diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index d6a891e1c518..6e53805900c4 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -2,7 +2,7 @@
 name: "\U0001F41B Bug report"
 about: Report a bug about the Dotty Compiler
 title: ''
-labels: itype:bug
+labels: itype:bug, stat:needs triage
 assignees: ''
 
 ---
@@ -14,6 +14,12 @@ If you're not sure what version you're using, run `print scalaVersion` from sbt
 
 ## Minimized code
 
+<!--
+This code should be self contained, compilable (with possible failures) and as small as possible.
+
+Ideally, we should be able to just copy this code in a file and run `scalac` (and maybe `scala`) to reproduce the issue.
+-->
+
 ```Scala
 println("hello, world")
 ```
diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
index dc935e310548..5a4cfe3f5e15 100644
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -2,7 +2,7 @@
 name: "\U0001F4A5 Crash report"
 about: Report a Dotty compiler crash
 title: ''
-labels: itype:bug, itype:crash
+labels: itype:bug, itype:crash, stat:needs triage
 assignees: ''
 
 ---
@@ -14,6 +14,12 @@ If you're not sure what version you're using, run `print scalaVersion` from sbt
 
 ## Minimized code
 
+<!--
+This code should be self contained, compilable (with possible failures) and as small as possible.
+
+Ideally, we should be able to just copy this code in a file and run `scalac` (and maybe `scala`) to reproduce the issue.
+-->
+
 ```Scala
 println("hello, world")
 ```
diff --git a/.github/ISSUE_TEMPLATE/other-issue.md b/.github/ISSUE_TEMPLATE/other-issue.md
index cfa8618c542a..07a9fe77846a 100644
--- a/.github/ISSUE_TEMPLATE/other-issue.md
+++ b/.github/ISSUE_TEMPLATE/other-issue.md
@@ -1,9 +1,10 @@
 ---
-name: "Other issue"
+name: Other issue
 about: Report an issue about the Dotty Compiler (not bug or crash)
 title: ''
-labels:
+labels: stat:needs triage
 assignees: ''
+
 ---
 
 ## Compiler version
diff --git a/.github/ISSUE_TEMPLATE/syntax-highlight.md b/.github/ISSUE_TEMPLATE/syntax-highlight.md
index 17b720d4d2aa..ffb8fbd32c46 100644
--- a/.github/ISSUE_TEMPLATE/syntax-highlight.md
+++ b/.github/ISSUE_TEMPLATE/syntax-highlight.md
@@ -1,10 +1,13 @@
 ---
 name: Syntax highlighting
-about: Please create a syntax highlighting issue here https://github.com/scala/vscode-scala-syntax/issues
+about: Please create a syntax highlighting issue in a respective repo
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
-Please create a syntax highlighting issue here: [scala/vscode-scala-syntax](https://github.com/scala/vscode-scala-syntax/issues).
+Please create a syntax highlighting issue here
+* VS Code / GitHub: https://github.com/scala/vscode-scala-syntax/issues
+* IntelliJ: https://youtrack.jetbrains.com/issues/SCL?q=tag:%20%7BScala%203%7D%20tag:%20%7BSyntax%20Highlighting%7D
+* highlight.js: https://github.com/highlightjs/highlight.js/issues
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 20b59eb56aa6..d9da3baee124 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -35,10 +35,7 @@ jobs:
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
         - ${{ github.workspace }}/../../cache/general:/root/.cache
     if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
-         || (
-           github.event_name == 'push'
-           && !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')
-         )
+         || github.event_name == 'push'
          || (
            github.event_name == 'pull_request'
            && !contains(github.event.pull_request.body, '[skip ci]')
@@ -69,7 +66,7 @@ jobs:
 
       - name: Test
         run: |
-          ./project/scripts/sbt ";compile ;test"
+          ./project/scripts/sbt ";dist/pack; compile ;test"
           ./project/scripts/cmdTests
 
   test:
@@ -82,10 +79,7 @@ jobs:
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
         - ${{ github.workspace }}/../../cache/general:/root/.cache
     if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
-         || (
-           github.event_name == 'push'
-           && !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')
-         )
+         || github.event_name == 'push'
          || (
            github.event_name == 'pull_request'
            && !contains(github.event.pull_request.body, '[skip ci]')
@@ -117,19 +111,19 @@ jobs:
 
       - name: Cmd Tests
         run: |
-          ./project/scripts/sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-dotty/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
-          ./project/scripts/bootstrapCmdTests
+          ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
+          ./project/scripts/cmdTests
+          ./project/scripts/bootstrappedOnlyCmdTests
+
+      - name: MiMa
+        run: |
+          ./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues"
 
   test_windows_fast:
     runs-on: [self-hosted, Windows]
     if: "(
            github.event_name == 'push'
-           && github.ref != 'refs/heads/master'
-           && !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')
-         )
-         || (
-           github.event_name == 'pull_request'
-           && !contains(github.event.pull_request.body, '[skip ci]')
+           && github.ref != 'refs/heads/main'
          )
          || (
            github.event_name == 'pull_request'
@@ -161,6 +155,10 @@ jobs:
         run: '"C:\Program Files\Git\bin\bash" ./project/scripts/winCmdTests'
         shell: cmd
 
+      - name: win tests
+        run: './project/scripts/winCmdTests.bat'
+        shell: cmd
+
       - name: Scala.js Test
         run: sbt ";sjsJUnitTests/test ;sjsCompilerTests/test"
         shell: cmd
@@ -168,10 +166,7 @@ jobs:
   test_windows_full:
     runs-on: [self-hosted, Windows]
     if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
-         || (
-           github.event_name == 'push'
-           && !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')
-         )
+         || github.event_name == 'push'
          || (
            github.event_name == 'pull_request'
            && !contains(github.event.pull_request.body, '[skip ci]')
@@ -187,7 +182,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Test
-        run: sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test"
+        run: sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test"
         shell: cmd
 
       - name: Scala.js Test
@@ -323,6 +318,49 @@ jobs:
           git submodule update --init --recursive --jobs 7
           ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
 
+  community_build_forward_compat:
+    runs-on: [self-hosted, Linux]
+    container:
+      image: lampepfl/dotty:2021-03-22
+      options: --cpu-shares 4096
+      volumes:
+        - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
+        - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
+        - ${{ github.workspace }}/../../cache/general:/root/.cache
+    if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
+        || (
+           github.event_name == 'pull_request'
+           && !contains(github.event.pull_request.body, '[skip ci]')
+           && !contains(github.event.pull_request.body, '[skip community_build]')
+           && contains(github.event.pull_request.body, '[test_forward_compat]')
+         )
+         || (
+           github.event_name == 'workflow_dispatch'
+           && github.repository == 'lampepfl/dotty'
+         )"
+
+    steps:
+      - name: Reset existing repo
+        run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
+
+      - name: Checkout cleanup script
+        uses: actions/checkout@v2
+
+      - name: Cleanup
+        run: .github/workflows/cleanup.sh
+
+      - name: Git Checkout
+        uses: actions/checkout@v2
+
+      - name: Add SBT proxy repositories
+        run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
+
+      - name: Test
+        run: |
+          git submodule sync
+          git submodule update --init --recursive --jobs 7
+          ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestForwardCompat"
+
   test_sbt:
     runs-on: [self-hosted, Linux]
     container:
@@ -361,7 +399,7 @@ jobs:
         run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
 
       - name: Test sbt
-        run: ./project/scripts/sbt "sbt-dotty/scripted; sbt-community-build/scripted"
+        run: ./project/scripts/sbt "sbt-test/scripted; sbt-community-build/scripted"
 
   test_java8:
     runs-on: [self-hosted, Linux]
@@ -377,7 +415,6 @@ jobs:
          || (
            github.event_name == 'push'
            && startsWith(github.event.ref, 'refs/tags/')
-           && !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')
          )
          || (
            github.event_name == 'pull_request'
@@ -410,8 +447,9 @@ jobs:
 
       - name: Test
         run: |
-          ./project/scripts/sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-dotty/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
-          ./project/scripts/bootstrapCmdTests
+          ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
+          ./project/scripts/cmdTests
+          ./project/scripts/bootstrappedOnlyCmdTests
 
   publish_nightly:
     runs-on: [self-hosted, Linux]
@@ -422,7 +460,7 @@ jobs:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
         - ${{ github.workspace }}/../../cache/general:/root/.cache
-    needs: [test_non_bootstrapped, test, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
+    needs: [test_non_bootstrapped, test, community_build_a, community_build_b, community_build_c, community_build_forward_compat, test_sbt, test_java8]
     if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
     env:
       NIGHTLYBUILD: yes
@@ -447,7 +485,20 @@ jobs:
       - name: Add SBT proxy repositories
         run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
 
+      - name: Get version string for this build
+        run: |
+          ver=$(./project/scripts/sbt "print scala3-compiler-bootstrapped/version" | tail -n1)
+          echo "This build version: $ver"
+          echo "THISBUILD_VERSION=$ver" >> $GITHUB_ENV
+
+      - name: Check whether not yet published
+        id: not_yet_published
+        continue-on-error: true
+        run: |
+          ! ./project/scripts/is-version-published.sh "$THISBUILD_VERSION"
+
       - name: Publish Nightly
+        if: "steps.not_yet_published.outcome == 'success'"
         run: |
           ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleRelease"
 
@@ -464,9 +515,13 @@ jobs:
     if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
     env:
       NIGHTLYBUILD: yes
-      BOT_TOKEN: ${{ secrets.BOT_TOKEN }}  # If you need to change this:
-                                           # Generate one at https://github.com/settings/tokens
-                                           # Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
+      DOTTY_WEBSITE_BOT_TOKEN: ${{ secrets.BOT_TOKEN }}  # If you need to change this:
+                                          # Generate one at https://github.com/settings/tokens
+                                          # Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
+      # Currently unused token, no need to deploy anything to docs.scala-lang
+      # DOCS_SCALALANG_BOT_TOKEN: ${{ secrets.DOCS_SCALALANG_BOT_TOKEN }}  # If you need to change this:
+                                          # Generate one at https://github.com/settings/tokens
+                                          # Make sure you have the write permissions to the repo: https://github.com/scala/docs.scala-lang
 
     steps:
       - name: Reset existing repo
@@ -488,14 +543,15 @@ jobs:
         run: |
           ./project/scripts/genDocs -doc-snapshot
 
-      - name: Deploy Website
+      - name: Deploy Website to dotty-website
         uses: peaceiris/actions-gh-pages@v3
         with:
-          personal_token: ${{ secrets.BOT_TOKEN }}
+          personal_token: ${{ env.DOTTY_WEBSITE_BOT_TOKEN }}
           publish_dir: docs/_site
           external_repository: lampepfl/dotty-website
           publish_branch: gh-pages
 
+
   publish_release:
     runs-on: [self-hosted, Linux]
     container:
@@ -507,8 +563,7 @@ jobs:
         - ${{ github.workspace }}/../../cache/general:/root/.cache
     needs: [test_non_bootstrapped, test, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
     if: "github.event_name == 'push'
-         && startsWith(github.event.ref, 'refs/tags/')
-         && !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')"
+         && startsWith(github.event.ref, 'refs/tags/')"
 
     env:
       RELEASEBUILD: yes
@@ -582,94 +637,6 @@ jobs:
           asset_name: sha256sum.txt
           asset_content_type: text/plain
 
-  release_documentation:
-    runs-on: [self-hosted, Linux]
-    container:
-      image: lampepfl/dotty:2021-03-22
-      options: --cpu-shares 4096
-      volumes:
-        - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
-        - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
-        - ${{ github.workspace }}/../../cache/general:/root/.cache
-    needs: [publish_release]
-    if: "github.event_name == 'push'
-         && startsWith(github.event.ref, 'refs/tags/')
-         && !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')"
-
-    env:
-      RELEASEBUILD: yes
-      BOT_TOKEN: ${{ secrets.BOT_TOKEN }}  # If you need to change this:
-                                           # Generate one at https://github.com/settings/tokens
-                                           # Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
-
-    steps:
-      - name: Reset existing repo
-        run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
-
-      - name: Checkout cleanup script
-        uses: actions/checkout@v2
-
-      - name: Cleanup
-        run: .github/workflows/cleanup.sh
-
-      - name: Git Checkout
-        uses: actions/checkout@v2
-
-      - name: Add SBT proxy repositories
-        run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
-
-      - name: Generate Website
-        run: |
-          ./project/scripts/genDocs -doc-snapshot
-
-      - name: Deploy Website
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          personal_token: ${{ secrets.BOT_TOKEN }}
-          publish_dir: docs/_site
-          external_repository: lampepfl/dotty-website
-          publish_branch: gh-pages
-
-  publish_sbt_release:
-    runs-on: [self-hosted, Linux]
-    container:
-      image: lampepfl/dotty:2021-03-22
-      options: --cpu-shares 4096
-      volumes:
-        - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
-        - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
-        - ${{ github.workspace }}/../../cache/general:/root/.cache
-    needs: [community_build_a, community_build_b, community_build_c, test_sbt]
-    if: "github.event_name == 'push'
-         && startsWith(github.event.ref, 'refs/tags/sbt-dotty-')"
-
-    env:
-      RELEASEBUILD: yes
-      PGP_PW: ${{ secrets.PGP_PW }}  # PGP passphrase
-      PGP_SECRET: ${{ secrets.PGP_SECRET }}  # Export your private and public PGP key to an *.asc file, take the file's contents as a string
-      SONATYPE_PW: ${{ secrets.SONATYPE_PW }}
-      SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
-
-    steps:
-      - name: Reset existing repo
-        run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
-
-      - name: Checkout cleanup script
-        uses: actions/checkout@v2
-
-      - name: Cleanup
-        run: .github/workflows/cleanup.sh
-
-      - name: Git Checkout
-        uses: actions/checkout@v2
-
-      - name: Add SBT proxy repositories
-        run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
-
-      - name: Publish Dotty SBT Plugin Release
-        run: |
-          ./project/scripts/sbtPublish ";project sbt-dotty ;publishSigned ;sonatypeBundleRelease"
-
   open_issue_on_failure:
     runs-on: [self-hosted, Linux]
     container:
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 1547a0569f70..53800df7bb00 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -6,3 +6,5 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - run: ./project/scripts/check-cla.sh
+      env:
+        AUTHOR: ${{ github.event.pull_request.user.login }}
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
new file mode 100644
index 000000000000..820843778428
--- /dev/null
+++ b/.github/workflows/releases.yml
@@ -0,0 +1,27 @@
+name: Releases
+on:
+  workflow_dispatch:
+
+jobs:
+  publish_release:
+    runs-on: [self-hosted, Linux]
+    container:
+      image: lampepfl/dotty:2021-03-22
+      options: --cpu-shares 4096
+
+    env:
+      SDKMAN_KEY: ${{ secrets.SDKMAN_KEY }} 
+      SDKMAN_TOKEN: ${{ secrets.SDKMAN_TOKEN }}
+      
+    steps:
+      - name: Reset existing repo
+        run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
+
+      - name: Cleanup
+        run: .github/workflows/cleanup.sh
+
+      - name: Git Checkout
+        uses: actions/checkout@v2
+
+      - name: Publish to SDKMAN
+        run: .github/workflows/scripts/publish-sdkman.sh
diff --git a/.github/workflows/scaladoc.yaml b/.github/workflows/scaladoc.yaml
index 269950f68962..50c8009f3e8e 100644
--- a/.github/workflows/scaladoc.yaml
+++ b/.github/workflows/scaladoc.yaml
@@ -13,7 +13,7 @@ jobs:
            && !contains(github.event.pull_request.body, '[skip docs]')
          )
          || contains(github.event.ref, 'scaladoc')
-         || contains(github.event.ref, 'master')"
+         || contains(github.event.ref, 'main')"
 
     steps:
       - name: Git Checkout
@@ -36,10 +36,12 @@ jobs:
           java-version: 11
 
       - name: Compile and test scala3doc-js
-        run: ./project/scripts/sbt scaladoc-js/test
+        run: ./project/scripts/sbt scaladoc-js-main/test
 
       - name: Compile and test
-        run: ./project/scripts/sbt scaladoc/test
+        run: |
+          ./project/scripts/sbt scaladoc/test
+          ./project/scripts/cmdScaladocTests
 
       - name: Locally publish self
         run: ./project/scripts/sbt scaladoc/publishLocal
@@ -54,7 +56,7 @@ jobs:
         run: ./project/scripts/sbt scaladoc/generateScalaDocumentation
 
       - name: Generate documentation for example project using dotty-sbt
-        run: ./project/scripts/sbt "sbt-dotty/scripted sbt-dotty/scaladoc"
+        run: ./project/scripts/sbt "sbt-test/scripted sbt-dotty/scaladoc"
 
       - name: Generate index file
         run: scaladoc/scripts/mk-index.sh scaladoc/output > scaladoc/output/index.html
@@ -71,17 +73,16 @@ jobs:
             az storage container create --name $DOC_DEST --account-name scala3docstorage --public-access container
             az storage blob upload-batch -s scaladoc/output -d $DOC_DEST --account-name scala3docstorage
 
-  community-docs:
-    env:
-      AZURE_STORAGE_SAS_TOKEN: ${{ secrets.AZURE_STORAGE_SAS_TOKEN }}
+  stdlib-sourcelinks-test:
     runs-on: ubuntu-latest
-    if: "(    github.event_name == 'pull_request'
+    # if false - disable flaky test
+    if: "false && ((    github.event_name == 'pull_request'
            && !contains(github.event.pull_request.body, '[skip ci]')
            && !contains(github.event.pull_request.body, '[skip docs]')
          )
          || contains(github.event.ref, 'scaladoc')
          || contains(github.event.ref, 'scala3doc')
-         || contains(github.event.ref, 'master')"
+         || contains(github.event.ref, 'main'))"
 
     steps:
       - name: Git Checkout
@@ -92,20 +93,5 @@ jobs:
         with:
           java-version: 8
 
-      - name: Init submodules
-        run: git submodule update --init --recursive --jobs 7
-
-      - name: Generate docs
-        run: ./project/scripts/sbt "community-build/run doc all docsOutput"
-
-      - name: Upload documentation to server
-        uses: azure/CLI@v1
-        if: env.AZURE_STORAGE_SAS_TOKEN
-        env:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-        with:
-          inlineScript: |
-            DOC_DEST=pr-${PR_NUMBER:-${GITHUB_REF##*/}}-docs
-            echo uplading docs to https://scala3doc.virtuslab.com/$DOC_DEST
-            az storage container create --name $DOC_DEST --account-name scala3docstorage --public-access container
-            az storage blob upload-batch -s community-build/docsOutput -d  $DOC_DEST --account-name scala3docstorage
+      - name: Test sourcelinks to stdlib
+        run: true # ./project/scripts/sbt scaladoc/sourceLinksIntegrationTest:test
diff --git a/.github/workflows/scripts/publish-sdkman.sh b/.github/workflows/scripts/publish-sdkman.sh
new file mode 100755
index 000000000000..07d35a72a65e
--- /dev/null
+++ b/.github/workflows/scripts/publish-sdkman.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+# This is script for publishing scala on SDKMAN.
+# Script resolves the latest stable version of scala and then send REST request to SDKMAN Vendor API.
+# It's releasing and announcing the release of scala on SDKMAN.
+#
+# Requirement:
+#   - the latest stable version of scala should be available in github artifacts
+
+set -u
+
+# latest stable dotty version 
+DOTTY_VERSION=$(curl -s https://api.github.com/repos/lampepfl/dotty/releases/latest  | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+DOTTY_URL="https://github.com/lampepfl/dotty/releases/download/$DOTTY_VERSION/scala3-$DOTTY_VERSION.zip"
+
+# checking if dotty version is available 
+if ! curl --output /dev/null --silent --head --fail "$DOTTY_URL"; then
+  echo "URL doesn't exist: $DOTTY_URL"
+  exit 1
+fi
+
+# Release a new Candidate Version
+curl --silent --show-error --fail \
+    -X POST \
+    -H "Consumer-Key: $SDKMAN_KEY" \
+    -H "Consumer-Token: $SDKMAN_TOKEN" \
+    -H "Content-Type: application/json" \
+    -H "Accept: application/json" \
+    -d '{"candidate": "scala", "version": "'"$DOTTY_VERSION"'", "url": "'"$DOTTY_URL"'"}' \
+    https://vendors.sdkman.io/release
+
+if [[ $? -ne 0 ]]; then
+  echo "Fail sending POST request to releasing scala on SDKMAN."
+  exit 1
+fi
+
+# Set DOTTY_VERSION as Default for Candidate
+curl --silent --show-error --fail \
+    -X PUT \
+    -H "Consumer-Key: $SDKMAN_KEY" \
+    -H "Consumer-Token: $SDKMAN_TOKEN" \
+    -H "Content-Type: application/json" \
+    -H "Accept: application/json" \
+    -d '{"candidate": "scala", "version": "'"$DOTTY_VERSION"'"}' \
+    https://vendors.sdkman.io/default
+
+if [[ $? -ne 0 ]]; then
+  echo "Fail sending PUT request to announcing the release of scala on SDKMAN."
+  exit 1
+fi
diff --git a/.gitignore b/.gitignore
index 0ba8e15fd3f3..e182b7114a07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,9 @@ tests/partest-generated/
 tests/locks/
 /test-classes/
 
+# Benchmarks
+bench/tests-generated
+
 # Ignore output files but keep the directory
 out/
 build/
@@ -96,3 +99,13 @@ community-build/dotty-community-build-deps
 
 # Bloop
 .bsp
+
+# Coursier
+cs
+
+# Coursier test product
+compiler/test-coursier/run/*.jar
+
+# docs related
+contributors.js
+content-contributors.css
diff --git a/.gitmodules b/.gitmodules
index d922c875223a..f93c2c9a9857 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -100,10 +100,6 @@
 [submodule "community-build/community-projects/requests-scala"]
 	path = community-build/community-projects/requests-scala
 	url = https://github.com/dotty-staging/requests-scala.git
-[submodule "community-build/community-projects/cats-effect-2"]
-	path = community-build/community-projects/cats-effect-2
-	url = https://github.com/dotty-staging/cats-effect.git
-	branch = series/2.x
 [submodule "community-build/community-projects/cats-effect-3"]
 	path = community-build/community-projects/cats-effect-3
 	url = https://github.com/dotty-staging/cats-effect.git
@@ -184,6 +180,9 @@
 [submodule "community-build/community-projects/protoquill"]
 	path = community-build/community-projects/protoquill
 	url = https://github.com/dotty-staging/protoquill.git
+[submodule "community-build/community-projects/Monocle"]
+	path = community-build/community-projects/Monocle
+	url = https://github.com/dotty-staging/Monocle.git
 [submodule "community-build/community-projects/onnx-scala"]
 	path = community-build/community-projects/onnx-scala
 	url = https://github.com/dotty-staging/onnx-scala.git
@@ -193,3 +192,61 @@
 [submodule "community-build/community-projects/play-json"]
 	path = community-build/community-projects/play-json
 	url = https://github.com/dotty-staging/play-json.git
+[submodule "community-build/community-projects/scalatestplus-testng"]
+	path = community-build/community-projects/scalatestplus-testng
+	url = https://github.com/dotty-staging/scalatestplus-testng.git
+[submodule "community-build/community-projects/munit-cats-effect"]
+	path = community-build/community-projects/munit-cats-effect
+	url = https://github.com/dotty-staging/munit-cats-effect.git
+[submodule "community-build/community-projects/scalacheck-effect"]
+	path = community-build/community-projects/scalacheck-effect
+	url = https://github.com/dotty-staging/scalacheck-effect.git
+[submodule "community-build/community-projects/fs2"]
+	path = community-build/community-projects/fs2
+	url = https://github.com/dotty-staging/fs2.git
+[submodule "community-build/community-projects/libretto"]
+	path = community-build/community-projects/libretto
+	url = https://github.com/dotty-staging/libretto.git
+[submodule "community-build/community-projects/jackson-module-scala"]
+	path = community-build/community-projects/jackson-module-scala
+	url = https://github.com/dotty-staging/jackson-module-scala.git
+[submodule "community-build/community-projects/scala-java8-compat"]
+	path = community-build/community-projects/scala-java8-compat
+	url = https://github.com/dotty-staging/scala-java8-compat.git
+[submodule "community-build/community-projects/specs2"]
+	path = community-build/community-projects/specs2
+	url = https://github.com/dotty-staging/specs2.git
+[submodule "community-build/community-projects/spire"]
+	path = community-build/community-projects/spire
+	url = https://github.com/dotty-staging/spire.git
+[submodule "community-build/community-projects/munit-forward-compat"]
+	path = community-build/community-projects/munit-forward-compat
+	url = https://github.com/dotty-staging/munit.git
+[submodule "community-build/community-projects/discipline-forward-compat"]
+	path = community-build/community-projects/discipline-forward-compat
+	url = https://github.com/dotty-staging/discipline.git
+[submodule "community-build/community-projects/discipline-munit-forward-compat"]
+	path = community-build/community-projects/discipline-munit-forward-compat
+	url = https://github.com/dotty-staging/discipline-munit.git
+[submodule "community-build/community-projects/discipline-specs2-forward-compat"]
+	path = community-build/community-projects/discipline-specs2-forward-compat
+	url = https://github.com/dotty-staging/discipline-specs2.git
+[submodule "community-build/community-projects/simulacrum-scalafix-forward-compat"]
+	path = community-build/community-projects/simulacrum-scalafix-forward-compat
+	url = https://github.com/dotty-staging/simulacrum-scalafix.git
+[submodule "community-build/community-projects/cats-forward-compat"]
+	path = community-build/community-projects/cats-forward-compat
+	url = https://github.com/dotty-staging/cats.git
+[submodule "community-build/community-projects/cats-mtl-forward-compat"]
+	path = community-build/community-projects/cats-mtl-forward-compat
+	url = https://github.com/dotty-staging/cats-mtl.git
+[submodule "community-build/community-projects/coop-forward-compat"]
+	path = community-build/community-projects/coop-forward-compat
+	url = https://github.com/dotty-staging/coop.git
+[submodule "community-build/community-projects/cats-effect-3-forward-compat"]
+	path = community-build/community-projects/cats-effect-3-forward-compat
+	url = https://github.com/dotty-staging/cats-effect.git
+	branch = series/3.x
+[submodule "community-build/community-projects/scalacheck-forward-compat"]
+	path = community-build/community-projects/scalacheck-forward-compat
+	url = https://github.com/dotty-staging/scalacheck
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3b622e9f57c8..19af50ebd49f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ These guidelines are meant to be a living document that should be changed and ad
 
 This is the process for committing code to the Scala project. There are of course exceptions to these rules, for example minor changes to comments and documentation, fixing a broken build etc.
 
-1. Make sure you have signed the [Scala CLA](http://typesafe.com/contribute/cla/scala), if not, sign it.
+1. Make sure you have signed the [Scala CLA](https://www.lightbend.com/contribute/cla/scala), if not, sign it.
 2. Before starting to work on a feature or a fix, it's good practice to ensure that:
     1. There is a ticket for your work in the project's [issue tracker](https://github.com/lampepfl/dotty/issues);
     2. The ticket has been discussed and prioritized by the team.
diff --git a/MAINTENANCE.md b/MAINTENANCE.md
new file mode 100644
index 000000000000..cb98344e1ea0
--- /dev/null
+++ b/MAINTENANCE.md
@@ -0,0 +1,76 @@
+# Issue Tsar Role
+This document formally defines the Issue Tsar role. This is a repository maintenance role that is assigned to core contributors on rotating basis.
+
+## Responsibilities
+Issue Tsar is responsible for:
+- Health of the CI, nightly releases and benchmark infrastructure.
+- PRs of external contributors: assigning someone to review, or handling themselves.
+- Triaging issues (especially new):
+  - Each issue needs to be assigned an `itype` and 1 or more `area` labels.
+  - Where applicable, new issues need to be designated for the Spree or Semester projects with the corresponding labels.
+  - Regressions from an earlier Scala 3 release must be classified with the “regression” label and assigned to the next release’s milestone.
+  - Modifying issue labels to best capture information about the issues
+    - Attempting to reproduce the issue (or label “stat:cannot reproduce”)
+    - Further minimizing the issue or asking the reporter of the issue to minimize it correctly (or label “stat:needs minimization”)
+
+Other core teammates are responsible for providing information to the Issue Tsar in a timely manner when it is requested if they have that information.
+
+## Assignment
+Issue Tsar is appointed for 7 days and is responsible for what is specified in the “Responsibilities” section during those 7 days. Their assumption of the role starts from the Dotty Meeting on Monday and ends on the next Dotty Meeting on Monday.
+
+During the Dotty Meeting, an Issue Tsar is assigned for the current week and for the week after that.
+
+Issue Tsardom schedule is maintained in the [Issue Tsardom Statistics spreadsheet](https://docs.google.com/spreadsheets/d/19IAqNzHfJ9rsii3EsjIGwPz5BLTFJs_byGM3FprmX3E/edit?usp=sharing). So, someone who knows their availability several weeks ahead into the future can assign themselves to be an issue tsar well ahead of time.
+
+## Prerequisites
+An issue tsar needs to have all the accesses and privileges required to get their job done. This might include:
+- Admin rights in lampepfl/dotty repository
+- Admin rights in lampepfl/dotty-feature-requests repository
+- Permissions to create new repositories in lampepfl organization (needed to fork repositories for the community build)
+- Access to the LAMP slack to be able to ask for help with the infrastructure, triaging and such
+
+## Procedures
+To ensure proper health of the infrastructure, the Tsar regularly monitors its proper operation. If a malfunction is detected, the Tsar's job is to ensure that someone is working on it (or solve it on their own).
+
+If it is unclear what area an issue belongs to, the Tsar asks for advice from other team members on Slack or GitHub. If, after asking for advice, it turns out that nobody in the team knows how to classify it, the issue must be classified with a “stat:needs triage” label.
+
+If it is unclear who should review an external PR, the Tsar asks for advice from the rest of the core team. If after asking for advice, it is still unclear who should do it, the reviewer for such a PR will be decided at the next Dotty meeting.
+
+In general, if anything else is unclear for proper fulfillment of responsibilities, the Tsar must proactively seek advice from other team members on Slack or other channels.
+
+## Reporting
+At the end of their Tsardom, the Tsar reports to the team during the Dotty meeting on the following points:
+
+- Whether there were any incidents with the CI, nightlies and benchmarks, how they were resolved and what steps were taken to prevent them from happening in the future.
+- How many new external contributors’ PRs were there and what they were about (in brief).
+- How many new issues were opened during their Tsardom period? Were there any areas that got a lot of issues? How many regressions from a prior Scala 3 release were there? Which were designated for an MSc project or an Issue Spree?
+- If new labels were created or old ones were removed, or there is any other feedback on how to improve the Tsardom, mention that.
+- Unassigned PRs and issues that the team failed to classify: bring them one by one so that the team can make a decision on them.
+
+# Maintenance List
+The following is the list of all the principal areas of the compiler and the core teams members who are responsible for their maintenance:
+
+- Typer: @odersky, @smarter, (@dwijnand)
+- Erasure: @smarter, @odersky
+- Enums: @bishabosha
+- Export: @bishabosha, @odersky 
+- Pattern Matching: @dwijnand, (@liufengyun), @sjrd
+- Inline: @nicolasstucki, @odersky
+- Metaprogramming (Quotes, Reflect, Staging): @nicolasstucki, @aherlihy
+- Match types: @OlivierBlanvillain, @dwijnand
+- GADT: @abgruszecki, @dwijnand
+- Scaladoc: @KacperFKorban,  @BarkingBad, @pikinier20
+- Initialization checker: @olhotak, @liufengyun, @anatoliykmetyuk
+- Safe nulls: @noti0na1, @olhotak
+- tailrec: @sjrd, @mbovel
+- JS backend: @sjrd
+- forward compat (-scala-release): @prolativ, @Kordyjan, (@nicolasstucki)
+- Benchmarks: @anatoliykmetyuk, @mbovel
+- REPL: @dwijnand, @anatoliykmetyuk, @prolativ
+- CI: @anatoliykmetyuk
+- Community Build: @anatoliykmetyuk
+- Vulpix: @dwijnand, @prolativ
+- JVM backend: @Kordyjan, (@sjrd)
+- Derivation & Mirrors: @bishabosha, (@dwijnand)
+- Linting (especially unused warnings) / Reporting UX  : VirtusLab TBD?
+- Java-compat: @Kordyjan
diff --git a/NOTICE.md b/NOTICE.md
index b116155369a8..64b5f9122db7 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -82,9 +82,9 @@ major authors were omitted by oversight.
     modifications. They were originally authored by Lex Spoon, Som Snytt,
     Adriaan Moors, Paul Phillips and others.
 
-  * dotty.tools.dottydoc: The Dottydoc documentation utility ships some
+  * dotty.tools.scaladoc: The Scaladoc documentation utility ships some
     third-party JavaScript and CSS libraries which are located under
-    dotty-doc/resources/css/, dotty-doc/resources/js/, docs/css/ and
+    scaladoc/resources/dotty_res/styles/, scaladoc/resources/dotty_res/scripts/, docs/css/ and
     docs/js/. Please refer to the license header of the concerned files for
     details.
 
diff --git a/README.md b/README.md
index 2c566d863c7b..fa564654fb38 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,24 @@
 Dotty
 =====
-[![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amaster)
-[![Join the chat at https://gitter.im/lampepfl/dotty](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lampepfl/dotty?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amain)
+[![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://discord.com/invite/scala)
 
-* [Homepage](http://dotty.epfl.ch)
+* [Homepage](https://dotty.epfl.ch)
 * [Documentation](https://dotty.epfl.ch/docs)
 
 Try it out
 ==========
 To try it in your project see also the [Getting Started User Guide](https://dotty.epfl.ch/#getting-started).
 
+Building a Local Distribution
+=============================
+1. `sbt dist/packArchive`
+2. Find the newly-built distributions in `dist/target/`
+
 Code of Conduct
 ===============
 Dotty uses the [Scala Code of Conduct](https://www.scala-lang.org/conduct.html)
-for all communication and discussion. This includes both GitHub, Gitter chat and
+for all communication and discussion. This includes both GitHub, Discord and
 other more direct lines of communication such as email.
 
 How to Contribute
diff --git a/bench/profiles/ci.yml b/bench/profiles/ci.yml
new file mode 100644
index 000000000000..0571d509a286
--- /dev/null
+++ b/bench/profiles/ci.yml
@@ -0,0 +1,61 @@
+scripts:
+
+    re2s:
+        - measure 1 1 1 $(find $PROG_HOME/tests/re2s/src -name *.scala)
+
+    implicit-cache:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicit_cache.scala
+
+    implicit-cache-from-tasty:
+        - source $PROG_HOME/dotty/bench/scripts/implicit-cache-from-tasty
+
+    implicit-scope-loop:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala
+
+    i1535:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/i1535.scala
+
+    i1687:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/i1687.scala
+
+    empty-class:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-class.scala
+
+    empty-object:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-object.scala
+
+    empty-file:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-file.scala
+
+    patmatexhaust:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/patmatexhaust.scala
+
+    exhaustivity-I:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala
+
+    exhaustivity-S:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala
+
+    exhaustivity-T:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala
+
+    exhaustivity-V:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala
+
+    implicitNums:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicitNums.scala
+
+    implicitNums-from-tasty:
+        - source $PROG_HOME/dotty/bench/scripts/implicitNums-from-tasty
+
+    inductive-implicits:
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/inductive-implicits.scala
+
+    scalap:
+        - source $PROG_HOME/dotty/bench/scripts/scalap
+
+    power-macro-power-inlined-1:
+        - source $PROG_HOME/dotty/bench/scripts/power-macro-1
+
+    power-macro-power-inlined-1k:
+        - source $PROG_HOME/dotty/bench/scripts/power-macro-1k
diff --git a/bench/profiles/compiletime.yml b/bench/profiles/compiletime.yml
new file mode 100644
index 000000000000..fd77df7dfe9a
--- /dev/null
+++ b/bench/profiles/compiletime.yml
@@ -0,0 +1,51 @@
+charts:
+
+    - name: "Compile-time sums of constant integer types (generated)"
+      url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
+      lines:
+        - key: compiletime-sum-constants
+          label: bootstrapped
+
+    - name: "Compile-time sums of term reference types (generated)"
+      url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
+      lines:
+        - key: compiletime-sum-termrefs
+          label: bootstrapped
+
+    - name: "Sums of term references, result type inferred (generated)"
+      url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
+      lines:
+        - key: compiletime-sum-termrefs-terms
+          label: bootstrapped
+
+    - name: "Compile-time sums of type applications (generated)"
+      url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
+      lines:
+        - key: compiletime-sum-applications
+          label: bootstrapped
+
+    - name: "Compile-time additions inside multiplications (generated)"
+      url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
+      lines:
+        - key: compiletime-distribute
+          label: bootstrapped
+
+scripts:
+
+    compiletime-sum-constants:
+        - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/sum-constants.scala
+
+    compiletime-sum-termrefs:
+        - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/sum-termrefs.scala
+
+    compiletime-sum-termrefs-terms:
+        - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/sum-termrefs-terms.scala
+
+    compiletime-sum-applications:
+        - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/sum-applications.scala
+
+    compiletime-distribute:
+        - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/distribute.scala
+
+config:
+    pr_base_url: "https://github.com/lampepfl/dotty/pull/"
diff --git a/bench/profiles/default.yml b/bench/profiles/default.yml
new file mode 100644
index 000000000000..22ed6d5f31df
--- /dev/null
+++ b/bench/profiles/default.yml
@@ -0,0 +1,14 @@
+includes:
+    - projects.yml
+    - implicits.yml
+    - typing.yml
+    - exhaustivity.yml
+    - misc.yml
+    - empty.yml
+    - quotes.yml
+    - tuples.yml
+    - compiletime.yml
+
+
+config:
+    pr_base_url: "https://github.com/lampepfl/dotty/pull/"
diff --git a/bench/profiles/empty.yml b/bench/profiles/empty.yml
new file mode 100644
index 000000000000..ac571e64e831
--- /dev/null
+++ b/bench/profiles/empty.yml
@@ -0,0 +1,33 @@
+charts:
+
+    - name: "empty class"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-class.scala
+      lines:
+        - key: empty-class
+          label: bootstrapped
+
+    - name: "empty object"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-object.scala
+      lines:
+        - key: empty-object
+          label: bootstrapped
+
+    - name: "empty file"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-file.scala
+      lines:
+        - key: empty-file
+          label: bootstrapped
+
+scripts:
+
+    empty-class:
+        - measure $PROG_HOME/dotty/tests/bench/empty-class.scala
+
+    empty-object:
+        - measure $PROG_HOME/dotty/tests/bench/empty-object.scala
+
+    empty-file:
+        - measure $PROG_HOME/dotty/tests/bench/empty-file.scala
+
+config:
+    pr_base_url: "https://github.com/lampepfl/dotty/pull/"
diff --git a/bench/profiles/exhaustivity.yml b/bench/profiles/exhaustivity.yml
new file mode 100644
index 000000000000..af6eb4041f6c
--- /dev/null
+++ b/bench/profiles/exhaustivity.yml
@@ -0,0 +1,86 @@
+charts:
+    - name: "exhaustivity check"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/patmatexhaust.scala
+      lines:
+        - key: patmatexhaust
+          label: bootstrapped
+
+    - name: "exhaustivity I"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-I.scala
+      lines:
+        - key: exhaustivity-I
+          label: bootstrapped
+
+    - name: "exhaustivity S"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-S.scala
+      lines:
+        - key: exhaustivity-S
+          label: bootstrapped
+
+    - name: "exhaustivity T"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-T.scala
+      lines:
+        - key: exhaustivity-T
+          label: bootstrapped
+
+    - name: "exhaustivity V"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-V.scala
+      lines:
+        - key: exhaustivity-V
+          label: bootstrapped
+
+    - name: "exhaustivity MIPS"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i7186.scala
+      lines:
+        - key: exhaustivity-mips
+          label: bootstrapped
+
+    - name: "exhaustivity i12241"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i12241.scala
+      lines:
+        - key: exhaustivity-i12241
+          label: bootstrapped
+
+    - name: "exhaustivity i12358"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i12358.scala
+      lines:
+        - key: exhaustivity-i12358
+          label: bootstrapped
+
+    - name: "exhaustivity i13565"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/pos/i13565.scala
+      lines:
+        - key: exhaustivity-i13565
+          label: bootstrapped
+
+scripts:
+
+    patmatexhaust:
+        - measure 20 40 3 $PROG_HOME/dotty/tests/bench/patmatexhaust.scala
+
+    exhaustivity-I:
+        - measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala
+
+    exhaustivity-S:
+        - measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala
+
+    exhaustivity-T:
+        - measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala
+
+    exhaustivity-V:
+        - measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala
+
+    exhaustivity-mips:
+        - measure 20 40 3 $PROG_HOME/dotty/tests/patmat/i7186.scala
+
+    exhaustivity-i12241:
+        - measure 20 40 3 $PROG_HOME/dotty/tests/patmat/i12241.scala
+
+    exhaustivity-i12358:
+        - measure 20 40 3 $PROG_HOME/dotty/tests/patmat/i12358.scala
+
+    exhaustivity-i13565:
+        - measure 20 40 3 $PROG_HOME/dotty/tests/pos/i13565.scala
+
+config:
+    pr_base_url: "https://github.com/lampepfl/dotty/pull/"
diff --git a/bench/profiles/implicits.yml b/bench/profiles/implicits.yml
new file mode 100644
index 000000000000..3e944b5be28b
--- /dev/null
+++ b/bench/profiles/implicits.yml
@@ -0,0 +1,51 @@
+charts:
+    - name: "implicit cache I"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicit_cache.scala
+      lines:
+        - key: implicit-cache
+          label: bootstrapped
+        - key: implicit-cache-from-tasty
+          label: from tasty
+
+    - name: "implicit cache II"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicitNums.scala
+      lines:
+        - key: implicitNums
+          label: bootstrapped
+        - key: implicitNums-from-tasty
+          label: from tasty
+
+    - name: "implicit scope loop"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicit-scope-loop.scala
+      lines:
+        - key: implicit-scope-loop
+          label: bootstrapped
+
+    - name: "inductive implicits"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/inductive-implicits.scala
+      lines:
+        - key: inductive-implicits
+          label: bootstrapped
+
+scripts:
+
+    implicit-cache:
+        - measure $PROG_HOME/dotty/tests/bench/implicit_cache.scala
+
+    implicit-cache-from-tasty:
+        - source $PROG_HOME/dotty/bench/scripts/implicit-cache-from-tasty
+
+    implicit-scope-loop:
+        - measure $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala
+
+    inductive-implicits:
+        - measure $PROG_HOME/dotty/tests/bench/inductive-implicits.scala
+
+    implicitNums:
+        - measure $PROG_HOME/dotty/tests/bench/implicitNums.scala
+
+    implicitNums-from-tasty:
+        - source $PROG_HOME/dotty/bench/scripts/implicitNums-from-tasty
+
+config:
+    pr_base_url: "https://github.com/lampepfl/dotty/pull/"
diff --git a/bench/profiles/misc.yml b/bench/profiles/misc.yml
new file mode 100644
index 000000000000..668f8e60c176
--- /dev/null
+++ b/bench/profiles/misc.yml
@@ -0,0 +1,21 @@
+charts:
+
+    - name: "issue #1535"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/i1535.scala
+      lines:
+        - key: i1535
+          label: bootstrapped
+
+    - name: "issue #1687"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/i1687.scala
+      lines:
+        - key: i1687
+          label: bootstrapped
+
+scripts:
+
+    i1535:
+        - measure $PROG_HOME/dotty/tests/bench/i1535.scala
+
+    i1687:
+        - measure $PROG_HOME/dotty/tests/bench/i1687.scala
diff --git a/bench/profiles/projects.yml b/bench/profiles/projects.yml
new file mode 100644
index 000000000000..e012d36b0b01
--- /dev/null
+++ b/bench/profiles/projects.yml
@@ -0,0 +1,44 @@
+charts:
+    - name: "dotty (source changes over time)"
+      url: https://github.com/lampepfl/dotty
+      lines:
+        - key:  dotty
+          label: bootstrapped
+
+    - name: "scala stdlib-2.13"
+      url: https://github.com/dotty-staging/scala/commits/stdLib213-dotty-community-build
+      lines:
+        - key: stdlib213
+          label: bootstrapped
+
+    - name: scalap
+      url: https://github.com/dotty-staging/scala/commits/scalap-dotty-community-build-2.13
+      lines:
+        - key: scalap
+          label: bootstrapped
+
+    - name: re2
+      url: https://github.com/lampepfl/bench/blob/main/tests/re2s
+      lines:
+        - key: re2s
+          label: bootstrapped
+
+
+scripts:
+    dotty:
+        - measure -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java)
+
+    re2s:
+        - measure $(find $PROG_HOME/tests/re2s/src -name *.scala)
+
+    # scalapb:
+    #    - source $PROG_HOME/dotty/bench/scripts/scalapb
+
+    scalap:
+       - source $PROG_HOME/dotty/bench/scripts/scalap
+
+    stdlib213:
+        - source $PROG_HOME/dotty/bench/scripts/stdlib213
+
+config:
+    pr_base_url: "https://github.com/lampepfl/dotty/pull/"
diff --git a/bench/profiles/pull.yml b/bench/profiles/pull.yml
new file mode 100644
index 000000000000..163d75a8769d
--- /dev/null
+++ b/bench/profiles/pull.yml
@@ -0,0 +1,8 @@
+includes:
+    - projects.yml
+    - quotes.yml
+    - misc.yml
+    - empty.yml
+
+config:
+    pr_base_url: "https://github.com/lampepfl/dotty/pull/"
diff --git a/bench/profiles/quotes.yml b/bench/profiles/quotes.yml
new file mode 100644
index 000000000000..afd970543aa1
--- /dev/null
+++ b/bench/profiles/quotes.yml
@@ -0,0 +1,32 @@
+charts:
+    - name: "Inline a quote"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/power-macro/PowerInlined-1.scala
+      lines:
+        - key: power-macro-power-inlined-1
+          label: bootstrapped
+
+    - name: "Inline 1k quotes"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/power-macro/PowerInlined-1k.scala
+      lines:
+        - key: power-macro-power-inlined-1k
+          label: bootstrapped
+
+    - name: "Quote String interpolation matching"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/string-interpolation-macro/Test.scala
+      lines:
+        - key: quote-string-interpolation-matching
+          label: bootstrapped
+
+scripts:
+
+    power-macro-power-inlined-1:
+        - source $PROG_HOME/dotty/bench/scripts/power-macro-1
+
+    power-macro-power-inlined-1k:
+        - source $PROG_HOME/dotty/bench/scripts/power-macro-1k
+
+    quote-string-interpolation-matching:
+        - source $PROG_HOME/dotty/bench/scripts/quote-string-interpolation-matching
+
+config:
+    pr_base_url: "https://github.com/lampepfl/dotty/pull/"
diff --git a/bench/profiles/sbt.yml b/bench/profiles/sbt.yml
new file mode 100644
index 000000000000..3ab0e43f3db2
--- /dev/null
+++ b/bench/profiles/sbt.yml
@@ -0,0 +1,15 @@
+charts:
+    - name: "dotty (source changes over time)"
+      url: https://github.com/lampepfl/dotty
+      lines:
+        - key:  dotty
+          label: bootstrapped
+        - key:  dotty-sbt
+          label: with sbt phases
+
+scripts:
+    dotty-sbt:
+        - measure -with-compiler -Yforce-sbt-phases -with-dotty $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java)
+
+config:
+    pr_base_url: "https://github.com/lampepfl/dotty/pull/"
diff --git a/bench/profiles/tuples.yml b/bench/profiles/tuples.yml
new file mode 100644
index 000000000000..5e41ecf7c80d
--- /dev/null
+++ b/bench/profiles/tuples.yml
@@ -0,0 +1,68 @@
+charts:
+    - name: "Tuple22 creation with Tuple22.apply"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-creation-apply.scala
+      lines:
+        - key: tuple22-creation-apply
+          label: bootstrapped
+
+    - name: "Tuple22 creation with *:"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-creation-cons.scala
+      lines:
+        - key: tuple22-creation-cons
+          label: bootstrapped
+
+    - name: "Tuple22.tail"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-tails.scala
+      lines:
+        - key: tuple22-tails
+          label: bootstrapped
+
+    - name: "Tuple22.apply"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-apply.scala
+      lines:
+        - key: tuple22-apply
+          label: bootstrapped
+
+    - name: "Tuple22.size"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-size.scala
+      lines:
+        - key: tuple22-size
+          label: bootstrapped
+
+    - name: "Tuple reverse (Runtime)"
+      url: https://github.com/lampepfl/dotty/blob/main/bench-run/src/main/scala/dotty/tools/benchmarks/tuples/TupleOps.scala#L59
+      lines:
+        - key: tuple-reverse
+          label: bootstrapped
+
+    - name: "Tuple flatMap (Runtime)"
+      url: https://github.com/lampepfl/dotty/blob/main/bench-run/src/main/scala/dotty/tools/benchmarks/tuples/TupleOps.scala#L64
+      lines:
+        - key: tuple-flatMap
+          label: bootstrapped
+
+scripts:
+
+    tuple22-creation-apply:
+        - measure $PROG_HOME/dotty/tests/bench/tuple22-creation-apply.scala
+
+    tuple22-creation-cons:
+        - measure $PROG_HOME/dotty/tests/bench/tuple22-creation-cons.scala
+
+    tuple22-tails:
+        - measure $PROG_HOME/dotty/tests/bench/tuple22-tails.scala
+
+    tuple22-apply:
+        - measure $PROG_HOME/dotty/tests/bench/tuple22-apply.scala
+
+    tuple22-size:
+        - measure $PROG_HOME/dotty/tests/bench/tuple22-size.scala
+
+    tuple-reverse:
+        - measure-run TupleOps.reverse
+
+    tuple-flatMap:
+        - measure-run TupleOps.flatMap
+
+config:
+    pr_base_url: "https://github.com/lampepfl/dotty/pull/"
diff --git a/bench/profiles/typing.yml b/bench/profiles/typing.yml
new file mode 100644
index 000000000000..f6476bca7006
--- /dev/null
+++ b/bench/profiles/typing.yml
@@ -0,0 +1,14 @@
+charts:
+    - name: "Find Ref"
+      url: https://github.com/lampepfl/dotty/blob/main/tests/bench/FindRef.scala
+      lines:
+        - key: find-ref
+          label: bootstrapped
+
+scripts:
+
+    find-ref:
+        - measure $PROG_HOME/dotty/tests/bench/FindRef.scala
+
+config:
+    pr_base_url: "https://github.com/lampepfl/dotty/pull/"
diff --git a/bench/scripts/implicit-cache-from-tasty b/bench/scripts/implicit-cache-from-tasty
new file mode 100755
index 000000000000..2cbd1694c9ac
--- /dev/null
+++ b/bench/scripts/implicit-cache-from-tasty
@@ -0,0 +1,8 @@
+set -e
+
+out="$PROG_HOME/tests/implicit_cache-out"
+mkdir -p "$out"
+
+compile -d "$out" "$PROG_HOME/dotty/tests/bench/implicit_cache.scala"
+
+measure -from-tasty "$out/Test.tasty" "$out/A.tasty" "$out/Foo.tasty"
diff --git a/bench/scripts/implicitNums-from-tasty b/bench/scripts/implicitNums-from-tasty
new file mode 100755
index 000000000000..53c4ea3754da
--- /dev/null
+++ b/bench/scripts/implicitNums-from-tasty
@@ -0,0 +1,8 @@
+set -e
+
+out="$PROG_HOME/tests/implicitNums-out"
+mkdir -p "$out"
+
+compile -d "$out" "$PROG_HOME/dotty/tests/bench/implicitNums.scala"
+
+measure -from-tasty "$out/Test.tasty"
diff --git a/bench/scripts/power-macro-1 b/bench/scripts/power-macro-1
new file mode 100755
index 000000000000..e6e43f31aa38
--- /dev/null
+++ b/bench/scripts/power-macro-1
@@ -0,0 +1,7 @@
+set -e
+
+mkdir -p "$PROG_HOME/tests/power-macro/out"
+
+compile -d "$PROG_HOME/tests/power-macro/out" "$PROG_HOME/dotty/tests/bench/power-macro/PowerMacro.scala"
+
+measure "$PROG_HOME/dotty/tests/bench/power-macro/PowerInlined-1.scala" -classpath "$PROG_HOME/tests/power-macro/out"
diff --git a/bench/scripts/power-macro-1k b/bench/scripts/power-macro-1k
new file mode 100755
index 000000000000..ec9c4b1dffe8
--- /dev/null
+++ b/bench/scripts/power-macro-1k
@@ -0,0 +1,7 @@
+set -e
+
+mkdir -p "$PROG_HOME/tests/power-macro/out"
+
+compile -d "$PROG_HOME/tests/power-macro/out" "$PROG_HOME/dotty/tests/bench/power-macro/PowerMacro.scala"
+
+measure "$PROG_HOME/dotty/tests/bench/power-macro/PowerInlined-1k.scala" -classpath "$PROG_HOME/tests/power-macro/out"
diff --git a/bench/scripts/quote-string-interpolation-matching b/bench/scripts/quote-string-interpolation-matching
new file mode 100755
index 000000000000..003f299db32d
--- /dev/null
+++ b/bench/scripts/quote-string-interpolation-matching
@@ -0,0 +1,7 @@
+set -e
+
+mkdir -p "$PROG_HOME/tests/string-interpolation-macro/out"
+
+compile -d "$PROG_HOME/tests/string-interpolation-macro/out" "$PROG_HOME/dotty/tests/bench/string-interpolation-macro/Macro.scala"
+
+measure "$PROG_HOME/dotty/tests/bench/string-interpolation-macro/Test.scala" -classpath "$PROG_HOME/tests/string-interpolation-macro/out"
diff --git a/bench/scripts/scalap b/bench/scripts/scalap
new file mode 100644
index 000000000000..f9b25632e8ae
--- /dev/null
+++ b/bench/scripts/scalap
@@ -0,0 +1,5 @@
+set -e
+
+path=$(cs fetch -p org.scala-lang:scala-compiler:2.13.0)
+
+measure -source 3.0-migration -classpath "$path" $(find $PROG_HOME/dotty/community-build/community-projects/scalap/src/scalap -name "*.scala")
diff --git a/bench/scripts/stdlib213 b/bench/scripts/stdlib213
new file mode 100644
index 000000000000..b70010b15644
--- /dev/null
+++ b/bench/scripts/stdlib213
@@ -0,0 +1,7 @@
+set -e
+
+pattern="! -name AnyVal.scala ! -name language.scala -name *.scala -o -name *.java"
+stdlib213=$(find $PROG_HOME/dotty/community-build/community-projects/stdLib213/src/library/scala $pattern)
+cd $PROG_HOME/dotty
+measure -language:implicitConversions $stdlib213
+
diff --git a/bench/src/main/scala/Benchmarks.scala b/bench/src/main/scala/Benchmarks.scala
index 6e0bae6e72de..51cd411cc13b 100644
--- a/bench/src/main/scala/Benchmarks.scala
+++ b/bench/src/main/scala/Benchmarks.scala
@@ -8,6 +8,8 @@ import reporting._
 import org.openjdk.jmh.results.RunResult
 import org.openjdk.jmh.runner.Runner
 import org.openjdk.jmh.runner.options.OptionsBuilder
+import org.openjdk.jmh.runner.options.TimeValue
+//import org.openjdk.jmh.results.format.ResultFormatType
 import org.openjdk.jmh.annotations._
 import org.openjdk.jmh.results.format._
 import java.util.concurrent.TimeUnit
@@ -21,8 +23,11 @@ import dotty.tools.io.AbstractFile
 
 object Bench {
   val COMPILE_OPTS_FILE = "compile.txt"
+  val GENERATED_BENCHMARKS_DIR = "tests-generated"
 
   def main(args: Array[String]): Unit = {
+    generateBenchmarks(GENERATED_BENCHMARKS_DIR)
+
     if (args.isEmpty) {
       println("Missing <args>")
       return
@@ -32,7 +37,7 @@ object Bench {
     val warmup = if (intArgs.length > 0) intArgs(0).toInt else 30
     val iterations = if (intArgs.length > 1) intArgs(1).toInt else 20
     val forks = if (intArgs.length > 2) intArgs(2).toInt else 1
-
+    val measurementTime = if (intArgs.length > 3) intArgs(3).toInt else 1
 
     import File.{ separator => sep }
 
@@ -48,7 +53,13 @@ object Bench {
                .mode(Mode.AverageTime)
                .timeUnit(TimeUnit.MILLISECONDS)
                .warmupIterations(warmup)
+               .warmupTime(TimeValue.seconds(measurementTime))
                .measurementIterations(iterations)
+               .measurementTime(TimeValue.seconds(measurementTime))
+               // To output results to bench/results.json, uncomment the 2
+               // following lines and the ResultFormatType import.
+               //.result("results.json")
+               //.resultFormat(ResultFormatType.JSON)
                .forks(forks)
                .build
 
diff --git a/bench/src/main/scala/generateBenchmarks.scala b/bench/src/main/scala/generateBenchmarks.scala
new file mode 100644
index 000000000000..012d81e3f5a2
--- /dev/null
+++ b/bench/src/main/scala/generateBenchmarks.scala
@@ -0,0 +1,155 @@
+package dotty.tools.benchmarks
+
+import java.nio.file.{Files, Paths, Path}
+import java.util.Random
+
+/** Generates benchmarks in `genDirName`.
+ *
+ *  Called automatically by the benchmarks runner ([[Bench.main]]).
+ */
+def generateBenchmarks(genDirName: String) =
+  val thisFile = Paths.get("src/main/scala/generateBenchmarks.scala")
+  val genDir = Paths.get(genDirName)
+
+  def generateBenchmark(subDirName: String, fileName: String, make: () => String) =
+    val outputDir = genDir.resolve(Paths.get(subDirName))
+    Files.createDirectories(outputDir)
+    val file = outputDir.resolve(Paths.get(fileName))
+    if !Files.exists(file) ||
+        Files.getLastModifiedTime(file).toMillis() <
+        Files.getLastModifiedTime(thisFile).toMillis() then
+      println(f"Generate benchmark $file")
+      Files.write(file, make().getBytes())
+
+  // Big compile-time sums of constant integer types: (1.type + 2.type + …).
+  // This should ideally have a linear complexity.
+  generateBenchmark("compiletime-ops", "sum-constants.scala", () =>
+    val innerSum = (1 to 50) // Limited to 50 to avoid stackoverflows in the compiler.
+      .map(i => f"$i")
+      .mkString(" + ")
+    val outerSum = (1 to 50)
+      .map(_ => f"($innerSum)")
+      .mkString(" + ")
+    val vals = (1 to 50)
+      .map(i => f"val v$i: $outerSum = ???")
+      .mkString("\n\n  ")
+
+    f"""
+import scala.compiletime.ops.int.*
+
+object Test:
+  val one: 1 = ???
+  val n: Int = ???
+  val m: Int = ???
+
+  $vals
+    """
+  )
+
+  // Big compile-time sums of term reference types: (one.type + m.type + n.type
+  // + one.type + m.type + n.type + …). This big type is normalized to (8000 +
+  // 8000 * m.type + 8000 * n.type).
+  generateBenchmark("compiletime-ops", "sum-termrefs.scala", () =>
+    val innerSum = (1 to 40)
+      .map(_ => "one.type + m.type + n.type")
+      .mkString(" + ")
+    val outerSum = (1 to 20)
+      .map(_ => f"($innerSum)")
+      .mkString(" + ")
+    val vals = (1 to 4)
+      .map(i => f"val v$i: $outerSum = ???")
+      .mkString("\n\n  ")
+
+    f"""
+import scala.compiletime.ops.int.*
+
+object Test:
+  val one: 1 = ???
+  val n: Int = ???
+  val m: Int = ???
+
+  $vals
+    """
+  )
+
+  // Big compile-time sums of term references: (n + m + …). The result type is
+  // inferred. The goal of this benchmark is to measure the performance cost of
+  // inferring precise types for arithmetic operations.
+  generateBenchmark("compiletime-ops", "sum-termrefs-terms.scala", () =>
+    val innerSum = (1 to 40)
+      .map(_ => "one + m + n")
+      .mkString(" + ")
+    val outerSum = (1 to 20)
+      .map(_ => f"($innerSum)")
+      .mkString(" + ")
+    val vals = (1 to 4)
+      .map(i => f"val v$i = $outerSum")
+      .mkString("\n\n  ")
+
+    f"""
+import scala.compiletime.ops.int.*
+
+object Test:
+  val one: 1 = ???
+  val n: Int = ???
+  val m: Int = ???
+
+  $vals
+    """
+  )
+
+  // Big compile-time product of sums of term references: (one + n + m) * (one +
+  // n + m) * …. The goal of this benchmark is to measure the performance impact
+  // of distributing addition over multiplication during compile-time operations
+  // normalization.
+  generateBenchmark("compiletime-ops", "distribute.scala", () =>
+    val product = (1 to 18)
+      .map(_ => "(one.type + m.type + n.type)")
+      .mkString(" * ")
+    val vals = (1 to 50)
+      .map(i => f"val v$i: $product = ???")
+      .mkString("\n\n  ")
+
+    f"""
+import scala.compiletime.ops.int.*
+
+object Test:
+  val one: 1 = ???
+  val n: Int = ???
+  val m: Int = ???
+
+  $vals
+    """
+  )
+
+  def applicationCount = 14
+  def applicationDepth = 10
+  def applicationVals = 2
+
+  // Compile-time sums of big applications: Op[Op[…], Op[…]] + Op[Op[…], Op[…]]
+  // + …. Applications are deep balanced binary trees only differing in their
+  // very last (top-right) leafs. These applications are compared pairwise in
+  // order to sort the terms of the sum.
+  generateBenchmark("compiletime-ops", "sum-applications.scala", () =>
+    def makeOp(depth: Int, last: Boolean, k: Int): String =
+      if depth == 0 then f"Op[one.type, ${if last then k.toString else "n.type"}]"
+      else f"Op[${makeOp(depth - 1, false, k)}, ${makeOp(depth - 1, last, k)}]"
+    val sum = (applicationCount to 1 by -1)
+      .map(k => makeOp(applicationDepth, true, k))
+      .mkString(" + ")
+    val vals = (1 to applicationVals)
+      .map(i => f"val v$i: $sum = ???")
+      .mkString("\n\n  ")
+
+    f"""
+import scala.compiletime.ops.int.*
+
+object Test:
+  val one: 1 = ???
+  val n: Int = ???
+  type SInt = Int & Singleton
+  type Op[A <: SInt, B <: SInt] <:SInt
+
+  $vals
+    """
+  )
diff --git a/bench/tests/compiletime-ops/empty.scala b/bench/tests/compiletime-ops/empty.scala
new file mode 100644
index 000000000000..3da2acd61b75
--- /dev/null
+++ b/bench/tests/compiletime-ops/empty.scala
@@ -0,0 +1,6 @@
+import scala.compiletime.ops.int.*
+
+object Test:
+  val one: 1 = ???
+  val n: Int = ???
+  val m: Int = ???
diff --git a/build.sbt b/build.sbt
index f6a2fe9d82bf..3ec2958324be 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,14 +4,12 @@ val `scala3-interfaces` = Build.`scala3-interfaces`
 val `scala3-compiler` = Build.`scala3-compiler`
 val `scala3-compiler-bootstrapped` = Build.`scala3-compiler-bootstrapped`
 val `scala3-library` = Build.`scala3-library`
-val `scala3-library-js` = Build.`scala3-library-js`
 val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
 val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`
 val `scala3-sbt-bridge` = Build.`scala3-sbt-bridge`
 val `scala3-sbt-bridge-tests` = Build.`scala3-sbt-bridge-tests`
 val `scala3-staging` = Build.`scala3-staging`
 val `scala3-tasty-inspector` = Build.`scala3-tasty-inspector`
-val `scala3-tasty-inspector-nonbootstrapped` = Build.`scala3-tasty-inspector-nonbootstrapped`
 val `scala3-language-server` = Build.`scala3-language-server`
 val `scala3-bench` = Build.`scala3-bench`
 val `scala3-bench-bootstrapped` = Build.`scala3-bench-bootstrapped`
@@ -21,11 +19,10 @@ val `tasty-core` = Build.`tasty-core`
 val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`
 val `tasty-core-scala2` = Build.`tasty-core-scala2`
 val scaladoc = Build.scaladoc
-val `scaladoc-nonBootstrapped` = Build.`scaladoc-nonBootstrapped`
 val `scaladoc-testcases` = Build.`scaladoc-testcases`
-val `scaladoc-testcases-nonBootstrapped` = Build.`scaladoc-testcases-nonBootstrapped`
-val `scaladoc-js` = Build.`scaladoc-js`
-val `scaladoc-js-nonBootstrapped` = Build.`scaladoc-js-nonBootstrapped`
+val `scaladoc-js-common` = Build.`scaladoc-js-common`
+val `scaladoc-js-main` = Build.`scaladoc-js-main`
+val `scaladoc-js-contributors` = Build.`scaladoc-js-contributors`
 val `scala3-bench-run` = Build.`scala3-bench-run`
 val dist = Build.dist
 val `community-build` = Build.`community-build`
@@ -35,7 +32,7 @@ val sjsSandbox = Build.sjsSandbox
 val sjsJUnitTests = Build.sjsJUnitTests
 val sjsCompilerTests = Build.sjsCompilerTests
 
-val `sbt-dotty` = Build.`sbt-dotty`
+val `sbt-test` = Build.`sbt-test`
 val `vscode-dotty` = Build.`vscode-dotty`
 
 inThisBuild(Build.thisBuildSettings)
diff --git a/community-build/README.md b/community-build/README.md
index a042f13b94ac..26396d372936 100644
--- a/community-build/README.md
+++ b/community-build/README.md
@@ -1,18 +1,22 @@
-# Dotty Community Build
+# Scala 3 Community Build
 
-This project contains tests to build and test a corpus of open sources Scala projects against the latest version of Dotty.
+This project contains tests to build and test a corpus of open sources Scala projects against the latest version of Scala 3.
+
+## Running it locally
 
 To run the community build on a local machine, first fetch all the git submodules with `git submodule update --init` and run `sbt community-build/test` from the root of the dotty repo.
 
+To run a single project, you can use the usual syntax for running a single JUnit test, for example `community-build/testOnly -- *shapeless`
+
 ## Adding your project
 
 To add your project to the community build you can follow these steps:
 
-1. Get your project to compile with Dotty. Instructions can be found on the [dotty-example-project](https://github.com/lampepfl/dotty-example-project).
-   See the submodules in [community-projects](https://github.com/lampepfl/dotty/tree/master/community-build/community-projects/) for examples of projects that compile with Dotty.
+1. Get your project to compile with Scala 3. Instructions can be found on the [scala3-example-project](https://github.com/lampepfl/scala3-example-project).
+   See the submodules in [community-projects](https://github.com/lampepfl/dotty/tree/master/community-build/community-projects/) for examples of projects that compile with Scala 3.
 
 2. Open a PR against this repo that:
      - Adds your project as a new git submodule
-       - `git submodule add https://github.com/lampepfl/XYZ.git community-build/community-projects/XYZ`
+       - `git submodule add https://github.com/dotty-staging/XYZ.git community-build/community-projects/XYZ`
      - Add the project to [projects.scala](https://github.com/lampepfl/dotty/blob/master/community-build/src/scala/dotty/communitybuild/projects.scala)
      - Adds a test in [CommunityBuildTest.scala](https://github.com/lampepfl/dotty/blob/master/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala)
diff --git a/community-build/community-projects/Lucre b/community-build/community-projects/Lucre
index 87d680baaa23..412b1ac4b263 160000
--- a/community-build/community-projects/Lucre
+++ b/community-build/community-projects/Lucre
@@ -1 +1 @@
-Subproject commit 87d680baaa2355de5b062adcbdfc5005e787521b
+Subproject commit 412b1ac4b2630b7e883822cca4ce0e6452a1bbfd
diff --git a/community-build/community-projects/Monocle b/community-build/community-projects/Monocle
new file mode 160000
index 000000000000..bc5781caf523
--- /dev/null
+++ b/community-build/community-projects/Monocle
@@ -0,0 +1 @@
+Subproject commit bc5781caf523eab7e2c0e92478cbbef568a1be43
diff --git a/community-build/community-projects/akka b/community-build/community-projects/akka
index 5b9496313ca7..be87625f490b 160000
--- a/community-build/community-projects/akka
+++ b/community-build/community-projects/akka
@@ -1 +1 @@
-Subproject commit 5b9496313ca7be34e2a8149d38f8b1ce7c6f6b01
+Subproject commit be87625f490b529e646c897aebb1d271646d899a
diff --git a/community-build/community-projects/cask b/community-build/community-projects/cask
index d9e3ec387ade..03b6a24ab597 160000
--- a/community-build/community-projects/cask
+++ b/community-build/community-projects/cask
@@ -1 +1 @@
-Subproject commit d9e3ec387ade7f462fe696d25c647e3192daf566
+Subproject commit 03b6a24ab59796ff8f7a3dc5f28041fce816aaf9
diff --git a/community-build/community-projects/cats b/community-build/community-projects/cats
index 2c27eb8b6fe5..878472d7bff4 160000
--- a/community-build/community-projects/cats
+++ b/community-build/community-projects/cats
@@ -1 +1 @@
-Subproject commit 2c27eb8b6fe567d5a7adcb8433646d6f718d3e94
+Subproject commit 878472d7bff4c3bfec8a265782c1e0d6a3147541
diff --git a/community-build/community-projects/cats-effect-2 b/community-build/community-projects/cats-effect-2
deleted file mode 160000
index f3d3bb3428fa..000000000000
--- a/community-build/community-projects/cats-effect-2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f3d3bb3428faa9b2495310dfd520844c37018042
diff --git a/community-build/community-projects/cats-effect-3 b/community-build/community-projects/cats-effect-3
index 04155e429e23..af11317d40ce 160000
--- a/community-build/community-projects/cats-effect-3
+++ b/community-build/community-projects/cats-effect-3
@@ -1 +1 @@
-Subproject commit 04155e429e230224e61235c4e4dd125419f82f7a
+Subproject commit af11317d40cee8979c4e40b60431bc0f3b9e03f0
diff --git a/community-build/community-projects/cats-effect-3-forward-compat b/community-build/community-projects/cats-effect-3-forward-compat
new file mode 160000
index 000000000000..af11317d40ce
--- /dev/null
+++ b/community-build/community-projects/cats-effect-3-forward-compat
@@ -0,0 +1 @@
+Subproject commit af11317d40cee8979c4e40b60431bc0f3b9e03f0
diff --git a/community-build/community-projects/cats-forward-compat b/community-build/community-projects/cats-forward-compat
new file mode 160000
index 000000000000..878472d7bff4
--- /dev/null
+++ b/community-build/community-projects/cats-forward-compat
@@ -0,0 +1 @@
+Subproject commit 878472d7bff4c3bfec8a265782c1e0d6a3147541
diff --git a/community-build/community-projects/cats-mtl b/community-build/community-projects/cats-mtl
index 1b0d1404f0eb..7679d606336a 160000
--- a/community-build/community-projects/cats-mtl
+++ b/community-build/community-projects/cats-mtl
@@ -1 +1 @@
-Subproject commit 1b0d1404f0eb104e72d4fd80c4ba285c9390fbc0
+Subproject commit 7679d606336a4da0e6dfca43c0a481db273cc10c
diff --git a/community-build/community-projects/cats-mtl-forward-compat b/community-build/community-projects/cats-mtl-forward-compat
new file mode 160000
index 000000000000..7679d606336a
--- /dev/null
+++ b/community-build/community-projects/cats-mtl-forward-compat
@@ -0,0 +1 @@
+Subproject commit 7679d606336a4da0e6dfca43c0a481db273cc10c
diff --git a/community-build/community-projects/coop b/community-build/community-projects/coop
index d3bcd3622dc3..4babee9613a4 160000
--- a/community-build/community-projects/coop
+++ b/community-build/community-projects/coop
@@ -1 +1 @@
-Subproject commit d3bcd3622dc3a1f3257e2d861d724c04ab634b81
+Subproject commit 4babee9613a4bc0713d195676dd169c4f636a31a
diff --git a/community-build/community-projects/coop-forward-compat b/community-build/community-projects/coop-forward-compat
new file mode 160000
index 000000000000..4babee9613a4
--- /dev/null
+++ b/community-build/community-projects/coop-forward-compat
@@ -0,0 +1 @@
+Subproject commit 4babee9613a4bc0713d195676dd169c4f636a31a
diff --git a/community-build/community-projects/discipline b/community-build/community-projects/discipline
index 4e3f9678c847..b0865da0c5e0 160000
--- a/community-build/community-projects/discipline
+++ b/community-build/community-projects/discipline
@@ -1 +1 @@
-Subproject commit 4e3f9678c84702b079209ae9928d9b6c884a7514
+Subproject commit b0865da0c5e016ad1d45060f52885219256d3205
diff --git a/community-build/community-projects/discipline-forward-compat b/community-build/community-projects/discipline-forward-compat
new file mode 160000
index 000000000000..b0865da0c5e0
--- /dev/null
+++ b/community-build/community-projects/discipline-forward-compat
@@ -0,0 +1 @@
+Subproject commit b0865da0c5e016ad1d45060f52885219256d3205
diff --git a/community-build/community-projects/discipline-munit b/community-build/community-projects/discipline-munit
index e0a3aee65b85..014f8ca26fef 160000
--- a/community-build/community-projects/discipline-munit
+++ b/community-build/community-projects/discipline-munit
@@ -1 +1 @@
-Subproject commit e0a3aee65b85bf8d6bb53037e4bc33ebfdeaedff
+Subproject commit 014f8ca26fefab7c32a2779b9d3382df14ccf860
diff --git a/community-build/community-projects/discipline-munit-forward-compat b/community-build/community-projects/discipline-munit-forward-compat
new file mode 160000
index 000000000000..014f8ca26fef
--- /dev/null
+++ b/community-build/community-projects/discipline-munit-forward-compat
@@ -0,0 +1 @@
+Subproject commit 014f8ca26fefab7c32a2779b9d3382df14ccf860
diff --git a/community-build/community-projects/discipline-specs2 b/community-build/community-projects/discipline-specs2
index b2fa931a44ee..3603b0874940 160000
--- a/community-build/community-projects/discipline-specs2
+++ b/community-build/community-projects/discipline-specs2
@@ -1 +1 @@
-Subproject commit b2fa931a44eeb6a6afa1343e57f963e73aafff59
+Subproject commit 3603b08749404f83946aab48203f8bd9f9410b49
diff --git a/community-build/community-projects/discipline-specs2-forward-compat b/community-build/community-projects/discipline-specs2-forward-compat
new file mode 160000
index 000000000000..3603b0874940
--- /dev/null
+++ b/community-build/community-projects/discipline-specs2-forward-compat
@@ -0,0 +1 @@
+Subproject commit 3603b08749404f83946aab48203f8bd9f9410b49
diff --git a/community-build/community-projects/dotty-cps-async b/community-build/community-projects/dotty-cps-async
index 614dc4a30557..b893454c4bbb 160000
--- a/community-build/community-projects/dotty-cps-async
+++ b/community-build/community-projects/dotty-cps-async
@@ -1 +1 @@
-Subproject commit 614dc4a30557bf7d282387d0c7efcdb59d97d76b
+Subproject commit b893454c4bbbcc25cb99c2db0ba5989f3e1d6478
diff --git a/community-build/community-projects/endpoints4s b/community-build/community-projects/endpoints4s
index 9433bf818e4a..3a667a3608ff 160000
--- a/community-build/community-projects/endpoints4s
+++ b/community-build/community-projects/endpoints4s
@@ -1 +1 @@
-Subproject commit 9433bf818e4ac06815017ec9344ce648bd52d82a
+Subproject commit 3a667a3608ff9950c24e9b2b5038c71c1690a21d
diff --git a/community-build/community-projects/fs2 b/community-build/community-projects/fs2
new file mode 160000
index 000000000000..bb69f51505d7
--- /dev/null
+++ b/community-build/community-projects/fs2
@@ -0,0 +1 @@
+Subproject commit bb69f51505d7871af318da56be5281f25fa6b5af
diff --git a/community-build/community-projects/izumi-reflect b/community-build/community-projects/izumi-reflect
index 54051d0bca92..540f08283069 160000
--- a/community-build/community-projects/izumi-reflect
+++ b/community-build/community-projects/izumi-reflect
@@ -1 +1 @@
-Subproject commit 54051d0bca921706ef0a3f9f63264f6f57d50ef0
+Subproject commit 540f08283069aefd8a81fec1f3493c70217b6099
diff --git a/community-build/community-projects/jackson-module-scala b/community-build/community-projects/jackson-module-scala
new file mode 160000
index 000000000000..13e3a34a46d6
--- /dev/null
+++ b/community-build/community-projects/jackson-module-scala
@@ -0,0 +1 @@
+Subproject commit 13e3a34a46d60dfcc0a787b46c73f2f3cd6cc379
diff --git a/community-build/community-projects/libretto b/community-build/community-projects/libretto
new file mode 160000
index 000000000000..d229f3ccb9c4
--- /dev/null
+++ b/community-build/community-projects/libretto
@@ -0,0 +1 @@
+Subproject commit d229f3ccb9c49aa3b0fef1b3f7425e986155cc97
diff --git a/community-build/community-projects/munit b/community-build/community-projects/munit
index 7006d9d3963c..662953cdb57f 160000
--- a/community-build/community-projects/munit
+++ b/community-build/community-projects/munit
@@ -1 +1 @@
-Subproject commit 7006d9d3963c0f1db5594e4a054a3531ee781c9a
+Subproject commit 662953cdb57fec0d8e1baa7fcd1ab178a0bba8c6
diff --git a/community-build/community-projects/munit-cats-effect b/community-build/community-projects/munit-cats-effect
new file mode 160000
index 000000000000..5a4ee90a625e
--- /dev/null
+++ b/community-build/community-projects/munit-cats-effect
@@ -0,0 +1 @@
+Subproject commit 5a4ee90a625e01c47421a17d1b093b2f27b9f2c5
diff --git a/community-build/community-projects/munit-forward-compat b/community-build/community-projects/munit-forward-compat
new file mode 160000
index 000000000000..662953cdb57f
--- /dev/null
+++ b/community-build/community-projects/munit-forward-compat
@@ -0,0 +1 @@
+Subproject commit 662953cdb57fec0d8e1baa7fcd1ab178a0bba8c6
diff --git a/community-build/community-projects/onnx-scala b/community-build/community-projects/onnx-scala
index ff0c47297fd2..3a5a45016d1a 160000
--- a/community-build/community-projects/onnx-scala
+++ b/community-build/community-projects/onnx-scala
@@ -1 +1 @@
-Subproject commit ff0c47297fd2885f8b56def3ea4fd22efdfe1e8b
+Subproject commit 3a5a45016d1a48d2a84dc3159d3e08c1ad5ac587
diff --git a/community-build/community-projects/protoquill b/community-build/community-projects/protoquill
index 524649385718..5f45b0048624 160000
--- a/community-build/community-projects/protoquill
+++ b/community-build/community-projects/protoquill
@@ -1 +1 @@
-Subproject commit 524649385718b3feed96cb4ac2725d5ee9ecf7ef
+Subproject commit 5f45b00486240c5dcffff563299b989e7169be30
diff --git a/community-build/community-projects/scala-java8-compat b/community-build/community-projects/scala-java8-compat
new file mode 160000
index 000000000000..57e1f7ccaa67
--- /dev/null
+++ b/community-build/community-projects/scala-java8-compat
@@ -0,0 +1 @@
+Subproject commit 57e1f7ccaa67dcac2b4227ab1a6ee0fcb5f42023
diff --git a/community-build/community-projects/scalacheck b/community-build/community-projects/scalacheck
index ad6b6f997a91..976db31cd549 160000
--- a/community-build/community-projects/scalacheck
+++ b/community-build/community-projects/scalacheck
@@ -1 +1 @@
-Subproject commit ad6b6f997a9189dc9abdb187440cad4de5c33720
+Subproject commit 976db31cd549328167a90ecc6f5f31efa83cd845
diff --git a/community-build/community-projects/scalacheck-effect b/community-build/community-projects/scalacheck-effect
new file mode 160000
index 000000000000..a275735caed7
--- /dev/null
+++ b/community-build/community-projects/scalacheck-effect
@@ -0,0 +1 @@
+Subproject commit a275735caed75eeb49b8ba1c4ef85d72ca6b61d8
diff --git a/community-build/community-projects/scalacheck-forward-compat b/community-build/community-projects/scalacheck-forward-compat
new file mode 160000
index 000000000000..976db31cd549
--- /dev/null
+++ b/community-build/community-projects/scalacheck-forward-compat
@@ -0,0 +1 @@
+Subproject commit 976db31cd549328167a90ecc6f5f31efa83cd845
diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest
index d3b7db9af036..75f5a3be6632 160000
--- a/community-build/community-projects/scalatest
+++ b/community-build/community-projects/scalatest
@@ -1 +1 @@
-Subproject commit d3b7db9af036829e417e6a08940d9e4e406cfbf2
+Subproject commit 75f5a3be66322f69ea624bbf5f166fbd28c5ff9e
diff --git a/community-build/community-projects/scalatestplus-junit b/community-build/community-projects/scalatestplus-junit
index 3857010185d9..dd047825a880 160000
--- a/community-build/community-projects/scalatestplus-junit
+++ b/community-build/community-projects/scalatestplus-junit
@@ -1 +1 @@
-Subproject commit 3857010185d95c3b5fece4800759436ceebdc0e7
+Subproject commit dd047825a880bb467d69833dca198a27c8e30f87
diff --git a/community-build/community-projects/scalatestplus-scalacheck b/community-build/community-projects/scalatestplus-scalacheck
index 010387f5854e..c9d4faeb8e1c 160000
--- a/community-build/community-projects/scalatestplus-scalacheck
+++ b/community-build/community-projects/scalatestplus-scalacheck
@@ -1 +1 @@
-Subproject commit 010387f5854eb473ddc71ecd2d6a0183dfebfbcb
+Subproject commit c9d4faeb8e1c815bd932fd67a5d2fe138a2bbda8
diff --git a/community-build/community-projects/scalatestplus-testng b/community-build/community-projects/scalatestplus-testng
new file mode 160000
index 000000000000..f7a439f1b207
--- /dev/null
+++ b/community-build/community-projects/scalatestplus-testng
@@ -0,0 +1 @@
+Subproject commit f7a439f1b2078b748bc904c5c774ad1205561e31
diff --git a/community-build/community-projects/scas b/community-build/community-projects/scas
index 650b72f7baeb..372a9255ba77 160000
--- a/community-build/community-projects/scas
+++ b/community-build/community-projects/scas
@@ -1 +1 @@
-Subproject commit 650b72f7baeb4443f16fe4e923901837f5d9ad98
+Subproject commit 372a9255ba77ffae0f9fec3880ffdece4940d4ca
diff --git a/community-build/community-projects/scodec b/community-build/community-projects/scodec
index 84db5f776573..d59c0440b078 160000
--- a/community-build/community-projects/scodec
+++ b/community-build/community-projects/scodec
@@ -1 +1 @@
-Subproject commit 84db5f7765738024aebd8df2bf53151cc6d4d793
+Subproject commit d59c0440b078292dedff10b6743d6a086f468527
diff --git a/community-build/community-projects/scodec-bits b/community-build/community-projects/scodec-bits
index 85de35c014b9..d513312fbfc9 160000
--- a/community-build/community-projects/scodec-bits
+++ b/community-build/community-projects/scodec-bits
@@ -1 +1 @@
-Subproject commit 85de35c014b948f0dd3f94e975c42d17deab4055
+Subproject commit d513312fbfc9fd54d0d3cde914b37e7755f7f6f4
diff --git a/community-build/community-projects/shapeless b/community-build/community-projects/shapeless
index 94c1d4413373..e58dd710b5c4 160000
--- a/community-build/community-projects/shapeless
+++ b/community-build/community-projects/shapeless
@@ -1 +1 @@
-Subproject commit 94c1d44133739c7c57b64228caccc4fc938c2862
+Subproject commit e58dd710b5c46d54336242a7ba4bab90d440d4f8
diff --git a/community-build/community-projects/simulacrum-scalafix b/community-build/community-projects/simulacrum-scalafix
index 75f7e10d30fb..2515271c46ad 160000
--- a/community-build/community-projects/simulacrum-scalafix
+++ b/community-build/community-projects/simulacrum-scalafix
@@ -1 +1 @@
-Subproject commit 75f7e10d30fb1b848b7adaf2a026320ee548b56a
+Subproject commit 2515271c46ad46512a43d20e1e8ae0793433cf0b
diff --git a/community-build/community-projects/simulacrum-scalafix-forward-compat b/community-build/community-projects/simulacrum-scalafix-forward-compat
new file mode 160000
index 000000000000..2515271c46ad
--- /dev/null
+++ b/community-build/community-projects/simulacrum-scalafix-forward-compat
@@ -0,0 +1 @@
+Subproject commit 2515271c46ad46512a43d20e1e8ae0793433cf0b
diff --git a/community-build/community-projects/specs2 b/community-build/community-projects/specs2
new file mode 160000
index 000000000000..0652daeefb57
--- /dev/null
+++ b/community-build/community-projects/specs2
@@ -0,0 +1 @@
+Subproject commit 0652daeefb57c2d51e3f16ea5c44929bdba722bf
diff --git a/community-build/community-projects/spire b/community-build/community-projects/spire
new file mode 160000
index 000000000000..c98b32c6844f
--- /dev/null
+++ b/community-build/community-projects/spire
@@ -0,0 +1 @@
+Subproject commit c98b32c6844f501491ab3a22d6f5be50b9b80c8d
diff --git a/community-build/community-projects/stdLib213 b/community-build/community-projects/stdLib213
index 891f92f01cfb..2c742834cf16 160000
--- a/community-build/community-projects/stdLib213
+++ b/community-build/community-projects/stdLib213
@@ -1 +1 @@
-Subproject commit 891f92f01cfbc900a1a1efada73530246babd075
+Subproject commit 2c742834cf162ab89e914bbc0a8b975874a2c3c2
diff --git a/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala b/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala
new file mode 100644
index 000000000000..3d52a3ff0631
--- /dev/null
+++ b/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala
@@ -0,0 +1,92 @@
+package dotty.communitybuild
+
+import java.nio.file._
+import java.io.{PrintWriter, File}
+import java.nio.charset.StandardCharsets.UTF_8
+
+object CommunityBuildRunner:
+
+  /** Depending on the mode of operation, either
+   *  runs the test or updates the project. Updating
+   *  means that all the dependencies are fetched but
+   *  minimal other extra other work is done. Updating
+   *  is necessary since we run tests each time on a fresh
+   *  Docker container. We run the update on Docker container
+   *  creation time to create the cache of the dependencies
+   *  and avoid network overhead. See https://github.com/lampepfl/dotty-drone
+   *  for more infrastructural details.
+   */
+  extension (self: CommunityProject) def run()(using suite: CommunityBuildRunner): Unit =
+    if self.requiresExperimental && !self.compilerSupportExperimental then
+      log(s"Skipping ${self.project} - it needs experimental features unsupported in this build.")
+      return
+    self.dependencies().foreach(_.publish())
+    self.testOnlyDependencies().foreach(_.publish())
+    suite.runProject(self)
+
+trait CommunityBuildRunner:
+
+  /** fails the current operation, can be specialised in a concrete Runner
+   *  - overridden in `CommunityBuildTest`
+   */
+  def failWith(msg: String): Nothing = throw IllegalStateException(msg)
+
+  /** Build the given project with the published local compiler and sbt plugin.
+   *
+   *  This test reads the compiler version from community-build/dotty-bootstrapped.version
+   *  and expects community-build/sbt-dotty-sbt to set the compiler plugin.
+   *
+   *  @param project    The project name, should be a git submodule in community-build/
+   *  @param command    The binary file of the program used to test the project – usually
+   *                    a build tool like SBT or Mill
+   *  @param arguments  Arguments to pass to the testing program
+   */
+  def runProject(projectDef: CommunityProject): Unit =
+    val project = projectDef.project
+    val command = projectDef.binaryName
+    val arguments = projectDef.buildCommands
+    val compilerVersion = projectDef.compilerVersion
+
+    @annotation.tailrec
+    def execTimes(task: () => Int, timesToRerun: Int): Boolean =
+      val exitCode = task()
+      if exitCode == 0
+      then true
+      else if timesToRerun == 0
+        then false
+        else
+          log(s"Rerunning tests in $project because of a previous run failure.")
+          execTimes(task, timesToRerun - 1)
+
+    log(s"Building $project with dotty-bootstrapped $compilerVersion...")
+
+    val projectDir = communitybuildDir.resolve("community-projects").resolve(project)
+
+    if !Files.exists(projectDir.resolve(".git")) then
+      failWith(s"""
+        |
+        |Missing $project submodule. You can initialize this module using
+        |
+        |    git submodule update --init community-build/community-projects/$project
+        |
+        |""".stripMargin)
+
+    val testsCompletedSuccessfully = execTimes(projectDef.build, 3)
+
+    if !testsCompletedSuccessfully then
+      failWith(s"""
+          |
+          |$command exited with an error code. To reproduce without JUnit, use:
+          |
+          |    sbt community-build/prepareCommunityBuild
+          |    cd community-build/community-projects/$project
+          |    $command ${arguments.init.mkString(" ")} "${arguments.last}"
+          |
+          |For a faster feedback loop on SBT projects, one can try to extract a direct call to dotc
+          |using the sbt export command. For instance, for scalacheck, use
+          |    sbt export jvm/test:compileIncremental
+          |
+          |""".stripMargin)
+  end runProject
+
+end CommunityBuildRunner
diff --git a/community-build/src/scala/dotty/communitybuild/Main.scala b/community-build/src/scala/dotty/communitybuild/Main.scala
index d135de12bdb0..7c3a39261eb0 100644
--- a/community-build/src/scala/dotty/communitybuild/Main.scala
+++ b/community-build/src/scala/dotty/communitybuild/Main.scala
@@ -5,6 +5,7 @@ import java.nio.file.Path
 import java.nio.file.Files
 import scala.sys.process._
 
+import CommunityBuildRunner.run
 
 object Main:
 
@@ -56,7 +57,7 @@ object Main:
         val (toRun, ignored) =
           allProjects.partition( p =>
             p.docCommand != null
-            && (!p.requiresExperimental || compilerSupportExperimental)
+            && (!p.requiresExperimental || p.compilerSupportExperimental)
           )
 
         val paths = toRun.map { project =>
@@ -106,12 +107,15 @@ object Main:
           println(s"Documentation not found for ${failed.mkString(", ")}")
           sys.exit(1)
 
+      case "run" :: names if names.nonEmpty =>
+        given CommunityBuildRunner()
+        withProjects(names, "Running")(_.run())
+
       case args =>
         println("USAGE: <COMMAND> <PROJECT NAME>")
-        println("COMMAND is one of: publish doc run")
+        println("COMMAND is one of: publish, build, doc, doc all, run")
         println("Available projects are:")
         allProjects.foreach { k =>
           println(s"\t${k.project}")
         }
         sys.exit(1)
-
diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala
index cc792159b104..1a23ccba2170 100644
--- a/community-build/src/scala/dotty/communitybuild/projects.scala
+++ b/community-build/src/scala/dotty/communitybuild/projects.scala
@@ -6,13 +6,10 @@ import java.nio.charset.StandardCharsets.UTF_8
 
 lazy val communitybuildDir: Path = Paths.get(sys.props("user.dir"))
 
-lazy val compilerVersion: String =
+lazy val testedCompilerVersion: String =
   val file = communitybuildDir.resolve("scala3-bootstrapped.version")
   new String(Files.readAllBytes(file), UTF_8)
 
-lazy val compilerSupportExperimental: Boolean =
-  compilerVersion.contains("SNAPSHOT") || compilerVersion.contains("NIGHTLY")
-
 lazy val sbtPluginFilePath: String =
   // Workaround for https://github.com/sbt/sbt/issues/4395
   new File(sys.props("user.home") + "/.sbt/1.0/plugins").mkdirs()
@@ -39,16 +36,21 @@ sealed trait CommunityProject:
   val testCommand: String
   val publishCommand: String
   val docCommand: String
-  val dependencies: List[CommunityProject]
+  val dependencies: () => List[CommunityProject]
+  val testOnlyDependencies: () => List[CommunityProject]
   val binaryName: String
   val runCommandsArgs: List[String] = Nil
   val requiresExperimental: Boolean
   val environment: Map[String, String] = Map.empty
+  val compilerVersion: String
 
   final val projectDir = communitybuildDir.resolve("community-projects").resolve(project)
 
+  final val compilerSupportExperimental: Boolean =
+    compilerVersion.contains("SNAPSHOT") || compilerVersion.contains("NIGHTLY")
+
   final def publishDependencies(): Unit =
-    dependencies.foreach(_.publish())
+    dependencies().foreach(_.publish())
 
   /** Publish this project to the local Maven repository */
   final def publish(): Unit =
@@ -86,9 +88,11 @@ end CommunityProject
 final case class MillCommunityProject(
     project: String,
     baseCommand: String,
-    dependencies: List[CommunityProject] = Nil,
+    dependencies: () => List[CommunityProject] = () => Nil,
+    testOnlyDependencies: () => List[CommunityProject] = () => Nil,
     ignoreDocs: Boolean = false,
     requiresExperimental: Boolean = false,
+    compilerVersion: String = testedCompilerVersion
     ) extends CommunityProject:
   override val binaryName: String = "./mill"
   override val testCommand = s"$baseCommand.test"
@@ -103,11 +107,14 @@ final case class SbtCommunityProject(
     project: String,
     sbtTestCommand: String,
     extraSbtArgs: List[String] = Nil,
-    dependencies: List[CommunityProject] = Nil,
+    dependencies: () => List[CommunityProject] = () => Nil,
+    testOnlyDependencies: () => List[CommunityProject] = () => Nil,
     sbtPublishCommand: String = null,
     sbtDocCommand: String = null,
     scalacOptions: List[String] = SbtCommunityProject.scalacOptions,
     requiresExperimental: Boolean = false,
+    compilerVersion: String = testedCompilerVersion,
+    isForwardCompatProject: Boolean = false
   ) extends CommunityProject:
   override val binaryName: String = "sbt"
 
@@ -116,6 +123,7 @@ final case class SbtCommunityProject(
 
   private val baseCommand =
     "clean; set Global/logLevel := Level.Error; set Global/updateOptions ~= (_.withLatestSnapshots(false)); "
+    ++ (if isForwardCompatProject then "set Global / isForwardCompatProject := true; " else "")
     ++ (if scalacOptions.isEmpty then "" else s"""set Global/scalacOptions ++= $scalacOptionsString;""")
     ++ s"++$compilerVersion!; "
 
@@ -137,12 +145,25 @@ final case class SbtCommunityProject(
       case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome")
       case _ => Nil
     extraSbtArgs ++ sbtProps ++ List(
-      "-sbt-version", "1.5.0",
+      "-sbt-version", "1.6.1",
       "-Dsbt.supershell=false",
       s"-Ddotty.communitybuild.dir=$communitybuildDir",
       s"--addPluginSbtFile=$sbtPluginFilePath"
     )
 
+  def forwardCompat: SbtCommunityProject =
+    this.copy(
+      project = project + "-forward-compat",
+      dependencies = () => dependencies().map(forwardCompatMapping),
+      testOnlyDependencies = () => testOnlyDependencies().map(forwardCompatMapping),
+      isForwardCompatProject = true
+    )
+
+  def withScalaRelease(release: String): SbtCommunityProject =
+    this.copy(
+      scalacOptions = scalacOptions ++ Seq("-Yscala-release", release)
+    )
+
 object SbtCommunityProject:
   def scalacOptions = List(
     "-Xcheck-macros",
@@ -163,89 +184,89 @@ object projects:
 
   lazy val utest = MillCommunityProject(
     project = "utest",
-    baseCommand = s"utest.jvm[$compilerVersion]",
+    baseCommand = s"utest.jvm[$testedCompilerVersion]",
     ignoreDocs = true
   )
 
   lazy val sourcecode = MillCommunityProject(
     project = "sourcecode",
-    baseCommand = s"sourcecode.jvm[$compilerVersion]",
+    baseCommand = s"sourcecode.jvm[$testedCompilerVersion]",
     ignoreDocs = true
   )
 
   lazy val oslib = MillCommunityProject(
     project = "os-lib",
-    baseCommand = s"os.jvm[$compilerVersion]",
-    dependencies = List(utest, sourcecode)
+    baseCommand = s"os.jvm[$testedCompilerVersion]",
+    dependencies = () => List(utest, sourcecode)
   )
 
   lazy val oslibWatch = MillCommunityProject(
     project = "os-lib",
-    baseCommand = s"os.watch[$compilerVersion]",
-    dependencies = List(utest, sourcecode),
+    baseCommand = s"os.watch[$testedCompilerVersion]",
+    dependencies = () => List(utest, sourcecode),
     ignoreDocs = true
   )
 
   lazy val ujson = MillCommunityProject(
     project = "upickle",
-    baseCommand = s"ujson.jvm[$compilerVersion]",
-    dependencies = List(geny)
+    baseCommand = s"ujson.jvm[$testedCompilerVersion]",
+    dependencies = () => List(geny)
   )
 
   lazy val upickle = MillCommunityProject(
     project = "upickle",
-    baseCommand = s"upickle.jvm[$compilerVersion]",
-    dependencies = List(geny, utest)
+    baseCommand = s"upickle.jvm[$testedCompilerVersion]",
+    dependencies = () => List(geny, utest)
   )
 
   lazy val upickleCore = MillCommunityProject(
     project = "upickle",
-    baseCommand = s"core.jvm[$compilerVersion]",
-    dependencies = List(geny, utest)
+    baseCommand = s"core.jvm[$testedCompilerVersion]",
+    dependencies = () => List(geny, utest)
   )
 
   lazy val upickleImplicits = MillCommunityProject(
     project = "upickle",
-    baseCommand = s"implicits.jvm[$compilerVersion]",
-    dependencies = List(upickleCore, ujson)
+    baseCommand = s"implicits.jvm[$testedCompilerVersion]",
+    dependencies = () => List(upickleCore, ujson)
   )
 
   lazy val upack = MillCommunityProject(
     project = "upickle",
-    baseCommand = s"upack.jvm[$compilerVersion]",
-    dependencies = List(ujson, upickleCore)
+    baseCommand = s"upack.jvm[$testedCompilerVersion]",
+    dependencies = () => List(ujson, upickleCore)
   )
 
   lazy val geny = MillCommunityProject(
     project = "geny",
-    baseCommand = s"geny.jvm[$compilerVersion]",
-    dependencies = List(utest)
+    baseCommand = s"geny.jvm[$testedCompilerVersion]",
+    dependencies = () => List(utest)
   )
 
   lazy val fansi = MillCommunityProject(
     project = "fansi",
-    baseCommand = s"fansi.jvm[$compilerVersion]",
-    dependencies = List(utest, sourcecode),
+    baseCommand = s"fansi.jvm[$testedCompilerVersion]",
+    dependencies = () => List(utest, sourcecode),
     ignoreDocs = true
   )
 
   lazy val pprint = MillCommunityProject(
     project = "PPrint",
-    baseCommand = s"pprint.jvm[$compilerVersion]",
-    dependencies = List(fansi),
+    baseCommand = s"pprint.jvm[$testedCompilerVersion]",
+    dependencies = () => List(fansi),
     ignoreDocs = true
   )
 
   lazy val requests = MillCommunityProject(
     project = "requests-scala",
-    baseCommand = s"requests[$compilerVersion]",
-    dependencies = List(geny, utest, ujson, upickleCore)
+    baseCommand = s"requests[$testedCompilerVersion]",
+    dependencies = () => List(geny, utest, ujson, upickleCore)
   )
 
   lazy val cask = MillCommunityProject(
     project = "cask",
-    baseCommand = s"cask[$compilerVersion]",
-    dependencies = List(utest, geny, sourcecode, pprint, upickle, upickleImplicits, upack, requests)
+    baseCommand = s"cask[$testedCompilerVersion]",
+    dependencies = () => List(utest, geny, sourcecode, pprint, upickle, upickleImplicits, upack, requests)
   )
 
   lazy val scas = MillCommunityProject(
@@ -273,15 +294,31 @@ object projects:
     sbtDocCommand = forceDoc("jvm")
   )
 
-  lazy val scalatest = SbtCommunityProject(
+  lazy val scalacheckForwardCompat = scalacheck.forwardCompat.withScalaRelease("3.0")
+
+  lazy val scalatest: SbtCommunityProject = SbtCommunityProject(
     project       = "scalatest",
-    sbtTestCommand   = "scalacticDotty/clean;scalacticTestDotty/test; scalatestTestDotty/test",
-    sbtPublishCommand = "scalacticDotty/publishLocal; scalatestDotty/publishLocal",
-    sbtDocCommand = ";scalacticDotty/doc" // fails with missing type ;scalatestDotty/doc"
+    sbtTestCommand   =
+      List(
+        "scalacticDotty/clean; scalacticDottyJS/clean",
+
+        // Some scalatest's tests are flaky (https://github.com/scalatest/scalatest/issues/2049)
+        // so we disable them, this list is based on the one used in the Scala 2 community build
+        // (https://github.com/scala/community-build/blob/2.13.x/proj/scalatest.conf).
+        """set scalatestTest / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "GeneratorSpec.scala" || "FrameworkSuite.scala" || "WaitersSpec.scala" || "TestSortingReporterSpec.scala" || "JavaFuturesSpec.scala" || "ParallelTestExecutionSpec.scala" || "TimeLimitsSpec.scala" || "TestThreadsStartingCounterSpec.scala" || "SuiteSortingReporterSpec.scala" || "CommonGeneratorsSpec.scala" || "PropCheckerAssertingSpec.scala" || "ConductorMethodsSuite.scala"""",
+        """set scalacticTest / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "NonEmptyArraySpec.scala"""",
+        """set genRegularTests4 / Test / managedSources ~= (_.filterNot(_.getName == "FrameworkSuite.scala").filterNot(_.getName == "GeneratorSpec.scala").filterNot(_.getName == "CommonGeneratorsSpec.scala").filterNot(_.getName == "ParallelTestExecutionSpec.scala").filterNot(_.getName == "DispatchReporterSpec.scala").filterNot(_.getName == "TestThreadsStartingCounterSpec.scala").filterNot(_.getName == "EventuallySpec.scala"))""",
+
+        "scalacticTestDotty/test; scalatestTestDotty/test; scalacticDottyJS/compile; scalatestDottyJS/compile"
+      ).mkString("; "),
+    sbtPublishCommand = "scalacticDotty/publishLocal; scalatestDotty/publishLocal; scalacticDottyJS/publishLocal; scalatestDottyJS/publishLocal",
+    sbtDocCommand = ";scalacticDotty/doc", // fails with missing type ;scalatestDotty/doc"
     // cannot take signature of (test: org.scalatest.concurrent.ConductorFixture#OneArgTest):
     // org.scalatest.Outcome
     // Problem parsing scalatest.dotty/target/scala-3.0.0-M2/src_managed/main/org/scalatest/concurrent/ConductorFixture.scala:[602..624..3843], documentation may not be generated.
     // dotty.tools.dotc.core.MissingType:
+    dependencies = () => List(scalaXml),
+    testOnlyDependencies = () => List(scalatestplusJunit, scalatestplusTestNG)
   )
 
   lazy val scalatestplusScalacheck = SbtCommunityProject(
@@ -289,19 +326,27 @@ object projects:
     sbtTestCommand = "scalatestPlusScalaCheckJVM/test",
     sbtPublishCommand = "scalatestPlusScalaCheckJVM/publishLocal",
     sbtDocCommand = "scalatestPlusScalaCheckJVM/doc",
-    dependencies = List(scalatest, scalacheck)
+    dependencies = () => List(scalatest, scalacheck)
   )
 
   lazy val scalatestplusJunit = SbtCommunityProject(
     project           = "scalatestplus-junit",
     sbtTestCommand    = "scalatestplus-junit/test",
     sbtPublishCommand = "scalatestplus-junit/publishLocal",
-    dependencies      = List(scalatest)
+    dependencies      = () => List(scalatest)
+  )
+
+  lazy val scalatestplusTestNG = SbtCommunityProject(
+    project = "scalatestplus-testng",
+    sbtTestCommand = "test",
+    sbtPublishCommand = "publishLocal",
+    dependencies = () => List(scalatest)
   )
 
   lazy val scalaXml = SbtCommunityProject(
     project       = "scala-xml",
-    sbtTestCommand   = "xml/test",
+    sbtTestCommand = "xml/test",
+    sbtPublishCommand = "xml/publishLocal",
     sbtDocCommand = "xml/doc"
   )
 
@@ -331,7 +376,7 @@ object projects:
     project       = "minitest",
     sbtTestCommand   = "test",
     sbtDocCommand = aggregateDoc("lawsJVM")("minitestJVM"),
-    dependencies = List(scalacheck)
+    dependencies = () => List(scalacheck)
   )
 
   lazy val fastparse = SbtCommunityProject(
@@ -344,8 +389,8 @@ object projects:
   lazy val stdLib213 = SbtCommunityProject(
     project       = "stdLib213",
     extraSbtArgs  = List("-Dscala.build.compileWithDotty=true"),
-    sbtTestCommand   = """library/compile""",
-    sbtPublishCommand = """set library/Compile/packageDoc/publishArtifact := false; library/publishLocal""",
+    sbtTestCommand   = """set Global / fatalWarnings := false; library/compile""",
+    sbtPublishCommand = """set Global / fatalWarnings := false; set library/Compile/packageDoc/publishArtifact := false; library/publishLocal""",
     // sbtDocCommand = "library/doc" // Does no compile? No idea :/
   )
 
@@ -389,14 +434,14 @@ object projects:
     project       = "sconfig",
     sbtTestCommand   = "sconfigJVM/test",
     sbtDocCommand = "sconfigJVM/doc",
-    dependencies = List(scalaCollectionCompat)
+    dependencies = () => List(scalaCollectionCompat)
   )
 
   lazy val zio = SbtCommunityProject(
     project = "zio",
     sbtTestCommand = "testJVMDotty",
     sbtDocCommand = forceDoc("coreJVM"),
-    dependencies = List(izumiReflect)
+    dependencies = () => List(izumiReflect)
   )
 
   lazy val munit = SbtCommunityProject(
@@ -404,16 +449,17 @@ object projects:
     sbtTestCommand  = "testsJVM/test;testsJS/test;",
     sbtPublishCommand = "munitJVM/publishLocal; munitJS/publishLocal; munitScalacheckJVM/publishLocal; munitScalacheckJS/publishLocal; junit/publishLocal",
     sbtDocCommand   = "junit/doc; munitJVM/doc",
-    dependencies = List(scalacheck)
+    dependencies = () => List(scalacheck)
   )
 
+  lazy val munitForwardCompat = munit.forwardCompat.withScalaRelease("3.0")
+
   lazy val scodecBits = SbtCommunityProject(
     project          = "scodec-bits",
     sbtTestCommand   = "coreJVM/test;coreJS/test",
     sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
     sbtDocCommand   = "coreJVM/doc",
-    dependencies = List(munit),
-    requiresExperimental = true,
+    dependencies = () => List(munit),
   )
 
   lazy val scodec = SbtCommunityProject(
@@ -421,8 +467,7 @@ object projects:
     sbtTestCommand   = "unitTests/test",
     // Adds <empty> package
     sbtDocCommand   = "coreJVM/doc",
-    dependencies = List(munit, scodecBits),
-    requiresExperimental = true,
+    dependencies = () => List(munit, scodecBits),
   )
 
   lazy val scalaParserCombinators = SbtCommunityProject(
@@ -455,7 +500,7 @@ object projects:
     // [error] class scalaz.iteratee.Iteratee cannot be unpickled because no class file was found
 
     sbtDocCommand = forceDoc("effectJVM"),
-    dependencies     = List(scalacheck)
+    dependencies  = () => List(scalacheck)
   )
 
   lazy val endpoints4s = SbtCommunityProject(
@@ -464,25 +509,21 @@ object projects:
     sbtDocCommand = ";json-schemaJVM/doc ;algebraJVM/doc; openapiJVM/doc; http4s-server/doc ;http4s-client/doc ;play-server/doc ;play-client/doc ;akka-http-server/doc ;akka-http-client/doc",
   )
 
-  lazy val catsEffect2 = SbtCommunityProject(
-    project        = "cats-effect-2",
-    sbtTestCommand = "test",
-    sbtDocCommand  = ";coreJVM/doc ;lawsJVM/doc",
-    dependencies   = List(cats, disciplineMunit)
-  )
-
   lazy val catsEffect3 = SbtCommunityProject(
     project        = "cats-effect-3",
     sbtTestCommand = "test",
+    sbtPublishCommand = "publishLocal",
     sbtDocCommand  = ";coreJVM/doc ;lawsJVM/doc ;kernelJVM/doc",
-    dependencies   = List(cats, coop, disciplineSpecs2, scalacheck)
+    dependencies   = () => List(cats, coop, disciplineSpecs2, scalacheck)
   )
 
+  lazy val catsEffect3ForwardCompat = catsEffect3.forwardCompat.copy(compilerVersion = "3.0.2")
+
   lazy val scalaParallelCollections = SbtCommunityProject(
     project        = "scala-parallel-collections",
     sbtTestCommand = "test",
     sbtDocCommand  = forceDoc("core"),
-    dependencies   = List(scalacheck)
+    dependencies   = () => List(scalacheck)
   )
 
   lazy val scalaCollectionCompat = SbtCommunityProject(
@@ -491,6 +532,14 @@ object projects:
     sbtPublishCommand = "compat30/publishLocal",
   )
 
+  lazy val scalaJava8Compat = SbtCommunityProject(
+    project        = "scala-java8-compat",
+    // the fnGen subproject must be built with 2.12.x
+    sbtTestCommand = s"++2.12.14; ++$testedCompilerVersion; set fnGen/dependencyOverrides := Nil; test",
+    sbtPublishCommand = s"++2.12.14; ++$testedCompilerVersion; set fnGen/dependencyOverrides := Nil; publishLocal",
+    scalacOptions = Nil // avoid passing Scala 3 options to Scala 2.12 in fnGen subproject
+  )
+
   lazy val verify = SbtCommunityProject(
     project        = "verify",
     sbtTestCommand = "verifyJVM/test",
@@ -502,67 +551,81 @@ object projects:
     project = "discipline",
     sbtTestCommand = "coreJVM/test;coreJS/test",
     sbtPublishCommand = "set every credentials := Nil;coreJVM/publishLocal;coreJS/publishLocal",
-    dependencies = List(scalacheck)
+    dependencies = () => List(scalacheck)
   )
 
+  lazy val disciplineForwardCompat = discipline.forwardCompat.withScalaRelease("3.0")
+
   lazy val disciplineMunit = SbtCommunityProject(
     project = "discipline-munit",
-    sbtTestCommand = "test",
+    sbtTestCommand = "coreJVM/test;coreJS/test",
     sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
-    dependencies = List(discipline, munit)
+    dependencies = () => List(discipline, munit)
   )
 
+  lazy val disciplineMunitForwardCompat = disciplineMunit.forwardCompat.withScalaRelease("3.0")
+
   lazy val disciplineSpecs2 = SbtCommunityProject(
     project = "discipline-specs2",
     sbtTestCommand = "test",
     sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
-    dependencies = List(discipline),
+    dependencies = () => List(discipline),
     scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init")
   )
 
+  lazy val disciplineSpecs2ForwardCompat = disciplineSpecs2.forwardCompat.withScalaRelease("3.0")
+
   lazy val simulacrumScalafixAnnotations = SbtCommunityProject(
     project = "simulacrum-scalafix",
     sbtTestCommand = "annotation/test:compile;annotationJS/test:compile",
     sbtPublishCommand = "annotation/publishLocal;annotationJS/publishLocal",
   )
 
+  lazy val simulacrumScalafixAnnotationsForwardCompat = simulacrumScalafixAnnotations.forwardCompat.withScalaRelease("3.0")
+
   lazy val cats = SbtCommunityProject(
     project = "cats",
     sbtTestCommand = "set Global/scalaJSStage := FastOptStage;buildJVM;validateAllJS",
     sbtPublishCommand = "catsJVM/publishLocal;catsJS/publishLocal",
-    dependencies = List(discipline, disciplineMunit, scalacheck, simulacrumScalafixAnnotations),
+    dependencies = () => List(discipline, disciplineMunit, scalacheck, simulacrumScalafixAnnotations),
     scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init") // disable -Ysafe-init, due to -Xfatal-warning
 
   )
 
+  lazy val catsForwardCompat = cats.forwardCompat.withScalaRelease("3.0")
+
   lazy val catsMtl = SbtCommunityProject(
     project = "cats-mtl",
     sbtTestCommand = "testsJVM/test;testsJS/test",
     sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal;lawsJVM/publishLocal;lawsJS/publishLocal",
-    dependencies = List(cats, disciplineMunit)
+    dependencies = () => List(cats, disciplineMunit)
   )
 
+  lazy val catsMtlForwardCompat = catsMtl.forwardCompat.copy(compilerVersion = "3.0.2")
+
   lazy val coop = SbtCommunityProject(
     project = "coop",
     sbtTestCommand = "test",
     sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
-    dependencies = List(cats, catsMtl)
+    dependencies = () => List(cats, catsMtl)
   )
 
+  lazy val coopForwardCompat = coop.forwardCompat.withScalaRelease("3.0")
+
   // 'Sciss/Lucre' with its dependencies:
 
   lazy val scissEqual = SbtCommunityProject(
     project           = "Equal",
     sbtTestCommand    = "rootJVM/test",
     sbtPublishCommand = "rootJVM/publishLocal",
-    dependencies      = List(scalatest),
+    dependencies      = () => List(scalatest),
   )
 
   lazy val scissFingerTree = SbtCommunityProject(
     project           = "FingerTree",
     sbtTestCommand    = "rootJVM/test",
     sbtPublishCommand = "rootJVM/publishLocal",
-    dependencies      = List(scalatest),
+    dependencies      = () => List(scalatest),
   )
 
   lazy val scissLog = SbtCommunityProject(
@@ -575,42 +638,42 @@ object projects:
     project           = "Model",
     sbtTestCommand    = "rootJVM/test",
     sbtPublishCommand = "rootJVM/publishLocal",
-    dependencies      = List(scalatest),
+    dependencies      = () => List(scalatest),
   )
 
   lazy val scissNumbers = SbtCommunityProject(
     project           = "Numbers",
     sbtTestCommand    = "rootJVM/test",
     sbtPublishCommand = "rootJVM/publishLocal",
-    dependencies      = List(scalatest),
+    dependencies      = () => List(scalatest),
   )
 
   lazy val scissSerial = SbtCommunityProject(
     project           = "Serial",
     sbtTestCommand    = "rootJVM/test",
     sbtPublishCommand = "rootJVM/publishLocal",
-    dependencies      = List(scalatest),
+    dependencies      = () => List(scalatest),
   )
 
   lazy val scissAsyncFile = SbtCommunityProject(
     project           = "AsyncFile",
     sbtTestCommand    = "rootJVM/test",
     sbtPublishCommand = "rootJVM/publishLocal",
-    dependencies      = List(scissLog, scalatest),
+    dependencies      = () => List(scissLog, scalatest),
   )
 
   lazy val scissSpan = SbtCommunityProject(
     project           = "Span",
     sbtTestCommand    = "rootJVM/test",
     sbtPublishCommand = "rootJVM/publishLocal",
-    dependencies      = List(scissSerial, scalatest),
+    dependencies      = () => List(scissSerial, scalatest),
   )
 
   lazy val scalaSTM = SbtCommunityProject(
     project           = "scala-stm",
     sbtTestCommand    = "rootJVM/test",
     sbtPublishCommand = "rootJVM/publishLocal",
-    dependencies      = List(scalatestplusJunit),
+    dependencies      = () => List(scalatestplusJunit),
   )
 
   lazy val scissLucre = SbtCommunityProject(
@@ -618,14 +681,14 @@ object projects:
     sbtTestCommand    = "adjunctJVM/test;baseJVM/test;confluentJVM/test;coreJVM/test;dataJVM/test;expr0JVM/test;expr1JVM/test;exprJVM/test;geomJVM/test;lucre-bdb/test;testsJVM/test",
     extraSbtArgs      = List("-Dde.sciss.lucre.ShortTests=true"),
     sbtPublishCommand = "adjunctJVM/publishLocal;baseJVM/publishLocal;confluentJVM/publishLocal;coreJVM/publishLocal;dataJVM/publishLocal;expr0JVM/publishLocal;expr1JVM/publishLocal;exprJVM/publishLocal;geomJVM/publishLocal;lucre-bdb/publishLocal",
-    dependencies      = List(scalaSTM, scissAsyncFile, scissEqual, scissFingerTree, scissLog, scissModel, scissNumbers, scissSerial, scissSpan, scalatest),
+    dependencies      = () => List(scalaSTM, scissAsyncFile, scissEqual, scissFingerTree, scissLog, scissModel, scissNumbers, scissSerial, scissSpan, scalatest),
   )
 
   lazy val izumiReflect = SbtCommunityProject(
     project = "izumi-reflect",
     sbtTestCommand = "test",
     sbtPublishCommand = "publishLocal",
-    dependencies = List(scalatest)
+    dependencies = () => List(scalatest)
   )
 
   lazy val perspective = SbtCommunityProject(
@@ -633,21 +696,28 @@ object projects:
     // No library with easy typeclasses to verify data against exist for Dotty, so no tests yet
     // Until then I guess this mainly serves to check that it still compiles at all
     sbtTestCommand = "dottyPerspectiveExamples/compile",
-    dependencies = List(cats)
+    dependencies = () => List(cats)
   )
 
   lazy val akka = SbtCommunityProject(
     project = "akka",
-    extraSbtArgs = List(s"-Dakka.build.scalaVersion=$compilerVersion"),
+    extraSbtArgs = List(s"-Dakka.build.scalaVersion=$testedCompilerVersion"),
     sbtTestCommand = "set every targetSystemJdk := true; akka-actor-tests/Test/compile",
-    dependencies = List(scalatest, scalatestplusJunit, scalatestplusScalacheck)
+    dependencies = () => List(scalatest, scalatestplusJunit, scalatestplusScalacheck)
+  )
+
+  lazy val monocle = SbtCommunityProject(
+    project = "Monocle",
+    sbtTestCommand = "coreJVM/test; macrosJVM/test; testJVM/test",
+    dependencies = () => List(cats, munit, discipline, disciplineMunit)
   )
 
   lazy val protoquill = SbtCommunityProject(
     project = "protoquill",
-    sbtTestCommand = "test",
+    extraSbtArgs  = List("-Dcommunity=true", "-DcommunityRemote=true", "-Dquill.macro.stdout=true"),
+    sbtTestCommand = "runCommunityBuild",
     sbtPublishCommand = "publishLocal",
-    dependencies = List(), // TODO add scalatest and pprint (see protoquill/build.sbt)
+    dependencies = () => List(scalatest),
     scalacOptions = List("-language:implicitConversions"), // disabled -Ysafe-init, due to bug in macro
   )
 
@@ -655,18 +725,80 @@ object projects:
     project = "onnx-scala",
     sbtTestCommand = "test",
     sbtPublishCommand = "publishLocal",
-    dependencies = List(scalatest)
+    dependencies = () => List(scalatest)
   )
 
   lazy val playJson = SbtCommunityProject(
     project = "play-json",
     sbtTestCommand = "test",
     sbtPublishCommand = "publishLocal",
-    dependencies = List(scalatest, scalatestplusScalacheck),
+    dependencies = () => List(scalatest, scalatestplusScalacheck),
+  )
+
+  lazy val munitCatsEffect = SbtCommunityProject(
+    project = "munit-cats-effect",
+    sbtTestCommand = "ce3JVM/test; ce3JS/test",
+    sbtPublishCommand = "ce3JVM/publishLocal; ce3JS/publishLocal",
+    dependencies = () => List(munit, catsEffect3)
+  )
+
+  lazy val scalacheckEffect = SbtCommunityProject(
+    project = "scalacheck-effect",
+    sbtTestCommand = "test",
+    sbtPublishCommand = "publishLocal",
+    dependencies = () => List(cats, catsEffect3, munit, scalacheck)
+  )
+
+  lazy val fs2 = SbtCommunityProject(
+    project = "fs2",
+    sbtTestCommand = "coreJVM/test; coreJS/test",  // io/test requires JDK9+
+    sbtPublishCommand = "coreJVM/publishLocal; coreJS/publishLocal",
+    dependencies = () => List(cats, catsEffect3, munitCatsEffect, scalacheckEffect, scodecBits)
+  )
+
+  lazy val libretto = SbtCommunityProject(
+    project = "libretto",
+    sbtTestCommand = "core/test; examples/compile",
+    sbtPublishCommand = "core/publishLocal; examples/publishLocal",
+    dependencies = () => List(scalatest)
+  )
+
+  lazy val jacksonModuleScala = SbtCommunityProject(
+    project = "jackson-module-scala",
+    sbtTestCommand = "test",
+    sbtPublishCommand = "publishLocal",
+    dependencies = () => List(scalaJava8Compat, scalatest)
+  )
+
+  lazy val specs2 = SbtCommunityProject(
+    project = "specs2",
+    sbtTestCommand = "core/testOnly -- exclude ci",
+    sbtPublishCommand = "core/publishLocal",
+    dependencies = () => List()
+  )
+
+  lazy val spire = SbtCommunityProject(
+    project = "spire",
+    sbtTestCommand = "test",
+    sbtPublishCommand = "publishLocal",
+    dependencies = () => List(cats, disciplineMunit)
   )
 
 end projects
 
+lazy val forwardCompatMapping = Map[CommunityProject, CommunityProject](
+  projects.scalacheck -> projects.scalacheckForwardCompat,
+  projects.munit -> projects.munitForwardCompat,
+  projects.discipline -> projects.disciplineForwardCompat,
+  projects.disciplineMunit -> projects.disciplineMunitForwardCompat,
+  projects.disciplineSpecs2 -> projects.disciplineSpecs2ForwardCompat,
+  projects.simulacrumScalafixAnnotations -> projects.simulacrumScalafixAnnotationsForwardCompat,
+  projects.cats -> projects.catsForwardCompat,
+  projects.catsMtl -> projects.catsMtlForwardCompat,
+  projects.coop -> projects.coopForwardCompat,
+  projects.catsEffect3 -> projects.catsEffect3ForwardCompat,
+)
+
 def allProjects = List(
   projects.utest,
   projects.sourcecode,
@@ -686,6 +818,7 @@ def allProjects = List(
   projects.intent,
   projects.algebra,
   projects.scalacheck,
+  projects.scalacheckForwardCompat,
   projects.scalatest,
   projects.scalatestplusScalacheck,
   projects.scalatestplusJunit,
@@ -702,23 +835,31 @@ def allProjects = List(
   projects.sconfig,
   projects.zio,
   projects.munit,
+  projects.munitForwardCompat,
   projects.scodecBits,
   projects.scodec,
   projects.scalaParserCombinators,
   projects.dottyCpsAsync,
   projects.scalaz,
   projects.endpoints4s,
-  projects.catsEffect2,
   projects.catsEffect3,
+  projects.catsEffect3ForwardCompat,
   projects.scalaParallelCollections,
   projects.scalaCollectionCompat,
+  projects.scalaJava8Compat,
   projects.verify,
   projects.discipline,
+  projects.disciplineForwardCompat,
   projects.disciplineMunit,
+  projects.disciplineMunitForwardCompat,
   projects.disciplineSpecs2,
+  projects.disciplineSpecs2ForwardCompat,
   projects.simulacrumScalafixAnnotations,
+  projects.simulacrumScalafixAnnotationsForwardCompat,
   projects.cats,
+  projects.catsForwardCompat,
   projects.catsMtl,
+  projects.catsMtlForwardCompat,
   projects.coop,
   projects.scissEqual,
   projects.scissFingerTree,
@@ -733,9 +874,19 @@ def allProjects = List(
   projects.izumiReflect,
   projects.perspective,
   projects.akka,
+  projects.monocle,
   projects.protoquill,
   projects.onnxScala,
   projects.playJson,
+  projects.scalatestplusTestNG,
+  projects.munitCatsEffect,
+  projects.scalacheckEffect,
+  projects.fs2,
+  projects.libretto,
+  projects.jacksonModuleScala,
+  projects.specs2,
+  projects.coop,
+  projects.coopForwardCompat
 )
 
 lazy val projectMap = allProjects.groupBy(_.project)
diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
index eb16e2466bc8..f3f0bf90188e 100644
--- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
+++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
@@ -7,95 +7,19 @@ import org.junit.{Ignore, Test}
 import org.junit.Assert.{assertEquals, fail}
 import org.junit.experimental.categories.Category
 
-abstract class CommunityBuildTest:
-  given CommunityBuildTest = this
-
-  /** Depending on the mode of operation, either
-   *  runs the test or updates the project. Updating
-   *  means that all the dependencies are fetched but
-   *  minimal other extra other work is done. Updating
-   *  is necessary since we run tests each time on a fresh
-   *  Docker container. We run the update on Docker container
-   *  creation time to create the cache of the dependencies
-   *  and avoid network overhead. See https://github.com/lampepfl/dotty-drone
-   *  for more infrastructural details.
-   */
-  extension (self: CommunityProject) def run()(using suite: CommunityBuildTest): Unit =
-    if self.requiresExperimental && !compilerSupportExperimental then
-      println(
-        s"Skipping ${self.project} - it needs experimental features unsupported in this build."
-      )
-      return
-    self.dependencies.foreach(_.publish())
-    suite.test(self)
-
-  /** Build the given project with the published local compiler and sbt plugin.
-   *
-   *  This test reads the compiler version from community-build/dotty-bootstrapped.version
-   *  and expects community-build/sbt-dotty-sbt to set the compiler plugin.
-   *
-   *  @param project    The project name, should be a git submodule in community-build/
-   *  @param command    The binary file of the program used to test the project – usually
-   *                    a build tool like SBT or Mill
-   *  @param arguments  Arguments to pass to the testing program
-   */
-  def test(projectDef: CommunityProject): Unit = {
-    val project = projectDef.project
-    val command = projectDef.binaryName
-    val arguments = projectDef.buildCommands
-
-    @annotation.tailrec
-    def execTimes(task: () => Int, timesToRerun: Int): Boolean =
-      val exitCode = task()
-      if exitCode == 0
-      then true
-      else if timesToRerun == 0
-        then false
-        else
-          log(s"Rerunning tests in $project because of a previous run failure.")
-          execTimes(task, timesToRerun - 1)
-
-    log(s"Building $project with dotty-bootstrapped $compilerVersion...")
-
-    val projectDir = communitybuildDir.resolve("community-projects").resolve(project)
-
-    if (!Files.exists(projectDir.resolve(".git"))) {
-      fail(s"""
-        |
-        |Missing $project submodule. You can initialize this module using
-        |
-        |    git submodule update --init community-build/community-projects/$project
-        |
-        |""".stripMargin)
-    }
-
-    val testsCompletedSuccessfully = execTimes(projectDef.build, 3)
-
-    if (!testsCompletedSuccessfully) {
-      fail(s"""
-          |
-          |$command exited with an error code. To reproduce without JUnit, use:
-          |
-          |    sbt community-build/prepareCommunityBuild
-          |    cd community-build/community-projects/$project
-          |    $command ${arguments.init.mkString(" ")} "${arguments.last}"
-          |
-          |For a faster feedback loop on SBT projects, one can try to extract a direct call to dotc
-          |using the sbt export command. For instance, for scalacheck, use
-          |    sbt export jvm/test:compileIncremental
-          |
-          |""".stripMargin)
-    }
-  }
-end CommunityBuildTest
+import CommunityBuildRunner.run
 
 class TestCategory
 
+given testRunner: CommunityBuildRunner with
+  override def failWith(msg: String) = { fail(msg); ??? }
+
 @Category(Array(classOf[TestCategory]))
-class CommunityBuildTestA extends CommunityBuildTest:
+class CommunityBuildTestA:
   @Test def izumiReflect = projects.izumiReflect.run()
   @Test def scalaSTM = projects.scalaSTM.run()
   @Test def scalatest = projects.scalatest.run()
+  @Test def scalatestplusTestNG = projects.scalatestplusTestNG.run()
   // 'Sciss/Lucre' dependencies:
   // @Test def scissEqual      = projects.scissEqual     .run()
   // @Test def scissFingerTree = projects.scissFingerTree.run()
@@ -110,24 +34,27 @@ class CommunityBuildTestA extends CommunityBuildTest:
 end CommunityBuildTestA
 
 @Category(Array(classOf[TestCategory]))
-class CommunityBuildTestB extends CommunityBuildTest:
+class CommunityBuildTestB:
   @Test def cats = projects.cats.run()
-  @Test def catsEffect2 = projects.catsEffect2.run()
   @Test def catsEffect3 = projects.catsEffect3.run()
   @Test def catsMtl = projects.catsMtl.run()
   @Test def coop = projects.coop.run()
   @Test def discipline = projects.discipline.run()
   @Test def disciplineMunit = projects.disciplineMunit.run()
   @Test def disciplineSpecs2 = projects.disciplineSpecs2.run()
+  @Test def fs2 = projects.fs2.run()
   @Test def munit = projects.munit.run()
+  @Test def munitCatsEffect = projects.munitCatsEffect.run()
   @Test def perspective = projects.perspective.run()
+  @Test def scalacheckEffect = projects.scalacheckEffect.run()
   @Test def scodec = projects.scodec.run()
   @Test def scodecBits = projects.scodecBits.run()
+  @Test def monocle = projects.monocle.run()
   @Test def simulacrumScalafixAnnotations = projects.simulacrumScalafixAnnotations.run()
 end CommunityBuildTestB
 
 @Category(Array(classOf[TestCategory]))
-class CommunityBuildTestC extends CommunityBuildTest:
+class CommunityBuildTestC:
   @Test def akka = projects.akka.run()
   @Test def algebra = projects.algebra.run()
   @Test def betterfiles = projects.betterfiles.run()
@@ -140,6 +67,8 @@ class CommunityBuildTestC extends CommunityBuildTest:
   @Test def fastparse = projects.fastparse.run()
   @Test def geny = projects.geny.run()
   @Test def intent = projects.intent.run()
+  @Test def jacksonModuleScala = projects.jacksonModuleScala.run()
+  @Test def libretto = projects.libretto.run()
   @Test def minitest = projects.minitest.run()
   @Test def onnxScala = projects.onnxScala.run()
   @Test def oslib = projects.oslib.run()
@@ -150,6 +79,7 @@ class CommunityBuildTestC extends CommunityBuildTest:
   @Test def requests = projects.requests.run()
   @Test def scalacheck = projects.scalacheck.run()
   @Test def scalaCollectionCompat = projects.scalaCollectionCompat.run()
+  @Test def scalaJava8Compat = projects.scalaJava8Compat.run()
   @Test def scalap = projects.scalap.run()
   @Test def scalaParallelCollections = projects.scalaParallelCollections.run()
   @Test def scalaParserCombinators = projects.scalaParserCombinators.run()
@@ -157,10 +87,12 @@ class CommunityBuildTestC extends CommunityBuildTest:
   @Test def scalatestplusScalacheck = projects.scalatestplusScalacheck.run()
   @Test def scalaXml = projects.scalaXml.run()
   @Test def scalaz = projects.scalaz.run()
-  @Test def scas = if compilerSupportExperimental then projects.scas.run()
+  @Test def scas = projects.scas.run()
   @Test def sconfig = projects.sconfig.run()
   @Test def shapeless = projects.shapeless.run()
+  @Test def spire = projects.spire.run()
   @Test def sourcecode = projects.sourcecode.run()
+  @Test def specs2 = projects.specs2.run()
   @Test def stdLib213 = projects.stdLib213.run()
   @Test def ujson = projects.ujson.run()
   @Test def upickle = projects.upickle.run()
@@ -168,3 +100,17 @@ class CommunityBuildTestC extends CommunityBuildTest:
   @Test def verify = projects.verify.run()
   @Test def xmlInterpolator = projects.xmlInterpolator.run()
 end CommunityBuildTestC
+
+@Category(Array(classOf[TestCategory]))
+class CommunityBuildTestForwardCompat:
+  @Test def catsEffect3ForwardCompat = projects.catsEffect3ForwardCompat.run()
+  @Test def catsForwardCompat = projects.catsForwardCompat.run()
+  @Test def catsMtlForwardCompat = projects.catsMtlForwardCompat.run()
+  @Test def coopForwardCompat = projects.coopForwardCompat.run()
+  @Test def disciplineForwardCompat = projects.disciplineForwardCompat.run()
+  @Test def disciplineMunitForwardCompat = projects.disciplineMunitForwardCompat.run()
+  @Test def disciplineSpecs2ForwardCompat = projects.disciplineSpecs2ForwardCompat.run()
+  @Test def munitForwardCompat = projects.munitForwardCompat.run()
+  @Test def scalacheckForwardCompat = projects.scalacheckForwardCompat.run()
+  @Test def simulacrumScalafixAnnotationsForwardCompat = projects.simulacrumScalafixAnnotationsForwardCompat.run()
+end CommunityBuildTestForwardCompat
diff --git a/compiler/src/dotty/tools/MainGenericRunner.scala b/compiler/src/dotty/tools/MainGenericRunner.scala
new file mode 100644
index 000000000000..b7ef90dcdc60
--- /dev/null
+++ b/compiler/src/dotty/tools/MainGenericRunner.scala
@@ -0,0 +1,274 @@
+package dotty.tools
+
+
+import scala.annotation.tailrec
+import scala.io.Source
+import scala.util.{ Try, Success, Failure }
+import java.io.File
+import java.lang.Thread
+import scala.annotation.internal.sharable
+import dotty.tools.dotc.util.ClasspathFromClassloader
+import dotty.tools.runner.ObjectRunner
+import dotty.tools.dotc.config.Properties.envOrNone
+import java.util.jar._
+import dotty.tools.io.Jar
+import dotty.tools.runner.ScalaClassLoader
+import java.nio.file.{Files, Paths, Path}
+import dotty.tools.dotc.config.CommandLineParser
+import dotty.tools.scripting.StringDriver
+
+enum ExecuteMode:
+  case Guess
+  case Script
+  case Repl
+  case Run
+  case PossibleRun
+  case Expression
+
+case class Settings(
+  verbose: Boolean = false,
+  classPath: List[String] = List.empty,
+  executeMode: ExecuteMode = ExecuteMode.Guess,
+  exitCode: Int = 0,
+  javaArgs: List[String] = List.empty,
+  scalaArgs: List[String] = List.empty,
+  residualArgs: List[String] = List.empty,
+  possibleEntryPaths: List[String] = List.empty,
+  scriptArgs: List[String] = List.empty,
+  targetScript: String = "",
+  targetExpression: String = "",
+  targetToRun: String = "",
+  save: Boolean = false,
+  modeShouldBePossibleRun: Boolean = false,
+  modeShouldBeRun: Boolean = false,
+  compiler: Boolean = false,
+) {
+  def withExecuteMode(em: ExecuteMode): Settings = this.executeMode match
+    case ExecuteMode.Guess | ExecuteMode.PossibleRun =>
+      this.copy(executeMode = em)
+    case _ =>
+      println(s"execute_mode==[$executeMode], attempted overwrite by [$em]")
+      this.copy(exitCode = 1)
+  end withExecuteMode
+
+  def withScalaArgs(args: String*): Settings =
+    this.copy(scalaArgs = scalaArgs.appendedAll(args.toList))
+
+  def withJavaArgs(args: String*): Settings =
+    this.copy(javaArgs = javaArgs.appendedAll(args.toList))
+
+  def withResidualArgs(args: String*): Settings =
+    this.copy(residualArgs = residualArgs.appendedAll(args.toList))
+
+  def withPossibleEntryPaths(args: String*): Settings =
+    this.copy(possibleEntryPaths = possibleEntryPaths.appendedAll(args.toList))
+
+  def withScriptArgs(args: String*): Settings =
+    this.copy(scriptArgs = scriptArgs.appendedAll(args.toList))
+
+  def withTargetScript(file: String): Settings =
+    Try(Source.fromFile(file)).toOption match
+      case Some(_) => this.copy(targetScript = file)
+      case None      =>
+        println(s"not found $file")
+        this.copy(exitCode = 2)
+  end withTargetScript
+
+  def withTargetToRun(targetToRun: String): Settings =
+    this.copy(targetToRun = targetToRun)
+
+  def withExpression(scalaSource: String): Settings =
+    this.copy(targetExpression = scalaSource)
+
+  def withSave: Settings =
+    this.copy(save = true)
+
+  def noSave: Settings =
+    this.copy(save = false)
+
+  def withModeShouldBePossibleRun: Settings =
+    this.copy(modeShouldBePossibleRun = true)
+
+  def withModeShouldBeRun: Settings =
+    this.copy(modeShouldBeRun = true)
+
+  def withCompiler: Settings =
+    this.copy(compiler = true)
+}
+
+object MainGenericRunner {
+
+  val classpathSeparator = File.pathSeparator
+
+  @sharable val javaOption = raw"""-J(.*)""".r
+  @sharable val scalaOption = raw"""@.*""".r
+  @sharable val colorOption = raw"""-color:.*""".r
+  @tailrec
+  def process(args: List[String], settings: Settings): Settings = args match
+    case Nil =>
+      settings
+    case "-run" :: fqName :: tail =>
+      process(tail, settings.withExecuteMode(ExecuteMode.Run).withTargetToRun(fqName))
+    case ("-cp" | "-classpath" | "--class-path") :: cp :: tail =>
+      val cpEntries = cp.split(classpathSeparator).toList
+      val singleEntryClasspath: Boolean = cpEntries.take(2).size == 1
+      val globdir: String = if singleEntryClasspath then cp.replaceAll("[\\\\/][^\\\\/]*$", "") else "" // slash/backslash agnostic
+      def validGlobbedJar(s: String): Boolean = s.startsWith(globdir) && ((s.toLowerCase.endsWith(".jar") || s.toLowerCase.endsWith(".zip")))
+      val (tailargs, newEntries) = if singleEntryClasspath && validGlobbedJar(cpEntries.head) then
+        // reassemble globbed wildcard classpath
+        // globdir is wildcard directory for globbed jar files, reconstruct the intended classpath
+        val cpJars = tail.takeWhile( f => validGlobbedJar(f) )
+        val remainingArgs = tail.drop(cpJars.size)
+        (remainingArgs, cpEntries ++ cpJars)
+      else
+        (tail, cpEntries)
+
+      process(tailargs, settings.copy(classPath = settings.classPath ++ newEntries.filter(_.nonEmpty)))
+
+    case ("-version" | "--version") :: _ =>
+      settings.copy(
+        executeMode = ExecuteMode.Repl,
+        residualArgs = List("-version")
+      )
+    case ("-v" | "-verbose" | "--verbose") :: tail =>
+      process(
+        tail,
+        settings.copy(
+          verbose = true,
+          residualArgs = settings.residualArgs :+ "-verbose"
+        )
+      )
+    case "-save" :: tail =>
+      process(tail, settings.withSave)
+    case "-nosave" :: tail =>
+      process(tail, settings.noSave)
+    case "-with-compiler" :: tail =>
+      process(tail, settings.withCompiler)
+    case (o @ javaOption(striped)) :: tail =>
+      process(tail, settings.withJavaArgs(striped).withScalaArgs(o))
+    case (o @ scalaOption(_*)) :: tail =>
+      val remainingArgs = (CommandLineParser.expandArg(o) ++ tail).toList
+      process(remainingArgs, settings)
+    case (o @ colorOption(_*)) :: tail =>
+      process(tail, settings.withScalaArgs(o))
+    case "-e" :: expression :: tail =>
+      val mainSource = s"@main def main(args: String *): Unit =\n  ${expression}"
+      settings
+        .withExecuteMode(ExecuteMode.Expression)
+        .withExpression(mainSource)
+        .withScriptArgs(tail*)
+        .noSave // -save not useful here
+    case arg :: tail =>
+      val line = Try(Source.fromFile(arg).getLines.toList).toOption.flatMap(_.headOption)
+      lazy val hasScalaHashbang = { val s = line.getOrElse("") ; s.startsWith("#!") && s.contains("scala") }
+      if arg.endsWith(".scala") || arg.endsWith(".sc") || hasScalaHashbang then
+        settings
+          .withExecuteMode(ExecuteMode.Script)
+          .withTargetScript(arg)
+          .withScriptArgs(tail*)
+      else
+        val newSettings = if arg.startsWith("-") then settings else settings.withPossibleEntryPaths(arg).withModeShouldBePossibleRun
+        process(tail, newSettings.withResidualArgs(arg))
+
+      
+  def main(args: Array[String]): Unit =
+    val scalaOpts = envOrNone("SCALA_OPTS").toArray.flatMap(_.split(" ")).filter(_.nonEmpty)
+    val allArgs = scalaOpts ++ args
+    val settings = process(allArgs.toList, Settings())
+    if settings.exitCode != 0 then System.exit(settings.exitCode)
+
+    def removeCompiler(cp: Array[String]) =
+      if (!settings.compiler) then // Let's remove compiler from the classpath
+        val compilerLibs = Seq("scala3-compiler", "scala3-interfaces", "tasty-core", "scala-asm", "scala3-staging", "scala3-tasty-inspector")
+        cp.filterNot(c => compilerLibs.exists(c.contains))
+      else
+        cp
+
+    def run(settings: Settings): Unit = settings.executeMode match
+      case ExecuteMode.Repl =>
+        val properArgs =
+          List("-classpath", settings.classPath.mkString(classpathSeparator)).filter(Function.const(settings.classPath.nonEmpty))
+            ++ settings.residualArgs
+        repl.Main.main(properArgs.toArray)
+
+      case ExecuteMode.PossibleRun =>
+        val newClasspath = (settings.classPath :+ ".").flatMap(_.split(classpathSeparator).filter(_.nonEmpty)).map(File(_).toURI.toURL)
+        import dotty.tools.runner.RichClassLoader._
+        val newClassLoader = ScalaClassLoader.fromURLsParallelCapable(newClasspath)
+        val targetToRun = settings.possibleEntryPaths.to(LazyList).find { entryPath =>
+          newClassLoader.tryToLoadClass(entryPath).orElse {
+            Option.when(Jar.isJarOrZip(dotty.tools.io.Path(entryPath)))(Jar(entryPath).mainClass).flatten
+          }.isDefined
+        }
+        targetToRun match
+          case Some(fqName) =>
+            run(settings.withTargetToRun(fqName).withResidualArgs(settings.residualArgs.filter { _ != fqName }*).withExecuteMode(ExecuteMode.Run))
+          case None =>
+            run(settings.withExecuteMode(ExecuteMode.Repl))
+      case ExecuteMode.Run =>
+        val scalaClasspath = ClasspathFromClassloader(Thread.currentThread().getContextClassLoader).split(classpathSeparator)
+        val newClasspath = (settings.classPath.flatMap(_.split(classpathSeparator).filter(_.nonEmpty)) ++ removeCompiler(scalaClasspath) :+ ".").map(File(_).toURI.toURL)
+        val res = ObjectRunner.runAndCatch(newClasspath, settings.targetToRun, settings.residualArgs).flatMap {
+          case ex: ClassNotFoundException if ex.getMessage == settings.targetToRun =>
+            val file = settings.targetToRun
+            Jar(file).mainClass match
+              case Some(mc) =>
+                ObjectRunner.runAndCatch(newClasspath :+ File(file).toURI.toURL, mc, settings.residualArgs)
+              case None =>
+                Some(IllegalArgumentException(s"No main class defined in manifest in jar: $file"))
+          case ex => Some(ex)
+        }
+        errorFn("", res)
+      case ExecuteMode.Script =>
+        val targetScript = Paths.get(settings.targetScript).toFile
+        val targetJar = settings.targetScript.replaceAll("[.][^\\/]*$", "")+".jar"
+        val precompiledJar = File(targetJar)
+        val mainClass = if !precompiledJar.isFile then "" else Jar(targetJar).mainClass.getOrElse("")
+        val jarIsValid = mainClass.nonEmpty && precompiledJar.lastModified >= targetScript.lastModified && settings.save
+        if jarIsValid then
+          // precompiledJar exists, is newer than targetScript, and manifest defines a mainClass
+          sys.props("script.path") = targetScript.toPath.toAbsolutePath.normalize.toString
+          val scalaClasspath = ClasspathFromClassloader(Thread.currentThread().getContextClassLoader).split(classpathSeparator)
+          val newClasspath = (settings.classPath.flatMap(_.split(classpathSeparator).filter(_.nonEmpty)) ++ removeCompiler(scalaClasspath) :+ ".").map(File(_).toURI.toURL)
+          val res = if mainClass.nonEmpty then
+            ObjectRunner.runAndCatch(newClasspath :+ File(targetJar).toURI.toURL, mainClass, settings.scriptArgs)
+          else
+            Some(IllegalArgumentException(s"No main class defined in manifest in jar: $precompiledJar"))
+          errorFn("", res)
+
+        else
+          val properArgs =
+            List("-classpath", settings.classPath.mkString(classpathSeparator)).filter(Function.const(settings.classPath.nonEmpty))
+              ++ settings.residualArgs
+              ++ (if settings.save then List("-save") else Nil)
+              ++ settings.scalaArgs
+              ++ List("-script", settings.targetScript)
+              ++ settings.scriptArgs
+          scripting.Main.main(properArgs.toArray)
+      case ExecuteMode.Expression =>
+        val cp = settings.classPath match {
+          case Nil => ""
+          case list => list.mkString(classpathSeparator)
+        }
+        val cpArgs = if cp.isEmpty then Nil else List("-classpath", cp)
+        val properArgs = cpArgs ++ settings.residualArgs ++ settings.scalaArgs
+        val driver = StringDriver(properArgs.toArray, settings.targetExpression)
+        driver.compileAndRun(settings.classPath)
+
+      case ExecuteMode.Guess =>
+        if settings.modeShouldBePossibleRun then
+          run(settings.withExecuteMode(ExecuteMode.PossibleRun))
+        else if settings.modeShouldBeRun then
+          run(settings.withExecuteMode(ExecuteMode.Run))
+        else
+          run(settings.withExecuteMode(ExecuteMode.Repl))
+
+    run(settings)
+
+
+  def errorFn(str: String, e: Option[Throwable] = None, isFailure: Boolean = true): Boolean = {
+    if (str.nonEmpty) Console.err.println(str)
+    e.foreach(_.printStackTrace())
+    !isFailure
+  }
+}
diff --git a/compiler/src/dotty/tools/backend/ScalaPrimitivesOps.scala b/compiler/src/dotty/tools/backend/ScalaPrimitivesOps.scala
index 40b567b640b8..6b5bfbc3e00e 100644
--- a/compiler/src/dotty/tools/backend/ScalaPrimitivesOps.scala
+++ b/compiler/src/dotty/tools/backend/ScalaPrimitivesOps.scala
@@ -5,161 +5,161 @@ object ScalaPrimitivesOps extends ScalaPrimitivesOps
 
 class ScalaPrimitivesOps {
   // Arithmetic unary operations
-  final val POS = 1                            // +x
-  final val NEG = 2                            // -x
-  final val NOT = 3                            // ~x
+  inline val POS = 1                            // +x
+  inline val NEG = 2                            // -x
+  inline val NOT = 3                            // ~x
 
   // Arithmetic binary operations
-  final val ADD = 10                           // x + y
-  final val SUB = 11                           // x - y
-  final val MUL = 12                           // x * y
-  final val DIV = 13                           // x / y
-  final val MOD = 14                           // x % y
+  inline val ADD = 10                           // x + y
+  inline val SUB = 11                           // x - y
+  inline val MUL = 12                           // x * y
+  inline val DIV = 13                           // x / y
+  inline val MOD = 14                           // x % y
 
   // Bitwise operations
-  final val OR  = 20                           // x | y
-  final val XOR = 21                           // x ^ y
-  final val AND = 22                           // x & y
+  inline val OR  = 20                           // x | y
+  inline val XOR = 21                           // x ^ y
+  inline val AND = 22                           // x & y
 
   // Shift operations
-  final val LSL = 30                           // x << y
-  final val LSR = 31                           // x >>> y
-  final val ASR = 32                           // x >> y
+  inline val LSL = 30                           // x << y
+  inline val LSR = 31                           // x >>> y
+  inline val ASR = 32                           // x >> y
 
   // Comparison operations
-  final val ID = 40                            // x eq y
-  final val NI = 41                            // x ne y
-  final val EQ = 42                            // x == y
-  final val NE = 43                            // x != y
-  final val LT = 44                            // x < y
-  final val LE = 45                            // x <= y
-  final val GT = 46                            // x > y
-  final val GE = 47                            // x >= y
+  inline val ID = 40                            // x eq y
+  inline val NI = 41                            // x ne y
+  inline val EQ = 42                            // x == y
+  inline val NE = 43                            // x != y
+  inline val LT = 44                            // x < y
+  inline val LE = 45                            // x <= y
+  inline val GT = 46                            // x > y
+  inline val GE = 47                            // x >= y
 
   // Boolean unary operations
-  final val ZNOT = 50                          // !x
+  inline val ZNOT = 50                          // !x
 
   // Boolean binary operations
-  final val ZOR = 60                           // x || y
-  final val ZAND = 61                          // x && y
+  inline val ZOR = 60                           // x || y
+  inline val ZAND = 61                          // x && y
 
   // Array operations
-  final val LENGTH = 70                        // x.length
-  final val APPLY  = 71                        // x(y)
-  final val UPDATE = 72                        // x(y) = z
+  inline val LENGTH = 70                        // x.length
+  inline val APPLY  = 71                        // x(y)
+  inline val UPDATE = 72                        // x(y) = z
 
   // Any operations
-  final val IS = 80                            // x.is[y]
-  final val AS = 81                            // x.as[y]
-  final val HASH = 87                          // x.##
+  inline val IS = 80                            // x.is[y]
+  inline val AS = 81                            // x.as[y]
+  inline val HASH = 87                          // x.##
 
   // AnyRef operations
-  final val SYNCHRONIZED = 90                  // x.synchronized(y)
+  inline val SYNCHRONIZED = 90                  // x.synchronized(y)
 
   // String operations
-  final val CONCAT = 100                       // String.valueOf(x)+String.valueOf(y)
+  inline val CONCAT = 100                       // String.valueOf(x)+String.valueOf(y)
 
   // coercions
-  final val COERCE = 101
+  inline val COERCE = 101
 
   // RunTime operations
-  final val BOX = 110                          // RunTime.box_<X>(x)
-  final val UNBOX = 111                        // RunTime.unbox_<X>(x)
-  final val NEW_ZARRAY = 112                   // RunTime.zarray(x)
-  final val NEW_BARRAY = 113                   // RunTime.barray(x)
-  final val NEW_SARRAY = 114                   // RunTime.sarray(x)
-  final val NEW_CARRAY = 115                   // RunTime.carray(x)
-  final val NEW_IARRAY = 116                   // RunTime.iarray(x)
-  final val NEW_LARRAY = 117                   // RunTime.larray(x)
-  final val NEW_FARRAY = 118                   // RunTime.farray(x)
-  final val NEW_DARRAY = 119                   // RunTime.darray(x)
-  final val NEW_OARRAY = 120                   // RunTime.oarray(x)
-
-  final val ZARRAY_LENGTH = 131                // RunTime.zarray_length(x)
-  final val BARRAY_LENGTH = 132                // RunTime.barray_length(x)
-  final val SARRAY_LENGTH = 133                // RunTime.sarray_length(x)
-  final val CARRAY_LENGTH = 134                // RunTime.carray_length(x)
-  final val IARRAY_LENGTH = 135                // RunTime.iarray_length(x)
-  final val LARRAY_LENGTH = 136                // RunTime.larray_length(x)
-  final val FARRAY_LENGTH = 137                // RunTime.farray_length(x)
-  final val DARRAY_LENGTH = 138                // RunTime.darray_length(x)
-  final val OARRAY_LENGTH = 139                // RunTime.oarray_length(x)
-
-  final val ZARRAY_GET = 140                   // RunTime.zarray_get(x,y)
-  final val BARRAY_GET = 141                   // RunTime.barray_get(x,y)
-  final val SARRAY_GET = 142                   // RunTime.sarray_get(x,y)
-  final val CARRAY_GET = 143                   // RunTime.carray_get(x,y)
-  final val IARRAY_GET = 144                   // RunTime.iarray_get(x,y)
-  final val LARRAY_GET = 145                   // RunTime.larray_get(x,y)
-  final val FARRAY_GET = 146                   // RunTime.farray_get(x,y)
-  final val DARRAY_GET = 147                   // RunTime.darray_get(x,y)
-  final val OARRAY_GET = 148                   // RunTime.oarray_get(x,y)
-
-  final val ZARRAY_SET = 150                   // RunTime.zarray(x,y,z)
-  final val BARRAY_SET = 151                   // RunTime.barray(x,y,z)
-  final val SARRAY_SET = 152                   // RunTime.sarray(x,y,z)
-  final val CARRAY_SET = 153                   // RunTime.carray(x,y,z)
-  final val IARRAY_SET = 154                   // RunTime.iarray(x,y,z)
-  final val LARRAY_SET = 155                   // RunTime.larray(x,y,z)
-  final val FARRAY_SET = 156                   // RunTime.farray(x,y,z)
-  final val DARRAY_SET = 157                   // RunTime.darray(x,y,z)
-  final val OARRAY_SET = 158                   // RunTime.oarray(x,y,z)
-
-  final val B2B = 200                          // RunTime.b2b(x)
-  final val B2S = 201                          // RunTime.b2s(x)
-  final val B2C = 202                          // RunTime.b2c(x)
-  final val B2I = 203                          // RunTime.b2i(x)
-  final val B2L = 204                          // RunTime.b2l(x)
-  final val B2F = 205                          // RunTime.b2f(x)
-  final val B2D = 206                          // RunTime.b2d(x)
-
-  final val S2B = 210                          // RunTime.s2b(x)
-  final val S2S = 211                          // RunTime.s2s(x)
-  final val S2C = 212                          // RunTime.s2c(x)
-  final val S2I = 213                          // RunTime.s2i(x)
-  final val S2L = 214                          // RunTime.s2l(x)
-  final val S2F = 215                          // RunTime.s2f(x)
-  final val S2D = 216                          // RunTime.s2d(x)
-
-  final val C2B = 220                          // RunTime.c2b(x)
-  final val C2S = 221                          // RunTime.c2s(x)
-  final val C2C = 222                          // RunTime.c2c(x)
-  final val C2I = 223                          // RunTime.c2i(x)
-  final val C2L = 224                          // RunTime.c2l(x)
-  final val C2F = 225                          // RunTime.c2f(x)
-  final val C2D = 226                          // RunTime.c2d(x)
-
-  final val I2B = 230                          // RunTime.i2b(x)
-  final val I2S = 231                          // RunTime.i2s(x)
-  final val I2C = 232                          // RunTime.i2c(x)
-  final val I2I = 233                          // RunTime.i2i(x)
-  final val I2L = 234                          // RunTime.i2l(x)
-  final val I2F = 235                          // RunTime.i2f(x)
-  final val I2D = 236                          // RunTime.i2d(x)
-
-  final val L2B = 240                          // RunTime.l2b(x)
-  final val L2S = 241                          // RunTime.l2s(x)
-  final val L2C = 242                          // RunTime.l2c(x)
-  final val L2I = 243                          // RunTime.l2i(x)
-  final val L2L = 244                          // RunTime.l2l(x)
-  final val L2F = 245                          // RunTime.l2f(x)
-  final val L2D = 246                          // RunTime.l2d(x)
-
-  final val F2B = 250                          // RunTime.f2b(x)
-  final val F2S = 251                          // RunTime.f2s(x)
-  final val F2C = 252                          // RunTime.f2c(x)
-  final val F2I = 253                          // RunTime.f2i(x)
-  final val F2L = 254                          // RunTime.f2l(x)
-  final val F2F = 255                          // RunTime.f2f(x)
-  final val F2D = 256                          // RunTime.f2d(x)
-
-  final val D2B = 260                          // RunTime.d2b(x)
-  final val D2S = 261                          // RunTime.d2s(x)
-  final val D2C = 262                          // RunTime.d2c(x)
-  final val D2I = 263                          // RunTime.d2i(x)
-  final val D2L = 264                          // RunTime.d2l(x)
-  final val D2F = 265                          // RunTime.d2f(x)
-  final val D2D = 266                          // RunTime.d2d(x)
+  inline val BOX = 110                          // RunTime.box_<X>(x)
+  inline val UNBOX = 111                        // RunTime.unbox_<X>(x)
+  inline val NEW_ZARRAY = 112                   // RunTime.zarray(x)
+  inline val NEW_BARRAY = 113                   // RunTime.barray(x)
+  inline val NEW_SARRAY = 114                   // RunTime.sarray(x)
+  inline val NEW_CARRAY = 115                   // RunTime.carray(x)
+  inline val NEW_IARRAY = 116                   // RunTime.iarray(x)
+  inline val NEW_LARRAY = 117                   // RunTime.larray(x)
+  inline val NEW_FARRAY = 118                   // RunTime.farray(x)
+  inline val NEW_DARRAY = 119                   // RunTime.darray(x)
+  inline val NEW_OARRAY = 120                   // RunTime.oarray(x)
+
+  inline val ZARRAY_LENGTH = 131                // RunTime.zarray_length(x)
+  inline val BARRAY_LENGTH = 132                // RunTime.barray_length(x)
+  inline val SARRAY_LENGTH = 133                // RunTime.sarray_length(x)
+  inline val CARRAY_LENGTH = 134                // RunTime.carray_length(x)
+  inline val IARRAY_LENGTH = 135                // RunTime.iarray_length(x)
+  inline val LARRAY_LENGTH = 136                // RunTime.larray_length(x)
+  inline val FARRAY_LENGTH = 137                // RunTime.farray_length(x)
+  inline val DARRAY_LENGTH = 138                // RunTime.darray_length(x)
+  inline val OARRAY_LENGTH = 139                // RunTime.oarray_length(x)
+
+  inline val ZARRAY_GET = 140                   // RunTime.zarray_get(x,y)
+  inline val BARRAY_GET = 141                   // RunTime.barray_get(x,y)
+  inline val SARRAY_GET = 142                   // RunTime.sarray_get(x,y)
+  inline val CARRAY_GET = 143                   // RunTime.carray_get(x,y)
+  inline val IARRAY_GET = 144                   // RunTime.iarray_get(x,y)
+  inline val LARRAY_GET = 145                   // RunTime.larray_get(x,y)
+  inline val FARRAY_GET = 146                   // RunTime.farray_get(x,y)
+  inline val DARRAY_GET = 147                   // RunTime.darray_get(x,y)
+  inline val OARRAY_GET = 148                   // RunTime.oarray_get(x,y)
+
+  inline val ZARRAY_SET = 150                   // RunTime.zarray(x,y,z)
+  inline val BARRAY_SET = 151                   // RunTime.barray(x,y,z)
+  inline val SARRAY_SET = 152                   // RunTime.sarray(x,y,z)
+  inline val CARRAY_SET = 153                   // RunTime.carray(x,y,z)
+  inline val IARRAY_SET = 154                   // RunTime.iarray(x,y,z)
+  inline val LARRAY_SET = 155                   // RunTime.larray(x,y,z)
+  inline val FARRAY_SET = 156                   // RunTime.farray(x,y,z)
+  inline val DARRAY_SET = 157                   // RunTime.darray(x,y,z)
+  inline val OARRAY_SET = 158                   // RunTime.oarray(x,y,z)
+
+  inline val B2B = 200                          // RunTime.b2b(x)
+  inline val B2S = 201                          // RunTime.b2s(x)
+  inline val B2C = 202                          // RunTime.b2c(x)
+  inline val B2I = 203                          // RunTime.b2i(x)
+  inline val B2L = 204                          // RunTime.b2l(x)
+  inline val B2F = 205                          // RunTime.b2f(x)
+  inline val B2D = 206                          // RunTime.b2d(x)
+
+  inline val S2B = 210                          // RunTime.s2b(x)
+  inline val S2S = 211                          // RunTime.s2s(x)
+  inline val S2C = 212                          // RunTime.s2c(x)
+  inline val S2I = 213                          // RunTime.s2i(x)
+  inline val S2L = 214                          // RunTime.s2l(x)
+  inline val S2F = 215                          // RunTime.s2f(x)
+  inline val S2D = 216                          // RunTime.s2d(x)
+
+  inline val C2B = 220                          // RunTime.c2b(x)
+  inline val C2S = 221                          // RunTime.c2s(x)
+  inline val C2C = 222                          // RunTime.c2c(x)
+  inline val C2I = 223                          // RunTime.c2i(x)
+  inline val C2L = 224                          // RunTime.c2l(x)
+  inline val C2F = 225                          // RunTime.c2f(x)
+  inline val C2D = 226                          // RunTime.c2d(x)
+
+  inline val I2B = 230                          // RunTime.i2b(x)
+  inline val I2S = 231                          // RunTime.i2s(x)
+  inline val I2C = 232                          // RunTime.i2c(x)
+  inline val I2I = 233                          // RunTime.i2i(x)
+  inline val I2L = 234                          // RunTime.i2l(x)
+  inline val I2F = 235                          // RunTime.i2f(x)
+  inline val I2D = 236                          // RunTime.i2d(x)
+
+  inline val L2B = 240                          // RunTime.l2b(x)
+  inline val L2S = 241                          // RunTime.l2s(x)
+  inline val L2C = 242                          // RunTime.l2c(x)
+  inline val L2I = 243                          // RunTime.l2i(x)
+  inline val L2L = 244                          // RunTime.l2l(x)
+  inline val L2F = 245                          // RunTime.l2f(x)
+  inline val L2D = 246                          // RunTime.l2d(x)
+
+  inline val F2B = 250                          // RunTime.f2b(x)
+  inline val F2S = 251                          // RunTime.f2s(x)
+  inline val F2C = 252                          // RunTime.f2c(x)
+  inline val F2I = 253                          // RunTime.f2i(x)
+  inline val F2L = 254                          // RunTime.f2l(x)
+  inline val F2F = 255                          // RunTime.f2f(x)
+  inline val F2D = 256                          // RunTime.f2d(x)
+
+  inline val D2B = 260                          // RunTime.d2b(x)
+  inline val D2S = 261                          // RunTime.d2s(x)
+  inline val D2C = 262                          // RunTime.d2c(x)
+  inline val D2I = 263                          // RunTime.d2i(x)
+  inline val D2L = 264                          // RunTime.d2l(x)
+  inline val D2F = 265                          // RunTime.d2f(x)
+  inline val D2D = 266                          // RunTime.d2d(x)
 
   /** Check whether the given operation code is an array operation. */
   def isArrayOp(code: Int): Boolean =
diff --git a/compiler/src/dotty/tools/backend/jvm/AsmUtils.scala b/compiler/src/dotty/tools/backend/jvm/AsmUtils.scala
index 7f5887d99a7f..8a71a09aa7ab 100644
--- a/compiler/src/dotty/tools/backend/jvm/AsmUtils.scala
+++ b/compiler/src/dotty/tools/backend/jvm/AsmUtils.scala
@@ -19,8 +19,8 @@ object AsmUtils {
   /**
    * Print the bytecode of classes generated by GenBCode to the standard output.
    */
-  final val traceClassEnabled = false
-  final val traceClassPattern = ""
+  inline val traceClassEnabled = false
+  inline val traceClassPattern = ""
 
   /**
    * Print the bytedcode of classes as they are serialized by the ASM library. The serialization
@@ -28,8 +28,8 @@ object AsmUtils {
    * introduces stack map frames, it computes the maximal stack sizes, and it replaces dead
    * code by NOPs (see also https://github.com/scala/scala/pull/3726#issuecomment-42861780).
    */
-  final val traceSerializedClassEnabled = false
-  final val traceSerializedClassPattern = ""
+  inline val traceSerializedClassEnabled = false
+  inline val traceSerializedClassPattern = ""
 
   def traceMethod(mnode: MethodNode1): Unit = {
     println(s"Bytecode for method ${mnode.name}")
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala
index 156551519cb9..96ae4e8a00af 100644
--- a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala
+++ b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala
@@ -3,6 +3,7 @@ package backend
 package jvm
 
 import scala.annotation.switch
+import scala.collection.mutable.SortedMap
 
 import scala.tools.asm
 import scala.tools.asm.{Handle, Label, Opcodes}
@@ -88,9 +89,23 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
         case Assign(lhs, rhs) =>
           val s = lhs.symbol
           val Local(tk, _, idx, _) = locals.getOrMakeLocal(s)
-          genLoad(rhs, tk)
-          lineNumber(tree)
-          bc.store(idx, tk)
+
+          rhs match {
+            case Apply(Select(larg: Ident, nme.ADD), Literal(x) :: Nil)
+            if larg.symbol == s && tk.isIntSizedType && x.isShortRange =>
+              lineNumber(tree)
+              bc.iinc(idx, x.intValue)
+
+            case Apply(Select(larg: Ident, nme.SUB), Literal(x) :: Nil)
+            if larg.symbol == s && tk.isIntSizedType && Constant(-x.intValue).isShortRange =>
+              lineNumber(tree)
+              bc.iinc(idx, -x.intValue)
+
+            case _ =>
+              genLoad(rhs, tk)
+              lineNumber(tree)
+              bc.store(idx, tk)
+          }
 
         case _ =>
           genLoad(tree, UNIT)
@@ -228,7 +243,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
       resKind
     }
 
-    def genPrimitiveOp(tree: Apply, expectedType: BType): BType = tree match {
+    def genPrimitiveOp(tree: Apply, expectedType: BType): BType = (tree: @unchecked) match {
       case Apply(fun @ DesugaredSelect(receiver, _), _) =>
       val sym = tree.symbol
 
@@ -610,7 +625,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
       }
     }
 
-    def genTypeApply(t: TypeApply): BType = t match {
+    def genTypeApply(t: TypeApply): BType = (t: @unchecked) match {
       case TypeApply(fun@DesugaredSelect(obj, _), targs) =>
 
         val sym = fun.symbol
@@ -826,61 +841,170 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
       generatedType
     }
 
-    /*
-     * A Match node contains one or more case clauses,
-     * each case clause lists one or more Int values to use as keys, and a code block.
-     * Except the "default" case clause which (if it exists) doesn't list any Int key.
-     *
-     * On a first pass over the case clauses, we flatten the keys and their targets (the latter represented with asm.Labels).
-     * That representation allows JCodeMethodV to emit a lookupswitch or a tableswitch.
-     *
-     * On a second pass, we emit the switch blocks, one for each different target.
+    /* A Match node contains one or more case clauses, each case clause lists one or more
+     * Int/String values to use as keys, and a code block. The exception is the "default" case
+     * clause which doesn't list any key (there is exactly one of these per match).
      */
     private def genMatch(tree: Match): BType = tree match {
       case Match(selector, cases) =>
       lineNumber(tree)
-      genLoad(selector, INT)
       val generatedType = tpeTK(tree)
+      val postMatch = new asm.Label
 
-      var flatKeys: List[Int]       = Nil
-      var targets:  List[asm.Label] = Nil
-      var default:  asm.Label       = null
-      var switchBlocks: List[(asm.Label, Tree)] = Nil
-
-      // collect switch blocks and their keys, but don't emit yet any switch-block.
-      for (caze @ CaseDef(pat, guard, body) <- cases) {
-        assert(guard == tpd.EmptyTree, guard)
-        val switchBlockPoint = new asm.Label
-        switchBlocks ::= (switchBlockPoint, body)
-        pat match {
-          case Literal(value) =>
-            flatKeys ::= value.intValue
-            targets  ::= switchBlockPoint
-          case Ident(nme.WILDCARD) =>
-            assert(default == null, s"multiple default targets in a Match node, at ${tree.span}")
-            default = switchBlockPoint
-          case Alternative(alts) =>
-            alts foreach {
-              case Literal(value) =>
-                flatKeys ::= value.intValue
-                targets  ::= switchBlockPoint
-              case _ =>
-                abort(s"Invalid alternative in alternative pattern in Match node: $tree at: ${tree.span}")
-            }
-          case _ =>
-            abort(s"Invalid pattern in Match node: $tree at: ${tree.span}")
+      // Only two possible selector types exist in `Match` trees at this point: Int and String
+      if (tpeTK(selector) == INT) {
+
+        /* On a first pass over the case clauses, we flatten the keys and their
+         * targets (the latter represented with asm.Labels). That representation
+         * allows JCodeMethodV to emit a lookupswitch or a tableswitch.
+         *
+         * On a second pass, we emit the switch blocks, one for each different target.
+         */
+
+        var flatKeys: List[Int]       = Nil
+        var targets:  List[asm.Label] = Nil
+        var default:  asm.Label       = null
+        var switchBlocks: List[(asm.Label, Tree)] = Nil
+
+        genLoad(selector, INT)
+
+        // collect switch blocks and their keys, but don't emit yet any switch-block.
+        for (caze @ CaseDef(pat, guard, body) <- cases) {
+          assert(guard == tpd.EmptyTree, guard)
+          val switchBlockPoint = new asm.Label
+          switchBlocks ::= (switchBlockPoint, body)
+          pat match {
+            case Literal(value) =>
+              flatKeys ::= value.intValue
+              targets  ::= switchBlockPoint
+            case Ident(nme.WILDCARD) =>
+              assert(default == null, s"multiple default targets in a Match node, at ${tree.span}")
+              default = switchBlockPoint
+            case Alternative(alts) =>
+              alts foreach {
+                case Literal(value) =>
+                  flatKeys ::= value.intValue
+                  targets  ::= switchBlockPoint
+                case _ =>
+                  abort(s"Invalid alternative in alternative pattern in Match node: $tree at: ${tree.span}")
+              }
+            case _ =>
+              abort(s"Invalid pattern in Match node: $tree at: ${tree.span}")
+          }
         }
-      }
 
-      bc.emitSWITCH(mkArrayReverse(flatKeys), mkArrayL(targets.reverse), default, MIN_SWITCH_DENSITY)
+        bc.emitSWITCH(mkArrayReverse(flatKeys), mkArrayL(targets.reverse), default, MIN_SWITCH_DENSITY)
 
-      // emit switch-blocks.
-      val postMatch = new asm.Label
-      for (sb <- switchBlocks.reverse) {
-        val (caseLabel, caseBody) = sb
-        markProgramPoint(caseLabel)
-        genLoad(caseBody, generatedType)
-        bc goTo postMatch
+        // emit switch-blocks.
+        for (sb <- switchBlocks.reverse) {
+          val (caseLabel, caseBody) = sb
+          markProgramPoint(caseLabel)
+          genLoad(caseBody, generatedType)
+          bc goTo postMatch
+        }
+      } else {
+
+        /* Since the JVM doesn't have a way to switch on a string, we  switch
+         * on the `hashCode` of the string then do an `equals` check (with a
+         * possible second set of jumps if blocks can be reach from multiple
+         * string alternatives).
+         *
+         * This mirrors the way that Java compiles `switch` on Strings.
+         */
+
+        var default:  asm.Label       = null
+        var indirectBlocks: List[(asm.Label, Tree)] = Nil
+
+        import scala.collection.mutable
+
+        // Cases grouped by their hashCode
+        val casesByHash = SortedMap.empty[Int, List[(String, Either[asm.Label, Tree])]]
+        var caseFallback: Tree = null
+
+        for (caze @ CaseDef(pat, guard, body) <- cases) {
+          assert(guard == tpd.EmptyTree, guard)
+          pat match {
+            case Literal(value) =>
+              val strValue = value.stringValue
+              casesByHash.updateWith(strValue.##) { existingCasesOpt =>
+                val newCase = (strValue, Right(body))
+                Some(newCase :: existingCasesOpt.getOrElse(Nil))
+              }
+            case Ident(nme.WILDCARD) =>
+              assert(default == null, s"multiple default targets in a Match node, at ${tree.span}")
+              default = new asm.Label
+              indirectBlocks ::= (default, body)
+            case Alternative(alts) =>
+              // We need an extra basic block since multiple strings can lead to this code
+              val indirectCaseGroupLabel = new asm.Label
+              indirectBlocks ::= (indirectCaseGroupLabel, body)
+              alts foreach {
+                case Literal(value) =>
+                  val strValue = value.stringValue
+                  casesByHash.updateWith(strValue.##) { existingCasesOpt =>
+                    val newCase = (strValue, Left(indirectCaseGroupLabel))
+                    Some(newCase :: existingCasesOpt.getOrElse(Nil))
+                  }
+                case _ =>
+                  abort(s"Invalid alternative in alternative pattern in Match node: $tree at: ${tree.span}")
+              }
+
+            case _ =>
+              abort(s"Invalid pattern in Match node: $tree at: ${tree.span}")
+          }
+        }
+
+        // Organize the hashCode options into switch cases
+        var flatKeys: List[Int]       = Nil
+        var targets:  List[asm.Label] = Nil
+        var hashBlocks: List[(asm.Label, List[(String, Either[asm.Label, Tree])])] = Nil
+        for ((hashValue, hashCases) <- casesByHash) {
+          val switchBlockPoint = new asm.Label
+          hashBlocks ::= (switchBlockPoint, hashCases)
+          flatKeys ::= hashValue
+          targets  ::= switchBlockPoint
+        }
+
+        // Push the hashCode of the string (or `0` it is `null`) onto the stack and switch on it
+        genLoadIf(
+          If(
+            tree.selector.select(defn.Any_==).appliedTo(nullLiteral),
+            Literal(Constant(0)),
+            tree.selector.select(defn.Any_hashCode).appliedToNone
+          ),
+          INT
+        )
+        bc.emitSWITCH(mkArrayReverse(flatKeys), mkArrayL(targets.reverse), default, MIN_SWITCH_DENSITY)
+
+        // emit blocks for each hash case
+        for ((hashLabel, caseAlternatives) <- hashBlocks.reverse) {
+          markProgramPoint(hashLabel)
+          for ((caseString, indirectLblOrBody) <- caseAlternatives) {
+            val comparison = if (caseString == null) defn.Any_== else defn.Any_equals
+            val condp = Literal(Constant(caseString)).select(defn.Any_==).appliedTo(tree.selector)
+            val keepGoing = new asm.Label
+            indirectLblOrBody match {
+              case Left(jump) =>
+                genCond(condp, jump, keepGoing, targetIfNoJump = keepGoing)
+
+              case Right(caseBody) =>
+                val thisCaseMatches = new asm.Label
+                genCond(condp, thisCaseMatches, keepGoing, targetIfNoJump = thisCaseMatches)
+                markProgramPoint(thisCaseMatches)
+                genLoad(caseBody, generatedType)
+                bc goTo postMatch
+            }
+            markProgramPoint(keepGoing)
+          }
+          bc goTo default
+        }
+
+        // emit blocks for common patterns
+        for ((caseLabel, caseBody) <- indirectBlocks.reverse) {
+          markProgramPoint(caseLabel)
+          genLoad(caseBody, generatedType)
+          bc goTo postMatch
+        }
       }
 
       markProgramPoint(postMatch)
@@ -1063,30 +1187,109 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
       }
     }
 
+    /* Generate string concatenation
+     *
+     * On JDK 8: create and append using `StringBuilder`
+     * On JDK 9+: use `invokedynamic` with `StringConcatFactory`
+     */
     def genStringConcat(tree: Tree): BType = {
       lineNumber(tree)
       liftStringConcat(tree) match {
-        // Optimization for expressions of the form "" + x.  We can avoid the StringBuilder.
+        // Optimization for expressions of the form "" + x
         case List(Literal(Constant("")), arg) =>
           genLoad(arg, ObjectReference)
           genCallMethod(defn.String_valueOf_Object, InvokeStyle.Static)
 
         case concatenations =>
-          bc.genStartConcat
-          for (elem <- concatenations) {
-            val loadedElem = elem match {
+          val concatArguments = concatenations.view
+            .filter {
+              case Literal(Constant("")) => false // empty strings are no-ops in concatenation
+              case _ => true
+            }
+            .map {
               case Apply(boxOp, value :: Nil) if Erasure.Boxing.isBox(boxOp.symbol) && boxOp.symbol.denot.owner != defn.UnitModuleClass =>
                 // Eliminate boxing of primitive values. Boxing is introduced by erasure because
                 // there's only a single synthetic `+` method "added" to the string class.
                 value
+              case other => other
+            }
+            .toList
+
+          // `StringConcatFactory` only got added in JDK 9, so use `StringBuilder` for lower
+          if (classfileVersion < asm.Opcodes.V9) {
+
+            // Estimate capacity needed for the string builder
+            val approxBuilderSize = concatArguments.view.map {
+              case Literal(Constant(s: String)) => s.length
+              case Literal(c @ Constant(_)) if c.isNonUnitAnyVal => String.valueOf(c).length
+              case _ => 0
+            }.sum
+            bc.genNewStringBuilder(approxBuilderSize)
+
+            for (elem <- concatArguments) {
+              val elemType = tpeTK(elem)
+              genLoad(elem, elemType)
+              bc.genStringBuilderAppend(elemType)
+            }
+            bc.genStringBuilderEnd
+          } else {
 
-              case _ => elem
+            /* `StringConcatFactory#makeConcatWithConstants` accepts max 200 argument slots. If
+             * the string concatenation is longer (unlikely), we spill into multiple calls
+             */
+            val MaxIndySlots = 200
+            val TagArg = '\u0001'    // indicates a hole (in the recipe string) for an argument
+            val TagConst = '\u0002'  // indicates a hole (in the recipe string) for a constant
+
+            val recipe = new StringBuilder()
+            val argTypes = Seq.newBuilder[asm.Type]
+            val constVals = Seq.newBuilder[String]
+            var totalArgSlots = 0
+            var countConcats = 1     // ie. 1 + how many times we spilled
+
+            for (elem <- concatArguments) {
+              val tpe = tpeTK(elem)
+              val elemSlots = tpe.size
+
+              // Unlikely spill case
+              if (totalArgSlots + elemSlots >= MaxIndySlots) {
+                bc.genIndyStringConcat(recipe.toString, argTypes.result(), constVals.result())
+                countConcats += 1
+                totalArgSlots = 0
+                recipe.setLength(0)
+                argTypes.clear()
+                constVals.clear()
+              }
+
+              elem match {
+                case Literal(Constant(s: String)) =>
+                  if (s.contains(TagArg) || s.contains(TagConst)) {
+                    totalArgSlots += elemSlots
+                    recipe.append(TagConst)
+                    constVals += s
+                  } else {
+                    recipe.append(s)
+                  }
+
+                case other =>
+                  totalArgSlots += elemSlots
+                  recipe.append(TagArg)
+                  val tpe = tpeTK(elem)
+                  argTypes += tpe.toASMType
+                  genLoad(elem, tpe)
+              }
+            }
+            bc.genIndyStringConcat(recipe.toString, argTypes.result(), constVals.result())
+
+            // If we spilled, generate one final concat
+            if (countConcats > 1) {
+              bc.genIndyStringConcat(
+                TagArg.toString * countConcats,
+                Seq.fill(countConcats)(StringRef.toASMType),
+                Seq.empty
+              )
             }
-            val elemType = tpeTK(loadedElem)
-            genLoad(loadedElem, elemType)
-            bc.genConcat(elemType)
           }
-          bc.genEndConcat
       }
       StringRef
     }
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala b/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala
index d8a38e263970..4085d87ad7ca 100644
--- a/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala
+++ b/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala
@@ -21,11 +21,13 @@ import dotty.tools.dotc.core.Names.Name
 import dotty.tools.dotc.core.NameKinds.ExpandedName
 import dotty.tools.dotc.core.Signature
 import dotty.tools.dotc.core.StdNames._
+import dotty.tools.dotc.core.NameKinds
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.core.TypeErasure
 import dotty.tools.dotc.transform.GenericSignatures
+import dotty.tools.dotc.transform.ElimErasedValueType
 import dotty.tools.io.AbstractFile
 import dotty.tools.dotc.report
 
@@ -341,6 +343,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
     def emitParamNames(jmethod: asm.MethodVisitor, params: List[Symbol]) =
       for param <- params do
         var access = asm.Opcodes.ACC_FINAL
+        if param.is(Artifact) then access |= asm.Opcodes.ACC_SYNTHETIC
         jmethod.visitParameter(param.name.mangledString, access)
 
     /*
@@ -506,7 +509,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
      *
      * must-single-thread
      */
-    private def addForwarder(jclass: asm.ClassVisitor, module: Symbol, m: Symbol): Unit = {
+    private def addForwarder(jclass: asm.ClassVisitor, module: Symbol, m: Symbol, isSynthetic: Boolean): Unit = {
       val moduleName     = internalName(module)
       val methodInfo     = module.thisType.memberInfo(m)
       val paramJavaTypes: List[BType] = methodInfo.firstParamTypes map toTypeKind
@@ -517,9 +520,10 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
        *  and we don't know what classes might be subclassing the companion class.  See SI-4827.
        */
       // TODO: evaluate the other flags we might be dropping on the floor here.
-      // TODO: ACC_SYNTHETIC ?
       val flags = GenBCodeOps.PublicStatic | (
         if (m.is(JavaVarargs)) asm.Opcodes.ACC_VARARGS else 0
+      ) | (
+        if (isSynthetic) asm.Opcodes.ACC_SYNTHETIC else 0
       )
 
       // TODO needed? for(ann <- m.annotations) { ann.symbol.initialize }
@@ -594,7 +598,16 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
           report.log(s"No forwarder for non-public member $m")
         else {
           report.log(s"Adding static forwarder for '$m' from $jclassName to '$moduleClass'")
-          addForwarder(jclass, moduleClass, m)
+          // It would be simpler to not generate forwarders for these methods,
+          // but that wouldn't be binary-compatible with Scala 3.0.0, so instead
+          // we generate ACC_SYNTHETIC forwarders so Java compilers ignore them.
+          val isSynthetic =
+            m0.name.is(NameKinds.SyntheticSetterName) ||
+            // Only hide bridges generated at Erasure, mixin forwarders are also
+            // marked as bridge but shouldn't be hidden since they don't have a
+            // non-bridge overload.
+            m0.is(Bridge) && m0.initial.validFor.firstPhaseId == erasurePhase.next.id
+          addForwarder(jclass, moduleClass, m, isSynthetic)
         }
       }
     }
@@ -926,7 +939,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
     // (one that doesn't erase to the actual signature). See run/t3452b for a test case.
 
     val memberTpe = atPhase(erasurePhase) { moduleClass.denot.thisType.memberInfo(sym) }
-    val erasedMemberType = TypeErasure.fullErasure(memberTpe)
+    val erasedMemberType = ElimErasedValueType.elimEVT(TypeErasure.transformInfo(sym, memberTpe))
     if (erasedMemberType =:= sym.denot.info)
       getGenericSignatureHelper(sym, moduleClass, memberTpe).orNull
     else null
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala b/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala
index 614548ff361e..fffefae8a165 100644
--- a/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala
+++ b/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala
@@ -34,7 +34,7 @@ trait BCodeIdiomatic {
       case (Some(release), None) => release
       case (None, Some(target)) => target
       case (Some(release), Some(_)) =>
-        report.warning(s"The value of ${ctx.settings.Xtarget.name} was overriden by ${ctx.settings.release.name}")
+        report.warning(s"The value of ${ctx.settings.Xtarget.name} was overridden by ${ctx.settings.release.name}")
         release
       case (None, None) => "8" // least supported version by default
 
@@ -224,24 +224,27 @@ trait BCodeIdiomatic {
 
     } // end of method genPrimitiveShift()
 
-    /*
+    /* Creates a new `StringBuilder` instance with the requested capacity
+     *
      * can-multi-thread
      */
-    final def genStartConcat: Unit = {
+    final def genNewStringBuilder(size: Int): Unit = {
       jmethod.visitTypeInsn(Opcodes.NEW, JavaStringBuilderClassName)
       jmethod.visitInsn(Opcodes.DUP)
+      jmethod.visitLdcInsn(Integer.valueOf(size))
       invokespecial(
         JavaStringBuilderClassName,
         INSTANCE_CONSTRUCTOR_NAME,
-        "()V",
+        "(I)V",
         itf = false
       )
     }
 
-    /*
+    /* Issue a call to `StringBuilder#append` for the right element type
+     *
      * can-multi-thread
      */
-    def genConcat(elemType: BType): Unit = {
+    final def genStringBuilderAppend(elemType: BType): Unit = {
       val paramType = elemType match {
         case ct: ClassBType if ct.isSubtypeOf(StringRef)          => StringRef
         case ct: ClassBType if ct.isSubtypeOf(jlStringBufferRef)  => jlStringBufferRef
@@ -257,13 +260,38 @@ trait BCodeIdiomatic {
       invokevirtual(JavaStringBuilderClassName, "append", bt.descriptor)
     }
 
-    /*
+    /* Extract the built `String` from the `StringBuilder`
+     *
      * can-multi-thread
      */
-    final def genEndConcat: Unit = {
+    final def genStringBuilderEnd: Unit = {
       invokevirtual(JavaStringBuilderClassName, "toString", "()Ljava/lang/String;")
     }
 
+    /* Concatenate top N arguments on the stack with `StringConcatFactory#makeConcatWithConstants`
+     * (only works for JDK 9+)
+     *
+     * can-multi-thread
+     */
+    final def genIndyStringConcat(
+      recipe: String,
+      argTypes: Seq[asm.Type],
+      constants: Seq[String]
+    ): Unit = {
+      jmethod.visitInvokeDynamicInsn(
+        "makeConcatWithConstants",
+        asm.Type.getMethodDescriptor(StringRef.toASMType, argTypes:_*),
+        new asm.Handle(
+          asm.Opcodes.H_INVOKESTATIC,
+          "java/lang/invoke/StringConcatFactory",
+          "makeConcatWithConstants",
+          "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;",
+          false
+        ),
+        (recipe +: constants):_*
+      )
+    }
+
     /*
      * Emits one or more conversion instructions based on the types given as arguments.
      *
@@ -405,6 +433,7 @@ trait BCodeIdiomatic {
 
     final def load( idx: Int, tk: BType): Unit = { emitVarInsn(Opcodes.ILOAD,  idx, tk) } // can-multi-thread
     final def store(idx: Int, tk: BType): Unit = { emitVarInsn(Opcodes.ISTORE, idx, tk) } // can-multi-thread
+    final def iinc( idx: Int, increment: Int): Unit = jmethod.visitIincInsn(idx, increment) // can-multi-thread
 
     final def aload( tk: BType): Unit = { emitTypeBased(JCodeMethodN.aloadOpcodes,  tk) } // can-multi-thread
     final def astore(tk: BType): Unit = { emitTypeBased(JCodeMethodN.astoreOpcodes, tk) } // can-multi-thread
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
index 43a926001456..86150f114d2c 100644
--- a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
+++ b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
@@ -70,7 +70,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
     with    BCJGenSigGen {
 
     // Strangely I can't find this in the asm code 255, but reserving 1 for "this"
-    final val MaximumJvmParameters = 254
+    inline val MaximumJvmParameters = 254
 
     // current class
     var cnode: ClassNode1          = null
@@ -139,6 +139,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
         // See `tests/run/given-var.scala`
         //
 
+        // !!! Part of this logic is duplicated in JSCodeGen.genCompilationUnit
         claszSymbol.info.decls.foreach { f =>
           if f.isField && !f.name.is(LazyBitMapName) then
             f.setFlag(JavaStatic)
@@ -206,7 +207,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
       val optSerial: Option[Long] =
         claszSymbol.getAnnotation(defn.SerialVersionUIDAnnot).flatMap { annot =>
           if (claszSymbol.is(Trait)) {
-            report.error("@SerialVersionUID does nothing on a trait", annot.tree.sourcePos)
+            report.warning("@SerialVersionUID does nothing on a trait", annot.tree.sourcePos)
             None
           } else {
             val vuid = annot.argumentConstant(0).map(_.longValue)
@@ -291,7 +292,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
       emitAnnotations(cnode, claszSymbol.annotations ++ ssa)
 
       if (!isCZStaticModule && !isCZParcelable) {
-        val skipStaticForwarders = (claszSymbol.isInterface || claszSymbol.is(Module) || ctx.settings.XnoForwarders.value)
+        val skipStaticForwarders = (claszSymbol.is(Module) || ctx.settings.XnoForwarders.value)
         if (!skipStaticForwarders) {
           val lmoc = claszSymbol.companionModule
           // add static forwarders if there are no name conflicts; see bugs #363 and #1735
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala b/compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala
index 04425b524b93..d326bcfa242a 100644
--- a/compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala
+++ b/compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala
@@ -27,7 +27,7 @@ trait BCodeSyncAndTry extends BCodeBodyBuilder {
    */
   abstract class SyncAndTryBuilder(cunit: CompilationUnit) extends PlainBodyBuilder(cunit) {
 
-    def genSynchronized(tree: Apply, expectedType: BType): BType = tree match {
+    def genSynchronized(tree: Apply, expectedType: BType): BType = (tree: @unchecked) match {
       case Apply(TypeApply(fun, _), args) =>
       val monitor = locals.makeLocal(ObjectReference, "monitor", defn.ObjectType, tree.span)
       val monCleanup = new asm.Label
diff --git a/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala b/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala
index d8cb5534e5e3..25a05077626a 100644
--- a/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala
+++ b/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala
@@ -5,7 +5,7 @@ package jvm
 import scala.tools.asm
 import scala.annotation.threadUnsafe
 import scala.collection.mutable
-import scala.collection.generic.Clearable
+import scala.collection.mutable.Clearable
 
 import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.Contexts._
@@ -13,7 +13,6 @@ import dotty.tools.dotc.core.Phases._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.transform.SymUtils._
-import dotty.tools.dotc.util.WeakHashSet
 
 /**
  * This class mainly contains the method classBTypeFromSymbol, which extracts the necessary
@@ -49,7 +48,6 @@ class BTypesFromSymbols[I <: DottyBackendInterface](val int: I) extends BTypes {
     def newAnyRefMap[K <: AnyRef, V](): mutable.AnyRefMap[K, V] = new mutable.AnyRefMap[K, V]()
     def newWeakMap[K, V](): mutable.WeakHashMap[K, V] = new mutable.WeakHashMap[K, V]()
     def recordCache[T <: Clearable](cache: T): T = cache
-    def newWeakSet[K >: Null <: AnyRef](): WeakHashSet[K] = new WeakHashSet[K]()
     def newMap[K, V](): mutable.HashMap[K, V] = new mutable.HashMap[K, V]()
     def newSet[K](): mutable.Set[K] = new mutable.HashSet[K]
   }
@@ -60,7 +58,6 @@ class BTypesFromSymbols[I <: DottyBackendInterface](val int: I) extends BTypes {
     def newWeakMap[K, V](): collection.mutable.WeakHashMap[K, V]
     def newMap[K, V](): collection.mutable.HashMap[K, V]
     def newSet[K](): collection.mutable.Set[K]
-    def newWeakSet[K >: Null <: AnyRef](): dotty.tools.dotc.util.WeakHashSet[K]
     def newAnyRefMap[K <: AnyRef, V](): collection.mutable.AnyRefMap[K, V]
   }
 
@@ -214,7 +211,7 @@ class BTypesFromSymbols[I <: DottyBackendInterface](val int: I) extends BTypes {
   private def definedClasses(sym: Symbol, phase: Phase) =
     if (sym.isDefinedInCurrentRun)
       atPhase(phase) {
-        toDenot(sym).info.decls.filter(_.isClass)
+        toDenot(sym).info.decls.filter(sym => sym.isClass && !sym.isEffectivelyErased)
       }
     else Nil
 
diff --git a/compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala b/compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala
index 35bc25693d10..299c1c75d6cf 100644
--- a/compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala
+++ b/compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala
@@ -20,7 +20,9 @@ import dotty.tools.dotc.transform.MegaPhase.MiniPhase
 class CollectSuperCalls extends MiniPhase {
   import tpd._
 
-  def phaseName: String = "collectSuperCalls"
+  override def phaseName: String = CollectSuperCalls.name
+
+  override def description: String = CollectSuperCalls.description
 
   override def transformSelect(tree: Select)(using Context): Tree = {
     tree.qualifier match {
@@ -40,3 +42,7 @@ class CollectSuperCalls extends MiniPhase {
     }
   }
 }
+
+object CollectSuperCalls:
+  val name: String = "collectSuperCalls"
+  val description: String = "find classes that are called with super"
diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
index a5aa8abd1c7c..64e667d95b68 100644
--- a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
+++ b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
@@ -12,7 +12,6 @@ import scala.annotation.threadUnsafe
 import scala.collection.generic.Clearable
 import scala.collection.mutable
 import scala.reflect.ClassTag
-import dotty.tools.dotc.util.WeakHashSet
 import dotty.tools.io.AbstractFile
 import scala.tools.asm.AnnotationVisitor
 import dotty.tools.dotc.core._
diff --git a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala
index 0c3c24916da5..2f2f653ae2e2 100644
--- a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala
+++ b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala
@@ -34,7 +34,10 @@ import StdNames._
 import dotty.tools.io._
 
 class GenBCode extends Phase {
-  def phaseName: String = GenBCode.name
+
+  override def phaseName: String = GenBCode.name
+
+  override def description: String = GenBCode.description
 
   private val superCallsMap = new MutableSymbolMap[Set[ClassSymbol]]
   def registerSuperCall(sym: Symbol, calls: ClassSymbol): Unit = {
@@ -42,6 +45,9 @@ class GenBCode extends Phase {
     superCallsMap.update(sym, old + calls)
   }
 
+  private val entryPoints = new mutable.HashSet[String]()
+  def registerEntryPoint(s: String): Unit = entryPoints += s
+
   private var myOutput: AbstractFile = _
 
   private def outputDir(using Context): AbstractFile = {
@@ -61,21 +67,49 @@ class GenBCode extends Phase {
 
 
   override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] = {
+    outputDir match
+      case jar: JarArchive =>
+        updateJarManifestWithMainClass(jar, entryPoints.toList)
+      case _ =>
     try super.runOn(units)
-    finally myOutput match {
+    finally outputDir match {
       case jar: JarArchive =>
         if (ctx.run.suspendedUnits.nonEmpty)
           // If we close the jar the next run will not be able to write on the jar.
           // But if we do not close it we cannot use it as part of the macro classpath of the suspended files.
           report.error("Can not suspend and output to a jar at the same time. See suspension with -Xprint-suspension.")
+
         jar.close()
       case _ =>
     }
   }
+
+  private def updateJarManifestWithMainClass(jarArchive: JarArchive, entryPoints: List[String])(using Context): Unit =
+    val mainClass = Option.when(!ctx.settings.XmainClass.isDefault)(ctx.settings.XmainClass.value).orElse {
+      entryPoints match
+        case List(mainClass) =>
+          Some(mainClass)
+        case Nil =>
+          report.warning("No Main-Class designated or discovered.")
+          None
+        case mcs =>
+          report.warning(s"No Main-Class due to multiple entry points:\n  ${mcs.mkString("\n  ")}")
+          None
+    }
+    mainClass.map { mc =>
+      val manifest = Jar.WManifest()
+      manifest.mainClass = mc
+      val file = jarArchive.subdirectoryNamed("META-INF").fileNamed("MANIFEST.MF")
+      val os = file.output
+      manifest.underlying.write(os)
+      os.close()
+    }
+  end updateJarManifestWithMainClass
 }
 
 object GenBCode {
   val name: String = "genBCode"
+  val description: String = "generate JVM bytecode"
 }
 
 class GenBCodePipeline(val int: DottyBackendInterface, val primitives: DottyPrimitives)(using Context) extends BCodeSyncAndTry {
diff --git a/compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala b/compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala
index a5eb4f0d117a..1579b4577933 100644
--- a/compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala
+++ b/compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala
@@ -6,7 +6,10 @@ import Phases._
 
 /** Generates Scala.js IR files for the compilation unit. */
 class GenSJSIR extends Phase {
-  def phaseName: String = "genSJSIR"
+
+  override def phaseName: String = GenSJSIR.name
+
+  override def description: String = GenSJSIR.description
 
   override def isRunnable(using Context): Boolean =
     super.isRunnable && ctx.settings.scalajs.value
@@ -14,3 +17,7 @@ class GenSJSIR extends Phase {
   def run(using Context): Unit =
     new JSCodeGen().run()
 }
+
+object GenSJSIR:
+  val name: String = "genSJSIR"
+  val description: String = "generate .sjsir files for Scala.js"
diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
index 38641cea93e4..56e16647d080 100644
--- a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
+++ b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
@@ -18,6 +18,7 @@ import Decorators._
 import Flags._
 import dotty.tools.dotc.ast.Trees._
 import Names._
+import NameKinds.DefaultGetterName
 import Types._
 import Symbols._
 import Denotations._
@@ -41,7 +42,6 @@ import org.scalajs.ir.Trees.OptimizerHints
 import dotty.tools.dotc.transform.sjs.JSSymUtils._
 
 import JSEncoding._
-import JSInterop._
 import ScopedVar.withScopedVars
 
 /** Main codegen for Scala.js IR.
@@ -103,6 +103,17 @@ class JSCodeGen()(using genCtx: Context) {
     }
   }
 
+  private def withPerMethodBodyState[A](methodSym: Symbol)(body: => A): A = {
+    withScopedVars(
+        currentMethodSym := methodSym,
+        thisLocalVarIdent := None,
+        isModuleInitialized := new ScopedVar.VarBox(false),
+        undefinedDefaultParams := mutable.Set.empty,
+    ) {
+      body
+    }
+  }
+
   private def acquireContextualJSClassValue[A](f: Option[js.Tree] => A): A = {
     val jsClassValue = contextualJSClassValue.get
     withScopedVars(
@@ -186,6 +197,23 @@ class JSCodeGen()(using genCtx: Context) {
     }
     val allTypeDefs = collectTypeDefs(cunit.tpdTree)
 
+    /* #13221 Set JavaStatic on all the Module fields of static module classes.
+     * This is necessary for `desugarIdent` not to crash in some obscure
+     * scenarios.
+     *
+     * !!! Part of this logic is duplicated in BCodeSkelBuilder.genPlainClass
+     *
+     * However, here we only do this for Module fields, not all fields.
+     */
+    for (typeDef <- allTypeDefs) {
+      if (typeDef.symbol.is(ModuleClass)) {
+        typeDef.symbol.info.decls.foreach { f =>
+          if (f.isField && f.is(Module))
+            f.setFlag(JavaStatic)
+        }
+      }
+    }
+
     val (anonJSClassTypeDefs, otherTypeDefs) =
       allTypeDefs.partition(td => td.symbol.isAnonymousClass && td.symbol.isJSType)
 
@@ -455,6 +483,13 @@ class JSCodeGen()(using genCtx: Context) {
         i"genNonNativeJSClass() must be called only for non-native JS classes: $sym")
     assert(sym.superClass != NoSymbol, sym)
 
+    if (hasDefaultCtorArgsAndJSModule(sym)) {
+      report.error(
+          "Implementation restriction: " +
+          "constructors of non-native JS classes cannot have default parameters if their companion module is JS native.",
+          td)
+    }
+
     val classIdent = encodeClassNameIdent(sym)
     val originalName = originalNameOfClass(sym)
 
@@ -490,7 +525,7 @@ class JSCodeGen()(using genCtx: Context) {
               /* We add symbols that we have to expose here. This way we also
                * get inherited stuff that is implemented in this class.
                */
-              dispatchMethodNames += jsNameOf(sym)
+              dispatchMethodNames += sym.jsName
             }
           }
 
@@ -521,14 +556,25 @@ class JSCodeGen()(using genCtx: Context) {
 
     val topLevelExports = jsExportsGen.genTopLevelExports(sym)
 
-    val (jsClassCaptures, generatedConstructor) =
-      genJSClassCapturesAndConstructor(sym, constructorTrees.toList)
+    val (generatedConstructor, jsClassCaptures) = withNewLocalNameScope {
+      val isNested = sym.isNestedJSClass
 
-    /* If there is one, the JS super class value is always the first JS class
-     * capture. This is a JSCodeGen-specific invariant (the IR does not rely
-     * on this) enforced in genJSClassCapturesAndConstructor.
-     */
-    val jsSuperClass = jsClassCaptures.map(_.head.ref)
+      if (isNested)
+        localNames.reserveLocalName(JSSuperClassParamName)
+
+      val (captures, ctor) = genJSClassCapturesAndConstructor(constructorTrees.toList)
+
+      val jsClassCaptures = if (isNested) {
+        val superParam = js.ParamDef(js.LocalIdent(JSSuperClassParamName),
+            NoOriginalName, jstpe.AnyType, mutable = false)
+        Some(superParam :: captures)
+      } else {
+        assert(captures.isEmpty, s"found non nested JS class with captures $captures at $pos")
+        None
+      }
+
+      (ctor, jsClassCaptures)
+    }
 
     // Generate fields (and add to methods + ctors)
     val generatedMembers = {
@@ -554,7 +600,7 @@ class JSCodeGen()(using genCtx: Context) {
         jsClassCaptures,
         Some(encodeClassNameIdent(sym.superClass)),
         genClassInterfaces(sym, forJSClass = true),
-        jsSuperClass,
+        jsSuperClass = jsClassCaptures.map(_.head.ref),
         None,
         hashedMemberDefs,
         topLevelExports)(
@@ -743,7 +789,21 @@ class JSCodeGen()(using genCtx: Context) {
 
     def isExcluded(m: Symbol): Boolean = {
       def hasAccessBoundary = m.accessBoundary(defn.RootClass) ne defn.RootClass
-      m.is(Deferred) || m.isConstructor || hasAccessBoundary || (m.owner eq defn.ObjectClass)
+
+      def isOfJLObject: Boolean = m.owner eq defn.ObjectClass
+
+      def isDefaultParamOfJSNativeDef: Boolean = {
+        m.name.is(DefaultGetterName) && {
+          val info = new DefaultParamInfo(m)
+          !info.isForConstructor && info.attachedMethod.hasAnnotation(jsdefn.JSNativeAnnot)
+        }
+      }
+
+      m.is(Deferred)
+        || m.isConstructor
+        || hasAccessBoundary
+        || isOfJLObject
+        || m.hasAnnotation(jsdefn.JSNativeAnnot) || isDefaultParamOfJSNativeDef // #4557
     }
 
     val forwarders = for {
@@ -959,47 +1019,361 @@ class JSCodeGen()(using genCtx: Context) {
 
   // Constructor of a non-native JS class ------------------------------------
 
-  def genJSClassCapturesAndConstructor(classSym: Symbol,
-      constructorTrees: List[DefDef]): (Option[List[js.ParamDef]], js.JSMethodDef) = {
-    implicit val pos = classSym.span
+  def genJSClassCapturesAndConstructor(constructorTrees: List[DefDef])(
+      implicit pos: SourcePosition): (List[js.ParamDef], js.JSMethodDef) = {
+    /* We need to merge all Scala constructors into a single one because the
+     * IR, like JavaScript, only allows a single one.
+     *
+     * We do this by applying:
+     * 1. Applying runtime type based dispatch, just like exports.
+     * 2. Splitting secondary ctors into parts before and after the `this` call.
+     * 3. Topo-sorting all constructor statements and including/excluding
+     *    them based on the overload that was chosen.
+     */
 
-    if (hasDefaultCtorArgsAndJSModule(classSym)) {
-      report.error(
-          "Implementation restriction: " +
-          "constructors of non-native JS classes cannot have default parameters if their companion module is JS native.",
-          classSym.srcPos)
-      val ctorDef = js.JSMethodDef(js.MemberFlags.empty,
-          js.StringLiteral("constructor"), Nil, None, js.Skip())(
-          OptimizerHints.empty, None)
-      (None, ctorDef)
-    } else {
-      withNewLocalNameScope {
-        localNames.reserveLocalName(JSSuperClassParamName)
+    val (primaryTree :: Nil, secondaryTrees) =
+      constructorTrees.partition(_.symbol.isPrimaryConstructor)
+
+    val primaryCtor = genPrimaryJSClassCtor(primaryTree)
+    val secondaryCtors = secondaryTrees.map(genSecondaryJSClassCtor(_))
+
+    // VarDefs for the parameters of all constructors.
+    val paramVarDefs = for {
+      vparam <- constructorTrees.flatMap(_.paramss.flatten)
+    } yield {
+      val sym = vparam.symbol
+      val tpe = toIRType(sym.info)
+      js.VarDef(encodeLocalSym(sym), originalNameOfLocal(sym), tpe, mutable = true, jstpe.zeroOf(tpe))(vparam.span)
+    }
+
+    /* organize constructors in a called-by tree
+     * (the implicit root is the primary constructor)
+     */
+    val ctorTree = {
+      val ctorToChildren = secondaryCtors
+        .groupBy(_.targetCtor)
+        .withDefaultValue(Nil)
+
+      /* when constructing the call-by tree, we use pre-order traversal to
+       * assign overload numbers.
+       * this puts all descendants of a ctor in a range of overloads numbers.
+       *
+       * this property is useful, later, when we need to make statements
+       * conditional based on the chosen overload.
+       */
+      var nextOverloadNum = 0
+      def subTree[T <: JSCtor](ctor: T): ConstructorTree[T] = {
+        val overloadNum = nextOverloadNum
+        nextOverloadNum += 1
+        val subtrees = ctorToChildren(ctor.sym).map(subTree(_))
+        new ConstructorTree(overloadNum, ctor, subtrees)
+      }
+
+      subTree(primaryCtor)
+    }
+
+    /* prepare overload dispatch for all constructors.
+     * as a side-product, we retrieve the capture parameters.
+     */
+    val (exports, jsClassCaptures) = {
+      val exports = List.newBuilder[jsExportsGen.Exported]
+      val jsClassCaptures = List.newBuilder[js.ParamDef]
+
+      def add(tree: ConstructorTree[_ <: JSCtor]): Unit = {
+        val (e, c) = genJSClassCtorDispatch(tree.ctor.sym,
+            tree.ctor.paramsAndInfo, tree.overloadNum)
+        exports += e
+        jsClassCaptures ++= c
+        tree.subCtors.foreach(add(_))
+      }
+
+      add(ctorTree)
+
+      (exports.result(), jsClassCaptures.result())
+    }
 
-        val ctors: List[js.MethodDef] = constructorTrees.flatMap { tree =>
-          genMethodWithCurrentLocalNameScope(tree)
+    val (formalArgs, restParam, overloadDispatchBody) =
+      jsExportsGen.genOverloadDispatch(JSName.Literal("constructor"), exports, jstpe.IntType)
+
+    val overloadVar = js.VarDef(freshLocalIdent("overload"), NoOriginalName,
+        jstpe.IntType, mutable = false, overloadDispatchBody)
+
+    val ctorStats = genJSClassCtorStats(overloadVar.ref, ctorTree)
+
+    val constructorBody = js.Block(
+        paramVarDefs ::: List(overloadVar, ctorStats, js.Undefined()))
+
+    val constructorDef = js.JSMethodDef(
+        js.MemberFlags.empty,
+        js.StringLiteral("constructor"),
+        formalArgs, restParam, constructorBody)(OptimizerHints.empty, None)
+
+    (jsClassCaptures, constructorDef)
+  }
+
+  private def genPrimaryJSClassCtor(dd: DefDef): PrimaryJSCtor = {
+    val sym = dd.symbol
+    val Block(stats, _) = dd.rhs
+    assert(sym.isPrimaryConstructor, s"called with non-primary ctor: $sym")
+
+    var jsSuperCall: Option[js.JSSuperConstructorCall] = None
+    val jsStats = List.newBuilder[js.Tree]
+
+    /* Move all statements after the super constructor call since JS
+     * cannot access `this` before the super constructor call.
+     *
+     * dotc inserts statements before the super constructor call for param
+     * accessor initializers (including val's and var's declared in the
+     * params). We move those after the super constructor call, and are
+     * therefore executed later than for a Scala class.
+     */
+    withPerMethodBodyState(sym) {
+      stats.foreach {
+        case tree @ Apply(fun @ Select(Super(This(_), _), _), args)
+            if fun.symbol.isClassConstructor =>
+          assert(jsSuperCall.isEmpty, s"Found 2 JS Super calls at ${dd.sourcePos}")
+          implicit val pos: Position = tree.span
+          jsSuperCall = Some(js.JSSuperConstructorCall(genActualJSArgs(fun.symbol, args)))
+
+        case stat =>
+          val jsStat = genStat(stat)
+          assert(jsSuperCall.isDefined || !jsStat.isInstanceOf[js.VarDef],
+              "Trying to move a local VarDef after the super constructor call of a non-native JS class at " +
+              dd.sourcePos)
+          jsStats += jsStat
+      }
+    }
+
+    assert(jsSuperCall.isDefined,
+        s"Did not find Super call in primary JS construtor at ${dd.sourcePos}")
+
+    new PrimaryJSCtor(sym, genParamsAndInfo(sym, dd.paramss), jsSuperCall.get :: jsStats.result())
+  }
+
+  private def genSecondaryJSClassCtor(dd: DefDef): SplitSecondaryJSCtor = {
+    val sym = dd.symbol
+    assert(!sym.isPrimaryConstructor, s"called with primary ctor $sym")
+
+    def flattenBlocks(t: Tree): List[Tree] = t match {
+      case Block(stats, expr) => (stats :+ expr).flatMap(flattenBlocks)
+      case _                  => t :: Nil
+    }
+    val stats = flattenBlocks(dd.rhs)
+
+    val beforeThisCall = List.newBuilder[js.Tree]
+    var thisCall: Option[(Symbol, List[js.Tree])] = None
+    val afterThisCall = List.newBuilder[js.Tree]
+
+    withPerMethodBodyState(sym) {
+      stats.foreach {
+        case tree @ Apply(fun @ Select(This(_), _), args)
+            if fun.symbol.isClassConstructor =>
+          assert(thisCall.isEmpty,
+              s"duplicate this() call in secondary JS constructor at ${dd.sourcePos}")
+
+          implicit val pos: Position = tree.span
+          val sym = fun.symbol
+          thisCall = Some((sym, genActualArgs(sym, args)))
+
+        case stat =>
+          val jsStat = genStat(stat)
+          if (thisCall.isEmpty)
+            beforeThisCall += jsStat
+          else
+            afterThisCall += jsStat
+      }
+    }
+
+    assert(thisCall.isDefined,
+        i"could not find the this() call in secondary JS constructor at ${dd.sourcePos}:\n${stats.map(_.show).mkString("\n")}")
+    val Some((targetCtor, ctorArgs)) = thisCall
+
+    new SplitSecondaryJSCtor(sym, genParamsAndInfo(sym, dd.paramss),
+        beforeThisCall.result(), targetCtor, ctorArgs, afterThisCall.result())
+  }
+
+  private def genParamsAndInfo(ctorSym: Symbol,
+      vparamss: List[ParamClause]): List[(Symbol, JSParamInfo)] = {
+    implicit val pos: SourcePosition = ctorSym.sourcePos
+
+    val paramSyms = if (vparamss.isEmpty) Nil else vparamss.head.map(_.symbol)
+    paramSyms.zip(ctorSym.jsParamInfos)
+  }
+
+  private def genJSClassCtorDispatch(ctorSym: Symbol,
+      allParamsAndInfos: List[(Symbol, JSParamInfo)],
+      overloadNum: Int): (jsExportsGen.Exported, List[js.ParamDef]) = {
+
+    implicit val pos: SourcePosition = ctorSym.sourcePos
+
+    /* `allParams` are the parameters as seen from inside the constructor body,
+     * i.e., the ones generated by the trees in the constructor body.
+     */
+    val (captureParamsAndInfos, normalParamsAndInfos) =
+      allParamsAndInfos.partition(_._2.capture)
+
+    /* For class captures, we need to generate different names than the ones
+     * used by the constructor body. This is necessary so that we can forward
+     * captures properly between constructor delegation calls.
+     */
+    val (jsClassCaptures, captureAssigns) = (for {
+      (param, info) <- captureParamsAndInfos
+    } yield {
+      val ident = freshLocalIdent(param.name.toTermName)
+      val jsClassCapture =
+        js.ParamDef(ident, originalNameOfLocal(param), toIRType(info.info), mutable = false)
+      val captureAssign =
+        js.Assign(genVarRef(param), jsClassCapture.ref)
+      (jsClassCapture, captureAssign)
+    }).unzip
+
+    val normalInfos = normalParamsAndInfos.map(_._2).toIndexedSeq
+
+    val jsExport = new jsExportsGen.Exported(ctorSym, normalInfos) {
+      def genBody(formalArgsRegistry: jsExportsGen.FormalArgsRegistry): js.Tree = {
+        val paramAssigns = for {
+          ((param, info), i) <- normalParamsAndInfos.zipWithIndex
+        } yield {
+          val rhs = jsExportsGen.genScalaArg(this, i, formalArgsRegistry, info, static = true,
+              captures = captureParamsAndInfos.map(pi => genVarRef(pi._1)))(
+              prevArgsCount => normalParamsAndInfos.take(prevArgsCount).map(pi => genVarRef(pi._1)))
+
+          js.Assign(genVarRef(param), rhs)
         }
 
-        val (captureParams, dispatch) =
-          jsExportsGen.genJSConstructorDispatch(constructorTrees.map(_.symbol))
+        js.Block(captureAssigns ::: paramAssigns, js.IntLiteral(overloadNum))
+      }
+    }
+
+    (jsExport, jsClassCaptures)
+  }
+
+  /** generates a sequence of JS constructor statements based on a constructor tree. */
+  private def genJSClassCtorStats(overloadVar: js.VarRef,
+      ctorTree: ConstructorTree[PrimaryJSCtor])(implicit pos: Position): js.Tree = {
 
-        /* Ensure that the first JS class capture is a reference to the JS super class value.
-         * genNonNativeJSClass and genNewAnonJSClass rely on this.
-         */
-        val captureParamsWithJSSuperClass = captureParams.map { params =>
-          val jsSuperClassParam = js.ParamDef(
-              js.LocalIdent(JSSuperClassParamName), NoOriginalName,
-              jstpe.AnyType, mutable = false)
-          jsSuperClassParam :: params
+    /* generates a statement that conditionally executes body iff the chosen
+     * overload is any of the descendants of `tree` (including itself).
+     *
+     * here we use the property from building the trees, that a set of
+     * descendants always has a range of overload numbers.
+     */
+    def ifOverload(tree: ConstructorTree[_], body: js.Tree): js.Tree = body match {
+      case js.Skip() => js.Skip()
+
+      case body =>
+        val x = overloadVar
+        val cond = {
+          import tree.{lo, hi}
+
+          if (lo == hi) {
+            js.BinaryOp(js.BinaryOp.Int_==, js.IntLiteral(lo), x)
+          } else {
+            val lhs = js.BinaryOp(js.BinaryOp.Int_<=, js.IntLiteral(lo), x)
+            val rhs = js.BinaryOp(js.BinaryOp.Int_<=, x, js.IntLiteral(hi))
+            js.If(lhs, rhs, js.BooleanLiteral(false))(jstpe.BooleanType)
+          }
         }
 
-        val ctorDef = JSConstructorGen.buildJSConstructorDef(dispatch, ctors, freshLocalIdent("overload")) {
-          msg => report.error(msg, classSym.srcPos)
+        js.If(cond, body, js.Skip())(jstpe.NoType)
+    }
+
+    /* preStats / postStats use pre/post order traversal respectively to
+     * generate a topo-sorted sequence of statements.
+     */
+
+    def preStats(tree: ConstructorTree[SplitSecondaryJSCtor],
+        nextParamsAndInfo: List[(Symbol, JSParamInfo)]): js.Tree = {
+      val inner = tree.subCtors.map(preStats(_, tree.ctor.paramsAndInfo))
+
+      assert(tree.ctor.ctorArgs.size == nextParamsAndInfo.size, "param count mismatch")
+      val paramsInfosAndArgs = nextParamsAndInfo.zip(tree.ctor.ctorArgs)
+
+      val (captureParamsInfosAndArgs, normalParamsInfosAndArgs) =
+        paramsInfosAndArgs.partition(_._1._2.capture)
+
+      val captureAssigns = for {
+        ((param, _), arg) <- captureParamsInfosAndArgs
+      } yield {
+        js.Assign(genVarRef(param), arg)
+      }
+
+      val normalAssigns = for {
+        (((param, info), arg), i) <- normalParamsInfosAndArgs.zipWithIndex
+      } yield {
+        val newArg = arg match {
+          case js.Transient(UndefinedParam) =>
+            /* Go full circle: We have ignored the default param getter for
+             * this, we'll create it again.
+             *
+             * This seems not optimal: We could simply not ignore the calls to
+             * default param getters in the first place.
+             *
+             * However, this proves to be difficult: Because of translations in
+             * earlier phases, calls to default param getters may be assigned
+             * to temporary variables first (see the undefinedDefaultParams
+             * ScopedVar). If this happens, it becomes increasingly difficult
+             * to distinguish a default param getter call for a constructor
+             * call of *this* instance (in which case we would want to keep
+             * the default param getter call) from one for a *different*
+             * instance (in which case we would want to discard the default
+             * param getter call)
+             *
+             * Because of this, it ends up being easier to just re-create the
+             * default param getter call if necessary.
+             */
+            implicit val pos: SourcePosition = tree.ctor.sym.sourcePos
+            jsExportsGen.genCallDefaultGetter(tree.ctor.sym, i, static = false,
+                captures = captureParamsInfosAndArgs.map(p => genVarRef(p._1._1)))(
+                prevArgsCount => normalParamsInfosAndArgs.take(prevArgsCount).map(p => genVarRef(p._1._1)))
+
+          case arg => arg
         }
 
-        (captureParamsWithJSSuperClass, ctorDef)
+        js.Assign(genVarRef(param), newArg)
       }
+
+      ifOverload(tree, js.Block(
+          inner ++ tree.ctor.beforeCall ++ captureAssigns ++ normalAssigns))
+    }
+
+    def postStats(tree: ConstructorTree[SplitSecondaryJSCtor]): js.Tree = {
+      val inner = tree.subCtors.map(postStats(_))
+      ifOverload(tree, js.Block(tree.ctor.afterCall ++ inner))
     }
+
+    val primaryCtor = ctorTree.ctor
+    val secondaryCtorTrees = ctorTree.subCtors
+
+    js.Block(
+        secondaryCtorTrees.map(preStats(_, primaryCtor.paramsAndInfo)) ++
+        primaryCtor.body ++
+        secondaryCtorTrees.map(postStats(_))
+    )
+  }
+
+  private sealed trait JSCtor {
+    val sym: Symbol
+    val paramsAndInfo: List[(Symbol, JSParamInfo)]
+  }
+
+  private class PrimaryJSCtor(val sym: Symbol,
+      val paramsAndInfo: List[(Symbol, JSParamInfo)],
+      val body: List[js.Tree]) extends JSCtor
+
+  private class SplitSecondaryJSCtor(val sym: Symbol,
+      val paramsAndInfo: List[(Symbol, JSParamInfo)],
+      val beforeCall: List[js.Tree],
+      val targetCtor: Symbol, val ctorArgs: List[js.Tree],
+      val afterCall: List[js.Tree]) extends JSCtor
+
+  private class ConstructorTree[Ctor <: JSCtor](
+      val overloadNum: Int, val ctor: Ctor,
+      val subCtors: List[ConstructorTree[SplitSecondaryJSCtor]]) {
+    val lo: Int = overloadNum
+    val hi: Int = subCtors.lastOption.fold(lo)(_.hi)
+
+    assert(lo <= hi, "bad overload range")
   }
 
   // Generate a method -------------------------------------------------------
@@ -1042,12 +1416,54 @@ class JSCodeGen()(using genCtx: Context) {
     val vparamss = dd.termParamss
     val rhs = dd.rhs
 
-    withScopedVars(
-        currentMethodSym       := sym,
-        undefinedDefaultParams := mutable.Set.empty,
-        thisLocalVarIdent      := None,
-        isModuleInitialized    := new ScopedVar.VarBox(false)
-    ) {
+    /* Is this method a default accessor that should be ignored?
+     *
+     * This is the case iff one of the following applies:
+     * - It is a constructor default accessor and the linked class is a
+     *   native JS class.
+     * - It is a default accessor for a native JS def, but with the caveat
+     *   that its rhs must be `js.native` because of #4553.
+     *
+     * Both of those conditions can only happen if the default accessor is in
+     * a module class, so we use that as a fast way out. (But omitting that
+     * condition would not change the result.)
+     *
+     * This is different than `isJSDefaultParam` in `genApply`: we do not
+     * ignore default accessors of *non-native* JS types. Neither for
+     * constructor default accessor nor regular default accessors. We also
+     * do not need to worry about non-constructor members of native JS types,
+     * since for those, the entire member list is ignored in `genJSClassData`.
+     */
+    def isIgnorableDefaultParam: Boolean = {
+      sym.name.is(DefaultGetterName) && sym.owner.is(ModuleClass) && {
+        val info = new DefaultParamInfo(sym)
+        if (info.isForConstructor) {
+          /* This is a default accessor for a constructor parameter. Check
+           * whether the attached constructor is a native JS constructor,
+           * which is the case iff the linked class is a native JS type.
+           */
+          info.constructorOwner.hasAnnotation(jsdefn.JSNativeAnnot)
+        } else {
+          /* #4553 We need to ignore default accessors for JS native defs.
+           * However, because Scala.js <= 1.7.0 actually emitted code calling
+           * those accessors, we must keep default accessors that would
+           * compile. The only accessors we can actually get rid of are those
+           * that are `= js.native`.
+           */
+          !sym.owner.isJSType &&
+          info.attachedMethod.hasAnnotation(jsdefn.JSNativeAnnot) && {
+            dd.rhs match {
+              case MaybeAsInstanceOf(Apply(fun, _)) =>
+                fun.symbol == jsdefn.JSPackage_native
+              case _ =>
+                false
+            }
+          }
+        }
+      }
+    }
+
+    withPerMethodBodyState(sym) {
       assert(vparamss.isEmpty || vparamss.tail.isEmpty,
           "Malformed parameter list: " + vparamss)
       val params = if (vparamss.isEmpty) Nil else vparamss.head.map(_.symbol)
@@ -1066,9 +1482,17 @@ class JSCodeGen()(using genCtx: Context) {
         Some(js.MethodDef(js.MemberFlags.empty, methodName, originalName,
             jsParams, toIRType(patchedResultType(sym)), None)(
             OptimizerHints.empty, None))
-      } else if (sym.isJSNativeCtorDefaultParam) {
+      } else if (isIgnorableDefaultParam) {
         // #11592
         None
+      } else if (sym.is(Bridge) && sym.name.is(DefaultGetterName) && currentClassSym.isNonNativeJSClass) {
+        /* #12572 Bridges for default accessors in non-native JS classes must not be emitted,
+         * because they call another default accessor, making their entire body an
+         * <undefined-param> that cannot be eliminated.
+         * Such methods are never called anyway, because they are filtered out in
+         * JSExportsGen.defaultGetterDenot().
+         */
+        None
       } else /*if (sym.isClassConstructor && isHijackedBoxedClass(sym.owner)) {
         None
       } else*/ {
@@ -1095,15 +1519,9 @@ class JSCodeGen()(using genCtx: Context) {
 
         val methodDef = {
           if (sym.isClassConstructor) {
-            val body0 = genStat(rhs)
-            val body1 = {
-              val needsMove = currentClassSym.isNonNativeJSClass && sym.isPrimaryConstructor
-              if (needsMove) moveAllStatementsAfterSuperConstructorCall(body0)
-              else body0
-            }
             val namespace = js.MemberNamespace.Constructor
             js.MethodDef(js.MemberFlags.empty.withNamespace(namespace),
-                methodName, originalName, jsParams, jstpe.NoType, Some(body1))(
+                methodName, originalName, jsParams, jstpe.NoType, Some(genStat(rhs)))(
                 optimizerHints, None)
           } else {
             val namespace = if (isMethodStaticInIR(sym)) {
@@ -1170,53 +1588,6 @@ class JSCodeGen()(using genCtx: Context) {
     }
   }
 
-  /** Moves all statements after the super constructor call.
-   *
-   *  This is used for the primary constructor of a non-native JS class,
-   *  because those cannot access `this` before the super constructor call.
-   *
-   *  Normally, in Scala, param accessors (i.e., fields declared directly in
-   *  constructor parameters) are initialized *before* the super constructor
-   *  call. This is important for cases like
-   *
-   *    abstract class A {
-   *      def a: Int
-   *      println(a)
-   *    }
-   *    class B(val a: Int) extends A
-   *
-   *  where `a` is supposed to be correctly initialized by the time `println`
-   *  is executed.
-   *
-   *  However, in a JavaScript class, this is forbidden: it is not allowed to
-   *  read the `this` value in a constructor before the super constructor call.
-   *
-   *  Therefore, for JavaScript classes, we specifically move all those early
-   *  assignments after the super constructor call, to comply with JavaScript
-   *  limitations. This clearly introduces a semantic difference in
-   *  initialization order between Scala classes and JavaScript classes, but
-   *  there is nothing we can do about it. That difference in behavior is
-   *  basically spec'ed in Scala.js the language, since specifying it any other
-   *  way would prevent JavaScript classes from ever having constructor
-   *  parameters.
-   *
-   *  We do the same thing in Scala 2, obviously.
-   */
-  private def moveAllStatementsAfterSuperConstructorCall(body: js.Tree): js.Tree = {
-    val bodyStats = body match {
-      case js.Block(stats) => stats
-      case _               => body :: Nil
-    }
-
-    val (beforeSuper, superCall :: afterSuper) =
-      bodyStats.span(!_.isInstanceOf[js.JSSuperConstructorCall])
-
-    assert(!beforeSuper.exists(_.isInstanceOf[js.VarDef]),
-        s"Trying to move a local VarDef after the super constructor call of a non-native JS class at ${body.pos}")
-
-    js.Block(superCall :: beforeSuper ::: afterSuper)(body.pos)
-  }
-
   // ParamDefs ---------------------------------------------------------------
 
   def genParamDef(sym: Symbol): js.ParamDef =
@@ -1361,8 +1732,12 @@ class JSCodeGen()(using genCtx: Context) {
         }
 
       case If(cond, thenp, elsep) =>
+        val tpe =
+          if (isStat) jstpe.NoType
+          else toIRType(tree.tpe)
+
         js.If(genExpr(cond), genStatOrExpr(thenp, isStat),
-            genStatOrExpr(elsep, isStat))(toIRType(tree.tpe))
+            genStatOrExpr(elsep, isStat))(tpe)
 
       case Labeled(bind, expr) =>
         js.Labeled(encodeLabelSym(bind.symbol), toIRType(tree.tpe), genStatOrExpr(expr, isStat))
@@ -1430,7 +1805,7 @@ class JSCodeGen()(using genCtx: Context) {
              */
             js.Transient(UndefinedParam)
           } else {
-            js.VarRef(encodeLocalSym(sym))(toIRType(sym.info))
+            genVarRef(sym)
           }
         } { select =>
           genStatOrExpr(select, isStat)
@@ -1515,9 +1890,7 @@ class JSCodeGen()(using genCtx: Context) {
             }
 
           case _ =>
-            js.Assign(
-                js.VarRef(encodeLocalSym(sym))(toIRType(sym.info)),
-                genRhs)
+            js.Assign(genVarRef(sym), genRhs)
         }
 
       /** Array constructor */
@@ -1599,7 +1972,10 @@ class JSCodeGen()(using genCtx: Context) {
     val Try(block, catches, finalizer) = tree
 
     val blockAST = genStatOrExpr(block, isStat)
-    val resultType = toIRType(tree.tpe)
+
+    val resultType =
+      if (isStat) jstpe.NoType
+      else toIRType(tree.tpe)
 
     val handled =
       if (catches.isEmpty) blockAST
@@ -1692,13 +2068,52 @@ class JSCodeGen()(using genCtx: Context) {
     val args = tree.args
     val sym = tree.fun.symbol
 
-    val fun = tree.fun match {
-      case fun: Ident => desugarIdent(fun)
-      case fun => fun
+    /* Is the method a JS default accessor, which should become an
+     * `UndefinedParam` rather than being compiled normally.
+     *
+     * This is true iff one of the following conditions apply:
+     * - It is a constructor default param for the constructor of a JS class.
+     * - It is a default param of an instance method of a native JS type.
+     * - It is a default param of an instance method of a non-native JS type
+     *   and the attached method is exposed.
+     * - It is a default param for a native JS def.
+     *
+     * This is different than `isIgnorableDefaultParam` in
+     * `genMethodWithCurrentLocalNameScope`: we include here the default
+     * accessors of *non-native* JS types (unless the corresponding methods are
+     * not exposed). We also need to handle non-constructor members of native
+     * JS types.
+     */
+    def isJSDefaultParam: Boolean = {
+      sym.name.is(DefaultGetterName) && {
+        val info = new DefaultParamInfo(sym)
+        if (info.isForConstructor) {
+          /* This is a default accessor for a constructor parameter. Check
+           * whether the attached constructor is a JS constructor, which is
+           * the case iff the linked class is a JS type.
+           */
+          info.constructorOwner.isJSType
+        } else {
+          if (sym.owner.isJSType) {
+            /* The default accessor is in a JS type. It is a JS default
+             * param iff the enclosing class is native or the attached method
+             * is exposed.
+             */
+            !sym.owner.isNonNativeJSClass || info.attachedMethod.isJSExposed
+          } else {
+            /* The default accessor is in a Scala type. It is a JS default
+             * param iff the attached method is a native JS def. This can
+             * only happen if the owner is a module class, which we test
+             * first as a fast way out.
+             */
+            sym.owner.is(ModuleClass) && info.attachedMethod.hasAnnotation(jsdefn.JSNativeAnnot)
+          }
+        }
+      }
     }
 
-    fun match {
-      case _ if sym.isJSDefaultParam =>
+    tree.fun match {
+      case _ if isJSDefaultParam =>
         js.Transient(UndefinedParam)
 
       case Select(Super(_, _), _) =>
@@ -2368,7 +2783,10 @@ class JSCodeGen()(using genCtx: Context) {
               js.UnaryOp(IntToLong, intValue)
           }
         case jstpe.FloatType =>
-          js.UnaryOp(js.UnaryOp.DoubleToFloat, doubleValue)
+          if (from == jstpe.LongType)
+            js.UnaryOp(js.UnaryOp.LongToFloat, value)
+          else
+            js.UnaryOp(js.UnaryOp.DoubleToFloat, doubleValue)
         case jstpe.DoubleType =>
           doubleValue
       }
@@ -2476,27 +2894,7 @@ class JSCodeGen()(using genCtx: Context) {
       args: List[Tree]): js.Tree = {
     implicit val pos = tree.span
 
-    val arg = args.head
-
-    /* Primitive number types such as scala.Int have a
-     *   def +(s: String): String
-     * method, which is why we have to box the lhs sometimes.
-     * Otherwise, both lhs and rhs are already reference types (Any or String)
-     * so boxing is not necessary (in particular, rhs is never a primitive).
-     */
-    assert(!isPrimitiveValueType(receiver.tpe) || arg.tpe.isRef(defn.StringClass))
-    assert(!isPrimitiveValueType(arg.tpe))
-
-    val genLhs = {
-      val genLhs0 = genExpr(receiver)
-      // Box the receiver if it is a primitive value
-      if (!isPrimitiveValueType(receiver.tpe)) genLhs0
-      else makePrimitiveBox(genLhs0, receiver.tpe)
-    }
-
-    val genRhs = genExpr(arg)
-
-    js.BinaryOp(js.BinaryOp.String_+, genLhs, genRhs)
+    js.BinaryOp(js.BinaryOp.String_+, genExpr(receiver), genExpr(args.head))
   }
 
   /** Gen JS code for a call to Any.## */
@@ -2795,9 +3193,8 @@ class JSCodeGen()(using genCtx: Context) {
             s"Trying to call the super constructor of Object in a non-native JS class at $pos")
         genApplyMethod(genReceiver, sym, genScalaArgs)
       } else if (sym.isClassConstructor) {
-        assert(genReceiver.isInstanceOf[js.This],
-            s"Trying to call a JS super constructor with a non-`this` receiver at $pos")
-        js.JSSuperConstructorCall(genJSArgs)
+        throw new AssertionError(
+            s"calling a JS super constructor should have happened in genPrimaryJSClassCtor at $pos")
       } else if (sym.owner.isNonNativeJSClass && !sym.isJSExposed) {
         // Reroute to the static method
         genApplyJSClassMethod(genReceiver, sym, genScalaArgs)
@@ -2863,12 +3260,6 @@ class JSCodeGen()(using genCtx: Context) {
     def abortMatch(msg: String): Nothing =
       throw new FatalError(s"$msg in switch-like pattern match at ${tree.span}: $tree")
 
-    /* Although GenBCode adapts the scrutinee and the cases to `int`, only
-     * true `int`s can reach the back-end, as asserted by the String-switch
-     * transformation in `cleanup`. Therefore, we do not adapt, preserving
-     * the `string`s and `null`s that come out of the pattern matching in
-     * Scala 2.13.2+.
-     */
     val genSelector = genExpr(selector)
 
     // Sanity check: we can handle Ints and Strings (including `null`s), but nothing else
@@ -2885,7 +3276,7 @@ class JSCodeGen()(using genCtx: Context) {
       case resType           => resType
     }
 
-    var clauses: List[(List[js.Tree], js.Tree)] = Nil
+    var clauses: List[(List[js.MatchableLiteral], js.Tree)] = Nil
     var optDefaultClause: Option[js.Tree] = None
 
     for (caze @ CaseDef(pat, guard, body) <- cases) {
@@ -2894,19 +3285,29 @@ class JSCodeGen()(using genCtx: Context) {
 
       val genBody = genStatOrExpr(body, isStat)
 
+      def invalidCase(): Nothing =
+        abortMatch("Invalid case")
+
+      def genMatchableLiteral(tree: Literal): js.MatchableLiteral = {
+        genExpr(tree) match {
+          case matchableLiteral: js.MatchableLiteral => matchableLiteral
+          case otherExpr                             => invalidCase()
+        }
+      }
+
       pat match {
         case lit: Literal =>
-          clauses = (List(genExpr(lit)), genBody) :: clauses
+          clauses = (List(genMatchableLiteral(lit)), genBody) :: clauses
         case Ident(nme.WILDCARD) =>
           optDefaultClause = Some(genBody)
         case Alternative(alts) =>
           val genAlts = alts.map {
-            case lit: Literal => genExpr(lit)
-            case _            => abortMatch("Invalid case in alternative")
+            case lit: Literal => genMatchableLiteral(lit)
+            case _            => invalidCase()
           }
           clauses = (genAlts, genBody) :: clauses
         case _ =>
-          abortMatch("Invalid case pattern")
+          invalidCase()
       }
     }
 
@@ -2921,15 +3322,6 @@ class JSCodeGen()(using genCtx: Context) {
      * case is a typical product of `match`es that are full of
      * `case n if ... =>`, which are used instead of `if` chains for
      * convenience and/or readability.
-     *
-     * When no optimization applies, and any of the case values is not a
-     * literal int, we emit a series of `if..else` instead of a `js.Match`.
-     * This became necessary in 2.13.2 with strings and nulls.
-     *
-     * Note that dotc has not adopted String-switch-Matches yet, so these code
-     * paths are dead code at the moment. However, they already existed in the
-     * scalac, so were ported, to be immediately available and working when
-     * dotc starts emitting switch-Matches on Strings.
      */
     def isInt(tree: js.Tree): Boolean = tree.tpe == jstpe.IntType
 
@@ -2949,32 +3341,8 @@ class JSCodeGen()(using genCtx: Context) {
         js.If(js.BinaryOp(op, genSelector, uniqueAlt), caseRhs, defaultClause)(resultType)
 
       case _ =>
-        if (isInt(genSelector) &&
-            clauses.forall(_._1.forall(_.isInstanceOf[js.IntLiteral]))) {
-          // We have int literals only: use a js.Match
-          val intClauses = clauses.asInstanceOf[List[(List[js.IntLiteral], js.Tree)]]
-          js.Match(genSelector, intClauses, defaultClause)(resultType)
-        } else {
-          // We have other stuff: generate an if..else chain
-          val (tempSelectorDef, tempSelectorRef) = genSelector match {
-            case varRef: js.VarRef =>
-              (js.Skip(), varRef)
-            case _ =>
-              val varDef = js.VarDef(freshLocalIdent(), NoOriginalName,
-                  genSelector.tpe, mutable = false, genSelector)
-              (varDef, varDef.ref)
-          }
-          val ifElseChain = clauses.foldRight(defaultClause) { (caze, elsep) =>
-            val conds = caze._1.map { caseValue =>
-              js.BinaryOp(js.BinaryOp.===, tempSelectorRef, caseValue)
-            }
-            val cond = conds.reduceRight[js.Tree] { (left, right) =>
-              js.If(left, js.BooleanLiteral(true), right)(jstpe.BooleanType)
-            }
-            js.If(cond, caze._2, elsep)(resultType)
-          }
-          js.Block(tempSelectorDef, ifElseChain)
-        }
+        // We have more than one case: use a js.Match
+        js.Match(genSelector, clauses, defaultClause)(resultType)
     }
   }
 
@@ -3041,7 +3409,7 @@ class JSCodeGen()(using genCtx: Context) {
     val formalAndActualCaptures = allCaptureValues.map { value =>
       implicit val pos = value.span
       val (formalIdent, originalName) = value match {
-        case Ident(name) => (freshLocalIdent(name.toString), OriginalName(name.toString))
+        case Ident(name) => (freshLocalIdent(name.toTermName), OriginalName(name.toString))
         case This(_)     => (freshLocalIdent("this"), thisOriginalName)
         case _           => (freshLocalIdent(), NoOriginalName)
       }
@@ -3069,7 +3437,7 @@ class JSCodeGen()(using genCtx: Context) {
 
     val formalAndActualParams = formalParamNames.lazyZip(formalParamTypes).lazyZip(formalParamRepeateds).map {
       (name, tpe, repeated) =>
-        val formalParam = js.ParamDef(freshLocalIdent(name.toString),
+        val formalParam = js.ParamDef(freshLocalIdent(name),
             OriginalName(name.toString), jstpe.AnyType, mutable = false)
         val actualParam =
           if (repeated) genJSArrayToVarArgs(formalParam.ref)(tree.sourcePos)
@@ -3243,7 +3611,7 @@ class JSCodeGen()(using genCtx: Context) {
   }
 
   /** Gen a statically linked call to an instance method. */
-  private def genApplyMethodMaybeStatically(receiver: js.Tree, method: Symbol,
+  def genApplyMethodMaybeStatically(receiver: js.Tree, method: Symbol,
       arguments: List[js.Tree])(implicit pos: Position): js.Tree = {
     if (method.isPrivate || method.isClassConstructor)
       genApplyMethodStatically(receiver, method, arguments)
@@ -3428,6 +3796,15 @@ class JSCodeGen()(using genCtx: Context) {
         // BoxedUnit.UNIT, which is the boxed version of ()
         js.Undefined()
 
+      case JS_IMPORT =>
+        // js.import(arg)
+        val arg = genArgs1
+        js.JSImportCall(arg)
+
+      case JS_IMPORT_META =>
+        // js.import.meta
+        js.JSImportMeta()
+
       case JS_NATIVE =>
         // js.native
         report.error(
@@ -3718,46 +4095,24 @@ class JSCodeGen()(using genCtx: Context) {
   private def genActualJSArgs(sym: Symbol, args: List[Tree])(
       implicit pos: Position): List[js.TreeOrJSSpread] = {
 
-    def paramNamesAndTypes(using Context): List[(Names.TermName, Type)] =
-      sym.info.paramNamess.flatten.zip(sym.info.paramInfoss.flatten)
-
-    val wereRepeated = atPhase(elimRepeatedPhase) {
-      val list =
-        for ((name, tpe) <- paramNamesAndTypes)
-        yield (name -> tpe.isRepeatedParam)
-      list.toMap
-    }
-
-    val paramTypes = atPhase(elimErasedValueTypePhase) {
-      paramNamesAndTypes.toMap
-    }
-
     var reversedArgs: List[js.TreeOrJSSpread] = Nil
 
-    val argsParamNamesAndTypes = args.zip(paramNamesAndTypes)
-    for ((arg, (paramName, paramType)) <- argsParamNamesAndTypes) {
-      val wasRepeated = wereRepeated.get(paramName)
-
-      wasRepeated match {
-        case Some(true) =>
-          reversedArgs = genJSRepeatedParam(arg) reverse_::: reversedArgs
-
-        case Some(false) =>
-          val unboxedArg = genExpr(arg)
-          val boxedArg = unboxedArg match {
-            case js.Transient(UndefinedParam) =>
-              unboxedArg
-            case _ =>
-              val tpe = paramTypes.getOrElse(paramName, paramType)
-              box(unboxedArg, tpe)
-          }
-          reversedArgs ::= boxedArg
-
-        case None =>
-          // This is a parameter introduced by erasure or lambdalift, which we ignore.
-          assert(sym.isClassConstructor,
-              i"Found an unknown param $paramName in method " +
-              i"${sym.fullName}, which is not a class constructor, at $pos")
+    for ((arg, info) <- args.zip(sym.jsParamInfos)) {
+      if (info.repeated) {
+        reversedArgs = genJSRepeatedParam(arg) reverse_::: reversedArgs
+      } else if (info.capture) {
+        // Ignore captures
+        assert(sym.isClassConstructor,
+            i"Found a capture param in method ${sym.fullName}, which is not a class constructor, at $pos")
+      } else {
+        val unboxedArg = genExpr(arg)
+        val boxedArg = unboxedArg match {
+          case js.Transient(UndefinedParam) =>
+            unboxedArg
+          case _ =>
+            box(unboxedArg, info.info)
+        }
+        reversedArgs ::= boxedArg
       }
     }
 
@@ -3890,6 +4245,9 @@ class JSCodeGen()(using genCtx: Context) {
     }
   }
 
+  private def genVarRef(sym: Symbol)(implicit pos: Position): js.VarRef =
+    js.VarRef(encodeLocalSym(sym))(toIRType(sym.info))
+
   private def genAssignableField(sym: Symbol, qualifier: Tree)(implicit pos: SourcePosition): (js.AssignLhs, Boolean) = {
     def qual = genExpr(qualifier)
 
@@ -4011,7 +4369,7 @@ class JSCodeGen()(using genCtx: Context) {
     js.LoadJSConstructor(encodeClassName(sym))
   }
 
-  private final val GenericGlobalObjectInformationMsg = {
+  private inline val GenericGlobalObjectInformationMsg = {
     "\n  " +
     "See https://www.scala-js.org/doc/interoperability/global-scope.html " +
     "for further information."
@@ -4325,4 +4683,31 @@ object JSCodeGen {
       out.print("<undefined-param>")
   }
 
+  /** Info about a default param accessor.
+   *
+   *  The method must have a default getter name for this class to make sense.
+   */
+  private class DefaultParamInfo(sym: Symbol)(using Context) {
+    private val methodName = sym.name.exclude(DefaultGetterName)
+
+    def isForConstructor: Boolean = methodName == nme.CONSTRUCTOR
+
+    /** When `isForConstructor` is true, returns the owner of the attached
+     *  constructor.
+     */
+    def constructorOwner: Symbol = sym.owner.linkedClass
+
+    /** When `isForConstructor` is false, returns the method attached to the
+     *  specified default accessor.
+     */
+    def attachedMethod: Symbol = {
+      // If there are overloads, we need to find the one that has default params.
+      val overloads = sym.owner.info.decl(methodName)
+      if (!overloads.isOverloaded)
+        overloads.symbol
+      else
+        overloads.suchThat(_.is(HasDefaultParams, butNot = Bridge)).symbol
+    }
+  }
+
 }
diff --git a/compiler/src/dotty/tools/backend/sjs/JSConstructorGen.scala b/compiler/src/dotty/tools/backend/sjs/JSConstructorGen.scala
deleted file mode 100644
index 25ec8ff53c6b..000000000000
--- a/compiler/src/dotty/tools/backend/sjs/JSConstructorGen.scala
+++ /dev/null
@@ -1,376 +0,0 @@
-package dotty.tools.backend.sjs
-
-import org.scalajs.ir
-import org.scalajs.ir.{Position, Trees => js, Types => jstpe}
-import org.scalajs.ir.Names._
-import org.scalajs.ir.OriginalName.NoOriginalName
-
-import JSCodeGen.UndefinedParam
-
-object JSConstructorGen {
-
-  /** Builds one JS constructor out of several "init" methods and their
-   *  dispatcher.
-   *
-   *  This method and the rest of this file are copied verbatim from `GenJSCode`
-   *  for scalac, since there is no dependency on the compiler trees/symbols/etc.
-   *  We are only manipulating IR trees and types.
-   *
-   *  The only difference is the two parameters `overloadIdent` and `reportError`,
-   *  which are added so that this entire file can be even more isolated.
-   */
-  def buildJSConstructorDef(dispatch: js.JSMethodDef, ctors: List[js.MethodDef],
-      overloadIdent: js.LocalIdent)(
-      reportError: String => Unit)(
-      implicit pos: Position): js.JSMethodDef = {
-
-    val js.JSMethodDef(_, dispatchName, dispatchArgs, dispatchRestParam, dispatchResolution) =
-      dispatch
-
-    val jsConstructorBuilder = mkJSConstructorBuilder(ctors, reportError)
-
-    // Section containing the overload resolution and casts of parameters
-    val overloadSelection = mkOverloadSelection(jsConstructorBuilder,
-      overloadIdent, dispatchResolution)
-
-    /* Section containing all the code executed before the call to `this`
-     * for every secondary constructor.
-     */
-    val prePrimaryCtorBody =
-      jsConstructorBuilder.mkPrePrimaryCtorBody(overloadIdent)
-
-    val primaryCtorBody = jsConstructorBuilder.primaryCtorBody
-
-    /* Section containing all the code executed after the call to this for
-     * every secondary constructor.
-     */
-    val postPrimaryCtorBody =
-      jsConstructorBuilder.mkPostPrimaryCtorBody(overloadIdent)
-
-    val newBody = js.Block(overloadSelection ::: prePrimaryCtorBody ::
-        primaryCtorBody :: postPrimaryCtorBody :: js.Undefined() :: Nil)
-
-    js.JSMethodDef(js.MemberFlags.empty, dispatchName, dispatchArgs, dispatchRestParam, newBody)(
-        dispatch.optimizerHints, None)
-  }
-
-  private class ConstructorTree(val overrideNum: Int, val method: js.MethodDef,
-      val subConstructors: List[ConstructorTree]) {
-
-    lazy val overrideNumBounds: (Int, Int) =
-      if (subConstructors.isEmpty) (overrideNum, overrideNum)
-      else (subConstructors.head.overrideNumBounds._1, overrideNum)
-
-    def get(methodName: MethodName): Option[ConstructorTree] = {
-      if (methodName == this.method.methodName) {
-        Some(this)
-      } else {
-        subConstructors.iterator.map(_.get(methodName)).collectFirst {
-          case Some(node) => node
-        }
-      }
-    }
-
-    def getParamRefs(implicit pos: Position): List[js.VarRef] =
-      method.args.map(_.ref)
-
-    def getAllParamDefsAsVars(implicit pos: Position): List[js.VarDef] = {
-      val localDefs = method.args.map { pDef =>
-        js.VarDef(pDef.name, pDef.originalName, pDef.ptpe, mutable = true,
-            jstpe.zeroOf(pDef.ptpe))
-      }
-      localDefs ++ subConstructors.flatMap(_.getAllParamDefsAsVars)
-    }
-  }
-
-  private class JSConstructorBuilder(root: ConstructorTree, reportError: String => Unit) {
-
-    def primaryCtorBody: js.Tree = root.method.body.getOrElse(
-        throw new AssertionError("Found abstract constructor"))
-
-    def hasSubConstructors: Boolean = root.subConstructors.nonEmpty
-
-    def getOverrideNum(methodName: MethodName): Int =
-      root.get(methodName).fold(-1)(_.overrideNum)
-
-    def getParamRefsFor(methodName: MethodName)(implicit pos: Position): List[js.VarRef] =
-      root.get(methodName).fold(List.empty[js.VarRef])(_.getParamRefs)
-
-    def getAllParamDefsAsVars(implicit pos: Position): List[js.VarDef] =
-      root.getAllParamDefsAsVars
-
-    def mkPrePrimaryCtorBody(overrideNumIdent: js.LocalIdent)(
-        implicit pos: Position): js.Tree = {
-      val overrideNumRef = js.VarRef(overrideNumIdent)(jstpe.IntType)
-      mkSubPreCalls(root, overrideNumRef)
-    }
-
-    def mkPostPrimaryCtorBody(overrideNumIdent: js.LocalIdent)(
-        implicit pos: Position): js.Tree = {
-      val overrideNumRef = js.VarRef(overrideNumIdent)(jstpe.IntType)
-      js.Block(mkSubPostCalls(root, overrideNumRef))
-    }
-
-    private def mkSubPreCalls(constructorTree: ConstructorTree,
-        overrideNumRef: js.VarRef)(implicit pos: Position): js.Tree = {
-      val overrideNumss = constructorTree.subConstructors.map(_.overrideNumBounds)
-      val paramRefs = constructorTree.getParamRefs
-      val bodies = constructorTree.subConstructors.map { constructorTree =>
-        mkPrePrimaryCtorBodyOnSndCtr(constructorTree, overrideNumRef, paramRefs)
-      }
-      overrideNumss.zip(bodies).foldRight[js.Tree](js.Skip()) {
-        case ((numBounds, body), acc) =>
-          val cond = mkOverrideNumsCond(overrideNumRef, numBounds)
-          js.If(cond, body, acc)(jstpe.BooleanType)
-      }
-    }
-
-    private def mkPrePrimaryCtorBodyOnSndCtr(constructorTree: ConstructorTree,
-        overrideNumRef: js.VarRef, outputParams: List[js.VarRef])(
-        implicit pos: Position): js.Tree = {
-      val subCalls =
-        mkSubPreCalls(constructorTree, overrideNumRef)
-
-      val preSuperCall = {
-        def checkForUndefinedParams(args: List[js.Tree]): List[js.Tree] = {
-          def isUndefinedParam(tree: js.Tree): Boolean = tree match {
-            case js.Transient(UndefinedParam) => true
-            case _                            => false
-          }
-
-          if (!args.exists(isUndefinedParam)) {
-            args
-          } else {
-            /* If we find an undefined param here, we're in trouble, because
-             * the handling of a default param for the target constructor has
-             * already been done during overload resolution. If we store an
-             * `undefined` now, it will fall through without being properly
-             * processed.
-             *
-             * Since this seems very tricky to deal with, and a pretty rare
-             * use case (with a workaround), we emit an "implementation
-             * restriction" error.
-             */
-            reportError(
-                "Implementation restriction: in a JS class, a secondary " +
-                "constructor calling another constructor with default " +
-                "parameters must provide the values of all parameters.")
-
-            /* Replace undefined params by undefined to prevent subsequent
-             * compiler crashes.
-             */
-            args.map { arg =>
-              if (isUndefinedParam(arg))
-                js.Undefined()(arg.pos)
-              else
-                arg
-            }
-          }
-        }
-
-        constructorTree.method.body.get match {
-          case js.Block(stats) =>
-            val beforeSuperCall = stats.takeWhile {
-              case js.ApplyStatic(_, _, mtd, _) => !mtd.name.isConstructor
-              case _                            => true
-            }
-            val superCallParams = stats.collectFirst {
-              case js.ApplyStatic(_, _, mtd, js.This() :: args)
-                  if mtd.name.isConstructor =>
-                val checkedArgs = checkForUndefinedParams(args)
-                zipMap(outputParams, checkedArgs)(js.Assign(_, _))
-            }.getOrElse(Nil)
-
-            beforeSuperCall ::: superCallParams
-
-          case js.ApplyStatic(_, _, mtd, js.This() :: args)
-              if mtd.name.isConstructor =>
-            val checkedArgs = checkForUndefinedParams(args)
-            zipMap(outputParams, checkedArgs)(js.Assign(_, _))
-
-          case _ => Nil
-        }
-      }
-
-      js.Block(subCalls :: preSuperCall)
-    }
-
-    private def mkSubPostCalls(constructorTree: ConstructorTree,
-        overrideNumRef: js.VarRef)(implicit pos: Position): js.Tree = {
-      val overrideNumss = constructorTree.subConstructors.map(_.overrideNumBounds)
-      val bodies = constructorTree.subConstructors.map { ct =>
-        mkPostPrimaryCtorBodyOnSndCtr(ct, overrideNumRef)
-      }
-      overrideNumss.zip(bodies).foldRight[js.Tree](js.Skip()) {
-        case ((numBounds, js.Skip()), acc) => acc
-
-        case ((numBounds, body), acc) =>
-          val cond = mkOverrideNumsCond(overrideNumRef, numBounds)
-          js.If(cond, body, acc)(jstpe.BooleanType)
-      }
-    }
-
-    private def mkPostPrimaryCtorBodyOnSndCtr(constructorTree: ConstructorTree,
-        overrideNumRef: js.VarRef)(implicit pos: Position): js.Tree = {
-      val postSuperCall = {
-        constructorTree.method.body.get match {
-          case js.Block(stats) =>
-            stats.dropWhile {
-              case js.ApplyStatic(_, _, mtd, _) => !mtd.name.isConstructor
-              case _                            => true
-            }.tail
-
-          case _ => Nil
-        }
-      }
-      js.Block(postSuperCall :+ mkSubPostCalls(constructorTree, overrideNumRef))
-    }
-
-    private def mkOverrideNumsCond(numRef: js.VarRef,
-        numBounds: (Int, Int))(implicit pos: Position) = numBounds match {
-      case (lo, hi) if lo == hi =>
-        js.BinaryOp(js.BinaryOp.Int_==, js.IntLiteral(lo), numRef)
-
-      case (lo, hi) if lo == hi - 1 =>
-        val lhs = js.BinaryOp(js.BinaryOp.Int_==, numRef, js.IntLiteral(lo))
-        val rhs = js.BinaryOp(js.BinaryOp.Int_==, numRef, js.IntLiteral(hi))
-        js.If(lhs, js.BooleanLiteral(true), rhs)(jstpe.BooleanType)
-
-      case (lo, hi) =>
-        val lhs = js.BinaryOp(js.BinaryOp.Int_<=, js.IntLiteral(lo), numRef)
-        val rhs = js.BinaryOp(js.BinaryOp.Int_<=, numRef, js.IntLiteral(hi))
-        js.BinaryOp(js.BinaryOp.Boolean_&, lhs, rhs)
-        js.If(lhs, rhs, js.BooleanLiteral(false))(jstpe.BooleanType)
-    }
-  }
-
-  private def zipMap[T, U, V](xs: List[T], ys: List[U])(
-      f: (T, U) => V): List[V] = {
-    for ((x, y) <- xs zip ys) yield f(x, y)
-  }
-
-  /** mkOverloadSelection return a list of `stats` with that starts with:
-   *  1) The definition for the local variable that will hold the overload
-   *     resolution number.
-   *  2) The definitions of all local variables that are used as parameters
-   *     in all the constructors.
-   *  3) The overload resolution match/if statements. For each overload the
-   *     overload number is assigned and the parameters are cast and assigned
-   *     to their corresponding variables.
-   */
-  private def mkOverloadSelection(jsConstructorBuilder: JSConstructorBuilder,
-      overloadIdent: js.LocalIdent, dispatchResolution: js.Tree)(
-      implicit pos: Position): List[js.Tree] = {
-
-    def deconstructApplyCtor(body: js.Tree): (List[js.Tree], MethodName, List[js.Tree]) = {
-      val (prepStats, applyCtor) = (body: @unchecked) match {
-        case applyCtor: js.ApplyStatic =>
-          (Nil, applyCtor)
-        case js.Block(prepStats :+ (applyCtor: js.ApplyStatic)) =>
-          (prepStats, applyCtor)
-      }
-      val js.ApplyStatic(_, _, js.MethodIdent(ctorName), js.This() :: ctorArgs) =
-        applyCtor
-      assert(ctorName.isConstructor,
-          s"unexpected super constructor call to non-constructor $ctorName at ${applyCtor.pos}")
-      (prepStats, ctorName, ctorArgs)
-    }
-
-    if (!jsConstructorBuilder.hasSubConstructors) {
-      val (prepStats, ctorName, ctorArgs) =
-        deconstructApplyCtor(dispatchResolution)
-
-      val refs = jsConstructorBuilder.getParamRefsFor(ctorName)
-      assert(refs.size == ctorArgs.size, s"at $pos")
-      val assignCtorParams = zipMap(refs, ctorArgs) { (ref, ctorArg) =>
-        js.VarDef(ref.ident, NoOriginalName, ref.tpe, mutable = false, ctorArg)
-      }
-
-      prepStats ::: assignCtorParams
-    } else {
-      val overloadRef = js.VarRef(overloadIdent)(jstpe.IntType)
-
-      /* transformDispatch takes the body of the method generated by
-       * `genJSConstructorDispatch` and transform it recursively.
-       */
-      def transformDispatch(tree: js.Tree): js.Tree = tree match {
-        // Parameter count resolution
-        case js.Match(selector, cases, default) =>
-          val newCases = cases.map {
-            case (literals, body) => (literals, transformDispatch(body))
-          }
-          val newDefault = transformDispatch(default)
-          js.Match(selector, newCases, newDefault)(tree.tpe)
-
-        // Parameter type resolution
-        case js.If(cond, thenp, elsep) =>
-          js.If(cond, transformDispatch(thenp),
-              transformDispatch(elsep))(tree.tpe)
-
-        // Throw(StringLiteral(No matching overload))
-        case tree: js.Throw =>
-          tree
-
-        // Overload resolution done, apply the constructor
-        case _ =>
-          val (prepStats, ctorName, ctorArgs) = deconstructApplyCtor(tree)
-
-          val num = jsConstructorBuilder.getOverrideNum(ctorName)
-          val overloadAssign = js.Assign(overloadRef, js.IntLiteral(num))
-
-          val refs = jsConstructorBuilder.getParamRefsFor(ctorName)
-          assert(refs.size == ctorArgs.size, s"at $pos")
-          val assignCtorParams = zipMap(refs, ctorArgs)(js.Assign(_, _))
-
-          js.Block(overloadAssign :: prepStats ::: assignCtorParams)
-      }
-
-      val newDispatchResolution = transformDispatch(dispatchResolution)
-      val allParamDefsAsVars = jsConstructorBuilder.getAllParamDefsAsVars
-      val overrideNumDef = js.VarDef(overloadIdent, NoOriginalName,
-          jstpe.IntType, mutable = true, js.IntLiteral(0))
-
-      overrideNumDef :: allParamDefsAsVars ::: newDispatchResolution :: Nil
-    }
-  }
-
-  private def mkJSConstructorBuilder(ctors: List[js.MethodDef], reportError: String => Unit)(
-      implicit pos: Position): JSConstructorBuilder = {
-    def findCtorForwarderCall(tree: js.Tree): MethodName = (tree: @unchecked) match {
-      case js.ApplyStatic(_, _, method, js.This() :: _)
-          if method.name.isConstructor =>
-        method.name
-
-      case js.Block(stats) =>
-        stats.collectFirst {
-          case js.ApplyStatic(_, _, method, js.This() :: _)
-              if method.name.isConstructor =>
-            method.name
-        }.get
-    }
-
-    val (primaryCtor :: Nil, secondaryCtors) = ctors.partition {
-      _.body.get match {
-        case js.Block(stats) =>
-          stats.exists(_.isInstanceOf[js.JSSuperConstructorCall])
-
-        case _: js.JSSuperConstructorCall => true
-        case _                            => false
-      }
-    }
-
-    val ctorToChildren = secondaryCtors.map { ctor =>
-      findCtorForwarderCall(ctor.body.get) -> ctor
-    }.groupBy(_._1).map(kv => kv._1 -> kv._2.map(_._2)).withDefaultValue(Nil)
-
-    var overrideNum = -1
-    def mkConstructorTree(method: js.MethodDef): ConstructorTree = {
-      val subCtrTrees = ctorToChildren(method.methodName).map(mkConstructorTree)
-      overrideNum += 1
-      new ConstructorTree(overrideNum, method, subCtrTrees)
-    }
-
-    new JSConstructorBuilder(mkConstructorTree(primaryCtor), reportError: String => Unit)
-  }
-
-}
diff --git a/compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala b/compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala
index c73821430098..c02e0c030657 100644
--- a/compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala
+++ b/compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala
@@ -95,6 +95,9 @@ final class JSDefinitions()(using Context) {
   def JSExportStaticAnnot(using Context) = JSExportStaticAnnotType.symbol.asClass
   @threadUnsafe lazy val JSExportAllAnnotType: TypeRef = requiredClassRef("scala.scalajs.js.annotation.JSExportAll")
   def JSExportAllAnnot(using Context) = JSExportAllAnnotType.symbol.asClass
+
+  def JSAnnotPackage(using Context) = JSGlobalAnnot.owner.asClass
+
   @threadUnsafe lazy val JSTypeAnnotType: TypeRef = requiredClassRef("scala.scalajs.js.annotation.internal.JSType")
   def JSTypeAnnot(using Context) = JSTypeAnnotType.symbol.asClass
   @threadUnsafe lazy val JSOptionalAnnotType: TypeRef = requiredClassRef("scala.scalajs.js.annotation.internal.JSOptional")
@@ -142,6 +145,13 @@ final class JSDefinitions()(using Context) {
     @threadUnsafe lazy val JSConstructorTag_materializeR = JSConstructorTagModule.requiredMethodRef("materialize")
     def JSConstructorTag_materialize(using Context) = JSConstructorTag_materializeR.symbol
 
+  @threadUnsafe lazy val JSImportModuleRef = requiredModuleRef("scala.scalajs.js.import")
+  def JSImportModule(using Context) = JSImportModuleRef.symbol
+    @threadUnsafe lazy val JSImport_applyR = JSImportModule.requiredMethodRef(nme.apply)
+    def JSImport_apply(using Context) = JSImport_applyR.symbol
+    @threadUnsafe lazy val JSImport_metaR = JSImportModule.requiredMethodRef("meta")
+    def JSImport_meta(using Context) = JSImport_metaR.symbol
+
   @threadUnsafe lazy val RuntimePackageVal = requiredPackage("scala.scalajs.runtime")
   @threadUnsafe lazy val RuntimePackageClass = RuntimePackageVal.moduleClass.asClass
     @threadUnsafe lazy val RuntimePackage_wrapJavaScriptExceptionR = RuntimePackageClass.requiredMethodRef("wrapJavaScriptException")
diff --git a/compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala b/compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala
index c571a08980a1..ab2211b7073b 100644
--- a/compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala
+++ b/compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala
@@ -13,6 +13,7 @@ import Denotations._
 import Flags._
 import Names._
 import NameKinds.DefaultGetterName
+import NameOps._
 import Periods._
 import Phases._
 import StdNames._
@@ -174,7 +175,7 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
           js.TopLevelJSClassExportDef(info.moduleID, info.jsName)
 
         case Constructor | Method =>
-          val exported = tups.map(t => Exported(t._2))
+          val exported = tups.map(_._2)
 
           val methodDef = withNewLocalNameScope {
             genExportMethod(exported, JSName.Literal(info.jsName), static = true)
@@ -330,32 +331,10 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
       if (isProp)
         genExportProperty(alts, jsName, static)
       else
-        genExportMethod(alts.map(Exported.apply), jsName, static)
+        genExportMethod(alts, jsName, static)
     }
   }
 
-  def genJSConstructorDispatch(alts: List[Symbol]): (Option[List[js.ParamDef]], js.JSMethodDef) = {
-    val exporteds = alts.map(Exported.apply)
-
-    val isConstructorOfNestedJSClass = exporteds.head.isConstructorOfNestedJSClass
-    assert(exporteds.tail.forall(_.isConstructorOfNestedJSClass == isConstructorOfNestedJSClass),
-        s"Alternative constructors $alts do not agree on whether they are in a nested JS class or not")
-    val captureParams = if (!isConstructorOfNestedJSClass) {
-      None
-    } else {
-      Some(for {
-        exported <- exporteds
-        param <- exported.captureParamsFront ::: exported.captureParamsBack
-      } yield {
-        param
-      })
-    }
-
-    val ctorDef = genExportMethod(exporteds, JSName.Literal("constructor"), static = false)
-
-    (captureParams, ctorDef)
-  }
-
   private def genExportProperty(alts: List[Symbol], jsName: JSName, static: Boolean): js.JSPropertyDef = {
     assert(!alts.isEmpty, s"genExportProperty with empty alternatives for $jsName")
 
@@ -372,17 +351,11 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
     val (getter, setters) = alts.partition(_.info.paramInfoss.head.isEmpty)
 
     // We can have at most one getter
-    if (getter.sizeIs > 1) {
-      /* Member export of properties should be caught earlier, so if we get
-       * here with a non-static export, something went horribly wrong.
-       */
-      assert(static, s"Found more than one instance getter to export for name $jsName.")
-      for (duplicate <- getter.tail)
-        report.error(s"Duplicate static getter export with name '${jsName.displayName}'", duplicate)
-    }
+    if (getter.sizeIs > 1)
+      reportCannotDisambiguateError(jsName, alts)
 
     val getterBody = getter.headOption.map { getterSym =>
-      genApplyForSingleExported(new FormalArgsRegistry(0, false), Exported(getterSym), static)
+      genApplyForSingleExported(new FormalArgsRegistry(0, false), new ExportedSymbol(getterSym, static), static)
     }
 
     val setterArgAndBody = {
@@ -391,7 +364,8 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
       } else {
         val formalArgsRegistry = new FormalArgsRegistry(1, false)
         val (List(arg), None) = formalArgsRegistry.genFormalArgs()
-        val body = genExportSameArgc(jsName, formalArgsRegistry, setters.map(Exported.apply), static, None)
+        val body = genOverloadDispatchSameArgc(jsName, formalArgsRegistry,
+            setters.map(new ExportedSymbol(_, static)), jstpe.AnyType, None)
         Some((arg, body))
       }
     }
@@ -399,10 +373,10 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
     js.JSPropertyDef(flags, genExpr(jsName)(alts.head.sourcePos), getterBody, setterArgAndBody)
   }
 
-  private def genExportMethod(alts0: List[Exported], jsName: JSName, static: Boolean): js.JSMethodDef = {
+  private def genExportMethod(alts0: List[Symbol], jsName: JSName, static: Boolean)(using Context): js.JSMethodDef = {
     assert(alts0.nonEmpty, "need at least one alternative to generate exporter method")
 
-    implicit val pos = alts0.head.pos
+    implicit val pos: SourcePosition = alts0.head.sourcePos
 
     val namespace =
       if (static) js.MemberNamespace.PublicStatic
@@ -411,12 +385,24 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
 
     // toString() is always exported. We might need to add it here to get correct overloading.
     val alts = jsName match {
-      case JSName.Literal("toString") if alts0.forall(_.params.nonEmpty) =>
-        Exported(defn.Any_toString) :: alts0
+      case JSName.Literal("toString") if alts0.forall(_.info.paramInfoss.exists(_.nonEmpty)) =>
+        defn.Any_toString :: alts0
       case _ =>
         alts0
     }
 
+    val overloads = alts.map(new ExportedSymbol(_, static))
+
+    val (formalArgs, restParam, body) =
+      genOverloadDispatch(jsName, overloads, jstpe.AnyType)
+
+    js.JSMethodDef(flags, genExpr(jsName), formalArgs, restParam, body)(
+        OptimizerHints.empty, None)
+  }
+
+  def genOverloadDispatch(jsName: JSName, alts: List[Exported], tpe: jstpe.Type)(
+      using pos: SourcePosition): (List[js.ParamDef], Option[js.ParamDef], js.Tree) = {
+
     // Create the formal args registry
     val hasVarArg = alts.exists(_.hasRepeatedParam)
     val minArgc = alts.map(_.minArgc).min
@@ -437,14 +423,14 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
      * ported to dotc.
      */
     val body =
-      if (alts.tail.isEmpty) genApplyForSingleExported(formalArgsRegistry, alts.head, static)
-      else genExportMethodMultiAlts(formalArgsRegistry, maxNonRepeatedArgc, alts, jsName, static)
+      if (alts.tail.isEmpty) alts.head.genBody(formalArgsRegistry)
+      else genExportMethodMultiAlts(formalArgsRegistry, maxNonRepeatedArgc, alts, tpe, jsName)
 
-    js.JSMethodDef(flags, genExpr(jsName), formalArgs, restParam, body)(OptimizerHints.empty, None)
+    (formalArgs, restParam, body)
   }
 
   private def genExportMethodMultiAlts(formalArgsRegistry: FormalArgsRegistry,
-      maxNonRepeatedArgc: Int, alts: List[Exported], jsName: JSName, static: Boolean)(
+      maxNonRepeatedArgc: Int, alts: List[Exported], tpe: jstpe.Type, jsName: JSName)(
       implicit pos: SourcePosition): js.Tree = {
 
     // Generate tuples (argc, method)
@@ -469,7 +455,7 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
       if methods != altsWithVarArgs // exclude default case we're generating anyways for varargs
     } yield {
       // body of case to disambiguates methods with current count
-      val caseBody = genExportSameArgc(jsName, formalArgsRegistry, methods, static, Some(argc))
+      val caseBody = genOverloadDispatchSameArgc(jsName, formalArgsRegistry, methods, tpe, Some(argc))
       List(js.IntLiteral(argc - formalArgsRegistry.minArgc)) -> caseBody
     }
 
@@ -477,7 +463,7 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
       if (altsWithVarArgs.isEmpty)
         genThrowTypeError()
       else
-        genExportSameArgc(jsName, formalArgsRegistry, altsWithVarArgs, static, None)
+        genOverloadDispatchSameArgc(jsName, formalArgsRegistry, altsWithVarArgs, tpe, None)
     }
 
     val body = {
@@ -491,7 +477,7 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
             js.AsInstanceOf(js.JSSelect(restArgRef, js.StringLiteral("length")), jstpe.IntType),
             cases,
             defaultCase)(
-            jstpe.AnyType)
+            tpe)
       }
     }
 
@@ -506,14 +492,14 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
    *    The registry of all the formal arguments
    *  @param alts
    *    Alternative methods
-   *  @param static
-   *    Whether we are generating a static method
+   *  @param tpe
+   *    Result type
    *  @param maxArgc
    *    Maximum number of arguments to use for disambiguation
    */
-  private def genExportSameArgc(jsName: JSName, formalArgsRegistry: FormalArgsRegistry,
-      alts: List[Exported], static: Boolean, maxArgc: Option[Int]): js.Tree = {
-    genExportSameArgcRec(jsName, formalArgsRegistry, alts, paramIndex = 0, static, maxArgc)
+  private def genOverloadDispatchSameArgc(jsName: JSName, formalArgsRegistry: FormalArgsRegistry,
+      alts: List[Exported], tpe: jstpe.Type, maxArgc: Option[Int]): js.Tree = {
+    genOverloadDispatchSameArgcRec(jsName, formalArgsRegistry, alts, tpe, paramIndex = 0, maxArgc)
   }
 
   /** Resolves method calls to [[alts]] while assuming they have the same parameter count.
@@ -524,27 +510,27 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
    *    The registry of all the formal arguments
    *  @param alts
    *    Alternative methods
+   *  @param tpe
+   *    Result type
    *  @param paramIndex
    *    Index where to start disambiguation (starts at 0, increases through recursion)
-   *  @param static
-   *    Whether we are generating a static method
    *  @param maxArgc
    *    Maximum number of arguments to use for disambiguation
    */
-  private def genExportSameArgcRec(jsName: JSName, formalArgsRegistry: FormalArgsRegistry, alts: List[Exported],
-      paramIndex: Int, static: Boolean, maxArgc: Option[Int]): js.Tree = {
+  private def genOverloadDispatchSameArgcRec(jsName: JSName, formalArgsRegistry: FormalArgsRegistry,
+      alts: List[Exported], tpe: jstpe.Type, paramIndex: Int, maxArgc: Option[Int]): js.Tree = {
 
     implicit val pos = alts.head.pos
 
     if (alts.sizeIs == 1) {
-      genApplyForSingleExported(formalArgsRegistry, alts.head, static)
+      alts.head.genBody(formalArgsRegistry)
     } else if (maxArgc.exists(_ <= paramIndex) || !alts.exists(_.params.size > paramIndex)) {
       // We reach here in three cases:
       // 1. The parameter list has been exhausted
       // 2. The optional argument count restriction has triggered
       // 3. We only have (more than once) repeated parameters left
       // Therefore, we should fail
-      reportCannotDisambiguateError(jsName, alts)
+      reportCannotDisambiguateError(jsName, alts.map(_.sym))
       js.Undefined()
     } else {
       val altsByTypeTest = groupByWithoutHashCode(alts) { exported =>
@@ -553,10 +539,25 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
 
       if (altsByTypeTest.size == 1) {
         // Testing this parameter is not doing any us good
-        genExportSameArgcRec(jsName, formalArgsRegistry, alts, paramIndex + 1, static, maxArgc)
+        genOverloadDispatchSameArgcRec(jsName, formalArgsRegistry, alts, tpe, paramIndex + 1, maxArgc)
       } else {
         // Sort them so that, e.g., isInstanceOf[String] comes before isInstanceOf[Object]
-        val sortedAltsByTypeTest = topoSortDistinctsBy(altsByTypeTest)(_._1)
+        val sortedAltsByTypeTest = topoSortDistinctsWith(altsByTypeTest) { (lhs, rhs) =>
+          (lhs._1, rhs._1) match {
+            // NoTypeTest is always last
+            case (_, NoTypeTest) => true
+            case (NoTypeTest, _) => false
+
+            case (PrimitiveTypeTest(_, rank1), PrimitiveTypeTest(_, rank2)) =>
+              rank1 <= rank2
+
+            case (InstanceOfTypeTest(t1), InstanceOfTypeTest(t2)) =>
+              t1 <:< t2
+
+            case (_: PrimitiveTypeTest, _: InstanceOfTypeTest) => true
+            case (_: InstanceOfTypeTest, _: PrimitiveTypeTest) => false
+          }
+        }
 
         val defaultCase = genThrowTypeError()
 
@@ -565,14 +566,10 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
           implicit val pos = subAlts.head.pos
 
           val paramRef = formalArgsRegistry.genArgRef(paramIndex)
-          val genSubAlts = genExportSameArgcRec(jsName, formalArgsRegistry,
-              subAlts, paramIndex + 1, static, maxArgc)
+          val genSubAlts = genOverloadDispatchSameArgcRec(jsName, formalArgsRegistry,
+              subAlts, tpe, paramIndex + 1, maxArgc)
 
-          def hasDefaultParam = subAlts.exists { exported =>
-            val params = exported.params
-            params.size > paramIndex &&
-            params(paramIndex).hasDefault
-          }
+          def hasDefaultParam = subAlts.exists(_.hasDefaultAt(paramIndex))
 
           val optCond = typeTest match {
             case PrimitiveTypeTest(tpe, _) => Some(js.IsInstanceOf(paramRef, tpe))
@@ -588,14 +585,14 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
                   js.BinaryOp(js.BinaryOp.===, paramRef, js.Undefined()))(
                   jstpe.BooleanType)
             }
-            js.If(condOrUndef, genSubAlts, elsep)(jstpe.AnyType)
+            js.If(condOrUndef, genSubAlts, elsep)(tpe)
           }
         }
       }
     }
   }
 
-  private def reportCannotDisambiguateError(jsName: JSName, alts: List[Exported]): Unit = {
+  private def reportCannotDisambiguateError(jsName: JSName, alts: List[Symbol]): Unit = {
     val currentClass = currentClassSym.get
 
     /* Find a position that is in the current class for decent error reporting.
@@ -604,21 +601,26 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
      * same error in all compilers.
      */
     val validPositions = alts.collect {
-      case alt if alt.sym.owner == currentClass => alt.pos
+      case alt if alt.owner == currentClass => alt.sourcePos
     }
     val pos: SourcePosition =
       if (validPositions.isEmpty) currentClass.sourcePos
       else validPositions.maxBy(_.point)
 
     val kind =
-      if (currentClass.isJSType) "method"
-      else "exported method"
+      if (alts.head.isJSGetter) "getter"
+      else if (alts.head.isJSSetter) "setter"
+      else "method"
+
+    val fullKind =
+      if (currentClass.isJSType) kind
+      else "exported " + kind
 
     val displayName = jsName.displayName
-    val altsTypesInfo = alts.map(_.typeInfo).mkString("\n  ")
+    val altsTypesInfo = alts.map(_.info.show).sorted.mkString("\n  ")
 
     report.error(
-        s"Cannot disambiguate overloads for $kind $displayName with types\n  $altsTypesInfo",
+        s"Cannot disambiguate overloads for $fullKind $displayName with types\n  $altsTypesInfo",
         pos)
   }
 
@@ -677,63 +679,54 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
 
     implicit val pos = exported.pos
 
-    // Generate JS code to prepare arguments (repeated args, default getters and unboxes)
-    val jsArgPrep = genPrepareArgs(formalArgsRegistry, exported, static)
-    val jsArgPrepRefs = jsArgPrep.map(_.ref)
+    val varDefs = new mutable.ListBuffer[js.VarDef]
 
-    // Combine prep'ed formal arguments with captures
-    val allJSArgs = {
-      exported.captureParamsFront.map(_.ref) :::
-      jsArgPrepRefs :::
-      exported.captureParamsBack.map(_.ref)
+    for ((param, i) <- exported.params.zipWithIndex) {
+      val rhs = genScalaArg(exported, i, formalArgsRegistry, param, static, captures = Nil)(
+          prevArgsCount => varDefs.take(prevArgsCount).toList.map(_.ref))
+
+      varDefs += js.VarDef(freshLocalIdent("prep" + i), NoOriginalName, rhs.tpe, mutable = false, rhs)
     }
 
-    val jsResult = genResult(exported, allJSArgs, static)
+    val builtVarDefs = varDefs.result()
+
+    val jsResult = genResult(exported, builtVarDefs.map(_.ref), static)
 
-    js.Block(jsArgPrep :+ jsResult)
+    js.Block(builtVarDefs :+ jsResult)
   }
 
-  /** Generate the necessary JavaScript code to prepare the arguments of an
-   *  exported method (unboxing and default parameter handling)
+  /** Generates a Scala argument from dispatched JavaScript arguments
+   *  (unboxing and default parameter handling).
    */
-  private def genPrepareArgs(formalArgsRegistry: FormalArgsRegistry, exported: Exported, static: Boolean)(
-      implicit pos: SourcePosition): List[js.VarDef] = {
-
-    val result = new mutable.ListBuffer[js.VarDef]
+  def genScalaArg(exported: Exported, paramIndex: Int, formalArgsRegistry: FormalArgsRegistry,
+      param: JSParamInfo, static: Boolean, captures: List[js.Tree])(
+      previousArgsValues: Int => List[js.Tree])(
+      implicit pos: SourcePosition): js.Tree = {
 
-    for ((param, i) <- exported.params.zipWithIndex) yield {
-      val verifiedOrDefault = if (param.isRepeated) {
-        genJSArrayToVarArgs(formalArgsRegistry.genVarargRef(i))
-      } else {
-        val jsArg = formalArgsRegistry.genArgRef(i)
+    if (param.repeated) {
+      genJSArrayToVarArgs(formalArgsRegistry.genVarargRef(paramIndex))
+    } else {
+      val jsArg = formalArgsRegistry.genArgRef(paramIndex)
 
-        // Unboxed argument (if it is defined)
-        val unboxedArg = unbox(jsArg, param.info)
+      // Unboxed argument (if it is defined)
+      val unboxedArg = unbox(jsArg, param.info)
 
+      if (exported.hasDefaultAt(paramIndex)) {
         // If argument is undefined and there is a default getter, call it
-        if (param.hasDefault) {
-          js.If(js.BinaryOp(js.BinaryOp.===, jsArg, js.Undefined()), {
-            genCallDefaultGetter(exported.sym, i, static) {
-              prevArgsCount => result.take(prevArgsCount).toList.map(_.ref)
-            }
-          }, {
-            // Otherwise, unbox the argument
-            unboxedArg
-          })(unboxedArg.tpe)
-        } else {
-          // Otherwise, it is always the unboxed argument
+        js.If(js.BinaryOp(js.BinaryOp.===, jsArg, js.Undefined()), {
+          genCallDefaultGetter(exported.sym, paramIndex, static, captures)(previousArgsValues)
+        }, {
           unboxedArg
-        }
+        })(unboxedArg.tpe)
+      } else {
+        // Otherwise, it is always the unboxed argument
+        unboxedArg
       }
-
-      result += js.VarDef(freshLocalIdent("prep" + i), NoOriginalName,
-          verifiedOrDefault.tpe, mutable = false, verifiedOrDefault)
     }
-
-    result.toList
   }
 
-  private def genCallDefaultGetter(sym: Symbol, paramIndex: Int, static: Boolean)(
+  def genCallDefaultGetter(sym: Symbol, paramIndex: Int,
+      static: Boolean, captures: List[js.Tree])(
       previousArgsValues: Int => List[js.Tree])(
       implicit pos: SourcePosition): js.Tree = {
 
@@ -744,9 +737,33 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
     assert(!defaultGetterDenot.isOverloaded, i"found overloaded default getter $defaultGetterDenot")
     val defaultGetter = defaultGetterDenot.symbol
 
-    val targetTree =
-      if (sym.isClassConstructor || static) genLoadModule(targetSym)
-      else js.This()(encodeClassType(targetSym))
+    val targetTree = {
+      if (sym.isClassConstructor || static) {
+        if (targetSym.isStatic) {
+          assert(captures.isEmpty, i"expected empty captures for ${targetSym.fullName} at $pos")
+          genLoadModule(targetSym)
+        } else {
+          assert(captures.sizeIs == 1, "expected exactly one capture")
+
+          // Find the module accessor. We cannot use memberBasedOnFlags because of scala-js/scala-js#4526.
+          val outer = targetSym.originalOwner
+          val name = atPhase(typerPhase)(targetSym.name.unexpandedName).sourceModuleName
+          val modAccessor = outer.info.allMembers.find { denot =>
+            denot.symbol.is(Module) && denot.name.unexpandedName == name
+          }.getOrElse {
+            throw new AssertionError(i"could not find module accessor for ${targetSym.fullName} at $pos")
+          }.symbol
+
+          val receiver = captures.head
+          if (outer.isJSType)
+            genApplyJSClassMethod(receiver, modAccessor, Nil)
+          else
+            genApplyMethodMaybeStatically(receiver, modAccessor, Nil)
+        }
+      } else {
+        js.This()(encodeClassType(targetSym))
+      }
+    }
 
     // Pass previous arguments to defaultGetter
     val defaultGetterArgs = previousArgsValues(defaultGetter.info.paramInfoss.head.size)
@@ -757,6 +774,13 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
           js.Undefined()
         else
           genApplyJSClassMethod(targetTree, defaultGetter, defaultGetterArgs)
+      } else if (defaultGetter.owner == targetSym) {
+        /* We get here if a non-native constructor has a native companion.
+         * This is reported on a per-class level.
+         */
+        assert(sym.isClassConstructor,
+            s"got non-constructor method $sym with default method in JS native companion")
+        js.Undefined()
       } else {
         report.error(
             "When overriding a native method with default arguments, " +
@@ -774,7 +798,7 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
     else sym.owner
 
   private def defaultGetterDenot(targetSym: Symbol, sym: Symbol, paramIndex: Int): Denotation =
-    targetSym.info.member(DefaultGetterName(sym.name.asTermName, paramIndex))
+    targetSym.info.memberBasedOnFlags(DefaultGetterName(sym.name.asTermName, paramIndex), excluded = Bridge)
 
   private def defaultGetterDenot(sym: Symbol, paramIndex: Int): Denotation =
     defaultGetterDenot(targetSymForDefaultGetter(sym), sym, paramIndex)
@@ -809,106 +833,33 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
   private def genThrowTypeError(msg: String = "No matching overload")(implicit pos: Position): js.Tree =
     js.Throw(js.JSNew(js.JSGlobalRef("TypeError"), js.StringLiteral(msg) :: Nil))
 
-  private final class ParamSpec(val info: Type, val isRepeated: Boolean, val hasDefault: Boolean) {
-    override def toString(): String =
-      i"ParamSpec($info, isRepeated = $isRepeated, hasDefault = $hasDefault)"
-  }
-
-  private object ParamSpec {
-    def apply(methodSym: Symbol, infoAtElimRepeated: Type, infoAtElimEVT: Type,
-        methodHasDefaultParams: Boolean, paramIndex: Int): ParamSpec = {
-      val isRepeated = infoAtElimRepeated.isRepeatedParam
-      val info =
-        if (isRepeated) atPhase(elimRepeatedPhase)(infoAtElimRepeated.repeatedToSingle.widenDealias)
-        else infoAtElimEVT
-      val hasDefault = methodHasDefaultParams && defaultGetterDenot(methodSym, paramIndex).exists
-      new ParamSpec(info, isRepeated, hasDefault)
-    }
-  }
-
-  // This is a case class because we rely on its structural equality
-  private final case class Exported(sym: Symbol) {
-    val isConstructorOfNestedJSClass =
-      sym.isClassConstructor && sym.owner.isNestedJSClass
-
-    // params: List[ParamSpec] ; captureParams and captureParamsBack: List[js.ParamDef]
-    val (params, captureParamsFront, captureParamsBack) = {
-      val (paramNamesAtElimRepeated, paramInfosAtElimRepeated, methodHasDefaultParams) =
-        atPhase(elimRepeatedPhase)((sym.info.paramNamess.flatten, sym.info.paramInfoss.flatten, sym.hasDefaultParams))
-      val (paramNamesAtElimEVT, paramInfosAtElimEVT) =
-        atPhase(elimErasedValueTypePhase)((sym.info.firstParamNames, sym.info.firstParamTypes))
-      val (paramNamesNow, paramInfosNow) =
-        (sym.info.firstParamNames, sym.info.firstParamTypes)
-
-      val formalParamCount = paramInfosAtElimRepeated.size
-
-      def buildFormalParams(formalParamInfosAtElimEVT: List[Type]): IndexedSeq[ParamSpec] = {
-        (for {
-          (infoAtElimRepeated, infoAtElimEVT, paramIndex) <-
-            paramInfosAtElimRepeated.lazyZip(formalParamInfosAtElimEVT).lazyZip(0 until formalParamCount)
-        } yield {
-          ParamSpec(sym, infoAtElimRepeated, infoAtElimEVT, methodHasDefaultParams, paramIndex)
-        }).toIndexedSeq
-      }
-
-      def buildCaptureParams(namesAndInfosNow: List[(TermName, Type)]): List[js.ParamDef] = {
-        implicit val pos: Position = sym.span
-        for ((name, info) <- namesAndInfosNow) yield {
-          js.ParamDef(freshLocalIdent(name.mangledString), NoOriginalName, toIRType(info),
-              mutable = false)
-        }
-      }
+  abstract class Exported(
+    val sym: Symbol,
+    // Parameters participating in overload resolution.
+    val params: scala.collection.immutable.IndexedSeq[JSParamInfo]
+  ) {
+    assert(!params.exists(_.capture), "illegal capture params in Exported")
 
-      if (!isConstructorOfNestedJSClass) {
-        // Easy case: all params are formal params
-        assert(paramInfosAtElimEVT.size == formalParamCount && paramInfosNow.size == formalParamCount,
-            s"Found $formalParamCount params entering elimRepeated but ${paramInfosAtElimEVT.size} params entering " +
-            s"elimErasedValueType and ${paramInfosNow.size} params at the back-end for non-lifted symbol ${sym.fullName}")
-        val formalParams = buildFormalParams(paramInfosAtElimEVT)
-        (formalParams, Nil, Nil)
-      } else if (formalParamCount == 0) {
-        // Fast path: all params are capture params
-        val captureParams = buildCaptureParams(paramNamesNow.zip(paramInfosNow))
-        (IndexedSeq.empty, Nil, captureParams)
+    private val paramsHasDefault = {
+      if (!atPhase(elimRepeatedPhase)(sym.hasDefaultParams)) {
+        Vector.empty
       } else {
-        /* Slow path: we have to isolate formal params (which were already present at elimRepeated)
-         * from capture params (which are later, typically by erasure and/or lambdalift).
-         */
-
-        def findStartOfFormalParamsIn(paramNames: List[TermName]): Int = {
-          val start = paramNames.indexOfSlice(paramNamesAtElimRepeated)
-          assert(start >= 0, s"could not find formal param names $paramNamesAtElimRepeated in $paramNames")
-          start
-        }
-
-        // Find the infos of formal params at elimEVT
-        val startOfFormalParamsAtElimEVT = findStartOfFormalParamsIn(paramNamesAtElimEVT)
-        val formalParamInfosAtElimEVT = paramInfosAtElimEVT.drop(startOfFormalParamsAtElimEVT).take(formalParamCount)
-
-        // Build the formal param specs from their infos at elimRepeated and elimEVT
-        val formalParams = buildFormalParams(formalParamInfosAtElimEVT)
-
-        // Find the formal params now to isolate the capture params (before and after the formal params)
-        val startOfFormalParamsNow = findStartOfFormalParamsIn(paramNamesNow)
-        val paramNamesAndInfosNow = paramNamesNow.zip(paramInfosNow)
-        val (captureParamsFrontNow, restOfParamsNow) = paramNamesAndInfosNow.splitAt(startOfFormalParamsNow)
-        val captureParamsBackNow = restOfParamsNow.drop(formalParamCount)
-
-        // Build the capture param defs from the isolated capture params
-        val captureParamsFront = buildCaptureParams(captureParamsFrontNow)
-        val captureParamsBack = buildCaptureParams(captureParamsBackNow)
-
-        (formalParams, captureParamsFront, captureParamsBack)
+        val targetSym = targetSymForDefaultGetter(sym)
+        params.indices.map(i => defaultGetterDenot(targetSym, sym, i).exists)
       }
     }
 
-    val hasRepeatedParam = params.nonEmpty && params.last.isRepeated
+    def hasDefaultAt(paramIndex: Int): Boolean =
+      paramIndex < paramsHasDefault.size && paramsHasDefault(paramIndex)
+
+    val hasRepeatedParam = params.nonEmpty && params.last.repeated
 
     val minArgc = {
       // Find the first default param or repeated param
-      val firstOptionalParamIndex = params.indexWhere(p => p.hasDefault || p.isRepeated)
-      if (firstOptionalParamIndex == -1) params.size
-      else firstOptionalParamIndex
+      params
+        .indices
+        .find(i => hasDefaultAt(i) || params(i).repeated)
+        .getOrElse(params.size)
     }
 
     val maxNonRepeatedArgc = if (hasRepeatedParam) params.size - 1 else params.size
@@ -925,6 +876,15 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
     }
 
     def typeInfo: String = sym.info.toString
+
+    def genBody(formalArgsRegistry: FormalArgsRegistry): js.Tree
+  }
+
+  private class ExportedSymbol(sym: Symbol, static: Boolean)
+      extends Exported(sym, sym.jsParamInfos.toIndexedSeq) {
+
+    def genBody(formalArgsRegistry: FormalArgsRegistry): js.Tree =
+      genApplyForSingleExported(formalArgsRegistry, this, static)
   }
 
   // !!! Hash codes of RTTypeTest are meaningless because of InstanceOfTypeTest
@@ -944,46 +904,14 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
 
   private case object NoTypeTest extends RTTypeTest
 
-  private object RTTypeTest {
-    given PartialOrdering[RTTypeTest] with {
-      override def tryCompare(lhs: RTTypeTest, rhs: RTTypeTest): Option[Int] = {
-        if (lteq(lhs, rhs)) if (lteq(rhs, lhs)) Some(0) else Some(-1)
-        else                if (lteq(rhs, lhs)) Some(1) else None
-      }
-
-      override def lteq(lhs: RTTypeTest, rhs: RTTypeTest): Boolean = {
-        (lhs, rhs) match {
-          // NoTypeTest is always last
-          case (_, NoTypeTest) => true
-          case (NoTypeTest, _) => false
-
-          case (PrimitiveTypeTest(_, rank1), PrimitiveTypeTest(_, rank2)) =>
-            rank1 <= rank2
-
-          case (InstanceOfTypeTest(t1), InstanceOfTypeTest(t2)) =>
-            t1 <:< t2
-
-          case (_: PrimitiveTypeTest, _: InstanceOfTypeTest) => true
-          case (_: InstanceOfTypeTest, _: PrimitiveTypeTest) => false
-        }
-      }
-
-      override def equiv(lhs: RTTypeTest, rhs: RTTypeTest): Boolean = {
-        lhs == rhs
-      }
-    }
-  }
-
   /** Very simple O(n²) topological sort for elements assumed to be distinct. */
-  private def topoSortDistinctsBy[A <: AnyRef, B](coll: List[A])(f: A => B)(
-      using ord: PartialOrdering[B]): List[A] = {
-
+  private def topoSortDistinctsWith[A <: AnyRef](coll: List[A])(lteq: (A, A) => Boolean): List[A] = {
     @tailrec
     def loop(coll: List[A], acc: List[A]): List[A] = {
       if (coll.isEmpty) acc
       else if (coll.tail.isEmpty) coll.head :: acc
       else {
-        val (lhs, rhs) = coll.span(x => !coll.forall(y => (x eq y) || !ord.lteq(f(x), f(y))))
+        val (lhs, rhs) = coll.span(x => !coll.forall(y => (x eq y) || !lteq(x, y)))
         assert(!rhs.isEmpty, s"cycle while ordering $coll")
         loop(lhs ::: rhs.tail, rhs.head :: acc)
       }
@@ -1039,7 +967,7 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
     m.toList
   }
 
-  private class FormalArgsRegistry(val minArgc: Int, needsRestParam: Boolean) {
+  class FormalArgsRegistry(val minArgc: Int, needsRestParam: Boolean) {
     private val fixedParamNames: scala.collection.immutable.IndexedSeq[jsNames.LocalName] =
       (0 until minArgc).toIndexedSeq.map(_ => freshLocalIdent("arg")(NoPosition).name)
 
@@ -1083,14 +1011,14 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
       js.VarRef(js.LocalIdent(restParamName))(jstpe.AnyType)
     }
 
-    def genAllArgsRefsForForwarder()(implicit pos: Position): List[js.Tree] = {
+    def genAllArgsRefsForForwarder()(implicit pos: Position): List[js.TreeOrJSSpread] = {
       val fixedArgRefs = fixedParamNames.toList.map { paramName =>
         js.VarRef(js.LocalIdent(paramName))(jstpe.AnyType)
       }
 
       if (needsRestParam) {
         val restArgRef = js.VarRef(js.LocalIdent(restParamName))(jstpe.AnyType)
-        fixedArgRefs :+ restArgRef
+        fixedArgRefs :+ js.JSSpread(restArgRef)
       } else {
         fixedArgRefs
       }
diff --git a/compiler/src/dotty/tools/backend/sjs/JSInterop.scala b/compiler/src/dotty/tools/backend/sjs/JSInterop.scala
deleted file mode 100644
index c22af60bd179..000000000000
--- a/compiler/src/dotty/tools/backend/sjs/JSInterop.scala
+++ /dev/null
@@ -1,74 +0,0 @@
-package dotty.tools.backend.sjs
-
-import dotty.tools.dotc.core._
-import Contexts._
-import Flags._
-import Symbols._
-import NameOps._
-import StdNames._
-import Phases._
-
-import dotty.tools.dotc.transform.sjs.JSSymUtils._
-
-/** Management of the interoperability with JavaScript.
- *
- *  This object only contains forwarders for extension methods in
- *  `transform.sjs.JSSymUtils`. They are kept to minimize changes in
- *  `JSCodeGen` in the short term, but it will eventually be removed.
- */
-object JSInterop {
-
-  /** Is this symbol a JavaScript type? */
-  def isJSType(sym: Symbol)(using Context): Boolean =
-    sym.isJSType
-
-  /** Should this symbol be translated into a JS getter?
-   *
-   *  This is true for any parameterless method, i.e., defined without `()`.
-   *  Unlike `SymDenotations.isGetter`, it applies to user-defined methods as
-   *  much as *accessor* methods created for `val`s and `var`s.
-   */
-  def isJSGetter(sym: Symbol)(using Context): Boolean =
-    sym.isJSGetter
-
-  /** Should this symbol be translated into a JS setter?
-   *
-   *  This is true for any method whose name ends in `_=`.
-   *  Unlike `SymDenotations.isGetter`, it applies to user-defined methods as
-   *  much as *accessor* methods created for `var`s.
-   */
-  def isJSSetter(sym: Symbol)(using Context): Boolean =
-    sym.isJSSetter
-
-  /** Should this symbol be translated into a JS bracket access?
-   *
-   *  This is true for methods annotated with `@JSBracketAccess`.
-   */
-  def isJSBracketAccess(sym: Symbol)(using Context): Boolean =
-    sym.isJSBracketAccess
-
-  /** Should this symbol be translated into a JS bracket call?
-   *
-   *  This is true for methods annotated with `@JSBracketCall`.
-   */
-  def isJSBracketCall(sym: Symbol)(using Context): Boolean =
-    sym.isJSBracketCall
-
-  /** Is this symbol a default param accessor for a JS method?
-   *
-   *  For default param accessors of *constructors*, we need to test whether
-   *  the companion *class* of the owner is a JS type; not whether the owner
-   *  is a JS type.
-   */
-  def isJSDefaultParam(sym: Symbol)(using Context): Boolean =
-    sym.isJSDefaultParam
-
-  /** Gets the unqualified JS name of a symbol.
-   *
-   *  If it is not explicitly specified with an `@JSName` annotation, the
-   *  JS name is inferred from the Scala name.
-   */
-  def jsNameOf(sym: Symbol)(using Context): JSName =
-    sym.jsName
-
-}
diff --git a/compiler/src/dotty/tools/backend/sjs/JSPositions.scala b/compiler/src/dotty/tools/backend/sjs/JSPositions.scala
index 84b6304d60eb..454b5b5c3a5c 100644
--- a/compiler/src/dotty/tools/backend/sjs/JSPositions.scala
+++ b/compiler/src/dotty/tools/backend/sjs/JSPositions.scala
@@ -39,11 +39,11 @@ class JSPositions()(using Context) {
   private def sourceAndSpan2irPos(source: SourceFile, span: Span): ir.Position = {
     if (!span.exists) ir.Position.NoPosition
     else {
-      // dotty positions are 1-based but IR positions are 0-based
+      // dotty positions and IR positions are both 0-based
       val irSource = span2irPosCache.toIRSource(source)
       val point = span.point
-      val line = source.offsetToLine(point) - 1
-      val column = source.column(point) - 1
+      val line = source.offsetToLine(point)
+      val column = source.column(point)
       ir.Position(irSource, line, column)
     }
   }
diff --git a/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala b/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala
index d4a96f29ca5c..ac7b492e3e1f 100644
--- a/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala
+++ b/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala
@@ -16,39 +16,42 @@ import scala.collection.mutable
 
 object JSPrimitives {
 
-  final val FirstJSPrimitiveCode = 300
+  inline val FirstJSPrimitiveCode = 300
 
-  final val DYNNEW = FirstJSPrimitiveCode + 1 // Instantiate a new JavaScript object
+  inline val DYNNEW = FirstJSPrimitiveCode + 1 // Instantiate a new JavaScript object
 
-  final val ARR_CREATE = DYNNEW + 1 // js.Array.apply (array literal syntax)
+  inline val ARR_CREATE = DYNNEW + 1 // js.Array.apply (array literal syntax)
 
-  final val TYPEOF = ARR_CREATE + 1 // typeof x
-  final val JS_NATIVE = TYPEOF + 1  // js.native. Marker method. Fails if tried to be emitted.
+  inline val TYPEOF = ARR_CREATE + 1 // typeof x
+  inline val JS_NATIVE = TYPEOF + 1  // js.native. Marker method. Fails if tried to be emitted.
 
-  final val UNITVAL = JS_NATIVE + 1 // () value, which is undefined
+  inline val UNITVAL = JS_NATIVE + 1 // () value, which is undefined
 
-  final val CONSTRUCTOROF = UNITVAL + 1                                // runtime.constructorOf(clazz)
-  final val CREATE_INNER_JS_CLASS = CONSTRUCTOROF + 1                  // runtime.createInnerJSClass
-  final val CREATE_LOCAL_JS_CLASS = CREATE_INNER_JS_CLASS + 1          // runtime.createLocalJSClass
-  final val WITH_CONTEXTUAL_JS_CLASS_VALUE = CREATE_LOCAL_JS_CLASS + 1 // runtime.withContextualJSClassValue
-  final val LINKING_INFO = WITH_CONTEXTUAL_JS_CLASS_VALUE + 1          // runtime.linkingInfo
+  inline val JS_IMPORT = UNITVAL + 1        // js.import.apply(specifier)
+  inline val JS_IMPORT_META = JS_IMPORT + 1 // js.import.meta
 
-  final val STRICT_EQ = LINKING_INFO + 1 // js.special.strictEquals
-  final val IN = STRICT_EQ + 1           // js.special.in
-  final val INSTANCEOF = IN + 1          // js.special.instanceof
-  final val DELETE = INSTANCEOF + 1      // js.special.delete
-  final val FORIN = DELETE + 1           // js.special.forin
-  final val DEBUGGER = FORIN + 1         // js.special.debugger
+  inline val CONSTRUCTOROF = JS_IMPORT_META + 1                         // runtime.constructorOf(clazz)
+  inline val CREATE_INNER_JS_CLASS = CONSTRUCTOROF + 1                  // runtime.createInnerJSClass
+  inline val CREATE_LOCAL_JS_CLASS = CREATE_INNER_JS_CLASS + 1          // runtime.createLocalJSClass
+  inline val WITH_CONTEXTUAL_JS_CLASS_VALUE = CREATE_LOCAL_JS_CLASS + 1 // runtime.withContextualJSClassValue
+  inline val LINKING_INFO = WITH_CONTEXTUAL_JS_CLASS_VALUE + 1          // runtime.linkingInfo
 
-  final val THROW = DEBUGGER + 1
+  inline val STRICT_EQ = LINKING_INFO + 1 // js.special.strictEquals
+  inline val IN = STRICT_EQ + 1           // js.special.in
+  inline val INSTANCEOF = IN + 1          // js.special.instanceof
+  inline val DELETE = INSTANCEOF + 1      // js.special.delete
+  inline val FORIN = DELETE + 1           // js.special.forin
+  inline val DEBUGGER = FORIN + 1         // js.special.debugger
 
-  final val UNION_FROM = THROW + 1                       // js.|.from
-  final val UNION_FROM_TYPE_CONSTRUCTOR = UNION_FROM + 1 // js.|.fromTypeConstructor
+  inline val THROW = DEBUGGER + 1
 
-  final val REFLECT_SELECTABLE_SELECTDYN = UNION_FROM_TYPE_CONSTRUCTOR + 1 // scala.reflect.Selectable.selectDynamic
-  final val REFLECT_SELECTABLE_APPLYDYN = REFLECT_SELECTABLE_SELECTDYN + 1 // scala.reflect.Selectable.applyDynamic
+  inline val UNION_FROM = THROW + 1                       // js.|.from
+  inline val UNION_FROM_TYPE_CONSTRUCTOR = UNION_FROM + 1 // js.|.fromTypeConstructor
 
-  final val LastJSPrimitiveCode = REFLECT_SELECTABLE_APPLYDYN
+  inline val REFLECT_SELECTABLE_SELECTDYN = UNION_FROM_TYPE_CONSTRUCTOR + 1 // scala.reflect.Selectable.selectDynamic
+  inline val REFLECT_SELECTABLE_APPLYDYN = REFLECT_SELECTABLE_SELECTDYN + 1 // scala.reflect.Selectable.applyDynamic
+
+  inline val LastJSPrimitiveCode = REFLECT_SELECTABLE_APPLYDYN
 
   def isJSPrimitive(code: Int): Boolean =
     code >= FirstJSPrimitiveCode && code <= LastJSPrimitiveCode
@@ -106,6 +109,9 @@ class JSPrimitives(ictx: Context) extends DottyPrimitives(ictx) {
 
     addPrimitive(defn.BoxedUnit_UNIT, UNITVAL)
 
+    addPrimitive(jsdefn.JSImport_apply, JS_IMPORT)
+    addPrimitive(jsdefn.JSImport_meta, JS_IMPORT_META)
+
     addPrimitive(jsdefn.Runtime_constructorOf, CONSTRUCTOROF)
     addPrimitive(jsdefn.Runtime_createInnerJSClass, CREATE_INNER_JS_CLASS)
     addPrimitive(jsdefn.Runtime_createLocalJSClass, CREATE_LOCAL_JS_CLASS)
diff --git a/compiler/src/dotty/tools/dotc/CompilationUnit.scala b/compiler/src/dotty/tools/dotc/CompilationUnit.scala
index e858e01efc48..3c73b1126889 100644
--- a/compiler/src/dotty/tools/dotc/CompilationUnit.scala
+++ b/compiler/src/dotty/tools/dotc/CompilationUnit.scala
@@ -56,9 +56,6 @@ class CompilationUnit protected (val source: SourceFile) {
    */
   var needsQuotePickling: Boolean = false
 
-  /** A structure containing a temporary map for generating inline accessors */
-  val inlineAccessors: InlineAccessors = new InlineAccessors
-
   var suspended: Boolean = false
   var suspendedAtInliningPhase: Boolean = false
 
@@ -66,7 +63,7 @@ class CompilationUnit protected (val source: SourceFile) {
   def isSuspendable: Boolean = true
 
   /** Suspends the compilation unit by thowing a SuspendException
-   *  and recoring the suspended compilation unit
+   *  and recording the suspended compilation unit
    */
   def suspend()(using Context): Nothing =
     assert(isSuspendable)
@@ -125,7 +122,7 @@ object CompilationUnit {
         NoSource
       }
       else if (!source.file.exists) {
-        report.error(s"not found: ${source.file.path}")
+        report.error(s"source file not found: ${source.file.path}")
         NoSource
       }
       else source
diff --git a/compiler/src/dotty/tools/dotc/Compiler.scala b/compiler/src/dotty/tools/dotc/Compiler.scala
index ef0acb58492b..1ddc626d2646 100644
--- a/compiler/src/dotty/tools/dotc/Compiler.scala
+++ b/compiler/src/dotty/tools/dotc/Compiler.scala
@@ -3,12 +3,13 @@ package dotc
 
 import core._
 import Contexts._
-import typer.{FrontEnd, RefChecks}
+import typer.{TyperPhase, RefChecks}
+import parsing.Parser
 import Phases.Phase
 import transform._
-import dotty.tools.backend.jvm.{CollectSuperCalls, GenBCode}
 import dotty.tools.backend
-import dotty.tools.dotc.transform.localopt.StringInterpolatorOpt
+import backend.jvm.{CollectSuperCalls, GenBCode}
+import localopt.StringInterpolatorOpt
 
 /** The central class of the dotc compiler. The job of a compiler is to create
  *  runs, which process given `phases` in a given `rootContext`.
@@ -36,7 +37,8 @@ class Compiler {
 
   /** Phases dealing with the frontend up to trees ready for TASTY pickling */
   protected def frontendPhases: List[List[Phase]] =
-    List(new FrontEnd) ::           // Compiler frontend: scanner, parser, namer, typer
+    List(new Parser) ::             // Compiler frontend: scanner, parser
+    List(new TyperPhase) ::         // Compiler frontend: namer, typer
     List(new YCheckPositions) ::    // YCheck positions
     List(new sbt.ExtractDependencies) :: // Sends information on classes' dependencies to sbt via callbacks
     List(new semanticdb.ExtractSemanticDB) :: // Extract info into .semanticdb files
@@ -62,27 +64,30 @@ class Compiler {
          new ElimPackagePrefixes,    // Eliminate references to package prefixes in Select nodes
          new CookComments,           // Cook the comments: expand variables, doc, etc.
          new CheckStatic,            // Check restrictions that apply to @static members
+         new CheckLoopingImplicits,  // Check that implicit defs do not call themselves in an infinite loop
          new BetaReduce,             // Reduce closure applications
          new InlineVals,             // Check right hand-sides of an `inline val`s
          new ExpandSAMs,             // Expand single abstract method closures to anonymous classes
-         new init.Checker) ::        // Check initialization of objects
-    List(new ElimRepeated,           // Rewrite vararg parameters and arguments
+         new ElimRepeated,           // Rewrite vararg parameters and arguments
+         new RefChecks) ::           // Various checks mostly related to abstract members and overriding
+    List(new init.Checker) ::        // Check initialization of objects
+    List(new CrossVersionChecks,     // Check issues related to deprecated and experimental
          new ProtectedAccessors,     // Add accessors for protected members
          new ExtensionMethods,       // Expand methods of value classes with extension methods
          new UncacheGivenAliases,    // Avoid caching RHS of simple parameterless given aliases
-         new ByNameClosures,         // Expand arguments to by-name parameters to closures
+         new ElimByName,             // Map by-name parameters to functions
          new HoistSuperArgs,         // Hoist complex arguments of supercalls to enclosing scope
+         new ForwardDepChecks,       // Check that there are no forward references to local vals
          new SpecializeApplyMethods, // Adds specialized methods to FunctionN
-         new RefChecks) ::           // Various checks mostly related to abstract members and overriding
-    List(new ElimOpaque,             // Turn opaque into normal aliases
          new TryCatchPatterns,       // Compile cases in try/catch
-         new PatternMatcher,         // Compile pattern matches
+         new PatternMatcher) ::      // Compile pattern matches
+    List(new ElimOpaque,             // Turn opaque into normal aliases
          new sjs.ExplicitJSClasses,  // Make all JS classes explicit (Scala.js only)
          new ExplicitOuter,          // Add accessors to outer classes from nested ones.
          new ExplicitSelf,           // Make references to non-trivial self types explicit as casts
-         new ElimByName,             // Expand by-name parameter references
-         new StringInterpolatorOpt) :: // Optimizes raw and s string interpolators by rewriting them to string concatenations
+         new StringInterpolatorOpt) :: // Optimizes raw and s and f string interpolators by rewriting them to string concatenations or formats
     List(new PruneErasedDefs,        // Drop erased definitions from scopes and simplify erased expressions
+         new UninitializedDefs,      // Replaces `compiletime.uninitialized` by `_`
          new InlinePatterns,         // Remove placeholders of inlined patterns
          new VCInlineMethods,        // Inlines calls to value class methods
          new SeqLiterals,            // Express vararg arguments as arrays
@@ -102,6 +107,7 @@ class Compiler {
     List(new ElimErasedValueType,    // Expand erased value types to their underlying implmementation types
          new PureStats,              // Remove pure stats from blocks
          new VCElideAllocations,     // Peep-hole optimization to eliminate unnecessary value class allocations
+         new EtaReduce,              // Reduce eta expansions of pure paths to the underlying function reference
          new ArrayApply,             // Optimize `scala.Array.apply([....])` and `scala.Array.apply(..., [....])` into `[...]`
          new sjs.AddLocalJSFakeNews, // Adds fake new invocations to local JS classes in calls to `createLocalJSClass`
          new ElimPolyFunction,       // Rewrite PolyFunction subclasses to FunctionN subclasses
@@ -120,14 +126,15 @@ class Compiler {
          new ElimStaticThis,         // Replace `this` references to static objects by global identifiers
          new CountOuterAccesses) ::  // Identify outer accessors that can be dropped
     List(new DropOuterAccessors,     // Drop unused outer accessors
+         new CheckNoSuperThis,       // Check that supercalls don't contain references to `this`
          new Flatten,                // Lift all inner classes to package scope
-         new RenameLifted,           // Renames lifted classes to local numbering scheme
          new TransformWildcards,     // Replace wildcards with default values
          new MoveStatics,            // Move static methods from companion to the class itself
          new ExpandPrivate,          // Widen private definitions accessed from nested classes
          new RestoreScopes,          // Repair scopes rendered invalid by moving definitions in prior phases of the group
          new SelectStatic,           // get rid of selects that would be compiled into GetStatic
          new sjs.JUnitBootstrappers, // Generate JUnit-specific bootstrapper classes for Scala.js (not enabled by default)
+         new CollectEntryPoints,     // Collect all entry points and save them in the context
          new CollectSuperCalls,      // Find classes that are called with super
          new RepeatableAnnotations) :: // Aggregate repeatable annotations
     Nil
diff --git a/compiler/src/dotty/tools/dotc/Driver.scala b/compiler/src/dotty/tools/dotc/Driver.scala
index 20ae4da58d18..17177e72a7de 100644
--- a/compiler/src/dotty/tools/dotc/Driver.scala
+++ b/compiler/src/dotty/tools/dotc/Driver.scala
@@ -82,7 +82,7 @@ class Driver {
     Positioned.init(using ictx)
 
     inContext(ictx) {
-      if !ctx.settings.YdropComments.value || ctx.mode.is(Mode.ReadComments) then
+      if !ctx.settings.YdropComments.value || ctx.settings.YreadComments.value then
         ictx.setProperty(ContextDoc, new ContextDocstrings)
       val fileNamesOrNone = command.checkUsage(summary, sourcesRequired)(using ctx.settings)(using ctx.settingsState)
       fileNamesOrNone.map { fileNames =>
diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala
index 6b51908c37d7..a258036466ff 100644
--- a/compiler/src/dotty/tools/dotc/Run.scala
+++ b/compiler/src/dotty/tools/dotc/Run.scala
@@ -9,20 +9,20 @@ import Types._
 import Scopes._
 import Names.Name
 import Denotations.Denotation
-import typer.Typer
+import typer.{Typer, PrepareInlineable}
 import typer.ImportInfo._
 import Decorators._
 import io.{AbstractFile, PlainFile, VirtualFile}
 import Phases.unfusedPhases
 
 import util._
-import reporting.Reporter
+import reporting.{Reporter, Suppression, Action}
+import reporting.Diagnostic
+import reporting.Diagnostic.Warning
 import rewrites.Rewrites
 
 import profile.Profiler
 import printing.XprintMode
-import parsing.Parsers.Parser
-import parsing.JavaParsers.JavaParser
 import typer.ImplicitRunInfo
 import config.Feature
 import StdNames.nme
@@ -57,45 +57,66 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
    */
   @volatile var isCancelled = false
 
-  /** Produces the following contexts, from outermost to innermost
-   *
-   *    bootStrap:   A context with next available runId and a scope consisting of
-   *                 the RootPackage _root_
-   *    start        A context with RootClass as owner and the necessary initializations
-   *                 for type checking.
-   *    imports      For each element of RootImports, an import context
-   */
-  protected def rootContext(using Context): Context = {
-    ctx.initialize()
-    ctx.base.setPhasePlan(comp.phases)
-    val rootScope = new MutableScope
-    val bootstrap = ctx.fresh
-      .setPeriod(Period(comp.nextRunId, FirstPhaseId))
-      .setScope(rootScope)
-    rootScope.enter(ctx.definitions.RootPackage)(using bootstrap)
-    var start = bootstrap.fresh
-      .setOwner(defn.RootClass)
-      .setTyper(new Typer)
-      .addMode(Mode.ImplicitsEnabled)
-      .setTyperState(ctx.typerState.fresh(ctx.reporter))
-    if ctx.settings.YexplicitNulls.value && !Feature.enabledBySetting(nme.unsafeNulls) then
-      start = start.addMode(Mode.SafeNulls)
-    ctx.initialize()(using start) // re-initialize the base context with start
-    start.setRun(this)
-  }
-
   private var compiling = false
 
-  private var myCtx = rootContext(using ictx)
-
-  /** The context created for this run */
-  given runContext[Dummy_so_its_a_def]: Context = myCtx
-  assert(runContext.runId <= Periods.MaxPossibleRunId)
-
   private var myUnits: List[CompilationUnit] = _
   private var myUnitsCached: List[CompilationUnit] = _
   private var myFiles: Set[AbstractFile] = _
 
+  // `@nowarn` annotations by source file, populated during typer
+  private val mySuppressions: mutable.LinkedHashMap[SourceFile, mutable.ListBuffer[Suppression]] = mutable.LinkedHashMap.empty
+  // source files whose `@nowarn` annotations are processed
+  private val mySuppressionsComplete: mutable.Set[SourceFile] = mutable.Set.empty
+  // warnings issued before a source file's `@nowarn` annotations are processed, suspended so that `@nowarn` can filter them
+  private val mySuspendedMessages: mutable.LinkedHashMap[SourceFile, mutable.LinkedHashSet[Warning]] = mutable.LinkedHashMap.empty
+
+  object suppressions:
+    // When the REPL creates a new run (ReplDriver.compile), parsing is already done in the old context, with the
+    // previous Run. Parser warnings were suspended in the old run and need to be copied over so they are not lost.
+    // Same as scala/scala/commit/79ca1408c7.
+    def initSuspendedMessages(oldRun: Run) = if oldRun != null then
+      mySuspendedMessages.clear()
+      mySuspendedMessages ++= oldRun.mySuspendedMessages
+
+    def suppressionsComplete(source: SourceFile) = source == NoSource || mySuppressionsComplete(source)
+
+    def addSuspendedMessage(warning: Warning) =
+      mySuspendedMessages.getOrElseUpdate(warning.pos.source, mutable.LinkedHashSet.empty) += warning
+
+    def nowarnAction(dia: Diagnostic): Action.Warning.type | Action.Verbose.type | Action.Silent.type =
+      mySuppressions.getOrElse(dia.pos.source, Nil).find(_.matches(dia)) match {
+        case Some(s) =>
+          s.markUsed()
+          if (s.verbose) Action.Verbose
+          else Action.Silent
+        case _ =>
+          Action.Warning
+      }
+
+    def addSuppression(sup: Suppression): Unit =
+      val source = sup.annotPos.source
+      mySuppressions.getOrElseUpdate(source, mutable.ListBuffer.empty) += sup
+
+    def reportSuspendedMessages(source: SourceFile)(using Context): Unit = {
+      // sort suppressions. they are not added in any particular order because of lazy type completion
+      for (sups <- mySuppressions.get(source))
+        mySuppressions(source) = sups.sortBy(sup => 0 - sup.start)
+      mySuppressionsComplete += source
+      mySuspendedMessages.remove(source).foreach(_.foreach(ctx.reporter.issueIfNotSuppressed))
+    }
+
+    def runFinished(hasErrors: Boolean): Unit =
+      // report suspended messages (in case the run finished before typer)
+      mySuspendedMessages.keysIterator.toList.foreach(reportSuspendedMessages)
+      // report unused nowarns only if all all phases are done
+      if !hasErrors && ctx.settings.WunusedHas.nowarn then
+        for {
+          source <- mySuppressions.keysIterator.toList
+          sups   <- mySuppressions.remove(source)
+          sup    <- sups.reverse
+        } if (!sup.used)
+          report.warning("@nowarn annotation does not suppress any warnings", sup.annotPos)
+
   /** The compilation units currently being compiled, this may return different
    *  results over time.
    */
@@ -212,6 +233,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
             Stats.record(s"total trees at end of $phase", ast.Trees.ntrees)
             for (unit <- units)
               Stats.record(s"retained typed trees at end of $phase", unit.tpdTree.treeSize)
+            ctx.typerState.gc()
           }
 
       profiler.finished()
@@ -221,7 +243,9 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
     runCtx.setProfiler(Profiler())
     unfusedPhases.foreach(_.initContext(runCtx))
     runPhases(using runCtx)
-    if (!ctx.reporter.hasErrors) Rewrites.writeBack()
+    if (!ctx.reporter.hasErrors)
+      Rewrites.writeBack()
+    suppressions.runFinished(hasErrors = ctx.reporter.hasErrors)
     while (finalizeActions.nonEmpty) {
       val action = finalizeActions.remove(0)
       action()
@@ -243,19 +267,13 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
         .setCompilationUnit(unit)
         .withRootImports
 
-      def process()(using Context) = {
-        unit.untpdTree =
-          if (unit.isJava) new JavaParser(unit.source).parse()
-          else new Parser(unit.source).parse()
-        ctx.typer.lateEnter(unit.untpdTree)
-        def processUnit() = {
-          unit.tpdTree = ctx.typer.typedExpr(unit.untpdTree)
-          val phase = new transform.SetRootTree()
-          phase.run
-        }
-        if (typeCheck)
-          if (compiling) finalizeActions += (() => processUnit()) else processUnit()
-      }
+      def process()(using Context) =
+        ctx.typer.lateEnterUnit(doTypeCheck =>
+          if typeCheck then
+            if compiling then finalizeActions += doTypeCheck
+            else doTypeCheck()
+        )
+
       process()(using unitCtx)
     }
 
@@ -267,25 +285,23 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
     val unit = ctx.compilationUnit
     val prevPhase = ctx.phase.prev // can be a mini-phase
     val fusedPhase = ctx.base.fusedContaining(prevPhase)
-    val treeString = unit.tpdTree.show(using ctx.withProperty(XprintMode, Some(())))
-
-    report.echo(s"result of $unit after $fusedPhase:")
+    val echoHeader = f"[[syntax trees at end of $fusedPhase%25s]] // ${unit.source}"
+    val tree = if ctx.isAfterTyper then unit.tpdTree else unit.untpdTree
+    val treeString = tree.show(using ctx.withProperty(XprintMode, Some(())))
 
     last match {
-      case SomePrintedTree(phase, lastTreeSting) if lastTreeSting != treeString =>
-        val msg =
-          if (!ctx.settings.XprintDiff.value && !ctx.settings.XprintDiffDel.value) treeString
-          else DiffUtil.mkColoredCodeDiff(treeString, lastTreeSting, ctx.settings.XprintDiffDel.value)
-        report.echo(msg)
-        SomePrintedTree(fusedPhase.toString, treeString)
-
-      case SomePrintedTree(phase, lastTreeSting) =>
-        report.echo("  Unchanged since " + phase)
+      case SomePrintedTree(phase, lastTreeString) if lastTreeString == treeString =>
+        report.echo(s"$echoHeader: unchanged since $phase")
         last
 
-      case NoPrintedTree =>
-        report.echo(treeString)
-        SomePrintedTree(fusedPhase.toString, treeString)
+      case SomePrintedTree(phase, lastTreeString) if ctx.settings.XprintDiff.value || ctx.settings.XprintDiffDel.value =>
+        val diff = DiffUtil.mkColoredCodeDiff(treeString, lastTreeString, ctx.settings.XprintDiffDel.value)
+        report.echo(s"$echoHeader\n$diff\n")
+        SomePrintedTree(fusedPhase.phaseName, treeString)
+
+      case _ =>
+        report.echo(s"$echoHeader\n$treeString\n")
+        SomePrintedTree(fusedPhase.phaseName, treeString)
     }
   }
 
@@ -320,4 +336,40 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
     myUnits = null
     myUnitsCached = null
   }
+
+  /** Produces the following contexts, from outermost to innermost
+   *
+   *    bootStrap:   A context with next available runId and a scope consisting of
+   *                 the RootPackage _root_
+   *    start        A context with RootClass as owner and the necessary initializations
+   *                 for type checking.
+   *    imports      For each element of RootImports, an import context
+   */
+  protected def rootContext(using Context): Context = {
+    ctx.initialize()
+    ctx.base.setPhasePlan(comp.phases)
+    val rootScope = new MutableScope(0)
+    val bootstrap = ctx.fresh
+      .setPeriod(Period(comp.nextRunId, FirstPhaseId))
+      .setScope(rootScope)
+    rootScope.enter(ctx.definitions.RootPackage)(using bootstrap)
+    var start = bootstrap.fresh
+      .setOwner(defn.RootClass)
+      .setTyper(new Typer)
+      .addMode(Mode.ImplicitsEnabled)
+      .setTyperState(ctx.typerState.fresh(ctx.reporter))
+    if ctx.settings.YexplicitNulls.value && !Feature.enabledBySetting(nme.unsafeNulls) then
+      start = start.addMode(Mode.SafeNulls)
+    ctx.initialize()(using start) // re-initialize the base context with start
+
+    // `this` must be unchecked for safe initialization because by being passed to setRun during
+    // initialization, it is not yet considered fully initialized by the initialization checker
+    start.setRun(this: @unchecked)
+  }
+
+  private var myCtx = rootContext(using ictx)
+
+  /** The context created for this run */
+  given runContext[Dummy_so_its_a_def]: Context = myCtx
+  assert(runContext.runId <= Periods.MaxPossibleRunId)
 }
diff --git a/compiler/src/dotty/tools/dotc/ast/CheckTrees.scala.disabled b/compiler/src/dotty/tools/dotc/ast/CheckTrees.scala.disabled
index 6eddf64fff15..6bf7530faf24 100644
--- a/compiler/src/dotty/tools/dotc/ast/CheckTrees.scala.disabled
+++ b/compiler/src/dotty/tools/dotc/ast/CheckTrees.scala.disabled
@@ -217,7 +217,7 @@ object CheckTrees {
                 optionArg.argTypesHi match {
                   case Nil =>
                     optionArg :: Nil
-                  case tupleArgs if defn.isTupleType(optionArg) =>
+                  case tupleArgs if defn.isTupleNType(optionArg) =>
                     tupleArgs
                 }
               case _ =>
diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
index 27362bff418f..8f0abf9cd999 100644
--- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala
+++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
@@ -7,7 +7,7 @@ import util.Spans._, Types._, Contexts._, Constants._, Names._, NameOps._, Flags
 import Symbols._, StdNames._, Trees._, Phases._, ContextOps._
 import Decorators._, transform.SymUtils._
 import NameKinds.{UniqueName, EvidenceParamName, DefaultGetterName}
-import typer.{FrontEnd, Namer, Checking}
+import typer.{TyperPhase, Namer, Checking}
 import util.{Property, SourceFile, SourcePosition}
 import config.Feature.{sourceVersion, migrateTo3, enabled}
 import config.SourceVersion._
@@ -182,6 +182,7 @@ object desugar {
         tpt     = TypeTree(defn.UnitType),
         rhs     = setterRhs
       ).withMods((mods | Accessor) &~ (CaseAccessor | GivenOrImplicit | Lazy))
+       .dropEndMarker() // the end marker should only appear on the getter definition
       Thicket(vdef1, setter)
     }
     else vdef1
@@ -519,7 +520,11 @@ object desugar {
           enumCases.last.pushAttachment(DesugarEnums.DefinesEnumLookupMethods, ())
         val enumCompanionRef = TermRefTree()
         val enumImport =
-          Import(enumCompanionRef, enumCases.flatMap(caseIds).map(ImportSelector(_)))
+          Import(enumCompanionRef, enumCases.flatMap(caseIds).map(
+            enumCase => 
+              ImportSelector(enumCase.withSpan(enumCase.span.startPos))
+            ) 
+          )
         (enumImport :: enumStats, enumCases, enumCompanionRef)
       }
       else (stats, Nil, EmptyTree)
@@ -782,7 +787,7 @@ object desugar {
         DefDef(
           className.toTermName, joinParams(constrTparams, defParamss),
           classTypeRef, creatorExpr)
-          .withMods(companionMods | mods.flags.toTermFlags & GivenOrImplicit | Synthetic | Final)
+          .withMods(companionMods | mods.flags.toTermFlags & (GivenOrImplicit | Inline) | Final)
           .withSpan(cdef.span) :: Nil
       }
 
@@ -808,7 +813,9 @@ object desugar {
             Nil
         }
       }
-      val classMods = if mods.is(Given) then mods &~ Given | Synthetic else mods
+      if mods.isAllOf(Given | Inline | Transparent) then
+        report.error("inline given instances cannot be trasparent", cdef)
+      val classMods = if mods.is(Given) then mods &~ (Inline | Transparent) | Synthetic else mods
       cpy.TypeDef(cdef: TypeDef)(
         name = className,
         rhs = cpy.Template(impl)(constr, parents1, clsDerived, self1,
@@ -883,6 +890,7 @@ object desugar {
       val clsTmpl = cpy.Template(impl)(self = clsSelf, body = impl.body)
       val cls = TypeDef(clsName, clsTmpl)
         .withMods(mods.toTypeFlags & RetainedModuleClassFlags | ModuleClassCreationFlags)
+        .withEndMarker(copyFrom = mdef) // copy over the end marker position to the module class def
       Thicket(modul, classDef(cls).withSpan(mdef.span))
     }
   }
@@ -946,7 +954,7 @@ object desugar {
       tree.withMods(mods)
     else if tree.name.startsWith("$") && !tree.isBackquoted then
       report.error(
-        """Quoted pattern variable names starting with $ are not suported anymore.
+        """Quoted pattern variable names starting with $ are not supported anymore.
           |Use lower cases type pattern name instead.
           |""".stripMargin,
         tree.srcPos)
@@ -1091,6 +1099,16 @@ object desugar {
     case IdPattern(named, tpt) =>
       derivedValDef(original, named, tpt, rhs, mods)
     case _ =>
+
+      def filterWildcardGivenBinding(givenPat: Bind): Boolean =
+        givenPat.name != nme.WILDCARD
+
+      def errorOnGivenBinding(bind: Bind)(using Context): Boolean =
+        report.error(
+          em"""${hl("given")} patterns are not allowed in a ${hl("val")} definition,
+              |please bind to an identifier and use an alias given.""".stripMargin, bind)
+        false
+
       def isTuplePattern(arity: Int): Boolean = pat match {
         case Tuple(pats) if pats.size == arity =>
           pats.forall(isVarPattern)
@@ -1106,13 +1124,23 @@ object desugar {
       // - `pat` is a tuple of N variables or wildcard patterns like `(x1, x2, ..., xN)`
       val tupleOptimizable = forallResults(rhs, isMatchingTuple)
 
+      val inAliasGenerator = original match
+        case _: GenAlias => true
+        case _ => false
+
       val vars =
         if (tupleOptimizable) // include `_`
-          pat match {
-            case Tuple(pats) =>
-              pats.map { case id: Ident => id -> TypeTree() }
-          }
-        else getVariables(pat)  // no `_`
+          pat match
+            case Tuple(pats) => pats.map { case id: Ident => id -> TypeTree() }
+        else
+          getVariables(
+            tree = pat,
+            shouldAddGiven =
+              if inAliasGenerator then
+                filterWildcardGivenBinding
+              else
+                errorOnGivenBinding
+          ) // no `_`
 
       val ids = for ((named, _) <- vars) yield Ident(named.name)
       val caseDef = CaseDef(pat, EmptyTree, makeTuple(ids))
@@ -1130,7 +1158,7 @@ object desugar {
             mods & Lazy | Synthetic | (if (ctx.owner.isClass) PrivateLocal else EmptyFlags)
           val firstDef =
             ValDef(tmpName, TypeTree(), matchExpr)
-              .withSpan(pat.span.union(rhs.span)).withMods(patMods)
+              .withSpan(pat.span.startPos).withMods(patMods)
           val useSelectors = vars.length <= 22
           def selector(n: Int) =
             if useSelectors then Select(Ident(tmpName), nme.selectorName(n))
@@ -1239,6 +1267,18 @@ object desugar {
       makeOp(left, right, Span(left.span.start, op.span.end, op.span.start))
   }
 
+  /** Translate throws type `A throws E1 | ... | En` to
+   *  $throws[... $throws[A, E1] ... , En].
+   */
+  def throws(tpt: Tree, op: Ident, excepts: Tree)(using Context): AppliedTypeTree = excepts match
+    case Parens(excepts1) =>
+      throws(tpt, op, excepts1)
+    case InfixOp(l, bar @ Ident(tpnme.raw.BAR), r) =>
+      throws(throws(tpt, op, l), bar, r)
+    case e =>
+      AppliedTypeTree(
+        TypeTree(defn.throwsAlias.typeRef).withSpan(op.span), tpt :: excepts :: Nil)
+
   /** Translate tuple expressions of arity <= 22
    *
    *     ()             ==>   ()
@@ -1299,7 +1339,9 @@ object desugar {
     if (nestedStats.isEmpty) pdef
     else {
       val name = packageObjectName(ctx.source)
-      val grouped = ModuleDef(name, Template(emptyConstructor, Nil, Nil, EmptyValDef, nestedStats))
+      val grouped =
+        ModuleDef(name, Template(emptyConstructor, Nil, Nil, EmptyValDef, nestedStats))
+          .withMods(Modifiers(Synthetic))
       cpy.PackageDef(pdef)(pdef.pid, topStats :+ grouped)
     }
   }
@@ -1376,29 +1418,6 @@ object desugar {
     FunctionWithMods(params, body, Modifiers(mods))
   }
 
-  /** Add annotation to tree:
-   *      tree @fullName
-   *
-   *  The annotation is usually represented as a TypeTree referring to the class
-   *  with the given name `fullName`. However, if the annotation matches a file name
-   *  that is still to be entered, the annotation is represented as a cascade of `Selects`
-   *  following `fullName`. This is necessary so that we avoid reading an annotation from
-   *  the classpath that is also compiled from source.
-   */
-  def makeAnnotated(fullName: String, tree: Tree)(using Context): Annotated = {
-    val parts = fullName.split('.')
-    val ttree = typerPhase match {
-      case phase: FrontEnd if phase.stillToBeEntered(parts.last) =>
-        val prefix =
-          parts.init.foldLeft(Ident(nme.ROOTPKG): Tree)((qual, name) =>
-            Select(qual, name.toTermName))
-        Select(prefix, parts.last.toTypeName)
-      case _ =>
-        TypeTree(requiredClass(fullName).typeRef)
-    }
-    Annotated(tree, New(ttree, Nil))
-  }
-
   private def derivedValDef(original: Tree, named: NameTree, tpt: Tree, rhs: Tree, mods: Modifiers)(using Context) = {
     val vdef = ValDef(named.name.asTermName, tpt, rhs)
       .withMods(mods)
@@ -1554,14 +1573,21 @@ object desugar {
         }
       }
 
+      /** Is `pat` of the form `x`, `x T`, or `given T`? when used as the lhs of a generator,
+       *  these are all considered irrefutable.
+       */
+      def isVarBinding(pat: Tree): Boolean = pat match
+        case pat @ Bind(_, pat1) if pat.mods.is(Given) => isVarBinding(pat1)
+        case IdPattern(_) => true
+        case _ => false
+
       def needsNoFilter(gen: GenFrom): Boolean =
         if (gen.checkMode == GenCheckMode.FilterAlways) // pattern was prefixed by `case`
           false
-        else (
-          gen.checkMode != GenCheckMode.FilterNow ||
-          IdPattern.unapply(gen.pat).isDefined ||
-          isIrrefutable(gen.pat, gen.expr)
-        )
+        else
+          gen.checkMode != GenCheckMode.FilterNow
+          || isVarBinding(gen.pat)
+          || isIrrefutable(gen.pat, gen.expr)
 
       /** rhs.name with a pattern filter on rhs unless `pat` is irrefutable when
        *  matched against `rhs`.
@@ -1604,6 +1630,8 @@ object desugar {
     def makePolyFunction(targs: List[Tree], body: Tree): Tree = body match {
       case Parens(body1) =>
         makePolyFunction(targs, body1)
+      case Block(Nil, body1) =>
+        makePolyFunction(targs, body1)
       case Function(vargs, res) =>
         assert(targs.nonEmpty)
         // TODO: Figure out if we need a `PolyFunctionWithMods` instead.
@@ -1787,16 +1815,21 @@ object desugar {
   /** Returns list of all pattern variables, possibly with their types,
    *  without duplicates
    */
-  private def getVariables(tree: Tree)(using Context): List[VarInfo] = {
+  private def getVariables(tree: Tree, shouldAddGiven: Context ?=> Bind => Boolean)(using Context): List[VarInfo] = {
     val buf = ListBuffer[VarInfo]()
     def seenName(name: Name) = buf exists (_._1.name == name)
     def add(named: NameTree, t: Tree): Unit =
       if (!seenName(named.name) && named.name.isTermName) buf += ((named, t))
     def collect(tree: Tree): Unit = tree match {
-      case Bind(nme.WILDCARD, tree1) =>
+      case tree @ Bind(nme.WILDCARD, tree1) =>
+        if tree.mods.is(Given) then
+          val Typed(_, tpt) = tree1: @unchecked
+          if shouldAddGiven(tree) then
+            add(tree, tpt)
         collect(tree1)
       case tree @ Bind(_, Typed(tree1, tpt)) =>
-        add(tree, tpt)
+        if !(tree.mods.is(Given) && !shouldAddGiven(tree)) then
+          add(tree, tpt)
         collect(tree1)
       case tree @ Bind(_, tree1) =>
         add(tree, TypeTree())
@@ -1814,7 +1847,7 @@ object desugar {
       case SeqLiteral(elems, _) =>
         elems foreach collect
       case Alternative(trees) =>
-        for (tree <- trees; (vble, _) <- getVariables(tree))
+        for (tree <- trees; (vble, _) <- getVariables(tree, shouldAddGiven))
           report.error(IllegalVariableInPatternAlternative(), vble.srcPos)
       case Annotated(arg, _) =>
         collect(arg)
diff --git a/compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala b/compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala
index def5cb39bee1..009aba09f2f6 100644
--- a/compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala
+++ b/compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala
@@ -104,7 +104,7 @@ object DesugarEnums {
 
   /**  The following lists of definitions for an enum type E and known value cases e_0, ..., e_n:
    *
-   *   private val $values = Array[E](this.e_0,...,this.e_n)(ClassTag[E](classOf[E])): @unchecked
+   *   private val $values = Array[E](this.e_0,...,this.e_n)(ClassTag[E](classOf[E]))
    *   def values = $values.clone
    *   def valueOf($name: String) = $name match {
    *     case "e_0" => this.e_0
@@ -118,15 +118,7 @@ object DesugarEnums {
     extension (tpe: NamedType) def ofRawEnum = AppliedTypeTree(ref(tpe), rawEnumClassRef)
 
     val privateValuesDef =
-      val uncheckedValues =
-        // Here we use an unchecked annotation to silence warnings from the init checker. Without it, we get a warning
-        // that simple enum cases are promoting this from warm to initialised. This is because we are populating the
-        // array by selecting enum values from `this`, a value under construction.
-        // Singleton enum values always construct a new anonymous class, which will not be checked by the init-checker,
-        // so this warning will always persist even if the implementation of the anonymous class is safe.
-        // TODO: remove @unchecked after https://github.com/lampepfl/dotty-feature-requests/issues/135 is resolved.
-        Annotated(ArrayLiteral(enumValues, rawEnumClassRef), New(ref(defn.UncheckedAnnot.typeRef), Nil))
-      ValDef(nme.DOLLAR_VALUES, TypeTree(), uncheckedValues)
+      ValDef(nme.DOLLAR_VALUES, TypeTree(), ArrayLiteral(enumValues, rawEnumClassRef))
         .withFlags(Private | Synthetic)
 
     val valuesDef =
@@ -187,13 +179,12 @@ object DesugarEnums {
    *   }
    */
   private def enumValueCreator(using Context) = {
-    val fieldMethods = if isJavaEnum then Nil else ordinalMeth(Ident(nme.ordinalDollar_)) :: Nil
     val creator = New(Template(
       constr = emptyConstructor,
       parents = enumClassRef :: scalaRuntimeDot(tpnme.EnumValue) :: Nil,
       derived = Nil,
       self = EmptyValDef,
-      body = fieldMethods
+      body = Nil
     ).withAttachment(ExtendsSingletonMirror, ()))
     DefDef(nme.DOLLAR_NEW,
         List(List(param(nme.ordinalDollar_, defn.IntType), param(nme.nameDollar, defn.StringType))),
@@ -278,8 +269,6 @@ object DesugarEnums {
   def param(name: TermName, typ: Type)(using Context): ValDef = param(name, TypeTree(typ))
   def param(name: TermName, tpt: Tree)(using Context): ValDef = ValDef(name, tpt, EmptyTree).withFlags(Param)
 
-  private def isJavaEnum(using Context): Boolean = enumClass.derivesFrom(defn.JavaEnumClass)
-
   def ordinalMeth(body: Tree)(using Context): DefDef =
     DefDef(nme.ordinal, Nil, TypeTree(defn.IntType), body).withAddedFlags(Synthetic)
 
@@ -298,10 +287,8 @@ object DesugarEnums {
       expandSimpleEnumCase(name, mods, definesLookups, span)
     else {
       val (tag, scaffolding) = nextOrdinal(name, CaseKind.Object, definesLookups)
-      val impl1 = cpy.Template(impl)(
-        parents = impl.parents :+ scalaRuntimeDot(tpnme.EnumValue),
-        body = if isJavaEnum then Nil else ordinalMethLit(tag) :: Nil
-      ).withAttachment(ExtendsSingletonMirror, ())
+      val impl1 = cpy.Template(impl)(parents = impl.parents :+ scalaRuntimeDot(tpnme.EnumValue), body = Nil)
+        .withAttachment(ExtendsSingletonMirror, ())
       val vdef = ValDef(name, TypeTree(), New(impl1)).withMods(mods.withAddedFlags(EnumValue, span))
       flatTree(vdef :: scaffolding).withSpan(span)
     }
diff --git a/compiler/src/dotty/tools/dotc/ast/MainProxies.scala b/compiler/src/dotty/tools/dotc/ast/MainProxies.scala
index 9178478c399b..2eafeca16e39 100644
--- a/compiler/src/dotty/tools/dotc/ast/MainProxies.scala
+++ b/compiler/src/dotty/tools/dotc/ast/MainProxies.scala
@@ -94,8 +94,20 @@ object MainProxies {
       val body = Try(call, handler :: Nil, EmptyTree)
       val mainArg = ValDef(nme.args, TypeTree(defn.ArrayType.appliedTo(defn.StringType)), EmptyTree)
         .withFlags(Param)
+      /** Replace typed `Ident`s that have been typed with a TypeSplice with the reference to the symbol.
+       *  The annotations will be retype-checked in another scope that may not have the same imports.
+       */
+      def insertTypeSplices = new TreeMap {
+          override def transform(tree: Tree)(using Context): Tree = tree match
+            case tree: tpd.Ident @unchecked => TypedSplice(tree)
+            case tree => super.transform(tree)
+      }
+      val annots = mainFun.annotations
+        .filterNot(_.matches(defn.MainAnnot))
+        .map(annot => insertTypeSplices.transform(annot.tree))
       val mainMeth = DefDef(nme.main, (mainArg :: Nil) :: Nil, TypeTree(defn.UnitType), body)
         .withFlags(JavaStatic)
+        .withAnnotations(annots)
       val mainTempl = Template(emptyConstructor, Nil, Nil, EmptyValDef, mainMeth :: Nil)
       val mainCls = TypeDef(mainFun.name.toTypeName, mainTempl)
         .withFlags(Final | Invisible)
diff --git a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala
index ffc7d04faa52..730149381487 100644
--- a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala
+++ b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala
@@ -5,6 +5,10 @@ import core.Contexts._
 import core.Decorators._
 import util.Spans._
 import Trees.{MemberDef, DefTree, WithLazyField}
+import dotty.tools.dotc.core.Annotations.ConcreteAnnotation
+import dotty.tools.dotc.core.Types.AnnotatedType
+import dotty.tools.dotc.core.Types.ImportType
+import dotty.tools.dotc.core.Types.Type
 
 /** Utility functions to go from typed to untyped ASTs */
 // TODO: Handle trees with mixed source files
@@ -56,19 +60,19 @@ object NavigateAST {
    *  the given `span`.
    */
   def untypedPath(span: Span)(using Context): List[Positioned] =
-    pathTo(span, ctx.compilationUnit.untpdTree)
+    pathTo(span, List(ctx.compilationUnit.untpdTree))
 
 
-  /** The reverse path from node `from` to the node that closest encloses `span`,
+  /** The reverse path from any node in `from` to the node that closest encloses `span`,
    *  or `Nil` if no such path exists. If a non-empty path is returned it starts with
-   *  the node closest enclosing `span` and ends with `from`.
+   *  the node closest enclosing `span` and ends with one of the nodes in `from`.
    *
    *  @param skipZeroExtent  If true, skip over zero-extent nodes in the search. These nodes
    *                         do not correspond to code the user wrote since their start and
    *                         end point are the same, so this is useful when trying to reconcile
    *                         nodes with source code.
    */
-  def pathTo(span: Span, from: Positioned, skipZeroExtent: Boolean = false)(using Context): List[Positioned] = {
+  def pathTo(span: Span, from: List[Positioned], skipZeroExtent: Boolean = false)(using Context): List[Positioned] = {
     def childPath(it: Iterator[Any], path: List[Positioned]): List[Positioned] = {
       var bestFit: List[Positioned] = path
       while (it.hasNext) {
@@ -86,6 +90,18 @@ object NavigateAST {
       }
       bestFit
     }
+    /*
+     * Annotations trees are located in the Type
+     */
+    def unpackAnnotations(t: Type, path: List[Positioned]): List[Positioned] =
+      t match {
+        case ann: AnnotatedType =>
+            unpackAnnotations(ann.parent, childPath(ann.annot.tree.productIterator, path))
+        case imp: ImportType =>
+          childPath(imp.expr.productIterator, path)
+        case other =>
+          path
+    }
     def singlePath(p: Positioned, path: List[Positioned]): List[Positioned] =
       if (p.span.exists && !(skipZeroExtent && p.span.isZeroExtent) && p.span.contains(span)) {
         // FIXME: We shouldn't be manually forcing trees here, we should replace
@@ -98,7 +114,12 @@ object NavigateAST {
         }
         childPath(p.productIterator, p :: path)
       }
-      else path
-    singlePath(from, Nil)
+      else {
+        p match {
+          case t: untpd.TypeTree => unpackAnnotations(t.typeOpt, path)
+          case _ => path
+        }
+      }
+    childPath(from.iterator, Nil)
   }
 }
diff --git a/compiler/src/dotty/tools/dotc/ast/Positioned.scala b/compiler/src/dotty/tools/dotc/ast/Positioned.scala
index 0c1f43b8f292..964b9855ae13 100644
--- a/compiler/src/dotty/tools/dotc/ast/Positioned.scala
+++ b/compiler/src/dotty/tools/dotc/ast/Positioned.scala
@@ -23,6 +23,8 @@ abstract class Positioned(implicit @constructorOnly src: SourceFile) extends Src
 
   private var mySpan: Span = _
 
+  private var mySource: SourceFile = src
+
   /** A unique identifier in case -Yshow-tree-ids, or -Ydebug-tree-with-id
    *  is set, -1 otherwise.
    */
@@ -36,7 +38,7 @@ abstract class Positioned(implicit @constructorOnly src: SourceFile) extends Src
       ids.put(this, ownId)
       if ownId == debugId then
         println(s"Debug tree (id=$debugId) creation \n$this\n")
-        Reporter.displayPrompt(Console.in, new PrintWriter(Console.err, true))
+        Thread.dumpStack()
 
   allocateId()
 
@@ -48,7 +50,8 @@ abstract class Positioned(implicit @constructorOnly src: SourceFile) extends Src
 
   span = envelope(src)
 
-  val source: SourceFile = src
+  def source: SourceFile = mySource
+
   def sourcePos(using Context): SourcePosition = source.atSpan(span)
 
   /** This positioned item, widened to `SrcPos`. Used to make clear we only need the
@@ -65,12 +68,11 @@ abstract class Positioned(implicit @constructorOnly src: SourceFile) extends Src
     if (span == mySpan) this
     else {
       val newpd: this.type =
-        if (mySpan.isSynthetic) {
-          if (!mySpan.exists && span.exists)
-            envelope(source, span.startPos) // fill in children spans
+        if !mySpan.exists then
+          if span.exists then envelope(source, span.startPos) // fill in children spans
           this
-        }
-        else cloneIn(source)
+        else
+          cloneIn(source)
       newpd.span = span
       newpd
     }
@@ -128,7 +130,7 @@ abstract class Positioned(implicit @constructorOnly src: SourceFile) extends Src
   def cloneIn(src: SourceFile): this.type = {
     val newpd: this.type = clone.asInstanceOf[this.type]
     newpd.allocateId()
-    // assert(newpd.uniqueId != 2208, s"source = $this, ${this.uniqueId}, ${this.span}")
+    newpd.mySource = src
     newpd
   }
 
diff --git a/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala b/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
index 73f1585427ac..8592b6d2e647 100644
--- a/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
+++ b/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
@@ -113,11 +113,11 @@ trait TreeInfo[T >: Untyped <: Type] { self: Trees.Instance[T] =>
     case _ => 0
   }
 
-  /** The (last) list of arguments of an application */
-  def arguments(tree: Tree): List[Tree] = unsplice(tree) match {
-    case Apply(_, args) => args
-    case TypeApply(fn, _) => arguments(fn)
-    case Block(_, expr) => arguments(expr)
+  /** All term arguments of an application in a single flattened list */
+  def allArguments(tree: Tree): List[Tree] = unsplice(tree) match {
+    case Apply(fn, args) => allArguments(fn) ::: args
+    case TypeApply(fn, _) => allArguments(fn)
+    case Block(_, expr) => allArguments(expr)
     case _ => Nil
   }
 
@@ -569,6 +569,7 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
    *  This avoids the situation where we have a Select node that does not have a symbol.
    */
   def constToLiteral(tree: Tree)(using Context): Tree = {
+    assert(!tree.isType)
     val tree1 = ConstFold(tree)
     tree1.tpe.widenTermRefExpr.dealias.normalized match {
       case ConstantType(Constant(_: Type)) if tree.isInstanceOf[Block] =>
@@ -958,7 +959,7 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
 
   /** Extractors for splices */
   object Spliced {
-    /** Extracts the content of a spliced expresion tree.
+    /** Extracts the content of a spliced expression tree.
      *  The result can be the contents of a term splice, which
      *  will return a term tree.
      */
diff --git a/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala b/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala
index 9e5b7f036aa0..3f4ff4687787 100644
--- a/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala
+++ b/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala
@@ -15,55 +15,16 @@ import scala.annotation.tailrec
  *
  *  This incudes implicits defined in scope as well as imported implicits.
  */
-class TreeMapWithImplicits extends tpd.TreeMap {
+class TreeMapWithImplicits extends tpd.TreeMapWithPreciseStatContexts {
   import tpd._
 
   def transformSelf(vd: ValDef)(using Context): ValDef =
     cpy.ValDef(vd)(tpt = transform(vd.tpt))
 
-  /** Transform statements, while maintaining import contexts and expression contexts
-   *  in the same way as Typer does. The code addresses additional concerns:
-   *   - be tail-recursive where possible
-   *   - don't re-allocate trees where nothing has changed
-   */
-  override def transformStats(stats: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = {
-
-    @tailrec def traverse(curStats: List[Tree])(using Context): List[Tree] = {
-
-      def recur(stats: List[Tree], changed: Tree, rest: List[Tree])(using Context): List[Tree] =
-        if (stats eq curStats) {
-          val rest1 = transformStats(rest, exprOwner)
-          changed match {
-            case Thicket(trees) => trees ::: rest1
-            case tree => tree :: rest1
-          }
-        }
-        else stats.head :: recur(stats.tail, changed, rest)
-
-      curStats match {
-        case stat :: rest =>
-          val statCtx = stat match {
-            case stat: DefTree => ctx
-            case _ => ctx.exprContext(stat, exprOwner)
-          }
-          val restCtx = stat match {
-            case stat: Import => ctx.importContext(stat, stat.symbol)
-            case _ => ctx
-          }
-          val stat1 = transform(stat)(using statCtx)
-          if (stat1 ne stat) recur(stats, stat1, rest)(using restCtx)
-          else traverse(rest)(using restCtx)
-        case nil =>
-          stats
-      }
-    }
-    traverse(stats)
-  }
-
   private def nestedScopeCtx(defs: List[Tree])(using Context): Context = {
     val nestedCtx = ctx.fresh.setNewScope
     defs foreach {
-      case d: DefTree if d.symbol.isOneOf(GivenOrImplicit) => nestedCtx.enter(d.symbol)
+      case d: DefTree if d.symbol.isOneOf(GivenOrImplicitVal) => nestedCtx.enter(d.symbol)
       case _ =>
     }
     nestedCtx
@@ -74,7 +35,7 @@ class TreeMapWithImplicits extends tpd.TreeMap {
     new TreeTraverser {
       def traverse(tree: Tree)(using Context): Unit = {
         tree match {
-          case d: DefTree if d.symbol.isOneOf(GivenOrImplicit) =>
+          case d: DefTree if d.symbol.isOneOf(GivenOrImplicitVal) =>
             nestedCtx.enter(d.symbol)
           case _ =>
         }
diff --git a/compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala b/compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala
index f80d126bc471..d38ce8ca6888 100644
--- a/compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala
+++ b/compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala
@@ -7,7 +7,6 @@ import Types._, Contexts._, Flags._
 import Symbols._, Annotations._, Trees._, Symbols._, Constants.Constant
 import Decorators._
 import dotty.tools.dotc.transform.SymUtils._
-import core.tasty.TreePickler.Hole
 
 /** A map that applies three functions and a substitution together to a tree and
  *  makes sure they are coordinated so that the result is well-typed. The functions are
diff --git a/compiler/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala
index d1de1094524c..7aa4491c31de 100644
--- a/compiler/src/dotty/tools/dotc/ast/Trees.scala
+++ b/compiler/src/dotty/tools/dotc/ast/Trees.scala
@@ -16,17 +16,10 @@ import annotation.internal.sharable
 import annotation.unchecked.uncheckedVariance
 import annotation.constructorOnly
 import Decorators._
-import dotty.tools.dotc.core.tasty.TreePickler.Hole
 
 object Trees {
 
-  // Note: it would be more logical to make Untyped = Nothing.
-  // However, this interacts in a bad way with Scala's current type inference.
-  // In fact, we cannot write something like Select(pre, name), where pre is
-  // of type Tree[Nothing]; type inference will treat the Nothing as an uninstantiated
-  // value and will not infer Nothing as the type parameter for Select.
-  // We should come back to this issue once type inference is changed.
-  type Untyped = Null
+  type Untyped = Nothing
 
   /** The total number of created tree nodes, maintained if Stats.enabled */
   @sharable var ntrees: Int = 0
@@ -45,8 +38,7 @@ object Trees {
    *
    *   - You can never observe a `tpe` which is `null` (throws an exception)
    *   - So when creating a typed tree with `withType` we can re-use
-   *     the existing tree transparently, assigning its `tpe` field,
-   *     provided it was `null` before.
+   *     the existing tree transparently, assigning its `tpe` field.
    *   - It is impossible to embed untyped trees in typed ones.
    *   - Typed trees can be embedded in untyped ones provided they are rooted
    *     in a TypedSplice node.
@@ -327,9 +319,58 @@ object Trees {
 
   extension (mdef: untpd.DefTree) def mods: untpd.Modifiers = mdef.rawMods
 
-  abstract class NamedDefTree[-T >: Untyped](implicit @constructorOnly src: SourceFile) extends NameTree[T] with DefTree[T] {
+  sealed trait WithEndMarker[-T >: Untyped]:
+    self: PackageDef[T] | NamedDefTree[T] =>
+
+    import WithEndMarker.*
+
+    final def endSpan(using Context): Span =
+      if hasEndMarker then
+        val realName = srcName.stripModuleClassSuffix.lastPart
+        span.withStart(span.end - realName.length)
+      else
+        NoSpan
+
+    /** The name in source code that represents this construct,
+     *  and is the name that the user must write to create a valid
+     *  end marker.
+     *  e.g. a constructor definition is terminated in the source
+     *  code by `end this`, so it's `srcName` should return `this`.
+     */
+    protected def srcName(using Context): Name
+
+    final def withEndMarker(): self.type =
+      self.withAttachment(HasEndMarker, ())
+
+    final def withEndMarker(copyFrom: WithEndMarker[?]): self.type =
+      if copyFrom.hasEndMarker then
+        this.withEndMarker()
+      else
+        this
+
+    final def dropEndMarker(): self.type =
+      self.removeAttachment(HasEndMarker)
+      this
+
+    protected def hasEndMarker: Boolean = self.hasAttachment(HasEndMarker)
+
+  object WithEndMarker:
+    /** Property key that signals the tree was terminated
+     *  with an `end` marker in the source code
+     */
+    private val HasEndMarker: Property.StickyKey[Unit] = Property.StickyKey()
+
+  end WithEndMarker
+
+  abstract class NamedDefTree[-T >: Untyped](implicit @constructorOnly src: SourceFile)
+  extends NameTree[T] with DefTree[T] with WithEndMarker[T] {
     type ThisTree[-T >: Untyped] <: NamedDefTree[T]
 
+    protected def srcName(using Context): Name =
+      if name == nme.CONSTRUCTOR then nme.this_
+      else if symbol.isPackageObject then symbol.owner.name
+      else name
+
     /** The position of the name defined by this definition.
      *  This is a point position if the definition is synthetic, or a range position
      *  if the definition comes from source.
@@ -342,7 +383,7 @@ object Trees {
         val point = span.point
         if (rawMods.is(Synthetic) || span.isSynthetic || name.toTermName == nme.ERROR) Span(point)
         else {
-          val realName = name.stripModuleClassSuffix.lastPart
+          val realName = srcName.stripModuleClassSuffix.lastPart
           Span(point, point + realName.length, point)
         }
       }
@@ -650,10 +691,12 @@ object Trees {
       s"TypeTree${if (hasType) s"[$typeOpt]" else ""}"
   }
 
-  /** A type tree that defines a new type variable. Its type is always a TypeVar.
-   *  Every TypeVar is created as the type of one TypeVarBinder.
+  /** A type tree whose type is inferred. These trees appear in two contexts
+   *    - as an argument of a TypeApply. In that case its type is always a TypeVar
+   *    - as a (result-)type of an inferred ValDef or DefDef.
+   *  Every TypeVar is created as the type of one InferredTypeTree.
    */
-  class TypeVarBinder[-T >: Untyped](implicit @constructorOnly src: SourceFile) extends TypeTree[T]
+  class InferredTypeTree[-T >: Untyped](implicit @constructorOnly src: SourceFile) extends TypeTree[T]
 
   /** ref.type */
   case class SingletonTypeTree[-T >: Untyped] private[ast] (ref: Tree[T])(implicit @constructorOnly src: SourceFile)
@@ -857,9 +900,10 @@ object Trees {
 
   /** package pid { stats } */
   case class PackageDef[-T >: Untyped] private[ast] (pid: RefTree[T], stats: List[Tree[T]])(implicit @constructorOnly src: SourceFile)
-    extends ProxyTree[T] {
+    extends ProxyTree[T] with WithEndMarker[T] {
     type ThisTree[-T >: Untyped] = PackageDef[T]
     def forwardTo: RefTree[T] = pid
+    protected def srcName(using Context): Name = pid.name
   }
 
   /** arg @annot */
@@ -928,6 +972,15 @@ object Trees {
   def genericEmptyValDef[T >: Untyped]: ValDef[T]       = theEmptyValDef.asInstanceOf[ValDef[T]]
   def genericEmptyTree[T >: Untyped]: Thicket[T]        = theEmptyTree.asInstanceOf[Thicket[T]]
 
+  /** Tree that replaces a splice in pickled quotes.
+   *  It is only used when picking quotes (Will never be in a TASTy file).
+   */
+  case class Hole[-T >: Untyped](isTermHole: Boolean, idx: Int, args: List[Tree[T]])(implicit @constructorOnly src: SourceFile) extends Tree[T] {
+    type ThisTree[-T >: Untyped] <: Hole[T]
+    override def isTerm: Boolean = isTermHole
+    override def isType: Boolean = !isTermHole
+  }
+
   def flatten[T >: Untyped](trees: List[Tree[T]]): List[Tree[T]] = {
     def recur(buf: ListBuffer[Tree[T]], remaining: List[Tree[T]]): ListBuffer[Tree[T]] =
       remaining match {
@@ -1029,6 +1082,7 @@ object Trees {
     type JavaSeqLiteral = Trees.JavaSeqLiteral[T]
     type Inlined = Trees.Inlined[T]
     type TypeTree = Trees.TypeTree[T]
+    type InferredTypeTree = Trees.InferredTypeTree[T]
     type SingletonTypeTree = Trees.SingletonTypeTree[T]
     type RefinedTypeTree = Trees.RefinedTypeTree[T]
     type AppliedTypeTree = Trees.AppliedTypeTree[T]
@@ -1051,6 +1105,8 @@ object Trees {
     type Annotated = Trees.Annotated[T]
     type Thicket = Trees.Thicket[T]
 
+    type Hole = Trees.Hole[T]
+
     @sharable val EmptyTree: Thicket = genericEmptyTree
     @sharable val EmptyValDef: ValDef = genericEmptyValDef
     @sharable val ContextualEmptyTree: Thicket = new EmptyTree() // an empty tree marking a contextual closure
diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala
index ed60b817a11f..396d85a8c58a 100644
--- a/compiler/src/dotty/tools/dotc/ast/tpd.scala
+++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala
@@ -7,6 +7,7 @@ import typer.ProtoTypes
 import transform.SymUtils._
 import transform.TypeUtils._
 import core._
+import Scopes.newScope
 import util.Spans._, Types._, Contexts._, Constants._, Names._, Flags._, NameOps._
 import Symbols._, StdNames._, Annotations._, Trees._, Symbols._
 import Decorators._, DenotTransformers._
@@ -41,15 +42,17 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
   def Super(qual: Tree, mixName: TypeName, mixinClass: Symbol = NoSymbol)(using Context): Super =
     Super(qual, if (mixName.isEmpty) untpd.EmptyTypeIdent else untpd.Ident(mixName), mixinClass)
 
-  def Apply(fn: Tree, args: List[Tree])(using Context): Apply = {
-    assert(fn.isInstanceOf[RefTree] || fn.isInstanceOf[GenericApply] || fn.isInstanceOf[Inlined] || fn.isInstanceOf[tasty.TreePickler.Hole])
-    ta.assignType(untpd.Apply(fn, args), fn, args)
-  }
+  def Apply(fn: Tree, args: List[Tree])(using Context): Apply = fn match
+    case Block(Nil, expr) =>
+      Apply(expr, args)
+    case _: RefTree | _: GenericApply | _: Inlined | _: Hole =>
+      ta.assignType(untpd.Apply(fn, args), fn, args)
 
-  def TypeApply(fn: Tree, args: List[Tree])(using Context): TypeApply = {
-    assert(fn.isInstanceOf[RefTree] || fn.isInstanceOf[GenericApply])
-    ta.assignType(untpd.TypeApply(fn, args), fn, args)
-  }
+  def TypeApply(fn: Tree, args: List[Tree])(using Context): TypeApply = fn match
+    case Block(Nil, expr) =>
+      TypeApply(expr, args)
+    case _: RefTree | _: GenericApply =>
+      ta.assignType(untpd.TypeApply(fn, args), fn, args)
 
   def Literal(const: Constant)(using Context): Literal =
     ta.assignType(untpd.Literal(const))
@@ -119,9 +122,9 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
       Closure(Nil, call, targetTpt))
   }
 
-  /** A closure whole anonymous function has the given method type */
+  /** A closure whose anonymous function has the given method type */
   def Lambda(tpe: MethodType, rhsFn: List[Tree] => Tree)(using Context): Block = {
-    val meth = newSymbol(ctx.owner, nme.ANON_FUN, Synthetic | Method, tpe)
+    val meth = newAnonFun(ctx.owner, tpe)
     Closure(meth, tss => rhsFn(tss.head).changeOwner(ctx.owner, meth))
   }
 
@@ -203,8 +206,8 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
   def ValDef(sym: TermSymbol, rhs: LazyTree = EmptyTree)(using Context): ValDef =
     ta.assignType(untpd.ValDef(sym.name, TypeTree(sym.info), rhs), sym)
 
-  def SyntheticValDef(name: TermName, rhs: Tree)(using Context): ValDef =
-    ValDef(newSymbol(ctx.owner, name, Synthetic, rhs.tpe.widen, coord = rhs.span), rhs)
+  def SyntheticValDef(name: TermName, rhs: Tree, flags: FlagSet = EmptyFlags)(using Context): ValDef =
+    ValDef(newSymbol(ctx.owner, name, Synthetic | flags, rhs.tpe.widen, coord = rhs.span), rhs)
 
   def DefDef(sym: TermSymbol, paramss: List[List[Symbol]],
              resultType: Type, rhs: Tree)(using Context): DefDef =
@@ -342,7 +345,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
       }
       else parents
     val cls = newNormalizedClassSymbol(owner, tpnme.ANON_CLASS, Synthetic | Final, parents1,
-        coord = fns.map(_.span).reduceLeft(_ union _))
+        newScope, coord = fns.map(_.span).reduceLeft(_ union _))
     val constr = newConstructor(cls, Synthetic, Nil, Nil).entered
     def forwarder(fn: TermSymbol, name: TermName) = {
       val fwdMeth = fn.copy(cls, name, Synthetic | Method | Final).entered.asTerm
@@ -961,8 +964,10 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
 
     /** `tree.isInstanceOf[tp]`, with special treatment of singleton types */
     def isInstance(tp: Type)(using Context): Tree = tp.dealias match {
+      case ConstantType(c) if c.tag == StringTag =>
+        singleton(tp).equal(tree)
       case tp: SingletonType =>
-        if (tp.widen.derivesFrom(defn.ObjectClass))
+        if tp.widen.derivesFrom(defn.ObjectClass) then
           tree.ensureConforms(defn.ObjectType).select(defn.Object_eq).appliedTo(singleton(tp))
         else
           singleton(tp).equal(tree)
@@ -977,11 +982,13 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
     }
 
     /** cast tree to `tp`, assuming no exception is raised, i.e the operation is pure */
-    def cast(tp: Type)(using Context): Tree = {
-      assert(tp.isValueType, i"bad cast: $tree.asInstanceOf[$tp]")
+    def cast(tp: Type)(using Context): Tree = cast(TypeTree(tp))
+
+    /** cast tree to `tp`, assuming no exception is raised, i.e the operation is pure */
+    def cast(tpt: TypeTree)(using Context): Tree =
+      assert(tpt.tpe.isValueType, i"bad cast: $tree.asInstanceOf[$tpt]")
       tree.select(if (ctx.erasedTypes) defn.Any_asInstanceOf else defn.Any_typeCast)
-        .appliedToType(tp)
-    }
+        .appliedToTypeTree(tpt)
 
     /** cast `tree` to `tp` (or its box/unbox/cast equivalent when after
      *  erasure and value and non-value types are mixed),
@@ -1098,6 +1105,21 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
       if (sym.exists) sym.defTree = tree
       tree
     }
+
+    def etaExpandCFT(using Context): Tree =
+      def expand(target: Tree, tp: Type)(using Context): Tree = tp match
+        case defn.ContextFunctionType(argTypes, resType, isErased) =>
+          val anonFun = newAnonFun(
+            ctx.owner,
+            MethodType.companion(isContextual = true, isErased = isErased)(argTypes, resType),
+            coord = ctx.owner.coord)
+          def lambdaBody(refss: List[List[Tree]]) =
+            expand(target.select(nme.apply).appliedToArgss(refss), resType)(
+              using ctx.withOwner(anonFun))
+          Closure(anonFun, lambdaBody)
+        case _ =>
+          target
+      expand(tree, tree.tpe.widen)
   }
 
   inline val MapRecursionLimit = 10
@@ -1129,12 +1151,57 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
               case _ => tree1 :: rest1
           case nil => nil
       recur(trees, 0)
+
+    /** Transform statements while maintaining import contexts and expression contexts
+     *  in the same way as Typer does. The code addresses additional concerns:
+     *   - be tail-recursive where possible
+     *   - don't re-allocate trees where nothing has changed
+     */
+    inline def mapStatements(exprOwner: Symbol, inline op: Tree => Context ?=> Tree)(using Context): List[Tree] =
+      @tailrec
+      def loop(mapped: mutable.ListBuffer[Tree] | Null, unchanged: List[Tree], pending: List[Tree])(using Context): List[Tree] =
+        pending match
+          case stat :: rest =>
+            val statCtx = stat match
+              case _: DefTree | _: ImportOrExport => ctx
+              case _ => ctx.exprContext(stat, exprOwner)
+            val stat1 = op(stat)(using statCtx)
+            val restCtx = stat match
+              case stat: Import => ctx.importContext(stat, stat.symbol)
+              case _ => ctx
+            if stat1 eq stat then
+              loop(mapped, unchanged, rest)(using restCtx)
+            else
+              val buf = if mapped == null then new mutable.ListBuffer[Tree] else mapped
+              var xc = unchanged
+              while xc ne pending do
+                buf += xc.head
+                xc = xc.tail
+              stat1 match
+                case Thicket(stats1) => buf ++= stats1
+                case _ => buf += stat1
+              loop(buf, rest, rest)(using restCtx)
+          case nil =>
+            if mapped == null then unchanged
+            else mapped.prependToList(unchanged)
+
+      loop(null, trees, trees)
+    end mapStatements
   end extension
 
+  /** A treemap that generates the same contexts as the original typer for statements.
+   *  This means:
+   *    - statements that are not definitions get the exprOwner as owner
+   *    - imports are reflected in the contexts of subsequent statements
+   */
+  class TreeMapWithPreciseStatContexts(cpy: TreeCopier = tpd.cpy) extends TreeMap(cpy):
+    override def transformStats(trees: List[Tree], exprOwner: Symbol)(using Context): List[Tree] =
+      trees.mapStatements(exprOwner, transform(_))
+
   /** Map Inlined nodes, NamedArgs, Blocks with no statements and local references to underlying arguments.
    *  Also drops Inline and Block with no statements.
    */
-  class MapToUnderlying extends TreeMap {
+  private class MapToUnderlying extends TreeMap {
     override def transform(tree: Tree)(using Context): Tree = tree match {
       case tree: Ident if isBinding(tree.symbol) && skipLocal(tree.symbol) =>
         tree.symbol.defTree match {
@@ -1316,7 +1383,11 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
   /** Recover identifier prefix (e.g. this) if it exists */
   def desugarIdentPrefix(tree: Ident)(using Context): Tree = tree.tpe match {
     case TermRef(prefix: TermRef, _) =>
-      ref(prefix)
+      prefix.info match
+        case mt: MethodType if mt.paramInfos.isEmpty && mt.resultType.typeSymbol.is(Module) =>
+          ref(mt.resultType.typeSymbol.sourceModule)
+        case _ =>
+          ref(prefix)
     case TermRef(prefix: ThisType, _) =>
       This(prefix.cls)
     case _ =>
diff --git a/compiler/src/dotty/tools/dotc/ast/untpd.scala b/compiler/src/dotty/tools/dotc/ast/untpd.scala
index 40467dc5be3f..7e00972f354d 100644
--- a/compiler/src/dotty/tools/dotc/ast/untpd.scala
+++ b/compiler/src/dotty/tools/dotc/ast/untpd.scala
@@ -458,7 +458,11 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
   def AppliedTypeTree(tpt: Tree, arg: Tree)(implicit src: SourceFile): AppliedTypeTree =
     AppliedTypeTree(tpt, arg :: Nil)
 
-  def TypeTree(tpe: Type)(using Context): TypedSplice = TypedSplice(TypeTree().withTypeUnchecked(tpe))
+  def TypeTree(tpe: Type)(using Context): TypedSplice =
+    TypedSplice(TypeTree().withTypeUnchecked(tpe))
+
+  def InferredTypeTree(tpe: Type)(using Context): TypedSplice =
+    TypedSplice(new InferredTypeTree().withTypeUnchecked(tpe))
 
   def unitLiteral(implicit src: SourceFile): Literal = Literal(Constant(()))
 
diff --git a/compiler/src/dotty/tools/dotc/config/CliCommand.scala b/compiler/src/dotty/tools/dotc/config/CliCommand.scala
index e361519bb54d..5a648db2b504 100644
--- a/compiler/src/dotty/tools/dotc/config/CliCommand.scala
+++ b/compiler/src/dotty/tools/dotc/config/CliCommand.scala
@@ -7,7 +7,7 @@ import Settings._
 import core.Contexts._
 import Properties._
 
-import scala.collection.JavaConverters._
+import scala.PartialFunction.cond
 
 trait CliCommand:
 
@@ -41,28 +41,15 @@ trait CliCommand:
 
   /** Distill arguments into summary detailing settings, errors and files to main */
   def distill(args: Array[String], sg: Settings.SettingGroup)(ss: SettingsState = sg.defaultState)(using Context): ArgsSummary =
-    /**
-     * Expands all arguments starting with @ to the contents of the
-     * file named like each argument.
-     */
-    def expandArg(arg: String): List[String] =
-      def stripComment(s: String) = s takeWhile (_ != '#')
-      val path = Paths.get(arg stripPrefix "@")
-      if (!Files.exists(path))
-        report.error(s"Argument file ${path.getFileName} could not be found")
-        Nil
-      else
-        val lines = Files.readAllLines(path) // default to UTF-8 encoding
-        val params = lines.asScala map stripComment mkString " "
-        CommandLineParser.tokenize(params)
 
     // expand out @filename to the contents of that filename
     def expandedArguments = args.toList flatMap {
-      case x if x startsWith "@"  => expandArg(x)
+      case x if x startsWith "@"  => CommandLineParser.expandArg(x)
       case x                      => List(x)
     }
 
     sg.processArguments(expandedArguments, processAll = true, settingsState = ss)
+  end distill
 
   /** Creates a help message for a subset of options based on cond */
   protected def availableOptionsMsg(cond: Setting[?] => Boolean)(using settings: ConcreteSettings)(using SettingsState): String =
@@ -106,8 +93,9 @@ trait CliCommand:
           // For now, skip the default values that do not make sense for the end user.
           // For example 'false' for the version command.
           ""
-      s"${formatName(s.name)} ${formatDescription(s.description)}${formatSetting("Default", defaultValue)}${formatSetting("Choices", s.legalChoices)}"
+      s"${formatName(s.name)} ${formatDescription(shortHelp(s))}${formatSetting("Default", defaultValue)}${formatSetting("Choices", s.legalChoices)}"
     ss.map(helpStr).mkString("", "\n", s"\n${formatName("@<file>")} ${formatDescription("A text file containing compiler arguments (options and source files).")}\n")
+  end availableOptionsMsg
 
   protected def shortUsage: String = s"Usage: $cmdName <options> <source files>"
 
@@ -121,25 +109,61 @@ trait CliCommand:
     prefix + "\n" + availableOptionsMsg(cond)
 
   protected def isStandard(s: Setting[?])(using settings: ConcreteSettings)(using SettingsState): Boolean =
-    !isAdvanced(s) && !isPrivate(s)
+    !isVerbose(s) && !isWarning(s) && !isAdvanced(s) && !isPrivate(s) || s.name == "-Werror" || s.name == "-Wconf"
+  protected def isVerbose(s: Setting[?])(using settings: ConcreteSettings)(using SettingsState): Boolean =
+    s.name.startsWith("-V") && s.name != "-V"
+  protected def isWarning(s: Setting[?])(using settings: ConcreteSettings)(using SettingsState): Boolean =
+    s.name.startsWith("-W") && s.name != "-W" || s.name == "-Xlint"
   protected def isAdvanced(s: Setting[?])(using settings: ConcreteSettings)(using SettingsState): Boolean =
     s.name.startsWith("-X") && s.name != "-X"
   protected def isPrivate(s: Setting[?])(using settings: ConcreteSettings)(using SettingsState): Boolean =
     s.name.startsWith("-Y") && s.name != "-Y"
+  protected def shortHelp(s: Setting[?])(using settings: ConcreteSettings)(using SettingsState): String =
+    s.description.linesIterator.next()
+  protected def isHelping(s: Setting[?])(using settings: ConcreteSettings)(using SettingsState): Boolean =
+    cond(s.value) {
+      case ss: List[?] if s.isMultivalue => ss.contains("help")
+      case s: String                     => "help" == s
+    }
 
   /** Messages explaining usage and options */
   protected def usageMessage(using settings: ConcreteSettings)(using SettingsState) =
     createUsageMsg("where possible standard", shouldExplain = false, isStandard)
+  protected def vusageMessage(using settings: ConcreteSettings)(using SettingsState) =
+    createUsageMsg("Possible verbose", shouldExplain = true, isVerbose)
+  protected def wusageMessage(using settings: ConcreteSettings)(using SettingsState) =
+    createUsageMsg("Possible warning", shouldExplain = true, isWarning)
   protected def xusageMessage(using settings: ConcreteSettings)(using SettingsState) =
     createUsageMsg("Possible advanced", shouldExplain = true, isAdvanced)
   protected def yusageMessage(using settings: ConcreteSettings)(using SettingsState) =
     createUsageMsg("Possible private", shouldExplain = true, isPrivate)
 
-  protected def phasesMessage: String =
-    (new Compiler()).phases.map {
-      case List(single) => single.phaseName
-      case more => more.map(_.phaseName).mkString("{", ", ", "}")
-    }.mkString("\n")
+  /** Used for the formatted output of -Xshow-phases */
+  protected def phasesMessage(using ctx: Context): String =
+  
+    val phases = new Compiler().phases
+    val nameLimit = 25 
+    val maxCol = ctx.settings.pageWidth.value
+    val maxName = phases.flatten.map(_.phaseName.length).max
+    val width = maxName.min(nameLimit)
+    val maxDesc = maxCol - (width + 6)
+    val fmt = s"%${width}.${width}s  %.${maxDesc}s%n"
+
+    val sb = new StringBuilder
+    sb ++= fmt.format("phase name", "description")
+    sb ++= fmt.format("----------", "-----------")
+
+    phases.foreach {
+      case List(single) =>
+        sb ++= fmt.format(single.phaseName, single.description)
+      case Nil => ()
+      case more =>
+        sb ++= fmt.format(s"{", "")
+        more.foreach { mini => sb ++= fmt.format(mini.phaseName, mini.description) }
+        sb ++= fmt.format(s"}", "")
+    }
+    sb.mkString
+
 
   /** Provide usage feedback on argument summary, assuming that all settings
    *  are already applied in context.
diff --git a/compiler/src/dotty/tools/dotc/config/CommandLineParser.scala b/compiler/src/dotty/tools/dotc/config/CommandLineParser.scala
index e3ca896d18d2..91017f7fc0c0 100644
--- a/compiler/src/dotty/tools/dotc/config/CommandLineParser.scala
+++ b/compiler/src/dotty/tools/dotc/config/CommandLineParser.scala
@@ -3,6 +3,8 @@ package dotty.tools.dotc.config
 import scala.annotation.tailrec
 import scala.collection.mutable.ArrayBuffer
 import java.lang.Character.isWhitespace
+import java.nio.file.{Files, Paths}
+import scala.collection.JavaConverters._
 
 /** A simple enough command line parser.
  */
@@ -93,4 +95,19 @@ object CommandLineParser:
 
   def tokenize(line: String): List[String] = tokenize(line, x => throw new ParseException(x))
 
+  /**
+   * Expands all arguments starting with @ to the contents of the
+   * file named like each argument.
+   */
+  def expandArg(arg: String): List[String] =
+    def stripComment(s: String) = s takeWhile (_ != '#')
+    val path = Paths.get(arg stripPrefix "@")
+    if (!Files.exists(path))
+      System.err.println(s"Argument file ${path.getFileName} could not be found")
+      Nil
+    else
+      val lines = Files.readAllLines(path) // default to UTF-8 encoding
+      val params = lines.asScala map stripComment mkString " "
+      tokenize(params)
+
   class ParseException(msg: String) extends RuntimeException(msg)
diff --git a/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala b/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala
index 049972365642..29a02b7f7a29 100644
--- a/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala
+++ b/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala
@@ -13,12 +13,19 @@ abstract class CompilerCommand extends CliCommand:
   type ConcreteSettings = ScalaSettings
 
   final def helpMsg(using settings: ScalaSettings)(using SettingsState, Context): String =
-    if (settings.help.value) usageMessage
-    else if (settings.Xhelp.value) xusageMessage
-    else if (settings.Yhelp.value) yusageMessage
-    else if (settings.showPlugins.value) ctx.base.pluginDescriptions
-    else if (settings.XshowPhases.value) phasesMessage
-    else ""
+    settings.allSettings.find(isHelping) match
+      case Some(s) => s.description
+      case _ =>
+        if (settings.help.value) usageMessage
+        else if (settings.Vhelp.value) vusageMessage
+        else if (settings.Whelp.value) wusageMessage
+        else if (settings.Xhelp.value) xusageMessage
+        else if (settings.Yhelp.value) yusageMessage
+        else if (settings.showPlugins.value) ctx.base.pluginDescriptions
+        else if (settings.XshowPhases.value) phasesMessage
+        else ""
 
   final def isHelpFlag(using settings: ScalaSettings)(using SettingsState): Boolean =
-    Set(settings.help, settings.Xhelp, settings.Yhelp, settings.showPlugins, settings.XshowPhases) exists (_.value)
+    import settings._
+    val flags = Set(help, Vhelp,  Whelp, Xhelp, Yhelp, showPlugins, XshowPhases)
+    flags.exists(_.value) || allSettings.exists(isHelping)
diff --git a/compiler/src/dotty/tools/dotc/config/Config.scala b/compiler/src/dotty/tools/dotc/config/Config.scala
index c009372f19d3..ac1708378e73 100644
--- a/compiler/src/dotty/tools/dotc/config/Config.scala
+++ b/compiler/src/dotty/tools/dotc/config/Config.scala
@@ -24,7 +24,10 @@ object Config {
   inline val checkConstraintsNonCyclic = false
 
   /** Check that each constraint resulting from a subtype test
-   *  is satisfiable.
+   *  is satisfiable. Also check that a type variable instantiation
+   *  satisfies its constraints.
+   *  Note that this can fail when bad bounds are in scope, like in
+   *  tests/neg/i4721a.scala.
    */
   inline val checkConstraintsSatisfiable = false
 
@@ -34,6 +37,15 @@ object Config {
    */
   inline val checkConstraintsPropagated = false
 
+  /** Check that constraint bounds do not contain wildcard types */
+  inline val checkNoWildcardsInConstraint = false
+
+  /** If a constraint is over a type lambda `tl` and `tvar` is one of
+   *  the type variables associated with `tl` in the constraint, check
+   *  that the origin of `tvar` is a parameter of `tl`.
+   */
+  inline val checkConsistentVars = false
+
   /** Check that constraints of globally committable typer states are closed.
    *  NOTE: When enabled, the check can cause CyclicReference errors because
    *  it traverses all elements of a type. Such failures were observed when
diff --git a/compiler/src/dotty/tools/dotc/config/Feature.scala b/compiler/src/dotty/tools/dotc/config/Feature.scala
index 42522d38be51..ed592e76ace1 100644
--- a/compiler/src/dotty/tools/dotc/config/Feature.scala
+++ b/compiler/src/dotty/tools/dotc/config/Feature.scala
@@ -27,6 +27,7 @@ object Feature:
   val erasedDefinitions = experimental("erasedDefinitions")
   val symbolLiterals = deprecated("symbolLiterals")
   val fewerBraces = experimental("fewerBraces")
+  val saferExceptions = experimental("saferExceptions")
 
   /** Is `feature` enabled by by a command-line setting? The enabling setting is
    *
@@ -90,29 +91,35 @@ object Feature:
   def warnOnMigration(msg: Message, pos: SrcPos,
       version: SourceVersion = defaultSourceVersion)(using Context): Boolean =
     if sourceVersion.isMigrating && sourceVersion.stable == version
-       || version == `3.0` && migrateTo3
+       || (version == `3.0` || version == `3.1`) && migrateTo3
     then
       report.migrationWarning(msg, pos)
       true
     else
       false
 
-  private val assumeExperimentalIn = Set("dotty.tools.vulpix.ParallelTesting")
-
-  def checkExperimentalFeature(which: String, srcPos: SrcPos = NoSourcePosition)(using Context) =
-    def hasSpecialPermission =
-      new Exception().getStackTrace.exists(elem =>
-        assumeExperimentalIn.exists(elem.getClassName().startsWith(_)))
-    if !(Properties.experimental || hasSpecialPermission)
-       || ctx.settings.YnoExperimental.value
-    then
-      //println(i"${new Exception().getStackTrace.map(_.getClassName).toList}%\n%")
-      report.error(i"Experimental feature$which may only be used with nightly or snapshot version of compiler", srcPos)
+  def checkExperimentalFeature(which: String, srcPos: SrcPos, note: => String = "")(using Context) =
+    if !isExperimentalEnabled then
+      report.error(i"Experimental $which may only be used with a nightly or snapshot version of the compiler$note", srcPos)
+
+  def checkExperimentalDef(sym: Symbol, srcPos: SrcPos)(using Context) =
+    if !isExperimentalEnabled then
+      val symMsg =
+        if sym.hasAnnotation(defn.ExperimentalAnnot) then
+          i"$sym is marked @experimental"
+        else if sym.owner.hasAnnotation(defn.ExperimentalAnnot) then
+          i"${sym.owner} is marked @experimental"
+        else
+          i"$sym inherits @experimental"
+      report.error(s"$symMsg and therefore may only be used in an experimental scope.", srcPos)
 
   /** Check that experimental compiler options are only set for snapshot or nightly compiler versions. */
   def checkExperimentalSettings(using Context): Unit =
     for setting <- ctx.settings.language.value
         if setting.startsWith("experimental.") && setting != "experimental.macros"
-    do checkExperimentalFeature(s" $setting")
+    do checkExperimentalFeature(s"feature $setting", NoSourcePosition)
+
+  def isExperimentalEnabled(using Context): Boolean =
+    Properties.experimental && !ctx.settings.YnoExperimental.value
 
 end Feature
\ No newline at end of file
diff --git a/compiler/src/dotty/tools/dotc/config/Printers.scala b/compiler/src/dotty/tools/dotc/config/Printers.scala
index 27391154591f..8e13e50e59b7 100644
--- a/compiler/src/dotty/tools/dotc/config/Printers.scala
+++ b/compiler/src/dotty/tools/dotc/config/Printers.scala
@@ -20,7 +20,7 @@ object Printers {
   val debug = noPrinter
   val derive = noPrinter
   val desugar = noPrinter
-  val dottydoc = noPrinter
+  val scaladoc = noPrinter
   val exhaustivity = noPrinter
   val gadts = noPrinter
   val gadtsConstr = noPrinter
diff --git a/compiler/src/dotty/tools/dotc/config/Properties.scala b/compiler/src/dotty/tools/dotc/config/Properties.scala
index 3ec49d8eef68..ca5d94977690 100644
--- a/compiler/src/dotty/tools/dotc/config/Properties.scala
+++ b/compiler/src/dotty/tools/dotc/config/Properties.scala
@@ -84,11 +84,11 @@ trait PropertiesTrait {
 
   /** Whether the current version of compiler is experimental
    *
-   *  1. Snapshot and nightly releases are experimental.
+   *  1. Snapshot, nightly releases and non-bootstrapped compiler are experimental.
    *  2. Features supported by experimental versions of the compiler:
    *     - research plugins
    */
-  val experimental: Boolean = versionString.contains("SNAPSHOT") || versionString.contains("NIGHTLY")
+  val experimental: Boolean = versionString.contains("SNAPSHOT") || versionString.contains("NIGHTLY") || versionString.contains("nonbootstrapped")
 
   val copyrightString: String       = scalaPropOrElse("copyright.string", "(c) 2002-2017 LAMP/EPFL")
 
diff --git a/compiler/src/dotty/tools/dotc/config/ScalaRelease.scala b/compiler/src/dotty/tools/dotc/config/ScalaRelease.scala
new file mode 100644
index 000000000000..acca9ce9298c
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/config/ScalaRelease.scala
@@ -0,0 +1,19 @@
+package dotty.tools.dotc.config
+
+enum ScalaRelease(val majorVersion: Int, val minorVersion: Int) extends Ordered[ScalaRelease]:
+  case Release3_0 extends ScalaRelease(3, 0)
+  case Release3_1 extends ScalaRelease(3, 1)
+
+  def show = s"$majorVersion.$minorVersion"
+
+  def compare(that: ScalaRelease) =
+    val ord = summon[Ordering[(Int, Int)]]
+    ord.compare((majorVersion, minorVersion), (that.majorVersion, that.minorVersion))
+
+object ScalaRelease:
+  def latest = Release3_1
+
+  def parse(name: String) = name match
+    case "3.0" => Some(Release3_0)
+    case "3.1" => Some(Release3_1)
+    case _ => None
diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
index 9f346f97e742..4dccad86e98c 100644
--- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
+++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -1,17 +1,37 @@
 package dotty.tools.dotc
 package config
 
+import dotty.tools.dotc.config.PathResolver.Defaults
+import dotty.tools.dotc.config.Settings.{Setting, SettingGroup}
 import dotty.tools.dotc.core.Contexts._
-import dotty.tools.io.{ Directory, PlainDirectory, AbstractFile, JDK9Reflectors }
-import PathResolver.Defaults
-import rewrites.Rewrites
-import Settings.Setting
+import dotty.tools.dotc.rewrites.Rewrites
+import dotty.tools.io.{AbstractFile, Directory, JDK9Reflectors, PlainDirectory}
 
-/** Settings shared by compiler and scaladoc */
-trait CommonScalaSettings { self: Settings.SettingGroup =>
-  protected def defaultClasspath: String = sys.env.getOrElse("CLASSPATH", ".")
+import scala.util.chaining._
+
+class ScalaSettings extends SettingGroup with AllScalaSettings
+
+object ScalaSettings:
+  // Keep synchronized with `classfileVersion` in `BCodeIdiomatic`
+  private val minTargetVersion = 8
+  private val maxTargetVersion = 17
+
+  def supportedTargetVersions: List[String] =
+    (minTargetVersion to maxTargetVersion).toList.map(_.toString)
+
+  def supportedReleaseVersions: List[String] =
+    if scala.util.Properties.isJavaAtLeast("9") then
+      val jdkVersion = JDK9Reflectors.runtimeVersionMajor(JDK9Reflectors.runtimeVersion()).intValue()
+      val maxVersion = Math.min(jdkVersion, maxTargetVersion)
+      (minTargetVersion to maxVersion).toList.map(_.toString)
+    else List(minTargetVersion).map(_.toString)
+
+  def supportedScalaReleaseVersions: List[String] =
+    ScalaRelease.values.toList.map(_.show)
+
+  def defaultClasspath: String = sys.env.getOrElse("CLASSPATH", ".")
 
-  protected def defaultPageWidth: Int = {
+  def defaultPageWidth: Int = {
     val defaultWidth = 80
     val columnsVar = System.getenv("COLUMNS")
     if columnsVar != null then columnsVar.toInt
@@ -23,7 +43,49 @@ trait CommonScalaSettings { self: Settings.SettingGroup =>
     else defaultWidth
   }
 
-  /** Path related settings */
+trait AllScalaSettings extends CommonScalaSettings, PluginSettings, VerboseSettings, WarningSettings, XSettings, YSettings:
+  self: SettingGroup =>
+
+  /* Path related settings */
+  val semanticdbTarget: Setting[String] = PathSetting("-semanticdb-target", "Specify an alternative output directory for SemanticDB files.", "")
+
+  val source: Setting[String] = ChoiceSetting("-source", "source version", "source version", List("3.0", "3.1", "future", "3.0-migration", "future-migration"), "3.0", aliases = List("--source"))
+  val uniqid: Setting[Boolean] = BooleanSetting("-uniqid", "Uniquely tag all identifiers in debugging output.", aliases = List("--unique-id"))
+  val rewrite: Setting[Option[Rewrites]] = OptionSetting[Rewrites]("-rewrite", "When used in conjunction with a `...-migration` source version, rewrites sources to migrate to new version.", aliases = List("--rewrite"))
+  val fromTasty: Setting[Boolean] = BooleanSetting("-from-tasty", "Compile classes from tasty files. The arguments are .tasty or .jar files.", aliases = List("--from-tasty"))
+
+  val newSyntax: Setting[Boolean] = BooleanSetting("-new-syntax", "Require `then` and `do` in control expressions.")
+  val oldSyntax: Setting[Boolean] = BooleanSetting("-old-syntax", "Require `(...)` around conditions.")
+  val indent: Setting[Boolean] = BooleanSetting("-indent", "Together with -rewrite, remove {...} syntax when possible due to significant indentation.")
+  val noindent: Setting[Boolean] = BooleanSetting("-no-indent", "Require classical {...} syntax, indentation is not significant.", aliases = List("-noindent"))
+  val YindentColons: Setting[Boolean] = BooleanSetting("-Yindent-colons", "(disabled: use -language:experimental.fewerBraces instead)")
+
+  /* Decompiler settings */
+  val printTasty: Setting[Boolean] = BooleanSetting("-print-tasty", "Prints the raw tasty.", aliases = List("--print-tasty"))
+  val printLines: Setting[Boolean] = BooleanSetting("-print-lines", "Show source code line numbers.", aliases = List("--print-lines"))
+
+  /* Scala.js-related settings */
+  val scalajsGenStaticForwardersForNonTopLevelObjects: Setting[Boolean] = BooleanSetting("-scalajs-genStaticForwardersForNonTopLevelObjects", "Generate static forwarders even for non-top-level objects (Scala.js only)")
+  val scalajsMapSourceURI: Setting[List[String]] = MultiStringSetting("-scalajs-mapSourceURI", "uri1[->uri2]", "rebases source URIs from uri1 to uri2 (or to a relative URI) for source maps (Scala.js only)")
+
+  val projectUrl: Setting[String] = StringSetting (
+    "-project-url",
+    "project repository homepage",
+    "The source repository of your project.",
+    ""
+  )
+
+  val wikiSyntax: Setting[Boolean] = BooleanSetting("-Xwiki-syntax", "Retains the Scala2 behavior of using Wiki Syntax in Scaladoc.")
+
+  val jvmargs  = PrefixSetting("-J<flag>", "-J", "Pass <flag> directly to the runtime system.")
+  val defines  = PrefixSetting("-Dproperty=value", "-D", "Pass -Dproperty=value directly to the runtime system.")
+end AllScalaSettings
+
+/** Settings shared by compiler and scaladoc */
+trait CommonScalaSettings:
+  self: SettingGroup =>
+
+  /* Path related settings */
   val bootclasspath: Setting[String] = PathSetting("-bootclasspath", "Override location of bootstrap class files.", Defaults.scalaBootClassPath, aliases = List("--boot-class-path"))
   val extdirs: Setting[String] = PathSetting("-extdirs", "Override location of installed extensions.", Defaults.scalaExtDirs, aliases = List("--extension-directories"))
   val javabootclasspath: Setting[String] = PathSetting("-javabootclasspath", "Override java boot classpath.", Defaults.javaBootClassPath, aliases = List("--java-boot-class-path"))
@@ -31,83 +93,122 @@ trait CommonScalaSettings { self: Settings.SettingGroup =>
   val sourcepath: Setting[String] = PathSetting("-sourcepath", "Specify location(s) of source files.", Defaults.scalaSourcePath, aliases = List("--source-path"))
   val sourceroot: Setting[String] = PathSetting("-sourceroot", "Specify workspace root directory.", ".")
 
-  val classpath: Setting[String] = PathSetting("-classpath", "Specify where to find user class files.", defaultClasspath, aliases = List("-cp", "--class-path"))
+  val classpath: Setting[String] = PathSetting("-classpath", "Specify where to find user class files.", ScalaSettings.defaultClasspath, aliases = List("-cp", "--class-path"))
   val outputDir: Setting[AbstractFile] = OutputSetting("-d", "directory|jar", "Destination for generated classfiles.",
     new PlainDirectory(Directory(".")))
   val color: Setting[String] = ChoiceSetting("-color", "mode", "Colored output", List("always", "never"/*, "auto"*/), "always"/* "auto"*/, aliases = List("--color"))
   val verbose: Setting[Boolean] = BooleanSetting("-verbose", "Output messages about what the compiler is doing.", aliases = List("--verbose"))
   val version: Setting[Boolean] = BooleanSetting("-version", "Print product version and exit.", aliases = List("--version"))
   val help: Setting[Boolean] = BooleanSetting("-help", "Print a synopsis of standard options.", aliases = List("--help"))
-  val pageWidth: Setting[Int] = IntSetting("-pagewidth", "Set page width", defaultPageWidth, aliases = List("--page-width"))
+  val pageWidth: Setting[Int] = IntSetting("-pagewidth", "Set page width", ScalaSettings.defaultPageWidth, aliases = List("--page-width"))
   val silentWarnings: Setting[Boolean] = BooleanSetting("-nowarn", "Silence all warnings.", aliases = List("--no-warnings"))
 
-  /** Other settings */
+  val release: Setting[String] = ChoiceSetting("-release", "release", "Compile code with classes specific to the given version of the Java platform available on the classpath and emit bytecode for this version.", ScalaSettings.supportedReleaseVersions, "", aliases = List("--release"))
+  val deprecation: Setting[Boolean] = BooleanSetting("-deprecation", "Emit warning and location for usages of deprecated APIs.", aliases = List("--deprecation"))
+  val feature: Setting[Boolean] = BooleanSetting("-feature", "Emit warning and location for usages of features that should be imported explicitly.", aliases = List("--feature"))
+  val explain: Setting[Boolean] = BooleanSetting("-explain", "Explain errors in more detail.", aliases = List("--explain"))
+  // -explain-types setting is necessary for cross compilation, since it is mentioned in sbt-tpolecat, for instance
+  // it is otherwise subsumed by -explain, and should be dropped as soon as we can.
+  val explainTypes: Setting[Boolean] = BooleanSetting("-explain-types", "Explain type errors in more detail (deprecated, use -explain instead).", aliases = List("--explain-types", "-explaintypes"))
+  val unchecked: Setting[Boolean] = BooleanSetting("-unchecked", "Enable additional warnings where generated code depends on assumptions.", initialValue = true, aliases = List("--unchecked"))
+  val language: Setting[List[String]] = MultiStringSetting("-language", "feature", "Enable one or more language features.", aliases = List("--language"))
+
+  /* Other settings */
   val encoding: Setting[String] = StringSetting("-encoding", "encoding", "Specify character encoding used by source files.", Properties.sourceEncoding, aliases = List("--encoding"))
   val usejavacp: Setting[Boolean] = BooleanSetting("-usejavacp", "Utilize the java.class.path in classpath resolution.", aliases = List("--use-java-class-path"))
+  val scalajs: Setting[Boolean] = BooleanSetting("-scalajs", "Compile in Scala.js mode (requires scalajs-library.jar on the classpath).", aliases = List("--scalajs"))
+end CommonScalaSettings
 
-  /** Plugin-related setting */
-  val plugin: Setting[List[String]]             = MultiStringSetting  ("-Xplugin", "paths", "Load a plugin from each classpath.")
-  val disable: Setting[List[String]]            = MultiStringSetting  ("-Xplugin-disable", "plugin", "Disable plugins by name.")
-  val require: Setting[List[String]]            = MultiStringSetting  ("-Xplugin-require", "plugin", "Abort if a named plugin is not loaded.")
+/** -P "plugin" settings. Various tools might support plugins. */
+private sealed trait PluginSettings:
+  self: SettingGroup =>
+  val plugin: Setting[List[String]]        = MultiStringSetting  ("-Xplugin", "paths", "Load a plugin from each classpath.")
+  val disable: Setting[List[String]]       = MultiStringSetting  ("-Xplugin-disable", "plugin", "Disable plugins by name.")
+  val require: Setting[List[String]]       = MultiStringSetting  ("-Xplugin-require", "plugin", "Abort if a named plugin is not loaded.")
   val showPlugins: Setting[Boolean]        = BooleanSetting      ("-Xplugin-list", "Print a synopsis of loaded plugins.")
-  val pluginsDir: Setting[String]         = StringSetting       ("-Xpluginsdir", "path", "Path to search for plugin archives.", Defaults.scalaPluginPath)
-  val pluginOptions: Setting[List[String]]      = MultiStringSetting  ("-P", "plugin:opt", "Pass an option to a plugin, e.g. -P:<plugin>:<opt>")
-}
-
-class ScalaSettings extends Settings.SettingGroup with CommonScalaSettings {
-  // Keep synchronized with `classfileVersion` in `BCodeIdiomatic`
-  private val minTargetVersion = 8
-  private val maxTargetVersion = 17
-
-  private def supportedTargetVersions: List[String] =
-    (minTargetVersion to maxTargetVersion).toList.map(_.toString)
-
-  protected def supportedReleaseVersions: List[String] =
-    if scala.util.Properties.isJavaAtLeast("9") then
-      val jdkVersion = JDK9Reflectors.runtimeVersionMajor(JDK9Reflectors.runtimeVersion()).intValue()
-      val maxVersion = Math.min(jdkVersion, maxTargetVersion)
-      (minTargetVersion to maxVersion).toList.map(_.toString)
-    else List()
+  val pluginsDir: Setting[String]          = StringSetting       ("-Xpluginsdir", "path", "Path to search for plugin archives.", Defaults.scalaPluginPath)
+  val pluginOptions: Setting[List[String]] = MultiStringSetting  ("-P", "plugin:opt", "Pass an option to a plugin, e.g. -P:<plugin>:<opt>")
 
-  /** Path related settings */
-  val semanticdbTarget: Setting[String] = PathSetting("-semanticdb-target", "Specify an alternative output directory for SemanticDB files.", "")
+/** -V "Verbose" settings */
+private sealed trait VerboseSettings:
+  self: SettingGroup =>
+  val Vhelp: Setting[Boolean] = BooleanSetting("-V", "Print a synopsis of verbose options.")
+  val Xprint: Setting[List[String]] = PhasesSetting("-Vprint", "Print out program after", aliases = List("-Xprint"))
 
-  val deprecation: Setting[Boolean] = BooleanSetting("-deprecation", "Emit warning and location for usages of deprecated APIs.", aliases = List("--deprecation"))
-  val explainTypes: Setting[Boolean] = BooleanSetting("-explain-types", "Explain type errors in more detail (deprecated, use -explain instead).", aliases = List("--explain-types"))
-    // this setting is necessary for cross compilation, since it is mentioned in sbt-tpolecat, for instance
-    // it is otherwise subsumed by -explain, and should be dropped as soon as we can.
-  val explain: Setting[Boolean] = BooleanSetting("-explain", "Explain errors in more detail.", aliases = List("--explain"))
-  val feature: Setting[Boolean] = BooleanSetting("-feature", "Emit warning and location for usages of features that should be imported explicitly.", aliases = List("--feature"))
-  val release: Setting[String] = ChoiceSetting("-release", "release", "Compile code with classes specific to the given version of the Java platform available on the classpath and emit bytecode for this version.", supportedReleaseVersions, "", aliases = List("--release"))
-  val source: Setting[String] = ChoiceSetting("-source", "source version", "source version", List("3.0", "future", "3.0-migration", "future-migration"), "3.0", aliases = List("--source"))
-  val scalajs: Setting[Boolean] = BooleanSetting("-scalajs", "Compile in Scala.js mode (requires scalajs-library.jar on the classpath).", aliases = List("--scalajs"))
-  val unchecked: Setting[Boolean] = BooleanSetting("-unchecked", "Enable additional warnings where generated code depends on assumptions.", aliases = List("--unchecked"))
-  val uniqid: Setting[Boolean] = BooleanSetting("-uniqid", "Uniquely tag all identifiers in debugging output.", aliases = List("--unique-id"))
-  val language: Setting[List[String]] = MultiStringSetting("-language", "feature", "Enable one or more language features.", aliases = List("--language"))
-  val rewrite: Setting[Option[Rewrites]] = OptionSetting[Rewrites]("-rewrite", "When used in conjunction with a `...-migration` source version, rewrites sources to migrate to new version.", aliases = List("--rewrite"))
-  val fromTasty: Setting[Boolean] = BooleanSetting("-from-tasty", "Compile classes from tasty files. The arguments are .tasty or .jar files.", aliases = List("--from-tasty"))
+/** -W "Warnings" settings
+ */
+private sealed trait WarningSettings:
+  self: SettingGroup =>
+  val Whelp: Setting[Boolean] = BooleanSetting("-W", "Print a synopsis of warning options.")
+  val XfatalWarnings: Setting[Boolean] = BooleanSetting("-Werror", "Fail the compilation if there are any warnings.", aliases = List("-Xfatal-warnings"))
 
-  val newSyntax: Setting[Boolean] = BooleanSetting("-new-syntax", "Require `then` and `do` in control expressions.")
-  val oldSyntax: Setting[Boolean] = BooleanSetting("-old-syntax", "Require `(...)` around conditions.")
-  val indent: Setting[Boolean] = BooleanSetting("-indent", "Together with -rewrite, remove {...} syntax when possible due to significant indentation.")
-  val noindent: Setting[Boolean] = BooleanSetting("-no-indent", "Require classical {...} syntax, indentation is not significant.", aliases = List("-noindent"))
-  val YindentColons: Setting[Boolean] = BooleanSetting("-Yindent-colons", "(disabled: use -language:experimental.fewerBraces instead)")
+  val Wunused: Setting[List[String]] = MultiChoiceSetting(
+    name = "-Wunused",
+    helpArg = "warning",
+    descr = "Enable or disable specific `unused` warnings",
+    choices = List("nowarn", "all"),
+    default = Nil
+  )
+  object WunusedHas:
+    def allOr(s: String)(using Context) = Wunused.value.pipe(us => us.contains("all") || us.contains(s))
+    def nowarn(using Context) = allOr("nowarn")
 
-  /** Decompiler settings */
-  val printTasty: Setting[Boolean] = BooleanSetting("-print-tasty", "Prints the raw tasty.", aliases = List("--print-tasty"))
-  val printLines: Setting[Boolean] = BooleanSetting("-print-lines", "Show source code line numbers.", aliases = List("--print-lines"))
+  val Wconf: Setting[List[String]] = MultiStringSetting(
+    "-Wconf",
+    "patterns",
+    default = List(),
+    descr =
+      s"""Configure compiler warnings.
+         |Syntax: -Wconf:<filters>:<action>,<filters>:<action>,...
+         |multiple <filters> are combined with &, i.e., <filter>&...&<filter>
+         |
+         |<filter>
+         |  - Any message: any
+         |
+         |  - Message categories: cat=deprecation, cat=feature, cat=unchecked
+         |
+         |  - Message content: msg=regex
+         |    The regex need only match some part of the message, not all of it.
+         |
+         |  - Message id: id=E129
+         |    The message id is printed with the warning.
+         |
+         |  - Message name: name=PureExpressionInStatementPosition
+         |    The message name is printed with the warning in verbose warning mode.
+         |
+         |In verbose warning mode the compiler prints matching filters for warnings.
+         |Verbose mode can be enabled globally using `-Wconf:any:verbose`, or locally
+         |using the @nowarn annotation (example: `@nowarn("v") def test = try 1`).
+         |
+         |<action>
+         |  - error / e
+         |  - warning / w
+         |  - verbose / v (emit warning, show additional help for writing `-Wconf` filters)
+         |  - info / i    (infos are not counted as warnings and not affected by `-Werror`)
+         |  - silent / s
+         |
+         |The default configuration is empty.
+         |
+         |User-defined configurations are added to the left. The leftmost rule matching
+         |a warning message defines the action.
+         |
+         |Examples:
+         |  - change every warning into an error: -Wconf:any:error
+         |  - silence deprecations: -Wconf:cat=deprecation:s
+         |
+         |Note: on the command-line you might need to quote configurations containing `*` or `&`
+         |to prevent the shell from expanding patterns.""".stripMargin,
+  )
 
-  /** Scala.js-related settings */
-  val scalajsGenStaticForwardersForNonTopLevelObjects: Setting[Boolean] = BooleanSetting("-scalajs-genStaticForwardersForNonTopLevelObjects", "Generate static forwarders even for non-top-level objects (Scala.js only)")
-  val scalajsMapSourceURI: Setting[List[String]] = MultiStringSetting("-scalajs-mapSourceURI", "uri1[->uri2]", "rebases source URIs from uri1 to uri2 (or to a relative URI) for source maps (Scala.js only)")
+/** -X "Extended" or "Advanced" settings */
+private sealed trait XSettings:
+  self: SettingGroup =>
 
-  /** -X "Advanced" settings */
   val Xhelp: Setting[Boolean] = BooleanSetting("-X", "Print a synopsis of advanced options.")
   val XnoForwarders: Setting[Boolean] = BooleanSetting("-Xno-forwarders", "Do not generate static forwarders in mirror classes.")
   val XmaxInlines: Setting[Int] = IntSetting("-Xmax-inlines", "Maximal number of successive inlines.", 32)
   val XmaxInlinedTrees: Setting[Int] = IntSetting("-Xmax-inlined-trees", "Maximal number of inlined trees.", 2_000_000)
   val Xmigration: Setting[ScalaVersion] = VersionSetting("-Xmigration", "Warn about constructs whose behavior may have changed since version.")
-  val Xprint: Setting[List[String]] = PhasesSetting("-Xprint", "Print out program after")
   val XprintTypes: Setting[Boolean] = BooleanSetting("-Xprint-types", "Print tree types (debugging option).")
   val XprintDiff: Setting[Boolean] = BooleanSetting("-Xprint-diff", "Print changed parts of the tree since last print.")
   val XprintDiffDel: Setting[Boolean] = BooleanSetting("-Xprint-diff-del", "Print changed parts of the tree since last print including deleted parts.")
@@ -116,13 +217,14 @@ class ScalaSettings extends Settings.SettingGroup with CommonScalaSettings {
   val Xprompt: Setting[Boolean] = BooleanSetting("-Xprompt", "Display a prompt after each error (debugging option).")
   val XshowPhases: Setting[Boolean] = BooleanSetting("-Xshow-phases", "Print all compiler phases.")
   val XreplDisableDisplay: Setting[Boolean] = BooleanSetting("-Xrepl-disable-display", "Do not display definitions in REPL.")
-  val XfatalWarnings: Setting[Boolean] = BooleanSetting("-Xfatal-warnings", "Fail the compilation if there are any warnings.")
   val XverifySignatures: Setting[Boolean] = BooleanSetting("-Xverify-signatures", "Verify generic signatures in generated bytecode.")
   val XignoreScala2Macros: Setting[Boolean] = BooleanSetting("-Xignore-scala2-macros", "Ignore errors when compiling code that calls Scala2 macros, these will fail at runtime.")
   val XimportSuggestionTimeout: Setting[Int] = IntSetting("-Ximport-suggestion-timeout", "Timeout (in ms) for searching for import suggestions when errors are reported.", 8000)
   val Xsemanticdb: Setting[Boolean] = BooleanSetting("-Xsemanticdb", "Store information in SemanticDB.", aliases = List("-Ysemanticdb"))
-  val Xtarget: Setting[String] = ChoiceSetting("-Xtarget", "target", "Emit bytecode for the specified version of the Java platform. This might produce bytecode that will break at runtime. When on JDK 9+, consider -release as a safer alternative.", supportedTargetVersions, "", aliases = List("--Xtarget"))
+  val Xtarget: Setting[String] = ChoiceSetting("-Xtarget", "target", "Emit bytecode for the specified version of the Java platform. This might produce bytecode that will break at runtime. When on JDK 9+, consider -release as a safer alternative.", ScalaSettings.supportedTargetVersions, "", aliases = List("--Xtarget"))
   val XcheckMacros: Setting[Boolean] = BooleanSetting("-Xcheck-macros", "Check some invariants of macro generated code while expanding macros", aliases = List("--Xcheck-macros"))
+  val XmainClass: Setting[String] = StringSetting("-Xmain-class", "path", "Class for manifest's Main-Class entry (only useful with -d <jar>)", "")
+  val XimplicitSearchLimit: Setting[Int] = IntSetting("-Ximplicit-search-limit", "Maximal number of expressions to be generated in an implicit search", 50000)
 
   val XmixinForceForwarders = ChoiceSetting(
     name    = "-Xmixin-force-forwarders",
@@ -136,7 +238,13 @@ class ScalaSettings extends Settings.SettingGroup with CommonScalaSettings {
     def isAtLeastJunit(using Context) = isTruthy || XmixinForceForwarders.value == "junit"
   }
 
-  /** -Y "Private" settings */
+  val XmacroSettings: Setting[List[String]] = MultiStringSetting("-Xmacro-settings", "setting1,setting2,..settingN", "List of settings which exposed to the macros")
+end XSettings
+
+/** -Y "Forking" as in forked tongue or "Private" settings */
+private sealed trait YSettings:
+  self: SettingGroup =>
+
   val Yhelp: Setting[Boolean] = BooleanSetting("-Y", "Print a synopsis of private options.")
   val Ycheck: Setting[List[String]] = PhasesSetting("-Ycheck", "Check the tree at the end of")
   val YcheckMods: Setting[Boolean] = BooleanSetting("-Ycheck-mods", "Check that symbols and their defining trees have modifiers in sync.")
@@ -165,7 +273,7 @@ class ScalaSettings extends Settings.SettingGroup with CommonScalaSettings {
   val YstopBefore: Setting[List[String]] = PhasesSetting("-Ystop-before", "Stop before") // stop before erasure as long as we have not debugged it fully
   val YshowSuppressedErrors: Setting[Boolean] = BooleanSetting("-Yshow-suppressed-errors", "Also show follow-on errors and warnings that are normally suppressed.")
   val YdetailedStats: Setting[Boolean] = BooleanSetting("-Ydetailed-stats", "Show detailed internal compiler stats (needs Stats.enabled to be set to true).")
-  val YkindProjector: Setting[Boolean] = BooleanSetting("-Ykind-projector", "Allow `*` as wildcard to be compatible with kind projector.")
+  val YkindProjector: Setting[String] = ChoiceSetting("-Ykind-projector", "[underscores, disable]", "Allow `*` as type lambda placeholder to be compatible with kind projector. When invoked as -Ykind-projector:underscores will repurpose `_` to be a type parameter placeholder, this will disable usage of underscore as a wildcard.", List("disable", "", "underscores"), "disable")
   val YprintPos: Setting[Boolean] = BooleanSetting("-Yprint-pos", "Show tree positions.")
   val YprintPosSyms: Setting[Boolean] = BooleanSetting("-Yprint-pos-syms", "Show symbol definitions positions.")
   val YnoDeepSubtypes: Setting[Boolean] = BooleanSetting("-Yno-deep-subtypes", "Throw an exception on deep subtyping call stacks.")
@@ -174,11 +282,13 @@ class ScalaSettings extends Settings.SettingGroup with CommonScalaSettings {
   val YprintSyms: Setting[Boolean] = BooleanSetting("-Yprint-syms", "When printing trees print info in symbols instead of corresponding info in trees.")
   val YprintDebug: Setting[Boolean] = BooleanSetting("-Yprint-debug", "When printing trees, print some extra information useful for debugging.")
   val YprintDebugOwners: Setting[Boolean] = BooleanSetting("-Yprint-debug-owners", "When printing trees, print owners of definitions.")
+  val YprintLevel: Setting[Boolean] = BooleanSetting("-Yprint-level", "print nesting levels of symbols and type variables.")
   val YshowPrintErrors: Setting[Boolean] = BooleanSetting("-Yshow-print-errors", "Don't suppress exceptions thrown during tree printing.")
   val YtestPickler: Setting[Boolean] = BooleanSetting("-Ytest-pickler", "Self-test for pickling functionality; should be used with -Ystop-after:pickler.")
   val YcheckReentrant: Setting[Boolean] = BooleanSetting("-Ycheck-reentrant", "Check that compiled program does not contain vars that can be accessed from a global root.")
-  val YdropComments: Setting[Boolean] = BooleanSetting("-Ydrop-comments", "Drop comments when scanning source files.")
-  val YcookComments: Setting[Boolean] = BooleanSetting("-Ycook-comments", "Cook the comments (type check `@usecase`, etc.)")
+  val YdropComments: Setting[Boolean] = BooleanSetting("-Ydrop-docs", "Drop documentation when scanning source files.", aliases = List("-Ydrop-comments"))
+  val YcookComments: Setting[Boolean] = BooleanSetting("-Ycook-docs", "Cook the documentation (type check `@usecase`, etc.)", aliases = List("-Ycook-comments"))
+  val YreadComments: Setting[Boolean] = BooleanSetting("-Yread-docs", "Read documentation from tasty.")
   val YforceSbtPhases: Setting[Boolean] = BooleanSetting("-Yforce-sbt-phases", "Run the phases used by sbt for incremental compilation (ExtractDependencies and ExtractAPI) even if the compiler is ran outside of sbt, for debugging.")
   val YdumpSbtInc: Setting[Boolean] = BooleanSetting("-Ydump-sbt-inc", "For every compiled foo.scala, output the API representation and dependencies used for sbt incremental compilation in foo.inc, implies -Yforce-sbt-phases.")
   val YcheckAllPatmat: Setting[Boolean] = BooleanSetting("-Ycheck-all-patmat", "Check exhaustivity and redundancy of all pattern matching (used for testing the algorithm).")
@@ -200,6 +310,7 @@ class ScalaSettings extends Settings.SettingGroup with CommonScalaSettings {
   val YexplicitNulls: Setting[Boolean] = BooleanSetting("-Yexplicit-nulls", "Make reference types non-nullable. Nullable types can be expressed with unions: e.g. String|Null.")
   val YcheckInit: Setting[Boolean] = BooleanSetting("-Ysafe-init", "Ensure safe initialization of objects")
   val YrequireTargetName: Setting[Boolean] = BooleanSetting("-Yrequire-targetName", "Warn if an operator is defined without a @targetName annotation")
+  val YscalaRelease: Setting[String] = ChoiceSetting("-Yscala-release", "release", "Emit TASTy files that can be consumed by specified version of the compiler. The compilation will fail if for any reason valid TASTy cannot be produced (e.g. the code contains references to some parts of the standard library API that are missing in the older stdlib or uses language features unexpressible in the older version of TASTy format)", ScalaSettings.supportedScalaReleaseVersions, "", aliases = List("--Yscala-release"))
 
   /** Area-specific debug output */
   val YexplainLowlevel: Setting[Boolean] = BooleanSetting("-Yexplain-lowlevel", "When explaining type errors, show types at a lower level.")
@@ -212,16 +323,4 @@ class ScalaSettings extends Settings.SettingGroup with CommonScalaSettings {
   val YinstrumentDefs: Setting[Boolean] = BooleanSetting("-Yinstrument-defs", "Add instrumentation code that counts method calls; needs -Yinstrument to be set, too.")
 
   val YforceInlineWhileTyping: Setting[Boolean] = BooleanSetting("-Yforce-inline-while-typing", "Make non-transparent inline methods inline when typing. Emulates the old inlining behavior of 3.0.0-M3.")
-
-  /** Dottydoc specific settings that are not used in scaladoc */
-  val docSnapshot: Setting[Boolean] = BooleanSetting("-doc-snapshot", "Generate a documentation snapshot for the current Dotty version")
-
-  val projectUrl: Setting[String] = StringSetting (
-    "-project-url",
-    "project repository homepage",
-    "The source repository of your project.",
-    ""
-  )
-
-  val wikiSyntax: Setting[Boolean] = BooleanSetting("-Xwiki-syntax", "Retains the Scala2 behavior of using Wiki Syntax in Scaladoc.")
-}
+end YSettings
diff --git a/compiler/src/dotty/tools/dotc/config/Settings.scala b/compiler/src/dotty/tools/dotc/config/Settings.scala
index 7a0f18ab9e24..29a52defa4c6 100644
--- a/compiler/src/dotty/tools/dotc/config/Settings.scala
+++ b/compiler/src/dotty/tools/dotc/config/Settings.scala
@@ -11,7 +11,7 @@ import language.existentials
 import reflect.ClassTag
 import scala.util.{Success, Failure}
 
-object Settings {
+object Settings:
 
   val BooleanTag: ClassTag[Boolean]      = ClassTag.Boolean
   val IntTag: ClassTag[Int]              = ClassTag.Int
@@ -21,25 +21,22 @@ object Settings {
   val OptionTag: ClassTag[Option[?]]     = ClassTag(classOf[Option[?]])
   val OutputTag: ClassTag[AbstractFile]  = ClassTag(classOf[AbstractFile])
 
-  class SettingsState(initialValues: Seq[Any]) {
+  class SettingsState(initialValues: Seq[Any]):
     private val values = ArrayBuffer(initialValues: _*)
     private var _wasRead: Boolean = false
 
     override def toString: String = s"SettingsState(values: ${values.toList})"
 
-    def value(idx: Int): Any = {
+    def value(idx: Int): Any =
       _wasRead = true
       values(idx)
-    }
 
     def update(idx: Int, x: Any): SettingsState =
-      if (_wasRead)
-        new SettingsState(values.toSeq).update(idx, x)
-      else {
+      if (_wasRead) then SettingsState(values.toSeq).update(idx, x)
+      else
         values(idx) = x
         this
-      }
-  }
+  end SettingsState
 
   case class ArgsSummary(
     sstate: SettingsState,
@@ -59,7 +56,7 @@ object Settings {
     description: String,
     default: T,
     helpArg: String = "",
-    choices: Option[Seq[T]] = None,
+    choices: Option[Seq[?]] = None,
     prefix: String = "",
     aliases: List[String] = Nil,
     depends: List[(Setting[?], Any)] = Nil,
@@ -67,18 +64,11 @@ object Settings {
 
     private var changed: Boolean = false
 
-    def valueIn(state: SettingsState): T =
-      state.value(idx).asInstanceOf[T]
+    def valueIn(state: SettingsState): T = state.value(idx).asInstanceOf[T]
 
-    def updateIn(state: SettingsState, x: Any): SettingsState = x match {
+    def updateIn(state: SettingsState, x: Any): SettingsState = x match
       case _: T => state.update(idx, x)
-      case _ =>
-        // would like to do:
-        // throw new ClassCastException(s"illegal argument, found: $x of type ${x.getClass}, required: ${implicitly[ClassTag[T]]}")
-        // but this runs afoul of primitive types. Concretely: if T is Boolean, then x is a boxed Boolean and the test will fail.
-        // Maybe this is a bug in Scala 2.10?
-        state.update(idx, x.asInstanceOf[T])
-    }
+      case _ => throw IllegalArgumentException(s"found: $x of type ${x.getClass.getName}, required: ${implicitly[ClassTag[T]]}")
 
     def isDefaultIn(state: SettingsState): Boolean = valueIn(state) == default
 
@@ -94,7 +84,7 @@ object Settings {
 
     def tryToSet(state: ArgsSummary): ArgsSummary = {
       val ArgsSummary(sstate, arg :: args, errors, warnings) = state
-      def update(value: Any, args: List[String]) =
+      def update(value: Any, args: List[String]): ArgsSummary =
         var dangers = warnings
         val value1 =
           if changed && isMultivalue then
@@ -107,16 +97,34 @@ object Settings {
             value
         changed = true
         ArgsSummary(updateIn(sstate, value1), args, errors, dangers)
+      end update
+
       def fail(msg: String, args: List[String]) =
         ArgsSummary(sstate, args, errors :+ msg, warnings)
+
       def missingArg =
         fail(s"missing argument for option $name", args)
+
       def setString(argValue: String, args: List[String]) =
         choices match
           case Some(xs) if !xs.contains(argValue) =>
             fail(s"$argValue is not a valid choice for $name", args)
           case _ =>
             update(argValue, args)
+
+      def setInt(argValue: String, args: List[String]) =
+        try
+          val x = argValue.toInt
+          choices match
+            case Some(r: Range) if x < r.head || r.last < x =>
+              fail(s"$argValue is out of legal range ${r.head}..${r.last} for $name", args)
+            case Some(xs) if !xs.contains(x) =>
+              fail(s"$argValue is not a valid choice for $name", args)
+            case _ =>
+              update(x, args)
+        catch case _: NumberFormatException =>
+          fail(s"$argValue is not an integer argument for $name", args)
+
       def doSet(argRest: String) = ((implicitly[ClassTag[T]], args): @unchecked) match {
         case (BooleanTag, _) =>
           update(true, args)
@@ -124,8 +132,14 @@ object Settings {
           update(Some(propertyClass.get.getConstructor().newInstance()), args)
         case (ListTag, _) =>
           if (argRest.isEmpty) missingArg
-          else update((argRest split ",").toList, args)
-        case (StringTag, _) if argRest.nonEmpty =>
+          else
+            val strings = argRest.split(",").toList
+            choices match
+              case Some(valid) => strings.filterNot(valid.contains) match
+                case Nil => update(strings, args)
+                case invalid => fail(s"invalid choice(s) for $name: ${invalid.mkString(",")}", args)
+              case _ => update(strings, args)
+        case (StringTag, _) if argRest.nonEmpty || choices.exists(_.contains("")) =>
           setString(argRest, args)
         case (StringTag, arg2 :: args2) =>
           if (arg2 startsWith "-") missingArg
@@ -139,22 +153,10 @@ object Settings {
             val output = if (isJar) JarArchive.create(path) else new PlainDirectory(path)
             update(output, args)
           }
+        case (IntTag, args) if argRest.nonEmpty =>
+          setInt(argRest, args)
         case (IntTag, arg2 :: args2) =>
-          try {
-            val x = arg2.toInt
-            choices match {
-              case Some(r: Range) if x < r.head || r.last < x =>
-                fail(s"$arg2 is out of legal range ${r.head}..${r.last} for $name", args2)
-              case Some(xs) if !xs.contains(x) =>
-                fail(s"$arg2 is not a valid choice for $name", args)
-              case _ =>
-                update(x, args2)
-            }
-          }
-          catch {
-            case _: NumberFormatException =>
-              fail(s"$arg2 is not an integer argument for $name", args2)
-          }
+          setInt(arg2, args2)
         case (VersionTag, _) =>
           ScalaVersion.parse(argRest) match {
             case Success(v) => update(v, args)
@@ -175,13 +177,11 @@ object Settings {
     }
   }
 
-  object Setting {
-    extension [T](setting: Setting[T]) {
+  object Setting:
+    extension [T](setting: Setting[T])
       def value(using Context): T = setting.valueIn(ctx.settingsState)
       def update(x: T)(using Context): SettingsState = setting.updateIn(ctx.settingsState, x)
       def isDefault(using Context): Boolean = setting.isDefaultIn(ctx.settingsState)
-    }
-  }
 
   class SettingGroup {
 
@@ -209,7 +209,7 @@ object Settings {
     /** Iterates over the arguments applying them to settings where applicable.
      *  Then verifies setting dependencies are met.
      *
-     *  This temporarily takes a boolean indicating whether to keep
+     *  This takes a boolean indicating whether to keep
      *  processing if an argument is seen which is not a command line option.
      *  This is an expedience for the moment so that you can say
      *
@@ -221,28 +221,27 @@ object Settings {
      *
      *  to get their arguments.
      */
-    def processArguments(state: ArgsSummary, processAll: Boolean, skipped: List[String]): ArgsSummary = {
+    @tailrec
+    final def processArguments(state: ArgsSummary, processAll: Boolean, skipped: List[String]): ArgsSummary =
       def stateWithArgs(args: List[String]) = ArgsSummary(state.sstate, args, state.errors, state.warnings)
-      state.arguments match {
+      state.arguments match
         case Nil =>
           checkDependencies(stateWithArgs(skipped))
         case "--" :: args =>
           checkDependencies(stateWithArgs(skipped ++ args))
         case x :: _ if x startsWith "-" =>
-          @tailrec def loop(settings: List[Setting[?]]): ArgsSummary = settings match {
+          @tailrec def loop(settings: List[Setting[?]]): ArgsSummary = settings match
             case setting :: settings1 =>
               val state1 = setting.tryToSet(state)
-              if (state1 ne state) processArguments(state1, processAll, skipped)
+              if state1 ne state then state1
               else loop(settings1)
             case Nil =>
-              processArguments(state.warn(s"bad option '$x' was ignored"), processAll, skipped)
-          }
-          loop(allSettings.toList)
+              state.warn(s"bad option '$x' was ignored")
+          processArguments(loop(allSettings.toList), processAll, skipped)
         case arg :: args =>
-          if (processAll) processArguments(stateWithArgs(args), processAll, skipped :+ arg)
+          if processAll then processArguments(stateWithArgs(args), processAll, skipped :+ arg)
           else state
-      }
-    }
+    end processArguments
 
     def processArguments(arguments: List[String], processAll: Boolean, settingsState: SettingsState = defaultState): ArgsSummary =
       processArguments(ArgsSummary(settingsState, arguments, Nil, Nil), processAll, Nil)
@@ -262,14 +261,17 @@ object Settings {
     def ChoiceSetting(name: String, helpArg: String, descr: String, choices: List[String], default: String, aliases: List[String] = Nil): Setting[String] =
       publish(Setting(name, descr, default, helpArg, Some(choices), aliases = aliases))
 
+    def MultiChoiceSetting(name: String, helpArg: String, descr: String, choices: List[String], default: List[String], aliases: List[String] = Nil): Setting[List[String]] =
+      publish(Setting(name, descr, default, helpArg, Some(choices), aliases = aliases))
+
     def IntSetting(name: String, descr: String, default: Int, aliases: List[String] = Nil): Setting[Int] =
       publish(Setting(name, descr, default, aliases = aliases))
 
     def IntChoiceSetting(name: String, descr: String, choices: Seq[Int], default: Int): Setting[Int] =
       publish(Setting(name, descr, default, choices = Some(choices)))
 
-    def MultiStringSetting(name: String, helpArg: String, descr: String, aliases: List[String] = Nil): Setting[List[String]] =
-      publish(Setting(name, descr, Nil, helpArg, aliases = aliases))
+    def MultiStringSetting(name: String, helpArg: String, descr: String, default: List[String] = Nil, aliases: List[String] = Nil): Setting[List[String]] =
+      publish(Setting(name, descr, default, helpArg, aliases = aliases))
 
     def OutputSetting(name: String, helpArg: String, descr: String, default: AbstractFile): Setting[AbstractFile] =
       publish(Setting(name, descr, default, helpArg))
@@ -289,4 +291,4 @@ object Settings {
     def OptionSetting[T: ClassTag](name: String, descr: String, aliases: List[String] = Nil): Setting[Option[T]] =
       publish(Setting(name, descr, None, propertyClass = Some(implicitly[ClassTag[T]].runtimeClass), aliases = aliases))
   }
-}
+end Settings
diff --git a/compiler/src/dotty/tools/dotc/config/SourceVersion.scala b/compiler/src/dotty/tools/dotc/config/SourceVersion.scala
index d336305bf5c4..7311beb07601 100644
--- a/compiler/src/dotty/tools/dotc/config/SourceVersion.scala
+++ b/compiler/src/dotty/tools/dotc/config/SourceVersion.scala
@@ -9,7 +9,7 @@ import core.Decorators.{_, given}
 import util.Property
 
 enum SourceVersion:
-  case `3.0-migration`, `3.0`, `future-migration`, `future`
+  case `3.0-migration`, `3.0`, `3.1`, `future-migration`, `future`
 
   val isMigrating: Boolean = toString.endsWith("-migration")
 
diff --git a/compiler/src/dotty/tools/dotc/config/WrappedProperties.scala b/compiler/src/dotty/tools/dotc/config/WrappedProperties.scala
index bfcba2438a0a..76fac09c8c87 100644
--- a/compiler/src/dotty/tools/dotc/config/WrappedProperties.scala
+++ b/compiler/src/dotty/tools/dotc/config/WrappedProperties.scala
@@ -2,8 +2,6 @@ package dotty.tools
 package dotc
 package config
 
-import java.security.AccessControlException
-
 /** For placing a wrapper function around property functions.
  *  Motivated by places like google app engine throwing exceptions
  *  on property lookups.
@@ -29,6 +27,14 @@ trait WrappedProperties extends PropertiesTrait {
 
 object WrappedProperties {
   object AccessControl extends WrappedProperties {
-    def wrap[T](body: => T): Option[T] = try Some(body) catch { case _: AccessControlException => None }
+    def wrap[T](body: => T): Option[T] =
+      try Some(body)
+      catch {
+        // the actual exception we are concerned with is AccessControlException,
+        // but that's deprecated on JDK 17, so catching its superclass is a convenient
+        // way to avoid a deprecation warning
+        case _: SecurityException =>
+          None
+      }
   }
 }
diff --git a/compiler/src/dotty/tools/dotc/core/Annotations.scala b/compiler/src/dotty/tools/dotc/core/Annotations.scala
index 4245ae3ef0ec..b8d62210ce26 100644
--- a/compiler/src/dotty/tools/dotc/core/Annotations.scala
+++ b/compiler/src/dotty/tools/dotc/core/Annotations.scala
@@ -7,6 +7,9 @@ import StdNames._
 import dotty.tools.dotc.ast.tpd
 import scala.util.Try
 import util.Spans.Span
+import printing.{Showable, Printer}
+import printing.Texts.Text
+import annotation.internal.sharable
 
 object Annotations {
 
@@ -14,7 +17,7 @@ object Annotations {
     if (tree.symbol.isConstructor) tree.symbol.owner
     else tree.tpe.typeSymbol
 
-  abstract class Annotation {
+  abstract class Annotation extends Showable {
     def tree(using Context): Tree
 
     def symbol(using Context): Symbol = annotClass(tree)
@@ -26,7 +29,8 @@ object Annotations {
     def derivedAnnotation(tree: Tree)(using Context): Annotation =
       if (tree eq this.tree) this else Annotation(tree)
 
-    def arguments(using Context): List[Tree] = ast.tpd.arguments(tree)
+    /** All arguments to this annotation in a single flat list */
+    def arguments(using Context): List[Tree] = ast.tpd.allArguments(tree)
 
     def argument(i: Int)(using Context): Option[Tree] = {
       val args = arguments
@@ -44,15 +48,48 @@ object Annotations {
     /** The tree evaluation has finished. */
     def isEvaluated: Boolean = true
 
+    /** Normally, type map over all tree nodes of this annotation, but can
+     *  be overridden. Returns EmptyAnnotation if type type map produces a range
+     *  type, since ranges cannot be types of trees.
+     */
+    def mapWith(tm: TypeMap)(using Context) =
+      val args = arguments
+      if args.isEmpty then this
+      else
+        val findDiff = new TreeAccumulator[Type]:
+          def apply(x: Type, tree: Tree)(using Context): Type =
+            if tm.isRange(x) then x
+            else
+              val tp1 = tm(tree.tpe)
+              foldOver(if tp1 =:= tree.tpe then x else tp1, tree)
+        val diff = findDiff(NoType, args)
+        if tm.isRange(diff) then EmptyAnnotation
+        else if diff.exists then derivedAnnotation(tm.mapOver(tree))
+        else this
+
+    /** Does this annotation refer to a parameter of `tl`? */
+    def refersToParamOf(tl: TermLambda)(using Context): Boolean =
+      val args = arguments
+      if args.isEmpty then false
+      else tree.existsSubTree {
+        case id: Ident => id.tpe match
+          case TermParamRef(tl1, _) => tl eq tl1
+          case _ => false
+        case _ => false
+      }
+
+    /** A string representation of the annotation. Overridden in BodyAnnotation.
+     */
+    def toText(printer: Printer): Text = printer.annotText(this)
+
     def ensureCompleted(using Context): Unit = tree
 
     def sameAnnotation(that: Annotation)(using Context): Boolean =
       symbol == that.symbol && tree.sameTree(that.tree)
   }
 
-  case class ConcreteAnnotation(t: Tree) extends Annotation {
+  case class ConcreteAnnotation(t: Tree) extends Annotation:
     def tree(using Context): Tree = t
-  }
 
   abstract class LazyAnnotation extends Annotation {
     protected var mySym: Symbol | (Context ?=> Symbol)
@@ -98,6 +135,7 @@ object Annotations {
       if (tree eq this.tree) this else ConcreteBodyAnnotation(tree)
     override def arguments(using Context): List[Tree] = Nil
     override def ensureCompleted(using Context): Unit = ()
+    override def toText(printer: Printer): Text = "@Body"
   }
 
   class ConcreteBodyAnnotation(body: Tree) extends BodyAnnotation {
@@ -194,6 +232,8 @@ object Annotations {
       apply(defn.SourceFileAnnot, Literal(Constant(path)))
   }
 
+  @sharable val EmptyAnnotation = Annotation(EmptyTree)
+
   def ThrowsAnnotation(cls: ClassSymbol)(using Context): Annotation = {
     val tref = cls.typeRef
     Annotation(defn.ThrowsAnnot.typeRef.appliedTo(tref), Ident(tref))
diff --git a/compiler/src/dotty/tools/dotc/core/CheckRealizable.scala b/compiler/src/dotty/tools/dotc/core/CheckRealizable.scala
index 460647cdaf7c..a83f35ccd65a 100644
--- a/compiler/src/dotty/tools/dotc/core/CheckRealizable.scala
+++ b/compiler/src/dotty/tools/dotc/core/CheckRealizable.scala
@@ -118,6 +118,7 @@ class CheckRealizable(using Context) {
     case tp =>
       def isConcrete(tp: Type): Boolean = tp.dealias match {
         case tp: TypeRef => tp.symbol.isClass
+        case tp: TypeParamRef => false
         case tp: TypeProxy => isConcrete(tp.underlying)
         case tp: AndType => isConcrete(tp.tp1) && isConcrete(tp.tp2)
         case tp: OrType  => isConcrete(tp.tp1) && isConcrete(tp.tp2)
diff --git a/compiler/src/dotty/tools/dotc/core/Comments.scala b/compiler/src/dotty/tools/dotc/core/Comments.scala
index 33585411fa6e..183b581ce2e7 100644
--- a/compiler/src/dotty/tools/dotc/core/Comments.scala
+++ b/compiler/src/dotty/tools/dotc/core/Comments.scala
@@ -143,7 +143,7 @@ object Comments {
    * @author Felix Mulder
    */
   class CommentExpander {
-    import dotc.config.Printers.dottydoc
+    import dotc.config.Printers.scaladoc
     import scala.collection.mutable
 
     def expand(sym: Symbol, site: Symbol)(using Context): String = {
@@ -203,7 +203,7 @@ object Comments {
         case None =>
           // SI-8210 - The warning would be false negative when this symbol is a setter
           if (ownComment.indexOf("@inheritdoc") != -1 && ! sym.isSetter)
-            dottydoc.println(s"${sym.span}: the comment for ${sym} contains @inheritdoc, but no parent comment is available to inherit from.")
+            scaladoc.println(s"${sym.span}: the comment for ${sym} contains @inheritdoc, but no parent comment is available to inherit from.")
           ownComment.replace("@inheritdoc", "<invalid inheritdoc annotation>")
         case Some(sc) =>
           if (ownComment == "") sc
@@ -317,7 +317,7 @@ object Comments {
                 val sectionTextBounds = extractSectionText(parent, section)
                 cleanupSectionText(parent.substring(sectionTextBounds._1, sectionTextBounds._2))
               case None =>
-                dottydoc.println(s"""${sym.span}: the """" + getSectionHeader + "\" annotation of the " + sym +
+                scaladoc.println(s"""${sym.span}: the """" + getSectionHeader + "\" annotation of the " + sym +
                     " comment contains @inheritdoc, but the corresponding section in the parent is not defined.")
                 "<invalid inheritdoc annotation>"
             }
@@ -384,7 +384,7 @@ object Comments {
                 lookupVariable(vname, site) match {
                   case Some(replacement) => replaceWith(replacement)
                   case None              =>
-                    dottydoc.println(s"Variable $vname undefined in comment for $sym in $site")
+                    scaladoc.println(s"Variable $vname undefined in comment for $sym in $site")
                 }
             }
           }
diff --git a/compiler/src/dotty/tools/dotc/core/Constants.scala b/compiler/src/dotty/tools/dotc/core/Constants.scala
index 474dc0a8b508..f2e6f6fc489a 100644
--- a/compiler/src/dotty/tools/dotc/core/Constants.scala
+++ b/compiler/src/dotty/tools/dotc/core/Constants.scala
@@ -1,25 +1,27 @@
-package dotty.tools.dotc
+package dotty.tools
+package dotc
 package core
 
 import Types._, Symbols._, Contexts._
 import printing.Printer
 import printing.Texts.Text
+import Decorators._
 
 object Constants {
 
-  final val NoTag      = 0
-  final val UnitTag    = 1
-  final val BooleanTag = 2
-  final val ByteTag    = 3
-  final val ShortTag   = 4
-  final val CharTag    = 5
-  final val IntTag     = 6
-  final val LongTag    = 7
-  final val FloatTag   = 8
-  final val DoubleTag  = 9
-  final val StringTag  = 10
-  final val NullTag    = 11
-  final val ClazzTag   = 12
+  inline val NoTag      = 0
+  inline val UnitTag    = 1
+  inline val BooleanTag = 2
+  inline val ByteTag    = 3
+  inline val ShortTag   = 4
+  inline val CharTag    = 5
+  inline val IntTag     = 6
+  inline val LongTag    = 7
+  inline val FloatTag   = 8
+  inline val DoubleTag  = 9
+  inline val StringTag  = 10
+  inline val NullTag    = 11
+  inline val ClazzTag   = 12
 
   class Constant(val value: Any, val tag: Int) extends printing.Showable with Product1[Any] {
     import java.lang.Double.doubleToRawLongBits
@@ -161,25 +163,29 @@ object Constants {
           }
         case pt => pt
       }
-      val target = classBound(pt).typeSymbol
-      if (target == tpe.typeSymbol)
-        this
-      else if ((target == defn.ByteClass) && isByteRange)
-        Constant(byteValue)
-      else if (target == defn.ShortClass && isShortRange)
-        Constant(shortValue)
-      else if (target == defn.CharClass && isCharRange)
-        Constant(charValue)
-      else if (target == defn.IntClass && isIntRange)
-        Constant(intValue)
-      else if (target == defn.LongClass && isLongRange)
-        Constant(longValue)
-      else if (target == defn.FloatClass && isFloatRange)
-        Constant(floatValue)
-      else if (target == defn.DoubleClass && isNumeric)
-        Constant(doubleValue)
-      else
-        null
+      pt match
+        case ConstantType(value) if value == this => this
+        case _: SingletonType => null
+        case _ =>
+          val target = classBound(pt).typeSymbol
+          if (target == tpe.typeSymbol)
+            this
+          else if ((target == defn.ByteClass) && isByteRange)
+            Constant(byteValue)
+          else if (target == defn.ShortClass && isShortRange)
+            Constant(shortValue)
+          else if (target == defn.CharClass && isCharRange)
+            Constant(charValue)
+          else if (target == defn.IntClass && isIntRange)
+            Constant(intValue)
+          else if (target == defn.LongClass && isLongRange)
+            Constant(longValue)
+          else if (target == defn.FloatClass && isFloatRange)
+            Constant(floatValue)
+          else if (target == defn.DoubleClass && isNumeric)
+            Constant(doubleValue)
+          else
+            null
     }
 
     def stringValue: String = value.toString
diff --git a/compiler/src/dotty/tools/dotc/core/Constraint.scala b/compiler/src/dotty/tools/dotc/core/Constraint.scala
index 81c108bc1241..c35c93886cd8 100644
--- a/compiler/src/dotty/tools/dotc/core/Constraint.scala
+++ b/compiler/src/dotty/tools/dotc/core/Constraint.scala
@@ -93,13 +93,15 @@ abstract class Constraint extends Showable {
   /** A constraint that includes the relationship `p1 <: p2`.
    *  `<:` relationships between parameters ("edges") are propagated, but
    *  non-parameter bounds are left alone.
+   *
+   *  @param direction  Must be set to `KeepParam1` or `KeepParam2` when
+   *                    `p2 <: p1` is already true depending on which parameter
+   *                    the caller intends to keep. This will avoid propagating
+   *                    bounds that will be redundant after `p1` and `p2` are
+   *                    unified.
    */
-  def addLess(p1: TypeParamRef, p2: TypeParamRef)(using Context): This
-
-  /** A constraint resulting from adding p2 = p1 to this constraint, and at the same
-   *  time transferring all bounds of p2 to p1
-   */
-  def unify(p1: TypeParamRef, p2: TypeParamRef)(using Context): This
+  def addLess(p1: TypeParamRef, p2: TypeParamRef,
+    direction: UnificationDirection = UnificationDirection.NoUnification)(using Context): This
 
   /** A new constraint which is derived from this constraint by removing
    *  the type parameter `param` from the domain and replacing all top-level occurrences
@@ -118,8 +120,11 @@ abstract class Constraint extends Showable {
   /** A new constraint with all entries coming from `tl` removed. */
   def remove(tl: TypeLambda)(using Context): This
 
-  /** A new constraint with entry `tl` renamed to a fresh type lambda */
-  def rename(tl: TypeLambda)(using Context): This
+  /** A new constraint with entry `from` replaced with `to`
+   *  Rerences to `from` from within other constraint bounds are updated to `to`.
+   *  Type variables are left alone.
+   */
+  def subst(from: TypeLambda, to: TypeLambda)(using Context): This
 
   /** Gives for each instantiated type var that does not yet have its `inst` field
    *  set, the instance value stored in the constraint. Storing instances in constraints
@@ -149,13 +154,10 @@ abstract class Constraint extends Showable {
    */
   def uninstVars: collection.Seq[TypeVar]
 
-  /** The weakest constraint that subsumes both this constraint and `other`.
-   *
-   *  @param otherHasErrors    If true, handle incompatible constraints by
-   *                           returning an approximate constraint, instead of
-   *                           failing with an exception
+  /** Whether `tl` is present in both `this` and `that` but is associated with
+   *  different TypeVars there, meaning that the constraints cannot be merged.
    */
-  def & (other: Constraint, otherHasErrors: Boolean)(using Context): Constraint
+  def hasConflictingTypeVarsFor(tl: TypeLambda, that: Constraint): Boolean
 
   /** Check that no constrained parameter contains itself as a bound */
   def checkNonCyclic()(using Context): this.type
@@ -169,6 +171,20 @@ abstract class Constraint extends Showable {
   /** Check that constraint only refers to TypeParamRefs bound by itself */
   def checkClosed()(using Context): Unit
 
-  /** A string describing the constraint's contents without a header or trailer */
-  def contentsToString(using Context): String
+  /** Check that every typevar om this constraint has as origin a type parameter
+   *  of athe type lambda that is associated with the typevar itself.
+   */
+  def checkConsistentVars()(using Context): Unit
 }
+
+/** When calling `Constraint#addLess(p1, p2, ...)`, the caller might end up
+ *  unifying one parameter with the other, this enum lets `addLess` know which
+ *  direction the unification will take.
+ */
+enum UnificationDirection:
+  /** Neither p1 nor p2 will be instantiated. */
+  case NoUnification
+  /** `p2 := p1`, p1 left uninstantiated. */
+  case KeepParam1
+  /** `p1 := p2`, p2 left uninstantiated. */
+  case KeepParam2
diff --git a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
index e9ca12e3db9e..835da2176a33 100644
--- a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
+++ b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
@@ -10,7 +10,10 @@ import Flags._
 import config.Config
 import config.Printers.typr
 import reporting.trace
+import typer.ProtoTypes.{newTypeVar, representedParamRef}
 import StdNames.tpnme
+import UnificationDirection.*
+import NameKinds.AvoidNameKind
 
 /** Methods for adding constraints and solving them.
  *
@@ -55,6 +58,24 @@ trait ConstraintHandling {
    */
   protected var comparedTypeLambdas: Set[TypeLambda] = Set.empty
 
+  protected var myNecessaryConstraintsOnly = false
+  /** When collecting the constraints needed for a particular subtyping
+   *  judgment to be true, we sometimes need to approximate the constraint
+   *  set (see `TypeComparer#either` for example).
+   *
+   *  Normally, this means adding extra constraints which may not be necessary
+   *  for the subtyping judgment to be true, but if this variable is set to true
+   *  we will instead under-approximate and keep only the constraints that must
+   *  always be present for the subtyping judgment to hold.
+   *
+   *  This is needed for GADT bounds inference to be sound, but it is also used
+   *  when constraining a method call based on its expected type to avoid adding
+   *  constraints that would later prevent us from typechecking method
+   *  arguments, see or-inf.scala and and-inf.scala for examples.
+   */
+  protected def necessaryConstraintsOnly(using Context): Boolean =
+    ctx.mode.is(Mode.GadtConstraintInference) || myNecessaryConstraintsOnly
+
   def checkReset() =
     assert(addConstraintInvocations == 0)
     assert(frozenConstraint == false)
@@ -62,13 +83,43 @@ trait ConstraintHandling {
     assert(homogenizeArgs == false)
     assert(comparedTypeLambdas == Set.empty)
 
+  def nestingLevel(param: TypeParamRef) = constraint.typeVarOfParam(param) match
+    case tv: TypeVar => tv.nestingLevel
+    case _ => Int.MaxValue
+
+  /** If `param` is nested deeper than `maxLevel`, try to instantiate it to a
+   *  fresh type variable of level `maxLevel` and return the new variable.
+   *  If this isn't possible, throw a TypeError.
+   */
+  def atLevel(maxLevel: Int, param: TypeParamRef)(using Context): TypeParamRef =
+    if nestingLevel(param) <= maxLevel then return param
+    LevelAvoidMap(0, maxLevel)(param) match
+      case freshVar: TypeVar => freshVar.origin
+      case _ => throw new TypeError(
+        i"Could not decrease the nesting level of ${param} from ${nestingLevel(param)} to $maxLevel in $constraint")
+
   def nonParamBounds(param: TypeParamRef)(using Context): TypeBounds = constraint.nonParamBounds(param)
 
+  /** The full lower bound of `param` includes both the `nonParamBounds` and the
+   *  params in the constraint known to be `<: param`, except that
+   *  params with a `nestingLevel` higher than `param` will be instantiated
+   *  to a fresh param at a legal level. See the documentation of `TypeVar`
+   *  for details.
+   */
   def fullLowerBound(param: TypeParamRef)(using Context): Type =
-    constraint.minLower(param).foldLeft(nonParamBounds(param).lo)(_ | _)
+    val maxLevel = nestingLevel(param)
+    var loParams = constraint.minLower(param)
+    if maxLevel != Int.MaxValue then
+      loParams = loParams.mapConserve(atLevel(maxLevel, _))
+    loParams.foldLeft(nonParamBounds(param).lo)(_ | _)
 
+  /** The full upper bound of `param`, see the documentation of `fullLowerBounds` above. */
   def fullUpperBound(param: TypeParamRef)(using Context): Type =
-    constraint.minUpper(param).foldLeft(nonParamBounds(param).hi)(_ & _)
+    val maxLevel = nestingLevel(param)
+    var hiParams = constraint.minUpper(param)
+    if maxLevel != Int.MaxValue then
+      hiParams = hiParams.mapConserve(atLevel(maxLevel, _))
+    hiParams.foldLeft(nonParamBounds(param).hi)(_ & _)
 
   /** Full bounds of `param`, including other lower/upper params.
     *
@@ -78,22 +129,125 @@ trait ConstraintHandling {
   def fullBounds(param: TypeParamRef)(using Context): TypeBounds =
     nonParamBounds(param).derivedTypeBounds(fullLowerBound(param), fullUpperBound(param))
 
-  protected def addOneBound(param: TypeParamRef, bound: Type, isUpper: Boolean)(using Context): Boolean =
+  /** An approximating map that prevents types nested deeper than maxLevel as
+   *  well as WildcardTypes from leaking into the constraint.
+   *  Note that level-checking is turned off after typer and in uncommitable
+   *  TyperState since these leaks should be safe.
+   */
+  class LevelAvoidMap(topLevelVariance: Int, maxLevel: Int)(using Context) extends TypeOps.AvoidMap:
+    variance = topLevelVariance
+
+    /** Are we allowed to refer to types of the given `level`? */
+    private def levelOK(level: Int): Boolean =
+      level <= maxLevel || ctx.isAfterTyper || !ctx.typerState.isCommittable
+
+    def toAvoid(tp: NamedType): Boolean =
+      tp.prefix == NoPrefix && !tp.symbol.isStatic && !levelOK(tp.symbol.nestingLevel)
+
+    /** Return a (possibly fresh) type variable of a level no greater than `maxLevel` which is:
+     *  - lower-bounded by `tp` if variance >= 0
+     *  - upper-bounded by `tp` if variance <= 0
+     *  If this isn't possible, return the empty range.
+     */
+    def legalVar(tp: TypeVar): Type =
+      val oldParam = tp.origin
+      val nameKind =
+        if variance > 0 then AvoidNameKind.UpperBound
+        else if variance < 0 then AvoidNameKind.LowerBound
+        else AvoidNameKind.BothBounds
+
+      /** If it exists, return the first param in the list created in a previous call to `legalVar(tp)`
+       *  with the appropriate level and variance.
+       */
+      def findParam(params: List[TypeParamRef]): Option[TypeParamRef] =
+        params.find(p =>
+          nestingLevel(p) <= maxLevel && representedParamRef(p) == oldParam &&
+          (p.paramName.is(AvoidNameKind.BothBounds) ||
+           variance != 0 && p.paramName.is(nameKind)))
+
+      // First, check if we can reuse an existing parameter, this is more than an optimization
+      // since it avoids an infinite loop in tests/pos/i8900-cycle.scala
+      findParam(constraint.lower(oldParam)).orElse(findParam(constraint.upper(oldParam))) match
+        case Some(param) =>
+          constraint.typeVarOfParam(param)
+        case _ =>
+          // Otherwise, try to return a fresh type variable at `maxLevel` with
+          // the appropriate constraints.
+          val name = nameKind(oldParam.paramName.toTermName).toTypeName
+          val freshVar = newTypeVar(TypeBounds.upper(tp.topType), name,
+            nestingLevel = maxLevel, represents = oldParam)
+          val ok =
+            if variance < 0 then
+              addLess(freshVar.origin, oldParam)
+            else if variance > 0 then
+              addLess(oldParam, freshVar.origin)
+            else
+              unify(freshVar.origin, oldParam)
+          if ok then freshVar else emptyRange
+    end legalVar
+
+    override def apply(tp: Type): Type = tp match
+      case tp: TypeVar if !tp.isInstantiated && !levelOK(tp.nestingLevel) =>
+        legalVar(tp)
+      // TypeParamRef can occur in tl bounds
+      case tp: TypeParamRef =>
+        constraint.typeVarOfParam(tp) match
+          case tvar: TypeVar =>
+            apply(tvar)
+          case _ => super.apply(tp)
+      case _ =>
+        super.apply(tp)
+
+    override def mapWild(t: WildcardType) =
+      if ctx.mode.is(Mode.TypevarsMissContext) then super.mapWild(t)
+      else
+        val tvar = newTypeVar(apply(t.effectiveBounds).toBounds, nestingLevel = maxLevel)
+        tvar
+  end LevelAvoidMap
+
+  /** Approximate `rawBound` if needed to make it a legal bound of `param` by
+   *  avoiding wildcards and types with a level strictly greater than its
+   *  `nestingLevel`.
+   *
+   *  Note that level-checking must be performed here and cannot be delayed
+   *  until instantiation because if we allow level-incorrect bounds, then we
+   *  might end up reasoning with bad bounds outside of the scope where they are
+   *  defined. This can lead to level-correct but unsound instantiations as
+   *  demonstrated by tests/neg/i8900.scala.
+   */
+  protected def legalBound(param: TypeParamRef, rawBound: Type, isUpper: Boolean)(using Context): Type =
+    // Over-approximate for soundness.
+    var variance = if isUpper then -1 else 1
+    // ...unless we can only infer necessary constraints, in which case we
+    // flip the variance to under-approximate.
+    if necessaryConstraintsOnly then variance = -variance
+
+    val approx = new LevelAvoidMap(variance, nestingLevel(param)):
+      override def legalVar(tp: TypeVar): Type =
+        // `legalVar` will create a type variable whose bounds depend on
+        // `variance`, but whether the variance is positive or negative,
+        // we can still infer necessary constraints since just creating a
+        // type variable doesn't reduce the set of possible solutions.
+        // Therefore, we can safely "unflip" the variance flipped above.
+        // This is necessary for i8900-unflip.scala to typecheck.
+        val v = if necessaryConstraintsOnly then -this.variance else this.variance
+        atVariance(v)(super.legalVar(tp))
+    approx(rawBound)
+  end legalBound
+
+  protected def addOneBound(param: TypeParamRef, rawBound: Type, isUpper: Boolean)(using Context): Boolean =
     if !constraint.contains(param) then true
-    else if !isUpper && param.occursIn(bound) then
+    else if !isUpper && param.occursIn(rawBound) then
       // We don't allow recursive lower bounds when defining a type,
       // so we shouldn't allow them as constraints either.
       false
     else
+      val bound = legalBound(param, rawBound, isUpper)
       val oldBounds @ TypeBounds(lo, hi) = constraint.nonParamBounds(param)
       val equalBounds = (if isUpper then lo else hi) eq bound
-      if equalBounds
-        && !bound.existsPart(bp => bp.isInstanceOf[WildcardType] || (bp eq param))
-      then
-        // The narrowed bounds are equal and do not contain wildcards,
+      if equalBounds && !bound.existsPart(_ eq param, StopAt.Static) then
+        // The narrowed bounds are equal and not recursive,
         // so we can remove `param` from the constraint.
-        // (Handling wildcards requires choosing a bound, but we don't know which
-        // bound to choose here, this is handled in `ConstraintHandling#approximation`)
         constraint = constraint.replace(param, bound)
         true
       else
@@ -183,18 +337,50 @@ trait ConstraintHandling {
 
   def location(using Context) = "" // i"in ${ctx.typerState.stateChainStr}" // use for debugging
 
-  /** Make p2 = p1, transfer all bounds of p2 to p1
-   *  @pre  less(p1)(p2)
+  /** Unify p1 with p2: one parameter will be kept in the constraint, the
+   *  other will be removed and its bounds transferred to the remaining one.
+   *
+   *  If p1 and p2 have different `nestingLevel`, the parameter with the lowest
+   *  level will be kept and the transferred bounds from the other parameter
+   *  will be adjusted for level-correctness.
    */
   private def unify(p1: TypeParamRef, p2: TypeParamRef)(using Context): Boolean = {
     constr.println(s"unifying $p1 $p2")
-    assert(constraint.isLess(p1, p2))
+    if !constraint.isLess(p1, p2) then
+      constraint = constraint.addLess(p1, p2)
+
+    val level1 = nestingLevel(p1)
+    val level2 = nestingLevel(p2)
+    val pKept    = if level1 <= level2 then p1 else p2
+    val pRemoved = if level1 <= level2 then p2 else p1
+
+    constraint = constraint.addLess(p2, p1, direction = if pKept eq p1 then KeepParam2 else KeepParam1)
+
+    val boundKept    = constraint.nonParamBounds(pKept).substParam(pRemoved, pKept)
+    var boundRemoved = constraint.nonParamBounds(pRemoved).substParam(pRemoved, pKept)
+
+    if level1 != level2 then
+      boundRemoved = LevelAvoidMap(-1, math.min(level1, level2))(boundRemoved)
+      val TypeBounds(lo, hi) = boundRemoved
+      // After avoidance, the interval might be empty, e.g. in
+      // tests/pos/i8900-promote.scala:
+      //     >: x.type <: Singleton
+      // becomes:
+      //     >: Int <: Singleton
+      // In that case, we can still get a legal constraint
+      // by replacing the lower-bound to get:
+      //     >: Int & Singleton <: Singleton
+      if !isSub(lo, hi) then
+        boundRemoved = TypeBounds(lo & hi, hi)
+
     val down = constraint.exclusiveLower(p2, p1)
     val up = constraint.exclusiveUpper(p1, p2)
-    constraint = constraint.unify(p1, p2)
-    val bounds = constraint.nonParamBounds(p1)
-    val lo = bounds.lo
-    val hi = bounds.hi
+
+    val newBounds = (boundKept & boundRemoved).bounds
+    constraint = constraint.updateEntry(pKept, newBounds).replace(pRemoved, pKept)
+
+    val lo = newBounds.lo
+    val hi = newBounds.hi
     isSub(lo, hi) &&
     down.forall(addOneBound(_, hi, isUpper = true)) &&
     up.forall(addOneBound(_, lo, isUpper = false))
@@ -245,81 +431,12 @@ trait ConstraintHandling {
    *  @pre `param` is in the constraint's domain.
    */
   final def approximation(param: TypeParamRef, fromBelow: Boolean)(using Context): Type =
-
-    /** Substitute wildcards with fresh TypeParamRefs, to be compared with
-     *  other bound, so that they can be instantiated.
-     */
-    object substWildcards extends TypeMap:
-      override def stopAtStatic = true
-
-      var trackedPolis: List[PolyType] = Nil
-      def apply(tp: Type) = tp match
-        case tp: WildcardType =>
-          val poly = PolyType(tpnme.EMPTY :: Nil)(pt => tp.bounds :: Nil, pt => defn.AnyType)
-          trackedPolis = poly :: trackedPolis
-          poly.paramRefs.head
-        case _ =>
-          mapOver(tp)
-    end substWildcards
-
-    /** Replace TypeParamRefs substituted for wildcards by `substWildCards`
-     *  and any remaining wildcards by a safe approximation
-     */
-    val replaceWildcards = new TypeMap:
-      override def stopAtStatic = true
-
-      /** Try to instantiate a wildcard or TypeParamRef representing a wildcard
-       *  to a type that is known to conform to it.
-       *  This means:
-       *  If fromBelow is true, we minimize the type overall
-       *  Hence, if variance < 0, pick the maximal safe type: bounds.lo
-       *  (i.e. the whole bounds range is over the type).
-       *  If variance > 0, pick the minimal safe type: bounds.hi
-       *  (i.e. the whole bounds range is under the type).
-       *  If variance == 0, pick bounds.lo anyway (this is arbitrary but in line with
-       *  the principle that we pick the smaller type when in doubt).
-       *  If fromBelow is false, we maximize the type overall and reverse the bounds
-       *  If variance != 0. For variance == 0, we still minimize.
-       *  In summary we pick the bound given by this table:
-       *
-       *  variance    | -1  0   1
-       *  ------------------------
-       *  from below  | lo  lo  hi
-       *  from above  | hi  lo  lo
-       */
-      def pickOneBound(bounds: TypeBounds) =
-        if variance == 0 || fromBelow == (variance < 0) then bounds.lo
-        else bounds.hi
-
-      def apply(tp: Type) = mapOver {
-        tp match
-          case tp: WildcardType =>
-            pickOneBound(tp.bounds)
-          case tp: TypeParamRef if substWildcards.trackedPolis.contains(tp.binder) =>
-            pickOneBound(fullBounds(tp))
-          case _ => tp
-      }
-    end replaceWildcards
-
     constraint.entry(param) match
       case entry: TypeBounds =>
+        val maxLevel = nestingLevel(param)
         val useLowerBound = fromBelow || param.occursIn(entry.hi)
-        val rawBound = if useLowerBound then fullLowerBound(param) else fullUpperBound(param)
-        val bound = substWildcards(rawBound)
-        val inst =
-          if bound eq rawBound then bound
-          else
-            // Get rid of wildcards by mapping them to fresh TypeParamRefs
-            // with constraints derived from comparing both bounds, and then
-            // instantiating. See pos/i10161.scala for a test where this matters.
-            val saved = constraint
-            try
-              for poly <- substWildcards.trackedPolis do addToConstraint(poly, Nil)
-              if useLowerBound then bound <:< fullUpperBound(param)
-              else fullLowerBound(param) <:< bound
-              replaceWildcards(bound)
-            finally constraint = saved
-        typr.println(s"approx ${param.show}, from below = $fromBelow, bound = ${bound.show}, inst = ${inst.show}")
+        val inst = if useLowerBound then fullLowerBound(param) else fullUpperBound(param)
+        typr.println(s"approx ${param.show}, from below = $fromBelow, inst = ${inst.show}")
         inst
       case inst =>
         assert(inst.exists, i"param = $param\nconstraint = $constraint")
@@ -362,8 +479,15 @@ trait ConstraintHandling {
         dropped = dropped.tail
         recur(tp)
 
+    val saved = ctx.typerState.snapshot()
     val tpw = recur(tp)
-    if (tpw eq tp) || dropped.forall(_ frozen_<:< tpw) then tp else tpw
+    if (tpw eq tp) || dropped.forall(_ frozen_<:< tpw) then
+      // Rollback any constraint change that would lead to `tp` no longer
+      // being a valid solution.
+      ctx.typerState.resetTo(saved)
+      tp
+    else
+      tpw
   end dropTransparentTraits
 
   /** If `tp` is an applied match type alias which is also an unreducible application
@@ -466,9 +590,10 @@ trait ConstraintHandling {
         // If `c2` has, compared to `pre`, instantiated a param and we iterated over params of `c2`,
         // we could miss that param being instantiated to an incompatible type in `c1`.
         pre.forallParams(p =>
-          c1.contains(p) &&
-          c2.upper(p).forall(c1.isLess(p, _)) &&
-          isSubTypeWhenFrozen(c1.nonParamBounds(p), c2.nonParamBounds(p)))
+          c1.entry(p).exists
+          && c2.upper(p).forall(c1.isLess(p, _))
+          && isSubTypeWhenFrozen(c1.nonParamBounds(p), c2.nonParamBounds(p))
+        )
       finally constraint = saved
     }
 
diff --git a/compiler/src/dotty/tools/dotc/core/ContextOps.scala b/compiler/src/dotty/tools/dotc/core/ContextOps.scala
index 34956d9294c9..594f103b8481 100644
--- a/compiler/src/dotty/tools/dotc/core/ContextOps.scala
+++ b/compiler/src/dotty/tools/dotc/core/ContextOps.scala
@@ -2,8 +2,8 @@ package dotty.tools.dotc
 package core
 
 import Contexts._, Symbols._, Types._, Flags._, Scopes._, Decorators._, NameOps._
-import Denotations._
-import SymDenotations.LazyType, Names.Name, StdNames.nme
+import Denotations._, SymDenotations._
+import Names.Name, StdNames.nme
 import ast.untpd
 
 /** Extension methods for contexts where we want to keep the ctx.<methodName> syntax */
@@ -34,7 +34,8 @@ object ContextOps:
               if (elem.name == name) return elem.sym.denot // return self
             }
             val pre = ctx.owner.thisType
-            pre.findMember(name, pre, required, excluded)
+            if ctx.isJava then javaFindMember(name, pre, required, excluded)
+            else pre.findMember(name, pre, required, excluded)
           }
           else // we are in the outermost context belonging to a class; self is invisible here. See inClassContext.
             ctx.owner.findMember(name, ctx.owner.thisType, required, excluded)
@@ -42,6 +43,42 @@ object ContextOps:
           ctx.scope.denotsNamed(name).filterWithFlags(required, excluded).toDenot(NoPrefix)
       }
 
+    final def javaFindMember(name: Name, pre: Type, required: FlagSet = EmptyFlags, excluded: FlagSet = EmptyFlags): Denotation =
+      assert(ctx.isJava)
+      inContext(ctx) {
+
+        val preSym = pre.typeSymbol
+
+        // 1. Try to search in current type and parents.
+        val directSearch = pre.findMember(name, pre, required, excluded)
+
+        // 2. Try to search in companion class if current is an object.
+        def searchCompanionClass = if preSym.is(Flags.Module) then
+          preSym.companionClass.thisType.findMember(name, pre, required, excluded)
+          else NoDenotation
+
+        // 3. Try to search in companion objects of super classes.
+        // In Java code, static inner classes, which we model as members of the companion object,
+        // can be referenced from an ident in a subclass or by a selection prefixed by the subclass.
+        def searchSuperCompanionObjects =
+          val toSearch = if preSym.is(Flags.Module) then
+            if preSym.companionClass.exists then
+              preSym.companionClass.asClass.baseClasses
+            else Nil
+          else
+            preSym.asClass.baseClasses
+
+          toSearch.iterator.map { bc =>
+            val pre1 = bc.companionModule.namedType
+            pre1.findMember(name, pre1, required, excluded)
+          }.find(_.exists).getOrElse(NoDenotation)
+
+        if preSym.isClass then
+          directSearch orElse searchCompanionClass orElse searchSuperCompanionObjects
+        else
+          directSearch
+      }
+
     /** A fresh local context with given tree and owner.
     *  Owner might not exist (can happen for self valdefs), in which case
     *  no owner is set in result context
diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala
index 60f675ff0b0d..e9fbd6065261 100644
--- a/compiler/src/dotty/tools/dotc/core/Contexts.scala
+++ b/compiler/src/dotty/tools/dotc/core/Contexts.scala
@@ -13,7 +13,6 @@ import Scopes._
 import Uniques._
 import ast.Trees._
 import ast.untpd
-import Flags.GivenOrImplicit
 import util.{NoSource, SimpleIdentityMap, SourceFile, HashSet, ReusableInstance}
 import typer.{Implicits, ImportInfo, Inliner, SearchHistory, SearchRoot, TypeAssigner, Typer, Nullables}
 import Nullables._
@@ -25,7 +24,7 @@ import io.{AbstractFile, NoAbstractFile, PlainFile, Path}
 import scala.io.Codec
 import collection.mutable
 import printing._
-import config.{JavaPlatform, SJSPlatform, Platform, ScalaSettings}
+import config.{JavaPlatform, SJSPlatform, Platform, ScalaSettings, ScalaRelease}
 import classfile.ReusableDataReader
 import StdNames.nme
 
@@ -39,6 +38,9 @@ import xsbti.AnalysisCallback
 import plugins._
 import java.util.concurrent.atomic.AtomicInteger
 import java.nio.file.InvalidPathException
+import dotty.tools.tasty.TastyFormat
+import dotty.tools.dotc.config.{ NoScalaVersion, SpecificScalaVersion, AnyScalaVersion, ScalaBuild }
+import dotty.tools.dotc.core.tasty.TastyVersion
 
 object Contexts {
 
@@ -271,6 +273,10 @@ object Contexts {
       if owner != null && owner.isClass then owner.asClass.unforcedDecls
       else scope
 
+    def nestingLevel: Int =
+      val sc = effectiveScope
+      if sc != null then sc.nestingLevel else 0
+
     /** Sourcefile corresponding to given abstract file, memoized */
     def getSource(file: AbstractFile, codec: => Codec = Codec(settings.encoding.value)) = {
       util.Stats.record("Context.getSource")
@@ -388,8 +394,9 @@ object Contexts {
       // to be used as a default value.
       compilationUnit != null && compilationUnit.isJava
 
-    /** Is current phase after FrontEnd? */
+    /** Is current phase after TyperPhase? */
     final def isAfterTyper = base.isAfterTyper(phase)
+    final def isTyper = base.isTyper(phase)
 
     /** Is this a context for the members of a class definition? */
     def isClassDefContext: Boolean =
@@ -476,7 +483,22 @@ object Contexts {
 
     /** A new context that summarizes an import statement */
     def importContext(imp: Import[?], sym: Symbol): FreshContext =
-       fresh.setImportInfo(ImportInfo(sym, imp.selectors, imp.expr))
+      fresh.setImportInfo(ImportInfo(sym, imp.selectors, imp.expr))
+
+    def scalaRelease: ScalaRelease =
+      val releaseName = base.settings.YscalaRelease.value
+      if releaseName.nonEmpty then ScalaRelease.parse(releaseName).get else ScalaRelease.latest
+
+    def tastyVersion: TastyVersion =
+      import math.Ordered.orderingToOrdered
+      val latestRelease = ScalaRelease.latest
+      val specifiedRelease = scalaRelease
+      if specifiedRelease < latestRelease then
+        // This is needed to make -Yscala-release a no-op when set to the latest release for unstable versions of the compiler
+        // (which might have the tasty format version numbers set to higher values before they're decreased during a release)
+        TastyVersion.fromStableScalaRelease(specifiedRelease.majorVersion, specifiedRelease.minorVersion)
+      else
+        TastyVersion.compilerVersion
 
     /** Is the debug option set? */
     def debug: Boolean = base.settings.Ydebug.value
@@ -526,6 +548,12 @@ object Contexts {
     final def withOwner(owner: Symbol): Context =
       if (owner ne this.owner) fresh.setOwner(owner) else this
 
+    final def withTyperState(typerState: TyperState): Context =
+      if typerState ne this.typerState then fresh.setTyperState(typerState) else this
+
+    final def withUncommittedTyperState: Context =
+      withTyperState(typerState.uncommittedAncestor)
+
     final def withProperty[T](key: Key[T], value: Option[T]): Context =
       if (property(key) == value) this
       else value match {
@@ -555,7 +583,7 @@ object Contexts {
     def platform: Platform                 = base.platform
     def pendingUnderlying: util.HashSet[Type]      = base.pendingUnderlying
     def uniqueNamedTypes: Uniques.NamedTypeUniques = base.uniqueNamedTypes
-    def uniques: util.HashSet[Type]                = base.uniques
+    def uniques: util.WeakHashSet[Type]            = base.uniques
 
     def initialize()(using Context): Unit = base.initialize()
   }
@@ -595,8 +623,8 @@ object Contexts {
       this.scope = newScope
       this
     def setTyperState(typerState: TyperState): this.type = { this.typerState = typerState; this }
-    def setNewTyperState(): this.type = setTyperState(typerState.fresh().setCommittable(true))
-    def setExploreTyperState(): this.type = setTyperState(typerState.fresh().setCommittable(false))
+    def setNewTyperState(): this.type = setTyperState(typerState.fresh(committable = true))
+    def setExploreTyperState(): this.type = setTyperState(typerState.fresh(committable = false))
     def setReporter(reporter: Reporter): this.type = setTyperState(typerState.fresh().setReporter(reporter))
     def setTyper(typer: Typer): this.type = { this.scope = typer.scope; setTypeAssigner(typer) }
     def setGadt(gadt: GadtConstraint): this.type =
@@ -922,6 +950,20 @@ object Contexts {
 
     private[core] var denotTransformers: Array[DenotTransformer] = _
 
+    /** Flag to suppress inlining, set after overflow */
+    private[dotc] var stopInlining: Boolean = false
+
+    /** A variable that records that some error was reported in a globally committable context.
+     *  The error will not necessarlily be emitted, since it could still be that
+     *  the enclosing context will be aborted. The variable is used as a smoke test
+     *  to turn off assertions that might be wrong if the program is erroneous. To
+     *  just test for `ctx.reporter.errorsReported` is not always enough, since it
+     *  could be that the context in which the assertion is tested is a completer context
+     *  that's different from the context where the error was reported. See i13218.scala
+     *  for a test.
+     */
+    private[dotc] var errorsToBeReported = false
+
     // Reporters state
     private[dotc] var indent: Int = 0
 
@@ -940,6 +982,8 @@ object Contexts {
 
     private[core] val reusableDataReader = ReusableInstance(new ReusableDataReader())
 
+    private[dotc] var wConfCache: (List[String], WConf) = _
+
     def sharedCharArray(len: Int): Array[Char] =
       while len > charArray.length do
         charArray = new Array[Char](charArray.length * 2)
@@ -951,6 +995,7 @@ object Contexts {
       uniqueNamedTypes.clear()
       emptyTypeBounds = null
       emptyWildcardBounds = null
+      errorsToBeReported = false
       errorTypeMsg.clear()
       sources.clear()
       files.clear()
diff --git a/compiler/src/dotty/tools/dotc/core/Decorators.scala b/compiler/src/dotty/tools/dotc/core/Decorators.scala
index 809b76ba3118..3ea05af0292a 100644
--- a/compiler/src/dotty/tools/dotc/core/Decorators.scala
+++ b/compiler/src/dotty/tools/dotc/core/Decorators.scala
@@ -74,7 +74,7 @@ object Decorators {
       NoSymbol
     }
 
-  final val MaxFilterRecursions = 10
+  inline val MaxFilterRecursions = 10
 
   /** Implements filterConserve, zipWithConserve methods
    *  on lists that avoid duplication of list nodes where feasible.
@@ -162,16 +162,29 @@ object Decorators {
      *  `xs` to themselves.
      */
     def mapWithIndexConserve[U <: T](f: (T, Int) => U): List[U] =
-      def recur(xs: List[T], idx: Int): List[U] =
-        if xs.isEmpty then Nil
-        else
-          val x1 = f(xs.head, idx)
-          val xs1 = recur(xs.tail, idx + 1)
-          if (x1.asInstanceOf[AnyRef] eq xs.head.asInstanceOf[AnyRef])
-             && (xs1 eq xs.tail)
-          then xs.asInstanceOf[List[U]]
-          else x1 :: xs1
-      recur(xs, 0)
+
+      @tailrec
+      def addAll(buf: ListBuffer[T], from: List[T], until: List[T]): ListBuffer[T] =
+        if from eq until then buf else addAll(buf += from.head, from.tail, until)
+
+      @tailrec
+      def loopWithBuffer(buf: ListBuffer[U], explore: List[T], idx: Int): List[U] = explore match
+        case Nil       => buf.toList
+        case t :: rest => loopWithBuffer(buf += f(t, idx), rest, idx + 1)
+
+      @tailrec
+      def loop(keep: List[T], explore: List[T], idx: Int): List[U] = explore match
+        case Nil => keep.asInstanceOf[List[U]]
+        case t :: rest =>
+          val u = f(t, idx)
+          if u.asInstanceOf[AnyRef] eq t.asInstanceOf[AnyRef] then
+            loop(keep, rest, idx + 1)
+          else
+            val buf = addAll(new ListBuffer[T], keep, explore).asInstanceOf[ListBuffer[U]]
+            loopWithBuffer(buf += u, rest, idx + 1)
+
+      loop(xs, xs, 0)
+    end mapWithIndexConserve
 
     final def hasSameLengthAs[U](ys: List[U]): Boolean = {
       @tailrec def loop(xs: List[T], ys: List[U]): Boolean =
@@ -278,4 +291,3 @@ object Decorators {
     def binarySearch(x: T): Int = java.util.Arrays.binarySearch(arr.asInstanceOf[Array[Object]], x)
 
 }
-
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
index 70eebc750521..794119cd7a79 100644
--- a/compiler/src/dotty/tools/dotc/core/Definitions.scala
+++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -49,7 +49,10 @@ class Definitions {
   private def newPermanentClassSymbol(owner: Symbol, name: TypeName, flags: FlagSet, infoFn: ClassSymbol => Type) =
     newClassSymbol(owner, name, flags | Permanent | NoInits | Open, infoFn)
 
-  private def enterCompleteClassSymbol(owner: Symbol, name: TypeName, flags: FlagSet, parents: List[TypeRef], decls: Scope = newScope) =
+  private def enterCompleteClassSymbol(owner: Symbol, name: TypeName, flags: FlagSet, parents: List[TypeRef]): ClassSymbol =
+    enterCompleteClassSymbol(owner, name, flags, parents, newScope(owner.nestingLevel + 1))
+
+  private def enterCompleteClassSymbol(owner: Symbol, name: TypeName, flags: FlagSet, parents: List[TypeRef], decls: Scope) =
     newCompleteClassSymbol(owner, name, flags | Permanent | NoInits | Open, parents, decls).entered
 
   private def enterTypeField(cls: ClassSymbol, name: TypeName, flags: FlagSet, scope: MutableScope) =
@@ -133,8 +136,7 @@ class Definitions {
           ClassInfo(ScalaPackageClass.thisType, cls, ObjectType :: Nil, decls)
       }
     }
-    val flags0 = Trait | NoInits
-    val flags = if (name.isContextFunction) flags0 | Final else flags0
+    val flags = Trait | NoInits
     newPermanentClassSymbol(ScalaPackageClass, name, flags, completer)
   }
 
@@ -234,6 +236,7 @@ class Definitions {
     @tu lazy val Compiletime_constValue   : Symbol = CompiletimePackageClass.requiredMethod("constValue")
     @tu lazy val Compiletime_constValueOpt: Symbol = CompiletimePackageClass.requiredMethod("constValueOpt")
     @tu lazy val Compiletime_summonFrom   : Symbol = CompiletimePackageClass.requiredMethod("summonFrom")
+    @tu lazy val Compiletime_summonInline   : Symbol = CompiletimePackageClass.requiredMethod("summonInline")
   @tu lazy val CompiletimeTestingPackage: Symbol = requiredPackage("scala.compiletime.testing")
     @tu lazy val CompiletimeTesting_typeChecks: Symbol = CompiletimeTestingPackage.requiredMethod("typeChecks")
     @tu lazy val CompiletimeTesting_typeCheckErrors: Symbol = CompiletimeTestingPackage.requiredMethod("typeCheckErrors")
@@ -246,6 +249,9 @@ class Definitions {
   @tu lazy val CompiletimeOpsPackage: Symbol = requiredPackage("scala.compiletime.ops")
     @tu lazy val CompiletimeOpsAnyModuleClass: Symbol = requiredModule("scala.compiletime.ops.any").moduleClass
     @tu lazy val CompiletimeOpsIntModuleClass: Symbol = requiredModule("scala.compiletime.ops.int").moduleClass
+    @tu lazy val CompiletimeOpsLongModuleClass: Symbol = requiredModule("scala.compiletime.ops.long").moduleClass
+    @tu lazy val CompiletimeOpsFloatModuleClass: Symbol = requiredModule("scala.compiletime.ops.float").moduleClass
+    @tu lazy val CompiletimeOpsDoubleModuleClass: Symbol = requiredModule("scala.compiletime.ops.double").moduleClass
     @tu lazy val CompiletimeOpsStringModuleClass: Symbol = requiredModule("scala.compiletime.ops.string").moduleClass
     @tu lazy val CompiletimeOpsBooleanModuleClass: Symbol = requiredModule("scala.compiletime.ops.boolean").moduleClass
 
@@ -376,18 +382,18 @@ class Definitions {
    *       <T> void meth8(T... args) {}
    *
    *       // B.scala
-   *       meth7(1) // OK
-   *       meth8(1) // OK
+   *       meth7(1) // OK (creates a reference array)
+   *       meth8(1) // OK (creates a primitive array and copies it into a reference array at Erasure)
    *       val ai = Array[Int](1)
-   *       meth7(ai: _*) // OK (will copy the array)
-   *       meth8(ai: _*) // OK (will copy the array)
+   *       meth7(ai: _*) // OK (will copy the array at Erasure)
+   *       meth8(ai: _*) // OK (will copy the array at Erasure)
    *
    *     Java repeated arguments are erased to arrays, so it would be safe to treat
    *     them in the same way: add an `& Object` to the parameter type to disallow
    *     passing primitives, but that would be very inconvenient as it is common to
    *     want to pass a primitive to an Object repeated argument (e.g.
    *     `String.format("foo: %d", 1)`). So instead we type them _without_ adding the
-   *     `& Object` and let `ElimRepeated` take care of doing any necessary adaptation
+   *     `& Object` and let `ElimRepeated` and `Erasure` take care of doing any necessary adaptation
    *     (note that adapting a primitive array to a reference array requires
    *     copying the whole array, so this transformation only preserves semantics
    *     if the callee does not try to mutate the varargs array which is a reasonable
@@ -430,7 +436,7 @@ class Definitions {
     Any_toString, Any_##, Any_getClass, Any_isInstanceOf, Any_typeTest, Object_eq, Object_ne)
 
   @tu lazy val AnyKindClass: ClassSymbol = {
-    val cls = newCompleteClassSymbol(ScalaPackageClass, tpnme.AnyKind, AbstractFinal | Permanent, Nil)
+    val cls = newCompleteClassSymbol(ScalaPackageClass, tpnme.AnyKind, AbstractFinal | Permanent, Nil, newScope(0))
     if (!ctx.settings.YnoKindPolymorphism.value)
       // Enable kind-polymorphism by exposing scala.AnyKind
       cls.entered
@@ -441,12 +447,6 @@ class Definitions {
   @tu lazy val andType: TypeSymbol = enterBinaryAlias(tpnme.AND, AndType(_, _))
   @tu lazy val orType: TypeSymbol = enterBinaryAlias(tpnme.OR, OrType(_, _, soft = false))
 
-  /** Marker method to indicate an argument to a call-by-name parameter.
-   *  Created by byNameClosures and elimByName, eliminated by Erasure,
-   */
-  @tu lazy val cbnArg: TermSymbol = enterPolyMethod(OpsPackageClass, nme.cbnArg, 1,
-      pt => MethodType(List(FunctionOf(Nil, pt.paramRefs(0))), pt.paramRefs(0)))
-
   /** Method representing a throw */
   @tu lazy val throwMethod: TermSymbol = enterMethod(OpsPackageClass, nme.THROWkw,
       MethodType(List(ThrowableType), NothingType))
@@ -455,8 +455,9 @@ class Definitions {
     ScalaPackageClass, tpnme.Nothing, AbstractFinal, List(AnyType))
   def NothingType: TypeRef = NothingClass.typeRef
   @tu lazy val NullClass: ClassSymbol = {
-    val parent = if ctx.explicitNulls then AnyType else ObjectType
-    enterCompleteClassSymbol(ScalaPackageClass, tpnme.Null, AbstractFinal, parent :: Nil)
+    // When explicit-nulls is enabled, Null becomes a direct subtype of Any and Matchable
+    val parents = if ctx.explicitNulls then AnyType :: MatchableType :: Nil else ObjectType :: Nil
+    enterCompleteClassSymbol(ScalaPackageClass, tpnme.Null, AbstractFinal, parents)
   }
   def NullType: TypeRef = NullClass.typeRef
 
@@ -656,8 +657,11 @@ class Definitions {
 
   // in scalac modified to have Any as parent
 
-  @tu lazy val ThrowableType: TypeRef          = requiredClassRef("java.lang.Throwable")
-  def ThrowableClass(using Context): ClassSymbol = ThrowableType.symbol.asClass
+  @tu lazy val ThrowableType: TypeRef             = requiredClassRef("java.lang.Throwable")
+  def ThrowableClass(using Context): ClassSymbol  = ThrowableType.symbol.asClass
+  @tu lazy val ExceptionClass: ClassSymbol        = requiredClass("java.lang.Exception")
+  @tu lazy val RuntimeExceptionClass: ClassSymbol = requiredClass("java.lang.RuntimeException")
+
   @tu lazy val SerializableType: TypeRef       = JavaSerializableClass.typeRef
   def SerializableClass(using Context): ClassSymbol = SerializableType.symbol.asClass
 
@@ -729,6 +733,7 @@ class Definitions {
   @tu lazy val NoneModule: Symbol = requiredModule("scala.None")
 
   @tu lazy val EnumClass: ClassSymbol = requiredClass("scala.reflect.Enum")
+    @tu lazy val Enum_ordinal: Symbol = EnumClass.requiredMethod(nme.ordinal)
 
   @tu lazy val EnumValueSerializationProxyClass: ClassSymbol = requiredClass("scala.runtime.EnumValueSerializationProxy")
     @tu lazy val EnumValueSerializationProxyConstructor: TermSymbol =
@@ -761,6 +766,13 @@ class Definitions {
   @tu lazy val LanguageDeprecatedModule: Symbol = requiredModule("scala.language.deprecated")
   @tu lazy val NonLocalReturnControlClass: ClassSymbol = requiredClass("scala.runtime.NonLocalReturnControl")
   @tu lazy val SelectableClass: ClassSymbol = requiredClass("scala.Selectable")
+  @tu lazy val WithoutPreciseParameterTypesClass: Symbol = requiredClass("scala.Selectable.WithoutPreciseParameterTypes")
+
+  @tu lazy val ManifestClass: ClassSymbol = requiredClass("scala.reflect.Manifest")
+  @tu lazy val ManifestFactoryModule: Symbol = requiredModule("scala.reflect.ManifestFactory")
+  @tu lazy val ClassManifestFactoryModule: Symbol = requiredModule("scala.reflect.ClassManifestFactory")
+  @tu lazy val OptManifestClass: ClassSymbol = requiredClass("scala.reflect.OptManifest")
+  @tu lazy val NoManifestModule: Symbol = requiredModule("scala.reflect.NoManifest")
 
   @tu lazy val ReflectPackageClass: Symbol = requiredPackage("scala.reflect.package").moduleClass
   @tu lazy val ClassTagClass: ClassSymbol = requiredClass("scala.reflect.ClassTag")
@@ -822,6 +834,9 @@ class Definitions {
       val methodName = if CanEqualClass.name == tpnme.Eql then nme.eqlAny else nme.canEqualAny
       CanEqualClass.companionModule.requiredMethod(methodName)
 
+  @tu lazy val CanThrowClass: ClassSymbol = requiredClass("scala.CanThrow")
+  @tu lazy val throwsAlias: Symbol = ScalaRuntimePackageVal.requiredType(tpnme.THROWS)
+
   @tu lazy val TypeBoxClass: ClassSymbol = requiredClass("scala.runtime.TypeBox")
     @tu lazy val TypeBox_CAP: TypeSymbol = TypeBoxClass.requiredType(tpnme.CAP)
 
@@ -886,13 +901,16 @@ class Definitions {
   @tu lazy val BodyAnnot: ClassSymbol = requiredClass("scala.annotation.internal.Body")
   @tu lazy val ChildAnnot: ClassSymbol = requiredClass("scala.annotation.internal.Child")
   @tu lazy val ContextResultCountAnnot: ClassSymbol = requiredClass("scala.annotation.internal.ContextResultCount")
+  @tu lazy val ProvisionalSuperClassAnnot: ClassSymbol = requiredClass("scala.annotation.internal.ProvisionalSuperClass")
   @tu lazy val DeprecatedAnnot: ClassSymbol = requiredClass("scala.deprecated")
   @tu lazy val ImplicitAmbiguousAnnot: ClassSymbol = requiredClass("scala.annotation.implicitAmbiguous")
   @tu lazy val ImplicitNotFoundAnnot: ClassSymbol = requiredClass("scala.annotation.implicitNotFound")
   @tu lazy val InlineParamAnnot: ClassSymbol = requiredClass("scala.annotation.internal.InlineParam")
+  @tu lazy val ErasedParamAnnot: ClassSymbol = requiredClass("scala.annotation.internal.ErasedParam")
   @tu lazy val InvariantBetweenAnnot: ClassSymbol = requiredClass("scala.annotation.internal.InvariantBetween")
   @tu lazy val MainAnnot: ClassSymbol = requiredClass("scala.main")
   @tu lazy val MigrationAnnot: ClassSymbol = requiredClass("scala.annotation.migration")
+  @tu lazy val NowarnAnnot: ClassSymbol = requiredClass("scala.annotation.nowarn")
   @tu lazy val TransparentTraitAnnot: ClassSymbol = requiredClass("scala.annotation.transparentTrait")
   @tu lazy val NativeAnnot: ClassSymbol = requiredClass("scala.native")
   @tu lazy val RepeatedAnnot: ClassSymbol = requiredClass("scala.annotation.internal.Repeated")
@@ -909,6 +927,7 @@ class Definitions {
   @tu lazy val ConstructorOnlyAnnot: ClassSymbol = requiredClass("scala.annotation.constructorOnly")
   @tu lazy val CompileTimeOnlyAnnot: ClassSymbol = requiredClass("scala.annotation.compileTimeOnly")
   @tu lazy val SwitchAnnot: ClassSymbol = requiredClass("scala.annotation.switch")
+  @tu lazy val ExperimentalAnnot: ClassSymbol = requiredClass("scala.annotation.experimental")
   @tu lazy val ThrowsAnnot: ClassSymbol = requiredClass("scala.throws")
   @tu lazy val TransientAnnot: ClassSymbol = requiredClass("scala.transient")
   @tu lazy val UncheckedAnnot: ClassSymbol = requiredClass("scala.unchecked")
@@ -923,6 +942,7 @@ class Definitions {
   @tu lazy val FunctionalInterfaceAnnot: ClassSymbol = requiredClass("java.lang.FunctionalInterface")
   @tu lazy val TargetNameAnnot: ClassSymbol = requiredClass("scala.annotation.targetName")
   @tu lazy val VarargsAnnot: ClassSymbol = requiredClass("scala.annotation.varargs")
+  @tu lazy val SinceAnnot: ClassSymbol = requiredClass("scala.annotation.since")
 
   @tu lazy val JavaRepeatableAnnot: ClassSymbol = requiredClass("java.lang.annotation.Repeatable")
 
@@ -1007,6 +1027,7 @@ class Definitions {
       else ArrayType.appliedTo(elem :: Nil)
     def unapply(tp: Type)(using Context): Option[Type] = tp.dealias match {
       case AppliedType(at, arg :: Nil) if at.isRef(ArrayType.symbol) => Some(arg)
+      case JavaArrayType(tp) if ctx.erasedTypes => Some(tp)
       case _ => None
     }
   }
@@ -1030,13 +1051,13 @@ class Definitions {
 
   /** An extractor for multi-dimensional arrays.
    *  Note that this will also extract the high bound if an
-   *  element type is a wildcard. E.g.
+   *  element type is a wildcard upper-bounded by an array. E.g.
    *
    *     Array[? <: Array[? <: Number]]
    *
    *  would match
    *
-   *     MultiArrayOf(<Number>, 2)
+   *     MultiArrayOf(<? <: Number>, 2)
    */
   object MultiArrayOf {
     def apply(elem: Type, ndims: Int)(using Context): Type =
@@ -1044,7 +1065,8 @@ class Definitions {
     def unapply(tp: Type)(using Context): Option[(Type, Int)] = tp match {
       case ArrayOf(elemtp) =>
         def recur(elemtp: Type): Option[(Type, Int)] = elemtp.dealias match {
-          case TypeBounds(lo, hi) => recur(hi)
+          case tp @ TypeBounds(lo, hi @ MultiArrayOf(finalElemTp, n)) =>
+            Some(finalElemTp, n)
           case MultiArrayOf(finalElemTp, n) => Some(finalElemTp, n + 1)
           case _ => Some(elemtp, 1)
         }
@@ -1054,22 +1076,61 @@ class Definitions {
     }
   }
 
+  object ByNameFunction:
+    def apply(tp: Type)(using Context): Type =
+      defn.ContextFunction0.typeRef.appliedTo(tp :: Nil)
+    def unapply(tp: Type)(using Context): Option[Type] = tp match
+      case tp @ AppliedType(tycon, arg :: Nil) if defn.isByNameFunctionClass(tycon.typeSymbol) =>
+        Some(arg)
+      case tp @ AnnotatedType(parent, _) =>
+        unapply(parent)
+      case _ =>
+        None
+
+  final def isByNameFunctionClass(sym: Symbol): Boolean =
+    sym eq ContextFunction0
+
+  def isByNameFunction(tp: Type)(using Context): Boolean = tp match
+    case ByNameFunction(_) => true
+    case _ => false
+
   final def isCompiletime_S(sym: Symbol)(using Context): Boolean =
     sym.name == tpnme.S && sym.owner == CompiletimeOpsIntModuleClass
 
-  private val compiletimePackageAnyTypes: Set[Name] = Set(tpnme.Equals, tpnme.NotEquals)
-  private val compiletimePackageIntTypes: Set[Name] = Set(
+  private val compiletimePackageAnyTypes: Set[Name] = Set(
+    tpnme.Equals, tpnme.NotEquals, tpnme.IsConst, tpnme.ToString
+  )
+  private val compiletimePackageNumericTypes: Set[Name] = Set(
     tpnme.Plus, tpnme.Minus, tpnme.Times, tpnme.Div, tpnme.Mod,
     tpnme.Lt, tpnme.Gt, tpnme.Ge, tpnme.Le,
-    tpnme.Abs, tpnme.Negate, tpnme.Min, tpnme.Max, tpnme.ToString,
+    tpnme.Abs, tpnme.Negate, tpnme.Min, tpnme.Max
+  )
+  private val compiletimePackageIntTypes: Set[Name] = compiletimePackageNumericTypes ++ Set[Name](
+    tpnme.ToString, // ToString is moved to ops.any and deprecated for ops.int
+    tpnme.NumberOfLeadingZeros, tpnme.ToLong, tpnme.ToFloat, tpnme.ToDouble,
+    tpnme.Xor, tpnme.BitwiseAnd, tpnme.BitwiseOr, tpnme.ASR, tpnme.LSL, tpnme.LSR
+  )
+  private val compiletimePackageLongTypes: Set[Name] = compiletimePackageNumericTypes ++ Set[Name](
+    tpnme.NumberOfLeadingZeros, tpnme.ToInt, tpnme.ToFloat, tpnme.ToDouble,
     tpnme.Xor, tpnme.BitwiseAnd, tpnme.BitwiseOr, tpnme.ASR, tpnme.LSL, tpnme.LSR
   )
+  private val compiletimePackageFloatTypes: Set[Name] = compiletimePackageNumericTypes ++ Set[Name](
+    tpnme.ToInt, tpnme.ToLong, tpnme.ToDouble
+  )
+  private val compiletimePackageDoubleTypes: Set[Name] = compiletimePackageNumericTypes ++ Set[Name](
+    tpnme.ToInt, tpnme.ToLong, tpnme.ToFloat
+  )
   private val compiletimePackageBooleanTypes: Set[Name] = Set(tpnme.Not, tpnme.Xor, tpnme.And, tpnme.Or)
-  private val compiletimePackageStringTypes: Set[Name] = Set(tpnme.Plus)
+  private val compiletimePackageStringTypes: Set[Name] = Set(
+    tpnme.Plus, tpnme.Length, tpnme.Substring, tpnme.Matches
+  )
   private val compiletimePackageOpTypes: Set[Name] =
     Set(tpnme.S)
     ++ compiletimePackageAnyTypes
     ++ compiletimePackageIntTypes
+    ++ compiletimePackageLongTypes
+    ++ compiletimePackageFloatTypes
+    ++ compiletimePackageDoubleTypes
     ++ compiletimePackageBooleanTypes
     ++ compiletimePackageStringTypes
 
@@ -1079,6 +1140,9 @@ class Definitions {
          isCompiletime_S(sym)
       || sym.owner == CompiletimeOpsAnyModuleClass && compiletimePackageAnyTypes.contains(sym.name)
       || sym.owner == CompiletimeOpsIntModuleClass && compiletimePackageIntTypes.contains(sym.name)
+      || sym.owner == CompiletimeOpsLongModuleClass && compiletimePackageLongTypes.contains(sym.name)
+      || sym.owner == CompiletimeOpsFloatModuleClass && compiletimePackageFloatTypes.contains(sym.name)
+      || sym.owner == CompiletimeOpsDoubleModuleClass && compiletimePackageDoubleTypes.contains(sym.name)
       || sym.owner == CompiletimeOpsBooleanModuleClass && compiletimePackageBooleanTypes.contains(sym.name)
       || sym.owner == CompiletimeOpsStringModuleClass && compiletimePackageStringTypes.contains(sym.name)
     )
@@ -1192,10 +1256,16 @@ class Definitions {
 
   @tu lazy val topClasses: Set[Symbol] = Set(AnyClass, MatchableClass, ObjectClass, AnyValClass)
 
+  @tu lazy val untestableClasses: Set[Symbol] = Set(NothingClass, NullClass, SingletonClass)
+
   @tu lazy val AbstractFunctionType: Array[TypeRef] = mkArityArray("scala.runtime.AbstractFunction", MaxImplementedFunctionArity, 0)
   val AbstractFunctionClassPerRun: PerRun[Array[Symbol]] = new PerRun(AbstractFunctionType.map(_.symbol.asClass))
   def AbstractFunctionClass(n: Int)(using Context): Symbol = AbstractFunctionClassPerRun()(using ctx)(n)
 
+  @tu lazy val caseClassSynthesized: List[Symbol] = List(
+    Any_hashCode, Any_equals, Any_toString, Product_canEqual, Product_productArity,
+    Product_productPrefix, Product_productElement, Product_productElementName)
+
   val LazyHolder: PerRun[Map[Symbol, Symbol]] = new PerRun({
     def holderImpl(holderType: String) = requiredClass("scala.runtime." + holderType)
     Map[Symbol, Symbol](
@@ -1237,10 +1307,12 @@ class Definitions {
     ).symbol.asClass
 
   @tu lazy val Function0_apply: Symbol = Function0.requiredMethod(nme.apply)
+  @tu lazy val ContextFunction0_apply: Symbol = ContextFunction0.requiredMethod(nme.apply)
 
   @tu lazy val Function0: Symbol = FunctionClass(0)
   @tu lazy val Function1: Symbol = FunctionClass(1)
   @tu lazy val Function2: Symbol = FunctionClass(2)
+  @tu lazy val ContextFunction0: Symbol = FunctionClass(0, isContextual = true)
 
   def FunctionType(n: Int, isContextual: Boolean = false, isErased: Boolean = false)(using Context): TypeRef =
     FunctionClass(n, isContextual && !ctx.erasedTypes, isErased).typeRef
@@ -1327,23 +1399,6 @@ class Definitions {
   def isBoxedUnitClass(cls: Symbol): Boolean =
     cls.isClass && (cls.owner eq ScalaRuntimePackageClass) && cls.name == tpnme.BoxedUnit
 
-  /** Returns the erased class of the function class `cls`
-   *    - FunctionN for N > 22 becomes FunctionXXL
-   *    - FunctionN for 22 > N >= 0 remains as FunctionN
-   *    - ContextFunctionN for N > 22 becomes FunctionXXL
-   *    - ContextFunctionN for N <= 22 becomes FunctionN
-   *    - ErasedFunctionN becomes Function0
-   *    - ImplicitErasedFunctionN becomes Function0
-   *    - anything else becomes a NoSymbol
-   */
-  def erasedFunctionClass(cls: Symbol): Symbol = {
-    val arity = scalaClassName(cls).functionArity
-    if (cls.name.isErasedFunction) FunctionClass(0)
-    else if (arity > 22) FunctionXXLClass
-    else if (arity >= 0) FunctionClass(arity)
-    else NoSymbol
-  }
-
   /** Returns the erased type of the function class `cls`
    *    - FunctionN for N > 22 becomes FunctionXXL
    *    - FunctionN for 22 > N >= 0 remains as FunctionN
@@ -1353,20 +1408,12 @@ class Definitions {
    *    - ImplicitErasedFunctionN becomes Function0
    *    - anything else becomes a NoType
    */
-  def erasedFunctionType(cls: Symbol): Type = {
+  def functionTypeErasure(cls: Symbol): Type =
     val arity = scalaClassName(cls).functionArity
-    if (cls.name.isErasedFunction) FunctionType(0)
-    else if (arity > 22) FunctionXXLClass.typeRef
-    else if (arity >= 0) FunctionType(arity)
+    if cls.name.isErasedFunction then FunctionType(0)
+    else if arity > 22 then FunctionXXLClass.typeRef
+    else if arity >= 0 then FunctionType(arity)
     else NoType
-  }
-
-  val predefClassNames: Set[Name] =
-    Set("Predef$", "DeprecatedPredef", "LowPriorityImplicits").map(_.toTypeName.unmangleClassName)
-
-  /** Is `cls` the predef module class, or a class inherited by Predef? */
-  def isPredefClass(cls: Symbol): Boolean =
-    (cls.owner eq ScalaPackageClass) && predefClassNames.contains(cls.name)
 
   private val JavaImportFns: List[RootRef] = List(
     RootRef(() => JavaLangPackageVal.termRef)
@@ -1425,6 +1472,8 @@ class Definitions {
 
   @tu lazy val SpecialClassTagClasses: Set[Symbol] = Set(UnitClass, AnyClass, AnyValClass)
 
+  @tu lazy val SpecialManifestClasses: Set[Symbol] = Set(AnyClass, AnyValClass, ObjectClass, NullClass, NothingClass)
+
   /** Classes that are known not to have an initializer irrespective of
    *  whether NoInits is set. Note: FunctionXXLClass is in this set
    *  because if it is compiled by Scala2, it does not get a NoInit flag.
@@ -1440,7 +1489,11 @@ class Definitions {
   def isPolymorphicAfterErasure(sym: Symbol): Boolean =
      (sym eq Any_isInstanceOf) || (sym eq Any_asInstanceOf) || (sym eq Object_synchronized)
 
-  def isTupleType(tp: Type)(using Context): Boolean = {
+  /** Is this type a `TupleN` type?
+   *
+   * @return true if the dealiased type of `tp` is `TupleN[T1, T2, ..., Tn]`
+   */
+  def isTupleNType(tp: Type)(using Context): Boolean = {
     val arity = tp.dealias.argInfos.length
     arity <= MaxTupleArity && TupleType(arity) != null && tp.isRef(TupleType(arity).symbol)
   }
@@ -1506,7 +1559,8 @@ class Definitions {
     new PerRun(Function2SpecializedReturnTypes.map(_.symbol))
 
   def isSpecializableFunction(cls: ClassSymbol, paramTypes: List[Type], retType: Type)(using Context): Boolean =
-    paramTypes.length <= 2 && cls.derivesFrom(FunctionClass(paramTypes.length))
+    paramTypes.length <= 2
+    && (cls.derivesFrom(FunctionClass(paramTypes.length)) || isByNameFunctionClass(cls))
     && isSpecializableFunctionSAM(paramTypes, retType)
 
   /** If the Single Abstract Method of a Function class has this type, is it specializable? */
@@ -1588,11 +1642,11 @@ class Definitions {
 
   /** If `cls` is Tuple1..Tuple22, add the corresponding *: type as last parent to `parents` */
   def adjustForTuple(cls: ClassSymbol, tparams: List[TypeSymbol], parents: List[Type]): List[Type] = {
-    def syntheticParent(tparams: List[TypeSymbol]): Type =
-      if (tparams.isEmpty) TupleTypeRef
-      else TypeOps.nestedPairs(tparams.map(_.typeRef))
-    if (isTupleClass(cls)) parents :+ syntheticParent(tparams)
-    else parents
+    if !isTupleClass(cls) then parents
+    else if tparams.isEmpty then parents :+ TupleTypeRef
+    else
+      assert(parents.head.typeSymbol == ObjectClass)
+      TypeOps.nestedPairs(tparams.map(_.typeRef)) :: parents.tail
   }
 
   /** If it is BoxedUnit, remove `java.io.Serializable` from `parents`. */
@@ -1699,6 +1753,20 @@ class Definitions {
     else sys.error(s"Not a primitive value type: $tp")
   }.typeRef
 
+  def unboxedType(tp: Type)(using Context): TypeRef = {
+    val cls = tp.classSymbol
+    if (cls eq BoxedByteClass)         ByteType
+    else if (cls eq BoxedShortClass)   ShortType
+    else if (cls eq BoxedCharClass)    CharType
+    else if (cls eq BoxedIntClass)     IntType
+    else if (cls eq BoxedLongClass)    LongType
+    else if (cls eq BoxedFloatClass)   FloatType
+    else if (cls eq BoxedDoubleClass)  DoubleType
+    else if (cls eq BoxedUnitClass)    UnitType
+    else if (cls eq BoxedBooleanClass) BooleanType
+    else sys.error(s"Not a boxed primitive value type: $tp")
+  }
+
   /** The JVM tag for `tp` if it's a primitive, `java.lang.Object` otherwise. */
   def typeTag(tp: Type)(using Context): Name = typeTags(scalaClassName(tp))
 
@@ -1731,6 +1799,7 @@ class Definitions {
       .updated(SingletonClass, ObjectClass)
       .updated(TupleClass, ProductClass)
       .updated(NonEmptyTupleClass, ProductClass)
+      .updated(PairClass, ObjectClass)
 
   // ----- Initialization ---------------------------------------------------
 
@@ -1774,7 +1843,7 @@ class Definitions {
   }
 
   def addSyntheticSymbolsComments(using Context): Unit =
-    def add(sym: Symbol, doc: String) = ctx.docCtx.get.addDocstring(sym, Some(Comment(NoSpan, doc)))
+    def add(sym: Symbol, doc: String) = ctx.docCtx.foreach(_.addDocstring(sym, Some(Comment(NoSpan, doc))))
 
     add(AnyClass,
     """/** Class `Any` is the root of the Scala class hierarchy.  Every class in a Scala
diff --git a/compiler/src/dotty/tools/dotc/core/Denotations.scala b/compiler/src/dotty/tools/dotc/core/Denotations.scala
index f3c547697dec..d97ae8ca2f6e 100644
--- a/compiler/src/dotty/tools/dotc/core/Denotations.scala
+++ b/compiler/src/dotty/tools/dotc/core/Denotations.scala
@@ -791,8 +791,6 @@ object Denotations {
       val currentPeriod = ctx.period
       val valid = myValidFor
 
-      def signalError() = println(s"error while transforming $this")
-
       def assertNotPackage(d: SingleDenotation, transformer: DenotTransformer) = d match
         case d: ClassDenotation =>
           assert(!d.is(Package), s"illegal transformation of package denotation by transformer $transformer")
@@ -836,7 +834,7 @@ object Denotations {
                 // To work correctly, we need to demand that the context with the new phase
                 // is not retained in the result.
             catch case ex: CyclicReference =>
-              signalError()
+              // println(s"error while transforming $this")
               throw ex
             finally
               mutCtx.setPeriod(savedPeriod)
@@ -1023,7 +1021,7 @@ object Denotations {
      *  erasure (see i8615b, i9109b), Erasure takes care of adding any necessary
      *  bridge to make this work at runtime.
      */
-    def matchesLoosely(other: SingleDenotation)(using Context): Boolean =
+    def matchesLoosely(other: SingleDenotation, alwaysCompareTypes: Boolean = false)(using Context): Boolean =
       if isType then true
       else
         val thisLanguage = SourceLanguage(symbol)
@@ -1033,7 +1031,7 @@ object Denotations {
         val otherSig = other.signature(commonLanguage)
         sig.matchDegree(otherSig) match
           case FullMatch =>
-            true
+            !alwaysCompareTypes || info.matches(other.info)
           case MethodNotAMethodMatch =>
             !ctx.erasedTypes && {
               // A Scala zero-parameter method and a Scala non-method always match.
diff --git a/compiler/src/dotty/tools/dotc/core/Flags.scala b/compiler/src/dotty/tools/dotc/core/Flags.scala
index 76cb45c1b28c..cb590e2384a0 100644
--- a/compiler/src/dotty/tools/dotc/core/Flags.scala
+++ b/compiler/src/dotty/tools/dotc/core/Flags.scala
@@ -233,7 +233,7 @@ object Flags {
   val (Param @ _, TermParam @ _, TypeParam @ _) = newFlags(8, "<param>")
 
   /** Labeled with `implicit` modifier (implicit value) */
-  val (Implicit @ _, ImplicitTerm @ _, _) = newFlags(9, "implicit")
+  val (Implicit @ _, ImplicitVal @ _, _) = newFlags(9, "implicit")
 
   /** Labeled with `lazy` (a lazy val) / a trait */
   val (LazyOrTrait @ _, Lazy @ _, Trait @ _) = newFlags(10, "lazy", "<trait>")
@@ -321,7 +321,7 @@ object Flags {
   val (Extension @ _, ExtensionMethod @ _, _) = newFlags(28, "<extension>")
 
   /** An inferable (`given`) parameter */
-  val (Given @ _, _, _) = newFlags(29, "given")
+  val (Given @ _, GivenVal @ _,  _) = newFlags(29, "given")
 
   /** Symbol is defined by a Java class */
   val (JavaDefined @ _, JavaDefinedVal @ _, _) = newFlags(30, "<java>")
@@ -465,7 +465,7 @@ object Flags {
     Module, Package, Deferred, Method, Case, Enum, Param, ParamAccessor,
     Scala2SpecialFlags, MutableOrOpen, Opaque, Touched, JavaStatic,
     OuterOrCovariant, LabelOrContravariant, CaseAccessor,
-    Extension, NonMember, Implicit, Given, Permanent, Synthetic,
+    Extension, NonMember, Implicit, Given, Permanent, Synthetic, Exported,
     SuperParamAliasOrScala2x, Inline, Macro, ConstructorProxy, Invisible)
 
   /** Flags that are not (re)set when completing the denotation, or, if symbol is
@@ -531,7 +531,7 @@ object Flags {
   val RetainedModuleClassFlags: FlagSet = RetainedModuleValAndClassFlags | Enum
 
   /** Flags retained in export forwarders */
-  val RetainedExportFlags = Given | Implicit | Inline
+  val RetainedExportFlags = Given | Implicit | Inline | Transparent
 
   /** Flags that apply only to classes */
   val ClassOnlyFlags = Sealed | Open | Abstract.toTypeFlags
@@ -568,6 +568,7 @@ object Flags {
   val FinalOrSealed: FlagSet                 = Final | Sealed
   val GivenOrImplicit: FlagSet               = Given | Implicit
   val GivenOrImplicitVal: FlagSet            = GivenOrImplicit.toTermFlags
+  val GivenMethod: FlagSet                   = Given | Method
   val InlineOrProxy: FlagSet                 = Inline | InlineProxy                           // An inline method or inline argument proxy */
   val InlineMethod: FlagSet                  = Inline | Method
   val InlineParam: FlagSet                   = Inline | Param
@@ -600,7 +601,6 @@ object Flags {
   val Scala2Trait: FlagSet                   = Scala2x | Trait
   val SyntheticArtifact: FlagSet             = Synthetic | Artifact
   val SyntheticCase: FlagSet                 = Synthetic | Case
-  val SyntheticGivenMethod: FlagSet          = Synthetic | Given | Method
   val SyntheticModule: FlagSet               = Synthetic | Module
   val SyntheticOpaque: FlagSet               = Synthetic | Opaque
   val SyntheticParam: FlagSet                = Synthetic | Param
diff --git a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala
index 7d84b9892057..fb1ed9acaa4f 100644
--- a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala
+++ b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala
@@ -11,6 +11,7 @@ import collection.mutable
 import printing._
 
 import scala.annotation.internal.sharable
+import scala.annotation.unused
 
 /** Represents GADT constraints currently in scope */
 sealed abstract class GadtConstraint extends Showable {
@@ -43,8 +44,8 @@ sealed abstract class GadtConstraint extends Showable {
    */
   def contains(sym: Symbol)(using Context): Boolean
 
-  def isEmpty: Boolean
-  final def nonEmpty: Boolean = !isEmpty
+  /** GADT constraint narrows bounds of at least one variable */
+  def isNarrowing: Boolean
 
   /** See [[ConstraintHandling.approximation]] */
   def approximation(sym: Symbol, fromBelow: Boolean)(using Context): Type
@@ -61,13 +62,15 @@ final class ProperGadtConstraint private(
   private var myConstraint: Constraint,
   private var mapping: SimpleIdentityMap[Symbol, TypeVar],
   private var reverseMapping: SimpleIdentityMap[TypeParamRef, Symbol],
+  private var wasConstrained: Boolean
 ) extends GadtConstraint with ConstraintHandling {
   import dotty.tools.dotc.config.Printers.{gadts, gadtsConstr}
 
   def this() = this(
     myConstraint = new OrderingConstraint(SimpleIdentityMap.empty, SimpleIdentityMap.empty, SimpleIdentityMap.empty),
     mapping = SimpleIdentityMap.empty,
-    reverseMapping = SimpleIdentityMap.empty
+    reverseMapping = SimpleIdentityMap.empty,
+    wasConstrained = false
   )
 
   /** Exposes ConstraintHandling.subsumes */
@@ -79,6 +82,11 @@ final class ProperGadtConstraint private(
     subsumes(extractConstraint(left), extractConstraint(right), extractConstraint(pre))
   }
 
+  override protected def legalBound(param: TypeParamRef, rawBound: Type, isUpper: Boolean)(using Context): Type =
+    // GADT constraints never involve wildcards and are not propagated outside
+    // the case where they're valid, so no approximating is needed.
+    rawBound
+
   override def addToConstraint(params: List[Symbol])(using Context): Boolean = {
     import NameKinds.DepParamName
 
@@ -149,20 +157,24 @@ final class ProperGadtConstraint private(
         if (ntTvar ne null) stripInternalTypeVar(ntTvar) else bound
       case _ => bound
     }
-    (
-      internalizedBound match {
-        case boundTvar: TypeVar =>
-          if (boundTvar eq symTvar) true
-          else if (isUpper) addLess(symTvar.origin, boundTvar.origin)
-          else addLess(boundTvar.origin, symTvar.origin)
-        case bound =>
-          addBoundTransitively(symTvar.origin, bound, isUpper)
-      }
-    ).showing({
+
+    val saved = constraint
+    val result = internalizedBound match
+      case boundTvar: TypeVar =>
+        if (boundTvar eq symTvar) true
+        else if (isUpper) addLess(symTvar.origin, boundTvar.origin)
+        else addLess(boundTvar.origin, symTvar.origin)
+      case bound =>
+        addBoundTransitively(symTvar.origin, bound, isUpper)
+
+    gadts.println {
       val descr = if (isUpper) "upper" else "lower"
       val op = if (isUpper) "<:" else ">:"
       i"adding $descr bound $sym $op $bound = $result"
-    }, gadts)
+    }
+
+    if constraint ne saved then wasConstrained = true
+    result
   }
 
   override def isLess(sym1: Symbol, sym2: Symbol)(using Context): Boolean =
@@ -193,6 +205,8 @@ final class ProperGadtConstraint private(
 
   override def contains(sym: Symbol)(using Context): Boolean = mapping(sym) ne null
 
+  def isNarrowing: Boolean = wasConstrained
+
   override def approximation(sym: Symbol, fromBelow: Boolean)(using Context): Type = {
     val res = approximation(tvarOrError(sym).origin, fromBelow = fromBelow)
     gadts.println(i"approximating $sym ~> $res")
@@ -202,7 +216,8 @@ final class ProperGadtConstraint private(
   override def fresh: GadtConstraint = new ProperGadtConstraint(
     myConstraint,
     mapping,
-    reverseMapping
+    reverseMapping,
+    wasConstrained
   )
 
   def restore(other: GadtConstraint): Unit = other match {
@@ -210,11 +225,10 @@ final class ProperGadtConstraint private(
       this.myConstraint = other.myConstraint
       this.mapping = other.mapping
       this.reverseMapping = other.reverseMapping
+      this.wasConstrained = other.wasConstrained
     case _ => ;
   }
 
-  override def isEmpty: Boolean = mapping.size == 0
-
   // ---- Protected/internal -----------------------------------------------
 
   override protected def constraint = myConstraint
@@ -293,7 +307,7 @@ final class ProperGadtConstraint private(
 
   override def isLess(sym1: Symbol, sym2: Symbol)(using Context): Boolean = unsupported("EmptyGadtConstraint.isLess")
 
-  override def isEmpty: Boolean = true
+  override def isNarrowing: Boolean = false
 
   override def contains(sym: Symbol)(using Context) = false
 
@@ -304,7 +318,7 @@ final class ProperGadtConstraint private(
 
   override def fresh = new ProperGadtConstraint
   override def restore(other: GadtConstraint): Unit =
-    if (!other.isEmpty) sys.error("cannot restore a non-empty GADTMap")
+    assert(!other.isNarrowing, "cannot restore a non-empty GADTMap")
 
   override def debugBoundsDescription(using Context): String = "EmptyGadtConstraint"
 
diff --git a/compiler/src/dotty/tools/dotc/core/Hashable.scala b/compiler/src/dotty/tools/dotc/core/Hashable.scala
index 1a1550183f93..713555bed517 100644
--- a/compiler/src/dotty/tools/dotc/core/Hashable.scala
+++ b/compiler/src/dotty/tools/dotc/core/Hashable.scala
@@ -19,20 +19,20 @@ object Hashable {
   /** A hash value indicating that the underlying type is not
    *  cached in uniques.
    */
-  final val NotCached = 0
+  inline val NotCached = 0
 
   /** An alternative value returned from `hash` if the
    *  computed hashCode would be `NotCached`.
    */
-  private[core] final val NotCachedAlt = Int.MinValue
+  private[core] inline val NotCachedAlt = Int.MinValue
 
   /** A value that indicates that the hash code is unknown
    */
-  private[core] final val HashUnknown = 1234
+  private[core] inline val HashUnknown = 1234
 
   /** An alternative value if computeHash would otherwise yield HashUnknown
    */
-  private[core] final val HashUnknownAlt = 4321
+  private[core] inline val HashUnknownAlt = 4321
 }
 
 trait Hashable {
diff --git a/compiler/src/dotty/tools/dotc/core/MacroClassLoader.scala b/compiler/src/dotty/tools/dotc/core/MacroClassLoader.scala
index 261b1f26a64d..e56835d59c54 100644
--- a/compiler/src/dotty/tools/dotc/core/MacroClassLoader.scala
+++ b/compiler/src/dotty/tools/dotc/core/MacroClassLoader.scala
@@ -3,6 +3,7 @@ package dotty.tools.dotc.core
 import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.util.Property
 import dotty.tools.dotc.reporting.trace
+import dotty.tools.io.ClassPath
 
 import scala.collection.mutable
 
@@ -20,8 +21,9 @@ object MacroClassLoader {
     ctx.setProperty(MacroClassLoaderKey, makeMacroClassLoader(using ctx))
 
   private def makeMacroClassLoader(using Context): ClassLoader = trace("new macro class loader") {
-    val urls = ctx.settings.classpath.value.split(java.io.File.pathSeparatorChar).map(cp => java.nio.file.Paths.get(cp).toUri.toURL)
-    val out = ctx.settings.outputDir.value.jpath.toUri.toURL // to find classes in case of suspended compilation
-    new java.net.URLClassLoader(urls :+ out, getClass.getClassLoader)
+    val entries = ClassPath.expandPath(ctx.settings.classpath.value, expandStar=true)
+    val urls = entries.map(cp => java.nio.file.Paths.get(cp).toUri.toURL).toArray
+    val out = Option(ctx.settings.outputDir.value.toURL) // to find classes in case of suspended compilation
+    new java.net.URLClassLoader(urls ++ out.toList, getClass.getClassLoader)
   }
 }
diff --git a/compiler/src/dotty/tools/dotc/core/MatchTypeTrace.scala b/compiler/src/dotty/tools/dotc/core/MatchTypeTrace.scala
new file mode 100644
index 000000000000..bc08dbc36eea
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/core/MatchTypeTrace.scala
@@ -0,0 +1,124 @@
+package dotty.tools
+package dotc
+package core
+
+import Types._, Contexts._, Symbols._, Decorators._
+import util.Property
+
+/** A utility module to produce match type reduction traces in error messages.
+ */
+object MatchTypeTrace:
+
+  private enum TraceEntry:
+    case TryReduce(scrut: Type)
+    case NoMatches(scrut: Type, cases: List[Type])
+    case Stuck(scrut: Type, stuckCase: Type, otherCases: List[Type])
+    case EmptyScrutinee(scrut: Type)
+  import TraceEntry._
+
+  private class MatchTrace:
+    var entries: List[TraceEntry] = Nil
+
+  private val MatchTrace = new Property.Key[MatchTrace]
+
+  /** Execute `op` and if it involves a failed match type reduction
+   *  return the trace of that reduction. Otherwise return the empty string.
+   */
+  def record(op: Context ?=> Any)(using Context): String =
+    val trace = new MatchTrace
+    inContext(ctx.fresh.setProperty(MatchTrace, trace)) {
+      op
+      if trace.entries.isEmpty then ""
+      else
+        i"""
+           |
+           |Note: a match type could not be fully reduced:
+           |
+           |${trace.entries.reverse.map(explainEntry)}%\n%"""
+    }
+
+  /** Are we running an operation that records a match type trace? */
+  def isRecording(using Context): Boolean =
+    ctx.property(MatchTrace).isDefined
+
+  private def matchTypeFail(entry: TraceEntry)(using Context) =
+    ctx.property(MatchTrace) match
+      case Some(trace) =>
+        trace.entries match
+          case (e: TryReduce) :: es => trace.entries = entry :: trace.entries
+          case _ =>
+      case _ =>
+
+  /** Record a failure that scrutinee `scrut` does not match any case in `cases`.
+   *  Only the first failure is recorded.
+   */
+  def noMatches(scrut: Type, cases: List[Type])(using Context) =
+    matchTypeFail(NoMatches(scrut, cases))
+
+  /** Record a failure that scrutinee `scrut` does not match `stuckCase` but is
+   *  not disjoint from it either, which means that the remaining cases `otherCases`
+   *  cannot be visited. Only the first failure is recorded.
+   */
+  def stuck(scrut: Type, stuckCase: Type, otherCases: List[Type])(using Context) =
+    matchTypeFail(Stuck(scrut, stuckCase, otherCases))
+
+  /** Record a failure that scrutinee `scrut` is provably empty.
+   *  Only the first failure is recorded.
+   */
+  def emptyScrutinee(scrut: Type)(using Context) =
+    matchTypeFail(EmptyScrutinee(scrut))
+
+  /** Record in the trace that we are trying to reduce `scrut` when performing `op`
+   *  If `op` succeeds the entry is removed after exit. If `op` fails, it stays.
+   */
+  def recurseWith(scrut: Type)(op: => Type)(using Context): Type =
+    ctx.property(MatchTrace) match
+      case Some(trace) =>
+        val prev = trace.entries
+        trace.entries = TryReduce(scrut) :: prev
+        val res = op
+        if res.exists then trace.entries = prev
+        res
+      case _ =>
+        op
+
+  private def caseText(tp: Type)(using Context): String = tp match
+    case tp: HKTypeLambda => caseText(tp.resultType)
+    case defn.MatchCase(any, body) if any eq defn.AnyType => i"case _ => $body"
+    case defn.MatchCase(pat, body) => i"case $pat => $body"
+    case _ => i"case $tp"
+
+  private def casesText(cases: List[Type])(using Context) =
+    i"${cases.map(caseText)}%\n    %"
+
+  private def explainEntry(entry: TraceEntry)(using Context): String = entry match
+    case TryReduce(scrut: Type) =>
+      i"  trying to reduce  $scrut"
+    case NoMatches(scrut, cases) =>
+      i"""  failed since selector  $scrut
+         |  matches none of the cases
+         |
+         |    ${casesText(cases)}"""
+    case EmptyScrutinee(scrut) =>
+      i"""  failed since selector  $scrut
+         |  is uninhabited (there are no values of that type)."""
+    case Stuck(scrut, stuckCase, otherCases) =>
+      val msg =
+        i"""  failed since selector  $scrut
+           |  does not match  ${caseText(stuckCase)}
+           |  and cannot be shown to be disjoint from it either."""
+      if otherCases.length == 0 then msg
+      else
+        val s = if otherCases.length == 1 then "" else "s"
+        i"""$msg
+           |  Therefore, reduction cannot advance to the remaining case$s
+           |
+           |    ${casesText(otherCases)}"""
+
+  def noMatchesText(scrut: Type, cases: List[Type])(using Context): String =
+    i"""failed since selector  $scrut
+       |matches none of the cases
+       |
+       |    ${casesText(cases)}"""
+
+end MatchTypeTrace
diff --git a/compiler/src/dotty/tools/dotc/core/Mode.scala b/compiler/src/dotty/tools/dotc/core/Mode.scala
index 05986682e924..9f5b8a9a1c05 100644
--- a/compiler/src/dotty/tools/dotc/core/Mode.scala
+++ b/compiler/src/dotty/tools/dotc/core/Mode.scala
@@ -102,9 +102,6 @@ object Mode {
   /** We are typing the body of an inline method */
   val InlineableBody: Mode = newMode(21, "InlineableBody")
 
-  /** Read comments from definitions when unpickling from TASTY */
-  val ReadComments: Mode = newMode(22, "ReadComments")
-
   /** We are synthesizing the receiver of an extension method */
   val SynthesizeExtMethodReceiver: Mode = newMode(23, "SynthesizeExtMethodReceiver")
 
diff --git a/compiler/src/dotty/tools/dotc/core/NameKinds.scala b/compiler/src/dotty/tools/dotc/core/NameKinds.scala
index e17e772de993..0e9ccecb18c8 100644
--- a/compiler/src/dotty/tools/dotc/core/NameKinds.scala
+++ b/compiler/src/dotty/tools/dotc/core/NameKinds.scala
@@ -358,14 +358,22 @@ object NameKinds {
   val ProtectedAccessorName: PrefixNameKind = new PrefixNameKind(PROTECTEDACCESSOR, "protected$")
   val InlineAccessorName: PrefixNameKind = new PrefixNameKind(INLINEACCESSOR, "inline$")
 
+  /** See `ConstraintHandling#LevelAvoidMap`. */
+  enum AvoidNameKind(tag: Int, prefix: String) extends PrefixNameKind(tag, prefix):
+    override def definesNewName = true
+    case UpperBound extends AvoidNameKind(AVOIDUPPER, "(upper)")
+    case LowerBound extends AvoidNameKind(AVOIDLOWER, "(lower)")
+    case BothBounds extends AvoidNameKind(AVOIDBOTH, "(avoid)")
+
   val BodyRetainerName: SuffixNameKind = new SuffixNameKind(BODYRETAINER, "$retainedBody")
   val FieldName: SuffixNameKind = new SuffixNameKind(FIELD, "$$local") {
       override def mkString(underlying: TermName, info: ThisInfo) = underlying.toString
   }
+  val ExplicitFieldName: SuffixNameKind = new SuffixNameKind(EXPLICITFIELD, "$field")
   val ExtMethName: SuffixNameKind = new SuffixNameKind(EXTMETH, "$extension")
   val ParamAccessorName: SuffixNameKind = new SuffixNameKind(PARAMACC, "$accessor")
   val ModuleClassName: SuffixNameKind = new SuffixNameKind(OBJECTCLASS, "$", optInfoString = "ModuleClass")
-  val ImplMethName: SuffixNameKind = new SuffixNameKind(IMPLMETH, "$")
+  val DirectMethName: SuffixNameKind = new SuffixNameKind(DIRECT, "$direct")
   val AdaptedClosureName: SuffixNameKind = new SuffixNameKind(ADAPTEDCLOSURE, "$adapted") { override def definesNewName = true }
   val SyntheticSetterName: SuffixNameKind = new SuffixNameKind(SETTER, "_$eq")
 
diff --git a/compiler/src/dotty/tools/dotc/core/NameOps.scala b/compiler/src/dotty/tools/dotc/core/NameOps.scala
index d0b7e811eb4b..fb35ac0ac91f 100644
--- a/compiler/src/dotty/tools/dotc/core/NameOps.scala
+++ b/compiler/src/dotty/tools/dotc/core/NameOps.scala
@@ -17,7 +17,7 @@ object NameOps {
   object compactify {
     lazy val md5: MessageDigest = MessageDigest.getInstance("MD5")
 
-    final val CLASSFILE_NAME_CHAR_LIMIT = 240
+    inline val CLASSFILE_NAME_CHAR_LIMIT = 240
 
     /** COMPACTIFY
      *
diff --git a/compiler/src/dotty/tools/dotc/core/NameTags.scala b/compiler/src/dotty/tools/dotc/core/NameTags.scala
index 63aea8853235..59dfaa3d437b 100644
--- a/compiler/src/dotty/tools/dotc/core/NameTags.scala
+++ b/compiler/src/dotty/tools/dotc/core/NameTags.scala
@@ -5,31 +5,40 @@ import dotty.tools.tasty.TastyFormat
 /** The possible tags of a NameKind */
 object NameTags extends TastyFormat.NameTags {
 
-  final val FLATTENED = 5       // A flat name, generated by Flatten
+  inline val FLATTENED = 5       // A flat name, generated by Flatten
 
-  final val TRAITSETTER = 6     // A Scala-2 trait setter, generated by AugmentScala2Traits
+  inline val TRAITSETTER = 6     // A Scala-2 trait setter, generated by AugmentScala2Traits
 
-  final val OUTERSELECT = 13    // A name `<num>_outer`, used by the inliner to indicate an
+  inline val OUTERSELECT = 13    // A name `<num>_outer`, used by the inliner to indicate an
                                 // outer accessor that will be filled in by ExplicitOuter.
                                 // <num> indicates the number of hops needed to select the outer field.
 
-  final val PROTECTEDACCESSOR = 24 // The name of a protected accesor `protected$<name>` created by ProtectedAccessors.
+  inline val PROTECTEDACCESSOR = 24 // The name of a protected accesor `protected$<name>` created by ProtectedAccessors.
 
-  final val INITIALIZER = 26    // A mixin initializer method
+  inline val INITIALIZER = 26    // A mixin initializer method
 
-  final val FIELD = 29          // Used by Memoize to tag the name of a class member field.
+  inline val FIELD = 29          // Used by Memoize to tag the name of a class member field.
 
-  final val EXTMETH = 30        // Used by ExtensionMethods for the name of an extension method
+  inline val EXTMETH = 30        // Used by ExtensionMethods for the name of an extension method
                                 // implementing a value class method.
 
-  final val ADAPTEDCLOSURE = 31 // Used in Erasure to adapt closures over primitive types.
+  inline val ADAPTEDCLOSURE = 31 // Used in Erasure to adapt closures over primitive types.
 
-  final val IMPLMETH = 32       // Used to define methods in implementation classes
-                                // (can probably be removed).
+  inline val DIRECT = 32         // Used to define implementations of methods with
+                                // erased context function results that can override some
+                                // other method.
 
-  final val PARAMACC = 33       // Used for a private parameter alias
+  inline val PARAMACC = 33       // Used for a private parameter alias
 
-  final val SETTER = 34         // A synthesized += suffix.
+  inline val SETTER = 34         // A synthesized += suffix.
+
+  // Name of type variables created by `ConstraintHandling#LevelAvoidMap`.
+  final val AVOIDUPPER = 35
+  final val AVOIDLOWER = 36
+  final val AVOIDBOTH = 37
+
+  inline val EXPLICITFIELD = 38  // An explicitly named field, introduce to avoid a clash
+                                 // with a regular field of the underlying name
 
   def nameTagToString(tag: Int): String = tag match {
     case UTF8 => "UTF8"
@@ -48,7 +57,7 @@ object NameTags extends TastyFormat.NameTags {
     case INITIALIZER => "INITIALIZER"
     case FIELD => "FIELD"
     case EXTMETH => "EXTMETH"
-    case IMPLMETH => "IMPLMETH"
+    case DIRECT => "DIRECT"
     case PARAMACC => "PARAMACC"
     case ADAPTEDCLOSURE => "ADAPTEDCLOSURE"
     case OBJECTCLASS => "OBJECTCLASS"
diff --git a/compiler/src/dotty/tools/dotc/core/NamerOps.scala b/compiler/src/dotty/tools/dotc/core/NamerOps.scala
index ce525fc5d827..9444270ccb05 100644
--- a/compiler/src/dotty/tools/dotc/core/NamerOps.scala
+++ b/compiler/src/dotty/tools/dotc/core/NamerOps.scala
@@ -11,15 +11,14 @@ import ast.untpd
 /** Operations that are shared between Namer and TreeUnpickler */
 object NamerOps:
 
-  /** The given type, unless `sym` is a constructor, in which case the
-   *  type of the constructed instance is returned
+  /** The type of the constructed instance is returned
+   *
+   *  @param ctor the constructor
    */
-  def effectiveResultType(sym: Symbol, paramss: List[List[Symbol]], givenTp: Type)(using Context): Type =
-    if sym.name == nme.CONSTRUCTOR then
-      paramss match
-        case TypeSymbols(tparams) :: _ => sym.owner.typeRef.appliedTo(tparams.map(_.typeRef))
-        case _ => sym.owner.typeRef
-    else givenTp
+  def effectiveResultType(ctor: Symbol, paramss: List[List[Symbol]])(using Context): Type =
+    paramss match
+      case TypeSymbols(tparams) :: _ => ctor.owner.typeRef.appliedTo(tparams.map(_.typeRef))
+      case _ => ctor.owner.typeRef
 
   /** if isConstructor, make sure it has one leading non-implicit parameter list */
   def normalizeIfConstructor(paramss: List[List[Symbol]], isConstructor: Boolean)(using Context): List[List[Symbol]] =
@@ -76,11 +75,16 @@ object NamerOps:
   /** The flags of an `apply` method that serves as a constructor proxy */
   val ApplyProxyFlags = Synthetic | ConstructorProxy | Inline | Method
 
-  /** Does symbol `cls` need constructor proxies to be generated? */
-  def needsConstructorProxies(cls: Symbol)(using Context): Boolean =
-    cls.isClass
-    && !cls.flagsUNSAFE.isOneOf(NoConstructorProxyNeededFlags)
-    && !cls.isAnonymousClass
+  /** Does symbol `sym` need constructor proxies to be generated? */
+  def needsConstructorProxies(sym: Symbol)(using Context): Boolean =
+    sym.isClass
+    && !sym.flagsUNSAFE.isOneOf(NoConstructorProxyNeededFlags)
+    && !sym.isAnonymousClass
+    ||
+    sym.isType && sym.is(Exported)
+    && sym.info.loBound.underlyingClassRef(refinementOK = false).match
+      case tref: TypeRef => tref.prefix.isStable
+      case _ => false
 
   /** The completer of a constructor proxy apply method */
   class ApplyProxyCompleter(constr: Symbol)(using Context) extends LazyType:
@@ -114,7 +118,7 @@ object NamerOps:
     }.withSourceModule(modul)
 
   /** A new symbol that is the constructor companion for class `cls` */
-  def constructorCompanion(cls: ClassSymbol)(using Context): TermSymbol =
+  def classConstructorCompanion(cls: ClassSymbol)(using Context): TermSymbol =
     val companion = newModuleSymbol(
         cls.owner, cls.name.toTermName,
         ConstructorCompanionFlags, ConstructorCompanionFlags,
@@ -125,9 +129,13 @@ object NamerOps:
     cls.registerCompanion(companion.moduleClass)
     companion
 
+  def typeConstructorCompanion(tsym: Symbol, prefix: Type, proxy: Symbol)(using Context): TermSymbol =
+    newSymbol(tsym.owner, tsym.name.toTermName,
+        ConstructorCompanionFlags | StableRealizable | Method, ExprType(prefix.select(proxy)), coord = tsym.coord)
+
   /** Add all necesssary constructor proxy symbols for members of class `cls`. This means:
    *
-   *   - if a member is a class that needs a constructor companion, add one,
+   *   - if a member is a class, or type alias, that needs a constructor companion, add one,
    *     provided no member with the same name exists.
    *   - if `cls` is a companion object of a class that needs a constructor companion,
    *     and `cls` does not already define or inherit an `apply` method,
@@ -137,12 +145,21 @@ object NamerOps:
 
     def memberExists(cls: ClassSymbol, name: TermName): Boolean =
       cls.baseClasses.exists(_.info.decls.lookupEntry(name) != null)
+
     for mbr <- cls.info.decls do
-      if needsConstructorProxies(mbr)
-         && !mbr.asClass.unforcedRegisteredCompanion.exists
-         && !memberExists(cls, mbr.name.toTermName)
-      then
-        constructorCompanion(mbr.asClass).entered
+      if needsConstructorProxies(mbr) then
+        mbr match
+          case mbr: ClassSymbol =>
+            if !mbr.unforcedRegisteredCompanion.exists
+              && !memberExists(cls, mbr.name.toTermName)
+            then
+              classConstructorCompanion(mbr).entered
+          case _ =>
+            mbr.info.loBound.underlyingClassRef(refinementOK = false) match
+              case ref: TypeRef =>
+                val proxy = ref.symbol.registeredCompanion
+                if proxy.is(ConstructorProxy) && !memberExists(cls, mbr.name.toTermName) then
+                  typeConstructorCompanion(mbr, ref.prefix, proxy).entered
 
     if cls.is(Module)
        && needsConstructorProxies(cls.linkedClass)
diff --git a/compiler/src/dotty/tools/dotc/core/Names.scala b/compiler/src/dotty/tools/dotc/core/Names.scala
index acfbd411a0ce..f12aaecdd12d 100644
--- a/compiler/src/dotty/tools/dotc/core/Names.scala
+++ b/compiler/src/dotty/tools/dotc/core/Names.scala
@@ -245,7 +245,7 @@ object Names {
       myMangledString
     }
 
-    /** If this a qualified name, split it into underlyng, last part, and separator
+    /** If this a qualified name, split it into underlying, last part, and separator
      *  Otherwise return an empty name, the name itself, and "")
      */
     def split: (TermName, TermName, String)
@@ -342,8 +342,7 @@ object Names {
 
     override def encode: SimpleName = {
       val dontEncode =
-        length >= 3 &&
-        head == '<' && last == '>' && isIdentifierStart(apply(1))
+        this == StdNames.nme.CONSTRUCTOR || this == StdNames.nme.STATIC_CONSTRUCTOR
       if (dontEncode) this else NameTransformer.encode(this)
     }
 
diff --git a/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala b/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala
index 9b1fbecc517d..1f83224cc3e7 100644
--- a/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala
+++ b/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala
@@ -24,11 +24,13 @@ object OrderingConstraint {
   type ParamOrdering = ArrayValuedMap[List[TypeParamRef]]
 
   /** A new constraint with given maps */
-  private def newConstraint(boundsMap: ParamBounds, lowerMap: ParamOrdering, upperMap: ParamOrdering)(using Context) : OrderingConstraint = {
-    val result = new OrderingConstraint(boundsMap, lowerMap, upperMap)
-    ctx.run.recordConstraintSize(result, result.boundsMap.size)
-    result
-  }
+  private def newConstraint(boundsMap: ParamBounds, lowerMap: ParamOrdering, upperMap: ParamOrdering)(using Context) : OrderingConstraint =
+    if boundsMap.isEmpty && lowerMap.isEmpty && upperMap.isEmpty then
+      empty
+    else
+      val result = new OrderingConstraint(boundsMap, lowerMap, upperMap)
+      ctx.run.recordConstraintSize(result, result.boundsMap.size)
+      result
 
   /** A lens for updating a single entry array in one of the three constraint maps */
   abstract class ConstraintLens[T <: AnyRef: ClassTag] {
@@ -132,6 +134,8 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
                          private val lowerMap : ParamOrdering,
                          private val upperMap : ParamOrdering) extends Constraint {
 
+  import UnificationDirection.*
+
   type This = OrderingConstraint
 
 // ----------- Basic indices --------------------------------------------------
@@ -280,9 +284,11 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
     var current = this
     val todos = new mutable.ListBuffer[(OrderingConstraint, TypeParamRef) => OrderingConstraint]
     var i = 0
+    val dropWildcards = AvoidWildcardsMap()
     while (i < poly.paramNames.length) {
       val param = poly.paramRefs(i)
-      val stripped = stripParams(nonParamBounds(param), todos, isUpper = true)
+      val bounds = dropWildcards(nonParamBounds(param))
+      val stripped = stripParams(bounds, todos, isUpper = true)
       current = updateEntry(current, param, stripped)
       while todos.nonEmpty do
         current = todos.head(current, param)
@@ -309,8 +315,11 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
         val r1 = recur(tp.tp1, fromBelow)
         val r2 = recur(tp.tp2, fromBelow)
         if (r1 eq tp.tp1) && (r2 eq tp.tp2) then tp
-        else if tp.isAnd then r1 & r2
-        else r1 | r2
+        else tp.match
+          case tp: OrType =>
+            TypeComparer.lub(r1, r2, isSoft = tp.isSoft)
+          case _ =>
+            r1 & r2
       case tp: TypeParamRef =>
         if tp eq param then
           if fromBelow then defn.NothingType else defn.AnyType
@@ -343,13 +352,40 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
   /** Add the fact `param1 <: param2` to the constraint `current` and propagate
    *  `<:<` relationships between parameters ("edges") but not bounds.
    */
-  private def order(current: This, param1: TypeParamRef, param2: TypeParamRef)(using Context): This =
+  def order(current: This, param1: TypeParamRef, param2: TypeParamRef, direction: UnificationDirection = NoUnification)(using Context): This =
     if (param1 == param2 || current.isLess(param1, param2)) this
     else {
       assert(contains(param1), i"$param1")
       assert(contains(param2), i"$param2")
-      val newUpper = param2 :: exclusiveUpper(param2, param1)
-      val newLower = param1 :: exclusiveLower(param1, param2)
+      val unifying = direction != NoUnification
+      val newUpper = {
+        val up = exclusiveUpper(param2, param1)
+        if unifying then
+          // Since param2 <:< param1 already holds now, filter out param1 to avoid adding
+          //   duplicated orderings.
+          val filtered = up.filterNot(_ eq param1)
+          // Only add bounds for param2 if it will be kept in the constraint after unification.
+          if direction == KeepParam2 then
+            param2 :: filtered
+          else
+            filtered
+        else
+          param2 :: up
+      }
+      val newLower = {
+        val lower = exclusiveLower(param1, param2)
+        if unifying then
+          // Similarly, filter out param2 from lowerly-ordered parameters
+          //   to avoid duplicated orderings.
+          val filtered = lower.filterNot(_ eq param2)
+          // Only add bounds for param1 if it will be kept in the constraint after unification.
+          if direction == KeepParam1 then
+            param1 :: filtered
+          else
+            filtered
+        else
+          param1 :: lower
+      }
       val current1 = newLower.foldLeft(current)(upperLens.map(this, _, _, newUpper ::: _))
       val current2 = newUpper.foldLeft(current1)(lowerLens.map(this, _, _, newLower ::: _))
       current2
@@ -373,6 +409,7 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
       Nil
 
   private def updateEntry(current: This, param: TypeParamRef, tp: Type)(using Context): This = {
+    if Config.checkNoWildcardsInConstraint then assert(!tp.containsWildcardTypes)
     var current1 = boundsLens.update(this, current, param, tp)
     tp match {
       case TypeBounds(lo, hi) =>
@@ -389,14 +426,8 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
   def updateEntry(param: TypeParamRef, tp: Type)(using Context): This =
     updateEntry(this, param, ensureNonCyclic(param, tp)).checkNonCyclic()
 
-  def addLess(param1: TypeParamRef, param2: TypeParamRef)(using Context): This =
-    order(this, param1, param2).checkNonCyclic()
-
-  def unify(p1: TypeParamRef, p2: TypeParamRef)(using Context): This =
-    val bound1 = nonParamBounds(p1).substParam(p2, p1)
-    val bound2 = nonParamBounds(p2).substParam(p2, p1)
-    val p1Bounds = bound1 & bound2
-    updateEntry(p1, p1Bounds).replace(p2, p1)
+  def addLess(param1: TypeParamRef, param2: TypeParamRef, direction: UnificationDirection)(using Context): This =
+    order(this, param1, param2, direction).checkNonCyclic()
 
 // ---------- Replacements and Removals -------------------------------------
 
@@ -451,83 +482,23 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
 
 // ----------- Joins -----------------------------------------------------
 
-  def & (other: Constraint, otherHasErrors: Boolean)(using Context): OrderingConstraint = {
-
-    def merge[T](m1: ArrayValuedMap[T], m2: ArrayValuedMap[T], join: (T, T) => T): ArrayValuedMap[T] = {
-      var merged = m1
-      def mergeArrays(xs1: Array[T], xs2: Array[T]) = {
-        val xs = xs1.clone
-        for (i <- xs.indices) xs(i) = join(xs1(i), xs2(i))
-        xs
-      }
-      m2.foreachBinding { (poly, xs2) =>
-        merged = merged.updated(poly,
-            if (m1.contains(poly)) mergeArrays(m1(poly), xs2) else xs2)
-      }
-      merged
-    }
-
-    def mergeParams(ps1: List[TypeParamRef], ps2: List[TypeParamRef]) =
-      ps2.foldLeft(ps1)((ps1, p2) => if (ps1.contains(p2)) ps1 else p2 :: ps1)
-
-    // Must be symmetric
-    def mergeEntries(e1: Type, e2: Type): Type =
-      (e1, e2) match {
-        case _ if e1 eq e2 => e1
-        case (e1: TypeBounds, e2: TypeBounds) => e1 & e2
-        case (e1: TypeBounds, _) if e1 contains e2 => e2
-        case (_, e2: TypeBounds) if e2 contains e1 => e1
-        case (tv1: TypeVar, tv2: TypeVar) if tv1 eq tv2 => e1
-        case _ =>
-          if (otherHasErrors)
-            e1
-          else
-            throw new AssertionError(i"cannot merge $this with $other, mergeEntries($e1, $e2) failed")
-      }
-
-    /** Ensure that constraint `c` does not associate different TypeVars for the
-     *  same type lambda than this constraint. Do this by renaming type lambdas
-     *  in `c` where necessary.
-     */
-    def ensureNotConflicting(c: OrderingConstraint): OrderingConstraint = {
-      def hasConflictingTypeVarsFor(tl: TypeLambda) =
-        this.typeVarOfParam(tl.paramRefs(0)) ne c.typeVarOfParam(tl.paramRefs(0))
-          // Note: Since TypeVars are allocated in bulk for each type lambda, we only
-          // have to check the first one to find out if some of them are different.
-      val conflicting = c.domainLambdas.find(tl =>
-        this.contains(tl) && hasConflictingTypeVarsFor(tl))
-      conflicting match {
-        case Some(tl) => ensureNotConflicting(c.rename(tl))
-        case None => c
-      }
-    }
-
-    val that = ensureNotConflicting(other.asInstanceOf[OrderingConstraint])
-
-    new OrderingConstraint(
-        merge(this.boundsMap, that.boundsMap, mergeEntries),
-        merge(this.lowerMap, that.lowerMap, mergeParams),
-        merge(this.upperMap, that.upperMap, mergeParams))
-  }.showing(i"constraint merge $this with $other = $result", constr)
+  def hasConflictingTypeVarsFor(tl: TypeLambda, that: Constraint): Boolean =
+    contains(tl) && that.contains(tl) &&
+    // Since TypeVars are allocated in bulk for each type lambda, we only have
+    // to check the first one to find out if some of them are different.
+    (this.typeVarOfParam(tl.paramRefs(0)) ne that.typeVarOfParam(tl.paramRefs(0)))
 
-  def rename(tl: TypeLambda)(using Context): OrderingConstraint = {
-    assert(contains(tl))
-    val tl1 = ensureFresh(tl)
-    def swapKey[T](m: ArrayValuedMap[T]) = m.remove(tl).updated(tl1, m(tl))
+  def subst(from: TypeLambda, to: TypeLambda)(using Context): OrderingConstraint =
+    def swapKey[T](m: ArrayValuedMap[T]) = m.remove(from).updated(to, m(from))
     var current = newConstraint(swapKey(boundsMap), swapKey(lowerMap), swapKey(upperMap))
-    def subst[T <: Type](x: T): T = x.subst(tl, tl1).asInstanceOf[T]
+    def subst[T <: Type](x: T): T = x.subst(from, to).asInstanceOf[T]
     current.foreachParam {(p, i) =>
       current = boundsLens.map(this, current, p, i, subst)
       current = lowerLens.map(this, current, p, i, _.map(subst))
       current = upperLens.map(this, current, p, i, _.map(subst))
     }
-    current.foreachTypeVar { tvar =>
-      val TypeParamRef(binder, n) = tvar.origin
-      if (binder eq tl) tvar.setOrigin(tl1.paramRefs(n))
-    }
     constr.println(i"renamed $this to $current")
     current.checkNonCyclic()
-  }
 
   def instType(tvar: TypeVar): Type = entry(tvar.origin) match
     case _: TypeBounds => NoType
@@ -547,6 +518,13 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
     }
     else tl
 
+  def checkConsistentVars()(using Context): Unit =
+    for param <- domainParams do
+      typeVarOfParam(param) match
+        case tvar: TypeVar =>
+          assert(tvar.origin == param, i"mismatch $tvar, $param")
+        case _ =>
+
 // ---------- Exploration --------------------------------------------------------
 
   def domainLambdas: List[TypeLambda] = boundsMap.keys
@@ -646,49 +624,10 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
     upperMap.foreachBinding((_, paramss) => paramss.foreach(_.foreach(checkClosedType(_, "upper"))))
   end checkClosed
 
-// ---------- toText -----------------------------------------------------
-
-  private def contentsToText(printer: Printer): Text =
-    //Printer.debugPrintUnique = true
-    def entryText(tp: Type) = tp match {
-      case tp: TypeBounds =>
-        tp.toText(printer)
-      case _ =>
-        " := " ~ tp.toText(printer)
-    }
-    val indent = 3
-    val uninstVarsText = " uninstantiated variables: " ~
-      Text(uninstVars.map(_.toText(printer)), ", ")
-    val constrainedText =
-      " constrained types: " ~ Text(domainLambdas map (_.toText(printer)), ", ")
-    val boundsText =
-      " bounds: " ~ {
-        val assocs =
-          for (param <- domainParams)
-          yield (" " * indent) ~ param.toText(printer) ~ entryText(entry(param))
-        Text(assocs, "\n")
-      }
-    val orderingText =
-      " ordering: " ~ {
-        val deps =
-          for {
-            param <- domainParams
-            ups = minUpper(param)
-            if ups.nonEmpty
-          }
-          yield
-            (" " * indent) ~ param.toText(printer) ~ " <: " ~
-              Text(ups.map(_.toText(printer)), ", ")
-        Text(deps, "\n")
-      }
-    //Printer.debugPrintUnique = false
-    Text.lines(List(uninstVarsText, constrainedText, boundsText, orderingText))
+// ---------- Printing -----------------------------------------------------
 
   override def toText(printer: Printer): Text =
-    Text.lines(List("Constraint(", contentsToText(printer), ")"))
-
-  def contentsToString(using Context): String =
-    contentsToText(ctx.printer).show
+    printer.toText(this)
 
   override def toString: String = {
     def entryText(tp: Type): String = tp match {
@@ -697,7 +636,7 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
     }
     val constrainedText =
       " constrained types = " + domainLambdas.mkString("\n")
-    val boundsText = domainLambdas
+    val boundsText =
       " bounds = " + {
         val assocs =
           for (param <- domainParams)
diff --git a/compiler/src/dotty/tools/dotc/core/PatternTypeConstrainer.scala b/compiler/src/dotty/tools/dotc/core/PatternTypeConstrainer.scala
index 72914ebfee11..f928ad785e2c 100644
--- a/compiler/src/dotty/tools/dotc/core/PatternTypeConstrainer.scala
+++ b/compiler/src/dotty/tools/dotc/core/PatternTypeConstrainer.scala
@@ -73,17 +73,17 @@ trait PatternTypeConstrainer { self: TypeComparer =>
    *  scrutinee and pattern types. This does not apply if the pattern type is only applied to type variables,
    *  in which case the subtyping relationship "heals" the type.
    */
-  def constrainPatternType(pat: Type, scrut: Type, widenParams: Boolean = true): Boolean = trace(i"constrainPatternType($scrut, $pat)", gadts) {
+  def constrainPatternType(pat: Type, scrut: Type, forceInvariantRefinement: Boolean = false): Boolean = trace(i"constrainPatternType($scrut, $pat)", gadts) {
 
     def classesMayBeCompatible: Boolean = {
       import Flags._
-      val patClassSym = pat.classSymbol
-      val scrutClassSym = scrut.classSymbol
-      !patClassSym.exists || !scrutClassSym.exists || {
-        if (patClassSym.is(Final)) patClassSym.derivesFrom(scrutClassSym)
-        else if (scrutClassSym.is(Final)) scrutClassSym.derivesFrom(patClassSym)
-        else if (!patClassSym.is(Flags.Trait) && !scrutClassSym.is(Flags.Trait))
-          patClassSym.derivesFrom(scrutClassSym) || scrutClassSym.derivesFrom(patClassSym)
+      val patCls = pat.classSymbol
+      val scrCls = scrut.classSymbol
+      !patCls.exists || !scrCls.exists || {
+        if (patCls.is(Final)) patCls.derivesFrom(scrCls)
+        else if (scrCls.is(Final)) scrCls.derivesFrom(patCls)
+        else if (!patCls.is(Flags.Trait) && !scrCls.is(Flags.Trait))
+          patCls.derivesFrom(scrCls) || scrCls.derivesFrom(patCls)
         else true
       }
     }
@@ -93,6 +93,14 @@ trait PatternTypeConstrainer { self: TypeComparer =>
       case tp => tp
     }
 
+    def tryConstrainSimplePatternType(pat: Type, scrut: Type) = {
+      val patCls = pat.classSymbol
+      val scrCls = scrut.classSymbol
+      patCls.exists && scrCls.exists
+      && (patCls.derivesFrom(scrCls) || scrCls.derivesFrom(patCls))
+      && constrainSimplePatternType(pat, scrut, forceInvariantRefinement)
+    }
+
     def constrainUpcasted(scrut: Type): Boolean = trace(i"constrainUpcasted($scrut)", gadts) {
       // Fold a list of types into an AndType
       def buildAndType(xs: List[Type]): Type = {
@@ -113,7 +121,7 @@ trait PatternTypeConstrainer { self: TypeComparer =>
           val andType = buildAndType(parents)
           !andType.exists || constrainPatternType(pat, andType)
         case scrut @ AppliedType(tycon: TypeRef, _) if tycon.symbol.isClass =>
-          val patClassSym = pat.classSymbol
+          val patCls = pat.classSymbol
           // find all shared parents in the inheritance hierarchy between pat and scrut
           def allParentsSharedWithPat(tp: Type, tpClassSym: ClassSymbol): List[Symbol] = {
             var parents = tpClassSym.info.parents
@@ -121,7 +129,7 @@ trait PatternTypeConstrainer { self: TypeComparer =>
               parents = parents.tail
             parents flatMap { tp =>
               val sym = tp.classSymbol.asClass
-              if patClassSym.derivesFrom(sym) then List(sym)
+              if patCls.derivesFrom(sym) then List(sym)
               else allParentsSharedWithPat(tp, sym)
             }
           }
@@ -135,19 +143,31 @@ trait PatternTypeConstrainer { self: TypeComparer =>
             case _ => NoType
           }
           if (upcasted.exists)
-            constrainSimplePatternType(pat, upcasted, widenParams) || constrainUpcasted(upcasted)
+            tryConstrainSimplePatternType(pat, upcasted) || constrainUpcasted(upcasted)
           else true
       }
     }
 
-    scrut.dealias match {
+    def dealiasDropNonmoduleRefs(tp: Type) = tp.dealias match {
+      case tp: TermRef =>
+        // we drop TermRefs that don't have a class symbol, as they can't
+        // meaningfully participate in GADT reasoning and just get in the way.
+        // Their info could, for an example, be an AndType. One example where
+        // this is important is an enum case that extends its parent and an
+        // additional trait - argument-less enum cases desugar to vals.
+        // See run/enum-Tree.scala.
+        if tp.classSymbol.exists then tp else tp.info
+      case tp => tp
+    }
+
+    dealiasDropNonmoduleRefs(scrut) match {
       case OrType(scrut1, scrut2) =>
         either(constrainPatternType(pat, scrut1), constrainPatternType(pat, scrut2))
       case AndType(scrut1, scrut2) =>
         constrainPatternType(pat, scrut1) && constrainPatternType(pat, scrut2)
       case scrut: RefinedOrRecType =>
         constrainPatternType(pat, stripRefinement(scrut))
-      case scrut => pat.dealias match {
+      case scrut => dealiasDropNonmoduleRefs(pat) match {
         case OrType(pat1, pat2) =>
           either(constrainPatternType(pat1, scrut), constrainPatternType(pat2, scrut))
         case AndType(pat1, pat2) =>
@@ -155,22 +175,23 @@ trait PatternTypeConstrainer { self: TypeComparer =>
         case pat: RefinedOrRecType =>
           constrainPatternType(stripRefinement(pat), scrut)
         case pat =>
-          constrainSimplePatternType(pat, scrut, widenParams) || classesMayBeCompatible && constrainUpcasted(scrut)
+          tryConstrainSimplePatternType(pat, scrut)
+          || classesMayBeCompatible && constrainUpcasted(scrut)
       }
     }
   }
 
   /** Constrain "simple" patterns (see `constrainPatternType`).
    *
-   *  This function attempts to modify pattern and scrutinee type s.t. the pattern must be a subtype of the scrutinee,
-   *  or otherwise it cannot possibly match. In order to do that, we:
-   *
-   *  1. Rely on `constrainPatternType` to break the actual scrutinee/pattern types into subcomponents
-   *  2. Widen type parameters of scrutinee type that are not invariantly refined (see below) by the pattern type.
-   *  3. Wrap the pattern type in a skolem to avoid overconstraining top-level abstract types in scrutinee type
-   *  4. Check that `WidenedScrutineeType <: NarrowedPatternType`
+   *  This function expects to receive two types (scrutinee and pattern), both
+   *  of which have class symbols, one of which is derived from another. If the
+   *  type "being derived from" is an applied type, it will 1) "upcast" the
+   *  deriving type to an applied type with the same constructor and 2) infer
+   *  constraints for the applied types' arguments that follow from both
+   *  types being inhabited by one value (the scrutinee).
    *
-   *  Importantly, note that the pattern type may contain type variables.
+   *  Importantly, note that the pattern type may contain type variables, which
+   *  are used to infer type arguments to Unapply trees.
    *
    *  ## Invariant refinement
    *  Essentially, we say that `D[B] extends C[B]` s.t. refines parameter `A` of `trait C[A]` invariantly if
@@ -194,8 +215,9 @@ trait PatternTypeConstrainer { self: TypeComparer =>
    *  case classes without also appropriately extending the relevant case class
    *  (see `RefChecks#checkCaseClassInheritanceInvariant`).
    */
-  def constrainSimplePatternType(patternTp: Type, scrutineeTp: Type, widenParams: Boolean): Boolean = {
+  def constrainSimplePatternType(patternTp: Type, scrutineeTp: Type, forceInvariantRefinement: Boolean): Boolean = {
     def refinementIsInvariant(tp: Type): Boolean = tp match {
+      case tp: SingletonType => true
       case tp: ClassInfo => tp.cls.is(Final) || tp.cls.is(Case)
       case tp: TypeProxy => refinementIsInvariant(tp.underlying)
       case _ => false
@@ -211,13 +233,54 @@ trait PatternTypeConstrainer { self: TypeComparer =>
         tp
     }
 
-    val widePt =
-      if migrateTo3 || refinementIsInvariant(patternTp) then scrutineeTp
-      else if widenParams then widenVariantParams(scrutineeTp)
-      else scrutineeTp
-    val narrowTp = SkolemType(patternTp)
-    trace(i"constraining simple pattern type $narrowTp <:< $widePt", gadts, res => s"$res\ngadt = ${ctx.gadt.debugBoundsDescription}") {
-      isSubType(narrowTp, widePt)
+    val patternCls = patternTp.classSymbol
+    val scrutineeCls = scrutineeTp.classSymbol
+
+    // NOTE: we already know that there is a derives-from relationship in either direction
+    val upcastPattern =
+      patternCls.derivesFrom(scrutineeCls)
+
+    val pt = if upcastPattern then patternTp.baseType(scrutineeCls) else patternTp
+    val tp = if !upcastPattern then scrutineeTp.baseType(patternCls) else scrutineeTp
+
+    val assumeInvariantRefinement =
+      migrateTo3 || forceInvariantRefinement || refinementIsInvariant(patternTp)
+
+    trace(i"constraining simple pattern type $tp >:< $pt", gadts, res => s"$res\ngadt = ${ctx.gadt.debugBoundsDescription}") {
+      (tp, pt) match {
+        case (AppliedType(tyconS, argsS), AppliedType(tyconP, argsP)) =>
+          val saved = state.constraint
+          val savedGadt = ctx.gadt.fresh
+          val result =
+            tyconS.typeParams.lazyZip(argsS).lazyZip(argsP).forall { (param, argS, argP) =>
+              val variance = param.paramVarianceSign
+              if variance != 0 && !assumeInvariantRefinement then true
+              else if argS.isInstanceOf[TypeBounds] || argP.isInstanceOf[TypeBounds] then
+                // This line was added here as a quick fix for issue #13998,
+                // to extract GADT constraints from wildcard type arguments.
+                // The proper fix would involve inspecting the bounds right here and performing the
+                // correct subtyping checks, the ones that are already performed by `isSubType` below,
+                // for the same reasons for which we stopped using `SkolemType` here to begin with
+                // (commit 10fe5374dc2d).
+                isSubType(SkolemType(patternTp), scrutineeTp)
+              else {
+                var res = true
+                if variance <  1 then res &&= isSubType(argS, argP)
+                if variance > -1 then res &&= isSubType(argP, argS)
+                res
+              }
+            }
+          if !result then
+            constraint = saved
+            ctx.gadt.restore(savedGadt)
+          result
+        case _ =>
+          // Give up if we don't get AppliedType, e.g. if we upcasted to Any.
+          // Note that this doesn't mean that patternTp, scrutineeTp cannot possibly
+          // be co-inhabited, just that we cannot extract information out of them directly
+          // and should upcast.
+          false
+      }
     }
   }
 }
diff --git a/compiler/src/dotty/tools/dotc/core/Periods.scala b/compiler/src/dotty/tools/dotc/core/Periods.scala
index d5944beedc2a..44d83dcb5278 100644
--- a/compiler/src/dotty/tools/dotc/core/Periods.scala
+++ b/compiler/src/dotty/tools/dotc/core/Periods.scala
@@ -126,18 +126,18 @@ object Periods {
 
   /** An ordinal number for compiler runs. First run has number 1. */
   type RunId = Int
-  final val NoRunId = 0
-  final val InitialRunId = 1
-  final val RunWidth = java.lang.Integer.SIZE - PhaseWidth * 2 - 1/* sign */
-  final val MaxPossibleRunId = (1 << RunWidth) - 1
+  inline val NoRunId = 0
+  inline val InitialRunId = 1
+  inline val RunWidth = java.lang.Integer.SIZE - PhaseWidth * 2 - 1/* sign */
+  inline val MaxPossibleRunId = (1 << RunWidth) - 1
 
   /** An ordinal number for phases. First phase has number 1. */
   type PhaseId = Int
-  final val NoPhaseId = 0
-  final val FirstPhaseId = 1
+  inline val NoPhaseId = 0
+  inline val FirstPhaseId = 1
 
   /** The number of bits needed to encode a phase identifier. */
-  final val PhaseWidth = 7
-  final val PhaseMask = (1 << PhaseWidth) - 1
-  final val MaxPossiblePhaseId = PhaseMask
+  inline val PhaseWidth = 7
+  inline val PhaseMask = (1 << PhaseWidth) - 1
+  inline val MaxPossiblePhaseId = PhaseMask
 }
diff --git a/compiler/src/dotty/tools/dotc/core/Phases.scala b/compiler/src/dotty/tools/dotc/core/Phases.scala
index 4646751192b4..623286d837b3 100644
--- a/compiler/src/dotty/tools/dotc/core/Phases.scala
+++ b/compiler/src/dotty/tools/dotc/core/Phases.scala
@@ -13,10 +13,12 @@ import scala.collection.mutable.ListBuffer
 import dotty.tools.dotc.transform.MegaPhase._
 import dotty.tools.dotc.transform._
 import Periods._
-import typer.{FrontEnd, RefChecks}
+import parsing.{ Parser}
+import typer.{TyperPhase, RefChecks}
 import typer.ImportInfo.withRootImports
 import ast.tpd
 import scala.annotation.internal.sharable
+import scala.util.control.NonFatal
 
 object Phases {
 
@@ -64,7 +66,6 @@ object Phases {
                            YCheckAfter: List[String])(using Context): List[Phase] = {
       val fusedPhases = ListBuffer[Phase]()
       var prevPhases: Set[String] = Set.empty
-      val YCheckAll = YCheckAfter.contains("all")
 
       var stop = false
 
@@ -106,7 +107,7 @@ object Phases {
               phase
             }
           fusedPhases += phaseToAdd
-          val shouldAddYCheck = YCheckAfter.containsPhase(phaseToAdd) || YCheckAll
+          val shouldAddYCheck = filteredPhases(i).exists(_.isCheckable) && YCheckAfter.containsPhase(phaseToAdd)
           if (shouldAddYCheck) {
             val checker = new TreeChecker
             fusedPhases += checker
@@ -194,6 +195,7 @@ object Phases {
       config.println(s"nextDenotTransformerId = ${nextDenotTransformerId.toList}")
     }
 
+    private var myParserPhase: Phase = _
     private var myTyperPhase: Phase = _
     private var myPostTyperPhase: Phase = _
     private var mySbtExtractDependenciesPhase: Phase = _
@@ -205,6 +207,7 @@ object Phases {
     private var myRefChecksPhase: Phase = _
     private var myPatmatPhase: Phase = _
     private var myElimRepeatedPhase: Phase = _
+    private var myElimByNamePhase: Phase = _
     private var myExtensionMethodsPhase: Phase = _
     private var myExplicitOuterPhase: Phase = _
     private var myGettersPhase: Phase = _
@@ -215,6 +218,7 @@ object Phases {
     private var myFlattenPhase: Phase = _
     private var myGenBCodePhase: Phase = _
 
+    final def parserPhase: Phase = myParserPhase
     final def typerPhase: Phase = myTyperPhase
     final def postTyperPhase: Phase = myPostTyperPhase
     final def sbtExtractDependenciesPhase: Phase = mySbtExtractDependenciesPhase
@@ -226,6 +230,7 @@ object Phases {
     final def refchecksPhase: Phase = myRefChecksPhase
     final def patmatPhase: Phase = myPatmatPhase
     final def elimRepeatedPhase: Phase = myElimRepeatedPhase
+    final def elimByNamePhase: Phase = myElimByNamePhase
     final def extensionMethodsPhase: Phase = myExtensionMethodsPhase
     final def explicitOuterPhase: Phase = myExplicitOuterPhase
     final def gettersPhase: Phase = myGettersPhase
@@ -239,7 +244,8 @@ object Phases {
     private def setSpecificPhases() = {
       def phaseOfClass(pclass: Class[?]) = phases.find(pclass.isInstance).getOrElse(NoPhase)
 
-      myTyperPhase = phaseOfClass(classOf[FrontEnd])
+      myParserPhase = phaseOfClass(classOf[Parser])
+      myTyperPhase = phaseOfClass(classOf[TyperPhase])
       myPostTyperPhase = phaseOfClass(classOf[PostTyper])
       mySbtExtractDependenciesPhase = phaseOfClass(classOf[sbt.ExtractDependencies])
       myPicklerPhase = phaseOfClass(classOf[Pickler])
@@ -249,6 +255,7 @@ object Phases {
       myCollectNullableFieldsPhase = phaseOfClass(classOf[CollectNullableFields])
       myRefChecksPhase = phaseOfClass(classOf[RefChecks])
       myElimRepeatedPhase = phaseOfClass(classOf[ElimRepeated])
+      myElimByNamePhase = phaseOfClass(classOf[ElimByName])
       myExtensionMethodsPhase = phaseOfClass(classOf[ExtensionMethods])
       myErasurePhase = phaseOfClass(classOf[Erasure])
       myElimErasedValueTypePhase = phaseOfClass(classOf[ElimErasedValueType])
@@ -262,6 +269,7 @@ object Phases {
     }
 
     final def isAfterTyper(phase: Phase): Boolean = phase.id > typerPhase.id
+    final def isTyper(phase: Phase): Boolean = phase.id == typerPhase.id
   }
 
   abstract class Phase {
@@ -290,7 +298,7 @@ object Phases {
     /** If set, implicit search is enabled */
     def allowsImplicitSearch: Boolean = false
 
-     /** List of names of phases that should precede this phase */
+    /** List of names of phases that should precede this phase */
     def runsAfter: Set[String] = Set.empty
 
     /** @pre `isRunnable` returns true */
@@ -313,8 +321,8 @@ object Phases {
      */
     def checkPostCondition(tree: tpd.Tree)(using Context): Unit = ()
 
-    /** Is this phase the standard typerphase? True for FrontEnd, but
-     *  not for other first phases (such as FromTasty). The predicate
+    /** Is this phase the standard typerphase? True for TyperPhase, but
+     *  not for other first phases (such as FromTasty or Parser). The predicate
      *  is tested in some places that perform checks and corrections. It's
      *  different from ctx.isAfterTyper (and cheaper to test).
      */
@@ -402,9 +410,17 @@ object Phases {
     final def iterator: Iterator[Phase] =
       Iterator.iterate(this)(_.next) takeWhile (_.hasNext)
 
+    final def monitor(doing: String)(body: => Unit)(using Context): Unit =
+      try body
+      catch
+        case NonFatal(ex) =>
+          report.echo(s"exception occurred while $doing ${ctx.compilationUnit}")
+          throw ex
+
     override def toString: String = phaseName
   }
 
+  def parserPhase(using Context): Phase                 = ctx.base.parserPhase
   def typerPhase(using Context): Phase                  = ctx.base.typerPhase
   def postTyperPhase(using Context): Phase              = ctx.base.postTyperPhase
   def sbtExtractDependenciesPhase(using Context): Phase = ctx.base.sbtExtractDependenciesPhase
@@ -414,6 +430,7 @@ object Phases {
   def firstTransformPhase(using Context): Phase         = ctx.base.firstTransformPhase
   def refchecksPhase(using Context): Phase              = ctx.base.refchecksPhase
   def elimRepeatedPhase(using Context): Phase           = ctx.base.elimRepeatedPhase
+  def elimByNamePhase(using Context): Phase             = ctx.base.elimByNamePhase
   def extensionMethodsPhase(using Context): Phase       = ctx.base.extensionMethodsPhase
   def explicitOuterPhase(using Context): Phase          = ctx.base.explicitOuterPhase
   def gettersPhase(using Context): Phase                = ctx.base.gettersPhase
diff --git a/compiler/src/dotty/tools/dotc/core/Scopes.scala b/compiler/src/dotty/tools/dotc/core/Scopes.scala
index cb5f5c55e337..ecc61530601d 100644
--- a/compiler/src/dotty/tools/dotc/core/Scopes.scala
+++ b/compiler/src/dotty/tools/dotc/core/Scopes.scala
@@ -24,19 +24,19 @@ import collection.mutable
 object Scopes {
 
   /** Maximal fill factor of hash table */
-  private final val FillFactor = 2.0/3.0
+  private inline val FillFactor = 2.0/3.0
 
   /** A hashtable is created once current size exceeds MinHash * FillFactor
    *  The initial hash table has twice that size (i.e 16).
    *  This value must be a power of two, so that the index of an element can
    *  be computed as element.hashCode & (hashTable.length - 1)
    */
-  final val MinHashedScopeSize = 8
+  inline val MinHashedScopeSize = 8
 
   /** The maximal permissible number of recursions when creating
    *  a hashtable
    */
-  private final val MaxRecursions = 1000
+  private inline val MaxRecursions = 1000
 
   /** A function that optionally produces synthesized symbols with
    *  the given name in the given context. Returns `NoSymbol` if the
@@ -75,7 +75,7 @@ object Scopes {
      */
     def size: Int
 
-    /** The number of outer scopes from which symbols are inherited */
+    /** The number of scopes enclosing this scope. */
     def nestingLevel: Int
 
     /** The symbols in this scope in the order they were entered;
@@ -193,7 +193,7 @@ object Scopes {
    *  This is necessary because when run from reflection every scope needs to have a
    *  SynchronizedScope as mixin.
    */
-  class MutableScope protected[Scopes](initElems: ScopeEntry, initSize: Int, val nestingLevel: Int = 0)
+  class MutableScope protected[Scopes](initElems: ScopeEntry, initSize: Int, val nestingLevel: Int)
       extends Scope {
 
     /** Scope shares elements with `base` */
@@ -201,7 +201,7 @@ object Scopes {
       this(base.lastEntry, base.size, base.nestingLevel + 1)
       ensureCapacity(MinHashedScopeSize)
 
-    def this() = this(null, 0, 0)
+    def this(nestingLevel: Int) = this(null, 0, nestingLevel)
 
     private[dotc] var lastEntry: ScopeEntry = initElems
 
@@ -225,7 +225,7 @@ object Scopes {
     /** Use specified synthesize for this scope */
     def useSynthesizer(s: SymbolSynthesizer): Unit = synthesize = s
 
-    protected def newScopeLikeThis(): MutableScope = new MutableScope()
+    protected def newScopeLikeThis(): MutableScope = new MutableScope(nestingLevel)
 
     /** Clone scope, taking care not to force the denotations of any symbols in the scope.
      */
@@ -257,10 +257,6 @@ object Scopes {
       e
     }
 
-    /** create and enter a scope entry */
-    protected def newScopeEntry(sym: Symbol)(using Context): ScopeEntry =
-      newScopeEntry(sym.name, sym)
-
     private def enterInHash(e: ScopeEntry)(using Context): Unit = {
       val idx = e.name.hashCode & (hashTable.length - 1)
       e.tail = hashTable(idx)
@@ -273,7 +269,11 @@ object Scopes {
       if (sym.isType && ctx.phaseId <= typerPhase.id)
         assert(lookup(sym.name) == NoSymbol,
           s"duplicate ${sym.debugString}; previous was ${lookup(sym.name).debugString}") // !!! DEBUG
-      newScopeEntry(sym)
+      enter(sym.name, sym)
+    }
+
+    final def enter[T <: Symbol](name: Name, sym: T)(using Context): T = {
+      newScopeEntry(name, sym)
       sym
     }
 
@@ -375,7 +375,7 @@ object Scopes {
       }
       if ((e eq null) && (synthesize != null)) {
         val sym = synthesize(name)
-        if (sym.exists) newScopeEntry(sym) else e
+        if (sym.exists) newScopeEntry(sym.name, sym) else e
       }
       else e
     }
@@ -411,7 +411,7 @@ object Scopes {
       var irefs = new mutable.ListBuffer[TermRef]
       var e = lastEntry
       while (e ne null) {
-        if (e.sym.isOneOf(GivenOrImplicit)) {
+        if (e.sym.isOneOf(GivenOrImplicitVal)) {
           val d = e.sym.denot
           irefs += TermRef(NoPrefix, d.symbol.asTerm).withDenot(d)
         }
@@ -440,7 +440,10 @@ object Scopes {
   }
 
   /** Create a new scope */
-  def newScope: MutableScope = new MutableScope()
+  def newScope(using Context): MutableScope =
+    new MutableScope(ctx.nestingLevel + 1)
+
+  def newScope(nestingLevel: Int): MutableScope = new MutableScope(nestingLevel)
 
   /** Create a new scope nested in another one with which it shares its elements */
   def newNestedScope(outer: Scope)(using Context): MutableScope = new MutableScope(outer)
@@ -468,8 +471,4 @@ object Scopes {
     override def lookupEntry(name: Name)(using Context): ScopeEntry = null
     override def lookupNextEntry(entry: ScopeEntry)(using Context): ScopeEntry = null
   }
-
-  /** A class for error scopes (mutable)
-   */
-  class ErrorScope(owner: Symbol) extends MutableScope
 }
diff --git a/compiler/src/dotty/tools/dotc/core/StdNames.scala b/compiler/src/dotty/tools/dotc/core/StdNames.scala
index 076010399651..f8c70176482c 100644
--- a/compiler/src/dotty/tools/dotc/core/StdNames.scala
+++ b/compiler/src/dotty/tools/dotc/core/StdNames.scala
@@ -13,33 +13,33 @@ object StdNames {
 /** Base strings from which synthetic names are derived. */
 
   object str {
-    final val SETTER_SUFFIX            = "_="
-    final val EXPAND_SEPARATOR         = "$$"
-    final val TRAIT_SETTER_SEPARATOR   = "$_setter_$"
-    final val SUPER_PREFIX             = "super$"
-    final val INITIALIZER_PREFIX       = "initial$"
-    final val AVOID_CLASH_SUFFIX       = "$_avoid_name_clash_$"
-    final val MODULE_SUFFIX            = "$"
-    final val TOPLEVEL_SUFFIX          = "$package"
-    final val NAME_JOIN                = "$"
-    final val DEFAULT_GETTER           = "$default$"
-    final val LOCALDUMMY_PREFIX        = "<local "       // owner of local blocks
-    final val ANON_CLASS               = "$anon"
-    final val ANON_FUN                 = "$anonfun"
-
-    final val REPL_SESSION_LINE  = "rs$line$"
-    final val REPL_ASSIGN_SUFFIX = "$assign"
-    final val REPL_RES_PREFIX    = "res"
-
-    final val MODULE_INSTANCE_FIELD      = "MODULE$"
-
-    final val Function                   = "Function"
-    final val ErasedFunction             = "ErasedFunction"
-    final val ContextFunction            = "ContextFunction"
-    final val ErasedContextFunction      = "ErasedContextFunction"
-    final val AbstractFunction           = "AbstractFunction"
-    final val Tuple                      = "Tuple"
-    final val Product                    = "Product"
+    inline val SETTER_SUFFIX            = "_="
+    inline val EXPAND_SEPARATOR         = "$$"
+    inline val TRAIT_SETTER_SEPARATOR   = "$_setter_$"
+    inline val SUPER_PREFIX             = "super$"
+    inline val INITIALIZER_PREFIX       = "initial$"
+    inline val AVOID_CLASH_SUFFIX       = "$_avoid_name_clash_$"
+    inline val MODULE_SUFFIX            = "$"
+    inline val TOPLEVEL_SUFFIX          = "$package"
+    inline val NAME_JOIN                = "$"
+    inline val DEFAULT_GETTER           = "$default$"
+    inline val LOCALDUMMY_PREFIX        = "<local "       // owner of local blocks
+    inline val ANON_CLASS               = "$anon"
+    inline val ANON_FUN                 = "$anonfun"
+
+    inline val REPL_SESSION_LINE  = "rs$line$"
+    inline val REPL_ASSIGN_SUFFIX = "$assign"
+    inline val REPL_RES_PREFIX    = "res"
+
+    inline val MODULE_INSTANCE_FIELD      = "MODULE$"
+
+    inline val Function                   = "Function"
+    inline val ErasedFunction             = "ErasedFunction"
+    inline val ContextFunction            = "ContextFunction"
+    inline val ErasedContextFunction      = "ErasedContextFunction"
+    inline val AbstractFunction           = "AbstractFunction"
+    inline val Tuple                      = "Tuple"
+    inline val Product                    = "Product"
 
     def sanitize(str: String): String = str.replaceAll("""[<>]""", """\$""")
   }
@@ -210,29 +210,38 @@ object StdNames {
     final val IOOBException: N       = "IndexOutOfBoundsException"
     final val FunctionXXL: N         = "FunctionXXL"
 
-    final val Abs: N        = "Abs"
-    final val And: N        = "&&"
-    final val BitwiseAnd: N = "BitwiseAnd"
-    final val BitwiseOr: N  = "BitwiseOr"
-    final val Div: N        = "/"
-    final val Equals: N     = "=="
-    final val Ge: N         = ">="
-    final val Gt: N         = ">"
-    final val Le: N         = "<="
-    final val Lt: N         = "<"
-    final val Max: N        = "Max"
-    final val Min: N        = "Min"
-    final val Minus: N      = "-"
-    final val Mod: N        = "%"
-    final val Negate: N     = "Negate"
-    final val Not: N        = "!"
-    final val NotEquals: N  = "!="
-    final val Or: N         = "||"
-    final val Plus: N       = "+"
-    final val S: N          = "S"
-    final val Times: N      = "*"
-    final val ToString: N   = "ToString"
-    final val Xor: N        = "^"
+    final val Abs: N                  = "Abs"
+    final val And: N                  = "&&"
+    final val BitwiseAnd: N           = "BitwiseAnd"
+    final val BitwiseOr: N            = "BitwiseOr"
+    final val Div: N                  = "/"
+    final val Equals: N               = "=="
+    final val Ge: N                   = ">="
+    final val Gt: N                   = ">"
+    final val IsConst: N              = "IsConst"
+    final val Le: N                   = "<="
+    final val Length: N               = "Length"
+    final val Lt: N                   = "<"
+    final val Matches: N              = "Matches"
+    final val Max: N                  = "Max"
+    final val Min: N                  = "Min"
+    final val Minus: N                = "-"
+    final val Mod: N                  = "%"
+    final val Negate: N               = "Negate"
+    final val Not: N                  = "!"
+    final val NotEquals: N            = "!="
+    final val NumberOfLeadingZeros: N = "NumberOfLeadingZeros"
+    final val Or: N                   = "||"
+    final val Plus: N                 = "+"
+    final val S: N                    = "S"
+    final val Substring: N            = "Substring"
+    final val Times: N                = "*"
+    final val ToInt: N                = "ToInt"
+    final val ToLong: N               = "ToLong"
+    final val ToFloat: N              = "ToFloat"
+    final val ToDouble: N             = "ToDouble"
+    final val ToString: N             = "ToString"
+    final val Xor: N                  = "^"
 
     final val ClassfileAnnotation: N = "ClassfileAnnotation"
     final val ClassManifest: N       = "ClassManifest"
@@ -304,6 +313,7 @@ object StdNames {
     val SPECIALIZED_INSTANCE: N     = "specInstance$"
     val THIS: N                     = "_$this"
     val TRAIT_CONSTRUCTOR: N        = "$init$"
+    val THROWS: N                   = "$throws"
     val U2EVT: N                    = "u2evt$"
     val ALLARGS: N                  = "$allArgs"
 
@@ -366,7 +376,6 @@ object StdNames {
     val EnumValue: N            = "EnumValue"
     val ExistentialTypeTree: N  = "ExistentialTypeTree"
     val Flag : N                = "Flag"
-    val floatHash: N            = "floatHash"
     val Ident: N                = "Ident"
     val Import: N               = "Import"
     val Literal: N              = "Literal"
@@ -413,6 +422,7 @@ object StdNames {
     val argv : N                = "argv"
     val arrayClass: N           = "arrayClass"
     val arrayElementClass: N    = "arrayElementClass"
+    val arrayType: N            = "arrayType"
     val arrayValue: N           = "arrayValue"
     val array_apply : N         = "array_apply"
     val array_clone : N         = "array_clone"
@@ -435,10 +445,10 @@ object StdNames {
     val bytes: N                = "bytes"
     val canEqual_ : N           = "canEqual"
     val canEqualAny : N         = "canEqualAny"
-    val cbnArg: N               = "<cbn-arg>"
     val checkInitialized: N     = "checkInitialized"
     val ClassManifestFactory: N = "ClassManifestFactory"
     val classOf: N              = "classOf"
+    val classType: N            = "classType"
     val clone_ : N              = "clone"
     val common: N               = "common"
     val compiletime : N         = "compiletime"
@@ -480,6 +490,7 @@ object StdNames {
     val find_ : N               = "find"
     val flagsFromBits : N       = "flagsFromBits"
     val flatMap: N              = "flatMap"
+    val floatHash: N            = "floatHash"
     val foreach: N              = "foreach"
     val format: N               = "format"
     val fromDigits: N           = "fromDigits"
@@ -599,6 +610,7 @@ object StdNames {
     val this_ : N               = "this"
     val thisPrefix : N          = "thisPrefix"
     val throw_ : N              = "throw"
+    val throws: N               = "throws"
     val toArray: N              = "toArray"
     val toList: N               = "toList"
     val toObjectArray : N       = "toObjectArray"
@@ -625,6 +637,7 @@ object StdNames {
     val values: N               = "values"
     val view_ : N               = "view"
     val wait_ : N               = "wait"
+    val wildcardType: N         = "wildcardType"
     val withFilter: N           = "withFilter"
     val withFilterIfRefutable: N = "withFilterIfRefutable$"
     val WorksheetWrapper: N     = "WorksheetWrapper"
@@ -660,6 +673,12 @@ object StdNames {
       final val STAR : N  = "*"
       final val TILDE: N  = "~"
 
+      // kind-projector compat symbols
+      final val MINUS_STAR  : N = "-*"
+      final val PLUS_STAR   : N = "+*"
+      final val MINUS_USCORE: N = "-_"
+      final val PLUS_USCORE : N = "+_"
+
       final val isUnary: Set[Name] = Set(MINUS, PLUS, TILDE, BANG)
     }
 
diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
index 2d71bd350b3b..2f7e3debfa6f 100644
--- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -93,10 +93,11 @@ object SymDenotations {
         if (myFlags.is(Trait)) NoInitsInterface & bodyFlags // no parents are initialized from a trait
         else NoInits & bodyFlags & parentFlags)
 
-    private def isCurrent(fs: FlagSet) =
-      fs <= (
-        if (myInfo.isInstanceOf[SymbolLoader]) FromStartFlags
-        else AfterLoadFlags)
+    def isCurrent(fs: FlagSet)(using Context): Boolean =
+      def knownFlags(info: Type): FlagSet = info match
+        case _: SymbolLoader | _: ModuleCompleter => FromStartFlags
+        case _ => AfterLoadFlags
+      !myInfo.isInstanceOf[LazyType] || fs <= knownFlags(myInfo)
 
     final def relevantFlagsFor(fs: FlagSet)(using Context) =
       if (isCurrent(fs)) myFlags else flags
@@ -407,7 +408,7 @@ object SymDenotations {
      *  @param tparams The type parameters with which the right-hand side bounds should be abstracted
      *
      */
-    def opaqueToBounds(info: Type, rhs: tpd.Tree, tparams: List[TypeParamInfo])(using Context): Type =
+    def opaqueToBounds(info: Type, rhs: tpd.Tree, tparams: List[TypeSymbol])(using Context): Type =
 
       def setAlias(tp: Type) =
         def recur(self: Type): Unit = self match
@@ -432,8 +433,8 @@ object SymDenotations {
           TypeBounds.empty
 
       info match
-        case TypeAlias(alias) if isOpaqueAlias && owner.isClass =>
-          setAlias(alias)
+        case info: AliasingBounds if isOpaqueAlias && owner.isClass =>
+          setAlias(info.alias)
           HKTypeLambda.boundsFromParams(tparams, bounds(rhs))
         case _ =>
           info
@@ -573,7 +574,7 @@ object SymDenotations {
       case _ =>
         // Otherwise, no completion is necessary, see the preconditions of `markAbsent()`.
         (myInfo `eq` NoType)
-        || is(Invisible) && !ctx.isAfterTyper
+        || is(Invisible) && ctx.isTyper
         || is(ModuleVal, butNot = Package) && moduleClass.isAbsent(canForce)
     }
 
@@ -711,6 +712,19 @@ object SymDenotations {
          }
       )
 
+    /** Do this symbol and `cls` represent a pair of a given or implicit method and
+     *  its associated class that were defined by a single definition?
+     *  This can mean one of two things:
+     *   - the method and class are defined in a structural given instance, or
+     *   - the class is an implicit class and the method is its implicit conversion.
+	 */
+    final def isCoDefinedGiven(cls: Symbol)(using Context): Boolean =
+      is(Method) && isOneOf(GivenOrImplicit)
+      && ( is(Synthetic)                 // previous scheme used in 3.0
+         || cls.isOneOf(GivenOrImplicit) // new scheme from 3.1
+         )
+      && name == cls.name.toTermName && owner == cls.owner
+
     /** Is this a denotation of a stable term (or an arbitrary type)?
       * Terms are stable if they are idempotent (as in TreeInfo.Idempotent): that is, they always return the same value,
       * if any.
@@ -916,7 +930,7 @@ object SymDenotations {
     def hasDefaultParams(using Context): Boolean =
       if ctx.erasedTypes then false
       else if is(HasDefaultParams) then true
-      else if is(NoDefaultParams) then false
+      else if is(NoDefaultParams) || !is(Method) then false
       else
         val result =
           rawParamss.nestedExists(_.is(HasDefault))
@@ -1096,6 +1110,11 @@ object SymDenotations {
       enclClass(symbol, false)
     }
 
+    /** Skips symbol that are not owned by a class */
+    def skipLocalOwners(using Context): Symbol =
+      if symbol.owner.isClass then symbol
+      else symbol.owner.skipLocalOwners
+
     /** A class that in source code would be lexically enclosing */
     final def lexicallyEnclosingClass(using Context): Symbol =
       if (!exists || isClass) symbol else owner.lexicallyEnclosingClass
@@ -1140,11 +1159,10 @@ object SymDenotations {
       else NoSymbol
 
     /** The closest enclosing extension method containing this definition,
-     *  provided the extension method appears in the same class.
+     *  including methods outside the current class.
      */
     final def enclosingExtensionMethod(using Context): Symbol =
       if this.is(ExtensionMethod) then symbol
-      else if this.isClass then NoSymbol
       else if this.exists then owner.enclosingExtensionMethod
       else NoSymbol
 
@@ -1180,11 +1198,13 @@ object SymDenotations {
      */
     final def companionModule(using Context): Symbol =
       if (is(Module)) sourceModule
+      else if registeredCompanion.isAbsent() then NoSymbol
       else registeredCompanion.sourceModule
 
     private def companionType(using Context): Symbol =
       if (is(Package)) NoSymbol
       else if (is(ModuleVal)) moduleClass.denot.companionType
+      else if registeredCompanion.isAbsent() then NoSymbol
       else registeredCompanion
 
     /** The class with the same (type-) name as this module or module class,
@@ -1457,14 +1477,6 @@ object SymDenotations {
       else if is(Contravariant) then Contravariant
       else EmptyFlags
 
-    /** The length of the owner chain of this symbol. 1 for _root_, 0 for NoSymbol */
-    def nestingLevel(using Context): Int =
-      @tailrec def recur(d: SymDenotation, n: Int): Int = d match
-        case NoDenotation => n
-        case d: ClassDenotation => d.nestingLevel + n // profit from the cache in ClassDenotation
-        case _ => recur(d.owner, n + 1)
-      recur(this, 0)
-
     /** The flags to be used for a type parameter owned by this symbol.
      *  Overridden by ClassDenotation.
      */
@@ -1591,10 +1603,10 @@ object SymDenotations {
         // children that are defined in the same file as their parents.
         def maybeChild(sym: Symbol) =
           (sym.isClass && !this.is(JavaDefined) || sym.originDenotation.is(EnumVal))
-          && !owner.is(Package)
+          && (!owner.is(Package)
              || sym.originDenotation.infoOrCompleter.match
                   case _: SymbolLoaders.SecondCompleter => sym.associatedFile == this.symbol.associatedFile
-                  case _ => false
+                  case _ => false)
 
         if owner.isClass then
           for c <- owner.info.decls.toList if maybeChild(c) do
@@ -1612,6 +1624,66 @@ object SymDenotations {
 
       annotations.collect { case Annotation.Child(child) => child }.reverse
     end children
+
+    /** Recursively assemble all children of this symbol, Preserves order of insertion.
+     */
+    final def sealedStrictDescendants(using Context): List[Symbol] =
+
+      @tailrec
+      def findLvlN(
+        explore: mutable.ArrayDeque[Symbol],
+        seen: util.HashSet[Symbol],
+        acc: mutable.ListBuffer[Symbol]
+      ): List[Symbol] =
+        if explore.isEmpty then
+          acc.toList
+        else
+          val sym      = explore.head
+          val explore1 = explore.dropInPlace(1)
+          val lvlN     = sym.children
+          val notSeen  = lvlN.filterConserve(!seen.contains(_))
+          if notSeen.isEmpty then
+            findLvlN(explore1, seen, acc)
+          else
+            findLvlN(explore1 ++= notSeen, {seen ++= notSeen; seen}, acc ++= notSeen)
+      end findLvlN
+
+      /** Scans through `explore` to see if there are recursive children.
+       *  If a symbol in `explore` has children that are not contained in
+       *  `lvl1`, fallback to `findLvlN`, or else return `lvl1`.
+       */
+      @tailrec
+      def findLvl2(
+        lvl1: List[Symbol], explore: List[Symbol], seenOrNull: util.HashSet[Symbol] | Null
+      ): List[Symbol] = explore match
+        case sym :: explore1 =>
+          val lvl2 = sym.children
+          if lvl2.isEmpty then // no children, scan rest of explore1
+            findLvl2(lvl1, explore1, seenOrNull)
+          else // check if we have seen the children before
+            val seen = // initialise the seen set if not already
+              if seenOrNull != null then seenOrNull
+              else util.HashSet.from(lvl1)
+            val notSeen = lvl2.filterConserve(!seen.contains(_))
+            if notSeen.isEmpty then // we found children, but we had already seen them, scan the rest of explore1
+              findLvl2(lvl1, explore1, seen)
+            else // found unseen recursive children, we should fallback to the loop
+              findLvlN(
+                explore = mutable.ArrayDeque.from(explore1).appendAll(notSeen),
+                seen = {seen ++= notSeen; seen},
+                acc = mutable.ListBuffer.from(lvl1).appendAll(notSeen)
+              )
+        case nil =>
+          lvl1
+      end findLvl2
+
+      val lvl1 = children
+      findLvl2(lvl1, lvl1, seenOrNull = null)
+    end sealedStrictDescendants
+
+    /** Same as `sealedStrictDescendants` but prepends this symbol as well.
+     */
+    final def sealedDescendants(using Context): List[Symbol] = this.symbol :: sealedStrictDescendants
   }
 
   /** The contents of a class definition during a period
@@ -1804,6 +1876,11 @@ object SymDenotations {
     def baseClasses(implicit onBehalf: BaseData, ctx: Context): List[ClassSymbol] =
       baseData._1
 
+    /** Like `baseClasses.length` but more efficient. */
+    def baseClassesLength(using BaseData, Context): Int =
+      // `+ 1` because the baseClassSet does not include the current class unlike baseClasses
+      baseClassSet.classIds.length + 1
+
     /** A bitset that contains the superId's of all base classes */
     private def baseClassSet(implicit onBehalf: BaseData, ctx: Context): BaseClassSet =
       baseData._2
@@ -1982,7 +2059,10 @@ object SymDenotations {
 
     override final def findMember(name: Name, pre: Type, required: FlagSet, excluded: FlagSet)(using Context): Denotation =
       val raw = if excluded.is(Private) then nonPrivateMembersNamed(name) else membersNamed(name)
-      raw.filterWithFlags(required, excluded).asSeenFrom(pre).toDenot(pre)
+      val pre1 = pre match
+        case pre: OrType => pre.widenUnion
+        case _ => pre
+      raw.filterWithFlags(required, excluded).asSeenFrom(pre1).toDenot(pre1)
 
     final def findMemberNoShadowingBasedOnFlags(name: Name, pre: Type,
         required: FlagSet = EmptyFlags, excluded: FlagSet = EmptyFlags)(using Context): Denotation =
@@ -2162,7 +2242,7 @@ object SymDenotations {
           if (keepOnly eq implicitFilter)
             if (this.is(Package)) Iterator.empty
               // implicits in package objects are added by the overriding `memberNames` in `PackageClassDenotation`
-            else info.decls.iterator.filter(_.isOneOf(GivenOrImplicit))
+            else info.decls.iterator.filter(_.isOneOf(GivenOrImplicitVal))
           else info.decls.iterator
         for (sym <- ownSyms) maybeAdd(sym.name)
         names
@@ -2235,12 +2315,6 @@ object SymDenotations {
 
     override def registeredCompanion_=(c: Symbol) =
       myCompanion = c
-
-    private var myNestingLevel = -1
-
-    override def nestingLevel(using Context) =
-      if myNestingLevel == -1 then myNestingLevel = owner.nestingLevel + 1
-      myNestingLevel
   }
 
   /** The denotation of a package class.
@@ -2479,7 +2553,7 @@ object SymDenotations {
     }
 
   private[SymDenotations] def stillValidInOwner(denot: SymDenotation)(using Context): Boolean = try
-    val owner = denot.owner.denot
+    val owner = denot.maybeOwner.denot
     stillValid(owner)
     && (
       !owner.isClass
diff --git a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala
index 26e6e659779e..83198ab65857 100644
--- a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala
+++ b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala
@@ -221,7 +221,7 @@ object SymbolLoaders {
     /** The scope of a package. This is different from a normal scope
   	 *  in that names of scope entries are kept in mangled form.
   	 */
-    final class PackageScope extends MutableScope {
+    final class PackageScope extends MutableScope(0) {
       override def newScopeEntry(name: Name, sym: Symbol)(using Context): ScopeEntry =
         super.newScopeEntry(name.mangled, sym)
 
diff --git a/compiler/src/dotty/tools/dotc/core/Symbols.scala b/compiler/src/dotty/tools/dotc/core/Symbols.scala
index d8e107852947..7f0969d55f07 100644
--- a/compiler/src/dotty/tools/dotc/core/Symbols.scala
+++ b/compiler/src/dotty/tools/dotc/core/Symbols.scala
@@ -46,7 +46,7 @@ object Symbols {
    *  @param coord  The coordinates of the symbol (a position or an index)
    *  @param id     A unique identifier of the symbol (unique per ContextBase)
    */
-  class Symbol private[Symbols] (private var myCoord: Coord, val id: Int)
+  class Symbol private[Symbols] (private var myCoord: Coord, val id: Int, val nestingLevel: Int)
     extends Designator, ParamInfo, SrcPos, printing.Showable {
 
     type ThisName <: Name
@@ -206,7 +206,7 @@ object Symbols {
     }
 
     /** Enter this symbol in its class owner after given `phase`. Create a fresh
-     *  denotation for its owner class if the class has not yet already one
+     *  denotation for its owner class if the class does not already have one
      *  that starts being valid after `phase`.
      *  @pre  Symbol is a class member
      */
@@ -232,7 +232,7 @@ object Symbols {
     }
 
     /** Remove symbol from scope of owning class after given `phase`. Create a fresh
-     *  denotation for its owner class if the class has not yet already one that starts being valid after `phase`.
+     *  denotation for its owner class if the class does not already have one that starts being valid after `phase`.
      *  @pre  Symbol is a class member
      */
     def dropAfter(phase: DenotTransformer)(using Context): Unit =
@@ -368,8 +368,8 @@ object Symbols {
   type TermSymbol = Symbol { type ThisName = TermName }
   type TypeSymbol = Symbol { type ThisName = TypeName }
 
-  class ClassSymbol private[Symbols] (coord: Coord, val assocFile: AbstractFile, id: Int)
-    extends Symbol(coord, id) {
+  class ClassSymbol private[Symbols] (coord: Coord, val assocFile: AbstractFile, id: Int, nestingLevel: Int)
+    extends Symbol(coord, id, nestingLevel) {
 
     type ThisName = TypeName
 
@@ -459,7 +459,7 @@ object Symbols {
     override protected def prefixString: String = "ClassSymbol"
   }
 
-  @sharable object NoSymbol extends Symbol(NoCoord, 0) {
+  @sharable object NoSymbol extends Symbol(NoCoord, 0, 0) {
     override def associatedFile(using Context): AbstractFile = NoSource.file
     override def recomputeDenot(lastd: SymDenotation)(using Context): SymDenotation = NoDenotation
   }
@@ -506,21 +506,6 @@ object Symbols {
   def MutableSymbolMap[T](): EqHashMap[Symbol, T] = EqHashMap[Symbol, T]()
   def MutableSymbolMap[T](initialCapacity: Int): EqHashMap[Symbol, T] = EqHashMap[Symbol, T](initialCapacity)
 
-// ---- Factory methods for symbol creation ----------------------
-//
-// All symbol creations should be done via the next two methods.
-
-  /** Create a symbol without a denotation.
-   *  Note this uses a cast instead of a direct type refinement because
-   *  it's debug-friendlier not to create an anonymous class here.
-   */
-  def newNakedSymbol[N <: Name](coord: Coord = NoCoord)(using Context): Symbol { type ThisName = N } =
-    new Symbol(coord, ctx.base.nextSymId).asInstanceOf[Symbol { type ThisName = N }]
-
-  /** Create a class symbol without a denotation. */
-  def newNakedClassSymbol(coord: Coord = NoCoord, assocFile: AbstractFile = null)(using Context): ClassSymbol =
-    new ClassSymbol(coord, assocFile, ctx.base.nextSymId)
-
 // ---- Symbol creation methods ----------------------------------
 
   /** Create a symbol from its fields (info may be lazy) */
@@ -531,20 +516,12 @@ object Symbols {
       info: Type,
       privateWithin: Symbol = NoSymbol,
       coord: Coord = NoCoord)(using Context): Symbol { type ThisName = N } = {
-    val sym = newNakedSymbol[N](coord)
+    val sym = new Symbol(coord, ctx.base.nextSymId, ctx.nestingLevel).asInstanceOf[Symbol { type ThisName = N }]
     val denot = SymDenotation(sym, owner, name, flags, info, privateWithin)
     sym.denot = denot
     sym
   }
 
-  /** Create a class symbol from a function producing its denotation */
-  def newClassSymbolDenoting(denotFn: ClassSymbol => SymDenotation,
-       coord: Coord = NoCoord, assocFile: AbstractFile = null)(using Context): ClassSymbol = {
-    val cls = newNakedClassSymbol(coord, assocFile)
-    cls.denot = denotFn(cls)
-    cls
-  }
-
   /** Create a class symbol from its non-info fields and a function
    *  producing its info (the produced info may be lazy).
    */
@@ -557,7 +534,7 @@ object Symbols {
       coord: Coord = NoCoord,
       assocFile: AbstractFile = null)(using Context): ClassSymbol
   = {
-    val cls = newNakedClassSymbol(coord, assocFile)
+    val cls = new ClassSymbol(coord, assocFile, ctx.base.nextSymId, ctx.nestingLevel)
     val denot = SymDenotation(cls, owner, name, flags, infoFn(cls), privateWithin)
     cls.denot = denot
     cls
@@ -569,7 +546,7 @@ object Symbols {
       name: TypeName,
       flags: FlagSet,
       parents: List[TypeRef],
-      decls: Scope = newScope,
+      decls: Scope,
       selfInfo: Type = NoType,
       privateWithin: Symbol = NoSymbol,
       coord: Coord = NoCoord,
@@ -587,7 +564,7 @@ object Symbols {
       name: TypeName,
       flags: FlagSet,
       parentTypes: List[Type],
-      decls: Scope = newScope,
+      decls: Scope,
       selfInfo: Type = NoType,
       privateWithin: Symbol = NoSymbol,
       coord: Coord = NoCoord,
@@ -603,7 +580,7 @@ object Symbols {
   }
 
   def newRefinedClassSymbol(coord: Coord = NoCoord)(using Context): ClassSymbol =
-    newCompleteClassSymbol(ctx.owner, tpnme.REFINE_CLASS, NonMember, parents = Nil, coord = coord)
+    newCompleteClassSymbol(ctx.owner, tpnme.REFINE_CLASS, NonMember, parents = Nil, newScope, coord = coord)
 
   /** Create a module symbol with associated module class
    *  from its non-info fields and a function producing the info
@@ -620,19 +597,15 @@ object Symbols {
       assocFile: AbstractFile = null)(using Context): TermSymbol
   = {
     val base = owner.thisType
-    val module = newNakedSymbol[TermName](coord)
-    val modcls = newNakedClassSymbol(coord, assocFile)
     val modclsFlags = clsFlags | ModuleClassCreationFlags
     val modclsName = name.toTypeName.adjustIfModuleClass(modclsFlags)
-    val cdenot = SymDenotation(
-        modcls, owner, modclsName, modclsFlags,
-        infoFn(module, modcls), privateWithin)
-    val mdenot = SymDenotation(
-        module, owner, name, modFlags | ModuleValCreationFlags,
-        if (cdenot.isCompleted) TypeRef(owner.thisType, modcls)
-        else new ModuleCompleter(modcls))
-    module.denot = mdenot
-    modcls.denot = cdenot
+    val module = newSymbol(
+      owner, name, modFlags | ModuleValCreationFlags, NoCompleter, privateWithin, coord)
+    val modcls = newClassSymbol(
+      owner, modclsName, modclsFlags, infoFn(module, _), privateWithin, coord, assocFile)
+    module.info =
+      if (modcls.isCompleted) TypeRef(owner.thisType, modcls)
+      else new ModuleCompleter(modcls)
     module
   }
 
@@ -673,7 +646,7 @@ object Symbols {
       name: TermName,
       modFlags: FlagSet = EmptyFlags,
       clsFlags: FlagSet = EmptyFlags,
-      decls: Scope = newScope)(using Context): TermSymbol =
+      decls: Scope = newScope(0))(using Context): TermSymbol =
     newCompleteModuleSymbol(
       owner, name,
       modFlags | PackageCreationFlags, clsFlags | PackageCreationFlags,
@@ -739,6 +712,10 @@ object Symbols {
       coord: Coord = NoCoord)(using Context): TermSymbol =
     newSymbol(cls, nme.CONSTRUCTOR, flags | Method, MethodType(paramNames, paramTypes, cls.typeRef), privateWithin, coord)
 
+  /** Create an anonymous function symbol */
+  def newAnonFun(owner: Symbol, info: Type, coord: Coord = NoCoord)(using Context): TermSymbol =
+    newSymbol(owner, nme.ANON_FUN, Synthetic | Method, info, coord = coord)
+
   /** Create an empty default constructor symbol for given class `cls`. */
   def newDefaultConstructor(cls: ClassSymbol)(using Context): TermSymbol =
     newConstructor(cls, EmptyFlags, Nil, Nil)
@@ -802,12 +779,13 @@ object Symbols {
       originals
     else {
       val copies: List[Symbol] = for (original <- originals) yield
-        original match {
-          case original: ClassSymbol =>
-            newNakedClassSymbol(original.coord, original.assocFile)
-          case _ =>
-            newNakedSymbol[original.ThisName](original.coord)
-        }
+        val odenot = original.denot
+        original.copy(
+          owner = ttmap.mapOwner(odenot.owner),
+          flags = odenot.flags &~ Touched,
+          info = NoCompleter,
+          privateWithin = ttmap.mapOwner(odenot.privateWithin),
+          coord = original.coord)
       val ttmap1 = ttmap.withSubstitution(originals, copies)
       originals.lazyZip(copies) foreach { (original, copy) =>
         val odenot = original.denot
@@ -818,9 +796,10 @@ object Symbols {
             val oinfo = original.info match
               case ClassInfo(pre, _, parents, decls, selfInfo) =>
                 assert(original.isClass)
+                val parents1 = parents.mapConserve(ttmap.mapType)
                 val otypeParams = original.typeParams
                 if otypeParams.isEmpty then
-                  ClassInfo(pre, copy.asClass, parents, decls.cloneScope, selfInfo)
+                  ClassInfo(pre, copy.asClass, parents1, decls.cloneScope, selfInfo)
                 else
                   // copy type params, enter other definitions unchanged
                   // type parameters need to be copied early, since other type
@@ -829,11 +808,11 @@ object Symbols {
                   val newTypeParams = mapSymbols(original.typeParams, ttmap1, mapAlways = true)
                   newTypeParams.foreach(decls1.enter)
                   for sym <- decls do if !sym.is(TypeParam) then decls1.enter(sym)
-                  val parents1 = parents.map(_.substSym(otypeParams, newTypeParams))
+                  val parents2 = parents1.map(_.substSym(otypeParams, newTypeParams))
                   val selfInfo1 = selfInfo match
                     case selfInfo: Type => selfInfo.substSym(otypeParams, newTypeParams)
                     case _ => selfInfo
-                  ClassInfo(pre, copy.asClass, parents1, decls1, selfInfo1)
+                  ClassInfo(pre, copy.asClass, parents2, decls1, selfInfo1)
               case oinfo => oinfo
 
             denot.info = oinfo // needed as otherwise we won't be able to go from Sym -> parents & etc
@@ -844,13 +823,7 @@ object Symbols {
 
         end completer
 
-        copy.denot = odenot.copySymDenotation(
-          symbol = copy,
-          owner = ttmap1.mapOwner(odenot.owner),
-          initFlags = odenot.flags &~ Touched,
-          info = completer,
-          privateWithin = ttmap1.mapOwner(odenot.privateWithin), // since this refers to outer symbols, need not include copies (from->to) in ownermap here.
-          annotations = odenot.annotations)
+        copy.info = completer
         copy.denot match
           case cd: ClassDenotation =>
             cd.registeredCompanion = cd.unforcedRegisteredCompanion.subst(originals, copies)
diff --git a/compiler/src/dotty/tools/dotc/core/TypeApplications.scala b/compiler/src/dotty/tools/dotc/core/TypeApplications.scala
index 4e360224a18f..95ad0b95b335 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeApplications.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeApplications.scala
@@ -53,7 +53,7 @@ object TypeApplications {
       || {
         val paramRefs = tparams.map(_.paramRef)
         tp.typeParams.corresponds(tparams) { (param1, param2) =>
-          param2.paramInfo <:< param1.paramInfo.substParams(tp, paramRefs)
+          param2.paramInfo frozen_<:< param1.paramInfo.substParams(tp, paramRefs)
         }
       }
 
@@ -231,6 +231,16 @@ class TypeApplications(val self: Type) extends AnyVal {
       (alias ne self) && alias.hasSimpleKind
     }
 
+  /** The top type with the same kind as `self`. */
+  def topType(using Context): Type =
+    if self.hasSimpleKind then
+      defn.AnyType
+    else EtaExpand(self.typeParams) match
+      case tp: HKTypeLambda =>
+        tp.derivedLambdaType(resType = tp.resultType.topType)
+      case _ =>
+        defn.AnyKindType
+
   /** If self type is higher-kinded, its result type, otherwise NoType.
    *  Note: The hkResult of an any-kinded type is again AnyKind.
    */
@@ -466,7 +476,8 @@ class TypeApplications(val self: Type) extends AnyVal {
   def translateJavaArrayElementType(using Context): Type =
     // A type parameter upper-bounded solely by `FromJavaObject` has `ObjectClass` as its classSymbol
     if self.typeSymbol.isAbstractOrParamType && (self.classSymbol eq defn.ObjectClass) then
-      AndType(self, defn.ObjectType)
+      // The order is important here since Java intersections erase to their first operand
+      AndType(defn.ObjectType, self)
     else
       self
 
diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
index 62b06aea39a7..8b4eab685f2a 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
@@ -4,7 +4,7 @@ package core
 
 import Types._, Contexts._, Symbols._, Flags._, Names._, NameOps._, Denotations._
 import Decorators._
-import Phases.gettersPhase
+import Phases.{gettersPhase, elimByNamePhase}
 import StdNames.nme
 import TypeOps.refineUsingParent
 import collection.mutable
@@ -63,8 +63,6 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
   private var myInstance: TypeComparer = this
   def currentInstance: TypeComparer = myInstance
 
-  private var useNecessaryEither = false
-
   /** Is a subtype check in progress? In that case we may not
    *  permanently instantiate type variables, because the corresponding
    *  constraint might still be retracted and the instantiation should
@@ -134,10 +132,10 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
   }
 
   def necessarySubType(tp1: Type, tp2: Type): Boolean =
-    val saved = useNecessaryEither
-    useNecessaryEither = true
+    val saved = myNecessaryConstraintsOnly
+    myNecessaryConstraintsOnly = true
     try topLevelSubType(tp1, tp2)
-    finally useNecessaryEither = saved
+    finally myNecessaryConstraintsOnly = saved
 
   def testSubType(tp1: Type, tp2: Type): CompareResult =
     GADTused = false
@@ -162,13 +160,24 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
 
   private inline def inFrozenGadtIf[T](cond: Boolean)(inline op: T): T = {
     val savedFrozenGadt = frozenGadt
-    frozenGadt = cond
+    frozenGadt ||= cond
     try op finally frozenGadt = savedFrozenGadt
   }
 
   private inline def inFrozenGadtAndConstraint[T](inline op: T): T =
     inFrozenGadtIf(true)(inFrozenConstraint(op))
 
+  extension (sym: Symbol)
+    private inline def onGadtBounds(inline op: TypeBounds => Boolean): Boolean =
+      val bounds = gadtBounds(sym)
+      bounds != null && op(bounds)
+
+  private inline def comparingTypeLambdas(tl1: TypeLambda, tl2: TypeLambda)(op: => Boolean): Boolean =
+    val saved = comparedTypeLambdas
+    comparedTypeLambdas += tl1
+    comparedTypeLambdas += tl2
+    try op finally comparedTypeLambdas = saved
+
   protected def isSubType(tp1: Type, tp2: Type, a: ApproxState): Boolean = {
     val savedApprox = approx
     val savedLeftRoot = leftRoot
@@ -201,7 +210,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
    *  types (as when we go from an abstract type to one of its bounds). In that case
    *  one should use `isSubType(_, _, a)` where `a` defines the kind of approximation.
    *
-   *  Note: Logicaly, `recur` could be nested in `isSubType`, which would avoid
+   *  Note: Logically, `recur` could be nested in `isSubType`, which would avoid
    *  the instance state consisting `approx` and `leftRoot`. But then the implemented
    *  code would have two extra parameters for each of the many calls that go from
    *  one sub-part of isSubType to another.
@@ -465,19 +474,15 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
           case AndType(tp21, tp22) => constrainRHSVars(tp21) && constrainRHSVars(tp22)
           case _ => true
 
-        // An & on the left side loses information. We compensate by also trying the join.
-        // This is less ad-hoc than it looks since we produce joins in type inference,
-        // and then need to check that they are indeed supertypes of the original types
-        // under -Ycheck. Test case is i7965.scala.
-        def containsAnd(tp: Type): Boolean = tp.dealiasKeepRefiningAnnots match
-          case tp: AndType => true
-          case OrType(tp1, tp2) => containsAnd(tp1) || containsAnd(tp2)
-          case _ => false
-
         widenOK
         || joinOK
         || (tp1.isSoft || constrainRHSVars(tp2)) && recur(tp11, tp2) && recur(tp12, tp2)
         || containsAnd(tp1) && inFrozenGadt(recur(tp1.join, tp2))
+            // An & on the left side loses information. We compensate by also trying the join.
+            // This is less ad-hoc than it looks since we produce joins in type inference,
+            // and then need to check that they are indeed supertypes of the original types
+            // under -Ycheck. Test case is i7965.scala.
+
      case tp1: MatchType =>
         val reduced = tp1.reduced
         if (reduced.exists) recur(reduced, tp2) else thirdTry
@@ -489,11 +494,10 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
 
     def thirdTryNamed(tp2: NamedType): Boolean = tp2.info match {
       case info2: TypeBounds =>
-        def compareGADT: Boolean = {
-          val gbounds2 = gadtBounds(tp2.symbol)
-          (gbounds2 != null) &&
-            (isSubTypeWhenFrozen(tp1, gbounds2.lo) ||
-              (tp1 match {
+        def compareGADT: Boolean =
+          tp2.symbol.onGadtBounds(gbounds2 =>
+            isSubTypeWhenFrozen(tp1, gbounds2.lo)
+            || tp1.match
                 case tp1: NamedType if ctx.gadt.contains(tp1.symbol) =>
                   // Note: since we approximate constrained types only with their non-param bounds,
                   // we need to manually handle the case when we're comparing two constrained types,
@@ -502,10 +506,9 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
                   // comparing two constrained types, and that case will be handled here first.
                   ctx.gadt.isLess(tp1.symbol, tp2.symbol) && GADTusage(tp1.symbol) && GADTusage(tp2.symbol)
                 case _ => false
-              }) ||
-              narrowGADTBounds(tp2, tp1, approx, isUpper = false)) &&
-            { isBottom(tp1) || GADTusage(tp2.symbol) }
-        }
+            || narrowGADTBounds(tp2, tp1, approx, isUpper = false))
+          && (isBottom(tp1) || GADTusage(tp2.symbol))
+
         isSubApproxHi(tp1, info2.lo) || compareGADT || tryLiftedToThis2 || fourthTry
 
       case _ =>
@@ -559,31 +562,35 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
       case tp2: TypeParamRef =>
         compareTypeParamRef(tp2)
       case tp2: RefinedType =>
-        def compareRefinedSlow: Boolean = {
+        def compareRefinedSlow: Boolean =
           val name2 = tp2.refinedName
-          recur(tp1, tp2.parent) &&
-            (name2 == nme.WILDCARD || hasMatchingMember(name2, tp1, tp2))
-        }
-        def compareRefined: Boolean = {
+          recur(tp1, tp2.parent)
+          && (name2 == nme.WILDCARD || hasMatchingMember(name2, tp1, tp2))
+
+        def compareRefined: Boolean =
           val tp1w = tp1.widen
           val skipped2 = skipMatching(tp1w, tp2)
-          if ((skipped2 eq tp2) || !Config.fastPathForRefinedSubtype)
-            tp1 match {
-              case tp1: AndType =>
-                // Delay calling `compareRefinedSlow` because looking up a member
-                // of an `AndType` can lead to a cascade of subtyping checks
-                // This twist is needed to make collection/generic/ParFactory.scala compile
-                fourthTry || compareRefinedSlow
-              case tp1: HKTypeLambda =>
-                // HKTypeLambdas do not have members.
-                fourthTry
-              case _ =>
-                compareRefinedSlow || fourthTry
-            }
+          if (skipped2 eq tp2) || !Config.fastPathForRefinedSubtype then
+            if containsAnd(tp1) then
+              tp2.parent match
+                case _: RefinedType | _: AndType =>
+                  // maximally decompose RHS to limit the bad effects of the `either` that is necessary
+                  // since LHS contains an AndType
+                  recur(tp1, decomposeRefinements(tp2, Nil))
+                case _ =>
+                  // Delay calling `compareRefinedSlow` because looking up a member
+                  // of an `AndType` can lead to a cascade of subtyping checks
+                  // This twist is needed to make collection/generic/ParFactory.scala compile
+                  fourthTry || compareRefinedSlow
+            else if tp1.isInstanceOf[HKTypeLambda] then
+              // HKTypeLambdas do not have members.
+              fourthTry
+            else
+              compareRefinedSlow || fourthTry
           else // fast path, in particular for refinements resulting from parameterization.
             isSubRefinements(tp1w.asInstanceOf[RefinedType], tp2, skipped2) &&
             recur(tp1, skipped2)
-        }
+
         compareRefined
       case tp2: RecType =>
         def compareRec = tp1.safeDealias match {
@@ -616,12 +623,10 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
               migrateTo3 ||
               tp1.typeParams.corresponds(tp2.typeParams)((tparam1, tparam2) =>
                 isSubType(tparam2.paramInfo.subst(tp2, tp1), tparam1.paramInfo))
-            val saved = comparedTypeLambdas
-            comparedTypeLambdas += tp1
-            comparedTypeLambdas += tp2
-            val variancesOK = variancesConform(tp1.typeParams, tp2.typeParams)
-            try variancesOK && boundsOK && isSubType(tp1.resType, tp2.resType.subst(tp2, tp1))
-            finally comparedTypeLambdas = saved
+            comparingTypeLambdas(tp1, tp2) {
+              val variancesOK = variancesConform(tp1.typeParams, tp2.typeParams)
+              variancesOK && boundsOK && isSubType(tp1.resType, tp2.resType.subst(tp2, tp1))
+            }
           case _ =>
             val tparams1 = tp1.typeParams
             if (tparams1.nonEmpty)
@@ -691,9 +696,11 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
       case tp2: PolyType =>
         def comparePoly = tp1 match {
           case tp1: PolyType =>
-            (tp1.signature consistentParams tp2.signature) &&
-            matchingPolyParams(tp1, tp2) &&
-            isSubType(tp1.resultType, tp2.resultType.subst(tp2, tp1))
+            comparingTypeLambdas(tp1, tp2) {
+              (tp1.signature consistentParams tp2.signature)
+              && matchingPolyParams(tp1, tp2)
+              && isSubType(tp1.resultType, tp2.resultType.subst(tp2, tp1))
+            }
           case _ => false
         }
         comparePoly
@@ -751,13 +758,12 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
       case tp1: TypeRef =>
         tp1.info match {
           case TypeBounds(_, hi1) =>
-            def compareGADT = {
-              val gbounds1 = gadtBounds(tp1.symbol)
-              (gbounds1 != null) &&
-                (isSubTypeWhenFrozen(gbounds1.hi, tp2) ||
-                narrowGADTBounds(tp1, tp2, approx, isUpper = true)) &&
-                { tp2.isAny || GADTusage(tp1.symbol) }
-            }
+            def compareGADT =
+              tp1.symbol.onGadtBounds(gbounds1 =>
+                isSubTypeWhenFrozen(gbounds1.hi, tp2)
+                || narrowGADTBounds(tp1, tp2, approx, isUpper = true))
+              && (tp2.isAny || GADTusage(tp1.symbol))
+
             isSubType(hi1, tp2, approx.addLow) || compareGADT || tryLiftedToThis1
           case _ =>
             def isNullable(tp: Type): Boolean = tp.widenDealias match {
@@ -840,7 +846,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
           case _ => tp2.isAnyRef
         }
         compareJavaArray
-      case tp1: ExprType if ctx.phase.id > gettersPhase.id =>
+      case tp1: ExprType if ctx.phaseId > gettersPhase.id =>
         // getters might have converted T to => T, need to compensate.
         recur(tp1.widenExpr, tp2)
       case _ =>
@@ -848,11 +854,15 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
     }
 
     /** When called from `pre1.A <:< pre2.A` does `pre1` relate to `pre2` so that
-     *  the subtype test is true? This is the case if `pre1 <:< pre2`, or
-     *  `pre1` and `pre2` are both this-types of related classes. Here, two classes
-     *  are related if each of them has a self type that derives from the other.
+     *  the subtype test is true? This is the case if
+     *
+     *    1. `pre1 <:< pre2`, or
+     *    2. One of `pre1` and `pre2` refers to a package and the other to a
+     *       package object in that package, or
+     *    3. `pre1` and `pre2` are both this-types of related classes.
      *
-     *  This criterion is a bit dubious. I.e. in the test
+     *  Here, two classes are related if each of them has a self type that derives from the other.
+     *  The third criterion is a bit dubious. I.e. in the test
      *
      *      A.this.T <:< B.this.T
      *
@@ -872,18 +882,32 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
     |*  does not conform to  dotty.tools.dotc.util.Property.Key[Typer.this.Deriver & Namer.this.Deriver]
      */
     def isSubPrefix(pre1: Type, pre2: Type): Boolean =
+      def samePkg(sym1: Symbol, sym2: Symbol) =
+           sym2.is(Package) && sym1.isPackageObject && sym1.owner == sym2.moduleClass
+        || sym1.is(Package) && sym2.isPackageObject && sym2.owner == sym1.moduleClass
       pre1 match
         case pre1: ThisType =>
           pre2 match
             case pre2: ThisType =>
+              if samePkg(pre1.cls, pre2.cls) then return true
               if pre1.cls.classInfo.selfType.derivesFrom(pre2.cls)
                  && pre2.cls.classInfo.selfType.derivesFrom(pre1.cls)
               then
                 subtyping.println(i"assume equal prefixes $pre1 $pre2")
                 return true
+            case pre2: TermRef =>
+              if samePkg(pre1.cls, pre2.symbol) then return true
+            case _ =>
+        case pre1: TermRef =>
+          pre2 match
+            case pre2: TermRef =>
+              if samePkg(pre1.symbol, pre2.symbol) then return true
+            case pre2: ThisType =>
+              if samePkg(pre1.symbol, pre2.cls) then return true
             case _ =>
         case _ =>
       isSubType(pre1, pre2)
+    end isSubPrefix
 
     /** Compare `tycon[args]` with `other := otherTycon[otherArgs]`, via `>:>` if fromBelow is true, `<:<` otherwise
      *  (we call this relationship `~:~` in the rest of this comment).
@@ -973,7 +997,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
       /** True if `tp1` and `tp2` have compatible type constructors and their
        *  corresponding arguments are subtypes relative to their variance (see `isSubArgs`).
        */
-      def isMatchingApply(tp1: Type): Boolean = tp1 match {
+      def isMatchingApply(tp1: Type): Boolean = tp1.widen match {
         case tp1 @ AppliedType(tycon1, args1) =>
           // We intentionally do not automatically dealias `tycon1` or `tycon2` here.
           // `TypeApplications#appliedTo` already takes care of dealiasing type
@@ -1033,17 +1057,12 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
 
                   var touchedGADTs = false
                   var gadtIsInstantiated = false
-                  def byGadtBounds(sym: Symbol, tp: Type, fromAbove: Boolean): Boolean = {
-                    touchedGADTs = true
-                    val b = gadtBounds(sym)
-                    def boundsDescr = if b == null then "null" else b.show
-                    b != null && inFrozenGadt {
-                      if fromAbove then isSubType(b.hi, tp) else isSubType(tp, b.lo)
-                    } && {
-                      gadtIsInstantiated = b.isInstanceOf[TypeAlias]
-                      true
-                    }
-                  }
+
+                  extension (sym: Symbol)
+                    inline def byGadtBounds(inline op: TypeBounds => Boolean): Boolean =
+                      touchedGADTs = true
+                      sym.onGadtBounds(
+                        b => op(b) && { gadtIsInstantiated = b.isInstanceOf[TypeAlias]; true })
 
                   def byGadtOrdering: Boolean =
                     ctx.gadt.contains(tycon1sym)
@@ -1052,8 +1071,8 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
 
                   val res = (
                     tycon1sym == tycon2sym && isSubPrefix(tycon1.prefix, tycon2.prefix)
-                    || byGadtBounds(tycon1sym, tycon2, fromAbove = true)
-                    || byGadtBounds(tycon2sym, tycon1, fromAbove = false)
+                    || tycon1sym.byGadtBounds(b => isSubTypeWhenFrozen(b.hi, tycon2))
+                    || tycon2sym.byGadtBounds(b => isSubTypeWhenFrozen(tycon1, b.lo))
                     || byGadtOrdering
                   ) && {
                     // There are two cases in which we can assume injectivity.
@@ -1142,6 +1161,17 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
         else
           fallback(tycon2bounds.lo)
 
+      def byGadtBounds: Boolean =
+        {
+          tycon2 match
+            case tycon2: TypeRef =>
+              val tycon2sym = tycon2.symbol
+              tycon2sym.onGadtBounds { bounds2 =>
+                inFrozenGadt { compareLower(bounds2, tyconIsTypeRef = false) }
+              }
+            case _ => false
+        } && { GADTused = true; true }
+
       tycon2 match {
         case param2: TypeParamRef =>
           isMatchingApply(tp1) ||
@@ -1149,13 +1179,14 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
           compareLower(bounds(param2), tyconIsTypeRef = false)
         case tycon2: TypeRef =>
           isMatchingApply(tp1) ||
+          byGadtBounds ||
           defn.isCompiletimeAppliedType(tycon2.symbol) && compareCompiletimeAppliedType(tp2, tp1, fromBelow = true) || {
             tycon2.info match {
               case info2: TypeBounds =>
                 compareLower(info2, tyconIsTypeRef = true)
               case info2: ClassInfo =>
                 tycon2.name.startsWith("Tuple") &&
-                  defn.isTupleType(tp2) && recur(tp1, tp2.toNestedPairs) ||
+                  defn.isTupleNType(tp2) && recur(tp1, tp2.toNestedPairs) ||
                 tryBaseType(info2.cls)
               case _ =>
                 fourthTry
@@ -1188,11 +1219,18 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
             isSubType(bounds(param1).hi.applyIfParameterized(args1), tp2, approx.addLow)
         case tycon1: TypeRef =>
           val sym = tycon1.symbol
+
+          def byGadtBounds: Boolean =
+            sym.onGadtBounds { bounds1 =>
+              inFrozenGadt { isSubType(bounds1.hi.applyIfParameterized(args1), tp2, approx.addLow) }
+            } && { GADTused = true; true }
+
+
           !sym.isClass && {
             defn.isCompiletimeAppliedType(sym) && compareCompiletimeAppliedType(tp1, tp2, fromBelow = false) ||
             recur(tp1.superType, tp2) ||
             tryLiftedToThis1
-          }
+          }|| byGadtBounds
         case tycon1: TypeProxy =>
           recur(tp1.superType, tp2)
         case _ =>
@@ -1260,14 +1298,17 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
     else if tp1 eq tp2 then true
     else
       val saved = constraint
+      val savedGadt = ctx.gadt.fresh
+      inline def restore() =
+        state.constraint = saved
+        ctx.gadt.restore(savedGadt)
       val savedSuccessCount = successCount
       try
         recCount += 1
         if recCount >= Config.LogPendingSubTypesThreshold then monitored = true
         val result = if monitored then monitoredIsSubType else firstTry
         recCount -= 1
-        if !result then
-          state.constraint = saved
+        if !result then restore()
         else if recCount == 0 && needsGc then
           state.gc()
           needsGc = false
@@ -1276,7 +1317,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
       catch case NonFatal(ex) =>
         if ex.isInstanceOf[AssertionError] then showGoal(tp1, tp2)
         recCount -= 1
-        state.constraint = saved
+        restore()
         successCount = savedSuccessCount
         throw ex
   }
@@ -1363,7 +1404,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
      */
     def canCompare(ts: Set[Type]) =
       ctx.phase.isTyper
-      || !ts.exists(_.existsPart(_.isInstanceOf[SkolemType], stopAtStatic = true))
+      || !ts.exists(_.existsPart(_.isInstanceOf[SkolemType], StopAt.Static))
 
     def verified(result: Boolean): Boolean =
       if Config.checkAtomsComparisons then
@@ -1407,7 +1448,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
 
     def recurArgs(args1: List[Type], args2: List[Type], tparams2: List[ParamInfo]): Boolean =
       if (args1.isEmpty) args2.isEmpty
-      else args2.nonEmpty && {
+      else args2.nonEmpty && tparams2.nonEmpty && {
         val tparam = tparams2.head
         val v = tparam.paramVarianceSign
 
@@ -1438,15 +1479,16 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
          */
         def compareCaptured(arg1: TypeBounds, arg2: Type) = tparam match {
           case tparam: Symbol =>
-            if (leftRoot.isStable || (ctx.isAfterTyper || ctx.mode.is(Mode.TypevarsMissContext))
-                && leftRoot.member(tparam.name).exists) {
+            if (leftRoot.isStable || ctx.isAfterTyper || ctx.mode.is(Mode.TypevarsMissContext))
+                && leftRoot.isValueType
+                && leftRoot.member(tparam.name).exists
+            then
               val captured = TypeRef(leftRoot, tparam)
               try isSubArg(captured, arg2)
               catch case ex: TypeError =>
                 // The captured reference could be illegal and cause a
                 // TypeError to be thrown in argDenot
                 false
-            }
             else if (v > 0)
               isSubType(paramBounds(tparam).hi, arg2)
             else if (v < 0)
@@ -1457,7 +1499,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
             false
         }
 
-        def isSubArg(arg1: Type, arg2: Type): Boolean = arg2 match {
+        def isSubArg(arg1: Type, arg2: Type): Boolean = arg2 match
           case arg2: TypeBounds =>
             val arg1norm = arg1 match {
               case arg1: TypeBounds =>
@@ -1468,15 +1510,23 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
               case _ => arg1
             }
             arg2.contains(arg1norm)
+          case ExprType(arg2res)
+          if ctx.phaseId > elimByNamePhase.id && !ctx.erasedTypes
+               && defn.isByNameFunction(arg1.dealias) =>
+            // ElimByName maps `=> T` to `()? => T`, but only in method parameters. It leaves
+            // embedded `=> T` arguments alone. This clause needs to compensate for that.
+            isSubArg(arg1.dealias.argInfos.head, arg2res)
           case _ =>
-            arg1 match {
+            arg1 match
               case arg1: TypeBounds =>
                 compareCaptured(arg1, arg2)
+              case ExprType(arg1res)
+              if ctx.phaseId > elimByNamePhase.id && !ctx.erasedTypes
+                   && defn.isByNameFunction(arg2.dealias) =>
+                 isSubArg(arg1res, arg2.argInfos.head)
               case _ =>
                 (v > 0 || isSubType(arg2, arg1)) &&
                 (v < 0 || isSubType(arg1, arg2))
-            }
-        }
 
         isSubArg(args1.head, args2.head)
       } && recurArgs(args1.tail, args2.tail, tparams2.tail)
@@ -1526,23 +1576,16 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
 
   /** Returns true iff the result of evaluating either `op1` or `op2` is true and approximates resulting constraints.
    *
-   *  If we're inferring GADT bounds or constraining a method based on its
-   *  expected type, we infer only the _necessary_ constraints, this means we
-   *  keep the smaller constraint if any, or no constraint at all. This is
-   *  necessary for GADT bounds inference to be sound. When constraining a
-   *  method, this avoid committing of constraints that would later prevent us
-   *  from typechecking method arguments, see or-inf.scala and and-inf.scala for
-   *  examples.
+   *  If `necessaryConstraintsOnly` is true, we keep the smaller constraint if
+   *  any, or no constraint at all.
    *
    *  Otherwise, we infer _sufficient_ constraints: we try to keep the smaller of
    *  the two constraints, but if never is smaller than the other, we just pick
    *  the first one.
-   *
-   *  @see [[necessaryEither]] for the GADT / result type case
-   *  @see [[sufficientEither]] for the normal case
    */
   protected def either(op1: => Boolean, op2: => Boolean): Boolean =
-    if ctx.mode.is(Mode.GadtConstraintInference) || useNecessaryEither then
+    Stats.record("TypeComparer.either")
+    if necessaryConstraintsOnly then
       necessaryEither(op1, op2)
     else
       sufficientEither(op1, op2)
@@ -1618,7 +1661,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
    *     T1 & T2 <:< T3
    *     T1 <:< T2 | T3
    *
-   *  Unlike [[sufficientEither]], this method is used in GADTConstraintInference mode, when we are attempting
+   *  But this method is used when `useNecessaryEither` is true, like when we are attempting
    *  to infer GADT constraints that necessarily follow from the subtyping relationship. For instance, if we have
    *
    *     enum Expr[T] {
@@ -1690,6 +1733,26 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
     else op2
   end necessaryEither
 
+  /** Decompose into conjunction of types each of which has only a single refinement */
+  def decomposeRefinements(tp: Type, refines: List[(Name, Type)]): Type = tp match
+    case RefinedType(parent, rname, rinfo) =>
+      decomposeRefinements(parent, (rname, rinfo) :: refines)
+    case AndType(tp1, tp2) =>
+      AndType(decomposeRefinements(tp1, refines), decomposeRefinements(tp2, refines))
+    case _ =>
+      refines.map(RefinedType(tp, _, _): Type).reduce(AndType(_, _))
+
+  /** Can comparing this type on the left lead to an either? This is the case if
+   *  the type is and AndType or contains embedded occurrences of AndTypes
+   */
+  def containsAnd(tp: Type): Boolean = tp match
+    case tp: AndType => true
+    case OrType(tp1, tp2) => containsAnd(tp1) || containsAnd(tp2)
+    case tp: TypeParamRef => containsAnd(bounds(tp).hi)
+    case tp: TypeRef => containsAnd(tp.info.hiBound) || tp.symbol.onGadtBounds(gbounds => containsAnd(gbounds.hi))
+    case tp: TypeProxy => containsAnd(tp.superType)
+    case _ => false
+
   /** Does type `tp1` have a member with name `name` whose normalized type is a subtype of
    *  the normalized type of the refinement `tp2`?
    *  Normalization is as follows: If `tp2` contains a skolem to its refinement type,
@@ -1697,40 +1760,74 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
    */
   protected def hasMatchingMember(name: Name, tp1: Type, tp2: RefinedType): Boolean =
     trace(i"hasMatchingMember($tp1 . $name :? ${tp2.refinedInfo}), mbr: ${tp1.member(name).info}", subtyping) {
-      val rinfo2 = tp2.refinedInfo
-
-      // If the member is an abstract type and the prefix is a path, compare the member itself
-      // instead of its bounds. This case is needed situations like:
-      //
-      //    class C { type T }
-      //    val foo: C
-      //    foo.type <: C { type T {= , <: , >:} foo.T }
-      //
-      // or like:
-      //
-      //    class C[T]
-      //    C[?] <: C[TV]
-      //
-      // where TV is a type variable. See i2397.scala for an example of the latter.
-      def matchAbstractTypeMember(info1: Type) = info1 match {
-        case TypeBounds(lo, hi) if lo ne hi =>
-          tp2.refinedInfo match {
-            case rinfo2: TypeBounds if tp1.isStable =>
-              val ref1 = tp1.widenExpr.select(name)
-              isSubType(rinfo2.lo, ref1) && isSubType(ref1, rinfo2.hi)
-            case _ =>
-              false
-          }
-        case _ => false
-      }
 
-      def qualifies(m: SingleDenotation) =
-        isSubType(m.info.widenExpr, rinfo2.widenExpr) || matchAbstractTypeMember(m.info)
+      def qualifies(m: SingleDenotation): Boolean =
+        // If the member is an abstract type and the prefix is a path, compare the member itself
+        // instead of its bounds. This case is needed situations like:
+        //
+        //    class C { type T }
+        //    val foo: C
+        //    foo.type <: C { type T {= , <: , >:} foo.T }
+        //
+        // or like:
+        //
+        //    class C[T]
+        //    C[?] <: C[TV]
+        //
+        // where TV is a type variable. See i2397.scala for an example of the latter.
+        def matchAbstractTypeMember(info1: Type): Boolean = info1 match {
+          case TypeBounds(lo, hi) if lo ne hi =>
+            tp2.refinedInfo match {
+              case rinfo2: TypeBounds if tp1.isStable =>
+                val ref1 = tp1.widenExpr.select(name)
+                isSubType(rinfo2.lo, ref1) && isSubType(ref1, rinfo2.hi)
+              case _ =>
+                false
+            }
+          case _ => false
+        }
 
-      tp1.member(name) match { // inlined hasAltWith for performance
+        // An additional check for type member matching: If the refinement of the
+        // supertype `tp2` does not refer to a member symbol defined in the parent of `tp2`.
+        // then the symbol referred to in the subtype must have a signature that coincides
+        // in its parameters with the refinement's signature. The reason for the check
+        // is that if the refinement does not refer to a member symbol, we will have to
+        // resort to reflection to invoke the member. And Java reflection needs to know exact
+        // erased parameter types. See neg/i12211.scala. Other reflection algorithms could
+        // conceivably dispatch without knowning precise parameter signatures. One can signal
+        // this by inheriting from the `scala.reflect.SignatureCanBeImprecise` marker trait,
+        // in which case the signature test is elided.
+        def sigsOK(symInfo: Type, info2: Type) =
+          tp2.underlyingClassRef(refinementOK = true).member(name).exists
+          || tp2.derivesFrom(defn.WithoutPreciseParameterTypesClass)
+          || symInfo.isInstanceOf[MethodType]
+              && symInfo.signature.consistentParams(info2.signature)
+
+        // A relaxed version of isSubType, which compares method types
+        // under the standard arrow rule which is contravarient in the parameter types,
+        // but under the condition that signatures might have to match (see sigsOK)
+        // This relaxed version is needed to correctly compare dependent function types.
+        // See pos/i12211.scala.
+        def isSubInfo(info1: Type, info2: Type, symInfo: Type): Boolean =
+          info2 match
+            case info2: MethodType =>
+              info1 match
+                case info1: MethodType =>
+                  val symInfo1 = symInfo.stripPoly
+                  matchingMethodParams(info1, info2, precise = false)
+                  && isSubInfo(info1.resultType, info2.resultType.subst(info2, info1), symInfo1.resultType)
+                  && sigsOK(symInfo1, info2)
+                case _ => isSubType(info1, info2)
+            case _ => isSubType(info1, info2)
+
+        val info1 = m.info.widenExpr
+        isSubInfo(info1, tp2.refinedInfo.widenExpr, m.symbol.info.orElse(info1))
+        || matchAbstractTypeMember(m.info)
+      end qualifies
+
+      tp1.member(name) match // inlined hasAltWith for performance
         case mbr: SingleDenotation => qualifies(mbr)
         case mbr => mbr hasAltWith qualifies
-      }
     }
 
   final def ensureStableSingleton(tp: Type): SingletonType = tp.stripTypeVar match {
@@ -1840,15 +1937,20 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
   }
 
   /** Do the parameter types of `tp1` and `tp2` match in a way that allows `tp1`
-   *  to override `tp2` ? This is the case if they're pairwise `=:=`.
+   *  to override `tp2` ? Two modes: precise or not.
+   *  If `precise` is set (which is the default) this is the case if they're pairwise `=:=`.
+   *  Otherwise parameters in `tp2` must be subtypes of corresponding parameters in `tp1`.
    */
-  def matchingMethodParams(tp1: MethodType, tp2: MethodType): Boolean = {
+  def matchingMethodParams(tp1: MethodType, tp2: MethodType, precise: Boolean = true): Boolean = {
     def loop(formals1: List[Type], formals2: List[Type]): Boolean = formals1 match {
       case formal1 :: rest1 =>
         formals2 match {
           case formal2 :: rest2 =>
             val formal2a = if (tp2.isParamDependent) formal2.subst(tp2, tp1) else formal2
-            isSameTypeWhenFrozen(formal1, formal2a) && loop(rest1, rest2)
+            val paramsMatch =
+              if precise then isSameTypeWhenFrozen(formal1, formal2a)
+              else isSubTypeWhenFrozen(formal2a, formal1)
+            paramsMatch && loop(rest1, rest2)
           case nil =>
             false
         }
@@ -1933,43 +2035,40 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
     else if (!tp2.exists) tp1
     else if tp1.isAny && !tp2.isLambdaSub || tp1.isAnyKind || isBottom(tp2) then tp2
     else if tp2.isAny && !tp1.isLambdaSub || tp2.isAnyKind || isBottom(tp1) then tp1
-    else tp2 match {  // normalize to disjunctive normal form if possible.
+    else tp2 match
       case tp2: LazyRef =>
         glb(tp1, tp2.ref)
-      case OrType(tp21, tp22) =>
-        tp1 & tp21 | tp1 & tp22
       case _ =>
-        tp1 match {
+        tp1 match
           case tp1: LazyRef =>
             glb(tp1.ref, tp2)
-          case OrType(tp11, tp12) =>
-            tp11 & tp2 | tp12 & tp2
           case _ =>
             val tp1a = dropIfSuper(tp1, tp2)
-            if (tp1a ne tp1) glb(tp1a, tp2)
-            else {
+            if tp1a ne tp1 then glb(tp1a, tp2)
+            else
               val tp2a = dropIfSuper(tp2, tp1)
-              if (tp2a ne tp2) glb(tp1, tp2a)
-              else tp1 match {
-                case tp1: ConstantType =>
-                  tp2 match {
-                    case tp2: ConstantType =>
-                      // Make use of the fact that the intersection of two constant types
-                      // types which are not subtypes of each other is known to be empty.
-                      // Note: The same does not apply to singleton types in general.
-                      // E.g. we could have a pattern match against `x.type & y.type`
-                      // which might succeed if `x` and `y` happen to be the same ref
-                      // at run time. It would not work to replace that with `Nothing`.
-                      // However, maybe we can still apply the replacement to
-                      // types which are not explicitly written.
-                      NothingType
+              if tp2a ne tp2 then glb(tp1, tp2a)
+              else tp2 match // normalize to disjunctive normal form if possible.
+                case tp2 @ OrType(tp21, tp22) =>
+                  lub(tp1 & tp21, tp1 & tp22, isSoft = tp2.isSoft)
+                case _ =>
+                  tp1 match
+                    case tp1 @ OrType(tp11, tp12) =>
+                      lub(tp11 & tp2, tp12 & tp2, isSoft = tp1.isSoft)
+                    case tp1: ConstantType =>
+                      tp2 match
+                        case tp2: ConstantType =>
+                          // Make use of the fact that the intersection of two constant types
+                          // types which are not subtypes of each other is known to be empty.
+                          // Note: The same does not apply to singleton types in general.
+                          // E.g. we could have a pattern match against `x.type & y.type`
+                          // which might succeed if `x` and `y` happen to be the same ref
+                          // at run time. It would not work to replace that with `Nothing`.
+                          // However, maybe we can still apply the replacement to
+                          // types which are not explicitly written.
+                          NothingType
+                        case _ => andType(tp1, tp2)
                     case _ => andType(tp1, tp2)
-                  }
-                case _ => andType(tp1, tp2)
-              }
-            }
-        }
-    }
   }
 
   def widenInUnions(using Context): Boolean =
@@ -1977,10 +2076,10 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
 
   /** The least upper bound of two types
    *  @param canConstrain  If true, new constraints might be added to simplify the lub.
+   *  @param isSoft        If the lub is a union, this determines whether it's a soft union.
    *  @note  We do not admit singleton types in or-types as lubs.
    */
-  def lub(tp1: Type, tp2: Type, canConstrain: Boolean = false): Type = /*>|>*/ trace(s"lub(${tp1.show}, ${tp2.show}, canConstrain=$canConstrain)", subtyping, show = true) /*<|<*/ {
-
+  def lub(tp1: Type, tp2: Type, canConstrain: Boolean = false, isSoft: Boolean = true): Type = /*>|>*/ trace(s"lub(${tp1.show}, ${tp2.show}, canConstrain=$canConstrain, isSoft=$isSoft)", subtyping, show = true) /*<|<*/ {
     if (tp1 eq tp2) tp1
     else if (!tp1.exists) tp1
     else if (!tp2.exists) tp2
@@ -2006,8 +2105,8 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
         def widen(tp: Type) = if (widenInUnions) tp.widen else tp.widenIfUnstable
         val tp1w = widen(tp1)
         val tp2w = widen(tp2)
-        if ((tp1 ne tp1w) || (tp2 ne tp2w)) lub(tp1w, tp2w, canConstrain)
-        else orType(tp1w, tp2w) // no need to check subtypes again
+        if ((tp1 ne tp1w) || (tp2 ne tp2w)) lub(tp1w, tp2w, canConstrain = canConstrain, isSoft = isSoft)
+        else orType(tp1w, tp2w, isSoft = isSoft) // no need to check subtypes again
       }
       mergedLub(tp1.stripLazyRef, tp2.stripLazyRef)
   }
@@ -2116,11 +2215,11 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
       case tp2 @ OrType(tp21, tp22) =>
         val higher1 = mergeIfSuper(tp1, tp21, canConstrain)
         if (higher1 eq tp21) tp2
-        else if (higher1.exists) higher1 | tp22
+        else if (higher1.exists) lub(higher1, tp22, isSoft = tp2.isSoft)
         else {
           val higher2 = mergeIfSuper(tp1, tp22, canConstrain)
           if (higher2 eq tp22) tp2
-          else if (higher2.exists) tp21 | higher2
+          else if (higher2.exists) lub(tp21, higher2, isSoft = tp2.isSoft)
           else NoType
         }
       case _ =>
@@ -2157,7 +2256,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
    *  opportunistically merged.
    */
   final def andType(tp1: Type, tp2: Type, isErased: Boolean = ctx.erasedTypes): Type =
-    andTypeGen(tp1, tp2, AndType(_, _), isErased = isErased)
+    andTypeGen(tp1, tp2, AndType.balanced(_, _), isErased = isErased)
 
   final def simplifyAndTypeWithFallback(tp1: Type, tp2: Type, fallback: Type): Type =
     andTypeGen(tp1, tp2, (_, _) => fallback)
@@ -2168,17 +2267,18 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
    *  ExprType, LambdaType). Also, when forming an `|`,
    *  instantiated TypeVars are dereferenced and annotations are stripped.
    *
+   *  @param isSoft   If the result is a union, this determines whether it's a soft union.
    *  @param isErased Apply erasure semantics. If erased is true, instead of creating
    *                  an OrType, the lub will be computed using TypeCreator#erasedLub.
    */
-  final def orType(tp1: Type, tp2: Type, isErased: Boolean = ctx.erasedTypes): Type = {
-    val t1 = distributeOr(tp1, tp2)
+  final def orType(tp1: Type, tp2: Type, isSoft: Boolean = true, isErased: Boolean = ctx.erasedTypes): Type = {
+    val t1 = distributeOr(tp1, tp2, isSoft)
     if (t1.exists) t1
     else {
-      val t2 = distributeOr(tp2, tp1)
+      val t2 = distributeOr(tp2, tp1, isSoft)
       if (t2.exists) t2
       else if (isErased) erasedLub(tp1, tp2)
-      else liftIfHK(tp1, tp2, OrType(_, _, soft = true), _ | _, _ & _)
+      else liftIfHK(tp1, tp2, OrType.balanced(_, _, soft = isSoft), _ | _, _ & _)
     }
   }
 
@@ -2266,18 +2366,18 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
    *
    *  The rhs is a proper supertype of the lhs.
    */
-  private def distributeOr(tp1: Type, tp2: Type): Type = tp1 match {
+  private def distributeOr(tp1: Type, tp2: Type, isSoft: Boolean = true): Type = tp1 match {
     case ExprType(rt1) =>
       tp2 match {
         case ExprType(rt2) =>
-          ExprType(rt1 | rt2)
+          ExprType(lub(rt1, rt2, isSoft = isSoft))
         case _ =>
           NoType
       }
     case tp1: TypeVar if tp1.isInstantiated =>
-      tp1.underlying | tp2
+      lub(tp1.underlying, tp2, isSoft = isSoft)
     case tp1: AnnotatedType if !tp1.isRefining =>
-      tp1.underlying | tp2
+      lub(tp1.underlying, tp2, isSoft = isSoft)
     case _ =>
       NoType
   }
@@ -2329,19 +2429,21 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
     }
 
   /** Show subtype goal that led to an assertion failure */
-  def showGoal(tp1: Type, tp2: Type)(using Context): Unit = {
-    report.echo(i"assertion failure for ${show(tp1)} <:< ${show(tp2)}, frozen = $frozenConstraint")
-    def explainPoly(tp: Type) = tp match {
-      case tp: TypeParamRef => report.echo(s"TypeParamRef ${tp.show} found in ${tp.binder.show}")
-      case tp: TypeRef if tp.symbol.exists => report.echo(s"typeref ${tp.show} found in ${tp.symbol.owner.show}")
-      case tp: TypeVar => report.echo(s"typevar ${tp.show}, origin = ${tp.origin}")
-      case _ => report.echo(s"${tp.show} is a ${tp.getClass}")
-    }
-    if (Config.verboseExplainSubtype) {
-      explainPoly(tp1)
-      explainPoly(tp2)
-    }
-  }
+  def showGoal(tp1: Type, tp2: Type)(using Context): Unit =
+    try
+      report.echo(i"assertion failure for ${show(tp1)} <:< ${show(tp2)}, frozen = $frozenConstraint")
+      def explainPoly(tp: Type) = tp match {
+        case tp: TypeParamRef => report.echo(s"TypeParamRef ${tp.show} found in ${tp.binder.show}")
+        case tp: TypeRef if tp.symbol.exists => report.echo(s"typeref ${tp.show} found in ${tp.symbol.owner.show}")
+        case tp: TypeVar => report.echo(s"typevar ${tp.show}, origin = ${tp.origin}")
+        case _ => report.echo(s"${tp.show} is a ${tp.getClass}")
+      }
+      if (Config.verboseExplainSubtype) {
+        explainPoly(tp1)
+        explainPoly(tp2)
+      }
+    catch case NonFatal(ex) =>
+      report.echo(s"assertion failure [[cannot display since $ex was thrown]]")
 
   /** Record statistics about the total number of subtype checks
    *  and the number of "successful" subtype checks, i.e. checks
@@ -2408,29 +2510,41 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
   def provablyDisjoint(tp1: Type, tp2: Type)(using Context): Boolean = trace(i"provable disjoint $tp1, $tp2", matchTypes) {
     // println(s"provablyDisjoint(${tp1.show}, ${tp2.show})")
 
-    def isEnumValueOrModule(ref: TermRef): Boolean =
+    def isEnumValue(ref: TermRef): Boolean =
       val sym = ref.termSymbol
-      sym.isAllOf(EnumCase, butNot=JavaDefined) || sym.is(Module)
+      sym.isAllOf(EnumCase, butNot=JavaDefined)
 
-    /** Can we enumerate all instantiations of this type? */
-    def isClosedSum(tp: Symbol): Boolean =
-      tp.is(Sealed) && tp.isOneOf(AbstractOrTrait) && !tp.hasAnonymousChild
-
-    /** Splits a closed type into a disjunction of smaller types.
-     *  It should hold that `tp` and `decompose(tp).reduce(_ or _)`
-     *  denote the same set of values.
-     */
-    def decompose(sym: Symbol, tp: Type): List[Type] =
-      sym.children.map(x => refineUsingParent(tp, x)).filter(_.exists)
+    def isEnumValueOrModule(ref: TermRef): Boolean =
+      isEnumValue(ref) || ref.termSymbol.is(Module) || (ref.info match {
+        case tp: TermRef => isEnumValueOrModule(tp)
+        case _ => false
+      })
+
+    def fullyInstantiated(tp: Type): Boolean = new TypeAccumulator[Boolean] {
+      override def apply(x: Boolean, t: Type) =
+        x && {
+          t match {
+            case tp: TypeRef if tp.symbol.isAbstractOrParamType => false
+            case _: SkolemType | _: TypeVar | _: TypeParamRef => false
+            case _ => foldOver(x, t)
+          }
+        }
+    }.apply(true, tp)
 
     (tp1.dealias, tp2.dealias) match {
-      case (tp1: TypeRef, tp2: TypeRef) if tp1.symbol == defn.SingletonClass || tp2.symbol == defn.SingletonClass =>
+      case (tp1: TypeRef, _) if tp1.symbol == defn.SingletonClass =>
+        false
+      case (_, tp2: TypeRef) if tp2.symbol == defn.SingletonClass =>
         false
       case (tp1: ConstantType, tp2: ConstantType) =>
         tp1 != tp2
       case (tp1: TypeRef, tp2: TypeRef) if tp1.symbol.isClass && tp2.symbol.isClass =>
         val cls1 = tp1.classSymbol
         val cls2 = tp2.classSymbol
+        def isDecomposable(tp: Symbol): Boolean =
+           tp.is(Sealed) && !tp.hasAnonymousChild
+        def decompose(sym: Symbol, tp: Type): List[Type] =
+          sym.children.map(x => refineUsingParent(tp, x)).filter(_.exists)
         if (cls1.derivesFrom(cls2) || cls2.derivesFrom(cls1))
           false
         else
@@ -2443,9 +2557,13 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
             // subtype, so they must be unrelated by single inheritance
             // of classes.
             true
-          else if (isClosedSum(cls1))
+          else if (isDecomposable(cls1))
+            // At this point, !cls1.derivesFrom(cls2): we know that direct
+            // instantiations of `cls1` (terms of the form `new cls1`) are not
+            // of type `tp2`. Therefore, we can safely decompose `cls1` using
+            // `.children`, even if `cls1` is non abstract.
             decompose(cls1, tp1).forall(x => provablyDisjoint(x, tp2))
-          else if (isClosedSum(cls2))
+          else if (isDecomposable(cls2))
             decompose(cls2, tp2).forall(x => provablyDisjoint(x, tp1))
           else
             false
@@ -2458,31 +2576,20 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
         def covariantDisjoint(tp1: Type, tp2: Type, tparam: TypeParamInfo): Boolean =
           provablyDisjoint(tp1, tp2) && typeparamCorrespondsToField(tycon1, tparam)
 
-        // In the invariant case, we used a weaker version of disjointness:
-        // we consider types not equal with respect to =:= to be disjoint
+        // In the invariant case, we also use a stronger notion of disjointness:
+        // we consider fully instantiated types not equal wrt =:= to be disjoint
         // (under any context). This is fine because it matches the runtime
         // semantics of pattern matching. To implement a pattern such as
         // `case Inv[T] => ...`, one needs a type tag for `T` and the compiler
         // is used at runtime to check it the scrutinee's type is =:= to `T`.
-        // Note that this is currently a theoretical concern since we Dotty
+        // Note that this is currently a theoretical concern since Dotty
         // doesn't have type tags, meaning that users cannot write patterns
         // that do type tests on higher kinded types.
         def invariantDisjoint(tp1: Type, tp2: Type, tparam: TypeParamInfo): Boolean =
-          covariantDisjoint(tp1, tp2, tparam) || !isSameType(tp1, tp2) && {
-            // We can only trust a "no" from `isSameType` when both
-            // `tp1` and `tp2` are fully instantiated.
-            def fullyInstantiated(tp: Type): Boolean = new TypeAccumulator[Boolean] {
-              override def apply(x: Boolean, t: Type) =
-                x && {
-                  t match {
-                    case tp: TypeRef if tp.symbol.isAbstractOrParamType => false
-                    case _: SkolemType | _: TypeVar => false
-                    case _ => foldOver(x, t)
-                  }
-                }
-            }.apply(true, tp)
-            fullyInstantiated(tp1) && fullyInstantiated(tp2)
-          }
+          provablyDisjoint(tp1, tp2) ||
+          !isSameType(tp1, tp2) &&
+          fullyInstantiated(tp1) && // We can only trust a "no" from `isSameType` when
+          fullyInstantiated(tp2)    // both `tp1` and `tp2` are fully instantiated.
 
         args1.lazyZip(args2).lazyZip(tycon1.typeParams).exists {
           (arg1, arg2, tparam) =>
@@ -2519,9 +2626,13 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
         provablyDisjoint(tp1, gadtBounds(tp2.symbol).hi) || provablyDisjoint(tp1, tp2.superType)
       case (tp1: TermRef, tp2: TermRef) if isEnumValueOrModule(tp1) && isEnumValueOrModule(tp2) =>
         tp1.termSymbol != tp2.termSymbol
-      case (tp1: Type, tp2: Type) if defn.isTupleType(tp1) =>
+      case (tp1: TermRef, tp2: TypeRef) if isEnumValue(tp1) =>
+        fullyInstantiated(tp2) && !tp1.classSymbols.exists(_.derivesFrom(tp2.symbol))
+      case (tp1: TypeRef, tp2: TermRef) if isEnumValue(tp2) =>
+        fullyInstantiated(tp1) && !tp2.classSymbols.exists(_.derivesFrom(tp1.symbol))
+      case (tp1: Type, tp2: Type) if defn.isTupleNType(tp1) =>
         provablyDisjoint(tp1.toNestedPairs, tp2)
-      case (tp1: Type, tp2: Type) if defn.isTupleType(tp2) =>
+      case (tp1: Type, tp2: Type) if defn.isTupleNType(tp2) =>
         provablyDisjoint(tp1, tp2.toNestedPairs)
       case (tp1: TypeProxy, tp2: TypeProxy) =>
         provablyDisjoint(tp1.superType, tp2) || provablyDisjoint(tp1, tp2.superType)
@@ -2632,8 +2743,8 @@ object TypeComparer {
   def matchingMethodParams(tp1: MethodType, tp2: MethodType)(using Context): Boolean =
     comparing(_.matchingMethodParams(tp1, tp2))
 
-  def lub(tp1: Type, tp2: Type, canConstrain: Boolean = false)(using Context): Type =
-    comparing(_.lub(tp1, tp2, canConstrain))
+  def lub(tp1: Type, tp2: Type, canConstrain: Boolean = false, isSoft: Boolean = true)(using Context): Type =
+    comparing(_.lub(tp1, tp2, canConstrain = canConstrain, isSoft = isSoft))
 
   /** The least upper bound of a list of types */
   final def lub(tps: List[Type])(using Context): Type =
@@ -2649,8 +2760,8 @@ object TypeComparer {
   def glb(tps: List[Type])(using Context): Type =
     tps.foldLeft(defn.AnyType: Type)(glb)
 
-  def orType(using Context)(tp1: Type, tp2: Type, isErased: Boolean = ctx.erasedTypes): Type =
-    comparing(_.orType(tp1, tp2, isErased))
+  def orType(using Context)(tp1: Type, tp2: Type, isSoft: Boolean = true, isErased: Boolean = ctx.erasedTypes): Type =
+    comparing(_.orType(tp1, tp2, isSoft = isSoft, isErased = isErased))
 
   def andType(using Context)(tp1: Type, tp2: Type, isErased: Boolean = ctx.erasedTypes): Type =
     comparing(_.andType(tp1, tp2, isErased))
@@ -2696,8 +2807,8 @@ object TypeComparer {
   def dropTransparentTraits(tp: Type, bound: Type)(using Context): Type =
     comparing(_.dropTransparentTraits(tp, bound))
 
-  def constrainPatternType(pat: Type, scrut: Type, widenParams: Boolean = true)(using Context): Boolean =
-    comparing(_.constrainPatternType(pat, scrut, widenParams))
+  def constrainPatternType(pat: Type, scrut: Type, forceInvariantRefinement: Boolean = false)(using Context): Boolean =
+    comparing(_.constrainPatternType(pat, scrut, forceInvariantRefinement))
 
   def explained[T](op: ExplainingTypeComparer => T, header: String = "Subtype trace:")(using Context): String =
     comparing(_.explained(op, header))
@@ -2785,7 +2896,7 @@ class TrackingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
           caseLambda match {
             case caseLambda: HKTypeLambda =>
               val instances = paramInstances(new Array(caseLambda.paramNames.length), pat)
-              instantiateParams(instances)(body)
+              instantiateParams(instances)(body).simplified
             case _ =>
               body
           }
@@ -2798,10 +2909,19 @@ class TrackingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
         Some(NoType)
     }
 
-    def recur(cases: List[Type]): Type = cases match {
-      case cas :: cases1 => matchCase(cas).getOrElse(recur(cases1))
-      case Nil => NoType
-    }
+    def recur(remaining: List[Type]): Type = remaining match
+      case cas :: remaining1 =>
+        matchCase(cas) match
+          case None =>
+            recur(remaining1)
+          case Some(NoType) =>
+            MatchTypeTrace.stuck(scrut, cas, remaining1)
+            NoType
+          case Some(tp) =>
+            tp
+      case Nil =>
+        val casesText = MatchTypeTrace.noMatchesText(scrut, cases)
+        throw new TypeError(s"Match type reduction $casesText")
 
     inFrozenConstraint {
       // Empty types break the basic assumption that if a scrutinee and a
@@ -2818,6 +2938,7 @@ class TrackingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
       // we need to be careful that `provablyEmpty` covers all the conditions
       // used to conclude disjointness in `provablyDisjoint`.
       if (provablyEmpty(scrut))
+        MatchTypeTrace.emptyScrutinee(scrut)
         NoType
       else
         recur(cases)
@@ -2842,9 +2963,10 @@ class ExplainingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
     if (skipped) op
     else {
       indent += 2
-      b.append("\n").append(" " * indent).append("==> ").append(str)
+      val str1 = str.replace('\n', ' ')
+      b.append("\n").append(" " * indent).append("==> ").append(str1)
       val res = op
-      b.append("\n").append(" " * indent).append("<== ").append(str).append(" = ").append(show(res))
+      b.append("\n").append(" " * indent).append("<== ").append(str1).append(" = ").append(show(res))
       indent -= 2
       res
     }
@@ -2852,17 +2974,13 @@ class ExplainingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
   private def frozenNotice: String =
     if frozenConstraint then " in frozen constraint" else ""
 
-  override def isSubType(tp1: Type, tp2: Type, approx: ApproxState): Boolean =
+  override def recur(tp1: Type, tp2: Type): Boolean =
     def moreInfo =
       if Config.verboseExplainSubtype || ctx.settings.verbose.value
       then s" ${tp1.getClass} ${tp2.getClass}"
       else ""
+    val approx = approxState
     traceIndented(s"${show(tp1)}  <:  ${show(tp2)}$moreInfo${approx.show}$frozenNotice") {
-      super.isSubType(tp1, tp2, approx)
-    }
-
-  override def recur(tp1: Type, tp2: Type): Boolean =
-    traceIndented(s"${show(tp1)}  <:  ${show(tp2)} (recurring)$frozenNotice") {
       super.recur(tp1, tp2)
     }
 
@@ -2871,9 +2989,9 @@ class ExplainingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
       super.hasMatchingMember(name, tp1, tp2)
     }
 
-  override def lub(tp1: Type, tp2: Type, canConstrain: Boolean = false): Type =
-    traceIndented(s"lub(${show(tp1)}, ${show(tp2)}, canConstrain=$canConstrain)") {
-      super.lub(tp1, tp2, canConstrain)
+  override def lub(tp1: Type, tp2: Type, canConstrain: Boolean, isSoft: Boolean): Type =
+    traceIndented(s"lub(${show(tp1)}, ${show(tp2)}, canConstrain=$canConstrain, isSoft=$isSoft)") {
+      super.lub(tp1, tp2, canConstrain, isSoft)
     }
 
   override def glb(tp1: Type, tp2: Type): Type =
@@ -2882,7 +3000,7 @@ class ExplainingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
     }
 
   override def addConstraint(param: TypeParamRef, bound: Type, fromBelow: Boolean)(using Context): Boolean =
-    traceIndented(i"add constraint $param ${if (fromBelow) ">:" else "<:"} $bound $frozenConstraint, constraint = ${ctx.typerState.constraint}") {
+    traceIndented(s"add constraint ${show(param)} ${if (fromBelow) ">:" else "<:"} ${show(bound)} $frozenNotice, constraint = ${show(ctx.typerState.constraint)}") {
       super.addConstraint(param, bound, fromBelow)
     }
 
diff --git a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
index 5ce82de63eed..1473bcc559e2 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
@@ -238,6 +238,7 @@ object TypeErasure {
 
     if (defn.isPolymorphicAfterErasure(sym)) eraseParamBounds(sym.info.asInstanceOf[PolyType])
     else if (sym.isAbstractType) TypeAlias(WildcardType)
+    else if sym.is(ConstructorProxy) then NoType
     else if (sym.isConstructor) outer.addParam(sym.owner.asClass, erase(tp)(using preErasureCtx))
     else if (sym.is(Label)) erase.eraseResult(sym.info)(using preErasureCtx)
     else erase.eraseInfo(tp, sym)(using preErasureCtx) match {
@@ -426,10 +427,6 @@ object TypeErasure {
    *  This operation has the following the properties:
    *  - Associativity and commutativity, because this method acts as the minimum
    *    of the total order induced by `compareErasedGlb`.
-   *  - Java compatibility: intersections that would be valid in Java code are
-   *    erased like javac would erase them (a Java intersection is composed of
-   *    exactly one class and one or more interfaces and always erases to the
-   *    class).
    */
   def erasedGlb(tp1: Type, tp2: Type)(using Context): Type =
     if compareErasedGlb(tp1, tp2) <= 0 then tp1 else tp2
@@ -527,6 +524,15 @@ object TypeErasure {
     case tp: OrType  => hasStableErasure(tp.tp1) && hasStableErasure(tp.tp2)
     case _ => false
   }
+
+  /** The erasure of `PolyFunction { def apply: $applyInfo }` */
+  def erasePolyFunctionApply(applyInfo: Type)(using Context): Type =
+    assert(applyInfo.isInstanceOf[PolyType])
+    val res = applyInfo.resultType
+    val paramss = res.paramNamess
+    assert(paramss.length == 1)
+    erasure(defn.FunctionType(paramss.head.length,
+      isContextual = res.isImplicitMethod, isErased = res.isErasedMethod))
 }
 
 import TypeErasure._
@@ -584,7 +590,7 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
       val sym = tp.symbol
       if (!sym.isClass) this(tp.translucentSuperType)
       else if (semiEraseVCs && isDerivedValueClass(sym)) eraseDerivedValueClass(tp)
-      else if (defn.isSyntheticFunctionClass(sym)) defn.erasedFunctionType(sym)
+      else if (defn.isSyntheticFunctionClass(sym)) defn.functionTypeErasure(sym)
       else eraseNormalClassRef(tp)
     case tp: AppliedType =>
       val tycon = tp.tycon
@@ -600,15 +606,13 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
     case ExprType(rt) =>
       defn.FunctionType(0)
     case RefinedType(parent, nme.apply, refinedInfo) if parent.typeSymbol eq defn.PolyFunctionClass =>
-      assert(refinedInfo.isInstanceOf[PolyType])
-      val res = refinedInfo.resultType
-      val paramss = res.paramNamess
-      assert(paramss.length == 1)
-      this(defn.FunctionType(paramss.head.length, isContextual = res.isImplicitMethod, isErased = res.isErasedMethod))
+      erasePolyFunctionApply(refinedInfo)
     case tp: TypeProxy =>
       this(tp.underlying)
     case tp @ AndType(tp1, tp2) =>
-      if sourceLanguage.isScala2 then
+      if sourceLanguage.isJava then
+        this(tp1)
+      else if sourceLanguage.isScala2 then
         this(Scala2Erasure.intersectionDominator(Scala2Erasure.flattenedParents(tp)))
       else
         erasedGlb(this(tp1), this(tp2))
@@ -655,7 +659,14 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
               tr1 :: trs1.filterNot(_.isAnyRef)
             case nil => nil
           }
-        val erasedDecls = decls.filteredScope(sym => !sym.isType || sym.isClass)
+        var erasedDecls = decls.filteredScope(sym => !sym.isType || sym.isClass).openForMutations
+        for dcl <- erasedDecls.iterator do
+          if dcl.lastKnownDenotation.unforcedAnnotation(defn.TargetNameAnnot).isDefined
+             && dcl.targetName != dcl.name
+          then
+            if erasedDecls eq decls then erasedDecls = erasedDecls.cloneScope
+            erasedDecls.unlink(dcl)
+            erasedDecls.enter(dcl.targetName, dcl)
         val selfType1 = if cls.is(Module) then cls.sourceModule.termRef else NoType
         tp.derivedClassInfo(NoPrefix, erasedParents, erasedDecls, selfType1)
           // can't replace selftype by NoType because this would lose the sourceModule link
@@ -698,7 +709,7 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
             // See doc comment for ElimByName for speculation how we could improve this.
         else
           MethodType(Nil, Nil,
-            eraseResult(sym.info.finalResultType.translateFromRepeated(toArray = sourceLanguage.isJava)))
+            eraseResult(rt.translateFromRepeated(toArray = sourceLanguage.isJava)))
       case tp1: PolyType =>
         eraseResult(tp1.resultType) match
           case rt: MethodType => rt
@@ -726,7 +737,7 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
       //   erased like `Array[A]` as seen from its definition site, no matter
       //   the `X` (same if `A` is bounded).
       //
-      // The binary compatibility is checked by sbt-dotty/sbt-test/scala2-compat/i8001
+      // The binary compatibility is checked by sbt-test/scala2-compat/i8001
       val erasedValueClass =
         if erasedUnderlying.isPrimitiveValueType && !genericUnderlying.isPrimitiveValueType then
           defn.boxedType(erasedUnderlying)
@@ -785,7 +796,7 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
           if (erasedVCRef.exists) return sigName(erasedVCRef)
         }
         if (defn.isSyntheticFunctionClass(sym))
-          sigName(defn.erasedFunctionType(sym))
+          sigName(defn.functionTypeErasure(sym))
         else
           val cls = normalizeClass(sym.asClass)
           val fullName =
@@ -821,10 +832,10 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
         sigName(this(tp))
       case tp: TypeProxy =>
         sigName(tp.underlying)
-      case _: ErrorType | WildcardType | NoType =>
-        tpnme.WILDCARD
       case tp: WildcardType =>
-        sigName(tp.optBounds)
+        tpnme.Uninstantiated
+      case _: ErrorType | NoType =>
+        tpnme.ERROR
       case _ =>
         val erasedTp = this(tp)
         assert(erasedTp ne tp, tp)
diff --git a/compiler/src/dotty/tools/dotc/core/TypeErrors.scala b/compiler/src/dotty/tools/dotc/core/TypeErrors.scala
index 950963497fbc..c9ca98f65f5e 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeErrors.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeErrors.scala
@@ -141,7 +141,7 @@ class CyclicReference private (val denot: SymDenotation) extends TypeError {
         }
 
       // Give up and give generic errors.
-      else if (cycleSym.isOneOf(GivenOrImplicit, butNot = Method) && cycleSym.owner.isTerm)
+      else if (cycleSym.isOneOf(GivenOrImplicitVal, butNot = Method) && cycleSym.owner.isTerm)
         CyclicReferenceInvolvingImplicit(cycleSym)
       else
         CyclicReferenceInvolving(denot)
diff --git a/compiler/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala
index eb353744ae82..2d5c2a6da88a 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeOps.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeOps.scala
@@ -6,7 +6,6 @@ import Contexts._, Types._, Symbols._, Names._, Flags._
 import SymDenotations._
 import util.Spans._
 import util.Stats
-import NameKinds.DepParamName
 import Decorators._
 import StdNames._
 import collection.mutable
@@ -138,6 +137,8 @@ object TypeOps:
             tp2
           case tp1 => tp1
         }
+      case defn.MatchCase(pat, body) =>
+        defn.MatchCase(simplify(pat, theMap), body)
       case tp: AppliedType =>
         tp.tycon match
           case tycon: TypeRef if tycon.info.isInstanceOf[MatchAlias] =>
@@ -163,14 +164,22 @@ object TypeOps:
         // with Nulls (which have no base classes). Under -Yexplicit-nulls, we take
         // corrective steps, so no widening is wanted.
         simplify(l, theMap) | simplify(r, theMap)
-      case AnnotatedType(parent, annot)
-      if !ctx.mode.is(Mode.Type) && annot.symbol == defn.UncheckedVarianceAnnot =>
-        simplify(parent, theMap)
+      case tp @ AnnotatedType(parent, annot) =>
+        val parent1 = simplify(parent, theMap)
+        if annot.symbol == defn.UncheckedVarianceAnnot
+            && !ctx.mode.is(Mode.Type)
+            && !theMap.isInstanceOf[SimplifyKeepUnchecked]
+        then parent1
+        else tp.derivedAnnotatedType(parent1, annot)
       case _: MatchType =>
         val normed = tp.tryNormalize
         if (normed.exists) normed else mapOver
       case tp: MethodicType =>
         tp // See documentation of `Types#simplified`
+      case tp: SkolemType =>
+        // Mapping over a skolem creates a new skolem which by definition won't
+        // be =:= to the original one.
+        tp
       case _ =>
         mapOver
     }
@@ -180,6 +189,8 @@ object TypeOps:
     def apply(tp: Type): Type = simplify(tp, this)
   }
 
+  class SimplifyKeepUnchecked(using Context) extends SimplifyMap
+
   /** Approximate union type by intersection of its dominators.
    *  That is, replace a union type Tn | ... | Tn
    *  by the smallest intersection type of base-class instances of T1,...,Tn.
@@ -343,7 +354,12 @@ object TypeOps:
 
     tp match {
       case tp: OrType =>
-        approximateOr(tp.tp1, tp.tp2)
+        (tp.tp1.dealias, tp.tp2.dealias) match
+          case (tp1 @ AppliedType(tycon1, args1), tp2 @ AppliedType(tycon2, args2))
+          if tycon1.typeSymbol == tycon2.typeSymbol && (tycon1 =:= tycon2) =>
+            mergeRefinedOrApplied(tp1, tp2)
+          case (tp1, tp2) =>
+            approximateOr(tp1, tp2)
       case _ =>
         tp
     }
@@ -394,93 +410,109 @@ object TypeOps:
     }
   }
 
-  /** An upper approximation of the given type `tp` that does not refer to any symbol in `symsToAvoid`.
+  /** An approximating map that drops NamedTypes matching `toAvoid` and wildcard types. */
+  abstract class AvoidMap(using Context) extends AvoidWildcardsMap:
+    @threadUnsafe lazy val localParamRefs = util.HashSet[Type]()
+
+    def toAvoid(tp: NamedType): Boolean
+
+    /** True iff all NamedTypes on this prefix are static */
+    override def isStaticPrefix(pre: Type)(using Context): Boolean = pre match
+      case pre: NamedType =>
+        val sym = pre.currentSymbol
+        sym.is(Package) || sym.isStatic && isStaticPrefix(pre.prefix)
+      case _ => true
+
+    override def apply(tp: Type): Type = tp match
+      case tp: TermRef
+      if toAvoid(tp) =>
+        tp.info.widenExpr.dealias match {
+          case info: SingletonType => apply(info)
+          case info => range(defn.NothingType, apply(info))
+        }
+      case tp: TypeRef if toAvoid(tp) =>
+        tp.info match {
+          case info: AliasingBounds =>
+            apply(info.alias)
+          case TypeBounds(lo, hi) =>
+            range(atVariance(-variance)(apply(lo)), apply(hi))
+          case info: ClassInfo =>
+            range(defn.NothingType, apply(classBound(info)))
+          case _ =>
+            emptyRange // should happen only in error cases
+        }
+      case tp: ThisType =>
+        // ThisType is only used inside a class.
+        // Therefore, either they don't appear in the type to be avoided, or
+        // it must be a class that encloses the block whose type is to be avoided.
+        tp
+      case tp: LazyRef =>
+        if localParamRefs.contains(tp.ref) then tp
+        else if isExpandingBounds then emptyRange
+        else mapOver(tp)
+      case tl: HKTypeLambda =>
+        localParamRefs ++= tl.paramRefs
+        mapOver(tl)
+      case _ =>
+        super.apply(tp)
+    end apply
+
+    /** Three deviations from standard derivedSelect:
+     *   1. We first try a widening conversion to the type's info with
+     *      the original prefix. Since the original prefix is known to
+     *      be a subtype of the returned prefix, this can improve results.
+     *   2. Then, if the approximation result is a singleton reference C#x.type, we
+     *      replace by the widened type, which is usually more natural.
+     *   3. Finally, we need to handle the case where the prefix type does not have a member
+     *      named `tp.name` anymmore. In that case, we need to fall back to Bot..Top.
+     */
+    override def derivedSelect(tp: NamedType, pre: Type) =
+      if (pre eq tp.prefix)
+        tp
+      else tryWiden(tp, tp.prefix).orElse {
+        if (tp.isTerm && variance > 0 && !pre.isSingleton)
+          apply(tp.info.widenExpr)
+        else if (upper(pre).member(tp.name).exists)
+          super.derivedSelect(tp, pre)
+        else
+          range(defn.NothingType, defn.AnyType)
+      }
+  end AvoidMap
+
+  /** An upper approximation of the given type `tp` that does not refer to any symbol in `symsToAvoid`
+   *  and does not contain any WildcardType.
    *  We need to approximate with ranges:
    *
    *    term references to symbols in `symsToAvoid`,
    *    term references that have a widened type of which some part refers
    *    to a symbol in `symsToAvoid`,
    *    type references to symbols in `symsToAvoid`,
-   *    this types of classes in `symsToAvoid`.
    *
    *  Type variables that would be interpolated to a type that
    *  needs to be widened are replaced by the widened interpolation instance.
+   *
+   *  TODO: Could we replace some or all usages of this method by
+   *  `LevelAvoidMap` instead? It would be good to investigate this in details
+   *  but when I tried it, avoidance for inlined trees broke because `TreeMap`
+   *  does not update `ctx.nestingLevel` when entering a block so I'm leaving
+   *  this as Future Work™.
    */
   def avoid(tp: Type, symsToAvoid: => List[Symbol])(using Context): Type = {
-    val widenMap = new ApproximatingTypeMap {
+    val widenMap = new AvoidMap {
       @threadUnsafe lazy val forbidden = symsToAvoid.toSet
-      @threadUnsafe lazy val localParamRefs = util.HashSet[Type]()
-      def toAvoid(sym: Symbol) = !sym.isStatic && forbidden.contains(sym)
-      def partsToAvoid = new NamedPartsAccumulator(tp => toAvoid(tp.symbol))
+      def toAvoid(tp: NamedType) =
+        val sym = tp.symbol
+        !sym.isStatic && forbidden.contains(sym)
 
-      /** True iff all NamedTypes on this prefix are static */
-      override def isStaticPrefix(pre: Type)(using Context): Boolean = pre match
-        case pre: NamedType =>
-          val sym = pre.currentSymbol
-          sym.is(Package) || sym.isStatic && isStaticPrefix(pre.prefix)
-        case _ => true
-
-      def apply(tp: Type): Type = tp match {
-        case tp: TermRef
-        if toAvoid(tp.symbol) || partsToAvoid(Nil, tp.info).nonEmpty =>
-          tp.info.widenExpr.dealias match {
-            case info: SingletonType => apply(info)
-            case info => range(defn.NothingType, apply(info))
-          }
-        case tp: TypeRef if toAvoid(tp.symbol) =>
-          tp.info match {
-            case info: AliasingBounds =>
-              apply(info.alias)
-            case TypeBounds(lo, hi) =>
-              range(atVariance(-variance)(apply(lo)), apply(hi))
-            case info: ClassInfo =>
-              range(defn.NothingType, apply(classBound(info)))
-            case _ =>
-              emptyRange // should happen only in error cases
-          }
-        case tp: ThisType =>
-          // ThisType is only used inside a class.
-          // Therefore, either they don't appear in the type to be avoided, or
-          // it must be a class that encloses the block whose type is to be avoided.
-          tp
-        case tp: SkolemType if partsToAvoid(Nil, tp.info).nonEmpty =>
-          range(defn.NothingType, apply(tp.info))
+      override def apply(tp: Type): Type = tp match
         case tp: TypeVar if mapCtx.typerState.constraint.contains(tp) =>
           val lo = TypeComparer.instanceType(
             tp.origin, fromBelow = variance > 0 || variance == 0 && tp.hasLowerBound)(using mapCtx)
           val lo1 = apply(lo)
           if (lo1 ne lo) lo1 else tp
-        case tp: LazyRef =>
-          if localParamRefs.contains(tp.ref) then tp
-          else if isExpandingBounds then emptyRange
-          else mapOver(tp)
-        case tl: HKTypeLambda =>
-          localParamRefs ++= tl.paramRefs
-          mapOver(tl)
         case _ =>
-          mapOver(tp)
-      }
-
-      /** Three deviations from standard derivedSelect:
-       *   1. We first try a widening conversion to the type's info with
-       *      the original prefix. Since the original prefix is known to
-       *      be a subtype of the returned prefix, this can improve results.
-       *   2. Then, if the approximation result is a singleton reference C#x.type, we
-       *      replace by the widened type, which is usually more natural.
-       *   3. Finally, we need to handle the case where the prefix type does not have a member
-       *      named `tp.name` anymmore. In that case, we need to fall back to Bot..Top.
-       */
-      override def derivedSelect(tp: NamedType, pre: Type) =
-        if (pre eq tp.prefix)
-          tp
-        else tryWiden(tp, tp.prefix).orElse {
-          if (tp.isTerm && variance > 0 && !pre.isSingleton)
-          	apply(tp.info.widenExpr)
-          else if (upper(pre).member(tp.name).exists)
-            super.derivedSelect(tp, pre)
-          else
-            range(defn.NothingType, defn.AnyType)
-        }
+          super.apply(tp)
+      end apply
     }
 
     widenMap(tp)
@@ -685,14 +717,28 @@ object TypeOps:
    */
   private def instantiateToSubType(tp1: NamedType, tp2: Type)(using Context): Type = {
     // In order for a child type S to qualify as a valid subtype of the parent
-    // T, we need to test whether it is possible S <: T. Therefore, we replace
-    // type parameters in T with tvars, and see if the subtyping is true.
-    val approximateTypeParams = new TypeMap {
+    // T, we need to test whether it is possible S <: T.
+    //
+    // The check is different from subtype checking due to type parameters and
+    // `this`. We perform the following operations to approximate the parameters:
+    //
+    // 1. Replace type parameters in T with tvars
+    // 2. Replace `A.this.C` with `A#C` (see tests/patmat/i12681.scala)
+    // 3. Replace non-reducing MatchType with its bound
+    //
+    val approximateParent = new TypeMap {
       val boundTypeParams = util.HashMap[TypeRef, TypeVar]()
 
       def apply(tp: Type): Type = tp.dealias match {
-        case _: MatchType =>
-          tp // break cycles
+        case tp: MatchType =>
+          val reduced = tp.reduced
+          if reduced.exists then tp // break cycles
+          else mapOver(tp.bound) // if the match type doesn't statically reduce
+                                 // then to avoid it failing the <:<
+                                 // we'll approximate by widening to its bounds
+
+        case ThisType(tref: TypeRef) if !tref.symbol.isStaticOwner =>
+          tref
 
         case tp: TypeRef if !tp.symbol.isClass =>
           def lo = LazyRef.of(apply(tp.underlying.loBound))
@@ -710,7 +756,7 @@ object TypeOps:
             tv
           end if
 
-        case AppliedType(tycon: TypeRef, _) if !tycon.dealias.typeSymbol.isClass =>
+        case tp @ AppliedType(tycon: TypeRef, _) if !tycon.dealias.typeSymbol.isClass && !tp.isMatchAlias =>
 
           // In tests/patmat/i3645g.scala, we need to tell whether it's possible
           // that K1 <: K[Foo]. If yes, we issue a warning; otherwise, no
@@ -762,7 +808,8 @@ object TypeOps:
             this(tref)
           else {
             prefixTVar = WildcardType  // prevent recursive call from assigning it
-            prefixTVar = newTypeVar(TypeBounds.upper(this(tref)))
+            val tref2 = this(tref.applyIfParameterized(tref.typeParams.map(_ => TypeBounds.empty)))
+            prefixTVar = newTypeVar(TypeBounds.upper(tref2))
             prefixTVar
           }
         case tp => mapOver(tp)
@@ -779,7 +826,7 @@ object TypeOps:
     // we manually patch subtyping check instead of changing TypeComparer.
     // See tests/patmat/i3645b.scala
     def parentQualify(tp1: Type, tp2: Type) = tp1.classSymbol.info.parents.exists { parent =>
-      parent.argInfos.nonEmpty && approximateTypeParams(parent) <:< tp2
+      parent.argInfos.nonEmpty && approximateParent(parent) <:< tp2
     }
 
     def instantiate(): Type = {
@@ -789,8 +836,8 @@ object TypeOps:
 
     if (protoTp1 <:< tp2) instantiate()
     else {
-      val protoTp2 = approximateTypeParams(tp2)
-      if (protoTp1 <:< protoTp2 || parentQualify(protoTp1, protoTp2)) instantiate()
+      val approxTp2 = approximateParent(tp2)
+      if (protoTp1 <:< approxTp2 || parentQualify(protoTp1, approxTp2)) instantiate()
       else NoType
     }
   }
@@ -798,4 +845,11 @@ object TypeOps:
   def nestedPairs(ts: List[Type])(using Context): Type =
     ts.foldRight(defn.EmptyTupleModule.termRef: Type)(defn.PairClass.typeRef.appliedTo(_, _))
 
+  class StripTypeVarsMap(using Context) extends TypeMap:
+    def apply(tp: Type) = mapOver(tp).stripTypeVar
+
+  /** Apply [[Type.stripTypeVar]] recursively. */
+  def stripTypeVars(tp: Type)(using Context): Type =
+    new StripTypeVarsMap().apply(tp)
+
 end TypeOps
diff --git a/compiler/src/dotty/tools/dotc/core/TyperState.scala b/compiler/src/dotty/tools/dotc/core/TyperState.scala
index 8b4b6a476d1b..6163eebfbef4 100644
--- a/compiler/src/dotty/tools/dotc/core/TyperState.scala
+++ b/compiler/src/dotty/tools/dotc/core/TyperState.scala
@@ -22,6 +22,22 @@ object TyperState {
       .init(null, OrderingConstraint.empty)
       .setReporter(new ConsoleReporter())
       .setCommittable(true)
+
+  opaque type Snapshot = (Constraint, TypeVars, TypeVars)
+
+  extension (ts: TyperState)
+    def snapshot()(using Context): Snapshot =
+      var previouslyInstantiated: TypeVars = SimpleIdentitySet.empty
+      for tv <- ts.ownedVars do if tv.inst.exists then previouslyInstantiated += tv
+      (ts.constraint, ts.ownedVars, previouslyInstantiated)
+
+    def resetTo(state: Snapshot)(using Context): Unit =
+      val (c, tvs, previouslyInstantiated) = state
+      for tv <- tvs do
+        if tv.inst.exists && !previouslyInstantiated.contains(tv) then
+          tv.resetInst(ts)
+      ts.ownedVars = tvs
+      ts.constraint = c
 }
 
 class TyperState() {
@@ -44,6 +60,8 @@ class TyperState() {
   def constraint_=(c: Constraint)(using Context): Unit = {
     if (Config.debugCheckConstraintsClosed && isGlobalCommittable) c.checkClosed()
     myConstraint = c
+    if Config.checkConsistentVars && !ctx.reporter.errorsReported then
+      c.checkConsistentVars()
   }
 
   private var previousConstraint: Constraint = _
@@ -61,7 +79,12 @@ class TyperState() {
 
   private var isCommitted: Boolean = _
 
-  /** The set of uninstantiated type variables which have this state as their owning state */
+  /** The set of uninstantiated type variables which have this state as their owning state.
+   *
+   *  Invariant:
+   *   if `tstate.isCommittable` then
+   *     `tstate.ownedVars.contains(tvar)` iff `tvar.owningState.get eq tstate`
+   */
   private var myOwnedVars: TypeVars = _
   def ownedVars: TypeVars = myOwnedVars
   def ownedVars_=(vs: TypeVars): Unit = myOwnedVars = vs
@@ -80,11 +103,12 @@ class TyperState() {
     this
 
   /** A fresh typer state with the same constraint as this one. */
-  def fresh(reporter: Reporter = StoreReporter(this.reporter)): TyperState =
+  def fresh(reporter: Reporter = StoreReporter(this.reporter, fromTyperState = true),
+      committable: Boolean = this.isCommittable): TyperState =
     util.Stats.record("TyperState.fresh")
     TyperState().init(this, this.constraint)
       .setReporter(reporter)
-      .setCommittable(this.isCommittable)
+      .setCommittable(committable)
 
   /** The uninstantiated variables */
   def uninstVars: collection.Seq[TypeVar] = constraint.uninstVars
@@ -115,24 +139,110 @@ class TyperState() {
    */
   def commit()(using Context): Unit = {
     Stats.record("typerState.commit")
-    assert(isCommittable)
+    assert(isCommittable, s"$this is not committable")
+    assert(!isCommitted, s"$this is already committed")
+    reporter.flush()
+    setCommittable(false)
     val targetState = ctx.typerState
+
+    // Committing into an already committed TyperState usually doesn't make
+    // sense since it means the constraints we're committing won't be propagated
+    // further, but it can happen if the targetState gets captured in a reported
+    // Message, because forcing that Message might involve creating and
+    // committing new TyperStates into the captured one after its been committed.
+    assert(!targetState.isCommitted || targetState.reporter.hasErrors || targetState.reporter.hasWarnings,
+      s"Attempt to commit $this into already committed $targetState")
+
     if constraint ne targetState.constraint then
       Stats.record("typerState.commit.new constraint")
       constr.println(i"committing $this to $targetState, fromConstr = $constraint, toConstr = ${targetState.constraint}")
-      if targetState.constraint eq previousConstraint then targetState.constraint = constraint
-      else targetState.mergeConstraintWith(this)
-    if !ownedVars.isEmpty then
-      for tvar <- ownedVars do
-        tvar.owningState = new WeakReference(targetState)
-      targetState.ownedVars ++= ownedVars
+      if targetState.constraint eq previousConstraint then
+        targetState.constraint = constraint
+        if !ownedVars.isEmpty then ownedVars.foreach(targetState.includeVar)
+      else
+        targetState.mergeConstraintWith(this)
     targetState.gc()
-    reporter.flush()
     isCommitted = true
+    ownedVars = SimpleIdentitySet.empty
   }
 
-  def mergeConstraintWith(that: TyperState)(using Context): Unit =
-    constraint = constraint & (that.constraint, otherHasErrors = that.reporter.errorsReported)
+  /** Ensure that this constraint does not associate different TypeVars for the
+   *  same type lambda than the `other` constraint. Do this by renaming type lambdas
+   *  in this constraint and its predecessors where necessary.
+   */
+  def ensureNotConflicting(other: Constraint)(using Context): Unit =
+    val conflicting = constraint.domainLambdas.filter(constraint.hasConflictingTypeVarsFor(_, other))
+    for tl <- conflicting do
+      val tl1 = constraint.ensureFresh(tl)
+      for case (tvar: TypeVar, pref1) <- tl.paramRefs.map(constraint.typeVarOfParam).lazyZip(tl1.paramRefs) do
+        tvar.setOrigin(pref1)
+      var ts = this
+      while ts.constraint.domainLambdas.contains(tl) do
+        ts.constraint = ts.constraint.subst(tl, tl1)
+        ts = ts.previous
+
+  /** Integrate the constraints from `that` into this TyperState.
+   *
+   *  @pre If `this` and `that` are committable, `that` must not contain any type variable which
+   *       does not exist in `this` (in other words, all its type variables must
+   *       be owned by a common parent of `this` and `that`).
+   */
+  def mergeConstraintWith(that: TyperState)(using Context): this.type =
+    if this eq that then return this
+
+    that.ensureNotConflicting(constraint)
+
+    val comparingCtx = ctx.withTyperState(this)
+
+    inContext(comparingCtx)(comparing(typeComparer =>
+      val other = that.constraint
+      val res = other.domainLambdas.forall(tl =>
+        // Integrate the type lambdas from `other`
+        constraint.contains(tl) || other.isRemovable(tl) || {
+          val tvars = tl.paramRefs.map(other.typeVarOfParam(_)).collect { case tv: TypeVar => tv }
+          if this.isCommittable then
+            tvars.foreach(tvar => if !tvar.inst.exists && !isOwnedAnywhere(this, tvar) then includeVar(tvar))
+          typeComparer.addToConstraint(tl, tvars)
+        }) &&
+        // Integrate the additional constraints on type variables from `other`
+        constraint.uninstVars.forall(tv =>
+          val p = tv.origin
+          val otherLos = other.lower(p)
+          val otherHis = other.upper(p)
+          val otherEntry = other.entry(p)
+          (  (otherLos eq constraint.lower(p)) || otherLos.forall(_ <:< p)) &&
+          (  (otherHis eq constraint.upper(p)) || otherHis.forall(p <:< _)) &&
+          ((otherEntry eq constraint.entry(p)) || otherEntry.match
+            case NoType =>
+              true
+            case tp: TypeBounds =>
+              tp.contains(tv)
+            case tp =>
+              tv =:= tp
+          )
+        )
+      assert(res || ctx.reporter.errorsReported, i"cannot merge $constraint with $other.")
+    ))
+
+    for tl <- constraint.domainLambdas do
+      if constraint.isRemovable(tl) then constraint = constraint.remove(tl)
+    this
+  end mergeConstraintWith
+
+  /** Take ownership of `tvar`.
+   *
+   *  @pre `tvar` is not owned by a committable TyperState. This ensures
+   *       each tvar can only be instantiated by one TyperState.
+   */
+  private def includeVar(tvar: TypeVar)(using Context): Unit =
+    val oldState = tvar.owningState.get
+    assert(oldState == null || !oldState.isCommittable,
+      i"$this attempted to take ownership of $tvar which is already owned by committable $oldState")
+    tvar.owningState = new WeakReference(this)
+    ownedVars += tvar
+
+  private def isOwnedAnywhere(ts: TyperState, tvar: TypeVar): Boolean =
+    ts.ownedVars.contains(tvar) || ts.previous != null && isOwnedAnywhere(ts.previous, tvar)
 
   /** Make type variable instances permanent by assigning to `inst` field if
    *  type variable instantiation cannot be retracted anymore. Then, remove
@@ -143,14 +253,15 @@ class TyperState() {
       Stats.record("typerState.gc")
       val toCollect = new mutable.ListBuffer[TypeLambda]
       for tvar <- ownedVars do
-        if !tvar.inst.exists then
-          val inst = constraint.instType(tvar)
-          if inst.exists then
-            tvar.inst = inst
-            val lam = tvar.origin.binder
-            if constraint.isRemovable(lam) then toCollect += lam
-      for poly <- toCollect do
-        constraint = constraint.remove(poly)
+        assert(tvar.owningState.get eq this, s"Inconsistent state in $this: it owns $tvar whose owningState is ${tvar.owningState.get}")
+        assert(!tvar.inst.exists, s"Inconsistent state in $this: it owns $tvar which is already instantiated")
+        val inst = constraint.instType(tvar)
+        if inst.exists then
+          tvar.setInst(inst)
+          val tl = tvar.origin.binder
+          if constraint.isRemovable(tl) then toCollect += tl
+      for tl <- toCollect do
+        constraint = constraint.remove(tl)
 
   override def toString: String = {
     def ids(state: TyperState): List[String] =
diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index f9cbf932f9c8..b4a6172a6659 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -168,7 +168,11 @@ object Types {
       case _: SingletonType | NoPrefix => true
       case tp: RefinedOrRecType => tp.parent.isStable
       case tp: ExprType => tp.resultType.isStable
-      case tp: AnnotatedType => tp.parent.isStable
+      case tp: AnnotatedType =>
+        // NOTE UncheckedStableAnnot was originally meant to be put on fields,
+        // not on types. Allowing it on types is a Scala 3 extension. See:
+        // https://www.scala-lang.org/files/archive/spec/2.11/11-annotations.html#scala-compiler-annotations
+        tp.annot.symbol == defn.UncheckedStableAnnot || tp.parent.isStable
       case tp: AndType =>
         // TODO: fix And type check when tp contains type parames for explicit-nulls flow-typing
         // see: tests/explicit-nulls/pos/flow-stable.scala.disabled
@@ -295,7 +299,13 @@ object Types {
       loop(this)
     }
 
-    def isFromJavaObject(using Context): Boolean = typeSymbol eq defn.FromJavaObjectSymbol
+    def isFromJavaObject(using Context): Boolean =
+      isRef(defn.ObjectClass) && (typeSymbol eq defn.FromJavaObjectSymbol)
+
+    def containsFromJavaObject(using Context): Boolean = this match
+      case tp: OrType => tp.tp1.containsFromJavaObject || tp.tp2.containsFromJavaObject
+      case tp: AndType => tp.tp1.containsFromJavaObject && tp.tp2.containsFromJavaObject
+      case _ => isFromJavaObject
 
     /** True iff `symd` is a denotation of a class type parameter and the reference
      *  `<pre> . <symd>` is an actual argument reference, i.e. `pre` is not the
@@ -423,18 +433,23 @@ object Types {
     def isMatch(using Context): Boolean = stripped match {
       case _: MatchType => true
       case tp: HKTypeLambda => tp.resType.isMatch
+      case tp: AppliedType => tp.isMatchAlias
       case _ => false
     }
 
     /** Is this a higher-kinded type lambda with given parameter variances? */
     def isDeclaredVarianceLambda: Boolean = false
 
+    /** Does this type contain wildcard types? */
+    final def containsWildcardTypes(using Context) =
+      existsPart(_.isInstanceOf[WildcardType], StopAt.Static, forceLazy = false)
+
 // ----- Higher-order combinators -----------------------------------
 
     /** Returns true if there is a part of this type that satisfies predicate `p`.
      */
-    final def existsPart(p: Type => Boolean, stopAtStatic: Boolean = false, forceLazy: Boolean = true)(using Context): Boolean =
-      new ExistsAccumulator(p, stopAtStatic, forceLazy).apply(false, this)
+    final def existsPart(p: Type => Boolean, stopAt: StopAt = StopAt.None, forceLazy: Boolean = true)(using Context): Boolean =
+      new ExistsAccumulator(p, stopAt, forceLazy).apply(false, this)
 
     /** Returns true if all parts of this type satisfy predicate `p`.
      */
@@ -442,8 +457,8 @@ object Types {
       !existsPart(!p(_))
 
     /** Performs operation on all parts of this type */
-    final def foreachPart(p: Type => Unit, stopAtStatic: Boolean = false)(using Context): Unit =
-      new ForeachAccumulator(p, stopAtStatic).apply((), this)
+    final def foreachPart(p: Type => Unit, stopAt: StopAt = StopAt.None)(using Context): Unit =
+      new ForeachAccumulator(p, stopAt).apply((), this)
 
     /** The parts of this type which are type or term refs and which
      *  satisfy predicate `p`.
@@ -838,18 +853,23 @@ object Types {
       def goAnd(l: Type, r: Type) =
         go(l).meet(go(r), pre, safeIntersection = ctx.base.pendingMemberSearches.contains(name))
 
-      def goOr(tp: OrType) = tp match {
-        case OrNull(tp1) if Nullables.unsafeNullsEnabled =>
-          // Selecting `name` from a type `T | Null` is like selecting `name` from `T`, if
-          // unsafeNulls is enabled. This can throw at runtime, but we trade soundness for usability.
-          tp1.findMember(name, pre.stripNull, required, excluded)
-        case _ =>
+      def goOr(tp: OrType) =
+        inline def searchAfterJoin =
           // we need to keep the invariant that `pre <: tp`. Branch `union-types-narrow-prefix`
           // achieved that by narrowing `pre` to each alternative, but it led to merge errors in
           // lots of places. The present strategy is instead of widen `tp` using `join` to be a
           // supertype of `pre`.
           go(tp.join)
-      }
+
+        if Nullables.unsafeNullsEnabled then tp match
+          case OrNull(tp1) if tp1 <:< defn.ObjectType  =>
+            // Selecting `name` from a type `T | Null` is like selecting `name` from `T`, if
+            // unsafeNulls is enabled and T is a subtype of AnyRef.
+            // This can throw at runtime, but we trade soundness for usability.
+            tp1.findMember(name, pre.stripNull, required, excluded)
+          case _ =>
+            searchAfterJoin
+        else searchAfterJoin
 
       val recCount = ctx.base.findMemberCount
       if (recCount >= Config.LogPendingFindMemberThreshold)
@@ -1038,17 +1058,15 @@ object Types {
       TypeComparer.isSameTypeWhenFrozen(this, that)
 
     /** Is this type a primitive value type which can be widened to the primitive value type `that`? */
-    def isValueSubType(that: Type)(using Context): Boolean = widen match {
+    def isValueSubType(that: Type)(using Context): Boolean = widenDealias match
       case self: TypeRef if self.symbol.isPrimitiveValueClass =>
-        that.widenExpr match {
+        that.widenExpr.dealias match
           case that: TypeRef if that.symbol.isPrimitiveValueClass =>
             defn.isValueSubClass(self.symbol, that.symbol)
           case _ =>
             false
-        }
       case _ =>
         false
-    }
 
     def relaxed_<:<(that: Type)(using Context): Boolean =
       (this <:< that) || (this isValueSubType that)
@@ -1272,13 +1290,10 @@ object Types {
       case tp =>
         tp.widenUnionWithoutNull
 
+    /** Overridden in OrType */
     def widenUnionWithoutNull(using Context): Type = widen match
-      case tp @ OrType(lhs, rhs) if tp.isSoft =>
-        TypeComparer.lub(lhs.widenUnionWithoutNull, rhs.widenUnionWithoutNull, canConstrain = true) match
-          case union: OrType => union.join
-          case res => res
-      case tp: AndOrType =>
-        tp.derivedAndOrType(tp.tp1.widenUnionWithoutNull, tp.tp2.widenUnionWithoutNull)
+      case tp: AndType =>
+        tp.derivedAndType(tp.tp1.widenUnionWithoutNull, tp.tp2.widenUnionWithoutNull)
       case tp: RefinedType =>
         tp.derivedRefinedType(tp.parent.widenUnion, tp.refinedName, tp.refinedInfo)
       case tp: RecType =>
@@ -1348,25 +1363,26 @@ object Types {
             case Atoms.Unknown => Atoms.Unknown
         case _ => Atoms.Unknown
 
-    private def dealias1(keep: AnnotatedType => Context ?=> Boolean)(using Context): Type = this match {
+    private def dealias1(keep: AnnotatedType => Context ?=> Boolean, keepOpaques: Boolean)(using Context): Type = this match {
       case tp: TypeRef =>
         if (tp.symbol.isClass) tp
         else tp.info match {
-          case TypeAlias(alias) => alias.dealias1(keep)
+          case TypeAlias(alias) if !(keepOpaques && tp.symbol.is(Opaque)) =>
+            alias.dealias1(keep, keepOpaques)
           case _ => tp
         }
       case app @ AppliedType(tycon, _) =>
-        val tycon1 = tycon.dealias1(keep)
-        if (tycon1 ne tycon) app.superType.dealias1(keep)
+        val tycon1 = tycon.dealias1(keep, keepOpaques)
+        if (tycon1 ne tycon) app.superType.dealias1(keep, keepOpaques)
         else this
       case tp: TypeVar =>
         val tp1 = tp.instanceOpt
-        if (tp1.exists) tp1.dealias1(keep) else tp
+        if (tp1.exists) tp1.dealias1(keep, keepOpaques) else tp
       case tp: AnnotatedType =>
-        val tp1 = tp.parent.dealias1(keep)
+        val tp1 = tp.parent.dealias1(keep, keepOpaques)
         if keep(tp) then tp.derivedAnnotatedType(tp1, tp.annot) else tp1
       case tp: LazyRef =>
-        tp.ref.dealias1(keep)
+        tp.ref.dealias1(keep, keepOpaques)
       case _ => this
     }
 
@@ -1374,16 +1390,33 @@ object Types {
      *  TypeVars until type is no longer alias type, annotated type, LazyRef,
      *  or instantiated type variable.
      */
-    final def dealias(using Context): Type = dealias1(keepNever)
+    final def dealias(using Context): Type = dealias1(keepNever, keepOpaques = false)
 
     /** Follow aliases and dereferences LazyRefs and instantiated TypeVars until type
      *  is no longer alias type, LazyRef, or instantiated type variable.
      *  Goes through annotated types and rewraps annotations on the result.
      */
-    final def dealiasKeepAnnots(using Context): Type = dealias1(keepAlways)
+    final def dealiasKeepAnnots(using Context): Type = dealias1(keepAlways, keepOpaques = false)
 
     /** Like `dealiasKeepAnnots`, but keeps only refining annotations */
-    final def dealiasKeepRefiningAnnots(using Context): Type = dealias1(keepIfRefining)
+    final def dealiasKeepRefiningAnnots(using Context): Type = dealias1(keepIfRefining, keepOpaques = false)
+
+    /** Follow non-opaque aliases and dereferences LazyRefs, annotated types and instantiated
+     *  TypeVars until type is no longer alias type, annotated type, LazyRef,
+     *  or instantiated type variable.
+     */
+    final def dealiasKeepOpaques(using Context): Type = dealias1(keepNever, keepOpaques = true)
+
+    /** Approximate this type with a type that does not contain skolem types. */
+    final def deskolemized(using Context): Type =
+      val deskolemizer = new ApproximatingTypeMap {
+        def apply(tp: Type) = /*trace(i"deskolemize($tp) at $variance", show = true)*/
+          tp match {
+            case tp: SkolemType => range(defn.NothingType, atVariance(1)(apply(tp.info)))
+            case _ => mapOver(tp)
+          }
+      }
+      deskolemizer(this)
 
     /** The result of normalization using `tryNormalize`, or the type itself if
      *  tryNormlize yields NoType
@@ -1400,7 +1433,7 @@ object Types {
     def tryNormalize(using Context): Type = NoType
 
     private def widenDealias1(keep: AnnotatedType => Context ?=> Boolean)(using Context): Type = {
-      val res = this.widen.dealias1(keep)
+      val res = this.widen.dealias1(keep, keepOpaques = false)
       if (res eq this) res else res.widenDealias1(keep)
     }
 
@@ -1641,6 +1674,20 @@ object Types {
       case _ => resultType
     }
 
+    /** Determine the expected function type from the prototype. If multiple
+     *  function types are found in a union or intersection, their intersection
+     *  is returned. If no function type is found, Any is returned.
+     */
+    def findFunctionType(using Context): Type = dealias match
+      case tp: AndOrType =>
+        tp.tp1.findFunctionType & tp.tp2.findFunctionType
+      case t if defn.isNonRefinedFunction(t) =>
+        t
+      case t @ SAMType(_) =>
+        t
+      case _ =>
+        defn.AnyType
+
     /** This type seen as a TypeBounds */
     final def bounds(using Context): TypeBounds = this match {
       case tp: TypeBounds => tp
@@ -1688,6 +1735,14 @@ object Types {
     /** If this is a proto type, WildcardType, otherwise the type itself */
     def dropIfProto: Type = this
 
+    /** If this is an AndType, the number of factors, 1 for all other types */
+    def andFactorCount: Int = 1
+
+    /** If this is a OrType, the number of factors if that match `soft`,
+     *  1 for all other types.
+     */
+    def orFactorCount(soft: Boolean): Int = 1
+
 // ----- Substitutions -----------------------------------------------------
 
     /** Substitute all types that refer in their symbol attribute to
@@ -1888,7 +1943,15 @@ object Types {
       case st => st
     }
 
-    /** Same as superType, except that opaque types are treated as transparent aliases */
+    /** Same as superType, except for two differences:
+     *   - opaque types are treated as transparent aliases
+     *   - applied type are matchtype-reduced if possible
+     *
+     *  Note: the reason to reduce match type aliases here and not in `superType`
+     *  is that `superType` is context-independent and cached, whereas matchtype
+     *  reduction depends on context and should not be cached (at least not without
+     *  the very specific cache invalidation condition for matchtypes).
+     */
     def translucentSuperType(using Context): Type = superType
   }
 
@@ -2216,7 +2279,7 @@ object Types {
       if (!d.exists && !allowPrivate && ctx.mode.is(Mode.Interactive))
         // In the IDE we might change a public symbol to private, and would still expect to find it.
         d = memberDenot(prefix, name, true)
-      if (!d.exists && ctx.phaseId > FirstPhaseId && lastDenotation.isInstanceOf[SymDenotation])
+      if (!d.exists && ctx.isAfterTyper && lastDenotation.isInstanceOf[SymDenotation])
         // name has changed; try load in earlier phase and make current
         d = atPhase(ctx.phaseId - 1)(memberDenot(name, allowPrivate)).current
       if (d.isOverloaded)
@@ -2808,12 +2871,16 @@ object Types {
     private var myRef: Type = null
     private var computed = false
 
+    override def tryNormalize(using Context): Type = ref.tryNormalize
+
     def ref(using Context): Type =
       if computed then
         if myRef == null then
           // if errors were reported previously handle this by throwing a CyclicReference
           // instead of crashing immediately. A test case is neg/i6057.scala.
-          assert(ctx.mode.is(Mode.CheckCyclic) || ctx.reporter.errorsReported)
+          assert(ctx.mode.is(Mode.CheckCyclic)
+              || ctx.mode.is(Mode.Printing)
+              || ctx.reporter.errorsReported)
           throw CyclicReference(NoDenotation)
       else
         computed = true
@@ -3070,6 +3137,12 @@ object Types {
       myBaseClasses
     }
 
+    private var myFactorCount = 0
+    override def andFactorCount =
+      if myFactorCount == 0 then
+      	myFactorCount = tp1.andFactorCount + tp2.andFactorCount
+      myFactorCount
+
     def derivedAndType(tp1: Type, tp2: Type)(using Context): Type =
       if ((tp1 eq this.tp1) && (tp2 eq this.tp2)) this
       else AndType.make(tp1, tp2, checkValid = true)
@@ -3095,6 +3168,23 @@ object Types {
       unchecked(tp1, tp2)
     }
 
+    def balanced(tp1: Type, tp2: Type)(using Context): AndType =
+      tp1 match
+        case AndType(tp11, tp12) if tp1.andFactorCount > tp2.andFactorCount * 2 =>
+          if tp11.andFactorCount < tp12.andFactorCount then
+            return apply(tp12, balanced(tp11, tp2))
+          else
+            return apply(tp11, balanced(tp12, tp2))
+        case _ =>
+      tp2 match
+        case AndType(tp21, tp22) if tp2.andFactorCount > tp1.andFactorCount * 2 =>
+          if tp22.andFactorCount < tp21.andFactorCount then
+            return apply(balanced(tp1, tp22), tp21)
+          else
+            return apply(balanced(tp1, tp21), tp22)
+        case _ =>
+      apply(tp1, tp2)
+
     def unchecked(tp1: Type, tp2: Type)(using Context): AndType = {
       assertUnerased()
       unique(new CachedAndType(tp1, tp2))
@@ -3141,6 +3231,14 @@ object Types {
       myBaseClasses
     }
 
+    private var myFactorCount = 0
+    override def orFactorCount(soft: Boolean) =
+      if this.isSoft == soft then
+        if myFactorCount == 0 then
+          myFactorCount = tp1.orFactorCount(soft) + tp2.orFactorCount(soft)
+        myFactorCount
+      else 1
+
     assert(tp1.isValueTypeOrWildcard &&
            tp2.isValueTypeOrWildcard, s"$tp1 $tp2")
 
@@ -3158,6 +3256,20 @@ object Types {
       myJoin
     }
 
+    private var myUnion: Type = _
+    private var myUnionPeriod: Period = Nowhere
+
+    override def widenUnionWithoutNull(using Context): Type =
+      if myUnionPeriod != ctx.period then
+        myUnion =
+          if isSoft then
+            TypeComparer.lub(tp1.widenUnionWithoutNull, tp2.widenUnionWithoutNull, canConstrain = true, isSoft = isSoft) match
+              case union: OrType => union.join
+              case res => res
+          else derivedOrType(tp1.widenUnionWithoutNull, tp2.widenUnionWithoutNull, soft = isSoft)
+        if !isProvisional then myUnionPeriod = ctx.period
+      myUnion
+
     private var atomsRunId: RunId = NoRunId
     private var myAtoms: Atoms = _
     private var myWidened: Type = _
@@ -3170,7 +3282,7 @@ object Types {
           else tp1.atoms | tp2.atoms
         val tp1w = tp1.widenSingletons
         val tp2w = tp2.widenSingletons
-        myWidened = if ((tp1 eq tp1w) && (tp2 eq tp2w)) this else tp1w | tp2w
+        myWidened = if ((tp1 eq tp1w) && (tp2 eq tp2w)) this else TypeComparer.lub(tp1w, tp2w, isSoft = isSoft)
         atomsRunId = ctx.runId
 
     override def atoms(using Context): Atoms =
@@ -3198,10 +3310,29 @@ object Types {
   final class CachedOrType(tp1: Type, tp2: Type, override val isSoft: Boolean) extends OrType(tp1, tp2)
 
   object OrType {
+
     def apply(tp1: Type, tp2: Type, soft: Boolean)(using Context): OrType = {
       assertUnerased()
       unique(new CachedOrType(tp1, tp2, soft))
     }
+
+    def balanced(tp1: Type, tp2: Type, soft: Boolean)(using Context): OrType =
+      tp1 match
+        case OrType(tp11, tp12) if tp1.orFactorCount(soft) > tp2.orFactorCount(soft) * 2 =>
+          if tp11.orFactorCount(soft) < tp12.orFactorCount(soft) then
+            return apply(tp12, balanced(tp11, tp2, soft), soft)
+          else
+            return apply(tp11, balanced(tp12, tp2, soft), soft)
+        case _ =>
+      tp2 match
+        case OrType(tp21, tp22) if tp2.orFactorCount(soft) > tp1.orFactorCount(soft) * 2 =>
+          if tp22.orFactorCount(soft) < tp21.orFactorCount(soft) then
+            return apply(balanced(tp1, tp22, soft), tp21, soft)
+          else
+            return apply(balanced(tp1, tp21, soft), tp22, soft)
+        case _ =>
+      apply(tp1, tp2, soft)
+
     def make(tp1: Type, tp2: Type, soft: Boolean)(using Context): Type =
       if (tp1 eq tp2) tp1
       else apply(tp1, tp2, soft)
@@ -3495,6 +3626,9 @@ object Types {
           case tp: AppliedType => tp.fold(status, compute(_, _, theAcc))
           case tp: TypeVar if !tp.isInstantiated => combine(status, Provisional)
           case tp: TermParamRef if tp.binder eq thisLambdaType => TrueDeps
+          case AnnotatedType(parent, ann) =>
+            if ann.refersToParamOf(thisLambdaType) then TrueDeps
+            else compute(status, parent, theAcc)
           case _: ThisType | _: BoundType | NoPrefix => status
           case _ =>
             (if theAcc != null then theAcc else DepAcc()).foldOver(status, tp)
@@ -3547,8 +3681,10 @@ object Types {
       if (isResultDependent) {
         val dropDependencies = new ApproximatingTypeMap {
           def apply(tp: Type) = tp match {
-            case tp @ TermParamRef(thisLambdaType, _) =>
+            case tp @ TermParamRef(`thisLambdaType`, _) =>
               range(defn.NothingType, atVariance(1)(apply(tp.underlying)))
+            case AnnotatedType(parent, ann) if ann.refersToParamOf(thisLambdaType) =>
+              mapOver(parent)
             case _ => mapOver(tp)
           }
         }
@@ -3640,9 +3776,15 @@ object Types {
         case ExprType(resType) => ExprType(AnnotatedType(resType, Annotation(defn.InlineParamAnnot)))
         case _ => AnnotatedType(tp, Annotation(defn.InlineParamAnnot))
       }
+      def translateErased(tp: Type): Type = tp match {
+        case ExprType(resType) => ExprType(AnnotatedType(resType, Annotation(defn.ErasedParamAnnot)))
+        case _ => AnnotatedType(tp, Annotation(defn.ErasedParamAnnot))
+      }
       def paramInfo(param: Symbol) = {
-        val paramType = param.info.annotatedToRepeated
-        if (param.is(Inline)) translateInline(paramType) else paramType
+        var paramType = param.info.annotatedToRepeated
+        if (param.is(Inline)) paramType = translateInline(paramType)
+        if (param.is(Erased)) paramType = translateErased(paramType)
+        paramType
       }
 
       apply(params.map(_.name.asTermName))(
@@ -3735,9 +3877,6 @@ object Types {
     val paramInfos: List[TypeBounds] = paramInfosExp(this)
     val resType: Type = resultTypeExp(this)
 
-    assert(resType.isInstanceOf[TermType], this)
-    assert(paramNames.nonEmpty)
-
     private def setVariances(tparams: List[LambdaParam], vs: List[Variance]): Unit =
       if tparams.nonEmpty then
         tparams.head.declaredVariance = vs.head
@@ -3764,6 +3903,8 @@ object Types {
                   x.declaredVariance == y.declaredVariance))
         && {
           val bs1 = new BinderPairs(this, that, bs)
+          // `paramInfos` and `resType` might still be uninstantiated at this point
+          paramInfos != null && resType != null &&
           paramInfos.equalElements(that.paramInfos, bs1) &&
           resType.equals(that.resType, bs1)
         }
@@ -3787,6 +3928,9 @@ object Types {
       if isDeclaredVarianceLambda then
         s"HKTypeLambda($paramNames, $paramInfos, $resType, ${declaredVariances.map(_.flagsString)})"
       else super.toString
+
+    assert(resType.isInstanceOf[TermType], this)
+    assert(paramNames.nonEmpty)
   }
 
   /** The type of a polymorphic method. It has the same form as HKTypeLambda,
@@ -3924,7 +4068,7 @@ object Types {
   // ----- Type application: LambdaParam, AppliedType ---------------------
 
   /** The parameter of a type lambda */
-  case class LambdaParam(tl: TypeLambda, n: Int) extends ParamInfo {
+  case class LambdaParam(tl: TypeLambda, n: Int) extends ParamInfo, printing.Showable {
     type ThisName = TypeName
 
     def isTypeParam(using Context): Boolean = tl.paramNames.head.isTypeName
@@ -3969,6 +4113,8 @@ object Types {
           case _ =>
             myVariance = Invariant
       myVariance
+
+    def toText(printer: Printer): Text = printer.toText(this)
   }
 
   /** A type application `C[T_1, ..., T_n]` */
@@ -3988,24 +4134,23 @@ object Types {
 
     override def underlying(using Context): Type = tycon
 
-    override def superType(using Context): Type = {
-      if (ctx.period != validSuper) {
-        cachedSuper = tycon match {
+    override def superType(using Context): Type =
+      if ctx.period != validSuper then
+        validSuper = if (tycon.isProvisional) Nowhere else ctx.period
+        cachedSuper = tycon match
           case tycon: HKTypeLambda => defn.AnyType
           case tycon: TypeRef if tycon.symbol.isClass => tycon
-          case tycon: TypeProxy => tycon.superType.applyIfParameterized(args)
+          case tycon: TypeProxy =>
+            if isMatchAlias then validSuper = Nowhere
+            tycon.superType.applyIfParameterized(args).normalized
           case _ => defn.AnyType
-        }
-        validSuper = if (tycon.isProvisional) Nowhere else ctx.period
-      }
       cachedSuper
-    }
 
     override def translucentSuperType(using Context): Type = tycon match {
       case tycon: TypeRef if tycon.symbol.isOpaqueAlias =>
         tycon.translucentSuperType.applyIfParameterized(args)
       case _ =>
-        superType
+        tryNormalize.orElse(superType)
     }
 
     inline def map(inline op: Type => Type)(using Context) =
@@ -4025,7 +4170,9 @@ object Types {
         def tryMatchAlias = tycon.info match {
           case MatchAlias(alias) =>
             trace(i"normalize $this", typr, show = true) {
-              alias.applyIfParameterized(args).tryNormalize
+              MatchTypeTrace.recurseWith(this) {
+                alias.applyIfParameterized(args.map(_.normalized)).tryNormalize
+              }
             }
           case _ =>
             NoType
@@ -4055,85 +4202,233 @@ object Types {
 
     def tryCompiletimeConstantFold(using Context): Type = tycon match {
       case tycon: TypeRef if defn.isCompiletimeAppliedType(tycon.symbol) =>
-        def constValue(tp: Type): Option[Any] = tp.dealias match {
+        extension (tp: Type) def fixForEvaluation: Type =
+          tp.normalized.dealias match {
+            // enable operations for constant singleton terms. E.g.:
+            // ```
+            // final val one = 1
+            // type Two = one.type + one.type
+            // ```
+            case tp: TermRef => tp.underlying
+            case tp => tp
+          }
+
+        def constValue(tp: Type): Option[Any] = tp.fixForEvaluation match {
           case ConstantType(Constant(n)) => Some(n)
           case _ => None
         }
 
-        def boolValue(tp: Type): Option[Boolean] = tp.dealias match {
+        def boolValue(tp: Type): Option[Boolean] = tp.fixForEvaluation match {
           case ConstantType(Constant(n: Boolean)) => Some(n)
           case _ => None
         }
 
-        def intValue(tp: Type): Option[Int] = tp.dealias match {
+        def intValue(tp: Type): Option[Int] = tp.fixForEvaluation match {
           case ConstantType(Constant(n: Int)) => Some(n)
           case _ => None
         }
 
-        def stringValue(tp: Type): Option[String] = tp.dealias match {
+        def longValue(tp: Type): Option[Long] = tp.fixForEvaluation match {
+          case ConstantType(Constant(n: Long)) => Some(n)
+          case _ => None
+        }
+
+        def floatValue(tp: Type): Option[Float] = tp.fixForEvaluation match {
+          case ConstantType(Constant(n: Float)) => Some(n)
+          case _ => None
+        }
+
+        def doubleValue(tp: Type): Option[Double] = tp.fixForEvaluation match {
+          case ConstantType(Constant(n: Double)) => Some(n)
+          case _ => None
+        }
+
+        def stringValue(tp: Type): Option[String] = tp.fixForEvaluation match {
           case ConstantType(Constant(n: String)) => Some(n)
           case _ => None
         }
 
+        // Returns Some(true) if the type is a constant.
+        // Returns Some(false) if the type is not a constant.
+        // Returns None if there is not enough information to determine if the type is a constant.
+        // The type is a constant if it is a constant type or a type operation composition of constant types.
+        // If we get a type reference for an argument, then the result is not yet known.
+        def isConst(tp: Type): Option[Boolean] = tp.dealias match {
+          // known to be constant
+          case ConstantType(_) => Some(true)
+          // currently not a concrete known type
+          case TypeRef(NoPrefix,_) => None
+          // currently not a concrete known type
+          case _: TypeParamRef => None
+          // constant if the term is constant
+          case t: TermRef => isConst(t.underlying)
+          // an operation type => recursively check all argument compositions
+          case applied: AppliedType if defn.isCompiletimeAppliedType(applied.typeSymbol) =>
+            val argsConst = applied.args.map(isConst)
+            if (argsConst.exists(_.isEmpty)) None
+            else Some(argsConst.forall(_.get))
+          // all other types are considered not to be constant
+          case _ => Some(false)
+        }
+
+        def expectArgsNum(expectedNum: Int): Unit =
+        // We can use assert instead of a compiler type error because this error should not
+        // occur since the type signature of the operation enforces the proper number of args.
+          assert(args.length == expectedNum, s"Type operation expects $expectedNum arguments but found ${args.length}")
+
         def natValue(tp: Type): Option[Int] = intValue(tp).filter(n => n >= 0 && n < Int.MaxValue)
 
+        // Runs the op and returns the result as a constant type.
+        // If the op throws an exception, then this exception is converted into a type error.
+        def runConstantOp(op: => Any): Type =
+          val result = try {
+            op
+          } catch {
+            case e: Throwable =>
+              throw new TypeError(e.getMessage)
+          }
+          ConstantType(Constant(result))
+
         def constantFold1[T](extractor: Type => Option[T], op: T => Any): Option[Type] =
-          extractor(args.head.normalized).map(a => ConstantType(Constant(op(a))))
+          expectArgsNum(1)
+          extractor(args.head).map(a => runConstantOp(op(a)))
 
         def constantFold2[T](extractor: Type => Option[T], op: (T, T) => Any): Option[Type] =
+          constantFold2AB(extractor, extractor, op)
+
+        def constantFold2AB[TA, TB](extractorA: Type => Option[TA], extractorB: Type => Option[TB], op: (TA, TB) => Any): Option[Type] =
+          expectArgsNum(2)
           for {
-            a <- extractor(args.head.normalized)
-            b <- extractor(args.tail.head.normalized)
-          } yield ConstantType(Constant(op(a, b)))
+            a <- extractorA(args(0))
+            b <- extractorB(args(1))
+          } yield runConstantOp(op(a, b))
+
+        def constantFold3[TA, TB, TC](
+          extractorA: Type => Option[TA],
+          extractorB: Type => Option[TB],
+          extractorC: Type => Option[TC],
+          op: (TA, TB, TC) => Any
+        ): Option[Type] =
+          expectArgsNum(3)
+          for {
+            a <- extractorA(args(0))
+            b <- extractorB(args(1))
+            c <- extractorC(args(2))
+          } yield runConstantOp(op(a, b, c))
 
         trace(i"compiletime constant fold $this", typr, show = true) {
           val name = tycon.symbol.name
           val owner = tycon.symbol.owner
-          val nArgs = args.length
           val constantType =
             if (defn.isCompiletime_S(tycon.symbol)) {
-              if (nArgs == 1) constantFold1(natValue, _ + 1)
-              else None
+              constantFold1(natValue, _ + 1)
             } else if (owner == defn.CompiletimeOpsAnyModuleClass) name match {
-              case tpnme.Equals    if nArgs == 2 => constantFold2(constValue, _ == _)
-              case tpnme.NotEquals if nArgs == 2 => constantFold2(constValue, _ != _)
+              case tpnme.Equals     => constantFold2(constValue, _ == _)
+              case tpnme.NotEquals  => constantFold2(constValue, _ != _)
+              case tpnme.ToString   => constantFold1(constValue, _.toString)
+              case tpnme.IsConst    => isConst(args.head).map(b => ConstantType(Constant(b)))
               case _ => None
             } else if (owner == defn.CompiletimeOpsIntModuleClass) name match {
-              case tpnme.Abs      if nArgs == 1 => constantFold1(intValue, _.abs)
-              case tpnme.Negate   if nArgs == 1 => constantFold1(intValue, x => -x)
-              case tpnme.ToString if nArgs == 1 => constantFold1(intValue, _.toString)
-              case tpnme.Plus     if nArgs == 2 => constantFold2(intValue, _ + _)
-              case tpnme.Minus    if nArgs == 2 => constantFold2(intValue, _ - _)
-              case tpnme.Times    if nArgs == 2 => constantFold2(intValue, _ * _)
-              case tpnme.Div if nArgs == 2 => constantFold2(intValue, {
-                case (_, 0) => throw new TypeError("Division by 0")
-                case (a, b) => a / b
-              })
-              case tpnme.Mod if nArgs == 2 => constantFold2(intValue, {
-                case (_, 0) => throw new TypeError("Modulo by 0")
-                case (a, b) => a % b
-              })
-              case tpnme.Lt  if nArgs == 2 => constantFold2(intValue, _ < _)
-              case tpnme.Gt  if nArgs == 2 => constantFold2(intValue, _ > _)
-              case tpnme.Ge  if nArgs == 2 => constantFold2(intValue, _ >= _)
-              case tpnme.Le  if nArgs == 2 => constantFold2(intValue, _ <= _)
-              case tpnme.Xor if nArgs == 2 => constantFold2(intValue, _ ^ _)
-              case tpnme.BitwiseAnd if nArgs == 2 => constantFold2(intValue, _ & _)
-              case tpnme.BitwiseOr  if nArgs == 2 => constantFold2(intValue, _ | _)
-              case tpnme.ASR if nArgs == 2 => constantFold2(intValue, _ >> _)
-              case tpnme.LSL if nArgs == 2 => constantFold2(intValue, _ << _)
-              case tpnme.LSR if nArgs == 2 => constantFold2(intValue, _ >>> _)
-              case tpnme.Min if nArgs == 2 => constantFold2(intValue, _ min _)
-              case tpnme.Max if nArgs == 2 => constantFold2(intValue, _ max _)
+              case tpnme.Abs        => constantFold1(intValue, _.abs)
+              case tpnme.Negate     => constantFold1(intValue, x => -x)
+              // ToString is deprecated for ops.int, and moved to ops.any
+              case tpnme.ToString   => constantFold1(intValue, _.toString)
+              case tpnme.Plus       => constantFold2(intValue, _ + _)
+              case tpnme.Minus      => constantFold2(intValue, _ - _)
+              case tpnme.Times      => constantFold2(intValue, _ * _)
+              case tpnme.Div        => constantFold2(intValue, _ / _)
+              case tpnme.Mod        => constantFold2(intValue, _ % _)
+              case tpnme.Lt         => constantFold2(intValue, _ < _)
+              case tpnme.Gt         => constantFold2(intValue, _ > _)
+              case tpnme.Ge         => constantFold2(intValue, _ >= _)
+              case tpnme.Le         => constantFold2(intValue, _ <= _)
+              case tpnme.Xor        => constantFold2(intValue, _ ^ _)
+              case tpnme.BitwiseAnd => constantFold2(intValue, _ & _)
+              case tpnme.BitwiseOr  => constantFold2(intValue, _ | _)
+              case tpnme.ASR        => constantFold2(intValue, _ >> _)
+              case tpnme.LSL        => constantFold2(intValue, _ << _)
+              case tpnme.LSR        => constantFold2(intValue, _ >>> _)
+              case tpnme.Min        => constantFold2(intValue, _ min _)
+              case tpnme.Max        => constantFold2(intValue, _ max _)
+              case tpnme.NumberOfLeadingZeros => constantFold1(intValue, Integer.numberOfLeadingZeros(_))
+              case tpnme.ToLong     => constantFold1(intValue, _.toLong)
+              case tpnme.ToFloat    => constantFold1(intValue, _.toFloat)
+              case tpnme.ToDouble   => constantFold1(intValue, _.toDouble)
+              case _ => None
+            } else if (owner == defn.CompiletimeOpsLongModuleClass) name match {
+              case tpnme.Abs        => constantFold1(longValue, _.abs)
+              case tpnme.Negate     => constantFold1(longValue, x => -x)
+              case tpnme.Plus       => constantFold2(longValue, _ + _)
+              case tpnme.Minus      => constantFold2(longValue, _ - _)
+              case tpnme.Times      => constantFold2(longValue, _ * _)
+              case tpnme.Div        => constantFold2(longValue, _ / _)
+              case tpnme.Mod        => constantFold2(longValue, _ % _)
+              case tpnme.Lt         => constantFold2(longValue, _ < _)
+              case tpnme.Gt         => constantFold2(longValue, _ > _)
+              case tpnme.Ge         => constantFold2(longValue, _ >= _)
+              case tpnme.Le         => constantFold2(longValue, _ <= _)
+              case tpnme.Xor        => constantFold2(longValue, _ ^ _)
+              case tpnme.BitwiseAnd => constantFold2(longValue, _ & _)
+              case tpnme.BitwiseOr  => constantFold2(longValue, _ | _)
+              case tpnme.ASR        => constantFold2(longValue, _ >> _)
+              case tpnme.LSL        => constantFold2(longValue, _ << _)
+              case tpnme.LSR        => constantFold2(longValue, _ >>> _)
+              case tpnme.Min        => constantFold2(longValue, _ min _)
+              case tpnme.Max        => constantFold2(longValue, _ max _)
+              case tpnme.NumberOfLeadingZeros =>
+                constantFold1(longValue, java.lang.Long.numberOfLeadingZeros(_))
+              case tpnme.ToInt      => constantFold1(longValue, _.toInt)
+              case tpnme.ToFloat    => constantFold1(longValue, _.toFloat)
+              case tpnme.ToDouble   => constantFold1(longValue, _.toDouble)
+              case _ => None
+            } else if (owner == defn.CompiletimeOpsFloatModuleClass) name match {
+              case tpnme.Abs        => constantFold1(floatValue, _.abs)
+              case tpnme.Negate     => constantFold1(floatValue, x => -x)
+              case tpnme.Plus       => constantFold2(floatValue, _ + _)
+              case tpnme.Minus      => constantFold2(floatValue, _ - _)
+              case tpnme.Times      => constantFold2(floatValue, _ * _)
+              case tpnme.Div        => constantFold2(floatValue, _ / _)
+              case tpnme.Mod        => constantFold2(floatValue, _ % _)
+              case tpnme.Lt         => constantFold2(floatValue, _ < _)
+              case tpnme.Gt         => constantFold2(floatValue, _ > _)
+              case tpnme.Ge         => constantFold2(floatValue, _ >= _)
+              case tpnme.Le         => constantFold2(floatValue, _ <= _)
+              case tpnme.Min        => constantFold2(floatValue, _ min _)
+              case tpnme.Max        => constantFold2(floatValue, _ max _)
+              case tpnme.ToInt      => constantFold1(floatValue, _.toInt)
+              case tpnme.ToLong     => constantFold1(floatValue, _.toLong)
+              case tpnme.ToDouble   => constantFold1(floatValue, _.toDouble)
+              case _ => None
+            } else if (owner == defn.CompiletimeOpsDoubleModuleClass) name match {
+              case tpnme.Abs        => constantFold1(doubleValue, _.abs)
+              case tpnme.Negate     => constantFold1(doubleValue, x => -x)
+              case tpnme.Plus       => constantFold2(doubleValue, _ + _)
+              case tpnme.Minus      => constantFold2(doubleValue, _ - _)
+              case tpnme.Times      => constantFold2(doubleValue, _ * _)
+              case tpnme.Div        => constantFold2(doubleValue, _ / _)
+              case tpnme.Mod        => constantFold2(doubleValue, _ % _)
+              case tpnme.Lt         => constantFold2(doubleValue, _ < _)
+              case tpnme.Gt         => constantFold2(doubleValue, _ > _)
+              case tpnme.Ge         => constantFold2(doubleValue, _ >= _)
+              case tpnme.Le         => constantFold2(doubleValue, _ <= _)
+              case tpnme.Min        => constantFold2(doubleValue, _ min _)
+              case tpnme.Max        => constantFold2(doubleValue, _ max _)
+              case tpnme.ToInt      => constantFold1(doubleValue, _.toInt)
+              case tpnme.ToLong     => constantFold1(doubleValue, _.toLong)
+              case tpnme.ToFloat    => constantFold1(doubleValue, _.toFloat)
               case _ => None
             } else if (owner == defn.CompiletimeOpsStringModuleClass) name match {
-              case tpnme.Plus if nArgs == 2 => constantFold2(stringValue, _ + _)
+              case tpnme.Plus       => constantFold2(stringValue, _ + _)
+              case tpnme.Length     => constantFold1(stringValue, _.length)
+              case tpnme.Matches    => constantFold2(stringValue, _ matches _)
+              case tpnme.Substring  =>
+                constantFold3(stringValue, intValue, intValue, (s, b, e) => s.substring(b, e))
               case _ => None
             } else if (owner == defn.CompiletimeOpsBooleanModuleClass) name match {
-              case tpnme.Not if nArgs == 1 => constantFold1(boolValue, x => !x)
-              case tpnme.And if nArgs == 2 => constantFold2(boolValue, _ && _)
-              case tpnme.Or  if nArgs == 2 => constantFold2(boolValue, _ || _)
-              case tpnme.Xor if nArgs == 2 => constantFold2(boolValue, _ ^ _)
+              case tpnme.Not        => constantFold1(boolValue, x => !x)
+              case tpnme.And        => constantFold2(boolValue, _ && _)
+              case tpnme.Or         => constantFold2(boolValue, _ || _)
+              case tpnme.Xor        => constantFold2(boolValue, _ ^ _)
               case _ => None
             } else None
 
@@ -4300,6 +4595,8 @@ object Types {
 
   private final class RecThisImpl(binder: RecType) extends RecThis(binder)
 
+  // @sharable private var skid: Int = 0
+
   // ----- Skolem types -----------------------------------------------
 
   /** A skolem type reference with underlying type `info`.
@@ -4317,6 +4614,10 @@ object Types {
 
     def withName(name: Name): this.type = { myRepr = name; this }
 
+    //skid += 1
+    //val id = skid
+    //assert(id != 10)
+
     private var myRepr: Name = null
     def repr(using Context): Name = {
       if (myRepr == null) myRepr = SkolemName.fresh()
@@ -4356,9 +4657,17 @@ object Types {
    *
    *  @param  origin        The parameter that's tracked by the type variable.
    *  @param  creatorState  The typer state in which the variable was created.
+   *  @param  nestingLevel  Symbols with a nestingLevel strictly greater than this
+   *                        will not appear in the instantiation of this type variable.
+   *                        This is enforced in `ConstraintHandling` by:
+   *                        - Maintaining the invariant that the `nonParamBounds`
+   *                          of a type variable never refer to a type with a
+   *                          greater `nestingLevel` (see `legalBound` for the reason
+   *                          why this cannot be delayed until instantiation).
+   *                        - On instantiation, replacing any param in the param bound
+   *                          with a level greater than nestingLevel (see `fullLowerBound`).
    */
-  final class TypeVar private(initOrigin: TypeParamRef, creatorState: TyperState, nestingLevel: Int) extends CachedProxyType with ValueType {
-
+  final class TypeVar private(initOrigin: TypeParamRef, creatorState: TyperState, val nestingLevel: Int) extends CachedProxyType with ValueType {
     private var currentOrigin = initOrigin
 
     def origin: TypeParamRef = currentOrigin
@@ -4372,13 +4681,17 @@ object Types {
     private var myInst: Type = NoType
 
     private[core] def inst: Type = myInst
-    private[core] def inst_=(tp: Type): Unit = {
+    private[core] def setInst(tp: Type): Unit =
       myInst = tp
-      if (tp.exists && (owningState ne null)) {
-        owningState.get.ownedVars -= this
-        owningState = null // no longer needed; null out to avoid a memory leak
-      }
-    }
+      if tp.exists && owningState != null then
+        val owningState1 = owningState.get
+        if owningState1 != null then
+          owningState1.ownedVars -= this
+          owningState = null // no longer needed; null out to avoid a memory leak
+
+    private[core] def resetInst(ts: TyperState): Unit =
+      myInst = NoType
+      owningState = new WeakReference(ts)
 
     /** The state owning the variable. This is at first `creatorState`, but it can
      *  be changed to an enclosing state on a commit.
@@ -4395,42 +4708,18 @@ object Types {
     /** Is the variable already instantiated? */
     def isInstantiated(using Context): Boolean = instanceOpt.exists
 
-    /** Avoid term references in `tp` to parameters or local variables that
-     *  are nested more deeply than the type variable itself.
-     */
-    private def avoidCaptures(tp: Type)(using Context): Type =
-      val problemSyms = new TypeAccumulator[Set[Symbol]]:
-        def apply(syms: Set[Symbol], t: Type): Set[Symbol] = t match
-          case ref @ TermRef(NoPrefix, _)
-          // AVOIDANCE TODO: Are there other problematic kinds of references?
-          // Our current tests only give us these, but we might need to generalize this.
-          if ref.symbol.maybeOwner.nestingLevel > nestingLevel =>
-            syms + ref.symbol
-          case _ =>
-            foldOver(syms, t)
-      val problems = problemSyms(Set.empty, tp)
-      if problems.isEmpty then tp
-      else
-        val atp = TypeOps.avoid(tp, problems.toList)
-        def msg = i"Inaccessible variables captured in instantation of type variable $this.\n$tp was fixed to $atp"
-        typr.println(msg)
-        val bound = TypeComparer.fullUpperBound(origin)
-        if !(atp <:< bound) then
-          throw new TypeError(s"$msg,\nbut the latter type does not conform to the upper bound $bound")
-        atp
-      // AVOIDANCE TODO: This really works well only if variables are instantiated from below
-      // If we hit a problematic symbol while instantiating from above, then avoidance
-      // will widen the instance type further. This could yield an alias, which would be OK.
-      // But it also could yield a true super type which would then fail the bounds check
-      // and throw a TypeError. The right thing to do instead would be to avoid "downwards".
-      // To do this, we need first test cases for that situation.
-
     /** Instantiate variable with given type */
     def instantiateWith(tp: Type)(using Context): Type = {
-      assert(tp ne this, s"self instantiation of ${tp.show}, constraint = ${ctx.typerState.constraint.show}")
-      typr.println(s"instantiating ${this.show} with ${tp.show}")
+      assert(tp ne this, i"self instantiation of $origin, constraint = ${ctx.typerState.constraint}")
+      assert(!myInst.exists, i"$origin is already instantiated to $myInst but we attempted to instantiate it to $tp")
+      typr.println(i"instantiating $this with $tp")
+
+      if Config.checkConstraintsSatisfiable then
+        assert(currentEntry.bounds.contains(tp),
+          i"$origin is constrained to be $currentEntry but attempted to instantiate it to $tp")
+
       if ((ctx.typerState eq owningState.get) && !TypeComparer.subtypeCheckInProgress)
-        inst = tp
+        setInst(tp)
       ctx.typerState.constraint = ctx.typerState.constraint.replace(origin, tp)
       tp
     }
@@ -4443,15 +4732,22 @@ object Types {
      *  is also a singleton type.
      */
     def instantiate(fromBelow: Boolean)(using Context): Type =
-      instantiateWith(avoidCaptures(TypeComparer.instanceType(origin, fromBelow)))
+      val tp = TypeComparer.instanceType(origin, fromBelow)
+      if myInst.exists then // The line above might have triggered instantiation of the current type variable
+        myInst
+      else
+        instantiateWith(tp)
+
+    /** For uninstantiated type variables: the entry in the constraint (either bounds or
+     *  provisional instance value)
+     */
+    private def currentEntry(using Context): Type = ctx.typerState.constraint.entry(origin)
 
     /** For uninstantiated type variables: Is the lower bound different from Nothing? */
-    def hasLowerBound(using Context): Boolean =
-      !ctx.typerState.constraint.entry(origin).loBound.isExactlyNothing
+    def hasLowerBound(using Context): Boolean = !currentEntry.loBound.isExactlyNothing
 
     /** For uninstantiated type variables: Is the upper bound different from Any? */
-    def hasUpperBound(using Context): Boolean =
-      !ctx.typerState.constraint.entry(origin).hiBound.isRef(defn.AnyClass)
+    def hasUpperBound(using Context): Boolean = !currentEntry.hiBound.isRef(defn.AnyClass)
 
     /** Unwrap to instance (if instantiated) or origin (if not), until result
      *  is no longer a TypeVar
@@ -4478,8 +4774,8 @@ object Types {
     }
   }
   object TypeVar:
-    def apply(initOrigin: TypeParamRef, creatorState: TyperState)(using Context) =
-      new TypeVar(initOrigin, creatorState, ctx.owner.nestingLevel)
+    def apply(using Context)(initOrigin: TypeParamRef, creatorState: TyperState, nestingLevel: Int = ctx.nestingLevel) =
+      new TypeVar(initOrigin, creatorState, nestingLevel)
 
   type TypeVars = SimpleIdentitySet[TypeVar]
 
@@ -4509,7 +4805,12 @@ object Types {
     private var myReduced: Type = null
     private var reductionContext: util.MutableMap[Type, Type] = null
 
-    override def tryNormalize(using Context): Type = reduced.normalized
+    override def tryNormalize(using Context): Type =
+      try
+        reduced.normalized
+      catch
+        case ex: Throwable =>
+          handleRecursive("normalizing", s"${scrutinee.show} match ..." , ex)
 
     def reduced(using Context): Type = {
 
@@ -4537,19 +4838,28 @@ object Types {
         }
 
       record("MatchType.reduce called")
-      if (!Config.cacheMatchReduced || myReduced == null || !isUpToDate) {
+      if !Config.cacheMatchReduced
+          || myReduced == null
+          || !isUpToDate
+          || MatchTypeTrace.isRecording
+      then
         record("MatchType.reduce computed")
         if (myReduced != null) record("MatchType.reduce cache miss")
         myReduced =
           trace(i"reduce match type $this $hashCode", matchTypes, show = true) {
             def matchCases(cmp: TrackingTypeComparer): Type =
+              val saved = ctx.typerState.snapshot()
               try cmp.matchCases(scrutinee.normalized, cases)
               catch case ex: Throwable =>
                 handleRecursive("reduce type ", i"$scrutinee match ...", ex)
-              finally updateReductionContext(cmp.footprint)
+              finally
+                updateReductionContext(cmp.footprint)
+                ctx.typerState.resetTo(saved)
+                  // this drops caseLambdas in constraint and undoes any typevar
+                  // instantiations during matchtype reduction
+
             TypeComparer.tracked(matchCases)
           }
-      }
       myReduced
     }
 
@@ -4749,8 +5059,23 @@ object Types {
     }
 
     def & (that: TypeBounds)(using Context): TypeBounds =
-      if ((this.lo frozen_<:< that.lo) && (that.hi frozen_<:< this.hi)) that
-      else if ((that.lo frozen_<:< this.lo) && (this.hi frozen_<:< that.hi)) this
+      // This will try to preserve the FromJavaObjects type in upper bounds.
+      // For example, (? <: FromJavaObjects | Null) & (? <: Any),
+      // we want to get (? <: FromJavaObjects | Null) intead of (? <: Any),
+      // because we may check the result <:< (? <: Object | Null) later.
+      if this.hi.containsFromJavaObject
+        && (this.hi frozen_<:< that.hi)
+        && (that.lo frozen_<:< this.lo) then
+        // FromJavaObject in tp1.hi guarantees tp2.hi <:< tp1.hi
+        // prefer tp1 if FromJavaObject is in its hi
+        this
+      else if that.hi.containsFromJavaObject
+        && (that.hi frozen_<:< this.hi)
+        && (this.lo frozen_<:< that.lo) then
+        // Similarly, prefer tp2 if FromJavaObject is in its hi
+        that
+      else if (this.lo frozen_<:< that.lo) && (that.hi frozen_<:< this.hi) then that
+      else if (that.lo frozen_<:< this.lo) && (this.hi frozen_<:< that.hi) then this
       else TypeBounds(this.lo | that.lo, this.hi & that.hi)
 
     def | (that: TypeBounds)(using Context): TypeBounds =
@@ -4970,6 +5295,11 @@ object Types {
 
   /** Wildcard type, possibly with bounds */
   abstract case class WildcardType(optBounds: Type) extends CachedGroundType with TermType {
+
+    def effectiveBounds(using Context): TypeBounds = optBounds match
+      case bounds: TypeBounds => bounds
+      case _ => TypeBounds.empty
+
     def derivedWildcardType(optBounds: Type)(using Context): WildcardType =
       if (optBounds eq this.optBounds) this
       else if (!optBounds.exists) WildcardType
@@ -5043,7 +5373,7 @@ object Types {
         NoType
     }
     def isInstantiatable(tp: Type)(using Context): Boolean = zeroParamClass(tp) match {
-      case cinfo: ClassInfo =>
+      case cinfo: ClassInfo if !cinfo.cls.isOneOf(FinalOrSealed) =>
         val selfType = cinfo.selfType.asSeenFrom(tp, cinfo.cls)
         tp <:< selfType
       case _ =>
@@ -5111,6 +5441,12 @@ object Types {
 
   // ----- TypeMaps --------------------------------------------------------------------
 
+  /** Where a traversal should stop */
+  enum StopAt:
+    case None    // traverse everything
+    case Package // stop at package references
+    case Static  // stop at static references
+
   /** Common base class of TypeMap and TypeAccumulator */
   abstract class VariantTraversal:
     protected[core] var variance: Int = 1
@@ -5123,7 +5459,7 @@ object Types {
       res
     }
 
-    protected def stopAtStatic: Boolean = true
+    protected def stopAt: StopAt = StopAt.Static
 
     /** Can the prefix of this static reference be omitted if the reference
      *  itself can be omitted? Overridden in TypeOps#avoid.
@@ -5132,7 +5468,11 @@ object Types {
 
     protected def stopBecauseStaticOrLocal(tp: NamedType)(using Context): Boolean =
       (tp.prefix eq NoPrefix)
-      || stopAtStatic && tp.currentSymbol.isStatic && isStaticPrefix(tp.prefix)
+      || {
+        val stop = stopAt
+        stop == StopAt.Static && tp.currentSymbol.isStatic && isStaticPrefix(tp.prefix)
+        || stop == StopAt.Package && tp.currentSymbol.is(Package)
+      }
   end VariantTraversal
 
   abstract class TypeMap(implicit protected var mapCtx: Context)
@@ -5195,6 +5535,8 @@ object Types {
       variance = saved
       derivedLambdaType(tp)(ptypes1, this(restpe))
 
+    def isRange(tp: Type): Boolean = tp.isInstanceOf[Range]
+
     /** Map this function over given type */
     def mapOver(tp: Type): Type = {
       record(s"TypeMap mapOver ${getClass}")
@@ -5238,8 +5580,9 @@ object Types {
 
         case tp @ AnnotatedType(underlying, annot) =>
           val underlying1 = this(underlying)
-          if (underlying1 eq underlying) tp
-          else derivedAnnotatedType(tp, underlying1, mapOver(annot))
+          val annot1 = annot.mapWith(this)
+          if annot1 eq EmptyAnnotation then underlying1
+          else derivedAnnotatedType(tp, underlying1, annot1)
 
         case _: ThisType
           | _: BoundType
@@ -5311,9 +5654,6 @@ object Types {
       else newScopeWith(elems1: _*)
     }
 
-    def mapOver(annot: Annotation): Annotation =
-      annot.derivedAnnotation(mapOver(annot.tree))
-
     def mapOver(tree: Tree): Tree = treeTypeMap(tree)
 
     /** Can be overridden. By default, only the prefix is mapped. */
@@ -5321,7 +5661,7 @@ object Types {
       derivedClassInfo(tp, this(tp.prefix))
 
     def andThen(f: Type => Type): TypeMap = new TypeMap {
-      override def stopAtStatic = thisMap.stopAtStatic
+      override def stopAt = thisMap.stopAt
       def apply(tp: Type) = f(thisMap(tp))
     }
   }
@@ -5360,8 +5700,6 @@ object Types {
 
     protected def emptyRange = range(defn.NothingType, defn.AnyType)
 
-    protected def isRange(tp: Type): Boolean = tp.isInstanceOf[Range]
-
     protected def lower(tp: Type): Type = tp match {
       case tp: Range => tp.lo
       case _ => tp
@@ -5464,7 +5802,7 @@ object Types {
             case Range(infoLo: TypeBounds, infoHi: TypeBounds) =>
               assert(variance == 0)
               if (!infoLo.isTypeAlias && !infoHi.isTypeAlias) propagate(infoLo, infoHi)
-              else range(defn.NothingType, tp.parent)
+              else range(defn.NothingType, parent)
             case Range(infoLo, infoHi) =>
               propagate(infoLo, infoHi)
             case _ =>
@@ -5509,7 +5847,7 @@ object Types {
               tp.derivedAppliedType(tycon, args.map(rangeToBounds)) match
                 case tp1: AppliedType if tp1.isUnreducibleWild =>
                   // don't infer a type that would trigger an error later in
-                  // Checling.checkAppliedType; fall through to default handling instead
+                  // Checking.checkAppliedType; fall through to default handling instead
                 case tp1 =>
                   return tp1
             end if
@@ -5518,7 +5856,7 @@ object Types {
             // non-range arguments L1, ..., Ln and H1, ..., Hn such that
             // C[L1, ..., Ln] <: C[H1, ..., Hn] by taking the right limits of
             // ranges that appear in as co- or contravariant arguments.
-            // Fail for non-variant argument ranges.
+            // Fail for non-variant argument ranges (see use-site else branch below).
             // If successful, the L-arguments are in loBut, the H-arguments in hiBuf.
             // @return  operation succeeded for all arguments.
             def distributeArgs(args: List[Type], tparams: List[ParamInfo]): Boolean = args match {
@@ -5539,11 +5877,18 @@ object Types {
             if (distributeArgs(args, tp.tyconTypeParams))
               range(tp.derivedAppliedType(tycon, loBuf.toList),
                     tp.derivedAppliedType(tycon, hiBuf.toList))
-            else range(defn.NothingType, defn.AnyType)
-              // TODO: can we give a better bound than `topType`?
+            else if tycon.isLambdaSub || args.exists(isRangeOfNonTermTypes) then
+              range(defn.NothingType, defn.AnyType)
+            else
+              // See lampepfl/dotty#14152
+              range(defn.NothingType, tp.derivedAppliedType(tycon, args.map(rangeToBounds)))
           else tp.derivedAppliedType(tycon, args)
       }
 
+    private def isRangeOfNonTermTypes(tp: Type): Boolean = tp match
+      case Range(lo, hi) => !lo.isInstanceOf[TermType] || !hi.isInstanceOf[TermType]
+      case _             => false
+
     override protected def derivedAndType(tp: AndType, tp1: Type, tp2: Type): Type =
       if (isRange(tp1) || isRange(tp2)) range(lower(tp1) & lower(tp2), upper(tp1) & upper(tp2))
       else tp.derivedAndType(tp1, tp2)
@@ -5572,12 +5917,13 @@ object Types {
             case Range(lo, hi) => range(bound.bounds.lo, bound.bounds.hi)
             case _ => tp.derivedMatchType(bound, scrutinee, cases)
 
-    override protected def derivedSkolemType(tp: SkolemType, info: Type): Type = info match {
-      case Range(lo, hi) =>
-        range(tp.derivedSkolemType(lo), tp.derivedSkolemType(hi))
-      case _ =>
-        tp.derivedSkolemType(info)
-    }
+    override protected def derivedSkolemType(tp: SkolemType, info: Type): Type =
+      if info eq tp.info then tp
+      // By definition, a skolem is neither a subtype nor a supertype of a
+      // different skolem. So, regardless of `variance`, we cannot return a
+      // fresh skolem when approximating an existing skolem, we can only return
+      // a range.
+      else range(defn.NothingType, info)
 
     override protected def derivedClassInfo(tp: ClassInfo, pre: Type): Type = {
       assert(!isRange(pre))
@@ -5591,7 +5937,12 @@ object Types {
         case Range(lo, hi) =>
           range(derivedLambdaType(tp)(formals, lo), derivedLambdaType(tp)(formals, hi))
         case _ =>
-          tp.derivedLambdaType(tp.paramNames, formals, restpe)
+          if formals.exists(isRange) then
+            range(
+              derivedLambdaType(tp)(formals.map(upper(_).asInstanceOf[tp.PInfo]), restpe),
+              derivedLambdaType(tp)(formals.map(lower(_).asInstanceOf[tp.PInfo]), restpe))
+          else
+            tp.derivedLambdaType(tp.paramNames, formals, restpe)
       }
 
     protected def reapply(tp: Type): Type = apply(tp)
@@ -5608,6 +5959,15 @@ object Types {
       lo.toText(printer) ~ ".." ~ hi.toText(printer)
   }
 
+  /** Approximate wildcards by their bounds */
+  class AvoidWildcardsMap(using Context) extends ApproximatingTypeMap:
+    protected def mapWild(t: WildcardType) =
+      val bounds = t.effectiveBounds
+      range(atVariance(-variance)(apply(bounds.lo)), apply(bounds.hi))
+    def apply(t: Type): Type = t match
+      case t: WildcardType => mapWild(t)
+      case _ => mapOver(t)
+
   // ----- TypeAccumulators ----------------------------------------------------
 
   abstract class TypeAccumulator[T](implicit protected val accCtx: Context)
@@ -5729,12 +6089,12 @@ object Types {
 
   class ExistsAccumulator(
       p: Type => Boolean,
-      override val stopAtStatic: Boolean,
+      override val stopAt: StopAt,
       forceLazy: Boolean)(using Context) extends TypeAccumulator[Boolean]:
     def apply(x: Boolean, tp: Type): Boolean =
       x || p(tp) || (forceLazy || !tp.isInstanceOf[LazyRef]) && foldOver(x, tp)
 
-  class ForeachAccumulator(p: Type => Unit, override val stopAtStatic: Boolean)(using Context) extends TypeAccumulator[Unit] {
+  class ForeachAccumulator(p: Type => Unit, override val stopAt: StopAt)(using Context) extends TypeAccumulator[Unit] {
     def apply(x: Unit, tp: Type): Unit = foldOver(p(tp), tp)
   }
 
@@ -5894,7 +6254,7 @@ object Types {
   }
 
   object takeAllFilter extends NameFilter {
-    def apply(pre: Type, name: Name)(using Context): Boolean = true
+    def apply(pre: Type, name: Name)(using Context): Boolean = name != nme.CONSTRUCTOR
     def isStable = true
   }
 
diff --git a/compiler/src/dotty/tools/dotc/core/Uniques.scala b/compiler/src/dotty/tools/dotc/core/Uniques.scala
index 5b1ae1a499e9..d706875f58dd 100644
--- a/compiler/src/dotty/tools/dotc/core/Uniques.scala
+++ b/compiler/src/dotty/tools/dotc/core/Uniques.scala
@@ -4,9 +4,11 @@ package core
 import Types._, Contexts._, util.Stats._, Hashable._, Names._
 import config.Config
 import Decorators._
-import util.{HashSet, Stats}
+import util.{WeakHashSet, Stats}
+import WeakHashSet.Entry
+import scala.annotation.tailrec
 
-class Uniques extends HashSet[Type](Config.initialUniquesCapacity):
+class Uniques extends WeakHashSet[Type](Config.initialUniquesCapacity):
   override def hash(x: Type): Int = x.hash
   override def isEqual(x: Type, y: Type) = x.eql(y)
 
@@ -32,7 +34,7 @@ object Uniques:
     if tp.hash == NotCached then tp
     else ctx.uniques.put(tp).asInstanceOf[T]
 
-  final class NamedTypeUniques extends HashSet[NamedType](Config.initialUniquesCapacity * 4) with Hashable:
+  final class NamedTypeUniques extends WeakHashSet[NamedType](Config.initialUniquesCapacity * 4) with Hashable:
     override def hash(x: NamedType): Int = x.hash
 
     def enterIfNew(prefix: Type, designator: Designator, isTerm: Boolean)(using Context): NamedType =
@@ -43,17 +45,25 @@ object Uniques:
         else new CachedTypeRef(prefix, designator, h)
       if h == NotCached then newType
       else
+        // Inlined from WeakHashSet#put
         Stats.record(statsItem("put"))
-        var idx = index(h)
-        var e = entryAt(idx)
-        while e != null do
-          if (e.prefix eq prefix) && (e.designator eq designator) && (e.isTerm == isTerm) then return e
-          idx = nextIndex(idx)
-          e = entryAt(idx)
-        addEntryAt(idx, newType)
+        removeStaleEntries()
+        val bucket = index(h)
+        val oldHead = table(bucket)
+
+        @tailrec
+        def linkedListLoop(entry: Entry[NamedType]): NamedType = entry match
+          case null                    => addEntryAt(bucket, newType, h, oldHead)
+          case _                       =>
+            val e = entry.get
+            if e != null && (e.prefix eq prefix) && (e.designator eq designator) && (e.isTerm == isTerm) then e
+            else linkedListLoop(entry.tail)
+
+        linkedListLoop(oldHead)
+      end if
   end NamedTypeUniques
 
-  final class AppliedUniques extends HashSet[AppliedType](Config.initialUniquesCapacity * 2) with Hashable:
+  final class AppliedUniques extends WeakHashSet[AppliedType](Config.initialUniquesCapacity * 2) with Hashable:
     override def hash(x: AppliedType): Int = x.hash
 
     def enterIfNew(tycon: Type, args: List[Type]): AppliedType =
@@ -62,13 +72,21 @@ object Uniques:
       if monitored then recordCaching(h, classOf[CachedAppliedType])
       if h == NotCached then newType
       else
+        // Inlined from WeakHashSet#put
         Stats.record(statsItem("put"))
-        var idx = index(h)
-        var e = entryAt(idx)
-        while e != null do
-          if (e.tycon eq tycon) && e.args.eqElements(args) then return e
-          idx = nextIndex(idx)
-          e = entryAt(idx)
-        addEntryAt(idx, newType)
+        removeStaleEntries()
+        val bucket = index(h)
+        val oldHead = table(bucket)
+
+        @tailrec
+        def linkedListLoop(entry: Entry[AppliedType]): AppliedType = entry match
+          case null                    => addEntryAt(bucket, newType, h, oldHead)
+          case _                       =>
+            val e = entry.get
+            if e != null && (e.tycon eq tycon) && e.args.eqElements(args) then e
+            else linkedListLoop(entry.tail)
+
+        linkedListLoop(oldHead)
+      end if
   end AppliedUniques
 end Uniques
diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala
index 93603e8a9d37..3b05ee351b86 100644
--- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala
+++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala
@@ -6,11 +6,11 @@ import scala.annotation.switch
 
 object ClassfileConstants {
 
-  final val JAVA_MAGIC = 0xCAFEBABE
-  final val JAVA_MAJOR_VERSION = 45
-  final val JAVA_MINOR_VERSION = 3
+  inline val JAVA_MAGIC = 0xCAFEBABE
+  inline val JAVA_MAJOR_VERSION = 45
+  inline val JAVA_MINOR_VERSION = 3
 
-  final val JAVA8_MAJOR_VERSION = 52
+  inline val JAVA8_MAJOR_VERSION = 52
 
   /** (see http://java.sun.com/docs/books/jvms/second_edition/jvms-clarify.html)
    *
@@ -38,298 +38,298 @@ object ClassfileConstants {
    *    https://groups.google.com/forum/?hl=en#!topic/jvm-languages/jVhzvq8-ZIk
    *
    */                                        // Class   Field   Method
-  final val JAVA_ACC_PUBLIC       = 0x0001   //   X       X        X
-  final val JAVA_ACC_PRIVATE      = 0x0002   //           X        X
-  final val JAVA_ACC_PROTECTED    = 0x0004   //           X        X
-  final val JAVA_ACC_STATIC       = 0x0008   //           X        X
-  final val JAVA_ACC_FINAL        = 0x0010   //   X       X        X
-  final val JAVA_ACC_SUPER        = 0x0020   //   X
-  final val JAVA_ACC_SYNCHRONIZED = 0x0020   //                    X
-  final val JAVA_ACC_VOLATILE     = 0x0040   //           X
-  final val JAVA_ACC_BRIDGE       = 0x0040   //                    X
-  final val JAVA_ACC_TRANSIENT    = 0x0080   //           X
-  final val JAVA_ACC_VARARGS      = 0x0080   //                    X
-  final val JAVA_ACC_NATIVE       = 0x0100   //                    X
-  final val JAVA_ACC_INTERFACE    = 0x0200   //   X
-  final val JAVA_ACC_ABSTRACT     = 0x0400   //   X                X
-  final val JAVA_ACC_STRICT       = 0x0800   //                    X
-  final val JAVA_ACC_SYNTHETIC    = 0x1000   //   X       X        X
-  final val JAVA_ACC_ANNOTATION   = 0x2000   //   X
-  final val JAVA_ACC_ENUM         = 0x4000   //   X       X
+  inline val JAVA_ACC_PUBLIC       = 0x0001   //   X       X        X
+  inline val JAVA_ACC_PRIVATE      = 0x0002   //           X        X
+  inline val JAVA_ACC_PROTECTED    = 0x0004   //           X        X
+  inline val JAVA_ACC_STATIC       = 0x0008   //           X        X
+  inline val JAVA_ACC_FINAL        = 0x0010   //   X       X        X
+  inline val JAVA_ACC_SUPER        = 0x0020   //   X
+  inline val JAVA_ACC_SYNCHRONIZED = 0x0020   //                    X
+  inline val JAVA_ACC_VOLATILE     = 0x0040   //           X
+  inline val JAVA_ACC_BRIDGE       = 0x0040   //                    X
+  inline val JAVA_ACC_TRANSIENT    = 0x0080   //           X
+  inline val JAVA_ACC_VARARGS      = 0x0080   //                    X
+  inline val JAVA_ACC_NATIVE       = 0x0100   //                    X
+  inline val JAVA_ACC_INTERFACE    = 0x0200   //   X
+  inline val JAVA_ACC_ABSTRACT     = 0x0400   //   X                X
+  inline val JAVA_ACC_STRICT       = 0x0800   //                    X
+  inline val JAVA_ACC_SYNTHETIC    = 0x1000   //   X       X        X
+  inline val JAVA_ACC_ANNOTATION   = 0x2000   //   X
+  inline val JAVA_ACC_ENUM         = 0x4000   //   X       X
 
   // tags describing the type of a literal in the constant pool
-  final val CONSTANT_UTF8          =  1
-  final val CONSTANT_UNICODE       =  2
-  final val CONSTANT_INTEGER       =  3
-  final val CONSTANT_FLOAT         =  4
-  final val CONSTANT_LONG          =  5
-  final val CONSTANT_DOUBLE        =  6
-  final val CONSTANT_CLASS         =  7
-  final val CONSTANT_STRING        =  8
-  final val CONSTANT_FIELDREF      =  9
-  final val CONSTANT_METHODREF     = 10
-  final val CONSTANT_INTFMETHODREF = 11
-  final val CONSTANT_NAMEANDTYPE   = 12
-
-  final val CONSTANT_METHODHANDLE  = 15
-  final val CONSTANT_METHODTYPE    = 16
-  final val CONSTANT_INVOKEDYNAMIC = 18
+  inline val CONSTANT_UTF8          =  1
+  inline val CONSTANT_UNICODE       =  2
+  inline val CONSTANT_INTEGER       =  3
+  inline val CONSTANT_FLOAT         =  4
+  inline val CONSTANT_LONG          =  5
+  inline val CONSTANT_DOUBLE        =  6
+  inline val CONSTANT_CLASS         =  7
+  inline val CONSTANT_STRING        =  8
+  inline val CONSTANT_FIELDREF      =  9
+  inline val CONSTANT_METHODREF     = 10
+  inline val CONSTANT_INTFMETHODREF = 11
+  inline val CONSTANT_NAMEANDTYPE   = 12
+
+  inline val CONSTANT_METHODHANDLE  = 15
+  inline val CONSTANT_METHODTYPE    = 16
+  inline val CONSTANT_INVOKEDYNAMIC = 18
 
   // tags describing the type of a literal in attribute values
-  final val BYTE_TAG   = 'B'
-  final val CHAR_TAG   = 'C'
-  final val DOUBLE_TAG = 'D'
-  final val FLOAT_TAG  = 'F'
-  final val INT_TAG    = 'I'
-  final val LONG_TAG   = 'J'
-  final val SHORT_TAG  = 'S'
-  final val BOOL_TAG   = 'Z'
-  final val STRING_TAG = 's'
-  final val ENUM_TAG   = 'e'
-  final val CLASS_TAG  = 'c'
-  final val ARRAY_TAG  = '['
-  final val VOID_TAG   = 'V'
-  final val TVAR_TAG   = 'T'
-  final val OBJECT_TAG = 'L'
-  final val ANNOTATION_TAG = '@'
-  final val SCALA_NOTHING = "scala.runtime.Nothing$"
-  final val SCALA_NULL = "scala.runtime.Null$"
+  inline val BYTE_TAG   = 'B'
+  inline val CHAR_TAG   = 'C'
+  inline val DOUBLE_TAG = 'D'
+  inline val FLOAT_TAG  = 'F'
+  inline val INT_TAG    = 'I'
+  inline val LONG_TAG   = 'J'
+  inline val SHORT_TAG  = 'S'
+  inline val BOOL_TAG   = 'Z'
+  inline val STRING_TAG = 's'
+  inline val ENUM_TAG   = 'e'
+  inline val CLASS_TAG  = 'c'
+  inline val ARRAY_TAG  = '['
+  inline val VOID_TAG   = 'V'
+  inline val TVAR_TAG   = 'T'
+  inline val OBJECT_TAG = 'L'
+  inline val ANNOTATION_TAG = '@'
+  inline val SCALA_NOTHING = "scala.runtime.Nothing$"
+  inline val SCALA_NULL = "scala.runtime.Null$"
 
 
   // tags describing the type of newarray
-  final val T_BOOLEAN = 4
-  final val T_CHAR    = 5
-  final val T_FLOAT   = 6
-  final val T_DOUBLE  = 7
-  final val T_BYTE    = 8
-  final val T_SHORT   = 9
-  final val T_INT     = 10
-  final val T_LONG    = 11
+  inline val T_BOOLEAN = 4
+  inline val T_CHAR    = 5
+  inline val T_FLOAT   = 6
+  inline val T_DOUBLE  = 7
+  inline val T_BYTE    = 8
+  inline val T_SHORT   = 9
+  inline val T_INT     = 10
+  inline val T_LONG    = 11
 
   // JVM mnemonics
-  final val nop         = 0x00
-  final val aconst_null = 0x01
-  final val iconst_m1   = 0x02
-
-  final val iconst_0    = 0x03
-  final val iconst_1    = 0x04
-  final val iconst_2    = 0x05
-  final val iconst_3    = 0x06
-  final val iconst_4    = 0x07
-  final val iconst_5    = 0x08
-
-  final val lconst_0    = 0x09
-  final val lconst_1    = 0x0a
-  final val fconst_0    = 0x0b
-  final val fconst_1    = 0x0c
-  final val fconst_2    = 0x0d
-  final val dconst_0    = 0x0e
-  final val dconst_1    = 0x0f
-
-  final val bipush      = 0x10
-  final val sipush      = 0x11
-  final val ldc         = 0x12
-  final val ldc_w       = 0x13
-  final val ldc2_w      = 0x14
-
-  final val iload       = 0x15
-  final val lload       = 0x16
-  final val fload       = 0x17
-  final val dload       = 0x18
-  final val aload       = 0x19
-
-  final val iload_0     = 0x1a
-  final val iload_1     = 0x1b
-  final val iload_2     = 0x1c
-  final val iload_3     = 0x1d
-  final val lload_0     = 0x1e
-  final val lload_1     = 0x1f
-  final val lload_2     = 0x20
-  final val lload_3     = 0x21
-  final val fload_0     = 0x22
-  final val fload_1     = 0x23
-  final val fload_2     = 0x24
-  final val fload_3     = 0x25
-  final val dload_0     = 0x26
-  final val dload_1     = 0x27
-  final val dload_2     = 0x28
-  final val dload_3     = 0x29
-  final val aload_0     = 0x2a
-  final val aload_1     = 0x2b
-  final val aload_2     = 0x2c
-  final val aload_3     = 0x2d
-  final val iaload      = 0x2e
-  final val laload      = 0x2f
-  final val faload      = 0x30
-  final val daload      = 0x31
-  final val aaload      = 0x32
-  final val baload      = 0x33
-  final val caload      = 0x34
-  final val saload      = 0x35
-
-  final val istore      = 0x36
-  final val lstore      = 0x37
-  final val fstore      = 0x38
-  final val dstore      = 0x39
-  final val astore      = 0x3a
-  final val istore_0    = 0x3b
-  final val istore_1    = 0x3c
-  final val istore_2    = 0x3d
-  final val istore_3    = 0x3e
-  final val lstore_0    = 0x3f
-  final val lstore_1    = 0x40
-  final val lstore_2    = 0x41
-  final val lstore_3    = 0x42
-  final val fstore_0    = 0x43
-  final val fstore_1    = 0x44
-  final val fstore_2    = 0x45
-  final val fstore_3    = 0x46
-  final val dstore_0    = 0x47
-  final val dstore_1    = 0x48
-  final val dstore_2    = 0x49
-  final val dstore_3    = 0x4a
-  final val astore_0    = 0x4b
-  final val astore_1    = 0x4c
-  final val astore_2    = 0x4d
-  final val astore_3    = 0x4e
-  final val iastore     = 0x4f
-  final val lastore     = 0x50
-  final val fastore     = 0x51
-  final val dastore     = 0x52
-  final val aastore     = 0x53
-  final val bastore     = 0x54
-  final val castore     = 0x55
-  final val sastore     = 0x56
-
-  final val pop         = 0x57
-  final val pop2        = 0x58
-  final val dup         = 0x59
-  final val dup_x1      = 0x5a
-  final val dup_x2      = 0x5b
-  final val dup2        = 0x5c
-  final val dup2_x1     = 0x5d
-  final val dup2_x2     = 0x5e
-  final val swap        = 0x5f
-
-  final val iadd        = 0x60
-  final val ladd        = 0x61
-  final val fadd        = 0x62
-  final val dadd        = 0x63
-  final val isub        = 0x64
-  final val lsub        = 0x65
-  final val fsub        = 0x66
-  final val dsub        = 0x67
-  final val imul        = 0x68
-  final val lmul        = 0x69
-  final val fmul        = 0x6a
-  final val dmul        = 0x6b
-  final val idiv        = 0x6c
-  final val ldiv        = 0x6d
-  final val fdiv        = 0x6e
-  final val ddiv        = 0x6f
-  final val irem        = 0x70
-  final val lrem        = 0x71
-  final val frem        = 0x72
-  final val drem        = 0x73
-
-  final val ineg        = 0x74
-  final val lneg        = 0x75
-  final val fneg        = 0x76
-  final val dneg        = 0x77
-
-  final val ishl        = 0x78
-  final val lshl        = 0x79
-  final val ishr        = 0x7a
-  final val lshr        = 0x7b
-  final val iushr       = 0x7c
-  final val lushr       = 0x7d
-  final val iand        = 0x7e
-  final val land        = 0x7f
-  final val ior         = 0x80
-  final val lor         = 0x81
-  final val ixor        = 0x82
-  final val lxor        = 0x83
-  final val iinc        = 0x84
-
-  final val i2l         = 0x85
-  final val i2f         = 0x86
-  final val i2d         = 0x87
-  final val l2i         = 0x88
-  final val l2f         = 0x89
-  final val l2d         = 0x8a
-  final val f2i         = 0x8b
-  final val f2l         = 0x8c
-  final val f2d         = 0x8d
-  final val d2i         = 0x8e
-  final val d2l         = 0x8f
-  final val d2f         = 0x90
-  final val i2b         = 0x91
-  final val i2c         = 0x92
-  final val i2s         = 0x93
-
-  final val lcmp        = 0x94
-  final val fcmpl       = 0x95
-  final val fcmpg       = 0x96
-  final val dcmpl       = 0x97
-  final val dcmpg       = 0x98
-
-  final val ifeq        = 0x99
-  final val ifne        = 0x9a
-  final val iflt        = 0x9b
-  final val ifge        = 0x9c
-  final val ifgt        = 0x9d
-  final val ifle        = 0x9e
-  final val if_icmpeq   = 0x9f
-  final val if_icmpne   = 0xa0
-  final val if_icmplt   = 0xa1
-  final val if_icmpge   = 0xa2
-  final val if_icmpgt   = 0xa3
-  final val if_icmple   = 0xa4
-  final val if_acmpeq   = 0xa5
-  final val if_acmpne   = 0xa6
-  final val goto        = 0xa7
-  final val jsr         = 0xa8
-  final val ret         = 0xa9
-  final val tableswitch = 0xaa
-  final val lookupswitch = 0xab
-  final val ireturn     = 0xac
-  final val lreturn     = 0xad
-  final val freturn     = 0xae
-  final val dreturn     = 0xaf
-  final val areturn     = 0xb0
-  final val return_     = 0xb1
-
-  final val getstatic   = 0xb2
-  final val putstatic   = 0xb3
-  final val getfield    = 0xb4
-  final val putfield    = 0xb5
-
-  final val invokevirtual   = 0xb6
-  final val invokespecial   = 0xb7
-  final val invokestatic    = 0xb8
-  final val invokeinterface = 0xb9
-  final val xxxunusedxxxx   = 0xba
-
-  final val new_          = 0xbb
-  final val newarray      = 0xbc
-  final val anewarray     = 0xbd
-  final val arraylength   = 0xbe
-  final val athrow        = 0xbf
-  final val checkcast     = 0xc0
-  final val instanceof    = 0xc1
-  final val monitorenter  = 0xc2
-  final val monitorexit   = 0xc3
-  final val wide          = 0xc4
-  final val multianewarray = 0xc5
-  final val ifnull        = 0xc6
-  final val ifnonnull     = 0xc7
-  final val goto_w        = 0xc8
-  final val jsr_w         = 0xc9
+  inline val nop         = 0x00
+  inline val aconst_null = 0x01
+  inline val iconst_m1   = 0x02
+
+  inline val iconst_0    = 0x03
+  inline val iconst_1    = 0x04
+  inline val iconst_2    = 0x05
+  inline val iconst_3    = 0x06
+  inline val iconst_4    = 0x07
+  inline val iconst_5    = 0x08
+
+  inline val lconst_0    = 0x09
+  inline val lconst_1    = 0x0a
+  inline val fconst_0    = 0x0b
+  inline val fconst_1    = 0x0c
+  inline val fconst_2    = 0x0d
+  inline val dconst_0    = 0x0e
+  inline val dconst_1    = 0x0f
+
+  inline val bipush      = 0x10
+  inline val sipush      = 0x11
+  inline val ldc         = 0x12
+  inline val ldc_w       = 0x13
+  inline val ldc2_w      = 0x14
+
+  inline val iload       = 0x15
+  inline val lload       = 0x16
+  inline val fload       = 0x17
+  inline val dload       = 0x18
+  inline val aload       = 0x19
+
+  inline val iload_0     = 0x1a
+  inline val iload_1     = 0x1b
+  inline val iload_2     = 0x1c
+  inline val iload_3     = 0x1d
+  inline val lload_0     = 0x1e
+  inline val lload_1     = 0x1f
+  inline val lload_2     = 0x20
+  inline val lload_3     = 0x21
+  inline val fload_0     = 0x22
+  inline val fload_1     = 0x23
+  inline val fload_2     = 0x24
+  inline val fload_3     = 0x25
+  inline val dload_0     = 0x26
+  inline val dload_1     = 0x27
+  inline val dload_2     = 0x28
+  inline val dload_3     = 0x29
+  inline val aload_0     = 0x2a
+  inline val aload_1     = 0x2b
+  inline val aload_2     = 0x2c
+  inline val aload_3     = 0x2d
+  inline val iaload      = 0x2e
+  inline val laload      = 0x2f
+  inline val faload      = 0x30
+  inline val daload      = 0x31
+  inline val aaload      = 0x32
+  inline val baload      = 0x33
+  inline val caload      = 0x34
+  inline val saload      = 0x35
+
+  inline val istore      = 0x36
+  inline val lstore      = 0x37
+  inline val fstore      = 0x38
+  inline val dstore      = 0x39
+  inline val astore      = 0x3a
+  inline val istore_0    = 0x3b
+  inline val istore_1    = 0x3c
+  inline val istore_2    = 0x3d
+  inline val istore_3    = 0x3e
+  inline val lstore_0    = 0x3f
+  inline val lstore_1    = 0x40
+  inline val lstore_2    = 0x41
+  inline val lstore_3    = 0x42
+  inline val fstore_0    = 0x43
+  inline val fstore_1    = 0x44
+  inline val fstore_2    = 0x45
+  inline val fstore_3    = 0x46
+  inline val dstore_0    = 0x47
+  inline val dstore_1    = 0x48
+  inline val dstore_2    = 0x49
+  inline val dstore_3    = 0x4a
+  inline val astore_0    = 0x4b
+  inline val astore_1    = 0x4c
+  inline val astore_2    = 0x4d
+  inline val astore_3    = 0x4e
+  inline val iastore     = 0x4f
+  inline val lastore     = 0x50
+  inline val fastore     = 0x51
+  inline val dastore     = 0x52
+  inline val aastore     = 0x53
+  inline val bastore     = 0x54
+  inline val castore     = 0x55
+  inline val sastore     = 0x56
+
+  inline val pop         = 0x57
+  inline val pop2        = 0x58
+  inline val dup         = 0x59
+  inline val dup_x1      = 0x5a
+  inline val dup_x2      = 0x5b
+  inline val dup2        = 0x5c
+  inline val dup2_x1     = 0x5d
+  inline val dup2_x2     = 0x5e
+  inline val swap        = 0x5f
+
+  inline val iadd        = 0x60
+  inline val ladd        = 0x61
+  inline val fadd        = 0x62
+  inline val dadd        = 0x63
+  inline val isub        = 0x64
+  inline val lsub        = 0x65
+  inline val fsub        = 0x66
+  inline val dsub        = 0x67
+  inline val imul        = 0x68
+  inline val lmul        = 0x69
+  inline val fmul        = 0x6a
+  inline val dmul        = 0x6b
+  inline val idiv        = 0x6c
+  inline val ldiv        = 0x6d
+  inline val fdiv        = 0x6e
+  inline val ddiv        = 0x6f
+  inline val irem        = 0x70
+  inline val lrem        = 0x71
+  inline val frem        = 0x72
+  inline val drem        = 0x73
+
+  inline val ineg        = 0x74
+  inline val lneg        = 0x75
+  inline val fneg        = 0x76
+  inline val dneg        = 0x77
+
+  inline val ishl        = 0x78
+  inline val lshl        = 0x79
+  inline val ishr        = 0x7a
+  inline val lshr        = 0x7b
+  inline val iushr       = 0x7c
+  inline val lushr       = 0x7d
+  inline val iand        = 0x7e
+  inline val land        = 0x7f
+  inline val ior         = 0x80
+  inline val lor         = 0x81
+  inline val ixor        = 0x82
+  inline val lxor        = 0x83
+  inline val iinc        = 0x84
+
+  inline val i2l         = 0x85
+  inline val i2f         = 0x86
+  inline val i2d         = 0x87
+  inline val l2i         = 0x88
+  inline val l2f         = 0x89
+  inline val l2d         = 0x8a
+  inline val f2i         = 0x8b
+  inline val f2l         = 0x8c
+  inline val f2d         = 0x8d
+  inline val d2i         = 0x8e
+  inline val d2l         = 0x8f
+  inline val d2f         = 0x90
+  inline val i2b         = 0x91
+  inline val i2c         = 0x92
+  inline val i2s         = 0x93
+
+  inline val lcmp        = 0x94
+  inline val fcmpl       = 0x95
+  inline val fcmpg       = 0x96
+  inline val dcmpl       = 0x97
+  inline val dcmpg       = 0x98
+
+  inline val ifeq        = 0x99
+  inline val ifne        = 0x9a
+  inline val iflt        = 0x9b
+  inline val ifge        = 0x9c
+  inline val ifgt        = 0x9d
+  inline val ifle        = 0x9e
+  inline val if_icmpeq   = 0x9f
+  inline val if_icmpne   = 0xa0
+  inline val if_icmplt   = 0xa1
+  inline val if_icmpge   = 0xa2
+  inline val if_icmpgt   = 0xa3
+  inline val if_icmple   = 0xa4
+  inline val if_acmpeq   = 0xa5
+  inline val if_acmpne   = 0xa6
+  inline val goto        = 0xa7
+  inline val jsr         = 0xa8
+  inline val ret         = 0xa9
+  inline val tableswitch = 0xaa
+  inline val lookupswitch = 0xab
+  inline val ireturn     = 0xac
+  inline val lreturn     = 0xad
+  inline val freturn     = 0xae
+  inline val dreturn     = 0xaf
+  inline val areturn     = 0xb0
+  inline val return_     = 0xb1
+
+  inline val getstatic   = 0xb2
+  inline val putstatic   = 0xb3
+  inline val getfield    = 0xb4
+  inline val putfield    = 0xb5
+
+  inline val invokevirtual   = 0xb6
+  inline val invokespecial   = 0xb7
+  inline val invokestatic    = 0xb8
+  inline val invokeinterface = 0xb9
+  inline val xxxunusedxxxx   = 0xba
+
+  inline val new_          = 0xbb
+  inline val newarray      = 0xbc
+  inline val anewarray     = 0xbd
+  inline val arraylength   = 0xbe
+  inline val athrow        = 0xbf
+  inline val checkcast     = 0xc0
+  inline val instanceof    = 0xc1
+  inline val monitorenter  = 0xc2
+  inline val monitorexit   = 0xc3
+  inline val wide          = 0xc4
+  inline val multianewarray = 0xc5
+  inline val ifnull        = 0xc6
+  inline val ifnonnull     = 0xc7
+  inline val goto_w        = 0xc8
+  inline val jsr_w         = 0xc9
 
   // reserved opcodes
-  final val breakpoint    = 0xca
-  final val impdep1       = 0xfe
-  final val impdep2       = 0xff
+  inline val breakpoint    = 0xca
+  inline val impdep1       = 0xfe
+  inline val impdep2       = 0xff
 
   import Flags._
   abstract class FlagTranslation {
diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
index bc64f34d8d7a..9920fc060142 100644
--- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
+++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
@@ -3,7 +3,7 @@ package dotc
 package core
 package classfile
 
-import dotty.tools.tasty.{ TastyReader, TastyHeaderUnpickler }
+import dotty.tools.tasty.{ TastyFormat, TastyReader, TastyHeaderUnpickler }
 
 import Contexts._, Symbols._, Types._, Names._, StdNames._, NameOps._, Scopes._, Decorators._
 import SymDenotations._, unpickleScala2.Scala2Unpickler._, Constants._, Annotations._, util.Spans._
@@ -20,6 +20,7 @@ import java.util.UUID
 import scala.collection.immutable
 import scala.collection.mutable.{ ListBuffer, ArrayBuffer }
 import scala.annotation.switch
+import tasty.TastyVersion
 import typer.Checking.checkNonCyclic
 import io.{AbstractFile, PlainFile, ZipArchive}
 import scala.util.control.NonFatal
@@ -62,8 +63,8 @@ class ClassfileParser(
 
   protected val staticModule: Symbol = moduleRoot.sourceModule(using ictx)
 
-  protected val instanceScope: MutableScope = newScope     // the scope of all instance definitions
-  protected val staticScope: MutableScope = newScope       // the scope of all static definitions
+  protected val instanceScope: MutableScope = newScope(0)     // the scope of all instance definitions
+  protected val staticScope: MutableScope = newScope(0)       // the scope of all static definitions
   protected var pool: ConstantPool = _              // the classfile's constant pool
 
   protected var currentClassName: SimpleName = _      // JVM name of the current class
@@ -884,7 +885,7 @@ class ClassfileParser(
       }
 
       def unpickleTASTY(bytes: Array[Byte]): Some[Embedded]  = {
-        val unpickler = new tasty.DottyUnpickler(bytes)
+        val unpickler = new tasty.DottyUnpickler(bytes, ctx.tastyVersion)
         unpickler.enter(roots = Set(classRoot, moduleRoot, moduleRoot.sourceModule))(using ctx.withSource(util.NoSource))
         Some(unpickler)
       }
@@ -950,9 +951,37 @@ class ClassfileParser(
           if (tastyBytes.nonEmpty) {
             val reader = new TastyReader(bytes, 0, 16)
             val expectedUUID = new UUID(reader.readUncompressedLong(), reader.readUncompressedLong())
-            val tastyUUID = new TastyHeaderUnpickler(tastyBytes).readHeader()
+            val tastyHeader = new TastyHeaderUnpickler(tastyBytes).readFullHeader()
+            val fileTastyVersion = TastyVersion(tastyHeader.majorVersion, tastyHeader.minorVersion, tastyHeader.experimentalVersion)
+            val tastyUUID = tastyHeader.uuid
             if (expectedUUID != tastyUUID)
               report.warning(s"$classfile is out of sync with its TASTy file. Loaded TASTy file. Try cleaning the project to fix this issue", NoSourcePosition)
+
+            val tastyFilePath = classfile.path.stripSuffix(".class") + ".tasty"
+
+            def reportWrongTasty(reason: String, highestAllowed: TastyVersion) =
+              report.error(s"""The class ${classRoot.symbol.showFullName} cannot be loaded from file ${tastyFilePath} because $reason:
+                              |highest allowed: ${highestAllowed.show}
+                              |found:           ${fileTastyVersion.show}
+              """.stripMargin)
+
+            val isTastyReadable = fileTastyVersion.isCompatibleWith(TastyVersion.compilerVersion)
+            if !isTastyReadable then
+              reportWrongTasty("its TASTy format cannot be read by the compiler", TastyVersion.compilerVersion)
+            else
+              def isStdlibClass(cls: ClassDenotation): Boolean =
+                ctx.platform.classPath.findClassFile(cls.fullName.mangledString) match {
+                  case Some(entry: ZipArchive#Entry) =>
+                    entry.underlyingSource.map(_.name.startsWith("scala3-library_")).getOrElse(false)
+                  case _ => false
+                }
+              // While emitting older TASTy the the newer standard library used by the compiler will still be on the class path so trying to read its TASTy files should not cause a crash.
+              // This is OK however because references to elements of stdlib API are validated according to the values of their `@since` annotations.
+              // This should guarantee that the code won't crash at runtime when used with the stdlib provided by an older compiler.
+              val isTastyCompatible = fileTastyVersion.isCompatibleWith(ctx.tastyVersion) || isStdlibClass(classRoot)
+              if !isTastyCompatible then
+                reportWrongTasty(s"its TASTy format is not compatible with the one of the targeted Scala release (${ctx.scalaRelease.show})", ctx.tastyVersion)
+
             return unpickleTASTY(tastyBytes)
           }
         }
@@ -1061,6 +1090,8 @@ class ClassfileParser(
           }
         else if (sym == classRoot.symbol)
           instanceScope.lookup(name)
+        else if (sym == classRoot.symbol.owner && name == classRoot.name)
+          classRoot.symbol
         else
           sym.info.member(name).symbol
 
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala
index ffcab8dc7a90..7396adf76991 100644
--- a/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala
+++ b/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala
@@ -39,7 +39,7 @@ object DottyUnpickler {
  *  @param bytes         the bytearray containing the Tasty file from which we unpickle
  *  @param mode          the tasty file contains package (TopLevel), an expression (Term) or a type (TypeTree)
  */
-class DottyUnpickler(bytes: Array[Byte], mode: UnpickleMode = UnpickleMode.TopLevel) extends ClassfileParser.Embedded with tpd.TreeProvider {
+class DottyUnpickler(bytes: Array[Byte], maximalTastyVersion: TastyVersion, mode: UnpickleMode = UnpickleMode.TopLevel) extends ClassfileParser.Embedded with tpd.TreeProvider {
   import tpd._
   import DottyUnpickler._
 
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/PositionPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/PositionPickler.scala
index 7181687d2a99..ad0c051e1b7b 100644
--- a/compiler/src/dotty/tools/dotc/core/tasty/PositionPickler.scala
+++ b/compiler/src/dotty/tools/dotc/core/tasty/PositionPickler.scala
@@ -91,7 +91,7 @@ class PositionPickler(
           | _: Trees.PackageDef[?]
           // holes can change source files when filled, which means
           // they might lose their position
-          | _: TreePickler.Hole => true
+          | _: Trees.Hole[?] => true
       case _ => false
     }
 
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala
index 3aeb7e6f35c9..74b8b357e00c 100644
--- a/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala
+++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala
@@ -7,6 +7,8 @@ import dotty.tools.tasty.{TastyBuffer, TastyFormat, TastyHash}
 import TastyFormat._
 import TastyBuffer._
 
+import Contexts._
+
 import collection.mutable
 import core.Symbols.{Symbol, ClassSymbol}
 import ast.tpd
@@ -30,7 +32,7 @@ class TastyPickler(val rootCls: ClassSymbol) {
   def newSection(name: String, buf: TastyBuffer): Unit =
     sections += ((nameBuffer.nameIndex(name.toTermName), buf))
 
-  def assembleParts(): Array[Byte] = {
+  def assembleParts()(using Context): Array[Byte] = {
     def lengthWithLength(buf: TastyBuffer) =
       buf.length + natSize(buf.length)
 
@@ -40,6 +42,8 @@ class TastyPickler(val rootCls: ClassSymbol) {
     val nameBufferHash = TastyHash.pjwHash64(nameBuffer.bytes)
     val treeSectionHash +: otherSectionHashes = sections.map(x => TastyHash.pjwHash64(x._2.bytes))
 
+    val tastyVersion = ctx.tastyVersion
+
     // Hash of name table and tree
     val uuidLow: Long = nameBufferHash ^ treeSectionHash
     // Hash of positions, comments and any additional section
@@ -48,9 +52,9 @@ class TastyPickler(val rootCls: ClassSymbol) {
     val headerBuffer = {
       val buf = new TastyBuffer(header.length + TastyPickler.versionStringBytes.length + 32)
       for (ch <- header) buf.writeByte(ch.toByte)
-      buf.writeNat(MajorVersion)
-      buf.writeNat(MinorVersion)
-      buf.writeNat(ExperimentalVersion)
+      buf.writeNat(tastyVersion.major)
+      buf.writeNat(tastyVersion.minor)
+      buf.writeNat(tastyVersion.experimental)
       buf.writeNat(TastyPickler.versionStringBytes.length)
       buf.writeBytes(TastyPickler.versionStringBytes, TastyPickler.versionStringBytes.length)
       buf.writeUncompressedLong(uuidLow)
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala
index 3a482309e0c3..d1c9904cf6cb 100644
--- a/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala
+++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala
@@ -11,14 +11,52 @@ import TastyUnpickler._
 import util.Spans.offsetToInt
 import printing.Highlighting._
 import dotty.tools.tasty.TastyFormat.{ASTsSection, PositionsSection, CommentsSection}
+import java.nio.file.{Files, Paths}
+import dotty.tools.io.{JarArchive, Path}
 
 object TastyPrinter:
-  def show(bytes: Array[Byte])(using Context): String =
+
+  def showContents(bytes: Array[Byte], noColor: Boolean): String =
     val printer =
-      if ctx.settings.color.value == "never" then new TastyPrinter(bytes)
+      if noColor then new TastyPrinter(bytes)
       else new TastyAnsiiPrinter(bytes)
     printer.showContents()
 
+  def main(args: Array[String]): Unit = {
+    // TODO: Decouple CliCommand from Context and use CliCommand.distill?
+    val lineWidth = 80
+    val line = "-" * lineWidth
+    val noColor = args.contains("-color:never")
+    var printLastLine = false
+    def printTasty(fileName: String, bytes: Array[Byte]): Unit =
+      println(line)
+      println(fileName)
+      println(line)
+      println(showContents(bytes, noColor))
+      println()
+      printLastLine = true
+    for arg <- args do
+      if arg == "-color:never" then () // skip
+      else if arg.startsWith("-") then println(s"bad option '$arg' was ignored")
+      else if arg.endsWith(".tasty") then {
+        val path = Paths.get(arg)
+        if Files.exists(path) then printTasty(arg, Files.readAllBytes(path))
+        else println("File not found: " + arg)
+      }
+      else if arg.endsWith(".jar") then {
+        val jar = JarArchive.open(Path(arg), create = false)
+        try
+          for file <- jar.iterator() if file.name.endsWith(".tasty") do
+            printTasty(s"$arg ${file.path}", file.toByteArray)
+        finally jar.close()
+
+      }
+      else println(s"Not a '.tasty' or '.jar' file: $arg")
+
+    if printLastLine then
+      println(line)
+  }
+
 class TastyPrinter(bytes: Array[Byte]) {
 
   private val sb: StringBuilder = new StringBuilder
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala
index 7bb71aa6deee..1a7e1d50c981 100644
--- a/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala
+++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala
@@ -3,7 +3,7 @@ package core
 package tasty
 
 import dotty.tools.tasty.{TastyFormat, TastyBuffer, TastyReader, TastyHeaderUnpickler}
-import TastyFormat.NameTags._
+import TastyFormat.NameTags._, TastyFormat.nameTagToString
 import TastyBuffer.NameRef
 
 import scala.collection.mutable
@@ -79,8 +79,10 @@ class TastyUnpickler(reader: TastyReader) {
         val original = readName()
         val target = readName()
         readSignedRest(original, target)
-      case _ =>
+      case SUPERACCESSOR | INLINEACCESSOR | BODYRETAINER | OBJECTCLASS =>
         simpleNameKindOfTag(tag)(readName())
+      case _ =>
+        throw MatchError(s"unknown name tag ${nameTagToString(tag)}")
     }
     assert(currentAddr == end, s"bad name $result $start $currentAddr $end")
     result
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyVersion.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyVersion.scala
new file mode 100644
index 000000000000..9c417563a1e3
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyVersion.scala
@@ -0,0 +1,23 @@
+package dotty.tools.dotc.core.tasty
+
+import dotty.tools.tasty.TastyFormat
+
+case class TastyVersion(major: Int, minor: Int, experimental: Int) {
+  def show = s"$major.$minor-$experimental"
+
+  def isCompatibleWith(that: TastyVersion): Boolean = TastyFormat.isVersionCompatible(
+    this.major, this.minor, this.experimental,
+    that.major, that.minor, that.experimental
+  )
+}
+
+object TastyVersion {
+  def compilerVersion = TastyVersion(TastyFormat.MajorVersion, TastyFormat.MinorVersion, TastyFormat.ExperimentalVersion)
+
+  def fromStableScalaRelease(majorVersion: Int, minorVersion: Int) = {
+    val tastyMajor = majorVersion + 25
+    val tastyMinor = minorVersion
+    TastyVersion(tastyMajor, tastyMinor, 0)
+  }
+
+}
\ No newline at end of file
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala
index 268b02b4389f..a3dedaaec685 100644
--- a/compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala
+++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala
@@ -13,7 +13,7 @@ import ast.untpd.Tree
 
 class TreeBuffer extends TastyBuffer(50000) {
 
-  private final val ItemsOverOffsets = 2
+  private inline val ItemsOverOffsets = 2
   private val initialOffsetSize = bytes.length / (AddrWidth * ItemsOverOffsets)
   private var offsets = new Array[Int](initialOffsetSize)
   private var isRelative = new Array[Boolean](initialOffsetSize)
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
index 06ba83ae15bf..8f5910c3dd56 100644
--- a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
+++ b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
@@ -22,21 +22,10 @@ import annotation.constructorOnly
 import collection.mutable
 import dotty.tools.tasty.TastyFormat.ASTsSection
 
-object TreePickler {
-
-  case class Hole(isTermHole: Boolean, idx: Int, args: List[tpd.Tree])(implicit @constructorOnly src: SourceFile) extends tpd.Tree {
-    override def isTerm: Boolean = isTermHole
-    override def isType: Boolean = !isTermHole
-    override def fallbackToText(printer: Printer): Text =
-      if isTermHole then s"{{{ $idx |" ~~ printer.toTextGlobal(tpe) ~~ "|" ~~ printer.toTextGlobal(args, ", ") ~~ "}}}"
-      else s"[[[ $idx |" ~~ printer.toTextGlobal(tpe) ~~ "|" ~~ printer.toTextGlobal(args, ", ") ~~ "]]]"
-  }
-}
 
 class TreePickler(pickler: TastyPickler) {
   val buf: TreeBuffer = new TreeBuffer
   pickler.newSection(ASTsSection, buf)
-  import TreePickler._
   import buf._
   import pickler.nameBuffer.nameIndex
   import tpd._
@@ -100,11 +89,6 @@ class TreePickler(pickler: TastyPickler) {
     case Some(label) =>
       if (label != NoAddr) writeRef(label) else pickleForwardSymRef(sym)
     case None =>
-      // See pos/t1957.scala for an example where this can happen.
-      // I believe it's a bug in typer: the type of an implicit argument refers
-      // to a closure parameter outside the closure itself. TODO: track this down, so that we
-      // can eliminate this case.
-      report.log(i"pickling reference to as yet undefined $sym in ${sym.owner}", sym.srcPos)
       pickleForwardSymRef(sym)
   }
 
@@ -217,6 +201,8 @@ class TreePickler(pickler: TastyPickler) {
       }
       else if (tpe.prefix == NoPrefix) {
         writeByte(if (tpe.isType) TYPEREFdirect else TERMREFdirect)
+        if !symRefs.contains(sym) && !sym.isPatternBound && !sym.hasAnnotation(defn.QuotedRuntimePatterns_patternTypeAnnot) then
+          report.error(i"pickling reference to as yet undefined $tpe with symbol ${sym}", sym.srcPos)
         pickleSymRef(sym)
       }
       else tpe.designator match {
@@ -332,6 +318,7 @@ class TreePickler(pickler: TastyPickler) {
 
   def pickleDef(tag: Int, mdef: MemberDef, tpt: Tree, rhs: Tree = EmptyTree, pickleParams: => Unit = ())(using Context): Unit = {
     val sym = mdef.symbol
+
     assert(symRefs(sym) == NoAddr, sym)
     registerDef(sym)
     writeByte(tag)
@@ -355,8 +342,7 @@ class TreePickler(pickler: TastyPickler) {
   def pickleParam(tree: Tree)(using Context): Unit = {
     registerTreeAddr(tree)
     tree match {
-      case tree: ValDef => pickleDef(PARAM, tree, tree.tpt)
-      case tree: DefDef => pickleDef(PARAM, tree, tree.tpt, tree.rhs)
+      case tree: ValDef  => pickleDef(PARAM, tree, tree.tpt)
       case tree: TypeDef => pickleDef(TYPEPARAM, tree, tree.rhs)
     }
   }
@@ -411,7 +397,7 @@ class TreePickler(pickler: TastyPickler) {
               var ename = tree.symbol.targetName
               val selectFromQualifier =
                 name.isTypeName
-                || qual.isInstanceOf[TreePickler.Hole] // holes have no symbol
+                || qual.isInstanceOf[Hole] // holes have no symbol
                 || sig == Signature.NotAMethod // no overload resolution necessary
                 || !tree.denot.symbol.exists // polymorphic function type
                 || tree.denot.asSingleDenotation.isRefinedMethod // refined methods have no defining class symbol
@@ -731,9 +717,10 @@ class TreePickler(pickler: TastyPickler) {
     if flags.is(Infix) then writeModTag(INFIX)
     if flags.is(Invisible) then writeModTag(INVISIBLE)
     if (flags.is(Erased)) writeModTag(ERASED)
+    if (flags.is(Exported)) writeModTag(EXPORTED)
+    if (flags.is(Given)) writeModTag(GIVEN)
+    if (flags.is(Implicit)) writeModTag(IMPLICIT)
     if (isTerm) {
-      if (flags.is(Implicit)) writeModTag(IMPLICIT)
-      if (flags.is(Given)) writeModTag(GIVEN)
       if (flags.is(Lazy, butNot = Module)) writeModTag(LAZY)
       if (flags.is(AbsOverride)) { writeModTag(ABSTRACT); writeModTag(OVERRIDE) }
       if (flags.is(Mutable)) writeModTag(MUTABLE)
@@ -744,7 +731,6 @@ class TreePickler(pickler: TastyPickler) {
       if (flags.is(Extension)) writeModTag(EXTENSION)
       if (flags.is(ParamAccessor)) writeModTag(PARAMsetter)
       if (flags.is(SuperParamAlias)) writeModTag(PARAMalias)
-      if (flags.is(Exported)) writeModTag(EXPORTED)
       assert(!(flags.is(Label)))
     }
     else {
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
index 944d3016bd27..ac315f4cef89 100644
--- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
+++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -634,7 +634,6 @@ class TreeUnpickler(reader: TastyReader,
         }
         nextByte match {
           case PRIVATE => addFlag(Private)
-          case INTERNAL => ??? // addFlag(Internal)
           case PROTECTED => addFlag(Protected)
           case ABSTRACT =>
             readByte()
@@ -832,7 +831,11 @@ class TreeUnpickler(reader: TastyReader,
           val tpt = readTpt()(using localCtx)
           val paramss = normalizeIfConstructor(
               paramDefss.nestedMap(_.symbol), name == nme.CONSTRUCTOR)
-          val resType = effectiveResultType(sym, paramss, tpt.tpe)
+          val resType =
+            if name == nme.CONSTRUCTOR then
+              effectiveResultType(sym, paramss)
+            else
+              tpt.tpe
           sym.info = methodType(paramss, resType)
           DefDef(paramDefss, tpt)
         case VALDEF =>
@@ -857,36 +860,45 @@ class TreeUnpickler(reader: TastyReader,
             sym.info = TypeBounds.empty // needed to avoid cyclic references when unpickling rhs, see i3816.scala
             sym.setFlag(Provisional)
             val rhs = readTpt()(using localCtx)
-            sym.info = new NoCompleter {
+
+            sym.info = new NoCompleter:
               override def completerTypeParams(sym: Symbol)(using Context) =
                 rhs.tpe.typeParams
-            }
-            sym.info = sym.opaqueToBounds(
-              checkNonCyclic(sym, rhs.tpe.toBounds, reportErrors = false),
-              rhs, rhs.tpe.typeParams)
-            if sym.isOpaqueAlias then sym.typeRef.recomputeDenot() // make sure we see the new bounds from now on
+
+            def opaqueToBounds(info: Type): Type =
+              val tparamSyms = rhs match
+                case LambdaTypeTree(tparams, body) => tparams.map(_.symbol.asType)
+                case _ => Nil
+              sym.opaqueToBounds(info, rhs, tparamSyms)
+
+            val info = checkNonCyclic(sym, rhs.tpe.toBounds, reportErrors = false)
+            if sym.isOpaqueAlias then
+              sym.info = opaqueToBounds(info)
+              sym.typeRef.recomputeDenot() // make sure we see the new bounds from now on
+            else
+              sym.info = info
+
             sym.resetFlag(Provisional)
             TypeDef(rhs)
           }
         case PARAM =>
           val tpt = readTpt()(using localCtx)
-          if (nothingButMods(end)) {
-            sym.info = tpt.tpe
-            ValDef(tpt)
-          }
-          else {
-            sym.info = ExprType(tpt.tpe)
-            pickling.println(i"reading param alias $name -> $currentAddr")
-            DefDef(Nil, tpt)
-          }
+          assert(nothingButMods(end))
+          sym.info = tpt.tpe
+          ValDef(tpt)
       }
       goto(end)
       setSpan(start, tree)
-      if (!sym.isType) // Only terms might have leaky aliases, see the documentation of `checkNoPrivateLeaks`
+
+      // Dealias any non-accessible type alias in the type of `sym`. This can be
+      // skipped for types (see `checkNoPrivateLeaks` for why) as well as for
+      // param accessors since they can't refer to an inaccesible type member of
+      // the class.
+      if !sym.isType && !sym.is(ParamAccessor) then
         sym.info = ta.avoidPrivateLeaks(sym)
 
-      if (ctx.mode.is(Mode.ReadComments)) {
-        assert(ctx.docCtx.isDefined, "Mode is `ReadComments`, but no `docCtx` is set.")
+      if (ctx.settings.YreadComments.value) {
+        assert(ctx.docCtx.isDefined, "`-Yread-docs` enabled, but no `docCtx` is set.")
         commentUnpicklerOpt.foreach { commentUnpickler =>
           val comment = commentUnpickler.commentAt(start)
           ctx.docCtx.get.addDocstring(tree.symbol, comment)
@@ -1061,12 +1073,10 @@ class TreeUnpickler(reader: TastyReader,
       def makeSelect(qual: Tree, name: Name, denot: Denotation): Select =
         var qualType = qual.tpe.widenIfUnstable
         val owner = denot.symbol.maybeOwner
-        if (owner.isPackageObject && qualType.termSymbol.is(Package))
-          qualType = qualType.select(owner.sourceModule)
-        val tpe = name match {
+        val tpe0 = name match
           case name: TypeName => TypeRef(qualType, name, denot)
           case name: TermName => TermRef(qualType, name, denot)
-        }
+        val tpe = TypeOps.makePackageObjPrefixExplicit(tpe0)
         ConstFold.Select(untpd.Select(qual, name).withType(tpe))
 
       def completeSelect(name: Name, sig: Signature, target: Name): Select =
@@ -1199,8 +1209,8 @@ class TreeUnpickler(reader: TastyReader,
                *  or an override has been removed.
                *
                *  This is tested in
-               *  - sbt-dotty/sbt-test/tasty-compat/remove-override
-               *  - sbt-dotty/sbt-test/tasty-compat/move-method
+               *  - sbt-test/tasty-compat/remove-override
+               *  - sbt-test/tasty-compat/move-method
                */
               def lookupInSuper =
                 val cls = ownerTpe.classSymbol
@@ -1278,7 +1288,7 @@ class TreeUnpickler(reader: TastyReader,
               val idx = readNat()
               val tpe = readType()
               val args = until(end)(readTerm())
-              TreePickler.Hole(true, idx, args).withType(tpe)
+              Hole(true, idx, args).withType(tpe)
             case _ =>
               readPathTerm()
           }
@@ -1287,8 +1297,6 @@ class TreeUnpickler(reader: TastyReader,
       }
 
       val tree = if (tag < firstLengthTreeTag) readSimpleTerm() else readLengthTerm()
-      if (!tree.isInstanceOf[TypTree]) // FIXME: Necessary to avoid self-type cyclic reference in tasty_tools
-        tree.overwriteType(tree.tpe.simplified)
       setSpan(start, tree)
     }
 
@@ -1314,7 +1322,7 @@ class TreeUnpickler(reader: TastyReader,
           val idx = readNat()
           val tpe = readType()
           val args = until(end)(readTerm())
-          TreePickler.Hole(false, idx, args).withType(tpe)
+          Hole(false, idx, args).withType(tpe)
         case _ =>
           if (isTypeTreeTag(nextByte)) readTerm()
           else {
@@ -1353,7 +1361,9 @@ class TreeUnpickler(reader: TastyReader,
     def readLaterWithOwner[T <: AnyRef](end: Addr, op: TreeReader => Context ?=> T)(using Context): Symbol => Trees.Lazy[T] = {
       val localReader = fork
       goto(end)
-      owner => new LazyReader(localReader, owner, ctx.mode, ctx.source, op)
+      val mode = ctx.mode
+      val source = ctx.source
+      owner => new LazyReader(localReader, owner, mode, source, op)
     }
 
 // ------ Setting positions ------------------------------------------------
@@ -1397,7 +1407,7 @@ class TreeUnpickler(reader: TastyReader,
       if (path.nonEmpty) {
         val sourceFile = ctx.getSource(path)
         posUnpicklerOpt match
-          case Some(posUnpickler) =>
+          case Some(posUnpickler) if !sourceFile.initialized =>
             sourceFile.setLineIndicesFromLineSizes(posUnpickler.lineSizes)
           case _ =>
         pickling.println(i"source change at $addr: $path")
@@ -1510,9 +1520,9 @@ object TreeUnpickler {
 
   /** An enumeration indicating which subtrees should be added to an OwnerTree. */
   type MemberDefMode = Int
-  final val MemberDefsOnly = 0   // add only member defs; skip other statements
-  final val NoMemberDefs = 1     // add only statements that are not member defs
-  final val AllDefs = 2          // add everything
+  inline val MemberDefsOnly = 0   // add only member defs; skip other statements
+  inline val NoMemberDefs = 1     // add only statements that are not member defs
+  inline val AllDefs = 2          // add everything
 
   class TreeWithoutOwner extends Exception
 }
diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala
index fc06ce4da8a3..2aeb1bdeefcc 100644
--- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala
+++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala
@@ -189,9 +189,9 @@ class PickleBuffer(data: Array[Byte], from: Int, to: Int) {
 
 object PickleBuffer {
 
-  private final val ScalaFlagEnd = 48
-  private final val ChunkBits = 8
-  private final val ChunkSize = 1 << ChunkBits
+  private inline val ScalaFlagEnd = 48
+  private inline val ChunkBits = 8
+  private inline val ChunkSize = 1 << ChunkBits
   private type FlagMap = Array[Array[Long]]
 
   private val (scalaTermFlagMap, scalaTypeFlagMap) = {
diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleFormat.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleFormat.scala
index a9a64a9bb7ee..f135de7e43e9 100644
--- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleFormat.scala
+++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleFormat.scala
@@ -119,109 +119,109 @@ object PickleFormat {
   val MajorVersion: Int = 5
   val MinorVersion: Int = 2
 
-  final val TERMname = 1
-  final val TYPEname = 2
-  final val NONEsym = 3
-  final val TYPEsym = 4
-  final val ALIASsym = 5
-  final val CLASSsym = 6
-  final val MODULEsym = 7
-  final val VALsym = 8
-  final val EXTref = 9
-  final val EXTMODCLASSref = 10
-  final val NOtpe = 11
-  final val NOPREFIXtpe = 12
-  final val THIStpe = 13
-  final val SINGLEtpe = 14
-  final val CONSTANTtpe = 15
-  final val TYPEREFtpe = 16
-  final val TYPEBOUNDStpe = 17
-  final val REFINEDtpe = 18
-  final val CLASSINFOtpe = 19
-  final val METHODtpe = 20
-  final val POLYtpe = 21
-  final val IMPLICITMETHODtpe = 22    // no longer generated
+  inline val TERMname = 1
+  inline val TYPEname = 2
+  inline val NONEsym = 3
+  inline val TYPEsym = 4
+  inline val ALIASsym = 5
+  inline val CLASSsym = 6
+  inline val MODULEsym = 7
+  inline val VALsym = 8
+  inline val EXTref = 9
+  inline val EXTMODCLASSref = 10
+  inline val NOtpe = 11
+  inline val NOPREFIXtpe = 12
+  inline val THIStpe = 13
+  inline val SINGLEtpe = 14
+  inline val CONSTANTtpe = 15
+  inline val TYPEREFtpe = 16
+  inline val TYPEBOUNDStpe = 17
+  inline val REFINEDtpe = 18
+  inline val CLASSINFOtpe = 19
+  inline val METHODtpe = 20
+  inline val POLYtpe = 21
+  inline val IMPLICITMETHODtpe = 22    // no longer generated
 
-  final val LITERAL = 23   // base line for literals
-  final val LITERALunit = 24
-  final val LITERALboolean = 25
-  final val LITERALbyte = 26
-  final val LITERALshort = 27
-  final val LITERALchar = 28
-  final val LITERALint = 29
-  final val LITERALlong = 30
-  final val LITERALfloat = 31
-  final val LITERALdouble = 32
-  final val LITERALstring = 33
-  final val LITERALnull = 34
-  final val LITERALclass = 35
-  final val LITERALenum = 36
-  final val SYMANNOT = 40
-  final val CHILDREN = 41
-  final val ANNOTATEDtpe = 42
-  final val ANNOTINFO = 43
-  final val ANNOTARGARRAY = 44
+  inline val LITERAL = 23   // base line for literals
+  inline val LITERALunit = 24
+  inline val LITERALboolean = 25
+  inline val LITERALbyte = 26
+  inline val LITERALshort = 27
+  inline val LITERALchar = 28
+  inline val LITERALint = 29
+  inline val LITERALlong = 30
+  inline val LITERALfloat = 31
+  inline val LITERALdouble = 32
+  inline val LITERALstring = 33
+  inline val LITERALnull = 34
+  inline val LITERALclass = 35
+  inline val LITERALenum = 36
+  inline val SYMANNOT = 40
+  inline val CHILDREN = 41
+  inline val ANNOTATEDtpe = 42
+  inline val ANNOTINFO = 43
+  inline val ANNOTARGARRAY = 44
 
-  final val SUPERtpe = 46
-  final val DEBRUIJNINDEXtpe = 47   // no longer generated
-  final val EXISTENTIALtpe = 48
+  inline val SUPERtpe = 46
+  inline val DEBRUIJNINDEXtpe = 47   // no longer generated
+  inline val EXISTENTIALtpe = 48
 
-  final val TREE = 49      // prefix code that means a tree is coming
-    final val EMPTYtree = 1
-    final val PACKAGEtree = 2
-    final val CLASStree = 3
-    final val MODULEtree = 4
-    final val VALDEFtree = 5
-    final val DEFDEFtree = 6
-    final val TYPEDEFtree = 7
-    final val LABELtree = 8
-    final val IMPORTtree = 9
-    final val DOCDEFtree = 11
-    final val TEMPLATEtree = 12
-    final val BLOCKtree = 13
-    final val CASEtree = 14
+  inline val TREE = 49      // prefix code that means a tree is coming
+    inline val EMPTYtree = 1
+    inline val PACKAGEtree = 2
+    inline val CLASStree = 3
+    inline val MODULEtree = 4
+    inline val VALDEFtree = 5
+    inline val DEFDEFtree = 6
+    inline val TYPEDEFtree = 7
+    inline val LABELtree = 8
+    inline val IMPORTtree = 9
+    inline val DOCDEFtree = 11
+    inline val TEMPLATEtree = 12
+    inline val BLOCKtree = 13
+    inline val CASEtree = 14
     // This node type has been removed.
-    // final val SEQUENCEtree = 15
-    final val ALTERNATIVEtree = 16
-    final val STARtree = 17
-    final val BINDtree = 18
-    final val UNAPPLYtree = 19
-    final val ARRAYVALUEtree = 20
-    final val FUNCTIONtree = 21
-    final val ASSIGNtree = 22
-    final val IFtree = 23
-    final val MATCHtree = 24
-    final val RETURNtree = 25
-    final val TREtree = 26
-    final val THROWtree = 27
-    final val NEWtree = 28
-    final val TYPEDtree = 29
-    final val TYPEAPPLYtree = 30
-    final val APPLYtree = 31
-    final val APPLYDYNAMICtree = 32
-    final val SUPERtree = 33
-    final val THIStree = 34
-    final val SELECTtree = 35
-    final val IDENTtree = 36
-    final val LITERALtree = 37
-    final val TYPEtree = 38
-    final val ANNOTATEDtree = 39
-    final val SINGLETONTYPEtree = 40
-    final val SELECTFROMTYPEtree = 41
-    final val COMPOUNDTYPEtree = 42
-    final val APPLIEDTYPEtree = 43
-    final val TYPEBOUNDStree = 44
-    final val EXISTENTIALTYPEtree = 45
+    // inline val SEQUENCEtree = 15
+    inline val ALTERNATIVEtree = 16
+    inline val STARtree = 17
+    inline val BINDtree = 18
+    inline val UNAPPLYtree = 19
+    inline val ARRAYVALUEtree = 20
+    inline val FUNCTIONtree = 21
+    inline val ASSIGNtree = 22
+    inline val IFtree = 23
+    inline val MATCHtree = 24
+    inline val RETURNtree = 25
+    inline val TREtree = 26
+    inline val THROWtree = 27
+    inline val NEWtree = 28
+    inline val TYPEDtree = 29
+    inline val TYPEAPPLYtree = 30
+    inline val APPLYtree = 31
+    inline val APPLYDYNAMICtree = 32
+    inline val SUPERtree = 33
+    inline val THIStree = 34
+    inline val SELECTtree = 35
+    inline val IDENTtree = 36
+    inline val LITERALtree = 37
+    inline val TYPEtree = 38
+    inline val ANNOTATEDtree = 39
+    inline val SINGLETONTYPEtree = 40
+    inline val SELECTFROMTYPEtree = 41
+    inline val COMPOUNDTYPEtree = 42
+    inline val APPLIEDTYPEtree = 43
+    inline val TYPEBOUNDStree = 44
+    inline val EXISTENTIALTYPEtree = 45
 
-  final val MODIFIERS = 50
+  inline val MODIFIERS = 50
 
-  final val firstSymTag = NONEsym
-  final val lastSymTag = VALsym
-  final val lastExtSymTag = EXTMODCLASSref
+  inline val firstSymTag = NONEsym
+  inline val lastSymTag = VALsym
+  inline val lastExtSymTag = EXTMODCLASSref
 }
 
 
   //The following two are no longer accurate, because ANNOTATEDtpe,
   //SUPERtpe, ... are not in the same range as the other types
-  //final val firstTypeTag = NOtpe
-  //final val lastTypeTag = POLYtpe
+  //inline val firstTypeTag = NOtpe
+  //inline val lastTypeTag = POLYtpe
diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Erasure.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Erasure.scala
index 5dde517c4864..f43735d16630 100644
--- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Erasure.scala
+++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Erasure.scala
@@ -29,7 +29,7 @@ object Scala2Erasure:
    *  these issues because they get flattened into a single RefinedType with
    *  three parents, cf `flattenedParents`.
    *
-   *  See sbt-dotty/sbt-test/scala2-compat/erasure/changes/Main.scala for examples.
+   *  See sbt-test/scala2-compat/erasure/changes/Main.scala for examples.
    *
    *  @throws TypeError if this type is unsupported.
    */
@@ -215,7 +215,7 @@ object Scala2Erasure:
    *  is only specified for class symbols. Therefore, the accuracy of this
    *  method cannot be guaranteed, the best we can do is make sure it works on
    *  as many test cases as possible which can be run from sbt using:
-   *  > sbt-dotty/scripted scala2-compat/erasure
+   *  > sbt-test/scripted scala2-compat/erasure
    *
    *  The body of this method is made to look as much as the Scala 2 version as
    *  possible to make them easier to compare, cf:
diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Flags.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Flags.scala
index 5749706270c9..6cf08b3384d9 100644
--- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Flags.scala
+++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Flags.scala
@@ -12,96 +12,96 @@ package unpickleScala2
 /** Scala2 flags, adapted from https://github.com/scala/scala/blob/2.11.x/src/reflect/scala/reflect/internal/Flags.scala
  */
 object Scala2Flags {
-  final val IMPLICIT      = 1 << 9
-  final val FINAL         = 1 << 5    // May not be overridden. Note that java final implies much more than scala final.
-  final val PRIVATE       = 1 << 2
-  final val PROTECTED     = 1 << 0
+  inline val IMPLICIT      = 1 << 9
+  inline val FINAL         = 1 << 5    // May not be overridden. Note that java final implies much more than scala final.
+  inline val PRIVATE       = 1 << 2
+  inline val PROTECTED     = 1 << 0
 
-  final val SEALED        = 1 << 10
-  final val OVERRIDE      = 1 << 1
-  final val CASE          = 1 << 11
-  final val ABSTRACT      = 1 << 3        // abstract class, or used in conjunction with abstract override.
+  inline val SEALED        = 1 << 10
+  inline val OVERRIDE      = 1 << 1
+  inline val CASE          = 1 << 11
+  inline val ABSTRACT      = 1 << 3        // abstract class, or used in conjunction with abstract override.
                                           // Note difference to DEFERRED!
-  final val DEFERRED      = 1 << 4        // was `abstract' for members | trait is virtual
-  final val INTERFACE     = 1 << 7        // symbol is an interface (i.e. a trait which defines only abstract methods)
-  final val MUTABLE       = 1 << 12       // symbol is a mutable variable.
-  final val PARAM         = 1 << 13       // symbol is a (value or type) parameter to a method
-  final val MACRO         = 1 << 15       // symbol is a macro definition
+  inline val DEFERRED      = 1 << 4        // was `abstract' for members | trait is virtual
+  inline val INTERFACE     = 1 << 7        // symbol is an interface (i.e. a trait which defines only abstract methods)
+  inline val MUTABLE       = 1 << 12       // symbol is a mutable variable.
+  inline val PARAM         = 1 << 13       // symbol is a (value or type) parameter to a method
+  inline val MACRO         = 1 << 15       // symbol is a macro definition
 
-  final val COVARIANT     = 1 << 16       // symbol is a covariant type variable
-  final val BYNAMEPARAM   = 1 << 16       // parameter is by name
-  final val CONTRAVARIANT = 1 << 17       // symbol is a contravariant type variable
-  final val ABSOVERRIDE   = 1 << 18       // combination of abstract & override
-  final val LOCAL         = 1 << 19       // symbol is local to current class (i.e. private[this] or protected
+  inline val COVARIANT     = 1 << 16       // symbol is a covariant type variable
+  inline val BYNAMEPARAM   = 1 << 16       // parameter is by name
+  inline val CONTRAVARIANT = 1 << 17       // symbol is a contravariant type variable
+  inline val ABSOVERRIDE   = 1 << 18       // combination of abstract & override
+  inline val LOCAL         = 1 << 19       // symbol is local to current class (i.e. private[this] or protected
                                           // pre: PRIVATE or PROTECTED are also set
-  final val JAVA          = 1 << 20       // symbol was defined by a Java class
-  final val STATIC        = 1 << 23       // static field, method or class
-  final val CASEACCESSOR  = 1 << 24       // symbol is a case parameter (or its accessor, or a GADT skolem)
-  final val TRAIT         = 1 << 25       // symbol is a trait
-  final val DEFAULTPARAM  = 1 << 25       // the parameter has a default value
-  final val PARAMACCESSOR = 1 << 29       // for field definitions generated for primary constructor
+  inline val JAVA          = 1 << 20       // symbol was defined by a Java class
+  inline val STATIC        = 1 << 23       // static field, method or class
+  inline val CASEACCESSOR  = 1 << 24       // symbol is a case parameter (or its accessor, or a GADT skolem)
+  inline val TRAIT         = 1 << 25       // symbol is a trait
+  inline val DEFAULTPARAM  = 1 << 25       // the parameter has a default value
+  inline val PARAMACCESSOR = 1 << 29       // for field definitions generated for primary constructor
                                           //   parameters (no matter if it's a 'val' parameter or not)
                                           // for parameters of a primary constructor ('val' or not)
                                           // for the accessor methods generated for 'val' or 'var' parameters
-  final val LAZY          = 1L << 31      // symbol is a lazy val. can't have MUTABLE unless transformed by typer
-  final val PRESUPER      = 1L << 37      // value is evaluated before super call
-  final val DEFAULTINIT   = 1L << 41      // symbol is initialized to the default value: used by -Xcheckinit
-  final val ARTIFACT      = 1L << 46      // symbol should be ignored when typechecking; will be marked ACC_SYNTHETIC in bytecode
+  inline val LAZY          = 1L << 31      // symbol is a lazy val. can't have MUTABLE unless transformed by typer
+  inline val PRESUPER      = 1L << 37      // value is evaluated before super call
+  inline val DEFAULTINIT   = 1L << 41      // symbol is initialized to the default value: used by -Xcheckinit
+  inline val ARTIFACT      = 1L << 46      // symbol should be ignored when typechecking; will be marked ACC_SYNTHETIC in bytecode
                                           // to see which symbols are marked as ARTIFACT, see scaladocs for FlagValues.ARTIFACT
-  final val DEFAULTMETHOD = 1L << 47      // symbol is a java default method
-  final val ENUM          = 1L << 48      // symbol is an enum
+  inline val DEFAULTMETHOD = 1L << 47      // symbol is a java default method
+  inline val ENUM          = 1L << 48      // symbol is an enum
 
-  final val PrivateLocal   = PRIVATE | LOCAL
-  final val ProtectedLocal = PROTECTED | LOCAL
-  final val AccessFlags    = PRIVATE | PROTECTED | LOCAL
+  inline val PrivateLocal   = PRIVATE | LOCAL
+  inline val ProtectedLocal = PROTECTED | LOCAL
+  inline val AccessFlags    = PRIVATE | PROTECTED | LOCAL
 
-  final val METHOD        = 1 << 6        // a method
-  final val MODULE        = 1 << 8        // symbol is module or class implementing a module
-  final val PACKAGE       = 1 << 14       // symbol is a java package
+  inline val METHOD        = 1 << 6        // a method
+  inline val MODULE        = 1 << 8        // symbol is module or class implementing a module
+  inline val PACKAGE       = 1 << 14       // symbol is a java package
 
-  final val CAPTURED      = 1 << 16       // variable is accessed from nested function.  Set by LambdaLift.
-  final val LABEL         = 1 << 17       // method symbol is a label. Set by TailCall
-  final val INCONSTRUCTOR = 1 << 17       // class symbol is defined in this/superclass constructor.
-  final val SYNTHETIC     = 1 << 21       // symbol is compiler-generated (compare with ARTIFACT)
-  final val STABLE        = 1 << 22       // functions that are assumed to be stable
+  inline val CAPTURED      = 1 << 16       // variable is accessed from nested function.  Set by LambdaLift.
+  inline val LABEL         = 1 << 17       // method symbol is a label. Set by TailCall
+  inline val INCONSTRUCTOR = 1 << 17       // class symbol is defined in this/superclass constructor.
+  inline val SYNTHETIC     = 1 << 21       // symbol is compiler-generated (compare with ARTIFACT)
+  inline val STABLE        = 1 << 22       // functions that are assumed to be stable
                                           // (typically, access methods for valdefs)
                                           // or classes that do not contain abstract types.
-  final val BRIDGE        = 1 << 26       // function is a bridge method. Set by Erasure
-  final val ACCESSOR      = 1 << 27       // a value or variable accessor (getter or setter)
+  inline val BRIDGE        = 1 << 26       // function is a bridge method. Set by Erasure
+  inline val ACCESSOR      = 1 << 27       // a value or variable accessor (getter or setter)
 
-  final val SUPERACCESSOR = 1 << 28       // a super accessor
-  final val MODULEVAR     = 1 << 30       // for variables: is the variable caching a module value
+  inline val SUPERACCESSOR = 1 << 28       // a super accessor
+  inline val MODULEVAR     = 1 << 30       // for variables: is the variable caching a module value
 
-  final val IS_ERROR      = 1L << 32      // symbol is an error symbol
-  final val OVERLOADED    = 1L << 33      // symbol is overloaded
-  final val LIFTED        = 1L << 34      // class has been lifted out to package level
+  inline val IS_ERROR      = 1L << 32      // symbol is an error symbol
+  inline val OVERLOADED    = 1L << 33      // symbol is overloaded
+  inline val LIFTED        = 1L << 34      // class has been lifted out to package level
                                           // local value has been lifted out to class level
                                           // todo: make LIFTED = latePRIVATE?
-  final val MIXEDIN       = 1L << 35      // term member has been mixed in
-  final val EXISTENTIAL   = 1L << 35      // type is an existential parameter or skolem
-  final val EXPANDEDNAME  = 1L << 36      // name has been expanded with class suffix
-  final val TRANS_FLAG    = 1L << 38      // transient flag guaranteed to be reset after each phase.
+  inline val MIXEDIN       = 1L << 35      // term member has been mixed in
+  inline val EXISTENTIAL   = 1L << 35      // type is an existential parameter or skolem
+  inline val EXPANDEDNAME  = 1L << 36      // name has been expanded with class suffix
+  inline val TRANS_FLAG    = 1L << 38      // transient flag guaranteed to be reset after each phase.
 
-  final val LOCKED        = 1L << 39      // temporary flag to catch cyclic dependencies
-  final val SPECIALIZED   = 1L << 40      // symbol is a generated specialized member
-  final val VBRIDGE       = 1L << 42      // symbol is a varargs bridge
+  inline val LOCKED        = 1L << 39      // temporary flag to catch cyclic dependencies
+  inline val SPECIALIZED   = 1L << 40      // symbol is a generated specialized member
+  inline val VBRIDGE       = 1L << 42      // symbol is a varargs bridge
 
-  final val VARARGS       = 1L << 43      // symbol is a Java-style varargs method
-  final val TRIEDCOOKING  = 1L << 44      // `Cooking` has been tried on this symbol
+  inline val VARARGS       = 1L << 43      // symbol is a Java-style varargs method
+  inline val TRIEDCOOKING  = 1L << 44      // `Cooking` has been tried on this symbol
                                           // A Java method's type is `cooked` by transforming raw types to existentials
 
-  final val SYNCHRONIZED  = 1L << 45      // symbol is a method which should be marked ACC_SYNCHRONIZED
+  inline val SYNCHRONIZED  = 1L << 45      // symbol is a method which should be marked ACC_SYNCHRONIZED
 
-  final val IMPLICIT_PKL   = (1 << 0)
-  final val FINAL_PKL      = (1 << 1)
-  final val PRIVATE_PKL    = (1 << 2)
-  final val PROTECTED_PKL  = (1 << 3)
-  final val SEALED_PKL     = (1 << 4)
-  final val OVERRIDE_PKL   = (1 << 5)
-  final val CASE_PKL       = (1 << 6)
-  final val ABSTRACT_PKL   = (1 << 7)
-  final val DEFERRED_PKL   = (1 << 8)
-  final val METHOD_PKL     = (1 << 9)
-  final val MODULE_PKL     = (1 << 10)
-  final val INTERFACE_PKL  = (1 << 11)
+  inline val IMPLICIT_PKL   = (1 << 0)
+  inline val FINAL_PKL      = (1 << 1)
+  inline val PRIVATE_PKL    = (1 << 2)
+  inline val PROTECTED_PKL  = (1 << 3)
+  inline val SEALED_PKL     = (1 << 4)
+  inline val OVERRIDE_PKL   = (1 << 5)
+  inline val CASE_PKL       = (1 << 6)
+  inline val ABSTRACT_PKL   = (1 << 7)
+  inline val DEFERRED_PKL   = (1 << 8)
+  inline val METHOD_PKL     = (1 << 9)
+  inline val MODULE_PKL     = (1 << 10)
+  inline val INTERFACE_PKL  = (1 << 11)
 }
diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
index 54a7ad91e434..b5b8c4715ebc 100644
--- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
+++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
@@ -233,7 +233,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
   }
 
   /** The `decls` scope associated with given symbol */
-  protected def symScope(sym: Symbol): Scope = symScopes.getOrElseUpdate(sym, newScope)
+  protected def symScope(sym: Symbol): Scope = symScopes.getOrElseUpdate(sym, newScope(0))
 
   /** Does entry represent an (internal) symbol */
   protected def isSymbolEntry(i: Int)(using Context): Boolean = {
@@ -434,12 +434,16 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
     var name = at(nameref, () => readName()(using ctx))
     val owner = readSymbolRef()
 
-    if (name eq nme.getClass_) && defn.hasProblematicGetClass(owner.name) then
+    var flags = unpickleScalaFlags(readLongNat(), name.isTypeName)
+
+    if (name eq nme.getClass_) && defn.hasProblematicGetClass(owner.name)
+       // Scala 2 sometimes pickle the same type parameter symbol multiple times
+       // (see i11173 for an example), but we should only unpickle it once.
+       || tag == TYPEsym && flags.is(TypeParam) && symScope(owner).lookup(name.asTypeName).exists
+    then
       // skip this member
       return NoSymbol
 
-    var flags = unpickleScalaFlags(readLongNat(), name.isTypeName)
-
     name = name.adjustIfModuleClass(flags)
     if (flags.is(Method))
       name =
@@ -491,7 +495,27 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
         sym.setFlag(Scala2x)
       if (!(isRefinementClass(sym) || isUnpickleRoot(sym) || sym.is(Scala2Existential))) {
         val owner = sym.owner
-        if (owner.isClass)
+        val canEnter =
+          owner.isClass &&
+          (!sym.is(TypeParam) ||
+            owner.infoOrCompleter.match
+              case completer: ClassUnpickler =>
+                // Type parameters seen after class initialization are not
+                // actually type parameters of the current class but of some
+                // external class because of the bizarre way in which Scala 2
+                // pickles them (see
+                // https://github.com/scala/scala/blob/aa31e3e6bb945f5d69740d379ede1cd514904109/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala#L181-L197).
+                // Make sure we don't enter them in the class otherwise the
+                // compiler will get very confused (testcase in sbt-test/scala2-compat/i12641).
+                // Note: I don't actually know if these stray type parameters
+                // can also show up before initialization, if that's the case
+                // we'll need to study more closely how Scala 2 handles type
+                // parameter unpickling and try to emulate it.
+                !completer.isInitialized
+              case _ =>
+                true)
+
+        if (canEnter)
           owner.asClass.enter(sym, symScope(owner))
       }
       sym
@@ -621,23 +645,30 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
   object localMemberUnpickler extends LocalUnpickler
 
   class ClassUnpickler(infoRef: Int) extends LocalUnpickler with TypeParamsCompleter {
-    private def readTypeParams()(using Context): List[TypeSymbol] = {
+    private var myTypeParams: List[TypeSymbol] = null
+
+    private def readTypeParams()(using Context): Unit = {
       val tag = readByte()
       val end = readNat() + readIndex
-      if (tag == POLYtpe) {
-        val unusedRestpeRef = readNat()
-        until(end, () => readSymbolRef()(using ctx)).asInstanceOf[List[TypeSymbol]]
-      }
-      else Nil
+      myTypeParams =
+        if (tag == POLYtpe) {
+          val unusedRestpeRef = readNat()
+          until(end, () => readSymbolRef()(using ctx)).asInstanceOf[List[TypeSymbol]]
+        } else Nil
     }
-    private def loadTypeParams(using Context) =
+    private def loadTypeParams()(using Context) =
       atReadPos(index(infoRef), () => readTypeParams()(using ctx))
 
+    /** Have the type params of this class already been unpickled? */
+    def isInitialized: Boolean = myTypeParams ne null
+
     /** Force reading type params early, we need them in setClassInfo of subclasses. */
-    def init()(using Context): List[TypeSymbol] = loadTypeParams
+    def init()(using Context): List[TypeSymbol] =
+      if !isInitialized then loadTypeParams()
+      myTypeParams
 
     override def completerTypeParams(sym: Symbol)(using Context): List[TypeSymbol] =
-      loadTypeParams
+      init()
   }
 
   def rootClassUnpickler(start: Coord, cls: Symbol, module: Symbol, infoRef: Int): ClassUnpickler =
@@ -669,7 +700,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
     }
     // Cannot use standard `existsPart` method because it calls `lookupRefined`
     // which can cause CyclicReference errors.
-    val isBoundAccumulator = new ExistsAccumulator(isBound, stopAtStatic = true, forceLazy = true):
+    val isBoundAccumulator = new ExistsAccumulator(isBound, StopAt.Static, forceLazy = true):
       override def foldOver(x: Boolean, tp: Type): Boolean = tp match
         case tp: TypeRef => applyToPrefix(x, tp)
         case _ => super.foldOver(x, tp)
@@ -708,7 +739,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
       val anyTypes = boundSyms map (_ => defn.AnyType)
       val boundBounds = boundSyms map (_.info.bounds.hi)
       val tp2 = tp1.subst(boundSyms, boundBounds).subst(boundSyms, anyTypes)
-      report.warning(FailureToEliminateExistential(tp, tp1, tp2, boundSyms))
+      report.warning(FailureToEliminateExistential(tp, tp1, tp2, boundSyms, classRoot.symbol))
       tp2
     }
     else tp1
@@ -816,6 +847,12 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
         val maker = MethodType.companion(
           isImplicit = tag == IMPLICITMETHODtpe || params.nonEmpty && params.head.is(Implicit))
         val result = maker.fromSymbols(params, restpe)
+        result.resType match
+          case restpe1: MethodType if restpe1 ne restpe =>
+            val prevResParams = paramsOfMethodType.remove(restpe)
+            if prevResParams != null then
+              paramsOfMethodType.put(restpe1, prevResParams)
+          case _ =>
         if params.nonEmpty then paramsOfMethodType.put(result, params)
         result
       case POLYtpe =>
@@ -922,33 +959,33 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
   /** Read an annotation argument, which is pickled either
    *  as a Constant or a Tree.
    */
-  protected def readAnnotArg(i: Int)(using Context): Tree = bytes(index(i)) match {
+  protected def readAnnotArg(i: Int)(using Context): untpd.Tree = untpd.TypedSplice(bytes(index(i)) match
     case TREE => at(i, () => readTree())
     case _ => at(i, () =>
       readConstant() match
         case c: Constant => Literal(c)
         case tp: TermRef => ref(tp)
     )
-  }
+  )
 
   /** Read a ClassfileAnnotArg (argument to a classfile annotation)
    */
-  private def readArrayAnnotArg()(using Context): Tree = {
+  private def readArrayAnnotArg()(using Context): untpd.Tree = {
     readByte() // skip the `annotargarray` tag
     val end = readNat() + readIndex
     // array elements are trees representing instances of scala.annotation.Annotation
-    SeqLiteral(
+    untpd.JavaSeqLiteral(
       until(end, () => readClassfileAnnotArg(readNat())),
-      TypeTree(defn.AnnotationClass.typeRef))
+      untpd.TypeTree())
   }
 
-  private def readAnnotInfoArg()(using Context): Tree = {
+  private def readAnnotInfoArg()(using Context): untpd.Tree = untpd.TypedSplice {
     readByte() // skip the `annotinfo` tag
     val end = readNat() + readIndex
     readAnnotationContents(end)
   }
 
-  protected def readClassfileAnnotArg(i: Int)(using Context): Tree = bytes(index(i)) match {
+  protected def readClassfileAnnotArg(i: Int)(using Context): untpd.Tree = bytes(index(i)) match {
     case ANNOTINFO => at(i, () => readAnnotInfoArg())
     case ANNOTARGARRAY => at(i, () => readArrayAnnotArg())
     case _ => readAnnotArg(i)
@@ -960,7 +997,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
   protected def readAnnotationContents(end: Int)(using Context): Tree = {
     val atp = readTypeRef()
     val args = {
-      val t = new ListBuffer[Tree]
+      val t = new ListBuffer[untpd.Tree]
 
       while (readIndex != end) {
         val argref = readNat()
@@ -968,14 +1005,14 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
           if (isNameEntry(argref)) {
             val name = at(argref, () => readName())
             val arg = readClassfileAnnotArg(readNat())
-            NamedArg(name.asTermName, arg)
+            untpd.NamedArg(name.asTermName, arg)
           }
           else readAnnotArg(argref)
         }
       }
       t.toList
     }
-    resolveConstructor(atp, args)
+    untpd.resolveConstructor(atp, args)
   }
 
   /** Read an annotation and as a side effect store it into
@@ -1007,9 +1044,9 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
    */
   protected def deferredAnnot(end: Int)(using Context): Annotation = {
     val start = readIndex
-    val atp = readTypeRef()
     val phase = ctx.phase
-    Annotation.deferred(atp.typeSymbol)(
+    Annotation.deferredSymAndTree(
+        atReadPos(start, () => atPhase(phase)(readTypeRef().typeSymbol)))(
         atReadPos(start, () => atPhase(phase)(readAnnotationContents(end))))
   }
 
@@ -1333,4 +1370,4 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
       case other =>
         errorBadSignature("expected an TypeDef (" + other + ")")
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala b/compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala
index 978ebb4416e3..55e6e54787a2 100644
--- a/compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala
+++ b/compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala
@@ -40,12 +40,8 @@ class DecompilationPrinter extends Phase {
 
   private def printToOutput(out: PrintStream)(using Context): Unit = {
     val unit = ctx.compilationUnit
-    if (ctx.settings.printTasty.value)
-      println(TastyPrinter.show(unit.pickled.head._2()))
-    else {
-      val unitFile = unit.source.toString.replace("\\", "/").replace(".class", ".tasty")
-      out.println(s"/** Decompiled from $unitFile */")
-      out.println(QuotesImpl.showDecompiledTree(unit.tpdTree))
-    }
+    val unitFile = unit.source.toString.replace("\\", "/").replace(".class", ".tasty")
+    out.println(s"/** Decompiled from $unitFile */")
+    out.println(QuotesImpl.showDecompiledTree(unit.tpdTree))
   }
 }
diff --git a/compiler/src/dotty/tools/dotc/decompiler/IDEDecompilerDriver.scala b/compiler/src/dotty/tools/dotc/decompiler/IDEDecompilerDriver.scala
index 3e8e0f5fb86d..2e3c67150d11 100644
--- a/compiler/src/dotty/tools/dotc/decompiler/IDEDecompilerDriver.scala
+++ b/compiler/src/dotty/tools/dotc/decompiler/IDEDecompilerDriver.scala
@@ -16,7 +16,8 @@ import scala.quoted.runtime.impl.QuotesImpl
 class IDEDecompilerDriver(val settings: List[String]) extends dotc.Driver {
 
   private val myInitCtx: Context = {
-    val rootCtx = initCtx.fresh.addMode(Mode.Interactive | Mode.ReadPositions | Mode.ReadComments)
+    val rootCtx = initCtx.fresh.addMode(Mode.Interactive | Mode.ReadPositions)
+    rootCtx.setSetting(rootCtx.settings.YreadComments, true)
     rootCtx.setSetting(rootCtx.settings.YretainTrees, true)
     rootCtx.setSetting(rootCtx.settings.fromTasty, true)
     val ctx = setup(settings.toArray :+ "dummy.scala", rootCtx).get._2
diff --git a/compiler/src/dotty/tools/dotc/fromtasty/TASTYRun.scala b/compiler/src/dotty/tools/dotc/fromtasty/TASTYRun.scala
index 2d2d41ae50ed..1c8ba2359623 100644
--- a/compiler/src/dotty/tools/dotc/fromtasty/TASTYRun.scala
+++ b/compiler/src/dotty/tools/dotc/fromtasty/TASTYRun.scala
@@ -4,6 +4,7 @@ package fromtasty
 
 import io.{JarArchive, AbstractFile, Path}
 import core.Contexts._
+import java.io.File
 
 class TASTYRun(comp: Compiler, ictx: Context) extends Run(comp, ictx) {
   override def compile(files: List[AbstractFile]): Unit = {
@@ -17,9 +18,10 @@ class TASTYRun(comp: Compiler, ictx: Context) extends Run(comp, ictx) {
     val classNames = files.flatMap { file =>
       file.extension match
         case "jar" =>
-          JarArchive.open(Path(file.path), create = false).iterator()
-            .filter(e => e.extension == "tasty" && !fromTastyIgnoreList(e.name))
-            .map(e => e.name.stripSuffix(".tasty").replace("/", "."))
+          JarArchive.open(Path(file.path), create = false).allFileNames()
+            .map(_.stripPrefix(File.separator)) // change paths from absolute to relative
+            .filter(e => Path.extension(e) == "tasty" && !fromTastyIgnoreList(e))
+            .map(e => e.stripSuffix(".tasty").replace(File.separator, "."))
             .toList
         case "tasty" => TastyFileUtil.getClassName(file)
         case _ =>
diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
index bb552191fc36..1f26b50b6cce 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
@@ -24,6 +24,7 @@ import dotty.tools.dotc.printing.Texts._
 import dotty.tools.dotc.util.{NameTransformer, NoSourcePosition, SourcePosition}
 
 import scala.collection.mutable
+import scala.util.control.NonFatal
 
 /**
  * One of the results of a completion query.
@@ -61,6 +62,8 @@ object Completion {
    */
   def completionMode(path: List[Tree], pos: SourcePosition): Mode =
     path match {
+      case Ident(_) :: Import(_, _) :: _ =>
+        Mode.Import
       case (ref: RefTree) :: _ =>
         if (ref.name.isTermName) Mode.Term
         else if (ref.name.isTypeName) Mode.Type
@@ -112,10 +115,14 @@ object Completion {
     val completer = new Completer(mode, prefix, pos)
 
     val completions = path match {
-        case Select(qual, _) :: _                              => completer.selectionCompletions(qual)
-        case Import(expr, _) :: _                              => completer.directMemberCompletions(expr)
-        case (_: untpd.ImportSelector) :: Import(expr, _) :: _ => completer.directMemberCompletions(expr)
-        case _                                                 => completer.scopeCompletions
+        // Ignore synthetic select from `This` because in code it was `Ident`
+        // See example in dotty.tools.languageserver.CompletionTest.syntheticThis
+        case Select(qual @ This(_), _) :: _ if qual.span.isSynthetic  => completer.scopeCompletions
+        case Select(qual, _) :: _           if qual.tpe.hasSimpleKind => completer.selectionCompletions(qual)
+        case Select(qual, _) :: _                                     => Map.empty
+        case Import(expr, _) :: _                                     => completer.directMemberCompletions(expr)
+        case (_: untpd.ImportSelector) :: Import(expr, _) :: _        => completer.directMemberCompletions(expr)
+        case _                                                        => completer.scopeCompletions
       }
 
     val describedCompletions = describeCompletions(completions)
@@ -197,14 +204,45 @@ object Completion {
 
       mappings.foreach { (name, denotss) =>
         val first = denotss.head
+
+        // import a.c
+        def isSingleImport =  denotss.length < 2
+        // import a.C
+        // locally {  import b.C }
+        def isImportedInDifferentScope =  first.ctx.scope ne denotss(1).ctx.scope
+        // import a.C
+        // import a.C
+        def isSameSymbolImportedDouble =  denotss.forall(_.denots == first.denots)
+
+        def isScalaPackage(scopedDenots: ScopedDenotations) =
+          scopedDenots.denots.exists(_.info.typeSymbol.owner == defn.ScalaPackageClass)
+
+        def isJavaLangPackage(scopedDenots: ScopedDenotations) =
+          scopedDenots.denots.exists(_.info.typeSymbol.owner == defn.JavaLangPackageClass)
+
+        // For example
+        // import java.lang.annotation
+        //    is shadowed by
+        // import scala.annotation
+        def isJavaLangAndScala =
+          try
+            denotss.forall(denots => isScalaPackage(denots) || isJavaLangPackage(denots))
+          catch
+            case NonFatal(_) => false
+
         denotss.find(!_.ctx.isImportContext) match {
           // most deeply nested member or local definition if not shadowed by an import
           case Some(local) if local.ctx.scope == first.ctx.scope =>
             resultMappings += name -> local.denots
 
-          // most deeply nested import if not shadowed by another import
-          case None if denotss.length < 2 || (denotss(1).ctx.scope ne first.ctx.scope) =>
+          case None if isSingleImport || isImportedInDifferentScope || isSameSymbolImportedDouble =>
             resultMappings += name -> first.denots
+          case None if isJavaLangAndScala =>
+            denotss.foreach{
+              denots =>
+                if isScalaPackage(denots) then
+                  resultMappings += name -> denots.denots
+            }
 
           case _ =>
         }
@@ -300,7 +338,8 @@ object Completion {
               case name: TermName if include(denot, name) => Some((denot, name))
               case _ => None
 
-        types.flatMap { tpe =>
+        types.flatMap { tp =>
+          val tpe = tp.widenExpr
           tpe.membersBasedOnFlags(required = ExtensionMethod, excluded = EmptyFlags)
             .collect { case DenotWithMatchingName(denot, name) => TermRef(tpe, denot.symbol) -> name }
         }
@@ -322,7 +361,7 @@ object Completion {
       val extMethodsFromImplicitScope = extractMemberExtensionMethods(implicitScopeCompanions)
 
       // 4. The reference is of the form r.m and the extension method is defined in some given instance in the implicit scope of the type of r.
-      val givensInImplicitScope = implicitScopeCompanions.flatMap(_.membersBasedOnFlags(required = Given, excluded = EmptyFlags)).map(_.info)
+      val givensInImplicitScope = implicitScopeCompanions.flatMap(_.membersBasedOnFlags(required = GivenVal, excluded = EmptyFlags)).map(_.info)
       val extMethodsFromGivensInImplicitScope = extractMemberExtensionMethods(givensInImplicitScope)
 
       val availableExtMethods = extMethodsFromGivensInImplicitScope ++ extMethodsFromImplicitScope ++ extMethodsFromGivensInScope ++ extMethodsInScope
diff --git a/compiler/src/dotty/tools/dotc/interactive/Interactive.scala b/compiler/src/dotty/tools/dotc/interactive/Interactive.scala
index aa2359f33eb2..cb41650c0b57 100644
--- a/compiler/src/dotty/tools/dotc/interactive/Interactive.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/Interactive.scala
@@ -252,14 +252,14 @@ object Interactive {
    *  the tree closest enclosing `pos` and ends with an element of `trees`.
    */
   def pathTo(trees: List[SourceTree], pos: SourcePosition)(using Context): List[Tree] =
-    trees.find(_.pos.contains(pos)) match {
-      case Some(tree) => pathTo(tree.tree, pos.span)
-      case None => Nil
-    }
+    pathTo(trees.map(_.tree), pos.span)
 
   def pathTo(tree: Tree, span: Span)(using Context): List[Tree] =
-    if (tree.span.contains(span))
-      NavigateAST.pathTo(span, tree, skipZeroExtent = true)
+    pathTo(List(tree), span)
+
+  private def pathTo(trees: List[Tree], span: Span)(using Context): List[Tree] =
+    if (trees.exists(_.span.contains(span)))
+      NavigateAST.pathTo(span, trees, skipZeroExtent = true)
         .collect { case t: untpd.Tree => t }
         .dropWhile(!_.hasType).asInstanceOf[List[tpd.Tree]]
     else Nil
@@ -293,8 +293,10 @@ object Interactive {
             // in subsequent parameter sections
           localCtx
         case tree: MemberDef =>
-          assert(tree.symbol.exists)
-          outer.localContext(tree, tree.symbol)
+          if (tree.symbol.exists)
+            outer.localContext(tree, tree.symbol)
+          else
+            outer
         case tree @ Block(stats, expr) =>
           val localCtx = outer.fresh.setNewScope
           stats.foreach {
@@ -310,7 +312,7 @@ object Interactive {
           }
           localCtx
         case tree @ Template(constr, parents, self, _) =>
-          if ((constr :: self :: parents).contains(nested)) ctx
+          if ((constr :: self :: parents).contains(nested)) outer
           else contextOfStat(tree.body, nested, tree.symbol, outer.inClassContext(self.symbol))
         case _ =>
           outer
diff --git a/compiler/src/dotty/tools/dotc/interactive/InteractiveCompiler.scala b/compiler/src/dotty/tools/dotc/interactive/InteractiveCompiler.scala
index b3ef40dec8a3..38a93125a342 100644
--- a/compiler/src/dotty/tools/dotc/interactive/InteractiveCompiler.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/InteractiveCompiler.scala
@@ -4,6 +4,7 @@ package interactive
 
 import core._
 import Phases._
+import parsing._
 import typer._
 
 class InteractiveCompiler extends Compiler {
@@ -12,7 +13,8 @@ class InteractiveCompiler extends Compiler {
   // This could be improved by reporting errors back to the IDE
   // after each phase group instead of waiting for the pipeline to finish.
   override def phases: List[List[Phase]] = List(
-    List(new FrontEnd),
+    List(new Parser),
+    List(new TyperPhase),
     List(new transform.SetRootTree),
     List(new transform.CookComments)
   )
diff --git a/compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala b/compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala
index aa45b2080ee9..c0584c51b842 100644
--- a/compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala
+++ b/compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala
@@ -29,9 +29,10 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
   override def sourcesRequired: Boolean = false
 
   private val myInitCtx: Context = {
-    val rootCtx = initCtx.fresh.addMode(Mode.ReadPositions).addMode(Mode.Interactive).addMode(Mode.ReadComments)
+    val rootCtx = initCtx.fresh.addMode(Mode.ReadPositions).addMode(Mode.Interactive)
     rootCtx.setSetting(rootCtx.settings.YretainTrees, true)
     rootCtx.setSetting(rootCtx.settings.YcookComments, true)
+    rootCtx.setSetting(rootCtx.settings.YreadComments, true)
     val ctx = setup(settings.toArray, rootCtx) match
       case Some((_, ctx)) => ctx
       case None => rootCtx
@@ -166,6 +167,7 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
       cleanup(t)
       myOpenedTrees(uri) = topLevelTrees(t, source)
       myCompilationUnits(uri) = unit
+      myCtx = myCtx.fresh.setPhase(myInitCtx.base.typerPhase)
 
       reporter.removeBufferedMessages
     }
diff --git a/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala b/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala
index 44236c168b66..e5b0b24bdd2f 100644
--- a/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala
@@ -359,19 +359,6 @@ object JavaParsers {
       * but instead we skip entire annotation silently.
       */
     def annotation(): Option[Tree] = {
-      object LiteralT:
-        def unapply(token: Token) = Option(token match {
-          case TRUE      => true
-          case FALSE     => false
-          case CHARLIT   => in.name(0)
-          case INTLIT    => in.intVal(false).toInt
-          case LONGLIT   => in.intVal(false)
-          case FLOATLIT  => in.floatVal(false).toFloat
-          case DOUBLELIT => in.floatVal(false)
-          case STRINGLIT => in.name.toString
-          case _         => null
-        }).map(Constant(_))
-
       def classOrId(): Tree =
         val id = qualId()
         if in.lookaheadToken == CLASS then
@@ -398,17 +385,17 @@ object JavaParsers {
         }
 
       def argValue(): Option[Tree] =
-        val tree = in.token match {
-          case LiteralT(c) =>
-            val tree = atSpan(in.offset)(Literal(c))
-            in.nextToken()
-            Some(tree)
-          case AT =>
-            in.nextToken()
-            annotation()
-          case IDENTIFIER => Some(classOrId())
-          case LBRACE => array()
-          case _ => None
+        val tree = tryConstant match {
+          case Some(c) =>
+            Some(atSpan(in.offset)(Literal(c)))
+          case _ => in.token match {
+            case AT =>
+              in.nextToken()
+              annotation()
+            case IDENTIFIER => Some(classOrId())
+            case LBRACE => array()
+            case _ => None
+          }
         }
         if in.token == COMMA || in.token == RBRACE || in.token == RPAREN then
           tree
@@ -716,11 +703,7 @@ object JavaParsers {
 
         in.nextToken() // EQUALS
         if (mods.is(Flags.JavaStatic) && mods.is(Flags.Final)) {
-          val neg = in.token match {
-            case MINUS | BANG => in.nextToken(); true
-            case _ => false
-          }
-          tryLiteral(neg).map(forConst).getOrElse(tpt1)
+          tryConstant.map(forConst).getOrElse(tpt1)
         }
         else tpt1
       }
@@ -751,35 +734,8 @@ object JavaParsers {
           makeTemplate(List(), statics, List(), false)).withMods((cdef.mods & Flags.RetainedModuleClassFlags).toTermFlags)
       }
 
-    def importCompanionObject(cdef: TypeDef): Tree =
-      Import(
-        Ident(cdef.name.toTermName).withSpan(NoSpan),
-        ImportSelector(Ident(nme.WILDCARD)) :: Nil)
-
-    // Importing the companion object members cannot be done uncritically: see
-    // ticket #2377 wherein a class contains two static inner classes, each of which
-    // has a static inner class called "Builder" - this results in an ambiguity error
-    // when each performs the import in the enclosing class's scope.
-    //
-    // To address this I moved the import Companion._ inside the class, as the first
-    // statement.  This should work without compromising the enclosing scope, but may (?)
-    // end up suffering from the same issues it does in scala - specifically that this
-    // leaves auxiliary constructors unable to access members of the companion object
-    // as unqualified identifiers.
-    def addCompanionObject(statics: List[Tree], cdef: TypeDef): List[Tree] = {
-      // if there are no statics we can use the original cdef, but we always
-      // create the companion so import A._ is not an error (see ticket #1700)
-      val cdefNew =
-        if (statics.isEmpty) cdef
-        else {
-          val template = cdef.rhs.asInstanceOf[Template]
-          cpy.TypeDef(cdef)(cdef.name,
-            cpy.Template(template)(body = importCompanionObject(cdef) :: template.body))
-              .withMods(cdef.mods)
-        }
-
-      List(makeCompanionObject(cdefNew, statics), cdefNew)
-    }
+    def addCompanionObject(statics: List[Tree], cdef: TypeDef): List[Tree] =
+      List(makeCompanionObject(cdef, statics), cdef)
 
     def importDecl(): List[Tree] = {
       val start = in.offset
@@ -901,16 +857,7 @@ object JavaParsers {
             members) ++= decls
         }
       }
-      def forwarders(sdef: Tree): List[Tree] = sdef match {
-        case TypeDef(name, _) if (parentToken == INTERFACE) =>
-          var rhs: Tree = Select(Ident(parentName.toTermName), name)
-          List(TypeDef(name, rhs).withMods(Modifiers(Flags.Protected)))
-        case _ =>
-          List()
-      }
-      val sdefs = statics.toList
-      val idefs = members.toList ::: (sdefs flatMap forwarders)
-      (sdefs, idefs)
+      (statics.toList, members.toList)
     }
     def annotationParents: List[Select] = List(
       scalaAnnotationDot(tpnme.Annotation),
@@ -1012,7 +959,11 @@ object JavaParsers {
       case _         => in.nextToken(); syntaxError("illegal start of type declaration", skipIt = true); List(errorTypeTree)
     }
 
-    def tryLiteral(negate: Boolean = false): Option[Constant] = {
+    def tryConstant: Option[Constant] = {
+      val negate = in.token match {
+        case MINUS | BANG => in.nextToken(); true
+        case _ => false
+      }
       val l = in.token match {
         case TRUE      => !negate
         case FALSE     => negate
@@ -1062,7 +1013,9 @@ object JavaParsers {
       }
       val unit = atSpan(start) { PackageDef(pkg, buf.toList) }
       accept(EOF)
-      unit
+      unit match
+        case PackageDef(Ident(nme.EMPTY_PACKAGE), Nil) => EmptyTree
+        case _ => unit
     }
   }
 
diff --git a/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala b/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala
index 79dd549cdf0d..3e73b6d95adb 100644
--- a/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala
@@ -5,88 +5,88 @@ package parsing
 import collection.immutable.BitSet
 
 object JavaTokens extends TokensCommon {
-  final val minToken = EMPTY
+  inline val minToken = EMPTY
   final def maxToken: Int = DOUBLE
 
   final val javaOnlyKeywords: TokenSet = tokenRange(INSTANCEOF, ASSERT)
   final val sharedKeywords: BitSet = BitSet( IF, FOR, ELSE, THIS, NULL, NEW, SUPER, ABSTRACT, FINAL, PRIVATE, PROTECTED,
-    OVERRIDE, EXTENDS, TRUE, FALSE, CLASS, IMPORT, PACKAGE, DO, THROW, TRY, CATCH, FINALLY, WHILE, RETURN )
+    EXTENDS, TRUE, FALSE, CLASS, IMPORT, PACKAGE, DO, THROW, TRY, CATCH, FINALLY, WHILE, RETURN )
   final val primTypes: TokenSet = tokenRange(VOID, DOUBLE)
   final val keywords: BitSet = sharedKeywords | javaOnlyKeywords | primTypes
 
   /** keywords */
-  final val INSTANCEOF = 101;       enter(INSTANCEOF, "instanceof")
-  final val CONST = 102;            enter(CONST, "const")
+  inline val INSTANCEOF = 101;       enter(INSTANCEOF, "instanceof")
+  inline val CONST = 102;            enter(CONST, "const")
 
   /** templates */
-  final val INTERFACE = 105;        enter(INTERFACE, "interface")
-  final val ENUM = 106;             enter(ENUM, "enum")
-  final val IMPLEMENTS = 107;       enter(IMPLEMENTS, "implements")
+  inline val INTERFACE = 105;        enter(INTERFACE, "interface")
+  inline val ENUM = 106;             enter(ENUM, "enum")
+  inline val IMPLEMENTS = 107;       enter(IMPLEMENTS, "implements")
 
   /** modifiers */
-  final val PUBLIC = 110;           enter(PUBLIC, "public")
-  final val DEFAULT = 111;          enter(DEFAULT, "default")
-  final val STATIC = 112;           enter(STATIC, "static")
-  final val TRANSIENT = 113;        enter(TRANSIENT, "transient")
-  final val VOLATILE = 114;         enter(VOLATILE, "volatile")
-  final val SYNCHRONIZED = 115;     enter(SYNCHRONIZED, "synchronized")
-  final val NATIVE = 116;           enter(NATIVE, "native")
-  final val STRICTFP = 117;         enter(STRICTFP, "strictfp")
-  final val THROWS = 118;           enter(THROWS, "throws")
+  inline val PUBLIC = 110;           enter(PUBLIC, "public")
+  inline val DEFAULT = 111;          enter(DEFAULT, "default")
+  inline val STATIC = 112;           enter(STATIC, "static")
+  inline val TRANSIENT = 113;        enter(TRANSIENT, "transient")
+  inline val VOLATILE = 114;         enter(VOLATILE, "volatile")
+  inline val SYNCHRONIZED = 115;     enter(SYNCHRONIZED, "synchronized")
+  inline val NATIVE = 116;           enter(NATIVE, "native")
+  inline val STRICTFP = 117;         enter(STRICTFP, "strictfp")
+  inline val THROWS = 118;           enter(THROWS, "throws")
 
   /** control structures */
-  final val BREAK = 130;            enter(BREAK, "break")
-  final val CONTINUE = 131;         enter(CONTINUE, "continue")
-  final val GOTO = 132;             enter(GOTO, "goto")
-  final val SWITCH = 133;           enter(SWITCH, "switch")
-  final val ASSERT = 134;           enter(ASSERT, "assert")
+  inline val BREAK = 130;            enter(BREAK, "break")
+  inline val CONTINUE = 131;         enter(CONTINUE, "continue")
+  inline val GOTO = 132;             enter(GOTO, "goto")
+  inline val SWITCH = 133;           enter(SWITCH, "switch")
+  inline val ASSERT = 134;           enter(ASSERT, "assert")
 
   /** special symbols */
-  final val EQEQ = 140
-  final val BANGEQ = 141
-  final val LT = 142
-  final val GT = 143
-  final val LTEQ = 144
-  final val GTEQ = 145
-  final val BANG = 146
-  final val QMARK = 147
-  final val AMP = 148
-  final val BAR = 149
-  final val PLUS = 150
-  final val MINUS = 151
-  final val ASTERISK = 152
-  final val SLASH = 153
-  final val PERCENT = 154
-  final val HAT = 155
-  final val LTLT = 156
-  final val GTGT = 157
-  final val GTGTGT = 158
-  final val AMPAMP = 159
-  final val BARBAR = 160
-  final val PLUSPLUS = 161
-  final val MINUSMINUS = 162
-  final val TILDE = 163
-  final val DOTDOTDOT = 164
-  final val AMPEQ = 165
-  final val BAREQ = 166
-  final val PLUSEQ = 167
-  final val MINUSEQ = 168
-  final val ASTERISKEQ = 169
-  final val SLASHEQ = 170
-  final val PERCENTEQ = 171
-  final val HATEQ = 172
-  final val LTLTEQ = 173
-  final val GTGTEQ = 174
-  final val GTGTGTEQ = 175
+  inline val EQEQ = 140
+  inline val BANGEQ = 141
+  inline val LT = 142
+  inline val GT = 143
+  inline val LTEQ = 144
+  inline val GTEQ = 145
+  inline val BANG = 146
+  inline val QMARK = 147
+  inline val AMP = 148
+  inline val BAR = 149
+  inline val PLUS = 150
+  inline val MINUS = 151
+  inline val ASTERISK = 152
+  inline val SLASH = 153
+  inline val PERCENT = 154
+  inline val HAT = 155
+  inline val LTLT = 156
+  inline val GTGT = 157
+  inline val GTGTGT = 158
+  inline val AMPAMP = 159
+  inline val BARBAR = 160
+  inline val PLUSPLUS = 161
+  inline val MINUSMINUS = 162
+  inline val TILDE = 163
+  inline val DOTDOTDOT = 164
+  inline val AMPEQ = 165
+  inline val BAREQ = 166
+  inline val PLUSEQ = 167
+  inline val MINUSEQ = 168
+  inline val ASTERISKEQ = 169
+  inline val SLASHEQ = 170
+  inline val PERCENTEQ = 171
+  inline val HATEQ = 172
+  inline val LTLTEQ = 173
+  inline val GTGTEQ = 174
+  inline val GTGTGTEQ = 175
 
   /** primitive types */
-  final val VOID = 180;             enter(VOID, "void")
-  final val BOOLEAN = 181;          enter(BOOLEAN, "boolean")
-  final val BYTE = 182;             enter(BYTE, "byte")
-  final val SHORT = 183;            enter(SHORT, "short")
-  final val CHAR = 184;             enter(CHAR, "char")
-  final val INT = 185;              enter(INT, "int")
-  final val LONG = 186;             enter(LONG, "long")
-  final val FLOAT = 187;            enter(FLOAT, "float")
-  final val DOUBLE = 188;           enter(DOUBLE, "double")
+  inline val VOID = 180;             enter(VOID, "void")
+  inline val BOOLEAN = 181;          enter(BOOLEAN, "boolean")
+  inline val BYTE = 182;             enter(BYTE, "byte")
+  inline val SHORT = 183;            enter(SHORT, "short")
+  inline val CHAR = 184;             enter(CHAR, "char")
+  inline val INT = 185;              enter(INT, "int")
+  inline val LONG = 186;             enter(LONG, "long")
+  inline val FLOAT = 187;            enter(FLOAT, "float")
+  inline val DOUBLE = 188;           enter(DOUBLE, "double")
 }
diff --git a/compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala b/compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala
new file mode 100644
index 000000000000..d5918b5179ca
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala
@@ -0,0 +1,63 @@
+package dotty.tools.dotc.parsing
+
+import dotty.tools.dotc.ast.Trees
+import dotty.tools.dotc.config.Config
+import dotty.tools.dotc.config.Printers.{ default, typr }
+import dotty.tools.dotc.core.Contexts.{ Context, ctx }
+import dotty.tools.dotc.core.Phases.Phase
+import dotty.tools.dotc.core.Symbols.defn
+import dotty.tools.dotc.typer.ImportInfo.withRootImports
+import dotty.tools.dotc.{ CompilationUnit, ast, report }
+import dotty.tools.dotc.util.{ NoSourcePosition, SourcePosition }
+import dotty.tools.dotc.util.Stats.record
+import dotty.tools.unsupported
+
+class Parser extends Phase {
+
+  override def phaseName: String = Parser.name
+  override def description: String = Parser.description
+
+  // We run TreeChecker only after type checking
+  override def isCheckable: Boolean = false
+
+  /** The position of the first XML literal encountered while parsing,
+   *  NoSourcePosition if there were no XML literals.
+   */
+  private[dotc] var firstXmlPos: SourcePosition = NoSourcePosition
+
+  def parse(using Context) = monitor("parser") {
+    val unit = ctx.compilationUnit
+    unit.untpdTree =
+      if (unit.isJava) new JavaParsers.JavaParser(unit.source).parse()
+      else {
+        val p = new Parsers.Parser(unit.source)
+        //  p.in.debugTokenStream = true
+        val tree = p.parse()
+        if (p.firstXmlPos.exists && !firstXmlPos.exists)
+          firstXmlPos = p.firstXmlPos
+        tree
+      }
+    if (Config.checkPositions)
+      unit.untpdTree.checkPos(nonOverlapping = !unit.isJava && !ctx.reporter.hasErrors)
+  }
+
+
+  override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] = {
+    val unitContexts =
+      for unit <- units yield
+        report.inform(s"parsing ${unit.source}")
+        ctx.fresh.setCompilationUnit(unit).withRootImports
+
+    unitContexts.foreach(parse(using _))
+    record("parsedTrees", ast.Trees.ntrees)
+
+    unitContexts.map(_.compilationUnit)
+  }
+
+  def run(using Context): Unit = unsupported("run")
+}
+
+object Parser{
+  val name: String = "parser"
+  val description: String = "scan and parse sources"
+}
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index f5db937f8684..366ed459a6a0 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -56,7 +56,8 @@ object Parsers {
   object StageKind {
     val None = 0
     val Quoted = 1
-    val Spliced = 2
+    val Spliced = 1 << 1
+    val QuotedPattern = 1 << 2
   }
 
   extension (buf: ListBuffer[Tree])
@@ -72,8 +73,9 @@ object Parsers {
     if source.isSelfContained then new ScriptParser(source)
     else new Parser(source)
 
-  private val InCase: Region => Region = Scanners.InCase.apply
-  private val InCond: Region => Region = Scanners.InBraces.apply
+  private val InCase: Region => Region = Scanners.InCase(_)
+  private val InCond: Region => Region = Scanners.InParens(LPAREN, _)
+  private val InFor : Region => Region = Scanners.InBraces(_)
 
   abstract class ParserCommon(val source: SourceFile)(using Context) {
 
@@ -132,11 +134,11 @@ object Parsers {
      *  and update lastErrorOffset.
      */
     def syntaxError(msg: Message, offset: Int = in.offset): Unit =
-      if (offset > lastErrorOffset) {
-        val length = if (offset == in.offset && in.name != null) in.name.show.length else 0
+      if offset > lastErrorOffset then
+        val length = if offset == in.offset && in.name != null then in.name.show.length else 0
         syntaxError(msg, Span(offset, offset + length))
         lastErrorOffset = in.offset
-      }
+      end if
 
     /** Unconditionally issue an error at given span, without
      *  updating lastErrorOffset.
@@ -167,6 +169,7 @@ object Parsers {
   class Parser(source: SourceFile)(using Context) extends ParserCommon(source) {
 
     val in: Scanner = new Scanner(source)
+    //in.debugTokenStream = true    // uncomment to see the token stream of the standard scanner, but not syntax highlighting
 
     /** This is the general parse entry point.
      *  Overridden by ScriptParser
@@ -233,15 +236,6 @@ object Parsers {
 
 /* ------------- ERROR HANDLING ------------------------------------------- */
 
-    /** The offset of the last time when a statement on a new line was definitely
-     *  encountered in the current scope or an outer scope.
-     */
-    private var lastStatOffset = -1
-
-    def setLastStatOffset(): Unit =
-      if (mustStartStat && in.isAfterLineEnd)
-        lastStatOffset = in.offset
-
     /** Is offset1 less or equally indented than offset2?
      *  This is the case if the characters between the preceding end-of-line and offset1
      *  are a prefix of the characters between the preceding end-of-line and offset2.
@@ -255,13 +249,14 @@ object Parsers {
 
     /** Skip on error to next safe point.
      */
-    protected def skip(): Unit =
+    protected def skip(stopAtComma: Boolean): Unit =
       val lastRegion = in.currentRegion
       def atStop =
         in.token == EOF
-        || skipStopTokens.contains(in.token) && (in.currentRegion eq lastRegion)
+        || ((stopAtComma && in.token == COMMA) || skipStopTokens.contains(in.token)) && (in.currentRegion eq lastRegion)
       while !atStop do
         in.nextToken()
+      lastErrorOffset = in.offset
 
     def warning(msg: Message, sourcePos: SourcePosition): Unit =
       report.warning(msg, sourcePos)
@@ -281,11 +276,9 @@ object Parsers {
      */
     def syntaxErrorOrIncomplete(msg: Message, offset: Int = in.offset): Unit =
       if (in.token == EOF) incompleteInputError(msg)
-      else {
+      else
         syntaxError(msg, offset)
-        skip()
-        lastErrorOffset = in.offset
-      }
+        skip(stopAtComma = true)
 
     /** Consume one token of the specified type, or
       * signal an error if it is not there.
@@ -320,22 +313,45 @@ object Parsers {
     def acceptStatSep(): Unit =
       if in.isNewLine then in.nextToken() else accept(SEMI)
 
-    def acceptStatSepUnlessAtEnd[T <: Tree](stats: ListBuffer[T], altEnd: Token = EOF): Unit =
-      def skipEmptyStats(): Unit =
-        while (in.token == SEMI || in.token == NEWLINE || in.token == NEWLINES) do in.nextToken()
-
-      in.observeOutdented()
-      in.token match
-        case SEMI | NEWLINE | NEWLINES =>
-          skipEmptyStats()
+    /** Parse statement separators and end markers. Ensure that there is at least
+     *  one statement separator unless the next token terminates a statement´sequence.
+     *  @param   stats      the statements parsed to far
+     *  @param   noPrevStat true if there was no immediately preceding statement parsed
+     *  @param   what       a string indicating what kind of statement is parsed
+     *  @param   altEnd     a token that is also considered as a terminator of the statement
+     *                      sequence (the default `EOF` already assumes to terminate a statement
+     *                      sequence).
+     *  @return  true if the statement sequence continues, false if it terminates.
+     */
+    def statSepOrEnd[T <: Tree](stats: ListBuffer[T], noPrevStat: Boolean = false, what: String = "statement", altEnd: Token = EOF): Boolean =
+      def recur(sepSeen: Boolean, endSeen: Boolean): Boolean =
+        if isStatSep then
+          in.nextToken()
+          recur(true, endSeen)
+        else if in.token == END then
+          if endSeen then syntaxError("duplicate end marker")
           checkEndMarker(stats)
-          skipEmptyStats()
-        case `altEnd` =>
-        case _ =>
-          if !isStatSeqEnd then
-            syntaxError(i"end of statement expected but ${showToken(in.token)} found")
+          recur(sepSeen, endSeen = true)
+        else if isStatSeqEnd || in.token == altEnd then
+          false
+        else if sepSeen || endSeen then
+          true
+        else
+          val found = in.token
+          val statFollows = mustStartStatTokens.contains(found)
+          syntaxError(
+            if noPrevStat then IllegalStartOfStatement(what, isModifier, statFollows)
+            else i"end of $what expected but ${showToken(found)} found")
+          if mustStartStatTokens.contains(found) then
+            false // it's a statement that might be legal in an outer context
+          else
             in.nextToken() // needed to ensure progress; otherwise we might cycle forever
-            accept(SEMI)
+            skip(stopAtComma=false)
+            true
+
+      in.observeOutdented()
+      recur(false, false)
+    end statSepOrEnd
 
     def rewriteNotice(version: String = "3.0", additionalOption: String = "") = {
       val optionStr = if (additionalOption.isEmpty) "" else " " ++ additionalOption
@@ -427,6 +443,9 @@ object Parsers {
     def convertToParam(tree: Tree, mods: Modifiers, expected: String = "formal parameter"): ValDef = tree match {
       case id @ Ident(name) =>
         makeParameter(name.asTermName, TypeTree(), mods, isBackquoted = isBackquoted(id)).withSpan(tree.span)
+      case Typed(_, tpt: TypeBoundsTree) =>
+        syntaxError(s"not a legal $expected", tree.span)
+        makeParameter(nme.ERROR, tree, mods)
       case Typed(id @ Ident(name), tpt) =>
         makeParameter(name.asTermName, tpt, mods, isBackquoted = isBackquoted(id)).withSpan(tree.span)
       case Typed(Splice(Ident(name)), tpt) =>
@@ -522,22 +541,17 @@ object Parsers {
     def inBrackets[T](body: => T): T = enclosed(LBRACKET, body)
 
     def inBracesOrIndented[T](body: => T, rewriteWithColon: Boolean = false): T =
-      if (in.token == INDENT) {
-        val rewriteToBraces =
-          in.rewriteNoIndent &&
-          !testChars(in.lastOffset - 3, " =>") // braces are always optional after `=>` so none should be inserted
-        if (rewriteToBraces) indentedToBraces(body)
+      if in.token == INDENT then
+        val rewriteToBraces = in.rewriteNoIndent
+          && !testChars(in.lastOffset - 3, " =>") // braces are always optional after `=>` so none should be inserted
+        if rewriteToBraces then indentedToBraces(body)
         else enclosed(INDENT, body)
-      }
       else
-        if (in.rewriteToIndent) bracesToIndented(body, rewriteWithColon)
+        if in.rewriteToIndent then bracesToIndented(body, rewriteWithColon)
         else inBraces(body)
 
-    def inDefScopeBraces[T](body: => T, rewriteWithColon: Boolean = false): T = {
-      val saved = lastStatOffset
-      try inBracesOrIndented(body, rewriteWithColon)
-      finally lastStatOffset = saved
-    }
+    def inDefScopeBraces[T](body: => T, rewriteWithColon: Boolean = false): T =
+      inBracesOrIndented(body, rewriteWithColon)
 
     /** part { `separator` part }
      */
@@ -623,26 +637,18 @@ object Parsers {
       else idx
 
     /** Parse indentation region `body` and rewrite it to be in braces instead */
-    def indentedToBraces[T](body: => T): T = {
-      val enclRegion = in.currentRegion.enclosing
-      def indentWidth = enclRegion.indentWidth
+    def indentedToBraces[T](body: => T): T =
+      val enclRegion   = in.currentRegion.enclosing          // capture on entry
+      def indentWidth  = enclRegion.indentWidth
       val followsColon = testChar(in.lastOffset - 1, ':')
-      val startOpening =
-        if (followsColon)
-          if (testChar(in.lastOffset - 2, ' ')) in.lastOffset - 2
-          else in.lastOffset - 1
-        else in.lastOffset
-      val endOpening = in.lastOffset
-
-      val t = enclosed(INDENT, body)
 
       /** Is `expr` a tree that lacks a final `else`? Put such trees in `{...}` to make
        *  sure we don't accidentally merge them with a following `else`.
        */
       def isPartialIf(expr: Tree): Boolean = expr match {
         case If(_, _, EmptyTree) => true
-        case If(_, _, e) => isPartialIf(e)
-        case _ => false
+        case If(_, _, e)         => isPartialIf(e)
+        case _                   => false
       }
 
       /** Is `expr` a (possibly curried) function that has a multi-statement block
@@ -650,41 +656,43 @@ object Parsers {
        *  a `=>` in braces.
        */
       def isBlockFunction[T](expr: T): Boolean = expr match {
-        case Function(_, body) => isBlockFunction(body)
+        case Function(_, body)  => isBlockFunction(body)
         case Block(stats, expr) => stats.nonEmpty || isBlockFunction(expr)
-        case _ => false
+        case _                  => false
       }
 
       /** Start of first line after in.lastOffset that does not have a comment
        *  at indent width greater than the indent width of the closing brace.
        */
       def closingOffset(lineStart: Offset): Offset =
-        if (in.lineOffset >= 0 && lineStart >= in.lineOffset) in.lineOffset
-        else {
-          val candidate = source.nextLine(lineStart)
+        if in.lineOffset >= 0 && lineStart >= in.lineOffset then in.lineOffset
+        else
           val commentStart = skipBlanks(lineStart)
-          if (testChar(commentStart, '/') && indentWidth < in.indentWidth(commentStart))
-            closingOffset(source.nextLine(lineStart))
-          else
-            lineStart
-        }
+          if testChar(commentStart, '/') && indentWidth < in.indentWidth(commentStart)
+          then closingOffset(source.nextLine(lineStart))
+          else lineStart
 
       def needsBraces(t: Any): Boolean = t match {
         case Match(EmptyTree, _) => true
-        case Block(stats, expr) =>
-          stats.nonEmpty || needsBraces(expr)
-        case expr: Tree =>
-          followsColon ||
-          isPartialIf(expr) && in.token == ELSE ||
-          isBlockFunction(expr)
-        case _ => true
-      }
-      if (needsBraces(t)) {
+        case Block(stats, expr)  => stats.nonEmpty || needsBraces(expr)
+        case expr: Tree          => followsColon
+                                 || isPartialIf(expr) && in.token == ELSE
+                                 || isBlockFunction(expr)
+        case _                   => true
+      }
+      // begin indentedToBraces
+      val startOpening =
+        if followsColon then
+          if testChar(in.lastOffset - 2, ' ') then in.lastOffset - 2
+          else in.lastOffset - 1
+        else in.lastOffset
+      val endOpening = in.lastOffset
+      val t = enclosed(INDENT, body)
+      if needsBraces(t) then
         patch(source, Span(startOpening, endOpening), " {")
         patch(source, Span(closingOffset(source.nextLine(in.lastOffset))), indentWidth.toPrefix ++ "}\n")
-      }
       t
-    }
+    end indentedToBraces
 
     /** The region to eliminate when replacing an opening `(` or `{` that ends a line.
      *  The `(` or `{` is at in.offset.
@@ -873,7 +881,8 @@ object Parsers {
       val next = in.lookahead.token
       next == LBRACKET || next == LPAREN
 
-    /** Is current ident a `*`, and is it followed by a `)` or `, )`? */
+    /** Is current ident a `*`, and is it followed by a `)`, `, )`, `,EOF`? The latter two are not
+        syntactically valid, but we need to include them here for error recovery. */
     def followingIsVararg(): Boolean =
       in.isIdent(nme.raw.STAR) && {
         val lookahead = in.LookaheadScanner()
@@ -882,7 +891,7 @@ object Parsers {
         || lookahead.token == COMMA
            && {
              lookahead.nextToken()
-             lookahead.token == RPAREN
+             lookahead.token == RPAREN || lookahead.token == EOF
            }
       }
 
@@ -966,6 +975,10 @@ object Parsers {
     def ident(): TermName =
       if (isIdent) {
         val name = in.name
+        if name == nme.CONSTRUCTOR || name == nme.STATIC_CONSTRUCTOR then
+          report.error(
+            i"""Illegal backquoted identifier: `<init>` and `<clinit>` are forbidden""",
+            in.sourcePos())
         in.nextToken()
         name
       }
@@ -1150,10 +1163,11 @@ object Parsers {
           }
           else
             if !in.featureEnabled(Feature.symbolLiterals) then
+              val name = in.name // capture name (not `in`) in the warning message closure
               report.errorOrMigrationWarning(
-                em"""symbol literal '${in.name} is no longer supported,
-                    |use a string literal "${in.name}" or an application Symbol("${in.name}") instead,
-                    |or enclose in braces '{${in.name}} if you want a quoted expression.
+                em"""symbol literal '$name is no longer supported,
+                    |use a string literal "$name" or an application Symbol("$name") instead,
+                    |or enclose in braces '{$name} if you want a quoted expression.
                     |For now, you can also `import language.deprecated.symbolLiterals` to accept
                     |the idiom, but this possibility might no longer be available in the future.""",
                 in.sourcePos())
@@ -1254,7 +1268,7 @@ object Parsers {
     def possibleTemplateStart(isNew: Boolean = false): Unit =
       in.observeColonEOL()
       if in.token == COLONEOL then
-        if in.lookahead.isIdent(nme.end) then in.token = NEWLINE
+        if in.lookahead.token == END then in.token = NEWLINE
         else
           in.nextToken()
           if in.token != INDENT && in.token != LBRACE then
@@ -1264,7 +1278,13 @@ object Parsers {
 
     def checkEndMarker[T <: Tree](stats: ListBuffer[T]): Unit =
 
-      def matches(stat: Tree): Boolean = stat match
+      def updateSpanOfLast(last: T): Unit =
+        last match
+          case last: WithEndMarker[t] => last.withEndMarker()
+          case _ =>
+        last.span = last.span.withEnd(in.lastCharOffset)
+
+      def matches(stat: T): Boolean = stat match
         case stat: MemberDef if !stat.name.isEmpty =>
           if stat.name == nme.CONSTRUCTOR then in.token == THIS
           else in.isIdent && in.name == stat.name.toTermName
@@ -1272,8 +1292,6 @@ object Parsers {
           in.token == IDENTIFIER && in.name == nme.extension
         case PackageDef(pid: RefTree, _) =>
           in.isIdent && in.name == pid.name
-        case PatDef(_, IdPattern(id, _) :: Nil, _, _) =>
-         in.isIdent && in.name == id.name
         case stat: MemberDef if stat.mods.is(Given) => in.token == GIVEN
         case _: PatDef => in.token == VAL
         case _: If => in.token == IF
@@ -1284,25 +1302,23 @@ object Parsers {
         case _: (ForYield | ForDo) => in.token == FOR
         case _ => false
 
-      if isIdent(nme.end) then
-        val start = in.offset
-        val isEndMarker =
-          val endLine = source.offsetToLine(start)
-          val lookahead = in.LookaheadScanner()
-          lookahead.nextToken()
-          source.offsetToLine(lookahead.offset) == endLine
-          && endMarkerTokens.contains(in.token)
-          && {
-            lookahead.nextToken()
-            lookahead.token == EOF
-            || source.offsetToLine(lookahead.offset) > endLine
-          }
-        if isEndMarker then
-          in.nextToken()
-          if stats.isEmpty || !matches(stats.last) then
-            syntaxError("misaligned end marker", Span(start, in.lastCharOffset))
-          in.token = IDENTIFIER // Leaving it as the original token can confuse newline insertion
-          in.nextToken()
+      def endName = if in.token == IDENTIFIER then in.name.toString else tokenString(in.token)
+
+      def matchesAndSetEnd(last: T): Boolean =
+        val didMatch = matches(last)
+        if didMatch then
+          updateSpanOfLast(last)
+        didMatch
+
+      if in.token == END then
+        val start = in.skipToken()
+        if stats.isEmpty || !matchesAndSetEnd(stats.last) then
+          syntaxError("misaligned end marker", Span(start, in.lastCharOffset))
+        else if overlapsPatch(source, Span(start, start)) then
+          patch(source, Span(start, start), "")
+          patch(source, Span(start, in.lastCharOffset), s"} // end $endName")
+        in.token = IDENTIFIER // Leaving it as the original token can confuse newline insertion
+        in.nextToken()
     end checkEndMarker
 
 /* ------------- TYPES ------------------------------------------------------ */
@@ -1314,6 +1330,7 @@ object Parsers {
 
     private def isFunction(tree: Tree): Boolean = tree match {
       case Parens(tree1) => isFunction(tree1)
+      case Block(Nil, tree1) => isFunction(tree1)
       case _: Function => true
       case _ => false
     }
@@ -1357,7 +1374,7 @@ object Parsers {
             if imods.is(Given) && params.isEmpty then
               syntaxError("context function types require at least one parameter", paramSpan)
             new FunctionWithMods(params, t, imods)
-          else if ctx.settings.YkindProjector.value then
+          else if !ctx.settings.YkindProjector.isDefault then
             val (newParams :+ newT, tparams) = replaceKindProjectorPlaceholders(params :+ t)
 
             lambdaAbstract(tparams, Function(newParams, newT))
@@ -1448,20 +1465,31 @@ object Parsers {
       }
     }
 
-    private def makeKindProjectorTypeDef(name: TypeName): TypeDef =
-      TypeDef(name, WildcardTypeBoundsTree()).withFlags(Param)
+    private def makeKindProjectorTypeDef(name: TypeName): TypeDef = {
+      val isVarianceAnnotated = name.startsWith("+") || name.startsWith("-")
+      // We remove the variance marker from the name without passing along the specified variance at all
+      // The real variance will be inferred at a later stage but may contradict the variance specified,
+      // This is ok, because `-Ykind-projector` is for cross-compiling existing Scala 2 code, not for writing new code,
+      // we may assume that variance annotations have already been checked by the Scala 2 compiler.
+      val unannotatedName = if (isVarianceAnnotated) name.mapLast(_.drop(1)) else name
+      TypeDef(unannotatedName, WildcardTypeBoundsTree()).withFlags(Param)
+    }
 
     /** Replaces kind-projector's `*` in a list of types arguments with synthetic names,
      *  returning the new argument list and the synthetic type definitions.
      */
     private def replaceKindProjectorPlaceholders(params: List[Tree]): (List[Tree], List[TypeDef]) = {
       val tparams = new ListBuffer[TypeDef]
+      def addParam() = {
+        val name = WildcardParamName.fresh().toTypeName
+        tparams += makeKindProjectorTypeDef(name)
+        Ident(name)
+      }
 
+      val uscores = ctx.settings.YkindProjector.value == "underscores"
       val newParams = params.mapConserve {
-        case param @ Ident(tpnme.raw.STAR) =>
-          val name = WildcardParamName.fresh().toTypeName
-          tparams += makeKindProjectorTypeDef(name)
-          Ident(name)
+        case param @ Ident(tpnme.raw.STAR | tpnme.raw.MINUS_STAR | tpnme.raw.PLUS_STAR) => addParam()
+        case param @ Ident(tpnme.USCOREkw | tpnme.raw.MINUS_USCORE | tpnme.raw.PLUS_USCORE) if uscores => addParam()
         case other => other
       }
 
@@ -1538,20 +1566,21 @@ object Parsers {
       else t
 
     /** The block in a quote or splice */
-    def stagedBlock() =
-      val saved = lastStatOffset
-      try inBraces(block(simplify = true))
-      finally lastStatOffset = saved
+    def stagedBlock() = inBraces(block(simplify = true))
 
-    /** SimpleEpxr  ::=  spliceId | ‘$’ ‘{’ Block ‘}’)
-     *  SimpleType  ::=  spliceId | ‘$’ ‘{’ Block ‘}’)
+    /** SimpleExpr  ::=  spliceId | ‘$’ ‘{’ Block ‘}’)  unless inside quoted pattern
+     *  SimpleType  ::=  spliceId | ‘$’ ‘{’ Block ‘}’)  unless inside quoted pattern
+     *
+     *  SimpleExpr  ::=  spliceId | ‘$’ ‘{’ Pattern ‘}’)  when inside quoted pattern
+     *  SimpleType  ::=  spliceId | ‘$’ ‘{’ Pattern ‘}’)  when inside quoted pattern
      */
     def splice(isType: Boolean): Tree =
       atSpan(in.offset) {
         val expr =
           if (in.name.length == 1) {
             in.nextToken()
-            withinStaged(StageKind.Spliced)(stagedBlock())
+            val inPattern = (staged & StageKind.QuotedPattern) != 0
+            withinStaged(StageKind.Spliced)(if (inPattern) inBraces(pattern()) else stagedBlock())
           }
           else atSpan(in.offset + 1) {
             val id = Ident(in.name.drop(1))
@@ -1571,16 +1600,25 @@ object Parsers {
       if isSimpleLiteral then
         SingletonTypeTree(simpleLiteral())
       else if in.token == USCORE then
-        if sourceVersion.isAtLeast(future) then
-          deprecationWarning(em"`_` is deprecated for wildcard arguments of types: use `?` instead")
-          patch(source, Span(in.offset, in.offset + 1), "?")
+        if ctx.settings.YkindProjector.value == "underscores" then
+          val start = in.skipToken()
+          Ident(tpnme.USCOREkw).withSpan(Span(start, in.lastOffset, start))
+        else
+          if sourceVersion.isAtLeast(future) then
+            deprecationWarning(em"`_` is deprecated for wildcard arguments of types: use `?` instead")
+            patch(source, Span(in.offset, in.offset + 1), "?")
+          val start = in.skipToken()
+          typeBounds().withSpan(Span(start, in.lastOffset, start))
+      // Allow symbols -_ and +_ through for compatibility with code written using kind-projector in Scala 3 underscore mode.
+      // While these signify variant type parameters in Scala 2 + kind-projector, we ignore their variance markers since variance is inferred.
+      else if (isIdent(nme.MINUS) || isIdent(nme.PLUS)) && in.lookahead.token == USCORE && ctx.settings.YkindProjector.value == "underscores" then
+        val identName = in.name.toTypeName ++ nme.USCOREkw
         val start = in.skipToken()
-        typeBounds().withSpan(Span(start, in.lastOffset, start))
+        in.nextToken()
+        Ident(identName).withSpan(Span(start, in.lastOffset, start))
       else if isIdent(nme.?) then
         val start = in.skipToken()
         typeBounds().withSpan(Span(start, in.lastOffset, start))
-      else if isIdent(nme.*) && ctx.settings.YkindProjector.value then
-        typeIdent()
       else
         def singletonArgs(t: Tree): Tree =
           if in.token == LPAREN && in.featureEnabled(Feature.dependent)
@@ -1625,11 +1663,11 @@ object Parsers {
         val applied = rejectWildcardType(t)
         val args = typeArgs(namedOK = false, wildOK = true)
 
-        if (ctx.settings.YkindProjector.value) {
+        if (!ctx.settings.YkindProjector.isDefault) {
           def fail(): Tree = {
             syntaxError(
               "λ requires a single argument of the form X => ... or (X, Y) => ...",
-              Span(t.span.start, in.lastOffset)
+              Span(startOffset(t), in.lastOffset)
             )
             AppliedTypeTree(applied, args)
           }
@@ -1657,7 +1695,7 @@ object Parsers {
         }
       })
       case _ =>
-        if (ctx.settings.YkindProjector.value) {
+        if (!ctx.settings.YkindProjector.isDefault) {
           t match {
             case Tuple(params) =>
               val (newParams, tparams) = replaceKindProjectorPlaceholders(params)
@@ -1792,7 +1830,7 @@ object Parsers {
 
     def typeDependingOn(location: Location): Tree =
       if location.inParens then typ()
-      else if location.inPattern then refinedType()
+      else if location.inPattern then rejectWildcardType(refinedType())
       else infixType()
 
 /* ----------- EXPRESSIONS ------------------------------------------------ */
@@ -1801,14 +1839,14 @@ object Parsers {
      *  the initially parsed (...) region?
      */
     def toBeContinued(altToken: Token): Boolean =
-      if in.isNewLine || migrateTo3 then
-        false // a newline token means the expression is finished
-      else if !in.canStartStatTokens.contains(in.token)
-              || in.isLeadingInfixOperator(inConditional = true)
-      then
-        true
-      else
-        followedByToken(altToken) // scan ahead to see whether we find a `then` or `do`
+      inline def canContinue =
+        !in.canStartStatTokens.contains(in.token)  // not statement, so take as continued expr
+      || followedByToken(altToken)                 // scan ahead to see whether we find a `then` or `do`
+
+      !in.isNewLine       // a newline token means the expression is finished
+      && !migrateTo3      // old syntax
+      && canContinue
+    end toBeContinued
 
     def condExpr(altToken: Token): Tree =
       val t: Tree =
@@ -1838,6 +1876,7 @@ object Parsers {
       t
 
     /** Expr              ::=  [`implicit'] FunParams (‘=>’ | ‘?=>’) Expr
+     *                      |  HkTypeParamClause ‘=>’ Expr
      *                      |  Expr1
      *  FunParams         ::=  Bindings
      *                      |  id
@@ -1845,6 +1884,7 @@ object Parsers {
      *  ExprInParens      ::=  PostfixExpr `:' Type
      *                      |  Expr
      *  BlockResult       ::=  [‘implicit’] FunParams (‘=>’ | ‘?=>’) Block
+     *                      |  HkTypeParamClause ‘=>’ Block
      *                      |  Expr1
      *  Expr1             ::=  [‘inline’] `if' `(' Expr `)' {nl} Expr [[semi] else Expr]
      *                      |  [‘inline’] `if' Expr `then' Expr [[semi] else Expr]
@@ -1855,8 +1895,8 @@ object Parsers {
      *                      |  `throw' Expr
      *                      |  `return' [Expr]
      *                      |  ForExpr
-     *                      |  HkTypeParamClause ‘=>’ Expr
      *                      |  [SimpleExpr `.'] id `=' Expr
+     *                      |  PrefixOperator SimpleExpr `=' Expr
      *                      |  SimpleExpr1 ArgumentExprs `=' Expr
      *                      |  PostfixExpr [Ascription]
      *                      |  ‘inline’ InfixExpr MatchClause
@@ -1876,28 +1916,41 @@ object Parsers {
     def expr(location: Location): Tree = {
       val start = in.offset
       def isSpecialClosureStart = in.lookahead.isIdent(nme.erased) && in.erasedEnabled
-      if in.token == IMPLICIT then
-        closure(start, location, modifiers(BitSet(IMPLICIT)))
-      else if in.token == LPAREN && isSpecialClosureStart then
-        closure(start, location, Modifiers())
-      else {
-        val saved = placeholderParams
-        placeholderParams = Nil
-
-        def wrapPlaceholders(t: Tree) = try
-          if (placeholderParams.isEmpty) t
-          else new WildcardFunction(placeholderParams.reverse, t)
-        finally placeholderParams = saved
-
-        val t = expr1(location)
-        if in.isArrow then
-          placeholderParams = Nil // don't interpret `_' to the left of `=>` as placeholder
-          wrapPlaceholders(closureRest(start, location, convertToParams(t)))
-        else if isWildcard(t) then
-          placeholderParams = placeholderParams ::: saved
-          t
-        else wrapPlaceholders(t)
-      }
+      in.token match
+        case IMPLICIT =>
+          closure(start, location, modifiers(BitSet(IMPLICIT)))
+        case LPAREN if isSpecialClosureStart =>
+          closure(start, location, Modifiers())
+        case LBRACKET =>
+          val start = in.offset
+          val tparams = typeParamClause(ParamOwner.TypeParam)
+          val arrowOffset = accept(ARROW)
+          val body = expr(location)
+          atSpan(start, arrowOffset) {
+            if (isFunction(body))
+              PolyFunction(tparams, body)
+            else {
+              syntaxError("Implementation restriction: polymorphic function literals must have a value parameter", arrowOffset)
+              errorTermTree
+            }
+          }
+        case _ =>
+          val saved = placeholderParams
+          placeholderParams = Nil
+
+          def wrapPlaceholders(t: Tree) = try
+            if (placeholderParams.isEmpty) t
+            else new WildcardFunction(placeholderParams.reverse, t)
+          finally placeholderParams = saved
+
+          val t = expr1(location)
+          if in.isArrow then
+            placeholderParams = Nil // don't interpret `_' to the left of `=>` as placeholder
+            wrapPlaceholders(closureRest(start, location, convertToParams(t)))
+          else if isWildcard(t) then
+            placeholderParams = placeholderParams ::: saved
+            t
+          else wrapPlaceholders(t)
     }
 
     def expr1(location: Location = Location.ElseWhere): Tree = in.token match
@@ -1981,19 +2034,6 @@ object Parsers {
         }
       case FOR =>
         forExpr()
-      case LBRACKET =>
-        val start = in.offset
-        val tparams = typeParamClause(ParamOwner.TypeParam)
-        val arrowOffset = accept(ARROW)
-        val body = expr()
-        atSpan(start, arrowOffset) {
-          if (isFunction(body))
-            PolyFunction(tparams, body)
-          else {
-            syntaxError("Implementation restriction: polymorphic function literals must have a value parameter", arrowOffset)
-            errorTermTree
-          }
-        }
       case _ =>
         if isIdent(nme.inline)
            && !in.inModifierPosition()
@@ -2016,7 +2056,7 @@ object Parsers {
     def expr1Rest(t: Tree, location: Location): Tree = in.token match
       case EQUALS =>
         t match
-          case Ident(_) | Select(_, _) | Apply(_, _) =>
+          case Ident(_) | Select(_, _) | Apply(_, _) | PrefixOp(_, _) =>
             atSpan(startOffset(t), in.skipToken()) {
               val loc = if location.inArgs then location else Location.ElseWhere
               Assign(t, subPart(() => expr(loc)))
@@ -2080,14 +2120,14 @@ object Parsers {
     /**    MatchClause ::= `match' `{' CaseClauses `}'
      */
     def matchClause(t: Tree): Match =
-      atSpan(t.span.start, in.skipToken()) {
+      atSpan(startOffset(t), in.skipToken()) {
         Match(t, inBracesOrIndented(caseClauses(() => caseClause())))
       }
 
     /**    `match' `{' TypeCaseClauses `}'
      */
     def matchType(t: Tree): MatchTypeTree =
-      atSpan(t.span.start, accept(MATCH)) {
+      atSpan(startOffset(t), accept(MATCH)) {
         MatchTypeTree(EmptyTree, t, inBracesOrIndented(caseClauses(typeCaseClause)))
       }
 
@@ -2177,17 +2217,19 @@ object Parsers {
         isOperator = !(location.inArgs && followingIsVararg()),
         maybePostfix = true)
 
-    /** PrefixExpr   ::= [`-' | `+' | `~' | `!'] SimpleExpr
-    */
+    /** PrefixExpr       ::= [PrefixOperator'] SimpleExpr
+     *  PrefixOperator   ::=  ‘-’ | ‘+’ | ‘~’ | ‘!’
+     */
     val prefixExpr: Location => Tree = location =>
-      if (isIdent && nme.raw.isUnary(in.name)) {
+      if isIdent && nme.raw.isUnary(in.name)
+         && in.canStartExprTokens.contains(in.lookahead.token)
+      then
         val start = in.offset
         val op = termIdent()
         if (op.name == nme.raw.MINUS && isNumericLit)
           simpleExprRest(literal(start), location, canApply = true)
         else
           atSpan(start) { PrefixOp(op, simpleExpr(location)) }
-      }
       else simpleExpr(location)
 
     /** SimpleExpr    ::= ‘new’ ConstrApp {`with` ConstrApp} [TemplateBody]
@@ -2235,7 +2277,7 @@ object Parsers {
           blockExpr()
         case QUOTE =>
           atSpan(in.skipToken()) {
-            withinStaged(StageKind.Quoted) {
+            withinStaged(StageKind.Quoted | (if (location.inPattern) StageKind.QuotedPattern else 0)) {
               Quote {
                 if (in.token == LBRACKET) inBrackets(typ())
                 else stagedBlock()
@@ -2445,7 +2487,7 @@ object Parsers {
       else Nil
 
     /** Enumerator  ::=  Generator
-     *                |  Guard
+     *                |  Guard {Guard}
      *                |  Pattern1 `=' Expr
      */
     def enumerator(): Tree =
@@ -2473,9 +2515,9 @@ object Parsers {
         GenFrom(pat, subExpr(), checkMode)
       }
 
-    /** ForExpr  ::= `for' (`(' Enumerators `)' | `{' Enumerators `}')
-     *                {nl} [`yield'] Expr
-     *            |  `for' Enumerators (`do' Expr | `yield' Expr)
+    /** ForExpr  ::=  ‘for’ ‘(’ Enumerators ‘)’ {nl} [‘do‘ | ‘yield’] Expr
+     *             |  ‘for’ ‘{’ Enumerators ‘}’ {nl} [‘do‘ | ‘yield’] Expr
+     *             |  ‘for’     Enumerators          (‘do‘ | ‘yield’) Expr
      */
     def forExpr(): Tree =
       atSpan(in.skipToken()) {
@@ -2522,7 +2564,7 @@ object Parsers {
             if (in.token == INDENT)
               inBracesOrIndented(enumerators())
             else {
-              val ts = inSepRegion(InCond)(enumerators())
+              val ts = inSepRegion(InFor)(enumerators())
               if (rewriteToOldSyntax(Span(start)) && ts.nonEmpty)
                 if (ts.head.sourcePos.startLine != ts.last.sourcePos.startLine) {
                   patch(source, Span(forEnd), " {")
@@ -2574,15 +2616,22 @@ object Parsers {
       })
     }
 
-    /** TypeCaseClause     ::= ‘case’ InfixType ‘=>’ Type [nl]
+    /** TypeCaseClause     ::= ‘case’ (InfixType | ‘_’) ‘=>’ Type [semi]
      */
     def typeCaseClause(): CaseDef = atSpan(in.offset) {
       val pat = inSepRegion(InCase) {
         accept(CASE)
-        infixType()
+        in.token match {
+          case USCORE if in.lookahead.isArrow =>
+            val start = in.skipToken()
+            Ident(tpnme.WILDCARD).withSpan(Span(start, in.lastOffset, start))
+          case _ =>
+            rejectWildcardType(infixType())
+        }
       }
       CaseDef(pat, EmptyTree, atSpan(accept(ARROW)) {
-        val t = typ()
+        val t = rejectWildcardType(typ())
+        if in.token == SEMI then in.nextToken()
         newLinesOptWhenFollowedBy(CASE)
         t
       })
@@ -2677,7 +2726,7 @@ object Parsers {
       case LPAREN =>
         atSpan(in.offset) { makeTupleOrParens(inParens(patternsOpt())) }
       case QUOTE =>
-        simpleExpr(Location.ElseWhere)
+        simpleExpr(Location.InPattern)
       case XMLSTART =>
         xmlLiteralPattern()
       case GIVEN =>
@@ -3080,10 +3129,6 @@ object Parsers {
       languageImport(tree) match
         case Some(prefix) =>
           in.languageImportContext = in.languageImportContext.importContext(imp, NoSymbol)
-          if prefix == nme.experimental
-             && selectors.exists(sel => Feature.experimental(sel.name) != Feature.scala2macros)
-          then
-            Feature.checkExperimentalFeature("s", imp.srcPos)
           for
             case ImportSelector(id @ Ident(imported), EmptyTree, _) <- selectors
             if allSourceVersionNames.contains(imported)
@@ -3439,7 +3484,11 @@ object Parsers {
           givenDef(start, mods, atSpan(in.skipToken()) { Mod.Given() })
         case _ =>
           syntaxErrorOrIncomplete(ExpectedStartOfTopLevelDefinition())
-          EmptyTree
+          mods.annotations match {
+            case head :: Nil => head
+            case Nil => EmptyTree
+            case all => Block(all, errorTermTree)
+          }
       }
 
     /** ClassDef ::= id ClassConstr TemplateOpt
@@ -3577,7 +3626,7 @@ object Parsers {
             ValDef(name, parents.head, subExpr())
           else
             DefDef(name, joinParams(tparams, vparamss), parents.head, subExpr())
-        else if in.token != WITH && parentsIsType then
+        else if (isStatSep || isStatSeqEnd) && parentsIsType then
           if name.isEmpty then
             syntaxError(em"anonymous given cannot be abstract")
           DefDef(name, joinParams(tparams, vparamss), parents.head, EmptyTree)
@@ -3585,14 +3634,17 @@ object Parsers {
           val tparams1 = tparams.map(tparam => tparam.withMods(tparam.mods | PrivateLocal))
           val vparamss1 = vparamss.map(_.map(vparam =>
             vparam.withMods(vparam.mods &~ Param | ParamAccessor | Protected)))
-          val templ = withTemplate(makeConstructor(tparams1, vparamss1), parents)
-          if noParams then ModuleDef(name, templ)
+          val constr = makeConstructor(tparams1, vparamss1)
+          val templ =
+            if isStatSep || isStatSeqEnd then Template(constr, parents, Nil, EmptyValDef, Nil)
+            else withTemplate(constr, parents)
+          if noParams && !mods.is(Inline) then ModuleDef(name, templ)
           else TypeDef(name.toTypeName, templ)
       end gdef
       finalizeDef(gdef, mods1, start)
     }
 
-    /** Extension  ::=  ‘extension’ [DefTypeParamClause] ‘(’ DefParam ‘)’
+    /** Extension  ::=  ‘extension’ [DefTypeParamClause] {UsingParamClause} ‘(’ DefParam ‘)’
      *                  {UsingParamClause} ExtMethods
      */
     def extension(): ExtMethods =
@@ -3616,7 +3668,7 @@ object Parsers {
           in.observeIndented()
           newLineOptWhenFollowedBy(LBRACE)
           if in.isNestedStart then inDefScopeBraces(extMethods(nparams))
-          else { syntaxError("Extension without extension methods"); Nil }
+          else { syntaxErrorOrIncomplete("Extension without extension methods") ; Nil }
       val result = atSpan(start)(ExtMethods(joinParams(tparams, leadParamss.toList), methods))
       val comment = in.getDocComment(start)
       if comment.isDefined then
@@ -3637,12 +3689,16 @@ object Parsers {
      */
     def extMethods(numLeadParams: Int): List[DefDef] = checkNoEscapingPlaceholders {
       val meths = new ListBuffer[DefDef]
-      val exitOnError = false
-      while !isStatSeqEnd && !exitOnError do
-        setLastStatOffset()
-        meths += extMethod(numLeadParams)
-        acceptStatSepUnlessAtEnd(meths)
-      if meths.isEmpty then syntaxError("`def` expected")
+      while
+        val start = in.offset
+        val mods = defAnnotsMods(modifierTokens)
+        in.token != EOF && {
+          accept(DEF)
+          meths += defDefOrDcl(start, mods, numLeadParams)
+          in.token != EOF && statSepOrEnd(meths, what = "extension method")
+        }
+      do ()
+      if meths.isEmpty then syntaxErrorOrIncomplete("`def` expected")
       meths.toList
     }
 
@@ -3703,11 +3759,11 @@ object Parsers {
         }
         else Nil
       possibleTemplateStart()
-      if (isEnum) {
-        val (self, stats) = withinEnum(templateBody())
+      if isEnum then
+        val (self, stats) = withinEnum(templateBody(parents))
         Template(constr, parents, derived, self, stats)
-      }
-      else templateBodyOpt(constr, parents, derived)
+      else
+        templateBodyOpt(constr, parents, derived)
     }
 
     /** TemplateOpt = [Template]
@@ -3730,15 +3786,15 @@ object Parsers {
     def templateBodyOpt(constr: DefDef, parents: List[Tree], derived: List[Tree]): Template =
       val (self, stats) =
         if in.isNestedStart then
-          templateBody()
+          templateBody(parents)
         else
           checkNextNotIndented()
           (EmptyValDef, Nil)
       Template(constr, parents, derived, self, stats)
 
-    def templateBody(rewriteWithColon: Boolean = true): (ValDef, List[Tree]) =
+    def templateBody(parents: List[Tree], rewriteWithColon: Boolean = true): (ValDef, List[Tree]) =
       val r = inDefScopeBraces(templateStatSeq(), rewriteWithColon)
-      if in.token == WITH then
+      if in.token == WITH && parents.isEmpty then
         syntaxError(EarlyDefinitionsNotSupported())
         in.nextToken()
         template(emptyConstructor)
@@ -3747,7 +3803,7 @@ object Parsers {
     /** with Template, with EOL <indent> interpreted */
     def withTemplate(constr: DefDef, parents: List[Tree]): Template =
       accept(WITH)
-      val (self, stats) = templateBody(rewriteWithColon = false)
+      val (self, stats) = templateBody(parents, rewriteWithColon = false)
       Template(constr, parents, Nil, self, stats)
         .withSpan(Span(constr.span.orElse(parents.head.span).start, in.lastOffset))
 
@@ -3777,8 +3833,8 @@ object Parsers {
      */
     def topStatSeq(outermost: Boolean = false): List[Tree] = {
       val stats = new ListBuffer[Tree]
-      while (!isStatSeqEnd) {
-        setLastStatOffset()
+      while
+        var empty = false
         if (in.token == PACKAGE) {
           val start = in.skipToken()
           if (in.token == OBJECT) {
@@ -3795,13 +3851,10 @@ object Parsers {
           stats += extension()
         else if isDefIntro(modifierTokens) then
           stats +++= defOrDcl(in.offset, defAnnotsMods(modifierTokens))
-        else if !isStatSep then
-          if (in.token == CASE)
-            syntaxErrorOrIncomplete(OnlyCaseClassOrCaseObjectAllowed())
-          else
-            syntaxErrorOrIncomplete(ExpectedToplevelDef())
-        acceptStatSepUnlessAtEnd(stats)
-      }
+        else
+          empty = true
+        statSepOrEnd(stats, empty, "toplevel definition")
+      do ()
       stats.toList
     }
 
@@ -3819,9 +3872,9 @@ object Parsers {
     def templateStatSeq(): (ValDef, List[Tree]) = checkNoEscapingPlaceholders {
       var self: ValDef = EmptyValDef
       val stats = new ListBuffer[Tree]
-      if (isExprIntro && !isDefIntro(modifierTokens)) {
+      if isExprIntro && !isDefIntro(modifierTokens) then
         val first = expr1()
-        if (in.token == ARROW) {
+        if in.token == ARROW then
           first match {
             case Typed(tree @ This(EmptyTypeIdent), tpt) =>
               self = makeSelfDef(nme.WILDCARD, tpt).withSpan(first.span)
@@ -3832,15 +3885,12 @@ object Parsers {
           }
           in.token = SELFARROW // suppresses INDENT insertion after `=>`
           in.nextToken()
-        }
-        else {
+        else
           stats += first
-          acceptStatSepUnlessAtEnd(stats)
-        }
-      }
-      var exitOnError = false
-      while (!isStatSeqEnd && !exitOnError) {
-        setLastStatOffset()
+          statSepOrEnd(stats)
+      end if
+      while
+        var empty = false
         if (in.token == IMPORT)
           stats ++= importClause(IMPORT, mkImport())
         else if (in.token == EXPORT)
@@ -3851,13 +3901,11 @@ object Parsers {
           stats +++= defOrDcl(in.offset, defAnnotsMods(modifierTokens))
         else if (isExprIntro)
           stats += expr1()
-        else if (!isStatSep) {
-          exitOnError = mustStartStat
-          syntaxErrorOrIncomplete("illegal start of definition")
-        }
-        acceptStatSepUnlessAtEnd(stats)
-      }
-      (self, if (stats.isEmpty) List(EmptyTree) else stats.toList)
+        else
+          empty = true
+        statSepOrEnd(stats, empty)
+      do ()
+      (self, if stats.isEmpty then List(EmptyTree) else stats.toList)
     }
 
     /** RefineStatSeq    ::=  RefineStat {semi RefineStat}
@@ -3870,6 +3918,9 @@ object Parsers {
       val stats = new ListBuffer[Tree]
       def checkLegal(tree: Tree): List[Tree] =
         val problem = tree match
+          case tree: ValDef if tree.mods.is(Mutable) =>
+            i"""refinement cannot be a mutable var.
+               |You can use an explicit getter ${tree.name} and setter ${tree.name}_= instead"""
           case tree: MemberDef if !(tree.mods.flags & ModifierFlags).isEmpty =>
             i"refinement cannot be ${(tree.mods.flags & ModifierFlags).flagStrings().mkString("`", "`, `", "`")}"
           case tree: DefDef if tree.termParamss.nestedExists(!_.rhs.isEmpty) =>
@@ -3885,16 +3936,14 @@ object Parsers {
         if problem.isEmpty then tree :: Nil
         else { syntaxError(problem, tree.span); Nil }
 
-      while (!isStatSeqEnd) {
-        if (isDclIntro)
+      while
+        val dclFound = isDclIntro
+        if dclFound then
           stats ++= checkLegal(defOrDcl(in.offset, Modifiers()))
-        else if (!isStatSep)
-          syntaxErrorOrIncomplete(
-            "illegal start of declaration" +
-            (if (inFunReturnType) " (possible cause: missing `=` in front of current method body)"
-             else ""))
-        acceptStatSepUnlessAtEnd(stats)
-      }
+        var what = "declaration"
+        if inFunReturnType then what += " (possible cause: missing `=` in front of current method body)"
+        statSepOrEnd(stats, !dclFound, what)
+      do ()
       stats.toList
     }
 
@@ -3918,9 +3967,8 @@ object Parsers {
      */
     def blockStatSeq(): List[Tree] = checkNoEscapingPlaceholders {
       val stats = new ListBuffer[Tree]
-      var exitOnError = false
-      while (!isStatSeqEnd && in.token != CASE && !exitOnError) {
-        setLastStatOffset()
+      while
+        var empty = false
         if (in.token == IMPORT)
           stats ++= importClause(IMPORT, mkImport())
         else if (isExprIntro)
@@ -3931,12 +3979,10 @@ object Parsers {
           stats += extension()
         else if isDefIntro(localModifierTokens, excludedSoftModifiers = Set(nme.`opaque`)) then
           stats +++= localDef(in.offset)
-        else if (!isStatSep && (in.token != CASE)) {
-          exitOnError = mustStartStat
-          syntaxErrorOrIncomplete(IllegalStartOfStatement(isModifier))
-        }
-        acceptStatSepUnlessAtEnd(stats, CASE)
-      }
+        else
+          empty = true
+        statSepOrEnd(stats, empty, altEnd = CASE)
+      do ()
       stats.toList
     }
 
@@ -3953,7 +3999,7 @@ object Parsers {
             in.nextToken()
             ts += objectDef(start, Modifiers(Package))
             if (in.token != EOF) {
-              acceptStatSepUnlessAtEnd(ts)
+              statSepOrEnd(ts, what = "toplevel definition")
               ts ++= topStatSeq()
             }
           }
@@ -3970,7 +4016,7 @@ object Parsers {
               acceptStatSep()
               ts += makePackaging(start, pkg, topstats())
             if continue then
-              acceptStatSepUnlessAtEnd(ts)
+              statSepOrEnd(ts, what = "toplevel definition")
               ts ++= topStatSeq()
         }
         else
@@ -4000,7 +4046,7 @@ object Parsers {
       EmptyTree
     }
 
-    override def templateBody(rewriteWithColon: Boolean): (ValDef, List[Thicket]) = {
+    override def templateBody(parents: List[Tree], rewriteWithColon: Boolean): (ValDef, List[Thicket]) = {
       skipBraces()
       (EmptyValDef, List(EmptyTree))
     }
diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
index 15b3f6e63134..d6ef2646eacf 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
@@ -135,14 +135,19 @@ object Scanners {
       */
     protected def putChar(c: Char): Unit = litBuf.append(c)
 
-    /** Clear buffer and set name and token */
-    def finishNamed(idtoken: Token = IDENTIFIER, target: TokenData = this): Unit = {
+    /** Finish an IDENTIFIER with `this.name`. */
+    inline def finishNamed(): Unit = finishNamedToken(IDENTIFIER, this)
+
+    /** Clear buffer and set name and token.
+     *  If `target` is different from `this`, don't treat identifiers as end tokens.
+     */
+    def finishNamedToken(idtoken: Token, target: TokenData): Unit =
       target.name = termName(litBuf.chars, 0, litBuf.length)
       litBuf.clear()
       target.token = idtoken
-      if (idtoken == IDENTIFIER)
-        target.token = toToken(target.name)
-    }
+      if idtoken == IDENTIFIER then
+        val converted = toToken(target.name)
+        if converted != END || (target eq this) then target.token = converted
 
     /** The token for given `name`. Either IDENTIFIER or a keyword. */
     def toToken(name: SimpleName): Token
@@ -240,23 +245,18 @@ object Scanners {
     /** A buffer for comments */
     private val commentBuf = CharBuffer()
 
-    private def handleMigration(keyword: Token): Token =
-      if scala3keywords.contains(keyword) && migrateTo3 then treatAsIdent()
-      else keyword
-
-    private def treatAsIdent(): Token =
-      report.errorOrMigrationWarning(
-        i"$name is now a keyword, write `$name` instead of $name to keep it as an identifier",
-        sourcePos())
-      patch(source, Span(offset), "`")
-      patch(source, Span(offset + name.length), "`")
-      IDENTIFIER
-
-    def toToken(name: SimpleName): Token = {
-      val idx = name.start
+    def toToken(identifier: SimpleName): Token =
+      def handleMigration(keyword: Token): Token =
+        if scala3keywords.contains(keyword) && migrateTo3 then
+          val what = tokenString(keyword)
+          report.errorOrMigrationWarning(i"$what is now a keyword, write `$what` instead of $what to keep it as an identifier", sourcePos())
+          patch(source, Span(offset), "`")
+          patch(source, Span(offset + identifier.length), "`")
+          IDENTIFIER
+        else keyword
+      val idx = identifier.start
       if (idx >= 0 && idx <= lastKeywordStart) handleMigration(kwArray(idx))
       else IDENTIFIER
-    }
 
     def newTokenData: TokenData = new TokenData {}
 
@@ -367,6 +367,8 @@ object Scanners {
       *   - it does not follow a blank line, and
       *   - it is followed by at least one whitespace character and a
       *     token that can start an expression.
+      *   - if the operator appears on its own line, the next line must have at least
+      *     the same indentation width as the operator. See pos/i12395 for a test where this matters.
       *  If a leading infix operator is found and the source version is `3.0-migration`, emit a change warning.
       */
     def isLeadingInfixOperator(nextWidth: IndentWidth = indentWidth(offset), inConditional: Boolean = true) =
@@ -377,8 +379,8 @@ object Scanners {
       && {
         // Is current lexeme  assumed to start an expression?
         // This is the case if the lexime is one of the tokens that
-        // starts an expression. Furthermore, if the previous token is
-        // in backticks, the lexeme may not be a binary operator.
+        // starts an expression or it is a COLONEOL. Furthermore, if
+        // the previous token is in backticks, the lexeme may not be a binary operator.
         // I.e. in
         //
         //   a
@@ -388,14 +390,16 @@ object Scanners {
         // in backticks and is a binary operator. Hence, `x` is not classified as a
         // leading infix operator.
         def assumeStartsExpr(lexeme: TokenData) =
-          canStartExprTokens.contains(lexeme.token)
+          (canStartExprTokens.contains(lexeme.token) || lexeme.token == COLONEOL)
           && (!lexeme.isOperator || nme.raw.isUnary(lexeme.name))
         val lookahead = LookaheadScanner()
         lookahead.allowLeadingInfixOperators = false
           // force a NEWLINE a after current token if it is on its own line
         lookahead.nextToken()
         assumeStartsExpr(lookahead)
-        || lookahead.token == NEWLINE && assumeStartsExpr(lookahead.next)
+        || lookahead.token == NEWLINE
+           && assumeStartsExpr(lookahead.next)
+           && indentWidth(offset) <= indentWidth(lookahead.next.offset)
       }
       && {
         currentRegion match
@@ -535,7 +539,7 @@ object Scanners {
            || nextWidth == lastWidth && (indentPrefix == MATCH || indentPrefix == CATCH) && token != CASE then
           if currentRegion.isOutermost then
             if nextWidth < lastWidth then currentRegion = topLevelRegion(nextWidth)
-          else if !isLeadingInfixOperator(nextWidth) && !statCtdTokens.contains(lastToken) then
+          else if !isLeadingInfixOperator(nextWidth) && !statCtdTokens.contains(lastToken) && lastToken != INDENT then
             currentRegion match
               case r: Indented =>
                 currentRegion = r.enclosing
@@ -595,7 +599,9 @@ object Scanners {
       case r: Indented
       if !r.isOutermost
          && closingRegionTokens.contains(token)
-         && !(token == CASE && r.prefix == MATCH) =>
+         && !(token == CASE && r.prefix == MATCH)
+         && next.token == EMPTY  // can be violated for ill-formed programs, e.g. neg/i12605.sala
+      =>
         currentRegion = r.enclosing
         insert(OUTDENT, offset)
       case _ =>
@@ -604,6 +610,7 @@ object Scanners {
       prev.copyFrom(this)
       lastOffset = lastCharOffset
       fetchToken()
+      if token == END && !isEndMarker then token = IDENTIFIER
     }
 
     def reset() = {
@@ -652,10 +659,10 @@ object Scanners {
                  && (token == RPAREN || token == RBRACKET || token == RBRACE || token == OUTDENT)
               then
                 () /* skip the trailing comma */
-              else if token == EOF then // e.g. when the REPL is parsing "val List(x, y, _*,"
-                () /* skip the trailing comma */
               else
                 reset()
+        case END =>
+          if !isEndMarker then token = IDENTIFIER
         case COLON =>
           if fewerBracesEnabled then observeColonEOL()
         case RBRACE | RPAREN | RBRACKET =>
@@ -666,6 +673,21 @@ object Scanners {
       }
     }
 
+    protected def isEndMarker: Boolean =
+      if indentSyntax && isAfterLineEnd then
+        val endLine = source.offsetToLine(offset)
+        val lookahead = new LookaheadScanner():
+          override def isEndMarker = false
+        lookahead.nextToken()
+        if endMarkerTokens.contains(lookahead.token)
+          && source.offsetToLine(lookahead.offset) == endLine
+        then
+          lookahead.nextToken()
+          if lookahead.token == EOF
+          || source.offsetToLine(lookahead.offset) > endLine
+          then return true
+      false
+
     /** Is there a blank line between the current token and the last one?
      *  A blank line consists only of characters <= ' '.
      *  @pre  afterLineEnd().
@@ -975,7 +997,7 @@ object Scanners {
       getLitChars('`')
       if (ch == '`') {
         nextChar()
-        finishNamed(BACKQUOTED_IDENT)
+        finishNamedToken(BACKQUOTED_IDENT, target = this)
         if (name.length == 0)
           error("empty quoted identifier")
         else if (name == nme.WILDCARD)
@@ -1141,10 +1163,12 @@ object Scanners {
             nextRawChar()
             ch != SU && Character.isUnicodeIdentifierPart(ch)
           do ()
-          finishNamed(target = next)
+          finishNamedToken(IDENTIFIER, target = next)
         }
         else
-          error("invalid string interpolation: `$$`, `$\"`, `$`ident or `$`BlockExpr expected")
+          error("invalid string interpolation: `$$`, `$\"`, `$`ident or `$`BlockExpr expected", off = charOffset - 2)
+          putChar('$')
+          getStringPart(multiLine)
       }
       else {
         val isUnclosedLiteral = !isUnicodeEscape && (ch == SU || (!multiLine && (ch == CR || ch == LF)))
@@ -1227,7 +1251,7 @@ object Scanners {
               nextChar()
             }
           }
-          val alt = if oct == LF then raw"\n" else f"\u$oct%04x"
+          val alt = if oct == LF then raw"\n" else f"${"\\"}u$oct%04x"
           error(s"octal escape literals are unsupported: use $alt instead", start)
           putChar(oct.toChar)
         }
diff --git a/compiler/src/dotty/tools/dotc/parsing/Tokens.scala b/compiler/src/dotty/tools/dotc/parsing/Tokens.scala
index 27f533408deb..55f428cef5a4 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Tokens.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Tokens.scala
@@ -30,107 +30,107 @@ abstract class TokensCommon {
   }
 
   /** special tokens */
-  final val EMPTY = 0;             enter(EMPTY, "<empty>") // a missing token, used in lookahead
-  final val ERROR = 1;             enter(ERROR, "erroneous token") // an erroneous token
-  final val EOF = 2;               enter(EOF, "eof")
+  inline val EMPTY = 0;             enter(EMPTY, "<empty>") // a missing token, used in lookahead
+  inline val ERROR = 1;             enter(ERROR, "erroneous token") // an erroneous token
+  inline val EOF = 2;               enter(EOF, "eof")
 
   /** literals */
-  final val CHARLIT = 3;           enter(CHARLIT, "character literal")
-  final val INTLIT = 4;            enter(INTLIT, "integer literal")
-  final val DECILIT = 5;           enter(DECILIT, "number literal")  // with decimal point
-  final val EXPOLIT = 6;           enter(EXPOLIT, "number literal with exponent")
-  final val LONGLIT = 7;           enter(LONGLIT, "long literal")
-  final val FLOATLIT = 8;          enter(FLOATLIT, "float literal")
-  final val DOUBLELIT = 9;         enter(DOUBLELIT, "double literal")
-  final val STRINGLIT = 10;         enter(STRINGLIT, "string literal")
-  final val STRINGPART = 11;       enter(STRINGPART, "string literal", "string literal part")
-  //final val INTERPOLATIONID = 12;  enter(INTERPOLATIONID, "string interpolator")
-  //final val QUOTEID = 13;        enter(QUOTEID, "quoted identifier") // TODO: deprecate
+  inline val CHARLIT = 3;           enter(CHARLIT, "character literal")
+  inline val INTLIT = 4;            enter(INTLIT, "integer literal")
+  inline val DECILIT = 5;           enter(DECILIT, "number literal")  // with decimal point
+  inline val EXPOLIT = 6;           enter(EXPOLIT, "number literal with exponent")
+  inline val LONGLIT = 7;           enter(LONGLIT, "long literal")
+  inline val FLOATLIT = 8;          enter(FLOATLIT, "float literal")
+  inline val DOUBLELIT = 9;         enter(DOUBLELIT, "double literal")
+  inline val STRINGLIT = 10;         enter(STRINGLIT, "string literal")
+  inline val STRINGPART = 11;       enter(STRINGPART, "string literal", "string literal part")
+  //inline val INTERPOLATIONID = 12;  enter(INTERPOLATIONID, "string interpolator")
+  //inline val QUOTEID = 13;        enter(QUOTEID, "quoted identifier") // TODO: deprecate
 
   /** identifiers */
-  final val IDENTIFIER = 14;       enter(IDENTIFIER, "identifier")
-  //final val BACKQUOTED_IDENT = 15; enter(BACKQUOTED_IDENT, "identifier", "backquoted ident")
+  inline val IDENTIFIER = 14;       enter(IDENTIFIER, "identifier")
+  //inline val BACKQUOTED_IDENT = 15; enter(BACKQUOTED_IDENT, "identifier", "backquoted ident")
 
   /** alphabetic keywords */
-  final val IF = 20;               enter(IF, "if")
-  final val FOR = 21;              enter(FOR, "for")
-  final val ELSE = 22;             enter(ELSE, "else")
-  final val THIS = 23;             enter(THIS, "this")
-  final val NULL = 24;             enter(NULL, "null")
-  final val NEW = 25;              enter(NEW, "new")
-  //final val WITH = 26;             enter(WITH, "with")
-  final val SUPER = 27;            enter(SUPER, "super")
-  //final val CASE = 28;             enter(CASE, "case")
-  //final val CASECLASS = 29;        enter(CASECLASS, "case class")
-  //final val CASEOBJECT = 30;       enter(CASEOBJECT, "case object")
-  //final val VAL = 31;              enter(VAL, "val")
-  final val ABSTRACT = 32;         enter(ABSTRACT, "abstract")
-  final val FINAL = 33;            enter(FINAL, "final")
-  final val PRIVATE = 34;          enter(PRIVATE, "private")
-  final val PROTECTED = 35;        enter(PROTECTED, "protected")
-  final val OVERRIDE = 36;         enter(OVERRIDE, "override")
-  //final val IMPLICIT = 37;         enter(IMPLICIT, "implicit")
-  //final val VAR = 38;              enter(VAR, "var")
-  //final val DEF = 39;              enter(DEF, "def")
-  //final val TYPE = 40;             enter(TYPE, "type")
-  final val EXTENDS = 41;          enter(EXTENDS, "extends")
-  final val TRUE = 42;             enter(TRUE, "true")
-  final val FALSE = 43;            enter(FALSE, "false")
-  //final val OBJECT = 44;           enter(OBJECT, "object")
-  final val CLASS = 45;            enter(CLASS, "class")
-  final val IMPORT = 46;           enter(IMPORT, "import")
-  final val PACKAGE = 47;          enter(PACKAGE, "package")
-  //final val YIELD = 48;            enter(YIELD, "yield")
-  final val DO = 49;               enter(DO, "do")
-  //final val TRAIT = 50;            enter(TRAIT, "trait")
-  //final val SEALED = 51;           enter(SEALED, "sealed")
-  final val THROW = 52;            enter(THROW, "throw")
-  final val TRY = 53;              enter(TRY, "try")
-  final val CATCH = 54;            enter(CATCH, "catch")
-  final val FINALLY = 55;          enter(FINALLY, "finally")
-  final val WHILE = 56;            enter(WHILE, "while")
-  final val RETURN = 57;           enter(RETURN, "return")
-  //final val MATCH = 58;            enter(MATCH, "match")
-  //final val LAZY = 59;             enter(LAZY, "lazy")
-  //final val THEN = 60;             enter(THEN, "then")
-  //final val FORSOME = 61;          enter(FORSOME, "forSome") // TODO: deprecate
-  //final val ENUM = 62;             enter(ENUM, "enum")
+  inline val IF = 20;               enter(IF, "if")
+  inline val FOR = 21;              enter(FOR, "for")
+  inline val ELSE = 22;             enter(ELSE, "else")
+  inline val THIS = 23;             enter(THIS, "this")
+  inline val NULL = 24;             enter(NULL, "null")
+  inline val NEW = 25;              enter(NEW, "new")
+  //inline val WITH = 26;             enter(WITH, "with")
+  inline val SUPER = 27;            enter(SUPER, "super")
+  //inline val CASE = 28;             enter(CASE, "case")
+  //inline val CASECLASS = 29;        enter(CASECLASS, "case class")
+  //inline val CASEOBJECT = 30;       enter(CASEOBJECT, "case object")
+  //inline val VAL = 31;              enter(VAL, "val")
+  inline val ABSTRACT = 32;         enter(ABSTRACT, "abstract")
+  inline val FINAL = 33;            enter(FINAL, "final")
+  inline val PRIVATE = 34;          enter(PRIVATE, "private")
+  inline val PROTECTED = 35;        enter(PROTECTED, "protected")
+  inline val OVERRIDE = 36;         enter(OVERRIDE, "override")
+  //inline val IMPLICIT = 37;         enter(IMPLICIT, "implicit")
+  //inline val VAR = 38;              enter(VAR, "var")
+  //inline val DEF = 39;              enter(DEF, "def")
+  //inline val TYPE = 40;             enter(TYPE, "type")
+  inline val EXTENDS = 41;          enter(EXTENDS, "extends")
+  inline val TRUE = 42;             enter(TRUE, "true")
+  inline val FALSE = 43;            enter(FALSE, "false")
+  //inline val OBJECT = 44;           enter(OBJECT, "object")
+  inline val CLASS = 45;            enter(CLASS, "class")
+  inline val IMPORT = 46;           enter(IMPORT, "import")
+  inline val PACKAGE = 47;          enter(PACKAGE, "package")
+  //inline val YIELD = 48;            enter(YIELD, "yield")
+  inline val DO = 49;               enter(DO, "do")
+  //inline val TRAIT = 50;            enter(TRAIT, "trait")
+  //inline val SEALED = 51;           enter(SEALED, "sealed")
+  inline val THROW = 52;            enter(THROW, "throw")
+  inline val TRY = 53;              enter(TRY, "try")
+  inline val CATCH = 54;            enter(CATCH, "catch")
+  inline val FINALLY = 55;          enter(FINALLY, "finally")
+  inline val WHILE = 56;            enter(WHILE, "while")
+  inline val RETURN = 57;           enter(RETURN, "return")
+  //inline val MATCH = 58;            enter(MATCH, "match")
+  //inline val LAZY = 59;             enter(LAZY, "lazy")
+  //inline val THEN = 60;             enter(THEN, "then")
+  //inline val FORSOME = 61;          enter(FORSOME, "forSome") // TODO: deprecate
+  //inline val ENUM = 62;             enter(ENUM, "enum")
 
   /** special symbols */
-  final val COMMA = 70;            enter(COMMA, "','")
-  final val SEMI = 71;             enter(SEMI, "';'")
-  final val DOT = 72;              enter(DOT, "'.'")
-  //final val NEWLINE = 78;          enter(NEWLINE, "end of statement", "new line")
-  //final val NEWLINES = 79;         enter(NEWLINES, "end of statement", "new lines")
+  inline val COMMA = 70;            enter(COMMA, "','")
+  inline val SEMI = 71;             enter(SEMI, "';'")
+  inline val DOT = 72;              enter(DOT, "'.'")
+  //inline val NEWLINE = 78;          enter(NEWLINE, "end of statement", "new line")
+  //inline val NEWLINES = 79;         enter(NEWLINES, "end of statement", "new lines")
 
   /** special keywords */
-  //final val USCORE = 73;           enter(USCORE, "_")
-  final val COLON = 74;            enter(COLON, ":")
-  final val EQUALS = 75;           enter(EQUALS, "=")
-  //final val LARROW = 76;           enter(LARROW, "<-")
-  //final val ARROW = 77;            enter(ARROW, "=>")
-  //final val SUBTYPE = 80;          enter(SUBTYPE, "<:")
-  //final val SUPERTYPE = 81;        enter(SUPERTYPE, ">:")
-  //final val HASH = 82;             enter(HASH, "#")
-  final val AT = 83;               enter(AT, "@")
-  //final val VIEWBOUND = 84;        enter(VIEWBOUND, "<%")
+  //inline val USCORE = 73;           enter(USCORE, "_")
+  inline val COLON = 74;            enter(COLON, ":")
+  inline val EQUALS = 75;           enter(EQUALS, "=")
+  //inline val LARROW = 76;           enter(LARROW, "<-")
+  //inline val ARROW = 77;            enter(ARROW, "=>")
+  //inline val SUBTYPE = 80;          enter(SUBTYPE, "<:")
+  //inline val SUPERTYPE = 81;        enter(SUPERTYPE, ">:")
+  //inline val HASH = 82;             enter(HASH, "#")
+  inline val AT = 83;               enter(AT, "@")
+  //inline val VIEWBOUND = 84;        enter(VIEWBOUND, "<%")
 
   val keywords: TokenSet
 
   def isKeyword(token: Token): Boolean = keywords contains token
 
   /** parentheses */
-  final val LPAREN = 91;           enter(LPAREN, "'('")
-  final val RPAREN = 92;           enter(RPAREN, "')'")
-  final val LBRACKET = 93;         enter(LBRACKET, "'['")
-  final val RBRACKET = 94;         enter(RBRACKET, "']'")
-  final val LBRACE = 95;           enter(LBRACE, "'{'")
-  final val RBRACE = 96;           enter(RBRACE, "'}'")
-  final val INDENT = 97;           enter(INDENT, "indent")
-  final val OUTDENT = 98;          enter(OUTDENT, "unindent")
-
-  final val firstParen = LPAREN
-  final val lastParen = OUTDENT
+  inline val LPAREN = 91;           enter(LPAREN, "'('")
+  inline val RPAREN = 92;           enter(RPAREN, "')'")
+  inline val LBRACKET = 93;         enter(LBRACKET, "'['")
+  inline val RBRACKET = 94;         enter(RBRACKET, "']'")
+  inline val LBRACE = 95;           enter(LBRACE, "'{'")
+  inline val RBRACE = 96;           enter(RBRACE, "'}'")
+  inline val INDENT = 97;           enter(INDENT, "indent")
+  inline val OUTDENT = 98;          enter(OUTDENT, "unindent")
+
+  inline val firstParen = LPAREN
+  inline val lastParen = OUTDENT
 
   def buildKeywordArray(keywords: TokenSet): (Int, Array[Int]) = {
     def start(tok: Token) = tokenString(tok).toTermName.asSimpleName.start
@@ -148,13 +148,13 @@ abstract class TokensCommon {
 }
 
 object Tokens extends TokensCommon {
-  final val minToken = EMPTY
+  inline val minToken = EMPTY
   final def maxToken: Int = XMLSTART
 
-  final val INTERPOLATIONID = 12;  enter(INTERPOLATIONID, "string interpolator")
-  final val QUOTEID = 13;          enter(QUOTEID, "quoted identifier") // TODO: deprecate
+  inline val INTERPOLATIONID = 12;  enter(INTERPOLATIONID, "string interpolator")
+  inline val QUOTEID = 13;          enter(QUOTEID, "quoted identifier") // TODO: deprecate
 
-  final val BACKQUOTED_IDENT = 15; enter(BACKQUOTED_IDENT, "identifier", "backquoted ident")
+  inline val BACKQUOTED_IDENT = 15; enter(BACKQUOTED_IDENT, "identifier", "backquoted ident")
 
   final val identifierTokens: TokenSet = BitSet(IDENTIFIER, BACKQUOTED_IDENT)
 
@@ -162,52 +162,53 @@ object Tokens extends TokensCommon {
     token >= IDENTIFIER && token <= BACKQUOTED_IDENT
 
   /** alphabetic keywords */
-  final val WITH = 26;             enter(WITH, "with")
-  final val CASE = 28;             enter(CASE, "case")
-  final val CASECLASS = 29;        enter(CASECLASS, "case class")
-  final val CASEOBJECT = 30;       enter(CASEOBJECT, "case object")
-  final val VAL = 31;              enter(VAL, "val")
-  final val IMPLICIT = 37;         enter(IMPLICIT, "implicit")
-  final val VAR = 38;              enter(VAR, "var")
-  final val DEF = 39;              enter(DEF, "def")
-  final val TYPE = 40;             enter(TYPE, "type")
-  final val OBJECT = 44;           enter(OBJECT, "object")
-  final val YIELD = 48;            enter(YIELD, "yield")
-  final val TRAIT = 50;            enter(TRAIT, "trait")
-  final val SEALED = 51;           enter(SEALED, "sealed")
-  final val MATCH = 58;            enter(MATCH, "match")
-  final val LAZY = 59;             enter(LAZY, "lazy")
-  final val THEN = 60;             enter(THEN, "then")
-  final val FORSOME = 61;          enter(FORSOME, "forSome") // TODO: deprecate
-  final val ENUM = 62;             enter(ENUM, "enum")
-  final val GIVEN = 63;            enter(GIVEN, "given")
-  final val EXPORT = 64;           enter(EXPORT, "export")
-  final val MACRO = 65;            enter(MACRO, "macro") // TODO: remove
+  inline val WITH = 26;             enter(WITH, "with")
+  inline val CASE = 28;             enter(CASE, "case")
+  inline val CASECLASS = 29;        enter(CASECLASS, "case class")
+  inline val CASEOBJECT = 30;       enter(CASEOBJECT, "case object")
+  inline val VAL = 31;              enter(VAL, "val")
+  inline val IMPLICIT = 37;         enter(IMPLICIT, "implicit")
+  inline val VAR = 38;              enter(VAR, "var")
+  inline val DEF = 39;              enter(DEF, "def")
+  inline val TYPE = 40;             enter(TYPE, "type")
+  inline val OBJECT = 44;           enter(OBJECT, "object")
+  inline val YIELD = 48;            enter(YIELD, "yield")
+  inline val TRAIT = 50;            enter(TRAIT, "trait")
+  inline val SEALED = 51;           enter(SEALED, "sealed")
+  inline val MATCH = 58;            enter(MATCH, "match")
+  inline val LAZY = 59;             enter(LAZY, "lazy")
+  inline val THEN = 60;             enter(THEN, "then")
+  inline val FORSOME = 61;          enter(FORSOME, "forSome") // TODO: deprecate
+  inline val ENUM = 62;             enter(ENUM, "enum")
+  inline val GIVEN = 63;            enter(GIVEN, "given")
+  inline val EXPORT = 64;           enter(EXPORT, "export")
+  inline val MACRO = 65;            enter(MACRO, "macro") // TODO: remove
+  inline val END = 66;              enter(END, "end")
 
   /** special symbols */
-  final val NEWLINE = 78;          enter(NEWLINE, "end of statement", "new line")
-  final val NEWLINES = 79;         enter(NEWLINES, "end of statement", "new lines")
+  inline val NEWLINE = 78;          enter(NEWLINE, "end of statement", "new line")
+  inline val NEWLINES = 79;         enter(NEWLINES, "end of statement", "new lines")
 
   /** special keywords */
-  final val USCORE = 73;           enter(USCORE, "_")
-  final val LARROW = 76;           enter(LARROW, "<-")
-  final val ARROW = 77;            enter(ARROW, "=>")
-  final val SUBTYPE = 80;          enter(SUBTYPE, "<:")
-  final val SUPERTYPE = 81;        enter(SUPERTYPE, ">:")
-  final val HASH = 82;             enter(HASH, "#")
-  final val VIEWBOUND = 84;        enter(VIEWBOUND, "<%")
-  final val TLARROW = 85;          enter(TLARROW, "=>>")
-  final val CTXARROW = 86;         enter(CTXARROW, "?=>")
+  inline val USCORE = 73;           enter(USCORE, "_")
+  inline val LARROW = 76;           enter(LARROW, "<-")
+  inline val ARROW = 77;            enter(ARROW, "=>")
+  inline val SUBTYPE = 80;          enter(SUBTYPE, "<:")
+  inline val SUPERTYPE = 81;        enter(SUPERTYPE, ">:")
+  inline val HASH = 82;             enter(HASH, "#")
+  inline val VIEWBOUND = 84;        enter(VIEWBOUND, "<%")
+  inline val TLARROW = 85;          enter(TLARROW, "=>>")
+  inline val CTXARROW = 86;         enter(CTXARROW, "?=>")
 
-  final val QUOTE = 87;            enter(QUOTE, "'")
+  inline val QUOTE = 87;            enter(QUOTE, "'")
 
-  final val COLONEOL = 88;         enter(COLONEOL, ":", ": at eol")
-  final val SELFARROW = 89;        enter(SELFARROW, "=>") // reclassified ARROW following self-type
+  inline val COLONEOL = 88;         enter(COLONEOL, ":", ": at eol")
+  inline val SELFARROW = 89;        enter(SELFARROW, "=>") // reclassified ARROW following self-type
 
   /** XML mode */
-  final val XMLSTART = 99;         enter(XMLSTART, "$XMLSTART$<") // TODO: deprecate
+  inline val XMLSTART = 99;         enter(XMLSTART, "$XMLSTART$<") // TODO: deprecate
 
-  final val alphaKeywords: TokenSet = tokenRange(IF, MACRO)
+  final val alphaKeywords: TokenSet = tokenRange(IF, END)
   final val symbolicKeywords: TokenSet = tokenRange(USCORE, CTXARROW)
   final val keywords: TokenSet = alphaKeywords | symbolicKeywords
 
@@ -254,9 +255,9 @@ object Tokens extends TokensCommon {
   final val mustStartStatTokens: TokenSet = defIntroTokens | modifierTokens | BitSet(IMPORT, EXPORT, PACKAGE)
 
   final val canStartStatTokens2: TokenSet = canStartExprTokens2 | mustStartStatTokens | BitSet(
-    AT, CASE)
+    AT, CASE, END) // END is included since it might be tested before being converted back to IDENTIFIER
   final val canStartStatTokens3: TokenSet = canStartExprTokens3 | mustStartStatTokens | BitSet(
-    AT, CASE)
+    AT, CASE, END)
 
   final val canEndStatTokens: TokenSet = atomicExprTokens | BitSet(TYPE, GIVEN, RPAREN, RBRACE, RBRACKET, OUTDENT)
 
diff --git a/compiler/src/dotty/tools/dotc/plugins/Plugins.scala b/compiler/src/dotty/tools/dotc/plugins/Plugins.scala
index a4db7ef44a86..14cb83fb6c6c 100644
--- a/compiler/src/dotty/tools/dotc/plugins/Plugins.scala
+++ b/compiler/src/dotty/tools/dotc/plugins/Plugins.scala
@@ -3,7 +3,7 @@ package plugins
 
 import core._
 import Contexts._
-import config.{ PathResolver, Properties }
+import config.{ PathResolver, Feature }
 import dotty.tools.io._
 import Phases._
 import config.Printers.plugins.{ println => debug }
@@ -125,7 +125,7 @@ trait Plugins {
     val updatedPlan = Plugins.schedule(plan, pluginPhases)
 
     // add research plugins
-    if (Properties.experimental)
+    if (Feature.isExperimentalEnabled)
       plugins.collect { case p: ResearchPlugin => p }.foldRight(updatedPlan) {
         (plug, plan) => plug.init(options(plug), plan)
       }
diff --git a/compiler/src/dotty/tools/dotc/printing/Formatting.scala b/compiler/src/dotty/tools/dotc/printing/Formatting.scala
index be25469c549d..845283f69a0f 100644
--- a/compiler/src/dotty/tools/dotc/printing/Formatting.scala
+++ b/compiler/src/dotty/tools/dotc/printing/Formatting.scala
@@ -36,7 +36,7 @@ object Formatting {
               case _ => ex.getMessage
             s"[cannot display due to $msg, raw string = ${arg.toString}]"
         }
-      case _ => arg.toString
+      case _ => String.valueOf(arg)
     }
 
     private def treatArg(arg: Any, suffix: String)(using Context): (Any, String) = arg match {
diff --git a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala
index 618f7be6dac3..157b424b6251 100644
--- a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala
+++ b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala
@@ -12,7 +12,6 @@ import typer.Implicits._
 import typer.ImportInfo
 import Variances.varianceSign
 import util.SourcePosition
-import java.lang.Integer.toOctalString
 import scala.util.control.NonFatal
 import scala.annotation.switch
 
@@ -30,6 +29,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
   protected def maxToTextRecursions: Int = 100
 
   protected def showUniqueIds = ctx.settings.uniqid.value || Printer.debugPrintUnique
+  protected def showNestingLevel = ctx.settings.YprintLevel.value
 
   protected final def limiter: MessageLimiter = ctx.property(MessageLimiter).get
 
@@ -66,6 +66,8 @@ class PlainPrinter(_ctx: Context) extends Printer {
         case tp @ AppliedType(tycon, args) =>
           if (defn.isCompiletimeAppliedType(tycon.typeSymbol)) tp.tryCompiletimeConstantFold
           else tycon.dealias.appliedTo(args)
+        case tp: NamedType =>
+          tp.reduceProjection
         case _ =>
           tp
       }
@@ -156,7 +158,12 @@ class PlainPrinter(_ctx: Context) extends Printer {
       case tp: TermParamRef =>
         ParamRefNameString(tp) ~ lambdaHash(tp.binder) ~ ".type"
       case tp: TypeParamRef =>
-        ParamRefNameString(tp) ~ lambdaHash(tp.binder)
+        val suffix =
+          if showNestingLevel then
+            val tvar = ctx.typerState.constraint.typeVarOfParam(tp)
+            if tvar.exists then s"#${tvar.asInstanceOf[TypeVar].nestingLevel.toString}" else ""
+          else ""
+        ParamRefNameString(tp) ~ lambdaHash(tp.binder) ~ suffix
       case tp: SingletonType =>
         toTextSingleton(tp)
       case AppliedType(tycon, args) =>
@@ -178,13 +185,14 @@ class PlainPrinter(_ctx: Context) extends Printer {
       case MatchType(bound, scrutinee, cases) =>
         changePrec(GlobalPrec) {
           def caseText(tp: Type): Text = tp match {
+            case tp: HKTypeLambda => caseText(tp.resultType)
             case defn.MatchCase(pat, body) => "case " ~ toText(pat) ~ " => " ~ toText(body)
             case _ => "case " ~ toText(tp)
           }
           def casesText = Text(cases.map(caseText), "\n")
-            atPrec(InfixPrec) { toText(scrutinee) } ~
-            keywordStr(" match ") ~ "{" ~ casesText ~ "}" ~
-            (" <: " ~ toText(bound) provided !bound.isAny)
+          atPrec(InfixPrec) { toText(scrutinee) } ~
+          keywordStr(" match ") ~ "{" ~ casesText ~ "}" ~
+          (" <: " ~ toText(bound) provided !bound.isAny)
         }.close
       case tp: PreviousErrorType if ctx.settings.XprintTypes.value =>
         "<error>" // do not print previously reported error message because they may try to print this error type again recuresevely
@@ -219,7 +227,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
           toTextGlobal(tp.resultType)
         }
       case AnnotatedType(tpe, annot) =>
-        if annot.symbol == defn.InlineParamAnnot then toText(tpe)
+        if annot.symbol == defn.InlineParamAnnot || annot.symbol == defn.ErasedParamAnnot then toText(tpe)
         else toTextLocal(tpe) ~ " " ~ toText(annot)
       case tp: TypeVar =>
         if (tp.isInstantiated)
@@ -252,11 +260,11 @@ class PlainPrinter(_ctx: Context) extends Printer {
 
   protected def paramsText(lam: LambdaType): Text = {
     def paramText(name: Name, tp: Type) =
-      toText(name) ~ lambdaHash(lam) ~ toTextRHS(tp)
+      toText(name) ~ lambdaHash(lam) ~ toTextRHS(tp, isParameter = true)
     Text(lam.paramNames.lazyZip(lam.paramInfos).map(paramText), ", ")
   }
 
-  protected def ParamRefNameString(name: Name): String = name.toString
+  protected def ParamRefNameString(name: Name): String = nameString(name)
 
   protected def ParamRefNameString(param: ParamRef): String =
     ParamRefNameString(param.binder.paramNames(param.paramNum))
@@ -271,9 +279,13 @@ class PlainPrinter(_ctx: Context) extends Printer {
       catch { case ex: NullPointerException => "" }
     else ""
 
-  /** If -uniqid is set, the unique id of symbol, after a # */
+  /** A string to append to a symbol composed of:
+   *  - if -uniqid is set, its unique id after a #.
+   *  - if -Yprint-level, its nesting level after a %.
+   */
   protected def idString(sym: Symbol): String =
-    if (showUniqueIds || Printer.debugPrintUnique) "#" + sym.id else ""
+    (if (showUniqueIds || Printer.debugPrintUnique) "#" + sym.id else "") +
+    (if (showNestingLevel) "%" + sym.nestingLevel else "")
 
   def nameString(sym: Symbol): String =
     simpleNameString(sym) + idString(sym) // + "<" + (if (sym.exists) sym.owner else "") + ">"
@@ -348,15 +360,17 @@ class PlainPrinter(_ctx: Context) extends Printer {
     case None => "?"
   }
 
-  protected def decomposeLambdas(bounds: TypeBounds): (String, TypeBounds) =
-    def decompose(tp: Type) = tp.stripTypeVar match
+  protected def decomposeLambdas(bounds: TypeBounds): (Text, TypeBounds) =
+    def decompose(tp: Type): (Text, Type) = tp.stripTypeVar match
       case lam: HKTypeLambda =>
         val names =
           if lam.isDeclaredVarianceLambda then
             lam.paramNames.lazyZip(lam.declaredVariances).map((name, v) =>
               varianceSign(v) + name)
-          else lam.paramNames
-        (names.mkString("[", ", ", "]"), lam.resType)
+          else lam.paramNames.map(_.toString)
+        val infos = lam.paramInfos.map(toText)
+        val tparams = names.zip(infos).map(_ ~ _)
+        ("[" ~ Text(tparams, ",") ~ "]", lam.resType)
       case _ =>
         ("", tp)
     bounds match
@@ -370,7 +384,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
   end decomposeLambdas
 
   /** String representation of a definition's type following its name */
-  protected def toTextRHS(tp: Type): Text = controlled {
+  protected def toTextRHS(tp: Type, isParameter: Boolean = false): Text = controlled {
     homogenize(tp) match {
       case tp: TypeBounds =>
         val (tparamStr, rhs) = decomposeLambdas(tp)
@@ -400,7 +414,12 @@ class PlainPrinter(_ctx: Context) extends Printer {
       case mt: MethodType =>
         toTextGlobal(mt)
       case tp: ExprType =>
-        ": => " ~ toTextGlobal(tp.widenExpr)
+        // parameterless methods require special treatment, see #11201
+        (if (isParameter) ": => " else ": ") ~ toTextGlobal(tp.widenExpr)
+      case tp: PolyType =>
+        "[" ~ paramsText(tp) ~ "]"
+        ~ (Str(": ") provided !tp.resultType.isInstanceOf[MethodType])
+        ~ toTextGlobal(tp.resultType)
       case tp =>
         ": " ~ toTextGlobal(tp)
     }
@@ -523,7 +542,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
     case '"' => "\\\""
     case '\'' => "\\\'"
     case '\\' => "\\\\"
-    case _ => if (ch.isControl) "\\0" + toOctalString(ch) else String.valueOf(ch)
+    case _ => if ch.isControl then f"${"\\"}u${ch.toInt}%04x" else String.valueOf(ch)
   }
 
   def toText(const: Constant): Text = const.tag match {
@@ -536,7 +555,16 @@ class PlainPrinter(_ctx: Context) extends Printer {
     case _ => literalText(String.valueOf(const.value))
   }
 
-  def toText(annot: Annotation): Text = s"@${annot.symbol.name}" // for now
+  /** Usual target for `Annotation#toText`, overridden in RefinedPrinter */
+  def annotText(annot: Annotation): Text = s"@${annot.symbol.name}"
+
+  def toText(annot: Annotation): Text = annot.toText(this)
+
+  def toText(param: LambdaParam): Text =
+    varianceSign(param.paramVariance)
+    ~ toText(param.paramName)
+    ~ (if param.isTypeParam then "" else ": ")
+    ~ toText(param.paramInfo)
 
   protected def escapedString(str: String): String = str flatMap escapedChar
 
@@ -561,7 +589,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
         Text()
 
     nodeName ~ "(" ~ elems ~ tpSuffix ~ ")" ~ (Str(tree.sourcePos.toString) provided printDebug)
-  }.close // todo: override in refined printer
+  }.close
 
   def toText(pos: SourcePosition): Text =
     if (!pos.exists) "<no position>"
@@ -591,6 +619,47 @@ class PlainPrinter(_ctx: Context) extends Printer {
       case _ => "{...}"
     s"import $exprStr.$selectorStr"
 
+  def toText(c: OrderingConstraint): Text =
+    val savedConstraint = ctx.typerState.constraint
+    try
+      // The current TyperState constraint determines how type variables are printed
+      ctx.typerState.constraint = c
+      def entryText(tp: Type) = tp match {
+        case tp: TypeBounds =>
+          toText(tp)
+        case _ =>
+          " := " ~ toText(tp)
+      }
+      val indent = 3
+      val uninstVarsText = " uninstantiated variables: " ~
+        Text(c.uninstVars.map(toText), ", ")
+      val constrainedText =
+        " constrained types: " ~ Text(c.domainLambdas.map(toText), ", ")
+      val boundsText =
+        " bounds: " ~ {
+          val assocs =
+            for (param <- c.domainParams)
+            yield (" " * indent) ~ toText(param) ~ entryText(c.entry(param))
+          Text(assocs, "\n")
+        }
+      val orderingText =
+        " ordering: " ~ {
+          val deps =
+            for {
+              param <- c.domainParams
+              ups = c.minUpper(param)
+              if ups.nonEmpty
+            }
+            yield
+              (" " * indent) ~ toText(param) ~ " <: " ~
+                Text(ups.map(toText), ", ")
+          Text(deps, "\n")
+        }
+      //Printer.debugPrintUnique = false
+      Text.lines(List(uninstVarsText, constrainedText, boundsText, orderingText))
+    finally
+      ctx.typerState.constraint = savedConstraint
+
   def plain: PlainPrinter = this
 
   protected def keywordStr(text: String): String = coloredStr(text, SyntaxHighlighting.KeywordColor)
diff --git a/compiler/src/dotty/tools/dotc/printing/Printer.scala b/compiler/src/dotty/tools/dotc/printing/Printer.scala
index 8584c889eeda..550bdb94af4f 100644
--- a/compiler/src/dotty/tools/dotc/printing/Printer.scala
+++ b/compiler/src/dotty/tools/dotc/printing/Printer.scala
@@ -4,7 +4,8 @@ package printing
 
 import core._
 import Texts._, ast.Trees._
-import Types.{Type, SingletonType}, Symbols.Symbol, Scopes.Scope, Constants.Constant,
+import Types.{Type, SingletonType, LambdaParam},
+       Symbols.Symbol, Scopes.Scope, Constants.Constant,
        Names.Name, Denotations._, Annotations.Annotation
 import typer.Implicits.SearchResult
 import util.SourcePosition
@@ -118,6 +119,9 @@ abstract class Printer {
   /** A description of sym's location */
   def extendedLocationText(sym: Symbol): Text
 
+  /** Textual description of regular annotation in terms of its tree */
+  def annotText(annot: Annotation): Text
+
   /** Textual representation of denotation */
   def toText(denot: Denotation): Text
 
@@ -130,6 +134,9 @@ abstract class Printer {
   /** Textual representation of type */
   def toText(tp: Type): Text
 
+  /** Textual representation of lambda param */
+  def toText(tree: LambdaParam): Text
+
   /** Textual representation of all symbols in given list,
    *  using `dclText` for displaying each.
    */
@@ -150,6 +157,9 @@ abstract class Printer {
   /** Textual representation of info relating to an import clause */
   def toText(result: ImportInfo): Text
 
+  /** Textual representation of a constraint */
+  def toText(c: OrderingConstraint): Text
+
   /** Render element within highest precedence */
   def toTextLocal(elem: Showable): Text =
     atPrec(DotPrec) { elem.toText(this) }
diff --git a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala
index cf60a152547b..cf5942a178f0 100644
--- a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala
+++ b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala
@@ -1,4 +1,5 @@
-package dotty.tools.dotc
+package dotty.tools
+package dotc
 package printing
 
 import core._
@@ -20,6 +21,7 @@ import typer.ProtoTypes._
 import Trees._
 import TypeApplications._
 import Decorators._
+import NameKinds.{WildcardParamName, DefaultGetterName}
 import util.Chars.isOperatorPart
 import transform.TypeUtils._
 import transform.SymUtils._
@@ -76,9 +78,10 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   }
 
   override def nameString(name: Name): String =
-    if ctx.settings.YdebugNames.value
-    then name.debugString
-    else super.nameString(name)
+    def strippedName = if printDebug then name else name.stripModuleClassSuffix
+    if ctx.settings.YdebugNames.value then strippedName.debugString
+    else if name.isTypeName && name.is(WildcardParamName) && !printDebug then "_"
+    else super.nameString(strippedName)
 
   override protected def simpleNameString(sym: Symbol): String =
     nameString(if (ctx.property(XprintMode).isEmpty) sym.initial.name else sym.name)
@@ -105,15 +108,16 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
 
   override def toTextPrefix(tp: Type): Text = controlled {
     def isOmittable(sym: Symbol) =
-      if (printDebug) false
-      else if (homogenizedView) isEmptyPrefix(sym) // drop <root> and anonymous classes, but not scala, Predef.
+      if printDebug then false
+      else if homogenizedView then isEmptyPrefix(sym) // drop <root> and anonymous classes, but not scala, Predef.
+      else if sym.isPackageObject then isOmittablePrefix(sym.owner)
       else isOmittablePrefix(sym)
     tp match {
       case tp: ThisType if isOmittable(tp.cls) =>
         ""
       case tp @ TermRef(pre, _) =>
         val sym = tp.symbol
-        if (sym.isPackageObject && !homogenizedView) toTextPrefix(pre)
+        if sym.isPackageObject && !homogenizedView && !printDebug then toTextPrefix(pre)
         else if (isOmittable(sym)) ""
         else super.toTextPrefix(tp)
       case _ => super.toTextPrefix(tp)
@@ -143,7 +147,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       changePrec(GlobalPrec) {
         val argStr: Text =
           if args.length == 2
-             && !defn.isTupleType(args.head)
+             && !defn.isTupleNType(args.head)
              && !isGiven && !isErased
           then
             atPrec(InfixPrec) { argText(args.head) }
@@ -155,22 +159,41 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
         argStr ~ " " ~ arrow(isGiven) ~ " " ~ argText(args.last)
       }
 
-    def toTextDependentFunction(appType: MethodType): Text =
-      "("
-      ~ keywordText("erased ").provided(appType.isErasedMethod)
-      ~ paramsText(appType)
-      ~ ") "
-      ~ arrow(appType.isImplicitMethod)
-      ~ " "
-      ~ toText(appType.resultType)
+    def toTextMethodAsFunction(info: Type): Text = info match
+      case info: MethodType =>
+        changePrec(GlobalPrec) {
+          "("
+          ~ keywordText("erased ").provided(info.isErasedMethod)
+          ~ ( if info.isParamDependent || info.isResultDependent
+              then paramsText(info)
+              else argsText(info.paramInfos)
+            )
+          ~ ") "
+          ~ arrow(info.isImplicitMethod)
+          ~ " "
+          ~ toTextMethodAsFunction(info.resultType)
+        }
+      case info: PolyType =>
+        changePrec(GlobalPrec) {
+          "["
+          ~ paramsText(info)
+          ~ "] => "
+          ~ toTextMethodAsFunction(info.resultType)
+        }
+      case _ =>
+        toText(info)
 
-    def isInfixType(tp: Type): Boolean = tp match {
+    def isInfixType(tp: Type): Boolean = tp match
       case AppliedType(tycon, args) =>
-        args.length == 2 &&
-        tycon.typeSymbol.getAnnotation(defn.ShowAsInfixAnnot).map(_.argumentConstant(0).forall(_.booleanValue))
-          .getOrElse(!Character.isUnicodeIdentifierStart(tycon.typeSymbol.name.toString.head))
+        args.length == 2
+        && {
+          val sym = tycon.typeSymbol
+          sym.is(Infix)
+          || sym.getAnnotation(defn.ShowAsInfixAnnot)
+              .exists(_.argumentConstant(0).forall(_.booleanValue))
+          || !Character.isUnicodeIdentifierStart(tycon.typeSymbol.name.toString.head)
+        }
       case _ => false
-    }
 
     def tyconName(tp: Type): Name = tp.typeSymbol.name
     def checkAssocMismatch(tp: Type, isRightAssoc: Boolean) = tp match {
@@ -222,8 +245,10 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       if !printDebug && appliedText(tp.asInstanceOf[HKLambda].resType).isEmpty =>
         // don't eta contract if the application would be printed specially
         toText(tycon)
-      case tp: RefinedType if defn.isFunctionType(tp) && !printDebug =>
-        toTextDependentFunction(tp.refinedInfo.asInstanceOf[MethodType])
+      case tp: RefinedType
+      if (defn.isFunctionType(tp) || (tp.parent.typeSymbol eq defn.PolyFunctionClass))
+          && !printDebug =>
+        toTextMethodAsFunction(tp.refinedInfo)
       case tp: TypeRef =>
         if (tp.symbol.isAnonymousClass && !showUniqueIds)
           toText(tp.info)
@@ -237,9 +262,16 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       case ErasedValueType(tycon, underlying) =>
         "ErasedValueType(" ~ toText(tycon) ~ ", " ~ toText(underlying) ~ ")"
       case tp: ClassInfo =>
+        if tp.cls.derivesFrom(defn.PolyFunctionClass) then
+          tp.member(nme.apply).info match
+            case info: PolyType => return toTextMethodAsFunction(info)
+            case _ =>
         toTextParents(tp.parents) ~~ "{...}"
       case JavaArrayType(elemtp) =>
         toText(elemtp) ~ "[]"
+      case tp: LazyRef if !printDebug =>
+        try toText(tp.ref)
+        catch case ex: Throwable => "..."
       case tp: SelectionProto =>
         "?{ " ~ toText(tp.name) ~
            (Str(" ") provided !tp.name.toSimpleName.last.isLetterOrDigit) ~
@@ -490,6 +522,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
         "<derived typetree watching " ~ tpt.watched.showSummary() ~ ">"
       case TypeTree() =>
         typeText(toText(tree.typeOpt))
+        ~ Str("(inf)").provided(tree.isInstanceOf[InferredTypeTree] && printDebug)
       case SingletonTypeTree(ref) =>
         toTextLocal(ref) ~ "." ~ keywordStr("type")
       case RefinedTypeTree(tpt, refines) =>
@@ -499,6 +532,9 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
           changePrec(OrTypePrec) { toText(args(0)) ~ " | " ~ atPrec(OrTypePrec + 1) { toText(args(1)) } }
         else if (tpt.symbol == defn.andType && args.length == 2)
           changePrec(AndTypePrec) { toText(args(0)) ~ " & " ~ atPrec(AndTypePrec + 1) { toText(args(1)) } }
+        else if defn.isFunctionClass(tpt.symbol)
+            && tpt.isInstanceOf[TypeTree] && tree.hasType && !printDebug
+        then changePrec(GlobalPrec) { toText(tree.typeOpt) }
         else args match
           case arg :: _ if arg.isTerm =>
             toTextLocal(tpt) ~ "(" ~ Text(args.map(argText), ", ") ~ ")"
@@ -571,7 +607,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       case tree: Template =>
         toTextTemplate(tree)
       case Annotated(arg, annot) =>
-        toTextLocal(arg) ~~ annotText(annot)
+        toTextLocal(arg) ~~ annotText(annot.symbol.enclosingClass, annot)
       case EmptyTree =>
         "<empty>"
       case TypedSplice(t) =>
@@ -663,6 +699,10 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
         "Thicket {" ~~ toTextGlobal(trees, "\n") ~~ "}"
       case MacroTree(call) =>
         keywordStr("macro ") ~ toTextGlobal(call)
+      case Hole(isTermHole, idx, args) =>
+        val (prefix, postfix) = if isTermHole then ("{{{ ", " }}}") else ("[[[ ", " ]]]")
+        val argsText = toTextGlobal(args, ", ")
+        prefix ~~ idx.toString ~~ "|" ~~ argsText ~~ postfix
       case _ =>
         tree.fallbackToText(this)
     }
@@ -758,7 +798,15 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   protected def optAscription[T >: Untyped](tpt: Tree[T]): Text = optText(tpt)(": " ~ _)
 
   private def idText(tree: untpd.Tree): Text =
-    if showUniqueIds && tree.hasType && tree.symbol.exists then s"#${tree.symbol.id}" else ""
+    (if showUniqueIds && tree.hasType && tree.symbol.exists then s"#${tree.symbol.id}" else "") ~
+    (if showNestingLevel then tree.typeOpt match
+      case tp: NamedType if !tp.symbol.isStatic => s"%${tp.symbol.nestingLevel}"
+      case tp: TypeVar => s"%${tp.nestingLevel}"
+      case tp: TypeParamRef => ctx.typerState.constraint.typeVarOfParam(tp) match
+        case tvar: TypeVar => s"%${tvar.nestingLevel}"
+        case _ => ""
+      case _ => ""
+     else "")
 
   private def useSymbol(tree: untpd.Tree) =
     tree.hasType && tree.symbol.exists && ctx.settings.YprintSyms.value
@@ -924,14 +972,22 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
     keywordStr("package ") ~ toTextPackageId(tree.pid) ~ bodyText
   }
 
+  /** Textual representation of an instance creation expression without the leading `new` */
   protected def constrText(tree: untpd.Tree): Text = toTextLocal(tree).stripPrefix(keywordStr("new ")) // DD
 
-  protected def annotText(tree: untpd.Tree): Text = "@" ~ constrText(tree) // DD
-
-  override def annotsText(sym: Symbol): Text =
-    Text(sym.annotations.map(ann =>
-      if ann.symbol == defn.BodyAnnot then Str(simpleNameString(ann.symbol))
-      else annotText(ann.tree)))
+  protected def annotText(sym: Symbol, tree: untpd.Tree): Text =
+    def recur(t: untpd.Tree): Text = t match
+      case Apply(fn, Nil) => recur(fn)
+      case Apply(fn, args) =>
+        val explicitArgs = args.filterNot(_.symbol.name.is(DefaultGetterName))
+        recur(fn) ~ "(" ~ toTextGlobal(explicitArgs, ", ") ~ ")"
+      case TypeApply(fn, args) => recur(fn) ~ "[" ~ toTextGlobal(args, ", ") ~ "]"
+      case Select(qual, nme.CONSTRUCTOR) => recur(qual)
+      case New(tpt) => recur(tpt)
+      case _ =>
+        val annotSym = sym.orElse(tree.symbol.enclosingClass)
+        s"@${if annotSym.exists then annotSym.name.toString else t.show}"
+    recur(tree)
 
   protected def modText(mods: untpd.Modifiers, sym: Symbol, kw: String, isType: Boolean): Text = { // DD
     val suppressKw = if (enclDefIsClass) mods.isAllOf(LocalParam) else mods.is(Param)
@@ -944,12 +1000,16 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
     if (rawFlags.is(Param)) flagMask = flagMask &~ Given &~ Erased
     val flags = rawFlags & flagMask
     var flagsText = toTextFlags(sym, flags)
-    val annotations =
-      if (sym.exists) sym.annotations.filterNot(ann => dropAnnotForModText(ann.symbol)).map(_.tree)
-      else mods.annotations.filterNot(tree => dropAnnotForModText(tree.symbol))
-    Text(annotations.map(annotText), " ") ~~ flagsText ~~ (Str(kw) provided !suppressKw)
+    val annotTexts =
+      if sym.exists then
+        sym.annotations.filterNot(ann => dropAnnotForModText(ann.symbol)).map(toText)
+      else
+        mods.annotations.filterNot(tree => dropAnnotForModText(tree.symbol)).map(annotText(NoSymbol, _))
+    Text(annotTexts, " ") ~~ flagsText ~~ (Str(kw) provided !suppressKw)
   }
 
+  override def annotText(annot: Annotation): Text = annotText(annot.symbol, annot.tree)
+
   def optText(name: Name)(encl: Text => Text): Text =
     if (name.isEmpty) "" else encl(toText(name))
 
@@ -959,9 +1019,6 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   def optText[T >: Untyped](tree: List[Tree[T]])(encl: Text => Text): Text =
     if (tree.exists(!_.isEmpty)) encl(blockText(tree)) else ""
 
-  override protected def ParamRefNameString(name: Name): String =
-    name.toString
-
   override protected def treatAsTypeParam(sym: Symbol): Boolean = sym.is(TypeParam)
 
   override protected def treatAsTypeArg(sym: Symbol): Boolean =
diff --git a/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala b/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala
index cce2c6d00859..623f540bd721 100644
--- a/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala
+++ b/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala
@@ -17,7 +17,7 @@ import java.util.Arrays
 object SyntaxHighlighting {
 
   /** if true, log erroneous positions being highlighted */
-  private final val debug = true
+  private inline val debug = true
 
   // Keep in sync with SyntaxHighlightingTests
   val NoColor: String         = Console.RESET
diff --git a/compiler/src/dotty/tools/dotc/printing/Texts.scala b/compiler/src/dotty/tools/dotc/printing/Texts.scala
index 7df464ae74b8..9a3aac39ed18 100644
--- a/compiler/src/dotty/tools/dotc/printing/Texts.scala
+++ b/compiler/src/dotty/tools/dotc/printing/Texts.scala
@@ -106,11 +106,13 @@ object Texts {
       case Str(s, lines) =>
         if (numberWidth != 0) {
           val ln = lines.show
-          val pad = (numberWidth - ln.length - 1)
-          assert(pad >= 0)
-          sb.append(" " * pad)
-          sb.append(ln)
-          sb.append("|")
+          if (ln.nonEmpty) {
+            val pad = (numberWidth - ln.length - 1)
+            assert(pad >= 0)
+            sb.append(" " * pad)
+            sb.append(ln)
+            sb.append("|")
+          }
         }
         sb.append(s)
       case _ =>
diff --git a/compiler/src/dotty/tools/dotc/quoted/MacroExpansion.scala b/compiler/src/dotty/tools/dotc/quoted/MacroExpansion.scala
index 90a208814f2a..628afe4504bd 100644
--- a/compiler/src/dotty/tools/dotc/quoted/MacroExpansion.scala
+++ b/compiler/src/dotty/tools/dotc/quoted/MacroExpansion.scala
@@ -14,6 +14,6 @@ object MacroExpansion {
     ctx.property(MacroExpansionPosition)
 
   def context(inlinedFrom: tpd.Tree)(using Context): Context =
-    ctx.fresh.setProperty(MacroExpansionPosition, SourcePosition(inlinedFrom.source, inlinedFrom.span)).setTypeAssigner(new Typer).withSource(inlinedFrom.source)
+    QuotesCache.init(ctx.fresh).setProperty(MacroExpansionPosition, SourcePosition(inlinedFrom.source, inlinedFrom.span)).setTypeAssigner(new Typer(ctx.nestingLevel + 1)).withSource(inlinedFrom.source)
 }
 
diff --git a/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala b/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala
index fd118eb43bb5..8c72177a76d0 100644
--- a/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala
+++ b/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala
@@ -11,7 +11,6 @@ import dotty.tools.dotc.core.NameKinds
 import dotty.tools.dotc.core.Mode
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types._
-import dotty.tools.dotc.core.tasty.TreePickler.Hole
 import dotty.tools.dotc.core.tasty.{ PositionPickler, TastyPickler, TastyPrinter }
 import dotty.tools.dotc.core.tasty.DottyUnpickler
 import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
@@ -92,11 +91,6 @@ object PickledQuotes {
               val quotedType = typeHole(idx, reifiedArgs)
               PickledQuotes.quotedTypeToTree(quotedType)
           }
-        case tree: Select =>
-          // Retain selected members
-          val qual = transform(tree.qualifier)
-          qual.select(tree.symbol).withSpan(tree.span)
-
         case tree =>
           if tree.isDef then
             tree.symbol.annotations = tree.symbol.annotations.map {
@@ -175,31 +169,44 @@ object PickledQuotes {
       positionWarnings.foreach(report.warning(_))
 
     val pickled = pickler.assembleParts()
-    quotePickling.println(s"**** pickled quote\n${TastyPrinter.show(pickled)}")
+    quotePickling.println(s"**** pickled quote\n${TastyPrinter.showContents(pickled, ctx.settings.color.value == "never")}")
     pickled
   }
 
   /** Unpickle TASTY bytes into it's tree */
   private def unpickle(pickled: String | List[String], isType: Boolean)(using Context): Tree = {
-    val bytes = pickled match
-      case pickled: String => TastyString.unpickle(pickled)
-      case pickled: List[String] => TastyString.unpickle(pickled)
+    QuotesCache.getTree(pickled) match
+      case Some(tree) =>
+        quotePickling.println(s"**** Using cached quote for TASTY\n$tree")
+        treeOwner(tree) match
+          case Some(owner) =>
+            // Copy the cached tree to make sure the all definitions are unique.
+            TreeTypeMap(oldOwners = List(owner), newOwners = List(owner)).apply(tree)
+          case _ =>
+            tree
+
+      case _ =>
+        val bytes = pickled match
+          case pickled: String => TastyString.unpickle(pickled)
+          case pickled: List[String] => TastyString.unpickle(pickled)
 
-    quotePickling.println(s"**** unpickling quote from TASTY\n${TastyPrinter.show(bytes)}")
+        quotePickling.println(s"**** unpickling quote from TASTY\n${TastyPrinter.showContents(bytes, ctx.settings.color.value == "never")}")
 
-    val mode = if (isType) UnpickleMode.TypeTree else UnpickleMode.Term
-    val unpickler = new DottyUnpickler(bytes, mode)
-    unpickler.enter(Set.empty)
+        val mode = if (isType) UnpickleMode.TypeTree else UnpickleMode.Term
+        val unpickler = new DottyUnpickler(bytes, ctx.tastyVersion, mode)
+        unpickler.enter(Set.empty)
 
-    val tree = unpickler.tree
+        val tree = unpickler.tree
+        QuotesCache(pickled) = tree
 
-    // Make sure trees and positions are fully loaded
-    new TreeTraverser {
-      def traverse(tree: Tree)(using Context): Unit = traverseChildren(tree)
-    }.traverse(tree)
+        // Make sure trees and positions are fully loaded
+        new TreeTraverser {
+          def traverse(tree: Tree)(using Context): Unit = traverseChildren(tree)
+        }.traverse(tree)
 
-    quotePickling.println(i"**** unpickled quote\n$tree")
-    tree
+        quotePickling.println(i"**** unpickled quote\n$tree")
+
+        tree
   }
 
 }
diff --git a/compiler/src/dotty/tools/dotc/quoted/QuotesCache.scala b/compiler/src/dotty/tools/dotc/quoted/QuotesCache.scala
new file mode 100644
index 000000000000..996eb8a76fbb
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/quoted/QuotesCache.scala
@@ -0,0 +1,28 @@
+package dotty.tools.dotc.quoted
+
+import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.util.Property
+import dotty.tools.dotc.reporting.trace
+import dotty.tools.dotc.ast.tpd
+
+import scala.collection.mutable
+
+object QuotesCache {
+  import tpd._
+
+  /** A key to be used in a context property that caches the unpickled trees */
+  private val QuotesCacheKey = new Property.Key[collection.mutable.Map[String | List[String], Tree]]
+
+
+  /** Get the cached tree of the quote */
+  def getTree(pickled: String | List[String])(using Context): Option[Tree] =
+    ctx.property(QuotesCacheKey).get.get(pickled)
+
+  /** Update the cached tree of the quote */
+  def update(pickled: String | List[String], tree: Tree)(using Context): Unit =
+    ctx.property(QuotesCacheKey).get.update(pickled, tree)
+
+  /** Context with a cache for quote trees and tasty bytes */
+  def init(ctx: FreshContext): ctx.type =
+    ctx.setProperty(QuotesCacheKey, collection.mutable.Map.empty)
+}
diff --git a/compiler/src/dotty/tools/dotc/report.scala b/compiler/src/dotty/tools/dotc/report.scala
index 912ae9af52aa..36c857b94e37 100644
--- a/compiler/src/dotty/tools/dotc/report.scala
+++ b/compiler/src/dotty/tools/dotc/report.scala
@@ -21,15 +21,7 @@ object report:
     ctx.reporter.report(new Info(msg, pos.sourcePos))
 
   private def issueWarning(warning: Warning)(using Context): Unit =
-    if (!ctx.settings.silentWarnings.value)
-      if (ctx.settings.XfatalWarnings.value)
-        warning match {
-          case warning: ConditionalWarning if !warning.enablingOption.value =>
-            ctx.reporter.report(warning) // conditional warnings that are not enabled are not fatal
-          case _ =>
-            ctx.reporter.report(warning.toError)
-        }
-      else ctx.reporter.report(warning)
+    ctx.reporter.report(warning)
 
   def deprecationWarning(msg: Message, pos: SrcPos = NoSourcePosition)(using Context): Unit =
     issueWarning(new DeprecationWarning(msg, pos.sourcePos))
diff --git a/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala b/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala
index c3d6d042e379..0d2292318a71 100644
--- a/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala
@@ -12,32 +12,26 @@ import Diagnostic.{ Error, ConditionalWarning }
 class ConsoleReporter(
   reader: BufferedReader = Console.in,
   writer: PrintWriter = new PrintWriter(Console.err, true)
-) extends AbstractReporter {
+) extends ConsoleReporter.AbstractConsoleReporter {
+  override def printMessage(msg: String): Unit = { writer.print(msg + "\n"); writer.flush() }
+  override def flush()(using Context): Unit    = writer.flush()
 
-  import Diagnostic._
+  override def doReport(dia: Diagnostic)(using Context): Unit = {
+    super.doReport(dia)
+    dia match
+      case dia: Error if ctx.settings.Xprompt.value => Reporter.displayPrompt(reader, writer)
+      case _                                        =>
+  }
+}
 
-  /** Prints the message. */
-  def printMessage(msg: String): Unit = { writer.print(msg + "\n"); writer.flush() }
+object ConsoleReporter {
+  abstract class AbstractConsoleReporter extends AbstractReporter {
+    /** Prints the message. */
+    def printMessage(msg: String): Unit
 
-  /** Prints the message with the given position indication. */
-  def doReport(dia: Diagnostic)(using Context): Unit = {
-    val didPrint = dia match {
-      case dia: Error =>
-        printMessage(messageAndPos(dia.msg, dia.pos, diagnosticLevel(dia)))
-        if (ctx.settings.Xprompt.value) Reporter.displayPrompt(reader, writer)
-        true
-      case dia: ConditionalWarning if !dia.enablingOption.value =>
-        false
-      case dia =>
-        printMessage(messageAndPos(dia.msg, dia.pos, diagnosticLevel(dia)))
-        true
+    /** Prints the message with the given position indication. */
+    def doReport(dia: Diagnostic)(using Context): Unit = {
+      printMessage(messageAndPos(dia))
     }
-
-    if (didPrint && shouldExplain(dia))
-      printMessage(explanation(dia.msg))
-    else if (didPrint && dia.msg.canExplain)
-      printMessage("\nlonger explanation available when compiling with `-explain`")
   }
-
-  override def flush()(using Context): Unit = { writer.flush() }
 }
diff --git a/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala b/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala
index fbb7145152d6..3f498b432f98 100644
--- a/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala
@@ -2,12 +2,13 @@ package dotty.tools
 package dotc
 package reporting
 
-import util.SourcePosition
-import core.Contexts._
-import config.Settings.Setting
-import interfaces.Diagnostic.{ERROR, INFO, WARNING}
+import dotty.tools.dotc.config.Settings.Setting
+import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.interfaces.Diagnostic.{ERROR, INFO, WARNING}
+import dotty.tools.dotc.util.SourcePosition
 
 import java.util.Optional
+import scala.util.chaining._
 
 object Diagnostic:
 
@@ -35,7 +36,9 @@ object Diagnostic:
     msg: Message,
     pos: SourcePosition
   ) extends Diagnostic(msg, pos, WARNING) {
-    def toError: Error = new Error(msg, pos)
+    def toError: Error = new Error(msg, pos).tap(e => if isVerbose then e.setVerbose())
+    def toInfo: Info = new Info(msg, pos).tap(e => if isVerbose then e.setVerbose())
+    def isSummarizedConditional(using Context): Boolean = false
   }
 
   class Info(
@@ -48,6 +51,7 @@ object Diagnostic:
     pos: SourcePosition
   ) extends Warning(msg, pos) {
     def enablingOption(using Context): Setting[Boolean]
+    override def isSummarizedConditional(using Context): Boolean = !enablingOption.value
   }
 
   class FeatureWarning(
@@ -81,6 +85,12 @@ class Diagnostic(
   val pos: SourcePosition,
   val level: Int
 ) extends Exception with interfaces.Diagnostic:
+  private var verbose: Boolean = false
+  def isVerbose: Boolean = verbose
+  def setVerbose(): this.type =
+    verbose = true
+    this
+
   override def position: Optional[interfaces.SourcePosition] =
     if (pos.exists && pos.source.exists) Optional.of(pos) else Optional.empty()
   override def message: String =
diff --git a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
index d73e799ddf3c..f55196f82a8e 100644
--- a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala
@@ -1,7 +1,7 @@
 package dotty.tools.dotc.reporting
 
 /** Unique IDs identifying the messages */
-enum ErrorMessageID extends java.lang.Enum[ErrorMessageID] {
+enum ErrorMessageID extends java.lang.Enum[ErrorMessageID]:
 
   // IMPORTANT: Add new IDs only at the end and never remove IDs
   case
@@ -87,8 +87,8 @@ enum ErrorMessageID extends java.lang.Enum[ErrorMessageID] {
     ValueClassesMayNotWrapAnotherValueClassID,
     ValueClassParameterMayNotBeAVarID,
     ValueClassNeedsExactlyOneValParamID,
-    OnlyCaseClassOrCaseObjectAllowedID,
-    ExpectedTopLevelDefID,
+    UNUSED1,
+    UNUSED2,
     AnonymousFunctionMissingParamTypeID,
     SuperCallsNotAllowedInlineableID,
     NotAPathID,
@@ -173,7 +173,15 @@ enum ErrorMessageID extends java.lang.Enum[ErrorMessageID] {
     CaseClassInInlinedCodeID,
     OverrideTypeMismatchErrorID,
     OverrideErrorID,
-    MatchableWarningID
+    MatchableWarningID,
+    CannotExtendFunctionID,
+    LossyWideningConstantConversionID,
+    ImplicitSearchTooLargeID
 
   def errorNumber = ordinal - 2
-}
+
+object ErrorMessageID:
+  def fromErrorNumber(n: Int): Option[ErrorMessageID] =
+    val enumId = n + 2
+    if enumId >= 2 && enumId < ErrorMessageID.values.length then Some(fromOrdinal(enumId))
+    else None
diff --git a/compiler/src/dotty/tools/dotc/reporting/ExploringReporter.scala b/compiler/src/dotty/tools/dotc/reporting/ExploringReporter.scala
index e7b636cddf02..9255820140d8 100644
--- a/compiler/src/dotty/tools/dotc/reporting/ExploringReporter.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/ExploringReporter.scala
@@ -7,7 +7,7 @@ import core.Contexts.Context
 import Diagnostic._
 
 /** A re-usable Reporter used in Contexts#test */
-class ExploringReporter extends StoreReporter(null):
+class ExploringReporter extends StoreReporter(null, fromTyperState = false):
   infos = new mutable.ListBuffer[Diagnostic]
 
   override def hasUnreportedErrors: Boolean =
diff --git a/compiler/src/dotty/tools/dotc/reporting/Message.scala b/compiler/src/dotty/tools/dotc/reporting/Message.scala
index 03dc0426c582..cd7456cafcc2 100644
--- a/compiler/src/dotty/tools/dotc/reporting/Message.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/Message.scala
@@ -1,7 +1,7 @@
 package dotty.tools
 package dotc
 package reporting
-
+import scala.annotation.threadUnsafe
 import util.SourcePosition
 
 object Message {
@@ -12,8 +12,7 @@ object Message {
     * not yet been ported to the new scheme. Comment out this `implicit def` to
     * see where old errors still exist
     */
-  implicit def toNoExplanation(str: => String): Message =
-    NoExplanation(str)
+  implicit def toNoExplanation(str: => String): Message = NoExplanation(str)
 }
 
 /** A `Message` contains all semantic information necessary to easily
@@ -58,6 +57,9 @@ abstract class Message(val errorId: ErrorMessageID) { self =>
     */
   protected def explain: String
 
+  /** A message suffix that can be added for certain subclasses */
+  protected def msgSuffix: String = ""
+
   /** Does this message have an explanation?
    *  This is normally the same as `explain.nonEmpty` but can be overridden
    *  if we need a way to return `true` without actually calling the
@@ -82,10 +84,10 @@ abstract class Message(val errorId: ErrorMessageID) { self =>
   def rawMessage = message
 
   /** The message to report. <nonsensical> tags are filtered out */
-  lazy val message: String = dropNonSensical(msg)
+  @threadUnsafe lazy val message: String = dropNonSensical(msg + msgSuffix)
 
   /** The explanation to report. <nonsensical> tags are filtered out */
-  lazy val explanation: String = dropNonSensical(explain)
+  @threadUnsafe lazy val explanation: String = dropNonSensical(explain)
 
   /** A message is non-sensical if it contains references to <nonsensical>
    *  tags.  Such tags are inserted by the error diagnostic framework if a
@@ -122,6 +124,13 @@ abstract class Message(val errorId: ErrorMessageID) { self =>
     def explain    = self.explain ++ suffix
     override def canExplain = true
 
+  /** Override with `true` for messages that should always be shown even if their
+   *  position overlaps another messsage of a different class. On the other hand
+   *  multiple messages of the same class with overlapping positions will lead
+   *  to only a single message of that class to be issued.
+   */
+  def showAlways = false
+
   override def toString = msg
 }
 
diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
index 57b409109961..c2ddd535b728 100644
--- a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
@@ -16,6 +16,8 @@ import scala.annotation.switch
 import scala.collection.mutable
 
 trait MessageRendering {
+  import Highlight.*
+  import Offsets.*
 
   /** Remove ANSI coloring from `str`, useful for getting real length of
     * strings
@@ -25,15 +27,9 @@ trait MessageRendering {
   def stripColor(str: String): String =
     str.replaceAll("\u001b\\[.*?m", "")
 
-  /** When inlining a method call, if there's an error we'd like to get the
-    * outer context and the `pos` at which the call was inlined.
-    *
-    * @return a list of strings with inline locations
-    */
-  def outer(pos: SourcePosition, prefix: String)(using Context): List[String] =
-    if (pos.outer.exists)
-       i"$prefix| This location contains code that was inlined from $pos" ::
-       outer(pos.outer, prefix)
+  /** List of all the inline calls that surround the position */
+  def inlinePosStack(pos: SourcePosition): List[SourcePosition] =
+    if pos.outer != null && pos.outer.exists then pos :: inlinePosStack(pos.outer)
     else Nil
 
   /** Get the sourcelines before and after the position, as well as the offset
@@ -41,15 +37,15 @@ trait MessageRendering {
     *
     * @return (lines before error, lines after error, line numbers offset)
     */
-  def sourceLines(pos: SourcePosition, diagnosticLevel: String)(using Context): (List[String], List[String], Int) = {
+  private def sourceLines(pos: SourcePosition)(using Context, Level, Offset): (List[String], List[String], Int) = {
     assert(pos.exists && pos.source.file.exists)
     var maxLen = Int.MinValue
     def render(offsetAndLine: (Int, String)): String = {
-      val (offset, line) = offsetAndLine
-      val lineNbr = pos.source.offsetToLine(offset)
-      val prefix = s"${lineNbr + 1} |"
+      val (offset1, line) = offsetAndLine
+      val lineNbr = (pos.source.offsetToLine(offset1) + 1).toString
+      val prefix = String.format(s"%${offset - 2}s |", lineNbr)
       maxLen = math.max(maxLen, prefix.length)
-      val lnum = hl(diagnosticLevel)(" " * math.max(0, maxLen - prefix.length) + prefix)
+      val lnum = hl(" " * math.max(0, maxLen - prefix.length - 1) + prefix)
       lnum + line.stripLineEnd
     }
 
@@ -77,23 +73,76 @@ trait MessageRendering {
     )
   }
 
-  /** The column markers aligned under the error */
-  def columnMarker(pos: SourcePosition, offset: Int, diagnosticLevel: String)(using Context): String = {
-    val prefix = " " * (offset - 1)
+  /** Generate box containing the report title
+   *
+   *  ```
+   *  -- Error: source.scala ---------------------
+   *  ```
+   */
+  private def boxTitle(title: String)(using Context, Level, Offset): String =
+    val pageWidth = ctx.settings.pageWidth.value
+    val line = "-" * (pageWidth - title.length - 4)
+    hl(s"-- $title $line")
+
+  /** The position markers aligned under the error
+   *
+   *  ```
+   *    |         ^^^^^
+   *  ```
+   */
+  private def positionMarker(pos: SourcePosition)(using Context, Level, Offset): String = {
     val padding = pos.startColumnPadding
-    val carets = hl(diagnosticLevel) {
+    val carets =
       if (pos.startLine == pos.endLine)
         "^" * math.max(1, pos.endColumn - pos.startColumn)
       else "^"
-    }
-    s"$prefix|$padding$carets"
+    hl(s"$offsetBox$padding$carets")
   }
 
+  /** The horizontal line with the given offset
+   *
+   *  ```
+   *    |
+   *  ```
+   */
+  private def offsetBox(using Context, Level, Offset): String =
+    val prefix = " " * (offset - 1)
+    hl(s"$prefix|")
+
+  /** The end of a box section
+   *
+   *  ```
+   *    |---------------
+   *  ```
+   *  Or if there `soft` is true,
+   *  ```
+   *    |- - - - - - - -
+   *  ```
+   */
+  private def newBox(soft: Boolean = false)(using Context, Level, Offset): String =
+    val pageWidth = ctx.settings.pageWidth.value
+    val prefix = " " * (offset - 1)
+    val lineWidth = (pageWidth - offset)
+    val line = if soft then ("- " * ((lineWidth + 1) / 2)).trim else "-" * lineWidth
+    hl(s"$prefix|$line")
+
+  /** The end of a box section
+   *
+   *  ```
+   *     ----------------
+   *  ```
+   */
+  private def endBox(using Context, Level, Offset): String =
+    val pageWidth = ctx.settings.pageWidth.value
+    val prefix = " " * (offset - 1)
+    val line = "-" * (pageWidth - offset)
+    hl(s"${prefix} $line")
+
   /** The error message (`msg`) aligned under `pos`
     *
     * @return aligned error message
     */
-  def errorMsg(pos: SourcePosition, msg: String, offset: Int)(using Context): String = {
+  private def errorMsg(pos: SourcePosition, msg: String)(using Context, Level, Offset): String = {
     val padding = msg.linesIterator.foldLeft(pos.startColumnPadding) { (pad, line) =>
       val lineLength = stripColor(line).length
       val maxPad = math.max(0, ctx.settings.pageWidth.value - offset - lineLength) - offset
@@ -103,31 +152,35 @@ trait MessageRendering {
     }
 
     msg.linesIterator
-      .map { line => " " * (offset - 1) + "|" + (if line.isEmpty then "" else padding + line) }
+      .map { line => offsetBox + (if line.isEmpty then "" else padding + line) }
       .mkString(EOL)
   }
 
+  /** The source file path, line and column numbers from the given SourcePosition */
+  protected def posFileStr(pos: SourcePosition): String =
+    val path = pos.source.file.path
+    if pos.exists then s"$path:${pos.line + 1}:${pos.column}" else path
+
   /** The separator between errors containing the source file and error type
     *
     * @return separator containing error location and kind
     */
-  def posStr(pos: SourcePosition, diagnosticLevel: String, message: Message)(using Context): String =
-    if (pos.source != NoSourcePosition.source) hl(diagnosticLevel)({
-      val pos1 = pos.nonInlined
-      val file = if !pos.exists then pos1.source.file.toString else
-        s"${pos1.source.file.toString}:${pos1.line + 1}:${pos1.column}"
+  private def posStr(pos: SourcePosition, message: Message, diagnosticString: String)(using Context, Level, Offset): String =
+    if (pos.source != NoSourcePosition.source) hl({
+      val realPos = pos.nonInlined
+      val fileAndPos = posFileStr(realPos)
       val errId =
         if (message.errorId ne ErrorMessageID.NoExplanationID) {
           val errorNumber = message.errorId.errorNumber
           s"[E${"0" * (3 - errorNumber.toString.length) + errorNumber}] "
         } else ""
       val kind =
-        if (message.kind == "") diagnosticLevel
-        else s"${message.kind} $diagnosticLevel"
-      val prefix = s"-- ${errId}${kind}: $file "
-
-      prefix +
-        ("-" * math.max(ctx.settings.pageWidth.value - stripColor(prefix).length, 0))
+        if (message.kind == "") diagnosticString
+        else s"${message.kind} $diagnosticString"
+      val title =
+        if fileAndPos.isEmpty then s"$errId$kind:" // this happens in dotty.tools.repl.ScriptedTests // TODO add name of source or remove `:` (and update test files)
+        else s"$errId$kind: $fileAndPos"
+      boxTitle(title)
     }) else ""
 
   /** Explanation rendered under "Explanation" header */
@@ -138,45 +191,120 @@ trait MessageRendering {
           |${Blue("===========").show}""".stripMargin
     )
     sb.append(EOL).append(m.explanation)
-    if (m.explanation.lastOption != Some(EOL)) sb.append(EOL)
+    if (!m.explanation.endsWith(EOL)) sb.append(EOL)
     sb.toString
   }
 
+  private def appendFilterHelp(dia: Diagnostic, sb: mutable.StringBuilder): Unit =
+    import dia._
+    val hasId = msg.errorId.errorNumber >= 0
+    val category = dia match {
+      case _: UncheckedWarning => "unchecked"
+      case _: DeprecationWarning => "deprecation"
+      case _: FeatureWarning => "feature"
+      case _ => ""
+    }
+    if (hasId || category.nonEmpty)
+      sb.append(EOL).append("Matching filters for @nowarn or -Wconf:")
+      if (hasId)
+        sb.append(EOL).append("  - id=E").append(msg.errorId.errorNumber)
+        sb.append(EOL).append("  - name=").append(msg.errorId.productPrefix.stripSuffix("ID"))
+      if (category.nonEmpty)
+        sb.append(EOL).append("  - cat=").append(category)
+
   /** The whole message rendered from `msg` */
-  def messageAndPos(msg: Message, pos: SourcePosition, diagnosticLevel: String)(using Context): String = {
+  def messageAndPos(dia: Diagnostic)(using Context): String = {
+    import dia._
+    val pos1 = pos.nonInlined
+    val inlineStack = inlinePosStack(pos).filter(_ != pos1)
+    val maxLineNumber =
+      if pos.exists then (pos1 :: inlineStack).map(_.endLine).max + 1
+      else 0
+    given Level = Level(level)
+    given Offset = Offset(maxLineNumber.toString.length + 2)
     val sb = mutable.StringBuilder()
-    val posString = posStr(pos, diagnosticLevel, msg)
+    val posString = posStr(pos, msg, diagnosticLevel(dia))
     if (posString.nonEmpty) sb.append(posString).append(EOL)
     if (pos.exists) {
       val pos1 = pos.nonInlined
       if (pos1.exists && pos1.source.file.exists) {
-        val (srcBefore, srcAfter, offset) = sourceLines(pos1, diagnosticLevel)
-        val marker = columnMarker(pos1, offset, diagnosticLevel)
-        val err = errorMsg(pos1, msg.message, offset)
-        sb.append((srcBefore ::: marker :: err :: outer(pos, " " * (offset - 1)) ::: srcAfter).mkString(EOL))
+        val (srcBefore, srcAfter, offset) = sourceLines(pos1)
+        val marker = positionMarker(pos1)
+        val err = errorMsg(pos1, msg.message)
+        sb.append((srcBefore ::: marker :: err :: srcAfter).mkString(EOL))
+
+        if inlineStack.nonEmpty then
+          sb.append(EOL).append(newBox())
+          sb.append(EOL).append(offsetBox).append(i"Inline stack trace")
+          for inlinedPos <- inlineStack if inlinedPos != pos1 do
+            sb.append(EOL).append(newBox(soft = true))
+            sb.append(EOL).append(offsetBox).append(i"This location contains code that was inlined from $pos")
+            if inlinedPos.source.file.exists then
+              val (srcBefore, srcAfter, _) = sourceLines(inlinedPos)
+              val marker = positionMarker(inlinedPos)
+              sb.append(EOL).append((srcBefore ::: marker :: srcAfter).mkString(EOL))
+          sb.append(EOL).append(endBox)
       }
       else sb.append(msg.message)
     }
     else sb.append(msg.message)
+    if (dia.isVerbose)
+      appendFilterHelp(dia, sb)
+
+    if Diagnostic.shouldExplain(dia) then
+      sb.append(EOL).append(newBox())
+      sb.append(EOL).append(offsetBox).append(" Explanation (enabled by `-explain`)")
+      sb.append(EOL).append(newBox(soft = true))
+      dia.msg.explanation.split(raw"\R").foreach { line =>
+        sb.append(EOL).append(offsetBox).append(if line.isEmpty then "" else " ").append(line)
+      }
+      sb.append(EOL).append(endBox)
+    else if dia.msg.canExplain then
+      sb.append(EOL).append(offsetBox)
+      sb.append(EOL).append(offsetBox).append(" longer explanation available when compiling with `-explain`")
+
     sb.toString
   }
 
-  def hl(diagnosticLevel: String)(str: String)(using Context): String = diagnosticLevel match {
-    case "Info" => Blue(str).show
-    case "Error" => Red(str).show
-    case _ =>
-      assert(diagnosticLevel.contains("Warning"))
-      Yellow(str).show
-  }
+  private  def hl(str: String)(using Context, Level): String =
+    summon[Level].value match
+      case interfaces.Diagnostic.ERROR   => Red(str).show
+      case interfaces.Diagnostic.WARNING => Yellow(str).show
+      case interfaces.Diagnostic.INFO    => Blue(str).show
 
-  def diagnosticLevel(dia: Diagnostic): String =
+  private def diagnosticLevel(dia: Diagnostic): String =
     dia match {
-      case dia: Error => "Error"
       case dia: FeatureWarning => "Feature Warning"
       case dia: DeprecationWarning => "Deprecation Warning"
       case dia: UncheckedWarning => "Unchecked Warning"
       case dia: MigrationWarning => "Migration Warning"
-      case dia: Warning => "Warning"
-      case dia: Info => "Info"
+      case _ => dia.level match // Diagnostic isn't sealed (e.g. created in the REPL) so provide a fallback
+        case interfaces.Diagnostic.ERROR   => "Error"
+        case interfaces.Diagnostic.WARNING => "Warning"
+        case interfaces.Diagnostic.INFO    => "Info"
     }
+
+}
+
+private object Highlight {
+  opaque type Level = Int
+  extension (level: Level) def value: Int = level
+  object Level:
+    def apply(level: Int): Level = level
+}
+
+/** Size of the left offset added by the box
+ *
+ *  ```
+ *  -- Error: ... ------------
+ *  4 |  foo
+ *    |  ^^^
+ *  ^^^ // size of this offset
+ *  ```
+ */
+private object Offsets {
+  opaque type Offset = Int
+  def offset(using o: Offset): Int = o
+  object Offset:
+    def apply(level: Int): Offset = level
 }
diff --git a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala
index 437963af9161..421d8f52b43a 100644
--- a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala
@@ -2,30 +2,25 @@ package dotty.tools
 package dotc
 package reporting
 
+import dotty.tools.dotc.ast.{Trees, tpd}
+import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Decorators._
+import dotty.tools.dotc.core.Mode
+import dotty.tools.dotc.core.Symbols.{NoSymbol, Symbol}
+import dotty.tools.dotc.reporting.Diagnostic._
+import dotty.tools.dotc.reporting.Message._
+import dotty.tools.dotc.util.NoSourcePosition
+
+import java.io.{BufferedReader, PrintWriter}
 import scala.annotation.internal.sharable
-
-import core.Contexts._
-import core.Decorators._
-import collection.mutable
-import core.Mode
-import dotty.tools.dotc.core.Symbols.{Symbol, NoSymbol}
-import Diagnostic._
-import ast.{tpd, Trees}
-import Message._
-import core.Decorators._
-import util.NoSourcePosition
-
-import java.io.{ BufferedReader, PrintWriter }
+import scala.collection.mutable
+import scala.util.chaining._
 
 object Reporter {
   /** Convert a SimpleReporter into a real Reporter */
   def fromSimpleReporter(simple: interfaces.SimpleReporter): Reporter =
     new Reporter with UniqueMessagePositions with HideNonSensicalMessages {
-      override def doReport(dia: Diagnostic)(using Context): Unit = dia match {
-        case dia: ConditionalWarning if !dia.enablingOption.value =>
-        case _ =>
-          simple.report(dia)
-      }
+      override def doReport(dia: Diagnostic)(using Context): Unit = simple.report(dia)
     }
 
   /** A reporter that ignores reports, and doesn't record errors */
@@ -95,6 +90,8 @@ abstract class Reporter extends interfaces.ReporterResult {
     finally incompleteHandler = saved
   }
 
+  private def isIncompleteChecking = incompleteHandler ne defaultIncompleteHandler
+
   private var _errorCount = 0
   private var _warningCount = 0
 
@@ -140,25 +137,68 @@ abstract class Reporter extends interfaces.ReporterResult {
 
   var unreportedWarnings: Map[String, Int] = Map.empty
 
-  def report(dia: Diagnostic)(using Context): Unit =
-    val isSummarized = dia match
-      case dia: ConditionalWarning => !dia.enablingOption.value
-      case _ => false
-    if isSummarized  // avoid isHidden test for summarized warnings so that message is not forced
-       || !isHidden(dia)
-    then
-      withMode(Mode.Printing)(doReport(dia))
+  def addUnreported(key: String, n: Int): Unit =
+    val count = unreportedWarnings.getOrElse(key, 0)
+    unreportedWarnings = unreportedWarnings.updated(key, count + n)
+
+  /** Issue the diagnostic, ignoring `-Wconf` and `@nowarn` configurations,
+   *  but still honouring `-nowarn`, `-Werror`, and conditional warnings. */
+  def issueUnconfigured(dia: Diagnostic)(using Context): Unit = dia match
+    case w: Warning if ctx.settings.silentWarnings.value    =>
+    case w: ConditionalWarning if w.isSummarizedConditional =>
+      val key = w.enablingOption.name
+      addUnreported(key, 1)
+    case _                                                  =>
+      // conditional warnings that are not enabled are not fatal
+      val d = dia match
+        case w: Warning if ctx.settings.XfatalWarnings.value => w.toError
+        case _                                               => dia
+      if !isHidden(d) then // avoid isHidden test for summarized warnings so that message is not forced
+        withMode(Mode.Printing)(doReport(d))
+        d match {
+          case _: Warning => _warningCount += 1
+          case e: Error   =>
+            errors = e :: errors
+            _errorCount += 1
+            if ctx.typerState.isGlobalCommittable then
+              ctx.base.errorsToBeReported = true
+          case _: Info    => // nothing to do here
+          // match error if d is something else
+        }
+  end issueUnconfigured
+
+  def issueIfNotSuppressed(dia: Diagnostic)(using Context): Unit =
+    def go() =
+      import Action._
       dia match
-        case dia: ConditionalWarning if !dia.enablingOption.value =>
-          val key = dia.enablingOption.name
-          unreportedWarnings =
-            unreportedWarnings.updated(key, unreportedWarnings.getOrElse(key, 0) + 1)
-        case dia: Warning => _warningCount += 1
-        case dia: Error =>
-          errors = dia :: errors
-          _errorCount += 1
-        case dia: Info => // nothing to do here
-        // match error if d is something else
+        case w: Warning => WConf.parsed.action(w) match
+          case Error   => issueUnconfigured(w.toError)
+          case Warning => issueUnconfigured(w)
+          case Verbose => issueUnconfigured(w.setVerbose())
+          case Info    => issueUnconfigured(w.toInfo)
+          case Silent  =>
+        case _ => issueUnconfigured(dia)
+
+    // `ctx.run` can be null in test, also in the repl when parsing the first line. The parser runs early, the Run is
+    // only created in ReplDriver.compile when a line is submitted. This means that `@nowarn` doesnt work on parser
+    // warnings in the first line.
+    dia match
+      case w: Warning if ctx.run != null =>
+        val sup = ctx.run.suppressions
+        if sup.suppressionsComplete(w.pos.source) then sup.nowarnAction(w) match
+          case Action.Warning => go()
+          case Action.Verbose => w.setVerbose(); go()
+          case Action.Silent =>
+        else
+          // ParseResult.isIncomplete creates a new source file and reporter to check if the input is complete.
+          // The reporter's warnings are discarded, and we should not add them to the run's suspended messages,
+          // otherwise they are later reported.
+          if !isIncompleteChecking then
+            sup.addSuspendedMessage(w)
+      case _ => go()
+  end issueIfNotSuppressed
+
+  def report(dia: Diagnostic)(using Context): Unit = issueIfNotSuppressed(dia)
 
   def incomplete(dia: Diagnostic)(using Context): Unit =
     incompleteHandler(dia, ctx)
@@ -204,6 +244,8 @@ abstract class Reporter extends interfaces.ReporterResult {
   def flush()(using Context): Unit =
     val msgs = removeBufferedMessages
     if msgs.nonEmpty then msgs.foreach(ctx.reporter.report)
+    for (key, count) <- unreportedWarnings do
+      ctx.reporter.addUnreported(key, count)
 
   /** If this reporter buffers messages, all buffered messages, otherwise Nil */
   def pendingMessages(using Context): List[Diagnostic] = Nil
diff --git a/compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala b/compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala
index 8b6cd6ea5a0d..db39ed6527d1 100644
--- a/compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala
@@ -17,7 +17,7 @@ import Diagnostic._
   * - The reporter is not flushed and the message containers capture a
   *   `Context` (about 4MB)
   */
-class StoreReporter(outer: Reporter = Reporter.NoReporter) extends Reporter {
+class StoreReporter(outer: Reporter = Reporter.NoReporter, fromTyperState: Boolean = false) extends Reporter {
 
   protected var infos: mutable.ListBuffer[Diagnostic] = null
 
@@ -37,7 +37,14 @@ class StoreReporter(outer: Reporter = Reporter.NoReporter) extends Reporter {
     if (infos != null) try infos.toList finally infos = null
     else Nil
 
-  override def pendingMessages(using Context): List[Diagnostic] = infos.toList
+  override def pendingMessages(using Context): List[Diagnostic] = if (infos != null) infos.toList else Nil
 
   override def errorsReported: Boolean = hasErrors || (outer != null && outer.errorsReported)
+
+  // If this is a TyperState buffering reporter then buffer the messages,
+  // so that then only when the messages are unbuffered (when the reporter if flushed)
+  // do they go through -Wconf, and possibly then buffered on the Run as a suspended message
+  override def report(dia: Diagnostic)(using Context): Unit =
+    if fromTyperState then issueUnconfigured(dia)
+    else super.report(dia)
 }
diff --git a/compiler/src/dotty/tools/dotc/reporting/TestReporter.scala b/compiler/src/dotty/tools/dotc/reporting/TestReporter.scala
index 8ad5b525de5c..a3d84e462bf0 100644
--- a/compiler/src/dotty/tools/dotc/reporting/TestReporter.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/TestReporter.scala
@@ -6,7 +6,7 @@ import collection.mutable
 import Diagnostic._
 
 /** A re-usable Reporter used in Contexts#test */
-class TestingReporter extends StoreReporter(null):
+class TestingReporter extends StoreReporter(null, fromTyperState = false):
   infos = new mutable.ListBuffer[Diagnostic]
   override def hasUnreportedErrors: Boolean = infos.exists(_.isInstanceOf[Error])
   def reset(): Unit = infos.clear()
diff --git a/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala b/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala
index fb4c92c12f83..d745d8d20081 100644
--- a/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala
@@ -10,19 +10,24 @@ import core.Contexts._
   * are suppressed, unless they are of increasing severity. */
 trait UniqueMessagePositions extends Reporter {
 
-  private val positions = new mutable.HashMap[(SourceFile, Int), Int]
+  private val positions = new mutable.HashMap[(SourceFile, Integer), Diagnostic]
 
   /** Logs a position and returns true if it was already logged.
    *  @note  Two positions are considered identical for logging if they have the same point.
    */
   override def isHidden(dia: Diagnostic)(using Context): Boolean =
+    extension (dia1: Diagnostic) def hides(dia2: Diagnostic): Boolean =
+      if dia2.msg.showAlways then dia1.msg.getClass == dia2.msg.getClass
+      else dia1.level >= dia2.level
     super.isHidden(dia) || {
-      dia.pos.exists && !ctx.settings.YshowSuppressedErrors.value && {
+      dia.pos.exists
+      && !ctx.settings.YshowSuppressedErrors.value
+      && {
         var shouldHide = false
         for (pos <- dia.pos.start to dia.pos.end)
           positions get (ctx.source, pos) match {
-            case Some(level) if level >= dia.level => shouldHide = true
-            case _ => positions((ctx.source, pos)) = dia.level
+            case Some(dia1) if dia1.hides(dia) => shouldHide = true
+            case _ => positions((ctx.source, pos)) = dia
           }
         shouldHide
       }
diff --git a/compiler/src/dotty/tools/dotc/reporting/WConf.scala b/compiler/src/dotty/tools/dotc/reporting/WConf.scala
new file mode 100644
index 000000000000..34a47fa3db9d
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/reporting/WConf.scala
@@ -0,0 +1,124 @@
+package dotty.tools
+package dotc
+package reporting
+
+import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.util.SourcePosition
+
+import java.util.regex.PatternSyntaxException
+import scala.annotation.internal.sharable
+import scala.collection.mutable.ListBuffer
+import scala.util.matching.Regex
+
+enum MessageFilter:
+  def matches(message: Diagnostic): Boolean = this match
+    case Any => true
+    case Deprecated => message.isInstanceOf[Diagnostic.DeprecationWarning]
+    case Feature => message.isInstanceOf[Diagnostic.FeatureWarning]
+    case Unchecked => message.isInstanceOf[Diagnostic.UncheckedWarning]
+    case MessagePattern(pattern) =>
+      val noHighlight = message.msg.rawMessage.replaceAll("\\e\\[[\\d;]*[^\\d;]","")
+      pattern.findFirstIn(noHighlight).nonEmpty
+    case MessageID(errorId) => message.msg.errorId == errorId
+    case None => false
+
+  case Any, Deprecated, Feature, Unchecked, None
+  case MessagePattern(pattern: Regex)
+  case MessageID(errorId: ErrorMessageID)
+
+enum Action:
+  case Error, Warning, Verbose, Info, Silent
+
+final case class WConf(confs: List[(List[MessageFilter], Action)]):
+  def action(message: Diagnostic): Action = confs.collectFirst {
+    case (filters, action) if filters.forall(_.matches(message)) => action
+  }.getOrElse(Action.Warning)
+
+object WConf:
+  import Action._
+  import MessageFilter._
+
+  private type Conf = (List[MessageFilter], Action)
+
+  def parseAction(s: String): Either[List[String], Action] = s match
+    case "error" | "e"            => Right(Error)
+    case "warning" | "w"          => Right(Warning)
+    case "verbose" | "v"          => Right(Verbose)
+    case "info" | "i"             => Right(Info)
+    case "silent" | "s"           => Right(Silent)
+    case _                        => Left(List(s"unknown action: `$s`"))
+
+  private def regex(s: String) =
+    try Right(s.r)
+    catch case e: PatternSyntaxException => Left(s"invalid pattern `$s`: ${e.getMessage}")
+
+  @sharable val Splitter = raw"([^=]+)=(.+)".r
+  @sharable val ErrorId = raw"E?(\d+)".r
+
+  def parseFilters(s: String): Either[List[String], List[MessageFilter]] =
+    // TODO: don't split on escaped \&
+    val (parseErrors, filters) = s.split('&').toList.partitionMap(parseFilter)
+    if parseErrors.nonEmpty then Left(parseErrors)
+    else if filters.isEmpty then Left(List("no filters or no action defined"))
+    else Right(filters)
+
+  def parseFilter(s: String): Either[String, MessageFilter] = s match
+    case "any" => Right(Any)
+    case Splitter(filter, conf) => filter match
+      case "msg" => regex(conf).map(MessagePattern.apply)
+      case "id" => conf match
+        case ErrorId(num) =>
+          ErrorMessageID.fromErrorNumber(num.toInt) match
+            case Some(errId) => Right(MessageID(errId))
+            case _ => Left(s"unknonw error message number: E$num")
+        case _ =>
+          Left(s"invalid error message id: $conf")
+      case "name" =>
+        try Right(MessageID(ErrorMessageID.valueOf(conf + "ID")))
+        catch case _: IllegalArgumentException => Left(s"unknown error message name: $conf")
+
+      case "cat" => conf match
+        case "deprecation" => Right(Deprecated)
+        case "feature"     => Right(Feature)
+        case "unchecked"   => Right(Unchecked)
+        case _             => Left(s"unknown category: $conf")
+      case _ => Left(s"unknown filter: $filter")
+    case _ => Left(s"unknown filter: $s")
+
+  def parsed(using Context): WConf =
+    val setting = ctx.settings.Wconf.value
+    def cached = ctx.base.wConfCache
+    if cached == null || cached._1 != setting then
+      val conf = fromSettings(setting)
+      ctx.base.wConfCache = (setting, conf.getOrElse(WConf(Nil)))
+      conf.swap.foreach(msgs =>
+        val multiHelp =
+          if setting.sizeIs > 1 then
+            """
+              |Note: for multiple filters, use `-Wconf:filter1:action1,filter2:action2`
+              |      or alternatively          `-Wconf:filter1:action1 -Wconf:filter2:action2`""".stripMargin
+          else ""
+        report.warning(s"Failed to parse `-Wconf` configuration: ${ctx.settings.Wconf.value.mkString(",")}\n${msgs.mkString("\n")}$multiHelp"))
+    cached._2
+
+  def fromSettings(settings: List[String]): Either[List[String], WConf] =
+    if (settings.isEmpty) Right(WConf(Nil))
+    else
+      val parsedConfs: List[Either[List[String], (List[MessageFilter], Action)]] = settings.map(conf =>
+        val filtersAndAction = conf.split(':')
+        if filtersAndAction.length != 2 then Left(List("exactly one `:` expected (<filter>&...&<filter>:<action>)"))
+        else
+          parseFilters(filtersAndAction(0)).flatMap(filters =>
+            parseAction(filtersAndAction(1)).map((filters, _))))
+      val (parseErrorss, configs) = parsedConfs.partitionMap(identity)
+      if (parseErrorss.nonEmpty) Left(parseErrorss.flatten)
+      else Right(WConf(configs))
+
+class Suppression(val annotPos: SourcePosition, filters: List[MessageFilter], val start: Int, end: Int, val verbose: Boolean):
+  private[this] var _used = false
+  def used: Boolean = _used
+  def markUsed(): Unit = { _used = true }
+
+  def matches(dia: Diagnostic): Boolean =
+    val pos = dia.pos
+    pos.exists && start <= pos.start && pos.end <= end && filters.forall(_.matches(dia))
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
index b32f00dde083..4a1efab782a1 100644
--- a/compiler/src/dotty/tools/dotc/reporting/messages.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -16,8 +16,9 @@ import printing.Formatting
 import ErrorMessageID._
 import ast.Trees
 import config.{Feature, ScalaVersion}
-import typer.ErrorReporting.err
+import typer.ErrorReporting.{err, matchReductionAddendum}
 import typer.ProtoTypes.ViewProto
+import typer.Implicits.Candidate
 import scala.util.control.NonFatal
 import StdNames.nme
 import printing.Formatting.hl
@@ -45,7 +46,11 @@ import transform.SymUtils._
   abstract class TypeMsg(errorId: ErrorMessageID) extends Message(errorId):
     def kind = "Type"
 
-  abstract class TypeMismatchMsg(found: Type, expected: Type)(errorId: ErrorMessageID)(using Context) extends Message(errorId):
+  trait ShowMatchTrace(tps: Type*)(using Context) extends Message:
+    override def msgSuffix: String = matchReductionAddendum(tps*)
+
+  abstract class TypeMismatchMsg(found: Type, expected: Type)(errorId: ErrorMessageID)(using Context)
+  extends Message(errorId), ShowMatchTrace(found, expected):
     def kind = "Type Mismatch"
     def explain = err.whyNoMatchStr(found, expected)
     override def canExplain = true
@@ -145,7 +150,6 @@ import transform.SymUtils._
   }
 
   class AnonymousFunctionMissingParamType(param: untpd.ValDef,
-                                          args: List[untpd.Tree],
                                           tree: untpd.Function,
                                           pt: Type)
                                           (using Context)
@@ -153,7 +157,7 @@ import transform.SymUtils._
     def msg = {
       val ofFun =
         if param.name.is(WildcardParamName)
-           || (MethodType.syntheticParamNames(args.length + 1) contains param.name)
+           || (MethodType.syntheticParamNames(tree.args.length + 1) contains param.name)
         then i" of expanded function:\n$tree"
         else ""
 
@@ -238,7 +242,7 @@ import transform.SymUtils._
     }
   }
 
-  class TypeMismatch(found: Type, expected: Type, addenda: => String*)(using Context)
+  class TypeMismatch(found: Type,  expected: Type, inTree: Option[untpd.Tree],  addenda: => String*)(using Context)
     extends TypeMismatchMsg(found, expected)(TypeMismatchID):
 
     // replace constrained TypeParamRefs and their typevars by their bounds where possible
@@ -278,10 +282,16 @@ import transform.SymUtils._
       s"""|Found:    $foundStr
           |Required: $expectedStr""".stripMargin
         + whereSuffix + postScript
+
+    override def explain =
+      val treeStr = inTree.map(x => s"\nTree: ${x.show}").getOrElse("")
+      treeStr + "\n" + super.explain
+
+
   end TypeMismatch
 
   class NotAMember(site: Type, val name: Name, selected: String, addendum: => String = "")(using Context)
-  extends NotFoundMsg(NotAMemberID) {
+  extends NotFoundMsg(NotAMemberID), ShowMatchTrace(site) {
     //println(i"site = $site, decls = ${site.decls}, source = ${site.typeSymbol.sourceFile}") //DEBUG
 
     def msg = {
@@ -289,16 +299,16 @@ import transform.SymUtils._
       val maxDist = 3  // maximal number of differences to be considered for a hint
       val missing = name.show
 
-      // The names of all non-synthetic, non-private members of `site`
+      // The symbols of all non-synthetic, non-private members of `site`
       // that are of the same type/term kind as the missing member.
-      def candidates: Set[String] =
+      def candidates: Set[Symbol] =
         for
           bc <- site.widen.baseClasses.toSet
           sym <- bc.info.decls.filter(sym =>
             sym.isType == name.isTypeName
             && !sym.isConstructor
             && !sym.flagsUNSAFE.isOneOf(Synthetic | Private))
-        yield sym.name.show
+        yield sym
 
       // Calculate Levenshtein distance
       def distance(s1: String, s2: String): Int =
@@ -314,13 +324,13 @@ import transform.SymUtils._
             else (dist(j - 1)(i) min dist(j)(i - 1) min dist(j - 1)(i - 1)) + 1
         dist(s2.length)(s1.length)
 
-      // A list of possible candidate strings with their Levenstein distances
+      // A list of possible candidate symbols with their Levenstein distances
       // to the name of the missing member
-      def closest: List[(Int, String)] = candidates
+      def closest: List[(Int, Symbol)] = candidates
         .toList
-        .map(n => (distance(n, missing), n))
-        .filter((d, n) => d <= maxDist && d < missing.length && d < n.length)
-        .sorted  // sort by distance first, alphabetically second
+        .map(sym => (distance(sym.name.show, missing), sym))
+        .filter((d, sym) => d <= maxDist && d < missing.length && d < sym.name.show.length)
+        .sortBy((d, sym) => (d, sym.name.show))  // sort by distance first, alphabetically second
 
       val enumClause =
         if ((name eq nme.values) || (name eq nme.valueOf)) && site.classSymbol.companionClass.isEnumClass then
@@ -339,11 +349,15 @@ import transform.SymUtils._
       val finalAddendum =
         if addendum.nonEmpty then prefixEnumClause(addendum)
         else closest match
-          case (d, n) :: _ =>
+          case (d, sym) :: _ =>
             val siteName = site match
               case site: NamedType => site.name.show
               case site => i"$site"
-            s" - did you mean $siteName.$n?$enumClause"
+            val showName =
+              // Add .type to the name if it is a module
+              if sym.is(ModuleClass) then s"${sym.name.show}.type"
+              else sym.name.show
+            s" - did you mean $siteName.$showName?$enumClause"
           case Nil => prefixEnumClause("")
 
       ex"$selected $name is not a member of ${site.widen}$finalAddendum"
@@ -794,6 +808,13 @@ import transform.SymUtils._
            |"""
   }
 
+  class LossyWideningConstantConversion(sourceType: Type, targetType: Type)(using Context)
+  extends Message(LossyWideningConstantConversionID):
+    def kind = "Lossy Conversion"
+    def msg = em"""|Widening conversion from $sourceType to $targetType loses precision.
+                   |Write `.to$targetType` instead.""".stripMargin
+    def explain = ""
+
   class PatternMatchExhaustivity(uncoveredFn: => String, hasMore: Boolean)(using Context)
   extends Message(PatternMatchExhaustivityID) {
     def kind = "Pattern Match Exhaustivity"
@@ -834,7 +855,7 @@ import transform.SymUtils._
 
   class MatchCaseOnlyNullWarning()(using Context)
   extends PatternMatchMsg(MatchCaseOnlyNullWarningID) {
-    def msg = em"""Only ${hl("null")} is matched. Consider using ${hl("case null =>")} instead."""
+    def msg = em"""Unreachable case except for ${hl("null")} (if this is intentional, consider writing ${hl("case null =>")} instead)."""
     def explain = ""
   }
 
@@ -1558,6 +1579,12 @@ import transform.SymUtils._
       def explain = ""
     }
 
+  class CannotExtendContextFunction(sym: Symbol)(using Context)
+    extends SyntaxMsg(CannotExtendFunctionID) {
+      def msg = em"""$sym cannot extend a context function class"""
+      def explain = ""
+    }
+
   class JavaEnumParentArgs(parent: Type)(using Context)
     extends TypeMsg(JavaEnumParentArgsID) {
       def msg = em"""not enough arguments for constructor Enum: ${hl("(name: String, ordinal: Int)")}: ${hl(parent.show)}"""
@@ -1646,18 +1673,6 @@ import transform.SymUtils._
     def explain = ""
   }
 
-  class OnlyCaseClassOrCaseObjectAllowed()(using Context)
-    extends SyntaxMsg(OnlyCaseClassOrCaseObjectAllowedID) {
-    def msg = em"""Only ${hl("case class")} or ${hl("case object")} allowed"""
-    def explain = ""
-  }
-
-  class ExpectedToplevelDef()(using Context)
-    extends SyntaxMsg(ExpectedTopLevelDefID) {
-    def msg = "Expected a toplevel definition"
-    def explain = ""
-  }
-
   class SuperCallsNotAllowedInlineable(symbol: Symbol)(using Context)
     extends SyntaxMsg(SuperCallsNotAllowedInlineableID) {
     def msg = em"Super call not allowed in inlineable $symbol"
@@ -1758,13 +1773,13 @@ import transform.SymUtils._
     def explain = ""
   }
 
-  class FailureToEliminateExistential(tp: Type, tp1: Type, tp2: Type, boundSyms: List[Symbol])(using Context)
+  class FailureToEliminateExistential(tp: Type, tp1: Type, tp2: Type, boundSyms: List[Symbol], classRoot: Symbol)(using Context)
     extends Message(FailureToEliminateExistentialID) {
     def kind: String = "Compatibility"
     def msg =
       val originalType = ctx.printer.dclsText(boundSyms, "; ").show
-      em"""An existential type that came from a Scala-2 classfile cannot be
-          |mapped accurately to to a Scala-3 equivalent.
+      em"""An existential type that came from a Scala-2 classfile for $classRoot
+          |cannot be mapped accurately to a Scala-3 equivalent.
           |original type    : $tp forSome ${originalType}
           |reduces to       : $tp1
           |type used instead: $tp2
@@ -1814,12 +1829,16 @@ import transform.SymUtils._
     def explain = ""
   }
 
-  class IllegalStartOfStatement(isModifier: Boolean)(using Context) extends SyntaxMsg(IllegalStartOfStatementID) {
-    def msg = {
-      val addendum = if (isModifier) ": no modifiers allowed here" else ""
-      "Illegal start of statement" + addendum
-    }
-    def explain = "A statement is either an import, a definition or an expression."
+  class IllegalStartOfStatement(what: String, isModifier: Boolean, isStat: Boolean)(using Context) extends SyntaxMsg(IllegalStartOfStatementID) {
+    def msg =
+      if isStat then
+        "this kind of statement is not allowed here"
+      else
+        val addendum = if isModifier then ": this modifier is not allowed here" else ""
+        s"Illegal start of $what$addendum"
+    def explain =
+      i"""A statement is an import or export, a definition or an expression.
+         |Some statements are only allowed in certain contexts"""
   }
 
   class TraitIsExpected(symbol: Symbol)(using Context) extends SyntaxMsg(TraitIsExpectedID) {
@@ -1860,11 +1879,15 @@ import transform.SymUtils._
         i" in ${conflicting.associatedFile}"
       else if conflicting.owner == owner then ""
       else i" in ${conflicting.owner}"
+    private def note =
+      if owner.is(Method) || conflicting.is(Method) then
+        "\n\nNote that overloaded methods must all be defined in the same group of toplevel definitions"
+      else ""
     def msg =
       if conflicting.isTerm != name.isTermName then
         em"$name clashes with $conflicting$where; the two must be defined together"
       else
-        em"$name is already defined as $conflicting$where"
+        em"$name is already defined as $conflicting$where$note"
     def explain = ""
 
   class PackageNameAlreadyDefined(pkg: Symbol)(using Context) extends NamingMsg(PackageNameAlreadyDefinedID) {
@@ -2493,3 +2516,26 @@ import transform.SymUtils._
           |Inlining such definition would multiply this footprint for each call site.
           |""".stripMargin
   }
+
+  class ImplicitSearchTooLargeWarning(limit: Int, openSearchPairs: List[(Candidate, Type)])(using Context)
+    extends TypeMsg(ImplicitSearchTooLargeID):
+    override def showAlways = true
+    def showQuery(query: (Candidate, Type)): String =
+      i"  ${query._1.ref.symbol.showLocated}  for  ${query._2}}"
+    def msg =
+      em"""Implicit search problem too large.
+          |an implicit search was terminated with failure after trying $limit expressions.
+          |The root candidate for the search was:
+          |
+          |${showQuery(openSearchPairs.last)}
+          |
+          |You can change the behavior by setting the `-Ximplicit-search-limit` value.
+          |Smaller values cause the search to fail faster.
+          |Larger values might make a very large search problem succeed.
+          |"""
+    def explain =
+      em"""The overflow happened with the following lists of tried expressions and target types,
+          |starting with the root query:
+          |
+          |${openSearchPairs.reverse.map(showQuery)}%\n%
+        """
diff --git a/compiler/src/dotty/tools/dotc/reporting/trace.scala b/compiler/src/dotty/tools/dotc/reporting/trace.scala
index 9036ba1c1dc7..804188b20780 100644
--- a/compiler/src/dotty/tools/dotc/reporting/trace.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/trace.scala
@@ -7,6 +7,12 @@ import config.Config
 import config.Printers
 import core.Mode
 
+/** Exposes the {{{ trace("question") { op } }}} syntax.
+ *
+ * Traced operations will print indented messages if enabled.
+ * Tracing depends on [[Config.tracingEnabled]] and [[dotty.tools.dotc.config.ScalaSettings.Ylog]].
+ * Tracing can be forced by replacing [[trace]] with [[trace.force]] or [[trace.log]] (see below).
+ */
 object trace extends TraceSyntax:
   inline def isEnabled = Config.tracingEnabled
   protected val isForced = false
@@ -14,6 +20,10 @@ object trace extends TraceSyntax:
   object force extends TraceSyntax:
     inline def isEnabled: true = true
     protected val isForced = true
+
+  object log extends TraceSyntax:
+    inline def isEnabled: true = true
+    protected val isForced = false
 end trace
 
 /** This module is carefully optimized to give zero overhead if Config.tracingEnabled
@@ -33,7 +43,7 @@ trait TraceSyntax:
       apply(question, if cond then Printers.default else Printers.noPrinter, show)(op)
     else op
 
-  inline def apply[T](inline question: String, inline printer: Printers.Printer, inline showOp: Any => String)(inline op: T)(using Context): T =
+  inline def apply[T, U >: T](inline question: String, inline printer: Printers.Printer, inline showOp: U => String)(inline op: T)(using Context): T =
     inline if isEnabled then
       doTrace[T](question, printer, showOp)(op)
     else op
@@ -60,20 +70,20 @@ trait TraceSyntax:
 
   private def doTrace[T](question: => String,
                          printer: Printers.Printer = Printers.default,
-                         showOp: Any => String = alwaysToString)
+                         showOp: T => String = alwaysToString)
                         (op: => T)(using Context): T =
     if ctx.mode.is(Mode.Printing) || !isForced && (printer eq Printers.noPrinter) then op
     else
       // Avoid evaluating question multiple time, since each evaluation
       // may cause some extra logging output.
-      val q = question
+      val q = question.replace('\n', ' ')
       val leading = s"==> $q?"
-      val trailing = (res: Any) => s"<== $q = ${showOp(res)}"
+      val trailing = (res: T) => s"<== $q = ${showOp(res)}"
       var finalized = false
       var logctx = ctx
       while logctx.reporter.isInstanceOf[StoreReporter] do logctx = logctx.outer
       def margin = ctx.base.indentTab * ctx.base.indent
-      def doLog(s: String) = if isForced then println(s) else report.log(s)
+      def doLog(s: String) = if isForced then println(s) else report.log(s)(using logctx)
       def finalize(msg: String) =
         if !finalized then
           ctx.base.indent -= 1
diff --git a/compiler/src/dotty/tools/dotc/rewrites/Rewrites.scala b/compiler/src/dotty/tools/dotc/rewrites/Rewrites.scala
index 5eeee5dc1dd3..9c85d2f5bd1d 100644
--- a/compiler/src/dotty/tools/dotc/rewrites/Rewrites.scala
+++ b/compiler/src/dotty/tools/dotc/rewrites/Rewrites.scala
@@ -20,13 +20,16 @@ object Rewrites {
     private[Rewrites] val pbuf = new mutable.ListBuffer[Patch]()
 
     def addPatch(span: Span, replacement: String): Unit =
-      pbuf += Patch(span, replacement)
+      pbuf.indexWhere(p => p.span.start == span.start && p.span.end == span.end) match {
+        case i if i >= 0 => pbuf.update(i, Patch(span, replacement))
+        case _           => pbuf += Patch(span, replacement)
+      }
 
     def apply(cs: Array[Char]): Array[Char] = {
       val delta = pbuf.map(_.delta).sum
       val patches = pbuf.toList.sortBy(_.span.start)
       if (patches.nonEmpty)
-        patches reduceLeft {(p1, p2) =>
+        patches.reduceLeft {(p1, p2) =>
           assert(p1.span.end <= p2.span.start, s"overlapping patches in $source: $p1 and $p2")
           p2
         }
@@ -64,11 +67,11 @@ object Rewrites {
    *  given by `span` in `source` by `replacement`
    */
   def patch(source: SourceFile, span: Span, replacement: String)(using Context): Unit =
-    if (ctx.reporter != Reporter.NoReporter) // NoReporter is used for syntax highlighting
-      for (rewrites <- ctx.settings.rewrite.value)
-        rewrites.patched
-          .getOrElseUpdate(source, new Patches(source))
-          .addPatch(span, replacement)
+    if ctx.reporter != Reporter.NoReporter // NoReporter is used for syntax highlighting
+    then ctx.settings.rewrite.value.foreach(_.patched
+         .getOrElseUpdate(source, new Patches(source))
+         .addPatch(span, replacement)
+    )
 
   /** Patch position in `ctx.compilationUnit.source`. */
   def patch(span: Span, replacement: String)(using Context): Unit =
@@ -96,6 +99,3 @@ class Rewrites {
   import Rewrites._
   private val patched = new PatchedFiles
 }
-
-
-
diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala
index cf8b3e01822a..3e442aab5b68 100644
--- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala
+++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala
@@ -24,6 +24,8 @@ import java.io.PrintWriter
 import xsbti.api.DefinitionType
 
 import scala.collection.mutable
+import scala.util.hashing.MurmurHash3
+import scala.util.chaining.*
 
 /** This phase sends a representation of the API of classes to sbt via callbacks.
  *
@@ -41,7 +43,10 @@ import scala.collection.mutable
  *  @see ExtractDependencies
  */
 class ExtractAPI extends Phase {
-  override def phaseName: String = "sbt-api"
+
+  override def phaseName: String = ExtractAPI.name
+
+  override def description: String = ExtractAPI.description
 
   override def isRunnable(using Context): Boolean = {
     def forceRun = ctx.settings.YdumpSbtInc.value || ctx.settings.YforceSbtPhases.value
@@ -85,6 +90,10 @@ class ExtractAPI extends Phase {
   }
 }
 
+object ExtractAPI:
+  val name: String = "sbt-api"
+  val description: String = "sends a representation of the API of classes to sbt"
+
 /** Extracts full (including private members) API representation out of Symbols and Types.
  *
  *  The exact representation used for each type is not important: the only thing
@@ -140,9 +149,21 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
   /** This cache is necessary to avoid unstable name hashing when `typeCache` is present,
    *  see the comment in the `RefinedType` case in `computeType`
    *  The cache key is (api of RefinedType#parent, api of RefinedType#refinedInfo).
-    */
+   */
   private val refinedTypeCache = new mutable.HashMap[(api.Type, api.Definition), api.Structure]
 
+  /** This cache is necessary to avoid infinite loops when hashing an inline "Body" annotation.
+   *  Its values are transitively seen inline references within a call chain starting from a single "origin" inline
+   *  definition. Avoid hashing an inline "Body" annotation if its associated definition is already in the cache.
+   *  Precondition: the cache is empty whenever we hash a new "origin" inline "Body" annotation.
+   */
+  private val seenInlineCache = mutable.HashSet.empty[Symbol]
+
+  /** This cache is optional, it avoids recomputing hashes of inline "Body" annotations,
+   *  e.g. when a concrete inline method is inherited by a subclass.
+   */
+  private val inlineBodyCache = mutable.HashMap.empty[Symbol, Int]
+
   private val allNonLocalClassesInSrc = new mutable.HashSet[xsbti.api.ClassLike]
   private val _mainClasses = new mutable.HashSet[String]
 
@@ -219,9 +240,9 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
     val structure = apiClassStructure(sym)
     val acc = apiAccess(sym)
     val modifiers = apiModifiers(sym)
-    val anns = apiAnnotations(sym).toArray
+    val anns = apiAnnotations(sym, inlineOrigin = NoSymbol).toArray
     val topLevel = sym.isTopLevelClass
-    val childrenOfSealedClass = sym.children.sorted(classFirstSort).map(c =>
+    val childrenOfSealedClass = sym.sealedDescendants.sorted(classFirstSort).map(c =>
       if (c.isClass)
         apiType(c.typeRef)
       else
@@ -320,54 +341,100 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
     }
   }
 
-  def apiDefinitions(defs: List[Symbol]): List[api.ClassDefinition] = {
-    defs.sorted(classFirstSort).map(apiDefinition)
-  }
+  def apiDefinitions(defs: List[Symbol]): List[api.ClassDefinition] =
+    defs.sorted(classFirstSort).map(apiDefinition(_, inlineOrigin = NoSymbol))
 
-  def apiDefinition(sym: Symbol): api.ClassDefinition = {
+  /** `inlineOrigin` denotes an optional inline method that we are
+   *  currently hashing the body of. If it exists, include extra information
+   *  that is missing after erasure
+   */
+  def apiDefinition(sym: Symbol, inlineOrigin: Symbol): api.ClassDefinition = {
     if (sym.isClass) {
       apiClass(sym.asClass)
     } else if (sym.isType) {
       apiTypeMember(sym.asType)
     } else if (sym.is(Mutable, butNot = Accessor)) {
       api.Var.of(sym.name.toString, apiAccess(sym), apiModifiers(sym),
-        apiAnnotations(sym).toArray, apiType(sym.info))
+        apiAnnotations(sym, inlineOrigin).toArray, apiType(sym.info))
     } else if (sym.isStableMember && !sym.isRealMethod) {
       api.Val.of(sym.name.toString, apiAccess(sym), apiModifiers(sym),
-        apiAnnotations(sym).toArray, apiType(sym.info))
+        apiAnnotations(sym, inlineOrigin).toArray, apiType(sym.info))
     } else {
-      apiDef(sym.asTerm)
+      apiDef(sym.asTerm, inlineOrigin)
     }
   }
 
-  def apiDef(sym: TermSymbol): api.Def = {
+  /** `inlineOrigin` denotes an optional inline method that we are
+   *  currently hashing the body of. If it exists, include extra information
+   *  that is missing after erasure
+   */
+  def apiDef(sym: TermSymbol, inlineOrigin: Symbol): api.Def = {
+
+    var seenInlineExtras = false
+    var inlineExtras = 41
+
+    def mixInlineParam(p: Symbol): Unit =
+      if inlineOrigin.exists && p.is(Inline) then
+        seenInlineExtras = true
+        inlineExtras = hashInlineParam(p, inlineExtras)
+
+    def inlineExtrasAnnot: Option[api.Annotation] =
+      val h = inlineExtras
+      Option.when(seenInlineExtras) {
+        marker(s"${MurmurHash3.finalizeHash(h, "inlineExtras".hashCode)}")
+      }
+
+    def tparamList(pt: TypeLambda): List[api.TypeParameter] =
+      pt.paramNames.lazyZip(pt.paramInfos).map((pname, pbounds) =>
+        apiTypeParameter(pname.toString, 0, pbounds.lo, pbounds.hi)
+      )
+
+    def paramList(mt: MethodType, params: List[Symbol]): api.ParameterList =
+      val apiParams = params.lazyZip(mt.paramInfos).map((param, ptype) =>
+        mixInlineParam(param)
+        api.MethodParameter.of(
+          param.name.toString, apiType(ptype), param.is(HasDefault), api.ParameterModifier.Plain))
+      api.ParameterList.of(apiParams.toArray, mt.isImplicitMethod)
+
     def paramLists(t: Type, paramss: List[List[Symbol]]): List[api.ParameterList] = t match {
       case pt: TypeLambda =>
         paramLists(pt.resultType, paramss.drop(1))
       case mt @ MethodTpe(pnames, ptypes, restpe) =>
         assert(paramss.nonEmpty && paramss.head.hasSameLengthAs(pnames),
           i"mismatch for $sym, ${sym.info}, ${sym.paramSymss}")
-        val apiParams = paramss.head.lazyZip(ptypes).map((param, ptype) =>
-          api.MethodParameter.of(param.name.toString, apiType(ptype),
-          param.is(HasDefault), api.ParameterModifier.Plain))
-        api.ParameterList.of(apiParams.toArray, mt.isImplicitMethod)
-          :: paramLists(restpe, paramss.tail)
+        paramList(mt, paramss.head) :: paramLists(restpe, paramss.tail)
       case _ =>
         Nil
     }
 
-    val tparams = sym.info match {
+    /** returns list of pairs of 1: the position in all parameter lists, and 2: a type parameter list */
+    def tparamLists(t: Type, index: Int): List[(Int, List[api.TypeParameter])] = t match
       case pt: TypeLambda =>
-        pt.paramNames.lazyZip(pt.paramInfos).map((pname, pbounds) =>
-          apiTypeParameter(pname.toString, 0, pbounds.lo, pbounds.hi))
+        (index, tparamList(pt)) :: tparamLists(pt.resultType, index + 1)
+      case mt: MethodType =>
+        tparamLists(mt.resultType, index + 1)
       case _ =>
         Nil
-    }
+
+    val (tparams, tparamsExtras) = sym.info match
+      case pt: TypeLambda =>
+        (tparamList(pt), tparamLists(pt.resultType, index = 1))
+      case mt: MethodType =>
+        (Nil, tparamLists(mt.resultType, index = 1))
+      case _ =>
+        (Nil, Nil)
+
     val vparamss = paramLists(sym.info, sym.paramSymss)
     val retTp = sym.info.finalResultType.widenExpr
 
-    api.Def.of(sym.name.toString, apiAccess(sym), apiModifiers(sym),
-      apiAnnotations(sym).toArray, tparams.toArray, vparamss.toArray, apiType(retTp))
+    val tparamsExtraAnnot = Option.when(tparamsExtras.nonEmpty) {
+      marker(s"${hashTparamsExtras(tparamsExtras)("tparamsExtra".hashCode)}")
+    }
+
+    val annotations = inlineExtrasAnnot ++: tparamsExtraAnnot ++: apiAnnotations(sym, inlineOrigin)
+
+    api.Def.of(sym.zincMangledName.toString, apiAccess(sym), apiModifiers(sym),
+      annotations.toArray, tparams.toArray, vparamss.toArray, apiType(retTp))
   }
 
   def apiTypeMember(sym: TypeSymbol): api.TypeMember = {
@@ -375,7 +442,7 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
     val name = sym.name.toString
     val access = apiAccess(sym)
     val modifiers = apiModifiers(sym)
-    val as = apiAnnotations(sym)
+    val as = apiAnnotations(sym, inlineOrigin = NoSymbol)
     val tpe = sym.info
 
     if (sym.isAliasType)
@@ -585,23 +652,29 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
       sym.isOneOf(GivenOrImplicit), sym.is(Lazy), sym.is(Macro), sym.isSuperAccessor)
   }
 
-  def apiAnnotations(s: Symbol): List[api.Annotation] = {
+  /** `inlineOrigin` denotes an optional inline method that we are
+   *  currently hashing the body of.
+   */
+  def apiAnnotations(s: Symbol, inlineOrigin: Symbol): List[api.Annotation] = {
     val annots = new mutable.ListBuffer[api.Annotation]
     val inlineBody = Inliner.bodyToInline(s)
-    if (!inlineBody.isEmpty) {
+    if !inlineBody.isEmpty then
       // If the body of an inline def changes, all the reverse dependencies of
       // this method need to be recompiled. sbt has no way of tracking method
       // bodies, so we include the hash of the body of the method as part of the
       // signature we send to sbt.
-      //
-      // FIXME: The API of a class we send to Zinc includes the signatures of
-      // inherited methods, which means that we repeatedly compute the hash of
-      // an inline def in every class that extends its owner. To avoid this we
-      // could store the hash as an annotation when pickling an inline def
-      // and retrieve it here instead of computing it on the fly.
-      val inlineBodyHash = treeHash(inlineBody)
-      annots += marker(inlineBodyHash.toString)
-    }
+
+      def hash[U](inlineOrigin: Symbol): Int =
+        assert(seenInlineCache.add(s)) // will fail if already seen, guarded by treeHash
+        treeHash(inlineBody, inlineOrigin)
+
+      val inlineHash =
+        if inlineOrigin.exists then hash(inlineOrigin)
+        else inlineBodyCache.getOrElseUpdate(s, hash(inlineOrigin = s).tap(_ => seenInlineCache.clear()))
+
+      annots += marker(inlineHash.toString)
+
+    end if
 
     // In the Scala2 ExtractAPI phase we only extract annotations that extend
     // StaticAnnotation, but in Dotty we currently pickle all annotations so we
@@ -619,15 +692,66 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
   /** Produce a hash for a tree that is as stable as possible:
    *  it should stay the same across compiler runs, compiler instances,
    *  JVMs, etc.
+   *
+   * `inlineOrigin` denotes an optional inline method that we are hashing the body of, where `tree` could be
+   * its body, or the body of another method referenced in a call chain leading to `inlineOrigin`.
+   *
+   * If `inlineOrigin` is NoSymbol, then tree is the tree of an annotation.
    */
-  def treeHash(tree: Tree): Int =
-    import scala.util.hashing.MurmurHash3
+  def treeHash(tree: Tree, inlineOrigin: Symbol): Int =
+    import core.Constants.*
+
+    def nameHash(n: Name, initHash: Int): Int =
+      val h =
+        if n.isTermName then
+          MurmurHash3.mix(initHash, TermNameHash)
+        else
+          MurmurHash3.mix(initHash, TypeNameHash)
+
+      // The hashCode of the name itself is not stable across compiler instances
+      MurmurHash3.mix(h, n.toString.hashCode)
+    end nameHash
+
+    def constantHash(c: Constant, initHash: Int): Int =
+      var h = MurmurHash3.mix(initHash, c.tag)
+      c.tag match
+        case NullTag =>
+          // No value to hash, the tag is enough.
+        case ClazzTag =>
+          // Go through `apiType` to get a value with a stable hash, it'd
+          // be better to use Murmur here too instead of relying on
+          // `hashCode`, but that would essentially mean duplicating
+          // https://github.com/sbt/zinc/blob/develop/internal/zinc-apiinfo/src/main/scala/xsbt/api/HashAPI.scala
+          // and at that point we might as well do type hashing on our own
+          // representation.
+          h = MurmurHash3.mix(h, apiType(c.typeValue).hashCode)
+        case _ =>
+          h = MurmurHash3.mix(h, c.value.hashCode)
+      h
+    end constantHash
+
+    def cannotHash(what: String, elem: Any, pos: Positioned): Unit =
+      internalError(i"Don't know how to produce a stable hash for $what", pos.sourcePos)
 
     def positionedHash(p: ast.Positioned, initHash: Int): Int =
+      var h = initHash
+
       p match
         case p: WithLazyField[?] =>
           p.forceIfLazy
         case _ =>
+
+      if inlineOrigin.exists then
+        p match
+          case ref: RefTree @unchecked =>
+            val sym = ref.symbol
+            if sym.is(Inline, butNot = Param) && !seenInlineCache.contains(sym) then
+              // An inline method that calls another inline method will eventually inline the call
+              // at a non-inline callsite, in this case if the implementation of the nested call
+              // changes, then the callsite will have a different API, we should hash the definition
+              h = MurmurHash3.mix(h, apiDefinition(sym, inlineOrigin).hashCode)
+          case _ =>
+
       // FIXME: If `p` is a tree we should probably take its type into account
       // when hashing it, but producing a stable hash for a type is not trivial
       // since the same type might have multiple representations, for method
@@ -635,12 +759,11 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
       // in Zinc that generates hashes from that, if we can reliably produce
       // stable hashes for types ourselves then we could bypass all that and
       // send Zinc hashes directly.
-      val h = MurmurHash3.mix(initHash, p.productPrefix.hashCode)
+      h = MurmurHash3.mix(h, p.productPrefix.hashCode)
       iteratorHash(p.productIterator, h)
     end positionedHash
 
     def iteratorHash(it: Iterator[Any], initHash: Int): Int =
-      import core.Constants._
       var h = initHash
       while it.hasNext do
         it.next() match
@@ -649,30 +772,11 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
           case xs: List[?] =>
             h = iteratorHash(xs.iterator, h)
           case c: Constant =>
-            h = MurmurHash3.mix(h, c.tag)
-            c.tag match
-              case NullTag =>
-                // No value to hash, the tag is enough.
-              case ClazzTag =>
-                // Go through `apiType` to get a value with a stable hash, it'd
-                // be better to use Murmur here too instead of relying on
-                // `hashCode`, but that would essentially mean duplicating
-                // https://github.com/sbt/zinc/blob/develop/internal/zinc-apiinfo/src/main/scala/xsbt/api/HashAPI.scala
-                // and at that point we might as well do type hashing on our own
-                // representation.
-                val apiValue = apiType(c.typeValue)
-                h = MurmurHash3.mix(h, apiValue.hashCode)
-              case _ =>
-                h = MurmurHash3.mix(h, c.value.hashCode)
+            h = constantHash(c, h)
           case n: Name =>
-            // The hashCode of the name itself is not stable across compiler instances
-            h = MurmurHash3.mix(h, n.toString.hashCode)
+            h = nameHash(n, h)
           case elem =>
-            internalError(
-              i"Don't know how to produce a stable hash for `$elem` of unknown class ${elem.getClass}",
-              tree.sourcePos)
-
-            h = MurmurHash3.mix(h, elem.toString.hashCode)
+            cannotHash(what = i"`$elem` of unknown class ${elem.getClass}", elem, tree)
       h
     end iteratorHash
 
@@ -681,6 +785,38 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
     MurmurHash3.finalizeHash(h, 0)
   end treeHash
 
+  /** Hash secondary type parameters in separate marker annotation.
+   *  We hash them separately because the position of type parameters is important.
+   */
+  private def hashTparamsExtras(tparamsExtras: List[(Int, List[api.TypeParameter])])(initHash: Int): Int =
+
+    def mixTparams(tparams: List[api.TypeParameter])(initHash: Int) =
+      var h = initHash
+      var elems = tparams
+      while elems.nonEmpty do
+        h = MurmurHash3.mix(h, elems.head.hashCode)
+        elems = elems.tail
+      h
+
+    def mixIndexAndTparams(index: Int, tparams: List[api.TypeParameter])(initHash: Int) =
+      mixTparams(tparams)(MurmurHash3.mix(initHash, index))
+
+    var h = initHash
+    var extras = tparamsExtras
+    var len = 0
+    while extras.nonEmpty do
+      h = mixIndexAndTparams(index = extras.head(0), tparams = extras.head(1))(h)
+      extras = extras.tail
+      len += 1
+    MurmurHash3.finalizeHash(h, len)
+  end hashTparamsExtras
+
+  /** Mix in the name hash also because otherwise switching which
+   *  parameter is inline will not affect the hash.
+   */
+  private def hashInlineParam(p: Symbol, h: Int) =
+    MurmurHash3.mix(p.name.toString.hashCode, MurmurHash3.mix(h, InlineParamHash))
+
   def apiAnnotation(annot: Annotation): api.Annotation = {
     // Like with inline defs, the whole body of the annotation and not just its
     // type is part of its API so we need to store its hash, but Zinc wants us
@@ -691,6 +827,6 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
     // annotated @org.junit.Test).
     api.Annotation.of(
       apiType(annot.tree.tpe), // Used by sbt to find tests to run
-      Array(api.AnnotationArgument.of("TREE_HASH", treeHash(annot.tree).toString)))
+      Array(api.AnnotationArgument.of("TREE_HASH", treeHash(annot.tree, inlineOrigin = NoSymbol).toString)))
   }
 }
diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala
index 860e9e3e6c4c..0dd30cd27ced 100644
--- a/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala
+++ b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala
@@ -14,6 +14,7 @@ import dotty.tools.dotc.core.Names._
 import dotty.tools.dotc.core.Phases._
 import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.core.Denotations.StaleSymbol
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.transform.SymUtils._
 import dotty.tools.dotc.util.{SrcPos, NoSourcePosition}
@@ -48,7 +49,9 @@ import scala.collection.{Set, mutable}
 class ExtractDependencies extends Phase {
   import ExtractDependencies._
 
-  override def phaseName: String = "sbt-deps"
+  override def phaseName: String = ExtractDependencies.name
+
+  override def description: String = ExtractDependencies.description
 
   override def isRunnable(using Context): Boolean = {
     def forceRun = ctx.settings.YdumpSbtInc.value || ctx.settings.YforceSbtPhases.value
@@ -179,6 +182,9 @@ class ExtractDependencies extends Phase {
 }
 
 object ExtractDependencies {
+  val name: String = "sbt-deps"
+  val description: String = "sends information on classes' dependencies to sbt"
+
   def classNameAsString(sym: Symbol)(using Context): String =
     sym.fullName.stripModuleClassSuffix.toString
 
@@ -310,14 +316,6 @@ private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeT
     }
   }
 
-  /** Mangle a JVM symbol name in a format better suited for internal uses by sbt. */
-  private def mangledName(sym: Symbol)(using Context): Name = {
-    def constructorName = sym.owner.fullName ++ ";init;"
-
-    if (sym.isConstructor) constructorName
-    else sym.name.stripModuleClassSuffix
-  }
-
   private def addMemberRefDependency(sym: Symbol)(using Context): Unit =
     if (!ignoreDependency(sym)) {
       val enclOrModuleClass = if (sym.is(ModuleVal)) sym.moduleClass else sym.enclosingClass
@@ -327,7 +325,7 @@ private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeT
       if (fromClass.exists) { // can happen when visiting imports
         assert(fromClass.isClass)
 
-        addUsedName(fromClass, mangledName(sym), UseScope.Default)
+        addUsedName(fromClass, sym.zincMangledName, UseScope.Default)
         // packages have class symbol. Only record them as used names but not dependency
         if (!sym.is(Package)) {
           _dependencies += ClassDependency(fromClass, enclOrModuleClass, DependencyByMemberRef)
@@ -348,12 +346,17 @@ private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeT
     else DependencyByInheritance
 
   private def ignoreDependency(sym: Symbol)(using Context) =
-    !sym.exists ||
-    sym.isAbsent(canForce = false) || // ignore dependencies that have a symbol but do not exist.
-                                      // e.g. java.lang.Object companion object
-    sym.isEffectiveRoot ||
-    sym.isAnonymousFunction ||
-    sym.isAnonymousClass
+    try
+      !sym.exists ||
+      sym.isAbsent(canForce = false) || // ignore dependencies that have a symbol but do not exist.
+                                        // e.g. java.lang.Object companion object
+      sym.isEffectiveRoot ||
+      sym.isAnonymousFunction ||
+      sym.isAnonymousClass
+    catch case ex: StaleSymbol =>
+      // can happen for constructor proxies. Test case is pos-macros/i13532.
+      true
+
 
   /** Traverse the tree of a source file and record the dependencies and used names which
    *  can be retrieved using `dependencies` and`usedNames`.
@@ -455,18 +458,20 @@ private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeT
   private abstract class TypeDependencyTraverser(using Context) extends TypeTraverser() {
     protected def addDependency(symbol: Symbol): Unit
 
-    val seen = new mutable.HashSet[Type]
+    // Avoid cycles by remembering both the types (testcase:
+    // tests/run/enum-values.scala) and the symbols of named types (testcase:
+    // tests/pos-java-interop/i13575) we've seen before.
+    val seen = new mutable.HashSet[Symbol | Type]
     def traverse(tp: Type): Unit = if (!seen.contains(tp)) {
       seen += tp
       tp match {
         case tp: NamedType =>
           val sym = tp.symbol
-          if (!sym.is(Package)) {
+          if !seen.contains(sym) && !sym.is(Package) then
+            seen += sym
             addDependency(sym)
-            if (!sym.isClass)
-              traverse(tp.info)
+            if !sym.isClass then traverse(tp.info)
             traverse(tp.prefix)
-          }
         case tp: ThisType =>
           traverse(tp.underlying)
         case tp: ConstantType =>
@@ -490,7 +495,7 @@ private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeT
     val traverser = new TypeDependencyTraverser {
       def addDependency(symbol: Symbol) =
         if (!ignoreDependency(symbol) && symbol.is(Sealed)) {
-          val usedName = mangledName(symbol)
+          val usedName = symbol.zincMangledName
           addUsedName(usedName, UseScope.PatMatTarget)
         }
     }
diff --git a/compiler/src/dotty/tools/dotc/sbt/package.scala b/compiler/src/dotty/tools/dotc/sbt/package.scala
new file mode 100644
index 000000000000..379a2e45ce40
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/sbt/package.scala
@@ -0,0 +1,20 @@
+package dotty.tools.dotc.sbt
+
+import dotty.tools.dotc.core.Contexts.Context
+import dotty.tools.dotc.core.Symbols.Symbol
+import dotty.tools.dotc.core.NameOps.stripModuleClassSuffix
+import dotty.tools.dotc.core.Names.Name
+
+inline val TermNameHash = 1987 // 300th prime
+inline val TypeNameHash = 1993 // 301st prime
+inline val InlineParamHash = 1997 // 302nd prime
+
+extension (sym: Symbol)
+
+  def constructorName(using Context) =
+    sym.owner.fullName ++ ";init;"
+
+  /** Mangle a JVM symbol name in a format better suited for internal uses by sbt. */
+  def zincMangledName(using Context): Name =
+    if (sym.isConstructor) constructorName
+    else sym.name.stripModuleClassSuffix
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Access.scala b/compiler/src/dotty/tools/dotc/semanticdb/Access.scala
new file mode 100644
index 000000000000..6fb67be23ac7
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Access.scala
@@ -0,0 +1,651 @@
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
+
+package dotty.tools.dotc.semanticdb
+import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
+
+sealed trait Access  extends SemanticdbGeneratedSealedOneof  derives CanEqual {
+  type MessageType = dotty.tools.dotc.semanticdb.AccessMessage
+  final def isEmpty = this.isInstanceOf[dotty.tools.dotc.semanticdb.Access.Empty.type]
+  final def isDefined = !isEmpty
+  final def asMessage: dotty.tools.dotc.semanticdb.AccessMessage = dotty.tools.dotc.semanticdb.Access.AccessTypeMapper.toBase(this)
+  final def asNonEmpty: Option[dotty.tools.dotc.semanticdb.Access.NonEmpty] = if (isEmpty) None else Some(this.asInstanceOf[dotty.tools.dotc.semanticdb.Access.NonEmpty])
+}
+
+object Access {
+  case object Empty extends dotty.tools.dotc.semanticdb.Access
+  
+  sealed trait NonEmpty extends dotty.tools.dotc.semanticdb.Access
+  def defaultInstance: dotty.tools.dotc.semanticdb.Access = Empty
+  
+  implicit val AccessTypeMapper: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.AccessMessage, dotty.tools.dotc.semanticdb.Access] = new SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.AccessMessage, dotty.tools.dotc.semanticdb.Access] {
+    override def toCustom(__base: dotty.tools.dotc.semanticdb.AccessMessage): dotty.tools.dotc.semanticdb.Access = __base.sealedValue match {
+      case __v: dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PrivateAccess => __v.value
+      case __v: dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PrivateThisAccess => __v.value
+      case __v: dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PrivateWithinAccess => __v.value
+      case __v: dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.ProtectedAccess => __v.value
+      case __v: dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.ProtectedThisAccess => __v.value
+      case __v: dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.ProtectedWithinAccess => __v.value
+      case __v: dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PublicAccess => __v.value
+      case dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.Empty => Empty
+    }
+    override def toBase(__custom: dotty.tools.dotc.semanticdb.Access): dotty.tools.dotc.semanticdb.AccessMessage = dotty.tools.dotc.semanticdb.AccessMessage(__custom match {
+      case __v: dotty.tools.dotc.semanticdb.PrivateAccess => dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PrivateAccess(__v)
+      case __v: dotty.tools.dotc.semanticdb.PrivateThisAccess => dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PrivateThisAccess(__v)
+      case __v: dotty.tools.dotc.semanticdb.PrivateWithinAccess => dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PrivateWithinAccess(__v)
+      case __v: dotty.tools.dotc.semanticdb.ProtectedAccess => dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.ProtectedAccess(__v)
+      case __v: dotty.tools.dotc.semanticdb.ProtectedThisAccess => dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.ProtectedThisAccess(__v)
+      case __v: dotty.tools.dotc.semanticdb.ProtectedWithinAccess => dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.ProtectedWithinAccess(__v)
+      case __v: dotty.tools.dotc.semanticdb.PublicAccess => dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PublicAccess(__v)
+      case Empty => dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.Empty
+    })
+  }
+}
+@SerialVersionUID(0L)
+final case class AccessMessage(
+    sealedValue: dotty.tools.dotc.semanticdb.AccessMessage.SealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.Empty
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (sealedValue.privateAccess.isDefined) {
+        val __value = sealedValue.privateAccess.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.privateThisAccess.isDefined) {
+        val __value = sealedValue.privateThisAccess.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.privateWithinAccess.isDefined) {
+        val __value = sealedValue.privateWithinAccess.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.protectedAccess.isDefined) {
+        val __value = sealedValue.protectedAccess.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.protectedThisAccess.isDefined) {
+        val __value = sealedValue.protectedThisAccess.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.protectedWithinAccess.isDefined) {
+        val __value = sealedValue.protectedWithinAccess.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.publicAccess.isDefined) {
+        val __value = sealedValue.publicAccess.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      sealedValue.privateAccess.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.privateThisAccess.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(2, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.privateWithinAccess.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(3, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.protectedAccess.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(4, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.protectedThisAccess.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(5, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.protectedWithinAccess.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(6, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.publicAccess.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(7, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def getPrivateAccess: dotty.tools.dotc.semanticdb.PrivateAccess = sealedValue.privateAccess.getOrElse(dotty.tools.dotc.semanticdb.PrivateAccess.defaultInstance)
+    def withPrivateAccess(__v: dotty.tools.dotc.semanticdb.PrivateAccess): AccessMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PrivateAccess(__v))
+    def getPrivateThisAccess: dotty.tools.dotc.semanticdb.PrivateThisAccess = sealedValue.privateThisAccess.getOrElse(dotty.tools.dotc.semanticdb.PrivateThisAccess.defaultInstance)
+    def withPrivateThisAccess(__v: dotty.tools.dotc.semanticdb.PrivateThisAccess): AccessMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PrivateThisAccess(__v))
+    def getPrivateWithinAccess: dotty.tools.dotc.semanticdb.PrivateWithinAccess = sealedValue.privateWithinAccess.getOrElse(dotty.tools.dotc.semanticdb.PrivateWithinAccess.defaultInstance)
+    def withPrivateWithinAccess(__v: dotty.tools.dotc.semanticdb.PrivateWithinAccess): AccessMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PrivateWithinAccess(__v))
+    def getProtectedAccess: dotty.tools.dotc.semanticdb.ProtectedAccess = sealedValue.protectedAccess.getOrElse(dotty.tools.dotc.semanticdb.ProtectedAccess.defaultInstance)
+    def withProtectedAccess(__v: dotty.tools.dotc.semanticdb.ProtectedAccess): AccessMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.ProtectedAccess(__v))
+    def getProtectedThisAccess: dotty.tools.dotc.semanticdb.ProtectedThisAccess = sealedValue.protectedThisAccess.getOrElse(dotty.tools.dotc.semanticdb.ProtectedThisAccess.defaultInstance)
+    def withProtectedThisAccess(__v: dotty.tools.dotc.semanticdb.ProtectedThisAccess): AccessMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.ProtectedThisAccess(__v))
+    def getProtectedWithinAccess: dotty.tools.dotc.semanticdb.ProtectedWithinAccess = sealedValue.protectedWithinAccess.getOrElse(dotty.tools.dotc.semanticdb.ProtectedWithinAccess.defaultInstance)
+    def withProtectedWithinAccess(__v: dotty.tools.dotc.semanticdb.ProtectedWithinAccess): AccessMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.ProtectedWithinAccess(__v))
+    def getPublicAccess: dotty.tools.dotc.semanticdb.PublicAccess = sealedValue.publicAccess.getOrElse(dotty.tools.dotc.semanticdb.PublicAccess.defaultInstance)
+    def withPublicAccess(__v: dotty.tools.dotc.semanticdb.PublicAccess): AccessMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PublicAccess(__v))
+    def clearSealedValue: AccessMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.Empty)
+    def withSealedValue(__v: dotty.tools.dotc.semanticdb.AccessMessage.SealedValue): AccessMessage = copy(sealedValue = __v)
+    
+    
+    
+    
+    def toAccess: dotty.tools.dotc.semanticdb.Access = dotty.tools.dotc.semanticdb.Access.AccessTypeMapper.toCustom(this)
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.Access])
+}
+
+object AccessMessage  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.AccessMessage] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.AccessMessage] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.AccessMessage = {
+    var __sealedValue: dotty.tools.dotc.semanticdb.AccessMessage.SealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.Empty
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PrivateAccess(__sealedValue.privateAccess.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.PrivateAccess](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PrivateThisAccess(__sealedValue.privateThisAccess.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.PrivateThisAccess](_input__))(LiteParser.readMessage(_input__, _)))
+        case 26 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PrivateWithinAccess(__sealedValue.privateWithinAccess.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.PrivateWithinAccess](_input__))(LiteParser.readMessage(_input__, _)))
+        case 34 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.ProtectedAccess(__sealedValue.protectedAccess.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ProtectedAccess](_input__))(LiteParser.readMessage(_input__, _)))
+        case 42 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.ProtectedThisAccess(__sealedValue.protectedThisAccess.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ProtectedThisAccess](_input__))(LiteParser.readMessage(_input__, _)))
+        case 50 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.ProtectedWithinAccess(__sealedValue.protectedWithinAccess.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ProtectedWithinAccess](_input__))(LiteParser.readMessage(_input__, _)))
+        case 58 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.PublicAccess(__sealedValue.publicAccess.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.PublicAccess](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.AccessMessage(
+        sealedValue = __sealedValue
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.AccessMessage(
+    sealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.Empty
+  )
+  sealed trait SealedValue  extends SemanticdbGeneratedOneof  derives CanEqual {
+    def isEmpty: _root_.scala.Boolean = false
+    def isDefined: _root_.scala.Boolean = true
+    def isPrivateAccess: _root_.scala.Boolean = false
+    def isPrivateThisAccess: _root_.scala.Boolean = false
+    def isPrivateWithinAccess: _root_.scala.Boolean = false
+    def isProtectedAccess: _root_.scala.Boolean = false
+    def isProtectedThisAccess: _root_.scala.Boolean = false
+    def isProtectedWithinAccess: _root_.scala.Boolean = false
+    def isPublicAccess: _root_.scala.Boolean = false
+    def privateAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.PrivateAccess] = _root_.scala.None
+    def privateThisAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.PrivateThisAccess] = _root_.scala.None
+    def privateWithinAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.PrivateWithinAccess] = _root_.scala.None
+    def protectedAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.ProtectedAccess] = _root_.scala.None
+    def protectedThisAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.ProtectedThisAccess] = _root_.scala.None
+    def protectedWithinAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.ProtectedWithinAccess] = _root_.scala.None
+    def publicAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.PublicAccess] = _root_.scala.None
+  }
+  object SealedValue {
+    @SerialVersionUID(0L)
+    case object Empty extends dotty.tools.dotc.semanticdb.AccessMessage.SealedValue {
+      type ValueType = _root_.scala.Nothing
+      override def isEmpty: _root_.scala.Boolean = true
+      override def isDefined: _root_.scala.Boolean = false
+      override def number: _root_.scala.Int = 0
+      override def value: _root_.scala.Nothing = throw new java.util.NoSuchElementException("Empty.value")
+    }
+  
+    @SerialVersionUID(0L)
+    final case class PrivateAccess(value: dotty.tools.dotc.semanticdb.PrivateAccess) extends dotty.tools.dotc.semanticdb.AccessMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.PrivateAccess
+      override def isPrivateAccess: _root_.scala.Boolean = true
+      override def privateAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.PrivateAccess] = Some(value)
+      override def number: _root_.scala.Int = 1
+    }
+    @SerialVersionUID(0L)
+    final case class PrivateThisAccess(value: dotty.tools.dotc.semanticdb.PrivateThisAccess) extends dotty.tools.dotc.semanticdb.AccessMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.PrivateThisAccess
+      override def isPrivateThisAccess: _root_.scala.Boolean = true
+      override def privateThisAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.PrivateThisAccess] = Some(value)
+      override def number: _root_.scala.Int = 2
+    }
+    @SerialVersionUID(0L)
+    final case class PrivateWithinAccess(value: dotty.tools.dotc.semanticdb.PrivateWithinAccess) extends dotty.tools.dotc.semanticdb.AccessMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.PrivateWithinAccess
+      override def isPrivateWithinAccess: _root_.scala.Boolean = true
+      override def privateWithinAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.PrivateWithinAccess] = Some(value)
+      override def number: _root_.scala.Int = 3
+    }
+    @SerialVersionUID(0L)
+    final case class ProtectedAccess(value: dotty.tools.dotc.semanticdb.ProtectedAccess) extends dotty.tools.dotc.semanticdb.AccessMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.ProtectedAccess
+      override def isProtectedAccess: _root_.scala.Boolean = true
+      override def protectedAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.ProtectedAccess] = Some(value)
+      override def number: _root_.scala.Int = 4
+    }
+    @SerialVersionUID(0L)
+    final case class ProtectedThisAccess(value: dotty.tools.dotc.semanticdb.ProtectedThisAccess) extends dotty.tools.dotc.semanticdb.AccessMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.ProtectedThisAccess
+      override def isProtectedThisAccess: _root_.scala.Boolean = true
+      override def protectedThisAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.ProtectedThisAccess] = Some(value)
+      override def number: _root_.scala.Int = 5
+    }
+    @SerialVersionUID(0L)
+    final case class ProtectedWithinAccess(value: dotty.tools.dotc.semanticdb.ProtectedWithinAccess) extends dotty.tools.dotc.semanticdb.AccessMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.ProtectedWithinAccess
+      override def isProtectedWithinAccess: _root_.scala.Boolean = true
+      override def protectedWithinAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.ProtectedWithinAccess] = Some(value)
+      override def number: _root_.scala.Int = 6
+    }
+    @SerialVersionUID(0L)
+    final case class PublicAccess(value: dotty.tools.dotc.semanticdb.PublicAccess) extends dotty.tools.dotc.semanticdb.AccessMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.PublicAccess
+      override def isPublicAccess: _root_.scala.Boolean = true
+      override def publicAccess: _root_.scala.Option[dotty.tools.dotc.semanticdb.PublicAccess] = Some(value)
+      override def number: _root_.scala.Int = 7
+    }
+  }
+  final val PRIVATE_ACCESS_FIELD_NUMBER = 1
+  final val PRIVATE_THIS_ACCESS_FIELD_NUMBER = 2
+  final val PRIVATE_WITHIN_ACCESS_FIELD_NUMBER = 3
+  final val PROTECTED_ACCESS_FIELD_NUMBER = 4
+  final val PROTECTED_THIS_ACCESS_FIELD_NUMBER = 5
+  final val PROTECTED_WITHIN_ACCESS_FIELD_NUMBER = 6
+  final val PUBLIC_ACCESS_FIELD_NUMBER = 7
+  def of(
+    sealedValue: dotty.tools.dotc.semanticdb.AccessMessage.SealedValue
+  ): _root_.dotty.tools.dotc.semanticdb.AccessMessage = _root_.dotty.tools.dotc.semanticdb.AccessMessage(
+    sealedValue
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Access])
+}
+
+@SerialVersionUID(0L)
+final case class PrivateAccess(
+    )  extends dotty.tools.dotc.semanticdb.Access.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    final override def serializedSize: _root_.scala.Int = 0
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+    }
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.PrivateAccess])
+}
+
+object PrivateAccess  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.PrivateAccess] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.PrivateAccess] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.PrivateAccess = {
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.PrivateAccess(
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.PrivateAccess(
+  )
+  def of(
+  ): _root_.dotty.tools.dotc.semanticdb.PrivateAccess = _root_.dotty.tools.dotc.semanticdb.PrivateAccess(
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.PrivateAccess])
+}
+
+@SerialVersionUID(0L)
+final case class PrivateThisAccess(
+    )  extends dotty.tools.dotc.semanticdb.Access.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    final override def serializedSize: _root_.scala.Int = 0
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+    }
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.PrivateThisAccess])
+}
+
+object PrivateThisAccess  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.PrivateThisAccess] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.PrivateThisAccess] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.PrivateThisAccess = {
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.PrivateThisAccess(
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.PrivateThisAccess(
+  )
+  def of(
+  ): _root_.dotty.tools.dotc.semanticdb.PrivateThisAccess = _root_.dotty.tools.dotc.semanticdb.PrivateThisAccess(
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.PrivateThisAccess])
+}
+
+@SerialVersionUID(0L)
+final case class PrivateWithinAccess(
+    symbol: _root_.scala.Predef.String = ""
+    )  extends dotty.tools.dotc.semanticdb.Access.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = symbol
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = symbol
+        if (!__v.isEmpty) {
+          _output__.writeString(1, __v)
+        }
+      };
+    }
+    def withSymbol(__v: _root_.scala.Predef.String): PrivateWithinAccess = copy(symbol = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.PrivateWithinAccess])
+}
+
+object PrivateWithinAccess  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.PrivateWithinAccess] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.PrivateWithinAccess] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.PrivateWithinAccess = {
+    var __symbol: _root_.scala.Predef.String = ""
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __symbol = _input__.readStringRequireUtf8()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.PrivateWithinAccess(
+        symbol = __symbol
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.PrivateWithinAccess(
+    symbol = ""
+  )
+  final val SYMBOL_FIELD_NUMBER = 1
+  def of(
+    symbol: _root_.scala.Predef.String
+  ): _root_.dotty.tools.dotc.semanticdb.PrivateWithinAccess = _root_.dotty.tools.dotc.semanticdb.PrivateWithinAccess(
+    symbol
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.PrivateWithinAccess])
+}
+
+@SerialVersionUID(0L)
+final case class ProtectedAccess(
+    )  extends dotty.tools.dotc.semanticdb.Access.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    final override def serializedSize: _root_.scala.Int = 0
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+    }
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.ProtectedAccess])
+}
+
+object ProtectedAccess  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ProtectedAccess] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ProtectedAccess] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ProtectedAccess = {
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ProtectedAccess(
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ProtectedAccess(
+  )
+  def of(
+  ): _root_.dotty.tools.dotc.semanticdb.ProtectedAccess = _root_.dotty.tools.dotc.semanticdb.ProtectedAccess(
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ProtectedAccess])
+}
+
+@SerialVersionUID(0L)
+final case class ProtectedThisAccess(
+    )  extends dotty.tools.dotc.semanticdb.Access.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    final override def serializedSize: _root_.scala.Int = 0
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+    }
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.ProtectedThisAccess])
+}
+
+object ProtectedThisAccess  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ProtectedThisAccess] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ProtectedThisAccess] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ProtectedThisAccess = {
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ProtectedThisAccess(
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ProtectedThisAccess(
+  )
+  def of(
+  ): _root_.dotty.tools.dotc.semanticdb.ProtectedThisAccess = _root_.dotty.tools.dotc.semanticdb.ProtectedThisAccess(
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ProtectedThisAccess])
+}
+
+@SerialVersionUID(0L)
+final case class ProtectedWithinAccess(
+    symbol: _root_.scala.Predef.String = ""
+    )  extends dotty.tools.dotc.semanticdb.Access.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = symbol
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = symbol
+        if (!__v.isEmpty) {
+          _output__.writeString(1, __v)
+        }
+      };
+    }
+    def withSymbol(__v: _root_.scala.Predef.String): ProtectedWithinAccess = copy(symbol = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.ProtectedWithinAccess])
+}
+
+object ProtectedWithinAccess  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ProtectedWithinAccess] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ProtectedWithinAccess] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ProtectedWithinAccess = {
+    var __symbol: _root_.scala.Predef.String = ""
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __symbol = _input__.readStringRequireUtf8()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ProtectedWithinAccess(
+        symbol = __symbol
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ProtectedWithinAccess(
+    symbol = ""
+  )
+  final val SYMBOL_FIELD_NUMBER = 1
+  def of(
+    symbol: _root_.scala.Predef.String
+  ): _root_.dotty.tools.dotc.semanticdb.ProtectedWithinAccess = _root_.dotty.tools.dotc.semanticdb.ProtectedWithinAccess(
+    symbol
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ProtectedWithinAccess])
+}
+
+@SerialVersionUID(0L)
+final case class PublicAccess(
+    )  extends dotty.tools.dotc.semanticdb.Access.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    final override def serializedSize: _root_.scala.Int = 0
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+    }
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.PublicAccess])
+}
+
+object PublicAccess  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.PublicAccess] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.PublicAccess] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.PublicAccess = {
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.PublicAccess(
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.PublicAccess(
+  )
+  def of(
+  ): _root_.dotty.tools.dotc.semanticdb.PublicAccess = _root_.dotty.tools.dotc.semanticdb.PublicAccess(
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.PublicAccess])
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Annotation.scala b/compiler/src/dotty/tools/dotc/semanticdb/Annotation.scala
new file mode 100644
index 000000000000..214354bd4cf8
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Annotation.scala
@@ -0,0 +1,90 @@
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
+
+package dotty.tools.dotc.semanticdb
+import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
+
+@SerialVersionUID(0L)
+final case class Annotation(
+    tpe: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.Annotation._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.Annotation._typemapper_tpe.toBase(tpe)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.Annotation._typemapper_tpe.toBase(tpe)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+    }
+    def withTpe(__v: dotty.tools.dotc.semanticdb.Type): Annotation = copy(tpe = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.Annotation])
+}
+
+object Annotation  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Annotation] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Annotation] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.Annotation = {
+    var __tpe: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __tpe = _root_.scala.Some(__tpe.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.Annotation(
+        tpe = dotty.tools.dotc.semanticdb.Annotation._typemapper_tpe.toCustom(__tpe.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.Annotation(
+    tpe = dotty.tools.dotc.semanticdb.Annotation._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+  )
+  final val TPE_FIELD_NUMBER = 1
+  @transient @sharable
+  private[semanticdb] val _typemapper_tpe: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    tpe: dotty.tools.dotc.semanticdb.Type
+  ): _root_.dotty.tools.dotc.semanticdb.Annotation = _root_.dotty.tools.dotc.semanticdb.Annotation(
+    tpe
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Annotation])
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Constant.scala b/compiler/src/dotty/tools/dotc/semanticdb/Constant.scala
new file mode 100644
index 000000000000..1f8f7778494d
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Constant.scala
@@ -0,0 +1,1171 @@
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
+
+package dotty.tools.dotc.semanticdb
+import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
+
+sealed trait Constant  extends SemanticdbGeneratedSealedOneof  derives CanEqual {
+  type MessageType = dotty.tools.dotc.semanticdb.ConstantMessage
+  final def isEmpty = this.isInstanceOf[dotty.tools.dotc.semanticdb.Constant.Empty.type]
+  final def isDefined = !isEmpty
+  final def asMessage: dotty.tools.dotc.semanticdb.ConstantMessage = dotty.tools.dotc.semanticdb.Constant.ConstantTypeMapper.toBase(this)
+  final def asNonEmpty: Option[dotty.tools.dotc.semanticdb.Constant.NonEmpty] = if (isEmpty) None else Some(this.asInstanceOf[dotty.tools.dotc.semanticdb.Constant.NonEmpty])
+}
+
+object Constant {
+  case object Empty extends dotty.tools.dotc.semanticdb.Constant
+  
+  sealed trait NonEmpty extends dotty.tools.dotc.semanticdb.Constant
+  def defaultInstance: dotty.tools.dotc.semanticdb.Constant = Empty
+  
+  implicit val ConstantTypeMapper: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.ConstantMessage, dotty.tools.dotc.semanticdb.Constant] = new SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.ConstantMessage, dotty.tools.dotc.semanticdb.Constant] {
+    override def toCustom(__base: dotty.tools.dotc.semanticdb.ConstantMessage): dotty.tools.dotc.semanticdb.Constant = __base.sealedValue match {
+      case __v: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.UnitConstant => __v.value
+      case __v: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.BooleanConstant => __v.value
+      case __v: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.ByteConstant => __v.value
+      case __v: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.ShortConstant => __v.value
+      case __v: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.CharConstant => __v.value
+      case __v: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.IntConstant => __v.value
+      case __v: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.LongConstant => __v.value
+      case __v: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.FloatConstant => __v.value
+      case __v: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.DoubleConstant => __v.value
+      case __v: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.StringConstant => __v.value
+      case __v: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.NullConstant => __v.value
+      case dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.Empty => Empty
+    }
+    override def toBase(__custom: dotty.tools.dotc.semanticdb.Constant): dotty.tools.dotc.semanticdb.ConstantMessage = dotty.tools.dotc.semanticdb.ConstantMessage(__custom match {
+      case __v: dotty.tools.dotc.semanticdb.UnitConstant => dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.UnitConstant(__v)
+      case __v: dotty.tools.dotc.semanticdb.BooleanConstant => dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.BooleanConstant(__v)
+      case __v: dotty.tools.dotc.semanticdb.ByteConstant => dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.ByteConstant(__v)
+      case __v: dotty.tools.dotc.semanticdb.ShortConstant => dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.ShortConstant(__v)
+      case __v: dotty.tools.dotc.semanticdb.CharConstant => dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.CharConstant(__v)
+      case __v: dotty.tools.dotc.semanticdb.IntConstant => dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.IntConstant(__v)
+      case __v: dotty.tools.dotc.semanticdb.LongConstant => dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.LongConstant(__v)
+      case __v: dotty.tools.dotc.semanticdb.FloatConstant => dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.FloatConstant(__v)
+      case __v: dotty.tools.dotc.semanticdb.DoubleConstant => dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.DoubleConstant(__v)
+      case __v: dotty.tools.dotc.semanticdb.StringConstant => dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.StringConstant(__v)
+      case __v: dotty.tools.dotc.semanticdb.NullConstant => dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.NullConstant(__v)
+      case Empty => dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.Empty
+    })
+  }
+}
+@SerialVersionUID(0L)
+final case class ConstantMessage(
+    sealedValue: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.Empty
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (sealedValue.unitConstant.isDefined) {
+        val __value = sealedValue.unitConstant.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.booleanConstant.isDefined) {
+        val __value = sealedValue.booleanConstant.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.byteConstant.isDefined) {
+        val __value = sealedValue.byteConstant.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.shortConstant.isDefined) {
+        val __value = sealedValue.shortConstant.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.charConstant.isDefined) {
+        val __value = sealedValue.charConstant.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.intConstant.isDefined) {
+        val __value = sealedValue.intConstant.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.longConstant.isDefined) {
+        val __value = sealedValue.longConstant.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.floatConstant.isDefined) {
+        val __value = sealedValue.floatConstant.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.doubleConstant.isDefined) {
+        val __value = sealedValue.doubleConstant.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.stringConstant.isDefined) {
+        val __value = sealedValue.stringConstant.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.nullConstant.isDefined) {
+        val __value = sealedValue.nullConstant.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      sealedValue.unitConstant.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.booleanConstant.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(2, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.byteConstant.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(3, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.shortConstant.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(4, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.charConstant.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(5, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.intConstant.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(6, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.longConstant.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(7, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.floatConstant.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(8, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.doubleConstant.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(9, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.stringConstant.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(10, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.nullConstant.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(11, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def getUnitConstant: dotty.tools.dotc.semanticdb.UnitConstant = sealedValue.unitConstant.getOrElse(dotty.tools.dotc.semanticdb.UnitConstant.defaultInstance)
+    def withUnitConstant(__v: dotty.tools.dotc.semanticdb.UnitConstant): ConstantMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.UnitConstant(__v))
+    def getBooleanConstant: dotty.tools.dotc.semanticdb.BooleanConstant = sealedValue.booleanConstant.getOrElse(dotty.tools.dotc.semanticdb.BooleanConstant.defaultInstance)
+    def withBooleanConstant(__v: dotty.tools.dotc.semanticdb.BooleanConstant): ConstantMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.BooleanConstant(__v))
+    def getByteConstant: dotty.tools.dotc.semanticdb.ByteConstant = sealedValue.byteConstant.getOrElse(dotty.tools.dotc.semanticdb.ByteConstant.defaultInstance)
+    def withByteConstant(__v: dotty.tools.dotc.semanticdb.ByteConstant): ConstantMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.ByteConstant(__v))
+    def getShortConstant: dotty.tools.dotc.semanticdb.ShortConstant = sealedValue.shortConstant.getOrElse(dotty.tools.dotc.semanticdb.ShortConstant.defaultInstance)
+    def withShortConstant(__v: dotty.tools.dotc.semanticdb.ShortConstant): ConstantMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.ShortConstant(__v))
+    def getCharConstant: dotty.tools.dotc.semanticdb.CharConstant = sealedValue.charConstant.getOrElse(dotty.tools.dotc.semanticdb.CharConstant.defaultInstance)
+    def withCharConstant(__v: dotty.tools.dotc.semanticdb.CharConstant): ConstantMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.CharConstant(__v))
+    def getIntConstant: dotty.tools.dotc.semanticdb.IntConstant = sealedValue.intConstant.getOrElse(dotty.tools.dotc.semanticdb.IntConstant.defaultInstance)
+    def withIntConstant(__v: dotty.tools.dotc.semanticdb.IntConstant): ConstantMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.IntConstant(__v))
+    def getLongConstant: dotty.tools.dotc.semanticdb.LongConstant = sealedValue.longConstant.getOrElse(dotty.tools.dotc.semanticdb.LongConstant.defaultInstance)
+    def withLongConstant(__v: dotty.tools.dotc.semanticdb.LongConstant): ConstantMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.LongConstant(__v))
+    def getFloatConstant: dotty.tools.dotc.semanticdb.FloatConstant = sealedValue.floatConstant.getOrElse(dotty.tools.dotc.semanticdb.FloatConstant.defaultInstance)
+    def withFloatConstant(__v: dotty.tools.dotc.semanticdb.FloatConstant): ConstantMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.FloatConstant(__v))
+    def getDoubleConstant: dotty.tools.dotc.semanticdb.DoubleConstant = sealedValue.doubleConstant.getOrElse(dotty.tools.dotc.semanticdb.DoubleConstant.defaultInstance)
+    def withDoubleConstant(__v: dotty.tools.dotc.semanticdb.DoubleConstant): ConstantMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.DoubleConstant(__v))
+    def getStringConstant: dotty.tools.dotc.semanticdb.StringConstant = sealedValue.stringConstant.getOrElse(dotty.tools.dotc.semanticdb.StringConstant.defaultInstance)
+    def withStringConstant(__v: dotty.tools.dotc.semanticdb.StringConstant): ConstantMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.StringConstant(__v))
+    def getNullConstant: dotty.tools.dotc.semanticdb.NullConstant = sealedValue.nullConstant.getOrElse(dotty.tools.dotc.semanticdb.NullConstant.defaultInstance)
+    def withNullConstant(__v: dotty.tools.dotc.semanticdb.NullConstant): ConstantMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.NullConstant(__v))
+    def clearSealedValue: ConstantMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.Empty)
+    def withSealedValue(__v: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue): ConstantMessage = copy(sealedValue = __v)
+    
+    
+    
+    
+    def toConstant: dotty.tools.dotc.semanticdb.Constant = dotty.tools.dotc.semanticdb.Constant.ConstantTypeMapper.toCustom(this)
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.Constant])
+}
+
+object ConstantMessage  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ConstantMessage] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ConstantMessage] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ConstantMessage = {
+    var __sealedValue: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.Empty
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.UnitConstant(__sealedValue.unitConstant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.UnitConstant](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.BooleanConstant(__sealedValue.booleanConstant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.BooleanConstant](_input__))(LiteParser.readMessage(_input__, _)))
+        case 26 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.ByteConstant(__sealedValue.byteConstant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ByteConstant](_input__))(LiteParser.readMessage(_input__, _)))
+        case 34 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.ShortConstant(__sealedValue.shortConstant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ShortConstant](_input__))(LiteParser.readMessage(_input__, _)))
+        case 42 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.CharConstant(__sealedValue.charConstant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.CharConstant](_input__))(LiteParser.readMessage(_input__, _)))
+        case 50 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.IntConstant(__sealedValue.intConstant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.IntConstant](_input__))(LiteParser.readMessage(_input__, _)))
+        case 58 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.LongConstant(__sealedValue.longConstant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.LongConstant](_input__))(LiteParser.readMessage(_input__, _)))
+        case 66 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.FloatConstant(__sealedValue.floatConstant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.FloatConstant](_input__))(LiteParser.readMessage(_input__, _)))
+        case 74 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.DoubleConstant(__sealedValue.doubleConstant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.DoubleConstant](_input__))(LiteParser.readMessage(_input__, _)))
+        case 82 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.StringConstant(__sealedValue.stringConstant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.StringConstant](_input__))(LiteParser.readMessage(_input__, _)))
+        case 90 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.NullConstant(__sealedValue.nullConstant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.NullConstant](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ConstantMessage(
+        sealedValue = __sealedValue
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ConstantMessage(
+    sealedValue = dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue.Empty
+  )
+  sealed trait SealedValue  extends SemanticdbGeneratedOneof  derives CanEqual {
+    def isEmpty: _root_.scala.Boolean = false
+    def isDefined: _root_.scala.Boolean = true
+    def isUnitConstant: _root_.scala.Boolean = false
+    def isBooleanConstant: _root_.scala.Boolean = false
+    def isByteConstant: _root_.scala.Boolean = false
+    def isShortConstant: _root_.scala.Boolean = false
+    def isCharConstant: _root_.scala.Boolean = false
+    def isIntConstant: _root_.scala.Boolean = false
+    def isLongConstant: _root_.scala.Boolean = false
+    def isFloatConstant: _root_.scala.Boolean = false
+    def isDoubleConstant: _root_.scala.Boolean = false
+    def isStringConstant: _root_.scala.Boolean = false
+    def isNullConstant: _root_.scala.Boolean = false
+    def unitConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.UnitConstant] = _root_.scala.None
+    def booleanConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.BooleanConstant] = _root_.scala.None
+    def byteConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.ByteConstant] = _root_.scala.None
+    def shortConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.ShortConstant] = _root_.scala.None
+    def charConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.CharConstant] = _root_.scala.None
+    def intConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.IntConstant] = _root_.scala.None
+    def longConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.LongConstant] = _root_.scala.None
+    def floatConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.FloatConstant] = _root_.scala.None
+    def doubleConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.DoubleConstant] = _root_.scala.None
+    def stringConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.StringConstant] = _root_.scala.None
+    def nullConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.NullConstant] = _root_.scala.None
+  }
+  object SealedValue {
+    @SerialVersionUID(0L)
+    case object Empty extends dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue {
+      type ValueType = _root_.scala.Nothing
+      override def isEmpty: _root_.scala.Boolean = true
+      override def isDefined: _root_.scala.Boolean = false
+      override def number: _root_.scala.Int = 0
+      override def value: _root_.scala.Nothing = throw new java.util.NoSuchElementException("Empty.value")
+    }
+  
+    @SerialVersionUID(0L)
+    final case class UnitConstant(value: dotty.tools.dotc.semanticdb.UnitConstant) extends dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.UnitConstant
+      override def isUnitConstant: _root_.scala.Boolean = true
+      override def unitConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.UnitConstant] = Some(value)
+      override def number: _root_.scala.Int = 1
+    }
+    @SerialVersionUID(0L)
+    final case class BooleanConstant(value: dotty.tools.dotc.semanticdb.BooleanConstant) extends dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.BooleanConstant
+      override def isBooleanConstant: _root_.scala.Boolean = true
+      override def booleanConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.BooleanConstant] = Some(value)
+      override def number: _root_.scala.Int = 2
+    }
+    @SerialVersionUID(0L)
+    final case class ByteConstant(value: dotty.tools.dotc.semanticdb.ByteConstant) extends dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.ByteConstant
+      override def isByteConstant: _root_.scala.Boolean = true
+      override def byteConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.ByteConstant] = Some(value)
+      override def number: _root_.scala.Int = 3
+    }
+    @SerialVersionUID(0L)
+    final case class ShortConstant(value: dotty.tools.dotc.semanticdb.ShortConstant) extends dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.ShortConstant
+      override def isShortConstant: _root_.scala.Boolean = true
+      override def shortConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.ShortConstant] = Some(value)
+      override def number: _root_.scala.Int = 4
+    }
+    @SerialVersionUID(0L)
+    final case class CharConstant(value: dotty.tools.dotc.semanticdb.CharConstant) extends dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.CharConstant
+      override def isCharConstant: _root_.scala.Boolean = true
+      override def charConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.CharConstant] = Some(value)
+      override def number: _root_.scala.Int = 5
+    }
+    @SerialVersionUID(0L)
+    final case class IntConstant(value: dotty.tools.dotc.semanticdb.IntConstant) extends dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.IntConstant
+      override def isIntConstant: _root_.scala.Boolean = true
+      override def intConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.IntConstant] = Some(value)
+      override def number: _root_.scala.Int = 6
+    }
+    @SerialVersionUID(0L)
+    final case class LongConstant(value: dotty.tools.dotc.semanticdb.LongConstant) extends dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.LongConstant
+      override def isLongConstant: _root_.scala.Boolean = true
+      override def longConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.LongConstant] = Some(value)
+      override def number: _root_.scala.Int = 7
+    }
+    @SerialVersionUID(0L)
+    final case class FloatConstant(value: dotty.tools.dotc.semanticdb.FloatConstant) extends dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.FloatConstant
+      override def isFloatConstant: _root_.scala.Boolean = true
+      override def floatConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.FloatConstant] = Some(value)
+      override def number: _root_.scala.Int = 8
+    }
+    @SerialVersionUID(0L)
+    final case class DoubleConstant(value: dotty.tools.dotc.semanticdb.DoubleConstant) extends dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.DoubleConstant
+      override def isDoubleConstant: _root_.scala.Boolean = true
+      override def doubleConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.DoubleConstant] = Some(value)
+      override def number: _root_.scala.Int = 9
+    }
+    @SerialVersionUID(0L)
+    final case class StringConstant(value: dotty.tools.dotc.semanticdb.StringConstant) extends dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.StringConstant
+      override def isStringConstant: _root_.scala.Boolean = true
+      override def stringConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.StringConstant] = Some(value)
+      override def number: _root_.scala.Int = 10
+    }
+    @SerialVersionUID(0L)
+    final case class NullConstant(value: dotty.tools.dotc.semanticdb.NullConstant) extends dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.NullConstant
+      override def isNullConstant: _root_.scala.Boolean = true
+      override def nullConstant: _root_.scala.Option[dotty.tools.dotc.semanticdb.NullConstant] = Some(value)
+      override def number: _root_.scala.Int = 11
+    }
+  }
+  final val UNIT_CONSTANT_FIELD_NUMBER = 1
+  final val BOOLEAN_CONSTANT_FIELD_NUMBER = 2
+  final val BYTE_CONSTANT_FIELD_NUMBER = 3
+  final val SHORT_CONSTANT_FIELD_NUMBER = 4
+  final val CHAR_CONSTANT_FIELD_NUMBER = 5
+  final val INT_CONSTANT_FIELD_NUMBER = 6
+  final val LONG_CONSTANT_FIELD_NUMBER = 7
+  final val FLOAT_CONSTANT_FIELD_NUMBER = 8
+  final val DOUBLE_CONSTANT_FIELD_NUMBER = 9
+  final val STRING_CONSTANT_FIELD_NUMBER = 10
+  final val NULL_CONSTANT_FIELD_NUMBER = 11
+  def of(
+    sealedValue: dotty.tools.dotc.semanticdb.ConstantMessage.SealedValue
+  ): _root_.dotty.tools.dotc.semanticdb.ConstantMessage = _root_.dotty.tools.dotc.semanticdb.ConstantMessage(
+    sealedValue
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Constant])
+}
+
+@SerialVersionUID(0L)
+final case class UnitConstant(
+    )  extends dotty.tools.dotc.semanticdb.Constant.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    final override def serializedSize: _root_.scala.Int = 0
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+    }
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.UnitConstant])
+}
+
+object UnitConstant  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.UnitConstant] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.UnitConstant] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.UnitConstant = {
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.UnitConstant(
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.UnitConstant(
+  )
+  def of(
+  ): _root_.dotty.tools.dotc.semanticdb.UnitConstant = _root_.dotty.tools.dotc.semanticdb.UnitConstant(
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.UnitConstant])
+}
+
+@SerialVersionUID(0L)
+final case class BooleanConstant(
+    value: _root_.scala.Boolean = false
+    )  extends dotty.tools.dotc.semanticdb.Constant.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = value
+        if (__value != false) {
+          __size += SemanticdbOutputStream.computeBoolSize(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = value
+        if (__v != false) {
+          _output__.writeBool(1, __v)
+        }
+      };
+    }
+    def withValue(__v: _root_.scala.Boolean): BooleanConstant = copy(value = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.BooleanConstant])
+}
+
+object BooleanConstant  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.BooleanConstant] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.BooleanConstant] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.BooleanConstant = {
+    var __value: _root_.scala.Boolean = false
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 8 =>
+          __value = _input__.readBool()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.BooleanConstant(
+        value = __value
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.BooleanConstant(
+    value = false
+  )
+  final val VALUE_FIELD_NUMBER = 1
+  def of(
+    value: _root_.scala.Boolean
+  ): _root_.dotty.tools.dotc.semanticdb.BooleanConstant = _root_.dotty.tools.dotc.semanticdb.BooleanConstant(
+    value
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.BooleanConstant])
+}
+
+@SerialVersionUID(0L)
+final case class ByteConstant(
+    value: _root_.scala.Int = 0
+    )  extends dotty.tools.dotc.semanticdb.Constant.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = value
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeInt32Size(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = value
+        if (__v != 0) {
+          _output__.writeInt32(1, __v)
+        }
+      };
+    }
+    def withValue(__v: _root_.scala.Int): ByteConstant = copy(value = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.ByteConstant])
+}
+
+object ByteConstant  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ByteConstant] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ByteConstant] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ByteConstant = {
+    var __value: _root_.scala.Int = 0
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 8 =>
+          __value = _input__.readInt32()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ByteConstant(
+        value = __value
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ByteConstant(
+    value = 0
+  )
+  final val VALUE_FIELD_NUMBER = 1
+  def of(
+    value: _root_.scala.Int
+  ): _root_.dotty.tools.dotc.semanticdb.ByteConstant = _root_.dotty.tools.dotc.semanticdb.ByteConstant(
+    value
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ByteConstant])
+}
+
+@SerialVersionUID(0L)
+final case class ShortConstant(
+    value: _root_.scala.Int = 0
+    )  extends dotty.tools.dotc.semanticdb.Constant.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = value
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeInt32Size(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = value
+        if (__v != 0) {
+          _output__.writeInt32(1, __v)
+        }
+      };
+    }
+    def withValue(__v: _root_.scala.Int): ShortConstant = copy(value = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.ShortConstant])
+}
+
+object ShortConstant  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ShortConstant] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ShortConstant] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ShortConstant = {
+    var __value: _root_.scala.Int = 0
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 8 =>
+          __value = _input__.readInt32()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ShortConstant(
+        value = __value
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ShortConstant(
+    value = 0
+  )
+  final val VALUE_FIELD_NUMBER = 1
+  def of(
+    value: _root_.scala.Int
+  ): _root_.dotty.tools.dotc.semanticdb.ShortConstant = _root_.dotty.tools.dotc.semanticdb.ShortConstant(
+    value
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ShortConstant])
+}
+
+@SerialVersionUID(0L)
+final case class CharConstant(
+    value: _root_.scala.Int = 0
+    )  extends dotty.tools.dotc.semanticdb.Constant.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = value
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeInt32Size(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = value
+        if (__v != 0) {
+          _output__.writeInt32(1, __v)
+        }
+      };
+    }
+    def withValue(__v: _root_.scala.Int): CharConstant = copy(value = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.CharConstant])
+}
+
+object CharConstant  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.CharConstant] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.CharConstant] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.CharConstant = {
+    var __value: _root_.scala.Int = 0
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 8 =>
+          __value = _input__.readInt32()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.CharConstant(
+        value = __value
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.CharConstant(
+    value = 0
+  )
+  final val VALUE_FIELD_NUMBER = 1
+  def of(
+    value: _root_.scala.Int
+  ): _root_.dotty.tools.dotc.semanticdb.CharConstant = _root_.dotty.tools.dotc.semanticdb.CharConstant(
+    value
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.CharConstant])
+}
+
+@SerialVersionUID(0L)
+final case class IntConstant(
+    value: _root_.scala.Int = 0
+    )  extends dotty.tools.dotc.semanticdb.Constant.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = value
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeInt32Size(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = value
+        if (__v != 0) {
+          _output__.writeInt32(1, __v)
+        }
+      };
+    }
+    def withValue(__v: _root_.scala.Int): IntConstant = copy(value = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.IntConstant])
+}
+
+object IntConstant  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.IntConstant] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.IntConstant] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.IntConstant = {
+    var __value: _root_.scala.Int = 0
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 8 =>
+          __value = _input__.readInt32()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.IntConstant(
+        value = __value
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.IntConstant(
+    value = 0
+  )
+  final val VALUE_FIELD_NUMBER = 1
+  def of(
+    value: _root_.scala.Int
+  ): _root_.dotty.tools.dotc.semanticdb.IntConstant = _root_.dotty.tools.dotc.semanticdb.IntConstant(
+    value
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.IntConstant])
+}
+
+@SerialVersionUID(0L)
+final case class LongConstant(
+    value: _root_.scala.Long = 0L
+    )  extends dotty.tools.dotc.semanticdb.Constant.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = value
+        if (__value != 0L) {
+          __size += SemanticdbOutputStream.computeInt64Size(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = value
+        if (__v != 0L) {
+          _output__.writeInt64(1, __v)
+        }
+      };
+    }
+    def withValue(__v: _root_.scala.Long): LongConstant = copy(value = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.LongConstant])
+}
+
+object LongConstant  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.LongConstant] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.LongConstant] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.LongConstant = {
+    var __value: _root_.scala.Long = 0L
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 8 =>
+          __value = _input__.readInt64()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.LongConstant(
+        value = __value
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.LongConstant(
+    value = 0L
+  )
+  final val VALUE_FIELD_NUMBER = 1
+  def of(
+    value: _root_.scala.Long
+  ): _root_.dotty.tools.dotc.semanticdb.LongConstant = _root_.dotty.tools.dotc.semanticdb.LongConstant(
+    value
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.LongConstant])
+}
+
+@SerialVersionUID(0L)
+final case class FloatConstant(
+    value: _root_.scala.Float = 0.0f
+    )  extends dotty.tools.dotc.semanticdb.Constant.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = value
+        if (__value != 0.0f) {
+          __size += SemanticdbOutputStream.computeFloatSize(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = value
+        if (__v != 0.0f) {
+          _output__.writeFloat(1, __v)
+        }
+      };
+    }
+    def withValue(__v: _root_.scala.Float): FloatConstant = copy(value = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.FloatConstant])
+}
+
+object FloatConstant  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.FloatConstant] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.FloatConstant] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.FloatConstant = {
+    var __value: _root_.scala.Float = 0.0f
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 13 =>
+          __value = _input__.readFloat()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.FloatConstant(
+        value = __value
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.FloatConstant(
+    value = 0.0f
+  )
+  final val VALUE_FIELD_NUMBER = 1
+  def of(
+    value: _root_.scala.Float
+  ): _root_.dotty.tools.dotc.semanticdb.FloatConstant = _root_.dotty.tools.dotc.semanticdb.FloatConstant(
+    value
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.FloatConstant])
+}
+
+@SerialVersionUID(0L)
+final case class DoubleConstant(
+    value: _root_.scala.Double = 0.0
+    )  extends dotty.tools.dotc.semanticdb.Constant.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = value
+        if (__value != 0.0) {
+          __size += SemanticdbOutputStream.computeDoubleSize(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = value
+        if (__v != 0.0) {
+          _output__.writeDouble(1, __v)
+        }
+      };
+    }
+    def withValue(__v: _root_.scala.Double): DoubleConstant = copy(value = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.DoubleConstant])
+}
+
+object DoubleConstant  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.DoubleConstant] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.DoubleConstant] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.DoubleConstant = {
+    var __value: _root_.scala.Double = 0.0
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 9 =>
+          __value = _input__.readDouble()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.DoubleConstant(
+        value = __value
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.DoubleConstant(
+    value = 0.0
+  )
+  final val VALUE_FIELD_NUMBER = 1
+  def of(
+    value: _root_.scala.Double
+  ): _root_.dotty.tools.dotc.semanticdb.DoubleConstant = _root_.dotty.tools.dotc.semanticdb.DoubleConstant(
+    value
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.DoubleConstant])
+}
+
+@SerialVersionUID(0L)
+final case class StringConstant(
+    value: _root_.scala.Predef.String = ""
+    )  extends dotty.tools.dotc.semanticdb.Constant.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = value
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = value
+        if (!__v.isEmpty) {
+          _output__.writeString(1, __v)
+        }
+      };
+    }
+    def withValue(__v: _root_.scala.Predef.String): StringConstant = copy(value = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.StringConstant])
+}
+
+object StringConstant  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.StringConstant] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.StringConstant] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.StringConstant = {
+    var __value: _root_.scala.Predef.String = ""
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __value = _input__.readStringRequireUtf8()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.StringConstant(
+        value = __value
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.StringConstant(
+    value = ""
+  )
+  final val VALUE_FIELD_NUMBER = 1
+  def of(
+    value: _root_.scala.Predef.String
+  ): _root_.dotty.tools.dotc.semanticdb.StringConstant = _root_.dotty.tools.dotc.semanticdb.StringConstant(
+    value
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.StringConstant])
+}
+
+@SerialVersionUID(0L)
+final case class NullConstant(
+    )  extends dotty.tools.dotc.semanticdb.Constant.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    final override def serializedSize: _root_.scala.Int = 0
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+    }
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.NullConstant])
+}
+
+object NullConstant  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.NullConstant] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.NullConstant] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.NullConstant = {
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.NullConstant(
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.NullConstant(
+  )
+  def of(
+  ): _root_.dotty.tools.dotc.semanticdb.NullConstant = _root_.dotty.tools.dotc.semanticdb.NullConstant(
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.NullConstant])
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/ConstantOps.scala b/compiler/src/dotty/tools/dotc/semanticdb/ConstantOps.scala
new file mode 100644
index 000000000000..975d5480fe9b
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/ConstantOps.scala
@@ -0,0 +1,25 @@
+package dotty.tools
+package dotc
+package semanticdb
+
+import dotty.tools.dotc.{semanticdb => s}
+
+import core.Contexts.Context
+import core.Constants._
+
+object ConstantOps:
+  extension (const: Constant)
+    def toSemanticConst(using Context): s.Constant = const.tag match {
+      case UnitTag => s.UnitConstant()
+      case BooleanTag => s.BooleanConstant(const.booleanValue)
+      case ByteTag => s.ByteConstant(const.byteValue)
+      case ShortTag => s.ShortConstant(const.shortValue)
+      case CharTag => s.CharConstant(const.charValue)
+      case IntTag => s.IntConstant(const.intValue)
+      case LongTag => s.LongConstant(const.longValue)
+      case FloatTag => s.FloatConstant(const.floatValue)
+      case DoubleTag => s.DoubleConstant(const.doubleValue)
+      case StringTag => s.StringConstant(const.stringValue)
+      case NullTag => s.NullConstant()
+      case _ => throw new Error(s"Constant ${const} can't be converted to Semanticdb Constant.")
+    }
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Descriptor.scala b/compiler/src/dotty/tools/dotc/semanticdb/Descriptor.scala
new file mode 100644
index 000000000000..a93b99df602c
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Descriptor.scala
@@ -0,0 +1,120 @@
+package dotty.tools.dotc.semanticdb
+
+import java.lang.System.{lineSeparator => EOL}
+import dotty.tools.dotc.semanticdb.{Descriptor => d}
+
+class DescriptorParser(s: String) {
+  var i = s.length
+  def fail() = {
+    val message = "invalid symbol format"
+    val caret = " " * i + "^"
+    sys.error(s"$message$EOL$s$EOL$caret")
+  }
+
+  val BOF = '\u0000'
+  val EOF = '\u001A'
+  var currChar = EOF
+  def readChar(): Char = {
+    if (i <= 0) {
+      if (i == 0) {
+        i -= 1
+        currChar = BOF
+        currChar
+      } else {
+        fail()
+      }
+    } else {
+      i -= 1
+      currChar = s(i)
+      currChar
+    }
+  }
+
+  def parseValue(): String = {
+    if (currChar == '`') {
+      val end = i
+      while (readChar() != '`') {}
+      readChar()
+      s.substring(i + 2, end)
+    } else {
+      val end = i + 1
+      if (!Character.isJavaIdentifierPart(currChar)) fail()
+      while (Character.isJavaIdentifierPart(readChar()) && currChar != BOF) {}
+      s.substring(i + 1, end)
+    }
+  }
+
+  def parseDisambiguator(): String = {
+    val end = i + 1
+    if (currChar != ')') fail()
+    while (readChar() != '(') {}
+    readChar()
+    s.substring(i + 1, end)
+  }
+
+  def parseDescriptor(): Descriptor = {
+    if (currChar == '.') {
+      readChar()
+      if (currChar == ')') {
+        val disambiguator = parseDisambiguator()
+        val value = parseValue()
+        d.Method(value, disambiguator)
+      } else {
+        d.Term(parseValue())
+      }
+    } else if (currChar == '#') {
+      readChar()
+      d.Type(parseValue())
+    } else if (currChar == '/') {
+      readChar()
+      d.Package(parseValue())
+    } else if (currChar == ')') {
+      readChar()
+      val value = parseValue()
+      if (currChar != '(') fail()
+      else readChar()
+      d.Parameter(value)
+    } else if (currChar == ']') {
+      readChar()
+      val value = parseValue()
+      if (currChar != '[') fail()
+      else readChar()
+      d.TypeParameter(value)
+    } else {
+      fail()
+    }
+  }
+
+  def entryPoint(): (Descriptor, String) = {
+    readChar()
+    val desc = parseDescriptor()
+    (desc, s.substring(0, i + 1))
+  }
+}
+
+object DescriptorParser {
+  def apply(symbol: String): (Descriptor, String) = {
+    val parser = new DescriptorParser(symbol)
+    parser.entryPoint()
+  }
+}
+
+sealed trait Descriptor {
+  def isNone: Boolean = this == d.None
+  def isTerm: Boolean = this.isInstanceOf[d.Term]
+  def isMethod: Boolean = this.isInstanceOf[d.Method]
+  def isType: Boolean = this.isInstanceOf[d.Type]
+  def isPackage: Boolean = this.isInstanceOf[d.Package]
+  def isParameter: Boolean = this.isInstanceOf[d.Parameter]
+  def isTypeParameter: Boolean = this.isInstanceOf[d.TypeParameter]
+  def value: String
+}
+object Descriptor {
+  case object None extends Descriptor { def value: String = "" }
+  final case class Term(value: String) extends Descriptor
+  final case class Method(value: String, disambiguator: String) extends Descriptor
+  final case class Type(value: String) extends Descriptor
+  final case class Package(value: String) extends Descriptor
+  final case class Parameter(value: String) extends Descriptor
+  final case class TypeParameter(value: String) extends Descriptor
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Diagnostic.scala b/compiler/src/dotty/tools/dotc/semanticdb/Diagnostic.scala
new file mode 100644
index 000000000000..0478dfadb17b
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Diagnostic.scala
@@ -0,0 +1,195 @@
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
+
+package dotty.tools.dotc.semanticdb
+import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
+
+@SerialVersionUID(0L)
+final case class Diagnostic(
+    range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range] = _root_.scala.None,
+    severity: dotty.tools.dotc.semanticdb.Diagnostic.Severity = dotty.tools.dotc.semanticdb.Diagnostic.Severity.UNKNOWN_SEVERITY,
+    message: _root_.scala.Predef.String = ""
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (range.isDefined) {
+        val __value = range.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      
+      {
+        val __value = severity.value
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeEnumSize(2, __value)
+        }
+      };
+      
+      {
+        val __value = message
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(3, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      range.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      {
+        val __v = severity.value
+        if (__v != 0) {
+          _output__.writeEnum(2, __v)
+        }
+      };
+      {
+        val __v = message
+        if (!__v.isEmpty) {
+          _output__.writeString(3, __v)
+        }
+      };
+    }
+    def getRange: dotty.tools.dotc.semanticdb.Range = range.getOrElse(dotty.tools.dotc.semanticdb.Range.defaultInstance)
+    def clearRange: Diagnostic = copy(range = _root_.scala.None)
+    def withRange(__v: dotty.tools.dotc.semanticdb.Range): Diagnostic = copy(range = Option(__v))
+    def withSeverity(__v: dotty.tools.dotc.semanticdb.Diagnostic.Severity): Diagnostic = copy(severity = __v)
+    def withMessage(__v: _root_.scala.Predef.String): Diagnostic = copy(message = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.Diagnostic])
+}
+
+object Diagnostic  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Diagnostic] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Diagnostic] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.Diagnostic = {
+    var __range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range] = _root_.scala.None
+    var __severity: dotty.tools.dotc.semanticdb.Diagnostic.Severity = dotty.tools.dotc.semanticdb.Diagnostic.Severity.UNKNOWN_SEVERITY
+    var __message: _root_.scala.Predef.String = ""
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __range = Option(__range.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Range](_input__))(LiteParser.readMessage(_input__, _)))
+        case 16 =>
+          __severity = dotty.tools.dotc.semanticdb.Diagnostic.Severity.fromValue(_input__.readEnum())
+        case 26 =>
+          __message = _input__.readStringRequireUtf8()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.Diagnostic(
+        range = __range,
+        severity = __severity,
+        message = __message
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.Diagnostic(
+    range = _root_.scala.None,
+    severity = dotty.tools.dotc.semanticdb.Diagnostic.Severity.UNKNOWN_SEVERITY,
+    message = ""
+  )
+  sealed abstract class Severity(val value: _root_.scala.Int)  extends SemanticdbGeneratedEnum  derives CanEqual {
+    type EnumType = Severity
+    def isUnknownSeverity: _root_.scala.Boolean = false
+    def isError: _root_.scala.Boolean = false
+    def isWarning: _root_.scala.Boolean = false
+    def isInformation: _root_.scala.Boolean = false
+    def isHint: _root_.scala.Boolean = false
+    
+    final def asRecognized: _root_.scala.Option[dotty.tools.dotc.semanticdb.Diagnostic.Severity.Recognized] = if (isUnrecognized) _root_.scala.None else _root_.scala.Some(this.asInstanceOf[dotty.tools.dotc.semanticdb.Diagnostic.Severity.Recognized])
+  }
+  
+  object Severity  {
+    sealed trait Recognized extends Severity
+    
+    @SerialVersionUID(0L)
+    case object UNKNOWN_SEVERITY extends Severity(0) with Severity.Recognized {
+      val index = 0
+      val name = "UNKNOWN_SEVERITY"
+      override def isUnknownSeverity: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object ERROR extends Severity(1) with Severity.Recognized {
+      val index = 1
+      val name = "ERROR"
+      override def isError: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object WARNING extends Severity(2) with Severity.Recognized {
+      val index = 2
+      val name = "WARNING"
+      override def isWarning: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object INFORMATION extends Severity(3) with Severity.Recognized {
+      val index = 3
+      val name = "INFORMATION"
+      override def isInformation: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object HINT extends Severity(4) with Severity.Recognized {
+      val index = 4
+      val name = "HINT"
+      override def isHint: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    final case class Unrecognized(unrecognizedValue: _root_.scala.Int)  extends Severity(unrecognizedValue) with SemanticdbUnrecognizedEnum
+    
+    lazy val values = scala.collection.immutable.Seq(UNKNOWN_SEVERITY, ERROR, WARNING, INFORMATION, HINT)
+    def fromValue(__value: _root_.scala.Int): Severity = __value match {
+      case 0 => UNKNOWN_SEVERITY
+      case 1 => ERROR
+      case 2 => WARNING
+      case 3 => INFORMATION
+      case 4 => HINT
+      case __other => Unrecognized(__other)
+    }
+    
+    
+  }
+  final val RANGE_FIELD_NUMBER = 1
+  final val SEVERITY_FIELD_NUMBER = 2
+  final val MESSAGE_FIELD_NUMBER = 3
+  def of(
+    range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range],
+    severity: dotty.tools.dotc.semanticdb.Diagnostic.Severity,
+    message: _root_.scala.Predef.String
+  ): _root_.dotty.tools.dotc.semanticdb.Diagnostic = _root_.dotty.tools.dotc.semanticdb.Diagnostic(
+    range,
+    severity,
+    message
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Diagnostic])
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Documentation.scala b/compiler/src/dotty/tools/dotc/semanticdb/Documentation.scala
new file mode 100644
index 000000000000..c2c2fc470cbb
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Documentation.scala
@@ -0,0 +1,173 @@
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
+
+package dotty.tools.dotc.semanticdb
+import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
+
+@SerialVersionUID(0L)
+final case class Documentation(
+    message: _root_.scala.Predef.String = "",
+    format: dotty.tools.dotc.semanticdb.Documentation.Format = dotty.tools.dotc.semanticdb.Documentation.Format.HTML
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = message
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(1, __value)
+        }
+      };
+      
+      {
+        val __value = format.value
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeEnumSize(2, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = message
+        if (!__v.isEmpty) {
+          _output__.writeString(1, __v)
+        }
+      };
+      {
+        val __v = format.value
+        if (__v != 0) {
+          _output__.writeEnum(2, __v)
+        }
+      };
+    }
+    def withMessage(__v: _root_.scala.Predef.String): Documentation = copy(message = __v)
+    def withFormat(__v: dotty.tools.dotc.semanticdb.Documentation.Format): Documentation = copy(format = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.Documentation])
+}
+
+object Documentation  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Documentation] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Documentation] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.Documentation = {
+    var __message: _root_.scala.Predef.String = ""
+    var __format: dotty.tools.dotc.semanticdb.Documentation.Format = dotty.tools.dotc.semanticdb.Documentation.Format.HTML
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __message = _input__.readStringRequireUtf8()
+        case 16 =>
+          __format = dotty.tools.dotc.semanticdb.Documentation.Format.fromValue(_input__.readEnum())
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.Documentation(
+        message = __message,
+        format = __format
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.Documentation(
+    message = "",
+    format = dotty.tools.dotc.semanticdb.Documentation.Format.HTML
+  )
+  sealed abstract class Format(val value: _root_.scala.Int)  extends SemanticdbGeneratedEnum  derives CanEqual {
+    type EnumType = Format
+    def isHtml: _root_.scala.Boolean = false
+    def isMarkdown: _root_.scala.Boolean = false
+    def isJavadoc: _root_.scala.Boolean = false
+    def isScaladoc: _root_.scala.Boolean = false
+    def isKdoc: _root_.scala.Boolean = false
+    
+    final def asRecognized: _root_.scala.Option[dotty.tools.dotc.semanticdb.Documentation.Format.Recognized] = if (isUnrecognized) _root_.scala.None else _root_.scala.Some(this.asInstanceOf[dotty.tools.dotc.semanticdb.Documentation.Format.Recognized])
+  }
+  
+  object Format  {
+    sealed trait Recognized extends Format
+    
+    @SerialVersionUID(0L)
+    case object HTML extends Format(0) with Format.Recognized {
+      val index = 0
+      val name = "HTML"
+      override def isHtml: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object MARKDOWN extends Format(1) with Format.Recognized {
+      val index = 1
+      val name = "MARKDOWN"
+      override def isMarkdown: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object JAVADOC extends Format(2) with Format.Recognized {
+      val index = 2
+      val name = "JAVADOC"
+      override def isJavadoc: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object SCALADOC extends Format(3) with Format.Recognized {
+      val index = 3
+      val name = "SCALADOC"
+      override def isScaladoc: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object KDOC extends Format(4) with Format.Recognized {
+      val index = 4
+      val name = "KDOC"
+      override def isKdoc: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    final case class Unrecognized(unrecognizedValue: _root_.scala.Int)  extends Format(unrecognizedValue) with SemanticdbUnrecognizedEnum
+    
+    lazy val values = scala.collection.immutable.Seq(HTML, MARKDOWN, JAVADOC, SCALADOC, KDOC)
+    def fromValue(__value: _root_.scala.Int): Format = __value match {
+      case 0 => HTML
+      case 1 => MARKDOWN
+      case 2 => JAVADOC
+      case 3 => SCALADOC
+      case 4 => KDOC
+      case __other => Unrecognized(__other)
+    }
+    
+    
+  }
+  final val MESSAGE_FIELD_NUMBER = 1
+  final val FORMAT_FIELD_NUMBER = 2
+  def of(
+    message: _root_.scala.Predef.String,
+    format: dotty.tools.dotc.semanticdb.Documentation.Format
+  ): _root_.dotty.tools.dotc.semanticdb.Documentation = _root_.dotty.tools.dotc.semanticdb.Documentation(
+    message,
+    format
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Documentation])
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
index 89cf6f3df7d5..e40607ef0d5a 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
@@ -6,13 +6,14 @@ import core._
 import Phases._
 import ast.tpd._
 import ast.untpd.given
-import ast.Trees.mods
+import ast.Trees.{mods, WithEndMarker}
 import Contexts._
 import Symbols._
 import Flags._
 import Names.Name
 import StdNames.nme
 import NameOps._
+import Denotations.StaleSymbol
 import util.Spans.Span
 import util.{SourceFile, SourcePosition}
 import transform.SymUtils._
@@ -22,6 +23,7 @@ import scala.collection.mutable
 import scala.annotation.{ threadUnsafe => tu, tailrec }
 import scala.PartialFunction.condOpt
 
+import dotty.tools.dotc.{semanticdb => s}
 
 /** Extract symbol references and uses to semanticdb files.
  *  See https://scalameta.org/docs/semanticdb/specification.html#symbol-1
@@ -34,6 +36,8 @@ class ExtractSemanticDB extends Phase:
 
   override val phaseName: String = ExtractSemanticDB.name
 
+  override val description: String = ExtractSemanticDB.description
+
   override def isRunnable(using Context) =
     super.isRunnable && ctx.settings.Xsemanticdb.value
 
@@ -42,43 +46,46 @@ class ExtractSemanticDB extends Phase:
 
   override def run(using Context): Unit =
     val unit = ctx.compilationUnit
-    val extract = Extractor()
-    extract.traverse(unit.tpdTree)
-    ExtractSemanticDB.write(unit.source, extract.occurrences.toList, extract.symbolInfos.toList)
+    val extractor = Extractor()
+    extractor.extract(unit.tpdTree)
+    ExtractSemanticDB.write(unit.source, extractor.occurrences.toList, extractor.symbolInfos.toList, extractor.synthetics.toList)
 
   /** Extractor of symbol occurrences from trees */
   class Extractor extends TreeTraverser:
-
-    private var nextLocalIdx: Int = 0
-
-    /** The index of a local symbol */
-    private val locals = mutable.HashMap[Symbol, Int]()
+    given s.SemanticSymbolBuilder = s.SemanticSymbolBuilder()
+    val synth = SyntheticsExtractor()
+    given converter: s.TypeOps = s.TypeOps()
 
     /** The bodies of synthetic locals */
     private val localBodies = mutable.HashMap[Symbol, Tree]()
 
-    /** The local symbol(s) starting at given offset */
-    private val symsAtOffset = new mutable.HashMap[Int, Set[Symbol]]():
-      override def default(key: Int) = Set[Symbol]()
-
     /** The extracted symbol occurrences */
     val occurrences = new mutable.ListBuffer[SymbolOccurrence]()
 
     /** The extracted symbol infos */
     val symbolInfos = new mutable.ListBuffer[SymbolInformation]()
 
+    val synthetics = new mutable.ListBuffer[s.Synthetic]()
+
     /** A cache of localN names */
     val localNames = new mutable.HashSet[String]()
 
     /** The symbol occurrences generated so far, as a set */
     private val generated = new mutable.HashSet[SymbolOccurrence]
 
+    def extract(tree: Tree)(using Context): Unit =
+      traverse(tree)
+      val fakeSyms = converter.fakeSymbols.map(_.symbolInfo(Set.empty)(using LinkMode.SymlinkChildren, converter))
+      symbolInfos.appendAll(fakeSyms)
+
     /** Definitions of this symbol should be excluded from semanticdb */
     private def excludeDef(sym: Symbol)(using Context): Boolean =
       !sym.exists
       || sym.isLocalDummy
       || sym.is(Synthetic)
       || sym.isSetter
+      || sym.isOldStyleImplicitConversion(forImplicitClassOnly = true)
+      || sym.owner.isGivenInstanceSummoner
       || excludeDefOrUse(sym)
 
     private def excludeDefOrUse(sym: Symbol)(using Context): Boolean =
@@ -102,6 +109,7 @@ class ExtractSemanticDB extends Phase:
     private def excludeChildren(sym: Symbol)(using Context): Boolean =
       !sym.exists
       || sym.is(Param) && sym.info.bounds.hi.isInstanceOf[Types.HKTypeLambda]
+      || sym.isOldStyleImplicitConversion(forImplicitClassOnly = true)
 
     /** Uses of this symbol where the reference has given span should be excluded from semanticdb */
     private def excludeUse(qualifier: Option[Symbol], sym: Symbol)(using Context): Boolean =
@@ -130,62 +138,60 @@ class ExtractSemanticDB extends Phase:
 
       tree match
         case tree: PackageDef =>
-          if !excludeDef(tree.pid.symbol)
-          && tree.pid.span.hasLength then
-            tree.pid match
-            case tree: Select =>
-              registerDefinition(tree.symbol, selectSpan(tree), Set.empty, tree.source)
-              traverse(tree.qualifier)
-            case tree => registerDefinition(tree.symbol, tree.span, Set.empty, tree.source)
           tree.stats.foreach(traverse)
+          if !excludeDef(tree.pid.symbol) && tree.pid.span.hasLength then
+            tree.pid match
+              case tree: Select =>
+                traverse(tree.qualifier)
+                registerDefinition(tree.symbol, selectSpan(tree), Set.empty, tree.source)
+              case tree => registerDefinition(tree.symbol, tree.span, Set.empty, tree.source)
         case tree: NamedDefTree =>
-          if tree.symbol.isAllOf(ModuleValCreationFlags) then
-            return
-          if !excludeDef(tree.symbol)
-          && tree.span.hasLength then
-            registerDefinition(tree.symbol, tree.nameSpan, symbolKinds(tree), tree.source)
-            val privateWithin = tree.symbol.privateWithin
-            if privateWithin.exists then
-              registerUseGuarded(None, privateWithin, spanOfSymbol(privateWithin, tree.span, tree.source), tree.source)
-          else if !excludeSymbol(tree.symbol) then
-            registerSymbol(tree.symbol, symbolName(tree.symbol), symbolKinds(tree))
-          tree match
-          case tree: ValDef
-          if tree.symbol.isAllOf(EnumValue) =>
-            tree.rhs match
-            case Block(TypeDef(_, template: Template) :: _, _) => // simple case with specialised extends clause
-              template.parents.filter(!_.span.isZeroExtent).foreach(traverse)
-            case _ => // calls $new
-          case tree: ValDef
-          if tree.symbol.isSelfSym =>
-            if tree.tpt.span.hasLength then
-              traverse(tree.tpt)
-          case tree: DefDef
-          if tree.symbol.isConstructor => // ignore typeparams for secondary ctors
-            tree.trailingParamss.foreach(_.foreach(traverse))
-            traverse(tree.rhs)
-          case tree: (DefDef | ValDef)
-          if tree.symbol.isSyntheticWithIdent =>
-            tree match
-              case tree: DefDef =>
-                tree.paramss.foreach(_.foreach(param => registerSymbolSimple(param.symbol)))
-              case tree: ValDef if tree.symbol.is(Given) => traverse(tree.tpt)
-              case _ =>
-            if !tree.symbol.isGlobal then
-              localBodies(tree.symbol) = tree.rhs
-            // ignore rhs
-          case PatternValDef(pat, rhs) =>
-            traverse(rhs)
-            PatternValDef.collectPats(pat).foreach(traverse)
-          case tree =>
-            if !excludeChildren(tree.symbol) then
-              traverseChildren(tree)
+          if !tree.symbol.isAllOf(ModuleValCreationFlags) then
+            tree match {
+              case tree: ValDef if tree.symbol.isAllOf(EnumValue) =>
+                tree.rhs match
+                case Block(TypeDef(_, template: Template) :: _, _) => // simple case with specialised extends clause
+                  template.parents.filter(!_.span.isZeroExtent).foreach(traverse)
+                case _ => // calls $new
+              case tree: ValDef if tree.symbol.isSelfSym =>
+                if tree.tpt.span.hasLength then
+                  traverse(tree.tpt)
+              case tree: DefDef if tree.symbol.isConstructor => // ignore typeparams for secondary ctors
+                tree.trailingParamss.foreach(_.foreach(traverse))
+                traverse(tree.rhs)
+              case tree: (DefDef | ValDef) if tree.symbol.isSyntheticWithIdent =>
+                tree match
+                  case tree: DefDef =>
+                    tree.paramss.foreach(_.foreach(param => registerSymbolSimple(param.symbol)))
+                  case tree: ValDef if tree.symbol.is(Given) =>
+                    traverse(tree.tpt)
+                  case _ =>
+                if !tree.symbol.isGlobal then
+                  localBodies(tree.symbol) = tree.rhs
+                // ignore rhs
+
+              case PatternValDef(pat, rhs) =>
+                traverse(rhs)
+                PatternValDef.collectPats(pat).foreach(traverse)
+              case tree: TypeDef =>
+                traverseChildren(tree)
+              case tree =>
+                if !excludeChildren(tree.symbol) then
+                  traverseChildren(tree)
+            }
+            if !excludeDef(tree.symbol) && tree.span.hasLength then
+              registerDefinition(tree.symbol, tree.nameSpan, symbolKinds(tree), tree.source)
+              val privateWithin = tree.symbol.privateWithin
+              if privateWithin.exists then
+                registerUseGuarded(None, privateWithin, spanOfSymbol(privateWithin, tree.span, tree.source), tree.source)
+            else if !excludeSymbol(tree.symbol) then
+              registerSymbol(tree.symbol, symbolKinds(tree))
+        case tree: Template if tree.symbol.owner.is(Invisible) =>
+          // do nothing
+          // exclude the symbols and synthetics generated by @main annotation
+          // (main class generated by @main has `Invisible` flag, see `MainProxies.scala`).
         case tree: Template =>
           val ctorSym = tree.constr.symbol
-          if !excludeDef(ctorSym) then
-            traverseAnnotsOfDefinition(ctorSym)
-            registerDefinition(ctorSym, tree.constr.nameSpan.startPos, Set.empty, tree.source)
-            ctorParams(tree.constr.termParamss, tree.body)
           for parent <- tree.parentsOrDerived if parent.span.hasLength do
             traverse(parent)
           val selfSpan = tree.self.span
@@ -195,14 +201,19 @@ class ExtractSemanticDB extends Phase:
             tree.body.foreachUntilImport(traverse).foreach(traverse) // the first import statement
           else
             tree.body.foreach(traverse)
+          if !excludeDef(ctorSym) then
+            traverseAnnotsOfDefinition(ctorSym)
+            ctorParams(tree.constr.termParamss, tree.constr.leadingTypeParams, tree.body)
+            registerDefinition(ctorSym, tree.constr.nameSpan.startPos, Set.empty, tree.source)
         case tree: Apply =>
-          @tu lazy val genParamSymbol: Name => String = funParamSymbol(tree.fun.symbol)
+          @tu lazy val genParamSymbol: Name => String = tree.fun.symbol.funParamSymbol
           traverse(tree.fun)
+          synth.tryFindSynthetic(tree).foreach(synthetics.addOne)
           for arg <- tree.args do
             arg match
               case tree @ NamedArg(name, arg) =>
-                registerUse(genParamSymbol(name), tree.span.startPos.withEnd(tree.span.start + name.toString.length), tree.source)
                 traverse(localBodies.get(arg.symbol).getOrElse(arg))
+                registerUse(genParamSymbol(name), tree.span.startPos.withEnd(tree.span.start + name.toString.length), tree.source)
               case _ => traverse(arg)
         case tree: Assign =>
           val qualSym = condOpt(tree.lhs) { case Select(qual, _) if qual.symbol.exists => qual.symbol }
@@ -222,33 +233,52 @@ class ExtractSemanticDB extends Phase:
           val qual = tree.qualifier
           val qualSpan = qual.span
           val sym = tree.symbol.adjustIfCtorTyparam
-          registerUseGuarded(qual.symbol.ifExists, sym, selectSpan(tree), tree.source)
           if qualSpan.exists && qualSpan.hasLength then
             traverse(qual)
+          registerUseGuarded(qual.symbol.ifExists, sym, selectSpan(tree), tree.source)
         case tree: Import =>
           if tree.span.exists && tree.span.hasLength then
+            traverseChildren(tree)
             for sel <- tree.selectors do
               val imported = sel.imported.name
               if imported != nme.WILDCARD then
                 for alt <- tree.expr.tpe.member(imported).alternatives do
                   registerUseGuarded(None, alt.symbol, sel.imported.span, tree.source)
-                  if (alt.symbol.companionClass.exists)
-                    registerUseGuarded(None, alt.symbol.companionClass, sel.imported.span, tree.source)
-            traverseChildren(tree)
+                  try
+                    if (alt.symbol.companionClass.exists)
+                      registerUseGuarded(None, alt.symbol.companionClass, sel.imported.span, tree.source)
+                  catch case ex: StaleSymbol =>
+                    // can happen for constructor proxies. Test case is pos-macros/i13532.
+                    ()
+
         case tree: Inlined =>
           traverse(tree.call)
+
+        case tree: TypeApply =>
+          synth.tryFindSynthetic(tree).foreach(synthetics.addOne)
+          traverseChildren(tree)
+
+        case tree: TypeTree =>
+          tree.typeOpt match
+            // Any types could be appear inside of `TypeTree`, but
+            // types that precent in source other than TypeRef are traversable and contain Ident tree nodes
+            // (e.g. TypeBoundsTree, AppliedTypeTree)
+            case Types.TypeRef(_, sym: Symbol) if namePresentInSource(sym, tree.span, tree.source) =>
+              registerUseGuarded(None, sym, tree.span, tree.source)
+            case _ => ()
+
+
         case _ =>
           traverseChildren(tree)
 
-    end traverse
+      tree match
+        case tree: WithEndMarker[t] =>
+          val endSpan = tree.endSpan
+          if endSpan.exists then
+            registerUseGuarded(None, tree.symbol, endSpan, tree.source)
+        case _ =>
 
-    private def funParamSymbol(funSym: Symbol)(using Context): Name => String =
-      if funSym.isGlobal then
-        val funSymbol = symbolName(funSym)
-        name => s"$funSymbol($name)"
-      else
-        name => locals.keys.find(local => local.isTerm && local.owner == funSym && local.name == name)
-                      .fold("<?>")(Symbols.LocalPrefix + _)
+    end traverse
 
     private object PatternValDef:
 
@@ -283,217 +313,46 @@ class ExtractSemanticDB extends Phase:
 
     end PatternValDef
 
-    /** Add semanticdb name of the given symbol to string builder */
-    private def addSymName(b: StringBuilder, sym: Symbol)(using Context): Unit =
-
-      def addName(name: Name) =
-        val str = name.toString.unescapeUnicode
-        if str.isJavaIdent then b append str
-        else b append '`' append str append '`'
 
-      def addOwner(owner: Symbol): Unit =
-        if !owner.isRoot then addSymName(b, owner)
 
-      def addOverloadIdx(sym: Symbol): Unit =
-        val decls =
-          val decls0 = sym.owner.info.decls.lookupAll(sym.name)
-          if sym.owner.isAllOf(JavaModule) then
-            decls0 ++ sym.owner.companionClass.info.decls.lookupAll(sym.name)
-          else
-            decls0
-        end decls
-        val alts = decls.filter(_.isOneOf(Method | Mutable)).toList.reverse
-        def find(filter: Symbol => Boolean) = alts match
-          case notSym :: rest if !filter(notSym) =>
-            val idx = rest.indexWhere(filter).ensuring(_ >= 0)
-            b.append('+').append(idx + 1)
-          case _ =>
-        end find
-        val sig = sym.signature
-        find(_.signature == sig)
-
-      def addDescriptor(sym: Symbol): Unit =
-        if sym.is(ModuleClass) then
-          addDescriptor(sym.sourceModule)
-        else if sym.is(TypeParam) then
-          b.append('['); addName(sym.name); b.append(']')
-        else if sym.is(Param) then
-          b.append('('); addName(sym.name); b.append(')')
-        else if sym.isRoot then
-          b.append(Symbols.RootPackage)
-        else if sym.isEmptyPackage then
-          b.append(Symbols.EmptyPackage)
-        else if (sym.isScala2PackageObject) then
-          b.append(Symbols.PackageObjectDescriptor)
-        else
-          addName(sym.name)
-          if sym.is(Package) then b.append('/')
-          else if sym.isType || sym.isAllOf(JavaModule) then b.append('#')
-          else if sym.isOneOf(Method | Mutable)
-          && (!sym.is(StableRealizable) || sym.isConstructor) then
-            b.append('('); addOverloadIdx(sym); b.append(").")
-          else b.append('.')
-
-      /** The index of local symbol `sym`. Symbols with the same name and
-       *  the same starting position have the same index.
-       */
-      def localIdx(sym: Symbol)(using Context): Int =
-        val startPos =
-          assert(sym.span.exists, s"$sym should have a span")
-          sym.span.start
-        @tailrec
-        def computeLocalIdx(sym: Symbol): Int = locals get sym match
-          case Some(idx) => idx
-          case None      => symsAtOffset(startPos).find(_.name == sym.name) match
-            case Some(other) => computeLocalIdx(other)
-            case None =>
-              val idx = nextLocalIdx
-              nextLocalIdx += 1
-              locals(sym) = idx
-              symsAtOffset(startPos) += sym
-              idx
-        end computeLocalIdx
-        computeLocalIdx(sym)
-      end localIdx
-
-      if sym.exists then
-        if sym.isGlobal then
-          addOwner(sym.owner); addDescriptor(sym)
-        else
-          b.append(Symbols.LocalPrefix).append(localIdx(sym))
-
-    end addSymName
-
-    /** The semanticdb name of the given symbol */
-    private def symbolName(sym: Symbol)(using Context): String =
-      val b = StringBuilder(20)
-      addSymName(b, sym)
-      b.toString
-
-    private def range(span: Span, treeSource: SourceFile)(using Context): Option[Range] =
-      def lineCol(offset: Int) = (treeSource.offsetToLine(offset), treeSource.column(offset))
-      val (startLine, startCol) = lineCol(span.start)
-      val (endLine, endCol) = lineCol(span.end)
-      Some(Range(startLine, startCol, endLine, endCol))
-
-    private def symbolKind(sym: Symbol, symkinds: Set[SymbolKind])(using Context): SymbolInformation.Kind =
-      if sym.isTypeParam then
-        SymbolInformation.Kind.TYPE_PARAMETER
-      else if sym.is(TermParam) then
-        SymbolInformation.Kind.PARAMETER
-      else if sym.isTerm && sym.owner.isTerm then
-        SymbolInformation.Kind.LOCAL
-      else if sym.isInlineMethod || sym.is(Macro) then
-        SymbolInformation.Kind.MACRO
-      else if sym.isConstructor then
-        SymbolInformation.Kind.CONSTRUCTOR
-      else if sym.isSelfSym then
-        SymbolInformation.Kind.SELF_PARAMETER
-      else if sym.isOneOf(Method) || symkinds.exists(_.isVarOrVal) then
-        SymbolInformation.Kind.METHOD
-      else if sym.isPackageObject then
-        SymbolInformation.Kind.PACKAGE_OBJECT
-      else if sym.is(Module) then
-        SymbolInformation.Kind.OBJECT
-      else if sym.is(Package) then
-        SymbolInformation.Kind.PACKAGE
-      else if sym.isAllOf(JavaInterface) then
-        SymbolInformation.Kind.INTERFACE
-      else if sym.is(Trait) then
-        SymbolInformation.Kind.TRAIT
-      else if sym.isClass then
-        SymbolInformation.Kind.CLASS
-      else if sym.isType then
-        SymbolInformation.Kind.TYPE
-      else if sym.is(ParamAccessor) then
-        SymbolInformation.Kind.FIELD
-      else
-        SymbolInformation.Kind.UNKNOWN_KIND
-
-    private def symbolProps(sym: Symbol, symkinds: Set[SymbolKind])(using Context): Int =
-      if sym.is(ModuleClass) then
-        return symbolProps(sym.sourceModule, symkinds)
-      var props = 0
-      if sym.isPrimaryConstructor then
-        props |= SymbolInformation.Property.PRIMARY.value
-      if sym.is(Abstract) || symkinds.contains(SymbolKind.Abstract) then
-        props |= SymbolInformation.Property.ABSTRACT.value
-      if sym.is(Final) then
-        props |= SymbolInformation.Property.FINAL.value
-      if sym.is(Sealed) then
-        props |= SymbolInformation.Property.SEALED.value
-      if sym.isOneOf(GivenOrImplicit) then
-        props |= SymbolInformation.Property.IMPLICIT.value
-      if sym.is(Lazy, butNot=Module) then
-        props |= SymbolInformation.Property.LAZY.value
-      if sym.isAllOf(Case | Module) || sym.is(CaseClass) || sym.isAllOf(EnumCase) then
-        props |= SymbolInformation.Property.CASE.value
-      if sym.is(Covariant) then
-        props |= SymbolInformation.Property.COVARIANT.value
-      if sym.is(Contravariant) then
-        props |= SymbolInformation.Property.CONTRAVARIANT.value
-      if sym.isAllOf(DefaultMethod | JavaDefined) || sym.is(Accessor) && sym.name.is(NameKinds.DefaultGetterName) then
-        props |= SymbolInformation.Property.DEFAULT.value
-      if symkinds.exists(_.isVal) then
-        props |= SymbolInformation.Property.VAL.value
-      if symkinds.exists(_.isVar) then
-        props |= SymbolInformation.Property.VAR.value
-      if sym.is(JavaStatic) then
-        props |= SymbolInformation.Property.STATIC.value
-      if sym.is(Enum) then
-        props |= SymbolInformation.Property.ENUM.value
-      props
-
-    private def symbolInfo(sym: Symbol, symbolName: String, symkinds: Set[SymbolKind])(using Context): SymbolInformation =
-      SymbolInformation(
-        symbol = symbolName,
-        language = Language.SCALA,
-        kind = symbolKind(sym, symkinds),
-        properties = symbolProps(sym, symkinds),
-        displayName = Symbols.displaySymbol(sym)
-      )
-
-    private def registerSymbol(sym: Symbol, symbolName: String, symkinds: Set[SymbolKind])(using Context): Unit =
-      val isLocal = symbolName.isLocal
-      if !isLocal || !localNames.contains(symbolName) then
+    private def registerSymbol(sym: Symbol, symkinds: Set[SymbolKind])(using Context): Unit =
+      val sname = sym.symbolName
+      val isLocal = sname.isLocal
+      if !isLocal || !localNames.contains(sname) then
         if isLocal then
-          localNames += symbolName
-        symbolInfos += symbolInfo(sym, symbolName, symkinds)
+          localNames += sname
+        symbolInfos += sym.symbolInfo(symkinds)(using LinkMode.SymlinkChildren, converter)
 
     private def registerSymbolSimple(sym: Symbol)(using Context): Unit =
-      registerSymbol(sym, symbolName(sym), Set.empty)
+      registerSymbol(sym, Set.empty)
 
     private def registerOccurrence(symbol: String, span: Span, role: SymbolOccurrence.Role, treeSource: SourceFile)(using Context): Unit =
-      val occ = SymbolOccurrence(symbol, range(span, treeSource), role)
+      val occ = SymbolOccurrence(range(span, treeSource), symbol, role)
       if !generated.contains(occ) && occ.symbol.nonEmpty then
         occurrences += occ
         generated += occ
 
     private def registerUseGuarded(qualSym: Option[Symbol], sym: Symbol, span: Span, treeSource: SourceFile)(using Context) =
-      if !excludeUse(qualSym, sym) then
+      if !excludeUse(qualSym, sym) && !span.isZeroExtent then
         registerUse(sym, span, treeSource)
 
     private def registerUse(sym: Symbol, span: Span, treeSource: SourceFile)(using Context): Unit =
-      registerUse(symbolName(sym), span, treeSource)
+      registerUse(sym.symbolName, span, treeSource)
 
     private def registerUse(symbol: String, span: Span, treeSource: SourceFile)(using Context): Unit =
       registerOccurrence(symbol, span, SymbolOccurrence.Role.REFERENCE, treeSource)
 
     private def registerDefinition(sym: Symbol, span: Span, symkinds: Set[SymbolKind], treeSource: SourceFile)(using Context) =
-      val symbol = symbolName(sym)
+      val sname = sym.symbolName
       val finalSpan = if !span.hasLength || !sym.is(Given) || namePresentInSource(sym, span, treeSource) then
         span
       else
         Span(span.start)
 
-      registerOccurrence(symbol, finalSpan, SymbolOccurrence.Role.DEFINITION, treeSource)
+      if namePresentInSource(sym, span, treeSource) then
+        registerOccurrence(sname, finalSpan, SymbolOccurrence.Role.DEFINITION, treeSource)
       if !sym.is(Package) then
-        registerSymbol(sym, symbol, symkinds)
-
-    private def namePresentInSource(sym: Symbol, span: Span, source:SourceFile)(using Context): Boolean =
-      val content = source.content()
-      val (start, end) = if content(span.end - 1) == '`' then (span.start + 1, span.end - 1) else (span.start, span.end)
-      content.slice(start, end).mkString == sym.name.stripModuleClassSuffix.lastPart.toString
+        registerSymbol(sym, symkinds)
 
     private def spanOfSymbol(sym: Symbol, span: Span, treeSource: SourceFile)(using Context): Span =
       val contents = if treeSource.exists then treeSource.content() else Array.empty[Char]
@@ -580,19 +439,22 @@ class ExtractSemanticDB extends Phase:
         symkinds.toSet
 
     private def ctorParams(
-      vparamss: List[List[ValDef]], body: List[Tree])(using Context): Unit =
+      vparamss: List[List[ValDef]], tparams: List[TypeDef], body: List[Tree])(using Context): Unit =
       @tu lazy val getters = findGetters(vparamss.flatMap(_.map(_.name)).toSet, body)
       for
         vparams <- vparamss
         vparam  <- vparams
       do
+        traverse(vparam.tpt)
         if !excludeSymbol(vparam.symbol) then
           traverseAnnotsOfDefinition(vparam.symbol)
           val symkinds =
             getters.get(vparam.name).fold(SymbolKind.emptySet)(getter =>
               if getter.mods.is(Mutable) then SymbolKind.VarSet else SymbolKind.ValSet)
-          registerSymbol(vparam.symbol, symbolName(vparam.symbol), symkinds)
+          registerSymbol(vparam.symbol, symkinds)
         traverse(vparam.tpt)
+      tparams.foreach(tp => traverse(tp.rhs))
+
 
 object ExtractSemanticDB:
   import java.nio.file.Path
@@ -601,8 +463,14 @@ object ExtractSemanticDB:
   import java.nio.file.Paths
 
   val name: String = "extractSemanticDB"
-
-  def write(source: SourceFile, occurrences: List[SymbolOccurrence], symbolInfos: List[SymbolInformation])(using Context): Unit =
+  val description: String = "extract info into .semanticdb files"
+
+  def write(
+    source: SourceFile,
+    occurrences: List[SymbolOccurrence],
+    symbolInfos: List[SymbolInformation],
+    synthetics: List[Synthetic],
+  )(using Context): Unit =
     def absolutePath(path: Path): Path = path.toAbsolutePath.normalize
     val semanticdbTarget =
       val semanticdbTargetSetting = ctx.settings.semanticdbTarget.value
@@ -624,7 +492,8 @@ object ExtractSemanticDB:
       text = "",
       md5 = internal.MD5.compute(String(source.content)),
       symbols = symbolInfos,
-      occurrences = occurrences
+      occurrences = occurrences,
+      synthetics = synthetics,
     )
     val docs = TextDocuments(List(doc))
     val out = Files.newOutputStream(outpath)
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Language.scala b/compiler/src/dotty/tools/dotc/semanticdb/Language.scala
index cde313b6ec6e..7007f29816db 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/Language.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Language.scala
@@ -1,21 +1,56 @@
-package dotty.tools.dotc.semanticdb
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
 
+package dotty.tools.dotc.semanticdb
 import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
 
-sealed trait Language(val value: Int) extends SemanticdbEnum derives CanEqual
-
-object Language {
-
-  case object UNKNOWN_LANGUAGE extends Language(0)
-  case object SCALA extends Language(1)
-  case object JAVA extends Language(2)
-  final case class Unrecognized(id: Int) extends Language(id)
+sealed abstract class Language(val value: _root_.scala.Int)  extends SemanticdbGeneratedEnum  derives CanEqual {
+  type EnumType = Language
+  def isUnknownLanguage: _root_.scala.Boolean = false
+  def isScala: _root_.scala.Boolean = false
+  def isJava: _root_.scala.Boolean = false
+  
+  final def asRecognized: _root_.scala.Option[dotty.tools.dotc.semanticdb.Language.Recognized] = if (isUnrecognized) _root_.scala.None else _root_.scala.Some(this.asInstanceOf[dotty.tools.dotc.semanticdb.Language.Recognized])
+}
 
-  def fromValue(value: Int): Language = value match {
+object Language  {
+  sealed trait Recognized extends Language
+  
+  @SerialVersionUID(0L)
+  case object UNKNOWN_LANGUAGE extends Language(0) with Language.Recognized {
+    val index = 0
+    val name = "UNKNOWN_LANGUAGE"
+    override def isUnknownLanguage: _root_.scala.Boolean = true
+  }
+  
+  @SerialVersionUID(0L)
+  case object SCALA extends Language(1) with Language.Recognized {
+    val index = 1
+    val name = "SCALA"
+    override def isScala: _root_.scala.Boolean = true
+  }
+  
+  @SerialVersionUID(0L)
+  case object JAVA extends Language(2) with Language.Recognized {
+    val index = 2
+    val name = "JAVA"
+    override def isJava: _root_.scala.Boolean = true
+  }
+  
+  @SerialVersionUID(0L)
+  final case class Unrecognized(unrecognizedValue: _root_.scala.Int)  extends Language(unrecognizedValue) with SemanticdbUnrecognizedEnum
+  
+  lazy val values = scala.collection.immutable.Seq(UNKNOWN_LANGUAGE, SCALA, JAVA)
+  def fromValue(__value: _root_.scala.Int): Language = __value match {
     case 0 => UNKNOWN_LANGUAGE
     case 1 => SCALA
     case 2 => JAVA
-    case id => Unrecognized(id)
+    case __other => Unrecognized(__other)
   }
-
-}
+  
+  
+}
\ No newline at end of file
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/LinkMode.scala b/compiler/src/dotty/tools/dotc/semanticdb/LinkMode.scala
new file mode 100644
index 000000000000..aac4c1254892
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/LinkMode.scala
@@ -0,0 +1,4 @@
+package dotty.tools.dotc.semanticdb
+
+enum LinkMode:
+  case SymlinkChildren, HardlinkChildren
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Location.scala b/compiler/src/dotty/tools/dotc/semanticdb/Location.scala
new file mode 100644
index 000000000000..b58fb8c8e395
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Location.scala
@@ -0,0 +1,108 @@
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
+
+package dotty.tools.dotc.semanticdb
+import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
+
+@SerialVersionUID(0L)
+final case class Location(
+    uri: _root_.scala.Predef.String = "",
+    range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range] = _root_.scala.None
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = uri
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(1, __value)
+        }
+      };
+      if (range.isDefined) {
+        val __value = range.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = uri
+        if (!__v.isEmpty) {
+          _output__.writeString(1, __v)
+        }
+      };
+      range.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(2, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def withUri(__v: _root_.scala.Predef.String): Location = copy(uri = __v)
+    def getRange: dotty.tools.dotc.semanticdb.Range = range.getOrElse(dotty.tools.dotc.semanticdb.Range.defaultInstance)
+    def clearRange: Location = copy(range = _root_.scala.None)
+    def withRange(__v: dotty.tools.dotc.semanticdb.Range): Location = copy(range = Option(__v))
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.Location])
+}
+
+object Location  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Location] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Location] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.Location = {
+    var __uri: _root_.scala.Predef.String = ""
+    var __range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __uri = _input__.readStringRequireUtf8()
+        case 18 =>
+          __range = Option(__range.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Range](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.Location(
+        uri = __uri,
+        range = __range
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.Location(
+    uri = "",
+    range = _root_.scala.None
+  )
+  final val URI_FIELD_NUMBER = 1
+  final val RANGE_FIELD_NUMBER = 2
+  def of(
+    uri: _root_.scala.Predef.String,
+    range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range]
+  ): _root_.dotty.tools.dotc.semanticdb.Location = _root_.dotty.tools.dotc.semanticdb.Location(
+    uri,
+    range
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Location])
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala b/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala
new file mode 100644
index 000000000000..4361db3e50d6
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala
@@ -0,0 +1,392 @@
+package dotty.tools.dotc.semanticdb
+
+import dotty.tools.dotc.{semanticdb => s}
+
+import scala.collection.mutable
+import dotty.tools.dotc.semanticdb.Scala3.{_, given}
+import SymbolInformation.Kind._
+import dotty.tools.dotc.util.SourceFile
+class SymbolInformationPrinter (symtab: PrinterSymtab):
+  val notes = InfoNotes()
+  val infoPrinter = InfoPrinter(notes)
+
+  def pprintSymbolInformation(info: SymbolInformation): String =
+    val sb = new StringBuilder()
+    sb.append(info.symbol).append(" => ")
+    sb.append(infoPrinter.pprint(info))
+    sb.toString
+
+  class InfoNotes:
+    private val noteSymtab = mutable.Map[String, SymbolInformation]()
+    def enter(info: SymbolInformation) =
+      if (symtab.info(info.symbol).isEmpty && info.kind != UNKNOWN_KIND)
+        noteSymtab(info.symbol) = info
+
+    def visit(sym: String): SymbolInformation =
+      val symtabInfo = noteSymtab.get(sym).orElse(symtab.info(sym))
+      symtabInfo.getOrElse {
+        val displayName = if sym.isGlobal then sym.desc.value else sym
+        SymbolInformation(symbol = sym, displayName = displayName)
+      }
+  end InfoNotes
+
+  class InfoPrinter(notes: InfoNotes):
+    private enum SymbolStyle:
+      case Reference, Definition
+    def pprint(info: SymbolInformation): String =
+      val sb = new StringBuilder()
+      val annotStr = info.annotations.map(pprint).mkString(" ")
+      if annotStr.nonEmpty then
+        sb.append(annotStr + " ")
+      sb.append(accessString(info.access))
+      if info.isAbstract then sb.append("abstract ")
+      if info.isFinal then sb.append("final ")
+      if info.isSealed then sb.append("sealed ")
+      if info.isImplicit then sb.append("implicit ")
+      if info.isLazy then sb.append("lazy ")
+      if info.isCase then sb.append("case ")
+      if info.isCovariant then sb.append("covariant ")
+      if info.isContravariant then sb.append("contravariant ")
+      if info.isVal then sb.append("val ")
+      if info.isVar then sb.append("var ")
+      if info.isStatic then sb.append("static ")
+      if info.isPrimary then sb.append("primary ")
+      if info.isEnum then sb.append("enum ")
+      if info.isDefault then sb.append("default ")
+      if info.isGiven then sb.append("given ")
+      if info.isInline then sb.append("inline ")
+      if info.isOpen then sb.append("open ")
+      if info.isTransparent then sb.append("transparent ")
+      if info.isInfix then sb.append("infix ")
+      if info.isOpaque then sb.append("opaque ")
+      info.kind match
+        case LOCAL => sb.append("local ")
+        case FIELD => sb.append("field ")
+        case METHOD => sb.append("method ")
+        case CONSTRUCTOR => sb.append("ctor ")
+        case MACRO => sb.append("macro ")
+        case TYPE => sb.append("type ")
+        case PARAMETER => sb.append("param ")
+        case SELF_PARAMETER => sb.append("selfparam ")
+        case TYPE_PARAMETER => sb.append("typeparam ")
+        case OBJECT => sb.append("object ")
+        case PACKAGE => sb.append("package ")
+        case PACKAGE_OBJECT => sb.append("package object ")
+        case CLASS => sb.append("class ")
+        case TRAIT => sb.append("trait ")
+        case INTERFACE => sb.append("interface ")
+        case UNKNOWN_KIND | Unrecognized(_) => sb.append("unknown ")
+      sb.append(s"${info.displayName}${info.prefixBeforeTpe}${pprint(info.signature)}")
+      info.overriddenSymbols match
+        case Nil => ()
+        case all => sb.append(s" <: ${all.mkString(", ")}")
+      sb.toString
+
+    private def pprintDef(info: SymbolInformation) =
+      notes.enter(info)
+      pprint(info.symbol, SymbolStyle.Definition)
+    def pprintRef(sym: String): String = pprint(sym, SymbolStyle.Reference)
+    private def pprintDef(sym: String): String = pprint(sym, SymbolStyle.Definition)
+    private def pprint(sym: String, style: SymbolStyle): String =
+      val info = notes.visit(sym)
+      style match
+        case SymbolStyle.Reference =>
+          info.displayName
+        case SymbolStyle.Definition =>
+          pprint(info)
+
+
+    private def pprint(sig: Signature): String =
+      sig match
+        case ClassSignature(tparams, parents, self, decls) =>
+          val sb = new StringBuilder()
+          if (tparams.infos.nonEmpty)
+            sb.append(tparams.infos.map(pprintDef).mkString("[", ", ", "] "))
+          if (parents.nonEmpty)
+            sb.append(parents.map(pprint).mkString("extends ", " with ", " "))
+          if (self.isDefined || decls.infos.nonEmpty) {
+            val selfStr = if (self.isDefined) s"self: ${pprint(self)} =>" else ""
+            val declsStr = if (decls.infos.nonEmpty) s"+${decls.infos.length} decls" else ""
+            sb.append(s"{ ${selfStr} ${declsStr} }")
+          }
+          sb.toString
+        case MethodSignature(tparams, paramss, res) =>
+          val sb = new StringBuilder()
+          if (tparams.infos.nonEmpty)
+            sb.append(tparams.infos.map(pprintDef).mkString("[", ", ", "]"))
+          paramss.foreach { params =>
+            val paramsStr = params.infos.map(pprintDef).mkString("(", ", ", ")")
+            sb.append(paramsStr)
+          }
+          sb.append(s": ${pprint(res)}")
+          sb.toString
+        case TypeSignature(tparams, lo, hi) =>
+          val sb = new StringBuilder()
+          if (tparams.infos.nonEmpty)
+            sb.append(tparams.infos.map(pprintDef).mkString("[", ", ", "]"))
+          if (lo == hi) {
+            sb.append(s" = ${pprint(lo)}")
+          } else {
+            lo match
+              case TypeRef(Type.Empty, "scala/Nothing#", Nil) => ()
+              case lo => sb.append(s" >: ${pprint(lo)}")
+            hi match
+              case TypeRef(Type.Empty, "scala/Any#", Nil) => ()
+              case TypeRef(Type.Empty, "java/lang/Object#", Nil) => ()
+              case hi => sb.append(s" <: ${pprint(hi)}")
+          }
+          sb.toString
+        case ValueSignature(tpe) =>
+          pprint(tpe)
+        case _ =>
+          "<?>"
+
+    protected def pprint(tpe: Type): String = {
+      def prefix(tpe: Type): String = tpe match
+        case TypeRef(pre, sym, args) =>
+          val preStr = pre match {
+            case _: SingleType | _: ThisType | _: SuperType =>
+              s"${prefix(pre)}."
+            case Type.Empty => ""
+            case _ =>
+              s"${prefix(pre)}#"
+          }
+          val argsStr = if (args.nonEmpty) args.map(normal).mkString("[", ", ", "]") else ""
+          s"${preStr}${pprintRef(sym)}${argsStr}"
+        case SingleType(pre, sym) =>
+          pre match {
+            case Type.Empty => pprintRef(sym)
+            case _ =>
+              s"${prefix(pre)}.${pprintRef(sym)}"
+          }
+        case ThisType(sym) =>
+          s"${pprintRef(sym)}.this"
+        case SuperType(pre, sym) =>
+          s"${prefix(pre)}.super[${pprintRef(sym)}]"
+        case ConstantType(const) =>
+          pprint(const)
+        case IntersectionType(types) =>
+          types.map(normal).mkString(" & ")
+        case UnionType(types) =>
+          types.map(normal).mkString(" | ")
+        case WithType(types) =>
+          types.map(normal).mkString(" with ")
+        case StructuralType(utpe, decls) =>
+          val declsStr =
+            if (decls.infos.nonEmpty)
+              s"{ ${decls.infos.map(pprintDef).mkString("; ")} }"
+            else "{}"
+          s"${normal(utpe)} ${declsStr}"
+        case AnnotatedType(anns, utpe) =>
+          s"${normal(utpe)} ${anns.map(pprint).mkString(" ")}"
+        case ExistentialType(utpe, decls) =>
+          val sdecls = decls.infos.map(pprintDef).mkString("; ")
+          val sutpe = normal(utpe)
+          s"${sutpe} forSome { ${sdecls} }"
+        case UniversalType(tparams, utpe) =>
+          val params = tparams.infos.map(_.displayName).mkString("[", ", ", "]")
+          val resType = normal(utpe)
+          s"${params} => ${resType}"
+        case ByNameType(utpe) =>
+          s"=> ${normal(utpe)}"
+        case RepeatedType(utpe) =>
+          s"${normal(utpe)}*"
+        case _ =>
+          "<?>"
+
+      def normal(tpe: Type): String = tpe match
+        case _: SingleType | _: ThisType | _: SuperType =>
+          s"${prefix(tpe)}.type"
+        case _ =>
+          prefix(tpe)
+      normal(tpe)
+    }
+
+    private def pprint(ann: Annotation): String =
+      ann.tpe match {
+        case Type.Empty => s"@<?>"
+        case tpe => s"@${pprint(tpe)}"
+      }
+
+    protected def pprint(const: Constant): String = const match {
+        case Constant.Empty =>
+          "<?>"
+        case UnitConstant() =>
+          "()"
+        case BooleanConstant(true) =>
+          "true"
+        case BooleanConstant(false) =>
+          "false"
+        case ByteConstant(value) =>
+          value.toByte.toString
+        case ShortConstant(value) =>
+          value.toShort.toString
+        case CharConstant(value) =>
+          s"'${value.toChar.toString}'"
+        case IntConstant(value) =>
+          value.toString
+        case LongConstant(value) =>
+          s"${value.toString}L"
+        case FloatConstant(value) =>
+          s"${value.toString}f"
+        case DoubleConstant(value) =>
+          value.toString
+        case StringConstant(value) =>
+          "\"" + value + "\""
+        case NullConstant() =>
+          "null"
+      }
+
+    private def accessString(access: Access): String =
+      access match
+        case Access.Empty => ""
+        case _: PublicAccess => ""
+        case _: PrivateAccess => "private "
+        case _: ProtectedAccess => "protected "
+        case _: PrivateThisAccess => "private[this] "
+        case _: ProtectedThisAccess => "protected[this] "
+        case PrivateWithinAccess(ssym) =>
+          s"private[${ssym}] "
+        case ProtectedWithinAccess(ssym) =>
+          s"protected[${ssym}] "
+    extension (scope: Scope)
+      private def infos: List[SymbolInformation] =
+        if (scope.symlinks.nonEmpty)
+          scope.symlinks.map(symbol => SymbolInformation(symbol = symbol)).toList
+        else
+          scope.hardlinks.toList
+
+    extension (scope: Option[Scope])
+      private def infos: List[SymbolInformation] = scope match {
+        case Some(s) => s.infos
+        case None => Nil
+      }
+  end InfoPrinter
+end SymbolInformationPrinter
+
+extension (info: SymbolInformation)
+  def prefixBeforeTpe: String = {
+    info.kind match {
+      case LOCAL | FIELD | PARAMETER | SELF_PARAMETER | UNKNOWN_KIND | Unrecognized(_) =>
+        ": "
+      case METHOD | CONSTRUCTOR | MACRO | TYPE | TYPE_PARAMETER | OBJECT | PACKAGE |
+          PACKAGE_OBJECT | CLASS | TRAIT | INTERFACE =>
+        " "
+    }
+  }
+
+trait PrinterSymtab:
+  def info(symbol: String): Option[SymbolInformation]
+object PrinterSymtab:
+  def fromTextDocument(doc: TextDocument): PrinterSymtab =
+    val map = doc.symbols.map(info => (info.symbol, info)).toMap
+    new PrinterSymtab {
+      override def info(symbol: String): Option[SymbolInformation] = map.get(symbol)
+    }
+
+def processRange(sb: StringBuilder, range: Range): Unit =
+  sb.append('[')
+    .append(range.startLine).append(':').append(range.startCharacter)
+    .append("..")
+    .append(range.endLine).append(':').append(range.endCharacter)
+    .append("):")
+
+
+
+class SyntheticPrinter(symtab: PrinterSymtab, source: SourceFile) extends SymbolInformationPrinter(symtab):
+
+  def pprint(synth: Synthetic): String =
+    val sb = new StringBuilder()
+    val notes = InfoNotes()
+    val treePrinter = TreePrinter(source, synth.range, notes)
+
+    synth.range match
+      case Some(range) =>
+        processRange(sb, range)
+        sb.append(source.substring(range))
+      case None =>
+        sb.append("[):")
+    sb.append(" => ")
+    sb.append(treePrinter.pprint(synth.tree))
+    sb.toString
+
+  extension (source: SourceFile)
+    private def substring(range: Option[s.Range]): String =
+      range match
+        case Some(range) => source.substring(range)
+        case None => ""
+    private def substring(range: s.Range): String =
+      /** get the line length of a given line */
+      def lineLength(line: Int): Int =
+        val isLastLine = source.lineToOffsetOpt(line).nonEmpty && source.lineToOffsetOpt(line + 1).isEmpty
+        if isLastLine then source.content.length - source.lineToOffset(line) - 1
+        else source.lineToOffset(line + 1) - source.lineToOffset(line) - 1 // -1 for newline char
+
+      val start = source.lineToOffset(range.startLine) +
+        math.min(range.startCharacter, lineLength(range.startLine))
+      val end = source.lineToOffset(range.endLine) +
+        math.min(range.endCharacter, lineLength(range.endLine))
+      new String(source.content, start, end - start)
+
+
+  // def pprint(tree: s.Tree, range: Option[Range]): String =
+  class TreePrinter(source: SourceFile, originalRange: Option[Range], notes: InfoNotes) extends InfoPrinter(notes):
+    def pprint(tree: Tree): String =
+      val sb = new StringBuilder()
+      processTree(tree)(using sb)
+      sb.toString
+
+
+    private def rep[T](xs: Seq[T], seq: String)(f: T => Unit)(using sb: StringBuilder): Unit =
+      xs.zipWithIndex.foreach { (x, i) =>
+        if i != 0 then sb.append(seq)
+        f(x)
+      }
+
+    private def processTree(tree: Tree)(using sb: StringBuilder): Unit =
+      tree match {
+        case tree: ApplyTree =>
+          processTree(tree.function)
+          sb.append("(")
+          rep(tree.arguments, ", ")(processTree)
+          sb.append(")")
+        case tree: FunctionTree =>
+          sb.append("{")
+          sb.append("(")
+          rep(tree.parameters, ", ")(processTree)
+          sb.append(") =>")
+          processTree(tree.body)
+          sb.append("}")
+        case tree: IdTree =>
+          sb.append(pprintRef(tree.symbol))
+        case tree: LiteralTree =>
+          sb.append(pprint(tree.constant))
+        case tree: MacroExpansionTree =>
+          sb.append("(`macro-expandee` : `")
+          sb.append(pprint(tree.tpe))
+          sb.append(")")
+        case tree: OriginalTree =>
+          if (tree.range == originalRange && originalRange.nonEmpty) then
+            sb.append("*")
+          else
+            sb.append("orig(")
+            sb.append(source.substring(tree.range))
+            sb.append(")")
+        case tree: SelectTree =>
+          processTree(tree.qualifier)
+          sb.append(".")
+          tree.id match
+            case Some(tree) => processTree(tree)
+            case None => ()
+        case tree: TypeApplyTree =>
+          processTree(tree.function)
+          sb.append("[")
+          rep(tree.typeArguments, ", ")((t) => sb.append(pprint(t)))
+          sb.append("]")
+
+        case _ =>
+          sb.append("<?>")
+      }
+
+
+end SyntheticPrinter
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Range.scala b/compiler/src/dotty/tools/dotc/semanticdb/Range.scala
index 61d9d7f27c74..f8b1675a37c4 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/Range.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Range.scala
@@ -1,97 +1,106 @@
-package dotty.tools.dotc.semanticdb
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
 
+package dotty.tools.dotc.semanticdb
 import dotty.tools.dotc.semanticdb.internal._
 import scala.annotation.internal.sharable
 
-object Range {
-  val defaultInstance: Range = Range(0, 0, 0, 0)
-}
-
+@SerialVersionUID(0L)
 final case class Range(
-  startLine: Int,
-  startCharacter: Int,
-  endLine: Int,
-  endCharacter: Int
-) extends SemanticdbMessage[Range] derives CanEqual {
-  @sharable
-  private var __serializedSizeCachedValue: Int = 0
-  private def __computeSerializedValue(): Int = {
-    var __size = 0
-
-    {
-      val __value = startLine
-      if (__value != 0) {
-        __size += SemanticdbOutputStream
-          .computeInt32Size(1, __value)
-      }
-    };
-
-    {
-      val __value = startCharacter
-      if (__value != 0) {
-        __size += SemanticdbOutputStream
-          .computeInt32Size(2, __value)
-      }
-    };
-
-    {
-      val __value = endLine
-      if (__value != 0) {
-        __size += SemanticdbOutputStream
-          .computeInt32Size(3, __value)
-      }
-    };
-
-    {
-      val __value = endCharacter
-      if (__value != 0) {
-        __size += SemanticdbOutputStream
-          .computeInt32Size(4, __value)
-      }
-    };
-    __size
-  }
-  final override def serializedSize: Int = {
-    var read = __serializedSizeCachedValue
-    if (read == 0) {
-      read = __computeSerializedValue()
-      __serializedSizeCachedValue = read
+    startLine: _root_.scala.Int = 0,
+    startCharacter: _root_.scala.Int = 0,
+    endLine: _root_.scala.Int = 0,
+    endCharacter: _root_.scala.Int = 0
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = startLine
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeInt32Size(1, __value)
+        }
+      };
+      
+      {
+        val __value = startCharacter
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeInt32Size(2, __value)
+        }
+      };
+      
+      {
+        val __value = endLine
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeInt32Size(3, __value)
+        }
+      };
+      
+      {
+        val __value = endCharacter
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeInt32Size(4, __value)
+        }
+      };
+      __size
     }
-    read
-  }
-  def writeTo(
-      `_output__`: SemanticdbOutputStream
-  ): Unit = {
-    {
-      val __v = startLine
-      if (__v != 0) {
-        _output__.writeInt32(1, __v)
-      }
-    };
-    {
-      val __v = startCharacter
-      if (__v != 0) {
-        _output__.writeInt32(2, __v)
-      }
-    };
-    {
-      val __v = endLine
-      if (__v != 0) {
-        _output__.writeInt32(3, __v)
-      }
-    };
-    {
-      val __v = endCharacter
-      if (__v != 0) {
-        _output__.writeInt32(4, __v)
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
       }
-    };
-  }
-  def mergeFrom(`_input__`: SemanticdbInputStream): Range = {
-    var __startLine = this.startLine
-    var __startCharacter = this.startCharacter
-    var __endLine = this.endLine
-    var __endCharacter = this.endCharacter
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = startLine
+        if (__v != 0) {
+          _output__.writeInt32(1, __v)
+        }
+      };
+      {
+        val __v = startCharacter
+        if (__v != 0) {
+          _output__.writeInt32(2, __v)
+        }
+      };
+      {
+        val __v = endLine
+        if (__v != 0) {
+          _output__.writeInt32(3, __v)
+        }
+      };
+      {
+        val __v = endCharacter
+        if (__v != 0) {
+          _output__.writeInt32(4, __v)
+        }
+      };
+    }
+    def withStartLine(__v: _root_.scala.Int): Range = copy(startLine = __v)
+    def withStartCharacter(__v: _root_.scala.Int): Range = copy(startCharacter = __v)
+    def withEndLine(__v: _root_.scala.Int): Range = copy(endLine = __v)
+    def withEndCharacter(__v: _root_.scala.Int): Range = copy(endCharacter = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.Range])
+}
+
+object Range  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Range] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Range] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.Range = {
+    var __startLine: _root_.scala.Int = 0
+    var __startCharacter: _root_.scala.Int = 0
+    var __endLine: _root_.scala.Int = 0
+    var __endCharacter: _root_.scala.Int = 0
     var _done__ = false
     while (!_done__) {
       val _tag__ = _input__.readTag()
@@ -108,11 +117,39 @@ final case class Range(
         case tag => _input__.skipField(tag)
       }
     }
-    Range(
-      startLine = __startLine,
-      startCharacter = __startCharacter,
-      endLine = __endLine,
-      endCharacter = __endCharacter
+    dotty.tools.dotc.semanticdb.Range(
+        startLine = __startLine,
+        startCharacter = __startCharacter,
+        endLine = __endLine,
+        endCharacter = __endCharacter
     )
   }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.Range(
+    startLine = 0,
+    startCharacter = 0,
+    endLine = 0,
+    endCharacter = 0
+  )
+  final val START_LINE_FIELD_NUMBER = 1
+  final val START_CHARACTER_FIELD_NUMBER = 2
+  final val END_LINE_FIELD_NUMBER = 3
+  final val END_CHARACTER_FIELD_NUMBER = 4
+  def of(
+    startLine: _root_.scala.Int,
+    startCharacter: _root_.scala.Int,
+    endLine: _root_.scala.Int,
+    endCharacter: _root_.scala.Int
+  ): _root_.dotty.tools.dotc.semanticdb.Range = _root_.dotty.tools.dotc.semanticdb.Range(
+    startLine,
+    startCharacter,
+    endLine,
+    endCharacter
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Range])
 }
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala b/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala
index 211c1576254f..686dc20e481b 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala
@@ -1,14 +1,19 @@
 package dotty.tools.dotc.semanticdb
 
 import dotty.tools.dotc.core
-import core.Symbols.{ Symbol , defn }
+import core.Symbols.{ Symbol , defn, NoSymbol }
 import core.Contexts._
 import core.Names
 import core.Names.Name
-import core.Types.Type
+import core.Types.{Type, TypeBounds}
 import core.Flags._
 import core.NameKinds
 import core.StdNames.nme
+import SymbolInformation.{Kind => k}
+import dotty.tools.dotc.util.SourceFile
+import dotty.tools.dotc.util.Spans.Span
+import dotty.tools.dotc.ast.tpd
+import dotty.tools.dotc.{semanticdb => s}
 
 import java.lang.Character.{isJavaIdentifierPart, isJavaIdentifierStart}
 
@@ -25,6 +30,128 @@ object Scala3:
 
   private val WILDCARDTypeName = nme.WILDCARD.toTypeName
 
+  def range(span: Span, treeSource: SourceFile)(using Context): Option[Range] =
+    def lineCol(offset: Int) = (treeSource.offsetToLine(offset), treeSource.column(offset))
+    val (startLine, startCol) = lineCol(span.start)
+    val (endLine, endCol) = lineCol(span.end)
+    Some(Range(startLine, startCol, endLine, endCol))
+
+  def namePresentInSource(sym: Symbol, span: Span, source:SourceFile)(using Context): Boolean =
+    if !span.exists then false
+    else
+      val content = source.content()
+      val (start, end) =
+        if content.lift(span.end - 1).exists(_ == '`') then
+          (span.start + 1, span.end - 1)
+        else (span.start, span.end)
+      val nameInSource = content.slice(start, end).mkString
+      // for secondary constructors `this`
+      if sym.isConstructor && nameInSource == nme.THISkw.toString then
+        true
+      else
+        val target =
+          if sym.isPackageObject then sym.owner
+          else sym
+        nameInSource == target.name.stripModuleClassSuffix.lastPart.toString
+
+  sealed trait FakeSymbol {
+    private[Scala3] var sname: Option[String] = None
+  }
+
+  /** Fake symbol that represents wildcard symbol which will be converted to
+    * semanticdb symbol with
+    * - name: local...
+    * - SymbolInformation with signature TypeSignature of given type bound.
+    */
+  case class WildcardTypeSymbol(owner: Symbol, bounds: TypeBounds) extends FakeSymbol
+
+  case class TermParamRefSymbol(owner: Symbol, name: Name, tp: Type) extends FakeSymbol
+  case class TypeParamRefSymbol(owner: Symbol, name: Name, tp: TypeBounds) extends FakeSymbol
+  case class RefinementSymbol(owner: Symbol, name: Name, tp: Type) extends FakeSymbol
+  type SemanticSymbol = Symbol | FakeSymbol
+
+  given SemanticSymbolOps : AnyRef with
+    extension (sym: SemanticSymbol)
+      def name(using Context): Name = sym match
+        case s: Symbol => s.name
+        case s: WildcardTypeSymbol => nme.WILDCARD
+        case s: TermParamRefSymbol => s.name
+        case s: TypeParamRefSymbol => s.name
+        case s: RefinementSymbol => s.name
+
+      def symbolName(using builder: SemanticSymbolBuilder)(using Context): String =
+        sym match
+          case s: Symbol => builder.symbolName(s)
+          case s: FakeSymbol =>
+            s.sname.getOrElse {
+              val sname = builder.symbolName(s)
+              s.sname = Some(sname)
+              sname
+            }
+
+      def symbolInfo(symkinds: Set[SymbolKind])(using LinkMode, TypeOps, SemanticSymbolBuilder, Context): SymbolInformation =
+        sym match
+          case s: Symbol =>
+            val kind = s.symbolKind(symkinds)
+            val sname = sym.symbolName
+            val signature = s.info.toSemanticSig(s)
+            val symbolAnnotations = s.annotations.collect{
+              case annot if annot.symbol != defn.BodyAnnot && annot.symbol != defn.ChildAnnot =>
+                Annotation(annot.tree.tpe.toSemanticType(annot.symbol))
+            }
+            SymbolInformation(
+              symbol = sname,
+              language = Language.SCALA,
+              kind = kind,
+              properties = s.symbolProps(symkinds),
+              displayName = Symbols.displaySymbol(s),
+              signature = signature,
+              access = s.symbolAccess(kind),
+              overriddenSymbols = s.overriddenSymbols,
+              annotations = symbolAnnotations
+            )
+          case s: WildcardTypeSymbol =>
+            SymbolInformation(
+              symbol = symbolName,
+              language = Language.SCALA,
+              kind = SymbolInformation.Kind.TYPE,
+              displayName = nme.WILDCARD.show,
+              signature = s.bounds.toSemanticSig(s.owner),
+            )
+          case s: TermParamRefSymbol =>
+            SymbolInformation(
+              symbol = symbolName,
+              language = Language.SCALA,
+              kind = SymbolInformation.Kind.PARAMETER,
+              displayName = s.name.show.unescapeUnicode,
+              signature = s.tp.toSemanticSig(s.owner),
+            )
+          case s: TypeParamRefSymbol =>
+            SymbolInformation(
+              symbol = symbolName,
+              language = Language.SCALA,
+              kind = SymbolInformation.Kind.TYPE_PARAMETER,
+              displayName = s.name.show.unescapeUnicode,
+              signature = s.tp.toSemanticSig(s.owner),
+            )
+          case s: RefinementSymbol =>
+            val signature = s.tp.toSemanticSig(s.owner)
+            val kind = signature match
+              case _: TypeSignature => SymbolInformation.Kind.TYPE
+              case _: MethodSignature => SymbolInformation.Kind.METHOD
+              case _: ValueSignature => SymbolInformation.Kind.FIELD
+              case _ => SymbolInformation.Kind.UNKNOWN_KIND
+            SymbolInformation(
+              symbol = symbolName,
+              language = Language.SCALA,
+              kind = kind,
+              displayName = s.name.show.unescapeUnicode,
+              properties =
+                SymbolInformation.Property.ABSTRACT.value,
+              signature = signature,
+            )
+  end SemanticSymbolOps
+
   enum SymbolKind derives CanEqual:
     kind =>
 
@@ -83,6 +210,7 @@ object Scala3:
 
       def isEmptyNumbered: Boolean =
         !name.is(NameKinds.WildcardParamName)
+        && !name.is(NameKinds.EvidenceParamName)
         && { name match
           case NameKinds.AnyNumberedName(nme.EMPTY, _) => true
           case _                                       => false
@@ -126,6 +254,113 @@ object Scala3:
       def isSyntheticWithIdent(using Context): Boolean =
         sym.is(Synthetic) && !sym.isAnonymous && !sym.name.isEmptyNumbered
 
+      /** The semanticdb name of the given symbol */
+      def symbolName(using builder: SemanticSymbolBuilder)(using Context): String =
+        builder.symbolName(sym)
+
+      def funParamSymbol(using builder: SemanticSymbolBuilder)(using Context): Name => String =
+        builder.funParamSymbol(sym)
+
+      def symbolKind(symkinds: Set[SymbolKind])(using Context): SymbolInformation.Kind =
+        if sym.isTypeParam then
+          SymbolInformation.Kind.TYPE_PARAMETER
+        else if sym.is(TermParam) then
+          SymbolInformation.Kind.PARAMETER
+        else if sym.isTerm && sym.owner.isTerm then
+          SymbolInformation.Kind.LOCAL
+        else if sym.isInlineMethod || sym.is(Macro) then
+          SymbolInformation.Kind.MACRO
+        else if sym.isConstructor then
+          SymbolInformation.Kind.CONSTRUCTOR
+        else if sym.isSelfSym then
+          SymbolInformation.Kind.SELF_PARAMETER
+        else if sym.isOneOf(Method) || symkinds.exists(_.isVarOrVal) then
+          SymbolInformation.Kind.METHOD
+        else if sym.isPackageObject then
+          SymbolInformation.Kind.PACKAGE_OBJECT
+        else if sym.is(Module) then
+          SymbolInformation.Kind.OBJECT
+        else if sym.is(Package) then
+          SymbolInformation.Kind.PACKAGE
+        else if sym.isAllOf(JavaInterface) then
+          SymbolInformation.Kind.INTERFACE
+        else if sym.is(Trait) then
+          SymbolInformation.Kind.TRAIT
+        else if sym.isClass then
+          SymbolInformation.Kind.CLASS
+        else if sym.isType then
+          SymbolInformation.Kind.TYPE
+        else if sym.is(ParamAccessor) then
+          SymbolInformation.Kind.FIELD
+        else
+          SymbolInformation.Kind.UNKNOWN_KIND
+
+      def symbolProps(symkinds: Set[SymbolKind])(using Context): Int =
+        if sym.is(ModuleClass) then
+          return sym.sourceModule.symbolProps(symkinds)
+        var props = 0
+        if sym.isPrimaryConstructor then
+          props |= SymbolInformation.Property.PRIMARY.value
+        if sym.is(Abstract) || symkinds.contains(SymbolKind.Abstract) then
+          props |= SymbolInformation.Property.ABSTRACT.value
+        if sym.is(Final) then
+          props |= SymbolInformation.Property.FINAL.value
+        if sym.is(Sealed) then
+          props |= SymbolInformation.Property.SEALED.value
+        if sym.isOneOf(GivenOrImplicit) then
+          props |= SymbolInformation.Property.IMPLICIT.value
+        if sym.is(Lazy, butNot=Module) then
+          props |= SymbolInformation.Property.LAZY.value
+        if sym.isAllOf(Case | Module) || sym.is(CaseClass) || sym.isAllOf(EnumCase) then
+          props |= SymbolInformation.Property.CASE.value
+        if sym.is(Covariant) then
+          props |= SymbolInformation.Property.COVARIANT.value
+        if sym.is(Contravariant) then
+          props |= SymbolInformation.Property.CONTRAVARIANT.value
+        if sym.isAllOf(DefaultMethod | JavaDefined) || sym.is(Accessor) && sym.name.is(NameKinds.DefaultGetterName) then
+          props |= SymbolInformation.Property.DEFAULT.value
+        if symkinds.exists(_.isVal) then
+          props |= SymbolInformation.Property.VAL.value
+        if symkinds.exists(_.isVar) then
+          props |= SymbolInformation.Property.VAR.value
+        if sym.is(JavaStatic) then
+          props |= SymbolInformation.Property.STATIC.value
+        if sym.is(Enum) then
+          props |= SymbolInformation.Property.ENUM.value
+        if sym.is(Given) then
+          props |= SymbolInformation.Property.GIVEN.value
+        if sym.is(Inline) then
+          props |= SymbolInformation.Property.INLINE.value
+        if sym.is(Open) then
+          props |= SymbolInformation.Property.OPEN.value
+        if sym.is(Open) then
+          props |= SymbolInformation.Property.OPEN.value
+        if sym.is(Transparent) then
+          props |= SymbolInformation.Property.TRANSPARENT.value
+        if sym.is(Infix) then
+          props |= SymbolInformation.Property.INFIX.value
+        if sym.is(Opaque) then
+          props |= SymbolInformation.Property.OPAQUE.value
+        props
+
+      def symbolAccess(kind: SymbolInformation.Kind)(using Context, SemanticSymbolBuilder): Access =
+        kind match
+          case k.LOCAL | k.PARAMETER | k.SELF_PARAMETER | k.TYPE_PARAMETER | k.PACKAGE | k.PACKAGE_OBJECT =>
+            Access.Empty
+          case _ =>
+            if (sym.privateWithin == NoSymbol)
+              if (sym.isAllOf(PrivateLocal)) PrivateThisAccess()
+              else if (sym.is(Private)) PrivateAccess()
+              else if (sym.isAllOf(ProtectedLocal)) ProtectedThisAccess()
+              else if (sym.is(Protected)) ProtectedAccess()
+              else PublicAccess()
+            else
+              val ssym = sym.privateWithin.symbolName
+              if (sym.is(Protected)) ProtectedWithinAccess(ssym)
+              else PrivateWithinAccess(ssym)
+
+      def overriddenSymbols(using Context, SemanticSymbolBuilder): List[String] =
+        sym.allOverriddenSymbols.map(_.symbolName).toList
   end SymbolOps
 
   object LocalSymbol:
@@ -164,6 +399,10 @@ object Scala3:
       def isTypeParameter: Boolean = !symbol.isEmpty && !symbol.isMulti && symbol.last == ']'
       def isParameter: Boolean = !symbol.isEmpty && !symbol.isMulti && symbol.last == ')'
 
+      def desc: Descriptor =
+        if isGlobal then DescriptorParser(symbol)._1
+        else Descriptor.None
+
       def unescapeUnicode =
         unicodeEscape.replaceAllIn(symbol, m => String.valueOf(Integer.parseInt(m.group(1), 16).toChar))
 
@@ -187,6 +426,12 @@ object Scala3:
       def isStatic: Boolean = (info.properties & SymbolInformation.Property.STATIC.value) != 0
       def isEnum: Boolean = (info.properties & SymbolInformation.Property.ENUM.value) != 0
       def isDefault: Boolean = (info.properties & SymbolInformation.Property.DEFAULT.value) != 0
+      def isGiven: Boolean = (info.properties & SymbolInformation.Property.GIVEN.value) != 0
+      def isInline: Boolean = (info.properties & SymbolInformation.Property.INLINE.value) != 0
+      def isOpen: Boolean = (info.properties & SymbolInformation.Property.OPEN.value) != 0
+      def isTransparent: Boolean = (info.properties & SymbolInformation.Property.TRANSPARENT.value) != 0
+      def isInfix: Boolean = (info.properties & SymbolInformation.Property.INFIX.value) != 0
+      def isOpaque: Boolean = (info.properties & SymbolInformation.Property.OPAQUE.value) != 0
 
       def isUnknownKind: Boolean = info.kind.isUnknownKind
       def isLocal: Boolean = info.kind.isLocal
@@ -211,9 +456,7 @@ object Scala3:
       def hasLength = range.endLine > range.startLine || range.endCharacter > range.startCharacter
   end RangeOps
 
-  /** Sort symbol occurrences by their start position. */
-  given OccurrenceOrdering: Ordering[SymbolOccurrence] = (x, y) =>
-    x.range -> y.range match
+  private def compareRange(x: Option[Range], y: Option[Range]): Int = x -> y match
     case None -> _ | _ -> None => 0
     case Some(a) -> Some(b) =>
       val byLine = Integer.compare(a.startLine, b.startLine)
@@ -221,10 +464,14 @@ object Scala3:
         byLine
       else // byCharacter
         Integer.compare(a.startCharacter, b.startCharacter)
-  end OccurrenceOrdering
+
+  /** Sort symbol occurrences by their start position. */
+  given Ordering[SymbolOccurrence] = (x, y) => compareRange(x.range, y.range)
 
   given Ordering[SymbolInformation] = Ordering.by[SymbolInformation, String](_.symbol)(IdentifierOrdering())
 
+  given Ordering[Synthetic] = (x, y) => compareRange(x.range, y.range)
+
   /**
     * A comparator for identifier like "Predef" or "Function10".
     *
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Schema.scala b/compiler/src/dotty/tools/dotc/semanticdb/Schema.scala
index 33b236d7ac5a..492e1647de51 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/Schema.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Schema.scala
@@ -1,21 +1,56 @@
-package dotty.tools.dotc.semanticdb
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
 
+package dotty.tools.dotc.semanticdb
 import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
 
-sealed trait Schema(val value: Int) extends SemanticdbEnum derives CanEqual
-
-object Schema {
-
-  case object LEGACY extends Schema(0)
-  case object SEMANTICDB3 extends Schema(3)
-  case object SEMANTICDB4 extends Schema(4)
-  final case class Unrecognized(id: Int) extends Schema(id)
+sealed abstract class Schema(val value: _root_.scala.Int)  extends SemanticdbGeneratedEnum  derives CanEqual {
+  type EnumType = Schema
+  def isLegacy: _root_.scala.Boolean = false
+  def isSemanticdb3: _root_.scala.Boolean = false
+  def isSemanticdb4: _root_.scala.Boolean = false
+  
+  final def asRecognized: _root_.scala.Option[dotty.tools.dotc.semanticdb.Schema.Recognized] = if (isUnrecognized) _root_.scala.None else _root_.scala.Some(this.asInstanceOf[dotty.tools.dotc.semanticdb.Schema.Recognized])
+}
 
-  def fromValue(value: Int): Schema = value match {
+object Schema  {
+  sealed trait Recognized extends Schema
+  
+  @SerialVersionUID(0L)
+  case object LEGACY extends Schema(0) with Schema.Recognized {
+    val index = 0
+    val name = "LEGACY"
+    override def isLegacy: _root_.scala.Boolean = true
+  }
+  
+  @SerialVersionUID(0L)
+  case object SEMANTICDB3 extends Schema(3) with Schema.Recognized {
+    val index = 1
+    val name = "SEMANTICDB3"
+    override def isSemanticdb3: _root_.scala.Boolean = true
+  }
+  
+  @SerialVersionUID(0L)
+  case object SEMANTICDB4 extends Schema(4) with Schema.Recognized {
+    val index = 2
+    val name = "SEMANTICDB4"
+    override def isSemanticdb4: _root_.scala.Boolean = true
+  }
+  
+  @SerialVersionUID(0L)
+  final case class Unrecognized(unrecognizedValue: _root_.scala.Int)  extends Schema(unrecognizedValue) with SemanticdbUnrecognizedEnum
+  
+  lazy val values = scala.collection.immutable.Seq(LEGACY, SEMANTICDB3, SEMANTICDB4)
+  def fromValue(__value: _root_.scala.Int): Schema = __value match {
     case 0 => LEGACY
     case 3 => SEMANTICDB3
     case 4 => SEMANTICDB4
-    case id => Unrecognized(id)
+    case __other => Unrecognized(__other)
   }
-
-}
+  
+  
+}
\ No newline at end of file
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Scope.scala b/compiler/src/dotty/tools/dotc/semanticdb/Scope.scala
new file mode 100644
index 000000000000..f396929763ea
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Scope.scala
@@ -0,0 +1,107 @@
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
+
+package dotty.tools.dotc.semanticdb
+import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
+
+@SerialVersionUID(0L)
+final case class Scope(
+    symlinks: _root_.scala.Seq[_root_.scala.Predef.String] = _root_.scala.Seq.empty,
+    hardlinks: _root_.scala.Seq[dotty.tools.dotc.semanticdb.SymbolInformation] = _root_.scala.Seq.empty
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      symlinks.foreach { __item =>
+        val __value = __item
+        __size += SemanticdbOutputStream.computeStringSize(1, __value)
+      }
+      hardlinks.foreach { __item =>
+        val __value = __item
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      symlinks.foreach { __v =>
+        val __m = __v
+        _output__.writeString(1, __m)
+      };
+      hardlinks.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(2, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def clearSymlinks = copy(symlinks = _root_.scala.Seq.empty)
+    def addSymlinks(__vs: _root_.scala.Predef.String*): Scope = addAllSymlinks(__vs)
+    def addAllSymlinks(__vs: Iterable[_root_.scala.Predef.String]): Scope = copy(symlinks = symlinks ++ __vs)
+    def withSymlinks(__v: _root_.scala.Seq[_root_.scala.Predef.String]): Scope = copy(symlinks = __v)
+    def clearHardlinks = copy(hardlinks = _root_.scala.Seq.empty)
+    def addHardlinks(__vs: dotty.tools.dotc.semanticdb.SymbolInformation*): Scope = addAllHardlinks(__vs)
+    def addAllHardlinks(__vs: Iterable[dotty.tools.dotc.semanticdb.SymbolInformation]): Scope = copy(hardlinks = hardlinks ++ __vs)
+    def withHardlinks(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.SymbolInformation]): Scope = copy(hardlinks = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.Scope])
+}
+
+object Scope  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Scope] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Scope] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.Scope = {
+    val __symlinks: _root_.scala.collection.immutable.VectorBuilder[_root_.scala.Predef.String] = new _root_.scala.collection.immutable.VectorBuilder[_root_.scala.Predef.String]
+    val __hardlinks: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.SymbolInformation] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.SymbolInformation]
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __symlinks += _input__.readStringRequireUtf8()
+        case 18 =>
+          __hardlinks += LiteParser.readMessage[dotty.tools.dotc.semanticdb.SymbolInformation](_input__)
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.Scope(
+        symlinks = __symlinks.result(),
+        hardlinks = __hardlinks.result()
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.Scope(
+    symlinks = _root_.scala.Seq.empty,
+    hardlinks = _root_.scala.Seq.empty
+  )
+  final val SYMLINKS_FIELD_NUMBER = 1
+  final val HARDLINKS_FIELD_NUMBER = 2
+  def of(
+    symlinks: _root_.scala.Seq[_root_.scala.Predef.String],
+    hardlinks: _root_.scala.Seq[dotty.tools.dotc.semanticdb.SymbolInformation]
+  ): _root_.dotty.tools.dotc.semanticdb.Scope = _root_.dotty.tools.dotc.semanticdb.Scope(
+    symlinks,
+    hardlinks
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Scope])
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala b/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala
new file mode 100644
index 000000000000..8743fd04d651
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala
@@ -0,0 +1,151 @@
+package dotty.tools
+package dotc
+package semanticdb
+
+import core._
+import Contexts._
+import Symbols._
+import Flags._
+import Names.Name
+
+import scala.annotation.tailrec
+import scala.collection.mutable
+import dotty.tools.dotc.core.Types.TypeParamRef
+
+class SemanticSymbolBuilder:
+  import Scala3.{_, given}
+
+  private var nextLocalIdx: Int = 0
+
+  /** The index of a local symbol */
+  private val locals = mutable.HashMap[Symbol, Int]()
+
+  /** The local symbol(s) starting at given offset */
+  private val symsAtOffset = new mutable.HashMap[Int, Set[Symbol]]():
+    override def default(key: Int) = Set[Symbol]()
+
+
+  def symbolName(sym: Symbol)(using Context): String =
+    val b = StringBuilder(20)
+    addSymName(b, sym)
+    b.toString
+  def symbolName(sym: FakeSymbol)(using Context): String =
+    sym match
+      case sym: WildcardTypeSymbol =>
+        val b = StringBuilder(20)
+        addSymName(b, sym.owner)
+        b.append('['); addName(b, sym.name); b.append(']')
+        b.toString
+      case sym: TermParamRefSymbol =>
+        val b = StringBuilder(20)
+        addSymName(b, sym.owner)
+        b.append('('); addName(b, sym.name); b.append(')')
+        b.toString
+      case sym: TypeParamRefSymbol =>
+        val b = StringBuilder(20)
+        addSymName(b, sym.owner)
+        b.append('['); addName(b, sym.name); b.append(']')
+        b.toString
+      case sym: RefinementSymbol =>
+        val b = StringBuilder(20)
+        addLocalSymName(b)
+        b.toString
+
+  def funParamSymbol(sym: Symbol)(using Context): Name => String =
+    if sym.isGlobal then
+      val funSymbol = symbolName(sym)
+      name => s"$funSymbol($name)"
+    else
+      name => locals.keys.find(local => local.isTerm && local.owner == sym && local.name == name)
+                    .fold("<?>")(Symbols.LocalPrefix + locals(_))
+
+  private def addName(b: StringBuilder, name: Name): Unit =
+    val str = name.toString.unescapeUnicode
+    if str.isJavaIdent then b append str
+    else b append '`' append str append '`'
+
+  private def addLocalSymName(b: StringBuilder): Unit =
+    val idx = nextLocalIdx
+    nextLocalIdx += 1
+    b.append(Symbols.LocalPrefix).append(idx)
+
+  /** Add semanticdb name of the given symbol to string builder */
+  private def addSymName(b: StringBuilder, sym: Symbol)(using Context): Unit =
+
+    def addOwner(owner: Symbol): Unit =
+      if !owner.isRoot then addSymName(b, owner)
+
+    def addOverloadIdx(sym: Symbol): Unit =
+      val decls =
+        val decls0 = sym.owner.info.decls.lookupAll(sym.name)
+        if sym.owner.isAllOf(JavaModule) then
+          decls0 ++ sym.owner.companionClass.info.decls.lookupAll(sym.name)
+        else
+          decls0
+      end decls
+      val alts = decls.filter(_.isOneOf(Method | Mutable)).toList.reverse
+      def find(filter: Symbol => Boolean) = alts match
+        case notSym :: rest if !filter(notSym) =>
+          val idx = rest.indexWhere(filter).ensuring(_ >= 0)
+          b.append('+').append(idx + 1)
+        case _ =>
+      end find
+      val sig = sym.signature
+      find(_.signature == sig)
+
+    def addDescriptor(sym: Symbol): Unit =
+      if sym.is(ModuleClass) then
+        addDescriptor(sym.sourceModule)
+      else if sym.is(TypeParam) then
+        b.append('['); addName(b, sym.name); b.append(']')
+      else if sym.is(Param) then
+        b.append('('); addName(b, sym.name); b.append(')')
+      else if sym.isRoot then
+        b.append(Symbols.RootPackage)
+      else if sym.isEmptyPackage then
+        b.append(Symbols.EmptyPackage)
+      else if (sym.isScala2PackageObject) then
+        b.append(Symbols.PackageObjectDescriptor)
+      else
+        addName(b, sym.name)
+        if sym.is(Package) then b.append('/')
+        else if sym.isType || sym.isAllOf(JavaModule) then b.append('#')
+        else if sym.isOneOf(Method | Mutable)
+        && (!sym.is(StableRealizable) || sym.isConstructor) then
+          b.append('('); addOverloadIdx(sym); b.append(").")
+        else b.append('.')
+
+    /** The index of local symbol `sym`. Symbols with the same name and
+     *  the same starting position have the same index.
+     */
+    def localIdx(sym: Symbol)(using Context): Int =
+      val startPos =
+        // assert(sym.span.exists, s"$sym should have a span")
+        if (sym.span.exists) Some(sym.span.start) else None
+      @tailrec
+      def computeLocalIdx(sym: Symbol): Int = locals get sym match
+        case Some(idx) => idx
+        case None =>
+          (for {
+            pos <- startPos
+            syms <- symsAtOffset.get(pos)
+            found <- syms.find(_.name == sym.name)
+          } yield found) match
+            case Some(other) => computeLocalIdx(other)
+            case None =>
+              val idx = nextLocalIdx
+              nextLocalIdx += 1
+              locals(sym) = idx
+              startPos.foreach(pos => symsAtOffset(pos) += sym)
+              idx
+      end computeLocalIdx
+      computeLocalIdx(sym)
+    end localIdx
+
+    if sym.exists then
+      if sym.isGlobal then
+        addOwner(sym.owner); addDescriptor(sym)
+      else
+        b.append(Symbols.LocalPrefix).append(localIdx(sym))
+
+  end addSymName
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Signature.scala b/compiler/src/dotty/tools/dotc/semanticdb/Signature.scala
new file mode 100644
index 000000000000..9f1bff592b75
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Signature.scala
@@ -0,0 +1,701 @@
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
+
+package dotty.tools.dotc.semanticdb
+import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
+
+sealed trait Signature  extends SemanticdbGeneratedSealedOneof  derives CanEqual {
+  type MessageType = dotty.tools.dotc.semanticdb.SignatureMessage
+  final def isEmpty = this.isInstanceOf[dotty.tools.dotc.semanticdb.Signature.Empty.type]
+  final def isDefined = !isEmpty
+  final def asMessage: dotty.tools.dotc.semanticdb.SignatureMessage = dotty.tools.dotc.semanticdb.Signature.SignatureTypeMapper.toBase(this)
+  final def asNonEmpty: Option[dotty.tools.dotc.semanticdb.Signature.NonEmpty] = if (isEmpty) None else Some(this.asInstanceOf[dotty.tools.dotc.semanticdb.Signature.NonEmpty])
+}
+
+object Signature {
+  case object Empty extends dotty.tools.dotc.semanticdb.Signature
+  
+  sealed trait NonEmpty extends dotty.tools.dotc.semanticdb.Signature
+  def defaultInstance: dotty.tools.dotc.semanticdb.Signature = Empty
+  
+  implicit val SignatureTypeMapper: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.SignatureMessage, dotty.tools.dotc.semanticdb.Signature] = new SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.SignatureMessage, dotty.tools.dotc.semanticdb.Signature] {
+    override def toCustom(__base: dotty.tools.dotc.semanticdb.SignatureMessage): dotty.tools.dotc.semanticdb.Signature = __base.sealedValue match {
+      case __v: dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.ClassSignature => __v.value
+      case __v: dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.MethodSignature => __v.value
+      case __v: dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.TypeSignature => __v.value
+      case __v: dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.ValueSignature => __v.value
+      case dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.Empty => Empty
+    }
+    override def toBase(__custom: dotty.tools.dotc.semanticdb.Signature): dotty.tools.dotc.semanticdb.SignatureMessage = dotty.tools.dotc.semanticdb.SignatureMessage(__custom match {
+      case __v: dotty.tools.dotc.semanticdb.ClassSignature => dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.ClassSignature(__v)
+      case __v: dotty.tools.dotc.semanticdb.MethodSignature => dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.MethodSignature(__v)
+      case __v: dotty.tools.dotc.semanticdb.TypeSignature => dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.TypeSignature(__v)
+      case __v: dotty.tools.dotc.semanticdb.ValueSignature => dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.ValueSignature(__v)
+      case Empty => dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.Empty
+    })
+  }
+}
+@SerialVersionUID(0L)
+final case class SignatureMessage(
+    sealedValue: dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue = dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.Empty
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (sealedValue.classSignature.isDefined) {
+        val __value = sealedValue.classSignature.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.methodSignature.isDefined) {
+        val __value = sealedValue.methodSignature.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.typeSignature.isDefined) {
+        val __value = sealedValue.typeSignature.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.valueSignature.isDefined) {
+        val __value = sealedValue.valueSignature.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      sealedValue.classSignature.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.methodSignature.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(2, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.typeSignature.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(3, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.valueSignature.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(4, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def getClassSignature: dotty.tools.dotc.semanticdb.ClassSignature = sealedValue.classSignature.getOrElse(dotty.tools.dotc.semanticdb.ClassSignature.defaultInstance)
+    def withClassSignature(__v: dotty.tools.dotc.semanticdb.ClassSignature): SignatureMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.ClassSignature(__v))
+    def getMethodSignature: dotty.tools.dotc.semanticdb.MethodSignature = sealedValue.methodSignature.getOrElse(dotty.tools.dotc.semanticdb.MethodSignature.defaultInstance)
+    def withMethodSignature(__v: dotty.tools.dotc.semanticdb.MethodSignature): SignatureMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.MethodSignature(__v))
+    def getTypeSignature: dotty.tools.dotc.semanticdb.TypeSignature = sealedValue.typeSignature.getOrElse(dotty.tools.dotc.semanticdb.TypeSignature.defaultInstance)
+    def withTypeSignature(__v: dotty.tools.dotc.semanticdb.TypeSignature): SignatureMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.TypeSignature(__v))
+    def getValueSignature: dotty.tools.dotc.semanticdb.ValueSignature = sealedValue.valueSignature.getOrElse(dotty.tools.dotc.semanticdb.ValueSignature.defaultInstance)
+    def withValueSignature(__v: dotty.tools.dotc.semanticdb.ValueSignature): SignatureMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.ValueSignature(__v))
+    def clearSealedValue: SignatureMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.Empty)
+    def withSealedValue(__v: dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue): SignatureMessage = copy(sealedValue = __v)
+    
+    
+    
+    
+    def toSignature: dotty.tools.dotc.semanticdb.Signature = dotty.tools.dotc.semanticdb.Signature.SignatureTypeMapper.toCustom(this)
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.Signature])
+}
+
+object SignatureMessage  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SignatureMessage] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SignatureMessage] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.SignatureMessage = {
+    var __sealedValue: dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue = dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.Empty
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.ClassSignature(__sealedValue.classSignature.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ClassSignature](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.MethodSignature(__sealedValue.methodSignature.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.MethodSignature](_input__))(LiteParser.readMessage(_input__, _)))
+        case 26 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.TypeSignature(__sealedValue.typeSignature.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeSignature](_input__))(LiteParser.readMessage(_input__, _)))
+        case 34 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.ValueSignature(__sealedValue.valueSignature.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ValueSignature](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.SignatureMessage(
+        sealedValue = __sealedValue
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.SignatureMessage(
+    sealedValue = dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue.Empty
+  )
+  sealed trait SealedValue  extends SemanticdbGeneratedOneof  derives CanEqual {
+    def isEmpty: _root_.scala.Boolean = false
+    def isDefined: _root_.scala.Boolean = true
+    def isClassSignature: _root_.scala.Boolean = false
+    def isMethodSignature: _root_.scala.Boolean = false
+    def isTypeSignature: _root_.scala.Boolean = false
+    def isValueSignature: _root_.scala.Boolean = false
+    def classSignature: _root_.scala.Option[dotty.tools.dotc.semanticdb.ClassSignature] = _root_.scala.None
+    def methodSignature: _root_.scala.Option[dotty.tools.dotc.semanticdb.MethodSignature] = _root_.scala.None
+    def typeSignature: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeSignature] = _root_.scala.None
+    def valueSignature: _root_.scala.Option[dotty.tools.dotc.semanticdb.ValueSignature] = _root_.scala.None
+  }
+  object SealedValue {
+    @SerialVersionUID(0L)
+    case object Empty extends dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue {
+      type ValueType = _root_.scala.Nothing
+      override def isEmpty: _root_.scala.Boolean = true
+      override def isDefined: _root_.scala.Boolean = false
+      override def number: _root_.scala.Int = 0
+      override def value: _root_.scala.Nothing = throw new java.util.NoSuchElementException("Empty.value")
+    }
+  
+    @SerialVersionUID(0L)
+    final case class ClassSignature(value: dotty.tools.dotc.semanticdb.ClassSignature) extends dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.ClassSignature
+      override def isClassSignature: _root_.scala.Boolean = true
+      override def classSignature: _root_.scala.Option[dotty.tools.dotc.semanticdb.ClassSignature] = Some(value)
+      override def number: _root_.scala.Int = 1
+    }
+    @SerialVersionUID(0L)
+    final case class MethodSignature(value: dotty.tools.dotc.semanticdb.MethodSignature) extends dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.MethodSignature
+      override def isMethodSignature: _root_.scala.Boolean = true
+      override def methodSignature: _root_.scala.Option[dotty.tools.dotc.semanticdb.MethodSignature] = Some(value)
+      override def number: _root_.scala.Int = 2
+    }
+    @SerialVersionUID(0L)
+    final case class TypeSignature(value: dotty.tools.dotc.semanticdb.TypeSignature) extends dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.TypeSignature
+      override def isTypeSignature: _root_.scala.Boolean = true
+      override def typeSignature: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeSignature] = Some(value)
+      override def number: _root_.scala.Int = 3
+    }
+    @SerialVersionUID(0L)
+    final case class ValueSignature(value: dotty.tools.dotc.semanticdb.ValueSignature) extends dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.ValueSignature
+      override def isValueSignature: _root_.scala.Boolean = true
+      override def valueSignature: _root_.scala.Option[dotty.tools.dotc.semanticdb.ValueSignature] = Some(value)
+      override def number: _root_.scala.Int = 4
+    }
+  }
+  final val CLASS_SIGNATURE_FIELD_NUMBER = 1
+  final val METHOD_SIGNATURE_FIELD_NUMBER = 2
+  final val TYPE_SIGNATURE_FIELD_NUMBER = 3
+  final val VALUE_SIGNATURE_FIELD_NUMBER = 4
+  def of(
+    sealedValue: dotty.tools.dotc.semanticdb.SignatureMessage.SealedValue
+  ): _root_.dotty.tools.dotc.semanticdb.SignatureMessage = _root_.dotty.tools.dotc.semanticdb.SignatureMessage(
+    sealedValue
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Signature])
+}
+
+@SerialVersionUID(0L)
+final case class ClassSignature(
+    typeParameters: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None,
+    parents: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type] = _root_.scala.Seq.empty,
+    self: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.ClassSignature._typemapper_self.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    declarations: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None
+    )  extends dotty.tools.dotc.semanticdb.Signature.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (typeParameters.isDefined) {
+        val __value = typeParameters.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      parents.foreach { __item =>
+        val __value = dotty.tools.dotc.semanticdb.ClassSignature._typemapper_parents.toBase(__item)
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.ClassSignature._typemapper_self.toBase(self)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      if (declarations.isDefined) {
+        val __value = declarations.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      typeParameters.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      parents.foreach { __v =>
+        val __m = dotty.tools.dotc.semanticdb.ClassSignature._typemapper_parents.toBase(__v)
+        _output__.writeTag(2, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      {
+        val __v = dotty.tools.dotc.semanticdb.ClassSignature._typemapper_self.toBase(self)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(3, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      declarations.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(4, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def getTypeParameters: dotty.tools.dotc.semanticdb.Scope = typeParameters.getOrElse(dotty.tools.dotc.semanticdb.Scope.defaultInstance)
+    def clearTypeParameters: ClassSignature = copy(typeParameters = _root_.scala.None)
+    def withTypeParameters(__v: dotty.tools.dotc.semanticdb.Scope): ClassSignature = copy(typeParameters = Option(__v))
+    def clearParents = copy(parents = _root_.scala.Seq.empty)
+    def addParents(__vs: dotty.tools.dotc.semanticdb.Type*): ClassSignature = addAllParents(__vs)
+    def addAllParents(__vs: Iterable[dotty.tools.dotc.semanticdb.Type]): ClassSignature = copy(parents = parents ++ __vs)
+    def withParents(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type]): ClassSignature = copy(parents = __v)
+    def withSelf(__v: dotty.tools.dotc.semanticdb.Type): ClassSignature = copy(self = __v)
+    def getDeclarations: dotty.tools.dotc.semanticdb.Scope = declarations.getOrElse(dotty.tools.dotc.semanticdb.Scope.defaultInstance)
+    def clearDeclarations: ClassSignature = copy(declarations = _root_.scala.None)
+    def withDeclarations(__v: dotty.tools.dotc.semanticdb.Scope): ClassSignature = copy(declarations = Option(__v))
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.ClassSignature])
+}
+
+object ClassSignature  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ClassSignature] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ClassSignature] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ClassSignature = {
+    var __typeParameters: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None
+    val __parents: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Type] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Type]
+    var __self: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var __declarations: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __typeParameters = Option(__typeParameters.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Scope](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __parents += dotty.tools.dotc.semanticdb.ClassSignature._typemapper_parents.toCustom(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))
+        case 26 =>
+          __self = _root_.scala.Some(__self.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 34 =>
+          __declarations = Option(__declarations.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Scope](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ClassSignature(
+        typeParameters = __typeParameters,
+        parents = __parents.result(),
+        self = dotty.tools.dotc.semanticdb.ClassSignature._typemapper_self.toCustom(__self.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)),
+        declarations = __declarations
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ClassSignature(
+    typeParameters = _root_.scala.None,
+    parents = _root_.scala.Seq.empty,
+    self = dotty.tools.dotc.semanticdb.ClassSignature._typemapper_self.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    declarations = _root_.scala.None
+  )
+  final val TYPE_PARAMETERS_FIELD_NUMBER = 1
+  final val PARENTS_FIELD_NUMBER = 2
+  final val SELF_FIELD_NUMBER = 3
+  final val DECLARATIONS_FIELD_NUMBER = 4
+  @transient @sharable
+  private[semanticdb] val _typemapper_parents: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  @transient @sharable
+  private[semanticdb] val _typemapper_self: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    typeParameters: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope],
+    parents: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type],
+    self: dotty.tools.dotc.semanticdb.Type,
+    declarations: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope]
+  ): _root_.dotty.tools.dotc.semanticdb.ClassSignature = _root_.dotty.tools.dotc.semanticdb.ClassSignature(
+    typeParameters,
+    parents,
+    self,
+    declarations
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ClassSignature])
+}
+
+@SerialVersionUID(0L)
+final case class MethodSignature(
+    typeParameters: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None,
+    parameterLists: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.Seq.empty,
+    returnType: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.MethodSignature._typemapper_returnType.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+    )  extends dotty.tools.dotc.semanticdb.Signature.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (typeParameters.isDefined) {
+        val __value = typeParameters.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      parameterLists.foreach { __item =>
+        val __value = __item
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.MethodSignature._typemapper_returnType.toBase(returnType)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      typeParameters.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      parameterLists.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(2, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      {
+        val __v = dotty.tools.dotc.semanticdb.MethodSignature._typemapper_returnType.toBase(returnType)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(3, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+    }
+    def getTypeParameters: dotty.tools.dotc.semanticdb.Scope = typeParameters.getOrElse(dotty.tools.dotc.semanticdb.Scope.defaultInstance)
+    def clearTypeParameters: MethodSignature = copy(typeParameters = _root_.scala.None)
+    def withTypeParameters(__v: dotty.tools.dotc.semanticdb.Scope): MethodSignature = copy(typeParameters = Option(__v))
+    def clearParameterLists = copy(parameterLists = _root_.scala.Seq.empty)
+    def addParameterLists(__vs: dotty.tools.dotc.semanticdb.Scope*): MethodSignature = addAllParameterLists(__vs)
+    def addAllParameterLists(__vs: Iterable[dotty.tools.dotc.semanticdb.Scope]): MethodSignature = copy(parameterLists = parameterLists ++ __vs)
+    def withParameterLists(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Scope]): MethodSignature = copy(parameterLists = __v)
+    def withReturnType(__v: dotty.tools.dotc.semanticdb.Type): MethodSignature = copy(returnType = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.MethodSignature])
+}
+
+object MethodSignature  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.MethodSignature] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.MethodSignature] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.MethodSignature = {
+    var __typeParameters: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None
+    val __parameterLists: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Scope] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Scope]
+    var __returnType: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __typeParameters = Option(__typeParameters.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Scope](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __parameterLists += LiteParser.readMessage[dotty.tools.dotc.semanticdb.Scope](_input__)
+        case 26 =>
+          __returnType = _root_.scala.Some(__returnType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.MethodSignature(
+        typeParameters = __typeParameters,
+        parameterLists = __parameterLists.result(),
+        returnType = dotty.tools.dotc.semanticdb.MethodSignature._typemapper_returnType.toCustom(__returnType.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.MethodSignature(
+    typeParameters = _root_.scala.None,
+    parameterLists = _root_.scala.Seq.empty,
+    returnType = dotty.tools.dotc.semanticdb.MethodSignature._typemapper_returnType.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+  )
+  final val TYPE_PARAMETERS_FIELD_NUMBER = 1
+  final val PARAMETER_LISTS_FIELD_NUMBER = 2
+  final val RETURN_TYPE_FIELD_NUMBER = 3
+  @transient @sharable
+  private[semanticdb] val _typemapper_returnType: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    typeParameters: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope],
+    parameterLists: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Scope],
+    returnType: dotty.tools.dotc.semanticdb.Type
+  ): _root_.dotty.tools.dotc.semanticdb.MethodSignature = _root_.dotty.tools.dotc.semanticdb.MethodSignature(
+    typeParameters,
+    parameterLists,
+    returnType
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.MethodSignature])
+}
+
+@SerialVersionUID(0L)
+final case class TypeSignature(
+    typeParameters: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None,
+    lowerBound: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.TypeSignature._typemapper_lowerBound.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    upperBound: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.TypeSignature._typemapper_upperBound.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+    )  extends dotty.tools.dotc.semanticdb.Signature.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (typeParameters.isDefined) {
+        val __value = typeParameters.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.TypeSignature._typemapper_lowerBound.toBase(lowerBound)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.TypeSignature._typemapper_upperBound.toBase(upperBound)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      typeParameters.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      {
+        val __v = dotty.tools.dotc.semanticdb.TypeSignature._typemapper_lowerBound.toBase(lowerBound)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(2, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      {
+        val __v = dotty.tools.dotc.semanticdb.TypeSignature._typemapper_upperBound.toBase(upperBound)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(3, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+    }
+    def getTypeParameters: dotty.tools.dotc.semanticdb.Scope = typeParameters.getOrElse(dotty.tools.dotc.semanticdb.Scope.defaultInstance)
+    def clearTypeParameters: TypeSignature = copy(typeParameters = _root_.scala.None)
+    def withTypeParameters(__v: dotty.tools.dotc.semanticdb.Scope): TypeSignature = copy(typeParameters = Option(__v))
+    def withLowerBound(__v: dotty.tools.dotc.semanticdb.Type): TypeSignature = copy(lowerBound = __v)
+    def withUpperBound(__v: dotty.tools.dotc.semanticdb.Type): TypeSignature = copy(upperBound = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.TypeSignature])
+}
+
+object TypeSignature  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TypeSignature] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TypeSignature] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.TypeSignature = {
+    var __typeParameters: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None
+    var __lowerBound: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var __upperBound: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __typeParameters = Option(__typeParameters.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Scope](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __lowerBound = _root_.scala.Some(__lowerBound.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 26 =>
+          __upperBound = _root_.scala.Some(__upperBound.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.TypeSignature(
+        typeParameters = __typeParameters,
+        lowerBound = dotty.tools.dotc.semanticdb.TypeSignature._typemapper_lowerBound.toCustom(__lowerBound.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)),
+        upperBound = dotty.tools.dotc.semanticdb.TypeSignature._typemapper_upperBound.toCustom(__upperBound.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.TypeSignature(
+    typeParameters = _root_.scala.None,
+    lowerBound = dotty.tools.dotc.semanticdb.TypeSignature._typemapper_lowerBound.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    upperBound = dotty.tools.dotc.semanticdb.TypeSignature._typemapper_upperBound.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+  )
+  final val TYPE_PARAMETERS_FIELD_NUMBER = 1
+  final val LOWER_BOUND_FIELD_NUMBER = 2
+  final val UPPER_BOUND_FIELD_NUMBER = 3
+  @transient @sharable
+  private[semanticdb] val _typemapper_lowerBound: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  @transient @sharable
+  private[semanticdb] val _typemapper_upperBound: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    typeParameters: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope],
+    lowerBound: dotty.tools.dotc.semanticdb.Type,
+    upperBound: dotty.tools.dotc.semanticdb.Type
+  ): _root_.dotty.tools.dotc.semanticdb.TypeSignature = _root_.dotty.tools.dotc.semanticdb.TypeSignature(
+    typeParameters,
+    lowerBound,
+    upperBound
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TypeSignature])
+}
+
+@SerialVersionUID(0L)
+final case class ValueSignature(
+    tpe: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.ValueSignature._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+    )  extends dotty.tools.dotc.semanticdb.Signature.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.ValueSignature._typemapper_tpe.toBase(tpe)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.ValueSignature._typemapper_tpe.toBase(tpe)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+    }
+    def withTpe(__v: dotty.tools.dotc.semanticdb.Type): ValueSignature = copy(tpe = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.ValueSignature])
+}
+
+object ValueSignature  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ValueSignature] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ValueSignature] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ValueSignature = {
+    var __tpe: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __tpe = _root_.scala.Some(__tpe.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ValueSignature(
+        tpe = dotty.tools.dotc.semanticdb.ValueSignature._typemapper_tpe.toCustom(__tpe.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ValueSignature(
+    tpe = dotty.tools.dotc.semanticdb.ValueSignature._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+  )
+  final val TPE_FIELD_NUMBER = 1
+  @transient @sharable
+  private[semanticdb] val _typemapper_tpe: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    tpe: dotty.tools.dotc.semanticdb.Type
+  ): _root_.dotty.tools.dotc.semanticdb.ValueSignature = _root_.dotty.tools.dotc.semanticdb.ValueSignature(
+    tpe
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ValueSignature])
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/SymbolInformation.scala b/compiler/src/dotty/tools/dotc/semanticdb/SymbolInformation.scala
index b2508732232a..f6d060563be4 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/SymbolInformation.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/SymbolInformation.scala
@@ -1,179 +1,94 @@
-package dotty.tools.dotc.semanticdb
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
 
+package dotty.tools.dotc.semanticdb
 import dotty.tools.dotc.semanticdb.internal._
 import scala.annotation.internal.sharable
 
-object SymbolInformation {
-
-  val defaultInstance = SymbolInformation("", Language.UNKNOWN_LANGUAGE, SymbolInformation.Kind.UNKNOWN_KIND, 0, "")
-
-  sealed trait Kind(val value: Int) extends SemanticdbEnum derives CanEqual {
-    def isUnknownKind: Boolean = this == Kind.UNKNOWN_KIND
-    def isLocal: Boolean = this == Kind.LOCAL
-    def isField: Boolean = this == Kind.FIELD
-    def isMethod: Boolean = this == Kind.METHOD
-    def isConstructor: Boolean = this == Kind.CONSTRUCTOR
-    def isMacro: Boolean = this == Kind.MACRO
-    def isType: Boolean = this == Kind.TYPE
-    def isParameter: Boolean = this == Kind.PARAMETER
-    def isSelfParameter: Boolean = this == Kind.SELF_PARAMETER
-    def isTypeParameter: Boolean = this == Kind.TYPE_PARAMETER
-    def isObject: Boolean = this == Kind.OBJECT
-    def isPackage: Boolean = this == Kind.PACKAGE
-    def isPackageObject: Boolean = this == Kind.PACKAGE_OBJECT
-    def isClass: Boolean = this == Kind.CLASS
-    def isTrait: Boolean = this == Kind.TRAIT
-    def isInterface: Boolean = this == Kind.INTERFACE
-  }
-
-  object Kind {
-
-    case object UNKNOWN_KIND extends Kind(0)
-    case object METHOD extends Kind(3)
-    case object MACRO extends Kind(6)
-    case object TYPE extends Kind(7)
-    case object PARAMETER extends Kind(8)
-    case object TYPE_PARAMETER extends Kind(9)
-    case object OBJECT extends Kind(10)
-    case object PACKAGE extends Kind(11)
-    case object PACKAGE_OBJECT extends Kind(12)
-    case object CLASS extends Kind(13)
-    case object TRAIT extends Kind(14)
-    case object SELF_PARAMETER extends Kind(17)
-    case object INTERFACE extends Kind(18)
-    case object LOCAL extends Kind(19)
-    case object FIELD extends Kind(20)
-    case object CONSTRUCTOR extends Kind(21)
-    final case class Unrecognized(id: Int) extends Kind(id)
-
-    def fromValue(value: Int): Kind = value match {
-      case 0 => UNKNOWN_KIND
-      case 3 => METHOD
-      case 6 => MACRO
-      case 7 => TYPE
-      case 8 => PARAMETER
-      case 9 => TYPE_PARAMETER
-      case 10 => OBJECT
-      case 11 => PACKAGE
-      case 12 => PACKAGE_OBJECT
-      case 13 => CLASS
-      case 14 => TRAIT
-      case 17 => SELF_PARAMETER
-      case 18 => INTERFACE
-      case 19 => LOCAL
-      case 20 => FIELD
-      case 21 => CONSTRUCTOR
-      case id => Unrecognized(id)
-    }
-  }
-
-  sealed trait Property(val value: Int) extends SemanticdbEnum derives CanEqual {
-    def isUnknownProperty: Boolean = this == Property.UNKNOWN_PROPERTY
-    def isAbstract: Boolean = this == Property.ABSTRACT
-    def isFinal: Boolean = this == Property.FINAL
-    def isSealed: Boolean = this == Property.SEALED
-    def isImplicit: Boolean = this == Property.IMPLICIT
-    def isLazy: Boolean = this == Property.LAZY
-    def isCase: Boolean = this == Property.CASE
-    def isCovariant: Boolean = this == Property.CONTRAVARIANT
-    def isContravariant: Boolean = this == Property.CONTRAVARIANT
-    def isVal: Boolean = this == Property.VAL
-    def isVar: Boolean = this == Property.VAR
-    def isStatic: Boolean = this == Property.STATIC
-    def isPrimary: Boolean = this == Property.PRIMARY
-    def isEnum: Boolean = this == Property.ENUM
-    def isDefault: Boolean = this == Property.DEFAULT
-  }
-
-  object Property {
-
-    case object UNKNOWN_PROPERTY extends Property(0)
-    case object ABSTRACT extends Property(4)
-    case object FINAL extends Property(8)
-    case object SEALED extends Property(16)
-    case object IMPLICIT extends Property(32)
-    case object LAZY extends Property(64)
-    case object CASE extends Property(128)
-    case object COVARIANT extends Property(256)
-    case object CONTRAVARIANT extends Property(512)
-    case object VAL extends Property(1024)
-    case object VAR extends Property(2048)
-    case object STATIC extends Property(4096)
-    case object PRIMARY extends Property(8192)
-    case object ENUM extends Property(16384)
-    case object DEFAULT extends Property(32768)
-    final case class Unrecognized(id: Int) extends Property(id)
-
-    def fromValue(value: Int): Property = value match {
-      case 0x0 => UNKNOWN_PROPERTY
-      case 0x4 => ABSTRACT
-      case 0x8 => FINAL
-      case 0x10 => SEALED
-      case 0x20 => IMPLICIT
-      case 0x40 => LAZY
-      case 0x80 => CASE
-      case 0x100 => COVARIANT
-      case 0x200 => CONTRAVARIANT
-      case 0x400 => VAL
-      case 0x800 => VAR
-      case 0x1000 => STATIC
-      case 0x2000 => PRIMARY
-      case 0x4000 => ENUM
-      case 0x8000 => DEFAULT
-      case id => Unrecognized(id)
-    }
-  }
-}
-
+@SerialVersionUID(0L)
 final case class SymbolInformation(
-  symbol: String,
-  language: Language,
-  kind: SymbolInformation.Kind,
-  properties: Int,
-  displayName: String
-) extends SemanticdbMessage[SymbolInformation] derives CanEqual {
-    @sharable
-    private var __serializedSizeCachedValue: Int = 0
-    private def __computeSerializedValue(): Int = {
+    symbol: _root_.scala.Predef.String = "",
+    language: dotty.tools.dotc.semanticdb.Language = dotty.tools.dotc.semanticdb.Language.UNKNOWN_LANGUAGE,
+    kind: dotty.tools.dotc.semanticdb.SymbolInformation.Kind = dotty.tools.dotc.semanticdb.SymbolInformation.Kind.UNKNOWN_KIND,
+    properties: _root_.scala.Int = 0,
+    displayName: _root_.scala.Predef.String = "",
+    signature: dotty.tools.dotc.semanticdb.Signature = dotty.tools.dotc.semanticdb.SymbolInformation._typemapper_signature.toCustom(dotty.tools.dotc.semanticdb.SignatureMessage.defaultInstance),
+    annotations: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Annotation] = _root_.scala.Seq.empty,
+    access: dotty.tools.dotc.semanticdb.Access = dotty.tools.dotc.semanticdb.SymbolInformation._typemapper_access.toCustom(dotty.tools.dotc.semanticdb.AccessMessage.defaultInstance),
+    overriddenSymbols: _root_.scala.Seq[_root_.scala.Predef.String] = _root_.scala.Seq.empty,
+    documentation: _root_.scala.Option[dotty.tools.dotc.semanticdb.Documentation] = _root_.scala.None
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
       var __size = 0
-
+      
       {
         val __value = symbol
-        if (__value != "") {
+        if (!__value.isEmpty) {
           __size += SemanticdbOutputStream.computeStringSize(1, __value)
         }
       };
-
+      
       {
-        val __value = language
-        if (__value != Language.UNKNOWN_LANGUAGE) {
-          __size += SemanticdbOutputStream.computeEnumSize(16, __value.value)
+        val __value = language.value
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeEnumSize(16, __value)
         }
       };
-
+      
       {
-        val __value = kind
-        if (__value != SymbolInformation.Kind.UNKNOWN_KIND) {
-          __size += SemanticdbOutputStream.computeEnumSize(3, __value.value)
+        val __value = kind.value
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeEnumSize(3, __value)
         }
       };
-
+      
       {
         val __value = properties
         if (__value != 0) {
           __size += SemanticdbOutputStream.computeInt32Size(4, __value)
         }
       };
-
+      
       {
         val __value = displayName
-        if (__value != "") {
+        if (!__value.isEmpty) {
           __size += SemanticdbOutputStream.computeStringSize(5, __value)
         }
       };
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.SymbolInformation._typemapper_signature.toBase(signature)
+        if (__value != dotty.tools.dotc.semanticdb.SignatureMessage.defaultInstance) {
+          __size += 2 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      annotations.foreach { __item =>
+        val __value = __item
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.SymbolInformation._typemapper_access.toBase(access)
+        if (__value != dotty.tools.dotc.semanticdb.AccessMessage.defaultInstance) {
+          __size += 2 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      overriddenSymbols.foreach { __item =>
+        val __value = __item
+        __size += SemanticdbOutputStream.computeStringSize(19, __value)
+      }
+      if (documentation.isDefined) {
+        val __value = documentation.get
+        __size += 2 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
       __size
     }
-    final override def serializedSize: Int = {
+    override def serializedSize: _root_.scala.Int = {
       var read = __serializedSizeCachedValue
       if (read == 0) {
         read = __computeSerializedValue()
@@ -181,17 +96,17 @@ final case class SymbolInformation(
       }
       read
     }
-    def writeTo(`_output__`: SemanticdbOutputStream): Unit = {
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
       {
         val __v = symbol
-        if (__v != "") {
+        if (!__v.isEmpty) {
           _output__.writeString(1, __v)
         }
       };
       {
-        val __v = kind
-        if (__v != SymbolInformation.Kind.UNKNOWN_KIND) {
-          _output__.writeEnum(3, __v.value)
+        val __v = kind.value
+        if (__v != 0) {
+          _output__.writeEnum(3, __v)
         }
       };
       {
@@ -202,45 +117,553 @@ final case class SymbolInformation(
       };
       {
         val __v = displayName
-        if (__v != "") {
+        if (!__v.isEmpty) {
           _output__.writeString(5, __v)
         }
       };
+      annotations.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(13, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
       {
-        val __v = language
-        if (__v != Language.UNKNOWN_LANGUAGE) {
-          _output__.writeEnum(16, __v.value)
+        val __v = language.value
+        if (__v != 0) {
+          _output__.writeEnum(16, __v)
         }
       };
-    }
-    def mergeFrom(`_input__`: SemanticdbInputStream): SymbolInformation = {
-      var __symbol = this.symbol
-      var __language = this.language
-      var __kind = this.kind
-      var __properties = this.properties
-      var __displayName = this.displayName
-      var _done__ = false
-      while (!_done__) {
-        val _tag__ = _input__.readTag()
-        _tag__ match {
-          case 0 => _done__ = true
-          case 10 =>
-            __symbol = _input__.readString()
-          case 24 =>
-            __kind = SymbolInformation.Kind.fromValue(_input__.readEnum())
-          case 32 =>
-            __properties = _input__.readInt32()
-          case 42 =>
-            __displayName = _input__.readString()
-          case tag => _input__.skipField(tag)
+      {
+        val __v = dotty.tools.dotc.semanticdb.SymbolInformation._typemapper_signature.toBase(signature)
+        if (__v != dotty.tools.dotc.semanticdb.SignatureMessage.defaultInstance) {
+          _output__.writeTag(17, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
         }
+      };
+      {
+        val __v = dotty.tools.dotc.semanticdb.SymbolInformation._typemapper_access.toBase(access)
+        if (__v != dotty.tools.dotc.semanticdb.AccessMessage.defaultInstance) {
+          _output__.writeTag(18, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      overriddenSymbols.foreach { __v =>
+        val __m = __v
+        _output__.writeString(19, __m)
+      };
+      documentation.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(20, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def withSymbol(__v: _root_.scala.Predef.String): SymbolInformation = copy(symbol = __v)
+    def withLanguage(__v: dotty.tools.dotc.semanticdb.Language): SymbolInformation = copy(language = __v)
+    def withKind(__v: dotty.tools.dotc.semanticdb.SymbolInformation.Kind): SymbolInformation = copy(kind = __v)
+    def withProperties(__v: _root_.scala.Int): SymbolInformation = copy(properties = __v)
+    def withDisplayName(__v: _root_.scala.Predef.String): SymbolInformation = copy(displayName = __v)
+    def withSignature(__v: dotty.tools.dotc.semanticdb.Signature): SymbolInformation = copy(signature = __v)
+    def clearAnnotations = copy(annotations = _root_.scala.Seq.empty)
+    def addAnnotations(__vs: dotty.tools.dotc.semanticdb.Annotation*): SymbolInformation = addAllAnnotations(__vs)
+    def addAllAnnotations(__vs: Iterable[dotty.tools.dotc.semanticdb.Annotation]): SymbolInformation = copy(annotations = annotations ++ __vs)
+    def withAnnotations(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Annotation]): SymbolInformation = copy(annotations = __v)
+    def withAccess(__v: dotty.tools.dotc.semanticdb.Access): SymbolInformation = copy(access = __v)
+    def clearOverriddenSymbols = copy(overriddenSymbols = _root_.scala.Seq.empty)
+    def addOverriddenSymbols(__vs: _root_.scala.Predef.String*): SymbolInformation = addAllOverriddenSymbols(__vs)
+    def addAllOverriddenSymbols(__vs: Iterable[_root_.scala.Predef.String]): SymbolInformation = copy(overriddenSymbols = overriddenSymbols ++ __vs)
+    def withOverriddenSymbols(__v: _root_.scala.Seq[_root_.scala.Predef.String]): SymbolInformation = copy(overriddenSymbols = __v)
+    def getDocumentation: dotty.tools.dotc.semanticdb.Documentation = documentation.getOrElse(dotty.tools.dotc.semanticdb.Documentation.defaultInstance)
+    def clearDocumentation: SymbolInformation = copy(documentation = _root_.scala.None)
+    def withDocumentation(__v: dotty.tools.dotc.semanticdb.Documentation): SymbolInformation = copy(documentation = Option(__v))
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.SymbolInformation])
+}
+
+object SymbolInformation  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SymbolInformation] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SymbolInformation] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.SymbolInformation = {
+    var __symbol: _root_.scala.Predef.String = ""
+    var __language: dotty.tools.dotc.semanticdb.Language = dotty.tools.dotc.semanticdb.Language.UNKNOWN_LANGUAGE
+    var __kind: dotty.tools.dotc.semanticdb.SymbolInformation.Kind = dotty.tools.dotc.semanticdb.SymbolInformation.Kind.UNKNOWN_KIND
+    var __properties: _root_.scala.Int = 0
+    var __displayName: _root_.scala.Predef.String = ""
+    var __signature: _root_.scala.Option[dotty.tools.dotc.semanticdb.SignatureMessage] = _root_.scala.None
+    val __annotations: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Annotation] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Annotation]
+    var __access: _root_.scala.Option[dotty.tools.dotc.semanticdb.AccessMessage] = _root_.scala.None
+    val __overriddenSymbols: _root_.scala.collection.immutable.VectorBuilder[_root_.scala.Predef.String] = new _root_.scala.collection.immutable.VectorBuilder[_root_.scala.Predef.String]
+    var __documentation: _root_.scala.Option[dotty.tools.dotc.semanticdb.Documentation] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __symbol = _input__.readStringRequireUtf8()
+        case 128 =>
+          __language = dotty.tools.dotc.semanticdb.Language.fromValue(_input__.readEnum())
+        case 24 =>
+          __kind = dotty.tools.dotc.semanticdb.SymbolInformation.Kind.fromValue(_input__.readEnum())
+        case 32 =>
+          __properties = _input__.readInt32()
+        case 42 =>
+          __displayName = _input__.readStringRequireUtf8()
+        case 138 =>
+          __signature = _root_.scala.Some(__signature.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.SignatureMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 106 =>
+          __annotations += LiteParser.readMessage[dotty.tools.dotc.semanticdb.Annotation](_input__)
+        case 146 =>
+          __access = _root_.scala.Some(__access.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.AccessMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 154 =>
+          __overriddenSymbols += _input__.readStringRequireUtf8()
+        case 162 =>
+          __documentation = Option(__documentation.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Documentation](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
       }
-      SymbolInformation(
+    }
+    dotty.tools.dotc.semanticdb.SymbolInformation(
         symbol = __symbol,
         language = __language,
         kind = __kind,
         properties = __properties,
-        displayName = __displayName
-      )
+        displayName = __displayName,
+        signature = dotty.tools.dotc.semanticdb.SymbolInformation._typemapper_signature.toCustom(__signature.getOrElse(dotty.tools.dotc.semanticdb.SignatureMessage.defaultInstance)),
+        annotations = __annotations.result(),
+        access = dotty.tools.dotc.semanticdb.SymbolInformation._typemapper_access.toCustom(__access.getOrElse(dotty.tools.dotc.semanticdb.AccessMessage.defaultInstance)),
+        overriddenSymbols = __overriddenSymbols.result(),
+        documentation = __documentation
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.SymbolInformation(
+    symbol = "",
+    language = dotty.tools.dotc.semanticdb.Language.UNKNOWN_LANGUAGE,
+    kind = dotty.tools.dotc.semanticdb.SymbolInformation.Kind.UNKNOWN_KIND,
+    properties = 0,
+    displayName = "",
+    signature = dotty.tools.dotc.semanticdb.SymbolInformation._typemapper_signature.toCustom(dotty.tools.dotc.semanticdb.SignatureMessage.defaultInstance),
+    annotations = _root_.scala.Seq.empty,
+    access = dotty.tools.dotc.semanticdb.SymbolInformation._typemapper_access.toCustom(dotty.tools.dotc.semanticdb.AccessMessage.defaultInstance),
+    overriddenSymbols = _root_.scala.Seq.empty,
+    documentation = _root_.scala.None
+  )
+  sealed abstract class Kind(val value: _root_.scala.Int)  extends SemanticdbGeneratedEnum  derives CanEqual {
+    type EnumType = Kind
+    def isUnknownKind: _root_.scala.Boolean = false
+    def isLocal: _root_.scala.Boolean = false
+    def isField: _root_.scala.Boolean = false
+    def isMethod: _root_.scala.Boolean = false
+    def isConstructor: _root_.scala.Boolean = false
+    def isMacro: _root_.scala.Boolean = false
+    def isType: _root_.scala.Boolean = false
+    def isParameter: _root_.scala.Boolean = false
+    def isSelfParameter: _root_.scala.Boolean = false
+    def isTypeParameter: _root_.scala.Boolean = false
+    def isObject: _root_.scala.Boolean = false
+    def isPackage: _root_.scala.Boolean = false
+    def isPackageObject: _root_.scala.Boolean = false
+    def isClass: _root_.scala.Boolean = false
+    def isTrait: _root_.scala.Boolean = false
+    def isInterface: _root_.scala.Boolean = false
+    
+    final def asRecognized: _root_.scala.Option[dotty.tools.dotc.semanticdb.SymbolInformation.Kind.Recognized] = if (isUnrecognized) _root_.scala.None else _root_.scala.Some(this.asInstanceOf[dotty.tools.dotc.semanticdb.SymbolInformation.Kind.Recognized])
+  }
+  
+  object Kind  {
+    sealed trait Recognized extends Kind
+    
+    @SerialVersionUID(0L)
+    case object UNKNOWN_KIND extends Kind(0) with Kind.Recognized {
+      val index = 0
+      val name = "UNKNOWN_KIND"
+      override def isUnknownKind: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object LOCAL extends Kind(19) with Kind.Recognized {
+      val index = 1
+      val name = "LOCAL"
+      override def isLocal: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object FIELD extends Kind(20) with Kind.Recognized {
+      val index = 2
+      val name = "FIELD"
+      override def isField: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object METHOD extends Kind(3) with Kind.Recognized {
+      val index = 3
+      val name = "METHOD"
+      override def isMethod: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object CONSTRUCTOR extends Kind(21) with Kind.Recognized {
+      val index = 4
+      val name = "CONSTRUCTOR"
+      override def isConstructor: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object MACRO extends Kind(6) with Kind.Recognized {
+      val index = 5
+      val name = "MACRO"
+      override def isMacro: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object TYPE extends Kind(7) with Kind.Recognized {
+      val index = 6
+      val name = "TYPE"
+      override def isType: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object PARAMETER extends Kind(8) with Kind.Recognized {
+      val index = 7
+      val name = "PARAMETER"
+      override def isParameter: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object SELF_PARAMETER extends Kind(17) with Kind.Recognized {
+      val index = 8
+      val name = "SELF_PARAMETER"
+      override def isSelfParameter: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object TYPE_PARAMETER extends Kind(9) with Kind.Recognized {
+      val index = 9
+      val name = "TYPE_PARAMETER"
+      override def isTypeParameter: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object OBJECT extends Kind(10) with Kind.Recognized {
+      val index = 10
+      val name = "OBJECT"
+      override def isObject: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object PACKAGE extends Kind(11) with Kind.Recognized {
+      val index = 11
+      val name = "PACKAGE"
+      override def isPackage: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object PACKAGE_OBJECT extends Kind(12) with Kind.Recognized {
+      val index = 12
+      val name = "PACKAGE_OBJECT"
+      override def isPackageObject: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object CLASS extends Kind(13) with Kind.Recognized {
+      val index = 13
+      val name = "CLASS"
+      override def isClass: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object TRAIT extends Kind(14) with Kind.Recognized {
+      val index = 14
+      val name = "TRAIT"
+      override def isTrait: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object INTERFACE extends Kind(18) with Kind.Recognized {
+      val index = 15
+      val name = "INTERFACE"
+      override def isInterface: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    final case class Unrecognized(unrecognizedValue: _root_.scala.Int)  extends Kind(unrecognizedValue) with SemanticdbUnrecognizedEnum
+    
+    lazy val values = scala.collection.immutable.Seq(UNKNOWN_KIND, LOCAL, FIELD, METHOD, CONSTRUCTOR, MACRO, TYPE, PARAMETER, SELF_PARAMETER, TYPE_PARAMETER, OBJECT, PACKAGE, PACKAGE_OBJECT, CLASS, TRAIT, INTERFACE)
+    def fromValue(__value: _root_.scala.Int): Kind = __value match {
+      case 0 => UNKNOWN_KIND
+      case 3 => METHOD
+      case 6 => MACRO
+      case 7 => TYPE
+      case 8 => PARAMETER
+      case 9 => TYPE_PARAMETER
+      case 10 => OBJECT
+      case 11 => PACKAGE
+      case 12 => PACKAGE_OBJECT
+      case 13 => CLASS
+      case 14 => TRAIT
+      case 17 => SELF_PARAMETER
+      case 18 => INTERFACE
+      case 19 => LOCAL
+      case 20 => FIELD
+      case 21 => CONSTRUCTOR
+      case __other => Unrecognized(__other)
+    }
+    
+    
+  }
+  sealed abstract class Property(val value: _root_.scala.Int)  extends SemanticdbGeneratedEnum  derives CanEqual {
+    type EnumType = Property
+    def isUnknownProperty: _root_.scala.Boolean = false
+    def isAbstract: _root_.scala.Boolean = false
+    def isFinal: _root_.scala.Boolean = false
+    def isSealed: _root_.scala.Boolean = false
+    def isImplicit: _root_.scala.Boolean = false
+    def isLazy: _root_.scala.Boolean = false
+    def isCase: _root_.scala.Boolean = false
+    def isCovariant: _root_.scala.Boolean = false
+    def isContravariant: _root_.scala.Boolean = false
+    def isVal: _root_.scala.Boolean = false
+    def isVar: _root_.scala.Boolean = false
+    def isStatic: _root_.scala.Boolean = false
+    def isPrimary: _root_.scala.Boolean = false
+    def isEnum: _root_.scala.Boolean = false
+    def isDefault: _root_.scala.Boolean = false
+    def isGiven: _root_.scala.Boolean = false
+    def isInline: _root_.scala.Boolean = false
+    def isOpen: _root_.scala.Boolean = false
+    def isTransparent: _root_.scala.Boolean = false
+    def isInfix: _root_.scala.Boolean = false
+    def isOpaque: _root_.scala.Boolean = false
+    
+    final def asRecognized: _root_.scala.Option[dotty.tools.dotc.semanticdb.SymbolInformation.Property.Recognized] = if (isUnrecognized) _root_.scala.None else _root_.scala.Some(this.asInstanceOf[dotty.tools.dotc.semanticdb.SymbolInformation.Property.Recognized])
+  }
+  
+  object Property  {
+    sealed trait Recognized extends Property
+    
+    @SerialVersionUID(0L)
+    case object UNKNOWN_PROPERTY extends Property(0) with Property.Recognized {
+      val index = 0
+      val name = "UNKNOWN_PROPERTY"
+      override def isUnknownProperty: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object ABSTRACT extends Property(4) with Property.Recognized {
+      val index = 1
+      val name = "ABSTRACT"
+      override def isAbstract: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object FINAL extends Property(8) with Property.Recognized {
+      val index = 2
+      val name = "FINAL"
+      override def isFinal: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object SEALED extends Property(16) with Property.Recognized {
+      val index = 3
+      val name = "SEALED"
+      override def isSealed: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object IMPLICIT extends Property(32) with Property.Recognized {
+      val index = 4
+      val name = "IMPLICIT"
+      override def isImplicit: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object LAZY extends Property(64) with Property.Recognized {
+      val index = 5
+      val name = "LAZY"
+      override def isLazy: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object CASE extends Property(128) with Property.Recognized {
+      val index = 6
+      val name = "CASE"
+      override def isCase: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object COVARIANT extends Property(256) with Property.Recognized {
+      val index = 7
+      val name = "COVARIANT"
+      override def isCovariant: _root_.scala.Boolean = true
     }
+    
+    @SerialVersionUID(0L)
+    case object CONTRAVARIANT extends Property(512) with Property.Recognized {
+      val index = 8
+      val name = "CONTRAVARIANT"
+      override def isContravariant: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object VAL extends Property(1024) with Property.Recognized {
+      val index = 9
+      val name = "VAL"
+      override def isVal: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object VAR extends Property(2048) with Property.Recognized {
+      val index = 10
+      val name = "VAR"
+      override def isVar: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object STATIC extends Property(4096) with Property.Recognized {
+      val index = 11
+      val name = "STATIC"
+      override def isStatic: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object PRIMARY extends Property(8192) with Property.Recognized {
+      val index = 12
+      val name = "PRIMARY"
+      override def isPrimary: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object ENUM extends Property(16384) with Property.Recognized {
+      val index = 13
+      val name = "ENUM"
+      override def isEnum: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object DEFAULT extends Property(32768) with Property.Recognized {
+      val index = 14
+      val name = "DEFAULT"
+      override def isDefault: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object GIVEN extends Property(65536) with Property.Recognized {
+      val index = 15
+      val name = "GIVEN"
+      override def isGiven: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object INLINE extends Property(131072) with Property.Recognized {
+      val index = 16
+      val name = "INLINE"
+      override def isInline: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object OPEN extends Property(262144) with Property.Recognized {
+      val index = 17
+      val name = "OPEN"
+      override def isOpen: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object TRANSPARENT extends Property(524288) with Property.Recognized {
+      val index = 18
+      val name = "TRANSPARENT"
+      override def isTransparent: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object INFIX extends Property(1048576) with Property.Recognized {
+      val index = 19
+      val name = "INFIX"
+      override def isInfix: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object OPAQUE extends Property(2097152) with Property.Recognized {
+      val index = 20
+      val name = "OPAQUE"
+      override def isOpaque: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    final case class Unrecognized(unrecognizedValue: _root_.scala.Int)  extends Property(unrecognizedValue) with SemanticdbUnrecognizedEnum
+    
+    lazy val values = scala.collection.immutable.Seq(UNKNOWN_PROPERTY, ABSTRACT, FINAL, SEALED, IMPLICIT, LAZY, CASE, COVARIANT, CONTRAVARIANT, VAL, VAR, STATIC, PRIMARY, ENUM, DEFAULT, GIVEN, INLINE, OPEN, TRANSPARENT, INFIX, OPAQUE)
+    def fromValue(__value: _root_.scala.Int): Property = __value match {
+      case 0 => UNKNOWN_PROPERTY
+      case 4 => ABSTRACT
+      case 8 => FINAL
+      case 16 => SEALED
+      case 32 => IMPLICIT
+      case 64 => LAZY
+      case 128 => CASE
+      case 256 => COVARIANT
+      case 512 => CONTRAVARIANT
+      case 1024 => VAL
+      case 2048 => VAR
+      case 4096 => STATIC
+      case 8192 => PRIMARY
+      case 16384 => ENUM
+      case 32768 => DEFAULT
+      case 65536 => GIVEN
+      case 131072 => INLINE
+      case 262144 => OPEN
+      case 524288 => TRANSPARENT
+      case 1048576 => INFIX
+      case 2097152 => OPAQUE
+      case __other => Unrecognized(__other)
+    }
+    
+    
+  }
+  final val SYMBOL_FIELD_NUMBER = 1
+  final val LANGUAGE_FIELD_NUMBER = 16
+  final val KIND_FIELD_NUMBER = 3
+  final val PROPERTIES_FIELD_NUMBER = 4
+  final val DISPLAY_NAME_FIELD_NUMBER = 5
+  final val SIGNATURE_FIELD_NUMBER = 17
+  final val ANNOTATIONS_FIELD_NUMBER = 13
+  final val ACCESS_FIELD_NUMBER = 18
+  final val OVERRIDDEN_SYMBOLS_FIELD_NUMBER = 19
+  final val DOCUMENTATION_FIELD_NUMBER = 20
+  @transient @sharable
+  private[semanticdb] val _typemapper_signature: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.SignatureMessage, dotty.tools.dotc.semanticdb.Signature] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.SignatureMessage, dotty.tools.dotc.semanticdb.Signature]]
+  @transient @sharable
+  private[semanticdb] val _typemapper_access: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.AccessMessage, dotty.tools.dotc.semanticdb.Access] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.AccessMessage, dotty.tools.dotc.semanticdb.Access]]
+  def of(
+    symbol: _root_.scala.Predef.String,
+    language: dotty.tools.dotc.semanticdb.Language,
+    kind: dotty.tools.dotc.semanticdb.SymbolInformation.Kind,
+    properties: _root_.scala.Int,
+    displayName: _root_.scala.Predef.String,
+    signature: dotty.tools.dotc.semanticdb.Signature,
+    annotations: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Annotation],
+    access: dotty.tools.dotc.semanticdb.Access,
+    overriddenSymbols: _root_.scala.Seq[_root_.scala.Predef.String],
+    documentation: _root_.scala.Option[dotty.tools.dotc.semanticdb.Documentation]
+  ): _root_.dotty.tools.dotc.semanticdb.SymbolInformation = _root_.dotty.tools.dotc.semanticdb.SymbolInformation(
+    symbol,
+    language,
+    kind,
+    properties,
+    displayName,
+    signature,
+    annotations,
+    access,
+    overriddenSymbols,
+    documentation
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SymbolInformation])
 }
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/SymbolOccurrence.scala b/compiler/src/dotty/tools/dotc/semanticdb/SymbolOccurrence.scala
index 3123a54edd56..ea5ecfc73147 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/SymbolOccurrence.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/SymbolOccurrence.scala
@@ -1,117 +1,177 @@
-package dotty.tools.dotc.semanticdb
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
 
+package dotty.tools.dotc.semanticdb
 import dotty.tools.dotc.semanticdb.internal._
 import scala.annotation.internal.sharable
 
-object SymbolOccurrence {
-
-  sealed trait Role(val value: Int) extends SemanticdbEnum derives CanEqual {
-    def isDefinition: Boolean = this == Role.DEFINITION
-    def isReference: Boolean = this == Role.REFERENCE
-  }
-
-  object Role {
-
-    case object UNKNOWN_ROLE extends Role(0)
-    case object REFERENCE extends Role(1)
-    case object DEFINITION extends Role(2)
-    final case class Unrecognized(id: Int) extends Role(id)
-
-    def fromValue(value: Int): Role = value match {
-      case 0 => UNKNOWN_ROLE
-      case 1 => REFERENCE
-      case 2 => DEFINITION
-      case id => Unrecognized(id)
-    }
-
-  }
-
-  val defaultInstance: SymbolOccurrence = SymbolOccurrence("", None, Role.UNKNOWN_ROLE)
-}
-
+@SerialVersionUID(0L)
 final case class SymbolOccurrence(
-  symbol: String,
-  range: Option[Range],
-  role: SymbolOccurrence.Role
-) extends SemanticdbMessage[SymbolOccurrence] derives CanEqual {
-  @sharable
-  private var __serializedSizeCachedValue: Int = 0
-  private def __computeSerializedValue(): Int = {
-    var __size = 0
-    if (range.isDefined) {
-      val __value = range.get
-      __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(
-        __value.serializedSize
-      ) + __value.serializedSize
-    };
-
-    {
-      val __value = symbol
-      if (__value != "") {
-        __size += SemanticdbOutputStream
-          .computeStringSize(2, __value)
-      }
-    };
-
-    {
-      val __value = role
-      if (__value != SymbolOccurrence.Role.UNKNOWN_ROLE) {
-        __size += SemanticdbOutputStream
-          .computeEnumSize(3, __value.value)
-      }
-    };
-    __size
-  }
-  final override def serializedSize: Int = {
-    var read = __serializedSizeCachedValue
-    if (read == 0) {
-      read = __computeSerializedValue()
-      __serializedSizeCachedValue = read
+    range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range] = _root_.scala.None,
+    symbol: _root_.scala.Predef.String = "",
+    role: dotty.tools.dotc.semanticdb.SymbolOccurrence.Role = dotty.tools.dotc.semanticdb.SymbolOccurrence.Role.UNKNOWN_ROLE
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (range.isDefined) {
+        val __value = range.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      
+      {
+        val __value = symbol
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(2, __value)
+        }
+      };
+      
+      {
+        val __value = role.value
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeEnumSize(3, __value)
+        }
+      };
+      __size
     }
-    read
-  }
-  def writeTo(`_output__`: SemanticdbOutputStream): Unit = {
-    range.foreach { __v =>
-      val __m = __v
-      _output__.writeTag(1, 2)
-      _output__.writeUInt32NoTag(__m.serializedSize)
-      __m.writeTo(_output__)
-    };
-    {
-      val __v = symbol
-      if (__v != "") {
-        _output__.writeString(2, __v)
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
       }
-    };
-    {
-      val __v = role
-      if (__v != SymbolOccurrence.Role.UNKNOWN_ROLE) {
-        _output__.writeEnum(3, __v.value)
-      }
-    };
-  }
-  def mergeFrom(`_input__`: SemanticdbInputStream): SymbolOccurrence = {
-    var __range = this.range
-    var __symbol = this.symbol
-    var __role = this.role
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      range.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      {
+        val __v = symbol
+        if (!__v.isEmpty) {
+          _output__.writeString(2, __v)
+        }
+      };
+      {
+        val __v = role.value
+        if (__v != 0) {
+          _output__.writeEnum(3, __v)
+        }
+      };
+    }
+    def getRange: dotty.tools.dotc.semanticdb.Range = range.getOrElse(dotty.tools.dotc.semanticdb.Range.defaultInstance)
+    def clearRange: SymbolOccurrence = copy(range = _root_.scala.None)
+    def withRange(__v: dotty.tools.dotc.semanticdb.Range): SymbolOccurrence = copy(range = Option(__v))
+    def withSymbol(__v: _root_.scala.Predef.String): SymbolOccurrence = copy(symbol = __v)
+    def withRole(__v: dotty.tools.dotc.semanticdb.SymbolOccurrence.Role): SymbolOccurrence = copy(role = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.SymbolOccurrence])
+}
+
+object SymbolOccurrence  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SymbolOccurrence] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SymbolOccurrence] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.SymbolOccurrence = {
+    var __range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range] = _root_.scala.None
+    var __symbol: _root_.scala.Predef.String = ""
+    var __role: dotty.tools.dotc.semanticdb.SymbolOccurrence.Role = dotty.tools.dotc.semanticdb.SymbolOccurrence.Role.UNKNOWN_ROLE
     var _done__ = false
     while (!_done__) {
       val _tag__ = _input__.readTag()
       _tag__ match {
         case 0 => _done__ = true
         case 10 =>
-          __range = Option(LiteParser.readMessage(_input__, __range.getOrElse(Range.defaultInstance)))
+          __range = Option(__range.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Range](_input__))(LiteParser.readMessage(_input__, _)))
         case 18 =>
-          __symbol = _input__.readString()
+          __symbol = _input__.readStringRequireUtf8()
         case 24 =>
-          __role = SymbolOccurrence.Role.fromValue(_input__.readEnum())
+          __role = dotty.tools.dotc.semanticdb.SymbolOccurrence.Role.fromValue(_input__.readEnum())
         case tag => _input__.skipField(tag)
       }
     }
-    SymbolOccurrence(
-      range = __range,
-      symbol = __symbol,
-      role = __role
+    dotty.tools.dotc.semanticdb.SymbolOccurrence(
+        range = __range,
+        symbol = __symbol,
+        role = __role
     )
   }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.SymbolOccurrence(
+    range = _root_.scala.None,
+    symbol = "",
+    role = dotty.tools.dotc.semanticdb.SymbolOccurrence.Role.UNKNOWN_ROLE
+  )
+  sealed abstract class Role(val value: _root_.scala.Int)  extends SemanticdbGeneratedEnum  derives CanEqual {
+    type EnumType = Role
+    def isUnknownRole: _root_.scala.Boolean = false
+    def isReference: _root_.scala.Boolean = false
+    def isDefinition: _root_.scala.Boolean = false
+    
+    final def asRecognized: _root_.scala.Option[dotty.tools.dotc.semanticdb.SymbolOccurrence.Role.Recognized] = if (isUnrecognized) _root_.scala.None else _root_.scala.Some(this.asInstanceOf[dotty.tools.dotc.semanticdb.SymbolOccurrence.Role.Recognized])
+  }
+  
+  object Role  {
+    sealed trait Recognized extends Role
+    
+    @SerialVersionUID(0L)
+    case object UNKNOWN_ROLE extends Role(0) with Role.Recognized {
+      val index = 0
+      val name = "UNKNOWN_ROLE"
+      override def isUnknownRole: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object REFERENCE extends Role(1) with Role.Recognized {
+      val index = 1
+      val name = "REFERENCE"
+      override def isReference: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    case object DEFINITION extends Role(2) with Role.Recognized {
+      val index = 2
+      val name = "DEFINITION"
+      override def isDefinition: _root_.scala.Boolean = true
+    }
+    
+    @SerialVersionUID(0L)
+    final case class Unrecognized(unrecognizedValue: _root_.scala.Int)  extends Role(unrecognizedValue) with SemanticdbUnrecognizedEnum
+    
+    lazy val values = scala.collection.immutable.Seq(UNKNOWN_ROLE, REFERENCE, DEFINITION)
+    def fromValue(__value: _root_.scala.Int): Role = __value match {
+      case 0 => UNKNOWN_ROLE
+      case 1 => REFERENCE
+      case 2 => DEFINITION
+      case __other => Unrecognized(__other)
+    }
+    
+    
+  }
+  final val RANGE_FIELD_NUMBER = 1
+  final val SYMBOL_FIELD_NUMBER = 2
+  final val ROLE_FIELD_NUMBER = 3
+  def of(
+    range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range],
+    symbol: _root_.scala.Predef.String,
+    role: dotty.tools.dotc.semanticdb.SymbolOccurrence.Role
+  ): _root_.dotty.tools.dotc.semanticdb.SymbolOccurrence = _root_.dotty.tools.dotc.semanticdb.SymbolOccurrence(
+    range,
+    symbol,
+    role
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SymbolOccurrence])
 }
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Synthetic.scala b/compiler/src/dotty/tools/dotc/semanticdb/Synthetic.scala
new file mode 100644
index 000000000000..ab3301f209cb
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Synthetic.scala
@@ -0,0 +1,112 @@
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
+
+package dotty.tools.dotc.semanticdb
+import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
+
+@SerialVersionUID(0L)
+final case class Synthetic(
+    range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range] = _root_.scala.None,
+    tree: dotty.tools.dotc.semanticdb.Tree = dotty.tools.dotc.semanticdb.Synthetic._typemapper_tree.toCustom(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance)
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (range.isDefined) {
+        val __value = range.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.Synthetic._typemapper_tree.toBase(tree)
+        if (__value != dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      range.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      {
+        val __v = dotty.tools.dotc.semanticdb.Synthetic._typemapper_tree.toBase(tree)
+        if (__v != dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance) {
+          _output__.writeTag(2, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+    }
+    def getRange: dotty.tools.dotc.semanticdb.Range = range.getOrElse(dotty.tools.dotc.semanticdb.Range.defaultInstance)
+    def clearRange: Synthetic = copy(range = _root_.scala.None)
+    def withRange(__v: dotty.tools.dotc.semanticdb.Range): Synthetic = copy(range = Option(__v))
+    def withTree(__v: dotty.tools.dotc.semanticdb.Tree): Synthetic = copy(tree = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.Synthetic])
+}
+
+object Synthetic  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Synthetic] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Synthetic] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.Synthetic = {
+    var __range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range] = _root_.scala.None
+    var __tree: _root_.scala.Option[dotty.tools.dotc.semanticdb.TreeMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __range = Option(__range.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Range](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __tree = _root_.scala.Some(__tree.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TreeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.Synthetic(
+        range = __range,
+        tree = dotty.tools.dotc.semanticdb.Synthetic._typemapper_tree.toCustom(__tree.getOrElse(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.Synthetic(
+    range = _root_.scala.None,
+    tree = dotty.tools.dotc.semanticdb.Synthetic._typemapper_tree.toCustom(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance)
+  )
+  final val RANGE_FIELD_NUMBER = 1
+  final val TREE_FIELD_NUMBER = 2
+  @transient @sharable
+  private[semanticdb] val _typemapper_tree: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree]]
+  def of(
+    range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range],
+    tree: dotty.tools.dotc.semanticdb.Tree
+  ): _root_.dotty.tools.dotc.semanticdb.Synthetic = _root_.dotty.tools.dotc.semanticdb.Synthetic(
+    range,
+    tree
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Synthetic])
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala b/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala
new file mode 100644
index 000000000000..0818b7cf1be1
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala
@@ -0,0 +1,138 @@
+package dotty.tools.dotc.semanticdb
+
+import dotty.tools.dotc.ast.tpd._
+import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Flags._
+import dotty.tools.dotc.core.StdNames.nme
+import dotty.tools.dotc.{semanticdb => s}
+
+import scala.collection.mutable
+
+class SyntheticsExtractor:
+  import Scala3.{_, given}
+
+  val visited = collection.mutable.HashSet[Tree]()
+
+  def tryFindSynthetic(tree: Tree)(using Context, SemanticSymbolBuilder, TypeOps): Option[s.Synthetic] =
+    extension (synth: s.Synthetic)
+      def toOpt: Some[s.Synthetic] = Some(synth)
+
+    val forSynthetic = tree match // not yet supported (for synthetics)
+      case tree: Apply if isForSynthetic(tree) => true
+      case tree: TypeApply if isForSynthetic(tree) => true
+      case _ => false
+
+    if visited.contains(tree) || forSynthetic then None
+    else
+      tree match
+        case tree: TypeApply
+          if tree.span.isSynthetic &&
+            tree.args.forall(arg => !arg.symbol.is(Scala2x)) &&
+            !tree.span.isZeroExtent =>
+          visited.add(tree)
+          val fnTree = tree.fun match
+            // Something like `List.apply[Int](1,2,3)`
+            case select @ Select(qual, _) if isSyntheticName(select) =>
+              s.SelectTree(
+                s.OriginalTree(range(qual.span, tree.source)),
+                Some(select.toSemanticId)
+              )
+            case _ =>
+              s.OriginalTree(
+                range(tree.fun.span, tree.source)
+              )
+          val targs = tree.args.map(targ => targ.tpe.toSemanticType(targ.symbol)(using LinkMode.SymlinkChildren))
+          s.Synthetic(
+            range(tree.span, tree.source),
+            s.TypeApplyTree(
+              fnTree, targs
+            )
+          ).toOpt
+
+        case tree: Apply
+          if tree.args.nonEmpty &&
+            tree.args.forall(arg =>
+              arg.symbol.isOneOf(GivenOrImplicit) &&
+              arg.span.isSynthetic
+            ) =>
+          s.Synthetic(
+            range(tree.span, tree.source),
+            s.ApplyTree(
+              tree.fun.toSemanticOriginal,
+              tree.args.map(_.toSemanticTree)
+            )
+          ).toOpt
+
+        case tree: Apply if tree.fun.symbol.is(Implicit) =>
+          val pos = range(tree.span, tree.source)
+          s.Synthetic(
+            pos,
+            s.ApplyTree(
+              tree.fun.toSemanticTree,
+              arguments = List(
+                s.OriginalTree(pos)
+              )
+            )
+          ).toOpt
+
+        case _ => None
+
+  private given TreeOps: AnyRef with
+    extension (tree: Tree)
+      def toSemanticTree(using Context, SemanticSymbolBuilder, TypeOps): s.Tree =
+        tree match
+          case tree: Apply =>
+            s.ApplyTree(
+              tree.fun.toSemanticQualifierTree,
+              tree.args.map(_.toSemanticTree)
+            )
+          case tree: TypeApply =>
+            s.TypeApplyTree(
+              tree.fun.toSemanticQualifierTree,
+              tree.args.map { targ =>
+                targ.tpe.toSemanticType(targ.symbol)(using LinkMode.SymlinkChildren)
+              }
+            )
+          case tree: Ident => tree.toSemanticId
+          case tree: Select => tree.toSemanticId
+          case _ => s.Tree.defaultInstance
+
+      def toSemanticQualifierTree(using Context, SemanticSymbolBuilder): s.Tree = tree match
+        case sel @ Select(qual, _) if sel.symbol.owner != qual.symbol =>
+          s.SelectTree(qual.toSemanticId, Some(sel.toSemanticId))
+        case fun => fun.toSemanticId
+
+      def toSemanticId(using Context, SemanticSymbolBuilder) =
+        s.IdTree(tree.symbol.symbolName)
+
+      def toSemanticOriginal(using Context) =
+        s.OriginalTree(range(tree.span, tree.source))
+  end TreeOps
+
+
+  private def isForSynthetic(tree: Tree): Boolean =
+    def isForComprehensionSyntheticName(select: Select): Boolean =
+      select.span.toSynthetic == select.qualifier.span.toSynthetic && (
+        select.name == nme.map ||
+        select.name == nme.flatMap ||
+        select.name == nme.withFilter ||
+        select.name == nme.foreach
+      )
+    tree match
+      case Apply(fun, _) => isForSynthetic(fun)
+      case TypeApply(fun, _) => isForSynthetic(fun)
+      case select: Select => isForComprehensionSyntheticName(select)
+      case _ => false
+
+  private def isSyntheticName(select: Select): Boolean =
+    select.span.toSynthetic == select.qualifier.span.toSynthetic && (
+      select.name == nme.apply ||
+      select.name == nme.update ||
+      select.name == nme.foreach ||
+      select.name == nme.withFilter ||
+      select.name == nme.flatMap ||
+      select.name == nme.map ||
+      select.name == nme.unapplySeq ||
+      select.name == nme.unapply)
+
+end SyntheticsExtractor
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/TextDocument.scala b/compiler/src/dotty/tools/dotc/semanticdb/TextDocument.scala
index 05801340f955..5f377b2d0274 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/TextDocument.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/TextDocument.scala
@@ -1,147 +1,270 @@
-package dotty.tools.dotc.semanticdb
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
 
+package dotty.tools.dotc.semanticdb
 import dotty.tools.dotc.semanticdb.internal._
 import scala.annotation.internal.sharable
 
-object TextDocument {
-  val defaultInstance: TextDocument = TextDocument(Schema.LEGACY, Language.UNKNOWN_LANGUAGE, "", "", "", Nil, Nil)
-}
-
+@SerialVersionUID(0L)
 final case class TextDocument(
-  schema: Schema,
-  language: Language,
-  uri: String,
-  text: String,
-  md5: String,
-  symbols: Seq[SymbolInformation],
-  occurrences: Seq[SymbolOccurrence]
-) extends SemanticdbMessage[TextDocument] derives CanEqual {
-  @sharable
-  private var __serializedSizeCachedValue: Int = 0
-  private def __computeSerializedValue(): Int = {
-    var __size = 0
-
-    {
-      val __value = schema
-      if (__value != Schema.LEGACY) {
-        __size += SemanticdbOutputStream.computeEnumSize(1, __value.value)
+    schema: dotty.tools.dotc.semanticdb.Schema = dotty.tools.dotc.semanticdb.Schema.LEGACY,
+    uri: _root_.scala.Predef.String = "",
+    text: _root_.scala.Predef.String = "",
+    md5: _root_.scala.Predef.String = "",
+    language: dotty.tools.dotc.semanticdb.Language = dotty.tools.dotc.semanticdb.Language.UNKNOWN_LANGUAGE,
+    symbols: _root_.scala.Seq[dotty.tools.dotc.semanticdb.SymbolInformation] = _root_.scala.Seq.empty,
+    occurrences: _root_.scala.Seq[dotty.tools.dotc.semanticdb.SymbolOccurrence] = _root_.scala.Seq.empty,
+    diagnostics: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Diagnostic] = _root_.scala.Seq.empty,
+    synthetics: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Synthetic] = _root_.scala.Seq.empty
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = schema.value
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeEnumSize(1, __value)
+        }
+      };
+      
+      {
+        val __value = uri
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(2, __value)
+        }
+      };
+      
+      {
+        val __value = text
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(3, __value)
+        }
+      };
+      
+      {
+        val __value = md5
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(11, __value)
+        }
+      };
+      
+      {
+        val __value = language.value
+        if (__value != 0) {
+          __size += SemanticdbOutputStream.computeEnumSize(10, __value)
+        }
+      };
+      symbols.foreach { __item =>
+        val __value = __item
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
       }
-    };
-
-    {
-      val __value = uri
-      if (__value != "") {
-        __size += SemanticdbOutputStream
-          .computeStringSize(2, __value)
+      occurrences.foreach { __item =>
+        val __value = __item
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
       }
-    };
-
-    {
-      val __value = md5
-      if (__value != "") {
-        __size += SemanticdbOutputStream.computeStringSize(11, __value)
+      diagnostics.foreach { __item =>
+        val __value = __item
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
       }
-    };
-
-    {
-      val __value = language
-      if (__value != Language.UNKNOWN_LANGUAGE) {
-        __size += SemanticdbOutputStream.computeEnumSize(10, __value.value)
+      synthetics.foreach { __item =>
+        val __value = __item
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
       }
-    };
-    symbols.foreach { __item =>
-      val __value = __item
-      __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      __size
     }
-    occurrences.foreach { __item =>
-      val __value = __item
-      __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(
-        __value.serializedSize
-      ) + __value.serializedSize
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
     }
-    __size
-  }
-  final override def serializedSize: Int = {
-    var read = __serializedSizeCachedValue
-    if (read == 0) {
-      read = __computeSerializedValue()
-      __serializedSizeCachedValue = read
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = schema.value
+        if (__v != 0) {
+          _output__.writeEnum(1, __v)
+        }
+      };
+      {
+        val __v = uri
+        if (!__v.isEmpty) {
+          _output__.writeString(2, __v)
+        }
+      };
+      {
+        val __v = text
+        if (!__v.isEmpty) {
+          _output__.writeString(3, __v)
+        }
+      };
+      symbols.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(5, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      occurrences.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(6, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      diagnostics.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(7, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      {
+        val __v = language.value
+        if (__v != 0) {
+          _output__.writeEnum(10, __v)
+        }
+      };
+      {
+        val __v = md5
+        if (!__v.isEmpty) {
+          _output__.writeString(11, __v)
+        }
+      };
+      synthetics.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(12, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
     }
-    read
-  }
-  def writeTo(`_output__`: SemanticdbOutputStream): Unit = {
-    {
-      val __v = schema
-      if (__v != Schema.LEGACY) {
-        _output__.writeEnum(1, __v.value)
-      }
-    };
-    {
-      val __v = uri
-      if (__v != "") {
-        _output__.writeString(2, __v)
-      }
-    };
-    symbols.foreach { __v =>
-      val __m = __v
-      _output__.writeTag(5, 2)
-      _output__.writeUInt32NoTag(__m.serializedSize)
-      __m.writeTo(_output__)
-    };
-    occurrences.foreach { __v =>
-      val __m = __v
-      _output__.writeTag(6, 2)
-      _output__.writeUInt32NoTag(__m.serializedSize)
-      __m.writeTo(_output__)
-    };
-    {
-      val __v = language
-      if (__v != Language.UNKNOWN_LANGUAGE) {
-        _output__.writeEnum(10, __v.value)
-      }
-    };
-    {
-      val __v = md5
-      if (__v != "") {
-        _output__.writeString(11, __v)
-      }
-    };
-  }
-  def mergeFrom(`_input__`: SemanticdbInputStream): TextDocument = {
-    var __schema = this.schema
-    var __uri = this.uri
-    var __md5 = this.md5
-    var __language = this.language
-    val __symbols = (Vector.newBuilder[SymbolInformation] ++= this.symbols)
-    val __occurrences = (Vector.newBuilder[SymbolOccurrence] ++= this.occurrences)
+    def withSchema(__v: dotty.tools.dotc.semanticdb.Schema): TextDocument = copy(schema = __v)
+    def withUri(__v: _root_.scala.Predef.String): TextDocument = copy(uri = __v)
+    def withText(__v: _root_.scala.Predef.String): TextDocument = copy(text = __v)
+    def withMd5(__v: _root_.scala.Predef.String): TextDocument = copy(md5 = __v)
+    def withLanguage(__v: dotty.tools.dotc.semanticdb.Language): TextDocument = copy(language = __v)
+    def clearSymbols = copy(symbols = _root_.scala.Seq.empty)
+    def addSymbols(__vs: dotty.tools.dotc.semanticdb.SymbolInformation*): TextDocument = addAllSymbols(__vs)
+    def addAllSymbols(__vs: Iterable[dotty.tools.dotc.semanticdb.SymbolInformation]): TextDocument = copy(symbols = symbols ++ __vs)
+    def withSymbols(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.SymbolInformation]): TextDocument = copy(symbols = __v)
+    def clearOccurrences = copy(occurrences = _root_.scala.Seq.empty)
+    def addOccurrences(__vs: dotty.tools.dotc.semanticdb.SymbolOccurrence*): TextDocument = addAllOccurrences(__vs)
+    def addAllOccurrences(__vs: Iterable[dotty.tools.dotc.semanticdb.SymbolOccurrence]): TextDocument = copy(occurrences = occurrences ++ __vs)
+    def withOccurrences(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.SymbolOccurrence]): TextDocument = copy(occurrences = __v)
+    def clearDiagnostics = copy(diagnostics = _root_.scala.Seq.empty)
+    def addDiagnostics(__vs: dotty.tools.dotc.semanticdb.Diagnostic*): TextDocument = addAllDiagnostics(__vs)
+    def addAllDiagnostics(__vs: Iterable[dotty.tools.dotc.semanticdb.Diagnostic]): TextDocument = copy(diagnostics = diagnostics ++ __vs)
+    def withDiagnostics(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Diagnostic]): TextDocument = copy(diagnostics = __v)
+    def clearSynthetics = copy(synthetics = _root_.scala.Seq.empty)
+    def addSynthetics(__vs: dotty.tools.dotc.semanticdb.Synthetic*): TextDocument = addAllSynthetics(__vs)
+    def addAllSynthetics(__vs: Iterable[dotty.tools.dotc.semanticdb.Synthetic]): TextDocument = copy(synthetics = synthetics ++ __vs)
+    def withSynthetics(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Synthetic]): TextDocument = copy(synthetics = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.TextDocument])
+}
+
+object TextDocument  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TextDocument] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TextDocument] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.TextDocument = {
+    var __schema: dotty.tools.dotc.semanticdb.Schema = dotty.tools.dotc.semanticdb.Schema.LEGACY
+    var __uri: _root_.scala.Predef.String = ""
+    var __text: _root_.scala.Predef.String = ""
+    var __md5: _root_.scala.Predef.String = ""
+    var __language: dotty.tools.dotc.semanticdb.Language = dotty.tools.dotc.semanticdb.Language.UNKNOWN_LANGUAGE
+    val __symbols: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.SymbolInformation] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.SymbolInformation]
+    val __occurrences: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.SymbolOccurrence] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.SymbolOccurrence]
+    val __diagnostics: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Diagnostic] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Diagnostic]
+    val __synthetics: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Synthetic] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Synthetic]
     var _done__ = false
     while (!_done__) {
       val _tag__ = _input__.readTag()
       _tag__ match {
         case 0 => _done__ = true
         case 8 =>
-          __schema = Schema.fromValue(_input__.readEnum())
+          __schema = dotty.tools.dotc.semanticdb.Schema.fromValue(_input__.readEnum())
         case 18 =>
-          __uri = _input__.readString()
+          __uri = _input__.readStringRequireUtf8()
+        case 26 =>
+          __text = _input__.readStringRequireUtf8()
         case 90 =>
-          __md5 = _input__.readString()
+          __md5 = _input__.readStringRequireUtf8()
         case 80 =>
-          __language = Language.fromValue(_input__.readEnum())
+          __language = dotty.tools.dotc.semanticdb.Language.fromValue(_input__.readEnum())
         case 42 =>
-          __symbols += LiteParser.readMessage(_input__, SymbolInformation.defaultInstance)
+          __symbols += LiteParser.readMessage[dotty.tools.dotc.semanticdb.SymbolInformation](_input__)
         case 50 =>
-          __occurrences += LiteParser.readMessage(_input__, SymbolOccurrence.defaultInstance)
+          __occurrences += LiteParser.readMessage[dotty.tools.dotc.semanticdb.SymbolOccurrence](_input__)
+        case 58 =>
+          __diagnostics += LiteParser.readMessage[dotty.tools.dotc.semanticdb.Diagnostic](_input__)
+        case 98 =>
+          __synthetics += LiteParser.readMessage[dotty.tools.dotc.semanticdb.Synthetic](_input__)
         case tag => _input__.skipField(tag)
       }
     }
-    TextDocument(
-      schema = __schema,
-      uri = __uri,
-      text = "",
-      md5 = __md5,
-      language = __language,
-      symbols = __symbols.result(),
-      occurrences = __occurrences.result(),
+    dotty.tools.dotc.semanticdb.TextDocument(
+        schema = __schema,
+        uri = __uri,
+        text = __text,
+        md5 = __md5,
+        language = __language,
+        symbols = __symbols.result(),
+        occurrences = __occurrences.result(),
+        diagnostics = __diagnostics.result(),
+        synthetics = __synthetics.result()
     )
   }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.TextDocument(
+    schema = dotty.tools.dotc.semanticdb.Schema.LEGACY,
+    uri = "",
+    text = "",
+    md5 = "",
+    language = dotty.tools.dotc.semanticdb.Language.UNKNOWN_LANGUAGE,
+    symbols = _root_.scala.Seq.empty,
+    occurrences = _root_.scala.Seq.empty,
+    diagnostics = _root_.scala.Seq.empty,
+    synthetics = _root_.scala.Seq.empty
+  )
+  final val SCHEMA_FIELD_NUMBER = 1
+  final val URI_FIELD_NUMBER = 2
+  final val TEXT_FIELD_NUMBER = 3
+  final val MD5_FIELD_NUMBER = 11
+  final val LANGUAGE_FIELD_NUMBER = 10
+  final val SYMBOLS_FIELD_NUMBER = 5
+  final val OCCURRENCES_FIELD_NUMBER = 6
+  final val DIAGNOSTICS_FIELD_NUMBER = 7
+  final val SYNTHETICS_FIELD_NUMBER = 12
+  def of(
+    schema: dotty.tools.dotc.semanticdb.Schema,
+    uri: _root_.scala.Predef.String,
+    text: _root_.scala.Predef.String,
+    md5: _root_.scala.Predef.String,
+    language: dotty.tools.dotc.semanticdb.Language,
+    symbols: _root_.scala.Seq[dotty.tools.dotc.semanticdb.SymbolInformation],
+    occurrences: _root_.scala.Seq[dotty.tools.dotc.semanticdb.SymbolOccurrence],
+    diagnostics: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Diagnostic],
+    synthetics: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Synthetic]
+  ): _root_.dotty.tools.dotc.semanticdb.TextDocument = _root_.dotty.tools.dotc.semanticdb.TextDocument(
+    schema,
+    uri,
+    text,
+    md5,
+    language,
+    symbols,
+    occurrences,
+    diagnostics,
+    synthetics
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TextDocument])
 }
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/TextDocuments.scala b/compiler/src/dotty/tools/dotc/semanticdb/TextDocuments.scala
index 68d667f27f74..8bc46a1f703d 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/TextDocuments.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/TextDocuments.scala
@@ -1,58 +1,86 @@
-package dotty.tools.dotc.semanticdb
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
 
+package dotty.tools.dotc.semanticdb
 import dotty.tools.dotc.semanticdb.internal._
 import scala.annotation.internal.sharable
 
-object TextDocuments {
-  def parseFrom(in: Array[Byte]): TextDocuments = {
-    parseFrom(SemanticdbInputStream.newInstance(in))
-  }
-  def parseFrom(in: SemanticdbInputStream): TextDocuments = {
-    defaultInstance.mergeFrom(in)
-  }
-  val defaultInstance: TextDocuments = TextDocuments(Nil)
-}
-final case class TextDocuments(documents: Seq[TextDocument]) extends SemanticdbMessage[TextDocuments] derives CanEqual {
-  @sharable
-  private var __serializedSizeCachedValue: Int = 0
-  private def __computeSerializedValue(): Int = {
-    var __size = 0
-    documents.foreach { __item =>
-      val __value = __item
-      __size += 1 +
-        SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) +
-        __value.serializedSize
+@SerialVersionUID(0L)
+final case class TextDocuments(
+    documents: _root_.scala.Seq[dotty.tools.dotc.semanticdb.TextDocument] = _root_.scala.Seq.empty
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      documents.foreach { __item =>
+        val __value = __item
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      __size
     }
-    __size
-  }
-  final override def serializedSize: Int = {
-    var read = __serializedSizeCachedValue
-    if (read == 0) {
-      read = __computeSerializedValue()
-      __serializedSizeCachedValue = read
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
     }
-    read
-  }
-  def writeTo(`_output__`: SemanticdbOutputStream): Unit = {
-    documents.foreach { __v =>
-      val __m = __v
-      _output__.writeTag(1, 2)
-      _output__.writeUInt32NoTag(__m.serializedSize)
-      __m.writeTo(_output__)
-    };
-  }
-  def mergeFrom(`_input__`: SemanticdbInputStream): TextDocuments = {
-    val __documents = (Vector.newBuilder[TextDocument] ++= this.documents)
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      documents.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def clearDocuments = copy(documents = _root_.scala.Seq.empty)
+    def addDocuments(__vs: dotty.tools.dotc.semanticdb.TextDocument*): TextDocuments = addAllDocuments(__vs)
+    def addAllDocuments(__vs: Iterable[dotty.tools.dotc.semanticdb.TextDocument]): TextDocuments = copy(documents = documents ++ __vs)
+    def withDocuments(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.TextDocument]): TextDocuments = copy(documents = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.TextDocuments])
+}
+
+object TextDocuments  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TextDocuments] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TextDocuments] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.TextDocuments = {
+    val __documents: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.TextDocument] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.TextDocument]
     var _done__ = false
     while (!_done__) {
       val _tag__ = _input__.readTag()
       _tag__ match {
         case 0 => _done__ = true
         case 10 =>
-          __documents += LiteParser.readMessage(_input__, TextDocument.defaultInstance)
+          __documents += LiteParser.readMessage[dotty.tools.dotc.semanticdb.TextDocument](_input__)
         case tag => _input__.skipField(tag)
       }
     }
-    TextDocuments(documents = __documents.result())
+    dotty.tools.dotc.semanticdb.TextDocuments(
+        documents = __documents.result()
+    )
   }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.TextDocuments(
+    documents = _root_.scala.Seq.empty
+  )
+  final val DOCUMENTS_FIELD_NUMBER = 1
+  def of(
+    documents: _root_.scala.Seq[dotty.tools.dotc.semanticdb.TextDocument]
+  ): _root_.dotty.tools.dotc.semanticdb.TextDocuments = _root_.dotty.tools.dotc.semanticdb.TextDocuments(
+    documents
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TextDocuments])
 }
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Tools.scala b/compiler/src/dotty/tools/dotc/semanticdb/Tools.scala
index ce2e943ed7a1..54b57f7c6a2f 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/Tools.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Tools.scala
@@ -41,14 +41,22 @@ object Tools:
         document.copy(text = text)
   end loadTextDocument
 
+  def loadTextDocumentUnsafe(scalaAbsolutePath: Path, semanticdbAbsolutePath: Path): TextDocument =
+    val docs = parseTextDocuments(semanticdbAbsolutePath).documents
+    assert(docs.length == 1)
+    docs.head.copy(text = new String(Files.readAllBytes(scalaAbsolutePath), StandardCharsets.UTF_8))
+
   /** Parses SemanticDB text documents from an absolute path to a `*.semanticdb` file. */
   private def parseTextDocuments(path: Path): TextDocuments =
     val bytes = Files.readAllBytes(path) // NOTE: a semanticdb file is a TextDocuments message, not TextDocument
     TextDocuments.parseFrom(bytes)
 
   def metac(doc: TextDocument, realPath: Path)(using sb: StringBuilder): StringBuilder =
+    val symtab = PrinterSymtab.fromTextDocument(doc)
+    val symPrinter = SymbolInformationPrinter(symtab)
     val realURI = realPath.toString
-    given SourceFile = SourceFile.virtual(doc.uri, doc.text)
+    given sourceFile: SourceFile = SourceFile.virtual(doc.uri, doc.text)
+    val synthPrinter = SyntheticPrinter(symtab, sourceFile)
     sb.append(realURI).nl
     sb.append("-" * realURI.length).nl
     sb.nl
@@ -59,13 +67,20 @@ object Tools:
     sb.append("Language => ").append(languageString(doc.language)).nl
     sb.append("Symbols => ").append(doc.symbols.length).append(" entries").nl
     sb.append("Occurrences => ").append(doc.occurrences.length).append(" entries").nl
+    if doc.synthetics.nonEmpty then
+      sb.append("Synthetics => ").append(doc.synthetics.length).append(" entries").nl
     sb.nl
     sb.append("Symbols:").nl
-    doc.symbols.sorted.foreach(processSymbol)
+    doc.symbols.sorted.foreach(s => processSymbol(s, symPrinter))
     sb.nl
     sb.append("Occurrences:").nl
     doc.occurrences.sorted.foreach(processOccurrence)
     sb.nl
+    if doc.synthetics.nonEmpty then
+      sb.append("Synthetics:").nl
+      doc.synthetics.sorted.foreach(s => processSynth(s, synthPrinter))
+      sb.nl
+    sb
   end metac
 
   private def schemaString(schema: Schema) =
@@ -85,51 +100,16 @@ object Tools:
     case UNKNOWN_LANGUAGE | Unrecognized(_) => "unknown"
   end languageString
 
-  private def processSymbol(info: SymbolInformation)(using sb: StringBuilder): Unit =
-    import SymbolInformation.Kind._
-    sb.append(info.symbol).append(" => ")
-    if info.isAbstract then sb.append("abstract ")
-    if info.isFinal then sb.append("final ")
-    if info.isSealed then sb.append("sealed ")
-    if info.isImplicit then sb.append("implicit ")
-    if info.isLazy then sb.append("lazy ")
-    if info.isCase then sb.append("case ")
-    if info.isCovariant then sb.append("covariant ")
-    if info.isContravariant then sb.append("contravariant ")
-    if info.isVal then sb.append("val ")
-    if info.isVar then sb.append("var ")
-    if info.isStatic then sb.append("static ")
-    if info.isPrimary then sb.append("primary ")
-    if info.isEnum then sb.append("enum ")
-    if info.isDefault then sb.append("default ")
-    info.kind match
-      case LOCAL => sb.append("local ")
-      case FIELD => sb.append("field ")
-      case METHOD => sb.append("method ")
-      case CONSTRUCTOR => sb.append("ctor ")
-      case MACRO => sb.append("macro ")
-      case TYPE => sb.append("type ")
-      case PARAMETER => sb.append("param ")
-      case SELF_PARAMETER => sb.append("selfparam ")
-      case TYPE_PARAMETER => sb.append("typeparam ")
-      case OBJECT => sb.append("object ")
-      case PACKAGE => sb.append("package ")
-      case PACKAGE_OBJECT => sb.append("package object ")
-      case CLASS => sb.append("class ")
-      case TRAIT => sb.append("trait ")
-      case INTERFACE => sb.append("interface ")
-      case UNKNOWN_KIND | Unrecognized(_) => sb.append("unknown ")
-    sb.append(info.displayName).nl
-  end processSymbol
+  private def processSymbol(info: SymbolInformation, printer: SymbolInformationPrinter)(using sb: StringBuilder): Unit =
+    sb.append(printer.pprintSymbolInformation(info)).nl
+
+  private def processSynth(synth: Synthetic, printer: SyntheticPrinter)(using sb: StringBuilder): Unit =
+    sb.append(printer.pprint(synth)).nl
 
   private def processOccurrence(occ: SymbolOccurrence)(using sb: StringBuilder, sourceFile: SourceFile): Unit =
     occ.range match
     case Some(range) =>
-      sb.append('[')
-        .append(range.startLine).append(':').append(range.startCharacter)
-        .append("..")
-        .append(range.endLine).append(':').append(range.endCharacter)
-        .append("):")
+      processRange(sb, range)
       if range.endLine == range.startLine
       && range.startCharacter != range.endCharacter
       && !(occ.symbol.isConstructor && occ.role.isDefinition) then
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Tree.scala b/compiler/src/dotty/tools/dotc/semanticdb/Tree.scala
new file mode 100644
index 000000000000..c6b107852fb2
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Tree.scala
@@ -0,0 +1,1079 @@
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
+
+package dotty.tools.dotc.semanticdb
+import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
+
+sealed trait Tree  extends SemanticdbGeneratedSealedOneof  derives CanEqual {
+  type MessageType = dotty.tools.dotc.semanticdb.TreeMessage
+  final def isEmpty = this.isInstanceOf[dotty.tools.dotc.semanticdb.Tree.Empty.type]
+  final def isDefined = !isEmpty
+  final def asMessage: dotty.tools.dotc.semanticdb.TreeMessage = dotty.tools.dotc.semanticdb.Tree.TreeTypeMapper.toBase(this)
+  final def asNonEmpty: Option[dotty.tools.dotc.semanticdb.Tree.NonEmpty] = if (isEmpty) None else Some(this.asInstanceOf[dotty.tools.dotc.semanticdb.Tree.NonEmpty])
+}
+
+object Tree {
+  case object Empty extends dotty.tools.dotc.semanticdb.Tree
+  
+  sealed trait NonEmpty extends dotty.tools.dotc.semanticdb.Tree
+  def defaultInstance: dotty.tools.dotc.semanticdb.Tree = Empty
+  
+  implicit val TreeTypeMapper: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree] = new SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree] {
+    override def toCustom(__base: dotty.tools.dotc.semanticdb.TreeMessage): dotty.tools.dotc.semanticdb.Tree = __base.sealedValue match {
+      case __v: dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.ApplyTree => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.FunctionTree => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.IdTree => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.LiteralTree => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.MacroExpansionTree => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.OriginalTree => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.SelectTree => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.TypeApplyTree => __v.value
+      case dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.Empty => Empty
+    }
+    override def toBase(__custom: dotty.tools.dotc.semanticdb.Tree): dotty.tools.dotc.semanticdb.TreeMessage = dotty.tools.dotc.semanticdb.TreeMessage(__custom match {
+      case __v: dotty.tools.dotc.semanticdb.ApplyTree => dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.ApplyTree(__v)
+      case __v: dotty.tools.dotc.semanticdb.FunctionTree => dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.FunctionTree(__v)
+      case __v: dotty.tools.dotc.semanticdb.IdTree => dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.IdTree(__v)
+      case __v: dotty.tools.dotc.semanticdb.LiteralTree => dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.LiteralTree(__v)
+      case __v: dotty.tools.dotc.semanticdb.MacroExpansionTree => dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.MacroExpansionTree(__v)
+      case __v: dotty.tools.dotc.semanticdb.OriginalTree => dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.OriginalTree(__v)
+      case __v: dotty.tools.dotc.semanticdb.SelectTree => dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.SelectTree(__v)
+      case __v: dotty.tools.dotc.semanticdb.TypeApplyTree => dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.TypeApplyTree(__v)
+      case Empty => dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.Empty
+    })
+  }
+}
+@SerialVersionUID(0L)
+final case class TreeMessage(
+    sealedValue: dotty.tools.dotc.semanticdb.TreeMessage.SealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.Empty
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (sealedValue.applyTree.isDefined) {
+        val __value = sealedValue.applyTree.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.functionTree.isDefined) {
+        val __value = sealedValue.functionTree.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.idTree.isDefined) {
+        val __value = sealedValue.idTree.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.literalTree.isDefined) {
+        val __value = sealedValue.literalTree.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.macroExpansionTree.isDefined) {
+        val __value = sealedValue.macroExpansionTree.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.originalTree.isDefined) {
+        val __value = sealedValue.originalTree.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.selectTree.isDefined) {
+        val __value = sealedValue.selectTree.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.typeApplyTree.isDefined) {
+        val __value = sealedValue.typeApplyTree.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      sealedValue.applyTree.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.functionTree.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(2, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.idTree.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(3, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.literalTree.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(4, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.macroExpansionTree.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(5, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.originalTree.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(6, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.selectTree.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(7, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.typeApplyTree.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(8, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def getApplyTree: dotty.tools.dotc.semanticdb.ApplyTree = sealedValue.applyTree.getOrElse(dotty.tools.dotc.semanticdb.ApplyTree.defaultInstance)
+    def withApplyTree(__v: dotty.tools.dotc.semanticdb.ApplyTree): TreeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.ApplyTree(__v))
+    def getFunctionTree: dotty.tools.dotc.semanticdb.FunctionTree = sealedValue.functionTree.getOrElse(dotty.tools.dotc.semanticdb.FunctionTree.defaultInstance)
+    def withFunctionTree(__v: dotty.tools.dotc.semanticdb.FunctionTree): TreeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.FunctionTree(__v))
+    def getIdTree: dotty.tools.dotc.semanticdb.IdTree = sealedValue.idTree.getOrElse(dotty.tools.dotc.semanticdb.IdTree.defaultInstance)
+    def withIdTree(__v: dotty.tools.dotc.semanticdb.IdTree): TreeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.IdTree(__v))
+    def getLiteralTree: dotty.tools.dotc.semanticdb.LiteralTree = sealedValue.literalTree.getOrElse(dotty.tools.dotc.semanticdb.LiteralTree.defaultInstance)
+    def withLiteralTree(__v: dotty.tools.dotc.semanticdb.LiteralTree): TreeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.LiteralTree(__v))
+    def getMacroExpansionTree: dotty.tools.dotc.semanticdb.MacroExpansionTree = sealedValue.macroExpansionTree.getOrElse(dotty.tools.dotc.semanticdb.MacroExpansionTree.defaultInstance)
+    def withMacroExpansionTree(__v: dotty.tools.dotc.semanticdb.MacroExpansionTree): TreeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.MacroExpansionTree(__v))
+    def getOriginalTree: dotty.tools.dotc.semanticdb.OriginalTree = sealedValue.originalTree.getOrElse(dotty.tools.dotc.semanticdb.OriginalTree.defaultInstance)
+    def withOriginalTree(__v: dotty.tools.dotc.semanticdb.OriginalTree): TreeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.OriginalTree(__v))
+    def getSelectTree: dotty.tools.dotc.semanticdb.SelectTree = sealedValue.selectTree.getOrElse(dotty.tools.dotc.semanticdb.SelectTree.defaultInstance)
+    def withSelectTree(__v: dotty.tools.dotc.semanticdb.SelectTree): TreeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.SelectTree(__v))
+    def getTypeApplyTree: dotty.tools.dotc.semanticdb.TypeApplyTree = sealedValue.typeApplyTree.getOrElse(dotty.tools.dotc.semanticdb.TypeApplyTree.defaultInstance)
+    def withTypeApplyTree(__v: dotty.tools.dotc.semanticdb.TypeApplyTree): TreeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.TypeApplyTree(__v))
+    def clearSealedValue: TreeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.Empty)
+    def withSealedValue(__v: dotty.tools.dotc.semanticdb.TreeMessage.SealedValue): TreeMessage = copy(sealedValue = __v)
+    
+    
+    
+    
+    def toTree: dotty.tools.dotc.semanticdb.Tree = dotty.tools.dotc.semanticdb.Tree.TreeTypeMapper.toCustom(this)
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.Tree])
+}
+
+object TreeMessage  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TreeMessage] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TreeMessage] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.TreeMessage = {
+    var __sealedValue: dotty.tools.dotc.semanticdb.TreeMessage.SealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.Empty
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.ApplyTree(__sealedValue.applyTree.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ApplyTree](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.FunctionTree(__sealedValue.functionTree.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.FunctionTree](_input__))(LiteParser.readMessage(_input__, _)))
+        case 26 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.IdTree(__sealedValue.idTree.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.IdTree](_input__))(LiteParser.readMessage(_input__, _)))
+        case 34 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.LiteralTree(__sealedValue.literalTree.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.LiteralTree](_input__))(LiteParser.readMessage(_input__, _)))
+        case 42 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.MacroExpansionTree(__sealedValue.macroExpansionTree.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.MacroExpansionTree](_input__))(LiteParser.readMessage(_input__, _)))
+        case 50 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.OriginalTree(__sealedValue.originalTree.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.OriginalTree](_input__))(LiteParser.readMessage(_input__, _)))
+        case 58 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.SelectTree(__sealedValue.selectTree.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.SelectTree](_input__))(LiteParser.readMessage(_input__, _)))
+        case 66 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.TypeApplyTree(__sealedValue.typeApplyTree.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeApplyTree](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.TreeMessage(
+        sealedValue = __sealedValue
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.TreeMessage(
+    sealedValue = dotty.tools.dotc.semanticdb.TreeMessage.SealedValue.Empty
+  )
+  sealed trait SealedValue  extends SemanticdbGeneratedOneof  derives CanEqual {
+    def isEmpty: _root_.scala.Boolean = false
+    def isDefined: _root_.scala.Boolean = true
+    def isApplyTree: _root_.scala.Boolean = false
+    def isFunctionTree: _root_.scala.Boolean = false
+    def isIdTree: _root_.scala.Boolean = false
+    def isLiteralTree: _root_.scala.Boolean = false
+    def isMacroExpansionTree: _root_.scala.Boolean = false
+    def isOriginalTree: _root_.scala.Boolean = false
+    def isSelectTree: _root_.scala.Boolean = false
+    def isTypeApplyTree: _root_.scala.Boolean = false
+    def applyTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.ApplyTree] = _root_.scala.None
+    def functionTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.FunctionTree] = _root_.scala.None
+    def idTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.IdTree] = _root_.scala.None
+    def literalTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.LiteralTree] = _root_.scala.None
+    def macroExpansionTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.MacroExpansionTree] = _root_.scala.None
+    def originalTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.OriginalTree] = _root_.scala.None
+    def selectTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.SelectTree] = _root_.scala.None
+    def typeApplyTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeApplyTree] = _root_.scala.None
+  }
+  object SealedValue {
+    @SerialVersionUID(0L)
+    case object Empty extends dotty.tools.dotc.semanticdb.TreeMessage.SealedValue {
+      type ValueType = _root_.scala.Nothing
+      override def isEmpty: _root_.scala.Boolean = true
+      override def isDefined: _root_.scala.Boolean = false
+      override def number: _root_.scala.Int = 0
+      override def value: _root_.scala.Nothing = throw new java.util.NoSuchElementException("Empty.value")
+    }
+  
+    @SerialVersionUID(0L)
+    final case class ApplyTree(value: dotty.tools.dotc.semanticdb.ApplyTree) extends dotty.tools.dotc.semanticdb.TreeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.ApplyTree
+      override def isApplyTree: _root_.scala.Boolean = true
+      override def applyTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.ApplyTree] = Some(value)
+      override def number: _root_.scala.Int = 1
+    }
+    @SerialVersionUID(0L)
+    final case class FunctionTree(value: dotty.tools.dotc.semanticdb.FunctionTree) extends dotty.tools.dotc.semanticdb.TreeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.FunctionTree
+      override def isFunctionTree: _root_.scala.Boolean = true
+      override def functionTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.FunctionTree] = Some(value)
+      override def number: _root_.scala.Int = 2
+    }
+    @SerialVersionUID(0L)
+    final case class IdTree(value: dotty.tools.dotc.semanticdb.IdTree) extends dotty.tools.dotc.semanticdb.TreeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.IdTree
+      override def isIdTree: _root_.scala.Boolean = true
+      override def idTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.IdTree] = Some(value)
+      override def number: _root_.scala.Int = 3
+    }
+    @SerialVersionUID(0L)
+    final case class LiteralTree(value: dotty.tools.dotc.semanticdb.LiteralTree) extends dotty.tools.dotc.semanticdb.TreeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.LiteralTree
+      override def isLiteralTree: _root_.scala.Boolean = true
+      override def literalTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.LiteralTree] = Some(value)
+      override def number: _root_.scala.Int = 4
+    }
+    @SerialVersionUID(0L)
+    final case class MacroExpansionTree(value: dotty.tools.dotc.semanticdb.MacroExpansionTree) extends dotty.tools.dotc.semanticdb.TreeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.MacroExpansionTree
+      override def isMacroExpansionTree: _root_.scala.Boolean = true
+      override def macroExpansionTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.MacroExpansionTree] = Some(value)
+      override def number: _root_.scala.Int = 5
+    }
+    @SerialVersionUID(0L)
+    final case class OriginalTree(value: dotty.tools.dotc.semanticdb.OriginalTree) extends dotty.tools.dotc.semanticdb.TreeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.OriginalTree
+      override def isOriginalTree: _root_.scala.Boolean = true
+      override def originalTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.OriginalTree] = Some(value)
+      override def number: _root_.scala.Int = 6
+    }
+    @SerialVersionUID(0L)
+    final case class SelectTree(value: dotty.tools.dotc.semanticdb.SelectTree) extends dotty.tools.dotc.semanticdb.TreeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.SelectTree
+      override def isSelectTree: _root_.scala.Boolean = true
+      override def selectTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.SelectTree] = Some(value)
+      override def number: _root_.scala.Int = 7
+    }
+    @SerialVersionUID(0L)
+    final case class TypeApplyTree(value: dotty.tools.dotc.semanticdb.TypeApplyTree) extends dotty.tools.dotc.semanticdb.TreeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.TypeApplyTree
+      override def isTypeApplyTree: _root_.scala.Boolean = true
+      override def typeApplyTree: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeApplyTree] = Some(value)
+      override def number: _root_.scala.Int = 8
+    }
+  }
+  final val APPLY_TREE_FIELD_NUMBER = 1
+  final val FUNCTION_TREE_FIELD_NUMBER = 2
+  final val ID_TREE_FIELD_NUMBER = 3
+  final val LITERAL_TREE_FIELD_NUMBER = 4
+  final val MACRO_EXPANSION_TREE_FIELD_NUMBER = 5
+  final val ORIGINAL_TREE_FIELD_NUMBER = 6
+  final val SELECT_TREE_FIELD_NUMBER = 7
+  final val TYPE_APPLY_TREE_FIELD_NUMBER = 8
+  def of(
+    sealedValue: dotty.tools.dotc.semanticdb.TreeMessage.SealedValue
+  ): _root_.dotty.tools.dotc.semanticdb.TreeMessage = _root_.dotty.tools.dotc.semanticdb.TreeMessage(
+    sealedValue
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Tree])
+}
+
+@SerialVersionUID(0L)
+final case class ApplyTree(
+    function: dotty.tools.dotc.semanticdb.Tree = dotty.tools.dotc.semanticdb.ApplyTree._typemapper_function.toCustom(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance),
+    arguments: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Tree] = _root_.scala.Seq.empty
+    )  extends dotty.tools.dotc.semanticdb.Tree.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.ApplyTree._typemapper_function.toBase(function)
+        if (__value != dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      arguments.foreach { __item =>
+        val __value = dotty.tools.dotc.semanticdb.ApplyTree._typemapper_arguments.toBase(__item)
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.ApplyTree._typemapper_function.toBase(function)
+        if (__v != dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      arguments.foreach { __v =>
+        val __m = dotty.tools.dotc.semanticdb.ApplyTree._typemapper_arguments.toBase(__v)
+        _output__.writeTag(2, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def withFunction(__v: dotty.tools.dotc.semanticdb.Tree): ApplyTree = copy(function = __v)
+    def clearArguments = copy(arguments = _root_.scala.Seq.empty)
+    def addArguments(__vs: dotty.tools.dotc.semanticdb.Tree*): ApplyTree = addAllArguments(__vs)
+    def addAllArguments(__vs: Iterable[dotty.tools.dotc.semanticdb.Tree]): ApplyTree = copy(arguments = arguments ++ __vs)
+    def withArguments(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Tree]): ApplyTree = copy(arguments = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.ApplyTree])
+}
+
+object ApplyTree  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ApplyTree] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ApplyTree] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ApplyTree = {
+    var __function: _root_.scala.Option[dotty.tools.dotc.semanticdb.TreeMessage] = _root_.scala.None
+    val __arguments: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Tree] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Tree]
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __function = _root_.scala.Some(__function.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TreeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __arguments += dotty.tools.dotc.semanticdb.ApplyTree._typemapper_arguments.toCustom(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TreeMessage](_input__))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ApplyTree(
+        function = dotty.tools.dotc.semanticdb.ApplyTree._typemapper_function.toCustom(__function.getOrElse(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance)),
+        arguments = __arguments.result()
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ApplyTree(
+    function = dotty.tools.dotc.semanticdb.ApplyTree._typemapper_function.toCustom(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance),
+    arguments = _root_.scala.Seq.empty
+  )
+  final val FUNCTION_FIELD_NUMBER = 1
+  final val ARGUMENTS_FIELD_NUMBER = 2
+  @transient @sharable
+  private[semanticdb] val _typemapper_function: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree]]
+  @transient @sharable
+  private[semanticdb] val _typemapper_arguments: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree]]
+  def of(
+    function: dotty.tools.dotc.semanticdb.Tree,
+    arguments: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Tree]
+  ): _root_.dotty.tools.dotc.semanticdb.ApplyTree = _root_.dotty.tools.dotc.semanticdb.ApplyTree(
+    function,
+    arguments
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ApplyTree])
+}
+
+@SerialVersionUID(0L)
+final case class FunctionTree(
+    parameters: _root_.scala.Seq[dotty.tools.dotc.semanticdb.IdTree] = _root_.scala.Seq.empty,
+    body: dotty.tools.dotc.semanticdb.Tree = dotty.tools.dotc.semanticdb.FunctionTree._typemapper_body.toCustom(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance)
+    )  extends dotty.tools.dotc.semanticdb.Tree.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      parameters.foreach { __item =>
+        val __value = __item
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.FunctionTree._typemapper_body.toBase(body)
+        if (__value != dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      parameters.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      {
+        val __v = dotty.tools.dotc.semanticdb.FunctionTree._typemapper_body.toBase(body)
+        if (__v != dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance) {
+          _output__.writeTag(2, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+    }
+    def clearParameters = copy(parameters = _root_.scala.Seq.empty)
+    def addParameters(__vs: dotty.tools.dotc.semanticdb.IdTree*): FunctionTree = addAllParameters(__vs)
+    def addAllParameters(__vs: Iterable[dotty.tools.dotc.semanticdb.IdTree]): FunctionTree = copy(parameters = parameters ++ __vs)
+    def withParameters(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.IdTree]): FunctionTree = copy(parameters = __v)
+    def withBody(__v: dotty.tools.dotc.semanticdb.Tree): FunctionTree = copy(body = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.FunctionTree])
+}
+
+object FunctionTree  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.FunctionTree] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.FunctionTree] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.FunctionTree = {
+    val __parameters: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.IdTree] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.IdTree]
+    var __body: _root_.scala.Option[dotty.tools.dotc.semanticdb.TreeMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __parameters += LiteParser.readMessage[dotty.tools.dotc.semanticdb.IdTree](_input__)
+        case 18 =>
+          __body = _root_.scala.Some(__body.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TreeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.FunctionTree(
+        parameters = __parameters.result(),
+        body = dotty.tools.dotc.semanticdb.FunctionTree._typemapper_body.toCustom(__body.getOrElse(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.FunctionTree(
+    parameters = _root_.scala.Seq.empty,
+    body = dotty.tools.dotc.semanticdb.FunctionTree._typemapper_body.toCustom(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance)
+  )
+  final val PARAMETERS_FIELD_NUMBER = 1
+  final val BODY_FIELD_NUMBER = 2
+  @transient @sharable
+  private[semanticdb] val _typemapper_body: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree]]
+  def of(
+    parameters: _root_.scala.Seq[dotty.tools.dotc.semanticdb.IdTree],
+    body: dotty.tools.dotc.semanticdb.Tree
+  ): _root_.dotty.tools.dotc.semanticdb.FunctionTree = _root_.dotty.tools.dotc.semanticdb.FunctionTree(
+    parameters,
+    body
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.FunctionTree])
+}
+
+@SerialVersionUID(0L)
+final case class IdTree(
+    symbol: _root_.scala.Predef.String = ""
+    )  extends dotty.tools.dotc.semanticdb.Tree.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = symbol
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = symbol
+        if (!__v.isEmpty) {
+          _output__.writeString(1, __v)
+        }
+      };
+    }
+    def withSymbol(__v: _root_.scala.Predef.String): IdTree = copy(symbol = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.IdTree])
+}
+
+object IdTree  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.IdTree] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.IdTree] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.IdTree = {
+    var __symbol: _root_.scala.Predef.String = ""
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __symbol = _input__.readStringRequireUtf8()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.IdTree(
+        symbol = __symbol
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.IdTree(
+    symbol = ""
+  )
+  final val SYMBOL_FIELD_NUMBER = 1
+  def of(
+    symbol: _root_.scala.Predef.String
+  ): _root_.dotty.tools.dotc.semanticdb.IdTree = _root_.dotty.tools.dotc.semanticdb.IdTree(
+    symbol
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.IdTree])
+}
+
+@SerialVersionUID(0L)
+final case class LiteralTree(
+    constant: dotty.tools.dotc.semanticdb.Constant = dotty.tools.dotc.semanticdb.LiteralTree._typemapper_constant.toCustom(dotty.tools.dotc.semanticdb.ConstantMessage.defaultInstance)
+    )  extends dotty.tools.dotc.semanticdb.Tree.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.LiteralTree._typemapper_constant.toBase(constant)
+        if (__value != dotty.tools.dotc.semanticdb.ConstantMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.LiteralTree._typemapper_constant.toBase(constant)
+        if (__v != dotty.tools.dotc.semanticdb.ConstantMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+    }
+    def withConstant(__v: dotty.tools.dotc.semanticdb.Constant): LiteralTree = copy(constant = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.LiteralTree])
+}
+
+object LiteralTree  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.LiteralTree] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.LiteralTree] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.LiteralTree = {
+    var __constant: _root_.scala.Option[dotty.tools.dotc.semanticdb.ConstantMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __constant = _root_.scala.Some(__constant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ConstantMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.LiteralTree(
+        constant = dotty.tools.dotc.semanticdb.LiteralTree._typemapper_constant.toCustom(__constant.getOrElse(dotty.tools.dotc.semanticdb.ConstantMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.LiteralTree(
+    constant = dotty.tools.dotc.semanticdb.LiteralTree._typemapper_constant.toCustom(dotty.tools.dotc.semanticdb.ConstantMessage.defaultInstance)
+  )
+  final val CONSTANT_FIELD_NUMBER = 1
+  @transient @sharable
+  private[semanticdb] val _typemapper_constant: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.ConstantMessage, dotty.tools.dotc.semanticdb.Constant] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.ConstantMessage, dotty.tools.dotc.semanticdb.Constant]]
+  def of(
+    constant: dotty.tools.dotc.semanticdb.Constant
+  ): _root_.dotty.tools.dotc.semanticdb.LiteralTree = _root_.dotty.tools.dotc.semanticdb.LiteralTree(
+    constant
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.LiteralTree])
+}
+
+@SerialVersionUID(0L)
+final case class MacroExpansionTree(
+    beforeExpansion: dotty.tools.dotc.semanticdb.Tree = dotty.tools.dotc.semanticdb.MacroExpansionTree._typemapper_beforeExpansion.toCustom(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance),
+    tpe: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.MacroExpansionTree._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+    )  extends dotty.tools.dotc.semanticdb.Tree.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.MacroExpansionTree._typemapper_beforeExpansion.toBase(beforeExpansion)
+        if (__value != dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.MacroExpansionTree._typemapper_tpe.toBase(tpe)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.MacroExpansionTree._typemapper_beforeExpansion.toBase(beforeExpansion)
+        if (__v != dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      {
+        val __v = dotty.tools.dotc.semanticdb.MacroExpansionTree._typemapper_tpe.toBase(tpe)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(2, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+    }
+    def withBeforeExpansion(__v: dotty.tools.dotc.semanticdb.Tree): MacroExpansionTree = copy(beforeExpansion = __v)
+    def withTpe(__v: dotty.tools.dotc.semanticdb.Type): MacroExpansionTree = copy(tpe = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.MacroExpansionTree])
+}
+
+object MacroExpansionTree  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.MacroExpansionTree] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.MacroExpansionTree] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.MacroExpansionTree = {
+    var __beforeExpansion: _root_.scala.Option[dotty.tools.dotc.semanticdb.TreeMessage] = _root_.scala.None
+    var __tpe: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __beforeExpansion = _root_.scala.Some(__beforeExpansion.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TreeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __tpe = _root_.scala.Some(__tpe.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.MacroExpansionTree(
+        beforeExpansion = dotty.tools.dotc.semanticdb.MacroExpansionTree._typemapper_beforeExpansion.toCustom(__beforeExpansion.getOrElse(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance)),
+        tpe = dotty.tools.dotc.semanticdb.MacroExpansionTree._typemapper_tpe.toCustom(__tpe.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.MacroExpansionTree(
+    beforeExpansion = dotty.tools.dotc.semanticdb.MacroExpansionTree._typemapper_beforeExpansion.toCustom(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance),
+    tpe = dotty.tools.dotc.semanticdb.MacroExpansionTree._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+  )
+  final val BEFORE_EXPANSION_FIELD_NUMBER = 1
+  final val TPE_FIELD_NUMBER = 2
+  @transient @sharable
+  private[semanticdb] val _typemapper_beforeExpansion: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree]]
+  @transient @sharable
+  private[semanticdb] val _typemapper_tpe: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    beforeExpansion: dotty.tools.dotc.semanticdb.Tree,
+    tpe: dotty.tools.dotc.semanticdb.Type
+  ): _root_.dotty.tools.dotc.semanticdb.MacroExpansionTree = _root_.dotty.tools.dotc.semanticdb.MacroExpansionTree(
+    beforeExpansion,
+    tpe
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.MacroExpansionTree])
+}
+
+@SerialVersionUID(0L)
+final case class OriginalTree(
+    range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range] = _root_.scala.None
+    )  extends dotty.tools.dotc.semanticdb.Tree.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (range.isDefined) {
+        val __value = range.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      range.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def getRange: dotty.tools.dotc.semanticdb.Range = range.getOrElse(dotty.tools.dotc.semanticdb.Range.defaultInstance)
+    def clearRange: OriginalTree = copy(range = _root_.scala.None)
+    def withRange(__v: dotty.tools.dotc.semanticdb.Range): OriginalTree = copy(range = Option(__v))
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.OriginalTree])
+}
+
+object OriginalTree  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.OriginalTree] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.OriginalTree] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.OriginalTree = {
+    var __range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __range = Option(__range.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Range](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.OriginalTree(
+        range = __range
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.OriginalTree(
+    range = _root_.scala.None
+  )
+  final val RANGE_FIELD_NUMBER = 1
+  def of(
+    range: _root_.scala.Option[dotty.tools.dotc.semanticdb.Range]
+  ): _root_.dotty.tools.dotc.semanticdb.OriginalTree = _root_.dotty.tools.dotc.semanticdb.OriginalTree(
+    range
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.OriginalTree])
+}
+
+@SerialVersionUID(0L)
+final case class SelectTree(
+    qualifier: dotty.tools.dotc.semanticdb.Tree = dotty.tools.dotc.semanticdb.SelectTree._typemapper_qualifier.toCustom(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance),
+    id: _root_.scala.Option[dotty.tools.dotc.semanticdb.IdTree] = _root_.scala.None
+    )  extends dotty.tools.dotc.semanticdb.Tree.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.SelectTree._typemapper_qualifier.toBase(qualifier)
+        if (__value != dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      if (id.isDefined) {
+        val __value = id.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.SelectTree._typemapper_qualifier.toBase(qualifier)
+        if (__v != dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      id.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(2, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def withQualifier(__v: dotty.tools.dotc.semanticdb.Tree): SelectTree = copy(qualifier = __v)
+    def getId: dotty.tools.dotc.semanticdb.IdTree = id.getOrElse(dotty.tools.dotc.semanticdb.IdTree.defaultInstance)
+    def clearId: SelectTree = copy(id = _root_.scala.None)
+    def withId(__v: dotty.tools.dotc.semanticdb.IdTree): SelectTree = copy(id = Option(__v))
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.SelectTree])
+}
+
+object SelectTree  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SelectTree] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SelectTree] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.SelectTree = {
+    var __qualifier: _root_.scala.Option[dotty.tools.dotc.semanticdb.TreeMessage] = _root_.scala.None
+    var __id: _root_.scala.Option[dotty.tools.dotc.semanticdb.IdTree] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __qualifier = _root_.scala.Some(__qualifier.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TreeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __id = Option(__id.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.IdTree](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.SelectTree(
+        qualifier = dotty.tools.dotc.semanticdb.SelectTree._typemapper_qualifier.toCustom(__qualifier.getOrElse(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance)),
+        id = __id
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.SelectTree(
+    qualifier = dotty.tools.dotc.semanticdb.SelectTree._typemapper_qualifier.toCustom(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance),
+    id = _root_.scala.None
+  )
+  final val QUALIFIER_FIELD_NUMBER = 1
+  final val ID_FIELD_NUMBER = 2
+  @transient @sharable
+  private[semanticdb] val _typemapper_qualifier: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree]]
+  def of(
+    qualifier: dotty.tools.dotc.semanticdb.Tree,
+    id: _root_.scala.Option[dotty.tools.dotc.semanticdb.IdTree]
+  ): _root_.dotty.tools.dotc.semanticdb.SelectTree = _root_.dotty.tools.dotc.semanticdb.SelectTree(
+    qualifier,
+    id
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SelectTree])
+}
+
+@SerialVersionUID(0L)
+final case class TypeApplyTree(
+    function: dotty.tools.dotc.semanticdb.Tree = dotty.tools.dotc.semanticdb.TypeApplyTree._typemapper_function.toCustom(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance),
+    typeArguments: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type] = _root_.scala.Seq.empty
+    )  extends dotty.tools.dotc.semanticdb.Tree.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.TypeApplyTree._typemapper_function.toBase(function)
+        if (__value != dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      typeArguments.foreach { __item =>
+        val __value = dotty.tools.dotc.semanticdb.TypeApplyTree._typemapper_typeArguments.toBase(__item)
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.TypeApplyTree._typemapper_function.toBase(function)
+        if (__v != dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      typeArguments.foreach { __v =>
+        val __m = dotty.tools.dotc.semanticdb.TypeApplyTree._typemapper_typeArguments.toBase(__v)
+        _output__.writeTag(2, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def withFunction(__v: dotty.tools.dotc.semanticdb.Tree): TypeApplyTree = copy(function = __v)
+    def clearTypeArguments = copy(typeArguments = _root_.scala.Seq.empty)
+    def addTypeArguments(__vs: dotty.tools.dotc.semanticdb.Type*): TypeApplyTree = addAllTypeArguments(__vs)
+    def addAllTypeArguments(__vs: Iterable[dotty.tools.dotc.semanticdb.Type]): TypeApplyTree = copy(typeArguments = typeArguments ++ __vs)
+    def withTypeArguments(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type]): TypeApplyTree = copy(typeArguments = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.TypeApplyTree])
+}
+
+object TypeApplyTree  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TypeApplyTree] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TypeApplyTree] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.TypeApplyTree = {
+    var __function: _root_.scala.Option[dotty.tools.dotc.semanticdb.TreeMessage] = _root_.scala.None
+    val __typeArguments: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Type] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Type]
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __function = _root_.scala.Some(__function.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TreeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __typeArguments += dotty.tools.dotc.semanticdb.TypeApplyTree._typemapper_typeArguments.toCustom(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.TypeApplyTree(
+        function = dotty.tools.dotc.semanticdb.TypeApplyTree._typemapper_function.toCustom(__function.getOrElse(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance)),
+        typeArguments = __typeArguments.result()
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.TypeApplyTree(
+    function = dotty.tools.dotc.semanticdb.TypeApplyTree._typemapper_function.toCustom(dotty.tools.dotc.semanticdb.TreeMessage.defaultInstance),
+    typeArguments = _root_.scala.Seq.empty
+  )
+  final val FUNCTION_FIELD_NUMBER = 1
+  final val TYPE_ARGUMENTS_FIELD_NUMBER = 2
+  @transient @sharable
+  private[semanticdb] val _typemapper_function: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TreeMessage, dotty.tools.dotc.semanticdb.Tree]]
+  @transient @sharable
+  private[semanticdb] val _typemapper_typeArguments: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    function: dotty.tools.dotc.semanticdb.Tree,
+    typeArguments: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type]
+  ): _root_.dotty.tools.dotc.semanticdb.TypeApplyTree = _root_.dotty.tools.dotc.semanticdb.TypeApplyTree(
+    function,
+    typeArguments
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TypeApplyTree])
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Type.scala b/compiler/src/dotty/tools/dotc/semanticdb/Type.scala
new file mode 100644
index 000000000000..17d2d28bcf36
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/Type.scala
@@ -0,0 +1,1781 @@
+// Generated by https://github.com/tanishiking/semanticdb-for-scala3
+// Generated by the Scala Plugin for the Protocol Buffer Compiler.
+// Do not edit!
+//
+// Protofile syntax: PROTO3
+
+package dotty.tools.dotc.semanticdb
+import dotty.tools.dotc.semanticdb.internal._
+import scala.annotation.internal.sharable
+
+sealed trait Type  extends SemanticdbGeneratedSealedOneof  derives CanEqual {
+  type MessageType = dotty.tools.dotc.semanticdb.TypeMessage
+  final def isEmpty = this.isInstanceOf[dotty.tools.dotc.semanticdb.Type.Empty.type]
+  final def isDefined = !isEmpty
+  final def asMessage: dotty.tools.dotc.semanticdb.TypeMessage = dotty.tools.dotc.semanticdb.Type.TypeTypeMapper.toBase(this)
+  final def asNonEmpty: Option[dotty.tools.dotc.semanticdb.Type.NonEmpty] = if (isEmpty) None else Some(this.asInstanceOf[dotty.tools.dotc.semanticdb.Type.NonEmpty])
+}
+
+object Type {
+  case object Empty extends dotty.tools.dotc.semanticdb.Type
+  
+  sealed trait NonEmpty extends dotty.tools.dotc.semanticdb.Type
+  def defaultInstance: dotty.tools.dotc.semanticdb.Type = Empty
+  
+  implicit val TypeTypeMapper: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = new SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] {
+    override def toCustom(__base: dotty.tools.dotc.semanticdb.TypeMessage): dotty.tools.dotc.semanticdb.Type = __base.sealedValue match {
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.TypeRef => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.SingleType => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ThisType => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.SuperType => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ConstantType => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.IntersectionType => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.UnionType => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.WithType => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.StructuralType => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.AnnotatedType => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ExistentialType => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.UniversalType => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ByNameType => __v.value
+      case __v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.RepeatedType => __v.value
+      case dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.Empty => Empty
+    }
+    override def toBase(__custom: dotty.tools.dotc.semanticdb.Type): dotty.tools.dotc.semanticdb.TypeMessage = dotty.tools.dotc.semanticdb.TypeMessage(__custom match {
+      case __v: dotty.tools.dotc.semanticdb.TypeRef => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.TypeRef(__v)
+      case __v: dotty.tools.dotc.semanticdb.SingleType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.SingleType(__v)
+      case __v: dotty.tools.dotc.semanticdb.ThisType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ThisType(__v)
+      case __v: dotty.tools.dotc.semanticdb.SuperType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.SuperType(__v)
+      case __v: dotty.tools.dotc.semanticdb.ConstantType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ConstantType(__v)
+      case __v: dotty.tools.dotc.semanticdb.IntersectionType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.IntersectionType(__v)
+      case __v: dotty.tools.dotc.semanticdb.UnionType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.UnionType(__v)
+      case __v: dotty.tools.dotc.semanticdb.WithType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.WithType(__v)
+      case __v: dotty.tools.dotc.semanticdb.StructuralType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.StructuralType(__v)
+      case __v: dotty.tools.dotc.semanticdb.AnnotatedType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.AnnotatedType(__v)
+      case __v: dotty.tools.dotc.semanticdb.ExistentialType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ExistentialType(__v)
+      case __v: dotty.tools.dotc.semanticdb.UniversalType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.UniversalType(__v)
+      case __v: dotty.tools.dotc.semanticdb.ByNameType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ByNameType(__v)
+      case __v: dotty.tools.dotc.semanticdb.RepeatedType => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.RepeatedType(__v)
+      case Empty => dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.Empty
+    })
+  }
+}
+@SerialVersionUID(0L)
+final case class TypeMessage(
+    sealedValue: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.Empty
+    )  extends SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (sealedValue.typeRef.isDefined) {
+        val __value = sealedValue.typeRef.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.singleType.isDefined) {
+        val __value = sealedValue.singleType.get
+        __size += 2 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.thisType.isDefined) {
+        val __value = sealedValue.thisType.get
+        __size += 2 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.superType.isDefined) {
+        val __value = sealedValue.superType.get
+        __size += 2 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.constantType.isDefined) {
+        val __value = sealedValue.constantType.get
+        __size += 2 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.intersectionType.isDefined) {
+        val __value = sealedValue.intersectionType.get
+        __size += 2 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.unionType.isDefined) {
+        val __value = sealedValue.unionType.get
+        __size += 2 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.withType.isDefined) {
+        val __value = sealedValue.withType.get
+        __size += 2 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.structuralType.isDefined) {
+        val __value = sealedValue.structuralType.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.annotatedType.isDefined) {
+        val __value = sealedValue.annotatedType.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.existentialType.isDefined) {
+        val __value = sealedValue.existentialType.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.universalType.isDefined) {
+        val __value = sealedValue.universalType.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.byNameType.isDefined) {
+        val __value = sealedValue.byNameType.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      if (sealedValue.repeatedType.isDefined) {
+        val __value = sealedValue.repeatedType.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      sealedValue.typeRef.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(2, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.structuralType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(7, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.annotatedType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(8, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.existentialType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(9, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.universalType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(10, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.byNameType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(13, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.repeatedType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(14, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.intersectionType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(17, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.unionType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(18, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.withType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(19, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.singleType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(20, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.thisType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(21, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.superType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(22, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+      sealedValue.constantType.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(23, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def getTypeRef: dotty.tools.dotc.semanticdb.TypeRef = sealedValue.typeRef.getOrElse(dotty.tools.dotc.semanticdb.TypeRef.defaultInstance)
+    def withTypeRef(__v: dotty.tools.dotc.semanticdb.TypeRef): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.TypeRef(__v))
+    def getSingleType: dotty.tools.dotc.semanticdb.SingleType = sealedValue.singleType.getOrElse(dotty.tools.dotc.semanticdb.SingleType.defaultInstance)
+    def withSingleType(__v: dotty.tools.dotc.semanticdb.SingleType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.SingleType(__v))
+    def getThisType: dotty.tools.dotc.semanticdb.ThisType = sealedValue.thisType.getOrElse(dotty.tools.dotc.semanticdb.ThisType.defaultInstance)
+    def withThisType(__v: dotty.tools.dotc.semanticdb.ThisType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ThisType(__v))
+    def getSuperType: dotty.tools.dotc.semanticdb.SuperType = sealedValue.superType.getOrElse(dotty.tools.dotc.semanticdb.SuperType.defaultInstance)
+    def withSuperType(__v: dotty.tools.dotc.semanticdb.SuperType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.SuperType(__v))
+    def getConstantType: dotty.tools.dotc.semanticdb.ConstantType = sealedValue.constantType.getOrElse(dotty.tools.dotc.semanticdb.ConstantType.defaultInstance)
+    def withConstantType(__v: dotty.tools.dotc.semanticdb.ConstantType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ConstantType(__v))
+    def getIntersectionType: dotty.tools.dotc.semanticdb.IntersectionType = sealedValue.intersectionType.getOrElse(dotty.tools.dotc.semanticdb.IntersectionType.defaultInstance)
+    def withIntersectionType(__v: dotty.tools.dotc.semanticdb.IntersectionType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.IntersectionType(__v))
+    def getUnionType: dotty.tools.dotc.semanticdb.UnionType = sealedValue.unionType.getOrElse(dotty.tools.dotc.semanticdb.UnionType.defaultInstance)
+    def withUnionType(__v: dotty.tools.dotc.semanticdb.UnionType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.UnionType(__v))
+    def getWithType: dotty.tools.dotc.semanticdb.WithType = sealedValue.withType.getOrElse(dotty.tools.dotc.semanticdb.WithType.defaultInstance)
+    def withWithType(__v: dotty.tools.dotc.semanticdb.WithType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.WithType(__v))
+    def getStructuralType: dotty.tools.dotc.semanticdb.StructuralType = sealedValue.structuralType.getOrElse(dotty.tools.dotc.semanticdb.StructuralType.defaultInstance)
+    def withStructuralType(__v: dotty.tools.dotc.semanticdb.StructuralType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.StructuralType(__v))
+    def getAnnotatedType: dotty.tools.dotc.semanticdb.AnnotatedType = sealedValue.annotatedType.getOrElse(dotty.tools.dotc.semanticdb.AnnotatedType.defaultInstance)
+    def withAnnotatedType(__v: dotty.tools.dotc.semanticdb.AnnotatedType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.AnnotatedType(__v))
+    def getExistentialType: dotty.tools.dotc.semanticdb.ExistentialType = sealedValue.existentialType.getOrElse(dotty.tools.dotc.semanticdb.ExistentialType.defaultInstance)
+    def withExistentialType(__v: dotty.tools.dotc.semanticdb.ExistentialType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ExistentialType(__v))
+    def getUniversalType: dotty.tools.dotc.semanticdb.UniversalType = sealedValue.universalType.getOrElse(dotty.tools.dotc.semanticdb.UniversalType.defaultInstance)
+    def withUniversalType(__v: dotty.tools.dotc.semanticdb.UniversalType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.UniversalType(__v))
+    def getByNameType: dotty.tools.dotc.semanticdb.ByNameType = sealedValue.byNameType.getOrElse(dotty.tools.dotc.semanticdb.ByNameType.defaultInstance)
+    def withByNameType(__v: dotty.tools.dotc.semanticdb.ByNameType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ByNameType(__v))
+    def getRepeatedType: dotty.tools.dotc.semanticdb.RepeatedType = sealedValue.repeatedType.getOrElse(dotty.tools.dotc.semanticdb.RepeatedType.defaultInstance)
+    def withRepeatedType(__v: dotty.tools.dotc.semanticdb.RepeatedType): TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.RepeatedType(__v))
+    def clearSealedValue: TypeMessage = copy(sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.Empty)
+    def withSealedValue(__v: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue): TypeMessage = copy(sealedValue = __v)
+    
+    
+    
+    
+    def toType: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.Type.TypeTypeMapper.toCustom(this)
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.Type])
+}
+
+object TypeMessage  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TypeMessage] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TypeMessage] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.TypeMessage = {
+    var __sealedValue: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.Empty
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 18 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.TypeRef(__sealedValue.typeRef.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeRef](_input__))(LiteParser.readMessage(_input__, _)))
+        case 162 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.SingleType(__sealedValue.singleType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.SingleType](_input__))(LiteParser.readMessage(_input__, _)))
+        case 170 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ThisType(__sealedValue.thisType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ThisType](_input__))(LiteParser.readMessage(_input__, _)))
+        case 178 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.SuperType(__sealedValue.superType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.SuperType](_input__))(LiteParser.readMessage(_input__, _)))
+        case 186 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ConstantType(__sealedValue.constantType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ConstantType](_input__))(LiteParser.readMessage(_input__, _)))
+        case 138 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.IntersectionType(__sealedValue.intersectionType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.IntersectionType](_input__))(LiteParser.readMessage(_input__, _)))
+        case 146 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.UnionType(__sealedValue.unionType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.UnionType](_input__))(LiteParser.readMessage(_input__, _)))
+        case 154 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.WithType(__sealedValue.withType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.WithType](_input__))(LiteParser.readMessage(_input__, _)))
+        case 58 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.StructuralType(__sealedValue.structuralType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.StructuralType](_input__))(LiteParser.readMessage(_input__, _)))
+        case 66 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.AnnotatedType(__sealedValue.annotatedType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.AnnotatedType](_input__))(LiteParser.readMessage(_input__, _)))
+        case 74 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ExistentialType(__sealedValue.existentialType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ExistentialType](_input__))(LiteParser.readMessage(_input__, _)))
+        case 82 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.UniversalType(__sealedValue.universalType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.UniversalType](_input__))(LiteParser.readMessage(_input__, _)))
+        case 106 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.ByNameType(__sealedValue.byNameType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ByNameType](_input__))(LiteParser.readMessage(_input__, _)))
+        case 114 =>
+          __sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.RepeatedType(__sealedValue.repeatedType.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.RepeatedType](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.TypeMessage(
+        sealedValue = __sealedValue
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.TypeMessage(
+    sealedValue = dotty.tools.dotc.semanticdb.TypeMessage.SealedValue.Empty
+  )
+  sealed trait SealedValue  extends SemanticdbGeneratedOneof  derives CanEqual {
+    def isEmpty: _root_.scala.Boolean = false
+    def isDefined: _root_.scala.Boolean = true
+    def isTypeRef: _root_.scala.Boolean = false
+    def isSingleType: _root_.scala.Boolean = false
+    def isThisType: _root_.scala.Boolean = false
+    def isSuperType: _root_.scala.Boolean = false
+    def isConstantType: _root_.scala.Boolean = false
+    def isIntersectionType: _root_.scala.Boolean = false
+    def isUnionType: _root_.scala.Boolean = false
+    def isWithType: _root_.scala.Boolean = false
+    def isStructuralType: _root_.scala.Boolean = false
+    def isAnnotatedType: _root_.scala.Boolean = false
+    def isExistentialType: _root_.scala.Boolean = false
+    def isUniversalType: _root_.scala.Boolean = false
+    def isByNameType: _root_.scala.Boolean = false
+    def isRepeatedType: _root_.scala.Boolean = false
+    def typeRef: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeRef] = _root_.scala.None
+    def singleType: _root_.scala.Option[dotty.tools.dotc.semanticdb.SingleType] = _root_.scala.None
+    def thisType: _root_.scala.Option[dotty.tools.dotc.semanticdb.ThisType] = _root_.scala.None
+    def superType: _root_.scala.Option[dotty.tools.dotc.semanticdb.SuperType] = _root_.scala.None
+    def constantType: _root_.scala.Option[dotty.tools.dotc.semanticdb.ConstantType] = _root_.scala.None
+    def intersectionType: _root_.scala.Option[dotty.tools.dotc.semanticdb.IntersectionType] = _root_.scala.None
+    def unionType: _root_.scala.Option[dotty.tools.dotc.semanticdb.UnionType] = _root_.scala.None
+    def withType: _root_.scala.Option[dotty.tools.dotc.semanticdb.WithType] = _root_.scala.None
+    def structuralType: _root_.scala.Option[dotty.tools.dotc.semanticdb.StructuralType] = _root_.scala.None
+    def annotatedType: _root_.scala.Option[dotty.tools.dotc.semanticdb.AnnotatedType] = _root_.scala.None
+    def existentialType: _root_.scala.Option[dotty.tools.dotc.semanticdb.ExistentialType] = _root_.scala.None
+    def universalType: _root_.scala.Option[dotty.tools.dotc.semanticdb.UniversalType] = _root_.scala.None
+    def byNameType: _root_.scala.Option[dotty.tools.dotc.semanticdb.ByNameType] = _root_.scala.None
+    def repeatedType: _root_.scala.Option[dotty.tools.dotc.semanticdb.RepeatedType] = _root_.scala.None
+  }
+  object SealedValue {
+    @SerialVersionUID(0L)
+    case object Empty extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue {
+      type ValueType = _root_.scala.Nothing
+      override def isEmpty: _root_.scala.Boolean = true
+      override def isDefined: _root_.scala.Boolean = false
+      override def number: _root_.scala.Int = 0
+      override def value: _root_.scala.Nothing = throw new java.util.NoSuchElementException("Empty.value")
+    }
+  
+    @SerialVersionUID(0L)
+    final case class TypeRef(value: dotty.tools.dotc.semanticdb.TypeRef) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.TypeRef
+      override def isTypeRef: _root_.scala.Boolean = true
+      override def typeRef: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeRef] = Some(value)
+      override def number: _root_.scala.Int = 2
+    }
+    @SerialVersionUID(0L)
+    final case class SingleType(value: dotty.tools.dotc.semanticdb.SingleType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.SingleType
+      override def isSingleType: _root_.scala.Boolean = true
+      override def singleType: _root_.scala.Option[dotty.tools.dotc.semanticdb.SingleType] = Some(value)
+      override def number: _root_.scala.Int = 20
+    }
+    @SerialVersionUID(0L)
+    final case class ThisType(value: dotty.tools.dotc.semanticdb.ThisType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.ThisType
+      override def isThisType: _root_.scala.Boolean = true
+      override def thisType: _root_.scala.Option[dotty.tools.dotc.semanticdb.ThisType] = Some(value)
+      override def number: _root_.scala.Int = 21
+    }
+    @SerialVersionUID(0L)
+    final case class SuperType(value: dotty.tools.dotc.semanticdb.SuperType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.SuperType
+      override def isSuperType: _root_.scala.Boolean = true
+      override def superType: _root_.scala.Option[dotty.tools.dotc.semanticdb.SuperType] = Some(value)
+      override def number: _root_.scala.Int = 22
+    }
+    @SerialVersionUID(0L)
+    final case class ConstantType(value: dotty.tools.dotc.semanticdb.ConstantType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.ConstantType
+      override def isConstantType: _root_.scala.Boolean = true
+      override def constantType: _root_.scala.Option[dotty.tools.dotc.semanticdb.ConstantType] = Some(value)
+      override def number: _root_.scala.Int = 23
+    }
+    @SerialVersionUID(0L)
+    final case class IntersectionType(value: dotty.tools.dotc.semanticdb.IntersectionType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.IntersectionType
+      override def isIntersectionType: _root_.scala.Boolean = true
+      override def intersectionType: _root_.scala.Option[dotty.tools.dotc.semanticdb.IntersectionType] = Some(value)
+      override def number: _root_.scala.Int = 17
+    }
+    @SerialVersionUID(0L)
+    final case class UnionType(value: dotty.tools.dotc.semanticdb.UnionType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.UnionType
+      override def isUnionType: _root_.scala.Boolean = true
+      override def unionType: _root_.scala.Option[dotty.tools.dotc.semanticdb.UnionType] = Some(value)
+      override def number: _root_.scala.Int = 18
+    }
+    @SerialVersionUID(0L)
+    final case class WithType(value: dotty.tools.dotc.semanticdb.WithType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.WithType
+      override def isWithType: _root_.scala.Boolean = true
+      override def withType: _root_.scala.Option[dotty.tools.dotc.semanticdb.WithType] = Some(value)
+      override def number: _root_.scala.Int = 19
+    }
+    @SerialVersionUID(0L)
+    final case class StructuralType(value: dotty.tools.dotc.semanticdb.StructuralType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.StructuralType
+      override def isStructuralType: _root_.scala.Boolean = true
+      override def structuralType: _root_.scala.Option[dotty.tools.dotc.semanticdb.StructuralType] = Some(value)
+      override def number: _root_.scala.Int = 7
+    }
+    @SerialVersionUID(0L)
+    final case class AnnotatedType(value: dotty.tools.dotc.semanticdb.AnnotatedType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.AnnotatedType
+      override def isAnnotatedType: _root_.scala.Boolean = true
+      override def annotatedType: _root_.scala.Option[dotty.tools.dotc.semanticdb.AnnotatedType] = Some(value)
+      override def number: _root_.scala.Int = 8
+    }
+    @SerialVersionUID(0L)
+    final case class ExistentialType(value: dotty.tools.dotc.semanticdb.ExistentialType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.ExistentialType
+      override def isExistentialType: _root_.scala.Boolean = true
+      override def existentialType: _root_.scala.Option[dotty.tools.dotc.semanticdb.ExistentialType] = Some(value)
+      override def number: _root_.scala.Int = 9
+    }
+    @SerialVersionUID(0L)
+    final case class UniversalType(value: dotty.tools.dotc.semanticdb.UniversalType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.UniversalType
+      override def isUniversalType: _root_.scala.Boolean = true
+      override def universalType: _root_.scala.Option[dotty.tools.dotc.semanticdb.UniversalType] = Some(value)
+      override def number: _root_.scala.Int = 10
+    }
+    @SerialVersionUID(0L)
+    final case class ByNameType(value: dotty.tools.dotc.semanticdb.ByNameType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.ByNameType
+      override def isByNameType: _root_.scala.Boolean = true
+      override def byNameType: _root_.scala.Option[dotty.tools.dotc.semanticdb.ByNameType] = Some(value)
+      override def number: _root_.scala.Int = 13
+    }
+    @SerialVersionUID(0L)
+    final case class RepeatedType(value: dotty.tools.dotc.semanticdb.RepeatedType) extends dotty.tools.dotc.semanticdb.TypeMessage.SealedValue  derives CanEqual {
+      type ValueType = dotty.tools.dotc.semanticdb.RepeatedType
+      override def isRepeatedType: _root_.scala.Boolean = true
+      override def repeatedType: _root_.scala.Option[dotty.tools.dotc.semanticdb.RepeatedType] = Some(value)
+      override def number: _root_.scala.Int = 14
+    }
+  }
+  final val TYPE_REF_FIELD_NUMBER = 2
+  final val SINGLE_TYPE_FIELD_NUMBER = 20
+  final val THIS_TYPE_FIELD_NUMBER = 21
+  final val SUPER_TYPE_FIELD_NUMBER = 22
+  final val CONSTANT_TYPE_FIELD_NUMBER = 23
+  final val INTERSECTION_TYPE_FIELD_NUMBER = 17
+  final val UNION_TYPE_FIELD_NUMBER = 18
+  final val WITH_TYPE_FIELD_NUMBER = 19
+  final val STRUCTURAL_TYPE_FIELD_NUMBER = 7
+  final val ANNOTATED_TYPE_FIELD_NUMBER = 8
+  final val EXISTENTIAL_TYPE_FIELD_NUMBER = 9
+  final val UNIVERSAL_TYPE_FIELD_NUMBER = 10
+  final val BY_NAME_TYPE_FIELD_NUMBER = 13
+  final val REPEATED_TYPE_FIELD_NUMBER = 14
+  def of(
+    sealedValue: dotty.tools.dotc.semanticdb.TypeMessage.SealedValue
+  ): _root_.dotty.tools.dotc.semanticdb.TypeMessage = _root_.dotty.tools.dotc.semanticdb.TypeMessage(
+    sealedValue
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.Type])
+}
+
+@SerialVersionUID(0L)
+final case class TypeRef(
+    prefix: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.TypeRef._typemapper_prefix.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    symbol: _root_.scala.Predef.String = "",
+    typeArguments: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type] = _root_.scala.Seq.empty
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.TypeRef._typemapper_prefix.toBase(prefix)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      
+      {
+        val __value = symbol
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(2, __value)
+        }
+      };
+      typeArguments.foreach { __item =>
+        val __value = dotty.tools.dotc.semanticdb.TypeRef._typemapper_typeArguments.toBase(__item)
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.TypeRef._typemapper_prefix.toBase(prefix)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      {
+        val __v = symbol
+        if (!__v.isEmpty) {
+          _output__.writeString(2, __v)
+        }
+      };
+      typeArguments.foreach { __v =>
+        val __m = dotty.tools.dotc.semanticdb.TypeRef._typemapper_typeArguments.toBase(__v)
+        _output__.writeTag(3, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def withPrefix(__v: dotty.tools.dotc.semanticdb.Type): TypeRef = copy(prefix = __v)
+    def withSymbol(__v: _root_.scala.Predef.String): TypeRef = copy(symbol = __v)
+    def clearTypeArguments = copy(typeArguments = _root_.scala.Seq.empty)
+    def addTypeArguments(__vs: dotty.tools.dotc.semanticdb.Type*): TypeRef = addAllTypeArguments(__vs)
+    def addAllTypeArguments(__vs: Iterable[dotty.tools.dotc.semanticdb.Type]): TypeRef = copy(typeArguments = typeArguments ++ __vs)
+    def withTypeArguments(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type]): TypeRef = copy(typeArguments = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.TypeRef])
+}
+
+object TypeRef  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TypeRef] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TypeRef] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.TypeRef = {
+    var __prefix: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var __symbol: _root_.scala.Predef.String = ""
+    val __typeArguments: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Type] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Type]
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __prefix = _root_.scala.Some(__prefix.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __symbol = _input__.readStringRequireUtf8()
+        case 26 =>
+          __typeArguments += dotty.tools.dotc.semanticdb.TypeRef._typemapper_typeArguments.toCustom(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.TypeRef(
+        prefix = dotty.tools.dotc.semanticdb.TypeRef._typemapper_prefix.toCustom(__prefix.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)),
+        symbol = __symbol,
+        typeArguments = __typeArguments.result()
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.TypeRef(
+    prefix = dotty.tools.dotc.semanticdb.TypeRef._typemapper_prefix.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    symbol = "",
+    typeArguments = _root_.scala.Seq.empty
+  )
+  final val PREFIX_FIELD_NUMBER = 1
+  final val SYMBOL_FIELD_NUMBER = 2
+  final val TYPE_ARGUMENTS_FIELD_NUMBER = 3
+  @transient @sharable
+  private[semanticdb] val _typemapper_prefix: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  @transient @sharable
+  private[semanticdb] val _typemapper_typeArguments: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    prefix: dotty.tools.dotc.semanticdb.Type,
+    symbol: _root_.scala.Predef.String,
+    typeArguments: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type]
+  ): _root_.dotty.tools.dotc.semanticdb.TypeRef = _root_.dotty.tools.dotc.semanticdb.TypeRef(
+    prefix,
+    symbol,
+    typeArguments
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.TypeRef])
+}
+
+@SerialVersionUID(0L)
+final case class SingleType(
+    prefix: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.SingleType._typemapper_prefix.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    symbol: _root_.scala.Predef.String = ""
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.SingleType._typemapper_prefix.toBase(prefix)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      
+      {
+        val __value = symbol
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(2, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.SingleType._typemapper_prefix.toBase(prefix)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      {
+        val __v = symbol
+        if (!__v.isEmpty) {
+          _output__.writeString(2, __v)
+        }
+      };
+    }
+    def withPrefix(__v: dotty.tools.dotc.semanticdb.Type): SingleType = copy(prefix = __v)
+    def withSymbol(__v: _root_.scala.Predef.String): SingleType = copy(symbol = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.SingleType])
+}
+
+object SingleType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SingleType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SingleType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.SingleType = {
+    var __prefix: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var __symbol: _root_.scala.Predef.String = ""
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __prefix = _root_.scala.Some(__prefix.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __symbol = _input__.readStringRequireUtf8()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.SingleType(
+        prefix = dotty.tools.dotc.semanticdb.SingleType._typemapper_prefix.toCustom(__prefix.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)),
+        symbol = __symbol
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.SingleType(
+    prefix = dotty.tools.dotc.semanticdb.SingleType._typemapper_prefix.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    symbol = ""
+  )
+  final val PREFIX_FIELD_NUMBER = 1
+  final val SYMBOL_FIELD_NUMBER = 2
+  @transient @sharable
+  private[semanticdb] val _typemapper_prefix: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    prefix: dotty.tools.dotc.semanticdb.Type,
+    symbol: _root_.scala.Predef.String
+  ): _root_.dotty.tools.dotc.semanticdb.SingleType = _root_.dotty.tools.dotc.semanticdb.SingleType(
+    prefix,
+    symbol
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SingleType])
+}
+
+@SerialVersionUID(0L)
+final case class ThisType(
+    symbol: _root_.scala.Predef.String = ""
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = symbol
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(1, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = symbol
+        if (!__v.isEmpty) {
+          _output__.writeString(1, __v)
+        }
+      };
+    }
+    def withSymbol(__v: _root_.scala.Predef.String): ThisType = copy(symbol = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.ThisType])
+}
+
+object ThisType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ThisType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ThisType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ThisType = {
+    var __symbol: _root_.scala.Predef.String = ""
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __symbol = _input__.readStringRequireUtf8()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ThisType(
+        symbol = __symbol
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ThisType(
+    symbol = ""
+  )
+  final val SYMBOL_FIELD_NUMBER = 1
+  def of(
+    symbol: _root_.scala.Predef.String
+  ): _root_.dotty.tools.dotc.semanticdb.ThisType = _root_.dotty.tools.dotc.semanticdb.ThisType(
+    symbol
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ThisType])
+}
+
+@SerialVersionUID(0L)
+final case class SuperType(
+    prefix: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.SuperType._typemapper_prefix.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    symbol: _root_.scala.Predef.String = ""
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.SuperType._typemapper_prefix.toBase(prefix)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      
+      {
+        val __value = symbol
+        if (!__value.isEmpty) {
+          __size += SemanticdbOutputStream.computeStringSize(2, __value)
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.SuperType._typemapper_prefix.toBase(prefix)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      {
+        val __v = symbol
+        if (!__v.isEmpty) {
+          _output__.writeString(2, __v)
+        }
+      };
+    }
+    def withPrefix(__v: dotty.tools.dotc.semanticdb.Type): SuperType = copy(prefix = __v)
+    def withSymbol(__v: _root_.scala.Predef.String): SuperType = copy(symbol = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.SuperType])
+}
+
+object SuperType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SuperType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SuperType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.SuperType = {
+    var __prefix: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var __symbol: _root_.scala.Predef.String = ""
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __prefix = _root_.scala.Some(__prefix.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __symbol = _input__.readStringRequireUtf8()
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.SuperType(
+        prefix = dotty.tools.dotc.semanticdb.SuperType._typemapper_prefix.toCustom(__prefix.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)),
+        symbol = __symbol
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.SuperType(
+    prefix = dotty.tools.dotc.semanticdb.SuperType._typemapper_prefix.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    symbol = ""
+  )
+  final val PREFIX_FIELD_NUMBER = 1
+  final val SYMBOL_FIELD_NUMBER = 2
+  @transient @sharable
+  private[semanticdb] val _typemapper_prefix: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    prefix: dotty.tools.dotc.semanticdb.Type,
+    symbol: _root_.scala.Predef.String
+  ): _root_.dotty.tools.dotc.semanticdb.SuperType = _root_.dotty.tools.dotc.semanticdb.SuperType(
+    prefix,
+    symbol
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.SuperType])
+}
+
+@SerialVersionUID(0L)
+final case class ConstantType(
+    constant: dotty.tools.dotc.semanticdb.Constant = dotty.tools.dotc.semanticdb.ConstantType._typemapper_constant.toCustom(dotty.tools.dotc.semanticdb.ConstantMessage.defaultInstance)
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.ConstantType._typemapper_constant.toBase(constant)
+        if (__value != dotty.tools.dotc.semanticdb.ConstantMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.ConstantType._typemapper_constant.toBase(constant)
+        if (__v != dotty.tools.dotc.semanticdb.ConstantMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+    }
+    def withConstant(__v: dotty.tools.dotc.semanticdb.Constant): ConstantType = copy(constant = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.ConstantType])
+}
+
+object ConstantType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ConstantType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ConstantType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ConstantType = {
+    var __constant: _root_.scala.Option[dotty.tools.dotc.semanticdb.ConstantMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __constant = _root_.scala.Some(__constant.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.ConstantMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ConstantType(
+        constant = dotty.tools.dotc.semanticdb.ConstantType._typemapper_constant.toCustom(__constant.getOrElse(dotty.tools.dotc.semanticdb.ConstantMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ConstantType(
+    constant = dotty.tools.dotc.semanticdb.ConstantType._typemapper_constant.toCustom(dotty.tools.dotc.semanticdb.ConstantMessage.defaultInstance)
+  )
+  final val CONSTANT_FIELD_NUMBER = 1
+  @transient @sharable
+  private[semanticdb] val _typemapper_constant: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.ConstantMessage, dotty.tools.dotc.semanticdb.Constant] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.ConstantMessage, dotty.tools.dotc.semanticdb.Constant]]
+  def of(
+    constant: dotty.tools.dotc.semanticdb.Constant
+  ): _root_.dotty.tools.dotc.semanticdb.ConstantType = _root_.dotty.tools.dotc.semanticdb.ConstantType(
+    constant
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ConstantType])
+}
+
+@SerialVersionUID(0L)
+final case class IntersectionType(
+    types: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type] = _root_.scala.Seq.empty
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      types.foreach { __item =>
+        val __value = dotty.tools.dotc.semanticdb.IntersectionType._typemapper_types.toBase(__item)
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      types.foreach { __v =>
+        val __m = dotty.tools.dotc.semanticdb.IntersectionType._typemapper_types.toBase(__v)
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def clearTypes = copy(types = _root_.scala.Seq.empty)
+    def addTypes(__vs: dotty.tools.dotc.semanticdb.Type*): IntersectionType = addAllTypes(__vs)
+    def addAllTypes(__vs: Iterable[dotty.tools.dotc.semanticdb.Type]): IntersectionType = copy(types = types ++ __vs)
+    def withTypes(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type]): IntersectionType = copy(types = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.IntersectionType])
+}
+
+object IntersectionType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.IntersectionType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.IntersectionType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.IntersectionType = {
+    val __types: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Type] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Type]
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __types += dotty.tools.dotc.semanticdb.IntersectionType._typemapper_types.toCustom(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.IntersectionType(
+        types = __types.result()
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.IntersectionType(
+    types = _root_.scala.Seq.empty
+  )
+  final val TYPES_FIELD_NUMBER = 1
+  @transient @sharable
+  private[semanticdb] val _typemapper_types: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    types: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type]
+  ): _root_.dotty.tools.dotc.semanticdb.IntersectionType = _root_.dotty.tools.dotc.semanticdb.IntersectionType(
+    types
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.IntersectionType])
+}
+
+@SerialVersionUID(0L)
+final case class UnionType(
+    types: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type] = _root_.scala.Seq.empty
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      types.foreach { __item =>
+        val __value = dotty.tools.dotc.semanticdb.UnionType._typemapper_types.toBase(__item)
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      types.foreach { __v =>
+        val __m = dotty.tools.dotc.semanticdb.UnionType._typemapper_types.toBase(__v)
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def clearTypes = copy(types = _root_.scala.Seq.empty)
+    def addTypes(__vs: dotty.tools.dotc.semanticdb.Type*): UnionType = addAllTypes(__vs)
+    def addAllTypes(__vs: Iterable[dotty.tools.dotc.semanticdb.Type]): UnionType = copy(types = types ++ __vs)
+    def withTypes(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type]): UnionType = copy(types = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.UnionType])
+}
+
+object UnionType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.UnionType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.UnionType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.UnionType = {
+    val __types: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Type] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Type]
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __types += dotty.tools.dotc.semanticdb.UnionType._typemapper_types.toCustom(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.UnionType(
+        types = __types.result()
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.UnionType(
+    types = _root_.scala.Seq.empty
+  )
+  final val TYPES_FIELD_NUMBER = 1
+  @transient @sharable
+  private[semanticdb] val _typemapper_types: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    types: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type]
+  ): _root_.dotty.tools.dotc.semanticdb.UnionType = _root_.dotty.tools.dotc.semanticdb.UnionType(
+    types
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.UnionType])
+}
+
+@SerialVersionUID(0L)
+final case class WithType(
+    types: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type] = _root_.scala.Seq.empty
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      types.foreach { __item =>
+        val __value = dotty.tools.dotc.semanticdb.WithType._typemapper_types.toBase(__item)
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      types.foreach { __v =>
+        val __m = dotty.tools.dotc.semanticdb.WithType._typemapper_types.toBase(__v)
+        _output__.writeTag(1, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def clearTypes = copy(types = _root_.scala.Seq.empty)
+    def addTypes(__vs: dotty.tools.dotc.semanticdb.Type*): WithType = addAllTypes(__vs)
+    def addAllTypes(__vs: Iterable[dotty.tools.dotc.semanticdb.Type]): WithType = copy(types = types ++ __vs)
+    def withTypes(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type]): WithType = copy(types = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.WithType])
+}
+
+object WithType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.WithType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.WithType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.WithType = {
+    val __types: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Type] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Type]
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __types += dotty.tools.dotc.semanticdb.WithType._typemapper_types.toCustom(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.WithType(
+        types = __types.result()
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.WithType(
+    types = _root_.scala.Seq.empty
+  )
+  final val TYPES_FIELD_NUMBER = 1
+  @transient @sharable
+  private[semanticdb] val _typemapper_types: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    types: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Type]
+  ): _root_.dotty.tools.dotc.semanticdb.WithType = _root_.dotty.tools.dotc.semanticdb.WithType(
+    types
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.WithType])
+}
+
+@SerialVersionUID(0L)
+final case class StructuralType(
+    tpe: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.StructuralType._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    declarations: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.StructuralType._typemapper_tpe.toBase(tpe)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      if (declarations.isDefined) {
+        val __value = declarations.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.StructuralType._typemapper_tpe.toBase(tpe)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(4, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      declarations.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(5, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def withTpe(__v: dotty.tools.dotc.semanticdb.Type): StructuralType = copy(tpe = __v)
+    def getDeclarations: dotty.tools.dotc.semanticdb.Scope = declarations.getOrElse(dotty.tools.dotc.semanticdb.Scope.defaultInstance)
+    def clearDeclarations: StructuralType = copy(declarations = _root_.scala.None)
+    def withDeclarations(__v: dotty.tools.dotc.semanticdb.Scope): StructuralType = copy(declarations = Option(__v))
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.StructuralType])
+}
+
+object StructuralType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.StructuralType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.StructuralType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.StructuralType = {
+    var __tpe: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var __declarations: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 34 =>
+          __tpe = _root_.scala.Some(__tpe.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 42 =>
+          __declarations = Option(__declarations.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Scope](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.StructuralType(
+        tpe = dotty.tools.dotc.semanticdb.StructuralType._typemapper_tpe.toCustom(__tpe.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)),
+        declarations = __declarations
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.StructuralType(
+    tpe = dotty.tools.dotc.semanticdb.StructuralType._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    declarations = _root_.scala.None
+  )
+  final val TPE_FIELD_NUMBER = 4
+  final val DECLARATIONS_FIELD_NUMBER = 5
+  @transient @sharable
+  private[semanticdb] val _typemapper_tpe: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    tpe: dotty.tools.dotc.semanticdb.Type,
+    declarations: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope]
+  ): _root_.dotty.tools.dotc.semanticdb.StructuralType = _root_.dotty.tools.dotc.semanticdb.StructuralType(
+    tpe,
+    declarations
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.StructuralType])
+}
+
+@SerialVersionUID(0L)
+final case class AnnotatedType(
+    annotations: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Annotation] = _root_.scala.Seq.empty,
+    tpe: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.AnnotatedType._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      annotations.foreach { __item =>
+        val __value = __item
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      }
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.AnnotatedType._typemapper_tpe.toBase(tpe)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.AnnotatedType._typemapper_tpe.toBase(tpe)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      annotations.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(3, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def clearAnnotations = copy(annotations = _root_.scala.Seq.empty)
+    def addAnnotations(__vs: dotty.tools.dotc.semanticdb.Annotation*): AnnotatedType = addAllAnnotations(__vs)
+    def addAllAnnotations(__vs: Iterable[dotty.tools.dotc.semanticdb.Annotation]): AnnotatedType = copy(annotations = annotations ++ __vs)
+    def withAnnotations(__v: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Annotation]): AnnotatedType = copy(annotations = __v)
+    def withTpe(__v: dotty.tools.dotc.semanticdb.Type): AnnotatedType = copy(tpe = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.AnnotatedType])
+}
+
+object AnnotatedType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.AnnotatedType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.AnnotatedType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.AnnotatedType = {
+    val __annotations: _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Annotation] = new _root_.scala.collection.immutable.VectorBuilder[dotty.tools.dotc.semanticdb.Annotation]
+    var __tpe: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 26 =>
+          __annotations += LiteParser.readMessage[dotty.tools.dotc.semanticdb.Annotation](_input__)
+        case 10 =>
+          __tpe = _root_.scala.Some(__tpe.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.AnnotatedType(
+        annotations = __annotations.result(),
+        tpe = dotty.tools.dotc.semanticdb.AnnotatedType._typemapper_tpe.toCustom(__tpe.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.AnnotatedType(
+    annotations = _root_.scala.Seq.empty,
+    tpe = dotty.tools.dotc.semanticdb.AnnotatedType._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+  )
+  final val ANNOTATIONS_FIELD_NUMBER = 3
+  final val TPE_FIELD_NUMBER = 1
+  @transient @sharable
+  private[semanticdb] val _typemapper_tpe: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    annotations: _root_.scala.Seq[dotty.tools.dotc.semanticdb.Annotation],
+    tpe: dotty.tools.dotc.semanticdb.Type
+  ): _root_.dotty.tools.dotc.semanticdb.AnnotatedType = _root_.dotty.tools.dotc.semanticdb.AnnotatedType(
+    annotations,
+    tpe
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.AnnotatedType])
+}
+
+@SerialVersionUID(0L)
+final case class ExistentialType(
+    tpe: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.ExistentialType._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    declarations: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.ExistentialType._typemapper_tpe.toBase(tpe)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      if (declarations.isDefined) {
+        val __value = declarations.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.ExistentialType._typemapper_tpe.toBase(tpe)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      declarations.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(3, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def withTpe(__v: dotty.tools.dotc.semanticdb.Type): ExistentialType = copy(tpe = __v)
+    def getDeclarations: dotty.tools.dotc.semanticdb.Scope = declarations.getOrElse(dotty.tools.dotc.semanticdb.Scope.defaultInstance)
+    def clearDeclarations: ExistentialType = copy(declarations = _root_.scala.None)
+    def withDeclarations(__v: dotty.tools.dotc.semanticdb.Scope): ExistentialType = copy(declarations = Option(__v))
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.ExistentialType])
+}
+
+object ExistentialType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ExistentialType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ExistentialType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ExistentialType = {
+    var __tpe: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var __declarations: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __tpe = _root_.scala.Some(__tpe.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case 26 =>
+          __declarations = Option(__declarations.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Scope](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ExistentialType(
+        tpe = dotty.tools.dotc.semanticdb.ExistentialType._typemapper_tpe.toCustom(__tpe.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)),
+        declarations = __declarations
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ExistentialType(
+    tpe = dotty.tools.dotc.semanticdb.ExistentialType._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance),
+    declarations = _root_.scala.None
+  )
+  final val TPE_FIELD_NUMBER = 1
+  final val DECLARATIONS_FIELD_NUMBER = 3
+  @transient @sharable
+  private[semanticdb] val _typemapper_tpe: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    tpe: dotty.tools.dotc.semanticdb.Type,
+    declarations: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope]
+  ): _root_.dotty.tools.dotc.semanticdb.ExistentialType = _root_.dotty.tools.dotc.semanticdb.ExistentialType(
+    tpe,
+    declarations
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ExistentialType])
+}
+
+@SerialVersionUID(0L)
+final case class UniversalType(
+    typeParameters: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None,
+    tpe: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.UniversalType._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      if (typeParameters.isDefined) {
+        val __value = typeParameters.get
+        __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+      };
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.UniversalType._typemapper_tpe.toBase(tpe)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.UniversalType._typemapper_tpe.toBase(tpe)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(2, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+      typeParameters.foreach { __v =>
+        val __m = __v
+        _output__.writeTag(3, 2)
+        _output__.writeUInt32NoTag(__m.serializedSize)
+        __m.writeTo(_output__)
+      };
+    }
+    def getTypeParameters: dotty.tools.dotc.semanticdb.Scope = typeParameters.getOrElse(dotty.tools.dotc.semanticdb.Scope.defaultInstance)
+    def clearTypeParameters: UniversalType = copy(typeParameters = _root_.scala.None)
+    def withTypeParameters(__v: dotty.tools.dotc.semanticdb.Scope): UniversalType = copy(typeParameters = Option(__v))
+    def withTpe(__v: dotty.tools.dotc.semanticdb.Type): UniversalType = copy(tpe = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.UniversalType])
+}
+
+object UniversalType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.UniversalType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.UniversalType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.UniversalType = {
+    var __typeParameters: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope] = _root_.scala.None
+    var __tpe: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 26 =>
+          __typeParameters = Option(__typeParameters.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.Scope](_input__))(LiteParser.readMessage(_input__, _)))
+        case 18 =>
+          __tpe = _root_.scala.Some(__tpe.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.UniversalType(
+        typeParameters = __typeParameters,
+        tpe = dotty.tools.dotc.semanticdb.UniversalType._typemapper_tpe.toCustom(__tpe.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.UniversalType(
+    typeParameters = _root_.scala.None,
+    tpe = dotty.tools.dotc.semanticdb.UniversalType._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+  )
+  final val TYPE_PARAMETERS_FIELD_NUMBER = 3
+  final val TPE_FIELD_NUMBER = 2
+  @transient @sharable
+  private[semanticdb] val _typemapper_tpe: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    typeParameters: _root_.scala.Option[dotty.tools.dotc.semanticdb.Scope],
+    tpe: dotty.tools.dotc.semanticdb.Type
+  ): _root_.dotty.tools.dotc.semanticdb.UniversalType = _root_.dotty.tools.dotc.semanticdb.UniversalType(
+    typeParameters,
+    tpe
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.UniversalType])
+}
+
+@SerialVersionUID(0L)
+final case class ByNameType(
+    tpe: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.ByNameType._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.ByNameType._typemapper_tpe.toBase(tpe)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.ByNameType._typemapper_tpe.toBase(tpe)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+    }
+    def withTpe(__v: dotty.tools.dotc.semanticdb.Type): ByNameType = copy(tpe = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.ByNameType])
+}
+
+object ByNameType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ByNameType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ByNameType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.ByNameType = {
+    var __tpe: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __tpe = _root_.scala.Some(__tpe.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.ByNameType(
+        tpe = dotty.tools.dotc.semanticdb.ByNameType._typemapper_tpe.toCustom(__tpe.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.ByNameType(
+    tpe = dotty.tools.dotc.semanticdb.ByNameType._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+  )
+  final val TPE_FIELD_NUMBER = 1
+  @transient @sharable
+  private[semanticdb] val _typemapper_tpe: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    tpe: dotty.tools.dotc.semanticdb.Type
+  ): _root_.dotty.tools.dotc.semanticdb.ByNameType = _root_.dotty.tools.dotc.semanticdb.ByNameType(
+    tpe
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.ByNameType])
+}
+
+@SerialVersionUID(0L)
+final case class RepeatedType(
+    tpe: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.RepeatedType._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+    )  extends dotty.tools.dotc.semanticdb.Type.NonEmpty with SemanticdbGeneratedMessage  derives CanEqual {
+    @transient @sharable
+    private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
+    private[this] def __computeSerializedValue(): _root_.scala.Int = {
+      var __size = 0
+      
+      {
+        val __value = dotty.tools.dotc.semanticdb.RepeatedType._typemapper_tpe.toBase(tpe)
+        if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          __size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
+        }
+      };
+      __size
+    }
+    override def serializedSize: _root_.scala.Int = {
+      var read = __serializedSizeCachedValue
+      if (read == 0) {
+        read = __computeSerializedValue()
+        __serializedSizeCachedValue = read
+      }
+      read
+    }
+    def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
+      {
+        val __v = dotty.tools.dotc.semanticdb.RepeatedType._typemapper_tpe.toBase(tpe)
+        if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
+          _output__.writeTag(1, 2)
+          _output__.writeUInt32NoTag(__v.serializedSize)
+          __v.writeTo(_output__)
+        }
+      };
+    }
+    def withTpe(__v: dotty.tools.dotc.semanticdb.Type): RepeatedType = copy(tpe = __v)
+    
+    
+    
+    
+    // @@protoc_insertion_point(GeneratedMessage[dotty.tools.dotc.semanticdb.RepeatedType])
+}
+
+object RepeatedType  extends SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.RepeatedType] {
+  implicit def messageCompanion: SemanticdbGeneratedMessageCompanion[dotty.tools.dotc.semanticdb.RepeatedType] = this
+  def parseFrom(`_input__`: SemanticdbInputStream): dotty.tools.dotc.semanticdb.RepeatedType = {
+    var __tpe: _root_.scala.Option[dotty.tools.dotc.semanticdb.TypeMessage] = _root_.scala.None
+    var _done__ = false
+    while (!_done__) {
+      val _tag__ = _input__.readTag()
+      _tag__ match {
+        case 0 => _done__ = true
+        case 10 =>
+          __tpe = _root_.scala.Some(__tpe.fold(LiteParser.readMessage[dotty.tools.dotc.semanticdb.TypeMessage](_input__))(LiteParser.readMessage(_input__, _)))
+        case tag => _input__.skipField(tag)
+      }
+    }
+    dotty.tools.dotc.semanticdb.RepeatedType(
+        tpe = dotty.tools.dotc.semanticdb.RepeatedType._typemapper_tpe.toCustom(__tpe.getOrElse(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance))
+    )
+  }
+  
+  
+  
+  
+  
+  
+  lazy val defaultInstance = dotty.tools.dotc.semanticdb.RepeatedType(
+    tpe = dotty.tools.dotc.semanticdb.RepeatedType._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
+  )
+  final val TPE_FIELD_NUMBER = 1
+  @transient @sharable
+  private[semanticdb] val _typemapper_tpe: SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type] = implicitly[SemanticdbTypeMapper[dotty.tools.dotc.semanticdb.TypeMessage, dotty.tools.dotc.semanticdb.Type]]
+  def of(
+    tpe: dotty.tools.dotc.semanticdb.Type
+  ): _root_.dotty.tools.dotc.semanticdb.RepeatedType = _root_.dotty.tools.dotc.semanticdb.RepeatedType(
+    tpe
+  )
+  // @@protoc_insertion_point(GeneratedMessageCompanion[dotty.tools.dotc.semanticdb.RepeatedType])
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala b/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala
new file mode 100644
index 000000000000..963a153388a3
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala
@@ -0,0 +1,444 @@
+package dotty.tools
+package dotc
+package semanticdb
+
+import core.Symbols._
+import core.Contexts.Context
+import core.Types._
+import core.Annotations.Annotation
+import core.Flags
+import core.Names.Name
+import core.StdNames.tpnme
+import ast.tpd._
+import scala.util.chaining.scalaUtilChainingOps
+
+import collection.mutable
+
+import dotty.tools.dotc.{semanticdb => s}
+import Scala3.{FakeSymbol, SemanticSymbol, WildcardTypeSymbol, TypeParamRefSymbol, TermParamRefSymbol, RefinementSymbol}
+
+class TypeOps:
+  import SymbolScopeOps._
+  import Scala3.given
+  private val paramRefSymtab = mutable.Map[(LambdaType, Name), Symbol]()
+  private val refinementSymtab = mutable.Map[(RefinedType, Name), Symbol]()
+
+  // save generated fake symbols so we can insert them into symbols section of SemanticDB
+  val fakeSymbols = mutable.Set[FakeSymbol]()
+  given typeOps: TypeOps = this
+
+  extension [T <: LambdaType | RefinedType](symtab: mutable.Map[(T, Name), Symbol])
+    private def lookup(
+      binder: T,
+      name: Name,
+    )(using Context): Option[Symbol] =
+      symtab.get((binder, name))
+
+  extension [T <: LambdaType](symtab: mutable.Map[(T, Name), Symbol])
+    private def lookupOrErr(
+      binder: T,
+      name: Name,
+      parent: Symbol,
+    )(using Context): Option[Symbol] =
+      // In case refinement or type param cannot be accessed from traverser and
+      // no symbols are registered to the symbol table, fall back to Type.member
+      symtab.lookup(binder, name) match
+        case found @ Some(_) => found
+        case None =>
+          val member = binder.member(name).symbol
+          if !member.exists then
+            symbolNotFound(binder, name, parent)
+            None
+          else
+            Some(member)
+
+  private def symbolNotFound(binder: Type, name: Name, parent: Symbol)(using ctx: Context): Unit =
+    warn(s"Ignoring ${name} of symbol ${parent}, type ${binder}")
+
+  private def warn(msg: String)(using ctx: Context): Unit =
+    report.warning(
+      s"Internal error in extracting SemanticDB while compiling ${ctx.compilationUnit.source}: ${msg}"
+    )
+
+  private def registerFakeSymbol(sym: FakeSymbol)(using Context, SemanticSymbolBuilder): Unit =
+    fakeSymbols.add(sym)
+
+  extension (tpe: Type)
+    def toSemanticSig(using LinkMode, Context, SemanticSymbolBuilder)(sym: Symbol): s.Signature =
+      def enterParamRef(tpe: Type): Unit =
+        tpe match {
+          case lam: LambdaType =>
+            // Find the "actual" binder type for nested LambdaType
+            // For example, `def foo(x: T)(y: T): T` and for `<y>.owner.info` would be like
+            // `MethodType(...<x>, resType = MethodType(...<y>, resType = <T>))`.
+            // (Let's say the outer `MethodType` "outer", and `MethodType` who is
+            // `resType` of outer "inner")
+            //
+            // We try to find the "actual" binder of <y>: `inner`,
+            // and register them to the symbol table with `(<y>, inner) -> <y>`
+            // instead of `("y", outer) -> <y>`
+            if lam.paramNames.contains(sym.name) then
+              paramRefSymtab((lam, sym.name)) = sym
+            else
+              enterParamRef(lam.resType)
+
+          // for class constructor
+          // class C[T] { ... }
+          case cls: ClassInfo if sym.info.isInstanceOf[LambdaType] =>
+            val lam = sym.info.asInstanceOf[LambdaType]
+            cls.cls.typeParams.foreach { param =>
+              paramRefSymtab((lam, param.name)) = param
+            }
+
+          // type X[T] = ...
+          case tb: TypeBounds =>
+            enterParamRef(tb.lo)
+            enterParamRef(tb.hi)
+
+          case _ => ()
+        }
+
+      def enterRefined(tpe: Type): Unit =
+        tpe match {
+          case refined: RefinedType =>
+            val key = (refined, sym.name)
+            refinementSymtab(key) = sym
+
+          case rec: RecType =>
+            enterRefined(rec.parent)
+
+          // Register symbol for opaque type,
+          // opaque type alias will be stored into the refinement of
+          // the self type of the enclosing class.
+          // Key: the tuple of
+          //   - self-type of enclosing class
+          //   - name of the opaque type
+          // Value: the symbol of the opaque type
+          // See: SymDenotation.opaqueToBounds
+          case cls: ClassInfo if sym.is(Flags.Opaque) =>
+            cls.classSymbol.asClass.givenSelfType match
+              case rt: RefinedType =>
+                refinementSymtab((rt, sym.name)) = sym
+              case _ => ()
+
+          case cls: ClassInfo if (cls.cls.name == tpnme.REFINE_CLASS) =>
+            enterRefined(sym.owner.owner.info)
+
+          // type x = Person { refinement }
+          case tb: TypeBounds =>
+            // tb = TypeBounds(
+            //   lo = RefinedType(...)
+            //   hi = RefinedType(...)
+            // )
+            enterRefined(tb.lo)
+            enterRefined(tb.hi)
+
+          // def s(x: Int): { refinement } = ...
+          case expr: ExprType =>
+            enterRefined(expr.resType)
+          case m: LambdaType =>
+            enterRefined(m.resType)
+          case _ => ()
+        }
+      if sym.exists && sym.owner.exists then
+        enterParamRef(sym.owner.info)
+        enterRefined(sym.owner.info)
+
+      def loop(tpe: Type): s.Signature = tpe match {
+        case mp: MethodOrPoly =>
+          def flatten(
+            t: Type,
+            paramss: List[List[SemanticSymbol]],
+            tparams: List[SemanticSymbol]
+          ): (Type, List[List[SemanticSymbol]], List[SemanticSymbol]) = t match {
+            case mt: MethodType =>
+              val syms: List[SemanticSymbol] = mt.paramNames.zip(mt.paramInfos).map { (name, info) =>
+                paramRefSymtab.lookup(mt, name).getOrElse {
+                  TermParamRefSymbol(sym, name, info).tap(registerFakeSymbol)
+                }
+              }
+              flatten(mt.resType, paramss :+ syms, tparams)
+            case pt: PolyType =>
+              val syms: List[SemanticSymbol] = pt.paramNames.zip(pt.paramInfos).map { (name, info) =>
+                paramRefSymtab.lookup(pt, name).getOrElse {
+                  TypeParamRefSymbol(sym, name, info).tap(registerFakeSymbol)
+                }
+              }
+              flatten(pt.resType, paramss, tparams ++ syms)
+            case other =>
+              (other, paramss, tparams)
+          }
+          val (resType, paramss, tparams) = flatten(mp, Nil, Nil)
+
+          val sparamss = paramss.map(_.sscope)
+          val stparams = tparams.sscopeOpt
+          s.MethodSignature(
+            stparams,
+            sparamss,
+            resType.toSemanticType(sym)
+          )
+
+        case cls: ClassInfo =>
+          val stparams = cls.cls.typeParams.sscopeOpt
+          val sparents = cls.parents.map(_.toSemanticType(sym))
+          val sself = cls.selfType.toSemanticType(sym)
+          val decls = cls.decls.toList.sscopeOpt
+          s.ClassSignature(stparams, sparents, sself, decls)
+
+        case TypeBounds(lo, hi) =>
+          // for `type X[T] = T` is equivalent to `[T] =>> T`
+          def tparams(tpe: Type): (Type, List[SemanticSymbol]) = tpe match {
+            case lambda: HKTypeLambda =>
+              val paramSyms: List[SemanticSymbol] = lambda.paramNames.zip(lambda.paramInfos).map { (paramName, bounds) =>
+                // def x[T[_]] = ???
+                if paramName.isWildcard then
+                  WildcardTypeSymbol(sym, bounds).tap(registerFakeSymbol)
+                else
+                  paramRefSymtab.lookup(lambda, paramName).getOrElse {
+                    TypeParamRefSymbol(sym, paramName, bounds).tap(registerFakeSymbol)
+                  }
+              }
+              (lambda.resType, paramSyms)
+            case _ => (tpe, Nil)
+          }
+          val (loRes, loParams) = tparams(lo)
+          val (hiRes, hiParams) = tparams(hi)
+          val stparams = (loParams ++ hiParams).distinctBy(_.name).sscopeOpt
+          val slo = loRes.toSemanticType(sym)
+          val shi = hiRes.toSemanticType(sym)
+          s.TypeSignature(stparams, slo, shi)
+
+        case other =>
+          s.ValueSignature(
+            other.toSemanticType(sym)
+          )
+      }
+      loop(tpe)
+
+    def toSemanticType(sym: Symbol)(using LinkMode, SemanticSymbolBuilder, Context): s.Type =
+      import ConstantOps._
+      def loop(tpe: Type): s.Type = tpe match {
+        case t if t.isFromJavaObject =>
+          loop(defn.AnyType)
+        case ExprType(tpe) =>
+          val stpe = loop(tpe)
+          s.ByNameType(stpe)
+
+        case TypeRef(pre, sym: Symbol) =>
+          val spre = if tpe.hasTrivialPrefix then s.Type.Empty else loop(pre)
+          val ssym = sym.symbolName
+          s.TypeRef(spre, ssym, Seq.empty)
+
+        case TermRef(pre, sym: Symbol) =>
+          val spre = if(tpe.hasTrivialPrefix) s.Type.Empty else loop(pre)
+          val ssym = sym.symbolName
+          s.SingleType(spre, ssym)
+
+        case ThisType(TypeRef(_, sym: Symbol)) =>
+          s.ThisType(sym.symbolName)
+
+        case tref: TermParamRef =>
+          paramRefSymtab.lookupOrErr(
+            tref.binder, tref.paramName, sym
+          ) match
+            case Some(ref) =>
+              val ssym = ref.symbolName
+              s.SingleType(s.Type.Empty, ssym)
+            case None =>
+              s.Type.Empty
+
+        case tref: TypeParamRef =>
+          val tsym = paramRefSymtab.lookup(tref.binder, tref.paramName) match
+            case found @ Some(sym) => found
+            case None =>
+              tref.binder.typeParams.find(param => param.paramName == tref.paramName) match
+                case Some(param) =>
+                  val info = param.paramInfo
+                  Some(TypeParamRefSymbol(sym, tref.paramName, info).tap(registerFakeSymbol))
+                case None =>
+                  symbolNotFound(tref.binder, tref.paramName, sym)
+                  None
+          tsym match
+            case Some(sym) =>
+              val ssym = sym.symbolName
+              s.TypeRef(s.Type.Empty, ssym, Seq.empty)
+            case None =>
+              s.Type.Empty
+
+        case SuperType(thistpe, supertpe) =>
+          val spre = loop(thistpe.typeSymbol.info)
+          val ssym = supertpe.typeSymbol.symbolName
+          s.SuperType(spre, ssym)
+
+        // val clazzOf = classOf[...]
+        case ConstantType(const) if const.tag == core.Constants.ClazzTag =>
+          loop(const.typeValue)
+
+        case ConstantType(const) =>
+          s.ConstantType(const.toSemanticConst)
+
+        case rt @ RefinedType(parent, name, info) =>
+          // `X { def x: Int; def y: Int }`
+          // RefinedType(
+          //   parent = RefinedType(
+          //     parent = TypeRef(..., X)
+          //     ...
+          //   )
+          //   refinedName = x
+          //   refinedInfo = TypeRef(..., Int)
+          // )
+          type RefinedInfo = (core.Names.Name, Type)
+          def flatten(tpe: Type, acc: List[RefinedInfo]): (Type, List[RefinedInfo]) = tpe match {
+            case RefinedType(parent, name, info) =>
+              flatten(parent, acc :+ (name, info))
+            case _ =>
+              (tpe, acc)
+          }
+
+          // flatten parent types to list
+          // e.g. `X with Y with Z { refined }`
+          // RefinedType(parent = AndType(X, AndType(Y, Z)), ...)
+          // => List(X, Y, Z)
+          def flattenParent(parent: Type): List[s.Type] = parent match {
+            case AndType(tp1, tp2) =>
+              flattenParent(tp1) ++ flattenParent(tp2)
+            case _ => List(loop(parent))
+          }
+
+          val (parent, refinedInfos) = flatten(rt, List.empty)
+          val stpe = s.IntersectionType(flattenParent(parent))
+
+          val decls: List[SemanticSymbol] = refinedInfos.map { (name, info) =>
+            refinementSymtab.lookup(rt, name).getOrElse {
+              RefinementSymbol(sym, name, info).tap(registerFakeSymbol)
+            }
+          }
+          val sdecls = decls.sscopeOpt(using LinkMode.HardlinkChildren)
+          s.StructuralType(stpe, sdecls)
+
+        case rec: RecType =>
+          loop(rec.parent) // should be handled as RefinedType
+
+        // repeated params: e.g. `Int*`, which is the syntax sugar of
+        // `Seq[Int] @Repeated` (or `Array[Int] @Repeated`)
+        // See: Desugar.scala and TypeApplications.scala
+        case AnnotatedType(AppliedType(_, targs), annot)
+          if (annot matches defn.RepeatedAnnot) && (targs.length == 1) =>
+          val stpe = loop(targs(0))
+          s.RepeatedType(stpe)
+
+        case ann: AnnotatedType if ann.annot.symbol.info.isInstanceOf[ClassInfo] =>
+          def flatten(tpe: Type, annots: List[Annotation]): (Type, List[Annotation]) = tpe match
+            case AnnotatedType(parent, annot) if annot.symbol.info.isInstanceOf[ClassInfo] =>
+              flatten(parent, annot +: annots)
+            case other => (other, annots)
+
+          val (parent, annots) = flatten(ann, List.empty)
+          val sparent = loop(parent)
+          val sannots = annots.map(a =>
+            s.Annotation(loop(a.symbol.info.asInstanceOf[ClassInfo].selfType))
+          )
+          s.AnnotatedType(sannots, sparent)
+
+        case AppliedType(tycon, args) if tycon == defn.RepeatedParamType && args.length == 1 =>
+          val stpe = loop(args(0))
+          s.RepeatedType(stpe)
+
+        case app @ AppliedType(tycon, args) =>
+          val targs = args.map { arg =>
+            arg match
+              // For wildcard type C[_ <: T], it's internal type representation will be
+              // `AppliedType(TypeBounds(lo = <Nothing>, hi = <T>))`.
+              //
+              // As scalameta for Scala2 does, we'll convert the wildcard type to
+              // `ExistentialType(TypeRef(NoPrefix, C, <local0>), Scope(hardlinks = List(<local0>)))`
+              // where `<local0>` has
+              // display_name: "_" and,
+              // signature: type_signature(..., lo = <Nothing>, hi = <T>)
+              case bounds: TypeBounds =>
+                val wildcardSym = WildcardTypeSymbol(sym, bounds)
+                // DO NOT register the wildcard symbol to symbol section here
+                // since it's not a symbol definition
+                // registerFakeSymbol(wildcardSym)
+                val ssym = wildcardSym.symbolName
+                (Some(wildcardSym), s.TypeRef(s.Type.Empty, ssym, Seq.empty))
+              case other =>
+                val sarg = loop(other)
+                (None, sarg)
+          }
+          val wildcardSyms = targs.flatMap(_._1)
+          val sargs = targs.map(_._2)
+
+          val applied = loop(tycon) match
+            case ref @ s.TypeRef(_, _, targs) =>
+              // For curried applied type `F[T][U]` and tycon is also an `AppliedType`
+              // Convert it to TypeRef(..., targs = List(T, U))
+              ref.copy(typeArguments = targs ++ sargs)
+            case _ =>
+              s.Type.Empty
+
+          if (wildcardSyms.isEmpty) applied
+          else s.ExistentialType(
+            applied,
+            wildcardSyms.sscopeOpt(using LinkMode.HardlinkChildren)
+          )
+
+        case and: AndType =>
+          def flatten(child: Type): List[Type] = child match
+            case AndType(ct1, ct2) => flatten(ct1) ++ flatten(ct2)
+            case other => List(other)
+          val stpes = flatten(and).map(loop)
+          s.IntersectionType(stpes)
+
+        case or: OrType =>
+          def flatten(child: Type): List[Type] = child match
+            case OrType(ct1, ct2) => flatten(ct1) ++ flatten(ct2)
+            case other => List(other)
+          val stpes = flatten(or).map(loop)
+          s.UnionType(stpes)
+
+        case l: LazyRef =>
+          loop(l.ref)
+
+        case NoPrefix =>
+          s.Type.Empty
+
+        // Not yet supported
+        case _: HKTypeLambda =>
+          s.Type.Empty
+        case _: MatchType =>
+          s.Type.Empty
+
+        case tvar: TypeVar =>
+          loop(tvar.stripped)
+
+        case _ =>
+          s.Type.Empty
+      }
+      loop(tpe)
+
+    /** Return true if the prefix is like `_root_.this` */
+    private def hasTrivialPrefix(using Context): Boolean =
+      def checkTrivialPrefix(pre: Type, sym: Symbol)(using Context): Boolean =
+        pre =:= sym.owner.thisType
+      tpe match {
+        case TypeRef(pre, sym: Symbol) =>
+          checkTrivialPrefix(pre, sym)
+        case TermRef(pre, sym: Symbol) =>
+          checkTrivialPrefix(pre, sym)
+        case _ => false
+      }
+
+
+object SymbolScopeOps:
+  import Scala3.{_, given}
+  extension (syms: List[SemanticSymbol])
+    def sscope(using linkMode: LinkMode)(using SemanticSymbolBuilder, TypeOps, Context): s.Scope =
+      linkMode match
+        case LinkMode.SymlinkChildren =>
+          s.Scope(symlinks = syms.map(_.symbolName))
+        case LinkMode.HardlinkChildren =>
+          s.Scope(hardlinks = syms.map(_.symbolInfo(Set.empty)))
+
+    def sscopeOpt(using LinkMode, SemanticSymbolBuilder, TypeOps, Context): Option[s.Scope] =
+      if syms.nonEmpty then Some(syms.sscope) else None
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/internal/LiteParser.scala b/compiler/src/dotty/tools/dotc/semanticdb/internal/LiteParser.scala
index 48412fd027b8..dea43c0ede19 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/internal/LiteParser.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/internal/LiteParser.scala
@@ -4,10 +4,28 @@ import java.io.InputStream
 
 object LiteParser {
 
-  def readMessage[A](input: SemanticdbInputStream, message: SemanticdbMessage[A]): A = {
-    val length    = input.readRawVarint32()
-    val oldLimit  = input.pushLimit(length)
-    val result: A = message.mergeFrom(input)
+  def readMessage[A <: SemanticdbGeneratedMessage](
+      input: SemanticdbInputStream,
+      message: A
+  )(implicit
+      cmp: SemanticdbGeneratedMessageCompanion[A]
+  ): A = {
+    val length = input.readRawVarint32()
+    val oldLimit = input.pushLimit(length)
+    val result: A = cmp.merge(message, input)
+    input.checkLastTagWas(0)
+    input.popLimit(oldLimit)
+    result
+  }
+
+  def readMessage[A <: SemanticdbGeneratedMessage](
+      input: SemanticdbInputStream
+  )(implicit
+      cmp: SemanticdbGeneratedMessageCompanion[A]
+  ): A = {
+    val length = input.readRawVarint32()
+    val oldLimit = input.pushLimit(length)
+    val result: A = cmp.parseFrom(input)
     input.checkLastTagWas(0)
     input.popLimit(oldLimit)
     result
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbGeneratedMessageCompanion.scala b/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbGeneratedMessageCompanion.scala
new file mode 100644
index 000000000000..4974e3ea256c
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbGeneratedMessageCompanion.scala
@@ -0,0 +1,80 @@
+package dotty.tools.dotc.semanticdb.internal
+
+import java.io.InputStream
+
+// https://github.com/scalapb/ScalaPB/blob/194463272125b872b99d4902b7712355a53e96c4/scalapb-runtime/src/main/scala/scalapb/GeneratedMessageCompanion.scala#L61-L68
+trait SemanticdbGeneratedOneof extends Any with Product with Serializable {
+  type ValueType
+  def number: Int
+  def isDefined: Boolean
+  def isEmpty: Boolean
+  def value: ValueType
+  def valueOption: Option[ValueType] = if (isDefined) Some(value) else None
+}
+
+// https://github.com/scalapb/ScalaPB/blob/194463272125b872b99d4902b7712355a53e96c4/scalapb-runtime/src/main/scala/scalapb/GeneratedMessageCompanion.scala#L72-L138
+trait SemanticdbGeneratedMessage extends Any with Product with Serializable {
+  def serializedSize: Int
+
+  def writeTo(output: SemanticdbOutputStream): Unit
+
+  /** Serializes the messgae and returns a byte array containing its raw bytes */
+  final def toByteArray: Array[Byte] = {
+    val a = new Array[Byte](serializedSize)
+    val outputStream = SemanticdbOutputStream.newInstance(a)
+    writeTo(outputStream)
+    outputStream.checkNoSpaceLeft()
+    a
+  }
+}
+
+trait SemanticdbGeneratedSealedOneof
+    extends Any
+    with Product
+    with Serializable {
+  type MessageType <: SemanticdbGeneratedMessage
+  def isEmpty: Boolean
+  def isDefined: Boolean
+  def asMessage: MessageType
+}
+
+trait SemanticdbGeneratedEnum extends Any with Product with Serializable {
+  type EnumType <: SemanticdbGeneratedEnum
+
+  def value: Int
+
+  def index: Int
+
+  def name: String
+
+  override def toString = name
+
+  def isUnrecognized: Boolean = false
+
+}
+
+trait SemanticdbUnrecognizedEnum extends SemanticdbGeneratedEnum {
+  def name = "UNRECOGNIZED"
+
+  def index = -1
+
+  override def isUnrecognized: Boolean = true
+}
+
+trait SemanticdbGeneratedMessageCompanion[A <: SemanticdbGeneratedMessage]
+    extends Serializable {
+  self =>
+  type ValueType = A
+
+  /** Parses a message from a CodedInputStream. */
+  def parseFrom(input: SemanticdbInputStream): A
+
+  def parseFrom(input: Array[Byte]): A = parseFrom(
+    SemanticdbInputStream.newInstance(input)
+  )
+
+  /** Merges the given message with the additional fields in the steam. */
+  def merge(a: A, input: SemanticdbInputStream): A = {
+    parseFrom(a.toByteArray ++ parseFrom(input).toByteArray)
+  }
+}
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbInputStream.scala b/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbInputStream.scala
index 2d228ffeed64..3a2b616477c3 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbInputStream.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbInputStream.scala
@@ -448,6 +448,29 @@ class SemanticdbInputStream private (buffer: Array[Byte], input: InputStream) {
     }
   }
 
+  def readStringRequireUtf8(): String = {
+    val size: Int = readRawVarint32()
+    var bytes: Array[Byte] = Array()
+    var pos = bufferPos;
+    if (size <= (bufferSize - pos) && size > 0) {
+      // Fast path:  We already have the bytes in a contiguous buffer, so
+      //   just copy directly from it.
+      bytes = buffer;
+      bufferPos = pos + size;
+    } else if (size == 0) {
+      return "";
+    } else {
+      // Slow path:  Build a byte array first then copy it.
+      bytes = readRawBytesSlowPath(size);
+      pos = 0;
+    }
+    // TODO(martinrb): We could save a pass by validating while decoding.
+    // if (!Utf8.isValidUtf8(bytes, pos, pos + size)) {
+    //   throw InvalidProtocolBufferException.invalidUtf8();
+    // }
+    return new String(bytes, pos, size, "UTF-8");
+  }
+
   def checkLastTagWas(value: Int): Unit = {
     if (lastTag != value) {
       throw InvalidProtocolBufferException.invalidEndTag();
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbTypeMapper.scala b/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbTypeMapper.scala
new file mode 100644
index 000000000000..2310bcdbc97c
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbTypeMapper.scala
@@ -0,0 +1,17 @@
+package dotty.tools.dotc.semanticdb.internal
+
+abstract class SemanticdbTypeMapper[BaseType, CustomType] {
+  def toCustom(base: BaseType): CustomType
+  def toBase(custom: CustomType): BaseType
+}
+
+object SemanticdbTypeMapper {
+  def apply[BaseType, CustomType](baseToCustom: BaseType => CustomType)(
+      customToBase: CustomType => BaseType
+  ): SemanticdbTypeMapper[BaseType, CustomType] =
+    new SemanticdbTypeMapper[BaseType, CustomType] {
+      def toCustom(base: BaseType): CustomType = baseToCustom(base)
+      def toBase(custom: CustomType): BaseType = customToBase(custom)
+    }
+}
+
diff --git a/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala b/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala
index 0399386a9e89..de25cb140da0 100644
--- a/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala
+++ b/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala
@@ -31,12 +31,9 @@ abstract class AccessProxies {
    */
   protected def passReceiverAsArg(accessorName: Name)(using Context): Boolean = false
 
-  /** The accessor definitions that need to be added to class `cls`
-   *  As a side-effect, this method removes entries from the `accessedBy` map.
-   *  So a second call of the same method will yield the empty list.
-   */
+  /** The accessor definitions that need to be added to class `cls` */
   private def accessorDefs(cls: Symbol)(using Context): Iterator[DefDef] =
-    for (accessor <- cls.info.decls.iterator; accessed <- accessedBy.remove(accessor).toOption) yield
+    for accessor <- cls.info.decls.iterator; accessed <- accessedBy.get(accessor) yield
       DefDef(accessor.asTerm, prefss => {
         def numTypeParams = accessed.info match {
           case info: PolyType => info.paramNames.length
@@ -54,7 +51,10 @@ abstract class AccessProxies {
               forwardedArgss.nonEmpty && forwardedArgss.head.nonEmpty) // defensive conditions
             accessRef.becomes(forwardedArgss.head.head)
           else
-            accessRef.appliedToTypeTrees(forwardedTpts).appliedToArgss(forwardedArgss)
+            accessRef
+              .appliedToTypeTrees(forwardedTpts)
+              .appliedToArgss(forwardedArgss)
+              .etaExpandCFT(using ctx.withOwner(accessor))
         rhs.withSpan(accessed.span)
       })
 
diff --git a/compiler/src/dotty/tools/dotc/transform/ArrayApply.scala b/compiler/src/dotty/tools/dotc/transform/ArrayApply.scala
index 348bc735bd9c..cc39c5a3517b 100644
--- a/compiler/src/dotty/tools/dotc/transform/ArrayApply.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ArrayApply.scala
@@ -21,7 +21,9 @@ import scala.reflect.ClassTag
 class ArrayApply extends MiniPhase {
   import tpd._
 
-  override def phaseName: String = "arrayApply"
+  override def phaseName: String = ArrayApply.name
+
+  override def description: String = ArrayApply.description
 
   override def transformApply(tree: tpd.Apply)(using Context): tpd.Tree =
     if isArrayModuleApply(tree.symbol) then
@@ -71,3 +73,7 @@ class ArrayApply extends MiniPhase {
     }
   }
 }
+
+object ArrayApply:
+  val name: String = "arrayApply"
+  val description: String = "optimize `scala.Array.apply`"
diff --git a/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala b/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala
index 301026548444..1bcaa2626ee3 100644
--- a/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala
@@ -22,7 +22,9 @@ import scala.collection.immutable.::
 class ArrayConstructors extends MiniPhase {
   import ast.tpd._
 
-  override def phaseName: String = "arrayConstructors"
+  override def phaseName: String = ArrayConstructors.name
+
+  override def description: String = ArrayConstructors.description
 
   override def transformApply(tree: tpd.Apply)(using Context): tpd.Tree = {
     def expand(elemType: Type, dims: List[Tree]) =
@@ -49,3 +51,7 @@ class ArrayConstructors extends MiniPhase {
     else tree
   }
 }
+
+object ArrayConstructors:
+  val name: String = "arrayConstructors"
+  val description: String = "intercept creation of (non-generic) arrays and intrinsify"
diff --git a/compiler/src/dotty/tools/dotc/transform/BetaReduce.scala b/compiler/src/dotty/tools/dotc/transform/BetaReduce.scala
index 17ce6020e2a9..79b68b331930 100644
--- a/compiler/src/dotty/tools/dotc/transform/BetaReduce.scala
+++ b/compiler/src/dotty/tools/dotc/transform/BetaReduce.scala
@@ -33,7 +33,9 @@ import ast.TreeTypeMap
 class BetaReduce extends MiniPhase:
   import ast.tpd._
 
-  def phaseName: String = "betaReduce"
+  override def phaseName: String = BetaReduce.name
+
+  override def description: String = BetaReduce.description
 
   override def transformApply(app: Apply)(using Context): Tree = app.fun match
     case Select(fn, nme.apply) if defn.isFunctionType(fn.tpe) =>
@@ -47,6 +49,9 @@ class BetaReduce extends MiniPhase:
 object BetaReduce:
   import ast.tpd._
 
+  val name: String = "betaReduce"
+  val description: String = "reduce closure applications"
+
   /** Beta-reduces a call to `fn` with arguments `argSyms` or returns `tree` */
   def apply(original: Tree, fn: Tree, args: List[Tree])(using Context): Tree =
     fn match
diff --git a/compiler/src/dotty/tools/dotc/transform/Bridges.scala b/compiler/src/dotty/tools/dotc/transform/Bridges.scala
index 8cb78c258704..f7c00ef74b94 100644
--- a/compiler/src/dotty/tools/dotc/transform/Bridges.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Bridges.scala
@@ -9,6 +9,11 @@ import ast.untpd
 import collection.{mutable, immutable}
 import util.Spans.Span
 import util.SrcPos
+import ContextFunctionResults.{contextResultCount, contextFunctionResultTypeAfter}
+import StdNames.nme
+import Constants.Constant
+import TypeErasure.transformInfo
+import Erasure.Boxing.adaptClosure
 
 /** A helper class for generating bridge methods in class `root`. */
 class Bridges(root: ClassSymbol, thisPhase: DenotTransformer)(using Context) {
@@ -34,9 +39,12 @@ class Bridges(root: ClassSymbol, thisPhase: DenotTransformer)(using Context) {
 
     override def exclude(sym: Symbol) =
       !sym.isOneOf(MethodOrModule) || super.exclude(sym)
+
+    override def canBeHandledByParent(sym1: Symbol, sym2: Symbol, parent: Symbol): Boolean =
+      OverridingPairs.isOverridingPair(sym1, sym2, parent.thisType)
   }
 
-  //val site = root.thisType
+  val site = root.thisType
 
   private var toBeRemoved = immutable.Set[Symbol]()
   private val bridges = mutable.ListBuffer[Tree]()
@@ -77,7 +85,13 @@ class Bridges(root: ClassSymbol, thisPhase: DenotTransformer)(using Context) {
                       |clashes with definition of the member itself; both have erased type ${info(member)(using elimErasedCtx)}."""",
                   bridgePosFor(member))
     }
-    else if (!bridgeExists)
+    else if !inContext(preErasureCtx)(site.memberInfo(member).matches(site.memberInfo(other))) then
+      // Neither symbol signatures nor pre-erasure types seen from root match; this means
+      // according to Scala 2 semantics there is no override.
+      // A bridge might introduce a classcast exception.
+      // Example where this was observed: run/i12828a.scala and MapView in stdlib213
+      report.log(i"suppress bridge in $root for ${member} in ${member.owner} and ${other.showLocated} since member infos ${site.memberInfo(member)} and ${site.memberInfo(other)} do not match")
+    else if !bridgeExists then
       addBridge(member, other)
   }
 
@@ -103,12 +117,52 @@ class Bridges(root: ClassSymbol, thisPhase: DenotTransformer)(using Context) {
       toBeRemoved += other
     }
 
-    def bridgeRhs(argss: List[List[Tree]]) = {
+    val memberCount = contextResultCount(member)
+
+    /** Eta expand application `ref(args)` as needed.
+     *  To do this correctly, we have to look at the member's original pre-erasure
+     *  type and figure out which context function types in its result are
+     *  not yet instantiated.
+     */
+    def etaExpand(ref: Tree, args: List[Tree])(using Context): Tree =
+      def expand(args: List[Tree], tp: Type, n: Int)(using Context): Tree =
+        if n <= 0 then
+          assert(ctx.typer.isInstanceOf[Erasure.Typer])
+          ctx.typer.typed(untpd.cpy.Apply(ref)(ref, args), member.info.finalResultType)
+        else
+          val defn.ContextFunctionType(argTypes, resType, isErased) = tp: @unchecked
+          val anonFun = newAnonFun(ctx.owner,
+            MethodType(if isErased then Nil else argTypes, resType),
+            coord = ctx.owner.coord)
+          anonFun.info = transformInfo(anonFun, anonFun.info)
+
+          def lambdaBody(refss: List[List[Tree]]) =
+            val refs :: Nil = refss: @unchecked
+            val expandedRefs = refs.map(_.withSpan(ctx.owner.span.endPos)) match
+              case (bunchedParam @ Ident(nme.ALLARGS)) :: Nil =>
+                argTypes.indices.toList.map(n =>
+                  bunchedParam
+                    .select(nme.primitive.arrayApply)
+                    .appliedTo(Literal(Constant(n))))
+              case refs1 => refs1
+            expand(args ::: expandedRefs, resType, n - 1)(using ctx.withOwner(anonFun))
+
+          val unadapted = Closure(anonFun, lambdaBody)
+          cpy.Block(unadapted)(unadapted.stats,
+            adaptClosure(unadapted.expr.asInstanceOf[Closure]))
+      end expand
+
+      val otherCount = contextResultCount(other)
+      val start = contextFunctionResultTypeAfter(member, otherCount)(using preErasureCtx)
+      expand(args, start, memberCount - otherCount)(using ctx.withOwner(bridge))
+    end etaExpand
+
+    def bridgeRhs(argss: List[List[Tree]]) =
       assert(argss.tail.isEmpty)
       val ref = This(root).select(member)
-      if (member.info.isParameterless) ref // can happen if `member` is a module
-      else Erasure.partialApply(ref, argss.head)
-    }
+      if member.info.isParameterless then ref // can happen if `member` is a module
+      else if memberCount == 0 then ref.appliedToTermArgs(argss.head)
+      else etaExpand(ref, argss.head)
 
     bridges += DefDef(bridge, bridgeRhs(_).withSpan(bridge.span))
   }
diff --git a/compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala b/compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala
deleted file mode 100644
index 00bcd1e5076a..000000000000
--- a/compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-package dotty.tools.dotc
-package transform
-
-import core._
-import Contexts._
-import Symbols._
-import Types._
-import Flags._
-import DenotTransformers.IdentityDenotTransformer
-import core.StdNames.nme
-
-/** This phase translates arguments to call-by-name parameters, using the rules
- *
- *      x           ==>    x                  if x is a => parameter
- *      e.apply()   ==>    <cbn-arg>(e)       if e is pure
- *      e           ==>    <cbn-arg>(() => e) for all other arguments
- *
- *  where
- *
- *     <cbn-arg>: [T](() => T): T
- *
- *  is a synthetic method defined in Definitions. Erasure will later strip the <cbn-arg> wrappers.
- */
-class ByNameClosures extends TransformByNameApply with IdentityDenotTransformer { thisPhase =>
-  import ast.tpd._
-
-  override def phaseName: String = ByNameClosures.name
-
-  override def runsAfterGroupsOf: Set[String] = Set(ExpandSAMs.name)
-    // ExpanSAMs applied to partial functions creates methods that need
-    // to be fully defined before converting. Test case is pos/i9391.scala.
-
-  override def mkByNameClosure(arg: Tree, argType: Type)(using Context): Tree = {
-    val meth = newSymbol(
-      ctx.owner, nme.ANON_FUN, Synthetic | Method, MethodType(Nil, Nil, argType))
-    Closure(meth, _ => arg.changeOwnerAfter(ctx.owner, meth, thisPhase)).withSpan(arg.span)
-  }
-}
-
-object ByNameClosures {
-  val name: String = "byNameClosures"
-}
\ No newline at end of file
diff --git a/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala
index 7b6d7ee64cd2..2969b00c7dd2 100644
--- a/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala
@@ -10,6 +10,7 @@ import core.Decorators._
 import core.StdNames.nme
 import core.Names._
 import core.NameKinds.TempResultName
+import core.Constants._
 import ast.Trees._
 import util.Store
 import collection.mutable
@@ -17,11 +18,13 @@ import collection.mutable
 /** This phase translates variables that are captured in closures to
  *  heap-allocated refs.
  */
-class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisPhase =>
+class CapturedVars extends MiniPhase with IdentityDenotTransformer:
+  thisPhase =>
   import ast.tpd._
 
-  /** the following two members override abstract members in Transform */
-  val phaseName: String = "capturedVars"
+  override def phaseName: String = CapturedVars.name
+
+  override def description: String = CapturedVars.description
 
   override def runsAfterGroupsOf: Set[String] = Set(LiftTry.name)
     // lifting tries changes what variables are considered to be captured
@@ -45,6 +48,9 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisPhase =
 
     val boxedRefClasses: collection.Set[Symbol] =
       refClassKeys.flatMap(k => Set(refClass(k), volatileRefClass(k)))
+
+    val objectRefClasses: collection.Set[Symbol] =
+      Set(refClass(defn.ObjectClass), volatileRefClass(defn.ObjectClass))
   }
 
   private var myRefInfo: RefInfo = null
@@ -123,32 +129,46 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisPhase =
   }
 
   /** If assignment is to a boxed ref type, e.g.
-    *
-    *      intRef.elem = expr
-    *
-    *  rewrite using a temporary var to
-    *
-    *      val ev$n = expr
-    *      intRef.elem = ev$n
-    *
-    *  That way, we avoid the problem that `expr` might contain a `try` that would
-    *  run on a non-empty stack (which is illegal under JVM rules). Note that LiftTry
-    *  has already run before, so such `try`s would not be eliminated.
-    *
-    *  Also: If the ref type lhs is followed by a cast (can be an artifact of nested translation),
-    *  drop the cast.
-    */
-  override def transformAssign(tree: Assign)(using Context): Tree = {
-    def recur(lhs: Tree): Tree = lhs match {
-      case TypeApply(Select(qual, nme.asInstanceOf_), _) =>
-        val Select(_, nme.elem) = qual
+   *
+   *      intRef.elem = expr
+   *
+   *  rewrite using a temporary var to
+   *
+   *      val ev$n = expr
+   *      intRef.elem = ev$n
+   *
+   *  That way, we avoid the problem that `expr` might contain a `try` that would
+   *  run on a non-empty stack (which is illegal under JVM rules). Note that LiftTry
+   *  has already run before, so such `try`s would not be eliminated.
+   *
+   *  If the ref type lhs is followed by a cast (can be an artifact of nested translation),
+   *  drop the cast.
+   *
+   *  If the ref type is `ObjectRef` or `VolatileObjectRef`, immediately assign `null`
+   *  to the temporary to make the underlying target of the reference available for
+   *  garbage collection. Nullification is omitted if the `expr` is already `null`.
+   *
+   *      var ev$n: RHS = expr
+   *      objRef.elem = ev$n
+   *      ev$n = null.asInstanceOf[RHS]
+   */
+  override def transformAssign(tree: Assign)(using Context): Tree =
+    def absolved: Boolean = tree.rhs match
+      case Literal(Constant(null)) | Typed(Literal(Constant(null)), _) => true
+      case _ => false
+    def recur(lhs: Tree): Tree = lhs match
+      case TypeApply(Select(qual@Select(_, nme.elem), nme.asInstanceOf_), _) =>
         recur(qual)
       case Select(_, nme.elem) if refInfo.boxedRefClasses.contains(lhs.symbol.maybeOwner) =>
-        val tempDef = transformFollowing(SyntheticValDef(TempResultName.fresh(), tree.rhs))
-        transformFollowing(Block(tempDef :: Nil, cpy.Assign(tree)(lhs, ref(tempDef.symbol))))
+        val tempDef = transformFollowing(SyntheticValDef(TempResultName.fresh(), tree.rhs, flags = Mutable))
+        val update  = cpy.Assign(tree)(lhs, ref(tempDef.symbol))
+        def reset   = cpy.Assign(tree)(ref(tempDef.symbol), nullLiteral.cast(tempDef.symbol.info))
+        val res     = if refInfo.objectRefClasses(lhs.symbol.maybeOwner) && !absolved then reset else unitLiteral
+        transformFollowing(Block(tempDef :: update :: Nil, res))
       case _ =>
         tree
-    }
     recur(tree.lhs)
-  }
-}
+
+object CapturedVars:
+  val name: String = "capturedVars"
+  val description: String = "represent vars captured by closures as heap objects"
diff --git a/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala b/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala
new file mode 100644
index 000000000000..074f5a634821
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala
@@ -0,0 +1,93 @@
+package dotty.tools.dotc
+package transform
+
+import core.*
+import MegaPhase.MiniPhase
+import Contexts.*, Types.*, Symbols.*, SymDenotations.*, Flags.*
+import ast.*
+import Trees.*
+import Decorators.*
+
+import annotation.threadUnsafe
+
+object CheckLoopingImplicits:
+  val name: String = "checkLoopingImplicits"
+  val description: String = "check that implicit defs do not call themselves in an infinite loop"
+
+/** Checks that implicit defs do not call themselves in an infinite loop */
+class CheckLoopingImplicits extends MiniPhase:
+  thisPhase =>
+  import tpd._
+
+  override def phaseName: String = CheckLoopingImplicits.name
+
+  override def description: String = CheckLoopingImplicits.description
+
+  override def transformValDef(mdef: ValDef)(using Context): Tree = 
+    transform(mdef)
+
+  override def transformDefDef(mdef: DefDef)(using Context): Tree =
+    transform(mdef)
+
+  def transform(mdef: ValOrDefDef)(using Context): Tree =
+    val sym = mdef.symbol
+
+    def checkNotSelfRef(t: RefTree) =
+      if t.symbol eq sym then
+          report.warning(
+              em"""Infinite loop in function body
+                  |${mdef.rhs}""",
+              mdef.rhs.srcPos
+            )
+
+    def checkNotLooping(t: Tree): Unit = t match
+      case t: Ident =>
+        checkNotSelfRef(t)
+      case t @ Select(qual, _) =>
+        checkNotSelfRef(t)
+        checkNotLooping(qual)
+      case Apply(fn, args) =>
+        checkNotLooping(fn)
+        fn.tpe.widen match
+          case mt: MethodType
+               // Boolean && and || aren't defined with by-name parameters
+               // and therefore their type isn't an ExprType, so we exempt them by symbol name
+               if t.symbol != defn.Boolean_&& && t.symbol != defn.Boolean_|| =>
+            args.lazyZip(mt.paramInfos).foreach { (arg, pinfo) =>
+              if !pinfo.isInstanceOf[ExprType] then checkNotLooping(arg)
+            }
+          case _ =>
+      case TypeApply(fn, _) =>
+        checkNotLooping(fn)
+      case Block(stats, expr) =>
+        stats.foreach(checkNotLooping)
+        checkNotLooping(expr)
+      case Typed(expr, _) =>
+        checkNotLooping(expr)
+      case Assign(lhs, rhs) =>
+        checkNotLooping(lhs)
+        checkNotLooping(rhs)
+      case If(cond, _, _) =>
+        checkNotLooping(cond)
+      case Match(selector, _) =>
+        checkNotLooping(selector)
+      case Labeled(_, expr) =>
+        checkNotLooping(expr)
+      case Return(expr, _) =>
+        checkNotLooping(expr)
+      case WhileDo(cond, _) =>
+        checkNotLooping(cond)
+      case Try(block, _, finalizer) =>
+        checkNotLooping(block)
+        checkNotLooping(finalizer)
+      case SeqLiteral(elems, _) =>
+        elems.foreach(checkNotLooping)
+      case t: ValDef =>  
+        checkNotLooping(t.rhs)
+      case _ =>
+
+    if sym.isOneOf(GivenOrImplicit | Lazy | ExtensionMethod) then
+      checkNotLooping(mdef.rhs)
+    mdef
+  end transform
+end CheckLoopingImplicits
diff --git a/compiler/src/dotty/tools/dotc/transform/CheckNoSuperThis.scala b/compiler/src/dotty/tools/dotc/transform/CheckNoSuperThis.scala
new file mode 100644
index 000000000000..5d11cbdf7bb5
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/transform/CheckNoSuperThis.scala
@@ -0,0 +1,53 @@
+package dotty.tools.dotc
+package transform
+
+import core.*
+import MegaPhase.MiniPhase
+import Contexts.*, Types.*, Symbols.*, SymDenotations.*, Flags.*
+import ast.*
+import Trees.*
+import Decorators.*
+
+import annotation.threadUnsafe
+
+object CheckNoSuperThis:
+  val name: String = "checkNoSuperThis"
+  val description: String = "check that supercalls don't contain references to This"
+
+/** Checks that super and this calls do not pass `this` as (part of) an argument. */
+class CheckNoSuperThis extends MiniPhase:
+  thisPhase =>
+  import tpd._
+
+  override def phaseName: String = CheckNoSuperThis.name
+
+  override def description: String = CheckNoSuperThis.description
+
+  override def runsAfterGroupsOf: Set[String] = Set(Constructors.name)
+
+  override def transformDefDef(mdef: DefDef)(using Context): DefDef =
+    if mdef.symbol.isClassConstructor then
+      mdef.rhs match
+        case Block(stats, _) => splitAtSuper(stats) match
+          case (Apply(_, superArgs) :: _, _) =>
+            val cls = mdef.symbol.owner
+            def fail(t: Tree) =
+              report.error(em"super constructor cannot be passed a self reference $t unless parameter is declared by-name", t.srcPos)
+            for arg <- superArgs do
+              arg.foreachSubTree {
+                case t: This if t.symbol == cls =>
+                  fail(t)
+                case t: RefTree => t.tpe match
+                  case tpe @ TermRef(prefix, _)
+                  if (prefix == cls.thisType
+                      || cls.is(Module)
+                         && (prefix.termSymbol == cls.sourceModule || tpe.symbol == cls.sourceModule)
+                    ) && !tpe.symbol.is(JavaStatic) => fail(t)
+                  case _ =>
+                case _ =>
+              }
+          case _ =>
+        case _ =>
+    mdef
+
+end CheckNoSuperThis
diff --git a/compiler/src/dotty/tools/dotc/transform/CheckReentrant.scala b/compiler/src/dotty/tools/dotc/transform/CheckReentrant.scala
index 56c7c8b9b3d9..6b0a4c3e9737 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckReentrant.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckReentrant.scala
@@ -29,7 +29,9 @@ import Decorators._
 class CheckReentrant extends MiniPhase {
   import ast.tpd._
 
-  override def phaseName: String = "checkReentrant"
+  override def phaseName: String = CheckReentrant.name
+
+  override def description: String = CheckReentrant.description
 
   private var shared: Set[Symbol] = Set()
   private var seen: Set[ClassSymbol] = Set()
@@ -84,3 +86,7 @@ class CheckReentrant extends MiniPhase {
     tree
   }
 }
+
+object CheckReentrant:
+  val name: String = "checkReentrant"
+  val description: String = "check no data races involving global vars"
diff --git a/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala b/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala
index 3edddadfb2ae..ddd42d615ad4 100644
--- a/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala
@@ -29,6 +29,8 @@ class CheckStatic extends MiniPhase {
 
   override def phaseName: String = CheckStatic.name
 
+  override def description: String = CheckStatic.description
+
   override def transformTemplate(tree: tpd.Template)(using Context): tpd.Tree = {
     val defns = tree.body.collect{case t: ValOrDefDef => t}
     var hadNonStaticField = false
@@ -63,4 +65,5 @@ class CheckStatic extends MiniPhase {
 
 object CheckStatic {
   val name: String = "checkStatic"
+  val description: String = "check restrictions that apply to @static members"
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala b/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala
new file mode 100644
index 000000000000..de304f5d3077
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala
@@ -0,0 +1,61 @@
+package dotty.tools.dotc.transform
+
+import dotty.tools.dotc.ast.tpd
+import dotty.tools.dotc.core.Contexts.Context
+import dotty.tools.dotc.core.Types
+import dotty.tools.dotc.transform.MegaPhase._
+import java.io.{File => _}
+
+import dotty.tools.dotc.core._
+import SymDenotations._
+import Contexts._
+import Types._
+import Symbols._
+import Phases._
+import dotty.tools.dotc.util.SourcePosition
+import Decorators._
+import StdNames.nme
+import dotty.tools.io.JarArchive
+import dotty.tools.backend.jvm.GenBCode
+
+/**
+ * Small phase to be run to collect main classes and store them in the context.
+ * The general rule to run this phase is:
+ * - The output of compilation is JarArchive
+ * - There is no `-Xmain-class` defined
+ *
+ * The following flags affect this phase:
+ *   -d path.jar
+ *   -Xmain-class
+ */
+class CollectEntryPoints extends MiniPhase:
+
+  override def phaseName: String = CollectEntryPoints.name
+
+  override def description: String = CollectEntryPoints.description
+
+  override def isRunnable(using Context): Boolean =
+    def forceRun = ctx.settings.XmainClass.isDefault && ctx.settings.outputDir.value.isInstanceOf[JarArchive]
+    super.isRunnable && forceRun
+
+  override def transformTypeDef(tree: tpd.TypeDef)(using Context): tpd.Tree =
+    getEntryPoint(tree).map(registerEntryPoint)
+    tree
+
+  private def getEntryPoint(tree: tpd.TypeDef)(using Context): Option[String] =
+    val sym = tree.symbol
+    import dotty.tools.dotc.core.NameOps.stripModuleClassSuffix
+    val name = sym.fullName.stripModuleClassSuffix.toString
+    Option.when(sym.isStatic && !sym.is(Flags.Trait) && ctx.platform.hasMainMethod(sym))(name)
+
+  private def registerEntryPoint(s: String)(using Context) = {
+    genBCodePhase match {
+      case genBCodePhase: GenBCode =>
+        genBCodePhase.registerEntryPoint(s)
+      case _ =>
+    }
+  }
+
+object CollectEntryPoints:
+  val name: String = "Collect entry points"
+  val description: String = "collect all entry points and save them in the context"
diff --git a/compiler/src/dotty/tools/dotc/transform/CollectNullableFields.scala b/compiler/src/dotty/tools/dotc/transform/CollectNullableFields.scala
index 71bae0ec5a6d..cf575e84975d 100644
--- a/compiler/src/dotty/tools/dotc/transform/CollectNullableFields.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CollectNullableFields.scala
@@ -13,6 +13,7 @@ import java.util.IdentityHashMap
 
 object CollectNullableFields {
   val name: String = "collectNullableFields"
+  val description: String = "collect fields that can be nulled out after use in lazy initialization"
 }
 
 /** Collect fields that can be nulled out after use in lazy initialization.
@@ -43,6 +44,8 @@ class CollectNullableFields extends MiniPhase {
 
   override def phaseName: String = CollectNullableFields.name
 
+  override def description: String = CollectNullableFields.description
+
   /** Running after `ElimByName` to see by names as nullable types. */
   override def runsAfter: Set[String] = Set(ElimByName.name)
 
diff --git a/compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala b/compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala
index 4aa352f60f1b..9f90ae43c751 100644
--- a/compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala
@@ -20,6 +20,7 @@ import annotation.threadUnsafe
 
 object CompleteJavaEnums {
   val name: String = "completeJavaEnums"
+  val description: String = "fill in constructors for Java enums"
 
   private val nameParamName: TermName = "_$name".toTermName
   private val ordinalParamName: TermName = "_$ordinal".toTermName
@@ -35,6 +36,8 @@ class CompleteJavaEnums extends MiniPhase with InfoTransformer { thisPhase =>
 
   override def phaseName: String = CompleteJavaEnums.name
 
+  override def description: String = CompleteJavaEnums.description
+
   override def relaxedTypingInGroup: Boolean = true
     // Because it adds additional parameters to some constructors
 
diff --git a/compiler/src/dotty/tools/dotc/transform/Constructors.scala b/compiler/src/dotty/tools/dotc/transform/Constructors.scala
index 024261746265..be77103e2395 100644
--- a/compiler/src/dotty/tools/dotc/transform/Constructors.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Constructors.scala
@@ -9,7 +9,9 @@ import dotty.tools.dotc.core.StdNames._
 import ast._
 import Trees._
 import Flags._
+import Names.Name
 import NameOps._
+import NameKinds.{FieldName, ExplicitFieldName}
 import SymUtils._
 import Symbols._
 import Decorators._
@@ -19,6 +21,7 @@ import collection.mutable
 
 object Constructors {
   val name: String = "constructors"
+  val description: String = "collect initialization code in primary constructors"
 }
 
 /** This transform
@@ -31,6 +34,9 @@ class Constructors extends MiniPhase with IdentityDenotTransformer { thisPhase =
   import tpd._
 
   override def phaseName: String = Constructors.name
+
+  override def description: String = Constructors.description
+
   override def runsAfter: Set[String] = Set(HoistSuperArgs.name)
   override def runsAfterGroupsOf: Set[String] = Set(Memoize.name)
     // Memoized needs to be finished because we depend on the ownerchain after Memoize
@@ -146,10 +152,16 @@ class Constructors extends MiniPhase with IdentityDenotTransformer { thisPhase =
     //  (2) If the parameter accessor reference was to an alias getter,
     //      drop the () when replacing by the parameter.
     object intoConstr extends TreeMap {
+      private var isSuperCall = false
       override def transform(tree: Tree)(using Context): Tree = tree match {
         case Ident(_) | Select(This(_), _) =>
           var sym = tree.symbol
-          if (sym.is(ParamAccessor, butNot = Mutable)) sym = sym.subst(accessors, paramSyms)
+          if sym.is(ParamAccessor) && (!sym.is(Mutable) || isSuperCall)
+            // Variables need to go through the getter since they might have been updated,
+            // except if we are in a super call, since then the virtual getter call would
+            // be illegal.
+          then
+            sym = sym.subst(accessors, paramSyms)
           if (sym.maybeOwner.isConstructor) ref(sym).withSpan(tree.span) else tree
         case Apply(fn, Nil) =>
           val fn1 = transform(fn)
@@ -161,6 +173,7 @@ class Constructors extends MiniPhase with IdentityDenotTransformer { thisPhase =
       }
 
       def apply(tree: Tree, prevOwner: Symbol)(using Context): Tree =
+        isSuperCall = isSuperConstrCall(tree)
         transform(tree).changeOwnerAfter(prevOwner, constr.symbol, thisPhase)
     }
 
@@ -242,7 +255,28 @@ class Constructors extends MiniPhase with IdentityDenotTransformer { thisPhase =
         splitStats(stats1)
       case Nil =>
     }
+
+    /** Check that we do not have both a private field with name `x` and a private field
+     *  with name `FieldName(x)`. These will map to the same JVM name and therefore cause
+     *  a duplicate field error. If that case arises (as in i13862.scala), use an explicit
+     *  name `x$field` instead of `FieldName(x).
+     */
+    def checkNoFieldClashes() =
+      val fieldNames = mutable.HashSet[Name]()
+      for case field: ValDef <- clsStats do
+        field.symbol.name match
+          case FieldName(_) =>
+          case name => fieldNames += name
+      for case field: ValDef <- clsStats do
+        field.symbol.name match
+          case fldName @ FieldName(name) if fieldNames.contains(name) =>
+            val newName = ExplicitFieldName(name)
+            report.log(i"avoid field/field conflict by renaming $fldName to $newName")
+            field.symbol.copySymDenotation(name = newName).installAfter(thisPhase)
+          case _ =>
+
     splitStats(tree.body)
+    checkNoFieldClashes()
 
     // The initializers for the retained accessors */
     val copyParams = accessors flatMap { acc =>
diff --git a/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala b/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala
index ee56767054fd..14134b4bb1fa 100644
--- a/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala
@@ -8,12 +8,16 @@ import StdNames.nme
 import ast.untpd
 import ast.tpd._
 import config.Config
+import Decorators.*
 
 object ContextFunctionResults:
 
   /** Annotate methods that have context function result types directly matched by context
    *  closures on their right-hand side. Parameters to such closures will be integrated
    *  as additional method parameters in erasure.
+   *
+   *  A @ContextResultCount(n) annotation means that the method's result type
+   *  consists of a string of `n` nested context closures.
    */
   def annotateContextResults(mdef: DefDef)(using Context): Unit =
     def contextResultCount(rhs: Tree, tp: Type): Int = tp match
@@ -50,6 +54,15 @@ object ContextFunctionResults:
         crCount
       case none => 0
 
+  /** True iff `ContextResultCount` is not zero and all context functions in the result
+   *  type are erased.
+   */
+  def contextResultsAreErased(sym: Symbol)(using Context): Boolean =
+    def allErased(tp: Type): Boolean = tp.dealias match
+      case defn.ContextFunctionType(_, resTpe, isErased) => isErased && allErased(resTpe)
+      case _ => true
+    contextResultCount(sym) > 0 && allErased(sym.info.finalResultType)
+
   /** Turn the first `crCount` context function types in the result type of `tp`
    *  into the curried method types.
    */
@@ -86,33 +99,13 @@ object ContextFunctionResults:
     normalParamCount(sym.info)
   end totalParamCount
 
-  /** The rightmost context function type in the result type of `meth`
-   *  that represents `paramCount` curried, non-erased parameters that
-   *  are included in the `contextResultCount` of `meth`.
-   *  Example:
-   *
-   *  Say we have `def m(x: A): B ?=> (C1, C2, C3) ?=> D ?=> E ?=> F`,
-   *  paramCount == 4, and the contextResultCount of `m` is 3.
-   *  Then we return the type `(C1, C2, C3) ?=> D ?=> E ?=> F`, since this
-   *  type covers the 4 rightmost parameters C1, C2, C3 and D before the
-   *  contextResultCount runs out at E ?=> F.
-   *  Erased parameters are ignored; they contribute nothing to the
-   *  parameter count.
-   */
-  def contextFunctionResultTypeCovering(meth: Symbol, paramCount: Int)(using Context) =
-    atPhase(erasurePhase) {
-      // Recursive instances return pairs of context types and the
-      // # of parameters they represent.
-      def missingCR(tp: Type, crCount: Int): (Type, Int) =
-        if crCount == 0 then (tp, 0)
-        else
-          val defn.ContextFunctionType(formals, resTpe, isErased) = tp: @unchecked
-          val result @ (rt, nparams) = missingCR(resTpe, crCount - 1)
-          assert(nparams <= paramCount)
-          if nparams == paramCount || isErased then result
-          else (tp, nparams + formals.length)
-      missingCR(meth.info.finalResultType, contextResultCount(meth))._1
-    }
+  /** The `depth` levels nested context function type in the result type of `meth` */
+  def contextFunctionResultTypeAfter(meth: Symbol, depth: Int)(using Context) =
+    def recur(tp: Type, n: Int): Type =
+      if n == 0 then tp
+      else tp match
+        case defn.ContextFunctionType(_, resTpe, _) => recur(resTpe, n - 1)
+    recur(meth.info.finalResultType, depth)
 
   /** Should selection `tree` be eliminated since it refers to an `apply`
    *  node of a context function type whose parameters will end up being
diff --git a/compiler/src/dotty/tools/dotc/transform/CookComments.scala b/compiler/src/dotty/tools/dotc/transform/CookComments.scala
index 6ef0bdc4c247..27f34891fc2c 100644
--- a/compiler/src/dotty/tools/dotc/transform/CookComments.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CookComments.scala
@@ -6,7 +6,10 @@ import dotty.tools.dotc.core.ContextOps._
 import dotty.tools.dotc.typer.Docstrings
 
 class CookComments extends MegaPhase.MiniPhase {
-  override def phaseName: String = "cookComments"
+
+  override def phaseName: String = CookComments.name
+
+  override def description: String = CookComments.description
 
   override def transformTypeDef(tree: tpd.TypeDef)(using Context): tpd.Tree = {
     if (ctx.settings.YcookComments.value && tree.isClassDef) {
@@ -26,4 +29,6 @@ class CookComments extends MegaPhase.MiniPhase {
   }
 }
 
-
+object CookComments:
+  val name = "cookComments"
+  val description: String = "cook the comments: expand variables, doc, etc."
diff --git a/compiler/src/dotty/tools/dotc/transform/CountOuterAccesses.scala b/compiler/src/dotty/tools/dotc/transform/CountOuterAccesses.scala
index 27a7907b266e..54ac7478c332 100644
--- a/compiler/src/dotty/tools/dotc/transform/CountOuterAccesses.scala
+++ b/compiler/src/dotty/tools/dotc/transform/CountOuterAccesses.scala
@@ -15,6 +15,7 @@ import collection.mutable
 
 object CountOuterAccesses:
   val name: String = "countOuterAccesses"
+  val description: String = "identify outer accessors that can be dropped"
 
   /** Characterizes outer accessors and outer fields that can be dropped
    *  if there are no references to them from within the toplevel class
@@ -38,6 +39,8 @@ class CountOuterAccesses extends MiniPhase:
 
   override def phaseName: String = CountOuterAccesses.name
 
+  override def description: String = CountOuterAccesses.description
+
   override def runsAfter: Set[String] = Set(LambdaLift.name)
     // LambdaLift can create outer paths. These need to be known in this phase.
 
diff --git a/compiler/src/dotty/tools/dotc/transform/Dependencies.scala b/compiler/src/dotty/tools/dotc/transform/Dependencies.scala
new file mode 100644
index 000000000000..c5c6c5baaa7b
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/transform/Dependencies.scala
@@ -0,0 +1,266 @@
+package dotty.tools.dotc
+package transform
+
+import core.*
+import Symbols.*, Contexts.*, Types.*, Flags.*, Decorators.*
+import ast.Trees.*
+import SymUtils.*
+import collection.mutable.{LinkedHashMap, TreeSet}
+import annotation.constructorOnly
+
+/** Exposes the dependencies of the `root` tree in three functions or maps:
+ *  `freeVars`, `tracked`, and `logicalOwner`.
+ */
+abstract class Dependencies(root: ast.tpd.Tree, @constructorOnly rootContext: Context):
+  import ast.tpd._
+
+  /** The symbol is a method or a lazy val that will be mapped to a method */
+  protected def isExpr(sym: Symbol)(using Context): Boolean
+
+  /** The closest enclosing symbol in the current context for which `isExpr` is true */
+  protected def enclosure(using Context): Symbol
+
+  /** The set of free variables of a function, including free variables of its callees */
+  def freeVars(sym: Symbol): collection.Set[Symbol] = free.getOrElse(sym, Set.empty)
+
+  /** The set of functions that have free variables, i.e for which `freeVars` is non-empty */
+  def tracked: Iterable[Symbol] = free.keys
+
+  /** The outermost class that captures all free variables of a function
+   *  that are captured by enclosinh classes (this means that the function could
+   *  be placed in that class without having to add more environment parameters)
+   */
+  def logicalOwner: collection.Map[Symbol, Symbol] = logicOwner
+
+  private type SymSet = TreeSet[Symbol]
+
+  /** A map storing free variables of functions and classes */
+  private val free: LinkedHashMap[Symbol, SymSet] = new LinkedHashMap
+
+  /** A hashtable storing calls between functions */
+  private val called = new LinkedHashMap[Symbol, SymSet]
+
+  /** A map from local methods and classes to the owners to which they will be lifted as members.
+   *  For methods and classes that do not have any dependencies this will be the enclosing package.
+   *  symbols with packages as lifted owners will subsequently represented as static
+   *  members of their toplevel class, unless their enclosing class was already static.
+   *  Note: During tree transform (which runs at phase LambdaLift + 1), liftedOwner
+   *  is also used to decide whether a method had a term owner before.
+   */
+  private val logicOwner = new LinkedHashMap[Symbol, Symbol]
+
+  /** A flag to indicate whether new free variables have been found */
+  private var changedFreeVars: Boolean = _
+
+  /** A flag to indicate whether lifted owners have changed */
+  private var changedLogicOwner: Boolean = _
+
+  private val ord: Ordering[Symbol] = Ordering.by(_.id)
+  private def newSymSet = TreeSet.empty[Symbol](ord)
+
+  private def symSet(f: LinkedHashMap[Symbol, SymSet], sym: Symbol): SymSet =
+    f.getOrElseUpdate(sym, newSymSet)
+
+  /** A symbol is local if it is owned by a term or a local trait,
+   *  or if it is a constructor of a local symbol.
+   *  Note: we count members of local traits as local since their free variables
+   *  have to be passed on from their callers. By contrast, class members get their
+   *  free variable proxies from their enclosing class.
+   */
+  private def isLocal(sym: Symbol)(using Context): Boolean =
+    val owner = sym.maybeOwner
+    owner.isTerm
+    || owner.is(Trait) && isLocal(owner)
+    || sym.isConstructor && isLocal(owner)
+
+  /** Set `liftedOwner(sym)` to `owner` if `owner` is more deeply nested
+   *  than the previous value of `liftedowner(sym)`.
+   */
+  private def narrowLogicOwner(sym: Symbol, owner: Symbol)(using Context): Unit =
+    if sym.maybeOwner.isTerm
+        && owner.isProperlyContainedIn(logicOwner(sym))
+        && owner != sym
+    then
+      report.log(i"narrow lifted $sym to $owner")
+      changedLogicOwner = true
+      logicOwner(sym) = owner
+
+  /** Mark symbol `sym` as being free in `enclosure`, unless `sym` is defined
+   *  in `enclosure` or there is an intermediate class properly containing `enclosure`
+   *  in which `sym` is also free. Also, update `liftedOwner` of `enclosure` so
+   *  that `enclosure` can access `sym`, or its proxy in an intermediate class.
+   *  This means:
+   *
+   *    1. If there is an intermediate class in which `sym` is free, `enclosure`
+   *       must be contained in that class (in order to access the `sym proxy stored
+   *       in the class).
+   *
+   *    2. If there is no intermediate class, `enclosure` must be contained
+   *       in the class enclosing `sym`.
+   *
+   *  @return  If there is a non-trait class between `enclosure` and
+   *           the owner of `sym`, the largest such class.
+   *           Otherwise, if there is a trait between `enclosure` and
+   *           the owner of `sym`, the largest such trait.
+   *           Otherwise, NoSymbol.
+   *
+   *  @pre sym.owner.isTerm, (enclosure.isMethod || enclosure.isClass)
+   *
+   *  The idea of `markFree` is illustrated with an example:
+   *
+   *  def f(x: int) = {
+   *    class C {
+   *      class D {
+   *        val y = x
+   *      }
+   *    }
+   *  }
+   *
+   *  In this case `x` is free in the primary constructor of class `C`.
+   *  but it is not free in `D`, because after lambda lift the code would be transformed
+   *  as follows:
+   *
+   *  def f(x$0: int) {
+   *    class C(x$0: int) {
+   *      val x$1 = x$0
+   *      class D {
+   *        val y = outer.x$1
+   *      }
+   *    }
+   *  }
+   */
+  private def markFree(sym: Symbol, enclosure: Symbol)(using Context): Symbol =
+    import Dependencies.NoPath
+    try
+      if !enclosure.exists then throw NoPath()
+      if enclosure == sym.enclosure then NoSymbol
+      else
+        def nestedInConstructor(sym: Symbol): Boolean =
+          sym.isConstructor
+          || sym.isTerm && nestedInConstructor(sym.enclosure)
+        report.debuglog(i"mark free: ${sym.showLocated} with owner ${sym.maybeOwner} marked free in $enclosure")
+        val intermediate =
+          if enclosure.is(PackageClass) then enclosure
+          else if enclosure.isConstructor then markFree(sym, enclosure.owner.enclosure)
+          else markFree(sym, enclosure.enclosure)
+        if intermediate.exists then
+          narrowLogicOwner(enclosure, intermediate)
+        if !intermediate.isRealClass || nestedInConstructor(enclosure) then
+          // Constructors and methods nested inside traits get the free variables
+          // of the enclosing trait or class.
+          // Conversely, local traits do not get free variables.
+          // Methods inside constructors also don't have intermediates,
+          // need to get all their free variables passed directly.
+          if !enclosure.is(Trait) then
+            if symSet(free, enclosure).add(sym) then
+              changedFreeVars = true
+              report.log(i"$sym is free in $enclosure")
+        if intermediate.isRealClass then intermediate
+        else if enclosure.isRealClass then enclosure
+        else if intermediate.isClass then intermediate
+        else if enclosure.isClass then enclosure
+        else NoSymbol
+    catch case ex: NoPath =>
+      println(i"error lambda lifting ${ctx.compilationUnit}: $sym is not visible from $enclosure")
+      throw ex
+
+  private def markCalled(callee: Symbol, caller: Symbol)(using Context): Unit = {
+    report.debuglog(i"mark called: $callee of ${callee.owner} is called by $caller in ${caller.owner}")
+    assert(isLocal(callee))
+    symSet(called, caller) += callee
+  }
+
+  protected def process(tree: Tree)(using Context) =
+    val sym = tree.symbol
+
+    def narrowTo(thisClass: ClassSymbol) =
+      val enclMethod = enclosure
+      val enclClass = enclMethod.enclosingClass
+      narrowLogicOwner(enclMethod,
+        if enclClass.isContainedIn(thisClass) then thisClass
+        else enclClass) // unknown this reference, play it safe and assume the narrowest possible owner
+
+    tree match
+      case tree: Ident =>
+        if isLocal(sym) then
+          if isExpr(sym) then markCalled(sym, enclosure)
+          else if sym.isTerm then markFree(sym, enclosure)
+        def captureImplicitThis(x: Type): Unit = x match
+          case tr@TermRef(x, _) if !tr.termSymbol.isStatic => captureImplicitThis(x)
+          case x: ThisType if !x.tref.typeSymbol.isStaticOwner => narrowTo(x.tref.typeSymbol.asClass)
+          case _ =>
+        captureImplicitThis(tree.tpe)
+      case tree: Select =>
+        if isExpr(sym) && isLocal(sym) then markCalled(sym, enclosure)
+      case tree: This =>
+        narrowTo(tree.symbol.asClass)
+      case tree: MemberDef if isExpr(sym) && sym.owner.isTerm =>
+        logicOwner(sym) = sym.enclosingPackageClass
+          // this will make methods in supercall constructors of top-level classes owned
+          // by the enclosing package, which means they will be static.
+          // On the other hand, all other methods will be indirectly owned by their
+          // top-level class. This avoids possible deadlocks when a static method
+          // has to access its enclosing object from the outside.
+      case tree: DefDef if sym.isPrimaryConstructor && isLocal(sym.owner) && !sym.owner.is(Trait) =>
+        // add a call edge from the constructor of a local non-trait class to
+        // the class itself. This is done so that the constructor inherits
+        // the free variables of the class.
+        symSet(called, sym) += sym.owner
+      case tree: TypeDef =>
+        if sym.owner.isTerm then logicOwner(sym) = sym.topLevelClass.owner
+      case _ =>
+  end process
+
+  private class CollectDependencies extends TreeTraverser:
+    def traverse(tree: Tree)(using Context) =
+      try
+        process(tree)
+        traverseChildren(tree)
+      catch case ex: Exception =>
+        println(i"$ex while traversing $tree")
+        throw ex
+
+  /** Compute final free variables map `fvs by closing over caller dependencies. */
+  private def computeFreeVars()(using Context): Unit =
+    while
+      changedFreeVars = false
+      for
+        caller <- called.keys
+        callee <- called(caller)
+        fvs <- free get callee
+        fv <- fvs
+      do
+        markFree(fv, caller)
+      changedFreeVars
+    do ()
+
+  /** Compute final liftedOwner map by closing over caller dependencies */
+  private def computeLogicOwners()(using Context): Unit =
+    while
+      changedLogicOwner = false
+      for
+        caller <- called.keys
+        callee <- called(caller)
+      do
+        val normalizedCallee = callee.skipConstructor
+        val calleeOwner = normalizedCallee.owner
+        if calleeOwner.isTerm then narrowLogicOwner(caller, logicOwner(normalizedCallee))
+        else
+          assert(calleeOwner.is(Trait))
+          // methods nested inside local trait methods cannot be lifted out
+          // beyond the trait. Note that we can also call a trait method through
+          // a qualifier; in that case no restriction to lifted owner arises.
+          if caller.isContainedIn(calleeOwner) then
+            narrowLogicOwner(caller, calleeOwner)
+      changedLogicOwner
+    do ()
+
+  // initialization
+  inContext(rootContext) {
+    CollectDependencies().traverse(root)
+    computeFreeVars()
+    computeLogicOwners()
+  }
+object Dependencies:
+  private class NoPath extends Exception
+end Dependencies
diff --git a/compiler/src/dotty/tools/dotc/transform/DropOuterAccessors.scala b/compiler/src/dotty/tools/dotc/transform/DropOuterAccessors.scala
index c6b3785e99ed..e9322a450cb9 100644
--- a/compiler/src/dotty/tools/dotc/transform/DropOuterAccessors.scala
+++ b/compiler/src/dotty/tools/dotc/transform/DropOuterAccessors.scala
@@ -18,6 +18,7 @@ import annotation.threadUnsafe
 
 object DropOuterAccessors:
   val name: String = "dropOuterAccessors"
+  val description: String = "drop unused outer accessors"
 
 /** Drops unused outer accessors of inner classes that are visible only in one
  *  toplevel class. For other classes, we can't tell whether an outer accessor
@@ -29,6 +30,8 @@ class DropOuterAccessors extends MiniPhase with IdentityDenotTransformer:
 
   override def phaseName: String = DropOuterAccessors.name
 
+  override def description: String = DropOuterAccessors.description
+
   override def runsAfterGroupsOf: Set[String] = Set(CountOuterAccesses.name)
 
   override def changesMembers: Boolean = true // the phase drops outer accessors
diff --git a/compiler/src/dotty/tools/dotc/transform/ElimByName.scala b/compiler/src/dotty/tools/dotc/transform/ElimByName.scala
index aeed5ac76d39..3a91f6623243 100644
--- a/compiler/src/dotty/tools/dotc/transform/ElimByName.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ElimByName.scala
@@ -1,80 +1,163 @@
-package dotty.tools.dotc
+package dotty.tools
+package dotc
 package transform
 
 import core._
-import DenotTransformers.InfoTransformer
-import Symbols._
 import Contexts._
+import Symbols._
 import Types._
+import Flags._
+import SymDenotations.*
+import DenotTransformers.InfoTransformer
+import NameKinds.SuperArgName
 import core.StdNames.nme
-import ast.Trees._
+import MegaPhase.*
+import Decorators.*
+import typer.RefChecks
+import reporting.trace
 
-/** This phase eliminates ExprTypes `=> T` as types of method parameter references, and replaces them b
- *  nullary function types.  More precisely:
+/** This phase implements the following transformations:
  *
- *  For the types of parameter symbols:
+ *  1. For types of method and class parameters:
  *
- *         => T       ==>    () => T
+ *     => T     becomes    () ?=> T
  *
- *  For cbn parameter values
+ *  2. For references to cbn-parameters:
  *
- *         x          ==>    x()
+ *     x        becomes    x.apply()
  *
- *  Note: This scheme to have inconsistent types between method types (whose formal types are still
- *  ExprTypes and parameter valdefs (which are now FunctionTypes) is not pretty. There are two
- *  other options which have been abandoned or not yet pursued.
+ *  3. For arguments to cbn parameters
  *
- *  Option 1: Transform => T to () => T also in method and function types. The problem with this is
- *  that is that it requires to look at every type, and this forces too much, causing
- *  Cyclic Reference errors. Abandoned for this reason.
+ *     e        becomes    () ?=> e
  *
- *  Option 2: Merge ElimByName with erasure, or have it run immediately before. This has not been
- *  tried yet.
+ *  An optimization is applied: If the argument `e` to a cbn parameter is already
+ *  of type `() ?=> T` and is a pure expression, we avoid (2) and (3), i.e. we
+ *  pass `e` directly instead of `() ?=> e.apply()`.
+ *
+ *  Note that `() ?=> T`  cannot be written in source since user-defined context functions
+ *  must have at least one parameter. We use the type here as a convenient marker
+ *  of something that will erase to Function0, and where we know that it came from
+ *  a by-name parameter.
+ *
+ *  Note also that the transformation applies only to types of parameters, not to other
+ *  occurrences of ExprTypes. In particular, embedded occurrences in function types
+ *  such as `(=> T) => U` are left as-is here (they are eliminated in erasure).
+ *  Trying to convert these as well would mean traversing all the types, and that
+ *  leads to cyclic reference errors in many cases.  This can cause problems in that
+ *  we might have sometimes a `() ?=> T` where a `=> T` is expected. To compensate,
+ *  there is a new clause in TypeComparer#subArg that declares `() ?=> T` to be a
+ *  subtype of `=> T` for arguments of type applications at any point after this phase
+ *  and up to erasure.
  */
-class ElimByName extends TransformByNameApply with InfoTransformer {
+class ElimByName extends MiniPhase, InfoTransformer:
+  thisPhase =>
+
   import ast.tpd._
 
   override def phaseName: String = ElimByName.name
 
-  override def changesParents: Boolean = true // Only true for by-names
+  override def description: String = ElimByName.description
+
+  override def runsAfterGroupsOf: Set[String] = Set(ExpandSAMs.name, ElimRepeated.name, RefChecks.name)
+    // - ExpanSAMs applied to partial functions creates methods that need
+    //   to be fully defined before converting. Test case is pos/i9391.scala.
+    // - ElimByName needs to run in a group after ElimRepeated since ElimRepeated
+    //   works on simple arguments but not converted closures, and it sees the arguments
+    //   after transformations by subsequent miniphases in the same group.
+    // - ElimByName should run in a group after RefChecks, since RefChecks does heavy
+    //   comparisons of signatures, and ElimByName distorts these signatures by not
+    //   replacing `=>` with `() ?=> T` everywhere.
+
+  override def changesParents: Boolean = true
+    // Expr types in parent type arguments are changed to function types.
+
+  /** If denotation had an ExprType before, it now gets a function type */
+  private def exprBecomesFunction(symd: SymDenotation)(using Context): Boolean =
+    symd.is(Param) || symd.is(ParamAccessor, butNot = Method)
+
+  def transformInfo(tp: Type, sym: Symbol)(using Context): Type = tp match {
+    case ExprType(rt) if exprBecomesFunction(sym) =>
+      defn.ByNameFunction(rt)
+    case tp: MethodType =>
+      def exprToFun(tp: Type) = tp match
+        case ExprType(rt) => defn.ByNameFunction(rt)
+        case tp => tp
+      tp.derivedLambdaType(
+        paramInfos = tp.paramInfos.mapConserve(exprToFun),
+        resType = transformInfo(tp.resType, sym))
+    case tp: PolyType =>
+      tp.derivedLambdaType(resType = transformInfo(tp.resType, sym))
+    case _ => tp
+  }
 
-  /** Map `tree` to `tree.apply()` is `ftree` was of ExprType and becomes now a function */
-  private def applyIfFunction(tree: Tree, ftree: Tree)(using Context) =
-    if (isByNameRef(ftree)) {
+  override def infoMayChange(sym: Symbol)(using Context): Boolean =
+    sym.is(Method) || exprBecomesFunction(sym)
+
+  def byNameClosure(arg: Tree, argType: Type)(using Context): Tree =
+    val meth = newAnonFun(ctx.owner, MethodType(Nil, argType), coord = arg.span)
+    Closure(meth,
+        _ => arg.changeOwnerAfter(ctx.owner, meth, thisPhase),
+        targetType = defn.ByNameFunction(argType)
+      ).withSpan(arg.span)
+
+  private def isByNameRef(tree: Tree)(using Context): Boolean =
+    defn.isByNameFunction(tree.tpe.widen)
+
+  /** Map `tree` to `tree.apply()` is `tree` is of type `() ?=> T` */
+  private def applyIfFunction(tree: Tree)(using Context) =
+    if isByNameRef(tree) then
       val tree0 = transformFollowing(tree)
-      atPhase(next) { tree0.select(defn.Function0_apply).appliedToNone }
-    }
+      atPhase(next) { tree0.select(defn.ContextFunction0_apply).appliedToNone }
     else tree
 
   override def transformIdent(tree: Ident)(using Context): Tree =
-    applyIfFunction(tree, tree)
+    applyIfFunction(tree)
 
   override def transformSelect(tree: Select)(using Context): Tree =
-    applyIfFunction(tree, tree)
+    applyIfFunction(tree)
 
   override def transformTypeApply(tree: TypeApply)(using Context): Tree = tree match {
     case TypeApply(Select(_, nme.asInstanceOf_), arg :: Nil) =>
       // tree might be of form e.asInstanceOf[x.type] where x becomes a function.
       // See pos/t296.scala
-      applyIfFunction(tree, arg)
+      applyIfFunction(tree)
     case _ => tree
   }
 
+  override def transformApply(tree: Apply)(using Context): Tree =
+    trace(s"transforming ${tree.show} at phase ${ctx.phase}", show = true) {
+
+      def transformArg(arg: Tree, formal: Type): Tree = formal match
+        case defn.ByNameFunction(formalResult) =>
+          def stripTyped(t: Tree): Tree = t match
+            case Typed(expr, _) => stripTyped(expr)
+            case _ => t
+          stripTyped(arg) match
+            case Apply(Select(qual, nme.apply), Nil)
+            if isByNameRef(qual) && (isPureExpr(qual) || qual.symbol.isAllOf(InlineParam)) =>
+              qual
+            case _ =>
+              if isByNameRef(arg) || arg.symbol.name.is(SuperArgName)
+              then arg
+              else
+                var argType = arg.tpe.widenIfUnstable
+                if argType.isBottomType then argType = formalResult
+                byNameClosure(arg, argType)
+        case _ =>
+          arg
+
+      val mt @ MethodType(_) = tree.fun.tpe.widen
+      val args1 = tree.args.zipWithConserve(mt.paramInfos)(transformArg)
+      cpy.Apply(tree)(tree.fun, args1)
+    }
+
   override def transformValDef(tree: ValDef)(using Context): Tree =
     atPhase(next) {
-      if (exprBecomesFunction(tree.symbol))
+      if exprBecomesFunction(tree.symbol) then
         cpy.ValDef(tree)(tpt = tree.tpt.withType(tree.symbol.info))
       else tree
     }
 
-  def transformInfo(tp: Type, sym: Symbol)(using Context): Type = tp match {
-    case ExprType(rt) => defn.FunctionOf(Nil, rt)
-    case _ => tp
-  }
-
-  override def infoMayChange(sym: Symbol)(using Context): Boolean = sym.isTerm && exprBecomesFunction(sym)
-}
-
-object ElimByName {
+object ElimByName:
   val name: String = "elimByName"
-}
+  val description: String = "map by-name parameters to functions"
diff --git a/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala b/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala
index 6545d7653c6b..503561915040 100644
--- a/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala
@@ -13,6 +13,18 @@ import NameKinds.SuperAccessorName
 
 object ElimErasedValueType {
   val name: String = "elimErasedValueType"
+  val description: String = "expand erased value types to their underlying implmementation types"
+
+  def elimEVT(tp: Type)(using Context): Type = tp match {
+    case ErasedValueType(_, underlying) =>
+      elimEVT(underlying)
+    case tp: MethodType =>
+      val paramTypes = tp.paramInfos.mapConserve(elimEVT)
+      val retType = elimEVT(tp.resultType)
+      tp.derivedLambdaType(tp.paramNames, paramTypes, retType)
+    case _ =>
+      tp
+  }
 }
 
 /** This phase erases ErasedValueType to their underlying type.
@@ -25,9 +37,12 @@ object ElimErasedValueType {
 class ElimErasedValueType extends MiniPhase with InfoTransformer { thisPhase =>
 
   import tpd._
+  import ElimErasedValueType.elimEVT
 
   override def phaseName: String = ElimErasedValueType.name
 
+  override def description: String = ElimErasedValueType.description
+
   override def runsAfter: Set[String] = Set(Erasure.name)
 
   def transformInfo(tp: Type, sym: Symbol)(using Context): Type = sym match {
@@ -48,17 +63,6 @@ class ElimErasedValueType extends MiniPhase with InfoTransformer { thisPhase =>
       elimEVT(tp)
   }
 
-  def elimEVT(tp: Type)(using Context): Type = tp match {
-    case ErasedValueType(_, underlying) =>
-      elimEVT(underlying)
-    case tp: MethodType =>
-      val paramTypes = tp.paramInfos.mapConserve(elimEVT)
-      val retType = elimEVT(tp.resultType)
-      tp.derivedLambdaType(tp.paramNames, paramTypes, retType)
-    case _ =>
-      tp
-  }
-
   def transformTypeOfTree(tree: Tree)(using Context): Tree =
     tree.withType(elimEVT(tree.tpe))
 
@@ -116,7 +120,7 @@ class ElimErasedValueType extends MiniPhase with InfoTransformer { thisPhase =>
       // Do the test at the earliest phase where both symbols existed.
       val phaseId =
         sym1.originDenotation.validFor.firstPhaseId max sym2.originDenotation.validFor.firstPhaseId
-      atPhase(elimRepeatedPhase.next)(checkNoConflict(sym1, sym2, sym1.info))
+      atPhase(elimByNamePhase.next)(checkNoConflict(sym1, sym2, sym1.info))
       opc.next()
     }
   }
diff --git a/compiler/src/dotty/tools/dotc/transform/ElimOpaque.scala b/compiler/src/dotty/tools/dotc/transform/ElimOpaque.scala
index 3eca6ea6b28c..a6f9cbf7dbe9 100644
--- a/compiler/src/dotty/tools/dotc/transform/ElimOpaque.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ElimOpaque.scala
@@ -18,6 +18,7 @@ import ast.Trees._
 
 object ElimOpaque {
   val name: String = "elimOpaque"
+  val description: String = "turn opaque into normal aliases"
 }
 
 /** Rewrites opaque type aliases to normal alias types */
@@ -27,6 +28,8 @@ class ElimOpaque extends MiniPhase with DenotTransformer {
 
   override def phaseName: String = ElimOpaque.name
 
+  override def description: String = ElimOpaque.description
+
   // Override checks need to take place before treating opaque types as aliases
   override def runsAfterGroupsOf: Set[String] = Set(typer.RefChecks.name)
 
@@ -72,4 +75,4 @@ class ElimOpaque extends MiniPhase with DenotTransformer {
           tree
     else
       tree
-}
\ No newline at end of file
+}
diff --git a/compiler/src/dotty/tools/dotc/transform/ElimOuterSelect.scala b/compiler/src/dotty/tools/dotc/transform/ElimOuterSelect.scala
index 20a3c3223ea8..f161cd4f8cb7 100644
--- a/compiler/src/dotty/tools/dotc/transform/ElimOuterSelect.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ElimOuterSelect.scala
@@ -13,7 +13,9 @@ import NameKinds.OuterSelectName
 class ElimOuterSelect extends MiniPhase {
   import ast.tpd._
 
-  override def phaseName: String = "elimOuterSelect"
+  override def phaseName: String = ElimOuterSelect.name
+
+  override def description: String = ElimOuterSelect.description
 
   override def runsAfterGroupsOf: Set[String] = Set(ExplicitOuter.name)
     // ExplicitOuter needs to have run to completion before so that all classes
@@ -30,3 +32,7 @@ class ElimOuterSelect extends MiniPhase {
       case _ => tree
     }
 }
+
+object ElimOuterSelect:
+  val name: String = "elimOuterSelect"
+  val description: String = "expand outer selections"
diff --git a/compiler/src/dotty/tools/dotc/transform/ElimPackagePrefixes.scala b/compiler/src/dotty/tools/dotc/transform/ElimPackagePrefixes.scala
index 9179fb6c2d2c..83349f1f6199 100644
--- a/compiler/src/dotty/tools/dotc/transform/ElimPackagePrefixes.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ElimPackagePrefixes.scala
@@ -12,7 +12,9 @@ import MegaPhase.MiniPhase
  */
 class ElimPackagePrefixes extends MiniPhase {
 
-  override def phaseName: String = "elimPackagePrefixes"
+  override def phaseName: String = ElimPackagePrefixes.name
+
+  override def description: String = ElimPackagePrefixes.description
 
   override def transformSelect(tree: Select)(using Context): Tree =
     if (isPackageClassRef(tree)) Ident(tree.tpe.asInstanceOf[TypeRef]) else tree
@@ -29,3 +31,7 @@ class ElimPackagePrefixes extends MiniPhase {
     case _ => false
   }
 }
+
+object ElimPackagePrefixes:
+  val name: String = "elimPackagePrefixes"
+  val description: String = "eliminate references to package prefixes in Select nodes"
diff --git a/compiler/src/dotty/tools/dotc/transform/ElimPolyFunction.scala b/compiler/src/dotty/tools/dotc/transform/ElimPolyFunction.scala
index cb99e8ca9c8a..756ddd9bf0eb 100644
--- a/compiler/src/dotty/tools/dotc/transform/ElimPolyFunction.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ElimPolyFunction.scala
@@ -24,6 +24,8 @@ class ElimPolyFunction extends MiniPhase with DenotTransformer {
 
   override def phaseName: String = ElimPolyFunction.name
 
+  override def description: String = ElimPolyFunction.description
+
   override def runsAfter = Set(Erasure.name)
 
   override def changesParents: Boolean = true // Replaces PolyFunction by FunctionN
@@ -63,6 +65,7 @@ class ElimPolyFunction extends MiniPhase with DenotTransformer {
 }
 
 object ElimPolyFunction {
-  val name = "elimPolyFunction"
+  val name: String = "elimPolyFunction"
+  val description: String = "rewrite PolyFunction subclasses to FunctionN subclasses"
 }
 
diff --git a/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala b/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala
index f4d11f5a51a3..1ca258420aa2 100644
--- a/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala
@@ -1,4 +1,5 @@
-package dotty.tools.dotc
+package dotty.tools
+package dotc
 package transform
 
 import core._
@@ -14,9 +15,11 @@ import Decorators._
 import Denotations._, SymDenotations._
 import TypeErasure.erasure
 import DenotTransformers._
+import NullOpsDecorator._
 
 object ElimRepeated {
   val name: String = "elimRepeated"
+  val description: String = "rewrite vararg parameters and arguments"
 }
 
 /** A transformer that eliminates repeated parameters (T*) from all types, replacing
@@ -28,6 +31,8 @@ class ElimRepeated extends MiniPhase with InfoTransformer { thisPhase =>
 
   override def phaseName: String = ElimRepeated.name
 
+  override def description: String = ElimRepeated.description
+
   override def changesMembers: Boolean = true // the phase adds vararg forwarders
 
   def transformInfo(tp: Type, sym: Symbol)(using Context): Type =
@@ -76,16 +81,32 @@ class ElimRepeated extends MiniPhase with InfoTransformer { thisPhase =>
 
   override def infoMayChange(sym: Symbol)(using Context): Boolean = sym.is(Method)
 
-  private def overridesJava(sym: Symbol)(using Context) = sym.allOverriddenSymbols.exists(_.is(JavaDefined))
+  /** Does `sym` override a symbol defined in a Java class? One might think that
+   *  this can be expressed as
+   *
+   *      sym.allOverriddenSymbols.exists(_.is(JavaDefined))
+   *
+   *  but that does not work, since `allOverriddenSymbols` gets confused because the
+   *  signatures of a Java varargs method and a Scala varargs override are not the same.
+   */
+  private def overridesJava(sym: Symbol)(using Context) =
+    sym.owner.info.baseClasses.drop(1).exists { bc =>
+      bc.is(JavaDefined) && {
+        val other = bc.info.nonPrivateDecl(sym.name)
+        other.hasAltWith { alt =>
+          sym.owner.thisType.memberInfo(alt.symbol).matchesLoosely(sym.info)
+        }
+      }
+    }
 
   private def hasVarargsAnnotation(sym: Symbol)(using Context) = sym.hasAnnotation(defn.VarargsAnnot)
 
   private def parentHasVarargsAnnotation(sym: Symbol)(using Context) = sym.allOverriddenSymbols.exists(hasVarargsAnnotation)
 
   private def isVarargsMethod(sym: Symbol)(using Context) =
-    hasVarargsAnnotation(sym) ||
-      hasRepeatedParams(sym) &&
-      (sym.allOverriddenSymbols.exists(s => s.is(JavaDefined) || hasVarargsAnnotation(s)))
+    hasVarargsAnnotation(sym)
+    || hasRepeatedParams(sym)
+        && (overridesJava(sym) || sym.allOverriddenSymbols.exists(hasVarargsAnnotation))
 
   /** Eliminate repeated parameters from method types. */
   private def elimRepeated(tp: Type, isJava: Boolean)(using Context): Type = tp.stripTypeVar match
@@ -96,22 +117,7 @@ class ElimRepeated extends MiniPhase with InfoTransformer { thisPhase =>
         if lastIdx >= 0 then
           val last = paramTypes(lastIdx)
           if last.isRepeatedParam then
-            // We need to be careful when handling Java repeated parameters
-            // of the form `Object...` or `T...` where `T` is unbounded:
-            // in both cases, `Object` will have been translated to `FromJavaObject`
-            // to allow passing primitives as repeated arguments, but we can't
-            // pass a primitive array as argument to such a method since the
-            // parameter will be erased to `Object[]`. To handle this correctly we
-            // drop usage of `FromJavaObject` as an element type here, the
-            // tree transformer of this phase is then responsible for handling
-            // mismatches by emitting the correct adaptation (cf `adaptToArray`).
-            // See also the documentation of `FromJavaObjectSymbol`.
-            val last1 =
-              if isJava && last.elemType.isFromJavaObject then
-                defn.ArrayOf(TypeBounds.upper(defn.ObjectType))
-              else
-                last.translateFromRepeated(toArray = isJava)
-            paramTypes.updated(lastIdx, last1)
+            paramTypes.updated(lastIdx, last.translateFromRepeated(toArray = isJava))
           else paramTypes
         else paramTypes
       tp.derivedLambdaType(paramNames, paramTypes1, resultType1)
@@ -126,8 +132,7 @@ class ElimRepeated extends MiniPhase with InfoTransformer { thisPhase =>
         val isJavaDefined = tree.fun.symbol.is(JavaDefined)
         val tpe = arg.expr.tpe
         if isJavaDefined then
-          val pt = tree.fun.tpe.widen.firstParamTypes.last
-          adaptToArray(arg.expr, pt.elemType.bounds.hi)
+          adaptToArray(arg.expr)
         else if tpe.derivesFrom(defn.ArrayClass) then
           arrayToSeq(arg.expr)
         else
@@ -136,58 +141,25 @@ class ElimRepeated extends MiniPhase with InfoTransformer { thisPhase =>
     }
     cpy.Apply(tree)(tree.fun, args)
 
-  /** Convert sequence argument to Java array */
-  private def seqToArray(tree: Tree)(using Context): Tree = tree match
+  private def adaptToArray(tree: Tree)(implicit ctx: Context): Tree = tree match
     case SeqLiteral(elems, elemtpt) =>
-      JavaSeqLiteral(elems, elemtpt)
+      JavaSeqLiteral(elems, elemtpt).withSpan(tree.span)
     case _ =>
-      val elemType = tree.tpe.elemType
-      var elemClass = erasure(elemType).classSymbol
-      if defn.NotRuntimeClasses.contains(elemClass) then
-        elemClass = defn.ObjectClass
-      end if
-      ref(defn.DottyArraysModule)
-        .select(nme.seqToArray)
-        .appliedToType(elemType)
-        .appliedTo(tree, clsOf(elemClass.typeRef))
-
-  /** Adapt a Seq or Array tree to be a subtype of `Array[_ <: $elemPt]`.
-   *
-   *  @pre `elemPt` must either be a super type of the argument element type or `Object`.
-   *        The special handling of `Object` is required to deal with the translation
-   *        of generic Java varargs in `elimRepeated`.
-   */
-  private def adaptToArray(tree: Tree, elemPt: Type)(implicit ctx: Context): Tree =
-    val elemTp = tree.tpe.elemType
-    val elemTpMatches = elemTp <:< elemPt
-    val treeIsArray = tree.tpe.derivesFrom(defn.ArrayClass)
-    if elemTpMatches && treeIsArray then
-      tree // No adaptation necessary
-    else tree match
-      case SeqLiteral(elems, elemtpt) =>
-        // By the precondition, we only have mismatches if elemPt is Object, in
-        // that case we use `FromJavaObject` as the element type to allow the
-        // sequence literal to typecheck no matter the types of the elements,
-        // Erasure will take care of any necessary boxing (see documentation
-        // of `FromJavaObjectSymbol` for more information).
-        val adaptedElemTpt = if elemTpMatches then elemtpt else TypeTree(defn.FromJavaObjectType)
-        JavaSeqLiteral(elems, adaptedElemTpt).withSpan(tree.span)
-      case _ =>
-        if treeIsArray then
-          // Convert an Array[T] to an Array[Object]
-          ref(defn.ScalaRuntime_toObjectArray)
-            .appliedTo(tree)
-        else if elemTpMatches then
-          // Convert a Seq[T] to an Array[$elemPt]
-          ref(defn.DottyArraysModule)
-            .select(nme.seqToArray)
-            .appliedToType(elemPt)
-            .appliedTo(tree, clsOf(elemPt))
+      val elemTp = tree.tpe.elemType
+      val adapted =
+        if tree.tpe.derivesFrom(defn.ArrayClass) then
+          tree
         else
-          // Convert a Seq[T] to an Array[Object]
-          ref(defn.ScalaRuntime_toArray)
-            .appliedToType(elemTp)
-            .appliedTo(tree)
+          ref(defn.DottyArraysModule)
+          .select(nme.seqToArray)
+          .appliedToType(elemTp)
+          .appliedTo(tree, clsOf(elemTp))
+      // This seemingly redundant type ascription is needed because the result
+      // type of `adapted` might be erased to `Object`, but we need to keep
+      // the precise result type at erasure for `Erasure.Boxing.cast` to adapt
+      // a primitive array into a reference array if needed.
+      // Test case in tests/run/t1360.scala.
+      Typed(adapted, TypeTree(defn.ArrayOf(elemTp)))
 
   /** Convert an Array into a scala.Seq */
   private def arrayToSeq(tree: Tree)(using Context): Tree =
@@ -288,10 +260,11 @@ class ElimRepeated extends MiniPhase with InfoTransformer { thisPhase =>
         val src =
           if hasAnnotation then "@varargs"
           else if isBridge then "overriding a java varargs method"
-          else "@varargs (on overriden method)"
+          else "@varargs (on overridden method)"
         report.error(s"$src produces a forwarder method that conflicts with ${conflict.showDcl}", original.srcPos)
       case Nil =>
         forwarder.enteredAfter(thisPhase)
+  end addVarArgsForwarder
 
   /** Convert type from Scala to Java varargs method */
   private def toJavaVarArgs(tp: Type)(using Context): Type = tp match
@@ -317,6 +290,9 @@ class ElimRepeated extends MiniPhase with InfoTransformer { thisPhase =>
     val array = tp.translateFromRepeated(toArray = true) // Array[? <: T]
     val element = array.elemType.hiBound // T
 
-    if element <:< defn.AnyRefType || element.typeSymbol.isPrimitiveValueClass then array
+
+    if element <:< defn.AnyRefType
+      || ctx.mode.is(Mode.SafeNulls) && element.stripNull <:< defn.AnyRefType
+      || element.typeSymbol.isPrimitiveValueClass then array
     else defn.ArrayOf(TypeBounds.upper(AndType(element, defn.AnyRefType))) // Array[? <: T & AnyRef]
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/ElimStaticThis.scala b/compiler/src/dotty/tools/dotc/transform/ElimStaticThis.scala
index 8bf188a6a2de..02612253c735 100644
--- a/compiler/src/dotty/tools/dotc/transform/ElimStaticThis.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ElimStaticThis.scala
@@ -13,7 +13,10 @@ import dotty.tools.dotc.core.Types.{ThisType, TermRef}
  */
 class ElimStaticThis extends MiniPhase {
   import ast.tpd._
-  def phaseName: String = "elimStaticThis"
+
+  override def phaseName: String = ElimStaticThis.name
+
+  override def description: String = ElimStaticThis.description
 
   override def transformThis(tree: This)(using Context): Tree =
     if (!tree.symbol.is(Package) && ctx.owner.enclosingMethod.is(JavaStatic)) {
@@ -34,3 +37,7 @@ class ElimStaticThis extends MiniPhase {
       }
     else tree
 }
+
+object ElimStaticThis:
+  val name: String = "elimStaticThis"
+  val description: String = "replace This references to static objects by global identifiers"
diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala
index 915aaf371219..d16cc2f66f51 100644
--- a/compiler/src/dotty/tools/dotc/transform/Erasure.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Erasure.scala
@@ -12,7 +12,7 @@ import core.Types._
 import core.Names._
 import core.StdNames._
 import core.NameOps._
-import core.NameKinds.{AdaptedClosureName, BodyRetainerName}
+import core.NameKinds.{AdaptedClosureName, BodyRetainerName, DirectMethName}
 import core.Scopes.newScopeWith
 import core.Decorators._
 import core.Constants._
@@ -42,6 +42,8 @@ class Erasure extends Phase with DenotTransformer {
 
   override def phaseName: String = Erasure.name
 
+  override def description: String = Erasure.description
+
   /** List of names of phases that should precede this phase */
   override def runsAfter: Set[String] = Set(InterceptedMethods.name, ElimRepeated.name)
 
@@ -58,6 +60,18 @@ class Erasure extends Phase with DenotTransformer {
           }
         }
 
+      def erasedName =
+        if ref.is(Flags.Method)
+            && contextResultsAreErased(ref.symbol)
+            && (ref.owner.is(Flags.Trait) || ref.symbol.allOverriddenSymbols.hasNext)
+        then
+          // Add a `$direct` to prevent this method from having the same signature
+          // as a method it overrides. We need a bridge between the
+          // two methods, so they are not allowed to already override after erasure.
+          DirectMethName(ref.targetName.asTermName)
+        else
+          ref.targetName
+
       assert(ctx.phase == this, s"transforming $ref at ${ctx.phase}")
       if (ref.symbol eq defn.ObjectClass) {
         // After erasure, all former Any members are now Object members
@@ -80,7 +94,7 @@ class Erasure extends Phase with DenotTransformer {
         val oldOwner = ref.owner
         val newOwner = if oldOwner == defn.AnyClass then defn.ObjectClass else oldOwner
         val oldName = ref.name
-        val newName = ref.targetName
+        val newName = erasedName
         val oldInfo = ref.info
         var newInfo = transformInfo(oldSymbol, oldInfo)
         val oldFlags = ref.flags
@@ -191,6 +205,7 @@ object Erasure {
   import TypeTestsCasts._
 
   val name: String = "erasure"
+  val description: String = "rewrite types to JVM model"
 
   /** An attachment on Apply nodes indicating that multiple arguments
    *  are passed in a single array. This occurs only if the function
@@ -325,6 +340,13 @@ object Erasure {
       assert(!pt.isInstanceOf[SingletonType], pt)
       if (pt isRef defn.UnitClass) unbox(tree, pt)
       else (tree.tpe.widen, pt) match {
+        // Convert primitive arrays into reference arrays, this path is only
+        // needed to handle repeated arguments, see
+        // `Definitions#FromJavaObjectSymbol` and `ElimRepeated#adaptToArray`.
+        case (JavaArrayType(treeElem), JavaArrayType(ptElem))
+        if treeElem.widen.isPrimitiveValueType && !ptElem.isPrimitiveValueType =>
+          cast(ref(defn.ScalaRuntime_toObjectArray).appliedTo(tree), pt)
+
         // When casting between two EVTs, we need to check which one underlies the other to determine
         // whether u2evt or evt2u should be used.
         case (tp1 @ ErasedValueType(tycon1, underlying1), tp2 @ ErasedValueType(tycon2, underlying2)) =>
@@ -365,8 +387,8 @@ object Erasure {
       case _: FunProto | AnyFunctionProto => tree
       case _ => tree.tpe.widen match
         case mt: MethodType if tree.isTerm =>
-          if mt.paramInfos.isEmpty then adaptToType(tree.appliedToNone, pt)
-          else etaExpand(tree, mt, pt)
+          assert(mt.paramInfos.isEmpty)
+          adaptToType(tree.appliedToNone, pt)
         case tpw =>
           if (pt.isInstanceOf[ProtoType] || tree.tpe <:< pt)
             tree
@@ -385,7 +407,6 @@ object Erasure {
             cast(tree, pt)
     end adaptToType
 
-
     /** The following code:
      *
      *      val f: Function1[Int, Any] = x => ...
@@ -516,61 +537,6 @@ object Erasure {
       else
         tree
     end adaptClosure
-
-    /** Eta expand given `tree` that has the given method type `mt`, so that
-     *  it conforms to erased result type `pt`.
-     *  To do this correctly, we have to look at the tree's original pre-erasure
-     *  type and figure out which context function types in its result are
-     *  not yet instantiated.
-     */
-    def etaExpand(tree: Tree, mt: MethodType, pt: Type)(using Context): Tree =
-      report.log(i"eta expanding $tree")
-      val defs = new mutable.ListBuffer[Tree]
-      val tree1 = LiftErased.liftApp(defs, tree)
-      val xmt = if tree.isInstanceOf[Apply] then mt else expandedMethodType(mt, tree)
-      val targetLength = xmt.paramInfos.length
-      val origOwner = ctx.owner
-
-      // The original type from which closures should be constructed
-      val origType = contextFunctionResultTypeCovering(tree.symbol, targetLength)
-
-      def abstracted(args: List[Tree], tp: Type, pt: Type)(using Context): Tree =
-        if args.length < targetLength then
-          try
-            val defn.ContextFunctionType(argTpes, resTpe, isErased) = tp: @unchecked
-            if isErased then abstracted(args, resTpe, pt)
-            else
-              val anonFun = newSymbol(
-                ctx.owner, nme.ANON_FUN, Flags.Synthetic | Flags.Method,
-                MethodType(argTpes, resTpe), coord = tree.span.endPos)
-              anonFun.info = transformInfo(anonFun, anonFun.info)
-              def lambdaBody(refss: List[List[Tree]]) =
-                val refs :: Nil = refss: @unchecked
-                val expandedRefs = refs.map(_.withSpan(tree.span.endPos)) match
-                  case (bunchedParam @ Ident(nme.ALLARGS)) :: Nil =>
-                    argTpes.indices.toList.map(n =>
-                      bunchedParam
-                        .select(nme.primitive.arrayApply)
-                        .appliedTo(Literal(Constant(n))))
-                  case refs1 => refs1
-                abstracted(args ::: expandedRefs, resTpe, anonFun.info.finalResultType)(
-                  using ctx.withOwner(anonFun))
-
-              val unadapted = Closure(anonFun, lambdaBody)
-              cpy.Block(unadapted)(unadapted.stats, adaptClosure(unadapted.expr.asInstanceOf[Closure]))
-          catch case ex: MatchError =>
-            println(i"error while abstracting tree = $tree | mt = $mt | args = $args%, % | tp = $tp | pt = $pt")
-            throw ex
-        else
-          assert(args.length == targetLength, i"wrong # args tree = $tree | args = $args%, % | mt = $mt | tree type = ${tree.tpe}")
-          val app = untpd.cpy.Apply(tree1)(tree1, args)
-          assert(ctx.typer.isInstanceOf[Erasure.Typer])
-          ctx.typer.typed(app, pt)
-            .changeOwnerAfter(origOwner, ctx.owner, erasurePhase.asInstanceOf[Erasure])
-
-      seq(defs.toList, abstracted(Nil, origType, pt))
-    end etaExpand
-
   end Boxing
 
   class Typer(erasurePhase: DenotTransformer) extends typer.ReTyper with NoChecking {
@@ -586,8 +552,14 @@ object Erasure {
       */
     private def checkNotErased(tree: Tree)(using Context): tree.type = {
       if (!ctx.mode.is(Mode.Type)) {
-        if (isErased(tree))
-          report.error(em"${tree.symbol} is declared as erased, but is in fact used", tree.srcPos)
+        if isErased(tree) then
+          val msg =
+            if tree.symbol.is(Flags.Inline) then
+              em"""${tree.symbol} is declared as `inline`, but was not inlined
+                  |
+                  |Try increasing `-Xmax-inlines` above ${ctx.settings.XmaxInlines.value}""".stripMargin
+            else em"${tree.symbol} is declared as `erased`, but is in fact used"
+          report.error(msg, tree.srcPos)
         tree.symbol.getAnnotation(defn.CompileTimeOnlyAnnot) match {
           case Some(annot) =>
             def defaultMsg =
@@ -698,16 +670,24 @@ object Erasure {
       def mapOwner(sym: Symbol): Symbol =
         if !sym.exists && tree.name == nme.apply then
           // PolyFunction apply Selects will not have a symbol, so deduce the owner
-          // from the typed qual.
-          val owner = qual1.tpe.typeSymbol
-          if defn.isFunctionClass(owner) then owner else NoSymbol
+          // from the typed tree of the erasure of the original qualifier's PolyFunction type.
+          // We cannot simply call `erasure` on the qualifier because its erasure might be
+          // `Object` due to how we erase intersections (see pos/i13950.scala).
+          // Instead, we manually lookup the type of `apply` in the qualifier.
+          inContext(preErasureCtx) {
+            val qualTp = tree.qualifier.typeOpt.widen
+            if qualTp.derivesFrom(defn.PolyFunctionClass) then
+              erasePolyFunctionApply(qualTp.select(nme.apply).widen).classSymbol
+            else
+              NoSymbol
+          }
         else
           val owner = sym.maybeOwner
           if defn.specialErasure.contains(owner) then
             assert(sym.isConstructor, s"${sym.showLocated}")
             defn.specialErasure(owner)
           else if defn.isSyntheticFunctionClass(owner) then
-            defn.erasedFunctionClass(owner)
+            defn.functionTypeErasure(owner).typeSymbol
           else
             owner
 
@@ -718,7 +698,7 @@ object Erasure {
 
       val owner = mapOwner(origSym)
       val sym = if (owner eq origSym.maybeOwner) origSym else owner.info.decl(tree.name).symbol
-      assert(sym.exists, origSym.showLocated)
+      assert(sym.exists, i"no owner from $owner/${origSym.showLocated} in $tree")
 
       if owner == defn.ObjectClass then checkValue(qual1)
 
@@ -828,49 +808,46 @@ object Erasure {
      */
     override def typedApply(tree: untpd.Apply, pt: Type)(using Context): Tree =
       val Apply(fun, args) = tree
-      if fun.symbol == defn.cbnArg then
-        typedUnadapted(args.head, pt)
-      else
-        val origFun = fun.asInstanceOf[tpd.Tree]
-        val origFunType = origFun.tpe.widen(using preErasureCtx)
-        val ownArgs = if origFunType.isErasedMethod then Nil else args
-        val fun1 = typedExpr(fun, AnyFunctionProto)
-        fun1.tpe.widen match
-          case mt: MethodType =>
-            val (xmt,        // A method type like `mt` but with bunched arguments expanded to individual ones
-                 bunchArgs,  // whether arguments are bunched
-                 outers) =   // the outer reference parameter(s)
-              if fun1.isInstanceOf[Apply] then
-                (mt, fun1.removeAttachment(BunchedArgs).isDefined, Nil)
-              else
-                val xmt = expandedMethodType(mt, origFun)
-                (xmt, xmt ne mt, outer.args(origFun))
-
-            val args0 = outers ::: ownArgs
-            val args1 = args0.zipWithConserve(xmt.paramInfos)(typedExpr)
-              .asInstanceOf[List[Tree]]
-
-            def mkApply(finalFun: Tree, finalArgs: List[Tree]) =
-              val app = untpd.cpy.Apply(tree)(finalFun, finalArgs)
-                .withType(applyResultType(xmt, args1))
-              if bunchArgs then app.withAttachment(BunchedArgs, ()) else app
-
-            def app(fun1: Tree): Tree = fun1 match
-              case Block(stats, expr) =>
-                cpy.Block(fun1)(stats, app(expr))
-              case Apply(fun2, SeqLiteral(prevArgs, argTpt) :: _) if bunchArgs =>
-                mkApply(fun2, JavaSeqLiteral(prevArgs ++ args1, argTpt) :: Nil)
-              case Apply(fun2, prevArgs) =>
-                mkApply(fun2, prevArgs ++ args1)
-              case _ if bunchArgs =>
-                mkApply(fun1, JavaSeqLiteral(args1, TypeTree(defn.ObjectType)) :: Nil)
-              case _ =>
-                mkApply(fun1, args1)
-
-            app(fun1)
-          case t =>
-            if ownArgs.isEmpty then fun1
-            else throw new MatchError(i"tree $tree has unexpected type of function $fun/$fun1: $t, was $origFunType, args = $ownArgs")
+      val origFun = fun.asInstanceOf[tpd.Tree]
+      val origFunType = origFun.tpe.widen(using preErasureCtx)
+      val ownArgs = if origFunType.isErasedMethod then Nil else args
+      val fun1 = typedExpr(fun, AnyFunctionProto)
+      fun1.tpe.widen match
+        case mt: MethodType =>
+          val (xmt,        // A method type like `mt` but with bunched arguments expanded to individual ones
+                bunchArgs,  // whether arguments are bunched
+                outers) =   // the outer reference parameter(s)
+            if fun1.isInstanceOf[Apply] then
+              (mt, fun1.removeAttachment(BunchedArgs).isDefined, Nil)
+            else
+              val xmt = expandedMethodType(mt, origFun)
+              (xmt, xmt ne mt, outer.args(origFun))
+
+          val args0 = outers ::: ownArgs
+          val args1 = args0.zipWithConserve(xmt.paramInfos)(typedExpr)
+            .asInstanceOf[List[Tree]]
+
+          def mkApply(finalFun: Tree, finalArgs: List[Tree]) =
+            val app = untpd.cpy.Apply(tree)(finalFun, finalArgs)
+              .withType(applyResultType(xmt, args1))
+            if bunchArgs then app.withAttachment(BunchedArgs, ()) else app
+
+          def app(fun1: Tree): Tree = fun1 match
+            case Block(stats, expr) =>
+              cpy.Block(fun1)(stats, app(expr))
+            case Apply(fun2, SeqLiteral(prevArgs, argTpt) :: _) if bunchArgs =>
+              mkApply(fun2, JavaSeqLiteral(prevArgs ++ args1, argTpt) :: Nil)
+            case Apply(fun2, prevArgs) =>
+              mkApply(fun2, prevArgs ++ args1)
+            case _ if bunchArgs =>
+              mkApply(fun1, JavaSeqLiteral(args1, TypeTree(defn.ObjectType)) :: Nil)
+            case _ =>
+              mkApply(fun1, args1)
+
+          app(fun1)
+        case t =>
+          if ownArgs.isEmpty then fun1
+          else throw new MatchError(i"tree $tree has unexpected type of function $fun/$fun1: $t, was $origFunType, args = $ownArgs")
     end typedApply
 
     // The following four methods take as the proto-type the erasure of the pre-existing type,
@@ -960,7 +937,7 @@ object Erasure {
       if constr.isConstructor && needsOuterParam(constr.owner.asClass) then
         constr.info match
           case MethodTpe(outerName :: _, outerType :: _, _) =>
-            val outerSym = newSymbol(constr, outerName, Flags.Param, outerType)
+            val outerSym = newSymbol(constr, outerName, Flags.Param | Flags.SyntheticArtifact, outerType)
             ValDef(outerSym) :: Nil
           case _ =>
             // There's a possible race condition that a constructor was looked at
@@ -1038,24 +1015,9 @@ object Erasure {
     override def typedTypeDef(tdef: untpd.TypeDef, sym: Symbol)(using Context): Tree =
       EmptyTree
 
-    /** Drop all constructor proxies of members of class `cls`.
-     *  If `cls` is itself a constructor proxy, mark it as absent after erasure.
-     */
-    private def dropConstructorProxies(cls: ClassSymbol)(using Context) =
-      import Flags._
-      if cls.linkedClass.is(ConstructorProxy) then
-        if cls.owner.is(PackageClass) && cls.isDefinedInCurrentRun then
-          cls.linkedClass.copySymDenotation(initFlags = EmptyFlags, info = NoType)
-            .installAfter(erasurePhase)
-        cls.registeredCompanion = NoSymbol
-      for mbr <- cls.info.decls do
-        if mbr.is(ConstructorProxy) then mbr.dropAfter(erasurePhase)
-
     override def typedClassDef(cdef: untpd.TypeDef, cls: ClassSymbol)(using Context): Tree =
       if cls.is(Flags.Erased) then erasedDef(cls)
-      else
-        try super.typedClassDef(cdef, cls)
-        finally dropConstructorProxies(cls)
+      else super.typedClassDef(cdef, cls)
 
     override def typedAnnotated(tree: untpd.Annotated, pt: Type)(using Context): Tree =
       typed(tree.arg, pt)
diff --git a/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala b/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala
new file mode 100644
index 000000000000..ab5190daf0e8
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala
@@ -0,0 +1,50 @@
+package dotty.tools
+package dotc
+package transform
+
+import MegaPhase.MiniPhase
+import core.*
+import Symbols.*, Contexts.*, Types.*, Decorators.*
+import StdNames.nme
+import ast.Trees.*
+
+/** Rewrite `(x1, ... xN) => f(x1, ... xN)` for N >= 0 to `f`,
+ *  provided `f` is a pure path of function type.
+ *
+ *  This optimization is crucial for context functions. The compiler
+ *  produces a contextual closure around values passed as arguments
+ *  where a context function is expected, unless that value has the
+ *  syntactic form of a context function literal.
+ *
+ *  Without this phase, when a contextual function is passed as an argument to a
+ *  recursive function, that would have the unfortunate effect of a linear growth
+ *  in transient thunks of identical type wrapped around each other, leading
+ *  to performance degradation, and in some cases, stack overflows.
+ */
+class EtaReduce extends MiniPhase:
+  import ast.tpd._
+
+  override def phaseName: String = EtaReduce.name
+
+  override def description: String = EtaReduce.description
+
+  override def transformBlock(tree: Block)(using Context): Tree = tree match
+    case Block((meth : DefDef) :: Nil, closure: Closure)
+    if meth.symbol == closure.meth.symbol =>
+      meth.rhs match
+        case Apply(Select(fn, nme.apply), args)
+        if meth.paramss.head.corresponds(args)((param, arg) =>
+              arg.isInstanceOf[Ident] && arg.symbol == param.symbol)
+            && isPurePath(fn)
+            && fn.tpe <:< tree.tpe
+            && defn.isFunctionClass(fn.tpe.widen.typeSymbol) =>
+          report.log(i"eta reducing $tree --> $fn")
+          fn
+        case _ => tree
+    case _ => tree
+
+end EtaReduce
+
+object EtaReduce:
+  val name: String = "etaReduce"
+  val description: String = "reduce eta expansions of pure paths"
diff --git a/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala b/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala
index a9f2aaec2052..f02f6b61d588 100644
--- a/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala
@@ -32,7 +32,9 @@ import ValueClasses._
 class ExpandPrivate extends MiniPhase with IdentityDenotTransformer { thisPhase =>
   import ast.tpd._
 
-  override def phaseName: String = "expandPrivate"
+  override def phaseName: String = ExpandPrivate.name
+
+  override def description: String = ExpandPrivate.description
 
   // This phase moves methods around (in infotransform) so it may need to make other methods public
   override def runsAfter: Set[String] = Set(MoveStatics.name)
@@ -111,3 +113,7 @@ class ExpandPrivate extends MiniPhase with IdentityDenotTransformer { thisPhase
     tree
   }
 }
+
+object ExpandPrivate:
+  val name: String = "expandPrivate"
+  val description: String = "widen private definitions accessed from nested classes"
diff --git a/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala
index a152ec3ed981..0a2e49501278 100644
--- a/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala
@@ -1,12 +1,15 @@
-package dotty.tools.dotc
+package dotty.tools
+package dotc
 package transform
 
 import core._
+import Scopes.newScope
 import Contexts._, Symbols._, Types._, Flags._, Decorators._, StdNames._, Constants._
 import MegaPhase._
 import SymUtils._
 import NullOpsDecorator._
 import ast.Trees._
+import ast.untpd
 import reporting._
 import dotty.tools.dotc.util.Spans.Span
 
@@ -25,6 +28,7 @@ import dotty.tools.dotc.util.Spans.Span
  */
 object ExpandSAMs:
   val name: String = "expandSAMs"
+  val description: String = "expand SAM closures to anonymous classes"
 
   /** Is the SAMType `cls` also a SAM under the rules of the platform? */
   def isPlatformSam(cls: ClassSymbol)(using Context): Boolean =
@@ -40,6 +44,8 @@ class ExpandSAMs extends MiniPhase:
 
   override def phaseName: String = ExpandSAMs.name
 
+  override def description: String = ExpandSAMs.description
+
   override def transformBlock(tree: Block)(using Context): Tree = tree match {
     case Block(stats @ (fn: DefDef) :: Nil, Closure(_, fnRef, tpt)) if fnRef.symbol == fn.symbol =>
       tpt.tpe match {
@@ -103,78 +109,73 @@ class ExpandSAMs extends MiniPhase:
    *  ```
    */
   private def toPartialFunction(tree: Block, tpe: Type)(using Context): Tree = {
-    /** An extractor for match, either contained in a block or standalone. */
-    object PartialFunctionRHS {
-      def unapply(tree: Tree): Option[Match] = tree match {
-        case Block(Nil, expr) => unapply(expr)
-        case m: Match => Some(m)
-        case _ => None
-      }
-    }
-
     val closureDef(anon @ DefDef(_, List(List(param)), _, _)) = tree
-    anon.rhs match {
-      case PartialFunctionRHS(pf) =>
-        val anonSym = anon.symbol
-        val anonTpe = anon.tpe.widen
-        val parents = List(
-          defn.AbstractPartialFunctionClass.typeRef.appliedTo(anonTpe.firstParamTypes.head, anonTpe.resultType),
-          defn.SerializableType)
-        val pfSym = newNormalizedClassSymbol(anonSym.owner, tpnme.ANON_CLASS, Synthetic | Final, parents, coord = tree.span)
-
-        def overrideSym(sym: Symbol) = sym.copy(
-          owner = pfSym,
-          flags = Synthetic | Method | Final | Override,
-          info = tpe.memberInfo(sym),
-          coord = tree.span).asTerm.entered
-        val isDefinedAtFn = overrideSym(defn.PartialFunction_isDefinedAt)
-        val applyOrElseFn = overrideSym(defn.PartialFunction_applyOrElse)
-
-        def translateMatch(tree: Match, pfParam: Symbol, cases: List[CaseDef], defaultValue: Tree)(using Context) = {
-          val selector = tree.selector
-          val selectorTpe = selector.tpe.widen
-          val defaultSym = newSymbol(pfParam.owner, nme.WILDCARD, Synthetic | Case, selectorTpe)
-          val defaultCase =
-            CaseDef(
-              Bind(defaultSym, Underscore(selectorTpe)),
-              EmptyTree,
-              defaultValue)
-          val unchecked = selector.annotated(New(ref(defn.UncheckedAnnot.typeRef)))
-          cpy.Match(tree)(unchecked, cases :+ defaultCase)
-            .subst(param.symbol :: Nil, pfParam :: Nil)
-              // Needed because  a partial function can be written as:
-              // param => param match { case "foo" if foo(param) => param }
-              // And we need to update all references to 'param'
-        }
-
-        def isDefinedAtRhs(paramRefss: List[List[Tree]])(using Context) = {
-          val tru = Literal(Constant(true))
-          def translateCase(cdef: CaseDef) =
-            cpy.CaseDef(cdef)(body = tru).changeOwner(anonSym, isDefinedAtFn)
-          val paramRef = paramRefss.head.head
-          val defaultValue = Literal(Constant(false))
-          translateMatch(pf, paramRef.symbol, pf.cases.map(translateCase), defaultValue)
-        }
-
-        def applyOrElseRhs(paramRefss: List[List[Tree]])(using Context) = {
-          val List(paramRef, defaultRef) = paramRefss(1)
-          def translateCase(cdef: CaseDef) =
-            cdef.changeOwner(anonSym, applyOrElseFn)
-          val defaultValue = defaultRef.select(nme.apply).appliedTo(paramRef)
-          translateMatch(pf, paramRef.symbol, pf.cases.map(translateCase), defaultValue)
-        }
-
-        val constr = newConstructor(pfSym, Synthetic, Nil, Nil).entered
-        val isDefinedAtDef = transformFollowingDeep(DefDef(isDefinedAtFn, isDefinedAtRhs(_)(using ctx.withOwner(isDefinedAtFn))))
-        val applyOrElseDef = transformFollowingDeep(DefDef(applyOrElseFn, applyOrElseRhs(_)(using ctx.withOwner(applyOrElseFn))))
-        val pfDef = ClassDef(pfSym, DefDef(constr), List(isDefinedAtDef, applyOrElseDef))
-        cpy.Block(tree)(pfDef :: Nil, New(pfSym.typeRef, Nil))
 
+    // The right hand side from which to construct the partial function. This is always a Match.
+    // If the original rhs is already a Match (possibly in braces), return that.
+    // Otherwise construct a match `x match case _ => rhs` where `x` is the parameter of the closure.
+    def partialFunRHS(tree: Tree): Match = tree match
+      case m: Match => m
+      case Block(Nil, expr) => partialFunRHS(expr)
       case _ =>
-        val found = tpe.baseType(defn.Function1)
-        report.error(TypeMismatch(found, tpe), tree.srcPos)
-        tree
+        Match(ref(param.symbol),
+          CaseDef(untpd.Ident(nme.WILDCARD).withType(param.symbol.info), EmptyTree, tree) :: Nil)
+
+    val pfRHS = partialFunRHS(anon.rhs)
+    val anonSym = anon.symbol
+    val anonTpe = anon.tpe.widen
+    val parents = List(
+      defn.AbstractPartialFunctionClass.typeRef.appliedTo(anonTpe.firstParamTypes.head, anonTpe.resultType),
+      defn.SerializableType)
+    val pfSym = newNormalizedClassSymbol(anonSym.owner, tpnme.ANON_CLASS, Synthetic | Final, parents, newScope, coord = tree.span)
+
+    def overrideSym(sym: Symbol) = sym.copy(
+      owner = pfSym,
+      flags = Synthetic | Method | Final | Override,
+      info = tpe.memberInfo(sym),
+      coord = tree.span).asTerm.entered
+    val isDefinedAtFn = overrideSym(defn.PartialFunction_isDefinedAt)
+    val applyOrElseFn = overrideSym(defn.PartialFunction_applyOrElse)
+
+    def translateMatch(tree: Match, pfParam: Symbol, cases: List[CaseDef], defaultValue: Tree)(using Context) = {
+      val selector = tree.selector
+      val selectorTpe = selector.tpe.widen
+      val defaultSym = newSymbol(pfParam.owner, nme.WILDCARD, Synthetic | Case, selectorTpe)
+      val defaultCase =
+        CaseDef(
+          Bind(defaultSym, Underscore(selectorTpe)),
+          EmptyTree,
+          defaultValue)
+      val unchecked = selector.annotated(New(ref(defn.UncheckedAnnot.typeRef)))
+      cpy.Match(tree)(unchecked, cases :+ defaultCase)
+        .subst(param.symbol :: Nil, pfParam :: Nil)
+          // Needed because  a partial function can be written as:
+          // param => param match { case "foo" if foo(param) => param }
+          // And we need to update all references to 'param'
     }
+
+    def isDefinedAtRhs(paramRefss: List[List[Tree]])(using Context) = {
+      val tru = Literal(Constant(true))
+      def translateCase(cdef: CaseDef) =
+        cpy.CaseDef(cdef)(body = tru).changeOwner(anonSym, isDefinedAtFn)
+      val paramRef = paramRefss.head.head
+      val defaultValue = Literal(Constant(false))
+      translateMatch(pfRHS, paramRef.symbol, pfRHS.cases.map(translateCase), defaultValue)
+    }
+
+    def applyOrElseRhs(paramRefss: List[List[Tree]])(using Context) = {
+      val List(paramRef, defaultRef) = paramRefss(1)
+      def translateCase(cdef: CaseDef) =
+        cdef.changeOwner(anonSym, applyOrElseFn)
+      val defaultValue = defaultRef.select(nme.apply).appliedTo(paramRef)
+      translateMatch(pfRHS, paramRef.symbol, pfRHS.cases.map(translateCase), defaultValue)
+    }
+
+    val constr = newConstructor(pfSym, Synthetic, Nil, Nil).entered
+    val isDefinedAtDef = transformFollowingDeep(DefDef(isDefinedAtFn, isDefinedAtRhs(_)(using ctx.withOwner(isDefinedAtFn))))
+    val applyOrElseDef = transformFollowingDeep(DefDef(applyOrElseFn, applyOrElseRhs(_)(using ctx.withOwner(applyOrElseFn))))
+    val pfDef = ClassDef(pfSym, DefDef(constr), List(isDefinedAtDef, applyOrElseDef))
+    cpy.Block(tree)(pfDef :: Nil, New(pfSym.typeRef, Nil))
   }
 
   private def checkRefinements(tpe: Type, tree: Tree)(using Context): Type = tpe.dealias match {
diff --git a/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala b/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala
index 8b13633e6125..1ae915a1fc10 100644
--- a/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala
@@ -40,10 +40,10 @@ class ExplicitOuter extends MiniPhase with InfoTransformer { thisPhase =>
 
   override def phaseName: String = ExplicitOuter.name
 
-  /** List of names of phases that should have finished their processing of all compilation units
-    * before this phase starts
-    */
-  override def runsAfter: Set[String] = Set(PatternMatcher.name, HoistSuperArgs.name)
+  override def description: String = ExplicitOuter.description
+
+  override def runsAfter:         Set[String] = Set(HoistSuperArgs.name)
+  override def runsAfterGroupsOf: Set[String] = Set(PatternMatcher.name)
 
   override def changesMembers: Boolean = true // the phase adds outer accessors
 
@@ -127,6 +127,7 @@ object ExplicitOuter {
   import ast.tpd._
 
   val name: String = "explicitOuter"
+  val description: String = "add accessors to outer classes from nested ones"
 
   /** Ensure that class `cls` has outer accessors */
   def ensureOuterAccessors(cls: ClassSymbol)(using Context): Unit =
@@ -179,7 +180,7 @@ object ExplicitOuter {
           else prefix.widen)
     val info = if (flags.is(Method)) ExprType(target) else target
     atPhaseNoEarlier(explicitOuterPhase.next) { // outer accessors are entered at explicitOuter + 1, should not be defined before.
-      newSymbol(owner, name, Synthetic | flags, info, coord = cls.coord)
+      newSymbol(owner, name, SyntheticArtifact | flags, info, coord = cls.coord)
     }
   }
 
@@ -282,6 +283,10 @@ object ExplicitOuter {
       case TypeRef(prefix, _) => isOuterRef(prefix)
       case _ => false
     }
+    def containsOuterRefs(tp: Type): Boolean = tp match
+      case tp: SingletonType => isOuterRef(tp)
+      case tp: AndOrType => containsOuterRefs(tp.tp1) || containsOuterRefs(tp.tp2)
+      case _ => false
     tree match {
       case _: This | _: Ident => isOuterRef(tree.tpe)
       case nw: New =>
@@ -292,6 +297,9 @@ object ExplicitOuter {
           // newCls might get proxies for free variables. If current class is
           // properly contained in newCls, it needs an outer path to newCls access the
           // proxies and forward them to the new instance.
+      case app: TypeApply if app.symbol.isTypeTest =>
+        // Type tests of singletons translate to `eq` tests with references, which might require outer pointers
+        containsOuterRefs(app.args.head.tpe)
       case _ =>
         false
     }
diff --git a/compiler/src/dotty/tools/dotc/transform/ExplicitSelf.scala b/compiler/src/dotty/tools/dotc/transform/ExplicitSelf.scala
index 3a2bda437d80..0398ac7f8d19 100644
--- a/compiler/src/dotty/tools/dotc/transform/ExplicitSelf.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ExplicitSelf.scala
@@ -21,7 +21,9 @@ import Contexts._, Types._, MegaPhase._, ast.Trees._, Symbols._, Decorators._, F
 class ExplicitSelf extends MiniPhase {
   import ast.tpd._
 
-  override def phaseName: String = "explicitSelf"
+  override def phaseName: String = ExplicitSelf.name
+
+  override def description: String = ExplicitSelf.description
 
   private def needsCast(tree: RefTree, cls: ClassSymbol)(using Context) =
     !cls.is(Package) && cls.givenSelfType.exists && !cls.derivesFrom(tree.symbol.owner)
@@ -49,3 +51,7 @@ class ExplicitSelf extends MiniPhase {
     case _ => tree
   }
 }
+
+object ExplicitSelf:
+  val  name: String = "explicitSelf"
+  val description: String = "make references to non-trivial self types explicit as casts"
diff --git a/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala b/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala
index 546c4e18c633..27aee2d445d9 100644
--- a/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala
@@ -41,9 +41,10 @@ class ExtensionMethods extends MiniPhase with DenotTransformer with FullParamete
   import tpd._
   import ExtensionMethods._
 
-  /** the following two members override abstract members in Transform */
   override def phaseName: String = ExtensionMethods.name
 
+  override def description: String = ExtensionMethods.description
+
   override def runsAfter: Set[String] = Set(
     ElimRepeated.name,
     ProtectedAccessors.name,  // protected accessors cannot handle code that is moved from class to companion object
@@ -174,6 +175,7 @@ class ExtensionMethods extends MiniPhase with DenotTransformer with FullParamete
 
 object ExtensionMethods {
   val name: String = "extmethods"
+  val description: String = "expand methods of value classes with extension methods"
 
   /** Name of the extension method that corresponds to given instance method `meth`. */
   def extensionName(imeth: Symbol)(using Context): TermName =
diff --git a/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala b/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala
index 1ff9edda16d8..b01fc0a992df 100644
--- a/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala
+++ b/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala
@@ -22,10 +22,12 @@ import TypeUtils.isErasedValueType
 
 object FirstTransform {
   val name: String = "firstTransform"
+  val description: String = "some transformations to put trees into a canonical form"
 }
 
 /** The first tree transform
- *   - eliminates some kinds of trees: Imports, NamedArgs
+ *   - eliminates some kinds of trees: Imports other than language imports,
+ *     Exports, NamedArgs, type trees other than TypeTree
  *   - stubs out native methods
  *   - eliminates self tree in Template and self symbol in ClassInfo
  *   - collapses all type trees to trees of class TypeTree
@@ -39,6 +41,8 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase =>
 
   override def phaseName: String = FirstTransform.name
 
+  override def description: String = FirstTransform.description
+
   /** eliminate self symbol in ClassInfo */
   override def transformInfo(tp: Type, sym: Symbol)(using Context): Type = tp match {
     case tp @ ClassInfo(_, _, _, _, self: Symbol) =>
@@ -58,7 +62,7 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase =>
             tree.symbol.is(JavaStatic) && qualTpe.derivesFrom(tree.symbol.enclosingClass),
           i"non member selection of ${tree.symbol.showLocated} from ${qualTpe} in $tree")
       case _: TypeTree =>
-      case _: Import | _: NamedArg | _: TypTree =>
+      case _: Export | _: NamedArg | _: TypTree =>
         assert(false, i"illegal tree: $tree")
       case _ =>
     }
@@ -136,7 +140,8 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase =>
   }
 
   override def transformOther(tree: Tree)(using Context): Tree = tree match {
-    case tree: ImportOrExport => EmptyTree
+    case tree: Import if untpd.languageImport(tree.expr).isEmpty => EmptyTree
+    case tree: Export => EmptyTree
     case tree: NamedArg => transformAllDeep(tree.arg)
     case tree => if (tree.isType) toTypeTree(tree) else tree
   }
diff --git a/compiler/src/dotty/tools/dotc/transform/Flatten.scala b/compiler/src/dotty/tools/dotc/transform/Flatten.scala
index 2009076e5846..678a202709e0 100644
--- a/compiler/src/dotty/tools/dotc/transform/Flatten.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Flatten.scala
@@ -14,7 +14,9 @@ import util.Store
 class Flatten extends MiniPhase with SymTransformer {
   import ast.tpd._
 
-  override def phaseName: String = "flatten"
+  override def phaseName: String = Flatten.name
+
+  override def description: String = Flatten.description
 
   // private[this] and protected[this] modifiers must be dropped
   // before classes are lifted. Getters drop these modifiers.
@@ -56,3 +58,7 @@ class Flatten extends MiniPhase with SymTransformer {
   override def transformTypeDef(tree: TypeDef)(using Context): Tree =
     liftIfNested(tree)
 }
+
+object Flatten:
+  val name: String = "flatten"
+  val description: String = "lift all inner classes to package scope"
diff --git a/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala b/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala
new file mode 100644
index 000000000000..e01c975d0f0d
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala
@@ -0,0 +1,114 @@
+package dotty.tools
+package dotc
+package transform
+
+import core.*
+import Symbols.*, Types.*, Contexts.*, Flags.*, Decorators.*, reporting.*
+import util.Spans.Span
+import util.Store
+import collection.immutable
+import ast.tpd
+import MegaPhase.MiniPhase
+
+object ForwardDepChecks:
+
+  import tpd.*
+
+  val name: String = "forwardDepChecks"
+  val description: String = "ensure no forward references to local vals"
+
+  type LevelAndIndex = immutable.Map[Symbol, (LevelInfo, Int)]
+
+  class OptLevelInfo {
+    def levelAndIndex: LevelAndIndex = Map()
+    def enterReference(sym: Symbol, span: Span): Unit = ()
+  }
+
+  /** A class to help in forward reference checking */
+  class LevelInfo(outerLevelAndIndex: LevelAndIndex, stats: List[Tree])(using Context)
+  extends OptLevelInfo {
+    override val levelAndIndex: LevelAndIndex =
+      stats.foldLeft(outerLevelAndIndex, 0) {(mi, stat) =>
+        val (m, idx) = mi
+        val m1 = stat match {
+          case stat: MemberDef => m.updated(stat.symbol, (this, idx))
+          case _ => m
+        }
+        (m1, idx + 1)
+      }._1
+    var maxIndex: Int = Int.MinValue
+    var refSpan: Span = _
+    var refSym: Symbol = _
+
+    override def enterReference(sym: Symbol, span: Span): Unit =
+      if (sym.exists && sym.owner.isTerm)
+        levelAndIndex.get(sym) match {
+          case Some((level, idx)) if (level.maxIndex < idx) =>
+            level.maxIndex = idx
+            level.refSpan = span
+            level.refSym = sym
+          case _ =>
+        }
+  }
+
+  val NoLevelInfo: OptLevelInfo = new OptLevelInfo()
+
+class ForwardDepChecks extends MiniPhase:
+  import ForwardDepChecks.*
+  import tpd.*
+
+  override def phaseName: String = ForwardDepChecks.name
+
+  override def description: String = ForwardDepChecks.description
+
+  override def runsAfter: Set[String] = Set(ElimByName.name)
+
+  private var LevelInfo: Store.Location[OptLevelInfo] = _
+  private def currentLevel(using Context): OptLevelInfo = ctx.store(LevelInfo)
+
+  override def initContext(ctx: FreshContext): Unit =
+    LevelInfo = ctx.addLocation(NoLevelInfo)
+
+  override def prepareForStats(trees: List[Tree])(using Context): Context =
+    if (ctx.owner.isTerm)
+      ctx.fresh.updateStore(LevelInfo, new LevelInfo(currentLevel.levelAndIndex, trees))
+    else ctx
+
+  override def transformValDef(tree: ValDef)(using Context): ValDef =
+    val sym = tree.symbol
+    if sym.exists && sym.owner.isTerm && !sym.is(Lazy) then
+      currentLevel.levelAndIndex.get(sym) match
+        case Some((level, symIdx)) if symIdx <= level.maxIndex =>
+          report.error(ForwardReferenceExtendsOverDefinition(sym, level.refSym),
+            ctx.source.atSpan(level.refSpan))
+        case _ =>
+    tree
+
+  override def transformIdent(tree: Ident)(using Context): Ident = {
+    currentLevel.enterReference(tree.symbol, tree.span)
+    tree
+  }
+
+  override def transformApply(tree: Apply)(using Context): Apply = {
+    if (isSelfConstrCall(tree)) {
+      assert(currentLevel.isInstanceOf[LevelInfo], s"${ctx.owner}/" + i"$tree")
+      val level = currentLevel.asInstanceOf[LevelInfo]
+      if (level.maxIndex > 0) {
+        // An implementation restriction to avoid VerifyErrors and lazyvals mishaps; see SI-4717
+        report.debuglog("refsym = " + level.refSym)
+        report.error("forward reference not allowed from self constructor invocation",
+          ctx.source.atSpan(level.refSpan))
+      }
+    }
+    tree
+  }
+
+  override def transformNew(tree: New)(using Context): New = {
+    currentLevel.enterReference(tree.tpe.typeSymbol, tree.span)
+    tree.tpe.dealias.foreachPart {
+      case TermRef(_, s: Symbol) => currentLevel.enterReference(s, tree.span)
+      case _ =>
+    }
+    tree
+  }
+end ForwardDepChecks
diff --git a/compiler/src/dotty/tools/dotc/transform/FunctionXXLForwarders.scala b/compiler/src/dotty/tools/dotc/transform/FunctionXXLForwarders.scala
index 4fd075aa0dba..a7fa5c0fe909 100644
--- a/compiler/src/dotty/tools/dotc/transform/FunctionXXLForwarders.scala
+++ b/compiler/src/dotty/tools/dotc/transform/FunctionXXLForwarders.scala
@@ -25,7 +25,9 @@ import Types._
 class FunctionXXLForwarders extends MiniPhase with IdentityDenotTransformer {
   import ast.tpd._
 
-  override def phaseName: String = "functionXXLForwarders"
+  override def phaseName: String = FunctionXXLForwarders.name
+
+  override def description: String = FunctionXXLForwarders.description
 
   override def transformTemplate(impl: Template)(using Context): Template = {
 
@@ -59,3 +61,6 @@ class FunctionXXLForwarders extends MiniPhase with IdentityDenotTransformer {
   }
 }
 
+object FunctionXXLForwarders:
+  val name: String = "functionXXLForwarders"
+  val description: String = "add forwarders for FunctionXXL apply methods"
diff --git a/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala b/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala
index e2977a03e804..c18009784ba9 100644
--- a/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala
+++ b/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala
@@ -81,21 +81,14 @@ object GenericSignatures {
       val (repr :: _, others) = splitIntersection(bounds)
       builder.append(':')
 
-      // According to the Java spec
-      // (https://docs.oracle.com/javase/specs/jls/se8/html/jls-4.html#jls-4.4),
-      // intersections erase to their first member and must start with a class.
-      // So, if our intersection erases to a trait, in theory we should emit
-      // just that trait in the generic signature even if the intersection type
-      // is composed of multiple traits. But in practice Scala 2 has always
-      // ignored this restriction as intersections of traits seem to be handled
-      // correctly by javac, we do the same here since type soundness seems
-      // more important than adhering to the spec.
+      // In Java, intersections always erase to their first member, so put
+      // whatever parent erases to the Scala intersection erasure first in the
+      // signature.
       if repr.classSymbol.is(Trait) then
+        // An initial ':' is needed if the intersection starts with an interface
+        // (cf https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-TypeParameter)
         builder.append(':')
-        boxedSig(repr)
-        // If we wanted to be compliant with the spec, we would `return` here.
-      else
-        boxedSig(repr)
+      boxedSig(repr)
       others.filter(_.classSymbol.is(Trait)).foreach { tp =>
         builder.append(':')
         boxedSig(tp)
@@ -131,10 +124,10 @@ object GenericSignatures {
      */
     def splitIntersection(parents: List[Type])(using Context): (List[Type], List[Type]) =
       val erasedParents = parents.map(erasure)
-      val erasedCls = erasedGlb(erasedParents).classSymbol
+      val erasedTp = erasedGlb(erasedParents)
       parents.zip(erasedParents)
         .partitionMap((parent, erasedParent) =>
-          if erasedParent.classSymbol eq erasedCls then
+          if erasedParent =:= erasedTp then
             Left(parent)
           else
             Right(parent))
@@ -281,10 +274,10 @@ object GenericSignatures {
               jsig(erasedUnderlying, toplevel, primitiveOK)
           }
           else if (defn.isSyntheticFunctionClass(sym)) {
-            val erasedSym = defn.erasedFunctionClass(sym)
+            val erasedSym = defn.functionTypeErasure(sym).typeSymbol
             classSig(erasedSym, pre, if (erasedSym.typeParams.isEmpty) Nil else args)
           }
-          else if (sym.isClass)
+          else if sym.isClass then
             classSig(sym, pre, args)
           else
             jsig(erasure(tp), toplevel, primitiveOK)
@@ -298,7 +291,7 @@ object GenericSignatures {
 
         case PolyType(tparams, mtpe: MethodType) =>
           assert(tparams.nonEmpty)
-          if (toplevel) polyParamSig(tparams)
+          if (toplevel && !sym0.isConstructor) polyParamSig(tparams)
           jsig(mtpe)
 
         // Nullary polymorphic method
@@ -462,7 +455,7 @@ object GenericSignatures {
   private class NeedsSigCollector(using Context) extends TypeAccumulator[Boolean] {
     override def apply(x: Boolean, tp: Type): Boolean =
       if (!x)
-        tp match {
+        tp.dealias match {
           case RefinedType(parent, refinedName, refinedInfo) =>
             val sym = parent.typeSymbol
             if (sym == defn.ArrayClass) foldOver(x, refinedInfo)
@@ -478,9 +471,9 @@ object GenericSignatures {
             foldOver(tp.typeParams.nonEmpty, parents)
           case AnnotatedType(tpe, _) =>
             foldOver(x, tpe)
-          case proxy: TypeProxy =>
-            foldOver(x, proxy)
-          case _ =>
+          case ExprType(tpe) =>
+            true
+          case tp =>
             foldOver(x, tp)
         }
       else x
diff --git a/compiler/src/dotty/tools/dotc/transform/Getters.scala b/compiler/src/dotty/tools/dotc/transform/Getters.scala
index 7e5ea9c81b2a..2a46185a0512 100644
--- a/compiler/src/dotty/tools/dotc/transform/Getters.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Getters.scala
@@ -62,6 +62,8 @@ class Getters extends MiniPhase with SymTransformer { thisPhase =>
 
   override def phaseName: String = Getters.name
 
+  override def description: String = Getters.description
+
   override def transformSym(d: SymDenotation)(using Context): SymDenotation = {
     def noGetterNeeded =
       d.isOneOf(NoGetterNeededFlags) ||
@@ -120,4 +122,5 @@ class Getters extends MiniPhase with SymTransformer { thisPhase =>
 
 object Getters {
   val name: String = "getters"
+  val description: String = "replace non-private vals and vars with getter defs"
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala b/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala
index ca584561b711..3233601310ae 100644
--- a/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala
+++ b/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala
@@ -16,6 +16,7 @@ import SymUtils._
 
 object HoistSuperArgs {
   val name: String = "hoistSuperArgs"
+  val description: String = "hoist complex arguments of supercalls to enclosing scope"
 }
 
 /** This phase hoists complex arguments of supercalls and this-calls out of the enclosing class.
@@ -43,12 +44,12 @@ object HoistSuperArgs {
 class HoistSuperArgs extends MiniPhase with IdentityDenotTransformer { thisPhase =>
   import ast.tpd._
 
-  def phaseName: String = HoistSuperArgs.name
+  override def phaseName: String = HoistSuperArgs.name
 
-  override def runsAfter: Set[String] = Set(ByNameClosures.name)
+  override def description: String = HoistSuperArgs.description
+
+  override def runsAfter: Set[String] = Set(ElimByName.name)
     // By name closures need to be introduced first in order to be hoisted out here.
-    // There's an interaction with by name closures in that the <cbn-arg> marker
-    // application should not be hoisted, but be left at the point of call.
 
   /** Defines methods for hoisting complex supercall arguments out of
    *  parent super calls and constructor definitions.
@@ -88,7 +89,7 @@ class HoistSuperArgs extends MiniPhase with IdentityDenotTransformer { thisPhase
       def newSuperArgMethod(argType: Type) = {
         val (staticFlag, methOwner) =
           if (cls.owner.is(Package)) (JavaStatic, cls) else (EmptyFlags, cls.owner)
-        val argTypeWrtConstr = argType.subst(origParams, allParamRefs(constr.info))
+        val argTypeWrtConstr = argType.widenTermRefExpr.subst(origParams, allParamRefs(constr.info))
         // argType with references to paramRefs of the primary constructor instead of
         // local parameter accessors
         newSymbol(
@@ -126,8 +127,6 @@ class HoistSuperArgs extends MiniPhase with IdentityDenotTransformer { thisPhase
 
       // begin hoistSuperArg
       arg match {
-        case Apply(fn, arg1 :: Nil) if fn.symbol == defn.cbnArg =>
-          cpy.Apply(arg)(fn, hoistSuperArg(arg1, cdef) :: Nil)
         case _ if arg.existsSubTree(needsHoist) =>
           val superMeth = newSuperArgMethod(arg.tpe)
           val superArgDef = DefDef(superMeth, prefss => {
diff --git a/compiler/src/dotty/tools/dotc/transform/InlinePatterns.scala b/compiler/src/dotty/tools/dotc/transform/InlinePatterns.scala
index fdef553a835d..80f7402dfc53 100644
--- a/compiler/src/dotty/tools/dotc/transform/InlinePatterns.scala
+++ b/compiler/src/dotty/tools/dotc/transform/InlinePatterns.scala
@@ -29,7 +29,9 @@ import ast.TreeTypeMap
 class InlinePatterns extends MiniPhase:
   import ast.tpd._
 
-  def phaseName: String = "inlinePatterns"
+  override def phaseName: String = InlinePatterns.name
+
+  override def description: String = InlinePatterns.description
 
   // This phase needs to run after because it need to transform trees that are generated
   // by the pattern matcher but are still not visible in that group of phases.
@@ -59,3 +61,8 @@ class InlinePatterns extends MiniPhase:
           case List(ddef @ DefDef(`name`, _, _, _)) => BetaReduce(ddef, args)
           case _ => tree
       case _ => tree
+
+object InlinePatterns:
+  val name: String = "inlinePatterns"
+  val description: String = "remove placeholders of inlined patterns"
+
diff --git a/compiler/src/dotty/tools/dotc/transform/InlineVals.scala b/compiler/src/dotty/tools/dotc/transform/InlineVals.scala
index 9c3dc295d207..25fb573ccf10 100644
--- a/compiler/src/dotty/tools/dotc/transform/InlineVals.scala
+++ b/compiler/src/dotty/tools/dotc/transform/InlineVals.scala
@@ -14,7 +14,9 @@ import dotty.tools.dotc.typer.Inliner
 class InlineVals extends MiniPhase:
   import ast.tpd._
 
-  def phaseName: String = "inlineVals"
+  override def phaseName: String = InlineVals.name
+
+  override def description: String = InlineVals.description
 
   override def checkPostCondition(tree: Tree)(using Context): Unit =
     if !ctx.erasedTypes then
@@ -33,15 +35,25 @@ class InlineVals extends MiniPhase:
     then
       val rhs = tree.rhs
       val tpt = tree.tpt
-      tpt.tpe.widenTermRefExpr.dealias.normalized match
+      tpt.tpe.widenTermRefExpr.dealiasKeepOpaques.normalized match
         case tp: ConstantType =>
           if !isPureExpr(rhs) then
             val details = if enclosingInlineds.isEmpty then "" else em"but was: $rhs"
             report.error(s"inline value must be pure$details", rhs.srcPos)
         case tp =>
-          if tp.derivesFrom(defn.StringClass) || defn.ScalaValueClasses().exists(tp.derivesFrom(_)) then
+          if tp.typeSymbol.is(Opaque) then
+            report.error(em"The type of an `inline val` cannot be an opaque type.\n\nTo inline, consider using `inline def` instead", rhs)
+          else if tp.derivesFrom(defn.UnitClass) then
+            report.error(em"`inline val` of type `Unit` is not supported.\n\nTo inline a `Unit` consider using `inline def`", rhs)
+          else if tp.derivesFrom(defn.StringClass) || defn.ScalaValueClasses().exists(tp.derivesFrom(_)) then
             val pos = if tpt.span.isZeroExtent then rhs.srcPos else tpt.srcPos
             report.error(em"inline value must have a literal constant type", pos)
+          else if tp.derivesFrom(defn.NullClass) then
+            report.error(em"`inline val` with `null` is not supported.\n\nTo inline a `null` consider using `inline def`", rhs)
           else
             report.error(em"inline value must contain a literal constant value.\n\nTo inline more complex types consider using `inline def`", rhs)
-  }
\ No newline at end of file
+  }
+
+object InlineVals:
+  val name: String = "inlineVals"
+  val description: String = "check right hand-sides of an `inline val`s"
diff --git a/compiler/src/dotty/tools/dotc/transform/Inlining.scala b/compiler/src/dotty/tools/dotc/transform/Inlining.scala
index 7b6a45ce3cda..32805ed0d596 100644
--- a/compiler/src/dotty/tools/dotc/transform/Inlining.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Inlining.scala
@@ -11,11 +11,11 @@ import Constants._
 import ast.Trees._
 import ast.{TreeTypeMap, untpd}
 import util.Spans._
-import tasty.TreePickler.Hole
 import SymUtils._
 import NameKinds._
 import dotty.tools.dotc.ast.tpd
 import typer.Implicits.SearchFailureType
+import typer.PrepareInlineable
 
 import scala.collection.mutable
 import dotty.tools.dotc.core.Annotations._
@@ -37,6 +37,8 @@ class Inlining extends MacroTransform {
 
   override def phaseName: String = Inlining.name
 
+  override def description: String = Inlining.description
+
   override def allowsImplicitSearch: Boolean = true
 
   override def run(using Context): Unit =
@@ -98,3 +100,4 @@ class Inlining extends MacroTransform {
 
 object Inlining:
   val name: String = "inlining"
+  val description: String = "inline and execute macros"
diff --git a/compiler/src/dotty/tools/dotc/transform/Instrumentation.scala b/compiler/src/dotty/tools/dotc/transform/Instrumentation.scala
index 676cf00e2f46..12d845ca9a68 100644
--- a/compiler/src/dotty/tools/dotc/transform/Instrumentation.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Instrumentation.scala
@@ -23,7 +23,9 @@ import Constants.Constant
 class Instrumentation extends MiniPhase { thisPhase =>
   import ast.tpd._
 
-  override def phaseName: String = "instrumentation"
+  override def phaseName: String = Instrumentation.name
+
+  override def description: String = Instrumentation.description
 
   override def isEnabled(using Context) =
     ctx.settings.Yinstrument.value
@@ -105,3 +107,7 @@ class Instrumentation extends MiniPhase { thisPhase =>
       tree
   }
 }
+
+object Instrumentation:
+  val name: String = "instrumentation"
+  val description: String = "count calls and allocations under -Yinstrument"
diff --git a/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala b/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala
index 0b42162643f8..a2ec4da70c1c 100644
--- a/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala
+++ b/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala
@@ -13,6 +13,7 @@ import dotty.tools.dotc.transform.MegaPhase.MiniPhase
 
 object InterceptedMethods {
   val name: String = "intercepted"
+  val description: String = "handling of `==`, `|=`, `getClass` methods"
 }
 
 /** Replace member references as follows:
@@ -27,6 +28,8 @@ class InterceptedMethods extends MiniPhase {
 
   override def phaseName: String = InterceptedMethods.name
 
+  override def description: String = InterceptedMethods.description
+
   // this should be removed if we have guarantee that ## will get Apply node
   override def transformSelect(tree: tpd.Select)(using Context): Tree =
     transformRefTree(tree)
diff --git a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
index 58d4d7083d32..ce392c636a76 100644
--- a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
+++ b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
@@ -17,22 +17,38 @@ import ast.Trees._
 import SymUtils._
 import ExplicitOuter.outer
 import util.Store
-import collection.mutable
-import collection.mutable.{ HashMap, HashSet, LinkedHashMap, TreeSet }
+import collection.mutable.{HashMap, LinkedHashMap, ListBuffer}
 
-object LambdaLift {
+object LambdaLift:
   import ast.tpd._
-  private class NoPath extends Exception
 
   val name: String = "lambdaLift"
+  val description: String = "lifts out nested functions to class scope"
 
   /** The core lambda lift functionality. */
-  class Lifter(thisPhase: MiniPhase with DenotTransformer)(using Context) {
+  class Lifter(thisPhase: MiniPhase & DenotTransformer)(using Context):
 
-    private type SymSet = TreeSet[Symbol]
+    /** The outer parameter of a constructor */
+    private val outerParam = new HashMap[Symbol, Symbol]
 
-    /** A map storing free variables of functions and classes */
-    val free: mutable.LinkedHashMap[Symbol, SymSet] = new LinkedHashMap
+    /** Buffers for lifted out classes and methods, indexed by owner */
+    val liftedDefs: HashMap[Symbol, ListBuffer[Tree]] = new HashMap
+
+    val deps = new Dependencies(ctx.compilationUnit.tpdTree, ctx.withPhase(thisPhase)):
+      def isExpr(sym: Symbol)(using Context): Boolean = sym.is(Method)
+      def enclosure(using Context) = ctx.owner.enclosingMethod
+
+      override def process(tree: Tree)(using Context): Unit =
+        super.process(tree)
+        tree match
+          case tree: DefDef if tree.symbol.isConstructor =>
+            tree.termParamss.head.find(_.name == nme.OUTER) match
+              case Some(vdef) => outerParam(tree.symbol) = vdef.symbol
+              case _ =>
+          case tree: Template =>
+            liftedDefs(tree.symbol.owner) = new ListBuffer
+          case _ =>
+    end deps
 
     /** A map storing the free variable proxies of functions and classes.
      *  For every function and class, this is a map from the free variables
@@ -40,262 +56,10 @@ object LambdaLift {
      */
     private val proxyMap = new LinkedHashMap[Symbol, Map[Symbol, Symbol]]
 
-    /** A hashtable storing calls between functions */
-    private val called = new LinkedHashMap[Symbol, SymSet]
-
-    /** Symbols that are called from an inner class. */
-    private val calledFromInner = new HashSet[Symbol]
-
-    /** A map from local methods and classes to the owners to which they will be lifted as members.
-     *  For methods and classes that do not have any dependencies this will be the enclosing package.
-     *  symbols with packages as lifted owners will subsequently represented as static
-     *  members of their toplevel class, unless their enclosing class was already static.
-     *  Note: During tree transform (which runs at phase LambdaLift + 1), liftedOwner
-     *  is also used to decide whether a method had a term owner before.
-     */
-    private val liftedOwner = new LinkedHashMap[Symbol, Symbol]
-
-    /** The outer parameter of a constructor */
-    private val outerParam = new HashMap[Symbol, Symbol]
-
-    /** Buffers for lifted out classes and methods, indexed by owner */
-    val liftedDefs: mutable.HashMap[Symbol, mutable.ListBuffer[Tree]] = new HashMap
-
-    /** A flag to indicate whether new free variables have been found */
-    private var changedFreeVars: Boolean = _
-
-    /** A flag to indicate whether lifted owners have changed */
-    private var changedLiftedOwner: Boolean = _
-
-    private val ord: Ordering[Symbol] = Ordering.by(_.id)
-    private def newSymSet = TreeSet.empty[Symbol](ord)
-
-    private def symSet(f: LinkedHashMap[Symbol, SymSet], sym: Symbol): SymSet =
-      f.getOrElseUpdate(sym, newSymSet)
-
-    def freeVars(sym: Symbol): List[Symbol] = free get sym match {
-      case Some(set) => set.toList
-      case None => Nil
-    }
-
     def proxyOf(sym: Symbol, fv: Symbol): Symbol = proxyMap.getOrElse(sym, Map.empty)(fv)
 
-    def proxies(sym: Symbol): List[Symbol] =  freeVars(sym).map(proxyOf(sym, _))
-
-    /** A symbol is local if it is owned by a term or a local trait,
-     *  or if it is a constructor of a local symbol.
-     */
-    def isLocal(sym: Symbol)(using Context): Boolean = {
-      val owner = sym.maybeOwner
-      owner.isTerm ||
-      owner.is(Trait) && isLocal(owner) ||
-      sym.isConstructor && isLocal(owner)
-    }
-
-    /** Set `liftedOwner(sym)` to `owner` if `owner` is more deeply nested
-     *  than the previous value of `liftedowner(sym)`.
-     */
-    def narrowLiftedOwner(sym: Symbol, owner: Symbol)(using Context): Unit =
-      if (sym.maybeOwner.isTerm &&
-        owner.isProperlyContainedIn(liftedOwner(sym)) &&
-        owner != sym) {
-          report.log(i"narrow lifted $sym to $owner")
-          changedLiftedOwner = true
-          liftedOwner(sym) = owner
-      }
-
-    /** Mark symbol `sym` as being free in `enclosure`, unless `sym` is defined
-     *  in `enclosure` or there is an intermediate class properly containing `enclosure`
-     *  in which `sym` is also free. Also, update `liftedOwner` of `enclosure` so
-     *  that `enclosure` can access `sym`, or its proxy in an intermediate class.
-     *  This means:
-     *
-     *    1. If there is an intermediate class in which `sym` is free, `enclosure`
-     *       must be contained in that class (in order to access the `sym proxy stored
-     *       in the class).
-     *
-     *    2. If there is no intermediate class, `enclosure` must be contained
-     *       in the class enclosing `sym`.
-     *
-     *  @return  If there is a non-trait class between `enclosure` and
-     *           the owner of `sym`, the largest such class.
-     *           Otherwise, if there is a trait between `enclosure` and
-     *           the owner of `sym`, the largest such trait.
-     *           Otherwise, NoSymbol.
-     *
-     *  @pre sym.owner.isTerm, (enclosure.isMethod || enclosure.isClass)
-     *
-     *  The idea of `markFree` is illustrated with an example:
-     *
-     *  def f(x: int) = {
-     *    class C {
-     *      class D {
-     *        val y = x
-     *      }
-     *    }
-     *  }
-     *
-     *  In this case `x` is free in the primary constructor of class `C`.
-     *  but it is not free in `D`, because after lambda lift the code would be transformed
-     *  as follows:
-     *
-     *  def f(x$0: int) {
-     *    class C(x$0: int) {
-     *      val x$1 = x$0
-     *      class D {
-     *        val y = outer.x$1
-     *      }
-     *    }
-     *  }
-     */
-    private def markFree(sym: Symbol, enclosure: Symbol)(using Context): Symbol = try {
-      if (!enclosure.exists) throw new NoPath
-      if (enclosure == sym.enclosure) NoSymbol
-      else {
-        def nestedInConstructor(sym: Symbol): Boolean =
-          sym.isConstructor ||
-          sym.isTerm && nestedInConstructor(sym.enclosure)
-        report.debuglog(i"mark free: ${sym.showLocated} with owner ${sym.maybeOwner} marked free in $enclosure")
-        val intermediate =
-          if (enclosure.is(PackageClass)) enclosure
-          else if (enclosure.isConstructor) markFree(sym, enclosure.owner.enclosure)
-          else markFree(sym, enclosure.enclosure)
-        if (intermediate.exists) narrowLiftedOwner(enclosure, intermediate)
-        if !intermediate.isRealClass || nestedInConstructor(enclosure) then
-          // Constructors and methods nested inside traits get the free variables
-          // of the enclosing trait or class.
-          // Conversely, local traits do not get free variables.
-          // Methods inside constructors also don't have intermediates,
-          // need to get all their free variables passed directly.
-          if (!enclosure.is(Trait))
-            if (symSet(free, enclosure).add(sym)) {
-              changedFreeVars = true
-              report.log(i"$sym is free in $enclosure")
-            }
-        if (intermediate.isRealClass) intermediate
-        else if (enclosure.isRealClass) enclosure
-        else if (intermediate.isClass) intermediate
-        else if (enclosure.isClass) enclosure
-        else NoSymbol
-      }
-    }
-    catch {
-      case ex: NoPath =>
-        println(i"error lambda lifting ${ctx.compilationUnit}: $sym is not visible from $enclosure")
-        throw ex
-    }
-
-    private def markCalled(callee: Symbol, caller: Symbol)(using Context): Unit = {
-      report.debuglog(i"mark called: $callee of ${callee.owner} is called by $caller in ${caller.owner}")
-      assert(isLocal(callee))
-      symSet(called, caller) += callee
-      if (callee.enclosingClass != caller.enclosingClass) calledFromInner += callee
-    }
-
-    private class CollectDependencies extends TreeTraverser {
-      def traverse(tree: Tree)(using Context) = try { //debug
-        val sym = tree.symbol
-
-        def enclosure = ctx.owner.enclosingMethod
-
-        def narrowTo(thisClass: ClassSymbol) = {
-          val enclMethod = enclosure
-          val enclClass = enclMethod.enclosingClass
-          narrowLiftedOwner(enclMethod,
-            if (enclClass.isContainedIn(thisClass)) thisClass
-            else enclClass) // unknown this reference, play it safe and assume the narrowest possible owner
-        }
-
-        tree match {
-          case tree: Ident =>
-            if (isLocal(sym))
-              if (sym is Method) markCalled(sym, enclosure)
-              else if (sym.isTerm) markFree(sym, enclosure)
-            def captureImplicitThis(x: Type): Unit =
-              x match {
-                case tr@TermRef(x, _) if (!tr.termSymbol.isStatic) => captureImplicitThis(x)
-                case x: ThisType if (!x.tref.typeSymbol.isStaticOwner) => narrowTo(x.tref.typeSymbol.asClass)
-                case _ =>
-              }
-            captureImplicitThis(tree.tpe)
-          case tree: Select =>
-            if (sym.is(Method) && isLocal(sym)) markCalled(sym, enclosure)
-          case tree: This =>
-            narrowTo(tree.symbol.asClass)
-          case tree: DefDef =>
-            if (sym.owner.isTerm)
-              liftedOwner(sym) = sym.enclosingPackageClass
-                // this will make methods in supercall constructors of top-level classes owned
-                // by the enclosing package, which means they will be static.
-                // On the other hand, all other methods will be indirectly owned by their
-                // top-level class. This avoids possible deadlocks when a static method
-                // has to access its enclosing object from the outside.
-            else if (sym.isConstructor) {
-              if (sym.isPrimaryConstructor && isLocal(sym.owner) && !sym.owner.is(Trait))
-                // add a call edge from the constructor of a local non-trait class to
-                // the class itself. This is done so that the constructor inherits
-                // the free variables of the class.
-                symSet(called, sym) += sym.owner
-
-              tree.termParamss.head.find(_.name == nme.OUTER) match {
-                case Some(vdef) => outerParam(sym) = vdef.symbol
-                case _ =>
-              }
-            }
-          case tree: TypeDef =>
-            if (sym.owner.isTerm) liftedOwner(sym) = sym.topLevelClass.owner
-          case tree: Template =>
-            liftedDefs(tree.symbol.owner) = new mutable.ListBuffer
-          case _ =>
-        }
-        traverseChildren(tree)
-      }
-      catch { //debug
-        case ex: Exception =>
-          println(i"$ex while traversing $tree")
-          throw ex
-      }
-    }
-
-    /** Compute final free variables map `fvs by closing over caller dependencies. */
-    private def computeFreeVars()(using Context): Unit =
-      while ({
-        changedFreeVars = false
-        for {
-          caller <- called.keys
-          callee <- called(caller)
-          fvs <- free get callee
-          fv <- fvs
-        }
-        markFree(fv, caller)
-        changedFreeVars
-      })
-      ()
-
-    /** Compute final liftedOwner map by closing over caller dependencies */
-    private def computeLiftedOwners()(using Context): Unit =
-      while ({
-        changedLiftedOwner = false
-        for {
-          caller <- called.keys
-          callee <- called(caller)
-        }
-        {
-          val normalizedCallee = callee.skipConstructor
-          val calleeOwner = normalizedCallee.owner
-          if (calleeOwner.isTerm) narrowLiftedOwner(caller, liftedOwner(normalizedCallee))
-          else {
-            assert(calleeOwner.is(Trait))
-            // methods nested inside local trait methods cannot be lifted out
-            // beyond the trait. Note that we can also call a trait method through
-            // a qualifier; in that case no restriction to lifted owner arises.
-            if (caller.isContainedIn(calleeOwner))
-              narrowLiftedOwner(caller, calleeOwner)
-          }
-        }
-        changedLiftedOwner
-      })
-      ()
+    def proxies(sym: Symbol): List[Symbol] =
+      deps.freeVars(sym).toList.map(proxyOf(sym, _))
 
     private def newName(sym: Symbol)(using Context): Name =
       if (sym.isAnonymousFunction && sym.owner.is(Method))
@@ -305,19 +69,18 @@ object LambdaLift {
       else sym.name.freshened
 
     private def generateProxies()(using Context): Unit =
-      for ((owner, freeValues) <- free.iterator) {
+      for owner <- deps.tracked do
+        val fvs = deps.freeVars(owner).toList
         val newFlags = Synthetic | (if (owner.isClass) ParamAccessor | Private else Param)
-        report.debuglog(i"free var proxy of ${owner.showLocated}: ${freeValues.toList}%, %")
-        proxyMap(owner) = {
-          for (fv <- freeValues.toList) yield {
+        report.debuglog(i"free var proxy of ${owner.showLocated}: $fvs%, %")
+        val freeProxyPairs =
+          for fv <- fvs yield
             val proxyName = newName(fv)
             val proxy =
               newSymbol(owner, proxyName.asTermName, newFlags, fv.info, coord = fv.coord)
                 .enteredAfter(thisPhase)
             (fv, proxy)
-          }
-        }.toMap
-      }
+        proxyMap(owner) = freeProxyPairs.toMap
 
     private def liftedInfo(local: Symbol)(using Context): Type = local.info match {
       case MethodTpe(pnames, ptypes, restpe) =>
@@ -330,7 +93,7 @@ object LambdaLift {
     }
 
     private def liftLocals()(using Context): Unit = {
-      for ((local, lOwner) <- liftedOwner) {
+      for ((local, lOwner) <- deps.logicalOwner) {
         val (newOwner, maybeStatic) =
           if (lOwner is Package) {
             val encClass = local.enclosingClass
@@ -365,22 +128,11 @@ object LambdaLift {
           initFlags = initFlags,
           info = liftedInfo(local)).installAfter(thisPhase)
       }
-      for (local <- free.keys)
-        if (!liftedOwner.contains(local))
+      for (local <- deps.tracked)
+        if (!deps.logicalOwner.contains(local))
           local.copySymDenotation(info = liftedInfo(local)).installAfter(thisPhase)
     }
 
-    // initialization
-    atPhase(thisPhase) {
-      (new CollectDependencies).traverse(ctx.compilationUnit.tpdTree)
-      computeFreeVars()
-      computeLiftedOwners()
-    }
-    atPhase(thisPhase.next) {
-      generateProxies()
-      liftLocals()
-    }
-
     def currentEnclosure(using Context): Symbol =
       ctx.owner.enclosingMethodOrClass
 
@@ -388,7 +140,8 @@ object LambdaLift {
       sym.enclosure == currentEnclosure
 
     private def proxy(sym: Symbol)(using Context): Symbol = {
-      def liftedEnclosure(sym: Symbol) = liftedOwner.getOrElse(sym, sym.enclosure)
+      def liftedEnclosure(sym: Symbol) =
+        deps.logicalOwner.getOrElse(sym, sym.enclosure)
       def searchIn(enclosure: Symbol): Symbol = {
         if (!enclosure.exists) {
           def enclosures(encl: Symbol): List[Symbol] =
@@ -429,10 +182,8 @@ object LambdaLift {
     }
 
     def addFreeArgs(sym: Symbol, args: List[Tree])(using Context): List[Tree] =
-      free get sym match {
-        case Some(fvs) => fvs.toList.map(proxyRef(_)) ++ args
-        case _ => args
-      }
+      val fvs = deps.freeVars(sym)
+      if fvs.nonEmpty then fvs.toList.map(proxyRef(_)) ++ args else args
 
     def addFreeParams(tree: Tree, proxies: List[Symbol])(using Context): Tree = proxies match {
       case Nil => tree
@@ -445,7 +196,7 @@ object LambdaLift {
 
         /** Initialize proxy fields from proxy parameters and map `rhs` from fields to parameters */
         def copyParams(rhs: Tree) = {
-          val fvs = freeVars(sym.owner)
+          val fvs = deps.freeVars(sym.owner).toList
           val classProxies = fvs.map(proxyOf(sym.owner, _))
           val constrProxies = fvs.map(proxyOf(sym, _))
           report.debuglog(i"copy params ${constrProxies.map(_.showLocated)}%, % to ${classProxies.map(_.showLocated)}%, %}")
@@ -470,9 +221,15 @@ object LambdaLift {
       EmptyTree
     }
 
-    def needsLifting(sym: Symbol): Boolean = liftedOwner contains sym
-  }
-}
+    def needsLifting(sym: Symbol): Boolean = deps.logicalOwner.contains(sym)
+
+    // initialization
+    atPhase(thisPhase.next) {
+      generateProxies()
+      liftLocals()
+    }
+  end Lifter
+end LambdaLift
 
 /** This phase performs the necessary rewritings to eliminate classes and methods
  *  nested in other methods. In detail:
@@ -509,8 +266,9 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisPhase =>
   import LambdaLift._
   import ast.tpd._
 
-  /** the following two members override abstract members in Transform */
-  val phaseName: String = LambdaLift.name
+  override def phaseName: String = LambdaLift.name
+
+  override def description: String = LambdaLift.description
 
   override def relaxedTypingInGroup: Boolean = true
     // Because it adds free vars as additional proxy parameters
@@ -558,7 +316,7 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisPhase =>
     // reload them manually here.
     // Note: If you tweak this code, make sure to test your changes with
     // `Config.reuseSymDenotations` set to false to exercise this path more.
-    if denot.isInstanceOf[NonSymSingleDenotation] && lifter.free.contains(sym) then
+    if denot.isInstanceOf[NonSymSingleDenotation] && lifter.deps.freeVars(sym).nonEmpty then
       tree.qualifier.select(sym).withSpan(tree.span)
     else tree
 
@@ -572,7 +330,7 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisPhase =>
     val sym = tree.symbol
     val lft = lifter
     val paramsAdded =
-      if (lft.free.contains(sym)) lft.addFreeParams(tree, lft.proxies(sym)).asInstanceOf[DefDef]
+      if lft.deps.freeVars(sym).nonEmpty then lft.addFreeParams(tree, lft.proxies(sym)).asInstanceOf[DefDef]
       else tree
     if (lft.needsLifting(sym)) lft.liftDef(paramsAdded)
     else paramsAdded
diff --git a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala
index 121a2fd01a31..aabf8cf9a680 100644
--- a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala
+++ b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala
@@ -30,6 +30,8 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
 
   override def phaseName: String = LazyVals.name
 
+  override def description: String = LazyVals.description
+
   /** List of names of phases that should have finished processing of tree
     * before this phase starts processing same tree */
   override def runsAfter: Set[String] = Set(Mixin.name, CollectNullableFields.name)
@@ -439,6 +441,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
 
 object LazyVals {
   val name: String = "lazyVals"
+  val description: String = "expand lazy vals"
 
   object lazyNme {
     import Names.TermName
diff --git a/compiler/src/dotty/tools/dotc/transform/LetOverApply.scala b/compiler/src/dotty/tools/dotc/transform/LetOverApply.scala
index cd61c0f5ac82..c7ad2381c5f7 100644
--- a/compiler/src/dotty/tools/dotc/transform/LetOverApply.scala
+++ b/compiler/src/dotty/tools/dotc/transform/LetOverApply.scala
@@ -15,7 +15,9 @@ import ast.Trees._
 class LetOverApply extends MiniPhase:
   import ast.tpd._
 
-  override def phaseName: String = "letOverApply"
+  override def phaseName: String = LetOverApply.name
+
+  override def description: String = LetOverApply.description
 
   override def transformApply(tree: Apply)(using Context): Tree =
     tree.fun match
@@ -30,3 +32,7 @@ class LetOverApply extends MiniPhase:
         tree
 
 end LetOverApply
+
+object LetOverApply:
+  val name: String = "letOverApply"
+  val description: String = "lift blocks from receivers of applications"
diff --git a/compiler/src/dotty/tools/dotc/transform/LiftTry.scala b/compiler/src/dotty/tools/dotc/transform/LiftTry.scala
index e5e234b8fe8e..f70e6a38fcf5 100644
--- a/compiler/src/dotty/tools/dotc/transform/LiftTry.scala
+++ b/compiler/src/dotty/tools/dotc/transform/LiftTry.scala
@@ -30,7 +30,9 @@ import util.Store
 class LiftTry extends MiniPhase with IdentityDenotTransformer { thisPhase =>
   import ast.tpd._
 
-  val phaseName: String = LiftTry.name
+  override def phaseName: String = LiftTry.name
+
+  override def description: String = LiftTry.description
 
   private var NeedLift: Store.Location[Boolean] = _
   private def needLift(using Context): Boolean = ctx.store(NeedLift)
@@ -44,6 +46,9 @@ class LiftTry extends MiniPhase with IdentityDenotTransformer { thisPhase =>
   override def prepareForApply(tree: Apply)(using Context): Context =
     liftingCtx(true)
 
+  override def prepareForDefDef(tree: DefDef)(using Context): Context =
+    liftingCtx(false)
+
   override def prepareForValDef(tree: ValDef)(using Context): Context =
     if !tree.symbol.exists
        || tree.symbol.isSelfSym
@@ -80,3 +85,4 @@ class LiftTry extends MiniPhase with IdentityDenotTransformer { thisPhase =>
 }
 object LiftTry:
   val name = "liftTry"
+  val description: String = "Lifts try's that might be executed on non-empty expression stacks"
diff --git a/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala b/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala
index 6a246e509e61..0baf85c4e21d 100644
--- a/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala
+++ b/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala
@@ -29,19 +29,11 @@ abstract class MacroTransform extends Phase {
    */
   protected def transformPhase(using Context): Phase = this
 
-  class Transformer extends TreeMap(cpy = cpyBetweenPhases) {
+  class Transformer extends TreeMapWithPreciseStatContexts(cpy = cpyBetweenPhases):
 
-    protected def localCtx(tree: Tree)(using Context): FreshContext = 
+    protected def localCtx(tree: Tree)(using Context): FreshContext =
       ctx.fresh.setTree(tree).setOwner(localOwner(tree))
 
-    override def transformStats(trees: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = {
-      def transformStat(stat: Tree): Tree = stat match {
-        case _: Import | _: DefTree => transform(stat)
-        case _ => transform(stat)(using ctx.exprContext(stat, exprOwner))
-      }
-      flatten(trees.mapconserve(transformStat(_)))
-    }
-
     override def transform(tree: Tree)(using Context): Tree =
       try
         tree match {
@@ -67,5 +59,5 @@ abstract class MacroTransform extends Phase {
 
     def transformSelf(vd: ValDef)(using Context): ValDef =
       cpy.ValDef(vd)(tpt = transform(vd.tpt))
-  }
+  end Transformer
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala
index 77671fc6498c..56342322824c 100644
--- a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala
+++ b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala
@@ -432,16 +432,10 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase {
   def transformSpecificTree[T <: Tree](tree: T, start: Int)(using Context): T =
     transformTree(tree, start).asInstanceOf[T]
 
-  def transformStats(trees: List[Tree], exprOwner: Symbol, start: Int)(using Context): List[Tree] = {
-    def transformStat(stat: Tree)(using Context): Tree = stat match {
-      case _: Import | _: DefTree => transformTree(stat, start)
-      case Thicket(stats) => cpy.Thicket(stat)(stats.mapConserve(transformStat))
-      case _ => transformTree(stat, start)(using ctx.exprContext(stat, exprOwner))
-    }
+  def transformStats(trees: List[Tree], exprOwner: Symbol, start: Int)(using Context): List[Tree] =
     val nestedCtx = prepStats(trees, start)
-    val trees1 = trees.mapInline(transformStat(_)(using nestedCtx))
+    val trees1 = trees.mapStatements(exprOwner, transformTree(_, start))(using nestedCtx)
     goStats(trees1, start)(using nestedCtx)
-  }
 
   def transformUnit(tree: Tree)(using Context): Tree = {
     val nestedCtx = prepUnit(tree, 0)
@@ -461,11 +455,6 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase {
 
   // Initialization code
 
-  for ((phase, idx) <- miniPhases.zipWithIndex) {
-    phase.superPhase = this
-    phase.idxInGroup = idx
-  }
-
   /** Class#getDeclaredMethods is slow, so we cache its output */
   private val clsMethodsCache = new java.util.IdentityHashMap[Class[?], Array[java.lang.reflect.Method]]
 
@@ -570,6 +559,11 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase {
   private val nxOtherPrepPhase = init("prepareForOther")
   private val nxOtherTransPhase = init("transformOther")
 
+  for ((phase, idx) <- miniPhases.zipWithIndex) {
+    phase.superPhase = this
+    phase.idxInGroup = idx
+  }
+
   // Boilerplate snippets
 
   def prepIdent(tree: Ident, start: Int)(using Context): Context = {
diff --git a/compiler/src/dotty/tools/dotc/transform/Memoize.scala b/compiler/src/dotty/tools/dotc/transform/Memoize.scala
index 2f73ed8bd9eb..8e9bea8384c2 100644
--- a/compiler/src/dotty/tools/dotc/transform/Memoize.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Memoize.scala
@@ -22,6 +22,7 @@ import util.Store
 
 object Memoize {
   val name: String = "memoize"
+  val description: String = "add private fields to getters and setters"
 
   private final class MyState {
     val classesThatNeedReleaseFence = new util.HashSet[Symbol]
@@ -49,6 +50,8 @@ class Memoize extends MiniPhase with IdentityDenotTransformer { thisPhase =>
 
   override def phaseName: String = Memoize.name
 
+  override def description: String = Memoize.description
+
   private var MyState: Store.Location[MyState] = _
   private def myState(using Context): MyState = ctx.store(MyState)
 
diff --git a/compiler/src/dotty/tools/dotc/transform/Mixin.scala b/compiler/src/dotty/tools/dotc/transform/Mixin.scala
index d223566a208c..c3828327385c 100644
--- a/compiler/src/dotty/tools/dotc/transform/Mixin.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Mixin.scala
@@ -10,6 +10,7 @@ import SymUtils._
 import Symbols._
 import SymDenotations._
 import Types._
+import Periods._
 import Decorators._
 import DenotTransformers._
 import StdNames._
@@ -21,6 +22,7 @@ import collection.mutable
 
 object Mixin {
   val name: String = "mixin"
+  val description: String = "expand trait fields and trait initializers"
 
   def traitSetterName(getter: TermSymbol)(using Context): TermName =
     getter.ensureNotPrivate.name
@@ -111,6 +113,8 @@ class Mixin extends MiniPhase with SymTransformer { thisPhase =>
 
   override def phaseName: String = Mixin.name
 
+  override def description: String = Mixin.description
+
   override def relaxedTypingInGroup: Boolean = true
     // Because it changes number of parameters in trait initializers
 
@@ -146,6 +150,7 @@ class Mixin extends MiniPhase with SymTransformer { thisPhase =>
         // !decl.isClass avoids forcing nested traits, preventing cycles
         if !decl.isClass && needsTraitSetter(decl) then
           val setter = makeTraitSetter(decl.asTerm)
+          setter.validFor = thisPhase.validFor // validity of setter = next phase up to next transformer afterwards
           decls1.enter(setter)
           modified = true
       if modified then
diff --git a/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala b/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala
index ce71734e16d9..bf25bfe71569 100644
--- a/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala
+++ b/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala
@@ -26,6 +26,8 @@ class MoveStatics extends MiniPhase with SymTransformer {
 
   override def phaseName: String = MoveStatics.name
 
+  override def description: String = MoveStatics.description
+
   def transformSym(sym: SymDenotation)(using Context): SymDenotation =
     if (sym.hasAnnotation(defn.ScalaStaticAnnot) && sym.owner.is(Flags.Module) && sym.owner.companionClass.exists &&
         (sym.is(Flags.Method) || !(sym.is(Flags.Mutable) && sym.owner.companionClass.is(Flags.Trait)))) {
@@ -88,4 +90,5 @@ class MoveStatics extends MiniPhase with SymTransformer {
 
 object MoveStatics {
   val name: String = "moveStatic"
+  val description: String = "move static methods from companion to the class itself"
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala b/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala
index e65809fd97ba..4ab9663f6529 100644
--- a/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala
+++ b/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala
@@ -10,6 +10,10 @@ import config.SourceVersion._
 
 object NonLocalReturns {
   import ast.tpd._
+
+  val name: String = "nonLocalReturns"
+  val description: String = "expand non-local returns"
+
   def isNonLocalReturn(ret: Return)(using Context): Boolean =
     !ret.from.symbol.is(Label) && (ret.from.symbol != ctx.owner.enclosingMethod || ctx.owner.is(Lazy))
 }
@@ -17,7 +21,10 @@ object NonLocalReturns {
 /** Implement non-local returns using NonLocalReturnControl exceptions.
  */
 class NonLocalReturns extends MiniPhase {
-  override def phaseName: String = "nonLocalReturns"
+
+  override def phaseName: String = NonLocalReturns.name
+
+  override def description: String = NonLocalReturns.description
 
   import NonLocalReturns._
   import ast.tpd._
diff --git a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala
index b2851fd92619..437dfea9f156 100644
--- a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala
+++ b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala
@@ -1,8 +1,10 @@
-package dotty.tools.dotc
+package dotty.tools
+package dotc
 package transform
 
 import core._
-import Flags._, Symbols._, Contexts._, Scopes._, Decorators._
+import Flags._, Symbols._, Contexts._, Scopes._, Decorators._, Types.Type
+import NameKinds.DefaultGetterName
 import collection.mutable
 import collection.immutable.BitSet
 import scala.annotation.tailrec
@@ -15,12 +17,12 @@ import scala.annotation.tailrec
  *  Adapted from the 2.9 version of OverridingPairs. The 2.10 version is IMO
  *  way too unwieldy to be maintained.
  */
-object OverridingPairs {
+object OverridingPairs:
 
   /** The cursor class
    *  @param base   the base class that contains the overriding pairs
    */
-  class Cursor(base: Symbol)(using Context) {
+  class Cursor(base: Symbol)(using Context):
 
     private val self = base.thisType
 
@@ -33,11 +35,11 @@ object OverridingPairs {
      *  pair has already been treated in a parent class.
      *  This may be refined in subclasses. @see Bridges for a use case.
      */
-    protected def parents: Array[Symbol] = base.info.parents.toArray.map(_.typeSymbol)
+    protected def parents: Array[Symbol] = base.info.parents.toArray.map(_.classSymbol)
 
-    /** Does `sym1` match `sym2` so that it qualifies as overriding.
-     *  Types always match. Term symbols match if their membertypes
-     *  relative to <base>.this do
+    /** Does `sym1` match `sym2` so that it qualifies as overriding when both symbols are
+     *  seen as members of `self`? Types always match. Term symbols match if their membertypes
+     *  relative to `self` do.
      */
     protected def matches(sym1: Symbol, sym2: Symbol): Boolean =
       sym1.isType || sym1.asSeenFrom(self).matches(sym2.asSeenFrom(self))
@@ -85,11 +87,22 @@ object OverridingPairs {
         then bits += i
       subParents(bc) = bits
 
-    private def hasCommonParentAsSubclass(cls1: Symbol, cls2: Symbol): Boolean =
-      (subParents(cls1) intersect subParents(cls2)).nonEmpty
+    /** Is the override of `sym1` and `sym2` already handled when checking
+     *  a parent of `self`?
+     */
+    private def isHandledByParent(sym1: Symbol, sym2: Symbol): Boolean =
+      val commonParents = subParents(sym1.owner).intersect(subParents(sym2.owner))
+      commonParents.nonEmpty
+      && commonParents.exists(i => canBeHandledByParent(sym1, sym2, parents(i)))
+
+    /** Can pair `sym1`/`sym2` be handled by parent `parentType` which is a common subtype
+     *  of both symbol's owners? Assumed to be true by default, but overridden in RefChecks.
+     */
+    protected def canBeHandledByParent(sym1: Symbol, sym2: Symbol, parent: Symbol): Boolean =
+      true
 
     /** The scope entries that have already been visited as overridden
-     *  (maybe excluded because of hasCommonParentAsSubclass).
+     *  (maybe excluded because of already handled by a parent).
      *  These will not appear as overriding
      */
     private val visited = util.HashSet[Symbol]()
@@ -134,30 +147,83 @@ object OverridingPairs {
      *    overridden = overridden member of the pair, provided hasNext is true
      */
     @tailrec final def next(): Unit =
-      if (nextEntry ne null) {
+      if nextEntry != null then
         nextEntry = decls.lookupNextEntry(nextEntry)
-        if (nextEntry ne null)
-          try {
+        if nextEntry != null then
+          try
             overridden = nextEntry.sym
-            if (overriding.owner != overridden.owner && matches(overriding, overridden)) {
+            if overriding.owner != overridden.owner && matches(overriding, overridden) then
               visited += overridden
-              if (!hasCommonParentAsSubclass(overriding.owner, overridden.owner)) return
-            }
-          }
-          catch {
-            case ex: TypeError =>
-              // See neg/i1750a for an example where a cyclic error can arise.
-              // The root cause in this example is an illegal "override" of an inner trait
-              report.error(ex, base.srcPos)
-          }
-        else {
+              if !isHandledByParent(overriding, overridden) then return
+          catch case ex: TypeError =>
+            // See neg/i1750a for an example where a cyclic error can arise.
+            // The root cause in this example is an illegal "override" of an inner trait
+            report.error(ex, base.srcPos)
+        else
           curEntry = curEntry.prev
           nextOverriding()
-        }
         next()
-      }
 
     nextOverriding()
     next()
-  }
-}
+  end Cursor
+
+  /** Is this `sym1` considered an override of `sym2` (or vice versa) if both are
+   *  seen as members of `site`?
+   *  We declare a match if either we have a full match including matching names
+   *  or we have a loose match with different target name but the types are the same.
+   *  We leave out pairs of methods in Java classes under the assumption since these
+   *  have already been checked and handled by javac.
+   *  This leaves two possible sorts of discrepancies to be reported as errors
+   *  in `RefChecks`:
+   *
+   *    - matching names, target names, and signatures but different types
+   *    - matching names and types, but different target names
+   *
+   *  This method is used as a replacement of `matches` in some subclasses of
+   *  OverridingPairs.
+   */
+  def isOverridingPair(sym1: Symbol, sym2: Symbol, self: Type)(using Context): Boolean =
+    if     sym1.owner.is(JavaDefined, butNot = Trait)
+        && sym2.owner.is(JavaDefined, butNot = Trait)
+    then false // javac already handles these checks and inserts bridges
+    else if sym1.isType then true
+    else
+      val sd1 = sym1.asSeenFrom(self)
+      val sd2 = sym2.asSeenFrom(self)
+      sd1.matchesLoosely(sd2)
+        && (sym1.hasTargetName(sym2.targetName)
+            || isOverridingPair(sym1, sd1.info, sym2, sd2.info))
+
+  /** Let `member` and `other` be members of some common class C with types
+   *  `memberTp` and `otherTp` in C. Are the two symbols considered an overriding
+   *  pair in C? We assume that names already match so we test only the types here.
+   *  @param fallBack  A function called if the initial test is false and
+   *                   `member` and `other` are term symbols.
+   */
+  def isOverridingPair(member: Symbol, memberTp: Type, other: Symbol, otherTp: Type, fallBack: => Boolean = false)(using Context): Boolean =
+    if member.isType then // intersection of bounds to refined types must be nonempty
+      memberTp.bounds.hi.hasSameKindAs(otherTp.bounds.hi)
+      && (
+        (memberTp frozen_<:< otherTp)
+        || !member.owner.derivesFrom(other.owner)
+            && {
+              // if member and other come from independent classes or traits, their
+              // bounds must have non-empty-intersection
+              val jointBounds = (memberTp.bounds & otherTp.bounds).bounds
+              jointBounds.lo frozen_<:< jointBounds.hi
+            }
+      )
+    else
+      // releaxed override check for explicit nulls if one of the symbols is Java defined,
+      // force `Null` being a subtype of reference types during override checking
+      val relaxedCtxForNulls =
+        if ctx.explicitNulls && (member.is(JavaDefined) || other.is(JavaDefined)) then
+          ctx.retractMode(Mode.SafeNulls)
+        else ctx
+      member.name.is(DefaultGetterName) // default getters are not checked for compatibility
+      || memberTp.overrides(otherTp,
+            member.matchNullaryLoosely || other.matchNullaryLoosely || fallBack
+          )(using relaxedCtxForNulls)
+
+end OverridingPairs
diff --git a/compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala b/compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala
index 626455da63d1..47e5ae96f5da 100644
--- a/compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala
+++ b/compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala
@@ -124,6 +124,7 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
       val targs2 = targs.map(targ => TypeTree(healTypeOfTerm(quote.fun.srcPos)(targ.tpe)))
       cpy.Apply(quote)(cpy.TypeApply(quote.fun)(fun, targs2), body2 :: Nil)
     else
+      val quotes = quote.args.mapConserve(transform)
       body.tpe match
         case tp @ TypeRef(x: TermRef, _) if tp.symbol == defn.QuotedType_splice =>
           // Optimization: `quoted.Type.of[x.Underlying](quotes)`  -->  `x`
@@ -131,7 +132,7 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
         case _ =>
           // `quoted.Type.of[<body>](quotes)`  --> `quoted.Type.of[<body2>](quotes)`
           val TypeApply(fun, _) = quote.fun
-          cpy.Apply(quote)(cpy.TypeApply(quote.fun)(fun, body2 :: Nil), quote.args)
+          cpy.Apply(quote)(cpy.TypeApply(quote.fun)(fun, body2 :: Nil), quotes)
   }
 
   /** Transform splice
diff --git a/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala b/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala
index 028516f1ca07..6eb29f26edea 100644
--- a/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala
@@ -36,7 +36,9 @@ class ParamForwarding extends MiniPhase with IdentityDenotTransformer:
 
   private def thisPhase: ParamForwarding = this
 
-  val phaseName: String = "paramForwarding"
+  override def phaseName: String = ParamForwarding.name
+
+  override def description: String = ParamForwarding.description
 
   def transformIfParamAlias(mdef: ValOrDefDef)(using Context): Tree =
 
@@ -80,3 +82,7 @@ class ParamForwarding extends MiniPhase with IdentityDenotTransformer:
 
   override def transformDefDef(mdef: DefDef)(using Context): Tree =
     transformIfParamAlias(mdef)
+
+object ParamForwarding:
+  val name: String = "paramForwarding"
+  val description: String = "add forwarders for aliases of superclass parameters"
diff --git a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala
index 047b2587299a..21aa331367ca 100644
--- a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala
+++ b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala
@@ -8,7 +8,7 @@ import collection.mutable
 import Symbols._, Contexts._, Types._, StdNames._, NameOps._
 import ast.Trees._
 import util.Spans._
-import typer.Applications.{isProductMatch, isGetMatch, isProductSeqMatch, productSelectors, productArity, unapplySeqTypeElemTp}
+import typer.Applications.*
 import SymUtils._
 import Flags._, Constants._
 import Decorators._
@@ -20,13 +20,16 @@ import util.Property._
 
 /** The pattern matching transform.
  *  After this phase, the only Match nodes remaining in the code are simple switches
- *  where every pattern is an integer constant
+ *  where every pattern is an integer or string constant
  */
 class PatternMatcher extends MiniPhase {
   import ast.tpd._
   import PatternMatcher._
 
   override def phaseName: String = PatternMatcher.name
+
+  override def description: String = PatternMatcher.description
+
   override def runsAfter: Set[String] = Set(ElimRepeated.name)
 
   override def transformMatch(tree: Match)(using Context): Tree =
@@ -53,11 +56,12 @@ object PatternMatcher {
   import ast.tpd._
 
   val name: String = "patternMatcher"
+  val description: String = "compile pattern matches"
 
-  final val selfCheck = false // debug option, if on we check that no case gets generated twice
+  inline val selfCheck = false // debug option, if on we check that no case gets generated twice
 
   /** Minimal number of cases to emit a switch */
-  final val MinSwitchCases = 4
+  inline val MinSwitchCases = 4
 
   val TrustedTypeTestKey: Key[Unit] = new StickyKey[Unit]
 
@@ -231,8 +235,8 @@ object PatternMatcher {
         case _ =>
           tree.tpe
 
-      /** Plan for matching `selectors` against argument patterns `args` */
-      def matchArgsPlan(selectors: List[Tree], args: List[Tree], onSuccess: Plan): Plan = {
+      /** Plan for matching `components` against argument patterns `args` */
+      def matchArgsPlan(components: List[Tree], args: List[Tree], onSuccess: Plan): Plan = {
         /* For a case with arguments that have some test on them such as
          * ```
          * case Foo(1, 2) => someCode
@@ -249,9 +253,9 @@ object PatternMatcher {
          * } else ()
          * ```
          */
-        def matchArgsSelectorsPlan(selectors: List[Tree], syms: List[Symbol]): Plan =
-          selectors match {
-            case selector :: selectors1 => letAbstract(selector, selector.avoidPatBoundType())(sym => matchArgsSelectorsPlan(selectors1, sym :: syms))
+        def matchArgsComponentsPlan(components: List[Tree], syms: List[Symbol]): Plan =
+          components match {
+            case component :: components1 => letAbstract(component, component.avoidPatBoundType())(sym => matchArgsComponentsPlan(components1, sym :: syms))
             case Nil => matchArgsPatternPlan(args, syms.reverse)
           }
         def matchArgsPatternPlan(args: List[Tree], syms: List[Symbol]): Plan =
@@ -263,7 +267,7 @@ object PatternMatcher {
               assert(syms.isEmpty)
               onSuccess
           }
-        matchArgsSelectorsPlan(selectors, Nil)
+        matchArgsComponentsPlan(components, Nil)
       }
 
       /** Plan for matching the sequence in `seqSym` against sequence elements `args`.
@@ -325,8 +329,17 @@ object PatternMatcher {
         def isSyntheticScala2Unapply(sym: Symbol) =
           sym.isAllOf(SyntheticCase) && sym.owner.is(Scala2x)
 
+        def tupleApp(i: Int, receiver: Tree) = // manually inlining the call to NonEmptyTuple#apply, because it's an inline method
+          ref(defn.RuntimeTuplesModule)
+            .select(defn.RuntimeTuples_apply)
+            .appliedTo(receiver, Literal(Constant(i)))
+            .cast(args(i).tpe.widen)
+
         if (isSyntheticScala2Unapply(unapp.symbol) && caseAccessors.length == args.length)
-          matchArgsPlan(caseAccessors.map(ref(scrutinee).select(_)), args, onSuccess)
+          def tupleSel(sym: Symbol) = ref(scrutinee).select(sym)
+          val isGenericTuple = defn.isTupleClass(caseClass) && !defn.isTupleNType(tree.tpe)
+          val components = if isGenericTuple then caseAccessors.indices.toList.map(tupleApp(_, ref(scrutinee))) else caseAccessors.map(tupleSel)
+          matchArgsPlan(components, args, onSuccess)
         else if (unapp.tpe <:< (defn.BooleanType))
           TestPlan(GuardTest, unapp, unapp.span, onSuccess)
         else
@@ -344,6 +357,9 @@ object PatternMatcher {
             else if (isUnapplySeq && unapplySeqTypeElemTp(unapp.tpe.widen.finalResultType).exists) {
               unapplySeqPlan(unappResult, args)
             }
+            else if unappResult.info <:< defn.NonEmptyTupleTypeRef then
+              val components = (0 until foldApplyTupleType(unappResult.denot.info).length).toList.map(tupleApp(_, ref(unappResult)))
+              matchArgsPlan(components, args, onSuccess)
             else {
               assert(isGetMatch(unapp.tpe))
               val argsPlan = {
@@ -719,16 +735,19 @@ object PatternMatcher {
           val expectedTp = tpt.tpe
 
           // An outer test is needed in a situation like  `case x: y.Inner => ...`
-          def outerTestNeeded: Boolean =
-            // See the test for SI-7214 for motivation for dealias. Later `treeCondStrategy#outerTest`
-            // generates an outer test based on `patType.prefix` with automatically dealises.
-            expectedTp.dealias match {
+          def outerTestNeeded: Boolean = {
+            def go(expected: Type): Boolean = expected match {
               case tref @ TypeRef(pre: SingletonType, _) =>
                 tref.symbol.isClass &&
                 ExplicitOuter.needsOuterIfReferenced(tref.symbol.asClass)
+              case AppliedType(tpe, _) => go(tpe)
               case _ =>
                 false
             }
+            // See the test for SI-7214 for motivation for dealias. Later `treeCondStrategy#outerTest`
+            // generates an outer test based on `patType.prefix` with automatically dealises.
+            go(expectedTp.dealias)
+          }
 
           def outerTest: Tree = thisPhase.transformFollowingDeep {
             val expectedOuter = singleton(expectedTp.normalizedPrefix)
@@ -768,13 +787,15 @@ object PatternMatcher {
         (tpe isRef defn.IntClass) ||
         (tpe isRef defn.ByteClass) ||
         (tpe isRef defn.ShortClass) ||
-        (tpe isRef defn.CharClass)
+        (tpe isRef defn.CharClass) ||
+        (tpe isRef defn.StringClass)
 
-      val seen = mutable.Set[Int]()
+      val seen = mutable.Set[Any]()
 
-      def isNewIntConst(tree: Tree) = tree match {
-        case Literal(const) if const.isIntRange && !seen.contains(const.intValue) =>
-          seen += const.intValue
+      def isNewSwitchableConst(tree: Tree) = tree match {
+        case Literal(const)
+        if (const.isIntRange || const.tag == Constants.StringTag) && !seen.contains(const.value) =>
+          seen += const.value
           true
         case _ =>
           false
@@ -789,7 +810,7 @@ object PatternMatcher {
               val alts = List.newBuilder[Tree]
               def rec(innerPlan: Plan): Boolean = innerPlan match {
                 case SeqPlan(TestPlan(EqualTest(tree), scrut, _, ReturnPlan(`innerLabel`)), tail)
-                if scrut === scrutinee && isNewIntConst(tree) =>
+                if scrut === scrutinee && isNewSwitchableConst(tree) =>
                   alts += tree
                   rec(tail)
                 case ReturnPlan(`outerLabel`) =>
@@ -809,7 +830,7 @@ object PatternMatcher {
 
       def recur(plan: Plan): List[(List[Tree], Plan)] = plan match {
         case SeqPlan(testPlan @ TestPlan(EqualTest(tree), scrut, _, ons), tail)
-        if scrut === scrutinee && !canFallThrough(ons) && isNewIntConst(tree) =>
+        if scrut === scrutinee && !canFallThrough(ons) && isNewSwitchableConst(tree) =>
           (tree :: Nil, ons) :: recur(tail)
         case SeqPlan(AlternativesPlan(alts, ons), tail) =>
           (alts, ons) :: recur(tail)
@@ -832,29 +853,32 @@ object PatternMatcher {
 
     /** Emit a switch-match */
     private def emitSwitchMatch(scrutinee: Tree, cases: List[(List[Tree], Plan)]): Match = {
-      /* Make sure to adapt the scrutinee to Int, as well as all the alternatives
-       * of all cases, so that only Matches on pritimive Ints survive this phase.
+      /* Make sure to adapt the scrutinee to Int or String, as well as all the
+       * alternatives, so that only Matches on pritimive Ints or Strings survive
+       * this phase.
        */
 
-      val intScrutinee =
-        if (scrutinee.tpe.widen.isRef(defn.IntClass)) scrutinee
-        else scrutinee.select(nme.toInt)
+      val (primScrutinee, scrutineeTpe) =
+        if (scrutinee.tpe.widen.isRef(defn.IntClass)) (scrutinee, defn.IntType)
+        else if (scrutinee.tpe.widen.isRef(defn.StringClass)) (scrutinee, defn.StringType)
+        else (scrutinee.select(nme.toInt), defn.IntType)
 
-      def intLiteral(lit: Tree): Tree =
+      def primLiteral(lit: Tree): Tree =
         val Literal(constant) = lit
         if (constant.tag == Constants.IntTag) lit
+        else if (constant.tag == Constants.StringTag) lit
         else cpy.Literal(lit)(Constant(constant.intValue))
 
       val caseDefs = cases.map { (alts, ons) =>
         val pat = alts match {
-          case alt :: Nil => intLiteral(alt)
-          case Nil => Underscore(defn.IntType) // default case
-          case _ => Alternative(alts.map(intLiteral))
+          case alt :: Nil => primLiteral(alt)
+          case Nil => Underscore(scrutineeTpe) // default case
+          case _ => Alternative(alts.map(primLiteral))
         }
         CaseDef(pat, EmptyTree, emit(ons))
       }
 
-      Match(intScrutinee, caseDefs)
+      Match(primScrutinee, caseDefs)
     }
 
     /** If selfCheck is `true`, used to check whether a tree gets generated twice */
@@ -928,7 +952,7 @@ object PatternMatcher {
               default
           }
         case ResultPlan(tree) =>
-          if (tree.tpe <:< defn.NothingType) tree // For example MatchError
+          if (tree.symbol == defn.throwMethod) tree // For example MatchError
           else Return(tree, ref(resultLabel))
       }
     }
diff --git a/compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala b/compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala
index a0c2385e7866..96506d3c2b05 100644
--- a/compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala
+++ b/compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala
@@ -11,7 +11,6 @@ import Constants._
 import ast.Trees._
 import ast.{TreeTypeMap, untpd}
 import util.Spans._
-import tasty.TreePickler.Hole
 import SymUtils._
 import NameKinds._
 import dotty.tools.dotc.ast.tpd
@@ -74,6 +73,8 @@ class PickleQuotes extends MacroTransform {
 
   override def phaseName: String = PickleQuotes.name
 
+  override def description: String = PickleQuotes.description
+
   override def allowsImplicitSearch: Boolean = true
 
   override def checkPostCondition(tree: Tree)(using Context): Unit =
@@ -481,10 +482,16 @@ class PickleQuotes extends MacroTransform {
         transform(tree)(using ctx.withSource(tree.source))
       else reporting.trace(i"Reifier.transform $tree at $level", show = true) {
         tree match {
-          case Apply(TypeApply(fn, (body: RefTree) :: Nil), _) if fn.symbol == defn.QuotedTypeModule_of && isCaptured(body.symbol, level + 1) =>
+          case Apply(TypeApply(fn, (body: RefTree) :: Nil), _)
+          if fn.symbol == defn.QuotedTypeModule_of && isCaptured(body.symbol, level + 1) =>
             // Optimization: avoid the full conversion when capturing `X` with `x$1: Type[X$1]`
             // in `Type.of[X]` to `Type.of[x$1.Underlying]` and go directly to `X$1`
             capturers(body.symbol)(body)
+          case Apply(Select(Apply(TypeApply(fn,_), List(ref: RefTree)),nme.apply),List(quotes))
+          if fn.symbol == defn.QuotedRuntime_exprQuote && isCaptured(ref.symbol, level + 1) =>
+            // Optimization: avoid the full conversion when capturing `x` with `x$1: Expr[X]`
+            // in `'{x}` to `'{ ${x$1} }'` and go directly to `x$1`
+            capturers(ref.symbol)(ref).select(nme.apply).appliedTo(quotes)
           case tree: RefTree if isCaptured(tree.symbol, level) =>
             val body = capturers(tree.symbol).apply(tree)
             if (tree.isType)
@@ -523,6 +530,7 @@ object PickleQuotes {
   import tpd._
 
   val name: String = "pickleQuotes"
+  val description: String = "turn quoted trees into explicit run-time data structures"
 
   def getLiteral(tree: tpd.Tree): Option[Literal] = tree match {
     case tree: Literal => Some(tree)
diff --git a/compiler/src/dotty/tools/dotc/transform/Pickler.scala b/compiler/src/dotty/tools/dotc/transform/Pickler.scala
index b05d388bba98..98b61d8b6b60 100644
--- a/compiler/src/dotty/tools/dotc/transform/Pickler.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Pickler.scala
@@ -18,6 +18,7 @@ import scala.concurrent.duration.Duration
 
 object Pickler {
   val name: String = "pickler"
+  val description: String = "generates TASTy info"
 
   /** If set, perform jump target compacting, position and comment pickling,
    *  as well as final assembly in parallel with downstream phases; force
@@ -32,6 +33,8 @@ class Pickler extends Phase {
 
   override def phaseName: String = Pickler.name
 
+  override def description: String = Pickler.description
+
   // No need to repickle trees coming from TASTY
   override def isRunnable(using Context): Boolean =
     super.isRunnable && !ctx.settings.fromTasty.value
@@ -91,7 +94,7 @@ class Pickler extends Phase {
           if pickling ne noPrinter then
             pickling.synchronized {
               println(i"**** pickled info of $cls")
-              println(TastyPrinter.show(pickled))
+              println(TastyPrinter.showContents(pickled, ctx.settings.color.value == "never"))
             }
           pickled
         }(using ExecutionContext.global)
@@ -110,12 +113,12 @@ class Pickler extends Phase {
   override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] = {
     val result = super.runOn(units)
     if ctx.settings.YtestPickler.value then
+      val ctx2 = ctx.fresh.setSetting(ctx.settings.YreadComments, true)
       testUnpickler(
-        using ctx.fresh
-            .setPeriod(Period(ctx.runId + 1, FirstPhaseId))
+        using ctx2
+            .setPeriod(Period(ctx.runId + 1, ctx.base.typerPhase.id))
             .setReporter(new ThrowingReporter(ctx.reporter))
             .addMode(Mode.ReadPositions)
-            .addMode(Mode.ReadComments)
             .addMode(Mode.PrintShowExceptions))
     result
   }
@@ -125,7 +128,7 @@ class Pickler extends Phase {
     ctx.initialize()
     val unpicklers =
       for ((cls, pickler) <- picklers) yield {
-        val unpickler = new DottyUnpickler(pickler.assembleParts())
+        val unpickler = new DottyUnpickler(pickler.assembleParts(), ctx.tastyVersion)
         unpickler.enter(roots = Set.empty)
         cls -> unpickler
       }
diff --git a/compiler/src/dotty/tools/dotc/transform/PostInlining.scala b/compiler/src/dotty/tools/dotc/transform/PostInlining.scala
index 54e654781aed..e50a8b77ff0e 100644
--- a/compiler/src/dotty/tools/dotc/transform/PostInlining.scala
+++ b/compiler/src/dotty/tools/dotc/transform/PostInlining.scala
@@ -13,6 +13,9 @@ class PostInlining extends MacroTransform, IdentityDenotTransformer:
   thisPhase =>
 
   override def phaseName: String = PostInlining.name
+
+  override def description: String = PostInlining.description
+
   override def changesMembers = true
 
   override def run(using Context): Unit =
@@ -31,4 +34,5 @@ class PostInlining extends MacroTransform, IdentityDenotTransformer:
         case tree1 => tree1
 
 object PostInlining:
-  val name: String = "postInlining"
\ No newline at end of file
+  val name: String = "postInlining"
+  val description: String = "add mirror support for inlined code"
diff --git a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala
index 8e9b95a0c572..bfcf6cc6e5bf 100644
--- a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala
+++ b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala
@@ -17,6 +17,7 @@ import reporting._
 
 object PostTyper {
   val name: String = "posttyper"
+  val description: String = "additional checks and cleanups after type checking"
 }
 
 /** A macro transform that runs immediately after typer and that performs the following functions:
@@ -57,9 +58,10 @@ object PostTyper {
 class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase =>
   import tpd._
 
-  /** the following two members override abstract members in Transform */
   override def phaseName: String = PostTyper.name
 
+  override def description: String = PostTyper.description
+
   override def checkPostCondition(tree: tpd.Tree)(using Context): Unit = tree match {
     case tree: ValOrDefDef =>
       assert(!tree.symbol.signature.isUnderDefined)
@@ -243,10 +245,8 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
     private object dropInlines extends TreeMap {
       override def transform(tree: Tree)(using Context): Tree = tree match {
         case Inlined(call, _, expansion) =>
-          val newExpansion = tree.tpe match
-            case ConstantType(c) => Literal(c)
-            case _ => Typed(ref(defn.Predef_undefined), TypeTree(tree.tpe))
-          cpy.Inlined(tree)(call, Nil, newExpansion.withSpan(tree.span))
+          val newExpansion = PruneErasedDefs.trivialErasedTree(tree)
+          cpy.Inlined(tree)(call, Nil, newExpansion)
         case _ => super.transform(tree)
       }
     }
@@ -257,6 +257,14 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
 
     override def transform(tree: Tree)(using Context): Tree =
       try tree match {
+        // TODO move CaseDef case lower: keep most probable trees first for performance
+        case CaseDef(pat, _, _) =>
+          val gadtCtx =
+           pat.removeAttachment(typer.Typer.InferredGadtConstraints) match
+             case Some(gadt) => ctx.fresh.setGadt(gadt)
+             case None =>
+               ctx
+          super.transform(tree)(using gadtCtx)
         case tree: Ident if !tree.isType =>
           if tree.symbol.is(Inline) && !Inliner.inInlineMethod then
             ctx.compilationUnit.needsInlining = true
@@ -282,7 +290,12 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
               tpd.cpy.Apply(tree)(
                 tree.fun,
                 tree.args.mapConserve(arg =>
-                  if (methType.isImplicitMethod && arg.span.isSynthetic) ref(defn.Predef_undefined)
+                  if (methType.isImplicitMethod && arg.span.isSynthetic)
+                    arg match
+                      case _: RefTree | _: Apply | _: TypeApply if arg.symbol.is(Erased) =>
+                        dropInlines.transform(arg)
+                      case _ =>
+                        PruneErasedDefs.trivialErasedTree(arg)
                   else dropInlines.transform(arg)))
             else
               tree
@@ -296,6 +309,10 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
               // need to check instantiability here, because the type of the New itself
               // might be a type constructor.
               ctx.typer.checkClassType(tree.tpe, tree.srcPos, traitReq = false, stablePrefixReq = true)
+              if !nu.tpe.isLambdaSub then
+                // Check the constructor type as well; it could be an illegal singleton type
+                // which would not be reflected as `tree.tpe`
+                ctx.typer.checkClassType(nu.tpe, tree.srcPos, traitReq = false, stablePrefixReq = false)
               Checking.checkInstantiable(tree.tpe, nu.srcPos)
               withNoCheckNews(nu :: Nil)(app1)
             case _ =>
@@ -337,9 +354,11 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
             )
           }
         case tree: ValDef =>
+          checkErasedDef(tree)
           val tree1 = cpy.ValDef(tree)(rhs = normalizeErasedRhs(tree.rhs, tree.symbol))
           processValOrDefDef(super.transform(tree1))
         case tree: DefDef =>
+          checkErasedDef(tree)
           annotateContextResults(tree)
           val tree1 = cpy.DefDef(tree)(rhs = normalizeErasedRhs(tree.rhs, tree.symbol))
           processValOrDefDef(superAcc.wrapDefDef(tree1)(super.transform(tree1).asInstanceOf[DefDef]))
@@ -347,6 +366,11 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
           val sym = tree.symbol
           if (sym.isClass)
             VarianceChecker.check(tree)
+            annotateExperimental(sym)
+            tree.rhs match
+              case impl: Template =>
+                for parent <- impl.parents do
+                  Checking.checkTraitInheritance(parent.tpe.classSymbol, sym.asClass, parent.srcPos)
             // Add SourceFile annotation to top-level classes
             if sym.owner.is(Package)
                && ctx.compilationUnit.source.exists
@@ -358,6 +382,8 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
           else (tree.rhs, sym.info) match
             case (rhs: LambdaTypeTree, bounds: TypeBounds) =>
               VarianceChecker.checkLambda(rhs, bounds)
+              if sym.isOpaqueAlias then
+                VarianceChecker.checkLambda(rhs, TypeBounds.upper(sym.opaqueAlias))
             case _ =>
           processMemberDef(super.transform(tree))
         case tree: New if isCheckable(tree) =>
@@ -414,12 +440,12 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
             //     case x: (_: Tree[?])
         case m @ MatchTypeTree(bounds, selector, cases) =>
           // Analog to the case above for match types
-          def tranformIgnoringBoundsCheck(x: CaseDef): CaseDef =
+          def transformIgnoringBoundsCheck(x: CaseDef): CaseDef =
             withMode(Mode.Pattern)(super.transform(x)).asInstanceOf[CaseDef]
           cpy.MatchTypeTree(tree)(
             super.transform(bounds),
             super.transform(selector),
-            cases.mapConserve(tranformIgnoringBoundsCheck)
+            cases.mapConserve(transformIgnoringBoundsCheck)
           )
         case Block(_, Closure(_, _, tpt)) if ExpandSAMs.needsWrapperClass(tpt.tpe) =>
           superAcc.withInvalidCurrentClass(super.transform(tree))
@@ -432,10 +458,28 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
           throw ex
       }
 
+    override def transformStats(trees: List[Tree], exprOwner: Symbol)(using Context): List[Tree] =
+      try super.transformStats(trees, exprOwner)
+      finally Checking.checkExperimentalImports(trees)
+
     /** Transforms the rhs tree into a its default tree if it is in an `erased` val/def.
      *  Performed to shrink the tree that is known to be erased later.
      */
     private def normalizeErasedRhs(rhs: Tree, sym: Symbol)(using Context) =
       if (sym.isEffectivelyErased) dropInlines.transform(rhs) else rhs
+
+    private def checkErasedDef(tree: ValOrDefDef)(using Context): Unit =
+      if tree.symbol.is(Erased, butNot = Macro) then
+        val tpe = tree.rhs.tpe
+        if tpe.derivesFrom(defn.NothingClass) then
+          report.error("`erased` definition cannot be implemented with en expression of type Nothing", tree.srcPos)
+        else if tpe.derivesFrom(defn.NullClass) then
+          report.error("`erased` definition cannot be implemented with en expression of type Null", tree.srcPos)
+
+    private def annotateExperimental(sym: Symbol)(using Context): Unit =
+      if sym.is(Module) && sym.companionClass.hasAnnotation(defn.ExperimentalAnnot) then
+        sym.addAnnotation(defn.ExperimentalAnnot)
+        sym.companionModule.addAnnotation(defn.ExperimentalAnnot)
+
   }
-}
\ No newline at end of file
+}
diff --git a/compiler/src/dotty/tools/dotc/transform/ProtectedAccessors.scala b/compiler/src/dotty/tools/dotc/transform/ProtectedAccessors.scala
index 8c59a192e09f..98e835293303 100644
--- a/compiler/src/dotty/tools/dotc/transform/ProtectedAccessors.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ProtectedAccessors.scala
@@ -9,6 +9,7 @@ import core.Decorators._
 import core.Names.TermName
 import MegaPhase.MiniPhase
 import config.Printers.transforms
+import dotty.tools.dotc.util.Property
 
 /** Add accessors for all protected accesses. An accessor is needed if
  *  according to the rules of the JVM a protected class member is not accessible
@@ -17,6 +18,7 @@ import config.Printers.transforms
  */
 object ProtectedAccessors {
   val name: String = "protectedAccessors"
+  val description: String = "add accessors for protected members"
 
   /** Is the current context's owner inside the access boundary established by `sym`? */
   def insideBoundaryOf(sym: Symbol)(using Context): Boolean =
@@ -50,7 +52,17 @@ class ProtectedAccessors extends MiniPhase {
 
   override def phaseName: String = ProtectedAccessors.name
 
-  object Accessors extends AccessProxies {
+  override def description: String = ProtectedAccessors.description
+
+  private val AccessorsKey = new Property.Key[Accessors]
+
+  private def accessors(using Context): Accessors =
+   ctx.property(AccessorsKey).get
+
+  override def prepareForUnit(tree: Tree)(using Context): Context =
+    ctx.fresh.setProperty(AccessorsKey, new Accessors)
+
+  private class Accessors extends AccessProxies {
     val insert: Insert = new Insert {
       def accessorNameOf(name: TermName, site: Symbol)(using Context): TermName = ProtectedAccessorName(name)
       def needsAccessor(sym: Symbol)(using Context) = ProtectedAccessors.needsAccessor(sym)
@@ -66,19 +78,20 @@ class ProtectedAccessors extends MiniPhase {
   }
 
   override def transformIdent(tree: Ident)(using Context): Tree =
-    Accessors.insert.accessorIfNeeded(tree)
+    accessors.insert.accessorIfNeeded(tree)
 
   override def transformSelect(tree: Select)(using Context): Tree =
-    Accessors.insert.accessorIfNeeded(tree)
+    accessors.insert.accessorIfNeeded(tree)
 
   override def transformAssign(tree: Assign)(using Context): Tree =
     tree.lhs match {
       case lhs: RefTree if lhs.name.is(ProtectedAccessorName) =>
-        cpy.Apply(tree)(Accessors.insert.useSetter(lhs), tree.rhs :: Nil)
+        cpy.Apply(tree)(accessors.insert.useSetter(lhs), tree.rhs :: Nil)
       case _ =>
         tree
     }
 
   override def transformTemplate(tree: Template)(using Context): Tree =
-    cpy.Template(tree)(body = Accessors.addAccessorDefs(tree.symbol.owner, tree.body))
+    cpy.Template(tree)(body = accessors.addAccessorDefs(tree.symbol.owner, tree.body))
+
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala b/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala
index e18de6e60876..fca0b6b34928 100644
--- a/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala
+++ b/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala
@@ -12,6 +12,9 @@ import typer.RefChecks
 import MegaPhase.MiniPhase
 import StdNames.nme
 import ast.tpd
+import SymUtils._
+import config.Feature
+import Decorators.*
 
 /** This phase makes all erased term members of classes private so that they cannot
  *  conflict with non-erased members. This is needed so that subsequent phases like
@@ -19,62 +22,62 @@ import ast.tpd
  *  The phase also replaces all expressions that appear in an erased context by
  *  default values. This is necessary so that subsequent checking phases such
  *  as IsInstanceOfChecker don't give false negatives.
- *  Finally, the phase replaces `compiletime.uninitialized` on the right hand side
- *  of a mutable field definition by `_`. This avoids a "is declared erased, but is
- *  in fact used" error in Erasure and communicates to Constructors that the
- *  variable does not have an initializer.
+ *  Finally, the phase drops (language-) imports.
  */
 class PruneErasedDefs extends MiniPhase with SymTransformer { thisTransform =>
   import tpd._
+  import PruneErasedDefs._
 
   override def phaseName: String = PruneErasedDefs.name
 
+  override def description: String = PruneErasedDefs.description
+
   override def changesMembers: Boolean = true   // makes erased members private
 
   override def runsAfterGroupsOf: Set[String] = Set(RefChecks.name, ExplicitOuter.name)
 
   override def transformSym(sym: SymDenotation)(using Context): SymDenotation =
-    if (sym.isEffectivelyErased && sym.isTerm && !sym.is(Private) && sym.owner.isClass)
-      sym.copySymDenotation(initFlags = sym.flags | Private)
-    else sym
+    if !sym.isEffectivelyErased || !sym.isTerm || sym.is(Private) || !sym.owner.isClass then sym
+    else sym.copySymDenotation(initFlags = sym.flags | Private)
 
   override def transformApply(tree: Apply)(using Context): Tree =
-    if (tree.fun.tpe.widen.isErasedMethod)
-      cpy.Apply(tree)(tree.fun, tree.args.map(trivialErasedTree))
-    else tree
-
-  private def hasUninitializedRHS(tree: ValOrDefDef)(using Context): Boolean =
-    def recur(rhs: Tree): Boolean = rhs match
-      case rhs: RefTree =>
-        rhs.symbol == defn.Compiletime_uninitialized
-        && tree.symbol.is(Mutable) && tree.symbol.owner.isClass
-      case closureDef(ddef) if defn.isContextFunctionType(tree.tpt.tpe.dealias) =>
-        recur(ddef.rhs)
-      case _ =>
-        false
-    recur(tree.rhs)
+    if !tree.fun.tpe.widen.isErasedMethod then tree
+    else cpy.Apply(tree)(tree.fun, tree.args.map(trivialErasedTree))
 
   override def transformValDef(tree: ValDef)(using Context): Tree =
-    val sym = tree.symbol
-    if tree.symbol.isEffectivelyErased && !tree.rhs.isEmpty then
-      cpy.ValDef(tree)(rhs = trivialErasedTree(tree))
-    else if hasUninitializedRHS(tree) then
-      cpy.ValDef(tree)(rhs = cpy.Ident(tree.rhs)(nme.WILDCARD).withType(tree.tpt.tpe))
-    else
-      tree
+    checkErasedInExperimental(tree.symbol)
+    if !tree.symbol.isEffectivelyErased || tree.rhs.isEmpty then tree
+    else cpy.ValDef(tree)(rhs = trivialErasedTree(tree.rhs))
 
   override def transformDefDef(tree: DefDef)(using Context): Tree =
-    if (tree.symbol.isEffectivelyErased && !tree.rhs.isEmpty)
-      cpy.DefDef(tree)(rhs = trivialErasedTree(tree))
-    else tree
+    checkErasedInExperimental(tree.symbol)
+    if !tree.symbol.isEffectivelyErased || tree.rhs.isEmpty then tree
+    else cpy.DefDef(tree)(rhs = trivialErasedTree(tree.rhs))
+
+  override def transformTypeDef(tree: TypeDef)(using Context): Tree =
+    checkErasedInExperimental(tree.symbol)
+    tree
+
+  override def transformOther(tree: Tree)(using Context): Tree = tree match
+    case tree: Import => EmptyTree
+    case _ => tree
 
-  private def trivialErasedTree(tree: Tree)(using Context): Tree =
-    tree.tpe.widenTermRefExpr.dealias.normalized match
-      case ConstantType(c) => Literal(c)
-      case _ => ref(defn.Predef_undefined)
+  def checkErasedInExperimental(sym: Symbol)(using Context): Unit =
+    // Make an exception for Scala 2 experimental macros to allow dual Scala 2/3 macros under non experimental mode
+    if sym.is(Erased, butNot = Macro) && sym != defn.Compiletime_erasedValue && !sym.isInExperimentalScope then
+      Feature.checkExperimentalFeature("erased", sym.sourcePos)
 
+  override def checkPostCondition(tree: Tree)(using Context): Unit = tree match
+    case _: tpd.Import => assert(false, i"illegal tree: $tree")
+    case _ =>
 }
 
 object PruneErasedDefs {
+  import tpd._
+
   val name: String = "pruneErasedDefs"
+  val description: String = "drop erased definitions and simplify erased expressions"
+
+  def trivialErasedTree(tree: Tree)(using Context): Tree =
+    ref(defn.Compiletime_erasedValue).appliedToType(tree.tpe).withSpan(tree.span)
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/PureStats.scala b/compiler/src/dotty/tools/dotc/transform/PureStats.scala
index fc9b3bd6543e..b747d7d6b9e4 100644
--- a/compiler/src/dotty/tools/dotc/transform/PureStats.scala
+++ b/compiler/src/dotty/tools/dotc/transform/PureStats.scala
@@ -9,6 +9,7 @@ import Symbols._, StdNames._, Trees._
 
 object PureStats {
   val name: String = "pureStats"
+  val description: String = "remove pure statements in blocks"
 }
 
 /** Remove pure statements in blocks */
@@ -18,6 +19,8 @@ class PureStats extends MiniPhase {
 
   override def phaseName: String = PureStats.name
 
+  override def description: String = PureStats.description
+
   override def runsAfter: Set[String] = Set(Erasure.name)
 
   override def transformBlock(tree: Block)(using Context): Tree =
diff --git a/compiler/src/dotty/tools/dotc/transform/RenameLifted.scala b/compiler/src/dotty/tools/dotc/transform/RenameLifted.scala
deleted file mode 100644
index 60327d59be88..000000000000
--- a/compiler/src/dotty/tools/dotc/transform/RenameLifted.scala
+++ /dev/null
@@ -1,46 +0,0 @@
-package dotty.tools.dotc.transform
-
-import dotty.tools.dotc.core.Contexts._
-import dotty.tools.dotc.core.Decorators._
-import dotty.tools.dotc.core.DenotTransformers.SymTransformer
-import dotty.tools.dotc.core.Flags._
-import dotty.tools.dotc.core.NameKinds._
-import dotty.tools.dotc.core.Names._
-import dotty.tools.dotc.core.SymDenotations.SymDenotation
-import dotty.tools.dotc.core.Symbols._
-import dotty.tools.dotc.transform.MegaPhase.MiniPhase
-
-/** Renames lifted classes to local numbering scheme */
-class RenameLifted extends MiniPhase with SymTransformer {
-
-  override def phaseName: String = "renameLifted"
-
-  // Not clear why this should run after restoreScopes
-  // override def runsAfterGroupsOf = Set(RestoreScopes.name)
-
-  def transformSym(ref: SymDenotation)(using Context): SymDenotation =
-    if (needsRefresh(ref.symbol)) ref.copySymDenotation(name = refreshedName(ref.symbol))
-    else ref
-
-  /** If the name of the symbol with a unique name needs to be refreshed
-   *    - if it is a lifted class
-   *    - if it is a lifted method
-   */
-  private def needsRefresh(sym: Symbol)(using Context): Boolean =
-    (sym.isClass || sym.isOneOf(Private | Method | JavaStatic)) && sym.name.is(UniqueName)
-
-  /** Refreshes the number of the name based on the full name of the symbol */
-  private def refreshedName(sym: Symbol)(using Context): Name = {
-    def rewriteUnique: PartialFunction[Name, Name] = {
-      case name: DerivedName if name.info.kind == UniqueName =>
-        val fullName = (sym.owner.fullName.toString + name.underlying).toTermName
-        val freshName = UniqueName.fresh(fullName)
-        val info = freshName.asInstanceOf[DerivedName].info
-        DerivedName(name.underlying.replace(rewriteUnique), info)
-      case DerivedName(underlying, info: QualifiedInfo) =>
-        underlying.replace(rewriteUnique).derived(info)
-    }
-
-    sym.name.replace(rewriteUnique)
-  }
-}
diff --git a/compiler/src/dotty/tools/dotc/transform/RepeatableAnnotations.scala b/compiler/src/dotty/tools/dotc/transform/RepeatableAnnotations.scala
index ecf2d3e2b96f..24c46cd98e4c 100644
--- a/compiler/src/dotty/tools/dotc/transform/RepeatableAnnotations.scala
+++ b/compiler/src/dotty/tools/dotc/transform/RepeatableAnnotations.scala
@@ -12,7 +12,10 @@ import Types._
 import Decorators._
 
 class RepeatableAnnotations extends MiniPhase:
-  override def phaseName = "repeatableAnnotations"
+
+  override def phaseName: String = RepeatableAnnotations.name
+
+  override def description: String = RepeatableAnnotations.description
 
   override def transformTypeDef(tree: TypeDef)(using Context): Tree = transformDef(tree)
   override def transformValDef(tree: ValDef)(using Context): Tree = transformDef(tree)
@@ -46,3 +49,7 @@ class RepeatableAnnotations extends MiniPhase:
             Nil
       case (_, anns) => anns
     }.toList
+
+object RepeatableAnnotations:
+  val name: String = "repeatableAnnotations"
+  val description: String = "aggregate repeatable annotations"
diff --git a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala
index 30ccc69e37ca..2a4a775b834f 100644
--- a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala
@@ -35,6 +35,8 @@ class ResolveSuper extends MiniPhase with IdentityDenotTransformer { thisPhase =
 
   override def phaseName: String = ResolveSuper.name
 
+  override def description: String = ResolveSuper.description
+
   override def runsAfter: Set[String] = Set(ElimByName.name, // verified empirically, need to figure out what the reason is.
                                PruneErasedDefs.name) // Erased decls make `isCurrent` work incorrectly
 
@@ -72,6 +74,7 @@ class ResolveSuper extends MiniPhase with IdentityDenotTransformer { thisPhase =
 
 object ResolveSuper {
   val name: String = "resolveSuper"
+  val description: String = "implement super accessors"
 
   /** Returns the symbol that is accessed by a super-accessor in a mixin composition.
    *
@@ -107,7 +110,14 @@ object ResolveSuper {
         // of the superaccessor's type, see i5433.scala for an example where this matters
         val otherTp = other.asSeenFrom(base.typeRef).info
         val accTp = acc.asSeenFrom(base.typeRef).info
-        if (!(otherTp.overrides(accTp, matchLoosely = true)))
+        // Since the super class can be Java defined,
+        // we use releaxed overriding check for explicit nulls if one of the symbols is Java defined.
+        // This forces `Null` being a subtype of reference types during override checking.
+        val relaxedCtxForNulls =
+        if ctx.explicitNulls && (sym.is(JavaDefined) || acc.is(JavaDefined)) then
+          ctx.retractMode(Mode.SafeNulls)
+        else ctx
+        if (!(otherTp.overrides(accTp, matchLoosely = true)(using relaxedCtxForNulls)))
           report.error(IllegalSuperAccessor(base, memberName, targetName, acc, accTp, other.symbol, otherTp), base.srcPos)
 
       bcs = bcs.tail
diff --git a/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala b/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala
index 6fe75ce8a901..4937b3ec80b1 100644
--- a/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala
+++ b/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala
@@ -16,7 +16,10 @@ import StdNames._
  */
 class RestoreScopes extends MiniPhase with IdentityDenotTransformer { thisPhase =>
   import ast.tpd._
-  override def phaseName: String = "restoreScopes"
+
+  override def phaseName: String = RestoreScopes.name
+
+  override def description: String = RestoreScopes.description
 
   override def changesMembers: Boolean = true // the phase affects scopes, applying tree transformations of previous phases
 
@@ -50,3 +53,6 @@ class RestoreScopes extends MiniPhase with IdentityDenotTransformer { thisPhase
   }
 }
 
+object RestoreScopes:
+  val name: String = "restoreScopes"
+  val description: String = "repair rendered invalid scopes"
diff --git a/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala b/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala
index 6e9fd6f48568..1db210634ab6 100644
--- a/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala
+++ b/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala
@@ -46,7 +46,9 @@ import dotty.tools.dotc.transform.SymUtils._
 class SelectStatic extends MiniPhase with IdentityDenotTransformer {
   import ast.tpd._
 
-  override def phaseName: String = "selectStatic"
+  override def phaseName: String = SelectStatic.name
+
+  override def description: String = SelectStatic.description
 
   override def transformSelect(tree: tpd.Select)(using Context): tpd.Tree = {
     val sym = tree.symbol
@@ -94,3 +96,7 @@ class SelectStatic extends MiniPhase with IdentityDenotTransformer {
   override def transformClosure(tree: tpd.Closure)(using Context): tpd.Tree =
     normalize(tree)
 }
+
+object SelectStatic:
+  val name: String = "selectStatic"
+  val description: String = "get rid of selects that would be compiled into GetStatic"
diff --git a/compiler/src/dotty/tools/dotc/transform/SeqLiterals.scala b/compiler/src/dotty/tools/dotc/transform/SeqLiterals.scala
index aacf3373dbe0..2f586104c4e3 100644
--- a/compiler/src/dotty/tools/dotc/transform/SeqLiterals.scala
+++ b/compiler/src/dotty/tools/dotc/transform/SeqLiterals.scala
@@ -17,7 +17,10 @@ import Contexts._
 class SeqLiterals extends MiniPhase {
   import ast.tpd._
 
-  override def phaseName: String = "seqLiterals"
+  override def phaseName: String = SeqLiterals.name
+
+  override def description: String = SeqLiterals.description
+
   override def runsAfter: Set[String] = Set(PatternMatcher.name)
 
   override def checkPostCondition(tree: Tree)(using Context): Unit = tree match {
@@ -34,3 +37,8 @@ class SeqLiterals extends MiniPhase {
       wrapArray(arr, elemtp).withSpan(tree.span).ensureConforms(tree.tpe)
   }
 }
+
+object SeqLiterals:
+  val name: String = "seqLiterals"
+  val description: String = "express vararg arguments as arrays"
+
diff --git a/compiler/src/dotty/tools/dotc/transform/SetRootTree.scala b/compiler/src/dotty/tools/dotc/transform/SetRootTree.scala
index 06c3d3ffa0eb..a2bd55a1035d 100644
--- a/compiler/src/dotty/tools/dotc/transform/SetRootTree.scala
+++ b/compiler/src/dotty/tools/dotc/transform/SetRootTree.scala
@@ -9,6 +9,9 @@ import dotty.tools.dotc.core.Phases.Phase
 class SetRootTree extends Phase {
 
   override val phaseName: String = SetRootTree.name
+
+  override val description: String = SetRootTree.description
+
   override def isRunnable(using Context) =
     super.isRunnable && ctx.settings.YretainTrees.value
 
@@ -43,4 +46,5 @@ class SetRootTree extends Phase {
 
 object SetRootTree {
   val name: String = "SetRootTree"
+  val description: String = "set the rootTreeOrProvider on class symbols"
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/SpecializeApplyMethods.scala b/compiler/src/dotty/tools/dotc/transform/SpecializeApplyMethods.scala
index ef825832c1cd..6ffa05075201 100644
--- a/compiler/src/dotty/tools/dotc/transform/SpecializeApplyMethods.scala
+++ b/compiler/src/dotty/tools/dotc/transform/SpecializeApplyMethods.scala
@@ -20,7 +20,9 @@ import scala.collection.mutable
 class SpecializeApplyMethods extends MiniPhase with InfoTransformer {
   import ast.tpd._
 
-  val phaseName = "specializeApplyMethods"
+  override def phaseName: String = SpecializeApplyMethods.name
+
+  override def description: String = SpecializeApplyMethods.description
 
   override def isEnabled(using Context): Boolean =
     !ctx.settings.scalajs.value
@@ -116,3 +118,7 @@ class SpecializeApplyMethods extends MiniPhase with InfoTransformer {
       tree
   }
 }
+
+object SpecializeApplyMethods:
+  val name: String = "specializeApplyMethods"
+  val description: String = "adds specialized methods to FunctionN"
diff --git a/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala b/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala
index 91555dc2b995..97e8e37ae444 100644
--- a/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala
+++ b/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala
@@ -13,7 +13,11 @@ import scala.collection.mutable
  */
 class SpecializeFunctions extends MiniPhase {
   import ast.tpd._
-  val phaseName = "specializeFunctions"
+
+  override def phaseName: String = SpecializeFunctions.name
+
+  override def description: String = SpecializeFunctions.description
+
   override def runsAfter = Set(ElimByName.name)
 
   override def isEnabled(using Context): Boolean =
@@ -76,24 +80,27 @@ class SpecializeFunctions extends MiniPhase {
             argTypes,
             retType
           )
-
-        if (!isSpecializable || argTypes.exists(_.isInstanceOf[ExprType])) return tree
-
-        val specializedApply = nme.apply.specializedFunction(retType, argTypes)
-        val newSel = fun match {
-          case Select(qual, _) =>
-            qual.select(specializedApply)
-          case _ =>
-            (fun.tpe: @unchecked) match {
-              case TermRef(prefix: ThisType, name) =>
-                tpd.This(prefix.cls).select(specializedApply)
-              case TermRef(prefix: NamedType, name) =>
-                tpd.ref(prefix).select(specializedApply)
-            }
-        }
-
-        newSel.appliedToTermArgs(args)
-
+        if isSpecializable then
+          val specializedApply = nme.apply.specializedFunction(retType, argTypes)
+          val newSel = fun match
+            case Select(qual, _) =>
+              val qual1 = qual.tpe.widen match
+                case defn.ByNameFunction(res) =>
+                  // Need to cast to regular function, since specialied apply methods
+                  // are not members of ContextFunction0. The cast will be eliminated in
+                  // erasure.
+                  qual.cast(defn.FunctionOf(Nil, res))
+                case _ =>
+                  qual
+              qual1.select(specializedApply)
+            case _ =>
+              (fun.tpe: @unchecked) match
+                case TermRef(prefix: ThisType, name) =>
+                  tpd.This(prefix.cls).select(specializedApply)
+                case TermRef(prefix: NamedType, name) =>
+                  tpd.ref(prefix).select(specializedApply)
+          newSel.appliedToTermArgs(args)
+        else tree
       case _ => tree
     }
 
@@ -102,3 +109,7 @@ class SpecializeFunctions extends MiniPhase {
       p == defn.Function0 || p == defn.Function1 || p == defn.Function2
     }
 }
+
+object SpecializeFunctions:
+  val name: String = "specializeFunctions"
+  val description: String = "specialize Function{0,1,2} by replacing super with specialized super"
diff --git a/compiler/src/dotty/tools/dotc/transform/Splicer.scala b/compiler/src/dotty/tools/dotc/transform/Splicer.scala
index 6fb008c88889..dcd5b8d8c4b5 100644
--- a/compiler/src/dotty/tools/dotc/transform/Splicer.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Splicer.scala
@@ -49,7 +49,7 @@ object Splicer {
           val oldContextClassLoader = Thread.currentThread().getContextClassLoader
           Thread.currentThread().setContextClassLoader(classLoader)
           try {
-            val interpreter = new Interpreter(spliceExpansionPos, classLoader)
+            val interpreter = new Interpreter(splicePos, classLoader)
 
             // Some parts of the macro are evaluated during the unpickling performed in quotedExprToTree
             val interpretedExpr = interpreter.interpret[Quotes => scala.quoted.Expr[Any]](tree)
@@ -63,8 +63,10 @@ object Splicer {
       catch {
         case ex: CompilationUnit.SuspendException =>
           throw ex
-        case ex: scala.quoted.runtime.StopMacroExpansion if ctx.reporter.hasErrors =>
-           // errors have been emitted
+        case ex: scala.quoted.runtime.StopMacroExpansion =>
+          if !ctx.reporter.hasErrors then
+            report.error("Macro expansion was aborted by the macro without any errors reported. Macros should issue errors to end-users to facilitate debugging when aborting a macro expansion.", splicePos)
+          // errors have been emitted
           EmptyTree
         case ex: StopInterpretation =>
           report.error(ex.msg, ex.pos)
@@ -147,7 +149,14 @@ object Splicer {
         case Typed(expr, _) => checkIfValidArgument(expr)
 
         case Apply(Select(Apply(fn, quoted :: Nil), nme.apply), _) if fn.symbol == defn.QuotedRuntime_exprQuote =>
-          // OK
+          val noSpliceChecker = new TreeTraverser {
+            def traverse(tree: Tree)(using Context): Unit = tree match
+              case Spliced(_) =>
+                report.error("Quoted argument of macros may not have splices", tree.srcPos)
+              case _ =>
+                traverseChildren(tree)
+          }
+          noSpliceChecker.traverse(quoted)
 
         case Apply(TypeApply(fn, List(quoted)), _)if fn.symbol == defn.QuotedTypeModule_of =>
           // OK
@@ -161,7 +170,7 @@ object Splicer {
         case SeqLiteral(elems, _) =>
           elems.foreach(checkIfValidArgument)
 
-        case tree: Ident if summon[Env].contains(tree.symbol) =>
+        case tree: Ident if summon[Env].contains(tree.symbol) || tree.symbol.is(Inline, butNot = Method) =>
           // OK
 
         case _ =>
@@ -172,6 +181,7 @@ object Splicer {
               |Parameters may only be:
               | * Quoted parameters or fields
               | * Literal values of primitive types
+              | * References to `inline val`s
               |""".stripMargin, tree.srcPos)
       }
 
@@ -242,6 +252,11 @@ object Splicer {
       case Literal(Constant(value)) =>
         interpretLiteral(value)
 
+      case tree: Ident if tree.symbol.is(Inline, butNot = Method) =>
+        tree.tpe.widenTermRefExpr match
+          case ConstantType(c) => c.value.asInstanceOf[Object]
+          case _ => throw new StopInterpretation(em"${tree.symbol} could not be inlined", tree.srcPos)
+
       // TODO disallow interpreted method calls as arguments
       case Call(fn, args) =>
         if (fn.symbol.isConstructor && fn.symbol.owner.owner.is(Package))
@@ -342,12 +357,18 @@ object Splicer {
 
     private def interpretedStaticMethodCall(moduleClass: Symbol, fn: Symbol)(implicit env: Env): List[Object] => Object = {
       val (inst, clazz) =
-        if (moduleClass.name.startsWith(str.REPL_SESSION_LINE))
-          (null, loadReplLineClass(moduleClass))
-        else {
-          val inst = loadModule(moduleClass)
-          (inst, inst.getClass)
-        }
+        try
+          if (moduleClass.name.startsWith(str.REPL_SESSION_LINE))
+            (null, loadReplLineClass(moduleClass))
+          else {
+            val inst = loadModule(moduleClass)
+            (inst, inst.getClass)
+          }
+        catch
+          case MissingClassDefinedInCurrentRun(sym)  if ctx.compilationUnit.isSuspendable =>
+            if (ctx.settings.XprintSuspension.value)
+              report.echo(i"suspension triggered by a dependency on $sym", pos)
+            ctx.compilationUnit.suspend() // this throws a SuspendException
 
       val name = fn.name.asTermName
       val method = getMethod(clazz, name, paramsSig(fn))
@@ -408,6 +429,10 @@ object Splicer {
         case _: NoSuchMethodException =>
           val msg = em"Could not find method ${clazz.getCanonicalName}.$name with parameters ($paramClasses%, %)"
           throw new StopInterpretation(msg, pos)
+        case MissingClassDefinedInCurrentRun(sym) if ctx.compilationUnit.isSuspendable =>
+            if (ctx.settings.XprintSuspension.value)
+              report.echo(i"suspension triggered by a dependency on $sym", pos)
+            ctx.compilationUnit.suspend() // this throws a SuspendException
       }
 
     private def stopIfRuntimeException[T](thunk: => T, method: JLRMethod): T =
@@ -540,4 +565,3 @@ object Splicer {
     }
   }
 }
-
diff --git a/compiler/src/dotty/tools/dotc/transform/Staging.scala b/compiler/src/dotty/tools/dotc/transform/Staging.scala
index 936fc22c5d71..dbfeaf4728b1 100644
--- a/compiler/src/dotty/tools/dotc/transform/Staging.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Staging.scala
@@ -12,7 +12,6 @@ import dotty.tools.dotc.core.NameKinds._
 import dotty.tools.dotc.core.StagingContext._
 import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.core.Symbols._
-import dotty.tools.dotc.core.tasty.TreePickler.Hole
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.quoted._
 import dotty.tools.dotc.util.{SourceFile, SrcPos}
@@ -35,6 +34,8 @@ class Staging extends MacroTransform {
 
   override def phaseName: String = Staging.name
 
+  override def description: String = Staging.description
+
   override def runsAfter: Set[String] = Set(Inlining.name)
 
   override def allowsImplicitSearch: Boolean = true
@@ -86,4 +87,5 @@ class Staging extends MacroTransform {
 
 object Staging {
   val name: String = "staging"
+  val description: String = "check staging levels and heal staged types"
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/SymUtils.scala b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala
index 3bbcdef68932..93268b71a477 100644
--- a/compiler/src/dotty/tools/dotc/transform/SymUtils.scala
+++ b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala
@@ -87,7 +87,44 @@ object SymUtils:
 
     def isGenericProduct(using Context): Boolean = whyNotGenericProduct.isEmpty
 
-    def useCompanionAsMirror(using Context): Boolean = self.linkedClass.exists && !self.is(Scala2x)
+    /** Is this an old style implicit conversion?
+     *  @param directOnly            only consider explicitly written methods
+     *  @param forImplicitClassOnly  only consider methods generated from implicit classes
+     */
+    def isOldStyleImplicitConversion(directOnly: Boolean = false, forImplicitClassOnly: Boolean = false)(using Context): Boolean =
+      self.is(Implicit) && self.info.stripPoly.match
+        case mt @ MethodType(_ :: Nil) if !mt.isImplicitMethod =>
+          if self.isCoDefinedGiven(mt.finalResultType.typeSymbol)
+          then !directOnly
+          else !forImplicitClassOnly
+        case _ =>
+          false
+
+    /** Is this the method that summons a structural given instance? */
+    def isGivenInstanceSummoner(using Context): Boolean =
+      def isCodefined(info: Type): Boolean = info.stripPoly match
+        case mt: MethodType =>
+          // given summoner can only have contextual params
+          mt.isImplicitMethod && isCodefined(mt.resultType)
+        case mt: ExprType =>
+          isCodefined(mt.resultType)
+        case res =>
+          self.isCoDefinedGiven(res.typeSymbol)
+      self.isAllOf(Given | Method) && isCodefined(self.info)
+
+    def useCompanionAsSumMirror(using Context): Boolean =
+      self.linkedClass.exists
+      && !self.is(Scala2x)
+      && (
+        // If the sum type is compiled from source, and `self` is a "generic sum"
+        // then its companion object will become a sum mirror in `posttyper`. (This method
+        // can be called from `typer` when summoning a Mirror.)
+        // However if `self` is from a prior run then we should check that its companion subclasses `Mirror.Sum`.
+        // e.g. before Scala 3.1, hierarchical sum types were not considered "generic sums", so their
+        // companion would not cache the mirror. Companions from TASTy will already be typed as `Mirror.Sum`.
+        self.isDefinedInCurrentRun
+        || self.linkedClass.isSubClass(defn.Mirror_SumClass)
+      )
 
     /** Is this a sealed class or trait for which a sum mirror is generated?
     *  It must satisfy the following conditions:
@@ -95,14 +132,16 @@ object SymUtils:
     *   - none of its children are anonymous classes
     *   - all of its children are addressable through a path from the parent class
     *     and also the location of the generated mirror.
-    *   - all of its children are generic products or singletons
+    *   - all of its children are generic products, singletons, or generic sums themselves.
     */
     def whyNotGenericSum(declScope: Symbol)(using Context): String =
       if (!self.is(Sealed))
         s"it is not a sealed ${self.kindString}"
+      else if (!self.isOneOf(AbstractOrTrait))
+        s"it is not an abstract class"
       else {
         val children = self.children
-        val companionMirror = self.useCompanionAsMirror
+        val companionMirror = self.useCompanionAsSumMirror
         assert(!(companionMirror && (declScope ne self.linkedClass)))
         def problem(child: Symbol) = {
 
@@ -116,7 +155,11 @@ object SymUtils:
           else {
             val s = child.whyNotGenericProduct
             if (s.isEmpty) s
-            else i"its child $child is not a generic product because $s"
+            else if (child.is(Sealed)) {
+              val s = child.whyNotGenericSum(if child.useCompanionAsSumMirror then child.linkedClass else ctx.owner)
+              if (s.isEmpty) s
+              else i"its child $child is not a generic sum because $s"
+            } else i"its child $child is not a generic product because $s"
           }
         }
         if (children.isEmpty) "it does not have subclasses"
@@ -259,6 +302,25 @@ object SymUtils:
         && self.owner.linkedClass.is(Case)
         && self.owner.linkedClass.isDeclaredInfix
 
+    /** Is symbol declared or inherits @experimental? */
+    def isExperimental(using Context): Boolean =
+      self.hasAnnotation(defn.ExperimentalAnnot)
+      || (self.maybeOwner.isClass && self.owner.hasAnnotation(defn.ExperimentalAnnot))
+
+    def isInExperimentalScope(using Context): Boolean =
+      def isDefaultArgumentOfExperimentalMethod =
+        self.name.is(DefaultGetterName)
+        && self.owner.isClass
+        && {
+          val overloads = self.owner.asClass.membersNamed(self.name.firstPart)
+          overloads.filterWithFlags(HasDefaultParams, EmptyFlags) match
+            case denot: SymDenotation => denot.symbol.isExperimental
+            case _ => false
+        }
+      self.hasAnnotation(defn.ExperimentalAnnot)
+      || isDefaultArgumentOfExperimentalMethod
+      || (!self.is(Package) && self.owner.isInExperimentalScope)
+
     /** The declared self type of this class, as seen from `site`, stripping
     *  all refinements for opaque types.
     */
@@ -278,5 +340,50 @@ object SymUtils:
         self.addAnnotation(
           Annotation(defn.TargetNameAnnot,
             Literal(Constant(nameFn(original.targetName).toString)).withSpan(original.span)))
+
+    /** The return type as seen from the body of this definition. It is
+     *  computed from the symbol's type by replacing param refs by param symbols.
+     */
+    def localReturnType(using Context): Type =
+      if self.isConstructor then defn.UnitType
+      else
+        def instantiateRT(info: Type, psymss: List[List[Symbol]]): Type = info match
+          case info: PolyType =>
+            instantiateRT(info.instantiate(psymss.head.map(_.typeRef)), psymss.tail)
+          case info: MethodType =>
+            instantiateRT(info.instantiate(psymss.head.map(_.termRef)), psymss.tail)
+          case info =>
+            info.widenExpr
+        instantiateRT(self.info, self.paramSymss)
+
+    /** The expected type of a return to `self` at the place indicated by the context.
+     *  This is the local return type instantiated by the symbols of any context function
+     *  closures that enclose the site of the return
+     */
+    def returnProto(using Context): Type =
+
+      /** If `pt` is a context function type, its return type. If the CFT
+       * is dependent, instantiate with the parameters of the associated
+       * anonymous function.
+       * @param  paramss  the parameters of the anonymous functions
+       *                  enclosing the return expression
+       */
+      def instantiateCFT(pt: Type, paramss: => List[List[Symbol]]): Type =
+        val ift = defn.asContextFunctionType(pt)
+        if ift.exists then
+          ift.nonPrivateMember(nme.apply).info match
+            case appType: MethodType =>
+              instantiateCFT(appType.instantiate(paramss.head.map(_.termRef)), paramss.tail)
+        else pt
+
+      def iftParamss = ctx.owner.ownersIterator
+          .filter(_.is(Method, butNot = Accessor))
+          .takeWhile(_.isAnonymousFunction)
+          .toList
+          .reverse
+          .map(_.paramSymss.head)
+
+      instantiateCFT(self.localReturnType, iftParamss)
+    end returnProto
   end extension
 end SymUtils
diff --git a/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala b/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala
index 817be9cba633..4ce4619aa3b9 100644
--- a/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala
+++ b/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala
@@ -63,12 +63,10 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
   private def initSymbols(using Context) =
     if (myValueSymbols.isEmpty) {
       myValueSymbols = List(defn.Any_hashCode, defn.Any_equals)
-      myCaseSymbols = myValueSymbols ++ List(defn.Any_toString, defn.Product_canEqual,
-        defn.Product_productArity, defn.Product_productPrefix, defn.Product_productElement,
-        defn.Product_productElementName)
+      myCaseSymbols = defn.caseClassSynthesized
       myCaseModuleSymbols = myCaseSymbols.filter(_ ne defn.Any_equals)
       myEnumValueSymbols = List(defn.Product_productPrefix)
-      myNonJavaEnumValueSymbols = myEnumValueSymbols :+ defn.Any_toString
+      myNonJavaEnumValueSymbols = myEnumValueSymbols :+ defn.Any_toString :+ defn.Enum_ordinal
     }
 
   def valueSymbols(using Context): List[Symbol] = { initSymbols; myValueSymbols }
@@ -134,6 +132,17 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
         else // assume owner is `val Foo = new MyEnum { def ordinal = 0 }`
           Literal(Constant(clazz.owner.name.toString))
 
+      def ordinalRef: Tree =
+        if isSimpleEnumValue then // owner is `def $new(_$ordinal: Int, $name: String) = new MyEnum { ... }`
+          ref(clazz.owner.paramSymss.head.find(_.name == nme.ordinalDollar_).get)
+        else // val CaseN = new MyEnum { ... def ordinal: Int = n }
+          val vdef = clazz.owner
+          val parentEnum = vdef.owner.companionClass
+          val children = parentEnum.children.zipWithIndex
+          val candidate: Option[Int] = children.collectFirst { case (child, idx) if child == vdef => idx }
+          assert(candidate.isDefined, i"could not find child for $vdef")
+          Literal(Constant(candidate.get))
+
       def toStringBody(vrefss: List[List[Tree]]): Tree =
         if (clazz.is(ModuleClass)) ownName
         else if (isNonJavaEnumValue) identifierRef
@@ -145,6 +154,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
         case nme.toString_ => toStringBody(vrefss)
         case nme.equals_ => equalsBody(vrefss.head.head)
         case nme.canEqual_ => canEqualBody(vrefss.head.head)
+        case nme.ordinal => ordinalRef
         case nme.productArity => Literal(Constant(accessors.length))
         case nme.productPrefix if isEnumValue => nameRef
         case nme.productPrefix => ownName
@@ -525,7 +535,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
           val pat = Typed(untpd.Ident(nme.WILDCARD).withType(patType), TypeTree(patType))
           CaseDef(pat, EmptyTree, Literal(Constant(idx)))
         }
-      Match(param, cases)
+      Match(param.annotated(New(defn.UncheckedAnnot.typeRef, Nil)), cases)
     }
 
   /** - If `impl` is the companion of a generic sum, add `deriving.Mirror.Sum` parent
@@ -600,7 +610,16 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
 
   def addSyntheticMembers(impl: Template)(using Context): Template = {
     val clazz = ctx.owner.asClass
+    val syntheticMembers = serializableObjectMethod(clazz) ::: serializableEnumValueMethod(clazz) ::: caseAndValueMethods(clazz)
+    checkInlining(syntheticMembers)
     addMirrorSupport(
-      cpy.Template(impl)(body = serializableObjectMethod(clazz) ::: serializableEnumValueMethod(clazz) ::: caseAndValueMethods(clazz) ::: impl.body))
+      cpy.Template(impl)(body = syntheticMembers ::: impl.body))
   }
+
+  private def checkInlining(syntheticMembers: List[Tree])(using Context): Unit =
+    if syntheticMembers.exists(_.existsSubTree {
+      case tree: GenericApply => tree.symbol.isAllOf(InlineMethod)
+      case tree: Select => tree.symbol.isAllOf(InlineMethod)
+      case _ => false
+    }) then ctx.compilationUnit.needsInlining = true
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/TailRec.scala b/compiler/src/dotty/tools/dotc/transform/TailRec.scala
index 9330016f3292..66dcd4a9dfbd 100644
--- a/compiler/src/dotty/tools/dotc/transform/TailRec.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TailRec.scala
@@ -113,6 +113,8 @@ class TailRec extends MiniPhase {
 
   override def phaseName: String = TailRec.name
 
+  override def description: String = TailRec.description
+
   override def runsAfter: Set[String] = Set(Erasure.name) // tailrec assumes erased types
 
   override def transformDefDef(tree: DefDef)(using Context): Tree = {
@@ -277,23 +279,11 @@ class TailRec extends MiniPhase {
     def yesTailTransform(tree: Tree)(using Context): Tree =
       transform(tree, tailPosition = true)
 
-    /** If not in tail position a tree traversal may not be needed.
-     *
-     *  A recursive  call may still be in tail position if within the return
-     *  expression of a labeled block.
-     *  A tree traversal may also be needed to report a failure to transform
-     *  a recursive call of a @tailrec annotated method (i.e. `isMandatory`).
-     */
-    private def isTraversalNeeded =
-      isMandatory || tailPositionLabeledSyms.size > 0
-
     def noTailTransform(tree: Tree)(using Context): Tree =
-      if (isTraversalNeeded) transform(tree, tailPosition = false)
-      else tree
+      transform(tree, tailPosition = false)
 
     def noTailTransforms[Tr <: Tree](trees: List[Tr])(using Context): List[Tr] =
-      if (isTraversalNeeded) trees.mapConserve(noTailTransform).asInstanceOf[List[Tr]]
-      else trees
+      trees.mapConserve(noTailTransform).asInstanceOf[List[Tr]]
 
     override def transform(tree: Tree)(using Context): Tree = {
       /* Rewrite an Apply to be considered for tail call transformation. */
@@ -444,7 +434,7 @@ class TailRec extends MiniPhase {
 
         case Return(expr, from) =>
           val fromSym = from.symbol
-          val inTailPosition = fromSym.is(Label) && tailPositionLabeledSyms.contains(fromSym)
+          val inTailPosition = !fromSym.is(Label) || tailPositionLabeledSyms.contains(fromSym)
           cpy.Return(tree)(transform(expr, inTailPosition), from)
 
         case _ =>
@@ -456,4 +446,5 @@ class TailRec extends MiniPhase {
 
 object TailRec {
   val name: String = "tailrec"
+  val description: String = "rewrite tail recursion to loops"
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala b/compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala
deleted file mode 100644
index dab1d8f25ca2..000000000000
--- a/compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala
+++ /dev/null
@@ -1,64 +0,0 @@
-package dotty.tools
-package dotc
-package transform
-
-import MegaPhase._
-import core._
-import Symbols._
-import SymDenotations._
-import Contexts._
-import Types._
-import Flags._
-import Decorators._
-import DenotTransformers._
-import core.StdNames.nme
-import ast.Trees._
-import reporting.trace
-
-/** Abstract base class of ByNameClosures and ElimByName, factoring out the
- *  common functionality to transform arguments of by-name parameters.
- */
-abstract class TransformByNameApply extends MiniPhase { thisPhase: DenotTransformer =>
-  import ast.tpd._
-
-  /** The info of the tree's symbol before it is potentially transformed in this phase */
-  private def originalDenotation(tree: Tree)(using Context) =
-    atPhase(thisPhase)(tree.symbol.denot)
-
-  /** If denotation had an ExprType before, it now gets a function type */
-  protected def exprBecomesFunction(symd: SymDenotation)(using Context): Boolean =
-    symd.is(Param) || symd.is(ParamAccessor, butNot = Method)
-
-  protected def isByNameRef(tree: Tree)(using Context): Boolean = {
-    val origDenot = originalDenotation(tree)
-    origDenot.info.isInstanceOf[ExprType] && exprBecomesFunction(origDenot)
-  }
-
-  def mkByNameClosure(arg: Tree, argType: Type)(using Context): Tree = unsupported(i"mkClosure($arg)")
-
-  override def transformApply(tree: Apply)(using Context): Tree =
-    trace(s"transforming ${tree.show} at phase ${ctx.phase}", show = true) {
-
-      def transformArg(arg: Tree, formal: Type): Tree = formal.dealias match {
-        case formalExpr: ExprType =>
-          var argType = arg.tpe.widenIfUnstable
-          if (argType.isBottomType) argType = formal.widenExpr
-          def wrap(arg: Tree) =
-            ref(defn.cbnArg).appliedToType(argType).appliedTo(arg).withSpan(arg.span)
-          arg match {
-            case Apply(Select(qual, nme.apply), Nil)
-            if qual.tpe.derivesFrom(defn.Function0) && (isPureExpr(qual) || qual.symbol.isAllOf(Inline | Param)) =>
-              wrap(qual)
-            case _ =>
-              if (isByNameRef(arg) || arg.symbol == defn.cbnArg) arg
-              else wrap(mkByNameClosure(arg, argType))
-          }
-        case _ =>
-          arg
-      }
-
-      val mt @ MethodType(_) = tree.fun.tpe.widen
-      val args1 = tree.args.zipWithConserve(mt.paramInfos)(transformArg)
-      cpy.Apply(tree)(tree.fun, args1)
-    }
-}
diff --git a/compiler/src/dotty/tools/dotc/transform/TransformWildcards.scala b/compiler/src/dotty/tools/dotc/transform/TransformWildcards.scala
index eac7ef11b7de..ffed65f7676e 100644
--- a/compiler/src/dotty/tools/dotc/transform/TransformWildcards.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TransformWildcards.scala
@@ -14,7 +14,9 @@ import ast.tpd
 class TransformWildcards extends MiniPhase with IdentityDenotTransformer {
   import tpd._
 
-  override def phaseName: String = "transformWildcards"
+  override def phaseName: String = TransformWildcards.name
+
+  override def description: String = TransformWildcards.description
 
   override def checkPostCondition(tree: Tree)(using Context): Unit =
     tree match {
@@ -26,3 +28,7 @@ class TransformWildcards extends MiniPhase with IdentityDenotTransformer {
     if (ctx.owner.isClass) tree
     else cpy.ValDef(tree)(rhs = tree.rhs.wildcardToDefault)
 }
+
+object TransformWildcards:
+  val name: String = "transformWildcards"
+  val description: String = "replace wildcards with default values"
diff --git a/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala b/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala
index e3a0489cf0fa..29fd1adb6688 100644
--- a/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala
@@ -91,7 +91,7 @@ class TreeChecker extends Phase with SymTransformer {
     // until erasure, see the comment above `Compiler#phases`.
     if (ctx.phaseId <= erasurePhase.id) {
       val initial = symd.initial
-      assert(symd.signature == initial.signature,
+      assert(symd == initial || symd.signature == initial.signature,
         i"""Signature of ${sym.showLocated} changed at phase ${ctx.base.fusedContaining(ctx.phase.prev)}
            |Initial info: ${initial.info}
            |Initial sig : ${initial.signature}
@@ -128,6 +128,8 @@ class TreeChecker extends Phase with SymTransformer {
     report.echo(s"checking ${ctx.compilationUnit} after phase ${fusedPhase}")(using ctx)
 
     inContext(ctx) {
+      assert(ctx.typerState.constraint.domainLambdas.isEmpty,
+        i"non-empty constraint at end of $fusedPhase: ${ctx.typerState.constraint}, ownedVars = ${ctx.typerState.ownedVars.toList}%, %")
       assertSelectWrapsNew(ctx.compilationUnit.tpdTree)
     }
 
@@ -420,6 +422,30 @@ class TreeChecker extends Phase with SymTransformer {
       assert(tree.qual.tpe.isInstanceOf[ThisType], i"expect prefix of Super to be This, actual = ${tree.qual}")
       super.typedSuper(tree, pt)
 
+    override def typedTyped(tree: untpd.Typed, pt: Type)(using Context): Tree =
+      val tpt1 = checkSimpleKinded(typedType(tree.tpt))
+      val expr1 = tree.expr match
+        case id: untpd.Ident if (ctx.mode is Mode.Pattern) && untpd.isVarPattern(id) && (id.name == nme.WILDCARD || id.name == nme.WILDCARD_STAR) =>
+          tree.expr.withType(tpt1.tpe)
+        case _ =>
+          var pt1 = tpt1.tpe
+          if pt1.isRepeatedParam then
+            pt1 = pt1.translateFromRepeated(toArray = tree.expr.typeOpt.derivesFrom(defn.ArrayClass))
+          val isAfterInlining =
+            val inliningPhase = ctx.base.inliningPhase
+            inliningPhase.exists && ctx.phase.id > inliningPhase.id
+          if isAfterInlining then
+            // The staging phase destroys in PCPCheckAndHeal the property that
+            // tree.expr.tpe <:< pt1. A test case where this arises is run-macros/enum-nat-macro.
+            // We should follow up why this happens. If the problem is fixed, we can
+            // drop the isAfterInlining special case. To reproduce the problem, just
+            // change the condition from `isAfterInlining` to `false`.
+            typed(tree.expr)
+          else
+            //println(i"typing $tree, ${tree.expr.typeOpt}, $pt1, ${ctx.mode is Mode.Pattern}")
+            typed(tree.expr, pt1)
+      untpd.cpy.Typed(tree)(expr1, tpt1).withType(tree.typeOpt)
+
     private def checkOwner(tree: untpd.Tree)(using Context): Unit = {
       def ownerMatches(symOwner: Symbol, ctxOwner: Symbol): Boolean =
         symOwner == ctxOwner ||
@@ -446,8 +472,7 @@ class TreeChecker extends Phase with SymTransformer {
       val decls   = cls.classInfo.decls.toList.toSet.filter(isNonMagicalMember)
       val defined = impl.body.map(_.symbol)
 
-      def isAllowed(sym: Symbol): Boolean =
-        sym.is(ConstructorProxy) && !ctx.phase.erasedTypes
+      def isAllowed(sym: Symbol): Boolean = sym.is(ConstructorProxy)
 
       val symbolsNotDefined = (decls -- defined - constr.symbol).filterNot(isAllowed)
 
@@ -567,7 +592,7 @@ class TreeChecker extends Phase with SymTransformer {
           !isPrimaryConstructorReturn &&
           !pt.isInstanceOf[FunOrPolyProto])
         assert(tree.tpe <:< pt, {
-          val mismatch = TypeMismatch(tree.tpe, pt)
+          val mismatch = TypeMismatch(tree.tpe, pt, Some(tree))
           i"""|${mismatch.msg}
               |found: ${infoStr(tree.tpe)}
               |expected: ${infoStr(pt)}
diff --git a/compiler/src/dotty/tools/dotc/transform/TreeMapWithStages.scala b/compiler/src/dotty/tools/dotc/transform/TreeMapWithStages.scala
index c8019bf5deb8..c4a3ead114b0 100644
--- a/compiler/src/dotty/tools/dotc/transform/TreeMapWithStages.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TreeMapWithStages.scala
@@ -13,7 +13,6 @@ import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core.StagingContext._
 import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.core.Symbols._
-import dotty.tools.dotc.core.tasty.TreePickler.Hole
 import dotty.tools.dotc.quoted._
 import dotty.tools.dotc.util.Spans._
 import dotty.tools.dotc.util.Property
diff --git a/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala b/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala
index 6be58352e6dc..34971911bc7d 100644
--- a/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala
@@ -42,7 +42,9 @@ import dotty.tools.dotc.util.Spans.Span
 class TryCatchPatterns extends MiniPhase {
   import dotty.tools.dotc.ast.tpd._
 
-  def phaseName: String = "tryCatchPatterns"
+  override def phaseName: String = TryCatchPatterns.name
+
+  override def description: String = TryCatchPatterns.description
 
   override def runsAfter: Set[String] = Set(ElimRepeated.name)
 
@@ -98,3 +100,6 @@ class TryCatchPatterns extends MiniPhase {
     }
 }
 
+object TryCatchPatterns:
+  val name: String = "tryCatchPatterns"
+  val description: String = "compile cases in try/catch"
diff --git a/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala b/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala
index 73e75597c2b3..d7705111444f 100644
--- a/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala
@@ -21,7 +21,9 @@ import scala.annotation.tailrec
 class TupleOptimizations extends MiniPhase with IdentityDenotTransformer {
   import tpd._
 
-  def phaseName: String = "genericTuples"
+  override def phaseName: String = TupleOptimizations.name
+
+  override def description: String = TupleOptimizations.description
 
   override def transformApply(tree: tpd.Apply)(using Context): tpd.Tree =
     if (!tree.symbol.exists || tree.symbol.owner != defn.RuntimeTuplesModuleClass) tree
@@ -218,3 +220,6 @@ class TupleOptimizations extends MiniPhase with IdentityDenotTransformer {
     (0 until size).map(i => tup.select(nme.selectorName(i))).toList
 }
 
+object TupleOptimizations:
+  val name: String = "genericTuples"
+  val description: String = "optimize generic operations on tuples"
diff --git a/compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala b/compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala
index 5209f71e5dd1..8ffe2198c4d9 100644
--- a/compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala
@@ -28,7 +28,7 @@ import config.Printers.{ transforms => debug }
 object TypeTestsCasts {
   import ast.tpd._
   import typer.Inferencing.maximizeType
-  import typer.ProtoTypes.{ constrained, newTypeVar }
+  import typer.ProtoTypes.constrained
 
   /** Whether `(x:X).isInstanceOf[P]` can be checked at runtime?
    *
@@ -98,8 +98,10 @@ object TypeTestsCasts {
         //
         // If we perform widening, we will get X = Nothing, and we don't have
         // Ident[X] <:< Ident[Int] any more.
-        TypeComparer.constrainPatternType(P1, X, widenParams = false)
-        debug.println(TypeComparer.explained(_.constrainPatternType(P1, X, widenParams = false)))
+        TypeComparer.constrainPatternType(P1, X, forceInvariantRefinement = true)
+        debug.println(
+          TypeComparer.explained(_.constrainPatternType(P1, X, forceInvariantRefinement = true))
+        )
       }
 
       // Maximization of the type means we try to cover all possible values
@@ -295,7 +297,7 @@ object TypeTestsCasts {
             derivedTree(expr, defn.Any_asInstanceOf, testType)
         }
 
-        /** Transform isInstanceOf OrType
+        /** Transform isInstanceOf
          *
          *    expr.isInstanceOf[A | B]  ~~>  expr.isInstanceOf[A] | expr.isInstanceOf[B]
          *    expr.isInstanceOf[A & B]  ~~>  expr.isInstanceOf[A] & expr.isInstanceOf[B]
@@ -337,15 +339,21 @@ object TypeTestsCasts {
           case AppliedType(tref: TypeRef, _) if tref.symbol == defn.PairClass =>
             ref(defn.RuntimeTuples_isInstanceOfNonEmptyTuple).appliedTo(expr)
           case _ =>
-            val erasedTestType = erasure(testType)
-            transformIsInstanceOf(expr, erasedTestType, erasedTestType, flagUnrelated)
+            val testWidened = testType.widen
+            defn.untestableClasses.find(testWidened.isRef(_)) match
+              case Some(untestable) =>
+                report.error(i"$untestable cannot be used in runtime type tests", tree.srcPos)
+                constant(expr, Literal(Constant(false)))
+              case _ =>
+                val erasedTestType = erasure(testType)
+                transformIsInstanceOf(expr, erasedTestType, erasedTestType, flagUnrelated)
         }
 
         if (sym.isTypeTest) {
           val argType = tree.args.head.tpe
           val isTrusted = tree.hasAttachment(PatternMatcher.TrustedTypeTestKey)
           if (!isTrusted && !checkable(expr.tpe, argType, tree.span))
-            report.warning(i"the type test for $argType cannot be checked at runtime", tree.srcPos)
+            report.uncheckedWarning(i"the type test for $argType cannot be checked at runtime", expr.srcPos)
           transformTypeTest(expr, tree.args.head.tpe, flagUnrelated = true)
         }
         else if (sym.isTypeCast)
diff --git a/compiler/src/dotty/tools/dotc/transform/TypeUtils.scala b/compiler/src/dotty/tools/dotc/transform/TypeUtils.scala
index ecbfbeb6d6e5..7a3da6ad4bde 100644
--- a/compiler/src/dotty/tools/dotc/transform/TypeUtils.scala
+++ b/compiler/src/dotty/tools/dotc/transform/TypeUtils.scala
@@ -24,6 +24,16 @@ object TypeUtils {
     def isErasedClass(using Context): Boolean =
       self.underlyingClassRef(refinementOK = true).typeSymbol.is(Flags.Erased)
 
+    /** Is this type a checked exception? This is the case if the type
+     *  derives from Exception but not from RuntimeException. According to
+     *  that definition Throwable is unchecked. That makes sense since you should
+     *  neither throw nor catch `Throwable` anyway, so we should not define
+     *  a capability to do so.
+     */
+    def isCheckedException(using Context): Boolean =
+      self.derivesFrom(defn.ExceptionClass)
+      && !self.derivesFrom(defn.RuntimeExceptionClass)
+
     def isByName: Boolean =
       self.isInstanceOf[ExprType]
 
diff --git a/compiler/src/dotty/tools/dotc/transform/UncacheGivenAliases.scala b/compiler/src/dotty/tools/dotc/transform/UncacheGivenAliases.scala
index 958fce04da77..29f9e68aa7fa 100644
--- a/compiler/src/dotty/tools/dotc/transform/UncacheGivenAliases.scala
+++ b/compiler/src/dotty/tools/dotc/transform/UncacheGivenAliases.scala
@@ -15,6 +15,7 @@ import ast.tpd
 
 object UncacheGivenAliases:
   val name: String = "uncacheGivenAliases"
+  val description: String = "avoid caching RHS of simple parameterless given aliases"
 
 /** This phase optimizes alias givens represented as lazy vals to be uncached
  *  if that does not change runtime behavior. A definition does not need to be
@@ -30,6 +31,8 @@ class UncacheGivenAliases extends MiniPhase with IdentityDenotTransformer:
 
   override def phaseName: String = UncacheGivenAliases.name
 
+  override def description: String = UncacheGivenAliases.description
+
   private def needsCache(sym: Symbol, rhs: Tree)(using Context): Boolean = rhs.tpe match
     case rhsTpe @ TermRef(NoPrefix, _)
     if rhsTpe.isStable => false
diff --git a/compiler/src/dotty/tools/dotc/transform/UninitializedDefs.scala b/compiler/src/dotty/tools/dotc/transform/UninitializedDefs.scala
new file mode 100644
index 000000000000..d63e2d453b44
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/transform/UninitializedDefs.scala
@@ -0,0 +1,52 @@
+package dotty.tools.dotc
+package transform
+
+import core._
+import Contexts._
+import DenotTransformers.SymTransformer
+import Flags._
+import SymDenotations._
+import Symbols._
+import Types._
+import typer.RefChecks
+import MegaPhase.MiniPhase
+import StdNames.nme
+import ast.tpd
+
+/** This phase replaces `compiletime.uninitialized` on the right hand side of a mutable field definition by `_`.
+ *  This avoids a
+ *  ```scala
+ *  "@compileTimeOnly("`uninitialized` can only be used as the right hand side of a mutable field definition")`
+ *  ```
+ *  error in Erasure and communicates to Constructors that the variable does not have an initializer.
+ *
+ *  @syntax markdown
+ */
+class UninitializedDefs extends MiniPhase:
+  import tpd._
+
+  override def phaseName: String = UninitializedDefs.name
+
+  override def description: String = UninitializedDefs.description
+
+  override def transformValDef(tree: ValDef)(using Context): Tree =
+    if !hasUninitializedRHS(tree) then tree
+    else cpy.ValDef(tree)(rhs = cpy.Ident(tree.rhs)(nme.WILDCARD).withType(tree.tpt.tpe))
+
+  private def hasUninitializedRHS(tree: ValOrDefDef)(using Context): Boolean =
+    def recur(rhs: Tree): Boolean = rhs match
+      case rhs: RefTree =>
+        rhs.symbol == defn.Compiletime_uninitialized
+        && tree.symbol.is(Mutable) && tree.symbol.owner.isClass
+      case closureDef(ddef) if defn.isContextFunctionType(tree.tpt.tpe.dealias) =>
+        recur(ddef.rhs)
+      case _ =>
+        false
+    recur(tree.rhs)
+
+end UninitializedDefs
+
+object UninitializedDefs:
+  val name: String = "uninitializedDefs"
+  val description: String = "replaces `compiletime.uninitialized` by `_`"
+end UninitializedDefs
diff --git a/compiler/src/dotty/tools/dotc/transform/VCElideAllocations.scala b/compiler/src/dotty/tools/dotc/transform/VCElideAllocations.scala
index d9fb4567e169..879a885d626e 100644
--- a/compiler/src/dotty/tools/dotc/transform/VCElideAllocations.scala
+++ b/compiler/src/dotty/tools/dotc/transform/VCElideAllocations.scala
@@ -18,7 +18,9 @@ import TreeExtractors._, ValueClasses._
 class VCElideAllocations extends MiniPhase with IdentityDenotTransformer {
   import tpd._
 
-  override def phaseName: String = "vcElideAllocations"
+  override def phaseName: String = VCElideAllocations.name
+
+  override def description: String = VCElideAllocations.description
 
   override def runsAfter: Set[String] = Set(ElimErasedValueType.name)
 
@@ -47,3 +49,7 @@ class VCElideAllocations extends MiniPhase with IdentityDenotTransformer {
         tree
     }
 }
+
+object VCElideAllocations:
+  val name: String = "vcElideAllocations"
+  val description: String = "peep-hole optimization to eliminate unnecessary value class allocations"
diff --git a/compiler/src/dotty/tools/dotc/transform/VCInlineMethods.scala b/compiler/src/dotty/tools/dotc/transform/VCInlineMethods.scala
index a777a570da27..219945d4ebb1 100644
--- a/compiler/src/dotty/tools/dotc/transform/VCInlineMethods.scala
+++ b/compiler/src/dotty/tools/dotc/transform/VCInlineMethods.scala
@@ -42,7 +42,9 @@ import ExtensionMethods._, ValueClasses._
 class VCInlineMethods extends MiniPhase with IdentityDenotTransformer {
   import tpd._
 
-  override def phaseName: String = "vcInlineMethods"
+  override def phaseName: String = VCInlineMethods.name
+
+  override def description: String = VCInlineMethods.description
 
   override def runsAfter: Set[String] =
     Set(ExtensionMethods.name, PatternMatcher.name)
@@ -105,3 +107,7 @@ class VCInlineMethods extends MiniPhase with IdentityDenotTransformer {
   override def transformApply(tree: Apply)(using Context): Tree =
     rewireIfNeeded(tree)
 }
+
+object VCInlineMethods:
+  val name: String = "vcInlineMethods"
+  val description: String = "inlines calls to value class methods"
diff --git a/compiler/src/dotty/tools/dotc/transform/YCheckPositions.scala b/compiler/src/dotty/tools/dotc/transform/YCheckPositions.scala
index 44655e3bead3..fb0731198a98 100644
--- a/compiler/src/dotty/tools/dotc/transform/YCheckPositions.scala
+++ b/compiler/src/dotty/tools/dotc/transform/YCheckPositions.scala
@@ -14,7 +14,9 @@ import dotty.tools.dotc.util.SourceFile
 class YCheckPositions extends Phase {
   import tpd._
 
-  def phaseName: String = "inlinedPositions"
+  override def phaseName: String = YCheckPositions.name
+
+  override def description: String = YCheckPositions.description
 
   override def run(using Context): Unit = () // YCheck only
 
@@ -63,3 +65,6 @@ class YCheckPositions extends Phase {
 
 }
 
+object YCheckPositions:
+  val name: String = "inlinedPositions"
+  val description: String = "check inlined positions"
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Cache.scala b/compiler/src/dotty/tools/dotc/transform/init/Cache.scala
deleted file mode 100644
index 763c7b70b52e..000000000000
--- a/compiler/src/dotty/tools/dotc/transform/init/Cache.scala
+++ /dev/null
@@ -1,43 +0,0 @@
-package dotty.tools.dotc
-package transform
-package init
-
-import core._
-import Contexts._
-import Types._
-import Symbols._
-import Decorators._
-
-import ast.Trees._
-import ast.tpd
-
-import reporting.trace
-import config.Printers.init
-
-import scala.collection.mutable
-
-import Effects._, Potentials._, Summary._
-
-class Cache {
-  /** Summary of a class */
-  private val summaryCache = mutable.Map.empty[ClassSymbol, ClassSummary]
-  def summaryOf(cls: ClassSymbol)(using Env): ClassSummary =
-    if (summaryCache.contains(cls)) summaryCache(cls)
-    else trace("summary for " + cls.show, init, s => s.asInstanceOf[ClassSummary].show) {
-      val summary = Summarization.classSummary(cls)
-      summaryCache(cls) = summary
-      summary
-    }
-
-  /** Cache for outer this */
-  private case class OuterKey(warm: Warm, cls: ClassSymbol)
-  private val outerCache: mutable.Map[OuterKey, Potentials] = mutable.Map.empty
-  def resolveOuter(warm: Warm, cls: ClassSymbol)(using Env): Potentials =
-    val key = OuterKey(warm, cls)
-    if (outerCache.contains(key)) outerCache(key)
-    else {
-      val pots = Potentials.resolveOuter(warm.classSymbol, warm.outer.toPots, cls)
-      outerCache(key) = pots
-      pots
-    }
-}
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Checker.scala b/compiler/src/dotty/tools/dotc/transform/init/Checker.scala
index ec15d35096f6..9d95951cb36c 100644
--- a/compiler/src/dotty/tools/dotc/transform/init/Checker.scala
+++ b/compiler/src/dotty/tools/dotc/transform/init/Checker.scala
@@ -5,36 +5,67 @@ package init
 
 import dotty.tools.dotc._
 import ast.tpd
+import tpd._
 
 import dotty.tools.dotc.core._
 import Contexts._
 import Types._
 import Symbols._
+import StdNames._
 
 import dotty.tools.dotc.transform._
-import MegaPhase._
-
+import Phases._
 
 import scala.collection.mutable
 
+import Semantic._
 
-class Checker extends MiniPhase {
-  import tpd._
+class Checker extends Phase {
 
-  val phaseName = "initChecker"
+  override def phaseName: String = Checker.name
 
-  // cache of class summary
-  private val cache = new Cache
+  override def description: String = Checker.description
 
   override val runsAfter = Set(Pickler.name)
 
   override def isEnabled(using Context): Boolean =
     super.isEnabled && ctx.settings.YcheckInit.value
 
-  override def transformTypeDef(tree: TypeDef)(using Context): tpd.Tree = {
-    if (!tree.isClassDef) return tree
+  override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] =
+    val checkCtx = ctx.fresh.setPhase(this.start)
+    Semantic.withInitialState {
+      val traverser = new InitTreeTraverser()
+      units.foreach { unit => traverser.traverse(unit.tpdTree) }
+      given Context = checkCtx
+      Semantic.check()
+      super.runOn(units)
+    }
+
+  def run(using Context): Unit = {
+    // ignore, we already called `Semantic.check()` in `runOn`
+  }
+
+  class InitTreeTraverser(using WorkList) extends TreeTraverser {
+    override def traverse(tree: Tree)(using Context): Unit =
+      traverseChildren(tree)
+      tree match {
+        case mdef: MemberDef =>
+          // self-type annotation ValDef has no symbol
+          if mdef.name != nme.WILDCARD then
+            mdef.symbol.defTree = tree
+
+          mdef match
+          case tdef: TypeDef if tdef.isClassDef =>
+            val cls = tdef.symbol.asClass
+            val thisRef = ThisRef(cls)
+            if shouldCheckClass(cls) then Semantic.addTask(thisRef)
+          case _ =>
+
+        case _ =>
+      }
+  }
 
-    val cls = tree.symbol.asClass
+  private def shouldCheckClass(cls: ClassSymbol)(using Context) = {
     val instantiable: Boolean =
       cls.is(Flags.Module) ||
       !cls.isOneOf(Flags.AbstractOrTrait) && {
@@ -46,20 +77,10 @@ class Checker extends MiniPhase {
       }
 
     // A concrete class may not be instantiated if the self type is not satisfied
-    if (instantiable && cls.enclosingPackageClass != defn.StdLibPatchesPackage.moduleClass) {
-      implicit val state: Checking.State = Checking.State(
-        visited = Set.empty,
-        path = Vector.empty,
-        thisClass = cls,
-        fieldsInited = mutable.Set.empty,
-        parentsInited = mutable.Set.empty,
-        safePromoted = mutable.Set.empty,
-        env = Env(ctx.withOwner(cls), cache)
-      )
-
-      Checking.checkClassBody(tree)
-    }
-
-    tree
+    instantiable && cls.enclosingPackageClass != defn.StdLibPatchesPackage.moduleClass
   }
 }
+
+object Checker:
+  val name: String = "initChecker"
+  val description: String = "check initialization of objects"
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Checking.scala b/compiler/src/dotty/tools/dotc/transform/init/Checking.scala
deleted file mode 100644
index cc8f95b20e8c..000000000000
--- a/compiler/src/dotty/tools/dotc/transform/init/Checking.scala
+++ /dev/null
@@ -1,420 +0,0 @@
-package dotty.tools.dotc
-package transform
-package init
-
-import scala.collection.mutable
-
-import core._
-import Contexts._
-import ast.tpd._
-import Decorators._
-import Symbols._
-import Constants.Constant
-import Types._
-import util.NoSourcePosition
-import reporting.trace
-import config.Printers.init
-
-import Effects._, Potentials._, Summary._, Util._, Errors._
-
-object Checking {
-  /** The checking state
-   *
-   *  Why `visited` is a set of effects instead of `Symbol`? Think the following program:
-   *
-   *      class C(x: Int, a: A @cold) {
-   *        val n = if (x > 0) new C(x - 1, a).m() else 0
-   *        val b: Int = this.m()
-   *        def m(): Int = b
-   *      }
-   *
-   */
-
-  case class State(
-    var visited: Set[Effect],                  // effects that have been checked or are being checked
-    path: Vector[Tree],                        // the path that leads to the current effect
-    thisClass: ClassSymbol,                    // the concrete class of `this`
-    fieldsInited: mutable.Set[Symbol],
-    parentsInited: mutable.Set[ClassSymbol],
-    safePromoted: mutable.Set[Potential],      // Potentials that can be safely promoted
-    env: Env
-  ) {
-    def withOwner[T](sym: Symbol)(op: State ?=> T): T =
-      val state = this.copy(env = env.withOwner(sym))
-      val res = op(using state)
-      this.visited = state.visited
-      res
-
-
-    def visit[T](eff: Effect)(op: State ?=> T): T =
-      val state: State = this.copy(path = path :+ eff.source, visited = this.visited + eff)
-      val res = op(using state)
-      this.visited = state.visited
-      res
-
-    def test(op: State ?=> Errors): Errors = {
-      val savedVisited = visited
-      val errors = op(using this)
-      visited = savedVisited
-      errors
-    }
-  }
-
-  given theEnv(using State): Env = summon[State].env
-  given theCtx(using State): Context = summon[State].env.ctx
-
-  private def check(eff: Effect)(using state: State): Errors = {
-    trace("checking effect " + eff.show, init, errs => Errors.show(errs.asInstanceOf[Errors])) {
-      if (state.visited.contains(eff)) {
-        traceIndented("Already checked " + eff.show, init)
-        Errors.empty
-      }
-      else
-        state.visit(eff) {
-          eff match {
-            case eff: Promote      => Checking.checkPromote(eff)
-            case eff: FieldAccess  => Checking.checkFieldAccess(eff)
-            case eff: MethodCall   => Checking.checkMethodCall(eff)
-          }
-        }
-    }
-  }
-
-  private def checkEffects(effs: Effects)(using state: State): Unit = traceOp("checking effects " + Effects.show(effs), init) {
-    for {
-      eff <- effs
-      error <- check(eff)
-    } error.issue
-  }
-
-  /** Check that the given concrete class may be initialized safely
-   *
-   *  It assumes that all definitions are properly summarized before-hand.
-   *  However, summarization can be done lazily on-demand to improve
-   *  performance.
-   */
-  def checkClassBody(cdef: TypeDef)(using state: State): Unit = {
-    traceIndented("\n\n>>>> checking " + cdef.symbol.show, init)
-
-    val cls = cdef.symbol.asClass
-    val tpl = cdef.rhs.asInstanceOf[Template]
-
-    if state.parentsInited.contains(cls) then return
-
-    // mark current class as initialized, required for linearization
-    state.parentsInited += cls
-
-    def checkClassBodyStat(tree: Tree)(using state: State): Unit = traceOp("checking " + tree.show, init) {
-      tree match {
-        case vdef : ValDef =>
-          val summary = Summarization.analyze(vdef.rhs)
-          theEnv.summaryOf(cls).cacheFor(vdef.symbol, summary)
-          if (!vdef.symbol.isOneOf(Flags.Lazy | Flags.Deferred)) {
-            checkEffects(summary.effs)
-            traceIndented(vdef.symbol.show + " initialized", init)
-            state.fieldsInited += vdef.symbol
-          }
-
-        case tree =>
-          val summary = Summarization.analyze(tree)
-          checkEffects(summary.effs)
-      }
-    }
-
-    // check parent calls : follows linearization ordering
-    // see spec 5.1 about "Template Evaluation".
-    // https://www.scala-lang.org/files/archive/spec/2.13/05-classes-and-objects.html
-
-    def checkConstructor(ctor: Symbol, tp: Type, source: Tree)(using state: State): Unit = traceOp("checking " + ctor.show, init) {
-      val cls = ctor.owner
-      val classDef = cls.defTree
-      if (!classDef.isEmpty)
-        state.withOwner(cls) {
-          if (ctor.isPrimaryConstructor) checkClassBody(classDef.asInstanceOf[TypeDef])
-          else checkSecondaryConstructor(ctor)
-        }
-    }
-
-    def checkSecondaryConstructor(ctor: Symbol)(using state: State): Unit = traceOp("checking " + ctor.show, init) {
-      val Block(ctorCall :: stats, expr) = ctor.defTree.asInstanceOf[DefDef].rhs
-      val cls = ctor.owner.asClass
-
-      traceOp("check ctor: " + ctorCall.show, init) {
-        val ctor = ctorCall.symbol
-        if (ctor.isPrimaryConstructor)
-          checkClassBody(cls.defTree.asInstanceOf[TypeDef])
-        else
-          checkSecondaryConstructor(ctor)
-      }
-
-      checkStats(stats :+ expr, ctor)
-    }
-
-    def checkStats(stats: List[Tree], owner: Symbol)(using state: State): Unit =
-      stats.foreach { stat =>
-        val summary = Summarization.analyze(stat)(theEnv.withOwner(owner))
-        checkEffects(summary.effs)
-      }
-
-    cls.paramAccessors.foreach { acc =>
-      if (!acc.is(Flags.Method)) {
-        traceIndented(acc.show + " initialized", init)
-        state.fieldsInited += acc
-      }
-    }
-
-    tpl.parents.foreach {
-      case tree @ Block(_, parent) =>
-        checkConstructor(funPart(parent).symbol, parent.tpe, tree)
-
-      case tree @ Apply(Block(_, parent), _) =>
-        checkConstructor(funPart(parent).symbol, tree.tpe, tree)
-
-      case parent : Apply =>
-        checkConstructor(funPart(parent).symbol, parent.tpe, parent)
-
-      case ref =>
-        val cls = ref.tpe.classSymbol.asClass
-        if (cls.primaryConstructor.exists)
-          checkConstructor(cls.primaryConstructor, ref.tpe, ref)
-    }
-
-    // check class body
-    tpl.body.foreach { checkClassBodyStat(_) }
-  }
-
-  private def checkMethodCall(eff: MethodCall)(using state: State): Errors =
-    val MethodCall(pot, sym) = eff
-    pot match {
-      case thisRef: ThisRef =>
-        val target = resolve(state.thisClass, sym)
-        if (!target.isOneOf(Flags.Method | Flags.Lazy))
-          check(FieldAccess(pot, target)(eff.source))
-        else if (target.hasSource) {
-          val effs = thisRef.effectsOf(target).toList
-          effs.flatMap { check(_) }
-        }
-        else CallUnknown(target, eff.source, state.path).toErrors
-
-      case SuperRef(thisRef: ThisRef, supercls) =>
-        val target = resolveSuper(state.thisClass, supercls, sym)
-        if (!target.is(Flags.Method))
-          check(FieldAccess(pot, target)(eff.source))
-        else if (target.hasSource) {
-          val effs = thisRef.effectsOf(target).toList
-          effs.flatMap { check(_) }
-        }
-        else CallUnknown(target, eff.source, state.path).toErrors
-
-      case warm @ Warm(cls, outer) =>
-        val target = resolve(cls, sym)
-
-        if (target.hasSource) {
-          val effs = warm.effectsOf(target).toList
-          effs.flatMap { check(_) }
-        }
-        else if (!sym.isConstructor)
-          CallUnknown(target, eff.source, state.path).toErrors
-        else
-          Errors.empty
-
-      case _: Cold =>
-        CallCold(sym, eff.source, state.path).toErrors
-
-      case Fun(pots, effs) =>
-        // TODO: assertion might be false, due to SAM
-        if (sym.name.toString == "apply") effs.toList.flatMap { check(_) }
-        else Errors.empty
-        // curried, tupled, toString are harmless
-
-      case pot =>
-        val Summary(pots, effs) = expand(pot)
-        val effs2 = pots.map(MethodCall(_, sym)(eff.source))
-        (effs2 ++ effs).toList.flatMap(check(_))
-    }
-
-  private def checkFieldAccess(eff: FieldAccess)(using state: State): Errors =
-    val FieldAccess(pot, field) = eff
-    pot match {
-      case _: ThisRef =>
-        val target = resolve(state.thisClass, field)
-        if (target.is(Flags.Lazy)) check(MethodCall(pot, target)(eff.source))
-        else if (!state.fieldsInited.contains(target)) AccessNonInit(target, state.path).toErrors
-        else Errors.empty
-
-      case SuperRef(_: ThisRef, supercls) =>
-        val target = resolveSuper(state.thisClass, supercls, field)
-        if (target.is(Flags.Lazy)) check(MethodCall(pot, target)(eff.source))
-        else if (!state.fieldsInited.contains(target)) AccessNonInit(target, state.path).toErrors
-        else Errors.empty
-
-      case Warm(cls, outer) =>
-        // all fields of warm values are initialized
-        val target = resolve(cls, field)
-        if (target.is(Flags.Lazy)) check(MethodCall(pot, target)(eff.source))
-        else Errors.empty
-
-      case _: Cold =>
-        AccessCold(field, eff.source, state.path).toErrors
-
-      case Fun(pots, effs) =>
-        throw new Exception("Unexpected effect " + eff.show)
-
-      case pot =>
-        val Summary(pots, effs) = expand(pot)
-        val effs2 = pots.map(FieldAccess(_, field)(eff.source))
-        (effs2 ++ effs).toList.flatMap(check(_))
-
-    }
-
-
-  private def checkPromote(eff: Promote)(using state: State): Errors =
-    if (state.safePromoted.contains(eff.potential)) Errors.empty
-    else {
-      val pot = eff.potential
-      val errs = pot match {
-        case pot: ThisRef =>
-          // If we have all fields initialized, then we can promote This to hot.
-          val classRef = state.thisClass.info.asInstanceOf[ClassInfo].appliedRef
-          val allFieldsInited = classRef.fields.forall { denot =>
-            val sym = denot.symbol
-            sym.isOneOf(Flags.Lazy | Flags.Deferred) || state.fieldsInited.contains(sym)
-          }
-          if (allFieldsInited)
-            Errors.empty
-          else
-            PromoteThis(pot, eff.source, state.path).toErrors
-
-        case _: Cold =>
-          PromoteCold(eff.source, state.path).toErrors
-
-        case pot @ Warm(cls, outer) =>
-          val errors = state.test { checkPromote(Promote(outer)(eff.source)) }
-          if (errors.isEmpty) Errors.empty
-          else PromoteWarm(pot, eff.source, state.path).toErrors
-
-        case Fun(pots, effs) =>
-          val errs1 = state.test {
-            effs.toList.flatMap(check(_))
-          }
-          val errs2 = state.test {
-            pots.toList.flatMap { pot =>
-              checkPromote(Promote(pot)(eff.source))
-            }
-          }
-
-          if (errs1.nonEmpty || errs2.nonEmpty)
-            UnsafePromotion(pot, eff.source, state.path, errs1 ++ errs2).toErrors
-          else
-            Errors.empty
-
-        case pot =>
-          val Summary(pots, effs) = expand(pot)
-          val effs2 = pots.map(Promote(_)(eff.source))
-          (effs2 ++ effs).toList.flatMap(check(_))
-      }
-      // If we can safely promote, then we don't need to check again
-      if (errs.isEmpty)
-        state.safePromoted += pot
-      errs
-    }
-
-  private def expand(pot: Potential)(using state: State): Summary = trace("expand " + pot.show, init, _.asInstanceOf[Summary].show) {
-    pot match {
-      case MethodReturn(pot1, sym) =>
-        pot1 match {
-          case thisRef: ThisRef =>
-            val target = resolve(state.thisClass, sym)
-            if (target.hasSource) Summary(thisRef.potentialsOf(target), Effects.empty)
-            else Summary.empty // warning already issued in call effect
-
-          case SuperRef(thisRef: ThisRef, supercls) =>
-            val target = resolveSuper(state.thisClass, supercls, sym)
-            if (target.hasSource) Summary(thisRef.potentialsOf(target), Effects.empty)
-            else Summary.empty // warning already issued in call effect
-
-
-          case Fun(pots, effs) =>
-            val name = sym.name.toString
-            if (name == "apply") Summary(pots)
-            else if (name == "tupled") Summary(pot1)
-            else if (name == "curried") {
-              val arity = defn.functionArity(sym.info.finalResultType)
-              val pots = (1 until arity).foldLeft(Vector(pot1)) { (acc, i) =>
-                Vector(Fun(acc, Effects.empty)(pot1.source))
-              }
-              Summary(pots)
-            }
-            else Summary.empty
-
-          case warm : Warm =>
-            val target = resolve(warm.classSymbol, sym)
-            if (target.hasSource) Summary(warm.potentialsOf(target), Effects.empty)
-            else Summary.empty // warning already issued in call effect
-
-          case _: Cold =>
-            Summary.empty // error already reported, ignore
-
-          case _ =>
-            val Summary(pots, effs) = expand(pot1)
-            val Summary(pots2, effs2) = pots.select(sym, pot.source, ignoreSelectEffect = false)
-            Summary(pots2, effs ++ effs2)
-        }
-
-      case FieldReturn(pot1, sym) =>
-        pot1 match {
-          case thisRef: ThisRef =>
-            val target = resolve(state.thisClass, sym)
-            if (sym.hasSource) Summary(thisRef.potentialsOf(target), Effects.empty)
-            else Summary(Cold()(pot.source))
-
-          case SuperRef(thisRef: ThisRef, supercls) =>
-            val target = resolveSuper(state.thisClass, supercls, sym)
-            if (target.hasSource) Summary(thisRef.potentialsOf(target), Effects.empty)
-            else Summary(Cold()(pot.source))
-
-          case _: Fun =>
-            throw new Exception("Unexpected code reached")
-
-          case warm: Warm =>
-            val target = resolve(warm.classSymbol, sym)
-            if (target.hasSource) Summary(warm.potentialsOf(target), Effects.empty)
-            else Summary(Cold()(pot.source))
-
-          case _: Cold =>
-            Summary.empty // error already reported, ignore
-
-          case _ =>
-            val Summary(pots, effs) = expand(pot1)
-            val Summary(pots2, effs2) = pots.select(sym, pot.source, ignoreSelectEffect = false)
-            Summary(pots2, effs ++ effs2)
-        }
-
-      case Outer(pot1, cls) =>
-        pot1 match {
-          case _: ThisRef =>
-            // all outers for `this` are assumed to be hot
-            Summary.empty
-
-          case _: Fun =>
-            throw new Exception("Unexpected code reached")
-
-          case warm: Warm =>
-            Summary(warm.resolveOuter(cls))
-
-          case _ =>
-            val Summary(pots, effs) = expand(pot1)
-            val pots2 = pots.map { Outer(_, cls)(pot.source): Potential }
-            Summary(pots2, effs)
-        }
-
-      case _: ThisRef | _: Fun | _: Warm | _: Cold =>
-        Summary(pot)
-
-      case SuperRef(pot1, supercls) =>
-        val Summary(pots, effs) = expand(pot1)
-        val pots2 = pots.map { SuperRef(_, supercls)(pot.source): Potential }
-        Summary(pots2, effs)
-    }
-  }
-}
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Effects.scala b/compiler/src/dotty/tools/dotc/transform/init/Effects.scala
deleted file mode 100644
index ce9d8d8aa497..000000000000
--- a/compiler/src/dotty/tools/dotc/transform/init/Effects.scala
+++ /dev/null
@@ -1,80 +0,0 @@
-package dotty.tools.dotc
-package transform
-package init
-
-import ast.tpd._
-import reporting.trace
-import config.Printers.init
-import core.Types._
-import core.Symbols._
-import core.Contexts._
-
-import Potentials._
-
-object Effects {
-  type Effects = Vector[Effect]
-  val empty: Effects = Vector.empty
-
-  def show(effs: Effects)(using Context): String =
-    effs.map(_.show).mkString(", ")
-
-  /** Effects that are related to safe initialization performed on potentials */
-  sealed trait Effect {
-    def potential: Potential
-
-    def show(using Context): String
-
-    def source: Tree
-
-    def toEffs: Effects = Vector(this)
-  }
-
-  /** A promotion effect means that a value that's possibly under initialization
-   *  is promoted from the initializing world to the fully-initialized world.
-   *
-   *  Essentially, this effect enforces that the object pointed to by
-   *  `potential` is transitively initialized.
-   *
-   *  This effect is trigger in several scenarios:
-   *  - a potential is used as arguments to method calls or new-expressions
-   *  - a potential is assigned (not initialize) to a field
-   *  - the selection chain on a potential is too long
-   */
-  case class Promote(potential: Potential)(val source: Tree) extends Effect {
-    def show(using Context): String = potential.show + "↑"
-  }
-
-  /** Field access, `a.f` */
-  case class FieldAccess(potential: Potential, field: Symbol)(val source: Tree) extends Effect {
-    assert(field != NoSymbol)
-
-    def show(using Context): String = potential.show + "." + field.name.show + "!"
-  }
-
-  /** Method call, `a.m()` */
-  case class MethodCall(potential: Potential, method: Symbol)(val source: Tree) extends Effect {
-    assert(method != NoSymbol)
-
-    def show(using Context): String = potential.show + "." + method.name.show + "!"
-  }
-
-  // ------------------ operations on effects ------------------
-
-  def asSeenFrom(eff: Effect, thisValue: Potential)(implicit env: Env): Effect =
-    trace(eff.show + " asSeenFrom " + thisValue.show + ", current = " + currentClass.show, init, _.asInstanceOf[Effect].show) { eff match {
-      case Promote(pot) =>
-        val pot1 = Potentials.asSeenFrom(pot, thisValue)
-        Promote(pot1)(eff.source)
-
-      case FieldAccess(pot, field) =>
-        val pot1 = Potentials.asSeenFrom(pot, thisValue)
-        FieldAccess(pot1, field)(eff.source)
-
-      case MethodCall(pot, sym) =>
-        val pot1 = Potentials.asSeenFrom(pot, thisValue)
-        MethodCall(pot1, sym)(eff.source)
-    } }
-
-  def asSeenFrom(effs: Effects, thisValue: Potential)(implicit env: Env): Effects =
-    effs.map(asSeenFrom(_, thisValue))
-}
\ No newline at end of file
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Env.scala b/compiler/src/dotty/tools/dotc/transform/init/Env.scala
deleted file mode 100644
index 02ff4aeef2cc..000000000000
--- a/compiler/src/dotty/tools/dotc/transform/init/Env.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-package dotty.tools.dotc
-package transform
-package init
-
-import core._
-import Contexts._
-import Types._
-import Symbols._
-import Decorators._
-
-import Effects._, Potentials._, Summary._
-
-given theCtx(using Env): Context = summon[Env].ctx
-
-case class Env(ctx: Context, cache: Cache) {
-  private implicit def self: Env = this
-
-  /** Can the method call be ignored? */
-  def canIgnoreMethod(symbol: Symbol): Boolean =
-    !symbol.exists || // possible with outer selection, tests/init/crash/i1990b.scala
-    canIgnoreClass(symbol.owner)
-
-  def canIgnoreClass(cls: Symbol): Boolean =
-    cls == defn.AnyClass ||
-    cls == defn.AnyValClass ||
-    cls == defn.ObjectClass
-
-  def withCtx(newCtx: Context): Env = this.copy(ctx = newCtx)
-
-  def withOwner(owner: Symbol) = this.copy(ctx = this.ctx.withOwner(owner))
-
-  /** Whether values of a given type is always fully initialized?
-   *
-   *  It's true for primitive values
-   */
-  def isAlwaysInitialized(tp: Type)(implicit env: Env): Boolean = {
-    val sym = tp.widen.finalResultType.typeSymbol
-    sym.isPrimitiveValueClass || sym == defn.StringClass
-  }
-
-  def summaryOf(cls: ClassSymbol): ClassSummary = cache.summaryOf(cls)
-
-  def resolveOuter(warm: Warm, cls: ClassSymbol): Potentials = cache.resolveOuter(warm, cls)
-}
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Errors.scala b/compiler/src/dotty/tools/dotc/transform/init/Errors.scala
index 73b8cd123033..9f3e0d1fcc47 100644
--- a/compiler/src/dotty/tools/dotc/transform/init/Errors.scala
+++ b/compiler/src/dotty/tools/dotc/transform/init/Errors.scala
@@ -9,10 +9,8 @@ import core._
 import Decorators._, printing.SyntaxHighlighting
 import Types._, Symbols._, Contexts._
 
-import Effects._, Potentials._
-
 object Errors {
-  type Errors = List[Error]
+  type Errors = Seq[Error]
   val empty: Errors = Nil
 
   def show(errs: Errors)(using Context): String =
@@ -20,7 +18,7 @@ object Errors {
 
   sealed trait Error {
     def source: Tree
-    def trace: Vector[Tree]
+    def trace: Seq[Tree]
     def show(using Context): String
 
     def issue(using Context): Unit =
@@ -57,10 +55,12 @@ object Errors {
       case unsafe: UnsafePromotion => unsafe.errors.flatMap(_.flatten)
       case _ => this :: Nil
     }
+
+    override def toString() = this.getClass.getName
   }
 
   /** Access non-initialized field */
-  case class AccessNonInit(field: Symbol, trace: Vector[Tree]) extends Error {
+  case class AccessNonInit(field: Symbol, trace: Seq[Tree]) extends Error {
     def source: Tree = trace.last
     def show(using Context): String =
       "Access non-initialized " + field.show + "."
@@ -70,52 +70,37 @@ object Errors {
   }
 
   /** Promote `this` under initialization to fully-initialized */
-  case class PromoteThis(pot: ThisRef, source: Tree, trace: Vector[Tree]) extends Error {
-    def show(using Context): String = "Promote the value under initialization to fully-initialized."
-  }
-
-  /** Promote `this` under initialization to fully-initialized */
-  case class PromoteWarm(pot: Warm, source: Tree, trace: Vector[Tree]) extends Error {
-    def show(using Context): String =
-      "Promoting the value under initialization to fully-initialized."
+  case class PromoteError(msg: String, source: Tree, trace: Seq[Tree]) extends Error {
+    def show(using Context): String = "Cannot prove that the value is fully initialized. " + msg + "."
   }
 
-  /** Promote a cold value under initialization to fully-initialized */
-  case class PromoteCold(source: Tree, trace: Vector[Tree]) extends Error {
+  case class AccessCold(field: Symbol, source: Tree, trace: Seq[Tree]) extends Error {
     def show(using Context): String =
-      "Promoting the value " + source.show + " to fully-initialized while it is under initialization" + "."
+      "Access field " + source.show + " on a value with an unknown initialization status."
   }
 
-  case class AccessCold(field: Symbol, source: Tree, trace: Vector[Tree]) extends Error {
-    def show(using Context): String =
-      "Access field " + source.show + " on a value with an unknown initialization status" + "."
-  }
-
-  case class CallCold(meth: Symbol, source: Tree, trace: Vector[Tree]) extends Error {
+  case class CallCold(meth: Symbol, source: Tree, trace: Seq[Tree]) extends Error {
     def show(using Context): String =
       "Call method " + source.show + " on a value with an unknown initialization" + "."
   }
 
-  case class CallUnknown(meth: Symbol, source: Tree, trace: Vector[Tree]) extends Error {
+  case class CallUnknown(meth: Symbol, source: Tree, trace: Seq[Tree]) extends Error {
     def show(using Context): String =
-      "Calling the external method " + meth.show + " may cause initialization errors" + "."
+      val prefix = if meth.is(Flags.Method) then "Calling the external method " else "Accessing the external field"
+      prefix + meth.show + " may cause initialization errors" + "."
   }
 
   /** Promote a value under initialization to fully-initialized */
-  case class UnsafePromotion(pot: Potential, source: Tree, trace: Vector[Tree], errors: Errors) extends Error {
+  case class UnsafePromotion(msg: String, source: Tree, trace: Seq[Tree], errors: Errors) extends Error {
     assert(errors.nonEmpty)
-
     override def issue(using Context): Unit =
       report.warning(show, source.srcPos)
 
     def show(using Context): String = {
       var index = 0
-      "Promoting the value to fully-initialized is unsafe.\n" + stacktrace +
-        "\nThe unsafe promotion may cause the following problem(s):\n" +
-        (errors.flatMap(_.flatten).map { error =>
-          index += 1
-          s"\n$index. " + error.show + error.stacktrace
-        }.mkString)
+      "Cannot prove that the value is fully initialized. " + msg + ".\n" + stacktrace +
+        "\nThe unsafe promotion may cause the following problem:\n" +
+        errors.head.show + errors.head.stacktrace
     }
   }
 }
\ No newline at end of file
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Potentials.scala b/compiler/src/dotty/tools/dotc/transform/init/Potentials.scala
deleted file mode 100644
index 39eac29a2741..000000000000
--- a/compiler/src/dotty/tools/dotc/transform/init/Potentials.scala
+++ /dev/null
@@ -1,232 +0,0 @@
-package dotty.tools
-package dotc
-package transform
-package init
-
-import scala.collection.mutable
-
-import ast.tpd._
-import reporting.trace
-import config.Printers.init
-
-import core._
-import Types._, Symbols._, Contexts._
-
-import Effects._, Summary._
-
-object Potentials {
-  type Potentials = Vector[Potential]
-  val empty: Potentials = Vector.empty
-
-  def show(pots: Potentials)(using Context): String =
-    pots.map(_.show).mkString(", ")
-
-  /** A potential represents an aliasing of a value that is possibly under initialization */
-  sealed trait Potential {
-    /** Length of the potential. Used for widening */
-    def size: Int = 1
-
-    /** Nested levels of the potential. Used for widening */
-    def level: Int = 1
-
-    def show(using Context): String
-    def source: Tree
-
-    def toPots: Potentials = Vector(this)
-  }
-
-  sealed trait Refinable extends Potential {
-    /** Effects of a method call or a lazy val access
-     *
-     *  The method performs prefix substitution
-     */
-    def effectsOf(sym: Symbol)(implicit env: Env): Effects = trace("effects of " + sym.show, init, r => Effects.show(r.asInstanceOf)) {
-      val cls = sym.owner.asClass
-      val effs = env.summaryOf(cls).effectsOf(sym)
-      this match
-      case _: ThisRef => effs
-      case _ =>  Effects.asSeenFrom(effs, this)
-    }
-
-    /** Potentials of a field, a method call or a lazy val access
-     *
-     *  The method performs prefix substitution
-     */
-    def potentialsOf(sym: Symbol)(implicit env: Env): Potentials = trace("potentials of " + sym.show, init, r => Potentials.show(r.asInstanceOf)) {
-      val cls = sym.owner.asClass
-      val pots = env.summaryOf(cls).potentialsOf(sym)
-      this match
-      case _: ThisRef => pots
-      case _ => Potentials.asSeenFrom(pots, this)
-    }
-  }
-
-  /** The object pointed by `this` */
-  case class ThisRef()(val source: Tree) extends Refinable {
-    def show(using Context): String = "this"
-  }
-
-  /** The object pointed by `C.super.this`, mainly used for override resolution */
-  case class SuperRef(pot: Potential, supercls: ClassSymbol)(val source: Tree) extends Potential {
-    override def size: Int = pot.size
-    override def level: Int = pot.level
-    def show(using Context): String = pot.show + ".super[" + supercls.name.show + "]"
-  }
-
-  /** A warm potential represents an object of which all fields are initialized, but it may contain
-   *  reference to objects under initialization.
-   *
-   *  @param classSymbol  The concrete class of the object
-   *  @param outer        The potential for `this` of the enclosing class
-   */
-  case class Warm(classSymbol: ClassSymbol, outer: Potential)(val source: Tree) extends Refinable {
-    override def level: Int = 1 + outer.level
-    def show(using Context): String = "Warm[" + classSymbol.show + ", outer = " + outer.show + "]"
-
-    def resolveOuter(cls: ClassSymbol)(implicit env: Env): Potentials =
-      env.resolveOuter(this, cls)
-  }
-
-  def resolveOuter(cur: ClassSymbol, outerPots: Potentials, cls: ClassSymbol)(implicit env: Env): Potentials =
-  trace("resolveOuter for " + cls.show + ", outer = " + show(outerPots) + ", cur = " + cur.show, init, s => Potentials.show(s.asInstanceOf[Potentials])) {
-    if (cur == cls) outerPots
-    else {
-      val bottomClsSummary = env.summaryOf(cur)
-      bottomClsSummary.parentOuter.find((k, v) => k.derivesFrom(cls)) match {
-        case Some((parentCls, pots)) =>
-          val rebased: Potentials = outerPots.flatMap { Potentials.asSeenFrom(pots, _) }
-          resolveOuter(parentCls, rebased, cls)
-        case None => unreachable()
-      }
-    }
-  }
-
-  /** The Outer potential for `classSymbol` of the object `pot`
-   *
-   *  It's only used internally for expansion of potentials.
-   *
-   *  Note: Usage of `Type.baseType(cls)` may simplify the code.
-   *        Current implementation avoids using complex type machinary,
-   *        and may be potentially faster.
-   */
-  case class Outer(pot: Potential, classSymbol: ClassSymbol)(val source: Tree) extends Potential {
-    // be lenient with size of outer selection, no worry for non-termination
-    override def size: Int = pot.size
-    override def level: Int = pot.level
-    def show(using Context): String = pot.show + ".outer[" + classSymbol.show + "]"
-  }
-
-  /** The object pointed by `this.f` */
-  case class FieldReturn(potential: Potential, field: Symbol)(val source: Tree) extends Potential {
-    assert(field != NoSymbol)
-
-    override def size: Int = potential.size + 1
-    override def level: Int = potential.level
-    def show(using Context): String = potential.show + "." + field.name.show
-  }
-
-  /** The object returned by `this.m()` */
-  case class MethodReturn(potential: Potential, method: Symbol)(val source: Tree) extends Potential {
-    assert(method != NoSymbol)
-
-    override def size: Int = potential.size + 1
-    override def level: Int = potential.level
-    def show(using Context): String = potential.show + "." + method.name.show
-  }
-
-  /** The object whose initialization status is unknown */
-  case class Cold()(val source: Tree) extends Potential {
-    def show(using Context): String = "Cold"
-  }
-
-  /** A function when called will produce the `effects` and return the `potentials` */
-  case class Fun(potentials: Potentials, effects: Effects)(val source: Tree) extends Potential {
-    override def size: Int = 1
-
-    override def level: Int = {
-      val max1 = potentials.map(_.level).max
-      val max2 = effects.map(_.potential.level).max
-      if max1 > max2 then max1 else max2
-    }
-
-    def show(using Context): String =
-      "Fun[pots = " + potentials.map(_.show).mkString(";") + ", effs = " + effects.map(_.show).mkString(";") + "]"
-  }
-
-  // ------------------ operations on potentials ------------------
-
-  /** Selection on a set of potentials
-   *
-   *  @param ignoreSelectEffect Where selection effects should be ignored
-   *
-   *  During expansion of potentials, we ignore select effects and only care
-   *  about promotion effects. This is because the selection effects have
-   *  already been checked.
-   */
-  extension (ps: Potentials) def select (symbol: Symbol, source: Tree, ignoreSelectEffect: Boolean = true)(using Context): Summary =
-    ps.foldLeft(Summary.empty) { case (summary, pot) =>
-      // max potential length
-      // TODO: it can be specified on a project basis via compiler options
-      if (pot.size > 2)
-        summary + Promote(pot)(pot.source)
-      else if (symbol.isConstructor)
-        val res = summary + pot
-        if ignoreSelectEffect then res + MethodCall(pot, symbol)(source)
-        else res
-      else if (symbol.isOneOf(Flags.Method | Flags.Lazy))
-        val res = summary + MethodReturn(pot, symbol)(source)
-        if ignoreSelectEffect then res + MethodCall(pot, symbol)(source)
-        else res
-      else
-        val res = summary + FieldReturn(pot, symbol)(source)
-        if ignoreSelectEffect then res + FieldAccess(pot, symbol)(source)
-        else res
-    }
-
-  extension (ps: Potentials) def promote(source: Tree): Effects = ps.map(Promote(_)(source))
-
-  def asSeenFrom(pot: Potential, thisValue: Potential)(implicit env: Env): Potential = trace(pot.show + " asSeenFrom " + thisValue.show, init, _.asInstanceOf[Potential].show) {
-    pot match {
-      case MethodReturn(pot1, sym) =>
-        val pot = asSeenFrom(pot1, thisValue)
-        MethodReturn(pot, sym)(pot.source)
-
-      case FieldReturn(pot1, sym) =>
-        val pot = asSeenFrom(pot1, thisValue)
-        FieldReturn(pot, sym)(pot.source)
-
-      case Outer(pot1, cls) =>
-        val pot = asSeenFrom(pot1, thisValue)
-        Outer(pot, cls)(pot.source)
-
-      case _: ThisRef =>
-        thisValue
-
-      case Fun(pots, effs) =>
-        val pots1 = Potentials.asSeenFrom(pots, thisValue)
-        val effs1 = Effects.asSeenFrom(effs, thisValue)
-        Fun(pots1, effs1)(pot.source)
-
-      case Warm(cls, outer2) =>
-        // widening to terminate
-        val thisValue2 =
-          if thisValue.level + outer2.level > 4 then
-            Cold()(outer2.source)
-          else
-            thisValue
-
-        val outer3 = asSeenFrom(outer2, thisValue2)
-        Warm(cls, outer3)(pot.source)
-
-      case _: Cold =>
-        pot
-
-      case SuperRef(potThis, supercls) =>
-        val pot1 = asSeenFrom(potThis, thisValue)
-        SuperRef(pot1, supercls)(pot.source)
-    }
-  }
-
-  def asSeenFrom(pots: Potentials, thisValue: Potential)(implicit env: Env): Potentials =
-    pots.map(asSeenFrom(_, thisValue))
-}
\ No newline at end of file
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala
new file mode 100644
index 000000000000..c1e7d6ab9f2a
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala
@@ -0,0 +1,1594 @@
+package dotty.tools.dotc
+package transform
+package init
+
+import core._
+import Contexts._
+import Symbols._
+import Types._
+import StdNames._
+import NameKinds.OuterSelectName
+
+import ast.tpd._
+import util.EqHashMap
+import config.Printers.init as printer
+import reporting.trace as log
+
+import Errors._
+
+import scala.collection.mutable
+import scala.annotation.tailrec
+import scala.annotation.constructorOnly
+
+object Semantic {
+
+// ----- Domain definitions --------------------------------
+
+  /** Abstract values
+   *
+   *  Value = Hot | Cold | Warm | ThisRef | Fun | RefSet
+   *
+   *                 Cold
+   *        ┌──────►  ▲  ◄────┐  ◄────┐
+   *        │         │       │       │
+   *        │         │       │       │
+   *        |         │       │       │
+   *        |         │       │       │
+   *     ThisRef     Warm   Fun    RefSet
+   *        │         ▲       ▲       ▲
+   *        │         │       │       │
+   *        |         │       │       │
+   *        ▲         │       │       │
+   *        │         │       │       │
+   *        └─────────┴───────┴───────┘
+   *                  Hot
+   *
+   *   The diagram above does not reflect relationship between `RefSet`
+   *   and other values. `RefSet` represents a set of values which could
+   *   be `ThisRef`, `Warm` or `Fun`. The following ordering applies for
+   *   RefSet:
+   *
+   *         R_a ⊑ R_b if R_a ⊆ R_b
+   *
+   *         V ⊑ R if V ∈ R
+   *
+   */
+  sealed abstract class Value {
+    def show: String = this.toString()
+
+    def isHot = this == Hot
+    def isCold = this == Cold
+    def isWarm = this.isInstanceOf[Warm]
+    def isThisRef = this.isInstanceOf[ThisRef]
+  }
+
+  /** A transitively initialized object */
+  case object Hot extends Value
+
+  /** An object with unknown initialization status */
+  case object Cold extends Value
+
+  sealed abstract class Ref extends Value {
+    def klass: ClassSymbol
+    def outer: Value
+  }
+
+  /** A reference to the object under initialization pointed by `this` */
+  case class ThisRef(klass: ClassSymbol) extends Ref {
+    val outer = Hot
+  }
+
+  /** An object with all fields initialized but reaches objects under initialization
+   *
+   *  We need to restrict nesting levels of `outer` to finitize the domain.
+   */
+  case class Warm(klass: ClassSymbol, outer: Value, ctor: Symbol, args: List[Value]) extends Ref {
+
+    /** If a warm value is in the process of populating parameters, class bodies are not executed. */
+    private var populatingParams: Boolean = false
+
+    def isPopulatingParams = populatingParams
+
+    /** Ensure that outers and class parameters are initialized.
+     *
+     *  Fields in class body are not initialized.
+     *
+     *  We need to populate class parameters and outers for warm values for the
+     *  following cases:
+     *
+     *  - Widen an already checked warm value to another warm value without
+     *    corresponding object
+     *
+     *  - Using a warm value from the cache, whose corresponding object from
+     *    the last iteration have been remove due to heap reversion
+     *    {@see Cache.prepareForNextIteration}
+     *
+     *  After populating class parameters and outers, it is possible to lazily
+     *  compute the field values in class bodies when they are accessed.
+     */
+    private def populateParams(): Contextual[this.type] = log("populating parameters", printer, (_: Warm).objekt.toString) {
+      assert(!populatingParams, "the object is already populating parameters")
+      populatingParams = true
+      val tpl = klass.defTree.asInstanceOf[TypeDef].rhs.asInstanceOf[Template]
+      this.callConstructor(ctor, args.map(arg => ArgInfo(arg, EmptyTree)), tpl)
+      populatingParams = false
+      this
+    }
+
+    def ensureObjectExistsAndPopulated(): Contextual[this.type] =
+      if cache.containsObject(this) then this
+      else this.ensureFresh().populateParams()
+  }
+
+  /** A function value */
+  case class Fun(expr: Tree, thisV: Ref, klass: ClassSymbol, env: Env) extends Value
+
+  /** A value which represents a set of addresses
+   *
+   * It comes from `if` expressions.
+   */
+  case class RefSet(refs: List[Fun | Ref]) extends Value
+
+  // end of value definition
+
+  /** The abstract object which stores value about its fields and immediate outers.
+   *
+   *  Semantically it suffices to store the outer for `klass`. We cache other outers
+   *  for performance reasons.
+   *
+   *  Note: Object is NOT a value.
+   */
+  case class Objekt(val klass: ClassSymbol, val fields: Map[Symbol, Value], val outers: Map[ClassSymbol, Value]) {
+    def field(f: Symbol): Value = fields(f)
+
+    def outer(klass: ClassSymbol) = outers(klass)
+
+    def hasOuter(klass: ClassSymbol) = outers.contains(klass)
+
+    def hasField(f: Symbol) = fields.contains(f)
+  }
+
+  /** The environment for method parameters
+   *
+   *  For performance and usability, we restrict parameters to be either `Cold`
+   *  or `Hot`.
+   *
+   *  Despite that we have environment for evaluating expressions in secondary
+   *  constructors, we don't need to put environment as the cache key. The
+   *  reason is that constructor parameters are determined by the value of
+   *  `this` --- it suffices to make the value of `this` as part of the cache
+   *  key.
+   *
+   *  This crucially depends on the fact that in the initialization process
+   *  there can be exactly one call to a specific constructor for a given
+   *  receiver. However, once we relax the design to allow non-hot values to
+   *  methods and functions, we have to put the environment as part of the cache
+   *  key. The reason is that given the same receiver, a method or function may
+   *  be called with different arguments -- they are not decided by the receiver
+   *  anymore.
+   */
+  object Env {
+    opaque type Env = Map[Symbol, Value]
+
+    val empty: Env = Map.empty
+
+    def apply(bindings: Map[Symbol, Value]): Env = bindings
+
+    def apply(ddef: DefDef, args: List[Value])(using Context): Env =
+      val params = ddef.termParamss.flatten.map(_.symbol)
+      assert(args.size == params.size, "arguments = " + args.size + ", params = " + params.size)
+      params.zip(args).toMap
+
+    extension (env: Env)
+      def lookup(sym: Symbol)(using Context): Value = env(sym)
+
+      def getOrElse(sym: Symbol, default: Value)(using Context): Value = env.getOrElse(sym, default)
+
+      def union(other: Env): Env = env ++ other
+
+      def isHot: Boolean = env.values.forall(_ == Hot)
+  }
+
+  type Env = Env.Env
+  inline def env(using env: Env) = env
+  inline def withEnv[T](env: Env)(op: Env ?=> T): T = op(using env)
+
+  import Env._
+
+  object Promoted {
+    class PromotionInfo {
+      var isCurrentObjectPromoted: Boolean = false
+      val values = mutable.Set.empty[Value]
+      override def toString(): String = values.toString()
+    }
+    /** Values that have been safely promoted */
+    opaque type Promoted = PromotionInfo
+
+    /** Note: don't use `val` to avoid incorrect sharing */
+    def empty: Promoted = new PromotionInfo
+
+    extension (promoted: Promoted)
+      def isCurrentObjectPromoted: Boolean = promoted.isCurrentObjectPromoted
+      def promoteCurrent(thisRef: ThisRef): Unit = promoted.isCurrentObjectPromoted = true
+      def contains(value: Value): Boolean = promoted.values.contains(value)
+      def add(value: Value): Unit = promoted.values += value
+      def remove(value: Value): Unit = promoted.values -= value
+    end extension
+  }
+  type Promoted = Promoted.Promoted
+
+  import Promoted._
+  inline def promoted(using p: Promoted): Promoted = p
+
+  /** Interpreter configuration
+   *
+   * The (abstract) interpreter can be seen as a push-down automaton
+   * that transits between the configurations where the stack is the
+   * implicit call stack of the meta-language.
+   *
+   * It's important that the configuration is finite for the analysis
+   * to terminate.
+   *
+   * For soundness, we need to compute fixed point of the cache, which
+   * maps configuration to evaluation result.
+   *
+   * Thanks to heap monotonicity, heap is not part of the configuration.
+   *
+   * This class is only used for the purpose of documentation.
+   */
+  case class Config(thisV: Value, expr: Tree)
+
+  /** Cache used to terminate the analysis
+   *
+   * A finitary configuration is not enough for the analysis to
+   * terminate.  We need to use cache to let the interpreter "know"
+   * that it can terminate.
+   *
+   * For performance reasons we use curried key.
+   *
+   * Note: It's tempting to use location of trees as key. That should
+   * be avoided as a template may have the same location as its single
+   * statement body. Macros may also create incorrect locations.
+   *
+   */
+
+  object Cache {
+    opaque type CacheStore = mutable.Map[Value, EqHashMap[Tree, Value]]
+    private type Heap = Map[Ref, Objekt]
+
+    class Cache {
+      private var last: CacheStore =  mutable.Map.empty
+      private var current: CacheStore = mutable.Map.empty
+      private val stable: CacheStore = mutable.Map.empty
+      private var changed: Boolean = false
+
+      /** Abstract heap stores abstract objects
+       *
+       *  The heap serves as cache of summaries for warm objects and is shared for checking all classes.
+       *
+       *  The fact that objects of `ThisRef` are stored in heap is just an engineering convenience.
+       *  Technically, we can also store the object directly in `ThisRef`.
+       *
+       *  The heap contains objects of two conceptually distinct kinds.
+       *
+       *  - Objects that are also in `heapStable` are flow-insensitive views of already initialized objects that are
+       *    cached for reuse in analysis of later classes. These objects and their fields should never change; this is
+       *    enforced using assertions.
+       *
+       *  - Objects that are not (yet) in `heapStable` are the flow-sensitive abstract state of objects being analyzed
+       *    in the current iteration of the analysis of the current class. Their fields do change flow-sensitively: more
+       *    fields are added as fields become initialized. These objects are valid only within the current iteration and
+       *    are removed when moving to a new iteration of analyzing the current class. When the analysis of a class
+       *    reaches a fixed point, these now stable flow-sensitive views of the object at the end of the constructor
+       *    of the analyzed class now become the flow-insensitive views of already initialized objects and can therefore
+       *    be added to `heapStable`.
+       */
+      private var heap: Heap = Map.empty
+
+      /** Used to revert heap to last stable heap. */
+      private var heapStable: Heap = Map.empty
+
+      def hasChanged = changed
+
+      def contains(value: Value, expr: Tree) =
+        current.contains(value, expr) || stable.contains(value, expr)
+
+      def apply(value: Value, expr: Tree) =
+        if current.contains(value, expr) then current(value)(expr)
+        else stable(value)(expr)
+
+      /** Copy the value of `(value, expr)` from the last cache to the current cache
+       * (assuming it's `Hot` if it doesn't exist in the cache).
+       *
+       * Then, runs `fun` and update the caches if the values change.
+       */
+      def assume(value: Value, expr: Tree, cacheResult: Boolean)(fun: => Result): Contextual[Result] =
+        val assumeValue: Value =
+          if last.contains(value, expr) then
+            last.get(value, expr)
+          else
+            last.put(value, expr, Hot)
+            Hot
+          end if
+        current.put(value, expr, assumeValue)
+
+        val actual = fun
+        if actual.value != assumeValue then
+          this.changed = true
+          last.put(value, expr, actual.value)
+          current.put(value, expr, actual.value)
+        else
+          // It's tempting to cache the value in stable, but it's unsound.
+          // The reason is that the current value may depend on other values
+          // which might change.
+          //
+          // stable.put(value, expr, actual)
+          ()
+        end if
+
+        actual
+      end assume
+
+      /** Commit current cache to stable cache. */
+      private def commitToStableCache() =
+        current.foreach { (v, m) =>
+          // It's useless to cache value for ThisRef.
+          if v.isWarm then m.iterator.foreach { (e, res) =>
+            stable.put(v, e, res)
+          }
+        }
+
+      /** Prepare cache for the next iteration
+       *
+       *  1. Reset changed flag.
+       *
+       *  2. Reset current cache (last cache already synced in `assume`).
+       *
+       *  3. Revert heap if instable.
+       *
+       */
+      def prepareForNextIteration()(using Context) =
+        this.changed = false
+        this.current = mutable.Map.empty
+        this.heap = this.heapStable
+
+      /** Prepare for checking next class
+       *
+       *  1. Reset changed flag.
+       *
+       *  2. Commit current cache to stable cache if not changed.
+       *
+       *  3. Update stable heap if not changed.
+       *
+       *  4. Reset last cache.
+       */
+      def prepareForNextClass()(using Context) =
+        if this.changed then
+          this.changed = false
+          this.heap = this.heapStable
+        else
+          this.commitToStableCache()
+          this.heapStable = this.heap
+
+        this.last = mutable.Map.empty
+        this.current = mutable.Map.empty
+
+      def updateObject(ref: Ref, obj: Objekt) =
+        assert(!this.heapStable.contains(ref))
+        this.heap = this.heap.updated(ref, obj)
+
+      def containsObject(ref: Ref) = heap.contains(ref)
+
+      def getObject(ref: Ref) = heap(ref)
+    }
+
+    extension (cache: CacheStore)
+      def contains(value: Value, expr: Tree) = cache.contains(value) && cache(value).contains(expr)
+      def get(value: Value, expr: Tree): Value = cache(value)(expr)
+      def remove(value: Value, expr: Tree) = cache(value).remove(expr)
+      def put(value: Value, expr: Tree, result: Value): Unit = {
+        val innerMap = cache.getOrElseUpdate(value, new EqHashMap[Tree, Value])
+        innerMap(expr) = result
+      }
+    end extension
+  }
+
+  import Cache._
+
+  inline def cache(using c: Cache): Cache = c
+
+  /** Result of abstract interpretation */
+  case class Result(value: Value, errors: Seq[Error]) {
+    def show(using Context) = value.show + ", errors = " + errors.map(_.toString)
+
+    def ++(errors: Seq[Error]): Result = this.copy(errors = this.errors ++ errors)
+
+    def +(error: Error): Result = this.copy(errors = this.errors :+ error)
+
+    def ensureHot(msg: String, source: Tree): Contextual[Result] =
+      this ++ value.promote(msg, source)
+
+    def select(f: Symbol, source: Tree): Contextual[Result] =
+      value.select(f, source) ++ errors
+
+    def call(meth: Symbol, args: List[ArgInfo], superType: Type, source: Tree): Contextual[Result] =
+      value.call(meth, args, superType, source) ++ errors
+
+    def callConstructor(ctor: Symbol, args: List[ArgInfo], source: Tree): Contextual[Result] =
+      value.callConstructor(ctor, args, source) ++ errors
+
+    def instantiate(klass: ClassSymbol, ctor: Symbol, args: List[ArgInfo], source: Tree): Contextual[Result] =
+      value.instantiate(klass, ctor, args, source) ++ errors
+  }
+
+// ----- Checker State -----------------------------------
+
+  /** The state that threads through the interpreter */
+  type Contextual[T] = (Env, Context, Trace, Promoted, Cache) ?=> T
+
+// ----- Error Handling -----------------------------------
+
+  object Trace {
+    opaque type Trace = Vector[Tree]
+
+    val empty: Trace = Vector.empty
+
+    extension (trace: Trace)
+      def add(node: Tree): Trace = trace :+ node
+      def toVector: Vector[Tree] = trace
+  }
+
+  type Trace = Trace.Trace
+
+  import Trace._
+  def trace(using t: Trace): Trace = t
+  inline def withTrace[T](t: Trace)(op: Trace ?=> T): T = op(using t)
+
+// ----- Operations on domains -----------------------------
+  extension (a: Value)
+    def join(b: Value): Value =
+      (a, b) match
+      case (Hot, _)  => b
+      case (_, Hot)  => a
+
+      case (Cold, _) => Cold
+      case (_, Cold) => Cold
+
+      case (a: (Fun | Warm | ThisRef), b: (Fun | Warm | ThisRef)) =>
+        if a == b then a else RefSet(a :: b :: Nil)
+
+      case (a: (Fun | Warm | ThisRef), RefSet(refs)) =>
+        if refs.exists(_ == a) then b: Value // fix pickling test
+        else RefSet(a :: refs)
+
+      case (RefSet(refs), b: (Fun | Warm | ThisRef)) =>
+        if refs.exists(_ == b) then a: Value // fix pickling test
+        else RefSet(b :: refs)
+
+      case (RefSet(refs1), RefSet(refs2)) =>
+        val diff = refs2.filter(ref => refs1.forall(_ != ref))
+        RefSet(refs1 ++ diff)
+
+    /** Conservatively approximate the value with `Cold` or `Hot` */
+    def widenArg: Value =
+      a match
+      case _: Ref | _: Fun => Cold
+      case RefSet(refs) => refs.map(_.widenArg).join
+      case _ => a
+
+
+  extension (values: Seq[Value])
+    def join: Value =
+      if values.isEmpty then Hot
+      else values.reduce { (v1, v2) => v1.join(v2) }
+
+    def widenArgs: List[Value] = values.map(_.widenArg).toList
+
+
+  extension (ref: Ref)
+    def objekt: Contextual[Objekt] =
+      // TODO: improve performance
+      ref match
+        case warm: Warm => warm.ensureObjectExistsAndPopulated()
+        case _ =>
+      cache.getObject(ref)
+
+    def ensureObjectExists()(using Cache): ref.type =
+      if cache.containsObject(ref) then
+        printer.println("object " + ref + " already exists")
+        ref
+      else
+        ensureFresh()
+
+    def ensureFresh()(using Cache): ref.type =
+      val obj = Objekt(ref.klass, fields = Map.empty, outers = Map(ref.klass -> ref.outer))
+      printer.println("reset object " + ref)
+      cache.updateObject(ref, obj)
+      ref
+
+    /** Update field value of the abstract object
+     *
+     *  Invariant: fields are immutable and only set once
+     */
+    def updateField(field: Symbol, value: Value): Contextual[Unit] = log("set field " + field + " of " + ref + " to " + value) {
+      val obj = objekt
+      // We may reset the outers or params of a populated warm object.
+      // This is the case if we need access the field of a warm object, which
+      // requires population of parameters and outers; and later create an
+      // instance of the exact warm object, which requires initialization check.
+      //
+      // See tests/init/neg/unsound1.scala
+      assert(!obj.hasField(field) || field.is(Flags.ParamAccessor) && obj.field(field) == value, field.show + " already init, new = " + value + ", old = " + obj.field(field) + ", ref = " + ref)
+      val obj2 = obj.copy(fields = obj.fields.updated(field, value))
+      cache.updateObject(ref, obj2)
+    }
+
+    /** Update the immediate outer of the given `klass` of the abstract object
+     *
+     *  Invariant: outers are immutable and only set once
+     */
+    def updateOuter(klass: ClassSymbol, value: Value): Contextual[Unit] = log("set outer " + klass + " of " + ref + " to " + value) {
+      val obj = objekt
+      // See the comment in `updateField` for setting the value twice.
+      assert(!obj.hasOuter(klass) || obj.outer(klass) == value, klass.show + " already has outer, new = " + value + ", old = " + obj.outer(klass) + ", ref = " + ref)
+      val obj2 = obj.copy(outers = obj.outers.updated(klass, value))
+      cache.updateObject(ref, obj2)
+    }
+  end extension
+
+  extension (value: Value)
+    def select(field: Symbol, source: Tree, needResolve: Boolean = true): Contextual[Result] = log("select " + field.show + ", this = " + value, printer, (_: Result).show) {
+      if promoted.isCurrentObjectPromoted then Result(Hot, Nil)
+      else value match {
+        case Hot  =>
+          Result(Hot, Errors.empty)
+
+        case Cold =>
+          val error = AccessCold(field, source, trace.toVector)
+          Result(Hot, error :: Nil)
+
+        case ref: Ref =>
+          val target = if needResolve then resolve(ref.klass, field) else field
+          val trace1 = trace.add(source)
+          if target.is(Flags.Lazy) then
+            given Trace = trace1
+            val rhs = target.defTree.asInstanceOf[ValDef].rhs
+            eval(rhs, ref, target.owner.asClass, cacheResult = true)
+          else
+            val obj = ref.objekt
+            if obj.hasField(target) then
+              Result(obj.field(target), Nil)
+            else if ref.isInstanceOf[Warm] then
+              assert(obj.klass.isSubClass(target.owner))
+              if target.is(Flags.ParamAccessor) then
+                // possible for trait parameters
+                // see tests/init/neg/trait2.scala
+                //
+                // return `Hot` here, errors are reported in checking `ThisRef`
+                Result(Hot, Nil)
+              else if target.hasSource then
+                val rhs = target.defTree.asInstanceOf[ValOrDefDef].rhs
+                eval(rhs, ref, target.owner.asClass, cacheResult = true)
+              else
+                val error = CallUnknown(field, source, trace.toVector)
+                Result(Hot, error :: Nil)
+            else
+              val error = AccessNonInit(target, trace.add(source).toVector)
+              Result(Hot, error :: Nil)
+
+        case fun: Fun =>
+          report.error("unexpected tree in selecting a function, fun = " + fun.expr.show, source)
+          Result(Hot, Nil)
+
+        case RefSet(refs) =>
+          val resList = refs.map(_.select(field, source))
+          val value2 = resList.map(_.value).join
+          val errors = resList.flatMap(_.errors)
+          Result(value2, errors)
+      }
+    }
+
+    def call(meth: Symbol, args: List[ArgInfo], superType: Type, source: Tree, needResolve: Boolean = true): Contextual[Result] = log("call " + meth.show + ", args = " + args, printer, (_: Result).show) {
+      def checkArgs = args.flatMap(_.promote)
+
+      def isSyntheticApply(meth: Symbol) =
+        meth.is(Flags.Synthetic)
+        && meth.owner.is(Flags.Module)
+        && meth.owner.companionClass.is(Flags.Case)
+
+      def isAlwaysSafe(meth: Symbol) =
+        (meth eq defn.Object_eq)
+        || (meth eq defn.Object_ne)
+        || (meth eq defn.Any_isInstanceOf)
+
+      // fast track if the current object is already initialized
+      if promoted.isCurrentObjectPromoted then Result(Hot, Nil)
+      else if isAlwaysSafe(meth) then Result(Hot, Nil)
+      else if meth eq defn.Any_asInstanceOf then Result(value, Nil)
+      else value match {
+        case Hot  =>
+          if isSyntheticApply(meth) then
+            val klass = meth.owner.companionClass.asClass
+            instantiate(klass, klass.primaryConstructor, args, source)
+          else
+            Result(Hot, checkArgs)
+
+        case Cold =>
+          val error = CallCold(meth, source, trace.toVector)
+          Result(Hot, error :: checkArgs)
+
+        case ref: Ref =>
+          val isLocal = !meth.owner.isClass
+          val target =
+            if !needResolve then
+              meth
+            else if superType.exists then
+              resolveSuper(ref.klass, superType, meth)
+            else
+              resolve(ref.klass, meth)
+
+          if target.isOneOf(Flags.Method) then
+            val trace1 = trace.add(source)
+            if target.hasSource then
+              given Trace = trace1
+              val cls = target.owner.enclosingClass.asClass
+              val ddef = target.defTree.asInstanceOf[DefDef]
+              val argErrors = checkArgs
+              // normal method call
+              if argErrors.nonEmpty && isSyntheticApply(meth) then
+                val klass = meth.owner.companionClass.asClass
+                val outerCls = klass.owner.lexicallyEnclosingClass.asClass
+                val outer = resolveOuterSelect(outerCls, ref, 1, source)
+                outer.instantiate(klass, klass.primaryConstructor, args, source)
+              else
+                withEnv(if isLocal then env else Env.empty) {
+                  eval(ddef.rhs, ref, cls, cacheResult = true) ++ argErrors
+                }
+            else if ref.canIgnoreMethodCall(target) then
+              Result(Hot, Nil)
+            else
+              // no source code available
+              val error = CallUnknown(target, source, trace.toVector)
+              Result(Hot, error :: checkArgs)
+          else
+            // method call resolves to a field
+            val obj = ref.objekt
+            if obj.hasField(target) then
+              Result(obj.field(target), Nil)
+            else
+              value.select(target, source, needResolve = false)
+
+        case Fun(body, thisV, klass, env) =>
+          // meth == NoSymbol for poly functions
+          if meth.name.toString == "tupled" then Result(value, Nil) // a call like `fun.tupled`
+          else
+            withEnv(env) {
+              eval(body, thisV, klass, cacheResult = true) ++ checkArgs
+            }
+
+        case RefSet(refs) =>
+          val resList = refs.map(_.call(meth, args, superType, source))
+          val value2 = resList.map(_.value).join
+          val errors = resList.flatMap(_.errors)
+          Result(value2, errors)
+      }
+    }
+
+    def callConstructor(ctor: Symbol, args: List[ArgInfo], source: Tree): Contextual[Result] = log("call " + ctor.show + ", args = " + args, printer, (_: Result).show) {
+      // init "fake" param fields for the secondary constructor
+      def addParamsAsFields(env: Env, ref: Ref, ctorDef: DefDef) = {
+        val paramSyms = ctorDef.termParamss.flatten.map(_.symbol)
+        paramSyms.map { acc =>
+          val value = env.lookup(acc)
+          ref.updateField(acc, value)
+          printer.println(acc.show + " initialized with " + value)
+        }
+      }
+      value match {
+        case Hot | Cold | _: RefSet | _: Fun =>
+          report.error("unexpected constructor call, meth = " + ctor + ", value = " + value, source)
+          Result(Hot, Nil)
+
+        case ref: Warm if ref.isPopulatingParams =>
+          val trace1 = trace.add(source)
+          if ctor.hasSource then
+            given Trace = trace1
+            val cls = ctor.owner.enclosingClass.asClass
+            val ddef = ctor.defTree.asInstanceOf[DefDef]
+            given Env = Env(ddef, args.map(_.value).widenArgs)
+            if ctor.isPrimaryConstructor then
+              val tpl = cls.defTree.asInstanceOf[TypeDef].rhs.asInstanceOf[Template]
+              init(tpl, ref, cls)
+            else
+              addParamsAsFields(env, ref, ddef)
+              val initCall = ddef.rhs match
+                case Block(call :: _, _) => call
+                case call => call
+              eval(initCall, ref, cls)
+            end if
+          else
+            Result(Hot, Nil)
+
+        case ref: Ref =>
+          val trace1 = trace.add(source)
+          if ctor.hasSource then
+            given Trace = trace1
+            val cls = ctor.owner.enclosingClass.asClass
+            val ddef = ctor.defTree.asInstanceOf[DefDef]
+            given Env = Env(ddef, args.map(_.value).widenArgs)
+            if ctor.isPrimaryConstructor then
+              val tpl = cls.defTree.asInstanceOf[TypeDef].rhs.asInstanceOf[Template]
+              val res = withTrace(trace.add(cls.defTree)) { eval(tpl, ref, cls, cacheResult = true) }
+              Result(ref, res.errors)
+            else
+              addParamsAsFields(env, ref, ddef)
+              eval(ddef.rhs, ref, cls, cacheResult = true)
+          else if ref.canIgnoreMethodCall(ctor) then
+            Result(Hot, Nil)
+          else
+            // no source code available
+            val error = CallUnknown(ctor, source, trace.toVector)
+            Result(Hot, error :: Nil)
+      }
+
+    }
+
+    /** Handle a new expression `new p.C` where `p` is abstracted by `value` */
+    def instantiate(klass: ClassSymbol, ctor: Symbol, args: List[ArgInfo], source: Tree): Contextual[Result] = log("instantiating " + klass.show + ", value = " + value + ", args = " + args, printer, (_: Result).show) {
+      val trace1 = trace.add(source)
+      if promoted.isCurrentObjectPromoted then Result(Hot, Nil)
+      else value match {
+        case Hot  =>
+          val buffer = new mutable.ArrayBuffer[Error]
+          val args2 = args.map { arg =>
+            val errors = arg.promote
+            buffer ++= errors
+            if errors.isEmpty then Hot
+            else arg.value.widenArg
+          }
+
+          if buffer.isEmpty then
+            Result(Hot, Errors.empty)
+          else
+            val outer = Hot
+            val warm = Warm(klass, outer, ctor, args2).ensureObjectExists()
+            val argInfos2 = args.zip(args2).map { (argInfo, v) => argInfo.copy(value = v) }
+            val res = warm.callConstructor(ctor, argInfos2, source)
+            Result(warm, res.errors)
+
+        case Cold =>
+          val error = CallCold(ctor, source, trace1.toVector)
+          Result(Hot, error :: Nil)
+
+        case ref: Ref =>
+          given Trace = trace1
+          // widen the outer to finitize the domain
+          val outer = ref match
+            case warm @ Warm(_, _: Warm, _, _) =>
+              // the widened warm object might not exist in the heap
+              warm.copy(outer = Cold).ensureObjectExistsAndPopulated()
+            case _ => ref
+
+          val argsWidened = args.map(_.value).widenArgs
+          val argInfos2 = args.zip(argsWidened).map { (argInfo, v) => argInfo.copy(value = v) }
+          val warm = Warm(klass, outer, ctor, argsWidened).ensureObjectExists()
+          val res = warm.callConstructor(ctor, argInfos2, source)
+          Result(warm, res.errors)
+
+        case Fun(body, thisV, klass, env) =>
+          report.error("unexpected tree in instantiating a function, fun = " + body.show, source)
+          Result(Hot, Nil)
+
+        case RefSet(refs) =>
+          val resList = refs.map(_.instantiate(klass, ctor, args, source))
+          val value2 = resList.map(_.value).join
+          val errors = resList.flatMap(_.errors)
+          Result(value2, errors)
+      }
+    }
+  end extension
+
+  extension (ref: Ref)
+    def accessLocal(tmref: TermRef, klass: ClassSymbol, source: Tree): Contextual[Result] =
+      val sym = tmref.symbol
+
+      def default() = Result(Hot, Nil)
+
+      if sym.is(Flags.Param) && sym.owner.isConstructor then
+        // if we can get the field from the Ref (which can only possibly be
+        // a secondary constructor parameter), then use it.
+        if (ref.objekt.hasField(sym))
+          Result(ref.objekt.field(sym), Errors.empty)
+        // instances of local classes inside secondary constructors cannot
+        // reach here, as those values are abstracted by Cold instead of Warm.
+        // This enables us to simplify the domain without sacrificing
+        // expressiveness nor soundess, as local classes inside secondary
+        // constructors are uncommon.
+        else if sym.isContainedIn(klass) then
+          Result(env.lookup(sym), Nil)
+        else
+          // We don't know much about secondary constructor parameters in outer scope.
+          // It's always safe to approximate them with `Cold`.
+          Result(Cold, Nil)
+      else if sym.is(Flags.Param) then
+        default()
+      else
+        sym.defTree match {
+          case vdef: ValDef =>
+            // resolve this for local variable
+            val enclosingClass = sym.owner.enclosingClass.asClass
+            val thisValue2 = resolveThis(enclosingClass, ref, klass, source)
+            thisValue2 match {
+              case Hot => Result(Hot, Errors.empty)
+
+              case Cold => Result(Cold, Nil)
+
+              case ref: Ref => eval(vdef.rhs, ref, enclosingClass)
+
+              case _ =>
+                 report.error("unexpected defTree when accessing local variable, sym = " + sym.show + ", defTree = " + sym.defTree.show, source)
+                 default()
+            }
+
+          case _ => default()
+        }
+  end extension
+
+// ----- Promotion ----------------------------------------------------
+  extension (ref: Ref)
+    /** Whether the object is fully assigned
+     *
+     *  It means all fields and outers are set. For performance, we don't check
+     *  outers here, because Scala semantics ensure that they are always set
+     *  before any user code in the constructor.
+     *
+     *  Note that `isFullyFilled = true` does not mean we can use the
+     *  object freely, as its fields or outers may still reach uninitialized
+     *  objects.
+     */
+    def isFullyFilled: Contextual[Boolean] = log("isFullyFilled " + ref, printer) {
+      val obj = ref.objekt
+      ref.klass.baseClasses.forall { klass =>
+        !klass.hasSource || {
+          val nonInits = klass.info.decls.filter { member =>
+            !member.isOneOf(Flags.Method | Flags.Lazy | Flags.Deferred)
+            && !member.isType
+            && !obj.hasField(member)
+          }
+          printer.println("nonInits = " + nonInits)
+          nonInits.isEmpty
+        }
+      }
+    }
+
+  end extension
+
+  extension (thisRef: ThisRef)
+    def tryPromoteCurrentObject: Contextual[Boolean] = log("tryPromoteCurrentObject ", printer) {
+      if promoted.isCurrentObjectPromoted then
+        true
+      else if thisRef.isFullyFilled then
+        // If we have all fields initialized, then we can promote This to hot.
+        promoted.promoteCurrent(thisRef)
+        true
+      else
+        false
+    }
+
+  extension (value: Value)
+    /** Promotion of values to hot */
+    def promote(msg: String, source: Tree): Contextual[List[Error]] = log("promoting " + value + ", promoted = " + promoted, printer) {
+      if promoted.isCurrentObjectPromoted then Nil else
+
+      value.match
+      case Hot   =>  Nil
+
+      case Cold  =>  PromoteError(msg, source, trace.toVector) :: Nil
+
+      case thisRef: ThisRef =>
+        if thisRef.tryPromoteCurrentObject then Nil
+        else PromoteError(msg, source, trace.toVector) :: Nil
+
+      case warm: Warm =>
+        if promoted.contains(warm) then Nil
+        else {
+          promoted.add(warm)
+          val errors = warm.tryPromote(msg, source)
+          if errors.nonEmpty then promoted.remove(warm)
+          errors
+        }
+
+      case fun @ Fun(body, thisV, klass, env) =>
+        if promoted.contains(fun) then Nil
+        else
+          val res = withEnv(env) { eval(body, thisV, klass) }
+          val errors2 = res.value.promote(msg, source)
+          if (res.errors.nonEmpty || errors2.nonEmpty)
+            UnsafePromotion(msg, source, trace.toVector, res.errors ++ errors2) :: Nil
+          else
+            promoted.add(fun)
+            Nil
+
+      case RefSet(refs) =>
+        refs.flatMap(_.promote(msg, source))
+    }
+  end extension
+
+  extension (warm: Warm)
+    /** Try early promotion of warm objects
+     *
+     *  Promotion is expensive and should only be performed for small classes.
+     *
+     *  1. for each concrete method `m` of the warm object:
+     *     call the method and promote the result
+     *
+     *  2. for each concrete field `f` of the warm object:
+     *     promote the field value
+     *
+     *  If the object contains nested classes as members, the checker simply
+     *  reports a warning to avoid expensive checks.
+     *
+     *  TODO: we need to revisit whether this is needed once we make the
+     *  system more flexible in other dimentions: e.g. leak to
+     *  methods or constructors, or use ownership for creating cold data structures.
+     */
+    def tryPromote(msg: String, source: Tree): Contextual[List[Error]] = log("promote " + warm.show + ", promoted = " + promoted, printer) {
+      val classRef = warm.klass.appliedRef
+      if classRef.memberClasses.nonEmpty || !warm.isFullyFilled then
+        return PromoteError(msg, source, trace.toVector) :: Nil
+
+      val buffer  = new mutable.ArrayBuffer[Error]
+
+      warm.klass.baseClasses.exists { klass =>
+        klass.hasSource && klass.info.decls.exists { member =>
+          if !member.isType && !member.isConstructor && member.hasSource  && !member.is(Flags.Deferred) then
+            if member.is(Flags.Method) then
+              val trace2 = trace.add(source)
+              locally {
+                given Trace = trace2
+                val args = member.info.paramInfoss.flatten.map(_ => ArgInfo(Hot, EmptyTree))
+                val res = warm.call(member, args, superType = NoType, source = member.defTree)
+                buffer ++= res.ensureHot(msg, source).errors
+              }
+            else
+              val res = warm.select(member, source)
+              buffer ++= res.ensureHot(msg, source).errors
+          buffer.nonEmpty
+        }
+      }
+
+      if buffer.isEmpty then Nil
+      else UnsafePromotion(msg, source, trace.toVector, buffer.toList) :: Nil
+    }
+
+  end extension
+
+// ----- Policies ------------------------------------------------------
+  extension (value: Ref)
+    /** Can the method call on `value` be ignored?
+     *
+     *  Note: assume overriding resolution has been performed.
+     */
+    def canIgnoreMethodCall(meth: Symbol)(using Context): Boolean =
+      val cls = meth.owner
+      cls == defn.AnyClass ||
+      cls == defn.AnyValClass ||
+      cls == defn.ObjectClass
+
+// ----- Work list ---------------------------------------------------
+  case class Task(value: ThisRef)
+
+  class WorkList private[Semantic]() {
+    private var pendingTasks: List[Task] = Nil
+
+    def addTask(task: Task): Unit =
+      if !pendingTasks.contains(task) then pendingTasks = task :: pendingTasks
+
+    /** Process the worklist until done */
+    final def work()(using Cache, Context): Unit =
+      for task <- pendingTasks
+      do doTask(task)
+
+    /** Check an individual class
+     *
+     *  This method should only be called from the work list scheduler.
+     */
+    private def doTask(task: Task)(using Cache, Context): Unit = {
+      val thisRef = task.value
+      val tpl = thisRef.klass.defTree.asInstanceOf[TypeDef].rhs.asInstanceOf[Template]
+
+      val paramValues = tpl.constr.termParamss.flatten.map(param => param.symbol -> Hot).toMap
+
+      @tailrec
+      def iterate(): Unit = {
+        given Promoted = Promoted.empty
+        given Trace = Trace.empty
+        given Env = Env(paramValues)
+
+        thisRef.ensureFresh()
+        val res = log("checking " + task) { eval(tpl, thisRef, thisRef.klass) }
+        res.errors.foreach(_.issue)
+
+        if cache.hasChanged && res.errors.isEmpty then
+          // code to prepare cache and heap for next iteration
+          cache.prepareForNextIteration()
+          iterate()
+        else
+          cache.prepareForNextClass()
+      }
+
+      iterate()
+    }
+  }
+  inline def workList(using wl: WorkList): WorkList = wl
+
+// ----- API --------------------------------
+
+  /** Add a checking task to the work list */
+  def addTask(thisRef: ThisRef)(using WorkList) = workList.addTask(Task(thisRef))
+
+  /** Perform check on the work list until it becomes empty
+   *
+   *  Should only be called once from the checker.
+   */
+  def check()(using Cache, WorkList, Context) = workList.work()
+
+  /** Perform actions with initial checking state.
+   *
+   *      Semantic.withInitialState {
+   *         Semantic.addTask(...)
+   *         ...
+   *         Semantic.check()
+   *      }
+   */
+  def withInitialState[T](work: (Cache, WorkList) ?=> T): T = {
+    work(using new Cache, new WorkList)
+  }
+
+// ----- Semantic definition --------------------------------
+
+  /** Utility definition used for better error-reporting of argument errors */
+  case class ArgInfo(value: Value, source: Tree) {
+    def promote: Contextual[List[Error]] = value.promote("Only initialized values may be used as arguments", source)
+  }
+
+  /** Evaluate an expression with the given value for `this` in a given class `klass`
+   *
+   *  Note that `klass` might be a super class of the object referred by `thisV`.
+   *  The parameter `klass` is needed for `this` resolution. Consider the following code:
+   *
+   *  class A {
+   *    A.this
+   *    class B extends A { A.this }
+   *  }
+   *
+   *  As can be seen above, the meaning of the expression `A.this` depends on where
+   *  it is located.
+   *
+   *  This method only handles cache logic and delegates the work to `cases`.
+   */
+  def eval(expr: Tree, thisV: Ref, klass: ClassSymbol, cacheResult: Boolean = false): Contextual[Result] = log("evaluating " + expr.show + ", this = " + thisV.show + " in " + klass.show, printer, (_: Result).show) {
+    if (cache.contains(thisV, expr)) Result(cache(thisV, expr), Errors.empty)
+    else cache.assume(thisV, expr, cacheResult) { cases(expr, thisV, klass) }
+  }
+
+  /** Evaluate a list of expressions */
+  def eval(exprs: List[Tree], thisV: Ref, klass: ClassSymbol): Contextual[List[Result]] =
+    exprs.map { expr => eval(expr, thisV, klass) }
+
+  /** Evaluate arguments of methods */
+  def evalArgs(args: List[Arg], thisV: Ref, klass: ClassSymbol): Contextual[(List[Error], List[ArgInfo])] =
+    val errors = new mutable.ArrayBuffer[Error]
+    val argInfos = new mutable.ArrayBuffer[ArgInfo]
+    args.foreach { arg =>
+      val res =
+        if arg.isByName then
+          val fun = Fun(arg.tree, thisV, klass, env)
+          Result(fun, Nil)
+        else
+          eval(arg.tree, thisV, klass)
+
+      errors ++= res.errors
+      argInfos += ArgInfo(res.value, arg.tree)
+    }
+    (errors.toList, argInfos.toList)
+
+  /** Handles the evaluation of different expressions
+   *
+   *  Note: Recursive call should go to `eval` instead of `cases`.
+   */
+  def cases(expr: Tree, thisV: Ref, klass: ClassSymbol): Contextual[Result] =
+    expr match {
+      case Ident(nme.WILDCARD) =>
+        // TODO:  disallow `var x: T = _`
+        Result(Hot, Errors.empty)
+
+      case id @ Ident(name) if !id.symbol.is(Flags.Method)  =>
+        assert(name.isTermName, "type trees should not reach here")
+        cases(expr.tpe, thisV, klass, expr)
+
+      case NewExpr(tref, New(tpt), ctor, argss) =>
+        // check args
+        val (errors, args) = evalArgs(argss.flatten, thisV, klass)
+
+        val cls = tref.classSymbol.asClass
+        val res = outerValue(tref, thisV, klass, tpt)
+        val trace2 = trace.add(expr)
+        locally {
+          given Trace = trace2
+          (res ++ errors).instantiate(cls, ctor, args, source = expr)
+        }
+
+      case Call(ref, argss) =>
+        // check args
+        val (errors, args) = evalArgs(argss.flatten, thisV, klass)
+
+        ref match
+        case Select(supert: Super, _) =>
+          val SuperType(thisTp, superTp) = supert.tpe
+          val thisValue2 = resolveThis(thisTp.classSymbol.asClass, thisV, klass, ref)
+          Result(thisValue2, errors).call(ref.symbol, args, superTp, expr)
+
+        case Select(qual, _) =>
+          val res = eval(qual, thisV, klass) ++ errors
+          if ref.symbol.isConstructor then
+            res.callConstructor(ref.symbol, args, source = expr)
+          else
+            res.call(ref.symbol, args, superType = NoType, source = expr)
+
+        case id: Ident =>
+          id.tpe match
+          case TermRef(NoPrefix, _) =>
+            // resolve this for the local method
+            val enclosingClass = id.symbol.owner.enclosingClass.asClass
+            val thisValue2 = resolveThis(enclosingClass, thisV, klass, id)
+            // local methods are not a member, but we can reuse the method `call`
+            thisValue2.call(id.symbol, args, superType = NoType, expr, needResolve = false)
+          case TermRef(prefix, _) =>
+            val res = cases(prefix, thisV, klass, id) ++ errors
+            if id.symbol.isConstructor then
+              res.callConstructor(id.symbol, args, source = expr)
+            else
+              res.call(id.symbol, args, superType = NoType, source = expr)
+
+      case Select(qualifier, name) =>
+        val qualRes = eval(qualifier, thisV, klass)
+
+        name match
+          case OuterSelectName(_, hops) =>
+            val SkolemType(tp) = expr.tpe
+            val outer = resolveOuterSelect(tp.classSymbol.asClass, qualRes.value, hops, source = expr)
+            Result(outer, qualRes.errors)
+          case _ =>
+            qualRes.select(expr.symbol, expr)
+
+      case _: This =>
+        cases(expr.tpe, thisV, klass, expr)
+
+      case Literal(_) =>
+        Result(Hot, Errors.empty)
+
+      case Typed(expr, tpt) =>
+        if (tpt.tpe.hasAnnotation(defn.UncheckedAnnot)) Result(Hot, Errors.empty)
+        else eval(expr, thisV, klass) ++ checkTermUsage(tpt, thisV, klass)
+
+      case NamedArg(name, arg) =>
+        eval(arg, thisV, klass)
+
+      case Assign(lhs, rhs) =>
+        lhs match
+        case Select(qual, _) =>
+          val res = eval(qual, thisV, klass)
+          eval(rhs, thisV, klass).ensureHot("May only assign fully initialized value", rhs) ++ res.errors
+        case id: Ident =>
+          eval(rhs, thisV, klass).ensureHot("May only assign fully initialized value", rhs)
+
+      case closureDef(ddef) =>
+        val value = Fun(ddef.rhs, thisV, klass, env)
+        Result(value, Nil)
+
+      case PolyFun(body) =>
+        val value = Fun(body, thisV, klass, env)
+        Result(value, Nil)
+
+      case Block(stats, expr) =>
+        val ress = eval(stats, thisV, klass)
+        eval(expr, thisV, klass) ++ ress.flatMap(_.errors)
+
+      case If(cond, thenp, elsep) =>
+        val ress = eval(cond :: thenp :: elsep :: Nil, thisV, klass)
+        val value = ress.map(_.value).join
+        val errors = ress.flatMap(_.errors)
+        Result(value, errors)
+
+      case Annotated(arg, annot) =>
+        if (expr.tpe.hasAnnotation(defn.UncheckedAnnot)) Result(Hot, Errors.empty)
+        else eval(arg, thisV, klass)
+
+      case Match(selector, cases) =>
+        val res1 = eval(selector, thisV, klass).ensureHot("The value to be matched needs to be fully initialized", selector)
+        val ress = eval(cases.map(_.body), thisV, klass)
+        val value = ress.map(_.value).join
+        val errors = res1.errors ++ ress.flatMap(_.errors)
+        Result(value, errors)
+
+      case Return(expr, from) =>
+        eval(expr, thisV, klass).ensureHot("return expression may only be initialized value", expr)
+
+      case WhileDo(cond, body) =>
+        val ress = eval(cond :: body :: Nil, thisV, klass)
+        Result(Hot, ress.flatMap(_.errors))
+
+      case Labeled(_, expr) =>
+        eval(expr, thisV, klass)
+
+      case Try(block, cases, finalizer) =>
+        val res1 = eval(block, thisV, klass)
+        val ress = eval(cases.map(_.body), thisV, klass)
+        val errors = ress.flatMap(_.errors)
+        val resValue = ress.map(_.value).join
+        if finalizer.isEmpty then
+          Result(resValue, res1.errors ++ errors)
+        else
+          val res2 = eval(finalizer, thisV, klass)
+          Result(resValue, res1.errors ++ errors ++ res2.errors)
+
+      case SeqLiteral(elems, elemtpt) =>
+        val ress = elems.map { elem =>
+          eval(elem, thisV, klass).ensureHot("May only use initialized value as method arguments", elem)
+        }
+        Result(Hot, ress.flatMap(_.errors))
+
+      case Inlined(call, bindings, expansion) =>
+        val ress = eval(bindings, thisV, klass)
+        eval(expansion, thisV, klass) ++ ress.flatMap(_.errors)
+
+      case Thicket(List()) =>
+        // possible in try/catch/finally, see tests/crash/i6914.scala
+        Result(Hot, Errors.empty)
+
+      case vdef : ValDef =>
+        // local val definition
+        // TODO: support explicit @cold annotation for local definitions
+        eval(vdef.rhs, thisV, klass)
+
+      case ddef : DefDef =>
+        // local method
+        Result(Hot, Errors.empty)
+
+      case tdef: TypeDef =>
+        // local type definition
+        if tdef.isClassDef then Result(Hot, Errors.empty)
+        else Result(Hot, checkTermUsage(tdef.rhs, thisV, klass))
+
+      case tpl: Template =>
+        init(tpl, thisV, klass)
+
+      case _: Import | _: Export =>
+        Result(Hot, Errors.empty)
+
+      case _ =>
+        throw new Exception("unexpected tree: " + expr.show)
+    }
+
+  /** Handle semantics of leaf nodes */
+  def cases(tp: Type, thisV: Ref, klass: ClassSymbol, source: Tree): Contextual[Result] = log("evaluating " + tp.show, printer, (_: Result).show) {
+    tp match {
+      case _: ConstantType =>
+        Result(Hot, Errors.empty)
+
+      case tmref: TermRef if tmref.prefix == NoPrefix =>
+        thisV.accessLocal(tmref, klass, source)
+
+      case tmref: TermRef =>
+        cases(tmref.prefix, thisV, klass, source).select(tmref.symbol, source)
+
+      case tp @ ThisType(tref) =>
+        val cls = tref.classSymbol.asClass
+        if cls.isStaticOwner && !klass.isContainedIn(cls) then
+          // O.this outside the body of the object O
+          Result(Hot, Nil)
+        else
+          val value = resolveThis(cls, thisV, klass, source)
+          Result(value, Errors.empty)
+
+      case _: TermParamRef | _: RecThis  =>
+        // possible from checking effects of types
+        Result(Hot, Errors.empty)
+
+      case _ =>
+        throw new Exception("unexpected type: " + tp)
+    }
+  }
+
+  /** Resolve C.this that appear in `klass` */
+  def resolveThis(target: ClassSymbol, thisV: Value, klass: ClassSymbol, source: Tree): Contextual[Value] = log("resolving " + target.show + ", this = " + thisV.show + " in " + klass.show, printer, (_: Value).show) {
+    if target == klass then thisV
+    else if target.is(Flags.Package) then Hot
+    else
+      thisV match
+        case Hot => Hot
+        case ref: Ref =>
+          val obj = ref.objekt
+          val outerCls = klass.owner.lexicallyEnclosingClass.asClass
+          if !obj.hasOuter(klass) then
+            val error = PromoteError("outer not yet initialized, target = " + target + ", klass = " + klass + ", object = " + obj, source, trace.toVector)
+            report.error(error.show + error.stacktrace, source)
+            Hot
+          else
+            resolveThis(target, obj.outer(klass), outerCls, source)
+        case RefSet(refs) =>
+          refs.map(ref => resolveThis(target, ref, klass, source)).join
+        case fun: Fun =>
+          report.warning("unexpected thisV = " + thisV + ", target = " + target.show + ", klass = " + klass.show, source.srcPos)
+          Cold
+        case Cold => Cold
+
+  }
+
+  /** Resolve outer select introduced during inlining.
+   *
+   *  See `tpd.outerSelect` and `ElimOuterSelect`.
+   */
+  def resolveOuterSelect(target: ClassSymbol, thisV: Value, hops: Int, source: Tree): Contextual[Value] = log("resolving outer " + target.show + ", this = " + thisV.show + ", hops = " + hops, printer, (_: Value).show) {
+    // Is `target` reachable from `cls` with the given `hops`?
+    def reachable(cls: ClassSymbol, hops: Int): Boolean = log("reachable from " + cls + " -> " + target + " in " + hops, printer) {
+      if hops == 0 then cls == target
+      else reachable(cls.owner.lexicallyEnclosingClass.asClass, hops - 1)
+    }
+
+    thisV match
+      case Hot => Hot
+
+      case ref: Ref =>
+        val obj = ref.objekt
+        val curOpt = obj.klass.baseClasses.find(cls => reachable(cls, hops))
+        curOpt match
+          case Some(cur) =>
+            resolveThis(target, thisV, cur, source)
+
+          case None =>
+            report.warning("unexpected outerSelect, thisV = " + thisV + ", target = " + target.show + ", hops = " + hops, source.srcPos)
+            Cold
+
+      case RefSet(refs) =>
+        refs.map(ref => resolveOuterSelect(target, ref, hops, source)).join
+
+      case fun: Fun =>
+        report.warning("unexpected thisV = " + thisV + ", target = " + target.show + ", hops = " + hops, source.srcPos)
+        Cold
+
+      case Cold => Cold
+  }
+
+  /** Compute the outer value that correspond to `tref.prefix` */
+  def outerValue(tref: TypeRef, thisV: Ref, klass: ClassSymbol, source: Tree): Contextual[Result] =
+    val cls = tref.classSymbol.asClass
+    if tref.prefix == NoPrefix then
+      val enclosing = cls.owner.lexicallyEnclosingClass.asClass
+      val outerV = resolveThis(enclosing, thisV, klass, source)
+      Result(outerV, Errors.empty)
+    else
+      if cls.isAllOf(Flags.JavaInterface) then Result(Hot, Nil)
+      else cases(tref.prefix, thisV, klass, source)
+
+  /** Initialize part of an abstract object in `klass` of the inheritance chain */
+  def init(tpl: Template, thisV: Ref, klass: ClassSymbol): Contextual[Result] = log("init " + klass.show, printer, (_: Result).show) {
+    val errorBuffer = new mutable.ArrayBuffer[Error]
+
+    val paramsMap = tpl.constr.termParamss.flatten.map { vdef =>
+      vdef.name -> env.lookup(vdef.symbol)
+    }.toMap
+
+    // init param fields
+    klass.paramGetters.foreach { acc =>
+      val value = paramsMap(acc.name.toTermName)
+      thisV.updateField(acc, value)
+      printer.println(acc.show + " initialized with " + value)
+    }
+
+    // Tasks is used to schedule super constructor calls.
+    // Super constructor calls are delayed until all outers are set.
+    type Tasks = mutable.ArrayBuffer[() => Unit]
+    def superCall(tref: TypeRef, ctor: Symbol, args: List[ArgInfo], source: Tree, tasks: Tasks)(using Env): Unit =
+      val cls = tref.classSymbol.asClass
+      // update outer for super class
+      val res = outerValue(tref, thisV, klass, source)
+      errorBuffer ++= res.errors
+      thisV.updateOuter(cls, res.value)
+
+      // follow constructor
+      if cls.hasSource then
+        tasks.append { () =>
+          printer.println("init super class " + cls.show)
+          val res2 = thisV.callConstructor(ctor, args, source)
+          errorBuffer ++= res2.errors
+          ()
+        }
+
+    // parents
+    def initParent(parent: Tree, tasks: Tasks)(using Env) = parent match {
+      case tree @ Block(stats, NewExpr(tref, New(tpt), ctor, argss)) =>  // can happen
+        eval(stats, thisV, klass).foreach { res => errorBuffer ++= res.errors }
+        val (errors, args) = evalArgs(argss.flatten, thisV, klass)
+        errorBuffer ++= errors
+        superCall(tref, ctor, args, tree, tasks)
+
+      case tree @ NewExpr(tref, New(tpt), ctor, argss) =>       // extends A(args)
+      val (errors, args) = evalArgs(argss.flatten, thisV, klass)
+      errorBuffer ++= errors
+      superCall(tref, ctor, args, tree, tasks)
+
+      case _ =>   // extends A or extends A[T]
+        val tref = typeRefOf(parent.tpe)
+        superCall(tref, tref.classSymbol.primaryConstructor, Nil, parent, tasks)
+    }
+
+    // see spec 5.1 about "Template Evaluation".
+    // https://www.scala-lang.org/files/archive/spec/2.13/05-classes-and-objects.html
+    if !klass.is(Flags.Trait) then
+      given Env = Env.empty
+
+      // outers are set first
+      val tasks = new mutable.ArrayBuffer[() => Unit]
+
+      // 1. first init parent class recursively
+      // 2. initialize traits according to linearization order
+      val superParent = tpl.parents.head
+      val superCls = superParent.tpe.classSymbol.asClass
+      initParent(superParent, tasks)
+
+      val parents = tpl.parents.tail
+      val mixins = klass.baseClasses.tail.takeWhile(_ != superCls)
+
+      // The interesting case is the outers for traits.  The compiler
+      // synthesizes proxy accessors for the outers in the class that extends
+      // the trait. As those outers must be stable values, they are initialized
+      // immediately following class parameters and before super constructor
+      // calls and user code in the class body.
+      mixins.reverse.foreach { mixin =>
+        parents.find(_.tpe.classSymbol == mixin) match
+        case Some(parent) => initParent(parent, tasks)
+        case None =>
+          // According to the language spec, if the mixin trait requires
+          // arguments, then the class must provide arguments to it explicitly
+          // in the parent list. That means we will encounter it in the Some
+          // branch.
+          //
+          // When a trait A extends a parameterized trait B, it cannot provide
+          // term arguments to B. That can only be done in a concrete class.
+          val tref = typeRefOf(klass.typeRef.baseType(mixin).typeConstructor)
+          val ctor = tref.classSymbol.primaryConstructor
+          if ctor.exists then superCall(tref, ctor, Nil, superParent, tasks)
+      }
+
+      // initialize super classes after outers are set
+      tasks.foreach(task => task())
+    end if
+
+    var fieldsChanged = true
+
+    // class body
+    if thisV.isThisRef || !thisV.asInstanceOf[Warm].isPopulatingParams then tpl.body.foreach {
+      case vdef : ValDef if !vdef.symbol.is(Flags.Lazy) && !vdef.rhs.isEmpty =>
+        given Env = Env.empty
+        val res = eval(vdef.rhs, thisV, klass)
+        errorBuffer ++= res.errors
+        thisV.updateField(vdef.symbol, res.value)
+        fieldsChanged = true
+
+      case _: MemberDef =>
+
+      case tree =>
+        if fieldsChanged && thisV.isThisRef then thisV.asInstanceOf[ThisRef].tryPromoteCurrentObject
+        fieldsChanged = false
+
+        given Env = Env.empty
+        errorBuffer ++= eval(tree, thisV, klass).errors
+    }
+
+    // The result value is ignored, use Hot to avoid futile fixed point computation
+    Result(Hot, errorBuffer.toList)
+  }
+
+  /** Check that path in path-dependent types are initialized
+   *
+   *  This is intended to avoid type soundness issues in Dotty.
+   */
+  def checkTermUsage(tpt: Tree, thisV: Ref, klass: ClassSymbol): Contextual[List[Error]] =
+    val buf = new mutable.ArrayBuffer[Error]
+    val traverser = new TypeTraverser {
+      def traverse(tp: Type): Unit = tp match {
+        case TermRef(_: SingletonType, _) =>
+          buf ++= cases(tp, thisV, klass, tpt).errors
+        case _ =>
+          traverseChildren(tp)
+      }
+    }
+    traverser.traverse(tpt.tpe)
+    buf.toList
+
+// ----- Utility methods and extractors --------------------------------
+
+  def typeRefOf(tp: Type)(using Context): TypeRef = tp.dealias.typeConstructor match {
+    case tref: TypeRef => tref
+    case hklambda: HKTypeLambda => typeRefOf(hklambda.resType)
+  }
+
+  opaque type Arg  = Tree | ByNameArg
+  case class ByNameArg(tree: Tree)
+
+  extension (arg: Arg)
+    def isByName = arg.isInstanceOf[ByNameArg]
+    def tree: Tree = arg match
+      case t: Tree      => t
+      case ByNameArg(t) => t
+
+  object Call {
+
+    def unapply(tree: Tree)(using Context): Option[(Tree, List[List[Arg]])] =
+      tree match
+      case Apply(fn, args) =>
+        val argTps = fn.tpe.widen match
+          case mt: MethodType => mt.paramInfos
+        val normArgs: List[Arg] = args.zip(argTps).map {
+          case (arg, _: ExprType) => ByNameArg(arg)
+          case (arg, _)           => arg
+        }
+        unapply(fn) match
+        case Some((ref, args0)) => Some((ref, args0 :+ normArgs))
+        case None => None
+
+      case TypeApply(fn, targs) =>
+        unapply(fn)
+
+      case ref: RefTree if ref.tpe.widenSingleton.isInstanceOf[MethodicType] =>
+        Some((ref, Nil))
+
+      case _ => None
+  }
+
+  object NewExpr {
+    def unapply(tree: Tree)(using Context): Option[(TypeRef, New, Symbol, List[List[Arg]])] =
+      tree match
+      case Call(fn @ Select(newTree: New, init), argss) if init == nme.CONSTRUCTOR =>
+        val tref = typeRefOf(newTree.tpe)
+        Some((tref, newTree, fn.symbol, argss))
+      case _ => None
+  }
+
+  object PolyFun {
+    def unapply(tree: Tree)(using Context): Option[Tree] =
+      tree match
+      case Block((cdef: TypeDef) :: Nil, Typed(NewExpr(tref, _, _, _), _))
+      if tref.symbol.isAnonymousClass && tref <:< defn.PolyFunctionType
+      =>
+        val body = cdef.rhs.asInstanceOf[Template].body
+        val apply = body.head.asInstanceOf[DefDef]
+        Some(apply.rhs)
+      case _ =>
+        None
+  }
+
+  extension (symbol: Symbol) def hasSource(using Context): Boolean =
+    !symbol.defTree.isEmpty
+
+  def resolve(cls: ClassSymbol, sym: Symbol)(using Context): Symbol = log("resove " + cls + ", " + sym, printer, (_: Symbol).show) {
+    if (sym.isEffectivelyFinal || sym.isConstructor) sym
+    else sym.matchingMember(cls.appliedRef)
+  }
+
+  def resolveSuper(cls: ClassSymbol, superType: Type, sym: Symbol)(using Context): Symbol = {
+    import annotation.tailrec
+    @tailrec def loop(bcs: List[ClassSymbol]): Symbol = bcs match {
+      case bc :: bcs1 =>
+        val cand = sym.matchingDecl(bcs.head, cls.thisType)
+          .suchThat(alt => !alt.is(Flags.Deferred)).symbol
+        if (cand.exists) cand else loop(bcs.tail)
+      case _ =>
+        NoSymbol
+    }
+    loop(cls.info.baseClasses.dropWhile(sym.owner != _))
+  }
+
+}
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Summarization.scala b/compiler/src/dotty/tools/dotc/transform/init/Summarization.scala
deleted file mode 100644
index 8da415bf82bb..000000000000
--- a/compiler/src/dotty/tools/dotc/transform/init/Summarization.scala
+++ /dev/null
@@ -1,382 +0,0 @@
-package dotty.tools.dotc
-package transform
-package init
-
-import core._
-import Contexts._
-import Decorators._
-import StdNames._
-import Symbols._
-import Constants.Constant
-import Types._
-
-import ast.tpd._
-import config.Printers.init
-import reporting.trace
-
-import Effects._, Potentials._, Summary._, Util._
-
-object Summarization {
-
-  /** Summarization of potentials and effects for an expression
-   *
-   *  Optimization:
-   *
-   *   1. potentials for expression of primitive value types can be
-   *      safely abandoned, as they are always fully initialized.
-   */
-  def analyze(expr: Tree)(implicit env: Env): Summary =
-  trace("summarizing " + expr.show, init, s => s.asInstanceOf[Summary].show) {
-    val summary: Summary = expr match {
-      case Ident(nme.WILDCARD) =>
-        // TODO:  disallow `var x: T = _`
-        Summary.empty
-
-      case Ident(name) =>
-        assert(name.isTermName, "type trees should not reach here")
-        analyze(expr.tpe, expr)
-
-      case supert: Super =>
-        analyze(supert.tpe, supert)
-
-      case Select(qualifier, name) =>
-        val Summary(pots, effs) = analyze(qualifier)
-        if (env.canIgnoreMethod(expr.symbol)) Summary(effs)
-        else if (!expr.symbol.exists) { // polymorphic function apply and structural types
-          Summary(pots.promote(expr) ++ effs)
-        }
-        else {
-          val Summary(pots2, effs2) = pots.select(expr.symbol, expr)
-          Summary(pots2, effs ++ effs2)
-        }
-
-      case _: This =>
-        analyze(expr.tpe, expr)
-
-      case Apply(fun, args) =>
-        val summary = analyze(fun)
-        val ignoredCall = env.canIgnoreMethod(expr.symbol)
-
-        val argTps = fun.tpe.widen match
-          case mt: MethodType => mt.paramInfos
-
-        val res = args.zip(argTps).foldLeft(summary) { case (sum, (arg, argTp)) =>
-          val Summary(pots1, effs1) = analyze(arg)
-          if (ignoredCall) sum ++ effs1
-          else if (argTp.isInstanceOf[ExprType]) sum + Promote(Fun(pots1, effs1)(arg))(arg)
-          else sum ++ pots1.promote(arg) ++ effs1
-        }
-
-        if (ignoredCall) Summary(res.effs)
-        else res
-
-      case TypeApply(fun, args) =>
-        analyze(fun)
-
-      case Literal(const) =>
-        Summary.empty
-
-      case New(tpt) =>
-        def typeRefOf(tp: Type): TypeRef = tp.dealias.typeConstructor match {
-          case tref: TypeRef => tref
-          case hklambda: HKTypeLambda => typeRefOf(hklambda.resType)
-        }
-
-        val tref = typeRefOf(tpt.tpe)
-        val cls = tref.classSymbol.asClass
-        // local class may capture, thus we need to track it
-        if (tref.prefix == NoPrefix) {
-          val cur = theCtx.owner.lexicallyEnclosingClass.asClass
-          val thisRef = ThisRef()(expr)
-          val enclosing = cls.owner.lexicallyEnclosingClass.asClass
-          val summary = resolveThis(enclosing, thisRef, cur, expr)
-          if summary.pots.isEmpty then summary
-          else {
-            assert(summary.pots.size == 1)
-            summary.dropPotentials + Warm(cls, summary.pots.head)(expr)
-          }
-        }
-        else {
-          val summary = analyze(tref.prefix, expr)
-          if summary.pots.isEmpty then summary
-          else {
-            assert(summary.pots.size == 1)
-            summary.dropPotentials + Warm(cls, summary.pots.head)(expr)
-          }
-        }
-
-      case Typed(expr, tpt) =>
-        if (tpt.tpe.hasAnnotation(defn.UncheckedAnnot)) Summary.empty
-        else analyze(expr) ++ effectsOfType(tpt.tpe, tpt)
-
-      case NamedArg(name, arg) =>
-        analyze(arg)
-
-      case Assign(lhs, rhs) =>
-        val Summary(pots, effs) = analyze(rhs)
-        Summary(pots.promote(expr) ++ effs)
-
-      case closureDef(ddef) =>     // must be before `Block`
-        val Summary(pots, effs) = analyze(ddef.rhs)
-        Summary(Fun(pots, effs)(expr))
-
-      case Block(stats, expr) =>
-        val effs = stats.foldLeft(Effects.empty) { (acc, stat) => acc ++ analyze(stat).effs }
-        val Summary(pots2, effs2) = analyze(expr)
-        Summary(pots2, effs ++ effs2)
-
-      case If(cond, thenp, elsep) =>
-        val Summary(_, effs0) = analyze(cond)
-        val Summary(pots1, effs1) = analyze(thenp)
-        val Summary(pots2, effs2) = analyze(elsep)
-        Summary(pots1 ++ pots2, effs0 ++ effs1 ++ effs2)
-
-      case Annotated(arg, annot) =>
-        if (expr.tpe.hasAnnotation(defn.UncheckedAnnot)) Summary.empty
-        else analyze(arg)
-
-      case Match(selector, cases) =>
-        // possible for switches
-        val Summary(pots, effs) = analyze(selector)
-        val init = Summary(Potentials.empty, pots.promote(selector) ++ effs)
-        cases.foldLeft(init) { (acc, cas) =>
-          acc + analyze(cas.body)
-        }
-
-      // case CaseDef(pat, guard, body) =>
-      //   Summary.empty
-
-      case Return(expr, from) =>
-        val Summary(pots, effs) = analyze(expr)
-        Summary(effs ++ pots.promote(expr))
-
-      case WhileDo(cond, body) =>
-        // for lazy fields, the translation may result in `while (<empty>)`
-        val Summary(_, effs1) = if (cond.isEmpty) Summary.empty else analyze(cond)
-        val Summary(_, effs2) = analyze(body)
-        Summary(effs1 ++ effs2)
-
-      case Labeled(_, expr) =>
-        val summary = analyze(expr)
-        summary.dropPotentials
-
-      case Try(block, cases, finalizer) =>
-        val Summary(pots, effs) =  cases.foldLeft(analyze(block)) { (acc, cas) =>
-          acc + analyze(cas.body)
-        }
-        val Summary(_, eff2) = if (finalizer.isEmpty) Summary.empty else analyze(finalizer)
-        Summary(pots, effs ++ eff2)
-
-      case SeqLiteral(elems, elemtpt) =>
-        val effsAll: Effects = elems.foldLeft(Effects.empty) { (effs, elem) =>
-          val Summary(pots1, effs1) = analyze(elem)
-          pots1.promote(expr) ++ effs1 ++ effs
-        }
-        Summary(effsAll)
-
-      case Inlined(call, bindings, expansion) =>
-        val effs = bindings.foldLeft(Effects.empty) { (acc, mdef) =>
-          acc ++ analyze(mdef).effs
-        }
-        analyze(expansion) ++ effs
-
-      case vdef : ValDef =>
-        val Summary(pots, effs) = analyze(vdef.rhs)
-
-        if (vdef.symbol.owner.isClass)
-          if (vdef.symbol.is(Flags.Lazy)) Summary.empty else Summary(effs)
-        else
-          Summary(pots.promote(vdef) ++ effs)
-
-      case Thicket(List()) =>
-        // possible in try/catch/finally, see tests/crash/i6914.scala
-        Summary.empty
-
-      case ddef : DefDef =>
-        if (ddef.symbol.owner.isClass) Summary.empty
-        else {
-          val Summary(pots, effs) = analyze(ddef.rhs)
-          Summary(pots.promote(ddef) ++ effs)
-        }
-
-      case tdef: TypeDef =>
-        if tdef.isClassDef then Summary.empty
-        else Summary(effectsOfType(tdef.symbol.info, tdef.rhs))
-
-      case _: Import | _: Export =>
-        Summary.empty
-
-      case _ =>
-        throw new Exception("unexpected tree: " + expr.show)
-    }
-
-    if (env.isAlwaysInitialized(expr.tpe)) Summary(Potentials.empty, summary.effs)
-    else summary
-  }
-
-  private def effectsOfType(tp: Type, source: Tree)(implicit env: Env): Effects =
-    var summary = Summary.empty
-    val traverser = new TypeTraverser {
-      def traverse(tp: Type): Unit = tp match {
-        case TermRef(_: SingletonType, _) =>
-          summary = summary + analyze(tp, source)
-        case _ =>
-          traverseChildren(tp)
-      }
-    }
-    traverser.traverse(tp)
-    summary.effs
-
-  def analyze(tp: Type, source: Tree)(implicit env: Env): Summary =
-  trace("summarizing " + tp.show, init, s => s.asInstanceOf[Summary].show) {
-    val summary: Summary = tp match {
-      case _: ConstantType =>
-        Summary.empty
-
-      case tmref: TermRef if tmref.prefix == NoPrefix =>
-        Summary.empty
-
-      case tmref: TermRef =>
-        val Summary(pots, effs) = analyze(tmref.prefix, source)
-        if (env.canIgnoreMethod(tmref.symbol)) Summary(effs)
-        else {
-          val summary = pots.select(tmref.symbol, source)
-          summary ++ effs
-        }
-
-      case ThisType(tref) =>
-        val enclosing = env.ctx.owner.lexicallyEnclosingClass.asClass
-        val cls = tref.symbol.asClass
-        resolveThis(cls, ThisRef()(source), enclosing, source)
-
-      case SuperType(thisTp, superTp) =>
-        val Summary(pots, effs) = analyze(thisTp, source)
-        val pots2 = pots.map {
-          // TODO: properly handle super of the form A & B
-          SuperRef(_, superTp.classSymbols.head.asClass)(source): Potential
-        }
-        Summary(pots2, effs)
-
-      case _: TermParamRef | _: RecThis  =>
-        // possible from checking effects of types
-        Summary.empty
-
-      case _ =>
-        throw new Exception("unexpected type: " + tp)
-    }
-
-    if (env.isAlwaysInitialized(tp)) Summary(Potentials.empty, summary.effs)
-    else summary
-  }
-
-  def analyzeMethod(sym: Symbol)(implicit env: Env): Summary = {
-    val ddef = sym.defTree.asInstanceOf[DefDef]
-    traceIndented(sym.show + " = " + ddef.show, init)
-    analyze(ddef.rhs)(env.withOwner(sym))
-  }
-
-  def analyzeField(sym: Symbol)(implicit env: Env): Summary = {
-    val vdef = sym.defTree.asInstanceOf[ValDef]
-    analyze(vdef.rhs)(env.withOwner(sym))
-  }
-
-  def resolveThis(cls: ClassSymbol, pot: Potential, cur: ClassSymbol, source: Tree)(implicit env: Env): Summary =
-  trace("resolve " + cls.show + ", pot = " + pot.show + ", cur = " + cur.show, init, s => s.asInstanceOf[Summary].show) {
-    if (cls.is(Flags.Package)) Summary.empty
-    else if (cls == cur) Summary(pot)
-    else if (pot.size > 2) Summary(Promote(pot)(source))
-    else {
-      val enclosing = cur.owner.lexicallyEnclosingClass.asClass
-      // Dotty uses O$.this outside of the object O
-      if (enclosing.is(Flags.Package) && cls.is(Flags.Module))
-        return Summary.empty
-
-      assert(!enclosing.is(Flags.Package), "enclosing = " + enclosing.show + ", cls = " + cls.show + ", pot = " + pot.show + ", cur = " + cur.show)
-      val pot2 = Outer(pot, cur)(pot.source)
-      resolveThis(cls, pot2, enclosing, source)
-    }
-  }
-
-  /** Summarize secondary constructors or class body */
-  def analyzeConstructor(ctor: Symbol)(implicit env: Env): Summary =
-  trace("summarizing constructor " + ctor.owner.show, init, s => s.asInstanceOf[Summary].show) {
-    if (ctor.isPrimaryConstructor) {
-      val cls = ctor.owner.asClass
-      val tpl = ctor.owner.defTree.asInstanceOf[TypeDef].rhs.asInstanceOf[Template]
-      val effs = analyze(Block(tpl.body, unitLiteral)).effs
-
-      def parentArgEffsWithInit(stats: List[Tree], ctor: Symbol, source: Tree): Effects =
-        val init =
-          if env.canIgnoreMethod(ctor) then Effects.empty
-          else Effects.empty :+ MethodCall(ThisRef()(source), ctor)(source)
-        stats.foldLeft(init) { (acc, stat) =>
-          val summary = Summarization.analyze(stat)
-          acc ++ summary.effs
-        }
-
-      val effsAll = tpl.parents.foldLeft(effs) { (effs, parent) =>
-        effs ++ (parent match {
-          case tree @ Block(stats, parent) =>
-            val ctor @ Select(qual, _) = funPart(parent)
-            parentArgEffsWithInit(qual :: stats ++ termArgss(parent).flatten, ctor.symbol, tree)
-
-          case tree @ Apply(Block(stats, parent), args) =>
-            val ctor @ Select(qual, _) = funPart(parent)
-            parentArgEffsWithInit(qual :: stats ++ args ++ termArgss(parent).flatten, ctor.symbol, tree)
-
-          case parent : Apply =>
-            val ctor @ Select(qual, _) = funPart(parent)
-            parentArgEffsWithInit(qual :: termArgss(parent).flatten, ctor.symbol, parent)
-
-          case ref =>
-            val tref: TypeRef = ref.tpe.typeConstructor.asInstanceOf
-            val cls = tref.classSymbol.asClass
-            if env.canIgnoreClass(cls) then Effects.empty
-            else {
-              val ctor = cls.primaryConstructor
-              val prefixEff =
-                if tref.prefix == NoPrefix then Effects.empty
-                else Summarization.analyze(tref.prefix, ref).effs
-
-              prefixEff :+ MethodCall(ThisRef()(ref), ctor)(ref)
-            }
-        })
-      }
-
-      Summary(effsAll)
-    }
-    else {
-      val ddef = ctor.defTree.asInstanceOf[DefDef]
-      analyze(ddef.rhs)(env.withOwner(ctor))
-    }
-  }
-
-  def classSummary(cls: ClassSymbol)(implicit env: Env): ClassSummary = trace("summarizing " + cls.show, init) {
-    def extractParentOuters(parent: Type, source: Tree): (ClassSymbol, Potentials) = {
-      val tref = parent.typeConstructor.stripAnnots.asInstanceOf[TypeRef]
-      val parentCls = tref.classSymbol.asClass
-      val env2: Env = env.withOwner(cls.owner.lexicallyEnclosingClass)
-      if (tref.prefix != NoPrefix)
-        parentCls -> analyze(tref.prefix, source)(env2).pots
-      else
-        parentCls -> analyze(cls.owner.lexicallyEnclosingClass.thisType, source)(env2).pots
-    }
-
-    if (cls.defTree.isEmpty)
-        val source = {
-          implicit val ctx2: Context = theCtx.withSource(cls.source(using theCtx))
-          TypeTree(cls.typeRef).withSpan(cls.span)
-        }
-
-        val parentOuter = cls.info.parents.map { extractParentOuters(_, source) }.toMap
-        ClassSummary(cls, parentOuter)
-    else {
-      val tpl = cls.defTree.asInstanceOf[TypeDef]
-      val parents = tpl.rhs.asInstanceOf[Template].parents
-
-      val parentOuter = parents.map { parent => extractParentOuters(parent.tpe, parent) }
-      ClassSummary(cls, parentOuter.toMap)
-    }
-  }
-
-}
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Summary.scala b/compiler/src/dotty/tools/dotc/transform/init/Summary.scala
deleted file mode 100644
index 1c7a852d4847..000000000000
--- a/compiler/src/dotty/tools/dotc/transform/init/Summary.scala
+++ /dev/null
@@ -1,92 +0,0 @@
-package dotty.tools.dotc
-package transform
-package init
-
-import scala.collection.mutable
-import scala.annotation.targetName
-
-import core._
-import Contexts._
-import Symbols._
-import reporting.trace
-import config.Printers.init
-
-import Potentials._, Effects._, Util._
-
-case class Summary(pots: Potentials, effs: Effects) {
-  def +(summary2: Summary): Summary =
-    Summary(pots ++ summary2.pots, this.effs ++ summary2.effs)
-
-  def +(pot: Potential): Summary =
-    Summary(pots :+ pot, effs)
-
-  def +(eff: Effect): Summary =
-    Summary(pots, effs :+ eff)
-
-  def dropPotentials: Summary =
-    Summary(Potentials.empty, effs)
-
-  @targetName("withPotentials")
-  def ++(pots: Potentials): Summary =
-    Summary(this.pots ++ pots, effs)
-
-  @targetName("withEffects")
-  def ++(effs: Effects): Summary =
-    Summary(pots, this.effs ++ effs)
-
-  def show(using Context): String = {
-    val pots = Potentials.show(this.pots)
-    val effs = Effects.show(this.effs)
-    s"([$pots], [$effs])"
-  }
-}
-
-object Summary {
-  val empty: Summary = Summary(Potentials.empty, Effects.empty)
-
-  def apply(pots: Potentials): Summary = empty ++ pots
-
-  @targetName("withEffects")
-  def apply(effs: Effects): Summary = empty ++ effs
-
-  def apply(pot: Potential): Summary = empty + pot
-
-  def apply(eff: Effect): Summary = empty + eff
-}
-
-/** Summary of class.
-  *
-  *  It makes ObjectPart construction easier with already established raw outer for parents.
-  */
-case class ClassSummary(currentClass: ClassSymbol, parentOuter: Map[ClassSymbol, Potentials]) {
-  private val summaryCache: mutable.Map[Symbol, Summary] = mutable.Map.empty
-
-  def cacheFor(member: Symbol, summary: Summary)(using Context): Unit = {
-    traceIndented("cache for " + member.show + ", summary = " + summary.show, init)
-    assert(member.owner == currentClass, "owner = " + member.owner.show + ", current = " + currentClass.show)
-    summaryCache(member) = summary
-  }
-
-  def summaryOf(member: Symbol)(implicit env: Env): Summary =
-    if (summaryCache.contains(member)) summaryCache(member)
-    else trace("summary for " + member.show, init, s => s.asInstanceOf[Summary].show) {
-      implicit val env2 = env.withOwner(member)
-      val summary =
-        if (member.isConstructor)
-          Summarization.analyzeConstructor(member)
-        else if (member.is(Flags.Method))
-          Summarization.analyzeMethod(member)
-        else // field
-          Summarization.analyzeField(member)
-
-      summaryCache(member) = summary
-      summary
-    }
-
-  def effectsOf(member: Symbol)(implicit env: Env): Effects = summaryOf(member).effs
-  def potentialsOf(member: Symbol)(implicit env: Env): Potentials = summaryOf(member).pots
-
-  def show(using Context): String =
-    "ClassSummary(" + currentClass.name.show +
-      ", parents = " + parentOuter.map { case (k, v) => k.show + "->" + "[" + Potentials.show(v) + "]" }
-}
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Util.scala b/compiler/src/dotty/tools/dotc/transform/init/Util.scala
deleted file mode 100644
index 41d77a8fe608..000000000000
--- a/compiler/src/dotty/tools/dotc/transform/init/Util.scala
+++ /dev/null
@@ -1,41 +0,0 @@
-package dotty.tools.dotc
-package transform
-package init
-
-import core._
-import Contexts._
-import Symbols._
-import config.Printers.Printer
-
-import annotation.tailrec
-
-object Util {
-  def traceIndented(msg: String, printer: Printer)(using Context): Unit =
-    printer.println(s"${ctx.base.indentTab * ctx.base.indent} $msg")
-
-  def traceOp(msg: String, printer: Printer)(op: => Unit)(using Context): Unit = {
-    traceIndented(s"==> ${msg}", printer)
-    op
-    traceIndented(s"<== ${msg}", printer)
-  }
-
-  extension (symbol: Symbol) def hasSource(using Context): Boolean =
-    !symbol.defTree.isEmpty
-
-  def resolve(cls: ClassSymbol, sym: Symbol)(using Context): Symbol =
-    if (sym.isEffectivelyFinal || sym.isConstructor) sym
-    else sym.matchingMember(cls.appliedRef)
-
-  def resolveSuper(cls: ClassSymbol, superCls: ClassSymbol, sym: Symbol)(using Context): Symbol = {
-    // println(s"bases of $cls: " + cls.info.baseClasses)
-    @tailrec def loop(bcs: List[ClassSymbol]): Symbol = bcs match {
-      case bc :: bcs1 =>
-        val cand = sym.matchingDecl(bcs.head, cls.thisType)
-          .suchThat(alt => !alt.is(Flags.Deferred)).symbol
-        if (cand.exists) cand else loop(bcs.tail)
-      case _ =>
-        NoSymbol
-    }
-    loop(cls.info.baseClasses.dropWhile(sym.owner != _))
-  }
-}
\ No newline at end of file
diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
new file mode 100644
index 000000000000..0ba7bd14a9b6
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala
@@ -0,0 +1,287 @@
+package dotty.tools.dotc
+package transform.localopt
+
+import scala.annotation.tailrec
+import scala.collection.mutable.ListBuffer
+import scala.util.chaining.*
+import scala.util.matching.Regex.Match
+
+import java.util.{Calendar, Date, Formattable}
+
+import PartialFunction.cond
+
+import dotty.tools.dotc.ast.tpd.{Match => _, *}
+import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.core.Types._
+import dotty.tools.dotc.core.Phases.typerPhase
+import dotty.tools.dotc.util.Spans.Span
+
+/** Formatter string checker. */
+class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List[Tree])(using Context):
+
+  val argTypes = args.map(_.tpe)
+  val actuals = ListBuffer.empty[Tree]
+
+  // count of args, for checking indexes
+  val argc = argTypes.length
+
+  // Pick the first runtime type which the i'th arg can satisfy.
+  // If conversion is required, implementation must emit it.
+  def argType(argi: Int, types: Type*): Type =
+    require(argi < argc, s"$argi out of range picking from $types")
+    val tpe = argTypes(argi)
+    types.find(t => argConformsTo(argi, tpe, t))
+      .orElse(types.find(t => argConvertsTo(argi, tpe, t)))
+      .getOrElse {
+        report.argError(s"Found: ${tpe.show}, Required: ${types.map(_.show).mkString(", ")}", argi)
+        actuals += args(argi)
+        types.head
+      }
+
+  object formattableTypes:
+    val FormattableType = requiredClassRef("java.util.Formattable")
+    val BigIntType      = requiredClassRef("scala.math.BigInt")
+    val BigDecimalType  = requiredClassRef("scala.math.BigDecimal")
+    val CalendarType    = requiredClassRef("java.util.Calendar")
+    val DateType        = requiredClassRef("java.util.Date")
+  import formattableTypes.*
+  def argConformsTo(argi: Int, arg: Type, target: Type): Boolean = (arg <:< target).tap(if _ then actuals += args(argi))
+  def argConvertsTo(argi: Int, arg: Type, target: Type): Boolean =
+    import typer.Implicits.SearchSuccess
+    atPhase(typerPhase) {
+      ctx.typer.inferView(args(argi), target) match
+        case SearchSuccess(view, ref, _, _) => actuals += view ; true
+        case _ => false
+    }
+
+  // match a conversion specifier
+  val formatPattern = """%(?:(\d+)\$)?([-#+ 0,(<]+)?(\d+)?(\.\d+)?([tT]?[%a-zA-Z])?""".r
+
+  // ordinal is the regex group index in the format pattern
+  enum SpecGroup:
+    case Spec, Index, Flags, Width, Precision, CC
+  import SpecGroup.*
+
+  /** For N part strings and N-1 args to interpolate, normalize parts and check arg types.
+   *
+   *  Returns normalized part strings and args, where args correcpond to conversions in tail of parts.
+   */
+  def checked: (List[String], List[Tree]) =
+    val amended = ListBuffer.empty[String]
+    val convert = ListBuffer.empty[Conversion]
+
+    @tailrec
+    def loop(remaining: List[String], n: Int): Unit =
+      remaining match
+        case part0 :: more =>
+          def badPart(t: Throwable): String = "".tap(_ => report.partError(t.getMessage, index = n, offset = 0))
+          val part = try StringContext.processEscapes(part0) catch badPart
+          val matches = formatPattern.findAllMatchIn(part)
+
+          def insertStringConversion(): Unit =
+            amended += "%s" + part
+            convert += Conversion(formatPattern.findAllMatchIn("%s").next(), n)  // improve
+            argType(n-1, defn.AnyType)
+          def errorLeading(op: Conversion) = op.errorAt(Spec)(s"conversions must follow a splice; ${Conversion.literalHelp}")
+          def accept(op: Conversion): Unit =
+            if !op.isLeading then errorLeading(op)
+            op.accepts(argType(n-1, op.acceptableVariants*))
+            amended += part
+            convert += op
+
+          // after the first part, a leading specifier is required for the interpolated arg; %s is supplied if needed
+          if n == 0 then amended += part
+          else if !matches.hasNext then insertStringConversion()
+          else
+            val cv = Conversion(matches.next(), n)
+            if cv.isLiteral then insertStringConversion()
+            else if cv.isIndexed then
+              if cv.index.getOrElse(-1) == n then accept(cv) else insertStringConversion()
+            else if !cv.isError then accept(cv)
+
+          // any remaining conversions in this part must be either literals or indexed
+          while matches.hasNext do
+            val cv = Conversion(matches.next(), n)
+            if n == 0 && cv.hasFlag('<') then cv.badFlag('<', "No last arg")
+            else if !cv.isLiteral && !cv.isIndexed then errorLeading(cv)
+
+          loop(more, n + 1)
+        case Nil => ()
+    end loop
+
+    loop(parts, n = 0)
+    if reported then (Nil, Nil)
+    else
+      assert(argc == actuals.size, s"Expected ${argc} args but got ${actuals.size} for [${parts.mkString(", ")}]")
+      (amended.toList, actuals.toList)
+  end checked
+
+  extension (descriptor: Match)
+    def at(g: SpecGroup): Int = descriptor.start(g.ordinal)
+    def end(g: SpecGroup): Int = descriptor.end(g.ordinal)
+    def offset(g: SpecGroup, i: Int = 0): Int = at(g) + i
+    def group(g: SpecGroup): Option[String] = Option(descriptor.group(g.ordinal))
+    def stringOf(g: SpecGroup): String = group(g).getOrElse("")
+    def intOf(g: SpecGroup): Option[Int] = group(g).map(_.toInt)
+
+  extension (inline value: Boolean)
+    inline def or(inline body: => Unit): Boolean     = value || { body ; false }
+    inline def orElse(inline body: => Unit): Boolean = value || { body ; true }
+    inline def and(inline body: => Unit): Boolean    = value && { body ; true }
+    inline def but(inline body: => Unit): Boolean    = value && { body ; false }
+
+  enum Kind:
+    case StringXn, HashXn, BooleanXn, CharacterXn, IntegralXn, FloatingPointXn, DateTimeXn, LiteralXn, ErrorXn
+  import Kind.*
+
+  /** A conversion specifier matched in the argi'th string part, with `argc` arguments to interpolate.
+   */
+  final class Conversion(val descriptor: Match, val argi: Int, val kind: Kind):
+    // the descriptor fields
+    val index: Option[Int]     = descriptor.intOf(Index)
+    val flags: String          = descriptor.stringOf(Flags)
+    val width: Option[Int]     = descriptor.intOf(Width)
+    val precision: Option[Int] = descriptor.group(Precision).map(_.drop(1).toInt)
+    val op: String             = descriptor.stringOf(CC)
+
+    // the conversion char is the head of the op string (but see DateTimeXn)
+    val cc: Char =
+      kind match
+        case ErrorXn => if op.isEmpty then '?' else op(0)
+        case DateTimeXn => if op.length > 1 then op(1) else '?'
+        case _ => op(0)
+
+    def isIndexed: Boolean = index.nonEmpty || hasFlag('<')
+    def isError: Boolean   = kind == ErrorXn
+    def isLiteral: Boolean = kind == LiteralXn
+
+    // descriptor is at index 0 of the part string
+    def isLeading: Boolean = descriptor.at(Spec) == 0
+
+    // true if passes.
+    def verify: Boolean =
+      // various assertions
+      def goodies = goodFlags && goodIndex
+      def noFlags = flags.isEmpty or errorAt(Flags)("flags not allowed")
+      def noWidth = width.isEmpty or errorAt(Width)("width not allowed")
+      def noPrecision = precision.isEmpty or errorAt(Precision)("precision not allowed")
+      def only_-(msg: String) =
+        val badFlags = flags.filterNot { case '-' | '<' => true case _ => false }
+        badFlags.isEmpty or badFlag(badFlags(0), s"Only '-' allowed for $msg")
+      def goodFlags =
+        val badFlags = flags.filterNot(okFlags.contains)
+        for f <- badFlags do badFlag(f, s"Illegal flag '$f'")
+        badFlags.isEmpty
+      def goodIndex =
+        if index.nonEmpty && hasFlag('<') then warningAt(Index)("Argument index ignored if '<' flag is present")
+        val okRange = index.map(i => i > 0 && i <= argc).getOrElse(true)
+        okRange || hasFlag('<') or errorAt(Index)("Argument index out of range")
+    // begin verify
+      kind match
+        case StringXn        => goodies
+        case BooleanXn       => goodies
+        case HashXn          => goodies
+        case CharacterXn     => goodies && noPrecision && only_-("c conversion")
+        case IntegralXn      =>
+          def d_# = cc == 'd' && hasFlag('#') and badFlag('#', "# not allowed for d conversion")
+          def x_comma = cc != 'd' && hasFlag(',') and badFlag(',', "',' only allowed for d conversion of integral types")
+          goodies && noPrecision && !d_# && !x_comma
+        case FloatingPointXn =>
+          goodies && (cc match
+            case 'a' | 'A' =>
+              val badFlags = ",(".filter(hasFlag)
+              noPrecision && badFlags.isEmpty or badFlags.foreach(badf => badFlag(badf, s"'$badf' not allowed for a, A"))
+            case _ => true
+          )
+        case DateTimeXn      =>
+          def hasCC = op.length == 2 or errorAt(CC)("Date/time conversion must have two characters")
+          def goodCC = "HIklMSLNpzZsQBbhAaCYyjmdeRTrDFc".contains(cc) or errorAt(CC, 1)(s"'$cc' doesn't seem to be a date or time conversion")
+          goodies && hasCC && goodCC && noPrecision && only_-("date/time conversions")
+        case LiteralXn       =>
+          op match
+            case "%" => goodies && noPrecision and width.foreach(_ => warningAt(Width)("width ignored on literal"))
+            case "n" => noFlags && noWidth && noPrecision
+        case ErrorXn         =>
+          errorAt(CC)(s"illegal conversion character '$cc'")
+          false
+    end verify
+
+    // is the specifier OK with the given arg
+    def accepts(arg: Type): Boolean =
+      kind match
+        case BooleanXn  => arg == defn.BooleanType orElse warningAt(CC)("Boolean format is null test for non-Boolean")
+        case IntegralXn =>
+          arg == BigIntType || !cond(cc) {
+            case 'o' | 'x' | 'X' if hasAnyFlag("+ (") => "+ (".filter(hasFlag).foreach(bad => badFlag(bad, s"only use '$bad' for BigInt conversions to o, x, X")) ; true
+          }
+        case _ => true
+
+    // what arg type if any does the conversion accept
+    def acceptableVariants: List[Type] =
+      kind match
+        case StringXn        => if hasFlag('#') then FormattableType :: Nil else defn.AnyType :: Nil
+        case BooleanXn       => defn.BooleanType :: defn.NullType :: Nil
+        case HashXn          => defn.AnyType :: Nil
+        case CharacterXn     => defn.CharType :: defn.ByteType :: defn.ShortType :: defn.IntType :: Nil
+        case IntegralXn      => defn.IntType :: defn.LongType :: defn.ByteType :: defn.ShortType :: BigIntType :: Nil
+        case FloatingPointXn => defn.DoubleType :: defn.FloatType :: BigDecimalType :: Nil
+        case DateTimeXn      => defn.LongType :: CalendarType :: DateType :: Nil
+        case LiteralXn       => Nil
+        case ErrorXn         => Nil
+
+    // what flags does the conversion accept?
+    private def okFlags: String =
+      kind match
+        case StringXn => "-#<"
+        case BooleanXn | HashXn => "-<"
+        case LiteralXn => "-"
+        case _ => "-#+ 0,(<"
+
+    def hasFlag(f: Char) = flags.contains(f)
+    def hasAnyFlag(fs: String) = fs.exists(hasFlag)
+
+    def badFlag(f: Char, msg: String) =
+      val i = flags.indexOf(f) match { case -1 => 0 case j => j }
+      errorAt(Flags, i)(msg)
+
+    def errorAt(g: SpecGroup, i: Int = 0)(msg: String)   = report.partError(msg, argi, descriptor.offset(g, i), descriptor.end(g))
+    def warningAt(g: SpecGroup, i: Int = 0)(msg: String) = report.partWarning(msg, argi, descriptor.offset(g, i), descriptor.end(g))
+
+  object Conversion:
+    def apply(m: Match, i: Int): Conversion =
+      def kindOf(cc: Char) = cc match
+        case 's' | 'S' => StringXn
+        case 'h' | 'H' => HashXn
+        case 'b' | 'B' => BooleanXn
+        case 'c' | 'C' => CharacterXn
+        case 'd' | 'o' |
+             'x' | 'X' => IntegralXn
+        case 'e' | 'E' |
+             'f' |
+             'g' | 'G' |
+             'a' | 'A' => FloatingPointXn
+        case 't' | 'T' => DateTimeXn
+        case '%' | 'n' => LiteralXn
+        case _         => ErrorXn
+      end kindOf
+      m.group(CC) match
+        case Some(cc) => new Conversion(m, i, kindOf(cc(0))).tap(_.verify)
+        case None     => new Conversion(m, i, ErrorXn).tap(_.errorAt(Spec)(s"Missing conversion operator in '${m.matched}'; $literalHelp"))
+    end apply
+    val literalHelp = "use %% for literal %, %n for newline"
+  end Conversion
+
+  var reported = false
+
+  private def partPosAt(index: Int, offset: Int, end: Int) =
+    val pos = partsElems(index).sourcePos
+    val bgn = pos.span.start + offset
+    val fin = if end < 0 then pos.span.end else pos.span.start + end
+    pos.withSpan(Span(bgn, fin, bgn))
+
+  extension (r: report.type)
+    def argError(message: String, index: Int): Unit = r.error(message, args(index).srcPos).tap(_ => reported = true)
+    def partError(message: String, index: Int, offset: Int, end: Int = -1): Unit = r.error(message, partPosAt(index, offset, end)).tap(_ => reported = true)
+    def partWarning(message: String, index: Int, offset: Int, end: Int = -1): Unit = r.warning(message, partPosAt(index, offset, end)).tap(_ => reported = true)
+end TypedFormatChecker
diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala
new file mode 100644
index 000000000000..79d94c26c692
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala
@@ -0,0 +1,39 @@
+package dotty.tools.dotc
+package transform.localopt
+
+import dotty.tools.dotc.ast.tpd.*
+import dotty.tools.dotc.core.Constants.Constant
+import dotty.tools.dotc.core.Contexts.*
+
+object FormatInterpolatorTransform:
+
+  /** For f"${arg}%xpart", check format conversions and return (format, args)
+   *  suitable for String.format(format, args).
+   */
+  def checked(fun: Tree, args0: Tree)(using Context): (Tree, Tree) =
+    val (partsExpr, parts) = fun match
+      case TypeApply(Select(Apply(_, (parts: SeqLiteral) :: Nil), _), _) =>
+        (parts.elems, parts.elems.map { case Literal(Constant(s: String)) => s })
+      case _ =>
+        report.error("Expected statically known StringContext", fun.srcPos)
+        (Nil, Nil)
+    val (args, elemtpt) = args0 match
+      case seqlit: SeqLiteral => (seqlit.elems, seqlit.elemtpt)
+      case _ =>
+        report.error("Expected statically known argument list", args0.srcPos)
+        (Nil, EmptyTree)
+
+    def literally(s: String) = Literal(Constant(s))
+    if parts.lengthIs != args.length + 1 then
+      val badParts =
+        if parts.isEmpty then "there are no parts"
+        else s"too ${if parts.lengthIs > args.length + 1 then "few" else "many"} arguments for interpolated string"
+      report.error(badParts, fun.srcPos)
+      (literally(""), args0)
+    else
+      val checker = TypedFormatChecker(partsExpr, parts, args)
+      val (format, formatArgs) = checker.checked
+      if format.isEmpty then (literally(parts.mkString), args0)
+      else (literally(format.mkString), SeqLiteral(formatArgs.toList, elemtpt))
+  end checked
+end FormatInterpolatorTransform
diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/StringContextChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/StringContextChecker.scala
deleted file mode 100644
index fbd09f43b853..000000000000
--- a/compiler/src/dotty/tools/dotc/transform/localopt/StringContextChecker.scala
+++ /dev/null
@@ -1,714 +0,0 @@
-package dotty.tools.dotc
-package transform.localopt
-
-import dotty.tools.dotc.ast.Trees._
-import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Decorators._
-import dotty.tools.dotc.core.Constants.Constant
-import dotty.tools.dotc.core.Contexts._
-import dotty.tools.dotc.core.StdNames._
-import dotty.tools.dotc.core.NameKinds._
-import dotty.tools.dotc.core.Symbols._
-import dotty.tools.dotc.core.Types._
-
-// Ported from old dotty.internal.StringContextMacro
-// TODO: port Scala 2 logic? (see https://github.com/scala/scala/blob/2.13.x/src/compiler/scala/tools/reflect/FormatInterpolator.scala#L74)
-object StringContextChecker {
-  import tpd._
-
-  /** This trait defines a tool to report errors/warnings that do not depend on Position. */
-  trait InterpolationReporter {
-
-    /** Reports error/warning of size 1 linked with a part of the StringContext.
-      *
-      * @param message the message to report as error/warning
-      * @param index the index of the part inside the list of parts of the StringContext
-      * @param offset the index in the part String where the error is
-      * @return an error/warning depending on the function
-      */
-    def partError(message : String, index : Int, offset : Int) : Unit
-    def partWarning(message : String, index : Int, offset : Int) : Unit
-
-    /** Reports error linked with an argument to format.
-      *
-      * @param message the message to report as error/warning
-      * @param index the index of the argument inside the list of arguments of the format function
-      * @return an error depending on the function
-      */
-    def argError(message : String, index : Int) : Unit
-
-    /** Reports error linked with the list of arguments or the StringContext.
-      *
-      * @param message the message to report in the error
-      * @return an error
-      */
-    def strCtxError(message : String) : Unit
-    def argsError(message : String) : Unit
-
-    /** Claims whether an error or a warning has been reported
-      *
-      * @return true if an error/warning has been reported, false
-      */
-    def hasReported() : Boolean
-
-    /** Stores the old value of the reported and reset it to false */
-    def resetReported() : Unit
-
-    /** Restores the value of the reported boolean that has been reset */
-    def restoreReported() : Unit
-  }
-
-  /** Check the format of the parts of the f".." arguments and returns the string parts of the StringContext */
-  def checkedParts(strContext_f: Tree, args0: Tree)(using Context): String = {
-
-    val (partsExpr, parts) = strContext_f match {
-      case TypeApply(Select(Apply(_, (parts: SeqLiteral) :: Nil), _), _) =>
-        (parts.elems, parts.elems.map { case Literal(Constant(str: String)) => str } )
-      case _ =>
-        report.error("Expected statically known String Context", strContext_f.srcPos)
-        return ""
-    }
-
-    val args = args0 match {
-      case args: SeqLiteral => args.elems
-      case _ =>
-        report.error("Expected statically known argument list", args0.srcPos)
-        return ""
-    }
-
-    val reporter = new InterpolationReporter{
-      private[this] var reported = false
-      private[this] var oldReported = false
-      def partError(message : String, index : Int, offset : Int) : Unit = {
-        reported = true
-        val pos = partsExpr(index).sourcePos
-        val posOffset = pos.withSpan(pos.span.shift(offset))
-        report.error(message, posOffset)
-      }
-      def partWarning(message : String, index : Int, offset : Int) : Unit = {
-        reported = true
-        val pos = partsExpr(index).sourcePos
-        val posOffset = pos.withSpan(pos.span.shift(offset))
-        report.warning(message, posOffset)
-      }
-
-      def argError(message : String, index : Int) : Unit = {
-        reported = true
-        report.error(message, args(index).srcPos)
-      }
-
-      def strCtxError(message : String) : Unit = {
-        reported = true
-        report.error(message, strContext_f.srcPos)
-      }
-      def argsError(message : String) : Unit = {
-        reported = true
-        report.error(message, args0.srcPos)
-      }
-
-      def hasReported() : Boolean = {
-        reported
-      }
-
-      def resetReported() : Unit = {
-        oldReported = reported
-        reported = false
-      }
-
-      def restoreReported() : Unit = {
-        reported = oldReported
-      }
-    }
-
-    checked(parts, args, reporter)
-  }
-
-  def checked(parts0: List[String], args: List[Tree], reporter: InterpolationReporter)(using Context): String = {
-
-
-    /** Checks if the number of arguments are the same as the number of formatting strings
-     *
-     *  @param format the number of formatting parts in the StringContext
-     *  @param argument the number of arguments to interpolate in the string
-     *  @return reports an error if the number of arguments does not match with the number of formatting strings,
-     *  nothing otherwise
-     */
-    def checkSizes(format : Int, argument : Int) : Unit = {
-      if (format > argument && !(format == -1 && argument == 0))
-        if (argument == 0)
-          reporter.argsError("too few arguments for interpolated string")
-        else
-          reporter.argError("too few arguments for interpolated string", argument - 1)
-      if (format < argument && !(format == -1 && argument == 0))
-        if (argument == 0)
-          reporter.argsError("too many arguments for interpolated string")
-        else
-          reporter.argError("too many arguments for interpolated string", format)
-      if (format == -1)
-        reporter.strCtxError("there are no parts")
-    }
-
-    /** Adds the default "%s" to the Strings that do not have any given format
-     *
-     *  @param parts the list of parts contained in the StringContext
-     *  @return a new list of string with all a defined formatting or reports an error if the '%' and
-     *  formatting parameter are too far away from the argument that they refer to
-     *  For example : f2"${d}random-leading-junk%d" will lead to an error
-     */
-    def addDefaultFormat(parts : List[String]) : List[String] = parts match {
-      case Nil => Nil
-      case p :: parts1 => p :: parts1.map((part : String) => {
-        if (!part.startsWith("%")) {
-          val index = part.indexOf('%')
-          if (!reporter.hasReported() && index != -1) {
-            reporter.partError("conversions must follow a splice; use %% for literal %, %n for newline", parts.indexOf(part), index)
-            "%s" + part
-          } else "%s" + part
-        } else part
-      })
-    }
-
-    /** Checks whether a part contains a formatting substring
-     *
-     *  @param part the part to check
-     *  @param l the length of the given part
-     *  @param index the index where to start to look for a potential new formatting string
-     *  @return an Option containing the index in the part where a new formatting String starts, None otherwise
-     */
-    def getFormattingSubstring(part : String, l : Int, index : Int) : Option[Int] = {
-      var i = index
-      var result : Option[Int] = None
-      while (i < l){
-        if (part.charAt(i) == '%' && result.isEmpty)
-          result = Some(i)
-        i += 1
-      }
-      result
-    }
-
-    /** Finds all the flags that are inside a formatting String from a given index
-     *
-     *  @param i the index in the String s where to start to check
-     *  @param l the length of s
-     *  @param s the String to check
-     *  @return a list containing all the flags that are inside the formatting String,
-     *  and their index in the String
-     */
-    def getFlags(i : Int, l : Int, s : String) : List[(Char, Int)] = {
-      def isFlag(c : Char) : Boolean = c match {
-        case '-' | '#' | '+' | ' ' | '0' | ',' | '(' => true
-        case _ => false
-      }
-      if (i < l && isFlag(s.charAt(i))) (s.charAt(i), i) :: getFlags(i + 1, l, s)
-      else Nil
-    }
-
-    /** Skips the Characters that are width or argumentIndex parameters
-     *
-     *  @param i the index where to start checking in the given String
-     *  @param s the String to check
-     *  @param l the length of s
-     *  @return a tuple containing the index in the String after skipping
-     *  the parameters, true if it has a width parameter and its value, false otherwise
-     */
-    def skipWidth(i : Int, s : String, l : Int) = {
-      var j = i
-      var width = (false, 0)
-      while (j < l && Character.isDigit(s.charAt(j))){
-        width = (true, j)
-        j += 1
-      }
-      (j, width._1, width._2)
-    }
-
-    /** Retrieves all the formatting parameters from a part and their index in it
-     *
-     *  @param part the String containing the formatting parameters
-     *  @param argIndex the index of the current argument inside the list of arguments to interpolate
-     *  @param partIndex the index of the current part inside the list of parts in the StringContext
-     *  @param noArg true if there is no arg, i.e. "%%" or "%n"
-     *  @param pos the initial index where to start checking the part
-     *  @return reports an error if any of the size of the arguments and the parts do not match or if a conversion
-     *  parameter is missing. Otherwise,
-     *  the index where the format specifier substring is,
-     *  hasArgumentIndex (true and the index of its corresponding argumentIndex if there is an argument index, false and 0 otherwise) and
-     *  flags that contains the list of flags (empty if there is none),
-     *  hasWidth (true and the index of the width parameter if there is a width, false and 0 otherwise),
-     *  hasPrecision (true and the index of the precision if there is a precision, false and 0 otherwise),
-     *  hasRelative (true if the specifiers use relative indexing, false otherwise) and
-     *  conversion character index
-     */
-    def getFormatSpecifiers(part : String, argIndex : Int, partIndex : Int, noArg : Boolean, pos : Int) : (Boolean, Int, List[(Char, Int)], Boolean, Int, Boolean, Int, Boolean, Int, Int) = {
-      var conversion = pos
-      var hasArgumentIndex = false
-      var argumentIndex = pos
-      var hasPrecision = false
-      var precision = pos
-      val l = part.length
-
-      if (l >= 1 && part.charAt(conversion) == '%')
-        conversion += 1
-      else if (!noArg)
-        reporter.argError("too many arguments for interpolated string", argIndex)
-
-      //argument index or width
-      val (i, hasWidth1, width1) = skipWidth(conversion, part, l)
-      conversion = i
-
-      //argument index
-      if (conversion < l && part.charAt(conversion) == '$'){
-        if (hasWidth1){
-          hasArgumentIndex = true
-          argumentIndex = width1
-          conversion += 1
-        } else {
-          reporter.partError("Missing conversion operator in '" + part.substring(0, conversion) + "'; use %% for literal %, %n for newline", partIndex, 0)
-        }
-      }
-
-      //relative indexing
-      val hasRelative = conversion < l && part.charAt(conversion) == '<'
-      val relativeIndex = conversion
-      if (hasRelative)
-        conversion += 1
-
-      //flags
-      val flags = getFlags(conversion, l, part)
-      conversion += flags.size
-
-      //width
-      val (j, hasWidth2, width2) = skipWidth(conversion, part, l)
-      conversion = j
-
-      //precision
-      if (conversion < l && part.charAt(conversion) == '.') {
-        precision = conversion
-        conversion += 1
-        hasPrecision = true
-        val oldConversion = conversion
-        while (conversion < l && Character.isDigit(part.charAt(conversion))) {
-          conversion += 1
-        }
-        if (oldConversion == conversion) {
-          reporter.partError("Missing conversion operator in '" + part.substring(pos, oldConversion - 1) + "'; use %% for literal %, %n for newline", partIndex, pos)
-          hasPrecision = false
-        }
-      }
-
-      //conversion
-      if((conversion >= l || (!part.charAt(conversion).isLetter && part.charAt(conversion) != '%')) && !reporter.hasReported())
-        reporter.partError("Missing conversion operator in '" + part.substring(pos, conversion) + "'; use %% for literal %, %n for newline", partIndex, pos)
-
-      val hasWidth = (hasWidth1 && !hasArgumentIndex) || hasWidth2
-      val width = if (hasWidth1 && !hasArgumentIndex) width1 else width2
-      (hasArgumentIndex, argumentIndex, flags, hasWidth, width, hasPrecision, precision, hasRelative, relativeIndex, conversion)
-    }
-
-    /** Checks if a given type is a subtype of any of the possibilities
-     *
-     *  @param actualType the given type
-     *  @param expectedType the type we are expecting
-     *  @param argIndex the index of the argument that should type check
-     *  @param possibilities all the types within which we want to find a super type of the actualType
-     *  @return reports a type mismatch error if the actual type is not a subtype of any of the possibilities,
-     *  nothing otherwise
-     */
-    def checkSubtype(actualType: Type, expectedType: String, argIndex: Int, possibilities: List[Type]) = {
-      if !possibilities.exists(actualType <:< _) then
-        reporter.argError("type mismatch;\n found   : " + actualType.widen.show.stripPrefix("scala.Predef.").stripPrefix("java.lang.").stripPrefix("scala.") + "\n required: " + expectedType, argIndex)
-    }
-
-    /** Checks whether a given argument index, relative or not, is in the correct bounds
-     *
-     *  @param partIndex the index of the part we are checking
-     *  @param offset the index in the part where there might be an error
-     *  @param relative true if relative indexing is used, false otherwise
-     *  @param argumentIndex the argument index parameter in the formatting String
-     *  @param expected true if we have an expectedArgumentIndex, false otherwise
-     *  @param expectedArgumentIndex the expected argument index parameter
-     *  @param maxArgumentIndex the maximum argument index parameter that can be used
-     *  @return reports a warning if relative indexing is used but an argument is still given,
-     *  an error is the argument index is not in the bounds [1, number of arguments]
-     */
-    def checkArgumentIndex(partIndex : Int, offset : Int, relative : Boolean, argumentIndex : Int, expected : Boolean, expectedArgumentIndex : Int, maxArgumentIndex : Int) = {
-      if (relative)
-        reporter.partWarning("Argument index ignored if '<' flag is present", partIndex, offset)
-
-      if (argumentIndex > maxArgumentIndex || argumentIndex <= 0)
-        reporter.partError("Argument index out of range", partIndex, offset)
-
-      if (expected && expectedArgumentIndex != argumentIndex && !reporter.hasReported())
-        reporter.partWarning("Index is not this arg", partIndex, offset)
-    }
-
-    /** Checks if a parameter is specified whereas it is not allowed
-     *
-     *  @param hasParameter true if parameter is specified, false otherwise
-     *  @param partIndex the index of the part inside the parts
-     *  @param offset the index in the part where to report an error
-     *  @param parameter the parameter that is not allowed
-     *  @return reports an error if hasParameter is true, nothing otherwise
-     */
-    def checkNotAllowedParameter(hasParameter : Boolean, partIndex : Int, offset : Int, parameter : String) = {
-      if (hasParameter)
-        reporter.partError(parameter + " not allowed", partIndex, offset)
-    }
-
-    /** Checks if the flags are allowed for the conversion
-     *
-     *  @param partIndex the index of the part in the String Context
-     *  @param flags the specified flags to check
-     *  @param notAllowedFlagsOnCondition a list that maps which flags are allowed depending on the conversion Char
-     *  @return reports an error if the flag is not allowed, nothing otherwise
-     */
-    def checkFlags(partIndex : Int, flags : List[(Char, Int)], notAllowedFlagOnCondition: List[(Char, Boolean, String)]) = {
-      for {flag <- flags ; (nonAllowedFlag, condition, message) <- notAllowedFlagOnCondition ; if (flag._1 == nonAllowedFlag && condition)}
-        reporter.partError(message, partIndex, flag._2)
-    }
-
-    /** Checks if the flags are allowed for the conversion
-     *
-     *  @param partIndex the index of the part in the String Context
-     *  @param flags the specified flags to check
-     *  @param notAllowedFlagsOnCondition a list that maps which flags are allowed depending on the conversion Char
-     *  @return reports an error only once if at least one of the flags is not allowed, nothing otherwise
-     */
-    def checkUniqueFlags(partIndex : Int, flags : List[(Char, Int)], notAllowedFlagOnCondition : List[(Char, Boolean, String)]) = {
-      reporter.resetReported()
-      for {flag <- flags ; (nonAllowedFlag, condition, message) <- notAllowedFlagOnCondition ; if (flag._1 == nonAllowedFlag && condition)} {
-        if (!reporter.hasReported())
-          reporter.partError(message, partIndex, flag._2)
-      }
-      if (!reporter.hasReported())
-        reporter.restoreReported()
-    }
-
-    /** Checks all the formatting parameters for a Character conversion
-     *
-     *  @param partIndex the index of the part, that we are checking, inside the parts
-     *  @param flags the flags parameters inside the formatting part
-     *  @param hasPrecision true if precision parameter is specified, false otherwise
-     *  @param precision the index of the precision parameter inside the part
-     *  @return reports an error
-     *  if precision is specified or if the used flags are different from '-'
-     */
-    def checkCharacterConversion(partIndex : Int, flags : List[(Char, Int)], hasPrecision : Boolean, precisionIndex : Int) = {
-      val notAllowedFlagOnCondition = for (flag <- List('#', '+', ' ', '0', ',', '(')) yield (flag, true, "Only '-' allowed for c conversion")
-      checkUniqueFlags(partIndex, flags, notAllowedFlagOnCondition)
-      checkNotAllowedParameter(hasPrecision, partIndex, precisionIndex, "precision")
-    }
-
-    /** Checks all the formatting parameters for an Integral conversion
-     *
-     *  @param partIndex the index of the part, that we are checking, inside the parts
-     *  @param argType the type of the argument matching with the given part
-     *  @param conversionChar the Char used for the formatting conversion
-     *  @param flags the flags parameters inside the formatting part
-     *  @param hasPrecision true if precision parameter is specified, false otherwise
-     *  @param precision the index of the precision parameter inside the part
-     *  @return reports an error
-     *  if precision is specified or if the used flags are not allowed :
-     *  ’d’: only ’#’ is allowed,
-     *  ’o’, ’x’, ’X’: ’-’, ’#’, ’0’ are always allowed, depending on the type, this will be checked in the type check step
-     */
-    def checkIntegralConversion(partIndex : Int, argType : Option[Type], conversionChar : Char, flags : List[(Char, Int)], hasPrecision : Boolean, precision : Int) = {
-      if (conversionChar == 'd')
-        checkFlags(partIndex, flags, List(('#', true,  "# not allowed for d conversion")))
-
-      checkNotAllowedParameter(hasPrecision, partIndex, precision, "precision")
-    }
-
-    /** Checks all the formatting parameters for a Floating Point conversion
-     *
-     *  @param partIndex the index of the part, that we are checking, inside the parts
-     *  @param conversionChar the Char used for the formatting conversion
-     *  @param flags the flags parameters inside the formatting part
-     *  @param hasPrecision true if precision parameter is specified, false otherwise
-     *  @param precision the index of the precision parameter inside the part
-     *  @return reports an error
-     *  if precision is specified for 'a', 'A' conversion or if the used flags are '(' and ',' for 'a', 'A'
-     */
-    def checkFloatingPointConversion(partIndex: Int, conversionChar : Char, flags : List[(Char, Int)], hasPrecision : Boolean, precision : Int) = {
-      if(conversionChar == 'a' || conversionChar == 'A'){
-        for {flag <- flags ; if (flag._1 == ',' || flag._1 == '(')}
-          reporter.partError("'" + flag._1 + "' not allowed for a, A", partIndex, flag._2)
-        checkNotAllowedParameter(hasPrecision, partIndex, precision, "precision")
-      }
-    }
-
-    /** Checks all the formatting parameters for a Time conversion
-     *
-     *  @param partIndex the index of the part, that we are checking, inside the parts
-     *  @param part the part that we are checking
-     *  @param conversionIndex the index of the conversion Char used in the part
-     *  @param flags the flags parameters inside the formatting part
-     *  @param hasPrecision true if precision parameter is specified, false otherwise
-     *  @param precision the index of the precision parameter inside the part
-     *  @return reports an error
-     *  if precision is specified, if the time suffix is not given/incorrect or if the used flags are
-     *  different from '-'
-     */
-    def checkTimeConversion(partIndex : Int, part : String, conversionIndex : Int, flags : List[(Char, Int)], hasPrecision : Boolean, precision : Int) = {
-      /** Checks whether a time suffix is given and whether it is allowed
-       *
-       *  @param part the part that we are checking
-       *  @param partIndex the index of the part inside of the parts of the StringContext
-       *  @param conversionIndex the index of the conversion Char inside the part
-       *  @param return reports an error if no suffix is specified or if the given suffix is not
-       *  part of the allowed ones
-       */
-      def checkTime(part : String, partIndex : Int, conversionIndex : Int) : Unit = {
-        if (conversionIndex + 1 >= part.size)
-          reporter.partError("Date/time conversion must have two characters", partIndex, conversionIndex)
-        else {
-          part.charAt(conversionIndex + 1) match {
-            case 'H' | 'I' | 'k' | 'l' | 'M' | 'S' | 'L' | 'N' | 'p' | 'z' | 'Z' | 's' | 'Q' => //times
-            case 'B' | 'b' | 'h' | 'A' | 'a' | 'C' | 'Y' | 'y' | 'j' | 'm' | 'd' | 'e' => //dates
-            case 'R' | 'T' | 'r' | 'D' | 'F' | 'c' => //dates and times
-            case c => reporter.partError("'" + c + "' doesn't seem to be a date or time conversion", partIndex, conversionIndex + 1)
-          }
-        }
-      }
-
-      val notAllowedFlagOnCondition = for (flag <- List('#', '+', ' ', '0', ',', '(')) yield (flag, true, "Only '-' allowed for date/time conversions")
-      checkUniqueFlags(partIndex, flags, notAllowedFlagOnCondition)
-      checkNotAllowedParameter(hasPrecision, partIndex, precision, "precision")
-      checkTime(part, partIndex, conversionIndex)
-    }
-
-    /** Checks all the formatting parameters for a General conversion
-     *
-     *  @param partIndex the index of the part, that we are checking, inside the parts
-     *  @param argType the type of the argument matching with the given part
-     *  @param conversionChar the Char used for the formatting conversion
-     *  @param flags the flags parameters inside the formatting part
-     *  @return reports an error
-     *  if '#' flag is used or if any other flag is used
-     */
-    def checkGeneralConversion(partIndex : Int, argType : Option[Type], conversionChar : Char, flags : List[(Char, Int)]) = {
-      for {flag <- flags ; if (flag._1 != '-' && flag._1 != '#')}
-        reporter.partError("Illegal flag '" + flag._1 + "'", partIndex, flag._2)
-    }
-
-    /** Checks all the formatting parameters for a special Char such as '%' and end of line
-     *
-     *  @param partIndex the index of the part, that we are checking, inside the parts
-     *  @param conversionChar the Char used for the formatting conversion
-     *  @param hasPrecision true if precision parameter is specified, false otherwise
-     *  @param precision the index of the precision parameter inside the part
-     *  @param hasWidth true if width parameter is specified, false otherwise
-     *  @param width the index of the width parameter inside the part
-     *  @return reports an error if precision or width is specified for '%' or
-     *  if precision is specified for end of line
-     */
-    def checkSpecials(partIndex : Int, conversionChar : Char, hasPrecision : Boolean, precision : Int, hasWidth : Boolean, width : Int, flags : List[(Char, Int)]) = conversionChar match {
-      case 'n' => {
-        checkNotAllowedParameter(hasPrecision, partIndex, precision, "precision")
-        checkNotAllowedParameter(hasWidth, partIndex, width, "width")
-        val notAllowedFlagOnCondition = for (flag <- List('-', '#', '+', ' ', '0', ',', '(')) yield (flag, true, "flags not allowed")
-        checkUniqueFlags(partIndex, flags, notAllowedFlagOnCondition)
-      }
-      case '%' => {
-        checkNotAllowedParameter(hasPrecision, partIndex, precision, "precision")
-        val notAllowedFlagOnCondition = for (flag <- List('#', '+', ' ', '0', ',', '(')) yield (flag, true, "Illegal flag '" + flag + "'")
-        checkFlags(partIndex, flags, notAllowedFlagOnCondition)
-      }
-      case _ => // OK
-    }
-
-    /** Checks whether the format specifiers are correct depending on the conversion parameter
-     *
-     *  @param partIndex the index of the part, that we are checking, inside the parts
-     *  @param part the part to check
-     *  The rest of the inputs correspond to the output of the function getFormatSpecifiers
-     *  @param hasArgumentIndex
-     *  @param actualArgumentIndex
-     *  @param expectedArgumentIndex
-     *  @param firstFormattingSubstring true if it is the first in the list, i.e. not an indexed argument
-     *  @param maxArgumentIndex
-     *  @param hasRelative
-     *  @param hasWidth
-     *  @param hasPrecision
-     *  @param precision
-     *  @param flags
-     *  @param conversion
-     *  @param argType
-     *  @return the argument index and its type if there is an argument, the flags and the conversion parameter
-     *  reports an error/warning if the formatting parameters are not allowed/wrong, nothing otherwise
-     */
-    def checkFormatSpecifiers(partIndex : Int, hasArgumentIndex : Boolean, actualArgumentIndex : Int, expectedArgumentIndex : Option[Int], firstFormattingSubstring : Boolean, maxArgumentIndex : Option[Int],
-      hasRelative : Boolean, hasWidth : Boolean, width : Int, hasPrecision : Boolean, precision : Int, flags : List[(Char, Int)], conversion : Int, argType : Option[Type], part : String) : (Option[(Type, Int)], Char, List[(Char, Int)])= {
-      val conversionChar = part.charAt(conversion)
-
-      if (hasArgumentIndex && expectedArgumentIndex.nonEmpty && maxArgumentIndex.nonEmpty && firstFormattingSubstring)
-        checkArgumentIndex(partIndex, actualArgumentIndex, hasRelative, part.charAt(actualArgumentIndex).asDigit, true, expectedArgumentIndex.get, maxArgumentIndex.get)
-      else if(hasArgumentIndex && maxArgumentIndex.nonEmpty && !firstFormattingSubstring)
-        checkArgumentIndex(partIndex, actualArgumentIndex, hasRelative, part.charAt(actualArgumentIndex).asDigit, false, 0, maxArgumentIndex.get)
-
-      conversionChar match {
-        case 'c' | 'C' => checkCharacterConversion(partIndex, flags, hasPrecision, precision)
-        case 'd' | 'o' | 'x' | 'X' => checkIntegralConversion(partIndex, argType, conversionChar, flags, hasPrecision, precision)
-        case 'e' | 'E' |'f' | 'g' | 'G' | 'a' | 'A' => checkFloatingPointConversion(partIndex, conversionChar, flags, hasPrecision, precision)
-        case 't' | 'T' => checkTimeConversion(partIndex, part, conversion, flags, hasPrecision, precision)
-        case 'b' | 'B' | 'h' | 'H' | 'S' | 's' => checkGeneralConversion(partIndex, argType, conversionChar, flags)
-        case 'n' | '%' => checkSpecials(partIndex, conversionChar, hasPrecision, precision, hasWidth, width, flags)
-        case illegal => reporter.partError("illegal conversion character '" + illegal + "'", partIndex, conversion)
-      }
-
-      (if (argType.isEmpty) None else Some(argType.get, (partIndex - 1)), conversionChar, flags)
-    }
-
-    /** Checks whether the argument type, if there is one, type checks with the formatting parameters
-     *
-     *  @param partIndex the index of the part, that we are checking, inside the parts
-     *  @param conversionChar the character used for the conversion
-     *  @param argument an option containing the type and index of the argument, None if there is no argument
-     *  @param flags the flags used for the formatting
-     *  @param formattingStart the index in the part where the formatting substring starts, i.e. where the '%' is
-     *  @return reports an error/warning if the formatting parameters are not allowed/wrong depending on the type, nothing otherwise
-     */
-    def checkArgTypeWithConversion(partIndex : Int, conversionChar : Char, argument : Option[(Type, Int)], flags : List[(Char, Int)], formattingStart : Int) = {
-      if (argument.nonEmpty)
-        checkTypeWithArgs(argument.get, conversionChar, partIndex, flags)
-      else
-        checkTypeWithoutArgs(conversionChar, partIndex, flags, formattingStart)
-    }
-
-    /** Checks whether the argument type checks with the formatting parameters
-     *
-     *  @param argument the given argument to check
-     *  @param conversionChar the conversion parameter inside the formatting String
-     *  @param partIndex index of the part inside the String Context
-     *  @param flags the list of flags, and their index, used inside the formatting String
-     *  @return reports an error if the argument type does not correspond with the conversion character,
-     *  nothing otherwise
-     */
-    def checkTypeWithArgs(argument : (Type, Int), conversionChar : Char, partIndex : Int, flags : List[(Char, Int)]) = {
-      def booleans = List(defn.BooleanType, defn.NullType)
-      def dates = List(defn.LongType, defn.JavaCalendarClass.typeRef, defn.JavaDateClass.typeRef)
-      def floatingPoints = List(defn.DoubleType, defn.FloatType, defn.JavaBigDecimalClass.typeRef)
-      def integral = List(defn.IntType, defn.LongType, defn.ShortType, defn.ByteType, defn.JavaBigIntegerClass.typeRef)
-      def character = List(defn.CharType, defn.ByteType, defn.ShortType, defn.IntType)
-
-      val (argType, argIndex) = argument
-      conversionChar match {
-        case 'c' | 'C' => checkSubtype(argType, "Char", argIndex, character)
-        case 'd' | 'o' | 'x' | 'X' => {
-          checkSubtype(argType, "Int", argIndex, integral)
-          if (conversionChar != 'd') {
-            val notAllowedFlagOnCondition = List(('+', !(argType <:< defn.JavaBigIntegerClass.typeRef), "only use '+' for BigInt conversions to o, x, X"),
-            (' ', !(argType <:< defn.JavaBigIntegerClass.typeRef), "only use ' ' for BigInt conversions to o, x, X"),
-            ('(', !(argType <:< defn.JavaBigIntegerClass.typeRef), "only use '(' for BigInt conversions to o, x, X"),
-            (',', true, "',' only allowed for d conversion of integral types"))
-            checkFlags(partIndex, flags, notAllowedFlagOnCondition)
-          }
-        }
-        case 'e' | 'E' |'f' | 'g' | 'G' | 'a' | 'A' => checkSubtype(argType, "Double", argIndex, floatingPoints)
-        case 't' | 'T' => checkSubtype(argType, "Date", argIndex, dates)
-        case 'b' | 'B' => checkSubtype(argType, "Boolean", argIndex, booleans)
-        case 'h' | 'H' | 'S' | 's' =>
-          if !(argType <:< defn.JavaFormattableClass.typeRef) then
-            for flag <- flags; if flag._1 == '#' do
-              reporter.argError("type mismatch;\n found   : " + argType.widen.show.stripPrefix("scala.Predef.").stripPrefix("java.lang.").stripPrefix("scala.") + "\n required: java.util.Formattable", argIndex)
-        case 'n' | '%' =>
-        case illegal =>
-      }
-    }
-
-    /** Reports error when the formatting parameter require a specific type but no argument is given
-     *
-     *  @param conversionChar the conversion parameter inside the formatting String
-     *  @param partIndex index of the part inside the String Context
-     *  @param flags the list of flags, and their index, used inside the formatting String
-     *  @param formattingStart the index in the part where the formatting substring starts, i.e. where the '%' is
-     *  @return reports an error if the formatting parameter refer to the type of the parameter but no parameter is given
-     *  nothing otherwise
-     */
-    def checkTypeWithoutArgs(conversionChar : Char, partIndex : Int, flags : List[(Char, Int)], formattingStart : Int) = {
-      conversionChar match {
-          case 'o' | 'x' | 'X' => {
-            val notAllowedFlagOnCondition = List(('+', true, "only use '+' for BigInt conversions to o, x, X"),
-            (' ', true, "only use ' ' for BigInt conversions to o, x, X"),
-            ('(', true, "only use '(' for BigInt conversions to o, x, X"),
-            (',', true, "',' only allowed for d conversion of integral types"))
-            checkFlags(partIndex, flags, notAllowedFlagOnCondition)
-          }
-          case _ => //OK
-        }
-    }
-
-    /** Checks that a given part of the String Context respects every formatting constraint per parameter
-     *
-     *  @param part a particular part of the String Context
-     *  @param start the index from which we start checking the part
-     *  @param argument an Option containing the argument corresponding to the part and its index in the list of args,
-     *  None if no args are specified.
-     *  @param maxArgumentIndex an Option containing the maximum argument index possible, None if no args are specified
-     *  @return a list with all the elements of the conversion per formatting string
-     */
-    def checkPart(part : String, start : Int, argument : Option[(Int, Tree)], maxArgumentIndex : Option[Int]) : List[(Option[(Type, Int)], Char, List[(Char, Int)])] = {
-      reporter.resetReported()
-      val hasFormattingSubstring = getFormattingSubstring(part, part.size, start)
-      if (hasFormattingSubstring.nonEmpty) {
-        val formattingStart = hasFormattingSubstring.get
-        var nextStart = formattingStart
-
-        argument match {
-          case Some(argIndex, arg) => {
-            val (hasArgumentIndex, argumentIndex, flags, hasWidth, width, hasPrecision, precision, hasRelative, relativeIndex, conversion) = getFormatSpecifiers(part, argIndex, argIndex + 1, false, formattingStart)
-            if (!reporter.hasReported()){
-              val conversionWithType = checkFormatSpecifiers(argIndex + 1, hasArgumentIndex, argumentIndex, Some(argIndex + 1), start == 0, maxArgumentIndex, hasRelative, hasWidth, width, hasPrecision, precision, flags, conversion, Some(arg.tpe), part)
-              nextStart = conversion + 1
-              conversionWithType :: checkPart(part, nextStart, argument, maxArgumentIndex)
-            } else checkPart(part, conversion + 1, argument, maxArgumentIndex)
-          }
-          case None => {
-            val (hasArgumentIndex, argumentIndex, flags, hasWidth, width, hasPrecision, precision, hasRelative, relativeIndex, conversion) = getFormatSpecifiers(part, 0, 0, true, formattingStart)
-            if (hasArgumentIndex && !(part.charAt(argumentIndex).asDigit == 1 && (part.charAt(conversion) == 'n' || part.charAt(conversion) == '%')))
-              reporter.partError("Argument index out of range", 0, argumentIndex)
-            if (hasRelative)
-              reporter.partError("No last arg", 0, relativeIndex)
-            if (!reporter.hasReported()){
-              val conversionWithType = checkFormatSpecifiers(0, hasArgumentIndex, argumentIndex, None, start == 0, maxArgumentIndex, hasRelative, hasWidth, width, hasPrecision, precision, flags, conversion, None, part)
-              nextStart = conversion + 1
-              if (!reporter.hasReported() && part.charAt(conversion) != '%' && part.charAt(conversion) != 'n' && !hasArgumentIndex && !hasRelative)
-                reporter.partError("conversions must follow a splice; use %% for literal %, %n for newline", 0, part.indexOf('%'))
-              conversionWithType :: checkPart(part, nextStart, argument, maxArgumentIndex)
-            } else checkPart(part, conversion + 1, argument, maxArgumentIndex)
-          }
-        }
-      } else {
-        reporter.restoreReported()
-        Nil
-      }
-    }
-
-    val argument = args.size
-
-    // check validity of formatting
-    checkSizes(parts0.size - 1, argument)
-
-    // add default format
-    val parts = addDefaultFormat(parts0)
-
-    if (!parts.isEmpty && !reporter.hasReported()) {
-      if (parts.size == 1 && args.size == 0 && parts.head.size != 0){
-        val argTypeWithConversion = checkPart(parts.head, 0, None, None)
-        if (!reporter.hasReported())
-          for ((argument, conversionChar, flags) <- argTypeWithConversion)
-            checkArgTypeWithConversion(0, conversionChar, argument, flags, parts.head.indexOf('%'))
-      } else {
-        val partWithArgs = parts.tail.zip(args)
-        for (i <- (0 until args.size)){
-          val (part, arg) = partWithArgs(i)
-          val argTypeWithConversion = checkPart(part, 0, Some((i, arg)), Some(args.size))
-          if (!reporter.hasReported())
-            for ((argument, conversionChar, flags) <- argTypeWithConversion)
-              checkArgTypeWithConversion(i + 1, conversionChar, argument, flags, parts(i).indexOf('%'))
-        }
-      }
-    }
-
-    parts.mkString
-  }
-}
diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala
index 8f4aa6af8783..b8e6300f4e04 100644
--- a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala
+++ b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala
@@ -13,155 +13,139 @@ import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.transform.MegaPhase.MiniPhase
 import dotty.tools.dotc.typer.ConstFold
 
-/**
-  * MiniPhase to transform s and raw string interpolators from using StringContext to string
-  * concatenation. Since string concatenation uses the Java String builder, we get a performance
-  * improvement in terms of these two interpolators.
-  *
-  * More info here:
-  * https://medium.com/@dkomanov/scala-string-interpolation-performance-21dc85e83afd
-  */
-class StringInterpolatorOpt extends MiniPhase {
-  import tpd._
+/** MiniPhase to transform s and raw string interpolators from using StringContext to string
+ *  concatenation. Since string concatenation uses the Java String builder, we get a performance
+ *  improvement in terms of these two interpolators.
+ *
+ *  More info here:
+ *  https://medium.com/@dkomanov/scala-string-interpolation-performance-21dc85e83afd
+ */
+class StringInterpolatorOpt extends MiniPhase:
+  import tpd.*
 
-  override def phaseName: String = "stringInterpolatorOpt"
+  override def phaseName: String = StringInterpolatorOpt.name
 
-  override def checkPostCondition(tree: tpd.Tree)(using Context): Unit = {
-    tree match {
+  override def description: String = StringInterpolatorOpt.description
+
+  override def checkPostCondition(tree: tpd.Tree)(using Context): Unit =
+    tree match
       case tree: RefTree =>
         val sym = tree.symbol
-        assert(sym != defn.StringContext_raw && sym != defn.StringContext_s,
+        assert(sym != defn.StringContext_raw && sym != defn.StringContext_s && sym != defn.StringContext_f,
           i"$tree in ${ctx.owner.showLocated} should have been rewritten by phase $phaseName")
       case _ =>
-    }
-  }
 
   /** Matches a list of constant literals */
-  private object Literals {
-    def unapply(tree: SeqLiteral)(using Context): Option[List[Literal]] = {
-      tree.elems match {
-        case literals if literals.forall(_.isInstanceOf[Literal]) =>
-          Some(literals.map(_.asInstanceOf[Literal]))
+  private object Literals:
+    def unapply(tree: SeqLiteral)(using Context): Option[List[Literal]] =
+      tree.elems match
+        case literals if literals.forall(_.isInstanceOf[Literal]) => Some(literals.map(_.asInstanceOf[Literal]))
         case _ => None
-      }
-    }
-  }
 
-  private object StringContextApply {
-    def unapply(tree: Select)(using Context): Boolean = {
-      tree.symbol.eq(defn.StringContextModule_apply) &&
-      tree.qualifier.symbol.eq(defn.StringContextModule)
-    }
-  }
+  private object StringContextApply:
+    def unapply(tree: Select)(using Context): Boolean =
+      (tree.symbol eq defn.StringContextModule_apply) && (tree.qualifier.symbol eq defn.StringContextModule)
 
   /** Matches an s or raw string interpolator */
-  private object SOrRawInterpolator {
-    def unapply(tree: Tree)(using Context): Option[(List[Literal], List[Tree])] = {
-      tree match {
-        case Apply(Select(Apply(StringContextApply(), List(Literals(strs))), _),
-        List(SeqLiteral(elems, _))) if elems.length == strs.length - 1 =>
-          Some(strs, elems)
+  private object SOrRawInterpolator:
+    def unapply(tree: Tree)(using Context): Option[(List[Literal], List[Tree])] =
+      tree match
+        case Apply(Select(Apply(StringContextApply(), List(Literals(strs))), _), List(SeqLiteral(elems, _)))
+        if elems.length == strs.length - 1 => Some(strs, elems)
         case _ => None
-      }
-    }
-  }
 
   //Extract the position from InvalidUnicodeEscapeException
   //which due to bincompat reasons is unaccessible.
   //TODO: remove once there is less restrictive bincompat
-  private object InvalidEscapePosition {
-    def unapply(t: Throwable): Option[Int] = t match {
+  private object InvalidEscapePosition:
+    def unapply(t: Throwable): Option[Int] = t match
       case iee: StringContext.InvalidEscapeException => Some(iee.index)
-      case il: IllegalArgumentException => il.getMessage() match {
-          case s"""invalid unicode escape at index $index of $_""" => index.toIntOption
-          case _ => None
-      }
+      case iae: IllegalArgumentException => iae.getMessage() match
+        case s"""invalid unicode escape at index $index of $_""" => index.toIntOption
+        case _ => None
       case _ => None
-    }
-  }
 
-  /**
-    * Match trees that resemble s and raw string interpolations. In the case of the s
-    * interpolator, escapes the string constants. Exposes the string constants as well as
-    * the variable references.
-    */
-  private object StringContextIntrinsic {
-    def unapply(tree: Apply)(using Context): Option[(List[Literal], List[Tree])] = {
-      tree match {
+  /** Match trees that resemble s and raw string interpolations. In the case of the s
+   *  interpolator, escapes the string constants. Exposes the string constants as well as
+   *  the variable references.
+   */
+  private object StringContextIntrinsic:
+    def unapply(tree: Apply)(using Context): Option[(List[Literal], List[Tree])] =
+      tree match
         case SOrRawInterpolator(strs, elems) =>
-          if (tree.symbol == defn.StringContext_raw) Some(strs, elems)
-          else { // tree.symbol == defn.StringContextS
+          if tree.symbol == defn.StringContext_raw then Some(strs, elems)
+          else // tree.symbol == defn.StringContextS
             import dotty.tools.dotc.util.SourcePosition
             var stringPosition: SourcePosition = null
-            try {
-              val escapedStrs = strs.map(str => {
+            try
+              val escapedStrs = strs.map { str =>
                 stringPosition = str.sourcePos
                 val escaped = StringContext.processEscapes(str.const.stringValue)
                 cpy.Literal(str)(Constant(escaped))
-              })
+              }
               Some(escapedStrs, elems)
-            } catch {
-              case t @ InvalidEscapePosition(p) => {
+            catch
+              case t @ InvalidEscapePosition(p) =>
                 val errorSpan = stringPosition.span.startPos.shift(p)
                 val errorPosition = stringPosition.withSpan(errorSpan)
                 report.error(t.getMessage() + "\n", errorPosition)
                 None
-              }
-            }
-          }
         case _ => None
-      }
-    }
-  }
 
-  override def transformApply(tree: Apply)(using Context): Tree = {
+  override def transformApply(tree: Apply)(using Context): Tree =
+    def mkConcat(strs: List[Literal], elems: List[Tree]): Tree =
+      val stri = strs.iterator
+      val elemi = elems.iterator
+      var result: Tree = stri.next
+      def concat(tree: Tree): Unit =
+        result = result.select(defn.String_+).appliedTo(tree).withSpan(tree.span)
+      while elemi.hasNext
+      do
+        concat(elemi.next)
+        val str = stri.next
+        if !str.const.stringValue.isEmpty then concat(str)
+      result
+    end mkConcat
     val sym = tree.symbol
-    val isInterpolatedMethod = // Test names first to avoid loading scala.StringContext if not used
-      (sym.name == nme.raw_ && sym.eq(defn.StringContext_raw)) ||
-      (sym.name == nme.f && sym.eq(defn.StringContext_f)) ||
-      (sym.name == nme.s && sym.eq(defn.StringContext_s))
-    if (isInterpolatedMethod)
-      tree match {
+    // Test names first to avoid loading scala.StringContext if not used, and common names first
+    val isInterpolatedMethod =
+      sym.name match
+        case nme.s    => sym eq defn.StringContext_s
+        case nme.raw_ => sym eq defn.StringContext_raw
+        case nme.f    => sym eq defn.StringContext_f
+        case _        => false
+    // Perform format checking and normalization, then make it StringOps(fmt).format(args1) with tweaked args
+    def transformF(fun: Tree, args: Tree): Tree =
+      val (fmt, args1) = FormatInterpolatorTransform.checked(fun, args)
+      resolveConstructor(defn.StringOps.typeRef, List(fmt))
+        .select(nme.format)
+        .appliedTo(args1)
+    // Starting with Scala 2.13, s and raw are macros in the standard
+    // library, so we need to expand them manually.
+    // sc.s(args)    -->   standardInterpolator(processEscapes, args, sc.parts)
+    // sc.raw(args)  -->   standardInterpolator(x => x,         args, sc.parts)
+    def transformS(fun: Tree, args: Tree, isRaw: Boolean): Tree =
+      val pre = fun match
+        case Select(pre, _) => pre
+        case intp: Ident    => tpd.desugarIdentPrefix(intp)
+      val stringToString = defn.StringContextModule_processEscapes.info.asInstanceOf[MethodType]
+      val process = tpd.Lambda(stringToString, args =>
+        if isRaw then args.head else ref(defn.StringContextModule_processEscapes).appliedToTermArgs(args)
+      )
+      evalOnce(pre) { sc =>
+        val parts = sc.select(defn.StringContext_parts)
+        ref(defn.StringContextModule_standardInterpolator)
+          .appliedToTermArgs(List(process, args, parts))
+      }
+    end transformS
+    // begin transformApply
+    if isInterpolatedMethod then
+      (tree: @unchecked) match
         case StringContextIntrinsic(strs: List[Literal], elems: List[Tree]) =>
-          val stri = strs.iterator
-          val elemi = elems.iterator
-          var result: Tree = stri.next
-          def concat(tree: Tree): Unit = {
-            result = result.select(defn.String_+).appliedTo(tree).withSpan(tree.span)
-          }
-          while (elemi.hasNext) {
-            concat(elemi.next)
-            val str = stri.next
-            if (!str.const.stringValue.isEmpty) concat(str)
-          }
-          result
-        case Apply(intp, args :: Nil) if sym.eq(defn.StringContext_f) =>
-          val partsStr = StringContextChecker.checkedParts(intp, args).mkString
-          resolveConstructor(defn.StringOps.typeRef, List(Literal(Constant(partsStr))))
-            .select(nme.format)
-            .appliedTo(args)
-        // Starting with Scala 2.13, s and raw are macros in the standard
-        // library, so we need to expand them manually.
-        // sc.s(args)    -->   standardInterpolator(processEscapes, args, sc.parts)
-        // sc.raw(args)  -->   standardInterpolator(x => x,         args, sc.parts)
+          mkConcat(strs, elems)
         case Apply(intp, args :: Nil) =>
-          val pre = intp match {
-            case Select(pre, _) => pre
-            case intp: Ident => tpd.desugarIdentPrefix(intp)
-          }
-          val isRaw = sym eq defn.StringContext_raw
-          val stringToString = defn.StringContextModule_processEscapes.info.asInstanceOf[MethodType]
-
-          val process = tpd.Lambda(stringToString, args =>
-            if (isRaw) args.head else ref(defn.StringContextModule_processEscapes).appliedToTermArgs(args))
-
-          evalOnce(pre) { sc =>
-            val parts = sc.select(defn.StringContext_parts)
-
-            ref(defn.StringContextModule_standardInterpolator)
-              .appliedToTermArgs(List(process, args, parts))
-          }
-      }
+          if sym eq defn.StringContext_f then transformF(intp, args)
+          else transformS(intp, args, isRaw = sym eq defn.StringContext_raw)
     else
       tree.tpe match
         case _: ConstantType => tree
@@ -169,12 +153,12 @@ class StringInterpolatorOpt extends MiniPhase {
           ConstFold.Apply(tree).tpe match
             case ConstantType(x) => Literal(x).withSpan(tree.span).ensureConforms(tree.tpe)
             case _ => tree
-  }
 
-  override def transformSelect(tree: Select)(using Context): Tree = {
+  override def transformSelect(tree: Select)(using Context): Tree =
     ConstFold.Select(tree).tpe match
       case ConstantType(x) => Literal(x).withSpan(tree.span).ensureConforms(tree.tpe)
       case _ => tree
-  }
 
-}
+object StringInterpolatorOpt:
+  val name: String = "stringInterpolatorOpt"
+  val description: String = "optimize s, f and raw string interpolators"
diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
index 001f8a711913..13310299ed00 100644
--- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
+++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
@@ -72,7 +72,7 @@ case class Typ(tp: Type, decomposed: Boolean = true) extends Space
 case class Prod(tp: Type, unappTp: TermRef, params: List[Space]) extends Space
 
 /** Union of spaces */
-case class Or(spaces: List[Space]) extends Space
+case class Or(spaces: Seq[Space]) extends Space
 
 /** abstract space logic */
 trait SpaceLogic {
@@ -105,53 +105,46 @@ trait SpaceLogic {
   def signature(unapp: TermRef, scrutineeTp: Type, argLen: Int): List[Type]
 
   /** Get components of decomposable types */
-  def decompose(tp: Type): List[Space]
+  def decompose(tp: Type): List[Typ]
 
   /** Whether the extractor covers the given type */
-  def covers(unapp: TermRef, scrutineeTp: Type): Boolean
+  def covers(unapp: TermRef, scrutineeTp: Type, argLen: Int): Boolean
 
   /** Display space in string format */
   def show(sp: Space): String
 
-  /** Simplify space using the laws, there's no nested union after simplify
-   *
-   *  @param aggressive if true and OR space has less than 5 components, `simplify` will
-   *                    collapse `sp1 | sp2` to `sp1` if `sp2` is a subspace of `sp1`.
-   *
-   *                    This reduces noise in counterexamples.
-   */
-  def simplify(space: Space, aggressive: Boolean = false)(using Context): Space = trace(s"simplify ${show(space)}, aggressive = $aggressive --> ", debug, x => show(x.asInstanceOf[Space]))(space match {
+  /** Simplify space such that a space equal to `Empty` becomes `Empty` */
+  def simplify(space: Space)(using Context): Space = trace(s"simplify ${show(space)} --> ", debug, show)(space match {
     case Prod(tp, fun, spaces) =>
-      val sp = Prod(tp, fun, spaces.map(simplify(_)))
-      if (sp.params.contains(Empty)) Empty
+      val sps = spaces.map(simplify(_))
+      if (sps.contains(Empty)) Empty
       else if (canDecompose(tp) && decompose(tp).isEmpty) Empty
-      else sp
+      else Prod(tp, fun, sps)
     case Or(spaces) =>
-      val buf = new mutable.ListBuffer[Space]
-      def include(s: Space) = if s != Empty then buf += s
-      for space <- spaces do
-        simplify(space) match
-          case Or(ss) => ss.foreach(include)
-          case s => include(s)
-      val set = buf.toList
-
-      if (set.isEmpty) Empty
-      else if (set.size == 1) set.toList(0)
-      else if (aggressive && spaces.size < 5) {
-        val res = set.map(sp => (sp, set.filter(_ ne sp))).find {
-          case (sp, sps) =>
-            isSubspace(sp, Or(sps))
-        }
-        if (res.isEmpty) Or(set)
-        else simplify(Or(res.get._2), aggressive)
-      }
-      else Or(set)
+      val spaces2 = spaces.map(simplify(_)).filter(_ != Empty)
+      if spaces2.isEmpty then Empty
+      else if spaces2.lengthCompare(1) == 0 then spaces2.head
+      else Or(spaces2)
     case Typ(tp, _) =>
       if (canDecompose(tp) && decompose(tp).isEmpty) Empty
       else space
     case _ => space
   })
 
+  /** Remove a space if it's a subspace of remaining spaces
+   *
+   *  Note: `dedup` will return the same result if the sequence >= 10
+   */
+  def dedup(spaces: Seq[Space])(using Context): Seq[Space] =
+    if (spaces.lengthCompare(1) <= 0 || spaces.lengthCompare(10) >= 0) spaces
+    else {
+      val res = spaces.map(sp => (sp, spaces.filter(_ ne sp))).find {
+        case (sp, sps) => isSubspace(sp, Or(LazyList(sps: _*)))
+      }
+      if (res.isEmpty) spaces
+      else res.get._2
+    }
+
   /** Flatten space to get rid of `Or` for pretty print */
   def flatten(space: Space)(using Context): Seq[Space] = space match {
     case Prod(tp, fun, spaces) =>
@@ -172,7 +165,7 @@ trait SpaceLogic {
   }
 
   /** Is `a` a subspace of `b`? Equivalent to `a - b == Empty`, but faster */
-  def isSubspace(a: Space, b: Space)(using Context): Boolean = trace(s"${show(a)} < ${show(b)}", debug) {
+  def isSubspace(a: Space, b: Space)(using Context): Boolean = trace(s"isSubspace(${show(a)}, ${show(b)})", debug) {
     def tryDecompose1(tp: Type) = canDecompose(tp) && isSubspace(Or(decompose(tp)), b)
     def tryDecompose2(tp: Type) = canDecompose(tp) && isSubspace(a, Or(decompose(tp)))
 
@@ -183,6 +176,8 @@ trait SpaceLogic {
         ss.forall(isSubspace(_, b))
       case (Typ(tp1, _), Typ(tp2, _)) =>
         isSubType(tp1, tp2)
+        || canDecompose(tp1) && tryDecompose1(tp1)
+        || canDecompose(tp2) && tryDecompose2(tp2)
       case (Typ(tp1, _), Or(ss)) =>  // optimization: don't go to subtraction too early
         ss.exists(isSubspace(a, _)) || tryDecompose1(tp1)
       case (_, Or(_)) =>
@@ -191,7 +186,7 @@ trait SpaceLogic {
         isSubType(tp1, tp2)
       case (Typ(tp1, _), Prod(tp2, fun, ss)) =>
         isSubType(tp1, tp2)
-        && covers(fun, tp1)
+        && covers(fun, tp1, ss.length)
         && isSubspace(Prod(tp2, fun, signature(fun, tp2, ss.length).map(Typ(_, false))), b)
       case (Prod(_, fun1, ss1), Prod(_, fun2, ss2)) =>
         isSameUnapply(fun1, fun2) && ss1.zip(ss2).forall((isSubspace _).tupled)
@@ -199,14 +194,14 @@ trait SpaceLogic {
   }
 
   /** Intersection of two spaces  */
-  def intersect(a: Space, b: Space)(using Context): Space = trace(s"${show(a)} & ${show(b)}", debug, x => show(x.asInstanceOf[Space])) {
+  def intersect(a: Space, b: Space)(using Context): Space = trace(s"${show(a)} & ${show(b)}", debug, show) {
     def tryDecompose1(tp: Type) = intersect(Or(decompose(tp)), b)
     def tryDecompose2(tp: Type) = intersect(a, Or(decompose(tp)))
 
     (a, b) match {
       case (Empty, _) | (_, Empty) => Empty
-      case (_, Or(ss)) => Or(ss.map(intersect(a, _)).filterConserve(_ ne Empty))
-      case (Or(ss), _) => Or(ss.map(intersect(_, b)).filterConserve(_ ne Empty))
+      case (_, Or(ss)) => Or(ss.map(intersect(a, _)).filter(_ ne Empty))
+      case (Or(ss), _) => Or(ss.map(intersect(_, b)).filter(_ ne Empty))
       case (Typ(tp1, _), Typ(tp2, _)) =>
         if (isSubType(tp1, tp2)) a
         else if (isSubType(tp2, tp1)) b
@@ -217,21 +212,27 @@ trait SpaceLogic {
         if (isSubType(tp2, tp1)) b
         else if (canDecompose(tp1)) tryDecompose1(tp1)
         else if (isSubType(tp1, tp2)) a // problematic corner case: inheriting a case class
-        else Empty
+        else intersectUnrelatedAtomicTypes(tp1, tp2) match
+          case Typ(tp, _) => Prod(tp, fun, ss)
+          case sp         => sp
       case (Prod(tp1, fun, ss), Typ(tp2, _)) =>
         if (isSubType(tp1, tp2)) a
         else if (canDecompose(tp2)) tryDecompose2(tp2)
         else if (isSubType(tp2, tp1)) a  // problematic corner case: inheriting a case class
-        else Empty
+        else intersectUnrelatedAtomicTypes(tp1, tp2) match
+          case Typ(tp, _) => Prod(tp, fun, ss)
+          case sp         => sp
       case (Prod(tp1, fun1, ss1), Prod(tp2, fun2, ss2)) =>
-        if (!isSameUnapply(fun1, fun2)) Empty
+        if (!isSameUnapply(fun1, fun2)) intersectUnrelatedAtomicTypes(tp1, tp2) match
+          case Typ(tp, _) => Prod(tp, fun1, ss1)
+          case sp         => sp
         else if (ss1.zip(ss2).exists(p => simplify(intersect(p._1, p._2)) == Empty)) Empty
         else Prod(tp1, fun1, ss1.zip(ss2).map((intersect _).tupled))
     }
   }
 
   /** The space of a not covered by b */
-  def minus(a: Space, b: Space)(using Context): Space = trace(s"${show(a)} - ${show(b)}", debug, x => show(x.asInstanceOf[Space])) {
+  def minus(a: Space, b: Space)(using Context): Space = trace(s"${show(a)} - ${show(b)}", debug, show) {
     def tryDecompose1(tp: Type) = minus(Or(decompose(tp)), b)
     def tryDecompose2(tp: Type) = minus(a, Or(decompose(tp)))
 
@@ -245,16 +246,16 @@ trait SpaceLogic {
         else a
       case (Typ(tp1, _), Prod(tp2, fun, ss)) =>
         // rationale: every instance of `tp1` is covered by `tp2(_)`
-        if isSubType(tp1, tp2) && covers(fun, tp1) then
+        if isSubType(tp1, tp2) && covers(fun, tp1, ss.length) then
           minus(Prod(tp1, fun, signature(fun, tp1, ss.length).map(Typ(_, false))), b)
         else if canDecompose(tp1) then
           tryDecompose1(tp1)
         else
           a
-      case (_, Or(ss)) =>
-        ss.foldLeft(a)(minus)
       case (Or(ss), _) =>
         Or(ss.map(minus(_, b)))
+      case (_, Or(ss)) =>
+        ss.foldLeft(a)(minus)
       case (Prod(tp1, fun, ss), Typ(tp2, _)) =>
         // uncovered corner case: tp2 :< tp1, may happen when inheriting case class
         if (isSubType(tp1, tp2))
@@ -263,12 +264,11 @@ trait SpaceLogic {
            Empty
         else if (canDecompose(tp2))
           tryDecompose2(tp2)
-        else if (isSubType(tp2, tp1) &&covers(fun, tp2))
-          minus(a, Prod(tp1, fun, signature(fun, tp1, ss.length).map(Typ(_, false))))
         else
           a
       case (Prod(tp1, fun1, ss1), Prod(tp2, fun2, ss2)) =>
         if (!isSameUnapply(fun1, fun2)) return a
+        if (fun1.symbol.name == nme.unapply && ss1.length != ss2.length) return a
 
         val range = (0 until ss1.size).toList
         val cache = Array.fill[Space](ss2.length)(null)
@@ -282,7 +282,10 @@ trait SpaceLogic {
         else if cache.forall(sub => isSubspace(sub, Empty)) then Empty
         else
           // `(_, _, _) - (Some, None, _)` becomes `(None, _, _) | (_, Some, _) | (_, _, Empty)`
-          Or(range.map { i => Prod(tp1, fun1, ss1.updated(i, sub(i))) })
+          val spaces = LazyList(range: _*).flatMap { i =>
+            flatten(sub(i)).map(s => Prod(tp1, fun1, ss1.updated(i, s)))
+          }
+          Or(spaces)
     }
   }
 }
@@ -292,13 +295,13 @@ object SpaceEngine {
   /** Is the unapply or unapplySeq irrefutable?
    *  @param  unapp   The unapply function reference
    */
-  def isIrrefutable(unapp: TermRef)(using Context): Boolean = {
+  def isIrrefutable(unapp: TermRef, argLen: Int)(using Context): Boolean = {
     val unappResult = unapp.widen.finalResultType
     unappResult.isRef(defn.SomeClass)
     || unappResult <:< ConstantType(Constant(true)) // only for unapply
     || (unapp.symbol.is(Synthetic) && unapp.symbol.owner.linkedClass.is(Case))  // scala2 compatibility
     || unapplySeqTypeElemTp(unappResult).exists // only for unapplySeq
-    || productArity(unappResult) > 0
+    || isProductMatch(unappResult, argLen)
     || {
       val isEmptyTp = extractorMemberType(unappResult, nme.isEmpty, NoSourcePosition)
       isEmptyTp <:< ConstantType(Constant(false))
@@ -308,10 +311,10 @@ object SpaceEngine {
   /** Is the unapply or unapplySeq irrefutable?
    *  @param  unapp   The unapply function tree
    */
-  def isIrrefutable(unapp: tpd.Tree)(using Context): Boolean = {
+  def isIrrefutable(unapp: tpd.Tree, argLen: Int)(using Context): Boolean = {
     val fun1 = tpd.funPart(unapp)
     val funRef = fun1.tpe.asInstanceOf[TermRef]
-    isIrrefutable(funRef)
+    isIrrefutable(funRef, argLen)
   }
 }
 
@@ -326,7 +329,6 @@ class SpaceEngine(using Context) extends SpaceLogic {
   private val scalaConsType        = defn.ConsClass.typeRef
 
   private val constantNullType     = ConstantType(Constant(null))
-  private val constantNullSpace    = Typ(constantNullType)
 
   /** Does the given tree stand for the literal `null`? */
   def isNullLit(tree: Tree): Boolean = tree match {
@@ -334,13 +336,6 @@ class SpaceEngine(using Context) extends SpaceLogic {
     case _ => false
   }
 
-  /** Does the given space contain just the value `null`? */
-  def isNullSpace(space: Space): Boolean = space match {
-    case Typ(tpe, _) => tpe.dealias == constantNullType || tpe.isNullType
-    case Or(spaces) => spaces.forall(isNullSpace)
-    case _ => false
-  }
-
   override def intersectUnrelatedAtomicTypes(tp1: Type, tp2: Type): Space = trace(s"atomic intersection: ${AndType(tp1, tp2).show}", debug) {
     // Precondition: !isSubType(tp1, tp2) && !isSubType(tp2, tp1).
     if (!ctx.explicitNulls && (tp1.isNullType || tp2.isNullType)) {
@@ -351,9 +346,7 @@ class SpaceEngine(using Context) extends SpaceLogic {
       val res = TypeComparer.provablyDisjoint(tp1, tp2)
 
       if (res) Empty
-      else if (tp1.isSingleton) Typ(tp1, true)
-      else if (tp2.isSingleton) Typ(tp2, true)
-      else Typ(AndType(tp1, tp2), true)
+      else Typ(AndType(tp1, tp2), decomposed = true)
     }
   }
 
@@ -361,18 +354,15 @@ class SpaceEngine(using Context) extends SpaceLogic {
   def project(pat: Tree): Space = pat match {
     case Literal(c) =>
       if (c.value.isInstanceOf[Symbol])
-        Typ(c.value.asInstanceOf[Symbol].termRef, false)
+        Typ(c.value.asInstanceOf[Symbol].termRef, decomposed = false)
       else
-        Typ(ConstantType(c), false)
+        Typ(ConstantType(c), decomposed = false)
 
     case pat: Ident if isBackquoted(pat) =>
-      Typ(pat.tpe, false)
-
-    case Ident(nme.WILDCARD) =>
-      Or(Typ(erase(pat.tpe.stripAnnots), false) :: constantNullSpace :: Nil)
+      Typ(pat.tpe, decomposed = false)
 
     case Ident(_) | Select(_, _) =>
-      Typ(erase(pat.tpe.stripAnnots), false)
+      Typ(erase(pat.tpe.stripAnnots.widenSkolem, isValue = true), decomposed = false)
 
     case Alternative(trees) =>
       Or(trees.map(project(_)))
@@ -387,36 +377,41 @@ class SpaceEngine(using Context) extends SpaceLogic {
       val fun1 = funPart(fun)
       val funRef = fun1.tpe.asInstanceOf[TermRef]
       if (fun.symbol.name == nme.unapplySeq)
-        if (fun.symbol.owner == scalaSeqFactoryClass)
+        val (arity, elemTp, resultTp) = unapplySeqInfo(fun.tpe.widen.finalResultType, fun.srcPos)
+        if (fun.symbol.owner == scalaSeqFactoryClass && scalaListType.appliedTo(elemTp) <:< pat.tpe)
+          // The exhaustivity and reachability logic already handles decomposing sum types (into its subclasses)
+          // and product types (into its components).  To get better counter-examples for patterns that are of type
+          // List (or a super-type of list, like LinearSeq) we project them into spaces that use `::` and Nil.
+          // Doing so with a pattern of `case Seq() =>` with a scrutinee of type `Vector()` doesn't work because the
+          // space is then discarded leading to a false positive reachability warning, see #13931.
           projectSeq(pats)
         else {
-          val (arity, elemTp, resultTp) = unapplySeqInfo(fun.tpe.widen.finalResultType, fun.srcPos)
           if (elemTp.exists)
-            Prod(erase(pat.tpe.stripAnnots), funRef, projectSeq(pats) :: Nil)
+            Prod(erase(pat.tpe.stripAnnots, isValue = false), funRef, projectSeq(pats) :: Nil)
           else
-            Prod(erase(pat.tpe.stripAnnots), funRef, pats.take(arity - 1).map(project) :+ projectSeq(pats.drop(arity - 1)))
+            Prod(erase(pat.tpe.stripAnnots, isValue = false), funRef, pats.take(arity - 1).map(project) :+ projectSeq(pats.drop(arity - 1)))
         }
       else
-        Prod(erase(pat.tpe.stripAnnots), funRef, pats.map(project))
+        Prod(erase(pat.tpe.stripAnnots, isValue = false), funRef, pats.map(project))
 
     case Typed(pat @ UnApply(_, _, _), _) =>
       project(pat)
 
-    case Typed(expr, _) =>
-      Typ(erase(expr.tpe.stripAnnots), true)
+    case Typed(_, tpt) =>
+      Typ(erase(tpt.tpe.stripAnnots, isValue = true), decomposed = false)
 
     case This(_) =>
-      Typ(pat.tpe.stripAnnots, false)
+      Typ(pat.tpe.stripAnnots, decomposed = false)
 
     case EmptyTree =>         // default rethrow clause of try/catch, check tests/patmat/try2.scala
-      Typ(WildcardType, false)
+      Typ(WildcardType, decomposed = false)
 
     case Block(Nil, expr) =>
       project(expr)
 
     case _ =>
       // Pattern is an arbitrary expression; assume a skolem (i.e. an unknown value) of the pattern type
-      Typ(pat.tpe.narrow, false)
+      Typ(pat.tpe.narrow, decomposed = false)
   }
 
   private def project(tp: Type): Space = tp match {
@@ -464,29 +459,37 @@ class SpaceEngine(using Context) extends SpaceLogic {
    *       case (IntExpr(_), IntExpr(_)) =>
    *       case (BooleanExpr(_), BooleanExpr(_)) =>
    *     }
+   *
+   *  @param inArray whether `tp` is a type argument to `Array`
+   *  @param isValue whether `tp` is the type which match against values
+   *
+   *  If `isValue` is true, then pattern-bound symbols are erased to its upper bound.
+   *  This is needed to avoid spurious unreachable warnings. See tests/patmat/i6197.scala.
    */
-  private def erase(tp: Type, inArray: Boolean = false): Type = trace(i"$tp erased to", debug) {
+  private def erase(tp: Type, inArray: Boolean = false, isValue: Boolean = false): Type = trace(i"$tp erased to", debug) {
 
     tp match {
       case tp @ AppliedType(tycon, args) =>
         if tycon.typeSymbol.isPatternBound then return WildcardType
 
         val args2 =
-          if (tycon.isRef(defn.ArrayClass)) args.map(arg => erase(arg, inArray = true))
-          else args.map(arg => erase(arg, inArray = false))
-        tp.derivedAppliedType(erase(tycon, inArray), args2)
+          if (tycon.isRef(defn.ArrayClass)) args.map(arg => erase(arg, inArray = true, isValue = false))
+          else args.map(arg => erase(arg, inArray = false, isValue = false))
+        tp.derivedAppliedType(erase(tycon, inArray, isValue = false), args2)
 
       case tp @ OrType(tp1, tp2) =>
-        OrType(erase(tp1, inArray), erase(tp2, inArray), tp.isSoft)
+        OrType(erase(tp1, inArray, isValue), erase(tp2, inArray, isValue), tp.isSoft)
 
       case AndType(tp1, tp2) =>
-        AndType(erase(tp1, inArray), erase(tp2, inArray))
+        AndType(erase(tp1, inArray, isValue), erase(tp2, inArray, isValue))
 
       case tp @ RefinedType(parent, _, _) =>
-        erase(parent)
+        erase(parent, inArray, isValue)
 
       case tref: TypeRef if tref.symbol.isPatternBound =>
-        if (inArray) tref.underlying else WildcardType
+        if inArray then tref.underlying
+        else if isValue then tref.superType
+        else WildcardType
 
       case _ => tp
     }
@@ -509,15 +512,45 @@ class SpaceEngine(using Context) extends SpaceLogic {
     }
   }
 
+  /** Numeric literals, while being constant values of unrelated types (e.g. Char and Int),
+   *  when used in a case may end up matching at runtime, because their equals may returns true.
+   *  Because these are universally available, general purpose types, it would be good to avoid
+   *  returning false positive warnings, such as in `(c: Char) match { case 67 => ... }` emitting a
+   *  reachability warning on the case.  So the type `ConstantType(Constant(67, IntTag))` is
+   *  converted to `ConstantType(Constant(67, CharTag))`.  #12805 */
+  def convertConstantType(tp: Type, pt: Type): Type = tp match
+    case tp @ ConstantType(const) =>
+      val converted = const.convertTo(pt)
+      if converted == null then tp else ConstantType(converted)
+    case _ => tp
+
+  def isPrimToBox(tp: Type, pt: Type) =
+    tp.classSymbol.isPrimitiveValueClass && (defn.boxedType(tp).classSymbol eq pt.classSymbol)
+
+  /** Adapt types by performing primitive value unboxing or boxing, or numeric constant conversion.  #12805
+   *
+   *  This makes these isSubType cases work like this:
+   *  {{{
+   *   1      <:< Integer  => (<skolem> : Integer) <:< Integer  = true
+   *  ONE     <:< Int      => (<skolem> : Int)     <:< Int      = true
+   *  Integer <:< (1: Int) => (<skolem> : Int)     <:< (1: Int) = false
+   *  }}}
+   */
+  def adaptType(tp1: Type, tp2: Type): Type = trace(i"adaptType($tp1, $tp2)", show = true) {
+    if      isPrimToBox(tp1, tp2) then defn.boxedType(tp1).narrow
+    else if isPrimToBox(tp2, tp1) then defn.unboxedType(tp1).narrow
+    else convertConstantType(tp1, tp2)
+  }
+
+  private val isSubspaceCache = mutable.HashMap.empty[(Space, Space, Context), Boolean]
+
+  override def isSubspace(a: Space, b: Space)(using Context): Boolean =
+    isSubspaceCache.getOrElseUpdate((a, b, ctx), super.isSubspace(a, b))
+
   /** Is `tp1` a subtype of `tp2`?  */
-  def isSubType(tp1: Type, tp2: Type): Boolean = {
-    debug.println(TypeComparer.explained(_.isSubType(tp1, tp2)))
-    val res = if (ctx.explicitNulls) {
-      tp1 <:< tp2
-    } else {
-      (tp1 != constantNullType || tp2 == constantNullType) && tp1 <:< tp2
-    }
-    res
+  def isSubType(tp1: Type, tp2: Type): Boolean = trace(i"$tp1 <:< $tp2", debug, show = true) {
+    if tp1 == constantNullType && !ctx.explicitNulls then tp2 == constantNullType
+    else adaptType(tp1, tp2) <:< tp2
   }
 
   def isSameUnapply(tp1: TermRef, tp2: TermRef): Boolean =
@@ -535,7 +568,7 @@ class SpaceEngine(using Context) extends SpaceLogic {
       case mt: MethodType => mt
       case pt: PolyType   =>
         inContext(ctx.fresh.setExploreTyperState()) {
-          val tvars = pt.paramInfos.map(newTypeVar)
+          val tvars = pt.paramInfos.map(newTypeVar(_))
           val mt = pt.instantiate(tvars).asInstanceOf[MethodType]
           scrutineeTp <:< mt.paramInfos(0)
           // force type inference to infer a narrower type: could be singleton
@@ -590,21 +623,34 @@ class SpaceEngine(using Context) extends SpaceLogic {
   }
 
   /** Whether the extractor covers the given type */
-  def covers(unapp: TermRef, scrutineeTp: Type): Boolean =
-    SpaceEngine.isIrrefutable(unapp) || unapp.symbol == defn.TypeTest_unapply && {
+  def covers(unapp: TermRef, scrutineeTp: Type, argLen: Int): Boolean =
+    SpaceEngine.isIrrefutable(unapp, argLen) || unapp.symbol == defn.TypeTest_unapply && {
       val AppliedType(_, _ :: tp :: Nil) = unapp.prefix.widen.dealias
       scrutineeTp <:< tp
     }
 
   /** Decompose a type into subspaces -- assume the type can be decomposed */
-  def decompose(tp: Type): List[Space] =
+  def decompose(tp: Type): List[Typ] =
     tp.dealias match {
       case AndType(tp1, tp2) =>
-        intersect(Typ(tp1, false), Typ(tp2, false)) match {
-          case Or(spaces) => spaces
-          case Empty => Nil
-          case space => List(space)
-        }
+        def decomposeComponent(tpA: Type, tpB: Type): List[Typ] =
+          decompose(tpA).flatMap {
+            case Typ(tp, _) =>
+              if tp <:< tpB then
+                Typ(tp, decomposed = true) :: Nil
+              else if tpB <:< tp then
+                Typ(tpB, decomposed = true) :: Nil
+              else if TypeComparer.provablyDisjoint(tp, tpB) then
+                Nil
+              else
+                Typ(AndType(tp, tpB), decomposed = true) :: Nil
+          }
+
+        if canDecompose(tp1) then
+          decomposeComponent(tp1, tp2)
+        else
+          decomposeComponent(tp2, tp1)
+
       case OrType(tp1, tp2) => List(Typ(tp1, true), Typ(tp2, true))
       case tp if tp.isRef(defn.BooleanClass) =>
         List(
@@ -643,7 +689,6 @@ class SpaceEngine(using Context) extends SpaceLogic {
         parts.map(Typ(_, true))
     }
 
-
   /** Abstract sealed types, or-types, Boolean and Java enums can be decomposed */
   def canDecompose(tp: Type): Boolean =
     val res = tp.dealias match
@@ -659,7 +704,7 @@ class SpaceEngine(using Context) extends SpaceLogic {
         || cls.isAllOf(JavaEnumTrait)
         || tp.isRef(defn.BooleanClass)
         || tp.isRef(defn.UnitClass)
-    debug.println(s"decomposable: ${tp.show} = $res")
+    //debug.println(s"decomposable: ${tp.show} = $res")
     res
 
   /** Show friendly type name with current scope in mind
@@ -743,6 +788,7 @@ class SpaceEngine(using Context) extends SpaceLogic {
   }
 
   def show(ss: Seq[Space]): String = ss.map(show).mkString(", ")
+
   /** Display spaces */
   def show(s: Space): String = {
     def params(tp: Type): List[Type] = tp.classSymbol.primaryConstructor.info.firstParamTypes
@@ -764,7 +810,7 @@ class SpaceEngine(using Context) extends SpaceLogic {
 
         val sym = tp.classSymbol
 
-        if (ctx.definitions.isTupleType(tp))
+        if (ctx.definitions.isTupleNType(tp))
           params(tp).map(_ => "_").mkString("(", ", ", ")")
         else if (scalaListType.isRef(sym))
           if (flattenList) "_*" else "_: List"
@@ -778,10 +824,10 @@ class SpaceEngine(using Context) extends SpaceLogic {
         else if (decomposed) "_: " + showType(tp, showTypeArgs = true)
         else "_"
       case Prod(tp, fun, params) =>
-        if (ctx.definitions.isTupleType(tp))
+        if (ctx.definitions.isTupleNType(tp))
           "(" + params.map(doShow(_)).mkString(", ") + ")"
         else if (tp.isRef(scalaConsType.symbol))
-          if (flattenList) params.map(doShow(_, flattenList)).mkString(", ")
+          if (flattenList) params.map(doShow(_, flattenList)).filter(_.nonEmpty).mkString(", ")
           else params.map(doShow(_, flattenList = true)).filter(!_.isEmpty).mkString("List(", ", ", ")")
         else {
           val sym = fun.symbol
@@ -797,23 +843,30 @@ class SpaceEngine(using Context) extends SpaceLogic {
   }
 
   private def exhaustivityCheckable(sel: Tree): Boolean = {
+    val seen = collection.mutable.Set.empty[Type]
+
     // Possible to check everything, but be compatible with scalac by default
     def isCheckable(tp: Type): Boolean =
-      !tp.hasAnnotation(defn.UncheckedAnnot) && {
-        val tpw = tp.widen.dealias
-        ctx.settings.YcheckAllPatmat.value ||
-        tpw.typeSymbol.is(Sealed) ||
-        tpw.isInstanceOf[OrType] ||
-        (tpw.isInstanceOf[AndType] && {
-          val and = tpw.asInstanceOf[AndType]
-          isCheckable(and.tp1) || isCheckable(and.tp2)
-        }) ||
-        tpw.isRef(defn.BooleanClass) ||
-        tpw.typeSymbol.isAllOf(JavaEnumTrait) ||
-        (defn.isTupleType(tpw) && tpw.argInfos.exists(isCheckable(_)))
+      val tpw = tp.widen.dealias
+      val classSym = tpw.classSymbol
+      classSym.is(Sealed) ||
+      tpw.isInstanceOf[OrType] ||
+      (tpw.isInstanceOf[AndType] && {
+        val and = tpw.asInstanceOf[AndType]
+        isCheckable(and.tp1) || isCheckable(and.tp2)
+      }) ||
+      tpw.isRef(defn.BooleanClass) ||
+      classSym.isAllOf(JavaEnumTrait) ||
+      classSym.is(Case) && {
+        if seen.add(tpw) then productSelectorTypes(tpw, sel.srcPos).exists(isCheckable(_))
+        else true // recursive case class: return true and other members can still fail the check
       }
 
-    val res = isCheckable(sel.tpe)
+    val res = !sel.tpe.hasAnnotation(defn.UncheckedAnnot) && {
+      ctx.settings.YcheckAllPatmat.value
+      || isCheckable(sel.tpe)
+    }
+
     debug.println(s"exhaustivity checkable: ${sel.show} = $res")
     res
   }
@@ -827,12 +880,28 @@ class SpaceEngine(using Context) extends SpaceLogic {
       }
     }.apply(false, tp)
 
+  /** Return the underlying type of non-module, non-constant, non-enum case singleton types.
+   *  Also widen ExprType to its result type, and rewrap any annotation wrappers.
+   *  For example, with `val opt = None`, widen `opt.type` to `None.type`. */
+  def toUnderlying(tp: Type)(using Context): Type = trace(i"toUnderlying($tp)", show = true)(tp match {
+    case _: ConstantType                            => tp
+    case tp: TermRef if tp.symbol.is(Module)        => tp
+    case tp: TermRef if tp.symbol.isAllOf(EnumCase) => tp
+    case tp: SingletonType                          => toUnderlying(tp.underlying)
+    case tp: ExprType                               => toUnderlying(tp.resultType)
+    case AnnotatedType(tp, annot)                   => AnnotatedType(toUnderlying(tp), annot)
+    case _                                          => tp
+  })
+
   def checkExhaustivity(_match: Match): Unit = {
     val Match(sel, cases) = _match
-    val selTyp = sel.tpe.widen.dealias
+    debug.println(i"checking exhaustivity of ${_match}")
 
     if (!exhaustivityCheckable(sel)) return
 
+    val selTyp = toUnderlying(sel.tpe).dealias
+    debug.println(i"selTyp = $selTyp")
+
     val patternSpace = Or(cases.foldLeft(List.empty[Space]) { (acc, x) =>
       val space = if (x.guard.isEmpty) project(x.pat) else Empty
       debug.println(s"${x.pat.show} ====> ${show(space)}")
@@ -842,14 +911,15 @@ class SpaceEngine(using Context) extends SpaceLogic {
     val checkGADTSAT = shouldCheckExamples(selTyp)
 
     val uncovered =
-      flatten(simplify(minus(project(selTyp), patternSpace), aggressive = true)).filter { s =>
+      flatten(simplify(minus(project(selTyp), patternSpace))).filter({ s =>
         s != Empty && (!checkGADTSAT || satisfiable(s))
-      }
+      })
 
 
     if uncovered.nonEmpty then
       val hasMore = uncovered.lengthCompare(6) > 0
-      report.warning(PatternMatchExhaustivity(show(uncovered.take(6)), hasMore), sel.srcPos)
+      val deduped = dedup(uncovered.take(6))
+      report.warning(PatternMatchExhaustivity(show(deduped), hasMore), sel.srcPos)
   }
 
   private def redundancyCheckable(sel: Tree): Boolean =
@@ -863,58 +933,58 @@ class SpaceEngine(using Context) extends SpaceLogic {
     && !sel.tpe.widen.isRef(defn.QuotedTypeClass)
 
   def checkRedundancy(_match: Match): Unit = {
-    val Match(sel, cases) = _match
-    val selTyp = sel.tpe.widen.dealias
+    val Match(sel, _) = _match
+    val cases = _match.cases.toIndexedSeq
+    debug.println(i"checking redundancy in $_match")
 
     if (!redundancyCheckable(sel)) return
 
-    val targetSpace =
-      if (ctx.explicitNulls || selTyp.classSymbol.isPrimitiveValueClass)
-        project(selTyp)
-      else
-        project(OrType(selTyp, constantNullType, soft = false))
+    val selTyp = toUnderlying(sel.tpe).dealias
+    debug.println(i"selTyp = $selTyp")
 
-    // in redundancy check, take guard as false in order to soundly approximate
-    def projectPrevCases(cases: List[CaseDef]): List[Space] =
-      cases.map { x =>
-        if (x.guard.isEmpty) project(x.pat)
-        else Empty
-      }
+    val isNullable = selTyp.classSymbol.isNullableClass
+    val targetSpace = if isNullable
+      then project(OrType(selTyp, constantNullType, soft = false))
+      else project(selTyp)
+    debug.println(s"targetSpace: ${show(targetSpace)}")
 
-    val spaces = projectPrevCases(cases)
+    var i        = 0
+    val len      = cases.length
+    var prevs    = List.empty[Space]
+    var deferred = List.empty[Tree]
 
-    (1 until cases.length).foreach { i =>
-      val pat = cases(i).pat
+    while (i < len) {
+      val CaseDef(pat, guard, _) = cases(i)
 
-      if (pat != EmptyTree) { // rethrow case of catch uses EmptyTree
-        val prevs = Or(spaces.take(i))
-        val curr = project(pat)
+      debug.println(i"case pattern: $pat")
 
-        debug.println(s"---------------reachable? ${show(curr)}")
-        debug.println(s"prev: ${show(prevs)}")
+      val curr = project(pat)
+      debug.println(i"reachable? ${show(curr)}")
 
-        var covered = simplify(intersect(curr, targetSpace))
-        debug.println(s"covered: $covered")
+      val prev = simplify(Or(prevs))
+      debug.println(s"prev: ${show(prev)}")
 
-        // `covered == Empty` may happen for primitive types with auto-conversion
-        // see tests/patmat/reader.scala  tests/patmat/byte.scala
-        if (covered == Empty && !isNullLit(pat)) covered = curr
+      val covered = simplify(intersect(curr, targetSpace))
+      debug.println(s"covered: ${show(covered)}")
 
-        if (isSubspace(covered, prevs)) {
+      if prev == Empty && covered == Empty then // defer until a case is reachable
+        deferred ::= pat
+      else {
+        for (pat <- deferred.reverseIterator)
           report.warning(MatchCaseUnreachable(), pat.srcPos)
+        if pat != EmptyTree // rethrow case of catch uses EmptyTree
+            && isSubspace(covered, prev)
+        then {
+          val nullOnly = isNullable && i == len - 1 && isWildcardArg(pat)
+          val msg = if nullOnly then MatchCaseOnlyNullWarning() else MatchCaseUnreachable()
+          report.warning(msg, pat.srcPos)
         }
-
-        // if last case is `_` and only matches `null`, produce a warning
-        // If explicit nulls are enabled, this check isn't needed because most of the cases
-        // that would trigger it would also trigger unreachability warnings.
-        if (!ctx.explicitNulls && i == cases.length - 1 && !isNullLit(pat) ) {
-          simplify(minus(covered, prevs)) match {
-            case Typ(`constantNullType`, _) =>
-              report.warning(MatchCaseOnlyNullWarning(), pat.srcPos)
-            case _ =>
-          }
-        }
+        deferred = Nil
       }
+
+      // in redundancy check, take guard as false in order to soundly approximate
+      prevs ::= (if guard.isEmpty then covered else Empty)
+      i += 1
     }
   }
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/AddLocalJSFakeNews.scala b/compiler/src/dotty/tools/dotc/transform/sjs/AddLocalJSFakeNews.scala
index 483622c2fb0c..da4c57afb3e6 100644
--- a/compiler/src/dotty/tools/dotc/transform/sjs/AddLocalJSFakeNews.scala
+++ b/compiler/src/dotty/tools/dotc/transform/sjs/AddLocalJSFakeNews.scala
@@ -54,6 +54,8 @@ class AddLocalJSFakeNews extends MiniPhase { thisPhase =>
 
   override def phaseName: String = AddLocalJSFakeNews.name
 
+  override def description: String = AddLocalJSFakeNews.description
+
   override def isEnabled(using Context): Boolean =
     ctx.settings.scalajs.value
 
@@ -96,4 +98,5 @@ class AddLocalJSFakeNews extends MiniPhase { thisPhase =>
 
 object AddLocalJSFakeNews {
   val name: String = "addLocalJSFakeNews"
+  val description: String = "adds fake new invocations to local JS classes in calls to `createLocalJSClass`"
 }
diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/ExplicitJSClasses.scala b/compiler/src/dotty/tools/dotc/transform/sjs/ExplicitJSClasses.scala
index d714151c66d5..c2685ee3c431 100644
--- a/compiler/src/dotty/tools/dotc/transform/sjs/ExplicitJSClasses.scala
+++ b/compiler/src/dotty/tools/dotc/transform/sjs/ExplicitJSClasses.scala
@@ -239,6 +239,8 @@ class ExplicitJSClasses extends MiniPhase with InfoTransformer { thisPhase =>
 
   override def phaseName: String = ExplicitJSClasses.name
 
+  override def description: String = ExplicitJSClasses.description
+
   private var MyState: Store.Location[MyState] = _
   private def myState(using Context) = ctx.store(MyState)
 
@@ -720,6 +722,7 @@ class ExplicitJSClasses extends MiniPhase with InfoTransformer { thisPhase =>
 
 object ExplicitJSClasses {
   val name: String = "explicitJSClasses"
+  val description: String = "make all JS classes explicit"
 
   val LocalJSClassValueName: UniqueNameKind = new UniqueNameKind("$jsclass")
 
diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/JSExportUtils.scala b/compiler/src/dotty/tools/dotc/transform/sjs/JSExportUtils.scala
index 6825ddcc1fef..57e5fc636ddc 100644
--- a/compiler/src/dotty/tools/dotc/transform/sjs/JSExportUtils.scala
+++ b/compiler/src/dotty/tools/dotc/transform/sjs/JSExportUtils.scala
@@ -26,9 +26,9 @@ import dotty.tools.backend.sjs.JSDefinitions.jsdefn
 
 /** Utilities for JS exports handling. */
 object JSExportUtils {
-  private final val ExportPrefix = "$js$exported$"
-  private final val MethodExportPrefix = ExportPrefix + "meth$"
-  private final val PropExportPrefix = ExportPrefix + "prop$"
+  private inline val ExportPrefix = "$js$exported$"
+  private inline val MethodExportPrefix = ExportPrefix + "meth$"
+  private inline val PropExportPrefix = ExportPrefix + "prop$"
 
   /** Creates a name for an export specification. */
   def makeExportName(jsName: String, isProp: Boolean): TermName = {
diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala b/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala
index 0651e33c4d7d..a78adaff6522 100644
--- a/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala
+++ b/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala
@@ -92,6 +92,24 @@ object JSSymUtils {
     }
   }
 
+  /** Info about a Scala method param when called as JS method.
+   *
+   *  @param info
+   *    Parameter type (type of a single element if repeated).
+   *  @param repeated
+   *    Whether the parameter is repeated.
+   *  @param capture
+   *    Whether the parameter is a capture.
+   */
+  final class JSParamInfo(
+    val info: Type,
+    val repeated: Boolean = false,
+    val capture: Boolean = false
+  ) {
+    override def toString(): String =
+      s"ParamSpec($info, repeated = $repeated, capture = $capture)"
+  }
+
   extension (sym: Symbol) {
     /** Is this symbol a JavaScript type? */
     def isJSType(using Context): Boolean =
@@ -138,33 +156,6 @@ object JSSymUtils {
     def isJSBracketCall(using Context): Boolean =
       sym.hasAnnotation(jsdefn.JSBracketCallAnnot)
 
-    /** Is this symbol a default param accessor for a JS method?
-     *
-     *  For default param accessors of *constructors*, we need to test whether
-     *  the companion *class* of the owner is a JS type; not whether the owner
-     *  is a JS type.
-     */
-    def isJSDefaultParam(using Context): Boolean = {
-      sym.name.is(DefaultGetterName) && {
-        val owner = sym.owner
-        val methName = sym.name.exclude(DefaultGetterName)
-        if (methName == nme.CONSTRUCTOR) {
-          owner.linkedClass.isJSType
-        } else {
-          def isAttachedMethodExposed: Boolean =
-            owner.info.decl(methName).hasAltWith(_.symbol.isJSExposed)
-          owner.isJSType && (!owner.isNonNativeJSClass || isAttachedMethodExposed)
-        }
-      }
-    }
-
-    /** Is this symbol a default param accessor for the constructor of a native JS class? */
-    def isJSNativeCtorDefaultParam(using Context): Boolean = {
-      sym.name.is(DefaultGetterName)
-        && sym.name.exclude(DefaultGetterName) == nme.CONSTRUCTOR
-        && sym.owner.linkedClass.hasAnnotation(jsdefn.JSNativeAnnot)
-    }
-
     def jsCallingConvention(using Context): JSCallingConvention =
       JSCallingConvention.of(sym)
 
@@ -190,6 +181,43 @@ object JSSymUtils {
     def defaultJSName(using Context): String =
       if (sym.isTerm) sym.asTerm.name.unexpandedName.getterName.toString()
       else sym.name.unexpandedName.stripModuleClassSuffix.toString()
+
+    def jsParamInfos(using Context): List[JSParamInfo] = {
+      assert(sym.is(Method), s"trying to take JS param info of non-method: $sym")
+
+      def paramNamesAndTypes(using Context): List[(Names.TermName, Type)] =
+        sym.info.paramNamess.flatten.zip(sym.info.paramInfoss.flatten)
+
+      val paramInfosAtElimRepeated = atPhase(elimRepeatedPhase) {
+        val list =
+          for ((name, info) <- paramNamesAndTypes) yield {
+            val v =
+              if (info.isRepeatedParam) Some(info.repeatedToSingle.widenDealias)
+              else None
+            name -> v
+          }
+        list.toMap
+      }
+
+      val paramInfosAtElimEVT = atPhase(elimErasedValueTypePhase) {
+        paramNamesAndTypes.toMap
+      }
+
+      for ((paramName, paramInfoNow) <- paramNamesAndTypes) yield {
+        paramInfosAtElimRepeated.get(paramName) match {
+          case None =>
+            // This is a capture parameter introduced by erasure or lambdalift
+            new JSParamInfo(paramInfoNow, capture = true)
+
+          case Some(Some(info)) =>
+            new JSParamInfo(info, repeated = true)
+
+          case Some(None) =>
+            val info = paramInfosAtElimEVT.getOrElse(paramName, paramInfoNow)
+            new JSParamInfo(info)
+        }
+      }
+    }
   }
 
   private object JSUnaryOpMethodName {
diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala b/compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala
index 0c4e4a13cfce..c6f1feba5e98 100644
--- a/compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala
+++ b/compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala
@@ -111,7 +111,9 @@ class JUnitBootstrappers extends MiniPhase {
   import JUnitBootstrappers._
   import ast.tpd._
 
-  def phaseName: String = "junitBootstrappers"
+  override def phaseName: String = JUnitBootstrappers.name
+
+  override def description: String = JUnitBootstrappers.description
 
   override def isEnabled(using Context): Boolean =
     super.isEnabled && ctx.settings.scalajs.value
@@ -223,7 +225,7 @@ class JUnitBootstrappers extends MiniPhase {
 
     DefDef(sym, {
       val metadata = for (test <- tests) yield {
-        val name = Literal(Constant(test.name.toString))
+        val name = Literal(Constant(test.name.mangledString))
         val ignored = Literal(Constant(test.hasAnnotation(junitdefn.IgnoreAnnotClass)))
         val testAnnot = test.getAnnotation(junitdefn.TestAnnotClass).get
 
@@ -266,7 +268,7 @@ class JUnitBootstrappers extends MiniPhase {
           val tp = junitdefn.NoSuchMethodExceptionType
           Throw(resolveConstructor(tp, nameParamRef :: Nil))
         } { (test, next) =>
-          If(Literal(Constant(test.name.toString)).select(defn.Any_equals).appliedTo(nameParamRef),
+          If(Literal(Constant(test.name.mangledString)).select(defn.Any_equals).appliedTo(nameParamRef),
             genTestInvocation(testClass, test, ref(castInstanceSym)),
             next)
         }
@@ -312,6 +314,8 @@ class JUnitBootstrappers extends MiniPhase {
 }
 
 object JUnitBootstrappers {
+  val name: String = "junitBootstrappers"
+  val description: String = "generate JUnit-specific bootstrapper classes for Scala.js"
 
   private object junitNme {
     val beforeClass: TermName = termName("beforeClass")
diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala b/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala
index 8e9e11aef048..c9cf71554bc6 100644
--- a/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala
+++ b/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala
@@ -64,6 +64,8 @@ class PrepJSInterop extends MacroTransform with IdentityDenotTransformer { thisP
 
   override def phaseName: String = PrepJSInterop.name
 
+  override def description: String = PrepJSInterop.description
+
   override def isEnabled(using Context): Boolean =
     ctx.settings.scalajs.value
 
@@ -123,6 +125,8 @@ class PrepJSInterop extends MacroTransform with IdentityDenotTransformer { thisP
 
       checkInternalAnnotations(sym)
 
+      stripJSAnnotsOnExported(sym)
+
       /* Checks related to @js.native:
        * - if @js.native, verify that it is allowed in this context, and if
        *   yes, compute and store the JS native load spec
@@ -299,6 +303,14 @@ class PrepJSInterop extends MacroTransform with IdentityDenotTransformer { thisP
 
           super.transform(tree)
 
+        case _: Export =>
+          if enclosingOwner is OwnerKind.JSNative then
+            report.error("Native JS traits, classes and objects cannot contain exported definitions.", tree)
+          else if enclosingOwner is OwnerKind.JSTrait then
+            report.error("Non-native JS traits cannot contain exported definitions.", tree)
+
+          super.transform(tree)
+
         case _ =>
           super.transform(tree)
       }
@@ -457,7 +469,8 @@ class PrepJSInterop extends MacroTransform with IdentityDenotTransformer { thisP
       val kind = {
         if (!isJSNative) {
           if (sym.is(ModuleClass)) OwnerKind.JSMod
-          else OwnerKind.JSClass
+          else if (sym.is(Trait)) OwnerKind.JSTrait
+          else OwnerKind.JSNonTraitClass
         } else {
           if (sym.is(ModuleClass)) OwnerKind.JSNativeMod
           else OwnerKind.JSNativeClass
@@ -814,7 +827,29 @@ class PrepJSInterop extends MacroTransform with IdentityDenotTransformer { thisP
       super.transform(tree)
     }
 
+    /** Removes annotations from exported definitions (e.g. `export foo.bar`):
+     *  - `js.native`
+     *  - `js.annotation.*`
+     */
+    private def stripJSAnnotsOnExported(sym: Symbol)(using Context): Unit =
+      if !sym.is(Exported) then
+        return // only remove annotations from exported definitions
+
+      val JSNativeAnnot = jsdefn.JSNativeAnnot
+      val JSAnnotPackage = jsdefn.JSAnnotPackage
+
+      extension (sym: Symbol) def isJSAnnot =
+        (sym eq JSNativeAnnot) || (sym.owner eq JSAnnotPackage)
+
+      val newAnnots = sym.annotations.filterConserve(!_.symbol.isJSAnnot)
+      if newAnnots ne sym.annotations then
+        sym.annotations = newAnnots
+    end stripJSAnnotsOnExported
+
     private def checkRHSCallsJSNative(tree: ValOrDefDef, longKindStr: String)(using Context): Unit = {
+      if tree.symbol.is(Exported) then
+        return // we already report an error that exports are not allowed here, this prevents extra errors.
+
       // Check that the rhs is exactly `= js.native`
       tree.rhs match {
         case sel: Select if sel.symbol == jsdefn.JSPackage_native =>
@@ -960,6 +995,7 @@ class PrepJSInterop extends MacroTransform with IdentityDenotTransformer { thisP
 
 object PrepJSInterop {
   val name: String = "prepjsinterop"
+  val description: String = "additional checks and transformations for Scala.js"
 
   private final class OwnerKind private (private val baseKinds: Int) extends AnyVal {
     import OwnerKind._
@@ -992,10 +1028,12 @@ object PrepJSInterop {
     val JSNativeClass = new OwnerKind(0x04)
     /** A native JS object, which extends js.Any. */
     val JSNativeMod = new OwnerKind(0x08)
-    /** A non-native JS class/trait. */
-    val JSClass = new OwnerKind(0x10)
+    /** A non-native JS class (not a trait). */
+    val JSNonTraitClass = new OwnerKind(0x10)
+    /** A non-native JS trait. */
+    val JSTrait = new OwnerKind(0x20)
     /** A non-native JS object. */
-    val JSMod = new OwnerKind(0x20)
+    val JSMod = new OwnerKind(0x40)
 
     // Compound kinds
 
@@ -1005,12 +1043,12 @@ object PrepJSInterop {
     /** A native JS class/trait/object. */
     val JSNative = JSNativeClass | JSNativeMod
     /** A non-native JS class/trait/object. */
-    val JSNonNative = JSClass | JSMod
+    val JSNonNative = JSNonTraitClass | JSTrait | JSMod
     /** A JS type, i.e., something extending js.Any. */
     val JSType = JSNative | JSNonNative
 
     /** Any kind of class/trait, i.e., a Scala or JS class/trait. */
-    val AnyClass = ScalaClass | JSNativeClass | JSClass
+    val AnyClass = ScalaClass | JSNativeClass | JSNonTraitClass | JSTrait
   }
 
   /** Tests if the symbol extend `js.Any`.
diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
index 48a5738b4074..1e324de33675 100644
--- a/compiler/src/dotty/tools/dotc/typer/Applications.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -118,7 +118,7 @@ object Applications {
   }
 
   def tupleComponentTypes(tp: Type)(using Context): List[Type] =
-    tp.widenExpr.dealias match
+    tp.widenExpr.dealias.normalized match
     case tp: AppliedType =>
       if defn.isTupleClass(tp.tycon.typeSymbol) then
         tp.args
@@ -173,6 +173,7 @@ object Applications {
       val elemTp = unapplySeqTypeElemTp(tp)
       if (elemTp.exists) args.map(Function.const(elemTp))
       else if (isProductSeqMatch(tp, args.length, pos)) productSeqSelectors(tp, args.length, pos)
+      else if tp.derivesFrom(defn.NonEmptyTupleClass) then foldApplyTupleType(tp)
       else fallback
     }
 
@@ -189,14 +190,26 @@ object Applications {
         getUnapplySelectors(getTp, args, pos)
       else if (unapplyResult.widenSingleton isRef defn.BooleanClass)
         Nil
-      else if (defn.isProductSubType(unapplyResult))
+      else if (defn.isProductSubType(unapplyResult) && productArity(unapplyResult, pos) != 0)
         productSelectorTypes(unapplyResult, pos)
           // this will cause a "wrong number of arguments in pattern" error later on,
           // which is better than the message in `fail`.
+      else if unapplyResult.derivesFrom(defn.NonEmptyTupleClass) then
+        foldApplyTupleType(unapplyResult)
       else fail
     }
   }
 
+  def foldApplyTupleType(tp: Type)(using Context): List[Type] =
+    object tupleFold extends TypeAccumulator[List[Type]]:
+      override def apply(accum: List[Type], t: Type): List[Type] =
+        t match
+          case AppliedType(tycon, x :: x2 :: Nil) if tycon.typeSymbol == defn.PairClass =>
+            apply(x :: accum, x2)
+          case x => foldOver(accum, x)
+    end tupleFold
+    tupleFold(Nil, tp).reverse
+
   def wrapDefs(defs: mutable.ListBuffer[Tree], tree: Tree)(using Context): Tree =
     if (defs != null && defs.nonEmpty) tpd.Block(defs.toList, tree) else tree
 
@@ -210,6 +223,7 @@ object Applications {
         case Select(receiver, _) => receiver
         case mr => mr.tpe.normalizedPrefix match {
           case mr: TermRef => ref(mr)
+          case mr: ThisType => singleton(mr)
           case mr =>
             if testOnly then
               // In this case it is safe to skolemize now; we will produce a stable prefix for the actual call.
@@ -261,7 +275,20 @@ object Applications {
   /** Splice new method reference `meth` into existing application `app` */
   private def spliceMeth(meth: Tree, app: Tree)(using Context): Tree = app match {
     case Apply(fn, args) =>
-      spliceMeth(meth, fn).appliedToArgs(args)
+      // Constructors always have one leading non-implicit parameter list.
+      // Empty list is inserted for constructors where the first parameter list is implicit.
+      //
+      // Therefore, we need to ignore the first empty argument list.
+      // This is needed for the test tests/neg/i12344.scala
+      //
+      // see NamerOps.normalizeIfConstructor
+      //
+      if args == Nil
+         && !fn.isInstanceOf[Apply]
+         && app.tpe.isImplicitMethod
+         && fn.symbol.isConstructor
+      then meth
+      else spliceMeth(meth, fn).appliedToArgs(args)
     case TypeApply(fn, targs) =>
       // Note: It is important that the type arguments `targs` are passed in new trees
       // instead of being spliced in literally. Otherwise, a type argument to a default
@@ -397,7 +424,7 @@ trait Applications extends Compatibility {
      */
     @threadUnsafe lazy val methType: Type = liftedFunType.widen match {
       case funType: MethodType => funType
-      case funType: PolyType => constrained(funType).resultType
+      case funType: PolyType => instantiateWithTypeVars(funType)
       case tp => tp //was: funType
     }
 
@@ -419,15 +446,18 @@ trait Applications extends Compatibility {
 
     protected def init(): Unit = methType match {
       case methType: MethodType =>
-        // apply the result type constraint, unless method type is dependent
         val resultApprox = resultTypeApprox(methType)
-        if (!constrainResult(methRef.symbol, resultApprox, resultType))
-          if (ctx.typerState.isCommittable)
-            // defer the problem until after the application;
-            // it might be healed by an implicit conversion
-            ()
-          else
-            fail(TypeMismatch(methType.resultType, resultType))
+        val sym = methRef.symbol
+        if ctx.typerState.isCommittable then
+          // Here we call `resultType` only to accumulate constraints (even if
+          // it fails, we might be able to heal the expression to conform to the
+          // result type) so don't check for views since `viewExists` doesn't
+          // have any side-effect and would only slow the compiler down (cf #14333).
+          NoViewsAllowed.constrainResult(sym, resultApprox, resultType)
+        else if !constrainResult(sym, resultApprox, resultType) then
+          // Here we actually record that this alternative failed so that
+          // overloading resolution might prune it.
+          fail(TypeMismatch(methType.resultType, resultType, None))
 
         // match all arguments with corresponding formal parameters
         matchArgs(orderedArgs, methType.paramInfos, 0)
@@ -614,7 +644,6 @@ trait Applications extends Compatibility {
 
   /** The degree to which an argument has to match a formal parameter */
   enum ArgMatch:
-    case SubType       // argument is a relaxed subtype of formal
     case Compatible    // argument is compatible with formal
     case CompatibleCAP // capture-converted argument is compatible with formal
 
@@ -635,21 +664,38 @@ trait Applications extends Compatibility {
         // matches expected type
         false
       case argtpe =>
-        def SAMargOK = formal match {
-          case SAMType(sam) => argtpe <:< sam.toFunctionType(isJava = formal.classSymbol.is(JavaDefined))
-          case _ => false
-        }
-        if argMatch == ArgMatch.SubType then
-          argtpe relaxed_<:< formal.widenExpr
-        else
-          isCompatible(argtpe, formal)
-          || ctx.mode.is(Mode.ImplicitsEnabled) && SAMargOK
-          || argMatch == ArgMatch.CompatibleCAP
-              && {
-                val argtpe1 = argtpe.widen
-                val captured = captureWildcards(argtpe1)
-                (captured ne argtpe1) && isCompatible(captured, formal.widenExpr)
-              }
+        val argtpe1 = argtpe.widen
+
+        def SAMargOK =
+          defn.isFunctionType(argtpe1) && formal.match
+            case SAMType(sam) => argtpe <:< sam.toFunctionType(isJava = formal.classSymbol.is(JavaDefined))
+            case _ => false
+
+        isCompatible(argtpe, formal)
+        // Only allow SAM-conversion to PartialFunction if implicit conversions
+        // are enabled. This is necessary to avoid ambiguity between an overload
+        // taking a PartialFunction and one taking a Function1 because
+        // PartialFunction extends Function1 but Function1 is SAM-convertible to
+        // PartialFunction. Concretely, given:
+        //
+        //   def foo(a: Int => Int): Unit = println("1")
+        //   def foo(a: PartialFunction[Int, Int]): Unit = println("2")
+        //
+        // - `foo(x => x)` will print 1, because the PartialFunction overload
+        //   won't be seen as applicable in the first call to
+        //   `resolveOverloaded`, this behavior happens to match what Java does
+        //   since PartialFunction is not a SAM type according to Java
+        //   (`isDefined` is abstract).
+        // - `foo { case x if x % 2 == 0 => x }` will print 2, because both
+        //    overloads are applicable, but PartialFunction is a subtype of
+        //    Function1 so it's more specific.
+        || (!formal.isRef(defn.PartialFunctionClass) || ctx.mode.is(Mode.ImplicitsEnabled)) && SAMargOK
+        || argMatch == ArgMatch.CompatibleCAP
+            && {
+              val argtpe1 = argtpe.widen
+              val captured = captureWildcards(argtpe1)
+              (captured ne argtpe1) && isCompatible(captured, formal.widenExpr)
+            }
 
     /** The type of the given argument */
     protected def argType(arg: Arg, formal: Type): Type
@@ -714,7 +760,10 @@ trait Applications extends Compatibility {
       typedArgBuf += seqToRepeated(SeqLiteral(args, elemtpt))
     }
 
-    def harmonizeArgs(args: List[TypedArg]): List[Tree] = harmonize(args)
+    def harmonizeArgs(args: List[TypedArg]): List[Tree] =
+      // harmonize args only if resType depends on parameter types
+      if (isFullyDefined(methodType.resType, ForceDegree.none)) args
+      else harmonize(args)
 
     override def appPos: SrcPos = app.srcPos
 
@@ -851,24 +900,12 @@ trait Applications extends Compatibility {
       record("typedApply")
       val fun1 = typedExpr(tree.fun, originalProto)
 
-      // Warning: The following lines are dirty and fragile.
-      // We record that auto-tupling or untupling was demanded as a side effect in adapt.
-      // If it was, we assume the tupled-dual proto-type in the rest of the application,
-      // until, possibly, we have to fall back to insert an implicit on the qualifier.
-      // This crucially relies on he fact that `proto` is used only in a single call of `adapt`,
-      // otherwise we would get possible cross-talk between different `adapt` calls using the same
-      // prototype. A cleaner alternative would be to return a modified prototype from `adapt` together with
-      // a modified tree but this would be more convoluted and less efficient.
-      val proto = if (originalProto.hasTupledDual) originalProto.tupledDual else originalProto
-
-      // If some of the application's arguments are function literals without explicitly declared
-      // parameter types, relate the normalized result type of the application with the
-      // expected type through `constrainResult`. This can add more constraints which
-      // help sharpen the inferred parameter types for the argument function literal(s).
-      // This tweak is needed to make i1378 compile.
-      if (tree.args.exists(untpd.isFunctionWithUnknownParamType(_)))
-        if (!constrainResult(tree.symbol, fun1.tpe.widen, proto.derivedFunProto(resultType = pt)))
-          typr.println(i"result failure for $tree with type ${fun1.tpe.widen}, expected = $pt")
+      // If adaptation created a tupled dual of `originalProto`, pick the right version
+      // (tupled or not) of originalProto to proceed.
+      val proto =
+        if originalProto.hasTupledDual && needsTupledDual(fun1.tpe, originalProto)
+        then originalProto.tupledDual
+        else originalProto
 
       /** Type application where arguments come from prototype, and no implicits are inserted */
       def simpleApply(fun1: Tree, proto: FunProto)(using Context): Tree =
@@ -887,8 +924,9 @@ trait Applications extends Compatibility {
        *  part. Return an optional value to indicate success.
        */
       def tryWithImplicitOnQualifier(fun1: Tree, proto: FunProto)(using Context): Option[Tree] =
-        if (ctx.mode.is(Mode.SynthesizeExtMethodReceiver))
+        if ctx.mode.is(Mode.SynthesizeExtMethodReceiver) || proto.hasErrorArg then
           // Suppress insertion of apply or implicit conversion on extension method receiver
+          // or if argument is erroneous by itself.
           None
         else
           tryInsertImplicitOnQualifier(fun1, proto, ctx.typerState.ownedVars) flatMap { fun2 =>
@@ -977,7 +1015,7 @@ trait Applications extends Compatibility {
      *     { val xs = es; e' = e' + args }
      */
     def typedOpAssign(using Context): Tree = {
-      val (lhs1, name, rhss) = tree match
+      val (lhs1, name, rhss) = (tree: @unchecked) match
         case Apply(Select(lhs, name), rhss) => (typedExpr(lhs), name, rhss)
         case Apply(untpd.TypedSplice(Select(lhs1, name)), rhss) => (lhs1, name, rhss)
       val liftedDefs = new mutable.ListBuffer[Tree]
@@ -1097,6 +1135,40 @@ trait Applications extends Compatibility {
       tree
   }
 
+  /** Is `tp` a unary function type or an overloaded type with with only unary function
+   *  types as alternatives?
+   */
+  def isUnary(tp: Type)(using Context): Boolean = tp match {
+    case tp: MethodicType =>
+      tp.firstParamTypes match {
+        case ptype :: Nil => !ptype.isRepeatedParam
+        case _ => false
+      }
+    case tp: TermRef =>
+      tp.denot.alternatives.forall(alt => isUnary(alt.info))
+    case _ =>
+      false
+  }
+
+  /** Should we tuple or untuple the argument before application?
+    *  If auto-tupling is enabled then
+    *
+    *   - we tuple n-ary arguments where n > 0 if the function consists
+    *     only of unary alternatives
+    *   - we untuple tuple arguments of infix operations if the function
+    *     does not consist only of unary alternatives.
+    */
+  def needsTupledDual(funType: Type, pt: FunProto)(using Context): Boolean =
+    pt.args match
+      case untpd.Tuple(elems) :: Nil =>
+        elems.length > 1
+        && pt.applyKind == ApplyKind.InfixTuple
+        && !isUnary(funType)
+      case args =>
+        args.lengthCompare(1) > 0
+        && isUnary(funType)
+        && Feature.autoTuplingEnabled
+
   /** If `tree` is a complete application of a compiler-generated `apply`
    *  or `copy` method of an enum case, widen its type to the underlying
    *  type by means of a type ascription, as long as the widened type is
@@ -1299,7 +1371,7 @@ trait Applications extends Compatibility {
         for (argType <- argTypes) assert(!isBounds(argType), unapplyApp.tpe.show)
         val bunchedArgs = argTypes match {
           case argType :: Nil =>
-            if (args.lengthCompare(1) > 0 && Feature.autoTuplingEnabled) untpd.Tuple(args) :: Nil
+            if (args.lengthCompare(1) > 0 && Feature.autoTuplingEnabled && defn.isTupleNType(argType)) untpd.Tuple(args) :: Nil
             else args
           case _ => args
         }
@@ -1507,7 +1579,7 @@ trait Applications extends Compatibility {
             case tp2: MethodType => true // (3a)
             case tp2: PolyType if tp2.resultType.isInstanceOf[MethodType] => true // (3a)
             case tp2: PolyType => // (3b)
-              explore(isAsSpecificValueType(tp1, constrained(tp2).resultType))
+              explore(isAsSpecificValueType(tp1, instantiateWithTypeVars(tp2)))
             case _ => // 3b)
               isAsSpecificValueType(tp1, tp2)
     }
@@ -1567,7 +1639,7 @@ trait Applications extends Compatibility {
     /** Widen the result type of synthetic given methods from the implementation class to the
      *  type that's implemented. Example
      *
-     *      given I[X] as T { ... }
+     *      given I[X]: T with { ... }
      *
      *  This desugars to
      *
@@ -1577,7 +1649,7 @@ trait Applications extends Compatibility {
      *  To compare specificity we should compare with `T`, not with its implementation `I[X]`.
      *  No such widening is performed for given aliases, which are not synthetic. E.g.
      *
-     *      given J[X] as T = rhs
+     *      given J[X]: T = rhs
      *
      *  already has the right result type `T`. Neither is widening performed for given
      *  objects, since these are anyway taken to be more specific than methods
@@ -1588,8 +1660,8 @@ trait Applications extends Compatibility {
         mt.derivedLambdaType(mt.paramNames, mt.paramInfos, widenGiven(mt.resultType, alt))
       case pt: PolyType =>
         pt.derivedLambdaType(pt.paramNames, pt.paramInfos, widenGiven(pt.resultType, alt))
-      case _ =>
-        if (alt.symbol.isAllOf(SyntheticGivenMethod)) tp.widenToParents
+      case rt =>
+        if alt.symbol.isCoDefinedGiven(rt.typeSymbol) then tp.widenToParents
         else tp
     }
 
@@ -1674,7 +1746,7 @@ trait Applications extends Compatibility {
       resultType.revealIgnored match {
         case resultType: ValueType =>
           altType.widen match {
-            case tp: PolyType => resultConforms(altSym, constrained(tp).resultType, resultType)
+            case tp: PolyType => resultConforms(altSym, instantiateWithTypeVars(tp), resultType)
             case tp: MethodType => constrainResult(altSym, tp.resultType, resultType)
             case _ => true
           }
@@ -1863,17 +1935,10 @@ trait Applications extends Compatibility {
           else
             alts
 
-        def narrowByTrees(alts: List[TermRef], args: List[Tree], resultType: Type): List[TermRef] = {
-          val alts2 = alts.filterConserve(alt =>
-            isApplicableMethodRef(alt, args, resultType, keepConstraint = false, ArgMatch.SubType)
+        def narrowByTrees(alts: List[TermRef], args: List[Tree], resultType: Type): List[TermRef] =
+          alts.filterConserve(alt =>
+            isApplicableMethodRef(alt, args, resultType, keepConstraint = false, ArgMatch.CompatibleCAP)
           )
-          if (alts2.isEmpty && !ctx.isAfterTyper)
-            alts.filterConserve(alt =>
-              isApplicableMethodRef(alt, args, resultType, keepConstraint = false, ArgMatch.CompatibleCAP)
-            )
-          else
-            alts2
-        }
 
         record("resolveOverloaded.FunProto", alts.length)
         val alts1 = narrowBySize(alts)
@@ -2061,7 +2126,11 @@ trait Applications extends Compatibility {
             else defn.FunctionOf(commonParamTypes, WildcardType)
           overload.println(i"pretype arg $arg with expected type $commonFormal")
           if (commonParamTypes.forall(isFullyDefined(_, ForceDegree.flipBottom)))
-            withMode(Mode.ImplicitsEnabled)(pt.typedArg(arg, commonFormal))
+            withMode(Mode.ImplicitsEnabled) {
+              // We can cache the adapted argument here because the expected type
+              // is a common type shared by all overloading candidates.
+              pt.cacheArg(arg, pt.typedArg(arg, commonFormal))
+            }
         }
         recur(altFormals.map(_.tail), args1)
       case _ =>
diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala
index 820f466723e2..be38221ef167 100644
--- a/compiler/src/dotty/tools/dotc/typer/Checking.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala
@@ -20,6 +20,7 @@ import ErrorReporting.errorTree
 import rewrites.Rewrites.patch
 import util.Spans.Span
 import Phases.refchecksPhase
+import Constants.Constant
 
 import util.SrcPos
 import util.Spans.Span
@@ -33,9 +34,12 @@ import NameKinds.DefaultGetterName
 import NameOps._
 import SymDenotations.{NoCompleter, NoDenotation}
 import Applications.unapplyArgs
+import Inferencing.isFullyDefined
 import transform.patmat.SpaceEngine.isIrrefutable
-import config.Feature._
+import config.Feature
+import config.Feature.sourceVersion
 import config.SourceVersion._
+import transform.TypeUtils.*
 
 import collection.mutable
 import reporting._
@@ -191,6 +195,30 @@ object Checking {
       report.errorOrMigrationWarning(em"$tp is not a legal $what\nsince it${rstatus.msg}", pos)
   }
 
+  /** Given a parent `parent` of a class `cls`, if `parent` is a trait check that
+   *  the superclass of `cls` derived from the superclass of `parent`.
+   *
+   *  An exception is made if `cls` extends `Any`, and `parent` is `java.io.Serializable`
+   *  or `java.lang.Comparable`. These two classes are treated by Scala as universal
+   *  traits. E.g. the following is OK:
+   *
+   *      ... extends Any with java.io.Serializable
+   *
+   *  The standard library relies on this idiom.
+   */
+  def checkTraitInheritance(parent: Symbol, cls: ClassSymbol, pos: SrcPos)(using Context): Unit =
+    parent match {
+      case parent: ClassSymbol if parent.is(Trait) =>
+        val psuper = parent.superClass
+        val csuper = cls.superClass
+        val ok = csuper.derivesFrom(psuper) ||
+          parent.is(JavaDefined) && csuper == defn.AnyClass &&
+          (parent == defn.JavaSerializableClass || parent == defn.ComparableClass)
+        if (!ok)
+          report.error(em"illegal trait inheritance: super$csuper does not derive from $parent's super$psuper", pos)
+      case _ =>
+    }
+
   /** A type map which checks that the only cycles in a type are F-bounds
    *  and that protects all F-bounded references by LazyRefs.
    */
@@ -403,11 +431,11 @@ object Checking {
       return
 
     def qualifies(sym: Symbol) = sym.name.isTypeName && !sym.is(Private)
-    val abstractTypeNames =
-      for (parent <- parents; mbr <- parent.abstractTypeMembers if qualifies(mbr.symbol))
-      yield mbr.name.asTypeName
-
     withMode(Mode.CheckCyclic) {
+      val abstractTypeNames =
+        for (parent <- parents; mbr <- parent.abstractTypeMembers if qualifies(mbr.symbol))
+        yield mbr.name.asTypeName
+
       for name <- abstractTypeNames do
         try
           val mbr = joint.member(name)
@@ -425,6 +453,7 @@ object Checking {
   /** Check that symbol's definition is well-formed. */
   def checkWellFormed(sym: Symbol)(using Context): Unit = {
     def fail(msg: Message) = report.error(msg, sym.srcPos)
+    def warn(msg: Message) = report.warning(msg, sym.srcPos)
 
     def checkWithDeferred(flag: FlagSet) =
       if (sym.isOneOf(flag))
@@ -448,7 +477,7 @@ object Checking {
     if (sym.is(Implicit)) {
       if (sym.owner.is(Package))
         fail(TopLevelCantBeImplicit(sym))
-      if (sym.isType)
+      if sym.isType && (!sym.isClass || sym.is(Trait)) then
         fail(TypesAndTraitsCantBeImplicit())
     }
     if sym.is(Transparent) then
@@ -464,8 +493,15 @@ object Checking {
       fail(em"only classes can be ${(sym.flags & ClassOnlyFlags).flagsString}")
     if (sym.is(AbsOverride) && !sym.owner.is(Trait))
       fail(AbstractOverrideOnlyInTraits(sym))
-    if (sym.is(Trait) && sym.is(Final))
-      fail(TraitsMayNotBeFinal(sym))
+    if sym.is(Trait) then
+      if sym.is(Final) then
+        fail(TraitsMayNotBeFinal(sym))
+      else if sym.is(Open) then
+        warn(RedundantModifier(Open))
+    if sym.isAllOf(Abstract | Open) then
+      warn(RedundantModifier(Open))
+    if sym.is(Open) && sym.isLocal then
+      warn(RedundantModifier(Open))
     // Skip ModuleVal since the annotation will also be on the ModuleClass
     if sym.hasAnnotation(defn.TailrecAnnot) then
       if !sym.isOneOf(Method | ModuleVal) then
@@ -505,6 +541,9 @@ object Checking {
     checkCombination(Abstract, Override)
     checkCombination(Private, Override)
     checkCombination(Lazy, Inline)
+    // The issue with `erased inline` is that the erased semantics get lost
+    // as the code is inlined and the reference is removed before the erased usage check.
+    checkCombination(Erased, Inline)
     checkNoConflict(Lazy, ParamAccessor, s"parameter may not be `lazy`")
   }
 
@@ -687,6 +726,50 @@ object Checking {
         checkValue(tree)
       case _ =>
     tree
+
+  /** Check that experimental language imports in `trees`
+   *  are done only in experimental scopes, or in a top-level
+   *  scope with only @experimental definitions.
+   */
+  def checkExperimentalImports(trees: List[Tree])(using Context): Unit =
+
+    def nonExperimentalStat(trees: List[Tree]): Tree = trees match
+      case (_: Import | EmptyTree) :: rest =>
+        nonExperimentalStat(rest)
+      case (tree @ TypeDef(_, impl: Template)) :: rest if tree.symbol.isPackageObject =>
+        nonExperimentalStat(impl.body).orElse(nonExperimentalStat(rest))
+      case (tree: PackageDef) :: rest =>
+        nonExperimentalStat(tree.stats).orElse(nonExperimentalStat(rest))
+      case (tree: MemberDef) :: rest =>
+        if tree.symbol.isExperimental || tree.symbol.is(Synthetic) then
+          nonExperimentalStat(rest)
+        else
+          tree
+      case tree :: rest =>
+        tree
+      case Nil =>
+        EmptyTree
+
+    for case imp @ Import(qual, selectors) <- trees do
+      def isAllowedImport(sel: untpd.ImportSelector) =
+        val name = Feature.experimental(sel.name)
+        name == Feature.scala2macros || name == Feature.erasedDefinitions
+
+      languageImport(qual) match
+        case Some(nme.experimental)
+        if !ctx.owner.isInExperimentalScope && !selectors.forall(isAllowedImport) =>
+          def check(stable: => String) =
+            Feature.checkExperimentalFeature("features", imp.srcPos,
+              s"\n\nNote: the scope enclosing the import is not considered experimental because it contains the\nnon-experimental $stable")
+          if ctx.owner.is(Package) then
+            // allow top-level experimental imports if all definitions are @experimental
+            nonExperimentalStat(trees) match
+              case EmptyTree =>
+              case tree: MemberDef => check(i"${tree.symbol}")
+              case tree => check(i"expression ${tree}")
+          else Feature.checkExperimentalFeature("features", imp.srcPos)
+        case _ =>
+  end checkExperimentalImports
 }
 
 trait Checking {
@@ -742,7 +825,7 @@ trait Checking {
             recur(pat1, pt)
           case UnApply(fn, _, pats) =>
             check(pat, pt) &&
-            (isIrrefutable(fn) || fail(pat, pt)) && {
+            (isIrrefutable(fn, pats.length) || fail(pat, pt)) && {
               val argPts = unapplyArgs(fn.tpe.widen.finalResultType, fn, pats, pat.srcPos)
               pats.corresponds(argPts)(recur)
             }
@@ -802,12 +885,13 @@ trait Checking {
    *  that is concurrently compiled in another source file.
    */
   def checkNoModuleClash(sym: Symbol)(using Context): Unit =
-    if sym.effectiveOwner.is(Package)
-       && sym.owner.info.member(sym.name.moduleClassName).symbol.isAbsent()
+    val effectiveOwner = sym.effectiveOwner
+    if effectiveOwner.is(Package)
+       && effectiveOwner.info.member(sym.name.moduleClassName).symbol.isAbsent()
     then
-      val conflicting = sym.owner.info.member(sym.name.toTypeName).symbol
+      val conflicting = effectiveOwner.info.member(sym.name.toTypeName).symbol
       if conflicting.exists then
-        report.error(AlreadyDefined(sym.name, sym.owner, conflicting), sym.srcPos)
+        report.error(AlreadyDefined(sym.name, effectiveOwner, conflicting), sym.srcPos)
 
  /**  Check that `tp` is a class type.
   *   Also, if `traitReq` is true, check that `tp` is a trait.
@@ -829,22 +913,14 @@ trait Checking {
   /** If `sym` is an old-style implicit conversion, check that implicit conversions are enabled.
    *  @pre  sym.is(GivenOrImplicit)
    */
-  def checkImplicitConversionDefOK(sym: Symbol)(using Context): Unit = {
-    def check(): Unit =
+  def checkImplicitConversionDefOK(sym: Symbol)(using Context): Unit =
+    if sym.isOldStyleImplicitConversion(directOnly = true) then
       checkFeature(
         nme.implicitConversions,
         i"Definition of implicit conversion $sym",
         ctx.owner.topLevelClass,
         sym.srcPos)
 
-    sym.info.stripPoly match {
-      case mt @ MethodType(_ :: Nil)
-      if !mt.isImplicitMethod && !sym.is(Synthetic) => // it's an old-styleconversion
-        check()
-      case _ =>
-    }
-  }
-
   /** If `tree` is an application of a new-style implicit conversion (using the apply
    *  method of a `scala.Conversion` instance), check that implicit conversions are
    *  enabled.
@@ -906,7 +982,7 @@ trait Checking {
                    description: => String,
                    featureUseSite: Symbol,
                    pos: SrcPos)(using Context): Unit =
-    if !enabled(name) then
+    if !Feature.enabled(name) then
       report.featureWarning(name.toString, description, featureUseSite, required = false, pos)
 
   /** Check that `tp` is a class type and that any top-level type arguments in this type
@@ -954,7 +1030,9 @@ trait Checking {
           def doubleDefError(decl: Symbol, other: Symbol): Unit =
             if (!decl.info.isErroneous && !other.info.isErroneous)
               report.error(DoubleDefinition(decl, other, cls), decl.srcPos)
-          if (decl is Synthetic) doubleDefError(other, decl)
+          if decl.name.is(DefaultGetterName) && ctx.reporter.errorsReported then
+            () // do nothing; we already have reported an error that overloaded variants cannot have default arguments
+          else if (decl is Synthetic) doubleDefError(other, decl)
           else doubleDefError(decl, other)
         }
         if decl.hasDefaultParams && other.hasDefaultParams then
@@ -981,18 +1059,6 @@ trait Checking {
         report.error(i"""$called is already implemented by super${caller.superClass},
                    |its constructor cannot be called again""", call.srcPos)
 
-      if (caller.is(Module)) {
-        val traverser = new TreeTraverser {
-          def traverse(tree: Tree)(using Context) = tree match {
-            case tree: RefTree if tree.isTerm && (tree.tpe.classSymbol eq caller) =>
-              report.error("super constructor cannot be passed a self reference", tree.srcPos)
-            case _ =>
-              traverseChildren(tree)
-          }
-        }
-        traverser.traverse(call)
-      }
-
       // Check that constructor call is of the form _.<init>(args1)...(argsN).
       // This guards against calls resulting from inserted implicits or applies.
       def checkLegalConstructorCall(tree: Tree, encl: Tree, kind: String): Unit = tree match {
@@ -1090,7 +1156,7 @@ trait Checking {
         }
       case _ =>
     }
-    tp.foreachPart(check, stopAtStatic = true)
+    tp.foreachPart(check, StopAt.Static)
     if (ok) tp else UnspecifiedErrorType
   }
 
@@ -1143,21 +1209,33 @@ trait Checking {
   /** Check arguments of compiler-defined annotations */
   def checkAnnotArgs(tree: Tree)(using Context): tree.type =
     val cls = Annotations.annotClass(tree)
-    def needsStringLit(arg: Tree) =
-      report.error(em"@${cls.name} needs a string literal as argument", arg.srcPos)
     tree match
       case Apply(tycon, arg :: Nil) if cls == defn.TargetNameAnnot =>
         arg match
+          case Literal(Constant("")) =>
+            report.error(em"target name cannot be empty", arg.srcPos)
           case Literal(_) => // ok
-          case _ => needsStringLit(arg)
+          case _ =>
+            report.error(em"@${cls.name} needs a string literal as argument", arg.srcPos)
       case _ =>
     tree
 
   /** 1. Check that all case classes that extend `scala.reflect.Enum` are `enum` cases
    *  2. Check that parameterised `enum` cases do not extend java.lang.Enum.
    *  3. Check that only a static `enum` base class can extend java.lang.Enum.
+   *  4. Check that user does not implement an `ordinal` method in the body of an enum class.
    */
   def checkEnum(cdef: untpd.TypeDef, cls: Symbol, firstParent: Symbol)(using Context): Unit = {
+    def existingDef(sym: Symbol, clazz: ClassSymbol)(using Context): Symbol = // adapted from SyntheticMembers
+      val existing = sym.matchingMember(clazz.thisType)
+      if existing != sym && !existing.is(Deferred) then existing else NoSymbol
+    def checkExistingOrdinal(using Context) =
+      val decl = existingDef(defn.Enum_ordinal, cls.asClass)
+      if decl.exists then
+        if decl.owner == cls then
+          report.error(em"the ordinal method of enum $cls can not be defined by the user", decl.srcPos)
+        else
+          report.error(em"enum $cls can not inherit the concrete ordinal method of ${decl.owner}", cdef.srcPos)
     def isEnumAnonCls =
       cls.isAnonymousClass
       && cls.owner.isTerm
@@ -1177,6 +1255,8 @@ trait Checking {
         // this test allows inheriting from `Enum` by hand;
         // see enum-List-control.scala.
         report.error(ClassCannotExtendEnum(cls, firstParent), cdef.srcPos)
+    if cls.isEnumClass && !isJavaEnum then
+      checkExistingOrdinal
   }
 
   /** Check that the firstParent for an enum case derives from the declaring enum class, if not, adds it as a parent
@@ -1298,6 +1378,25 @@ trait Checking {
     if !tp.derivesFrom(defn.MatchableClass) && sourceVersion.isAtLeast(`future-migration`) then
       val kind = if pattern then "pattern selector" else "value"
       report.warning(MatchableWarning(tp, pattern), pos)
+
+  def checkCanThrow(tp: Type, span: Span)(using Context): Unit =
+    if Feature.enabled(Feature.saferExceptions) && tp.isCheckedException then
+      ctx.typer.implicitArgTree(defn.CanThrowClass.typeRef.appliedTo(tp), span)
+
+  /** Check that catch can generate a good CanThrow exception */
+  def checkCatch(pat: Tree, guard: Tree)(using Context): Unit = pat match
+    case Typed(_: Ident, tpt) if isFullyDefined(tpt.tpe, ForceDegree.none) && guard.isEmpty =>
+      // OK
+    case Bind(_, pat1) =>
+      checkCatch(pat1, guard)
+    case _ =>
+      val req =
+        if guard.isEmpty then "for cases of the form `ex: T` where `T` is fully defined"
+        else "if no pattern guard is given"
+      report.error(
+        em"""Implementation restriction: cannot generate CanThrow capability for this kind of catch.
+            |CanThrow capabilities can only be generated $req.""",
+        pat.srcPos)
 }
 
 trait ReChecking extends Checking {
@@ -1310,6 +1409,8 @@ trait ReChecking extends Checking {
   override def checkAnnotApplicable(annot: Tree, sym: Symbol)(using Context): Boolean = true
   override def checkMatchable(tp: Type, pos: SrcPos, pattern: Boolean)(using Context): Unit = ()
   override def checkNoModuleClash(sym: Symbol)(using Context) = ()
+  override def checkCanThrow(tp: Type, span: Span)(using Context): Unit = ()
+  override def checkCatch(pat: Tree, guard: Tree)(using Context): Unit = ()
 }
 
 trait NoChecking extends ReChecking {
diff --git a/compiler/src/dotty/tools/dotc/typer/ConstFold.scala b/compiler/src/dotty/tools/dotc/typer/ConstFold.scala
index 4633c187912f..3e09642d291d 100644
--- a/compiler/src/dotty/tools/dotc/typer/ConstFold.scala
+++ b/compiler/src/dotty/tools/dotc/typer/ConstFold.scala
@@ -29,12 +29,12 @@ object ConstFold:
   def Apply[T <: Apply](tree: T)(using Context): T =
     tree.fun match
       case Select(xt, op) if foldedBinops.contains(op) =>
-        xt.tpe.widenTermRefExpr.normalized match
-          case ConstantType(x) =>
+        xt match
+          case ConstantTree(x) =>
             tree.args match
               case yt :: Nil =>
-                yt.tpe.widenTermRefExpr.normalized match
-                  case ConstantType(y) => tree.withFoldedType(foldBinop(op, x, y))
+                yt match
+                  case ConstantTree(y) => tree.withFoldedType(foldBinop(op, x, y))
                   case _ => tree
               case _ => tree
           case _ => tree
@@ -46,8 +46,8 @@ object ConstFold:
 
   def Select[T <: Select](tree: T)(using Context): T =
     if foldedUnops.contains(tree.name) then
-      tree.qualifier.tpe.widenTermRefExpr.normalized match
-        case ConstantType(x) => tree.withFoldedType(foldUnop(tree.name, x))
+      tree.qualifier match
+        case ConstantTree(x) => tree.withFoldedType(foldUnop(tree.name, x))
         case _ => tree
     else tree
 
@@ -59,6 +59,17 @@ object ConstFold:
       tree.withFoldedType(Constant(targ.tpe))
     case _ => tree
 
+  private object ConstantTree:
+    def unapply(tree: Tree)(using Context): Option[Constant] =
+      tree match
+        case Inlined(_, Nil, expr) => unapply(expr)
+        case Typed(expr, _) => unapply(expr)
+        case Literal(c) if c.tag == Constants.NullTag => Some(c)
+        case _ =>
+          tree.tpe.widenTermRefExpr.normalized.simplified match
+            case ConstantType(c) => Some(c)
+            case _ => None
+
   extension [T <: Tree](tree: T)(using Context)
     private def withFoldedType(c: Constant | Null): T =
       if c == null then tree else tree.withType(ConstantType(c)).asInstanceOf[T]
@@ -164,15 +175,24 @@ object ConstFold:
     case _ => null
   }
   private def foldStringOp(op: Name, x: Constant, y: Constant): Constant = op match {
-    case nme.ADD  => Constant(x.stringValue + y.stringValue)
+    case nme.ADD => Constant(x.stringValue + y.stringValue)
     case nme.EQ  => Constant(x.stringValue == y.stringValue)
+    case nme.NE  => Constant(x.stringValue != y.stringValue)
     case _ => null
   }
 
+  private def foldNullOp(op: Name, x: Constant, y: Constant): Constant =
+    assert(x.tag == NullTag || y.tag == NullTag)
+    op match
+      case nme.EQ => Constant(x.tag == y.tag)
+      case nme.NE => Constant(x.tag != y.tag)
+      case _ => null
+
   private def foldBinop(op: Name, x: Constant, y: Constant): Constant =
     val optag =
       if (x.tag == y.tag) x.tag
       else if (x.isNumeric && y.isNumeric) math.max(x.tag, y.tag)
+      else if (x.tag == NullTag || y.tag == NullTag) NullTag
       else NoTag
 
     try optag match
@@ -182,6 +202,7 @@ object ConstFold:
       case  FloatTag                              => foldFloatOp(op, x, y)
       case  DoubleTag                             => foldDoubleOp(op, x, y)
       case  StringTag                             => foldStringOp(op, x, y)
+      case  NullTag                               => foldNullOp(op, x, y)
       case  _                                     => null
       catch case ex: ArithmeticException => null // the code will crash at runtime,
                                                  // but that is better than the
diff --git a/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala b/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala
new file mode 100644
index 000000000000..970b771623f6
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala
@@ -0,0 +1,216 @@
+package dotty.tools
+package dotc
+package transform
+
+import core.*
+import Symbols.*, Types.*, Contexts.*, Flags.*, SymUtils.*, Decorators.*, reporting.*
+import util.SrcPos
+import config.{ScalaVersion, NoScalaVersion, Feature, ScalaRelease}
+import MegaPhase.MiniPhase
+import scala.util.{Failure, Success}
+import ast.tpd
+
+class CrossVersionChecks extends MiniPhase:
+  import tpd.*
+
+  override def phaseName: String = CrossVersionChecks.name
+
+  override def description: String = CrossVersionChecks.description
+
+  override def runsAfterGroupsOf: Set[String] = Set(FirstTransform.name)
+    // We assume all type trees except TypeTree have been eliminated
+
+  // Note: if a symbol has both @deprecated and @migration annotations and both
+  // warnings are enabled, only the first one checked here will be emitted.
+  // I assume that's a consequence of some code trying to avoid noise by suppressing
+  // warnings after the first, but I think it'd be better if we didn't have to
+  // arbitrarily choose one as more important than the other.
+  private def checkUndesiredProperties(sym: Symbol, pos: SrcPos)(using Context): Unit =
+    checkDeprecated(sym, pos)
+    checkExperimental(sym, pos)
+    checkSinceAnnot(sym, pos)
+
+    val xMigrationValue = ctx.settings.Xmigration.value
+    if xMigrationValue != NoScalaVersion then
+      checkMigration(sym, pos, xMigrationValue)
+
+
+  /** If @deprecated is present, and the point of reference is not enclosed
+   * in either a deprecated member or a scala bridge method, issue a warning.
+   */
+  private def checkDeprecated(sym: Symbol, pos: SrcPos)(using Context): Unit =
+
+    /** is the owner an enum or its companion and also the owner of sym */
+    def isEnumOwner(owner: Symbol)(using Context) =
+      // pre: sym is an enumcase
+      if owner.isEnumClass then owner.companionClass eq sym.owner
+      else if owner.is(ModuleClass) && owner.companionClass.isEnumClass then owner eq sym.owner
+      else false
+
+    def isDeprecatedOrEnum(owner: Symbol)(using Context) =
+      // pre: sym is an enumcase
+      owner.isDeprecated
+      || isEnumOwner(owner)
+
+    /**Scan the chain of outer declaring scopes from the current context
+     * a deprecation warning will be skipped if one the following holds
+     * for a given declaring scope:
+     * - the symbol associated with the scope is also deprecated.
+     * - if and only if `sym` is an enum case, the scope is either
+     *   a module that declares `sym`, or the companion class of the
+     *   module that declares `sym`.
+     */
+    def skipWarning(using Context) =
+      ctx.owner.ownersIterator.exists(if sym.isEnumCase then isDeprecatedOrEnum else _.isDeprecated)
+
+    for annot <- sym.getAnnotation(defn.DeprecatedAnnot) do
+      if !skipWarning then
+        val msg = annot.argumentConstant(0).map(": " + _.stringValue).getOrElse("")
+        val since = annot.argumentConstant(1).map(" since " + _.stringValue).getOrElse("")
+        report.deprecationWarning(s"${sym.showLocated} is deprecated${since}${msg}", pos)
+
+  private def checkExperimental(sym: Symbol, pos: SrcPos)(using Context): Unit =
+    if sym.isExperimental && !ctx.owner.isInExperimentalScope then
+      Feature.checkExperimentalDef(sym, pos)
+
+  private def checkExperimentalSignature(sym: Symbol, pos: SrcPos)(using Context): Unit =
+    class Checker extends TypeTraverser:
+      def traverse(tp: Type): Unit =
+        if tp.typeSymbol.isExperimental then
+          Feature.checkExperimentalDef(tp.typeSymbol, pos)
+        else
+          traverseChildren(tp)
+    if !sym.isInExperimentalScope then
+      new Checker().traverse(sym.info)
+
+  private def checkExperimentalAnnots(sym: Symbol)(using Context): Unit =
+    if !sym.isInExperimentalScope then
+      for annot <- sym.annotations if annot.symbol.isExperimental do
+        Feature.checkExperimentalDef(annot.symbol, annot.tree)
+
+  private def checkSinceAnnot(sym: Symbol, pos: SrcPos)(using Context): Unit =
+    for
+      annot <- sym.getAnnotation(defn.SinceAnnot)
+      releaseName <- annot.argumentConstantString(0)
+    do
+      ScalaRelease.parse(releaseName) match
+        case Some(release) if release > ctx.scalaRelease =>
+          report.error(
+            i"$sym was added in Scala release ${releaseName.show}, therefore it cannot be used in the code targeting Scala ${ctx.scalaRelease.show}",
+            pos)
+        case None =>
+          report.error(i"$sym has an unparsable release name: '${releaseName}'", annot.tree.srcPos)
+        case _ =>
+
+  private def checkSinceAnnotInSignature(sym: Symbol, pos: SrcPos)(using Context) =
+    new TypeTraverser:
+      def traverse(tp: Type) =
+        if tp.typeSymbol.hasAnnotation(defn.SinceAnnot) then
+          checkSinceAnnot(tp.typeSymbol, pos)
+        else
+          traverseChildren(tp)
+    .traverse(sym.info)
+
+  /** If @migration is present (indicating that the symbol has changed semantics between versions),
+   *  emit a warning.
+   */
+  private def checkMigration(sym: Symbol, pos: SrcPos, xMigrationValue: ScalaVersion)(using Context): Unit =
+    for annot <- sym.getAnnotation(defn.MigrationAnnot) do
+      val migrationVersion = ScalaVersion.parse(annot.argumentConstant(1).get.stringValue)
+      migrationVersion match
+        case Success(symVersion) if xMigrationValue < symVersion =>
+          val msg = annot.argumentConstant(0).get.stringValue
+          report.warning(SymbolChangedSemanticsInVersion(sym, symVersion, msg), pos)
+        case Failure(ex) =>
+          report.warning(SymbolHasUnparsableVersionNumber(sym, ex.getMessage), pos)
+        case _ =>
+
+  /** Check that a deprecated val or def does not override a
+   *  concrete, non-deprecated method.  If it does, then
+   *  deprecation is meaningless.
+   */
+  private def checkDeprecatedOvers(tree: Tree)(using Context): Unit = {
+    val symbol = tree.symbol
+    if (symbol.isDeprecated) {
+      val concrOvers =
+        symbol.allOverriddenSymbols.filter(sym =>
+          !sym.isDeprecated && !sym.is(Deferred))
+      if (!concrOvers.isEmpty)
+        report.deprecationWarning(
+          symbol.toString + " overrides concrete, non-deprecated symbol(s):" +
+            concrOvers.map(_.name).mkString("    ", ", ", ""), tree.srcPos)
+    }
+  }
+
+  /** Check that classes extending experimental classes or nested in experimental classes have the @experimental annotation. */
+  private def checkExperimentalInheritance(cls: ClassSymbol)(using Context): Unit =
+    if !cls.isAnonymousClass && !cls.hasAnnotation(defn.ExperimentalAnnot) then
+      cls.info.parents.find(_.typeSymbol.isExperimental) match
+        case Some(parent) =>
+          report.error(em"extension of experimental ${parent.typeSymbol} must have @experimental annotation", cls.srcPos)
+        case _ =>
+  end checkExperimentalInheritance
+
+  override def transformValDef(tree: ValDef)(using Context): ValDef =
+    checkDeprecatedOvers(tree)
+    checkExperimentalAnnots(tree.symbol)
+    checkExperimentalSignature(tree.symbol, tree)
+    checkSinceAnnot(tree.symbol, tree.srcPos)
+    checkSinceAnnotInSignature(tree.symbol, tree)
+    tree
+
+  override def transformDefDef(tree: DefDef)(using Context): DefDef =
+    checkDeprecatedOvers(tree)
+    checkExperimentalAnnots(tree.symbol)
+    checkExperimentalSignature(tree.symbol, tree)
+    checkSinceAnnotInSignature(tree.symbol, tree)
+    tree
+
+  override def transformTemplate(tree: Template)(using Context): Tree =
+    val cls = ctx.owner.asClass
+    checkExperimentalInheritance(cls)
+    checkExperimentalAnnots(cls)
+    tree
+
+  override def transformIdent(tree: Ident)(using Context): Ident = {
+    checkUndesiredProperties(tree.symbol, tree.srcPos)
+    tree
+  }
+
+  override def transformSelect(tree: Select)(using Context): Select = {
+    checkUndesiredProperties(tree.symbol, tree.srcPos)
+    tree
+  }
+
+  override def transformNew(tree: New)(using Context): New = {
+    checkUndesiredProperties(tree.tpe.typeSymbol, tree.srcPos)
+    tree
+  }
+
+  override def transformTypeTree(tree: TypeTree)(using Context): TypeTree = {
+    val tpe = tree.tpe
+    tpe.foreachPart {
+      case TypeRef(_, sym: Symbol)  =>
+        checkDeprecated(sym, tree.srcPos)
+        checkExperimental(sym, tree.srcPos)
+        checkSinceAnnot(sym, tree.srcPos)
+      case TermRef(_, sym: Symbol)  =>
+        checkDeprecated(sym, tree.srcPos)
+        checkExperimental(sym, tree.srcPos)
+        checkSinceAnnot(sym, tree.srcPos)
+      case _ =>
+    }
+    tree
+  }
+
+  override def transformTypeDef(tree: TypeDef)(using Context): TypeDef = {
+    checkExperimentalAnnots(tree.symbol)
+    checkSinceAnnot(tree.symbol, tree.srcPos)
+    tree
+  }
+
+end CrossVersionChecks
+
+object CrossVersionChecks:
+  val name: String = "crossVersionChecks"
+  val description: String = "check issues related to deprecated and experimental"
diff --git a/compiler/src/dotty/tools/dotc/typer/Deriving.scala b/compiler/src/dotty/tools/dotc/typer/Deriving.scala
index 269924c21114..39a775d61f8c 100644
--- a/compiler/src/dotty/tools/dotc/typer/Deriving.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Deriving.scala
@@ -83,7 +83,10 @@ trait Deriving {
      */
     private def processDerivedInstance(derived: untpd.Tree): Unit = {
       val originalTypeClassType = typedAheadType(derived, AnyTypeConstructorProto).tpe
-      val typeClassType = checkClassType(underlyingClassRef(originalTypeClassType), derived.srcPos, traitReq = false, stablePrefixReq = true)
+      val underlyingClassType = underlyingClassRef(originalTypeClassType)
+      val typeClassType = checkClassType(
+          underlyingClassType.orElse(originalTypeClassType),
+          derived.srcPos, traitReq = false, stablePrefixReq = true)
       val typeClass = typeClassType.classSymbol
       val typeClassParams = typeClass.typeParams
       val typeClassArity = typeClassParams.length
@@ -160,7 +163,7 @@ trait Deriving {
         val clsParamInfos = clsType.typeParams
         val clsArity = clsParamInfos.length
         val alignedClsParamInfos = clsParamInfos.takeRight(instanceArity)
-        val alignedTypeClassParamInfos = typeClassParamInfos.take(alignedClsParamInfos.length)
+        val alignedTypeClassParamInfos = typeClassParamInfos.takeRight(alignedClsParamInfos.length)
 
 
         if ((instanceArity == clsArity || instanceArity > 0) && sameParamKinds(alignedClsParamInfos, alignedTypeClassParamInfos)) {
diff --git a/compiler/src/dotty/tools/dotc/typer/Dynamic.scala b/compiler/src/dotty/tools/dotc/typer/Dynamic.scala
index 232ad8456c0a..72a0cfe9dcbe 100644
--- a/compiler/src/dotty/tools/dotc/typer/Dynamic.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Dynamic.scala
@@ -186,7 +186,7 @@ trait Dynamic {
       val base =
         untpd.Apply(
           untpd.TypedSplice(selectable.select(selectorName)).withSpan(fun.span),
-          (Literal(Constant(name.toString)) :: Nil).map(untpd.TypedSplice(_)))
+          (Literal(Constant(name.encode.toString)) :: Nil).map(untpd.TypedSplice(_)))
 
       val scall =
         if (vargss.isEmpty) base
diff --git a/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala b/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala
index 413ae14762b8..733977734329 100644
--- a/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala
+++ b/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala
@@ -51,6 +51,16 @@ object ErrorReporting {
       case _ =>
         report.error(em"missing arguments for $meth", tree.srcPos)
 
+  def matchReductionAddendum(tps: Type*)(using Context): String =
+    val collectMatchTrace = new TypeAccumulator[String]:
+      def apply(s: String, tp: Type): String =
+        if s.nonEmpty then s
+        else tp match
+          case tp: AppliedType if tp.isMatchAlias => MatchTypeTrace.record(tp.tryNormalize)
+          case tp: MatchType => MatchTypeTrace.record(tp.tryNormalize)
+          case _ => foldOver(s, tp)
+    tps.foldLeft("")(collectMatchTrace)
+
   class Errors(using Context) {
 
     /** An explanatory note to be added to error messages
@@ -121,7 +131,7 @@ object ErrorReporting {
         case If(_, _, elsep @ Literal(Constant(()))) if elsep.span.isSynthetic =>
           "\nMaybe you are missing an else part for the conditional?"
         case _ => ""
-      errorTree(tree, TypeMismatch(treeTp, pt, implicitFailure.whyNoConversion, missingElse))
+      errorTree(tree, TypeMismatch(treeTp, pt, Some(tree), implicitFailure.whyNoConversion, missingElse))
     }
 
     /** A subtype log explaining why `found` does not conform to `expected` */
@@ -132,18 +142,17 @@ object ErrorReporting {
           |conforms to
           |  $expected
           |but the comparison trace ended with `false`:
-          """
+          |"""
       val c = ctx.typerState.constraint
       val constraintText =
         if c.domainLambdas.isEmpty then
           "the empty constraint"
         else
           i"""a constraint with:
-             |${c.contentsToString}"""
-      i"""
-        |${TypeComparer.explained(_.isSubType(found, expected), header)}
-        |
-        |The tests were made under $constraintText"""
+             |$c"""
+      i"""${TypeComparer.explained(_.isSubType(found, expected), header)}
+         |
+         |The tests were made under $constraintText"""
 
     /** Format `raw` implicitNotFound or implicitAmbiguous argument, replacing
      *  all occurrences of `${X}` where `X` is in `paramNames` with the
@@ -230,7 +239,6 @@ object ErrorReporting {
   def err(using Context): Errors = new Errors
 }
 
-
 class ImplicitSearchError(
   arg: tpd.Tree,
   pt: Type,
@@ -239,6 +247,7 @@ class ImplicitSearchError(
   ignoredInstanceNormalImport: => Option[SearchSuccess],
   importSuggestionAddendum: => String
 )(using ctx: Context) {
+
   def missingArgMsg = arg.tpe match {
     case ambi: AmbiguousImplicits =>
       (ambi.alt1, ambi.alt2) match {
@@ -253,7 +262,9 @@ class ImplicitSearchError(
       val shortMessage = userDefinedImplicitNotFoundParamMessage
         .orElse(userDefinedImplicitNotFoundTypeMessage)
         .getOrElse(defaultImplicitNotFoundMessage)
-      formatMsg(shortMessage)() ++ hiddenImplicitsAddendum
+      formatMsg(shortMessage)()
+      ++ hiddenImplicitsAddendum
+      ++ ErrorReporting.matchReductionAddendum(pt)
   }
 
   private def formatMsg(shortForm: String)(headline: String = shortForm) = arg match {
@@ -303,7 +314,7 @@ class ImplicitSearchError(
   }
 
   private def defaultImplicitNotFoundMessage = {
-    em"no implicit argument of type $pt was found${location("for")}"
+    ex"no implicit argument of type $pt was found${location("for")}"
   }
 
   /** Construct a custom error message given an ambiguous implicit
@@ -402,7 +413,7 @@ class ImplicitSearchError(
 
   private def hiddenImplicitsAddendum: String =
     def hiddenImplicitNote(s: SearchSuccess) =
-      em"\n\nNote: given instance ${s.ref.symbol.showLocated} was not considered because it was not imported with `import given`."
+      em"\n\nNote: ${s.ref.symbol.showLocated} was not considered because it was not imported with `import given`."
 
     val normalImports = ignoredInstanceNormalImport.map(hiddenImplicitNote)
 
diff --git a/compiler/src/dotty/tools/dotc/typer/EtaExpansion.scala b/compiler/src/dotty/tools/dotc/typer/EtaExpansion.scala
index 32849de6f560..c04b5f1d2d85 100644
--- a/compiler/src/dotty/tools/dotc/typer/EtaExpansion.scala
+++ b/compiler/src/dotty/tools/dotc/typer/EtaExpansion.scala
@@ -48,7 +48,7 @@ abstract class Lifter {
     else {
       val name = UniqueName.fresh(prefix)
       // don't instantiate here, as the type params could be further constrained, see tests/pos/pickleinf.scala
-      var liftedType = expr.tpe.widen
+      var liftedType = expr.tpe.widen.deskolemized
       if (liftedFlags.is(Method)) liftedType = ExprType(liftedType)
       val lifted = newSymbol(ctx.owner, name, liftedFlags | Synthetic, liftedType, coord = spanCoord(expr.span))
       defs += liftedDef(lifted, expr)
@@ -88,8 +88,10 @@ abstract class Lifter {
     methRef.widen match {
       case mt: MethodType =>
         args.lazyZip(mt.paramNames).lazyZip(mt.paramInfos).map { (arg, name, tp) =>
-          val lifter = if (tp.isInstanceOf[ExprType]) exprLifter else this
-          lifter.liftArg(defs, arg, if (name.firstPart contains '$') EmptyTermName else name)
+          if tp.hasAnnotation(defn.InlineParamAnnot) then arg
+          else
+            val lifter = if (tp.isInstanceOf[ExprType]) exprLifter else this
+            lifter.liftArg(defs, arg, if (name.firstPart contains '$') EmptyTermName else name)
         }
       case _ =>
         args.mapConserve(liftArg(defs, _))
diff --git a/compiler/src/dotty/tools/dotc/typer/FrontEnd.scala b/compiler/src/dotty/tools/dotc/typer/FrontEnd.scala
deleted file mode 100644
index 0f51b19ddf91..000000000000
--- a/compiler/src/dotty/tools/dotc/typer/FrontEnd.scala
+++ /dev/null
@@ -1,133 +0,0 @@
-package dotty.tools
-package dotc
-package typer
-
-import core._
-import Phases._
-import Contexts._
-import Symbols._
-import Decorators._
-import ImportInfo.withRootImports
-import parsing.JavaParsers.JavaParser
-import parsing.Parsers.Parser
-import config.Config
-import config.Printers.{typr, default}
-import util.Stats._
-import util.{ SourcePosition, NoSourcePosition }
-import scala.util.control.NonFatal
-import ast.Trees._
-
-class FrontEnd extends Phase {
-
-  override def phaseName: String = FrontEnd.name
-  override def isTyper: Boolean = true
-  import ast.tpd
-
-  override def allowsImplicitSearch: Boolean = true
-
-  /** The contexts for compilation units that are parsed but not yet entered */
-  private var remaining: List[Context] = Nil
-
-  /** The position of the first XML literal encountered while parsing,
-   *  NoSourcePosition if there were no XML literals.
-   */
-  private var firstXmlPos: SourcePosition = NoSourcePosition
-
-  /** Does a source file ending with `<name>.scala` belong to a compilation unit
-   *  that is parsed but not yet entered?
-   */
-  def stillToBeEntered(name: String): Boolean =
-    remaining.exists(_.compilationUnit.toString.endsWith(name + ".scala"))
-
-  def monitor(doing: String)(body: => Unit)(using Context): Unit =
-    try body
-    catch
-      case NonFatal(ex) =>
-        report.echo(s"exception occurred while $doing ${ctx.compilationUnit}")
-        throw ex
-
-  def parse(using Context): Unit = monitor("parsing") {
-    val unit = ctx.compilationUnit
-
-    unit.untpdTree =
-      if (unit.isJava) new JavaParser(unit.source).parse()
-      else {
-        val p = new Parser(unit.source)
-       //  p.in.debugTokenStream = true
-        val tree = p.parse()
-        if (p.firstXmlPos.exists && !firstXmlPos.exists)
-          firstXmlPos = p.firstXmlPos
-        tree
-      }
-
-    val printer = if (ctx.settings.Xprint.value.contains("parser")) default else typr
-    printer.println("parsed:\n" + unit.untpdTree.show)
-    if (Config.checkPositions)
-      unit.untpdTree.checkPos(nonOverlapping = !unit.isJava && !ctx.reporter.hasErrors)
-  }
-
-  def enterSyms(using Context): Unit = monitor("indexing") {
-    val unit = ctx.compilationUnit
-    ctx.typer.index(unit.untpdTree)
-    typr.println("entered: " + unit.source)
-  }
-
-  def typeCheck(using Context): Unit = monitor("typechecking") {
-    try
-      val unit = ctx.compilationUnit
-      if !unit.suspended then
-        unit.tpdTree = ctx.typer.typedExpr(unit.untpdTree)
-        typr.println("typed: " + unit.source)
-        record("retained untyped trees", unit.untpdTree.treeSize)
-        record("retained typed trees after typer", unit.tpdTree.treeSize)
-    catch
-      case ex: CompilationUnit.SuspendException =>
-  }
-
-  def javaCheck(using Context): Unit = monitor("checking java") {
-    val unit = ctx.compilationUnit
-    if unit.isJava then
-      JavaChecks.check(unit.tpdTree)
-  }
-
-
-  private def firstTopLevelDef(trees: List[tpd.Tree])(using Context): Symbol = trees match
-    case PackageDef(_, defs) :: _    => firstTopLevelDef(defs)
-    case Import(_, _) :: defs        => firstTopLevelDef(defs)
-    case (tree @ TypeDef(_, _)) :: _ => tree.symbol
-    case _ => NoSymbol
-
-  protected def discardAfterTyper(unit: CompilationUnit)(using Context): Boolean =
-    unit.isJava || unit.suspended
-
-  override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] =
-    val unitContexts =
-      for unit <- units yield
-        report.inform(s"compiling ${unit.source}")
-        ctx.fresh.setCompilationUnit(unit).withRootImports
-    unitContexts.foreach(parse(using _))
-    record("parsedTrees", ast.Trees.ntrees)
-    remaining = unitContexts
-    while remaining.nonEmpty do
-      enterSyms(using remaining.head)
-      remaining = remaining.tail
-
-    if firstXmlPos.exists && !defn.ScalaXmlPackageClass.exists then
-      report.error("""To support XML literals, your project must depend on scala-xml.
-                  |See https://github.com/scala/scala-xml for more information.""".stripMargin,
-        firstXmlPos)
-
-    unitContexts.foreach(typeCheck(using _))
-    record("total trees after typer", ast.Trees.ntrees)
-    unitContexts.foreach(javaCheck(using _)) // after typechecking to avoid cycles
-
-    val newUnits = unitContexts.map(_.compilationUnit).filterNot(discardAfterTyper)
-    ctx.run.checkSuspendedUnits(newUnits)
-    newUnits
-
-  def run(using Context): Unit = unsupported("run")
-}
-
-object FrontEnd {
-  val name: String = "typer"
-}
diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala
index 2b01a7245969..4824031f12bc 100644
--- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala
@@ -25,6 +25,7 @@ import Constants._
 import ProtoTypes._
 import ErrorReporting._
 import Inferencing.{fullyDefinedType, isFullyDefined}
+import Scopes.newScope
 import Trees._
 import transform.SymUtils._
 import transform.TypeUtils._
@@ -66,10 +67,10 @@ object Implicits:
   }
   object Candidate {
     type Kind = Int
-    final val None = 0
-    final val Value = 1
-    final val Conversion = 2
-    final val Extension = 4
+    inline val None = 0
+    inline val Value = 1
+    inline val Conversion = 2
+    inline val Extension = 4
   }
 
   /** If `expected` is a selection prototype, does `tp` have an extension
@@ -287,7 +288,7 @@ object Implicits:
       }
 
     override def isAccessible(ref: TermRef)(using Context): Boolean =
-      ref.symbol.exists && !ref.symbol.is(Private)
+      ref.symbol.exists
 
     override def toString: String =
       i"OfTypeImplicits($tp), companions = ${companionRefs.showAsList}%, %; refs = $refs%, %."
@@ -330,11 +331,25 @@ object Implicits:
       (this eq finalImplicits) || (outerImplicits eq finalImplicits)
     }
 
+    private def combineEligibles(ownEligible: List[Candidate], outerEligible: List[Candidate]): List[Candidate] =
+      if ownEligible.isEmpty then outerEligible
+      else if outerEligible.isEmpty then ownEligible
+      else
+        val shadowed = ownEligible.map(_.ref.implicitName).toSet
+        ownEligible ::: outerEligible.filterConserve(cand => !shadowed.contains(cand.ref.implicitName))
+
+    def uncachedEligible(tp: Type)(using Context): List[Candidate] =
+      Stats.record("uncached eligible")
+      if monitored then record(s"check uncached eligible refs in irefCtx", refs.length)
+      val ownEligible = filterMatching(tp)
+      if isOuterMost then ownEligible
+      else combineEligibles(ownEligible, outerImplicits.uncachedEligible(tp))
+
     /** The implicit references that are eligible for type `tp`. */
     def eligible(tp: Type): List[Candidate] =
       if (tp.hash == NotCached)
         Stats.record(i"compute eligible not cached ${tp.getClass}")
-        Stats.record(i"compute eligible not cached")
+        Stats.record("compute eligible not cached")
         computeEligible(tp)
       else {
         val eligibles = eligibleCache.lookup(tp)
@@ -354,14 +369,8 @@ object Implicits:
     private def computeEligible(tp: Type): List[Candidate] = /*>|>*/ trace(i"computeEligible $tp in $refs%, %", implicitsDetailed) /*<|<*/ {
       if (monitored) record(s"check eligible refs in irefCtx", refs.length)
       val ownEligible = filterMatching(tp)
-      if (isOuterMost) ownEligible
-      else if ownEligible.isEmpty then outerImplicits.eligible(tp)
-      else
-        val outerEligible = outerImplicits.eligible(tp)
-        if outerEligible.isEmpty then ownEligible
-        else
-          val shadowed = ownEligible.map(_.ref.implicitName).toSet
-          ownEligible ::: outerEligible.filterConserve(cand => !shadowed.contains(cand.ref.implicitName))
+      if isOuterMost then ownEligible
+      else combineEligibles(ownEligible, outerImplicits.eligible(tp))
     }
 
     override def isAccessible(ref: TermRef)(using Context): Boolean =
@@ -462,20 +471,26 @@ object Implicits:
       val ctx1 = ctx.fresh.setExploreTyperState()
       ctx1.typerState.constraint = constraint
       inContext(ctx1) {
-        val map = new TypeMap {
-          def apply(t: Type): Type = t match {
+        val map = new TypeMap:
+          def apply(t: Type): Type = t match
             case t: TypeParamRef =>
-              constraint.entry(t) match {
-                case NoType => t
-                case bounds: TypeBounds => TypeComparer.fullBounds(t)
+              constraint.entry(t) match
+                case NoType | _: TypeBounds => t
                 case t1 => t1
-              }
             case t: TypeVar =>
               t.instanceOpt.orElse(apply(t.origin))
             case _ =>
               mapOver(t)
-          }
-        }
+
+          override def mapArgs(args: List[Type], tparams: List[ParamInfo]) =
+            args.mapConserve {
+              case t: TypeParamRef =>
+                constraint.entry(t) match
+                  case bounds: TypeBounds => TypeComparer.fullBounds(t)
+                  case _ => this(t)
+              case t => this(t)
+            }
+        end map
         map(tp)
       }
 
@@ -489,10 +504,20 @@ object Implicits:
   @sharable val NoMatchingImplicitsFailure: SearchFailure =
     SearchFailure(NoMatchingImplicits, NoSpan)(using NoContext)
 
+  @sharable object ImplicitSearchTooLarge extends NoMatchingImplicits(NoType, EmptyTree, OrderingConstraint.empty)
+
+  @sharable val ImplicitSearchTooLargeFailure: SearchFailure =
+    SearchFailure(ImplicitSearchTooLarge, NoSpan)(using NoContext)
+
   /** An ambiguous implicits failure */
   class AmbiguousImplicits(val alt1: SearchSuccess, val alt2: SearchSuccess, val expectedType: Type, val argument: Tree) extends SearchFailureType {
     def explanation(using Context): String =
-      em"both ${err.refStr(alt1.ref)} and ${err.refStr(alt2.ref)} $qualify"
+      var str1 = err.refStr(alt1.ref)
+      var str2 = err.refStr(alt2.ref)
+      if str1 == str2 then
+        str1 = ctx.printer.toTextRef(alt1.ref).show
+        str2 = ctx.printer.toTextRef(alt2.ref).show
+      em"both $str1 and $str2 $qualify"
     override def whyNoConversion(using Context): String =
       if !argument.isEmpty && argument.tpe.widen.isRef(defn.NothingClass) then
         ""
@@ -557,7 +582,6 @@ trait ImplicitRunInfo:
 
     object collectParts extends TypeTraverser:
 
-      private var provisional: Boolean = _
       private var parts: mutable.LinkedHashSet[Type] = _
       private val partSeen = util.HashSet[Type]()
 
@@ -582,19 +606,18 @@ trait ImplicitRunInfo:
             case t: ConstantType =>
               traverse(t.underlying)
             case t: TypeParamRef =>
+              assert(!ctx.typerState.constraint.contains(t), i"`wildApprox` failed to remove uninstantiated $t")
               traverse(t.underlying)
-              if ctx.typerState.constraint.contains(t) then provisional = true
             case t: TermParamRef =>
               traverse(t.underlying)
             case t =>
               traverseChildren(t)
 
-      def apply(tp: Type): (collection.Set[Type], Boolean) =
-        provisional = false
+      def apply(tp: Type): collection.Set[Type] =
         parts = mutable.LinkedHashSet()
         partSeen.clear()
         traverse(tp)
-        (parts, provisional)
+        parts
     end collectParts
 
     val seen = util.HashSet[Type]()
@@ -669,12 +692,11 @@ trait ImplicitRunInfo:
     end collectCompanions
 
     def recur(tp: Type): OfTypeImplicits =
-      val (parts, provisional) = collectParts(tp)
+      val parts = collectParts(tp)
       val companions = collectCompanions(tp, parts)
       val result = OfTypeImplicits(tp, companions)(runContext)
       if Config.cacheImplicitScopes
         && tp.hash != NotCached
-        && !provisional
         && (tp eq rootTp)              // first type traversed is always cached
            || !incomplete.contains(tp) // other types are cached if they are not incomplete
       then implicitScopeCache(tp) = result
@@ -727,7 +749,7 @@ trait ImplicitRunInfo:
       case null =>
         record(i"implicitScope")
         val liftToAnchors = new TypeMap:
-          override def stopAtStatic = true
+          override def stopAt = StopAt.Static
           private val seen = util.HashSet[Type]()
 
           def applyToUnderlying(t: TypeProxy) =
@@ -788,16 +810,8 @@ trait Implicits:
    */
   def inferView(from: Tree, to: Type)(using Context): SearchResult = {
     record("inferView")
-    val wfromtp = from.tpe.widen
-    if    to.isAny
-       || to.isAnyRef
-       || to.isRef(defn.UnitClass)
-       || wfromtp.isRef(defn.NothingClass)
-       || wfromtp.isRef(defn.NullClass)
-       || !ctx.mode.is(Mode.ImplicitsEnabled)
-       || from.isInstanceOf[Super]
-       || (wfromtp eq NoPrefix)
-    then NoMatchingImplicitsFailure
+    if !ctx.mode.is(Mode.ImplicitsEnabled) || from.isInstanceOf[Super] then
+      NoMatchingImplicitsFailure
     else {
       def adjust(to: Type) = to.stripTypeVar.widenExpr match {
         case SelectionProto(name, memberProto, compat, true) =>
@@ -874,7 +888,8 @@ trait Implicits:
     def ignoredInstanceNormalImport = arg.tpe match
       case fail: SearchFailureType =>
         if (fail.expectedType eq pt) || isFullyDefined(fail.expectedType, ForceDegree.none) then
-          inferImplicit(fail.expectedType, fail.argument, arg.span) match {
+          inferImplicit(fail.expectedType, fail.argument, arg.span)(
+            using findHiddenImplicitsCtx(ctx)) match {
             case s: SearchSuccess => Some(s)
             case f: SearchFailure =>
               f.reason match {
@@ -924,6 +939,8 @@ trait Implicits:
           apply(t.widen)
         case t: RefinedType =>
           apply(t.parent)
+        case t: LazyRef =>
+          t
         case _ =>
           if (variance > 0) mapOver(t) else t
       }
@@ -963,7 +980,7 @@ trait Implicits:
     trace(s"search implicit ${pt.show}, arg = ${argument.show}: ${argument.tpe.show}", implicits, show = true) {
       record("inferImplicit")
       assert(ctx.phase.allowsImplicitSearch,
-        if (argument.isEmpty) i"missing implicit parameter of type $pt after typer"
+        if (argument.isEmpty) i"missing implicit parameter of type $pt after typer at phase ${ctx.phase.phaseName}"
         else i"type error: ${argument.tpe} does not conform to $pt${err.whyNoMatchStr(argument.tpe, pt)}")
 
       if pt.unusableForInference
@@ -971,16 +988,31 @@ trait Implicits:
       then return NoMatchingImplicitsFailure
 
       val result0 =
-        try ImplicitSearch(pt, argument, span).bestImplicit
+        // If we are searching implicits when resolving an import symbol, start the search
+        // in the first enclosing context that does not have the same scope and owner as the current
+        // context. Without that precaution, an eligible implicit in the current scope
+        // would cause a cyclic reference error (if the import is named) or cause a
+        // spurious import skip (if the import is a wildcard import). See i12802 for a test case.
+        var searchCtx = ctx
+        if ctx.owner.isImport then
+          while
+            searchCtx = searchCtx.outer
+            (searchCtx.scope eq ctx.scope) && (searchCtx.owner eq ctx.owner.owner)
+          do ()
+
+        try ImplicitSearch(pt, argument, span)(using searchCtx).bestImplicit
         catch case ce: CyclicReference =>
           ce.inImplicitSearch = true
           throw ce
+      end result0
 
       val result =
         result0 match {
           case result: SearchSuccess =>
-            result.tstate.commit()
-            ctx.gadt.restore(result.gstate)
+            if result.tstate ne ctx.typerState then
+              result.tstate.commit()
+            if result.gstate ne ctx.gadt then
+              ctx.gadt.restore(result.gstate)
             if hasSkolem(false, result.tree) then
               report.error(SkolemInInferred(result.tree, pt, argument), ctx.source.atSpan(span))
             implicits.println(i"success: $result")
@@ -1018,13 +1050,22 @@ trait Implicits:
       val generated: Tree = tpd.ref(ref).withSpan(span.startPos)
       val locked = ctx.typerState.ownedVars
       val adapted =
-        if (argument.isEmpty)
-          adapt(generated, pt.widenExpr, locked)
+        if argument.isEmpty then
+          if defn.isContextFunctionType(pt) then
+            // need to go through typed, to build the context closure
+            typed(untpd.TypedSplice(generated), pt, locked)
+          else
+            // otherwise we can skip typing and go directly to adapt
+            adapt(generated, pt.widenExpr, locked)
         else {
           def untpdGenerated = untpd.TypedSplice(generated)
+          def producesConversion(info: Type): Boolean = info match
+            case info: PolyType => producesConversion(info.resType)
+            case info: MethodType if info.isImplicitMethod => producesConversion(info.resType)
+            case _ => info.derivesFrom(defn.ConversionClass)
           def tryConversion(using Context) = {
             val untpdConv =
-              if (ref.symbol.is(Given))
+              if ref.symbol.is(Given) && producesConversion(ref.symbol.info) then
                 untpd.Select(
                   untpd.TypedSplice(
                     adapt(generated,
@@ -1105,23 +1146,47 @@ trait Implicits:
 
     val isNotGiven: Boolean = wildProto.classSymbol == defn.NotGivenClass
 
+    private def searchTooLarge(): Boolean = ctx.searchHistory match
+      case root: SearchRoot =>
+        root.nestedSearches = 1
+        false
+      case h =>
+        val limit = ctx.settings.XimplicitSearchLimit.value
+        val nestedSearches = h.root.nestedSearches
+        val result = nestedSearches > limit
+        if result then
+          var c = ctx
+          while c.outer.typer eq ctx.typer do c = c.outer
+          report.warning(ImplicitSearchTooLargeWarning(limit, h.openSearchPairs), ctx.source.atSpan(span))(using c)
+        else
+          h.root.nestedSearches = nestedSearches + 1
+        result
+
     /** Try to type-check implicit reference, after checking that this is not
       * a diverging search
       */
     def tryImplicit(cand: Candidate, contextual: Boolean): SearchResult =
       if checkDivergence(cand) then
         SearchFailure(new DivergingImplicit(cand.ref, wideProto, argument), span)
-      else {
+      else if searchTooLarge() then
+        ImplicitSearchTooLargeFailure
+      else
         val history = ctx.searchHistory.nest(cand, pt)
-        val result =
-          typedImplicit(cand, pt, argument, span)(using nestedContext().setNewTyperState().setFreshGADTBounds.setSearchHistory(history))
-        result match {
+        val typingCtx =
+          nestedContext().setNewTyperState().setFreshGADTBounds.setSearchHistory(history)
+        val result = typedImplicit(cand, pt, argument, span)(using typingCtx)
+        result match
           case res: SearchSuccess =>
             ctx.searchHistory.defineBynameImplicit(wideProto, res)
           case _ =>
+            // Since the search failed, the local typerstate will be discarded
+            // without being committed, but type variables local to that state
+            // might still appear in an error message, so we run `gc()` here to
+            // make sure we don't forget their instantiation. This leads to more
+            // precise error messages in tests/neg/missing-implicit3.check and
+            // tests/neg/implicitSearch.check
+            typingCtx.typerState.gc()
             result
-        }
-      }
 
     /** Search a list of eligible implicit references */
     private def searchImplicit(eligible: List[Candidate], contextual: Boolean): SearchResult =
@@ -1150,7 +1215,29 @@ trait Implicits:
             // compare the extension methods instead of their wrappers.
             def stripExtension(alt: SearchSuccess) = methPart(stripApply(alt.tree)).tpe
             (stripExtension(alt1), stripExtension(alt2)) match
-              case (ref1: TermRef, ref2: TermRef) => diff = compare(ref1, ref2)
+              case (ref1: TermRef, ref2: TermRef) =>
+                // ref1 and ref2 might refer to type variables owned by
+                // alt1.tstate and alt2.tstate respectively, to compare the
+                // alternatives correctly we need a TyperState that includes
+                // constraints from both sides, see
+                // tests/*/extension-specificity2.scala for test cases.
+                val constraintsIn1 = alt1.tstate.constraint ne ctx.typerState.constraint
+                val constraintsIn2 = alt2.tstate.constraint ne ctx.typerState.constraint
+                def exploreState(alt: SearchSuccess): TyperState =
+                  alt.tstate.fresh(committable = false)
+                val comparisonState =
+                  if constraintsIn1 && constraintsIn2 then
+                    exploreState(alt1).mergeConstraintWith(alt2.tstate)
+                  else if constraintsIn1 then
+                    exploreState(alt1)
+                  else if constraintsIn2 then
+                    exploreState(alt2)
+                  else
+                    ctx.typerState
+
+                diff = inContext(ctx.withTyperState(comparisonState)) {
+                  compare(ref1, ref2)
+                }
               case _ =>
           if diff < 0 then alt2
           else if diff > 0 then alt1
@@ -1188,7 +1275,9 @@ trait Implicits:
 
             negateIfNot(tryImplicit(cand, contextual)) match {
               case fail: SearchFailure =>
-                if (fail.isAmbiguous)
+                if fail eq ImplicitSearchTooLargeFailure then
+                  fail
+                else if (fail.isAmbiguous)
                   if migrateTo3 then
                     val result = rank(remaining, found, NoMatchingImplicitsFailure :: rfailures)
                     if (result.isSuccess)
@@ -1247,78 +1336,158 @@ trait Implicits:
              |Consider using the scala.util.NotGiven class to implement similar functionality.""",
              ctx.source.atSpan(span))
 
-      /** A relation that influences the order in which implicits are tried.
+      /** Compare the length of the baseClasses of two symbols (except for objects,
+       *  where we use the length of the companion class instead if it's bigger).
+       *
+       *  This relation is meant to approximate `Applications#compareOwner` while also
+       *  inducing a total ordering: `compareOwner` returns `0` for unrelated symbols
+       *  and therefore only induces a partial ordering, meaning it cannot be used
+       *  as a sorting function (see `java.util.Comparator#compare`).
+       */
+      def compareBaseClassesLength(sym1: Symbol, sym2: Symbol): Int =
+        def len(sym: Symbol) =
+          if sym.is(ModuleClass) && sym.companionClass.exists then
+            Math.max(sym.asClass.baseClassesLength, sym.companionClass.asClass.baseClassesLength)
+          else if sym.isClass then
+            sym.asClass.baseClassesLength
+          else
+            0
+        len(sym1) - len(sym2)
+
+      /** A relation that influences the order in which eligible implicits are tried.
+       *
        *  We prefer (in order of importance)
        *   1. more deeply nested definitions
        *   2. definitions with fewer implicit parameters
-       *   3. definitions in subclasses
+       *   3. definitions whose owner has more parents (see `compareBaseClassesLength`)
        *  The reason for (2) is that we want to fail fast if the search type
        *  is underconstrained. So we look for "small" goals first, because that
        *  will give an ambiguity quickly.
        */
-      def prefer(cand1: Candidate, cand2: Candidate): Boolean =
-        val level1 = cand1.level
-        val level2 = cand2.level
-        if level1 > level2 then return true
-        if level1 < level2 then return false
-        val sym1 = cand1.ref.symbol
-        val sym2 = cand2.ref.symbol
+      def compareEligibles(e1: Candidate, e2: Candidate): Int =
+        if e1 eq e2 then return 0
+        val cmpLevel = e1.level - e2.level
+        if cmpLevel != 0 then return -cmpLevel // 1.
+        val sym1 = e1.ref.symbol
+        val sym2 = e2.ref.symbol
         val arity1 = sym1.info.firstParamTypes.length
         val arity2 = sym2.info.firstParamTypes.length
-        if arity1 < arity2 then return true
-        if arity1 > arity2 then return false
-        compareOwner(sym1.owner, sym2.owner) == 1
+        val cmpArity = arity1 - arity2
+        if cmpArity != 0 then return cmpArity // 2.
+        val cmpBcs = compareBaseClassesLength(sym1.owner, sym2.owner)
+        -cmpBcs // 3.
 
-      /** Sort list of implicit references according to `prefer`.
+      /** Check if `ord` respects the contract of `Ordering`.
+       *
+       *  More precisely, we check that its `compare` method respects the invariants listed
+       *  in https://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html#compare-T-T-
+       */
+      def validateOrdering(ord: Ordering[Candidate]): Unit =
+        for
+          x <- eligible
+          y <- eligible
+          cmpXY = Integer.signum(ord.compare(x, y))
+          cmpYX = Integer.signum(ord.compare(y, x))
+          z <- eligible
+          cmpXZ = Integer.signum(ord.compare(x, z))
+          cmpYZ = Integer.signum(ord.compare(y, z))
+        do
+          def reportViolation(msg: String): Unit =
+            Console.err.println(s"Internal error: comparison function violated ${msg.stripMargin}")
+          def showCandidate(c: Candidate): String =
+            s"$c (${c.ref.symbol.showLocated})"
+
+          if cmpXY != -cmpYX then
+            reportViolation(
+              s"""signum(cmp(x, y)) == -signum(cmp(y, x)) given:
+                 |x = ${showCandidate(x)}
+                 |y = ${showCandidate(y)}
+                 |cmpXY = $cmpXY
+                 |cmpYX = $cmpYX""")
+          if cmpXY != 0 && cmpXY == cmpYZ && cmpXZ != cmpXY then
+            reportViolation(
+              s"""transitivity given:
+                 |x = ${showCandidate(x)}
+                 |y = ${showCandidate(y)}
+                 |z = ${showCandidate(z)}
+                 |cmpXY = $cmpXY
+                 |cmpXZ = $cmpXZ
+                 |cmpYZ = $cmpYZ""")
+          if cmpXY == 0 && cmpXZ != cmpYZ then
+            reportViolation(
+              s"""cmp(x, y) == 0 implies that signum(cmp(x, z)) == signum(cmp(y, z)) given:
+                 |x = ${showCandidate(x)}
+                 |y = ${showCandidate(y)}
+                 |z = ${showCandidate(z)}
+                 |cmpXY = $cmpXY
+                 |cmpXZ = $cmpXZ
+                 |cmpYZ = $cmpYZ""")
+      end validateOrdering
+
+      /** Sort list of implicit references according to `compareEligibles`.
        *  This is just an optimization that aims at reducing the average
        *  number of candidates to be tested.
        */
-      def sort(eligible: List[Candidate]) = eligible match {
+      def sort(eligible: List[Candidate]) = eligible match
         case Nil => eligible
         case e1 :: Nil => eligible
         case e1 :: e2 :: Nil =>
-          if (prefer(e2, e1)) e2 :: e1 :: Nil
+          if compareEligibles(e2, e1) < 0 then e2 :: e1 :: Nil
           else eligible
         case _ =>
-          try eligible.sortWith(prefer)
+          val ord: Ordering[Candidate] = (a, b) => compareEligibles(a, b)
+          try eligible.sorted(using ord)
           catch case ex: IllegalArgumentException =>
-            // diagnostic to see what went wrong
-            for
-              e1 <- eligible
-              e2 <- eligible
-              if prefer(e1, e2)
-              e3 <- eligible
-              if prefer(e2, e3) && !prefer(e1, e3)
-            do
-              val es = List(e1, e2, e3)
-              println(i"transitivity violated for $es%, %\n ${es.map(_.implicitRef.underlyingRef.symbol.showLocated)}%, %")
+            // This exception being thrown probably means that our comparison
+            // function is broken, check if that's the case
+            validateOrdering(ord)
             throw ex
-      }
 
       rank(sort(eligible), NoMatchingImplicitsFailure, Nil)
     end searchImplicit
 
+    def isUnderSpecifiedArgument(tp: Type): Boolean =
+      tp.isRef(defn.NothingClass) || tp.isRef(defn.NullClass) || (tp eq NoPrefix)
+
+    private def isUnderspecified(tp: Type): Boolean = tp.stripTypeVar match
+      case tp: WildcardType =>
+        !tp.optBounds.exists || isUnderspecified(tp.optBounds.hiBound)
+      case tp: ViewProto =>
+        isUnderspecified(tp.resType)
+        || tp.resType.isRef(defn.UnitClass)
+        || isUnderSpecifiedArgument(tp.argType.widen)
+      case _ =>
+        tp.isAny || tp.isAnyRef
+
     private def searchImplicit(contextual: Boolean): SearchResult =
-      val eligible =
-        if contextual then ctx.implicits.eligible(wildProto)
-        else implicitScope(wildProto).eligible
-      searchImplicit(eligible, contextual) match
-        case result: SearchSuccess =>
-          result
-        case failure: SearchFailure =>
-          failure.reason match
-            case _: AmbiguousImplicits => failure
-            case reason =>
-              if contextual then
-                searchImplicit(contextual = false).recoverWith {
-                  failure2 => failure2.reason match
-                    case _: AmbiguousImplicits => failure2
-                    case _ =>
-                      reason match
-                        case (_: DivergingImplicit) => failure
-                        case _ => List(failure, failure2).maxBy(_.tree.treeSize)
-                }
-              else failure
+      if isUnderspecified(wildProto) then
+        NoMatchingImplicitsFailure
+      else
+        val eligible =
+          if contextual then
+            if ctx.gadt.isNarrowing then
+              withoutMode(Mode.ImplicitsEnabled) {
+                ctx.implicits.uncachedEligible(wildProto)
+              }
+            else ctx.implicits.eligible(wildProto)
+          else implicitScope(wildProto).eligible
+        searchImplicit(eligible, contextual) match
+          case result: SearchSuccess =>
+            result
+          case failure: SearchFailure =>
+            failure.reason match
+              case _: AmbiguousImplicits => failure
+              case reason =>
+                if contextual then
+                  searchImplicit(contextual = false).recoverWith {
+                    failure2 => failure2.reason match
+                      case _: AmbiguousImplicits => failure2
+                      case _ =>
+                        reason match
+                          case (_: DivergingImplicit) => failure
+                          case _ => List(failure, failure2).maxBy(_.tree.treeSize)
+                  }
+                else failure
     end searchImplicit
 
     /** Find a unique best implicit reference */
@@ -1497,13 +1666,17 @@ case class OpenSearch(cand: Candidate, pt: Type, outer: SearchHistory)(using Con
 end OpenSearch
 
 /**
- * The the state corresponding to the outermost context of an implicit searcch.
+ * The state corresponding to the outermost context of an implicit searcch.
  */
 final class SearchRoot extends SearchHistory:
   val root = this
   val byname = false
   def openSearchPairs = Nil
 
+  /** How many expressions were constructed so far in the current toplevel implicit search?
+   */
+  var nestedSearches: Int = 0
+
   /** The dictionary of recursive implicit types and corresponding terms for this search. */
   var myImplicitDictionary: mutable.Map[Type, (TermRef, tpd.Tree)] = null
   private def implicitDictionary =
@@ -1626,7 +1799,7 @@ final class SearchRoot extends SearchHistory:
             // }
 
             val parents = List(defn.ObjectType, defn.SerializableType)
-            val classSym = newNormalizedClassSymbol(ctx.owner, LazyImplicitName.fresh().toTypeName, Synthetic | Final, parents, coord = span)
+            val classSym = newNormalizedClassSymbol(ctx.owner, LazyImplicitName.fresh().toTypeName, Synthetic | Final, parents, newScope, coord = span)
             val vsyms = pruned.map(_._1.symbol)
             val nsyms = vsyms.map(vsym => newSymbol(classSym, vsym.name, EmptyFlags, vsym.info, coord = span).entered)
             val vsymMap = (vsyms zip nsyms).toMap
diff --git a/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala b/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala
index a975dd206d22..e8a923427b38 100644
--- a/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala
+++ b/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala
@@ -151,7 +151,7 @@ class ImportInfo(symf: Context ?=> Symbol,
     else
       for
         renamed <- reverseMapping.keys
-        denot <- pre.member(reverseMapping(renamed)).altsWith(_.isOneOf(GivenOrImplicit))
+        denot <- pre.member(reverseMapping(renamed)).altsWith(_.isOneOf(GivenOrImplicitVal))
       yield
         val original = reverseMapping(renamed)
         val ref = TermRef(pre, original, denot)
diff --git a/compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala b/compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala
index 7c11508ece65..bc82c9501c76 100644
--- a/compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala
+++ b/compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala
@@ -167,12 +167,15 @@ trait ImportSuggestions:
       allCandidates.map(_.implicitRef.underlyingRef.symbol).toSet
     }
 
+    def testContext(): Context =
+      ctx.fresh.retractMode(Mode.ImplicitsEnabled).setExploreTyperState()
+
     /** Test whether the head of a given instance matches the expected type `pt`,
      *  ignoring any dependent implicit arguments.
      */
     def shallowTest(ref: TermRef): Boolean =
       System.currentTimeMillis < deadLine
-      && inContext(ctx.fresh.setExploreTyperState()) {
+      && inContext(testContext()) {
         def test(pt: Type): Boolean = pt match
           case ViewProto(argType, OrType(rt1, rt2)) =>
             // Union types do not constrain results, since comparison with a union
@@ -209,7 +212,7 @@ trait ImportSuggestions:
         try
           timer.schedule(task, testOneImplicitTimeOut)
           typedImplicit(candidate, expectedType, argument, span)(
-            using ctx.fresh.setExploreTyperState()).isSuccess
+            using testContext()).isSuccess
         finally
           if task.cancel() then // timer task has not run yet
             assert(!ctx.run.isCancelled)
@@ -270,11 +273,14 @@ trait ImportSuggestions:
   /** The `ref` parts of this list of pairs, discarding subsequent elements that
    *  have the same String part. Elements are sorted by their String parts.
    */
-  extension (refs: List[(TermRef, String)]) def distinctRefs(using Context): List[TermRef] = refs match
-    case (ref, str) :: refs1 =>
-      ref :: refs1.dropWhile(_._2 == str).distinctRefs
-    case Nil =>
-      Nil
+  extension (refs: List[(TermRef, String)]) def distinctRefs(using Context): List[TermRef] =
+    val buf = new mutable.ListBuffer[TermRef]
+    var last = ""
+    for (ref, str) <- refs do
+      if last != str then
+        buf += ref
+        last = str
+    buf.toList
 
   /** The best `n` references in `refs`, according to `compare`
    *  `compare` is a partial order. If there's a tie, we take elements
diff --git a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala
index 59ee126f382d..17df9c93f9a9 100644
--- a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala
@@ -7,7 +7,7 @@ import ast._
 import Contexts._, Types._, Flags._, Symbols._
 import Trees._
 import ProtoTypes._
-import NameKinds.UniqueName
+import NameKinds.{AvoidNameKind, UniqueName}
 import util.Spans._
 import util.{Stats, SimpleIdentityMap}
 import Decorators._
@@ -33,7 +33,10 @@ object Inferencing {
    */
   def isFullyDefined(tp: Type, force: ForceDegree.Value)(using Context): Boolean = {
     val nestedCtx = ctx.fresh.setNewTyperState()
-    val result = new IsFullyDefinedAccumulator(force)(using nestedCtx).process(tp)
+    val result =
+      try new IsFullyDefinedAccumulator(force)(using nestedCtx).process(tp)
+      catch case ex: StackOverflowError =>
+        false // can happen for programs with illegal recusions, e.g. neg/recursive-lower-constraint.scala
     if (result) nestedCtx.typerState.commit()
     result
   }
@@ -43,7 +46,7 @@ object Inferencing {
    */
   def canDefineFurther(tp: Type)(using Context): Boolean =
     val prevConstraint = ctx.typerState.constraint
-    isFullyDefined(tp, force = ForceDegree.all)
+    isFullyDefined(tp, force = ForceDegree.failBottom)
     && (ctx.typerState.constraint ne prevConstraint)
 
   /** The fully defined type, where all type variables are forced.
@@ -89,10 +92,16 @@ object Inferencing {
   }
 
   /** If `tp` is top-level type variable with a lower bound in the current constraint,
-   *  instantiate it from below. We also look for TypeVars whereever their instantiation
-   *  could uncover new type members.
+   *  instantiate it from below. We also look for TypeVars in other places where
+   *  their instantiation could uncover new type members. However that search is best
+   *  effort only. It might miss type variables that appear in structures involving
+   *  alias types and type projections.
+   *  @param applied  Test is done in a `tryInsertImplicitOnQualifier` application.
+   *                  In this case, we always try to instantiate TypeVars in type arguments.
+   *                  If `applied` is false, we only try that in arguments that may affect
+   *                  the result type.
    */
-  def couldInstantiateTypeVar(tp: Type)(using Context): Boolean = tp.dealias match
+  def couldInstantiateTypeVar(tp: Type, applied: Boolean = false)(using Context): Boolean = tp.dealias match
     case tvar: TypeVar
     if !tvar.isInstantiated
        && ctx.typerState.constraint.contains(tvar)
@@ -115,14 +124,14 @@ object Inferencing {
                 case _ => Nil
             case _ => Nil
         case _ => Nil
-      couldInstantiateTypeVar(tycon)
-      || argsInResult.exists(couldInstantiateTypeVar)
+      couldInstantiateTypeVar(tycon, applied)
+      || (if applied then args else argsInResult).exists(couldInstantiateTypeVar(_, applied))
     case RefinedType(parent, _, _) =>
-      couldInstantiateTypeVar(parent)
+      couldInstantiateTypeVar(parent, applied)
     case tp: AndOrType =>
-      couldInstantiateTypeVar(tp.tp1) || couldInstantiateTypeVar(tp.tp2)
+      couldInstantiateTypeVar(tp.tp1, applied) || couldInstantiateTypeVar(tp.tp2, applied)
     case AnnotatedType(tp, _) =>
-      couldInstantiateTypeVar(tp)
+      couldInstantiateTypeVar(tp, applied)
     case _ =>
       false
 
@@ -173,12 +182,14 @@ object Inferencing {
         && ctx.typerState.constraint.contains(tvar)
         && {
           val direction = instDirection(tvar.origin)
-          if direction != 0 then
+          if minimizeSelected then
+            if direction <= 0 && tvar.hasLowerBound then
+              instantiate(tvar, fromBelow = true)
+            else if direction >= 0 && tvar.hasUpperBound then
+              instantiate(tvar, fromBelow = false)
+            // else hold off instantiating unbounded unconstrained variable
+          else if direction != 0 then
             instantiate(tvar, fromBelow = direction < 0)
-          else if minimizeSelected then
-            if tvar.hasLowerBound then instantiate(tvar, fromBelow = true)
-            else if tvar.hasUpperBound then instantiate(tvar, fromBelow = false)
-            else () // hold off instantiating unbounded unconstrained variables
           else if variance >= 0 && (force.ifBottom == IfBottom.ok || tvar.hasLowerBound) then
             instantiate(tvar, fromBelow = true)
           else if variance >= 0 && force.ifBottom == IfBottom.fail then
@@ -326,7 +337,7 @@ object Inferencing {
     @tailrec def boundVars(tree: Tree, acc: List[TypeVar]): List[TypeVar] = tree match {
       case Apply(fn, _) => boundVars(fn, acc)
       case TypeApply(fn, targs) =>
-        val tvars = targs.filter(_.isInstanceOf[TypeVarBinder[?]]).tpes.collect {
+        val tvars = targs.filter(_.isInstanceOf[InferredTypeTree]).tpes.collect {
           case tvar: TypeVar
           if !tvar.isInstantiated &&
              ctx.typerState.ownedVars.contains(tvar) &&
@@ -396,20 +407,21 @@ object Inferencing {
     val vs = variances(tp)
     val patternBindings = new mutable.ListBuffer[(Symbol, TypeParamRef)]
     vs foreachBinding { (tvar, v) =>
-      if (v == 1) tvar.instantiate(fromBelow = false)
-      else if (v == -1) tvar.instantiate(fromBelow = true)
-      else {
-        val bounds = TypeComparer.fullBounds(tvar.origin)
-        if (bounds.hi <:< bounds.lo || bounds.hi.classSymbol.is(Final) || fromScala2x)
-          tvar.instantiate(fromBelow = false)
+      if !tvar.isInstantiated then
+        if (v == 1) tvar.instantiate(fromBelow = false)
+        else if (v == -1) tvar.instantiate(fromBelow = true)
         else {
-          // We do not add the created symbols to GADT constraint immediately, since they may have inter-dependencies.
-          // Instead, we simultaneously add them later on.
-          val wildCard = newPatternBoundSymbol(UniqueName.fresh(tvar.origin.paramName), bounds, span, addToGadt = false)
-          tvar.instantiateWith(wildCard.typeRef)
-          patternBindings += ((wildCard, tvar.origin))
+          val bounds = TypeComparer.fullBounds(tvar.origin)
+          if (bounds.hi <:< bounds.lo || bounds.hi.classSymbol.is(Final) || fromScala2x)
+            tvar.instantiate(fromBelow = false)
+          else {
+            // We do not add the created symbols to GADT constraint immediately, since they may have inter-dependencies.
+            // Instead, we simultaneously add them later on.
+            val wildCard = newPatternBoundSymbol(UniqueName.fresh(tvar.origin.paramName), bounds, span, addToGadt = false)
+            tvar.instantiateWith(wildCard.typeRef)
+            patternBindings += ((wildCard, tvar.origin))
+          }
         }
-      }
     }
     val res = patternBindings.toList.map { (boundSym, _) =>
       // substitute bounds of pattern bound variables to deal with possible F-bounds
@@ -425,12 +437,19 @@ object Inferencing {
 
   type VarianceMap = SimpleIdentityMap[TypeVar, Integer]
 
-  /** All occurrences of type vars in this type that satisfy predicate
-   *  `include` mapped to their variances (-1/0/1) in this type, where
+  /** All occurrences of type vars in `tp` that satisfy predicate
+   *  `include` mapped to their variances (-1/0/1) in both `tp` and
+   *  `pt.finalResultType`, where
    *  -1 means: only contravariant occurrences
    *  +1 means: only covariant occurrences
    *  0 means: mixed or non-variant occurrences
    *
+   *  We need to take the occurences in `pt` into account because a type
+   *  variable created when typing the current tree might only appear in the
+   *  bounds of a type variable in the expected type, for example when
+   *  `ConstraintHandling#legalBound` creates type variables when approximating
+   *  a bound.
+   *
    *  Note: We intentionally use a relaxed version of variance here,
    *  where the variance does not change under a prefix of a named type
    *  (the strict version makes prefixes invariant). This turns out to be
@@ -441,7 +460,7 @@ object Inferencing {
    *
    *  we want to instantiate U to x.type right away. No need to wait further.
    */
-  private def variances(tp: Type)(using Context): VarianceMap = {
+  private def variances(tp: Type, pt: Type = WildcardType)(using Context): VarianceMap = {
     Stats.record("variances")
     val constraint = ctx.typerState.constraint
 
@@ -474,21 +493,29 @@ object Inferencing {
       def traverse(tp: Type) = { vmap1 = accu(vmap1, tp) }
       vmap.foreachBinding { (tvar, v) =>
         val param = tvar.origin
-        val e = constraint.entry(param)
-        accu.setVariance(v)
-        if (v >= 0) {
-          traverse(e.bounds.lo)
-          constraint.lower(param).foreach(p => traverse(constraint.typeVarOfParam(p)))
-        }
-        if (v <= 0) {
-          traverse(e.bounds.hi)
-          constraint.upper(param).foreach(p => traverse(constraint.typeVarOfParam(p)))
-        }
+        constraint.entry(param) match
+          case TypeBounds(lo, hi) =>
+            accu.setVariance(v)
+            if v >= 0 then
+              traverse(lo)
+              constraint.lower(param).foreach(p => traverse(constraint.typeVarOfParam(p)))
+            if v <= 0 then
+              traverse(hi)
+              constraint.upper(param).foreach(p => traverse(constraint.typeVarOfParam(p)))
+          case _ =>
       }
       if (vmap1 eq vmap) vmap else propagate(vmap1)
     }
 
-    propagate(accu(SimpleIdentityMap.empty, tp))
+    propagate(accu(accu(SimpleIdentityMap.empty, tp), pt.finalResultType))
+  }
+
+  /** Run the transformation after dealiasing but return the original type if it was a no-op. */
+  private def derivedOnDealias(tp: Type)(transform: Type => Type)(using Context) = {
+    val dealiased = tp.dealias
+    val transformed = transform(dealiased)
+    if transformed eq dealiased then tp // return the original type, not the result of dealiasing
+    else transformed
   }
 
   /** Replace every top-level occurrence of a wildcard type argument by
@@ -496,23 +523,17 @@ object Inferencing {
     *  $i is a skolem of type `scala.internal.TypeBox`, and `CAP` is its
     *  type member. See the documentation of `TypeBox` for a rationale why we do this.
     */
-  def captureWildcards(tp: Type)(using Context): Type = tp match {
+  def captureWildcards(tp: Type)(using Context): Type = derivedOnDealias(tp) {
     case tp @ AppliedType(tycon, args) if tp.hasWildcardArg =>
-      tycon.typeParams match {
-        case tparams @ ((_: Symbol) :: _) =>
-          val boundss = tparams.map(_.paramInfo.substApprox(tparams.asInstanceOf[List[TypeSymbol]], args))
-          val args1 = args.zipWithConserve(boundss) { (arg, bounds) =>
-            arg match {
-              case TypeBounds(lo, hi) =>
-                val skolem = SkolemType(defn.TypeBoxClass.typeRef.appliedTo(lo | bounds.loBound, hi & bounds.hiBound))
-                TypeRef(skolem, defn.TypeBox_CAP)
-              case arg => arg
-            }
-          }
-          tp.derivedAppliedType(tycon, args1)
-        case _ =>
-          tp
+      val tparams = tycon.typeParamSymbols
+      val args1 = args.zipWithConserve(tparams.map(_.paramInfo.substApprox(tparams, args))) {
+        case (TypeBounds(lo, hi), bounds) =>
+          val skolem = SkolemType(defn.TypeBoxClass.typeRef.appliedTo(lo | bounds.loBound, hi & bounds.hiBound))
+          TypeRef(skolem, defn.TypeBox_CAP)
+        case (arg, _) =>
+          arg
       }
+      if tparams.isEmpty then tp else tp.derivedAppliedType(tycon, args1)
     case tp: AndOrType => tp.derivedAndOrType(captureWildcards(tp.tp1), captureWildcards(tp.tp2))
     case tp: RefinedType => tp.derivedRefinedType(captureWildcards(tp.parent), tp.refinedName, tp.refinedInfo)
     case tp: RecType => tp.derivedRecType(captureWildcards(tp.parent))
@@ -532,8 +553,9 @@ trait Inferencing { this: Typer =>
    *  @param locked  the set of type variables of the current typer state that cannot be interpolated
    *                 at the present time
    *  Eligible for interpolation are all type variables owned by the current typerstate
-   *  that are not in locked. Type variables occurring co- (respectively, contra-) variantly in the type
-   *  are minimized (respectvely, maximized). Non occurring type variables are minimized if they
+   *  that are not in `locked` and whose `nestingLevel` is `>= ctx.nestingLevel`.
+   *  Type variables occurring co- (respectively, contra-) variantly in the tree type
+   *  or expected type are minimized (respectvely, maximized). Non occurring type variables are minimized if they
    *  have a lower bound different from Nothing, maximized otherwise. Type variables appearing
    *  non-variantly in the type are left untouched.
    *
@@ -558,7 +580,7 @@ trait Inferencing { this: Typer =>
     if ((ownedVars ne locked) && !ownedVars.isEmpty) {
       val qualifying = ownedVars -- locked
       if (!qualifying.isEmpty) {
-        typr.println(i"interpolate $tree: ${tree.tpe.widen} in $state, owned vars = ${state.ownedVars.toList}%, %, qualifying = ${qualifying.toList}%, %, previous = ${locked.toList}%, % / ${state.constraint}")
+        typr.println(i"interpolate $tree: ${tree.tpe.widen} in $state, pt = $pt, owned vars = ${state.ownedVars.toList}%, %, qualifying = ${qualifying.toList}%, %, previous = ${locked.toList}%, % / ${state.constraint}")
         val resultAlreadyConstrained =
           tree.isInstanceOf[Apply] || tree.tpe.isInstanceOf[MethodOrPoly]
         if (!resultAlreadyConstrained)
@@ -566,7 +588,7 @@ trait Inferencing { this: Typer =>
             // This is needed because it could establish singleton type upper bounds. See i2998.scala.
 
         val tp = tree.tpe.widen
-        val vs = variances(tp)
+        val vs = variances(tp, pt)
 
         // Avoid interpolating variables occurring in tree's type if typerstate has unreported errors.
         // Reason: The errors might reflect unsatisfiable constraints. In that
@@ -593,22 +615,38 @@ trait Inferencing { this: Typer =>
         def constraint = state.constraint
         type InstantiateQueue = mutable.ListBuffer[(TypeVar, Boolean)]
         val toInstantiate = new InstantiateQueue
-        for (tvar <- qualifying)
-          if (!tvar.isInstantiated && constraint.contains(tvar)) {
+        for tvar <- qualifying do
+          if !tvar.isInstantiated && constraint.contains(tvar) && tvar.nestingLevel >= ctx.nestingLevel then
+            constrainIfDependentParamRef(tvar, tree)
             // Needs to be checked again, since previous interpolations could already have
             // instantiated `tvar` through unification.
             val v = vs(tvar)
-            if (v == null) {
-              typr.println(i"interpolate non-occurring $tvar in $state in $tree: $tp, fromBelow = ${tvar.hasLowerBound}, $constraint")
-              toInstantiate += ((tvar, tvar.hasLowerBound))
-            }
+            if v == null then
+              // Even though `tvar` is non-occurring in `v`, the specific
+              // instantiation we pick still matters because `tvar` might appear
+              // in the bounds of a non-`qualifying` type variable in the
+              // constraint.
+              // In particular, if `tvar` was created as the upper or lower
+              // bound of an existing variable by `LevelAvoidMap`, we
+              // instantiate it in the direction corresponding to the
+              // original variable which might be further constrained later.
+              // Otherwise, we simply rely on `hasLowerBound`.
+              val name = tvar.origin.paramName
+              val fromBelow =
+                name.is(AvoidNameKind.UpperBound) ||
+                !name.is(AvoidNameKind.LowerBound) && tvar.hasLowerBound
+              typr.println(i"interpolate non-occurring $tvar in $state in $tree: $tp, fromBelow = $fromBelow, $constraint")
+              toInstantiate += ((tvar, fromBelow))
+            else if v.intValue != 0 then
+              typr.println(i"interpolate $tvar in $state in $tree: $tp, fromBelow = ${v.intValue == 1}, $constraint")
+              toInstantiate += ((tvar, v.intValue == 1))
+            else if tvar.nestingLevel > ctx.nestingLevel then
+              // Invariant: a type variable of level N can only appear
+              // in the type of a tree whose enclosing scope is level <= N.
+              typr.println(i"instantiate nonvariant $tvar of level ${tvar.nestingLevel} to a type variable of level <= ${ctx.nestingLevel}, $constraint")
+              comparing(_.atLevel(ctx.nestingLevel, tvar.origin))
             else
-              if (v.intValue != 0) {
-                typr.println(i"interpolate $tvar in $state in $tree: $tp, fromBelow = ${v.intValue == 1}, $constraint")
-                toInstantiate += ((tvar, v.intValue == 1))
-              }
-              else typr.println(i"no interpolation for nonvariant $tvar in $state")
-          }
+              typr.println(i"no interpolation for nonvariant $tvar in $state")
 
         /** Instantiate all type variables in `buf` in the indicated directions.
          *  If a type variable A is instantiated from below, and there is another
@@ -645,13 +683,16 @@ trait Inferencing { this: Typer =>
             while buf.nonEmpty do
               val first @ (tvar, fromBelow) = buf.head
               buf.dropInPlace(1)
-              val suspend = buf.exists{ (following, _) =>
-                if fromBelow then
-                  constraint.isLess(following.origin, tvar.origin)
-                else
-                  constraint.isLess(tvar.origin, following.origin)
-              }
-              if suspend then suspended += first else tvar.instantiate(fromBelow)
+              if !tvar.isInstantiated then
+                val suspend = buf.exists{ (following, _) =>
+                  if fromBelow then
+                    constraint.isLess(following.origin, tvar.origin)
+                  else
+                    constraint.isLess(tvar.origin, following.origin)
+                }
+                if suspend then suspended += first else tvar.instantiate(fromBelow)
+              end if
+            end while
             doInstantiate(suspended)
         end doInstantiate
         doInstantiate(toInstantiate)
@@ -659,6 +700,33 @@ trait Inferencing { this: Typer =>
     }
     tree
   }
+
+  /** If `tvar` represents a parameter of a dependent method type in the current `call`
+   *  approximate it from below with the type of the actual argument. Skolemize that
+   *  type if necessary to make it a Singleton.
+   */
+  private def constrainIfDependentParamRef(tvar: TypeVar, call: Tree)(using Context): Unit =
+    if tvar.origin.paramName.is(NameKinds.DepParamName) then
+      representedParamRef(tvar.origin) match
+        case ref: TermParamRef =>
+          def findArg(tree: Tree)(using Context): Tree = tree match
+            case Apply(fn, args) =>
+              if fn.tpe.widen eq ref.binder then
+                if ref.paramNum < args.length then args(ref.paramNum)
+                else EmptyTree
+              else findArg(fn)
+            case TypeApply(fn, _) => findArg(fn)
+            case Block(_, expr) => findArg(expr)
+            case Inlined(_, _, expr) => findArg(expr)
+            case _ => EmptyTree
+
+          val arg = findArg(call)
+          if !arg.isEmpty then
+            var argType = arg.tpe.widenIfUnstable
+            if !argType.isSingleton then argType = SkolemType(argType)
+            argType <:< tvar
+        case _ =>
+  end constrainIfDependentParamRef
 }
 
 /** An enumeration controlling the degree of forcing in "is-dully-defined" checks. */
diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala
index d5893f44f631..c99ccbd24428 100644
--- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala
@@ -20,7 +20,9 @@ import ProtoTypes.shallowSelectionProto
 import Annotations.Annotation
 import SymDenotations.SymDenotation
 import Inferencing.isFullyDefined
+import Scopes.newScope
 import config.Printers.inlining
+import config.Feature
 import ErrorReporting.errorTree
 import dotty.tools.dotc.util.{SimpleIdentityMap, SimpleIdentitySet, EqHashMap, SourceFile, SourcePosition, SrcPos}
 import dotty.tools.dotc.parsing.Parsers.Parser
@@ -33,9 +35,13 @@ import util.Spans.Span
 import dotty.tools.dotc.transform.{Splicer, TreeMapWithStages}
 import quoted.QuoteUtils
 
+import scala.annotation.constructorOnly
+
 object Inliner {
   import tpd._
 
+  private type DefBuffer = mutable.ListBuffer[ValOrDefDef]
+
   /** `sym` is an inline method with a known body to inline.
    */
   def hasBodyToInline(sym: SymDenotation)(using Context): Boolean =
@@ -70,6 +76,7 @@ object Inliner {
         || (ctx.phase == Phases.typerPhase && needsTransparentInlining(tree))
       )
       && !ctx.typer.hasInliningErrors
+      && !ctx.base.stopInlining
   }
 
   private def needsTransparentInlining(tree: Tree)(using Context): Boolean =
@@ -92,6 +99,10 @@ object Inliner {
       if (tree.symbol == defn.CompiletimeTesting_typeChecks) return Intrinsics.typeChecks(tree)
       if (tree.symbol == defn.CompiletimeTesting_typeCheckErrors) return Intrinsics.typeCheckErrors(tree)
 
+    if tree.symbol.isExperimental then
+      Feature.checkExperimentalDef(tree.symbol, tree)
+
+    if tree.symbol.isConstructor then return tree // error already reported for the inline constructor definition
 
     /** Set the position of all trees logically contained in the expansion of
      *  inlined call `call` to the position of `call`. This transform is necessary
@@ -124,6 +135,14 @@ object Inliner {
       case Apply(fn, args) =>
         cpy.Apply(tree)(liftBindings(fn, liftPos), args)
       case TypeApply(fn, args) =>
+        fn.tpe.widenTermRefExpr match
+          case tp: PolyType =>
+            val targBounds = tp.instantiateParamInfos(args.map(_.tpe))
+            for (arg, bounds: TypeBounds) <- args.zip(targBounds) if !bounds.contains(arg.tpe) do
+              val boundsStr =
+                if bounds == TypeBounds.empty then " <: Any. Note that this type is higher-kinded."
+                else bounds.show
+              report.error(em"${arg.tpe} does not conform to bound$boundsStr", arg)
         cpy.TypeApply(tree)(liftBindings(fn, liftPos), args)
       case Select(qual, name) =>
         cpy.Select(tree)(liftBindings(qual, liftPos), name)
@@ -140,6 +159,7 @@ object Inliner {
         val body = bodyToInline(tree.symbol) // can typecheck the tree and thereby produce errors
         new Inliner(tree, body).inlined(tree.srcPos)
       else
+        ctx.base.stopInlining = true
         val (reason, setting) =
           if reachedInlinedTreesLimit then ("inlined trees", ctx.settings.XmaxInlinedTrees)
           else ("successive inlines", ctx.settings.XmaxInlines)
@@ -150,6 +170,10 @@ object Inliner {
               |You can use ${setting.name} to change the limit.""",
           (tree :: enclosingInlineds).last.srcPos
         )
+    if ctx.base.stopInlining && enclosingInlineds.isEmpty then
+      ctx.base.stopInlining = false
+        // we have completely backed out of the call that overflowed;
+        // reset so that further inline calls can be expanded
     tree2
   }
 
@@ -175,7 +199,7 @@ object Inliner {
 
     val UnApply(fun, implicits, patterns) = unapp
     val sym = unapp.symbol
-    val cls = newNormalizedClassSymbol(ctx.owner, tpnme.ANON_CLASS, Synthetic | Final, List(defn.ObjectType), coord = sym.coord)
+    val cls = newNormalizedClassSymbol(ctx.owner, tpnme.ANON_CLASS, Synthetic | Final, List(defn.ObjectType), newScope, coord = sym.coord)
     val constr = newConstructor(cls, Synthetic, Nil, Nil, coord = sym.coord).entered
 
     val targs = fun match
@@ -285,8 +309,9 @@ object Inliner {
    */
   def inlineCallTrace(callSym: Symbol, pos: SourcePosition)(using Context): Tree = {
     assert(ctx.source == pos.source)
-    if (callSym.is(Macro)) ref(callSym.topLevelClass.owner).select(callSym.topLevelClass.name).withSpan(pos.span)
-    else Ident(callSym.topLevelClass.typeRef).withSpan(pos.span)
+    val topLevelCls = callSym.topLevelClass
+    if (callSym.is(Macro)) ref(topLevelCls.owner).select(topLevelCls.name)(using ctx.withOwner(topLevelCls.owner)).withSpan(pos.span)
+    else Ident(topLevelCls.typeRef).withSpan(pos.span)
   }
 
   object Intrinsics {
@@ -312,7 +337,7 @@ object Inliner {
       ConstFold(underlyingCodeArg).tpe.widenTermRefExpr match {
         case ConstantType(Constant(code: String)) =>
           val source2 = SourceFile.virtual("tasty-reflect", code)
-          inContext(ctx.fresh.setNewTyperState().setTyper(new Typer).setSource(source2)) {
+          inContext(ctx.fresh.setNewTyperState().setTyper(new Typer(ctx.nestingLevel + 1)).setSource(source2)) {
             val tree2 = new Parser(source2).block()
             if ctx.reporter.allErrors.nonEmpty then
               ctx.reporter.allErrors.map((ErrorKind.Parser, _))
@@ -345,9 +370,9 @@ object Inliner {
         lit(error.pos.column),
         if kind == ErrorKind.Parser then parserErrorKind else typerErrorKind)
 
-    private def packErrors(errors: List[(ErrorKind, Error)])(using Context): Tree =
+    private def packErrors(errors: List[(ErrorKind, Error)], pos: SrcPos)(using Context): Tree =
       val individualErrors: List[Tree] = errors.map(packError)
-      val errorTpt = ref(defn.CompiletimeTesting_ErrorClass)
+      val errorTpt = ref(defn.CompiletimeTesting_ErrorClass).withSpan(pos.span)
       mkList(individualErrors, errorTpt)
 
     /** Expand call to scala.compiletime.testing.typeChecks */
@@ -358,11 +383,12 @@ object Inliner {
     /** Expand call to scala.compiletime.testing.typeCheckErrors */
     def typeCheckErrors(tree: Tree)(using Context): Tree =
       val errors = compileForErrors(tree)
-      packErrors(errors)
+      packErrors(errors, tree)
 
     /** Expand call to scala.compiletime.codeOf */
     def codeOf(arg: Tree, pos: SrcPos)(using Context): Tree =
-      Literal(Constant(arg.show)).withSpan(pos.span)
+      val ctx1 = ctx.fresh.setSetting(ctx.settings.color, "never")
+      Literal(Constant(arg.show(using ctx1))).withSpan(pos.span)
   }
 
   extension (tp: Type) {
@@ -444,14 +470,14 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
   /** A binding for the parameter of an inline method. This is a `val` def for
    *  by-value parameters and a `def` def for by-name parameters. `val` defs inherit
    *  inline annotations from their parameters. The generated `def` is appended
-   *  to `bindingsBuf`.
+   *  to `buf`.
    *  @param name        the name of the parameter
    *  @param formal      the type of the parameter
    *  @param arg         the argument corresponding to the parameter
-   *  @param bindingsBuf the buffer to which the definition should be appended
+   *  @param buf         the buffer to which the definition should be appended
    */
   private def paramBindingDef(name: Name, formal: Type, arg0: Tree,
-                              bindingsBuf: mutable.ListBuffer[ValOrDefDef])(using Context): ValOrDefDef = {
+                              buf: DefBuffer)(using Context): ValOrDefDef = {
     val isByName = formal.dealias.isInstanceOf[ExprType]
     val arg = arg0 match {
       case Typed(arg1, tpt) if tpt.tpe.isRepeatedParam && arg1.tpe.derivesFrom(defn.ArrayClass) =>
@@ -467,6 +493,8 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
     var bindingFlags: FlagSet = InlineProxy
     if formal.widenExpr.hasAnnotation(defn.InlineParamAnnot) then
       bindingFlags |= Inline
+    if formal.widenExpr.hasAnnotation(defn.ErasedParamAnnot) then
+      bindingFlags |= Erased
     if isByName then
       bindingFlags |= Method
     val boundSym = newSym(InlineBinderName.fresh(name.asTermName), bindingFlags, bindingType).asTerm
@@ -478,23 +506,25 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
       else ValDef(boundSym, newArg)
     }.withSpan(boundSym.span)
     inlining.println(i"parameter binding: $binding, $argIsBottom")
-    bindingsBuf += binding
+    buf += binding
     binding
   }
 
-  /** Populate `paramBinding` and `bindingsBuf` by matching parameters with
+  /** Populate `paramBinding` and `buf` by matching parameters with
    *  corresponding arguments. `bindingbuf` will be further extended later by
    *  proxies to this-references. Issue an error if some arguments are missing.
    */
   private def computeParamBindings(
-      tp: Type, targs: List[Tree], argss: List[List[Tree]], formalss: List[List[Type]]): Boolean =
+      tp: Type, targs: List[Tree],
+      argss: List[List[Tree]], formalss: List[List[Type]],
+      buf: DefBuffer): Boolean =
     tp match
       case tp: PolyType =>
         tp.paramNames.lazyZip(targs).foreach { (name, arg) =>
           paramSpan(name) = arg.span
           paramBinding(name) = arg.tpe.stripTypeVar
         }
-        computeParamBindings(tp.resultType, targs.drop(tp.paramNames.length), argss, formalss)
+        computeParamBindings(tp.resultType, targs.drop(tp.paramNames.length), argss, formalss, buf)
       case tp: MethodType =>
         if argss.isEmpty then
           report.error(i"missing arguments for inline method $inlinedMethod", call.srcPos)
@@ -506,9 +536,9 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
               case _: SingletonType if isIdempotentPath(arg) =>
                 arg.tpe
               case _ =>
-                paramBindingDef(name, formal, arg, bindingsBuf).symbol.termRef
+                paramBindingDef(name, formal, arg, buf).symbol.termRef
           }
-          computeParamBindings(tp.resultType, targs, argss.tail, formalss.tail)
+          computeParamBindings(tp.resultType, targs, argss.tail, formalss.tail, buf)
       case _ =>
         assert(targs.isEmpty)
         assert(argss.isEmpty)
@@ -525,9 +555,11 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
     var lastSelf: Symbol = NoSymbol
     var lastLevel: Int = 0
     for ((level, selfSym) <- sortedProxies) {
-      lazy val rhsClsSym = selfSym.info.widenDealias.classSymbol
       val rhs = selfSym.info.dealias match
-        case info: TermRef if info.isStable =>
+        case info: TermRef
+        if info.isStable && (lastSelf.exists || isPureExpr(inlineCallPrefix)) =>
+          // If this is the first proxy, optimize to `ref(info)` only if call prefix is pure.
+          // Otherwise we might forget side effects. See run/i12829.scala.
           ref(info)
         case info =>
           val rhsClsSym = info.widenDealias.classSymbol
@@ -536,8 +568,11 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
           else if lastSelf.exists then
             ref(lastSelf).outerSelect(lastLevel - level, selfSym.info)
           else
-            inlineCallPrefix
-      val binding = ValDef(selfSym.asTerm, QuoteUtils.changeOwnerOfTree(rhs, selfSym)).withSpan(selfSym.span)
+            inlineCallPrefix match
+              case Super(_, _) => This(rhsClsSym.asClass)
+              case _ => inlineCallPrefix
+      val binding = accountForOpaques(
+        ValDef(selfSym.asTerm, QuoteUtils.changeOwnerOfTree(rhs, selfSym)).withSpan(selfSym.span))
       bindingsBuf += binding
       inlining.println(i"proxy at $level: $selfSym = ${bindingsBuf.last}")
       lastSelf = selfSym
@@ -545,10 +580,110 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
     }
   }
 
+  /** A list of pairs between TermRefs appearing in thisProxy bindings that
+   *  refer to objects with opaque type aliases and local proxy symbols
+   *  that contain refined versions of these TermRefs where the aliases
+   *  are exposed.
+   */
+  private val opaqueProxies = new mutable.ListBuffer[(TermRef, TermRef)]
+
+  /** Map first halfs of opaqueProxies pairs to second halfs, using =:= as equality */
+  def mapRef(ref: TermRef): Option[TermRef] =
+    opaqueProxies.collectFirst {
+      case (from, to) if from.symbol == ref.symbol && from =:= ref => to
+    }
+
+  /** If `tp` contains TermRefs that refer to objects with opaque
+   *  type aliases, add proxy definitions to `opaqueProxies` that expose these aliases.
+   */
+  def addOpaqueProxies(tp: Type, span: Span, forThisProxy: Boolean)(using Context): Unit =
+    tp.foreachPart {
+      case ref: TermRef =>
+        for cls <- ref.widen.classSymbols do
+          if cls.containsOpaques
+             && (forThisProxy || inlinedMethod.isContainedIn(cls))
+             && mapRef(ref).isEmpty
+          then
+            def openOpaqueAliases(selfType: Type): List[(Name, Type)] = selfType match
+              case RefinedType(parent, rname, TypeAlias(alias)) =>
+                val opaq = cls.info.member(rname).symbol
+                if opaq.isOpaqueAlias then
+                  (rname, alias.stripLazyRef.asSeenFrom(ref, cls))
+                  :: openOpaqueAliases(parent)
+                else Nil
+              case _ =>
+                Nil
+            val refinements = openOpaqueAliases(cls.givenSelfType)
+            val refinedType = refinements.foldLeft(ref: Type) ((parent, refinement) =>
+              RefinedType(parent, refinement._1, TypeAlias(refinement._2))
+            )
+            val refiningSym = newSym(InlineBinderName.fresh(), Synthetic, refinedType).asTerm
+            val refiningDef = ValDef(refiningSym, tpd.ref(ref).cast(refinedType)).withSpan(span)
+            inlining.println(i"add opaque alias proxy $refiningDef for $ref in $tp")
+            bindingsBuf += refiningDef
+            opaqueProxies += ((ref, refiningSym.termRef))
+      case _ =>
+    }
+
+  /** Map all TermRefs that match left element in `opaqueProxies` to the
+   *  corresponding right element.
+   */
+  val mapOpaques = TreeTypeMap(
+      typeMap = new TypeMap:
+          override def stopAt = StopAt.Package
+          def apply(t: Type) = mapOver {
+            t match
+              case ref: TermRef => mapRef(ref).getOrElse(ref)
+              case _ => t
+          }
+    )
+
+  /** If `binding` contains TermRefs that refer to objects with opaque
+   *  type aliases, add proxy definitions that expose these aliases
+   *  and substitute such TermRefs with theproxies. Example from pos/opaque-inline1.scala:
+   *
+   *  object refined:
+   *    opaque type Positive = Int
+   *    inline def Positive(value: Int): Positive = f(value)
+   *    def f(x: Positive): Positive = x
+   *  def run: Unit = { val x = 9; val nine = refined.Positive(x) }
+   *
+   *  This generates the following proxies:
+   *
+   *    val $proxy1: refined.type{type Positive = Int} =
+   *      refined.$asInstanceOf$[refined.type{type Positive = Int}]
+   *    val refined$_this: ($proxy1 : refined.type{Positive = Int}) =
+   *      $proxy1
+   *
+   *  and every reference to `refined` in the inlined expression is replaced by
+   *  `refined_$this`.
+   */
+  def accountForOpaques(binding: ValDef)(using Context): ValDef =
+    addOpaqueProxies(binding.symbol.info, binding.span, forThisProxy = true)
+    if opaqueProxies.isEmpty then binding
+    else
+      binding.symbol.info = mapOpaques.typeMap(binding.symbol.info)
+      mapOpaques.transform(binding).asInstanceOf[ValDef]
+        .showing(i"transformed this binding exposing opaque aliases: $result", inlining)
+  end accountForOpaques
+
+  /** If value argument contains references to objects that contain opaque types,
+   *  map them to their opaque proxies.
+   */
+  def mapOpaquesInValueArg(arg: Tree)(using Context): Tree =
+    val argType = arg.tpe.widen
+    addOpaqueProxies(argType, arg.span, forThisProxy = false)
+    if opaqueProxies.nonEmpty then
+      val mappedType = mapOpaques.typeMap(argType)
+      if mappedType ne argType then arg.cast(AndType(arg.tpe, mappedType))
+      else arg
+    else arg
+
   private def canElideThis(tpe: ThisType): Boolean =
-    inlineCallPrefix.tpe == tpe && ctx.owner.isContainedIn(tpe.cls) ||
-    tpe.cls.isContainedIn(inlinedMethod) ||
-    tpe.cls.is(Package)
+    inlineCallPrefix.tpe == tpe && ctx.owner.isContainedIn(tpe.cls)
+    || tpe.cls.isContainedIn(inlinedMethod)
+    || tpe.cls.is(Package)
+    || tpe.cls.isStaticOwner && !(tpe.cls.seesOpaques && inlinedMethod.isContainedIn(tpe.cls))
 
   /** Very similar to TreeInfo.isPureExpr, but with the following inliner-only exceptions:
    *  - synthetic case class apply methods, when the case class constructor is empty, are
@@ -637,19 +772,32 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
       for (param <- tpe.cls.typeParams)
         paramProxy(param.typeRef) = adaptToPrefix(param.typeRef)
     case tpe: NamedType
-    if tpe.symbol.is(Param) && tpe.symbol.owner == inlinedMethod && !paramProxy.contains(tpe) =>
+    if tpe.symbol.is(Param)
+        && tpe.symbol.owner == inlinedMethod
+        && (tpe.symbol.isTerm || inlinedMethod.paramSymss.exists(_.contains(tpe.symbol)))
+          // this test is needed to rule out nested LambdaTypeTree parameters
+          // with the same name as the method's parameters. Note that the nested
+          // LambdaTypeTree parameters also have the inlineMethod as owner. C.f. i13460.scala.
+        && !paramProxy.contains(tpe) =>
       paramBinding.get(tpe.name) match
         case Some(bound) => paramProxy(tpe) = bound
         case _ =>  // can happen for params bound by type-lambda trees.
+
+      // The widened type may contain param types too (see tests/pos/i12379a.scala)
+      if tpe.isTerm then registerType(tpe.widenTermRefExpr)
     case _ =>
   }
 
+  private val registerTypes = new TypeTraverser:
+    override def stopAt = StopAt.Package
+    override def traverse(t: Type) =
+      registerType(t)
+      traverseChildren(t)
+
   /** Register type of leaf node */
-  private def registerLeaf(tree: Tree): Unit = tree match {
-    case _: This | _: Ident | _: TypeTree =>
-      tree.typeOpt.foreachPart(registerType, stopAtStatic = true)
+  private def registerLeaf(tree: Tree): Unit = tree match
+    case _: This | _: Ident | _: TypeTree => registerTypes.traverse(tree.typeOpt)
     case _ =>
-  }
 
   /** Make `tree` part of inlined expansion. This means its owner has to be changed
    *  from its `originalOwner`, and, if it comes from outside the inlined method
@@ -680,7 +828,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
           return Intrinsics.codeOf(arg, call.srcPos)
       case _ =>
 
-  	// Special handling of `constValue[T]` and `constValueOpt[T]`
+  	// Special handling of `constValue[T]`, `constValueOpt[T], and summonInline[T]`
     if (callTypeArgs.length == 1)
       if (inlinedMethod == defn.Compiletime_constValue) {
         val constVal = tryConstValue
@@ -697,6 +845,19 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
           else New(defn.SomeClass.typeRef.appliedTo(constVal.tpe), constVal :: Nil)
         )
       }
+      else if (inlinedMethod == defn.Compiletime_summonInline) {
+        def searchImplicit(tpt: Tree) =
+          val evTyper = new Typer(ctx.nestingLevel + 1)
+          val evCtx = ctx.fresh.setTyper(evTyper)
+          val evidence = evTyper.inferImplicitArg(tpt.tpe, tpt.span)(using evCtx)
+          evidence.tpe match
+            case fail: Implicits.SearchFailureType =>
+              val msg = evTyper.missingArgMsg(evidence, tpt.tpe, "")
+              errorTree(call, em"$msg")
+            case _ =>
+              evidence
+        return searchImplicit(callTypeArgs.head)
+      }
 
     def paramTypess(call: Tree, acc: List[List[Type]]): List[List[Type]] = call match
       case Apply(fn, args) =>
@@ -706,12 +867,25 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
       case TypeApply(fn, _) => paramTypess(fn, acc)
       case _ => acc
 
-    // Compute bindings for all parameters, appending them to bindingsBuf
-    if !computeParamBindings(inlinedMethod.info, callTypeArgs, callValueArgss, paramTypess(call, Nil)) then
-      return call
+    val paramBindings =
+      val mappedCallValueArgss = callValueArgss.nestedMapConserve(mapOpaquesInValueArg)
+      if mappedCallValueArgss ne callValueArgss then
+        inlining.println(i"mapped value args = ${mappedCallValueArgss.flatten}%, %")
+
+      val paramBindingsBuf = new DefBuffer
+      // Compute bindings for all parameters, appending them to bindingsBuf
+      if !computeParamBindings(
+          inlinedMethod.info, callTypeArgs,
+          mappedCallValueArgss, paramTypess(call, Nil),
+          paramBindingsBuf)
+      then
+        return call
+
+      paramBindingsBuf.toList
+    end paramBindings
 
     // make sure prefix is executed if it is impure
-    if (!isIdempotentExpr(inlineCallPrefix)) registerType(inlinedMethod.owner.thisType)
+    if !isIdempotentExpr(inlineCallPrefix) then registerType(inlinedMethod.owner.thisType)
 
     // Register types of all leaves of inlined body so that the `paramProxy` and `thisProxy` maps are defined.
     rhsToInline.foreachSubTree(registerLeaf)
@@ -719,6 +893,9 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
     // Compute bindings for all this-proxies, appending them to bindingsBuf
     computeThisBindings()
 
+    // Parameter bindings come after this bindings, reflecting order of evaluation
+    bindingsBuf ++= paramBindings
+
     val inlineTyper = new InlineTyper(ctx.reporter.errorCount)
 
     val inlineCtx = inlineContext(call).fresh.setTyper(inlineTyper).setNewScope
@@ -762,11 +939,13 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
     val inliner = new InlinerMap(
       typeMap =
         new DeepTypeMap {
+          override def stopAt =
+            if opaqueProxies.isEmpty then StopAt.Static else StopAt.Package
           def apply(t: Type) = t match {
             case t: ThisType => thisProxy.getOrElse(t.cls, t)
             case t: TypeRef => paramProxy.getOrElse(t, mapOver(t))
             case t: SingletonType =>
-              if t.termSymbol.isAllOf(Inline | Param) then mapOver(t.widenTermRefExpr)
+              if t.termSymbol.isAllOf(Inline | Param) then apply(t.widenTermRefExpr)
               else paramProxy.getOrElse(t, mapOver(t))
             case t => mapOver(t)
           }
@@ -806,6 +985,11 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
       substTo = Nil
     )(using inlineCtx)
 
+    inlining.println(
+      i"""inliner transform with
+         |thisProxy = ${thisProxy.toList.map(_._1)}%, % --> ${thisProxy.toList.map(_._2)}%, %
+         |paramProxy = ${paramProxy.toList.map(_._1.typeSymbol.showLocated)}%, % --> ${paramProxy.toList.map(_._2)}%, %""")
+
     // Apply inliner to `rhsToInline`, split off any implicit bindings from result, and
     // make them part of `bindingsBuf`. The expansion is then the tree that remains.
     val expansion = inliner.transform(rhsToInline)
@@ -818,11 +1002,13 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
         }
         // Usually `error` is called from within a rewrite method. In this
         // case we need to report the error at the point of the outermost enclosing inline
-        // call. This way, a defensively written rewrite methid can always
+        // call. This way, a defensively written rewrite method can always
         // report bad inputs at the point of call instead of revealing its internals.
         val callToReport = if (enclosingInlineds.nonEmpty) enclosingInlineds.last else call
         val ctxToReport = ctx.outersIterator.dropWhile(enclosingInlineds(using _).nonEmpty).next
-        inContext(ctxToReport) {
+        // The context in which we report should still use the existing context reporter
+        val ctxOrigReporter = ctxToReport.fresh.setReporter(ctx.reporter)
+        inContext(ctxOrigReporter) {
           report.error(message, callToReport.srcPos)
         }
       case _ =>
@@ -880,7 +1066,17 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
 
       // Take care that only argument bindings go into `bindings`, since positions are
       // different for bindings from arguments and bindings from body.
-      tpd.Inlined(call, finalBindings, finalExpansion)
+      val res = tpd.Inlined(call, finalBindings, finalExpansion)
+      if opaqueProxies.isEmpty then res
+      else
+        val target =
+          if inlinedMethod.is(Transparent) then call.tpe & res.tpe
+          else call.tpe
+        res.ensureConforms(target)
+          // Make sure that the sealing with the declared type
+          // is type correct. Without it we might get problems since the
+          // expression's type is the opaque alias but the call's type is
+          // the opaque type itself. An example is in pos/opaque-inline1.scala.
     }
   }
 
@@ -1012,7 +1208,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
     private object InlineableArg {
       lazy val paramProxies = paramProxy.values.toSet
       def unapply(tree: Trees.Ident[?])(using Context): Option[Tree] = {
-        def search(buf: mutable.ListBuffer[ValOrDefDef]) = buf.find(_.name == tree.name)
+        def search(buf: DefBuffer) = buf.find(_.name == tree.name)
         if (paramProxies.contains(tree.typeOpt))
           search(bindingsBuf) match {
             case Some(bind: ValOrDefDef) if bind.symbol.is(Inline) =>
@@ -1051,7 +1247,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
             cpy.Inlined(cl)(call, bindings, recur(expr))
           case _ => ddef.tpe.widen match
             case mt: MethodType if ddef.paramss.head.length == args.length =>
-              val bindingsBuf = new mutable.ListBuffer[ValOrDefDef]
+              val bindingsBuf = new DefBuffer
               val argSyms = mt.paramNames.lazyZip(mt.paramInfos).lazyZip(args).map { (name, paramtp, arg) =>
                 arg.tpe.dealias match {
                   case ref @ TermRef(NoPrefix, _) => ref.symbol
@@ -1078,6 +1274,11 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
      */
     type MatchRedux = Option[(List[MemberDef], Tree)]
 
+    /** Same as MatchRedux, but also includes a boolean
+     *  that is true if the guard can be checked at compile time.
+     */
+    type MatchReduxWithGuard = Option[(List[MemberDef], Tree, Boolean)]
+
     /** Reduce an inline match
      *   @param     mtch          the match tree
      *   @param     scrutinee     the scrutinee expression, assumed to be pure, or
@@ -1115,7 +1316,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
         }
 
         def searchImplicit(sym: TermSymbol, tpt: Tree) = {
-          val evTyper = new Typer
+          val evTyper = new Typer(ctx.nestingLevel + 1)
           val evCtx = ctx.fresh.setTyper(evTyper)
           val evidence = evTyper.inferImplicitArg(tpt.tpe, tpt.span)(using evCtx)
           evidence.tpe match {
@@ -1125,7 +1326,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
             case fail: Implicits.SearchFailureType =>
               false
             case _ =>
-              //inliner.println(i"inferred implicit $sym: ${sym.info} with $evidence: ${evidence.tpe.widen}, ${evCtx.gadt.constraint}, ${evCtx.typerState.constraint}")
+              //inlining.println(i"inferred implicit $sym: ${sym.info} with $evidence: ${evidence.tpe.widen}, ${evCtx.gadt.constraint}, ${evCtx.typerState.constraint}")
               newTermBinding(sym, evidence)
               true
           }
@@ -1247,6 +1448,8 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
               case _ =>
                 false
             }
+          case Alternative(pats) =>
+            pats.exists(reducePattern(caseBindingMap, scrut, _))
           case Inlined(EmptyTree, Nil, ipat) =>
             reducePattern(caseBindingMap, scrut, ipat)
           case _ => false
@@ -1257,7 +1460,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
       val scrutineeSym = newSym(InlineScrutineeName.fresh(), Synthetic, scrutType).asTerm
       val scrutineeBinding = normalizeBinding(ValDef(scrutineeSym, scrutinee))
 
-      def reduceCase(cdef: CaseDef): MatchRedux = {
+      def reduceCase(cdef: CaseDef): MatchReduxWithGuard = {
         val caseBindingMap = new mutable.ListBuffer[(Symbol, MemberDef)]()
 
         def substBindings(
@@ -1276,21 +1479,26 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
         val gadtCtx = ctx.fresh.setFreshGADTBounds.addMode(Mode.GadtConstraintInference)
         if (reducePattern(caseBindingMap, scrutineeSym.termRef, cdef.pat)(using gadtCtx)) {
           val (caseBindings, from, to) = substBindings(caseBindingMap.toList, mutable.ListBuffer(), Nil, Nil)
-          val guardOK = cdef.guard.isEmpty || {
-            typer.typed(cdef.guard.subst(from, to), defn.BooleanType) match {
-              case ConstantValue(true) => true
-              case _ => false
+          val (guardOK, canReduceGuard) =
+            if cdef.guard.isEmpty then (true, true)
+            else typer.typed(cdef.guard.subst(from, to), defn.BooleanType) match {
+              case ConstantValue(v: Boolean) => (v, true)
+              case _ => (false, false)
             }
-          }
-          if (guardOK) Some((caseBindings.map(_.subst(from, to)), cdef.body.subst(from, to)))
-          else None
+          if guardOK then Some((caseBindings.map(_.subst(from, to)), cdef.body.subst(from, to), canReduceGuard))
+          else if canReduceGuard then None
+          else Some((caseBindings.map(_.subst(from, to)), cdef.body.subst(from, to), canReduceGuard))
         }
         else None
       }
 
       def recur(cases: List[CaseDef]): MatchRedux = cases match {
         case Nil => None
-        case cdef :: cases1 => reduceCase(cdef) `orElse` recur(cases1)
+        case cdef :: cases1 =>
+          reduceCase(cdef) match
+            case None => recur(cases1)
+            case r @ Some((caseBindings, rhs, canReduceGuard)) if canReduceGuard => Some((caseBindings, rhs))
+            case _ => None
       }
 
       recur(cases)
@@ -1306,7 +1514,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
    *  4. Make sure inlined code is type-correct.
    *  5. Make sure that the tree's typing is idempotent (so that future -Ycheck passes succeed)
    */
-  class InlineTyper(initialErrorCount: Int) extends ReTyper {
+  class InlineTyper(initialErrorCount: Int, @constructorOnly nestingLevel: Int = ctx.nestingLevel + 1) extends ReTyper(nestingLevel) {
     import reducer._
 
     override def ensureAccessible(tpe: Type, superAccess: Boolean, pos: SrcPos)(using Context): Type = {
@@ -1322,20 +1530,34 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
       super.ensureAccessible(tpe, superAccess, pos)
     }
 
+    /** Enter implicits in scope so that they can be found in implicit search.
+     *  This is important for non-transparent inlines
+     */
+    override def index(trees: List[untpd.Tree])(using Context): Context =
+      for case tree: untpd.MemberDef <- trees do
+        if tree.symbol.isOneOf(Flags.GivenOrImplicit) then
+          ctx.scope.openForMutations.enter(tree.symbol)
+      ctx
+
     override def typedIdent(tree: untpd.Ident, pt: Type)(using Context): Tree =
       inlineIfNeeded(tryInlineArg(tree.asInstanceOf[tpd.Tree]) `orElse` super.typedIdent(tree, pt))
 
     override def typedSelect(tree: untpd.Select, pt: Type)(using Context): Tree = {
-      assert(tree.hasType, tree)
       val qual1 = typed(tree.qualifier, shallowSelectionProto(tree.name, pt, this))
       val resNoReduce = untpd.cpy.Select(tree)(qual1, tree.name).withType(tree.typeOpt)
-      val resMaybeReduced = constToLiteral(reducer.reduceProjection(resNoReduce))
-      if (resNoReduce ne resMaybeReduced)
-        typed(resMaybeReduced, pt) // redo typecheck if reduction changed something
+      val reducedProjection = reducer.reduceProjection(resNoReduce)
+      if reducedProjection.isType then
+        //if the projection leads to a typed tree then we stop reduction
+        resNoReduce
       else
-        val res = resMaybeReduced
-        ensureAccessible(res.tpe, tree.qualifier.isInstanceOf[untpd.Super], tree.srcPos)
-        inlineIfNeeded(res)
+        val res = constToLiteral(reducedProjection)
+        if resNoReduce ne res then
+          typed(res, pt) // redo typecheck if reduction changed something
+        else if res.symbol.isInlineMethod then
+          inlineIfNeeded(res)
+        else
+          ensureAccessible(res.tpe, tree.qualifier.isInstanceOf[untpd.Super], tree.srcPos)
+          res
     }
 
     override def typedIf(tree: untpd.If, pt: Type)(using Context): Tree =
@@ -1366,14 +1588,18 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
       super.typedValDef(vdef1, sym)
 
     override def typedApply(tree: untpd.Apply, pt: Type)(using Context): Tree =
-      val res = constToLiteral(betaReduce(super.typedApply(tree, pt))) match {
+      def cancelQuotes(tree: Tree): Tree =
+        tree match
+          case Quoted(Spliced(inner)) => inner
+          case _ => tree
+      val res = cancelQuotes(constToLiteral(betaReduce(super.typedApply(tree, pt)))) match {
         case res: Apply if res.symbol == defn.QuotedRuntime_exprSplice
                         && level == 0
                         && !hasInliningErrors =>
           val expanded = expandMacro(res.args.head, tree.srcPos)
           typedExpr(expanded) // Inline calls and constant fold code generated by the macro
         case res =>
-          inlineIfNeeded(res)
+          specializeEq(inlineIfNeeded(res))
       }
       if res.symbol == defn.QuotedRuntime_exprQuote then
         ctx.compilationUnit.needsQuotePickling = true
@@ -1440,13 +1666,16 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
         }
       }
 
-    override def newLikeThis: Typer = new InlineTyper(initialErrorCount)
+    override def newLikeThis(nestingLevel: Int): Typer = new InlineTyper(initialErrorCount, nestingLevel)
 
     /** True if this inline typer has already issued errors */
     override def hasInliningErrors(using Context) = ctx.reporter.errorCount > initialErrorCount
 
     private def inlineIfNeeded(tree: Tree)(using Context): Tree =
-      if Inliner.needsInlining(tree) then Inliner.inlineCall(tree)
+      val meth = tree.symbol
+      if meth.isAllOf(DeferredInline) then
+        errorTree(tree, i"Deferred inline ${meth.showLocated} cannot be invoked")
+      else if Inliner.needsInlining(tree) then Inliner.inlineCall(tree)
       else tree
 
     override def typedUnadapted(tree: untpd.Tree, pt: Type, locked: TypeVars)(using Context): Tree =
@@ -1455,6 +1684,21 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
         case tree => tree
   }
 
+  def specializeEq(tree: Tree): Tree =
+    tree match
+      case Apply(sel @ Select(arg1, opName), arg2 :: Nil)
+      if sel.symbol == defn.Any_== || sel.symbol == defn.Any_!= =>
+        defn.ScalaValueClasses().find { cls =>
+          arg1.tpe.derivesFrom(cls) && arg2.tpe.derivesFrom(cls)
+        } match {
+          case Some(cls) =>
+            val newOp = cls.requiredMethod(opName, List(cls.typeRef))
+            arg1.select(newOp).withSpan(sel.span).appliedTo(arg2).withSpan(tree.span)
+          case None => tree
+        }
+      case _ =>
+        tree
+
   /** Drop any side-effect-free bindings that are unused in expansion or other reachable bindings.
    *  Inline def bindings that are used only once.
    */
diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
index 3be5fae4df98..4bca5c50cf77 100644
--- a/compiler/src/dotty/tools/dotc/typer/Namer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -18,6 +18,8 @@ import tpd.tpes
 import Variances.alwaysInvariant
 import config.{Config, Feature}
 import config.Printers.typr
+import parsing.JavaParsers.JavaParser
+import parsing.Parsers.Parser
 import Annotations._
 import Inferencing._
 import transform.ValueClasses._
@@ -27,6 +29,8 @@ import reporting._
 import config.Feature.sourceVersion
 import config.SourceVersion._
 
+import scala.annotation.constructorOnly
+
 /** This class creates symbols from definitions and imports and gives them
  *  lazy types.
  *
@@ -86,13 +90,6 @@ class Namer { typer: Typer =>
    */
   lazy val nestedTyper: mutable.AnyRefMap[Symbol, Typer] = new mutable.AnyRefMap
 
-  /** The scope of the typer.
-   *  For nested typers this is a place parameters are entered during completion
-   *  and where they survive until typechecking. A context with this typer also
-   *  has this scope.
-   */
-  val scope: MutableScope = newScope
-
   /** We are entering symbols coming from a SourceLoader */
   private var lateCompile = false
 
@@ -241,7 +238,7 @@ class Namer { typer: Typer =>
 
     tree match {
       case tree: TypeDef if tree.isClassDef =>
-        val flags = checkFlags(tree.mods.flags &~ Implicit)
+        val flags = checkFlags(tree.mods.flags)
         val name = checkNoConflict(tree.name, flags.is(Private), tree.span).asTypeName
         val cls =
           createOrRefine[ClassSymbol](tree, name, flags, ctx.owner,
@@ -412,6 +409,58 @@ class Namer { typer: Typer =>
   def isEnumConstant(vd: ValDef)(using Context): Boolean =
     vd.mods.isAllOf(JavaEnumValue)
 
+  /** Ensure that the first type in a list of parent types Ps points to a non-trait class.
+   *  If that's not already the case, add one. The added class type CT is determined as follows.
+   *  First, let C be the unique class such that
+   *  - there is a parent P_i such that P_i derives from C, and
+   *  - for every class D: If some parent P_j, j <= i derives from D, then C derives from D.
+   *  Then, let CT be the smallest type which
+   *  - has C as its class symbol, and
+   *  - for all parents P_i: If P_i derives from C then P_i <:< CT.
+   *
+   * Tweak: It could be that at the point where the method is called, some superclass
+   * is still missing its parents. Parents are set to Nil when completion starts and are
+   * set to the actual parents later. If a superclass completes a subclass in one
+   * of its parents, the parents of the superclass or some intervening class might
+   * not yet be set. This situation can be detected by asking for the baseType of Any -
+   * if that type does not exist, one of the base classes of this class misses its parents.
+   * If this situation arises, the computation of the superclass might be imprecise.
+   * For instance, in i12722.scala, the superclass of `IPersonalCoinOps` is computed
+   * as `Object`, where `JsObject` would be correct. The problem cannot be solved locally,
+   * but we detect the situaton and mark the superclass with a `@ProvisionalSuperClass`
+   * annotation in this case. When typechecking the class, we then run ensureFirstIsClass
+   * again and possibly improve the computed super class.
+   * An alternatiev fix would compute superclasses at typer instead at completion. But
+   * that breaks too many invariants. For instance, we rely on correct @Child annotations
+   * after completion, and these in turn need the superclass.
+   */
+  def ensureFirstIsClass(cls: ClassSymbol, parents: List[Type])(using Context): List[Type] =
+
+    def realClassParent(sym: Symbol): ClassSymbol =
+      if !sym.isClass then defn.ObjectClass
+      else if !sym.is(Trait) then sym.asClass
+      else sym.info.parents match
+        case parentRef :: _ => realClassParent(parentRef.typeSymbol)
+        case nil => defn.ObjectClass
+
+    def improve(candidate: ClassSymbol, parent: Type): ClassSymbol =
+      val pcls = realClassParent(parent.classSymbol)
+      if (pcls derivesFrom candidate) pcls else candidate
+
+    parents match
+      case p :: _ if p.classSymbol.isRealClass => parents
+      case _ =>
+        val pcls = parents.foldLeft(defn.ObjectClass)(improve)
+        typr.println(i"ensure first is class $parents%, % --> ${parents map (_ baseType pcls)}%, %")
+        val bases = parents.map(_.baseType(pcls))
+        var first = TypeComparer.glb(defn.ObjectType :: bases)
+        val isProvisional = parents.exists(!_.baseType(defn.AnyClass).exists)
+        if isProvisional then
+          typr.println(i"provisional superclass $first for $cls")
+          first = AnnotatedType(first, Annotation(defn.ProvisionalSuperClassAnnot))
+        checkFeasibleParent(first, cls.srcPos, em" in inferred superclass $first") :: parents
+  end ensureFirstIsClass
+
   /** Add child annotation for `child` to annotations of `cls`. The annotation
    *  is added at the correct insertion point, so that Child annotations appear
    *  in reverse order of their start positions.
@@ -617,7 +666,7 @@ class Namer { typer: Typer =>
           val classSym = ctx.effectiveScope.lookup(className)
           val moduleName = className.toTermName
           if needsConstructorProxies(classSym) && ctx.effectiveScope.lookupEntry(moduleName) == null then
-            enterSymbol(constructorCompanion(classSym.asClass))
+            enterSymbol(classConstructorCompanion(classSym.asClass))
       else if ctx.owner.is(PackageClass) then
         for case cdef @ TypeDef(moduleName, _) <- moduleDef.values do
           val moduleSym = ctx.effectiveScope.lookup(moduleName)
@@ -634,12 +683,13 @@ class Namer { typer: Typer =>
             val moduleName = className.toTermName
             val companionVals = ctx.effectiveScope.lookupAll(moduleName.encode)
             if companionVals.isEmpty && needsConstructorProxies(classSym) then
-              enterSymbol(constructorCompanion(classSym.asClass))
+              enterSymbol(classConstructorCompanion(classSym.asClass))
             else
               for moduleSym <- companionVals do
                 if moduleSym.is(Module) && !moduleSym.isDefinedInCurrentRun then
                   val companion =
-                    if needsConstructorProxies(classSym) then constructorCompanion(classSym.asClass)
+                    if needsConstructorProxies(classSym) then
+                      classConstructorCompanion(classSym.asClass)
                     else newModuleSymbol(
                       ctx.owner, moduleName, EmptyFlags, EmptyFlags, (_, _) => NoType)
                   enterSymbol(companion)
@@ -655,15 +705,44 @@ class Namer { typer: Typer =>
     ctxWithStats
   }
 
-  /** Index symbols in `tree` while asserting the `lateCompile` flag.
-   *  This will cause any old top-level symbol with the same fully qualified
-   *  name as a newly created symbol to be replaced.
+  /** Parse the source and index symbols in the compilation unit's untpdTree
+   *  while asserting the `lateCompile` flag. This will cause any old
+   *  top-level symbol with the same fully qualified name as a newly created
+   *  symbol to be replaced.
+   *
+   *  Will call the callback with an implementation of type checking
+   *  That will set the tpdTree and root tree for the compilation unit.
    */
-  def lateEnter(tree: Tree)(using Context): Context = {
-    val saved = lateCompile
-    lateCompile = true
-    try index(tree :: Nil) finally lateCompile = saved
-  }
+  def lateEnterUnit(typeCheckCB: (() => Unit) => Unit)(using Context) =
+    val unit = ctx.compilationUnit
+
+    /** Index symbols in unit.untpdTree with lateCompile flag = true */
+    def lateEnter()(using Context): Context =
+      val saved = lateCompile
+      lateCompile = true
+      try index(unit.untpdTree :: Nil) finally lateCompile = saved
+
+    /** Set the tpdTree and root tree of the compilation unit */
+    def lateTypeCheck()(using Context) =
+      unit.tpdTree = typer.typedExpr(unit.untpdTree)
+      val phase = new transform.SetRootTree()
+      phase.run
+
+    unit.untpdTree =
+      if (unit.isJava) new JavaParser(unit.source).parse()
+      else new Parser(unit.source).parse()
+
+    atPhase(Phases.typerPhase) {
+      inContext(PrepareInlineable.initContext(ctx)) {
+        // inline body annotations are set in namer, capturing the current context
+        // we need to prepare the context for inlining.
+        lateEnter()
+        typeCheckCB { () =>
+          lateTypeCheck()
+        }
+      }
+    }
+  end lateEnterUnit
 
   /** The type bound on wildcard imports of an import list, with special values
    *    Nothing  if no wildcard imports of this kind exist
@@ -698,12 +777,12 @@ class Namer { typer: Typer =>
         if (sym.is(Module)) moduleValSig(sym)
         else valOrDefDefSig(original, sym, Nil, identity)(using localContext(sym).setNewScope)
       case original: DefDef =>
-        val typer1 = ctx.typer.newLikeThis
+        val typer1 = ctx.typer.newLikeThis(ctx.nestingLevel + 1)
         nestedTyper(sym) = typer1
-        typer1.defDefSig(original, sym)(using localContext(sym).setTyper(typer1))
+        typer1.defDefSig(original, sym, this)(using localContext(sym).setTyper(typer1))
       case imp: Import =>
         try
-          val expr1 = typedImportQualifier(imp, typedAheadExpr)
+          val expr1 = typedImportQualifier(imp, typedAheadExpr(_, _)(using ctx.withOwner(sym)))
           ImportType(expr1)
         catch case ex: CyclicReference =>
           typr.println(s"error while completing ${imp.expr}")
@@ -733,6 +812,15 @@ class Namer { typer: Typer =>
             completer.complete(denot)
     }
 
+    private var completedTypeParamSyms: List[TypeSymbol] = null
+
+    def setCompletedTypeParams(tparams: List[TypeSymbol]) =
+      completedTypeParamSyms = tparams
+
+    override def completerTypeParams(sym: Symbol)(using Context): List[TypeSymbol] =
+      if completedTypeParamSyms != null then completedTypeParamSyms
+      else Nil
+
     protected def addAnnotations(sym: Symbol): Unit = original match {
       case original: untpd.MemberDef =>
         lazy val annotCtx = annotContext(original, sym)
@@ -927,9 +1015,12 @@ class Namer { typer: Typer =>
       val unsafeInfo = if (isDerived) rhsBodyType else abstracted(rhsBodyType)
 
       def opaqueToBounds(info: Type): Type =
-        if sym.isOpaqueAlias && info.typeParams.nonEmpty && info.hkResult.typeParams.nonEmpty then
-          report.error(em"opaque type alias cannot have multiple type parameter lists", rhs.srcPos)
-        sym.opaqueToBounds(info, rhs1, tparamSyms)
+        if sym.isOpaqueAlias then
+          if info.typeParams.nonEmpty && info.hkResult.typeParams.nonEmpty then
+            report.error(em"opaque type alias cannot have multiple type parameter lists", rhs.srcPos)
+          sym.opaqueToBounds(info, rhs1, tparamSyms)
+        else
+          info
 
       if (isDerived) sym.info = unsafeInfo
       else {
@@ -953,7 +1044,7 @@ class Namer { typer: Typer =>
   }
 
   class ClassCompleter(cls: ClassSymbol, original: TypeDef)(ictx: Context) extends Completer(original)(ictx) {
-    withDecls(newScope)
+    withDecls(newScope(using ictx))
 
     protected implicit val completerCtx: Context = localContext(cls)
 
@@ -972,162 +1063,195 @@ class Namer { typer: Typer =>
 
     def init(): Context = index(params)
 
-    /** Add forwarders as required by the export statements in this class */
-    private def processExports(using Context): Unit = {
+    /** The forwarders defined by export `exp` */
+    private def exportForwarders(exp: Export)(using Context): List[tpd.MemberDef] =
+      val buf = new mutable.ListBuffer[tpd.MemberDef]
+      val Export(expr, selectors) = exp
+      if expr.isEmpty then
+        report.error(em"Export selector must have prefix and `.`", exp.srcPos)
+        return Nil
+
+      val path = typedAheadExpr(expr, AnySelectionProto)
+      checkLegalExportPath(path, selectors)
+      lazy val wildcardBound = importBound(selectors, isGiven = false)
+      lazy val givenBound = importBound(selectors, isGiven = true)
+
+      def canForward(mbr: SingleDenotation): CanForward = {
+        import CanForward.*
+        val sym = mbr.symbol
+        if !sym.isAccessibleFrom(path.tpe) then
+          No("is not accessible")
+        else if sym.isConstructor || sym.is(ModuleClass) || sym.is(Bridge) || sym.is(ConstructorProxy) then
+          Skip
+        else if cls.derivesFrom(sym.owner) && (sym.owner == cls || !sym.is(Deferred)) then
+          No(i"is already a member of $cls")
+        else if sym.is(Override) then
+          sym.allOverriddenSymbols.find(
+            other => cls.derivesFrom(other.owner) && !other.is(Deferred)
+          ) match
+              case Some(other) => No(i"overrides ${other.showLocated}, which is already a member of $cls")
+              case None => Yes
+        else if sym.isAllOf(JavaModule) then
+          Skip
+        else Yes
+      }
 
-      /** A string indicating that no forwarders for this kind of symbol are emitted */
-      val SKIP = "(skip)"
+      def foreachDefaultGetterOf(sym: TermSymbol, op: TermSymbol => Unit): Unit =
+        var n = 0
+        for params <- sym.paramSymss; param <- params do
+          if param.isTerm then
+            if param.is(HasDefault) then
+              val getterName = DefaultGetterName(sym.name, n)
+              val getter = path.tpe.member(DefaultGetterName(sym.name, n)).symbol
+              assert(getter.exists, i"$path does not have a default getter named $getterName")
+              op(getter.asTerm)
+            n += 1
+
+      /** Add a forwarder with name `alias` or its type name equivalent to `mbr`,
+        *  provided `mbr` is accessible and of the right implicit/non-implicit kind.
+        */
+      def addForwarder(alias: TermName, mbr: SingleDenotation, span: Span): Unit =
+
+        def adaptForwarderParams(acc: List[List[tpd.Tree]], tp: Type, prefss: List[List[tpd.Tree]])
+          : List[List[tpd.Tree]] = tp match
+            case mt: MethodType
+            if mt.paramInfos.nonEmpty && mt.paramInfos.last.isRepeatedParam =>
+              // Note: in this branch we use the assumptions
+              // that `prefss.head` corresponds to `mt.paramInfos` and
+              // that `prefss.tail` corresponds to `mt.resType`
+              val init :+ vararg = prefss.head
+              val prefs = init :+ ctx.typeAssigner.seqToRepeated(vararg)
+              adaptForwarderParams(prefs :: acc, mt.resType, prefss.tail)
+            case mt: MethodOrPoly =>
+              adaptForwarderParams(prefss.head :: acc, mt.resultType, prefss.tail)
+            case _ =>
+              acc.reverse ::: prefss
 
-      /** The forwarders defined by export `exp`.
-       */
-      def exportForwarders(exp: Export): List[tpd.MemberDef] = {
-        val buf = new mutable.ListBuffer[tpd.MemberDef]
-        val Export(expr, selectors) = exp
-        if expr.isEmpty then
-          report.error(em"Export selector must have prefix and `.`", exp.srcPos)
-          return Nil
-
-        val path = typedAheadExpr(expr, AnySelectionProto)
-        checkLegalExportPath(path, selectors)
-        lazy val wildcardBound = importBound(selectors, isGiven = false)
-        lazy val givenBound = importBound(selectors, isGiven = true)
-
-        def whyNoForwarder(mbr: SingleDenotation): String = {
+        if canForward(mbr) == CanForward.Yes then
           val sym = mbr.symbol
-          if (!sym.isAccessibleFrom(path.tpe)) "is not accessible"
-          else if (sym.isConstructor || sym.is(ModuleClass) || sym.is(Bridge) || sym.is(ConstructorProxy)) SKIP
-          else if (cls.derivesFrom(sym.owner) &&
-                   (sym.owner == cls || !sym.is(Deferred))) i"is already a member of $cls"
-          else if (sym.is(Override))
-            sym.allOverriddenSymbols.find(
-             other => cls.derivesFrom(other.owner) && !other.is(Deferred)) match {
-               case Some(other) => i"overrides ${other.showLocated}, which is already a member of $cls"
-               case None => ""
-            }
-          else ""
-        }
-
-        /** Add a forwarder with name `alias` or its type name equivalent to `mbr`,
-         *  provided `mbr` is accessible and of the right implicit/non-implicit kind.
-         */
-        def addForwarder(alias: TermName, mbr: SingleDenotation, span: Span): Unit =
-
-          def adaptForwarderParams(acc: List[List[tpd.Tree]], tp: Type, prefss: List[List[tpd.Tree]])
-            : List[List[tpd.Tree]] = tp match
-              case mt: MethodType
-              if mt.paramInfos.nonEmpty && mt.paramInfos.last.isRepeatedParam =>
-                // Note: in this branch we use the assumptions
-                // that `prefss.head` corresponds to `mt.paramInfos` and
-                // that `prefss.tail` corresponds to `mt.resType`
-                val init :+ vararg = prefss.head
-                val prefs = init :+ ctx.typeAssigner.seqToRepeated(vararg)
-                adaptForwarderParams(prefs :: acc, mt.resType, prefss.tail)
-              case mt: MethodOrPoly =>
-                adaptForwarderParams(prefss.head :: acc, mt.resultType, prefss.tail)
-              case _ =>
-                acc.reverse ::: prefss
-
-          if whyNoForwarder(mbr) == "" then
-            val sym = mbr.symbol
-            val forwarder =
-              if mbr.isType then
-                val forwarderName = checkNoConflict(alias.toTypeName, isPrivate = false, span)
-                var target = path.tpe.select(sym)
-                if target.typeParams.nonEmpty then
-                  target = target.EtaExpand(target.typeParams)
-                newSymbol(
-                  cls, forwarderName,
-                  Exported | Final,
-                  TypeAlias(target),
-                  coord = span)
-                // Note: This will always create unparameterzied aliases. So even if the original type is
-                // a parameterized class, say `C[X]` the alias will read `type C = d.C`. We currently do
-                // allow such type aliases. If we forbid them at some point (requiring the referred type to be
-                // fully applied), we'd have to change the scheme here as well.
-              else {
-                def refersToPrivate(tp: Type): Boolean = tp match
-                  case tp: TermRef => tp.termSymbol.is(Private) || refersToPrivate(tp.prefix)
-                  case _ => false
-                val (maybeStable, mbrInfo) =
-                  if sym.isStableMember && sym.isPublic && !refersToPrivate(path.tpe) then
-                    (StableRealizable, ExprType(path.tpe.select(sym)))
-                  else
-                    (EmptyFlags, mbr.info.ensureMethodic)
-                var mbrFlags = Exported | Method | Final | maybeStable | sym.flags & RetainedExportFlags
-                if sym.is(ExtensionMethod) then mbrFlags |= ExtensionMethod
-                val forwarderName = checkNoConflict(alias, isPrivate = false, span)
-                newSymbol(cls, forwarderName, mbrFlags, mbrInfo, coord = span)
-              }
-            forwarder.info = avoidPrivateLeaks(forwarder)
-            forwarder.addAnnotations(sym.annotations)
-            val forwarderDef =
-              if (forwarder.isType) tpd.TypeDef(forwarder.asType)
-              else {
-                import tpd._
-                val ref = path.select(sym.asTerm)
-                val ddef = tpd.DefDef(forwarder.asTerm, prefss =>
-                  ref.appliedToArgss(adaptForwarderParams(Nil, sym.info, prefss))
-                )
-                if forwarder.isInlineMethod then
-                  PrepareInlineable.registerInlineInfo(forwarder, ddef.rhs)
-                ddef
-              }
-
-            buf += forwarderDef.withSpan(span)
-        end addForwarder
-
-        def addForwardersNamed(name: TermName, alias: TermName, span: Span): Unit = {
-          val size = buf.size
-          val mbrs = List(name, name.toTypeName).flatMap(path.tpe.member(_).alternatives)
-          mbrs.foreach(addForwarder(alias, _, span))
-          if (buf.size == size) {
-            val reason = mbrs.map(whyNoForwarder).dropWhile(_ == SKIP) match {
-              case Nil => ""
-              case why :: _ => i"\n$path.$name cannot be exported because it $why"
-            }
-            report.error(i"""no eligible member $name at $path$reason""", ctx.source.atSpan(span))
-          }
-        }
-
-        def addWildcardForwardersNamed(name: TermName, span: Span): Unit =
-          List(name, name.toTypeName)
-            .flatMap(path.tpe.memberBasedOnFlags(_, excluded = Private|Given|ConstructorProxy).alternatives)
-            .foreach(addForwarder(name, _, span)) // ignore if any are not added
-
-        def addWildcardForwarders(seen: List[TermName], span: Span): Unit =
-          val nonContextual = mutable.HashSet(seen: _*)
-          for mbr <- path.tpe.membersBasedOnFlags(required = EmptyFlags, excluded = PrivateOrSynthetic) do
-            if !mbr.symbol.isSuperAccessor then
+          val hasDefaults = sym.hasDefaultParams // compute here to ensure HasDefaultParams and NoDefaultParams flags are set
+          val forwarder =
+            if mbr.isType then
+              val forwarderName = checkNoConflict(alias.toTypeName, isPrivate = false, span)
+              var target = path.tpe.select(sym)
+              if target.typeParams.nonEmpty then
+                target = target.EtaExpand(target.typeParams)
+              newSymbol(
+                cls, forwarderName,
+                Exported | Final,
+                TypeAlias(target),
+                coord = span)
+              // Note: This will always create unparameterzied aliases. So even if the original type is
+              // a parameterized class, say `C[X]` the alias will read `type C = d.C`. We currently do
+              // allow such type aliases. If we forbid them at some point (requiring the referred type to be
+              // fully applied), we'd have to change the scheme here as well.
+            else
+              def refersToPrivate(tp: Type): Boolean = tp match
+                case tp: TermRef => tp.termSymbol.is(Private) || refersToPrivate(tp.prefix)
+                case _ => false
+              val (maybeStable, mbrInfo) =
+                if sym.isStableMember && sym.isPublic && !refersToPrivate(path.tpe) then
+                  (StableRealizable, ExprType(path.tpe.select(sym)))
+                else
+                  (EmptyFlags, mbr.info.ensureMethodic)
+              var flagMask = RetainedExportFlags
+              if sym.isTerm then flagMask |= HasDefaultParams | NoDefaultParams
+              var mbrFlags = Exported | Method | Final | maybeStable | sym.flags & flagMask
+              if sym.is(ExtensionMethod) then mbrFlags |= ExtensionMethod
+              val forwarderName = checkNoConflict(alias, isPrivate = false, span)
+              newSymbol(cls, forwarderName, mbrFlags, mbrInfo, coord = span)
+
+          forwarder.info = avoidPrivateLeaks(forwarder)
+          forwarder.addAnnotations(sym.annotations.filterConserve(_.symbol != defn.BodyAnnot))
+
+          if forwarder.isType then
+            buf += tpd.TypeDef(forwarder.asType).withSpan(span)
+          else
+            import tpd._
+            val ref = path.select(sym.asTerm)
+            val ddef = tpd.DefDef(forwarder.asTerm, prefss =>
+                ref.appliedToArgss(adaptForwarderParams(Nil, sym.info, prefss)))
+            if forwarder.isInlineMethod then
+              PrepareInlineable.registerInlineInfo(forwarder, ddef.rhs)
+            buf += ddef.withSpan(span)
+            if hasDefaults then
+              foreachDefaultGetterOf(sym.asTerm,
+                getter => addForwarder(getter.name.asTermName, getter, span))
+      end addForwarder
+
+      def addForwardersNamed(name: TermName, alias: TermName, span: Span): Unit =
+        val size = buf.size
+        val mbrs = List(name, name.toTypeName).flatMap(path.tpe.member(_).alternatives)
+        mbrs.foreach(addForwarder(alias, _, span))
+        if buf.size == size then
+          val reason = mbrs.map(canForward).collect {
+            case CanForward.No(whyNot) => i"\n$path.$name cannot be exported because it $whyNot"
+          }.headOption.getOrElse("")
+          report.error(i"""no eligible member $name at $path$reason""", ctx.source.atSpan(span))
+
+      def addWildcardForwardersNamed(name: TermName, span: Span): Unit =
+        List(name, name.toTypeName)
+          .flatMap(path.tpe.memberBasedOnFlags(_, excluded = Private|Given|ConstructorProxy).alternatives)
+          .foreach(addForwarder(name, _, span)) // ignore if any are not added
+
+      def addWildcardForwarders(seen: List[TermName], span: Span): Unit =
+        val nonContextual = mutable.HashSet(seen: _*)
+        val fromCaseClass = path.tpe.widen.classSymbols.exists(_.is(Case))
+        def isCaseClassSynthesized(mbr: Symbol) =
+          fromCaseClass && defn.caseClassSynthesized.contains(mbr)
+        for mbr <- path.tpe.membersBasedOnFlags(required = EmptyFlags, excluded = PrivateOrSynthetic) do
+          if !mbr.symbol.isSuperAccessor
               // Scala 2 superaccessors have neither Synthetic nor Artfact set, so we
               // need to filter them out here (by contrast, Scala 3 superaccessors are Artifacts)
-              val alias = mbr.name.toTermName
-              if mbr.symbol.is(Given) then
-                if !seen.contains(alias) && mbr.matchesImportBound(givenBound) then
-                  addForwarder(alias, mbr, span)
-              else if !nonContextual.contains(alias) && mbr.matchesImportBound(wildcardBound) then
-                nonContextual += alias
-                addWildcardForwardersNamed(alias, span)
-
-        def addForwarders(sels: List[untpd.ImportSelector], seen: List[TermName]): Unit = sels match
-          case sel :: sels1 =>
-            if sel.isWildcard then
-              addWildcardForwarders(seen, sel.span)
-            else
-              if sel.rename != nme.WILDCARD then
-                addForwardersNamed(sel.name, sel.rename, sel.span)
-              addForwarders(sels1, sel.name :: seen)
-          case _ =>
+              // Symbols from base traits of case classes that will get synthesized implementations
+              // at PostTyper are also excluded.
+            && !isCaseClassSynthesized(mbr.symbol)
+            && !mbr.symbol.name.is(DefaultGetterName)
+              // default getters are exported with the members they belong to
+          then
+            val alias = mbr.name.toTermName
+            if mbr.symbol.is(Given) then
+              if !seen.contains(alias) && mbr.matchesImportBound(givenBound) then
+                addForwarder(alias, mbr, span)
+            else if !nonContextual.contains(alias) && mbr.matchesImportBound(wildcardBound) then
+              nonContextual += alias
+              addWildcardForwardersNamed(alias, span)
+
+      def addForwarders(sels: List[untpd.ImportSelector], seen: List[TermName]): Unit = sels match
+        case sel :: sels1 =>
+          if sel.isWildcard then
+            addWildcardForwarders(seen, sel.span)
+          else
+            if sel.rename != nme.WILDCARD then
+              addForwardersNamed(sel.name, sel.rename, sel.span)
+            addForwarders(sels1, sel.name :: seen)
+        case _ =>
 
-        addForwarders(selectors, Nil)
-        val forwarders = buf.toList
-        exp.pushAttachment(ExportForwarders, forwarders)
-        forwarders
-      }
+      addForwarders(selectors, Nil)
+      val forwarders = buf.toList
+      exp.pushAttachment(ExportForwarders, forwarders)
+      forwarders
+    end exportForwarders
 
-      for case exp @ Export(_, _) <- rest do
-        for forwarder <- exportForwarders(exp) do
-          forwarder.symbol.entered
-    }
+    /** Add forwarders as required by the export statements in this class */
+    private def processExports(using Context): Unit =
+
+      def process(stats: List[Tree])(using Context): Unit = stats match
+        case (stat: Export) :: stats1 =>
+          for forwarder <- exportForwarders(stat) do
+            forwarder.symbol.entered
+          process(stats1)
+        case (stat: Import) :: stats1 =>
+          process(stats1)(using ctx.importContext(stat, symbolOfTree(stat)))
+        case stat :: stats1 =>
+          process(stats1)
+        case Nil =>
+
+      // Do a quick scan whether we need to process at all. This avoids creating
+      // import contexts for nothing.
+      if rest.exists(_.isInstanceOf[Export]) then
+        process(rest)
+    end processExports
 
     /** Ensure constructor is completed so that any parameter accessors
      *  which have type trees deriving from its parameters can be
@@ -1240,37 +1364,6 @@ class Namer { typer: Typer =>
         }
       }
 
-      /** Ensure that the first type in a list of parent types Ps points to a non-trait class.
-       *  If that's not already the case, add one. The added class type CT is determined as follows.
-       *  First, let C be the unique class such that
-       *  - there is a parent P_i such that P_i derives from C, and
-       *  - for every class D: If some parent P_j, j <= i derives from D, then C derives from D.
-       *  Then, let CT be the smallest type which
-       *  - has C as its class symbol, and
-       *  - for all parents P_i: If P_i derives from C then P_i <:< CT.
-       */
-      def ensureFirstIsClass(parents: List[Type]): List[Type] =
-
-        def realClassParent(sym: Symbol): ClassSymbol =
-          if !sym.isClass then defn.ObjectClass
-          else if !sym.is(Trait) then sym.asClass
-          else sym.info.parents match
-            case parentRef :: _ => realClassParent(parentRef.typeSymbol)
-            case nil => defn.ObjectClass
-
-        def improve(candidate: ClassSymbol, parent: Type): ClassSymbol =
-          val pcls = realClassParent(parent.classSymbol)
-          if (pcls derivesFrom candidate) pcls else candidate
-
-        parents match
-          case p :: _ if p.classSymbol.isRealClass => parents
-          case _ =>
-            val pcls = parents.foldLeft(defn.ObjectClass)(improve)
-            typr.println(i"ensure first is class $parents%, % --> ${parents map (_ baseType pcls)}%, %")
-            val first = TypeComparer.glb(defn.ObjectType :: parents.map(_.baseType(pcls)))
-            checkFeasibleParent(first, cls.srcPos, em" in inferred superclass $first") :: parents
-      end ensureFirstIsClass
-
       /** If `parents` contains references to traits that have supertraits with implicit parameters
        *  add those supertraits in linearization order unless they are already covered by other
        *  parent types. For instance, in
@@ -1313,7 +1406,7 @@ class Namer { typer: Typer =>
       val parentTypes = defn.adjustForTuple(cls, cls.typeParams,
         defn.adjustForBoxedUnit(cls,
           addUsingTraits(
-            ensureFirstIsClass(parents.map(checkedParentType(_)))
+            ensureFirstIsClass(cls, parents.map(checkedParentType(_)))
           )
         )
       )
@@ -1348,6 +1441,12 @@ class Namer { typer: Typer =>
     }
   }
 
+  /** Possible actions to perform when deciding on a forwarder for a member */
+  private enum CanForward:
+    case Yes
+    case No(whyNot: String)
+    case Skip  // for members that have never forwarders
+
   class SuspendCompleter extends LazyType, SymbolLoaders.SecondCompleter {
 
     final override def complete(denot: SymDenotation)(using Context): Unit =
@@ -1368,14 +1467,10 @@ class Namer { typer: Typer =>
   }
 
   def typedAheadType(tree: Tree, pt: Type = WildcardType)(using Context): tpd.Tree =
-    inMode(ctx.mode &~ Mode.PatternOrTypeBits | Mode.Type) {
-      typedAhead(tree, typer.typed(_, pt))
-    }
+    typedAhead(tree, typer.typedType(_, pt))
 
   def typedAheadExpr(tree: Tree, pt: Type = WildcardType)(using Context): tpd.Tree =
-    withoutMode(Mode.PatternOrTypeBits) {
-      typedAhead(tree, typer.typed(_, pt))
-    }
+    typedAhead(tree, typer.typedExpr(_, pt))
 
   def typedAheadAnnotation(tree: Tree)(using Context): tpd.Tree =
     typedAheadExpr(tree, defn.AnnotationClass.typeRef)
@@ -1414,166 +1509,7 @@ class Namer { typer: Typer =>
    */
   def valOrDefDefSig(mdef: ValOrDefDef, sym: Symbol, paramss: List[List[Symbol]], paramFn: Type => Type)(using Context): Type = {
 
-    def inferredType = {
-      /** A type for this definition that might be inherited from elsewhere:
-       *  If this is a setter parameter, the corresponding getter type.
-       *  If this is a class member, the conjunction of all result types
-       *  of overridden methods.
-       *  NoType if neither case holds.
-       */
-      val inherited =
-        if (sym.owner.isTerm) NoType
-        else
-          // TODO: Look only at member of supertype instead?
-          lazy val schema = paramFn(WildcardType)
-          val site = sym.owner.thisType
-          val bcs = sym.owner.info.baseClasses
-          if bcs.isEmpty then
-            assert(ctx.reporter.errorsReported)
-            NoType
-          else bcs.tail.foldLeft(NoType: Type) { (tp, cls) =>
-            def instantiatedResType(info: Type, paramss: List[List[Symbol]]): Type = info match
-              case info: PolyType =>
-                paramss match
-                  case TypeSymbols(tparams) :: paramss1 if info.paramNames.length == tparams.length =>
-                    instantiatedResType(info.instantiate(tparams.map(_.typeRef)), paramss1)
-                  case _ =>
-                    NoType
-              case info: MethodType =>
-                paramss match
-                  case TermSymbols(vparams) :: paramss1 if info.paramNames.length == vparams.length =>
-                    instantiatedResType(info.instantiate(vparams.map(_.termRef)), paramss1)
-                  case _ =>
-                    NoType
-              case _ =>
-                if paramss.isEmpty then info.widenExpr
-                else NoType
-
-            val iRawInfo =
-              cls.info.nonPrivateDecl(sym.name).matchingDenotation(site, schema, sym.targetName).info
-            val iResType = instantiatedResType(iRawInfo, paramss).asSeenFrom(site, cls)
-            if (iResType.exists)
-              typr.println(i"using inherited type for ${mdef.name}; raw: $iRawInfo, inherited: $iResType")
-            tp & iResType
-          }
-      end inherited
-
-      /** If this is a default getter, the type of the corresponding method parameter,
-       *  otherwise NoType.
-       */
-      def defaultParamType = sym.name match
-        case DefaultGetterName(original, idx) =>
-          val meth: Denotation =
-            if (original.isConstructorName && (sym.owner.is(ModuleClass)))
-              sym.owner.companionClass.info.decl(nme.CONSTRUCTOR)
-            else
-              ctx.defContext(sym).denotNamed(original)
-          def paramProto(paramss: List[List[Type]], idx: Int): Type = paramss match {
-            case params :: paramss1 =>
-              if (idx < params.length) params(idx)
-              else paramProto(paramss1, idx - params.length)
-            case nil =>
-              NoType
-          }
-          val defaultAlts = meth.altsWith(_.hasDefaultParams)
-          if (defaultAlts.length == 1)
-            paramProto(defaultAlts.head.info.widen.paramInfoss, idx)
-          else
-            NoType
-        case _ =>
-          NoType
-
-      /** The expected type for a default argument. This is normally the `defaultParamType`
-       *  with references to internal parameters replaced by wildcards. This replacement
-       *  makes it possible that the default argument can have a more specific type than the
-       *  parameter. For instance, we allow
-       *
-       *      class C[A](a: A) { def copy[B](x: B = a): C[B] = C(x) }
-       *
-       *  However, if the default parameter type is a context function type, we
-       *  have to make sure that wildcard types do not leak into the implicitly
-       *  generated closure's result type. Test case is pos/i12019.scala. If there
-       *  would be a leakage with the wildcard approximation, we pick the original
-       *  default parameter type as expected type.
-       */
-      def expectedDefaultArgType =
-        val originalTp = defaultParamType
-        val approxTp = wildApprox(originalTp)
-        approxTp.stripPoly match
-          case atp @ defn.ContextFunctionType(_, resType, _)
-          if !defn.isNonRefinedFunction(atp) // in this case `resType` is lying, gives us only the non-dependent upper bound
-              || resType.existsPart(_.isInstanceOf[WildcardType], stopAtStatic = true, forceLazy = false) =>
-            originalTp
-          case _ =>
-            approxTp
-
-      // println(s"final inherited for $sym: ${inherited.toString}") !!!
-      // println(s"owner = ${sym.owner}, decls = ${sym.owner.info.decls.show}")
-      // TODO Scala 3.1: only check for inline vals (no final ones)
-      def isInlineVal = sym.isOneOf(FinalOrInline, butNot = Method | Mutable)
-
-      var rhsCtx = ctx.fresh.addMode(Mode.InferringReturnType)
-      if sym.isInlineMethod then rhsCtx = rhsCtx.addMode(Mode.InlineableBody)
-      if sym.is(ExtensionMethod) then rhsCtx = rhsCtx.addMode(Mode.InExtensionMethod)
-      val typeParams = paramss.collect { case TypeSymbols(tparams) => tparams }.flatten
-      if (typeParams.nonEmpty) {
-        // we'll be typing an expression from a polymorphic definition's body,
-        // so we must allow constraining its type parameters
-        // compare with typedDefDef, see tests/pos/gadt-inference.scala
-        rhsCtx.setFreshGADTBounds
-        rhsCtx.gadt.addToConstraint(typeParams)
-      }
-
-      def typedAheadRhs(pt: Type) =
-        PrepareInlineable.dropInlineIfError(sym,
-          typedAheadExpr(mdef.rhs, pt)(using rhsCtx))
-
-      def rhsType =
-        // For default getters, we use the corresponding parameter type as an
-        // expected type but we run it through `wildApprox` to allow default
-        // parameters like in `def mkList[T](value: T = 1): List[T]`.
-        val defaultTp = defaultParamType
-        val pt = inherited.orElse(expectedDefaultArgType).orElse(WildcardType).widenExpr
-        val tp = typedAheadRhs(pt).tpe
-        if (defaultTp eq pt) && (tp frozen_<:< defaultTp) then
-          // When possible, widen to the default getter parameter type to permit a
-          // larger choice of overrides (see `default-getter.scala`).
-          // For justification on the use of `@uncheckedVariance`, see
-          // `default-getter-variance.scala`.
-          AnnotatedType(defaultTp, Annotation(defn.UncheckedVarianceAnnot))
-        else tp.widenTermRefExpr.simplified match
-          case ctp: ConstantType if isInlineVal => ctp
-          case tp =>
-            TypeComparer.widenInferred(tp, pt)
-
-      // Replace aliases to Unit by Unit itself. If we leave the alias in
-      // it would be erased to BoxedUnit.
-      def dealiasIfUnit(tp: Type) = if (tp.isRef(defn.UnitClass)) defn.UnitType else tp
-
-      // Approximate a type `tp` with a type that does not contain skolem types.
-      val deskolemize = new ApproximatingTypeMap {
-        def apply(tp: Type) = /*trace(i"deskolemize($tp) at $variance", show = true)*/
-          tp match {
-            case tp: SkolemType => range(defn.NothingType, atVariance(1)(apply(tp.info)))
-            case _ => mapOver(tp)
-          }
-      }
-
-      def cookedRhsType = deskolemize(dealiasIfUnit(rhsType))
-      def lhsType = fullyDefinedType(cookedRhsType, "right-hand side", mdef.span)
-      //if (sym.name.toString == "y") println(i"rhs = $rhsType, cooked = $cookedRhsType")
-      if (inherited.exists)
-        if (isInlineVal) lhsType else inherited
-      else {
-        if (sym.is(Implicit))
-          mdef match {
-            case _: DefDef => missingType(sym, "result ")
-            case _: ValDef if sym.owner.isType => missingType(sym, "")
-            case _ =>
-          }
-        lhsType orElse WildcardType
-      }
-    }
+    def inferredType = inferredResultType(mdef, sym, paramss, paramFn, WildcardType)
     lazy val termParamss = paramss.collect { case TermSymbols(vparams) => vparams }
 
     val tptProto = mdef.tpt match {
@@ -1591,22 +1527,7 @@ class Namer { typer: Typer =>
             // This case applies if the closure result type contains uninstantiated
             // type variables. In this case, constrain the closure result from below
             // by the parameter-capture-avoiding type of the body.
-            val rhsType = typedAheadExpr(mdef.rhs, tpt.tpe).tpe
-
-            // The following part is important since otherwise we might instantiate
-            // the closure result type with a plain functon type that refers
-            // to local parameters. An example where this happens in `dependent-closures.scala`
-            // If the code after `val rhsType` is commented out, this file fails pickling tests.
-            // AVOIDANCE TODO: Follow up why this happens, and whether there
-            // are better ways to achieve this. It would be good if we could get rid of this code.
-            // It seems at least partially redundant with the nesting level checking on TypeVar
-            // instantiation.
-            val hygienicType = TypeOps.avoid(rhsType, termParamss.flatten)
-            if (!hygienicType.isValueType || !(hygienicType <:< tpt.tpe))
-              report.error(i"return type ${tpt.tpe} of lambda cannot be made hygienic;\n" +
-                i"it is not a supertype of the hygienic type $hygienicType", mdef.srcPos)
-            //println(i"lifting $rhsType over $termParamss -> $hygienicType = ${tpt.tpe}")
-            //println(TypeComparer.explained { implicit ctx => hygienicType <:< tpt.tpe })
+            typedAheadExpr(mdef.rhs, tpt.tpe).tpe
           case _ =>
         }
         WildcardType
@@ -1620,7 +1541,7 @@ class Namer { typer: Typer =>
   }
 
   /** The type signature of a DefDef with given symbol */
-  def defDefSig(ddef: DefDef, sym: Symbol)(using Context): Type = {
+  def defDefSig(ddef: DefDef, sym: Symbol, completer: Namer#Completer)(using Context): Type = {
     // Beware: ddef.name need not match sym.name if sym was freshened!
     val isConstructor = sym.name == nme.CONSTRUCTOR
 
@@ -1649,20 +1570,182 @@ class Namer { typer: Typer =>
     //   5. Info of CP is copied to DP and DP is completed.
     index(ddef.leadingTypeParams)
     if (isConstructor) sym.owner.typeParams.foreach(_.ensureCompleted())
-    for (tparam <- ddef.leadingTypeParams) typedAheadExpr(tparam)
-
+    val completedTypeParams =
+      for tparam <- ddef.leadingTypeParams yield typedAheadExpr(tparam).symbol
+    if completedTypeParams.forall(_.isType) then
+      completer.setCompletedTypeParams(completedTypeParams.asInstanceOf[List[TypeSymbol]])
     ddef.trailingParamss.foreach(completeParams)
     val paramSymss = normalizeIfConstructor(ddef.paramss.nestedMap(symbolOfTree), isConstructor)
     sym.setParamss(paramSymss)
-    def wrapMethType(restpe: Type): Type = {
+    def wrapMethType(restpe: Type): Type =
       instantiateDependent(restpe, paramSymss)
-      methodType(paramSymss, restpe, isJava = ddef.mods.is(JavaDefined))
-    }
-    if (isConstructor) {
+      methodType(paramSymss, restpe, ddef.mods.is(JavaDefined))
+    if isConstructor then
       // set result type tree to unit, but take the current class as result type of the symbol
       typedAheadType(ddef.tpt, defn.UnitType)
-      wrapMethType(effectiveResultType(sym, paramSymss, NoType))
-    }
-    else valOrDefDefSig(ddef, sym, paramSymss, wrapMethType)
+      wrapMethType(effectiveResultType(sym, paramSymss))
+    else
+      valOrDefDefSig(ddef, sym, paramSymss, wrapMethType)
   }
+
+  def inferredResultType(
+      mdef: ValOrDefDef,
+      sym: Symbol,
+      paramss: List[List[Symbol]],
+      paramFn: Type => Type,
+      fallbackProto: Type
+    )(using Context): Type =
+
+    /** A type for this definition that might be inherited from elsewhere:
+     *  If this is a setter parameter, the corresponding getter type.
+     *  If this is a class member, the conjunction of all result types
+     *  of overridden methods.
+     *  NoType if neither case holds.
+     */
+    val inherited =
+      if (sym.owner.isTerm) NoType
+      else
+        // TODO: Look only at member of supertype instead?
+        lazy val schema = paramFn(WildcardType)
+        val site = sym.owner.thisType
+        val bcs = sym.owner.info.baseClasses
+        if bcs.isEmpty then
+          assert(ctx.reporter.errorsReported)
+          NoType
+        else bcs.tail.foldLeft(NoType: Type) { (tp, cls) =>
+          def instantiatedResType(info: Type, paramss: List[List[Symbol]]): Type = info match
+            case info: PolyType =>
+              paramss match
+                case TypeSymbols(tparams) :: paramss1 if info.paramNames.length == tparams.length =>
+                  instantiatedResType(info.instantiate(tparams.map(_.typeRef)), paramss1)
+                case _ =>
+                  NoType
+            case info: MethodType =>
+              paramss match
+                case TermSymbols(vparams) :: paramss1 if info.paramNames.length == vparams.length =>
+                  instantiatedResType(info.instantiate(vparams.map(_.termRef)), paramss1)
+                case _ =>
+                  NoType
+            case _ =>
+              if paramss.isEmpty then info.widenExpr
+              else NoType
+
+          val iRawInfo =
+            cls.info.nonPrivateDecl(sym.name).matchingDenotation(site, schema, sym.targetName).info
+          val iResType = instantiatedResType(iRawInfo, paramss).asSeenFrom(site, cls)
+          if (iResType.exists)
+            typr.println(i"using inherited type for ${mdef.name}; raw: $iRawInfo, inherited: $iResType")
+          tp & iResType
+        }
+    end inherited
+
+    /** If this is a default getter, the type of the corresponding method parameter,
+     *  otherwise NoType.
+     */
+    def defaultParamType = sym.name match
+      case DefaultGetterName(original, idx) =>
+        val meth: Denotation =
+          if (original.isConstructorName && (sym.owner.is(ModuleClass)))
+            sym.owner.companionClass.info.decl(nme.CONSTRUCTOR)
+          else
+            ctx.defContext(sym).denotNamed(original)
+        def paramProto(paramss: List[List[Type]], idx: Int): Type = paramss match {
+          case params :: paramss1 =>
+            if (idx < params.length) params(idx)
+            else paramProto(paramss1, idx - params.length)
+          case nil =>
+            NoType
+        }
+        val defaultAlts = meth.altsWith(_.hasDefaultParams)
+        if (defaultAlts.length == 1)
+          paramProto(defaultAlts.head.info.widen.paramInfoss, idx)
+        else
+          NoType
+      case _ =>
+        NoType
+
+    /** The expected type for a default argument. This is normally the `defaultParamType`
+     *  with references to internal parameters replaced by wildcards. This replacement
+     *  makes it possible that the default argument can have a more specific type than the
+     *  parameter. For instance, we allow
+     *
+     *      class C[A](a: A) { def copy[B](x: B = a): C[B] = C(x) }
+     *
+     *  However, if the default parameter type is a context function type, we
+     *  have to make sure that wildcard types do not leak into the implicitly
+     *  generated closure's result type. Test case is pos/i12019.scala. If there
+     *  would be a leakage with the wildcard approximation, we pick the original
+     *  default parameter type as expected type.
+     */
+    def expectedDefaultArgType =
+      val originalTp = defaultParamType
+      val approxTp = wildApprox(originalTp)
+      approxTp.stripPoly match
+        case atp @ defn.ContextFunctionType(_, resType, _)
+        if !defn.isNonRefinedFunction(atp) // in this case `resType` is lying, gives us only the non-dependent upper bound
+            || resType.existsPart(_.isInstanceOf[WildcardType], StopAt.Static, forceLazy = false) =>
+          originalTp
+        case _ =>
+          approxTp
+
+    // println(s"final inherited for $sym: ${inherited.toString}") !!!
+    // println(s"owner = ${sym.owner}, decls = ${sym.owner.info.decls.show}")
+    // TODO Scala 3.1: only check for inline vals (no final ones)
+    def isInlineVal = sym.isOneOf(FinalOrInline, butNot = Method | Mutable)
+
+    var rhsCtx = ctx.fresh.addMode(Mode.InferringReturnType)
+    if sym.isInlineMethod then rhsCtx = rhsCtx.addMode(Mode.InlineableBody)
+    if sym.is(ExtensionMethod) then rhsCtx = rhsCtx.addMode(Mode.InExtensionMethod)
+    val typeParams = paramss.collect { case TypeSymbols(tparams) => tparams }.flatten
+    if (typeParams.nonEmpty) {
+      // we'll be typing an expression from a polymorphic definition's body,
+      // so we must allow constraining its type parameters
+      // compare with typedDefDef, see tests/pos/gadt-inference.scala
+      rhsCtx.setFreshGADTBounds
+      rhsCtx.gadt.addToConstraint(typeParams)
+    }
+
+    def typedAheadRhs(pt: Type) =
+      PrepareInlineable.dropInlineIfError(sym,
+        typedAheadExpr(mdef.rhs, pt)(using rhsCtx))
+
+    def rhsType =
+      // For default getters, we use the corresponding parameter type as an
+      // expected type but we run it through `wildApprox` to allow default
+      // parameters like in `def mkList[T](value: T = 1): List[T]`.
+      val defaultTp = defaultParamType
+      val pt = inherited.orElse(expectedDefaultArgType).orElse(fallbackProto).widenExpr
+      val tp = typedAheadRhs(pt).tpe
+      if (defaultTp eq pt) && (tp frozen_<:< defaultTp) then
+        // When possible, widen to the default getter parameter type to permit a
+        // larger choice of overrides (see `default-getter.scala`).
+        // For justification on the use of `@uncheckedVariance`, see
+        // `default-getter-variance.scala`.
+        AnnotatedType(defaultTp, Annotation(defn.UncheckedVarianceAnnot))
+      else
+        // don't strip @uncheckedVariance annot for default getters
+        TypeOps.simplify(tp.widenTermRefExpr,
+            if defaultTp.exists then TypeOps.SimplifyKeepUnchecked() else null) match
+          case ctp: ConstantType if isInlineVal => ctp
+          case tp => TypeComparer.widenInferred(tp, pt)
+
+    // Replace aliases to Unit by Unit itself. If we leave the alias in
+    // it would be erased to BoxedUnit.
+    def dealiasIfUnit(tp: Type) = if (tp.isRef(defn.UnitClass)) defn.UnitType else tp
+
+    def cookedRhsType = dealiasIfUnit(rhsType).deskolemized
+    def lhsType = fullyDefinedType(cookedRhsType, "right-hand side", mdef.span)
+    //if (sym.name.toString == "y") println(i"rhs = $rhsType, cooked = $cookedRhsType")
+    if (inherited.exists)
+      if (isInlineVal) lhsType else inherited
+    else {
+      if (sym.is(Implicit))
+        mdef match {
+          case _: DefDef => missingType(sym, "result ")
+          case _: ValDef if sym.owner.isType => missingType(sym, "")
+          case _ =>
+        }
+      lhsType orElse WildcardType
+    }
+  end inferredResultType
 }
diff --git a/compiler/src/dotty/tools/dotc/typer/PrepareInlineable.scala b/compiler/src/dotty/tools/dotc/typer/PrepareInlineable.scala
index 5b52fa883403..8fea810921e4 100644
--- a/compiler/src/dotty/tools/dotc/typer/PrepareInlineable.scala
+++ b/compiler/src/dotty/tools/dotc/typer/PrepareInlineable.scala
@@ -26,6 +26,19 @@ import dotty.tools.dotc.transform.TreeMapWithStages._
 object PrepareInlineable {
   import tpd._
 
+  private val InlineAccessorsKey = new Property.Key[InlineAccessors]
+
+  def initContext(ctx: Context): Context =
+    ctx.fresh.setProperty(InlineAccessorsKey, new InlineAccessors)
+
+  def makeInlineable(tree: Tree)(using Context): Tree =
+    ctx.property(InlineAccessorsKey).get.makeInlineable(tree)
+
+  def addAccessorDefs(cls: Symbol, body: List[Tree])(using Context): List[Tree] =
+    ctx.property(InlineAccessorsKey) match
+      case Some(inlineAccessors) => inlineAccessors.addAccessorDefs(cls, body)
+      case _ => body
+
   class InlineAccessors extends AccessProxies {
 
     /** If an inline accessor name wraps a unique inline name, this is taken as indication
@@ -80,7 +93,7 @@ object PrepareInlineable {
       def preTransform(tree: Tree)(using Context): Tree = tree match {
         case tree: RefTree if needsAccessor(tree.symbol) =>
           if (tree.symbol.isConstructor) {
-            report.error("Implementation restriction: cannot use private constructors in inlineinline methods", tree.srcPos)
+            report.error("Implementation restriction: cannot use private constructors in inline methods", tree.srcPos)
             tree // TODO: create a proper accessor for the private constructor
           }
           else useAccessor(tree)
@@ -251,7 +264,7 @@ object PrepareInlineable {
             if inlined.isInlineMethod then
               inlinedBody = dropInlineIfError(inlined,
                 checkInlineMethod(inlined,
-                  ctx.compilationUnit.inlineAccessors.makeInlineable(inlinedBody)))
+                  PrepareInlineable.makeInlineable(inlinedBody)))
             inlining.println(i"Body to inline for $inlined: $inlinedBody")
             inlinedBody
           })
@@ -259,8 +272,6 @@ object PrepareInlineable {
     }
 
   private def checkInlineMethod(inlined: Symbol, body: Tree)(using Context): body.type = {
-    if (inlined.owner.isClass && inlined.owner.seesOpaques)
-      report.error(em"Implementation restriction: No inline methods allowed where opaque type aliases are in scope", inlined.srcPos)
     if Inliner.inInlineMethod(using ctx.outer) then
       report.error(ex"Implementation restriction: nested inline methods are not supported", inlined.srcPos)
 
diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
index 0d2c60c677b0..fcbcf179d97e 100644
--- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
+++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
@@ -8,7 +8,7 @@ import Contexts._, Types._, Denotations._, Names._, StdNames._, NameOps._, Symbo
 import NameKinds.DepParamName
 import Trees._
 import Constants._
-import util.{Stats, SimpleIdentityMap}
+import util.{Stats, SimpleIdentityMap, SimpleIdentitySet}
 import Decorators._
 import Uniques._
 import config.Printers.typr
@@ -64,19 +64,8 @@ object ProtoTypes {
                 i"""normalizedCompatible for $poly, $pt = $result
                    |constraint was: ${ctx.typerState.constraint}
                    |constraint now: ${newctx.typerState.constraint}""")
-            if result
-                && (ctx.typerState.constraint ne newctx.typerState.constraint)
-                && {
-                  val existingVars = ctx.typerState.uninstVars.toSet
-                  newctx.typerState.uninstVars.forall(existingVars.contains)
-                }
-            then newctx.typerState.commit()
-              // If the new constrait contains fresh type variables we cannot keep it,
-              // since those type variables are not instantiated anywhere in the source.
-              // See pos/i6682a.scala for a test case. See pos/11243.scala and pos/i5773b.scala
-              // for tests where it matters that we keep the constraint otherwise.
-              // TODO: A better solution would clean the new constraint, so that it "avoids"
-              // the problematic type variables. But we have not implemented such an algorithm yet.
+            if result && (ctx.typerState.constraint ne newctx.typerState.constraint) then
+              newctx.typerState.commit()
             result
           case _ => testCompat
       else explore(testCompat)
@@ -293,6 +282,9 @@ object ProtoTypes {
     /** A map in which typed arguments can be stored to be later integrated in `typedArgs`. */
     var typedArg: SimpleIdentityMap[untpd.Tree, Tree] = SimpleIdentityMap.empty
 
+    /** The argument that produced errors during typing */
+    var errorArgs: SimpleIdentitySet[untpd.Tree] = SimpleIdentitySet.empty
+
     /** The tupled or untupled version of this prototype, if it has been computed */
     var tupledDual: Type = NoType
 
@@ -352,6 +344,30 @@ object ProtoTypes {
       case _ => false
     }
 
+    /** Did an argument produce an error when typing? This means: an error was reported
+     *  and a tree got an error type. Errors of adaptation whree a tree has a good type
+     *  but that type does not conform to the expected type are not counted.
+     */
+    def hasErrorArg = !state.errorArgs.isEmpty
+
+    /** Does tree have embedded error trees that are not at the outside.
+     *  A nested tree t1 is "at the outside" relative to a tree t2 if
+     *    - t1 and t2 have the same span, or
+     *    - t2 is a ascription (t22: T) and t1 is at the outside of t22
+     *    - t2 is a closure (...) => t22 and t1 is at the outside of t22
+     */
+    def hasInnerErrors(t: Tree): Boolean = t match
+      case Typed(expr, tpe) => hasInnerErrors(expr)
+      case closureDef(mdef) => hasInnerErrors(mdef.rhs)
+      case _ =>
+        t.existsSubTree { t1 =>
+          if t1.typeOpt.isError && t1.span.toSynthetic != t.span.toSynthetic then
+            typr.println(i"error subtree $t1 of $t with ${t1.typeOpt}, spans = ${t1.span}, ${t.span}")
+            true
+          else
+            false
+        }
+
     private def cacheTypedArg(arg: untpd.Tree, typerFn: untpd.Tree => Tree, force: Boolean)(using Context): Tree = {
       var targ = state.typedArg(arg)
       if (targ == null)
@@ -368,8 +384,12 @@ object ProtoTypes {
             targ = arg.withType(WildcardType)
           case _ =>
             targ = typerFn(arg)
-            if (!ctx.reporter.hasUnreportedErrors)
+            if ctx.reporter.hasUnreportedErrors then
+              if hasInnerErrors(targ) then
+                state.errorArgs += arg
+            else
               state.typedArg = state.typedArg.updated(arg, targ)
+              state.errorArgs -= arg
         }
       targ
     }
@@ -385,21 +405,49 @@ object ProtoTypes {
      *                before it is typed. The second Int parameter is the parameter index.
      */
     def typedArgs(norm: (untpd.Tree, Int) => untpd.Tree = sameTree)(using Context): List[Tree] =
-      if (state.typedArgs.size == args.length) state.typedArgs
-      else {
-        val prevConstraint = protoCtx.typerState.constraint
-
-        try
-          inContext(protoCtx) {
-            val args1 = args.mapWithIndexConserve((arg, idx) =>
-              cacheTypedArg(arg, arg => typer.typed(norm(arg, idx)), force = false))
-            if !args1.exists(arg => isUndefined(arg.tpe)) then state.typedArgs = args1
-            args1
-          }
-        finally
-          if (protoCtx.typerState.constraint ne prevConstraint)
-            ctx.typerState.mergeConstraintWith(protoCtx.typerState)
-      }
+      if state.typedArgs.size == args.length then state.typedArgs
+      else
+        val passedCtx = ctx
+        val passedTyperState = ctx.typerState
+        inContext(protoCtx.withUncommittedTyperState) {
+          val protoTyperState = ctx.typerState
+          val oldConstraint = protoTyperState.constraint
+          val args1 = args.mapWithIndexConserve((arg, idx) =>
+            cacheTypedArg(arg, arg => typer.typed(norm(arg, idx)), force = false))
+          val newConstraint = protoTyperState.constraint
+
+          if !args1.exists(arg => isUndefined(arg.tpe)) then state.typedArgs = args1
+
+          // We only need to propagate constraints if we typed the arguments in a different
+          // TyperState and if that created additional constraints.
+          if (passedTyperState ne protoTyperState) && (oldConstraint ne newConstraint) then
+            // To respect the pre-condition of `mergeConstraintWith` and keep
+            // `protoTyperState` committable we must ensure that it does not
+            // contain any type variable which don't already exist in the passed
+            // TyperState. This is achieved by instantiating any such type
+            // variable. NOTE: this does not suffice to discard type variables
+            // in ancestors of `protoTyperState`, if this situation ever
+            // comes up, an assertion in TyperState will trigger and this code
+            // will need to be generalized.
+            if protoTyperState.isCommittable then
+              val passedConstraint = passedTyperState.constraint
+              val newLambdas = newConstraint.domainLambdas.filter(tl =>
+                !passedConstraint.contains(tl) || passedConstraint.hasConflictingTypeVarsFor(tl, newConstraint))
+              val newTvars = newLambdas.flatMap(_.paramRefs).map(newConstraint.typeVarOfParam)
+
+              args1.foreach(arg => Inferencing.instantiateSelected(arg.tpe, newTvars))
+
+              // `instantiateSelected` can leave some type variables uninstantiated,
+              // so we maximize them in a second pass.
+              newTvars.foreach {
+                case tvar: TypeVar if !tvar.isInstantiated =>
+                  tvar.instantiate(fromBelow = false)
+                case _ =>
+              }
+            passedTyperState.mergeConstraintWith(protoTyperState)(using passedCtx)
+          end if
+          args1
+        }
 
     /** Type single argument and remember the unadapted result in `myTypedArg`.
      *  used to avoid repeated typings of trees when backtracking.
@@ -424,6 +472,10 @@ object ProtoTypes {
       if (t == null) NoType else t.tpe
     }
 
+    /** Cache the typed argument */
+    def cacheArg(arg: untpd.Tree, targ: Tree) =
+      state.typedArg = state.typedArg.updated(arg, targ)
+
     /** The same proto-type but with all arguments combined in a single tuple */
     def tupledDual: FunProto = state.tupledDual match {
       case pt: FunProto =>
@@ -561,7 +613,7 @@ object ProtoTypes {
     override def isMatchedBy(tp: Type, keepConstraint: Boolean)(using Context): Boolean =
       canInstantiate(tp) || tp.member(nme.apply).hasAltWith(d => canInstantiate(d.info))
 
-    def derivedPolyProto(targs: List[Tree], resultType: Type): PolyProto =
+    def derivedPolyProto(targs: List[Tree], resType: Type): PolyProto =
       if ((targs eq this.targs) && (resType eq this.resType)) this
       else PolyProto(targs, resType)
 
@@ -607,7 +659,11 @@ object ProtoTypes {
    *  for each parameter.
    *  @return  The added type lambda, and the list of created type variables.
    */
-  def constrained(tl: TypeLambda, owningTree: untpd.Tree, alwaysAddTypeVars: Boolean)(using Context): (TypeLambda, List[TypeTree]) = {
+  def constrained(using Context)(
+    tl: TypeLambda, owningTree: untpd.Tree,
+    alwaysAddTypeVars: Boolean,
+    nestingLevel: Int = ctx.nestingLevel
+  ): (TypeLambda, List[TypeTree]) = {
     val state = ctx.typerState
     val addTypeVars = alwaysAddTypeVars || !owningTree.isEmpty
     if (tl.isInstanceOf[PolyType])
@@ -618,8 +674,8 @@ object ProtoTypes {
     def newTypeVars(tl: TypeLambda): List[TypeTree] =
       for (paramRef <- tl.paramRefs)
       yield {
-        val tt = TypeVarBinder().withSpan(owningTree.span)
-        val tvar = TypeVar(paramRef, state)
+        val tt = InferredTypeTree().withSpan(owningTree.span)
+        val tvar = TypeVar(paramRef, state, nestingLevel)
         state.ownedVars += tvar
         tt.withType(tvar)
       }
@@ -638,34 +694,66 @@ object ProtoTypes {
   def constrained(tl: TypeLambda)(using Context): TypeLambda =
     constrained(tl, EmptyTree)._1
 
-  def newTypeVar(bounds: TypeBounds)(using Context): TypeVar = {
-    val poly = PolyType(DepParamName.fresh().toTypeName :: Nil)(
+  /** Instantiate `tl` with fresh type variables added to the constraint. */
+  def instantiateWithTypeVars(tl: TypeLambda)(using Context): Type =
+    val targs = constrained(tl, ast.tpd.EmptyTree, alwaysAddTypeVars = true)._2
+    tl.instantiate(targs.tpes)
+
+  /** A fresh type variable added to the current constraint.
+   *  @param  bounds        The initial bounds of the variable
+   *  @param  name          The name of the variable, defaults a fresh `DepParamName`
+   *  @param  nestingLevel  See `TypeVar#nestingLevel`
+   *  @param  represents    If it exists, a ParamRef that this TypeVar represents,
+   *                        to be retrieved using `representedParamRef`.
+   *                        in the substitution generated by `resultTypeApprox`
+   *  If `represents` exists, it is stored in the result type of the PolyType
+   *  that backs the TypeVar, to be retrieved by `representedParamRef`.
+   */
+  def newTypeVar(using Context)(
+      bounds: TypeBounds, name: TypeName = DepParamName.fresh().toTypeName,
+      nestingLevel: Int = ctx.nestingLevel, represents: Type = NoType): TypeVar =
+    val poly = PolyType(name :: Nil)(
         pt => bounds :: Nil,
-        pt => defn.AnyType)
-    constrained(poly, untpd.EmptyTree, alwaysAddTypeVars = true)
+        pt => represents.orElse(defn.AnyType))
+    constrained(poly, untpd.EmptyTree, alwaysAddTypeVars = true, nestingLevel)
       ._2.head.tpe.asInstanceOf[TypeVar]
-  }
 
-  /** Create a new TypeVar that represents a dependent method parameter singleton */
-  def newDepTypeVar(tp: Type)(using Context): TypeVar =
-    newTypeVar(TypeBounds.upper(AndType(tp.widenExpr, defn.SingletonClass.typeRef)))
+  /** If `param` was created using `newTypeVar(..., represents = X)`, returns X.
+   *  This is used in:
+   *  - `Inferencing#constrainIfDependentParamRef` to retrieve the dependent function
+   *    parameter for which the variable was substituted.
+   *  - `ConstraintHandling#LevelAvoidMap#legalVar` to retrieve the type variable that was
+   *    avoided in a previous call to `legalVar`.
+   */
+  def representedParamRef(param: TypeParamRef)(using Context): Type =
+    param.binder.resultType match
+      case ref: ParamRef => ref
+      case _ => NoType
+
+  /** Create a new TypeVar that represents a dependent method parameter singleton `ref` */
+  def newDepTypeVar(ref: TermParamRef)(using Context): TypeVar =
+    newTypeVar(
+      TypeBounds.upper(AndType(ref.underlying.widenExpr, defn.SingletonClass.typeRef)),
+      represents = ref)
 
   /** The result type of `mt`, where all references to parameters of `mt` are
    *  replaced by either wildcards or TypeParamRefs.
    */
   def resultTypeApprox(mt: MethodType, wildcardOnly: Boolean = false)(using Context): Type =
     if mt.isResultDependent then
-      def replacement(tp: Type) =
+      def replacement(ref: TermParamRef) =
         if wildcardOnly
            || ctx.mode.is(Mode.TypevarsMissContext)
-           || !tp.widenExpr.isValueTypeOrWildcard
-        then WildcardType
-        else newDepTypeVar(tp)
-      mt.resultType.substParams(mt, mt.paramInfos.map(replacement))
+           || !ref.underlying.widenExpr.isValueTypeOrWildcard
+        then
+          WildcardType(ref.underlying.substParams(mt, mt.paramRefs.map(_ => WildcardType)).toBounds)
+        else
+          newDepTypeVar(ref)
+      mt.resultType.substParams(mt, mt.paramRefs.map(replacement))
     else mt.resultType
 
   /** The normalized form of a type
-   *   - unwraps polymorphic types, tracking their parameters in the current constraint
+   *   - instantiate polymorphic types with fresh type variables in the current constraint
    *   - skips implicit parameters of methods and functions;
    *     if result type depends on implicit parameter, replace with wildcard.
    *   - converts non-dependent method types to the corresponding function types
@@ -684,7 +772,7 @@ object ProtoTypes {
     Stats.record("normalize")
     tp.widenSingleton match {
       case poly: PolyType =>
-        normalize(constrained(poly).resultType, pt)
+        normalize(instantiateWithTypeVars(poly), pt)
       case mt: MethodType =>
         if (mt.isImplicitMethod) normalize(resultTypeApprox(mt, wildcardOnly = true), pt)
         else if (mt.isResultDependent) tp
@@ -783,6 +871,17 @@ object ProtoTypes {
       tp.derivedViewProto(
           wildApprox(tp.argType, theMap, seen, internal),
           wildApprox(tp.resultType, theMap, seen, internal))
+    case tp: FunProto =>
+      val args = tp.args.mapconserve(arg =>
+        val argTp = tp.typeOfArg(arg) match
+          case NoType => WildcardType
+          case tp => wildApprox(tp, theMap, seen, internal)
+        arg.withType(argTp))
+      val resTp = wildApprox(tp.resultType, theMap, seen, internal)
+      if (args eq tp.args) && (resTp eq tp.resultType) then
+        tp
+      else
+        FunProtoTyped(args, resTp)(ctx.typer, tp.applyKind)
     case tp: IgnoredProto =>
       WildcardType
     case  _: ThisType | _: BoundType => // default case, inlined for speed
diff --git a/compiler/src/dotty/tools/dotc/typer/QuotesAndSplices.scala b/compiler/src/dotty/tools/dotc/typer/QuotesAndSplices.scala
index 18c08bb8a3ad..86cd7e5f24f3 100644
--- a/compiler/src/dotty/tools/dotc/typer/QuotesAndSplices.scala
+++ b/compiler/src/dotty/tools/dotc/typer/QuotesAndSplices.scala
@@ -56,19 +56,24 @@ trait QuotesAndSplices {
     else if !qctx.tpe.isStable then
       report.error(em"Quotes require stable Quotes, but found non stable $qctx", qctx.srcPos)
 
-    val tree1 =
-      if ctx.mode.is(Mode.Pattern) then
-        typedQuotePattern(tree, pt, qctx)
-      else if tree.quoted.isType then
-        val msg = em"Consider using canonical type constructor scala.quoted.Type.of[${tree.quoted}] instead"
-        if sourceVersion.isAtLeast(`future-migration`) then report.error(msg, tree.srcPos)
-        else report.warning(msg, tree.srcPos)
-        typedTypeApply(untpd.TypeApply(untpd.ref(defn.QuotedTypeModule_of.termRef), tree.quoted :: Nil), pt)(using quoteContext).select(nme.apply).appliedTo(qctx)
-      else
-        typedApply(untpd.Apply(untpd.ref(defn.QuotedRuntime_exprQuote.termRef), tree.quoted), pt)(using pushQuotes(qctx)).select(nme.apply).appliedTo(qctx)
-    tree1.withSpan(tree.span)
+    if ctx.mode.is(Mode.Pattern) then
+      typedQuotePattern(tree, pt, qctx).withSpan(tree.span)
+    else if tree.quoted.isType then
+      val msg = em"Consider using canonical type constructor scala.quoted.Type.of[${tree.quoted}] instead"
+      if sourceVersion.isAtLeast(`future-migration`) then report.error(msg, tree.srcPos)
+      else report.warning(msg, tree.srcPos)
+      val typeOfTree = untpd.TypeApply(untpd.ref(defn.QuotedTypeModule_of.termRef), tree.quoted :: Nil).withSpan(tree.span)
+      makeInlineable(typedTypeApply(typeOfTree, pt)(using quoteContext).select(nme.apply).appliedTo(qctx).withSpan(tree.span))
+    else
+      val exprQuoteTree = untpd.Apply(untpd.ref(defn.QuotedRuntime_exprQuote.termRef), tree.quoted)
+      makeInlineable(typedApply(exprQuoteTree, pt)(using pushQuotes(qctx)).select(nme.apply).appliedTo(qctx).withSpan(tree.span))
   }
 
+  private def makeInlineable(tree: Tree)(using Context): Tree =
+    inContext(ctx.withOwner(ctx.owner.skipLocalOwners)) {
+      PrepareInlineable.makeInlineable(tree)
+    }
+
   /** Translate `${ t: Expr[T] }` into expression `t.splice` while tracking the quotation level in the context */
   def typedSplice(tree: untpd.Splice, pt: Type)(using Context): Tree = {
     record("typedSplice")
@@ -159,7 +164,7 @@ trait QuotesAndSplices {
 
     if ctx.mode.is(Mode.QuotedPattern) && level == 1 then
       report.error(
-            """`$` for quote pattern varable is not supported anymore.
+            """`$` for quote pattern variable is not supported anymore.
                |Use lower cased variable name without the `$` instead.""".stripMargin,
             tree.srcPos)
       ref(defn.NothingType)
@@ -323,7 +328,7 @@ trait QuotesAndSplices {
           tdef.symbol.addAnnotation(Annotation(New(ref(defn.QuotedRuntimePatterns_fromAboveAnnot.typeRef)).withSpan(tdef.span)))
         val bindingType = getBinding(tdef.symbol).symbol.typeRef
         val bindingTypeTpe = AppliedType(defn.QuotedTypeClass.typeRef, bindingType :: Nil)
-        val sym = newPatternBoundSymbol(nameOfSyntheticGiven, bindingTypeTpe, tdef.span, flags = ImplicitTerm)(using ctx0)
+        val sym = newPatternBoundSymbol(nameOfSyntheticGiven, bindingTypeTpe, tdef.span, flags = ImplicitVal)(using ctx0)
         buff += Bind(sym, untpd.Ident(nme.WILDCARD).withType(bindingTypeTpe)).withSpan(tdef.span)
         super.transform(tdef)
       }
diff --git a/compiler/src/dotty/tools/dotc/typer/ReTyper.scala b/compiler/src/dotty/tools/dotc/typer/ReTyper.scala
index a744ca39f41f..85be8c32227a 100644
--- a/compiler/src/dotty/tools/dotc/typer/ReTyper.scala
+++ b/compiler/src/dotty/tools/dotc/typer/ReTyper.scala
@@ -22,7 +22,7 @@ import Nullables._
  *
  *  Otherwise, everything is as in Typer.
  */
-class ReTyper extends Typer with ReChecking {
+class ReTyper(nestingLevel: Int = 0) extends Typer(nestingLevel) with ReChecking {
   import tpd._
 
   private def assertTyped(tree: untpd.Tree)(using Context): Unit =
@@ -114,6 +114,9 @@ class ReTyper extends Typer with ReChecking {
       super.handleUnexpectedFunType(tree, fun)
   }
 
+  override def addCanThrowCapabilities(expr: untpd.Tree, cases: List[CaseDef])(using Context): untpd.Tree =
+    expr
+
   override def typedUnadapted(tree: untpd.Tree, pt: Type, locked: TypeVars)(using Context): Tree =
     try super.typedUnadapted(tree, pt, locked)
     catch {
@@ -134,4 +137,5 @@ class ReTyper extends Typer with ReChecking {
   override protected def addAccessorDefs(cls: Symbol, body: List[Tree])(using Context): List[Tree] = body
   override protected def checkEqualityEvidence(tree: tpd.Tree, pt: Type)(using Context): Unit = ()
   override protected def matchingApply(methType: MethodOrPoly, pt: FunProto)(using Context): Boolean = true
+  override protected def typedScala2MacroBody(call: untpd.Tree)(using Context): Tree = promote(call)
 }
diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
index 7d9e25c33b2d..834cfba2a8a0 100644
--- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
+++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala
@@ -4,19 +4,18 @@ package typer
 
 import transform._
 import core._
-import Symbols._, Types._, Contexts._, Flags._, Names._, NameOps._
+import Symbols._, Types._, Contexts._, Flags._, Names._, NameOps._, NameKinds._
 import StdNames._, Denotations._, SymUtils._, Phases._, SymDenotations._
 import NameKinds.DefaultGetterName
 import Annotations._
 import util.Spans._
-import util.{Store, SrcPos}
+import util.SrcPos
 import scala.collection.{ mutable, immutable }
 import ast._
 import MegaPhase._
 import config.Printers.{checks, noPrinter}
-import scala.util.{Try, Failure, Success}
-import config.{ScalaVersion, NoScalaVersion}
 import Decorators._
+import OverridingPairs.isOverridingPair
 import typer.ErrorReporting._
 import config.Feature.{warnOnMigration, migrateTo3}
 import config.Printers.refcheck
@@ -29,6 +28,7 @@ object RefChecks {
   import tpd._
 
   val name: String = "refchecks"
+  val description: String = "checks related to abstract members and overriding"
 
   private val defaultMethodFilter = new NameFilter {
     def apply(pre: Type, name: Name)(using Context): Boolean = name.is(DefaultGetterName)
@@ -96,7 +96,7 @@ object RefChecks {
 
   /** Check that self type of this class conforms to self types of parents
    *  and required classes. Also check that only `enum` constructs extend
-   *  `java.lang.Enum`.
+   *  `java.lang.Enum` and no user-written class extends ContextFunctionN.
    */
   private def checkParents(cls: Symbol, parentTrees: List[Tree])(using Context): Unit = cls.info match {
     case cinfo: ClassInfo =>
@@ -132,6 +132,8 @@ object RefChecks {
             case _ =>
               false
           }
+      if psyms.exists(defn.isContextFunctionClass) then
+        report.error(CannotExtendContextFunction(cls), cls.sourcePos)
 
       /** Check that arguments passed to trait parameters conform to the parameter types
        *  in the current class. This is necessary since parameter types might be narrowed
@@ -188,6 +190,54 @@ object RefChecks {
 
   // Override checking ------------------------------------------------------------
 
+  /** A class for checking all overriding pairs of `class` with a given check function */
+  class OverridingPairsChecker(clazz: ClassSymbol, self: Type)(using Context) extends OverridingPairs.Cursor(clazz):
+
+    override def matches(sym1: Symbol, sym2: Symbol): Boolean =
+      isOverridingPair(sym1, sym2, self)
+
+    private def inLinearizationOrder(sym1: Symbol, sym2: Symbol, parent: Symbol): Boolean =
+      val owner1 = sym1.owner
+      val owner2 = sym2.owner
+      def precedesIn(bcs: List[ClassSymbol]): Boolean = (bcs: @unchecked) match
+        case bc :: bcs1 =>
+          if owner1 eq bc then true
+          else if owner2 eq bc then false
+          else precedesIn(bcs1)
+        case _ =>
+          false
+      precedesIn(parent.asClass.baseClasses)
+
+    // We can exclude pairs safely from checking only under two additional conditions
+    //   - their signatures also match in the parent class.
+    //     See neg/i12828.scala for an example where this matters.
+    //   - They overriding/overridden appear in linearization order.
+    //     See neg/i5094.scala for an example where this matters.
+    override def canBeHandledByParent(sym1: Symbol, sym2: Symbol, parent: Symbol): Boolean =
+      isOverridingPair(sym1, sym2, parent.thisType)
+        .showing(i"already handled ${sym1.showLocated}: ${sym1.asSeenFrom(parent.thisType).signature}, ${sym2.showLocated}: ${sym2.asSeenFrom(parent.thisType).signature} = $result", refcheck)
+      && inLinearizationOrder(sym1, sym2, parent)
+
+    def checkAll(checkOverride: (Symbol, Symbol) => Unit) =
+      while hasNext do
+        checkOverride(overriding, overridden)
+        next()
+
+      // The OverridingPairs cursor does assume that concrete overrides abstract
+      // We have to check separately for an abstract definition in a subclass that
+      // overrides a concrete definition in a superclass. E.g. the following (inspired
+      // from neg/i11130.scala) needs to be rejected as well:
+      //
+      //   class A { type T = B }
+      //   class B extends A { override type T }
+      for dcl <- clazz.info.decls.iterator do
+        if dcl.is(Deferred) then
+          for other <- dcl.allOverriddenSymbols do
+            if !other.is(Deferred) then
+              checkOverride(dcl, other)
+    end checkAll
+  end OverridingPairsChecker
+
   /** 1. Check all members of class `clazz` for overriding conditions.
    *  That is for overriding member M and overridden member O:
    *
@@ -210,6 +260,7 @@ object RefChecks {
    *    1.9. If M is erased, O is erased. If O is erased, M is erased or inline.
    *    1.10.  If O is inline (and deferred, otherwise O would be final), M must be inline
    *    1.11.  If O is a Scala-2 macro, M must be a Scala-2 macro.
+   *    1.12.  If O is non-experimental, M must be non-experimental.
    *  2. Check that only abstract classes have deferred members
    *  3. Check that concrete classes do not have deferred definitions
    *     that are not implemented in a subclass.
@@ -260,31 +311,6 @@ object RefChecks {
       i"${if (showLocation) sym1.showLocated else sym1}$infoStr"
     }
 
-    def compatibleTypes(member: Symbol, memberTp: Type, other: Symbol, otherTp: Type, fallBack: => Boolean = false): Boolean =
-      try
-        if (member.isType) // intersection of bounds to refined types must be nonempty
-          memberTp.bounds.hi.hasSameKindAs(otherTp.bounds.hi) &&
-          ((memberTp frozen_<:< otherTp) ||
-            !member.owner.derivesFrom(other.owner) && {
-              // if member and other come from independent classes or traits, their
-              // bounds must have non-empty-intersection
-              val jointBounds = (memberTp.bounds & otherTp.bounds).bounds
-              jointBounds.lo frozen_<:< jointBounds.hi
-            })
-        else
-          // releaxed override check for explicit nulls if one of the symbols is Java defined,
-          // force `Null` being a subtype of reference types during override checking
-          val relaxedCtxForNulls =
-            if ctx.explicitNulls && (member.is(JavaDefined) || other.is(JavaDefined)) then
-              ctx.retractMode(Mode.SafeNulls)
-            else ctx
-          member.name.is(DefaultGetterName) // default getters are not checked for compatibility
-          || memberTp.overrides(otherTp, member.matchNullaryLoosely || other.matchNullaryLoosely || fallBack)(using relaxedCtxForNulls)
-      catch case ex: MissingType =>
-        // can happen when called with upwardsSelf as qualifier of memberTp and otherTp,
-        // because in that case we might access types that are not members of the qualifier.
-        false
-
     /* Check that all conditions for overriding `other` by `member`
        * of class `clazz` are met.
        */
@@ -314,10 +340,23 @@ object RefChecks {
       }
 
       def compatTypes(memberTp: Type, otherTp: Type): Boolean =
-        compatibleTypes(member, memberTp, other, otherTp,
-          fallBack = warnOnMigration(
-            overrideErrorMsg("no longer has compatible type"),
-            (if (member.owner == clazz) member else clazz).srcPos))
+        try
+          isOverridingPair(member, memberTp, other, otherTp,
+            fallBack = warnOnMigration(
+              overrideErrorMsg("no longer has compatible type"),
+              (if (member.owner == clazz) member else clazz).srcPos))
+        catch case ex: MissingType =>
+          // can happen when called with upwardsSelf as qualifier of memberTp and otherTp,
+          // because in that case we might access types that are not members of the qualifier.
+          false
+
+      /** Do types of term members `member` and `other` as seen from `self` match?
+       *  If not we treat them as not a real override and don't issue override
+       *  error messages. Also, bridges are not generated in this case.
+       *  Type members are always assumed to match.
+       */
+      def trueMatch: Boolean =
+        member.isType || memberTp(self).matches(otherTp(self))
 
       def emitOverrideError(fullmsg: Message) =
         if (!(hasErrors && member.is(Synthetic) && member.is(Module))) {
@@ -329,7 +368,7 @@ object RefChecks {
         }
 
       def overrideError(msg: String, compareTypes: Boolean = false) =
-        if (noErrorType)
+        if trueMatch && noErrorType then
           emitOverrideError(overrideErrorMsg(msg, compareTypes))
 
       def autoOverride(sym: Symbol) =
@@ -356,24 +395,6 @@ object RefChecks {
 
       //Console.println(infoString(member) + " overrides " + infoString(other) + " in " + clazz);//DEBUG
 
-      // return if we already checked this combination elsewhere
-      if (member.owner != clazz) {
-        def deferredCheck = member.is(Deferred) || !other.is(Deferred)
-        def subOther(s: Symbol) = s derivesFrom other.owner
-        def subMember(s: Symbol) = s derivesFrom member.owner
-
-        if (subOther(member.owner) && deferredCheck)
-          //Console.println(infoString(member) + " shadows1 " + infoString(other) " in " + clazz);//DEBUG
-          return
-        val parentSymbols = clazz.info.parents.map(_.typeSymbol)
-        if (parentSymbols exists (p => subOther(p) && subMember(p) && deferredCheck))
-          //Console.println(infoString(member) + " shadows2 " + infoString(other) + " in " + clazz);//DEBUG
-          return
-        if (parentSymbols forall (p => subOther(p) == subMember(p)))
-          //Console.println(infoString(member) + " shadows " + infoString(other) + " in " + clazz);//DEBUG
-          return
-      }
-
       /* Is the intersection between given two lists of overridden symbols empty? */
       def intersectionIsEmpty(syms1: Iterator[Symbol], syms2: Iterator[Symbol]) = {
         val set2 = syms2.toSet
@@ -408,7 +429,7 @@ object RefChecks {
         overrideError("cannot be used here - class definitions cannot be overridden")
       else if (!other.is(Deferred) && member.isClass)
         overrideError("cannot be used here - classes can only override abstract types")
-      else if (other.isEffectivelyFinal) // (1.2)
+      else if other.isEffectivelyFinal then // (1.2)
         overrideError(i"cannot override final member ${other.showLocated}")
       else if (member.is(ExtensionMethod) && !other.is(ExtensionMethod)) // (1.3)
         overrideError("is an extension method, cannot override a normal method")
@@ -429,9 +450,11 @@ object RefChecks {
           member.setFlag(Override)
         else if (member.isType && self.memberInfo(member) =:= self.memberInfo(other))
           () // OK, don't complain about type aliases which are equal
-        else if (member.owner != clazz && other.owner != clazz &&
-                 !(other.owner derivesFrom member.owner))
-          emitOverrideError(
+        else if member.owner != clazz
+             && other.owner != clazz
+             && !other.owner.derivesFrom(member.owner)
+        then
+          overrideError(
             s"$clazz inherits conflicting members:\n  "
               + infoStringWithLocation(other) + "  and\n  " + infoStringWithLocation(member)
               + "\n(Note: this can be resolved by declaring an override in " + clazz + ".)")
@@ -441,8 +464,7 @@ object RefChecks {
           overrideError("needs `override` modifier")
       else if (other.is(AbsOverride) && other.isIncompleteIn(clazz) && !member.is(AbsOverride))
         overrideError("needs `abstract override` modifiers")
-      else if (member.is(Override) && other.is(Accessor) &&
-        other.accessedFieldOrGetter.is(Mutable, butNot = Lazy))
+      else if member.is(Override) && other.is(Accessor, butNot = Deferred) && other.accessedFieldOrGetter.is(Mutable, butNot = Lazy) then
         overrideError("cannot override a mutable variable")
       else if (member.isAnyOverride &&
         !(member.owner.thisType.baseClasses exists (_ isSubClass other.owner)) &&
@@ -475,6 +497,8 @@ object RefChecks {
           overrideError(i"needs to be declared with @targetName(${"\""}${other.targetName}${"\""}) so that external names match")
         else
           overrideError("cannot have a @targetName annotation since external names would be different")
+      else if !other.isExperimental && member.hasAnnotation(defn.ExperimentalAnnot) then // (1.12)
+        overrideError("may not override non-experimental member")
       else
         checkOverrideDeprecated()
     }
@@ -490,46 +514,7 @@ object RefChecks {
           }*/
     }
 
-    val opc = new OverridingPairs.Cursor(clazz):
-
-      /** We declare a match if either we have a full match including matching names
-       *  or we have a loose match with different target name but the types are the same.
-       *  This leaves two possible sorts of discrepancies to be reported as errors
-       *  in `checkOveride`:
-       *
-       *    - matching names, target names, and signatures but different types
-       *    - matching names and types, but different target names
-       */
-      override def matches(sym1: Symbol, sym2: Symbol): Boolean =
-        !(sym1.owner.is(JavaDefined, butNot = Trait) && sym2.owner.is(JavaDefined, butNot = Trait)) && // javac already handles these checks
-        (sym1.isType || {
-          val sd1 = sym1.asSeenFrom(clazz.thisType)
-          val sd2 = sym2.asSeenFrom(clazz.thisType)
-          sd1.matchesLoosely(sd2)
-          && (sym1.hasTargetName(sym2.targetName)
-             || compatibleTypes(sym1, sd1.info, sym2, sd2.info))
-        })
-    end opc
-
-    while opc.hasNext do
-      checkOverride(opc.overriding, opc.overridden)
-      opc.next()
-
-    // The OverridingPairs cursor does assume that concrete overrides abstract
-    // We have to check separately for an abstract definition in a subclass that
-    // overrides a concrete definition in a superclass. E.g. the following (inspired
-    // from neg/i11130.scala) needs to be rejected as well:
-    //
-    //   class A { type T = B }
-    //   class B extends A { override type T }
-    for
-      dcl <- clazz.info.decls.iterator
-      if dcl.is(Deferred)
-      other <- dcl.allOverriddenSymbols
-      if !other.is(Deferred)
-    do
-      checkOverride(dcl, other)
-
+    OverridingPairsChecker(clazz, self).checkAll(checkOverride)
     printMixinOverrideErrors()
 
     // Verifying a concrete class has nothing unimplemented.
@@ -572,7 +557,8 @@ object RefChecks {
         def isConcrete(sym: Symbol) = sym.exists && !sym.isOneOf(NotConcrete)
         clazz.nonPrivateMembersNamed(mbr.name)
           .filterWithPredicate(
-            impl => isConcrete(impl.symbol) && mbrDenot.matchesLoosely(impl))
+            impl => isConcrete(impl.symbol)
+              && mbrDenot.matchesLoosely(impl, alwaysCompareTypes = true))
           .exists
 
       /** The term symbols in this class and its baseclasses that are
@@ -605,7 +591,7 @@ object RefChecks {
           // Grouping missing methods by the declaring class
           val regrouped = missingMethods.groupBy(_.owner).toList
           def membersStrings(members: List[Symbol]) =
-            members.sortBy(_.name.toString).map(_.showDcl + " = ???")
+            members.sortBy(_.name.toString).map(_.asSeenFrom(clazz.thisType).showDcl + " = ???")
 
           if (regrouped.tail.isEmpty)
             membersStrings(regrouped.head._2)
@@ -915,84 +901,6 @@ object RefChecks {
       }
   }
 
-  // Note: if a symbol has both @deprecated and @migration annotations and both
-  // warnings are enabled, only the first one checked here will be emitted.
-  // I assume that's a consequence of some code trying to avoid noise by suppressing
-  // warnings after the first, but I think it'd be better if we didn't have to
-  // arbitrarily choose one as more important than the other.
-  private def checkUndesiredProperties(sym: Symbol, pos: SrcPos)(using Context): Unit =
-    checkDeprecated(sym, pos)
-
-    val xMigrationValue = ctx.settings.Xmigration.value
-    if xMigrationValue != NoScalaVersion then
-      checkMigration(sym, pos, xMigrationValue)
-
-
-  /** If @deprecated is present, and the point of reference is not enclosed
-   * in either a deprecated member or a scala bridge method, issue a warning.
-   */
-  private def checkDeprecated(sym: Symbol, pos: SrcPos)(using Context): Unit =
-
-    /** is the owner an enum or its companion and also the owner of sym */
-    def isEnumOwner(owner: Symbol)(using Context) =
-      // pre: sym is an enumcase
-      if owner.isEnumClass then owner.companionClass eq sym.owner
-      else if owner.is(ModuleClass) && owner.companionClass.isEnumClass then owner eq sym.owner
-      else false
-
-    def isDeprecatedOrEnum(owner: Symbol)(using Context) =
-      // pre: sym is an enumcase
-      owner.isDeprecated
-      || isEnumOwner(owner)
-
-    /**Scan the chain of outer declaring scopes from the current context
-     * a deprecation warning will be skipped if one the following holds
-     * for a given declaring scope:
-     * - the symbol associated with the scope is also deprecated.
-     * - if and only if `sym` is an enum case, the scope is either
-     *   a module that declares `sym`, or the companion class of the
-     *   module that declares `sym`.
-     */
-    def skipWarning(using Context) =
-      ctx.owner.ownersIterator.exists(if sym.isEnumCase then isDeprecatedOrEnum else _.isDeprecated)
-
-    for annot <- sym.getAnnotation(defn.DeprecatedAnnot) do
-      if !skipWarning then
-        val msg = annot.argumentConstant(0).map(": " + _.stringValue).getOrElse("")
-        val since = annot.argumentConstant(1).map(" since " + _.stringValue).getOrElse("")
-        report.deprecationWarning(s"${sym.showLocated} is deprecated${since}${msg}", pos)
-
-  /** If @migration is present (indicating that the symbol has changed semantics between versions),
-   *  emit a warning.
-   */
-  private def checkMigration(sym: Symbol, pos: SrcPos, xMigrationValue: ScalaVersion)(using Context): Unit =
-    for annot <- sym.getAnnotation(defn.MigrationAnnot) do
-      val migrationVersion = ScalaVersion.parse(annot.argumentConstant(1).get.stringValue)
-      migrationVersion match
-        case Success(symVersion) if xMigrationValue < symVersion =>
-          val msg = annot.argumentConstant(0).get.stringValue
-          report.warning(SymbolChangedSemanticsInVersion(sym, symVersion, msg), pos)
-        case Failure(ex) =>
-          report.warning(SymbolHasUnparsableVersionNumber(sym, ex.getMessage), pos)
-        case _ =>
-
-  /** Check that a deprecated val or def does not override a
-   *  concrete, non-deprecated method.  If it does, then
-   *  deprecation is meaningless.
-   */
-  private def checkDeprecatedOvers(tree: Tree)(using Context): Unit = {
-    val symbol = tree.symbol
-    if (symbol.isDeprecated) {
-      val concrOvers =
-        symbol.allOverriddenSymbols.filter(sym =>
-          !sym.isDeprecated && !sym.is(Deferred))
-      if (!concrOvers.isEmpty)
-        report.deprecationWarning(
-          symbol.toString + " overrides concrete, non-deprecated symbol(s):" +
-            concrOvers.map(_.name).mkString("    ", ", ", ""), tree.srcPos)
-    }
-  }
-
   /** Check that we do not "override" anything with a private method
    *  or something that becomes a private method. According to the Scala
    *  modeling this is non-sensical since private members don't override.
@@ -1005,7 +913,7 @@ object RefChecks {
    */
   def checkNoPrivateOverrides(tree: Tree)(using Context): Unit =
     val sym = tree.symbol
-    if sym.owner.isClass
+    if sym.maybeOwner.isClass
        && sym.is(Private)
        && (sym.isOneOf(MethodOrLazyOrMutable) || !sym.is(Local)) // in these cases we'll produce a getter later
        && !sym.isConstructor
@@ -1017,41 +925,52 @@ object RefChecks {
           report.error(i"private $sym cannot override ${other.showLocated}", sym.srcPos)
   end checkNoPrivateOverrides
 
-  type LevelAndIndex = immutable.Map[Symbol, (LevelInfo, Int)]
+  /** Check that unary method definition do not receive parameters.
+   *  They can only receive inferred parameters such as type parameters and implicit parameters.
+   */
+  def checkUnaryMethods(sym: Symbol)(using Context): Unit =
+    /** Check that the only term parameters are contextual or implicit */
+    def checkParameters(tpe: Type): Unit =
+      tpe match
+        case tpe: MethodType =>
+          if tpe.isImplicitMethod || tpe.isContextualMethod then
+            checkParameters(tpe.resType)
+          else
+            val what =
+              if tpe.paramNames.isEmpty then "empty parameter list.\n\nPossible fix: remove the `()` arguments."
+              else "parameters"
+            report.warning(s"unary_<op> method cannot take $what", sym.sourcePos)
+        case tpe: PolyType =>
+          checkParameters(tpe.resType)
+        case _ =>
+          // ok
 
-  class OptLevelInfo {
-    def levelAndIndex: LevelAndIndex = Map()
-    def enterReference(sym: Symbol, span: Span): Unit = ()
-  }
+    /** Skip leading type and contextual parameters, then skip the
+     *  self parameter, and finally check the parameter
+     */
+    def checkExtensionParameters(tpe: Type): Unit =
+      tpe match
+        case tpe: MethodType =>
+          assert(tpe.paramNames.length == 1)
+          if tpe.isContextualMethod then checkExtensionParameters(tpe.resType)
+          else checkParameters(tpe.resType)
+        case tpe: PolyType =>
+          checkExtensionParameters(tpe.resType)
+
+    def isUnaryPrefixName(name: Name) = name match
+      case name: SimpleName =>
+        name.startsWith("unary_") && nme.raw.isUnary(name.drop(6))
+      case _ =>
+        false
 
-  /** A class to help in forward reference checking */
-  class LevelInfo(outerLevelAndIndex: LevelAndIndex, stats: List[Tree])(using Context)
-  extends OptLevelInfo {
-    override val levelAndIndex: LevelAndIndex =
-      stats.foldLeft(outerLevelAndIndex, 0) {(mi, stat) =>
-        val (m, idx) = mi
-        val m1 = stat match {
-          case stat: MemberDef => m.updated(stat.symbol, (this, idx))
-          case _ => m
-        }
-        (m1, idx + 1)
-      }._1
-    var maxIndex: Int = Int.MinValue
-    var refSpan: Span = _
-    var refSym: Symbol = _
-
-    override def enterReference(sym: Symbol, span: Span): Unit =
-      if (sym.exists && sym.owner.isTerm)
-        levelAndIndex.get(sym) match {
-          case Some((level, idx)) if (level.maxIndex < idx) =>
-            level.maxIndex = idx
-            level.refSpan = span
-            level.refSym = sym
-          case _ =>
-        }
-  }
+    if isUnaryPrefixName(sym.name) then
+      if sym.is(Extension) || sym.name.is(ExtMethName) then
+        // if is method from `extension` or value class
+        checkExtensionParameters(sym.info)
+      else
+        checkParameters(sym.info)
 
-  val NoLevelInfo: RefChecks.OptLevelInfo = new OptLevelInfo()
+  end checkUnaryMethods
 
   /** Verify that references in the user-defined `@implicitNotFound` message are valid.
    *  (i.e. they refer to a type variable that really occurs in the signature of the annotated symbol.)
@@ -1173,44 +1092,28 @@ class RefChecks extends MiniPhase { thisPhase =>
 
   override def phaseName: String = RefChecks.name
 
-  // Needs to run after ElimRepeated for override checks involving varargs methods
-  override def runsAfter: Set[String] = Set(ElimRepeated.name)
-
-  private var LevelInfo: Store.Location[OptLevelInfo] = _
-  private def currentLevel(using Context): OptLevelInfo = ctx.store(LevelInfo)
-
-  override def initContext(ctx: FreshContext): Unit =
-    LevelInfo = ctx.addLocation(NoLevelInfo)
+  override def description: String = RefChecks.description
 
-  override def prepareForStats(trees: List[Tree])(using Context): Context =
-    if (ctx.owner.isTerm)
-      ctx.fresh.updateStore(LevelInfo, new LevelInfo(currentLevel.levelAndIndex, trees))
-    else ctx
+  override def runsAfter: Set[String] = Set(ElimRepeated.name)
+    // Needs to run after ElimRepeated for override checks involving varargs methods
 
   override def transformValDef(tree: ValDef)(using Context): ValDef = {
-    checkNoPrivateOverrides(tree)
-    checkDeprecatedOvers(tree)
-    val sym = tree.symbol
-    if (sym.exists && sym.owner.isTerm) {
-      tree.rhs match {
-        case Ident(nme.WILDCARD) => report.error(UnboundPlaceholderParameter(), sym.srcPos)
-        case _ =>
-      }
-      if (!sym.is(Lazy))
-        currentLevel.levelAndIndex.get(sym) match {
-          case Some((level, symIdx)) if symIdx <= level.maxIndex =>
-            report.error(ForwardReferenceExtendsOverDefinition(sym, level.refSym),
-              ctx.source.atSpan(level.refSpan))
+    if tree.symbol.exists then
+      checkNoPrivateOverrides(tree)
+      val sym = tree.symbol
+      if (sym.exists && sym.owner.isTerm) {
+        tree.rhs match {
+          case Ident(nme.WILDCARD) => report.error(UnboundPlaceholderParameter(), sym.srcPos)
           case _ =>
         }
-    }
+      }
     tree
   }
 
   override def transformDefDef(tree: DefDef)(using Context): DefDef = {
     checkNoPrivateOverrides(tree)
-    checkDeprecatedOvers(tree)
     checkImplicitNotFoundAnnotation.defDef(tree.symbol.denot)
+    checkUnaryMethods(tree.symbol)
     tree
   }
 
@@ -1229,43 +1132,6 @@ class RefChecks extends MiniPhase { thisPhase =>
       report.error(ex, tree.srcPos)
       tree
   }
-
-  override def transformIdent(tree: Ident)(using Context): Ident = {
-    checkUndesiredProperties(tree.symbol, tree.srcPos)
-    currentLevel.enterReference(tree.symbol, tree.span)
-    tree
-  }
-
-  override def transformSelect(tree: Select)(using Context): Select = {
-    checkUndesiredProperties(tree.symbol, tree.srcPos)
-    tree
-  }
-
-  override def transformApply(tree: Apply)(using Context): Apply = {
-    if (isSelfConstrCall(tree)) {
-      assert(currentLevel.isInstanceOf[LevelInfo], s"${ctx.owner}/" + i"$tree")
-      val level = currentLevel.asInstanceOf[LevelInfo]
-      if (level.maxIndex > 0) {
-        // An implementation restriction to avoid VerifyErrors and lazyvals mishaps; see SI-4717
-        report.debuglog("refsym = " + level.refSym)
-        report.error("forward reference not allowed from self constructor invocation",
-          ctx.source.atSpan(level.refSpan))
-      }
-    }
-    tree
-  }
-
-  override def transformNew(tree: New)(using Context): New = {
-    val tpe = tree.tpe
-    val sym = tpe.typeSymbol
-    checkUndesiredProperties(sym, tree.srcPos)
-    currentLevel.enterReference(sym, tree.span)
-    tpe.dealias.foreachPart {
-      case TermRef(_, s: Symbol) => currentLevel.enterReference(s, tree.span)
-      case _ =>
-    }
-    tree
-  }
 }
 
 /* todo: rewrite and re-enable
diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
index 0406c98d790b..fe4feecd6100 100644
--- a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
@@ -39,9 +39,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
               if defn.SpecialClassTagClasses.contains(sym) then
                 classTag.select(sym.name.toTermName)
               else
-                val clsOfType = erasure(tp) match
-                  case JavaArrayType(elemType) => defn.ArrayOf(elemType)
-                  case etp => etp
+                val clsOfType = escapeJavaArray(erasure(tp))
                 classTag.select(nme.apply).appliedToType(tp).appliedTo(clsOf(clsOfType))
             tag.withSpan(span)
           case tp => EmptyTree
@@ -52,7 +50,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
     (formal, span) => formal.argInfos match {
       case arg1 :: arg2 :: Nil if !defn.isBottomClass(arg2.typeSymbol) =>
         val tp1 = fullyDefinedType(arg1, "TypeTest argument", span)
-        val tp2 = fullyDefinedType(arg2, "TypeTest argument", span)
+        val tp2 = fullyDefinedType(arg2, "TypeTest argument", span).normalized
         val sym2 = tp2.typeSymbol
         if tp1 <:< tp2 then
           // optimization when we know the typetest will always succeed
@@ -72,7 +70,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
               ref(defn.NoneModule))
           }
           val tpe = MethodType(List(nme.s))(_ => List(tp1), mth => defn.OptionClass.typeRef.appliedTo(mth.newParamRef(0) & tp2))
-          val meth = newSymbol(ctx.owner, nme.ANON_FUN, Synthetic | Method, tpe, coord = span)
+          val meth = newAnonFun(ctx.owner, tpe, coord = span)
           val typeTestType = defn.TypeTestClass.typeRef.appliedTo(List(tp1, tp2))
           Closure(meth, tss => body(tss.head).changeOwner(ctx.owner, meth), targetType = typeTestType).withSpan(span)
       case _ =>
@@ -104,7 +102,8 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
     def canComparePredefinedClasses(cls1: ClassSymbol, cls2: ClassSymbol): Boolean =
 
       def cmpWithBoxed(cls1: ClassSymbol, cls2: ClassSymbol) =
-        cls2 == defn.boxedType(cls1.typeRef).symbol
+        cls2 == defn.NothingClass
+        || cls2 == defn.boxedType(cls1.typeRef).symbol
         || cls1.isNumericValueClass && cls2.derivesFrom(defn.BoxedNumberClass)
 
       if cls1.isPrimitiveValueClass then
@@ -131,7 +130,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
       else if cls2 == defn.NullClass then
         cls1.derivesFrom(defn.ObjectClass)
       else
-        false
+        cls1 == defn.NothingClass || cls2 == defn.NothingClass
     end canComparePredefinedClasses
 
     /** Some simulated `CanEqual` instances for predefined types. It's more efficient
@@ -160,13 +159,12 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
 
     def success(t: Tree) =
       New(defn.ValueOfClass.typeRef.appliedTo(t.tpe), t :: Nil).withSpan(span)
-
     formal.argInfos match
       case arg :: Nil =>
-        fullyDefinedType(arg.dealias, "ValueOf argument", span).normalized match
+        fullyDefinedType(arg, "ValueOf argument", span).normalized.dealias match
           case ConstantType(c: Constant) =>
             success(Literal(c))
-          case TypeRef(_, sym) if sym == defn.UnitClass =>
+          case tp: TypeRef if tp.isRef(defn.UnitClass) =>
             success(Literal(Constant(())))
           case n: TermRef =>
             success(ref(n))
@@ -219,6 +217,12 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
       case _ => true
     loop(formal)
 
+  private def checkRefinement(formal: Type, name: TypeName, expected: Type, span: Span)(using Context): Unit =
+    val actual = formal.lookupRefined(name)
+    if actual.exists && !(expected =:= actual)
+    then report.error(
+      em"$name mismatch, expected: $expected, found: $actual.", ctx.source.atSpan(span))
+
   private def mkMirroredMonoType(mirroredType: HKTypeLambda)(using Context): Type =
     val monoMap = new TypeMap:
       def apply(t: Type) = t match
@@ -245,25 +249,19 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
           val cls = mirroredType.classSymbol
           val accessors = cls.caseAccessors.filterNot(_.isAllOf(PrivateLocal))
           val elemLabels = accessors.map(acc => ConstantType(Constant(acc.name.toString)))
+          val nestedPairs = TypeOps.nestedPairs(accessors.map(mirroredType.resultType.memberInfo(_).widenExpr))
           val (monoType, elemsType) = mirroredType match
             case mirroredType: HKTypeLambda =>
-              def accessorType(acc: Symbol) =
-                if cls.typeParams.hasSameLengthAs(mirroredType.paramRefs) then
-                  acc.info.subst(cls.typeParams, mirroredType.paramRefs)
-                else
-                  acc.info
-              val elems =
-                mirroredType.derivedLambdaType(
-                  resType = TypeOps.nestedPairs(accessors.map(accessorType))
-                )
-              (mkMirroredMonoType(mirroredType), elems)
+              (mkMirroredMonoType(mirroredType), mirroredType.derivedLambdaType(resType = nestedPairs))
             case _ =>
-              val elems = TypeOps.nestedPairs(accessors.map(mirroredType.memberInfo(_).widenExpr))
-              (mirroredType, elems)
+              (mirroredType, nestedPairs)
+          val elemsLabels = TypeOps.nestedPairs(elemLabels)
+          checkRefinement(formal, tpnme.MirroredElemTypes, elemsType, span)
+          checkRefinement(formal, tpnme.MirroredElemLabels, elemsLabels, span)
           val mirrorType =
             mirrorCore(defn.Mirror_ProductClass, monoType, mirroredType, cls.name, formal)
               .refinedWith(tpnme.MirroredElemTypes, TypeAlias(elemsType))
-              .refinedWith(tpnme.MirroredElemLabels, TypeAlias(TypeOps.nestedPairs(elemLabels)))
+              .refinedWith(tpnme.MirroredElemLabels, TypeAlias(elemsLabels))
           val mirrorRef =
             if (cls.is(Scala2x)) anonymousMirror(monoType, ExtendsProductMirror, span)
             else companionPath(mirroredType, span)
@@ -273,18 +271,18 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
 
   private def sumMirror(mirroredType: Type, formal: Type, span: Span)(using Context): Tree =
     val cls = mirroredType.classSymbol
-    val useCompanion = cls.useCompanionAsMirror
+    val useCompanion = cls.useCompanionAsSumMirror
 
     if cls.isGenericSum(if useCompanion then cls.linkedClass else ctx.owner) then
       val elemLabels = cls.children.map(c => ConstantType(Constant(c.name.toString)))
 
       def solve(sym: Symbol): Type = sym match
-        case caseClass: ClassSymbol =>
-          assert(caseClass.is(Case))
-          if caseClass.is(Module) then
-            caseClass.sourceModule.termRef
+        case childClass: ClassSymbol =>
+          assert(childClass.isOneOf(Case | Sealed))
+          if childClass.is(Module) then
+            childClass.sourceModule.termRef
           else
-            caseClass.primaryConstructor.info match
+            childClass.primaryConstructor.info match
               case info: PolyType =>
                 // Compute the the full child type by solving the subtype constraint
                 // `C[X1, ..., Xn] <: P`, where
@@ -301,13 +299,13 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
                     case tp => tp
                   resType <:< target
                   val tparams = poly.paramRefs
-                  val variances = caseClass.typeParams.map(_.paramVarianceSign)
+                  val variances = childClass.typeParams.map(_.paramVarianceSign)
                   val instanceTypes = tparams.lazyZip(variances).map((tparam, variance) =>
                     TypeComparer.instanceType(tparam, fromBelow = variance < 0))
                   resType.substParams(poly, instanceTypes)
-                instantiate(using ctx.fresh.setExploreTyperState().setOwner(caseClass))
+                instantiate(using ctx.fresh.setExploreTyperState().setOwner(childClass))
               case _ =>
-                caseClass.typeRef
+                childClass.typeRef
         case child => child.termRef
       end solve
 
@@ -322,9 +320,9 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
           (mirroredType, elems)
 
       val mirrorType =
-          mirrorCore(defn.Mirror_SumClass, monoType, mirroredType, cls.name, formal)
-          .refinedWith(tpnme.MirroredElemTypes, TypeAlias(elemsType))
-          .refinedWith(tpnme.MirroredElemLabels, TypeAlias(TypeOps.nestedPairs(elemLabels)))
+        mirrorCore(defn.Mirror_SumClass, monoType, mirroredType, cls.name, formal)
+            .refinedWith(tpnme.MirroredElemTypes, TypeAlias(elemsType))
+            .refinedWith(tpnme.MirroredElemLabels, TypeAlias(TypeOps.nestedPairs(elemLabels)))
       val mirrorRef =
         if useCompanion then companionPath(mirroredType, span)
         else anonymousMirror(monoType, ExtendsSumMirror, span)
@@ -337,7 +335,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
       (using Context): Tree =
     if checkFormal(formal) then
       formal.member(tpnme.MirroredType).info match
-        case TypeBounds(mirroredType, _) => synth(mirroredType.stripTypeVar, formal, span)
+        case TypeBounds(mirroredType, _) => synth(TypeOps.stripTypeVars(mirroredType), formal, span)
         case other => EmptyTree
     else EmptyTree
 
@@ -367,6 +365,119 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
           synthesizedSumMirror(formal, span)
       case _ => EmptyTree
 
+  private def escapeJavaArray(tp: Type)(using Context): Type = tp match
+    case JavaArrayType(elemTp) => defn.ArrayOf(escapeJavaArray(elemTp))
+    case _                     => tp
+
+  private enum ManifestKind:
+    case Full, Opt, Clss
+
+    /** The kind that should be used for an array element, if we are `OptManifest` then this
+     *  prevents wildcards arguments of Arrays being converted to `NoManifest`
+     */
+    def arrayElem = if this == Full then this else Clss
+
+  end ManifestKind
+
+  /** Manifest factory that does enough to satisfy the equality semantics for
+   *  - `scala.reflect.OptManifest` (only runtime class is recorded)
+   *  - `scala.reflect.Manifest` (runtime class of arguments are recorded, with wildcard upper bounds wrapped)
+   *  however,`toString` may be different.
+   *
+   * There are some differences to `ClassTag`,
+   *  e.g. in Scala 2 `manifest[Int @unchecked]` will fail, but `classTag[Int @unchecked]` succeeds.
+   */
+  private def manifestFactoryOf(kind: ManifestKind): SpecialHandler = (formal, span) =>
+    import ManifestKind.*
+
+    /* Creates a tree that calls the factory method called constructor in object scala.reflect.Manifest */
+    def factoryManifest(constructor: TermName, tparg: Type, args: Tree*): Tree =
+      if args.contains(EmptyTree) then
+        EmptyTree
+      else
+        val factory = if kind == Full then defn.ManifestFactoryModule else defn.ClassManifestFactoryModule
+        applyOverloaded(ref(factory), constructor, args.toList, tparg :: Nil, Types.WildcardType).withSpan(span)
+
+    /* Creates a tree representing one of the singleton manifests.*/
+    def singletonManifest(name: TermName) =
+      ref(defn.ManifestFactoryModule).select(name).ensureApplied.withSpan(span)
+
+    def synthArrayManifest(elemTp: Type, kind: ManifestKind, topLevel: Boolean): Tree =
+      factoryManifest(nme.arrayType, elemTp, synthesize(elemTp, kind.arrayElem, topLevel))
+
+    /** manifests generated from wildcards can not equal Int,Long,Any,AnyRef,AnyVal etc,
+     *  so we wrap their upper bound.
+     */
+    def synthWildcardManifest(tp: Manifestable, hi: Type, topLevel: Boolean): Tree =
+      factoryManifest(nme.wildcardType, tp, singletonManifest(nme.Nothing), synthesize(hi, Full, topLevel))
+
+    /** `Nil` if not full manifest */
+    def synthArgManifests(tp: Manifestable): List[Tree] = tp match
+      case AppliedType(_, args) if kind == Full && tp.typeSymbol.isClass =>
+        args.map(synthesize(_, Full, topLevel = false))
+      case _ =>
+        Nil
+
+    /** This type contains all top-level types supported by Scala 2's algorithm */
+    type Manifestable =
+      ThisType | TermRef | ConstantType | TypeRef | AppliedType | TypeBounds | RecType | RefinedType | AndType
+
+    def canManifest(tp: Manifestable, topLevel: Boolean) =
+      val sym = tp.typeSymbol
+      !sym.isAbstractType
+      && hasStableErasure(tp)
+      && !(topLevel && defn.isBottomClassAfterErasure(sym))
+
+    /** adapted from `syntheticClassTag` */
+    def synthManifest(tp: Manifestable, kind: ManifestKind, topLevel: Boolean) = tp match
+      case defn.ArrayOf(elemTp)              => synthArrayManifest(elemTp, kind, topLevel)
+      case TypeBounds(_, hi) if kind == Full => synthWildcardManifest(tp, hi, topLevel)
+
+      case tp if canManifest(tp, topLevel) =>
+        val sym = tp.typeSymbol
+        if sym.isPrimitiveValueClass || defn.SpecialManifestClasses.contains(sym) then
+          singletonManifest(sym.name.toTermName)
+        else
+          erasure(tp) match
+            case JavaArrayType(elemTp) =>
+              synthArrayManifest(escapeJavaArray(elemTp), kind, topLevel)
+
+            case etp =>
+              val clsArg = clsOf(etp).asInstance(defn.ClassType(tp)) // cast needed to resolve overloading
+              factoryManifest(nme.classType, tp, (clsArg :: synthArgManifests(tp))*)
+
+      case _ =>
+        EmptyTree
+
+    end synthManifest
+
+    def manifestOfType(tp0: Type, kind: ManifestKind, topLevel: Boolean): Tree = tp0.dealiasKeepAnnots match
+      case tp1: Manifestable => synthManifest(tp1, kind, topLevel)
+      case tp1               => EmptyTree
+
+    def synthesize(tp: Type, kind: ManifestKind, topLevel: Boolean): Tree =
+      manifestOfType(tp, kind, topLevel) match
+        case EmptyTree if kind == Opt => ref(defn.NoManifestModule)
+        case result                   => result
+
+    formal.argInfos match
+      case arg :: Nil =>
+        val manifest = synthesize(fullyDefinedType(arg, "Manifest argument", span), kind, topLevel = true)
+        if manifest != EmptyTree then
+          report.deprecationWarning(
+            i"""Compiler synthesis of Manifest and OptManifest is deprecated, instead
+               |replace with the type `scala.reflect.ClassTag[$arg]`.
+               |Alternatively, consider using the new metaprogramming features of Scala 3,
+               |see https://docs.scala-lang.org/scala3/reference/metaprogramming.html""", ctx.source.atSpan(span))
+        manifest
+      case _ =>
+        EmptyTree
+
+  end manifestFactoryOf
+
+  val synthesizedManifest: SpecialHandler = manifestFactoryOf(ManifestKind.Full)
+  val synthesizedOptManifest: SpecialHandler = manifestFactoryOf(ManifestKind.Opt)
+
   val specialHandlers = List(
     defn.ClassTagClass        -> synthesizedClassTag,
     defn.TypeTestClass        -> synthesizedTypeTest,
@@ -374,7 +485,10 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
     defn.ValueOfClass         -> synthesizedValueOf,
     defn.Mirror_ProductClass  -> synthesizedProductMirror,
     defn.Mirror_SumClass      -> synthesizedSumMirror,
-    defn.MirrorClass          -> synthesizedMirror)
+    defn.MirrorClass          -> synthesizedMirror,
+    defn.ManifestClass        -> synthesizedManifest,
+    defn.OptManifestClass     -> synthesizedOptManifest,
+  )
 
   def tryAll(formal: Type, span: Span)(using Context): Tree =
     def recur(handlers: SpecialHandlers): Tree = handlers match
diff --git a/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala b/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala
index 8ce74a6061cc..3dcec413540f 100644
--- a/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala
+++ b/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala
@@ -4,7 +4,7 @@ package typer
 
 import core._
 import ast._
-import Contexts._, Constants._, Types._, Symbols._, Names._, Flags._, Decorators._
+import Contexts._, ContextOps._, Constants._, Types._, Symbols._, Names._, Flags._, Decorators._
 import ErrorReporting._, Annotations._, Denotations._, SymDenotations._, StdNames._
 import util.Spans._
 import util.SrcPos
@@ -12,7 +12,6 @@ import config.Printers.typr
 import ast.Trees._
 import NameOps._
 import ProtoTypes._
-import Inferencing.couldInstantiateTypeVar
 import collection.mutable
 import reporting._
 import Checking.{checkNoPrivateLeaks, checkNoWildcard}
@@ -117,12 +116,15 @@ trait TypeAssigner {
 
   /** The type of the selection `tree`, where `qual1` is the typed qualifier part. */
   def selectionType(tree: untpd.RefTree, qual1: Tree)(using Context): Type =
-    var qualType = qual1.tpe.widenIfUnstable
-    if !qualType.hasSimpleKind && tree.name != nme.CONSTRUCTOR then
-      // constructors are selected on typeconstructor, type arguments are passed afterwards
-      qualType = errorType(em"$qualType takes type parameters", qual1.srcPos)
-    else if !qualType.isInstanceOf[TermType] then
-      qualType = errorType(em"$qualType is illegal as a selection prefix", qual1.srcPos)
+    val qualType0 = qual1.tpe.widenIfUnstable
+    val qualType =
+      if !qualType0.hasSimpleKind && tree.name != nme.CONSTRUCTOR then
+        // constructors are selected on typeconstructor, type arguments are passed afterwards
+        errorType(em"$qualType0 takes type parameters", qual1.srcPos)
+      else if !qualType0.isInstanceOf[TermType] && !qualType0.isError then
+        errorType(em"$qualType0 is illegal as a selection prefix", qual1.srcPos)
+      else
+        qualType0
 
     def arrayElemType = qual1.tpe.widen match
       case JavaArrayType(elemtp) => elemtp
@@ -143,7 +145,12 @@ trait TypeAssigner {
       // this is exactly what Erasure will do.
       case _ =>
         val pre = maybeSkolemizePrefix(qualType, name)
-        val mbr = qualType.findMember(name, pre)
+        val mbr =
+          if ctx.isJava then
+            ctx.javaFindMember(name, pre)
+          else
+            qualType.findMember(name, pre)
+
         if reallyExists(mbr) then qualType.select(name, mbr)
         else if qualType.isErroneous || name.toTermName == nme.ERROR then UnspecifiedErrorType
         else NoType
@@ -155,7 +162,7 @@ trait TypeAssigner {
     val qualType = qual.tpe.widenIfUnstable
     def kind = if tree.isType then "type" else "value"
     val foundWithoutNull = qualType match
-      case OrNull(qualType1) =>
+      case OrNull(qualType1) if qualType1 <:< defn.ObjectType =>
         val name = tree.name
         val pre = maybeSkolemizePrefix(qualType1, name)
         reallyExists(qualType1.findMember(name, pre))
@@ -228,19 +235,18 @@ trait TypeAssigner {
         else errorType("not a legal qualifying class for this", tree.srcPos))
   }
 
-  def assignType(tree: untpd.Super, qual: Tree, mixinClass: Symbol = NoSymbol)(using Context): Super = {
-    val mix = tree.mix
-    qual.tpe match {
-      case err: ErrorType => untpd.cpy.Super(tree)(qual, mix).withType(err)
+  def superType(qualType: Type, mix: untpd.Ident, mixinClass: Symbol, pos: SrcPos)(using Context) =
+    qualType match
+      case err: ErrorType => err
       case qtype @ ThisType(_) =>
         val cls = qtype.cls
         def findMixinSuper(site: Type): Type = site.parents filter (_.typeSymbol.name == mix.name) match {
           case p :: Nil =>
             p.typeConstructor
           case Nil =>
-            errorType(SuperQualMustBeParent(mix, cls), tree.srcPos)
+            errorType(SuperQualMustBeParent(mix, cls), pos)
           case p :: q :: _ =>
-            errorType("ambiguous parent class qualifier", tree.srcPos)
+            errorType("ambiguous parent class qualifier", pos)
         }
         val owntype =
           if (mixinClass.exists) mixinClass.appliedRef
@@ -250,9 +256,11 @@ trait TypeAssigner {
             val ps = cls.classInfo.parents
             if (ps.isEmpty) defn.AnyType else ps.reduceLeft((x: Type, y: Type) => x & y)
           }
-        tree.withType(SuperType(cls.thisType, owntype))
-    }
-  }
+        SuperType(cls.thisType, owntype)
+
+  def assignType(tree: untpd.Super, qual: Tree, mixinClass: Symbol = NoSymbol)(using Context): Super =
+    untpd.cpy.Super(tree)(qual, tree.mix)
+      .withType(superType(qual.tpe, tree.mix, mixinClass, tree.srcPos))
 
   /** Substitute argument type `argType` for parameter `pref` in type `tp`,
    *  skolemizing the argument type if it is not stable and `pref` occurs in `tp`.
@@ -340,7 +348,17 @@ trait TypeAssigner {
             }
           }
           else {
-            val argTypes = args.tpes
+            // Make sure arguments don't contain the type `pt` itself.
+            // make a copy of the argument if that's the case.
+            // This is done to compensate for the fact that normally every
+            // reference to a polytype would have to be a fresh copy of that type,
+            // but we want to avoid that because it would increase compilation cost.
+            // See pos/i6682a.scala for a test case where the defensive copying matters.
+            val ensureFresh = new TypeMap:
+              def apply(tp: Type) = mapOver(
+                if tp eq pt then pt.newLikeThis(pt.paramNames, pt.paramInfos, pt.resType)
+                else tp)
+            val argTypes = args.tpes.mapConserve(ensureFresh)
             if (sameLength(argTypes, paramNames)) pt.instantiate(argTypes)
             else wrongNumberOfTypeArgs(fn.tpe, pt.typeParams, args, tree.srcPos)
           }
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index 4433ac7dee90..09acde2ac845 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -39,7 +39,8 @@ import annotation.tailrec
 import Implicits._
 import util.Stats.record
 import config.Printers.{gadts, typr, debug}
-import config.Feature._
+import config.Feature
+import config.Feature.{sourceVersion, migrateTo3}
 import config.SourceVersion._
 import rewrites.Rewrites.patch
 import NavigateAST._
@@ -50,6 +51,8 @@ import Nullables._
 import NullOpsDecorator._
 import config.Config
 
+import scala.annotation.constructorOnly
+
 object Typer {
 
   /** The precedence of bindings which determines which of several bindings will be
@@ -66,6 +69,9 @@ object Typer {
     if (!tree.isEmpty && !tree.isInstanceOf[untpd.TypedSplice] && ctx.typerState.isGlobalCommittable)
       assert(tree.span.exists, i"position not set for $tree # ${tree.uniqueId} of ${tree.getClass} in ${tree.source}")
 
+  /** An attachment for GADT constraints that were inferred for a pattern. */
+  val InferredGadtConstraints = new Property.StickyKey[core.GadtConstraint]
+
   /** A context property that indicates the owner of any expressions to be typed in the context
    *  if that owner is different from the context's owner. Typically, a context with a class
    *  as owner would have a local dummy as ExprOwner value.
@@ -77,6 +83,12 @@ object Typer {
    */
   private val InsertedApply = new Property.Key[Unit]
 
+  /** An attachment on a result of an implicit conversion or extension method
+   *  that was added by tryInsertImplicitOnQualifier. Needed to prevent infinite
+   *  expansions in error cases (e.g. in fuzzy/i9293.scala).
+   */
+  private val InsertedImplicitOnQualifier = new Property.Key[Unit]
+
   /** An attachment on a tree `t` occurring as part of a `t()` where
    *  the `()` was dropped by the Typer.
    */
@@ -100,7 +112,11 @@ object Typer {
     tree.putAttachment(HiddenSearchFailure,
       fail :: tree.attachmentOrElse(HiddenSearchFailure, Nil))
 }
-class Typer extends Namer
+/** Typecheck trees, the main entry point is `typed`.
+ *
+ *  @param nestingLevel The nesting level of the `scope` of this Typer.
+ */
+class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
                with TypeAssigner
                with Applications
                with Implicits
@@ -115,6 +131,13 @@ class Typer extends Namer
   import tpd.{cpy => _, _}
   import untpd.cpy
 
+  /** The scope of the typer.
+   *  For nested typers (cf `Namer#nestedTyper`), this is a place parameters are
+   *  entered during completion and where they survive until typechecking. A
+   *  context with this typer also has this scope.
+   */
+  val scope: MutableScope = newScope(nestingLevel)
+
   /** A temporary data item valid for a single typed ident:
    *  The set of all root import symbols that have been
    *  encountered as a qualifier of an import so far.
@@ -131,7 +154,7 @@ class Typer extends Namer
   private var foundUnderScala2: Type = NoType
 
   // Overridden in derived typers
-  def newLikeThis: Typer = new Typer
+  def newLikeThis(nestingLevel: Int): Typer = new Typer(nestingLevel)
 
   /** Find the type of an identifier with given `name` in given context `ctx`.
    *   @param name       the name of the identifier
@@ -149,19 +172,32 @@ class Typer extends Namer
       if !suppressErrors then report.error(msg, pos)
 
     /** A symbol qualifies if it really exists and is not a package class.
-     *  In addition, if we are in a constructor of a pattern, we ignore all definitions
-     *  which are methods and not accessors (note: if we don't do that
-     *  case x :: xs in class List would return the :: method).
-     *
      *  Package classes are part of their parent's scope, because otherwise
      *  we could not reload them via `_.member`. On the other hand, accessing a
      *  package as a type from source is always an error.
+
+     *  In addition:
+     *    - if we are in a constructor of a pattern, we ignore all definitions
+     *      which are methods and not accessors (note: if we don't do that
+     *      case x :: xs in class List would return the :: method).
+     *    - Members of the empty package can be accessed only from within the empty package.
+     *      Note: it would be cleaner to never nest package definitions in empty package definitions,
+     *      but then we'd have to give up the fiction that a compilation unit consists of
+     *      a single tree (because a source file may have both toplevel classes which go
+     *      into the empty package and package definitions, which would have to stay outside).
+     *      Since the principle of a single tree per compilation unit is assumed by many
+     *      tools, we did not want to take that step.
      */
     def qualifies(denot: Denotation): Boolean =
       reallyExists(denot)
       && (!pt.isInstanceOf[UnapplySelectionProto]
           || denot.hasAltWith(sd => !sd.symbol.is(Method, butNot = Accessor)))
       && !denot.symbol.is(PackageClass)
+      && {
+        var owner = denot.symbol.maybeOwner
+        if owner.isPackageObject then owner = owner.owner
+        !owner.isEmptyPackage || ctx.owner.enclosingPackageClass.isEmptyPackage
+      }
 
     /** Find the denotation of enclosing `name` in given context `ctx`.
      *  @param previous    A denotation that was found in a more deeply nested scope,
@@ -275,7 +311,7 @@ class Typer extends Namer
        */
       def isDefinedInCurrentUnit(denot: Denotation)(using Context): Boolean = denot match {
         case MultiDenotation(d1, d2) => isDefinedInCurrentUnit(d1) || isDefinedInCurrentUnit(d2)
-        case denot: SingleDenotation => denot.symbol.source == ctx.compilationUnit.source
+        case denot: SingleDenotation => ctx.compilationUnit != null && denot.symbol.source == ctx.compilationUnit.source
       }
 
       /** Is `denot` the denotation of a self symbol? */
@@ -300,7 +336,7 @@ class Typer extends Namer
            *  A package object should always be skipped if we look for a term.
            *  That way we make sure we consider all overloaded alternatives of
            *  a definition, even if they are in different source files.
-           *  If we are looking for a type, a package object should ne skipped
+           *  If we are looking for a type, a package object should be skipped
            *  only if it does not contain opaque definitions. Package objects
            *  with opaque definitions are significant, since opaque aliases
            *  are only seen if the prefix is the this-type of the package object.
@@ -364,7 +400,9 @@ class Typer extends Namer
             if (qualifies(defDenot)) {
               val found =
                 if (isSelfDenot(defDenot)) curOwner.enclosingClass.thisType
-                else {
+                else if (ctx.isJava && defDenot.symbol.isStatic) {
+                  defDenot.symbol.namedType
+                } else {
                   val effectiveOwner =
                     if (curOwner.isTerm && defDenot.symbol.maybeOwner.isType)
                       // Don't mix NoPrefix and thisType prefixes, since type comparer
@@ -377,7 +415,8 @@ class Typer extends Namer
               if !curOwner.is(Package) || isDefinedInCurrentUnit(defDenot) then
                 result = checkNewOrShadowed(found, Definition) // no need to go further out, we found highest prec entry
                 found match
-                  case found: NamedType if curOwner.isClass && isInherited(found.denot) =>
+                  case found: NamedType
+                  if curOwner.isClass && isInherited(found.denot) && !ctx.compilationUnit.isJava =>
                     checkNoOuterDefs(found.denot, ctx, ctx)
                   case _ =>
               else
@@ -459,6 +498,8 @@ class Typer extends Namer
     if ctx.mode.is(Mode.Pattern) then
       if name == nme.WILDCARD then
         return tree.withType(pt)
+      if name == tpnme.WILDCARD then
+        return tree.withType(defn.AnyType)
       if untpd.isVarPattern(tree) && name.isTermName then
         return typed(desugar.patternVar(tree), pt)
     else if ctx.mode.is(Mode.QuotedPattern) then
@@ -571,13 +612,17 @@ class Typer extends Namer
       checkLegalValue(select, pt)
       ConstFold(select)
     else if couldInstantiateTypeVar(qual.tpe.widen) then
-      // try again with more defined qualifier type
+       // there's a simply visible type variable in the result; try again with a more defined qualifier type
+       // There's a second trial where we try to instantiate all type variables in `qual.tpe.widen`,
+       // but that is done only after we search for extension methods or conversions.
       typedSelect(tree, pt, qual)
     else
       val tree1 = tryExtensionOrConversion(
-          tree, pt, IgnoredProto(pt), qual, ctx.typerState.ownedVars, this, privateOK = true)
+          tree, pt, IgnoredProto(pt), qual, ctx.typerState.ownedVars, this, inSelect = true)
       if !tree1.isEmpty then
         tree1
+      else if canDefineFurther(qual.tpe.widen) then
+        typedSelect(tree, pt, qual)
       else if qual.tpe.derivesFrom(defn.DynamicClass)
         && selName.isTermName && !isDynamicExpansion(tree)
       then
@@ -602,7 +647,7 @@ class Typer extends Namer
       val qual = typedExpr(tree.qualifier, shallowSelectionProto(tree.name, pt, this))
       val qual1 = if Nullables.unsafeNullsEnabled then
         qual.tpe match {
-          case OrNull(tpe1) =>
+          case OrNull(tpe1) if tpe1 <:< defn.ObjectType =>
             qual.cast(AndType(qual.tpe, tpe1))
           case tp =>
             if tp.isNullType
@@ -695,14 +740,18 @@ class Typer extends Namer
       else if (target.isRef(defn.FloatClass))
         tree.kind match {
           case Whole(16) => // cant parse hex literal as float
-          case _         => return lit(floatFromDigits(digits))
+          case _         =>
+            val float = floatFromDigits(digits)
+            if digits.toIntOption.exists(_ != float.toInt) then
+              report.warning(LossyWideningConstantConversion(defn.IntType, target), tree.srcPos)
+            return lit(float)
         }
       else if (target.isRef(defn.DoubleClass))
         tree.kind match {
           case Whole(16) => // cant parse hex literal as double
           case _         => return lit(doubleFromDigits(digits))
         }
-      else if genericNumberLiteralsEnabled
+      else if Feature.genericNumberLiteralsEnabled
           && target.isValueType && isFullyDefined(target, ForceDegree.none)
       then
         // If expected type is defined with a FromDigits instance, use that one
@@ -771,6 +820,9 @@ class Typer extends Namer
         typed(cpy.Block(tree)(clsDef :: Nil, New(Ident(x), Nil)), pt)
       case _ =>
         var tpt1 = typedType(tree.tpt)
+        val tsym = tpt1.tpe.underlyingClassRef(refinementOK = false).typeSymbol
+        if tsym.is(Package) then
+          report error(em"$tsym cannot be instantiated", tpt1.srcPos)
         tpt1 = tpt1.withType(ensureAccessible(tpt1.tpe, superAccess = false, tpt1.srcPos))
         tpt1 match {
           case AppliedTypeTree(_, targs) =>
@@ -804,11 +856,9 @@ class Typer extends Namer
       val underlyingTreeTpe =
         if (isRepeatedParamType(tpt)) TypeTree(defn.SeqType.appliedTo(pt :: Nil))
         else tpt
-
       val expr1 =
-        if (isRepeatedParamType(tpt)) tree.expr.withType(defn.SeqType.appliedTo(pt :: Nil))
-        else if (isWildcard) tree.expr.withType(tpt.tpe)
-        else typed(tree.expr, tpt.tpe.widenSkolem)
+        if isWildcard then tree.expr.withType(underlyingTreeTpe.tpe)
+        else typed(tree.expr, underlyingTreeTpe.tpe.widenSkolem)
       assignType(cpy.Typed(tree)(expr1, tpt), underlyingTreeTpe)
         .withNotNullInfo(expr1.notNullInfo)
     }
@@ -834,8 +884,10 @@ class Typer extends Namer
               // We need to make sure its type is no longer nullable
               expr0.castToNonNullable
           else expr0
-        val fromCls = if expr1.tpe.derivesFrom(defn.ArrayClass)
-          then defn.ArrayClass else defn.SeqClass
+        val fromCls =
+          if expr1.tpe.derivesFrom(defn.ArrayClass)
+          then defn.ArrayClass
+          else defn.SeqClass
         val tpt1 = TypeTree(expr1.tpe.widen.translateToRepeated(fromCls)).withSpan(tree.tpt.span)
         assignType(cpy.Typed(tree)(expr1, tpt1), tpt1)
       }
@@ -845,7 +897,7 @@ class Typer extends Namer
         wildName = nme.WILDCARD_STAR)
     }
     else {
-      def typedTpt = checkSimpleKinded(typedType(tree.tpt))
+      def typedTpt = checkSimpleKinded(typedType(tree.tpt, mapPatternBounds = true))
       def handlePattern: Tree = {
         val tpt1 = typedTpt
         if !ctx.isAfterTyper && pt != defn.ImplicitScrutineeTypeRef then
@@ -874,28 +926,32 @@ class Typer extends Namer
    *  exists, rewrite to `tt(e)`.
    *  @pre We are in pattern-matching mode (Mode.Pattern)
    */
-  def tryWithTypeTest(tree: Typed, pt: Type)(using Context): Tree = tree.tpt.tpe.dealias match {
-    case tref: TypeRef if !tref.symbol.isClass && !ctx.isAfterTyper && !(tref =:= pt) =>
-      def withTag(tpe: Type): Option[Tree] = {
-        require(ctx.mode.is(Mode.Pattern))
-        withoutMode(Mode.Pattern)(
-          inferImplicit(tpe, EmptyTree, tree.tpt.span)
-        ) match
-          case SearchSuccess(clsTag, _, _, _) =>
-            withMode(Mode.InTypeTest) {
-              Some(typed(untpd.Apply(untpd.TypedSplice(clsTag), untpd.TypedSplice(tree.expr)), pt))
-            }
-          case _ =>
-            None
-      }
-      val tag = withTag(defn.TypeTestClass.typeRef.appliedTo(pt, tref))
-          .orElse(withTag(defn.ClassTagClass.typeRef.appliedTo(tref)))
+  def tryWithTypeTest(tree: Typed, pt: Type)(using Context): Tree =
+    def withTag(tpe: Type): Option[Tree] = {
+      require(ctx.mode.is(Mode.Pattern))
+      withoutMode(Mode.Pattern)(
+        inferImplicit(tpe, EmptyTree, tree.tpt.span)
+      ) match
+        case SearchSuccess(clsTag, _, _, _) =>
+          withMode(Mode.InTypeTest) {
+            Some(typed(untpd.Apply(untpd.TypedSplice(clsTag), untpd.TypedSplice(tree.expr)), pt))
+          }
+        case _ =>
+          None
+    }
+    def tagged(tpe: Type) = {
+      val tag = withTag(defn.TypeTestClass.typeRef.appliedTo(pt, tpe))
+          .orElse(withTag(defn.ClassTagClass.typeRef.appliedTo(tpe)))
           .getOrElse(tree)
-      if tag.symbol.owner == defn.ClassTagClass && config.Feature.sourceVersion.isAtLeast(config.SourceVersion.future) then
+      if tag.symbol.maybeOwner == defn.ClassTagClass && config.Feature.sourceVersion.isAtLeast(config.SourceVersion.future) then
         report.warning("Use of `scala.reflect.ClassTag` for type testing may be unsound. Consider using `scala.reflect.TypeTest` instead.", tree.srcPos)
       tag
-    case _ => tree
-  }
+    }
+    tree.tpt.tpe.dealias match {
+      case tpe @ AppliedType(tref: TypeRef, _) if !tref.symbol.isClass && !ctx.isAfterTyper && !(tpe =:= pt) => tagged(tpe)
+      case tref: TypeRef if !tref.symbol.isClass && !ctx.isAfterTyper && !(tref =:= pt) => tagged(tref)
+      case _ => tree
+    }
 
 
   def typedNamedArg(tree: untpd.NamedArg, pt: Type)(using Context): NamedArg = {
@@ -1045,7 +1101,15 @@ class Typer extends Namer
         val expr1 = ascribeType(expr, pt)
         cpy.Block(block)(stats, expr1) withType expr1.tpe // no assignType here because avoid is redundant
       case _ =>
-        Typed(tree, TypeTree(pt.simplified))
+        val target = pt.simplified
+        val targetTpt = InferredTypeTree().withType(target)
+        if tree.tpe <:< target then Typed(tree, targetTpt)
+        else
+          // This case should not normally arise. It currently does arise in test cases
+          // pos/t4080b.scala and pos/i7067.scala. In that case, a type ascription is wrong
+          // and would not pass Ycheck. We have to use a cast instead. TODO: follow-up why
+          // the cases arise and eliminate them, if possible.
+          tree.cast(targetTpt)
     }
     def noLeaks(t: Tree): Boolean = escapingRefs(t, localSyms).isEmpty
     if (noLeaks(tree)) tree
@@ -1097,10 +1161,10 @@ class Typer extends Namer
    *     def double(x: Char): String = s"$x$x"
    *     "abc" flatMap double
    */
-  private def decomposeProtoFunction(pt: Type, defaultArity: Int, tree: untpd.Tree)(using Context): (List[Type], untpd.Tree) = {
+  private def decomposeProtoFunction(pt: Type, defaultArity: Int, pos: SrcPos)(using Context): (List[Type], untpd.Tree) = {
     def typeTree(tp: Type) = tp match {
-      case _: WildcardType => untpd.TypeTree()
-      case _ => untpd.TypeTree(tp)
+      case _: WildcardType => new untpd.InferredTypeTree()
+      case _ => untpd.InferredTypeTree(tp)
     }
     def interpolateWildcards = new TypeMap {
       def apply(t: Type): Type = t match
@@ -1108,33 +1172,73 @@ class Typer extends Namer
           newTypeVar(apply(bounds.orElse(TypeBounds.empty)).bounds)
         case _ => mapOver(t)
     }
-    val pt1 = pt.stripTypeVar.dealias
+
+    val pt1 = pt.stripTypeVar.dealias.normalized
     if (pt1 ne pt1.dropDependentRefinement)
        && defn.isContextFunctionType(pt1.nonPrivateMember(nme.apply).info.finalResultType)
     then
       report.error(
         i"""Implementation restriction: Expected result type $pt1
            |is a curried dependent context function type. Such types are not yet supported.""",
-        tree.srcPos)
+        pos)
     pt1 match {
-      case pt1 if defn.isNonRefinedFunction(pt1) =>
-        // if expected parameter type(s) are wildcards, approximate from below.
-        // if expected result type is a wildcard, approximate from above.
-        // this can type the greatest set of admissible closures.
-        (pt1.argTypesLo.init, typeTree(interpolateWildcards(pt1.argTypesHi.last)))
-      case SAMType(sam @ MethodTpe(_, formals, restpe)) =>
-        (formals,
-         if (sam.isResultDependent)
-           untpd.DependentTypeTree(syms => restpe.substParams(sam, syms.map(_.termRef)))
-         else
-           typeTree(restpe))
       case tp: TypeParamRef =>
-        decomposeProtoFunction(ctx.typerState.constraint.entry(tp).bounds.hi, defaultArity, tree)
-      case _ =>
-        (List.tabulate(defaultArity)(alwaysWildcardType), untpd.TypeTree())
+        decomposeProtoFunction(ctx.typerState.constraint.entry(tp).bounds.hi, defaultArity, pos)
+      case _ => pt1.findFunctionType match {
+        case pt1 if defn.isNonRefinedFunction(pt1) =>
+          // if expected parameter type(s) are wildcards, approximate from below.
+          // if expected result type is a wildcard, approximate from above.
+          // this can type the greatest set of admissible closures.
+          (pt1.argTypesLo.init, typeTree(interpolateWildcards(pt1.argTypesHi.last)))
+        case RefinedType(parent, nme.apply, mt @ MethodTpe(_, formals, restpe))
+        if defn.isNonRefinedFunction(parent) && formals.length == defaultArity =>
+          (formals, untpd.DependentTypeTree(syms => restpe.substParams(mt, syms.map(_.termRef))))
+        case SAMType(mt @ MethodTpe(_, formals, restpe)) =>
+          (formals,
+           if (mt.isResultDependent)
+             untpd.DependentTypeTree(syms => restpe.substParams(mt, syms.map(_.termRef)))
+           else
+             typeTree(restpe))
+        case _ =>
+          (List.tabulate(defaultArity)(alwaysWildcardType), untpd.TypeTree())
+      }
     }
   }
 
+  /** The parameter type for a parameter in a lambda that does
+   *  not have an explicit type given, and where the type is not known from the context.
+   *  In this case the parameter type needs to be inferred the "target type" T known
+   *  from the callee `f` if the lambda is of a form like `x => f(x)`.
+   *  If `T` exists, we know that `S <: I <: T`.
+   *
+   *  The inference makes two attempts:
+   *
+   *    1. Compute the target type `T` and make it known that `S <: T`.
+   *       If the expected type `S` can be fully defined under ForceDegree.flipBottom,
+   *       pick this one (this might use the fact that S <: T for an upper approximation).
+   *    2. Otherwise, if the target type `T` can be fully defined under ForceDegree.flipBottom,
+   *       pick this one.
+   *
+   *  If both attempts fail, return `NoType`.
+   */
+  def inferredFromTarget(
+      param: untpd.ValDef, formal: Type, calleeType: Type, paramIndex: Name => Int)(using Context): Type =
+    val target = calleeType.widen match
+      case mtpe: MethodType =>
+        val pos = paramIndex(param.name)
+        if pos < mtpe.paramInfos.length then
+          mtpe.paramInfos(pos)
+            // This works only if vararg annotations match up.
+            // See neg/i14367.scala for an example where the inferred type is mispredicted. 
+            // Nevertheless, the alternative would be to give up completely, so this is
+            // defensible.
+        else NoType
+      case _ => NoType
+    if target.exists then formal <:< target
+    if isFullyDefined(formal, ForceDegree.flipBottom) then formal
+    else if target.exists && isFullyDefined(target, ForceDegree.flipBottom) then target
+    else NoType
+
   def typedFunction(tree: untpd.Function, pt: Type)(using Context): Tree =
     if (ctx.mode is Mode.Type) typedFunctionType(tree, pt)
     else typedFunctionValue(tree, pt)
@@ -1216,10 +1320,10 @@ class Typer extends Namer
      */
     var fnBody = tree.body
 
-    def refersTo(arg: untpd.Tree, param: untpd.ValDef): Boolean = arg match {
+    def refersTo(arg: untpd.Tree, param: untpd.ValDef): Boolean = arg match
       case Ident(name) => name == param.name
+      case Typed(arg1, _) if untpd.isWildcardStarArg(arg) => refersTo(arg1, param)
       case _ => false
-    }
 
     /** If parameter `param` appears exactly once as an argument in `args`,
      *  the singleton list consisting of its position in `args`, otherwise `Nil`.
@@ -1307,41 +1411,7 @@ class Typer extends Namer
       case _ =>
     }
 
-    val (protoFormals, resultTpt) = decomposeProtoFunction(pt, params.length, tree)
-
-    /** The inferred parameter type for a parameter in a lambda that does
-     *  not have an explicit type given.
-     *  An inferred parameter type I has two possible sources:
-     *   - the type S known from the context
-     *   - the "target type" T known from the callee `f` if the lambda is of a form like `x => f(x)`
-     *  If `T` exists, we know that `S <: I <: T`.
-     *
-     *  The inference makes three attempts:
-     *
-     *    1. If the expected type `S` is already fully defined under ForceDegree.failBottom
-     *       pick this one.
-     *    2. Compute the target type `T` and make it known that `S <: T`.
-     *       If the expected type `S` can be fully defined under ForceDegree.flipBottom,
-     *       pick this one (this might use the fact that S <: T for an upper approximation).
-     *    3. Otherwise, if the target type `T` can be fully defined under ForceDegree.flipBottom,
-     *       pick this one.
-     *
-     *  If all attempts fail, issue a "missing parameter type" error.
-     */
-    def inferredParamType(param: untpd.ValDef, formal: Type): Type =
-      if isFullyDefined(formal, ForceDegree.failBottom) then return formal
-      val target = calleeType.widen match
-        case mtpe: MethodType =>
-          val pos = paramIndex(param.name)
-          if pos < mtpe.paramInfos.length then
-            val ptype = mtpe.paramInfos(pos)
-            if ptype.isRepeatedParam then NoType else ptype
-          else NoType
-        case _ => NoType
-      if target.exists then formal <:< target
-      if isFullyDefined(formal, ForceDegree.flipBottom) then formal
-      else if target.exists && isFullyDefined(target, ForceDegree.flipBottom) then target
-      else errorType(AnonymousFunctionMissingParamType(param, params, tree, formal), param.srcPos)
+    val (protoFormals, resultTpt) = decomposeProtoFunction(pt, params.length, tree.srcPos)
 
     def protoFormal(i: Int): Type =
       if (protoFormals.length == params.length) protoFormals(i)
@@ -1367,9 +1437,19 @@ class Typer extends Namer
         val inferredParams: List[untpd.ValDef] =
           for ((param, i) <- params.zipWithIndex) yield
             if (!param.tpt.isEmpty) param
-            else cpy.ValDef(param)(
-              tpt = untpd.TypeTree(
-                inferredParamType(param, protoFormal(i)).translateFromRepeated(toArray = false)))
+            else
+              val formal = protoFormal(i)
+              val knownFormal = isFullyDefined(formal, ForceDegree.failBottom)
+              val paramType =
+                if knownFormal then formal
+                else inferredFromTarget(param, formal, calleeType, paramIndex)
+                  .orElse(errorType(AnonymousFunctionMissingParamType(param, tree, formal), param.srcPos))
+              val paramTpt = untpd.TypedSplice(
+                  (if knownFormal then InferredTypeTree() else untpd.TypeTree())
+                    .withType(paramType.translateFromRepeated(toArray = false))
+                    .withSpan(param.span.endPos)
+                )
+              cpy.ValDef(param)(tpt = paramTpt)
         desugar.makeClosure(inferredParams, fnBody, resultTpt, isContextual, tree.span)
       }
     typed(desugared, pt)
@@ -1382,7 +1462,7 @@ class Typer extends Namer
       if (tree.tpt.isEmpty)
         meth1.tpe.widen match {
           case mt: MethodType =>
-            pt.stripNull match {
+            pt.findFunctionType match {
               case pt @ SAMType(sam)
               if !defn.isFunctionType(pt) && mt <:< sam =>
                 // SAMs of the form C[?] where C is a class cannot be conversion targets.
@@ -1399,10 +1479,6 @@ class Typer extends Namer
                   else
                     report.error(ex"result type of lambda is an underspecified SAM type $pt", tree.srcPos)
                     pt
-                if (pt.classSymbol.isOneOf(FinalOrSealed)) {
-                  val offendingFlag = pt.classSymbol.flags & FinalOrSealed
-                  report.error(ex"lambda cannot implement $offendingFlag ${pt.classSymbol}", tree.srcPos)
-                }
                 TypeTree(targetTpe)
               case _ =>
                 if (mt.isParamDependent)
@@ -1439,7 +1515,7 @@ class Typer extends Namer
           typedMatchFinish(tree, tpd.EmptyTree, defn.ImplicitScrutineeTypeRef, cases1, pt)
         }
         else {
-          val (protoFormals, _) = decomposeProtoFunction(pt, 1, tree)
+          val (protoFormals, _) = decomposeProtoFunction(pt, 1, tree.srcPos)
           val checkMode =
             if (pt.isRef(defn.PartialFunctionClass)) desugar.MatchCheck.None
             else desugar.MatchCheck.Exhaustive
@@ -1448,8 +1524,10 @@ class Typer extends Namer
       case _ =>
         if tree.isInline then checkInInlineContext("inline match", tree.srcPos)
         val sel1 = typedExpr(tree.selector)
-        val selType = fullyDefinedType(sel1.tpe, "pattern selector", tree.span).widen
-
+        val rawSelectorTpe = fullyDefinedType(sel1.tpe, "pattern selector", tree.span)
+        val selType = rawSelectorTpe match
+          case c: ConstantType if tree.isInline => c
+          case otherTpe => otherTpe.widen
         /** Extractor for match types hidden behind an AppliedType/MatchAlias */
         object MatchTypeInDisguise {
           def unapply(tp: AppliedType): Option[MatchType] = tp match {
@@ -1488,6 +1566,11 @@ class Typer extends Namer
                   case defn.MatchCase(patternTp, _) => tpt.tpe frozen_=:= patternTp
                   case _ => false
                 }
+              case (id @ Ident(nme.WILDCARD), pt) =>
+                pt match {
+                  case defn.MatchCase(patternTp, _) => defn.AnyType frozen_=:= patternTp
+                  case _ => false
+                }
               case _ => false
             }
 
@@ -1564,9 +1647,9 @@ class Typer extends Namer
       super.transform(trt.withType(stripTypeVars(trt.tpe))) match {
         case b: Bind =>
           val sym = b.symbol
-          if (sym.name != tpnme.WILDCARD)
-            if (ctx.scope.lookup(b.name) == NoSymbol) ctx.enter(sym)
-            else report.error(new DuplicateBind(b, cdef), b.srcPos)
+          assert(sym.name != tpnme.WILDCARD)
+          if ctx.scope.lookup(b.name) == NoSymbol then ctx.enter(sym)
+          else report.error(new DuplicateBind(b, cdef), b.srcPos)
           if (!ctx.isAfterTyper) {
             val bounds = ctx.gadt.fullBounds(sym)
             if (bounds != null) sym.info = bounds
@@ -1592,7 +1675,7 @@ class Typer extends Namer
   /** Type a case. */
   def typedCase(tree: untpd.CaseDef, sel: Tree, wideSelType: Type, pt: Type)(using Context): CaseDef = {
     val originalCtx = ctx
-    val gadtCtx: Context = ctx.fresh.setFreshGADTBounds
+    val gadtCtx: Context = ctx.fresh.setFreshGADTBounds.setNewScope
 
     def caseRest(pat: Tree)(using Context) = {
       val pt1 = instantiateMatchTypeProto(pat, pt) match {
@@ -1602,6 +1685,13 @@ class Typer extends Namer
       val pat1 = indexPattern(tree).transform(pat)
       val guard1 = typedExpr(tree.guard, defn.BooleanType)
       var body1 = ensureNoLocalRefs(typedExpr(tree.body, pt1), pt1, ctx.scope.toList)
+      if ctx.gadt.isNarrowing then
+        // Store GADT constraint to later retrieve it (in PostTyper, for now).
+        // GADT constraints are necessary to correctly check bounds of type app,
+        // see tests/pos/i12226 and issue #12226. It might be possible that this
+        // will end up taking too much memory. If it does, we should just limit
+        // how much GADT constraints we infer - it's always sound to infer less.
+        pat1.putAttachment(InferredGadtConstraints, ctx.gadt)
       if (pt1.isValueType) // insert a cast if body does not conform to expected type if we disregard gadt bounds
         body1 = body1.ensureConforms(pt1)(using originalCtx)
       assignType(cpy.CaseDef(tree)(pat1, guard1, body1), pat1, body1)
@@ -1610,7 +1700,7 @@ class Typer extends Namer
     val pat1 = typedPattern(tree.pat, wideSelType)(using gadtCtx)
     caseRest(pat1)(
       using Nullables.caseContext(sel, pat1)(
-        using gadtCtx.fresh.setNewScope))
+        using gadtCtx))
   }
 
   def typedLabeled(tree: untpd.Labeled)(using Context): Labeled = {
@@ -1622,7 +1712,9 @@ class Typer extends Namer
   /** Type a case of a type match */
   def typedTypeCase(cdef: untpd.CaseDef, selType: Type, pt: Type)(using Context): CaseDef = {
     def caseRest(using Context) = {
-      val pat1 = withMode(Mode.Pattern)(checkSimpleKinded(typedType(cdef.pat)))
+      val pat1 = withMode(Mode.Pattern) {
+        checkSimpleKinded(typedType(cdef.pat, mapPatternBounds = true))
+      }
       val pat2 = indexPattern(cdef).transform(pat1)
       var body1 = typedType(cdef.body, pt)
       if !body1.isType then
@@ -1633,66 +1725,25 @@ class Typer extends Namer
     caseRest(using ctx.fresh.setFreshGADTBounds.setNewScope)
   }
 
-  def typedReturn(tree: untpd.Return)(using Context): Return = {
+  def typedReturn(tree: untpd.Return)(using Context): Return =
 
-    /** If `pt` is a context function type, its return type. If the CFT
-     * is dependent, instantiate with the parameters of the associated
-     * anonymous function.
-     * @param  paramss  the parameters of the anonymous functions
-     *                  enclosing the return expression
-     */
-    def instantiateCFT(pt: Type, paramss: => List[List[Symbol]]): Type =
-      val ift = defn.asContextFunctionType(pt)
-      if ift.exists then
-        ift.nonPrivateMember(nme.apply).info match
-          case appType: MethodType =>
-            instantiateCFT(appType.instantiate(paramss.head.map(_.termRef)), paramss.tail)
-      else pt
-
-    def returnProto(owner: Symbol): Type =
-      if (owner.isConstructor) defn.UnitType
-      else
-        // We need to get the return type of the enclosing function, with all parameters replaced
-        // by the local type and value parameters. It would be nice if we could look up that
-        // type simply in the tpt field of the enclosing function. But the tree argument in
-        // a context is an untyped tree, so we cannot extract its type.
-        def instantiateRT(info: Type, psymss: List[List[Symbol]]): Type = info match
-          case info: PolyType =>
-            instantiateRT(info.instantiate(psymss.head.map(_.typeRef)), psymss.tail)
-          case info: MethodType =>
-            instantiateRT(info.instantiate(psymss.head.map(_.termRef)), psymss.tail)
-          case info =>
-            info.widenExpr
-        val rt = instantiateRT(owner.info, owner.paramSymss)
-        def iftParamss = ctx.owner.ownersIterator
-          .filter(_.is(Method, butNot = Accessor))
-          .takeWhile(_.isAnonymousFunction)
-          .toList
-          .reverse
-          .map(_.paramSymss.head)
-        instantiateCFT(rt, iftParamss)
-
-    def enclMethInfo(cx: Context): (Tree, Type) = {
+    def enclMethInfo(cx: Context): (Tree, Type) =
       val owner = cx.owner
-      if (owner.isType) {
+      if owner.isType then
         report.error(ReturnOutsideMethodDefinition(owner), tree.srcPos)
         (EmptyTree, WildcardType)
-      }
-      else if (owner != cx.outer.owner && owner.isRealMethod)
-        if (owner.isInlineMethod)
+      else if owner != cx.outer.owner && owner.isRealMethod then
+        if owner.isInlineMethod then
           (EmptyTree, errorType(NoReturnFromInlineable(owner), tree.srcPos))
-        else if (!owner.isCompleted)
+        else if !owner.isCompleted then
           (EmptyTree, errorType(MissingReturnTypeWithReturnStatement(owner), tree.srcPos))
-        else {
-          val from = Ident(TermRef(NoPrefix, owner.asTerm))
-          val proto = returnProto(owner)
-          (from, proto)
-        }
+        else
+          (Ident(TermRef(NoPrefix, owner.asTerm)), owner.returnProto)
       else enclMethInfo(cx.outer)
-    }
+
     val (from, proto) =
-      if (tree.from.isEmpty) enclMethInfo(ctx)
-      else {
+      if tree.from.isEmpty then enclMethInfo(ctx)
+      else
         val from = tree.from.asInstanceOf[tpd.Tree]
         val proto =
           if (ctx.erasedTypes) from.symbol.info.finalResultType
@@ -1700,10 +1751,9 @@ class Typer extends Namer
                             // because we do not know the internal type params and method params.
                             // Hence no adaptation is possible, and we assume WildcardType as prototype.
         (from, proto)
-      }
     val expr1 = typedExpr(tree.expr orElse untpd.unitLiteral.withSpan(tree.span), proto)
     assignType(cpy.Return(tree)(expr1, from))
-  }
+  end typedReturn
 
   def typedWhileDo(tree: untpd.WhileDo)(using Context): Tree =
     inContext(Nullables.whileContext(tree.span)) {
@@ -1715,10 +1765,38 @@ class Typer extends Namer
         .withNotNullInfo(body1.notNullInfo.retractedInfo.seq(cond1.notNullInfoIf(false)))
     }
 
+  /** Add givens reflecting `CanThrow` capabilities for all checked exceptions matched
+   *  by `cases`. The givens appear in nested blocks with earlier cases leading to
+   *  more deeply nested givens. This way, given priority will be the same as pattern priority.
+   *  The functionality is enabled if the experimental.saferExceptions language feature is enabled.
+   */
+  def addCanThrowCapabilities(expr: untpd.Tree, cases: List[CaseDef])(using Context): untpd.Tree =
+    def makeCanThrow(tp: Type): untpd.Tree =
+      untpd.ValDef(
+          EvidenceParamName.fresh(),
+          untpd.TypeTree(defn.CanThrowClass.typeRef.appliedTo(tp)),
+          untpd.ref(defn.Compiletime_erasedValue))
+        .withFlags(Given | Final | Erased)
+        .withSpan(expr.span)
+    val caughtExceptions =
+      if Feature.enabled(Feature.saferExceptions) then
+        for
+          CaseDef(pat, guard, _) <- cases
+          if pat.tpe.widen.isCheckedException
+        yield
+          checkCatch(pat, guard)
+          pat.tpe.widen
+      else Seq.empty
+
+    if caughtExceptions.isEmpty then expr
+    else
+      val capabilityProof = caughtExceptions.reduce(OrType(_, _, true))
+      untpd.Block(makeCanThrow(capabilityProof), expr)
+
   def typedTry(tree: untpd.Try, pt: Type)(using Context): Try = {
     val expr2 :: cases2x = harmonic(harmonize, pt) {
-      val expr1 = typed(tree.expr, pt.dropIfProto)
       val cases1 = typedCases(tree.cases, EmptyTree, defn.ThrowableType, pt.dropIfProto)
+      val expr1 = typed(addCanThrowCapabilities(tree.expr, cases1), pt.dropIfProto)
       expr1 :: cases1
     }
     val finalizer1 = typed(tree.finalizer, defn.UnitType)
@@ -1737,6 +1815,7 @@ class Typer extends Namer
 
   def typedThrow(tree: untpd.Throw)(using Context): Tree = {
     val expr1 = typed(tree.expr, defn.ThrowableType)
+    checkCanThrow(expr1.tpe.widen, tree.span)
     Throw(expr1).withSpan(tree.span)
   }
 
@@ -1776,8 +1855,15 @@ class Typer extends Namer
         bindings1, expansion1)
   }
 
+  def completeTypeTree(tree: untpd.TypeTree, pt: Type, original: untpd.Tree)(using Context): TypeTree =
+    tree.withSpan(original.span).withAttachmentsFrom(original)
+      .withType(
+        if isFullyDefined(pt, ForceDegree.flipBottom) then pt
+        else if ctx.reporter.errorsReported then UnspecifiedErrorType
+        else errorType(i"cannot infer type; expected type $pt is not fully defined", tree.srcPos))
+
   def typedTypeTree(tree: untpd.TypeTree, pt: Type)(using Context): Tree =
-    tree match {
+    tree match
       case tree: untpd.DerivedTypeTree =>
         tree.ensureCompletions
         tree.getAttachment(untpd.OriginalSymbol) match {
@@ -1791,11 +1877,7 @@ class Typer extends Namer
             errorTree(tree, "Something's wrong: missing original symbol for type tree")
         }
       case _ =>
-        tree.withType(
-          if (isFullyDefined(pt, ForceDegree.flipBottom)) pt
-          else if (ctx.reporter.errorsReported) UnspecifiedErrorType
-          else errorType(i"cannot infer type; expected type $pt is not fully defined", tree.srcPos))
-    }
+        completeTypeTree(InferredTypeTree(), pt, tree)
 
   def typedSingletonTypeTree(tree: untpd.SingletonTypeTree)(using Context): SingletonTypeTree = {
     val ref1 = typedExpr(tree.ref)
@@ -1832,7 +1914,7 @@ class Typer extends Namer
   def typedAppliedTypeTree(tree: untpd.AppliedTypeTree)(using Context): Tree = {
     tree.args match
       case arg :: _ if arg.isTerm =>
-        if dependentEnabled then
+        if Feature.dependentEnabled then
           return errorTree(tree, i"Not yet implemented: T(...)")
         else
           return errorTree(tree, dependentStr)
@@ -1872,8 +1954,7 @@ class Typer extends Namer
             arg match {
               case untpd.WildcardTypeBoundsTree()
               if tparam.paramInfo.isLambdaSub &&
-                 tpt1.tpe.typeParamSymbols.nonEmpty &&
-                 !ctx.mode.is(Mode.Pattern) =>
+                 tpt1.tpe.typeParamSymbols.nonEmpty =>
                 // An unbounded `_` automatically adapts to type parameter bounds. This means:
                 // If we have wildcard application C[?], where `C` is a class replace
                 // with C[? >: L <: H] where `L` and `H` are the bounds of the corresponding
@@ -1882,7 +1963,7 @@ class Typer extends Namer
                 // wildcard identifiers `_` instead.
                 TypeTree(tparamBounds).withSpan(arg.span)
               case _ =>
-                typed(desugaredArg, argPt)
+                typedType(desugaredArg, argPt, mapPatternBounds = true)
             }
           else desugaredArg.withType(UnspecifiedErrorType)
         }
@@ -1898,14 +1979,20 @@ class Typer extends Namer
       }
       var checkedArgs = preCheckKinds(args1, paramBounds)
         // check that arguments conform to bounds is done in phase PostTyper
-      if (tpt1.symbol == defn.andType)
+      val tycon = tpt1.symbol
+      if (tycon == defn.andType)
         checkedArgs = checkedArgs.mapconserve(arg =>
           checkSimpleKinded(checkNoWildcard(arg)))
-      else if (tpt1.symbol == defn.orType)
+      else if (tycon == defn.orType)
         checkedArgs = checkedArgs.mapconserve(arg =>
           checkSimpleKinded(checkNoWildcard(arg)))
+      else if tycon == defn.throwsAlias
+          && checkedArgs.length == 2
+          && checkedArgs(1).tpe.derivesFrom(defn.RuntimeExceptionClass)
+      then
+        report.error(em"throws clause cannot be defined for RuntimeException", checkedArgs(1).srcPos)
       else if (ctx.isJava)
-        if (tpt1.symbol eq defn.ArrayClass) then
+        if tycon eq defn.ArrayClass then
           checkedArgs match {
             case List(arg) =>
               val elemtp = arg.tpe.translateJavaArrayElementType
@@ -1929,7 +2016,7 @@ class Typer extends Namer
     typeIndexedLambdaTypeTree(tree, tparams, body)
 
   def typedTermLambdaTypeTree(tree: untpd.TermLambdaTypeTree)(using Context): Tree =
-    if dependentEnabled then
+    if Feature.dependentEnabled then
       errorTree(tree, i"Not yet implemented: (...) =>> ...")
     else
       errorTree(tree, dependentStr)
@@ -1949,35 +2036,18 @@ class Typer extends Namer
     assignType(cpy.ByNameTypeTree(tree)(result1), result1)
   }
 
-  def typedTypeBoundsTree(tree: untpd.TypeBoundsTree, pt: Type)(using Context): Tree = {
+  def typedTypeBoundsTree(tree: untpd.TypeBoundsTree, pt: Type)(using Context): Tree =
     val TypeBoundsTree(lo, hi, alias) = tree
     val lo1 = typed(lo)
     val hi1 = typed(hi)
     val alias1 = typed(alias)
-
     val lo2 = if (lo1.isEmpty) typed(untpd.TypeTree(defn.NothingType)) else lo1
     val hi2 = if (hi1.isEmpty) typed(untpd.TypeTree(defn.AnyType)) else hi1
-
     if !alias1.isEmpty then
       val bounds = TypeBounds(lo2.tpe, hi2.tpe)
       if !bounds.contains(alias1.tpe) then
         report.error(em"type ${alias1.tpe} outside bounds $bounds", tree.srcPos)
-
-    val tree1 = assignType(cpy.TypeBoundsTree(tree)(lo2, hi2, alias1), lo2, hi2, alias1)
-    if (ctx.mode.is(Mode.Pattern))
-      // Associate a pattern-bound type symbol with the wildcard.
-      // The bounds of the type symbol can be constrained when comparing a pattern type
-      // with an expected type in typedTyped. The type symbol and the defining Bind node
-      // are eliminated once the enclosing pattern has been typechecked; see `indexPattern`
-      // in `typedCase`.
-      //val ptt = if (lo.isEmpty && hi.isEmpty) pt else
-      if (ctx.isAfterTyper) tree1
-      else {
-        val wildcardSym = newPatternBoundSymbol(tpnme.WILDCARD, tree1.tpe & pt, tree.span)
-        untpd.Bind(tpnme.WILDCARD, tree1).withType(wildcardSym.typeRef)
-      }
-    else tree1
-  }
+    assignType(cpy.TypeBoundsTree(tree)(lo2, hi2, alias1), lo2, hi2, alias1)
 
   def typedBind(tree: untpd.Bind, pt: Type)(using Context): Tree = {
     if !isFullyDefined(pt, ForceDegree.all) then
@@ -2054,10 +2124,21 @@ class Typer extends Namer
   def annotContext(mdef: untpd.Tree, sym: Symbol)(using Context): Context = {
     def isInner(owner: Symbol) = owner == sym || sym.is(Param) && owner == sym.owner
     val outer = ctx.outersIterator.dropWhile(c => isInner(c.owner)).next()
-    outer.property(ExprOwner) match {
+    var adjusted = outer.property(ExprOwner) match {
       case Some(exprOwner) if outer.owner.isClass => outer.exprContext(mdef, exprOwner)
       case _ => outer
     }
+    sym.owner.infoOrCompleter match
+      case completer: Namer#Completer if sym.is(Param) =>
+        val tparams = completer.completerTypeParams(sym)
+        if tparams.nonEmpty then
+          // Create a new local context with a dummy owner and a scope containing the
+          // type parameters of the enclosing method or class. Thus annotations can see
+          // these type parameters. See i12953.scala for a test case.
+          val dummyOwner = newLocalDummy(sym.owner)
+          adjusted = adjusted.fresh.setOwner(dummyOwner).setScope(newScopeWith(tparams*))
+      case _ =>
+    adjusted
   }
 
   def completeAnnotations(mdef: untpd.MemberDef, sym: Symbol)(using Context): Unit = {
@@ -2066,12 +2147,43 @@ class Typer extends Namer
     lazy val annotCtx = annotContext(mdef, sym)
     // necessary in order to mark the typed ahead annotations as definitely typed:
     for (annot <- mdef.mods.annotations)
-      checkAnnotApplicable(typedAnnotation(annot)(using annotCtx), sym)
+      val annot1 = typedAnnotation(annot)(using annotCtx)
+      checkAnnotApplicable(annot1, sym)
+      if Annotations.annotClass(annot1) == defn.NowarnAnnot then
+        registerNowarn(annot1, mdef)
   }
 
   def typedAnnotation(annot: untpd.Tree)(using Context): Tree =
     checkAnnotArgs(typed(annot, defn.AnnotationClass.typeRef))
 
+  def registerNowarn(tree: Tree, mdef: untpd.Tree)(using Context): Unit =
+    val annot = Annotations.Annotation(tree)
+    def argPos = annot.argument(0).getOrElse(tree).sourcePos
+    var verbose = false
+    val filters = annot.argumentConstantString(0) match
+      case None => annot.argument(0) match
+        case Some(t: Select) if t.name.is(DefaultGetterName) =>
+          // default argument used for `@nowarn` and `@nowarn()`
+          List(MessageFilter.Any)
+        case _ =>
+          report.warning(s"filter needs to be a compile-time constant string", argPos)
+          List(MessageFilter.None)
+      case Some("") =>
+        List(MessageFilter.Any)
+      case Some("verbose") | Some("v") =>
+        verbose = true
+        List(MessageFilter.Any)
+      case Some(s) =>
+        WConf.parseFilters(s).left.map(parseErrors =>
+          report.warning (s"Invalid message filter\n${parseErrors.mkString ("\n")}", argPos)
+            List(MessageFilter.None)
+        ).merge
+    val range = mdef.sourcePos
+    val sup = Suppression(tree.sourcePos, filters, range.start, range.end, verbose)
+    // invalid suppressions, don't report as unused
+    if filters == List(MessageFilter.None) then sup.markUsed()
+    ctx.run.suppressions.addSuppression(sup)
+
   def typedValDef(vdef: untpd.ValDef, sym: Symbol)(using Context): Tree = {
     val ValDef(name, tpt, _) = vdef
     completeAnnotations(vdef, sym)
@@ -2153,6 +2265,8 @@ class Typer extends Namer
       PrepareInlineable.registerInlineInfo(sym, rhsToInline)
 
     if sym.isConstructor then
+      if sym.is(Inline) then
+        report.error("constructors cannot be `inline`", ddef)
       if sym.isPrimaryConstructor then
         if sym.owner.is(Case) then
           for
@@ -2269,11 +2383,20 @@ class Typer extends Namer
           result = maybeCall(result, psym)
       }
       else checkParentCall(result, cls)
-      checkTraitInheritance(psym, cls, tree.srcPos)
       if (cls is Case) checkCaseInheritance(psym, cls, tree.srcPos)
       result
     }
 
+    def ensureCorrectSuperClass(): Unit =
+      val parents0 = cls.classInfo.declaredParents
+      parents0 match
+        case AnnotatedType(sc, ann) :: rest if ann.symbol == defn.ProvisionalSuperClassAnnot =>
+          val parents1 = ensureFirstIsClass(cls, rest)
+          if parents1.head ne sc then
+            typr.println(i"improved provisional superclass $sc to ${parents1.head}")
+          cls.info = cls.classInfo.derivedClassInfo(declaredParents = parents1)
+        case _ =>
+
     /** Augment `ptrees` to have the same class symbols as `parents`. Generate TypeTrees
      *  or New trees to fill in any parents for which no tree exists yet.
      */
@@ -2313,6 +2436,7 @@ class Typer extends Namer
       }
     }
 
+    ensureCorrectSuperClass()
     completeAnnotations(cdef, cls)
     val constr1 = typed(constr).asInstanceOf[DefDef]
     val parents0 = parentTrees(
@@ -2345,7 +2469,7 @@ class Typer extends Namer
         ctx.phase.isTyper &&
         cdef1.symbol.ne(defn.DynamicClass) &&
         cdef1.tpe.derivesFrom(defn.DynamicClass) &&
-        !dynamicsEnabled
+        !Feature.dynamicsEnabled
       if (reportDynamicInheritance) {
         val isRequired = parents1.exists(_.tpe.isRef(defn.DynamicClass))
         report.featureWarning(nme.dynamics.toString, "extension of type scala.Dynamic", cls, isRequired, cdef.srcPos)
@@ -2385,7 +2509,7 @@ class Typer extends Namer
       // 4. Polymorphic type defs override nothing.
 
   protected def addAccessorDefs(cls: Symbol, body: List[Tree])(using Context): List[Tree] =
-    ctx.compilationUnit.inlineAccessors.addAccessorDefs(cls, body)
+    PrepareInlineable.addAccessorDefs(cls, body)
 
   /** If this is a real class, make sure its first parent is a
    *  constructor call. Cannot simply use a type. Overridden in ReTyper.
@@ -2435,8 +2559,8 @@ class Typer extends Namer
                 |The selector is not a member of an object or package.""")
     else typd(imp.expr, AnySelectionProto)
 
-  def typedImport(imp: untpd.Import, sym: Symbol)(using Context): Import =
-    val expr1 = typedImportQualifier(imp, typedExpr)
+  def typedImport(imp: untpd.Import, sym: Symbol)(using Context): Tree =
+    val expr1 = typedImportQualifier(imp, typedExpr(_, _)(using ctx.withOwner(sym)))
     checkLegalImportPath(expr1)
     val selectors1 = typedSelectors(imp.selectors)
     assignType(cpy.Import(imp)(expr1, selectors1), sym)
@@ -2453,6 +2577,10 @@ class Typer extends Namer
     pid1 match
       case pid1: RefTree if pkg.is(Package) =>
         inContext(ctx.packageContext(tree, pkg)) {
+          // If it exists, complete the class containing the top-level definitions
+          // before typing any statement in the package to avoid cycles as in i13669.scala
+          val topLevelClassName = desugar.packageObjectName(ctx.source).moduleClassName
+          pkg.moduleClass.info.decls.lookup(topLevelClassName).ensureCompleted()
           var stats1 = typedStats(tree.stats, pkg.moduleClass)._1
           if (!ctx.isAfterTyper)
             stats1 = stats1 ++ typedBlockStats(MainProxies.mainProxies(stats1))._1
@@ -2467,6 +2595,8 @@ class Typer extends Namer
 
   def typedAnnotated(tree: untpd.Annotated, pt: Type)(using Context): Tree = {
     val annot1 = typedExpr(tree.annot, defn.AnnotationClass.typeRef)
+    if Annotations.annotClass(annot1) == defn.NowarnAnnot then
+      registerNowarn(annot1, tree)
     val arg1 = typed(tree.arg, pt)
     if (ctx.mode is Mode.Type) {
       if arg1.isType then
@@ -2558,7 +2688,10 @@ class Typer extends Namer
     val untpd.InfixOp(l, op, r) = tree
     val result =
       if (ctx.mode.is(Mode.Type))
-        typedAppliedTypeTree(cpy.AppliedTypeTree(tree)(op, l :: r :: Nil))
+        typedAppliedTypeTree(
+          if op.name == tpnme.throws && Feature.enabled(Feature.saferExceptions)
+          then desugar.throws(l, op, r)
+          else cpy.AppliedTypeTree(tree)(op, l :: r :: Nil))
       else if (ctx.mode.is(Mode.Pattern))
         typedUnApply(cpy.Apply(tree)(op, l :: r :: Nil), pt)
       else {
@@ -2576,7 +2709,10 @@ class Typer extends Namer
           wrapDefs(defs, lift(app))
         else app
       }
-    checkValidInfix(tree, result.symbol)
+    // issue 10383: we stripBlock because e.g. default arguments desugar to blocks during typing,
+    // and the block itself doesn't have a symbol (because a Block isn't a ProxyTree),
+    // but the last expression in the block does have the right symbol
+    checkValidInfix(tree, stripBlock(result).symbol)
     result
   }
 
@@ -2589,7 +2725,9 @@ class Typer extends Namer
       val pts =
         if (arity == pt.tupleArity) pt.tupleElementTypes
         else List.fill(arity)(defn.AnyType)
-      val elems = tree.trees.lazyZip(pts).map(typed(_, _))
+      val elems = tree.trees.lazyZip(pts).map(
+        if ctx.mode.is(Mode.Type) then typedType(_, _, mapPatternBounds = true)
+        else typed(_, _))
       if (ctx.mode.is(Mode.Type))
         elems.foldRight(TypeTree(defn.EmptyTupleModule.termRef): Tree)((elemTpt, elemTpts) =>
           AppliedTypeTree(TypeTree(defn.PairClass.typeRef), List(elemTpt, elemTpts)))
@@ -2709,7 +2847,7 @@ class Typer extends Namer
           case tree: untpd.TypedSplice => typedTypedSplice(tree)
           case tree: untpd.UnApply => typedUnApply(tree, pt)
           case tree: untpd.Tuple => typedTuple(tree, pt)
-          case tree: untpd.DependentTypeTree => typed(untpd.TypeTree().withSpan(tree.span), pt)
+          case tree: untpd.DependentTypeTree => completeTypeTree(untpd.TypeTree(), pt, tree)
           case tree: untpd.InfixOp => typedInfixOp(tree, pt)
           case tree: untpd.ParsedTry => typedTry(tree, pt)
           case tree @ untpd.PostfixOp(qual, Ident(nme.WILDCARD)) => typedAsFunction(tree, pt)
@@ -2717,6 +2855,7 @@ class Typer extends Namer
           case tree: untpd.Quote => typedQuote(tree, pt)
           case tree: untpd.Splice => typedSplice(tree, pt)
           case tree: untpd.TypSplice => typedTypSplice(tree, pt)
+          case tree: untpd.MacroTree => report.error("Unexpected macro", tree.srcPos); tpd.nullLiteral  // ill-formed code may reach here
           case _ => typedUnadapted(desugar(tree), pt, locked)
         }
 
@@ -2777,7 +2916,7 @@ class Typer extends Namer
     // see tests/pos/i7778b.scala
 
     val paramTypes = {
-      val hasWildcard = formals.exists(_.existsPart(_.isInstanceOf[WildcardType], stopAtStatic = true))
+      val hasWildcard = formals.exists(_.existsPart(_.isInstanceOf[WildcardType], StopAt.Static))
       if hasWildcard then formals.map(_ => untpd.TypeTree())
       else formals.map(untpd.TypeTree)
     }
@@ -2919,8 +3058,24 @@ class Typer extends Namer
 
   def typedExpr(tree: untpd.Tree, pt: Type = WildcardType)(using Context): Tree =
     withoutMode(Mode.PatternOrTypeBits)(typed(tree, pt))
-  def typedType(tree: untpd.Tree, pt: Type = WildcardType)(using Context): Tree = // todo: retract mode between Type and Pattern?
-    withMode(Mode.Type)(typed(tree, pt))
+
+  def typedType(tree: untpd.Tree, pt: Type = WildcardType, mapPatternBounds: Boolean = false)(using Context): Tree =
+    val tree1 = withMode(Mode.Type) { typed(tree, pt) }
+    if mapPatternBounds && ctx.mode.is(Mode.Pattern) && !ctx.isAfterTyper then
+      tree1 match
+        case tree1: TypeBoundsTree =>
+          // Associate a pattern-bound type symbol with the wildcard.
+          // The bounds of the type symbol can be constrained when comparing a pattern type
+          // with an expected type in typedTyped. The type symbol and the defining Bind node
+          // are eliminated once the enclosing pattern has been typechecked; see `indexPattern`
+          // in `typedCase`.
+          val boundName = WildcardParamName.fresh().toTypeName
+          val wildcardSym = newPatternBoundSymbol(boundName, tree1.tpe & pt, tree.span)
+          untpd.Bind(boundName, tree1).withType(wildcardSym.typeRef)
+        case tree1 =>
+          tree1
+    else tree1
+
   def typedPattern(tree: untpd.Tree, selType: Type = WildcardType)(using Context): Tree =
     withMode(Mode.Pattern)(typed(tree, selType))
 
@@ -3019,24 +3174,34 @@ class Typer extends Namer
     }
   }
 
-  /** If this tree is a select node `qual.name` that does not conform to `pt`,
-   *  try to insert an implicit conversion `c` around `qual` so that
-   *  `c(qual).name` conforms to `pt`.
+  /** If this tree is a select node `qual.name` (possibly applied to type variables)
+   *  that does not conform to `pt`, try two mitigations:
+   *   1. Instantiate any TypeVars in the widened type of `tree` with their lower bounds.
+   *   2. Try to insert an implicit conversion `c` around `qual` so that
+   *   `c(qual).name` conforms to `pt`.
    */
   def tryInsertImplicitOnQualifier(tree: Tree, pt: Type, locked: TypeVars)(using Context): Option[Tree] = trace(i"try insert impl on qualifier $tree $pt") {
-    tree match {
+    tree match
       case tree @ Select(qual, name) if name != nme.CONSTRUCTOR =>
-        val selProto = SelectionProto(name, pt, NoViewsAllowed, privateOK = false)
-        if selProto.isMatchedBy(qual.tpe) then None
+        if couldInstantiateTypeVar(qual.tpe.widen, applied = true)
+        then
+          Some(adapt(tree, pt, locked))
         else
-          tryEither {
-            val tree1 = tryExtensionOrConversion(tree, pt, pt, qual, locked, NoViewsAllowed, privateOK = false)
-            if tree1.isEmpty then None
-            else Some(adapt(tree1, pt, locked))
-          } { (_, _) => None
-          }
+          val selProto = SelectionProto(name, pt, NoViewsAllowed, privateOK = false)
+          if selProto.isMatchedBy(qual.tpe) || tree.hasAttachment(InsertedImplicitOnQualifier) then
+            None
+          else
+            tryEither {
+              val tree1 = tryExtensionOrConversion(tree, pt, pt, qual, locked, NoViewsAllowed, inSelect = false)
+              if tree1.isEmpty then None
+              else
+                tree1.putAttachment(InsertedImplicitOnQualifier, ())
+                Some(adapt(tree1, pt, locked))
+            } { (_, _) => None
+            }
+      case TypeApply(fn, args) if args.forall(_.isInstanceOf[untpd.InferredTypeTree]) =>
+        tryInsertImplicitOnQualifier(fn, pt, locked)
       case _ => None
-    }
   }
 
   /** Given a selection `qual.name`, try to convert to an extension method
@@ -3044,10 +3209,10 @@ class Typer extends Namer
    *  @return The converted tree, or `EmptyTree` is not successful.
    */
   def tryExtensionOrConversion
-      (tree: untpd.Select, pt: Type, mbrProto: Type, qual: Tree, locked: TypeVars, compat: Compatibility, privateOK: Boolean)
+      (tree: untpd.Select, pt: Type, mbrProto: Type, qual: Tree, locked: TypeVars, compat: Compatibility, inSelect: Boolean)
       (using Context): Tree =
 
-    def selectionProto = SelectionProto(tree.name, mbrProto, compat, privateOK)
+    def selectionProto = SelectionProto(tree.name, mbrProto, compat, privateOK = inSelect)
 
     def tryExtension(using Context): Tree =
       findRef(tree.name, WildcardType, ExtensionMethod, EmptyFlags, qual.srcPos) match
@@ -3067,7 +3232,10 @@ class Typer extends Namer
       if !app.isEmpty && !nestedCtx.reporter.hasErrors then
         nestedCtx.typerState.commit()
         return app
-      for err <- nestedCtx.reporter.allErrors.take(1) do
+      val errs = nestedCtx.reporter.allErrors
+      val remembered = // report AmbiguousReferences as priority, otherwise last error
+        (errs.filter(_.msg.isInstanceOf[AmbiguousReference]) ++ errs).take(1)
+      for err <- remembered do
         rememberSearchFailure(qual,
           SearchFailure(app.withType(FailedExtension(app, selectionProto, err.msg))))
     catch case ex: TypeError => nestedFailure(ex)
@@ -3085,12 +3253,13 @@ class Typer extends Namer
                 return typedSelect(tree, pt, found)
             case failure: SearchFailure =>
               if failure.isAmbiguous then
-                return (
-                  if canDefineFurther(qual.tpe.widen) then
-                    tryExtensionOrConversion(tree, pt, mbrProto, qual, locked, compat, privateOK)
+                return
+                  if !inSelect // in a selection we will do the canDefineFurther afterwards
+                     && canDefineFurther(qual.tpe.widen)
+                  then
+                    tryExtensionOrConversion(tree, pt, mbrProto, qual, locked, compat, inSelect)
                   else
                     err.typeMismatch(qual, selProto, failure.reason) // TODO: report NotAMember instead, but need to be aware of failure
-                )
               rememberSearchFailure(qual, failure)
         }
       catch case ex: TypeError => nestedFailure(ex)
@@ -3135,7 +3304,7 @@ class Typer extends Namer
    */
   def adapt(tree: Tree, pt: Type, locked: TypeVars, tryGadtHealing: Boolean = true)(using Context): Tree =
     try
-      trace(i"adapting $tree to $pt ${if (tryGadtHealing) "" else "(tryGadtHealing=false)" }\n", typr, show = true) {
+      trace(i"adapting $tree to $pt ${if (tryGadtHealing) "" else "(tryGadtHealing=false)" }", typr, show = true) {
         record("adapt")
         adapt1(tree, pt, locked, tryGadtHealing)
       }
@@ -3202,37 +3371,6 @@ class Typer extends Namer
       }
     }
 
-    def isUnary(tp: Type): Boolean = tp match {
-      case tp: MethodicType =>
-        tp.firstParamTypes match {
-          case ptype :: Nil => !ptype.isRepeatedParam
-          case _ => false
-        }
-      case tp: TermRef =>
-        tp.denot.alternatives.forall(alt => isUnary(alt.info))
-      case _ =>
-        false
-    }
-
-    /** Should we tuple or untuple the argument before application?
-     *  If auto-tupling is enabled then
-     *
-     *   - we tuple n-ary arguments where n > 0 if the function consists
-     *     only of unary alternatives
-     *   - we untuple tuple arguments of infix operations if the function
-     *     does not consist only of unary alternatives.
-     */
-    def needsTupledDual(funType: Type, pt: FunProto): Boolean =
-      pt.args match
-        case untpd.Tuple(elems) :: Nil =>
-          elems.length > 1
-          && pt.applyKind == ApplyKind.InfixTuple
-          && !isUnary(funType)
-        case args =>
-          args.lengthCompare(1) > 0
-          && isUnary(funType)
-          && autoTuplingEnabled
-
     def adaptToArgs(wtp: Type, pt: FunProto): Tree = wtp match {
       case wtp: MethodOrPoly =>
         def methodStr = methPart(tree).symbol.showLocated
@@ -3271,7 +3409,7 @@ class Typer extends Namer
         replaceSingletons(tp)
       }
       wtp.paramInfos.foreach(instantiate)
-      val constr = ctx.typerState.constraint
+      val saved = ctx.typerState.snapshot()
 
       def dummyArg(tp: Type) = untpd.Ident(nme.???).withTypeUnchecked(tp)
 
@@ -3371,8 +3509,9 @@ class Typer extends Namer
         if (propFail.exists) {
           // If there are several arguments, some arguments might already
           // have influenced the context, binding variables, but later ones
-          // might fail. In that case the constraint needs to be reset.
-          ctx.typerState.constraint = constr
+          // might fail. In that case the constraint and instantiated variables
+          // need to be reset.
+          ctx.typerState.resetTo(saved)
 
           // If method has default params, fall back to regular application
           // where all inferred implicits are passed as named args.
@@ -3439,7 +3578,7 @@ class Typer extends Namer
       def isAutoApplied(sym: Symbol): Boolean =
         sym.isConstructor
         || sym.matchNullaryLoosely
-        || warnOnMigration(MissingEmptyArgumentList(sym.show), tree.srcPos)
+        || Feature.warnOnMigration(MissingEmptyArgumentList(sym.show), tree.srcPos)
            && { patch(tree.span.endPos, "()"); true }
 
       // Reasons NOT to eta expand:
@@ -3536,13 +3675,33 @@ class Typer extends Namer
                 typr.println(i"adapt to subtype ${tree.tpe} !<:< $pt")
                 //typr.println(TypeComparer.explained(tree.tpe <:< pt))
                 adaptToSubType(wtp)
-          case CompareResult.OKwithGADTUsed if pt.isValueType =>
+          case CompareResult.OKwithGADTUsed
+          if pt.isValueType
+             && !inContext(ctx.fresh.setGadt(EmptyGadtConstraint)) {
+               val res = (tree.tpe.widenExpr frozen_<:< pt)
+               if res then
+                 // we overshot; a cast is not needed, after all.
+                 gadts.println(i"unnecessary GADTused for $tree: ${tree.tpe.widenExpr} vs $pt in ${ctx.source}")
+               res
+              } =>
             // Insert an explicit cast, so that -Ycheck in later phases succeeds.
             // I suspect, but am not 100% sure that this might affect inferred types,
             // if the expected type is a supertype of the GADT bound. It would be good to come
             // up with a test case for this.
-            tree.cast(pt)
+            val target =
+              if tree.tpe.isSingleton then
+                val conj = AndType(tree.tpe, pt)
+                if tree.tpe.isStable && !conj.isStable then
+                  // this is needed for -Ycheck. Without the annotation Ycheck will
+                  // skolemize the result type which will lead to different types before
+                  // and after checking. See i11955.scala.
+                  AnnotatedType(conj, Annotation(defn.UncheckedStableAnnot))
+                else conj
+              else pt
+            gadts.println(i"insert GADT cast from $tree to $target")
+            tree.cast(target)
           case _ =>
+            //typr.println(i"OK ${tree.tpe}\n${TypeComparer.explained(_.isSubType(tree.tpe, pt))}") // uncomment for unexpected successes
             tree
     }
 
@@ -3632,6 +3791,12 @@ class Typer extends Namer
         case ConstantType(x) =>
           val converted = x.convertTo(pt)
           if converted != null && (converted ne x) then
+            val cls = pt.classSymbol
+            if x.tag == IntTag && cls == defn.FloatClass && x.intValue.toFloat.toInt != x.intValue
+              || x.tag == LongTag && cls == defn.FloatClass  && x.longValue.toFloat.toLong != x.longValue
+              || x.tag == LongTag && cls == defn.DoubleClass && x.longValue.toDouble.toLong != x.longValue
+            then
+              report.warning(LossyWideningConstantConversion(x.tpe, pt), tree.srcPos)
             return adaptConstant(tree, ConstantType(converted))
         case _ =>
 
@@ -3672,13 +3837,22 @@ class Typer extends Namer
         if target <:< pt then
           return readapt(tree.cast(target))
 
+      // if unsafeNulls is enabled, try to strip nulls from Java function calls
+      if Nullables.unsafeNullsEnabled then
+        tree match
+          case _: Apply | _: Select if tree.symbol.is(JavaDefined) =>
+            wtp match
+              case OrNull(wtp1) => return readapt(tree.cast(wtp1))
+              case _ =>
+          case _ =>
+
       def recover(failure: SearchFailureType) =
-        if canDefineFurther(wtp) then readapt(tree)
+        if canDefineFurther(wtp) || canDefineFurther(pt) then readapt(tree)
         else err.typeMismatch(tree, pt, failure)
 
       pt match
         case pt: SelectionProto =>
-          if ctx.gadt.nonEmpty then
+          if ctx.gadt.isNarrowing then
             // try GADT approximation if we're trying to select a member
             // Member lookup cannot take GADTs into account b/c of cache, so we
             // approximate types based on GADT constraints instead. For an example,
@@ -3688,8 +3862,14 @@ class Typer extends Namer
             gadts.println(i"GADT-approximated $wtp ~~ $gadtApprox")
             if pt.isMatchedBy(gadtApprox) then
               gadts.println(i"Member selection healed by GADT approximation")
-              tpd.Typed(tree, TypeTree(gadtApprox))
+              tree.cast(gadtApprox)
             else tree
+          else if tree.tpe.derivesFrom(defn.PairClass) && !defn.isTupleNType(tree.tpe.widenDealias) then
+            // If this is a generic tuple we need to cast it to make the TupleN/ members accessible.
+            // This only works for generic tuples of know size up to 22.
+            defn.tupleTypes(tree.tpe.widenTermRefExpr, Definitions.MaxTupleArity) match
+              case Some(elems) => tree.cast(defn.tupleType(elems))
+              case None => tree
           else tree // other adaptations for selections are handled in typedSelect
         case _ if ctx.mode.is(Mode.ImplicitsEnabled) && tree.tpe.isValueType =>
           checkConversionsSpecific(pt, tree.srcPos)
@@ -3770,7 +3950,7 @@ class Typer extends Namer
         case ref: TermRef =>
           pt match {
             case pt: FunProto
-            if needsTupledDual(ref, pt) && autoTuplingEnabled =>
+            if needsTupledDual(ref, pt) && Feature.autoTuplingEnabled =>
               adapt(tree, pt.tupledDual, locked)
             case _ =>
               adaptOverloaded(ref)
@@ -3835,9 +4015,15 @@ class Typer extends Namer
 
         // approximate type params with bounds
         def approx = new ApproximatingTypeMap {
+          var alreadyExpanding: List[TypeRef] = Nil
           def apply(tp: Type) = tp.dealias match
             case tp: TypeRef if !tp.symbol.isClass =>
-              expandBounds(tp.info.bounds)
+              if alreadyExpanding contains tp then tp else
+                val saved = alreadyExpanding
+                alreadyExpanding ::= tp
+                val res = expandBounds(tp.info.bounds)
+                alreadyExpanding = saved
+                res
             case _ =>
               mapOver(tp)
         }
@@ -3859,12 +4045,12 @@ class Typer extends Namer
         }
 
         if isDefiniteNotSubtype then
-          // We could check whether `equals` is overriden.
+          // We could check whether `equals` is overridden.
           // Reasons for not doing so:
           // - it complicates the protocol
           // - such code patterns usually implies hidden errors in the code
           // - it's safe/sound to reject the code
-          report.error(TypeMismatch(tree.tpe, pt, "\npattern type is incompatible with expected type"), tree.srcPos)
+          report.error(TypeMismatch(tree.tpe, pt, Some(tree), "\npattern type is incompatible with expected type"), tree.srcPos)
         else
           val cmp =
             untpd.Apply(
@@ -3895,7 +4081,7 @@ class Typer extends Namer
         report.warning(PureExpressionInStatementPosition(original, exprOwner), original.srcPos)
 
   /** Types the body Scala 2 macro declaration `def f = macro <body>` */
-  private def typedScala2MacroBody(call: untpd.Tree)(using Context): Tree =
+  protected def typedScala2MacroBody(call: untpd.Tree)(using Context): Tree =
     // TODO check that call is to a method with valid signature
     def typedPrefix(tree: untpd.RefTree)(splice: Context ?=> Tree => Tree)(using Context): Tree = {
       tryAlternatively {
diff --git a/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala b/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala
new file mode 100644
index 000000000000..070bf9fff12f
--- /dev/null
+++ b/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala
@@ -0,0 +1,112 @@
+package dotty.tools
+package dotc
+package typer
+
+import core._
+import Phases._
+import Contexts._
+import Symbols._
+import Decorators._
+import ImportInfo.withRootImports
+import parsing.JavaParsers.JavaParser
+import parsing.Parsers.Parser
+import parsing.{Parser => ParserPhase}
+import config.Config
+import config.Printers.{typr, default}
+import util.Stats._
+import util.{ SourcePosition, NoSourcePosition }
+import scala.util.control.NonFatal
+import ast.Trees._
+
+/**
+ *
+ * @param addRootImports Set to false in the REPL. Calling [[ImportInfo.withRootImports]] on the [[Context]]
+ *                       for each [[CompilationUnit]] causes dotty.tools.repl.ScriptedTests to fail.
+ */
+class TyperPhase(addRootImports: Boolean = true) extends Phase {
+
+  override def phaseName: String = TyperPhase.name
+
+  override def description: String = TyperPhase.description
+
+  override def isTyper: Boolean = true
+
+  import ast.tpd
+
+  override def allowsImplicitSearch: Boolean = true
+
+  // Run regardless of parsing errors
+  override def isRunnable(implicit ctx: Context): Boolean = true
+
+  def enterSyms(using Context): Unit = monitor("indexing") {
+    val unit = ctx.compilationUnit
+    ctx.typer.index(unit.untpdTree)
+    typr.println("entered: " + unit.source)
+  }
+
+  def typeCheck(using Context): Unit = monitor("typechecking") {
+    try
+      val unit = ctx.compilationUnit
+      if !unit.suspended then
+        unit.tpdTree = ctx.typer.typedExpr(unit.untpdTree)
+        typr.println("typed: " + unit.source)
+        record("retained untyped trees", unit.untpdTree.treeSize)
+        record("retained typed trees after typer", unit.tpdTree.treeSize)
+        ctx.run.suppressions.reportSuspendedMessages(unit.source)
+    catch
+      case ex: CompilationUnit.SuspendException =>
+  }
+
+  def javaCheck(using Context): Unit = monitor("checking java") {
+    val unit = ctx.compilationUnit
+    if unit.isJava then
+      JavaChecks.check(unit.tpdTree)
+  }
+
+  protected def discardAfterTyper(unit: CompilationUnit)(using Context): Boolean =
+    unit.isJava || unit.suspended
+
+  override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] =
+    val unitContexts =
+      for unit <- units yield
+        val newCtx0 = ctx.fresh.setPhase(this.start).setCompilationUnit(unit)
+        val newCtx = PrepareInlineable.initContext(newCtx0)
+        report.inform(s"typing ${unit.source}")
+        if (addRootImports)
+          newCtx.withRootImports
+        else
+          newCtx
+
+    unitContexts.foreach(enterSyms(using _))
+
+    ctx.base.parserPhase match {
+      case p: ParserPhase =>
+        if p.firstXmlPos.exists && !defn.ScalaXmlPackageClass.exists then
+          report.error(
+            """To support XML literals, your project must depend on scala-xml.
+              |See https://github.com/scala/scala-xml for more information.""".stripMargin,
+            p.firstXmlPos)
+      case _ =>
+    }
+
+    unitContexts.foreach(typeCheck(using _))
+    record("total trees after typer", ast.Trees.ntrees)
+    unitContexts.foreach(javaCheck(using _)) // after typechecking to avoid cycles
+
+    val newUnits = unitContexts.map(_.compilationUnit).filterNot(discardAfterTyper)
+    ctx.run.checkSuspendedUnits(newUnits)
+    newUnits
+
+  def run(using Context): Unit = unsupported("run")
+}
+
+object TyperPhase {
+  val name: String = "typer"
+  val description: String = "type the trees"
+}
+
+@deprecated(message = "FrontEnd has been split into TyperPhase and Parser. Refer to one or the other.")
+object FrontEnd {
+  // For backwards compatibility: some plugins refer to FrontEnd so that they can schedule themselves after it.
+  val name: String = TyperPhase.name
+}
diff --git a/compiler/src/dotty/tools/dotc/typer/VarianceChecker.scala b/compiler/src/dotty/tools/dotc/typer/VarianceChecker.scala
index f0ad18ee18c5..8c796cfb6fa9 100644
--- a/compiler/src/dotty/tools/dotc/typer/VarianceChecker.scala
+++ b/compiler/src/dotty/tools/dotc/typer/VarianceChecker.scala
@@ -133,7 +133,7 @@ class VarianceChecker(using Context) {
     def apply(status: Option[VarianceError], tp: Type): Option[VarianceError] = trace(s"variance checking $tp of $base at $variance", variances) {
       try
         if (status.isDefined) status
-        else tp.normalized match {
+        else tp match {
           case tp: TypeRef =>
             val sym = tp.symbol
             if (sym.isOneOf(VarianceFlags) && base.isContainedIn(sym.owner)) checkVarianceOfSymbol(sym)
diff --git a/compiler/src/dotty/tools/dotc/util/Attachment.scala b/compiler/src/dotty/tools/dotc/util/Attachment.scala
index 582ff6da0557..8f0e5dd97dfe 100644
--- a/compiler/src/dotty/tools/dotc/util/Attachment.scala
+++ b/compiler/src/dotty/tools/dotc/util/Attachment.scala
@@ -117,7 +117,7 @@ object Attachment {
     }
 
     final def pushAttachment[V](key: Key[V], value: V)(using ctx: Context): Unit = {
-      assert(!hasAttachment(key) || ctx.reporter.errorsReported, s"duplicate attachment for key $key")
+      assert(!hasAttachment(key) || ctx.base.errorsToBeReported, s"duplicate attachment for key $key")
       next = new Link(key, value, next)
     }
 
diff --git a/compiler/src/dotty/tools/dotc/util/Chars.scala b/compiler/src/dotty/tools/dotc/util/Chars.scala
index 986b1fda58ec..4c54dc73459e 100644
--- a/compiler/src/dotty/tools/dotc/util/Chars.scala
+++ b/compiler/src/dotty/tools/dotc/util/Chars.scala
@@ -11,10 +11,10 @@ import java.lang.Character.UPPERCASE_LETTER
 /** Contains constants and classifier methods for characters */
 object Chars {
 
-  final val LF = '\u000A'
-  final val FF = '\u000C'
-  final val CR = '\u000D'
-  final val SU = '\u001A'
+  inline val LF = '\u000A'
+  inline val FF = '\u000C'
+  inline val CR = '\u000D'
+  inline val SU = '\u001A'
 
   /** Convert a character digit to an Int according to given base,
     *  -1 if no success
diff --git a/compiler/src/dotty/tools/dotc/util/CommentParsing.scala b/compiler/src/dotty/tools/dotc/util/CommentParsing.scala
index d8184c0ce5aa..c25660a6225a 100644
--- a/compiler/src/dotty/tools/dotc/util/CommentParsing.scala
+++ b/compiler/src/dotty/tools/dotc/util/CommentParsing.scala
@@ -8,11 +8,11 @@ package dotty.tools.dotc.util
 import scala.collection.mutable
 
 /** The comment parsing in `dotc` is used by both the comment cooking and the
-  * dottydoc tool.
+  * scaladoc tool.
   *
   * The comment cooking is used to expand comments with `@inheritdoc` and
   * `@define` annotations. The rest of the comment is untouched and later
-  * handled by dottydoc.
+  * handled by scaladoc.
   */
 object CommentParsing {
   import Chars._
diff --git a/compiler/src/dotty/tools/dotc/util/HashSet.scala b/compiler/src/dotty/tools/dotc/util/HashSet.scala
index e7406f9ab094..e99754c7267b 100644
--- a/compiler/src/dotty/tools/dotc/util/HashSet.scala
+++ b/compiler/src/dotty/tools/dotc/util/HashSet.scala
@@ -7,6 +7,11 @@ object HashSet:
    */
   inline val DenseLimit = 8
 
+  def from[T](xs: IterableOnce[T]): HashSet[T] =
+    val set = new HashSet[T]()
+    set ++= xs
+    set
+
 /** A hash set that allows some privileged protected access to its internals
  *  @param  initialCapacity  Indicates the initial number of slots in the hash table.
  *                           The actual number of slots is always a power of 2, so the
diff --git a/compiler/src/dotty/tools/dotc/util/MutableSet.scala b/compiler/src/dotty/tools/dotc/util/MutableSet.scala
index bedb079f18ca..6e3ae7628eb6 100644
--- a/compiler/src/dotty/tools/dotc/util/MutableSet.scala
+++ b/compiler/src/dotty/tools/dotc/util/MutableSet.scala
@@ -8,7 +8,7 @@ abstract class MutableSet[T] extends ReadOnlySet[T]:
   def +=(x: T): Unit
 
   /** Like `+=` but return existing element equal to `x` of it exists,
-   *  `x` itself otherwose.
+   *  `x` itself otherwise.
    */
   def put(x: T): T
 
diff --git a/compiler/src/dotty/tools/dotc/util/ReusableInstance.scala b/compiler/src/dotty/tools/dotc/util/ReusableInstance.scala
index 16bd2decd908..4dd897dd082a 100644
--- a/compiler/src/dotty/tools/dotc/util/ReusableInstance.scala
+++ b/compiler/src/dotty/tools/dotc/util/ReusableInstance.scala
@@ -27,7 +27,7 @@ final class ReusableInstance[T <: AnyRef] private (make: => T) {
 }
 
 object ReusableInstance {
-  private final val InitialSize = 4
+  private inline val InitialSize = 4
 
   def apply[T <: AnyRef](make: => T): ReusableInstance[T] = new ReusableInstance[T](make)
 }
diff --git a/compiler/src/dotty/tools/dotc/util/SimpleIdentityMap.scala b/compiler/src/dotty/tools/dotc/util/SimpleIdentityMap.scala
index 437f7e140f68..c7dc8632f194 100644
--- a/compiler/src/dotty/tools/dotc/util/SimpleIdentityMap.scala
+++ b/compiler/src/dotty/tools/dotc/util/SimpleIdentityMap.scala
@@ -6,6 +6,7 @@ import collection.mutable.ListBuffer
  *  It has linear complexity for `apply`, `updated`, and `remove`.
  */
 abstract class SimpleIdentityMap[K <: AnyRef, +V >: Null <: AnyRef] extends (K => V) {
+  final def isEmpty: Boolean = this eq SimpleIdentityMap.myEmpty
   def size: Int
   def apply(k: K): V
   def remove(k: K): SimpleIdentityMap[K, V]
diff --git a/compiler/src/dotty/tools/dotc/util/SimpleIdentitySet.scala b/compiler/src/dotty/tools/dotc/util/SimpleIdentitySet.scala
index 5b3544b894c4..45ee3652fe16 100644
--- a/compiler/src/dotty/tools/dotc/util/SimpleIdentitySet.scala
+++ b/compiler/src/dotty/tools/dotc/util/SimpleIdentitySet.scala
@@ -7,28 +7,46 @@ import collection.mutable
  */
 abstract class SimpleIdentitySet[+Elem <: AnyRef] {
   def size: Int
-  final def isEmpty: Boolean = size == 0
   def + [E >: Elem <: AnyRef](x: E): SimpleIdentitySet[E]
   def - [E >: Elem <: AnyRef](x: E): SimpleIdentitySet[Elem]
   def contains[E >: Elem <: AnyRef](x: E): Boolean
   def foreach(f: Elem => Unit): Unit
   def exists[E >: Elem <: AnyRef](p: E => Boolean): Boolean
+  def map[B <: AnyRef](f: Elem => B): SimpleIdentitySet[B]
   def /: [A, E >: Elem <: AnyRef](z: A)(f: (A, E) => A): A
   def toList: List[Elem]
+
+  final def isEmpty: Boolean = size == 0
+
+  def forall[E >: Elem <: AnyRef](p: E => Boolean): Boolean = !exists(!p(_))
+
+  def filter(p: Elem => Boolean): SimpleIdentitySet[Elem] =
+    val z: SimpleIdentitySet[Elem] = SimpleIdentitySet.empty
+    (z /: this)((s, x) => if p(x) then s + x else s)
+
   def ++ [E >: Elem <: AnyRef](that: SimpleIdentitySet[E]): SimpleIdentitySet[E] =
     if (this.size == 0) that
     else if (that.size == 0) this
     else ((this: SimpleIdentitySet[E]) /: that)(_ + _)
+
   def -- [E >: Elem <: AnyRef](that: SimpleIdentitySet[E]): SimpleIdentitySet[E] =
     if (that.size == 0) this
     else
       ((SimpleIdentitySet.empty: SimpleIdentitySet[E]) /: this) { (s, x) =>
         if (that.contains(x)) s else s + x
       }
-  override def toString: String = toList.mkString("(", ", ", ")")
+  override def toString: String = toList.mkString("{", ", ", "}")
 }
 
 object SimpleIdentitySet {
+
+  def apply[Elem <: AnyRef](elems: Elem*): SimpleIdentitySet[Elem] =
+    elems.foldLeft(empty: SimpleIdentitySet[Elem])(_ + _)
+
+  extension [E <: AnyRef](xs: SimpleIdentitySet[E])
+    def intersect(ys: SimpleIdentitySet[E]): SimpleIdentitySet[E] =
+      xs.filter(ys.contains)
+
   object empty extends SimpleIdentitySet[Nothing] {
     def size: Int = 0
     def + [E <: AnyRef](x: E): SimpleIdentitySet[E] =
@@ -38,6 +56,7 @@ object SimpleIdentitySet {
     def contains[E <: AnyRef](x: E): Boolean = false
     def foreach(f: Nothing => Unit): Unit = ()
     def exists[E <: AnyRef](p: E => Boolean): Boolean = false
+    def map[B <: AnyRef](f: Nothing => B): SimpleIdentitySet[B] = empty
     def /: [A, E <: AnyRef](z: A)(f: (A, E) => A): A = z
     def toList = Nil
   }
@@ -52,6 +71,8 @@ object SimpleIdentitySet {
     def foreach(f: Elem => Unit): Unit = f(x0.asInstanceOf[Elem])
     def exists[E >: Elem <: AnyRef](p: E => Boolean): Boolean =
       p(x0.asInstanceOf[E])
+    def map[B <: AnyRef](f: Elem => B): SimpleIdentitySet[B] =
+      Set1(f(x0.asInstanceOf[Elem]))
     def /: [A, E >: Elem <: AnyRef](z: A)(f: (A, E) => A): A =
       f(z, x0.asInstanceOf[E])
     def toList = x0.asInstanceOf[Elem] :: Nil
@@ -69,6 +90,8 @@ object SimpleIdentitySet {
     def foreach(f: Elem => Unit): Unit = { f(x0.asInstanceOf[Elem]); f(x1.asInstanceOf[Elem]) }
     def exists[E >: Elem <: AnyRef](p: E => Boolean): Boolean =
       p(x0.asInstanceOf[E]) || p(x1.asInstanceOf[E])
+    def map[B <: AnyRef](f: Elem => B): SimpleIdentitySet[B] =
+      Set2(f(x0.asInstanceOf[Elem]), f(x1.asInstanceOf[Elem]))
     def /: [A, E >: Elem <: AnyRef](z: A)(f: (A, E) => A): A =
       f(f(z, x0.asInstanceOf[E]), x1.asInstanceOf[E])
     def toList = x0.asInstanceOf[Elem] :: x1.asInstanceOf[Elem] :: Nil
@@ -97,6 +120,8 @@ object SimpleIdentitySet {
     }
     def exists[E >: Elem <: AnyRef](p: E => Boolean): Boolean =
       p(x0.asInstanceOf[E]) || p(x1.asInstanceOf[E]) || p(x2.asInstanceOf[E])
+    def map[B <: AnyRef](f: Elem => B): SimpleIdentitySet[B] =
+      Set3(f(x0.asInstanceOf[Elem]), f(x1.asInstanceOf[Elem]), f(x2.asInstanceOf[Elem]))
     def /: [A, E >: Elem <: AnyRef](z: A)(f: (A, E) => A): A =
       f(f(f(z, x0.asInstanceOf[E]), x1.asInstanceOf[E]), x2.asInstanceOf[E])
     def toList = x0.asInstanceOf[Elem] :: x1.asInstanceOf[Elem] :: x2.asInstanceOf[Elem] :: Nil
@@ -139,6 +164,8 @@ object SimpleIdentitySet {
     }
     def exists[E >: Elem <: AnyRef](p: E => Boolean): Boolean =
       xs.asInstanceOf[Array[E]].exists(p)
+    def map[B <: AnyRef](f: Elem => B): SimpleIdentitySet[B] =
+      SetN(xs.map(x => f(x.asInstanceOf[Elem]).asInstanceOf[AnyRef]))
     def /: [A, E >: Elem <: AnyRef](z: A)(f: (A, E) => A): A =
       xs.asInstanceOf[Array[E]].foldLeft(z)(f)
     def toList: List[Elem] = {
diff --git a/compiler/src/dotty/tools/dotc/util/SixteenNibbles.scala b/compiler/src/dotty/tools/dotc/util/SixteenNibbles.scala
index ebeb9f700273..42286aef5d31 100644
--- a/compiler/src/dotty/tools/dotc/util/SixteenNibbles.scala
+++ b/compiler/src/dotty/tools/dotc/util/SixteenNibbles.scala
@@ -22,7 +22,7 @@ class SixteenNibbles(val bits: Long) extends AnyVal {
 }
 
 object SixteenNibbles {
-  final val Width = 4
-  final val Mask = (1 << Width) - 1
+  inline val Width = 4
+  inline val Mask = (1 << Width) - 1
   final val LongMask: Long = Mask.toLong
 }
diff --git a/compiler/src/dotty/tools/dotc/util/SourceFile.scala b/compiler/src/dotty/tools/dotc/util/SourceFile.scala
index 73fd53289a9b..bddcd02e7ab9 100644
--- a/compiler/src/dotty/tools/dotc/util/SourceFile.scala
+++ b/compiler/src/dotty/tools/dotc/util/SourceFile.scala
@@ -144,6 +144,9 @@ class SourceFile(val file: AbstractFile, computeContent: => Array[Char]) extends
     if lineIndicesCache eq null then
       lineIndicesCache = calculateLineIndicesFromContents()
     lineIndicesCache
+
+  def initialized = lineIndicesCache != null
+
   def setLineIndicesFromLineSizes(sizes: Array[Int]): Unit =
     val lines = sizes.length
     val indices = new Array[Int](lines + 1)
diff --git a/compiler/src/dotty/tools/dotc/util/SourcePosition.scala b/compiler/src/dotty/tools/dotc/util/SourcePosition.scala
index 9bc21fdf408f..7808c9a57acd 100644
--- a/compiler/src/dotty/tools/dotc/util/SourcePosition.scala
+++ b/compiler/src/dotty/tools/dotc/util/SourcePosition.scala
@@ -68,7 +68,7 @@ extends SrcPos, interfaces.SourcePosition, Showable {
     if outer == null || outer == NoSourcePosition then this else outer.outermost
 
   /** Inner most position that is contained within the `outermost` position.
-   *  Most precise position that that comes from the call site.
+   *  Most precise position that comes from the call site.
    */
   def nonInlined: SourcePosition = {
     val om = outermost
diff --git a/compiler/src/dotty/tools/dotc/util/Spans.scala b/compiler/src/dotty/tools/dotc/util/Spans.scala
index c21070f79e95..0a28c367ff29 100644
--- a/compiler/src/dotty/tools/dotc/util/Spans.scala
+++ b/compiler/src/dotty/tools/dotc/util/Spans.scala
@@ -15,9 +15,9 @@ import language.implicitConversions
  */
 object Spans {
 
-  private final val StartEndBits = 26
-  private final val StartEndMask = (1L << StartEndBits) - 1
-  private final val SyntheticPointDelta = (1 << (64 - StartEndBits * 2)) - 1
+  private inline val StartEndBits = 26
+  private inline val StartEndMask = (1L << StartEndBits) - 1
+  private inline val SyntheticPointDelta = (1 << (64 - StartEndBits * 2)) - 1
 
   /** The maximal representable offset in a span */
   final val MaxOffset = StartEndMask.toInt
@@ -85,6 +85,7 @@ object Spans {
       || containsInner(this, that.end)
       || containsInner(that, this.start)
       || containsInner(that, this.end)
+      || this.start == that.start && this.end == that.end   // exact match in one point
       )
     }
 
diff --git a/compiler/src/dotty/tools/dotc/util/Stats.scala b/compiler/src/dotty/tools/dotc/util/Stats.scala
index 684083fa77ba..60465e519452 100644
--- a/compiler/src/dotty/tools/dotc/util/Stats.scala
+++ b/compiler/src/dotty/tools/dotc/util/Stats.scala
@@ -9,7 +9,7 @@ import collection.mutable
 
 @sharable object Stats {
 
-  final val enabled = false
+  inline val enabled = false
 
   var monitored: Boolean = false
 
@@ -43,7 +43,7 @@ import collection.mutable
     else op
   }
 
-  final val GroupChar = '/'
+  inline val GroupChar = '/'
 
   /** Aggregate all counts of all keys with a common prefix, followed by `:` */
   private def aggregate(): Unit = {
@@ -62,6 +62,7 @@ import collection.mutable
         aggregate()
         println()
         println(hits.toList.sortBy(_._2).map{ case (x, y) => s"$x -> $y" } mkString "\n")
+        hits.clear()
       }
     }
     else op
diff --git a/compiler/src/dotty/tools/dotc/util/WeakHashSet.scala b/compiler/src/dotty/tools/dotc/util/WeakHashSet.scala
index 265f6e78cad2..3dc5761c0244 100644
--- a/compiler/src/dotty/tools/dotc/util/WeakHashSet.scala
+++ b/compiler/src/dotty/tools/dotc/util/WeakHashSet.scala
@@ -1,10 +1,10 @@
-/** Taken from the original implementation of WeakHashSet in scala-reflect
+/** Adapted from the original implementation of WeakHashSet in scala-reflect
  */
 package dotty.tools.dotc.util
 
 import java.lang.ref.{ReferenceQueue, WeakReference}
 
-import scala.annotation.tailrec
+import scala.annotation.{ constructorOnly, tailrec }
 import scala.collection.mutable
 
 /**
@@ -17,12 +17,10 @@ import scala.collection.mutable
  * This set implementation is not in general thread safe without external concurrency control. However it behaves
  * properly when GC concurrently collects elements in this set.
  */
-final class WeakHashSet[A <: AnyRef](initialCapacity: Int, loadFactor: Double) extends mutable.Set[A] {
+abstract class WeakHashSet[A <: AnyRef](initialCapacity: Int = 8, loadFactor: Double = 0.5) extends MutableSet[A] {
 
   import WeakHashSet._
 
-  def this() = this(initialCapacity = WeakHashSet.defaultInitialCapacity, loadFactor = WeakHashSet.defaultLoadFactor)
-
   type This = WeakHashSet[A]
 
   /**
@@ -30,12 +28,12 @@ final class WeakHashSet[A <: AnyRef](initialCapacity: Int, loadFactor: Double) e
    * the removeStaleEntries() method works through the queue to remove
    * stale entries from the table
    */
-  private val queue = new ReferenceQueue[A]
+  protected val queue = new ReferenceQueue[A]
 
   /**
    * the number of elements in this set
    */
-  private var count = 0
+  protected var count = 0
 
   /**
    * from a specified initial capacity compute the capacity we'll use as being the next
@@ -52,40 +50,26 @@ final class WeakHashSet[A <: AnyRef](initialCapacity: Int, loadFactor: Double) e
   /**
    * the underlying table of entries which is an array of Entry linked lists
    */
-  private var table = new Array[Entry[A]](computeCapacity)
+  protected var table = new Array[Entry[A]](computeCapacity)
 
   /**
    * the limit at which we'll increase the size of the hash table
    */
-  private var threshold = computeThreshold
+  protected var threshold = computeThreshold
 
   private def computeThreshold: Int = (table.size * loadFactor).ceil.toInt
 
-  def get(elem: A): Option[A] = Option(findEntry(elem))
+  protected def hash(key: A): Int
+  protected def isEqual(x: A, y: A): Boolean = x.equals(y)
 
-  /**
-   * find the bucket associated with an element's hash code
-   */
-  private def bucketFor(hash: Int): Int = {
-    // spread the bits around to try to avoid accidental collisions using the
-    // same algorithm as java.util.HashMap
-    var h = hash
-    h ^= h >>> 20 ^ h >>> 12
-    h ^= h >>> 7 ^ h >>> 4
-
-    // this is finding h % table.length, but takes advantage of the
-    // fact that table length is a power of 2,
-    // if you don't do bit flipping in your head, if table.length
-    // is binary 100000.. (with n 0s) then table.length - 1
-    // is 1111.. with n 1's.
-    // In other words this masks on the last n bits in the hash
-    h & (table.length - 1)
-  }
+  /** Turn hashcode `x` into a table index */
+  protected def index(x: Int): Int = x & (table.length - 1)
 
   /**
    * remove a single entry from a linked list in a given bucket
    */
   private def remove(bucket: Int, prevEntry: Entry[A], entry: Entry[A]): Unit = {
+    Stats.record(statsItem("remove"))
     prevEntry match {
       case null => table(bucket) = entry.tail
       case _ => prevEntry.tail = entry.tail
@@ -96,14 +80,14 @@ final class WeakHashSet[A <: AnyRef](initialCapacity: Int, loadFactor: Double) e
   /**
    * remove entries associated with elements that have been gc'ed
    */
-  private def removeStaleEntries(): Unit = {
+  protected def removeStaleEntries(): Unit = {
     def poll(): Entry[A] = queue.poll().asInstanceOf[Entry[A]]
 
     @tailrec
     def queueLoop(): Unit = {
       val stale = poll()
       if (stale != null) {
-        val bucket = bucketFor(stale.hash)
+        val bucket = index(stale.hash)
 
         @tailrec
         def linkedListLoop(prevEntry: Entry[A], entry: Entry[A]): Unit = if (stale eq entry) remove(bucket, prevEntry, entry)
@@ -121,7 +105,8 @@ final class WeakHashSet[A <: AnyRef](initialCapacity: Int, loadFactor: Double) e
   /**
    * Double the size of the internal table
    */
-  private def resize(): Unit = {
+  protected def resize(): Unit = {
+    Stats.record(statsItem("resize"))
     val oldTable = table
     table = new Array[Entry[A]](oldTable.size * 2)
     threshold = computeThreshold
@@ -132,7 +117,7 @@ final class WeakHashSet[A <: AnyRef](initialCapacity: Int, loadFactor: Double) e
       def linkedListLoop(entry: Entry[A]): Unit = entry match {
         case null => ()
         case _ =>
-          val bucket = bucketFor(entry.hash)
+          val bucket = index(entry.hash)
           val oldNext = entry.tail
           entry.tail = table(bucket)
           table(bucket) = entry
@@ -145,103 +130,76 @@ final class WeakHashSet[A <: AnyRef](initialCapacity: Int, loadFactor: Double) e
     tableLoop(0)
   }
 
-  def contains(elem: A): Boolean = findEntry(elem) ne null
-
-  // from scala.reflect.internal.Set, find an element or null if it isn't contained
-  def findEntry(elem: A): A = elem match {
+  def lookup(elem: A): A | Null = elem match {
     case null => throw new NullPointerException("WeakHashSet cannot hold nulls")
     case _    =>
+      Stats.record(statsItem("lookup"))
       removeStaleEntries()
-      val hash = elem.hashCode
-      val bucket = bucketFor(hash)
+      val bucket = index(hash(elem))
 
       @tailrec
       def linkedListLoop(entry: Entry[A]): A = entry match {
         case null                    => null.asInstanceOf[A]
         case _                       =>
           val entryElem = entry.get
-          if (elem.equals(entryElem)) entryElem
+          if (isEqual(elem, entryElem)) entryElem
           else linkedListLoop(entry.tail)
       }
 
       linkedListLoop(table(bucket))
   }
-  // add an element to this set unless it's already in there and return the element
-  def findEntryOrUpdate(elem: A): A = elem match {
+
+  protected def addEntryAt(bucket: Int, elem: A, elemHash: Int, oldHead: Entry[A]): A = {
+    Stats.record(statsItem("addEntryAt"))
+    table(bucket) = new Entry(elem, elemHash, oldHead, queue)
+    count += 1
+    if (count > threshold) resize()
+    elem
+  }
+
+  def put(elem: A): A = elem match {
     case null => throw new NullPointerException("WeakHashSet cannot hold nulls")
     case _    =>
+      Stats.record(statsItem("put"))
       removeStaleEntries()
-      val hash = elem.hashCode
-      val bucket = bucketFor(hash)
+      val h = hash(elem)
+      val bucket = index(h)
       val oldHead = table(bucket)
 
-      def add() = {
-        table(bucket) = new Entry(elem, hash, oldHead, queue)
-        count += 1
-        if (count > threshold) resize()
-        elem
-      }
-
       @tailrec
       def linkedListLoop(entry: Entry[A]): A = entry match {
-        case null                    => add()
+        case null                    => addEntryAt(bucket, elem, h, oldHead)
         case _                       =>
           val entryElem = entry.get
-          if (elem.equals(entryElem)) entryElem
+          if (isEqual(elem, entryElem)) entryElem
           else linkedListLoop(entry.tail)
       }
 
       linkedListLoop(oldHead)
   }
 
-  // add an element to this set unless it's already in there and return this set
-  override def addOne(elem: A): this.type = elem match {
-    case null => throw new NullPointerException("WeakHashSet cannot hold nulls")
-    case _    =>
-      removeStaleEntries()
-      val hash = elem.hashCode
-      val bucket = bucketFor(hash)
-      val oldHead = table(bucket)
+  def +=(elem: A): Unit = put(elem)
 
-      def add(): Unit = {
-        table(bucket) = new Entry(elem, hash, oldHead, queue)
-        count += 1
-        if (count > threshold) resize()
-      }
-
-      @tailrec
-      def linkedListLoop(entry: Entry[A]): Unit = entry match {
-        case null                        => add()
-        case _ if elem.equals(entry.get) => ()
-        case _                           => linkedListLoop(entry.tail)
-      }
-
-      linkedListLoop(oldHead)
-      this
-  }
-
-  // remove an element from this set and return this set
-  override def subtractOne(elem: A): this.type = elem match {
-    case null => this
+  def -=(elem: A): Unit = elem match {
+    case null =>
     case _ =>
+      Stats.record(statsItem("-="))
       removeStaleEntries()
-      val bucket = bucketFor(elem.hashCode)
+      val bucket = index(hash(elem))
 
 
 
       @tailrec
       def linkedListLoop(prevEntry: Entry[A], entry: Entry[A]): Unit = entry match {
         case null => ()
-        case _ if elem.equals(entry.get) => remove(bucket, prevEntry, entry)
+        case _ if isEqual(elem, entry.get) => remove(bucket, prevEntry, entry)
         case _ => linkedListLoop(entry, entry.tail)
       }
 
       linkedListLoop(null, table(bucket))
-      this
   }
 
-  // empty this set
-  override def clear(): Unit = {
+  def clear(): Unit = {
     table = new Array[Entry[A]](table.size)
     threshold = computeThreshold
     count = 0
@@ -251,21 +209,11 @@ final class WeakHashSet[A <: AnyRef](initialCapacity: Int, loadFactor: Double) e
     queueLoop()
   }
 
-  // true if this set is empty
-  override def empty: This = new WeakHashSet[A](initialCapacity, loadFactor)
-
-  // the number of elements in this set
-  override def size: Int = {
+  def size: Int = {
     removeStaleEntries()
     count
   }
 
-  override def isEmpty: Boolean = size == 0
-  override def foreach[U](f: A => U): Unit = iterator foreach f
-
-  // It has the `()` because iterator runs `removeStaleEntries()`
-  override def toList(): List[A] = iterator.toList
-
   // Iterator over all the elements in this set in no particular order
   override def iterator: Iterator[A] = {
     removeStaleEntries()
@@ -318,6 +266,12 @@ final class WeakHashSet[A <: AnyRef](initialCapacity: Int, loadFactor: Double) e
     }
   }
 
+  protected def statsItem(op: String): String = {
+    val prefix = "WeakHashSet."
+    val suffix = getClass.getSimpleName
+    s"$prefix$op $suffix"
+  }
+
   /**
    * Diagnostic information about the internals of this set. Not normally
    * needed by ordinary code, but may be useful for diagnosing performance problems
@@ -338,9 +292,9 @@ final class WeakHashSet[A <: AnyRef](initialCapacity: Int, loadFactor: Double) e
           assert(entry.get != null, s"$entry had a null value indicated that gc activity was happening during diagnostic validation or that a null value was inserted")
           computedCount += 1
           val cachedHash = entry.hash
-          val realHash = entry.get.hashCode
+          val realHash = hash(entry.get)
           assert(cachedHash == realHash, s"for $entry cached hash was $cachedHash but should have been $realHash")
-          val computedBucket = bucketFor(realHash)
+          val computedBucket = index(realHash)
           assert(computedBucket == bucket, s"for $entry the computed bucket was $computedBucket but should have been $bucket")
 
           entry = entry.tail
@@ -386,11 +340,6 @@ object WeakHashSet {
    * A single entry in a WeakHashSet. It's a WeakReference plus a cached hash code and
    * a link to the next Entry in the same bucket
    */
-  private class Entry[A](element: A, val hash:Int, var tail: Entry[A], queue: ReferenceQueue[A]) extends WeakReference[A](element, queue)
-
-  private final val defaultInitialCapacity = 16
-  private final val defaultLoadFactor = .75
+  class Entry[A](@constructorOnly element: A, val hash:Int, var tail: Entry[A], @constructorOnly queue: ReferenceQueue[A]) extends WeakReference[A](element, queue)
 
-  def apply[A <: AnyRef](initialCapacity: Int = defaultInitialCapacity, loadFactor: Double = defaultLoadFactor): WeakHashSet[A] =
-    new WeakHashSet(initialCapacity, loadFactor)
 }
diff --git a/compiler/src/dotty/tools/io/ClassPath.scala b/compiler/src/dotty/tools/io/ClassPath.scala
index d7218108e944..eeefabddd19f 100644
--- a/compiler/src/dotty/tools/io/ClassPath.scala
+++ b/compiler/src/dotty/tools/io/ClassPath.scala
@@ -132,7 +132,8 @@ object ClassPath {
       dir.list.filter(x => filt(x.name) && (x.isDirectory || isJarOrZip(x))).map(_.path).toList
 
     if (pattern == "*") lsDir(Directory("."))
-    else if (pattern.endsWith(wildSuffix)) lsDir(Directory(pattern dropRight 2))
+    // On Windows the JDK supports forward slash or backslash in classpath entries
+    else if (pattern.endsWith(wildSuffix) || pattern.endsWith("/*")) lsDir(Directory(pattern dropRight 2))
     else if (pattern.contains('*')) {
       try {
         val regexp = ("^" + pattern.replace("""\*""", """.*""") + "$").r
diff --git a/compiler/src/dotty/tools/io/Jar.scala b/compiler/src/dotty/tools/io/Jar.scala
index 063de2ca8137..6baaec175b14 100644
--- a/compiler/src/dotty/tools/io/Jar.scala
+++ b/compiler/src/dotty/tools/io/Jar.scala
@@ -72,6 +72,7 @@ class Jar(file: File) {
     case null   => errorFn("No such entry: " + entry) ; null
     case x      => x
   }
+
   override def toString: String = "" + file
 }
 
diff --git a/compiler/src/dotty/tools/io/JarArchive.scala b/compiler/src/dotty/tools/io/JarArchive.scala
index f35493299cd6..80af5ef390b5 100644
--- a/compiler/src/dotty/tools/io/JarArchive.scala
+++ b/compiler/src/dotty/tools/io/JarArchive.scala
@@ -10,6 +10,8 @@ import scala.jdk.CollectionConverters._
  */
 class JarArchive private (root: Directory) extends PlainDirectory(root) {
   def close(): Unit = jpath.getFileSystem().close()
+  def allFileNames(): Iterator[String] = 
+    java.nio.file.Files.walk(jpath).iterator().asScala.map(_.toString)
 }
 
 object JarArchive {
diff --git a/compiler/src/dotty/tools/repl/AbstractFileClassLoader.scala b/compiler/src/dotty/tools/repl/AbstractFileClassLoader.scala
index a3f4047fb646..7263758b60c5 100644
--- a/compiler/src/dotty/tools/repl/AbstractFileClassLoader.scala
+++ b/compiler/src/dotty/tools/repl/AbstractFileClassLoader.scala
@@ -18,7 +18,7 @@ import io.AbstractFile
 import java.net.{URL, URLConnection, URLStreamHandler}
 import java.util.Collections
 
-class AbstractFileClassLoader(root: AbstractFile, parent: ClassLoader) extends ClassLoader(parent):
+class AbstractFileClassLoader(val root: AbstractFile, parent: ClassLoader) extends ClassLoader(parent):
   private def findAbstractFile(name: String) = root.lookupPath(name.split('/').toIndexedSeq, directory = false)
 
   override protected def findResource(name: String) =
diff --git a/compiler/src/dotty/tools/repl/JLineTerminal.scala b/compiler/src/dotty/tools/repl/JLineTerminal.scala
index 5f43a7483841..807ae2bf5eec 100644
--- a/compiler/src/dotty/tools/repl/JLineTerminal.scala
+++ b/compiler/src/dotty/tools/repl/JLineTerminal.scala
@@ -28,7 +28,7 @@ final class JLineTerminal extends java.io.Closeable {
   private def blue(str: String)(using Context) =
     if (ctx.settings.color.value != "never") Console.BLUE + str + Console.RESET
     else str
-  private def prompt(using Context)        = blue("scala> ")
+  private def prompt(using Context)        = blue("\nscala> ")
   private def newLinePrompt(using Context) = blue("     | ")
 
   /** Blockingly read line from `System.in`
diff --git a/compiler/src/dotty/tools/repl/Main.scala b/compiler/src/dotty/tools/repl/Main.scala
index 127ccd10b467..7eb906edc586 100644
--- a/compiler/src/dotty/tools/repl/Main.scala
+++ b/compiler/src/dotty/tools/repl/Main.scala
@@ -1,6 +1,7 @@
 package dotty.tools.repl
 
 /** Main entry point to the REPL */
+// To test, run bin/scala
 object Main {
   def main(args: Array[String]): Unit =
     new ReplDriver(args).tryRunning
diff --git a/compiler/src/dotty/tools/repl/ParseResult.scala b/compiler/src/dotty/tools/repl/ParseResult.scala
index 352c568533c4..5d414ecf9b34 100644
--- a/compiler/src/dotty/tools/repl/ParseResult.scala
+++ b/compiler/src/dotty/tools/repl/ParseResult.scala
@@ -7,7 +7,7 @@ import dotc.core.Contexts._
 import dotc.core.StdNames.str
 import dotc.parsing.Parsers.Parser
 import dotc.parsing.Tokens
-import dotc.reporting.Diagnostic
+import dotc.reporting.{Diagnostic, StoreReporter}
 import dotc.util.SourceFile
 
 import scala.annotation.internal.sharable
@@ -16,7 +16,7 @@ import scala.annotation.internal.sharable
 sealed trait ParseResult
 
 /** An error free parsing resulting in a list of untyped trees */
-case class Parsed(source: SourceFile, trees: List[untpd.Tree]) extends ParseResult
+case class Parsed(source: SourceFile, trees: List[untpd.Tree], reporter: StoreReporter) extends ParseResult
 
 /** A parsing result containing syntax `errors` */
 case class SyntaxErrors(sourceCode: String,
@@ -80,10 +80,16 @@ case object Imports extends Command {
   val command: String = ":imports"
 }
 
+case class Settings(arg: String) extends Command
+object Settings {
+  val command: String = ":settings"
+}
+
 /** Reset the session to the initial state from when the repl program was
  *  started
  */
-case object Reset extends Command {
+case class Reset(arg: String) extends Command
+object Reset {
   val command: String = ":reset"
 }
 
@@ -105,7 +111,8 @@ case object Help extends Command {
       |:type <expression>       evaluate the type of the given expression
       |:doc <expression>        print the documentation for the given expression
       |:imports                 show import history
-      |:reset                   reset the repl to its initial state, forgetting all session entries
+      |:reset [options]         reset the repl to its initial state, forgetting all session entries
+      |:settings <options>      update compiler options, if possible
     """.stripMargin
 }
 
@@ -124,11 +131,12 @@ object ParseResult {
     Quit.command -> (_ => Quit),
     Quit.alias -> (_ => Quit),
     Help.command -> (_  => Help),
-    Reset.command -> (_  => Reset),
+    Reset.command -> (arg  => Reset(arg)),
     Imports.command -> (_  => Imports),
     Load.command -> (arg => Load(arg)),
     TypeOf.command -> (arg => TypeOf(arg)),
-    DocOf.command -> (arg => DocOf(arg))
+    DocOf.command -> (arg => DocOf(arg)),
+    Settings.command -> (arg => Settings(arg)),
   )
 
   def apply(source: SourceFile)(implicit state: State): ParseResult = {
@@ -154,7 +162,7 @@ object ParseResult {
               reporter.removeBufferedMessages,
               stats)
           else
-            Parsed(source, stats)
+            Parsed(source, stats, reporter)
         }
     }
   }
diff --git a/compiler/src/dotty/tools/repl/Rendering.scala b/compiler/src/dotty/tools/repl/Rendering.scala
index e07cb867062d..bb5496f0cc8b 100644
--- a/compiler/src/dotty/tools/repl/Rendering.scala
+++ b/compiler/src/dotty/tools/repl/Rendering.scala
@@ -31,21 +31,16 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None) {
 
   private val MaxStringElements: Int = 1000  // no need to mkString billions of elements
 
-  /** A `MessageRenderer` for the REPL without file positions */
-  private val messageRenderer = new MessageRendering {
-    override def posStr(pos: SourcePosition, diagnosticLevel: String, message: Message)(using Context): String = ""
-  }
-
-  private var myClassLoader: ClassLoader = _
+  private var myClassLoader: AbstractFileClassLoader = _
 
   private var myReplStringOf: Object => String = _
 
 
   /** Class loader used to load compiled code */
   private[repl] def classLoader()(using Context) =
-    if (myClassLoader != null) myClassLoader
+    if (myClassLoader != null && myClassLoader.root == ctx.settings.outputDir.value) myClassLoader
     else {
-      val parent = parentClassLoader.getOrElse {
+      val parent = Option(myClassLoader).orElse(parentClassLoader).getOrElse {
         val compilerClasspath = ctx.platform.classPath(using ctx).asURLs
         // We can't use the system classloader as a parent because it would
         // pollute the user classpath with everything passed to the JVM
@@ -62,11 +57,21 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None) {
         // We need to use the ScalaRunTime class coming from the scala-library
         // on the user classpath, and not the one available in the current
         // classloader, so we use reflection instead of simply calling
-        // `ScalaRunTime.replStringOf`.
+        // `ScalaRunTime.replStringOf`. Probe for new API without extraneous newlines.
+        // For old API, try to clean up extraneous newlines by stripping suffix and maybe prefix newline.
         val scalaRuntime = Class.forName("scala.runtime.ScalaRunTime", true, myClassLoader)
-        val meth = scalaRuntime.getMethod("replStringOf", classOf[Object], classOf[Int])
-
-        (value: Object) => meth.invoke(null, value, Integer.valueOf(MaxStringElements)).asInstanceOf[String]
+        val renderer = "stringOf"  // was: replStringOf
+        try {
+          val meth = scalaRuntime.getMethod(renderer, classOf[Object], classOf[Int], classOf[Boolean])
+          val truly = java.lang.Boolean.TRUE
+
+          (value: Object) => meth.invoke(null, value, Integer.valueOf(MaxStringElements), truly).asInstanceOf[String]
+        } catch {
+          case _: NoSuchMethodException =>
+            val meth = scalaRuntime.getMethod(renderer, classOf[Object], classOf[Int])
+
+            (value: Object) => meth.invoke(null, value, Integer.valueOf(MaxStringElements)).asInstanceOf[String]
+        }
       }
       myClassLoader
     }
@@ -88,7 +93,8 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None) {
   private[repl] def replStringOf(value: Object)(using Context): String = {
     assert(myReplStringOf != null,
       "replStringOf should only be called on values creating using `classLoader()`, but `classLoader()` has not been called so far")
-    truncate(myReplStringOf(value))
+    val res = myReplStringOf(value)
+    if res == null then "null // non-null reference has null-valued toString" else truncate(res)
   }
 
   /** Load the value of the symbol using reflection.
@@ -102,26 +108,18 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None) {
       resObj
         .getDeclaredMethods.find(_.getName == sym.name.encode.toString)
         .map(_.invoke(null))
-    val string = value.map(replStringOf(_).trim)
+    val string = value.map(replStringOf(_))
     if (!sym.is(Flags.Method) && sym.info == defn.UnitType)
       None
     else
       string.map { s =>
-        if (s.startsWith(str.REPL_SESSION_LINE))
-          s.drop(str.REPL_SESSION_LINE.length).dropWhile(c => c.isDigit || c == '$')
+        if (s.startsWith(REPL_WRAPPER_NAME_PREFIX))
+          s.drop(REPL_WRAPPER_NAME_PREFIX.length).dropWhile(c => c.isDigit || c == '$')
         else
           s
       }
   }
 
-  /** Formats errors using the `messageRenderer` */
-  def formatError(dia: Diagnostic)(implicit state: State): Diagnostic =
-    new Diagnostic(
-      messageRenderer.messageAndPos(dia.msg, dia.pos, messageRenderer.diagnosticLevel(dia))(using state.context),
-      dia.pos,
-      dia.level
-    )
-
   def renderTypeDef(d: Denotation)(using Context): Diagnostic =
     infoDiagnostic("// defined " ++ d.symbol.showUser, d)
 
@@ -156,11 +154,14 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None) {
     val cause = ite.getCause match
       case e: ExceptionInInitializerError => e.getCause
       case e => e
-    def isWrapperCode(ste: StackTraceElement) =
-      ste.getClassName == d.symbol.owner.name.show
+    // detect
+    //at repl$.rs$line$2$.<clinit>(rs$line$2:1)
+    //at repl$.rs$line$2.res1(rs$line$2)
+    def isWrapperInitialization(ste: StackTraceElement) =
+      ste.getClassName.startsWith(REPL_WRAPPER_NAME_PREFIX)  // d.symbol.owner.name.show is simple name
       && (ste.getMethodName == nme.STATIC_CONSTRUCTOR.show || ste.getMethodName == nme.CONSTRUCTOR.show)
 
-    cause.formatStackTracePrefix(!isWrapperCode(_))
+    cause.formatStackTracePrefix(!isWrapperInitialization(_))
   end renderError
 
   private def infoDiagnostic(msg: String, d: Denotation)(using Context): Diagnostic =
@@ -169,6 +170,7 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None) {
 }
 
 object Rendering {
+  final val REPL_WRAPPER_NAME_PREFIX = str.REPL_SESSION_LINE
 
   extension (s: Symbol)
     def showUser(using Context): String = {
diff --git a/compiler/src/dotty/tools/repl/ReplCompillationUnit.scala b/compiler/src/dotty/tools/repl/ReplCompilationUnit.scala
similarity index 100%
rename from compiler/src/dotty/tools/repl/ReplCompillationUnit.scala
rename to compiler/src/dotty/tools/repl/ReplCompilationUnit.scala
diff --git a/compiler/src/dotty/tools/repl/ReplCompiler.scala b/compiler/src/dotty/tools/repl/ReplCompiler.scala
index e81ea47cfff9..9249172b5d4d 100644
--- a/compiler/src/dotty/tools/repl/ReplCompiler.scala
+++ b/compiler/src/dotty/tools/repl/ReplCompiler.scala
@@ -14,6 +14,7 @@ import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.reporting.Diagnostic
 import dotty.tools.dotc.transform.{PostTyper, Staging}
 import dotty.tools.dotc.typer.ImportInfo._
+import dotty.tools.dotc.typer.TyperPhase
 import dotty.tools.dotc.util.Spans._
 import dotty.tools.dotc.util.{ParsedComment, SourceFile}
 import dotty.tools.dotc.{CompilationUnit, Compiler, Run}
@@ -32,37 +33,41 @@ import scala.collection.mutable
 class ReplCompiler extends Compiler {
 
   override protected def frontendPhases: List[List[Phase]] = List(
-    List(new REPLFrontEnd),
+    List(new TyperPhase(addRootImports = false)),
     List(new CollectTopLevelImports),
     List(new PostTyper),
   )
 
-  def newRun(initCtx: Context, state: State): Run = new Run(this, initCtx) {
-
-    /** Import previous runs and user defined imports */
-    override protected def rootContext(using Context): Context = {
-      def importContext(imp: tpd.Import)(using Context) =
-        ctx.importContext(imp, imp.symbol)
-
-      def importPreviousRun(id: Int)(using Context) = {
-        // we first import the wrapper object id
-        val path = nme.EMPTY_PACKAGE ++ "." ++ objectNames(id)
-        val ctx0 = ctx.fresh
-          .setNewScope
-          .withRootImports(RootRef(() => requiredModuleRef(path)) :: Nil)
-
-        // then its user defined imports
-        val imports = state.imports.getOrElse(id, Nil)
-        if imports.isEmpty then ctx0
-        else imports.foldLeft(ctx0.fresh.setNewScope)((ctx, imp) =>
-          importContext(imp)(using ctx))
-      }
+  def newRun(initCtx: Context, state: State): Run =
+    val run = new Run(this, initCtx) {
+      /** Import previous runs and user defined imports */
+      override protected def rootContext(using Context): Context = {
+        def importContext(imp: tpd.Import)(using Context) =
+          ctx.importContext(imp, imp.symbol)
+
+        def importPreviousRun(id: Int)(using Context) = {
+          // we first import the wrapper object id
+          val path = nme.EMPTY_PACKAGE ++ "." ++ objectNames(id)
+          val ctx0 = ctx.fresh
+            .setNewScope
+            .withRootImports(RootRef(() => requiredModuleRef(path)) :: Nil)
+
+          // then its user defined imports
+          val imports = state.imports.getOrElse(id, Nil)
+          if imports.isEmpty then ctx0
+          else imports.foldLeft(ctx0.fresh.setNewScope)((ctx, imp) =>
+            importContext(imp)(using ctx))
+        }
 
-      val rootCtx = super.rootContext.withRootImports
-      (1 to state.objectIndex).foldLeft(rootCtx)((ctx, id) =>
-        importPreviousRun(id)(using ctx))
+        val rootCtx = super.rootContext.fresh
+          .setOwner(defn.EmptyPackageClass)
+          .withRootImports
+        (1 to state.objectIndex).foldLeft(rootCtx)((ctx, id) =>
+          importPreviousRun(id)(using ctx))
+      }
     }
-  }
+    run.suppressions.initSuspendedMessages(state.context.run)
+    run
 
   private val objectNames = mutable.Map.empty[Int, TermName]
 
@@ -83,6 +88,17 @@ class ReplCompiler extends Compiler {
     var valIdx = state.valIndex
     val defs = new mutable.ListBuffer[Tree]
 
+    /** If the user inputs a definition whose name is of the form REPL_RES_PREFIX and a number,
+     *  such as `val res9 = 1`, we bump `valIdx` to avoid name clashes.  lampepfl/dotty#3536 */
+    def maybeBumpValIdx(tree: Tree): Unit = tree match
+      case apply: Apply   => for a <- apply.args  do maybeBumpValIdx(a)
+      case tuple: Tuple   => for t <- tuple.trees do maybeBumpValIdx(t)
+      case patDef: PatDef => for p <- patDef.pats do maybeBumpValIdx(p)
+      case tree: NameTree => tree.name.show.stripPrefix(str.REPL_RES_PREFIX).toIntOption match
+        case Some(n) if n >= valIdx => valIdx = n + 1
+        case _                      =>
+      case _              =>
+
     flattened.foreach {
       case expr @ Assign(id: Ident, _) =>
         // special case simple reassignment (e.g. x = 3)
@@ -96,6 +112,7 @@ class ReplCompiler extends Compiler {
         val vd = ValDef(resName, TypeTree(), expr).withSpan(expr.span)
         defs += vd
       case other =>
+        maybeBumpValIdx(other)
         defs += other
     }
 
@@ -148,6 +165,7 @@ class ReplCompiler extends Compiler {
   private def runCompilationUnit(unit: CompilationUnit, state: State): Result[(CompilationUnit, State)] = {
     val ctx = state.context
     ctx.run.compileUnits(unit :: Nil)
+    ctx.run.printSummary() // this outputs "2 errors found" like normal - but we might decide that's needlessly noisy for the REPL
 
     if (!ctx.reporter.hasErrors) (unit, state).result
     else ctx.reporter.removeBufferedMessages(using ctx).errors
@@ -235,7 +253,7 @@ class ReplCompiler extends Compiler {
       }
 
       ParseResult(sourceFile)(state) match {
-        case Parsed(_, trees) =>
+        case Parsed(_, trees, _) =>
           wrap(trees).result
         case SyntaxErrors(_, reported, trees) =>
           if (errorsAllowed) wrap(trees).result
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
index 7abaa86a77dc..f69a7ca142fb 100644
--- a/compiler/src/dotty/tools/repl/ReplDriver.scala
+++ b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -5,25 +5,31 @@ import java.nio.charset.StandardCharsets
 
 import dotty.tools.dotc.ast.Trees._
 import dotty.tools.dotc.ast.{tpd, untpd}
+import dotty.tools.dotc.config.CommandLineParser.tokenize
+import dotty.tools.dotc.config.Properties.{javaVersion, javaVmName, simpleVersionString}
 import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Decorators._
 import dotty.tools.dotc.core.Phases.{unfusedPhases, typerPhase}
 import dotty.tools.dotc.core.Denotations.Denotation
 import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.Mode
 import dotty.tools.dotc.core.NameKinds.SimpleNameKind
+import dotty.tools.dotc.core.NameKinds.DefaultGetterName
 import dotty.tools.dotc.core.NameOps._
 import dotty.tools.dotc.core.Names.Name
 import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.core.Symbols.{Symbol, defn}
+import dotty.tools.dotc.interfaces
 import dotty.tools.dotc.interactive.Completion
 import dotty.tools.dotc.printing.SyntaxHighlighting
-import dotty.tools.dotc.reporting.MessageRendering
+import dotty.tools.dotc.reporting.{ConsoleReporter, MessageRendering, StoreReporter}
 import dotty.tools.dotc.reporting.{Message, Diagnostic}
 import dotty.tools.dotc.util.Spans.Span
 import dotty.tools.dotc.util.{SourceFile, SourcePosition}
 import dotty.tools.dotc.{CompilationUnit, Driver}
 import dotty.tools.dotc.config.CompilerCommand
 import dotty.tools.io._
+import dotty.tools.runner.ScalaClassLoader.*
 import org.jline.reader._
 
 import scala.annotation.tailrec
@@ -57,7 +63,7 @@ case class State(objectIndex: Int,
 /** Main REPL instance, orchestrating input, compilation and presentation */
 class ReplDriver(settings: Array[String],
                  out: PrintStream = Console.out,
-                 classLoader: Option[ClassLoader] = None) extends Driver {
+                 classLoader: Option[ClassLoader] = None) extends Driver:
 
   /** Overridden to `false` in order to not have to give sources on the
    *  commandline
@@ -65,14 +71,21 @@ class ReplDriver(settings: Array[String],
   override def sourcesRequired: Boolean = false
 
   /** Create a fresh and initialized context with IDE mode enabled */
-  private def initialCtx = {
-    val rootCtx = initCtx.fresh.addMode(Mode.ReadPositions | Mode.Interactive | Mode.ReadComments)
+  private def initialCtx(settings: List[String]) = {
+    val rootCtx = initCtx.fresh.addMode(Mode.ReadPositions | Mode.Interactive)
     rootCtx.setSetting(rootCtx.settings.YcookComments, true)
+    rootCtx.setSetting(rootCtx.settings.YreadComments, true)
+    setupRootCtx(this.settings ++ settings, rootCtx)
+  }
+
+  private def setupRootCtx(settings: Array[String], rootCtx: Context) = {
     setup(settings, rootCtx) match
-      case Some((files, ictx)) =>
+      case Some((files, ictx)) => inContext(ictx) {
         shouldStart = true
-        ictx.base.initialize()(using ictx)
+        if files.nonEmpty then out.println(i"Ignoring spurious arguments: $files%, %")
+        ictx.base.initialize()
         ictx
+      }
       case None =>
         shouldStart = false
         rootCtx
@@ -87,8 +100,8 @@ class ReplDriver(settings: Array[String],
    *  such, when the user enters `:reset` this method should be called to reset
    *  everything properly
    */
-  protected def resetToInitial(): Unit = {
-    rootCtx = initialCtx
+  protected def resetToInitial(settings: List[String] = Nil): Unit = {
+    rootCtx = initialCtx(settings)
     if (rootCtx.settings.outputDir.isDefault(using rootCtx))
       rootCtx = rootCtx.fresh
         .setSetting(rootCtx.settings.outputDir, new VirtualDirectory("<REPL compilation output>"))
@@ -122,6 +135,10 @@ class ReplDriver(settings: Array[String],
   final def runUntilQuit(initialState: State = initialState): State = {
     val terminal = new JLineTerminal
 
+    out.println(
+      s"""Welcome to Scala $simpleVersionString ($javaVersion, Java $javaVmName).
+         |Type in expressions for evaluation. Or try :help.""".stripMargin)
+
     /** Blockingly read a line, getting back a parse result */
     def readLine(state: State): ParseResult = {
       val completer: Completer = { (_, line, candidates) =>
@@ -145,15 +162,17 @@ class ReplDriver(settings: Array[String],
       else loop(interpret(res)(state))
     }
 
-    try withRedirectedOutput { loop(initialState) }
+    try runBody { loop(initialState) }
     finally terminal.close()
   }
 
-  final def run(input: String)(implicit state: State): State = withRedirectedOutput {
+  final def run(input: String)(implicit state: State): State = runBody {
     val parsed = ParseResult(input)(state)
     interpret(parsed)
   }
 
+  private def runBody(body: => State): State = rendering.classLoader()(using rootCtx).asContext(withRedirectedOutput(body))
+
   // TODO: i5069
   final def bind(name: String, value: Any)(implicit state: State): State = state
 
@@ -172,8 +191,8 @@ class ReplDriver(settings: Array[String],
     }
   }
 
-  private def newRun(state: State) = {
-    val run = compiler.newRun(rootCtx.fresh.setReporter(newStoreReporter), state)
+  private def newRun(state: State, reporter: StoreReporter = newStoreReporter) = {
+    val run = compiler.newRun(rootCtx.fresh.setReporter(reporter), state)
     state.copy(context = run.runContext)
   }
 
@@ -206,7 +225,7 @@ class ReplDriver(settings: Array[String],
   }
 
   private def interpret(res: ParseResult)(implicit state: State): State = {
-    val newState = res match {
+    res match {
       case parsed: Parsed if parsed.trees.nonEmpty =>
         compile(parsed, state)
 
@@ -223,11 +242,6 @@ class ReplDriver(settings: Array[String],
       case _ => // new line, empty tree
         state
     }
-    inContext(newState.context) {
-      if (!ctx.settings.XreplDisableDisplay.value)
-        out.println()
-      newState
-    }
   }
 
   /** Compile `parsed` trees and evolve `state` in accordance */
@@ -240,8 +254,14 @@ class ReplDriver(settings: Array[String],
     def extractTopLevelImports(ctx: Context): List[tpd.Import] =
       unfusedPhases(using ctx).collectFirst { case phase: CollectTopLevelImports => phase.imports }.get
 
+    def contextWithNewImports(ctx: Context, imports: List[tpd.Import]): Context =
+      if imports.isEmpty then ctx
+      else
+        imports.foldLeft(ctx.fresh.setNewScope)((ctx, imp) =>
+          ctx.importContext(imp, imp.symbol(using ctx)))
+
     implicit val state = {
-      val state0 = newRun(istate)
+      val state0 = newRun(istate, parsed.reporter)
       state0.copy(context = state0.context.withSource(parsed.source))
     }
     compiler
@@ -255,11 +275,13 @@ class ReplDriver(settings: Array[String],
             var allImports = newState.imports
             if (newImports.nonEmpty)
               allImports += (newState.objectIndex -> newImports)
-            val newStateWithImports = newState.copy(imports = allImports)
+            val newStateWithImports = newState.copy(
+              imports = allImports,
+              context = contextWithNewImports(newState.context, newImports)
+            )
 
             val warnings = newState.context.reporter
               .removeBufferedMessages(using newState.context)
-              .map(rendering.formatError)
 
             inContext(newState.context) {
               val (updatedState, definitions) =
@@ -276,8 +298,7 @@ class ReplDriver(settings: Array[String],
 
               (definitions ++ warnings)
                 .sorted
-                .map(_.msg)
-                .foreach(out.println)
+                .foreach(printDiagnostic)
 
               updatedState
             }
@@ -306,6 +327,7 @@ class ReplDriver(settings: Array[String],
           .membersBasedOnFlags(required = Method, excluded = Accessor | ParamAccessor | Synthetic | Private)
           .filterNot { denot =>
             defn.topClasses.contains(denot.symbol.owner) || denot.symbol.isConstructor
+             || denot.symbol.name.is(DefaultGetterName)
           }
 
       val vals =
@@ -368,8 +390,8 @@ class ReplDriver(settings: Array[String],
       out.println(Help.text)
       state
 
-    case Reset =>
-      resetToInitial()
+    case Reset(arg) =>
+      resetToInitial(tokenize(arg))
       initialState
 
     case Imports =>
@@ -412,6 +434,16 @@ class ReplDriver(settings: Array[String],
       }
       state
 
+    case Settings(arg) => arg match
+      case "" =>
+        given ctx: Context = state.context
+        for (s <- ctx.settings.userSetSettings(ctx.settingsState).sortBy(_.name))
+          out.println(s"${s.name} = ${if s.value == "" then "\"\"" else s.value}")
+        state
+      case _  =>
+        rootCtx = setupRootCtx(tokenize(arg).toArray, rootCtx)
+        state.copy(context = rootCtx)
+
     case Quit =>
       // end of the world!
       state
@@ -419,7 +451,21 @@ class ReplDriver(settings: Array[String],
 
   /** shows all errors nicely formatted */
   private def displayErrors(errs: Seq[Diagnostic])(implicit state: State): State = {
-    errs.map(rendering.formatError).map(_.msg).foreach(out.println)
+    errs.foreach(printDiagnostic)
     state
   }
-}
+
+  /** Like ConsoleReporter, but without file paths, -Xprompt displaying,
+   *  and using a PrintStream rather than a PrintWriter so messages aren't re-encoded. */
+  private object ReplConsoleReporter extends ConsoleReporter.AbstractConsoleReporter {
+    override def posFileStr(pos: SourcePosition) = "" // omit file paths
+    override def printMessage(msg: String): Unit = out.println(msg)
+    override def flush()(using Context): Unit    = out.flush()
+  }
+
+  /** Print warnings & errors using ReplConsoleReporter, and info straight to out */
+  private def printDiagnostic(dia: Diagnostic)(implicit state: State) = dia.level match
+    case interfaces.Diagnostic.INFO => out.println(dia.msg) // print REPL's special info diagnostics directly to out
+    case _                          => ReplConsoleReporter.doReport(dia)(using state.context)
+
+end ReplDriver
diff --git a/compiler/src/dotty/tools/repl/ReplFrontEnd.scala b/compiler/src/dotty/tools/repl/ReplFrontEnd.scala
deleted file mode 100644
index 59df49e853cb..000000000000
--- a/compiler/src/dotty/tools/repl/ReplFrontEnd.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-package dotty.tools
-package repl
-
-import dotc.typer.FrontEnd
-import dotc.CompilationUnit
-import dotc.core.Contexts._
-import dotc.typer.ImportInfo.withRootImports
-
-/** A customized `FrontEnd` for the REPL
- *
- *  This customized front end does not perform parsing as part of its `runOn`
- *  method. This allows us to keep the parsing separate from the rest of the
- *  compiler pipeline.
- */
-private[repl] class REPLFrontEnd extends FrontEnd {
-
-  override def isRunnable(using Context): Boolean = true
-
-  override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] = {
-    assert(units.size == 1) // REPl runs one compilation unit at a time
-    val unit = units.head
-    val unitContext = ctx.fresh.setCompilationUnit(unit).withRootImports
-    enterSyms(using unitContext)
-    typeCheck(using unitContext)
-    List(unit)
-  }
-}
diff --git a/compiler/src/dotty/tools/repl/ScriptEngine.scala b/compiler/src/dotty/tools/repl/ScriptEngine.scala
index 8a1d3e7c2148..501dbd0263d7 100644
--- a/compiler/src/dotty/tools/repl/ScriptEngine.scala
+++ b/compiler/src/dotty/tools/repl/ScriptEngine.scala
@@ -3,7 +3,7 @@ package repl
 
 import java.io.{Reader, StringWriter}
 import javax.script.{AbstractScriptEngine, Bindings, ScriptContext, ScriptEngine => JScriptEngine, ScriptEngineFactory, ScriptException, SimpleBindings}
-import dotc.core.StdNames.str
+import dotc.core.StdNames.{nme, str}
 
 /** A JSR 223 (Scripting API) compatible wrapper around the REPL for improved
  *  interoperability with software that supports it.
@@ -37,7 +37,7 @@ class ScriptEngine extends AbstractScriptEngine {
     val vid = state.valIndex
     state = driver.run(script)(state)
     val oid = state.objectIndex
-    Class.forName(s"${str.REPL_SESSION_LINE}$oid", true, rendering.classLoader()(using state.context))
+    Class.forName(s"${Rendering.REPL_WRAPPER_NAME_PREFIX}$oid", true, rendering.classLoader()(using state.context))
       .getDeclaredMethods.find(_.getName == s"${str.REPL_RES_PREFIX}$vid")
       .map(_.invoke(null))
       .getOrElse(null)
diff --git a/compiler/src/dotty/tools/runner/ObjectRunner.scala b/compiler/src/dotty/tools/runner/ObjectRunner.scala
new file mode 100644
index 000000000000..112b55f2e464
--- /dev/null
+++ b/compiler/src/dotty/tools/runner/ObjectRunner.scala
@@ -0,0 +1,48 @@
+package dotty.tools
+package runner
+
+import java.net.URL
+import scala.util.control.NonFatal
+import java.lang.reflect.InvocationTargetException
+import java.lang.reflect.UndeclaredThrowableException
+import java.util.concurrent.ExecutionException
+
+/**
+ * This is a copy implementation from scala/scala scala.tools.nsc.CommonRunner trait
+ */
+trait CommonRunner {
+  /** Run a given object, specified by name, using a
+   *  specified classpath and argument list.
+   *
+   *  @throws java.lang.ClassNotFoundException
+   *  @throws java.lang.NoSuchMethodException
+   *  @throws java.lang.reflect.InvocationTargetException
+   */
+  def run(urls: Seq[URL], objectName: String, arguments: Seq[String]): Unit = {
+    import RichClassLoader._
+    ScalaClassLoader.fromURLsParallelCapable(urls).run(objectName, arguments)
+  }
+
+  /** Catches any non-fatal exception thrown by run (in the case of InvocationTargetException,
+   *  unwrapping it) and returns it in an Option.
+   */
+  def runAndCatch(urls: Seq[URL], objectName: String, arguments: Seq[String]): Option[Throwable] =
+    try   { run(urls, objectName, arguments) ; None }
+    catch { case NonFatal(e) => Some(rootCause(e)) }
+
+  private def rootCause(x: Throwable): Throwable = x match {
+    case  _: InvocationTargetException |
+          _: ExceptionInInitializerError |
+          _: UndeclaredThrowableException |
+          _: ExecutionException
+            if x.getCause != null =>
+              rootCause(x.getCause)
+    case _ => x
+  }
+}
+
+/** An object that runs another object specified by name.
+ *
+ *  @author  Lex Spoon
+ */
+object ObjectRunner extends CommonRunner
diff --git a/compiler/src/dotty/tools/runner/ScalaClassLoader.scala b/compiler/src/dotty/tools/runner/ScalaClassLoader.scala
new file mode 100644
index 000000000000..af9e54f3506d
--- /dev/null
+++ b/compiler/src/dotty/tools/runner/ScalaClassLoader.scala
@@ -0,0 +1,82 @@
+package dotty.tools
+package runner
+
+import scala.language.implicitConversions
+
+import java.lang.ClassLoader
+import java.lang.invoke.{MethodHandles, MethodType}
+import java.lang.reflect.Modifier
+import java.net.{ URL, URLClassLoader }
+import java.lang.reflect.{ InvocationTargetException, UndeclaredThrowableException }
+
+import scala.annotation.internal.sharable
+import scala.annotation.tailrec
+import scala.util.control.Exception.catching
+
+final class RichClassLoader(private val self: ClassLoader) extends AnyVal {
+  /** Execute an action with this classloader as context classloader. */
+  private def asContext[T](action: => T): T = ScalaClassLoader.asContext(self)(action)
+
+  /** Load and link a class with this classloader */
+  def tryToLoadClass[T <: AnyRef](path: String): Option[Class[T]] = tryClass(path, initialize = false)
+
+  /** Load, link and initialize a class with this classloader */
+  def tryToInitializeClass[T <: AnyRef](path: String): Option[Class[T]] = tryClass(path, initialize = true)
+
+  private def tryClass[T <: AnyRef](path: String, initialize: Boolean): Option[Class[T]] =
+    catching(classOf[ClassNotFoundException], classOf[SecurityException]) opt
+      Class.forName(path, initialize, self).asInstanceOf[Class[T]]
+
+  /** Run the main method of a class to be loaded by this classloader */
+  def run(objectName: String, arguments: Seq[String]): Unit = {
+    val clsToRun = tryToInitializeClass(objectName).getOrElse(throw new ClassNotFoundException(objectName))
+    val method = clsToRun.getMethod("main", classOf[Array[String]])
+    if !Modifier.isStatic(method.getModifiers) then
+      throw new NoSuchMethodException(s"$objectName.main is not static")
+    try asContext(method.invoke(null, Array(arguments.toArray: AnyRef): _*))
+    catch unwrapHandler({ case ex => throw ex })
+  }
+
+  @tailrec private def unwrapThrowable(x: Throwable): Throwable = x match {
+    case  _: InvocationTargetException |      // thrown by reflectively invoked method or constructor
+          _: ExceptionInInitializerError |    // thrown when running a static initializer (e.g. a scala module constructor)
+          _: UndeclaredThrowableException |   // invocation on a proxy instance if its invocation handler's `invoke` throws an exception
+          _: ClassNotFoundException |         // no definition for a class instantiated by name
+          _: NoClassDefFoundError             // the definition existed when the executing class was compiled, but can no longer be found
+            if x.getCause != null =>
+              unwrapThrowable(x.getCause)
+    case _ => x
+  }
+
+  // Transforms an exception handler into one which will only receive the unwrapped
+  // exceptions (for the values of wrap covered in unwrapThrowable.)
+  private def unwrapHandler[T](pf: PartialFunction[Throwable, T]): PartialFunction[Throwable, T] =
+    pf.compose({ case ex => unwrapThrowable(ex) })
+}
+
+object RichClassLoader {
+  implicit def wrapClassLoader(loader: ClassLoader): RichClassLoader = new RichClassLoader(loader)
+}
+
+object ScalaClassLoader {
+  def setContext(cl: ClassLoader) = Thread.currentThread.setContextClassLoader(cl)
+
+  def fromURLsParallelCapable(urls: Seq[URL], parent: ClassLoader = null): URLClassLoader =
+    new URLClassLoader(urls.toArray, if parent == null then bootClassLoader else parent)
+
+  @sharable private[this] val bootClassLoader: ClassLoader =
+    if scala.util.Properties.isJavaAtLeast("9") then
+      try
+        MethodHandles.lookup().findStatic(classOf[ClassLoader], "getPlatformClassLoader", MethodType.methodType(classOf[ClassLoader])).invoke().asInstanceOf[ClassLoader]
+      catch case _: Throwable => null
+    else null
+
+  extension (classLoader: ClassLoader)
+    /** Execute an action with this classloader as context classloader. */
+    def asContext[T](action: => T): T =
+      val saved = Thread.currentThread.getContextClassLoader
+      try
+        setContext(classLoader)
+        action
+      finally setContext(saved)
+}
diff --git a/compiler/src/dotty/tools/scripting/Main.scala b/compiler/src/dotty/tools/scripting/Main.scala
old mode 100644
new mode 100755
index ded809b9f675..3a86155f1fe9
--- a/compiler/src/dotty/tools/scripting/Main.scala
+++ b/compiler/src/dotty/tools/scripting/Main.scala
@@ -2,7 +2,7 @@ package dotty.tools.scripting
 
 import java.io.File
 import java.nio.file.{Path, Paths}
-import dotty.tools.dotc.config.Properties.isWin 
+import dotty.tools.dotc.config.Properties.isWin
 
 /** Main entry point to the Scripting execution engine */
 object Main:
@@ -10,9 +10,11 @@ object Main:
       All arguments afterwards are script arguments.*/
   private def distinguishArgs(args: Array[String]): (Array[String], File, Array[String], Boolean, Boolean) =
     val (leftArgs, rest) = args.splitAt(args.indexOf("-script"))
-    assert(rest.size >= 2,s"internal error: rest == Array(${rest.mkString(",")})")
+    assert(rest.size >= 2, s"internal error: rest == Array(${rest.mkString(",")})")
 
     val file = File(rest(1))
+    // write script path to script.path property, so called script can see it
+    sys.props("script.path") = file.toPath.toAbsolutePath.toString
     val scriptArgs = rest.drop(2)
     var saveJar = false
     var invokeFlag = true // by default, script main method is invoked
@@ -32,10 +34,12 @@ object Main:
   def main(args: Array[String]): Unit =
     val (compilerArgs, scriptFile, scriptArgs, saveJar, invokeFlag) = distinguishArgs(args)
     val driver = ScriptingDriver(compilerArgs, scriptFile, scriptArgs)
-    try driver.compileAndRun { (outDir:Path, classpath:String, mainClass: String) =>
+    try driver.compileAndRun { (outDir:Path, classpathEntries:Seq[Path], mainClass: String) =>
+      // write expanded classpath to java.class.path property, so called script can see it
+      sys.props("java.class.path") = classpathEntries.map(_.toString).mkString(pathsep)
       if saveJar then
         // write a standalone jar to the script parent directory
-        writeJarfile(outDir, scriptFile, scriptArgs, classpath, mainClass)
+        writeJarfile(outDir, scriptFile, scriptArgs, classpathEntries, mainClass)
       invokeFlag
     }
     catch
@@ -47,10 +51,7 @@ object Main:
         throw e.getCause
 
   private def writeJarfile(outDir: Path, scriptFile: File, scriptArgs:Array[String],
-      classpath:String, mainClassName: String): Unit =
-
-    val javaClasspath = sys.props("java.class.path")
-    val runtimeClasspath = s"${classpath}$pathsep$javaClasspath"
+      classpathEntries:Seq[Path], mainClassName: String): Unit =
 
     val jarTargetDir: Path = Option(scriptFile.toPath.toAbsolutePath.getParent) match {
       case None => sys.error(s"no parent directory for script file [$scriptFile]")
@@ -60,7 +61,7 @@ object Main:
     def scriptBasename = scriptFile.getName.takeWhile(_!='.')
     val jarPath = s"$jarTargetDir/$scriptBasename.jar"
 
-    val cpPaths = runtimeClasspath.split(pathsep).map(_.toUrl)
+    val cpPaths = classpathEntries.map { _.toString.toUrl }
 
     import java.util.jar.Attributes.Name
     val cpString:String = cpPaths.distinct.mkString(" ")
@@ -88,11 +89,11 @@ object Main:
         case s if s.startsWith("./") => s.drop(2)
         case s => s
       }
-   
+
     // convert to absolute path relative to cwd.
     def absPath: String = norm match
       case str if str.isAbsolute => norm
-      case _ => Paths.get(userDir,norm).toString.norm
+      case _ => Paths.get(userDir, norm).toString.norm
 
     def toUrl: String = Paths.get(absPath).toUri.toURL.toString
 
diff --git a/compiler/src/dotty/tools/scripting/ScriptingDriver.scala b/compiler/src/dotty/tools/scripting/ScriptingDriver.scala
old mode 100644
new mode 100755
index af0858acf658..bce54183807b
--- a/compiler/src/dotty/tools/scripting/ScriptingDriver.scala
+++ b/compiler/src/dotty/tools/scripting/ScriptingDriver.scala
@@ -1,24 +1,18 @@
 package dotty.tools.scripting
 
-import java.nio.file.{ Files, Path }
+import java.nio.file.{ Files, Paths, Path }
 import java.io.File
-import java.net.{ URL, URLClassLoader }
-import java.lang.reflect.{ Modifier, Method }
+import java.net.{ URLClassLoader }
 
-import scala.jdk.CollectionConverters._
-
-import dotty.tools.dotc.{ Driver, Compiler }
-import dotty.tools.dotc.core.Contexts, Contexts.{ Context, ContextBase, ctx }
-import dotty.tools.dotc.config.CompilerCommand
-import dotty.tools.io.{ PlainDirectory, Directory }
-import dotty.tools.dotc.reporting.Reporter
-import dotty.tools.dotc.config.Settings.Setting._
-
-import sys.process._
+import dotty.tools.dotc.Driver
+import dotty.tools.dotc.core.Contexts, Contexts.{ Context, ctx }
+import dotty.tools.io.{ PlainDirectory, Directory, ClassPath }
+import Util.*
 
 class ScriptingDriver(compilerArgs: Array[String], scriptFile: File, scriptArgs: Array[String]) extends Driver:
-  def compileAndRun(pack:(Path, String, String) => Boolean = null): Unit =
+  def compileAndRun(pack:(Path, Seq[Path], String) => Boolean = null): Unit =
     val outDir = Files.createTempDirectory("scala3-scripting")
+    outDir.toFile.deleteOnExit()
     setup(compilerArgs :+ scriptFile.getAbsolutePath, initCtx.fresh) match
       case Some((toCompile, rootCtx)) =>
         given Context = rootCtx.fresh.setSetting(rootCtx.settings.outputDir,
@@ -28,11 +22,13 @@ class ScriptingDriver(compilerArgs: Array[String], scriptFile: File, scriptArgs:
           throw ScriptingException("Errors encountered during compilation")
 
         try
-          val (mainClass, mainMethod) = detectMainClassAndMethod(outDir, ctx.settings.classpath.value, scriptFile)
+          val classpath = s"${ctx.settings.classpath.value}${pathsep}${sys.props("java.class.path")}"
+          val classpathEntries: Seq[Path] = ClassPath.expandPath(classpath, expandStar=true).map { Paths.get(_) }
+          val (mainClass, mainMethod) = detectMainClassAndMethod(outDir, classpathEntries, scriptFile.toString)
           val invokeMain: Boolean =
             Option(pack) match
               case Some(func) =>
-                func(outDir, ctx.settings.classpath.value, mainClass)
+                func(outDir, classpathEntries, mainClass)
               case None =>
                 true
             end match
@@ -45,57 +41,6 @@ class ScriptingDriver(compilerArgs: Array[String], scriptFile: File, scriptArgs:
       case None =>
   end compileAndRun
 
-  private def deleteFile(target: File): Unit =
-    if target.isDirectory then
-      for member <- target.listFiles.toList
-      do deleteFile(member)
-    target.delete()
-  end deleteFile
-
-  private def detectMainClassAndMethod(outDir: Path, classpath: String,
-      scriptFile: File): (String, Method) =
-    val outDirURL = outDir.toUri.toURL
-    val classpathUrls = classpath.split(pathsep).map(File(_).toURI.toURL)
-    val cl = URLClassLoader(classpathUrls :+ outDirURL)
-
-    def collectMainMethods(target: File, path: String): List[(String, Method)] =
-      val nameWithoutExtension = target.getName.takeWhile(_ != '.')
-      val targetPath =
-        if path.nonEmpty then s"${path}.${nameWithoutExtension}"
-        else nameWithoutExtension
-
-      if target.isDirectory then
-        for
-          packageMember <- target.listFiles.toList
-          membersMainMethod <- collectMainMethods(packageMember, targetPath)
-        yield membersMainMethod
-      else if target.getName.endsWith(".class") then
-        val cls = cl.loadClass(targetPath)
-        try
-          val method = cls.getMethod("main", classOf[Array[String]])
-          if Modifier.isStatic(method.getModifiers) then List((cls.getName, method)) else Nil
-        catch
-          case _: java.lang.NoSuchMethodException => Nil
-      else Nil
-    end collectMainMethods
-
-    val candidates = for
-      file <- outDir.toFile.listFiles.toList
-      method <- collectMainMethods(file, "")
-    yield method
-
-    candidates match
-      case Nil =>
-        throw ScriptingException(s"No main methods detected in script ${scriptFile}")
-      case _ :: _ :: _ =>
-        throw ScriptingException("A script must contain only one main method. " +
-          s"Detected the following main methods:\n${candidates.mkString("\n")}")
-      case m :: Nil => m
-    end match
-  end detectMainClassAndMethod
-
-  def pathsep = sys.props("path.separator")
-
 end ScriptingDriver
 
 case class ScriptingException(msg: String) extends RuntimeException(msg)
diff --git a/compiler/src/dotty/tools/scripting/StringDriver.scala b/compiler/src/dotty/tools/scripting/StringDriver.scala
new file mode 100755
index 000000000000..6ac0bce9766a
--- /dev/null
+++ b/compiler/src/dotty/tools/scripting/StringDriver.scala
@@ -0,0 +1,45 @@
+package dotty.tools.scripting
+
+import java.nio.file.{ Files, Paths, Path }
+
+import dotty.tools.dotc.Driver
+import dotty.tools.dotc.core.Contexts, Contexts.{ Context, ctx }
+import dotty.tools.io.{ PlainDirectory, Directory, ClassPath }
+import Util.*
+
+class StringDriver(compilerArgs: Array[String], scalaSource: String) extends Driver:
+  override def sourcesRequired: Boolean = false
+
+  def compileAndRun(classpath: List[String] = Nil): Unit =
+    val outDir = Files.createTempDirectory("scala3-expression")
+    outDir.toFile.deleteOnExit()
+
+    setup(compilerArgs, initCtx.fresh) match
+      case Some((toCompile, rootCtx)) =>
+        given Context = rootCtx.fresh.setSetting(rootCtx.settings.outputDir,
+          new PlainDirectory(Directory(outDir)))
+
+        val compiler = newCompiler
+        compiler.newRun.compileFromStrings(List(scalaSource))
+
+        val output = ctx.settings.outputDir.value
+        if ctx.reporter.hasErrors then
+          throw StringDriverException("Errors encountered during compilation")
+
+        try
+          val classpath = s"${ctx.settings.classpath.value}${pathsep}${sys.props("java.class.path")}"
+          val classpathEntries: Seq[Path] = ClassPath.expandPath(classpath, expandStar=true).map { Paths.get(_) }
+          sys.props("java.class.path") = classpathEntries.map(_.toString).mkString(pathsep)
+          val (mainClass, mainMethod) = detectMainClassAndMethod(outDir, classpathEntries, scalaSource)
+          mainMethod.invoke(null, Array.empty[String])
+        catch
+          case e: java.lang.reflect.InvocationTargetException =>
+            throw e.getCause
+        finally
+          deleteFile(outDir.toFile)
+      case None =>
+  end compileAndRun
+
+end StringDriver
+
+case class StringDriverException(msg: String) extends RuntimeException(msg)
diff --git a/compiler/src/dotty/tools/scripting/Util.scala b/compiler/src/dotty/tools/scripting/Util.scala
new file mode 100755
index 000000000000..9529eb9ad791
--- /dev/null
+++ b/compiler/src/dotty/tools/scripting/Util.scala
@@ -0,0 +1,60 @@
+package dotty.tools.scripting
+
+import java.nio.file.{ Path }
+import java.io.File
+import java.net.{ URLClassLoader }
+import java.lang.reflect.{ Modifier, Method }
+
+object Util:
+
+  def deleteFile(target: File): Unit =
+    if target.isDirectory then
+      for member <- target.listFiles.toList
+      do deleteFile(member)
+    target.delete()
+  end deleteFile
+
+  def detectMainClassAndMethod(outDir: Path, classpathEntries: Seq[Path], srcFile: String): (String, Method) =
+    val classpathUrls = (classpathEntries :+ outDir).map { _.toUri.toURL }
+    val cl = URLClassLoader(classpathUrls.toArray)
+
+    def collectMainMethods(target: File, path: String): List[(String, Method)] =
+      val nameWithoutExtension = target.getName.takeWhile(_ != '.')
+      val targetPath =
+        if path.nonEmpty then s"${path}.${nameWithoutExtension}"
+        else nameWithoutExtension
+
+      if target.isDirectory then
+        for
+          packageMember <- target.listFiles.toList
+          membersMainMethod <- collectMainMethods(packageMember, targetPath)
+        yield membersMainMethod
+      else if target.getName.endsWith(".class") then
+        val cls = cl.loadClass(targetPath)
+        try
+          val method = cls.getMethod("main", classOf[Array[String]])
+          if Modifier.isStatic(method.getModifiers) then List((cls.getName, method)) else Nil
+        catch
+          case _: java.lang.NoSuchMethodException => Nil
+      else Nil
+    end collectMainMethods
+
+    val mains = for
+      file <- outDir.toFile.listFiles.toList
+      method <- collectMainMethods(file, "")
+    yield method
+
+    mains match
+      case Nil =>
+        throw StringDriverException(s"No main methods detected for [${srcFile}]")
+      case _ :: _ :: _ =>
+        throw StringDriverException(
+          s"internal error: Detected the following main methods:\n${mains.mkString("\n")}")
+      case m :: Nil => m
+    end match
+  end detectMainClassAndMethod
+
+  def pathsep = sys.props("path.separator")
+
+end Util
+
diff --git a/compiler/src/scala/quoted/runtime/impl/Matcher.scala b/compiler/src/scala/quoted/runtime/impl/Matcher.scala
deleted file mode 100644
index c6176cbcf830..000000000000
--- a/compiler/src/scala/quoted/runtime/impl/Matcher.scala
+++ /dev/null
@@ -1,438 +0,0 @@
-package scala.quoted
-package runtime.impl
-
-import scala.annotation.internal.sharable
-import scala.annotation.{Annotation, compileTimeOnly}
-
-/** Matches a quoted tree against a quoted pattern tree.
- *  A quoted pattern tree may have type and term holes in addition to normal terms.
- *
- *
- *  Semantics:
- *
- *  We use `'{..}` for expression, `'[..]` for types and `⟨..⟩` for patterns nested in expressions.
- *  The semantics are defined as a list of reduction rules that are tried one by one until one matches.
- *
- *   Operations:
- *   - `s =?= p` checks if a scrutinee `s` matches the pattern `p` while accumulating extracted parts of the code.
- *   - `isColosedUnder(x1, .., xn)('{e})` returns true if and only if all the references in `e` to names defined in the patttern are contained in the set `{x1, ... xn}`.
- *   - `lift(x1, .., xn)('{e})` returns `(y1, ..., yn) => [xi = $yi]'{e}` where `yi` is an `Expr` of the type of `xi`.
- *   - `withEnv(x1 -> y1, ..., xn -> yn)(matching)` evaluates mathing recording that `xi` is equivalent to `yi`.
- *   - `matched` denotes that the the match succedded and `matched('{e})` denotes that a matech succeded and extracts `'{e}`
- *   - `&&&` matches if both sides match. Concatenates the extracted expressions of both sides.
- *
- *   Note: that not all quoted terms bellow are valid expressions
- *
- *   ```scala
- *   /* Term hole */
- *   '{ e } =?= '{ hole[T] }  &&  typeOf('{e}) <:< T && isColosedUnder()('{e})  ===>   matched('{e})
- *
- *   /* Higher order term hole */
- *   '{ e } =?= '{ hole[(T1, ..., Tn) => T](x1, ..., xn) }  &&  isColosedUnder(x1, ... xn)('{e})  ===>   matched(lift(x1, ..., xn)('{e}))
- *
- *   /* Match literal */
- *   '{ lit } =?= '{ lit }   ===>   matched
- *
- *   /* Match type ascription (a) */
- *   '{ e: T } =?= '{ p }   ===>   '{e} =?= '{p}
- *
- *   /* Match type ascription (b) */
- *   '{ e } =?= '{ p: P }   ===>   '{e} =?= '{p}
- *
- *   /* Match selection */
- *   '{ e.x } =?= '{ p.x }   ===>   '{e} =?= '{p}
- *
- *   /* Match reference */
- *   '{ x } =?= '{ x }   ===>   matched
- *
- *   /* Match application */
- *   '{e0(e1, ..., en)} =?= '{p0(p1, ..., p2)}   ===>   '{e0} =?= '{p0} &&& '{e1} =?= '{p1} &&& ... %% '{en} =?= '{pn}
- *
- *   /* Match type application */
- *   '{e[T1, ..., Tn]} =?= '{p[P1, ..., Pn]}   ===>   '{e} =?= '{p} &&& '[T1] =?= '{P1} &&& ... %% '[Tn] =?= '[Pn]
- *
- *   /* Match block flattening */
- *   '{ {e0; e1; ...; en}; em } =?= '{ {p0; p1; ...; pm}; em }   ===>   '{ e0; {e1; ...; en; em} } =?= '{ p0; {p1; ...; pm; em} }
- *
- *   /* Match block */
- *   '{ e1; e2 } =?= '{ p1; p2 }   ===>   '{e1} =?= '{p1} &&& '{e2} =?= '{p2}
- *
- *   /* Match def block */
- *   '{ e1; e2 } =?= '{ p1; p2 }   ===>   withEnv(symOf(e1) -> symOf(p1))('{e1} =?= '{p1} &&& '{e2} =?= '{p2})
- *
- *   /* Match if */
- *   '{ if e0 then e1 else e2 } =?= '{ if p0 then p1 else p2 }   ===>  '{e0} =?= '{p0} &&& '{e1} =?= '{p1} &&& '{e2} =?= '{p2}
- *
- *   /* Match while */
- *   '{ while e0 do e1 } =?= '{ while p0 do p1 }   ===>  '{e0} =?= '{p0} &&& '{e1} =?= '{p1}
- *
- *   /* Match assign */
- *   '{ e0 = e1 } =?= '{ p0 = p1 }   ==>   '{e0} =?= '{p0} &&& '{e1} =?= '{p1}
- *
- *   /* Match new */
- *   '{ new T } =?= '{ new T }   ===>   matched
- *
- *   /* Match this */
- *   '{ C.this } =?= '{ C.this }   ===>   matched
- *
- *   /* Match super */
- *   '{ e.super } =?= '{ p.super }   ===>   '{e} =?= '{p}
- *
- *   /* Match varargs */
- *   '{ e: _* } =?= '{ p: _* }   ===>   '{e} =?= '{p}
- *
- *   /* Match val */
- *   '{ val x: T = e1; e2 } =?= '{ val y: P = p1; p2 }   ===>   withEnv(x -> y)('[T] =?= '[P] &&& '{e1} =?= '{p1} &&& '{e2} =?= '{p2})
- *
- *   /* Match def */
- *   '{ def x0(x1: T1, ..., xn: Tn): T0 = e1; e2 } =?= '{ def y0(y1: P1, ..., yn: Pn): P0 = p1; p2 }   ===>   withEnv(x0 -> y0, ..., xn -> yn)('[T0] =?= '[P0] &&& ... &&& '[Tn] =?= '[Pn] &&& '{e1} =?= '{p1} &&& '{e2} =?= '{p2})
- *
- *   // Types
- *
- *   /* Match type */
- *   '[T] =?= '[P] && T <:< P   ===>   matched
- *
- *   ```
- */
-object Matcher {
-
-  abstract class QuoteMatcher[QCtx <: Quotes & Singleton](val qctx: QCtx) {
-
-    // TODO improve performance
-
-    // TODO use flag from qctx.reflect. Maybe -debug or add -debug-macros
-    private inline val debug = false
-
-    import qctx.reflect._
-    import Matching._
-
-    def patternHoleSymbol: Symbol
-    def higherOrderHoleSymbol: Symbol
-
-    /** A map relating equivalent symbols from the scrutinee and the pattern
-     *  For example in
-     *  ```
-     *  '{val a = 4; a * a} match case '{ val x = 4; x * x }
-     *  ```
-     *  when matching `a * a` with `x * x` the environment will contain `Map(a -> x)`.
-     */
-    private type Env = Map[Symbol, Symbol]
-
-    inline private def withEnv[T](env: Env)(inline body: Env ?=> T): T = body(using env)
-
-    def termMatch(scrutineeTerm: Term, patternTerm: Term): Option[Tuple] =
-      given Env = Map.empty
-      scrutineeTerm =?= patternTerm
-
-    def typeTreeMatch(scrutineeTypeTree: TypeTree, patternTypeTree: TypeTree): Option[Tuple] =
-      given Env = Map.empty
-      scrutineeTypeTree =?= patternTypeTree
-
-    /** Check that all trees match with `mtch` and concatenate the results with &&& */
-    private def matchLists[T](l1: List[T], l2: List[T])(mtch: (T, T) => Matching): Matching = (l1, l2) match {
-      case (x :: xs, y :: ys) => mtch(x, y) &&& matchLists(xs, ys)(mtch)
-      case (Nil, Nil) => matched
-      case _ => notMatched
-    }
-
-    extension (scrutinees: List[Tree])
-      /** Check that all trees match with =?= and concatenate the results with &&& */
-      private def =?= (patterns: List[Tree])(using Env): Matching =
-        matchLists(scrutinees, patterns)(_ =?= _)
-
-    extension (scrutinee0: Tree)
-      /** Check that the trees match and return the contents from the pattern holes.
-       *  Return None if the trees do not match otherwise return Some of a tuple containing all the contents in the holes.
-       *
-       *  @param scrutinee The tree beeing matched
-       *  @param pattern The pattern tree that the scrutinee should match. Contains `patternHole` holes.
-       *  @param `summon[Env]` Set of tuples containing pairs of symbols (s, p) where s defines a symbol in `scrutinee` which corresponds to symbol p in `pattern`.
-       *  @return `None` if it did not match or `Some(tup: Tuple)` if it matched where `tup` contains the contents of the holes.
-       */
-      private def =?= (pattern0: Tree)(using Env): Matching = {
-
-        /* Match block flattening */ // TODO move to cases
-        /** Normalize the tree */
-        def normalize(tree: Tree): Tree = tree match {
-          case Block(Nil, expr) => normalize(expr)
-          case Block(stats1, Block(stats2, expr)) =>
-            expr match
-              case _: Closure => tree
-              case _ => normalize(Block(stats1 ::: stats2, expr))
-          case Inlined(_, Nil, expr) => normalize(expr)
-          case _ => tree
-        }
-
-        val scrutinee = normalize(scrutinee0)
-        val pattern = normalize(pattern0)
-
-        /** Check that both are `val` or both are `lazy val` or both are `var` **/
-        def checkValFlags(): Boolean = {
-          import Flags._
-          val sFlags = scrutinee.symbol.flags
-          val pFlags = pattern.symbol.flags
-          sFlags.is(Lazy) == pFlags.is(Lazy) && sFlags.is(Mutable) == pFlags.is(Mutable)
-        }
-
-        (scrutinee, pattern) match {
-
-          /* Term hole */
-          // Match a scala.internal.Quoted.patternHole typed as a repeated argument and return the scrutinee tree
-          case (scrutinee @ Typed(s, tpt1), Typed(TypeApply(patternHole, tpt :: Nil), tpt2))
-              if patternHole.symbol == patternHoleSymbol &&
-                 s.tpe <:< tpt.tpe &&
-                 tpt2.tpe.derivesFrom(defn.RepeatedParamClass) =>
-            matched(scrutinee.asExpr)
-
-          /* Term hole */
-          // Match a scala.internal.Quoted.patternHole and return the scrutinee tree
-          case (ClosedPatternTerm(scrutinee), TypeApply(patternHole, tpt :: Nil))
-              if patternHole.symbol == patternHoleSymbol &&
-                 scrutinee.tpe <:< tpt.tpe =>
-            matched(scrutinee.asExpr)
-
-          /* Higher order term hole */
-          // Matches an open term and wraps it into a lambda that provides the free variables
-          case (scrutinee, pattern @ Apply(TypeApply(Ident("higherOrderHole"), List(Inferred())), Repeated(args, _) :: Nil))
-              if pattern.symbol == higherOrderHoleSymbol =>
-
-            def bodyFn(lambdaArgs: List[Tree]): Tree = {
-              val argsMap = args.map(_.symbol).zip(lambdaArgs.asInstanceOf[List[Term]]).toMap
-              new TreeMap {
-                override def transformTerm(tree: Term)(owner: Symbol): Term =
-                  tree match
-                    case tree: Ident => summon[Env].get(tree.symbol).flatMap(argsMap.get).getOrElse(tree)
-                    case tree => super.transformTerm(tree)(owner)
-              }.transformTree(scrutinee)(Symbol.spliceOwner)
-            }
-            val names = args.map {
-              case Block(List(DefDef("$anonfun", _, _, Some(Apply(Ident(name), _)))), _) => name
-              case arg => arg.symbol.name
-            }
-            val argTypes = args.map(x => x.tpe.widenTermRefByName)
-            val resType = pattern.tpe
-            val res = Lambda(Symbol.spliceOwner, MethodType(names)(_ => argTypes, _ => resType), (meth, x) => bodyFn(x).changeOwner(meth))
-            matched(res.asExpr)
-
-          //
-          // Match two equivalent trees
-          //
-
-          /* Match literal */
-          case (Literal(constant1), Literal(constant2)) if constant1 == constant2 =>
-            matched
-
-          /* Match type ascription (a) */
-          case (Typed(expr1, _), pattern) =>
-            expr1 =?= pattern
-
-          /* Match type ascription (b) */
-          case (scrutinee, Typed(expr2, _)) =>
-            scrutinee =?= expr2
-
-          /* Match selection */
-          case (ref: Ref, Select(qual2, _)) if symbolMatch(scrutinee, pattern) =>
-            ref match
-              case Select(qual1, _) => qual1 =?= qual2
-              case ref: Ident =>
-                ref.tpe match
-                  case TermRef(qual: TermRef, _) => Ref.term(qual) =?= qual2
-                  case _ => matched
-
-          /* Match reference */
-          case (_: Ref, _: Ident) if symbolMatch(scrutinee, pattern) =>
-            matched
-
-          /* Match application */
-          case (Apply(fn1, args1), Apply(fn2, args2)) =>
-            fn1 =?= fn2 &&& args1 =?= args2
-
-          /* Match type application */
-          case (TypeApply(fn1, args1), TypeApply(fn2, args2)) =>
-            fn1 =?= fn2 &&& args1 =?= args2
-
-          /* Match block */
-          case (Block(stat1 :: stats1, expr1), Block(stat2 :: stats2, expr2)) =>
-            val newEnv = (stat1, stat2) match {
-              case (stat1: Definition, stat2: Definition) =>
-                summon[Env] + (stat1.symbol -> stat2.symbol)
-              case _ =>
-                summon[Env]
-            }
-            withEnv(newEnv) {
-              stat1 =?= stat2 &&& Block(stats1, expr1) =?= Block(stats2, expr2)
-            }
-
-          /* Match if */
-          case (If(cond1, thenp1, elsep1), If(cond2, thenp2, elsep2)) =>
-            cond1 =?= cond2 &&& thenp1 =?= thenp2 &&& elsep1 =?= elsep2
-
-          /* Match while */
-          case (While(cond1, body1), While(cond2, body2)) =>
-            cond1 =?= cond2 &&& body1 =?= body2
-
-          /* Match assign */
-          case (Assign(lhs1, rhs1), Assign(lhs2, rhs2)) =>
-            lhs1 =?= lhs2 &&& rhs1 =?= rhs2
-
-          /* Match new */
-          case (New(tpt1), New(tpt2)) if tpt1.tpe.typeSymbol == tpt2.tpe.typeSymbol =>
-            matched
-
-          /* Match this */
-          case (This(_), This(_)) if scrutinee.symbol == pattern.symbol =>
-            matched
-
-          /* Match super */
-          case (Super(qual1, mix1), Super(qual2, mix2)) if mix1 == mix2 =>
-            qual1 =?= qual2
-
-          /* Match varargs */
-          case (Repeated(elems1, _), Repeated(elems2, _)) if elems1.size == elems2.size =>
-            elems1 =?= elems2
-
-          /* Match type */
-          // TODO remove this?
-          case (scrutinee: TypeTree, pattern: TypeTree) if scrutinee.tpe <:< pattern.tpe =>
-            matched
-
-          /* Match val */
-          case (ValDef(_, tpt1, rhs1), ValDef(_, tpt2, rhs2)) if checkValFlags() =>
-            def rhsEnv = summon[Env] + (scrutinee.symbol -> pattern.symbol)
-            tpt1 =?= tpt2 &&& treeOptMatches(rhs1, rhs2)(using rhsEnv)
-
-          /* Match def */
-          case (DefDef(_, paramss1, tpt1, Some(rhs1)), DefDef(_, paramss2, tpt2, Some(rhs2))) =>
-            def rhsEnv =
-              val paramSyms: List[(Symbol, Symbol)] =
-                for
-                  (clause1, clause2) <- paramss1.zip(paramss2)
-                  (param1, param2) <- clause1.params.zip(clause2.params)
-                yield
-                  param1.symbol -> param2.symbol
-              val oldEnv: Env = summon[Env]
-              val newEnv: List[(Symbol, Symbol)] = (scrutinee.symbol -> pattern.symbol) :: paramSyms
-              oldEnv ++ newEnv
-
-            matchLists(paramss1, paramss2)(_ =?= _)
-              &&& tpt1 =?= tpt2
-              &&& withEnv(rhsEnv)(rhs1 =?= rhs2)
-
-          case (Closure(_, tpt1), Closure(_, tpt2)) =>
-            // TODO match tpt1 with tpt2?
-            matched
-
-          case (NamedArg(name1, arg1), NamedArg(name2, arg2)) if name1 == name2 =>
-            arg1 =?= arg2
-
-          // No Match
-          case _ =>
-            if (debug)
-              println(
-                s""">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-                   |Scrutinee
-                   |  ${scrutinee.show}
-                   |did not match pattern
-                   |  ${pattern.show}
-                   |
-                   |with environment: ${summon[Env]}
-                   |
-                   |Scrutinee: ${scrutinee.show(using Printer.TreeStructure)}
-                   |Pattern: ${pattern.show(using Printer.TreeStructure)}
-                   |
-                   |""".stripMargin)
-            notMatched
-        }
-      }
-    end extension
-
-    extension (scrutinee: ParamClause)
-      /** Check that all parameters in the clauses clauses match with =?= and concatenate the results with &&& */
-      private def =?= (pattern: ParamClause)(using Env)(using DummyImplicit): Matching =
-        (scrutinee, pattern) match
-          case (TermParamClause(params1), TermParamClause(params2)) => matchLists(params1, params2)(_ =?= _)
-          case (TypeParamClause(params1), TypeParamClause(params2)) => matchLists(params1, params2)(_ =?= _)
-          case _ => notMatched
-
-    /** Does the scrutenne symbol match the pattern symbol? It matches if:
-     *   - They are the same symbol
-     *   - The scrutinee has is in the environment and they are equivalent
-     *   - The scrutinee overrides the symbol of the pattern
-     */
-    private def symbolMatch(scrutineeTree: Tree, patternTree: Tree)(using Env): Boolean =
-      val scrutinee = scrutineeTree.symbol
-      val devirtualizedScrutinee = scrutineeTree match
-        case Select(qual, _) =>
-          val sym = scrutinee.overridingSymbol(qual.tpe.typeSymbol)
-          if sym.exists then sym
-          else scrutinee
-        case _ => scrutinee
-      val pattern = patternTree.symbol
-
-      devirtualizedScrutinee == pattern
-      || summon[Env].get(devirtualizedScrutinee).contains(pattern)
-      || devirtualizedScrutinee.allOverriddenSymbols.contains(pattern)
-
-    private object ClosedPatternTerm {
-      /** Matches a term that does not contain free variables defined in the pattern (i.e. not defined in `Env`) */
-      def unapply(term: Term)(using Env): Option[term.type] =
-        if freePatternVars(term).isEmpty then Some(term) else None
-
-      /** Return all free variables of the term defined in the pattern (i.e. defined in `Env`) */
-      def freePatternVars(term: Term)(using env: Env): Set[Symbol] =
-        val accumulator = new TreeAccumulator[Set[Symbol]] {
-          def foldTree(x: Set[Symbol], tree: Tree)(owner: Symbol): Set[Symbol] =
-            tree match
-              case tree: Ident if env.contains(tree.symbol) => foldOverTree(x + tree.symbol, tree)(owner)
-              case _ => foldOverTree(x, tree)(owner)
-        }
-        accumulator.foldTree(Set.empty, term)(Symbol.spliceOwner)
-    }
-
-    private object IdentArgs {
-      def unapply(args: List[Term]): Option[List[Ident]] =
-        args.foldRight(Option(List.empty[Ident])) {
-          case (id: Ident, Some(acc)) => Some(id :: acc)
-          case (Block(List(DefDef("$anonfun", TermParamClause(params) :: Nil, Inferred(), Some(Apply(id: Ident, args)))), Closure(Ident("$anonfun"), None)), Some(acc))
-              if params.zip(args).forall(_.symbol == _.symbol) =>
-            Some(id :: acc)
-          case _ => None
-        }
-    }
-
-    private def treeOptMatches(scrutinee: Option[Tree], pattern: Option[Tree])(using Env): Matching = {
-      (scrutinee, pattern) match {
-        case (Some(x), Some(y)) => x =?= y
-        case (None, None) => matched
-        case _ => notMatched
-      }
-    }
-
-  }
-
-  /** Result of matching a part of an expression */
-  private opaque type Matching = Option[Tuple]
-
-  private object Matching {
-
-    def notMatched: Matching = None
-    val matched: Matching = Some(Tuple())
-    def matched(x: Any): Matching = Some(Tuple1(x))
-
-    extension (self: Matching)
-      def asOptionOfTuple: Option[Tuple] = self
-
-      /** Concatenates the contents of two successful matchings or return a `notMatched` */
-      def &&& (that: => Matching): Matching = self match {
-        case Some(x) =>
-          that match {
-            case Some(y) => Some(x ++ y)
-            case _ => None
-          }
-        case _ => None
-      }
-    end extension
-
-  }
-
-}
diff --git a/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala b/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala
new file mode 100644
index 000000000000..6d9ff6ca68a8
--- /dev/null
+++ b/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala
@@ -0,0 +1,474 @@
+package scala.quoted
+package runtime.impl
+
+import scala.annotation.internal.sharable
+import scala.annotation.{Annotation, compileTimeOnly}
+
+import dotty.tools.dotc
+import dotty.tools.dotc.ast.tpd
+import dotty.tools.dotc.core.Contexts.*
+import dotty.tools.dotc.core.Flags.*
+import dotty.tools.dotc.core.Names.*
+import dotty.tools.dotc.core.Types.*
+import dotty.tools.dotc.core.StdNames.nme
+import dotty.tools.dotc.core.Symbols.*
+
+/** Matches a quoted tree against a quoted pattern tree.
+ *  A quoted pattern tree may have type and term holes in addition to normal terms.
+ *
+ *
+ *  Semantics:
+ *
+ *  We use `'{..}` for expression, `'[..]` for types and `⟨..⟩` for patterns nested in expressions.
+ *  The semantics are defined as a list of reduction rules that are tried one by one until one matches.
+ *
+ *   Operations:
+ *   - `s =?= p` checks if a scrutinee `s` matches the pattern `p` while accumulating extracted parts of the code.
+ *   - `isClosedUnder(x1, .., xn)('{e})` returns true if and only if all the references in `e` to names defined in the pattern are contained in the set `{x1, ... xn}`.
+ *   - `lift(x1, .., xn)('{e})` returns `(y1, ..., yn) => [xi = $yi]'{e}` where `yi` is an `Expr` of the type of `xi`.
+ *   - `withEnv(x1 -> y1, ..., xn -> yn)(matching)` evaluates matching recording that `xi` is equivalent to `yi`.
+ *   - `matched` denotes that the the match succeeded and `matched('{e})` denotes that a match succeeded and extracts `'{e}`
+ *   - `&&&` matches if both sides match. Concatenates the extracted expressions of both sides.
+ *
+ *   Note: that not all quoted terms bellow are valid expressions
+ *
+ *   ```scala
+ *   /* Term hole */
+ *   '{ e } =?= '{ hole[T] }  &&  typeOf('{e}) <:< T && isClosedUnder()('{e})  ===>   matched('{e})
+ *
+ *   /* Higher order term hole */
+ *   '{ e } =?= '{ hole[(T1, ..., Tn) => T](x1, ..., xn) }  &&  isClosedUnder(x1, ... xn)('{e})  ===>   matched(lift(x1, ..., xn)('{e}))
+ *
+ *   /* Match literal */
+ *   '{ lit } =?= '{ lit }   ===>   matched
+ *
+ *   /* Match type ascription (a) */
+ *   '{ e: T } =?= '{ p }   ===>   '{e} =?= '{p}
+ *
+ *   /* Match type ascription (b) */
+ *   '{ e } =?= '{ p: P }   ===>   '{e} =?= '{p}
+ *
+ *   /* Match selection */
+ *   '{ e.x } =?= '{ p.x }   ===>   '{e} =?= '{p}
+ *
+ *   /* Match reference */
+ *   '{ x } =?= '{ x }   ===>   matched
+ *
+ *   /* Match application */
+ *   '{e0(e1, ..., en)} =?= '{p0(p1, ..., p2)}   ===>   '{e0} =?= '{p0} &&& '{e1} =?= '{p1} &&& ... %% '{en} =?= '{pn}
+ *
+ *   /* Match type application */
+ *   '{e[T1, ..., Tn]} =?= '{p[P1, ..., Pn]}   ===>   '{e} =?= '{p} &&& '[T1] =?= '{P1} &&& ... %% '[Tn] =?= '[Pn]
+ *
+ *   /* Match block flattening */
+ *   '{ {e0; e1; ...; en}; em } =?= '{ {p0; p1; ...; pm}; em }   ===>   '{ e0; {e1; ...; en; em} } =?= '{ p0; {p1; ...; pm; em} }
+ *
+ *   /* Match block */
+ *   '{ e1; e2 } =?= '{ p1; p2 }   ===>   '{e1} =?= '{p1} &&& '{e2} =?= '{p2}
+ *
+ *   /* Match def block */
+ *   '{ e1; e2 } =?= '{ p1; p2 }   ===>   withEnv(symOf(e1) -> symOf(p1))('{e1} =?= '{p1} &&& '{e2} =?= '{p2})
+ *
+ *   /* Match if */
+ *   '{ if e0 then e1 else e2 } =?= '{ if p0 then p1 else p2 }   ===>  '{e0} =?= '{p0} &&& '{e1} =?= '{p1} &&& '{e2} =?= '{p2}
+ *
+ *   /* Match while */
+ *   '{ while e0 do e1 } =?= '{ while p0 do p1 }   ===>  '{e0} =?= '{p0} &&& '{e1} =?= '{p1}
+ *
+ *   /* Match assign */
+ *   '{ e0 = e1 } =?= '{ p0 = p1 }   ==>   '{e0} =?= '{p0} &&& '{e1} =?= '{p1}
+ *
+ *   /* Match new */
+ *   '{ new T } =?= '{ new T }   ===>   matched
+ *
+ *   /* Match this */
+ *   '{ C.this } =?= '{ C.this }   ===>   matched
+ *
+ *   /* Match super */
+ *   '{ e.super } =?= '{ p.super }   ===>   '{e} =?= '{p}
+ *
+ *   /* Match varargs */
+ *   '{ e: _* } =?= '{ p: _* }   ===>   '{e} =?= '{p}
+ *
+ *   /* Match val */
+ *   '{ val x: T = e1; e2 } =?= '{ val y: P = p1; p2 }   ===>   withEnv(x -> y)('[T] =?= '[P] &&& '{e1} =?= '{p1} &&& '{e2} =?= '{p2})
+ *
+ *   /* Match def */
+ *   '{ def x0(x1: T1, ..., xn: Tn): T0 = e1; e2 } =?= '{ def y0(y1: P1, ..., yn: Pn): P0 = p1; p2 }   ===>   withEnv(x0 -> y0, ..., xn -> yn)('[T0] =?= '[P0] &&& ... &&& '[Tn] =?= '[Pn] &&& '{e1} =?= '{p1} &&& '{e2} =?= '{p2})
+ *
+ *   // Types
+ *
+ *   /* Match type */
+ *   '[T] =?= '[P] && T <:< P   ===>   matched
+ *
+ *   ```
+ */
+object QuoteMatcher {
+  import tpd.*
+
+  // TODO improve performance
+
+  // TODO use flag from Context. Maybe -debug or add -debug-macros
+  private inline val debug = false
+
+  import Matching._
+
+  /** A map relating equivalent symbols from the scrutinee and the pattern
+    *  For example in
+    *  ```
+    *  '{val a = 4; a * a} match case '{ val x = 4; x * x }
+    *  ```
+    *  when matching `a * a` with `x * x` the environment will contain `Map(a -> x)`.
+    */
+  private type Env = Map[Symbol, Symbol]
+
+  private def withEnv[T](env: Env)(body: Env ?=> T): T = body(using env)
+
+  def treeMatch(scrutineeTerm: Tree, patternTerm: Tree)(using Context): Option[Tuple] =
+    given Env = Map.empty
+    scrutineeTerm =?= patternTerm
+
+  /** Check that all trees match with `mtch` and concatenate the results with &&& */
+  private def matchLists[T](l1: List[T], l2: List[T])(mtch: (T, T) => Matching): Matching = (l1, l2) match {
+    case (x :: xs, y :: ys) => mtch(x, y) &&& matchLists(xs, ys)(mtch)
+    case (Nil, Nil) => matched
+    case _ => notMatched
+  }
+
+  extension (scrutinees: List[Tree])
+    private def =?= (patterns: List[Tree])(using Env, Context): Matching =
+      matchLists(scrutinees, patterns)(_ =?= _)
+
+  extension (scrutinee0: Tree)
+
+    /** Check that the trees match and return the contents from the pattern holes.
+      *  Return None if the trees do not match otherwise return Some of a tuple containing all the contents in the holes.
+      *
+      *  @param scrutinee The tree being matched
+      *  @param pattern The pattern tree that the scrutinee should match. Contains `patternHole` holes.
+      *  @param `summon[Env]` Set of tuples containing pairs of symbols (s, p) where s defines a symbol in `scrutinee` which corresponds to symbol p in `pattern`.
+      *  @return `None` if it did not match or `Some(tup: Tuple)` if it matched where `tup` contains the contents of the holes.
+      */
+    private def =?= (pattern0: Tree)(using Env, Context): Matching =
+
+      /* Match block flattening */ // TODO move to cases
+      /** Normalize the tree */
+      def normalize(tree: Tree): Tree = tree match {
+        case Block(Nil, expr) => normalize(expr)
+        case Block(stats1, Block(stats2, expr)) =>
+          expr match
+            case _: Closure => tree
+            case _ => normalize(Block(stats1 ::: stats2, expr))
+        case Inlined(_, Nil, expr) => normalize(expr)
+        case _ => tree
+      }
+
+      val scrutinee = normalize(scrutinee0)
+      val pattern = normalize(pattern0)
+
+      /** Check that both are `val` or both are `lazy val` or both are `var` **/
+      def checkValFlags(): Boolean = {
+        val sFlags = scrutinee.symbol.flags
+        val pFlags = pattern.symbol.flags
+        sFlags.is(Lazy) == pFlags.is(Lazy) && sFlags.is(Mutable) == pFlags.is(Mutable)
+      }
+
+      // TODO remove
+      object TypeTreeTypeTest:
+        def unapply(x: Tree): Option[Tree & x.type] = x match
+          case x: (TypeBoundsTree & x.type) => None
+          case x: (Tree & x.type) if x.isType => Some(x)
+          case _ => None
+      end TypeTreeTypeTest
+
+      val res = pattern match
+
+        /* Term hole */
+        // Match a scala.internal.Quoted.patternHole typed as a repeated argument and return the scrutinee tree
+        case Typed(TypeApply(patternHole, tpt :: Nil), tpt2)
+            if patternHole.symbol.eq(defn.QuotedRuntimePatterns_patternHole) &&
+               tpt2.tpe.derivesFrom(defn.RepeatedParamClass) =>
+          scrutinee match
+            case Typed(s, tpt1) if s.tpe <:< tpt.tpe => matched(scrutinee)
+            case _ => notMatched
+
+        /* Term hole */
+        // Match a scala.internal.Quoted.patternHole and return the scrutinee tree
+        case TypeApply(patternHole, tpt :: Nil)
+            if patternHole.symbol.eq(defn.QuotedRuntimePatterns_patternHole) &&
+                scrutinee.tpe <:< tpt.tpe =>
+          scrutinee match
+            case ClosedPatternTerm(scrutinee) => matched(scrutinee)
+            case _ => notMatched
+
+
+        /* Higher order term hole */
+        // Matches an open term and wraps it into a lambda that provides the free variables
+        case Apply(TypeApply(Ident(_), List(TypeTree())), SeqLiteral(args, _) :: Nil)
+            if pattern.symbol.eq(defn.QuotedRuntimePatterns_higherOrderHole) =>
+          val names: List[TermName] = args.map {
+            case Block(List(DefDef(nme.ANON_FUN, _, _, Apply(Ident(name), _))), _) => name.asTermName
+            case arg => arg.symbol.name.asTermName
+          }
+          val argTypes = args.map(x => x.tpe.widenTermRefExpr)
+          val methTpe = MethodType(names)(_ => argTypes, _ => pattern.tpe)
+          val meth = newAnonFun(ctx.owner, methTpe)
+          def bodyFn(lambdaArgss: List[List[Tree]]): Tree = {
+            val argsMap = args.map(_.symbol).zip(lambdaArgss.head).toMap
+            val body = new TreeMap {
+              override def transform(tree: Tree)(using Context): Tree =
+                tree match
+                  case tree: Ident => summon[Env].get(tree.symbol).flatMap(argsMap.get).getOrElse(tree)
+                  case tree => super.transform(tree)
+            }.transform(scrutinee)
+            TreeOps(body).changeNonLocalOwners(meth)
+          }
+          matched(Closure(meth, bodyFn))
+
+        /* Match type ascription (b) */
+        case Typed(expr2, _) =>
+          scrutinee =?= expr2
+
+        case _ =>
+          scrutinee match
+            /* Match type ascription (a) */
+            case Typed(expr1, _) =>
+              expr1 =?= pattern
+
+            /* Match literal */
+            case Literal(constant1) =>
+              pattern match
+                case Literal(constant2) if constant1 == constant2 => matched
+                case _ => notMatched
+
+            case ref: RefTree =>
+              pattern match
+                /* Match selection */
+                case Select(qual2, _) if symbolMatch(scrutinee, pattern) =>
+                  ref match
+                    case Select(qual1, _) => qual1 =?= qual2
+                    case ref: Ident =>
+                      ref.tpe match
+                        case TermRef(qual: TermRef, _) => tpd.ref(qual) =?= qual2
+                        case _ => matched
+                /* Match reference */
+                case _: Ident if symbolMatch(scrutinee, pattern) => matched
+                /* Match type */
+                case TypeTreeTypeTest(pattern) if scrutinee.tpe <:< pattern.tpe => matched
+                case _ => notMatched
+
+            /* Match application */
+            case Apply(fn1, args1) =>
+              pattern match
+                case Apply(fn2, args2) =>
+                  fn1 =?= fn2 &&& args1 =?= args2
+                case _ => notMatched
+
+            /* Match type application */
+            case TypeApply(fn1, args1) =>
+              pattern match
+                case TypeApply(fn2, args2) =>
+                  fn1 =?= fn2 &&& args1 =?= args2
+                case _ => notMatched
+
+            /* Match block */
+            case Block(stat1 :: stats1, expr1) =>
+              pattern match
+                case Block(stat2 :: stats2, expr2) =>
+                  val newEnv = (stat1, stat2) match {
+                    case (stat1: MemberDef, stat2: MemberDef) =>
+                      summon[Env] + (stat1.symbol -> stat2.symbol)
+                    case _ =>
+                      summon[Env]
+                  }
+                  withEnv(newEnv) {
+                    stat1 =?= stat2 &&& Block(stats1, expr1) =?= Block(stats2, expr2)
+                  }
+                case _ => notMatched
+
+            /* Match if */
+            case If(cond1, thenp1, elsep1) =>
+              pattern match
+                case If(cond2, thenp2, elsep2) =>
+                  cond1 =?= cond2 &&& thenp1 =?= thenp2 &&& elsep1 =?= elsep2
+                case _ => notMatched
+
+            /* Match while */
+            case WhileDo(cond1, body1) =>
+              pattern match
+                case WhileDo(cond2, body2) => cond1 =?= cond2 &&& body1 =?= body2
+                case _ => notMatched
+
+            /* Match assign */
+            case Assign(lhs1, rhs1) =>
+              pattern match
+                case Assign(lhs2, rhs2) => lhs1 =?= lhs2 &&& rhs1 =?= rhs2
+                case _ => notMatched
+
+            /* Match new */
+            case New(tpt1) =>
+              pattern match
+                case New(tpt2) if tpt1.tpe.typeSymbol == tpt2.tpe.typeSymbol => matched
+                case _ => notMatched
+
+            /* Match this */
+            case This(_) =>
+              pattern match
+                case This(_) if scrutinee.symbol == pattern.symbol => matched
+                case _ => notMatched
+
+            /* Match super */
+            case Super(qual1, mix1) =>
+              pattern match
+                case Super(qual2, mix2) if mix1 == mix2 => qual1 =?= qual2
+                case _ => notMatched
+
+            /* Match varargs */
+            case SeqLiteral(elems1, _) =>
+              pattern match
+                case SeqLiteral(elems2, _) if elems1.size == elems2.size => elems1 =?= elems2
+                case _ => notMatched
+
+            /* Match type */
+            // TODO remove this?
+            case TypeTreeTypeTest(scrutinee) =>
+              pattern match
+                case TypeTreeTypeTest(pattern) if scrutinee.tpe <:< pattern.tpe => matched
+                case _ => notMatched
+
+            /* Match val */
+            case scrutinee @ ValDef(_, tpt1, _) =>
+              pattern match
+                case pattern @ ValDef(_, tpt2, _) if checkValFlags() =>
+                  def rhsEnv = summon[Env] + (scrutinee.symbol -> pattern.symbol)
+                  tpt1 =?= tpt2 &&& withEnv(rhsEnv)(scrutinee.rhs =?= pattern.rhs)
+                case _ => notMatched
+
+            /* Match def */
+            case scrutinee @ DefDef(_, paramss1, tpt1, _) =>
+              pattern match
+                case pattern @ DefDef(_, paramss2, tpt2, _) =>
+                  def rhsEnv: Env =
+                    val paramSyms: List[(Symbol, Symbol)] =
+                      for
+                        (clause1, clause2) <- paramss1.zip(paramss2)
+                        (param1, param2) <- clause1.zip(clause2)
+                      yield
+                        param1.symbol -> param2.symbol
+                    val oldEnv: Env = summon[Env]
+                    val newEnv: List[(Symbol, Symbol)] = (scrutinee.symbol -> pattern.symbol) :: paramSyms
+                    oldEnv ++ newEnv
+                  matchLists(paramss1, paramss2)(_ =?= _)
+                    &&& tpt1 =?= tpt2
+                    &&& withEnv(rhsEnv)(scrutinee.rhs =?= pattern.rhs)
+                case _ => notMatched
+
+            case Closure(_, _, tpt1) =>
+              pattern match
+                case Closure(_, _, tpt2) => matched // TODO match tpt1 with tpt2?
+                case _ => notMatched
+
+            case NamedArg(name1, arg1) =>
+              pattern match
+                case NamedArg(name2, arg2) if name1 == name2 => arg1 =?= arg2
+                case _ => notMatched
+
+            case EmptyTree =>
+              if pattern.isEmpty then matched
+              else notMatched
+
+            // No Match
+            case _ =>
+              notMatched
+
+      if (debug && res == notMatched)
+        val quotes = QuotesImpl()
+        println(
+          s""">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+              |Scrutinee
+              |  ${scrutinee.show}
+              |did not match pattern
+              |  ${pattern.show}
+              |
+              |with environment: ${summon[Env]}
+              |
+              |Scrutinee: ${quotes.reflect.Printer.TreeStructure.show(scrutinee.asInstanceOf)}
+              |Pattern: ${quotes.reflect.Printer.TreeStructure.show(pattern.asInstanceOf)}
+              |
+              |""".stripMargin)
+
+      res
+    end =?=
+
+  end extension
+
+  /** Does the scrutinee symbol match the pattern symbol? It matches if:
+    *   - They are the same symbol
+    *   - The scrutinee has is in the environment and they are equivalent
+    *   - The scrutinee overrides the symbol of the pattern
+    */
+  private def symbolMatch(scrutineeTree: Tree, patternTree: Tree)(using Env, Context): Boolean =
+    val scrutinee = scrutineeTree.symbol
+
+    def overridingSymbol(ofclazz: Symbol): Symbol =
+      if ofclazz.isClass then scrutinee.denot.overridingSymbol(ofclazz.asClass)
+      else NoSymbol
+
+    val devirtualizedScrutinee = scrutineeTree match
+      case Select(qual, _) =>
+        val sym = overridingSymbol(qual.tpe.typeSymbol)
+        if sym.exists then sym
+        else scrutinee
+      case _ => scrutinee
+    val pattern = patternTree.symbol
+
+
+    devirtualizedScrutinee == pattern
+    || summon[Env].get(devirtualizedScrutinee).contains(pattern)
+    || devirtualizedScrutinee.allOverriddenSymbols.contains(pattern)
+
+  private object ClosedPatternTerm {
+    /** Matches a term that does not contain free variables defined in the pattern (i.e. not defined in `Env`) */
+    def unapply(term: Tree)(using Env, Context): Option[term.type] =
+      if freePatternVars(term).isEmpty then Some(term) else None
+
+    /** Return all free variables of the term defined in the pattern (i.e. defined in `Env`) */
+    def freePatternVars(term: Tree)(using Env, Context): Set[Symbol] =
+      val accumulator = new TreeAccumulator[Set[Symbol]] {
+        def apply(x: Set[Symbol], tree: Tree)(using Context): Set[Symbol] =
+          tree match
+            case tree: Ident if summon[Env].contains(tree.symbol) => foldOver(x + tree.symbol, tree)
+            case _ => foldOver(x, tree)
+      }
+      accumulator.apply(Set.empty, term)
+  }
+
+  /** Result of matching a part of an expression */
+  private opaque type Matching = Option[Tuple]
+
+  private object Matching {
+
+    def notMatched: Matching = None
+
+    val matched: Matching = Some(Tuple())
+
+    def matched(tree: Tree)(using Context): Matching =
+      Some(Tuple1(new ExprImpl(tree, SpliceScope.getCurrent)))
+
+    extension (self: Matching)
+      def asOptionOfTuple: Option[Tuple] = self
+
+      /** Concatenates the contents of two successful matchings or return a `notMatched` */
+      def &&& (that: => Matching): Matching = self match {
+        case Some(x) =>
+          that match {
+            case Some(y) => Some(x ++ y)
+            case _ => None
+          }
+        case _ => None
+      }
+    end extension
+
+  }
+
+}
diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
index 9a1df9d01f2d..000f84199c27 100644
--- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
+++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -45,6 +45,14 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
     def matches(that: scala.quoted.Expr[Any]): Boolean =
       treeMatch(reflect.asTerm(self), reflect.asTerm(that)).nonEmpty
 
+    def valueOrAbort(using fromExpr: FromExpr[T]): T =
+      def reportError =
+        val tree = reflect.asTerm(self)
+        val code = reflect.Printer.TreeCode.show(tree)
+        val msg = s"Expected a known value. \n\nThe value of: $code\ncould not be extracted using $fromExpr"
+        reflect.report.throwError(msg, self)
+      fromExpr.unapply(self)(using QuotesImpl.this).getOrElse(reportError)
+
   end extension
 
   extension (self: scala.quoted.Expr[Any])
@@ -70,6 +78,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object CompilationInfo extends CompilationInfoModule:
       def isWhileTyping: Boolean = !ctx.isAfterTyper
+      def XmacroSettings: List[String] = ctx.settings.XmacroSettings.value
     end CompilationInfo
 
     extension (expr: Expr[Any])
@@ -97,7 +106,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
             new ExprImpl(self, SpliceScope.getCurrent)
           else self match
             case TermTypeTest(self) => throw new Exception("Expected an expression. This is a partially applied Term. Try eta-expanding the term first.")
-            case _ => throw new Exception("Expected a Term but was: " + self)
+            case _ => throw new Exception("Expected a Term but was: " + Printer.TreeStructure.show(self))
       end extension
 
       extension (self: Tree)
@@ -186,10 +195,11 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object StatementTypeTest extends TypeTest[Tree, Statement]:
       def unapply(x: Tree): Option[Statement & x.type] = x match
-        case _: tpd.PatternTree => None
-        case _ =>
-          if x.isTerm then TermTypeTest.unapply(x)
-          else DefinitionTypeTest.unapply(x)
+        case TermTypeTest(x: x.type) => Some(x)
+        case DefinitionTypeTest(x: x.type) => Some(x)
+        case ImportTypeTest(x: x.type) => Some(x)
+        case ExportTypeTest(x: x.type) => Some(x)
+        case _ => None
     end StatementTypeTest
 
     type Definition = tpd.MemberDef
@@ -286,15 +296,15 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
       def unapply(vdef: ValDef): (String, TypeTree, Option[Term]) =
         (vdef.name.toString, vdef.tpt, optional(vdef.rhs))
 
-      def let(owner: Symbol, name: String, rhs: Term)(body: Ident => Term): Term =
+      def let(owner: Symbol, name: String, rhs: Term)(body: Ref => Term): Term =
         val vdef = tpd.SyntheticValDef(name.toTermName, rhs)(using ctx.withOwner(owner))
-        val ref = tpd.ref(vdef.symbol).asInstanceOf[Ident]
+        val ref = tpd.ref(vdef.symbol).asInstanceOf[Ref]
         Block(List(vdef), body(ref))
 
-      def let(owner: Symbol, terms: List[Term])(body: List[Ident] => Term): Term =
+      def let(owner: Symbol, terms: List[Term])(body: List[Ref] => Term): Term =
         val ctx1 = ctx.withOwner(owner)
         val vdefs = terms.map(term => tpd.SyntheticValDef("x".toTermName, term)(using ctx1))
-        val refs = vdefs.map(vdef => tpd.ref(vdef.symbol).asInstanceOf[Ident])
+        val refs = vdefs.map(vdef => tpd.ref(vdef.symbol).asInstanceOf[Ref])
         Block(vdefs, body(refs))
     end ValDef
 
@@ -332,13 +342,13 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object TermTypeTest extends TypeTest[Tree, Term]:
       def unapply(x: Tree): Option[Term & x.type] = x match
-        case _ if UnapplyTypeTest.unapply(x).isDefined => None
-        case _: tpd.PatternTree => None
-        case x: (tpd.Tree & x.type) if x.isTerm => Some(x)
+        case x: tpd.PatternTree => None
         case x: (tpd.SeqLiteral & x.type) => Some(x)
         case x: (tpd.Inlined & x.type) => Some(x)
         case x: (tpd.NamedArg & x.type) => Some(x)
-        case _ => None
+        case x: (tpd.Typed & x.type) =>
+          TypedTypeTest.unapply(x) // Matches `Typed` but not `TypedOrTest`
+        case _ => if x.isTerm then Some(x) else None
     end TermTypeTest
 
     object Term extends TermModule:
@@ -376,7 +386,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
               case t => t
             }
             val closureTpe = Types.MethodType(mtpe.paramNames, mtpe.paramInfos, closureResType)
-            val closureMethod = dotc.core.Symbols.newSymbol(owner, nme.ANON_FUN, Synthetic | Method, closureTpe)
+            val closureMethod = dotc.core.Symbols.newAnonFun(owner, closureTpe)
             tpd.Closure(closureMethod, tss => new tpd.TreeOps(self).appliedToTermArgs(tss.head).etaExpand(closureMethod))
           case _ => self
         }
@@ -441,6 +451,20 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
       end extension
     end IdentMethods
 
+    type Wildcard = tpd.Ident
+
+    object WildcardTypeTest extends TypeTest[Tree, Wildcard]:
+      def unapply(x: Tree): Option[Wildcard & x.type] = x match
+        case x: (tpd.Ident & x.type) if x.name == nme.WILDCARD => Some(x)
+        case _ => None
+    end WildcardTypeTest
+
+    object Wildcard extends WildcardModule:
+      def apply(): Wildcard =
+        withDefaultPos(untpd.Ident(nme.WILDCARD).withType(dotc.core.Symbols.defn.AnyType))
+      def unapply(pattern: Wildcard): true = true
+    end Wildcard
+
     type Select = tpd.Select
 
     object SelectTypeTest extends TypeTest[Tree, Select]:
@@ -648,7 +672,10 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object TypedTypeTest extends TypeTest[Tree, Typed]:
       def unapply(x: Tree): Option[Typed & x.type] = x match
-        case x: (tpd.Typed & x.type) => Some(x)
+        case x: (tpd.Typed & x.type) =>
+          x.expr match
+            case TermTypeTest(_) => Some(x)
+            case _ => None
         case _ => None
     end TypedTypeTest
 
@@ -668,6 +695,31 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
       end extension
     end TypedMethods
 
+    type TypedOrTest = tpd.Typed
+
+    object TypedOrTestTypeTest extends TypeTest[Tree, TypedOrTest]:
+      def unapply(x: Tree): Option[TypedOrTest & x.type] = x match
+        case x: (tpd.Typed & x.type) => Some(x)
+        case _ => None
+    end TypedOrTestTypeTest
+
+    object TypedOrTest extends TypedOrTestModule:
+      def apply(expr: Term, tpt: TypeTree): Typed =
+        withDefaultPos(tpd.Typed(xCheckMacroValidExpr(expr), tpt))
+      def copy(original: Tree)(expr: Term, tpt: TypeTree): Typed =
+        tpd.cpy.Typed(original)(xCheckMacroValidExpr(expr), tpt)
+      def unapply(x: Typed): (Term, TypeTree) =
+        (x.expr, x.tpt)
+    end TypedOrTest
+
+    given TypedOrTestMethods: TypedOrTestMethods with
+      extension (self: Typed)
+        def tree: Tree = self.expr
+        def tpt: TypeTree = self.tpt
+      end extension
+    end TypedOrTestMethods
+
+
     type Assign = tpd.Assign
 
     object AssignTypeTest extends TypeTest[Tree, Assign]:
@@ -702,9 +754,9 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object Block extends BlockModule:
       def apply(stats: List[Statement], expr: Term): Block =
-        withDefaultPos(tpd.Block(stats, expr))
+        xCheckMacroBlockOwners(withDefaultPos(tpd.Block(stats, expr)))
       def copy(original: Tree)(stats: List[Statement], expr: Term): Block =
-        tpd.cpy.Block(original)(stats, expr)
+        xCheckMacroBlockOwners(tpd.cpy.Block(original)(stats, expr))
       def unapply(x: Block): (List[Statement], Term) =
         (x.statements, x.expr)
     end Block
@@ -742,8 +794,8 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object Lambda extends LambdaModule:
       def apply(owner: Symbol, tpe: MethodType, rhsFn: (Symbol, List[Tree]) => Tree): Block =
-        val meth = dotc.core.Symbols.newSymbol(owner, nme.ANON_FUN, Synthetic | Method, tpe)
-        tpd.Closure(meth, tss => xCheckMacroedOwners(xCheckMacroValidExpr(rhsFn(meth, tss.head.map(withDefaultPos))), meth))
+        val meth = dotc.core.Symbols.newAnonFun(owner, tpe)
+        withDefaultPos(tpd.Closure(meth, tss => xCheckMacroedOwners(xCheckMacroValidExpr(rhsFn(meth, tss.head.map(withDefaultPos))), meth)))
 
       def unapply(tree: Block): Option[(List[ValDef], Term)] = tree match {
         case Block((ddef @ DefDef(_, tpd.ValDefs(params) :: Nil, _, Some(body))) :: Nil, Closure(meth, _))
@@ -1021,7 +1073,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object TypeIdentTypeTest extends TypeTest[Tree, TypeIdent]:
       def unapply(x: Tree): Option[TypeIdent & x.type] = x match
-        case tpt: (tpd.Ident & x.type) if tpt.isType => Some(tpt)
+        case tpt: (tpd.Ident & x.type) if tpt.isType && tpt.name != nme.WILDCARD => Some(tpt)
         case _ => None
     end TypeIdentTypeTest
 
@@ -1324,10 +1376,12 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
         def tpe: TypeBounds = self.tpe.asInstanceOf[Types.TypeBounds]
         def low: TypeTree = self match
           case self: tpd.TypeBoundsTree => self.lo
-          case self: tpd.TypeTree => tpd.TypeTree(self.tpe.asInstanceOf[Types.TypeBounds].lo).withSpan(self.span)
+          case self: tpd.TypeTree => makeTypeDef(self.tpe.asInstanceOf[Types.TypeBounds].lo)
         def hi: TypeTree = self match
           case self: tpd.TypeBoundsTree => self.hi
-          case self: tpd.TypeTree => tpd.TypeTree(self.tpe.asInstanceOf[Types.TypeBounds].hi).withSpan(self.span)
+          case self: tpd.TypeTree => makeTypeDef(self.tpe.asInstanceOf[Types.TypeBounds].hi)
+        private def makeTypeDef(tpe: Types.Type) =
+          tpd.TypeTree(tpe)(using ctx.withSource(self.source)).withSpan(self.span)
       end extension
     end TypeBoundsTreeMethods
 
@@ -1335,7 +1389,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object WildcardTypeTreeTypeTest extends TypeTest[Tree, WildcardTypeTree]:
       def unapply(x: Tree): Option[WildcardTypeTree & x.type] = x match
-        case x: (tpd.Ident & x.type) if x.name == nme.WILDCARD => Some(x)
+        case x: (tpd.Ident & x.type) if x.isType && x.name == nme.WILDCARD => Some(x)
         case _ => None
     end WildcardTypeTreeTypeTest
 
@@ -1423,17 +1477,17 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
       end extension
     end BindMethods
 
-    type Unapply = tpd.UnApply | tpd.Typed // tpd.Typed containing a tpd.UnApply as expression
+    type Unapply = tpd.UnApply
 
     object UnapplyTypeTest extends TypeTest[Tree, Unapply]:
-      def unapply(x: Tree): Option[Unapply & x.type] =
-        x match // keep in sync with UnapplyMethodsImpl.selfUnApply
-          case x: (tpd.UnApply & x.type) => Some(x)
-          case x: (tpd.Typed & x.type) if x.expr.isInstanceOf[tpd.UnApply] => Some(x)
-          case _ => None
+      def unapply(x: Tree): Option[Unapply & x.type] = x match
+        case x: (tpd.UnApply & x.type) => Some(x)
+        case _ => None
     end UnapplyTypeTest
 
     object Unapply extends UnapplyModule:
+      def apply(fun: Term, implicits: List[Term], patterns: List[Tree]): Unapply =
+        withDefaultPos(tpd.UnApply(fun, implicits, patterns, dotc.core.Symbols.defn.NothingType))
       def copy(original: Tree)(fun: Term, implicits: List[Term], patterns: List[Tree]): Unapply =
         withDefaultPos(tpd.cpy.UnApply(original)(fun, implicits, patterns))
       def unapply(x: Unapply): (Term, List[Term], List[Tree]) =
@@ -1442,14 +1496,10 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     given UnapplyMethods: UnapplyMethods with
       extension (self: Unapply)
-        def fun: Term = selfUnApply(self).fun
-        def implicits: List[Term] = selfUnApply(self).implicits
-        def patterns: List[Tree] = effectivePatterns(selfUnApply(self).patterns)
-      end extension
-      private def selfUnApply(self: Unapply): tpd.UnApply =
-        self match // keep in sync with UnapplyTypeTest
-          case self: tpd.UnApply => self
-          case self: tpd.Typed => self.expr.asInstanceOf[tpd.UnApply]
+        def fun: Term = self.fun
+        def implicits: List[Term] = self.implicits
+        def patterns: List[Tree] = effectivePatterns(self.patterns)
+      end extension
       private def effectivePatterns(patterns: List[Tree]): List[Tree] =
         patterns match
           case patterns0 :+ dotc.ast.Trees.SeqLiteral(elems, _) => patterns0 ::: elems
@@ -1691,11 +1741,19 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
           val tpNoRefinement = self.dropDependentRefinement
           tpNoRefinement != self
           && dotc.core.Symbols.defn.isNonRefinedFunction(tpNoRefinement)
+        def isTupleN: Boolean =
+          dotc.core.Symbols.defn.isTupleNType(self)
         def select(sym: Symbol): TypeRepr = self.select(sym)
         def appliedTo(targ: TypeRepr): TypeRepr =
           dotc.core.Types.decorateTypeApplications(self).appliedTo(targ)
         def appliedTo(targs: List[TypeRepr]): TypeRepr =
           dotc.core.Types.decorateTypeApplications(self).appliedTo(targs)
+        def substituteTypes(from: List[Symbol], to: List[TypeRepr]): TypeRepr =
+          self.subst(from, to)
+
+        def typeArgs: List[TypeRepr] = self match
+          case AppliedType(_, args) => args
+          case _ => List.empty
       end extension
     end TypeReprMethods
 
@@ -1726,7 +1784,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     given NamedTypeMethods: NamedTypeMethods with
       extension (self: NamedType)
-        def qualifier: TypeRepr = self.prefix
+        def qualifier: TypeRepr = self.prefix.widenSkolem
         def name: String = self.name.toString
       end extension
     end NamedTypeMethods
@@ -1825,13 +1883,13 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object AppliedType extends AppliedTypeModule:
       def unapply(x: AppliedType): (TypeRepr, List[TypeRepr]) =
-        (x.tycon, x.args)
+        (AppliedTypeMethods.tycon(x), AppliedTypeMethods.args(x))
     end AppliedType
 
     given AppliedTypeMethods: AppliedTypeMethods with
       extension (self: AppliedType)
-        def tycon: TypeRepr = self.tycon
-        def args: List[TypeRepr] = self.args
+        def tycon: TypeRepr = self.tycon.stripTypeVar
+        def args: List[TypeRepr] = self.args.mapConserve(_.stripTypeVar)
       end extension
     end AppliedTypeMethods
 
@@ -2427,6 +2485,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
         def name: String = self.denot.name.toString
         def fullName: String = self.denot.fullName.toString
+
         def pos: Option[Position] =
           if self.exists then Some(self.sourcePos) else None
 
@@ -2454,7 +2513,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
           }
 
         def isDefinedInCurrentRun: Boolean =
-          self.topLevelClass.asClass.isDefinedInCurrentRun
+          self.exists && self.topLevelClass.asClass.isDefinedInCurrentRun
         def isLocalDummy: Boolean = self.denot.isLocalDummy
         def isRefinementClass: Boolean = self.denot.isRefinementClass
         def isAliasType: Boolean = self.denot.isAliasType
@@ -2482,13 +2541,22 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
         def declaredFields: List[Symbol] = self.unforcedDecls.filter(isField)
 
-        def memberField(name: String): Symbol =
-          appliedTypeRef(self).allMembers.iterator.map(_.symbol).find {
+        /** The prefix on which a member lookup should be performed. */
+        private def lookupPrefix: TypeRepr =
+          if self.isClass then
+            self.thisType // Needed to handle self-types (as in tests/run-macros/self)
+          else
+            self.namedType
+
+        def memberField(name: String): Symbol = fieldMember(name)
+        def fieldMember(name: String): Symbol =
+          lookupPrefix.allMembers.iterator.map(_.symbol).find {
             sym => isField(sym) && sym.name.toString == name
           }.getOrElse(dotc.core.Symbols.NoSymbol)
 
-        def memberFields: List[Symbol] =
-          appliedTypeRef(self).allMembers.iterator.map(_.symbol).collect {
+        def memberFields: List[Symbol] = fieldMembers
+        def fieldMembers: List[Symbol] =
+          lookupPrefix.allMembers.iterator.map(_.symbol).collect {
             case sym if isField(sym) => sym.asTerm
           }.toList
 
@@ -2502,13 +2570,15 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
             case sym if isMethod(sym) => sym.asTerm
           }.toList
 
-        def memberMethod(name: String): List[Symbol] =
-          appliedTypeRef(self).allMembers.iterator.map(_.symbol).collect {
+        def memberMethod(name: String): List[Symbol] = methodMember(name)
+        def methodMember(name: String): List[Symbol] =
+          lookupPrefix.allMembers.iterator.map(_.symbol).collect {
             case sym if isMethod(sym) && sym.name.toString == name => sym.asTerm
           }.toList
 
-        def memberMethods: List[Symbol] =
-          appliedTypeRef(self).allMembers.iterator.map(_.symbol).collect {
+        def memberMethods: List[Symbol] = methodMembers
+        def methodMembers: List[Symbol] =
+          lookupPrefix.allMembers.iterator.map(_.symbol).collect {
             case sym if isMethod(sym) => sym.asTerm
           }.toList
 
@@ -2522,10 +2592,12 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
             case sym if sym.isType => sym.asType
           }.toList
 
-        def memberType(name: String): Symbol =
+        def memberType(name: String): Symbol = typeMember(name)
+        def typeMember(name: String): Symbol =
           self.unforcedDecls.find(sym => sym.name == name.toTypeName)
 
-        def memberTypes: List[Symbol] =
+        def memberTypes: List[Symbol] = typeMembers
+        def typeMembers: List[Symbol] =
           self.unforcedDecls.filter(_.isType)
 
         def declarations: List[Symbol] =
@@ -2733,6 +2805,9 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
     given SourceFileMethods: SourceFileMethods with
       extension (self: SourceFile)
         def jpath: java.nio.file.Path = self.file.jpath
+        def getJPath: Option[java.nio.file.Path] = Option(self.file.jpath)
+        def name: String = self.name
+        def path: String = self.path
         def content: Option[String] =
           // TODO detect when we do not have a source and return None
           Some(new String(self.content()))
@@ -2751,14 +2826,23 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
         dotc.report.error(msg, pos)
 
       def throwError(msg: String): Nothing =
+        errorAndAbort(msg)
+
+      def throwError(msg: String, expr: Expr[Any]): Nothing =
+        errorAndAbort(msg, expr)
+
+      def throwError(msg: String, pos: Position): Nothing =
+        errorAndAbort(msg, pos)
+
+      def errorAndAbort(msg: String): Nothing =
         error(msg)
         throw new scala.quoted.runtime.StopMacroExpansion
 
-      def throwError(msg: String, expr: Expr[Any]): Nothing =
+      def errorAndAbort(msg: String, expr: Expr[Any]): Nothing =
         error(msg, expr)
         throw new scala.quoted.runtime.StopMacroExpansion
 
-      def throwError(msg: String, pos: Position): Nothing =
+      def errorAndAbort(msg: String, pos: Position): Nothing =
         error(msg, pos)
         throw new scala.quoted.runtime.StopMacroExpansion
 
@@ -2835,6 +2919,28 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
             case _ => traverseChildren(t)
       }.traverse(tree)
 
+    /** Checks that all definitions in this block have the same owner.
+     *  Nested definitions are ignored and assumed to be correct by construction.
+     */
+    private def xCheckMacroBlockOwners(tree: Tree): tree.type =
+      if xCheckMacro then
+        val defs = new tpd.TreeAccumulator[List[Tree]] {
+          def apply(defs: List[Tree], tree: Tree)(using Context): List[Tree] =
+            tree match
+              case tree: tpd.DefTree => tree :: defs
+              case _ => foldOver(defs, tree)
+        }.apply(Nil, tree)
+        val defOwners = defs.groupBy(_.symbol.owner)
+        assert(defOwners.size <= 1,
+          s"""Block contains definition with different owners.
+            |Found definitions ${defOwners.size} distinct owners: ${defOwners.keys.mkString(", ")}
+            |
+            |Block: ${Printer.TreeCode.show(tree)}
+            |
+            |${defOwners.map((owner, trees) => s"Definitions owned by $owner: \n${trees.map(Printer.TreeCode.show).mkString("\n")}").mkString("\n\n")}
+            |""".stripMargin)
+      tree
+
     private def xCheckMacroValidExprs(terms: List[Term]): terms.type =
       if xCheckMacro then terms.foreach(xCheckMacroValidExpr)
       terms
@@ -2942,24 +3048,17 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
         ctx1.gadt.addToConstraint(typeHoles)
         ctx1
 
-    val qctx1 = QuotesImpl()(using ctx1)
-
-    val matcher = new Matcher.QuoteMatcher[qctx1.type](qctx1) {
-      def patternHoleSymbol: qctx1.reflect.Symbol = dotc.core.Symbols.defn.QuotedRuntimePatterns_patternHole.asInstanceOf
-      def higherOrderHoleSymbol: qctx1.reflect.Symbol = dotc.core.Symbols.defn.QuotedRuntimePatterns_higherOrderHole.asInstanceOf
-    }
-
-    val matchings =
-      if pat1.isType then matcher.termMatch(scrutinee.asInstanceOf[matcher.qctx.reflect.Term], pat1.asInstanceOf[matcher.qctx.reflect.Term])
-      else matcher.termMatch(scrutinee.asInstanceOf[matcher.qctx.reflect.Term], pat1.asInstanceOf[matcher.qctx.reflect.Term])
+    val matchings = QuoteMatcher.treeMatch(scrutinee, pat1)(using ctx1)
 
-    // val matchings = matcher.termMatch(scrutinee, pattern)
     if typeHoles.isEmpty then matchings
     else {
       // After matching and doing all subtype checks, we have to approximate all the type bindings
       // that we have found, seal them in a quoted.Type and add them to the result
       def typeHoleApproximation(sym: Symbol) =
-        ctx1.gadt.approximation(sym, !sym.hasAnnotation(dotc.core.Symbols.defn.QuotedRuntimePatterns_fromAboveAnnot)).asInstanceOf[qctx1.reflect.TypeRepr].asType
+        val fromAboveAnnot = sym.hasAnnotation(dotc.core.Symbols.defn.QuotedRuntimePatterns_fromAboveAnnot)
+        val fullBounds = ctx1.gadt.fullBounds(sym)
+        val tp = if fromAboveAnnot then fullBounds.hi else fullBounds.lo
+        reflect.TypeReprMethods.asType(tp)
       matchings.map { tup =>
         Tuple.fromIArray(typeHoles.map(typeHoleApproximation).toArray.asInstanceOf[IArray[Object]]) ++ tup
       }
diff --git a/compiler/src/scala/quoted/runtime/impl/ScopeException.scala b/compiler/src/scala/quoted/runtime/impl/ScopeException.scala
index ae16d7434a18..d65328bb5405 100644
--- a/compiler/src/scala/quoted/runtime/impl/ScopeException.scala
+++ b/compiler/src/scala/quoted/runtime/impl/ScopeException.scala
@@ -33,4 +33,9 @@ object ScopeException:
             |
             |Use stack:
             |${currentScope.stack.mkString("\t", "\n\t", "\n")}
+            |
+            |Hint: A common reason for this to happen is when a `def` that creates a `'{...}`
+            |      captures an outer instance of `Quotes`. If this `def` is called in a splice
+            |      it will not track the `Quotes` provided by that particular splice.
+            |      To fix it add a `given Quotes` to this `def`.
           """.stripMargin)
diff --git a/compiler/src/scala/quoted/runtime/impl/printers/Extractors.scala b/compiler/src/scala/quoted/runtime/impl/printers/Extractors.scala
index b55ae6cbb166..0bea8f0ab643 100644
--- a/compiler/src/scala/quoted/runtime/impl/printers/Extractors.scala
+++ b/compiler/src/scala/quoted/runtime/impl/printers/Extractors.scala
@@ -33,6 +33,7 @@ object Extractors {
     if (flags.is(Flags.ExtensionMethod)) flagList += "Flags.ExtensionMethod"
     if (flags.is(Flags.FieldAccessor)) flagList += "Flags.FieldAccessor"
     if (flags.is(Flags.Final)) flagList += "Flags.Final"
+    if (flags.is(Flags.Given)) flagList += "Flags.Given"
     if (flags.is(Flags.HasDefault)) flagList += "Flags.HasDefault"
     if (flags.is(Flags.Implicit)) flagList += "Flags.Implicit"
     if (flags.is(Flags.Infix)) flagList += "Flags.Infix"
@@ -71,10 +72,14 @@ object Extractors {
     def result(): String = sb.result()
 
     def visitTree(x: Tree): this.type = x match {
-      case Ident(name) =>
-        this += "Ident(\"" += name += "\")"
-      case Select(qualifier, name) =>
-        this += "Select(" += qualifier += ", \"" += name += "\")"
+      case tree: Ref =>
+        tree match
+          case Wildcard() =>
+            this += "Wildcard()"
+          case Ident(name) =>
+            this += "Ident(\"" += name += "\")"
+          case Select(qualifier, name) =>
+            this += "Select(" += qualifier += ", \"" += name += "\")"
       case This(qual) =>
         this += "This(" += qual += ")"
       case Super(qual, mix) =>
@@ -170,7 +175,9 @@ object Extractors {
       case Unapply(fun, implicits, patterns) =>
         this += "Unapply(" += fun += ", " ++= implicits += ", " ++= patterns += ")"
       case Alternatives(patterns) =>
-        this += "Alternative(" ++= patterns += ")"
+        this += "Alternatives(" ++= patterns += ")"
+      case TypedOrTest(tree, tpt) =>
+        this += "TypedOrTest(" += tree += ", " += tpt += ")"
     }
 
     def visitConstant(x: Constant): this.type = x match {
@@ -231,6 +238,8 @@ object Extractors {
         this += "TypeBounds(" += lo += ", " += hi += ")"
       case NoPrefix() =>
         this += "NoPrefix()"
+      case MatchCase(pat, rhs) =>
+        this += "MatchCase(" += pat += ", " += rhs += ")"
     }
 
     def visitSignature(sig: Signature): this.type = {
diff --git a/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala b/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala
index 62fa24d908f1..7f77f8fa5eb2 100644
--- a/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala
+++ b/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala
@@ -328,7 +328,7 @@ object SourceCode {
         }
         this
 
-      case Ident("_") =>
+      case Wildcard() =>
         this += "_"
 
       case tree: Ident =>
@@ -530,6 +530,9 @@ object SourceCode {
       case Closure(meth, _) =>
         printTree(meth)
 
+      case _:Unapply | _:Alternatives | _:Bind =>
+        printPattern(tree)
+
       case _ =>
         throw new MatchError(tree.show(using Printer.TreeStructure))
 
@@ -893,13 +896,13 @@ object SourceCode {
     }
 
     private def printPattern(pattern: Tree): this.type = pattern match {
-      case Ident("_") =>
+      case Wildcard() =>
         this += "_"
 
-      case Bind(name, Ident("_")) =>
+      case Bind(name, Wildcard()) =>
         this += name
 
-      case Bind(name, Typed(Ident("_"), tpt)) =>
+      case Bind(name, Typed(Wildcard(), tpt)) =>
         this += highlightValDef(name) += ": "
         printTypeTree(tpt)
 
@@ -925,9 +928,13 @@ object SourceCode {
       case Alternatives(trees) =>
         inParens(printPatterns(trees, " | "))
 
-      case Typed(Ident("_"), tpt) =>
-        this += "_: "
-        printTypeTree(tpt)
+      case TypedOrTest(tree1, tpt) =>
+        tree1 match
+          case Wildcard() =>
+            this += "_: "
+            printTypeTree(tpt)
+          case _ =>
+            printPattern(tree1)
 
       case v: Term =>
         printTree(v)
@@ -1049,7 +1056,7 @@ object SourceCode {
 
       case LambdaTypeTree(tparams, body) =>
         printTargsDefs(tparams.zip(tparams), isDef = false)
-        this += highlightTypeDef(" => ")
+        this += highlightTypeDef(" =>> ")
         printTypeOrBoundsTree(body)
 
       case TypeBind(name, _) =>
@@ -1215,19 +1222,18 @@ object SourceCode {
         this += "]"
         printType(tpe.resType)
 
-      case tpe: TypeLambda =>
-        this += "["
-        printList(tpe.paramNames.zip(tpe.paramBounds), ", ",
-          (x: (String, TypeBounds)) => (this += x._1 += " ").printType(x._2))
-        this += "] => "
-        printType(tpe.resType)
-
       case tpe@TypeBounds(lo, hi) =>
         this += "_ >: "
         printType(lo)
         this += " <: "
         printType(hi)
 
+      case MatchCase(pat, rhs) =>
+        this += "case "
+        printType(pat)
+        this += " => "
+        printType(rhs)
+
       case _ =>
         throw new MatchError(tpe.show(using Printer.TypeReprStructure))
     }
@@ -1417,7 +1423,7 @@ object SourceCode {
       case '"' => "\\\""
       case '\'' => "\\\'"
       case '\\' => "\\\\"
-      case _ => if (ch.isControl) "\\0" + Integer.toOctalString(ch) else String.valueOf(ch)
+      case _ => if ch.isControl then f"${"\\"}u${ch.toInt}%04x" else String.valueOf(ch)
     }
 
     private def escapedString(str: String): String = str flatMap escapedChar
diff --git a/compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala b/compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala
new file mode 100644
index 000000000000..d8a14f72ebfa
--- /dev/null
+++ b/compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala
@@ -0,0 +1,173 @@
+package dotty
+package tools
+package coursier
+
+import java.io.File
+import java.nio.file.{Path, Paths, Files}
+import scala.sys.process._
+import org.junit.Test
+import org.junit.BeforeClass
+import org.junit.Assert._
+import scala.collection.mutable.ListBuffer
+
+import java.net.URLClassLoader
+import java.net.URL
+
+class CoursierScalaTests:
+
+  private def scripts(path: String): Array[File] = {
+    val dir = new File(getClass.getResource(path).getPath)
+    assert(dir.exists && dir.isDirectory, "Couldn't load scripts dir")
+    dir.listFiles
+  }
+
+  extension (f: File) private def absPath =
+    f.getAbsolutePath.replace('\\', '/')
+
+  extension (str: String) private def dropExtension =
+    str.reverse.dropWhile(_ != '.').drop(1).reverse
+
+  // classpath tests are managed by scripting.ClasspathTests.scala
+  def testFiles = scripts("/scripting").filter { ! _.getName.startsWith("classpath") }
+
+  // Cannot run tests in parallel, more info here: https://stackoverflow.com/questions/6345660/java-executing-bash-script-error-26-text-file-busy
+  @Test def allTests =
+    def scriptArgs() =
+      val scriptPath = scripts("/scripting").find(_.getName == "showArgs.sc").get.absPath
+      val testScriptArgs = Seq("a", "b", "c", "-repl", "-run", "-script", "-debug")
+
+      val args = scriptPath +: testScriptArgs
+      val output = CoursierScalaTests.csScalaCmd(args*)
+      val expectedOutput = List(
+        "arg  0:[a]",
+        "arg  1:[b]",
+        "arg  2:[c]",
+        "arg  3:[-repl]",
+        "arg  4:[-run]",
+        "arg  5:[-script]",
+        "arg  6:[-debug]",
+      )
+      for (line, expect) <- output zip expectedOutput do
+        printf("expected: %-17s\nactual  : %s\n", expect, line)
+      assertEquals(expectedOutput, output)
+    scriptArgs()
+
+    def scriptPath() =
+      val scriptPath = scripts("/scripting").find(_.getName == "scriptPath.sc").get.absPath
+      val args = scriptPath
+      val output = CoursierScalaTests.csScalaCmd(args)
+      assertTrue(output.mkString("\n").startsWith("script.path:"))
+      assertTrue(output.mkString("\n").endsWith("scriptPath.sc"))
+    scriptPath()
+
+    def scriptEnvDashJDashD() =
+      val scriptPath = scripts("/scripting").find(_.getName == "envtest.sc").get.absPath
+      val args = scriptPath
+      val output = CoursierScalaTests.csScalaCmd("-J-Dkey=World", args)
+      assertEquals(output.mkString("\n"), "Hello World")
+    scriptEnvDashJDashD()
+
+    def version() =
+      val output = CoursierScalaTests.csScalaCmd("-version")
+      assertTrue(output.mkString("\n").contains(sys.env("DOTTY_BOOTSTRAPPED_VERSION")))
+    version()
+
+    def emptyArgsEqualsRepl() =
+      val output = CoursierScalaTests.csScalaCmd()
+      assertTrue(output.mkString("\n").contains("Unable to create a system terminal")) // Scala attempted to create REPL so we can assume it is working
+    emptyArgsEqualsRepl()
+
+    def run() =
+      val output = CoursierScalaTests.csScalaCmd("-classpath", scripts("/run").head.getParentFile.getParent, "-run", "run.myfile")
+      assertEquals(output.mkString("\n"), "Hello")
+    run()
+
+    def runDashJDashD() =
+      val output = CoursierScalaTests.csScalaCmd("-J-Dkey=World", "-classpath", scripts("/run").head.getParentFile.getParent, "-run", "run.envtest")
+      assertEquals(output.mkString("\n"), "Hello World")
+    runDashJDashD()
+
+    def notOnlyOptionsEqualsRun() =
+      val output = CoursierScalaTests.csScalaCmd("-classpath", scripts("/run").head.getParentFile.getParent, "run.myfile")
+      assertEquals(output.mkString("\n"), "Hello")
+    notOnlyOptionsEqualsRun()
+
+    def help() =
+      val output = CoursierScalaTests.csScalaCmd("-help")
+      assertTrue(output.mkString("\n").contains("Usage: scala <options> <source files>"))
+    help()
+
+    def jar() =
+      val source = new File(getClass.getResource("/run/myfile.scala").getPath)
+      val output = CoursierScalaTests.csScalaCmd("-save", source.absPath)
+      assertEquals(output.mkString("\n"), "Hello")
+      assertTrue(source.getParentFile.listFiles.find(_.getName == "myfile.jar").isDefined)
+    jar()
+
+    def runThatJar() =
+      val source = new File(getClass.getResource("/run/myfile.jar").getPath)
+      val output = CoursierScalaTests.csScalaCmd(source.absPath)
+      assertEquals(output.mkString("\n"), "Hello")
+    runThatJar()
+
+    def compileFilesToJarAndRun() =
+      val source = new File(getClass.getResource("/run/myfile.scala").getPath)
+      val prefix = source.getParent
+
+      val o1source = Paths.get(prefix, "automain.jar").toAbsolutePath.toString
+      val output1 = CoursierScalaTests.csScalaCompilerCmd("-d", o1source, source.absPath)
+      assertEquals(output1.mkString("\n"), "")
+
+      val o2source = Paths.get(prefix, "custommain.jar").toAbsolutePath.toString
+      val output2 = CoursierScalaTests.csScalaCompilerCmd("-d", o2source, "-Xmain-class", "run.myfile", source.absPath)
+      assertEquals(output2.mkString("\n"), "")
+
+      val output3 = CoursierScalaTests.csScalaCmd(o1source)
+      assertEquals(output3.mkString("\n"), "Hello")
+
+      val output4 = CoursierScalaTests.csScalaCmd(o2source)
+      assertEquals(output4.mkString("\n"), "Hello")
+    compileFilesToJarAndRun()
+
+    def replWithArgs() =
+      val output = CoursierScalaTests.csScalaCmd("-source", "3.0-migration")
+      assertTrue(output.mkString("\n").contains("Unable to create a system terminal")) // Scala attempted to create REPL so we can assume it is working
+    replWithArgs()
+
+    def argumentFile() =
+      // verify that an arguments file is accepted
+      // verify that setting a user classpath does not remove compiler libraries from the classpath.
+      // arguments file contains "-classpath .", adding current directory to classpath.
+      val source = new File(getClass.getResource("/run/myfile.scala").getPath)
+      val argsFile = new File(getClass.getResource("/run/myargs.txt").getPath)
+      val output = CoursierScalaTests.csScalaCmd(s"@$argsFile", source.absPath)
+      assertEquals(output.mkString("\n"), "Hello")
+    argumentFile()
+
+object CoursierScalaTests:
+
+  def execCmd(command: String, options: String*): List[String] =
+    val cmd = (command :: options.toList).toSeq.mkString(" ")
+    val out = new ListBuffer[String]
+    cmd.!(ProcessLogger(out += _, out += _))
+    out.toList
+
+  def csScalaCmd(options: String*): List[String] =
+    csCmd("dotty.tools.MainGenericRunner", options*)
+
+  def csScalaCompilerCmd(options: String*): List[String] =
+    csCmd("dotty.tools.dotc.Main", options*)
+
+  private def csCmd(entry: String, options: String*): List[String] =
+    val (jOpts, args) = options.partition(_.startsWith("-J"))
+    val newOptions = args match
+      case Nil => args
+      case _ => "--" +: args
+    val newJOpts = jOpts.map(s => s"--java-opt ${s.stripPrefix("-J")}").mkString(" ")
+    execCmd("./cs", (s"""launch "org.scala-lang:scala3-compiler_3:${sys.env("DOTTY_BOOTSTRAPPED_VERSION")}" $newJOpts --main-class "$entry" --property "scala.usejavacp=true"""" +: newOptions)*)
+
+  /** Get coursier script */
+  @BeforeClass def setup(): Unit =
+    val ver = execCmd("uname").head.replace('L', 'l').replace('D', 'd')
+    execCmd("curl", s"-fLo cs https://git.io/coursier-cli-$ver") #&& execCmd("chmod", "+x cs")
+
diff --git a/compiler/test-coursier/run/envtest.scala b/compiler/test-coursier/run/envtest.scala
new file mode 100644
index 000000000000..bf416c9519ce
--- /dev/null
+++ b/compiler/test-coursier/run/envtest.scala
@@ -0,0 +1,4 @@
+package run
+
+object envtest extends App:
+  println("Hello " + sys.props("key"))
diff --git a/compiler/test-coursier/run/myargs.txt b/compiler/test-coursier/run/myargs.txt
new file mode 100755
index 000000000000..a0d2d24986de
--- /dev/null
+++ b/compiler/test-coursier/run/myargs.txt
@@ -0,0 +1 @@
+-classpath .
diff --git a/compiler/test-coursier/run/myfile.scala b/compiler/test-coursier/run/myfile.scala
new file mode 100644
index 000000000000..c9ed2cfb1683
--- /dev/null
+++ b/compiler/test-coursier/run/myfile.scala
@@ -0,0 +1,4 @@
+package run
+
+object myfile extends App:
+  println("Hello")
diff --git a/compiler/test-resources/repl/10886 b/compiler/test-resources/repl/10886
new file mode 100644
index 000000000000..5d06f7995a13
--- /dev/null
+++ b/compiler/test-resources/repl/10886
@@ -0,0 +1,10 @@
+scala> type Channel = "A" | "B"
+// defined alias type Channel = "A" | "B"
+
+scala> type SelChannel[C <: Tuple] = C match { case x *: xs => x | SelChannel[xs] case _ => Nothing }
+
+scala> lazy val a: SelChannel[("A", "B", "C")] = "A"
+lazy val a: "A" | ("B" | ("C" | Nothing))
+
+scala>:type a
+("A" : String) | (("B" : String) | (("C" : String) | Nothing))
diff --git a/compiler/test-resources/repl/1379 b/compiler/test-resources/repl/1379
index 902d6251a62b..978aab344204 100644
--- a/compiler/test-resources/repl/1379
+++ b/compiler/test-resources/repl/1379
@@ -1,4 +1,6 @@
 scala>  object Foo { val bar = new Object { def baz = 1 }; bar.baz }
+-- [E008] Not Found Error: -----------------------------------------------------
 1 |  object Foo { val bar = new Object { def baz = 1 }; bar.baz }
   |                                                     ^^^^^^^
-  |                                       value baz is not a member of Object
\ No newline at end of file
+  |                                       value baz is not a member of Object
+1 error found
diff --git a/compiler/test-resources/repl/defaultClassloader b/compiler/test-resources/repl/defaultClassloader
index ac42150e14d4..bd9a955409b9 100644
--- a/compiler/test-resources/repl/defaultClassloader
+++ b/compiler/test-resources/repl/defaultClassloader
@@ -1,3 +1,2 @@
-scala> val d: java.sql.Date = new java.sql.Date(100L)
-val d: java.sql.Date = 1970-01-01
-
+scala> val d: Long = (new java.sql.Date(100L)).getTime
+val d: Long = 100
diff --git a/compiler/test-resources/repl/errmsgs b/compiler/test-resources/repl/errmsgs
index e4cb6eca36d4..9819c1cb089f 100644
--- a/compiler/test-resources/repl/errmsgs
+++ b/compiler/test-resources/repl/errmsgs
@@ -1,35 +1,59 @@
 scala> class Inv[T](x: T)
 // defined class Inv
 scala> val x: List[String] = List(1)
+-- [E007] Type Mismatch Error: -------------------------------------------------
 1 | val x: List[String] = List(1)
   |                            ^
   |                            Found:    (1 : Int)
   |                            Required: String
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala> val y: List[List[String]] = List(List(1))
+-- [E007] Type Mismatch Error: -------------------------------------------------
 1 | val y: List[List[String]] = List(List(1))
   |                                       ^
   |                                       Found:    (1 : Int)
   |                                       Required: String
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala> val z: (List[String], List[Int]) = (List(1), List("a"))
+-- [E007] Type Mismatch Error: -------------------------------------------------
 1 | val z: (List[String], List[Int]) = (List(1), List("a"))
   |                                          ^
   |                                          Found:    (1 : Int)
   |                                          Required: String
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: -------------------------------------------------
 1 | val z: (List[String], List[Int]) = (List(1), List("a"))
   |                                                   ^^^
   |                                                  Found:    ("a" : String)
   |                                                  Required: Int
+  |
+  | longer explanation available when compiling with `-explain`
+2 errors found
 scala> val a: Inv[String] = new Inv(new Inv(1))
+-- [E007] Type Mismatch Error: -------------------------------------------------
 1 | val a: Inv[String] = new Inv(new Inv(1))
   |                              ^^^^^^^^^^
   |                              Found:    Inv[Int]
   |                              Required: String
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala> val b: Inv[String] = new Inv(1)
+-- [E007] Type Mismatch Error: -------------------------------------------------
 1 | val b: Inv[String] = new Inv(1)
   |                              ^
   |                              Found:    (1 : Int)
   |                              Required: String
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala> abstract class C { type T; val x: T; val s: Unit = { type T = String; var y: T = x; locally { def f() = { type T = Int; val z: T = y }; f() } }; }
+-- [E007] Type Mismatch Error: -------------------------------------------------
 1 | abstract class C { type T; val x: T; val s: Unit = { type T = String; var y: T = x; locally { def f() = { type T = Int; val z: T = y }; f() } }; }
   |                                                                                  ^
   |Found:    (C.this.x : C.this.T)
@@ -37,6 +61,9 @@ scala> abstract class C { type T; val x: T; val s: Unit = { type T = String; var
   |
   |where:    T  is a type in class C
   |          T² is a type in the initializer of value s which is an alias of String
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: -------------------------------------------------
 1 | abstract class C { type T; val x: T; val s: Unit = { type T = String; var y: T = x; locally { def f() = { type T = Int; val z: T = y }; f() } }; }
   |                                                                                                                                    ^
   |Found:    (y : T)
@@ -44,28 +71,53 @@ scala> abstract class C { type T; val x: T; val s: Unit = { type T = String; var
   |
   |where:    T  is a type in the initializer of value s which is an alias of String
   |          T² is a type in method f which is an alias of Int
+  |
+  | longer explanation available when compiling with `-explain`
+2 errors found
 scala> class Foo() { def bar: Int = 1 }; val foo = new Foo(); foo.barr
+-- [E008] Not Found Error: -----------------------------------------------------
 1 | class Foo() { def bar: Int = 1 }; val foo = new Foo(); foo.barr
   |                                                        ^^^^^^^^
   |                 value barr is not a member of Foo - did you mean foo.bar?
+1 error found
 scala> val x: List[Int] = "foo" :: List(1)
+-- [E007] Type Mismatch Error: -------------------------------------------------
 1 | val x: List[Int] = "foo" :: List(1)
   |                    ^^^^^
   |                    Found:    ("foo" : String)
   |                    Required: Int
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala> while (((  foo ))) {}
+-- [E006] Not Found Error: -----------------------------------------------------
 1 | while (((  foo ))) {}
   |            ^^^
   |            Not found: foo
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala> val a: iDontExist = 1
+-- [E006] Not Found Error: -----------------------------------------------------
 1 | val a: iDontExist = 1
   |        ^^^^^^^^^^
   |        Not found: type iDontExist
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala> def foo1(x: => Int) = x _
+-- [E099] Syntax Error: --------------------------------------------------------
 1 | def foo1(x: => Int) = x _
   |                       ^^^
   |Only function types can be followed by _ but the current expression has type Int
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala> def foo2(x: => Int): () => Int = x _
+-- [E099] Syntax Error: --------------------------------------------------------
 1 | def foo2(x: => Int): () => Int = x _
   |                                  ^^^
   |Only function types can be followed by _ but the current expression has type Int
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
diff --git a/compiler/test-resources/repl/errorThenValid b/compiler/test-resources/repl/errorThenValid
deleted file mode 100644
index 3aea44b6392d..000000000000
--- a/compiler/test-resources/repl/errorThenValid
+++ /dev/null
@@ -1,8 +0,0 @@
-scala> val xs = scala.collection.mutable.ListBuffer[Int]
-1 | val xs = scala.collection.mutable.ListBuffer[Int]
-  |          ^
-  |          Missing parameter type
-  |
-  |          I could not infer the type of the parameter elems.
-scala> val xs = scala.collection.mutable.ListBuffer[Int]()
-val xs: scala.collection.mutable.ListBuffer[Int] = ListBuffer()
diff --git a/compiler/test-resources/repl/i11146 b/compiler/test-resources/repl/i11146
new file mode 100644
index 000000000000..1a6b7d414eeb
--- /dev/null
+++ b/compiler/test-resources/repl/i11146
@@ -0,0 +1,25 @@
+scala> class Appendable { def foo = println("Appendable.foo") }
+// defined class Appendable
+
+scala> (new Appendable).foo
+Appendable.foo
+
+scala> def assert(x: Boolean) = println(if x then "not asserted" else "asserted")
+def assert(x: Boolean): Unit
+
+scala> assert(false)
+asserted
+
+scala> class Option; object Option { val baz = 42 }
+// defined class Option
+// defined object Option
+
+scala> Option.baz
+val res0: Int = 42
+
+scala> object fs2 { class Stream[T] { override def toString = "fs2.Stream(..)" }; object Stream { def apply[T](x: T) = new Stream[T] }}
+// defined object fs2
+
+scala> import fs2.Stream
+scala> Stream(1)
+val res1: fs2.Stream[Int] = fs2.Stream(..)
diff --git a/compiler/test-resources/repl/i11377 b/compiler/test-resources/repl/i11377
index c07100ddbcf5..4e971fb89749 100644
--- a/compiler/test-resources/repl/i11377
+++ b/compiler/test-resources/repl/i11377
@@ -5,8 +5,10 @@ val bigArray: Array[Int] = Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 scala> val notTruncated = "!" * 999
 val notTruncated: String = !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 scala> val onTruncationLimit = "!" * 1000
-val onTruncationLimit: String = !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ... large output truncated, print value to show all
+val onTruncationLimit: String = !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+scala> val onTruncationLimitPlus = "!" * 1001
+val onTruncationLimitPlus: String = !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ... large output truncated, print value to show all
 scala> val veryBigTruncated = "!" * 10000
 val veryBigTruncated: String = !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ... large output truncated, print value to show all
 scala> val beh = "\u08A0"*10000
-val beh: String = ࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠ ... large output truncated, print value to show all
\ No newline at end of file
+val beh: String = ࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠࢠ ... large output truncated, print value to show all
diff --git a/compiler/test-resources/repl/i13181 b/compiler/test-resources/repl/i13181
new file mode 100644
index 000000000000..32f6c6e40c1e
--- /dev/null
+++ b/compiler/test-resources/repl/i13181
@@ -0,0 +1,2 @@
+scala> scala.compiletime.codeOf(1+2)
+val res0: String = 1.+(2)
diff --git a/compiler/test-resources/repl/i13208.default.scala b/compiler/test-resources/repl/i13208.default.scala
new file mode 100644
index 000000000000..9a18f9a67c66
--- /dev/null
+++ b/compiler/test-resources/repl/i13208.default.scala
@@ -0,0 +1,10 @@
+scala> try 1
+1 warning found
+-- [E000] Syntax Warning: ------------------------------------------------------
+1 | try 1
+  | ^^^^^
+  | A try without catch or finally is equivalent to putting
+  | its body in a block; no exceptions are handled.
+  |
+  | longer explanation available when compiling with `-explain`
+val res0: Int = 1
diff --git a/compiler/test-resources/repl/i13208.scala b/compiler/test-resources/repl/i13208.scala
new file mode 100644
index 000000000000..ce4fcf0d9ed8
--- /dev/null
+++ b/compiler/test-resources/repl/i13208.scala
@@ -0,0 +1,8 @@
+// scalac: -source:future -deprecation
+scala> type M[X] = X match { case Int => String case _ => Int }
+scala> type N[X] = X match { case List[_] => Int }
+1 warning found
+-- Deprecation Warning: --------------------------------------------------------
+1 | type N[X] = X match { case List[_] => Int }
+  |                                 ^
+  |        `_` is deprecated for wildcard arguments of types: use `?` instead
diff --git a/compiler/test-resources/repl/i1370 b/compiler/test-resources/repl/i1370
index 21193692e355..6582e03b6539 100644
--- a/compiler/test-resources/repl/i1370
+++ b/compiler/test-resources/repl/i1370
@@ -1,4 +1,6 @@
 scala> object Lives { class Private { def foo1: Any = new Private.C1; def foo2: Any = new Private.C2 };  object Private { class C1 private {}; private class C2 {} } }
+-- Error: ----------------------------------------------------------------------
 1 | object Lives { class Private { def foo1: Any = new Private.C1; def foo2: Any = new Private.C2 };  object Private { class C1 private {}; private class C2 {} } }
   |                                                    ^^^^^^^^^^
   |constructor C1 cannot be accessed as a member of Lives.Private.C1 from class Private.
+1 error found
diff --git a/compiler/test-resources/repl/i1374 b/compiler/test-resources/repl/i1374
index a56b15df2818..3d117fdb4ff9 100644
--- a/compiler/test-resources/repl/i1374
+++ b/compiler/test-resources/repl/i1374
@@ -1,5 +1,6 @@
 scala> implicit class Padder(val sb: StringBuilder) extends AnyVal { def pad2(width: Int) = { 1 to width - sb.length foreach { sb append '*' }; sb } }
 // defined class Padder
+def Padder(sb: StringBuilder): Padder
 scala> val greeting = new StringBuilder("Hello, kitteh!")
 val greeting: StringBuilder = Hello, kitteh!
 scala> val a = greeting pad2 20
diff --git a/compiler/test-resources/repl/i2063 b/compiler/test-resources/repl/i2063
index 2cee5d4fa735..7245f677bfe6 100644
--- a/compiler/test-resources/repl/i2063
+++ b/compiler/test-resources/repl/i2063
@@ -1,12 +1,24 @@
 scala> 	class Foo extends Bar // with one tab
+-- [E006] Not Found Error: -----------------------------------------------------
 1 | 	class Foo extends Bar // with one tab
   | 	                  ^^^
   | 	                  Not found: type Bar
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala>                                                                               class Foo extends Bar // with spaces
+-- [E006] Not Found Error: -----------------------------------------------------
 1 |                                                                               class Foo extends Bar // with spaces
   |                                                                                                 ^^^
   |                                                       Not found: type Bar
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala>                                                                                  class Foo extends Bar // with tabs
+-- [E006] Not Found Error: -----------------------------------------------------
 1 |                                                                                  class Foo extends Bar // with tabs
   |                                                                                                    ^^^
   |                                                       Not found: type Bar
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
diff --git a/compiler/test-resources/repl/i2213 b/compiler/test-resources/repl/i2213
index 93638f03f504..b75b2056c959 100644
--- a/compiler/test-resources/repl/i2213
+++ b/compiler/test-resources/repl/i2213
@@ -1,9 +1,13 @@
 scala> def x
+-- [E019] Syntax Error: --------------------------------------------------------
 1 | def x
   |      ^
   |      Missing return type
-
+  |
+  | longer explanation available when compiling with `-explain`
 scala> def x: Int
+-- [E067] Syntax Error: --------------------------------------------------------
 1 | def x: Int
   |     ^
   |Declaration of method x not allowed here: only classes can have declared but undefined members
+1 error found
diff --git a/compiler/test-resources/repl/i2631 b/compiler/test-resources/repl/i2631
index f68b430d829d..a04e2cb15bc6 100644
--- a/compiler/test-resources/repl/i2631
+++ b/compiler/test-resources/repl/i2631
@@ -1,4 +1,6 @@
 scala> class Foo(x : Any) { val foo : Integer = 0; def this() = { this(foo) } }
+-- Error: ----------------------------------------------------------------------
 1 | class Foo(x : Any) { val foo : Integer = 0; def this() = { this(foo) } }
   |                                                                 ^^^
-  |                          foo is not accessible from constructor arguments
\ No newline at end of file
+  |                          foo is not accessible from constructor arguments
+1 error found
diff --git a/compiler/test-resources/repl/i3536 b/compiler/test-resources/repl/i3536
new file mode 100644
index 000000000000..490909db103a
--- /dev/null
+++ b/compiler/test-resources/repl/i3536
@@ -0,0 +1,19 @@
+scala> val res0 = 1
+val res0: Int = 1
+
+scala> res0
+val res1: Int = 1
+
+
+scala> val res99 = 9
+val res99: Int = 9
+
+scala> res99
+val res100: Int = 9
+
+
+scala> val res50 = 5
+val res50: Int = 5
+
+scala> res50
+val res101: Int = 5
diff --git a/compiler/test-resources/repl/i3536_bind b/compiler/test-resources/repl/i3536_bind
new file mode 100644
index 000000000000..96ccdce81356
--- /dev/null
+++ b/compiler/test-resources/repl/i3536_bind
@@ -0,0 +1,4 @@
+scala> val res10 @ Some(_) = Option(1)
+val res10: Some[Int] = Some(1)
+scala> res10
+val res11: Some[Int] = Some(1)
diff --git a/compiler/test-resources/repl/i3536_defdef b/compiler/test-resources/repl/i3536_defdef
new file mode 100644
index 000000000000..04e6045c26c3
--- /dev/null
+++ b/compiler/test-resources/repl/i3536_defdef
@@ -0,0 +1,4 @@
+scala> def res20 = 1
+def res20: Int
+scala> res20
+val res21: Int = 1
diff --git a/compiler/test-resources/repl/i3536_object b/compiler/test-resources/repl/i3536_object
new file mode 100644
index 000000000000..181302939423
--- /dev/null
+++ b/compiler/test-resources/repl/i3536_object
@@ -0,0 +1,4 @@
+scala> object res30 { override def toString = "res30" }
+// defined object res30
+scala> res30
+val res31: res30.type = res30
diff --git a/compiler/test-resources/repl/i3536_patterndef_some b/compiler/test-resources/repl/i3536_patterndef_some
new file mode 100644
index 000000000000..24c8736b57b9
--- /dev/null
+++ b/compiler/test-resources/repl/i3536_patterndef_some
@@ -0,0 +1,5 @@
+scala> val Some((res40, res41)) = Option((1, 0))
+val res40: Int = 1
+val res41: Int = 0
+scala> res40
+val res42: Int = 1
diff --git a/compiler/test-resources/repl/i3536_patterndef_tuple b/compiler/test-resources/repl/i3536_patterndef_tuple
new file mode 100644
index 000000000000..987c28c3a382
--- /dev/null
+++ b/compiler/test-resources/repl/i3536_patterndef_tuple
@@ -0,0 +1,5 @@
+scala> val (res40, res41) = (1, 0)
+val res40: Int = 1
+val res41: Int = 0
+scala> res40
+val res42: Int = 1
diff --git a/compiler/test-resources/repl/i3536_typedef b/compiler/test-resources/repl/i3536_typedef
new file mode 100644
index 000000000000..4db70a4f9c98
--- /dev/null
+++ b/compiler/test-resources/repl/i3536_typedef
@@ -0,0 +1,4 @@
+scala> type res50 = Int
+// defined alias type res50 = Int
+scala> 1
+val res51: Int = 1
diff --git a/compiler/test-resources/repl/i3536_var b/compiler/test-resources/repl/i3536_var
new file mode 100644
index 000000000000..7467ad84c772
--- /dev/null
+++ b/compiler/test-resources/repl/i3536_var
@@ -0,0 +1,4 @@
+scala> var res60 = 1
+var res60: Int = 1
+scala> res60
+val res61: Int = 1
diff --git a/compiler/test-resources/repl/i4184 b/compiler/test-resources/repl/i4184
index 385e98014d11..2c4eb7d12a6f 100644
--- a/compiler/test-resources/repl/i4184
+++ b/compiler/test-resources/repl/i4184
@@ -5,6 +5,8 @@ scala> object bar { class Foo }
 scala> implicit def eqFoo: CanEqual[foo.Foo, foo.Foo] = CanEqual.derived
 def eqFoo: CanEqual[foo.Foo, foo.Foo]
 scala> object Bar { new foo.Foo == new bar.Foo }
+-- Error: ----------------------------------------------------------------------
 1 | object Bar { new foo.Foo == new bar.Foo }
   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^
   |      Values of types foo.Foo and bar.Foo cannot be compared with == or !=
+1 error found
diff --git a/compiler/test-resources/repl/i4217 b/compiler/test-resources/repl/i4217
index 22964adaf6a7..d4e113271073 100644
--- a/compiler/test-resources/repl/i4217
+++ b/compiler/test-resources/repl/i4217
@@ -1,7 +1,11 @@
 scala> def foo(x: Option[Int]) = x match { case None => }
+1 warning found
+-- [E029] Pattern Match Exhaustivity Warning: ----------------------------------
 1 | def foo(x: Option[Int]) = x match { case None => }
   |                           ^
   |                           match may not be exhaustive.
   |
   |                           It would fail on pattern case: Some(_)
-def foo(x: Option[Int]): Unit
\ No newline at end of file
+  |
+  | longer explanation available when compiling with `-explain`
+def foo(x: Option[Int]): Unit
diff --git a/compiler/test-resources/repl/i4566 b/compiler/test-resources/repl/i4566
index dcc7262a0eaf..32d84a6403d4 100644
--- a/compiler/test-resources/repl/i4566
+++ b/compiler/test-resources/repl/i4566
@@ -1,5 +1,9 @@
 scala> object test { type ::[A, B]; def a: Int :: Int = ???; def b: Int = a }
+-- [E007] Type Mismatch Error: -------------------------------------------------
 1 | object test { type ::[A, B]; def a: Int :: Int = ???; def b: Int = a }
   |                                                                    ^
   |                                                      Found:    Int :: Int
   |                                                      Required: Int
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
diff --git a/compiler/test-resources/repl/i5218 b/compiler/test-resources/repl/i5218
index bdf8325b6962..abe63009ef74 100644
--- a/compiler/test-resources/repl/i5218
+++ b/compiler/test-resources/repl/i5218
@@ -3,5 +3,4 @@ val tuple: (Int, String, Long) = (1,2,3)
 scala> 0.0 *: tuple
 val res0: (Double, Int, String, Long) = (0.0,1,2,3)
 scala> tuple ++ tuple
-val res1: Int *: String *: Long *:
-  scala.Tuple.Concat[scala.Tuple$package.EmptyTuple.type, tuple.type] = (1,2,3,1,2,3)
+val res1: Int *: String *: Long *: tuple.type = (1,2,3,1,2,3)
diff --git a/compiler/test-resources/repl/i5733 b/compiler/test-resources/repl/i5733
index e9afea5e98ec..ef578f24522f 100644
--- a/compiler/test-resources/repl/i5733
+++ b/compiler/test-resources/repl/i5733
@@ -1,6 +1,8 @@
 scala> abstract class F { def f(arg: Any): Unit; override def toString = "F" }
 // defined class F
 scala> val f: F = println
+1 warning found
+-- Warning: --------------------------------------------------------------------
 1 | val f: F = println
   |            ^^^^^^^
   |method println is eta-expanded even though F does not have the @FunctionalInterface annotation.
diff --git a/compiler/test-resources/repl/i6474 b/compiler/test-resources/repl/i6474
index 8b11b42859cf..0957bbbe2761 100644
--- a/compiler/test-resources/repl/i6474
+++ b/compiler/test-resources/repl/i6474
@@ -9,9 +9,11 @@ val res0: (Any, Int) = (1,2)
 scala> ((1, 2): Foo2.T[Int][Int]): Foo2.T[Any][Int]
 val res1: (Any, Int) = (1,2)
 scala> (1, 2): Foo3.T[Int][Int]
+-- [E056] Syntax Error: --------------------------------------------------------
 1 | (1, 2): Foo3.T[Int][Int]
   |         ^^^^^^^^^^^^^^^^
   |         Missing type parameter for Foo3.T[Int][Int]
+1 error found
 scala> ((1, 2): Foo3.T[Int][Int][Int]): Foo3.T[Any][Int][Int]
 val res2: (Any, Int) = (1,2)
 scala> object Foo3 { type T[A] = [B] =>> [C] =>> (A, B) }
diff --git a/compiler/test-resources/repl/i6676 b/compiler/test-resources/repl/i6676
index 519225183e43..e60023000b1d 100644
--- a/compiler/test-resources/repl/i6676
+++ b/compiler/test-resources/repl/i6676
@@ -1,25 +1,25 @@
 scala> xml"
+-- Error: ----------------------------------------------------------------------
 1 | xml"
   |    ^
   |    unclosed string literal
-1 | xml"
-  |     ^
-  |     ';' expected, but eof found
 scala> xml""
+-- [E008] Not Found Error: -----------------------------------------------------
 1 | xml""
   | ^^^^^
   | value xml is not a member of StringContext
+1 error found
 scala> xml"""
+-- Error: ----------------------------------------------------------------------
 1 | xml"""
   |    ^
   |    unclosed multi-line string literal
+-- Error: ----------------------------------------------------------------------
 1 | xml"""
   |       ^
   |       unclosed multi-line string literal
 scala> s"
+-- Error: ----------------------------------------------------------------------
 1 | s"
   |  ^
   |  unclosed string literal
-1 | s"
-  |   ^
-  |   ';' expected, but eof found
diff --git a/compiler/test-resources/repl/i7635 b/compiler/test-resources/repl/i7635
deleted file mode 100644
index 1c9e6474a768..000000000000
--- a/compiler/test-resources/repl/i7635
+++ /dev/null
@@ -1,9 +0,0 @@
-scala>  class C { protected val c = 42; override def toString() = s"C($c)" }
-// defined class C
-scala> val x = C()
-val x: C = C(42)
-scala> def foo = 3
-def foo: Int
-scala> foo
-val res0: Int = 3
-scala> import util.Try
diff --git a/compiler/test-resources/repl/i7644 b/compiler/test-resources/repl/i7644
index 780b3847bb4e..8ceaf8b00804 100644
--- a/compiler/test-resources/repl/i7644
+++ b/compiler/test-resources/repl/i7644
@@ -1,14 +1,24 @@
 scala> class T extends CanEqual
+-- [E112] Syntax Error: --------------------------------------------------------
 1 | class T extends CanEqual
   |       ^
   |       Cannot extend sealed trait CanEqual in a different source file
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E056] Syntax Error: --------------------------------------------------------
 1 | class T extends CanEqual
   |                 ^^^^^^^^
   |                 Missing type parameter for CanEqual
+2 errors found
 scala> class T extends CanEqual
+-- [E112] Syntax Error: --------------------------------------------------------
 1 | class T extends CanEqual
   |       ^
   |       Cannot extend sealed trait CanEqual in a different source file
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E056] Syntax Error: --------------------------------------------------------
 1 | class T extends CanEqual
   |                 ^^^^^^^^
   |                 Missing type parameter for CanEqual
+2 errors found
diff --git a/compiler/test-resources/repl/i9227 b/compiler/test-resources/repl/i9227
index 772325640ff7..40f9248898a2 100644
--- a/compiler/test-resources/repl/i9227
+++ b/compiler/test-resources/repl/i9227
@@ -1,5 +1,6 @@
 scala> import scala.quoted._; inline def myMacro[T]: Unit = ${ myMacroImpl[T] }; def myMacroImpl[T](using Quotes): Expr[Unit] = '{}; println(myMacro[Int])
+-- Error: ----------------------------------------------------------------------
 1 | import scala.quoted._; inline def myMacro[T]: Unit = ${ myMacroImpl[T] }; def myMacroImpl[T](using Quotes): Expr[Unit] = '{}; println(myMacro[Int])
   |                                                                                                                                       ^^^^^^^^^^^^
   |      Cannot call macro method myMacroImpl defined in the same source file
-  | This location contains code that was inlined from rs$line$1:1
+1 error found
diff --git a/compiler/test-resources/repl/importFromObj b/compiler/test-resources/repl/importFromObj
index 144859891519..281025af45f5 100644
--- a/compiler/test-resources/repl/importFromObj
+++ b/compiler/test-resources/repl/importFromObj
@@ -5,17 +5,25 @@ scala> object o { val xs = List(1, 2, 3) }
 // defined object o
 scala> import o._
 scala> buf += xs
+-- [E007] Type Mismatch Error: -------------------------------------------------
 1 | buf += xs
   |        ^^
   |        Found:    (o.xs : List[Int])
   |        Required: Int
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala> buf ++= xs
 val res0: scala.collection.mutable.ListBuffer[Int] = ListBuffer(1, 2, 3)
 scala> import util.foobar
+-- [E008] Not Found Error: -----------------------------------------------------
 1 | import util.foobar
   |             ^^^^^^
   |             value foobar is not a member of util
+1 error found
 scala> import util.foobar.bar
+-- [E008] Not Found Error: -----------------------------------------------------
 1 | import util.foobar.bar
   |        ^^^^^^^^^^^
   |        value foobar is not a member of util
+1 error found
diff --git a/compiler/test-resources/repl/notFound b/compiler/test-resources/repl/notFound
index 99379a89660d..689854ef2700 100644
--- a/compiler/test-resources/repl/notFound
+++ b/compiler/test-resources/repl/notFound
@@ -1,8 +1,16 @@
 scala>  Foo
+-- [E006] Not Found Error: -----------------------------------------------------
 1 |  Foo
   |  ^^^
   |  Not found: Foo
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala>  Bar
+-- [E006] Not Found Error: -----------------------------------------------------
 1 |  Bar
   |  ^^^
   |  Not found: Bar
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
diff --git a/compiler/test-resources/repl/nowarn.scala b/compiler/test-resources/repl/nowarn.scala
new file mode 100644
index 000000000000..db6ea24465e7
--- /dev/null
+++ b/compiler/test-resources/repl/nowarn.scala
@@ -0,0 +1,33 @@
+scala> @annotation.nowarn def f = try 1 // @nowarn doesn't work on first line, ctx.run is null in issueIfNotSuppressed
+1 warning found
+-- [E000] Syntax Warning: ------------------------------------------------------
+1 | @annotation.nowarn def f = try 1 // @nowarn doesn't work on first line, ctx.run is null in issueIfNotSuppressed
+  |                            ^^^^^
+  |                   A try without catch or finally is equivalent to putting
+  |                   its body in a block; no exceptions are handled.
+  |
+  | longer explanation available when compiling with `-explain`
+def f: Int
+scala> @annotation.nowarn def f = try 1
+def f: Int
+scala> def f = try 1
+1 warning found
+-- [E000] Syntax Warning: ------------------------------------------------------
+1 | def f = try 1
+  |         ^^^^^
+  |         A try without catch or finally is equivalent to putting
+  |         its body in a block; no exceptions are handled.
+  |
+  | longer explanation available when compiling with `-explain`
+def f: Int
+scala> @annotation.nowarn def f = { 1; 2 }
+def f: Int
+scala> def f = { 1; 2 }
+1 warning found
+-- [E129] Potential Issue Warning: ---------------------------------------------
+1 | def f = { 1; 2 }
+  |           ^
+  |A pure expression does nothing in statement position; you may be omitting necessary parentheses
+  |
+  | longer explanation available when compiling with `-explain`
+def f: Int
diff --git a/compiler/test-resources/repl/overrides b/compiler/test-resources/repl/overrides
index 05ddd3229deb..5bad603801a4 100644
--- a/compiler/test-resources/repl/overrides
+++ b/compiler/test-resources/repl/overrides
@@ -1,10 +1,18 @@
 scala> class B { override def foo(i: Int): Unit = {}; }
+-- [E037] Declaration Error: ---------------------------------------------------
 1 | class B { override def foo(i: Int): Unit = {}; }
   |                        ^
   |                        method foo overrides nothing
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
 scala> class A { def foo: Unit = {}; }
 // defined class A
 scala> class B extends A { override def foo(i: Int): Unit = {}; }
+-- [E038] Declaration Error: ---------------------------------------------------
 1 | class B extends A { override def foo(i: Int): Unit = {}; }
   |                                  ^
   |      method foo has a different signature than the overridden declaration
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
diff --git a/compiler/test-resources/repl/parsing b/compiler/test-resources/repl/parsing
index 2b3da45aa537..76cdd488ca36 100644
--- a/compiler/test-resources/repl/parsing
+++ b/compiler/test-resources/repl/parsing
@@ -1,14 +1,15 @@
-scala> ; 
-scala> ;; 
-scala> 1; 2 
+scala> ;
+scala> ;;
+scala> 1; 2
 val res0: Int = 1
 val res1: Int = 2
-scala> 1; 
+scala> 1;
 val res2: Int = 1
-scala> 1;; 2 
+scala> 1;; 2
 val res3: Int = 1
 val res4: Int = 2
-scala> } 
+scala> }
+-- [E040] Syntax Error: --------------------------------------------------------
 1 | }
   | ^
   | eof expected, but '}' found
diff --git a/compiler/test-resources/repl/reset-command b/compiler/test-resources/repl/reset-command
new file mode 100644
index 000000000000..ad38c9e9a867
--- /dev/null
+++ b/compiler/test-resources/repl/reset-command
@@ -0,0 +1,29 @@
+scala> def f(thread: Thread) = thread.stop()
+there were 1 deprecation warning(s); re-run with -deprecation for details
+def f(thread: Thread): Unit
+
+scala>:reset -deprecation
+
+scala> def f(thread: Thread) = thread.stop()
+1 warning found
+-- Deprecation Warning: --------------------------------------------------------
+1 | def f(thread: Thread) = thread.stop()
+  |                         ^^^^^^^^^^^
+  |method stop in class Thread is deprecated since : see corresponding Javadoc for more information.
+def f(thread: Thread): Unit
+
+scala> def resetNoArgsStillWorks = 1
+def resetNoArgsStillWorks: Int
+
+scala>:reset
+
+scala> resetNoArgsStillWorks
+-- [E006] Not Found Error: -----------------------------------------------------
+1 | resetNoArgsStillWorks
+  | ^^^^^^^^^^^^^^^^^^^^^
+  | Not found: resetNoArgsStillWorks
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
+
+scala>:settings "-Dfoo=bar baz"
diff --git a/compiler/test-resources/repl/settings-command b/compiler/test-resources/repl/settings-command
new file mode 100644
index 000000000000..db4b1af7343f
--- /dev/null
+++ b/compiler/test-resources/repl/settings-command
@@ -0,0 +1,16 @@
+scala> def f(thread: Thread) = thread.stop()
+there were 1 deprecation warning(s); re-run with -deprecation for details
+def f(thread: Thread): Unit
+
+scala>:settings -deprecation foo.scala
+Ignoring spurious arguments: foo.scala
+
+scala> def f(thread: Thread) = thread.stop()
+1 warning found
+-- Deprecation Warning: --------------------------------------------------------
+1 | def f(thread: Thread) = thread.stop()
+  |                         ^^^^^^^^^^^
+  |method stop in class Thread is deprecated since : see corresponding Javadoc for more information.
+def f(thread: Thread): Unit
+
+scala>
diff --git a/compiler/test-resources/repl/settings-outputDir b/compiler/test-resources/repl/settings-outputDir
new file mode 100644
index 000000000000..8f0460a30cfe
--- /dev/null
+++ b/compiler/test-resources/repl/settings-outputDir
@@ -0,0 +1,18 @@
+scala> java.nio.file.Files.exists(java.nio.file.Files.createDirectories(java.nio.file.Paths.get("target", "test-repl-settings-outDir")))
+val res0: Boolean = true
+
+scala> val x = 1
+val x: Int = 1
+
+scala>:settings -d target/test-repl-settings-outDir
+
+scala> val y = 2
+val y: Int = 2
+
+scala> x
+val res1: Int = 1
+
+scala> y
+val res2: Int = 2
+
+scala> java.nio.file.Files.walk(java.nio.file.Paths.get("target", "test-repl-settings-outDir")).sorted(java.util.Comparator.reverseOrder).forEach(java.nio.file.Files.delete)
diff --git a/compiler/test-resources/scripting/argfileClasspath.sc b/compiler/test-resources/scripting/argfileClasspath.sc
new file mode 100755
index 000000000000..c31371ba8934
--- /dev/null
+++ b/compiler/test-resources/scripting/argfileClasspath.sc
@@ -0,0 +1,9 @@
+#!dist/target/pack/bin/scala @compiler/test-resources/scripting/cpArgumentsFile.txt
+
+import java.nio.file.Paths
+
+def main(args: Array[String]): Unit =
+  val cwd = Paths.get(".").toAbsolutePath.toString.replace('\\', '/').replaceAll("/$", "")
+  printf("cwd: %s\n", cwd)
+  printf("classpath: %s\n", sys.props("java.class.path"))
+
diff --git a/compiler/test-resources/scripting/classpathReport.sc b/compiler/test-resources/scripting/classpathReport.sc
new file mode 100755
index 000000000000..a9eacbbba1f7
--- /dev/null
+++ b/compiler/test-resources/scripting/classpathReport.sc
@@ -0,0 +1,12 @@
+#!bin/scala -classpath 'dist/target/pack/lib/*'
+
+import java.nio.file.Paths
+
+def main(args: Array[String]): Unit =
+  val cwd = Paths.get(".").toAbsolutePath.normalize.toString.norm
+  printf("cwd: %s\n", cwd)
+  printf("classpath: %s\n", sys.props("java.class.path").norm)
+
+extension(s: String)
+  def norm: String = s.replace('\\', '/')
+
diff --git a/compiler/test-resources/scripting/cpArgumentsFile.txt b/compiler/test-resources/scripting/cpArgumentsFile.txt
new file mode 100755
index 000000000000..73037eb7d9bc
--- /dev/null
+++ b/compiler/test-resources/scripting/cpArgumentsFile.txt
@@ -0,0 +1 @@
+-classpath dist/target/pack/lib/*
diff --git a/compiler/test-resources/scripting/envtest.sc b/compiler/test-resources/scripting/envtest.sc
new file mode 100755
index 000000000000..b2fde1b32339
--- /dev/null
+++ b/compiler/test-resources/scripting/envtest.sc
@@ -0,0 +1,2 @@
+def main(args: Array[String]): Unit =
+  println("Hello " + util.Properties.propOrNull("key"))
diff --git a/compiler/test-resources/scripting/envtest.scala b/compiler/test-resources/scripting/envtest.scala
new file mode 100644
index 000000000000..bf416c9519ce
--- /dev/null
+++ b/compiler/test-resources/scripting/envtest.scala
@@ -0,0 +1,4 @@
+package run
+
+object envtest extends App:
+  println("Hello " + sys.props("key"))
diff --git a/compiler/test-resources/scripting/hashBang.sc b/compiler/test-resources/scripting/hashBang.sc
old mode 100644
new mode 100755
diff --git a/compiler/test-resources/scripting/mainClassOnStack.sc b/compiler/test-resources/scripting/mainClassOnStack.sc
old mode 100644
new mode 100755
diff --git a/compiler/test-resources/scripting/scriptPath.sc b/compiler/test-resources/scripting/scriptPath.sc
old mode 100644
new mode 100755
index 49ed65a76515..46cd5e8a7385
--- a/compiler/test-resources/scripting/scriptPath.sc
+++ b/compiler/test-resources/scripting/scriptPath.sc
@@ -1,10 +1,22 @@
-#!/usr/bin/env scala
+#!dist/target/pack/bin/scala
 
   def main(args: Array[String]): Unit =
     args.zipWithIndex.foreach { case (arg,i) => printf("arg %d: [%s]\n",i,arg) }
-    val path = Option(sys.props("script.path")) match {
-    case None => printf("no script.path property is defined\n")
+
+    Option(sys.props("script.path")) match {
     case Some(path) =>
-      printf("script.path: %s\n",path)
-      assert(path.endsWith("scriptPath.sc"),s"actual path [$path]")
+      if ! path.endsWith("scriptPath.sc") then
+        printf( s"incorrect script.path defined as [$path]")
+      else
+        printf("script.path: %s\n",path) // report the value
+    case None =>
+      printf("no script.path property is defined\n")
+      // report relevant environment factors that might explain the error
+      val psep: String = Option(sys.props("path.separator")).get
+      val pathEntries = System.getenv("PATH").split(psep).toList
+      System.err.printf("sun.java.command: %s\n", sys.props("sun.java.command"))
+      System.err.printf("first 5 PATH entries:\n%s\n",pathEntries.take(5).mkString("\n"))
     }
+
+  extension(s: String)
+    def norm: String = s.replace('\\', '/')
diff --git a/compiler/test-resources/scripting/showArgs.sc b/compiler/test-resources/scripting/showArgs.sc
new file mode 100755
index 000000000000..28f16a9022b3
--- /dev/null
+++ b/compiler/test-resources/scripting/showArgs.sc
@@ -0,0 +1,6 @@
+#!/usr/bin/env scala
+
+// precise output format expected by BashScriptsTests.scala
+def main(args: Array[String]): Unit =
+  for (a,i) <- args.zipWithIndex do
+    printf(s"arg %2d:[%s]\n",i,a)
diff --git a/compiler/test-resources/scripting/sqlDateError.sc b/compiler/test-resources/scripting/sqlDateError.sc
new file mode 100755
index 000000000000..b9a47d245d1a
--- /dev/null
+++ b/compiler/test-resources/scripting/sqlDateError.sc
@@ -0,0 +1,6 @@
+#!bin/scala -nosave
+
+def main(args: Array[String]): Unit = {
+  println(new java.sql.Date(100L))
+  System.err.println("SCALA_OPTS="+Option(System.getenv("SCALA_OPTS")).getOrElse(""))
+}
diff --git a/compiler/test-resources/scripting/unglobClasspath.sc b/compiler/test-resources/scripting/unglobClasspath.sc
new file mode 100755
index 000000000000..796697cdedf2
--- /dev/null
+++ b/compiler/test-resources/scripting/unglobClasspath.sc
@@ -0,0 +1,8 @@
+#!bin/scala -classpath 'dist/target/pack/lib/*'
+
+// won't compile unless the hashbang line sets classpath
+import org.jline.terminal.Terminal
+
+def main(args: Array[String]) =
+  val cp = sys.props("java.class.path")
+  printf("unglobbed classpath: %s\n", cp)
diff --git a/compiler/test-resources/type-printer/infix b/compiler/test-resources/type-printer/infix
index caac75e62fe2..a7904ae9ec43 100644
--- a/compiler/test-resources/type-printer/infix
+++ b/compiler/test-resources/type-printer/infix
@@ -40,7 +40,7 @@ def foo: Int Mappy Boolean && String
 scala> @scala.annotation.showAsInfix(false) class ||[T,U]
 // defined class ||
 scala> def foo: Int || Boolean = ???
-def foo: ||[Int, Boolean]
+def foo: Int || Boolean
 scala> def foo: Int && Boolean & String = ???
 def foo: Int && Boolean & String
 scala> def foo: (Int && Boolean) & String = ???
diff --git a/compiler/test-resources/type-printer/type-mismatch b/compiler/test-resources/type-printer/type-mismatch
index 83a84d917113..d139f9dff74b 100644
--- a/compiler/test-resources/type-printer/type-mismatch
+++ b/compiler/test-resources/type-printer/type-mismatch
@@ -3,7 +3,11 @@ scala> case class Foo[A](a: A)
 scala> Foo(1)
 val res0: Foo[Int] = Foo(1)
 scala> val x: Foo[String] = res0
+-- [E007] Type Mismatch Error: -------------------------------------------------
 1 | val x: Foo[String] = res0
   |                      ^^^^
   |                      Found:    (res0 : Foo[Int])
   |                      Required: Foo[String]
+  |
+  | longer explanation available when compiling with `-explain`
+1 error found
diff --git a/compiler/test/dotc/comptest.scala b/compiler/test/dotc/comptest.scala
index bb4961ea2a88..bd0d800e641c 100644
--- a/compiler/test/dotc/comptest.scala
+++ b/compiler/test/dotc/comptest.scala
@@ -10,7 +10,7 @@ object comptest extends ParallelTesting {
   def numberOfSlaves = 5
   def safeMode = false
   def isInteractive = true
-  def testFilter = None
+  def testFilter = Nil
   def updateCheckFiles: Boolean = false
 
   val posDir = "./tests/pos/"
diff --git a/compiler/test/dotc/pos-from-tasty.blacklist b/compiler/test/dotc/pos-from-tasty.blacklist
index b0ea2e35caec..e48c7f7ca8ce 100644
--- a/compiler/test/dotc/pos-from-tasty.blacklist
+++ b/compiler/test/dotc/pos-from-tasty.blacklist
@@ -11,3 +11,9 @@ rbtree.scala
 
 # transitive reduction of match types
 i10511.scala
+
+# Violates tightened condition in Retyper#typedTyped
+i11247.scala
+
+# Tree is huge and blows stack for printing Text
+i7034.scala
diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist
index e6fd9deb979d..b42d41f0df85 100644
--- a/compiler/test/dotc/pos-test-pickling.blacklist
+++ b/compiler/test/dotc/pos-test-pickling.blacklist
@@ -16,6 +16,11 @@ tuple-filter.scala
 i7740a.scala
 i7740b.scala
 i6507b.scala
+i12299a.scala
+i13871.scala
+
+# Tree is huge and blows stack for printing Text
+i7034.scala
 
 # Stale symbol: package object scala
 seqtype-cycle
@@ -24,18 +29,17 @@ seqtype-cycle
 i939.scala
 
 # Match types
-typelevel0.scala
-matchtype.scala
-6322.scala
-i7087.scala
-i7868.scala
 i7872.scala
-6709.scala
-6687.scala
 i11236.scala
 i11247.scala
 i11250
 i9999.scala
+8649.scala
+12093.scala
+9757.scala
+9890.scala
+13491.scala
+7512.scala
 
 # Opaque type
 i5720.scala
@@ -64,3 +68,15 @@ i8182.scala
 
 # local lifted value in annotation argument has different position after pickling
 i2797a
+
+# Late instantiation of type variable in tryInsertImplicitOnQualifier
+# allows to simplify a type that was already computed
+i13842.scala
+
+# GADT cast applied to singleton type difference
+i4176-gadt.scala
+
+# GADT difference
+i13974a.scala
+
+java-inherited-type1
diff --git a/compiler/test/dotc/run-test-pickling.blacklist b/compiler/test/dotc/run-test-pickling.blacklist
index d36314e896d8..9f19b439135c 100644
--- a/compiler/test/dotc/run-test-pickling.blacklist
+++ b/compiler/test/dotc/run-test-pickling.blacklist
@@ -1,3 +1,6 @@
+## Many of these tests fail because CompilationTests.pickling does not handle
+## tests containing java files correctly
+
 derive-generic.scala
 eff-dependent.scala
 enum-java
@@ -6,6 +9,8 @@ i7212
 i7868.scala
 i9011.scala
 i9473.scala
+i13433.scala
+i13433b.scala
 macros-in-same-project1
 mixin-forwarder-overload
 t10889
@@ -33,3 +38,9 @@ typeclass-derivation2d.scala
 typeclass-derivation3.scala
 varargs-abstract
 zero-arity-case-class.scala
+i12194.scala
+i12753
+t6138
+t6138-2
+i12656.scala
+trait-static-forwarder
diff --git a/compiler/test/dotty/Properties.scala b/compiler/test/dotty/Properties.scala
index 042773505dc5..4ef2ad7a61c9 100644
--- a/compiler/test/dotty/Properties.scala
+++ b/compiler/test/dotty/Properties.scala
@@ -15,13 +15,18 @@ object Properties {
   val isRunByCI: Boolean = sys.env.isDefinedAt("DOTTY_CI_RUN")
   || sys.env.isDefinedAt("DRONE")  // TODO remove this when we drop Drone
 
+  val testCache: Path =
+    sys.env.get("DOTTY_TEST_CACHE").map(Paths.get(_)).getOrElse {
+      Paths.get(sys.props("user.home"), ".cache", "dotty", "test")
+    }
+
   /** Tests should run interactive? */
   val testsInteractive: Boolean = propIsNullOrTrue("dotty.tests.interactive")
 
   /** Filter out tests not matching the regex supplied by "dotty.tests.filter"
    *  define
    */
-  val testsFilter: Option[String] = sys.props.get("dotty.tests.filter")
+  val testsFilter: List[String] = sys.props.get("dotty.tests.filter").fold(Nil)(_.split(',').toList)
 
   /** Tests should override the checkfiles with the current output */
   val testsUpdateCheckfile: Boolean =
diff --git a/compiler/test/dotty/tools/DottyTypeStealer.scala b/compiler/test/dotty/tools/DottyTypeStealer.scala
index 0a80205fbacf..52bf7a7e221a 100644
--- a/compiler/test/dotty/tools/DottyTypeStealer.scala
+++ b/compiler/test/dotty/tools/DottyTypeStealer.scala
@@ -3,29 +3,97 @@ package dotty.tools
 import dotc.ast.tpd
 import dotc.core.Names._
 import dotc.ast.tpd._
-import dotc.core.Contexts.Context
+import dotc.core.Contexts.{Context, atPhase}
+import dotty.tools.dotc.core.Phases.{typerPhase, erasurePhase}
+import dotc.core.Symbols.Symbol
 import dotc.core.Decorators._
 import dotc.core.Types.Type
 
+import scala.util.CommandLineParser.FromString
+
+/**Pass a string representing a Scala source file,
+ * and then some type signatures referencing prior definitions.
+ *
+ * The type signatures will then be printed as raw data structures.
+ *
+ * @param source top level Scala definitions, e.g. `"class O { type X }"`
+ * @param kind the kind of type we are inspecting [`rhs`, `method`, `class`, `type`]
+ * @param typeStrings Scala type signatures, e.g. `"O#X"`
+ *
+ * @syntax markdown
+ */
+@main def printTypes(source: String, kind: DottyTypeStealer.Kind, typeStrings: String*) = {
+  val (_, tpes) = DottyTypeStealer.stealType(source, kind, typeStrings*)
+  tpes.foreach(t => println(s"$t [${t.getClass}]"))
+}
+
+/**Pass a string representing a Scala source file,
+ * and then some type signatures referencing prior definitions.
+ *
+ * The type signatures will then be printed comparing between phase
+ * `typer` where types are as Scala understands them and phase `erasure`,
+ * which models the JVM types.
+ *
+ * @param source top level Scala definitions, e.g. `"class O { type X }"`
+ * @param kind the kind of type we are inspecting [`rhs`, `method`, `class`, `type`]
+ * @param typeStrings Scala type signatures, e.g. `"O#X"`
+ *
+ * @syntax markdown
+ */
+@main def printTypesAndErasure(source: String, kind: DottyTypeStealer.Kind, typeStrings: String*): Unit =
+  val (ictx, vdefs) = DottyTypeStealer.stealMember("erasure", source, kind, typeStrings*)
+
+  given Context = ictx
+
+  for vdef <- vdefs do
+    println(i"info @ typer   => ${atPhase(typerPhase.next)(vdef.info)}")
+    println(i"info @ erasure => ${atPhase(erasurePhase.next)(vdef.info)}")
+end printTypesAndErasure
+
 object DottyTypeStealer extends DottyTest {
-  def stealType(source: String, typeStrings: String*): (Context, List[Type]) = {
+
+  given FromString[Kind] = kind =>
+    if kind == "" then
+      println(s"assuming kind `${Kind.rhs}`")
+      Kind.rhs
+    else
+      Kind.valueOf(kind)
+
+  enum Kind:
+    case `rhs`, `method`, `class`, `type`
+
+    def format(name: String, arg: String) = this match
+      case `rhs`    => s"val $name: $arg = ???"
+      case `method` => s"def $name $arg = ???"
+      case `class`  => s"class $name $arg"
+      case `type`   => s"type $name $arg"
+
+  def stealType(source: String, kind: Kind, typeStrings: String*): (Context, List[Type]) = {
+    val (scontext, members) = stealMember("typer", source, kind, typeStrings*)
+    given Context = scontext
+    (scontext, members.map(_.info))
+  }
+
+  def stealMember(lastPhase: String, source: String, kind: Kind, typeStrings: String*): (Context, List[Symbol]) = {
     val dummyName = "x_x_x"
-    val vals = typeStrings.zipWithIndex.map{case (s, x)=> s"val ${dummyName}$x: $s = ???"}.mkString("\n")
+    val vals = typeStrings.zipWithIndex.map{case (s, x) => kind.format(dummyName + x, s) }.mkString("\n")
     val gatheredSource = s" ${source}\n object A$dummyName {$vals}"
     var scontext : Context = null
-    var tp: List[Type] = null
-    checkCompile("typer", gatheredSource) {
+    var members: List[Symbol] = null
+    checkCompile(lastPhase, gatheredSource) {
       (tree, context) =>
         given Context = context
-        val findValDef: (List[ValDef], tpd.Tree) => List[ValDef] =
+        val findMemberDef: (List[MemberDef], tpd.Tree) => List[MemberDef] =
           (acc , tree) =>  tree match {
+            case t: DefDef if t.name.startsWith(dummyName) => t :: acc
             case t: ValDef if t.name.startsWith(dummyName) => t :: acc
+            case t: TypeDef if t.name.startsWith(dummyName) => t :: acc
             case _ => acc
           }
-        val d = new DeepFolder[List[ValDef]](findValDef).foldOver(Nil, tree)
-        tp = d.map(_.tpe.widen).reverse
+        val d = new DeepFolder[List[MemberDef]](findMemberDef).foldOver(Nil, tree)
+        members = d.map(_.symbol).reverse
         scontext = context
     }
-    (scontext, tp)
+    (scontext, members)
   }
 }
diff --git a/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala b/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala
index d984b612ced2..9d6ff413f8a2 100644
--- a/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala
+++ b/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala
@@ -32,6 +32,22 @@ class TestBCode extends DottyBytecodeTest {
     }
   }
 
+  @Test def byNameParameters = {
+    val source = """
+                   |class Foo {
+                   |  def byNameParam(str: => String): Unit = {}
+                   |}
+                 """.stripMargin
+
+    checkBCode(source) { dir =>
+      val clsIn      = dir.lookupName("Foo.class", directory = false).input
+      val clsNode    = loadClassNode(clsIn)
+      val methodNode: MethodNode = getMethod(clsNode, "byNameParam")
+
+      assert(methodNode.signature == "(Lscala/Function0<Ljava/lang/String;>;)V")
+    }
+  }
+
   /** This test verifies that simple matches are transformed if possible
    *  despite no annotation
    */
@@ -118,6 +134,28 @@ class TestBCode extends DottyBytecodeTest {
     }
   }
 
+  @Test def switchOnStrings = {
+    val source =
+      """
+        |object Foo {
+        |  import scala.annotation.switch
+        |  def foo(s: String) = s match {
+        |    case "AaAa" => println(3)
+        |    case "BBBB" | "c" => println(2)
+        |    case "D" | "E" => println(1)
+        |    case _ => println(0)
+        |  }
+        |}
+      """.stripMargin
+
+    checkBCode(source) { dir =>
+      val moduleIn   = dir.lookupName("Foo$.class", directory = false)
+      val moduleNode = loadClassNode(moduleIn.input)
+      val methodNode = getMethod(moduleNode, "foo")
+      assert(verifySwitch(methodNode))
+    }
+  }
+
   @Test def matchWithDefaultNoThrowMatchError = {
     val source =
       """class Test {
@@ -677,7 +715,7 @@ class TestBCode extends DottyBytecodeTest {
       """.stripMargin)
 
   @Test def objectsInObjDefAreFinal =
-    checkFinalClass("Test$Foo$1$.class",
+    checkFinalClass("Test$Foo$2$.class",
       """
         |object Test {
         |  def bar() = {
@@ -687,7 +725,7 @@ class TestBCode extends DottyBytecodeTest {
       """.stripMargin)
 
   @Test def objectsInClassDefAreFinal =
-    checkFinalClass("Test$Foo$1$.class",
+    checkFinalClass("Test$Foo$2$.class",
       """
         |class Test {
         |  def bar() = {
@@ -697,7 +735,7 @@ class TestBCode extends DottyBytecodeTest {
       """.stripMargin)
 
   @Test def objectsInObjValAreFinal =
-    checkFinalClass("Test$Foo$1$.class",
+    checkFinalClass("Test$Foo$2$.class",
       """
         |class Test {
         |  val bar = {
@@ -759,17 +797,14 @@ class TestBCode extends DottyBytecodeTest {
         FrameEntry(1, List(1), List()),
         VarOp(Opcodes.ILOAD, 1),
         Op(Opcodes.ICONST_5),
-        Jump(Opcodes.IF_ICMPGT, Label(16)),
+        Jump(Opcodes.IF_ICMPGT, Label(13)),
         Field(Opcodes.GETSTATIC, "scala/Predef$", "MODULE$", "Lscala/Predef$;"),
         VarOp(Opcodes.ILOAD, 1),
         Invoke(Opcodes.INVOKESTATIC, "scala/runtime/BoxesRunTime", "boxToInteger", "(I)Ljava/lang/Integer;", false),
         Invoke(Opcodes.INVOKEVIRTUAL, "scala/Predef$", "println", "(Ljava/lang/Object;)V", false),
-        VarOp(Opcodes.ILOAD, 1),
-        Op(Opcodes.ICONST_1),
-        Op(Opcodes.IADD),
-        VarOp(Opcodes.ISTORE, 1),
+        Incr(Opcodes.IINC, 1, 1),
         Jump(Opcodes.GOTO, Label(2)),
-        Label(16),
+        Label(13),
         FrameEntry(3, List(), List()),
         Op(Opcodes.RETURN))
 
@@ -938,7 +973,7 @@ class TestBCode extends DottyBytecodeTest {
 
   @Test
   def invocationReceivers(): Unit = {
-    import Opcodes._
+    import Opcodes.*
 
     checkBCode(List(invocationReceiversTestCode.definitions("Object"))) { dir =>
       val c1 = loadClassNode(dir.lookupName("C1.class", directory = false).input)
diff --git a/compiler/test/dotty/tools/backend/jvm/IincTest.scala b/compiler/test/dotty/tools/backend/jvm/IincTest.scala
new file mode 100644
index 000000000000..ad19a4b489ae
--- /dev/null
+++ b/compiler/test/dotty/tools/backend/jvm/IincTest.scala
@@ -0,0 +1,71 @@
+package dotty.tools.backend.jvm
+
+import org.junit.Test
+import org.junit.Assert._
+
+import scala.tools.asm.Opcodes._
+
+class IincTest extends DottyBytecodeTest {
+  import ASMConverters._
+
+  @Test def increment = test(
+    """{
+      |  var i = x
+      |  i += 1
+      |  i += 54
+      |  i += 127
+      |  i -= 1
+      |  i -= 54
+      |  i -= 128
+      |  i
+      |}""".stripMargin,
+    List(1, 54, 127, -1, -54, -128)
+  )
+
+  @Test def wideIncrement = test(
+    """{
+      |  var i = x
+      |  i += 128
+      |  i += 8765
+      |  i += 32767
+      |  i -= 129
+      |  i -= 8765
+      |  i -= 32768
+      |  i
+      |}""".stripMargin,
+    List(128, 8765, 32767, -129, -8765, -32768)
+  )
+
+  @Test def tooBigForIinc = test(
+    """{
+      |  var i = x
+      |  i += 32768
+      |  i += 56789
+      |  i += 2147483647
+      |  i -= 32769
+      |  i -= 56789
+      |  i -= 2147483647
+      |  i
+      |}""".stripMargin,
+    Nil
+  )
+
+  private def test(code: String, expectedIincs: List[Int])= {
+    val source =
+      s"""class Increment {
+         | def test(x: Int): Int = $code
+         |}
+       """.stripMargin
+
+    checkBCode(source) { dir =>
+      val clsIn   = dir.lookupName("Increment.class", directory = false).input
+      val clsNode = loadClassNode(clsIn)
+      val meth   = getMethod(clsNode, "test")
+
+      val foundIincs = instructionsFromMethod(meth).collect { case iinc: Incr => iinc.incr }
+
+      assertEquals(expectedIincs, foundIincs)
+    }
+  }
+
+}
diff --git a/compiler/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala b/compiler/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala
index 829bc2607feb..741928203d77 100644
--- a/compiler/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala
+++ b/compiler/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala
@@ -397,10 +397,7 @@ class InlineBytecodeTests extends DottyBytecodeTest {
         List(
           IntOp(BIPUSH, 10),
           VarOp(ISTORE, 1),
-          VarOp(ILOAD, 1),
-          Op(ICONST_1),
-          Op(IADD),
-          VarOp(ISTORE, 1),
+          Incr(IINC, 1, 1),
           VarOp(ILOAD, 1),
           Op(IRETURN),
         )
@@ -615,4 +612,108 @@ class InlineBytecodeTests extends DottyBytecodeTest {
 
     }
   }
+
+  @Test def any_eq_specialization = {
+    val source = """class Test:
+                   |  inline def eql(x: Any, y: Any) = x == y
+                   |
+                   |  def testAny(x: Any, y: Any) = eql(x, y)
+                   |  def testAnyExpected(x: Any, y: Any) = x == y
+                   |
+                   |  def testBoolean(x: Boolean, y: Boolean) = eql(x, y)
+                   |  def testBooleanExpected(x: Boolean, y: Boolean) = x == y
+                   |
+                   |  def testByte(x: Byte, y: Byte) = eql(x, y)
+                   |  def testByteExpected(x: Byte, y: Byte) = x == y
+                   |
+                   |  def testShort(x: Short, y: Short) = eql(x, y)
+                   |  def testShortExpected(x: Short, y: Short) = x == y
+                   |
+                   |  def testInt(x: Int, y: Int) = eql(x, y)
+                   |  def testIntExpected(x: Int, y: Int) = x == y
+                   |
+                   |  def testLong(x: Long, y: Long) = eql(x, y)
+                   |  def testLongExpected(x: Long, y: Long) = x == y
+                   |
+                   |  def testFloat(x: Float, y: Float) = eql(x, y)
+                   |  def testFloatExpected(x: Float, y: Float) = x == y
+                   |
+                   |  def testDouble(x: Double, y: Double) = eql(x, y)
+                   |  def testDoubleExpected(x: Double, y: Double) = x == y
+                   |
+                   |  def testChar(x: Char, y: Char) = eql(x, y)
+                   |  def testCharExpected(x: Char, y: Char) = x == y
+                   |
+                   |  def testUnit(x: Unit, y: Unit) = eql(x, y)
+                   |  def testUnitExpected(x: Unit, y: Unit) = x == y
+                 """.stripMargin
+
+    checkBCode(source) { dir =>
+      val clsIn      = dir.lookupName("Test.class", directory = false).input
+      val clsNode    = loadClassNode(clsIn)
+
+      for cls <- List("Boolean", "Byte", "Short", "Int", "Long", "Float", "Double", "Char", "Unit") do
+        val meth1      = getMethod(clsNode, s"test$cls")
+        val meth2      = getMethod(clsNode, s"test${cls}Expected")
+
+        val instructions1 = instructionsFromMethod(meth1)
+        val instructions2 = instructionsFromMethod(meth2)
+
+        assert(instructions1 == instructions2,
+          s"`==` was not properly specialized when inlined in `test$cls`\n" +
+          diffInstructions(instructions1, instructions2))
+    }
+  }
+
+  @Test def any_neq_specialization = {
+    val source = """class Test:
+                   |  inline def neql(x: Any, y: Any) = x != y
+                   |
+                   |  def testAny(x: Any, y: Any) = neql(x, y)
+                   |  def testAnyExpected(x: Any, y: Any) = x != y
+                   |
+                   |  def testBoolean(x: Boolean, y: Boolean) = neql(x, y)
+                   |  def testBooleanExpected(x: Boolean, y: Boolean) = x != y
+                   |
+                   |  def testByte(x: Byte, y: Byte) = neql(x, y)
+                   |  def testByteExpected(x: Byte, y: Byte) = x != y
+                   |
+                   |  def testShort(x: Short, y: Short) = neql(x, y)
+                   |  def testShortExpected(x: Short, y: Short) = x != y
+                   |
+                   |  def testInt(x: Int, y: Int) = neql(x, y)
+                   |  def testIntExpected(x: Int, y: Int) = x != y
+                   |
+                   |  def testLong(x: Long, y: Long) = neql(x, y)
+                   |  def testLongExpected(x: Long, y: Long) = x != y
+                   |
+                   |  def testFloat(x: Float, y: Float) = neql(x, y)
+                   |  def testFloatExpected(x: Float, y: Float) = x != y
+                   |
+                   |  def testDouble(x: Double, y: Double) = neql(x, y)
+                   |  def testDoubleExpected(x: Double, y: Double) = x != y
+                   |
+                   |  def testChar(x: Char, y: Char) = neql(x, y)
+                   |  def testCharExpected(x: Char, y: Char) = x != y
+                   |
+                   |  def testUnit(x: Unit, y: Unit) = neql(x, y)
+                   |  def testUnitExpected(x: Unit, y: Unit) = x != y
+                 """.stripMargin
+
+    checkBCode(source) { dir =>
+      val clsIn      = dir.lookupName("Test.class", directory = false).input
+      val clsNode    = loadClassNode(clsIn)
+
+      for cls <- List("Boolean", "Byte", "Short", "Int", "Long", "Float", "Double", "Char", "Unit") do
+        val meth1      = getMethod(clsNode, s"test$cls")
+        val meth2      = getMethod(clsNode, s"test${cls}Expected")
+
+        val instructions1 = instructionsFromMethod(meth1)
+        val instructions2 = instructionsFromMethod(meth2)
+
+        assert(instructions1 == instructions2,
+          s"`!=` was not properly specialized when inlined in `test$cls`\n" +
+          diffInstructions(instructions1, instructions2))
+    }
+  }
 }
diff --git a/compiler/test/dotty/tools/backend/jvm/StringConcatTest.scala b/compiler/test/dotty/tools/backend/jvm/StringConcatTest.scala
index f288a8d6ff33..613e72b32e52 100644
--- a/compiler/test/dotty/tools/backend/jvm/StringConcatTest.scala
+++ b/compiler/test/dotty/tools/backend/jvm/StringConcatTest.scala
@@ -61,7 +61,7 @@ class StringConcatTest extends DottyBytecodeTest {
       }
 
       assertEquals(List(
-        "<init>()V",
+        "<init>(I)V",
         "toString()Ljava/lang/String;",
         "append(Ljava/lang/String;)Ljava/lang/StringBuilder;",
         "append(Ljava/lang/Object;)Ljava/lang/StringBuilder;",
@@ -82,7 +82,7 @@ class StringConcatTest extends DottyBytecodeTest {
       )
 
       assertEquals(List(
-        "<init>()V",
+        "<init>(I)V",
         "toString()Ljava/lang/String;",
         "append(Ljava/lang/String;)Ljava/lang/StringBuilder;",
         "append(Ljava/lang/String;)Ljava/lang/StringBuilder;",
diff --git a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala
index 3af7d5e676b3..9a6da578348c 100644
--- a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala
@@ -29,6 +29,7 @@ class BootstrappedOnlyCompilationTests {
       compileFilesInDir("tests/pos-custom-args/semanticdb", defaultOptions.and("-Xsemanticdb")),
       compileDir("tests/pos-special/i7592", defaultOptions.and("-Yretain-trees")),
       compileDir("tests/pos-special/i11331.1", defaultOptions),
+      compileDir("tests/pos-custom-args/i13405", defaultOptions.and("-Xfatal-warnings")),
     ).checkCompile()
   }
 
@@ -118,6 +119,7 @@ class BootstrappedOnlyCompilationTests {
     aggregateTests(
       compileFilesInDir("tests/run-macros", defaultOptions.and("-Xcheck-macros")),
       compileFilesInDir("tests/run-custom-args/Yretain-trees", defaultOptions and "-Yretain-trees"),
+      compileFilesInDir("tests/run-custom-args/Yread-comments", defaultOptions and "-Yread-docs"),
       compileFilesInDir("tests/run-custom-args/run-macros-erased", defaultOptions.and("-language:experimental.erasedDefinitions").and("-Xcheck-macros")),
     )
   }.checkRuns()
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index db05ed611a0e..88eab8d131e6 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -37,11 +37,12 @@ class CompilationTests {
       compileFilesInDir("tests/pos-special/spec-t5545", defaultOptions),
       compileFilesInDir("tests/pos-special/strawman-collections", allowDeepSubtypes),
       compileFilesInDir("tests/pos-special/isInstanceOf", allowDeepSubtypes.and("-Xfatal-warnings")),
-      compileFilesInDir("tests/new", defaultOptions),
+      compileFilesInDir("tests/new", defaultOptions.and("-source", "3.1")), // just to see whether 3.1 works
       compileFilesInDir("tests/pos-scala2", scala2CompatMode),
       compileFilesInDir("tests/pos-custom-args/erased", defaultOptions.and("-language:experimental.erasedDefinitions")),
       compileFilesInDir("tests/pos", defaultOptions.and("-Ysafe-init")),
       compileFilesInDir("tests/pos-deep-subtype", allowDeepSubtypes),
+      compileFilesInDir("tests/pos-custom-args/no-experimental", defaultOptions.and("-Yno-experimental")),
       compileDir("tests/pos-special/java-param-names", defaultOptions.withJavacOnlyOptions("-parameters")),
       compileFile(
         // succeeds despite -Xfatal-warnings because of -nowarn
@@ -54,11 +55,16 @@ class CompilationTests {
       compileDir("tests/pos-special/adhoc-extension", defaultOptions.and("-source", "future", "-feature", "-Xfatal-warnings")),
       compileFile("tests/pos-special/i7575.scala", defaultOptions.andLanguageFeature("dynamics")),
       compileFile("tests/pos-special/kind-projector.scala", defaultOptions.and("-Ykind-projector")),
+      compileFile("tests/pos-special/kind-projector-underscores.scala", defaultOptions.and("-Ykind-projector:underscores")),
       compileFile("tests/run/i5606.scala", defaultOptions.and("-Yretain-trees")),
       compileFile("tests/pos-custom-args/i5498-postfixOps.scala", defaultOptions withoutLanguageFeature "postfixOps"),
       compileFile("tests/pos-custom-args/i8875.scala", defaultOptions.and("-Xprint:getters")),
       compileFile("tests/pos-custom-args/i9267.scala", defaultOptions.and("-Ystop-after:erasure")),
       compileFile("tests/pos-special/extend-java-enum.scala", defaultOptions.and("-source", "3.0-migration")),
+      compileFile("tests/pos-custom-args/help.scala", defaultOptions.and("-help", "-V", "-W", "-X", "-Y")),
+      compileFile("tests/pos-custom-args/i10383.scala", defaultOptions.and("-source", "future", "-deprecation", "-Xfatal-warnings")),
+      compileFile("tests/pos-custom-args/i13044.scala", defaultOptions.and("-Xmax-inlines:33")),
+      compileFile("tests/pos-custom-args/jdk-8-app.scala", defaultOptions.and("-release:8")),
     ).checkCompile()
   }
 
@@ -70,7 +76,8 @@ class CompilationTests {
       compileFile("tests/rewrites/rewrites3x.scala", defaultOptions.and("-rewrite", "-source", "future-migration")),
       compileFile("tests/rewrites/i8982.scala", defaultOptions.and("-indent", "-rewrite")),
       compileFile("tests/rewrites/i9632.scala", defaultOptions.and("-indent", "-rewrite")),
-      compileFile("tests/rewrites/i11895.scala", defaultOptions.and("-indent", "-rewrite"))
+      compileFile("tests/rewrites/i11895.scala", defaultOptions.and("-indent", "-rewrite")),
+      compileFile("tests/rewrites/i12340.scala", unindentOptions.and("-rewrite")),
     ).checkRewrites()
   }
 
@@ -126,12 +133,14 @@ class CompilationTests {
       compileFilesInDir("tests/neg-no-kind-polymorphism", defaultOptions and "-Yno-kind-polymorphism"),
       compileFilesInDir("tests/neg-custom-args/deprecation", defaultOptions.and("-Xfatal-warnings", "-deprecation")),
       compileFilesInDir("tests/neg-custom-args/fatal-warnings", defaultOptions.and("-Xfatal-warnings")),
+      compileFilesInDir("tests/neg-custom-args/nowarn", defaultOptions.and("-deprecation", "-Wunused:nowarn", "-Wconf:msg=@nowarn annotation does not suppress any warnings:e")),
       compileFilesInDir("tests/neg-custom-args/erased", defaultOptions.and("-language:experimental.erasedDefinitions")),
       compileFilesInDir("tests/neg-custom-args/allow-double-bindings", allowDoubleBindings),
       compileFilesInDir("tests/neg-custom-args/allow-deep-subtypes", allowDeepSubtypes),
       compileFilesInDir("tests/neg-custom-args/explicit-nulls", defaultOptions.and("-Yexplicit-nulls")),
       compileFilesInDir("tests/neg-custom-args/no-experimental", defaultOptions.and("-Yno-experimental")),
       compileDir("tests/neg-custom-args/impl-conv", defaultOptions.and("-Xfatal-warnings", "-feature")),
+      compileDir("tests/neg-custom-args/i13946", defaultOptions.and("-Xfatal-warnings", "-feature")),
       compileFile("tests/neg-custom-args/implicit-conversions.scala", defaultOptions.and("-Xfatal-warnings", "-feature")),
       compileFile("tests/neg-custom-args/implicit-conversions-old.scala", defaultOptions.and("-Xfatal-warnings", "-feature")),
       compileFile("tests/neg-custom-args/i3246.scala", scala2CompatMode),
@@ -146,6 +155,7 @@ class CompilationTests {
       compileFile("tests/neg-custom-args/i3882.scala", allowDeepSubtypes),
       compileFile("tests/neg-custom-args/i4372.scala", allowDeepSubtypes),
       compileFile("tests/neg-custom-args/i1754.scala", allowDeepSubtypes),
+      compileFile("tests/neg-custom-args/i12650.scala", allowDeepSubtypes),
       compileFile("tests/neg-custom-args/i9517.scala", defaultOptions.and("-Xprint-types")),
       compileFile("tests/neg-custom-args/i11637.scala", defaultOptions.and("-explain")),
       compileFile("tests/neg-custom-args/interop-polytypes.scala", allowDeepSubtypes.and("-Yexplicit-nulls")),
@@ -166,12 +176,17 @@ class CompilationTests {
       compileDir("tests/neg-custom-args/adhoc-extension", defaultOptions.and("-source", "future", "-feature", "-Xfatal-warnings")),
       compileFile("tests/neg/i7575.scala", defaultOptions.withoutLanguageFeatures.and("-language:_")),
       compileFile("tests/neg-custom-args/kind-projector.scala", defaultOptions.and("-Ykind-projector")),
+      compileFile("tests/neg-custom-args/kind-projector-underscores.scala", defaultOptions.and("-Ykind-projector:underscores")),
       compileFile("tests/neg-custom-args/typeclass-derivation2.scala", defaultOptions.and("-language:experimental.erasedDefinitions")),
       compileFile("tests/neg-custom-args/i5498-postfixOps.scala", defaultOptions withoutLanguageFeature "postfixOps"),
       compileFile("tests/neg-custom-args/deptypes.scala", defaultOptions.and("-language:experimental.dependent")),
       compileFile("tests/neg-custom-args/matchable.scala", defaultOptions.and("-Xfatal-warnings", "-source", "future")),
       compileFile("tests/neg-custom-args/i7314.scala", defaultOptions.and("-Xfatal-warnings", "-source", "future")),
       compileFile("tests/neg-custom-args/feature-shadowing.scala", defaultOptions.and("-Xfatal-warnings", "-feature")),
+      compileDir("tests/neg-custom-args/hidden-type-errors", defaultOptions.and("-explain")),
+      compileFile("tests/neg-custom-args/i13026.scala", defaultOptions.and("-print-lines")),
+      compileFile("tests/neg-custom-args/i13838.scala", defaultOptions.and("-Ximplicit-search-limit", "1000")),
+      compileFile("tests/neg-custom-args/jdk-9-app.scala", defaultOptions.and("-release:8")),
     ).checkExpectedErrors()
   }
 
@@ -191,6 +206,9 @@ class CompilationTests {
       compileFile("tests/run-custom-args/no-useless-forwarders.scala", defaultOptions and "-Xmixin-force-forwarders:false"),
       compileFile("tests/run-custom-args/defaults-serizaliable-no-forwarders.scala", defaultOptions and "-Xmixin-force-forwarders:false"),
       compileFilesInDir("tests/run-custom-args/erased", defaultOptions.and("-language:experimental.erasedDefinitions")),
+      compileFilesInDir("tests/run-custom-args/fatal-warnings", defaultOptions.and("-Xfatal-warnings")),
+      compileDir("tests/run-custom-args/Xmacro-settings/simple", defaultOptions.and("-Xmacro-settings:one,two,three")),
+      compileDir("tests/run-custom-args/Xmacro-settings/compileTimeEnv", defaultOptions.and("-Xmacro-settings:a,b=1,c.b.a=x.y.z=1,myLogger.level=INFO")),
       compileFilesInDir("tests/run-deep-subtype", allowDeepSubtypes),
       compileFilesInDir("tests/run", defaultOptions.and("-Ysafe-init"))
     ).checkRuns()
@@ -214,84 +232,6 @@ class CompilationTests {
     ).checkCompile()
   }
 
-  /** The purpose of this test is three-fold, being able to compile dotty
-   *  bootstrapped, and making sure that TASTY can link against a compiled
-   *  version of Dotty, and compiling the compiler using the SemanticDB generation
-   */
-  @Test def tastyBootstrap: Unit = {
-    implicit val testGroup: TestGroup = TestGroup("tastyBootstrap/tests")
-    val libGroup = TestGroup("tastyBootstrap/lib")
-    val tastyCoreGroup = TestGroup("tastyBootstrap/tastyCore")
-    val dotty1Group = TestGroup("tastyBootstrap/dotty1")
-    val dotty2Group = TestGroup("tastyBootstrap/dotty2")
-
-    // Make sure that the directory is clean
-    dotty.tools.io.Directory(defaultOutputDir + "tastyBootstrap").deleteRecursively()
-
-    val opt = TestFlags(
-      List(
-        // compile with bootstrapped library on cp:
-        defaultOutputDir + libGroup + "/lib/",
-        // and bootstrapped tasty-core:
-        defaultOutputDir + tastyCoreGroup + "/tastyCore/",
-        // as well as bootstrapped compiler:
-        defaultOutputDir + dotty1Group + "/dotty1/",
-        // and the other compiler dependencies:
-        Properties.compilerInterface, Properties.scalaLibrary, Properties.scalaAsm,
-        Properties.dottyInterfaces, Properties.jlineTerminal, Properties.jlineReader,
-      ).mkString(File.pathSeparator),
-      Array("-Ycheck-reentrant", "-language:postfixOps", "-Xsemanticdb", "-Yno-experimental")
-    )
-
-    val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-bootstrapped"))
-    val librarySources = libraryDirs.flatMap(sources(_))
-
-    val lib =
-      compileList("lib", librarySources,
-        defaultOptions.and("-Ycheck-reentrant",
-          "-language:experimental.erasedDefinitions", // support declaration of scala.compiletime.erasedValue
-          //  "-source", "future",  // TODO: re-enable once we allow : @unchecked in pattern definitions. Right now, lots of narrowing pattern definitions fail.
-          ))(libGroup)
-
-    val tastyCoreSources = sources(Paths.get("tasty/src"))
-    val tastyCore = compileList("tastyCore", tastyCoreSources, opt)(tastyCoreGroup)
-
-    val compilerSources = sources(Paths.get("compiler/src")) ++ sources(Paths.get("compiler/src-bootstrapped"))
-    val compilerManagedSources = sources(Properties.dottyCompilerManagedSources)
-
-    val dotty1 = compileList("dotty1", compilerSources ++ compilerManagedSources, opt)(dotty1Group)
-    val dotty2 = compileList("dotty2", compilerSources ++ compilerManagedSources, opt)(dotty2Group)
-
-    val tests = {
-      lib.keepOutput :: tastyCore.keepOutput :: dotty1.keepOutput :: aggregateTests(
-        dotty2,
-        compileShallowFilesInDir("compiler/src/dotty/tools", opt),
-        compileShallowFilesInDir("compiler/src/dotty/tools/dotc", opt),
-        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/ast", opt),
-        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/config", opt),
-        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/parsing", opt),
-        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/printing", opt),
-        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/reporting", opt),
-        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/rewrites", opt),
-        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/transform", opt),
-        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/typer", opt),
-        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/util", opt),
-        compileShallowFilesInDir("compiler/src/dotty/tools/backend", opt),
-        compileShallowFilesInDir("compiler/src/dotty/tools/backend/jvm", opt),
-        compileList("managed-sources", compilerManagedSources, opt)
-      ).keepOutput :: Nil
-    }.map(_.checkCompile())
-
-    def assertExists(path: String) = assertTrue(Files.exists(Paths.get(path)))
-    assertExists(s"out/$libGroup/lib/")
-    assertExists(s"out/$tastyCoreGroup/tastyCore/")
-    assertExists(s"out/$dotty1Group/dotty1/")
-    assertExists(s"out/$dotty2Group/dotty2/")
-    compileList("idempotency", List("tests/idempotency/BootstrapChecker.scala", "tests/idempotency/IdempotencyCheck.scala"), defaultOptions).checkRuns()
-
-    tests.foreach(_.delete())
-  }
-
   // Explicit nulls tests
   @Test def explicitNullsNeg: Unit = {
     implicit val testGroup: TestGroup = TestGroup("explicitNullsNeg")
@@ -323,6 +263,27 @@ class CompilationTests {
     compileFilesInDir("tests/init/neg", options).checkExpectedErrors()
     compileFilesInDir("tests/init/pos", options).checkCompile()
     compileFilesInDir("tests/init/crash", options.without("-Xfatal-warnings")).checkCompile()
+
+    // The regression test for i12128 has some atypical classpath requirements.
+    // The test consists of three files: (a) Reflect_1  (b) Macro_2  (c) Test_3
+    // which must be compiled separately. In addition:
+    //   - the output from (a) must be on the classpath while compiling (b)
+    //   - the output from (b) must be on the classpath while compiling (c)
+    //   - the output from (a) _must not_ be on the classpath while compiling (c)
+    locally {
+      val i12128Group = TestGroup("checkInit/i12128")
+      val i12128Options = options.without("-Xfatal-warnings")
+      val outDir1 = defaultOutputDir + i12128Group + "/Reflect_1/i12128/Reflect_1"
+      val outDir2 = defaultOutputDir + i12128Group + "/Macro_2/i12128/Macro_2"
+
+      val tests = List(
+        compileFile("tests/init/special/i12128/Reflect_1.scala", i12128Options)(i12128Group),
+        compileFile("tests/init/special/i12128/Macro_2.scala", i12128Options.withClasspath(outDir1))(i12128Group),
+        compileFile("tests/init/special/i12128/Test_3.scala", options.withClasspath(outDir2))(i12128Group)
+      ).map(_.keepOutput.checkCompile())
+
+      tests.foreach(_.delete())
+    }
   }
 }
 
diff --git a/compiler/test/dotty/tools/dotc/IdempotencyTests.scala b/compiler/test/dotty/tools/dotc/IdempotencyTests.scala
index 980cfee4634a..38f8c02ee375 100644
--- a/compiler/test/dotty/tools/dotc/IdempotencyTests.scala
+++ b/compiler/test/dotty/tools/dotc/IdempotencyTests.scala
@@ -18,9 +18,8 @@ class IdempotencyTests {
   import IdempotencyTests._
   import CompilationTest.aggregateTests
 
-  val filter = FileFilter.exclude(
-    s"pos${JFile.separator}i6507b"
-  )
+  // ignore flaky tests
+  val filter = FileFilter.NoFilter
 
   @Category(Array(classOf[SlowTests]))
   @Test def idempotency: Unit = {
diff --git a/compiler/test/dotty/tools/dotc/SettingsTests.scala b/compiler/test/dotty/tools/dotc/SettingsTests.scala
index 5303fb070c7a..4625f4f34f72 100644
--- a/compiler/test/dotty/tools/dotc/SettingsTests.scala
+++ b/compiler/test/dotty/tools/dotc/SettingsTests.scala
@@ -21,7 +21,7 @@ class SettingsTests {
     assertEquals(1, reporter.errorCount)
     assertEquals("'not_here' does not exist or is not a directory or .jar file", reporter.allErrors.head.message)
 
-  @Test def jarOutput: Unit = {
+  @Test def jarOutput: Unit =
     val source = "tests/pos/Foo.scala"
     val out = Paths.get("out/jaredFoo.jar").normalize
     if (Files.exists(out)) Files.delete(out)
@@ -29,7 +29,6 @@ class SettingsTests {
     val reporter = Main.process(options)
     assertEquals(0, reporter.errorCount)
     assertTrue(Files.exists(out))
-  }
 
   @Test def `t8124 Don't crash on missing argument`: Unit =
     val source    = Paths.get("tests/pos/Foo.scala").normalize
@@ -45,15 +44,70 @@ class SettingsTests {
       val foo = StringSetting("-foo", "foo", "Foo", "a")
       val bar = IntSetting("-bar", "Bar", 0)
 
-    inContext {
-      val args = List("-foo", "b", "-bar", "1")
-      val summary = Settings.processArguments(args, true)
-      assertTrue(summary.errors.isEmpty)
-      given SettingsState = summary.sstate
+    val args = List("-foo", "b", "-bar", "1")
+    val summary = Settings.processArguments(args, true)
+    assertTrue(summary.errors.isEmpty)
+    withProcessedArgs(summary) {
       assertEquals("b", Settings.foo.value)
       assertEquals(1, Settings.bar.value)
     }
 
+  @Test def `workaround dont crash on many files`: Unit =
+    object Settings extends SettingGroup
+
+    val args = "--" :: List.fill(6000)("file.scala")
+    val summary = Settings.processArguments(args, processAll = true)
+    assertTrue(summary.errors.isEmpty)
+    assertEquals(6000, summary.arguments.size)
+
+  @Test def `dont crash on many files`: Unit =
+    object Settings extends SettingGroup
+
+    val args = List.fill(6000)("file.scala")
+    val summary = Settings.processArguments(args, processAll = true)
+    assertTrue(summary.errors.isEmpty)
+    assertEquals(6000, summary.arguments.size)
+
+  @Test def `dont crash on many options`: Unit =
+    object Settings extends SettingGroup:
+      val option = BooleanSetting("-option", "Some option")
+
+    val limit = 6000
+    val args = List.fill(limit)("-option")
+    val summary = Settings.processArguments(args, processAll = true)
+    assertTrue(summary.errors.isEmpty)
+    assertEquals(limit-1, summary.warnings.size)
+    assertTrue(summary.warnings.head.contains("repeatedly"))
+    assertEquals(0, summary.arguments.size)
+    withProcessedArgs(summary) {
+      assertTrue(Settings.option.value)
+    }
+
+  @Test def `bad option warning consumes an arg`: Unit =
+    object Settings extends SettingGroup:
+      val option = BooleanSetting("-option", "Some option")
+
+    val args = List("-adoption", "dogs", "cats")
+    val summary = Settings.processArguments(args, processAll = true)
+    assertTrue(summary.errors.isEmpty)
+    assertFalse(summary.warnings.isEmpty)
+    assertEquals(2, summary.arguments.size)
+
+  @Test def `bad option settings throws`: Unit =
+    object Settings extends SettingGroup:
+      val option = BooleanSetting("-option", "Some option")
+
+    def checkMessage(s: String): (Throwable => Boolean) = t =>
+      if t.getMessage == s then true
+      else
+        println(s"Expected: $s, Actual: ${t.getMessage}")
+        false
+
+    val default = Settings.defaultState
+    assertThrows[IllegalArgumentException](checkMessage("found: not an option of type java.lang.String, required: Boolean")) {
+      Settings.option.updateIn(default, "not an option")
+    }
+
   @Test def validateChoices: Unit =
     object Settings extends SettingGroup:
       val foo = ChoiceSetting("-foo", "foo", "Foo", List("a", "b"), "a")
@@ -63,25 +117,27 @@ class SettingsTests {
       val quux = ChoiceSetting("-quux", "quux", "Quux", List(), "")
       val quuz = IntChoiceSetting("-quuz", "Quuz", List(), 0)
 
-    inContext {
+    locally {
       val args = List("-foo", "b", "-bar", "1", "-baz", "5")
       val summary = Settings.processArguments(args, true)
       assertTrue(summary.errors.isEmpty)
-      given SettingsState = summary.sstate
-      assertEquals("b", Settings.foo.value)
-      assertEquals(1, Settings.bar.value)
-      assertEquals(5, Settings.baz.value)
+      withProcessedArgs(summary) {
+        assertEquals("b", Settings.foo.value)
+        assertEquals(1, Settings.bar.value)
+        assertEquals(5, Settings.baz.value)
+      }
     }
 
-    inContext {
+    locally {
       val args = List("-foo:b")
       val summary = Settings.processArguments(args, true)
       assertTrue(summary.errors.isEmpty)
-      given SettingsState = summary.sstate
-      assertEquals("b", Settings.foo.value)
+      withProcessedArgs(summary) {
+        assertEquals("b", Settings.foo.value)
+      }
     }
 
-    inContext {
+    locally {
       val args = List("-foo", "c", "-bar", "3", "-baz", "-1")
       val summary = Settings.processArguments(args, true)
       val expectedErrors = List(
@@ -92,14 +148,14 @@ class SettingsTests {
       assertEquals(expectedErrors, summary.errors)
     }
 
-    inContext {
+    locally {
       val args = List("-foo:c")
       val summary = Settings.processArguments(args, true)
       val expectedErrors = List("c is not a valid choice for -foo")
       assertEquals(expectedErrors, summary.errors)
     }
 
-    inContext {
+    locally {
       val args = List("-quux", "a", "-quuz", "0")
       val summary = Settings.processArguments(args, true)
       val expectedErrors = List(
@@ -109,7 +165,19 @@ class SettingsTests {
       assertEquals(expectedErrors, summary.errors)
     }
 
-  private def inContext(f: Context ?=> Unit) = f(using (new ContextBase).initialCtx.fresh)
+  @Test def `Allow IntSetting's to be set with a colon`: Unit =
+    object Settings extends SettingGroup:
+      val foo = IntSetting("-foo", "foo", 80)
+    import Settings._
+
+    val args = List("-foo:100")
+    val summary = processArguments(args, processAll = true)
+    assertTrue(s"Setting args errors:\n  ${summary.errors.take(5).mkString("\n  ")}", summary.errors.isEmpty)
+    withProcessedArgs(summary) {
+      assertEquals(100, foo.value)
+    }
+
+  private def withProcessedArgs(summary: ArgsSummary)(f: SettingsState ?=> Unit) = f(using summary.sstate)
 
   extension [T](setting: Setting[T])
     private def value(using ss: SettingsState): T = setting.valueIn(ss)
diff --git a/compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala b/compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala
new file mode 100644
index 000000000000..7b1629c426d6
--- /dev/null
+++ b/compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala
@@ -0,0 +1,121 @@
+package dotty
+package tools
+package dotc
+
+import org.junit.{ Test, BeforeClass, AfterClass }
+import org.junit.Assert._
+import org.junit.Assume._
+import org.junit.experimental.categories.Category
+
+import java.io.File
+import java.nio.file._
+import java.util.stream.{ Stream => JStream }
+import scala.collection.JavaConverters._
+import scala.util.matching.Regex
+import scala.concurrent.duration._
+import TestSources.sources
+import vulpix._
+
+class TastyBootstrapTests {
+  import ParallelTesting._
+  import TestConfiguration._
+  import CompilationTests._
+  import CompilationTest.aggregateTests
+
+  /** The purpose of this test is three-fold, being able to compile dotty
+   *  bootstrapped, and making sure that TASTY can link against a compiled
+   *  version of Dotty, and compiling the compiler using the SemanticDB generation
+   */
+  @Test def tastyBootstrap: Unit = {
+    implicit val testGroup: TestGroup = TestGroup("tastyBootstrap/tests")
+    val libGroup = TestGroup("tastyBootstrap/lib")
+    val tastyCoreGroup = TestGroup("tastyBootstrap/tastyCore")
+    val dotty1Group = TestGroup("tastyBootstrap/dotty1")
+    val dotty2Group = TestGroup("tastyBootstrap/dotty2")
+
+    // Make sure that the directory is clean
+    dotty.tools.io.Directory(defaultOutputDir + "tastyBootstrap").deleteRecursively()
+
+    val opt = TestFlags(
+      List(
+        // compile with bootstrapped library on cp:
+        defaultOutputDir + libGroup + "/lib/",
+        // and bootstrapped tasty-core:
+        defaultOutputDir + tastyCoreGroup + "/tastyCore/",
+        // as well as bootstrapped compiler:
+        defaultOutputDir + dotty1Group + "/dotty1/",
+        // and the other compiler dependencies:
+        Properties.compilerInterface, Properties.scalaLibrary, Properties.scalaAsm,
+        Properties.dottyInterfaces, Properties.jlineTerminal, Properties.jlineReader,
+      ).mkString(File.pathSeparator),
+      Array("-Ycheck-reentrant", "-language:postfixOps", "-Xsemanticdb")
+    )
+
+    val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-bootstrapped"))
+    val librarySources = libraryDirs.flatMap(sources(_))
+
+    val lib =
+      compileList("lib", librarySources,
+        defaultOptions.and("-Ycheck-reentrant",
+          "-language:experimental.erasedDefinitions", // support declaration of scala.compiletime.erasedValue
+          //  "-source", "future",  // TODO: re-enable once we allow : @unchecked in pattern definitions. Right now, lots of narrowing pattern definitions fail.
+          ))(libGroup)
+
+    val tastyCoreSources = sources(Paths.get("tasty/src"))
+    val tastyCore = compileList("tastyCore", tastyCoreSources, opt)(tastyCoreGroup)
+
+    val compilerSources = sources(Paths.get("compiler/src")) ++ sources(Paths.get("compiler/src-bootstrapped"))
+    val compilerManagedSources = Properties.dottyCompilerManagedSources match
+      case p if Files.isDirectory(p) => sources(p)
+      case _                         => Nil
+
+    val dotty1 = compileList("dotty1", compilerSources ++ compilerManagedSources, opt)(dotty1Group)
+    val dotty2 = compileList("dotty2", compilerSources ++ compilerManagedSources, opt)(dotty2Group)
+
+    val tests = {
+      lib.keepOutput :: tastyCore.keepOutput :: dotty1.keepOutput :: aggregateTests(
+        dotty2,
+        compileShallowFilesInDir("compiler/src/dotty/tools", opt),
+        compileShallowFilesInDir("compiler/src/dotty/tools/dotc", opt),
+        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/ast", opt),
+        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/config", opt),
+        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/parsing", opt),
+        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/printing", opt),
+        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/reporting", opt),
+        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/rewrites", opt),
+        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/transform", opt),
+        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/typer", opt),
+        compileShallowFilesInDir("compiler/src/dotty/tools/dotc/util", opt),
+        compileShallowFilesInDir("compiler/src/dotty/tools/backend", opt),
+        compileShallowFilesInDir("compiler/src/dotty/tools/backend/jvm", opt),
+        compileList("managed-sources", compilerManagedSources, opt)
+      ).keepOutput :: Nil
+    }.map(_.checkCompile())
+
+    def assertExists(path: String) = assertTrue(Files.exists(Paths.get(path)))
+    assertExists(s"out/$libGroup/lib/")
+    assertExists(s"out/$tastyCoreGroup/tastyCore/")
+    assertExists(s"out/$dotty1Group/dotty1/")
+    assertExists(s"out/$dotty2Group/dotty2/")
+    compileList("idempotency", List("tests/idempotency/BootstrapChecker.scala", "tests/idempotency/IdempotencyCheck.scala"), defaultOptions).checkRuns()
+
+    tests.foreach(_.delete())
+  }
+}
+
+object TastyBootstrapTests extends ParallelTesting {
+  // Test suite configuration --------------------------------------------------
+
+  def maxDuration = 45.seconds
+  def numberOfSlaves = Runtime.getRuntime.availableProcessors()
+  def safeMode = Properties.testsSafeMode
+  def isInteractive = SummaryReport.isInteractive
+  def testFilter = Properties.testsFilter
+  def updateCheckFiles: Boolean = Properties.testsUpdateCheckfile
+
+  implicit val summaryReport: SummaryReporting = new SummaryReport
+  @AfterClass def tearDown(): Unit = {
+    super.cleanup()
+    summaryReport.echoSummary()
+  }
+}
diff --git a/compiler/test/dotty/tools/dotc/classpath/MultiReleaseJarTest.scala b/compiler/test/dotty/tools/dotc/classpath/MultiReleaseJarTest.scala
index b79a34e1f2ab..79aeb87aed1d 100644
--- a/compiler/test/dotty/tools/dotc/classpath/MultiReleaseJarTest.scala
+++ b/compiler/test/dotty/tools/dotc/classpath/MultiReleaseJarTest.scala
@@ -2,18 +2,19 @@ package dotty.tools.dotc.classpath
 
 import dotty.tools.dotc.core.Contexts.Context
 
-import java.io.ByteArrayOutputStream
+import java.io.{ByteArrayOutputStream, IOException}
 import java.nio.file.{FileSystems, Files, Path}
 import java.util.jar.Attributes
 import java.util.jar.Attributes.Name
 
-import org.junit.Test
 import org.junit.Assert._
+import org.junit.Test
 
-import scala.util.Properties
 import scala.collection.JavaConverters._
+import scala.util.Properties
 
 class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
+
   @Test
   def mrJar(): Unit = {
     if (!Properties.isJavaAtLeast("9")) { println("skipping mrJar() on old JDK"); return }
@@ -61,7 +62,10 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
       if Properties.isJavaAtLeast("10") then
         assertEquals(Set("foo1", "foo2", "bar1", "bar2"), apiMethods(jar3, "10"))
     } finally
-      List(jar1, jar2, jar3).foreach(Files.deleteIfExists)
+      List(jar1, jar2, jar3).forall(path =>
+        try Files.deleteIfExists(path)
+        catch case _: IOException => false
+      )
   }
 
   @Test
@@ -82,7 +86,6 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
     assertTrue(classExists("java.lang.invoke.LambdaMetafactory", "9"))
   }
 
-
   private def createManifest = {
     val manifest = new java.util.jar.Manifest()
     manifest.getMainAttributes.put(Name.MANIFEST_VERSION, "1.0")
@@ -92,6 +95,7 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
     val manifestBytes = os.toByteArray
     manifestBytes
   }
+
   private def createZip(zipLocation: Path, content: List[(String, Array[Byte])]): Unit = {
     val env = new java.util.HashMap[String, String]()
     Files.deleteIfExists(zipLocation)
@@ -113,4 +117,5 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
       zipfs.close()
     }
   }
+
 }
diff --git a/compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala b/compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala
index a18f96dfd35b..05f218059f02 100644
--- a/compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala
+++ b/compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala
@@ -64,4 +64,22 @@ class ScalaSettingsTests:
     assertTrue("Has the feature", set.contains("implicitConversions"))
     assertTrue("Has the feature", set.contains("dynamics"))
 
+  @Test def `WConf setting is parsed`: Unit =
+    import reporting.{Action, Diagnostic, NoExplanation}
+    val sets = new ScalaSettings
+    val args = List("-Wconf:cat=deprecation:s,cat=feature:e", "-Wconf:msg=a problem\\.:s")
+    val sumy = ArgsSummary(sets.defaultState, args, errors = Nil, warnings = Nil)
+    val proc = sets.processArguments(sumy, processAll = true, skipped = Nil)
+    val conf = sets.Wconf.valueIn(proc.sstate)
+    val sut  = reporting.WConf.fromSettings(conf).getOrElse(???)
+    val msg  = NoExplanation("There was a problem!")
+    val depr = new Diagnostic.DeprecationWarning(msg, util.NoSourcePosition)
+    assertEquals(Action.Silent, sut.action(depr))
+    val feat = new Diagnostic.FeatureWarning(msg, util.NoSourcePosition)
+    assertEquals(Action.Error, sut.action(feat))
+    val warn = new Diagnostic.Warning(msg, util.NoSourcePosition)
+    assertEquals(Action.Warning, sut.action(warn))
+    val nowr = new Diagnostic.Warning(NoExplanation("This is a problem."), util.NoSourcePosition)
+    assertEquals(Action.Silent, sut.action(nowr))
+
 end ScalaSettingsTests
diff --git a/compiler/test/dotty/tools/dotc/core/ConstraintsTest.scala b/compiler/test/dotty/tools/dotc/core/ConstraintsTest.scala
new file mode 100644
index 000000000000..5ab162b9f05c
--- /dev/null
+++ b/compiler/test/dotty/tools/dotc/core/ConstraintsTest.scala
@@ -0,0 +1,55 @@
+package dotty.tools
+package dotc.core
+
+import vulpix.TestConfiguration
+
+import dotty.tools.dotc.core.Contexts.{*, given}
+import dotty.tools.dotc.core.Decorators.{*, given}
+import dotty.tools.dotc.core.Symbols.*
+import dotty.tools.dotc.core.Types.*
+import dotty.tools.dotc.ast.tpd.*
+import dotty.tools.dotc.typer.ProtoTypes.constrained
+
+import org.junit.Test
+
+import dotty.tools.DottyTest
+
+class ConstraintsTest:
+
+  @Test def mergeParamsTransitivity: Unit =
+    inCompilerContext(TestConfiguration.basicClasspath,
+        scalaSources = "trait A { def foo[S, T, R]: Any  }") {
+      val tvars = constrained(requiredClass("A").typeRef.select("foo".toTermName).info.asInstanceOf[TypeLambda], EmptyTree, alwaysAddTypeVars = true)._2
+      val List(s, t, r) = tvars.tpes
+
+      val innerCtx = ctx.fresh.setExploreTyperState()
+      inContext(innerCtx) {
+        s <:< t
+      }
+
+      t <:< r
+
+      ctx.typerState.mergeConstraintWith(innerCtx.typerState)
+      assert(s frozen_<:< r,
+        i"Merging constraints `?S <: ?T` and `?T <: ?R` should result in `?S <:< ?R`: ${ctx.typerState.constraint}")
+    }
+  end mergeParamsTransitivity
+
+  @Test def mergeBoundsTransitivity: Unit =
+    inCompilerContext(TestConfiguration.basicClasspath,
+        scalaSources = "trait A { def foo[S, T]: Any  }") {
+      val tvars = constrained(requiredClass("A").typeRef.select("foo".toTermName).info.asInstanceOf[TypeLambda], EmptyTree, alwaysAddTypeVars = true)._2
+      val List(s, t) = tvars.tpes
+
+      val innerCtx = ctx.fresh.setExploreTyperState()
+      inContext(innerCtx) {
+        s <:< t
+      }
+
+      defn.IntType <:< s
+
+      ctx.typerState.mergeConstraintWith(innerCtx.typerState)
+      assert(defn.IntType frozen_<:< t,
+        i"Merging constraints `?S <: ?T` and `Int <: ?S` should result in `Int <:< ?T`: ${ctx.typerState.constraint}")
+    }
+  end mergeBoundsTransitivity
diff --git a/compiler/test/dotty/tools/dotc/core/SealedDescendantsTest.scala b/compiler/test/dotty/tools/dotc/core/SealedDescendantsTest.scala
new file mode 100644
index 000000000000..7d90d0ed8870
--- /dev/null
+++ b/compiler/test/dotty/tools/dotc/core/SealedDescendantsTest.scala
@@ -0,0 +1,108 @@
+package dotty.tools.dotc.core
+
+import dotty.tools.dotc.core.Contexts.{Context, ctx}
+import dotty.tools.dotc.core.Symbols.*
+
+import org.junit.Assert._
+import org.junit.Test
+
+import dotty.tools.DottyTest
+
+class SealedDescendantsTest extends DottyTest {
+
+  @Test
+  def zincIssue979: Unit =
+    val source =
+      """
+      sealed trait Z
+      sealed trait A extends Z
+      class B extends A
+      class C extends A
+      class D extends A
+      """
+
+    expectedDescendents(source, "Z",
+      "Z" ::
+      "A" ::
+      "B" ::
+      "C" ::
+      "D" :: Nil
+    )
+  end zincIssue979
+
+  @Test
+  def enumOpt: Unit =
+    val source =
+      """
+      enum Opt[+T] {
+        case Some(t: T)
+        case None
+      }
+      """
+
+    expectedDescendents(source, "Opt",
+      "Opt"       ::
+      "Some"      ::
+      "None.type" :: Nil
+    )
+  end enumOpt
+
+  @Test
+  def hierarchicalSharedChildren: Unit =
+    // Q is a child of both Z and A and should appear once
+    // X is a child of both A and Q and should appear once
+    val source =
+      """
+      sealed trait Z
+      sealed trait A extends Z
+      sealed trait Q extends A with Z
+      trait X extends A with Q
+      case object Y extends Q
+      """
+
+    expectedDescendents(source, "Z",
+      "Z"      ::
+      "A"      ::
+      "Q"      ::
+      "X"      ::
+      "Y.type" :: Nil
+    )
+  end hierarchicalSharedChildren
+
+  @Test
+  def hierarchicalSharedChildrenB: Unit =
+    val source =
+      """
+      sealed trait Z
+      case object A extends Z with D with E
+      sealed trait B extends Z
+      trait C extends B
+      sealed trait D extends B
+      sealed trait E extends D
+      """
+
+    expectedDescendents(source, "Z",
+      "Z"      ::
+      "A.type" ::
+      "B"      ::
+      "C"      ::
+      "D"      ::
+      "E"      :: Nil
+    )
+  end hierarchicalSharedChildrenB
+
+  def expectedDescendents(source: String, root: String, expected: List[String]) =
+    exploreRoot(source, root) { rootCls =>
+      val descendents = rootCls.sealedDescendants.map(sym => s"${sym.name}${if (sym.isTerm) ".type" else ""}")
+      assertEquals(expected.toString, descendents.toString)
+    }
+
+  def exploreRoot(source: String, root: String)(op: Context ?=> ClassSymbol => Unit) =
+    val source0 = source.linesIterator.map(_.trim).mkString("\n|")
+    val source1 = s"""package testsealeddescendants
+                     |$source0""".stripMargin
+    checkCompile("typer", source1) { (_, context) =>
+      given Context = context
+      op(requiredClass(s"testsealeddescendants.$root"))
+    }
+}
diff --git a/compiler/test/dotty/tools/dotc/core/tasty/CommentPicklingTest.scala b/compiler/test/dotty/tools/dotc/core/tasty/CommentPicklingTest.scala
index 361d5a00b880..064eedd6dceb 100644
--- a/compiler/test/dotty/tools/dotc/core/tasty/CommentPicklingTest.scala
+++ b/compiler/test/dotty/tools/dotc/core/tasty/CommentPicklingTest.scala
@@ -105,12 +105,16 @@ class CommentPicklingTest {
   }
 
   private class UnpicklingDriver extends Driver {
-    override def initCtx = super.initCtx.addMode(Mode.ReadComments)
+    override def initCtx =
+      val ctx = super.initCtx.fresh
+      ctx.setSetting(ctx.settings.YreadComments, true)
+      ctx
+
     def unpickle[T](args: Array[String], files: List[File])(fn: (List[tpd.Tree], Context) => T): T = {
       implicit val ctx: Context = setup(args, initCtx).map(_._2).getOrElse(initCtx)
       ctx.initialize()
       val trees = files.flatMap { f =>
-        val unpickler = new DottyUnpickler(f.toByteArray())
+        val unpickler = new DottyUnpickler(f.toByteArray(), ctx.tastyVersion)
         unpickler.enter(roots = Set.empty)
         unpickler.rootTrees(using ctx)
       }
diff --git a/compiler/test/dotty/tools/dotc/core/tasty/PathPicklingTest.scala b/compiler/test/dotty/tools/dotc/core/tasty/PathPicklingTest.scala
index 2a44c681e8f1..927cbe838e6e 100644
--- a/compiler/test/dotty/tools/dotc/core/tasty/PathPicklingTest.scala
+++ b/compiler/test/dotty/tools/dotc/core/tasty/PathPicklingTest.scala
@@ -1,7 +1,7 @@
 package dotty.tools.dotc.core.tasty
 
 import java.io.{File => JFile, ByteArrayOutputStream, IOException}
-import java.nio.file.{Files, NoSuchFileException, Path, Paths}
+import java.nio.file.{Files, NoSuchFileException, Paths}
 
 import scala.sys.process._
 
@@ -19,7 +19,7 @@ import dotty.tools.dotc.core.Mode
 import dotty.tools.dotc.core.Names.Name
 import dotty.tools.dotc.interfaces.Diagnostic.ERROR
 import dotty.tools.dotc.reporting.TestReporter
-import dotty.tools.io.{Directory, File, Path}
+import dotty.tools.io.{Directory, File, Path, JarArchive}
 
 import dotty.tools.vulpix.TestConfiguration
 
@@ -42,28 +42,24 @@ class PathPicklingTest {
       assertFalse("Compilation failed.", rep.hasErrors)
     }
 
-    val decompiled =
-      val outstream = new ByteArrayOutputStream()
-      val options = TestConfiguration.defaultOptions
-        .and("-print-tasty")
-        .and("-color:never")
-        .and(s"$out/out.jar")
-      val reporter = TestReporter.reporter(System.out, logLevel = ERROR)
-      val rep = Console.withOut(outstream) {
-        decompiler.Main.process(options.all, reporter)
-      }
-      assertFalse("Decompilation failed.", rep.hasErrors)
-      new String(outstream.toByteArray(), "UTF-8")
+    val printedTasty =
+      val sb = new StringBuffer
+      val jar = JarArchive.open(Path(s"$out/out.jar"), create = false)
+      try
+        for file <- jar.iterator() if file.name.endsWith(".tasty") do
+          sb.append(TastyPrinter.showContents(file.toByteArray, noColor = true))
+      finally jar.close()
+      sb.toString()
 
-    assertTrue(decompiled.contains(": i10430/lib.scala"))
-    assertTrue(decompiled.contains(": i10430/app.scala"))
-    assertTrue(decompiled.contains("[i10430/lib.scala]"))
-    assertTrue(decompiled.contains("[i10430/app.scala]"))
+    assertTrue(printedTasty.contains(": i10430/lib.scala"))
+    assertTrue(printedTasty.contains("[i10430/lib.scala]"))
+    assertFalse(printedTasty.contains(": i10430\\lib.scala"))
+    assertFalse(printedTasty.contains("[i10430\\lib.scala]"))
 
-    assertFalse(decompiled.contains(": i10430\\lib.scala"))
-    assertFalse(decompiled.contains(": i10430\\app.scala"))
-    assertFalse(decompiled.contains("[i10430\\lib.scala]"))
-    assertFalse(decompiled.contains("[i10430\\app.scala]"))
+    assertTrue(printedTasty.contains(": i10430/app.scala"))
+    assertTrue(printedTasty.contains("[i10430/app.scala]"))
+    assertFalse(printedTasty.contains(": i10430\\app.scala"))
+    assertFalse(printedTasty.contains("[i10430\\app.scala]"))
   }
 
   private def delete(file: JFile): Unit = {
diff --git a/compiler/test/dotty/tools/dotc/interactive/CustomCompletionTests.scala b/compiler/test/dotty/tools/dotc/interactive/CustomCompletionTests.scala
index ddd44ea7daf0..ccf211136d51 100644
--- a/compiler/test/dotty/tools/dotc/interactive/CustomCompletionTests.scala
+++ b/compiler/test/dotty/tools/dotc/interactive/CustomCompletionTests.scala
@@ -169,3 +169,4 @@ class CustomCompletionTests extends DottyTest:
 
       assert(offset == prefix.length)
       assert(labels.contains("scala.Function2"))
+
diff --git a/compiler/test/dotty/tools/dotc/printing/PrintingTest.scala b/compiler/test/dotty/tools/dotc/printing/PrintingTest.scala
index cd0aee578742..9c260cb75cc8 100644
--- a/compiler/test/dotty/tools/dotc/printing/PrintingTest.scala
+++ b/compiler/test/dotty/tools/dotc/printing/PrintingTest.scala
@@ -19,17 +19,18 @@ import scala.io.Source
 import org.junit.Test
 
 class PrintingTest {
-  val testsDir = "tests/printing"
-  val options = List("-Xprint:typer", "-color:never", "-classpath", TestConfiguration.basicClasspath)
 
-  private def compileFile(path: JPath): Boolean = {
+  def options(phase: String) =
+    List(s"-Xprint:$phase", "-color:never", "-classpath", TestConfiguration.basicClasspath)
+
+  private def compileFile(path: JPath, phase: String): Boolean = {
     val baseFilePath  = path.toString.stripSuffix(".scala")
     val checkFilePath = baseFilePath + ".check"
     val byteStream    = new ByteArrayOutputStream()
     val reporter = TestReporter.reporter(new PrintStream(byteStream), INFO)
 
     try {
-      Main.process((path.toString::options).toArray, reporter, null)
+      Main.process((path.toString::options(phase)).toArray, reporter, null)
     } catch {
       case e: Throwable =>
         println(s"Compile $path exception:")
@@ -40,11 +41,10 @@ class PrintingTest {
     FileDiff.checkAndDump(path.toString, actualLines.toIndexedSeq, checkFilePath)
   }
 
-  @Test
-  def printing: Unit = {
+  def testIn(testsDir: String, phase: String) =
     val res = Directory(testsDir).list.toList
       .filter(f => f.extension == "scala")
-      .map { f => compileFile(f.jpath) }
+      .map { f => compileFile(f.jpath, phase) }
 
     val failed = res.filter(!_)
 
@@ -53,5 +53,12 @@ class PrintingTest {
     assert(failed.length == 0, msg)
 
     println(msg)
-  }
+
+  end testIn
+
+  @Test
+  def printing: Unit = testIn("tests/printing", "typer")
+
+  @Test
+  def untypedPrinting: Unit = testIn("tests/printing/untyped", "parser")
 }
diff --git a/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala b/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala
index cc7d1eac2004..76f06802c79c 100644
--- a/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala
+++ b/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala
@@ -8,7 +8,7 @@ import org.junit.Assert._
 
 trait ErrorMessagesTest extends DottyTest {
 
-  private def newContext = {
+  protected def newContext = {
     val rep = new StoreReporter(null)
               with UniqueMessagePositions with HideNonSensicalMessages
     initialCtx.setReporter(rep).setSetting(ctx.settings.color, "never")
diff --git a/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala b/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala
index 24890279accd..da9b2498d528 100644
--- a/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala
+++ b/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala
@@ -53,7 +53,7 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M
 
   /** Prints the message with the given position indication. */
   def printMessageAndPos(dia: Diagnostic, extra: String)(using Context): Unit = {
-    val msg = messageAndPos(dia.msg, dia.pos, diagnosticLevel(dia))
+    val msg = messageAndPos(dia)
     val extraInfo = inlineInfo(dia.pos)
 
     if (dia.level >= logLevel) {
@@ -73,15 +73,9 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M
       case _ => ""
     }
 
-    dia match {
-      case dia: Error => {
-        _errorBuf.append(dia)
-        _consoleReporter.doReport(dia)
-        printMessageAndPos(dia, extra)
-      }
-      case dia =>
-        printMessageAndPos(dia, extra)
-    }
+    if dia.level >= ERROR then _errorBuf.append(dia)
+    if dia.level >= WARNING then _consoleReporter.doReport(dia)
+    printMessageAndPos(dia, extra)
   }
 }
 
diff --git a/compiler/test/dotty/tools/dotc/semanticdb/SemanticdbTests.scala b/compiler/test/dotty/tools/dotc/semanticdb/SemanticdbTests.scala
index 5deeaed114a8..d1f58bf52a91 100644
--- a/compiler/test/dotty/tools/dotc/semanticdb/SemanticdbTests.scala
+++ b/compiler/test/dotty/tools/dotc/semanticdb/SemanticdbTests.scala
@@ -25,6 +25,30 @@ import dotty.tools.dotc.util.SourceFile
 @main def updateExpect =
   SemanticdbTests().runExpectTest(updateExpectFiles = true)
 
+/** Useful for printing semanticdb metac output for one file
+ *
+ *  @param root the output directory containing semanticdb output,
+ *  only 1 semanticdb file should be present
+ *  @param source the single source file producing the semanticdb
+ */
+@main def metac(root: String, source: String) =
+  val rootSrc = Paths.get(root)
+  val sourceSrc = Paths.get(source)
+  val semanticFile = FileSystems.getDefault.getPathMatcher("glob:**.semanticdb")
+  def inputFile(): Path =
+    val ls = Files.walk(rootSrc.resolve("META-INF").resolve("semanticdb"))
+    val files =
+      try ls.filter(p => semanticFile.matches(p)).collect(Collectors.toList).asScala
+      finally ls.close()
+    require(files.sizeCompare(1) == 0, s"No semanticdb files! $rootSrc")
+    files.head
+  val metacSb: StringBuilder = StringBuilder(5000)
+  val semanticdbPath = inputFile()
+  val doc = Tools.loadTextDocumentUnsafe(sourceSrc.toAbsolutePath, semanticdbPath)
+  Tools.metac(doc, Paths.get(doc.uri))(using metacSb)
+  Files.write(rootSrc.resolve("metac.expect"), metacSb.toString.getBytes(StandardCharsets.UTF_8))
+
+
 @Category(Array(classOf[BootstrappedOnlyTests]))
 class SemanticdbTests:
   val javaFile = FileSystems.getDefault.getPathMatcher("glob:**.java")
diff --git a/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala b/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala
index 58e1133180ec..0c895d436238 100644
--- a/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala
+++ b/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala
@@ -12,24 +12,25 @@ import dotty.tools.io.Directory
 import java.io._
 import java.nio.file.{Path => JPath}
 
-import scala.io.Source._
 import org.junit.Test
 
 class PatmatExhaustivityTest {
   val testsDir = "tests/patmat"
-  // stop-after: patmatexhaust-huge.scala crash compiler
-  val options = List("-pagewidth", "80", "-color:never", "-Ystop-after:explicitSelf", "-Ycheck-all-patmat", "-classpath", TestConfiguration.basicClasspath)
+  // pagewidth/color: for a stable diff as the defaults are based on the terminal (e.g size)
+  // stop-after: patmatexhaust-huge.scala crash compiler (but also hides other warnings..)
+  val options = List("-pagewidth", "80", "-color:never", "-Ystop-after:explicitSelf", "-classpath", TestConfiguration.basicClasspath)
 
-  private def compile(files: Seq[String]): Seq[String] = {
+  private def compile(files: List[JPath]): Seq[String] = {
+    val opts         = toolArgsFor(files)
     val stringBuffer = new StringWriter()
-    val reporter = TestReporter.simplifiedReporter(new PrintWriter(stringBuffer))
+    val printWriter  = new PrintWriter(stringBuffer)
+    val reporter = TestReporter.simplifiedReporter(printWriter)
 
     try {
-      Main.process((options ++ files).toArray, reporter, null)
+      Main.process((options ::: opts ::: files.map(_.toString)).toArray, reporter, null)
     } catch {
       case e: Throwable =>
-        println(s"Compile $files exception:")
-        e.printStackTrace()
+        e.printStackTrace(printWriter)
     }
 
     stringBuffer.toString.trim.replaceAll("\\s+\n", "\n") match {
@@ -39,35 +40,34 @@ class PatmatExhaustivityTest {
   }
 
   private def compileFile(path: JPath): Boolean = {
-    val actualLines   = compile(path.toString :: Nil)
+    val actualLines   = compile(List(path))
     val baseFilePath  = path.toString.stripSuffix(".scala")
     val checkFilePath = baseFilePath + ".check"
 
-    FileDiff.checkAndDump(path.toString, actualLines, checkFilePath)
+    FileDiff.checkAndDumpOrUpdate(path.toString, actualLines, checkFilePath)
   }
 
   /** A single test with multiple files grouped in a folder */
   private def compileDir(path: JPath): Boolean = {
     val files = Directory(path).list.toList
       .filter(f => f.extension == "scala" || f.extension == "java" )
-      .map(_.jpath.toString)
+      .map(_.jpath)
 
     val actualLines   = compile(files)
     val checkFilePath = s"${path}${File.separator}expected.check"
 
-    FileDiff.checkAndDump(path.toString, actualLines, checkFilePath)
+    FileDiff.checkAndDumpOrUpdate(path.toString, actualLines, checkFilePath)
   }
 
   @Test
   def patmatExhaustivity: Unit = {
     val res = Directory(testsDir).list.toList
       .filter(f => f.extension == "scala" || f.isDirectory)
-      .map { f =>
-        if (f.isDirectory)
-          compileDir(f.jpath)
-        else
-          compileFile(f.jpath)
+      .filter { f =>
+        val path = if f.isDirectory then f.path + "/" else f.path
+        Properties.testsFilter.isEmpty || Properties.testsFilter.exists(path.contains)
       }
+      .map(f => if f.isDirectory then compileDir(f.jpath) else compileFile(f.jpath))
 
     val failed = res.filter(!_)
     val ignored = Directory(testsDir).list.toList.filter(_.extension == "ignore")
diff --git a/compiler/test/dotty/tools/dotc/transform/SpaceEngineTest.scala b/compiler/test/dotty/tools/dotc/transform/SpaceEngineTest.scala
new file mode 100644
index 000000000000..09fb5ee960fd
--- /dev/null
+++ b/compiler/test/dotty/tools/dotc/transform/SpaceEngineTest.scala
@@ -0,0 +1,25 @@
+package dotty.tools
+package dotc
+package transform
+
+import org.junit.*, Assert.*
+
+import core.*, Constants.*, Contexts.*, Decorators.*, Symbols.*, Types.*
+
+class SpaceEngineTest extends DottyTest:
+  @Test def testAdaptTest(): Unit =
+    given Context = ctx
+    val defn = ctx.definitions
+    import defn._
+    val e = patmat.SpaceEngine()
+
+    val BoxedIntType = BoxedIntClass.typeRef
+    val ConstOneType = ConstantType(Constant(1))
+
+    assertTrue(e.isPrimToBox(IntType, BoxedIntType))
+    assertFalse(e.isPrimToBox(BoxedIntType, IntType))
+    assertTrue(e.isPrimToBox(ConstOneType, BoxedIntType))
+
+    assertEquals(BoxedIntType, e.adaptType(IntType, BoxedIntType).widenSingleton)
+    assertEquals(IntType,      e.adaptType(BoxedIntType, IntType).widenSingleton)
+    assertEquals(IntType,      e.adaptType(BoxedIntType, ConstOneType).widenSingleton)
diff --git a/compiler/test/dotty/tools/io/ClasspathTest.scala b/compiler/test/dotty/tools/io/ClasspathTest.scala
new file mode 100755
index 000000000000..35437ef17390
--- /dev/null
+++ b/compiler/test/dotty/tools/io/ClasspathTest.scala
@@ -0,0 +1,70 @@
+package dotty.tools.io
+
+import org.junit.Test
+
+import java.io.File
+import dotty.tools.io.AbstractFile
+import java.nio.file.{Files, Paths}
+import java.nio.file.StandardCopyOption._
+import java.nio.file.attribute.PosixFilePermissions
+import dotty.tools.io.{ PlainDirectory, Directory, ClassPath }
+
+class ClasspathTest {
+
+  def pathsep = sys.props("path.separator")
+
+  //
+  // Cope with wildcard classpath entries, exercised with -classpath <cp>
+  //
+  // Verify that Windows users not forced to use backslash in classpath.
+  //
+  @Test def testWildcards(): Unit =
+    val outDir = Files.createTempDirectory("classpath-test")
+    try
+      val compilerLib = "dist/target/pack/lib"
+      val libdir = Paths.get(compilerLib).toFile
+      if libdir.exists then
+        val libjarFiles = libdir.listFiles.toList.take(5)
+        try
+          for src <- libjarFiles do
+            val dest = Paths.get(s"$outDir/${src.getName}")
+            printf("copy: %s\n", Files.copy(src.toPath, dest))
+        
+          val cp = Seq(s"$outDir/*", "not-a-real-directory/*").mkString(pathsep).replace('\\', '/')
+         
+          val libjars = libjarFiles.map { _.getName }.toSet
+
+          // expand wildcard classpath entries, ignoring invalid entries
+          val entries = ClassPath.expandPath(cp).map { Paths.get(_).toFile.getName }
+
+          // require one-to-one matches
+          assert(libjars == entries.toSet)
+
+          printf("%d entries\n", entries.size)
+          printf("%d libjars\n", libjars.size)
+
+          for entry <- libjars do
+            printf("libdir[%s]\n", entry)
+
+          for entry <- entries do
+            printf("expand[%s]\n", entry)
+
+          // verify that expanded classpath has expected jar names
+          for jar <- libjars do
+            assert(entries.contains(jar))
+
+        catch
+          case _:NullPointerException => // no test if unable to copy jars to outDir
+
+
+    finally
+      deleteFile(outDir.toFile)
+
+
+  private def deleteFile(target: File): Unit =
+    if target.isDirectory then
+      for member <- target.listFiles.toList
+      do deleteFile(member)
+    target.delete()
+  end deleteFile
+}
diff --git a/compiler/test/dotty/tools/repl/DocTests.scala b/compiler/test/dotty/tools/repl/DocTests.scala
index 67f203c9b52b..ea900e866119 100644
--- a/compiler/test/dotty/tools/repl/DocTests.scala
+++ b/compiler/test/dotty/tools/repl/DocTests.scala
@@ -6,78 +6,44 @@ import org.junit.Assert.assertEquals
 
 class DocTests extends ReplTest {
 
-  @Test def docOfDef =
-    eval("/** doc */ def foo = 0").andThen { implicit s =>
-      assertEquals("doc", doc("foo"))
-    }
+  @Test def docOfDef = eval("/** doc */ def foo = 0") andThen assertEquals("doc", doc("foo"))
 
-  @Test def docOfVal =
-    eval("/** doc */ val foo = 0").andThen { implicit s =>
-      assertEquals("doc", doc("foo"))
-    }
+  @Test def docOfVal = eval("/** doc */ val foo = 0") andThen assertEquals("doc", doc("foo"))
 
-  @Test def docOfObject =
-    eval("/** doc */ object Foo").andThen { implicit s =>
-      assertEquals("doc", doc("Foo"))
-    }
+  @Test def docOfObject = eval("/** doc */ object Foo") andThen assertEquals("doc", doc("Foo"))
 
-  @Test def docOfClass =
-    eval("/** doc */ class Foo").andThen { implicit s =>
-      assertEquals("doc", doc("new Foo"))
-    }
+  @Test def docOfClass = eval("/** doc */ class Foo") andThen assertEquals("doc", doc("new Foo"))
 
-  @Test def docOfTrait =
-    eval("/** doc */ trait Foo").andThen { implicit s =>
-      assertEquals("doc", doc("new Foo"))
-    }
-/*
-  @Test def docOfExtension1 =
-    eval("/** doc */ extension (x: Int) def foo = 0").andThen { implicit s =>
-      assertEquals("doc", doc("extension_foo"))
-    }
+  @Test def docOfTrait = eval("/** doc */ trait Foo") andThen assertEquals("doc", doc("new Foo"))
 
-  @Test def docOfExtension2 =
-    eval("extension (x: Int) /** doc */ def foo = 0").andThen { implicit s =>
-      assertEquals("doc", doc("extension_foo"))
-    }
+  /*@Test*/ def docOfExtension1 =
+    eval("/** doc */ extension (x: Int) def foo = 0") andThen assertEquals("doc", doc("extension_foo"))
 
-  @Test def docOfExtension3 =
-    eval("/** doc0 */ extension (x: Int) { /** doc1 */ def foo = 0; /** doc2 */ def bar = 0; def baz = 0 }").andThen { implicit s =>
+  /*@Test*/ def docOfExtension2 =
+    eval("extension (x: Int) /** doc */ def foo = 0") andThen assertEquals("doc", doc("extension_foo"))
+
+  /*@Test*/ def docOfExtension3 =
+    eval("/** doc0 */ extension (x: Int) { /** doc1 */ def foo = 0; /** doc2 */ def bar = 0; def baz = 0 }") andThen {
       assertEquals("doc1", doc("extension_foo"))
       assertEquals("doc2", doc("extension_bar"))
       assertEquals("doc0", doc("extension_baz"))
     }
-*/
-  @Test def docOfDefInObject =
-    eval("object O { /** doc */ def foo = 0 }").andThen { implicit s =>
-      assertEquals("doc", doc("O.foo"))
-    }
 
-  @Test def docOfValInObject =
-    eval("object O { /** doc */ val foo = 0 }").andThen { implicit s =>
-      assertEquals("doc", doc("O.foo"))
-    }
+  @Test def docOfDefInObject = eval("object O { /** doc */ def foo = 0 }") andThen assertEquals("doc", doc("O.foo"))
 
-  @Test def docOfObjectInObject =
-    eval("object O { /** doc */ object Foo }").andThen { implicit s =>
-      assertEquals("doc", doc("O.Foo"))
-    }
+  @Test def docOfValInObject = eval("object O { /** doc */ val foo = 0 }") andThen assertEquals("doc", doc("O.foo"))
 
-  @Test def docOfClassInObject =
-    eval("object O { /** doc */ class Foo }").andThen { implicit s =>
-      assertEquals("doc", doc("new O.Foo"))
-    }
+  @Test def docOfObjectInObject = eval("object O { /** doc */ object Foo }") andThen assertEquals("doc", doc("O.Foo"))
 
-  @Test def docOfTraitInObject =
-    eval("object O { /** doc */ trait Foo }").andThen { implicit s =>
-      assertEquals("doc", doc("new O.Foo"))
-    }
+  @Test def docOfClassInObject = eval("object O { /** doc */ class Foo }") andThen assertEquals("doc", doc("new O.Foo"))
+
+  @Test def docOfTraitInObject = eval("object O { /** doc */ trait Foo }") andThen assertEquals("doc", doc("new O.Foo"))
 
   @Test def docOfDefInClass =
     eval(
       """class C { /** doc */ def foo = 0 }
         |val c = new C
-      """.stripMargin).andThen { implicit s =>
+      """.stripMargin) andThen {
       assertEquals("doc", doc("c.foo"))
     }
 
@@ -85,7 +51,7 @@ class DocTests extends ReplTest {
     eval(
       """class C { /** doc */ val foo = 0 }
         |val c = new C
-      """.stripMargin).andThen { implicit s =>
+      """.stripMargin) andThen {
       assertEquals("doc", doc("c.foo"))
     }
 
@@ -93,7 +59,7 @@ class DocTests extends ReplTest {
     eval(
       """class C { /** doc */ object Foo }
         |val c = new C
-      """.stripMargin).andThen { implicit s =>
+      """.stripMargin) andThen {
       assertEquals("doc", doc("c.Foo"))
     }
 
@@ -101,7 +67,7 @@ class DocTests extends ReplTest {
     eval(
       """class C { /** doc */ class Foo }
         |val c = new C
-      """.stripMargin).andThen { implicit s =>
+      """.stripMargin) andThen {
       assertEquals("doc", doc("new c.Foo"))
     }
 
@@ -109,7 +75,7 @@ class DocTests extends ReplTest {
     eval(
       """class C { /** doc */ trait Foo }
         |val c = new C
-      """.stripMargin).andThen { implicit s =>
+      """.stripMargin) andThen {
       assertEquals("doc", doc("new c.Foo"))
     }
 
@@ -119,7 +85,7 @@ class DocTests extends ReplTest {
         |  /** doc0 */ def foo(x: Int) = x
         |  /** doc1 */ def foo(x: String) = x
         |}
-      """.stripMargin).andThen { implicit s =>
+      """.stripMargin) andThen {
       assertEquals("doc0", doc("O.foo(_: Int)"))
       assertEquals("doc1", doc("O.foo(_: String)"))
     }
@@ -128,7 +94,7 @@ class DocTests extends ReplTest {
     eval(
       """class C { /** doc */ def foo = 0 }
         |object O extends C
-      """.stripMargin).andThen { implicit s =>
+      """.stripMargin) andThen {
       assertEquals("doc", doc("O.foo"))
     }
 
@@ -142,7 +108,7 @@ class DocTests extends ReplTest {
         |  override def foo(x: Int): Int = x
         |  /** overridden doc */ override def foo(x: String): String = x
         |}
-      """.stripMargin).andThen { implicit s =>
+      """.stripMargin) andThen {
       assertEquals("doc0", doc("O.foo(_: Int)"))
       assertEquals("overridden doc", doc("O.foo(_: String)"))
     }
@@ -158,38 +124,34 @@ class DocTests extends ReplTest {
         |    override def bar: Int = 0
         |  }
         |}
-      """.stripMargin).andThen { implicit s =>
+      """.stripMargin) andThen {
       assertEquals("companion", doc("O.foo"))
       assertEquals("doc0", doc("O.foo.bar"))
     }
 
   @Test def docIsCooked =
     eval(
-      """/**
-        | * An object
+      """/** An object
         | * @define Variable some-value
         | */
         |object Foo {
         |  /** Expansion: $Variable */
         |  def hello = "world"
         |}
-      """.stripMargin).andThen { implicit s =>
+      """.stripMargin) andThen {
       assertEquals("Expansion: some-value", doc("Foo.hello"))
     }
 
-  @Test def docOfEmpty =
-    fromInitialState { implicit s =>
+  @Test def docOfEmpty = initially {
     run(":doc")
     assertEquals(":doc <expression>", storedOutput().trim)
   }
 
-  private def eval(code: String): State =
-    fromInitialState { implicit s => run(code) }
+  private def eval(code: String): State = initially(run(code))
 
-  private def doc(expr: String)(implicit s: State): String = {
+  private def doc(expr: String)(using State): String = {
     storedOutput()
     run(s":doc $expr")
     storedOutput().trim
   }
-
 }
diff --git a/compiler/test/dotty/tools/repl/JavaDefinedTests.scala b/compiler/test/dotty/tools/repl/JavaDefinedTests.scala
new file mode 100644
index 000000000000..561111cf7eb1
--- /dev/null
+++ b/compiler/test/dotty/tools/repl/JavaDefinedTests.scala
@@ -0,0 +1,16 @@
+package dotty.tools.repl
+
+import org.junit.Assert._
+import org.junit.Test
+
+class JavaDefinedTests extends ReplTest {
+  @Test def typeOfJavaDefinedString = initially {
+    run("String")
+    assertTrue(storedOutput().contains("Java defined class String is not a value"))
+  }
+
+  @Test def typeOfJavaDefinedClass = initially {
+    run("Class")
+    assertTrue(storedOutput().contains("Java defined class Class is not a value"))
+  }
+}
diff --git a/compiler/test/dotty/tools/repl/LoadTests.scala b/compiler/test/dotty/tools/repl/LoadTests.scala
index 276a684b20e8..c4f1f9f0781d 100644
--- a/compiler/test/dotty/tools/repl/LoadTests.scala
+++ b/compiler/test/dotty/tools/repl/LoadTests.scala
@@ -16,12 +16,9 @@ class LoadTests extends ReplTest {
                  |""".stripMargin,
     defs    = """|Hello, World!
                  |def helloWorld: String
-                 |
-                 |
                  |""".stripMargin,
     runCode = "helloWorld",
     output  = """|val res0: String = Hello, World!
-                 |
                  |""".stripMargin
   )
 
@@ -29,12 +26,9 @@ class LoadTests extends ReplTest {
     file    = """|@main def helloWorld = println("Hello, World!")
                  |""".stripMargin,
     defs    = """|def helloWorld: Unit
-                 |
-                 |
                  |""".stripMargin,
     runCode = "helloWorld",
     output  = """|Hello, World!
-                 |
                  |""".stripMargin
   )
 
@@ -44,26 +38,21 @@ class LoadTests extends ReplTest {
                  |""".stripMargin,
     defs    = """|def helloWorld: Unit
                  |def helloTo(name: String): Unit
-                 |
-                 |
                  |""".stripMargin,
     runCode = """helloWorld; helloTo("Scala")""",
     output  = """|Hello, World!
                  |Hello, Scala!
-                 |
                  |""".stripMargin
   )
 
   def loadTest(file: String, defs: String, runCode: String, output: String) =
-    eval(s":load ${writeFile(file)}").andThen { implicit s =>
+    eval(s":load ${writeFile(file)}") andThen {
       assertMultiLineEquals(defs, storedOutput())
       run(runCode)
       assertMultiLineEquals(output, storedOutput())
     }
 
-  private def eval(code: String): State =
-    fromInitialState { implicit s => run(code) }
-
+  private def eval(code: String): State = initially(run(code))
 }
 
 object LoadTests {
diff --git a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala
index bc06727f2ea4..c02552aac83c 100644
--- a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala
+++ b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala
@@ -6,42 +6,40 @@ import org.junit.Assert.{assertTrue => assert, _}
 import org.junit.{Ignore, Test}
 import dotty.tools.dotc.core.Contexts.Context
 
-class ReplCompilerTests extends ReplTest {
+class ReplCompilerTests extends ReplTest:
   import ReplCompilerTests._
 
   private def lines() =
     storedOutput().trim.linesIterator.toList
 
-  @Test def compileSingle = fromInitialState { implicit state =>
+  @Test def compileSingle = initially {
     run("def foo: 1 = 1")
     assertEquals("def foo: 1", storedOutput().trim)
   }
 
   @Test def compileTwo =
-    fromInitialState { implicit state =>
+    initially {
       run("def foo: 1 = 1")
-    }
-    .andThen { implicit state =>
+    } andThen {
       val s2 = run("def foo(i: Int): i.type = i")
       assertEquals(2, s2.objectIndex)
     }
 
   @Test def inspectWrapper =
-    fromInitialState { implicit state =>
+    initially {
       run("def foo = 1")
-
-    }.andThen { implicit state =>
+    } andThen {
       storedOutput() // discard output
       run("val x = rs$line$1.foo")
       assertEquals("val x: Int = 1", storedOutput().trim)
     }
 
-  @Test def testVar = fromInitialState { implicit state =>
+  @Test def testVar = initially {
     run("var x = 5")
     assertEquals("var x: Int = 5", storedOutput().trim)
   }
 
-  @Test def testRes = fromInitialState { implicit state =>
+  @Test def testRes = initially {
     run {
       """|def foo = 1 + 1
          |val x = 5 + 5
@@ -62,11 +60,10 @@ class ReplCompilerTests extends ReplTest {
   }
 
   @Test def testImportMutable =
-    fromInitialState { implicit state =>
+    initially {
       run("import scala.collection.mutable")
-    }
-    .andThen { implicit state =>
-      assertEquals(1, state.imports.size)
+    } andThen {
+      assertEquals(1, summon[State].imports.size)
       run("""mutable.Map("one" -> 1)""")
       assertEquals(
         "val res0: scala.collection.mutable.Map[String, Int] = HashMap(one -> 1)",
@@ -75,22 +72,26 @@ class ReplCompilerTests extends ReplTest {
     }
 
   @Test def rebindVariable =
-    fromInitialState { implicit s =>
+    initially {
       val state = run("var x = 5")
       assertEquals("var x: Int = 5", storedOutput().trim)
       state
-    }
-    .andThen { implicit s =>
+    } andThen {
       run("x = 10")
       assertEquals("x: Int = 10", storedOutput().trim)
     }
 
-  @Test def i8677 = fromInitialState { implicit state =>
+  @Test def defaultParameter = initially {
+    run("def foo(a: Int = 1): 1 = 1")
+    assertEquals("def foo(a: Int): 1", storedOutput().trim)
+  }
+
+  @Test def i8677 = initially {
     run {
       """|sealed trait T1
          |case class X() extends T1
          |case class Y() extends T1
-         | case object O extends T1
+         |case object O extends T1
          """.stripMargin
     }
 
@@ -106,38 +107,38 @@ class ReplCompilerTests extends ReplTest {
 
   // FIXME: Tests are not run in isolation, the classloader is corrupted after the first exception
   @Ignore @Test def i3305: Unit = {
-    fromInitialState { implicit s =>
+    initially {
       run("null.toString")
       assert(storedOutput().startsWith("java.lang.NullPointerException"))
     }
 
-    fromInitialState { implicit s =>
+    initially {
       run("def foo: Int = 1 + foo; foo")
       assert(storedOutput().startsWith("def foo: Int\njava.lang.StackOverflowError"))
     }
 
-    fromInitialState { implicit s =>
+    initially {
       run("""throw new IllegalArgumentException("Hello")""")
       assert(storedOutput().startsWith("java.lang.IllegalArgumentException: Hello"))
     }
 
-    fromInitialState { implicit s =>
+    initially {
       run("val (x, y) = null")
       assert(storedOutput().startsWith("scala.MatchError: null"))
     }
   }
 
-  @Test def i2789: Unit = fromInitialState { implicit state =>
+  @Test def i2789: Unit = initially {
     run("(x: Int) => println(x)")
     assert(storedOutput().startsWith("val res0: Int => Unit ="))
   }
 
-  @Test def byNameParam: Unit = fromInitialState { implicit state =>
+  @Test def byNameParam: Unit = initially {
     run("def f(g: => Int): Int = g")
     assert(storedOutput().startsWith("def f(g: => Int): Int"))
   }
 
-  @Test def i4051 = fromInitialState { implicit state =>
+  @Test def i4051 = initially {
     val source =
       """val x: PartialFunction[Int, Int] = { case x => x }
         |val y = Map(("A", 1), ("B", 2), ("X", 3)).collect { case (k, v) => v }.toList""".stripMargin
@@ -152,8 +153,9 @@ class ReplCompilerTests extends ReplTest {
   }
 
   @Test def i5897 =
-    fromInitialState { implicit state => run("given Int = 10") }
-    .andThen         { implicit state =>
+    initially {
+      run("given Int = 10")
+    } andThen {
       assertEquals(
         "lazy val given_Int: Int",
         storedOutput().trim
@@ -166,7 +168,7 @@ class ReplCompilerTests extends ReplTest {
     }
 
   @Test def i6200 =
-    fromInitialState { implicit state =>
+    initially {
       run("""
         |trait Ord[T] {
         |  def compare(x: T, y: T): Int
@@ -178,8 +180,8 @@ class ReplCompilerTests extends ReplTest {
         |  def compare(x: Int, y: Int) =
         |  if (x < y) -1 else if (x > y) +1 else 0
         |}
-      """.stripMargin) }
-    .andThen         { implicit state =>
+      """.stripMargin)
+    } andThen {
       assertMultiLineEquals(
         """// defined trait Ord
           |// defined object IntOrd""".stripMargin,
@@ -189,75 +191,113 @@ class ReplCompilerTests extends ReplTest {
       assert(storedOutput().startsWith("val res0: IntOrd.type ="))
     }
 
-  @Test def i7934: Unit = fromInitialState { state =>
-    given Context = state.context
+  @Test def i7934: Unit = contextually {
     assertFalse(ParseResult.isIncomplete("_ + 1"))  // was: assertThrows[NullPointerException]
   }
 
-  @Test def testSingletonPrint = fromInitialState { implicit state =>
+  @Test def `i9374 accept collective extensions`: Unit = contextually {
+    assert(ParseResult.isIncomplete("extension (x: String)"))
+    assert(ParseResult.isIncomplete("extension (x: String) {"))
+  }
+
+  @Test def testSingletonPrint = initially {
     run("""val a = "hello"; val x: a.type = a""")
     assertMultiLineEquals("val a: String = hello\nval x: a.type = hello", storedOutput().trim)
   }
 
-  @Test def i6574 = fromInitialState { implicit state =>
+  @Test def i6574 = initially {
     run("val a: 1 | 0 = 1")
     assertEquals("val a: 1 | 0 = 1", storedOutput().trim)
   }
 
-  @Test def `i10214 must show classic MatchError` = fromInitialState { implicit state =>
+  @Test def `i10214 must show classic MatchError` = initially {
     run("val 1 = 2")
     assertEquals("scala.MatchError: 2 (of class java.lang.Integer)", storedOutput().linesIterator.next())
   }
   @Test def `i10214 must show useful regex MatchError` =
-    fromInitialState { implicit state =>
+    initially {
       run("""val r = raw"\d+".r""")
-    } andThen { implicit state =>
+    } andThen {
       run("""val r() = "abc"""")
-      assertEquals("scala.MatchError: abc (of class java.lang.String)", storedOutput().linesIterator.drop(2).next())
+      assertEquals("scala.MatchError: abc (of class java.lang.String)", storedOutput().linesIterator.drop(1).next())
     }
-  @Test def `i10214 must show MatchError on literal type` = fromInitialState { implicit state =>
+  @Test def `i10214 must show MatchError on literal type` = initially {
     run("val (x: 1) = 2")
     assertEquals("scala.MatchError: 2 (of class java.lang.Integer)", storedOutput().linesIterator.next())
   }
-}
+  @Test def `i12920 must truncate stack trace to user code` = initially {
+    run("???")
+    val all = lines()
+    assertEquals(3, all.length)
+    assertEquals("scala.NotImplementedError: an implementation is missing", all.head)
+    /* avoid asserting much about line number or elided count
+    scala.NotImplementedError: an implementation is missing
+      at scala.Predef$.$qmark$qmark$qmark(Predef.scala:344)
+      ... 28 elided
+     */
+  }
+  @Test def `i14281 context class loader must be REPL class loader` = initially {
+    run("class C ; assert(classOf[C].getClassLoader eq Thread.currentThread.getContextClassLoader)")
+    assertEquals(List("// defined class C"), lines())
+  }
 
-object ReplCompilerTests {
+  @Test def i14491 =
+    initially {
+      run("import language.experimental.fewerBraces")
+    } andThen {
+      run("""|val x = Seq(7,8,9).apply:
+             |  1
+             |""".stripMargin)
+      assertEquals("val x: Int = 8", storedOutput().trim)
+    }
+    initially {
+      run("""|import language.experimental.fewerBraces
+             |import language.experimental.fewerBraces as _
+             |""".stripMargin)
+    } andThen {
+      run("""|val x = Seq(7,8,9).apply:
+             |  1
+             |""".stripMargin)
+      assert("expected error if fewerBraces is unimported",
+        lines().exists(_.contains("missing arguments for method apply")))
+    }
+
+object ReplCompilerTests:
 
   private val pattern = Pattern.compile("\\r[\\n]?|\\n");
 
   // Ensure 'expected' and 'actual' contain the same line separator(s).
-  def assertMultiLineEquals(expected: String, actual: String): Unit = {
+  def assertMultiLineEquals(expected: String, actual: String): Unit =
     val expected0 = pattern.matcher(expected).replaceAll(System.lineSeparator)
     val actual0 = pattern.matcher(actual).replaceAll(System.lineSeparator)
     assertEquals(expected0, actual0)
-  }
 
-}
+end ReplCompilerTests
 
-class ReplXPrintTyperTests extends ReplTest(ReplTest.defaultOptions :+ "-Xprint:typer") {
-  @Test def i9111 = fromInitialState { implicit state =>
+class ReplXPrintTyperTests extends ReplTest(ReplTest.defaultOptions :+ "-Xprint:typer"):
+  @Test def i9111 = initially {
     run("""|enum E {
            |  case A
            |}""".stripMargin)
     assert(storedOutput().trim().endsWith("// defined class E"))
   }
 
-  @Test def i10883 = fromInitialState { implicit state =>
+  @Test def i10883 = initially {
     run("val a = 42")
     assert(storedOutput().trim().endsWith("val a: Int = 42"))
   }
-}
+end ReplXPrintTyperTests
 
-class ReplVerboseTests extends ReplTest(ReplTest.defaultOptions :+ "-verbose") {
-  @Test def i9111 = fromInitialState { implicit state =>
+class ReplVerboseTests extends ReplTest(ReplTest.defaultOptions :+ "-verbose"):
+  @Test def i9111 = initially {
     run("""|enum E {
            |  case A
            |}""".stripMargin)
     assert(storedOutput().trim().endsWith("// defined class E"))
   }
 
-  @Test def i10883 = fromInitialState { implicit state =>
+  @Test def i10883 = initially {
     run("val a = 42")
     assert(storedOutput().trim().endsWith("val a: Int = 42"))
   }
-}
+end ReplVerboseTests
diff --git a/compiler/test/dotty/tools/repl/ReplTest.scala b/compiler/test/dotty/tools/repl/ReplTest.scala
index 0c2517dd0219..d5256986f874 100644
--- a/compiler/test/dotty/tools/repl/ReplTest.scala
+++ b/compiler/test/dotty/tools/repl/ReplTest.scala
@@ -12,6 +12,7 @@ import scala.io.Source
 import scala.util.Using
 import scala.collection.mutable.ArrayBuffer
 
+import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.reporting.MessageRendering
 import org.junit.{After, Before}
 import org.junit.Assert._
@@ -33,13 +34,16 @@ extends ReplDriver(options, new PrintStream(out, true, StandardCharsets.UTF_8.na
   @After def cleanup: Unit =
     storedOutput()
 
-  def fromInitialState[A](op: State => A): A =
-    op(initialState)
+  def initially[A](op: State ?=> A): A = op(using initialState)
+
+  def contextually[A](op: Context ?=> A): A = op(using initialState.context)
 
   extension [A](state: State)
-    def andThen(op: State => A): A = op(state)
+    infix def andThen(op: State ?=> A): A = op(using state)
+
+  def testFile(f: JFile): Unit = testScript(f.toString, readLines(f), Some(f))
 
-  def testFile(f: JFile): Unit = {
+  def testScript(name: => String, lines: List[String], scriptFile: Option[JFile] = None): Unit = {
     val prompt = "scala>"
 
     def evaluate(state: State, input: String) =
@@ -50,7 +54,7 @@ extends ReplDriver(options, new PrintStream(out, true, StandardCharsets.UTF_8.na
       }
       catch {
         case ex: Throwable =>
-          System.err.println(s"failed while running script: $f, on:\n$input")
+          System.err.println(s"failed while running script: $name, on:\n$input")
           throw ex
       }
 
@@ -59,36 +63,41 @@ extends ReplDriver(options, new PrintStream(out, true, StandardCharsets.UTF_8.na
         case "" => Nil
         case nonEmptyLine => nonEmptyLine :: Nil
       }
+    def nonBlank(line: String): Boolean = line.exists(!Character.isWhitespace(_))
 
-    val expectedOutput = readLines(f).flatMap(filterEmpties)
+    val expectedOutput = lines.filter(nonBlank)
     val actualOutput = {
-      resetToInitial()
+      val opts = toolArgsParse(lines.take(1))
+      val (optsLine, inputLines) = if opts.isEmpty then ("", lines) else (lines.head, lines.drop(1))
+      resetToInitial(opts)
 
-      val lines = readLines(f)
-      assert(lines.head.startsWith(prompt),
-        s"""Each file has to start with the prompt: "$prompt"""")
-      val inputRes = lines.filter(_.startsWith(prompt))
+      assert(inputLines.head.startsWith(prompt),
+        s"""Each script must start with the prompt: "$prompt"""")
+      val inputRes = inputLines.filter(_.startsWith(prompt))
 
       val buf = new ArrayBuffer[String]
       inputRes.foldLeft(initialState) { (state, input) =>
         val (out, nstate) = evaluate(state, input)
         out.linesIterator.foreach(buf.append)
-
-        assert(out.endsWith("\n"),
-               s"Expected output of $input to end with newline")
-
         nstate
       }
-      buf.toList.flatMap(filterEmpties)
+      (optsLine :: buf.toList).filter(nonBlank)
     }
 
     if !FileDiff.matches(actualOutput, expectedOutput) then
-      println("expected =========>")
-      println(expectedOutput.mkString(EOL))
-      println("actual ===========>")
-      println(actualOutput.mkString(EOL))
-
-      fail(s"Error in file $f, expected output did not match actual")
+      // Some tests aren't file-based but just pass a string, so can't update anything then
+      // Also the files here are the copies in target/ not the original, so you need to vimdiff/mv them...
+      if dotty.Properties.testsUpdateCheckfile && scriptFile != None then
+        val checkFile = scriptFile.get
+        FileDiff.dump(checkFile.toPath.toString, actualOutput)
+        println(s"Wrote updated script file to $checkFile")
+      else
+        println("expected =========>")
+        println(expectedOutput.mkString(EOL))
+        println("actual ===========>")
+        println(actualOutput.mkString(EOL))
+
+        fail(s"Error in script $name, expected output did not match actual")
     end if
   }
 }
diff --git a/compiler/test/dotty/tools/repl/ShadowingBatchTests.scala b/compiler/test/dotty/tools/repl/ShadowingBatchTests.scala
new file mode 100644
index 000000000000..bcfe1c3251a7
--- /dev/null
+++ b/compiler/test/dotty/tools/repl/ShadowingBatchTests.scala
@@ -0,0 +1,71 @@
+package dotty.tools
+package repl
+
+import java.io.File
+import java.nio.file.Files
+
+import org.junit.{ After, AfterClass, BeforeClass, Ignore, Test }
+import org.junit.Assert._
+import io.{ Directory, PlainDirectory }
+import dotc.core.Contexts._
+import dotc.reporting.{ ErrorMessagesTest, StoreReporter }
+import vulpix.TestConfiguration
+
+object ShadowingBatchTests:
+  val dir = Directory(Files.createTempDirectory("batch-shadow"))
+
+  @BeforeClass def suiteStarting: Unit = dir.createDirectory()
+  @AfterClass  def suiteFinished: Unit = dir.deleteRecursively()
+
+class ShadowingBatchTests extends ErrorMessagesTest:
+  import ShadowingBatchTests._
+
+  @After def testFinished: Unit = dir.list.foreach(_.deleteRecursively())
+
+  val compiler = new dotc.Compiler()
+
+  override def initializeCtx(ictx: FreshContext) = inContext(ictx) {
+    super.initializeCtx(ictx)
+    val settings = ictx.settings; import settings._
+    ictx.setSetting(outputDir, new PlainDirectory(dir))
+    ictx.setSetting(classpath, classpath.value + File.pathSeparator + dir.jpath.toAbsolutePath)
+  }
+
+  @Test def file =
+    checkMessages("class C(val c: Int)").expectNoErrors
+    checkMessages("object rsline1 {\n  def line1 = new C().c\n}").expect { (_, msgs) =>
+      assertMessageCount(1, msgs)
+      assertEquals("missing argument for parameter c of constructor C in class C: (c: Int): C", msgs.head.message)
+    }
+    checkMessages("object rsline2 {\n  def line2 = new C(13).c\n}").expectNoErrors
+    checkMessages("object rsline3 {\n  class C { val c = 42 }\n}").expectNoErrors
+    checkMessages("import rsline3._\nobject rsline4 {\n  def line4 = new C().c\n}").expectNoErrors
+
+  @Test def directory =
+    checkMessages("package foo\nclass C").expectNoErrors
+    checkMessages("object rsline1 {\n  def line1 = foo\n}").expect { (_, msgs) =>
+      assertMessageCount(1, msgs)
+      assertEquals("package foo is not a value", msgs.head.message)
+    }
+    checkMessages("object rsline2 {\n  val foo = 2\n}").expectNoErrors
+    checkMessages("import rsline2._\nobject rsline3 {\n  def line3 = foo\n}").expectNoErrors
+
+  @Test def directoryJava =
+    checkMessages("object rsline1 {\n  def line1 = java\n}").expect { (_, msgs) =>
+      assertMessageCount(1, msgs)
+      assertEquals("package java is not a value", msgs.head.message)
+    }
+    checkMessages("object rsline2 {\n  val java = 2\n}").expectNoErrors
+    checkMessages("import rsline2._\nobject rsline3 {\n  def line3 = java\n}").expectNoErrors
+
+  def checkMessages(source: String): Report =
+    ctx = newContext
+    val run = compiler.newRun(using ctx.fresh)
+    run.compileFromStrings(List(source))
+    val runCtx = run.runContext
+    if runCtx.reporter.hasErrors then
+      val rep = runCtx.reporter.asInstanceOf[StoreReporter]
+      val msgs = rep.removeBufferedMessages(using runCtx).map(_.msg).reverse
+      new Report(msgs, runCtx)
+    else new EmptyReport
+end ShadowingBatchTests
diff --git a/compiler/test/dotty/tools/repl/ShadowingTests.scala b/compiler/test/dotty/tools/repl/ShadowingTests.scala
new file mode 100644
index 000000000000..43c182b9ae5b
--- /dev/null
+++ b/compiler/test/dotty/tools/repl/ShadowingTests.scala
@@ -0,0 +1,139 @@
+package dotty.tools
+package repl
+
+import java.io.File
+import java.nio.file.{Path, Files}
+import java.util.Comparator
+
+import org.junit.{Test, Ignore, BeforeClass, AfterClass}
+
+import dotc.Driver
+import dotc.reporting.TestReporter
+import dotc.interfaces.Diagnostic.ERROR
+import vulpix.{TestConfiguration, TestFlags}
+
+/** Test that the REPL can shadow artifacts in the local filesystem on the classpath.
+ *  Since the REPL launches with the current directory on the classpath, stray .class
+ *  files containing definitions in the empty package will be in scope in the REPL.
+ *  Additionally, any subdirectories will be treated as package names in scope.
+ *  As this may come as a surprise to an unsuspecting user, we would like definitions
+ *  from the REPL session to shadow these names.
+ *
+ *  Provided here is a framework for creating the filesystem artifacts to be shadowed
+ *  and running scripted REPL tests with them on the claspath.
+ */
+object ShadowingTests:
+  def classpath = TestConfiguration.basicClasspath + File.pathSeparator + shadowDir
+  def options = ReplTest.commonOptions ++ Array("-classpath", classpath)
+  def shadowDir = dir.toAbsolutePath.toString
+
+  def createSubDir(name: String): Path =
+    val subdir = dir.resolve(name)
+    try Files.createDirectory(subdir)
+    catch case _: java.nio.file.FileAlreadyExistsException =>
+    assert(Files.isDirectory(subdir), s"failed to create shadowed subdirectory $subdir")
+    subdir
+
+  // The directory on the classpath containing artifacts to be shadowed
+  private var dir: Path = null
+
+  @BeforeClass def setupDir: Unit =
+    dir = Files.createTempDirectory("repl-shadow")
+
+  @AfterClass def tearDownDir: Unit =
+    Files.walk(dir).sorted(Comparator.reverseOrder).forEach(Files.delete)
+    dir = null
+
+class ShadowingTests extends ReplTest(options = ShadowingTests.options):
+  // delete contents of shadowDir after each test
+  override def cleanup: Unit =
+    super.cleanup
+    val dir = ShadowingTests.dir
+    Files.walk(dir)
+      .filter(_ != dir)
+      .sorted(Comparator.reverseOrder)
+      .forEach(Files.delete)
+
+  /** Run a scripted REPL test with the compilation artifacts of `shadowed` on the classpath */
+  def shadowedScriptedTest(name: String, shadowed: String, script: String): Unit =
+    compileShadowed(shadowed)
+    testScript(name, script.linesIterator.toList)
+
+  /** Compile the given source text and output to the shadow dir on the classpath */
+  private def compileShadowed(src: String): Unit =
+    val file: Path = Files.createTempFile("repl-shadow-test", ".scala")
+    Files.write(file, src.getBytes)
+
+    val flags =
+      TestFlags(TestConfiguration.basicClasspath, TestConfiguration.noCheckOptions)
+        .and("-d", ShadowingTests.shadowDir)
+    val driver = new Driver
+    val reporter = TestReporter.reporter(System.out, logLevel = ERROR)
+    driver.process(flags.all :+ file.toString, reporter)
+    assert(!reporter.hasErrors, s"compilation of $file failed")
+    Files.delete(file)
+  end compileShadowed
+
+  @Test def i7635 = shadowedScriptedTest(name = "<i7635>",
+    shadowed = "class C(val c: Int)",
+    script =
+      """|scala> new C().c
+         |-- Error: ----------------------------------------------------------------------
+         |1 | new C().c
+         |  | ^^^^^^^
+         |  | missing argument for parameter c of constructor C in class C: (c: Int): C
+         |1 error found
+         |
+         |scala> new C(13).c
+         |val res0: Int = 13
+         |
+         |scala> class C { val c = 42 }
+         |// defined class C
+         |
+         |scala> new C().c
+         |val res1: Int = 42
+         |""".stripMargin
+  )
+
+  @Test def `shadow subdirectories on classpath` =
+    // NB: Tests of shadowing of subdirectories on the classpath are only valid
+    // when the subdirectories exist prior to initialization of the REPL driver.
+    // In the tests below this is enforced by the call to `testScript` which
+    // in turn invokes `ReplDriver#resetToInitial`. When testing interactively,
+    // the subdirectories may be created before launching the REPL, or during
+    // an existing session followed by the `:reset` command.
+
+    ShadowingTests.createSubDir("foo")
+    testScript(name = "<shadow-subdir-foo>",
+      """|scala> val foo = 3
+         |val foo: Int = 3
+         |
+         |scala> foo
+         |val res0: Int = 3
+         |""".stripMargin.linesIterator.toList
+    )
+
+    ShadowingTests.createSubDir("x")
+    testScript(name = "<shadow-subdir-x>",
+      """|scala> val (x, y) = (42, "foo")
+         |val x: Int = 42
+         |val y: String = foo
+         |
+         |scala> if (true) x else y
+         |val res0: Matchable = 42
+         |""".stripMargin.linesIterator.toList
+    )
+
+    ShadowingTests.createSubDir("util")
+    testScript(name = "<shadow-subdir-util>",
+      """|scala> import util.Try
+         |
+         |scala> object util { class Try { override def toString = "you've gotta try!" }  }
+         |// defined object util
+         |
+         |scala> import util.Try
+         |scala> new Try
+         |val res0: util.Try = you've gotta try!
+         |""".stripMargin.linesIterator.toList
+    )
+end ShadowingTests
diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
index cbf267e7c846..ab581d664629 100644
--- a/compiler/test/dotty/tools/repl/TabcompleteTests.scala
+++ b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
@@ -10,22 +10,22 @@ class TabcompleteTests extends ReplTest {
   private def tabComplete(src: String)(implicit state: State): List[String] =
     completions(src.length, src, state).map(_.value).sorted
 
-  @Test def tabCompleteList = fromInitialState { implicit s =>
+  @Test def tabCompleteList = initially {
     val comp = tabComplete("List.r")
     assertEquals(List("range"), comp.distinct)
   }
 
-  @Test def tabCompleteListInstance = fromInitialState { implicit s =>
+  @Test def tabCompleteListInstance = initially {
     val comp = tabComplete("(null: List[Int]).sli")
     assertEquals(List("slice", "sliding"), comp.distinct)
   }
 
-  @Test def tabCompleteModule = fromInitialState{ implicit s =>
+  @Test def tabCompleteModule = initially {
     val comp = tabComplete("scala.Pred")
     assertEquals(List("Predef"), comp)
   }
 
-  @Test def tabCompleteInClass = fromInitialState { implicit s =>
+  @Test def tabCompleteInClass = initially {
     val comp = tabComplete("class Foo { def bar: List[Int] = List.ap")
     assertEquals(List("apply"), comp)
   }
@@ -34,77 +34,70 @@ class TabcompleteTests extends ReplTest {
     val src1 = "class Foo { def bar(xs: List[Int]) = xs.map"
     val src2 = "class Foo { def bar(xs: List[Int]) = xs.mapC"
 
-    fromInitialState { implicit state =>
-      val comp = tabComplete(src1)
-      assertEquals(List("map", "mapConserve"), comp)
-      state
-    }
-    .andThen { implicit state =>
-      val comp = tabComplete(src2)
-      assertEquals(List("mapConserve"), comp)
+    initially {
+      val comp1 = tabComplete(src1)
+      assertEquals(List("map", "mapConserve"), comp1)
+      val comp2 = tabComplete(src2)
+      assertEquals(List("mapConserve"), comp2)
     }
   }
 
-  @Test def i3309 = fromInitialState { implicit s =>
+  @Test def i3309 = initially {
     // We make sure we do not crash
     List("\"", ")", "'", "¨", "£", ":", ",", ";", "@", "}", "[", "]", ".")
       .foreach(tabComplete(_))
   }
 
   @Test def completeFromPreviousState =
-    fromInitialState { implicit state  =>
+    initially {
       val src = "class Foo { def comp3 = 3; def comp1 = 1; def comp2 = 2 }"
       run(src)
-    }
-    .andThen { implicit state =>
+    } andThen {
       val expected = List("comp1", "comp2", "comp3")
       assertEquals(expected, tabComplete("(new Foo).comp"))
     }
 
   @Test def completeFromPreviousState2 =
-    fromInitialState { implicit state  =>
+    initially {
       val src = "def hello = 1"
       run(src)
-    }
-    .andThen { implicit state =>
+    } andThen {
       val expected = List("hello")
       assertEquals(expected, tabComplete("hel"))
     }
 
   @Test def tabCompleteFromPreviousImport =
-    fromInitialState { implicit state =>
+    initially {
       val src = "import java.io.FileDescriptor"
       run(src)
-    }
-    .andThen { implicit state =>
+    } andThen {
       val expected = List("FileDescriptor")
       assertEquals(expected, tabComplete("val foo: FileDesc"))
     }
 
   @Test def tabCompleteRenamedImport =
-    fromInitialState { implicit state =>
+    initially {
       val src = "import java.io.{FileDescriptor => Renamed}"
       run(src)
-    }
-    .andThen { implicit state =>
+    } andThen {
       val expected = List("Renamed")
       assertEquals(expected, tabComplete("val foo: Rena"))
     }
 
-  @Test def tabClosureComplete = fromInitialState { implicit s =>
+  @Test def tabClosureComplete = initially {
     assertEquals(List("map", "mapConserve"), tabComplete("Nil.map"))
     assertEquals(List("map", "mapConserve"), tabComplete("(x: Int => Int) => Nil.map"))
     assertEquals(List("apply"), tabComplete("(x: Int => Int) => x.ap"))
   }
 
-  @Test def importScala = fromInitialState { implicit s =>
+  @Test def importScala = initially {
     val comp = tabComplete("import scala.")
     // check that there are no special symbols leaked: <byname>, <special-ops>, ...
     assertEquals(Some("<:<"), comp.find(_.startsWith("<")))
     assert(!comp.contains("package"))
   }
 
-  @Test def `null` = fromInitialState { implicit s =>
+  @Test def `null` = initially {
     val comp = tabComplete("null.")
     assertEquals(
       List("!=", "##", "==", "asInstanceOf", "eq", "equals", "getClass", "hashCode",
@@ -112,7 +105,7 @@ class TabcompleteTests extends ReplTest {
       comp.distinct.sorted)
   }
 
-  @Test def anyRef = fromInitialState { implicit s =>
+  @Test def anyRef = initially {
     val comp = tabComplete("(null: AnyRef).")
     assertEquals(
       List("!=", "##", "->", "==", "asInstanceOf", "ensuring", "eq", "equals", "formatted",
@@ -120,16 +113,22 @@ class TabcompleteTests extends ReplTest {
       comp.distinct.sorted)
   }
 
-  @Test def `???` = fromInitialState { implicit s =>
+  @Test def `???` = initially {
     val comp = tabComplete("???.")
     assertEquals(Nil, comp)
   }
 
-  @Test def moduleCompletion = fromInitialState { implicit s =>
+  @Test def moduleCompletion = initially {
     assertEquals(List("Predef"), tabComplete("object Foo { type T = Pre"))
   }
 
-  @Test def i6415 = fromInitialState { implicit s =>
+  @Test def i6415 = initially {
     assertEquals(List("Predef"), tabComplete("object Foo { opaque type T = Pre"))
   }
+
+  @Test def i12600 = initially {
+    assertEquals(List("select", "show", "simplified", "substituteTypes"),
+      tabComplete("import quoted.* ; def fooImpl(using Quotes): Expr[Int] = { import quotes.reflect.* ; TypeRepr.of[Int].s"))
+  }
+
 }
diff --git a/compiler/test/dotty/tools/repl/TypeTests.scala b/compiler/test/dotty/tools/repl/TypeTests.scala
index abc66ba2c0ab..6a8c38867ff0 100644
--- a/compiler/test/dotty/tools/repl/TypeTests.scala
+++ b/compiler/test/dotty/tools/repl/TypeTests.scala
@@ -4,25 +4,26 @@ import org.junit.Assert._
 import org.junit.Test
 
 class TypeTests extends ReplTest {
-  @Test def typeOf1 = fromInitialState { implicit s =>
+  @Test def typeOf1 = initially {
     run(":type 1")
     assertEquals("Int", storedOutput().trim)
   }
 
-  @Test def typeOfBlock = fromInitialState { implicit s =>
+  @Test def typeOfBlock = initially {
     run(":type { /** omg omg omg */ 1 + 5; 1 }")
     assertEquals("Int", storedOutput().trim)
   }
 
   @Test def typeOfX =
-    fromInitialState { implicit s => run("val x = 5") }
-    .andThen { implicit s =>
+    initially {
+      run("val x = 5")
+    } andThen {
       storedOutput() // discard output
       run(":type x")
       assertEquals("Int", storedOutput().trim)
     }
 
-  @Test def typeOfEmpty = fromInitialState { implicit s =>
+  @Test def typeOfEmpty = initially {
     run(":type")
     assertEquals(":type <expression>", storedOutput().trim)
   }
diff --git a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala
new file mode 100644
index 000000000000..b83b16e01e1f
--- /dev/null
+++ b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala
@@ -0,0 +1,229 @@
+package dotty
+package tools
+package scripting
+
+import java.nio.file.Paths
+import org.junit.{Test, AfterClass}
+import org.junit.Assert.assertEquals
+
+import vulpix.TestConfiguration
+
+import ScriptTestEnv.*
+
+/** Verifies correct handling of command line arguments by `dist/bin/scala` and `dist/bin/scalac`.
+ *   +. arguments following a script path must be treated as script arguments
+ *   +. preserve script command line arguments.
+ *   +. prevent SCALA_OPTS in build environment from infecting tests, via 'SCALA_OPTS= ' prefix
+ *   +. test scripts must not throw execptions or exit with nonzero.
+ */
+object BashScriptsTests:
+  lazy val argsfile = createArgsFile() // avoid problems caused by drive letter
+  def testFiles = scripts("/scripting")
+
+  @AfterClass def cleanup: Unit = {
+    val af = argsfile.toFile
+    if (af.exists) {
+      af.delete()
+    }
+  }
+  printf("osname[%s]\n", osname)
+  printf("uname[%s]\n", ostypeFull)
+  printf("using JAVA_HOME=%s\n", envJavaHome)
+  printf("using SCALA_HOME=%s\n", envScalaHome)
+  printf("first 5 PATH entries:\n%s\n", adjustedPathEntries.take(5).mkString("\n"))
+  printf("scala path:  [%s]\n", scalaPath)
+  printf("scalac path: [%s]\n", scalacPath)
+
+  val expectedOutput = List(
+    "arg  0:[a]",
+    "arg  1:[b]",
+    "arg  2:[c]",
+    "arg  3:[-repl]",
+    "arg  4:[-run]",
+    "arg  5:[-script]",
+    "arg  6:[-debug]",
+  )
+  val testScriptArgs = Seq(
+    "a", "b", "c", "-repl", "-run", "-script", "-debug"
+  )
+  val showArgsScript = testFiles.find(_.getName == "showArgs.sc").get.absPath
+
+  def testFile(name: String): String = 
+    val file = testFiles.find(_.getName == name) match {
+      case Some(f) =>
+        val ff = f.absPath
+        printf("test file [%s] is [%s]\n", name, ff)
+        ff
+      case None =>
+        printf("test file [%s] not found!\n", name)
+        name.absPath
+    }
+    file
+
+  val Seq(envtestSc, envtestScala) = Seq("envtest.sc", "envtest.scala").map { testFile(_) }
+
+  // create command line with given options, execute specified script, return stdout
+  def callScript(tag: String, script: String, keyPre: String): String =
+    val keyArg = s"$keyPre=$tag"
+    printf("pass tag [%s] via [%s] to script [%s]\n", tag, keyArg, script)
+    val cmd: String = Seq("SCALA_OPTS= ", scalaPath, keyArg, script).mkString(" ")
+    printf("cmd: [%s]\n", cmd)
+    val (validTest, exitCode, stdout, stderr) = bashCommand(cmd)
+    stderr.filter { !_.contains("Inappropriate ioctl") }.foreach { System.err.printf("stderr [%s]\n", _) }
+    stdout.mkString("\n")
+
+
+class BashScriptsTests:
+  import BashScriptsTests.*
+  // classpath tests managed by scripting.ClasspathTests.scala
+
+  ////////////////////////// begin tests //////////////////////
+  
+  /* verify that `dist/bin/scala` correctly passes args to the jvm via -J-D for script envtest.sc */
+  @Test def verifyScJProperty =
+    val tag = "World1"
+    val stdout = callScript(tag, envtestSc, s"-J-Dkey")
+    assertEquals( s"Hello $tag", stdout)
+
+  /* verify that `dist/bin/scala` correctly passes args to the jvm via -J-D for script envtest.scala */
+  @Test def verifyScalaJProperty =
+    val tag = "World2"
+    val stdout = callScript(tag, envtestScala, s"-J-Dkey")
+    assertEquals(s"Hello $tag", stdout)
+
+  /* verify that `dist/bin/scala` can set system properties via -D for envtest.sc */
+  @Test def verifyScDProperty =
+    val tag = "World3"
+    val stdout = callScript(tag, envtestSc, s"-Dkey")
+    assertEquals(s"Hello $tag", stdout)
+
+  /* verify that `dist/bin/scala` can set system properties via -D for envtest.scala */
+  @Test def verifyScalaDProperty =
+    val tag = "World4"
+    val stdout = callScript(tag, envtestScala, s"-Dkey")
+    assertEquals(s"Hello $tag", stdout)
+
+  /* verify that `dist/bin/scala` can set system properties via -D when executing compiled script via -jar envtest.jar */
+  @Test def saveAndRunWithDProperty =
+    val commandline = Seq("SCALA_OPTS= ", scalaPath.relpath, "-save", envtestScala.relpath).mkString(" ")
+    val (_, _, _, _) = bashCommand(commandline) // compile jar, discard output
+    val testJar = testFile("envtest.jar") // jar is created by the previous bashCommand()
+    if (testJar.isFile){
+      printf("compiled envtest.scala to %s\n", testJar.norm)
+    } else {
+      sys.error(s"error: unable to compile envtest.scala to ${testJar.norm}")
+    }
+
+    val tag = "World5"
+    val commandline2 = Seq("SCALA_OPTS= ", scalaPath.relpath, s"-Dkey=$tag", testJar.relpath)
+    printf("cmd[%s]\n", commandline2.mkString(" "))
+    val (validTest, exitCode, stdout, stderr) = bashCommand(commandline2.mkString(" "))
+    assertEquals(s"Hello $tag", stdout.mkString("/n"))
+
+  /* verify `dist/bin/scalac` non-interference with command line args following script name */
+  @Test def verifyScalacArgs =
+    val commandline = (Seq("SCALA_OPTS= ", scalacPath, "-script", showArgsScript) ++ testScriptArgs).mkString(" ")
+    val (validTest, exitCode, stdout, stderr) = bashCommand(commandline)
+    if verifyValid(validTest) then
+      var fail = false
+      printf("\n")
+      for (line, expect) <- stdout zip expectedOutput do
+        printf("expected: %-17s\nactual  : %s\n", expect, line)
+        if line != expect then
+          fail = true
+
+      if fail then
+        assert(stdout == expectedOutput)
+
+  /* verify `dist/bin/scala` non-interference with command line args following script name */
+  @Test def verifyScalaArgs =
+    val commandline = (Seq("SCALA_OPTS= ", scalaPath, showArgsScript) ++ testScriptArgs).mkString(" ")
+    val (validTest, exitCode, stdout, stderr) = bashCommand(commandline)
+    if verifyValid(validTest) then
+      var fail = false
+      printf("\n")
+      for (line, expect) <- stdout zip expectedOutput do
+        printf("expected: %-17s\nactual  : %s\n", expect, line)
+        if line != expect then
+          fail = true
+
+      if fail then
+        assert(stdout == expectedOutput)
+
+  /*
+   * verify that scriptPath.sc sees a valid script.path property,
+   * and that it's value is the path to "scriptPath.sc".
+   */
+  @Test def verifyScriptPathProperty =
+    val scriptFile = testFiles.find(_.getName == "scriptPath.sc").get
+    val expected = s"${scriptFile.getName}"
+    printf("===> verify valid system property script.path is reported by script [%s]\n", scriptFile.getName)
+    printf("calling scriptFile: %s\n", scriptFile)
+    val (validTest, exitCode, stdout, stderr) = bashCommand(scriptFile.absPath)
+    if verifyValid(validTest) then
+      stdout.foreach { printf("stdout: [%s]\n", _) }
+      stderr.foreach { printf("stderr: [%s]\n", _) }
+      val valid = stdout.exists { _.endsWith(expected) }
+      if valid then printf("# valid script.path reported by [%s]\n", scriptFile.getName)
+      assert(valid, s"script ${scriptFile.absPath} did not report valid script.path value")
+
+  /*
+   * verify SCALA_OPTS can specify an @argsfile when launching a scala script in `dist/bin/scala`.
+   */
+  @Test def verifyScalaOpts =
+    val scriptFile = testFiles.find(_.getName == "classpathReport.sc").get
+    printf("===> verify SCALA_OPTS='@argsfile' is properly handled by `dist/bin/scala`\n")
+    val envPairs = List(("SCALA_OPTS", s"@$argsfile"))
+    val (validTest, exitCode, stdout, stderr) = bashCommand(scriptFile.absPath, envPairs)
+    printf("stdout: %s\n", stdout.mkString("\n","\n",""))
+    if verifyValid(validTest) then
+      val expected = s"${workingDirectory.norm}"
+      // stdout might be polluted with an ANSI color prefix, so be careful
+      val cwdline = stdout.find( _.trim.matches(".*cwd: .*") ).getOrElse("")
+      printf("cwdline  [%s]\n", cwdline)
+      printf("expected[%s]\n", expected)
+      val valid = cwdline.endsWith(expected)
+      if (!valid) then
+        stdout.foreach { printf("stdout[%s]\n", _) }
+        stderr.foreach { printf("stderr[%s]\n", _) }
+      if valid then printf(s"\n===> success: classpath begins with %s, as reported by [%s]\n", workingDirectory, scriptFile.getName)
+      assert(valid, s"script ${scriptFile.absPath} did not report valid java.class.path first entry")
+
+  /*
+   * verify that individual scripts can override -save with -nosave (needed to address #13760).
+   */
+  @Test def sqlDateTest =
+    val scriptBase = "sqlDateError"
+    val scriptFile = testFiles.find(_.getName == s"$scriptBase.sc").get
+    val testJar = testFile(s"$scriptBase.jar") // jar should not be created when scriptFile runs
+    val tj = Paths.get(testJar).toFile
+    if tj.isFile then tj.delete() // discard residual debris from previous test
+    printf("===> verify '-save' is cancelled by '-nosave' in script hashbang.`\n")
+    val (validTest, exitCode, stdout, stderr) = bashCommand(s"SCALA_OPTS=-save ${scriptFile.absPath}")
+    printf("stdout: %s\n", stdout.mkString("\n","\n",""))
+    if verifyValid(validTest) then
+      // the script should print '1969-12-31' or '1970-01-01', depending on time zone
+      // stdout can be polluted with an ANSI color prefix, in some test environments
+      val valid = stdout.mkString("").matches(""".*\d{4}-\d{2}-\d{2}.*""")
+      if (!valid) then
+        stdout.foreach { printf("stdout[%s]\n", _) }
+        stderr.foreach { printf("stderr[%s]\n", _) }
+      if valid then printf(s"\n===> success: scripts can override -save via -nosave\n")
+      assert(valid, s"script ${scriptFile.absPath} reported unexpected value for java.sql.Date ${stdout.mkString("\n")}")
+      assert(!testJar.exists,s"unexpected, jar file [$testJar] was created")
+
+
+  /*
+   * verify -e println("yo!") works.
+   */
+  @Test def verifyCommandLineExpression =
+    printf("===> verify -e <expression> is properly handled by `dist/bin/scala`\n")
+    val expected = "9"
+    val expression = s"println(3*3)"
+    val cmd = s"bin/scala -e $expression"
+    val (validTest, exitCode, stdout, stderr) = bashCommand(s"""bin/scala -e '$expression'""")
+    val result = stdout.filter(_.nonEmpty).mkString("")
+    printf("stdout: %s\n", result)
+    printf("stderr: %s\n", stderr.mkString("\n","\n",""))
+    if verifyValid(validTest) then
+      assert(result.contains(expected), s"expression [$expression] did not send [$expected] to stdout")
diff --git a/compiler/test/dotty/tools/scripting/ClasspathTests.scala b/compiler/test/dotty/tools/scripting/ClasspathTests.scala
new file mode 100755
index 000000000000..767c30e60ad6
--- /dev/null
+++ b/compiler/test/dotty/tools/scripting/ClasspathTests.scala
@@ -0,0 +1,102 @@
+package dotty
+package tools
+package scripting
+
+import java.io.File
+import java.nio.file.Path
+
+import org.junit.{Test, Ignore, AfterClass}
+import vulpix.TestConfiguration
+import ScriptTestEnv.*
+
+/** Test java command line generated by bin/scala and bin/scalac */
+
+class ClasspathTests:
+  /*
+   * Test disabled (temporarily).
+   * verify classpath reported by called script.
+   * This need to be reconceptualized.
+   * System property "java.class.path" does not necessarily contain the actual runtime path,
+   * So this test can fail even when the classpath is correct.
+   */
+  @Ignore
+  @Test def hashbangClasspathVerifyTest = {
+    // only interested in classpath test scripts
+    val testScriptName = "classpathReport.sc"
+    val testScript = scripts("/scripting").find { _.getName.matches(testScriptName) } match
+      case None => sys.error(s"test script not found: ${testScriptName}")
+      case Some(file) => file
+
+    val relpath = testScript.toPath.relpath.norm
+    printf("===> hashbangClasspathVerifyTest for script [%s]\n", relpath)
+    printf("bash is [%s]\n", bashExe)
+
+    if packBinScalaExists then
+      val bashCmdline = s"SCALA_OPTS= $relpath"
+      val cmd = Array(bashExe, "-c", bashCmdline)
+
+      cmd.foreach { printf("[%s]\n", _) }
+
+      // classpathReport.sc is expected to produce two lines:
+      // cwd: <current-working-directory-seen-by-the-script>
+      // classpath: <classpath-seen-by-the-script>
+      
+      val scriptOutput: Seq[String] = exec(cmd:_*)
+      val scriptCwd: String = findTaggedLine("cwd", scriptOutput) // the value tagged "cwd: "
+      printf("script ran in directory [%s]\n", scriptCwd)
+      val scriptCp = findTaggedLine("classpath", scriptOutput) // the value tagged "classpath: "
+
+      // convert scriptCp to a list of files
+      val hashbangJars: List[File] = scriptCp.split(psep).map { _.toFile }.toList
+      val hashbangClasspathJars = hashbangJars.map { _.name }.sorted.distinct // get jar basenames, remove duplicates
+      val packlibDir = s"$scriptCwd/$packLibDir" // classpathReport.sc specifies a wildcard classpath in this directory 
+      val packlibJars: List[File] = listJars(packlibDir) // classpath entries expected to have been reported by the script
+
+      printf("%d jar files in dist/target/pack/lib\n", packlibJars.size)
+      printf("%d test script jars in classpath\n", hashbangClasspathJars.size)
+
+      val (diff: Set[File], msg: String) = if (packlibJars.size > hashbangClasspathJars.size) {
+        (packlibJars.toSet -- hashbangJars.toSet , "only in packlib classpath")
+      } else {
+        (hashbangJars.toSet -- packlibJars.toSet , "only in hashbang classpath")
+      }
+      // verify that the script hasbang classpath setting was effective at supplementing the classpath
+      // (a minimal subset of jars below dist/target/pack/lib are always be in the classpath)
+      val missingClasspathEntries = if hashbangClasspathJars.size != packlibJars.size then
+        printf("packlib dir [%s]\n", packlibDir)
+        printf("hashbangClasspathJars: %s\n", hashbangJars.map { _.relpath.norm }.mkString("\n ", "\n ", ""))
+        printf("# %s\n", msg)
+        diff.foreach { (f: File) => printf(" %s\n", f.relpath.norm) }
+      else
+        Set.empty[String]
+
+      assert(hashbangClasspathJars.size == packlibJars.size)
+  }
+  /*
+   * verify classpath is unglobbed by MainGenericRunner.
+   */
+  @Test def unglobClasspathVerifyTest = {
+    val testScriptName = "unglobClasspath.sc"
+    val testScript = scripts("/scripting").find { _.name.matches(testScriptName) } match
+      case None => sys.error(s"test script not found: ${testScriptName}")
+      case Some(file) => file
+
+    val relpath = testScript.toPath.relpath.norm
+    printf("===> unglobClasspathVerifyTest for script [%s]\n", relpath)
+    printf("bash is [%s]\n", bashExe)
+
+    if packBinScalaExists then
+      val bashCmdline = s"set +x ; SCALA_OPTS= $relpath"
+      val cmd = Array(bashExe, "-c", bashCmdline)
+
+      cmd.foreach { printf("[%s]\n", _) }
+
+      // test script reports the classpath it sees
+      val scriptOutput = exec(cmd:_*)
+      val scriptCp = findTaggedLine("unglobbed classpath", scriptOutput)
+      printf("%s\n", scriptCp)
+      val classpathJars = scriptCp.split(psep).map { _.getName }.sorted.distinct
+      //classpathJars.foreach { printf("%s\n", _) }
+      assert(classpathJars.size > 1)
+  }
+
diff --git a/compiler/test/dotty/tools/scripting/ExpressionTest.scala b/compiler/test/dotty/tools/scripting/ExpressionTest.scala
new file mode 100755
index 000000000000..136007af835d
--- /dev/null
+++ b/compiler/test/dotty/tools/scripting/ExpressionTest.scala
@@ -0,0 +1,56 @@
+package dotty
+package tools
+package scripting
+
+import java.nio.file.Paths
+import org.junit.{Test, AfterClass}
+import org.junit.Assert.assertEquals
+
+import vulpix.TestConfiguration
+
+import ScriptTestEnv.*
+
+/** 
+ *   +. test scala -e <expression>
+ */
+class ExpressionTest:
+  /*
+   * verify -e <expression> works.
+   */
+  @Test def verifyCommandLineExpression =
+    printf("===> verify -e <expression> is properly handled by `dist/bin/scala`\n")
+    val expected = "9"
+    val expression = s"println(3*3)"
+    val result = getResult(expression)
+    assert(result.contains(expected), s"expression [$expression] did not send [$expected] to stdout")
+
+  @Test def verifyImports: Unit =
+    val expressionLines = List(
+      "import java.nio.file.Paths",
+      "import scala.util.Properties.userDir",
+      "println(Paths.get(userDir).toFile.listFiles.toList.filter(_.isDirectory).size)",
+    )
+    val expression = expressionLines.mkString(";")
+    val success = testExpression(expression){ result =>
+      result.matches("[0-9]+") && result.toInt > 0
+    }
+    assert(success)
+
+  def getResult(expression: String): String =
+    val (_, _, stdout, stderr) = bashCommand(s"$scalaPath -e '$expression'")
+    printf("stdout: %s\n", stdout.mkString("|"))
+    printf("stderr: %s\n", stderr.mkString("\n", "\n", ""))
+    stdout.filter(_.nonEmpty).mkString("")
+    
+  def testExpression(expression: String)(check: (result: String) => Boolean): Boolean =
+    val result = getResult(expression)
+    check(result)
+
+object ExpressionTest:
+
+  def main(args: Array[String]): Unit =
+    val tests = new ExpressionTest
+    println("\n=== verifyCommandLineExpression ===")
+    tests.verifyCommandLineExpression
+    println("\n=== verifyImports ===")
+    tests.verifyImports
diff --git a/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala b/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala
new file mode 100644
index 000000000000..15bcf4034a5f
--- /dev/null
+++ b/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala
@@ -0,0 +1,292 @@
+package dotty
+package tools
+package scripting
+
+import java.io.File
+import java.nio.file.{Path, Paths, Files}
+
+import dotty.tools.dotc.config.Properties.*
+
+import scala.sys.process.*
+import scala.jdk.CollectionConverters.*
+
+/**
+ * Common Code for supporting scripting tests.
+ * To override the path to the bash executable, set TEST_BASH=<path-to-bash.exe>
+ * To specify where `dist/target/pack/bin` resides, set TEST_CWD=<working-directory>
+ * Test scripts run in a bash env, so paths are converted to forward slash via .norm.
+ */
+object ScriptTestEnv {
+  def osname: String = sys.props("os.name").toLowerCase
+  def psep: String = sys.props("path.separator")
+  def userDir: String = sys.props("user.dir").norm
+  def testCwd = envOrElse("TEST_CWD", "").norm // optional working directory TEST_CWD
+  def verbose = envOrElse("VERBOSE", "").nonEmpty
+
+  def whichJava: String = whichExe("java")
+  def whichBash: String = whichExe("bash")
+
+  lazy val workingDirectory: String = {
+    val dirstr = if testCwd.nonEmpty then
+      if verbose then printf("TEST_CWD set to [%s]\n", testCwd)
+      testCwd
+    else 
+      userDir // userDir, if TEST_CWD not set
+
+    // issue warning if things don't look right
+    val test = Paths.get(s"$dirstr/dist/target/pack/bin").normalize
+    if !test.isDirectory then
+      printf("warning: not found below working directory: %s\n", test.norm)
+
+    if verbose then printf("working directory is [%s]\n", dirstr)
+    dirstr
+  }
+
+  def envPath: String = envOrElse("PATH", "")
+  // remove duplicate entries in path
+  def supplementedPath: String = s"dist/target/pack/bin$psep$envJavaHome/bin$psep$envScalaHome/bin$psep$envPath".norm
+  def adjustedPathEntries: List[String] = supplementedPath.norm.split(psep).toList.distinct
+  def adjustedPath: String = adjustedPathEntries.mkString(psep)
+  def envPathEntries: List[String] = envPath.split(psep).toList.distinct
+
+  def bashExe: String = envOrElse("TEST_BASH", whichBash)
+
+  def unameExe = which("uname")
+  def ostypeFull = if unameExe.nonEmpty then exec(unameExe).mkString else ""
+  def ostype = ostypeFull.toLowerCase.takeWhile{ cc => cc >= 'a' && cc <='z' || cc >= 'A' && cc <= 'Z' }
+
+  def cygwin = ostype == "cygwin"
+  def mingw = ostype == "mingw"
+  def msys = ostype == "msys"
+  def winshell: Boolean = cygwin || mingw || msys
+
+  def which(str: String) =
+    var out = ""
+    // must not use adjusted path here! (causes recursive call / stack overflow)
+    envPathEntries.find { entry =>
+      val it = Paths.get(entry).toAbsolutePath.normalize
+      it.toFile.isDirectory && {
+        var testpath = s"$it/$str".norm
+        val test = Paths.get(testpath)
+        if test.toFile.exists then
+          out = testpath
+          true
+        else
+          val test = Paths.get(s"$it/$str.exe".norm)
+          if test.toFile.exists then
+            out = testpath
+            true
+          else
+            false
+        }
+      }
+    out
+
+  def whichExe(basename: String): String = 
+    val exeName = if (osname.toLowerCase.startsWith("windows")) s"$basename.exe" else basename
+    which(exeName)
+
+  /* returned values are:
+   * validTest: Boolean   - false if permissions problems occur, true otherwise
+   * exitVal:   Int       - the conventional return error code, where zero implies "no errors".
+   * stdout: Seq[String]  - the lines captured from STDOUT
+   * stderr: Seq[String]  - the lines captured from STDERR
+   */
+  def bashCommand(cmdstr: String, additionalEnvPairs: List[(String, String)] = Nil): (Boolean, Int, Seq[String], Seq[String]) = {
+    var (stdout, stderr) = (List.empty[String], List.empty[String])
+    if bashExe.toFile.exists then
+      def q = "\""
+      printf("bashCmd: %s -c %s\n", bashExe, s"$q$cmdstr$q")
+      val cmd = Seq(bashExe, "-c", cmdstr)
+      val envPairs = testEnvPairs ++ additionalEnvPairs
+      val proc = Process(cmd, None, envPairs *)
+      val exitVal = proc ! ProcessLogger (
+        (out: String) => stdout ::= out,
+        (err: String) => stderr ::= err
+      )
+      // a misconfigured environment (e.g., script is not executable) can prevent script execution
+      val validTest = !stderr.exists(_.contains("Permission denied"))
+      if ! validTest then
+        System.err.printf("\nunable to execute script, return value is %d\n", exitVal)
+        stderr.foreach { System.err.printf("stderr [%s]\n", _) }
+
+      (validTest, exitVal, stdout.reverse, stderr.reverse)
+    else
+      (false, -1, Nil, Nil)
+  }
+
+  def execCmd(command: String, options: String *): Seq[String] =
+    val cmd = (command :: options.toList).toSeq
+    for {
+      line <- Process(cmd).lazyLines_!
+    } yield line
+
+
+  def packBinDir = "dist/target/pack/bin"
+  def packLibDir = "dist/target/pack/lib"
+  def packBinScalaExists: Boolean = Files.exists(Paths.get(s"$packBinDir/scala"))
+
+  def listJars(dir: String): List[File] =
+    val packlibDir = Paths.get(dir).toFile
+    if packlibDir.isDirectory then
+      packlibDir.listFiles.toList.filter { _.getName.endsWith(".jar") }
+    else
+      Nil
+
+  // script output expected as "<tag>: <value>"
+  def findTaggedLine(tag: String, lines: Seq[String]): String =
+    lines.map { stripColors(_) }.find { _.startsWith(tag) } match
+      case None =>
+        lines.foreach { System.err.printf("line[%s]\n", _) }
+        sys.error(s"no $tag: found in script output")
+      case Some(cwd) => cwd.dropWhile( _ != ' ').trim // discard tag
+
+  def stripColors(line:String): String =
+    // ESC has be seen in the wild replaced by "\u2190"
+    // Also, BOM marker appears as 
+    lazy val colorsRegex = "(\u001b|\u2190)\\[[0-9;]*m|".r
+    colorsRegex.replaceAllIn(line,"")
+
+  def exec(cmd: String *): Seq[String] = Process(cmd).lazyLines_!.toList
+
+  def script2jar(scriptFile: File) = 
+    val jarName = s"${scriptFile.getName.dropExtension}.jar"
+    File(scriptFile.getParent, jarName)
+
+  def showScriptUnderTest(scriptFile: File): Unit =
+    printf("===> test script name [%s]\n", scriptFile.getName)
+
+  def callExecutableJar(script: File, jar: File, scriptArgs: Array[String] = Array.empty[String]) = {
+    import scala.sys.process._
+    val cmd = Array("java", s"-Dscript.path=${script.getName}", "-jar", jar.absPath)
+      ++ scriptArgs
+    Process(cmd).lazyLines_!.foreach { println }
+  }
+
+  ////////////////////////////////////////////////////////////////////////////////
+
+  def createArgsFile(): String =
+    val utfCharset = java.nio.charset.StandardCharsets.UTF_8.name
+    val path = Files.createTempFile("scriptingTest", ".args")
+    val text = s"-classpath ${workingDirectory.absPath}"
+    Files.write(path, text.getBytes(utfCharset))
+    path.toFile.getAbsolutePath.norm
+
+  def fixHome(s: String): String =
+    s.startsWith("~") match {
+      case false => s
+      case true => s.replaceFirst("~", userHome)
+    }
+
+  extension(s: String) {
+    def norm: String = s.replace('\\', '/') // bash expects forward slash
+    def noDrive = if s.secondChar == ":" then s.drop(2).norm else s.norm
+    def toPath: Path = Paths.get(fixHome(s)) // .toAbsolutePath
+    def toFile: File = File(s)
+    def absPath: String = s.toFile.absPath
+    def relpath: String = s.norm.replaceFirst(s"${cwd.norm}/","")
+    def isFile: Boolean = s.toFile.isFile
+    def isDirectory: Boolean = s.toFile.isDirectory
+    def exists: Boolean = s.toFile.exists
+    def name: String = s.toFile.getName
+    def getName: String = s.toFile.getName
+    def dropExtension: String = s.reverse.dropWhile(_ != '.').drop(1).reverse
+    def parent(up: Int): String = s.norm.split("/").reverse.drop(up).reverse.mkString("/")
+    def secondChar: String = s.take(2).drop(1).mkString("")
+  }
+
+  extension(p: Path) {
+    def norm: String = p.normalize.toString.replace('\\', '/')
+    def noDrive = p.norm match {
+      case str if str.drop(1).take(1) == ":" => str.drop(2)
+      case str => str
+    }
+    def name: String = p.toFile.getName
+    def relpath: Path = cwd.relativize(p).normalize
+    def files: Seq[File] = p.toFile.files
+    def parent: String = norm.replaceAll("/[^/]*$", "")
+
+    // convert to absolute path relative to cwd.
+    def absPath: String = if (p.isAbsolute) p.norm else Paths.get(userDir, p.norm).norm
+
+    def isDir: Boolean = Files.isDirectory(p)
+    def isDirectory: Boolean = p.toFile.isDirectory
+    def isFile: Boolean = p.toFile.isFile
+
+    def toUrl: String = Paths.get(absPath).toUri.toURL.toString
+
+    // Treat norm paths with a leading '/' as absolute (Windows java.io.File#isAbsolute treats them as relative)
+    def isAbsolute = p.norm.startsWith("/") || (isWin && p.norm.secondChar == ":")
+  }
+
+  extension(f: File) {
+    def name = f.getName
+    def norm: String = f.toPath.normalize.norm
+    def absPath: String = f.getAbsolutePath.norm
+    def relpath: Path = f.toPath.relpath
+    def files: Seq[File] = f.listFiles.toList
+    def parentDir: Path = f.toPath.getParent
+  }
+
+  lazy val cwd: Path = Paths.get(".").toAbsolutePath.normalize
+
+  lazy val (scalacPath: String, scalaPath: String) = {
+    val scalac = s"$workingDirectory/dist/target/pack/bin/scalac".toPath.normalize
+    val scala = s"$workingDirectory/dist/target/pack/bin/scala".toPath.normalize
+    (scalac.norm, scala.norm)
+  }
+    
+
+  // use optional TEST_BASH if defined, otherwise, bash must be in PATH
+
+  // envScalaHome is:
+  //    dist/target/pack, if present
+  //    else, SCALA_HOME if defined
+  //    else, not defined
+  lazy val envScalaHome =
+    printf("scalacPath: %s\n", scalacPath.norm)
+    if scalacPath.isFile then scalacPath.replaceAll("/bin/scalac", "")
+    else envOrElse("SCALA_HOME", "not-found").norm
+
+  lazy val javaParent: String = whichJava.parent(2)
+  lazy val envJavaHome: String = envOrElse("JAVA_HOME", javaParent)
+  lazy val cyghome = envOrElse("CYGWIN", "")
+  lazy val msyshome = envOrElse("MSYS", "")
+
+  // remove xtrace, if present, add :igncr: if not present
+  lazy val shellopts: String = {
+    val value: String = envOrElse("SHELLOPTS", "braceexpand:hashall:igncr:ignoreeof:monitor:vi")
+    val list: List[String] = value.split(":").toList
+    val minlist = list.filter {
+      case "igncr" | "xtrace" => false
+      case _ => true
+    }
+    if isWin then
+      "igncr" :: minlist
+    else
+      minlist
+  }.mkString(":")
+
+  lazy val testEnvPairs = {
+    val pairs = List(
+      ("JAVA_HOME", envJavaHome),
+      ("SCALA_HOME", envScalaHome),
+      ("PATH", adjustedPath),
+      ("CYGWIN", cyghome),
+      ("MSYS", msyshome),
+      ("SHELLOPTS", shellopts),
+    ).filter { case (name, valu) => valu.nonEmpty }
+    if verbose then for (k, v) <- pairs do printf("%s : %s\n", k ,v)
+    pairs
+  }
+
+  // if unable to execute bash commands, this prevents invalid tests from failing
+  lazy val passInvalidTests = envOrElse("PASS_INVALID_TESTS", "").nonEmpty
+
+  def verifyValid(validTest: Boolean): Boolean =
+      // !validTest implies unable to execute scripts via bash (e.g., permissions, or bash not found, etc.)
+    if !validTest && !passInvalidTests then
+      assert(validTest == true, s"unable to call script via bash -c")
+
+    validTest
+}
diff --git a/compiler/test/dotty/tools/scripting/ScriptingTests.scala b/compiler/test/dotty/tools/scripting/ScriptingTests.scala
index e7399c68f09a..7ddab2b55424 100644
--- a/compiler/test/dotty/tools/scripting/ScriptingTests.scala
+++ b/compiler/test/dotty/tools/scripting/ScriptingTests.scala
@@ -3,57 +3,23 @@ package tools
 package scripting
 
 import java.io.File
+import java.nio.file.Path
 
 import org.junit.Test
 
 import vulpix.TestConfiguration
-
+import ScriptTestEnv.*
 
 /** Runs all tests contained in `compiler/test-resources/scripting/` */
 class ScriptingTests:
-  extension (str: String) def dropExtension =
-    str.reverse.dropWhile(_ != '.').drop(1).reverse
-
-  extension(f: File) def absPath =
-    f.getAbsolutePath.replace('\\','/')
-
-  def testFiles = scripts("/scripting")
-
-  def script2jar(scriptFile: File) = 
-    val jarName = s"${scriptFile.getName.dropExtension}.jar"
-    File(scriptFile.getParent,jarName)
-
-  def showScriptUnderTest(scriptFile: File): Unit =
-    printf("===> test script name [%s]\n",scriptFile.getName)
-
-  val argss: Map[String, Array[String]] = (
-    for
-      argFile <- testFiles
-      if argFile.getName.endsWith(".args")
-      name = argFile.getName.dropExtension
-      scriptArgs = readLines(argFile).toArray
-    yield name -> scriptArgs).toMap
-
-  def scalaFilesWithArgs(extension: String) = (
-    for
-      scriptFile <- testFiles
-      if scriptFile.getName.endsWith(extension)
-      name = scriptFile.getName.dropExtension
-      scriptArgs = argss.getOrElse(name, Array.empty[String])
-    yield scriptFile -> scriptArgs).toList.sortBy { (file,args) => file.getName }
-
-  def callExecutableJar(script: File,jar: File, scriptArgs: Array[String] = Array.empty[String]) = {
-    import scala.sys.process._
-    val cmd = Array("java",s"-Dscript.path=${script.getName}","-jar",jar.absPath)
-      ++ scriptArgs
-    Process(cmd).lazyLines_!.foreach { println }
-  }
+  // classpath tests managed by scripting.ClasspathTests.scala
+  def testFiles = scripts("/scripting").filter { ! _.getName.toLowerCase.contains("classpath") }
 
   /*
    * Call .scala scripts without -save option, verify no jar created
    */
   @Test def scriptingDriverTests =
-    for (scriptFile,scriptArgs) <- scalaFilesWithArgs(".scala") do
+    for (scriptFile, scriptArgs) <- scalaFilesWithArgs(".scala") do
       showScriptUnderTest(scriptFile)
       val unexpectedJar = script2jar(scriptFile)
       unexpectedJar.delete
@@ -65,17 +31,17 @@ class ScriptingTests:
         ),
         scriptFile = scriptFile,
         scriptArgs = scriptArgs
-      ).compileAndRun { (path:java.nio.file.Path,classpath:String, mainClass:String) =>
-        printf("mainClass from ScriptingDriver: %s\n",mainClass)
+      ).compileAndRun { (path:java.nio.file.Path, classpathEntries:Seq[Path], mainClass:String) =>
+        printf("mainClass from ScriptingDriver: %s\n", mainClass)
         true // call compiled script main method
       }
-      assert(! unexpectedJar.exists, s"not expecting jar file: ${unexpectedJar.absPath}")
+      assert( !unexpectedJar.exists, s"not expecting jar file: ${unexpectedJar.absPath}" )
 
   /*
    * Call .sc scripts without -save option, verify no jar created
    */
   @Test def scriptingMainTests =
-    for (scriptFile,scriptArgs) <- scalaFilesWithArgs(".sc") do
+    for (scriptFile, scriptArgs) <- scalaFilesWithArgs(".sc") do
       showScriptUnderTest(scriptFile)
       val unexpectedJar = script2jar(scriptFile)
       unexpectedJar.delete
@@ -87,13 +53,13 @@ class ScriptingTests:
       ) ++ scriptArgs
 
       Main.main(mainArgs)
-      assert(! unexpectedJar.exists, s"not expecting jar file: ${unexpectedJar.absPath}")
+      assert( !unexpectedJar.exists, s"not expecting jar file: ${unexpectedJar.absPath}")
 
   /*
    * Call .sc scripts with -save option, verify jar is created.
    */
   @Test def scriptingJarTest =
-    for (scriptFile,scriptArgs) <- scalaFilesWithArgs(".sc") do
+    for (scriptFile, scriptArgs) <- scalaFilesWithArgs(".sc") do
       showScriptUnderTest(scriptFile)
       val expectedJar = script2jar(scriptFile)
       expectedJar.delete
@@ -107,7 +73,7 @@ class ScriptingTests:
 
       Main.main(mainArgs)
 
-      printf("===> test script jar name [%s]\n",expectedJar.getName)
+      printf("===> test script jar name [%s]\n", expectedJar.getName)
       assert(expectedJar.exists)
 
       callExecutableJar(scriptFile, expectedJar, scriptArgs)
@@ -123,13 +89,13 @@ class ScriptingTests:
     // verify main method not called when false is returned
     printf("testing script compile, with no call to script main method.\n")
     touchedFile.delete
-    assert(!touchedFile.exists, s"unable to delete ${touchedFile}")
+    assert( !touchedFile.exists, s"unable to delete ${touchedFile}" )
     ScriptingDriver(
       compilerArgs = Array("-classpath", TestConfiguration.basicClasspath),
       scriptFile = scriptFile,
       scriptArgs = Array.empty[String]
-    ).compileAndRun { (path:java.nio.file.Path,classpath:String, mainClass:String) =>
-      printf("success: no call to main method in mainClass: %s\n",mainClass)
+    ).compileAndRun { (path:java.nio.file.Path, classpathEntries:Seq[Path], mainClass:String) =>
+      printf("success: no call to main method in mainClass: %s\n", mainClass)
       false // no call to compiled script main method
     }
     touchedFile.delete
@@ -141,14 +107,14 @@ class ScriptingTests:
       compilerArgs = Array("-classpath", TestConfiguration.basicClasspath),
       scriptFile = scriptFile,
       scriptArgs = Array.empty[String]
-    ).compileAndRun { (path:java.nio.file.Path,classpath:String, mainClass:String) =>
-      printf("call main method in mainClass: %s\n",mainClass)
+    ).compileAndRun { (path:java.nio.file.Path, classpathEntries:Seq[Path], mainClass:String) =>
+      printf("call main method in mainClass: %s\n", mainClass)
       true // call compiled script main method, create touchedFile
     }
 
     if touchedFile.exists then
-      printf("success: script created file %s\n",touchedFile)
-    if touchedFile.exists then printf("success: created file %s\n",touchedFile)
+      printf("success: script created file %s\n", touchedFile)
+    if touchedFile.exists then printf("success: created file %s\n", touchedFile)
     assert( touchedFile.exists, s"expected to find file ${touchedFile}" )
    
   /*
@@ -168,16 +134,48 @@ class ScriptingTests:
 
     expectedJar.delete
     Main.main(mainArgs) // create executable jar
-    printf("===> test script jar name [%s]\n",expectedJar.getName)
-    assert(expectedJar.exists,s"unable to create executable jar [$expectedJar]")
+    printf("===> test script jar name [%s]\n", expectedJar.getName)
+    assert(expectedJar.exists, s"unable to create executable jar [$expectedJar]")
 
     touchedFile.delete
-    assert(!touchedFile.exists,s"unable to delete ${touchedFile}")
-    printf("calling executable jar %s\n",expectedJar)
+    assert( !touchedFile.exists, s"unable to delete ${touchedFile}" )
+    printf("calling executable jar %s\n", expectedJar)
     callExecutableJar(scriptFile, expectedJar)
     if touchedFile.exists then
-      printf("success: executable jar created file %s\n",touchedFile)
+      printf("success: executable jar created file %s\n", touchedFile)
     assert( touchedFile.exists, s"expected to find file ${touchedFile}" )
 
+///////////////////////////////////
   def touchFileScript = testFiles.find(_.getName == "touchFile.sc").get
+
   def touchedFile = File("touchedFile.out")
+
+  def script2jar(scriptFile: File) = 
+    val jarName = s"${scriptFile.getName.dropExtension}.jar"
+    File(scriptFile.getParent, jarName)
+
+  def showScriptUnderTest(scriptFile: File): Unit =
+    printf("===> test script name [%s]\n", scriptFile.getName)
+
+  def argss: Map[String, Array[String]] = (
+    for
+      argFile <- testFiles
+      if argFile.getName.endsWith(".args")
+      name = argFile.getName.dropExtension
+      scriptArgs = readLines(argFile).toArray
+    yield name -> scriptArgs).toMap
+
+  def scalaFilesWithArgs(extension: String) = (
+    for
+      scriptFile <- testFiles
+      if scriptFile.getName.endsWith(extension)
+      name = scriptFile.getName.dropExtension
+      scriptArgs = argss.getOrElse(name, Array.empty[String])
+    yield scriptFile -> scriptArgs).toList.sortBy { (file, args) => file.getName }
+
+  def callExecutableJar(script: File, jar: File, scriptArgs: Array[String] = Array.empty[String]) = {
+    import scala.sys.process._
+    val cmd = Array("java", s"-Dscript.path=${script.getName}", "-jar", jar.absPath)
+      ++ scriptArgs
+    Process(cmd).lazyLines_!.foreach { println }
+  }
diff --git a/compiler/test/dotty/tools/utils.scala b/compiler/test/dotty/tools/utils.scala
index b7023a577234..388715f45cc2 100644
--- a/compiler/test/dotty/tools/utils.scala
+++ b/compiler/test/dotty/tools/utils.scala
@@ -1,19 +1,69 @@
-package dotty.tools
+package dotty
+package tools
 
 import java.io.File
+import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets.UTF_8
+import java.nio.file.{Files, Path => JPath}
 
 import scala.io.Source
+import scala.jdk.StreamConverters._
+import scala.reflect.ClassTag
 import scala.util.Using.resource
+import scala.util.chaining.given
+import scala.util.control.{ControlThrowable, NonFatal}
 
 def scripts(path: String): Array[File] = {
   val dir = new File(getClass.getResource(path).getPath)
   assert(dir.exists && dir.isDirectory, "Couldn't load scripts dir")
-  dir.listFiles
+  dir.listFiles.filter { f =>
+    val path = if f.isDirectory then f.getPath + "/" else f.getPath
+    Properties.testsFilter.isEmpty || Properties.testsFilter.exists(path.contains)
+  }
 }
 
-private def withFile[T](file: File)(action: Source => T): T =
-  resource(Source.fromFile(file, UTF_8.name))(action)
+extension (f: File) def absPath =
+  f.getAbsolutePath.replace('\\', '/')
 
-def readLines(f: File): List[String] = withFile(f)(_.getLines.toList)
-def readFile(f: File): String = withFile(f)(_.mkString)
+extension (str: String) def dropExtension =
+  str.reverse.dropWhile(_ != '.').drop(1).reverse
+
+private
+def withFile[T](file: File)(action: Source => T): T = resource(Source.fromFile(file, UTF_8.name))(action)
+def readLines(f: File): List[String]                = withFile(f)(_.getLines.toList)
+def readFile(f: File): String                       = withFile(f)(_.mkString)
+
+private object Unthrown extends ControlThrowable
+
+def assertThrows[T <: Throwable: ClassTag](p: T => Boolean)(body: => Any): Unit =
+  try
+    body
+    throw Unthrown
+  catch
+    case Unthrown        => throw AssertionError("Expression did not throw!")
+    case e: T if p(e)    => ()
+    case failed: T       => throw AssertionError(s"Exception failed check: $failed").tap(_.addSuppressed(failed))
+    case NonFatal(other) => throw AssertionError(s"Wrong exception: expected ${implicitly[ClassTag[T]]} but was ${other.getClass.getName}").tap(_.addSuppressed(other))
+end assertThrows
+
+def toolArgsFor(files: List[JPath], charset: Charset = UTF_8): List[String] =
+  files.flatMap(path => toolArgsParse(resource(Files.lines(path, charset))(_.limit(10).toScala(List))))
+
+// Inspect the first 10 of the given lines for compiler options of the form
+// `// scalac: args`, `/* scalac: args`, ` * scalac: args`.
+// If args string ends in close comment, drop the `*` `/`.
+// If split, parse the args string as a command line.
+// (from scala.tools.partest.nest.Runner#toolArgsFor)
+def toolArgsParse(lines: List[String]): List[String] = {
+  val tag  = "scalac:"
+  val endc = "*" + "/"    // be forgiving of /* scalac: ... */
+  def stripped(s: String) = s.substring(s.indexOf(tag) + tag.length).stripSuffix(endc)
+  val args = lines.to(LazyList).take(10).filter { s =>
+       s.contains("//" + tag)
+    || s.contains("// " + tag)
+    || s.contains("/* " + tag)
+    || s.contains(" * " + tag)
+    // but avoid picking up comments like "% scalac ./a.scala" and "$ scalac a.scala"
+  }.map(stripped).headOption
+  args.map(dotc.config.CommandLineParser.tokenize).getOrElse(Nil)
+}
\ No newline at end of file
diff --git a/compiler/test/dotty/tools/vulpix/ChildJVMMain.java b/compiler/test/dotty/tools/vulpix/ChildJVMMain.java
index 65e40f3bbbac..a6873ead1968 100644
--- a/compiler/test/dotty/tools/vulpix/ChildJVMMain.java
+++ b/compiler/test/dotty/tools/vulpix/ChildJVMMain.java
@@ -14,7 +14,7 @@ public class ChildJVMMain {
 
     private static void runMain(String dir) throws Exception {
         Method meth = null;
-        Object[] args = new Object[]{ new String[]{ "jvm" } };
+        Object[] args = new Object[]{ new String[]{ } };
         try {
             String jcp = System.getProperty("java.class.path");
             String sep = File.pathSeparator;
diff --git a/compiler/test/dotty/tools/vulpix/FileDiff.scala b/compiler/test/dotty/tools/vulpix/FileDiff.scala
index af44dbf2076d..4cb68005ecb7 100644
--- a/compiler/test/dotty/tools/vulpix/FileDiff.scala
+++ b/compiler/test/dotty/tools/vulpix/FileDiff.scala
@@ -63,4 +63,24 @@ object FileDiff {
     }
   }
 
+  def checkAndDumpOrUpdate(sourceTitle: String, actualLines: Seq[String], checkFilePath: String): Boolean = {
+    val outFilePath = checkFilePath + ".out"
+    FileDiff.check(sourceTitle, actualLines, checkFilePath) match {
+      case Some(msg) if dotty.Properties.testsUpdateCheckfile =>
+        Files.deleteIfExists(Paths.get(outFilePath))
+        if actualLines.isEmpty
+          then Files.deleteIfExists(Paths.get(checkFilePath))
+          else FileDiff.dump(checkFilePath, actualLines)
+        println("Updated checkfile: " + checkFilePath)
+        true
+      case Some(msg) =>
+        FileDiff.dump(outFilePath, actualLines)
+        println(msg)
+        println(FileDiff.diffMessage(checkFilePath, outFilePath))
+        false
+      case _ =>
+        Files.deleteIfExists(Paths.get(outFilePath))
+        true
+    }
+  }
 }
diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
index 5855af9f5b04..bd30e7fff98e 100644
--- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
+++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -2,31 +2,33 @@ package dotty
 package tools
 package vulpix
 
-import java.io.{File => JFile, IOException}
+import java.io.{File => JFile, IOException, PrintStream, ByteArrayOutputStream}
 import java.lang.System.{lineSeparator => EOL}
+import java.net.URL
 import java.nio.file.StandardCopyOption.REPLACE_EXISTING
 import java.nio.file.{Files, NoSuchFileException, Path, Paths}
-import java.nio.charset.StandardCharsets
+import java.nio.charset.{Charset, StandardCharsets}
 import java.text.SimpleDateFormat
 import java.util.{HashMap, Timer, TimerTask}
 import java.util.concurrent.{TimeUnit, TimeoutException, Executors => JExecutors}
 
 import scala.collection.mutable
-import scala.io.Source
+import scala.io.{Codec, Source}
+import scala.jdk.CollectionConverters.*
 import scala.util.{Random, Try, Failure => TryFailure, Success => TrySuccess, Using}
 import scala.util.control.NonFatal
 import scala.util.matching.Regex
 import scala.collection.mutable.ListBuffer
 
 import dotc.{Compiler, Driver}
-import dotc.core.Contexts._
+import dotc.core.Contexts.*
 import dotc.decompiler
 import dotc.report
 import dotc.interfaces.Diagnostic.ERROR
 import dotc.reporting.{Reporter, TestReporter}
 import dotc.reporting.Diagnostic
 import dotc.config.Config
-import dotc.util.DiffUtil
+import dotc.util.{DiffUtil, SourceFile, SourcePosition, Spans, NoSourcePosition}
 import io.AbstractFile
 import dotty.tools.vulpix.TestConfiguration.defaultOptions
 
@@ -44,11 +46,11 @@ trait ParallelTesting extends RunnerOrchestration { self =>
    */
   def isInteractive: Boolean
 
-  /** A string which is used to filter which tests to run, if `None` will run
-   *  all tests. All absolute paths that contain the substring `testFilter`
+  /** A list of strings which is used to filter which tests to run, if `Nil` will run
+   *  all tests. All absolute paths that contain any of the substrings in `testFilter`
    *  will be run
    */
-  def testFilter: Option[String]
+  def testFilter: List[String]
 
   /** Tests should override the checkfiles with the current output */
   def updateCheckFiles: Boolean
@@ -127,10 +129,10 @@ trait ParallelTesting extends RunnerOrchestration { self =>
           }
           sb.toString + "\n\n"
         }
-        case self: SeparateCompilationSource => {
+        case self: SeparateCompilationSource => { // TODO: this won't work when using other versions of compiler
           val command = sb.toString
           val fsb = new StringBuilder(command)
-          self.compilationGroups.foreach { files =>
+          self.compilationGroups.foreach { (_, files) =>
             files.map(_.getPath).foreach { path =>
               fsb.append(delimiter)
               lineLen = 8
@@ -173,31 +175,28 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     flags: TestFlags,
     outDir: JFile
   ) extends TestSource {
-
-    /** Get the files grouped by `_X` as a list of groups, files missing this
-     *  suffix will be put into the same group.
-     *  Files in each group are sorted alphabetically.
-     *
-     *  Filters out all none source files
-     */
-    def compilationGroups: List[Array[JFile]] =
-      dir
-      .listFiles
-      .groupBy { file =>
-        val name = file.getName
-        Try {
-          val potentialNumber = name
-            .substring(0, name.lastIndexOf('.'))
-            .reverse.takeWhile(_ != '_').reverse
-
-          potentialNumber.toInt.toString
-        }
-        .toOption
-        .getOrElse("")
-      }
-      .toList.sortBy(_._1).map(_._2.filter(isSourceFile).sorted)
-
-    def sourceFiles: Array[JFile] = compilationGroups.flatten.toArray
+    case class Group(ordinal: Int, compiler: String, release: String)
+
+    lazy val compilationGroups: List[(Group, Array[JFile])] =
+      val Release = """r([\d\.]+)""".r
+      val Compiler = """c([\d\.]+)""".r
+      val Ordinal = """(\d+)""".r
+      def groupFor(file: JFile): Group =
+        val groupSuffix = file.getName.dropWhile(_ != '_').stripSuffix(".scala").stripSuffix(".java")
+        val groupSuffixParts = groupSuffix.split("_")
+        val ordinal = groupSuffixParts.collectFirst { case Ordinal(n) => n.toInt }.getOrElse(Int.MinValue)
+        val release = groupSuffixParts.collectFirst { case Release(r) => r }.getOrElse("")
+        val compiler = groupSuffixParts.collectFirst { case Compiler(c) => c }.getOrElse("")
+        Group(ordinal, compiler, release)
+
+      dir.listFiles
+        .filter(isSourceFile)
+        .groupBy(groupFor)
+        .toList
+        .sortBy { (g, _) => (g.ordinal, g.compiler, g.release) }
+        .map { (g, f) => (g, f.sorted) }
+
+    def sourceFiles = compilationGroups.map(_._2).flatten.toArray
   }
 
   private trait CompilationLogic { this: Test =>
@@ -216,7 +215,13 @@ trait ParallelTesting extends RunnerOrchestration { self =>
           List(reporter)
 
         case testSource @ SeparateCompilationSource(_, dir, flags, outDir) =>
-          testSource.compilationGroups.map(files => compile(files, flags, suppressErrors, outDir))  // TODO? only `compile` option?
+          testSource.compilationGroups.map { (group, files) =>
+            val flags1 = if group.release.isEmpty then flags else flags.and("-Yscala-release", group.release)
+            if group.compiler.isEmpty then
+              compile(files, flags1, suppressErrors, outDir)
+            else
+              compileWithOtherCompiler(group.compiler, files, flags1, outDir)
+          }
       })
 
     final def countErrorsAndWarnings(reporters: Seq[TestReporter]): (Int, Int) =
@@ -271,7 +276,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     /** This callback is executed once the compilation of this test source finished */
     private final def onComplete(testSource: TestSource, reportersOrCrash: Try[Seq[TestReporter]], logger: LoggedRunnable): Unit =
       reportersOrCrash match {
-        case TryFailure(exn) => onFailure(testSource, Nil, logger, Some(s"Fatal compiler crash when compiling: ${testSource.title}:\n${exn.getMessage}\n${exn.getStackTrace.mkString("\n")}"))
+        case TryFailure(exn) => onFailure(testSource, Nil, logger, Some(s"Fatal compiler crash when compiling: ${testSource.title}:\n${exn.getMessage}${exn.getStackTrace.map("\n\tat " + _).mkString}"))
         case TrySuccess(reporters) => maybeFailureMessage(testSource, reporters) match {
           case Some(msg) => onFailure(testSource, reporters, logger, Option(msg).filter(_.nonEmpty))
           case None => onSuccess(testSource, reporters, logger)
@@ -340,12 +345,12 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
     /** All testSources left after filtering out */
     private val filteredSources =
-      if (!testFilter.isDefined) testSources
+      if (testFilter.isEmpty) testSources
       else testSources.filter {
         case JointCompilationSource(_, files, _, _, _, _) =>
-          files.exists(file => file.getPath.contains(testFilter.get))
+          testFilter.exists(filter => files.exists(file => file.getPath.contains(filter)))
         case SeparateCompilationSource(_, dir, _, _) =>
-          dir.getPath.contains(testFilter.get)
+          testFilter.exists(dir.getPath.contains)
       }
 
     /** Total amount of test sources being compiled by this test */
@@ -441,15 +446,17 @@ trait ParallelTesting extends RunnerOrchestration { self =>
           throw e
 
     protected def compile(files0: Array[JFile], flags0: TestFlags, suppressErrors: Boolean, targetDir: JFile): TestReporter = {
-      val flags = flags0.and("-d", targetDir.getPath)
-        .withClasspath(targetDir.getPath)
-
       def flattenFiles(f: JFile): Array[JFile] =
         if (f.isDirectory) f.listFiles.flatMap(flattenFiles)
         else Array(f)
 
       val files: Array[JFile] = files0.flatMap(flattenFiles)
 
+      val flags = flags0
+        .and(toolArgsFor(files.toList.map(_.toPath), getCharsetFromEncodingOpt(flags0)): _*)
+        .and("-d", targetDir.getPath)
+        .withClasspath(targetDir.getPath)
+
       def compileWithJavac(fs: Array[String]) = if (fs.nonEmpty) {
         val fullArgs = Array(
           "javac",
@@ -500,6 +507,87 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       reporter
     }
 
+    private def parseErrors(errorsText: String, compilerVersion: String, pageWidth: Int) =
+      val errorPattern = """^.*Error: (.*\.scala):(\d+):(\d+).*""".r
+      val brokenClassPattern = """^class file (.*) is broken.*""".r
+      val warnPattern = """^.*Warning: (.*\.scala):(\d+):(\d+).*""".r
+      val summaryPattern = """\d+ (?:warning|error)s? found""".r
+      val indent = "    "
+      var diagnostics = List.empty[Diagnostic.Error]
+      def barLine(start: Boolean) = s"$indent${if start then "╭" else "╰"}${"┄" * pageWidth}${if start then "╮" else "╯"}\n"
+      def errorLine(line: String) = s"$indent┆${String.format(s"%-${pageWidth}s", stripAnsi(line))}┆\n"
+      def stripAnsi(str: String): String = str.replaceAll("\u001b\\[\\d+m", "")
+      def addToLast(str: String): Unit =
+        diagnostics match
+          case head :: tail =>
+            diagnostics = Diagnostic.Error(s"${head.msg.rawMessage}$str", head.pos) :: tail
+          case Nil =>
+      var inError = false
+      for line <- errorsText.linesIterator do
+        line match
+          case error @ warnPattern(filePath, line, column) =>
+            inError = false
+          case error @ errorPattern(filePath, line, column) =>
+            inError = true
+            val lineNum = line.toInt
+            val columnNum = column.toInt
+            val abstractFile = AbstractFile.getFile(filePath)
+            val sourceFile = SourceFile(abstractFile, Codec.UTF8)
+            val offset = sourceFile.lineToOffset(lineNum - 1) + columnNum - 1
+            val span = Spans.Span(offset)
+            val sourcePos = SourcePosition(sourceFile, span)
+            addToLast(barLine(start = false))
+            diagnostics ::= Diagnostic.Error(s"Compilation of $filePath with Scala $compilerVersion failed at line: $line, column: $column.\nFull error output:\n${barLine(start = true)}${errorLine(error)}", sourcePos)
+          case error @ brokenClassPattern(filePath) =>
+            inError = true
+            diagnostics ::= Diagnostic.Error(s"$error\nFull error output:\n${barLine(start = true)}${errorLine(error)}", NoSourcePosition)
+          case summaryPattern() => // Ignored
+          case line if inError => addToLast(errorLine(line))
+          case _ =>
+      addToLast(barLine(start = false))
+      diagnostics.reverse
+
+    protected def compileWithOtherCompiler(compiler: String, files: Array[JFile], flags: TestFlags, targetDir: JFile): TestReporter =
+      def artifactClasspath(organizationName: String, moduleName: String) =
+        import coursier._
+        val dep = Dependency(
+          Module(
+            Organization(organizationName),
+            ModuleName(moduleName),
+            attributes = Map.empty
+          ),
+          version = compiler
+        )
+        Fetch()
+          .addDependencies(dep)
+          .run()
+          .mkString(JFile.pathSeparator)
+
+      val stdlibClasspath = artifactClasspath("org.scala-lang", "scala3-library_3")
+      val scalacClasspath = artifactClasspath("org.scala-lang", "scala3-compiler_3")
+
+      val pageWidth = TestConfiguration.pageWidth - 20
+      val flags1 = flags.copy(defaultClassPath = stdlibClasspath)
+        .withClasspath(targetDir.getPath)
+        .and("-d", targetDir.getPath)
+        .and("-pagewidth", pageWidth.toString)
+
+      val scalacCommand = Array("java", "-cp", scalacClasspath, "dotty.tools.dotc.Main")
+      val command = scalacCommand ++ flags1.all ++ files.map(_.getAbsolutePath)
+      val process = Runtime.getRuntime.exec(command)
+
+      val reporter = TestReporter.reporter(realStdout, logLevel =
+        if (suppressErrors || suppressAllOutput) ERROR + 1 else ERROR)
+      val errorsText = Source.fromInputStream(process.getErrorStream).mkString
+      if process.waitFor() != 0 then
+        val diagnostics = parseErrors(errorsText, compiler, pageWidth)
+        diagnostics.foreach { diag =>
+          val context = (new ContextBase).initialCtx
+          reporter.report(diag)(using context)
+        }
+
+      reporter
+
     protected def compileFromTasty(flags0: TestFlags, suppressErrors: Boolean, targetDir: JFile): TestReporter = {
       val tastyOutput = new JFile(targetDir.getPath + "_from-tasty")
       tastyOutput.mkdir()
@@ -581,9 +669,9 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         else reportPassed()
       }
       else echo {
-        testFilter
-          .map(r => s"""No files matched "$r" in test""")
-          .getOrElse("No tests available under target - erroneous test?")
+        testFilter match
+          case _ :: _ => s"""No files matched "${testFilter.mkString(",")}" in test"""
+          case _      => "No tests available under target - erroneous test?"
       }
 
       this
@@ -663,17 +751,26 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       def compilerCrashed = reporters.exists(_.compilerCrashed)
       lazy val (errorMap, expectedErrors) = getErrorMapAndExpectedCount(testSource.sourceFiles.toIndexedSeq)
       lazy val actualErrors = reporters.foldLeft(0)(_ + _.errorCount)
-      def hasMissingAnnotations = getMissingExpectedErrors(errorMap, reporters.iterator.flatMap(_.errors))
+      lazy val (expected, unexpected) = getMissingExpectedErrors(errorMap, reporters.iterator.flatMap(_.errors))
+      def hasMissingAnnotations = expected.nonEmpty || unexpected.nonEmpty
       def showErrors = "-> following the errors:\n" +
-        reporters.flatMap(_.allErrors.map(e => e.pos.line.toString + ": " + e.message)).mkString(start = "at ", sep = "\n at ", end = "")
-
-      if (compilerCrashed) Some(s"Compiler crashed when compiling: ${testSource.title}")
-      else if (actualErrors == 0) Some(s"\nNo errors found when compiling neg test $testSource")
-      else if (expectedErrors == 0) Some(s"\nNo errors expected/defined in $testSource -- use // error or // nopos-error")
-      else if (expectedErrors != actualErrors) Some(s"\nWrong number of errors encountered when compiling $testSource\nexpected: $expectedErrors, actual: $actualErrors " + showErrors)
-      else if (hasMissingAnnotations) Some(s"\nErrors found on incorrect row numbers when compiling $testSource\n$showErrors")
-      else if (!errorMap.isEmpty) Some(s"\nExpected error(s) have {<error position>=<unreported error>}: $errorMap")
-      else None
+        reporters.flatMap(_.allErrors.sortBy(_.pos.line).map(e => s"${e.pos.line + 1}: ${e.message}")).mkString(" at ", "\n at ", "")
+
+      Option {
+        if compilerCrashed then s"Compiler crashed when compiling: ${testSource.title}"
+        else if actualErrors == 0 then s"\nNo errors found when compiling neg test $testSource"
+        else if expectedErrors == 0 then s"\nNo errors expected/defined in $testSource -- use // error or // nopos-error"
+        else if expectedErrors != actualErrors then
+          s"""|Wrong number of errors encountered when compiling $testSource
+              |expected: $expectedErrors, actual: $actualErrors
+              |${expected.mkString("Unfulfilled expectations:\n", "\n", "")}
+              |${unexpected.mkString("Unexpected errors:\n", "\n", "")}
+              |$showErrors
+              |""".stripMargin.trim.linesIterator.mkString("\n", "\n", "")
+        else if hasMissingAnnotations then s"\nErrors found on incorrect row numbers when compiling $testSource\n$showErrors"
+        else if !errorMap.isEmpty then s"\nExpected error(s) have {<error position>=<unreported error>}: $errorMap"
+        else null
+      }
     }
 
     override def onSuccess(testSource: TestSource, reporters: Seq[TestReporter], logger: LoggedRunnable): Unit =
@@ -688,72 +785,59 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     //
     // We collect these in a map `"file:row" -> numberOfErrors`, for
     // nopos errors we save them in `"file" -> numberOfNoPosErrors`
-    def getErrorMapAndExpectedCount(files: Seq[JFile]): (HashMap[String, Integer], Int) = {
+    def getErrorMapAndExpectedCount(files: Seq[JFile]): (HashMap[String, Integer], Int) =
+      val comment = raw"//( *)(nopos-|anypos-)?error".r
       val errorMap = new HashMap[String, Integer]()
       var expectedErrors = 0
+      def bump(key: String): Unit =
+        errorMap.get(key) match
+          case null => errorMap.put(key, 1)
+          case n => errorMap.put(key, n+1)
+        expectedErrors += 1
       files.filter(isSourceFile).foreach { file =>
         Using(Source.fromFile(file, StandardCharsets.UTF_8.name)) { source =>
           source.getLines.zipWithIndex.foreach { case (line, lineNbr) =>
-            val errors = line.toSeq.sliding("// error".length).count(_.unwrap == "// error")
-            if (errors > 0)
-              errorMap.put(s"${file.getPath}:$lineNbr", errors)
-
-            val noposErrors = line.toSeq.sliding("// nopos-error".length).count(_.unwrap == "// nopos-error")
-            if (noposErrors > 0) {
-              val nopos = errorMap.get("nopos")
-              val existing: Integer = if (nopos eq null) 0 else nopos
-              errorMap.put("nopos", noposErrors + existing)
-            }
-
-            val anyposErrors = line.toSeq.sliding("// anypos-error".length).count(_.unwrap == "// anypos-error")
-            if (anyposErrors > 0) {
-              val anypos = errorMap.get("anypos")
-              val existing: Integer = if (anypos eq null) 0 else anypos
-              errorMap.put("anypos", anyposErrors + existing)
-            }
-
-            val possibleTypos = List("//error" -> "// error", "//nopos-error" -> "// nopos-error", "//anypos-error" -> "// anypos-error")
-            for ((possibleTypo, expected) <- possibleTypos) {
-              if (line.contains(possibleTypo))
-                echo(s"Warning: Possible typo in error tag in file ${file.getCanonicalPath}:$lineNbr: found `$possibleTypo` but expected `$expected`")
+            comment.findAllMatchIn(line).foreach { m =>
+              m.group(2) match
+                case prefix if m.group(1).isEmpty =>
+                  val what = Option(prefix).getOrElse("")
+                  echo(s"Warning: ${file.getCanonicalPath}:${lineNbr}: found `//${what}error` but expected `// ${what}error`, skipping comment")
+                case "nopos-" => bump("nopos")
+                case "anypos-" => bump("anypos")
+                case _ => bump(s"${file.getPath}:${lineNbr+1}")
             }
-
-            expectedErrors += anyposErrors + noposErrors + errors
           }
         }.get
       }
-
       (errorMap, expectedErrors)
-    }
-
-    def getMissingExpectedErrors(errorMap: HashMap[String, Integer], reporterErrors: Iterator[Diagnostic]) = !reporterErrors.forall { error =>
-      val pos1 = error.pos.nonInlined
-      val key = if (pos1.exists) {
-        def toRelative(path: String): String =  // For some reason, absolute paths leak from the compiler itself...
-          path.split(JFile.separatorChar).dropWhile(_ != "tests").mkString(JFile.separator)
-        val fileName = toRelative(pos1.source.file.toString)
-        s"$fileName:${pos1.line}"
-
-      } else "nopos"
-
-      val errors = errorMap.get(key)
-
-      def missing = { echo(s"Error reported in ${pos1.source}, but no annotation found") ; false }
-
-      if (errors ne null) {
-        if (errors == 1) errorMap.remove(key)
-        else errorMap.put(key, errors - 1)
-        true
-      }
-      else if key == "nopos" then
-        missing
-      else
-        errorMap.get("anypos") match
-          case null  => missing
-          case 1     => errorMap.remove("anypos") ; true
-          case slack => if slack < 1 then missing
-                        else errorMap.put("anypos", slack - 1) ; true
-    }
+    end getErrorMapAndExpectedCount
+
+    // return unfulfilled expected errors and unexpected diagnostics
+    def getMissingExpectedErrors(errorMap: HashMap[String, Integer], reporterErrors: Iterator[Diagnostic]): (List[String], List[String]) =
+      val unexpected, unpositioned = ListBuffer.empty[String]
+      // For some reason, absolute paths leak from the compiler itself...
+      def relativize(path: String): String = path.split(JFile.separatorChar).dropWhile(_ != "tests").mkString(JFile.separator)
+      def seenAt(key: String): Boolean =
+        errorMap.get(key) match
+          case null => false
+          case 1 => errorMap.remove(key) ; true
+          case n => errorMap.put(key, n - 1) ; true
+      def sawDiagnostic(d: Diagnostic): Unit =
+        d.pos.nonInlined match
+          case srcpos if srcpos.exists =>
+            val key = s"${relativize(srcpos.source.file.toString)}:${srcpos.line + 1}"
+            if !seenAt(key) then unexpected += key
+          case srcpos =>
+            if !seenAt("nopos") then unpositioned += relativize(srcpos.source.file.toString)
+
+      reporterErrors.foreach(sawDiagnostic)
+
+      errorMap.get("anypos") match
+        case n if n == unexpected.size => errorMap.remove("anypos") ; unexpected.clear()
+        case _ =>
+
+      (errorMap.asScala.keys.toList, (unexpected ++ unpositioned).toList)
+    end getMissingExpectedErrors
   }
 
   private final class NoCrashTest(testSources: List[TestSource], times: Int, threadLimit: Option[Int], suppressAllOutput: Boolean)(implicit summaryReport: SummaryReporting)
@@ -978,7 +1062,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
           target.copy(dir = copyToDir(outDir, dir))
       }
 
-      val test = new RewriteTest(copiedTargets, checkFileMap, times, threadLimit, shouldFail || shouldSuppressOutput).executeTestSuite()
+      new RewriteTest(copiedTargets, checkFileMap, times, threadLimit, shouldFail || shouldSuppressOutput).executeTestSuite()
       this
     }
 
@@ -1227,14 +1311,14 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     val (dirs, files) = compilationTargets(sourceDir, fileFilter)
 
     val isPicklerTest = flags.options.contains("-Ytest-pickler")
-    def ignoreDir(dir: JFile): Boolean = {
+    def picklerDirFilter(source: SeparateCompilationSource): Boolean = {
       // Pickler tests stop after pickler not producing class/tasty files. The second part of the compilation
       // will not be able to compile due to the missing artifacts from the first part.
-      isPicklerTest && dir.listFiles().exists(file => file.getName.endsWith("_2.scala") || file.getName.endsWith("_2.java"))
+      !isPicklerTest || source.compilationGroups.length == 1
     }
     val targets =
       files.map(f => JointCompilationSource(testGroup.name, Array(f), flags, createOutputDirsForFile(f, sourceDir, outDir))) ++
-      dirs.collect { case dir if !ignoreDir(dir) => SeparateCompilationSource(testGroup.name, dir, flags, createOutputDirsForDir(dir, sourceDir, outDir)) }
+      dirs.map { dir => SeparateCompilationSource(testGroup.name, dir, flags, createOutputDirsForDir(dir, sourceDir, outDir)) }.filter(picklerDirFilter)
 
     // Create a CompilationTest and let the user decide whether to execute a pos or a neg test
     new CompilationTest(targets)
@@ -1269,10 +1353,9 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
     val (dirs, files) = compilationTargets(sourceDir, fromTastyFilter)
 
-    val filteredFiles = testFilter match {
-      case Some(str) => files.filter(_.getPath.contains(str))
-      case None => files
-    }
+    val filteredFiles = testFilter match
+      case _ :: _ => files.filter(f => testFilter.exists(f.getPath.contains))
+      case _      => Nil
 
     class JointCompilationSourceFromTasty(
        name: String,
@@ -1358,6 +1441,11 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     // Create a CompilationTest and let the user decide whether to execute a pos or a neg test
     new CompilationTest(targets)
   }
+
+  private def getCharsetFromEncodingOpt(flags: TestFlags) =
+    flags.options.sliding(2).collectFirst {
+      case Array("-encoding", encoding) => Charset.forName(encoding)
+    }.getOrElse(StandardCharsets.UTF_8)
 }
 
 object ParallelTesting {
@@ -1371,4 +1459,5 @@ object ParallelTesting {
 
   def isTastyFile(f: JFile): Boolean =
     f.getName.endsWith(".tasty")
+
 }
diff --git a/compiler/test/dotty/tools/vulpix/TestConfiguration.scala b/compiler/test/dotty/tools/vulpix/TestConfiguration.scala
index 8d1c9fa5cd86..b43dcbdd6046 100644
--- a/compiler/test/dotty/tools/vulpix/TestConfiguration.scala
+++ b/compiler/test/dotty/tools/vulpix/TestConfiguration.scala
@@ -6,8 +6,10 @@ import java.io.File
 
 object TestConfiguration {
 
+  val pageWidth = 120
+
   val noCheckOptions = Array(
-    "-pagewidth", "120",
+    "-pagewidth", pageWidth.toString,
     "-color:never",
     "-Xtarget", defaultTarget
   )
@@ -60,6 +62,7 @@ object TestConfiguration {
 
   val commonOptions = Array("-indent", "-language:postfixOps") ++ checkOptions ++ noCheckOptions ++ yCheckOptions
   val defaultOptions = TestFlags(basicClasspath, commonOptions)
+  val unindentOptions = TestFlags(basicClasspath, Array("-no-indent") ++ checkOptions ++ noCheckOptions ++ yCheckOptions)
   val withCompilerOptions =
     defaultOptions.withClasspath(withCompilerClasspath).withRunClasspath(withCompilerClasspath)
   lazy val withStagingOptions =
diff --git a/compiler/test/dotty/tools/vulpix/VulpixMetaTests.scala b/compiler/test/dotty/tools/vulpix/VulpixMetaTests.scala
index befb4701f371..75af0aa94893 100644
--- a/compiler/test/dotty/tools/vulpix/VulpixMetaTests.scala
+++ b/compiler/test/dotty/tools/vulpix/VulpixMetaTests.scala
@@ -28,7 +28,7 @@ object VulpixMetaTests extends ParallelTesting {
   def numberOfSlaves = 1
   def safeMode = false // Don't fork a new VM after each run test
   def isInteractive = false // Don't beautify output for interactive use.
-  def testFilter = None // Run all the tests.
+  def testFilter = Nil // Run all the tests.
   def updateCheckFiles: Boolean = false
 
   @AfterClass
diff --git a/compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala b/compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala
index cdbd55af61d4..432bb64bc1cf 100644
--- a/compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala
+++ b/compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala
@@ -104,7 +104,7 @@ object VulpixUnitTests extends ParallelTesting {
   def numberOfSlaves = 5
   def safeMode = sys.env.get("SAFEMODE").isDefined
   def isInteractive = !sys.env.contains("DRONE")
-  def testFilter = None
+  def testFilter = Nil
   def updateCheckFiles: Boolean = false
 
   @AfterClass
diff --git a/dist/bin/common b/dist/bin/common
index fd7b8be9149e..e3e4253938fb 100755
--- a/dist/bin/common
+++ b/dist/bin/common
@@ -54,15 +54,15 @@ case "`uname`" in
 esac
 
 unset CYGPATHCMD
-if [[ $cygwin || $mingw || $msys ]]; then
+if [[ ${cygwin-} || ${mingw-} || ${msys-} ]]; then
   # ConEmu terminal is incompatible with jna-5.*.jar
-  [[ ($CONEMUANSI || $ConEmuANSI) ]] && conemu=true
+  [[ (${CONEMUANSI-} || ${ConEmuANSI-}) ]] && conemu=true
   # cygpath is used by various windows shells: cygwin, git-sdk, gitbash, msys, etc.
   CYGPATHCMD=`which cygpath 2>/dev/null`
   case "$TERM" in
     rxvt* | xterm* | cygwin*)
       stty -icanon min 1 -echo
-      SCALA_OPTS="$SCALA_OPTS -Djline.terminal=unix"
+      JAVA_OPTS="$JAVA_OPTS -Djline.terminal=unix"
     ;;
   esac
 fi
@@ -111,14 +111,14 @@ CLASSPATH_SUFFIX=""
 PSEP=":"
 
 # translate paths to Windows-mixed format before running java
-if [ -n "$CYGPATHCMD" ]; then
-  [ -n "$PROG_HOME" ] &&
+if [ -n "${CYGPATHCMD-}" ]; then
+  [ -n "${PROG_HOME-}" ] &&
     PROG_HOME=`"$CYGPATHCMD" -am "$PROG_HOME"`
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME=`"$CYGPATHCMD" -am "$JAVA_HOME"`
   CLASSPATH_SUFFIX=";"
   PSEP=";"
-elif [[ $mingw || $msys ]]; then
+elif [[ ${mingw-} || ${msys-} ]]; then
   # For Mingw / Msys, convert paths from UNIX format before anything is touched
   [ -n "$PROG_HOME" ] &&
     PROG_HOME="`(cd "$PROG_HOME"; pwd -W | sed 's|/|\\\\|g')`"
@@ -133,14 +133,18 @@ fi
 # *-------------------------------------------------*/
 
 find_lib () {
-  local lib=$(find $PROG_HOME/lib/ -name "$1")
-  if [ -n "$CYGPATHCMD" ]; then
-    "$CYGPATHCMD" -am $lib
-  elif [[ $mingw ||  $msys ]]; then
-    echo $lib | sed 's|/|\\\\|g'
-  else
-    echo $lib
-  fi
+  for lib in "$PROG_HOME"/lib/$1 ; do
+    if [[ -f "$lib" ]]; then
+      if [ -n "$CYGPATHCMD" ]; then
+        "$CYGPATHCMD" -am "$lib"
+      elif [[ $mingw ||  $msys ]]; then
+        echo "$lib" | sed 's|/|\\\\|g'
+      else
+        echo "$lib"
+      fi
+      return
+    fi
+  done
 }
 
 DOTTY_COMP=$(find_lib "*scala3-compiler*")
@@ -155,8 +159,65 @@ SBT_INTF=$(find_lib "*compiler-interface*")
 JLINE_READER=$(find_lib "*jline-reader-3*")
 JLINE_TERMINAL=$(find_lib "*jline-terminal-3*")
 JLINE_TERMINAL_JNA=$(find_lib "*jline-terminal-jna-3*")
-[[ $conemu ]] || JNA=$(find_lib "*jna-5*")
 
-# debug
+# jna-5 only appropriate for some combinations
+[[ ${conemu-} && ${msys-} ]] || JNA=$(find_lib "*jna-5*")
+
+compilerJavaClasspathArgs () {
+  # echo "dotty-compiler: $DOTTY_COMP"
+  # echo "dotty-interface: $DOTTY_INTF"
+  # echo "dotty-library: $DOTTY_LIB"
+  # echo "tasty-core: $TASTY_CORE"
+  # echo "scala-asm: $SCALA_ASM"
+  # echo "scala-lib: $SCALA_LIB"
+  # echo "sbt-intface: $SBT_INTF"
+
+  toolchain=""
+  toolchain+="$SCALA_LIB$PSEP"
+  toolchain+="$DOTTY_LIB$PSEP"
+  toolchain+="$SCALA_ASM$PSEP"
+  toolchain+="$SBT_INTF$PSEP"
+  toolchain+="$DOTTY_INTF$PSEP"
+  toolchain+="$DOTTY_COMP$PSEP"
+  toolchain+="$TASTY_CORE$PSEP"
+  toolchain+="$DOTTY_STAGING$PSEP"
+  toolchain+="$DOTTY_TASTY_INSPECTOR$PSEP"
+
+  # jine
+  toolchain+="$JLINE_READER$PSEP"
+  toolchain+="$JLINE_TERMINAL$PSEP"
+  toolchain+="$JLINE_TERMINAL_JNA$PSEP"
+  [ -n "${JNA-}" ] && toolchain+="$JNA$PSEP"
+
+  if [ -n "${jvm_cp_args-}" ]; then
+    jvm_cp_args="$toolchain$jvm_cp_args"
+  else
+    jvm_cp_args="$toolchain$PSEP"
+  fi
+}
+
+default_java_opts="-Xmx768m -Xms768m"
+
+CompilerMain=dotty.tools.dotc.Main
+DecompilerMain=dotty.tools.dotc.decompiler.Main
+TastyPrinterMain=dotty.tools.dotc.core.tasty.TastyPrinter
+ReplMain=dotty.tools.repl.Main
+ScriptingMain=dotty.tools.scripting.Main
 
-DEBUG_STR=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005
+declare -a java_args
+declare -a scala_args
+declare -a residual_args
+declare -a script_args
+
+addJava () {
+  java_args+=("'$1'")
+}
+addScala () {
+  scala_args+=("'$1'")
+}
+addResidual () {
+  residual_args+=("'$1'")
+}
+addScript () {
+  script_args+=("'$1'")
+}
diff --git a/dist/bin/common.bat b/dist/bin/common.bat
new file mode 100644
index 000000000000..0ffaed18652c
--- /dev/null
+++ b/dist/bin/common.bat
@@ -0,0 +1,54 @@
+@rem #########################################################################
+@rem ## Code common to scalac.bat, scaladoc.bat and scala.bat
+
+if defined JAVACMD (
+    set "_JAVACMD=%JAVACMD%"
+) else if defined JAVA_HOME (
+    set "_JAVACMD=%JAVA_HOME%\bin\java.exe"
+) else if defined JDK_HOME (
+    set "_JAVACMD=%JDK_HOME%\bin\java.exe"
+) else (
+    where /q java.exe
+    if !ERRORLEVEL!==0 (
+        set __JAVA_BIN_DIR=
+        for /f "delims=" %%i in ('where /f java.exe') do (
+            set "__PATH=%%~dpi"
+            @rem we take first occurence and ignore Oracle path for java executable
+            if not defined __JAVA_BIN_DIR if "!__PATH!"=="!__PATH:javapath=!" set "__JAVA_BIN_DIR=!__PATH!"
+        )
+        if defined __JAVA_BIN_DIR set "_JAVACMD=!__JAVA_BIN_DIR!\java.exe"
+    )
+    if not defined _JAVACMD (
+        set "__PATH=%ProgramFiles%\Java"
+        for /f %%f in ('dir /ad /b "!__PATH!\jre*" 2^>NUL') do set "_JAVA_HOME=!__PATH!\%%f"
+        if not defined _JAVA_HOME (
+           set __PATH=C:\opt
+           for /f %%f in ('dir /ad /b "!__PATH!\jdk*" 2^>NUL') do set "_JAVA_HOME=!__PATH!\%%f\jre"
+        )
+        if defined _JAVA_HOME set "_JAVACMD=!_JAVA_HOME!\bin\java.exe"
+    )
+)
+if not exist "%_JAVACMD%" (
+   echo Error: Java executable not found ^(!_JAVACMD!^) 1>&2
+   set _EXITCODE=1
+   goto :eof
+)
+
+if not defined _PROG_HOME set "_PROG_HOME=%~dp0"
+for /f "delims=" %%f in ("%_PROG_HOME%\.") do set "_LIB_DIR=%%~dpflib"
+
+set _PSEP=;
+
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-compiler*"')        do set "_SCALA3_COMP=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-interfaces*"')      do set "_SCALA3_INTF=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-library*"')         do set "_SCALA3_LIB=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-staging*"')         do set "_SCALA3_STAGING=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-tasty-inspector*"') do set "_SCALA3_TASTY_INSPECTOR=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*tasty-core*"')             do set "_TASTY_CORE=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala-asm*"')              do set "_SCALA_ASM=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala-library*"')          do set "_SCALA_LIB=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*compiler-interface*"')     do set "_SBT_INTF=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-reader-3*"')         do set "_JLINE_READER=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-3*"')       do set "_JLINE_TERMINAL=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-jna-3*"')   do set "_JLINE_TERMINAL_JNA=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jna-5*"')                  do set "_JNA=%_LIB_DIR%\%%f"
diff --git a/dist/bin/scala b/dist/bin/scala
index bfcd30c14cd0..b3116b2706b3 100755
--- a/dist/bin/scala
+++ b/dist/bin/scala
@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 
 # Try to autodetect real location of the script
-
-if [ -z "$PROG_HOME" ] ; then
+if [ -z "${PROG_HOME-}" ] ; then
   ## resolve links - $0 may be a link to PROG_HOME
   PRG="$0"
 
@@ -27,141 +26,47 @@ if [ -z "$PROG_HOME" ] ; then
   cd "$saveddir"
 fi
 
-addJvmOptions () {
-  jvm_options+=("'$1'")
-}
-
-addScalacOptions () {
-  java_options+=("'$1'")
-}
-
 source "$PROG_HOME/bin/common"
 
-declare -a residual_args
-declare -a script_args
-execute_repl=false
-execute_run=false
-execute_script=false
-with_compiler=false
-class_path_count=0
-CLASS_PATH=""
-save_compiled=false
-
-# Little hack to check if all arguments are options
-all_params="$*"
-truncated_params="${*#-}"
-# options_indicator != 0 if at least one parameter is not an option
-options_indicator=$(( ${#all_params} - ${#truncated_params} - $# ))
-
-[ -n "$SCALA_OPTS" ] && set -- $SCALA_OPTS "$@"
-
 while [[ $# -gt 0 ]]; do
   case "$1" in
-    -repl)
-      execute_repl=true
-      shift
-      ;;
-    -run)
-      execute_run=true
-      shift
-      ;;
-    -cp | -classpath)
-      CLASS_PATH="$2"
-      class_path_count+=1
-      shift
-      shift
-      ;;
-    -with-compiler)
-      with_compiler=true
-      shift
-      ;;
-    @*|-color:*)
-      addScalacOptions "${1}"
+    -D*)
+      # pass to scala as well: otherwise we lose it sometimes when we
+      # need it, e.g. communicating with a server compiler.
+      addJava "$1"
+      addScala "$1"
+      # respect user-supplied -Dscala.usejavacp
       shift
       ;;
-    -save|-savecompiled)
-      save_compiled=true
-      scala_script_options+=("$1")
-      shift
-      ;;
-    -compile-only)
-      scala_script_options+=("$1")
-      shift
-      ;;
-    -d)
-      DEBUG="$DEBUG_STR"
-      shift
-      ;;
-    -version)
-      # defer to scalac, then exit
-      addScalacOptions "${1}"
+    -J*)
+      # as with -D, pass to scala even though it will almost
+      # never be used.
+      addJava "${1:2}"
+      addScala "$1"
       shift
-      eval "\"$PROG_HOME/bin/scalac\" ${cp_arg-} ${java_options[@]}"
-      scala_exit_status=$?
-      onExit
       ;;
-    -J*)
-      addJvmOptions "${1:2}"
-      addScalacOptions "${1}"
-      shift ;;
-    *)
-      if [ $execute_script == false ]; then
-        # is a script if extension .scala or .sc or if has scala hash bang
-        if [[ -e "$1" && ("$1" == *.scala || "$1" == *.sc || -f "$1" && `head -n 1 -- "$1" | grep '#!.*scala'`) ]]; then
-          execute_script=true
-          target_script="$1"
-        else
-          residual_args+=("$1")
-        fi
+    -classpath*)
+      if [ "$1" != "${1##* }" ]; then
+        # hashbang-combined args "-classpath 'lib/*'"
+        A=$1 ; shift # consume $1 before adding its substrings back
+        set -- $A "$@" # split $1 on whitespace and put it back
       else
-        script_args+=("$1")
+        addScala "$1"
+        shift
       fi
+      ;;
+    *)
+      addScala "$1"
       shift
       ;;
-
   esac
 done
 
-if [ $execute_script == true ]; then
-  [ -n "${script_trace-}" ] && set -x
-  if [ "$CLASS_PATH" ]; then
-    cp_arg="-classpath \"$CLASS_PATH\""
-  fi
-  java_options+=(${scala_script_options})
-  setScriptName="-Dscript.path=$target_script"
-  target_jar="${target_script%.*}.jar"
-  if [[ $save_compiled == true && "$target_jar" -nt "$target_script" ]]; then
-    eval "\"$JAVACMD\"" $setScriptName -jar "$target_jar" "${script_args[@]}"
-    scala_exit_status=$?
-  else
-    [[ $save_compiled == true ]] && rm -f $target_jar
-    residual_args+=($setScriptName)
-    eval "\"$PROG_HOME/bin/scalac\" ${cp_arg-} ${java_options[@]} ${residual_args[@]} -script $target_script ${script_args[@]}"
-    scala_exit_status=$?
-  fi
-elif [ $execute_repl == true ] || ([ $execute_run == false ] && [ $options_indicator == 0 ]); then
-  if [ "$CLASS_PATH" ]; then
-    cp_arg="-classpath \"$CLASS_PATH\""
-  fi
-  eval "\"$PROG_HOME/bin/scalac\" ${cp_arg-} ${java_options[@]} -repl ${residual_args[@]}"
-  scala_exit_status=$?
-elif [ $execute_repl == true ] || [ ${#residual_args[@]} -ne 0 ]; then
-  cp_arg="$DOTTY_LIB$PSEP$SCALA_LIB"
-  if [ -z "$CLASS_PATH" ]; then
-    cp_arg+="$PSEP."
-  else
-    cp_arg+="$PSEP$CLASS_PATH"
-  fi
-  if [ "$class_path_count" -gt 1 ]; then
-    echo "warning: multiple classpaths are found, scala only use the last one."
-  fi
-  if [ $with_compiler == true ]; then
-    cp_arg+="$PSEP$DOTTY_COMP$PSEP$TASTY_CORE$PSEP$DOTTY_INTF$PSEP$SCALA_ASM$PSEP$DOTTY_STAGING$PSEP$DOTTY_TASTY_INSPECTOR"
-  fi
-  # exec here would prevent onExit from being called, leaving terminal in unusable state
-  eval "\"$JAVACMD\"" "$DEBUG"  "-classpath \"$cp_arg\"" "${jvm_options[@]}" "${residual_args[@]}"
-  scala_exit_status=$?
-else
-  echo "warning: command option is not correct."
-fi
+# exec here would prevent onExit from being called, leaving terminal in unusable state
+compilerJavaClasspathArgs
+[ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405
+eval "\"$JAVACMD\"" "${java_args[@]}" "-Dscala.home=$PROG_HOME" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${scala_args[@]}"
+scala_exit_status=$?
+
+
 onExit
diff --git a/dist/bin/scala.bat b/dist/bin/scala.bat
new file mode 100644
index 000000000000..edf7bfc5a1c2
--- /dev/null
+++ b/dist/bin/scala.bat
@@ -0,0 +1,121 @@
+@echo off
+setlocal enabledelayedexpansion
+
+@rem #########################################################################
+@rem ## Environment setup
+
+set _EXITCODE=0
+
+set "_PROG_HOME=%~dp0"
+
+call "%_PROG_HOME%\common.bat"
+if not %_EXITCODE%==0 goto end
+
+call :args %*
+
+@rem #########################################################################
+@rem ## Main
+
+set _CASE_REPL=0
+if %_EXECUTE_REPL%==1 set _CASE_REPL=1
+if %_EXECUTE_RUN%==0 if %_OPTIONS_INDICATOR%==0 set _CASE_REPL=1
+
+set _CASE_EXEC=0
+if %_EXECUTE_REPL%==1 set _CASE_EXEC=1
+if defined _RESIDUAL_ARGS set _CASE_EXEC=1
+
+if %_EXECUTE_SCRIPT%==1 (
+    set _SCALAC_ARGS=
+    if defined _CLASS_PATH set _SCALAC_ARGS=-classpath "%_CLASS_PATH%"
+    set _RESIDUAL_ARGS=!_RESIDUAL_ARGS! "-Dscript.path=%_TARGET_SCRIPT%" 
+    set _SCALAC_ARGS=!_SCALAC_ARGS! %_JAVA_OPTS% !_RESIDUAL_ARGS! -script "%_TARGET_SCRIPT%" %_SCRIPT_ARGS%
+    call "%_PROG_HOME%\scalac.bat" !_SCALAC_ARGS!
+    if not !ERRORLEVEL!==0 ( set _EXITCODE=1& goto end )
+@rem if [ $execute_repl == true ] || ([ $execute_run == false ] && [ $options_indicator == 0 ]); then
+) else if %_CASE_REPL%==1 (
+    set _SCALAC_ARGS=
+    if defined _CLASS_PATH set _SCALAC_ARGS=-classpath "%_CLASS_PATH%"
+    set _SCALAC_ARGS=!_SCALAC_ARGS! %_JAVA_OPTS% -repl %_RESIDUAL_ARGS%
+    call "%_PROG_HOME%\scalac.bat" !_SCALAC_ARGS!
+    if not !ERRORLEVEL!==0 ( set _EXITCODE=1& goto end )
+@rem elif [ $execute_repl == true ] || [ ${#residual_args[@]} -ne 0 ]; then
+) else if %_CASE_EXEC%==1 (
+    set "_CP_ARG=%_SCALA3_LIB%%_PSEP%%_SCALA_LIB%"
+    if defined _CLASS_PATH ( set "_CP_ARG=!_CP_ARG!%_PSEP%%_CLASS_PATH%"
+    ) else ( set "_CP_ARG=!_CP_ARG!%_PSEP%."
+    )
+    if %_CLASS_PATH_COUNT% gtr 1 (
+        echo Warning: Multiple classpaths are found, scala only use the last one. 1>&2
+    )
+    if %_WITH_COMPILER%==1 (
+        set "_CP_ARG=!_CP_ARG!%_PSEP%%_SCALA3_COMP%%_PSEP%%_TASTY_CORE%%_PSEP%%_SCALA3_INTF%%_PSEP%%_SCALA_ASM%%_PSEP%%_SCALA3_STAGING%%_PSEP%%_SCALA3_TASTY_INSPECTOR%"
+    )
+    set _JAVA_ARGS=-classpath "!_CP_ARG!" %_JVM_OPTS% %_RESIDUAL_ARGS%
+    call "%_JAVACMD%" !_JAVA_ARGS!
+    if not !ERRORLEVEL!==0 ( set _EXITCODE=1& goto end )
+) else (
+    echo Warning: Command option is not correct. 1>&2
+)
+
+goto end
+
+@rem #########################################################################
+@rem ## Subroutines
+
+:args
+set _RESIDUAL_ARGS=
+set _SCRIPT_ARGS=
+set _EXECUTE_REPL=0
+set _EXECUTE_RUN=0
+set _EXECUTE_SCRIPT=0
+set _TARGET_SCRIPT=
+set _WITH_COMPILER=0
+set _CLASS_PATH_COUNT=0
+set _CLASS_PATH=
+set _JVM_OPTS=
+set _JAVA_OPTS=
+set _OPTIONS_INDICATOR=0
+
+:args_loop
+if "%~1"=="" goto args_done
+set "__ARG=%~1"
+if "%__ARG%"=="-repl" (
+    set _EXECUTE_REPL=1
+) else if "%__ARG%"=="-run" (
+    set _EXECUTE_RUN=1
+) else if "%__ARG%"=="-classpath" (
+    set "_CLASS_PATH=%~2"
+    set /a _CLASS_PATH_COUNT+=1
+    shift
+) else if "%__ARG%"=="-cp" (
+    set "_CLASS_PATH=%~2"
+    set /a _CLASS_PATH_COUNT+=1
+    shift
+) else if "%__ARG%"=="-with-compiler" (
+    set _WITH_COMPILER=1
+) else if "%__ARG:~0,2%"=="-J" (
+    set _JVM_OPTS=!_JVM_OPTS! %__ARG:~2%
+    set _JAVA_OPTS=!_JAVA_OPTS! %__ARG%
+) else (
+    @rem _OPTIONS_INDICATOR != 0 if at least one parameter is not an option
+    if not "%__ARG:~0,1%"=="-" set /a _OPTIONS_INDICATOR+=1
+    if %_EXECUTE_SCRIPT%==1 (
+        set _SCRIPT_ARGS=%_SCRIPT_ARGS% %__ARG%
+    ) else if "%__ARG:~-6%"==".scala" (
+        set _EXECUTE_SCRIPT=1
+        set "_TARGET_SCRIPT=%__ARG%"
+    ) else (
+        set _RESIDUAL_ARGS=%_RESIDUAL_ARGS% %__ARG%
+    )
+)
+shift
+goto args_loop
+:args_done
+goto :eof
+
+@rem #########################################################################
+@rem ## Cleanups
+
+:end
+exit /b %_EXITCODE%
+endlocal
diff --git a/dist/bin/scalac b/dist/bin/scalac
old mode 100755
new mode 100644
index 7d56ac197cc5..6ebf0fe70ea8
--- a/dist/bin/scalac
+++ b/dist/bin/scalac
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-if [ -z "$PROG_HOME" ] ; then
+# Try to autodetect real location of the script
+if [ -z "${PROG_HOME-}" ] ; then
   ## resolve links - $0 may be a link to PROG_HOME
   PRG="$0"
 
@@ -27,73 +28,24 @@ fi
 
 source "$PROG_HOME/bin/common"
 
-default_java_opts="-Xmx768m -Xms768m"
-withCompiler=true
+[ -z "$PROG_NAME" ] && PROG_NAME=$CompilerMain
 
-CompilerMain=dotty.tools.dotc.Main
-DecompilerMain=dotty.tools.dotc.decompiler.Main
-ReplMain=dotty.tools.repl.Main
-ScriptingMain=dotty.tools.scripting.Main
-
-PROG_NAME=$CompilerMain
-
-addJava () {
-  java_args+=("'$1'")
-}
-addScala () {
-  scala_args+=("'$1'")
-}
-addResidual () {
-  residual_args+=("'$1'")
-}
-addScripting () {
-  scripting_args+=("'$1'")
-}
-
-classpathArgs () {
-  # echo "dotty-compiler: $DOTTY_COMP"
-  # echo "dotty-interface: $DOTTY_INTF"
-  # echo "dotty-library: $DOTTY_LIB"
-  # echo "tasty-core: $TASTY_CORE"
-  # echo "scala-asm: $SCALA_ASM"
-  # echo "scala-lib: $SCALA_LIB"
-  # echo "sbt-intface: $SBT_INTF"
-
-  toolchain=""
-  toolchain+="$SCALA_LIB$PSEP"
-  toolchain+="$DOTTY_LIB$PSEP"
-  toolchain+="$SCALA_ASM$PSEP"
-  toolchain+="$SBT_INTF$PSEP"
-  toolchain+="$DOTTY_INTF$PSEP"
-  toolchain+="$DOTTY_COMP$PSEP"
-  toolchain+="$TASTY_CORE$PSEP"
-  toolchain+="$DOTTY_STAGING$PSEP"
-  toolchain+="$DOTTY_TASTY_INSPECTOR$PSEP"
-
-  # jine
-  toolchain+="$JLINE_READER$PSEP"
-  toolchain+="$JLINE_TERMINAL$PSEP"
-  toolchain+="$JLINE_TERMINAL_JNA$PSEP"
-  toolchain+="$JNA$PSEP"
-
-  jvm_cp_args="-classpath \"$toolchain\""
-}
+withCompiler=true
 
 while [[ $# -gt 0 ]]; do
 case "$1" in
            --) shift; for arg; do addResidual "$arg"; done; set -- ;;
   -v|-verbose) verbose=true && addScala "-verbose" && shift ;;
-       -debug) DEBUG="$DEBUG_STR" && shift ;;
     -q|-quiet) quiet=true && shift ;;
 
     # Optimize for short-running applications, see https://github.com/lampepfl/dotty/issues/222
     -Oshort) addJava "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" && shift ;;
         -repl) PROG_NAME="$ReplMain" && shift ;;
       -script) PROG_NAME="$ScriptingMain" && target_script="$2" && shift && shift
-               while [[ $# -gt 0 ]]; do addScripting "$1" && shift ; done ;;
+               while [[ $# -gt 0 ]]; do addScript "$1" && shift ; done ;;
      -compile) PROG_NAME="$CompilerMain" && shift ;;
    -decompile) PROG_NAME="$DecompilerMain" && shift ;;
- -print-tasty) PROG_NAME="$DecompilerMain" && addScala "-print-tasty" && shift ;;
+ -print-tasty) PROG_NAME="$TastyPrinterMain" && shift ;;
          -run) PROG_NAME="$ReplMain" && shift ;;
       -colors) colors=true && shift ;;
    -no-colors) unset colors && shift ;;
@@ -108,21 +60,26 @@ case "$1" in
   esac
 done
 
-classpathArgs
+compilerJavaClasspathArgs
 
 if [ "$PROG_NAME" == "$ScriptingMain" ]; then
-  scripting_string="-script $target_script ${scripting_args[@]}"
+  setScriptName="-Dscript.path=$target_script"
+  scripting_string="-script $target_script ${script_args[@]}"
 fi
 
+[ -n "$script_trace" ] && set -x
+[ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405
+
+# exec here would prevent onExit from being called, leaving terminal in unusable state
 eval "\"$JAVACMD\"" \
-     ${JAVA_OPTS:-$default_java_opts} \
-     "${DEBUG-}" \
-     "${java_args[@]}" \
-     "$jvm_cp_args" \
-     -Dscala.usejavacp=true \
-     "$PROG_NAME"  \
-     "${scala_args[@]}" \
-     "${residual_args[@]}" \
-     "${scripting_string-}"
+   ${JAVA_OPTS:-$default_java_opts} \
+   "${java_args[@]}" \
+   "-classpath \"$jvm_cp_args\"" \
+   -Dscala.usejavacp=true \
+   "$setScriptName" \
+   "$PROG_NAME"  \
+   "${scala_args[@]}" \
+   "${residual_args[@]}" \
+   "${scripting_string-}"
 scala_exit_status=$?
-onExit
+
diff --git a/dist/bin/scalac.bat b/dist/bin/scalac.bat
new file mode 100644
index 000000000000..a94bdb5f88b8
--- /dev/null
+++ b/dist/bin/scalac.bat
@@ -0,0 +1,175 @@
+@echo off
+setlocal enabledelayedexpansion
+
+@rem #########################################################################
+@rem ## Environment setup
+
+set _EXITCODE=0
+
+set "_PROG_HOME=%~dp0"
+
+call "%_PROG_HOME%\common.bat"
+if not %_EXITCODE%==0 goto end
+
+set _DEFAULT_JAVA_OPTS=-Xmx768m -Xms768m
+@rem set _WITH_COMPILER=true
+
+set _COMPILER_MAIN=dotty.tools.dotc.Main
+set _DECOMPILER_MAIN=dotty.tools.dotc.decompiler.Main
+set _REPL_MAIN=dotty.tools.repl.Main
+set _SCRIPTING_MAIN=dotty.tools.scripting.Main
+
+call :args %*
+
+@rem #########################################################################
+@rem ## Main
+
+call :classpathArgs
+
+set _SCRIPTING_STRING=
+if "%_PROG_NAME%"=="%_SCRIPTING_MAIN%" (
+    if not defined _TARGET_SCRIPT (
+        echo Error: Missing Scala script file 1>&2
+        set _EXITCODE=1
+        goto end
+    )
+    set _SCRIPTING_STRING=-script %_TARGET_SCRIPT% %_SCRIPTING_ARGS%
+)
+
+if defined JAVA_OPTS ( set _JAVA_OPTS=%JAVA_OPTS%
+) else ( set _JAVA_OPTS=%_DEFAULT_JAVA_OPTS%
+)
+for %%i in ("%_PROG_HOME%\..") do set "_SCALA_HOME=%%~fi"
+
+call "%_JAVACMD%" %_JAVA_OPTS% %_JAVA_DEBUG% %_JAVA_ARGS% %_JVM_CP_ARGS% ^
+-Dscala.home="%_SCALA_HOME%" -Dscala.usejavacp=true ^
+%_PROG_NAME% %_SCALA_ARGS% %_RESIDUAL_ARGS% %_SCRIPTING_STRING%
+if not %ERRORLEVEL%==0 (
+    set _EXITCODE=1
+    goto end
+)
+goto end
+
+@rem #########################################################################
+@rem ## Subroutines
+
+:args
+set _JAVA_DEBUG=
+set _HELP=
+set _VERBOSE=
+set _QUIET=
+set _COLORS=
+set _PROG_NAME=%_COMPILER_MAIN%
+set _SCALA_ARGS=
+set _JAVA_ARGS=
+set _RESIDUAL_ARGS=
+set _SCRIPTING_ARGS=
+set _TARGET_SCRIPT=
+
+:args_loop
+if "%~1"=="" goto args_done
+set "__ARG=%~1"
+if defined _TARGET_SCRIPT (
+    call :addScripting "%__ARG%"
+) else if "%__ARG%"=="--" (
+    @rem for arg; do addResidual "$arg"; done; set -- ;;
+) else if "%__ARG%"=="-h" (
+    set _HELP=true
+    call :addScala "-help"
+) else if "%__ARG%"=="-help" (
+    set _HELP=true
+    call :addScala "-help"
+) else if "%__ARG%"=="-v" (
+    set _VERBOSE=true
+    call :addScala "-verbose"
+) else if "%__ARG%"=="-verbose" (
+    set _VERBOSE=true
+    call :addScala "-verbose"
+) else if "%__ARG%"=="-debug" ( set "_JAVA_DEBUG=%_DEBUG_STR%"
+) else if "%__ARG%"=="-q" ( set _QUIET=true
+) else if "%__ARG%"=="-quiet" ( set _QUIET=true
+@rem Optimize for short-running applications, see https://github.com/lampepfl/dotty/issues/222
+) else if "%__ARG%"=="-Oshort" (
+    call :addJava "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
+) else if "%__ARG%"=="-repl" ( set _PROG_NAME=%_REPL_MAIN%
+) else if "%__ARG%"=="-script" (
+    set _PROG_NAME=%_SCRIPTING_MAIN%
+    if "%~2"=="" goto args_done
+    set "_TARGET_SCRIPT=%~2"
+    shift
+) else if "%__ARG%"=="-compile" ( set _PROG_NAME=%_COMPILER_MAIN%
+) else if "%__ARG%"=="-decompile" ( set _PROG_NAME=%_DECOMPILER_MAIN%
+) else if "%__ARG%"=="-print-tasty" (
+    set _PROG_NAME=%_DECOMPILER_MAIN%
+    call :addScala "-print-tasty"
+) else if "%__ARG%"=="-run" ( set _PROG_NAME=%_REPL_MAIN%
+) else if "%__ARG%"=="-colors" ( set _COLORS=true
+) else if "%__ARG%"=="-no-colors" ( set _COLORS=
+) else if "%__ARG%"=="-with-compiler" ( set "_JVM_CP_ARGS=%_PSEP%%_SCALA3_COMP%%_PSEP%%_TASTY_CORE%"
+@rem break out -D and -J options and add them to JAVA_OPTS as well
+@rem so they reach the JVM in time to do some good. The -D options
+@rem will be available as system properties.
+) else if "%__ARG:~0,2%"=="-D" ( call :addJava "%__ARG%"
+) else if "%__ARG:~0,2%"=="-J" ( call :addJava "%__ARG:~2%"
+) else ( call :addResidual "%__ARG%"
+)
+shift
+goto args_loop
+:args_done
+goto :eof
+
+@rem output parameter: _SCALA_ARGS
+:addScala
+set _SCALA_ARGS=%_SCALA_ARGS% %~1
+goto :eof
+
+@rem output parameter: _JAVA_ARGS
+:addJava
+set _JAVA_ARGS=%_JAVA_ARGS% %~1
+goto :eof
+
+@rem output parameter: _RESIDUAL_ARGS
+:addResidual
+set _RESIDUAL_ARGS=%_RESIDUAL_ARGS% %~1
+goto :eof
+
+@rem output parameter: _SCRIPTING_ARGS
+:addScripting
+set _SCRIPTING_ARGS=%_SCRIPTING_ARGS% %~1
+goto :eof
+
+@rem output parameter: _JVM_CP_ARGS
+:classpathArgs
+@rem echo scala3-compiler: %_SCALA3_COMP%
+@rem echo scala3-interface: %_SCALA3_INTF%
+@rem echo scala3-library: %_SCALA3_LIB%
+@rem echo tasty-core: %_TASTY_CORE%
+@rem echo scala-asm: %_SCALA_ASM%
+@rem echo scala-lib: %_SCALA_LIB%
+@rem echo sbt-intface: %_SBT_INTF%
+
+set "__TOOLCHAIN=%_SCALA_LIB%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_LIB%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA_ASM%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SBT_INTF%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_INTF%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_COMP%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_TASTY_CORE%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_STAGING%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_TASTY_INSPECTOR%%_PSEP%"
+
+@rem # jline
+set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_READER%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_TERMINAL%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_TERMINAL_JNA%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_JNA%"
+
+set _JVM_CP_ARGS=-classpath "%__TOOLCHAIN%"
+goto :eof
+
+@rem #########################################################################
+@rem ## Cleanups
+
+:end
+exit /b %_EXITCODE%
+endlocal
diff --git a/dist/bin/scaladoc b/dist/bin/scaladoc
index 304da8f5045d..a3a23a1accea 100755
--- a/dist/bin/scaladoc
+++ b/dist/bin/scaladoc
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
-if [ -z "$PROG_HOME" ] ; then
+#set -o nounset ; set -o errexit
+
+# Try to autodetect real location of the script
+if [ -z "${PROG_HOME-}" ] ; then
   ## resolve links - $0 may be a link to PROG_HOME
   PRG="$0"
 
@@ -26,7 +29,6 @@ if [ -z "$PROG_HOME" ] ; then
 fi
 
 source "$PROG_HOME/bin/common"
-
 default_java_opts="-Xmx768m -Xms768m"
 withCompiler=true
 
@@ -46,8 +48,8 @@ addScala () {
 addResidual () {
   residual_args+=("'$1'")
 }
-addScripting () {
-  scripting_args+=("'$1'")
+addScrip() {
+  script_args+=("'$1'")
 }
 
 classpathArgs () {
@@ -71,6 +73,8 @@ classpathArgs () {
   CLASS_PATH+="$(find_lib "*liqp*")$PSEP"
   CLASS_PATH+="$(find_lib "*jsoup*")$PSEP"
   CLASS_PATH+="$(find_lib "*jackson-dataformat-yaml*")$PSEP"
+  CLASS_PATH+="$(find_lib "*jackson-datatype-jsr310*")$PSEP"
+  CLASS_PATH+="$(find_lib "*strftime4j*")$PSEP"
   CLASS_PATH+="$(find_lib "*scala-asm*")$PSEP"
   CLASS_PATH+="$(find_lib "*compiler-interface*")$PSEP"
   CLASS_PATH+="$(find_lib "*jline-reader*")$PSEP"
@@ -80,7 +84,7 @@ classpathArgs () {
   CLASS_PATH+="$(find_lib "*flexmark-formatter*")$PSEP"
   CLASS_PATH+="$(find_lib "*autolink-0.6*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-jira-converter*")$PSEP"
-  CLASS_PATH+="$(find_lib "*antlr-3*")$PSEP"
+  CLASS_PATH+="$(find_lib "*antlr4*")$PSEP"
   CLASS_PATH+="$(find_lib "*jackson-annotations*")$PSEP"
   CLASS_PATH+="$(find_lib "*jackson-core*")$PSEP"
   CLASS_PATH+="$(find_lib "*jackson-databind*")$PSEP"
@@ -92,18 +96,18 @@ classpathArgs () {
   CLASS_PATH+="$(find_lib "*flexmark-ext-tables*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-ext-ins*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-ext-superscript*")$PSEP"
-  CLASS_PATH+="$(find_lib "*antlr-runtime*")$PSEP"
+  CLASS_PATH+="$(find_lib "*antlr4-runtime*")$PSEP"
   CLASS_PATH+="$(find_lib "*ST4*")"
 
   jvm_cp_args="-classpath \"$CLASS_PATH\""
 }
 
-in_scripting_args=false
+#for A in "$@" ; do echo "A[$A]" ; done ; exit 2
+
 while [[ $# -gt 0 ]]; do
 case "$1" in
            --) shift; for arg; do addResidual "$arg"; done; set -- ;;
   -v|-verbose) verbose=true && addScala "-verbose" && shift ;;
-       -debug) DEBUG="$DEBUG_STR" && shift ;;
     -q|-quiet) quiet=true && shift ;;
 
       -colors) colors=true && shift ;;
@@ -113,11 +117,7 @@ case "$1" in
           # will be available as system properties.
           -D*) addJava "$1" && shift ;;
           -J*) addJava "${1:2}" && shift ;;
-            *) if [ $in_scripting_args == false ]; then
-                addResidual "$1"
-               else
-                addScripting "$1"
-               fi
+            *) addResidual "$1"
                shift
                ;;
   esac
@@ -127,12 +127,12 @@ classpathArgs
 
 eval "\"$JAVACMD\"" \
      ${JAVA_OPTS:-$default_java_opts} \
-     "$DEBUG" \
      "${java_args[@]}" \
-     "$jvm_cp_args" \
+     "${jvm_cp_args-}" \
+      -Dscala.usejavacp=true \
      "dotty.tools.scaladoc.Main"  \
      "${scala_args[@]}" \
      "${residual_args[@]}" \
-     "$scripting_string"
+     "${scripting_string-}"
 scala_exit_status=$?
 onExit
diff --git a/dist/bin/scaladoc.bat b/dist/bin/scaladoc.bat
new file mode 100644
index 000000000000..698f2a7c36f1
--- /dev/null
+++ b/dist/bin/scaladoc.bat
@@ -0,0 +1,164 @@
+@echo off
+setlocal enabledelayedexpansion
+
+@rem #########################################################################
+@rem ## Environment setup
+
+set _EXITCODE=0
+
+set "_PROG_HOME=%~dp0"
+
+call "%_PROG_HOME%\common.bat"
+if not %_EXITCODE%==0 goto end
+
+set _DEFAULT_JAVA_OPTS=-Xmx768m -Xms768m
+
+call :args %*
+
+@rem #########################################################################
+@rem ## Main
+
+call :classpathArgs
+
+if defined JAVA_OPTS ( set _JAVA_OPTS=%JAVA_OPTS%
+) else ( set _JAVA_OPTS=%_DEFAULT_JAVA_OPTS%
+)
+call "%_JAVACMD%" %_JAVA_OPTS% %_JAVA_DEBUG% %_JAVA_ARGS% ^
+-classpath "%_CLASS_PATH%" ^
+-Dscala.usejavacp=true ^
+dotty.tools.scaladoc.Main %_SCALA_ARGS% %_RESIDUAL_ARGS%
+if not %ERRORLEVEL%==0 (
+    @rem echo Error: Scaladoc execution failed 1>&2
+    set _EXITCODE=1
+    goto end
+)
+goto end
+
+@rem #########################################################################
+@rem ## Subroutines
+
+:args
+set _JAVA_DEBUG=
+set _HELP=
+set _VERBOSE=
+set _QUIET=
+set _COLORS=
+set _SCALA_ARGS=
+set _JAVA_ARGS=
+set _RESIDUAL_ARGS=
+
+:args_loop
+if "%~1"=="" goto args_done
+set "__ARG=%~1"
+if "%__ARG%"=="--" (
+    @rem for arg; do addResidual "$arg"; done; set -- ;;
+) else if "%__ARG%"=="-h" (
+    set _HELP=true
+    call :addScala "-help"
+) else if "%__ARG%"=="-help" (
+    set _HELP=true
+    call :addScala "-help"
+) else if "%__ARG%"=="-v" (
+    set _VERBOSE=true
+    call :addScala "-verbose"
+) else if "%__ARG%"=="-verbose" (
+    set _VERBOSE=true
+    call :addScala "-verbose"
+) else if "%__ARG%"=="-debug" ( set "_JAVA_DEBUG=%_DEBUG_STR%"
+) else if "%__ARG%"=="-q" ( set _QUIET=true
+) else if "%__ARG%"=="-quiet" ( set _QUIET=true
+) else if "%__ARG%"=="-colors" ( set _COLORS=true
+) else if "%__ARG%"=="-no-colors" ( set _COLORS=
+) else if "%__ARG:~0,2%"=="-D" ( call :addJava "%__ARG%"
+) else if "%__ARG:~0,2%"=="-J" ( call :addJava "%__ARG:~2%"
+) else (
+    if defined _IN_SCRIPTING_ARGS ( call :addScripting "%__ARG%"
+    ) else ( call :addResidual "%__ARG%"
+    )
+)
+shift
+goto args_loop
+:args_done
+goto :eof
+
+@rem output parameter: _SCALA_ARGS
+:addScala
+set _SCALA_ARGS=%_SCALA_ARGS% %~1
+goto :eof
+
+@rem output parameter: _JAVA_ARGS
+:addJava
+set _JAVA_ARGS=%_JAVA_ARGS% %~1
+goto :eof
+
+@rem output parameter: _RESIDUAL_ARGS
+:addResidual
+set _RESIDUAL_ARGS=%_RESIDUAL_ARGS% %~1
+goto :eof
+
+@rem output parameter: _CLASS_PATH
+:classpathArgs
+for /f "delims=" %%f in ("%_PROG_HOME%\.") do set "_LIB_DIR=%%~dpflib"
+set _CLASS_PATH=
+@rem keep list in sync with bash script `bin\scaladoc` !
+call :updateClasspath "scaladoc"
+call :updateClasspath "scala3-compiler"
+call :updateClasspath "scala3-interfaces"
+call :updateClasspath "scala3-library"
+call :updateClasspath "tasty-core"
+call :updateClasspath "scala3-tasty-inspector"
+call :updateClasspath "flexmark-0"
+call :updateClasspath "flexmark-html-parser"
+call :updateClasspath "flexmark-ext-anchorlink"
+call :updateClasspath "flexmark-ext-autolink"
+call :updateClasspath "flexmark-ext-emoji"
+call :updateClasspath "flexmark-ext-gfm-strikethrough"
+call :updateClasspath "flexmark-ext-gfm-tables"
+call :updateClasspath "flexmark-ext-gfm-tasklist"
+call :updateClasspath "flexmark-ext-wikilink"
+call :updateClasspath "flexmark-ext-yaml-front-matter"
+call :updateClasspath "liqp"
+call :updateClasspath "jsoup"
+call :updateClasspath "jackson-dataformat-yaml"
+call :updateClasspath "jackson-datatype-jsr310"
+call :updateClasspath "strftime4j"
+call :updateClasspath "scala-asm"
+call :updateClasspath "compiler-interface"
+call :updateClasspath "jline-reader"
+call :updateClasspath "jline-terminal-3"
+call :updateClasspath "jline-terminal-jna"
+call :updateClasspath "flexmark-util"
+call :updateClasspath "flexmark-formatter"
+call :updateClasspath "autolink-0.6"
+call :updateClasspath "flexmark-jira-converter"
+call :updateClasspath "antlr4"
+call :updateClasspath "jackson-annotations"
+call :updateClasspath "jackson-core"
+call :updateClasspath "jackson-databind"
+call :updateClasspath "snakeyaml"
+call :updateClasspath "scala-library"
+call :updateClasspath "protobuf-java"
+call :updateClasspath "util-interface"
+call :updateClasspath "jna-5"
+call :updateClasspath "flexmark-ext-tables"
+call :updateClasspath "flexmark-ext-ins"
+call :updateClasspath "flexmark-ext-superscript"
+call :updateClasspath "antlr4-runtime"
+call :updateClasspath "ST4"
+goto :eof
+
+@rem input parameter: %1=pattern for library file
+@rem output parameter: _CLASS_PATH
+:updateClasspath
+set "__PATTERN=%~1"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*%__PATTERN%*"') do (
+    set "_CLASS_PATH=!_CLASS_PATH!%_LIB_DIR%\%%f%_PSEP%"
+)
+goto :eof
+
+@rem #########################################################################
+@rem ## Cleanups
+
+:end
+exit /b %_EXITCODE%
+endlocal
diff --git a/docs/css/bootstrap.min.css b/docs/_assets/css/bootstrap.min.css
similarity index 100%
rename from docs/css/bootstrap.min.css
rename to docs/_assets/css/bootstrap.min.css
diff --git a/docs/css/color-brewer.css b/docs/_assets/css/color-brewer.css
similarity index 100%
rename from docs/css/color-brewer.css
rename to docs/_assets/css/color-brewer.css
diff --git a/docs/css/dottydoc.css b/docs/_assets/css/dottydoc.css
similarity index 86%
rename from docs/css/dottydoc.css
rename to docs/_assets/css/dottydoc.css
index caeb967d6fd1..ca7613835ff0 100644
--- a/docs/css/dottydoc.css
+++ b/docs/_assets/css/dottydoc.css
@@ -25,6 +25,10 @@ main > h1 {
   margin-bottom: 20px;
 }
 
+.byline {
+  font-size: 14px;
+}
+
 .byline, .byline a {
   color: grey;
 }
@@ -43,7 +47,7 @@ ul.post-list {
 
 /* headings anchors */
 a.anchor {
-  color: white;
+  color: transparent;
   margin-left: -23px;
   padding-right: 3px;
   transition: color .4s ease-out;
@@ -180,18 +184,6 @@ h5:hover a.anchor:hover {
   font-family: var(--font-family-monospace);
 }
 
-/* code */
-pre, code {
-  font-variant-ligatures: none;
-}
-pre {
-  padding: 0;
-  font-size: 13px;
-  background: var(--pre-bg);
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-}
-
 /* admonitions */
 blockquote {
   padding: 0 1em;
@@ -205,8 +197,8 @@ aside {
 }
 
 aside.warning {
-  border-left: 3px solid #d62c2c;
-  background-color: #ffe4e4;
+  border-left: 3px solid var(--red500);
+  background-color: var(--aside-warning-bg);
 }
 
 aside.notice {
@@ -219,21 +211,6 @@ aside.success {
   background-color: #ebfddd;
 }
 
-/* gitter chat */
-.gitter-open-chat-button {
-  background-color: grey;
-}
-.gitter-open-chat-button:focus, .gitter-open-chat-button:hover {
-  background-color: var(--primary);
-}
-.gitter-open-chat-button:focus {
-  box-shadow: 0 0 8px var(--primary);
-}
-.gitter-chat-embed {
-  top: 40px; /* 50px (navbar) - 10px (aside's margin) */
-  bottom: -10px;
-}
-
 /* media queries for bigger screens (dottydoc is mobile-first) */
 @media (min-width: 576px) {
   .byline .author {
@@ -263,4 +240,4 @@ aside.success {
 header {
   position: static !important;
   width: 100% !important;
-}
\ No newline at end of file
+}
diff --git a/docs/css/frontpage.css b/docs/_assets/css/frontpage.css
similarity index 97%
rename from docs/css/frontpage.css
rename to docs/_assets/css/frontpage.css
index 722d4ba09802..a3a5c0d7dd8a 100644
--- a/docs/css/frontpage.css
+++ b/docs/_assets/css/frontpage.css
@@ -119,12 +119,6 @@ pre, code {
   line-height: 1.75em;
 }
 
-/* gitter chat */
-.gitter-chat-embed {
-  top: 0;
-  bottom: 0;
-}
-
 aside {
   margin: 0;
   padding: 0;
diff --git a/docs/css/search.css b/docs/_assets/css/search.css
similarity index 100%
rename from docs/css/search.css
rename to docs/_assets/css/search.css
diff --git a/docs/css/sidebar.css b/docs/_assets/css/sidebar.css
similarity index 100%
rename from docs/css/sidebar.css
rename to docs/_assets/css/sidebar.css
diff --git a/docs/css/toolbar.css b/docs/_assets/css/toolbar.css
similarity index 100%
rename from docs/css/toolbar.css
rename to docs/_assets/css/toolbar.css
diff --git a/docs/_assets/docsScalaLangResources/scaladoc-assets.html b/docs/_assets/docsScalaLangResources/scaladoc-assets.html
new file mode 100644
index 000000000000..504a93b25fa8
--- /dev/null
+++ b/docs/_assets/docsScalaLangResources/scaladoc-assets.html
@@ -0,0 +1,5 @@
+<!--- This file is copied from dotty repo located at the github lampepefl/dotty inside docs/docsScalaLangResources/scaladoc-assets.html -->
+<script src="{{ site.baseurl }}/scripts/scaladoc-scalajs.js" type="text/javascript"></script>
+<link rel="stylesheet" href="{{ site.baseurl }}/resources/css/colors.css" type="text/css" />
+<link rel="stylesheet" href="{{ site.baseurl }}/resources/css/code-snippets.css" type="text/css" />
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.min.css">
diff --git a/docs/images/aggelos.jpg b/docs/_assets/images/aggelos.jpg
similarity index 100%
rename from docs/images/aggelos.jpg
rename to docs/_assets/images/aggelos.jpg
diff --git a/docs/images/allan.jpg b/docs/_assets/images/allan.jpg
similarity index 100%
rename from docs/images/allan.jpg
rename to docs/_assets/images/allan.jpg
diff --git a/docs/images/anatolii.png b/docs/_assets/images/anatolii.png
similarity index 100%
rename from docs/images/anatolii.png
rename to docs/_assets/images/anatolii.png
diff --git a/docs/images/dotty-ide/decompiler.png b/docs/_assets/images/dotty-ide/decompiler.png
similarity index 100%
rename from docs/images/dotty-ide/decompiler.png
rename to docs/_assets/images/dotty-ide/decompiler.png
diff --git a/docs/images/dotty-ide/documentation-hover.png b/docs/_assets/images/dotty-ide/documentation-hover.png
similarity index 100%
rename from docs/images/dotty-ide/documentation-hover.png
rename to docs/_assets/images/dotty-ide/documentation-hover.png
diff --git a/docs/images/dotty-ide/signature-help.png b/docs/_assets/images/dotty-ide/signature-help.png
similarity index 100%
rename from docs/images/dotty-ide/signature-help.png
rename to docs/_assets/images/dotty-ide/signature-help.png
diff --git a/docs/images/dotty-logo-white.svg b/docs/_assets/images/dotty-logo-white.svg
similarity index 100%
rename from docs/images/dotty-logo-white.svg
rename to docs/_assets/images/dotty-logo-white.svg
diff --git a/docs/images/explicit-nulls/explicit-nulls-type-hierarchy.png b/docs/_assets/images/explicit-nulls/explicit-nulls-type-hierarchy.png
similarity index 100%
rename from docs/images/explicit-nulls/explicit-nulls-type-hierarchy.png
rename to docs/_assets/images/explicit-nulls/explicit-nulls-type-hierarchy.png
diff --git a/docs/images/favicon.png b/docs/_assets/images/favicon.png
similarity index 100%
rename from docs/images/favicon.png
rename to docs/_assets/images/favicon.png
diff --git a/docs/images/felix.jpg b/docs/_assets/images/felix.jpg
similarity index 100%
rename from docs/images/felix.jpg
rename to docs/_assets/images/felix.jpg
diff --git a/docs/images/fengyun.jpg b/docs/_assets/images/fengyun.jpg
similarity index 100%
rename from docs/images/fengyun.jpg
rename to docs/_assets/images/fengyun.jpg
diff --git a/docs/images/github-logo.svg b/docs/_assets/images/github-logo.svg
similarity index 100%
rename from docs/images/github-logo.svg
rename to docs/_assets/images/github-logo.svg
diff --git a/docs/_assets/images/logo.svg b/docs/_assets/images/logo.svg
new file mode 100644
index 000000000000..472d0d6025fc
--- /dev/null
+++ b/docs/_assets/images/logo.svg
@@ -0,0 +1,16 @@
+<svg width="64" height="109" viewBox="0 0 64 109" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.5 75.5C0.5 75.5 63.4 81.8 63.4 92.3V67.1C63.4 67.1 63.4 56.6 0.5 50.3V75.5Z" fill="#B73F35"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.5 41.9C0.5 41.9 63.4 48.2 63.4 58.7V33.5C63.4 33.5 63.4 23 0.5 16.7V26.5V41.9Z" fill="#B73F35"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.5 109V83.8C0.5 83.8 63.4 77.5 63.4 67V92.2C63.5 92.3 63.5 102.7 0.5 109Z" fill="#DD6056"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.5 50.3C0.5 50.3 63.4 44 63.4 33.5V58.7C63.4 58.7 63.4 69.2 0.5 75.5V50.3Z" fill="#DD6056"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M63.5 0V25.2C63.5 25.2 63.5 35.7 0.599972 42V16.7C0.499972 16.7 63.5 10.5 63.5 0Z" fill="#DD6056"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.44711 89.7886C5.45019 89.7882 5.45019 89.7882 5.45328 89.7878C5.91769 89.7325 6.24931 89.3111 6.19397 88.8467C6.13863 88.3823 5.71728 88.0507 5.25287 88.106C5.24981 88.1064 5.24981 88.1064 5.24674 88.1068C4.78233 88.1621 4.4507 88.5834 4.50603 89.0478C4.56136 89.5123 4.9827 89.8439 5.44711 89.7886ZM13.3486 89.6305C13.3541 89.6298 13.3541 89.6298 13.3596 89.629C14.1807 89.5193 14.7575 88.7648 14.6478 87.9436C14.5381 87.1225 13.7835 86.5457 12.9624 86.6554C12.9569 86.6562 12.9569 86.6562 12.9515 86.6569C12.1303 86.7666 11.5536 87.5211 11.6632 88.3423C11.7729 89.1634 12.5275 89.7402 13.3486 89.6305ZM21.0067 88.5493C21.0121 88.5485 21.0121 88.5485 21.0176 88.5477C21.8369 88.4254 22.4021 87.6621 22.2798 86.8428C22.1576 86.0234 21.3942 85.4583 20.5749 85.5805C20.5695 85.5813 20.5695 85.5813 20.564 85.5821C19.7447 85.7044 19.1795 86.4677 19.3018 87.287C19.424 88.1064 20.1873 88.6715 21.0067 88.5493ZM28.8225 87.9232C28.8298 87.922 28.8298 87.922 28.837 87.9208C29.9223 87.7387 30.6543 86.7113 30.4722 85.626C30.2901 84.5408 29.2627 83.8087 28.1774 83.9909C28.1702 83.9921 28.1702 83.9921 28.163 83.9933C27.0778 84.1754 26.3457 85.2028 26.5278 86.288C26.7099 87.3732 27.7373 88.1054 28.8225 87.9232ZM36.4725 86.5526C37.5532 86.3453 38.2612 85.3012 38.054 84.2205C37.8467 83.1399 36.8026 82.4318 35.7219 82.6391C35.7147 82.6405 35.7147 82.6405 35.7075 82.6419C34.6269 82.8491 33.9188 83.8932 34.126 84.9739C34.3333 86.0546 35.3773 86.7626 36.458 86.5554C36.4653 86.554 36.4653 86.554 36.4725 86.5526ZM43.8724 84.3948C43.8779 84.3935 43.8779 84.3935 43.8834 84.3923C44.6916 84.2101 45.199 83.4073 45.0169 82.5991C44.8347 81.791 44.0319 81.2835 43.2237 81.4657C43.2183 81.4669 43.2183 81.4669 43.2128 81.4682C42.4047 81.6503 41.8972 82.4531 42.0793 83.2612C42.2614 84.0694 43.0642 84.5769 43.8724 84.3948ZM51.4276 82.5083C51.433 82.5068 51.433 82.5068 51.4384 82.5053C52.2363 82.2826 52.7026 81.4552 52.4799 80.6573C52.2572 79.8593 51.4298 79.393 50.6319 79.6157C50.6267 79.6172 50.6267 79.6172 50.6214 79.6186C49.8235 79.8413 49.3571 80.6686 49.5797 81.4666C49.8023 82.2645 50.6297 82.7309 51.4276 82.5083ZM58.4198 79.8064C58.8557 79.637 59.0717 79.1462 58.9022 78.7102C58.7327 78.2743 58.242 78.0583 57.806 78.2278C57.8032 78.2289 57.8032 78.2289 57.8004 78.23C57.3644 78.3993 57.1483 78.8901 57.3177 79.3261C57.4871 79.762 57.9778 79.9781 58.4138 79.8087C58.4168 79.8076 58.4168 79.8076 58.4198 79.8064Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.6776 97.5965C5.68306 97.5958 5.68306 97.5958 5.68853 97.5952C6.51113 97.4972 7.09853 96.7509 7.0005 95.9282C6.90248 95.1056 6.15616 94.5182 5.33355 94.6163C5.32812 94.6169 5.32812 94.6169 5.32269 94.6176C4.50008 94.7156 3.91267 95.4619 4.01068 96.2845C4.10869 97.1071 4.85499 97.6945 5.6776 97.5965ZM13.3486 96.6274C13.3541 96.6267 13.3541 96.6267 13.3596 96.6259C14.1807 96.5163 14.7575 95.7617 14.6478 94.9406C14.5381 94.1194 13.7835 93.5427 12.9624 93.6524C12.9569 93.6531 12.9569 93.6531 12.9515 93.6538C12.1303 93.7635 11.5536 94.518 11.6632 95.3392C11.7729 96.1603 12.5275 96.7371 13.3486 96.6274ZM21.1767 96.1256C21.184 96.1245 21.184 96.1245 21.1912 96.1235C22.2796 95.9611 23.0303 94.9471 22.8679 93.8587C22.7055 92.7704 21.6916 92.0197 20.6032 92.1821C20.596 92.1832 20.596 92.1832 20.5888 92.1842C19.5004 92.3466 18.7497 93.3605 18.9121 94.4489C19.0744 95.5373 20.0884 96.288 21.1767 96.1256ZM28.837 94.9177C29.9223 94.7356 30.6543 93.7082 30.4722 92.623C30.2901 91.5377 29.2627 90.8057 28.1774 90.9878C28.1702 90.989 28.1702 90.989 28.163 90.9902C27.0778 91.1723 26.3457 92.1997 26.5278 93.2849C26.7099 94.3702 27.7373 95.1023 28.8225 94.9202C28.8298 94.919 28.8298 94.919 28.837 94.9177ZM36.4725 93.5611C37.5532 93.3532 38.2612 92.306 38.054 91.2222C37.8467 90.1384 36.8026 89.4283 35.7219 89.6361C35.7147 89.6375 35.7147 89.6375 35.7075 89.6389C34.6269 89.8467 33.9188 90.8939 34.126 91.9777C34.3333 93.0616 35.3773 93.7717 36.458 93.5639C36.4653 93.5625 36.4653 93.5625 36.4725 93.5611ZM44.0707 91.9695C44.0781 91.9679 44.0781 91.9679 44.0854 91.9662C45.1588 91.7243 45.8328 90.658 45.5908 89.5846C45.3488 88.5112 44.2825 87.8372 43.2092 88.0792C43.2019 88.0808 43.2019 88.0808 43.1947 88.0825C42.1213 88.3244 41.4473 89.3906 41.6892 90.464C41.9311 91.5374 42.9973 92.2114 44.0707 91.9695ZM51.4276 89.5083C51.433 89.5068 51.433 89.5068 51.4384 89.5053C52.2363 89.2826 52.7026 88.4552 52.4799 87.6573C52.2572 86.8593 51.4298 86.393 50.6319 86.6157C50.6267 86.6172 50.6267 86.6172 50.6214 86.6186C49.8235 86.8413 49.3571 87.6686 49.5797 88.4665C49.8023 89.2645 50.6297 89.7309 51.4276 89.5083ZM58.9 87.0756C58.9052 87.0736 58.9052 87.0736 58.9105 87.0715C59.6826 86.7713 60.0652 85.9021 59.765 85.1299C59.4649 84.3578 58.5956 83.9752 57.8234 84.2754C57.8185 84.2773 57.8185 84.2773 57.8135 84.2793C57.0413 84.5793 56.6585 85.4485 56.9586 86.2207C57.2586 86.9929 58.1278 87.3756 58.9 87.0756Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.45328 104.198C5.54647 104.187 5.63432 104.161 5.71477 104.123C6.0352 103.972 6.2382 103.628 6.19397 103.257C6.13863 102.792 5.71728 102.461 5.25287 102.516C5.24981 102.516 5.24981 102.516 5.24674 102.517C4.78233 102.572 4.4507 102.993 4.50603 103.458C4.56136 103.922 4.9827 104.254 5.44711 104.199C5.45019 104.198 5.45019 104.198 5.45328 104.198ZM13.3486 103.627C13.3541 103.627 13.3541 103.627 13.3596 103.626C14.1807 103.516 14.7575 102.762 14.6478 101.941C14.5381 101.119 13.7835 100.543 12.9624 100.652C12.9569 100.653 12.9569 100.653 12.9515 100.654C12.1303 100.763 11.5536 101.518 11.6632 102.339C11.7729 103.16 12.5275 103.737 13.3486 103.627ZM21.0067 102.546C21.0121 102.545 21.0121 102.545 21.0176 102.545C21.8369 102.422 22.4021 101.659 22.2798 100.84C22.1576 100.02 21.3942 99.4552 20.5749 99.5775C20.5695 99.5783 20.5695 99.5783 20.564 99.5791C19.7447 99.7013 19.1795 100.465 19.3018 101.284C19.424 102.103 20.1873 102.668 21.0067 102.546ZM28.8225 101.92C28.8298 101.919 28.8298 101.919 28.837 101.918C29.9223 101.736 30.6543 100.708 30.4722 99.623C30.2901 98.5377 29.2627 97.8057 28.1774 97.9878C28.1702 97.989 28.1702 97.989 28.163 97.9902C27.0778 98.1723 26.3457 99.1997 26.5278 100.285C26.7099 101.37 27.7373 102.102 28.8225 101.92ZM36.4725 100.55C37.5532 100.342 38.2612 99.2982 38.054 98.2175C37.8467 97.1368 36.8026 96.4288 35.7219 96.636C35.7147 96.6374 35.7147 96.6374 35.7075 96.6388C34.6269 96.846 33.9188 97.8901 34.126 98.9708C34.3333 100.051 35.3773 100.76 36.458 100.552C36.4653 100.551 36.4653 100.551 36.4725 100.55ZM43.8724 98.3948C43.8779 98.3935 43.8779 98.3935 43.8834 98.3923C44.6916 98.2101 45.199 97.4073 45.0169 96.5991C44.8347 95.791 44.0319 95.2835 43.2237 95.4657C43.2183 95.4669 43.2183 95.4669 43.2128 95.4682C42.4047 95.6503 41.8972 96.4531 42.0793 97.2612C42.2614 98.0694 43.0642 98.5769 43.8724 98.3948ZM51.4276 96.5083C51.433 96.5068 51.433 96.5068 51.4384 96.5053C52.2363 96.2826 52.7026 95.4552 52.4799 94.6573C52.2572 93.8593 51.4298 93.393 50.6319 93.6157C50.6267 93.6172 50.6267 93.6172 50.6214 93.6186C49.8235 93.8413 49.3571 94.6686 49.5797 95.4666C49.8023 96.2645 50.6297 96.7309 51.4276 96.5083ZM58.4138 93.2088C58.4168 93.2076 58.4168 93.2076 58.4198 93.2064C58.8557 93.037 59.0717 92.5462 58.9022 92.1102C58.7327 91.6743 58.242 91.4583 57.806 91.6278C57.8032 91.6289 57.8032 91.6289 57.8004 91.63C57.3644 91.7993 57.1483 92.2901 57.3177 92.7261C57.4871 93.162 57.9778 93.3781 58.4138 93.2088Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.44711 56.1886C5.45019 56.1882 5.45019 56.1882 5.45328 56.1878C5.91769 56.1325 6.24931 55.7111 6.19397 55.2467C6.13863 54.7823 5.71728 54.4507 5.25287 54.506C5.24981 54.5064 5.24981 54.5064 5.24674 54.5068C4.78233 54.5621 4.4507 54.9834 4.50603 55.4478C4.56136 55.9123 4.9827 56.2439 5.44711 56.1886ZM13.3486 56.0305C13.3541 56.0298 13.3541 56.0298 13.3596 56.029C14.1807 55.9193 14.7575 55.1648 14.6478 54.3436C14.5381 53.5225 13.7835 52.9458 12.9624 53.0554C12.9569 53.0562 12.9569 53.0562 12.9515 53.0569C12.1303 53.1666 11.5536 53.9211 11.6632 54.7423C11.7729 55.5634 12.5275 56.1402 13.3486 56.0305ZM21.0067 54.9493C21.0121 54.9485 21.0121 54.9485 21.0176 54.9477C21.8369 54.8254 22.4021 54.0621 22.2798 53.2428C22.1576 52.4234 21.3942 51.8583 20.5749 51.9805C20.5695 51.9813 20.5695 51.9813 20.564 51.9821C19.7447 52.1044 19.1795 52.8677 19.3018 53.687C19.424 54.5064 20.1873 55.0715 21.0067 54.9493ZM28.8225 54.3232C28.8298 54.322 28.8298 54.322 28.837 54.3208C29.9223 54.1387 30.6543 53.1113 30.4722 52.026C30.2901 50.9408 29.2627 50.2087 28.1774 50.3909C28.1702 50.3921 28.1702 50.3921 28.163 50.3933C27.0778 50.5754 26.3457 51.6028 26.5278 52.688C26.7099 53.7732 27.7373 54.5054 28.8225 54.3232ZM36.4725 52.9526C37.5532 52.7453 38.2612 51.7012 38.054 50.6205C37.8467 49.5399 36.8026 48.8318 35.7219 49.0391C35.7147 49.0405 35.7147 49.0405 35.7075 49.0419C34.6269 49.2491 33.9188 50.2932 34.126 51.3739C34.3333 52.4546 35.3773 53.1626 36.458 52.9554C36.4653 52.954 36.4653 52.954 36.4725 52.9526ZM43.8724 50.7948C43.8779 50.7935 43.8779 50.7935 43.8834 50.7923C44.6916 50.6101 45.199 49.8073 45.0169 48.9991C44.8347 48.191 44.0319 47.6835 43.2237 47.8657C43.2183 47.8669 43.2183 47.8669 43.2128 47.8682C42.4047 48.0503 41.8972 48.8531 42.0793 49.6612C42.2614 50.4694 43.0642 50.9769 43.8724 50.7948ZM51.4276 48.9083C51.433 48.9068 51.433 48.9068 51.4384 48.9053C52.2363 48.6826 52.7026 47.8552 52.4799 47.0573C52.2572 46.2593 51.4298 45.793 50.6319 46.0157C50.6267 46.0172 50.6267 46.0172 50.6214 46.0186C49.8235 46.2413 49.3571 47.0686 49.5797 47.8666C49.8023 48.6645 50.6297 49.1309 51.4276 48.9083ZM58.4198 46.2064C58.8557 46.037 59.0717 45.5462 58.9022 45.1102C58.7327 44.6743 58.242 44.4583 57.806 44.6278C57.8032 44.6289 57.8032 44.6289 57.8004 44.63C57.3644 44.7994 57.1483 45.2901 57.3177 45.7261C57.4871 46.162 57.9778 46.3781 58.4138 46.2088C58.4168 46.2076 58.4168 46.2076 58.4198 46.2064Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.6776 63.9965C5.68306 63.9959 5.68306 63.9959 5.68853 63.9952C6.51113 63.8972 7.09853 63.1509 7.0005 62.3283C6.90248 61.5056 6.15616 60.9183 5.33355 61.0163C5.32812 61.0169 5.32812 61.0169 5.32269 61.0176C4.50008 61.1156 3.91267 61.8619 4.01068 62.6845C4.10869 63.5071 4.85499 64.0945 5.6776 63.9965ZM13.3486 63.0274C13.3541 63.0267 13.3541 63.0267 13.3596 63.026C14.1807 62.9163 14.7575 62.1617 14.6478 61.3406C14.5381 60.5194 13.7835 59.9427 12.9624 60.0524C12.9569 60.0531 12.9569 60.0531 12.9515 60.0538C12.1303 60.1635 11.5536 60.918 11.6632 61.7392C11.7729 62.5603 12.5275 63.1371 13.3486 63.0274ZM21.1767 62.5256C21.184 62.5245 21.184 62.5245 21.1912 62.5235C22.2796 62.3611 23.0303 61.3471 22.8679 60.2588C22.7055 59.1704 21.6916 58.4197 20.6032 58.5821C20.596 58.5832 20.596 58.5832 20.5888 58.5842C19.5004 58.7466 18.7497 59.7605 18.9121 60.8489C19.0744 61.9373 20.0884 62.688 21.1767 62.5256ZM28.837 61.3177C29.9223 61.1356 30.6543 60.1082 30.4722 59.023C30.2901 57.9377 29.2627 57.2057 28.1774 57.3878C28.1702 57.389 28.1702 57.389 28.163 57.3902C27.0778 57.5723 26.3457 58.5997 26.5278 59.6849C26.7099 60.7702 27.7373 61.5023 28.8225 61.3202C28.8298 61.319 28.8298 61.319 28.837 61.3177ZM36.4725 59.9611C37.5532 59.7532 38.2612 58.706 38.054 57.6222C37.8467 56.5384 36.8026 55.8283 35.7219 56.0361C35.7147 56.0375 35.7147 56.0375 35.7075 56.0389C34.6269 56.2467 33.9188 57.2939 34.126 58.3777C34.3333 59.4616 35.3773 60.1717 36.458 59.9639C36.4653 59.9625 36.4653 59.9625 36.4725 59.9611ZM44.0707 58.3695C44.0781 58.3679 44.0781 58.3679 44.0854 58.3662C45.1588 58.1243 45.8328 57.058 45.5908 55.9846C45.3488 54.9112 44.2825 54.2372 43.2092 54.4792C43.2019 54.4808 43.2019 54.4808 43.1947 54.4825C42.1213 54.7244 41.4473 55.7906 41.6892 56.864C41.9311 57.9374 42.9973 58.6115 44.0707 58.3695ZM51.4276 55.9083C51.433 55.9068 51.433 55.9068 51.4384 55.9053C52.2363 55.6826 52.7026 54.8552 52.4799 54.0573C52.2572 53.2593 51.4298 52.793 50.6319 53.0157C50.6267 53.0172 50.6267 53.0172 50.6214 53.0186C49.8235 53.2413 49.3571 54.0686 49.5797 54.8666C49.8023 55.6645 50.6297 56.1309 51.4276 55.9083ZM58.9 53.4756C58.9052 53.4736 58.9052 53.4736 58.9105 53.4715C59.6826 53.1714 60.0652 52.3021 59.765 51.5299C59.4649 50.7578 58.5956 50.3752 57.8234 50.6754C57.8185 50.6773 57.8185 50.6773 57.8135 50.6793C57.0413 50.9793 56.6585 51.8485 56.9586 52.6207C57.2586 53.3929 58.1278 53.7756 58.9 53.4756Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.45328 70.5978C5.54647 70.5867 5.63432 70.5609 5.71477 70.5229C6.0352 70.3716 6.2382 70.0279 6.19397 69.6567C6.13863 69.1923 5.71728 68.8607 5.25287 68.916C5.24981 68.9164 5.24981 68.9164 5.24674 68.9168C4.78233 68.9721 4.4507 69.3934 4.50603 69.8578C4.56136 70.3223 4.9827 70.6539 5.44711 70.5986C5.45019 70.5982 5.45019 70.5982 5.45328 70.5978ZM13.3486 70.0274C13.3541 70.0267 13.3541 70.0267 13.3596 70.026C14.1807 69.9163 14.7575 69.1617 14.6478 68.3406C14.5381 67.5194 13.7835 66.9427 12.9624 67.0524C12.9569 67.0531 12.9569 67.0531 12.9515 67.0538C12.1303 67.1635 11.5536 67.918 11.6632 68.7392C11.7729 69.5603 12.5275 70.1371 13.3486 70.0274ZM21.0067 68.9462C21.0121 68.9454 21.0121 68.9454 21.0176 68.9446C21.8369 68.8224 22.4021 68.059 22.2798 67.2397C22.1576 66.4203 21.3942 65.8552 20.5749 65.9775C20.5695 65.9783 20.5695 65.9783 20.564 65.9791C19.7447 66.1013 19.1795 66.8646 19.3018 67.684C19.424 68.5033 20.1873 69.0685 21.0067 68.9462ZM28.8225 68.3202C28.8298 68.319 28.8298 68.319 28.837 68.3177C29.9223 68.1356 30.6543 67.1082 30.4722 66.023C30.2901 64.9377 29.2627 64.2057 28.1774 64.3878C28.1702 64.389 28.1702 64.389 28.163 64.3902C27.0778 64.5723 26.3457 65.5997 26.5278 66.6849C26.7099 67.7702 27.7373 68.5023 28.8225 68.3202ZM36.4725 66.9495C37.5532 66.7423 38.2612 65.6982 38.054 64.6175C37.8467 63.5368 36.8026 62.8288 35.7219 63.036C35.7147 63.0374 35.7147 63.0374 35.7075 63.0388C34.6269 63.246 33.9188 64.2901 34.126 65.3708C34.3333 66.4515 35.3773 67.1596 36.458 66.9523C36.4653 66.9509 36.4653 66.9509 36.4725 66.9495ZM43.8724 64.7948C43.8779 64.7935 43.8779 64.7935 43.8834 64.7923C44.6916 64.6101 45.199 63.8073 45.0169 62.9991C44.8347 62.191 44.0319 61.6835 43.2237 61.8657C43.2183 61.8669 43.2183 61.8669 43.2128 61.8682C42.4047 62.0503 41.8972 62.8531 42.0793 63.6612C42.2614 64.4694 43.0642 64.9769 43.8724 64.7948ZM51.4276 62.9083C51.433 62.9068 51.433 62.9068 51.4384 62.9053C52.2363 62.6826 52.7026 61.8552 52.4799 61.0573C52.2572 60.2593 51.4298 59.793 50.6319 60.0157C50.6267 60.0172 50.6267 60.0172 50.6214 60.0186C49.8235 60.2413 49.3571 61.0686 49.5797 61.8666C49.8023 62.6645 50.6297 63.1309 51.4276 62.9083ZM58.4138 59.6088C58.4168 59.6076 58.4168 59.6076 58.4198 59.6064C58.8557 59.437 59.0717 58.9462 58.9022 58.5102C58.7327 58.0743 58.242 57.8583 57.806 58.0278C57.8032 58.0289 57.8032 58.0289 57.8004 58.03C57.3644 58.1994 57.1483 58.6901 57.3177 59.1261C57.4871 59.562 57.9778 59.7781 58.4138 59.6088Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.44711 22.2886C5.45019 22.2882 5.45019 22.2882 5.45328 22.2878C5.91769 22.2325 6.24931 21.8111 6.19397 21.3467C6.13863 20.8823 5.71728 20.5507 5.25287 20.606C5.24981 20.6064 5.24981 20.6064 5.24674 20.6068C4.78233 20.6621 4.4507 21.0834 4.50603 21.5478C4.56136 22.0123 4.9827 22.3439 5.44711 22.2886ZM13.3486 22.1305C13.3541 22.1298 13.3541 22.1298 13.3596 22.129C14.1807 22.0193 14.7575 21.2648 14.6478 20.4436C14.5381 19.6225 13.7835 19.0457 12.9624 19.1554C12.9569 19.1562 12.9569 19.1562 12.9515 19.1569C12.1303 19.2666 11.5536 20.0211 11.6632 20.8423C11.7729 21.6634 12.5275 22.2402 13.3486 22.1305ZM21.0067 21.0493C21.0121 21.0485 21.0121 21.0485 21.0176 21.0477C21.8369 20.9254 22.4021 20.1621 22.2798 19.3428C22.1576 18.5234 21.3942 17.9583 20.5749 18.0805C20.5695 18.0813 20.5695 18.0813 20.564 18.0821C19.7447 18.2044 19.1795 18.9677 19.3018 19.787C19.424 20.6064 20.1873 21.1715 21.0067 21.0493ZM28.8225 20.4232C28.8298 20.422 28.8298 20.422 28.837 20.4208C29.9223 20.2387 30.6543 19.2113 30.4722 18.126C30.2901 17.0408 29.2627 16.3087 28.1774 16.4909C28.1702 16.4921 28.1702 16.4921 28.163 16.4933C27.0778 16.6754 26.3457 17.7028 26.5278 18.788C26.7099 19.8732 27.7373 20.6054 28.8225 20.4232ZM36.4725 19.0526C37.5532 18.8453 38.2612 17.8012 38.054 16.7205C37.8467 15.6399 36.8026 14.9318 35.7219 15.1391C35.7147 15.1405 35.7147 15.1405 35.7075 15.1419C34.6269 15.3491 33.9188 16.3932 34.126 17.4739C34.3333 18.5546 35.3773 19.2626 36.458 19.0554C36.4653 19.054 36.4653 19.054 36.4725 19.0526ZM43.8724 16.8948C43.8779 16.8935 43.8779 16.8935 43.8834 16.8923C44.6916 16.7101 45.199 15.9073 45.0169 15.0991C44.8347 14.291 44.0319 13.7835 43.2237 13.9657C43.2183 13.9669 43.2183 13.9669 43.2128 13.9682C42.4047 14.1503 41.8972 14.9531 42.0793 15.7612C42.2614 16.5694 43.0642 17.0769 43.8724 16.8948ZM51.4276 15.0083C51.433 15.0068 51.433 15.0068 51.4384 15.0053C52.2363 14.7826 52.7026 13.9552 52.4799 13.1573C52.2572 12.3593 51.4298 11.893 50.6319 12.1157C50.6267 12.1172 50.6267 12.1172 50.6214 12.1186C49.8235 12.3413 49.3571 13.1686 49.5797 13.9666C49.8023 14.7645 50.6297 15.2309 51.4276 15.0083ZM58.4198 12.3064C58.8557 12.137 59.0717 11.6462 58.9022 11.2102C58.7327 10.7743 58.242 10.5583 57.806 10.7278C57.8032 10.7289 57.8032 10.7289 57.8004 10.73C57.3644 10.8993 57.1483 11.3901 57.3177 11.8261C57.4871 12.262 57.9778 12.4781 58.4138 12.3088C58.4168 12.3076 58.4168 12.3076 58.4198 12.3064Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.6776 30.0965C5.68306 30.0959 5.68306 30.0959 5.68853 30.0952C6.51113 29.9972 7.09853 29.2509 7.0005 28.4283C6.90248 27.6056 6.15616 27.0183 5.33355 27.1163C5.32812 27.1169 5.32812 27.1169 5.32269 27.1176C4.50008 27.2156 3.91267 27.9619 4.01068 28.7845C4.10869 29.6071 4.85499 30.1945 5.6776 30.0965ZM13.3486 29.1274C13.3541 29.1267 13.3541 29.1267 13.3596 29.126C14.1807 29.0163 14.7575 28.2617 14.6478 27.4406C14.5381 26.6194 13.7835 26.0427 12.9624 26.1524C12.9569 26.1531 12.9569 26.1531 12.9515 26.1538C12.1303 26.2635 11.5536 27.018 11.6632 27.8392C11.7729 28.6603 12.5275 29.2371 13.3486 29.1274ZM21.1767 28.6256C21.184 28.6245 21.184 28.6245 21.1912 28.6235C22.2796 28.4611 23.0303 27.4471 22.8679 26.3588C22.7055 25.2704 21.6916 24.5197 20.6032 24.6821C20.596 24.6832 20.596 24.6832 20.5888 24.6842C19.5004 24.8466 18.7497 25.8605 18.9121 26.9489C19.0744 28.0373 20.0884 28.788 21.1767 28.6256ZM28.837 27.4177C29.9223 27.2356 30.6543 26.2082 30.4722 25.123C30.2901 24.0377 29.2627 23.3057 28.1774 23.4878C28.1702 23.489 28.1702 23.489 28.163 23.4902C27.0778 23.6723 26.3457 24.6997 26.5278 25.7849C26.7099 26.8702 27.7373 27.6023 28.8225 27.4202C28.8298 27.419 28.8298 27.419 28.837 27.4177ZM36.4725 26.0611C37.5532 25.8532 38.2612 24.806 38.054 23.7222C37.8467 22.6384 36.8026 21.9283 35.7219 22.1361C35.7147 22.1375 35.7147 22.1375 35.7075 22.1389C34.6269 22.3467 33.9188 23.3939 34.126 24.4777C34.3333 25.5616 35.3773 26.2717 36.458 26.0639C36.4653 26.0625 36.4653 26.0625 36.4725 26.0611ZM44.0707 24.4695C44.0781 24.4679 44.0781 24.4679 44.0854 24.4662C45.1588 24.2243 45.8328 23.158 45.5908 22.0846C45.3488 21.0112 44.2825 20.3372 43.2092 20.5792C43.2019 20.5808 43.2019 20.5808 43.1947 20.5825C42.1213 20.8244 41.4473 21.8906 41.6892 22.964C41.9311 24.0374 42.9973 24.7114 44.0707 24.4695ZM51.4276 22.0083C51.433 22.0068 51.433 22.0068 51.4384 22.0053C52.2363 21.7826 52.7026 20.9552 52.4799 20.1573C52.2572 19.3593 51.4298 18.893 50.6319 19.1157C50.6267 19.1172 50.6267 19.1172 50.6214 19.1186C49.8235 19.3413 49.3571 20.1686 49.5797 20.9666C49.8023 21.7645 50.6297 22.2309 51.4276 22.0083ZM58.9 19.5756C58.9052 19.5736 58.9052 19.5736 58.9105 19.5715C59.6826 19.2714 60.0652 18.4021 59.765 17.6299C59.4649 16.8578 58.5956 16.4752 57.8234 16.7754C57.8185 16.7773 57.8185 16.7773 57.8135 16.7793C57.0413 17.0793 56.6585 17.9485 56.9586 18.7207C57.2586 19.4929 58.1278 19.8756 58.9 19.5756Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.45328 36.6978C5.54647 36.6867 5.63432 36.6609 5.71477 36.6229C6.0352 36.4716 6.2382 36.1279 6.19397 35.7567C6.13863 35.2923 5.71728 34.9607 5.25287 35.016C5.24981 35.0164 5.24981 35.0164 5.24674 35.0168C4.78233 35.0721 4.4507 35.4934 4.50603 35.9578C4.56136 36.4223 4.9827 36.7539 5.44711 36.6986C5.45019 36.6982 5.45019 36.6982 5.45328 36.6978ZM13.3486 36.1274C13.3541 36.1267 13.3541 36.1267 13.3596 36.126C14.1807 36.0163 14.7575 35.2617 14.6478 34.4406C14.5381 33.6194 13.7835 33.0427 12.9624 33.1524C12.9569 33.1531 12.9569 33.1531 12.9515 33.1538C12.1303 33.2635 11.5536 34.018 11.6632 34.8392C11.7729 35.6603 12.5275 36.2371 13.3486 36.1274ZM21.0067 35.0462C21.0121 35.0454 21.0121 35.0454 21.0176 35.0446C21.8369 34.9224 22.4021 34.159 22.2798 33.3397C22.1576 32.5203 21.3942 31.9552 20.5749 32.0775C20.5695 32.0783 20.5695 32.0783 20.564 32.0791C19.7447 32.2013 19.1795 32.9646 19.3018 33.784C19.424 34.6033 20.1873 35.1685 21.0067 35.0462ZM28.8225 34.4202C28.8298 34.419 28.8298 34.419 28.837 34.4177C29.9223 34.2356 30.6543 33.2082 30.4722 32.123C30.2901 31.0377 29.2627 30.3057 28.1774 30.4878C28.1702 30.489 28.1702 30.489 28.163 30.4902C27.0778 30.6723 26.3457 31.6997 26.5278 32.7849C26.7099 33.8702 27.7373 34.6023 28.8225 34.4202ZM36.4725 33.0495C37.5532 32.8423 38.2612 31.7982 38.054 30.7175C37.8467 29.6368 36.8026 28.9288 35.7219 29.136C35.7147 29.1374 35.7147 29.1374 35.7075 29.1388C34.6269 29.346 33.9188 30.3901 34.126 31.4708C34.3333 32.5515 35.3773 33.2596 36.458 33.0523C36.4653 33.0509 36.4653 33.0509 36.4725 33.0495ZM43.8724 30.8948C43.8779 30.8935 43.8779 30.8935 43.8834 30.8923C44.6916 30.7101 45.199 29.9073 45.0169 29.0991C44.8347 28.291 44.0319 27.7835 43.2237 27.9657C43.2183 27.9669 43.2183 27.9669 43.2128 27.9682C42.4047 28.1503 41.8972 28.9531 42.0793 29.7612C42.2614 30.5694 43.0642 31.0769 43.8724 30.8948ZM51.4276 29.0083C51.433 29.0068 51.433 29.0068 51.4384 29.0053C52.2363 28.7826 52.7026 27.9552 52.4799 27.1573C52.2572 26.3593 51.4298 25.893 50.6319 26.1157C50.6267 26.1172 50.6267 26.1172 50.6214 26.1186C49.8235 26.3413 49.3571 27.1686 49.5797 27.9666C49.8023 28.7645 50.6297 29.2309 51.4276 29.0083ZM58.4138 25.7088C58.4168 25.7076 58.4168 25.7076 58.4198 25.7064C58.8557 25.537 59.0717 25.0462 58.9022 24.6102C58.7327 24.1743 58.242 23.9583 57.806 24.1278C57.8032 24.1289 57.8032 24.1289 57.8004 24.13C57.3644 24.2993 57.1483 24.7901 57.3177 25.2261C57.4871 25.662 57.9778 25.8781 58.4138 25.7088Z" fill="white"/>
+</svg>
diff --git a/docs/images/martin.jpg b/docs/_assets/images/martin.jpg
similarity index 100%
rename from docs/images/martin.jpg
rename to docs/_assets/images/martin.jpg
diff --git a/docs/images/nico.jpg b/docs/_assets/images/nico.jpg
similarity index 100%
rename from docs/images/nico.jpg
rename to docs/_assets/images/nico.jpg
diff --git a/docs/images/olivier.jpg b/docs/_assets/images/olivier.jpg
similarity index 100%
rename from docs/images/olivier.jpg
rename to docs/_assets/images/olivier.jpg
diff --git a/docs/images/others/scala-days-logo.png b/docs/_assets/images/others/scala-days-logo.png
similarity index 100%
rename from docs/images/others/scala-days-logo.png
rename to docs/_assets/images/others/scala-days-logo.png
diff --git a/docs/images/petrashko.jpg b/docs/_assets/images/petrashko.jpg
similarity index 100%
rename from docs/images/petrashko.jpg
rename to docs/_assets/images/petrashko.jpg
diff --git a/docs/images/preview.png b/docs/_assets/images/preview.png
similarity index 100%
rename from docs/images/preview.png
rename to docs/_assets/images/preview.png
diff --git a/docs/images/scala-logo.svg b/docs/_assets/images/scala-logo.svg
similarity index 100%
rename from docs/images/scala-logo.svg
rename to docs/_assets/images/scala-logo.svg
diff --git a/docs/images/scaladoc-logo.png b/docs/_assets/images/scaladoc-logo.png
similarity index 100%
rename from docs/images/scaladoc-logo.png
rename to docs/_assets/images/scaladoc-logo.png
diff --git a/docs/_assets/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif b/docs/_assets/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif
new file mode 100644
index 000000000000..1cc25b5683f7
Binary files /dev/null and b/docs/_assets/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif differ
diff --git a/docs/_assets/images/scaladoc/nightly.gif b/docs/_assets/images/scaladoc/nightly.gif
new file mode 100644
index 000000000000..d6e764a032d5
Binary files /dev/null and b/docs/_assets/images/scaladoc/nightly.gif differ
diff --git a/docs/images/smarter.jpg b/docs/_assets/images/smarter.jpg
similarity index 100%
rename from docs/images/smarter.jpg
rename to docs/_assets/images/smarter.jpg
diff --git a/docs/images/worksheets/config-autorun.png b/docs/_assets/images/worksheets/config-autorun.png
similarity index 100%
rename from docs/images/worksheets/config-autorun.png
rename to docs/_assets/images/worksheets/config-autorun.png
diff --git a/docs/images/worksheets/worksheet-demo.gif b/docs/_assets/images/worksheets/worksheet-demo.gif
similarity index 100%
rename from docs/images/worksheets/worksheet-demo.gif
rename to docs/_assets/images/worksheets/worksheet-demo.gif
diff --git a/docs/images/worksheets/worksheet-help.png b/docs/_assets/images/worksheets/worksheet-help.png
similarity index 100%
rename from docs/images/worksheets/worksheet-help.png
rename to docs/_assets/images/worksheets/worksheet-help.png
diff --git a/docs/images/worksheets/worksheet-run.png b/docs/_assets/images/worksheets/worksheet-run.png
similarity index 100%
rename from docs/images/worksheets/worksheet-run.png
rename to docs/_assets/images/worksheets/worksheet-run.png
diff --git a/docs/js/api-search.js b/docs/_assets/js/api-search.js
similarity index 100%
rename from docs/js/api-search.js
rename to docs/_assets/js/api-search.js
diff --git a/docs/js/bootstrap.min.js b/docs/_assets/js/bootstrap.min.js
similarity index 100%
rename from docs/js/bootstrap.min.js
rename to docs/_assets/js/bootstrap.min.js
diff --git a/docs/js/highlight.pack.js b/docs/_assets/js/highlight.pack.js
similarity index 100%
rename from docs/js/highlight.pack.js
rename to docs/_assets/js/highlight.pack.js
diff --git a/docs/js/jquery.min.js b/docs/_assets/js/jquery.min.js
similarity index 100%
rename from docs/js/jquery.min.js
rename to docs/_assets/js/jquery.min.js
diff --git a/docs/js/sidebar.js b/docs/_assets/js/sidebar.js
similarity index 100%
rename from docs/js/sidebar.js
rename to docs/_assets/js/sidebar.js
diff --git a/docs/js/toolbar.js b/docs/_assets/js/toolbar.js
similarity index 100%
rename from docs/js/toolbar.js
rename to docs/_assets/js/toolbar.js
diff --git a/docs/_assets/resources/safer-exceptions.pdf b/docs/_assets/resources/safer-exceptions.pdf
new file mode 100644
index 000000000000..1a10ab6c0e46
Binary files /dev/null and b/docs/_assets/resources/safer-exceptions.pdf differ
diff --git a/docs/blog/_posts/2015-10-23-dotty-compiler-bootstraps.md b/docs/_blog/_posts/2015-10-23-dotty-compiler-bootstraps.md
similarity index 100%
rename from docs/blog/_posts/2015-10-23-dotty-compiler-bootstraps.md
rename to docs/_blog/_posts/2015-10-23-dotty-compiler-bootstraps.md
diff --git a/docs/blog/_posts/2016-01-02-new-year-resolutions.md b/docs/_blog/_posts/2016-01-02-new-year-resolutions.md
similarity index 100%
rename from docs/blog/_posts/2016-01-02-new-year-resolutions.md
rename to docs/_blog/_posts/2016-01-02-new-year-resolutions.md
diff --git a/docs/blog/_posts/2016-02-03-essence-of-scala.md b/docs/_blog/_posts/2016-02-03-essence-of-scala.md
similarity index 100%
rename from docs/blog/_posts/2016-02-03-essence-of-scala.md
rename to docs/_blog/_posts/2016-02-03-essence-of-scala.md
diff --git a/docs/blog/_posts/2016-02-17-scaling-dot-soundness.md b/docs/_blog/_posts/2016-02-17-scaling-dot-soundness.md
similarity index 100%
rename from docs/blog/_posts/2016-02-17-scaling-dot-soundness.md
rename to docs/_blog/_posts/2016-02-17-scaling-dot-soundness.md
diff --git a/docs/blog/_posts/2016-05-05-multiversal-equality.md b/docs/_blog/_posts/2016-05-05-multiversal-equality.md
similarity index 100%
rename from docs/blog/_posts/2016-05-05-multiversal-equality.md
rename to docs/_blog/_posts/2016-05-05-multiversal-equality.md
diff --git a/docs/blog/_posts/2016-12-05-implicit-function-types.md b/docs/_blog/_posts/2016-12-05-implicit-function-types.md
similarity index 100%
rename from docs/blog/_posts/2016-12-05-implicit-function-types.md
rename to docs/_blog/_posts/2016-12-05-implicit-function-types.md
diff --git a/docs/blog/_posts/2017-05-31-first-dotty-milestone-release.md b/docs/_blog/_posts/2017-05-31-first-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2017-05-31-first-dotty-milestone-release.md
rename to docs/_blog/_posts/2017-05-31-first-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2017-07-12-second-dotty-milestone-release.md b/docs/_blog/_posts/2017-07-12-second-dotty-milestone-release.md
similarity index 98%
rename from docs/blog/_posts/2017-07-12-second-dotty-milestone-release.md
rename to docs/_blog/_posts/2017-07-12-second-dotty-milestone-release.md
index 19de33740776..aa71d62ffc97 100644
--- a/docs/blog/_posts/2017-07-12-second-dotty-milestone-release.md
+++ b/docs/_blog/_posts/2017-07-12-second-dotty-milestone-release.md
@@ -10,7 +10,7 @@ Today, we are excited to release Dotty version 0.2.0-RC1. This release
 serves as a technology preview that demonstrates new language features
 and the compiler supporting them.
 
-This release is based on the [previous milestone](/blog/_posts/2017-05-31-first-dotty-milestone-release.html).
+This release is based on the [previous milestone](/_blog/_posts/2017-05-31-first-dotty-milestone-release.html).
 The highlights of this release are:
  - substantial improvement of quality of generated code for pattern matching
  - improvements in VS Code IDE stability
@@ -24,7 +24,7 @@ The highlights of this release are:
 This is our second scheduled release according to our [6-week release schedule](https://dotty.epfl.ch/docs/usage/version-numbers.html).
 
 ## What’s in the 0.2.0-RC1 technology preview?
-The [previous technology preview](/blog/_posts/2017-05-31-first-dotty-milestone-release.html) has shipped new language features planned for Scala 3:
+The [previous technology preview](/_blog/_posts/2017-05-31-first-dotty-milestone-release.html) has shipped new language features planned for Scala 3:
 [Intersection Types](https://dotty.epfl.ch/docs/reference/new-types/intersection-types.html),
 [Union Types](https://dotty.epfl.ch/docs/reference/new-types/union-types.html),
 [Trait Parameters](https://dotty.epfl.ch/docs/reference/other-new-features/trait-parameters.html),
diff --git a/docs/blog/_posts/2017-09-07-third-dotty-milestone-release.md b/docs/_blog/_posts/2017-09-07-third-dotty-milestone-release.md
similarity index 98%
rename from docs/blog/_posts/2017-09-07-third-dotty-milestone-release.md
rename to docs/_blog/_posts/2017-09-07-third-dotty-milestone-release.md
index d07c5d518f19..eb20292884f1 100644
--- a/docs/blog/_posts/2017-09-07-third-dotty-milestone-release.md
+++ b/docs/_blog/_posts/2017-09-07-third-dotty-milestone-release.md
@@ -20,7 +20,7 @@ You can learn more about Dotty on our [website](http://dotty.epfl.ch).
 <!--more-->
 
 This is our third scheduled release according to our [6-week release schedule](https://dotty.epfl.ch/docs/usage/version-numbers.html).
-The [previous technology preview](/blog/_posts/2017-07-12-second-dotty-milestone-release.html) improved
+The [previous technology preview](/_blog/_posts/2017-07-12-second-dotty-milestone-release.html) improved
 stability and reliability:
 
  - substantial improvement of quality of generated code for pattern matching
diff --git a/docs/blog/_posts/2017-10-16-fourth-dotty-milestone-release.md b/docs/_blog/_posts/2017-10-16-fourth-dotty-milestone-release.md
similarity index 98%
rename from docs/blog/_posts/2017-10-16-fourth-dotty-milestone-release.md
rename to docs/_blog/_posts/2017-10-16-fourth-dotty-milestone-release.md
index 52a1f6914034..4990ec198aa0 100644
--- a/docs/blog/_posts/2017-10-16-fourth-dotty-milestone-release.md
+++ b/docs/_blog/_posts/2017-10-16-fourth-dotty-milestone-release.md
@@ -20,7 +20,7 @@ You can learn more about Dotty on our [website](http://dotty.epfl.ch).
 <!--more-->
 
 This is our fourth scheduled release according to our [6-week release schedule](https://dotty.epfl.ch/docs/usage/version-numbers.html).
-The [previous technology preview](/blog/_posts/2017-09-07-third-dotty-milestone-release.html) improved
+The [previous technology preview](/_blog/_posts/2017-09-07-third-dotty-milestone-release.html) improved
 stability and reliability.
 
 ## What’s new in the 0.4.0-RC1 technology preview?
diff --git a/docs/blog/_posts/2017-12-01-fifth-dotty-milestone-release.md b/docs/_blog/_posts/2017-12-01-fifth-dotty-milestone-release.md
similarity index 98%
rename from docs/blog/_posts/2017-12-01-fifth-dotty-milestone-release.md
rename to docs/_blog/_posts/2017-12-01-fifth-dotty-milestone-release.md
index 8204771b3134..98fa6e127088 100644
--- a/docs/blog/_posts/2017-12-01-fifth-dotty-milestone-release.md
+++ b/docs/_blog/_posts/2017-12-01-fifth-dotty-milestone-release.md
@@ -20,7 +20,7 @@ You can learn more about Dotty on our [website](http://dotty.epfl.ch).
 <!--more-->
 
 This is our fifth scheduled release according to our [6-week release schedule](https://dotty.epfl.ch/docs/usage/version-numbers.html).
-The [previous technology preview](/blog/_posts/2017-10-16-fourth-dotty-milestone-release.html) added
+The [previous technology preview](/_blog/_posts/2017-10-16-fourth-dotty-milestone-release.html) added
 support for Scala 2.12 and came with a brand new REPL.
 
 ## What’s new in the 0.5.0-RC1 technology preview?
diff --git a/docs/blog/_posts/2018-03-05-seventh-dotty-milestone-release.md b/docs/_blog/_posts/2018-03-05-seventh-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2018-03-05-seventh-dotty-milestone-release.md
rename to docs/_blog/_posts/2018-03-05-seventh-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2018-04-27-eighth-dotty-milestone-release.md b/docs/_blog/_posts/2018-04-27-eighth-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2018-04-27-eighth-dotty-milestone-release.md
rename to docs/_blog/_posts/2018-04-27-eighth-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2018-07-06-ninth-dotty-milestone-release.md b/docs/_blog/_posts/2018-07-06-ninth-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2018-07-06-ninth-dotty-milestone-release.md
rename to docs/_blog/_posts/2018-07-06-ninth-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2018-10-10-10th-dotty-milestone-release.md b/docs/_blog/_posts/2018-10-10-10th-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2018-10-10-10th-dotty-milestone-release.md
rename to docs/_blog/_posts/2018-10-10-10th-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2018-11-30-11th-dotty-milestone-release.md b/docs/_blog/_posts/2018-11-30-11th-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2018-11-30-11th-dotty-milestone-release.md
rename to docs/_blog/_posts/2018-11-30-11th-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2019-01-21-12th-dotty-milestone-release.md b/docs/_blog/_posts/2019-01-21-12th-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2019-01-21-12th-dotty-milestone-release.md
rename to docs/_blog/_posts/2019-01-21-12th-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2019-03-05-13th-dotty-milestone-release.md b/docs/_blog/_posts/2019-03-05-13th-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2019-03-05-13th-dotty-milestone-release.md
rename to docs/_blog/_posts/2019-03-05-13th-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2019-04-15-14th-dotty-milestone-release.md b/docs/_blog/_posts/2019-04-15-14th-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2019-04-15-14th-dotty-milestone-release.md
rename to docs/_blog/_posts/2019-04-15-14th-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2019-05-23-15th-dotty-milestone-release.md b/docs/_blog/_posts/2019-05-23-15th-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2019-05-23-15th-dotty-milestone-release.md
rename to docs/_blog/_posts/2019-05-23-15th-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md b/docs/_blog/_posts/2019-06-11-16th-dotty-milestone-release.md
similarity index 99%
rename from docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md
rename to docs/_blog/_posts/2019-06-11-16th-dotty-milestone-release.md
index e3d81f6c3df5..41194df26625 100644
--- a/docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md
+++ b/docs/_blog/_posts/2019-06-11-16th-dotty-milestone-release.md
@@ -156,7 +156,7 @@ enum B(val gravity: Double) extends java.lang.Enum[B] {
 }
 ```
 
-For more information please check the [test case](https://github.com/lampepfl/dotty/tree/master/tests/run/enum-java) and
+For more information please check the [test case](https://github.com/lampepfl/dotty/tree/main/tests/run/enum-java) and
 also the relevant PRs [#6602](https://github.com/lampepfl/dotty/pull/6602) and
 [#6629](https://github.com/lampepfl/dotty/pull/6629).
 
diff --git a/docs/blog/_posts/2019-07-25-17th-dotty-milestone-release.md b/docs/_blog/_posts/2019-07-25-17th-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2019-07-25-17th-dotty-milestone-release.md
rename to docs/_blog/_posts/2019-07-25-17th-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2019-08-30-18th-dotty-milestone-release.md b/docs/_blog/_posts/2019-08-30-18th-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2019-08-30-18th-dotty-milestone-release.md
rename to docs/_blog/_posts/2019-08-30-18th-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2019-09-23-19th-dotty-milestone-release.md b/docs/_blog/_posts/2019-09-23-19th-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2019-09-23-19th-dotty-milestone-release.md
rename to docs/_blog/_posts/2019-09-23-19th-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2019-11-04-20th-dotty-milestone-release.md b/docs/_blog/_posts/2019-11-04-20th-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2019-11-04-20th-dotty-milestone-release.md
rename to docs/_blog/_posts/2019-11-04-20th-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md b/docs/_blog/_posts/2019-12-20-21th-dotty-milestone-release.md
similarity index 99%
rename from docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md
rename to docs/_blog/_posts/2019-12-20-21th-dotty-milestone-release.md
index 6b5d28c35254..94d8ee61bec9 100644
--- a/docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md
+++ b/docs/_blog/_posts/2019-12-20-21th-dotty-milestone-release.md
@@ -48,7 +48,7 @@ It means that we can now put the Scala 3 compiler under heavy load, getting it
 ready for industrial strength applications. At the moment we have 23
 projects on our community projects and we expect this number to go up!
 
-> https://github.com/lampepfl/dotty/tree/master/community-build/community-projects
+> https://github.com/lampepfl/dotty/tree/main/community-build/community-projects
 
 This project contains tests to build and test a corpus of open sources Scala 2.x
 projects against Scala 3.
diff --git a/docs/blog/_posts/2020-02-05-22nd-dotty-milestone-release.md b/docs/_blog/_posts/2020-02-05-22nd-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2020-02-05-22nd-dotty-milestone-release.md
rename to docs/_blog/_posts/2020-02-05-22nd-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2020-03-18-23rd-dotty-milestone-release.md b/docs/_blog/_posts/2020-03-18-23rd-dotty-milestone-release.md
similarity index 100%
rename from docs/blog/_posts/2020-03-18-23rd-dotty-milestone-release.md
rename to docs/_blog/_posts/2020-03-18-23rd-dotty-milestone-release.md
diff --git a/docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md b/docs/_blog/_posts/2020-04-29-24th-dotty-milestone-release.md
similarity index 99%
rename from docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md
rename to docs/_blog/_posts/2020-04-29-24th-dotty-milestone-release.md
index d4f34446e5c4..e32df8cacc55 100644
--- a/docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md
+++ b/docs/_blog/_posts/2020-04-29-24th-dotty-milestone-release.md
@@ -134,7 +134,7 @@ We are looking forward to having you join the team of contributors.
 
 Dotty now has a set of widely-used community libraries that are built against every nightly Dotty
 snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants.
-Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build)
+Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build)
 to make sure that our regression suite includes your library.
 
 [Scastie]: https://scastie.scala-lang.org/?target=dotty
diff --git a/docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md b/docs/_blog/_posts/2020-06-22-25th-dotty-milestone-release.md
similarity index 99%
rename from docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md
rename to docs/_blog/_posts/2020-06-22-25th-dotty-milestone-release.md
index 8989a2f7b410..dd5def04bfe9 100644
--- a/docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md
+++ b/docs/_blog/_posts/2020-06-22-25th-dotty-milestone-release.md
@@ -98,7 +98,7 @@ We are looking forward to having you join the team of contributors.
 
 Dotty now has a set of widely-used community libraries that are built against every nightly Dotty
 snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants.
-Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build)
+Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build)
 to make sure that our regression suite includes your library.
 
 [Scastie]: https://scastie.scala-lang.org/?target=dotty
diff --git a/docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md b/docs/_blog/_posts/2020-07-27-26th-dotty-milestone-release.md
similarity index 99%
rename from docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md
rename to docs/_blog/_posts/2020-07-27-26th-dotty-milestone-release.md
index 06a76455e433..b0d153dded7e 100644
--- a/docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md
+++ b/docs/_blog/_posts/2020-07-27-26th-dotty-milestone-release.md
@@ -128,7 +128,7 @@ We are looking forward to having you join the team of contributors.
 
 Dotty now has a set of widely-used community libraries that are built against every nightly Dotty
 snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants.
-Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build)
+Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build)
 to make sure that our regression suite includes your library.
 
 [Scastie]: https://scastie.scala-lang.org/?target=dotty
diff --git a/docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md b/docs/_blog/_posts/2020-08-31-27th-dotty-milestone-release.md
similarity index 99%
rename from docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md
rename to docs/_blog/_posts/2020-08-31-27th-dotty-milestone-release.md
index 641db674abb6..e42e98a1385b 100644
--- a/docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md
+++ b/docs/_blog/_posts/2020-08-31-27th-dotty-milestone-release.md
@@ -109,7 +109,7 @@ We are looking forward to having you join the team of contributors.
 
 Dotty now has a set of widely-used community libraries that are built against every nightly Dotty
 snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants.
-Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build)
+Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build)
 to make sure that our regression suite includes your library.
 
 [Scastie]: https://scastie.scala-lang.org/?target=dotty
diff --git a/docs/blog/_posts/2020-09-21-naming-schema-change.md b/docs/_blog/_posts/2020-09-21-naming-schema-change.md
similarity index 100%
rename from docs/blog/_posts/2020-09-21-naming-schema-change.md
rename to docs/_blog/_posts/2020-09-21-naming-schema-change.md
diff --git a/docs/blog/_posts/2020-11-09-scala3-m1.md b/docs/_blog/_posts/2020-11-09-scala3-m1.md
similarity index 99%
rename from docs/blog/_posts/2020-11-09-scala3-m1.md
rename to docs/_blog/_posts/2020-11-09-scala3-m1.md
index 5292ad0e8344..ffef5618f9ff 100644
--- a/docs/blog/_posts/2020-11-09-scala3-m1.md
+++ b/docs/_blog/_posts/2020-11-09-scala3-m1.md
@@ -199,7 +199,7 @@ We are looking forward to having you join the team of contributors.
 
 Dotty now has a set of widely-used community libraries that are built against every nightly Dotty
 snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants.
-Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build)
+Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build)
 to make sure that our regression suite includes your library.
 
 [Scastie]: https://scastie.scala-lang.org/?target=dotty
diff --git a/docs/blog/_posts/2020-12-18-scala3-m3.md b/docs/_blog/_posts/2020-12-18-scala3-m3.md
similarity index 99%
rename from docs/blog/_posts/2020-12-18-scala3-m3.md
rename to docs/_blog/_posts/2020-12-18-scala3-m3.md
index e0cba2b144d8..41cfa76c0265 100644
--- a/docs/blog/_posts/2020-12-18-scala3-m3.md
+++ b/docs/_blog/_posts/2020-12-18-scala3-m3.md
@@ -231,7 +231,7 @@ We are looking forward to having you join the team of contributors.
 
 ## Library authors: Join our community build
 
-Scala 3 is regularly tested against a sample of libraries known as the "community build". You can add your library to the [community build](https://github.com/lampepfl/dotty/tree/master/community-build) by submitting a PR.
+Scala 3 is regularly tested against a sample of libraries known as the "community build". You can add your library to the [community build](https://github.com/lampepfl/dotty/tree/main/community-build) by submitting a PR.
 
 [Scastie]: https://scastie.scala-lang.org/?target=dotty
 
diff --git a/docs/blog/_posts/2021-02-17-scala3-rc1.md b/docs/_blog/_posts/2021-02-17-scala3-rc1.md
similarity index 100%
rename from docs/blog/_posts/2021-02-17-scala3-rc1.md
rename to docs/_blog/_posts/2021-02-17-scala3-rc1.md
diff --git a/docs/blog/_posts/2021-03-31-scala3-rc2.md b/docs/_blog/_posts/2021-03-31-scala3-rc2.md
similarity index 99%
rename from docs/blog/_posts/2021-03-31-scala3-rc2.md
rename to docs/_blog/_posts/2021-03-31-scala3-rc2.md
index 8e4439037be5..178dfabfbffc 100644
--- a/docs/blog/_posts/2021-03-31-scala3-rc2.md
+++ b/docs/_blog/_posts/2021-03-31-scala3-rc2.md
@@ -116,7 +116,7 @@ We are looking forward to having you join the team of contributors.
 
 Dotty now has a set of widely-used community libraries that are built against every nightly Dotty
 snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants.
-Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build)
+Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build)
 to make sure that our regression suite includes your library.
 
 [Scastie]: https://scastie.scala-lang.org/?target=dotty
diff --git a/docs/_blog/_posts/2021-04-21-scala3-rc3.md b/docs/_blog/_posts/2021-04-21-scala3-rc3.md
new file mode 100644
index 000000000000..8651730da93a
--- /dev/null
+++ b/docs/_blog/_posts/2021-04-21-scala3-rc3.md
@@ -0,0 +1,70 @@
+---
+layout: blog-page
+title: Scala 3.0.0-RC3 – bug fixes for 3.0.0 stable
+author: Anatolii Kmetiuk
+authorImg: /images/anatolii.png
+date: 2021-04-21
+---
+
+Hello! With this blog article, we would like to announce the release of Scala 3.0.0-RC3. Some critical bugs were discovered during the previous release cycle, whose fixes had to be included in 3.0.0 stable. Therefore, we are having RC3 to give the community time to test our fixes.
+
+This release also impacts the release date for 3.0.0 stable. 3.0.0 stable will get a green light if no critical bugs are discovered until May 12th. Otherwise we may need to have an RC4.
+
+<!--more-->
+
+# Bug fixes included
+- Fix type test for trait parameter arguments [#12066](https://github.com/lampepfl/dotty/pull/12066)
+- Set file filter correctly [#12119](https://github.com/lampepfl/dotty/pull/12119)
+- Provide mirror support after inlining [#12079](https://github.com/lampepfl/dotty/pull/12079)
+- Revert "Recursively check nonvariant arguments of base types for realizability" [#12067](https://github.com/lampepfl/dotty/pull/12067)
+- When simplifying match types, ensure fully defined before reducing [#12068](https://github.com/lampepfl/dotty/pull/12068)
+- sbt-dotty: the binary version is 3 for Scala >= 3.0.0 [#12084](https://github.com/lampepfl/dotty/pull/12084)
+- Fix isInstanceOf[Array[?]] returning true on non-Array [#12108](https://github.com/lampepfl/dotty/pull/12108)
+- Scala2Unpickler: don't unpickle the same type parameter twice [#12129](https://github.com/lampepfl/dotty/pull/12129)
+- Overloading resolution: Handle SAM types more like Java and Scala 2 [#12131](https://github.com/lampepfl/dotty/pull/12131)
+- Add TermParamClause.isGiven [#12042](https://github.com/lampepfl/dotty/pull/12042)
+
+## Contributors
+Thank you to all the contributors who made this release possible 🎉
+
+According to `git shortlog -sn --no-merges 3.0.0-RC2..3.0.0-RC3` these are:
+
+```
+     8  Martin Odersky
+     7  Adrien Piquerez
+     6  Guillaume Martres
+     4  Liu Fengyun
+     1  Anatolii Kmetiuk
+     1  Nicolas Stucki
+```
+
+If you want to get your hands dirty and contribute to Dotty, now is a good time to get involved!
+Head to our [Getting Started page for new contributors](https://dotty.epfl.ch/docs/contributing/getting-started.html),
+and have a look at some of the [good first issues](https://github.com/lampepfl/dotty/issues?q=is%3Aissue+is%3Aopen+label%3Aexp%3Anovice).
+They make perfect entry points into hacking on the compiler.
+
+We are looking forward to having you join the team of contributors.
+
+## Library authors: Join our community build
+
+Dotty now has a set of widely-used community libraries that are built against every nightly Dotty
+snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants.
+Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build)
+to make sure that our regression suite includes your library.
+
+[Scastie]: https://scastie.scala-lang.org/?target=dotty
+
+[@odersky]: https://github.com/odersky
+[@DarkDimius]: https://github.com/DarkDimius
+[@smarter]: https://github.com/smarter
+[@felixmulder]: https://github.com/felixmulder
+[@nicolasstucki]: https://github.com/nicolasstucki
+[@liufengyun]: https://github.com/liufengyun
+[@OlivierBlanvillain]: https://github.com/OlivierBlanvillain
+[@biboudis]: https://github.com/biboudis
+[@allanrenucci]: https://github.com/allanrenucci
+[@Blaisorblade]: https://github.com/Blaisorblade
+[@Duhemm]: https://github.com/Duhemm
+[@AleksanderBG]: https://github.com/AleksanderBG
+[@milessabin]: https://github.com/milessabin
+[@anatoliykmetyuk]: https://github.com/anatoliykmetyuk
diff --git a/docs/_blog/_posts/2021-06-07-scala3.0.1-rc1-release.md b/docs/_blog/_posts/2021-06-07-scala3.0.1-rc1-release.md
new file mode 100644
index 000000000000..e9fac2d0447c
--- /dev/null
+++ b/docs/_blog/_posts/2021-06-07-scala3.0.1-rc1-release.md
@@ -0,0 +1,168 @@
+---
+layout: blog-page
+title: Scala 3.0.1-RC1 – further stabilising the compiler
+author: Anatolii Kmetiuk
+authorImg: /images/anatolii.png
+date: 2021-06-07
+---
+
+Hello! We are happy to announce Scala 3.0.1-RC1 – the first release candidate in the post-3.0.0 era. With this release, we continue the work on making the compiler even more stable.
+
+<!--more-->
+
+# Experimental language features policy
+Research and experimentation has always been an integral part of the Scala community's culture. That's what made Scala the language it is right now. Like many things in engineering, however, it's a part of a trade-off between experimentation and stability. Experimenting is fun and insightful, but when stakes on your project are high, stability becomes a priority.
+
+Therefore, to ensure wide adoption of the language and its reliability in wide range of applications, we need to balance the two. We would like to have the room for trying new things out – but while doing so, we would like to keep in mind an ordinary Scala user who may not necessarily be interested in the bleeding edge and who would like their Scala dependencies and code to simply work. In the post-3.0.0 era, we must prioritize stability.
+
+With this release, we are introducing a restriction on [features marked as experimental](https://dotty.epfl.ch/api/scala/language$$experimental$.html). Now, it is not possible to use them from stable or `RC` releases. If you would like to experiment with them, you need to use a `NIGHTLY` version of the compiler. Nightlies are published every 24 hours, and you can find them on [Maven](https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/).
+
+The spirit of this policy is to make sure that effectively, no library published for Scala 3 contain experimental features. This way, what is experimental can be easily changed and is not subject to the guarantees of the wider language. And, most importantly, the changes to such features would not affect the community *in practice* – the guarantee not achievable if we just announced the policy without implementing a mechanism to enforce it.
+
+Having said that, we still encourage people to play with the experimental features from the `NIGHTLY` compiler versions and discuss their findings. Without the curious and adventurous part of the community playing with the new features, there is no way of knowing what they are good for, and no way to decide whether they should be dropped or promoted to a stable feature.
+
+More about this change you can read in the PR [#12102](https://github.com/lampepfl/dotty/pull/12102).
+
+# Kind-projector work
+This release also brings extra features for the [Kind Projector](https://docs.scala-lang.org/scala3/guides/migration/plugin-kind-projector.html) migration support. First, PR [#12378](https://github.com/lampepfl/dotty/pull/12378) allows `_` as type lambda placeholder. Second, PR [#12341](https://github.com/lampepfl/dotty/pull/12341) brings support for the variance annotations on the placeholder. This work enhances the ability to cross-compile Scala 2 code that uses the Kind Projector plugin to Scala 3.
+
+# Improved error reporting
+Down the error reporting lane, match type reduction errors were improved. When using a match type, it may or may not reduce to one of its cases. If it doesn't match type is used as specified, e.g. if `M[T]` is a match type and it didn't reduce for `M[Int]`, `M[Int]` will be used. This behavior, however, is frequently not what you want: there is a lot of cases where you would expect a match type to reduce but it doesn't. In such cases, it would be nice to have some diagnostic regarding why it didn't reduce. PR [#12053](https://github.com/lampepfl/dotty/pull/12053/) adds just such a diagnostic. E.g. the following code:
+
+```scala
+trait A
+trait B
+type M[X] = X match
+  case A => Int
+  case B => String
+val x: String = ??? : M[B] // error
+```
+
+will report the following error:
+
+```
+6 |val x: String = ??? : M[B] // error
+  |                ^^^^^^^^^^
+  |                Found:    M[B]
+  |                Required: String
+  |
+  |                Note: a match type could not be fully reduced:
+  |
+  |                  trying to reduce  M[B]
+  |                  failed since selector  B
+  |                  does not match  case A => Int
+  |                  and cannot be shown to be disjoint from it either.
+  |                  Therefore, reduction cannot advance to the remaining case
+  |
+  |                    case B => String
+```
+
+# Scaladoc
+We have updated the [documentation](http://dotty.epfl.ch/docs/usage/scaladoc/index.html) for Scaladoc making it easier for you to get started. Also, PR [#11582](https://github.com/lampepfl/dotty/pull/11582) has added the snippet compiler to ensure the snippets in your scaladoc documentation comments aren't broken. You can read more about this feature on the [mailing list](https://contributors.scala-lang.org/t/snippet-validation-in-scaladoc-for-scala-3/4976).
+
+# Metaprogramming
+A lot of metaprogramming work was focused on improving the performance. Some of the notable PRs include:
+
+- Cache quote unpickling [#12242](https://github.com/lampepfl/dotty/pull/12242)
+- Avoid pickled tasty for some captured quote reference [#12248](https://github.com/lampepfl/dotty/pull/12248)
+- Improve quote matcher performance [#12418](https://github.com/lampepfl/dotty/pull/12418)
+- Port scala.quoted.runtime.impl.QuoteMatcher [#12402](https://github.com/lampepfl/dotty/pull/12402)
+
+
+# Issue fixing
+Otherwise, we are making an effort to reduce our issue tracker. Among others, the following are some of the PRs dedicated to issue fixing:
+
+- IArray.toArray: Deprecate broken method [#12598](https://github.com/lampepfl/dotty/pull/12598)
+- Fix comparison of dependent function types [#12214](https://github.com/lampepfl/dotty/pull/12214)
+- Make translucentSuperType handle match types [#12153](https://github.com/lampepfl/dotty/pull/12153)
+- Harden Type Inference [#12560](https://github.com/lampepfl/dotty/pull/12560)
+- Reject references to self in super constructor calls [#12567](https://github.com/lampepfl/dotty/pull/12567)
+- Provide mirror support after inlining [#12062](https://github.com/lampepfl/dotty/pull/12062)
+- Allow export paths to see imports [#12134](https://github.com/lampepfl/dotty/pull/12134)
+- Streamline given syntax [#12107](https://github.com/lampepfl/dotty/pull/12107)
+- Export constructor proxies [#12311](https://github.com/lampepfl/dotty/pull/12311)
+- Identify package and nested package object in isSubPrefix [#12297](https://github.com/lampepfl/dotty/pull/12297)
+- Treat Refinements more like AndTypes [#12317](https://github.com/lampepfl/dotty/pull/12317)
+- Fix [#9871](https://github.com/lampepfl/dotty/pull/9871): use toNestedPairs in provablyDisjoint [#10560](https://github.com/lampepfl/dotty/pull/10560)
+
+
+# Contributors
+Thank you to all the contributors who made this release possible 🎉
+
+According to `git shortlog -sn --no-merges 3.0.0-RC2..3.0.1-RC1`† these are:
+
+```
+   121  Martin Odersky
+   111  Liu Fengyun
+    98  Nicolas Stucki
+    29  Guillaume Martres
+    24  Phil
+    20  Olivier Blanvillain
+    14  Tom Grigg
+    14  Adrien Piquerez
+    13  Natsu Kagami
+    12  Andrzej Ratajczak
+    10  odersky
+    10  Aleksander Boruch-Gruszecki
+     9  Anatolii Kmetiuk
+     8  Jamie Thompson
+     6  Maxime Kjaer
+     5  Som Snytt
+     3  Filip Zybała
+     3  Krzysztof Romanowski
+     3  Kai
+     3  Fengyun Liu
+     3  noti0na1
+     3  Phil Walker
+     2  Johannes Rudolph
+     2  soronpo
+     2  tanishiking
+     2  Adam Warski
+     2  Kacper Korban
+     2  Raphael Jolly
+     2  Sébastien Doeraene
+     1  xuwei-k
+     1  Alexander Ioffe
+     1  David Barri
+     1  Devon Stewart
+     1  Dmitrii Naumenko
+     1  Ivan Kurchenko
+     1  Jakub Kozłowski
+     1  Jonas Ackermann
+     1  Kevin Lee
+     1  Martin
+     1  Michał Pałka
+     1  Miles Sabin
+     1  Oron Port
+     1  Paweł Marks
+     1  Ruslan Shevchenko
+     1  Seth Tisue
+     1  Vadim Chelyshov
+     1  nogurenn
+     1  nurekata
+```
+
+†: Note that we measure against `3.0.0-RC2` and not `3.0.0` because we stabilized on `3.0.0-RC2`. Only critical bug fixes found their way into `3.0.0-RC3` and further, while the majority of changes ended up in `3.0.1-RC1`.
+
+## Library authors: Join our community build
+
+Scala 3 now has a set of widely-used community libraries that are built against every nightly Scala 3 snapshot.
+Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build)
+to make sure that our regression suite includes your library.
+
+[Scastie]: https://scastie.scala-lang.org/?target=dotty
+
+[@odersky]: https://github.com/odersky
+[@DarkDimius]: https://github.com/DarkDimius
+[@smarter]: https://github.com/smarter
+[@felixmulder]: https://github.com/felixmulder
+[@nicolasstucki]: https://github.com/nicolasstucki
+[@liufengyun]: https://github.com/liufengyun
+[@OlivierBlanvillain]: https://github.com/OlivierBlanvillain
+[@biboudis]: https://github.com/biboudis
+[@allanrenucci]: https://github.com/allanrenucci
+[@Blaisorblade]: https://github.com/Blaisorblade
+[@Duhemm]: https://github.com/Duhemm
+[@AleksanderBG]: https://github.com/AleksanderBG
+[@milessabin]: https://github.com/milessabin
+[@anatoliykmetyuk]: https://github.com/anatoliykmetyuk
diff --git a/docs/_blog/_posts/2021-06-25-scala301-rc2.md b/docs/_blog/_posts/2021-06-25-scala301-rc2.md
new file mode 100644
index 000000000000..76257d1a8664
--- /dev/null
+++ b/docs/_blog/_posts/2021-06-25-scala301-rc2.md
@@ -0,0 +1,50 @@
+---
+layout: blog-page
+title: Scala 3.0.1-RC2 – backports of critical bugfixes
+author: Anatolii Kmetiuk
+authorImg: /images/anatolii.png
+date: 2021-06-25
+---
+
+This post is a quick announcement of Scala 3.0.1-RC2. This is the second release candidate for 3.0.1. The reason for this release is that a regression with respect to 3.0.0 was introduced by PR [#12519](https://github.com/lampepfl/dotty/pull/12519) which caused the compiler to fail where it shouldn't. We have fixed this regression in PR [#12827](https://github.com/lampepfl/dotty/pull/12827) and backported it to 3.0.1. This is the main reason for having 3.0.1-RC2 before 3.0.1 which is due in one week.
+
+Besides this main change, taking advantage of the fact that RC2 is happening, we have also included various SBT reporting improvements (PR [#12845](https://github.com/lampepfl/dotty/pull/12845)) which should improve interaction with [Metals](https://scalameta.org/metals/). Also we've backported a few infrastructural fixes even though they aren't a regression from 3.0.0.
+
+<!--more-->
+
+# Contributors
+Thank you to all the contributors who made this release possible 🎉
+
+According to `git shortlog -sn --no-merges 3.0.1-RC1..3.0.1-RC2` these are:
+
+```
+     3  Guillaume Martres
+     2  Krzysztof Romanowski
+     1  Anatolii Kmetiuk
+     1  Markus Sutter
+     1  Martin Odersky
+     1  Vadim Chelyshov
+```
+
+## Library authors: Join our community build
+
+Scala 3 now has a set of widely-used community libraries that are built against every nightly Scala 3 snapshot.
+Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build)
+to make sure that our regression suite includes your library.
+
+[Scastie]: https://scastie.scala-lang.org/?target=dotty
+
+[@odersky]: https://github.com/odersky
+[@DarkDimius]: https://github.com/DarkDimius
+[@smarter]: https://github.com/smarter
+[@felixmulder]: https://github.com/felixmulder
+[@nicolasstucki]: https://github.com/nicolasstucki
+[@liufengyun]: https://github.com/liufengyun
+[@OlivierBlanvillain]: https://github.com/OlivierBlanvillain
+[@biboudis]: https://github.com/biboudis
+[@allanrenucci]: https://github.com/allanrenucci
+[@Blaisorblade]: https://github.com/Blaisorblade
+[@Duhemm]: https://github.com/Duhemm
+[@AleksanderBG]: https://github.com/AleksanderBG
+[@milessabin]: https://github.com/milessabin
+[@anatoliykmetyuk]: https://github.com/anatoliykmetyuk
diff --git a/docs/_blog/index.html b/docs/_blog/index.html
new file mode 100644
index 000000000000..b1ad4787b41b
--- /dev/null
+++ b/docs/_blog/index.html
@@ -0,0 +1,32 @@
+---
+layout: static-site-main
+title: Blog
+---
+<main class="container">
+    <h1>{{ page.title }}</h1>
+
+    <ul class="post-list">
+        {% for post in site.posts %}
+            <li>
+                <h2>
+                    <a href="{{ post.url }}">{{ post.title }}</a>
+                </h2>
+                <div class="byline">
+                    <time class="date">
+                        <i class="far fa-calendar-alt"></i>
+                        {{ post.date | date: "%Y-%m-%d" }}
+                    </time>
+                    {% if post.author %}
+                        <span class="author">
+                            <i class="fas fa-pen-nib"></i>
+                            {{ post.author }}
+                        </span>
+                    {% endif %}
+                </div>
+                <div class="excerpt">
+                    {{ post.excerpt }}
+                </div>
+            </li>
+        {% endfor %}
+    </ul>
+</main>
diff --git a/docs/docs/contributing/checklist.sh b/docs/_docs/contributing/checklist.sh
similarity index 96%
rename from docs/docs/contributing/checklist.sh
rename to docs/_docs/contributing/checklist.sh
index 827f0911d84d..d3cfe70b4e21 100755
--- a/docs/docs/contributing/checklist.sh
+++ b/docs/_docs/contributing/checklist.sh
@@ -48,6 +48,7 @@ LIST='- [ ] Publish artifacts to Maven via CI
   - [ ] Publish Blog Post on dotty.epfl.ch
   - [ ] Make an announcement thread on https://contributors.scala-lang.org
   - [ ] Tweet the announcement blog post on https://twitter.com/scala_lang
+  - [ ] Run workflow releases CI to publish scala on SDKMAN - https://github.com/lampepfl/dotty/actions/workflows/releases.yml
 
 [Instructions on how to release](https://dotty.epfl.ch/docs/contributing/release.html)'
 
diff --git a/docs/docs/contributing/contribute-knowledge.md b/docs/_docs/contributing/contribute-knowledge.md
similarity index 100%
rename from docs/docs/contributing/contribute-knowledge.md
rename to docs/_docs/contributing/contribute-knowledge.md
diff --git a/docs/docs/contributing/debug-tests.md b/docs/_docs/contributing/debug-tests.md
similarity index 100%
rename from docs/docs/contributing/debug-tests.md
rename to docs/_docs/contributing/debug-tests.md
diff --git a/docs/docs/contributing/debugging.md b/docs/_docs/contributing/debugging.md
similarity index 99%
rename from docs/docs/contributing/debugging.md
rename to docs/_docs/contributing/debugging.md
index 84f6937f628f..959ad6706290 100644
--- a/docs/docs/contributing/debugging.md
+++ b/docs/_docs/contributing/debugging.md
@@ -164,7 +164,7 @@ val YshowVarBounds    = BooleanSetting("-Yshow-var-bounds"   , "Print type varia
 val YtestPickler      = BooleanSetting("-Ytest-pickler"      , "self-test for pickling functionality; should be used with -Ystop-after:pickler")
 ```
 
-They are defined in [ScalaSettings.scala](https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala). E.g. `YprintPos` is defined as:
+They are defined in [ScalaSettings.scala](https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala). E.g. `YprintPos` is defined as:
 
 ```scala
 val YprintPos: Setting[Boolean] = BooleanSetting("-Yprint-pos", "show tree positions.")
diff --git a/docs/_docs/contributing/getting-started.md b/docs/_docs/contributing/getting-started.md
new file mode 100644
index 000000000000..c842fd0a49d0
--- /dev/null
+++ b/docs/_docs/contributing/getting-started.md
@@ -0,0 +1,100 @@
+---
+layout: doc-page
+title: Getting Started
+---
+
+
+
+Requirements
+------------
+Make sure that you are using macOS or Linux (or WSL on Windows) with Java 8 or newer. You can determine which version of the JDK is the
+default by typing `java -version` in a Terminal window.
+
+Compiling and Running
+---------------------
+Start by cloning the repository:
+
+```bash
+$ git clone https://github.com/lampepfl/dotty.git
+$ cd dotty
+$ sbt managedSources # Needed for IDE import to succeed
+```
+
+Dotty provides a standard sbt build: compiling, running and starting a repl can
+all be done from within sbt:
+
+```bash
+$ sbt
+> scalac tests/pos/HelloWorld.scala
+> scala HelloWorld
+hello world
+```
+
+There are also bash scripts that can be used in the same way. Assuming that you have cloned the Dotty repo locally, append
+the following line on your `.bash_profile`:
+
+```shell
+$ export PATH=$HOME/dotty/bin:$PATH
+```
+
+and you will be able to run the corresponding commands directly from your console:
+
+```shell
+# Compile code using Dotty
+$ scalac tests/pos/HelloWorld.scala
+
+# Run it with the proper classpath
+$ scala HelloWorld
+```
+
+
+Starting a REPL
+---------------
+```bash
+$ sbt
+> repl
+Welcome to Scala.next (pre-alpha)  (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_101).
+Type in expressions to have them evaluated.
+Type :help for more information.
+scala>
+```
+
+or via bash:
+
+```bash
+$ scala
+```
+Publish to local repository
+---------------------------------
+To test our cloned compiler on local projects:
+
+```bash
+$ sbt publishLocal
+```
+Then in the `build.sbt` file of a test project:
+
+```bash
+ThisBuild / scalaVersion := "<dotty-version>-bin-SNAPSHOT"
+```
+where `dotty-version` can be found in the file `project/Build.scala`, like `3.0.0-M2`
+
+
+Generating Documentation
+-------------------------
+To generate this page and other static page docs, run
+```bash
+$ sbt
+> scaladoc/generateScalaDocumentation
+```
+For more information, see `scaladoc/README.md`.
+
+Before contributing to Dotty, we invite you to consult the
+[Dotty Developer Guidelines](https://github.com/lampepfl/dotty/blob/main/CONTRIBUTING.md).
+
+
+Community
+-------------
+The main development discussion channels are:
+- [github.com/lampepfl/dotty/discussions](https://github.com/lampepfl/dotty/discussions)
+- [contributors.scala-lang.org](https://contributors.scala-lang.org)
+- [gitter.im/scala/contributors](https://gitter.im/scala/contributors)
diff --git a/docs/docs/contributing/procedures/release.md b/docs/_docs/contributing/procedures/release.md
similarity index 100%
rename from docs/docs/contributing/procedures/release.md
rename to docs/_docs/contributing/procedures/release.md
diff --git a/docs/docs/contributing/procedures/vulpix.md b/docs/_docs/contributing/procedures/vulpix.md
similarity index 100%
rename from docs/docs/contributing/procedures/vulpix.md
rename to docs/_docs/contributing/procedures/vulpix.md
diff --git a/docs/docs/contributing/scala2-vs-scala3.md b/docs/_docs/contributing/scala2-vs-scala3.md
similarity index 100%
rename from docs/docs/contributing/scala2-vs-scala3.md
rename to docs/_docs/contributing/scala2-vs-scala3.md
diff --git a/docs/docs/contributing/testing.md b/docs/_docs/contributing/testing.md
similarity index 75%
rename from docs/docs/contributing/testing.md
rename to docs/_docs/contributing/testing.md
index c0fdca5f10dc..41e8b0b9b85e 100644
--- a/docs/docs/contributing/testing.md
+++ b/docs/_docs/contributing/testing.md
@@ -17,7 +17,7 @@ The entire suite of tests can be run using the bootstrapped compiler as follows:
 
 ```bash
 $ sbt
-> dotty-bootstrapped/test
+> scala3-bootstrapped/test
 ```
 
 There are currently several forms of tests in Dotty. These can be split into
@@ -32,7 +32,7 @@ To run all tests in e.g., for the compiler test-suite you can write:
 
 ```bash
 $ sbt
-> dotty-compiler/test
+> scala3-compiler/test
 ```
 
 To run a single test class you use `testOnly` and the fully qualified class name.
@@ -127,10 +127,21 @@ $ sbt
 > testCompilation --help
 ```
 
+### Joint and separate sources compilation
+
+When the sources of a test consist of multiple source files places in a single directory they are passed to the compiler in a single run and the compiler decides in which order to compile them. In some cases, however, to reproduce a specific test scenario it might be necessary to compile the source files in several steps in a specified order. To achieve that one can add a `_${step_index}` suffix to a file name (before the `.scala` or `.java` extension) indicating the order of compilation. E.g. if the test directory contains files named `Foo_1.scala`, `Bar_2.scala` and `Baz_2.scala` then `Foo_1.scala` will be compiled first and after that `Bar_2.scala` together with `Baz_2.scala`.
+
+There are also other suffixes indicating how some particular files are compiled:
+* `_c${compilerVersion}` - compile a file with a specific version of the compiler instead of the one developed on the current branch
+  (e.g. `Foo_c3.0.2.scala`)
+* `_r${release}` - compile a file with a given value of `-Yscala-release` flag (e.g. `Foo_r3.0.scala`)
+
+Different suffixes can be mixed together (their order is not important although consistency is advised), e.g. `Foo_1_r3.0`, `Bar_2_c3.0.2`.
+
 ### Bootstrapped-only tests
 
 To run `testCompilation` on a bootstrapped Dotty compiler, use
-`dotty-compiler-bootstrapped/testCompilation` (with the same syntax as above).
+`scala3-compiler-bootstrapped/testCompilation` (with the same syntax as above).
 Some tests can only be run in bootstrapped compilers; that includes all tests
 with `with-compiler` in their name.
 
@@ -144,10 +155,15 @@ with `with-compiler` in their name.
  > testCompilation --from-tasty
  ```
 
- This mode can be run under `dotty-compiler-bootstrapped/testCompilation` to test on a bootstrapped Dotty compiler.
+ This mode can be run under `scala3-compiler-bootstrapped/testCompilation` to test on a bootstrapped Dotty compiler.
 
 ### SemanticDB tests
 
+```bash
+$ sbt
+> scala3-compiler-bootstrapped/testOnly dotty.tools.dotc.semanticdb.SemanticdbTests
+```
+
 The output of the `extractSemanticDB` phase, enabled with `-Xsemanticdb` is tested with the bootstrapped JUnit test
 `dotty.tools.dotc.semanticdb.SemanticdbTests`. It uses source files in `tests/semanticdb/expect` to generate
 two kinds of output file that are compared with "expect files": placement of semanticdb symbol occurrences inline in
@@ -157,5 +173,12 @@ Expect files are used as regression tests to detect changes in the compiler.
 
 The test suite will create a new file if it detects any difference, which can be compared with the
 original expect file, or if the user wants to globally replace all expect files for semanticdb they can use
-`dotty-compiler-bootstrapped/test:runMain dotty.tools.dotc.semanticdb.updateExpect`, and compare the changes via version
+`scala3-compiler-bootstrapped/test:runMain dotty.tools.dotc.semanticdb.updateExpect`, and compare the changes via version
 control.
+
+## Troubleshooting
+
+Some of the tests depend on temporary state stored in the `out` directory. In rare cases, that directory
+can enter an inconsistent state and cause spurious test failures. If you suspect a spurious test failure,
+you can run `rm -rf out/*` from the root of the repository and run your tests again. If that fails, you
+can try `git clean -xfd`.
diff --git a/docs/docs/contributing/tools/ide.md b/docs/_docs/contributing/tools/ide.md
similarity index 100%
rename from docs/docs/contributing/tools/ide.md
rename to docs/_docs/contributing/tools/ide.md
diff --git a/docs/docs/contributing/tools/mill.md b/docs/_docs/contributing/tools/mill.md
similarity index 100%
rename from docs/docs/contributing/tools/mill.md
rename to docs/_docs/contributing/tools/mill.md
diff --git a/docs/docs/contributing/tools/scalafix.md b/docs/_docs/contributing/tools/scalafix.md
similarity index 100%
rename from docs/docs/contributing/tools/scalafix.md
rename to docs/_docs/contributing/tools/scalafix.md
diff --git a/docs/_docs/contributing/workflow.md b/docs/_docs/contributing/workflow.md
new file mode 100644
index 000000000000..956ce2998c75
--- /dev/null
+++ b/docs/_docs/contributing/workflow.md
@@ -0,0 +1,110 @@
+---
+layout: doc-page
+title: Workflow
+---
+
+Check [Getting Started](getting-started.md) for instructions on how to obtain the source code of dotty.
+This document details common workflow patterns when working with Dotty.
+
+## Compiling files with scalac ##
+
+As we have seen you can compile a test file either from sbt:
+
+```bash
+$ sbt
+> scalac <OPTIONS> <FILE>
+```
+
+or from terminal:
+
+```bash
+$ scalac <OPTIONS> <FILE>
+```
+
+Here are some useful debugging `<OPTIONS>`:
+
+* `-Xprint:PHASE1,PHASE2,...` or `-Xprint:all`: prints the `AST` after each
+  specified phase. Phase names can be found by examining the
+  `dotty.tools.dotc.transform.*` classes for their `phaseName` field e.g., `-Xprint:erasure`.
+  You can discover all phases in the `dotty.tools.dotc.Compiler` class
+* `-Ylog:PHASE1,PHASE2,...` or `-Ylog:all`: enables `ctx.log("")` logging for
+  the specified phase.
+* `-Ycheck:all` verifies the consistency of `AST` nodes between phases, in
+  particular checks that types do not change. Some phases currently can't be
+  `Ycheck`ed, therefore in the tests we run:
+  `-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef`.
+* the last frontier of debugging (before actual debugging) is the range of logging capabilities that
+can be enabled through the `dotty.tools.dotc.config.Printers` object. Change any of the desired printer from `noPrinter` to
+`default` and this will give you the full logging capability of the compiler.
+
+## Inspecting Types with Type Stealer ##
+
+You can inspect types with the main method `dotty.tools.printTypes` from the sbt shell,
+passing at least three arguments:
+- The first argument is a string that introduces some
+Scala definitions
+- The second argument introduces how the the remaining arguments should be interpreted,
+comprising of
+  - `rhs` - the return type of a definition
+  - `class` - the signature of a class, after its name
+  - `method` - the signature of a method, after its name
+  - `type` - the signature of a type, after its name
+- The remaining arguments are type signatures, these may reference definitions introduced by the first argument.
+
+Each type signature is then be printed, displaying their internal structure, alongside their class, using
+the same representation that can later be used in pattern matching to decompose the type.
+
+Here, we inspect a refinement of a class `Box`:
+```bash
+$ sbt
+> scala3-compiler-bootstrapped/Test/runMain dotty.tools.printTypes "class Box { def x: Any }" "rhs" "Box { def x: Int }"
+RefinedType(TypeRef(ThisType(TypeRef(NoPrefix, module class <empty>)),class Box), x, ExprType(TypeRef(TermRef(ThisType(TypeRef(NoPrefix, module class <root>)), object scala), class Int))) [class dotty.tools.dotc.core.Types$CachedRefinedType]
+```
+
+You can also pass the empty string as the second
+argument, e.g. to inspect a standard library type:
+```bash
+$ sbt
+> scala3-compiler-bootstrapped/Test/runMain dotty.tools.printTypes "" "rhs" "1 *: EmptyTuple"
+AppliedType(TypeRef(TermRef(ThisType(TypeRef(NoPrefix, module class <root>)), object scala), class *:), List(ConstantType(Constant(1)), TypeRef(TermRef(ThisType(TypeRef(NoPrefix, module class scala)), object Tuple$package), type EmptyTuple)))
+```
+
+Here are some other examples you can follow:
+- `...printTypes "" class "[T] extends Foo[T] {}"`
+- `...printTypes "" method "(x: Int): x.type"`
+- `...printTypes "" type "<: Int" "= [T] =>> List[T]"`
+
+If you want to further inspect the types, and not just print them, the object `dotty.tools.DottyTypeStealer` has a
+method `stealType`. It takes the same arguments as `printTypes`, but returns both a `Context` containing the
+definitions passed, along with the list of types:
+```scala
+// compiler/test/dotty/tools/DottyTypeStealer.scala
+object DottyTypeStealer extends DottyTest {
+
+  enum Kind:
+    case `rhs`, `method`, `class`, `type`
+    ...
+
+  def stealType(kind: Kind, source: String, typeStrings: String*): (Context, List[Type]) = {
+    ...
+  }
+}
+```
+Any test source within `compiler/test` can then call `stealType` for custom purposes.
+
+## Pretty-printing ##
+Many objects in the scalac compiler implement a `Showable` trait (e.g. `Tree`,
+`Symbol`, `Type`). These objects may be prettyprinted using the `.show`
+method
+
+## SBT Commands Cheat Sheet ##
+The basics of working with Dotty codebase are documented [here](https://dotty.epfl.ch/docs/contributing/getting-started.html) and [here](https://dotty.epfl.ch/docs/contributing/workflow.html). Below is a cheat sheet of some frequently used commands (to be used from SBT console – `sbt`).
+
+
+|                        Command                       |                                                          Description                                                          |
+|------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|
+| `scalac ../issues/Playground.scala`                  | Compile the given file – path relative to the Dotty directory. Output the compiled class files to the Dotty directory itself. |
+| `scala Playground`                                   | Run the compiled class `Playground`. Dotty directory is on classpath by default.                                              |
+| `repl`                                               | Start REPL                                                                                                                    |
+| `testOnly dotty.tools.dotc.CompilationTests -- *pos` | Run test (method) `pos` from `CompilationTests` suite.                                                                        |
+| `testCompilation sample`                             | In all test suites, run test files containing the word `sample` in their title.                                               |
diff --git a/docs/_docs/index.md b/docs/_docs/index.md
new file mode 100644
index 000000000000..839d14d16308
--- /dev/null
+++ b/docs/_docs/index.md
@@ -0,0 +1,22 @@
+---
+layout: doc-page
+redirectFrom: docs/index.html
+---
+
+Dotty is the project name for technologies that are considered for inclusion in Scala 3. Scala has
+pioneered the fusion of object-oriented and functional programming in a typed setting. Scala 3 will
+be a big step towards realizing the full potential of these ideas. Its main objectives are to
+
+- become more opinionated by promoting programming idioms we found to work well,
+- simplify where possible,
+- eliminate inconsistencies and surprising behaviors,
+- build on strong foundations to ensure the design hangs well together,
+- consolidate language constructs to improve the language’s consistency, safety, ergonomics, and performance.
+
+In this documentation you will find information on how to use the Dotty compiler on your machine,
+navigate through the code, setup Dotty with your favorite IDE and more!
+
+Table of Contents
+=================
+{% assign titles = sidebar.titles %}
+{% include "table-of-contents" %}
diff --git a/docs/docs/internals/backend.md b/docs/_docs/internals/backend.md
similarity index 100%
rename from docs/docs/internals/backend.md
rename to docs/_docs/internals/backend.md
diff --git a/docs/docs/internals/classpaths.md b/docs/_docs/internals/classpaths.md
similarity index 100%
rename from docs/docs/internals/classpaths.md
rename to docs/_docs/internals/classpaths.md
diff --git a/docs/docs/internals/contexts.md b/docs/_docs/internals/contexts.md
similarity index 100%
rename from docs/docs/internals/contexts.md
rename to docs/_docs/internals/contexts.md
diff --git a/docs/docs/internals/core-data-structures.md b/docs/_docs/internals/core-data-structures.md
similarity index 100%
rename from docs/docs/internals/core-data-structures.md
rename to docs/_docs/internals/core-data-structures.md
diff --git a/docs/docs/internals/debug-macros.md b/docs/_docs/internals/debug-macros.md
similarity index 100%
rename from docs/docs/internals/debug-macros.md
rename to docs/_docs/internals/debug-macros.md
diff --git a/docs/docs/internals/dotc-scalac.md b/docs/_docs/internals/dotc-scalac.md
similarity index 100%
rename from docs/docs/internals/dotc-scalac.md
rename to docs/_docs/internals/dotc-scalac.md
diff --git a/docs/docs/internals/dotty-internals-1-notes.md b/docs/_docs/internals/dotty-internals-1-notes.md
similarity index 99%
rename from docs/docs/internals/dotty-internals-1-notes.md
rename to docs/_docs/internals/dotty-internals-1-notes.md
index 8f3110bd91fb..899fb49438b3 100644
--- a/docs/docs/internals/dotty-internals-1-notes.md
+++ b/docs/_docs/internals/dotty-internals-1-notes.md
@@ -88,7 +88,7 @@ on the structure of a tree is error-prone.
 ## Errors
 `dotc/typer/ErrorReporting.scala`
 
-Sometimes there's an error during compilation, but we want to continue compilling (as opposed to failing outright), to
+Sometimes there's an error during compilation, but we want to continue compiling (as opposed to failing outright), to
 uncover additional errors.
 
 In cases where a tree is expected but there's an error, we can use the `errorTree` methods in `ErrorReporting` to create
diff --git a/docs/docs/internals/explicit-nulls.md b/docs/_docs/internals/explicit-nulls.md
similarity index 100%
rename from docs/docs/internals/explicit-nulls.md
rename to docs/_docs/internals/explicit-nulls.md
diff --git a/docs/docs/internals/higher-kinded-v2.md b/docs/_docs/internals/higher-kinded-v2.md
similarity index 100%
rename from docs/docs/internals/higher-kinded-v2.md
rename to docs/_docs/internals/higher-kinded-v2.md
diff --git a/docs/docs/internals/overall-structure.md b/docs/_docs/internals/overall-structure.md
similarity index 94%
rename from docs/docs/internals/overall-structure.md
rename to docs/_docs/internals/overall-structure.md
index 874155589116..f50ab6bf03a7 100644
--- a/docs/docs/internals/overall-structure.md
+++ b/docs/_docs/internals/overall-structure.md
@@ -97,7 +97,8 @@ phases. The current list of phases is specified in class [Compiler] as follows:
 
   /** Phases dealing with the frontend up to trees ready for TASTY pickling */
   protected def frontendPhases: List[List[Phase]] =
-    List(new FrontEnd) ::           // Compiler frontend: scanner, parser, namer, typer
+    List(new Parser) ::             // scanner, parser
+    List(new TyperPhase) ::         // namer, typer
     List(new YCheckPositions) ::    // YCheck positions
     List(new sbt.ExtractDependencies) :: // Sends information on classes' dependencies to sbt via callbacks
     List(new semanticdb.ExtractSemanticDB) :: // Extract info into .semanticdb files
@@ -232,10 +233,10 @@ Phases fall into four categories:
 * Code generators: These map the transformed trees to Java classfiles or
   .sjsir files.
 
-[dotty.tools]: https://github.com/lampepfl/dotty/tree/master/compiler/src/dotty/tools
-[dotc]: https://github.com/lampepfl/dotty/tree/master/compiler/src/dotty/tools/dotc
-[Main]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/Main.scala
-[Driver]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/Driver.scala
-[Compiler]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/Compiler.scala
-[Run]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/Run.scala
-[Context]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/core/Contexts.scala
+[dotty.tools]: https://github.com/lampepfl/dotty/tree/main/compiler/src/dotty/tools
+[dotc]: https://github.com/lampepfl/dotty/tree/main/compiler/src/dotty/tools/dotc
+[Main]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/Main.scala
+[Driver]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/Driver.scala
+[Compiler]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/Compiler.scala
+[Run]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/Run.scala
+[Context]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/core/Contexts.scala
diff --git a/docs/docs/internals/periods.md b/docs/_docs/internals/periods.md
similarity index 100%
rename from docs/docs/internals/periods.md
rename to docs/_docs/internals/periods.md
diff --git a/docs/docs/internals/syntax-3.1.md b/docs/_docs/internals/syntax-3.1.md
similarity index 97%
rename from docs/docs/internals/syntax-3.1.md
rename to docs/_docs/internals/syntax-3.1.md
index 8a7eea52a09f..ef18bd1486b1 100644
--- a/docs/docs/internals/syntax-3.1.md
+++ b/docs/_docs/internals/syntax-3.1.md
@@ -24,14 +24,14 @@ form.
 whiteSpace       ::=  ‘\u0020’ | ‘\u0009’ | ‘\u000D’ | ‘\u000A’
 upper            ::=  ‘A’ | … | ‘Z’ | ‘\$’ | ‘_’  “… and Unicode category Lu”
 lower            ::=  ‘a’ | … | ‘z’ “… and Unicode category Ll”
-letter           ::=  upper | lower “… and Unicode categories Lo, Lt, Nl”
+letter           ::=  upper | lower “… and Unicode categories Lo, Lt, Lm, Nl”
 digit            ::=  ‘0’ | … | ‘9’
 paren            ::=  ‘(’ | ‘)’ | ‘[’ | ‘]’ | ‘{’ | ‘}’ | ‘'(’ | ‘'[’ | ‘'{’
 delim            ::=  ‘`’ | ‘'’ | ‘"’ | ‘.’ | ‘;’ | ‘,’
-opchar           ::=  “printableChar not matched by (whiteSpace | upper | lower |
-                       letter | digit | paren | delim | opchar | Unicode_Sm |
-                       Unicode_So)”
-printableChar    ::=  “all characters in [\u0020, \u007F] inclusive”
+opchar           ::=  ‘!’ | ‘#’ | ‘%’ | ‘&’ | ‘*’ | ‘+’ | ‘-’ | ‘/’ | ‘:’ |
+                      ‘<’ | ‘=’ | ‘>’ | ‘?’ | ‘@’ | ‘\’ | ‘^’ | ‘|’ | ‘~’
+                      “… and Unicode categories Sm, So”
+printableChar    ::=  “all characters in [\u0020, \u007E] inclusive”
 charEscapeSeq    ::=  ‘\’ (‘b’ | ‘t’ | ‘n’ | ‘f’ | ‘r’ | ‘"’ | ‘'’ | ‘\’)
 
 op               ::=  opchar {opchar}
@@ -96,7 +96,7 @@ erased    extends   false     final     finally   for       given     if
 implied   import    lazy      match     new       null      object    package
 private   protected override  return    super     sealed    then      throw
 trait     true      try       type      val       var       while     yield
-:         =         <-        =>        <:        :>        #         @
+:         =         <-        =>        <:        >:        #         @
 ```
 
 ### Soft keywords
diff --git a/docs/_docs/internals/syntax.md b/docs/_docs/internals/syntax.md
new file mode 100644
index 000000000000..c484c42864e5
--- /dev/null
+++ b/docs/_docs/internals/syntax.md
@@ -0,0 +1,463 @@
+---
+layout: doc-page
+title: "Scala 3 Syntax Summary"
+---
+
+The following description of Scala tokens uses literal characters `‘c’` when
+referring to the ASCII fragment `\u0000` – `\u007F`.
+
+_Unicode escapes_ are used to represent the [Unicode character](https://www.w3.org/International/articles/definitions-characters/) with the given
+hexadecimal code:
+
+```ebnf
+UnicodeEscape ::= ‘\’ ‘u’ {‘u’} hexDigit hexDigit hexDigit hexDigit
+hexDigit      ::= ‘0’ | … | ‘9’ | ‘A’ | … | ‘F’ | ‘a’ | … | ‘f’
+```
+
+Informal descriptions are typeset as `“some comment”`.
+
+### Lexical Syntax
+
+The lexical syntax of Scala is given by the following grammar in EBNF
+form.
+
+```ebnf
+whiteSpace       ::=  ‘\u0020’ | ‘\u0009’ | ‘\u000D’ | ‘\u000A’
+upper            ::=  ‘A’ | … | ‘Z’ | ‘\$’ | ‘_’  “… and Unicode category Lu”
+lower            ::=  ‘a’ | … | ‘z’ “… and Unicode category Ll”
+letter           ::=  upper | lower “… and Unicode categories Lo, Lt, Lm, Nl”
+digit            ::=  ‘0’ | … | ‘9’
+paren            ::=  ‘(’ | ‘)’ | ‘[’ | ‘]’ | ‘{’ | ‘}’ | ‘'(’ | ‘'[’ | ‘'{’
+delim            ::=  ‘`’ | ‘'’ | ‘"’ | ‘.’ | ‘;’ | ‘,’
+opchar           ::=  ‘!’ | ‘#’ | ‘%’ | ‘&’ | ‘*’ | ‘+’ | ‘-’ | ‘/’ | ‘:’ |
+                      ‘<’ | ‘=’ | ‘>’ | ‘?’ | ‘@’ | ‘\’ | ‘^’ | ‘|’ | ‘~’
+                      “… and Unicode categories Sm, So”
+printableChar    ::=  “all characters in [\u0020, \u007E] inclusive”
+charEscapeSeq    ::=  ‘\’ (‘b’ | ‘t’ | ‘n’ | ‘f’ | ‘r’ | ‘"’ | ‘'’ | ‘\’)
+
+op               ::=  opchar {opchar}
+varid            ::=  lower idrest
+alphaid          ::=  upper idrest
+                   |  varid
+plainid          ::=  alphaid
+                   |  op
+id               ::=  plainid
+                   |  ‘`’ { charNoBackQuoteOrNewline | UnicodeEscape | charEscapeSeq } ‘`’
+idrest           ::=  {letter | digit} [‘_’ op]
+quoteId          ::=  ‘'’ alphaid
+
+integerLiteral   ::=  (decimalNumeral | hexNumeral) [‘L’ | ‘l’]
+decimalNumeral   ::=  ‘0’ | nonZeroDigit [{digit | ‘_’} digit]
+hexNumeral       ::=  ‘0’ (‘x’ | ‘X’) hexDigit [{hexDigit | ‘_’} hexDigit]
+nonZeroDigit     ::=  ‘1’ | … | ‘9’
+
+floatingPointLiteral
+                 ::=  [decimalNumeral] ‘.’ digit [{digit | ‘_’} digit] [exponentPart] [floatType]
+                   |  decimalNumeral exponentPart [floatType]
+                   |  decimalNumeral floatType
+exponentPart     ::=  (‘E’ | ‘e’) [‘+’ | ‘-’] digit [{digit | ‘_’} digit]
+floatType        ::=  ‘F’ | ‘f’ | ‘D’ | ‘d’
+
+booleanLiteral   ::=  ‘true’ | ‘false’
+
+characterLiteral ::=  ‘'’ (printableChar | charEscapeSeq) ‘'’
+
+stringLiteral    ::=  ‘"’ {stringElement} ‘"’
+                   |  ‘"""’ multiLineChars ‘"""’
+stringElement    ::=  printableChar \ (‘"’ | ‘\’)
+                   |  UnicodeEscape
+                   |  charEscapeSeq
+multiLineChars   ::=  {[‘"’] [‘"’] char \ ‘"’} {‘"’}
+processedStringLiteral
+                 ::=  alphaid ‘"’ {[‘\’] processedStringPart | ‘\\’ | ‘\"’} ‘"’
+                   |  alphaid ‘"""’ {[‘"’] [‘"’] char \ (‘"’ | ‘$’) | escape} {‘"’} ‘"""’
+processedStringPart
+                 ::= printableChar \ (‘"’ | ‘$’ | ‘\’) | escape
+escape           ::=  ‘$$’
+                   |  ‘$’ letter { letter | digit }
+                   |  ‘{’ Block  [‘;’ whiteSpace stringFormat whiteSpace] ‘}’
+stringFormat     ::=  {printableChar \ (‘"’ | ‘}’ | ‘ ’ | ‘\t’ | ‘\n’)}
+
+symbolLiteral    ::=  ‘'’ plainid // until 2.13
+
+comment          ::=  ‘/*’ “any sequence of characters; nested comments are allowed” ‘*/’
+                   |  ‘//’ “any sequence of characters up to end of line”
+
+nl               ::=  “new line character”
+semi             ::=  ‘;’ |  nl {nl}
+```
+
+
+## Optional Braces
+
+The lexical analyzer also inserts `indent` and `outdent` tokens that represent regions of indented code [at certain points](../reference/other-new-features/indentation.md)
+
+In the context-free productions below we use the notation `<<< ts >>>`
+to indicate a token sequence `ts` that is either enclosed in a pair of braces `{ ts }` or that constitutes an indented region `indent ts outdent`. Analogously, the
+notation `:<<< ts >>>` indicates a token sequence `ts` that is either enclosed in a pair of braces `{ ts }` or that constitutes an indented region `indent ts outdent` that follows
+a `:` at the end of a line.
+
+
+```
+ <<< ts >>>   ::=  ‘{’ ts ‘}’
+                |  indent ts outdent
+:<<< ts >>>   ::=  [nl] ‘{’ ts ‘}’
+                |  `:` indent ts outdent
+```
+
+## Keywords
+
+### Regular keywords
+
+```
+abstract  case      catch     class     def       do        else
+enum      export    extends   false     final     finally   for
+given     if        implicit  import    lazy      match     new
+null      object    override  package   private   protected return
+sealed    super     then      throw     trait     true      try
+type      val       var       while     with      yield
+:         =         <-        =>        <:        >:        #
+@         =>>       ?=>
+```
+
+### Soft keywords
+
+```
+as  derives  end  extension  infix  inline  opaque  open  transparent  using  |  *  +  -
+```
+
+See the [separate section on soft keywords](../reference/soft-modifier.md) for additional
+details on where a soft keyword is recognized.
+
+## Context-free Syntax
+
+The context-free syntax of Scala is given by the following EBNF
+grammar:
+
+### Literals and Paths
+```ebnf
+SimpleLiteral     ::=  [‘-’] integerLiteral
+                    |  [‘-’] floatingPointLiteral
+                    |  booleanLiteral
+                    |  characterLiteral
+                    |  stringLiteral
+Literal           ::=  SimpleLiteral
+                    |  processedStringLiteral
+                    |  symbolLiteral
+                    |  ‘null’
+
+QualId            ::=  id {‘.’ id}
+ids               ::=  id {‘,’ id}
+
+SimpleRef         ::=  id
+                    |  [id ‘.’] ‘this’
+                    |  [id ‘.’] ‘super’ [ClassQualifier] ‘.’ id
+
+ClassQualifier    ::=  ‘[’ id ‘]’
+```
+
+### Types
+```ebnf
+Type              ::=  FunType
+                    |  HkTypeParamClause ‘=>>’ Type                             LambdaTypeTree(ps, t)
+                    |  FunParamClause ‘=>>’ Type                                TermLambdaTypeTree(ps, t)
+                    |  MatchType
+                    |  InfixType
+FunType           ::=  FunTypeArgs (‘=>’ | ‘?=>’) Type                          Function(ts, t)
+                    |  HKTypeParamClause '=>' Type                              PolyFunction(ps, t)
+FunTypeArgs       ::=  InfixType
+                    |  ‘(’ [ FunArgTypes ] ‘)’
+                    |  FunParamClause
+FunParamClause    ::=  ‘(’ TypedFunParam {‘,’ TypedFunParam } ‘)’
+TypedFunParam     ::=  id ‘:’ Type
+MatchType         ::=  InfixType `match` <<< TypeCaseClauses >>>
+InfixType         ::=  RefinedType {id [nl] RefinedType}                        InfixOp(t1, op, t2)
+RefinedType       ::=  AnnotType {[nl] Refinement}                              RefinedTypeTree(t, ds)
+AnnotType         ::=  SimpleType {Annotation}                                  Annotated(t, annot)
+
+SimpleType        ::=  SimpleLiteral                                            SingletonTypeTree(l)
+                    |  ‘?’ TypeBounds
+                    |  SimpleType1
+SimpleType1       ::=  id                                                       Ident(name)
+                    |  Singleton ‘.’ id                                         Select(t, name)
+                    |  Singleton ‘.’ ‘type’                                     SingletonTypeTree(p)
+                    |  ‘(’ Types ‘)’                                            Tuple(ts)
+                    |  Refinement                                               RefinedTypeTree(EmptyTree, refinement)
+                    |  ‘$’ ‘{’ Block ‘}’                                        -- unless inside quoted pattern
+                    |  ‘$’ ‘{’ Pattern ‘}’                                      -- only inside quoted pattern
+                    |  SimpleType1 TypeArgs                                     AppliedTypeTree(t, args)
+                    |  SimpleType1 ‘#’ id                                       Select(t, name)
+Singleton         ::=  SimpleRef
+                    |  SimpleLiteral
+                    |  Singleton ‘.’ id
+Singletons        ::=  Singleton { ‘,’ Singleton }
+FunArgType        ::=  Type
+                    |  ‘=>’ Type                                                PrefixOp(=>, t)
+FunArgTypes       ::=  FunArgType { ‘,’ FunArgType }
+ParamType         ::=  [‘=>’] ParamValueType
+ParamValueType    ::=  Type [‘*’]                                               PostfixOp(t, "*")
+TypeArgs          ::=  ‘[’ Types ‘]’                                            ts
+Refinement        ::=  ‘{’ [RefineDcl] {semi [RefineDcl]} ‘}’                   ds
+TypeBounds        ::=  [‘>:’ Type] [‘<:’ Type]                                  TypeBoundsTree(lo, hi)
+TypeParamBounds   ::=  TypeBounds {‘:’ Type}                                    ContextBounds(typeBounds, tps)
+Types             ::=  Type {‘,’ Type}
+```
+
+### Expressions
+```ebnf
+Expr              ::=  FunParams (‘=>’ | ‘?=>’) Expr                            Function(args, expr), Function(ValDef([implicit], id, TypeTree(), EmptyTree), expr)
+                    |  HkTypeParamClause ‘=>’ Expr                              PolyFunction(ts, expr)
+                    |  Expr1
+BlockResult       ::=  FunParams (‘=>’ | ‘?=>’) Block
+                    |  HkTypeParamClause ‘=>’ Block
+                    |  Expr1
+FunParams         ::=  Bindings
+                    |  id
+                    |  ‘_’
+Expr1             ::=  [‘inline’] ‘if’ ‘(’ Expr ‘)’ {nl} Expr [[semi] ‘else’ Expr] If(Parens(cond), thenp, elsep?)
+                    |  [‘inline’] ‘if’  Expr ‘then’ Expr [[semi] ‘else’ Expr]    If(cond, thenp, elsep?)
+                    |  ‘while’ ‘(’ Expr ‘)’ {nl} Expr                           WhileDo(Parens(cond), body)
+                    |  ‘while’ Expr ‘do’ Expr                                   WhileDo(cond, body)
+                    |  ‘try’ Expr Catches [‘finally’ Expr]                      Try(expr, catches, expr?)
+                    |  ‘try’ Expr [‘finally’ Expr]                              Try(expr, Nil, expr?)
+                    |  ‘throw’ Expr                                             Throw(expr)
+                    |  ‘return’ [Expr]                                          Return(expr?)
+                    |  ForExpr
+                    |  [SimpleExpr ‘.’] id ‘=’ Expr                             Assign(expr, expr)
+                    |  PrefixOperator SimpleExpr ‘=’ Expr                       Assign(expr, expr)
+                    |  SimpleExpr ArgumentExprs ‘=’ Expr                        Assign(expr, expr)
+                    |  PostfixExpr [Ascription]
+                    |  ‘inline’ InfixExpr MatchClause
+Ascription        ::=  ‘:’ InfixType                                            Typed(expr, tp)
+                    |  ‘:’ Annotation {Annotation}                              Typed(expr, Annotated(EmptyTree, annot)*)
+Catches           ::=  ‘catch’ (Expr | ExprCaseClause)
+PostfixExpr       ::=  InfixExpr [id]                                           PostfixOp(expr, op)
+InfixExpr         ::=  PrefixExpr
+                    |  InfixExpr id [nl] InfixExpr                              InfixOp(expr, op, expr)
+                    |  InfixExpr id ‘:’ IndentedExpr
+                    |  InfixExpr MatchClause
+MatchClause       ::=  ‘match’ <<< CaseClauses >>>                              Match(expr, cases)
+PrefixExpr        ::=  [PrefixOperator] SimpleExpr                             PrefixOp(expr, op)
+PrefixOperator    ::=  ‘-’ | ‘+’ | ‘~’ | ‘!’
+SimpleExpr        ::=  SimpleRef
+                    |  Literal
+                    |  ‘_’
+                    |  BlockExpr
+                    |  ‘$’ ‘{’ Block ‘}’                                        -- unless inside quoted pattern
+                    |  ‘$’ ‘{’ Pattern ‘}’                                      -- only inside quoted pattern
+                    |  Quoted
+                    |  quoteId                                                  -- only inside splices
+                    |  ‘new’ ConstrApp {‘with’ ConstrApp} [TemplateBody]        New(constr | templ)
+                    |  ‘new’ TemplateBody
+                    |  ‘(’ ExprsInParens ‘)’                                    Parens(exprs)
+                    |  SimpleExpr ‘.’ id                                        Select(expr, id)
+                    |  SimpleExpr ‘.’ MatchClause
+                    |  SimpleExpr TypeArgs                                      TypeApply(expr, args)
+                    |  SimpleExpr ArgumentExprs                                 Apply(expr, args)
+                    |  SimpleExpr ‘:’ IndentedExpr                              -- under language.experimental.fewerBraces
+                    |  SimpleExpr FunParams (‘=>’ | ‘?=>’) IndentedExpr         -- under language.experimental.fewerBraces
+                    |  SimpleExpr ‘_’                                           PostfixOp(expr, _) (to be dropped)
+                    |  XmlExpr													                        -- to be dropped
+IndentedExpr      ::=  indent CaseClauses | Block outdent
+Quoted            ::=  ‘'’ ‘{’ Block ‘}’  
+                    |  ‘'’ ‘[’ Type ‘]’
+ExprsInParens     ::=  ExprInParens {‘,’ ExprInParens}
+ExprInParens      ::=  PostfixExpr ‘:’ Type                                     -- normal Expr allows only RefinedType here
+                    |  Expr
+ParArgumentExprs  ::=  ‘(’ [‘using’] ExprsInParens ‘)’                          exprs
+                    |  ‘(’ [ExprsInParens ‘,’] PostfixExpr ‘*’ ‘)’              exprs :+ Typed(expr, Ident(wildcardStar))
+ArgumentExprs     ::=  ParArgumentExprs
+                    |  BlockExpr
+BlockExpr         ::=  <<< CaseClauses | Block >>>
+Block             ::=  {BlockStat semi} [BlockResult]                           Block(stats, expr?)
+BlockStat         ::=  Import
+                    |  {Annotation {nl}} {LocalModifier} Def
+                    |  Extension
+                    |  Expr1
+                    |  EndMarker
+
+ForExpr           ::=  ‘for’ ‘(’ Enumerators0 ‘)’ {nl} [‘do‘ | ‘yield’] Expr     ForYield(enums, expr) / ForDo(enums, expr)
+                    |  ‘for’ ‘{’ Enumerators0 ‘}’ {nl} [‘do‘ | ‘yield’] Expr
+                    |  ‘for’     Enumerators0          (‘do‘ | ‘yield’) Expr
+Enumerators0      ::=  {nl} Enumerators [semi]
+Enumerators       ::=  Generator {semi Enumerator | Guard}
+Enumerator        ::=  Generator
+                    |  Guard {Guard}
+                    |  Pattern1 ‘=’ Expr                                        GenAlias(pat, expr)
+Generator         ::=  [‘case’] Pattern1 ‘<-’ Expr                              GenFrom(pat, expr)
+Guard             ::=  ‘if’ PostfixExpr
+
+CaseClauses       ::=  CaseClause { CaseClause }                                Match(EmptyTree, cases)
+CaseClause        ::=  ‘case’ Pattern [Guard] ‘=>’ Block                        CaseDef(pat, guard?, block)   // block starts at =>
+ExprCaseClause    ::=  ‘case’ Pattern [Guard] ‘=>’ Expr
+TypeCaseClauses   ::=  TypeCaseClause { TypeCaseClause }
+TypeCaseClause    ::=  ‘case’ (InfixType | ‘_’) ‘=>’ Type [semi]
+
+Pattern           ::=  Pattern1 { ‘|’ Pattern1 }                                Alternative(pats)
+Pattern1          ::=  Pattern2 [‘:’ RefinedType]                               Bind(name, Typed(Ident(wildcard), tpe))
+Pattern2          ::=  [id ‘@’] InfixPattern                                    Bind(name, pat)
+InfixPattern      ::=  SimplePattern { id [nl] SimplePattern }                  InfixOp(pat, op, pat)
+SimplePattern     ::=  PatVar                                                   Ident(wildcard)
+                    |  Literal                                                  Bind(name, Ident(wildcard))
+                    |  ‘(’ [Patterns] ‘)’                                       Parens(pats) Tuple(pats)
+                    |  Quoted
+                    |  XmlPattern												(to be dropped)
+                    |  SimplePattern1 [TypeArgs] [ArgumentPatterns]
+                    |  ‘given’ RefinedType
+SimplePattern1    ::=  SimpleRef
+                    |  SimplePattern1 ‘.’ id
+PatVar            ::=  varid
+                    |  ‘_’
+Patterns          ::=  Pattern {‘,’ Pattern}
+ArgumentPatterns  ::=  ‘(’ [Patterns] ‘)’                                       Apply(fn, pats)
+                    |  ‘(’ [Patterns ‘,’] PatVar ‘*’ ‘)’
+```
+
+### Type and Value Parameters
+```ebnf
+ClsTypeParamClause::=  ‘[’ ClsTypeParam {‘,’ ClsTypeParam} ‘]’
+ClsTypeParam      ::=  {Annotation} [‘+’ | ‘-’]                                 TypeDef(Modifiers, name, tparams, bounds)
+                       id [HkTypeParamClause] TypeParamBounds                   Bound(below, above, context)
+
+DefTypeParamClause::=  ‘[’ DefTypeParam {‘,’ DefTypeParam} ‘]’
+DefTypeParam      ::=  {Annotation} id [HkTypeParamClause] TypeParamBounds
+
+TypTypeParamClause::=  ‘[’ TypTypeParam {‘,’ TypTypeParam} ‘]’
+TypTypeParam      ::=  {Annotation} id [HkTypeParamClause] TypeBounds
+
+HkTypeParamClause ::=  ‘[’ HkTypeParam {‘,’ HkTypeParam} ‘]’
+HkTypeParam       ::=  {Annotation} [‘+’ | ‘-’] (id [HkTypeParamClause] | ‘_’)
+                       TypeBounds
+
+ClsParamClauses   ::=  {ClsParamClause} [[nl] ‘(’ [‘implicit’] ClsParams ‘)’]
+ClsParamClause    ::=  [nl] ‘(’ ClsParams ‘)’
+                    |  [nl] ‘(’ ‘using’ (ClsParams | FunArgTypes) ‘)’
+ClsParams         ::=  ClsParam {‘,’ ClsParam}
+ClsParam          ::=  {Annotation}                                             ValDef(mods, id, tpe, expr) -- point of mods on val/var
+                       [{Modifier} (‘val’ | ‘var’) | ‘inline’] Param
+Param             ::=  id ‘:’ ParamType [‘=’ Expr]
+
+DefParamClauses   ::=  {DefParamClause} [[nl] ‘(’ [‘implicit’] DefParams ‘)’]
+DefParamClause    ::=  [nl] ‘(’ DefParams ‘)’ | UsingParamClause
+UsingParamClause  ::=  [nl] ‘(’ ‘using’ (DefParams | FunArgTypes) ‘)’
+DefParams         ::=  DefParam {‘,’ DefParam}
+DefParam          ::=  {Annotation} [‘inline’] Param                            ValDef(mods, id, tpe, expr) -- point of mods at id.
+```
+
+### Bindings and Imports
+```ebnf
+Bindings          ::=  ‘(’ [Binding {‘,’ Binding}] ‘)’
+Binding           ::=  (id | ‘_’) [‘:’ Type]                                    ValDef(_, id, tpe, EmptyTree)
+
+Modifier          ::=  LocalModifier
+                    |  AccessModifier
+                    |  ‘override’
+                    |  ‘opaque’
+LocalModifier     ::=  ‘abstract’
+                    |  ‘final’
+                    |  ‘sealed’
+                    |  ‘open’
+                    |  ‘implicit’
+                    |  ‘lazy’
+                    |  ‘inline’
+AccessModifier    ::=  (‘private’ | ‘protected’) [AccessQualifier]
+AccessQualifier   ::=  ‘[’ id ‘]’
+
+Annotation        ::=  ‘@’ SimpleType1 {ParArgumentExprs}                         Apply(tpe, args)
+
+Import            ::=  ‘import’ ImportExpr {‘,’ ImportExpr}
+Export            ::=  ‘export’ ImportExpr {‘,’ ImportExpr}
+ImportExpr        ::=  SimpleRef {‘.’ id} ‘.’ ImportSpec                          Import(expr, sels)
+                    |  SimpleRef ‘as’ id                                          Import(EmptyTree, ImportSelector(ref, id))
+ImportSpec        ::=  NamedSelector
+                    |  WildcardSelector
+                    | ‘{’ ImportSelectors) ‘}’
+NamedSelector     ::=  id [‘as’ (id | ‘_’)]
+WildCardSelector  ::=  ‘*' | ‘given’ [InfixType]
+ImportSelectors   ::=  NamedSelector [‘,’ ImportSelectors]
+                    |  WildCardSelector {‘,’ WildCardSelector}
+
+EndMarker         ::=  ‘end’ EndMarkerTag    -- when followed by EOL
+EndMarkerTag      ::=  id | ‘if’ | ‘while’ | ‘for’ | ‘match’ | ‘try’
+                    |  ‘new’ | ‘this’ | ‘given’ | ‘extension’ | ‘val’
+```
+
+### Declarations and Definitions
+```ebnf
+RefineDcl         ::=  ‘val’ ValDcl
+                    |  ‘def’ DefDcl
+                    |  ‘type’ {nl} TypeDcl
+Dcl               ::=  RefineDcl
+                    |  ‘var’ VarDcl
+ValDcl            ::=  ids ‘:’ Type                                             PatDef(_, ids, tpe, EmptyTree)
+VarDcl            ::=  ids ‘:’ Type                                             PatDef(_, ids, tpe, EmptyTree)
+DefDcl            ::=  DefSig ‘:’ Type                                          DefDef(_, name, tparams, vparamss, tpe, EmptyTree)
+DefSig            ::=  id [DefTypeParamClause] DefParamClauses
+TypeDcl           ::=  id [TypeParamClause] {FunParamClause} TypeBounds         TypeDefTree(_, name, tparams, bound
+                       [‘=’ Type]
+
+Def               ::=  ‘val’ PatDef
+                    |  ‘var’ PatDef
+                    |  ‘def’ DefDef
+                    |  ‘type’ {nl} TypeDcl
+                    |  TmplDef
+PatDef            ::=  ids [‘:’ Type] ‘=’ Expr
+                    |  Pattern2 [‘:’ Type] ‘=’ Expr                             PatDef(_, pats, tpe?, expr)
+DefDef            ::=  DefSig [‘:’ Type] ‘=’ Expr                               DefDef(_, name, tparams, vparamss, tpe, expr)
+                    |  ‘this’ DefParamClause DefParamClauses ‘=’ ConstrExpr     DefDef(_, <init>, Nil, vparamss, EmptyTree, expr | Block)
+
+TmplDef           ::=  ([‘case’] ‘class’ | ‘trait’) ClassDef
+                    |  [‘case’] ‘object’ ObjectDef
+                    |  ‘enum’ EnumDef
+                    |  ‘given’ GivenDef
+ClassDef          ::=  id ClassConstr [Template]                                ClassDef(mods, name, tparams, templ)
+ClassConstr       ::=  [ClsTypeParamClause] [ConstrMods] ClsParamClauses        with DefDef(_, <init>, Nil, vparamss, EmptyTree, EmptyTree) as first stat
+ConstrMods        ::=  {Annotation} [AccessModifier]
+ObjectDef         ::=  id [Template]                                            ModuleDef(mods, name, template)  // no constructor
+EnumDef           ::=  id ClassConstr InheritClauses EnumBody
+GivenDef          ::=  [GivenSig] (AnnotType [‘=’ Expr] | StructuralInstance)
+GivenSig          ::=  [id] [DefTypeParamClause] {UsingParamClause} ‘:’         -- one of `id`, `DefParamClause`, `UsingParamClause` must be present
+StructuralInstance ::=  ConstrApp {‘with’ ConstrApp} [‘with’ TemplateBody]
+Extension         ::=  ‘extension’ [DefTypeParamClause] {UsingParamClause}
+                       ‘(’ DefParam ‘)’ {UsingParamClause} ExtMethods
+ExtMethods        ::=  ExtMethod | [nl] <<< ExtMethod {semi ExtMethod} >>>
+ExtMethod         ::=  {Annotation [nl]} {Modifier} ‘def’ DefDef
+Template          ::=  InheritClauses [TemplateBody]
+InheritClauses    ::=  [‘extends’ ConstrApps] [‘derives’ QualId {‘,’ QualId}]
+ConstrApps        ::=  ConstrApp ({‘,’ ConstrApp} | {‘with’ ConstrApp})
+ConstrApp         ::=  SimpleType1 {Annotation} {ParArgumentExprs}
+ConstrExpr        ::=  SelfInvocation
+                    |  <<< SelfInvocation {semi BlockStat} >>>
+SelfInvocation    ::=  ‘this’ ArgumentExprs {ArgumentExprs}
+
+TemplateBody      ::=  :<<< [SelfType] TemplateStat {semi TemplateStat} >>>
+TemplateStat      ::=  Import
+                    |  Export
+                    |  {Annotation [nl]} {Modifier} Def
+                    |  {Annotation [nl]} {Modifier} Dcl
+                    |  Extension
+                    |  Expr1
+                    |  EndMarker
+                    |
+SelfType          ::=  id [‘:’ InfixType] ‘=>’                                  ValDef(_, name, tpt, _)
+                    |  ‘this’ ‘:’ InfixType ‘=>’
+
+EnumBody          ::=  :<<< [SelfType] EnumStat {semi EnumStat} >>>
+EnumStat          ::=  TemplateStat
+                    |  {Annotation [nl]} {Modifier} EnumCase
+EnumCase          ::=  ‘case’ (id ClassConstr [‘extends’ ConstrApps]] | ids)
+
+TopStats          ::=  TopStat {semi TopStat}
+TopStat           ::=  Import
+                    |  Export
+                    |  {Annotation [nl]} {Modifier} Def
+                    |  Extension
+                    |  Packaging
+                    |  PackageObject
+                    |  EndMarker
+                    |
+Packaging         ::=  ‘package’ QualId :<<< TopStats >>>
+PackageObject     ::=  ‘package’ ‘object’ ObjectDef
+
+CompilationUnit   ::=  {‘package’ QualId semi} TopStats
+```
diff --git a/docs/docs/internals/type-system.md b/docs/_docs/internals/type-system.md
similarity index 87%
rename from docs/docs/internals/type-system.md
rename to docs/_docs/internals/type-system.md
index 30aa907f6773..8fa8912a7118 100644
--- a/docs/docs/internals/type-system.md
+++ b/docs/_docs/internals/type-system.md
@@ -23,23 +23,24 @@ Type -+- ProxyType --+- NamedType ----+--- TypeRef
       |              |                +--- ThisType
       |              |                +--- SuperType
       |              |                +--- ConstantType
-      |              |                +--- MethodParam
+      |              |                +--- TermParamRef
       |              |                +----RecThis
       |              |                +--- SkolemType
-      |              +- PolyParam
+      |              +- TypeParamRef
       |              +- RefinedOrRecType -+-- RefinedType
       |              |                   -+-- RecType
-      |              +- HKApply
+      |              +- AppliedType
       |              +- TypeBounds
       |              +- ExprType
       |              +- AnnotatedType
       |              +- TypeVar
-      |              +- PolyType
+      |              +- HKTypeLambda
+      |              +- MatchType
       |
       +- GroundType -+- AndType
                      +- OrType
-                     +- MethodType -----+- ImplicitMethodType
-                     |                  +- JavaMethodType
+                     +- MethodOrPoly ---+-- PolyType
+                     |                  +-- MethodType
                      +- ClassInfo
                      |
                      +- NoType
@@ -131,8 +132,8 @@ TODO
 ## Type inference via constraint solving ##
 TODO
 
-[1]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/core/Types.scala
+[1]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/core/Types.scala
 [2]: https://github.com/samuelgruetter/dotty/blob/classdiagrampdf/dotty-types.pdf
 [3]: https://github.com/samuelgruetter/scaladiagrams/tree/print-descendants
-[4]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
-[5]: https://github.com/lampepfl/dotty/blob/master/tests/pos/refinedSubtyping.scala
+[4]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
+[5]: https://github.com/lampepfl/dotty/blob/main/tests/pos/refinedSubtyping.scala
diff --git a/docs/_docs/reference/changed-features/changed-features.md b/docs/_docs/reference/changed-features/changed-features.md
new file mode 100644
index 000000000000..05a138b396fa
--- /dev/null
+++ b/docs/_docs/reference/changed-features/changed-features.md
@@ -0,0 +1,7 @@
+---
+layout: doc-page
+title: "Other Changed Features"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features.html
+---
+
+The following pages document the features that have changed in Scala 3, compared to Scala 2.
diff --git a/docs/docs/reference/changed-features/compiler-plugins.md b/docs/_docs/reference/changed-features/compiler-plugins.md
similarity index 80%
rename from docs/docs/reference/changed-features/compiler-plugins.md
rename to docs/_docs/reference/changed-features/compiler-plugins.md
index debf369cc0c1..2a446e9cfb84 100644
--- a/docs/docs/reference/changed-features/compiler-plugins.md
+++ b/docs/_docs/reference/changed-features/compiler-plugins.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Changes in Compiler Plugins"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/compiler-plugins.html
 ---
 
 Compiler plugins are supported by Dotty (and Scala 3) since 0.9. There are two notable changes
@@ -63,28 +64,28 @@ import dotty.tools.dotc.plugins.{PluginPhase, StandardPlugin}
 import dotty.tools.dotc.transform.{Pickler, Staging}
 
 class DivideZero extends StandardPlugin:
-   val name: String = "divideZero"
-   override val description: String = "divide zero check"
+  val name: String = "divideZero"
+  override val description: String = "divide zero check"
 
-   def init(options: List[String]): List[PluginPhase] =
-      (new DivideZeroPhase) :: Nil
+  def init(options: List[String]): List[PluginPhase] =
+    (new DivideZeroPhase) :: Nil
 
 class DivideZeroPhase extends PluginPhase:
-   import tpd.*
+  import tpd.*
 
-   val phaseName = "divideZero"
+  val phaseName = "divideZero"
 
-   override val runsAfter = Set(Pickler.name)
-   override val runsBefore = Set(Staging.name)
+  override val runsAfter = Set(Pickler.name)
+  override val runsBefore = Set(Staging.name)
 
-   override def transformApply(tree: Apply)(implicit ctx: Context): Tree =
-      tree match
-         case Apply(Select(rcvr, nme.DIV), List(Literal(Constant(0))))
-         if rcvr.tpe <:< defn.IntType =>
-            report.error("dividing by zero", tree.pos)
-         case _ =>
-            ()
-      tree
+  override def transformApply(tree: Apply)(implicit ctx: Context): Tree =
+    tree match
+      case Apply(Select(rcvr, nme.DIV), List(Literal(Constant(0))))
+      if rcvr.tpe <:< defn.IntType =>
+        report.error("dividing by zero", tree.pos)
+      case _ =>
+        ()
+    tree
 end DivideZeroPhase
 ```
 
@@ -109,11 +110,11 @@ import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.plugins.ResearchPlugin
 
 class DummyResearchPlugin extends ResearchPlugin:
-   val name: String = "dummy"
-   override val description: String = "dummy research plugin"
+  val name: String = "dummy"
+  override val description: String = "dummy research plugin"
 
-   def init(options: List[String], phases: List[List[Phase]])(implicit ctx: Context): List[List[Phase]] =
-      phases
+  def init(options: List[String], phases: List[List[Phase]])(implicit ctx: Context): List[List[Phase]] =
+    phases
 end DummyResearchPlugin
 ```
 
diff --git a/docs/docs/reference/changed-features/eta-expansion-spec.md b/docs/_docs/reference/changed-features/eta-expansion-spec.md
similarity index 97%
rename from docs/docs/reference/changed-features/eta-expansion-spec.md
rename to docs/_docs/reference/changed-features/eta-expansion-spec.md
index 932d7e9cd236..67f7606d5b15 100644
--- a/docs/docs/reference/changed-features/eta-expansion-spec.md
+++ b/docs/_docs/reference/changed-features/eta-expansion-spec.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Automatic Eta Expansion - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/eta-expansion-spec.html
 ---
 
 ## Motivation
diff --git a/docs/docs/reference/changed-features/eta-expansion.md b/docs/_docs/reference/changed-features/eta-expansion.md
similarity index 93%
rename from docs/docs/reference/changed-features/eta-expansion.md
rename to docs/_docs/reference/changed-features/eta-expansion.md
index adfaa96f531a..2ae9af870a55 100644
--- a/docs/docs/reference/changed-features/eta-expansion.md
+++ b/docs/_docs/reference/changed-features/eta-expansion.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Automatic Eta Expansion"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/eta-expansion.html
 ---
 
 The conversion of _methods_ into _functions_ has been improved and happens automatically for methods with one or more parameters.
diff --git a/docs/docs/reference/changed-features/implicit-conversions-spec.md b/docs/_docs/reference/changed-features/implicit-conversions-spec.md
similarity index 91%
rename from docs/docs/reference/changed-features/implicit-conversions-spec.md
rename to docs/_docs/reference/changed-features/implicit-conversions-spec.md
index 33557ecef72c..b4ab97355036 100644
--- a/docs/docs/reference/changed-features/implicit-conversions-spec.md
+++ b/docs/_docs/reference/changed-features/implicit-conversions-spec.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Implicit Conversions - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/implicit-conversions-spec.html
 ---
 
 ## Implementation
@@ -11,13 +12,13 @@ defined by either:
 - An `implicit def` which has type `S => T` or `(=> S) => T`
 - An implicit value which has type `Conversion[S, T]`
 
-The standard library defines an abstract class `Conversion`:
+The standard library defines an abstract class [`Conversion`](https://scala-lang.org/api/3.x/scala/Conversion.html):
 
 ```scala
 package scala
 @java.lang.FunctionalInterface
 abstract class Conversion[-T, +U] extends Function1[T, U]:
-   def apply(x: T): U
+  def apply(x: T): U
 ```
 
 Function literals are automatically converted to `Conversion` values.
@@ -85,7 +86,7 @@ Note that implicit conversions are also affected by the [changes to implicit res
 
 ## Motivation for the changes
 
-The introduction of [`scala.Conversion`](https://github.com/lampepfl/dotty/blob/master/library/src/scala/Conversion.scala)
+The introduction of [`scala.Conversion`](https://scala-lang.org/api/3.x/scala/Conversion.html)
 in Scala 3 and the decision to restrict implicit values of this type to be
 considered as potential views comes from the desire to remove surprising
 behavior from the language:
@@ -101,7 +102,7 @@ This snippet contains a type error. The right-hand side of `val x`
 does not conform to type `String`. In Scala 2, the compiler will use
 `m` as an implicit conversion from `Int` to `String`, whereas Scala 3
 will report a type error, because `Map` isn't an instance of
-`Conversion`.
+[`Conversion`](https://scala-lang.org/api/3.x/scala/Conversion.html).
 
 ## Migration path
 
diff --git a/docs/_docs/reference/changed-features/implicit-conversions.md b/docs/_docs/reference/changed-features/implicit-conversions.md
new file mode 100644
index 000000000000..69737d5b6bf9
--- /dev/null
+++ b/docs/_docs/reference/changed-features/implicit-conversions.md
@@ -0,0 +1,65 @@
+---
+layout: doc-page
+title: "Implicit Conversions"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/implicit-conversions.html
+---
+
+An _implicit conversion_, also called _view_, is a conversion that
+is applied by the compiler in several situations:
+
+1. When an expression `e` of type `T` is encountered, but the compiler
+   needs an expression of type `S`.
+1. When an expression `e.m` where `e` has type `T` but `T` defines no
+   member `m` is encountered.
+
+In those cases, the compiler looks in the implicit scope for a
+conversion that can convert an expression of type `T` to an expression
+of type `S` (or to a type that defines a member `m` in the second
+case).
+
+This conversion can be either:
+
+1. An `implicit def` of type `T => S` or `(=> T) => S`
+1. An implicit value of type `scala.Conversion[T, S]`
+
+Defining an implicit conversion will emit a warning unless the import
+`scala.language.implicitConversions` is in scope, or the flag
+`-language:implicitConversions` is given to the compiler.
+
+## Examples
+
+The first example is taken from [`scala.Predef`](https://scala-lang.org/api/3.x/scala/Predef$.html).
+Thanks to this implicit conversion, it is possible to pass a
+[`scala.Int`](https://scala-lang.org/api/3.x/scala/Int.html)
+to a Java method that expects a `java.lang.Integer`
+
+```scala
+import scala.language.implicitConversions
+implicit def int2Integer(x: Int): java.lang.Integer =
+  x.asInstanceOf[java.lang.Integer]
+```
+
+The second example shows how to use `Conversion` to define an
+`Ordering` for an arbitrary type, given existing `Ordering`s for other
+types:
+
+```scala
+import scala.language.implicitConversions
+implicit def ordT[T, S](
+    implicit conv: Conversion[T, S],
+             ordS: Ordering[S]
+   ): Ordering[T] =
+   // `ordS` compares values of type `S`, but we can convert from `T` to `S`
+  (x: T, y: T) => ordS.compare(x, y)
+
+class A(val x: Int) // The type for which we want an `Ordering`
+
+// Convert `A` to a type for which an `Ordering` is available:
+implicit val AToInt: Conversion[A, Int] = _.x
+
+implicitly[Ordering[Int]] // Ok, exists in the standard library
+implicitly[Ordering[A]] // Ok, will use the implicit conversion from
+                        // `A` to `Int` and the `Ordering` for `Int`.
+```
+
+[More details](implicit-conversions-spec.md)
diff --git a/docs/docs/reference/changed-features/implicit-resolution.md b/docs/_docs/reference/changed-features/implicit-resolution.md
similarity index 93%
rename from docs/docs/reference/changed-features/implicit-resolution.md
rename to docs/_docs/reference/changed-features/implicit-resolution.md
index 90b6c80cf3bf..cf8af361b787 100644
--- a/docs/docs/reference/changed-features/implicit-resolution.md
+++ b/docs/_docs/reference/changed-features/implicit-resolution.md
@@ -1,7 +1,9 @@
 ---
 layout: doc-page
 title: "Changes in Implicit Resolution"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/implicit-resolution.html
 ---
+
 This section describes changes to the implicit resolution that apply both to the new `given`s and to the old-style `implicit`s in Scala 3.
 Implicit resolution uses a new algorithm which caches implicit results
 more aggressively for performance. There are also some changes that
@@ -13,23 +15,23 @@ where the type may still be inferred:
 ```scala
   class C {
 
-     val ctx: Context = ...        // ok
+    val ctx: Context = ...        // ok
 
-     /*!*/ implicit val x = ...    // error: type must be given explicitly
+    /*!*/ implicit val x = ...    // error: type must be given explicitly
 
-     /*!*/ implicit def y = ...    // error: type must be given explicitly
+    /*!*/ implicit def y = ...    // error: type must be given explicitly
   }
   val y = {
-     implicit val ctx = this.ctx // ok
-     ...
+    implicit val ctx = this.ctx // ok
+    ...
   }
 ```
 **2.** Nesting is now taken into account for selecting an implicit. Consider for instance the following scenario:
 ```scala
   def f(implicit i: C) = {
-     def g(implicit j: C) = {
-        implicitly[C]
-     }
+    def g(implicit j: C) = {
+      implicitly[C]
+    }
   }
 ```
 This will now resolve the `implicitly` call to `j`, because `j` is nested
@@ -45,8 +47,8 @@ no longer applies.
   given a: A = A()
 
   object o:
-     given b: B = B()
-     type C
+    given b: B = B()
+    type C
 ```
 Both `a` and `b` are visible as implicits at the point of the definition
 of `type C`. However, a reference to `p.o.C` outside of package `p` will
@@ -56,6 +58,7 @@ In more detail, here are the rules for what constitutes the implicit scope of
 a type:
 
 **Definition:** A reference is an _anchor_ if it refers to an object, a class, a trait, an abstract type, an opaque type alias, or a match type alias. References to packages and package objects are anchors only under `-source:3.0-migration`.
+Opaque type aliases count as anchors only outside the scope where their alias is visible.
 
 **Definition:** The _anchors_ of a type _T_ is a set of references defined as follows:
 
@@ -107,7 +110,7 @@ which means that the alternative `c` would be chosen as solution!
 Scala 2's somewhat puzzling behavior with respect to ambiguity has been exploited to implement
 the analogue of a "negated" search in implicit resolution, where a query `Q1` fails if some
 other query `Q2` succeeds and `Q1` succeeds if `Q2` fails. With the new cleaned up behavior
-these techniques no longer work. But there is now a new special type `scala.util.NotGiven`
+these techniques no longer work. But there is now a new special type [`scala.util.NotGiven`](https://scala-lang.org/api/3.x/scala/util/NotGiven.html)
 which implements negation directly. For any query type `Q`, `NotGiven[Q]` succeeds if and only if
 the implicit search for `Q` fails.
 
diff --git a/docs/docs/reference/changed-features/imports.md b/docs/_docs/reference/changed-features/imports.md
similarity index 93%
rename from docs/docs/reference/changed-features/imports.md
rename to docs/_docs/reference/changed-features/imports.md
index cdd24ae6382d..7d364ce68b92 100644
--- a/docs/docs/reference/changed-features/imports.md
+++ b/docs/_docs/reference/changed-features/imports.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Imports"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/imports.html
 ---
 
 The syntax of wildcard and renaming imports (and exports) has changed.
@@ -16,8 +17,8 @@ If you want to import a member named `*` specifically, you can use backticks aro
 
 ```scala
 object A:
-   def * = ...
-   def min = ...
+  def * = ...
+  def min = ...
 
 object B:
   import A.`*`   // imports just `*`
diff --git a/docs/docs/reference/changed-features/interpolation-escapes.md b/docs/_docs/reference/changed-features/interpolation-escapes.md
similarity index 79%
rename from docs/docs/reference/changed-features/interpolation-escapes.md
rename to docs/_docs/reference/changed-features/interpolation-escapes.md
index 9a96f2a6d285..6c9afa9d85cb 100644
--- a/docs/docs/reference/changed-features/interpolation-escapes.md
+++ b/docs/_docs/reference/changed-features/interpolation-escapes.md
@@ -1,9 +1,10 @@
 ---
 layout: doc-page
 title: "Escapes in interpolations"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/interpolation-escapes.html
 ---
 
-In Scala 2 there is no straightforward way to represent a single quote character `"` in a single quoted interpolation. A `\` character can't be used for that because interpolators themselves decide how to handle escaping, so the parser doesn't know whether the `"` should be escaped or used as a terminator.
+In Scala 2 there is no straightforward way to represent a single quote character `"` in a single quoted interpolation. A `\` character can't be used for that because interpolators themselves decide how to handle escaping, so the parser doesn't know whether the `"` character should be escaped or used as a terminator.
 
 In Scala 3, we can use the `$` meta character of interpolations to escape a `"` character. Example:
 
diff --git a/docs/docs/reference/changed-features/lazy-vals-init.md b/docs/_docs/reference/changed-features/lazy-vals-init.md
similarity index 95%
rename from docs/docs/reference/changed-features/lazy-vals-init.md
rename to docs/_docs/reference/changed-features/lazy-vals-init.md
index 5fbb126e5ddf..c3b25cdc5ab3 100644
--- a/docs/docs/reference/changed-features/lazy-vals-init.md
+++ b/docs/_docs/reference/changed-features/lazy-vals-init.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
-title: Lazy Vals initialization
+title: Lazy Vals Initialization
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/lazy-vals-init.html
 ---
 
 Scala 3 implements [Version 6](https://docs.scala-lang.org/sips/improved-lazy-val-initialization.html#version-6---no-synchronization-on-this-and-concurrent-initialization-of-fields)
diff --git a/docs/_docs/reference/changed-features/main-functions.md b/docs/_docs/reference/changed-features/main-functions.md
new file mode 100644
index 000000000000..7485dc942d99
--- /dev/null
+++ b/docs/_docs/reference/changed-features/main-functions.md
@@ -0,0 +1,87 @@
+---
+layout: doc-page
+title: "Main Methods"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/main-functions.html
+---
+
+Scala 3 offers a new way to define programs that can be invoked from the command line:
+A [`@main`](https://scala-lang.org/api/3.x/scala/main.html) annotation on a method turns this method into an executable program.
+Example:
+
+```scala
+@main def happyBirthday(age: Int, name: String, others: String*) =
+  val suffix =
+    age % 100 match
+    case 11 | 12 | 13 => "th"
+    case _ =>
+      age % 10 match
+        case 1 => "st"
+        case 2 => "nd"
+        case 3 => "rd"
+        case _ => "th"
+  val bldr = new StringBuilder(s"Happy $age$suffix birthday, $name")
+  for other <- others do bldr.append(" and ").append(other)
+  bldr.toString
+```
+
+This would generate a main program `happyBirthday` that could be called like this
+
+```
+> scala happyBirthday 23 Lisa Peter
+Happy 23rd birthday, Lisa and Peter
+```
+
+A [`@main`](https://scala-lang.org/api/3.x/scala/main.html) annotated method can be written either at the top-level or in a statically accessible object. The name of the program is in each case the name of the method, without any object prefixes. The [`@main`](https://scala-lang.org/api/3.x/scala/main.html) method can have an arbitrary number of parameters.
+For each parameter type there must be an instance of the [`scala.util.CommandLineParser.FromString[T]`](https://scala-lang.org/api/3.x/scala/util/CommandLineParser$$FromString.html) type class that is used to convert an argument string to the required parameter type `T`.
+The parameter list of a main method can end in a repeated parameter that then takes all remaining arguments given on the command line.
+
+The program implemented from a [`@main`](https://scala-lang.org/api/3.x/scala/main.html) method checks that there are enough arguments on
+the command line to fill in all parameters, and that argument strings are convertible to
+the required types. If a check fails, the program is terminated with an error message.
+
+Examples:
+
+```
+> scala happyBirthday 22
+Illegal command line after first argument: more arguments expected
+
+> scala happyBirthday sixty Fred
+Illegal command line: java.lang.NumberFormatException: For input string: "sixty"
+```
+
+The Scala compiler generates a program from a [`@main`](https://scala-lang.org/api/3.x/scala/main.html) method `f` as follows:
+
+ - It creates a class named `f` in the package where the [`@main`](https://scala-lang.org/api/3.x/scala/main.html) method was found
+ - The class has a static method `main` with the usual signature. It takes an `Array[String]`
+   as argument and returns [`Unit`](https://scala-lang.org/api/3.x/scala/Unit.html).
+ - The generated `main` method calls method `f` with arguments converted using
+   methods in the [`scala.util.CommandLineParser`](https://scala-lang.org/api/3.x/scala/util/CommandLineParser$.html) object.
+
+For instance, the `happyBirthDay` method above would generate additional code equivalent to the following class:
+
+```scala
+final class happyBirthday:
+  import scala.util.CommandLineParser as CLP
+  <static> def main(args: Array[String]): Unit =
+    try
+      happyBirthday(
+        CLP.parseArgument[Int](args, 0),
+        CLP.parseArgument[String](args, 1),
+        CLP.parseRemainingArguments[String](args, 2))
+    catch
+      case error: CLP.ParseError => CLP.showError(error)
+```
+
+**Note**: The `<static>` modifier above expresses that the `main` method is generated
+as a static method of class `happyBirthDay`. It is not available for user programs in Scala. Regular "static" members are generated in Scala using objects instead.
+
+[`@main`](https://scala-lang.org/api/3.x/scala/main.html) methods are the recommended scheme to generate programs that can be invoked from the command line in Scala 3. They replace the previous scheme to write program as objects with a special `App` parent class. In Scala 2, `happyBirthday` could be written also like this:
+
+```scala
+object happyBirthday extends App:
+  // needs by-hand parsing of arguments vector
+  ...
+```
+
+The previous functionality of [`App`](https://www.scala-lang.org/api/3.x/scala/App.html), which relied on the "magic" [`DelayedInit`](../dropped-features/delayed-init.md) trait, is no longer available. [`App`](https://scala-lang.org/api/3.x/scala/App.html) still exists in limited form for now, but it does not support command line arguments and will be deprecated in the future. If programs need to cross-build
+between Scala 2 and Scala 3, it is recommended to use an explicit `main` method with an `Array[String]` argument instead.
diff --git a/docs/_docs/reference/changed-features/match-syntax.md b/docs/_docs/reference/changed-features/match-syntax.md
new file mode 100644
index 000000000000..cff77262611b
--- /dev/null
+++ b/docs/_docs/reference/changed-features/match-syntax.md
@@ -0,0 +1,56 @@
+---
+layout: doc-page
+title: "Match Expressions"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/match-syntax.html
+---
+
+The syntactical precedence of match expressions has been changed.
+`match` is still a keyword, but it is used like an alphabetical operator. This has several consequences:
+
+ 1. `match` expressions can be chained:
+
+    ```scala
+    xs match {
+      case Nil => "empty"
+      case _   => "nonempty"
+    } match {
+      case "empty"    => 0
+      case "nonempty" => 1
+    }
+    ```
+
+    (or, dropping the optional braces)
+
+    ```scala
+    xs match
+      case Nil => "empty"
+      case _   => "nonempty"
+    match
+      case "empty" => 0
+      case "nonempty" => 1
+    ```
+
+ 2. `match` may follow a period:
+
+     ```scala
+     if xs.match
+       case Nil => false
+       case _   => true
+     then "nonempty"
+     else "empty"
+     ```
+
+ 3. The scrutinee of a match expression must be an `InfixExpr`. Previously the scrutinee could be followed by a type ascription `: T`, but this is no longer supported. So `x : T match { ... }` now has to be
+ written `(x: T) match { ... }`.
+
+## Syntax
+
+The new syntax of match expressions is as follows.
+
+```
+InfixExpr    ::=  ...
+               |  InfixExpr MatchClause
+SimpleExpr   ::=  ...
+               |  SimpleExpr ‘.’ MatchClause
+MatchClause  ::=  ‘match’ ‘{’ CaseClauses ‘}’
+```
diff --git a/docs/_docs/reference/changed-features/numeric-literals.md b/docs/_docs/reference/changed-features/numeric-literals.md
new file mode 100644
index 000000000000..758cc2e21373
--- /dev/null
+++ b/docs/_docs/reference/changed-features/numeric-literals.md
@@ -0,0 +1,7 @@
+---
+layout: doc-page
+title: "Numeric Literals"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/numeric-literals.html
+---
+
+[Document was moved](../experimental/numeric-literals.md)
diff --git a/docs/docs/reference/changed-features/operators.md b/docs/_docs/reference/changed-features/operators.md
similarity index 87%
rename from docs/docs/reference/changed-features/operators.md
rename to docs/_docs/reference/changed-features/operators.md
index ff30c6c74bd9..495eb8c5ede9 100644
--- a/docs/docs/reference/changed-features/operators.md
+++ b/docs/_docs/reference/changed-features/operators.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Rules for Operators"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/operators.html
 ---
 
 The rules for infix operators have changed in some parts:
@@ -18,12 +19,12 @@ import scala.annotation.targetName
 
 trait MultiSet[T]:
 
-   infix def union(other: MultiSet[T]): MultiSet[T]
+  infix def union(other: MultiSet[T]): MultiSet[T]
 
-   def difference(other: MultiSet[T]): MultiSet[T]
+  def difference(other: MultiSet[T]): MultiSet[T]
 
-   @targetName("intersection")
-   def *(other: MultiSet[T]): MultiSet[T]
+  @targetName("intersection")
+  def *(other: MultiSet[T]): MultiSet[T]
 
 end MultiSet
 
@@ -79,8 +80,8 @@ The purpose of the `infix` modifier is to achieve consistency across a code base
     infix def op3[T](x: T, y: S): R    // error: two parameters
 
     extension (x: A)
-       infix def op4(y: B): R          // ok
-       infix def op5(y1: B, y2: B): R  // error: two parameters
+      infix def op4(y: B): R          // ok
+      infix def op5(y1: B, y2: B): R  // error: two parameters
     ```
 
  4. `infix` modifiers can also be given to type, trait or class definitions that have exactly two type parameters. An infix type like
@@ -113,14 +114,14 @@ Infix operators can now appear at the start of lines in a multi-line expression.
 
 ```scala
 val str = "hello"
-   ++ " world"
-   ++ "!"
+  ++ " world"
+  ++ "!"
 
 def condition =
-   x > 0
-   ||
-   xs.exists(_ > 0)
-   || xs.isEmpty
+  x > 0
+  ||
+  xs.exists(_ > 0)
+  || xs.isEmpty
 ```
 
 Previously, those expressions would have been rejected, since the compiler's semicolon inference
@@ -128,10 +129,12 @@ would have treated the continuations `++ " world"` or `|| xs.isEmpty` as separat
 
 To make this syntax work, the rules are modified to not infer semicolons in front of leading infix operators.
 A _leading infix operator_ is
- - a symbolic identifier such as `+`, or `approx_==`, or an identifier in backticks,
- - that starts a new line,
- - that precedes a token on the same or the next line that can start an expression,
- - and that is immediately followed by at least one whitespace character.
+ - a symbolic identifier such as `+`, or `approx_==`, or an identifier in backticks that
+ - starts a new line, and
+ - is not following a blank line, and
+ - is followed by at least one whitespace character and a token that can start an expression.
+ - Furthermore, if the operator appears on its own line, the next line must have at least
+   the same indentation width as the operator.
 
 Example:
 
diff --git a/docs/docs/reference/changed-features/overload-resolution.md b/docs/_docs/reference/changed-features/overload-resolution.md
similarity index 97%
rename from docs/docs/reference/changed-features/overload-resolution.md
rename to docs/_docs/reference/changed-features/overload-resolution.md
index 63eb3b318371..e6c929f7a2ef 100644
--- a/docs/docs/reference/changed-features/overload-resolution.md
+++ b/docs/_docs/reference/changed-features/overload-resolution.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Changes in Overload Resolution"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/overload-resolution.html
 ---
 
 Overload resolution in Scala 3 improves on Scala 2 in two ways.
diff --git a/docs/docs/reference/changed-features/pattern-bindings.md b/docs/_docs/reference/changed-features/pattern-bindings.md
similarity index 90%
rename from docs/docs/reference/changed-features/pattern-bindings.md
rename to docs/_docs/reference/changed-features/pattern-bindings.md
index 0c2871ae06b9..2c8d1c10ceae 100644
--- a/docs/docs/reference/changed-features/pattern-bindings.md
+++ b/docs/_docs/reference/changed-features/pattern-bindings.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Pattern Bindings"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/pattern-bindings.html
 ---
 
 In Scala 2, pattern bindings in `val` definitions and `for` expressions are
@@ -20,12 +21,11 @@ This code gives a compile-time warning in Scala 3.1 (and also in Scala 3.0 under
 val pair = (1, true)
 val (x, y) = pair
 ```
-Sometimes one wants to decompose data anyway, even though the pattern is refutable. For instance, if at some point one knows that a list `elems` is non-empty one might
-want to decompose it like this:
+Sometimes one wants to decompose data anyway, even though the pattern is refutable. For instance, if at some point one knows that a list `elems` is non-empty one might want to decompose it like this:
 ```scala
 val first :: rest = elems   // error
 ```
-This works in Scala 2. In fact it is a typical use case for Scala 2's rules. But in Scala 3.1 it will give a warning. One can avoid the warning by marking the right-hand side with an `@unchecked` annotation:
+This works in Scala 2. In fact it is a typical use case for Scala 2's rules. But in Scala 3.1 it will give a warning. One can avoid the warning by marking the right-hand side with an [`@unchecked`](https://scala-lang.org/api/3.x/scala/unchecked.html) annotation:
 ```scala
 val first :: rest = elems: @unchecked   // OK
 ```
diff --git a/docs/docs/reference/changed-features/pattern-matching.md b/docs/_docs/reference/changed-features/pattern-matching.md
similarity index 78%
rename from docs/docs/reference/changed-features/pattern-matching.md
rename to docs/_docs/reference/changed-features/pattern-matching.md
index b61ce8fa886e..b9115fe93233 100644
--- a/docs/docs/reference/changed-features/pattern-matching.md
+++ b/docs/_docs/reference/changed-features/pattern-matching.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Option-less pattern matching"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/pattern-matching.html
 ---
 
 The implementation of pattern matching in Scala 3 was greatly simplified compared to Scala 2. From a user perspective, this means that Scala 3 generated patterns are a *lot* easier to debug, as variables all show up in debug modes and positions are correctly preserved.
@@ -101,11 +102,11 @@ For example:
 
 ```scala
 object Even:
-   def unapply(s: String): Boolean = s.size % 2 == 0
+  def unapply(s: String): Boolean = s.size % 2 == 0
 
 "even" match
-   case s @ Even() => println(s"$s has an even number of characters")
-   case s          => println(s"$s has an odd number of characters")
+  case s @ Even() => println(s"$s has an even number of characters")
+  case s          => println(s"$s has an odd number of characters")
 
 // even has an even number of characters
 ```
@@ -122,20 +123,20 @@ For example:
 
 ```scala
 class FirstChars(s: String) extends Product:
-   def _1 = s.charAt(0)
-   def _2 = s.charAt(1)
+  def _1 = s.charAt(0)
+  def _2 = s.charAt(1)
 
    // Not used by pattern matching: Product is only used as a marker trait.
-   def canEqual(that: Any): Boolean = ???
-   def productArity: Int = ???
-   def productElement(n: Int): Any = ???
+  def canEqual(that: Any): Boolean = ???
+  def productArity: Int = ???
+  def productElement(n: Int): Any = ???
 
 object FirstChars:
-   def unapply(s: String): FirstChars = new FirstChars(s)
+  def unapply(s: String): FirstChars = new FirstChars(s)
 
 "Hi!" match
-   case FirstChars(char1, char2) =>
-      println(s"First: $char1; Second: $char2")
+  case FirstChars(char1, char2) =>
+    println(s"First: $char1; Second: $char2")
 
 // First: H; Second: i
 ```
@@ -148,15 +149,15 @@ object FirstChars:
 
 ```scala
 class Nat(val x: Int):
-   def get: Int = x
-   def isEmpty = x < 0
+  def get: Int = x
+  def isEmpty = x < 0
 
 object Nat:
-   def unapply(x: Int): Nat = new Nat(x)
+  def unapply(x: Int): Nat = new Nat(x)
 
 5 match
-   case Nat(n) => println(s"$n is a natural number")
-   case _      => ()
+  case Nat(n) => println(s"$n is a natural number")
+  case _      => ()
 
 // 5 is a natural number
 ```
@@ -168,15 +169,15 @@ object Nat:
 
 ```Scala
 object ProdEmpty:
-   def _1: Int = ???
-   def _2: String = ???
-   def isEmpty = true
-   def unapply(s: String): this.type = this
-   def get = this
+  def _1: Int = ???
+  def _2: String = ???
+  def isEmpty = true
+  def unapply(s: String): this.type = this
+  def get = this
 
 "" match
-   case ProdEmpty(_, _) => ???
-   case _ => ()
+  case ProdEmpty(_, _) => ???
+  case _ => ()
 ```
 
 
@@ -186,10 +187,10 @@ object ProdEmpty:
 
 ```Scala
 type X = {
-   def lengthCompare(len: Int): Int // or, `def length: Int`
-   def apply(i: Int): T1
-   def drop(n: Int): scala.Seq[T2]
-   def toSeq: scala.Seq[T3]
+  def lengthCompare(len: Int): Int // or, `def length: Int`
+  def apply(i: Int): T1
+  def drop(n: Int): scala.Seq[T2]
+  def toSeq: scala.Seq[T3]
 }
 ```
 
@@ -200,13 +201,13 @@ type X = {
 
 ```scala
 object CharList:
-   def unapplySeq(s: String): Option[Seq[Char]] = Some(s.toList)
+  def unapplySeq(s: String): Option[Seq[Char]] = Some(s.toList)
 
 "example" match
-   case CharList(c1, c2, c3, c4, _, _, _) =>
-      println(s"$c1,$c2,$c3,$c4")
-   case _ =>
-      println("Expected *exactly* 7 characters!")
+  case CharList(c1, c2, c3, c4, _, _, _) =>
+    println(s"$c1,$c2,$c3,$c4")
+  case _ =>
+    println("Expected *exactly* 7 characters!")
 
 // e,x,a,m
 ```
@@ -222,12 +223,12 @@ object CharList:
 ```Scala
 class Foo(val name: String, val children: Int *)
 object Foo:
-   def unapplySeq(f: Foo): Option[(String, Seq[Int])] =
-      Some((f.name, f.children))
+  def unapplySeq(f: Foo): Option[(String, Seq[Int])] =
+    Some((f.name, f.children))
 
 def foo(f: Foo) = f match
-   case Foo(name, ns : _*) =>
-   case Foo(name, x, y, ns : _*) =>
+  case Foo(name, ns : _*) =>
+  case Foo(name, x, y, ns : _*) =>
 ```
 
 There are plans for further simplification, in particular to factor out *product
diff --git a/docs/_docs/reference/changed-features/structural-types-spec.md b/docs/_docs/reference/changed-features/structural-types-spec.md
new file mode 100644
index 000000000000..290189a67eda
--- /dev/null
+++ b/docs/_docs/reference/changed-features/structural-types-spec.md
@@ -0,0 +1,153 @@
+---
+layout: doc-page
+title: "Programmatic Structural Types - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/structural-types-spec.html
+---
+
+## Syntax
+
+```
+SimpleType    ::= ... | Refinement
+Refinement    ::= ‘{’ RefineStatSeq ‘}’
+RefineStatSeq ::=  RefineStat {semi RefineStat}
+RefineStat    ::= ‘val’ VarDcl | ‘def’ DefDcl | ‘type’ {nl} TypeDcl
+```
+
+## Implementation of Structural Types
+
+The standard library defines a universal marker trait
+[`scala.Selectable`](https://github.com/lampepfl/dotty/blob/main/library/src/scala/Selectable.scala):
+
+```scala
+trait Selectable extends Any
+```
+
+An implementation of `Selectable` that relies on [Java reflection](https://www.oracle.com/technical-resources/articles/java/javareflection.html) is
+available in the standard library: `scala.reflect.Selectable`. Other
+implementations can be envisioned for platforms where Java reflection
+is not available.
+
+Implementations of `Selectable` have to make available one or both of
+the methods `selectDynamic` and `applyDynamic`. The methods could be members of the `Selectable` implementation or they could be extension methods.
+
+The `selectDynamic` method takes a field name and returns the value associated with that name in the `Selectable`.
+It should have a signature of the form:
+
+```scala
+def selectDynamic(name: String): T
+```
+
+Often, the return type `T` is `Any`.
+
+Unlike `scala.Dynamic`, there is no special meaning for an `updateDynamic` method.
+However, we reserve the right to give it meaning in the future.
+Consequently, it is recommended not to define any member called `updateDynamic` in `Selectable`s.
+
+The `applyDynamic` method is used for selections that are applied to arguments. It takes a method name and possibly `Class`es representing its parameters types as well as the arguments to pass to the function.
+Its signature should be of one of the two following forms:
+
+```scala
+def applyDynamic(name: String)(args: Any*): T
+def applyDynamic(name: String, ctags: Class[?]*)(args: Any*): T
+```
+
+Both versions are passed the actual arguments in the `args` parameter. The second version takes in addition a vararg argument of `java.lang.Class`es that identify the method's parameter classes. Such an argument is needed
+if `applyDynamic` is implemented using Java reflection, but it could be
+useful in other cases as well. `selectDynamic` and `applyDynamic` can also take additional context parameters in using clauses. These are resolved in the normal way at the callsite.
+
+Given a value `v` of type `C { Rs }`, where `C` is a class reference
+and `Rs` are structural refinement declarations, and given `v.a` of type `U`, we consider three distinct cases:
+
+- If `U` is a value type, we map `v.a` to:
+  ```scala
+  v.selectDynamic("a").asInstanceOf[U]
+  ```
+
+- If `U` is a method type `(T11, ..., T1n)...(TN1, ..., TNn): R` and it is not a dependent method type, we map `v.a(a11, ..., a1n)...(aN1, ..., aNn)` to:
+  ```scala
+  v.applyDynamic("a")(a11, ..., a1n, ..., aN1, ..., aNn)
+    .asInstanceOf[R]
+  ```
+  If this call resolves to an `applyDynamic` method of the second form that takes a `Class[?]*` argument, we further rewrite this call to
+  ```scala
+  v.applyDynamic("a", c11, ..., c1n, ..., cN1, ... cNn)(
+    a11, ..., a1n, ..., aN1, ..., aNn)
+    .asInstanceOf[R]
+  ```
+   where each `c_ij` is the literal `java.lang.Class[?]` of the type of the formal parameter `Tij`, i.e., `classOf[Tij]`.
+
+- If `U` is neither a value nor a method type, or a dependent method
+  type, an error is emitted.
+
+Note that `v`'s static type does not necessarily have to conform to `Selectable`, nor does it need to have `selectDynamic` and `applyDynamic` as members. It suffices that there is an implicit
+conversion that can turn `v` into a `Selectable`, and the selection methods could also be available as
+[extension methods](../contextual/extension-methods.md).
+
+## Limitations of Structural Types
+
+- Dependent methods cannot be called via structural call.
+
+- Refinements may not introduce overloads: If a refinement specifies the signature
+  of a method `m`, and `m` is also defined in the parent type of the refinement, then
+  the new signature must properly override the existing one.
+
+- Subtyping of structural refinements must preserve erased parameter types: Assume
+  we want to prove `S <: T { def m(x: A): B }`. Then, as usual, `S` must have a member method `m` that can take an argument of type `A`. Furthermore, if `m` is not a member of `T` (i.e. the refinement is structural), an additional condition applies. In this case, the member _definition_ `m` of `S` will have a parameter
+  with type `A'` say. The additional condition is that the erasure of `A'` and `A` is the same. Here is an example:
+
+  ```scala
+  class Sink[A] { def put(x: A): Unit = {} }
+  val a = Sink[String]()
+  val b: { def put(x: String): Unit } = a  // error
+  b.put("abc") // looks for a method with a `String` parameter
+  ```
+  The second to last line is not well-typed,
+  since the erasure of the parameter type of `put` in class `Sink` is `Object`,
+  but the erasure of `put`'s parameter in the type of `b` is `String`.
+  This additional condition is necessary, since we will have to resort
+  to some (as yet unknown) form of reflection to call a structural member
+  like `put` in the type of `b` above. The condition ensures that the statically
+  known parameter types of the refinement correspond up to erasure to the
+  parameter types of the selected call target at runtime.
+
+  Most reflection dispatch algorithms need to know exact erased parameter types. For instance, if the example above would typecheck, the call
+  `b.put("abc")` on the last line would look for a method `put` in the runtime type of `b` that takes a `String` parameter. But the `put` method is the one from class `Sink`, which takes an `Object` parameter. Hence the call would fail at runtime with a `NoSuchMethodException`.
+
+  One might hope for a "more intelligent" reflexive dispatch algorithm that does not require exact parameter type matching. Unfortunately, this can always run into ambiguities, as long as overloading is a possibility. For instance, continuing the example above, we might introduce a new subclass `Sink1` of `Sink` and change the definition of `a` as follows:
+
+  ```scala
+  class Sink1[A] extends Sink[A] { def put(x: "123") = ??? }
+  val a: Sink[String] = Sink1[String]()
+  ```
+
+  Now there are two `put` methods in the runtime type of `b` with erased parameter
+  types `Object` and `String`, respectively. Yet dynamic dispatch still needs to go
+  to the first `put` method, even though the second looks like a better match.
+
+  For the cases where we can in fact implement reflection without knowing precise parameter types (for instance if static overloading is replaced by dynamically dispatched multi-methods), there is an escape hatch. For types that extend `scala.Selectable.WithoutPreciseParameterTypes` the signature check is omitted. Example:
+
+  ```scala
+  trait MultiMethodSelectable extends Selectable.WithoutPreciseParameterTypes:
+    // Assume this version of `applyDynamic` can be implemented without knowing
+    // precise parameter types `paramTypes`:
+    def applyDynamic(name: String, paramTypes: Class[_]*)(args: Any*): Any = ???
+
+  class Sink[A] extends MultiMethodSelectable:
+    def put(x: A): Unit = {}
+
+  val a = new Sink[String]
+  val b: MultiMethodSelectable { def put(x: String): Unit } = a  // OK
+  ```
+## Differences with Scala 2 Structural Types
+
+- Scala 2 supports structural types by means of Java reflection. Unlike
+  Scala 3, structural calls do not rely on a mechanism such as
+  `Selectable`, and reflection cannot be avoided.
+- In Scala 2, refinements can introduce overloads.
+- In Scala 2, mutable `var`s are allowed in refinements. In Scala 3,
+  they are no longer allowed.
+- Scala 2 does not impose the "same-erasure" restriction on subtyping of structural types. It allows some calls to fail at runtime instead.
+
+## Context
+
+For more information, see [Rethink Structural Types](https://github.com/lampepfl/dotty/issues/1886).
diff --git a/docs/docs/reference/changed-features/structural-types.md b/docs/_docs/reference/changed-features/structural-types.md
similarity index 78%
rename from docs/docs/reference/changed-features/structural-types.md
rename to docs/_docs/reference/changed-features/structural-types.md
index 9a056fb2beee..cc07487feb4d 100644
--- a/docs/docs/reference/changed-features/structural-types.md
+++ b/docs/_docs/reference/changed-features/structural-types.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Programmatic Structural Types"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/structural-types.html
 ---
 
 ## Motivation
@@ -35,12 +36,12 @@ Here's an example of a structural type `Person`:
 
 ```scala
   class Record(elems: (String, Any)*) extends Selectable:
-     private val fields = elems.toMap
-     def selectDynamic(name: String): Any = fields(name)
+    private val fields = elems.toMap
+    def selectDynamic(name: String): Any = fields(name)
 
   type Person = Record { val name: String; val age: Int }
  ```
- 
+
 The type `Person` adds a _refinement_ to its parent type `Record` that defines the two fields `name` and `age`. We say the refinement is _structural_ since  `name` and `age` are not defined in the parent type. But they exist nevertheless as members of class `Person`. For instance, the following
 program would print  "Emma is 42 years old.":
 
@@ -58,7 +59,7 @@ help from the user. In practice, the connection between a structural type
 and its underlying generic representation would most likely be done by
 a database layer, and therefore would not be a concern of the end user.
 
-`Record` extends the marker trait `scala.Selectable` and defines
+`Record` extends the marker trait [`scala.Selectable`](https://scala-lang.org/api/3.x/scala/Selectable.html) and defines
 a method `selectDynamic`, which maps a field name to its value.
 Selecting a structural type member is done by calling this method.
 The `person.name` and `person.age` selections are translated by
@@ -89,7 +90,7 @@ Structural types can also be accessed using [Java reflection](https://www.oracle
     def close(): Unit
 ```
 
-Here, we define a structural type `Closeable` that defines a `close` method. There are various classes that have `close` methods, we just list `FileInputStream` and `Channel` as two examples. It would be easiest if the two classes shared a common interface that factors out the `close` method. But such factorings are often not possible if different libraries are combined in one application. Yet, we can still have methods that work on
+Here, we define a structural type `Closeable` that defines a `close` method. There are various classes that have `close` methods, we just list [`FileInputStream`](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/io/FileInputStream.html#%3Cinit%3E(java.io.File)) and [`Channel`](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/nio/channels/Channel.html) as two examples. It would be easiest if the two classes shared a common interface that factors out the `close` method. But such factorings are often not possible if different libraries are combined in one application. Yet, we can still have methods that work on
 all classes with a `close` method by using the `Closeable` type. For instance,
 
 ```scala
@@ -135,29 +136,28 @@ than other classes. Here is an example:
 
 ```scala
 trait Vehicle extends reflect.Selectable:
-   val wheels: Int
+  val wheels: Int
 
 val i3 = new Vehicle: // i3: Vehicle { val range: Int }
-   val wheels = 4
-   val range = 240
+  val wheels = 4
+  val range = 240
 
 i3.range
 ```
 
 The type of `i3` in this example is `Vehicle { val range: Int }`. Hence,
 `i3.range` is well-formed. Since the base class `Vehicle` does not define a `range` field or method, we need structural dispatch to access the `range` field of the anonymous class that initializes `id3`. Structural dispatch
-is implemented by the base trait `reflect.Selectable` of `Vehicle`, which
-defines the necessary `selectDynamic` member.
+is implemented by the base trait [`reflect.Selectable`](https://scala-lang.org/api/3.x/scala/reflect/Selectable.html) of `Vehicle`, which defines the necessary `selectDynamic` member.
 
-`Vehicle` could also extend some other subclass of `scala.Selectable` that implements `selectDynamic` and `applyDynamic` differently. But if it does not extend a `Selectable` at all, the code would no longer typecheck:
+`Vehicle` could also extend some other subclass of [`scala.Selectable`](https://scala-lang.org/api/3.x/scala/Selectable.html) that implements `selectDynamic` and `applyDynamic` differently. But if it does not extend a `Selectable` at all, the code would no longer typecheck:
 
 ```scala
 trait Vehicle:
-   val wheels: Int
+  val wheels: Int
 
 val i3 = new Vehicle: // i3: Vehicle
-   val wheels = 4
-   val range = 240
+  val wheels = 4
+  val range = 240
 
 i3.range // error: range is not a member of `Vehicle`
 ```
@@ -167,11 +167,11 @@ adding any refinements. Hence, `i3` now has just type `Vehicle` and the selectio
 
 Note that in Scala 2 all local and anonymous classes could produce values with refined types. But
 members defined by such refinements could be selected only with the language import
-`reflectiveCalls`.
+[`reflectiveCalls`](https://scala-lang.org/api/3.x/scala/languageFeature$$reflectiveCalls$.html).
 
 ## Relation with `scala.Dynamic`
 
-There are clearly some connections with `scala.Dynamic` here, since
+There are clearly some connections with [`scala.Dynamic`](https://scala-lang.org/api/3.x/scala/Dynamic.html) here, since
 both select members programmatically. But there are also some
 differences.
 
@@ -179,13 +179,13 @@ differences.
   is, as long as the correspondence of the structural type with the
   underlying value is as stated.
 
-- `Dynamic` is just a marker trait, which gives more leeway where and
+- [`Dynamic`](https://scala-lang.org/api/3.x/scala/Dynamic.html) is just a marker trait, which gives more leeway where and
   how to define reflective access operations. By contrast
   `Selectable` is a trait which declares the access operations.
 
 - Two access operations, `selectDynamic` and `applyDynamic` are shared
   between both approaches. In `Selectable`, `applyDynamic` also may also take
-  `java.lang.Class` arguments indicating the method's formal parameter types.
-  `Dynamic` comes with `updateDynamic`.
+  [`java.lang.Class`](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Class.html) arguments indicating the method's formal parameter types.
+  [`Dynamic`](https://scala-lang.org/api/3.x/scala/Dynamic.html) comes with `updateDynamic`.
 
 [More details](structural-types-spec.md)
diff --git a/docs/_docs/reference/changed-features/type-checking.md b/docs/_docs/reference/changed-features/type-checking.md
new file mode 100644
index 000000000000..09a62698d4c7
--- /dev/null
+++ b/docs/_docs/reference/changed-features/type-checking.md
@@ -0,0 +1,7 @@
+---
+layout: doc-page
+title: "Changes in Type Checking"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/type-checking.html
+---
+
+*** **TO BE FILLED IN** ***
diff --git a/docs/docs/reference/changed-features/type-inference.md b/docs/_docs/reference/changed-features/type-inference.md
similarity index 78%
rename from docs/docs/reference/changed-features/type-inference.md
rename to docs/_docs/reference/changed-features/type-inference.md
index b1cd806c0999..020878444914 100644
--- a/docs/docs/reference/changed-features/type-inference.md
+++ b/docs/_docs/reference/changed-features/type-inference.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Changes in Type Inference"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/type-inference.html
 ---
 
 For more information, see the two presentations
diff --git a/docs/docs/reference/changed-features/vararg-splices.md b/docs/_docs/reference/changed-features/vararg-splices.md
similarity index 75%
rename from docs/docs/reference/changed-features/vararg-splices.md
rename to docs/_docs/reference/changed-features/vararg-splices.md
index a787edd04225..1d8b61408176 100644
--- a/docs/docs/reference/changed-features/vararg-splices.md
+++ b/docs/_docs/reference/changed-features/vararg-splices.md
@@ -1,16 +1,17 @@
 ---
 layout: doc-page
 title: "Vararg Splices"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/vararg-splices.html
 ---
 
 The syntax of vararg splices in patterns and function arguments has changed. The new syntax uses a postfix `*`,  analogously to how a vararg parameter is declared.
 
 ```scala
 val arr = Array(0, 1, 2, 3)
-val lst = List(arr*)                    // vararg splice argument
+val lst = List(arr*)                   // vararg splice argument
 lst match
-   case List(0, 1, xs*) => println(xs)  // binds xs to Seq(2, 3)
-   case List(1, _*) =>                  // wildcard pattern
+  case List(0, 1, xs*) => println(xs)  // binds xs to Seq(2, 3)
+  case List(1, _*) =>                  // wildcard pattern
 ```
 
 The old syntax for splice arguments will be phased out.
@@ -18,12 +19,12 @@ The old syntax for splice arguments will be phased out.
 ```scala
 /*!*/ val lst = List(arr: _*)      // syntax error
       lst match
-         case List(0, 1, xs @ _*)  // ok, equivalent to `xs*`
+        case List(0, 1, xs @ _*)  // ok, equivalent to `xs*`
 ```
 
 ## Syntax
 
-```ebnf
+```
 ArgumentPatterns  ::=  ‘(’ [Patterns] ‘)’
                     |  ‘(’ [Patterns ‘,’] Pattern2 ‘*’ ‘)’
 
diff --git a/docs/docs/reference/changed-features/wildcards.md b/docs/_docs/reference/changed-features/wildcards.md
similarity index 78%
rename from docs/docs/reference/changed-features/wildcards.md
rename to docs/_docs/reference/changed-features/wildcards.md
index 45d436e2cb19..3336f43c3795 100644
--- a/docs/docs/reference/changed-features/wildcards.md
+++ b/docs/_docs/reference/changed-features/wildcards.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: Wildcard Arguments in Types
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/wildcards.html
 ---
 
 The syntax of wildcard arguments in types has changed from `_` to `?`. Example:
@@ -42,3 +43,8 @@ option `-Ykind-projector`:
  3. In Scala 3.3, `*` is removed again, and all type parameter placeholders will be expressed with `_`.
 
 These rules make it possible to cross build between Scala 2 using the kind projector plugin and Scala 3.0 - 3.2 using the compiler option `-Ykind-projector`.
+
+There is also a migration path for users that want a one-time transition to syntax with `_` as a type parameter placeholder.
+With option `-Ykind-projector:underscores` Scala 3 will regard `_` as a type parameter placeholder, leaving `?` as the only syntax for wildcards.
+
+To cross-compile with old Scala 2 sources, while using `_` a placeholder, you must use options `-Xsource:3 -P:kind-projector:underscore-placeholders` together with a recent version of kind-projector (`0.13` and higher) and most recent versions of Scala 2 (`2.13.5` and higher and `2.12.14` and higher)
diff --git a/docs/docs/reference/contextual/by-name-context-parameters.md b/docs/_docs/reference/contextual/by-name-context-parameters.md
similarity index 88%
rename from docs/docs/reference/contextual/by-name-context-parameters.md
rename to docs/_docs/reference/contextual/by-name-context-parameters.md
index 549cdb4e08b7..8e8427f7457f 100644
--- a/docs/docs/reference/contextual/by-name-context-parameters.md
+++ b/docs/_docs/reference/contextual/by-name-context-parameters.md
@@ -1,20 +1,21 @@
 ---
 layout: doc-page
 title: "By-Name Context Parameters"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/by-name-context-parameters.html
 ---
 
 Context parameters can be declared by-name to avoid a divergent inferred expansion. Example:
 
 ```scala
 trait Codec[T]:
-   def write(x: T): Unit
+  def write(x: T): Unit
 
 given intCodec: Codec[Int] = ???
 
 given optionCodec[T](using ev: => Codec[T]): Codec[Option[T]] with
-   def write(xo: Option[T]) = xo match
-      case Some(x) => ev.write(x)
-      case None =>
+  def write(xo: Option[T]) = xo match
+    case Some(x) => ev.write(x)
+    case None =>
 
 val s = summon[Codec[Option[Int]]]
 
@@ -52,7 +53,7 @@ In the example above, the definition of `s` would be expanded as follows.
 
 ```scala
 val s = summon[Test.Codec[Option[Int]]](
-   optionCodec[Int](using intCodec)
+  optionCodec[Int](using intCodec)
 )
 ```
 
diff --git a/docs/docs/reference/contextual/context-bounds.md b/docs/_docs/reference/contextual/context-bounds.md
similarity index 84%
rename from docs/docs/reference/contextual/context-bounds.md
rename to docs/_docs/reference/contextual/context-bounds.md
index e227ad8b0b8a..e336f00cc463 100644
--- a/docs/docs/reference/contextual/context-bounds.md
+++ b/docs/_docs/reference/contextual/context-bounds.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Context Bounds"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/context-bounds.html
 ---
 
 A context bound is a shorthand for expressing the common pattern of a context parameter that depends on a type parameter. Using a context bound, the `maximum` function of the last section can be written like this:
@@ -9,7 +10,7 @@ A context bound is a shorthand for expressing the common pattern of a context pa
 def maximum[T: Ord](xs: List[T]): T = xs.reduceLeft(max)
 ```
 
-A bound like `: Ord` on a type parameter `T` of a method or class indicates a context parameter `with Ord[T]`. The context parameter(s) generated from context bounds come last in the definition of the containing method or class. For instance,
+A bound like `: Ord` on a type parameter `T` of a method or class indicates a context parameter `using Ord[T]`. The context parameter(s) generated from context bounds come last in the definition of the containing method or class. For instance,
 
 ```scala
 def f[T: C1 : C2, U: C3](x: T)(using y: U, z: V): R
diff --git a/docs/docs/reference/contextual/context-functions-spec.md b/docs/_docs/reference/contextual/context-functions-spec.md
similarity index 90%
rename from docs/docs/reference/contextual/context-functions-spec.md
rename to docs/_docs/reference/contextual/context-functions-spec.md
index 981bc208bf79..3c61e0e0c6ca 100644
--- a/docs/docs/reference/contextual/context-functions-spec.md
+++ b/docs/_docs/reference/contextual/context-functions-spec.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Context Functions - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/context-functions-spec.html
 ---
 
 ## Syntax
@@ -26,7 +27,7 @@ methods with context parameters. Specifically, the `N`-ary function type
 ```scala
 package scala
 trait ContextFunctionN[-T1, ..., -TN, +R]:
-   def apply(using x1: T1, ..., xN: TN): R
+  def apply(using x1: T1, ..., xN: TN): R
 ```
 
 Context function types erase to normal function types, so these classes are
@@ -49,7 +50,7 @@ The context function literal is evaluated as the instance creation expression
 
 ```scala
 new scala.ContextFunctionN[T1, ..., Tn, T]:
-   def apply(using x1: T1, ..., xn: Tn): T = e
+  def apply(using x1: T1, ..., xn: Tn): T = e
 ```
 
 A context parameter may also be a wildcard represented by an underscore `_`. In that case, a fresh name for the parameter is chosen arbitrarily.
@@ -62,7 +63,7 @@ Context function literals `(x1: T1, ..., xn: Tn) ?=> e` are
 automatically created for any expression `e` whose expected type is
 `scala.ContextFunctionN[T1, ..., Tn, R]`, unless `e` is
 itself a context function literal. This is analogous to the automatic
-insertion of `scala.Function0` around expressions in by-name argument position.
+insertion of [`scala.Function0`](https://scala-lang.org/api/3.x/scala/Function0.html) around expressions in by-name argument position.
 
 Context function types generalize to `N > 22` in the same way that function types do, see [the corresponding
 documentation](../dropped-features/limit22.md).
diff --git a/docs/docs/reference/contextual/context-functions.md b/docs/_docs/reference/contextual/context-functions.md
similarity index 82%
rename from docs/docs/reference/contextual/context-functions.md
rename to docs/_docs/reference/contextual/context-functions.md
index 46b7ffa539ae..c556a0cadf8f 100644
--- a/docs/docs/reference/contextual/context-functions.md
+++ b/docs/_docs/reference/contextual/context-functions.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Context Functions"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/context-functions.html
 ---
 
 _Context functions_ are functions with (only) context parameters.
@@ -54,28 +55,28 @@ instance, here is how they can support the "builder pattern", where
 the aim is to construct tables like this:
 ```scala
   table {
-     row {
-        cell("top left")
-        cell("top right")
-     }
-     row {
-        cell("bottom left")
-        cell("bottom right")
-     }
+    row {
+      cell("top left")
+      cell("top right")
+    }
+    row {
+      cell("bottom left")
+      cell("bottom right")
+    }
   }
 ```
 The idea is to define classes for `Table` and `Row` that allow the
 addition of elements via `add`:
 ```scala
   class Table:
-     val rows = new ArrayBuffer[Row]
-     def add(r: Row): Unit = rows += r
-     override def toString = rows.mkString("Table(", ", ", ")")
+    val rows = new ArrayBuffer[Row]
+    def add(r: Row): Unit = rows += r
+    override def toString = rows.mkString("Table(", ", ", ")")
 
   class Row:
-     val cells = new ArrayBuffer[Cell]
-     def add(c: Cell): Unit = cells += c
-     override def toString = cells.mkString("Row(", ", ", ")")
+    val cells = new ArrayBuffer[Cell]
+    def add(c: Cell): Unit = cells += c
+    override def toString = cells.mkString("Row(", ", ", ")")
 
   case class Cell(elem: String)
 ```
@@ -84,9 +85,9 @@ with context function types as parameters to avoid the plumbing boilerplate
 that would otherwise be necessary.
 ```scala
   def table(init: Table ?=> Unit) =
-     given t: Table = Table()
-     init
-     t
+    given t: Table = Table()
+    init
+    t
 
   def row(init: Row ?=> Unit)(using t: Table) =
      given r: Row = Row()
@@ -117,14 +118,14 @@ As a larger example, here is a way to define constructs for checking arbitrary p
 
 ```scala
 object PostConditions:
-   opaque type WrappedResult[T] = T
+  opaque type WrappedResult[T] = T
 
-   def result[T](using r: WrappedResult[T]): T = r
+  def result[T](using r: WrappedResult[T]): T = r
 
-   extension [T](x: T)
-      def ensuring(condition: WrappedResult[T] ?=> Boolean): T =
-         assert(condition(using x))
-         x
+  extension [T](x: T)
+    def ensuring(condition: WrappedResult[T] ?=> Boolean): T =
+      assert(condition(using x))
+      x
 end PostConditions
 import PostConditions.{ensuring, result}
 
@@ -137,14 +138,13 @@ scope to pass along to the `result` method. `WrappedResult` is a fresh type, to
 that we do not get unwanted givens in scope (this is good practice in all cases
 where context parameters are involved). Since `WrappedResult` is an opaque type alias, its
 values need not be boxed, and since `ensuring` is added as an extension method, its argument
-does not need boxing either. Hence, the implementation of `ensuring` is as about as efficient
-as the best possible code one could write by hand:
+does not need boxing either. Hence, the implementation of `ensuring` is close in efficiency to the best possible code one could write by hand:
 
 ```scala
 val s =
-   val result = List(1, 2, 3).sum
-   assert(result == 6)
-   result
+  val result = List(1, 2, 3).sum
+  assert(result == 6)
+  result
 ```
 ### Reference
 
diff --git a/docs/_docs/reference/contextual/contextual.md b/docs/_docs/reference/contextual/contextual.md
new file mode 100644
index 000000000000..a2fe095c44c0
--- /dev/null
+++ b/docs/_docs/reference/contextual/contextual.md
@@ -0,0 +1,83 @@
+---
+layout: doc-page
+title: "Contextual Abstractions"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual.html
+---
+
+### Critique of the Status Quo
+
+Scala's implicits are its most distinguished feature. They are _the_ fundamental way to abstract over context. They represent a unified paradigm with a great variety of use cases, among them: implementing type classes, establishing context, dependency injection, expressing capabilities, computing new types and proving relationships between them.
+
+Following Haskell, Scala was the second popular language to have some form of implicits. Other languages have followed suit. E.g [Rust's traits](https://doc.rust-lang.org/rust-by-example/trait.html) or [Swift's protocol extensions](https://docs.swift.org/swift-book/LanguageGuide/Protocols.html#ID521). Design proposals are also on the table for Kotlin as [compile time dependency resolution](https://github.com/Kotlin/KEEP/blob/e863b25f8b3f2e9b9aaac361c6ee52be31453ee0/proposals/compile-time-dependency-resolution.md), for C# as [Shapes and Extensions](https://github.com/dotnet/csharplang/issues/164)
+or for F# as [Traits](https://github.com/MattWindsor91/visualfsharp/blob/hackathon-vs/examples/fsconcepts.md). Implicits are also a common feature of theorem provers such as [Coq](https://coq.inria.fr/refman/language/extensions/implicit-arguments.html) or [Agda](https://agda.readthedocs.io/en/latest/language/implicit-arguments.html).
+
+Even though these designs use widely different terminology, they are all variants of the core idea of _term inference_. Given a type, the compiler synthesizes a "canonical" term that has that type. Scala embodies the idea in a purer form than most other languages: An implicit parameter directly leads to an inferred argument term that could also be written down explicitly. By contrast, type class based designs are less direct since they hide term inference behind some form of type classification and do not offer the option of writing the inferred quantities (typically, dictionaries) explicitly.
+
+Given that term inference is where the industry is heading, and given that Scala has it in a very pure form, how come implicits are not more popular? In fact, it's fair to say that implicits are at the same time Scala's most distinguished and most controversial feature. I believe this is due to a number of aspects that together make implicits harder to learn than necessary and also make it harder to prevent abuses.
+
+Particular criticisms are:
+
+1. Being very powerful, implicits are easily over-used and mis-used. This observation holds in almost all cases when we talk about _implicit conversions_, which, even though conceptually different, share the same syntax with other implicit definitions. For instance, regarding the two definitions
+
+    ```scala
+    implicit def i1(implicit x: T): C[T] = ...
+    implicit def i2(x: T): C[T] = ...
+    ```
+
+   the first of these is a conditional implicit _value_, the second an implicit _conversion_. Conditional implicit values are a cornerstone for expressing type classes, whereas most applications of implicit conversions have turned out to be of dubious value. The problem is that many newcomers to the language start with defining implicit conversions since they are easy to understand and seem powerful and convenient. Scala 3 will put under a language flag both definitions and applications of "undisciplined" implicit conversions between types defined elsewhere. This is a useful step to push back against overuse of implicit conversions. But the problem remains that syntactically, conversions and values just look too similar for comfort.
+
+2. Another widespread abuse is over-reliance on implicit imports. This often leads to inscrutable type errors that go away with the right import incantation, leaving a feeling of frustration. Conversely, it is hard to see what implicits a program uses since implicits can hide anywhere in a long list of imports.
+
+3. The syntax of implicit definitions is too minimal. It consists of a single modifier, `implicit`, that can be attached to a large number of language constructs. A problem with this for newcomers is that it conveys mechanism instead of intent. For instance, a type class instance is an implicit object or val if unconditional and an implicit def with implicit parameters referring to some class if conditional. This describes precisely what the implicit definitions translate to -- just drop the `implicit` modifier, and that's it! But the cues that define intent are rather indirect and can be easily misread, as demonstrated by the definitions of `i1` and `i2` above.
+
+4. The syntax of implicit parameters also has shortcomings. While implicit _parameters_ are designated specifically, arguments are not. Passing an argument to an implicit parameter looks like a regular application `f(arg)`. This is problematic because it means there can be confusion regarding what parameter gets instantiated in a call. For instance, in
+
+   ```scala
+   def currentMap(implicit ctx: Context): Map[String, Int]
+   ```
+
+   one cannot write `currentMap("abc")` since the string `"abc"` is taken as explicit argument to the implicit `ctx` parameter. One has to write `currentMap.apply("abc")` instead, which is awkward and irregular. For the same reason, a method definition can only have one implicit parameter section and it must always come last. This restriction not only reduces orthogonality, but also prevents some useful program constructs, such as a method with a regular parameter whose type depends on an implicit value. Finally, it's also a bit annoying that implicit parameters must have a name, even though in many cases that name is never referenced.
+
+5. Implicits pose challenges for tooling. The set of available implicits depends on context, so command completion has to take context into account. This is feasible in an IDE but tools like [Scaladoc](https://docs.scala-lang.org/overviews/scaladoc/overview.html) that are based on static web pages can only provide an approximation. Another problem is that failed implicit searches often give very unspecific error messages, in particular if some deeply recursive implicit search has failed. Note that the Scala 3 compiler has already made a lot of progress in the error diagnostics area. If a recursive search fails some levels down, it shows what was constructed and what is missing. Also, it suggests imports that can bring missing implicits in scope.
+
+None of the shortcomings is fatal, after all implicits are very widely used, and many libraries and applications rely on them. But together, they make code using implicits a lot more cumbersome and less clear than it could be.
+
+Historically, many of these shortcomings come from the way implicits were gradually "discovered" in Scala. Scala originally had only implicit conversions with the intended use case of "extending" a class or trait after it was defined, i.e. what is expressed by implicit classes in later versions of Scala. Implicit parameters and instance definitions came later in 2006 and we picked similar syntax since it seemed convenient. For the same reason, no effort was made to distinguish implicit imports or arguments from normal ones.
+
+Existing Scala programmers by and large have gotten used to the status quo and see little need for change. But for newcomers this status quo presents a big hurdle. I believe if we want to overcome that hurdle, we should take a step back and allow ourselves to consider a radically new design.
+
+### The New Design
+
+The following pages introduce a redesign of contextual abstractions in Scala. They introduce four fundamental changes:
+
+1. [Given Instances](./givens.md) are a new way to define basic terms that can be synthesized.  They replace implicit definitions. The core principle of the proposal is that, rather than mixing the `implicit` modifier with a large number of features, we have a single way to define terms that can be synthesized for types.
+
+2. [Using Clauses](./using-clauses.md) are a new syntax for implicit _parameters_ and their _arguments_. It unambiguously aligns parameters and arguments, solving a number of language warts. It also allows us to have several `using` clauses in a definition.
+
+3. ["Given" Imports](./given-imports.md) are a new class of import selectors that specifically import
+   givens and nothing else.
+
+4. [Implicit Conversions](./conversions.md) are now expressed as given instances of a standard `Conversion` class. All other forms of implicit conversions will be phased out.
+
+This section also contains pages describing other language features that are related to context abstraction. These are:
+
+- [Context Bounds](./context-bounds.md), which carry over unchanged.
+- [Extension Methods](./extension-methods.md) replace implicit classes in a way that integrates better with type classes.
+- [Implementing Type Classes](./type-classes.md) demonstrates how some common type classes can be implemented using the new constructs.
+- [Type Class Derivation](./derivation.md) introduces constructs to automatically derive type class instances for ADTs.
+- [Multiversal Equality](./multiversal-equality.md) introduces a special type class to support type safe equality.
+- [Context Functions](./context-functions.md) provide a way to abstract over context parameters.
+- [By-Name Context Parameters](./by-name-context-parameters.md) are an essential tool to define recursive synthesized values without looping.
+- [Relationship with Scala 2 Implicits](./relationship-implicits.md) discusses the relationship between old-style implicits and new-style givens and how to migrate from one to the other.
+
+Overall, the new design achieves a better separation of term inference from the rest of the language: There is a single way to define givens instead of a multitude of forms all taking an `implicit` modifier. There is a single way to introduce implicit parameters and arguments instead of conflating implicit with normal arguments. There is a separate way to import givens that does not allow them to hide in a sea of normal imports. And there is a single way to define an implicit conversion which is clearly marked as such and does not require special syntax.
+
+This design thus avoids feature interactions and makes the language more consistent and orthogonal. It will make implicits easier to learn and harder to abuse. It will greatly improve the clarity of the 95% of Scala programs that use implicits. It has thus the potential to fulfil the promise of term inference in a principled way that is also accessible and friendly.
+
+Could we achieve the same goals by tweaking existing implicits? After having tried for a long time, I believe now that this is impossible.
+
+- First, some of the problems are clearly syntactic and require different syntax to solve them.
+- Second, there is the problem how to migrate. We cannot change the rules in mid-flight. At some stage of language evolution we need to accommodate both the new and the old rules. With a syntax change, this is easy: Introduce the new syntax with new rules, support the old syntax for a while to facilitate cross compilation, deprecate and phase out the old syntax at some later time. Keeping the same syntax does not offer this path, and in fact does not seem to offer any viable path for evolution
+- Third, even if we would somehow succeed with migration, we still have the problem
+  how to teach this. We cannot make existing tutorials go away. Almost all existing tutorials start with implicit conversions, which will go away; they use normal imports, which will go away, and they explain calls to methods with implicit parameters by expanding them to plain applications, which will also go away. This means that we'd have
+  to add modifications and qualifications to all existing literature and courseware, likely causing more confusion with beginners instead of less. By contrast, with a new syntax there is a clear criterion: Any book or courseware that mentions `implicit` is outdated and should be updated.
diff --git a/docs/_docs/reference/contextual/conversions.md b/docs/_docs/reference/contextual/conversions.md
new file mode 100644
index 000000000000..9928719663e2
--- /dev/null
+++ b/docs/_docs/reference/contextual/conversions.md
@@ -0,0 +1,76 @@
+---
+layout: doc-page
+title: "Implicit Conversions"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/conversions.html
+---
+
+Implicit conversions are defined by given instances of the `scala.Conversion` class.
+This class is defined in package `scala` as follows:
+```scala
+abstract class Conversion[-T, +U] extends (T => U):
+  def apply (x: T): U
+```
+For example, here is an implicit conversion from `String` to `Token`:
+```scala
+given Conversion[String, Token] with
+  def apply(str: String): Token = new KeyWord(str)
+```
+Using an alias this can be expressed more concisely as:
+```scala
+given Conversion[String, Token] = new KeyWord(_)
+```
+An implicit conversion is applied automatically by the compiler in three situations:
+
+1. If an expression `e` has type `T`, and `T` does not conform to the expression's expected type `S`.
+2. In a selection `e.m` with `e` of type `T`, but `T` defines no member `m`.
+3. In an application `e.m(args)` with `e` of type `T`, if `T` does define
+   some member(s) named `m`, but none of these members can be applied to the arguments `args`.
+
+In the first case, the compiler looks for a given `scala.Conversion` instance that maps
+an argument of type `T` to type `S`. In the second and third
+case, it looks for a given `scala.Conversion` instance that maps an argument of type `T`
+to a type that defines a member `m` which can be applied to `args` if present.
+If such an instance `C` is found, the expression `e` is replaced by `C.apply(e)`.
+
+## Examples
+
+1. The `Predef` package contains "auto-boxing" conversions that map
+primitive number types to subclasses of `java.lang.Number`. For instance, the
+conversion from `Int` to `java.lang.Integer` can be defined as follows:
+   ```scala
+   given int2Integer: Conversion[Int, java.lang.Integer] =
+     java.lang.Integer.valueOf(_)
+   ```
+
+2. The "magnet" pattern is sometimes used to express many variants of a method. Instead of defining overloaded versions of the method, one can also let the method take one or more arguments of specially defined "magnet" types, into which various argument types can be converted. Example:
+   ```scala
+   object Completions:
+
+     // The argument "magnet" type
+     enum CompletionArg:
+       case Error(s: String)
+       case Response(f: Future[HttpResponse])
+       case Status(code: Future[StatusCode])
+
+     object CompletionArg:
+
+       // conversions defining the possible arguments to pass to `complete`
+       // these always come with CompletionArg
+       // They can be invoked explicitly, e.g.
+       //
+       //   CompletionArg.fromStatusCode(statusCode)
+
+       given fromString    : Conversion[String, CompletionArg]               = Error(_)
+       given fromFuture    : Conversion[Future[HttpResponse], CompletionArg] = Response(_)
+       given fromStatusCode: Conversion[Future[StatusCode], CompletionArg]   = Status(_)
+     end CompletionArg
+     import CompletionArg.*
+
+     def complete[T](arg: CompletionArg) = arg match
+       case Error(s) => ...
+       case Response(f) => ...
+       case Status(code) => ...
+
+   end Completions
+   ```
+This setup is more complicated than simple overloading of `complete`, but it can still be useful if normal overloading is not available (as in the case above, since we cannot have two overloaded methods that take `Future[...]` arguments), or if normal overloading would lead to a combinatorial explosion of variants.
diff --git a/docs/docs/reference/contextual/derivation-macro.md b/docs/_docs/reference/contextual/derivation-macro.md
similarity index 85%
rename from docs/docs/reference/contextual/derivation-macro.md
rename to docs/_docs/reference/contextual/derivation-macro.md
index 22b4d0663c7e..5ff0007268dd 100644
--- a/docs/docs/reference/contextual/derivation-macro.md
+++ b/docs/_docs/reference/contextual/derivation-macro.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "How to write a type class `derived` method using macros"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/derivation-macro.html
 ---
 
 In the main [derivation](./derivation.md) documentation page, we explained the
@@ -17,7 +18,7 @@ As in the original code, the type class definition is the same:
 
 ```scala
 trait Eq[T]:
-   def eqv(x: T, y: T): Boolean
+  def eqv(x: T, y: T): Boolean
 ```
 
 we need to implement a method `Eq.derived` on the companion object of `Eq` that
@@ -41,25 +42,25 @@ from the signature. The body of the `derived` method is shown below:
 
 ```scala
 given derived[T: Type](using Quotes): Expr[Eq[T]] =
-   import quotes.reflect.*
+  import quotes.reflect.*
 
-   val ev: Expr[Mirror.Of[T]] = Expr.summon[Mirror.Of[T]].get
+  val ev: Expr[Mirror.Of[T]] = Expr.summon[Mirror.Of[T]].get
 
-   ev match
-      case '{ $m: Mirror.ProductOf[T] { type MirroredElemTypes = elementTypes }} =>
-         val elemInstances = summonAll[elementTypes]
-         val eqProductBody: (Expr[T], Expr[T]) => Expr[Boolean] = (x, y) =>
-            elemInstances.zipWithIndex.foldLeft(Expr(true: Boolean)) {
-               case (acc, (elem, index)) =>
-                  val e1 = '{$x.asInstanceOf[Product].productElement(${Expr(index)})}
-                  val e2 = '{$y.asInstanceOf[Product].productElement(${Expr(index)})}
-                  '{ $acc && $elem.asInstanceOf[Eq[Any]].eqv($e1, $e2) }
-            }
+  ev match
+    case '{ $m: Mirror.ProductOf[T] { type MirroredElemTypes = elementTypes }} =>
+      val elemInstances = summonAll[elementTypes]
+      val eqProductBody: (Expr[T], Expr[T]) => Expr[Boolean] = (x, y) =>
+        elemInstances.zipWithIndex.foldLeft(Expr(true: Boolean)) {
+          case (acc, (elem, index)) =>
+            val e1 = '{$x.asInstanceOf[Product].productElement(${Expr(index)})}
+            val e2 = '{$y.asInstanceOf[Product].productElement(${Expr(index)})}
+            '{ $acc && $elem.asInstanceOf[Eq[Any]].eqv($e1, $e2) }
+        }
 
-         '{ eqProduct((x: T, y: T) => ${eqProductBody('x, 'y)}) }
+      '{ eqProduct((x: T, y: T) => ${eqProductBody('x, 'y)}) }
 
-   // case for Mirror.ProductOf[T]
-   // ...
+  // case for Mirror.ProductOf[T]
+  // ...
 ```
 
 Note, that in the `inline` case we can merely write
@@ -97,7 +98,7 @@ One additional difference with the body of `derived` here as opposed to the one
 with `inline` is that with macros we need to synthesize the body of the code during the
 macro-expansion time. That is the rationale behind the `eqProductBody` function.
 Assuming that we calculate the equality of two `Person`s defined with a case
-class that holds a name of type [`String`](https://dotty.epfl.ch/api/scala/Predef$.html#String)
+class that holds a name of type [`String`](https://scala-lang.org/api/3.x/scala/Predef$.html#String-0)
 and an age of type `Int`, the equality check we want to generate is the following:
 
 ```scala
@@ -108,7 +109,7 @@ and an age of type `Int`, the equality check we want to generate is the followin
 
 ## Calling the derived method inside the macro
 
-Following the rules in [Macros](../metaprogramming/toc.md) we create two methods.
+Following the rules in [Macros](../metaprogramming/metaprogramming.md) we create two methods.
 One that hosts the top-level splice `eqv` and one that is the implementation.
 Alternatively and what is shown below is that we can call the `eqv` method
 directly. The `eqGen` can trigger the derivation.
diff --git a/docs/docs/reference/contextual/derivation.md b/docs/_docs/reference/contextual/derivation.md
similarity index 75%
rename from docs/docs/reference/contextual/derivation.md
rename to docs/_docs/reference/contextual/derivation.md
index 9a89fad25324..843116217d56 100644
--- a/docs/docs/reference/contextual/derivation.md
+++ b/docs/_docs/reference/contextual/derivation.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Type Class Derivation"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/derivation.html
 ---
 
 Type class derivation is a way to automatically generate given instances for type classes which satisfy some simple
@@ -10,8 +11,8 @@ on. Common examples are `Eq`, `Ordering`, or `Show`. For example, given the foll
 
 ```scala
 enum Tree[T] derives Eq, Ordering, Show:
-   case Branch(left: Tree[T], right: Tree[T])
-   case Leaf(elem: T)
+  case Branch(left: Tree[T], right: Tree[T])
+  case Leaf(elem: T)
 ```
 
 The `derives` clause generates the following given instances for the `Eq`, `Ordering` and `Show` type classes in the
@@ -42,37 +43,37 @@ derivation support.
 ```scala
 sealed trait Mirror:
 
-   /** the type being mirrored */
-   type MirroredType
+  /** the type being mirrored */
+  type MirroredType
 
-   /** the type of the elements of the mirrored type */
-   type MirroredElemTypes
+  /** the type of the elements of the mirrored type */
+  type MirroredElemTypes
 
-   /** The mirrored *-type */
-   type MirroredMonoType
+  /** The mirrored *-type */
+  type MirroredMonoType
 
-   /** The name of the type */
-   type MirroredLabel <: String
+  /** The name of the type */
+  type MirroredLabel <: String
 
-   /** The names of the elements of the type */
-   type MirroredElemLabels <: Tuple
+  /** The names of the elements of the type */
+  type MirroredElemLabels <: Tuple
 
 object Mirror:
 
-   /** The Mirror for a product type */
-   trait Product extends Mirror:
+  /** The Mirror for a product type */
+  trait Product extends Mirror:
 
-      /** Create a new instance of type `T` with elements
-       *  taken from product `p`.
-       */
-      def fromProduct(p: scala.Product): MirroredMonoType
+    /** Create a new instance of type `T` with elements
+     *  taken from product `p`.
+     */
+    def fromProduct(p: scala.Product): MirroredMonoType
 
-   trait Sum extends Mirror:
+  trait Sum extends Mirror:
 
-      /** The ordinal number of the case class of `x`.
-       *  For enums, `ordinal(x) == x.ordinal`
-       */
-      def ordinal(x: MirroredMonoType): Int
+    /** The ordinal number of the case class of `x`.
+     *  For enums, `ordinal(x) == x.ordinal`
+     */
+    def ordinal(x: MirroredMonoType): Int
 
 end Mirror
 ```
@@ -85,37 +86,37 @@ For the `Tree` ADT from above the following `Mirror` instances will be automatic
 ```scala
 // Mirror for Tree
 new Mirror.Sum:
-   type MirroredType = Tree
-   type MirroredElemTypes[T] = (Branch[T], Leaf[T])
-   type MirroredMonoType = Tree[_]
-   type MirroredLabels = "Tree"
-   type MirroredElemLabels = ("Branch", "Leaf")
+  type MirroredType = Tree
+  type MirroredElemTypes[T] = (Branch[T], Leaf[T])
+  type MirroredMonoType = Tree[_]
+  type MirroredLabel = "Tree"
+  type MirroredElemLabels = ("Branch", "Leaf")
 
-   def ordinal(x: MirroredMonoType): Int = x match
-      case _: Branch[_] => 0
-      case _: Leaf[_] => 1
+  def ordinal(x: MirroredMonoType): Int = x match
+    case _: Branch[_] => 0
+    case _: Leaf[_] => 1
 
 // Mirror for Branch
 new Mirror.Product:
-   type MirroredType = Branch
-   type MirroredElemTypes[T] = (Tree[T], Tree[T])
-   type MirroredMonoType = Branch[_]
-   type MirroredLabels = "Branch"
-   type MirroredElemLabels = ("left", "right")
+  type MirroredType = Branch
+  type MirroredElemTypes[T] = (Tree[T], Tree[T])
+  type MirroredMonoType = Branch[_]
+  type MirroredLabel = "Branch"
+  type MirroredElemLabels = ("left", "right")
 
-   def fromProduct(p: Product): MirroredMonoType =
-      new Branch(...)
+  def fromProduct(p: Product): MirroredMonoType =
+    new Branch(...)
 
 // Mirror for Leaf
 new Mirror.Product:
-   type MirroredType = Leaf
-   type MirroredElemTypes[T] = Tuple1[T]
-   type MirroredMonoType = Leaf[_]
-   type MirroredLabels = "Leaf"
-   type MirroredElemLabels = Tuple1["elem"]
-
-   def fromProduct(p: Product): MirroredMonoType =
-      new Leaf(...)
+  type MirroredType = Leaf
+  type MirroredElemTypes[T] = Tuple1[T]
+  type MirroredMonoType = Leaf[_]
+  type MirroredLabel = "Leaf"
+  type MirroredElemLabels = Tuple1["elem"]
+
+  def fromProduct(p: Product): MirroredMonoType =
+    new Leaf(...)
 ```
 
 Note the following properties of `Mirror` types,
@@ -142,6 +143,8 @@ signature and implementation of a `derived` method for a type class `TC[_]` are
 following form,
 
 ```scala
+import scala.deriving.Mirror
+
 def derived[T](using Mirror.Of[T]): TC[T] = ...
 ```
 
@@ -169,18 +172,20 @@ type-level constructs in Scala 3: inline methods, inline matches, and implicit s
 
 ```scala
 trait Eq[T]:
-   def eqv(x: T, y: T): Boolean
+  def eqv(x: T, y: T): Boolean
 ```
 
 we need to implement a method `Eq.derived` on the companion object of `Eq` that produces a given instance for `Eq[T]` given
 a `Mirror[T]`. Here is a possible implementation,
 
 ```scala
+import scala.deriving.Mirror
+
 inline given derived[T](using m: Mirror.Of[T]): Eq[T] =
-   val elemInstances = summonAll[m.MirroredElemTypes]           // (1)
-   inline m match                                               // (2)
-      case s: Mirror.SumOf[T]     => eqSum(s, elemInstances)
-      case p: Mirror.ProductOf[T] => eqProduct(p, elemInstances)
+  val elemInstances = summonAll[m.MirroredElemTypes]           // (1)
+  inline m match                                               // (2)
+    case s: Mirror.SumOf[T]     => eqSum(s, elemInstances)
+    case p: Mirror.ProductOf[T] => eqProduct(p, elemInstances)
 ```
 
 Note that `derived` is defined as an `inline` given. This means that the method will be expanded at
@@ -194,9 +199,9 @@ implementation of `summonAll` is `inline` and uses Scala 3's `summonInline` cons
 
 ```scala
 inline def summonAll[T <: Tuple]: List[Eq[_]] =
-   inline erasedValue[T] match
-      case _: EmptyTuple => Nil
-      case _: (t *: ts) => summonInline[Eq[t]] :: summonAll[ts]
+  inline erasedValue[T] match
+    case _: EmptyTuple => Nil
+    case _: (t *: ts) => summonInline[Eq[t]] :: summonAll[ts]
 ```
 
 with the instances for children in hand the `derived` method uses an `inline match` to dispatch to methods which can
@@ -209,23 +214,27 @@ values are of the same subtype of the ADT (3) and then, if they are, to further
 instance for the appropriate ADT subtype using the auxiliary method `check` (4).
 
 ```scala
+import scala.deriving.Mirror
+
 def eqSum[T](s: Mirror.SumOf[T], elems: List[Eq[_]]): Eq[T] =
-   new Eq[T]:
-      def eqv(x: T, y: T): Boolean =
-         val ordx = s.ordinal(x)                            // (3)
-         (s.ordinal(y) == ordx) && check(elems(ordx))(x, y) // (4)
+  new Eq[T]:
+    def eqv(x: T, y: T): Boolean =
+      val ordx = s.ordinal(x)                            // (3)
+      (s.ordinal(y) == ordx) && check(elems(ordx))(x, y) // (4)
 ```
 
 In the product case, `eqProduct` we test the runtime values of the arguments to `eqv` for equality as products based
 on the `Eq` instances for the fields of the data type (5),
 
 ```scala
+import scala.deriving.Mirror
+
 def eqProduct[T](p: Mirror.ProductOf[T], elems: List[Eq[_]]): Eq[T] =
-   new Eq[T]:
-      def eqv(x: T, y: T): Boolean =
-         iterator(x).zip(iterator(y)).zip(elems.iterator).forall {  // (5)
-            case ((x, y), elem) => check(elem)(x, y)
-         }
+  new Eq[T]:
+    def eqv(x: T, y: T): Boolean =
+      iterator(x).zip(iterator(y)).zip(elems.iterator).forall {  // (5)
+        case ((x, y), elem) => check(elem)(x, y)
+      }
 ```
 
 Pulling this all together we have the following complete implementation,
@@ -235,40 +244,40 @@ import scala.deriving.*
 import scala.compiletime.{erasedValue, summonInline}
 
 inline def summonAll[T <: Tuple]: List[Eq[_]] =
-   inline erasedValue[T] match
-      case _: EmptyTuple => Nil
-      case _: (t *: ts) => summonInline[Eq[t]] :: summonAll[ts]
+  inline erasedValue[T] match
+    case _: EmptyTuple => Nil
+    case _: (t *: ts) => summonInline[Eq[t]] :: summonAll[ts]
 
 trait Eq[T]:
-   def eqv(x: T, y: T): Boolean
+  def eqv(x: T, y: T): Boolean
 
 object Eq:
-   given Eq[Int] with
-      def eqv(x: Int, y: Int) = x == y
-
-   def check(elem: Eq[_])(x: Any, y: Any): Boolean =
-      elem.asInstanceOf[Eq[Any]].eqv(x, y)
-
-   def iterator[T](p: T) = p.asInstanceOf[Product].productIterator
-
-   def eqSum[T](s: Mirror.SumOf[T], elems: => List[Eq[_]]): Eq[T] =
-      new Eq[T]:
-         def eqv(x: T, y: T): Boolean =
-            val ordx = s.ordinal(x)
-            (s.ordinal(y) == ordx) && check(elems(ordx))(x, y)
-
-   def eqProduct[T](p: Mirror.ProductOf[T], elems: => List[Eq[_]]): Eq[T] =
-      new Eq[T]:
-         def eqv(x: T, y: T): Boolean =
-            iterator(x).zip(iterator(y)).zip(elems.iterator).forall {
-               case ((x, y), elem) => check(elem)(x, y)
-            }
-
-   inline given derived[T](using m: Mirror.Of[T]): Eq[T] =
-      lazy val elemInstances = summonAll[m.MirroredElemTypes]
-      inline m match
-         case s: Mirror.SumOf[T]     => eqSum(s, elemInstances)
-         case p: Mirror.ProductOf[T] => eqProduct(p, elemInstances)
+  given Eq[Int] with
+    def eqv(x: Int, y: Int) = x == y
+
+  def check(elem: Eq[_])(x: Any, y: Any): Boolean =
+    elem.asInstanceOf[Eq[Any]].eqv(x, y)
+
+  def iterator[T](p: T) = p.asInstanceOf[Product].productIterator
+
+  def eqSum[T](s: Mirror.SumOf[T], elems: => List[Eq[_]]): Eq[T] =
+    new Eq[T]:
+      def eqv(x: T, y: T): Boolean =
+        val ordx = s.ordinal(x)
+        (s.ordinal(y) == ordx) && check(elems(ordx))(x, y)
+
+  def eqProduct[T](p: Mirror.ProductOf[T], elems: => List[Eq[_]]): Eq[T] =
+    new Eq[T]:
+      def eqv(x: T, y: T): Boolean =
+        iterator(x).zip(iterator(y)).zip(elems.iterator).forall {
+          case ((x, y), elem) => check(elem)(x, y)
+        }
+
+  inline given derived[T](using m: Mirror.Of[T]): Eq[T] =
+    lazy val elemInstances = summonAll[m.MirroredElemTypes]
+    inline m match
+      case s: Mirror.SumOf[T]     => eqSum(s, elemInstances)
+      case p: Mirror.ProductOf[T] => eqProduct(p, elemInstances)
 end Eq
 ```
 
@@ -276,15 +285,15 @@ we can test this relative to a simple ADT like so,
 
 ```scala
 enum Opt[+T] derives Eq:
-   case Sm(t: T)
-   case Nn
+  case Sm(t: T)
+  case Nn
 
 @main def test(): Unit =
-   import Opt.*
-   val eqoi = summon[Eq[Opt[Int]]]
-   assert(eqoi.eqv(Sm(23), Sm(23)))
-   assert(!eqoi.eqv(Sm(23), Sm(13)))
-   assert(!eqoi.eqv(Sm(23), Nn))
+  import Opt.*
+  val eqoi = summon[Eq[Opt[Int]]]
+  assert(eqoi.eqv(Sm(23), Sm(23)))
+  assert(!eqoi.eqv(Sm(23), Sm(13)))
+  assert(!eqoi.eqv(Sm(23), Nn))
 ```
 
 In this case the code that is generated by the inline expansion for the derived `Eq` instance for `Opt` looks like the
@@ -292,13 +301,13 @@ following, after a little polishing,
 
 ```scala
 given derived$Eq[T](using eqT: Eq[T]): Eq[Opt[T]] =
-   eqSum(
-      summon[Mirror[Opt[T]]],
-      List(
-         eqProduct(summon[Mirror[Sm[T]]], List(summon[Eq[T]])),
-         eqProduct(summon[Mirror[Nn.type]], Nil)
-      )
-   )
+  eqSum(
+    summon[Mirror[Opt[T]]],
+    List(
+      eqProduct(summon[Mirror[Sm[T]]], List(summon[Eq[T]])),
+      eqProduct(summon[Mirror[Nn.type]], Nil)
+    )
+  )
 ```
 
 Alternative approaches can be taken to the way that `derived` methods can be defined. For example, more aggressively
@@ -310,18 +319,18 @@ As a third example, using a higher level library such as Shapeless the type clas
 
 ```scala
 given eqSum[A](using inst: => K0.CoproductInstances[Eq, A]): Eq[A] with
-   def eqv(x: A, y: A): Boolean = inst.fold2(x, y)(false)(
-      [t] => (eqt: Eq[t], t0: t, t1: t) => eqt.eqv(t0, t1)
-   )
+  def eqv(x: A, y: A): Boolean = inst.fold2(x, y)(false)(
+    [t] => (eqt: Eq[t], t0: t, t1: t) => eqt.eqv(t0, t1)
+  )
 
 given eqProduct[A](using inst: K0.ProductInstances[Eq, A]): Eq[A] with
-   def eqv(x: A, y: A): Boolean = inst.foldLeft2(x, y)(true: Boolean)(
-      [t] => (acc: Boolean, eqt: Eq[t], t0: t, t1: t) =>
-         Complete(!eqt.eqv(t0, t1))(false)(true)
-   )
+  def eqv(x: A, y: A): Boolean = inst.foldLeft2(x, y)(true: Boolean)(
+    [t] => (acc: Boolean, eqt: Eq[t], t0: t, t1: t) =>
+      Complete(!eqt.eqv(t0, t1))(false)(true)
+  )
 
-inline def derived[A](using gen: K0.Generic[A]) as Eq[A] =
-   gen.derive(eqSum, eqProduct)
+inline def derived[A](using gen: K0.Generic[A]): Eq[A] =
+  gen.derive(eqSum, eqProduct)
 ```
 
 The framework described here enables all three of these approaches without mandating any of them.
@@ -345,7 +354,7 @@ hand side of this definition in the same way as an instance defined in ADT compa
 
 ### Syntax
 
-```ebnf
+```
 Template          ::=  InheritClauses [TemplateBody]
 EnumDef           ::=  id ClassConstr InheritClauses EnumBody
 InheritClauses    ::=  [‘extends’ ConstrApps] [‘derives’ QualId {‘,’ QualId}]
diff --git a/docs/docs/reference/contextual/extension-methods.md b/docs/_docs/reference/contextual/extension-methods.md
similarity index 76%
rename from docs/docs/reference/contextual/extension-methods.md
rename to docs/_docs/reference/contextual/extension-methods.md
index 0052ebb06dc9..c2a12081cf99 100644
--- a/docs/docs/reference/contextual/extension-methods.md
+++ b/docs/_docs/reference/contextual/extension-methods.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Extension Methods"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/extension-methods.html
 ---
 
 Extension methods allow one to add methods to a type after the type is defined. Example:
@@ -9,7 +10,7 @@ Extension methods allow one to add methods to a type after the type is defined.
 case class Circle(x: Double, y: Double, radius: Double)
 
 extension (c: Circle)
-   def circumference: Double = c.radius * math.Pi * 2
+  def circumference: Double = c.radius * math.Pi * 2
 ```
 
 Like regular methods, extension methods can be invoked with infix `.`:
@@ -24,7 +25,7 @@ circle.circumference
 An extension method translates to a specially labelled method that takes the leading parameter section as its first argument list. The label, expressed
 as `<extension>` here, is compiler-internal. So, the definition of `circumference` above translates to the following method, and can also be invoked as such:
 
-```scala
+```
 <extension> def circumference(c: Circle): Double = c.radius * math.Pi * 2
 
 assert(circle.circumference == circumference(circle))
@@ -36,11 +37,11 @@ The extension method syntax can also be used to define operators. Examples:
 
 ```scala
 extension (x: String)
-   def < (y: String): Boolean = ...
+  def < (y: String): Boolean = ...
 extension (x: Elem)
-   def +: (xs: Seq[Elem]): Seq[Elem] = ...
+  def +: (xs: Seq[Elem]): Seq[Elem] = ...
 extension (x: Number)
-   infix def min (y: Number): Number = ...
+  infix def min (y: Number): Number = ...
 
 "ab" < "c"
 1 +: List(2, 3)
@@ -49,7 +50,7 @@ x min 3
 
 The three definitions above translate to
 
-```scala
+```
 <extension> def < (x: String)(y: String): Boolean = ...
 <extension> def +: (xs: Seq[Elem])(x: Elem): Seq[Elem] = ...
 <extension> infix def min(x: Number)(y: Number): Number = ...
@@ -68,10 +69,10 @@ It is also possible to extend generic types by adding type parameters to an exte
 
 ```scala
 extension [T](xs: List[T])
-   def second = xs.tail.head
+  def second = xs.tail.head
 
 extension [T: Numeric](x: T)
-   def + (y: T): T = summon[Numeric[T]].plus(x, y)
+  def + (y: T): T = summon[Numeric[T]].plus(x, y)
 ```
 
 Type parameters on extensions can also be combined with type parameters on the methods
@@ -79,7 +80,7 @@ themselves:
 
 ```scala
 extension [T](xs: List[T])
-   def sumBy[U: Numeric](f: T => U): U = ...
+  def sumBy[U: Numeric](f: T => U): U = ...
 ```
 
 Type arguments matching method type parameters are passed as usual:
@@ -105,7 +106,7 @@ Extensions can also take using clauses. For instance, the `+` extension above co
 
 ```scala
 extension [T](x: T)(using n: Numeric[T])
-   def + (y: T): T = n.plus(x, y)
+  def + (y: T): T = n.plus(x, y)
 ```
 
 ### Collective Extensions
@@ -118,11 +119,11 @@ Example:
 ```scala
 extension (ss: Seq[String])
 
-   def longestStrings: Seq[String] =
-      val maxLength = ss.map(_.length).max
-      ss.filter(_.length == maxLength)
+  def longestStrings: Seq[String] =
+    val maxLength = ss.map(_.length).max
+    ss.filter(_.length == maxLength)
 
-   def longestString: String = longestStrings.head
+  def longestString: String = longestStrings.head
 ```
 
 The same can be written with braces as follows (note that indented regions can still be used inside braces):
@@ -130,10 +131,10 @@ The same can be written with braces as follows (note that indented regions can s
 ```scala
 extension (ss: Seq[String]) {
 
-   def longestStrings: Seq[String] = {
-      val maxLength = ss.map(_.length).max
-      ss.filter(_.length == maxLength)
-   }
+  def longestStrings: Seq[String] = {
+    val maxLength = ss.map(_.length).max
+    ss.filter(_.length == maxLength)
+  }
 
   def longestString: String = longestStrings.head
 }
@@ -147,22 +148,22 @@ where each method is defined separately. For instance, the first extension above
 
 ```scala
 extension (ss: Seq[String])
-   def longestStrings: Seq[String] =
-      val maxLength = ss.map(_.length).max
-      ss.filter(_.length == maxLength)
+  def longestStrings: Seq[String] =
+    val maxLength = ss.map(_.length).max
+    ss.filter(_.length == maxLength)
 
 extension (ss: Seq[String])
-   def longestString: String = ss.longestStrings.head
+  def longestString: String = ss.longestStrings.head
 ```
 
 Collective extensions also can take type parameters and have using clauses. Example:
 
 ```scala
 extension [T](xs: List[T])(using Ordering[T])
-   def smallest(n: Int): List[T] = xs.sorted.take(n)
-   def smallestIndices(n: Int): List[Int] =
-      val limit = smallest(n).max
-      xs.zipWithIndex.collect { case (x, i) if x <= limit => i }
+  def smallest(n: Int): List[T] = xs.sorted.take(n)
+  def smallestIndices(n: Int): List[Int] =
+    val limit = smallest(n).max
+    xs.zipWithIndex.collect { case (x, i) if x <= limit => i }
 ```
 
 ### Translation of Calls to Extension Methods
@@ -183,33 +184,33 @@ Here is an example for the first rule:
 
 ```scala
 trait IntOps:
-   extension (i: Int) def isZero: Boolean = i == 0
+  extension (i: Int) def isZero: Boolean = i == 0
 
-   extension (i: Int) def safeMod(x: Int): Option[Int] =
-      // extension method defined in same scope IntOps
-      if x.isZero then None
-      else Some(i % x)
+  extension (i: Int) def safeMod(x: Int): Option[Int] =
+    // extension method defined in same scope IntOps
+    if x.isZero then None
+    else Some(i % x)
 
 object IntOpsEx extends IntOps:
-   extension (i: Int) def safeDiv(x: Int): Option[Int] =
-      // extension method brought into scope via inheritance from IntOps
-      if x.isZero then None
-      else Some(i / x)
+  extension (i: Int) def safeDiv(x: Int): Option[Int] =
+    // extension method brought into scope via inheritance from IntOps
+    if x.isZero then None
+    else Some(i / x)
 
 trait SafeDiv:
-   import IntOpsEx.* // brings safeDiv and safeMod into scope
+  import IntOpsEx.* // brings safeDiv and safeMod into scope
 
-   extension (i: Int) def divide(d: Int): Option[(Int, Int)] =
-      // extension methods imported and thus in scope
-      (i.safeDiv(d), i.safeMod(d)) match
-         case (Some(d), Some(r)) => Some((d, r))
-         case _ => None
+  extension (i: Int) def divide(d: Int): Option[(Int, Int)] =
+    // extension methods imported and thus in scope
+    (i.safeDiv(d), i.safeMod(d)) match
+      case (Some(d), Some(r)) => Some((d, r))
+      case _ => None
 ```
 
 By the second rule, an extension method can be made available by defining a given instance containing it, like this:
 
 ```scala
-given ops1: IntOps with {}  // brings safeMod into scope
+given ops1: IntOps()  // brings safeMod into scope
 
 1.safeMod(2)
 ```
@@ -218,15 +219,15 @@ By the third and fourth rule, an extension method is available if it is in the i
 
 ```scala
 class List[T]:
-   ...
+  ...
 object List:
-   ...
-   extension [T](xs: List[List[T]])
-      def flatten: List[T] = xs.foldLeft(List.empty[T])(_ ++ _)
+  ...
+  extension [T](xs: List[List[T]])
+    def flatten: List[T] = xs.foldLeft(List.empty[T])(_ ++ _)
 
-   given [T: Ordering]: Ordering[List[T]] with
-      extension (xs: List[T])
-         def < (ys: List[T]): Boolean = ...
+  given [T: Ordering]: Ordering[List[T]] with
+    extension (xs: List[T])
+      def < (ys: List[T]): Boolean = ...
 end List
 
 // extension method available since it is in the implicit scope
@@ -258,25 +259,25 @@ An extension method can also be referenced using a simple identifier without a p
 
 ```scala
 extension (x: T)
-   def f ... = ... g ...
-   def g ...
+  def f ... = ... g ...
+  def g ...
 ```
 
 the identifier is rewritten to `x.g`. This is also the case if `f` and `g` are the same method. Example:
 
 ```scala
 extension (s: String)
-   def position(ch: Char, n: Int): Int =
-      if n < s.length && s(n) != ch then position(ch, n + 1)
-      else n
+  def position(ch: Char, n: Int): Int =
+    if n < s.length && s(n) != ch then position(ch, n + 1)
+    else n
 ```
 
 The recursive call `position(ch, n + 1)` expands to `s.position(ch, n + 1)` in this case. The whole extension method rewrites to
 
 ```scala
 def position(s: String)(ch: Char, n: Int): Int =
-   if n < s.length && s(n) != ch then position(s)(ch, n + 1)
-   else n
+  if n < s.length && s(n) != ch then position(s)(ch, n + 1)
+  else n
 ```
 
 ### Syntax
@@ -284,12 +285,12 @@ def position(s: String)(ch: Char, n: Int): Int =
 Here are the syntax changes for extension methods and collective extensions relative
 to the [current syntax](../syntax.md).
 
-```ebnf
+```
 BlockStat         ::=  ... | Extension
 TemplateStat      ::=  ... | Extension
 TopStat           ::=  ... | Extension
-Extension         ::=  ‘extension’ [DefTypeParamClause] ‘(’ DefParam ‘)’
-                       {UsingParamClause} ExtMethods
+Extension         ::=  ‘extension’ [DefTypeParamClause] {UsingParamClause}
+                       ‘(’ DefParam ‘)’ {UsingParamClause} ExtMethods
 ExtMethods        ::=  ExtMethod | [nl] <<< ExtMethod {semi ExtMethod} >>>
 ExtMethod         ::=  {Annotation [nl]} {Modifier} ‘def’ DefDef
 ```
diff --git a/docs/docs/reference/contextual/given-imports.md b/docs/_docs/reference/contextual/given-imports.md
similarity index 86%
rename from docs/docs/reference/contextual/given-imports.md
rename to docs/_docs/reference/contextual/given-imports.md
index 0ffbb44d643d..3e3bc3d275cc 100644
--- a/docs/docs/reference/contextual/given-imports.md
+++ b/docs/_docs/reference/contextual/given-imports.md
@@ -1,20 +1,21 @@
 ---
 layout: doc-page
 title: "Importing Givens"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/given-imports.html
 ---
 
 A special form of import wildcard selector is used to import given instances. Example:
 
 ```scala
 object A:
-   class TC
-   given tc: TC = ???
-   def f(using TC) = ???
+  class TC
+  given tc: TC = ???
+  def f(using TC) = ???
 
 object B:
-   import A.*
-   import A.given
-   ...
+  import A.*
+  import A.given
+  ...
 ```
 
 In the code above, the `import A.*` clause in object `B` imports all members
@@ -23,11 +24,11 @@ The two import clauses can also be merged into one:
 
 ```scala
 object B:
-   import A.{given, *}
+  import A.{given, *}
    ...
 ```
 
-Generally, a normal wildcard selector `_` brings all definitions other than givens or extensions into scope
+Generally, a normal wildcard selector `*` brings all definitions other than givens or extensions into scope
 whereas a `given` selector brings all givens (including those resulting from extensions) into scope.
 
 There are two main benefits arising from these rules:
@@ -59,10 +60,10 @@ For instance, assuming the object
 
 ```scala
 object Instances:
-   given intOrd: Ordering[Int] = ...
-   given listOrd[T: Ordering]: Ordering[List[T]] = ...
-   given ec: ExecutionContext = ...
-   given im: Monoid[Int] = ...
+  given intOrd: Ordering[Int] = ...
+  given listOrd[T: Ordering]: Ordering[List[T]] = ...
+  given ec: ExecutionContext = ...
+  given im: Monoid[Int] = ...
 ```
 
 the import clause
@@ -90,11 +91,11 @@ normal imports to givens and given imports.
 The following modifications avoid this hurdle to migration.
 
  1. A `given` import selector also brings old style implicits into scope. So, in Scala 3.0
-    an old-style implicit definition can be brought into scope either by a `_` or a `given` wildcard selector.
+    an old-style implicit definition can be brought into scope either by a `*` or a `given` wildcard selector.
 
- 2. In Scala 3.1, old-style implicits accessed through a `_` wildcard import will give a deprecation warning.
+ 2. In Scala 3.1, old-style implicits accessed through a `*` wildcard import will give a deprecation warning.
 
- 3. In some version after 3.1, old-style implicits accessed through a `_` wildcard import will give a compiler error.
+ 3. In some version after 3.1, old-style implicits accessed through a `*` wildcard import will give a compiler error.
 
 These rules mean that library users can use `given` selectors to access old-style implicits in Scala 3.0,
 and will be gently nudged and then forced to do so in later versions. Libraries can then switch to
diff --git a/docs/_docs/reference/contextual/givens.md b/docs/_docs/reference/contextual/givens.md
new file mode 100644
index 000000000000..2af94c0a8aea
--- /dev/null
+++ b/docs/_docs/reference/contextual/givens.md
@@ -0,0 +1,193 @@
+---
+layout: doc-page
+title: "Given Instances"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/givens.html
+---
+
+Given instances (or, simply, "givens") define "canonical" values of certain types
+that serve for synthesizing arguments to [context parameters](./using-clauses.md). Example:
+
+```scala
+trait Ord[T]:
+  def compare(x: T, y: T): Int
+  extension (x: T) def < (y: T) = compare(x, y) < 0
+  extension (x: T) def > (y: T) = compare(x, y) > 0
+
+given intOrd: Ord[Int] with
+  def compare(x: Int, y: Int) =
+    if x < y then -1 else if x > y then +1 else 0
+
+given listOrd[T](using ord: Ord[T]): Ord[List[T]] with
+
+  def compare(xs: List[T], ys: List[T]): Int = (xs, ys) match
+    case (Nil, Nil) => 0
+    case (Nil, _) => -1
+    case (_, Nil) => +1
+    case (x :: xs1, y :: ys1) =>
+      val fst = ord.compare(x, y)
+      if fst != 0 then fst else compare(xs1, ys1)
+
+```
+
+This code defines a trait `Ord` with two given instances. `intOrd` defines
+a given for the type `Ord[Int]` whereas `listOrd[T]` defines givens
+for `Ord[List[T]]` for all types `T` that come with a given instance for `Ord[T]`
+themselves. The `using` clause in `listOrd` defines a condition: There must be a
+given of type `Ord[T]` for a given of type `Ord[List[T]]` to exist.
+Such conditions are expanded by the compiler to [context parameters](./using-clauses.md).
+
+## Anonymous Givens
+
+The name of a given can be left out. So the definitions
+of the last section can also be expressed like this:
+
+```scala
+given Ord[Int] with
+  ...
+given [T](using Ord[T]): Ord[List[T]] with
+  ...
+```
+
+If the name of a given is missing, the compiler will synthesize a name from
+the implemented type(s).
+
+**Note** The name synthesized by the compiler is chosen to be readable and reasonably concise. For instance, the two instances above would get the names:
+
+```scala
+given_Ord_Int
+given_Ord_List_T
+```
+
+The precise rules for synthesizing names are found [here](./relationship-implicits.html#anonymous-given-instances). These rules do not guarantee absence of name conflicts between
+given instances of types that are "too similar". To avoid conflicts one can
+use named instances.
+
+**Note** To ensure robust binary compatibility, publicly available libraries should prefer named instances.
+
+## Alias Givens
+
+An alias can be used to define a given instance that is equal to some expression. Example:
+
+```scala
+given global: ExecutionContext = ForkJoinPool()
+```
+
+This creates a given `global` of type `ExecutionContext` that resolves to the right
+hand side `ForkJoinPool()`.
+The first time `global` is accessed, a new `ForkJoinPool` is created, which is then
+returned for this and all subsequent accesses to `global`. This operation is thread-safe.
+
+Alias givens can be anonymous as well, e.g.
+
+```scala
+given Position = enclosingTree.position
+given (using config: Config): Factory = MemoizingFactory(config)
+```
+
+An alias given can have type parameters and context parameters just like any other given,
+but it can only implement a single type.
+
+## Given Macros
+
+Given aliases can have the `inline` and `transparent` modifiers.
+Example:
+
+```scala
+transparent inline given mkAnnotations[A, T]: Annotations[A, T] = ${
+  // code producing a value of a subtype of Annotations
+}
+```
+
+Since `mkAnnotations` is `transparent`, the type of an application is the type of its right-hand side, which can be a proper subtype of the declared result type `Annotations[A, T]`.
+
+Given instances can have the `inline` but not `transparent` modifiers as their type is already known from the signature.
+Example:
+
+```scala
+trait Show[T] {
+  inline def show(x: T): String
+}
+
+inline given Show[Foo] with {
+  /*transparent*/ inline def show(x: Foo): String = ${ ... }
+}
+
+def app =
+  // inlines `show` method call and removes the call to `given Show[Foo]`
+  summon[Show[Foo]].show(foo)
+```
+Note that the inline methods within the given instances may be `transparent`.
+
+The inlining of given instances will not inline/duplicate the implementation of the given, it will just inline the instantiation of that instance.
+This is used to help dead code elimination of the given instances that are not used after inlining.
+
+
+## Pattern-Bound Given Instances
+
+Given instances can also appear in patterns. Example:
+
+```scala
+for given Context <- applicationContexts do
+
+pair match
+  case (ctx @ given Context, y) => ...
+```
+
+In the first fragment above, anonymous given instances for class `Context` are established by enumerating over `applicationContexts`. In the second fragment, a given `Context`
+instance named `ctx` is established by matching against the first half of the `pair` selector.
+
+In each case, a pattern-bound given instance consists of `given` and a type `T`. The pattern matches exactly the same selectors as the type ascription pattern `_: T`.
+
+## Negated Givens
+
+Scala 2's somewhat puzzling behavior with respect to ambiguity has been exploited to implement the analogue of a "negated" search in implicit resolution,
+where a query Q1 fails if some other query Q2 succeeds and Q1 succeeds if Q2 fails. With the new cleaned up behavior these techniques no longer work.
+But the new special type [`scala.util.NotGiven`](https://scala-lang.org/api/3.x/scala/util/NotGiven.html) now implements negation directly.
+
+For any query type `Q`, [`NotGiven[Q]`](https://scala-lang.org/api/3.x/scala/util/NotGiven.html) succeeds if and only if the implicit
+search for `Q` fails, for example:
+
+```scala
+import scala.util.NotGiven
+
+trait Tagged[A]
+
+case class Foo[A](value: Boolean)
+object Foo:
+  given fooTagged[A](using Tagged[A]): Foo[A] = Foo(true)
+  given fooNotTagged[A](using NotGiven[Tagged[A]]): Foo[A] = Foo(false)
+
+@main def test(): Unit =
+  given Tagged[Int]()
+  assert(summon[Foo[Int]].value) // fooTagged is found
+  assert(!summon[Foo[String]].value) // fooNotTagged is found
+```
+
+## Given Instance Initialization
+
+A given instance without type or context parameters is initialized on-demand, the first
+time it is accessed. If a given has type or context parameters, a fresh instance
+is created for each reference.
+
+## Syntax
+
+Here is the syntax for given instances:
+
+```
+TmplDef             ::=  ...
+                     |   ‘given’ GivenDef
+GivenDef            ::=  [GivenSig] StructuralInstance
+                     |   [GivenSig] AnnotType ‘=’ Expr
+                     |   [GivenSig] AnnotType
+GivenSig            ::=  [id] [DefTypeParamClause] {UsingParamClause} ‘:’
+StructuralInstance  ::=  ConstrApp {‘with’ ConstrApp} ‘with’ TemplateBody
+```
+
+A given instance starts with the reserved word `given` and an optional _signature_. The signature
+defines a name and/or parameters for the instance. It is followed by `:`. There are three kinds
+of given instances:
+
+- A _structural instance_ contains one or more types or constructor applications,
+  followed by `with` and a template body that contains member definitions of the instance.
+- An _alias instance_ contains a type, followed by `=` and a right-hand side expression.
+- An _abstract instance_ contains just the type, which is not followed by anything.
diff --git a/docs/docs/reference/contextual/multiversal-equality.md b/docs/_docs/reference/contextual/multiversal-equality.md
similarity index 95%
rename from docs/docs/reference/contextual/multiversal-equality.md
rename to docs/_docs/reference/contextual/multiversal-equality.md
index 35a232903576..f01b64d2e444 100644
--- a/docs/docs/reference/contextual/multiversal-equality.md
+++ b/docs/_docs/reference/contextual/multiversal-equality.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Multiversal Equality"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/multiversal-equality.html
 ---
 
 Previously, Scala had universal equality: Two values of any types
@@ -24,7 +25,7 @@ the program will still typecheck, since values of all types can be compared with
 But it will probably give unexpected results and fail at runtime.
 
 Multiversal equality is an opt-in way to make universal equality safer.
-It uses a binary type class [`scala.CanEqual`](https://github.com/lampepfl/dotty/blob/master/library/src/scala/CanEqual.scala)
+It uses a binary type class [`scala.CanEqual`](https://github.com/lampepfl/dotty/blob/main/library/src/scala/CanEqual.scala)
 to indicate that values of two given types can be compared with each other.
 The example above would not typecheck if `S` or `T` was a class
 that derives `CanEqual`, e.g.
@@ -55,7 +56,7 @@ import annotation.implicitNotFound
 sealed trait CanEqual[-L, -R]
 
 object CanEqual:
-   object derived extends CanEqual[Any, Any]
+  object derived extends CanEqual[Any, Any]
 ```
 
 One can have several `CanEqual` given instances for a type. For example, the four
@@ -69,7 +70,7 @@ given CanEqual[A, B] = CanEqual.derived
 given CanEqual[B, A] = CanEqual.derived
 ```
 
-The [`scala.CanEqual`](https://github.com/lampepfl/dotty/blob/master/library/src/scala/CanEqual.scala)
+The [`scala.CanEqual`](https://github.com/lampepfl/dotty/blob/main/library/src/scala/CanEqual.scala)
 object defines a number of `CanEqual` given instances that together
 define a rule book for what standard types can be compared (more details below).
 
@@ -108,7 +109,7 @@ this generates the following `CanEqual` instance in the companion object of `Box
 
 ```scala
 given [T, U](using CanEqual[T, U]): CanEqual[Box[T], Box[U]] =
-   CanEqual.derived
+  CanEqual.derived
 ```
 
 That is, two boxes are comparable with `==` or `!=` if their elements are. Examples:
@@ -173,22 +174,22 @@ we are dealing with a refinement of pre-existing, universal equality. It is best
 Say you want to come up with a safe version of the `contains` method on `List[T]`. The original definition of `contains` in the standard library was:
 ```scala
 class List[+T]:
-   ...
-   def contains(x: Any): Boolean
+  ...
+  def contains(x: Any): Boolean
 ```
 That uses universal equality in an unsafe way since it permits arguments of any type to be compared with the list's elements. The "obvious" alternative definition
 ```scala
-   def contains(x: T): Boolean
+  def contains(x: T): Boolean
 ```
 does not work, since it refers to the covariant parameter `T` in a nonvariant context. The only variance-correct way to use the type parameter `T` in `contains` is as a lower bound:
 ```scala
-   def contains[U >: T](x: U): Boolean
+  def contains[U >: T](x: U): Boolean
 ```
 This generic version of `contains` is the one used in the current (Scala 2.13) version of `List`.
 It looks different but it admits exactly the same applications as the `contains(x: Any)` definition we started with.
 However, we can make it more useful (i.e. restrictive) by adding a `CanEqual` parameter:
 ```scala
-   def contains[U >: T](x: U)(using CanEqual[T, U]): Boolean // (1)
+  def contains[U >: T](x: U)(using CanEqual[T, U]): Boolean // (1)
 ```
 This version of `contains` is equality-safe! More precisely, given
 `x: T`, `xs: List[T]` and `y: U`, then `xs.contains(y)` is type-correct if and only if
@@ -196,7 +197,7 @@ This version of `contains` is equality-safe! More precisely, given
 
 Unfortunately, the crucial ability to "lift" equality type checking from simple equality and pattern matching to arbitrary user-defined operations gets lost if we restrict ourselves to an equality class with a single type parameter. Consider the following signature of `contains` with a hypothetical `CanEqual1[T]` type class:
 ```scala
-   def contains[U >: T](x: U)(using CanEqual1[U]): Boolean   // (2)
+  def contains[U >: T](x: U)(using CanEqual1[U]): Boolean   // (2)
 ```
 This version could be applied just as widely as the original `contains(x: Any)` method,
 since the `CanEqual1[Any]` fallback is always available! So we have gained nothing. What got lost in the transition to a single parameter type class was the original rule that `CanEqual[A, B]` is available only if neither `A` nor `B` have a reflexive `CanEqual` instance. That rule simply cannot be expressed if there is a single type parameter for `CanEqual`.
diff --git a/docs/docs/reference/contextual/relationship-implicits.md b/docs/_docs/reference/contextual/relationship-implicits.md
similarity index 96%
rename from docs/docs/reference/contextual/relationship-implicits.md
rename to docs/_docs/reference/contextual/relationship-implicits.md
index 784f01dcbf48..4a23e781bd70 100644
--- a/docs/docs/reference/contextual/relationship-implicits.md
+++ b/docs/_docs/reference/contextual/relationship-implicits.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Relationship with Scala 2 Implicits"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/relationship-implicits.html
 ---
 
 Many, but not all, of the new contextual abstraction features in Scala 3 can be mapped to Scala 2's implicits. This page gives a rundown on the relationships between new and old features.
@@ -34,7 +35,7 @@ Given instances can be mapped to combinations of implicit objects, classes and i
     ```scala
     class listOrd[T](implicit ord: Ord[T]) extends Ord[List[T]] { ... }
     final implicit def listOrd[T](implicit ord: Ord[T]): listOrd[T] =
-      new listOrd[T]
+     new listOrd[T]
     ```
 
  3. Alias givens map to implicit methods or implicit lazy vals. If an alias has neither type nor context parameters,
@@ -114,14 +115,14 @@ Extension methods have no direct counterpart in Scala 2, but they can be simulat
 
 ```scala
 extension (c: Circle)
-   def circumference: Double = c.radius * math.Pi * 2
+  def circumference: Double = c.radius * math.Pi * 2
 ```
 
 could be simulated to some degree by
 
 ```scala
 implicit class CircleDecorator(c: Circle) extends AnyVal {
-   def circumference: Double = c.radius * math.Pi * 2
+  def circumference: Double = c.radius * math.Pi * 2
 }
 ```
 
@@ -153,7 +154,7 @@ one can write
 
 ```scala
 given stringToToken: Conversion[String, Token] with
-   def apply(str: String): Token = KeyWord(str)
+  def apply(str: String): Token = KeyWord(str)
 ```
 
 or
diff --git a/docs/docs/reference/contextual/right-associative-extension-methods.md b/docs/_docs/reference/contextual/right-associative-extension-methods.md
similarity index 95%
rename from docs/docs/reference/contextual/right-associative-extension-methods.md
rename to docs/_docs/reference/contextual/right-associative-extension-methods.md
index 798370c4c373..7c2cf6b02675 100644
--- a/docs/docs/reference/contextual/right-associative-extension-methods.md
+++ b/docs/_docs/reference/contextual/right-associative-extension-methods.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Right-Associative Extension Methods: Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/right-associative-extension-methods.html
 ---
 
 The most general form of leading parameters of an extension method is as follows:
diff --git a/docs/docs/reference/contextual/type-classes.md b/docs/_docs/reference/contextual/type-classes.md
similarity index 79%
rename from docs/docs/reference/contextual/type-classes.md
rename to docs/_docs/reference/contextual/type-classes.md
index 5911eff48eed..c4648b3baf28 100644
--- a/docs/docs/reference/contextual/type-classes.md
+++ b/docs/_docs/reference/contextual/type-classes.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Implementing Type classes"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/type-classes.html
 ---
 
 A _type class_ is an abstract, parameterized type that lets you add new behavior to any closed data type without using sub-typing. This can be useful in multiple use-cases, for example:
@@ -17,47 +18,47 @@ Here's the `Monoid` type class definition:
 
 ```scala
 trait SemiGroup[T]:
-   extension (x: T) def combine (y: T): T
+  extension (x: T) def combine (y: T): T
 
 trait Monoid[T] extends SemiGroup[T]:
-   def unit: T
+  def unit: T
 ```
 
 An implementation of this `Monoid` type class for the type `String` can be the following:
 
 ```scala
 given Monoid[String] with
-   extension (x: String) def combine (y: String): String = x.concat(y)
-   def unit: String = ""
+  extension (x: String) def combine (y: String): String = x.concat(y)
+  def unit: String = ""
 ```
 
 Whereas for the type `Int` one could write the following:
 
 ```scala
 given Monoid[Int] with
-   extension (x: Int) def combine (y: Int): Int = x + y
-   def unit: Int = 0
+  extension (x: Int) def combine (y: Int): Int = x + y
+  def unit: Int = 0
 ```
 
 This monoid can now be used as _context bound_ in the following `combineAll` method:
 
 ```scala
 def combineAll[T: Monoid](xs: List[T]): T =
-   xs.foldLeft(summon[Monoid[T]].unit)(_.combine(_))
+  xs.foldLeft(summon[Monoid[T]].unit)(_.combine(_))
 ```
 
 To get rid of the `summon[...]` we can define a `Monoid` object as follows:
 
 ```scala
 object Monoid:
-   def apply[T](using m: Monoid[T]) = m
+  def apply[T](using m: Monoid[T]) = m
 ```
 
 Which would allow to re-write the `combineAll` method this way:
 
 ```scala
 def combineAll[T: Monoid](xs: List[T]): T =
-   xs.foldLeft(Monoid[T].unit)(_.combine(_))
+  xs.foldLeft(Monoid[T].unit)(_.combine(_))
 ```
 
 ### Functors
@@ -69,7 +70,7 @@ The definition of a generic `Functor` would thus be written as:
 
 ```scala
 trait Functor[F[_]]:
-   def map[A, B](x: F[A], f: A => B): F[B]
+  def map[A, B](x: F[A], f: A => B): F[B]
 ```
 
 Which could read as follows: "A `Functor` for the type constructor `F[_]` represents the ability to transform `F[A]` to `F[B]` through the application of function `f` with type `A => B`". We call the `Functor` definition here a _type class_.
@@ -77,8 +78,8 @@ This way, we could define an instance of `Functor` for the `List` type:
 
 ```scala
 given Functor[List] with
-   def map[A, B](x: List[A], f: A => B): List[B] =
-      x.map(f) // List already has a `map` method
+  def map[A, B](x: List[A], f: A => B): List[B] =
+    x.map(f) // List already has a `map` method
 ```
 
 With this `given` instance in scope, everywhere a `Functor` is expected, the compiler will accept a `List` to be used.
@@ -87,7 +88,7 @@ For instance, we may write such a testing method:
 
 ```scala
 def assertTransformation[F[_]: Functor, A, B](expected: F[B], original: F[A], mapping: A => B): Unit =
-   assert(expected == summon[Functor[F]].map(original, mapping))
+  assert(expected == summon[Functor[F]].map(original, mapping))
 ```
 
 And use it this way, for example:
@@ -101,17 +102,17 @@ As in the previous example of Monoids, [`extension` methods](extension-methods.m
 
 ```scala
 trait Functor[F[_]]:
-   extension [A](x: F[A])
-      def map[B](f: A => B): F[B]
+  extension [A](x: F[A])
+    def map[B](f: A => B): F[B]
 ```
 
 The instance of `Functor` for `List` now becomes:
 
 ```scala
 given Functor[List] with
-   extension [A](xs: List[A])
-      def map[B](f: A => B): List[B] =
-         xs.map(f) // List already has a `map` method
+  extension [A](xs: List[A])
+    def map[B](f: A => B): List[B] =
+      xs.map(f) // List already has a `map` method
 
 ```
 
@@ -119,7 +120,7 @@ It simplifies the `assertTransformation` method:
 
 ```scala
 def assertTransformation[F[_]: Functor, A, B](expected: F[B], original: F[A], mapping: A => B): Unit =
-   assert(expected == original.map(mapping))
+  assert(expected == original.map(mapping))
 ```
 
 The `map` method is now directly used on `original`. It is available as an extension method
@@ -140,15 +141,15 @@ Here is the translation of this definition in Scala 3:
 ```scala
 trait Monad[F[_]] extends Functor[F]:
 
-   /** The unit value for a monad */
-   def pure[A](x: A): F[A]
+  /** The unit value for a monad */
+  def pure[A](x: A): F[A]
 
-   extension [A](x: F[A])
-      /** The fundamental composition operation */
-      def flatMap[B](f: A => F[B]): F[B]
+  extension [A](x: F[A])
+    /** The fundamental composition operation */
+    def flatMap[B](f: A => F[B]): F[B]
 
-      /** The `map` operation can now be defined in terms of `flatMap` */
-      def map[B](f: A => B) = x.flatMap(f.andThen(pure))
+    /** The `map` operation can now be defined in terms of `flatMap` */
+    def map[B](f: A => B) = x.flatMap(f.andThen(pure))
 
 end Monad
 ```
@@ -159,11 +160,11 @@ A `List` can be turned into a monad via this `given` instance:
 
 ```scala
 given listMonad: Monad[List] with
-   def pure[A](x: A): List[A] =
-      List(x)
-   extension [A](xs: List[A])
-      def flatMap[B](f: A => List[B]): List[B] =
-         xs.flatMap(f) // rely on the existing `flatMap` method of `List`
+  def pure[A](x: A): List[A] =
+    List(x)
+  extension [A](xs: List[A])
+    def flatMap[B](f: A => List[B]): List[B] =
+      xs.flatMap(f) // rely on the existing `flatMap` method of `List`
 ```
 
 Since `Monad` is a subtype of `Functor`, `List` is also a functor. The Functor's `map`
@@ -176,12 +177,12 @@ it explicitly.
 
 ```scala
 given optionMonad: Monad[Option] with
-   def pure[A](x: A): Option[A] =
-      Option(x)
-   extension [A](xo: Option[A])
-      def flatMap[B](f: A => Option[B]): Option[B] = xo match
-         case Some(x) => f(x)
-         case None => None
+  def pure[A](x: A): Option[A] =
+    Option(x)
+  extension [A](xo: Option[A])
+    def flatMap[B](f: A => Option[B]): Option[B] = xo match
+      case Some(x) => f(x)
+      case None => None
 ```
 
 #### Reader
@@ -224,12 +225,12 @@ The monad instance will look like this:
 ```scala
 given configDependentMonad: Monad[ConfigDependent] with
 
-   def pure[A](x: A): ConfigDependent[A] =
-      config => x
+  def pure[A](x: A): ConfigDependent[A] =
+    config => x
 
-   extension [A](x: ConfigDependent[A])
-      def flatMap[B](f: A => ConfigDependent[B]): ConfigDependent[B] =
-         config => f(x(config))(config)
+  extension [A](x: ConfigDependent[A])
+    def flatMap[B](f: A => ConfigDependent[B]): ConfigDependent[B] =
+      config => f(x(config))(config)
 
 end configDependentMonad
 ```
@@ -245,12 +246,12 @@ Using this syntax would turn the previous `configDependentMonad` into:
 ```scala
 given configDependentMonad: Monad[[Result] =>> Config => Result] with
 
-   def pure[A](x: A): Config => A =
-      config => x
+  def pure[A](x: A): Config => A =
+    config => x
 
-   extension [A](x: Config => A)
-      def flatMap[B](f: A => Config => B): Config => B =
-         config => f(x(config))(config)
+  extension [A](x: Config => A)
+    def flatMap[B](f: A => Config => B): Config => B =
+      config => f(x(config))(config)
 
 end configDependentMonad
 ```
@@ -260,12 +261,12 @@ It is likely that we would like to use this pattern with other kinds of environm
 ```scala
 given readerMonad[Ctx]: Monad[[X] =>> Ctx => X] with
 
-   def pure[A](x: A): Ctx => A =
-      ctx => x
+  def pure[A](x: A): Ctx => A =
+    ctx => x
 
-   extension [A](x: Ctx => A)
-      def flatMap[B](f: A => Ctx => B): Ctx => B =
-         ctx => f(x(ctx))(ctx)
+  extension [A](x: Ctx => A)
+    def flatMap[B](f: A => Ctx => B): Ctx => B =
+      ctx => f(x(ctx))(ctx)
 
 end readerMonad
 ```
diff --git a/docs/docs/reference/contextual/using-clauses.md b/docs/_docs/reference/contextual/using-clauses.md
similarity index 82%
rename from docs/docs/reference/contextual/using-clauses.md
rename to docs/_docs/reference/contextual/using-clauses.md
index 42178a75a64c..e8a077ccdc0a 100644
--- a/docs/docs/reference/contextual/using-clauses.md
+++ b/docs/_docs/reference/contextual/using-clauses.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Using Clauses"
+movedTo: https://docs.scala-lang.org/scala3/reference/contextual/using-clauses.html
 ---
 
 Functional programming tends to express most dependencies as simple function parameterization.
@@ -13,7 +14,7 @@ a `max` function that works for any arguments for which an ordering exists can b
 
 ```scala
 def max[T](x: T, y: T)(using ord: Ord[T]): T =
-   if ord.compare(x, y) < 0 then y else x
+  if ord.compare(x, y) < 0 then y else x
 ```
 
 Here, `ord` is a _context parameter_ introduced with a `using` clause.
@@ -39,7 +40,7 @@ and just provide its type. Example:
 
 ```scala
 def maximum[T](xs: List[T])(using Ord[T]): T =
-   xs.reduceLeft(max)
+  xs.reduceLeft(max)
 ```
 
 `maximum` takes a context parameter of type `Ord` only to pass it on as an
@@ -47,16 +48,43 @@ inferred argument to `max`. The name of the parameter is left out.
 
 Generally, context parameters may be defined either as a full parameter list `(p_1: T_1, ..., p_n: T_n)` or just as a sequence of types `T_1, ..., T_n`. Vararg parameters are not supported in `using` clauses.
 
+## Class Context Parameters
+
+If a class context parameter is made a member by adding a `val` or `var` modifier,
+then that member is available as a given instance.
+
+Compare the following examples, where the attempt to supply an explicit `given` member induces an ambiguity:
+
+```scala
+class GivenIntBox(using val givenInt: Int):
+  def n = summon[Int]
+
+class GivenIntBox2(using givenInt: Int):
+  given Int = givenInt
+  //def n = summon[Int]     // ambiguous
+```
+
+The `given` member is importable as explained in the section on [importing `given`s](./given-imports.md):
+
+```scala
+val b = GivenIntBox(using 23)
+import b.given
+summon[Int]  // 23
+
+import b.*
+//givenInt   // Not found
+```
+
 ## Inferring Complex Arguments
 
 Here are two other methods that have a context parameter of type `Ord[T]`:
 
 ```scala
 def descending[T](using asc: Ord[T]): Ord[T] = new Ord[T]:
-   def compare(x: T, y: T) = asc.compare(y, x)
+  def compare(x: T, y: T) = asc.compare(y, x)
 
 def minimum[T](xs: List[T])(using Ord[T]) =
-   maximum(xs)(using descending)
+  maximum(xs)(using descending)
 ```
 
 The `minimum` method's right-hand side passes `descending` as an explicit argument to `maximum(xs)`.
diff --git a/docs/docs/reference/dropped-features/auto-apply.md b/docs/_docs/reference/dropped-features/auto-apply.md
similarity index 95%
rename from docs/docs/reference/dropped-features/auto-apply.md
rename to docs/_docs/reference/dropped-features/auto-apply.md
index 9ff9aa648502..c5424ffff22d 100644
--- a/docs/docs/reference/dropped-features/auto-apply.md
+++ b/docs/_docs/reference/dropped-features/auto-apply.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dropped: Auto-Application"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/auto-apply.html
 ---
 
 Previously an empty argument list `()` was implicitly inserted when
@@ -74,10 +75,10 @@ exactly in their parameter lists.
 
 ```scala
 class A:
-   def next(): Int
+  def next(): Int
 
 class B extends A:
-   def next: Int // overriding error: incompatible type
+  def next: Int // overriding error: incompatible type
 ```
 
 Methods overriding Java or Scala 2 methods are again exempted from this
diff --git a/docs/docs/reference/dropped-features/class-shadowing-spec.md b/docs/_docs/reference/dropped-features/class-shadowing-spec.md
similarity index 84%
rename from docs/docs/reference/dropped-features/class-shadowing-spec.md
rename to docs/_docs/reference/dropped-features/class-shadowing-spec.md
index 427337a63df8..98acff828cd3 100644
--- a/docs/docs/reference/dropped-features/class-shadowing-spec.md
+++ b/docs/_docs/reference/dropped-features/class-shadowing-spec.md
@@ -1,13 +1,14 @@
 ---
 layout: doc-page
 title: "Dropped: Class Shadowing - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/class-shadowing-spec.html
 ---
 
 Spec diff: in section [5.1.4 Overriding](https://www.scala-lang.org/files/archive/spec/2.13/05-classes-and-objects.html#Overriding), add *M' must not be a class*.
 
 > Why do we want to make this change to the language?
 
-Class shadowing is irregular compared to other types of overrides. Indeed, inner classes are not actually overriden but simply shadowed.
+Class shadowing is irregular compared to other types of overrides. Indeed, inner classes are not actually overridden but simply shadowed.
 
 
 > How much existing code is going to be affected?
diff --git a/docs/docs/reference/dropped-features/class-shadowing.md b/docs/_docs/reference/dropped-features/class-shadowing.md
similarity index 88%
rename from docs/docs/reference/dropped-features/class-shadowing.md
rename to docs/_docs/reference/dropped-features/class-shadowing.md
index d1d92a47bcbc..839b40253169 100644
--- a/docs/docs/reference/dropped-features/class-shadowing.md
+++ b/docs/_docs/reference/dropped-features/class-shadowing.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dropped: Class Shadowing"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/class-shadowing.html
 ---
 
 Scala 2 so far allowed patterns like this:
diff --git a/docs/_docs/reference/dropped-features/delayed-init.md b/docs/_docs/reference/dropped-features/delayed-init.md
new file mode 100644
index 000000000000..ab48de388569
--- /dev/null
+++ b/docs/_docs/reference/dropped-features/delayed-init.md
@@ -0,0 +1,32 @@
+---
+layout: doc-page
+title: "Dropped: DelayedInit"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/delayed-init.html
+---
+
+The special handling of the [`DelayedInit`](https://scala-lang.org/api/3.x/scala/DelayedInit.html)
+trait is no longer supported.
+
+One consequence is that the [`App`](https://scala-lang.org/api/3.x/scala/App.html) class,
+which used [`DelayedInit`](https://scala-lang.org/api/3.x/scala/DelayedInit.html) is
+now partially broken. You can still use `App` as a simple way to set up a main program. Example:
+
+```scala
+object HelloWorld extends App {
+  println("Hello, world!")
+}
+```
+
+However, the code is now run in the initializer of the object, which on
+some JVM's means that it will only be interpreted. So, better not use it
+for benchmarking! Also, if you want to access the command line arguments,
+you need to use an explicit `main` method for that.
+
+```scala
+object Hello:
+  def main(args: Array[String]) =
+    println(s"Hello, ${args(0)}")
+```
+
+On the other hand, Scala 3 offers a convenient alternative to such "program" objects
+with [`@main` methods](../changed-features/main-functions.md).
diff --git a/docs/docs/reference/dropped-features/do-while.md b/docs/_docs/reference/dropped-features/do-while.md
similarity index 85%
rename from docs/docs/reference/dropped-features/do-while.md
rename to docs/_docs/reference/dropped-features/do-while.md
index b2ef652f4898..5f5ca5feeea2 100644
--- a/docs/docs/reference/dropped-features/do-while.md
+++ b/docs/_docs/reference/dropped-features/do-while.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dropped: Do-While"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/do-while.html
 ---
 
 The syntax construct
@@ -15,22 +16,22 @@ while ({ <body> ; <cond> }) ()
 For instance, instead of
 ```scala
 do
-   i += 1
+  i += 1
 while (f(i) == 0)
 ```
 one writes
 ```scala
 while
-   i += 1
-   f(i) == 0
+  i += 1
+  f(i) == 0
 do ()
 ```
 The idea to use a block as the condition of a while also gives a solution
 to the "loop-and-a-half" problem. Here is another example:
 ```scala
 while
-   val x: Int = iterator.next
-   x >= 0
+  val x: Int = iterator.next
+  x >= 0
 do print(".")
 ```
 
diff --git a/docs/_docs/reference/dropped-features/dropped-features.md b/docs/_docs/reference/dropped-features/dropped-features.md
new file mode 100644
index 000000000000..f4cd72942949
--- /dev/null
+++ b/docs/_docs/reference/dropped-features/dropped-features.md
@@ -0,0 +1,7 @@
+---
+layout: doc-page
+title: "Dropped Features"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features.html
+---
+
+The following pages document the features of Scala 2 that have been dropped in Scala 3.
diff --git a/docs/docs/reference/dropped-features/early-initializers.md b/docs/_docs/reference/dropped-features/early-initializers.md
similarity index 83%
rename from docs/docs/reference/dropped-features/early-initializers.md
rename to docs/_docs/reference/dropped-features/early-initializers.md
index 0f7b5717b197..cb2ffea94376 100644
--- a/docs/docs/reference/dropped-features/early-initializers.md
+++ b/docs/_docs/reference/dropped-features/early-initializers.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dropped: Early Initializers"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/early-initializers.html
 ---
 
 Early initializers of the form
diff --git a/docs/docs/reference/dropped-features/existential-types.md b/docs/_docs/reference/dropped-features/existential-types.md
similarity index 93%
rename from docs/docs/reference/dropped-features/existential-types.md
rename to docs/_docs/reference/dropped-features/existential-types.md
index 6969feac33dc..4d7d9e2f8c10 100644
--- a/docs/docs/reference/dropped-features/existential-types.md
+++ b/docs/_docs/reference/dropped-features/existential-types.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dropped: Existential Types"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/existential-types.html
 ---
 
 Existential types using `forSome` (as in
diff --git a/docs/_docs/reference/dropped-features/limit22.md b/docs/_docs/reference/dropped-features/limit22.md
new file mode 100644
index 000000000000..514120fd2ce9
--- /dev/null
+++ b/docs/_docs/reference/dropped-features/limit22.md
@@ -0,0 +1,17 @@
+---
+layout: doc-page
+title: "Dropped: Limit 22"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/limit22.html
+---
+
+The limits of 22 for the maximal number of parameters of function types and the
+maximal number of fields in tuple types have been dropped.
+
+* Functions can now have an arbitrary number of parameters. Functions beyond
+  [`scala.Function22`](https://www.scala-lang.org/api/current/scala/Function22.html) are erased to a new trait [`scala.runtime.FunctionXXL`](https://scala-lang.org/api/3.x/scala/runtime/FunctionXXL.html).
+
+* Tuples can also have an arbitrary number of fields. Tuples beyond [`scala.Tuple22`](https://www.scala-lang.org/api/current/scala/Tuple22.html)
+  are erased to a new class [`scala.runtime.TupleXXL`](https://scala-lang.org/api/3.x/scala/runtime/TupleXXL.html) (which extends the trait [`scala.Product`](https://scala-lang.org/api/3.x/scala/Product.md)). Furthermore, they support generic
+  operation such as concatenation and indexing.
+
+Both of these are implemented using arrays.
diff --git a/docs/_docs/reference/dropped-features/macros.md b/docs/_docs/reference/dropped-features/macros.md
new file mode 100644
index 000000000000..e71bf120fe13
--- /dev/null
+++ b/docs/_docs/reference/dropped-features/macros.md
@@ -0,0 +1,16 @@
+---
+layout: doc-page
+title: "Dropped: Scala 2 Macros"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/macros.html
+---
+
+The previous, experimental macro system has been dropped.
+
+Instead, there is a cleaner, more restricted system based on two complementary concepts: `inline` and `'{ ... }`/`${ ... }` code generation.
+`'{ ... }` delays the compilation of the code and produces an object containing the code, dually `${ ... }` evaluates an expression which produces code and inserts it in the surrounding `${ ... }`.
+In this setting, a definition marked as inlined containing a `${ ... }` is a macro, the code inside the `${ ... }` is executed at compile-time and produces code in the form of `'{ ... }`.
+Additionally, the contents of code can be inspected and created with a more complex reflection API as an extension of `'{ ... }`/`${ ... }` framework.
+
+* `inline` has been [implemented](../metaprogramming/inline.md) in Scala 3.
+* Quotes `'{ ... }` and splices `${ ... }` has been [implemented](../metaprogramming/macros.md) in Scala 3.
+* [TASTy reflect](../metaprogramming/reflection.md) provides more complex tree based APIs to inspect or create quoted code.
diff --git a/docs/_docs/reference/dropped-features/nonlocal-returns.md b/docs/_docs/reference/dropped-features/nonlocal-returns.md
new file mode 100644
index 000000000000..99cdcdf0cd03
--- /dev/null
+++ b/docs/_docs/reference/dropped-features/nonlocal-returns.md
@@ -0,0 +1,27 @@
+---
+layout: doc-page
+title: "Deprecated: Nonlocal Returns"
+
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/nonlocal-returns.html
+---
+
+Returning from nested anonymous functions has been deprecated.
+
+Nonlocal returns are implemented by throwing and catching `scala.runtime.NonLocalReturnException`-s. This is rarely what is intended by the programmer. It can be problematic because of the hidden performance cost of throwing and catching exceptions. Furthermore, it is a leaky implementation: a catch-all exception handler can intercept a `NonLocalReturnException`.
+
+A drop-in library replacement is provided in [`scala.util.control.NonLocalReturns`](https://scala-lang.org/api/3.x/scala/util/control/NonLocalReturns$.html). Example:
+
+```scala
+import scala.util.control.NonLocalReturns.*
+
+extension [T](xs: List[T])
+  def has(elem: T): Boolean = returning {
+    for x <- xs do
+      if x == elem then throwReturn(true)
+    false
+  }
+
+@main def test(): Unit =
+  val xs = List(1, 2, 3, 4, 5)
+  assert(xs.has(2) == xs.contains(2))
+```
diff --git a/docs/docs/reference/dropped-features/package-objects.md b/docs/_docs/reference/dropped-features/package-objects.md
similarity index 83%
rename from docs/docs/reference/dropped-features/package-objects.md
rename to docs/_docs/reference/dropped-features/package-objects.md
index 6b5b71f1c6da..5e58b5479fd8 100644
--- a/docs/docs/reference/dropped-features/package-objects.md
+++ b/docs/_docs/reference/dropped-features/package-objects.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dropped: Package Objects"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/package-objects.html
 ---
 
 Package objects
@@ -10,7 +11,7 @@ package object p {
   def b = ...
 }
 ```
-will be dropped. They are still available in Scala 3.0, but will be deprecated and removed afterwards.
+will be dropped. They are still available in Scala 3.0 and 3.1, but will be deprecated and removed afterwards.
 
 Package objects are no longer needed since all kinds of definitions can now be written at the top-level. Example:
 ```scala
@@ -31,7 +32,8 @@ The compiler generates synthetic objects that wrap top-level definitions falling
  - implicit classes and objects,
  - companion objects of opaque type aliases.
 
-If a source file `src.scala` contains such top-level definitions, they will be put in a synthetic object named `src$package`. The wrapping is transparent, however. The definitions in `src` can still be accessed as members of the enclosing package.
+If a source file `src.scala` contains such top-level definitions, they will be put in a synthetic object named `src$package`. The wrapping is transparent, however. The definitions in `src` can still be accessed as members of the enclosing package. The synthetic object will be placed last in the file,
+after any other package clauses, imports, or object and class definitions.
 
 **Note:** This means that
 1. The name of a source file containing wrapped top-level definitions is relevant for binary compatibility. If the name changes, so does the name of the generated object and its class.
diff --git a/docs/docs/reference/dropped-features/procedure-syntax.md b/docs/_docs/reference/dropped-features/procedure-syntax.md
similarity index 84%
rename from docs/docs/reference/dropped-features/procedure-syntax.md
rename to docs/_docs/reference/dropped-features/procedure-syntax.md
index 374b06502b93..cc82636d370d 100644
--- a/docs/docs/reference/dropped-features/procedure-syntax.md
+++ b/docs/_docs/reference/dropped-features/procedure-syntax.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dropped: Procedure Syntax"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/procedure-syntax.html
 ---
 
 Procedure syntax
diff --git a/docs/_docs/reference/dropped-features/symlits.md b/docs/_docs/reference/dropped-features/symlits.md
new file mode 100644
index 000000000000..cec98030a831
--- /dev/null
+++ b/docs/_docs/reference/dropped-features/symlits.md
@@ -0,0 +1,24 @@
+---
+layout: doc-page
+title: "Dropped: Symbol Literals"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/symlits.html
+---
+
+Symbol literals are no longer supported.
+
+The [`scala.Symbol`](https://scala-lang.org/api/3.x/scala/Symbol.html) class still exists, so a literal translation of the symbol literal `'xyz` is `Symbol("xyz")`. However, it is recommended to use a plain string literal `"xyz"` instead. (The `Symbol` class will be deprecated and removed in the future). Example:
+
+
+```
+scalac Test.scala
+-- Error: Test.scala:1:25 ------------------------------------------------------------------------------------------------
+
+1 |@main def test = println('abc)
+  |                         ^
+  |                         symbol literal 'abc is no longer supported,
+  |                         use a string literal "abc" or an application Symbol("abc") instead,
+  |                         or enclose in braces '{abc} if you want a quoted expression.
+  |                         For now, you can also `import language.deprecated.symbolLiterals` to accept
+  |                         the idiom, but this possibility might no longer be available in the future.
+1 error found
+```
diff --git a/docs/_docs/reference/dropped-features/this-qualifier.md b/docs/_docs/reference/dropped-features/this-qualifier.md
new file mode 100644
index 000000000000..e1814e1d194e
--- /dev/null
+++ b/docs/_docs/reference/dropped-features/this-qualifier.md
@@ -0,0 +1,33 @@
+---
+layout: doc-page
+title: "Dropped: private[this] and protected[this]"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html
+---
+
+The `private[this]` and `protected[this]` access modifiers are deprecated and will be phased out.
+
+Previously, these modifiers were needed for
+
+ - avoiding the generation of getters and setters
+ - excluding code under a `private[this]` from variance checks. (Scala 2 also excludes `protected[this]` but this was found to be unsound and was therefore removed).
+ - avoiding the generation of fields, if a `private[this] val` is not accessed
+ by a class method.
+
+The compiler now infers for `private` members the fact that they are only accessed via `this`. Such members are treated as if they had been declared `private[this]`. `protected[this]` is dropped without a replacement.
+
+This change can in some cases change the semantics of a Scala program, since a
+`private` val is no longer guaranteed to generate a field. The field
+is omitted if
+
+ - the `val` is only accessed via `this`, and
+ - the `val` is not accessed from a method in the current class.
+
+This can cause problems if a program tries to access the missing private field via reflection. The recommended fix is to declare the field instead to be qualified private with the enclosing class as qualifier. Example:
+```scala
+  class C(x: Int):
+    private[C] val field = x + 1
+      // [C] needed if `field` is to be accessed through reflection
+    val retained = field * field
+```
+
+
diff --git a/docs/docs/reference/dropped-features/type-projection.md b/docs/_docs/reference/dropped-features/type-projection.md
similarity index 88%
rename from docs/docs/reference/dropped-features/type-projection.md
rename to docs/_docs/reference/dropped-features/type-projection.md
index 73b7a358cb38..f45eff5c423f 100644
--- a/docs/docs/reference/dropped-features/type-projection.md
+++ b/docs/_docs/reference/dropped-features/type-projection.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dropped: General Type Projection"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/type-projection.html
 ---
 
 Scala so far allowed general type projection `T#A` where `T` is an arbitrary type
diff --git a/docs/docs/reference/dropped-features/weak-conformance-spec.md b/docs/_docs/reference/dropped-features/weak-conformance-spec.md
similarity index 95%
rename from docs/docs/reference/dropped-features/weak-conformance-spec.md
rename to docs/_docs/reference/dropped-features/weak-conformance-spec.md
index a02c2ee781ba..1432782a8e38 100644
--- a/docs/docs/reference/dropped-features/weak-conformance-spec.md
+++ b/docs/_docs/reference/dropped-features/weak-conformance-spec.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dropped: Weak Conformance - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/weak-conformance-spec.html
 ---
 
 To simplify the underlying type theory, Scala 3 drops the notion of
diff --git a/docs/docs/reference/dropped-features/weak-conformance.md b/docs/_docs/reference/dropped-features/weak-conformance.md
similarity index 94%
rename from docs/docs/reference/dropped-features/weak-conformance.md
rename to docs/_docs/reference/dropped-features/weak-conformance.md
index c925249db9e7..c2dabe39e7c7 100644
--- a/docs/docs/reference/dropped-features/weak-conformance.md
+++ b/docs/_docs/reference/dropped-features/weak-conformance.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dropped: Weak Conformance"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/weak-conformance.html
 ---
 
 In some situations, Scala used a _weak conformance_ relation when
diff --git a/docs/docs/reference/dropped-features/wildcard-init.md b/docs/_docs/reference/dropped-features/wildcard-init.md
similarity index 84%
rename from docs/docs/reference/dropped-features/wildcard-init.md
rename to docs/_docs/reference/dropped-features/wildcard-init.md
index bf8e60976057..c4b89674b11d 100644
--- a/docs/docs/reference/dropped-features/wildcard-init.md
+++ b/docs/_docs/reference/dropped-features/wildcard-init.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dropped: Wildcard Initializer"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/wildcard-init.html
 ---
 
 The syntax
diff --git a/docs/docs/reference/dropped-features/xml.md b/docs/_docs/reference/dropped-features/xml.md
similarity index 93%
rename from docs/docs/reference/dropped-features/xml.md
rename to docs/_docs/reference/dropped-features/xml.md
index 602c0f08a12a..9de06ca30f2e 100644
--- a/docs/docs/reference/dropped-features/xml.md
+++ b/docs/_docs/reference/dropped-features/xml.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dropped: XML Literals"
+movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/xml.html
 ---
 
 XML Literals are still supported, but will be dropped in the near future, to
diff --git a/docs/docs/reference/enums/adts.md b/docs/_docs/reference/enums/adts.md
similarity index 86%
rename from docs/docs/reference/enums/adts.md
rename to docs/_docs/reference/enums/adts.md
index 00f33c887998..6fc5be78d7b8 100644
--- a/docs/docs/reference/enums/adts.md
+++ b/docs/_docs/reference/enums/adts.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Algebraic Data Types"
+movedTo: https://docs.scala-lang.org/scala3/reference/enums/adts.html
 ---
 
 The [`enum` concept](./enums.md) is general enough to also support algebraic data
@@ -9,8 +10,8 @@ how an `Option` type can be represented as an ADT:
 
 ```scala
 enum Option[+T]:
-   case Some(x: T)
-   case None
+  case Some(x: T)
+  case None
 ```
 
 This example introduces an `Option` enum with a covariant type
@@ -24,8 +25,8 @@ be given explicitly:
 
 ```scala
 enum Option[+T]:
-   case Some(x: T) extends Option[T]
-   case None       extends Option[Nothing]
+  case Some(x: T) extends Option[T]
+  case None       extends Option[Nothing]
 ```
 
 Note that the parent type of the `None` value is inferred as
@@ -60,17 +61,17 @@ As all other enums, ADTs can define methods. For instance, here is `Option` agai
 
 ```scala
 enum Option[+T]:
-   case Some(x: T)
-   case None
+  case Some(x: T)
+  case None
 
-   def isDefined: Boolean = this match
-      case None => false
-      case _    => true
+  def isDefined: Boolean = this match
+    case None => false
+    case _    => true
 
 object Option:
 
-   def apply[T >: Null](x: T): Option[T] =
-      if x == null then None else Some(x)
+  def apply[T >: Null](x: T): Option[T] =
+    if x == null then None else Some(x)
 
 end Option
 ```
@@ -84,10 +85,10 @@ parameterized case that takes an RGB value.
 
 ```scala
 enum Color(val rgb: Int):
-   case Red   extends Color(0xFF0000)
-   case Green extends Color(0x00FF00)
-   case Blue  extends Color(0x0000FF)
-   case Mix(mix: Int) extends Color(mix)
+  case Red   extends Color(0xFF0000)
+  case Green extends Color(0x00FF00)
+  case Blue  extends Color(0x0000FF)
+  case Mix(mix: Int) extends Color(mix)
 ```
 
 ### Parameter Variance of Enums
@@ -101,7 +102,7 @@ mapping a type `T` to itself:
 
 ```scala
 enum View[-T]:
-   case Refl(f: T => T)
+  case Refl(f: T => T)
 ```
 
 The definition of `Refl` is incorrect, as it uses contravariant type `T` in the covariant result position of a
@@ -119,7 +120,7 @@ Because `Refl` does not declare explicit parameters, it looks to the compiler li
 
 ```scala
 enum View[-T]:
-   case Refl[/*synthetic*/-T1](f: T1 => T1) extends View[T1]
+  case Refl[/*synthetic*/-T1](f: T1 => T1) extends View[T1]
 ```
 
 The compiler has inferred for `Refl` the contravariant type parameter `T1`, following `T` in `View`.
@@ -128,8 +129,8 @@ and can remedy the error by the following change to `Refl`:
 
 ```diff
 enum View[-T]:
--   case Refl(f: T => T)
-+   case Refl[R](f: R => R) extends View[R]
+-  case Refl(f: T => T)
++  case Refl[R](f: R => R) extends View[R]
 ```
 
 Above, type `R` is chosen as the parameter for `Refl` to highlight that it has a different meaning to
@@ -140,10 +141,10 @@ as the function type `T => U`:
 
 ```scala
 enum View[-T, +U] extends (T => U):
-   case Refl[R](f: R => R) extends View[R, R]
+  case Refl[R](f: R => R) extends View[R, R]
 
-   final def apply(t: T): U = this match
-      case refl: Refl[r] => refl.f(t)
+  final def apply(t: T): U = this match
+    case refl: Refl[r] => refl.f(t)
 ```
 
 ### Syntax of Enums
@@ -153,7 +154,7 @@ The changes are specified below as deltas with respect to the Scala syntax given
 
  1. Enum definitions are defined as follows:
 
-    ```ebnf
+    ```
     TmplDef   ::=  `enum' EnumDef
     EnumDef   ::=  id ClassConstr [`extends' [ConstrApps]] EnumBody
     EnumBody  ::=  [nl] ‘{’ [SelfType] EnumStat {semi EnumStat} ‘}’
@@ -163,7 +164,7 @@ The changes are specified below as deltas with respect to the Scala syntax given
 
  2. Cases of enums are defined as follows:
 
-    ```ebnf
+    ```
     EnumCase  ::=  `case' (id ClassConstr [`extends' ConstrApps]] | ids)
     ```
 
diff --git a/docs/docs/reference/enums/desugarEnums.md b/docs/_docs/reference/enums/desugarEnums.md
similarity index 96%
rename from docs/docs/reference/enums/desugarEnums.md
rename to docs/_docs/reference/enums/desugarEnums.md
index 6430724e8572..95df1a7513ce 100644
--- a/docs/docs/reference/enums/desugarEnums.md
+++ b/docs/_docs/reference/enums/desugarEnums.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Translation of Enums and ADTs"
+movedTo: https://docs.scala-lang.org/scala3/reference/enums/desugarEnums.html
 ---
 
 The compiler expands enums and their cases to code that only uses
@@ -41,7 +42,7 @@ map into `case class`es or `val`s.
    ```scala
    sealed abstract class E ... extends <parents> with scala.reflect.Enum {
      import E.{ <caseIds> }
-      <defs>
+     <defs>
    }
    object E { <cases> }
    ```
@@ -176,10 +177,10 @@ If `E` contains at least one simple case, its companion object will define in ad
 
      ```scala
      private def $new(_$ordinal: Int, $name: String) =
-        new E with runtime.EnumValue:
-           def ordinal = _$ordinal
-           override def productPrefix = $name // if not overridden in `E`
-           override def toString = $name      // if not overridden in `E`
+       new E with runtime.EnumValue:
+         def ordinal = _$ordinal
+         override def productPrefix = $name // if not overridden in `E`
+         override def toString = $name      // if not overridden in `E`
      ```
 
 The anonymous class also implements the abstract `Product` methods that it inherits from `Enum`.
diff --git a/docs/_docs/reference/enums/enums-index.md b/docs/_docs/reference/enums/enums-index.md
new file mode 100644
index 000000000000..794c0130c9ec
--- /dev/null
+++ b/docs/_docs/reference/enums/enums-index.md
@@ -0,0 +1,7 @@
+---
+layout: doc-page
+title: "Enums"
+movedTo: https://docs.scala-lang.org/scala3/reference/enums.html
+---
+
+This chapter documents enums in Scala 3.
diff --git a/docs/_docs/reference/enums/enums.md b/docs/_docs/reference/enums/enums.md
new file mode 100644
index 000000000000..fda03d2dee81
--- /dev/null
+++ b/docs/_docs/reference/enums/enums.md
@@ -0,0 +1,194 @@
+---
+layout: doc-page
+title: "Enumerations"
+movedTo: https://docs.scala-lang.org/scala3/reference/enums/enums.html
+---
+
+An enumeration is used to define a type consisting of a set of named values.
+
+```scala
+enum Color:
+  case Red, Green, Blue
+```
+
+This defines a new `sealed` class, `Color`, with three values, `Color.Red`,
+`Color.Green`, `Color.Blue`.  The color values are members of `Color`s
+companion object.
+
+### Parameterized enums
+
+Enums can be parameterized.
+
+```scala
+enum Color(val rgb: Int):
+  case Red   extends Color(0xFF0000)
+  case Green extends Color(0x00FF00)
+  case Blue  extends Color(0x0000FF)
+```
+
+As the example shows, you can define the parameter value by using an
+explicit extends clause.
+
+### Methods defined for enums
+
+The values of an enum correspond to unique integers. The integer
+associated with an enum value is returned by its `ordinal` method:
+
+```scala
+scala> val red = Color.Red
+val red: Color = Red
+scala> red.ordinal
+val res0: Int = 0
+```
+
+The companion object of an enum also defines three utility methods.
+The `valueOf` method obtains an enum value
+by its name. The `values` method returns all enum values
+defined in an enumeration in an `Array`. The `fromOrdinal`
+method obtains an enum value from its ordinal (`Int`) value.
+
+```scala
+scala> Color.valueOf("Blue")
+val res0: Color = Blue
+scala> Color.values
+val res1: Array[Color] = Array(Red, Green, Blue)
+scala> Color.fromOrdinal(0)
+val res2: Color = Red
+```
+
+### User-defined members of enums
+
+It is possible to add your own definitions to an enum. Example:
+
+```scala
+enum Planet(mass: Double, radius: Double):
+  private final val G = 6.67300E-11
+  def surfaceGravity = G * mass / (radius * radius)
+  def surfaceWeight(otherMass: Double) = otherMass * surfaceGravity
+
+  case Mercury extends Planet(3.303e+23, 2.4397e6)
+  case Venus   extends Planet(4.869e+24, 6.0518e6)
+  case Earth   extends Planet(5.976e+24, 6.37814e6)
+  case Mars    extends Planet(6.421e+23, 3.3972e6)
+  case Jupiter extends Planet(1.9e+27,   7.1492e7)
+  case Saturn  extends Planet(5.688e+26, 6.0268e7)
+  case Uranus  extends Planet(8.686e+25, 2.5559e7)
+  case Neptune extends Planet(1.024e+26, 2.4746e7)
+end Planet
+```
+
+It is also possible to define an explicit companion object for an enum:
+
+```scala
+object Planet:
+  def main(args: Array[String]) =
+    val earthWeight = args(0).toDouble
+    val mass = earthWeight / Earth.surfaceGravity
+    for p <- values do
+      println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
+end Planet
+```
+
+### Deprecation of Enum Cases
+
+As a library author, you may want to signal that an enum case is no longer intended for use. However you could still want to gracefully handle the removal of a case from your public API, such as special casing deprecated cases.
+
+To illustrate, say that the `Planet` enum originally had an additional case:
+
+```diff
+ enum Planet(mass: Double, radius: Double):
+   ...
+   case Neptune extends Planet(1.024e+26, 2.4746e7)
++  case Pluto   extends Planet(1.309e+22, 1.1883e3)
+ end Planet
+```
+
+We now want to deprecate the `Pluto` case. First we add the `scala.deprecated` annotation to `Pluto`:
+
+```diff
+ enum Planet(mass: Double, radius: Double):
+   ...
+   case Neptune extends Planet(1.024e+26, 2.4746e7)
+-  case Pluto   extends Planet(1.309e+22, 1.1883e3)
++
++  @deprecated("refer to IAU definition of planet")
++  case Pluto extends Planet(1.309e+22, 1.1883e3)
+ end Planet
+```
+
+Outside the lexical scopes of `enum Planet` or `object Planet`, references to `Planet.Pluto` will produce a deprecation warning, but within those scopes we can still reference it to implement introspection over the deprecated cases:
+
+```scala
+trait Deprecations[T <: reflect.Enum] {
+  extension (t: T) def isDeprecatedCase: Boolean
+}
+
+object Planet {
+  given Deprecations[Planet] with {
+    extension (p: Planet)
+      def isDeprecatedCase = p == Pluto
+  }
+}
+```
+
+We could imagine that a library may use [type class derivation](../contextual/derivation.md) to automatically provide an instance for `Deprecations`.
+
+### Compatibility with Java Enums
+
+If you want to use the Scala-defined enums as [Java enums](https://docs.oracle.com/javase/tutorial/java/javaOO/enum.html), you can do so by extending
+the class `java.lang.Enum`, which is imported by default, as follows:
+
+```scala
+enum Color extends Enum[Color] { case Red, Green, Blue }
+```
+
+The type parameter comes from the Java enum [definition](https://docs.oracle.com/javase/8/docs/api/index.html?java/lang/Enum.html) and should be the same as the type of the enum.
+There is no need to provide constructor arguments (as defined in the Java API docs) to `java.lang.Enum` when extending it – the compiler will generate them automatically.
+
+After defining `Color` like that, you can use it like you would a Java enum:
+
+```scala
+scala> Color.Red.compareTo(Color.Green)
+val res15: Int = -1
+```
+
+For a more in-depth example of using Scala 3 enums from Java, see [this test](https://github.com/lampepfl/dotty/tree/main/tests/run/enum-java). In the test, the enums are defined in the `MainScala.scala` file and used from a Java source, `Test.java`.
+
+### Implementation
+
+Enums are represented as `sealed` classes that extend the `scala.reflect.Enum` trait.
+This trait defines a single public method, `ordinal`:
+
+```scala
+package scala.reflect
+
+/** A base trait of all Scala enum definitions */
+transparent trait Enum extends Any, Product, Serializable:
+
+  /** A number uniquely identifying a case of an enum */
+  def ordinal: Int
+```
+
+Enum values with `extends` clauses get expanded to anonymous class instances.
+For instance, the `Venus` value above would be defined like this:
+
+```scala
+val Venus: Planet = new Planet(4.869E24, 6051800.0):
+  def ordinal: Int = 1
+  override def productPrefix: String = "Venus"
+  override def toString: String = "Venus"
+```
+
+Enum values without `extends` clauses all share a single implementation
+that can be instantiated using a private method that takes a tag and a name as arguments.
+For instance, the first
+definition of value `Color.Red` above would expand to:
+
+```scala
+val Red: Color = $new(0, "Red")
+```
+
+### Reference
+
+For more information, see [Issue #1970](https://github.com/lampepfl/dotty/issues/1970) and
+[PR #4003](https://github.com/lampepfl/dotty/pull/4003).
diff --git a/docs/_docs/reference/experimental/canthrow.md b/docs/_docs/reference/experimental/canthrow.md
new file mode 100644
index 000000000000..222bc63b6739
--- /dev/null
+++ b/docs/_docs/reference/experimental/canthrow.md
@@ -0,0 +1,281 @@
+---
+layout: doc-page
+title: "CanThrow Capabilities"
+movedTo: https://docs.scala-lang.org/scala3/reference/experimental/canthrow.html
+---
+
+This page describes experimental support for exception checking in Scala 3. It is enabled by the language import
+```scala
+import language.experimental.saferExceptions
+```
+The reason for publishing this extension now is to get feedback on its usability. We are working on more advanced type systems that build on the general ideas put forward in the extension. Those type systems have application areas beyond checked exceptions. Exception checking is a useful starting point since exceptions are familiar to all Scala programmers and their current treatment leaves room for improvement.
+
+## Why Exceptions?
+
+Exceptions are an ideal mechanism for error handling in many situations. They serve the intended purpose of propagating error conditions with a minimum of boilerplate. They cause zero overhead for the "happy path", which means they are very efficient as long as errors arise infrequently. Exceptions are also debug friendly, since they produce stack traces that can be inspected at the handler site. So one never has to guess where an erroneous condition originated.
+
+## Why Not Exceptions?
+
+However, exceptions in current Scala and many other languages are not reflected in the type system. This means that an essential part of the contract of a function - i.e. what exceptions can it produce? - is not statically checked. Most people acknowledge that this is a problem, but that so far the alternative of checked exceptions was just too painful to be considered. A good example are Java checked exceptions, which do the right thing in principle, but are widely regarded as a mistake since they are so difficult to deal with. So far, none of the successor languages that are modeled after Java or that build on the JVM has copied this feature. See for example Anders Hejlsberg's [statement on why C# does not have checked exceptions](https://www.artima.com/articles/the-trouble-with-checked-exceptions).
+
+## The Problem With Java's Checked Exceptions
+
+The main problem with [Java's checked exception model](https://docs.oracle.com/javase/specs/jls/se8/html/jls-11.html#jls-11.2) is its inflexibility, which is due to lack of polymorphism. Consider for instance the `map` function which is declared on `List[A]` like this:
+```scala
+  def map[B](f: A => B): List[B]
+```
+In the Java model, function `f` is not allowed to throw a checked exception. So the following call would be invalid:
+```scala
+  xs.map(x => if x < limit then x * x else throw LimitExceeded())
+```
+The only way around this would be to wrap the checked exception `LimitExceeded` in an unchecked [`java.lang.RuntimeException`](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/RuntimeException.html) that is caught at the callsite and unwrapped again. Something like this:
+```scala
+  try
+    xs.map(x => if x < limit then x * x else throw Wrapper(LimitExceeded()))
+  catch case Wrapper(ex) => throw ex
+```
+Ugh! No wonder checked exceptions in Java are not very popular.
+
+## Monadic Effects
+
+So the dilemma is that exceptions are easy to use only as long as we forget static type checking. This has caused many people working with Scala to abandon exceptions altogether and to use an error monad like [`Either`](https://scala-lang.org/api/3.x/scala/util/Either.html) instead. This can work in many situations but is not without its downsides either. It makes code a lot more complicated and harder to refactor. It means one is quickly confronted with the problem how to work with several monads. In general, dealing with one monad at a time in Scala is straightforward but dealing with several monads together is much less pleasant since monads don't compose. A great number of techniques have been proposed, implemented, and promoted to deal with this, from monad transformers, to free monads, to tagless final. But none of these techniques is universally liked;  each introduces a complicated DSL that's hard to understand for non-experts, introduces runtime overheads, and makes debugging difficult. In the end, quite a few developers prefer to work instead with a single "super-monad" like [`ZIO`](https://zio.dev/version-1.x/datatypes/core/zio) that has error propagation built in alongside other aspects. This one-size fits all approach can work very nicely, even though (or is it because?) it represents an all-encompassing framework.
+
+However, a programming language is not a framework; it has to cater also for those applications that do not fit the framework's use cases. So there's still a strong motivation for getting exception checking right.
+
+## From Effects To Capabilities
+
+Why does `map` work so poorly with Java's checked exception model? It's because
+`map`'s signature limits function arguments to not throw checked exceptions. We could try to come up with a more polymorphic formulation of `map`. For instance, it could look like this:
+```scala
+  def map[B, E](f: A => B throws E): List[B] throws E
+```
+This assumes a type `A throws E` to indicate computations of type `A` that can throw an exception of type `E`. But in practice the overhead of the additional type parameters makes this approach unappealing as well. Note in particular that we'd have to parameterize _every method_ that takes a function argument that way, so the added overhead of declaring all these exception types looks just like a sort of ceremony we would like to avoid.
+
+But there is a way to avoid the ceremony. Instead of concentrating on possible _effects_ such as "this code might throw an exception", concentrate on _capabilities_ such as "this code needs the capability to throw an exception". From a standpoint of expressiveness this is quite similar. But capabilities can be expressed as parameters whereas traditionally effects are expressed as some addition to result values. It turns out that this can make a big difference!
+
+## The `CanThrow` Capability
+
+In the _effects as capabilities_ model, an effect is expressed as an (implicit) parameter of a certain type. For exceptions we would expect parameters of type
+[`CanThrow[E]`](https://scala-lang.org/api/3.x/scala/CanThrow.html) where `E` stands for the exception that can be thrown. Here is the definition of `CanThrow`:
+```scala
+erased class CanThrow[-E <: Exception]
+```
+This shows another experimental Scala feature: [erased definitions](./erased-defs.md). Roughly speaking, values of an erased class do not generate runtime code; they are erased before code generation. This means that all `CanThrow` capabilities are compile-time only artifacts; they do not have a runtime footprint.
+
+Now, if the compiler sees a `throw Exc()` construct where `Exc` is a checked exception, it will check that there is a capability of type `CanThrow[Exc]` that can be summoned as a given. It's a compile-time error if that's not the case.
+
+How can the capability be produced? There are several possibilities:
+
+Most often, the capability is produced by having a using clause `(using CanThrow[Exc])` in some enclosing scope. This roughly corresponds to a [`throws`](https://docs.oracle.com/javase/specs/jls/se7/html/jls-8.html#jls-8.4.6) clause in Java. The analogy is even stronger since alongside [`CanThrow`](https://scala-lang.org/api/3.x/scala/CanThrow.html) there is also the following type alias defined in the [`scala`](https://scala-lang.org/api/3.x/scala.html) package:
+```scala
+infix type A = Int
+```
+```scala
+infix type $throws[R, +E <: Exception] = CanThrow[E] ?=> R
+```
+That is, [`R $throws E`](https://scala-lang.org/api/3.x/scala/runtime.html#$throws-0) is a context function type that takes an implicit `CanThrow[E]` parameter and that returns a value of type `R`. What's more, the compiler will translate an infix types with `throws` as the operator to `$throws` applications according to the rules
+```
+                A throws E  -->  A $throws E
+    A throws E₁ | ... | Eᵢ  -->  A $throws E₁ ... $throws Eᵢ
+```
+Therefore, a method written like this:
+```scala
+def m(x: T)(using CanThrow[E]): U
+```
+can alternatively be expressed like this:
+```scala
+def m(x: T): U throws E
+```
+Also the capability to throw multiple types of exceptions can be expressed in a few ways as shown in the examples below:
+```scala
+def m(x: T): U throws E1 | E2
+def m(x: T): U throws E1 throws E2
+def m(x: T)(using CanThrow[E1], CanThrow[E2]): U
+def m(x: T)(using CanThrow[E1])(using CanThrow[E2]): U
+def m(x: T)(using CanThrow[E1]): U throws E2
+```
+
+**Note 1:** A signature like
+```scala
+def m(x: T)(using CanThrow[E1 | E2]): U
+```
+would also allow throwing `E1` or `E2` inside the method's body but might cause problems when someone tried to call this method
+from another method declaring its `CanThrow` capabilities like in the earlier examples.
+This is because `CanThrow` has a contravariant type parameter so `CanThrow[E1 | E2]` is a subtype of both `CanThrow[E1]` and `CanThrow[E2]`.
+Hence the presence of a given instance of `CanThrow[E1 | E2]` in scope satisfies the requirement for `CanThrow[E1]` and `CanThrow[E2]`
+but given instances of `CanThrow[E1]` and `CanThrow[E2]` cannot be combined to provide and instance of `CanThrow[E1 | E2]`.
+
+**Note 2:** One should keep in mind that `|` binds its left and right arguments more tightly than `throws` so `A | B throws E1 | E2` means `(A | B) throws (Ex1 | Ex2)`, not `A | (B throws E1) | E2`.
+
+The `CanThrow`/`throws` combo essentially propagates the `CanThrow` requirement outwards. But where are these capabilities created in the first place? That's in the `try` expression. Given a `try` like this:
+
+```scala
+try
+  body
+catch
+  case ex1: Ex1 => handler1
+  ...
+  case exN: ExN => handlerN
+```
+the compiler generates an accumulated capability of type `CanThrow[Ex1 | ... | Ex2]` that is available as a given in the scope of `body`. It does this by augmenting the `try` roughly as follows:
+```scala
+try
+  erased given CanThrow[Ex1 | ... | ExN] = compiletime.erasedValue
+  body
+catch ...
+```
+Note that the right-hand side of the synthesized given is `???` (undefined). This is OK since
+this given is erased; it will not be executed at runtime.
+
+**Note 1:** The [`saferExceptions`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$experimental$$saferExceptions$.html) feature is designed to work only with checked exceptions. An exception type is _checked_ if it is a subtype of
+`Exception` but not of `RuntimeException`. The signature of `CanThrow` still admits `RuntimeException`s since `RuntimeException` is a proper subtype of its bound, `Exception`. But no capabilities will be generated for `RuntimeException`s. Furthermore, `throws` clauses
+also may not refer to `RuntimeException`s.
+
+**Note 2:** To keep things simple, the compiler will currently only generate capabilities
+for catch clauses of the form
+```scala
+  case ex: Ex =>
+```
+where `ex` is an arbitrary variable name (`_` is also allowed), and `Ex` is an arbitrary
+checked exception type. Constructor patterns such as `Ex(...)` or patterns with guards
+are not allowed. The compiler will issue an error if one of these is used to catch
+a checked exception and `saferExceptions` is enabled.
+
+## Example
+
+That's it. Let's see it in action in an example. First, add an import
+```scala
+import language.experimental.saferExceptions
+```
+to enable exception checking. Now, define an exception `LimitExceeded` and
+a function `f` like this:
+```scala
+val limit = 10e9
+class LimitExceeded extends Exception
+def f(x: Double): Double =
+  if x < limit then x * x else throw LimitExceeded()
+```
+You'll get this error message:
+```
+  if x < limit then x * x else throw LimitExceeded()
+                               ^^^^^^^^^^^^^^^^^^^^^
+The capability to throw exception LimitExceeded is missing.
+```
+The capability can be provided by one of the following:
+
+ - Adding a using clause `(using CanThrow[LimitExceeded])` to the definition of the enclosing method
+ - Adding `throws LimitExceeded` clause after the result type of the enclosing method
+ - Wrapping this piece of code with a `try` block that catches `LimitExceeded`
+
+The following import might fix the problem:
+```scala
+  import unsafeExceptions.canThrowAny
+```
+As the error message implies, you have to declare that `f` needs the capability to throw a `LimitExceeded` exception. The most concise way to do so is to add a `throws` clause:
+```scala
+def f(x: Double): Double throws LimitExceeded =
+  if x < limit then x * x else throw LimitExceeded()
+```
+Now put a call to `f` in a `try` that catches `LimitExceeded`:
+```scala
+@main def test(xs: Double*) =
+  try println(xs.map(f).sum)
+  catch case ex: LimitExceeded => println("too large")
+```
+Run the program with some inputs:
+```
+> scala test 1 2 3
+14.0
+> scala test
+0.0
+> scala test 1 2 3 100000000000
+too large
+```
+Everything typechecks and works as expected. But wait - we have called `map` without any ceremony! How did that work? Here's how the compiler expands the `test` function:
+```scala
+// compiler-generated code
+@main def test(xs: Double*) =
+  try
+    erased given ctl: CanThrow[LimitExceeded] = compiletime.erasedValue
+    println(xs.map(x => f(x)(using ctl)).sum)
+  catch case ex: LimitExceeded => println("too large")
+```
+The `CanThrow[LimitExceeded]` capability is passed in a synthesized `using` clause to `f`, since `f` requires it. Then the resulting closure is passed to `map`. The signature of `map` does not have to account for effects. It takes a closure as always, but that
+closure may refer to capabilities in its free variables. This means that `map` is
+already effect polymorphic even though we did not change its signature at all.
+So the takeaway is that the effects as capabilities model naturally provides for effect polymorphism whereas this is something that other approaches struggle with.
+
+## Gradual Typing Via Imports
+
+Another advantage is that the model allows a gradual migration from current unchecked exceptions to safer exceptions. Imagine for a moment that [`experimental.saferExceptions`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$experimental$$saferExceptions$.html) is turned on everywhere. There would be lots of code that breaks since functions have not yet been properly annotated with `throws`. But it's easy to create an escape hatch that lets us ignore the breakages for a while: simply add the import
+```scala
+import scala.unsafeExceptions.canThrowAny
+```
+This will provide the [`CanThrow`](https://scala-lang.org/api/3.x/scala/CanThrow.html) capability for any exception, and thereby allow
+all throws and all other calls, no matter what the current state of `throws` declarations is. Here's the
+definition of [`canThrowAny`](https://scala-lang.org/api/3.x/scala/unsafeExceptions$.html#canThrowAny-0):
+```scala
+package scala
+object unsafeExceptions:
+  given canThrowAny: CanThrow[Exception] = ???
+```
+Of course, defining a global capability like this amounts to cheating. But the cheating is useful for gradual typing. The import could be used to migrate existing code, or to
+enable more fluid explorations of code without regard for complete exception safety. At the end of these migrations or explorations the import should be removed.
+
+## Scope Of the Extension
+
+To summarize, the extension for safer exception checking consists of the following elements:
+
+ - It adds to the standard library the class `scala.CanThrow`, the type `scala.$throws`, and the [`scala.unsafeExceptions`](https://scala-lang.org/api/3.x/scala/unsafeExceptions$.html) object, as they were described above.
+ - It adds some desugaring rules ro rewrite `throws` types to cascaded `$throws` types.
+ - It augments the type checking of `throw` by _demanding_ a `CanThrow` capability or the thrown exception.
+ - It augments the type checking of `try` by _providing_ `CanThrow` capabilities for every caught exception.
+
+That's all. It's quite remarkable that one can do exception checking in this way without any special additions to the type system. We just need regular givens and context functions. Any runtime overhead is eliminated using `erased`.
+
+## Caveats
+
+Our capability model allows to declare and check the thrown exceptions of first-order code. But as it stands, it does not give us enough mechanism to enforce the _absence_ of
+capabilities for arguments to higher-order functions. Consider a variant `pureMap`
+of `map` that should enforce that its argument does not throw exceptions or have any other effects (maybe because wants to reorder computations transparently). Right now
+we cannot enforce that since the function argument to `pureMap` can capture arbitrary
+capabilities in its free variables without them showing up in its type. One possible way to
+address this would be to introduce a pure function type (maybe written `A -> B`). Pure functions are not allowed to close over capabilities. Then `pureMap` could be written
+like this:
+```scala
+  def pureMap(f: A -> B): List[B]
+```
+Another area where the lack of purity requirements shows up is when capabilities escape from bounded scopes. Consider the following function
+```scala
+def escaped(xs: Double*): () => Int =
+  try () => xs.map(f).sum
+  catch case ex: LimitExceeded => -1
+```
+With the system presented here, this function typechecks, with expansion
+```scala
+// compiler-generated code
+def escaped(xs: Double*): () => Int =
+  try
+    given ctl: CanThrow[LimitExceeded] = ???
+    () => xs.map(x => f(x)(using ctl)).sum
+  catch case ex: LimitExceeded => -1
+```
+But if you try to call `escaped` like this
+```scala
+val g = escaped(1, 2, 1000000000)
+g()
+```
+the result will be a `LimitExceeded` exception thrown at the second line where `g` is called. What's missing is that `try` should enforce that the capabilities it generates do not escape as free variables in the result of its body. It makes sense to describe such scoped effects as _ephemeral capabilities_ - they have lifetimes that cannot be extended to delayed code in a lambda.
+
+
+## Outlook
+
+We are working on a new class of type system that supports ephemeral capabilities by tracking the free variables of values. Once that research matures, it will hopefully be possible to augment the Scala language so that we can enforce the missing properties.
+
+And it would have many other applications besides: Exceptions are a special case of _algebraic effects_, which has been a very active research area over the last 20 years and is finding its way into programming languages (e.g. [Koka](https://koka-lang.github.io/koka/doc/book.html#why-handlers), [Eff](https://www.eff-lang.org/learn/), [Multicore OCaml](https://discuss.ocaml.org/t/multicore-ocaml-september-2021-effect-handlers-will-be-in-ocaml-5-0/8554), [Unison](https://www.unisonweb.org/docs/language-reference/#abilities-and-ability-handlers)). In fact, algebraic effects have been characterized as being equivalent to exceptions with an additional _resume_ operation. The techniques developed here for exceptions can probably be generalized to other classes of algebraic effects.
+
+But even without these additional mechanisms, exception checking is already useful as it is. It gives a clear path forward to make code that uses exceptions safer, better documented, and easier to refactor. The only loophole arises for scoped capabilities - here we have to verify manually that these capabilities do not escape. Specifically, a `try` always has to be placed in the same computation stage as the throws that it enables.
+
+Put another way: If the status quo is 0% static checking since 100% is too painful, then an alternative that gives you 95% static checking with great ergonomics looks like a win. And we might still get to 100% in the future.
+
+For more info, see also our [paper at the ACM Scala Symposium 2021](https://infoscience.epfl.ch/record/290885).
diff --git a/docs/_docs/reference/experimental/cc.md b/docs/_docs/reference/experimental/cc.md
new file mode 100644
index 000000000000..592d410a4502
--- /dev/null
+++ b/docs/_docs/reference/experimental/cc.md
@@ -0,0 +1,739 @@
+---
+layout: doc-page
+title: "Capture Checking"
+---
+
+Capture checking is a research project that modifies the Scala type system to track references to capabilities in values. It is currently
+implemented in an experimental branch [cc-experiment](https://github.com/lampepfl/dotty/tree/cc-experiment) in the dotty
+repo and can be enabled on this branch with a `-Ycc` compiler option.
+
+To get an idea what capture checking can do, let's start with a small example:
+```scala
+def usingLogFile[T](op: FileOutputStream => T): T =
+  val logFile = FileOutputStream("log")
+  val result = op(logFile)
+  logFile.close()
+  result
+```
+The `usingLogFile` method invokes a given operation with a fresh log file as parameter. Once the operation has ended, the log file is closed and the
+operation's result is returned. This is a typical _try-with-resources_ pattern, similar to many other such patterns which are often supported by special language constructs in other languages.
+
+The problem is that `usingLogFile`'s implementation is not entirely safe. One can
+undermine it by passing an operation that performs the logging at some later point
+after it has terminated. For instance:
+```scala
+val later = usingLogFile { file => () => file.write(0) }
+later() // crash
+```
+When `later` is executed it tries to write to a file that is already closed, which
+results in an uncaught `IOException`.
+
+Capture checking gives us the mechanism to prevent such errors _statically_. To
+prevent unsafe usages of `usingLogFile`, we can declare it like this:
+```scala
+def usingLogFile[T](op: ({*} FileOutputStream) => T): T =
+  // same body as before
+```
+The only thing that's changed is that the `FileOutputStream` parameter of `op` is now
+tagged with `{*}`. We'll see that this turns the parameter into a _capability_ whose lifetime is tracked.
+
+If we now try to define the problematic value `later`, we get a static error:
+```
+   |  val later = usingLogFile { f => () => f.write(0) }
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |The expression's type {*} () -> Unit is not allowed to capture the root capability `*`.
+   |This usually means that a capability persists longer than its allowed lifetime.
+```
+In this case, it was easy to see that the `logFile` capability escapes in the closure passed to `usingLogFile`. But capture checking also works for more complex cases.
+For instance, capture checking is able to distinguish between the following safe code:
+```scala
+val xs = usingLogFile { f =>
+  List(1, 2, 3).map { x => f.write(x); x * x }
+}
+```
+and the following unsafe one:
+```scala
+val xs = usingLogFile { f =>
+  LazyList(1, 2, 3).map { x => f.write(x); x * x }
+}
+```
+An error would be issued in the second case, but not the first one (this assumes a capture-aware
+formulation of `LazyList` which we will present later in this page).
+
+It turns out that capture checking has very broad applications. Besides the various
+try-with-resources patterns, it can also be a key part to the solutions of many other long standing problems in programming languages. Among them:
+
+ - How to have a simple and flexible system for checked exceptions. We show later
+   how capture checking enables a clean and fully safe system for checked exceptions in Scala.
+ - How to address the problem of effect polymorphism in general.
+ - How to solve the "what color is your function?" problem of mixing synchronous
+   and asynchronous computations.
+ - How to do region-based allocation, safely,
+ - How to reason about capabilities associated with memory locations.
+
+The following sections explain in detail how capture checking works in Scala 3.
+
+
+## Overview
+
+The capture checker extension introduces a new kind of types and it enforces some rules for working with these types.
+
+Capture checking is enabled by the compiler option `-Ycc`. If the option is not given, the new
+type forms can still be written but they are not checked for consistency, because they are
+treated simply as certain uninterpreted annotated types.
+
+## Capabilities and Capturing Types
+
+Capture checking is done in terms of _capturing types_ of the form
+`{c₁, ..., cᵢ} T`. Here `T` is a type, and `{c₁, ..., cᵢ}` is a _capture set_ consisting of references to capabilities `c₁, ..., cᵢ`.
+
+A _capability_ is syntactically a method- or class-parameter, a local variable, or the `this` of an enclosing class. The type of a capability
+must be a capturing type with a non-empty capture set. We also say that
+variables that are capabilities are _tracked_.
+
+In a sense, every
+capability gets its authority from some other, more sweeping capability which it captures. The most sweeping capability, from which ultimately all others are derived is written `*`. We call it the _universal capability_.
+
+Here is an example:
+```scala
+class FileSystem
+
+class Logger(fs: {*} FileSystem):
+  def log(s: String): Unit = ... // Write to a log file, using `fs`
+
+def test(fs: {*} FileSystem) =
+  val l: {fs} Logger = Logger(fs)
+  l.log("hello world!")
+  val xs: {l} LazyList[Int] =
+    LazyList.from(1)
+      .map { i =>
+        l.log(s"computing elem # $i")
+        i * i
+      }
+  xs
+```
+Here, the `test` method takes a `FileSystem` as a parameter. `fs` is a capability since its type has a non-empty capture set. The capability is passed to the `Logger` constructor
+and retained as a field in class `Logger`. Hence, the local variable `l` has type
+`{fs} Logger`: it is a `Logger` which retains the `fs` capability.
+
+The second variable defined in `test` is `xs`, a lazy list that is obtained from
+`LazyList.from(1)` by logging and mapping consecutive numbers. Since the list is lazy,
+it needs to retain the reference to the logger `l` for its computations. Hence, the
+type of the list is `{l} LazyList[Int]`. On the other hand, since `xs` only logs but does
+not do other file operations, it retains the `fs` capability only indirectly. That's why
+`fs` does not show up in the capture set of `xs`.
+
+Capturing types come with a subtype relation where types with "smaller" capture sets are subtypes of types with larger sets (the _subcapturing_ relation is defined in more detail below). If a type `T` does not have a capture set, it is called _pure_, and is a subtype of
+any capturing type that adds a capture set to `T`.
+
+## Function Types
+
+The usual function type `A => B` now stands for a function that can capture arbitrary capabilities. We call such functions
+_impure_. By contrast, the new single arrow function type `A -> B` stands for a function that cannot capture any capabilities, or otherwise said, is _pure_. One can add a capture set in front of an otherwise pure function.
+For instance, `{c, d} A -> B` would be a function that can capture capabilities `c` and `d`, but no others.
+
+The impure function type `A => B` is treated as an alias for `{*} A -> B`. That is, impure functions are functions that can capture anything.
+
+Function types and captures both associate to the right, so
+```scala
+{c} A -> {d} B -> C
+```
+is the same as
+```scala
+{c} (A -> {d} (B -> C))
+```
+Contrast with
+```scala
+({c} A) -> ({d} B) -> C
+```
+which is a curried pure function over argument types that can capture `c` and `d`, respectively.
+
+Analogous conventions apply to context function types. `A ?=> B` is an impure context function, with `A ?-> B` as its pure complement.
+
+**Note 1:** The identifiers `->` and `?->` are now treated as soft keywords when used as infix type operators. They are
+still available as regular identifiers for terms. For instance, the mapping syntax `Map("x" -> 1, "y" -> 2)` is still supported since it only applies to terms.
+
+**Note 2:** The distinctions between pure vs impure function types do not apply to methods. In fact, since methods are not values they never capture anything directly. References to
+capabilities in a method are instead counted in the capture set of the enclosing object.
+
+## By-Name Parameter Types
+
+A convention analogous to function types also extends to by-name parameters. In
+```scala
+def f(x: => Int): Int
+```
+the actual argument can refer to arbitrary capabilities. So the following would be OK:
+```scala
+f(if p(y) then throw Ex() else 1)
+```
+On the other hand, if `f` was defined like this
+```scala
+def f(x: -> Int): Int
+```
+the actual argument to `f` could not refer to any capabilities, so the call above would be rejected.
+One can also allow specific capabilities like this:
+```scala
+def f(x: {c}-> Int): Int
+```
+Here, the actual argument to `f` is allowed to use the `c` capability but no others.
+
+**Note**: It is strongly recommended to write the capability set and the arrow `->` without intervening spaces,
+as otherwise the notation would look confusingly like a function type.
+
+## Subtyping and Subcapturing
+
+Capturing influences subtyping. As usual we write `T₁ <: T₂` to express that the type
+`T₁` is a subtype of the type `T₂`, or equivalently, that `T₁` conforms to `T₂`. An
+analogous _subcapturing_ relation applies to capture sets. If `C₁` and `C₂` are capture sets, we write `C₁ <: C₂` to express that `C₁` _is covered by_ `C₂`, or, swapping the operands, that `C₂` _covers_ `C₁`.
+
+Subtyping extends as follows to capturing types:
+
+ - Pure types are subtypes of capturing types. That is, `T <: C T`, for any type `T`, capturing set `C`.
+ - For capturing types, smaller capturing sets produce subtypes: `C₁ T₁ <: C₂ T₂` if
+   `C₁ <: C₂` and `T₁ <: T₂`.
+
+A subcapturing relation `C₁ <: C₂` holds if `C₂` _accounts for_ every element `c` in `C₁`. This means one of the following three conditions must be true:
+
+ - `c ∈ C₂`,
+ - `c` refers to a parameter of some class `Cls` and `C₂` contains `Cls.this`,
+ - `c`'s type has capturing set `C` and `C₂` accounts for every element of `C` (that is, `C <: C₂`).
+
+
+**Example 1.** Given
+```scala
+fs: {*} FileSystem
+ct: {*} CanThrow[Exception]
+l : {fs} Logger
+```
+we have
+```
+{l}  <: {fs}     <: {*}
+{fs} <: {fs, ct} <: {*}
+{ct} <: {fs, ct} <: {*}
+```
+The set consisting of the root capability `{*}` covers every other capture set. This is
+a consequence of the fact that, ultimately, every capability is created from `*`.
+
+**Example 2.** Consider again the FileSystem/Logger example from before. `LazyList[Int]` is a proper subtype of `{l} LazyList[Int]`. So if the `test` method in that example
+was declared with a result type `LazyList[Int]`, we'd get a type error. Here is the error message:
+```
+11 |def test(using fs: {*} FileSystem): LazyList[Int] = {
+   |                                                    ^
+   |                                            Found:    {fs} LazyList[Int]
+   |                                            Required: LazyList[Int]
+```
+Why does it say `{fs} LazyList[Int]` and not `{l} LazyList[Int]`, which is, after all, the type of the returned value `xs`? The reason is that `l` is a local variable in the body of `test`, so it cannot be referred to in a type outside that body. What happens instead is that the type is _widened_ to the smallest supertype that does not mention `l`. Since `l` has capture set `fs`, we have that `{fs}` covers `{l}`, and `{fs}` is acceptable in a result type of `test`, so `{fs}` is the result of that widening.
+This widening is called _avoidance_; it is not specific to capture checking but applies to all variable references in Scala types.
+
+## Capability Classes
+
+Classes like `CanThrow` or `FileSystem` have the property that their values are always intended to be capabilities. We can make this intention explicit and save boilerplate by declaring these classes with a `@capability` annotation.
+
+The capture set of a capability class type is always `{*}`. This means we could equivalently express the `FileSystem` and `Logger` classes as follows:
+```scala
+import annotation.capability
+
+@capability class FileSystem
+
+class Logger(using FileSystem):
+  def log(s: String): Unit = ???
+
+def test(using fs: FileSystem) =
+  val l: {fs} Logger = Logger()
+  ...
+```
+In this version, `FileSystem` is a capability class, which means that the `{*}` capture set is implied on the parameters of `Logger` and `test`. Writing the capture set explicitly produces a warning:
+```scala
+class Logger(using {*} FileSystem):
+                   ^^^^^^^^^^^^^^
+             redundant capture: FileSystem already accounts for *
+```
+Another, unrelated change in the version of the last example here is that the `FileSystem` capability is now passed as an implicit parameter. It is quite natural to model capabilities with implicit parameters since it greatly reduces the wiring overhead once multiple capabilities are in play.
+
+## Capture Checking of Closures
+
+If a closure refers to capabilities in its body, it captures these capabilities in its type. For instance, consider:
+```scala
+def test(fs: FileSystem): {fs} String -> Unit =
+  (x: String) => Logger(fs).log(x)
+```
+Here, the body of `test` is a lambda that refers to the capability `fs`, which means that `fs` is retained in the lambda.
+Consequently, the type of the lambda is `{fs} String -> Unit`.
+
+**Note:** Function values are always written with `=>` (or `?=>` for context functions). There is no syntactic
+distinction for pure _vs_ impure function values. The distinction is only made in their types.
+
+A closure also captures all capabilities that are captured by the functions
+it calls. For instance, in
+```scala
+def test(fs: FileSystem) =
+  def f() = g()
+  def g() = (x: String) => Logger(fs).log(x)
+  f
+```
+the result of `test` has type `{fs} String -> Unit` even though function `f` itself does not refer to `fs`.
+
+## Capture Checking of Classes
+
+The principles for capture checking closures also apply to classes. For instance, consider:
+```scala
+class Logger(using fs: FileSystem):
+  def log(s: String): Unit = ... summon[FileSystem] ...
+
+def test(xfs: FileSystem): {xfs} Logger =
+  Logger(xfs)
+```
+Here, class `Logger` retains the capability `fs` as a (private) field. Hence, the result
+of `test` is of type `{xfs} Logger`
+
+Sometimes, a tracked capability is meant to be used only in the constructor of a class, but
+is not intended to be retained as a field. This fact can be communicated to the capture
+checker by declaring the parameter as `@constructorOnly`. Example:
+```scala
+import annotation.constructorOnly
+
+class NullLogger(using @constructorOnly fs: FileSystem):
+  ...
+def test2(using fs: FileSystem): NullLogger = NullLogger() // OK
+```
+
+The captured references of a class include _local capabilities_ and _argument capabilities_. Local capabilities are capabilities defined outside the class and referenced from its body. Argument capabilities are passed as parameters to the primary constructor of the class. Local capabilities are inherited:
+the local capabilities of a superclass are also local capabilities of its subclasses. Example:
+
+```scala
+@capability class Cap
+
+def test(a: Cap, b: Cap, c: Cap) =
+  class Super(y: Cap):
+    def f = a
+  class Sub(x: Cap) extends Super(x)
+    def g = b
+  Sub(c)
+```
+Here class `Super` has local capability `a`, which gets inherited by class
+`Sub` and is combined with `Sub`'s own local capability `b`. Class `Sub` also has an argument capability corresponding to its parameter `x`. This capability gets instantiated to `c` in the final constructor call `Sub(c)`. Hence,
+the capture set of that call is `{a, b, c}`.
+
+The capture set of the type of `this` of a class is inferred by the capture checker, unless the type is explicitly declared with a self type annotation like this one:
+```scala
+class C:
+  self: {a, b} D => ...
+```
+The inference observes the following constraints:
+
+ - The type of `this` of a class `C` includes all captured references of `C`.
+ - The type of `this` of a class `C` is a subtype of the type of `this`
+   of each parent class of `C`.
+ - The type of `this` must observe all constraints where `this` is used.
+
+For instance, in
+```scala
+@capability class Cap
+def test(c: Cap) =
+  class A:
+    val x: A = this
+    def f = println(c)  // error
+```
+we know that the type of `this` must be pure, since `this` is the right hand side of a `val` with type `A`. However, in the last line we find that the capture set of the class, and with it the capture set of `this`, would include `c`. This leads to a contradiction, and hence to a checking error:
+```
+16 |    def f = println(c)  // error
+   |                    ^
+   |(c : Cap) cannot be referenced here; it is not included in the allowed capture set {}
+```
+
+## Capture Tunnelling
+
+Consider the following simple definition of a `Pair` class:
+```scala
+class Pair[+A, +B](x: A, y: B):
+  def fst: A = x
+  def snd: B = y
+```
+What happens if `Pair` is instantiated like this (assuming `ct` and `fs` are two capabilities in scope)?
+```scala
+def x: {ct} Int -> String
+def y: {fs} Logger
+def p = Pair(x, y)
+```
+The last line will be typed as follows:
+```scala
+def p: Pair[{ct} Int -> String, {fs} Logger] = Pair(x, y)
+```
+This might seem surprising. The `Pair(x, y)` value does capture capabilities `ct` and `fs`. Why don't they show up in its type at the outside?
+
+The answer is capture tunnelling. Once a type variable is instantiated to a capturing type, the
+capture is not propagated beyond this point. On the other hand, if the type variable is instantiated
+again on access, the capture information "pops out" again. For instance, even though `p` is technically pure because its capture set is empty, writing `p.fst` would record a reference to the captured capability `ct`. So if this access was put in a closure, the capability would again form part of the outer capture set. E.g.
+```scala
+() => p.fst : {ct} () -> {ct} Int -> String
+```
+In other words, references to capabilities "tunnel through" in generic instantiations from creation to access; they do not affect the capture set of the enclosing generic data constructor applications.
+This principle may seem surprising at first, but it is the key to make capture checking concise and practical.
+
+## Escape Checking
+
+The universal capability `*` should be conceptually available only as a parameter to the main program. Indeed, if it was available everywhere, capability checking would be undermined since one could mint new capabilities
+at will. In line with this reasoning, some capture sets are restricted so that
+they are not allowed to contain the universal capability.
+
+Specifically, if a capturing type is an instance of a type variable, that capturing type
+is not allowed to carry the universal capability `{*}`. There's a connection to tunnelling here.
+The capture set of a type has to be present in the environment when a type is instantiated from
+a type variable. But `*` is not itself available as a global entity in the environment. Hence,
+an error should result.
+
+We can now reconstruct how this principle produced the error in the introductory example, where
+`usingLogFile` was declared like this:
+```scala
+def usingLogFile[T](op: ({*} FileOutputStream) => T): T = ...
+```
+The error message was:
+```
+   |  val later = usingLogFile { f => () => f.write(0) }
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |The expression's type {*} () -> Unit is not allowed to capture the root capability `*`.
+   |This usually means that a capability persists longer than its allowed lifetime.
+```
+This error message was produced by the following logic:
+
+ - The `f` parameter has type `{*} FileOutputStream`, which makes it a capability.
+ - Therefore, the type of the expression `() => f.write(0)` is `{f} () -> Unit`.
+ - This makes the whole type of the closure passed to `usingLogFile` the dependent function type
+   `(f: {*} FileOutputStream) -> {f} () -> Unit`.
+ - The expected type of the closure is a simple, parametric, impure function type `({*} FileOutputStream) => T`,
+   for some instantiation of the type variable `T`.
+ - The smallest supertype of the closure's dependent function type that is a parametric function type is
+   `({*} FileOutputStream) => {*} () -> Unit`
+ - Hence, the type variable `T` is instantiated to `* () -> Unit`, which causes the error.
+
+An analogous restriction applies to the type of a mutable variable.
+Another way one could try to undermine capture checking would be to
+assign a closure with a local capability to a global variable. Maybe
+like this:
+```scala
+var loophole: {*} () -> Unit = () => ()
+usingLogFile { f =>
+  loophole = () => f.write(0)
+}
+loophole()
+```
+But this will not compile either, since mutable variables cannot have universal capture sets.
+
+One also needs to prevent returning or assigning a closure with a local capability in an argument of a parametric type. For instance, here is a
+slightly more refined attack:
+```scala
+class Cell[+A](x: A)
+val sneaky = usingLogFile { f => Cell(() => f.write(0)) }
+sneaky.x()
+```
+At the point where the `Cell` is created, the capture set of the argument is `f`, which
+is OK. But at the point of use, it is `*` (because `f` is no longer in scope), which causes again an error:
+```
+   |  sneaky.x()
+   |  ^^^^^^^^
+   |The expression's type {*} () -> Unit is not allowed to capture the root capability `*`.
+   |This usually means that a capability persists longer than its allowed lifetime.
+```
+
+Looking at object graphs, we observe a monotonicity property: The capture set of an object `x` covers the capture sets of all objects reachable through `x`. This property is reflected in the type system by the following _monotonicity rule_:
+
+ - In a class `C` with a field `f`, the capture set `{this}` covers the capture set `{this.f}` as well as the capture set of any application of `this.f` to pure arguments.
+
+## Checked Exceptions
+
+Scala enables checked exceptions through a language import. Here is an example,
+taken from the [safer exceptions page](./canthrow.md), and also described in a
+[paper](https://infoscience.epfl.ch/record/290885) presented at the
+ 2021 Scala Symposium.
+```scala
+import language.experimental.saferExceptions
+
+class LimitExceeded extends Exception
+
+val limit = 10e+10
+def f(x: Double): Double throws LimitExceeded =
+  if x < limit then x * x else throw LimitExceeded()
+```
+The new `throws` clause expands into an implicit parameter that provides
+a `CanThrow` capability. Hence, function `f` could equivalently be written
+like this:
+```scala
+def f(x: Double)(using CanThrow[LimitExceeded]): Double = ...
+```
+If the implicit parameter is missing, an error is reported. For instance, the  function definition
+```scala
+def g(x: Double): Double =
+  if x < limit then x * x else throw LimitExceeded()
+```
+is rejected with this error message:
+```
+  |  if x < limit then x * x else throw LimitExceeded()
+  |                               ^^^^^^^^^^^^^^^^^^^^^
+  |The capability to throw exception LimitExceeded is missing.
+  |The capability can be provided by one of the following:
+  | - Adding a using clause `(using CanThrow[LimitExceeded])` to the definition of the enclosing method
+  | - Adding `throws LimitExceeded` clause after the result type of the enclosing method
+  | - Wrapping this piece of code with a `try` block that catches LimitExceeded
+```
+`CanThrow` capabilities are required by `throw` expressions and are created
+by `try` expressions. For instance, the expression
+```scala
+try xs.map(f).sum
+catch case ex: LimitExceeded => -1
+```
+would be expanded by the compiler to something like the following:
+```scala
+try
+  erased given ctl: CanThrow[LimitExceeded] = compiletime.erasedValue
+  xs.map(f).sum
+catch case ex: LimitExceeded => -1
+```
+(The `ctl` capability is only used for type checking but need not show up in the generated code, so it can be declared as
+erased.)
+
+As with other capability based schemes, one needs to guard against capabilities
+that are captured in results. For instance, here is a problematic use case:
+```scala
+def escaped(xs: Double*): (() => Double) throws LimitExceeded =
+  try () => xs.map(f).sum
+  catch case ex: LimitExceeded => () => -1
+val crasher = escaped(1, 2, 10e+11)
+crasher()
+```
+This code needs to be rejected since otherwise the call to `crasher()` would cause
+an unhandled `LimitExceeded` exception to be thrown.
+
+Under `-Ycc`, the code is indeed rejected
+```
+14 |  try () => xs.map(f).sum
+   |  ^
+   |The expression's type {*} () -> Double is not allowed to capture the root capability `*`.
+   |This usually means that a capability persists longer than its allowed lifetime.
+15 |  catch case ex: LimitExceeded => () => -1
+```
+To integrate exception and capture checking, only two changes are needed:
+
+ - `CanThrow` is declared as a `@capability` class, so all references to `CanThrow` instances are tracked.
+ - Escape checking is extended to `try` expressions. The result type of a `try` is not allowed to
+   capture the universal capability.
+
+## A Larger Example
+
+As a larger example, we present an implementation of lazy lists and some use cases. For simplicity,
+our lists are lazy only in their tail part. This corresponds to what the Scala-2 type `Stream` did, whereas Scala 3's `LazyList` type computes strictly less since it is also lazy in the first argument.
+
+Here is the base trait `LzyList` for our version of lazy lists:
+```scala
+trait LzyList[+A]:
+  def isEmpty: Boolean
+  def head: A
+  def tail: {this} LzyList[A]
+```
+Note that `tail` carries a capture annotation. It says that the tail of a lazy list can
+potentially capture the same references as the lazy list as a whole.
+
+The empty case of a `LzyList` is written as usual:
+```scala
+object LzyNil extends LzyList[Nothing]:
+  def isEmpty = true
+  def head = ???
+  def tail = ???
+```
+Here is a formulation of the class for lazy cons nodes:
+```scala
+import scala.compiletime.uninitialized
+
+final class LzyCons[+A](hd: A, tl: () => {*} LzyList[A]) extends LzyList[A]:
+  private var forced = false
+  private var cache: {this} LzyList[A] = uninitialized
+  private def force =
+    if !forced then { cache = tl(); forced = true }
+    cache
+
+  def isEmpty = false
+  def head = hd
+  def tail: {this} LzyList[A] = force
+end LzyCons
+```
+The `LzyCons` class takes two parameters: A head `hd` and a tail `tl`, which is a function
+returning a `LzyList`. Both the function and its result can capture arbitrary capabilities.
+The result of applying the function is memoized after the first dereference of `tail` in
+the private mutable field `cache`. Note that the typing of the assignment `cache = tl()` relies on the monotonicity rule for `{this}` capture sets.
+
+Here is an extension method to define an infix cons operator `#:` for lazy lists. It is analogous
+to `::` but instead of a strict list it produces a lazy list without evaluating its right operand.
+```scala
+extension [A](x: A)
+  def #:(xs1: => {*} LzyList[A]): {xs1} LzyList[A] =
+    LzyCons(x, () => xs1)
+```
+Note that `#:` takes an impure call-by-name parameter `xs1` as its right argument. The result
+of `#:` is a lazy list that captures that argument.
+
+As an example usage of `#:`, here is a method `tabulate` that creates a lazy list
+of given length with a generator function `gen`. The generator function is allowed
+to have side effects.
+```scala
+def tabulate[A](n: Int)(gen: Int => A) =
+  def recur(i: Int): {gen} LzyList[A] =
+    if i == n then LzyNil
+    else gen(i) #: recur(i + 1)
+  recur(0)
+```
+Here is a use of `tabulate`:
+```scala
+class LimitExceeded extends Exception
+def squares(n: Int)(using ct: CanThrow[LimitExceeded]) =
+  tabulate(10) { i =>
+    if i > 9 then throw LimitExceeded()
+    i * i
+  }
+```
+The inferred result type of `squares` is `{ct} LzyList[Int]`, i.e it is a lazy list of
+`Int`s that can throw the `LimitExceeded` exception when it is elaborated by calling `tail`
+one or more times.
+
+Here are some further extension methods for mapping, filtering, and concatenating lazy lists:
+```scala
+extension [A](xs: {*} LzyList[A])
+  def map[B](f: A => B): {xs, f} LzyList[B] =
+    if xs.isEmpty then LzyNil
+    else f(xs.head) #: xs.tail.map(f)
+
+  def filter(p: A => Boolean): {xs, p} LzyList[A] =
+    if xs.isEmpty then LzyNil
+    else if p(xs.head) then xs.head #: xs.tail.filter(p)
+    else xs.tail.filter(p)
+
+  def concat(ys: {*} LzyList[A]): {xs, ys} LzyList[A] =
+    if xs.isEmpty then ys
+    else xs.head #: xs.tail.concat(ys)
+
+  def drop(n: Int): {xs} LzyList[A] =
+    if n == 0 then xs else xs.tail.drop(n - 1)
+```
+Their capture annotations are all as one would expect:
+
+ - Mapping a lazy list produces a lazy list that captures the original list as well
+   as the (possibly impure) mapping function.
+ - Filtering a lazy list produces a lazy list that captures the original list as well
+   as the (possibly impure) filtering predicate.
+ - Concatenating two lazy lists produces a lazy list that captures both arguments.
+ - Dropping elements from a lazy list gives a safe approximation where the original list is captured in the result. In fact, it's only some suffix of the list that is retained at run time, but our modelling identifies lazy lists and their suffixes, so this additional knowledge would not be useful.
+
+Of course the function passed to `map` or `filter` could also be pure. After all, `A -> B` is a subtype of `{*} A -> B` which is the same as `A => B`. In that case, the pure function
+argument will _not_ show up in the result type of `map` or `filter`. For instance:
+```scala
+val xs = squares(10)
+val ys: {xs} LzyList[Int] = xs.map(_ + 1)
+```
+The type of the mapped list `ys` has only `xs` in its capture set. The actual function
+argument does not show up since it is pure. Likewise, if the lazy list
+`xs` was pure, it would not show up in any of the method results.
+This demonstrates that capability-based
+effect systems with capture checking are naturally _effect polymorphic_.
+
+This concludes our example. It's worth mentioning that an equivalent program defining and using standard, strict lists would require no capture annotations whatsoever. It would compile exactly as written now in standard Scala 3, yet one gets the capture checking for free. Essentially, `=>` already means "can capture anything" and since in a strict list side effecting operations are not retained in the result, there are no additional captures to record. A strict list could of course capture side-effecting closures in its elements but then tunnelling applies, since
+these elements are represented by a type variable. This means we don't need to annotate anything there either.
+
+Another possibility would be a variant of lazy lists that requires all functions passed to `map`, `filter` and other operations like it to be pure. E.g. `map` on such a list would be defined like this:
+```scala
+extension [A](xs: LzyList[A])
+  def map[B](f: A -> B): LzyList[B] = ...
+```
+That variant would not require any capture annotations either.
+
+To summarize, there are two "sweet spots" of data structure design: strict lists in
+side-effecting or resource-aware code and lazy lists in purely functional code.
+Both are already correctly capture-typed without requiring any explicit annotations. Capture annotations only come into play where the semantics gets more complicated because we deal with delayed effects such as in impure lazy lists or side-effecting iterators over strict lists. This property is probably one of the greatest plus points of our approach to capture checking compared to previous techniques which tend to be more noisy.
+
+## Function Type Shorthands
+
+TBD
+
+## Compilation Options
+
+The following options are relevant for capture checking.
+
+ - **-Ycc** Enables capture checking.
+ - **-Xprint:cc** Prints the program with capturing types as inferred by capture checking.
+ - **-Ycc-debug** Gives more detailed, implementation-oriented information about capture checking, as described in the next section.
+
+ The implementation supporting capture checking with these options is currently in branch `cc-experiment` on dotty.epfl.ch.
+
+## Capture Checking Internals
+
+The capture checker is architected as a propagation constraint solver, which runs as a separate phase after type-checking and some initial transformations.
+
+Constraint variables stand for unknown capture sets. A constraint variable is introduced
+
+ - for every part of a previously inferred type,
+ - for the accessed references of every method, class, anonymous function, or by-name argument,
+ - for the parameters passed in a class constructor call.
+
+Capture sets in explicitly written types are treated as constants (before capture checking, such sets are simply ignored).
+
+The capture checker essentially rechecks the program with the usual typing rules. Every time a subtype requirement between capturing types is checked, this translates to a subcapturing test on capture sets. If the two sets are constant, this is simply a yes/no question, where a no will produce an error message.
+
+If the lower set `C₁` of a comparison `C₁ <: C₂` is a variable, the set `C₂` is recorded
+as a _superset_ of `C₁`. If the upper set `C₂` is a variable, the elements of `C₁` are _propagated_ to `C₂`. Propagation of an element `x` to a set `C` means that `x` is included as an element in `C`, and it is also propagated
+to all known supersets of `C`. If such a superset is a constant, it is checked that `x` is included in it. If that's not the case, the original comparison `C₁ <: C₂` has no solution and an error is reported.
+
+The type checker also performs various maps on types, for instance when substituting actual argument types for formal parameter types in dependent functions, or mapping
+member types with "as-seen-from" in a selection. Maps keep track of the variance
+of positions in a type. The variance is initially covariant, it flips to
+contravariant in function parameter positions, and can be either covariant,
+contravariant, or nonvariant in type arguments, depending on the variance of
+the type parameter.
+
+When capture checking, the same maps are also performed on capture sets. If a capture set is a constant, its elements (which are capabilities) are mapped as regular types. If the result of such a map is not a capability, the result is approximated according to the variance of the type. A covariant approximation replaces a type by its capture set.
+A contravariant approximation replaces it with the empty capture set. A nonvariant
+approximation replaces the enclosing capturing type with a range of possible types
+that gets propagated and resolved further out.
+
+When a mapping `m` is performed on a capture set variable `C`, a new variable `Cm` is created that contains the mapped elements and that is linked with `C`. If `C` subsequently acquires further elements through propagation, these are also propagated to `Cm` after being transformed by the `m` mapping. `Cm` also gets the same supersets as `C`, mapped again using `m`.
+
+One interesting aspect of the capture checker concerns the implementation of capture tunnelling. The [foundational theory](https://infoscience.epfl.ch/record/290885) on which capture checking is based makes tunnelling explicit through so-called _box_ and
+_unbox_ operations. Boxing hides a capture set and unboxing recovers it. The capture checker inserts virtual box and unbox operations based on actual and expected types similar to the way the type checker inserts implicit conversions. When capture set variables are first introduced, any capture set in a capturing type that is an instance of a type parameter instance is marked as "boxed". A boxing operation is
+inserted if the expected type of an expression is a capturing type with
+a boxed capture set variable. The effect of the insertion is that any references
+to capabilities in the boxed expression are forgotten, which means that capture
+propagation is stopped. Dually, if the actual type of an expression has
+a boxed variable as capture set, an unbox operation is inserted, which adds all
+elements of the capture set to the environment.
+
+Boxing and unboxing has no runtime effect, so the insertion of these operations is  only simulated; the only visible effect is the retraction and insertion
+of variables in the capture sets representing the environment of the currently checked expression.
+
+The `-Ycc-debug` option provides some insight into the workings of the capture checker.
+When it is turned on, boxed sets are marked explicitly and capture set variables are printed with an ID and some information about their provenance. For instance, the string `{f, xs}33M5V` indicates a capture set
+variable that is known to hold elements `f` and `xs`. The variable's ID is `33`. The `M`
+indicates that the variable was created through a mapping from a variable with ID `5`. The latter is a regular variable, as indicated
+ by `V`.
+
+Generally, the string following the capture set consists of alternating numbers and letters where each number gives a variable ID and each letter gives the provenance of the variable. Possible letters are
+
+ - `V` : a regular variable,
+ - `M` : a variable resulting from a _mapping_ of the variable indicated by the string to the right,
+ - `B` : similar to `M` but where the mapping is a _bijection_,
+ - `F` : a variable resulting from _filtering_ the elements of the variable indicated by the string to the right,
+ - `I` : a variable resulting from an _intersection_ of two capture sets,
+ - `D` : a variable resulting from the set _difference_ of two capture sets.
+
+At the end of a compilation run, `-Ycc-debug` will print all variable dependencies of variables referred to in previous output. Here is an example:
+```
+Capture set dependencies:
+  {}2V                 ::
+  {}3V                 ::
+  {}4V                 ::
+  {f, xs}5V            :: {f, xs}31M5V, {f, xs}32M5V
+  {f, xs}31M5V         :: {xs, f}
+  {f, xs}32M5V         ::
+```
+This section lists all variables that appeared in previous diagnostics and their dependencies, recursively. For instance, we learn that
+
+ - variables 2, 3, 4 are empty and have no dependencies,
+ - variable `5` has two dependencies: variables `31` and `32` which both result from mapping variable `5`,
+ - variable `31` has a constant fixed superset `{xs, f}`
+ - variable `32` has no dependencies.
+
diff --git a/docs/docs/reference/experimental/erased-defs-spec.md b/docs/_docs/reference/experimental/erased-defs-spec.md
similarity index 93%
rename from docs/docs/reference/experimental/erased-defs-spec.md
rename to docs/_docs/reference/experimental/erased-defs-spec.md
index ed8490f7e30e..7ca815878b55 100644
--- a/docs/docs/reference/experimental/erased-defs-spec.md
+++ b/docs/_docs/reference/experimental/erased-defs-spec.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
-title: "Erased Definitions: More Details"
+title: "Erased Definitions - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/experimental/erased-defs-spec.html
 ---
 
 TODO: complete
@@ -61,4 +62,3 @@ TODO: complete
 7. Overriding
    * Member definitions overriding each other must both be `erased` or not be `erased`
    * `def foo(x: T): U` cannot be overridden by `def foo(erased x: T): U` and vice-versa
-
diff --git a/docs/docs/reference/experimental/erased-defs.md b/docs/_docs/reference/experimental/erased-defs.md
similarity index 77%
rename from docs/docs/reference/experimental/erased-defs.md
rename to docs/_docs/reference/experimental/erased-defs.md
index bd22a5149614..d8562d20b420 100644
--- a/docs/docs/reference/experimental/erased-defs.md
+++ b/docs/_docs/reference/experimental/erased-defs.md
@@ -1,14 +1,17 @@
 ---
 layout: doc-page
 title: "Erased Definitions"
+movedTo: https://docs.scala-lang.org/scala3/reference/experimental/erased-defs.html
 ---
 
 `erased` is a modifier that expresses that some definition or expression is erased by the compiler instead of being represented in the compiled output. It is not yet part of the Scala language standard. To enable `erased`, turn on the language feature
-`experimental.erasedDefinitions`. This can be done with a language import
+[`experimental.erasedDefinitions`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$experimental$$erasedDefinitions$.html). This can be done with a language import
 ```scala
 import scala.language.experimental.erasedDefinitions
 ```
 or by setting the command line option `-language:experimental.erasedDefinitions`.
+Erased definitions must be in an experimental scope (see [Experimental definitions](../other-new-features/experimental-defs.md)).
+
 ## Why erased terms?
 
 Let's describe the motivation behind erased terms with an example. In the
@@ -27,10 +30,10 @@ final class Off extends State
 @implicitNotFound("State must be Off")
 class IsOff[S <: State]
 object IsOff:
-   given isOff: IsOff[Off] = new IsOff[Off]
+  given isOff: IsOff[Off] = new IsOff[Off]
 
 class Machine[S <: State]:
-   def turnedOn(using IsOff[S]): Machine[On] = new Machine[On]
+  def turnedOn(using IsOff[S]): Machine[On] = new Machine[On]
 
 val m = new Machine[Off]
 m.turnedOn
@@ -57,7 +60,7 @@ in front of a parameter list (like `given`).
 def methodWithErasedEv(erased ev: Ev): Int = 42
 
 val lambdaWithErasedEv: erased Ev => Int =
-   (erased ev: Ev) => 42
+  (erased ev: Ev) => 42
 ```
 
 `erased` parameters will not be usable for computations, though they can be used
@@ -65,10 +68,10 @@ as arguments to other `erased` parameters.
 
 ```scala
 def methodWithErasedInt1(erased i: Int): Int =
-   i + 42 // ERROR: can not use i
+  i + 42 // ERROR: can not use i
 
 def methodWithErasedInt2(erased i: Int): Int =
-   methodWithErasedInt1(i) // OK
+  methodWithErasedInt1(i) // OK
 ```
 
 Not only parameters can be marked as erased, `val` and `def` can also be marked
@@ -125,37 +128,37 @@ final class Off extends State
 @implicitNotFound("State must be Off")
 class IsOff[S <: State]
 object IsOff:
-   // will not be called at runtime for turnedOn, the
-   // compiler will only require that this evidence exists
-   given IsOff[Off] = new IsOff[Off]
+  // will not be called at runtime for turnedOn, the
+  // compiler will only require that this evidence exists
+  given IsOff[Off] = new IsOff[Off]
 
 @implicitNotFound("State must be On")
 class IsOn[S <: State]
 object IsOn:
-   // will not exist at runtime, the compiler will only
-   // require that this evidence exists at compile time
-   erased given IsOn[On] = new IsOn[On]
+  // will not exist at runtime, the compiler will only
+  // require that this evidence exists at compile time
+  erased given IsOn[On] = new IsOn[On]
 
 class Machine[S <: State] private ():
-   // ev will disappear from both functions
-   def turnedOn(using erased ev: IsOff[S]): Machine[On] = new Machine[On]
-   def turnedOff(using erased ev: IsOn[S]): Machine[Off] = new Machine[Off]
+  // ev will disappear from both functions
+  def turnedOn(using erased ev: IsOff[S]): Machine[On] = new Machine[On]
+  def turnedOff(using erased ev: IsOn[S]): Machine[Off] = new Machine[Off]
 
 object Machine:
-   def newMachine(): Machine[Off] = new Machine[Off]
+  def newMachine(): Machine[Off] = new Machine[Off]
 
 @main def test =
-   val m = Machine.newMachine()
-   m.turnedOn
-   m.turnedOn.turnedOff
+  val m = Machine.newMachine()
+  m.turnedOn
+  m.turnedOn.turnedOff
 
-   // m.turnedOff
-   //            ^
-   //            State must be On
+  // m.turnedOff
+  //            ^
+  //            State must be On
 
-   // m.turnedOn.turnedOn
-   //                    ^
-   //                    State must be Off
+  // m.turnedOn.turnedOn
+  //                    ^
+  //                    State must be Off
 ```
 
 Note that in [Inline](../metaprogramming/inline.md) we discussed `erasedValue` and inline
@@ -170,27 +173,27 @@ final class On extends State
 final class Off extends State
 
 class Machine[S <: State]:
-   transparent inline def turnOn(): Machine[On] =
-      inline erasedValue[S] match
-         case _: Off => new Machine[On]
-         case _: On  => error("Turning on an already turned on machine")
+  transparent inline def turnOn(): Machine[On] =
+    inline erasedValue[S] match
+      case _: Off => new Machine[On]
+      case _: On  => error("Turning on an already turned on machine")
 
-   transparent inline def turnOff(): Machine[Off] =
-      inline erasedValue[S] match
-         case _: On  => new Machine[Off]
-         case _: Off => error("Turning off an already turned off machine")
+  transparent inline def turnOff(): Machine[Off] =
+    inline erasedValue[S] match
+      case _: On  => new Machine[Off]
+      case _: Off => error("Turning off an already turned off machine")
 
 object Machine:
-   def newMachine(): Machine[Off] =
-      println("newMachine")
-      new Machine[Off]
+  def newMachine(): Machine[Off] =
+    println("newMachine")
+    new Machine[Off]
 end Machine
 
 @main def test =
-   val m = Machine.newMachine()
-   m.turnOn()
-   m.turnOn().turnOff()
-   m.turnOn().turnOn() // error: Turning on an already turned on machine
+  val m = Machine.newMachine()
+  m.turnOn()
+  m.turnOn().turnOff()
+  m.turnOn().turnOn() // error: Turning on an already turned on machine
 ```
 
 ## Erased Classes
diff --git a/docs/docs/reference/other-new-features/explicit-nulls.md b/docs/_docs/reference/experimental/explicit-nulls.md
similarity index 78%
rename from docs/docs/reference/other-new-features/explicit-nulls.md
rename to docs/_docs/reference/experimental/explicit-nulls.md
index 1eb245fd1cec..ebdb3356d99e 100644
--- a/docs/docs/reference/other-new-features/explicit-nulls.md
+++ b/docs/_docs/reference/experimental/explicit-nulls.md
@@ -1,10 +1,11 @@
 ---
 layout: doc-page
 title: "Explicit Nulls"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/explicit-nulls.html
 ---
 
 Explicit nulls is an opt-in feature that modifies the Scala type system, which makes reference types
-(anything that extends `AnyRef`) _non-nullable_.
+(anything that extends [`AnyRef`](https://scala-lang.org/api/3.x/scala/AnyRef.html)) _non-nullable_.
 
 This means the following code will no longer typecheck:
 
@@ -35,7 +36,7 @@ When explicit nulls are enabled, the type hierarchy changes so that `Null` is on
 
 This is the new type hierarchy:
 
-!["Type Hierarchy for Explicit Nulls"](/images/explicit-nulls/explicit-nulls-type-hierarchy.png)
+!["Type Hierarchy for Explicit Nulls"](images/explicit-nulls/explicit-nulls-type-hierarchy.png)
 
 After erasure, `Null` remains a subtype of all reference types (as forced by the JVM).
 
@@ -58,7 +59,7 @@ So far, we have found the following useful:
 
   Don't use `.nn` on mutable variables directly, because it may introduce an unknown type into the type of the variable.
 
-- An `unsafeNulls` language feature.
+- An [`unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html) language feature.
 
   When imported, `T | Null` can be used as `T`, similar to regular Scala (without explicit nulls).
 
@@ -72,8 +73,8 @@ The unsoundness happens because uninitialized fields in a class start out as `nu
 
 ```scala
 class C:
-   val f: String = foo(f)
-   def foo(f2: String): String = f2
+  val f: String = foo(f)
+  def foo(f2: String): String = f2
 
 val c = new C()
 // c.f == "field is null"
@@ -123,8 +124,8 @@ We illustrate the rules with following examples:
 
   ```java
   class C {
-     String s;
-     int x;
+    String s;
+    int x;
   }
   ```
 
@@ -132,8 +133,8 @@ We illustrate the rules with following examples:
 
   ```scala
   class C:
-     val s: String | Null
-     val x: Int
+    val s: String | Null
+    val x: Int
   ```
 
 - We nullify type parameters because in Java a type parameter is always nullable, so the following code compiles.
@@ -152,8 +153,8 @@ We illustrate the rules with following examples:
 
   ```scala
   class InScala:
-     val c: C[Bool] = ???  // C as above
-     val b: Bool = c.foo() // no longer typechecks, since foo now returns Bool | Null
+    val c: C[Bool] = ???  // C as above
+    val b: Bool = c.foo() // no longer typechecks, since foo now returns Bool | Null
   ```
 
 - We can reduce the number of redundant nullable types we need to add. Consider
@@ -193,8 +194,8 @@ We illustrate the rules with following examples:
 
   ```scala
   class BoxFactory[T]:
-     def makeBox(): Box[T | Null] | Null
-     def makeCrazyBoxes(): java.util.List[Box[java.util.List[T] | Null]] | Null
+    def makeBox(): Box[T | Null] | Null
+    def makeCrazyBoxes(): java.util.List[Box[java.util.List[T] | Null]] | Null
   ```
 
   In this case, since `Box` is Scala-defined, we will get `Box[T | Null] | Null`.
@@ -209,11 +210,11 @@ We illustrate the rules with following examples:
 
   ```java
   class Constants {
-     final String NAME = "name";
-     final int AGE = 0;
-     final char CHAR = 'a';
+    final String NAME = "name";
+    final int AGE = 0;
+    final char CHAR = 'a';
 
-     final String NAME_GENERATED = getNewName();
+    final String NAME_GENERATED = getNewName();
   }
   ```
 
@@ -221,11 +222,11 @@ We illustrate the rules with following examples:
 
   ```scala
   class Constants:
-     val NAME: String("name") = "name"
-     val AGE: Int(0) = 0
-     val CHAR: Char('a') = 'a'
+    val NAME: String("name") = "name"
+    val AGE: Int(0) = 0
+    val CHAR: Char('a') = 'a'
 
-     val NAME_GENERATED: String | Null = getNewName()
+    val NAME_GENERATED: String | Null = getNewName()
   ```
 
 - We don't append `Null` to a field nor to a return type of a method which is annotated with a
@@ -233,9 +234,9 @@ We illustrate the rules with following examples:
 
   ```java
   class C {
-     @NotNull String name;
-     @NotNull List<String> getNames(String prefix); // List is Java-defined
-     @NotNull Box<String> getBoxedName(); // Box is Scala-defined
+    @NotNull String name;
+    @NotNull List<String> getNames(String prefix); // List is Java-defined
+    @NotNull Box<String> getBoxedName(); // Box is Scala-defined
   }
   ```
 
@@ -243,9 +244,9 @@ We illustrate the rules with following examples:
 
   ```scala
   class C:
-     val name: String
-     def getNames(prefix: String | Null): java.util.List[String] // we still need to nullify the paramter types
-     def getBoxedName(): Box[String | Null] // we don't append `Null` to the outmost level, but we still need to nullify inside
+    val name: String
+    def getNames(prefix: String | Null): java.util.List[String] // we still need to nullify the paramter types
+    def getBoxedName(): Box[String | Null] // we don't append `Null` to the outmost level, but we still need to nullify inside
   ```
 
   The annotation must be from the list below to be recognized as `NotNull` by the compiler.
@@ -276,7 +277,7 @@ We illustrate the rules with following examples:
 
 ### Override check
 
-When we check overriding between Scala classes and Java classes, the rules are relaxed for `Null` type with this feature, in order to help users to working with Java libraries.
+When we check overriding between Scala classes and Java classes, the rules are relaxed for [`Null`](https://scala-lang.org/api/3.x/scala/Null.html) type with this feature, in order to help users to working with Java libraries.
 
 Suppose we have Java method `String f(String x)`, we can override this method in Scala in any of the following forms:
 
@@ -304,7 +305,7 @@ Example:
 ```scala
 val s: String | Null = ???
 if s != null then
-   // s: String
+  // s: String
 
 // s: String | Null
 
@@ -316,9 +317,9 @@ A similar inference can be made for the `else` case if the test is `p == null`
 
 ```scala
 if s == null then
-   // s: String | Null
+  // s: String | Null
 else
-   // s: String
+  // s: String
 ```
 
 `==` and `!=` is considered a comparison for the purposes of the flow inference.
@@ -331,15 +332,15 @@ We also support logical operators (`&&`, `||`, and `!`):
 val s: String | Null = ???
 val s2: String | Null = ???
 if s != null && s2 != null then
-   // s: String
-   // s2: String
+  // s: String
+  // s2: String
 
 if s == null || s2 == null then
-   // s: String | Null
-   // s2: String | Null
+  // s: String | Null
+  // s2: String | Null
 else
-   // s: String
-   // s2: String
+  // s: String
+  // s2: String
 ```
 
 ### Inside Conditions
@@ -350,12 +351,12 @@ We also support type specialization _within_ the condition, taking into account
 val s: String | Null = ???
 
 if s != null && s.length > 0 then // s: String in `s.length > 0`
-   // s: String
+  // s: String
 
 if s == null || s.length > 0 then // s: String in `s.length > 0`
-   // s: String | Null
+  // s: String | Null
 else
-   // s: String
+  // s: String
 ```
 
 ### Match Case
@@ -366,8 +367,8 @@ The non-null cases can be detected in match statements.
 val s: String | Null = ???
 
 s match
-   case _: String => // s: String
-   case _ =>
+  case _: String => // s: String
+  case _ =>
 ```
 
 ### Mutable Variable
@@ -380,13 +381,13 @@ class C(val x: Int, val next: C | Null)
 var xs: C | Null = C(1, C(2, null))
 // xs is trackable, since all assignments are in the same method
 while xs != null do
-   // xs: C
-   val xsx: Int = xs.x
-   val xscpy: C = xs
-   xs = xscpy // since xscpy is non-null, xs still has type C after this line
-   // xs: C
-   xs = xs.next // after this assignment, xs can be null again
-   // xs: C | Null
+  // xs: C
+  val xsx: Int = xs.x
+  val xscpy: C = xs
+  xs = xscpy // since xscpy is non-null, xs still has type C after this line
+  // xs: C
+  xs = xs.next // after this assignment, xs can be null again
+  // xs: C | Null
 ```
 
 When dealing with local mutable variables, there are two questions:
@@ -399,7 +400,7 @@ When dealing with local mutable variables, there are two questions:
    ```scala
    var x: String | Null = ???
    def y =
-      x = null
+     x = null
 
    if x != null then
       // y can be called here, which would break the fact
@@ -416,16 +417,16 @@ When dealing with local mutable variables, there are two questions:
    ```scala
    var x: String | Null = ???
    def y =
-      if x != null then
-         // not safe to use the fact (x != null) here
-         // since y can be executed at the same time as the outer block
-         val _: String = x
+     if x != null then
+       // not safe to use the fact (x != null) here
+       // since y can be executed at the same time as the outer block
+       val _: String = x
    if x != null then
-      val a: String = x // ok to use the fact here
-      x = null
+     val a: String = x // ok to use the fact here
+     x = null
    ```
 
-See [more examples](https://github.com/lampepfl/dotty/blob/master/tests/explicit-nulls/neg/flow-varref-in-closure.scala).
+See [more examples](https://github.com/lampepfl/dotty/blob/main/tests/explicit-nulls/neg/flow-varref-in-closure.scala).
 
 Currently, we are unable to track paths with a mutable variable prefix.
 For example, `x.a` if `x` is mutable.
@@ -441,16 +442,16 @@ We don't support:
   val s: String | Null = ???
   val s2: String | Null = ???
   if s != null && s == s2 then
-     // s:  String inferred
-     // s2: String not inferred
+    // s:  String inferred
+    // s2: String not inferred
   ```
 
 ### UnsafeNulls
 
-It is difficult to work with many nullable values, we introduce a language feature `unsafeNulls`.
+It is difficult to work with many nullable values, we introduce a language feature [`unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html).
 Inside this "unsafe" scope, all `T | Null` values can be used as `T`.
 
-Users can import `scala.language.unsafeNulls` to create such scopes, or use `-language:unsafeNulls` to enable this feature globally (for migration purpose only).
+Users can import [`scala.language.unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html) to create such scopes, or use `-language:unsafeNulls` to enable this feature globally (for migration purpose only).
 
 Assume `T` is a reference type (a subtype of `AnyRef`), the following unsafe operation rules are
 applied in this unsafe-nulls scope:
@@ -469,7 +470,7 @@ can be used as `T2` if `T1` is a subtype of `T2` using regular subtyping rules
 
 Addtionally, `null` can be used as `AnyRef` (`Object`), which means you can select `.eq` or `.toString` on it.
 
-The program in `unsafeNulls` will have a **similar** semantic as regular Scala, but not **equivalent**.
+The program in [`unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html) will have a **similar** semantic as regular Scala, but not **equivalent**.
 
 For example, the following code cannot be compiled even using unsafe nulls. Because of the
 Java interoperation, the type of the get method becomes `T | Null`.
@@ -482,7 +483,7 @@ Since the compiler doesn’t know whether `T` is a reference type, it is unable
 to `T`. A `.nn` need to be inserted after `xs.get(0)` by user manually to fix the error, which
 strips the `Null` from its type.
 
-The intention of this `unsafeNulls` is to give users a better migration path for explicit nulls.
+The intention of this [`unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html) is to give users a better migration path for explicit nulls.
 Projects for Scala 2 or regular Scala 3 can try this by adding `-Yexplicit-nulls -language:unsafeNulls`
 to the compile options. A small number of manual modifications are expected. To migrate to the full
 explicit nulls feature in the future, `-language:unsafeNulls` can be dropped and add
@@ -513,9 +514,9 @@ class C[T >: Null <: String] // define a type bound with unsafe conflict bound
 val n = nullOf[String] // apply a type bound unsafely
 ```
 
-Without the `unsafeNulls`, all these unsafe operations will not be type-checked.
+Without the [`unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html), all these unsafe operations will not be type-checked.
 
-`unsafeNulls` also works for extension methods and implicit search.
+[`unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html) also works for extension methods and implicit search.
 
 ```scala
 import scala.language.unsafeNulls
@@ -534,4 +535,4 @@ Our strategy for binary compatibility with Scala binaries that predate explicit
 and new libraries compiled without `-Yexplicit-nulls` is to leave the types unchanged
 and be compatible but unsound.
 
-[More details](../../internals/explicit-nulls.md)
+[More details](https://dotty.epfl.ch/docs/internals/explicit-nulls.html)
diff --git a/docs/docs/reference/other-new-features/named-typeargs-spec.md b/docs/_docs/reference/experimental/named-typeargs-spec.md
similarity index 82%
rename from docs/docs/reference/other-new-features/named-typeargs-spec.md
rename to docs/_docs/reference/experimental/named-typeargs-spec.md
index f56f97d89100..7bf5c2f43ccf 100644
--- a/docs/docs/reference/other-new-features/named-typeargs-spec.md
+++ b/docs/_docs/reference/experimental/named-typeargs-spec.md
@@ -1,8 +1,11 @@
 ---
 layout: doc-page
 title: "Named Type Arguments - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/experimental/named-typeargs-spec.html
 ---
 
+In this section we give more details about the [named type arguments](named-typeargs.md) (*experimental*).
+
 ## Syntax
 
 The addition to the grammar is:
@@ -20,7 +23,7 @@ Note in particular that named arguments cannot be passed to type constructors:
 class C[T]
 
 val x: C[T = Int] = // error
-   new C[T = Int] // error
+  new C[T = Int] // error
 
 class E extends C[T = Int] // error
 ```
diff --git a/docs/docs/reference/other-new-features/named-typeargs.md b/docs/_docs/reference/experimental/named-typeargs.md
similarity index 88%
rename from docs/docs/reference/other-new-features/named-typeargs.md
rename to docs/_docs/reference/experimental/named-typeargs.md
index e9a67b0368dd..b9b4f7f33d69 100644
--- a/docs/docs/reference/other-new-features/named-typeargs.md
+++ b/docs/_docs/reference/experimental/named-typeargs.md
@@ -1,6 +1,8 @@
 ---
 layout: doc-page
 title: "Named Type Arguments"
+redirectFrom: reference/other-new-features/named-typeargs.html
+movedTo: https://docs.scala-lang.org/scala3/reference/experimental/named-typeargs.html
 ---
 
 **Note:** This feature is implemented in Scala 3, but is not expected to be part of Scala 3.0.
diff --git a/docs/_docs/reference/experimental/numeric-literals.md b/docs/_docs/reference/experimental/numeric-literals.md
new file mode 100644
index 000000000000..56684d2722d5
--- /dev/null
+++ b/docs/_docs/reference/experimental/numeric-literals.md
@@ -0,0 +1,257 @@
+---
+layout: doc-page
+title: "Numeric Literals"
+movedTo: https://docs.scala-lang.org/scala3/reference/experimental/numeric-literals.html
+---
+
+**Note**: This feature is not yet part of the Scala 3 language definition. It can be made available by a language import:
+
+```scala
+import scala.language.experimental.genericNumberLiterals
+```
+
+In Scala 2, numeric literals were confined to the primitive numeric types `Int`, `Long`, `Float`, and `Double`. Scala 3 allows to write numeric literals also for user-defined types. Example:
+
+```scala
+val x: Long = -10_000_000_000
+val y: BigInt = 0x123_abc_789_def_345_678_901
+val z: BigDecimal = 110_222_799_799.99
+
+(y: BigInt) match
+  case 123_456_789_012_345_678_901 =>
+```
+
+The syntax of numeric literals is the same as before, except there are no pre-set limits
+how large they can be.
+
+## Meaning of Numeric Literals
+
+The meaning of a numeric literal is determined as follows:
+
+- If the literal ends with `l` or `L`, it is a `Long` integer (and must fit in its legal range).
+- If the literal ends with `f` or `F`, it is a single precision floating point number of type `Float`.
+- If the literal ends with `d` or `D`, it is a double precision floating point number of type `Double`.
+
+In each of these cases the conversion to a number is exactly as in Scala 2 or in Java. If a numeric literal does _not_ end in one of these suffixes, its meaning is determined by the expected type:
+
+1. If the expected type is `Int`, `Long`, `Float`, or `Double`, the literal is
+   treated as a standard literal of that type.
+2. If the expected type is a fully defined type `T` that has a given instance of type
+   [`scala.util.FromDigits[T]`](https://scala-lang.org/api/3.x/scala/util/FromDigits.html), the literal is converted to a value of type `T` by passing it as an argument to
+   the `fromDigits` method of that instance (more details below).
+3. Otherwise, the literal is treated as a `Double` literal (if it has a decimal point or an
+   exponent), or as an `Int` literal (if not). (This last possibility is again as in Scala 2 or Java.)
+
+With these rules, the definition
+
+```scala
+val x: Long = -10_000_000_000
+```
+
+is legal by rule (1), since the expected type is `Long`. The definitions
+
+```scala
+val y: BigInt = 0x123_abc_789_def_345_678_901
+val z: BigDecimal = 111222333444.55
+```
+
+are legal by rule (2), since both `BigInt` and `BigDecimal` have [`FromDigits`](https://scala-lang.org/api/3.x/scala/util/FromDigits.html) instances (which implement the `FromDigits` subclasses [`FromDigits.WithRadix`](https://scala-lang.org/api/3.x/scala/util/FromDigits$$WithRadix.html) and [`FromDigits.Decimal`](https://scala-lang.org/api/3.x/scala/util/FromDigits$$Decimal.html), respectively). On the other hand,
+
+```scala
+val x = -10_000_000_000
+```
+
+gives a type error, since without an expected type `-10_000_000_000` is treated by rule (3) as an `Int` literal, but it is too large for that type.
+
+## The `FromDigits` Trait
+
+To allow numeric literals, a type simply has to define a `given` instance of the
+[`scala.util.FromDigits`](https://scala-lang.org/api/3.x/scala/util/FromDigits.html) type class, or one of its subclasses. `FromDigits` is defined as follows:
+
+```scala
+trait FromDigits[T]:
+  def fromDigits(digits: String): T
+```
+
+Implementations of the `fromDigits` convert strings of digits to the values of the
+implementation type `T`.
+The `digits` string consists of digits between `0` and `9`, possibly preceded by a
+sign ("+" or "-"). Number separator characters `_` are filtered out before
+the string is passed to `fromDigits`.
+
+The companion object [`FromDigits`](https://scala-lang.org/api/3.x/scala/util/FromDigits$.html) also defines subclasses of `FromDigits` for whole numbers with a given radix, for numbers with a decimal point, and for numbers that can have both a decimal point and an exponent:
+
+```scala
+object FromDigits:
+
+  /** A subclass of `FromDigits` that also allows to convert whole
+   *  number literals with a radix other than 10
+   */
+  trait WithRadix[T] extends FromDigits[T]:
+    def fromDigits(digits: String): T = fromDigits(digits, 10)
+    def fromDigits(digits: String, radix: Int): T
+
+  /** A subclass of `FromDigits` that also allows to convert number
+   *  literals containing a decimal point ".".
+   */
+  trait Decimal[T] extends FromDigits[T]
+
+  /** A subclass of `FromDigits`that allows also to convert number
+   *  literals containing a decimal point "." or an
+   *  exponent `('e' | 'E')['+' | '-']digit digit*`.
+   */
+  trait Floating[T] extends Decimal[T]
+```
+
+A user-defined number type can implement one of those, which signals to the compiler
+that hexadecimal numbers, decimal points, or exponents are also accepted in literals
+for this type.
+
+## Error Handling
+
+`FromDigits` implementations can signal errors by throwing exceptions of some subtype
+of [`FromDigitsException`](https://scala-lang.org/api/3.x/scala/util/FromDigits$$FromDigitsException.html). `FromDigitsException` is defined with three subclasses in the
+`FromDigits` object as follows:
+
+```scala
+abstract class FromDigitsException(msg: String) extends NumberFormatException(msg)
+
+class NumberTooLarge (msg: String = "number too large")         extends FromDigitsException(msg)
+class NumberTooSmall (msg: String = "number too small")         extends FromDigitsException(msg)
+class MalformedNumber(msg: String = "malformed number literal") extends FromDigitsException(msg)
+```
+
+## Example
+
+As a fully worked out example, here is an implementation of a new numeric class, `BigFloat`, that accepts numeric literals. `BigFloat` is defined in terms of a `BigInt` mantissa and an `Int` exponent:
+
+```scala
+case class BigFloat(mantissa: BigInt, exponent: Int):
+  override def toString = s"${mantissa}e${exponent}"
+```
+
+`BigFloat` literals can have a decimal point as well as an exponent. E.g. the following expression
+should produce the `BigFloat` number `BigFloat(-123, 997)`:
+
+```scala
+-0.123E+1000: BigFloat
+```
+
+The companion object of `BigFloat` defines an `apply` constructor method to construct a `BigFloat`
+from a `digits` string. Here is a possible implementation:
+
+```scala
+object BigFloat:
+  import scala.util.FromDigits
+
+  def apply(digits: String): BigFloat =
+    val (mantissaDigits, givenExponent) =
+      digits.toUpperCase.split('E') match
+        case Array(mantissaDigits, edigits) =>
+          val expo =
+            try FromDigits.intFromDigits(edigits)
+            catch case ex: FromDigits.NumberTooLarge =>
+              throw FromDigits.NumberTooLarge(s"exponent too large: $edigits")
+          (mantissaDigits, expo)
+        case Array(mantissaDigits) =>
+          (mantissaDigits, 0)
+    val (intPart, exponent) =
+      mantissaDigits.split('.') match
+        case Array(intPart, decimalPart) =>
+          (intPart ++ decimalPart, givenExponent - decimalPart.length)
+        case Array(intPart) =>
+          (intPart, givenExponent)
+    BigFloat(BigInt(intPart), exponent)
+```
+
+To accept `BigFloat` literals, all that's needed in addition is a `given` instance of type
+`FromDigits.Floating[BigFloat]`:
+
+```scala
+  given FromDigits: FromDigits.Floating[BigFloat] with
+    def fromDigits(digits: String) = apply(digits)
+end BigFloat
+```
+
+Note that the `apply` method does not check the format of the `digits` argument. It is
+assumed that only valid arguments are passed. For calls coming from the compiler
+that assumption is valid, since the compiler will first check whether a numeric
+literal has the correct format before it gets passed on to a conversion method.
+
+## Compile-Time Errors
+
+With the setup of the previous section, a literal like
+
+```scala
+1e10_0000_000_000: BigFloat
+```
+
+would be expanded by the compiler to
+
+```scala
+BigFloat.FromDigits.fromDigits("1e100000000000")
+```
+
+Evaluating this expression throws a [`NumberTooLarge`](https://scala-lang.org/api/3.x/scala/util/FromDigits$$NumberTooLarge.html) exception at run time. We would like it to
+produce a compile-time error instead. We can achieve this by tweaking the `BigFloat` class
+with a small dose of metaprogramming. The idea is to turn the `fromDigits` method
+into a macro, i.e. make it an inline method with a splice as right-hand side.
+To do this, replace the `FromDigits` instance in the `BigFloat` object by the following two definitions:
+
+```scala
+object BigFloat:
+  ...
+
+  class FromDigits extends FromDigits.Floating[BigFloat]:
+    def fromDigits(digits: String) = apply(digits)
+
+  given FromDigits with
+    override inline def fromDigits(digits: String) = ${
+      fromDigitsImpl('digits)
+    }
+```
+
+Note that an inline method cannot directly fill in for an abstract method, since it produces
+no code that can be executed at runtime. That is why we define an intermediary class
+`FromDigits` that contains a fallback implementation which is then overridden by the inline
+method in the `FromDigits` given instance. That method is defined in terms of a macro
+implementation method `fromDigitsImpl`. Here is its definition:
+
+```scala
+  private def fromDigitsImpl(digits: Expr[String])(using ctx: Quotes): Expr[BigFloat] =
+    digits.value match
+      case Some(ds) =>
+        try
+          val BigFloat(m, e) = apply(ds)
+          '{BigFloat(${Expr(m)}, ${Expr(e)})}
+        catch case ex: FromDigits.FromDigitsException =>
+          ctx.error(ex.getMessage)
+          '{BigFloat(0, 0)}
+      case None =>
+        '{apply($digits)}
+end BigFloat
+```
+
+The macro implementation takes an argument of type `Expr[String]` and yields
+a result of type `Expr[BigFloat]`. It tests whether its argument is a constant
+string. If that is the case, it converts the string using the `apply` method
+and lifts the resulting `BigFloat` back to `Expr` level. For non-constant
+strings `fromDigitsImpl(digits)` is simply `apply(digits)`, i.e. everything is
+evaluated at runtime in this case.
+
+The interesting part is the `catch` part of the case where `digits` is constant.
+If the `apply` method throws a `FromDigitsException`, the exception's message is issued as a compile time error in the `ctx.error(ex.getMessage)` call.
+
+With this new implementation, a definition like
+
+```scala
+val x: BigFloat = 1234.45e3333333333
+```
+
+would give a compile time error message:
+
+```scala
+3 |  val x: BigFloat = 1234.45e3333333333
+  |                    ^^^^^^^^^^^^^^^^^^
+  |                    exponent too large: 3333333333
+```
diff --git a/docs/_docs/reference/experimental/overview.md b/docs/_docs/reference/experimental/overview.md
new file mode 100644
index 000000000000..2644de0d864e
--- /dev/null
+++ b/docs/_docs/reference/experimental/overview.md
@@ -0,0 +1,28 @@
+---
+layout: doc-page
+title: "Overview"
+movedTo: https://docs.scala-lang.org/scala3/reference/experimental/overview.html
+---
+
+### Experimental language features
+
+All experimental language features can be found under the `scala.language.experimental` package.
+They are enabled by importing the feature or using the `-language` compiler flag.
+
+* [`erasedDefinitions`](./erased-defs.md): Enable support for `erased` modifier.
+* `fewerBraces`: Enable support for using indentation for arguments.
+* [`genericNumberLiterals`](./numeric-literals.md): Enable support for generic number literals.
+* [`namedTypeArguments`](./named-typeargs.md): Enable support for named type arguments
+* [`saferExceptions`](./canthrow.md): Enable support for checked exceptions.
+
+### Experimental language imports
+
+In general, experimental language features can be imported in an experimental scope (see [experimental definitions](../other-new-features/experimental-defs.md).
+They can be imported at the top-level if all top-level definitions are @experimental.
+
+### Experimental language features supported by special compiler options
+
+Some experimental language features that are still in research and development can be enabled with special compiler options. These include
+
+* [`-Yexplicit-nulls`](./explicit-nulls.md). Enable support for tracking null references in the type system.
+
diff --git a/docs/docs/reference/features-classification.md b/docs/_docs/reference/features-classification.md
similarity index 99%
rename from docs/docs/reference/features-classification.md
rename to docs/_docs/reference/features-classification.md
index 6196394b572a..21da1dfc065a 100644
--- a/docs/docs/reference/features-classification.md
+++ b/docs/_docs/reference/features-classification.md
@@ -1,8 +1,7 @@
 ---
 layout: doc-page
 title: "A Classification of Proposed Language Features"
-date: April 6, 2019
-author: Martin Odersky
+movedTo: https://docs.scala-lang.org/scala3/reference/features-classification.html
 ---
 
 This document provides an overview of the constructs proposed for Scala 3 with the aim to facilitate the discussion what to include and when to include it. It classifies features into eight groups: (1) essential foundations, (2) simplifications, (3) restrictions, (4) dropped features, (5) changed features, (6) new features, (7) features oriented towards metaprogramming with the aim to replace existing macros, and (8) changes to type checking and inference.
diff --git a/docs/_docs/reference/language-versions/binary-compatibility.md b/docs/_docs/reference/language-versions/binary-compatibility.md
new file mode 100644
index 000000000000..a25a4203fd6b
--- /dev/null
+++ b/docs/_docs/reference/language-versions/binary-compatibility.md
@@ -0,0 +1,36 @@
+---
+layout: doc-page
+title: "Binary Compatibility"
+---
+
+In Scala 2 different minor versions of the compiler were free to change the way how they encode different language features in JVM bytecode so each bump of the compiler's minor version resulted in breaking binary compatibility and if a project had any Scala dependencies they all needed to be (cross-)compiled to the same minor Scala version that was used in that project itself. On the contrary, Scala 3 has a stable encoding into JVM bytecode.
+
+In addition to classfiles the compilation process in Scala 3 also produces files with `.tasty` extension. The [TASTy](https://docs.scala-lang.org/scala3/guides/tasty-overview.html) format is an intermediate representation of Scala code containing full information about sources together with information provided by the typer. Some of this information is lost during generation of bytecode so Scala 3 compilers read TASTy files during compilation in addition to classfiles to know the exact types of values, methods, etc. in already compiled classes (although compilation from TASTy files only is also possible). TASTy files are also typically distributed together with classfiles in published artifacts.
+
+TASTy format is extensible but it preserves backward compatibility and the evolution happens between minor releases of the language. This means a Scala compiler in version `3.x1.y1` is able to read TASTy files produced by another compiler in version `3.x2.y2` if `x1 >= x2` (assuming two stable versions of the compiler are considered - `SNAPSHOT` or `NIGHTLY` compiler versions can read TASTy in an older stable format but their TASTY versions are not compatible between each other even if the compilers have the same minor version; also compilers in stable versions cannot read TASTy generated by an unstable version).
+
+TASTy version number has the format of `<major_version>.<minor_version>-<experimental_version>` and the numbering changes in parallel to language releases in such a way that a bump in language minor version corresponds to a bump in TASTy minor version (e.g. for Scala `3.0.0` the TASTy version is `28.0-0`). Experimental version set to 0 signifies a stable version while others are considered unstable/experimental. TASTy version is not strictly bound to the data format itself - any changes to the API of the standard library also require a change in TASTy minor version.
+
+Being able to bump the compiler version in a project without having to wait for all of its dependencies to do the same is already a big leap forward when compared to Scala 2. However, we might still try to do better, especially from the perspective of authors of libraries.
+If you maintain a library and you would like it to be usable as a dependency for all Scala 3 projects, you would have to always emit TASTy in a version that would be readble by everyone, which would normally mean getting stuck at 3.0.x forever.
+
+To solve this problem a new experimental compiler flag `-Yscala-release <release-version>` (available since 3.1.2-RC1) has been added. Setting this flag makes the compiler produce TASTy files that should be possible to use by all Scala 3 compilers in version `<release-version>` or newer (this flag was inspired by how `-release` works for specifying the target version of JDK). More specifically this enforces emitting TASTy files in an older format ensuring that:
+* the code contains no references to parts of the standard library which were added to the API after `<release-version>` and would crash at runtime when a program is executed with the older version of the standard library on the classpath
+* no dependency found on the classpath during compilation (except for the standard library itself) contains TASTy files produced by a compiler newer than `<release-version>` (otherwise they could potentially leak such disallowed references to the standard library).
+
+If any of the checks above is not fulfilled or for any other reason older TASTy cannot be emitted (e.g. the code uses some new language features which cannot be expressed the the older format) the entire compilation fails (with errors reported for each of such issues).
+
+As this feature is experimental it does not have any special support in build tools yet (at least not in sbt 1.6.1 or lower).
+E.g. when a project gets compiled with Scala compiler `3.x1.y1` and `-Yscala-release 3.x2` option and then published using sbt
+then the standard library in version `3.x1.y1` gets added to the project's dependencies instead of `3.x2.y2`.
+When the dependencies are added to the classpath during compilation with Scala `3.x2.y2` the compiler will crash while trying to read TASTy files in the newer format.
+A currently known workaround is to modify the build definition of the dependent project by explicitly overriding the version of Scala standard library in dependencies, e.g.
+
+```scala
+dependencyOverrides ++= Seq(
+  scalaOrganization.value %% "scala3-library" % scalaVersion.value,
+  scalaOrganization.value %% "scala3-library_sjs1" % scalaVersion.value // for Scala.js projects
+)
+```
+
+The behaviour of `-Yscala-release` flag might still change in the future, especially it's not guaranteed that every new version of the compiler would be able to generate TASTy in all older formats going back to the one produced by `3.0.x` compiler.
diff --git a/docs/_docs/reference/language-versions/language-versions.md b/docs/_docs/reference/language-versions/language-versions.md
new file mode 100644
index 000000000000..e98aba32fd34
--- /dev/null
+++ b/docs/_docs/reference/language-versions/language-versions.md
@@ -0,0 +1,6 @@
+---
+layout: doc-page
+title: "Language Versions"
+---
+
+Additional information on interoperability and migration between Scala 2 and 3 can be found [here](https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html).
diff --git a/docs/_docs/reference/language-versions/source-compatibility.md b/docs/_docs/reference/language-versions/source-compatibility.md
new file mode 100644
index 000000000000..029a3674ba73
--- /dev/null
+++ b/docs/_docs/reference/language-versions/source-compatibility.md
@@ -0,0 +1,38 @@
+---
+layout: doc-page
+title: "Source Compatibility"
+movedTo: https://docs.scala-lang.org/scala3/reference/language-versions.html
+---
+
+Scala 3 does NOT guarantee source compatibility between different minor language versions (e.g. some syntax valid in 3.x might get deprecated and then phased out in 3.y for y > x). There are also some syntax structures that were valid in Scala 2 but are not anymore in Scala 3. However the compiler provides a possibility to specify the desired version of syntax used in a particular file or globally for a run of the compiler to make migration between versions easier.
+
+The default Scala language syntax version currently supported by the Dotty compiler is [`3.0`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$3/0$.html). There are also other language versions that can be specified instead:
+
+- [`3.0-migration`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$3/0-migration$.html): Same as `3.0` but with a Scala 2 compatibility mode that helps moving Scala 2.13 sources over to Scala 3. In particular, it
+
+    - flags some Scala 2 constructs that are disallowed in Scala 3 as migration warnings instead of hard errors,
+    - changes some rules to be more lenient and backwards compatible with Scala 2.13
+    - gives some additional warnings where the semantics has changed between Scala 2.13 and 3.0
+    - in conjunction with `-rewrite`, offer code rewrites from Scala 2.13 to 3.0.
+
+- [`future`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$future$.html): A preview of changes introduced in the next versions after 3.0. In the doc pages here we refer to the language version with these changes as `3.1`, but it might be that some of these changes will be rolled out in later `3.x` versions.
+
+Some Scala 2 specific idioms will be dropped in this version. The feature set supported by this version will be refined over time  as we approach its release.
+
+- [`future-migration`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$future-migration$.html): Same as `future` but with additional helpers to migrate from `3.0`. Similarly to the helpers available under `3.0-migration`, these include migration warnings and optional rewrites.
+
+There are two ways to specify a language version :
+
+- with a `-source` command line setting, e.g. `-source 3.0-migration`.
+- with a `scala.language` import at the top of a source file, e.g:
+
+```scala
+package p
+import scala.language.`future-migration`
+
+class C { ... }
+```
+
+Language imports supersede command-line settings in the source files where they are specified. Only one language import specifying a source version is allowed in a source file, and it must come before any definitions in that file.
+
+**Note**: The [Scala 3 Migration Guide](https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html) gives further information to help the Scala programmer moving from Scala 2.13 to Scala 3.
diff --git a/docs/_docs/reference/metaprogramming/compiletime-ops.md b/docs/_docs/reference/metaprogramming/compiletime-ops.md
new file mode 100644
index 000000000000..944cdac5389a
--- /dev/null
+++ b/docs/_docs/reference/metaprogramming/compiletime-ops.md
@@ -0,0 +1,294 @@
+---
+layout: doc-page
+title: "Compile-time operations"
+movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/compiletime-ops.html
+---
+
+## The `scala.compiletime` Package
+
+The [`scala.compiletime`](https://scala-lang.org/api/3.x/scala/compiletime.html) package contains helper definitions that provide support for compile-time operations over values. They are described in the following.
+
+### `constValue` and `constValueOpt`
+
+`constValue` is a function that produces the constant value represented by a
+type.
+
+```scala
+import scala.compiletime.constValue
+import scala.compiletime.ops.int.S
+
+transparent inline def toIntC[N]: Int =
+  inline constValue[N] match
+    case 0        => 0
+    case _: S[n1] => 1 + toIntC[n1]
+
+inline val ctwo = toIntC[2]
+```
+
+`constValueOpt` is the same as `constValue`, however returning an `Option[T]`
+enabling us to handle situations where a value is not present. Note that `S` is
+the type of the successor of some singleton type. For example the type `S[1]` is
+the singleton type `2`.
+
+### `erasedValue`
+
+So far we have seen inline methods that take terms (tuples and integers) as
+parameters. What if we want to base case distinctions on types instead? For
+instance, one would like to be able to write a function `defaultValue`, that,
+given a type `T`, returns optionally the default value of `T`, if it exists.
+We can already express this using rewrite match expressions and a simple
+helper function, `scala.compiletime.erasedValue`, which is defined as follows:
+
+```scala
+def erasedValue[T]: T
+```
+
+The `erasedValue` function _pretends_ to return a value of its type argument `T`.
+Calling this function will always result in a compile-time error unless the call
+is removed from the code while inlining.
+
+Using `erasedValue`, we can then define `defaultValue` as follows:
+
+```scala
+import scala.compiletime.erasedValue
+
+transparent inline def defaultValue[T] =
+  inline erasedValue[T] match
+    case _: Byte    => Some(0: Byte)
+    case _: Char    => Some(0: Char)
+    case _: Short   => Some(0: Short)
+    case _: Int     => Some(0)
+    case _: Long    => Some(0L)
+    case _: Float   => Some(0.0f)
+    case _: Double  => Some(0.0d)
+    case _: Boolean => Some(false)
+    case _: Unit    => Some(())
+    case _          => None
+```
+
+Then:
+
+```scala
+val dInt: Some[Int] = defaultValue[Int]
+val dDouble: Some[Double] = defaultValue[Double]
+val dBoolean: Some[Boolean] = defaultValue[Boolean]
+val dAny: None.type = defaultValue[Any]
+```
+
+As another example, consider the type-level version of `toInt` below:
+given a _type_ representing a Peano number,
+return the integer _value_ corresponding to it.
+Consider the definitions of numbers as in the _Inline
+Match_ section above. Here is how `toIntT` can be defined:
+
+```scala
+transparent inline def toIntT[N <: Nat]: Int =
+  inline scala.compiletime.erasedValue[N] match
+    case _: Zero.type => 0
+    case _: Succ[n] => toIntT[n] + 1
+
+inline val two = toIntT[Succ[Succ[Zero.type]]]
+```
+
+`erasedValue` is an `erased` method so it cannot be used and has no runtime
+behavior. Since `toIntT` performs static checks over the static type of `N` we
+can safely use it to scrutinize its return type (`S[S[Z]]` in this case).
+
+### `error`
+
+The `error` method is used to produce user-defined compile errors during inline expansion.
+It has the following signature:
+
+```scala
+inline def error(inline msg: String): Nothing
+```
+
+If an inline expansion results in a call `error(msgStr)` the compiler
+produces an error message containing the given `msgStr`.
+
+```scala
+import scala.compiletime.{error, code}
+
+inline def fail() =
+  error("failed for a reason")
+
+fail() // error: failed for a reason
+```
+
+or
+
+```scala
+inline def fail(p1: => Any) =
+  error(code"failed on: $p1")
+
+fail(identity("foo")) // error: failed on: identity("foo")
+```
+
+### The `scala.compiletime.ops` package
+
+The [`scala.compiletime.ops`](https://scala-lang.org/api/3.x/scala/compiletime/ops.html) package contains types that provide support for
+primitive operations on singleton types. For example,
+`scala.compiletime.ops.int.*` provides support for multiplying two singleton
+`Int` types, and `scala.compiletime.ops.boolean.&&` for the conjunction of two
+`Boolean` types. When all arguments to a type in `scala.compiletime.ops` are
+singleton types, the compiler can evaluate the result of the operation.
+
+```scala
+import scala.compiletime.ops.int.*
+import scala.compiletime.ops.boolean.*
+
+val conjunction: true && true = true
+val multiplication: 3 * 5 = 15
+```
+
+Many of these singleton operation types are meant to be used infix (as in [SLS §3.2.10](https://www.scala-lang.org/files/archive/spec/2.13/03-types.html#infix-types)).
+
+Since type aliases have the same precedence rules as their term-level
+equivalents, the operations compose with the expected precedence rules:
+
+```scala
+import scala.compiletime.ops.int.*
+val x: 1 + 2 * 3 = 7
+```
+
+The operation types are located in packages named after the type of the
+left-hand side parameter: for instance, `scala.compiletime.ops.int.+` represents
+addition of two numbers, while `scala.compiletime.ops.string.+` represents string
+concatenation. To use both and distinguish the two types from each other, a
+match type can dispatch to the correct implementation:
+
+```scala
+import scala.compiletime.ops.*
+
+import scala.annotation.infix
+
+type +[X <: Int | String, Y <: Int | String] = (X, Y) match
+  case (Int, Int) => int.+[X, Y]
+  case (String, String) => string.+[X, Y]
+
+val concat: "a" + "b" = "ab"
+val addition: 1 + 1 = 2
+```
+
+## Summoning Implicits Selectively
+
+It is foreseen that many areas of typelevel programming can be done with rewrite
+methods instead of implicits. But sometimes implicits are unavoidable. The
+problem so far was that the Prolog-like programming style of implicit search
+becomes viral: Once some construct depends on implicit search it has to be
+written as a logic program itself. Consider for instance the problem of creating
+a `TreeSet[T]` or a `HashSet[T]` depending on whether `T` has an `Ordering` or
+not. We can create a set of implicit definitions like this:
+
+```scala
+trait SetFor[T, S <: Set[T]]
+
+class LowPriority:
+  implicit def hashSetFor[T]: SetFor[T, HashSet[T]] = ...
+
+object SetsFor extends LowPriority:
+  implicit def treeSetFor[T: Ordering]: SetFor[T, TreeSet[T]] = ...
+```
+
+Clearly, this is not pretty. Besides all the usual indirection of implicit
+search, we face the problem of rule prioritization where we have to ensure that
+`treeSetFor` takes priority over `hashSetFor` if the element type has an
+ordering. This is solved (clumsily) by putting `hashSetFor` in a superclass
+`LowPriority` of the object `SetsFor` where `treeSetFor` is defined. Maybe the
+boilerplate would still be acceptable if the crufty code could be contained.
+However, this is not the case. Every user of the abstraction has to be
+parameterized itself with a `SetFor` implicit. Considering the simple task _"I
+want a `TreeSet[T]` if `T` has an ordering and a `HashSet[T]` otherwise"_, this
+seems like a lot of ceremony.
+
+There are some proposals to improve the situation in specific areas, for
+instance by allowing more elaborate schemes to specify priorities. But they all
+keep the viral nature of implicit search programs based on logic programming.
+
+By contrast, the new `summonFrom` construct makes implicit search available
+in a functional context. To solve the problem of creating the right set, one
+would use it as follows:
+
+```scala
+import scala.compiletime.summonFrom
+
+inline def setFor[T]: Set[T] = summonFrom {
+  case ord: Ordering[T] => new TreeSet[T]()(using ord)
+  case _                => new HashSet[T]
+}
+```
+
+A `summonFrom` call takes a pattern matching closure as argument. All patterns
+in the closure are type ascriptions of the form `identifier : Type`.
+
+Patterns are tried in sequence. The first case with a pattern `x: T` such that an implicit value of type `T` can be summoned is chosen.
+
+Alternatively, one can also use a pattern-bound given instance, which avoids the explicit using clause. For instance, `setFor` could also be formulated as follows:
+
+```scala
+import scala.compiletime.summonFrom
+
+inline def setFor[T]: Set[T] = summonFrom {
+  case given Ordering[T] => new TreeSet[T]
+  case _                 => new HashSet[T]
+}
+```
+
+`summonFrom` applications must be reduced at compile time.
+
+Consequently, if we summon an `Ordering[String]` the code above will return a
+new instance of `TreeSet[String]`.
+
+```scala
+summon[Ordering[String]]
+
+println(setFor[String].getClass) // prints class scala.collection.immutable.TreeSet
+```
+
+**Note** `summonFrom` applications can raise ambiguity errors. Consider the following
+code with two givens in scope of type `A`. The pattern match in `f` will raise
+an ambiguity error of `f` is applied.
+
+```scala
+class A
+given a1: A = new A
+given a2: A = new A
+
+inline def f: Any = summonFrom {
+  case given _: A => ???  // error: ambiguous givens
+}
+```
+
+## `summonInline`
+
+The shorthand `summonInline` provides a simple way to write a `summon` that is delayed until the call is inlined.
+Unlike `summonFrom`, `summonInline` also yields the implicit-not-found error, if a given instance of the summoned
+type is not found.
+```scala
+import scala.compiletime.summonInline
+import scala.annotation.implicitNotFound
+
+@implicitNotFound("Missing One")
+trait Missing1
+
+@implicitNotFound("Missing Two")
+trait Missing2
+
+trait NotMissing
+given NotMissing = ???
+
+transparent inline def summonInlineCheck[T <: Int](inline t : T) : Any =
+  inline t match
+    case 1 => summonInline[Missing1]
+    case 2 => summonInline[Missing2]
+    case _ => summonInline[NotMissing]
+
+val missing1 = summonInlineCheck(1) // error: Missing One
+val missing2 = summonInlineCheck(2) // error: Missing Two
+val notMissing : NotMissing = summonInlineCheck(3)
+```
+
+## Reference
+
+For more information about compile-time operations, see [PR #4768](https://github.com/lampepfl/dotty/pull/4768),
+which explains how `summonFrom`'s predecessor (implicit matches) can be used for typelevel programming and code specialization and [PR #7201](https://github.com/lampepfl/dotty/pull/7201) which explains the new `summonFrom` syntax.
diff --git a/docs/_docs/reference/metaprogramming/inline.md b/docs/_docs/reference/metaprogramming/inline.md
new file mode 100644
index 000000000000..c625f4774a18
--- /dev/null
+++ b/docs/_docs/reference/metaprogramming/inline.md
@@ -0,0 +1,389 @@
+---
+layout: doc-page
+title: Inline
+movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/inline.html
+---
+
+## Inline Definitions
+
+`inline` is a new [soft modifier](../soft-modifier.md) that guarantees that a
+definition will be inlined at the point of use. Example:
+
+```scala
+object Config:
+  inline val logging = false
+
+object Logger:
+
+  private var indent = 0
+
+  inline def log[T](msg: String, indentMargin: =>Int)(op: => T): T =
+    if Config.logging then
+      println(s"${"  " * indent}start $msg")
+      indent += indentMargin
+      val result = op
+      indent -= indentMargin
+      println(s"${"  " * indent}$msg = $result")
+      result
+    else op
+end Logger
+```
+
+The `Config` object contains a definition of the **inline value** `logging`.
+This means that `logging` is treated as a _constant value_, equivalent to its
+right-hand side `false`. The right-hand side of such an `inline val` must itself
+be a [constant expression](https://scala-lang.org/files/archive/spec/2.13/06-expressions.html#constant-expressions).
+Used in this way, `inline` is equivalent to Java and Scala 2's `final`. Note that `final`, meaning
+_inlined constant_, is still supported in Scala 3, but will be phased out.
+
+The `Logger` object contains a definition of the **inline method** `log`. This
+method will always be inlined at the point of call.
+
+In the inlined code, an `if-then-else` with a constant condition will be rewritten
+to its `then`- or `else`-part. Consequently, in the `log` method above the
+`if Config.logging` with `Config.logging == true` will get rewritten into its
+`then`-part.
+
+Here's an example:
+
+```scala
+var indentSetting = 2
+
+def factorial(n: BigInt): BigInt =
+  log(s"factorial($n)", indentSetting) {
+    if n == 0 then 1
+    else n * factorial(n - 1)
+  }
+```
+
+If `Config.logging == false`, this will be rewritten (simplified) to:
+
+```scala
+def factorial(n: BigInt): BigInt =
+  if n == 0 then 1
+  else n * factorial(n - 1)
+```
+
+As you notice, since neither `msg` or `indentMargin` were used, they do not
+appear in the generated code for `factorial`. Also note the body of our `log`
+method: the `else-` part reduces to just an `op`. In the generated code we do
+not generate any closures because we only refer to a by-name parameter *once*.
+Consequently, the code was inlined directly and the call was beta-reduced.
+
+In the `true` case the code will be rewritten to:
+
+```scala
+def factorial(n: BigInt): BigInt =
+  val msg = s"factorial($n)"
+  println(s"${"  " * indent}start $msg")
+  Logger.inline$indent_=(indent.+(indentSetting))
+  val result =
+    if n == 0 then 1
+    else n * factorial(n - 1)
+  Logger.inline$indent_=(indent.-(indentSetting))
+  println(s"${"  " * indent}$msg = $result")
+  result
+```
+
+Note that the by-value parameter `msg` is evaluated only once, per the usual Scala
+semantics, by binding the value and reusing the `msg` through the body of
+`factorial`. Also, note the special handling of the assignment to the private var
+`indent`. It is achieved by generating a setter method `def inline$indent_=` and calling it instead.
+
+Inline methods always have to be fully applied. For instance, a call to
+```scala
+Logger.log[String]("some op", indentSetting)
+```
+would be ill-formed and the compiler would complain that arguments are missing.
+However, it is possible to pass wildcard arguments instead. For instance,
+```scala
+Logger.log[String]("some op", indentSetting)(_)
+```
+would typecheck.
+
+### Recursive Inline Methods
+
+Inline methods can be recursive. For instance, when called with a constant
+exponent `n`, the following method for `power` will be implemented by
+straight inline code without any loop or recursion.
+
+```scala
+inline def power(x: Double, n: Int): Double =
+  if n == 0 then 1.0
+  else if n == 1 then x
+  else
+    val y = power(x, n / 2)
+    if n % 2 == 0 then y * y else y * y * x
+
+power(expr, 10)
+// translates to
+//
+//   val x = expr
+//   val y1 = x * x   // ^2
+//   val y2 = y1 * y1 // ^4
+//   val y3 = y2 * x  // ^5
+//   y3 * y3          // ^10
+```
+
+Parameters of inline methods can have an `inline` modifier as well. This means
+that actual arguments to these parameters will be inlined in the body of the
+`inline def`. `inline` parameters have call semantics equivalent to by-name parameters
+but allow for duplication of the code in the argument. It is usually useful when constant
+values need to be propagated to allow further optimizations/reductions.
+
+The following example shows the difference in translation between by-value, by-name and `inline`
+parameters:
+
+```scala
+inline def funkyAssertEquals(actual: Double, expected: =>Double, inline delta: Double): Unit =
+  if (actual - expected).abs > delta then
+    throw new AssertionError(s"difference between ${expected} and ${actual} was larger than ${delta}")
+
+funkyAssertEquals(computeActual(), computeExpected(), computeDelta())
+// translates to
+//
+//   val actual = computeActual()
+//   def expected = computeExpected()
+//   if (actual - expected).abs > computeDelta() then
+//     throw new AssertionError(s"difference between ${expected} and ${actual} was larger than ${computeDelta()}")
+```
+
+### Rules for Overriding
+
+Inline methods can override other non-inline methods. The rules are as follows:
+
+1. If an inline method `f` implements or overrides another, non-inline method, the inline method can also be invoked at runtime. For instance, consider the scenario:
+
+    ```scala
+    abstract class A:
+      def f: Int
+      def g: Int = f
+
+    class B extends A:
+      inline def f = 22
+      override inline def g = f + 11
+
+    val b = new B
+    val a: A = b
+    // inlined invocatons
+    assert(b.f == 22)
+    assert(b.g == 33)
+    // dynamic invocations
+    assert(a.f == 22)
+    assert(a.g == 33)
+    ```
+
+    The inlined invocations and the dynamically dispatched invocations give the same results.
+
+2. Inline methods are effectively final.
+
+3. Inline methods can also be abstract. An abstract inline method can be implemented only by other inline methods. It cannot be invoked directly:
+
+    ```scala
+    abstract class A:
+      inline def f: Int
+
+    object B extends A:
+      inline def f: Int = 22
+
+    B.f         // OK
+    val a: A = B
+    a.f         // error: cannot inline f in A.
+    ```
+
+### Relationship to `@inline`
+
+Scala 2 also defines a `@inline` annotation which is used as a hint for the
+backend to inline code. The `inline` modifier is a more powerful option:
+
+- expansion is guaranteed instead of best effort,
+- expansion happens in the frontend instead of in the backend and
+- expansion also applies to recursive methods.
+
+<!--- (Commented out since the docs and implementation differ)
+
+### Evaluation Rules
+
+As you noticed by the examples above a lambda of the form
+
+`((x_1, ..., x_n) => B)(E_1, ..., E_n)` is rewritten to:
+
+```
+{ val/def x_1 = E_1
+  ...
+  val/def x_n = E_n
+  B
+}
+```
+
+where vals are used for value parameter bindings and defs are used for by-name
+parameter bindings. If an argument `E_i` is a simple variable reference `y`, the
+corresponding binding is omitted and `y` is used instead of `x_i` in `B`.
+
+If a `inline` modifier is given for parameters, corresponding arguments must be
+pure expressions of constant type.
+-->
+
+#### The definition of constant expression
+
+Right-hand sides of inline values and of arguments for inline parameters must be
+constant expressions in the sense defined by the [SLS §6.24](https://www.scala-lang.org/files/archive/spec/2.13/06-expressions.html#constant-expressions),
+including _platform-specific_ extensions such as constant folding of pure
+numeric computations.
+
+An inline value must have a literal type such as `1` or `true`.
+
+```scala
+inline val four = 4
+// equivalent to
+inline val four: 4 = 4
+```
+
+It is also possible to have inline vals of types that do not have a syntax, such as `Short(4)`.
+
+```scala
+trait InlineConstants:
+  inline val myShort: Short
+
+object Constants extends InlineConstants:
+  inline val myShort/*: Short(4)*/ = 4
+```
+
+## Transparent Inline Methods
+
+Inline methods can additionally be declared `transparent`.
+This means that the return type of the inline method can be
+specialized to a more precise type upon expansion. Example:
+
+```scala
+class A
+class B extends A:
+  def m = true
+
+transparent inline def choose(b: Boolean): A =
+  if b then new A else new B
+
+val obj1 = choose(true)  // static type is A
+val obj2 = choose(false) // static type is B
+
+// obj1.m // compile-time error: `m` is not defined on `A`
+obj2.m    // OK
+```
+
+Here, the inline method `choose` returns an instance of either of the two types `A` or `B`.
+If `choose` had not been declared to be `transparent`, the result
+of its expansion would always be of type `A`, even though the computed value might be of the subtype `B`.
+The inline method is a "blackbox" in the sense that details of its implementation do not leak out.
+But if a `transparent` modifier is given, the expansion is the type of the expanded body. If the argument `b`
+is `true`, that type is `A`, otherwise it is `B`. Consequently, calling `m` on `obj2`
+type-checks since `obj2` has the same type as the expansion of `choose(false)`, which is `B`.
+Transparent inline methods are "whitebox" in the sense that the type
+of an application of such a method can be more specialized than its declared
+return type, depending on how the method expands.
+
+In the following example, we see how the return type of `zero` is specialized to
+the singleton type `0` permitting the addition to be ascribed with the correct
+type `1`.
+
+```scala
+transparent inline def zero: Int = 0
+
+val one: 1 = zero + 1
+```
+
+### Transparent vs. non-transparent inline
+
+As we already discussed, transparent inline methods may influence type checking at call site.
+Technically this implies that transparent inline methods must be expanded during type checking of the program.
+Other inline methods are inlined later after the program is fully typed.
+
+For example, the following two functions will be typed the same way but will be inlined at different times.
+
+```scala
+inline def f1: T = ...
+transparent inline def f2: T = (...): T
+```
+
+A noteworthy difference is the behavior of `transparent inline given`.
+If there is an error reported when inlining that definition, it will be considered as an implicit search mismatch and the search will continue.
+A `transparent inline given` can add a type ascription in its RHS (as in `f2` from the previous example) to avoid the precise type but keep the search behavior.
+On the other hand, an `inline given` is taken as an implicit and then inlined after typing.
+Any error will be emitted as usual.
+
+## Inline Conditionals
+
+An if-then-else expression whose condition is a constant expression can be simplified to
+the selected branch. Prefixing an if-then-else expression with `inline` enforces that
+the condition has to be a constant expression, and thus guarantees that the conditional will always
+simplify.
+
+Example:
+
+```scala
+inline def update(delta: Int) =
+  inline if delta >= 0 then increaseBy(delta)
+  else decreaseBy(-delta)
+```
+
+A call `update(22)` would rewrite to `increaseBy(22)`. But if `update` was called with
+a value that was not a compile-time constant, we would get a compile time error like the one
+below:
+
+```scala
+  |  inline if delta >= 0 then ???
+  |  ^
+  |  cannot reduce inline if
+  |   its condition
+  |     delta >= 0
+  |   is not a constant value
+  | This location is in code that was inlined at ...
+```
+
+In a transparent inline, an `inline if` will force the inlining of any inline definition in its condition during type checking.
+
+## Inline Matches
+
+A `match` expression in the body of an `inline` method definition may be
+prefixed by the `inline` modifier. If there is enough static information to
+unambiguously take a branch, the expression is reduced to that branch and the
+type of the result is taken. If not, a compile-time error is raised that
+reports that the match cannot be reduced.
+
+The example below defines an inline method with a
+single inline match expression that picks a case based on its static type:
+
+```scala
+transparent inline def g(x: Any): Any =
+  inline x match
+    case x: String => (x, x) // Tuple2[String, String](x, x)
+    case x: Double => x
+
+g(1.0d) // Has type 1.0d which is a subtype of Double
+g("test") // Has type (String, String)
+```
+
+The scrutinee `x` is examined statically and the inline match is reduced
+accordingly returning the corresponding value (with the type specialized because `g` is declared `transparent`). This example performs a simple type test over the
+scrutinee. The type can have a richer structure like the simple ADT below.
+`toInt` matches the structure of a number in [Church-encoding](https://en.wikipedia.org/wiki/Church_encoding)
+and _computes_ the corresponding integer.
+
+```scala
+trait Nat
+case object Zero extends Nat
+case class Succ[N <: Nat](n: N) extends Nat
+
+transparent inline def toInt(n: Nat): Int =
+  inline n match
+    case Zero     => 0
+    case Succ(n1) => toInt(n1) + 1
+
+inline val natTwo = toInt(Succ(Succ(Zero)))
+val intTwo: 2 = natTwo
+```
+
+`natTwo` is inferred to have the singleton type 2.
+
+### Reference
+
+For more information about the semantics of `inline`, see the [Scala 2020: Semantics-preserving inlining for metaprogramming](https://dl.acm.org/doi/10.1145/3426426.3428486) paper.
diff --git a/docs/docs/reference/metaprogramming/macros-spec.md b/docs/_docs/reference/metaprogramming/macros-spec.md
similarity index 92%
rename from docs/docs/reference/metaprogramming/macros-spec.md
rename to docs/_docs/reference/metaprogramming/macros-spec.md
index e03bb2fc2d20..d152377e6d62 100644
--- a/docs/docs/reference/metaprogramming/macros-spec.md
+++ b/docs/_docs/reference/metaprogramming/macros-spec.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Macros Spec"
+movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/macros-spec.html
 ---
 
 ## Implementation
@@ -176,25 +177,25 @@ implementation of `power` otherwise.
 import scala.quoted.*
 
 inline def power(x: Double, n: Int): Double =
-   ${ powerExpr('x, 'n) }
+  ${ powerExpr('x, 'n) }
 
 private def powerExpr(x: Expr[Double], n: Expr[Int])
                      (using Quotes): Expr[Double] =
-   n.value match
-      case Some(m) => powerExpr(x, m)
-      case _ => '{ dynamicPower($x, $n) }
+  n.value match
+    case Some(m) => powerExpr(x, m)
+    case _ => '{ dynamicPower($x, $n) }
 
 private def powerExpr(x: Expr[Double], n: Int)
                      (using Quotes): Expr[Double] =
-   if n == 0 then '{ 1.0 }
-   else if n == 1 then x
-   else if n % 2 == 0 then '{ val y = $x * $x; ${ powerExpr('y, n / 2) } }
-   else '{ $x * ${ powerExpr(x, n - 1) } }
+  if n == 0 then '{ 1.0 }
+  else if n == 1 then x
+  else if n % 2 == 0 then '{ val y = $x * $x; ${ powerExpr('y, n / 2) } }
+  else '{ $x * ${ powerExpr(x, n - 1) } }
 
 private def dynamicPower(x: Double, n: Int): Double =
-   if n == 0 then 1.0
-   else if n % 2 == 0 then dynamicPower(x * x, n / 2)
-   else x * dynamicPower(x, n - 1)
+  if n == 0 then 1.0
+  else if n % 2 == 0 then dynamicPower(x * x, n / 2)
+  else x * dynamicPower(x, n - 1)
 ```
 
 In the above, the method `.value` maps a constant expression of the type
@@ -205,15 +206,15 @@ that maps expressions over functions to functions over expressions can
 be implemented in user code:
 ```scala
 given AsFunction1[T, U]: Conversion[Expr[T => U], Expr[T] => Expr[U]] with
-   def apply(f: Expr[T => U]): Expr[T] => Expr[U] =
-      (x: Expr[T]) => f match
-         case Lambda(g) => g(x)
-         case _ => '{ ($f)($x) }
+  def apply(f: Expr[T => U]): Expr[T] => Expr[U] =
+    (x: Expr[T]) => f match
+      case Lambda(g) => g(x)
+      case _ => '{ ($f)($x) }
 ```
 This assumes an extractor
 ```scala
 object Lambda:
-   def unapply[T, U](x: Expr[T => U]): Option[Expr[T] => Expr[U]]
+  def unapply[T, U](x: Expr[T => U]): Option[Expr[T] => Expr[U]]
 ```
 Once we allow inspection of code via extractors, it’s tempting to also
 add constructors that create typed trees directly without going
diff --git a/docs/_docs/reference/metaprogramming/macros.md b/docs/_docs/reference/metaprogramming/macros.md
new file mode 100644
index 000000000000..e1267ea82a59
--- /dev/null
+++ b/docs/_docs/reference/metaprogramming/macros.md
@@ -0,0 +1,823 @@
+---
+layout: doc-page
+title: "Macros"
+movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/macros.html
+---
+
+> When developing macros enable `-Xcheck-macros` scalac option flag to have extra runtime checks.
+
+## Macros: Quotes and Splices
+
+Macros are built on two well-known fundamental operations: quotation and splicing.
+Quotation is expressed as `'{...}` for expressions and splicing is expressed as `${ ... }`.
+Additionally, within a quote or a splice we can quote or splice identifiers directly (i.e. `'e` and `$e`).
+Readers may notice the resemblance of the two aforementioned syntactic
+schemes with the familiar string interpolation syntax.
+
+```scala
+println(s"Hello, $name, here is the result of 1 + 1 = ${1 + 1}")
+```
+
+In string interpolation we _quoted_ a string and then we _spliced_ into it, two others. The first, `name`, is a reference to a value of type [`String`](https://scala-lang.org/api/3.x/scala/Predef$.html#String-0), and the second is an arithmetic expression that will be _evaluated_ followed by the splicing of its string representation.
+
+Quotes and splices in this section allow us to treat code in a similar way,
+effectively supporting macros. The entry point for macros is an inline method
+with a top-level splice. We call it a top-level because it is the only occasion
+where we encounter a splice outside a quote (consider as a quote the
+compilation-unit at the call-site). For example, the code below presents an
+`inline` method `assert` which calls at compile-time a method `assertImpl` with
+a boolean expression tree as argument. `assertImpl` evaluates the expression and
+prints it again in an error message if it evaluates to `false`.
+
+```scala
+import scala.quoted.*
+
+inline def assert(inline expr: Boolean): Unit =
+  ${ assertImpl('expr) }
+
+def assertImpl(expr: Expr[Boolean])(using Quotes) = '{
+  if !$expr then
+    throw AssertionError(s"failed assertion: ${${ showExpr(expr) }}")
+}
+
+def showExpr(expr: Expr[Boolean])(using Quotes): Expr[String] =
+  '{ [actual implementation later in this document] }
+```
+
+If `e` is an expression, then `'{e}` represents the typed
+abstract syntax tree representing `e`. If `T` is a type, then `Type.of[T]`
+represents the type structure representing `T`.  The precise
+definitions of "typed abstract syntax tree" or "type-structure" do not
+matter for now, the terms are used only to give some
+intuition. Conversely, `${e}` evaluates the expression `e`, which must
+yield a typed abstract syntax tree or type structure, and embeds the
+result as an expression (respectively, type) in the enclosing program.
+
+Quotations can have spliced parts in them; in this case the embedded
+splices are evaluated and embedded as part of the formation of the
+quotation.
+
+Quotes and splices can also be applied directly to identifiers. An identifier
+`$x` starting with a `$` that appears inside a quoted expression or type is treated as a
+splice `${x}`. Analogously, an quoted identifier `'x` that appears inside a splice
+is treated as a quote `'{x}`. See the Syntax section below for details.
+
+Quotes and splices are duals of each other.
+For arbitrary expressions `e` we have:
+
+```scala
+${'{e}} = e
+'{${e}} = e
+```
+
+## Types for Quotations
+
+The type signatures of quotes and splices can be described using
+two fundamental types:
+
+- `Expr[T]`: abstract syntax trees representing expressions of type `T`
+- `Type[T]`: non erased representation of type `T`.
+
+Quoting takes expressions of type `T` to expressions of type `Expr[T]`
+and it takes types `T` to expressions of type `Type[T]`. Splicing
+takes expressions of type `Expr[T]` to expressions of type `T` and it
+takes expressions of type `Type[T]` to types `T`.
+
+The two types can be defined in package [`scala.quoted`](https://scala-lang.org/api/3.x/scala/quoted.html) as follows:
+
+```scala
+package scala.quoted
+
+sealed trait Expr[+T]
+sealed trait Type[T]
+```
+
+Both `Expr` and `Type` are abstract and sealed, so all constructors for
+these types are provided by the system. One way to construct values of
+these types is by quoting, the other is by type-specific lifting
+operations that will be discussed later on.
+
+## The Phase Consistency Principle
+
+A fundamental *phase consistency principle* (PCP) regulates accesses
+to free variables in quoted and spliced code:
+
+- _For any free variable reference `x`, the number of quoted scopes and the number of spliced scopes between the reference to `x` and the definition of `x` must be equal_.
+
+Here, `this`-references count as free variables. On the other
+hand, we assume that all imports are fully expanded and that `_root_` is
+not a free variable. So references to global definitions are
+allowed everywhere.
+
+The phase consistency principle can be motivated as follows: First,
+suppose the result of a program `P` is some quoted text `'{ ... x
+... }` that refers to a free variable `x` in `P`. This can be
+represented only by referring to the original variable `x`. Hence, the
+result of the program will need to persist the program state itself as
+one of its parts. We don’t want to do this, hence this situation
+should be made illegal. Dually, suppose a top-level part of a program
+is a spliced text `${ ... x ... }` that refers to a free variable `x`
+in `P`.  This would mean that we refer during _construction_ of `P` to
+a value that is available only during _execution_ of `P`. This is of
+course impossible and therefore needs to be ruled out.  Now, the
+small-step evaluation of a program will reduce quotes and splices in
+equal measure using the cancellation rules above. But it will neither
+create nor remove quotes or splices individually. So the PCP ensures
+that program elaboration will lead to neither of the two unwanted
+situations described above.
+
+In what concerns the range of features it covers, this form of macros introduces
+a principled metaprogramming framework that is quite close to the MetaML family of
+languages. One difference is that MetaML does not have an equivalent of the PCP -
+quoted code in MetaML _can_ access variables in its immediately enclosing
+environment, with some restrictions and caveats since such accesses involve
+serialization. However, this does not constitute a fundamental gain in
+expressiveness.
+
+## From `Expr`s to Functions and Back
+
+It is possible to convert any `Expr[T => R]` into `Expr[T] => Expr[R]` and back.
+These conversions can be implemented as follows:
+
+```scala
+def to[T: Type, R: Type](f: Expr[T] => Expr[R])(using Quotes): Expr[T => R] =
+  '{ (x: T) => ${ f('x) } }
+
+def from[T: Type, R: Type](f: Expr[T => R])(using Quotes): Expr[T] => Expr[R] =
+  (x: Expr[T]) => '{ $f($x) }
+```
+
+Note how the fundamental phase consistency principle works in two
+different directions here for `f` and `x`.  In the method `to`,  the reference to `f` is
+legal because it is quoted, then spliced, whereas the reference to `x`
+is legal because it is spliced, then quoted.
+
+They can be used as follows:
+
+```scala
+val f1: Expr[Int => String] =
+  to((x: Expr[Int]) => '{ $x.toString }) // '{ (x: Int) => x.toString }
+
+val f2: Expr[Int] => Expr[String] =
+  from('{ (x: Int) => x.toString }) // (x: Expr[Int]) => '{ ((x: Int) => x.toString)($x) }
+f2('{2}) // '{ ((x: Int) => x.toString)(2) }
+```
+
+One limitation of `from` is that it does not β-reduce when a lambda is called immediately, as evidenced in the code `{ ((x: Int) => x.toString)(2) }`.
+In some cases we want to remove the lambda from the code, for this we provide the method `Expr.betaReduce` that turns a tree
+describing a function into a function mapping trees to trees.
+
+```scala
+object Expr:
+  ...
+  def betaReduce[...](...)(...): ... = ...
+```
+
+The definition of `Expr.betaReduce(f)(x)` is assumed to be functionally the same as
+`'{($f)($x)}`, however it should optimize this call by returning the
+result of beta-reducing `f(x)` if `f` is a known lambda expression.
+`Expr.betaReduce` distributes applications of `Expr` over function arrows:
+
+```scala
+Expr.betaReduce(_): Expr[(T1, ..., Tn) => R] => ((Expr[T1], ..., Expr[Tn]) => Expr[R])
+```
+
+## Lifting Types
+
+Types are not directly affected by the phase consistency principle.
+It is possible to use types defined at any level in any other level.
+But, if a type is used in a subsequent stage it will need to be lifted to a `Type`.
+Indeed, the definition of `to` above uses `T` in the next stage, there is a
+quote but no splice between the parameter binding of `T` and its
+usage. But the code can be rewritten by adding an explicit binding of a `Type[T]`:
+
+```scala
+def to[T, R](f: Expr[T] => Expr[R])(using t: Type[T])(using Type[R], Quotes): Expr[T => R] =
+  '{ (x: t.Underlying) => ${ f('x) } }
+```
+
+In this version of `to`, the type of `x` is now the result of
+inserting the type `Type[T]` and selecting its `Underlying`.
+
+To avoid clutter, the compiler converts any type reference to
+a type `T` in subsequent phases to `summon[Type[T]].Underlying`.
+
+And to avoid duplication it does it once per type, and creates
+an alias for that type at the start of the quote.
+
+For instance, the user-level definition of `to`:
+
+```scala
+def to[T, R](f: Expr[T] => Expr[R])(using t: Type[T], r: Type[R])(using Quotes): Expr[T => R] =
+  '{ (x: T) => ${ f('x) } }
+```
+
+would be rewritten to
+
+```scala
+def to[T, R](f: Expr[T] => Expr[R])(using t: Type[T], r: Type[R])(using Quotes): Expr[T => R] =
+  '{
+    type T = t.Underlying
+    (x: T) => ${ f('x) }
+  }
+```
+
+The `summon` query succeeds because there is a given instance of
+type `Type[T]` available (namely the given parameter corresponding
+to the context bound `: Type`), and the reference to that value is
+phase-correct. If that was not the case, the phase inconsistency for
+`T` would be reported as an error.
+
+## Lifting Expressions
+
+Consider the following implementation of a staged interpreter that implements
+a compiler through staging.
+
+```scala
+import scala.quoted.*
+
+enum Exp:
+  case Num(n: Int)
+  case Plus(e1: Exp, e2: Exp)
+  case Var(x: String)
+  case Let(x: String, e: Exp, in: Exp)
+
+import Exp.*
+```
+
+The interpreted language consists of numbers `Num`, addition `Plus`, and variables
+`Var` which are bound by `Let`. Here are two sample expressions in the language:
+
+```scala
+val exp = Plus(Plus(Num(2), Var("x")), Num(4))
+val letExp = Let("x", Num(3), exp)
+```
+
+Here’s a compiler that maps an expression given in the interpreted
+language to quoted Scala code of type `Expr[Int]`.
+The compiler takes an environment that maps variable names to Scala `Expr`s.
+
+```scala
+import scala.quoted.*
+
+def compile(e: Exp, env: Map[String, Expr[Int]])(using Quotes): Expr[Int] =
+  e match
+    case Num(n) =>
+      Expr(n)
+    case Plus(e1, e2) =>
+      '{ ${ compile(e1, env) } + ${ compile(e2, env) } }
+    case Var(x) =>
+      env(x)
+    case Let(x, e, body) =>
+      '{ val y = ${ compile(e, env) }; ${ compile(body, env + (x -> 'y)) } }
+```
+
+Running `compile(letExp, Map())` would yield the following Scala code:
+
+```scala
+'{ val y = 3; (2 + y) + 4 }
+```
+
+The body of the first clause, `case Num(n) => Expr(n)`, looks suspicious. `n`
+is declared as an `Int`, yet it is converted to an `Expr[Int]` with `Expr()`.
+Shouldn’t `n` be quoted? In fact this would not
+work since replacing `n` by `'n` in the clause would not be phase
+correct.
+
+The `Expr.apply` method is defined in package `quoted`:
+
+```scala
+package quoted
+
+object Expr:
+  ...
+  def apply[T: ToExpr](x: T)(using Quotes): Expr[T] =
+    summon[ToExpr[T]].toExpr(x)
+```
+
+This method says that values of types implementing the `ToExpr` type class can be
+converted to `Expr` values using `Expr.apply`.
+
+Scala 3 comes with given instances of `ToExpr` for
+several types including `Boolean`, `String`, and all primitive number
+types. For example, `Int` values can be converted to `Expr[Int]`
+values by wrapping the value in a `Literal` tree node. This makes use
+of the underlying tree representation in the compiler for
+efficiency. But the `ToExpr` instances are nevertheless not _magic_
+in the sense that they could all be defined in a user program without
+knowing anything about the representation of `Expr` trees. For
+instance, here is a possible instance of `ToExpr[Boolean]`:
+
+```scala
+given ToExpr[Boolean] with
+  def toExpr(b: Boolean) =
+    if b then '{ true } else '{ false }
+```
+
+Once we can lift bits, we can work our way up. For instance, here is a
+possible implementation of `ToExpr[Int]` that does not use the underlying
+tree machinery:
+
+```scala
+given ToExpr[Int] with
+  def toExpr(n: Int) = n match
+    case Int.MinValue    => '{ Int.MinValue }
+    case _ if n < 0      => '{ - ${ toExpr(-n) } }
+    case 0               => '{ 0 }
+    case _ if n % 2 == 0 => '{ ${ toExpr(n / 2) } * 2 }
+    case _               => '{ ${ toExpr(n / 2) } * 2 + 1 }
+```
+
+Since `ToExpr` is a type class, its instances can be conditional. For example,
+a `List` is liftable if its element type is:
+
+```scala
+given [T: ToExpr : Type]: ToExpr[List[T]] with
+  def toExpr(xs: List[T]) = xs match
+    case head :: tail => '{ ${ Expr(head) } :: ${ toExpr(tail) } }
+    case Nil          => '{ Nil: List[T] }
+```
+
+In the end, `ToExpr` resembles very much a serialization
+framework. Like the latter it can be derived systematically for all
+collections, case classes and enums. Note also that the synthesis
+of _type-tag_ values of type `Type[T]` is essentially the type-level
+analogue of lifting.
+
+Using lifting, we can now give the missing definition of `showExpr` in the introductory example:
+
+```scala
+def showExpr[T](expr: Expr[T])(using Quotes): Expr[String] =
+  val code: String = expr.show
+  Expr(code)
+```
+
+That is, the `showExpr` method converts its `Expr` argument to a string (`code`), and lifts
+the result back to an `Expr[String]` using `Expr.apply`.
+
+## Lifting Types
+
+The previous section has shown that the metaprogramming framework has
+to be able to take a type `T` and convert it to a type tree of type
+`Type[T]` that can be reified. This means that all free variables of
+the type tree refer to types and values defined in the current stage.
+
+For a reference to a global class, this is easy: Just issue the fully
+qualified name of the class. Members of reifiable types are handled by
+just reifying the containing type together with the member name. But
+what to do for references to type parameters or local type definitions
+that are not defined in the current stage? Here, we cannot construct
+the `Type[T]` tree directly, so we need to get it from a recursive
+implicit search. For instance, to implement
+
+```scala
+summon[Type[List[T]]]
+```
+
+where `T` is not defined in the current stage, we construct the type constructor
+of `List` applied to the splice of the result of searching for a given instance for `Type[T]`:
+
+```scala
+Type.of[ List[ summon[Type[T]].Underlying ] ]
+```
+
+This is exactly the algorithm that Scala 2 uses to search for type tags.
+In fact Scala 2's type tag feature can be understood as a more ad-hoc version of
+`quoted.Type`. As was the case for type tags, the implicit search for a `quoted.Type`
+is handled by the compiler, using the algorithm sketched above.
+
+## Relationship with `inline`
+
+Seen by itself, principled metaprogramming looks more like a framework for
+runtime metaprogramming than one for compile-time metaprogramming with macros.
+But combined with Scala 3’s `inline` feature it can be turned into a compile-time
+system. The idea is that macro elaboration can be understood as a combination of
+a macro library and a quoted program. For instance, here’s the `assert` macro
+again together with a program that calls `assert`.
+
+```scala
+object Macros:
+
+  inline def assert(inline expr: Boolean): Unit =
+    ${ assertImpl('expr) }
+
+  def assertImpl(expr: Expr[Boolean])(using Quotes) =
+    val failMsg: Expr[String] = Expr("failed assertion: " + expr.show)
+    '{ if !($expr) then throw new AssertionError($failMsg) }
+
+@main def program =
+  val x = 1
+  Macros.assert(x != 0)
+```
+
+Inlining the `assert` function would give the following program:
+
+```scala
+@main def program =
+  val x = 1
+  ${ Macros.assertImpl('{ x != 0}) }
+```
+
+The example is only phase correct because `Macros` is a global value and
+as such not subject to phase consistency checking. Conceptually that’s
+a bit unsatisfactory. If the PCP is so fundamental, it should be
+applicable without the global value exception. But in the example as
+given this does not hold since both `assert` and `program` call
+`assertImpl` with a splice but no quote.
+
+However, one could argue that the example is really missing
+an important aspect: The macro library has to be compiled in a phase
+prior to the program using it, but in the code above, macro
+and program are defined together. A more accurate view of
+macros would be to have the user program be in a phase after the macro
+definitions, reflecting the fact that macros have to be defined and
+compiled before they are used. Hence, conceptually the program part
+should be treated by the compiler as if it was quoted:
+
+```scala
+@main def program = '{
+  val x = 1
+  ${ Macros.assertImpl('{ x != 0 }) }
+}
+```
+
+If `program` is treated as a quoted expression, the call to
+`Macro.assertImpl` becomes phase correct even if macro library and
+program are conceptualized as local definitions.
+
+But what about the call from `assert` to `assertImpl`? Here, we need a
+tweak of the typing rules. An inline function such as `assert` that
+contains a splice operation outside an enclosing quote is called a
+_macro_. Macros are supposed to be expanded in a subsequent phase,
+i.e. in a quoted context. Therefore, they are also type checked as if
+they were in a quoted context. For instance, the definition of
+`assert` is typechecked as if it appeared inside quotes.  This makes
+the call from `assert` to `assertImpl` phase-correct, even if we
+assume that both definitions are local.
+
+The `inline` modifier is used to declare a `val` that is
+either a constant or is a parameter that will be a constant when instantiated. This
+aspect is also important for macro expansion.
+
+To get values out of expressions containing constants `Expr` provides the method
+`value` (or `valueOrError`). This will convert the `Expr[T]` into a `Some[T]` (or `T`) when the
+expression contains value. Otherwise it will return `None` (or emit an error).
+To avoid having incidental val bindings generated by the inlining of the `def`
+it is recommended to use an inline parameter. To illustrate this, consider an
+implementation of the `power` function that makes use of a statically known exponent:
+
+```scala
+inline def power(x: Double, inline n: Int) = ${ powerCode('x, 'n) }
+
+private def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] =
+  n.value match
+    case Some(m) => powerCode(x, m)
+    case None => '{ Math.pow($x, $n.toDouble) }
+
+private def powerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] =
+  if n == 0 then '{ 1.0 }
+  else if n == 1 then x
+  else if n % 2 == 0 then '{ val y = $x * $x; ${ powerCode('y, n / 2) } }
+  else '{ $x * ${ powerCode(x, n - 1) } }
+```
+
+## Scope Extrusion
+
+Quotes and splices are duals as far as the PCP is concerned. But there is an
+additional restriction that needs to be imposed on splices to guarantee
+soundness: code in splices must be free of side effects. The restriction
+prevents code like this:
+
+```scala
+var x: Expr[T] = ...
+'{ (y: T) => ${ x = 'y; 1 } }
+```
+
+This code, if it was accepted, would _extrude_ a reference to a quoted variable
+`y` from its scope. This would subsequently allow access to a variable outside the
+scope where it is defined, which is likely problematic. The code is clearly
+phase consistent, so we cannot use PCP to rule it out. Instead, we postulate a
+future effect system that can guarantee that splices are pure. In the absence of
+such a system we simply demand that spliced expressions are pure by convention,
+and allow for undefined compiler behavior if they are not. This is analogous to
+the status of pattern guards in Scala, which are also required, but not
+verified, to be pure.
+
+[Multi-Stage Programming](./staging.md) introduces one additional method where
+you can expand code at runtime with a method `run`. There is also a problem with
+that invocation of `run` in splices. Consider the following expression:
+
+```scala
+'{ (x: Int) => ${ run('x); 1 } }
+```
+
+This is again phase correct, but will lead us into trouble. Indeed, evaluating
+the splice will reduce the expression `run('x)` to `x`. But then the result
+
+```scala
+'{ (x: Int) => ${ x; 1 } }
+```
+
+is no longer phase correct. To prevent this soundness hole it seems easiest to
+classify `run` as a side-effecting operation. It would thus be prevented from
+appearing in splices. In a base language with side effects we would have to do this
+anyway: Since `run` runs arbitrary code it can always produce a side effect if
+the code it runs produces one.
+
+## Example Expansion
+
+Assume we have two methods, one `map` that takes an `Expr[Array[T]]` and a
+function `f` and one `sum` that performs a sum by delegating to `map`.
+
+```scala
+object Macros:
+
+  def map[T](arr: Expr[Array[T]], f: Expr[T] => Expr[Unit])
+            (using Type[T], Quotes): Expr[Unit] = '{
+    var i: Int = 0
+    while i < ($arr).length do
+      val element: T = ($arr)(i)
+      ${f('element)}
+      i += 1
+  }
+
+  def sum(arr: Expr[Array[Int]])(using Quotes): Expr[Int] = '{
+    var sum = 0
+    ${ map(arr, x => '{sum += $x}) }
+    sum
+  }
+
+  inline def sum_m(arr: Array[Int]): Int = ${sum('arr)}
+
+end Macros
+```
+
+A call to `sum_m(Array(1,2,3))` will first inline `sum_m`:
+
+```scala
+val arr: Array[Int] = Array.apply(1, [2,3 : Int]:Int*)
+${_root_.Macros.sum('arr)}
+```
+
+then it will splice `sum`:
+
+```scala
+val arr: Array[Int] = Array.apply(1, [2,3 : Int]:Int*)
+
+var sum = 0
+${ map('arr, x => '{sum += $x}) }
+sum
+```
+
+then it will inline `map`:
+
+```scala
+val arr: Array[Int] = Array.apply(1, [2,3 : Int]:Int*)
+
+var sum = 0
+val f = x => '{sum += $x}
+${ _root_.Macros.map('arr, 'f)(Type.of[Int])}
+sum
+```
+
+then it will expand and splice inside quotes `map`:
+
+```scala
+val arr: Array[Int] = Array.apply(1, [2,3 : Int]:Int*)
+
+var sum = 0
+val f = x => '{sum += $x}
+var i: Int = 0
+while i < arr.length do
+  val element: Int = (arr)(i)
+  sum += element
+  i += 1
+sum
+```
+
+Finally cleanups and dead code elimination:
+
+```scala
+val arr: Array[Int] = Array.apply(1, [2,3 : Int]:Int*)
+var sum = 0
+var i: Int = 0
+while i < arr.length do
+  val element: Int = arr(i)
+  sum += element
+  i += 1
+sum
+```
+
+## Find implicits within a macro
+
+Similarly to the `summonFrom` construct, it is possible to make implicit search available
+in a quote context. For this we simply provide `scala.quoted.Expr.summon`:
+
+```scala
+import scala.collection.immutable.{ TreeSet, HashSet }
+inline def setFor[T]: Set[T] = ${ setForExpr[T] }
+
+def setForExpr[T: Type](using Quotes): Expr[Set[T]] =
+  Expr.summon[Ordering[T]] match
+    case Some(ord) => '{ new TreeSet[T]()($ord) }
+    case _ => '{ new HashSet[T] }
+```
+
+## Relationship with Transparent Inline
+
+[Inline](./inline.md) documents inlining. The code below introduces a transparent
+inline method that can calculate either a value of type `Int` or a value of type
+`String`.
+
+```scala
+transparent inline def defaultOf(inline str: String) =
+  ${ defaultOfImpl('str) }
+
+def defaultOfImpl(strExpr: Expr[String])(using Quotes): Expr[Any] =
+  strExpr.valueOrError match
+    case "int" => '{1}
+    case "string" => '{"a"}
+
+// in a separate file
+val a: Int = defaultOf("int")
+val b: String = defaultOf("string")
+
+```
+
+## Defining a macro and using it in a single project
+
+It is possible to define macros and use them in the same project as long as the implementation
+of the macros does not have run-time dependencies on code in the file where it is used.
+It might still have compile-time dependencies on types and quoted code that refers to the use-site file.
+
+To provide this functionality Scala 3 provides a transparent compilation mode where files that
+try to expand a macro but fail because the macro has not been compiled yet are suspended.
+If there are any suspended files when the compilation ends, the compiler will automatically restart
+compilation of the suspended files using the output of the previous (partial) compilation as macro classpath.
+In case all files are suspended due to cyclic dependencies the compilation will fail with an error.
+
+## Pattern matching on quoted expressions
+
+It is possible to deconstruct or extract values out of `Expr` using pattern matching.
+
+`scala.quoted` contains objects that can help extracting values from `Expr`.
+
+- `scala.quoted.Expr`/`scala.quoted.Exprs`: matches an expression of a value (or list of values) and returns the value (or list of values).
+- `scala.quoted.Const`/`scala.quoted.Consts`: Same as `Expr`/`Exprs` but only works on primitive values.
+- `scala.quoted.Varargs`: matches an explicit sequence of expressions and returns them. These sequences are useful to get individual `Expr[T]` out of a varargs expression of type `Expr[Seq[T]]`.
+
+These could be used in the following way to optimize any call to `sum` that has statically known values.
+
+```scala
+inline def sum(inline args: Int*): Int = ${ sumExpr('args) }
+private def sumExpr(argsExpr: Expr[Seq[Int]])(using Quotes): Expr[Int] =
+  argsExpr match
+    case Varargs(args @ Exprs(argValues)) =>
+      // args is of type Seq[Expr[Int]]
+      // argValues is of type Seq[Int]
+      Expr(argValues.sum) // precompute result of sum
+    case Varargs(argExprs) => // argExprs is of type Seq[Expr[Int]]
+      val staticSum: Int = argExprs.map(_.value.getOrElse(0)).sum
+      val dynamicSum: Seq[Expr[Int]] = argExprs.filter(_.value.isEmpty)
+      dynamicSum.foldLeft(Expr(staticSum))((acc, arg) => '{ $acc + $arg })
+    case _ =>
+      '{ $argsExpr.sum }
+```
+
+### Quoted patterns
+
+Quoted pattens allow deconstructing complex code that contains a precise structure, types or methods.
+Patterns `'{ ... }` can be placed in any location where Scala expects a pattern.
+
+For example
+
+```scala
+optimize {
+   sum(sum(1, a, 2), 3, b)
+} // should be optimized to 6 + a + b
+```
+
+```scala
+def sum(args: Int*): Int = args.sum
+inline def optimize(inline arg: Int): Int = ${ optimizeExpr('arg) }
+private def optimizeExpr(body: Expr[Int])(using Quotes): Expr[Int] =
+  body match
+    // Match a call to sum without any arguments
+    case '{ sum() } => Expr(0)
+    // Match a call to sum with an argument $n of type Int.
+    // n will be the Expr[Int] representing the argument.
+    case '{ sum($n) } => n
+    // Match a call to sum and extracts all its args in an `Expr[Seq[Int]]`
+    case '{ sum(${Varargs(args)}: _*) } => sumExpr(args)
+    case body => body
+
+private def sumExpr(args1: Seq[Expr[Int]])(using Quotes): Expr[Int] =
+  def flatSumArgs(arg: Expr[Int]): Seq[Expr[Int]] = arg match
+    case '{ sum(${Varargs(subArgs)}: _*) } => subArgs.flatMap(flatSumArgs)
+    case arg => Seq(arg)
+  val args2 = args1.flatMap(flatSumArgs)
+  val staticSum: Int = args2.map(_.value.getOrElse(0)).sum
+  val dynamicSum: Seq[Expr[Int]] = args2.filter(_.value.isEmpty)
+  dynamicSum.foldLeft(Expr(staticSum))((acc, arg) => '{ $acc + $arg })
+```
+
+### Recovering precise types using patterns
+
+Sometimes it is necessary to get a more precise type for an expression. This can be achieved using the following pattern match.
+
+```scala
+def f(expr: Expr[Any])(using Quotes) = expr match
+  case '{ $x: t } =>
+    // If the pattern match succeeds, then there is
+    // some type `t` such that
+    // - `x` is bound to a variable of type `Expr[t]`
+    // - `t` is bound to a new type `t` and a given
+    //   instance `Type[t]` is provided for it
+    // That is, we have `x: Expr[t]` and `given Type[t]`,
+    // for some (unknown) type `t`.
+```
+
+This might be used to then perform an implicit search as in:
+
+```scala
+extension (inline sc: StringContext)
+  inline def showMe(inline args: Any*): String = ${ showMeExpr('sc, 'args) }
+
+private def showMeExpr(sc: Expr[StringContext], argsExpr: Expr[Seq[Any]])(using Quotes): Expr[String] =
+  import quotes.reflect.report
+  argsExpr match
+    case Varargs(argExprs) =>
+      val argShowedExprs = argExprs.map {
+        case '{ $arg: tp } =>
+          Expr.summon[Show[tp]] match
+            case Some(showExpr) =>
+              '{ $showExpr.show($arg) }
+            case None =>
+              report.error(s"could not find implicit for ${Type.show[Show[tp]]}", arg); '{???}
+      }
+      val newArgsExpr = Varargs(argShowedExprs)
+      '{ $sc.s($newArgsExpr: _*) }
+    case _ =>
+      // `new StringContext(...).showMeExpr(args: _*)` not an explicit `showMeExpr"..."`
+      report.error(s"Args must be explicit", argsExpr)
+      '{???}
+
+trait Show[-T]:
+  def show(x: T): String
+
+// in a different file
+given Show[Boolean] with
+  def show(b: Boolean) = "boolean!"
+
+println(showMe"${true}")
+```
+
+### Open code patterns
+
+Quoted pattern matching also provides higher-order patterns to match open terms. If a quoted term contains a definition,
+then the rest of the quote can refer to this definition.
+
+```scala
+'{
+  val x: Int = 4
+  x * x
+}
+```
+
+To match such a term we need to match the definition and the rest of the code, but we need to explicitly state that the rest of the code may refer to this definition.
+
+```scala
+case '{ val y: Int = $x; $body(y): Int } =>
+```
+
+Here `$x` will match any closed expression while `$body(y)` will match an expression that is closed under `y`. Then
+the subexpression of type `Expr[Int]` is bound to `body` as an `Expr[Int => Int]`. The extra argument represents the references to `y`. Usually this expression is used in combination with `Expr.betaReduce` to replace the extra argument.
+
+```scala
+inline def eval(inline e: Int): Int = ${ evalExpr('e) }
+
+private def evalExpr(e: Expr[Int])(using Quotes): Expr[Int] = e match
+  case '{ val y: Int = $x; $body(y): Int } =>
+    // body: Expr[Int => Int] where the argument represents
+    // references to y
+    evalExpr(Expr.betaReduce('{$body(${evalExpr(x)})}))
+  case '{ ($x: Int) * ($y: Int) } =>
+    (x.value, y.value) match
+      case (Some(a), Some(b)) => Expr(a * b)
+      case _ => e
+  case _ => e
+```
+
+```scala
+eval { // expands to the code: (16: Int)
+  val x: Int = 4
+  x * x
+}
+```
+
+We can also close over several bindings using `$b(a1, a2, ..., an)`.
+To match an actual application we can use braces on the function part `${b}(a1, a2, ..., an)`.
+
+## More details
+
+[More details](./macros-spec.md)
diff --git a/docs/_docs/reference/metaprogramming/metaprogramming.md b/docs/_docs/reference/metaprogramming/metaprogramming.md
new file mode 100644
index 000000000000..d2f210187337
--- /dev/null
+++ b/docs/_docs/reference/metaprogramming/metaprogramming.md
@@ -0,0 +1,47 @@
+---
+layout: doc-page
+title: "Metaprogramming"
+movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming.html
+---
+
+The following pages introduce the redesign of metaprogramming in Scala. They
+introduce the following fundamental facilities:
+
+1. [`inline`](./inline.md) is a new modifier that guarantees that
+   a definition will be inlined at the point of use. The primary motivation
+   behind inline is to reduce the overhead behind function calls and access to
+   values. The expansion will be performed by the Scala compiler during the
+   `Typer` compiler phase. As opposed to inlining in some other ecosystems,
+   inlining in Scala is not merely a request to the compiler but is a
+   _command_. The reason is that inlining in Scala can drive other compile-time
+   operations, like inline pattern matching (enabling type-level
+   programming), macros (enabling compile-time, generative, metaprogramming) and
+   runtime code generation (multi-stage programming).
+
+2. [Compile-time ops](./compiletime-ops.md) are helper definitions in the
+   standard library that provide support for compile-time operations over values and types.
+
+3. [Macros](./macros.md) are built on two well-known fundamental
+   operations: quotation and splicing.  Quotation converts program code to
+   data, specifically, a (tree-like) representation of this code. It is
+   expressed as `'{...}` for expressions and as `'[...]` for types. Splicing,
+   expressed as `${ ... }`, goes the other way: it converts a program's representation
+   to program code. Together with `inline`, these two abstractions allow
+   to construct program code programmatically.
+
+4. [Runtime Staging](./staging.md) Where macros construct code at _compile-time_,
+   staging lets programs construct new code at _runtime_. That way,
+   code generation can depend not only on static data but also on data available at runtime. This splits the evaluation of the program in two or more phases or ...
+   stages. Consequently, this method of generative programming is called "Multi-Stage Programming". Staging is built on the same foundations as macros. It uses
+   quotes and splices, but leaves out `inline`.
+
+5. [Reflection](./reflection.md) Quotations are a "black-box"
+   representation of code. They can be parameterized and composed using
+   splices, but their structure cannot be analyzed from the outside. TASTy
+   reflection gives a way to analyze code structure by partly revealing the representation type of a piece of code in a standard API. The representation
+   type is a form of typed abstract syntax tree, which gives rise to the `TASTy`
+   moniker.
+
+6. [TASTy Inspection](./tasty-inspect.md) Typed abstract syntax trees are serialized
+   in a custom compressed binary format stored in `.tasty` files. TASTy inspection allows
+   to load these files and analyze their content's tree structure.
diff --git a/docs/docs/reference/metaprogramming/reflection.md b/docs/_docs/reference/metaprogramming/reflection.md
similarity index 76%
rename from docs/docs/reference/metaprogramming/reflection.md
rename to docs/_docs/reference/metaprogramming/reflection.md
index a6c50a6c6038..74bb4f693e1b 100644
--- a/docs/docs/reference/metaprogramming/reflection.md
+++ b/docs/_docs/reference/metaprogramming/reflection.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Reflection"
+movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/reflection.html
 ---
 
 Reflection enables inspection and construction of Typed Abstract Syntax Trees
@@ -28,8 +29,8 @@ import scala.quoted.*
 inline def natConst(inline x: Int): Int = ${natConstImpl('{x})}
 
 def natConstImpl(x: Expr[Int])(using Quotes): Expr[Int] =
-   import quotes.reflect.*
-   ...
+  import quotes.reflect.*
+  ...
 ```
 
 ### Extractors
@@ -39,18 +40,18 @@ For example the `Literal(_)` extractor used below.
 
 ```scala
 def natConstImpl(x: Expr[Int])(using Quotes): Expr[Int] =
-   import quotes.reflect.*
-   val tree: Term = x.asTerm
-   tree match
-      case Inlined(_, _, Literal(IntConstant(n))) =>
-         if n <= 0 then
-            report.error("Parameter must be natural number")
-            '{0}
-         else
-            tree.asExprOf[Int]
-      case _ =>
-         report.error("Parameter must be a known constant")
-         '{0}
+  import quotes.reflect.*
+  val tree: Term = x.asTerm
+  tree match
+    case Inlined(_, _, Literal(IntConstant(n))) =>
+      if n <= 0 then
+        report.error("Parameter must be natural number")
+        '{0}
+      else
+        tree.asExprOf[Int]
+    case _ =>
+      report.error("Parameter must be a known constant")
+      '{0}
 ```
 
 We can easily know which extractors are needed using `Printer.TreeStructure.show`,
@@ -78,18 +79,18 @@ expansion point.
 
 ```scala
 def macroImpl()(quotes: Quotes): Expr[Unit] =
-   import quotes.reflect.*
-   val pos = Position.ofMacroExpansion
-
-   val path = pos.sourceFile.jpath.toString
-   val start = pos.start
-   val end = pos.end
-   val startLine = pos.startLine
-   val endLine = pos.endLine
-   val startColumn = pos.startColumn
-   val endColumn = pos.endColumn
-   val sourceCode = pos.sourceCode
-   ...
+  import quotes.reflect.*
+  val pos = Position.ofMacroExpansion
+
+  val path = pos.sourceFile.jpath.toString
+  val start = pos.start
+  val end = pos.end
+  val startLine = pos.startLine
+  val endLine = pos.endLine
+  val startColumn = pos.startColumn
+  val endColumn = pos.endColumn
+  val sourceCode = pos.sourceCode
+  ...
 ```
 
 ### Tree Utilities
@@ -104,14 +105,14 @@ example, collects the `val` definitions in the tree.
 
 ```scala
 def collectPatternVariables(tree: Tree)(using ctx: Context): List[Symbol] =
-   val acc = new TreeAccumulator[List[Symbol]]:
-      def foldTree(syms: List[Symbol], tree: Tree)(owner: Symbol): List[Symbol] = tree match
-         case ValDef(_, _, rhs) =>
-            val newSyms = tree.symbol :: syms
-            foldTree(newSyms, body)(tree.symbol)
-         case _ =>
-            foldOverTree(syms, tree)(owner)
-   acc(Nil, tree)
+  val acc = new TreeAccumulator[List[Symbol]]:
+    def foldTree(syms: List[Symbol], tree: Tree)(owner: Symbol): List[Symbol] = tree match
+      case ValDef(_, _, rhs) =>
+        val newSyms = tree.symbol :: syms
+        foldTree(newSyms, body)(tree.symbol)
+      case _ =>
+        foldOverTree(syms, tree)(owner)
+  acc(Nil, tree)
 ```
 
 A `TreeTraverser` extends a `TreeAccumulator` and performs the same traversal
diff --git a/docs/docs/reference/metaprogramming/simple-smp.md b/docs/_docs/reference/metaprogramming/simple-smp.md
similarity index 98%
rename from docs/docs/reference/metaprogramming/simple-smp.md
rename to docs/_docs/reference/metaprogramming/simple-smp.md
index 7335135869c7..78277987c874 100644
--- a/docs/docs/reference/metaprogramming/simple-smp.md
+++ b/docs/_docs/reference/metaprogramming/simple-smp.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "The Meta-theory of Symmetric Metaprogramming"
+movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/simple-smp.html
 ---
 
 This note presents a simplified variant of
diff --git a/docs/docs/reference/metaprogramming/staging.md b/docs/_docs/reference/metaprogramming/staging.md
similarity index 95%
rename from docs/docs/reference/metaprogramming/staging.md
rename to docs/_docs/reference/metaprogramming/staging.md
index 633f7e2984b4..2b76df3f5fd5 100644
--- a/docs/docs/reference/metaprogramming/staging.md
+++ b/docs/_docs/reference/metaprogramming/staging.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Runtime Multi-Stage Programming"
+movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/staging.html
 ---
 
 The framework expresses at the same time compile-time metaprogramming and
@@ -110,10 +111,10 @@ import scala.quoted.*
 given staging.Compiler = staging.Compiler.make(getClass.getClassLoader)
 
 val f: Array[Int] => Int = staging.run {
-   val stagedSum: Expr[Array[Int] => Int] =
-      '{ (arr: Array[Int]) => ${sum('arr)}}
-   println(stagedSum.show) // Prints "(arr: Array[Int]) => { var sum = 0; ... }"
-   stagedSum
+  val stagedSum: Expr[Array[Int] => Int] =
+    '{ (arr: Array[Int]) => ${sum('arr)}}
+  println(stagedSum.show) // Prints "(arr: Array[Int]) => { var sum = 0; ... }"
+  stagedSum
 }
 
 f.apply(Array(1, 2, 3)) // Returns 6
diff --git a/docs/docs/reference/metaprogramming/tasty-inspect.md b/docs/_docs/reference/metaprogramming/tasty-inspect.md
similarity index 94%
rename from docs/docs/reference/metaprogramming/tasty-inspect.md
rename to docs/_docs/reference/metaprogramming/tasty-inspect.md
index a08e15009af1..2ab2ce84c354 100644
--- a/docs/docs/reference/metaprogramming/tasty-inspect.md
+++ b/docs/_docs/reference/metaprogramming/tasty-inspect.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "TASTy Inspection"
+movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/tasty-inspect.html
 ---
 
 ```scala
diff --git a/docs/_docs/reference/new-types/dependent-function-types-spec.md b/docs/_docs/reference/new-types/dependent-function-types-spec.md
new file mode 100644
index 000000000000..c3915ba9b8ac
--- /dev/null
+++ b/docs/_docs/reference/new-types/dependent-function-types-spec.md
@@ -0,0 +1,125 @@
+---
+layout: doc-page
+title: "Dependent Function Types - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/new-types/dependent-function-types-spec.html
+---
+
+Initial implementation in [PR #3464](https://github.com/lampepfl/dotty/pull/3464).
+
+## Syntax
+
+```
+FunArgTypes       ::=  InfixType
+                    |  ‘(’ [ FunArgType {',' FunArgType } ] ‘)’
+                    |  ‘(’ TypedFunParam {',' TypedFunParam } ‘)’
+TypedFunParam     ::=  id ‘:’ Type
+```
+
+Dependent function types associate to the right, e.g.
+`(s: S) => (t: T) => U` is the same as `(s: S) => ((t: T) => U)`.
+
+## Implementation
+
+Dependent function types are shorthands for class types that define `apply`
+methods with a dependent result type. Dependent function types desugar to
+refinement types of `scala.FunctionN`. A dependent function type
+`(x1: K1, ..., xN: KN) => R` of arity `N` translates to:
+
+```scala
+FunctionN[K1, ..., Kn, R']:
+  def apply(x1: K1, ..., xN: KN): R
+```
+
+where the result type parameter `R'` is the least upper approximation of the
+precise result type `R` without any reference to value parameters `x1, ..., xN`.
+
+The syntax and semantics of anonymous dependent functions is identical to the
+one of regular functions. Eta expansion is naturally generalized to produce
+dependent function types for methods with dependent result types.
+
+Dependent functions can be implicit, and generalize to arity `N > 22` in the
+same way that other functions do, see
+[the corresponding documentation](../dropped-features/limit22.md).
+
+## Examples
+
+The example below defines a trait `C` and the two dependent function types
+`DF` and `IDF` and prints the results of the respective function applications:
+
+[depfuntype.scala]: https://github.com/lampepfl/dotty/blob/main/tests/pos/depfuntype.scala
+
+```scala
+trait C { type M; val m: M }
+
+type DF = (x: C) => x.M
+
+type IDF = (x: C) ?=> x.M
+
+@main def test =
+  val c = new C { type M = Int; val m = 3 }
+
+  val depfun: DF = (x: C) => x.m
+  val t = depfun(c)
+  println(s"t=$t")   // prints "t=3"
+
+  val idepfun: IDF = summon[C].m
+  val u = idepfun(using c)
+  println(s"u=$u")   // prints "u=3"
+
+```
+
+In the following example the depend type `f.Eff` refers to the effect type `CanThrow`:
+
+[eff-dependent.scala]: https://github.com/lampepfl/dotty/blob/main/tests/run/eff-dependent.scala
+
+```scala
+trait Effect
+
+// Type X => Y
+abstract class Fun[-X, +Y]:
+  type Eff <: Effect
+  def apply(x: X): Eff ?=> Y
+
+class CanThrow extends Effect
+class CanIO extends Effect
+
+given ct: CanThrow = new CanThrow
+given ci: CanIO = new CanIO
+
+class I2S extends Fun[Int, String]:
+  type Eff = CanThrow
+  def apply(x: Int) = x.toString
+
+class S2I extends Fun[String, Int]:
+  type Eff = CanIO
+  def apply(x: String) = x.length
+
+// def map(f: A => B)(xs: List[A]): List[B]
+def map[A, B](f: Fun[A, B])(xs: List[A]): f.Eff ?=> List[B] =
+  xs.map(f.apply)
+
+// def mapFn[A, B]: (A => B) -> List[A] -> List[B]
+def mapFn[A, B]: (f: Fun[A, B]) => List[A] => f.Eff ?=> List[B] =
+  f => xs => map(f)(xs)
+
+// def compose(f: A => B)(g: B => C)(x: A): C
+def compose[A, B, C](f: Fun[A, B])(g: Fun[B, C])(x: A):
+  f.Eff ?=> g.Eff ?=> C =
+  g(f(x))
+
+// def composeFn: (A => B) -> (B => C) -> A -> C
+def composeFn[A, B, C]:
+  (f: Fun[A, B]) => (g: Fun[B, C]) => A => f.Eff ?=> g.Eff ?=> C =
+  f => g => x => compose(f)(g)(x)
+
+@main def test =
+  val i2s = new I2S
+  val s2i = new S2I
+
+  assert(mapFn(i2s)(List(1, 2, 3)).mkString == "123")
+  assert(composeFn(i2s)(s2i)(22) == 2)
+```
+
+### Type Checking
+
+After desugaring no additional typing rules are required for dependent function types.
diff --git a/docs/docs/reference/new-types/dependent-function-types.md b/docs/_docs/reference/new-types/dependent-function-types.md
similarity index 88%
rename from docs/docs/reference/new-types/dependent-function-types.md
rename to docs/_docs/reference/new-types/dependent-function-types.md
index 07becacc82ba..33f677276aac 100644
--- a/docs/docs/reference/new-types/dependent-function-types.md
+++ b/docs/_docs/reference/new-types/dependent-function-types.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Dependent Function Types"
+movedTo: https://docs.scala-lang.org/scala3/reference/new-types/dependent-function-types.html
 ---
 
 A dependent function type is a function type whose result depends
@@ -35,14 +36,14 @@ This type describes function values that take any argument `e` of type
 `Entry` and return a result of type `e.Key`.
 
 Recall that a normal function type `A => B` is represented as an
-instance of the [`Function1` trait](https://dotty.epfl.ch/api/scala/Function1.html)
+instance of the [`Function1` trait](https://scala-lang.org/api/3.x/scala/Function1.html)
 (i.e. `Function1[A, B]`) and analogously for functions with more parameters. Dependent functions
 are also represented as instances of these traits, but they get an additional
 refinement. In fact, the dependent function type above is just syntactic sugar for
 
 ```scala
 Function1[Entry, Entry#Key]:
-   def apply(e: Entry): e.Key
+  def apply(e: Entry): e.Key
 ```
 
 [More details](./dependent-function-types-spec.md)
diff --git a/docs/docs/reference/new-types/intersection-types-spec.md b/docs/_docs/reference/new-types/intersection-types-spec.md
similarity index 95%
rename from docs/docs/reference/new-types/intersection-types-spec.md
rename to docs/_docs/reference/new-types/intersection-types-spec.md
index 1ad0ed62601d..8ed9305e1486 100644
--- a/docs/docs/reference/new-types/intersection-types-spec.md
+++ b/docs/_docs/reference/new-types/intersection-types-spec.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Intersection Types - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/new-types/intersection-types-spec.html
 ---
 
 ## Syntax
@@ -97,7 +98,7 @@ glb(A, _)                 = A                     // use first
 In the above, `|T|` means the erased type of `T`, `JArray` refers to
 the type of Java Array.
 
-See also: [`TypeErasure#erasedGlb`](https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/core/TypeErasure.scala#L289).
+See also: [`TypeErasure#erasedGlb`](https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/core/TypeErasure.scala#L289).
 
 ## Relationship with Compound Type (`with`)
 
diff --git a/docs/docs/reference/new-types/intersection-types.md b/docs/_docs/reference/new-types/intersection-types.md
similarity index 87%
rename from docs/docs/reference/new-types/intersection-types.md
rename to docs/_docs/reference/new-types/intersection-types.md
index a2cfc1f380c8..d498e664d150 100644
--- a/docs/docs/reference/new-types/intersection-types.md
+++ b/docs/_docs/reference/new-types/intersection-types.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Intersection Types"
+movedTo: https://docs.scala-lang.org/scala3/reference/new-types/intersection-types.html
 ---
 
 Used on types, the `&` operator creates an intersection type.
@@ -11,14 +12,14 @@ The type `S & T` represents values that are of the type `S` and `T` at the same
 
 ```scala
 trait Resettable:
-   def reset(): Unit
+  def reset(): Unit
 
 trait Growable[T]:
-   def add(t: T): Unit
+  def add(t: T): Unit
 
 def f(x: Resettable & Growable[String]) =
-   x.reset()
-   x.add("first")
+  x.reset()
+  x.add("first")
 ```
 
 The parameter `x` is required to be _both_ a `Resettable` and a
@@ -35,10 +36,10 @@ of its type in `A` and its type in `B`. For instance, assume the definitions:
 
 ```scala
 trait A:
-   def children: List[A]
+  def children: List[A]
 
 trait B:
-   def children: List[B]
+  def children: List[B]
 
 val x: A & B = new C
 val ys: List[A & B] = x.children
@@ -60,7 +61,7 @@ to give at that point a definition of a `children` method with the required type
 
 ```scala
 class C extends A, B:
-   def children: List[A & B] = ???
+  def children: List[A & B] = ???
 ```
 
 
diff --git a/docs/docs/reference/new-types/match-types.md b/docs/_docs/reference/new-types/match-types.md
similarity index 90%
rename from docs/docs/reference/new-types/match-types.md
rename to docs/_docs/reference/new-types/match-types.md
index 7be51e6a09bd..a2a086f3819e 100644
--- a/docs/docs/reference/new-types/match-types.md
+++ b/docs/_docs/reference/new-types/match-types.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Match Types"
+movedTo: https://docs.scala-lang.org/scala3/reference/new-types/match-types.html
 ---
 
 A match type reduces to one of its right-hand sides, depending on the type of
@@ -8,9 +9,9 @@ its scrutinee. For example:
 
 ```scala
 type Elem[X] = X match
-   case String => Char
-   case Array[t] => t
-   case Iterable[t] => t
+  case String => Char
+  case Array[t] => t
+  case Iterable[t] => t
 ```
 
 This defines a type that reduces as follows:
@@ -38,18 +39,18 @@ Match types can form part of recursive type definitions. Example:
 
 ```scala
 type LeafElem[X] = X match
-   case String => Char
-   case Array[t] => LeafElem[t]
-   case Iterable[t] => LeafElem[t]
-   case AnyVal => X
+  case String => Char
+  case Array[t] => LeafElem[t]
+  case Iterable[t] => LeafElem[t]
+  case AnyVal => X
 ```
 
 Recursive match type definitions can also be given an upper bound, like this:
 
 ```scala
 type Concat[Xs <: Tuple, +Ys <: Tuple] <: Tuple = Xs match
-   case EmptyTuple => Ys
-   case x *: xs => x *: Concat[xs, Ys]
+  case EmptyTuple => Ys
+  case x *: xs => x *: Concat[xs, Ys]
 ```
 
 In this definition, every instance of `Concat[A, B]`, whether reducible or not,
@@ -65,10 +66,10 @@ use of the match type as the return type):
 
 ```scala
 def leafElem[X](x: X): LeafElem[X] = x match
-   case x: String      => x.charAt(0)
-   case x: Array[t]    => leafElem(x(9))
-   case x: Iterable[t] => leafElem(x.head)
-   case x: AnyVal      => x
+  case x: String      => x.charAt(0)
+  case x: Array[t]    => leafElem(x(9))
+  case x: Iterable[t] => leafElem(x.head)
+  case x: AnyVal      => x
 ```
 
 This special mode of typing for match expressions is only used when the
@@ -191,7 +192,7 @@ error message:
 
 ```scala
 type L[X] = X match
-   case Int => L[X]
+  case Int => L[X]
 
 def g[X]: L[X] = ???
 ```
@@ -213,14 +214,10 @@ type errors. If there is a stack overflow during subtyping, the exception will
 be caught and turned into a compile-time error that indicates a trace of the
 subtype tests that caused the overflow without showing a full stack trace.
 
-## Variance Laws for Match Types
 
-**Note:** This section does not reflect the current implementation.
+## Match Types Variance
 
-Within a match type `Match(S, Cs) <: B`, all occurrences of type variables count
-as covariant. By the nature of the cases `Ci` this means that occurrences in
-pattern position are contravariant (since patterns are represented as function
-type arguments).
+All type positions in a match type (scrutinee, patterns, bodies) are considered invariant.
 
 ## Related Work
 
diff --git a/docs/_docs/reference/new-types/new-types.md b/docs/_docs/reference/new-types/new-types.md
new file mode 100644
index 000000000000..dd2d1036d2e6
--- /dev/null
+++ b/docs/_docs/reference/new-types/new-types.md
@@ -0,0 +1,7 @@
+---
+layout: doc-page
+title: "New Types"
+movedTo: https://docs.scala-lang.org/scala3/reference/new-types.html
+---
+
+This chapter documents the new types introduced in Scala 3.
diff --git a/docs/docs/reference/new-types/polymorphic-function-types.md b/docs/_docs/reference/new-types/polymorphic-function-types.md
similarity index 89%
rename from docs/docs/reference/new-types/polymorphic-function-types.md
rename to docs/_docs/reference/new-types/polymorphic-function-types.md
index 1be8baca17ad..2a803f5e65db 100644
--- a/docs/docs/reference/new-types/polymorphic-function-types.md
+++ b/docs/_docs/reference/new-types/polymorphic-function-types.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Polymorphic Function Types"
+movedTo: https://docs.scala-lang.org/scala3/reference/new-types/polymorphic-function-types.html
 ---
 
 A polymorphic function type is a function type which accepts type parameters.
@@ -49,8 +50,8 @@ in a strongly-typed way:
 
 ```scala
 enum Expr[A]:
-   case Var(name: String)
-   case Apply[A, B](fun: Expr[B => A], arg: Expr[B]) extends Expr[A]
+  case Var(name: String)
+  case Apply[A, B](fun: Expr[B => A], arg: Expr[B]) extends Expr[A]
 ```
 
 We would like to provide a way for users to map a function
@@ -61,9 +62,9 @@ Here is how to implement this using polymorphic function types:
 
 ```scala
 def mapSubexpressions[A](e: Expr[A])(f: [B] => Expr[B] => Expr[B]): Expr[A] =
-   e match
-      case Apply(fun, arg) => Apply(f(fun), f(arg))
-      case Var(n) => Var(n)
+  e match
+    case Apply(fun, arg) => Apply(f(fun), f(arg))
+    case Var(n) => Var(n)
 ```
 
 And here is how to use this function to _wrap_ each subexpression
@@ -73,7 +74,7 @@ defined as a variable:
 ```scala
 val e0 = Apply(Var("f"), Var("a"))
 val e1 = mapSubexpressions(e0)(
-   [B] => (se: Expr[B]) => Apply(Var[B => B]("wrap"), se))
+  [B] => (se: Expr[B]) => Apply(Var[B => B]("wrap"), se))
 println(e1) // Apply(Apply(Var(wrap),Var(f)),Apply(Var(wrap),Var(a)))
 ```
 
diff --git a/docs/docs/reference/new-types/type-lambdas-spec.md b/docs/_docs/reference/new-types/type-lambdas-spec.md
similarity index 97%
rename from docs/docs/reference/new-types/type-lambdas-spec.md
rename to docs/_docs/reference/new-types/type-lambdas-spec.md
index 98362c004466..5c791ba40272 100644
--- a/docs/docs/reference/new-types/type-lambdas-spec.md
+++ b/docs/_docs/reference/new-types/type-lambdas-spec.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Type Lambdas - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/new-types/type-lambdas-spec.html
 ---
 
 ## Syntax
@@ -113,6 +114,3 @@ The body of a type lambda can again be a type lambda. Example:
 type TL = [X] =>> [Y] =>> (X, Y)
 ```
 Currently, no special provision is made to infer type arguments to such curried type lambdas. This is left for future work.
-
-
-
diff --git a/docs/docs/reference/new-types/type-lambdas.md b/docs/_docs/reference/new-types/type-lambdas.md
similarity index 84%
rename from docs/docs/reference/new-types/type-lambdas.md
rename to docs/_docs/reference/new-types/type-lambdas.md
index 0b69b40a4af6..8ede3f9305c7 100644
--- a/docs/docs/reference/new-types/type-lambdas.md
+++ b/docs/_docs/reference/new-types/type-lambdas.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Type Lambdas"
+movedTo: https://docs.scala-lang.org/scala3/reference/new-types/type-lambdas.html
 ---
 
 A _type lambda_ lets one express a higher-kinded type directly, without
diff --git a/docs/docs/reference/new-types/union-types-spec.md b/docs/_docs/reference/new-types/union-types-spec.md
similarity index 98%
rename from docs/docs/reference/new-types/union-types-spec.md
rename to docs/_docs/reference/new-types/union-types-spec.md
index 760bce4ec3e6..042dedea6954 100644
--- a/docs/docs/reference/new-types/union-types-spec.md
+++ b/docs/_docs/reference/new-types/union-types-spec.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Union Types - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/new-types/union-types-spec.html
 ---
 
 ## Syntax
@@ -139,7 +140,7 @@ On the other hand, the following would be allowed
 
 ```scala
 trait C { def hello: String }
-trait A extends C with D 
+trait A extends C with D
 trait B extends C with E
 
 def test(x: A | B) = x.hello // ok as `hello` is a member of the join of A | B which is C
diff --git a/docs/docs/reference/new-types/union-types.md b/docs/_docs/reference/new-types/union-types.md
similarity index 85%
rename from docs/docs/reference/new-types/union-types.md
rename to docs/_docs/reference/new-types/union-types.md
index 4de0fd842421..9c52cff3864d 100644
--- a/docs/docs/reference/new-types/union-types.md
+++ b/docs/_docs/reference/new-types/union-types.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Union Types"
+movedTo: https://docs.scala-lang.org/scala3/reference/new-types/union-types.html
 ---
 
 A union type `A | B` has as values all values of type `A` and also all values of type `B`.
@@ -11,10 +12,10 @@ case class UserName(name: String)
 case class Password(hash: Hash)
 
 def help(id: UserName | Password) =
-   val user = id match
-      case UserName(name) => lookupName(name)
-      case Password(hash) => lookupPassword(hash)
-   ...
+  val user = id match
+    case UserName(name) => lookupName(name)
+    case Password(hash) => lookupPassword(hash)
+  ...
 ```
 
 Union types are duals of intersection types. `|` is _commutative_:
diff --git a/docs/docs/reference/other-new-features/control-syntax.md b/docs/_docs/reference/other-new-features/control-syntax.md
similarity index 89%
rename from docs/docs/reference/other-new-features/control-syntax.md
rename to docs/_docs/reference/other-new-features/control-syntax.md
index 544eb5ebd584..2f0bbde41331 100644
--- a/docs/docs/reference/other-new-features/control-syntax.md
+++ b/docs/_docs/reference/other-new-features/control-syntax.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: New Control Syntax
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/control-syntax.html
 ---
 
 Scala 3 has a new "quiet" syntax for control expressions that does not rely on
@@ -8,11 +9,11 @@ enclosing the condition in parentheses, and also allows to drop parentheses or b
 around the generators of a `for`-expression. Examples:
 ```scala
 if x < 0 then
-   "negative"
+  "negative"
 else if x == 0 then
-   "zero"
+  "zero"
 else
-   "positive"
+  "positive"
 
 if x < 0 then -x else x
 
@@ -22,10 +23,10 @@ for x <- xs if x > 0
 yield x * x
 
 for
-   x <- xs
-   y <- ys
+  x <- xs
+  y <- ys
 do
-   println(x + y)
+  println(x + y)
 
 try body
 catch case ex: IOException => handle
diff --git a/docs/docs/reference/other-new-features/creator-applications.md b/docs/_docs/reference/other-new-features/creator-applications.md
similarity index 89%
rename from docs/docs/reference/other-new-features/creator-applications.md
rename to docs/_docs/reference/other-new-features/creator-applications.md
index 219fb16d2ea0..17bc1574f763 100644
--- a/docs/docs/reference/other-new-features/creator-applications.md
+++ b/docs/_docs/reference/other-new-features/creator-applications.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Universal Apply Methods"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/creator-applications.html
 ---
 
 Scala case classes generate apply methods, so that values of case classes can be created using simple
@@ -10,7 +11,7 @@ Scala 3 generalizes this scheme to all concrete classes. Example:
 
 ```scala
 class StringBuilder(s: String):
-   def this() = this("")
+  def this() = this("")
 
 StringBuilder("abc")  // old: new StringBuilder("abc")
 StringBuilder()       // old: new StringBuilder()
@@ -21,8 +22,8 @@ is generated together with the class. The object looks like this:
 
 ```scala
 object StringBuilder:
-   inline def apply(s: String): StringBuilder = new StringBuilder(s)
-   inline def apply(): StringBuilder = new StringBuilder()
+  inline def apply(s: String): StringBuilder = new StringBuilder(s)
+  inline def apply(): StringBuilder = new StringBuilder()
 ```
 
 The synthetic object `StringBuilder` and its `apply` methods are called _constructor proxies_.
diff --git a/docs/_docs/reference/other-new-features/experimental-defs.md b/docs/_docs/reference/other-new-features/experimental-defs.md
new file mode 100644
index 000000000000..ef9eca1ea7f5
--- /dev/null
+++ b/docs/_docs/reference/other-new-features/experimental-defs.md
@@ -0,0 +1,316 @@
+---
+layout: doc-page
+title: "Experimental Definitions"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/experimental-defs.html
+---
+
+The [`@experimental`](https://scala-lang.org/api/3.x/scala/annotation/experimental.html) annotation allows the definition of an API that is not guaranteed backward binary or source compatibility.
+This annotation can be placed on term or type definitions.
+
+## References to experimental definitions
+
+Experimental definitions can only be referenced in an experimental scope. Experimental scopes are defined as follows:
+
+1. The RHS of an experimental `def`, `val`, `var`, `given` or `type` is an experimental scope. Examples:
+
+   <details>
+   <summary>Example 1</summary>
+
+   ```scala
+   import scala.annotation.experimental
+
+   @experimental
+   def x = ()
+
+   def d1 = x // error: value x is marked @experimental and therefore ...
+   @experimental def d2 = x
+
+   val v1 = x // error: value x is marked @experimental and therefore ...
+   @experimental val v2 = x
+
+   var vr1 = x // error: value x is marked @experimental and therefore ...
+   @experimental var vr2 = x
+
+   lazy val lv1 = x // error: value x is marked @experimental and therefore ...
+   @experimental lazy val lv2 = x
+   ```
+   </details>
+
+   <details>
+   <summary>Example 2</summary>
+   
+   ```scala
+   import scala.annotation.experimental
+
+   @experimental
+   val x = ()
+
+   @experimental
+   def f() = ()
+
+   @experimental
+   object X:
+     def fx() = 1
+
+   def test1: Unit =
+     f() // error: def f is marked @experimental and therefore ...
+     x // error: value x is marked @experimental and therefore ...
+     X.fx() // error: object X is marked @experimental and therefore ...
+     import X.fx
+     fx() // error: object X is marked @experimental and therefore ...
+
+   @experimental
+   def test2: Unit =
+     // references to f, x and X are ok because `test2` is experimental
+     f()
+     x
+     X.fx()
+     import X.fx
+     fx()
+   ```
+   </details>
+
+   <details>
+   <summary>Example 3</summary>
+   
+   ```scala
+   import scala.annotation.experimental
+
+   @experimental type E
+
+   type A = E // error type E is marked @experimental and therefore ...
+   @experimental type B = E
+   ```
+   </details>
+
+   <details>
+   <summary>Example 4</summary>
+   
+   ```scala
+   import scala.annotation.experimental
+
+   @experimental class A
+   @experimental type X
+   @experimental type Y = Int
+   @experimental opaque type Z = Int
+
+   def test: Unit =
+     new A // error: class A is marked @experimental and therefore ...
+     val i0: A = ??? // error: class A is marked @experimental and therefore ...
+     val i1: X = ??? // error: type X is marked @experimental and therefore ...
+     val i2: Y = ??? // error: type Y is marked @experimental and therefore ...
+     val i2: Z = ??? // error: type Y is marked @experimental and therefore ...
+     ()
+   ```
+   </details>
+
+   <details>
+   <summary>Example 5</summary>
+   
+   ```scala
+   @experimental
+   trait ExpSAM {
+     def foo(x: Int): Int
+   }
+   def bar(f: ExpSAM): Unit = {} // error: error form rule 2
+
+   def test: Unit =
+     bar(x => x) // error: reference to experimental SAM
+     ()
+   ```
+   </details>
+
+2. The signatures of an experimental `def`, `val`, `var`, `given` and `type`, or constructors of `class` and `trait` are experimental scopes. Examples:
+
+   <details>
+   <summary>Example 1</summary>
+
+   ```scala
+   import scala.annotation.experimental
+
+   @experimental def x = 2
+   @experimental class A
+   @experimental type X
+   @experimental type Y = Int
+   @experimental opaque type Z = Int
+
+   def test1(
+     p1: A, // error: class A is marked @experimental and therefore ...
+     p2: List[A], // error: class A is marked @experimental and therefore ...
+     p3: X, // error: type X is marked @experimental and therefore ...
+     p4: Y, // error: type Y is marked @experimental and therefore ...
+     p5: Z, // error: type Z is marked @experimental and therefore ...
+     p6: Any = x // error: def x is marked @experimental and therefore ...
+   ): A = ??? // error: class A is marked @experimental and therefore ...
+
+   @experimental def test2(
+     p1: A,
+     p2: List[A],
+     p3: X,
+     p4: Y,
+     p5: Z,
+     p6: Any = x
+   ): A = ???
+
+   class Test1(
+     p1: A, // error
+     p2: List[A], // error
+     p3: X, // error
+     p4: Y, // error
+     p5: Z, // error
+     p6: Any = x // error
+   ) {}
+
+   @experimental class Test2(
+     p1: A,
+     p2: List[A],
+     p3: X,
+     p4: Y,
+     p5: Z,
+     p6: Any = x
+   ) {}
+
+   trait Test1(
+     p1: A, // error
+     p2: List[A], // error
+     p3: X, // error
+     p4: Y, // error
+     p5: Z, // error
+     p6: Any = x // error
+   ) {}
+
+   @experimental trait Test2(
+     p1: A,
+     p2: List[A],
+     p3: X,
+     p4: Y,
+     p5: Z,
+     p6: Any = x
+   ) {}
+   ```
+   </details>
+
+3. The `extends` clause of an experimental `class`, `trait` or `object` is an experimental scope. Examples:
+
+   <details>
+   <summary>Example 1</summary>
+
+   ```scala
+   import scala.annotation.experimental
+
+   @experimental def x = 2
+
+   @experimental class A1(x: Any)
+   class A2(x: Any)
+
+
+   @experimental class B1 extends A1(1)
+   class B2 extends A1(1) // error: class A1 is marked @experimental and therefore marked @experimental and therefore ...
+
+   @experimental class C1 extends A2(x)
+   class C2 extends A2(x) // error def x is marked @experimental and therefore
+   ```
+   </details>
+
+4. The body of an experimental `class`, `trait` or `object` is an experimental scope. Examples:
+
+   <details>
+   <summary>Example 1</summary>
+   ```scala
+   import scala.annotation.experimental
+
+   @experimental def x = 2
+
+   @experimental class A {
+     def f = x // ok because A is experimental
+   }
+
+   @experimental class B {
+     def f = x // ok because A is experimental
+   }
+
+   @experimental object C {
+     def f = x // ok because A is experimental
+   }
+
+   @experimental class D {
+     def f = {
+       object B {
+         x // ok because A is experimental
+       }
+     }
+   }
+   ```
+   </details>
+
+5. Annotations of an experimental definition are in experimental scopes. Examples:
+
+   <details>
+   <summary>Example 1</summary>
+
+   ```scala
+   import scala.annotation.experimental
+
+   @experimental class myExperimentalAnnot extends scala.annotation.Annotation
+
+   @myExperimentalAnnot // error
+   def test: Unit = ()
+
+   @experimental
+   @myExperimentalAnnot
+   def test: Unit = ()
+   ```
+
+   </details>
+
+6. Any code compiled using a [_Nightly_](https://search.maven.org/artifact/org.scala-lang/scala3-compiler_3) or _Snapshot_ version of the compiler is considered to be in an experimental scope.
+Can use the `-Yno-experimental` compiler flag to disable it and run as a proper release.
+
+In any other situation, a reference to an experimental definition will cause a compilation error.
+
+## Experimental inheritance
+
+All subclasses of an experimental `class` or `trait` must be marked as [`@experimental`](https://scala-lang.org/api/3.x/scala/annotation/experimental.html) even if they are in an experimental scope.
+Anonymous classes and SAMs of experimental classes are considered experimental.
+
+We require explicit annotations to make sure we do not have completion or cycles issues with nested classes. This restriction could be relaxed in the future.
+
+## Experimental overriding
+
+For an overriding member `M` and overridden member `O`, if `O` is non-experimental then `M` must be non-experimental.
+
+This makes sure that we cannot have accidental binary incompatibilities such as the following change.
+```diff
+class A:
+  def f: Any = 1
+class B extends A:
+-  @experimental def f: Int = 2
+```
+
+## Test frameworks
+
+Tests can be defined as experimental. Tests frameworks can execute tests using reflection even if they are in an experimental class, object or method. Examples:
+
+<details>
+<summary>Example 1</summary>
+
+Test that touch experimental APIs can be written as follows
+
+```scala
+import scala.annotation.experimental
+
+@experimental def x = 2
+
+class MyTests {
+  /*@Test*/ def test1 = x // error
+  @experimental /*@Test*/ def test2 = x
+}
+
+@experimental
+class MyExperimentalTests {
+  /*@Test*/ def test1 = x
+  /*@Test*/ def test2 = x
+}
+```
+
+</details>
diff --git a/docs/docs/reference/other-new-features/export.md b/docs/_docs/reference/other-new-features/export.md
similarity index 84%
rename from docs/docs/reference/other-new-features/export.md
rename to docs/_docs/reference/other-new-features/export.md
index 5ded49aebc75..ce1d536a1432 100644
--- a/docs/docs/reference/other-new-features/export.md
+++ b/docs/_docs/reference/other-new-features/export.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Export Clauses"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/export.html
 ---
 
 An export clause defines aliases for selected members of an object. Example:
@@ -10,22 +11,22 @@ class BitMap
 class InkJet
 
 class Printer:
-   type PrinterType
-   def print(bits: BitMap): Unit = ???
-   def status: List[String] = ???
+  type PrinterType
+  def print(bits: BitMap): Unit = ???
+  def status: List[String] = ???
 
 class Scanner:
-   def scan(): BitMap = ???
-   def status: List[String] = ???
+  def scan(): BitMap = ???
+  def status: List[String] = ???
 
 class Copier:
-   private val printUnit = new Printer { type PrinterType = InkJet }
-   private val scanUnit = new Scanner
+  private val printUnit = new Printer { type PrinterType = InkJet }
+  private val scanUnit = new Scanner
 
-   export scanUnit.scan
-   export printUnit.{status => _, _}
+  export scanUnit.scan
+  export printUnit.{status => _, *}
 
-   def status: List[String] = printUnit.status ++ scanUnit.status
+  def status: List[String] = printUnit.status ++ scanUnit.status
 ```
 
 The two `export` clauses define the following _export aliases_ in class `Copier`:
@@ -43,7 +44,7 @@ val copier = new Copier
 copier.print(copier.scan())
 ```
 
-An export clause has the same format as an import clause. Its general form is:
+An `export` clause has the same format as an import clause. Its general form is:
 
 ```scala
 export path . { sel_1, ..., sel_n }
@@ -58,8 +59,12 @@ of one of the following forms:
  - An _omitting selector_ `x => _` prevents `x` from being aliased by a subsequent
    wildcard selector.
  - A _given selector_ `given x` has an optional type bound `x`. It creates aliases for all eligible given instances that conform to either `x`, or `Any` if `x` is omitted, except for members that are named by a previous simple, renaming, or omitting selector.
- - A _wildcard selector_ `_` creates aliases for all eligible members of `path` except for given instances,
+ - A _wildcard selector_ `*` creates aliases for all eligible members of `path` except for given instances,
    synthetic members generated by the compiler and those members that are named by a previous simple, renaming, or omitting selector.
+   \
+   Notes:
+   - eligible construtor proxies are also included, even though they are synthetic members.
+   - members created by an export are also included. They are created by the compiler, but are not considered synthetic.
 
 A member is _eligible_ if all of the following holds:
 
@@ -73,7 +78,7 @@ A member is _eligible_ if all of the following holds:
 It is a compile-time error if a simple or renaming selector does not identify any eligible members.
 
 Type members are aliased by type definitions, and term members are aliased by method definitions. Export aliases copy the type and value parameters of the members they refer to.
-Export aliases are always `final`. Aliases of given instances are again defined as givens (and aliases of old-style implicits are `implicit`). Aliases of inline methods or values are again defined `inline`. There are no other modifiers that can be given to an alias. This has the following consequences for overriding:
+Export aliases are always `final`. Aliases of given instances are again defined as givens (and aliases of old-style implicits are `implicit`). Aliases of extensions are again defined as extensions. Aliases of inline methods or values are again defined `inline`. There are no other modifiers that can be given to an alias. This has the following consequences for overriding:
 
  - Export aliases cannot be overridden, since they are final.
  - Export aliases cannot override concrete members in base classes, since they are
@@ -131,7 +136,7 @@ ImportSpec        ::=  NamedSelector
                     |  WildcardSelector
                     | ‘{’ ImportSelectors) ‘}’
 NamedSelector     ::=  id [‘as’ (id | ‘_’)]
-WildCardSelector  ::=  ‘*' | ‘given’ [InfixType]
+WildCardSelector  ::=  ‘*’ | ‘given’ [InfixType]
 ImportSelectors   ::=  NamedSelector [‘,’ ImportSelectors]
                     |  WildCardSelector {‘,’ WildCardSelector}
 ```
@@ -144,15 +149,15 @@ Consider the following example:
 ```scala
 class B { val c: Int }
 object a { val b = new B }
-export a._
-export b._
+export a.*
+export b.*
 ```
 
-Is the `export b._` clause legal? If yes, what does it export? Is it equivalent to `export a.b._`? What about if we swap the last two clauses?
+Is the `export b.*` clause legal? If yes, what does it export? Is it equivalent to `export a.b.*`? What about if we swap the last two clauses?
 
 ```
-export b._
-export a._
+export b.*
+export a.*
 ```
 
 To avoid tricky questions like these, we fix the elaboration order of exports as follows.
@@ -168,8 +173,7 @@ Export clauses are processed when the type information of the enclosing object o
 
     With export clauses, the following steps are added:
 
- 6. Compute the types of all paths in export clauses in a context logically
-    inside the class but not considering any imports or exports in that class.
+ 6. Compute the types of all paths in export clauses.
  7. Enter export aliases for the eligible members of all paths in export clauses.
 
 It is important that steps 6 and 7 are done in sequence: We first compute the types of _all_
diff --git a/docs/docs/reference/other-new-features/indentation-experimental.md b/docs/_docs/reference/other-new-features/indentation-experimental.md
similarity index 83%
rename from docs/docs/reference/other-new-features/indentation-experimental.md
rename to docs/_docs/reference/other-new-features/indentation-experimental.md
index 48bc271df67f..cbdd41eeaf12 100644
--- a/docs/docs/reference/other-new-features/indentation-experimental.md
+++ b/docs/_docs/reference/other-new-features/indentation-experimental.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Fewer Braces"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/indentation-experimental.html
 ---
 
 By and large, the possible indentation regions coincide with those regions where braces `{...}` are also legal, no matter whether the braces enclose an expression or a set of definitions. There is one exception, though: Arguments to function can be enclosed in braces but they cannot be simply indented instead. Making indentation always significant for function arguments would be too restrictive and fragile.
@@ -19,31 +20,31 @@ This variant is more contentious and less stable than the rest of the significan
 Similar to what is done for classes and objects, a `:` that follows a function reference at the end of a line means braces can be omitted for function arguments. Example:
 ```scala
 times(10):
-   println("ah")
-   println("ha")
+  println("ah")
+  println("ha")
 ```
 
 The colon can also follow an infix operator:
 
 ```scala
 credentials ++ :
-   val file = Path.userHome / ".credentials"
-   if file.exists
-   then Seq(Credentials(file))
-   else Seq()
+  val file = Path.userHome / ".credentials"
+  if file.exists
+  then Seq(Credentials(file))
+  else Seq()
 ```
 
 Function calls that take multiple argument lists can also be handled this way:
 
 ```scala
 val firstLine = files.get(fileName).fold:
-      val fileNames = files.values
-      s"""no file named $fileName found among
-         |${values.mkString(\n)}""".stripMargin
-   :
-      f =>
-         val lines = f.iterator.map(_.readLine)
-         lines.mkString("\n)
+    val fileNames = files.values
+    s"""no file named $fileName found among
+      |${values.mkString(\n)}""".stripMargin
+  :
+    f =>
+      val lines = f.iterator.map(_.readLine)
+      lines.mkString("\n)
 ```
 
 
@@ -52,10 +53,10 @@ val firstLine = files.get(fileName).fold:
 Braces can also be omitted around multiple line function value arguments:
 ```scala
 val xs = elems.map x =>
-   val y = x - 1
-   y * y
+  val y = x - 1
+  y * y
 xs.foldLeft (x, y) =>
-   x + y
+  x + y
 ```
 Braces can be omitted if the lambda starts with a parameter list and `=>` or `=>?` at the end of one line and it has an indented body on the following lines.
 
diff --git a/docs/docs/reference/other-new-features/indentation.md b/docs/_docs/reference/other-new-features/indentation.md
similarity index 84%
rename from docs/docs/reference/other-new-features/indentation.md
rename to docs/_docs/reference/other-new-features/indentation.md
index 4b1b78a9bf4e..c7a6fdbb7453 100644
--- a/docs/docs/reference/other-new-features/indentation.md
+++ b/docs/_docs/reference/other-new-features/indentation.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Optional Braces"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/indentation.html
 ---
 
 Scala 3 enforces some rules on indentation and allows some occurrences of braces `{...}` to be optional:
@@ -68,6 +69,9 @@ There are two rules:
        if  match  return  then  throw  try  while  yield
        ```
 
+     - after the closing `)` of a condition in an old-style `if` or `while`.
+     - after the closing `)` or `}` of the enumerations of an old-style `for` loop without a `do`.
+
     If an `<indent>` is inserted, the indentation width of the token on the next line
     is pushed onto `IW`, which makes it the new current indentation width.
 
@@ -100,9 +104,9 @@ It is an error if the indentation width of the token following an `<outdent>` do
 
 ```scala
 if x < 0 then
-     -x
+    -x
   else   // error: `else` does not align correctly
-     x
+    x
 ```
 
 Indentation tokens are only inserted in regions where newline statement separators are also inferred:
@@ -141,25 +145,25 @@ With these new rules, the following constructs are all valid:
 
 ```scala
 trait A:
-   def f: Int
+  def f: Int
 
 class C(x: Int) extends A:
-   def f = x
+  def f = x
 
 object O:
-   def f = 3
+  def f = 3
 
 enum Color:
-   case Red, Green, Blue
+  case Red, Green, Blue
 
 new A:
-   def f = 3
+  def f = 3
 
 package p:
-   def a = 1
+  def a = 1
 
 package q:
-   def b = 2
+  def b = 2
 ```
 
 In each case, the `:` at the end of line can be replaced without change of meaning by a pair of braces that enclose the following indented definition(s).
@@ -199,13 +203,13 @@ Indentation can be mixed freely with braces `{...}`, as well as brackets `[...]`
 For instance, consider:
 ```scala
 {
-   val x = f(x: Int, y =>
-      x * (
-         y + 1
-      ) +
-      (x +
-      x)
-   )
+  val x = f(x: Int, y =>
+    x * (
+      y + 1
+    ) +
+    (x +
+    x)
+  )
 }
 ```
  - Here, the indentation width of the region enclosed by the braces is 3 (i.e. the indentation width of the
@@ -247,12 +251,12 @@ To solve this problem, Scala 3 offers an optional `end` marker. Example:
 
 ```scala
 def largeMethod(...) =
-   ...
-   if ... then ...
-   else
-      ... // a large block
-   end if
-   ... // more code
+  ...
+  if ... then ...
+  else
+    ... // a large block
+  end if
+  ... // more code
 end largeMethod
 ```
 
@@ -279,47 +283,47 @@ For instance, the following end markers are all legal:
 ```scala
 package p1.p2:
 
-   abstract class C():
-
-      def this(x: Int) =
-         this()
-         if x > 0 then
-            val a :: b =
-               x :: Nil
-            end val
-            var y =
-               x
-            end y
-            while y > 0 do
-               println(y)
-               y -= 1
-            end while
-            try
-               x match
-                  case 0 => println("0")
-                  case _ =>
-               end match
-            finally
-               println("done")
-            end try
-         end if
-      end this
-
-      def f: String
-   end C
-
-   object C:
-      given C =
-         new C:
-            def f = "!"
-            end f
-         end new
-      end given
-   end C
-
-   extension (x: C)
-      def ff: String = x.f ++ x.f
-   end extension
+  abstract class C():
+
+    def this(x: Int) =
+      this()
+      if x > 0 then
+        val a :: b =
+          x :: Nil
+        end val
+        var y =
+          x
+        end y
+        while y > 0 do
+          println(y)
+          y -= 1
+        end while
+        try
+          x match
+            case 0 => println("0")
+            case _ =>
+          end match
+        finally
+          println("done")
+        end try
+      end if
+    end this
+
+    def f: String
+  end C
+
+  object C:
+    given C =
+      new C:
+        def f = "!"
+        end f
+      end new
+    end given
+  end C
+
+  extension (x: C)
+    def ff: String = x.f ++ x.f
+  end extension
 
 end p2
 ```
@@ -351,56 +355,56 @@ Here is a (somewhat meta-circular) example of code using indentation. It provide
 
 ```scala
 enum IndentWidth:
-   case Run(ch: Char, n: Int)
-   case Conc(l: IndentWidth, r: Run)
-
-   def <= (that: IndentWidth): Boolean = this match
-      case Run(ch1, n1) =>
-         that match
-            case Run(ch2, n2) => n1 <= n2 && (ch1 == ch2 || n1 == 0)
-            case Conc(l, r)   => this <= l
-      case Conc(l1, r1) =>
-         that match
-            case Conc(l2, r2) => l1 == l2 && r1 <= r2
-            case _            => false
-
-   def < (that: IndentWidth): Boolean =
-      this <= that && !(that <= this)
-
-   override def toString: String =
-      this match
+  case Run(ch: Char, n: Int)
+  case Conc(l: IndentWidth, r: Run)
+
+  def <= (that: IndentWidth): Boolean = this match
+    case Run(ch1, n1) =>
+      that match
+        case Run(ch2, n2) => n1 <= n2 && (ch1 == ch2 || n1 == 0)
+        case Conc(l, r)   => this <= l
+    case Conc(l1, r1) =>
+      that match
+        case Conc(l2, r2) => l1 == l2 && r1 <= r2
+        case _            => false
+
+  def < (that: IndentWidth): Boolean =
+    this <= that && !(that <= this)
+
+  override def toString: String =
+    this match
       case Run(ch, n) =>
-         val kind = ch match
-            case ' '  => "space"
-            case '\t' => "tab"
-            case _    => s"'$ch'-character"
-         val suffix = if n == 1 then "" else "s"
-         s"$n $kind$suffix"
+        val kind = ch match
+          case ' '  => "space"
+          case '\t' => "tab"
+          case _    => s"'$ch'-character"
+        val suffix = if n == 1 then "" else "s"
+        s"$n $kind$suffix"
       case Conc(l, r) =>
-         s"$l, $r"
+        s"$l, $r"
 
 object IndentWidth:
-   private inline val MaxCached = 40
+  private inline val MaxCached = 40
 
-   private val spaces = IArray.tabulate(MaxCached + 1)(new Run(' ', _))
-   private val tabs = IArray.tabulate(MaxCached + 1)(new Run('\t', _))
+  private val spaces = IArray.tabulate(MaxCached + 1)(new Run(' ', _))
+  private val tabs = IArray.tabulate(MaxCached + 1)(new Run('\t', _))
 
-   def Run(ch: Char, n: Int): Run =
-      if n <= MaxCached && ch == ' ' then
-         spaces(n)
-      else if n <= MaxCached && ch == '\t' then
-         tabs(n)
-      else
-         new Run(ch, n)
-   end Run
+  def Run(ch: Char, n: Int): Run =
+    if n <= MaxCached && ch == ' ' then
+      spaces(n)
+    else if n <= MaxCached && ch == '\t' then
+      tabs(n)
+    else
+      new Run(ch, n)
+  end Run
 
-   val Zero = Run(' ', 0)
+  val Zero = Run(' ', 0)
 end IndentWidth
 ```
 
 ### Settings and Rewrites
 
-Significant indentation is enabled by default. It can be turned off by giving any of the options `-no-indent`, `old-syntax` and `language:Scala2`. If indentation is turned off, it is nevertheless checked that indentation conforms to the logical program structure as defined by braces. If that is not the case, the compiler issues a warning.
+Significant indentation is enabled by default. It can be turned off by giving any of the options `-no-indent`, `-old-syntax` and `-language:Scala2`. If indentation is turned off, it is nevertheless checked that indentation conforms to the logical program structure as defined by braces. If that is not the case, the compiler issues a warning.
 
 The Scala 3 compiler can rewrite source code to indented code and back.
 When invoked with options `-rewrite -indent` it will rewrite braces to
@@ -420,17 +424,17 @@ This variant is more contentious and less stable than the rest of the significan
 
 ```scala
 times(10):
-   println("ah")
-   println("ha")
+  println("ah")
+  println("ha")
 ```
 
 or
 
 ```scala
 xs.map:
-   x =>
-      val y = x - 1
-      y * y
+  x =>
+    val y = x - 1
+    y * y
 ```
 
 The colon is usable not only for lambdas and by-name parameters, but
@@ -438,10 +442,10 @@ also even for ordinary parameters:
 
 ```scala
 credentials ++ :
-   val file = Path.userHome / ".credentials"
-   if file.exists
-   then Seq(Credentials(file))
-   else Seq()
+  val file = Path.userHome / ".credentials"
+  if file.exists
+  then Seq(Credentials(file))
+  else Seq()
 ```
 
 How does this syntax variant work? Colons at the end of lines are their own token, distinct from normal `:`.
diff --git a/docs/docs/reference/other-new-features/kind-polymorphism.md b/docs/_docs/reference/other-new-features/kind-polymorphism.md
similarity index 84%
rename from docs/docs/reference/other-new-features/kind-polymorphism.md
rename to docs/_docs/reference/other-new-features/kind-polymorphism.md
index 0f3899a42a46..057e9de9d55d 100644
--- a/docs/docs/reference/other-new-features/kind-polymorphism.md
+++ b/docs/_docs/reference/other-new-features/kind-polymorphism.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Kind Polymorphism"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/kind-polymorphism.html
 ---
 
 Normally type parameters in Scala are partitioned into _kinds_. First-level types are types of values. Higher-kinded types are type constructors
@@ -13,7 +14,7 @@ _must_ be applied to a type argument, unless they are passed to type parameters
 
 Sometimes we would like to have type parameters that can have more than one kind, for instance to define an implicit
 value that works for parameters of any kind. This is now possible through a form of (_subtype_) kind polymorphism.
-Kind polymorphism relies on the special type `scala.AnyKind` that can be used as an upper bound of a type.
+Kind polymorphism relies on the special type [`scala.AnyKind`](https://scala-lang.org/api/3.x/scala/AnyKind.html) that can be used as an upper bound of a type.
 
 ```scala
 def f[T <: AnyKind] = ...
@@ -37,7 +38,7 @@ through advanced uses of implicits.
 
 (todo: insert good concise example)
 
-Some technical details: `AnyKind` is a synthesized class just like `Any`, but without any members. It extends no other class.
+Some technical details: [`AnyKind`](https://scala-lang.org/api/3.x/scala/AnyKind.html) is a synthesized class just like `Any`, but without any members. It extends no other class.
 It is declared `abstract` and `final`, so it can be neither instantiated nor extended.
 
 `AnyKind` plays a special role in Scala's subtype system: It is a supertype of all other types no matter what their kind is. It is also assumed to be kind-compatible with all other types. Furthermore, `AnyKind` is treated as a higher-kinded type (so it cannot be used as a type of values), but at the same time it has no type parameters (so it cannot be instantiated).
diff --git a/docs/_docs/reference/other-new-features/matchable.md b/docs/_docs/reference/other-new-features/matchable.md
new file mode 100644
index 000000000000..b1bb16697d62
--- /dev/null
+++ b/docs/_docs/reference/other-new-features/matchable.md
@@ -0,0 +1,140 @@
+---
+layout: doc-page
+title: "The Matchable Trait"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/matchable.html
+---
+
+A new trait [`Matchable`](https://scala-lang.org/api/3.x/scala/Matchable.html) controls the ability to pattern match.
+
+### The Problem
+
+The Scala 3 standard library has a type [`IArray`](https://scala-lang.org/api/3.x/scala.html#IArray-0) for immutable
+arrays that is defined like this:
+
+```scala
+  opaque type IArray[+T] = Array[_ <: T]
+```
+
+The `IArray` type offers extension methods for `length` and `apply`, but not for `update`; hence it seems values of type `IArray` cannot be updated.
+
+However, there is a potential hole due to pattern matching. Consider:
+
+```scala
+val imm: IArray[Int] = ...
+imm match
+  case a: Array[Int] => a(0) = 1
+```
+
+The test will succeed at runtime since [`IArray`](https://scala-lang.org/api/3.x/scala.html#IArray-0)s _are_ represented as
+`Array`s at runtime. But if we allowed it, it would break the fundamental abstraction of immutable arrays.
+
+__Aside:__ One could also achieve the same by casting:
+
+```scala
+imm.asInstanceOf[Array[Int]](0) = 1
+```
+
+But that is not as much of a problem since in Scala `asInstanceOf` is understood to be low-level and unsafe. By contrast, a pattern match that compiles without warning or error should not break abstractions.
+
+Note also that the problem is not tied to [opaque types](opaques.md) as match selectors. The following slight variant with a value of parametric
+type `T` as match selector leads to the same problem:
+
+```scala
+def f[T](x: T) = x match
+  case a: Array[Int] => a(0) = 0
+f(imm)
+```
+
+Finally, note that the problem is not linked to just [opaque types](opaques.md). No unbounded type parameter or abstract type should be decomposable with a pattern match.
+
+### The Solution
+
+There is a new type [`scala.Matchable`](https://scala-lang.org/api/3.x/scala/Matchable.html) that controls pattern matching. When typing a pattern match of a constructor pattern `C(...)` or
+a type pattern `_: C` it is required that the selector type conforms
+to `Matchable`. If that's not the case a warning is issued. For instance when compiling the example at the start of this section we get:
+
+```
+> sc ../new/test.scala -source future
+-- Warning: ../new/test.scala:4:12 ---------------------------------------------
+4 |    case a: Array[Int] => a(0) = 0
+  |            ^^^^^^^^^^
+  |            pattern selector should be an instance of Matchable,
+  |            but it has unmatchable type IArray[Int] instead
+```
+
+To allow migration from Scala 2 and cross-compiling
+between Scala 2 and 3 the warning is turned on only for `-source future-migration` or higher.
+
+[`Matchable`](https://scala-lang.org/api/3.x/scala/Matchable.html) is a universal trait with `Any` as its parent class. It is extended by both [`AnyVal`](https://scala-lang.org/api/3.x/scala/AnyVal.html) and [`AnyRef`](https://scala-lang.org/api/3.x/scala/AnyRef.html). Since `Matchable` is a supertype of every concrete value or reference class it means that instances of such classes can be matched as before. However, match selectors of the following types will produce a warning:
+
+- Type `Any`: if pattern matching is required one should use `Matchable` instead.
+- Unbounded type parameters and abstract types: If pattern matching is required they should have an upper bound `Matchable`.
+- Type parameters and abstract types that are only bounded by some
+  universal trait: Again, `Matchable` should be added as a bound.
+
+Here is the hierarchy of top-level classes and traits with their defined methods:
+
+```scala
+abstract class Any:
+  def getClass
+  def isInstanceOf
+  def asInstanceOf
+  def ==
+  def !=
+  def ##
+  def equals
+  def hashCode
+  def toString
+
+trait Matchable extends Any
+
+class AnyVal extends Any, Matchable
+class Object extends Any, Matchable
+```
+
+[`Matchable`](https://scala-lang.org/api/3.x/scala/Matchable.html) is currently a marker trait without any methods. Over time
+we might migrate methods `getClass` and `isInstanceOf` to it, since these are closely related to pattern-matching.
+
+### `Matchable` and Universal Equality
+
+Methods that pattern-match on selectors of type `Any` will need a cast once the
+Matchable warning is turned on. The most common such method is the universal
+`equals` method. It will have to be written as in the following example:
+
+```scala
+class C(val x: String):
+
+  override def equals(that: Any): Boolean =
+    that.asInstanceOf[Matchable] match
+      case that: C => this.x == that.x
+      case _ => false
+```
+
+The cast of `that` to [`Matchable`](https://scala-lang.org/api/3.x/scala/Matchable.html) serves as an indication that universal equality
+is unsafe in the presence of abstract types and opaque types since it cannot properly distinguish the meaning of a type from its representation. The cast
+is guaranteed to succeed at run-time since `Any` and [`Matchable`](https://scala-lang.org/api/3.x/scala/Matchable.html) both erase to
+`Object`.
+
+For instance, consider the definitions
+
+```scala
+opaque type Meter = Double
+def Meter(x: Double) = x
+
+opaque type Second = Double
+def Second(x: Double) = x
+```
+
+Here, universal `equals` will return true for
+
+```scala
+  Meter(10).equals(Second(10))
+```
+
+even though this is clearly false mathematically. With [multiversal equality](../contextual/multiversal-equality.md) one can mitigate that problem somewhat by turning
+
+```scala
+  Meter(10) == Second(10)
+```
+
+into a type error.
diff --git a/docs/docs/reference/other-new-features/opaques-details.md b/docs/_docs/reference/other-new-features/opaques-details.md
similarity index 80%
rename from docs/docs/reference/other-new-features/opaques-details.md
rename to docs/_docs/reference/other-new-features/opaques-details.md
index ef8d6ab0492f..0a992ff5f6be 100644
--- a/docs/docs/reference/other-new-features/opaques-details.md
+++ b/docs/_docs/reference/other-new-features/opaques-details.md
@@ -1,9 +1,10 @@
 ---
 layout: doc-page
 title: "Opaque Type Aliases: More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/opaques-details.html
 ---
 
-### Syntax
+## Syntax
 
 ```
 Modifier          ::=  ...
@@ -15,7 +16,7 @@ Modifier          ::=  ...
 Opaque type aliases must be members of classes, traits, or objects, or they are defined
 at the top-level. They cannot be defined in local blocks.
 
-### Type Checking
+## Type Checking
 
 The general form of a (monomorphic) opaque type alias is
 
@@ -23,7 +24,7 @@ The general form of a (monomorphic) opaque type alias is
 opaque type T >: L <: U = R
 ```
 
-where the lower bound `L` and the upper bound `U` may be missing, in which case they are assumed to be `scala.Nothing` and `scala.Any`, respectively. If bounds are given, it is checked that the right-hand side `R` conforms to them, i.e. `L <: R` and `R <: U`. F-bounds are not supported for opaque type aliases: `T` is not allowed to appear in `L` or `U`.
+where the lower bound `L` and the upper bound `U` may be missing, in which case they are assumed to be [`scala.Nothing`](https://scala-lang.org/api/3.x/scala/Nothing.html) and [`scala.Any`](https://scala-lang.org/api/3.x/scala/Any.html), respectively. If bounds are given, it is checked that the right-hand side `R` conforms to them, i.e. `L <: R` and `R <: U`. F-bounds are not supported for opaque type aliases: `T` is not allowed to appear in `L` or `U`.
 
 Inside the scope of the alias definition, the alias is transparent: `T` is treated
 as a normal alias of `R`. Outside its scope, the alias is treated as the abstract type
@@ -34,7 +35,7 @@ A special case arises if the opaque type alias is defined in an object. Example:
 
 ```scala
 object o:
-   opaque type T = R
+  opaque type T = R
 ```
 
 In this case we have inside the object (also for non-opaque types) that `o.T` is equal to
@@ -45,12 +46,12 @@ also known that `o.T` is equal to `R`. This means the following code type-checks
 
 ```scala
 object o:
-   opaque type T = Int
-   val x: Int = id(2)
+  opaque type T = Int
+  val x: Int = id(2)
 def id(x: o.T): o.T = x
 ```
 
-### Type Parameters of Opaque Types
+## Type Parameters of Opaque Types
 
 Opaque type aliases can have a single type parameter list. The following aliases
 are well-formed
@@ -64,7 +65,7 @@ opaque type BadF[T] = [U] =>> (T, U)
 opaque type BadG = [T] =>> [U] => (T, U)
 ```
 
-### Translation of Equality
+## Translation of Equality
 
 Comparing two values of opaque type with `==` or `!=` normally uses universal equality,
 unless another overloaded `==` or `!=` operator is defined for the type. To avoid
@@ -79,7 +80,7 @@ defined on the underlying type. For instance,
   x == y    // uses Int equality for the comparison.
 ```
 
-### Top-level Opaque Types
+## Top-level Opaque Types
 
 An opaque type alias on the top-level is transparent in all other top-level definitions in the sourcefile where it appears, but is opaque in nested
 objects and classes and in all other source files. Example:
@@ -89,7 +90,7 @@ opaque type A = String
 val x: A = "abc"
 
 object obj:
-   val y: A = "abc"  // error: found: "abc", required: A
+  val y: A = "abc"  // error: found: "abc", required: A
 
 // in test2.scala
 def z: String = x   // error: found: A, required: String
@@ -97,16 +98,16 @@ def z: String = x   // error: found: A, required: String
 This behavior becomes clear if one recalls that top-level definitions are placed in their own synthetic object. For instance, the code in `test1.scala` would expand to
 ```scala
 object test1$package:
-   opaque type A = String
-   val x: A = "abc"
+  opaque type A = String
+  val x: A = "abc"
 
 object obj:
-   val y: A = "abc"  // error: cannot assign "abc" to opaque type alias A
+  val y: A = "abc"  // error: cannot assign "abc" to opaque type alias A
 ```
 The opaque type alias `A` is transparent in its scope, which includes the definition of `x`, but not the definitions of `obj` and `y`.
 
 
-### Relationship to SIP 35
+## Relationship to SIP 35
 
 Opaque types in Scala 3 are an evolution from what is described in
 [Scala SIP 35](https://docs.scala-lang.org/sips/opaque-types.html).
diff --git a/docs/_docs/reference/other-new-features/opaques.md b/docs/_docs/reference/other-new-features/opaques.md
new file mode 100644
index 000000000000..402440bad90c
--- /dev/null
+++ b/docs/_docs/reference/other-new-features/opaques.md
@@ -0,0 +1,167 @@
+---
+layout: doc-page
+title: "Opaque Type Aliases"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/opaques.html
+---
+
+Opaque types aliases provide type abstraction without any overhead. Example:
+
+```scala
+object MyMath:
+
+  opaque type Logarithm = Double
+
+  object Logarithm:
+
+    // These are the two ways to lift to the Logarithm type
+
+    def apply(d: Double): Logarithm = math.log(d)
+
+    def safe(d: Double): Option[Logarithm] =
+      if d > 0.0 then Some(math.log(d)) else None
+
+  end Logarithm
+
+  // Extension methods define opaque types' public APIs
+  extension (x: Logarithm)
+    def toDouble: Double = math.exp(x)
+    def + (y: Logarithm): Logarithm = Logarithm(math.exp(x) + math.exp(y))
+    def * (y: Logarithm): Logarithm = x + y
+
+end MyMath
+```
+
+This introduces `Logarithm` as a new abstract type, which is implemented as `Double`.
+The fact that `Logarithm` is the same as `Double` is only known in the scope where
+`Logarithm` is defined which in the above example corresponds to the object `MyMath`.
+Or in other words, within the scope it is treated as type alias, but this is opaque to the outside world
+where in consequence `Logarithm` is seen as an abstract type and has nothing to do with `Double`.
+
+The public API of `Logarithm` consists of the `apply` and `safe` methods defined in the companion object.
+They convert from `Double`s to `Logarithm` values. Moreover, an operation `toDouble` that converts the other way, and operations `+` and `*` are defined as extension methods on `Logarithm` values.
+The following operations would be valid because they use functionality implemented in the `MyMath` object.
+
+```scala
+import MyMath.Logarithm
+
+val l = Logarithm(1.0)
+val l2 = Logarithm(2.0)
+val l3 = l * l2
+val l4 = l + l2
+```
+
+But the following operations would lead to type errors:
+
+```scala
+val d: Double = l       // error: found: Logarithm, required: Double
+val l2: Logarithm = 1.0 // error: found: Double, required: Logarithm
+l * 2                   // error: found: Int(2), required: Logarithm
+l / l2                  // error: `/` is not a member of Logarithm
+```
+
+### Bounds For Opaque Type Aliases
+
+Opaque type aliases can also come with bounds. Example:
+
+```scala
+object Access:
+
+  opaque type Permissions = Int
+  opaque type PermissionChoice = Int
+  opaque type Permission <: Permissions & PermissionChoice = Int
+
+  extension (x: Permissions)
+    def & (y: Permissions): Permissions = x | y
+  extension (x: PermissionChoice)
+    def | (y: PermissionChoice): PermissionChoice = x | y
+  extension (granted: Permissions)
+    def is(required: Permissions) = (granted & required) == required
+  extension (granted: Permissions)
+    def isOneOf(required: PermissionChoice) = (granted & required) != 0
+
+  val NoPermission: Permission = 0
+  val Read: Permission = 1
+  val Write: Permission = 2
+  val ReadWrite: Permissions = Read | Write
+  val ReadOrWrite: PermissionChoice = Read | Write
+
+end Access
+```
+
+The `Access` object defines three opaque type aliases:
+
+- `Permission`, representing a single permission,
+- `Permissions`, representing a set of permissions with the meaning "all of these permissions granted",
+- `PermissionChoice`, representing a set of permissions with the meaning "at least one of these permissions granted".
+
+Outside the `Access` object, values of type `Permissions` may be combined using the `&` operator,
+where `x & y` means "all permissions in `x` *and* in `y` granted".
+Values of type `PermissionChoice` may be combined using the `|` operator,
+where `x | y` means "a permission in `x` *or* in `y` granted".
+
+Note that inside the `Access` object, the `&` and `|` operators always resolve to the corresponding methods of `Int`,
+because members always take precedence over extension methods.
+Because of that, the `|` extension method in `Access` does not cause infinite recursion.
+Also, the definition of `ReadWrite` must use `|`,
+even though an equivalent definition outside `Access` would use `&`.
+
+All three opaque type aliases have the same underlying representation type `Int`. The
+`Permission` type has an upper bound `Permissions & PermissionChoice`. This makes
+it known outside the `Access` object that `Permission` is a subtype of the other
+two types.  Hence, the following usage scenario type-checks.
+
+```scala
+object User:
+  import Access.*
+
+  case class Item(rights: Permissions)
+
+  val roItem = Item(Read)  // OK, since Permission <: Permissions
+  val rwItem = Item(ReadWrite)
+  val noItem = Item(NoPermission)
+
+  assert(!roItem.rights.is(ReadWrite))
+  assert(roItem.rights.isOneOf(ReadOrWrite))
+
+  assert(rwItem.rights.is(ReadWrite))
+  assert(rwItem.rights.isOneOf(ReadOrWrite))
+
+  assert(!noItem.rights.is(ReadWrite))
+  assert(!noItem.rights.isOneOf(ReadOrWrite))
+end User
+```
+
+On the other hand, the call `roItem.rights.isOneOf(ReadWrite)` would give a type error
+since `Permissions` and `PermissionChoice` are different, unrelated types outside `Access`.
+
+
+### Opaque Type Members on Classes
+While typically, opaque types are used together with objects to hide implementation details of a module, they can also be used with classes.
+
+For example, we can redefine the above example of Logarithms as a class.
+```scala
+class Logarithms:
+
+  opaque type Logarithm = Double
+
+  def apply(d: Double): Logarithm = math.log(d)
+
+  def safe(d: Double): Option[Logarithm] =
+    if d > 0.0 then Some(math.log(d)) else None
+
+  def mul(x: Logarithm, y: Logarithm) = x + y
+```
+
+Opaque type members of different instances are treated as different:
+```scala
+val l1 = new Logarithms
+val l2 = new Logarithms
+val x = l1(1.5)
+val y = l1(2.6)
+val z = l2(3.1)
+l1.mul(x, y) // type checks
+l1.mul(x, z) // error: found l2.Logarithm, required l1.Logarithm
+```
+In general, one can think of an opaque type as being only transparent in the scope of `private[this]`.
+
+[More details](opaques-details.md)
diff --git a/docs/docs/reference/other-new-features/open-classes.md b/docs/_docs/reference/other-new-features/open-classes.md
similarity index 76%
rename from docs/docs/reference/other-new-features/open-classes.md
rename to docs/_docs/reference/other-new-features/open-classes.md
index 7164476d0ad4..6762b0eac14b 100644
--- a/docs/docs/reference/other-new-features/open-classes.md
+++ b/docs/_docs/reference/other-new-features/open-classes.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Open Classes"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/open-classes.html
 ---
 
 An `open` modifier on a class signals that the class is planned for extensions. Example:
@@ -10,18 +11,18 @@ package p
 
 open class Writer[T]:
 
-   /** Sends to stdout, can be overridden */
-   def send(x: T) = println(x)
+  /** Sends to stdout, can be overridden */
+  def send(x: T) = println(x)
 
-   /** Sends all arguments using `send` */
-   def sendAll(xs: T*) = xs.foreach(send)
+  /** Sends all arguments using `send` */
+  def sendAll(xs: T*) = xs.foreach(send)
 end Writer
 
 // File EncryptedWriter.scala
 package p
 
 class EncryptedWriter[T: Encryptable] extends Writer[T]:
-   override def send(x: T) = super.send(encrypt(x))
+  override def send(x: T) = super.send(encrypt(x))
 ```
 An open class typically comes with some documentation that describes
 the internal calling patterns between methods of the class as well as hooks that can be overridden. We call this the _extension contract_ of the class. It is different from the _external contract_ between a class and its users.
@@ -30,7 +31,7 @@ Classes that are not open can still be extended, but only if at least one of two
 
  - The extending class is in the same source file as the extended class. In this case, the extension is usually an internal implementation matter.
 
- - The language feature `adhocExtensions` is enabled for the extending class. This is typically enabled by an import clause in the source file of the extension:
+ - The language feature [`adhocExtensions`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$adhocExtensions$.html) is enabled for the extending class. This is typically enabled by an import clause in the source file of the extension:
    ```scala
    import scala.language.adhocExtensions
    ```
@@ -46,7 +47,7 @@ Classes that are not open can still be extended, but only if at least one of two
      |or by setting the compiler option -language:adhocExtensions.
    ```
 
-### Motivation
+## Motivation
 
 When writing a class, there are three possible expectations of extensibility:
 
@@ -63,17 +64,17 @@ It is good practice to avoid _ad-hoc_ extensions in a code base, since they tend
 are still some situations where these extensions are useful: for instance,
 to mock classes in tests, or to apply temporary patches that add features or fix bugs in library classes. That's why _ad-hoc_ extensions are permitted, but only if there is an explicit opt-in via a language feature import.
 
-### Details
+## Details
 
  - `open` is a soft modifier. It is treated as a normal identifier
    unless it is in modifier position.
  - An `open` class cannot be `final` or `sealed`.
  - Traits or `abstract` classes are always `open`, so `open` is redundant for them.
 
-### Relationship with `sealed`
+## Relationship with `sealed`
 
-A class that is neither `abstract` nor `open` is similar to a `sealed` class: it can still be extended, but only in the same compilation unit. The difference is what happens if an extension of the class is attempted in another compilation unit. For a `sealed` class, this is an error, whereas for a simple non-open class, this is still permitted provided the `adhocExtensions` feature is enabled, and it gives a warning otherwise.
+A class that is neither `abstract` nor `open` is similar to a `sealed` class: it can still be extended, but only in the same source file. The difference is what happens if an extension of the class is attempted in another source file. For a `sealed` class, this is an error, whereas for a simple non-open class, this is still permitted provided the [`adhocExtensions`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$adhocExtensions$.html) feature is enabled, and it gives a warning otherwise.
 
-### Migration
+## Migration
 
 `open` is a new modifier in Scala 3. To allow cross compilation between Scala 2.13 and Scala 3.0 without warnings, the feature warning for ad-hoc extensions is produced only under `-source future`. It will be produced by default from Scala 3.1 on.
diff --git a/docs/_docs/reference/other-new-features/other-new-types.md b/docs/_docs/reference/other-new-features/other-new-types.md
new file mode 100644
index 000000000000..85e768833a71
--- /dev/null
+++ b/docs/_docs/reference/other-new-features/other-new-types.md
@@ -0,0 +1,7 @@
+---
+layout: doc-page
+title: "Other New Features"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features.html
+---
+
+The following pages document new features of Scala 3.
diff --git a/docs/docs/reference/other-new-features/parameter-untupling-spec.md b/docs/_docs/reference/other-new-features/parameter-untupling-spec.md
similarity index 76%
rename from docs/docs/reference/other-new-features/parameter-untupling-spec.md
rename to docs/_docs/reference/other-new-features/parameter-untupling-spec.md
index 513538c39074..e01e91059a27 100644
--- a/docs/docs/reference/other-new-features/parameter-untupling-spec.md
+++ b/docs/_docs/reference/other-new-features/parameter-untupling-spec.md
@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "Parameter Untupling - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/parameter-untupling-spec.html
 ---
 
 ## Motivation
@@ -16,14 +17,14 @@ Previously, the best way to do this was with a pattern-matching decomposition:
 
 ```scala
 xs.map {
-   case (x, y) => x + y
+  case (x, y) => x + y
 }
 ```
 While correct, this is inconvenient. Instead, we propose to write it the following way:
 
 ```scala
 xs.map {
-   (x, y) => x + y
+  (x, y) => x + y
 }
 ```
 
@@ -67,20 +68,21 @@ is feasible for parameter untupling with the expected type `TupleN[T1, ..., Tn]
 
 ```scala
 (x: TupleN[T1, ..., Tn]) =>
-   def p1: T1 = x._1
-   ...
-   def pn: Tn = x._n
-   e
+  def p1: T1 = x._1
+  ...
+  def pn: Tn = x._n
+  e
 ```
 
 with the same expected type.
 ## Migration
 
-Code like this could not be written before, hence the new notation would not be ambiguous after adoption.
+Code like this could not be written before, hence the new notation is not ambiguous after adoption.
 
-Though it is possible that someone has written an implicit conversion form `(T1, ..., Tn) => R` to `TupleN[T1, ..., Tn] => R`
-for some `n`. This change could be detected and fixed by [`Scalafix`](https://scalacenter.github.io/scalafix/). Furthermore, such conversion would probably
-be doing the same translation (semantically) but in a less efficient way.
+It is possible that someone has written an implicit conversion from `(T1, ..., Tn) => R` to `TupleN[T1, ..., Tn] => R` for some `n`.
+Such a conversion is now only useful for general conversions of function values, when parameter untupling is not applicable.
+Some care is required to implement the conversion efficiently.
+Obsolete conversions could be detected and fixed by [`Scalafix`](https://scalacenter.github.io/scalafix/).
 
 ## Reference
 
diff --git a/docs/_docs/reference/other-new-features/parameter-untupling.md b/docs/_docs/reference/other-new-features/parameter-untupling.md
new file mode 100644
index 000000000000..84bbe52bddc1
--- /dev/null
+++ b/docs/_docs/reference/other-new-features/parameter-untupling.md
@@ -0,0 +1,77 @@
+---
+layout: doc-page
+title: "Parameter Untupling"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/parameter-untupling.html
+---
+
+Say you have a list of pairs
+
+```scala
+val xs: List[(Int, Int)]
+```
+
+and you want to map `xs` to a list of `Int`s so that each pair of numbers is mapped to
+their sum. Previously, the best way to do this was with a pattern-matching decomposition:
+
+```scala
+xs map {
+  case (x, y) => x + y
+}
+```
+
+While correct, this is also inconvenient and confusing, since the `case`
+suggests that the pattern match could fail. As a shorter and clearer alternative Scala 3 now allows
+
+```scala
+xs.map {
+  (x, y) => x + y
+}
+```
+
+or, equivalently:
+
+```scala
+xs.map(_ + _)
+```
+and
+```scala
+def combine(i: Int, j: Int) = i + j
+xs.map(combine)
+```
+
+Generally, a function value with `n > 1` parameters is converted to a
+pattern-matching closure using `case` if the expected type is a unary
+function type of the form `((T_1, ..., T_n)) => U`.
+
+More specifically, the adaptation is applied to the mismatching formal
+parameter list. In particular, the adaptation is not a conversion
+between function types. That is why the following is not accepted:
+
+```scala
+val combiner: (Int, Int) => Int = _ + _
+xs.map(combiner)     // Type Mismatch
+```
+
+The function value must be explicitly tupled, rather than the parameters untupled:
+```scala
+xs.map(combiner.tupled)
+```
+
+A conversion may be provided in user code:
+
+```scala
+import scala.language.implicitConversions
+transparent inline implicit def `fallback untupling`(f: (Int, Int) => Int): ((Int, Int)) => Int =
+  p => f(p._1, p._2)     // use specialized apply instead of unspecialized `tupled`
+xs.map(combiner)
+```
+
+Parameter untupling is attempted before conversions are applied, so that a conversion in scope
+cannot subvert untupling.
+
+## Reference
+
+For more information see:
+
+* [More details](./parameter-untupling-spec.md)
+* [Issue #897](https://github.com/lampepfl/dotty/issues/897).
diff --git a/docs/_docs/reference/other-new-features/safe-initialization.md b/docs/_docs/reference/other-new-features/safe-initialization.md
new file mode 100644
index 000000000000..57c962c9f5e8
--- /dev/null
+++ b/docs/_docs/reference/other-new-features/safe-initialization.md
@@ -0,0 +1,236 @@
+---
+layout: doc-page
+title: "Safe Initialization"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/safe-initialization.html
+---
+
+Scala 3 implements experimental safe initialization check, which can be enabled by the compiler option `-Ysafe-init`.
+
+## A Quick Glance
+
+To get a feel of how it works, we first show several examples below.
+
+### Parent-Child Interaction
+
+Given the following code snippet:
+
+``` scala
+abstract class AbstractFile:
+  def name: String
+  val extension: String = name.substring(4)
+
+class RemoteFile(url: String) extends AbstractFile:
+  val localFile: String = s"${url.##}.tmp"  // error: usage of `localFile` before it's initialized
+  def name: String = localFile
+```
+
+The checker will report:
+
+``` scala
+-- Warning: tests/init/neg/AbstractFile.scala:7:4 ------------------------------
+7 |	val localFile: String = s"${url.##}.tmp"  // error: usage of `localFile` before it's initialized
+  |	    ^
+  |    Access non-initialized field value localFile. Calling trace:
+  |     -> val extension: String = name.substring(4)	[ AbstractFile.scala:3 ]
+  |      -> def name: String = localFile            	[ AbstractFile.scala:8 ]
+```
+
+### Inner-Outer Interaction
+
+Given the code below:
+
+``` scala
+object Trees:
+  class ValDef { counter += 1 }
+  class EmptyValDef extends ValDef
+  val theEmptyValDef = new EmptyValDef
+  private var counter = 0  // error
+```
+
+The checker will report:
+
+``` scala
+-- Warning: tests/init/neg/trees.scala:5:14 ------------------------------------
+5 |  private var counter = 0  // error
+  |              ^
+  |             Access non-initialized field variable counter. Calling trace:
+  |              -> val theEmptyValDef = new EmptyValDef    [ trees.scala:4 ]
+  |               -> class EmptyValDef extends ValDef       [ trees.scala:3 ]
+  |                -> class ValDef { counter += 1 }	     [ trees.scala:2 ]
+```
+
+### Functions
+
+Given the code below:
+
+``` scala
+abstract class Parent:
+  val f: () => String = () => this.message
+  def message: String
+
+class Child extends Parent:
+  val a = f()
+  val b = "hello"           // error
+  def message: String = b
+```
+
+The checker reports:
+
+``` scala
+-- Warning: tests/init/neg/features-high-order.scala:7:6 -----------------------
+7 |  val b = "hello"           // error
+  |      ^
+  |Access non-initialized field value b. Calling trace:
+  | -> val a = f()                              	[ features-high-order.scala:6 ]
+  |   -> val f: () => String = () => this.message	[ features-high-order.scala:2 ]
+  |    -> def message: String = b	                [ features-high-order.scala:8 ]
+```
+## Design Goals
+
+We establish the following design goals:
+
+- __Sound__: checking always terminates, and is sound for common and reasonable usage (over-approximation)
+- __Expressive__: support common and reasonable initialization patterns
+- __Friendly__: simple rules, minimal syntactic overhead, informative error messages
+- __Modular__: modular checking, no analysis beyond project boundary
+- __Fast__: instant feedback
+- __Simple__: no changes to core type system, explainable by a simple theory
+
+By _reasonable usage_, we include the following use cases (but not restricted to them):
+
+- Access fields on `this` and outer `this` during initialization
+- Call methods on `this` and outer `this` during initialization
+- Instantiate inner class and call methods on such instances during initialization
+- Capture fields in functions
+
+## Principles
+
+To achieve the goals, we uphold three fundamental principles:
+_stackability_, _monotonicity_ and _scopability_.
+
+Stackability means that all fields of a class are initialized at the end of the
+class body. Scala enforces this property in syntax by demanding that all fields
+are initialized at the end of the primary constructor, except for the language
+feature below:
+
+``` scala
+var x: T = _
+```
+
+Control effects such as exceptions may break this property, as the
+following example shows:
+
+``` scala
+class MyException(val b: B) extends Exception("")
+class A:
+  val b = try { new B } catch { case myEx: MyException => myEx.b }
+  println(b.a)
+
+class B:
+  throw new MyException(this)
+  val a: Int = 1
+```
+
+In the code above, the control effect teleport the uninitialized value
+wrapped in an exception. In the implementation, we avoid the problem
+by ensuring that the values that are thrown must be transitively initialized.
+
+Monotonicity means that the initialization status of an object should
+not go backward: initialized fields continue to be initialized, a
+field points to an initialized object may not later point to an
+object under initialization. As an example, the following code will be rejected:
+
+``` scala
+trait Reporter:
+  def report(msg: String): Unit
+
+class FileReporter(ctx: Context) extends Reporter:
+  ctx.typer.reporter = this                // ctx now reaches an uninitialized object
+  val file: File = new File("report.txt")
+  def report(msg: String) = file.write(msg)
+```
+
+In the code above, suppose `ctx` points to a transitively initialized
+object. Now the assignment at line 3 makes `this`, which is not fully
+initialized, reachable from `ctx`. This makes field usage dangerous,
+as it may indirectly reach uninitialized fields.
+
+Monotonicity is based on a well-known technique called _heap monotonic
+typestate_ to ensure soundness in the presence of aliasing
+[1]. Roughly speaking, it means initialization state should not go backwards.
+
+Scopability means that there are no side channels to access to partially constructed objects. Control effects like coroutines, delimited
+control, resumable exceptions may break the property, as they can transport a
+value upper in the stack (not in scope) to be reachable from the current scope.
+Static fields can also serve as a teleport thus breaks this property.  In the
+implementation, we need to enforce that teleported values are transitively
+initialized.
+
+The principles enable _local reasoning_ of initialization, which means:
+
+> An initialized environment can only produce initialized values.
+
+For example, if the arguments to an `new`-expression are transitively
+initialized, so is the result. If the receiver and arguments in a method call
+are transitively initialized, so is the result.
+
+## Rules
+
+With the established principles and design goals, following rules are imposed:
+
+1. In an assignment `o.x = e`, the expression `e` may only point to transitively initialized objects.
+
+   This is how monotonicity is enforced in the system. Note that in an
+   initialization `val f: T = e`, the expression `e` may point to an object
+   under initialization. This requires a distinction between mutation and
+   initialization in order to enforce different rules. Scala
+   has different syntax for them, it thus is not an issue.
+
+2. Objects under initialization may not be passed as arguments to method calls.
+
+   Escape of `this` in the constructor is commonly regarded as an anti-pattern.
+   However, escape of `this` as constructor arguments are allowed, to support
+   creation of cyclic data structures. The checker will ensure that the escaped
+   non-initialized object is not used, i.e. calling methods or accessing fields
+   on the escaped object is not allowed.
+
+## Modularity
+
+The analysis takes the primary constructor of concrete classes as entry points.
+It follows the constructors of super classes, which might be defined in another project.
+The analysis takes advantage of TASTy for analyzing super classes defined in another project.
+
+The crossing of project boundary raises a concern about modularity. It is
+well-known in object-oriented programming that superclass and subclass are
+tightly coupled. For example, adding a method in the superclass requires
+recompiling the child class for checking safe overriding.
+
+Initialization is no exception in this respect. The initialization of an object
+essentially invovles close interaction between subclass and superclass. If the
+superclass is defined in another project, the crossing of project boundary
+cannot be avoided for soundness of the analysis.
+
+Meanwhile, inheritance across project boundary has been under scrutiny and the
+introduction of [open classes](./open-classes.md) mitigate the concern here.
+For example, the initialization check could enforce that the constructors of
+open classes may not contain method calls on `this` or introduce annotations as
+a contract.
+
+The feedback from the community on the topic is welcome.
+
+## Back Doors
+
+Occasionally you may want to suppress warnings reported by the
+checker.  You can either write `e: @unchecked` to tell the checker to
+skip checking for the expression `e`, or you may use the old trick:
+mark some fields as lazy.
+
+## Caveats
+
+- The system cannot provide safety guarantee when extending Java or Scala 2 classes.
+- Safe initialization of global objects is only partially checked.
+
+## References
+
+1. Fähndrich, M. and Leino, K.R.M., 2003, July. [_Heap monotonic typestates_](https://www.microsoft.com/en-us/research/publication/heap-monotonic-typestate/). In International Workshop on Aliasing, Confinement and Ownership in object-oriented programming (IWACO).
+2. Fengyun Liu, Ondřej Lhoták, Aggelos Biboudis, Paolo G. Giarrusso, and Martin Odersky. 2020. [_A type-and-effect system for object initialization_](https://dl.acm.org/doi/10.1145/3428243). OOPSLA, 2020.
diff --git a/docs/_docs/reference/other-new-features/targetName.md b/docs/_docs/reference/other-new-features/targetName.md
new file mode 100644
index 000000000000..d2a654697d15
--- /dev/null
+++ b/docs/_docs/reference/other-new-features/targetName.md
@@ -0,0 +1,118 @@
+---
+layout: doc-page
+title: "The @targetName annotation"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/targetName.html
+---
+
+A [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation on a definition defines an alternate name for the implementation of that definition. Example:
+
+```scala
+import scala.annotation.targetName
+
+object VecOps:
+  extension [T](xs: Vec[T])
+    @targetName("append")
+    def ++= [T] (ys: Vec[T]): Vec[T] = ...
+```
+
+Here, the `++=` operation is implemented (in Byte code or native code) under the name `append`. The implementation name affects the code that is generated, and is the name under which code from other languages can call the method. For instance, `++=` could be invoked from Java like this:
+
+```java
+VecOps.append(vec1, vec2)
+```
+
+The [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation has no bearing on Scala usages. Any application of that method in Scala has to use `++=`, not `append`.
+
+### Details
+
+ 1. `@targetName` is defined in package `scala.annotation`. It takes a single argument
+    of type `String`. That string is called the _external name_ of the definition
+    that's annotated.
+
+ 2. A `@targetName` annotation can be given for all kinds of definitions.
+
+ 3. The name given in a [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation must be a legal name
+    for the defined entities on the host platform.
+
+ 4. It is recommended that definitions with symbolic names have a [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation. This will establish an alternate name that is easier to search for and
+ will avoid cryptic encodings in runtime diagnostics.
+
+ 5. Definitions with names in backticks that are not legal host platform names
+    should also have a [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation.
+
+### Relationship with Overriding
+
+[`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotations are significant for matching two method definitions to decide whether they conflict or override each other. Two method definitions match if they have the same name, signature, and erased name. Here,
+
+- The _signature_ of a definition consists of the names of the erased types of all (value-) parameters and the method's result type.
+- The _erased name_ of a method definition is its target name if a [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation is given and its defined name otherwise.
+
+This means that `@targetName` annotations can be used to disambiguate two method definitions that would otherwise clash. For instance.
+
+```scala
+def f(x: => String): Int = x.length
+def f(x: => Int): Int = x + 1  // error: double definition
+```
+
+The two definitions above clash since their erased parameter types are both [`Function0`](https://scala-lang.org/api/3.x/scala/Function0.html), which is the type of the translation of a by-name-parameter. Hence they have the same names and signatures. But we can avoid the clash by adding a [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation to either method or to both of them. Example:
+
+```scala
+@targetName("f_string")
+def f(x: => String): Int = x.length
+def f(x: => Int): Int = x + 1  // OK
+```
+
+This will produce methods `f_string` and `f` in the generated code.
+
+However, [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotations are not allowed to break overriding relationships
+between two definitions that have otherwise the same names and types. So the following would be in error:
+
+```scala
+import annotation.targetName
+class A:
+  def f(): Int = 1
+class B extends A:
+  @targetName("g") def f(): Int = 2
+```
+
+The compiler reports here:
+
+```
+-- Error: test.scala:6:23 ------------------------------------------------------
+6 |  @targetName("g") def f(): Int = 2
+  |                       ^
+  |error overriding method f in class A of type (): Int;
+  |  method f of type (): Int should not have a @targetName
+  |  annotation since the overridden member hasn't one either
+```
+
+The relevant overriding rules can be summarized as follows:
+
+- Two members can override each other if their names and signatures are the same,
+  and they either have the same erased names or the same types.
+- If two members override, then both their erased names and their types must be the same.
+
+As usual, any overriding relationship in the generated code must also
+be present in the original code. So the following example would also be in error:
+
+```scala
+import annotation.targetName
+class A:
+  def f(): Int = 1
+class B extends A:
+  @targetName("f") def g(): Int = 2
+```
+
+Here, the original methods `g` and `f` do not override each other since they have
+different names. But once we switch to target names, there is a clash that is reported by the compiler:
+
+```
+-- [E120] Naming Error: test.scala:4:6 -----------------------------------------
+4 |class B extends A:
+  |      ^
+  |      Name clash between defined and inherited member:
+  |      def f(): Int in class A at line 3 and
+  |      def g(): Int in class B at line 5
+  |      have the same name and type after erasure.
+1 error found
+```
diff --git a/docs/_docs/reference/other-new-features/threadUnsafe-annotation.md b/docs/_docs/reference/other-new-features/threadUnsafe-annotation.md
new file mode 100644
index 000000000000..cd0d45e2246a
--- /dev/null
+++ b/docs/_docs/reference/other-new-features/threadUnsafe-annotation.md
@@ -0,0 +1,18 @@
+---
+layout: doc-page
+title: "The @threadUnsafe annotation"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/threadUnsafe-annotation.html
+---
+
+A new annotation [`@threadUnsafe`](https://scala-lang.org/api/3.x/scala/annotation/threadUnsafe.html) can be used on a field which defines
+a `lazy val`. When this annotation is used, the initialization of the
+[`lazy val`](../changed-features/lazy-vals-init.md) will use a faster mechanism which is not thread-safe.
+
+### Example
+
+```scala
+import scala.annotation.threadUnsafe
+
+class Hello:
+   @threadUnsafe lazy val x: Int = 1
+```
diff --git a/docs/docs/reference/other-new-features/trait-parameters.md b/docs/_docs/reference/other-new-features/trait-parameters.md
similarity index 84%
rename from docs/docs/reference/other-new-features/trait-parameters.md
rename to docs/_docs/reference/other-new-features/trait-parameters.md
index 5ccde10b05c1..6c833a097b21 100644
--- a/docs/docs/reference/other-new-features/trait-parameters.md
+++ b/docs/_docs/reference/other-new-features/trait-parameters.md
@@ -1,16 +1,17 @@
 ---
 layout: doc-page
 title: "Trait Parameters"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/trait-parameters.html
 ---
 
 Scala 3 allows traits to have parameters, just like classes have parameters.
 
 ```scala
 trait Greeting(val name: String):
-   def msg = s"How are you, $name"
+  def msg = s"How are you, $name"
 
 class C extends Greeting("Bob"):
-   println(msg)
+  println(msg)
 ```
 
 Arguments to a trait are evaluated immediately before the trait is initialized.
@@ -36,7 +37,7 @@ Here's a trait extending the parameterized trait `Greeting`.
 
 ```scala
 trait FormalGreeting extends Greeting:
-   override def msg = s"How do you do, $name"
+  override def msg = s"How do you do, $name"
 ```
 As is required, no arguments are passed to `Greeting`. However, this poses an issue
 when defining a class that extends `FormalGreeting`:
@@ -55,7 +56,7 @@ class E extends Greeting("Bob"), FormalGreeting
 ### Traits With Context Parameters
 
 This "explicit extension required" rule is relaxed if the missing trait contains only
-[context parameters](../contextual/using-clauses). In that case the trait reference is
+[context parameters](../contextual/using-clauses.md). In that case the trait reference is
 implicitly inserted as an additional parent with inferred arguments. For instance,
 here's a variant of greetings where the addressee is a context parameter of type
 `ImpliedName`:
@@ -65,10 +66,10 @@ case class ImpliedName(name: String):
   override def toString = name
 
 trait ImpliedGreeting(using val iname: ImpliedName):
-   def msg = s"How are you, $iname"
+  def msg = s"How are you, $iname"
 
 trait ImpliedFormalGreeting extends ImpliedGreeting:
-   override def msg = s"How do you do, $iname"
+  override def msg = s"How do you do, $iname"
 
 class F(using iname: ImpliedName) extends ImpliedFormalGreeting
 ```
@@ -76,9 +77,9 @@ class F(using iname: ImpliedName) extends ImpliedFormalGreeting
 The definition of `F` in the last line is implicitly expanded to
 ```scala
 class F(using iname: ImpliedName) extends
-   Object,
-   ImpliedGreeting(using iname),
-   ImpliedFormalGreeting(using iname)
+  Object,
+  ImpliedGreeting(using iname),
+  ImpliedFormalGreeting(using iname)
 ```
 Note the inserted reference to the super trait `ImpliedGreeting`, which was not mentioned explicitly.
 
diff --git a/docs/_docs/reference/other-new-features/transparent-traits.md b/docs/_docs/reference/other-new-features/transparent-traits.md
new file mode 100644
index 000000000000..3236bf71252d
--- /dev/null
+++ b/docs/_docs/reference/other-new-features/transparent-traits.md
@@ -0,0 +1,70 @@
+---
+layout: doc-page
+title: "Transparent Traits"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/transparent-traits.html
+---
+
+Traits are used in two roles:
+
+ 1. As mixins for other classes and traits
+ 2. As types of vals, defs, or parameters
+
+Some traits are used primarily in the first role, and we usually do not want to see them in inferred types. An example is the [`Product`](https://scala-lang.org/api/3.x/scala/Product.html) trait that the compiler adds as a mixin trait to every case class or case object. In Scala 2, this parent trait sometimes makes inferred types more complicated than they should be. Example:
+
+```scala
+trait Kind
+case object Var extends Kind
+case object Val extends Kind
+val x = Set(if condition then Val else Var)
+```
+
+Here, the inferred type of `x` is `Set[Kind & Product & Serializable]` whereas one would have hoped it to be `Set[Kind]`. The reasoning for this particular type to be inferred is as follows:
+
+- The type of the conditional above is the [union type](../new-types/union-types.md) `Val | Var`.
+- A union type is widened in type inference to the least supertype that is not a union type.
+  In the example, this type is `Kind & Product & Serializable` since all three traits are traits of both `Val` and `Var`.
+  So that type becomes the inferred element type of the set.
+
+Scala 3 allows one to mark a mixin trait as `transparent`, which means that it can be suppressed in type inference. Here's an example that follows the lines of the code above, but now with a new transparent trait `S` instead of `Product`:
+
+```scala
+transparent trait S
+trait Kind
+object Var extends Kind, S
+object Val extends Kind, S
+val x = Set(if condition then Val else Var)
+```
+
+Now `x` has inferred type `Set[Kind]`. The common transparent trait `S` does not
+appear in the inferred type.
+
+## Transparent Traits
+
+The traits [`scala.Product`](https://scala-lang.org/api/3.x/scala/Product.html), [`java.io.Serializable`](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/io/Serializable.html) and [`java.lang.Comparable`](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Comparable.html)
+are treated automatically as transparent. Other traits are turned into transparent traits using the modifier `transparent`. Scala 2 traits can also be made transparent
+by adding a [`@transparentTrait`](https://scala-lang.org/api/3.x/scala/annotation/transparentTrait.html) annotation. This annotation is defined in [`scala.annotation`](https://scala-lang.org/api/3.x/scala/annotation.html). It will be deprecated and phased out once Scala 2/3 interopability is no longer needed.
+
+Typically, transparent traits are traits
+that influence the implementation of inheriting classes and traits that are not usually used as types by themselves. Two examples from the standard collection library are:
+
+- [`IterableOps`](https://scala-lang.org/api/3.x/scala/collection/IterableOps.html), which provides method implementations for an [`Iterable`](https://scala-lang.org/api/3.x/scala/collection/Iterable.html).
+- [`StrictOptimizedSeqOps`](https://scala-lang.org/api/3.x/scala/collection/StrictOptimizedSeqOps.html), which optimises some of these implementations for sequences with efficient indexing.
+
+Generally, any trait that is extended recursively is a good candidate to be
+declared transparent.
+
+## Rules for Inference
+
+Transparent traits can be given as explicit types as usual. But they are often elided when types are inferred. Roughly, the rules for type inference say that transparent traits are dropped from intersections where possible.
+
+The precise rules are as follows:
+
+- When inferring a type of a type variable, or the type of a val, or the return type of a def,
+- where that type is not higher-kinded,
+- and where `B` is its known upper bound or `Any` if none exists:
+- If the type inferred so far is of the form `T1 & ... & Tn` where
+  `n >= 1`, replace the maximal number of transparent `Ti`s  by `Any`, while ensuring that
+  the resulting type is still a subtype of the bound `B`.
+- However, do not perform this widening if all transparent traits `Ti` can get replaced in that way.
+
+The last clause ensures that a single transparent trait instance such as [`Product`](https://scala-lang.org/api/3.x/scala/Product.html) is not widened to [`Any`](https://scala-lang.org/api/3.x/scala/Any.html). Transparent trait instances are only dropped when they appear in conjunction with some other type.
diff --git a/docs/_docs/reference/other-new-features/type-test.md b/docs/_docs/reference/other-new-features/type-test.md
new file mode 100644
index 000000000000..ee4e612e9a37
--- /dev/null
+++ b/docs/_docs/reference/other-new-features/type-test.md
@@ -0,0 +1,181 @@
+---
+layout: doc-page
+title: "TypeTest"
+movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/type-test.html
+---
+
+## TypeTest
+
+When pattern matching there are two situations where a runtime type test must be performed.
+The first case is an explicit type test using the ascription pattern notation.
+
+```scala
+(x: X) match
+  case y: Y =>
+```
+
+The second case is when an extractor takes an argument that is not a subtype of the scrutinee type.
+
+```scala
+(x: X) match
+  case y @ Y(n) =>
+
+object Y:
+  def unapply(x: Y): Some[Int] = ...
+```
+
+In both cases, a class test will be performed at runtime.
+But when the type test is on an abstract type (type parameter or type member), the test cannot be performed because the type is erased at runtime.
+
+A [`TypeTest`](https://scala-lang.org/api/3.x/scala/reflect/TypeTest.html) can be provided to make this test possible.
+
+```scala
+package scala.reflect
+
+trait TypeTest[-S, T]:
+  def unapply(s: S): Option[s.type & T]
+```
+
+It provides an extractor that returns its argument typed as a `T` if the argument is a `T`.
+It can be used to encode a type test.
+
+```scala
+def f[X, Y](x: X)(using tt: TypeTest[X, Y]): Option[Y] = x match
+  case tt(x @ Y(1)) => Some(x)
+  case tt(x) => Some(x)
+  case _ => None
+```
+
+To avoid the syntactic overhead the compiler will look for a type test automatically if it detects that the type test is on abstract types.
+This means that `x: Y` is transformed to `tt(x)` and `x @ Y(_)` to `tt(x @ Y(_))` if there is a contextual `TypeTest[X, Y]` in scope.
+The previous code is equivalent to
+
+```scala
+def f[X, Y](x: X)(using TypeTest[X, Y]): Option[Y] = x match
+  case x @ Y(1) => Some(x)
+  case x: Y => Some(x)
+  case _ => None
+```
+
+We could create a type test at call site where the type test can be performed with runtime class tests directly as follows
+
+```scala
+val tt: TypeTest[Any, String] =
+  new TypeTest[Any, String]:
+    def unapply(s: Any): Option[s.type & String] = s match
+      case s: String => Some(s)
+      case _ => None
+
+f[AnyRef, String]("acb")(using tt)
+```
+
+The compiler will synthesize a new instance of a type test if none is found in scope as:
+
+```scala
+new TypeTest[A, B]:
+  def unapply(s: A): Option[s.type & B] = s match
+    case s: B => Some(s)
+    case _ => None
+```
+
+If the type tests cannot be done there will be an unchecked warning that will be raised on the `case s: B =>` test.
+
+The most common [`TypeTest`](https://scala-lang.org/api/3.x/scala/reflect/TypeTest.html) instances are the ones that take any parameters (i.e. `TypeTest[Any, T]`).
+To make it possible to use such instances directly in context bounds we provide the alias
+
+```scala
+package scala.reflect
+
+type Typeable[T] = TypeTest[Any, T]
+```
+
+This alias can be used as
+
+```scala
+def f[T: Typeable]: Boolean =
+  "abc" match
+    case x: T => true
+    case _ => false
+
+f[String] // true
+f[Int] // false
+```
+
+## TypeTest and ClassTag
+
+[`TypeTest`](https://scala-lang.org/api/3.x/scala/reflect/TypeTest.html) is a replacement for functionality provided previously by `ClassTag.unapply`.
+Using [`ClassTag`](https://scala-lang.org/api/3.x/scala/reflect/ClassTag.html) instances was unsound since classtags can check only the class component of a type.
+[`TypeTest`](https://scala-lang.org/api/3.x/scala/reflect/TypeTest.html) fixes that unsoundness.
+[`ClassTag`](https://scala-lang.org/api/3.x/scala/reflect/ClassTag.html) type tests are still supported but a warning will be emitted after 3.0.
+
+
+## Example
+
+Given the following abstract definition of Peano numbers that provides two given instances of types `TypeTest[Nat, Zero]` and `TypeTest[Nat, Succ]`
+
+```scala
+import scala.reflect.*
+
+trait Peano:
+  type Nat
+  type Zero <: Nat
+  type Succ <: Nat
+
+  def safeDiv(m: Nat, n: Succ): (Nat, Nat)
+
+  val Zero: Zero
+
+  val Succ: SuccExtractor
+  trait SuccExtractor:
+    def apply(nat: Nat): Succ
+    def unapply(succ: Succ): Some[Nat]
+
+  given typeTestOfZero: TypeTest[Nat, Zero]
+  given typeTestOfSucc: TypeTest[Nat, Succ]
+```
+
+together with an implementation of Peano numbers based on type `Int`
+
+```scala
+object PeanoInt extends Peano:
+  type Nat  = Int
+  type Zero = Int
+  type Succ = Int
+
+  def safeDiv(m: Nat, n: Succ): (Nat, Nat) = (m / n, m % n)
+
+  val Zero: Zero = 0
+
+  val Succ: SuccExtractor = new:
+    def apply(nat: Nat): Succ = nat + 1
+    def unapply(succ: Succ) = Some(succ - 1)
+
+  def typeTestOfZero: TypeTest[Nat, Zero] = new:
+    def unapply(x: Nat): Option[x.type & Zero] =
+      if x == 0 then Some(x) else None
+
+  def typeTestOfSucc: TypeTest[Nat, Succ] = new:
+    def unapply(x: Nat): Option[x.type & Succ] =
+      if x > 0 then Some(x) else None
+```
+
+it is possible to write the following program
+
+```scala
+@main def test =
+  import PeanoInt.*
+
+  def divOpt(m: Nat, n: Nat): Option[(Nat, Nat)] =
+    n match
+      case Zero => None
+      case s @ Succ(_) => Some(safeDiv(m, s))
+
+  val two = Succ(Succ(Zero))
+  val five = Succ(Succ(Succ(two)))
+
+  println(divOpt(five, two))  // prints "Some((2,1))"
+  println(divOpt(two, five))  // prints "Some((0,2))"
+  println(divOpt(two, Zero))  // prints "None"
+```
+
+Note that without the `TypeTest[Nat, Succ]` the pattern `Succ.unapply(nat: Succ)` would be unchecked.
diff --git a/docs/_docs/reference/overview.md b/docs/_docs/reference/overview.md
new file mode 100644
index 000000000000..051ba4b124cc
--- /dev/null
+++ b/docs/_docs/reference/overview.md
@@ -0,0 +1,154 @@
+---
+layout: doc-page
+title: "Overview"
+movedTo: https://docs.scala-lang.org/scala3/reference/overview.html
+---
+
+Scala 3 implements many language changes and improvements over Scala 2.
+In this reference, we discuss design decisions and present important differences compared to Scala 2.
+
+## Goals
+
+The language redesign was guided by three main goals:
+
+- Strengthen Scala's foundations.
+  Make the full programming language compatible with the foundational work on the
+  [DOT calculus](https://infoscience.epfl.ch/record/227176/files/soundness_oopsla16.pdf)
+  and apply the lessons learned from that work.
+- Make Scala easier and safer to use.
+  Tame powerful constructs such as implicits to provide a gentler learning curve. Remove warts and puzzlers.
+- Further improve the consistency and expressiveness of Scala's language constructs.
+
+Corresponding to these goals, the language changes fall into seven categories:
+(1) Core constructs to strengthen foundations, (2) simplifications and (3) [restrictions](#restrictions), to make the language easier and safer to use, (4) [dropped constructs](#dropped-constructs) to make the language smaller and more regular, (5) [changed constructs](#changes) to remove warts, and increase consistency and usability, (6) [new constructs](#new-constructs) to fill gaps and increase expressiveness, (7) a new, principled approach to metaprogramming that replaces [Scala 2 experimental macros](https://docs.scala-lang.org/overviews/macros/overview.md).
+
+## Essential Foundations
+
+These new constructs directly model core features of DOT, higher-kinded types, and the [SI calculus for implicit resolution](https://infoscience.epfl.ch/record/229878/files/simplicitly_1.pdf).
+
+- [Intersection types](new-types/intersection-types.md), replacing compound types,
+- [Union types](new-types/union-types.md),
+- [Type lambdas](new-types/type-lambdas.md), replacing encodings using structural types and type projection.
+- [Context functions](contextual/context-functions.md), offering abstraction over given parameters.
+
+## Simplifications
+
+These constructs replace existing constructs with the aim of making the language safer and simpler to use, and to promote uniformity in code style.
+
+- [Trait parameters](other-new-features/trait-parameters.md)
+  replace [early initializers](dropped-features/early-initializers.md) with a more generally useful construct.
+- [Given instances](contextual/givens.md)
+  replace implicit objects and defs, focussing on intent over mechanism.
+- [Using clauses](contextual/using-clauses.md)
+  replace implicit parameters, avoiding their ambiguities.
+- [Extension methods](contextual/extension-methods.md)
+  replace implicit classes with a clearer and simpler mechanism.
+- [Opaque type aliases](other-new-features/opaques.md)
+  replace most uses of value classes while guaranteeing absence of boxing.
+- [Top-level definitions](dropped-features/package-objects.md)
+  replace package objects, dropping syntactic boilerplate.
+- [Export clauses](other-new-features/export.md)
+  provide a simple and general way to express aggregation, which can replace
+  the previous facade pattern of package objects inheriting from classes.
+- [Vararg splices](changed-features/vararg-splices.md)
+  now use the form `xs*` in function arguments and patterns instead of `xs: _*` and `xs @ _*`,
+- [Universal apply methods](other-new-features/creator-applications.md)
+  allow using simple function call syntax instead of `new` expressions. `new` expressions stay around
+  as a fallback for the cases where creator applications cannot be used.
+
+With the exception of [early initializers](dropped-features/early-initializers.md) and old-style vararg patterns, all superseded constructs continue to be available in Scala 3.0. The plan is to deprecate and phase them out later.
+
+Value classes (superseded by opaque type aliases) are a special case. There are currently no deprecation plans for value classes, since we might bring them back in a more general form if they are supported natively by the JVM as is planned by [project Valhalla](https://openjdk.java.net/projects/valhalla/).
+
+## Restrictions
+
+These constructs are restricted to make the language safer.
+
+- [Implicit Conversions](contextual/conversions.md):
+  there is only one way to define implicit conversions instead of many, and potentially surprising implicit conversions require a language import.
+- [Given Imports](contextual/given-imports.md):
+  implicits now require a special form of import, to make the import clearly visible.
+- [Type Projection](dropped-features/type-projection.md):
+  only classes can be used as prefix `C` of a type projection `C#A`. Type projection on abstract types is no longer supported since it is unsound.
+- [Multiversal Equality](contextual/multiversal-equality.md):
+  implement an "opt-in" scheme to rule out nonsensical comparisons with `==` and `!=`.
+- [infix](changed-features/operators.md):
+  make method application syntax uniform across code bases.
+
+Unrestricted implicit conversions continue to be available in Scala 3.0, but will be deprecated and removed later. Unrestricted versions of the other constructs in the list above are available only under `-source 3.0-migration`.
+
+## Dropped Constructs
+
+These constructs are proposed to be dropped without a new construct replacing them. The motivation for dropping these constructs is to simplify the language and its implementation.
+
+- [DelayedInit](dropped-features/delayed-init.md),
+- [Existential types](dropped-features/existential-types.md),
+- [Procedure syntax](dropped-features/procedure-syntax.md),
+- [Class shadowing](dropped-features/class-shadowing.md),
+- [XML literals](dropped-features/xml.md),
+- [Symbol literals](dropped-features/symlits.md),
+- [Auto application](dropped-features/auto-apply.md),
+- [Weak conformance](dropped-features/weak-conformance.md),
+- Compound types (replaced by [Intersection types](new-types/intersection-types.md)),
+- [Auto tupling](https://github.com/lampepfl/dotty/pull/4311) (implemented, but not merged).
+
+The date when these constructs are dropped varies. The current status is:
+
+- Not implemented at all:
+    - DelayedInit, existential types, weak conformance.
+- Supported under `-source 3.0-migration`:
+    - procedure syntax, class shadowing, symbol literals, auto application, auto tupling in a restricted form.
+- Supported in 3.0, to be deprecated and phased out later:
+    - [XML literals](dropped-features/xml.md), compound types.
+
+## Changes
+
+These constructs have undergone changes to make them more regular and useful.
+
+- [Structural Types](changed-features/structural-types.md):
+  They now allow pluggable implementations, which greatly increases their usefulness. Some usage patterns are restricted compared to the status quo.
+- [Name-based pattern matching](changed-features/pattern-matching.md):
+  The existing undocumented Scala 2 implementation has been codified in a slightly simplified form.
+- [Automatic Eta expansion](changed-features/eta-expansion.md):
+  Eta expansion is now performed universally also in the absence of an expected type. The postfix `_` operator is thus made redundant. It will be deprecated and dropped after Scala 3.0.
+- [Implicit Resolution](changed-features/implicit-resolution.md):
+  The implicit resolution rules have been cleaned up to make them more useful and less surprising. Implicit scope is restricted to no longer include package prefixes.
+
+Most aspects of old-style implicit resolution are still available under `-source 3.0-migration`. The other changes in this list are applied unconditionally.
+
+## New Constructs
+
+These are additions to the language that make it more powerful or pleasant to use.
+
+- [Enums](enums/enums.md) provide concise syntax for enumerations and [algebraic data types](enums/adts.md).
+- [Parameter untupling](other-new-features/parameter-untupling.md) avoids having to use `case` for tupled parameter destructuring.
+- [Dependent function types](new-types/dependent-function-types.md) generalize dependent methods to dependent function values and types.
+- [Polymorphic function types](new-types/polymorphic-function-types.md) generalize polymorphic methods to polymorphic function values and types.
+  _Current status_: There is a proposal and a merged prototype implementation, but the implementation has not been finalized (it is notably missing type inference support).
+- [Kind polymorphism](other-new-features/kind-polymorphism.md) allows the definition of operators working equally on types and type constructors.
+- [`@targetName` annotations](other-new-features/targetName.md) make it easier to interoperate with code written in other languages and give more flexibility for avoiding name clashes.
+
+## Metaprogramming
+
+The following constructs together aim to put metaprogramming in Scala on a new basis. So far, metaprogramming was achieved by a combination of macros and libraries such as [Shapeless](https://github.com/milessabin/shapeless) that were in turn based on some key macros. Current Scala 2 macro mechanisms are a thin veneer on top the current Scala 2 compiler, which makes them fragile and in many cases impossible to port to Scala 3.
+
+It's worth noting that macros were never included in the [Scala 2 language specification](https://scala-lang.org/files/archive/spec/2.13/) and were so far made available only under an `-experimental` flag. This has not prevented their widespread usage.
+
+To enable porting most uses of macros, we are experimenting with the advanced language constructs listed below. These designs are more provisional than the rest of the proposed language constructs for Scala 3.0. There might still be some changes until the final release. Stabilizing the feature set needed for metaprogramming is our first priority.
+
+- [Match Types](new-types/match-types.md)
+  allow computation on types.
+- [Inline](metaprogramming/inline.md)
+  provides by itself a straightforward implementation of some simple macros and is at the same time an essential building block for the implementation of complex macros.
+- [Quotes and Splices](metaprogramming/macros.md)
+  provide a principled way to express macros and staging with a unified set of abstractions.
+- [Type class derivation](contextual/derivation.md)
+  provides an in-language implementation of the `Gen` macro in Shapeless and other foundational libraries. The new implementation is more robust, efficient and easier to use than the macro.
+- [By-name context parameters](contextual/by-name-context-parameters.md)
+  provide a more robust in-language implementation of the `Lazy` macro in [Shapeless](https://github.com/milessabin/shapeless).
+
+## See Also
+
+[A classification of proposed language features](./features-classification.md) is
+an expanded version of this page that adds the status (i.e. relative importance to be a part of Scala 3, and relative urgency when to decide this) and expected migration cost
+of each language construct.
diff --git a/docs/docs/reference/soft-modifier.md b/docs/_docs/reference/soft-modifier.md
similarity index 80%
rename from docs/docs/reference/soft-modifier.md
rename to docs/_docs/reference/soft-modifier.md
index 1097eccec9ff..6421c38f00dd 100644
--- a/docs/docs/reference/soft-modifier.md
+++ b/docs/_docs/reference/soft-modifier.md
@@ -1,11 +1,12 @@
 ---
 layout: doc-page
-title: Soft Keywords
+title: "Soft Keywords"
+movedTo: https://docs.scala-lang.org/scala3/reference/soft-modifier.html
 ---
 
-A soft modifier is one of the identifiers `opaque`, `inline`, `open`, `transparent`, and `infix`.
+A soft modifier is one of the identifiers `infix`, `inline`, `opaque`, `open` and `transparent`.
 
-A soft keyword is a soft modifier, or one of `derives`, `end`, `extension`, `using`, `|`, `+`, `-`, `*`
+A soft keyword is a soft modifier, or one of `as`, `derives`, `end`, `extension`, `throws`, `using`, `|`, `+`, `-`, `*`
 
 A soft modifier is treated as potential modifier of a definition if it is followed by a hard modifier or a keyword combination starting a definition (`def`, `val`, `var`, `type`, `given`, `class`, `trait`, `object`, `enum`, `case class`, `case object`). Between the two words there may be a sequence of newline tokens and soft modifiers.
 
diff --git a/docs/_docs/reference/syntax.md b/docs/_docs/reference/syntax.md
new file mode 100644
index 000000000000..ff219a46081c
--- /dev/null
+++ b/docs/_docs/reference/syntax.md
@@ -0,0 +1,451 @@
+---
+layout: doc-page
+title: "Scala 3 Syntax Summary"
+movedTo: https://docs.scala-lang.org/scala3/reference/syntax.html
+---
+
+The following description of Scala tokens uses literal characters `‘c’` when
+referring to the ASCII fragment `\u0000` – `\u007F`.
+
+_Unicode escapes_ are used to represent the [Unicode character](https://www.w3.org/International/articles/definitions-characters/) with the given
+hexadecimal code:
+
+```
+UnicodeEscape ::= ‘\’ ‘u’ {‘u’} hexDigit hexDigit hexDigit hexDigit
+hexDigit      ::= ‘0’ | … | ‘9’ | ‘A’ | … | ‘F’ | ‘a’ | … | ‘f’
+```
+
+Informal descriptions are typeset as `“some comment”`.
+
+### Lexical Syntax
+
+The lexical syntax of Scala is given by the following grammar in EBNF
+form.
+
+```
+whiteSpace       ::=  ‘\u0020’ | ‘\u0009’ | ‘\u000D’ | ‘\u000A’
+upper            ::=  ‘A’ | … | ‘Z’ | ‘\$’ | ‘_’  “… and Unicode category Lu”
+lower            ::=  ‘a’ | … | ‘z’ “… and Unicode category Ll”
+letter           ::=  upper | lower “… and Unicode categories Lo, Lt, Nl”
+digit            ::=  ‘0’ | … | ‘9’
+paren            ::=  ‘(’ | ‘)’ | ‘[’ | ‘]’ | ‘{’ | ‘}’ | ‘'(’ | ‘'[’ | ‘'{’
+delim            ::=  ‘`’ | ‘'’ | ‘"’ | ‘.’ | ‘;’ | ‘,’
+opchar           ::=  “printableChar not matched by (whiteSpace | upper |
+                       lower | letter | digit | paren | delim | opchar |
+                       Unicode_Sm | Unicode_So)”
+printableChar    ::=  “all characters in [\u0020, \u007F] inclusive”
+charEscapeSeq    ::=  ‘\’ (‘b’ | ‘t’ | ‘n’ | ‘f’ | ‘r’ | ‘"’ | ‘'’ | ‘\’)
+
+op               ::=  opchar {opchar}
+varid            ::=  lower idrest
+alphaid          ::=  upper idrest
+                   |  varid
+plainid          ::=  alphaid
+                   |  op
+id               ::=  plainid
+                   |  ‘`’ { charNoBackQuoteOrNewline | UnicodeEscape | charEscapeSeq } ‘`’
+idrest           ::=  {letter | digit} [‘_’ op]
+quoteId          ::=  ‘'’ alphaid
+
+integerLiteral   ::=  (decimalNumeral | hexNumeral) [‘L’ | ‘l’]
+decimalNumeral   ::=  ‘0’ | nonZeroDigit [{digit | ‘_’} digit]
+hexNumeral       ::=  ‘0’ (‘x’ | ‘X’) hexDigit [{hexDigit | ‘_’} hexDigit]
+nonZeroDigit     ::=  ‘1’ | … | ‘9’
+
+floatingPointLiteral
+                 ::=  [decimalNumeral] ‘.’ digit [{digit | ‘_’} digit] [exponentPart] [floatType]
+                   |  decimalNumeral exponentPart [floatType]
+                   |  decimalNumeral floatType
+exponentPart     ::=  (‘E’ | ‘e’) [‘+’ | ‘-’] digit [{digit | ‘_’} digit]
+floatType        ::=  ‘F’ | ‘f’ | ‘D’ | ‘d’
+
+booleanLiteral   ::=  ‘true’ | ‘false’
+
+characterLiteral ::=  ‘'’ (printableChar | charEscapeSeq) ‘'’
+
+stringLiteral    ::=  ‘"’ {stringElement} ‘"’
+                   |  ‘"""’ multiLineChars ‘"""’
+stringElement    ::=  printableChar \ (‘"’ | ‘\’)
+                   |  UnicodeEscape
+                   |  charEscapeSeq
+multiLineChars   ::=  {[‘"’] [‘"’] char \ ‘"’} {‘"’}
+processedStringLiteral
+                 ::=  alphaid ‘"’ {[‘\’] processedStringPart | ‘\\’ | ‘\"’} ‘"’
+                   |  alphaid ‘"""’ {[‘"’] [‘"’] char \ (‘"’ | ‘$’) | escape} {‘"’} ‘"""’
+processedStringPart
+                 ::= printableChar \ (‘"’ | ‘$’ | ‘\’) | escape
+escape           ::=  ‘$$’
+                   |  ‘$’ letter { letter | digit }
+                   |  ‘{’ Block  [‘;’ whiteSpace stringFormat whiteSpace] ‘}’
+stringFormat     ::=  {printableChar \ (‘"’ | ‘}’ | ‘ ’ | ‘\t’ | ‘\n’)}
+
+symbolLiteral    ::=  ‘'’ plainid // until 2.13
+
+comment          ::=  ‘/*’ “any sequence of characters; nested comments are allowed” ‘*/’
+                   |  ‘//’ “any sequence of characters up to end of line”
+
+nl               ::=  “new line character”
+semi             ::=  ‘;’ |  nl {nl}
+```
+
+## Optional Braces
+
+The lexical analyzer also inserts `indent` and `outdent` tokens that represent regions of indented code [at certain points](./other-new-features/indentation.md).
+
+In the context-free productions below we use the notation `<<< ts >>>`
+to indicate a token sequence `ts` that is either enclosed in a pair of braces `{ ts }` or that constitutes an indented region `indent ts outdent`. Analogously, the
+notation `:<<< ts >>>` indicates a token sequence `ts` that is either enclosed in a pair of braces `{ ts }` or that constitutes an indented region `indent ts outdent` that follows
+a `:` at the end of a line.
+
+```
+ <<< ts >>>   ::=  ‘{’ ts ‘}’
+                |  indent ts outdent
+:<<< ts >>>   ::=  [nl] ‘{’ ts ‘}’
+                |  `:` indent ts outdent
+```
+
+## Keywords
+
+### Regular keywords
+
+```
+abstract  case      catch     class     def       do        else
+enum      export    extends   false     final     finally   for
+given     if        implicit  import    lazy      match     new
+null      object    override  package   private   protected return
+sealed    super     then      throw     trait     true      try
+type      val       var       while     with      yield
+:         =         <-        =>        <:        :>        #
+@         =>>       ?=>
+```
+
+### Soft keywords
+
+```
+as  derives  end  extension  infix  inline  opaque  open  throws
+transparent  using  |  *  +  -
+```
+
+See the [separate section on soft keywords](./soft-modifier.md) for additional
+details on where a soft keyword is recognized.
+
+## Context-free Syntax
+
+The context-free syntax of Scala is given by the following EBNF
+grammar:
+
+### Literals and Paths
+```
+SimpleLiteral     ::=  [‘-’] integerLiteral
+                    |  [‘-’] floatingPointLiteral
+                    |  booleanLiteral
+                    |  characterLiteral
+                    |  stringLiteral
+Literal           ::=  SimpleLiteral
+                    |  processedStringLiteral
+                    |  symbolLiteral
+                    |  ‘null’
+
+QualId            ::=  id {‘.’ id}
+ids               ::=  id {‘,’ id}
+
+SimpleRef         ::=  id
+                    |  [id ‘.’] ‘this’
+                    |  [id ‘.’] ‘super’ [ClassQualifier] ‘.’ id
+
+ClassQualifier    ::=  ‘[’ id ‘]’
+```
+
+### Types
+```
+Type              ::=  FunType
+                    |  HkTypeParamClause ‘=>>’ Type
+                    |  FunParamClause ‘=>>’ Type
+                    |  MatchType
+                    |  InfixType
+FunType           ::=  FunTypeArgs (‘=>’ | ‘?=>’) Type
+                    |  HKTypeParamClause '=>' Type
+FunTypeArgs       ::=  InfixType
+                    |  ‘(’ [ FunArgTypes ] ‘)’
+                    |  FunParamClause
+FunParamClause    ::=  ‘(’ TypedFunParam {‘,’ TypedFunParam } ‘)’
+TypedFunParam     ::=  id ‘:’ Type
+MatchType         ::=  InfixType `match` <<< TypeCaseClauses >>>
+InfixType         ::=  RefinedType {id [nl] RefinedType}
+RefinedType       ::=  AnnotType {[nl] Refinement}
+AnnotType         ::=  SimpleType {Annotation}
+
+SimpleType        ::=  SimpleLiteral
+                    |  ‘?’ TypeBounds
+                    |  id
+                    |  Singleton ‘.’ id
+                    |  Singleton ‘.’ ‘type’
+                    |  ‘(’ Types ‘)’
+                    |  Refinement
+                    |  ‘$’ ‘{’ Block ‘}’                                        -- unless inside quoted pattern
+                    |  ‘$’ ‘{’ Pattern ‘}’                                      -- only inside quoted pattern
+                    |  SimpleType1 TypeArgs
+                    |  SimpleType1 ‘#’ id
+Singleton         ::=  SimpleRef
+                    |  SimpleLiteral
+                    |  Singleton ‘.’ id
+
+FunArgType        ::=  Type
+                    |  ‘=>’ Type
+FunArgTypes       ::=  FunArgType { ‘,’ FunArgType }
+ParamType         ::=  [‘=>’] ParamValueType
+ParamValueType    ::=  Type [‘*’]
+TypeArgs          ::=  ‘[’ Types ‘]’
+Refinement        ::=  ‘{’ [RefineDcl] {semi [RefineDcl]} ‘}’
+TypeBounds        ::=  [‘>:’ Type] [‘<:’ Type]
+TypeParamBounds   ::=  TypeBounds {‘:’ Type}
+Types             ::=  Type {‘,’ Type}
+```
+
+### Expressions
+```
+Expr              ::=  FunParams (‘=>’ | ‘?=>’) Expr
+                    |  HkTypeParamClause ‘=>’ Expr
+                    |  Expr1
+BlockResult       ::=  FunParams (‘=>’ | ‘?=>’) Block
+                    |  HkTypeParamClause ‘=>’ Block
+                    |  Expr1
+FunParams         ::=  Bindings
+                    |  id
+                    |  ‘_’
+Expr1             ::=  [‘inline’] ‘if’ ‘(’ Expr ‘)’ {nl} Expr [[semi] ‘else’ Expr]
+                    |  [‘inline’] ‘if’  Expr ‘then’ Expr [[semi] ‘else’ Expr]
+                    |  ‘while’ ‘(’ Expr ‘)’ {nl} Expr
+                    |  ‘while’ Expr ‘do’ Expr
+                    |  ‘try’ Expr Catches [‘finally’ Expr]
+                    |  ‘try’ Expr [‘finally’ Expr]
+                    |  ‘throw’ Expr
+                    |  ‘return’ [Expr]
+                    |  ForExpr
+                    |  [SimpleExpr ‘.’] id ‘=’ Expr
+                    |  PrefixOperator SimpleExpr ‘=’ Expr
+                    |  SimpleExpr ArgumentExprs ‘=’ Expr
+                    |  PostfixExpr [Ascription]
+                    |  ‘inline’ InfixExpr MatchClause
+Ascription        ::=  ‘:’ InfixType
+                    |  ‘:’ Annotation {Annotation}
+Catches           ::=  ‘catch’ (Expr | ExprCaseClause)
+PostfixExpr       ::=  InfixExpr [id]                                          -- only if language.postfixOperators is enabled
+InfixExpr         ::=  PrefixExpr
+                    |  InfixExpr id [nl] InfixExpr
+                    |  InfixExpr MatchClause
+MatchClause       ::=  ‘match’ <<< CaseClauses >>>
+PrefixExpr        ::=  [PrefixOperator] SimpleExpr
+PrefixOperator    ::=  ‘-’ | ‘+’ | ‘~’ | ‘!’
+SimpleExpr        ::=  SimpleRef
+                    |  Literal
+                    |  ‘_’
+                    |  BlockExpr
+                    |  ‘$’ ‘{’ Block ‘}’                                        -- unless inside quoted pattern
+                    |  ‘$’ ‘{’ Pattern ‘}’                                      -- only inside quoted pattern
+                    |  Quoted
+                    |  quoteId                                                  -- only inside splices
+                    |  ‘new’ ConstrApp {‘with’ ConstrApp} [TemplateBody]
+                    |  ‘new’ TemplateBody
+                    |  ‘(’ ExprsInParens ‘)’
+                    |  SimpleExpr ‘.’ id
+                    |  SimpleExpr ‘.’ MatchClause
+                    |  SimpleExpr TypeArgs
+                    |  SimpleExpr ArgumentExprs
+Quoted            ::=  ‘'’ ‘{’ Block ‘}’
+                    |  ‘'’ ‘[’ Type ‘]’
+ExprsInParens     ::=  ExprInParens {‘,’ ExprInParens}
+ExprInParens      ::=  PostfixExpr ‘:’ Type
+                    |  Expr
+ParArgumentExprs  ::=  ‘(’ [‘using’] ExprsInParens ‘)’
+                    |  ‘(’ [ExprsInParens ‘,’] PostfixExpr ‘*’ ‘)’
+ArgumentExprs     ::=  ParArgumentExprs
+                    |  BlockExpr
+BlockExpr         ::=  <<< (CaseClauses | Block) >>>
+Block             ::=  {BlockStat semi} [BlockResult]
+BlockStat         ::=  Import
+                    |  {Annotation {nl}} {LocalModifier} Def
+                    |  Extension
+                    |  Expr1
+                    |  EndMarker
+
+ForExpr           ::=  ‘for’ ‘(’ Enumerators0 ‘)’ {nl} [‘do‘ | ‘yield’] Expr
+                    |  ‘for’ ‘{’ Enumerators0 ‘}’ {nl} [‘do‘ | ‘yield’] Expr
+                    |  ‘for’     Enumerators0          (‘do‘ | ‘yield’) Expr
+Enumerators0      ::=  {nl} Enumerators [semi]
+Enumerators       ::=  Generator {semi Enumerator | Guard}
+Enumerator        ::=  Generator
+                    |  Guard {Guard}
+                    |  Pattern1 ‘=’ Expr
+Generator         ::=  [‘case’] Pattern1 ‘<-’ Expr
+Guard             ::=  ‘if’ PostfixExpr
+
+CaseClauses       ::=  CaseClause { CaseClause }
+CaseClause        ::=  ‘case’ Pattern [Guard] ‘=>’ Block
+ExprCaseClause    ::=  ‘case’ Pattern [Guard] ‘=>’ Expr
+TypeCaseClauses   ::=  TypeCaseClause { TypeCaseClause }
+TypeCaseClause    ::=  ‘case’ InfixType ‘=>’ Type [semi]
+
+Pattern           ::=  Pattern1 { ‘|’ Pattern1 }
+Pattern1          ::=  Pattern2 [‘:’ RefinedType]
+Pattern2          ::=  [id ‘@’] InfixPattern [‘*’]
+InfixPattern      ::=  SimplePattern { id [nl] SimplePattern }
+SimplePattern     ::=  PatVar
+                    |  Literal
+                    |  ‘(’ [Patterns] ‘)’
+                    |  Quoted
+                    |  SimplePattern1 [TypeArgs] [ArgumentPatterns]
+                    |  ‘given’ RefinedType
+SimplePattern1    ::=  SimpleRef
+                    |  SimplePattern1 ‘.’ id
+PatVar            ::=  varid
+                    |  ‘_’
+Patterns          ::=  Pattern {‘,’ Pattern}
+ArgumentPatterns  ::=  ‘(’ [Patterns] ‘)’
+                    |  ‘(’ [Patterns ‘,’] PatVar ‘*’ ‘)’
+```
+
+### Type and Value Parameters
+```
+ClsTypeParamClause::=  ‘[’ ClsTypeParam {‘,’ ClsTypeParam} ‘]’
+ClsTypeParam      ::=  {Annotation} [‘+’ | ‘-’] id [HkTypeParamClause] TypeParamBounds
+
+DefTypeParamClause::=  ‘[’ DefTypeParam {‘,’ DefTypeParam} ‘]’
+DefTypeParam      ::=  {Annotation} id [HkTypeParamClause] TypeParamBounds
+
+TypTypeParamClause::=  ‘[’ TypTypeParam {‘,’ TypTypeParam} ‘]’
+TypTypeParam      ::=  {Annotation} id [HkTypeParamClause] TypeBounds
+
+HkTypeParamClause ::=  ‘[’ HkTypeParam {‘,’ HkTypeParam} ‘]’
+HkTypeParam       ::=  {Annotation} [‘+’ | ‘-’] (id [HkTypeParamClause] | ‘_’) TypeBounds
+
+ClsParamClauses   ::=  {ClsParamClause} [[nl] ‘(’ [‘implicit’] ClsParams ‘)’]
+ClsParamClause    ::=  [nl] ‘(’ ClsParams ‘)’
+                    |  [nl] ‘(’ ‘using’ (ClsParams | FunArgTypes) ‘)’
+ClsParams         ::=  ClsParam {‘,’ ClsParam}
+ClsParam          ::=  {Annotation} [{Modifier} (‘val’ | ‘var’) | ‘inline’] Param
+Param             ::=  id ‘:’ ParamType [‘=’ Expr]
+
+DefParamClauses   ::=  {DefParamClause} [[nl] ‘(’ [‘implicit’] DefParams ‘)’]
+DefParamClause    ::=  [nl] ‘(’ DefParams ‘)’ | UsingParamClause
+UsingParamClause  ::=  [nl] ‘(’ ‘using’ (DefParams | FunArgTypes) ‘)’
+DefParams         ::=  DefParam {‘,’ DefParam}
+DefParam          ::=  {Annotation} [‘inline’] Param
+```
+
+### Bindings and Imports
+```
+Bindings          ::=  ‘(’ [Binding {‘,’ Binding}] ‘)’
+Binding           ::=  (id | ‘_’) [‘:’ Type]
+
+Modifier          ::=  LocalModifier
+                    |  AccessModifier
+                    |  ‘override’
+                    |  ‘opaque’
+LocalModifier     ::=  ‘abstract’
+                    |  ‘final’
+                    |  ‘sealed’
+                    |  ‘open’
+                    |  ‘implicit’
+                    |  ‘lazy’
+                    |  ‘inline’
+AccessModifier    ::=  (‘private’ | ‘protected’) [AccessQualifier]
+AccessQualifier   ::=  ‘[’ id ‘]’
+
+Annotation        ::=  ‘@’ SimpleType1 {ParArgumentExprs}
+
+Import            ::=  ‘import’ ImportExpr {‘,’ ImportExpr}
+Export            ::=  ‘export’ ImportExpr {‘,’ ImportExpr}
+ImportExpr        ::=  SimpleRef {‘.’ id} ‘.’ ImportSpec
+                    |  SimpleRef ‘as’ id
+ImportSpec        ::=  NamedSelector
+                    |  WildcardSelector
+                    | ‘{’ ImportSelectors) ‘}’
+NamedSelector     ::=  id [‘as’ (id | ‘_’)]
+WildCardSelector  ::=  ‘*' | ‘given’ [InfixType]
+ImportSelectors   ::=  NamedSelector [‘,’ ImportSelectors]
+                    |  WildCardSelector {‘,’ WildCardSelector}
+
+EndMarker         ::=  ‘end’ EndMarkerTag    -- when followed by EOL
+EndMarkerTag      ::=  id | ‘if’ | ‘while’ | ‘for’ | ‘match’ | ‘try’
+                    |  ‘new’ | ‘this’ | ‘given’ | ‘extension’ | ‘val’
+```
+
+### Declarations and Definitions
+```
+RefineDcl         ::=  ‘val’ ValDcl
+                    |  ‘def’ DefDcl
+                    |  ‘type’ {nl} TypeDcl
+Dcl               ::=  RefineDcl
+                    |  ‘var’ VarDcl
+ValDcl            ::=  ids ‘:’ Type
+VarDcl            ::=  ids ‘:’ Type
+DefDcl            ::=  DefSig ‘:’ Type
+DefSig            ::=  id [DefTypeParamClause] DefParamClauses
+TypeDcl           ::=  id [TypeParamClause] {FunParamClause} TypeBounds [‘=’ Type]
+
+Def               ::=  ‘val’ PatDef
+                    |  ‘var’ PatDef
+                    |  ‘def’ DefDef
+                    |  ‘type’ {nl} TypeDcl
+                    |  TmplDef
+PatDef            ::=  ids [‘:’ Type] ‘=’ Expr
+                    |  Pattern2 [‘:’ Type] ‘=’ Expr
+DefDef            ::=  DefSig [‘:’ Type] ‘=’ Expr
+                    |  ‘this’ DefParamClause DefParamClauses ‘=’ ConstrExpr
+
+TmplDef           ::=  ([‘case’] ‘class’ | ‘trait’) ClassDef
+                    |  [‘case’] ‘object’ ObjectDef
+                    |  ‘enum’ EnumDef
+                    |  ‘given’ GivenDef
+ClassDef          ::=  id ClassConstr [Template]
+ClassConstr       ::=  [ClsTypeParamClause] [ConstrMods] ClsParamClauses
+ConstrMods        ::=  {Annotation} [AccessModifier]
+ObjectDef         ::=  id [Template]
+EnumDef           ::=  id ClassConstr InheritClauses EnumBody
+GivenDef          ::=  [GivenSig] (AnnotType [‘=’ Expr] | StructuralInstance)
+GivenSig          ::=  [id] [DefTypeParamClause] {UsingParamClause} ‘:’         -- one of `id`, `DefParamClause`, `UsingParamClause` must be present
+StructuralInstance ::=  ConstrApp {‘with’ ConstrApp} [‘with’ TemplateBody]
+Extension         ::=  ‘extension’ [DefTypeParamClause] {UsingParamClause}
+                       ‘(’ DefParam ‘)’ {UsingParamClause} ExtMethods
+ExtMethods        ::=  ExtMethod | [nl] <<< ExtMethod {semi ExtMethod} >>>
+ExtMethod         ::=  {Annotation [nl]} {Modifier} ‘def’ DefDef
+Template          ::=  InheritClauses [TemplateBody]
+InheritClauses    ::=  [‘extends’ ConstrApps] [‘derives’ QualId {‘,’ QualId}]
+ConstrApps        ::=  ConstrApp ({‘,’ ConstrApp} | {‘with’ ConstrApp})
+ConstrApp         ::=  SimpleType1 {Annotation} {ParArgumentExprs}
+ConstrExpr        ::=  SelfInvocation
+                    |  <<< SelfInvocation {semi BlockStat} >>>
+SelfInvocation    ::=  ‘this’ ArgumentExprs {ArgumentExprs}
+
+TemplateBody      ::=  :<<< [SelfType] TemplateStat {semi TemplateStat} >>>
+TemplateStat      ::=  Import
+                    |  Export
+                    |  {Annotation [nl]} {Modifier} Def
+                    |  {Annotation [nl]} {Modifier} Dcl
+                    |  Extension
+                    |  Expr1
+                    |  EndMarker
+                    |
+SelfType          ::=  id [‘:’ InfixType] ‘=>’
+                    |  ‘this’ ‘:’ InfixType ‘=>’
+
+EnumBody          ::=  :<<< [SelfType] EnumStat {semi EnumStat} >>>
+EnumStat          ::=  TemplateStat
+                    |  {Annotation [nl]} {Modifier} EnumCase
+EnumCase          ::=  ‘case’ (id ClassConstr [‘extends’ ConstrApps]] | ids)
+
+TopStats          ::=  TopStat {semi TopStat}
+TopStat           ::=  Import
+                    |  Export
+                    |  {Annotation [nl]} {Modifier} Def
+                    |  Extension
+                    |  Packaging
+                    |  PackageObject
+                    |  EndMarker
+                    |
+Packaging         ::=  ‘package’ QualId :<<< TopStats >>>
+PackageObject     ::=  ‘package’ ‘object’ ObjectDef
+
+CompilationUnit   ::=  {‘package’ QualId semi} TopStats
+```
diff --git a/docs/docs/release-notes/0.1.2.md b/docs/_docs/release-notes/0.1.2.md
similarity index 100%
rename from docs/docs/release-notes/0.1.2.md
rename to docs/_docs/release-notes/0.1.2.md
diff --git a/docs/docs/release-notes/syntax-changes-0.22.md b/docs/_docs/release-notes/syntax-changes-0.22.md
similarity index 100%
rename from docs/docs/release-notes/syntax-changes-0.22.md
rename to docs/_docs/release-notes/syntax-changes-0.22.md
diff --git a/docs/docs/usage/cbt-projects.md b/docs/_docs/usage/cbt-projects.md
similarity index 100%
rename from docs/docs/usage/cbt-projects.md
rename to docs/_docs/usage/cbt-projects.md
diff --git a/docs/docs/usage/dottydoc.md b/docs/_docs/usage/dottydoc.md
similarity index 97%
rename from docs/docs/usage/dottydoc.md
rename to docs/_docs/usage/dottydoc.md
index f7e15b692d99..28c29606a301 100644
--- a/docs/docs/usage/dottydoc.md
+++ b/docs/_docs/usage/dottydoc.md
@@ -92,7 +92,7 @@ It is also possible to use one of the [default layouts](#default-layouts) that s
 Blog
 ====
 Dottydoc also allows for a simple blogging platform in the same vein as Jekyll.
-Blog posts are placed within the `./blog/_posts` directory and have to be in
+Blog posts are placed within the `./_blog/_posts` directory and have to be in
 the form `year-month-day-title.{md,html}`.
 
 An example of this would be:
@@ -252,7 +252,7 @@ to alter the way Dottydoc renders API documentation.
 
 blog-page.html
 --------------
-A blog page uses files placed in `./blog/_posts/` as input to render a blog.
+A blog page uses files placed in `./_blog/_posts/` as input to render a blog.
 
 Default Includes
 ================
diff --git a/docs/_docs/usage/ide-support.md b/docs/_docs/usage/ide-support.md
new file mode 100644
index 000000000000..25739b021b78
--- /dev/null
+++ b/docs/_docs/usage/ide-support.md
@@ -0,0 +1,7 @@
+---
+layout: doc-page
+title: "IDE support for Scala 3"
+movedTo: https://docs.scala-lang.org/scala3/getting-started.html
+---
+
+This page is deprecated. Please go to the [getting-started](https://docs.scala-lang.org/scala3/getting-started.html)
diff --git a/docs/_docs/usage/sbt-projects.md b/docs/_docs/usage/sbt-projects.md
new file mode 100644
index 000000000000..13a61eff27db
--- /dev/null
+++ b/docs/_docs/usage/sbt-projects.md
@@ -0,0 +1,6 @@
+---
+layout: doc-page
+title: "Using Dotty with sbt"
+---
+
+To try it in your project see the [Getting Started User Guide](https://docs.scala-lang.org/scala3/getting-started.html).
diff --git a/docs/_docs/usage/scaladoc/blog.md b/docs/_docs/usage/scaladoc/blog.md
new file mode 100644
index 000000000000..85c2d9fa044a
--- /dev/null
+++ b/docs/_docs/usage/scaladoc/blog.md
@@ -0,0 +1,40 @@
+---
+layout: doc-page
+title: "Built-in blog"
+
+
+
+---
+
+
+Scaladoc allows you to include a simple blog in your documentation. For now, it
+provides only basic features. In the future, we plan to include more advanced
+features like tagging or author pages.
+
+Blog is treated a little differently than regular static sites. This article will help you set up your own blog.
+
+## Proper directory setup
+
+All your blogposts must be put under `blog/_posts` directory.
+
+
+```
+├── blog
+│   ├── _posts
+│   │   └── 2016-12-05-implicit-function-types.md
+│   └── index.html
+```
+
+If you are using yaml [sidebar](./static-site.md#sidebar) don't forget to place
+
+```
+sidebar:
+    - title: Blog
+```
+
+somewhere inside the `yaml` tree representing the sidebar sections. Scaladoc will attach under that section all of your blogposts.
+
+## Naming convention
+
+All the blogpost filenames should start with date in numeric format matching `YYYY-MM-DD`.
+Example name is `2015-10-23-dotty-compiler-bootstraps.md`.
diff --git a/docs/_docs/usage/scaladoc/docstrings.md b/docs/_docs/usage/scaladoc/docstrings.md
new file mode 100644
index 000000000000..9935702e10bd
--- /dev/null
+++ b/docs/_docs/usage/scaladoc/docstrings.md
@@ -0,0 +1,194 @@
+---
+layout: doc-page
+title: "Docstrings - specific Tags and Features"
+---
+
+This chapter describes how to correctly write docstrings and how to use all the available features of scaladoc.
+Since many things are the same as in the old scaladoc, some parts are reused from this [article](https://docs.scala-lang.org/overviews/scaladoc/for-library-authors.html)
+
+
+Scaladoc extends Markdown with additional features, such as linking
+to API definitions. This can be used from within static documentation and blog
+posts to provide blend-in content.
+
+
+## Where to put docstrings
+
+Scaladoc comments go before the items they pertain to in a special comment block that starts with a /** and ends with a */, like this:
+
+```scala
+/** Start the comment here
+  * and use the left star followed by a
+  * white space on every line.
+  *
+  * Even on empty paragraph-break lines.
+  *
+  * Note that the * on each line is aligned
+  * with the second * in /** so that the
+  * left margin is on the same column on the
+  * first line and on subsequent ones.
+  *
+  * Close the comment with *\/
+  *
+  * If you use Scaladoc tags (@param, @group, etc.),
+  * remember to put them at separate lines with nothing preceding.
+  *
+  * For example:
+  *
+  * Calculate the square of the given number
+  *
+  * @param d the Double to square
+  * @return the result of squaring d
+  */
+ def square(d: Double): Double = d * d
+```
+
+In the example above, this Scaladoc comment is associated with the method square since it is right before it in the source code.
+
+Scaladoc comments can go before fields, methods, classes, traits, objects.
+For now, scaladoc doesn't support straightforward solution to document packages. There is a dedicated github
+[issue](https://github.com/lampepfl/dotty/issues/11284), where you can check the current status of the problem.
+
+For class primary constructors which in Scala coincide with the definition of the class itself, a @constructor tag is used to target a comment to be put on the primary constructor documentation rather than the class overview.
+
+## Tags
+
+Scaladoc uses `@<tagname>` tags to provide specific detail fields in the comments. These include:
+
+### Class specific tags
+
+- `@constructor` placed in the class comment will describe the primary constructor.
+
+### Method specific tags
+
+- `@return` detail the return value from a method (one per method).
+
+### Method, Constructor and/or Class tags
+
+- `@throws` what exceptions (if any) the method or constructor may throw.
+- `@param` detail a value parameter for a method or constructor, provide one per parameter to the method/constructor.
+- `@tparam` detail a type parameter for a method, constructor or class. Provide one per type parameter.
+
+### Usage tags
+
+- `@see` reference other sources of information like external document links or related entities in the documentation.
+- `@note` add a note for pre or post conditions, or any other notable restrictions or expectations.
+- `@example` for providing example code or related example documentation.
+
+
+### Member grouping tags
+
+These tags are well-suited to larger types or packages, with many members. They allow you to organize the Scaladoc page into distinct sections, with each one shown separately, in the order that you choose.
+
+These tags are not enabled by default! You must pass the -groups flag to Scaladoc in order to turn them on. Typically the sbt for this will look something like:
+
+```scala
+Compile / doc / scalacOptions ++= Seq(
+  "-groups"
+)
+```
+Each section should have a single-word identifier that is used in all of these tags, shown as `group` below. By default, that identifier is shown as the title of that documentation section, but you can use @groupname to provide a longer title.
+
+Typically, you should put @groupprio (and optionally @groupname and @groupdesc) in the Scaladoc for the package/trait/class/object itself, describing what all the groups are, and their order. Then put @group in the Scaladoc for each member, saying which group it is in.
+
+Members that do not have a `@group` tag will be listed as “Ungrouped” in the resulting documentation.
+
+- `@group <group>` - mark the entity as a member of the `<group>` group.
+- `@groupname <group> <name>` - provide an optional name for the group. `<name>` is displayed as the group header before the group description.
+- `@groupdesc <group> <description>` - add optional descriptive text to display under the group name. Supports multiline formatted text.
+- `@groupprio <group> <priority>` - control the order of the group on the page. Defaults to 0. Ungrouped elements have an implicit priority of 1000. Use a value between 0 and 999 to set a relative position to other groups. Low values will appear before high values.
+
+### Other tags
+
+- `@author` provide author information for the following entity
+- `@version` the version of the system or API that this entity is a part of.
+- `@since` like `@version` but defines the system or API that this entity was first defined in.
+- `@deprecated` marks the entity as deprecated, providing both the replacement implementation that should be used and the version/date at which this entity was deprecated.
+- `@syntax <name>` let you change the parser for docstring. The default syntax is markdown, however you can change it using this directive. Currently available syntaxes are `markdown` or `wiki`, e. g. `@syntax wiki`
+
+### Macros
+
+- `@define <name> <definition>` allows use of $name in other Scaladoc comments within the same source file which will be expanded to the contents of `<definition>`.
+
+If a comment is not provided for an entity at the current inheritance level, but is supplied for the overridden entity at a higher level in the inheritance hierarchy, the comment from the super-class will be used.
+
+Likewise if `@param`, `@tparam`, `@return` and other entity tags are omitted but available from a superclass, those comments will be used.
+
+### Explicit
+
+For explicit comment inheritance, use the @inheritdoc tag.
+
+### Markup
+
+Scaladoc provides two syntax parsers: `markdown` (default) or `wikidoc`.
+It is still possible to embed HTML tags in Scaladoc (like with Javadoc), but not necessary most of the time as markup may be used instead.
+
+#### Markdown
+
+Markdown uses [commonmark flavour](https://spec.commonmark.org/current/) with two custom extensions:
+- `wikidoc` links for referencing convenience
+- `wikidoc` codeblocks with curly braces syntax
+
+
+#### Wikidoc
+
+Wikidoc is syntax used for scala2 scaladoc. It is supported because of many existing source code, however it is **not** recommended to use it in new projects.
+Wikisyntax can be toggled on with flag `-comment-syntax wiki` globally, or with `@syntax wiki` directive in docstring.
+
+Some of the standard markup available:
+
+```
+`monospace`
+''italic text''
+'''bold text'''
+__underline__
+^superscript^
+,,subscript,,
+[[entity link]], e.g. [[scala.collection.Seq]]
+[[https://external.link External Link]], e.g. [[https://scala-lang.org Scala Language Site]]
+```
+
+For more info about wiki links look at this [chapter](#linking-to-api)
+
+Other formatting notes
+
+- Paragraphs are started with one (or more) blank lines. `*` in the margin for the comment is valid (and should be included) but the line should be blank otherwise.
+- Headings are defined with surrounding `=` characters, with more `=` denoting subheadings. E.g. `=Heading=`, `==Sub-Heading==`, etc.
+- List blocks are a sequence of list items with the same style and level, with no interruptions from other block styles. Unordered lists can be bulleted using `-`, numbered lists can be denoted using `1.`, `i.`, `I.`, or `a.` for the various numbering styles. In both cases, you must have extra space in front, and more space makes a sub-level.
+
+The markup for list blocks looks like:
+
+```
+/** Here is an unordered list:
+  *
+  *   - First item
+  *   - Second item
+  *     - Sub-item to the second
+  *     - Another sub-item
+  *   - Third item
+  *
+  * Here is an ordered list:
+  *
+  *   1. First numbered item
+  *   1. Second numbered item
+  *     i. Sub-item to the second
+  *     i. Another sub-item
+  *   1. Third item
+  */
+```
+
+### General Notes for Writing Scaladoc Comments
+
+Concise is nice! Get to the point quickly, people have limited time to spend on your documentation, use it wisely.
+Omit unnecessary words. Prefer returns X rather than this method returns X, and does X,Y & Z rather than this method does X, Y and Z.
+DRY - don’t repeat yourself. Resist duplicating the method description in the @return tag and other forms of repetitive commenting.
+
+More details on writing Scaladoc
+
+Further information on the formatting and style recommendations can be found in Scala-lang scaladoc style guide.
+
+## Linking to API
+
+Scaladoc allows linking to API documentation with Wiki-style links. Linking to
+`scala.collection.immutable.List` is as simple as
+`[[scala.collection.immutable.List]]`. For more information on the exact syntax, see [doc comment documentation](./linking.md#definition-links).
diff --git a/docs/_docs/usage/scaladoc/index.md b/docs/_docs/usage/scaladoc/index.md
new file mode 100644
index 000000000000..dc53c01db666
--- /dev/null
+++ b/docs/_docs/usage/scaladoc/index.md
@@ -0,0 +1,8 @@
+---
+layout: doc-page
+title: "Scaladoc"
+---
+
+![scaladoc logo](images/scaladoc-logo.png)
+
+scaladoc is a tool to generate the API documentation of your Scala 3 projects. It provides similar features to `javadoc` as well as `jekyll` or `docusaurus`.
diff --git a/docs/_docs/usage/scaladoc/linking.md b/docs/_docs/usage/scaladoc/linking.md
new file mode 100644
index 000000000000..daef312700fc
--- /dev/null
+++ b/docs/_docs/usage/scaladoc/linking.md
@@ -0,0 +1,95 @@
+---
+layout: doc-page
+title: "Linking documentation"
+---
+
+Scaladoc's main feature is creating API documentation from code comments.
+
+By default, the code comments are understood as Markdown, though we also support
+Scaladoc's old [Wiki syntax](https://docs.scala-lang.org/style/scaladoc.html).
+
+## Syntax
+
+### Definition links
+
+Our definition link syntax is quite close to Scaladoc's syntax, though we have made some
+quality-of-life improvements.
+
+#### Basic syntax
+
+A definition link looks as follows: `[[scala.collection.immutable.List]]`.
+
+Which is to say, a definition link is a sequence of identifiers separated by
+`.`. The identifiers can be separated with `#` as well for Scaladoc compatibility.
+
+By default, an identifier `id` references the first (in source order) entity
+named `id`. An identifier can end with `$`, which forces it to refer to a value
+(an object, a value, a given); an identifier can also end with `!`, which forces
+it to refer to a type (a class, a type alias, a type member).
+
+The links are resolved relative to the current location in source. That is, when
+documenting a class, the links are relative to the entity enclosing the class (a
+package, a class, an object); the same applies to documenting definitions.
+
+Special characters in links can be backslash-escaped, which makes them part of
+identifiers instead. For example, `` [[scala.collection.immutable\.List]] ``
+references the class named `` `immutable.List` `` in package `scala.collection`.
+
+#### New syntax
+
+We have extended Scaladoc definition links to make them a bit more pleasant to
+write and read in source. The aim was also to bring the link and Scala syntax
+closer together. The new features are:
+
+1. `package` can be used as a prefix to reference the enclosing package
+    Example:
+    ```
+    package utils
+    class C {
+      def foo = "foo".
+    }
+    /** See also [[package.C]]. */
+    class D {
+      def bar = "bar".
+    }
+    ```
+    The `package` keyword helps make links to the enclosing package shorter
+    and a bit more resistant to name refactorings.
+1. `this` can be used as a prefix to reference the enclosing classlike
+    Example:
+    ```
+    class C {
+      def foo = "foo"
+      /** This is not [[this.foo]], this is bar. */
+      def bar = "bar"
+    }
+    ```
+    Using a Scala keyword here helps make the links more familiar, as well as
+    helps the links survive class name changes.
+1. Backticks can be used to escape identifiers
+    Example:
+    ```
+    def `([.abusive.])` = ???
+    /** TODO: Figure out what [[`([.abusive.])`]] is. */
+    def foo = `([.abusive.])`
+    ```
+    Previously (versions 2.x), Scaladoc required backslash-escaping to reference such identifiers. Now (3.x versions),
+    Scaladoc allows using the familiar Scala backtick quotation.
+
+#### Why keep the Wiki syntax for links?
+
+There are a few reasons why we've kept the Wiki syntax for documentation links
+instead of reusing the Markdown syntax. Those are:
+
+1. Nameless links in Markdown are ugly: `[](definition)` vs `[[definition]]`
+    By far, most links in documentation are nameless. It should be obvious how to
+    write them.
+2. Local member lookup collides with URL fragments: `[](#field)` vs `[[#field]]`
+3. Overload resolution collides with MD syntax: `[](meth(Int))` vs `[[meth(Int)]]`
+4. Now that we have a parser for the link syntax, we can allow spaces inside (in
+    Scaladoc one needed to slash-escape those), but that doesn't get recognized
+    as a link in Markdown: `[](meth(Int, Float))` vs `[[meth(Int, Float)]]`
+
+None of these make it completely impossible to use the standard Markdown link
+syntax, but they make it much more awkward and ugly than it needs to be. On top
+of that, Markdown link syntax doesn't even save any characters.
diff --git a/docs/_docs/usage/scaladoc/search-engine.md b/docs/_docs/usage/scaladoc/search-engine.md
new file mode 100644
index 000000000000..a586c25c0a21
--- /dev/null
+++ b/docs/_docs/usage/scaladoc/search-engine.md
@@ -0,0 +1,82 @@
+---
+layout: doc-page
+title: "Type-based search"
+---
+
+Searching for functions by their symbolic names can be time-consuming.
+That is why the new scaladoc allows searching for methods and fields by their types.
+
+
+Consider the following extension method definition:
+```
+extension [T](arr: IArray[T]) def span(p: T => Boolean): (IArray[T], IArray[T]) = ...
+```
+Instead of searching for `span` we can also search for `IArray[A] => (A => Boolean) => (IArray[A], IArray[A])`.
+
+To use this feature, type the signature of the member you are looking for in the scaladoc searchbar. This is how it works:
+
+![]({{ site.baseurl }}images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif)
+
+This feature is provided by the [Inkuire](https://github.com/VirtusLab/Inkuire) search engine, which works for Scala 3 and Kotlin. To be up-to-date with the development of this feature, follow the [Inkuire repository](https://github.com/VirtusLab/Inkuire).
+
+## Examples of queries
+
+Some examples of queries with intended results:
+- `List[Int] => (Int => Long) => List[Long]` -> `map`
+- `Seq[A] => (A => B) => Seq[B]` -> `map`
+- `(A, B) => A` -> `_1`
+- `Set[Long] => Long => Boolean` -> `contains`
+- `Int => Long => Int` -> `const`
+- `String => Int => Char` -> `apply`
+- `(Int & Float) => (String | Double)` -> `toDouble`, `toString`
+- `F[A] => Int` -> `length`
+
+## Query syntax
+
+In order for a scaladoc searchbar query to be searched using Inkuire instead of the default search engine, the query has to contain the `=>` character sequence.
+
+Accepted input is similar to a curried function signature in Scala 3. With some differences:
+- AndTypes, OrTypes and Functions have to be enclosed in parentheses e.g. `(Int & Any) => String`
+- fields and parameterless methods can be found by preceding their type with `=>`, e.g., `=> Int`
+- A wildcard `_` can be used to indicate that we want to match any type in a given place e.g. `Long => Double => _`
+- Types in the form of single letter e.g. `A` or a letter with a digit `X1` are automatically assumed to be type variables
+- Other type variables can be declared just like in polymorphic functions e.g. `[AVariable, AlsoAVariable] => AVariable => AlsoAVariable => AVariable`
+
+### Working with type aliases and method receivers
+
+When it comes to how the code is mapped to InkuireDb entries, there are some transformations to make the engine more opinionated (though open to suggestions and changes). Firstly, the receiver (non-module owner) of a function can be treated as a first argument. Automatic currying is also applied, so that the results don't depend on argument lists. When finding matches, `val`s and `def`s are not distinguished.
+
+So the following declarations should be found by query `Num => Int => Int => Int`:
+```
+class Num():
+  def a(i: Int, j: Int): Int
+  def b(i: Int)(j: Int): Int
+  def c(i: Int): (Int => Int)
+  val d: Int => Int => Int
+  val e: Int => Int => Int
+  val f: (Int, Int) => Int
+end Num
+
+def g(i: Num, j: Int, k: Int): Int
+extension (i: Num) def h(j: Int, k: Int): Int
+def i(i: Num, j: Int)(k: Int): Int
+extension (i: Num) def j(j: Int)(k: Int): Int
+...
+```
+
+When it comes to type aliases, they are desugared on both the declaration and the query signature. This means that for declarations:
+```
+type Name = String
+
+def fromName(name: Name): String
+def fromString(str: String): Name
+```
+both methods, `fromName` and `fromString`, should be found for queries `Name => Name`, `String => String`, `Name => String` and `String => Name`.
+
+## How it works
+
+Inkuire works as a JavaScript worker in the browser thanks to the power of [ScalaJS](https://www.scala-js.org/).
+
+To enable Inkuire when running scaladoc, add the flag `-Ygenerate-inkuire`. By adding this flag two files are generated:
+- `inkuire-db.json` - this is the file containing all the searchable declarations from the currently documented project in a format readable to the Inkuire search engine.
+- `inkuire-config.json` - this file contains the locations of the database files that should be searchable from the documentation of the current project. By default, it will be generated with the location of the local db file as well as the default implied locations of database files in [External mappings](https://docs.scala-lang.org/scala3/guides/scaladoc/settings.html#-external-mappings).
diff --git a/docs/_docs/usage/scaladoc/settings.md b/docs/_docs/usage/scaladoc/settings.md
new file mode 100644
index 000000000000..067967ee58cc
--- /dev/null
+++ b/docs/_docs/usage/scaladoc/settings.md
@@ -0,0 +1,179 @@
+---
+layout: doc-page
+title: "Settings"
+---
+
+This chapter lists the configuration options that can be used when calling scaladoc. Some of the information shown here can be found by calling scaladoc with the `-help` flag.
+
+## Parity with scaladoc for Scala 2
+
+Scaladoc has been rewritten from scratch and some of the features turned out to be useless in the new context.
+If you want to know what is current state of compatibility with scaladoc old flags, you can visit this issue for tracking [progress](https://github.com/lampepfl/dotty/issues/11907).
+
+## Providing settings
+
+Supply scaladoc settings as command-line arguments, e.g., `scaladoc -d output -project my-project target/scala-3.0.0-RC2/classes`. If called from sbt, update the value of `Compile / doc / scalacOptions` and `Compile / doc / target` respectively, e. g.
+
+```
+Compile / doc / target ++= Seq("-d", "output")
+Compile / doc / scalacOptions ++= Seq("-project", "my-project")
+```
+
+## Overview of all available settings
+
+##### -project
+The name of the project. To provide compatibility with Scala2 aliases with `-doc-title`
+
+##### -project-version
+The current version of your project that appears in a top left corner. To provide compatibility with Scala2 aliases with `-doc-version`
+
+##### -project-logo
+The logo of your project that appears in a top left corner. To provide compatibility with Scala2 aliases with `-doc-logo`
+
+##### -project-footer
+The string message that appears in a footer section. To provide compatibility with Scala2 aliases with `-doc-footer`
+
+##### -comment-syntax
+The styling language used for parsing comments.
+Currently we support two syntaxes: `markdown` or `wiki`
+If setting is not present, scaladoc defaults `markdown`
+
+##### -revision
+Revision (branch or ref) used to build project project. Useful with sourcelinks to prevent them from pointing always to the newest master that is subject to changes.
+
+##### -source-links
+Source links provide a mapping between file in documentation and code repository.
+
+Example source links is:
+`-source-links:docs=github://lampepfl/dotty/master#docs`
+
+Accepted formats:
+
+\<sub-path>=\<source-link>
+\<source-link>
+
+where \<source-link> is one of following:
+ - `github://<organization>/<repository>[/revision][#subpath]`
+     will match https://github.com/$organization/$repository/\[blob|edit]/$revision\[/$subpath]/$filePath\[$lineNumber]
+     when revision is not provided then requires revision to be specified as argument for scaladoc
+ - `gitlab://<organization>/<repository>`
+     will match https://gitlab.com/$organization/$repository/-/\[blob|edit]/$revision\[/$subpath]/$filePath\[$lineNumber]
+     when revision is not provided then requires revision to be specified as argument for scaladoc
+ - \<scaladoc-template>
+
+\<scaladoc-template> is a format for `doc-source-url` parameter from old scaladoc.
+NOTE: We only supports `€{FILE_PATH_EXT}`, `€{TPL_NAME}`, `€{FILE_EXT}`,
+ €{FILE_PATH}, and €{FILE_LINE} patterns.
+
+
+Template can defined only by subset of sources defined by path prefix represented by `<sub-path>`.
+In such case paths used in templates will be relativized against `<sub-path>`
+
+
+
+##### -external-mappings
+
+Mapping between regexes matching classpath entries and external documentation.
+
+Example external mapping is:
+`-external-mappings:.*scala.*::scaladoc3::https://scala-lang.org/api/3.x/,.*java.*::javadoc::https://docs.oracle.com/javase/8/docs/api/`
+
+A mapping is of the form '\<regex>::\[scaladoc3|scaladoc|javadoc]::\<path>'. You can supply several mappings, separated by commas, as shown in the example.
+
+##### -social-links
+
+Links to social sites. For example:
+
+`-social-links:github::https://github.com/lampepfl/dotty,gitter::https://gitter.im/scala/scala,twitter::https://twitter.com/scala_lang`
+
+Valid values are of the form: '\[github|twitter|gitter|discord]::link'. Scaladoc also supports 'custom::link::white_icon_name::black_icon_name'. In this case icons must be present in 'images/' directory.
+
+##### -skip-by-id
+
+Identifiers of packages or top-level classes to skip when generating documentation.
+
+##### -skip-by-regex
+
+Regexes that match fully qualified names of packages or top-level classes to skip when generating documentation.
+
+##### -doc-root-content
+
+The file from which the root package documentation should be imported.
+
+##### -author
+
+Adding authors in docstring with `@author Name Surname` by default won't be included in generated html documentation.
+If you would like to label classes with authors explicitly, run scaladoc with this flag.
+
+##### -groups
+
+Group similar functions together (based on the @group annotation)
+
+##### -private
+
+Show all types and members. Unless specified, show only public and protected types and members.
+
+##### -doc-canonical-base-url
+
+A base URL to use as prefix and add `canonical` URLs to all pages. The canonical URL may be used by search engines to choose the URL that you want people to see in search results. If unset no canonical URLs are generated.
+
+##### -siteroot
+
+A directory containing static files from which to generate documentation. Default directory is `./docs`
+
+##### -no-link-warnings
+
+Suppress warnings for ambiguous or incorrect links in members’ lookup. Doesn't affect warnings for incorrect links of assets etc.
+
+##### -versions-dictionary-url
+
+A URL pointing to a JSON document containing a dictionary: `version label -> documentation location`.
+The JSON file has single property `versions` that holds the dictionary associating the labels of specific versions of the documentation to the URLs pointing to their index.html
+Useful for libraries that maintain different versions of their documentation.
+
+Example JSON file:
+```
+{
+  "versions": {
+    "3.0.x": "https://dotty.epfl.ch/3.0.x/docs/index.html",
+    "Nightly": "https://dotty.epfl.ch/docs/index.html"
+  }
+}
+```
+
+##### -snippet-compiler
+
+Snippet compiler arguments provide a way to configure snippet type checking.
+
+This setting accepts a list of arguments in the format:
+args := arg{,arg}
+arg := [path=]flag
+where `path` is a prefix of the path to source files where snippets are located and `flag` is the mode in which snippets will be type checked.
+
+If the path is not present, the argument will be used as the default for all unmatched paths.
+
+Available flags:
+compile - Enables snippet checking.
+nocompile - Disables snippet checking.
+fail - Enables snippet checking, asserts that snippet doesn't compile.
+
+The fail flag comes in handy for snippets that present that some action would eventually fail during compilation, e. g. [Opaques page](../../reference/other-new-features/opaques.md)
+
+Example usage:
+
+`-snippet-compiler:my/path/nc=nocompile,my/path/f=fail,compile`
+
+Which means:
+
+all snippets in files under directory `my/path/nc` should not be compiled at all
+all snippets in files under directory `my/path/f` should fail during compilation
+all other snippets should compile successfully
+
+##### -Ysnippet-compiler-debug
+
+Setting this option makes snippet compiler print the snippet as it is compiled (after wrapping).
+
+##### -Ydocument-synthetic-types
+
+Include pages providing documentation for the intrinsic types (e. g. Any, Nothing) to the docs. The setting is useful only for stdlib because scaladoc for Scala 3 relies on TASTy files, but we cannot provide them for intrinsic types since they are embedded in the compiler.
+All other users should not concern with this setting.
diff --git a/docs/_docs/usage/scaladoc/site-versioning.md b/docs/_docs/usage/scaladoc/site-versioning.md
new file mode 100644
index 000000000000..8ce52d21b067
--- /dev/null
+++ b/docs/_docs/usage/scaladoc/site-versioning.md
@@ -0,0 +1,35 @@
+---
+layout: doc-page
+title: "Site versioning"
+---
+
+Scaladoc provides a convenient way to switch between different versions of the documentation. The feature is useful if we want to expose older docs for users that didn't migrate to the new version of our library.
+
+### How to setup it
+
+The feature was designed for easy scalability with no need to regenerate all scaladocs after adding a new version. To do so a new setting is introduced:  `-versions-dictionary-url`. Its argument must be a URL to a JSON document holding information about the locations of specific versions. The JSON file has single property `versions` that holds the dictionary associating the labels of specific versions of the documentation to the URLs pointing to their index.html
+
+Example JSON file:
+```
+{
+  "versions": {
+    "3.0.x": "https://dotty.epfl.ch/3.0.x/docs/index.html",
+    "Nightly": "https://dotty.epfl.ch/docs/index.html"
+  }
+}
+```
+
+This enforce us to provide the setting while generating docs for each of the versions, however it gives us more flexibility later. If you want to add a version of the API docs next to the previous 5 versions that you have already published, then you only need to upload the new docs to a web server and add a new entry to the JSON file. All versions of the site will now become aware of the new site version.
+
+The important thing to note is that there is only one JSON file to avoid redundancy and each scaladoc must set up its URL location beforehand, for example, in sbt:
+
+```
+doc / scalacOptions ++= Seq("-versions-dictionary-url", "https://dotty.epfl.ch/versions.json")
+```
+
+
+### How does it look from user perspective
+
+Providing a JSON file via `-versions-dictionary-url` enables scaladoc to link between versions. It is also convenient to be able to change the revision label in the drop-down menu. Everything will change automatically.
+
+![]({{ site.baseurl }}images/scaladoc/nightly.gif)
diff --git a/docs/_docs/usage/scaladoc/static-site.md b/docs/_docs/usage/scaladoc/static-site.md
new file mode 100644
index 000000000000..6a1f8db0824c
--- /dev/null
+++ b/docs/_docs/usage/scaladoc/static-site.md
@@ -0,0 +1,199 @@
+---
+layout: doc-page
+title: "Static documentation"
+---
+
+Scaladoc can generate static sites, known from [Jekyll](http://jekyllrb.com/) or [Docusaurus](https://docusaurus.io/).
+Having a combined tool allows providing interaction between static documentation and API, thus allowing the two to blend naturally.
+
+Creating a site is just as simple as in Jekyll. The site root contains the
+the layout of the site and all files placed there will be either considered static,
+or processed for template expansion.
+
+The files that are considered for template expansion must end in `*.{html,md}`
+and will from here on be referred to as "template files" or "templates".
+
+A simple "hello world" site could look something like this:
+
+```
+├── docs
+│   └── getting-started.md
+└── index.html
+```
+
+This will give you a site with the following files in generated documentation:
+
+```
+index.html
+docs/getting-started.html
+```
+
+Scaladoc can transform both files and directories (to organize your documentation into a tree-like structure). By default, directories have a title based on the file name and have empty content. It is possible to provide index pages for each section by creating `index.html` or `index.md` (not both) in the dedicated directory.
+
+## Properties
+
+Scaladoc uses the [Liquid](https://shopify.github.io/liquid/) templating engine
+and provides several custom filters and tags specific to Scala
+documentation.
+
+In Scaladoc, all templates can contain YAML front-matter. The front-matter
+is parsed and put into the `page` variable available in templates via Liquid.
+
+Example front-matter
+
+```
+---
+title: My custom title
+---
+```
+
+Scaladoc uses some predefined properties to controls some aspects of page.
+
+Predefined properties:
+
+- **title** provide page title that will be used in navigation and HTML metadata.
+- **extraCss** additional `.css` files that will be included in this page. Paths should be relative to the documentation root. **This setting is not exported to the template engine.**
+- **extraJs** additional `.js` files that will be included in this page. Paths should be relative to the documentation root. **This setting is not exported to the template engine.**
+- **hasFrame** when set to `false` page will not include default layout (navigation, breadcrumbs, etc.) but only token HTML wrapper to provide metadata and resources (js and css files). **This setting is not exported to the template engine.**
+- **layout** - predefined layout to use, see below. **This setting is not exported to the template engine.**
+
+
+## Using existing Templates and Layouts
+
+To perform template expansion, Dottydoc looks at the `layout` field in the front-matter.
+Here's a simple example of the templating system in action, `index.html`:
+
+```html
+---
+layout: main
+---
+
+<h1>Hello world!</h1>
+```
+
+With a simple main template like this:
+
+{% raw %}
+```html
+<html>
+    <head>
+        <title>Hello, world!</title>
+    </head>
+    <body>
+        {{ content }}
+    </body>
+</html>
+```
+
+Would result in `{{ content }}` being replaced by `<h1>Hello world!</h1>` from
+the `index.html` file.
+{% endraw %}
+
+Layouts must be placed in a `_layouts` directory in the site root:
+
+```
+├── _layouts
+│   └── main.html
+├── docs
+│   └── getting-started.md
+└── index.html
+```
+
+## Sidebar
+
+Scaladoc by default uses layout of files in `docs` directory to create table of content. There is also ability to override it by providing a `sidebar.yml` file in the site root:
+
+```yaml
+sidebar:
+  - title: Blog
+  - title: My title
+    page: my-page1.md
+  - page: my-page2.md
+  - page: my-page3/subsection
+  - title: Reference
+    subsection:
+      - page: my-page3.md
+  - index: my-page4/index.md
+    subsection:
+      - page: my-page4/my-page4.md
+  - title: My subsection
+    index: my-page5/index.md
+    subsection:
+      - page: my-page5/my-page5.md
+  - index: my-page6/index.md
+    subsection:
+      - index: my-page6/my-page6/index.md
+        subsection:
+          - page: my-page6/my-page6/my-page6.md
+```
+
+The `sidebar` key is mandatory.
+On each level, you can have three different types of entries: `page`, `blog` or `subsection`.
+
+`page` is a leaf of the structure and accepts the following attributes:
+- `title` (optional) - title of the page
+- `page` (mandatory) - path to the file that will represent the page, it can be either html or markdown file to be rendered, there is also the possibility to pass the `directory` path. If so, the scaladoc will render the directory and all its content as if there were no `sidebar.yml` basing on its tree structure and index files.
+
+The `page` property `subsection` accepts nested nodes, these can be either pages or subsections, which allow you to create tree-like navigation. The attributes are:
+- `title` (optional) - title of the page
+- `index` (optional) - path to the file that will represent the index file of the subsection, it can be either html or markdown file to be rendered
+- `subsection` (mandatory) - nested nodes, can be either pages or subsections
+
+In `subsection`s, you can omit `title` or `index`, however not specifying any of these properties prevents you from specifying the title of the section.
+
+`blog` is a special node represented by simple entry `- title: Blog` with no other attributes. All your blog posts will be automatically linked under this section. You can read more about the blog [here](./blog.md).
+
+```
+├── blog
+│   ├── _posts
+│   │   └── 2016-12-05-implicit-function-types.md
+│   └── index.html
+├── index.html
+└── sidebar.yml
+```
+
+## Hierarchy of title
+
+If the title is specified multiple times, the priority is as follows (from highest to lowest priority):
+
+#### Page
+
+1. `title` from the `front-matter` of the markdown/html file
+2. `title` property from the `sidebar.yml` property
+3. filename
+
+#### Subsection
+
+1. `title` from the `front-matter` of the markdown/html index file
+2. `title` property from the `sidebar.yml` property
+3. filename
+
+Note that if you skip the `index` file in your tree structure or you don't specify the `title` in the frontmatter, there will be given a generic name `index`. The same applies when using `sidebar.yml` but not specifying `title` nor `index`, just a subsection. Again, a generic `index` name will appear.
+
+
+## Static resources
+
+You can attach static resources (pdf, images) to your documentation by using two dedicated directories:
+`resources` and `images`. After placing your assets under any of these directories, you can reference them in markdown
+as if they were relatively at the same level.
+
+For example, consider the following situation:
+
+```
+├── blog
+│   ├── _posts
+│   │   └── 2016-12-05-implicit-function-types.md
+│   └── index.html
+├── index.html
+├── resources
+│   └── my_file.pdf
+├── images
+│   └── my_image.png
+└── sidebar.yml
+
+```
+
+You can refer to the assets from within any of the files using markdown links:
+
+```
+This is my blog post. Here is the image ![](my_image.png) and here is my [pdf](my_file.pdf)```
diff --git a/docs/docs/usage/version-numbers.md b/docs/_docs/usage/version-numbers.md
similarity index 100%
rename from docs/docs/usage/version-numbers.md
rename to docs/_docs/usage/version-numbers.md
diff --git a/docs/docs/usage/worksheet-mode-implementation-details.md b/docs/_docs/usage/worksheet-mode-implementation-details.md
similarity index 99%
rename from docs/docs/usage/worksheet-mode-implementation-details.md
rename to docs/_docs/usage/worksheet-mode-implementation-details.md
index d06939d810ae..17c1cc3a2430 100644
--- a/docs/docs/usage/worksheet-mode-implementation-details.md
+++ b/docs/_docs/usage/worksheet-mode-implementation-details.md
@@ -1,8 +1,13 @@
 ---
 layout: doc-page
 title: "Worksheet Mode - Implementation details"
+
+
+
+
 ---
 
+
 In brief, the worksheets extend the Language Server Protocol and rely on the
 Dotty REPL to evaluate code.
 
diff --git a/docs/_layouts/blog-page.html b/docs/_layouts/blog-page.html
index 6baad3d40ed8..c5d0fe8875e7 100644
--- a/docs/_layouts/blog-page.html
+++ b/docs/_layouts/blog-page.html
@@ -1,7 +1,7 @@
 ---
-layout: main
+layout: static-site-main
 ---
-<main class="container">
+<main>
     <header>
         <h1>{{ page.title }}</h1>
         <div class="byline">
diff --git a/docs/_layouts/doc-page.html b/docs/_layouts/doc-page.html
index 2f2cf2a85b53..57980aac0d3d 100644
--- a/docs/_layouts/doc-page.html
+++ b/docs/_layouts/doc-page.html
@@ -1,15 +1,22 @@
 ---
-layout: main
+layout: static-site-main
 ---
-<main class="container">
-    <header>
-        <h1>{{ page.title }}</h1>
-        <div class="byline">
-            <a href="{{ urls.editSource }}">
-                <i class="far fa-edit"></i>
-                Edit this page on GitHub
-            </a>
-        </div>
-    </header>
-    {{ content }}
+<main>
+  <header>
+    <h1>{{ page.title }}</h1>
+    {% if urls.editSource %}
+    <div class="byline">
+      <a href="{{ urls.editSource }}">
+        <i class="far fa-edit"></i>
+        Edit this page on GitHub
+      </a>
+    </div>
+    {% endif %}
+  </header>
+  {{ content }}
+  <div class="content-contributors hidden">
+    <h5>Contributors to this page:</h5>
+    <div id="documentation-contributors" class="contributors-container"></div>
+  </div>
 </main>
+
diff --git a/docs/_layouts/main.html b/docs/_layouts/main.html
index 9637365c0231..51139f6080ac 100644
--- a/docs/_layouts/main.html
+++ b/docs/_layouts/main.html
@@ -1,12 +1,10 @@
 ---
 layout: base
+extraJS:
+  - js/contributors.js
+extraCSS:
+  - css/content-contributors.css
 ---
 <div id="content-wrapper">
-    {{ content }}
+  {{ content }}
 </div>
-<script>
-  ((window.gitter = {}).chat = {}).options = {
-    room: 'lampepfl/dotty'
-  };
-</script>
-<script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>
diff --git a/docs/_layouts/redirect.html b/docs/_layouts/redirect.html
new file mode 100644
index 000000000000..d0c2329189d8
--- /dev/null
+++ b/docs/_layouts/redirect.html
@@ -0,0 +1,14 @@
+---
+hasFrame: false
+---
+<!DOCTYPE html>
+<html lang="en-US">
+  <meta charset="utf-8">
+  <title>Redirecting&hellip;</title>
+  <link rel="canonical" href="{{ redirectTo }}">
+  <script>location="{{ redirectTo }}"</script>
+  <meta http-equiv="refresh" content="0; url={{ redirectTo }}">
+  <meta name="robots" content="noindex">
+  <h1>Redirecting&hellip;</h1>
+  <a href="{{ redirectTo }}">Click here if you were not redirected.</a>
+</html>
diff --git a/docs/_layouts/static-site-main.html b/docs/_layouts/static-site-main.html
new file mode 100644
index 000000000000..b3e635a09bfb
--- /dev/null
+++ b/docs/_layouts/static-site-main.html
@@ -0,0 +1,49 @@
+---
+layout: main
+---
+<div class="container">
+  <div id="site-header">
+    <div class="wrap">
+      <nav class="navigation" role="menu">
+        <ul class="navigation-menu">
+          <li class="navigation-menu-item">
+            <a href="https://docs.scala-lang.org/" class="active">Documentation</a>
+          </li>
+          <li class="navigation-menu-item">
+            <a href="https://www.scala-lang.org/download/">Download</a>
+          </li>
+          <li class="navigation-menu-item">
+            <a href="https://www.scala-lang.org/community/">Community</a>
+          </li>
+          <li class="navigation-menu-item">
+            <a href="https://index.scala-lang.org">Libraries</a>
+          </li>
+          <li class="navigation-menu-item">
+            <a href="https://www.scala-lang.org/contribute/">Contribute</a>
+          </li>
+          <li class="navigation-menu-item">
+            <a href="https://www.scala-lang.org/blog/">Blog</a>
+          </li>
+        </ul>
+      </nav>
+    </div>
+  </div>
+  {% if page.movedTo %}
+  <aside class="warning">
+    The content of this page is outdated. Click <a href="{{ page.movedTo }}">here</a> to find the up to date version of this page.
+  </aside>
+  {% endif %}
+  {{ content }}
+  <nav class="arrows-wrapper" aria-label="Page navigation">
+    {% if page.previous %}
+    <a rel="prev" href="{{ page.previous }}" class="arrows previous" aria-keyshortcuts="Left">
+        <i class="fa fa-angle-left"></i>
+    </a>
+    {% endif %}
+    {% if page.next %}
+    <a rel="next" href="{{ page.next }}" class="arrows next" aria-keyshortcuts="Right">
+        <i class="fa fa-angle-right"></i>
+    </a>
+    {% endif %}
+  </nav>
+</div>
diff --git a/docs/blog/index.html b/docs/blog/index.html
deleted file mode 100644
index 6db9ee4ce1c4..000000000000
--- a/docs/blog/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
----
-layout: main
-title: Blog
----
-<main class="container">
-    <h1>{{ page.title }}</h1>
-
-    <ul class="post-list">
-        {% for post in site.posts %}
-            <li>
-                <h2>
-                    <a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a>
-                </h2>
-                <div class="byline">
-                    <time class="date">
-                        <i class="far fa-calendar-alt"></i>
-                        {{ post.date | date: "%Y-%m-%d" }}
-                    </time>
-                    {% if post.author %}
-                        <span class="author">
-                            <i class="fas fa-pen-nib"></i>
-                            {{ post.author }}
-                        </span>
-                    {% endif %}
-                </div>
-                <div class="excerpt">
-                    {{ post.excerpt }}
-                </div>
-            </li>
-        {% endfor %}
-    </ul>
-</main>
diff --git a/docs/docs/contributing/getting-started.md b/docs/docs/contributing/getting-started.md
deleted file mode 100644
index ff3e1e709e4d..000000000000
--- a/docs/docs/contributing/getting-started.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-layout: doc-page
-title: Getting Started
----
-
-
-
-Requirements
-------------
-Make sure that you are using macOS or Linux (or WSL on Windows) with Java 8 or newer. You can determine which version of the JDK is the
-default by typing `java -version` in a Terminal window.
-
-Compiling and Running
----------------------
-Start by cloning the repository:
-
-```bash
-$ git clone https://github.com/lampepfl/dotty.git
-$ cd dotty
-$ sbt managedSources # Needed for IDE import to succeed
-```
-
-Dotty provides a standard sbt build: compiling, running and starting a repl can
-all be done from within sbt:
-
-```bash
-$ sbt
-> scalac tests/pos/HelloWorld.scala
-> scala HelloWorld
-hello world
-```
-
-There are also bash scripts that can be used in the same way. Assuming that you have cloned the Dotty repo locally, append
-the following line on your `.bash_profile`:
-
-```shell
-$ export PATH=$HOME/dotty/bin:$PATH
-```
-
-and you will be able to run the corresponding commands directly from your console:
-
-```shell
-# Compile code using Dotty
-$ scalac tests/pos/HelloWorld.scala
-
-# Run it with the proper classpath
-$ scala HelloWorld
-```
-
-
-Starting a REPL
----------------
-```bash
-$ sbt
-> repl
-Welcome to Scala.next (pre-alpha)  (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_101).
-Type in expressions to have them evaluated.
-Type :help for more information.
-scala>
-```
-
-or via bash:
-
-```bash
-$ scala
-```
-Publish to local repository
----------------------------------
-To test our cloned compiler on local projects:
-
-```bash
-$ sbt publishLocal
-```
-Then in the `build.sbt` file of a test project:
-
-```bash
-ThisBuild / scalaVersion := "<dotty-version>-bin-SNAPSHOT"
-```
-where `dotty-version` can be found in the file `project/Build.scala`, like `3.0.0-M2`
-
-
-Generating Documentation
--------------------------
-To generate this page and other static page docs, run
-```bash
-$ sbt
-> genDocs
-```
-
-Before contributing to Dotty, we invite you to consult the
-[Dotty Developer Guidelines](https://github.com/lampepfl/dotty/blob/master/CONTRIBUTING.md).
diff --git a/docs/docs/contributing/workflow.md b/docs/docs/contributing/workflow.md
deleted file mode 100644
index 4afab827bf55..000000000000
--- a/docs/docs/contributing/workflow.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-layout: doc-page
-title: Workflow
----
-
-Check [Getting Started](getting-started.md) for instructions on how to obtain the source code of dotty.
-This document details common workflow patterns when working with Dotty.
-
-## Compiling files with scalac ##
-
-As we have seen you can compile a test file either from sbt:
-
-```bash
-$ sbt
-> scalac <OPTIONS> <FILE>
-```
-
-or from terminal:
-
-```bash
-$ scalac <OPTIONS> <FILE>
-```
-
-Here are some useful debugging `<OPTIONS>`:
-
-* `-Xprint:PHASE1,PHASE2,...` or `-Xprint:all`: prints the `AST` after each
-  specified phase. Phase names can be found by examining the
-  `dotty.tools.dotc.transform.*` classes for their `phaseName` field e.g., `-Xprint:erasure`.
-  You can discover all phases in the `dotty.tools.dotc.Compiler` class
-* `-Ylog:PHASE1,PHASE2,...` or `-Ylog:all`: enables `ctx.log("")` logging for
-  the specified phase.
-* `-Ycheck:all` verifies the consistency of `AST` nodes between phases, in
-  particular checks that types do not change. Some phases currently can't be
-  `Ycheck`ed, therefore in the tests we run:
-  `-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef`.
-* the last frontier of debugging (before actual debugging) is the range of logging capabilities that
-can be enabled through the `dotty.tools.dotc.config.Printers` object. Change any of the desired printer from `noPrinter` to
-`default` and this will give you the full logging capability of the compiler.
-
-## Inspecting Trees with Type Stealer ##
-
-There is no power mode for the REPL yet, but you can inspect types with the
-type stealer:
-
-```bash
-$ sbt
-> repl
-scala> import dotty.tools.DottyTypeStealer.*; import dotty.tools.dotc.core.*; import Contexts.*,Types.*
-```
-
-Now, you can define types and access their representation. For example:
-
-```scala
-scala> val s = stealType("class O { type X }", "O#X")
-scala> implicit val ctx: Context = s._1
-scala> val t = s._2(0)
-t: dotty.tools.dotc.core.Types.Type = TypeRef(TypeRef(ThisType(TypeRef(NoPrefix,<empty>)),O),X)
-scala> val u = t.asInstanceOf[TypeRef].underlying
-u: dotty.tools.dotc.core.Types.Type = TypeBounds(TypeRef(ThisType(TypeRef(NoPrefix,scala)),Nothing), TypeRef(ThisType(TypeRef(NoPrefix,scala)),Any))
-```
-
-## Pretty-printing ##
-Many objects in the scalac compiler implement a `Showable` trait (e.g. `Tree`,
-`Symbol`, `Type`). These objects may be prettyprinted using the `.show`
-method
-
-## SBT Commands Cheat Sheet ##
-The basics of working with Dotty codebase are documented [here](https://dotty.epfl.ch/docs/contributing/getting-started.html) and [here](https://dotty.epfl.ch/docs/contributing/workflow.html). Below is a cheat sheet of some frequently used commands (to be used from SBT console – `sbt`).
-
-
-|                        Command                       |                                                          Description                                                          |
-|------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|
-| `scalac ../issues/Playground.scala`                  | Compile the given file – path relative to the Dotty directory. Output the compiled class files to the Dotty directory itself. |
-| `scala Playground`                                   | Run the compiled class `Playground`. Dotty directory is on classpath by default.                                              |
-| `repl`                                               | Start REPL                                                                                                                    |
-| `testOnly dotty.tools.dotc.CompilationTests -- *pos` | Run test (method) `pos` from `CompilationTests` suite.                                                                        |
-| `testCompilation sample`                             | In all test suites, run test files containing the word `sample` in their title.                                               |
diff --git a/docs/docs/index.md b/docs/docs/index.md
deleted file mode 100644
index 8fe7ce938186..000000000000
--- a/docs/docs/index.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: doc-page
----
-
-Dotty is the project name for technologies that are considered for inclusion in Scala 3. Scala has
-pioneered the fusion of object-oriented and functional programming in a typed setting. Scala 3 will
-be a big step towards realizing the full potential of these ideas. Its main objectives are to
-
-- become more opinionated by promoting programming idioms we found to work well,
-- simplify where possible,
-- eliminate inconsistencies and surprising behaviors,
-- build on strong foundations to ensure the design hangs well together,
-- consolidate language constructs to improve the language’s consistency, safety, ergonomics, and performance.
-
-In this documentation you will find information on how to use the Dotty compiler on your machine,
-navigate through the code, setup Dotty with your favorite IDE and more!
-
-Table of Contents
-=================
-{% assign titles = sidebar.titles %}
-{% include "table-of-contents" %}
diff --git a/docs/docs/internals/syntax.md b/docs/docs/internals/syntax.md
deleted file mode 100644
index 4ecefb4bdb83..000000000000
--- a/docs/docs/internals/syntax.md
+++ /dev/null
@@ -1,456 +0,0 @@
----
-layout: doc-page
-title: "Scala 3 Syntax Summary"
----
-
-The following description of Scala tokens uses literal characters `‘c’` when
-referring to the ASCII fragment `\u0000` – `\u007F`.
-
-_Unicode escapes_ are used to represent the [Unicode character](https://www.w3.org/International/articles/definitions-characters/) with the given
-hexadecimal code:
-
-```ebnf
-UnicodeEscape ::= ‘\’ ‘u’ {‘u’} hexDigit hexDigit hexDigit hexDigit
-hexDigit      ::= ‘0’ | … | ‘9’ | ‘A’ | … | ‘F’ | ‘a’ | … | ‘f’
-```
-
-Informal descriptions are typeset as `“some comment”`.
-
-### Lexical Syntax
-
-The lexical syntax of Scala is given by the following grammar in EBNF
-form.
-
-```ebnf
-whiteSpace       ::=  ‘\u0020’ | ‘\u0009’ | ‘\u000D’ | ‘\u000A’
-upper            ::=  ‘A’ | … | ‘Z’ | ‘\$’ | ‘_’  “… and Unicode category Lu”
-lower            ::=  ‘a’ | … | ‘z’ “… and Unicode category Ll”
-letter           ::=  upper | lower “… and Unicode categories Lo, Lt, Nl”
-digit            ::=  ‘0’ | … | ‘9’
-paren            ::=  ‘(’ | ‘)’ | ‘[’ | ‘]’ | ‘{’ | ‘}’ | ‘'(’ | ‘'[’ | ‘'{’
-delim            ::=  ‘`’ | ‘'’ | ‘"’ | ‘.’ | ‘;’ | ‘,’
-opchar           ::=  “printableChar not matched by (whiteSpace | upper |
-                       lower | letter | digit | paren | delim | opchar |
-                       Unicode_Sm | Unicode_So)”
-printableChar    ::=  “all characters in [\u0020, \u007F] inclusive”
-charEscapeSeq    ::=  ‘\’ (‘b’ | ‘t’ | ‘n’ | ‘f’ | ‘r’ | ‘"’ | ‘'’ | ‘\’)
-
-op               ::=  opchar {opchar}
-varid            ::=  lower idrest
-alphaid          ::=  upper idrest
-                   |  varid
-plainid          ::=  alphaid
-                   |  op
-id               ::=  plainid
-                   |  ‘`’ { charNoBackQuoteOrNewline | UnicodeEscape | charEscapeSeq } ‘`’
-idrest           ::=  {letter | digit} [‘_’ op]
-quoteId          ::=  ‘'’ alphaid
-
-integerLiteral   ::=  (decimalNumeral | hexNumeral) [‘L’ | ‘l’]
-decimalNumeral   ::=  ‘0’ | nonZeroDigit [{digit | ‘_’} digit]
-hexNumeral       ::=  ‘0’ (‘x’ | ‘X’) hexDigit [{hexDigit | ‘_’} hexDigit]
-nonZeroDigit     ::=  ‘1’ | … | ‘9’
-
-floatingPointLiteral
-                 ::=  [decimalNumeral] ‘.’ digit [{digit | ‘_’} digit] [exponentPart] [floatType]
-                   |  decimalNumeral exponentPart [floatType]
-                   |  decimalNumeral floatType
-exponentPart     ::=  (‘E’ | ‘e’) [‘+’ | ‘-’] digit [{digit | ‘_’} digit]
-floatType        ::=  ‘F’ | ‘f’ | ‘D’ | ‘d’
-
-booleanLiteral   ::=  ‘true’ | ‘false’
-
-characterLiteral ::=  ‘'’ (printableChar | charEscapeSeq) ‘'’
-
-stringLiteral    ::=  ‘"’ {stringElement} ‘"’
-                   |  ‘"""’ multiLineChars ‘"""’
-stringElement    ::=  printableChar \ (‘"’ | ‘\’)
-                   |  UnicodeEscape
-                   |  charEscapeSeq
-multiLineChars   ::=  {[‘"’] [‘"’] char \ ‘"’} {‘"’}
-processedStringLiteral
-                 ::=  alphaid ‘"’ {[‘\’] processedStringPart | ‘\\’ | ‘\"’} ‘"’
-                   |  alphaid ‘"""’ {[‘"’] [‘"’] char \ (‘"’ | ‘$’) | escape} {‘"’} ‘"""’
-processedStringPart
-                 ::= printableChar \ (‘"’ | ‘$’ | ‘\’) | escape
-escape           ::=  ‘$$’
-                   |  ‘$’ letter { letter | digit }
-                   |  ‘{’ Block  [‘;’ whiteSpace stringFormat whiteSpace] ‘}’
-stringFormat     ::=  {printableChar \ (‘"’ | ‘}’ | ‘ ’ | ‘\t’ | ‘\n’)}
-
-symbolLiteral    ::=  ‘'’ plainid // until 2.13
-
-comment          ::=  ‘/*’ “any sequence of characters; nested comments are allowed” ‘*/’
-                   |  ‘//’ “any sequence of characters up to end of line”
-
-nl               ::=  “new line character”
-semi             ::=  ‘;’ |  nl {nl}
-```
-
-
-## Optional Braces
-
-The lexical analyzer also inserts `indent` and `outdent` tokens that represent regions of indented code [at certain points](../reference/other-new-features/indentation.md)
-
-In the context-free productions below we use the notation `<<< ts >>>`
-to indicate a token sequence `ts` that is either enclosed in a pair of braces `{ ts }` or that constitutes an indented region `indent ts outdent`. Analogously, the
-notation `:<<< ts >>>` indicates a token sequence `ts` that is either enclosed in a pair of braces `{ ts }` or that constitutes an indented region `indent ts outdent` that follows
-a `:` at the end of a line.
-
-
-```
- <<< ts >>>   ::=  ‘{’ ts ‘}’
-                |  indent ts outdent
-:<<< ts >>>   ::=  [nl] ‘{’ ts ‘}’
-                |  `:` indent ts outdent
-
-## Keywords
-
-### Regular keywords
-
-```
-abstract  case      catch     class     def       do        else
-enum      export    extends   false     final     finally   for
-given     if        implicit  import    lazy      match     new
-null      object    override  package   private   protected return
-sealed    super     then      throw     trait     true      try
-type      val       var       while     with      yield
-:         =         <-        =>        <:        :>        #
-@         =>>       ?=>
-```
-
-### Soft keywords
-
-```
-as  derives  end  extension  infix  inline  opaque  open  transparent  using  |  *  +  -
-```
-
-See the [separate section on soft keywords](./soft-modifier.md) for additional
-details on where a soft keyword is recognized.
-
-## Context-free Syntax
-
-The context-free syntax of Scala is given by the following EBNF
-grammar:
-
-### Literals and Paths
-```ebnf
-SimpleLiteral     ::=  [‘-’] integerLiteral
-                    |  [‘-’] floatingPointLiteral
-                    |  booleanLiteral
-                    |  characterLiteral
-                    |  stringLiteral
-Literal           ::=  SimpleLiteral
-                    |  processedStringLiteral
-                    |  symbolLiteral
-                    |  ‘null’
-
-QualId            ::=  id {‘.’ id}
-ids               ::=  id {‘,’ id}
-
-SimpleRef         ::=  id
-                    |  [id ‘.’] ‘this’
-                    |  [id ‘.’] ‘super’ [ClassQualifier] ‘.’ id
-
-ClassQualifier    ::=  ‘[’ id ‘]’
-```
-
-### Types
-```ebnf
-Type              ::=  FunType
-                    |  HkTypeParamClause ‘=>>’ Type                             LambdaTypeTree(ps, t)
-                    |  FunParamClause ‘=>>’ Type                                TermLambdaTypeTree(ps, t)
-                    |  MatchType
-                    |  InfixType
-FunType           ::=  FunTypeArgs (‘=>’ | ‘?=>’) Type                          Function(ts, t)
-                    |  HKTypeParamClause '=>' Type                              PolyFunction(ps, t)
-FunTypeArgs       ::=  InfixType
-                    |  ‘(’ [ FunArgTypes ] ‘)’
-                    |  FunParamClause
-FunParamClause    ::=  ‘(’ TypedFunParam {‘,’ TypedFunParam } ‘)’
-TypedFunParam     ::=  id ‘:’ Type
-MatchType         ::=  InfixType `match` <<< TypeCaseClauses >>>
-InfixType         ::=  RefinedType {id [nl] RefinedType}                        InfixOp(t1, op, t2)
-RefinedType       ::=  AnnotType {[nl] Refinement}                              RefinedTypeTree(t, ds)
-AnnotType         ::=  SimpleType {Annotation}                                  Annotated(t, annot)
-
-SimpleType        ::=  SimpleLiteral                                            SingletonTypeTree(l)
-                    |  ‘?’ TypeBounds
-                    |  SimpleType1
-SimpleType1       ::=  id                                                       Ident(name)
-                    |  Singleton ‘.’ id                                         Select(t, name)
-                    |  Singleton ‘.’ ‘type’                                     SingletonTypeTree(p)
-                    |  ‘(’ Types ‘)’                                            Tuple(ts)
-                    |  Refinement                                               RefinedTypeTree(EmptyTree, refinement)
-                    |  ‘$’ ‘{’ Block ‘}’
-                    |  SimpleType1 TypeArgs                                     AppliedTypeTree(t, args)
-                    |  SimpleType1 ‘#’ id                                       Select(t, name)
-Singleton         ::=  SimpleRef
-                    |  SimpleLiteral
-                    |  Singleton ‘.’ id
-Singletons        ::=  Singleton { ‘,’ Singleton }
-FunArgType        ::=  Type
-                    |  ‘=>’ Type                                                PrefixOp(=>, t)
-FunArgTypes       ::=  FunArgType { ‘,’ FunArgType }
-ParamType         ::=  [‘=>’] ParamValueType
-ParamValueType    ::=  Type [‘*’]                                               PostfixOp(t, "*")
-TypeArgs          ::=  ‘[’ Types ‘]’                                            ts
-Refinement        ::=  ‘{’ [RefineDcl] {semi [RefineDcl]} ‘}’                   ds
-TypeBounds        ::=  [‘>:’ Type] [‘<:’ Type]                                  TypeBoundsTree(lo, hi)
-TypeParamBounds   ::=  TypeBounds {‘:’ Type}                                    ContextBounds(typeBounds, tps)
-Types             ::=  Type {‘,’ Type}
-```
-
-### Expressions
-```ebnf
-Expr              ::=  FunParams (‘=>’ | ‘?=>’) Expr                            Function(args, expr), Function(ValDef([implicit], id, TypeTree(), EmptyTree), expr)
-                    |  Expr1
-BlockResult       ::=  FunParams (‘=>’ | ‘?=>’) Block
-                    |  Expr1
-FunParams         ::=  Bindings
-                    |  id
-                    |  ‘_’
-Expr1             ::=  [‘inline’] ‘if’ ‘(’ Expr ‘)’ {nl} Expr [[semi] ‘else’ Expr] If(Parens(cond), thenp, elsep?)
-                    |  [‘inline’] ‘if’  Expr ‘then’ Expr [[semi] ‘else’ Expr]    If(cond, thenp, elsep?)
-                    |  ‘while’ ‘(’ Expr ‘)’ {nl} Expr                           WhileDo(Parens(cond), body)
-                    |  ‘while’ Expr ‘do’ Expr                                   WhileDo(cond, body)
-                    |  ‘try’ Expr Catches [‘finally’ Expr]                      Try(expr, catches, expr?)
-                    |  ‘try’ Expr [‘finally’ Expr]                              Try(expr, Nil, expr?)
-                    |  ‘throw’ Expr                                             Throw(expr)
-                    |  ‘return’ [Expr]                                          Return(expr?)
-                    |  ForExpr
-                    |  HkTypeParamClause ‘=>’ Expr                              PolyFunction(ts, expr)
-                    |  [SimpleExpr ‘.’] id ‘=’ Expr                             Assign(expr, expr)
-                    |  SimpleExpr1 ArgumentExprs ‘=’ Expr                       Assign(expr, expr)
-                    |  PostfixExpr [Ascription]
-                    |  ‘inline’ InfixExpr MatchClause
-Ascription        ::=  ‘:’ InfixType                                            Typed(expr, tp)
-                    |  ‘:’ Annotation {Annotation}                              Typed(expr, Annotated(EmptyTree, annot)*)
-Catches           ::=  ‘catch’ (Expr | ExprCaseClause)
-PostfixExpr       ::=  InfixExpr [id]                                           PostfixOp(expr, op)
-InfixExpr         ::=  PrefixExpr
-                    |  InfixExpr id [nl] InfixExpr                              InfixOp(expr, op, expr)
-                    |  InfixExpr id ‘:’ IndentedExpr
-                    |  InfixExpr MatchClause
-MatchClause       ::=  ‘match’ <<< CaseClauses >>>                              Match(expr, cases)
-PrefixExpr        ::=  [‘-’ | ‘+’ | ‘~’ | ‘!’] SimpleExpr                       PrefixOp(expr, op)
-SimpleExpr        ::=  SimpleRef
-                    |  Literal
-                    |  ‘_’
-                    |  BlockExpr
-                    |  ‘$’ ‘{’ Block ‘}’
-                    |  Quoted
-                    |  quoteId                                                  -- only inside splices
-                    |  ‘new’ ConstrApp {‘with’ ConstrApp} [TemplateBody]        New(constr | templ)
-                    |  ‘new’ TemplateBody
-                    |  ‘(’ ExprsInParens ‘)’                                    Parens(exprs)
-                    |  SimpleExpr ‘.’ id                                        Select(expr, id)
-                    |  SimpleExpr ‘.’ MatchClause
-                    |  SimpleExpr TypeArgs                                      TypeApply(expr, args)
-                    |  SimpleExpr ArgumentExprs                                 Apply(expr, args)
-                    |  SimpleExpr1 ‘:’ IndentedExpr                             -- under language.experimental.fewerBraces
-                    |  SimpleExpr1 FunParams (‘=>’ | ‘?=>’) IndentedExpr        -- under language.experimental.fewerBraces
-                    |  SimpleExpr ‘_’                                           PostfixOp(expr, _) (to be dropped)
-                    |  XmlExpr													                        -- to be dropped
-IndentedExpr      ::=  indent CaseClauses | Block outdent
-Quoted            ::=  ‘'’ ‘{’ Block ‘}’
-                    |  ‘'’ ‘[’ Type ‘]’
-ExprsInParens     ::=  ExprInParens {‘,’ ExprInParens}
-ExprInParens      ::=  PostfixExpr ‘:’ Type                                     -- normal Expr allows only RefinedType here
-                    |  Expr
-ParArgumentExprs  ::=  ‘(’ [‘using’] ExprsInParens ‘)’                          exprs
-                    |  ‘(’ [ExprsInParens ‘,’] PostfixExpr ‘*’ ‘)’              exprs :+ Typed(expr, Ident(wildcardStar))
-ArgumentExprs     ::=  ParArgumentExprs
-                    |  BlockExpr
-BlockExpr         ::=  <<< CaseClauses | Block >>>
-Block             ::=  {BlockStat semi} [BlockResult]                           Block(stats, expr?)
-BlockStat         ::=  Import
-                    |  {Annotation {nl}} {LocalModifier} Def
-                    |  Extension
-                    |  Expr1
-                    |  EndMarker
-
-ForExpr           ::=  ‘for’ (‘(’ Enumerators ‘)’ | ‘{’ Enumerators ‘}’)        ForYield(enums, expr)
-                       {nl} [‘yield’] Expr
-                    |  ‘for’ Enumerators (‘do’ Expr | ‘yield’ Expr)             ForDo(enums, expr)
-Enumerators       ::=  Generator {semi Enumerator | Guard}
-Enumerator        ::=  Generator
-                    |  Guard
-                    |  Pattern1 ‘=’ Expr                                        GenAlias(pat, expr)
-Generator         ::=  [‘case’] Pattern1 ‘<-’ Expr                                       GenFrom(pat, expr)
-Guard             ::=  ‘if’ PostfixExpr
-
-CaseClauses       ::=  CaseClause { CaseClause }                                Match(EmptyTree, cases)
-CaseClause        ::=  ‘case’ Pattern [Guard] ‘=>’ Block                        CaseDef(pat, guard?, block)   // block starts at =>
-ExprCaseClause    ::=  ‘case’ Pattern [Guard] ‘=>’ Expr
-TypeCaseClauses   ::=  TypeCaseClause { TypeCaseClause }
-TypeCaseClause    ::=  ‘case’ InfixType ‘=>’ Type [nl]
-
-Pattern           ::=  Pattern1 { ‘|’ Pattern1 }                                Alternative(pats)
-Pattern1          ::=  Pattern2 [‘:’ RefinedType]                               Bind(name, Typed(Ident(wildcard), tpe))
-Pattern2          ::=  [id ‘@’] InfixPattern                                    Bind(name, pat)
-InfixPattern      ::=  SimplePattern { id [nl] SimplePattern }                  InfixOp(pat, op, pat)
-SimplePattern     ::=  PatVar                                                   Ident(wildcard)
-                    |  Literal                                                  Bind(name, Ident(wildcard))
-                    |  ‘(’ [Patterns] ‘)’                                       Parens(pats) Tuple(pats)
-                    |  Quoted
-                    |  XmlPattern												(to be dropped)
-                    |  SimplePattern1 [TypeArgs] [ArgumentPatterns]
-                    |  ‘given’ RefinedType
-SimplePattern1    ::=  SimpleRef
-                    |  SimplePattern1 ‘.’ id
-PatVar            ::=  varid
-                    |  ‘_’
-Patterns          ::=  Pattern {‘,’ Pattern}
-ArgumentPatterns  ::=  ‘(’ [Patterns] ‘)’                                       Apply(fn, pats)
-                    |  ‘(’ [Patterns ‘,’] PatVar ‘*’ ‘)’
-```
-
-### Type and Value Parameters
-```ebnf
-ClsTypeParamClause::=  ‘[’ ClsTypeParam {‘,’ ClsTypeParam} ‘]’
-ClsTypeParam      ::=  {Annotation} [‘+’ | ‘-’]                                 TypeDef(Modifiers, name, tparams, bounds)
-                       id [HkTypeParamClause] TypeParamBounds                   Bound(below, above, context)
-
-DefTypeParamClause::=  ‘[’ DefTypeParam {‘,’ DefTypeParam} ‘]’
-DefTypeParam      ::=  {Annotation} id [HkTypeParamClause] TypeParamBounds
-
-TypTypeParamClause::=  ‘[’ TypTypeParam {‘,’ TypTypeParam} ‘]’
-TypTypeParam      ::=  {Annotation} id [HkTypeParamClause] TypeBounds
-
-HkTypeParamClause ::=  ‘[’ HkTypeParam {‘,’ HkTypeParam} ‘]’
-HkTypeParam       ::=  {Annotation} [‘+’ | ‘-’] (id [HkTypeParamClause] | ‘_’)
-                       TypeBounds
-
-ClsParamClauses   ::=  {ClsParamClause} [[nl] ‘(’ [‘implicit’] ClsParams ‘)’]
-ClsParamClause    ::=  [nl] ‘(’ ClsParams ‘)’
-                    |  [nl] ‘(’ ‘using’ (ClsParams | FunArgTypes) ‘)’
-ClsParams         ::=  ClsParam {‘,’ ClsParam}
-ClsParam          ::=  {Annotation}                                             ValDef(mods, id, tpe, expr) -- point of mods on val/var
-                       [{Modifier} (‘val’ | ‘var’) | ‘inline’] Param
-Param             ::=  id ‘:’ ParamType [‘=’ Expr]
-
-DefParamClauses   ::=  {DefParamClause} [[nl] ‘(’ [‘implicit’] DefParams ‘)’]
-DefParamClause    ::=  [nl] ‘(’ DefParams ‘)’ | UsingParamClause
-UsingParamClause  ::=  [nl] ‘(’ ‘using’ (DefParams | FunArgTypes) ‘)’
-DefParams         ::=  DefParam {‘,’ DefParam}
-DefParam          ::=  {Annotation} [‘inline’] Param                            ValDef(mods, id, tpe, expr) -- point of mods at id.
-```
-
-### Bindings and Imports
-```ebnf
-Bindings          ::=  ‘(’ [Binding {‘,’ Binding}] ‘)’
-Binding           ::=  (id | ‘_’) [‘:’ Type]                                    ValDef(_, id, tpe, EmptyTree)
-
-Modifier          ::=  LocalModifier
-                    |  AccessModifier
-                    |  ‘override’
-                    |  ‘opaque’
-LocalModifier     ::=  ‘abstract’
-                    |  ‘final’
-                    |  ‘sealed’
-                    |  ‘open’
-                    |  ‘implicit’
-                    |  ‘lazy’
-                    |  ‘inline’
-AccessModifier    ::=  (‘private’ | ‘protected’) [AccessQualifier]
-AccessQualifier   ::=  ‘[’ id ‘]’
-
-Annotation        ::=  ‘@’ SimpleType1 {ParArgumentExprs}                         Apply(tpe, args)
-
-Import            ::=  ‘import’ ImportExpr {‘,’ ImportExpr}
-Export            ::=  ‘export’ ImportExpr {‘,’ ImportExpr}
-ImportExpr        ::=  SimpleRef {‘.’ id} ‘.’ ImportSpec                          Import(expr, sels)
-                    |  SimpleRef ‘as’ id                                          Import(EmptyTree, ImportSelector(ref, id))
-ImportSpec        ::=  NamedSelector
-                    |  WildcardSelector
-                    | ‘{’ ImportSelectors) ‘}’
-NamedSelector     ::=  id [‘as’ (id | ‘_’)]
-WildCardSelector  ::=  ‘*' | ‘given’ [InfixType]
-ImportSelectors   ::=  NamedSelector [‘,’ ImportSelectors]
-                    |  WildCardSelector {‘,’ WildCardSelector}
-
-EndMarker         ::=  ‘end’ EndMarkerTag    -- when followed by EOL
-EndMarkerTag      ::=  id | ‘if’ | ‘while’ | ‘for’ | ‘match’ | ‘try’
-                    |  ‘new’ | ‘this’ | ‘given’ | ‘extension’ | ‘val’
-```
-
-### Declarations and Definitions
-```ebnf
-RefineDcl         ::=  ‘val’ ValDcl
-                    |  ‘def’ DefDcl
-                    |  ‘type’ {nl} TypeDcl
-Dcl               ::=  RefineDcl
-                    |  ‘var’ VarDcl
-ValDcl            ::=  ids ‘:’ Type                                             PatDef(_, ids, tpe, EmptyTree)
-VarDcl            ::=  ids ‘:’ Type                                             PatDef(_, ids, tpe, EmptyTree)
-DefDcl            ::=  DefSig ‘:’ Type                                          DefDef(_, name, tparams, vparamss, tpe, EmptyTree)
-DefSig            ::=  id [DefTypeParamClause] DefParamClauses
-TypeDcl           ::=  id [TypeParamClause] {FunParamClause} TypeBounds         TypeDefTree(_, name, tparams, bound
-                       [‘=’ Type]
-
-Def               ::=  ‘val’ PatDef
-                    |  ‘var’ PatDef
-                    |  ‘def’ DefDef
-                    |  ‘type’ {nl} TypeDcl
-                    |  TmplDef
-PatDef            ::=  ids [‘:’ Type] ‘=’ Expr
-                    |  Pattern2 [‘:’ Type] ‘=’ Expr                             PatDef(_, pats, tpe?, expr)
-DefDef            ::=  DefSig [‘:’ Type] ‘=’ Expr                               DefDef(_, name, tparams, vparamss, tpe, expr)
-                    |  ‘this’ DefParamClause DefParamClauses ‘=’ ConstrExpr     DefDef(_, <init>, Nil, vparamss, EmptyTree, expr | Block)
-
-TmplDef           ::=  ([‘case’] ‘class’ | ‘trait’) ClassDef
-                    |  [‘case’] ‘object’ ObjectDef
-                    |  ‘enum’ EnumDef
-                    |  ‘given’ GivenDef
-ClassDef          ::=  id ClassConstr [Template]                                ClassDef(mods, name, tparams, templ)
-ClassConstr       ::=  [ClsTypeParamClause] [ConstrMods] ClsParamClauses        with DefDef(_, <init>, Nil, vparamss, EmptyTree, EmptyTree) as first stat
-ConstrMods        ::=  {Annotation} [AccessModifier]
-ObjectDef         ::=  id [Template]                                            ModuleDef(mods, name, template)  // no constructor
-EnumDef           ::=  id ClassConstr InheritClauses EnumBody
-GivenDef          ::=  [GivenSig] (AnnotType [‘=’ Expr] | StructuralInstance)
-GivenSig          ::=  [id] [DefTypeParamClause] {UsingParamClause} ‘:’         -- one of `id`, `DefParamClause`, `UsingParamClause` must be present
-StructuralInstance ::=  ConstrApp {‘with’ ConstrApp} ‘with’ TemplateBody
-Extension         ::=  ‘extension’ [DefTypeParamClause] ‘(’ DefParam ‘)’
-                       {UsingParamClause} ExtMethods
-ExtMethods        ::=  ExtMethod | [nl] <<< ExtMethod {semi ExtMethod} >>>
-ExtMethod         ::=  {Annotation [nl]} {Modifier} ‘def’ DefDef
-Template          ::=  InheritClauses [TemplateBody]
-InheritClauses    ::=  [‘extends’ ConstrApps] [‘derives’ QualId {‘,’ QualId}]
-ConstrApps        ::=  ConstrApp ({‘,’ ConstrApp} | {‘with’ ConstrApp})
-ConstrApp         ::=  SimpleType1 {Annotation} {ParArgumentExprs}
-ConstrExpr        ::=  SelfInvocation
-                    |  <<< SelfInvocation {semi BlockStat} >>>
-SelfInvocation    ::=  ‘this’ ArgumentExprs {ArgumentExprs}
-
-TemplateBody      ::=  :<<< [SelfType] TemplateStat {semi TemplateStat} >>>
-TemplateStat      ::=  Import
-                    |  Export
-                    |  {Annotation [nl]} {Modifier} Def
-                    |  {Annotation [nl]} {Modifier} Dcl
-                    |  Extension
-                    |  Expr1
-                    |  EndMarker
-                    |
-SelfType          ::=  id [‘:’ InfixType] ‘=>’                                  ValDef(_, name, tpt, _)
-                    |  ‘this’ ‘:’ InfixType ‘=>’
-
-EnumBody          ::=  :<<< [SelfType] EnumStat {semi EnumStat} >>>
-EnumStat          ::=  TemplateStat
-                    |  {Annotation [nl]} {Modifier} EnumCase
-EnumCase          ::=  ‘case’ (id ClassConstr [‘extends’ ConstrApps]] | ids)
-
-TopStats          ::=  TopStat {semi TopStat}
-TopStat           ::=  Import
-                    |  Export
-                    |  {Annotation [nl]} {Modifier} Def
-                    |  Extension
-                    |  Packaging
-                    |  PackageObject
-                    |  EndMarker
-                    |
-Packaging         ::=  ‘package’ QualId :<<< TopStats >>>
-PackageObject     ::=  ‘package’ ‘object’ ObjectDef
-
-CompilationUnit   ::=  {‘package’ QualId semi} TopStats
-```
diff --git a/docs/docs/reference/changed-features/implicit-conversions.md b/docs/docs/reference/changed-features/implicit-conversions.md
deleted file mode 100644
index df713ed09072..000000000000
--- a/docs/docs/reference/changed-features/implicit-conversions.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-layout: doc-page
-title: "Implicit Conversions"
----
-
-An _implicit conversion_, also called _view_, is a conversion that
-is applied by the compiler in several situations:
-
-1. When an expression `e` of type `T` is encountered, but the compiler
-   needs an expression of type `S`.
-1. When an expression `e.m` where `e` has type `T` but `T` defines no
-   member `m` is encountered.
-
-In those cases, the compiler looks in the implicit scope for a
-conversion that can convert an expression of type `T` to an expression
-of type `S` (or to a type that defines a member `m` in the second
-case).
-
-This conversion can be either:
-
-1. An `implicit def` of type `T => S` or `(=> T) => S`
-1. An implicit value of type `scala.Conversion[T, S]`
-
-Defining an implicit conversion will emit a warning unless the import
-`scala.language.implicitConversions` is in scope, or the flag
-`-language:implicitConversions` is given to the compiler.
-
-## Examples
-
-The first example is taken from `scala.Predef`. Thanks to this
-implicit conversion, it is possible to pass a `scala.Int` to a Java
-method that expects a `java.lang.Integer`
-
-```scala
-import scala.language.implicitConversions
-implicit def int2Integer(x: Int): java.lang.Integer =
-   x.asInstanceOf[java.lang.Integer]
-```
-
-The second example shows how to use `Conversion` to define an
-`Ordering` for an arbitrary type, given existing `Ordering`s for other
-types:
-
-```scala
-import scala.language.implicitConversions
-implicit def ordT[T, S](
-      implicit conv: Conversion[T, S],
-               ordS: Ordering[S]
-   ): Ordering[T] =
-    // `ordS` compares values of type `S`, but we can convert from `T` to `S`
-   (x: T, y: T) => ordS.compare(x, y)
-
-class A(val x: Int) // The type for which we want an `Ordering`
-
-// Convert `A` to a type for which an `Ordering` is available:
-implicit val AToInt: Conversion[A, Int] = _.x
-
-implicitly[Ordering[Int]] // Ok, exists in the standard library
-implicitly[Ordering[A]] // Ok, will use the implicit conversion from
-                        // `A` to `Int` and the `Ordering` for `Int`.
-```
-
-[More details](implicit-conversions-spec.md)
diff --git a/docs/docs/reference/changed-features/main-functions.md b/docs/docs/reference/changed-features/main-functions.md
deleted file mode 100644
index 165bd2efba12..000000000000
--- a/docs/docs/reference/changed-features/main-functions.md
+++ /dev/null
@@ -1,88 +0,0 @@
----
-layout: doc-page
-title: "Main Methods"
----
-
-Scala 3 offers a new way to define programs that can be invoked from the command line:
-A `@main` annotation on a method turns this method into an executable program.
-Example:
-
-```scala
-@main def happyBirthday(age: Int, name: String, others: String*) =
-   val suffix =
-      age % 100 match
-      case 11 | 12 | 13 => "th"
-      case _ =>
-         age % 10 match
-         case 1 => "st"
-         case 2 => "nd"
-         case 3 => "rd"
-         case _ => "th"
-   val bldr = new StringBuilder(s"Happy $age$suffix birthday, $name")
-   for other <- others do bldr.append(" and ").append(other)
-   bldr.toString
-```
-
-This would generate a main program `happyBirthday` that could be called like this
-
-```
-> scala happyBirthday 23 Lisa Peter
-Happy 23rd birthday, Lisa and Peter
-```
-
-A `@main` annotated method can be written either at the top-level or in a statically accessible object. The name of the program is in each case the name of the method, without any object prefixes. The `@main` method can have an arbitrary number of parameters.
-For each parameter type there must be an instance of the `scala.util.CommandLineParser.FromString` type class
-that is used to convert an argument string to the required parameter type.
-The parameter list of a main method can end in a repeated parameter that then
-takes all remaining arguments given on the command line.
-
-The program implemented from a `@main` method checks that there are enough arguments on
-the command line to fill in all parameters, and that argument strings are convertible to
-the required types. If a check fails, the program is terminated with an error message.
-
-Examples:
-
-```
-> scala happyBirthday 22
-Illegal command line after first argument: more arguments expected
-
-> scala happyBirthday sixty Fred
-Illegal command line: java.lang.NumberFormatException: For input string: "sixty"
-```
-
-The Scala compiler generates a program from a `@main` method `f` as follows:
-
- - It creates a class named `f` in the package where the `@main` method was found
- - The class has a static method `main` with the usual signature. It takes an `Array[String]`
-   as argument and returns `Unit`.
- - The generated `main` method calls method `f` with arguments converted using
-   methods in the [`scala.util.CommandLineParser`](https://dotty.epfl.ch/api/scala/util/CommandLineParser$.html) object.
-
-For instance, the `happyBirthDay` method above would generate additional code equivalent to the following class:
-
-```scala
-final class happyBirthday:
-   import scala.util.CommandLineParser as CLP
-   <static> def main(args: Array[String]): Unit =
-      try
-         happyBirthday(
-            CLP.parseArgument[Int](args, 0),
-            CLP.parseArgument[String](args, 1),
-            CLP.parseRemainingArguments[String](args, 2))
-      catch
-         case error: CLP.ParseError => CLP.showError(error)
-```
-
-**Note**: The `<static>` modifier above expresses that the `main` method is generated
-as a static method of class `happyBirthDay`. It is not available for user programs in Scala. Regular "static" members are generated in Scala using objects instead.
-
-`@main` methods are the recommended scheme to generate programs that can be invoked from the command line in Scala 3. They replace the previous scheme to write program as objects with a special `App` parent class. In Scala 2, `happyBirthday` could be written also like this:
-
-```scala
-object happyBirthday extends App:
-   // needs by-hand parsing of arguments vector
-   ...
-```
-
-The previous functionality of `App`, which relied on the "magic" [`DelayedInit`](../dropped-features/delayed-init.md) trait, is no longer available. [`App`](https://dotty.epfl.ch/api/scala/App.html) still exists in limited form for now, but it does not support command line arguments and will be deprecated in the future. If programs need to cross-build
-between Scala 2 and Scala 3, it is recommended to use an explicit `main` method with an `Array[String]` argument instead.
diff --git a/docs/docs/reference/changed-features/match-syntax.md b/docs/docs/reference/changed-features/match-syntax.md
deleted file mode 100644
index 67c2f675a704..000000000000
--- a/docs/docs/reference/changed-features/match-syntax.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-layout: doc-page
-title: "Match Expressions"
----
-
-The syntactical precedence of match expressions has been changed.
-`match` is still a keyword, but it is used like an alphabetical operator. This has several consequences:
-
- 1. `match` expressions can be chained:
-
-    ```scala
-    xs match {
-       case Nil => "empty"
-       case _   => "nonempty"
-    } match {
-       case "empty"    => 0
-       case "nonempty" => 1
-    }
-    ```
-
-    (or, dropping the optional braces)
-
-    ```scala
-    xs match
-       case Nil => "empty"
-       case _   => "nonempty"
-    match
-       case "empty" => 0
-       case "nonempty" => 1
-    ```
-
- 2. `match` may follow a period:
-
-     ```scala
-     if xs.match
-        case Nil => false
-        case _   => true
-     then "nonempty"
-     else "empty"
-     ```
-
- 3. The scrutinee of a match expression must be an `InfixExpr`. Previously the scrutinee could be followed by a type ascription `: T`, but this is no longer supported. So `x : T match { ... }` now has to be
- written `(x: T) match { ... }`.
-
-## Syntax
-
-The new syntax of match expressions is as follows.
-
-```ebnf
-InfixExpr    ::=  ...
-               |  InfixExpr MatchClause
-SimpleExpr   ::=  ...
-               |  SimpleExpr ‘.’ MatchClause
-MatchClause  ::=  ‘match’ ‘{’ CaseClauses ‘}’
-```
diff --git a/docs/docs/reference/changed-features/numeric-literals.md b/docs/docs/reference/changed-features/numeric-literals.md
deleted file mode 100644
index 3ac84541592f..000000000000
--- a/docs/docs/reference/changed-features/numeric-literals.md
+++ /dev/null
@@ -1,261 +0,0 @@
----
-layout: doc-page
-title: "Numeric Literals"
----
-
-**Note**: This feature is not yet part of the Scala 3 language definition. It can be made available by a language import:
-
-```scala
-import scala.language.experimental.genericNumberLiterals
-```
-
-In Scala 2, numeric literals were confined to the primitive numeric types `Int`, `Long`, `Float`, and `Double`. Scala 3 allows to write numeric literals also for user-defined types. Example:
-
-```scala
-val x: Long = -10_000_000_000
-val y: BigInt = 0x123_abc_789_def_345_678_901
-val z: BigDecimal = 110_222_799_799.99
-
-(y: BigInt) match
-   case 123_456_789_012_345_678_901 =>
-```
-
-The syntax of numeric literals is the same as before, except there are no pre-set limits
-how large they can be.
-
-### Meaning of Numeric Literals
-
-The meaning of a numeric literal is determined as follows:
-
-- If the literal ends with `l` or `L`, it is a `Long` integer (and must fit in its legal range).
-- If the literal ends with `f` or `F`, it is a single precision floating point number of type `Float`.
-- If the literal ends with `d` or `D`, it is a double precision floating point number of type `Double`.
-
-In each of these cases the conversion to a number is exactly as in Scala 2 or in Java. If a numeric literal does _not_ end in one of these suffixes, its meaning is determined by the expected type:
-
-1. If the expected type is `Int`, `Long`, `Float`, or `Double`, the literal is
-   treated as a standard literal of that type.
-2. If the expected type is a fully defined type `T` that has a given instance of type
-   `scala.util.FromDigits[T]`, the literal is converted to a value of type `T` by passing it as an argument to
-   the `fromDigits` method of that instance (more details below).
-3. Otherwise, the literal is treated as a `Double` literal (if it has a decimal point or an
-   exponent), or as an `Int` literal (if not). (This last possibility is again as in Scala 2 or Java.)
-
-With these rules, the definition
-
-```scala
-val x: Long = -10_000_000_000
-```
-
-is legal by rule (1), since the expected type is `Long`. The definitions
-
-```scala
-val y: BigInt = 0x123_abc_789_def_345_678_901
-val z: BigDecimal = 111222333444.55
-```
-
-are legal by rule (2), since both `BigInt` and `BigDecimal` have `FromDigits` instances
-(which implement the `FromDigits` subclasses `FromDigits.WithRadix` and `FromDigits.Decimal`, respectively).
-On the other hand,
-
-```scala
-val x = -10_000_000_000
-```
-
-gives a type error, since without an expected type `-10_000_000_000` is treated by rule (3) as an `Int` literal, but it is too large for that type.
-
-### The FromDigits Trait
-
-To allow numeric literals, a type simply has to define a `given` instance of the
-`scala.util.FromDigits` type class, or one of its subclasses. `FromDigits` is defined
-as follows:
-
-```scala
-trait FromDigits[T]:
-   def fromDigits(digits: String): T
-```
-
-Implementations of the `fromDigits` convert strings of digits to the values of the
-implementation type `T`.
-The `digits` string consists of digits between `0` and `9`, possibly preceded by a
-sign ("+" or "-"). Number separator characters `_` are filtered out before
-the string is passed to `fromDigits`.
-
-The companion object `FromDigits` also defines subclasses of `FromDigits` for
-whole numbers with a given radix, for numbers with a decimal point, and for
-numbers that can have both a decimal point and an exponent:
-
-```scala
-object FromDigits:
-
-   /** A subclass of `FromDigits` that also allows to convert whole
-    *  number literals with a radix other than 10
-    */
-   trait WithRadix[T] extends FromDigits[T]:
-      def fromDigits(digits: String): T = fromDigits(digits, 10)
-      def fromDigits(digits: String, radix: Int): T
-
-   /** A subclass of `FromDigits` that also allows to convert number
-    *  literals containing a decimal point ".".
-    */
-   trait Decimal[T] extends FromDigits[T]
-
-   /** A subclass of `FromDigits`that allows also to convert number
-    *  literals containing a decimal point "." or an
-    *  exponent `('e' | 'E')['+' | '-']digit digit*`.
-    */
-   trait Floating[T] extends Decimal[T]
-```
-
-A user-defined number type can implement one of those, which signals to the compiler
-that hexadecimal numbers, decimal points, or exponents are also accepted in literals
-for this type.
-
-### Error Handling
-
-`FromDigits` implementations can signal errors by throwing exceptions of some subtype
-of `FromDigitsException`. `FromDigitsException` is defined with three subclasses in the
-`FromDigits` object as follows:
-
-```scala
-abstract class FromDigitsException(msg: String) extends NumberFormatException(msg)
-
-class NumberTooLarge (msg: String = "number too large")         extends FromDigitsException(msg)
-class NumberTooSmall (msg: String = "number too small")         extends FromDigitsException(msg)
-class MalformedNumber(msg: String = "malformed number literal") extends FromDigitsException(msg)
-```
-
-### Example
-
-As a fully worked out example, here is an implementation of a new numeric class, `BigFloat`, that accepts numeric literals. `BigFloat` is defined in terms of a `BigInt` mantissa and an `Int` exponent:
-
-```scala
-case class BigFloat(mantissa: BigInt, exponent: Int):
-   override def toString = s"${mantissa}e${exponent}"
-```
-
-`BigFloat` literals can have a decimal point as well as an exponent. E.g. the following expression
-should produce the `BigFloat` number `BigFloat(-123, 997)`:
-
-```scala
--0.123E+1000: BigFloat
-```
-
-The companion object of `BigFloat` defines an `apply` constructor method to construct a `BigFloat`
-from a `digits` string. Here is a possible implementation:
-
-```scala
-object BigFloat:
-   import scala.util.FromDigits
-
-   def apply(digits: String): BigFloat =
-      val (mantissaDigits, givenExponent) =
-         digits.toUpperCase.split('E') match
-            case Array(mantissaDigits, edigits) =>
-               val expo =
-                  try FromDigits.intFromDigits(edigits)
-                  catch case ex: FromDigits.NumberTooLarge =>
-                     throw FromDigits.NumberTooLarge(s"exponent too large: $edigits")
-               (mantissaDigits, expo)
-            case Array(mantissaDigits) =>
-               (mantissaDigits, 0)
-      val (intPart, exponent) =
-         mantissaDigits.split('.') match
-            case Array(intPart, decimalPart) =>
-               (intPart ++ decimalPart, givenExponent - decimalPart.length)
-            case Array(intPart) =>
-               (intPart, givenExponent)
-      BigFloat(BigInt(intPart), exponent)
-```
-
-To accept `BigFloat` literals, all that's needed in addition is a `given` instance of type
-`FromDigits.Floating[BigFloat]`:
-
-```scala
-   given FromDigits: FromDigits.Floating[BigFloat] with
-      def fromDigits(digits: String) = apply(digits)
-end BigFloat
-```
-
-Note that the `apply` method does not check the format of the `digits` argument. It is
-assumed that only valid arguments are passed. For calls coming from the compiler
-that assumption is valid, since the compiler will first check whether a numeric
-literal has the correct format before it gets passed on to a conversion method.
-
-### Compile-Time Errors
-
-With the setup of the previous section, a literal like
-
-```scala
-1e10_0000_000_000: BigFloat
-```
-
-would be expanded by the compiler to
-
-```scala
-BigFloat.FromDigits.fromDigits("1e100000000000")
-```
-
-Evaluating this expression throws a `NumberTooLarge` exception at run time. We would like it to
-produce a compile-time error instead. We can achieve this by tweaking the `BigFloat` class
-with a small dose of metaprogramming. The idea is to turn the `fromDigits` method
-into a macro, i.e. make it an inline method with a splice as right-hand side.
-To do this, replace the `FromDigits` instance in the `BigFloat` object by the following two definitions:
-
-```scala
-object BigFloat:
-   ...
-
-   class FromDigits extends FromDigits.Floating[BigFloat]:
-      def fromDigits(digits: String) = apply(digits)
-
-   given FromDigits with
-      override inline def fromDigits(digits: String) = ${
-        fromDigitsImpl('digits)
-      }
-```
-
-Note that an inline method cannot directly fill in for an abstract method, since it produces
-no code that can be executed at runtime. That is why we define an intermediary class
-`FromDigits` that contains a fallback implementation which is then overridden by the inline
-method in the `FromDigits` given instance. That method is defined in terms of a macro
-implementation method `fromDigitsImpl`. Here is its definition:
-
-```scala
-   private def fromDigitsImpl(digits: Expr[String])(using ctx: Quotes): Expr[BigFloat] =
-      digits.value match
-         case Some(ds) =>
-            try
-               val BigFloat(m, e) = apply(ds)
-               '{BigFloat(${Expr(m)}, ${Expr(e)})}
-            catch case ex: FromDigits.FromDigitsException =>
-               ctx.error(ex.getMessage)
-               '{BigFloat(0, 0)}
-         case None =>
-            '{apply($digits)}
-end BigFloat
-```
-
-The macro implementation takes an argument of type `Expr[String]` and yields
-a result of type `Expr[BigFloat]`. It tests whether its argument is a constant
-string. If that is the case, it converts the string using the `apply` method
-and lifts the resulting `BigFloat` back to `Expr` level. For non-constant
-strings `fromDigitsImpl(digits)` is simply `apply(digits)`, i.e. everything is
-evaluated at runtime in this case.
-
-The interesting part is the `catch` part of the case where `digits` is constant.
-If the `apply` method throws a `FromDigitsException`, the exception's message is issued as a compile time error in the `ctx.error(ex.getMessage)` call.
-
-With this new implementation, a definition like
-
-```scala
-val x: BigFloat = 1234.45e3333333333
-```
-
-would give a compile time error message:
-
-```scala
-3 |  val x: BigFloat = 1234.45e3333333333
-  |                    ^^^^^^^^^^^^^^^^^^
-  |                    exponent too large: 3333333333
-```
diff --git a/docs/docs/reference/changed-features/structural-types-spec.md b/docs/docs/reference/changed-features/structural-types-spec.md
deleted file mode 100644
index b3e2125d7dcf..000000000000
--- a/docs/docs/reference/changed-features/structural-types-spec.md
+++ /dev/null
@@ -1,103 +0,0 @@
----
-layout: doc-page
-title: "Programmatic Structural Types - More Details"
----
-
-## Syntax
-
-```
-SimpleType    ::= ... | Refinement
-Refinement    ::= ‘{’ RefineStatSeq ‘}’
-RefineStatSeq ::=  RefineStat {semi RefineStat}
-RefineStat    ::= ‘val’ VarDcl | ‘def’ DefDcl | ‘type’ {nl} TypeDcl
-```
-
-## Implementation of structural types
-
-The standard library defines a universal marker trait
-[`scala.Selectable`](https://github.com/lampepfl/dotty/blob/master/library/src/scala/Selectable.scala):
-
-```scala
-trait Selectable extends Any
-```
-
-An implementation of `Selectable` that relies on [Java reflection](https://www.oracle.com/technical-resources/articles/java/javareflection.html) is
-available in the standard library: `scala.reflect.Selectable`. Other
-implementations can be envisioned for platforms where Java reflection
-is not available.
-
-Implementations of `Selectable` have to make available one or both of
-the methods `selectDynamic` and `applyDynamic`. The methods could be members of the `Selectable` implementation or they could be extension methods.
-
-The `selectDynamic` method takes a field name and returns the value associated with that name in the `Selectable`.
-It should have a signature of the form:
-
-```scala
-def selectDynamic(name: String): T
-```
-
-Often, the return type `T` is `Any`.
-
-Unlike `scala.Dynamic`, there is no special meaning for an `updateDynamic` method.
-However, we reserve the right to give it meaning in the future.
-Consequently, it is recommended not to define any member called `updateDynamic` in `Selectable`s.
-
-The `applyDynamic` method is used for selections that are applied to arguments. It takes a method name and possibly `Class`es representing its parameters types as well as the arguments to pass to the function.
-Its signature should be of one of the two following forms:
-
-```scala
-def applyDynamic(name: String)(args: Any*): T
-def applyDynamic(name: String, ctags: Class[?]*)(args: Any*): T
-```
-
-Both versions are passed the actual arguments in the `args` parameter. The second version takes in addition a vararg argument of `java.lang.Class`es that identify the method's parameter classes. Such an argument is needed
-if `applyDynamic` is implemented using Java reflection, but it could be
-useful in other cases as well. `selectDynamic` and `applyDynamic` can also take additional context parameters in using clauses. These are resolved in the normal way at the callsite.
-
-Given a value `v` of type `C { Rs }`, where `C` is a class reference
-and `Rs` are structural refinement declarations, and given `v.a` of type `U`, we consider three distinct cases:
-
-- If `U` is a value type, we map `v.a` to:
-  ```scala
-  v.selectDynamic("a").asInstanceOf[U]
-  ```
-
-- If `U` is a method type `(T11, ..., T1n)...(TN1, ..., TNn): R` and it is not a dependent method type, we map `v.a(a11, ..., a1n)...(aN1, ..., aNn)` to:
-  ```scala
-  v.applyDynamic("a")(a11, ..., a1n, ..., aN1, ..., aNn)
-    .asInstanceOf[R]
-  ```
-  If this call resolves to an `applyDynamic` method of the second form that takes a `Class[?]*` argument, we further rewrite this call to
-  ```scala
-  v.applyDynamic("a", c11, ..., c1n, ..., cN1, ... cNn)(
-    a11, ..., a1n, ..., aN1, ..., aNn)
-    .asInstanceOf[R]
-  ```
-   where each `c_ij` is the literal `java.lang.Class[?]` of the type of the formal parameter `Tij`, i.e., `classOf[Tij]`.
-
-- If `U` is neither a value nor a method type, or a dependent method
-  type, an error is emitted.
-
-Note that `v`'s static type does not necessarily have to conform to `Selectable`, nor does it need to have `selectDynamic` and `applyDynamic` as members. It suffices that there is an implicit
-conversion that can turn `v` into a `Selectable`, and the selection methods could also be available as
-[extension methods](../contextual/extension-methods.md).
-
-## Limitations of structural types
-
-- Dependent methods cannot be called via structural call.
-- Overloaded methods cannot be called via structural call.
-- Refinements do not handle polymorphic methods.
-
-## Differences with Scala 2 structural types
-
-- Scala 2 supports structural types by means of Java reflection. Unlike
-  Scala 3, structural calls do not rely on a mechanism such as
-  `Selectable`, and reflection cannot be avoided.
-- In Scala 2, structural calls to overloaded methods are possible.
-- In Scala 2, mutable `var`s are allowed in refinements. In Scala 3,
-  they are no longer allowed.
-
-
-## Context
-
-For more information, see [Rethink Structural Types](https://github.com/lampepfl/dotty/issues/1886).
diff --git a/docs/docs/reference/changed-features/type-checking.md b/docs/docs/reference/changed-features/type-checking.md
deleted file mode 100644
index 4c9d1f6139b9..000000000000
--- a/docs/docs/reference/changed-features/type-checking.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: doc-page
-title: "Changes in Type Checking"
----
-
-*** **TO BE FILLED IN** ***
diff --git a/docs/docs/reference/contextual/conversions.md b/docs/docs/reference/contextual/conversions.md
deleted file mode 100644
index f2f4249efb8d..000000000000
--- a/docs/docs/reference/contextual/conversions.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-layout: doc-page
-title: "Implicit Conversions"
----
-
-Implicit conversions are defined by given instances of the `scala.Conversion` class.
-This class is defined in package `scala` as follows:
-```scala
-abstract class Conversion[-T, +U] extends (T => U):
-   def apply (x: T): U
-```
-For example, here is an implicit conversion from `String` to `Token`:
-```scala
-given Conversion[String, Token] with
-   def apply(str: String): Token = new KeyWord(str)
-```
-Using an alias this can be expressed more concisely as:
-```scala
-given Conversion[String, Token] = new KeyWord(_)
-```
-An implicit conversion is applied automatically by the compiler in three situations:
-
-1. If an expression `e` has type `T`, and `T` does not conform to the expression's expected type `S`.
-2. In a selection `e.m` with `e` of type `T`, but `T` defines no member `m`.
-3. In an application `e.m(args)` with `e` of type `T`, if `T` does define
-   some member(s) named `m`, but none of these members can be applied to the arguments `args`.
-
-In the first case, the compiler looks for a given `scala.Conversion` instance that maps
-an argument of type `T` to type `S`. In the second and third
-case, it looks for a given `scala.Conversion` instance that maps an argument of type `T`
-to a type that defines a member `m` which can be applied to `args` if present.
-If such an instance `C` is found, the expression `e` is replaced by `C.apply(e)`.
-
-## Examples
-
-1. The `Predef` package contains "auto-boxing" conversions that map
-primitive number types to subclasses of `java.lang.Number`. For instance, the
-conversion from `Int` to `java.lang.Integer` can be defined as follows:
-   ```scala
-   given int2Integer: Conversion[Int, java.lang.Integer] =
-      java.lang.Integer.valueOf(_)
-   ```
-
-2. The "magnet" pattern is sometimes used to express many variants of a method. Instead of defining overloaded versions of the method, one can also let the method take one or more arguments of specially defined "magnet" types, into which various argument types can be converted. Example:
-   ```scala
-   object Completions:
-
-      // The argument "magnet" type
-      enum CompletionArg:
-         case Error(s: String)
-         case Response(f: Future[HttpResponse])
-         case Status(code: Future[StatusCode])
-
-      object CompletionArg:
-
-       // conversions defining the possible arguments to pass to `complete`
-       // these always come with CompletionArg
-       // They can be invoked explicitly, e.g.
-       //
-       //   CompletionArg.fromStatusCode(statusCode)
-
-         given fromString    : Conversion[String, CompletionArg]               = Error(_)
-         given fromFuture    : Conversion[Future[HttpResponse], CompletionArg] = Response(_)
-         given fromStatusCode: Conversion[Future[StatusCode], CompletionArg]   = Status(_)
-      end CompletionArg
-      import CompletionArg.*
-
-      def complete[T](arg: CompletionArg) = arg match
-         case Error(s) => ...
-         case Response(f) => ...
-         case Status(code) => ...
-
-   end Completions
-   ```
-This setup is more complicated than simple overloading of `complete`, but it can still be useful if normal overloading is not available (as in the case above, since we cannot have two overloaded methods that take `Future[...]` arguments), or if normal overloading would lead to a combinatorial explosion of variants.
diff --git a/docs/docs/reference/contextual/givens.md b/docs/docs/reference/contextual/givens.md
deleted file mode 100644
index 08539c081fb7..000000000000
--- a/docs/docs/reference/contextual/givens.md
+++ /dev/null
@@ -1,170 +0,0 @@
----
-layout: doc-page
-title: "Given Instances"
----
-
-Given instances (or, simply, "givens") define "canonical" values of certain types
-that serve for synthesizing arguments to [context parameters](./using-clauses.md). Example:
-
-```scala
-trait Ord[T]:
-   def compare(x: T, y: T): Int
-   extension (x: T) def < (y: T) = compare(x, y) < 0
-   extension (x: T) def > (y: T) = compare(x, y) > 0
-
-given intOrd: Ord[Int] with
-   def compare(x: Int, y: Int) =
-      if x < y then -1 else if x > y then +1 else 0
-
-given listOrd[T](using ord: Ord[T]): Ord[List[T]] with
-
-   def compare(xs: List[T], ys: List[T]): Int = (xs, ys) match
-      case (Nil, Nil) => 0
-      case (Nil, _) => -1
-      case (_, Nil) => +1
-      case (x :: xs1, y :: ys1) =>
-         val fst = ord.compare(x, y)
-         if fst != 0 then fst else compare(xs1, ys1)
-
-```
-
-This code defines a trait `Ord` with two given instances. `intOrd` defines
-a given for the type `Ord[Int]` whereas `listOrd[T]` defines givens
-for `Ord[List[T]]` for all types `T` that come with a given instance for `Ord[T]`
-themselves. The `using` clause in `listOrd` defines a condition: There must be a
-given of type `Ord[T]` for a given of type `Ord[List[T]]` to exist.
-Such conditions are expanded by the compiler to [context parameters](./using-clauses.md).
-
-## Anonymous Givens
-
-The name of a given can be left out. So the definitions
-of the last section can also be expressed like this:
-
-```scala
-given Ord[Int] with
-   ...
-given [T](using Ord[T]): Ord[List[T]] with
-   ...
-```
-
-If the name of a given is missing, the compiler will synthesize a name from
-the implemented type(s).
-
-**Note** The name synthesized by the compiler is chosen to be readable and reasonably concise. For instance, the two instances above would get the names:
-
-```scala
-given_Ord_Int
-given_Ord_List_T
-```
-
-The precise rules for synthesizing names are found [here](./relationship-implicits.html#anonymous-given-instances). These rules do not guarantee absence of name conflicts between
-given instances of types that are "too similar". To avoid conflicts one can
-use named instances.
-
-**Note** To ensure robust binary compatibility, publicly available libraries should prefer named instances.
-
-## Alias Givens
-
-An alias can be used to define a given instance that is equal to some expression. Example:
-
-```scala
-given global: ExecutionContext = ForkJoinPool()
-```
-
-This creates a given `global` of type `ExecutionContext` that resolves to the right
-hand side `ForkJoinPool()`.
-The first time `global` is accessed, a new `ForkJoinPool` is created, which is then
-returned for this and all subsequent accesses to `global`. This operation is thread-safe.
-
-Alias givens can be anonymous as well, e.g.
-
-```scala
-given Position = enclosingTree.position
-given (using config: Config): Factory = MemoizingFactory(config)
-```
-
-An alias given can have type parameters and context parameters just like any other given,
-but it can only implement a single type.
-
-## Given Macros
-
-Given aliases can have the `inline` and `transparent` modifiers.
-Example:
-
-```scala
-transparent inline given mkAnnotations[A, T]: Annotations[A, T] = ${
-  // code producing a value of a subtype of Annotations
-}
-```
-
-Since `mkAnnotations` is `transparent`, the type of an application is the type of its right-hand side, which can be a proper subtype of the declared result type `Annotations[A, T]`.
-
-## Pattern-Bound Given Instances
-
-Given instances can also appear in patterns. Example:
-
-```scala
-for given Context <- applicationContexts do
-
-pair match
-   case (ctx @ given Context, y) => ...
-```
-
-In the first fragment above, anonymous given instances for class `Context` are established by enumerating over `applicationContexts`. In the second fragment, a given `Context`
-instance named `ctx` is established by matching against the first half of the `pair` selector.
-
-In each case, a pattern-bound given instance consists of `given` and a type `T`. The pattern matches exactly the same selectors as the type ascription pattern `_: T`.
-
-## Negated Givens
-
-Scala 2's somewhat puzzling behavior with respect to ambiguity has been exploited to implement the analogue of a "negated" search in implicit resolution,
-where a query Q1 fails if some other query Q2 succeeds and Q1 succeeds if Q2 fails. With the new cleaned up behavior these techniques no longer work.
-But the new special type `scala.util.NotGiven` now implements negation directly.
-
-For any query type `Q`, `NotGiven[Q]` succeeds if and only if the implicit
-search for `Q` fails, for example:
-
-```scala
-import scala.util.NotGiven
-
-trait Tagged[A]
-
-case class Foo[A](value: Boolean)
-object Foo:
-   given fooTagged[A](using Tagged[A]): Foo[A] = Foo(true)
-   given fooNotTagged[A](using NotGiven[Tagged[A]]): Foo[A] = Foo(false)
-
-@main def test(): Unit =
-   given Tagged[Int] with {}
-   assert(summon[Foo[Int]].value) // fooTagged is found
-   assert(!summon[Foo[String]].value) // fooNotTagged is found
-```
-
-## Given Instance Initialization
-
-A given instance without type or context parameters is initialized on-demand, the first
-time it is accessed. If a given has type or context parameters, a fresh instance
-is created for each reference.
-
-## Syntax
-
-Here is the syntax for given instances:
-
-```ebnf
-TmplDef             ::=  ...
-                     |   ‘given’ GivenDef
-GivenDef            ::=  [GivenSig] StructuralInstance
-                     |   [GivenSig] AnnotType ‘=’ Expr
-                     |   [GivenSig] AnnotType
-GivenSig            ::=  [id] [DefTypeParamClause] {UsingParamClause} ‘:’
-StructuralInstance  ::=  ConstrApp {‘with’ ConstrApp} ‘with’ TemplateBody
-```
-
-A given instance starts with the reserved word `given` and an optional _signature_. The signature
-defines a name and/or parameters for the instance. It is followed by `:`. There are three kinds
-of given instances:
-
-- A _structural instance_ contains one or more types or constructor applications,
-  followed by `with` and a template body that contains member definitions of the instance.
-- An _alias instance_ contains a type, followed by `=` and a right-hand side expression.
-- An _abstract instance_ contains just the type, which is not followed by anything.
diff --git a/docs/docs/reference/contextual/motivation.md b/docs/docs/reference/contextual/motivation.md
deleted file mode 100644
index 33cf8110c557..000000000000
--- a/docs/docs/reference/contextual/motivation.md
+++ /dev/null
@@ -1,82 +0,0 @@
----
-layout: doc-page
-title: "Overview"
----
-
-### Critique of the Status Quo
-
-Scala's implicits are its most distinguished feature. They are _the_ fundamental way to abstract over context. They represent a unified paradigm with a great variety of use cases, among them: implementing type classes, establishing context, dependency injection, expressing capabilities, computing new types and proving relationships between them.
-
-Following Haskell, Scala was the second popular language to have some form of implicits. Other languages have followed suit. E.g [Rust's traits](https://doc.rust-lang.org/rust-by-example/trait.html) or [Swift's protocol extensions](https://docs.swift.org/swift-book/LanguageGuide/Protocols.html#ID521). Design proposals are also on the table for Kotlin as [compile time dependency resolution](https://github.com/Kotlin/KEEP/blob/e863b25f8b3f2e9b9aaac361c6ee52be31453ee0/proposals/compile-time-dependency-resolution.md), for C# as [Shapes and Extensions](https://github.com/dotnet/csharplang/issues/164)
-or for F# as [Traits](https://github.com/MattWindsor91/visualfsharp/blob/hackathon-vs/examples/fsconcepts.md). Implicits are also a common feature of theorem provers such as [Coq](https://coq.inria.fr/refman/language/extensions/implicit-arguments.html) or [Agda](https://agda.readthedocs.io/en/latest/language/implicit-arguments.html).
-
-Even though these designs use widely different terminology, they are all variants of the core idea of _term inference_. Given a type, the compiler synthesizes a "canonical" term that has that type. Scala embodies the idea in a purer form than most other languages: An implicit parameter directly leads to an inferred argument term that could also be written down explicitly. By contrast, type class based designs are less direct since they hide term inference behind some form of type classification and do not offer the option of writing the inferred quantities (typically, dictionaries) explicitly.
-
-Given that term inference is where the industry is heading, and given that Scala has it in a very pure form, how come implicits are not more popular? In fact, it's fair to say that implicits are at the same time Scala's most distinguished and most controversial feature. I believe this is due to a number of aspects that together make implicits harder to learn than necessary and also make it harder to prevent abuses.
-
-Particular criticisms are:
-
-1. Being very powerful, implicits are easily over-used and mis-used. This observation holds in almost all cases when we talk about _implicit conversions_, which, even though conceptually different, share the same syntax with other implicit definitions. For instance, regarding the two definitions
-
-    ```scala
-    implicit def i1(implicit x: T): C[T] = ...
-    implicit def i2(x: T): C[T] = ...
-    ```
-
-   the first of these is a conditional implicit _value_, the second an implicit _conversion_. Conditional implicit values are a cornerstone for expressing type classes, whereas most applications of implicit conversions have turned out to be of dubious value. The problem is that many newcomers to the language start with defining implicit conversions since they are easy to understand and seem powerful and convenient. Scala 3 will put under a language flag both definitions and applications of "undisciplined" implicit conversions between types defined elsewhere. This is a useful step to push back against overuse of implicit conversions. But the problem remains that syntactically, conversions and values just look too similar for comfort.
-
- 2. Another widespread abuse is over-reliance on implicit imports. This often leads to inscrutable type errors that go away with the right import incantation, leaving a feeling of frustration. Conversely, it is hard to see what implicits a program uses since implicits can hide anywhere in a long list of imports.
-
- 3. The syntax of implicit definitions is too minimal. It consists of a single modifier, `implicit`, that can be attached to a large number of language constructs. A problem with this for newcomers is that it conveys mechanism instead of intent. For instance, a type class instance is an implicit object or val if unconditional and an implicit def with implicit parameters referring to some class if conditional. This describes precisely what the implicit definitions translate to -- just drop the `implicit` modifier, and that's it! But the cues that define intent are rather indirect and can be easily misread, as demonstrated by the definitions of `i1` and `i2` above.
-
- 4. The syntax of implicit parameters also has shortcomings. While implicit _parameters_ are designated specifically, arguments are not. Passing an argument to an implicit parameter looks like a regular application `f(arg)`. This is problematic because it means there can be confusion regarding what parameter gets instantiated in a call. For instance, in
-
-    ```scala
-    def currentMap(implicit ctx: Context): Map[String, Int]
-    ```
-
-    one cannot write `currentMap("abc")` since the string `"abc"` is taken as explicit argument to the implicit `ctx` parameter. One has to write `currentMap.apply("abc")` instead, which is awkward and irregular. For the same reason, a method definition can only have one implicit parameter section and it must always come last. This restriction not only reduces orthogonality, but also prevents some useful program constructs, such as a method with a regular parameter whose type depends on an implicit value. Finally, it's also a bit annoying that implicit parameters must have a name, even though in many cases that name is never referenced.
-
- 5. Implicits pose challenges for tooling. The set of available implicits depends on context, so command completion has to take context into account. This is feasible in an IDE but tools like [Scaladoc](https://docs.scala-lang.org/overviews/scaladoc/overview.html) that are based on static web pages can only provide an approximation. Another problem is that failed implicit searches often give very unspecific error messages, in particular if some deeply recursive implicit search has failed. Note that the Scala 3 compiler has already made a lot of progress in the error diagnostics area. If a recursive search fails some levels down, it shows what was constructed and what is missing. Also, it suggests imports that can bring missing implicits in scope.
-
-None of the shortcomings is fatal, after all implicits are very widely used, and many libraries and applications rely on them. But together, they make code using implicits a lot more cumbersome and less clear than it could be.
-
-Historically, many of these shortcomings come from the way implicits were gradually "discovered" in Scala. Scala originally had only implicit conversions with the intended use case of "extending" a class or trait after it was defined, i.e. what is expressed by implicit classes in later versions of Scala. Implicit parameters and instance definitions came later in 2006 and we picked similar syntax since it seemed convenient. For the same reason, no effort was made to distinguish implicit imports or arguments from normal ones.
-
-Existing Scala programmers by and large have gotten used to the status quo and see little need for change. But for newcomers this status quo presents a big hurdle. I believe if we want to overcome that hurdle, we should take a step back and allow ourselves to consider a radically new design.
-
-### The New Design
-
-The following pages introduce a redesign of contextual abstractions in Scala. They introduce four fundamental changes:
-
- 1. [Given Instances](./givens.md) are a new way to define basic terms that can be synthesized.  They replace implicit definitions. The core principle of the proposal is that, rather than mixing the `implicit` modifier with a large number of features, we have a single way to define terms that can be synthesized for types.
-
- 2. [Using Clauses](./using-clauses.md) are a new syntax for implicit _parameters_ and their _arguments_. It unambiguously aligns parameters and arguments, solving a number of language warts. It also allows us to have several `using` clauses in a definition.
-
- 3. ["Given" Imports](./given-imports.md) are a new class of import selectors that specifically import
-    givens and nothing else.
-
- 4. [Implicit Conversions](./conversions.md) are now expressed as given instances of a standard `Conversion` class. All other forms of implicit conversions will be phased out.
-
-This section also contains pages describing other language features that are related to context abstraction. These are:
-
- - [Context Bounds](./context-bounds.md), which carry over unchanged.
- - [Extension Methods](./extension-methods.md) replace implicit classes in a way that integrates better with type classes.
- - [Implementing Type Classes](type-classes.md) demonstrates how some common type classes can be implemented using the new constructs.
- - [Type Class Derivation](./derivation.md) introduces constructs to automatically derive type class instances for ADTs.
- - [Multiversal Equality](./multiversal-equality.md) introduces a special type class to support type safe equality.
- - [Context Functions](./context-functions.md) provide a way to abstract over context parameters.
- - [By-Name Context Parameters](./by-name-context-parameters.md) are an essential tool to define recursive synthesized values without looping.
- - [Relationship with Scala 2 Implicits](./relationship-implicits.md) discusses the relationship between old-style implicits and new-style givens and how to migrate from one to the other.
-
-Overall, the new design achieves a better separation of term inference from the rest of the language: There is a single way to define givens instead of a multitude of forms all taking an `implicit` modifier. There is a single way to introduce implicit parameters and arguments instead of conflating implicit with normal arguments. There is a separate way to import givens that does not allow them to hide in a sea of normal imports. And there is a single way to define an implicit conversion which is clearly marked as such and does not require special syntax.
-
-This design thus avoids feature interactions and makes the language more consistent and orthogonal. It will make implicits easier to learn and harder to abuse. It will greatly improve the clarity of the 95% of Scala programs that use implicits. It has thus the potential to fulfil the promise of term inference in a principled way that is also accessible and friendly.
-
-Could we achieve the same goals by tweaking existing implicits? After having tried for a long time, I believe now that this is impossible.
-
- - First, some of the problems are clearly syntactic and require different syntax to solve them.
- - Second, there is the problem how to migrate. We cannot change the rules in mid-flight. At some stage of language evolution we need to accommodate both the new and the old rules. With a syntax change, this is easy: Introduce the new syntax with new rules, support the old syntax for a while to facilitate cross compilation, deprecate and phase out the old syntax at some later time. Keeping the same syntax does not offer this path, and in fact does not seem to offer any viable path for evolution
- - Third, even if we would somehow succeed with migration, we still have the problem
- how to teach this. We cannot make existing tutorials go away. Almost all existing tutorials start with implicit conversions, which will go away; they use normal imports, which will go away, and they explain calls to methods with implicit parameters by expanding them to plain applications, which will also go away. This means that we'd have
- to add modifications and qualifications to all existing literature and courseware, likely causing more confusion with beginners instead of less. By contrast, with a new syntax there is a clear criterion: Any book or courseware that mentions `implicit` is outdated and should be updated.
diff --git a/docs/docs/reference/dropped-features/delayed-init.md b/docs/docs/reference/dropped-features/delayed-init.md
deleted file mode 100644
index ca640185252d..000000000000
--- a/docs/docs/reference/dropped-features/delayed-init.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-layout: doc-page
-title: "Dropped: Delayedinit"
----
-
-The special handling of the `DelayedInit` trait is no longer supported.
-
-One consequence is that the `App` class, which used `DelayedInit` is
-now partially broken. You can still use `App` as a simple way to set up a main program. Example:
-
-```scala
-object HelloWorld extends App {
-   println("Hello, world!")
-}
-```
-
-However, the code is now run in the initializer of the object, which on
-some JVM's means that it will only be interpreted. So, better not use it
-for benchmarking! Also, if you want to access the command line arguments,
-you need to use an explicit `main` method for that.
-
-```scala
-object Hello:
-   def main(args: Array[String]) =
-      println(s"Hello, ${args(0)}")
-```
-
-On the other hand, Scala 3 offers a convenient alternative to such "program" objects
-with [`@main` methods](../changed-features/main-functions.md).
diff --git a/docs/docs/reference/dropped-features/limit22.md b/docs/docs/reference/dropped-features/limit22.md
deleted file mode 100644
index 3fbbc8d776b1..000000000000
--- a/docs/docs/reference/dropped-features/limit22.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-layout: doc-page
-title: "Dropped: Limit 22"
----
-
-The limits of 22 for the maximal number of parameters of function types and the
-maximal number of fields in tuple types have been dropped.
-
-* Functions can now have an arbitrary number of parameters. Functions beyond
-  [`scala.Function22`](https://www.scala-lang.org/api/current/scala/Function22.html) are erased to a new trait [`scala.runtime.FunctionXXL`](https://dotty.epfl.ch/api/scala/runtime/FunctionXXL.html).
-
-* Tuples can also have an arbitrary number of fields. Tuples beyond [`scala.Tuple22`](https://www.scala-lang.org/api/current/scala/Tuple22.html)
-  are erased to a new class [`scala.runtime.TupleXXL`](https://dotty.epfl.ch/api/scala/runtime/TupleXXL.html) (which extends the trait [`scala.Product`](https://dotty.epfl.ch/api/scala/Product.html)). Furthermore, they support generic
-  operation such as concatenation and indexing.
-
-Both of these are implemented using arrays.
diff --git a/docs/docs/reference/dropped-features/macros.md b/docs/docs/reference/dropped-features/macros.md
deleted file mode 100644
index c8070ffda6db..000000000000
--- a/docs/docs/reference/dropped-features/macros.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-layout: doc-page
-title: "Dropped: Scala 2 Macros"
----
-
-The previous, experimental macro system has been dropped.
-
-Instead, there is a cleaner, more restricted system based on two complementary concepts: `inline` and `'{ ... }`/`${ ... }` code generation.
-`'{ ... }` delays the compilation of the code and produces an object containing the code, dually `${ ... }` evaluates an expression which produces code and inserts it in the surrounding `${ ... }`.
-In this setting, a definition marked as inlined containing a `${ ... }` is a macro, the code inside the `${ ... }` is executed at compile-time and produces code in the form of `'{ ... }`.
-Additionally, the contents of code can be inspected and created with a more complex reflection API as an extension of `'{ ... }`/`${ ... }` framework.
-
-* `inline` has been [implemented](../metaprogramming/inline.md) in Scala 3.
-* Quotes `'{ ... }` and splices `${ ... }` has been [implemented](../metaprogramming/macros.md) in Scala 3.
-* [TASTy reflect](../metaprogramming/reflection.md) provides more complex tree based APIs to inspect or create quoted code.
diff --git a/docs/docs/reference/dropped-features/nonlocal-returns.md b/docs/docs/reference/dropped-features/nonlocal-returns.md
deleted file mode 100644
index dd1374c40342..000000000000
--- a/docs/docs/reference/dropped-features/nonlocal-returns.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: doc-page
-title: "Deprecated: Nonlocal Returns"
----
-
-Returning from nested anonymous functions has been deprecated.
-
-Nonlocal returns are implemented by throwing and catching `scala.runtime.NonLocalReturnException`-s. This is rarely what is intended by the programmer. It can be problematic because of the hidden performance cost of throwing and catching exceptions. Furthermore, it is a leaky implementation: a catch-all exception handler can intercept a `NonLocalReturnException`.
-
-A drop-in library replacement is provided in [`scala.util.control.NonLocalReturns`](http://dotty.epfl.ch/api/scala/util/control/NonLocalReturns$.html). Example:
-
-```scala
-import scala.util.control.NonLocalReturns.*
-
-extension [T](xs: List[T])
-   def has(elem: T): Boolean = returning {
-      for x <- xs do
-         if x == elem then throwReturn(true)
-      false
-   }
-
-@main def test(): Unit =
-   val xs = List(1, 2, 3, 4, 5)
-   assert(xs.has(2) == xs.contains(2))
-```
diff --git a/docs/docs/reference/dropped-features/symlits.md b/docs/docs/reference/dropped-features/symlits.md
deleted file mode 100644
index ecb03816b4cd..000000000000
--- a/docs/docs/reference/dropped-features/symlits.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: doc-page
-title: "Dropped: Symbol Literals"
----
-
-Symbol literals are no longer supported.
-
-The `scala.Symbol` class still exists, so a
-literal translation of the symbol literal `'xyz` is `Symbol("xyz")`. However, it is recommended to use a plain string literal `"xyz"` instead. (The `Symbol` class will be deprecated and removed in the future).
diff --git a/docs/docs/reference/dropped-features/this-qualifier.md b/docs/docs/reference/dropped-features/this-qualifier.md
deleted file mode 100644
index 9d7ba7e5ad41..000000000000
--- a/docs/docs/reference/dropped-features/this-qualifier.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: doc-page
-title: "Dropped: private[this] and protected[this]"
----
-
-The `private[this]` and `protected[this]` access modifiers are deprecated and will be phased out.
-
-Previously, these modifiers were needed for
-
- - avoiding the generation of getters and setters
- - excluding code under a `private[this]` from variance checks. (Scala 2 also excludes `protected[this]` but this was found to be unsound and was therefore removed).
-
-The compiler now infers for `private` members the fact that they are only accessed via `this`. Such members are treated as if they had been declared `private[this]`. `protected[this]` is dropped without a replacement.
-
diff --git a/docs/docs/reference/enums/enums.md b/docs/docs/reference/enums/enums.md
deleted file mode 100644
index b65d2f1e89a4..000000000000
--- a/docs/docs/reference/enums/enums.md
+++ /dev/null
@@ -1,193 +0,0 @@
----
-layout: doc-page
-title: "Enumerations"
----
-
-An enumeration is used to define a type consisting of a set of named values.
-
-```scala
-enum Color:
-   case Red, Green, Blue
-```
-
-This defines a new `sealed` class, `Color`, with three values, `Color.Red`,
-`Color.Green`, `Color.Blue`.  The color values are members of `Color`s
-companion object.
-
-### Parameterized enums
-
-Enums can be parameterized.
-
-```scala
-enum Color(val rgb: Int):
-   case Red   extends Color(0xFF0000)
-   case Green extends Color(0x00FF00)
-   case Blue  extends Color(0x0000FF)
-```
-
-As the example shows, you can define the parameter value by using an
-explicit extends clause.
-
-### Methods defined for enums
-
-The values of an enum correspond to unique integers. The integer
-associated with an enum value is returned by its `ordinal` method:
-
-```scala
-scala> val red = Color.Red
-val red: Color = Red
-scala> red.ordinal
-val res0: Int = 0
-```
-
-The companion object of an enum also defines three utility methods.
-The `valueOf` method obtains an enum value
-by its name. The `values` method returns all enum values
-defined in an enumeration in an `Array`. The `fromOrdinal`
-method obtains an enum value from its ordinal (`Int`) value.
-
-```scala
-scala> Color.valueOf("Blue")
-val res0: Color = Blue
-scala> Color.values
-val res1: Array[Color] = Array(Red, Green, Blue)
-scala> Color.fromOrdinal(0)
-val res2: Color = Red
-```
-
-### User-defined members of enums
-
-It is possible to add your own definitions to an enum. Example:
-
-```scala
-enum Planet(mass: Double, radius: Double):
-   private final val G = 6.67300E-11
-   def surfaceGravity = G * mass / (radius * radius)
-   def surfaceWeight(otherMass: Double) = otherMass * surfaceGravity
-
-   case Mercury extends Planet(3.303e+23, 2.4397e6)
-   case Venus   extends Planet(4.869e+24, 6.0518e6)
-   case Earth   extends Planet(5.976e+24, 6.37814e6)
-   case Mars    extends Planet(6.421e+23, 3.3972e6)
-   case Jupiter extends Planet(1.9e+27,   7.1492e7)
-   case Saturn  extends Planet(5.688e+26, 6.0268e7)
-   case Uranus  extends Planet(8.686e+25, 2.5559e7)
-   case Neptune extends Planet(1.024e+26, 2.4746e7)
-end Planet
-```
-
-It is also possible to define an explicit companion object for an enum:
-
-```scala
-object Planet:
-   def main(args: Array[String]) =
-      val earthWeight = args(0).toDouble
-      val mass = earthWeight / Earth.surfaceGravity
-      for p <- values do
-         println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
-end Planet
-```
-
-### Deprecation of Enum Cases
-
-As a library author, you may want to signal that an enum case is no longer intended for use. However you could still want to gracefully handle the removal of a case from your public API, such as special casing deprecated cases.
-
-To illustrate, say that the `Planet` enum originally had an additional case:
-
-```diff
- enum Planet(mass: Double, radius: Double):
-    ...
-    case Neptune extends Planet(1.024e+26, 2.4746e7)
-+   case Pluto   extends Planet(1.309e+22, 1.1883e3)
- end Planet
-```
-
-We now want to deprecate the `Pluto` case. First we add the `scala.deprecated` annotation to `Pluto`:
-
-```diff
- enum Planet(mass: Double, radius: Double):
-    ...
-    case Neptune extends Planet(1.024e+26, 2.4746e7)
--   case Pluto   extends Planet(1.309e+22, 1.1883e3)
-+
-+   @deprecated("refer to IAU definition of planet")
-+   case Pluto extends Planet(1.309e+22, 1.1883e3)
- end Planet
-```
-
-Outside the lexical scopes of `enum Planet` or `object Planet`, references to `Planet.Pluto` will produce a deprecation warning, but within those scopes we can still reference it to implement introspection over the deprecated cases:
-
-```scala
-trait Deprecations[T <: reflect.Enum] {
-   extension (t: T) def isDeprecatedCase: Boolean
-}
-
-object Planet {
-   given Deprecations[Planet] with {
-      extension (p: Planet)
-         def isDeprecatedCase = p == Pluto
-   }
-}
-```
-
-We could imagine that a library may use [type class derivation](../contextual/derivation.md) to automatically provide an instance for `Deprecations`.
-
-### Compatibility with Java Enums
-
-If you want to use the Scala-defined enums as [Java enums](https://docs.oracle.com/javase/tutorial/java/javaOO/enum.html), you can do so by extending
-the class `java.lang.Enum`, which is imported by default, as follows:
-
-```scala
-enum Color extends Enum[Color] { case Red, Green, Blue }
-```
-
-The type parameter comes from the Java enum [definition](https://docs.oracle.com/javase/8/docs/api/index.html?java/lang/Enum.html) and should be the same as the type of the enum.
-There is no need to provide constructor arguments (as defined in the Java API docs) to `java.lang.Enum` when extending it – the compiler will generate them automatically.
-
-After defining `Color` like that, you can use it like you would a Java enum:
-
-```scala
-scala> Color.Red.compareTo(Color.Green)
-val res15: Int = -1
-```
-
-For a more in-depth example of using Scala 3 enums from Java, see [this test](https://github.com/lampepfl/dotty/tree/master/tests/run/enum-java). In the test, the enums are defined in the `MainScala.scala` file and used from a Java source, `Test.java`.
-
-### Implementation
-
-Enums are represented as `sealed` classes that extend the `scala.reflect.Enum` trait.
-This trait defines a single public method, `ordinal`:
-
-```scala
-package scala.reflect
-
-/** A base trait of all Scala enum definitions */
-transparent trait Enum extends Any, Product, Serializable:
-
-   /** A number uniquely identifying a case of an enum */
-   def ordinal: Int
-```
-
-Enum values with `extends` clauses get expanded to anonymous class instances.
-For instance, the `Venus` value above would be defined like this:
-
-```scala
-val Venus: Planet = new Planet(4.869E24, 6051800.0):
-   def ordinal: Int = 1
-   override def productPrefix: String = "Venus"
-   override def toString: String = "Venus"
-```
-
-Enum values without `extends` clauses all share a single implementation
-that can be instantiated using a private method that takes a tag and a name as arguments.
-For instance, the first
-definition of value `Color.Red` above would expand to:
-
-```scala
-val Red: Color = $new(0, "Red")
-```
-
-### Reference
-
-For more information, see [Issue #1970](https://github.com/lampepfl/dotty/issues/1970) and
-[PR #4003](https://github.com/lampepfl/dotty/pull/4003).
diff --git a/docs/docs/reference/experimental/canthrow.md b/docs/docs/reference/experimental/canthrow.md
deleted file mode 100644
index 261e4b3edd3e..000000000000
--- a/docs/docs/reference/experimental/canthrow.md
+++ /dev/null
@@ -1,241 +0,0 @@
----
-layout: doc-page
-title: CanThrow Abilities
-author: Martin Odersky
----
-
-This page describes experimental support for exception checking in Scala 3. It is enabled by the language import
-```scala
-import language.experimental.saferExceptions
-```
-The reason for publishing this extension now is to get feedback on its usability. We are working on more advanced type systems that build on the general ideas put forward in the extension. Those type systems have application areas beyond checked exceptions. Exception checking is a useful starting point since exceptions are familiar to all Scala programmers and their current treatment leaves room for improvement.
-
-## Why Exceptions?
-
-Exceptions are an ideal mechanism for error handling in many situations. They serve the intended purpose of propagating error conditions with a minimum of boilerplate. They cause zero overhead for the "happy path", which means they are very efficient as long as errors arise infrequently. Exceptions are also debug friendly, since they produce stack traces that can be inspected at the handler site. So one never has to guess where an erroneous condition originated.
-
-## Why Not Exceptions?
-
-However, exceptions in current Scala and many other languages are not reflected in the type system. This means that an essential part of the contract of a function - i.e. what exceptions can it produce? - is not statically checked. Most people acknowledge that this is a problem, but that so far the alternative of checked exceptions was just too painful to be considered. A good example are Java checked exceptions, which do the right thing in principle, but are widely regarded as a mistake since they are so difficult to deal with. So far, none of the successor languages that are modeled after Java or that build on the JVM has copied this feature. See for example Anders Hejlsberg's [statement on why C# does not have checked exceptions](https://www.artima.com/articles/the-trouble-with-checked-exceptions).
-
-## The Problem With Java's Checked Exceptions
-
-The main problem with Java's checked exception model is its inflexibility, which is due to lack of polymorphism. Consider for instance the `map` function which is declared on `List[A]` like this:
-```scala
-  def map[B](f: A => B): List[B]
-```
-In the Java model, function `f` is not allowed to throw a checked exception. So the following call would be invalid:
-```scala
-  xs.map(x => if x < limit then x * x else throw LimitExceeded())
-```
-The only way around this would be to wrap the checked exception `LimitExceeded` in an unchecked `RuntimeException` that is caught at the callsite and unwrapped again. Something like this:
-```scala
-  try
-    xs.map(x => if x < limit then x * x else throw Wrapper(LimitExceeded()))
-  catch case Wrapper(ex) => throw ex
-```
-Ugh! No wonder checked exceptions in Java are not very popular.
-
-## Monadic Effects
-
-So the dilemma is that exceptions are easy to use only as long as we forgo static type checking. This has caused many people working with Scala to abandon exceptions altogether and to use an error monad like `Either` instead. This can work in many situations but is not without its downsides either. It makes code a lot more complicated and harder to refactor. It means one is quickly confronted with the problem how to work with several monads. In general, dealing with one monad at a time in Scala is straightforward but dealing with several monads together is much less pleasant since monads don't compose. A great number of techniques have been proposed, implemented, and promoted to deal with this, from monad transformers, to free monads, to tagless final. But none of these techniques is universally liked;  each introduces a complicated DSL that's hard to understand for non-experts, introduces runtime overheads, and makes debugging difficult. In the end, quite a few developers prefer to work instead with a single "super-monad" like ZIO that has error propagation built in alongside other aspects. This one-size fits all approach can work very nicely, even though (or is it because?) it represents an all-encompassing framework.
-
-However, a programming language is not a framework; it has to cater also for those applications that do not fit the framework's use cases. So there's still a strong motivation for getting exception checking right.
-
-## From Effects To Abilities
-
-Why does `map` work so poorly with Java's checked exception model? It's because
-`map`'s signature limits function arguments to not throw checked exceptions. We could try to come up with a more polymorphic formulation of `map`. For instance, it could look like this:
-```scala
-  def map[B, E](f: A => B canThrow E): List[B] canThrow E
-```
-This assumes a type `A canThrow E` to indicate computations of type `A` that can throw an exception of type `E`. But in practice the overhead of the additional type parameters makes this approach unappealing as well. Note in particular that we'd have to parameterize _every method_ that takes a function argument that way, so the added overhead of declaring all these exception types looks just like a sort of ceremony we would like to avoid.
-
-But there is a way to avoid the ceremony. Instead of concentrating on possible _effects_ such as "this code might throw an exception", concentrate on _capabilities_ such as "this code needs the capability to throw an exception". From a standpoint of expressiveness this is quite similar. But capabilities can be expressed as parameters whereas traditionally effects are expressed as some addition to result values. It turns out that this can make a big difference!
-
-Going to the root of the word _capability_, it means "being _able_ to do something", so the "cap" prefix is really just a filler. Following Conor McBride, we will use the name _ability_ from now on.
-
-## The CanThrow Ability
-
-In the _effects as abilities_ model, an effect is expressed as an (implicit) parameter of a certain type. For exceptions we would expect parameters of type
-`CanThrow[E]` where `E` stands for the exception that can be thrown. Here is the definition of `CanThrow`:
-```scala
-erased class CanThrow[-E <: Exception]
-```
-This shows another experimental Scala feature: [erased definitions](./erased-defs). Roughly speaking, values of an erased class do not generate runtime code; they are erased before code generation. This means that all `CanThrow` abilities are compile-time only artifacts; they do not have a runtime footprint.
-
-Now, if the compiler sees a `throw Exc()` construct where `Exc` is a checked exception, it will check that there is an ability of type `CanThrow[Exc]` that can be summoned as a given. It's a compile-time error if that's not the case.
-
-How can the ability be produced? There are several possibilities:
-
-Most often, the ability is produced by having a using clause `(using CanThrow[Exc])` in some enclosing scope. This roughly corresponds to a `throws` clause
-in Java. The analogy is even stronger since alongside `CanThrow` there is also the following type alias defined in the `scala` package:
-```scala
-infix type canThrow[R, +E <: Exception] = CanThrow[E] ?=> R
-```
-That is, `R canThrow E` is a context function type that takes an implicit `CanThrow[E]` parameter and that returns a value of type `R`. Therefore, a method written like this:
-```scala
-def m(x: T)(using CanThrow[E]): U
-```
-can alternatively be expressed like this:
-```scala
-def m(x: T): U canThrow E
-```
-_Aside_: If we rename `canThrow` to `throws` we would have a perfect analogy with Java but unfortunately `throws` is already taken in Scala 2.13.
-
-The `CanThrow`/`canThrow` combo essentially propagates the `CanThrow` requirement outwards. But where are these abilities created in the first place? That's in the `try` expression. Given a `try` like this:
-
-```scala
-try
-  body
-catch
-  case ex1: Ex1 => handler1
-  ...
-  case exN: ExN => handlerN
-```
-the compiler generates abilities for `CanThrow[Ex1]`, ..., `CanThrow[ExN]` that are in scope as givens in `body`. It does this by augmenting the `try` roughly as follows:
-```scala
-try
-  erased given CanThrow[Ex1] = ???
-  ...
-  erased given CanThrow[ExN] = ???
-  body
-catch ...
-```
-Note that the right-hand side of all givens is `???` (undefined). This is OK since
-these givens are erased; they will not be executed at runtime.
-
-## An Example
-
-That's it. Let's see it in action in an example. First, add an import
-```scala
-import language.experimental.saferExceptions
-```
-to enable exception checking. Now, define an exception `LimitExceeded` and
-a function `f` like this:
-```scala
-val limit = 10e9
-class LimitExceeded extends Exception
-def f(x: Double): Double =
-  if x < limit then x * x else throw LimitExceeded()
-```
-You'll get this error message:
-```
-9 |  if x < limit then x * x else throw LimitExceeded()
-  |                               ^^^^^^^^^^^^^^^^^^^^^
-  |The ability to throw exception LimitExceeded is missing.
-  |The ability can be provided by one of the following:
-  | - A using clause `(using CanThrow[LimitExceeded])`
-  | - A `canThrow` clause in a result type such as `X canThrow LimitExceeded`
-  | - an enclosing `try` that catches LimitExceeded
-  |
-  |The following import might fix the problem:
-  |
-  |  import unsafeExceptions.canThrowAny
-```
-As the error message implies, you have to declare that `f` needs the ability to throw a `LimitExceeded` exception. The most concise way to do so is to add a `canThrow` clause:
-```scala
-def f(x: Double): Double canThrow LimitExceeded =
-  if x < limit then x * x else throw LimitExceeded()
-```
-Now put a call to `f` in a `try` that catches `LimitExceeded`:
-```scala
-@main def test(xs: Double*) =
-  try println(xs.map(f).sum)
-  catch case ex: LimitExceeded => println("too large")
-```
-Run the program with some inputs:
-```
-> scala test 1 2 3
-14.0
-> scala test
-0.0
-> scala test 1 2 3 100000000000
-too large
-```
-Everything typechecks and works as expected. But wait - we have called `map` without any ceremony! How did that work? Here's how the compiler expands the `test` function:
-```scala
-// compiler-generated code
-@main def test(xs: Double*) =
-  try
-    erased given ctl: CanThrow[LimitExceeded] = ???
-    println(xs.map(x => f(x)(using ctl)).sum)
-  catch case ex: LimitExceeded => println("too large")
-```
-The `CanThrow[LimitExceeded]` ability is passed in a synthesized `using` clause to `f`, since `f` requires it. Then the resulting closure is passed to `map`. The signature of `map` does not have to account for effects. It takes a closure as always, but that
-closure may refer to abilities in its free variables. This means that `map` is
-already effect polymorphic even though we did not change its signature at all.
-So the takeaway is that the effects as abilities model naturally provides for effect polymorphism whereas this is something that other approaches struggle with.
-
-## Gradual Typing Via Imports
-
-Another advantage is that the model allows a gradual migration from current unchecked exceptions to safer exceptions. Imagine for a moment that `experimental.saferExceptions` is turned on everywhere. There would be lots of code that breaks since functions have not yet been properly annotated with `canThrow`. But it's easy to create an escape hatch that lets us ignore the breakages for a while: simply add the import
-```scala
-import scala.unsafeExceptions.canThrowAny
-```
-This will provide the `CanThrow` ability for any exception, and thereby allow
-all throws and all other calls, no matter what the current state of `canThrow` declarations is. Here's the
-definition of `canThrowAny`:
-```scala
-package scala
-object unsafeExceptions:
-  given canThrowAny: CanThrow[Exception] = ???
-```
-Of course, defining a global ability like this amounts to cheating. But the cheating is useful for gradual typing. The import could be used to migrate existing code, or to
-enable more fluid explorations of code without regard for complete exception safety. At the end of these migrations or explorations the import should be removed.
-
-## Scope Of the Extension
-
-To summarize, the extension for safer exception checking consists of the following elements:
-
- - It adds to the standard library the class `scala.CanThrow`, the type `scala.canThrow`, and the `scala.unsafeExceptions` object, as they were described above.
- - It augments the type checking of `throw` by _demanding_ a `CanThrow` ability or the thrown exception.
- - It augments the type checking of `try` by _providing_ `CanThrow` abilities for every caught exception.
-
-That's all. It's quite remarkable that one can do exception checking in this way without any special additions to the type system. We just need regular givens and context functions. Any runtime overhead is eliminated using `erased`.
-
-## Caveats
-
-Our ability model allows to declare and check the thrown exceptions of first-order code. But as it stands, it does not give us enough mechanism to enforce the _absence_ of
-abilities for arguments to higher-order functions. Consider a variant `pureMap`
-of `map` that should enforce that its argument does not throw exceptions or have any other effects (maybe because wants to reorder computations transparently). Right now
-we cannot enforce that since the function argument to `pureMap` can capture arbitrary
-abilities in its free variables without them showing up in its type. One possible way to
-address this would be to introduce a pure function type (maybe written `A -> B`). Pure functions are not allowed to close over abilities. Then `pureMap` could be written
-like this:
-```
-  def pureMap(f: A -> B): List[B]
-```
-Another area where the lack of purity requirements shows up is when abilities escape from bounded scopes. Consider the following function
-```scala
-def escaped(xs: Double*): () => Int =
-  try () => xs.map(f).sum
-  catch case ex: LimitExceeded => -1
-```
-With the system presented here, this function typechecks, with expansion
-```scala
-// compiler-generated code
-def escaped(xs: Double*): () => Int =
-  try
-    given ctl: CanThrow[LimitExceeded] = ???
-    () => xs.map(x => f(x)(using ctl)).sum
-  catch case ex: LimitExceeded => -1
-```
-But if you try to call `escaped` like this
-```scala
-val g = escaped(1, 2, 1000000000)
-g()
-```
-the result will be a `LimitExceeded` exception thrown at the second line where `g` is called. What's missing is that `try` should enforce that the abilities it generates do not escape as free variables in the result of its body. It makes sense to describe such scoped effects as _ephemeral abilities_ - they have lifetimes that cannot be extended to delayed code in a lambda.
-
-
-# Outlook
-
-We are working on a new class of type system that supports ephemeral abilities by tracking the free variables of values. Once that research matures, it will hopefully be possible to augment the language so that we can enforce the missing properties.
-
-And it would have many other applications besides: Exceptions are a special case of _algebraic effects_, which has been a very active research area over the last 20 years and is finding its way into programming languages (e.g. Koka, Eff, Multicore OCaml, Unison). In fact, algebraic effects have been characterized as being equivalent to exceptions with an additional _resume_ operation. The techniques developed here for exceptions can probably be generalized to other classes of algebraic effects.
-
-But even without these additional mechanisms, exception checking is already useful as it is. It gives a clear path forward to make code that uses exceptions safer, better documented, and easier to refactor. The only loophole arises for scoped abilities - here we have to verify manually that these abilities do not escape. Specifically, a `try` always has to be placed in the same computation stage as the throws that it enables.
-
-Put another way: If the status quo is 0% static checking since 100% is too painful, then an alternative that gives you 95% static checking with great ergonomics looks like a win. And we might still get to 100% in the future.
-
diff --git a/docs/docs/reference/metaprogramming/inline.md b/docs/docs/reference/metaprogramming/inline.md
deleted file mode 100644
index d5b1ce680bb9..000000000000
--- a/docs/docs/reference/metaprogramming/inline.md
+++ /dev/null
@@ -1,645 +0,0 @@
----
-layout: doc-page
-title: Inline
----
-
-## Inline Definitions
-
-`inline` is a new [soft modifier](../soft-modifier.md) that guarantees that a
-definition will be inlined at the point of use. Example:
-
-```scala
-object Config:
-   inline val logging = false
-
-object Logger:
-
-   private var indent = 0
-
-   inline def log[T](msg: String, indentMargin: =>Int)(op: => T): T =
-      if Config.logging then
-         println(s"${"  " * indent}start $msg")
-         indent += indentMargin
-         val result = op
-         indent -= indentMargin
-         println(s"${"  " * indent}$msg = $result")
-         result
-      else op
-end Logger
-```
-
-The `Config` object contains a definition of the **inline value** `logging`.
-This means that `logging` is treated as a _constant value_, equivalent to its
-right-hand side `false`. The right-hand side of such an `inline val` must itself
-be a [constant expression](https://scala-lang.org/files/archive/spec/2.13/06-expressions.html#constant-expressions).
-Used in this way, `inline` is equivalent to Java and Scala 2's `final`. Note that `final`, meaning
-_inlined constant_, is still supported in Scala 3, but will be phased out.
-
-The `Logger` object contains a definition of the **inline method** `log`. This
-method will always be inlined at the point of call.
-
-In the inlined code, an `if-then-else` with a constant condition will be rewritten
-to its `then`- or `else`-part. Consequently, in the `log` method above the
-`if Config.logging` with `Config.logging == true` will get rewritten into its
-`then`-part.
-
-Here's an example:
-
-```scala
-var indentSetting = 2
-
-def factorial(n: BigInt): BigInt =
-   log(s"factorial($n)", indentSetting) {
-      if n == 0 then 1
-      else n * factorial(n - 1)
-   }
-```
-
-If `Config.logging == false`, this will be rewritten (simplified) to:
-
-```scala
-def factorial(n: BigInt): BigInt =
-   if n == 0 then 1
-   else n * factorial(n - 1)
-```
-
-As you notice, since neither `msg` or `indentMargin` were used, they do not
-appear in the generated code for `factorial`. Also note the body of our `log`
-method: the `else-` part reduces to just an `op`. In the generated code we do
-not generate any closures because we only refer to a by-name parameter *once*.
-Consequently, the code was inlined directly and the call was beta-reduced.
-
-In the `true` case the code will be rewritten to:
-
-```scala
-def factorial(n: BigInt): BigInt =
-   val msg = s"factorial($n)"
-   println(s"${"  " * indent}start $msg")
-   Logger.inline$indent_=(indent.+(indentSetting))
-   val result =
-      if n == 0 then 1
-      else n * factorial(n - 1)
-   Logger.inline$indent_=(indent.-(indentSetting))
-   println(s"${"  " * indent}$msg = $result")
-   result
-```
-
-Note that the by-value parameter `msg` is evaluated only once, per the usual Scala
-semantics, by binding the value and reusing the `msg` through the body of
-`factorial`. Also, note the special handling of the assignment to the private var
-`indent`. It is achieved by generating a setter method `def inline$indent_=` and calling it instead.
-
-### Recursive Inline Methods
-
-Inline methods can be recursive. For instance, when called with a constant
-exponent `n`, the following method for `power` will be implemented by
-straight inline code without any loop or recursion.
-
-```scala
-inline def power(x: Double, n: Int): Double =
-   if n == 0 then 1.0
-   else if n == 1 then x
-   else
-      val y = power(x, n / 2)
-      if n % 2 == 0 then y * y else y * y * x
-
-power(expr, 10)
-// translates to
-//
-//    val x = expr
-//    val y1 = x * x   // ^2
-//    val y2 = y1 * y1 // ^4
-//    val y3 = y2 * x  // ^5
-//    y3 * y3          // ^10
-```
-
-Parameters of inline methods can have an `inline` modifier as well. This means
-that actual arguments to these parameters will be inlined in the body of the
-`inline def`. `inline` parameters have call semantics equivalent to by-name parameters
-but allow for duplication of the code in the argument. It is usually useful when constant
-values need to be propagated to allow further optimizations/reductions.
-
-The following example shows the difference in translation between by-value, by-name and `inline`
-parameters:
-
-```scala
-inline def funkyAssertEquals(actual: Double, expected: =>Double, inline delta: Double): Unit =
-   if (actual - expected).abs > delta then
-      throw new AssertionError(s"difference between ${expected} and ${actual} was larger than ${delta}")
-
-funkyAssertEquals(computeActual(), computeExpected(), computeDelta())
-// translates to
-//
-//    val actual = computeActual()
-//    def expected = computeExpected()
-//    if (actual - expected).abs > computeDelta() then
-//      throw new AssertionError(s"difference between ${expected} and ${actual} was larger than ${computeDelta()}")
-```
-
-### Rules for Overriding
-
-Inline methods can override other non-inline methods. The rules are as follows:
-
-1. If an inline method `f` implements or overrides another, non-inline method, the inline method can also be invoked at runtime. For instance, consider the scenario:
-
-    ```scala
-    abstract class A:
-       def f: Int
-       def g: Int = f
-
-    class B extends A:
-       inline def f = 22
-       override inline def g = f + 11
-
-    val b = new B
-    val a: A = b
-    // inlined invocatons
-    assert(b.f == 22)
-    assert(b.g == 33)
-    // dynamic invocations
-    assert(a.f == 22)
-    assert(a.g == 33)
-    ```
-
-    The inlined invocations and the dynamically dispatched invocations give the same results.
-
-2. Inline methods are effectively final.
-
-3. Inline methods can also be abstract. An abstract inline method can be implemented only by other inline methods. It cannot be invoked directly:
-
-    ```scala
-    abstract class A:
-       inline def f: Int
-
-    object B extends A:
-       inline def f: Int = 22
-
-    B.f         // OK
-    val a: A = B
-    a.f         // error: cannot inline f in A.
-    ```
-
-### Relationship to `@inline`
-
-Scala 2 also defines a `@inline` annotation which is used as a hint for the
-backend to inline code. The `inline` modifier is a more powerful option:
-
-- expansion is guaranteed instead of best effort,
-- expansion happens in the frontend instead of in the backend and
-- expansion also applies to recursive methods.
-
-<!--- (Commented out since the docs and implementation differ)
-
-### Evaluation Rules
-
-As you noticed by the examples above a lambda of the form
-
-`((x_1, ..., x_n) => B)(E_1, ..., E_n)` is rewritten to:
-
-```
-{ val/def x_1 = E_1
-  ...
-  val/def x_n = E_n
-  B
-}
-```
-
-where vals are used for value parameter bindings and defs are used for by-name
-parameter bindings. If an argument `E_i` is a simple variable reference `y`, the
-corresponding binding is omitted and `y` is used instead of `x_i` in `B`.
-
-If a `inline` modifier is given for parameters, corresponding arguments must be
-pure expressions of constant type.
--->
-
-#### The definition of constant expression
-
-Right-hand sides of inline values and of arguments for inline parameters must be
-constant expressions in the sense defined by the [SLS §6.24](https://www.scala-lang.org/files/archive/spec/2.13/06-expressions.html#constant-expressions),
-including _platform-specific_ extensions such as constant folding of pure
-numeric computations.
-
-An inline value must have a literal type such as `1` or `true`.
-
-```scala
-inline val four = 4
-// equivalent to
-inline val four: 4 = 4
-```
-
-It is also possible to have inline vals of types that do not have a syntax, such as `Short(4)`.
-
-```scala
-trait InlineConstants:
-   inline val myShort: Short
-
-object Constants extends InlineConstants:
-   inline val myShort/*: Short(4)*/ = 4
-```
-
-## Transparent Inline Methods
-
-Inline methods can additionally be declared `transparent`.
-This means that the return type of the inline method can be
-specialized to a more precise type upon expansion. Example:
-
-```scala
-class A
-class B extends A:
-   def m = true
-
-transparent inline def choose(b: Boolean): A =
-   if b then new A else new B
-
-val obj1 = choose(true)  // static type is A
-val obj2 = choose(false) // static type is B
-
-// obj1.m // compile-time error: `m` is not defined on `A`
-obj2.m    // OK
-```
-
-Here, the inline method `choose` returns an instance of either of the two types `A` or `B`.
-If `choose` had not been declared to be `transparent`, the result
-of its expansion would always be of type `A`, even though the computed value might be of the subtype `B`.
-The inline method is a "blackbox" in the sense that details of its implementation do not leak out.
-But if a `transparent` modifier is given, the expansion is the type of the expanded body. If the argument `b`
-is `true`, that type is `A`, otherwise it is `B`. Consequently, calling `m` on `obj2`
-type-checks since `obj2` has the same type as the expansion of `choose(false)`, which is `B`.
-Transparent inline methods are "whitebox" in the sense that the type
-of an application of such a method can be more specialized than its declared
-return type, depending on how the method expands.
-
-In the following example, we see how the return type of `zero` is specialized to
-the singleton type `0` permitting the addition to be ascribed with the correct
-type `1`.
-
-```scala
-transparent inline def zero: Int = 0
-
-val one: 1 = zero + 1
-```
-
-### Transparent vs. non-transparent inline
-
-As we already discussed, transparent inline methods may influence type checking at call site.
-Technically this implies that transparent inline methods must be expanded during type checking of the program.
-Other inline methods are inlined later after the program is fully typed.
-
-For example, the following two functions will be typed the same way but will be inlined at different times.
-
-```scala
-inline def f1: T = ...
-transparent inline def f2: T = (...): T
-```
-
-A noteworthy difference is the behavior of `transparent inline given`.
-If there is an error reported when inlining that definition, it will be considered as an implicit search mismatch and the search will continue.
-A `transparent inline given` can add a type ascription in its RHS (as in `f2` from the previous example) to avoid the precise type but keep the search behavior.
-On the other hand, an `inline given` is taken as an implicit and then inlined after typing.
-Any error will be emitted as usual.
-
-## Inline Conditionals
-
-An if-then-else expression whose condition is a constant expression can be simplified to
-the selected branch. Prefixing an if-then-else expression with `inline` enforces that
-the condition has to be a constant expression, and thus guarantees that the conditional will always
-simplify.
-
-Example:
-
-```scala
-inline def update(delta: Int) =
-   inline if delta >= 0 then increaseBy(delta)
-   else decreaseBy(-delta)
-```
-
-A call `update(22)` would rewrite to `increaseBy(22)`. But if `update` was called with
-a value that was not a compile-time constant, we would get a compile time error like the one
-below:
-
-```scala
-   |  inline if delta >= 0 then ???
-   |  ^
-   |  cannot reduce inline if
-   |   its condition
-   |     delta >= 0
-   |   is not a constant value
-   | This location is in code that was inlined at ...
-```
-
-In a transparent inline, an `inline if` will force the inlining of any inline definition in its condition during type checking.
-
-## Inline Matches
-
-A `match` expression in the body of an `inline` method definition may be
-prefixed by the `inline` modifier. If there is enough static information to
-unambiguously take a branch, the expression is reduced to that branch and the
-type of the result is taken. If not, a compile-time error is raised that
-reports that the match cannot be reduced.
-
-The example below defines an inline method with a
-single inline match expression that picks a case based on its static type:
-
-```scala
-transparent inline def g(x: Any): Any =
-   inline x match
-      case x: String => (x, x) // Tuple2[String, String](x, x)
-      case x: Double => x
-
-g(1.0d) // Has type 1.0d which is a subtype of Double
-g("test") // Has type (String, String)
-```
-
-The scrutinee `x` is examined statically and the inline match is reduced
-accordingly returning the corresponding value (with the type specialized because `g` is declared `transparent`). This example performs a simple type test over the
-scrutinee. The type can have a richer structure like the simple ADT below.
-`toInt` matches the structure of a number in [Church-encoding](https://en.wikipedia.org/wiki/Church_encoding)
-and _computes_ the corresponding integer.
-
-```scala
-trait Nat
-case object Zero extends Nat
-case class Succ[N <: Nat](n: N) extends Nat
-
-transparent inline def toInt(n: Nat): Int =
-   inline n match
-      case Zero     => 0
-      case Succ(n1) => toInt(n1) + 1
-
-inline val natTwo = toInt(Succ(Succ(Zero)))
-val intTwo: 2 = natTwo
-```
-
-`natTwo` is inferred to have the singleton type 2.
-
-## The `scala.compiletime` Package
-
-The [`scala.compiletime`](https://dotty.epfl.ch/api/scala/compiletime.html) package contains helper definitions that provide support for compile time operations over values. They are described in the following.
-
-### `constValue` and `constValueOpt`
-
-`constValue` is a function that produces the constant value represented by a
-type.
-
-```scala
-import scala.compiletime.constValue
-import scala.compiletime.ops.int.S
-
-transparent inline def toIntC[N]: Int =
-   inline constValue[N] match
-      case 0        => 0
-      case _: S[n1] => 1 + toIntC[n1]
-
-inline val ctwo = toIntC[2]
-```
-
-`constValueOpt` is the same as `constValue`, however returning an `Option[T]`
-enabling us to handle situations where a value is not present. Note that `S` is
-the type of the successor of some singleton type. For example the type `S[1]` is
-the singleton type `2`.
-
-### `erasedValue`
-
-So far we have seen inline methods that take terms (tuples and integers) as
-parameters. What if we want to base case distinctions on types instead? For
-instance, one would like to be able to write a function `defaultValue`, that,
-given a type `T`, returns optionally the default value of `T`, if it exists.
-We can already express this using rewrite match expressions and a simple
-helper function, `scala.compiletime.erasedValue`, which is defined as follows:
-
-```scala
-def erasedValue[T]: T
-```
-
-The `erasedValue` function _pretends_ to return a value of its type argument `T`.
-Calling this function will always result in a compiletime error unless the call
-is removed from the code while inlining.
-
-Using `erasedValue`, we can then define `defaultValue` as follows:
-
-```scala
-import scala.compiletime.erasedValue
-
-inline def defaultValue[T] =
-   inline erasedValue[T] match
-      case _: Byte    => Some(0: Byte)
-      case _: Char    => Some(0: Char)
-      case _: Short   => Some(0: Short)
-      case _: Int     => Some(0)
-      case _: Long    => Some(0L)
-      case _: Float   => Some(0.0f)
-      case _: Double  => Some(0.0d)
-      case _: Boolean => Some(false)
-      case _: Unit    => Some(())
-      case _          => None
-```
-
-Then:
-
-```scala
-val dInt: Some[Int] = defaultValue[Int]
-val dDouble: Some[Double] = defaultValue[Double]
-val dBoolean: Some[Boolean] = defaultValue[Boolean]
-val dAny: None.type = defaultValue[Any]
-```
-
-As another example, consider the type-level version of `toInt` below:
-given a _type_ representing a Peano number,
-return the integer _value_ corresponding to it.
-Consider the definitions of numbers as in the _Inline
-Match_ section above. Here is how `toIntT` can be defined:
-
-```scala
-transparent inline def toIntT[N <: Nat]: Int =
-   inline scala.compiletime.erasedValue[N] match
-      case _: Zero.type => 0
-      case _: Succ[n] => toIntT[n] + 1
-
-inline val two = toIntT[Succ[Succ[Zero.type]]]
-```
-
-`erasedValue` is an `erased` method so it cannot be used and has no runtime
-behavior. Since `toIntT` performs static checks over the static type of `N` we
-can safely use it to scrutinize its return type (`S[S[Z]]` in this case).
-
-### `error`
-
-The `error` method is used to produce user-defined compile errors during inline expansion.
-It has the following signature:
-
-```scala
-inline def error(inline msg: String): Nothing
-```
-
-If an inline expansion results in a call `error(msgStr)` the compiler
-produces an error message containing the given `msgStr`.
-
-```scala
-import scala.compiletime.{error, code}
-
-inline def fail() =
-   error("failed for a reason")
-
-fail() // error: failed for a reason
-```
-
-or
-
-```scala
-inline def fail(p1: => Any) =
-   error(code"failed on: $p1")
-
-fail(identity("foo")) // error: failed on: identity("foo")
-```
-
-### The `scala.compiletime.ops` package
-
-The [`scala.compiletime.ops`](https://dotty.epfl.ch/api/scala/compiletime/ops.html) package contains types that provide support for
-primitive operations on singleton types. For example,
-`scala.compiletime.ops.int.*` provides support for multiplying two singleton
-`Int` types, and `scala.compiletime.ops.boolean.&&` for the conjunction of two
-`Boolean` types. When all arguments to a type in `scala.compiletime.ops` are
-singleton types, the compiler can evaluate the result of the operation.
-
-```scala
-import scala.compiletime.ops.int.*
-import scala.compiletime.ops.boolean.*
-
-val conjunction: true && true = true
-val multiplication: 3 * 5 = 15
-```
-
-Many of these singleton operation types are meant to be used infix (as in [SLS §3.2.10](https://www.scala-lang.org/files/archive/spec/2.13/03-types.html#infix-types)).
-
-Since type aliases have the same precedence rules as their term-level
-equivalents, the operations compose with the expected precedence rules:
-
-```scala
-import scala.compiletime.ops.int.*
-val x: 1 + 2 * 3 = 7
-```
-
-The operation types are located in packages named after the type of the
-left-hand side parameter: for instance, `scala.compiletime.ops.int.+` represents
-addition of two numbers, while `scala.compiletime.ops.string.+` represents string
-concatenation. To use both and distinguish the two types from each other, a
-match type can dispatch to the correct implementation:
-
-```scala
-import scala.compiletime.ops.*
-
-import scala.annotation.infix
-
-type +[X <: Int | String, Y <: Int | String] = (X, Y) match
-   case (Int, Int) => int.+[X, Y]
-   case (String, String) => string.+[X, Y]
-
-val concat: "a" + "b" = "ab"
-val addition: 1 + 1 = 2
-```
-
-## Summoning Implicits Selectively
-
-It is foreseen that many areas of typelevel programming can be done with rewrite
-methods instead of implicits. But sometimes implicits are unavoidable. The
-problem so far was that the Prolog-like programming style of implicit search
-becomes viral: Once some construct depends on implicit search it has to be
-written as a logic program itself. Consider for instance the problem of creating
-a `TreeSet[T]` or a `HashSet[T]` depending on whether `T` has an `Ordering` or
-not. We can create a set of implicit definitions like this:
-
-```scala
-trait SetFor[T, S <: Set[T]]
-
-class LowPriority:
-   implicit def hashSetFor[T]: SetFor[T, HashSet[T]] = ...
-
-object SetsFor extends LowPriority:
-   implicit def treeSetFor[T: Ordering]: SetFor[T, TreeSet[T]] = ...
-```
-
-Clearly, this is not pretty. Besides all the usual indirection of implicit
-search, we face the problem of rule prioritization where we have to ensure that
-`treeSetFor` takes priority over `hashSetFor` if the element type has an
-ordering. This is solved (clumsily) by putting `hashSetFor` in a superclass
-`LowPriority` of the object `SetsFor` where `treeSetFor` is defined. Maybe the
-boilerplate would still be acceptable if the crufty code could be contained.
-However, this is not the case. Every user of the abstraction has to be
-parameterized itself with a `SetFor` implicit. Considering the simple task _"I
-want a `TreeSet[T]` if `T` has an ordering and a `HashSet[T]` otherwise"_, this
-seems like a lot of ceremony.
-
-There are some proposals to improve the situation in specific areas, for
-instance by allowing more elaborate schemes to specify priorities. But they all
-keep the viral nature of implicit search programs based on logic programming.
-
-By contrast, the new `summonFrom` construct makes implicit search available
-in a functional context. To solve the problem of creating the right set, one
-would use it as follows:
-
-```scala
-import scala.compiletime.summonFrom
-
-inline def setFor[T]: Set[T] = summonFrom {
-   case ord: Ordering[T] => new TreeSet[T](using ord)
-   case _                => new HashSet[T]
-}
-```
-
-A `summonFrom` call takes a pattern matching closure as argument. All patterns
-in the closure are type ascriptions of the form `identifier : Type`.
-
-Patterns are tried in sequence. The first case with a pattern `x: T` such that an implicit value of type `T` can be summoned is chosen.
-
-Alternatively, one can also use a pattern-bound given instance, which avoids the explicit using clause. For instance, `setFor` could also be formulated as follows:
-
-```scala
-import scala.compiletime.summonFrom
-
-inline def setFor[T]: Set[T] = summonFrom {
-   case given Ordering[T] => new TreeSet[T]
-   case _                 => new HashSet[T]
-}
-```
-
-`summonFrom` applications must be reduced at compile time.
-
-Consequently, if we summon an `Ordering[String]` the code above will return a
-new instance of `TreeSet[String]`.
-
-```scala
-summon[Ordering[String]]
-
-println(setFor[String].getClass) // prints class scala.collection.immutable.TreeSet
-```
-
-**Note** `summonFrom` applications can raise ambiguity errors. Consider the following
-code with two givens in scope of type `A`. The pattern match in `f` will raise
-an ambiguity error of `f` is applied.
-
-```scala
-class A
-given a1: A = new A
-given a2: A = new A
-
-inline def f: Any = summonFrom {
-   case given _: A => ???  // error: ambiguous givens
-}
-```
-
-## `summonInline`
-
-The shorthand `summonInline` provides a simple way to write a `summon` that is delayed until the call is inlined.
-
-```scala
-transparent inline def summonInline[T]: T = summonFrom {
-   case t: T => t
-}
-```
-
-### Reference
-
-For more information about the semantics of `inline`, see the [Scala 2020: Semantics-preserving inlining for metaprogramming](https://dl.acm.org/doi/10.1145/3426426.3428486) paper.
-
-For more information about compiletime operation, see [PR #4768](https://github.com/lampepfl/dotty/pull/4768),
-which explains how `summonFrom`'s predecessor (implicit matches) can be used for typelevel programming and code specialization and [PR #7201](https://github.com/lampepfl/dotty/pull/7201) which explains the new `summonFrom` syntax.
diff --git a/docs/docs/reference/metaprogramming/macros.md b/docs/docs/reference/metaprogramming/macros.md
deleted file mode 100644
index 1791360e5767..000000000000
--- a/docs/docs/reference/metaprogramming/macros.md
+++ /dev/null
@@ -1,817 +0,0 @@
----
-layout: doc-page
-title: "Macros"
----
-
-> When developing macros enable `-Xcheck-macros` scalac option flag to have extra runtime checks.
-
-## Macros: Quotes and Splices
-
-Macros are built on two well-known fundamental operations: quotation and splicing.
-Quotation is expressed as `'{...}` for expressions and splicing is expressed as `${ ... }`.
-Additionally, within a quote or a splice we can quote or splice identifiers directly (i.e. `'e` and `$e`).
-Readers may notice the resemblance of the two aforementioned syntactic
-schemes with the familiar string interpolation syntax.
-
-```scala
-println(s"Hello, $name, here is the result of 1 + 1 = ${1 + 1}")
-```
-
-In string interpolation we _quoted_ a string and then we _spliced_ into it, two others. The first, `name`, is a reference to a value of type [`String`](https://dotty.epfl.ch/api/scala/Predef$.html#String), and the second is an arithmetic expression that will be _evaluated_ followed by the splicing of its string representation.
-
-Quotes and splices in this section allow us to treat code in a similar way,
-effectively supporting macros. The entry point for macros is an inline method
-with a top-level splice. We call it a top-level because it is the only occasion
-where we encounter a splice outside a quote (consider as a quote the
-compilation-unit at the call-site). For example, the code below presents an
-`inline` method `assert` which calls at compile-time a method `assertImpl` with
-a boolean expression tree as argument. `assertImpl` evaluates the expression and
-prints it again in an error message if it evaluates to `false`.
-
-```scala
-import scala.quoted.*
-
-inline def assert(inline expr: Boolean): Unit =
-   ${ assertImpl('expr) }
-
-def assertImpl(expr: Expr[Boolean])(using Quotes) = '{
-   if !$expr then
-      throw AssertionError(s"failed assertion: ${${ showExpr(expr) }}")
-}
-
-def showExpr(expr: Expr[Boolean])(using Quotes): Expr[String] =
-   '{ "<some source code>" } // Better implementation later in this document
-```
-
-If `e` is an expression, then `'{e}` represents the typed
-abstract syntax tree representing `e`. If `T` is a type, then `Type.of[T]`
-represents the type structure representing `T`.  The precise
-definitions of "typed abstract syntax tree" or "type-structure" do not
-matter for now, the terms are used only to give some
-intuition. Conversely, `${e}` evaluates the expression `e`, which must
-yield a typed abstract syntax tree or type structure, and embeds the
-result as an expression (respectively, type) in the enclosing program.
-
-Quotations can have spliced parts in them; in this case the embedded
-splices are evaluated and embedded as part of the formation of the
-quotation.
-
-Quotes and splices can also be applied directly to identifiers. An identifier
-`$x` starting with a `$` that appears inside a quoted expression or type is treated as a
-splice `${x}`. Analogously, an quoted identifier `'x` that appears inside a splice
-is treated as a quote `'{x}`. See the Syntax section below for details.
-
-Quotes and splices are duals of each other.
-For arbitrary expressions `e` we have:
-
-```scala
-${'{e}} = e
-'{${e}} = e
-```
-
-## Types for Quotations
-
-The type signatures of quotes and splices can be described using
-two fundamental types:
-
-- `Expr[T]`: abstract syntax trees representing expressions of type `T`
-- `Type[T]`: non erased representation of type `T`.
-
-Quoting takes expressions of type `T` to expressions of type `Expr[T]`
-and it takes types `T` to expressions of type `Type[T]`. Splicing
-takes expressions of type `Expr[T]` to expressions of type `T` and it
-takes expressions of type `Type[T]` to types `T`.
-
-The two types can be defined in package [`scala.quoted`](https://dotty.epfl.ch/api/scala/quoted.html) as follows:
-
-```scala
-package scala.quoted
-
-sealed trait Expr[+T]
-sealed trait Type[T]
-```
-
-Both `Expr` and `Type` are abstract and sealed, so all constructors for
-these types are provided by the system. One way to construct values of
-these types is by quoting, the other is by type-specific lifting
-operations that will be discussed later on.
-
-## The Phase Consistency Principle
-
-A fundamental *phase consistency principle* (PCP) regulates accesses
-to free variables in quoted and spliced code:
-
-- _For any free variable reference `x`, the number of quoted scopes and the number of spliced scopes between the reference to `x` and the definition of `x` must be equal_.
-
-Here, `this`-references count as free variables. On the other
-hand, we assume that all imports are fully expanded and that `_root_` is
-not a free variable. So references to global definitions are
-allowed everywhere.
-
-The phase consistency principle can be motivated as follows: First,
-suppose the result of a program `P` is some quoted text `'{ ... x
-... }` that refers to a free variable `x` in `P`. This can be
-represented only by referring to the original variable `x`. Hence, the
-result of the program will need to persist the program state itself as
-one of its parts. We don’t want to do this, hence this situation
-should be made illegal. Dually, suppose a top-level part of a program
-is a spliced text `${ ... x ... }` that refers to a free variable `x`
-in `P`.  This would mean that we refer during _construction_ of `P` to
-a value that is available only during _execution_ of `P`. This is of
-course impossible and therefore needs to be ruled out.  Now, the
-small-step evaluation of a program will reduce quotes and splices in
-equal measure using the cancellation rules above. But it will neither
-create nor remove quotes or splices individually. So the PCP ensures
-that program elaboration will lead to neither of the two unwanted
-situations described above.
-
-In what concerns the range of features it covers, this form of macros introduces
-a principled metaprogramming framework that is quite close to the MetaML family of
-languages. One difference is that MetaML does not have an equivalent of the PCP -
-quoted code in MetaML _can_ access variables in its immediately enclosing
-environment, with some restrictions and caveats since such accesses involve
-serialization. However, this does not constitute a fundamental gain in
-expressiveness.
-
-## From `Expr`s to Functions and Back
-
-It is possible to convert any `Expr[T => R]` into `Expr[T] => Expr[R]` and back.
-These conversions can be implemented as follows:
-
-```scala
-def to[T: Type, R: Type](f: Expr[T] => Expr[R])(using Quotes): Expr[T => R] =
-   '{ (x: T) => ${ f('x) } }
-
-def from[T: Type, R: Type](f: Expr[T => R])(using Quotes): Expr[T] => Expr[R] =
-   (x: Expr[T]) => '{ $f($x) }
-```
-
-Note how the fundamental phase consistency principle works in two
-different directions here for `f` and `x`.  In the method `to`,  the reference to `f` is
-legal because it is quoted, then spliced, whereas the reference to `x`
-is legal because it is spliced, then quoted.
-
-They can be used as follows:
-
-```scala
-val f1: Expr[Int => String] =
-   to((x: Expr[Int]) => '{ $x.toString }) // '{ (x: Int) => x.toString }
-
-val f2: Expr[Int] => Expr[String] =
-   from('{ (x: Int) => x.toString }) // (x: Expr[Int]) => '{ ((x: Int) => x.toString)($x) }
-f2('{2}) // '{ ((x: Int) => x.toString)(2) }
-```
-
-One limitation of `from` is that it does not β-reduce when a lambda is called immediately, as evidenced in the code `{ ((x: Int) => x.toString)(2) }`.
-In some cases we want to remove the lambda from the code, for this we provide the method `Expr.betaReduce` that turns a tree
-describing a function into a function mapping trees to trees.
-
-```scala
-object Expr:
-   ...
-   def betaReduce[...](...)(...): ... = ...
-```
-
-The definition of `Expr.betaReduce(f)(x)` is assumed to be functionally the same as
-`'{($f)($x)}`, however it should optimize this call by returning the
-result of beta-reducing `f(x)` if `f` is a known lambda expression.
-`Expr.betaReduce` distributes applications of `Expr` over function arrows:
-
-```scala
-Expr.betaReduce(_): Expr[(T1, ..., Tn) => R] => ((Expr[T1], ..., Expr[Tn]) => Expr[R])
-```
-
-## Lifting Types
-
-Types are not directly affected by the phase consistency principle.
-It is possible to use types defined at any level in any other level.
-But, if a type is used in a subsequent stage it will need to be lifted to a `Type`.
-The resulting value of `Type` will be subject to PCP.
-Indeed, the definition of `to` above uses `T` in the next stage, there is a
-quote but no splice between the parameter binding of `T` and its
-usage. But the code can be rewritten by adding a binding of a `Type[T]` tag:
-
-```scala
-def to[T, R](f: Expr[T] => Expr[R])(using Type[T], Type[R], Quotes): Expr[T => R] =
-   '{ (x: T) => ${ f('x) } }
-```
-
-In this version of `to`, the type of `x` is now the result of
-splicing the `Type` value `t`. This operation _is_ splice correct -- there
-is one quote and one splice between the use of `t` and its definition.
-
-To avoid clutter, the Scala implementation tries to convert any type
-reference to a type `T` in subsequent phases to a type-splice, by rewriting `T` to `summon[Type[T]].Underlying`.
-For instance, the user-level definition of `to`:
-
-```scala
-def to[T, R](f: Expr[T] => Expr[R])(using t: Type[T], r: Type[R])(using Quotes): Expr[T => R] =
-   '{ (x: T) => ${ f('x) } }
-```
-
-would be rewritten to
-
-```scala
-def to[T, R](f: Expr[T] => Expr[R])(using t: Type[T], r: Type[R])(using Quotes): Expr[T => R] =
-   '{ (x: t.Underlying) => ${ f('x) } }
-```
-
-The `summon` query succeeds because there is a given instance of
-type `Type[T]` available (namely the given parameter corresponding
-to the context bound `: Type`), and the reference to that value is
-phase-correct. If that was not the case, the phase inconsistency for
-`T` would be reported as an error.
-
-## Lifting Expressions
-
-Consider the following implementation of a staged interpreter that implements
-a compiler through staging.
-
-```scala
-import scala.quoted.*
-
-enum Exp:
-   case Num(n: Int)
-   case Plus(e1: Exp, e2: Exp)
-   case Var(x: String)
-   case Let(x: String, e: Exp, in: Exp)
-
-import Exp.*
-```
-
-The interpreted language consists of numbers `Num`, addition `Plus`, and variables
-`Var` which are bound by `Let`. Here are two sample expressions in the language:
-
-```scala
-val exp = Plus(Plus(Num(2), Var("x")), Num(4))
-val letExp = Let("x", Num(3), exp)
-```
-
-Here’s a compiler that maps an expression given in the interpreted
-language to quoted Scala code of type `Expr[Int]`.
-The compiler takes an environment that maps variable names to Scala `Expr`s.
-
-```scala
-import scala.quoted.*
-
-def compile(e: Exp, env: Map[String, Expr[Int]])(using Quotes): Expr[Int] =
-   e match
-      case Num(n) =>
-         Expr(n)
-      case Plus(e1, e2) =>
-         '{ ${ compile(e1, env) } + ${ compile(e2, env) } }
-      case Var(x) =>
-         env(x)
-      case Let(x, e, body) =>
-         '{ val y = ${ compile(e, env) }; ${ compile(body, env + (x -> 'y)) } }
-```
-
-Running `compile(letExp, Map())` would yield the following Scala code:
-
-```scala
-'{ val y = 3; (2 + y) + 4 }
-```
-
-The body of the first clause, `case Num(n) => Expr(n)`, looks suspicious. `n`
-is declared as an `Int`, yet it is converted to an `Expr[Int]` with `Expr()`.
-Shouldn’t `n` be quoted? In fact this would not
-work since replacing `n` by `'n` in the clause would not be phase
-correct.
-
-The `Expr.apply` method is defined in package `quoted`:
-
-```scala
-package quoted
-
-object Expr:
-   ...
-   def apply[T: ToExpr](x: T)(using Quotes): Expr[T] =
-      summon[ToExpr[T]].toExpr(x)
-```
-
-This method says that values of types implementing the `ToExpr` type class can be
-converted to `Expr` values using `Expr.apply`.
-
-Scala 3 comes with given instances of `ToExpr` for
-several types including `Boolean`, `String`, and all primitive number
-types. For example, `Int` values can be converted to `Expr[Int]`
-values by wrapping the value in a `Literal` tree node. This makes use
-of the underlying tree representation in the compiler for
-efficiency. But the `ToExpr` instances are nevertheless not _magic_
-in the sense that they could all be defined in a user program without
-knowing anything about the representation of `Expr` trees. For
-instance, here is a possible instance of `ToExpr[Boolean]`:
-
-```scala
-given ToExpr[Boolean] with
-   def toExpr(b: Boolean) =
-      if b then '{ true } else '{ false }
-```
-
-Once we can lift bits, we can work our way up. For instance, here is a
-possible implementation of `ToExpr[Int]` that does not use the underlying
-tree machinery:
-
-```scala
-given ToExpr[Int] with
-   def toExpr(n: Int) = n match
-      case Int.MinValue    => '{ Int.MinValue }
-      case _ if n < 0      => '{ - ${ toExpr(-n) } }
-      case 0               => '{ 0 }
-      case _ if n % 2 == 0 => '{ ${ toExpr(n / 2) } * 2 }
-      case _               => '{ ${ toExpr(n / 2) } * 2 + 1 }
-```
-
-Since `ToExpr` is a type class, its instances can be conditional. For example,
-a `List` is liftable if its element type is:
-
-```scala
-given [T: ToExpr : Type]: ToExpr[List[T]] with
-   def toExpr(xs: List[T]) = xs match
-      case head :: tail => '{ ${ Expr(head) } :: ${ toExpr(tail) } }
-      case Nil          => '{ Nil: List[T] }
-```
-
-In the end, `ToExpr` resembles very much a serialization
-framework. Like the latter it can be derived systematically for all
-collections, case classes and enums. Note also that the synthesis
-of _type-tag_ values of type `Type[T]` is essentially the type-level
-analogue of lifting.
-
-Using lifting, we can now give the missing definition of `showExpr` in the introductory example:
-
-```scala
-def showExpr[T](expr: Expr[T])(using Quotes): Expr[String] =
-   val code: String = expr.show
-   Expr(code)
-```
-
-That is, the `showExpr` method converts its `Expr` argument to a string (`code`), and lifts
-the result back to an `Expr[String]` using `Expr.apply`.
-
-## Lifting Types
-
-The previous section has shown that the metaprogramming framework has
-to be able to take a type `T` and convert it to a type tree of type
-`Type[T]` that can be reified. This means that all free variables of
-the type tree refer to types and values defined in the current stage.
-
-For a reference to a global class, this is easy: Just issue the fully
-qualified name of the class. Members of reifiable types are handled by
-just reifying the containing type together with the member name. But
-what to do for references to type parameters or local type definitions
-that are not defined in the current stage? Here, we cannot construct
-the `Type[T]` tree directly, so we need to get it from a recursive
-implicit search. For instance, to implement
-
-```scala
-summon[Type[List[T]]]
-```
-
-where `T` is not defined in the current stage, we construct the type constructor
-of `List` applied to the splice of the result of searching for a given instance for `Type[T]`:
-
-```scala
-Type.of[ List[ summon[Type[T]].Underlying ] ]
-```
-
-This is exactly the algorithm that Scala 2 uses to search for type tags.
-In fact Scala 2's type tag feature can be understood as a more ad-hoc version of
-`quoted.Type`. As was the case for type tags, the implicit search for a `quoted.Type`
-is handled by the compiler, using the algorithm sketched above.
-
-## Relationship with `inline`
-
-Seen by itself, principled metaprogramming looks more like a framework for
-runtime metaprogramming than one for compile-time metaprogramming with macros.
-But combined with Scala 3’s `inline` feature it can be turned into a compile-time
-system. The idea is that macro elaboration can be understood as a combination of
-a macro library and a quoted program. For instance, here’s the `assert` macro
-again together with a program that calls `assert`.
-
-```scala
-object Macros:
-
-   inline def assert(inline expr: Boolean): Unit =
-      ${ assertImpl('expr) }
-
-   def assertImpl(expr: Expr[Boolean])(using Quotes) =
-      val failMsg: Expr[String] = Expr("failed assertion: " + expr.show)
-      '{ if !($expr) then throw new AssertionError($failMsg) }
-
-@main def program =
-   val x = 1
-   Macros.assert(x != 0)
-```
-
-Inlining the `assert` function would give the following program:
-
-```scala
-@main def program =
-   val x = 1
-   ${ Macros.assertImpl('{ x != 0) } }
-```
-
-The example is only phase correct because `Macros` is a global value and
-as such not subject to phase consistency checking. Conceptually that’s
-a bit unsatisfactory. If the PCP is so fundamental, it should be
-applicable without the global value exception. But in the example as
-given this does not hold since both `assert` and `program` call
-`assertImpl` with a splice but no quote.
-
-However, one could argue that the example is really missing
-an important aspect: The macro library has to be compiled in a phase
-prior to the program using it, but in the code above, macro
-and program are defined together. A more accurate view of
-macros would be to have the user program be in a phase after the macro
-definitions, reflecting the fact that macros have to be defined and
-compiled before they are used. Hence, conceptually the program part
-should be treated by the compiler as if it was quoted:
-
-```scala
-@main def program = '{
-   val x = 1
-   ${ Macros.assertImpl('{ x != 0 }) }
-}
-```
-
-If `program` is treated as a quoted expression, the call to
-`Macro.assertImpl` becomes phase correct even if macro library and
-program are conceptualized as local definitions.
-
-But what about the call from `assert` to `assertImpl`? Here, we need a
-tweak of the typing rules. An inline function such as `assert` that
-contains a splice operation outside an enclosing quote is called a
-_macro_. Macros are supposed to be expanded in a subsequent phase,
-i.e. in a quoted context. Therefore, they are also type checked as if
-they were in a quoted context. For instance, the definition of
-`assert` is typechecked as if it appeared inside quotes.  This makes
-the call from `assert` to `assertImpl` phase-correct, even if we
-assume that both definitions are local.
-
-The `inline` modifier is used to declare a `val` that is
-either a constant or is a parameter that will be a constant when instantiated. This
-aspect is also important for macro expansion.
-
-To get values out of expressions containing constants `Expr` provides the method
-`value` (or `valueOrError`). This will convert the `Expr[T]` into a `Some[T]` (or `T`) when the
-expression contains value. Otherwise it will retrun `None` (or emit an error).
-To avoid having incidental val bindings generated by the inlining of the `def`
-it is recommended to use an inline parameter. To illustrate this, consider an
-implementation of the `power` function that makes use of a statically known exponent:
-
-```scala
-inline def power(x: Double, inline n: Int) = ${ powerCode('x, 'n) }
-
-private def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] =
-   n.value match
-      case Some(m) => powerCode(x, m)
-      case None => '{ Math.pow($x, $n.toDouble) }
-
-private def powerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] =
-   if n == 0 then '{ 1.0 }
-   else if n == 1 then x
-   else if n % 2 == 0 then '{ val y = $x * $x; ${ powerCode('y, n / 2) } }
-   else '{ $x * ${ powerCode(x, n - 1) } }
-```
-
-## Scope Extrusion
-
-Quotes and splices are duals as far as the PCP is concerned. But there is an
-additional restriction that needs to be imposed on splices to guarantee
-soundness: code in splices must be free of side effects. The restriction
-prevents code like this:
-
-```scala
-var x: Expr[T] = ...
-'{ (y: T) => ${ x = 'y; 1 } }
-```
-
-This code, if it was accepted, would _extrude_ a reference to a quoted variable
-`y` from its scope. This would subsequently allow access to a variable outside the
-scope where it is defined, which is likely problematic. The code is clearly
-phase consistent, so we cannot use PCP to rule it out. Instead, we postulate a
-future effect system that can guarantee that splices are pure. In the absence of
-such a system we simply demand that spliced expressions are pure by convention,
-and allow for undefined compiler behavior if they are not. This is analogous to
-the status of pattern guards in Scala, which are also required, but not
-verified, to be pure.
-
-[Multi-Stage Programming](./staging.md) introduces one additional method where
-you can expand code at runtime with a method `run`. There is also a problem with
-that invocation of `run` in splices. Consider the following expression:
-
-```scala
-'{ (x: Int) => ${ run('x); 1 } }
-```
-
-This is again phase correct, but will lead us into trouble. Indeed, evaluating
-the splice will reduce the expression `run('x)` to `x`. But then the result
-
-```scala
-'{ (x: Int) => ${ x; 1 } }
-```
-
-is no longer phase correct. To prevent this soundness hole it seems easiest to
-classify `run` as a side-effecting operation. It would thus be prevented from
-appearing in splices. In a base language with side effects we would have to do this
-anyway: Since `run` runs arbitrary code it can always produce a side effect if
-the code it runs produces one.
-
-## Example Expansion
-
-Assume we have two methods, one `map` that takes an `Expr[Array[T]]` and a
-function `f` and one `sum` that performs a sum by delegating to `map`.
-
-```scala
-object Macros:
-
-   def map[T](arr: Expr[Array[T]], f: Expr[T] => Expr[Unit])
-             (using Type[T], Quotes): Expr[Unit] = '{
-      var i: Int = 0
-      while i < ($arr).length do
-         val element: T = ($arr)(i)
-         ${f('element)}
-         i += 1
-   }
-
-   def sum(arr: Expr[Array[Int]])(using Quotes): Expr[Int] = '{
-      var sum = 0
-      ${ map(arr, x => '{sum += $x}) }
-      sum
-   }
-
-   inline def sum_m(arr: Array[Int]): Int = ${sum('arr)}
-
-end Macros
-```
-
-A call to `sum_m(Array(1,2,3))` will first inline `sum_m`:
-
-```scala
-val arr: Array[Int] = Array.apply(1, [2,3 : Int]:Int*)
-${_root_.Macros.sum('arr)}
-```
-
-then it will splice `sum`:
-
-```scala
-val arr: Array[Int] = Array.apply(1, [2,3 : Int]:Int*)
-
-var sum = 0
-${ map('arr, x => '{sum += $x}) }
-sum
-```
-
-then it will inline `map`:
-
-```scala
-val arr: Array[Int] = Array.apply(1, [2,3 : Int]:Int*)
-
-var sum = 0
-val f = x => '{sum += $x}
-${ _root_.Macros.map('arr, 'f)(Type.of[Int])}
-sum
-```
-
-then it will expand and splice inside quotes `map`:
-
-```scala
-val arr: Array[Int] = Array.apply(1, [2,3 : Int]:Int*)
-
-var sum = 0
-val f = x => '{sum += $x}
-var i: Int = 0
-while i < arr.length do
-   val element: Int = (arr)(i)
-   sum += element
-   i += 1
-sum
-```
-
-Finally cleanups and dead code elimination:
-
-```scala
-val arr: Array[Int] = Array.apply(1, [2,3 : Int]:Int*)
-var sum = 0
-var i: Int = 0
-while i < arr.length do
-   val element: Int = arr(i)
-   sum += element
-   i += 1
-sum
-```
-
-## Find implicits within a macro
-
-Similarly to the `summonFrom` construct, it is possible to make implicit search available
-in a quote context. For this we simply provide `scala.quoted.Expr.summon`:
-
-```scala
-import scala.collection.immutable.{ TreeSet, HashSet }
-inline def setFor[T]: Set[T] = ${ setForExpr[T] }
-
-def setForExpr[T: Type](using Quotes): Expr[Set[T]] =
-   Expr.summon[Ordering[T]] match
-      case Some(ord) => '{ new TreeSet[T]()($ord) }
-      case _ => '{ new HashSet[T] }
-```
-
-## Relationship with Transparent Inline
-
-[Inline](./inline.md) documents inlining. The code below introduces a transparent
-inline method that can calculate either a value of type `Int` or a value of type
-`String`.
-
-```scala
-transparent inline def defaultOf(inline str: String) =
-   ${ defaultOfImpl('str) }
-
-def defaultOfImpl(strExpr: Expr[String])(using Quotes): Expr[Any] =
-   strExpr.valueOrError match
-      case "int" => '{1}
-      case "string" => '{"a"}
-
-// in a separate file
-val a: Int = defaultOf("int")
-val b: String = defaultOf("string")
-
-```
-
-## Defining a macro and using it in a single project
-
-It is possible to define macros and use them in the same project as long as the implementation
-of the macros does not have run-time dependencies on code in the file where it is used.
-It might still have compile-time dependencies on types and quoted code that refers to the use-site file.
-
-To provide this functionality Scala 3 provides a transparent compilation mode where files that
-try to expand a macro but fail because the macro has not been compiled yet are suspended.
-If there are any suspended files when the compilation ends, the compiler will automatically restart
-compilation of the suspended files using the output of the previous (partial) compilation as macro classpath.
-In case all files are suspended due to cyclic dependencies the compilation will fail with an error.
-
-## Pattern matching on quoted expressions
-
-It is possible to deconstruct or extract values out of `Expr` using pattern matching.
-
-`scala.quoted` contains objects that can help extracting values from `Expr`.
-
-- `scala.quoted.Expr`/`scala.quoted.Exprs`: matches an expression of a value (or list of values) and returns the value (or list of values).
-- `scala.quoted.Const`/`scala.quoted.Consts`: Same as `Expr`/`Exprs` but only works on primitive values.
-- `scala.quoted.Varargs`: matches an explicit sequence of expressions and returns them. These sequences are useful to get individual `Expr[T]` out of a varargs expression of type `Expr[Seq[T]]`.
-
-These could be used in the following way to optimize any call to `sum` that has statically known values.
-
-```scala
-inline def sum(inline args: Int*): Int = ${ sumExpr('args) }
-private def sumExpr(argsExpr: Expr[Seq[Int]])(using Quotes): Expr[Int] =
-   argsExpr match
-      case Varargs(args @ Exprs(argValues)) =>
-         // args is of type Seq[Expr[Int]]
-         // argValues is of type Seq[Int]
-         Expr(argValues.sum) // precompute result of sum
-      case Varargs(argExprs) => // argExprs is of type Seq[Expr[Int]]
-         val staticSum: Int = argExprs.map(_.value.getOrElse(0)).sum
-         val dynamicSum: Seq[Expr[Int]] = argExprs.filter(_.value.isEmpty)
-         dynamicSum.foldLeft(Expr(staticSum))((acc, arg) => '{ $acc + $arg })
-      case _ =>
-         '{ $argsExpr.sum }
-```
-
-### Quoted patterns
-
-Quoted pattens allow deconstructing complex code that contains a precise structure, types or methods.
-Patterns `'{ ... }` can be placed in any location where Scala expects a pattern.
-
-For example
-
-```scala
-optimize {
-   sum(sum(1, a, 2), 3, b)
-} // should be optimized to 6 + a + b
-```
-
-```scala
-def sum(args: Int*): Int = args.sum
-inline def optimize(inline arg: Int): Int = ${ optimizeExpr('arg) }
-private def optimizeExpr(body: Expr[Int])(using Quotes): Expr[Int] =
-   body match
-      // Match a call to sum without any arguments
-      case '{ sum() } => Expr(0)
-      // Match a call to sum with an argument $n of type Int.
-      // n will be the Expr[Int] representing the argument.
-      case '{ sum($n) } => n
-      // Match a call to sum and extracts all its args in an `Expr[Seq[Int]]`
-      case '{ sum(${Varargs(args)}: _*) } => sumExpr(args)
-      case body => body
-
-private def sumExpr(args1: Seq[Expr[Int]])(using Quotes): Expr[Int] =
-   def flatSumArgs(arg: Expr[Int]): Seq[Expr[Int]] = arg match
-      case '{ sum(${Varargs(subArgs)}: _*) } => subArgs.flatMap(flatSumArgs)
-      case arg => Seq(arg)
-   val args2 = args1.flatMap(flatSumArgs)
-   val staticSum: Int = args2.map(_.value.getOrElse(0)).sum
-   val dynamicSum: Seq[Expr[Int]] = args2.filter(_.value.isEmpty)
-   dynamicSum.foldLeft(Expr(staticSum))((acc, arg) => '{ $acc + $arg })
-```
-
-### Recovering precise types using patterns
-
-Sometimes it is necessary to get a more precise type for an expression. This can be achieved using the following pattern match.
-
-```scala
-def f(expr: Expr[Any])(using Quotes) = expr match
-   case '{ $x: t } =>
-      // If the pattern match succeeds, then there is
-      // some type `t` such that
-      // - `x` is bound to a variable of type `Expr[t]`
-      // - `t` is bound to a new type `t` and a given
-      //   instance `Type[t]` is provided for it
-      // That is, we have `x: Expr[t]` and `given Type[t]`,
-      // for some (unknown) type `t`.
-```
-
-This might be used to then perform an implicit search as in:
-
-```scala
-extension (inline sc: StringContext)
-   inline def showMe(inline args: Any*): String = ${ showMeExpr('sc, 'args) }
-
-private def showMeExpr(sc: Expr[StringContext], argsExpr: Expr[Seq[Any]])(using Quotes): Expr[String] =
-   import quotes.reflect.report
-   argsExpr match
-      case Varargs(argExprs) =>
-         val argShowedExprs = argExprs.map {
-            case '{ $arg: tp } =>
-               Expr.summon[Show[tp]] match
-                  case Some(showExpr) =>
-                     '{ $showExpr.show($arg) }
-                  case None =>
-                     report.error(s"could not find implicit for ${Type.show[Show[tp]]}", arg); '{???}
-         }
-         val newArgsExpr = Varargs(argShowedExprs)
-         '{ $sc.s($newArgsExpr: _*) }
-      case _ =>
-         // `new StringContext(...).showMeExpr(args: _*)` not an explicit `showMeExpr"..."`
-         report.error(s"Args must be explicit", argsExpr)
-         '{???}
-
-trait Show[-T]:
-   def show(x: T): String
-
-// in a different file
-given Show[Boolean] with
-   def show(b: Boolean) = "boolean!"
-
-println(showMe"${true}")
-```
-
-### Open code patterns
-
-Quoted pattern matching also provides higher-order patterns to match open terms. If a quoted term contains a definition,
-then the rest of the quote can refer to this definition.
-
-```scala
-'{
-   val x: Int = 4
-   x * x
-}
-```
-
-To match such a term we need to match the definition and the rest of the code, but we need to explicitly state that the rest of the code may refer to this definition.
-
-```scala
-case '{ val y: Int = $x; $body(y): Int } =>
-```
-
-Here `$x` will match any closed expression while `$body(y)` will match an expression that is closed under `y`. Then
-the subexpression of type `Expr[Int]` is bound to `body` as an `Expr[Int => Int]`. The extra argument represents the references to `y`. Usually this expression is used in combination with `Expr.betaReduce` to replace the extra argument.
-
-```scala
-inline def eval(inline e: Int): Int = ${ evalExpr('e) }
-
-private def evalExpr(e: Expr[Int])(using Quotes): Expr[Int] = e match
-   case '{ val y: Int = $x; $body(y): Int } =>
-      // body: Expr[Int => Int] where the argument represents
-      // references to y
-      evalExpr(Expr.betaReduce('{$body(${evalExpr(x)})}))
-   case '{ ($x: Int) * ($y: Int) } =>
-      (x.value, y.value) match
-         case (Some(a), Some(b)) => Expr(a * b)
-         case _ => e
-   case _ => e
-```
-
-```scala
-eval { // expands to the code: (16: Int)
-   val x: Int = 4
-   x * x
-}
-```
-
-We can also close over several bindings using `$b(a1, a2, ..., an)`.
-To match an actual application we can use braces on the function part `${b}(a1, a2, ..., an)`.
-
-## More details
-
-[More details](./macros-spec.md)
diff --git a/docs/docs/reference/metaprogramming/toc.md b/docs/docs/reference/metaprogramming/toc.md
deleted file mode 100644
index 9d1e0b2a0405..000000000000
--- a/docs/docs/reference/metaprogramming/toc.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-layout: doc-page
-title: "Overview"
----
-
-The following pages introduce the redesign of metaprogramming in Scala. They
-introduce the following fundamental facilities:
-
-1. [`inline`](./inline.md) is a new modifier that guarantees that
-   a definition will be inlined at the point of use. The primary motivation
-   behind inline is to reduce the overhead behind function calls and access to
-   values. The expansion will be performed by the Scala compiler during the
-   `Typer` compiler phase. As opposed to inlining in some other ecosystems,
-   inlining in Scala is not merely a request to the compiler but is a
-   _command_. The reason is that inlining in Scala can drive other compile-time
-   operations, like inline pattern matching (enabling type-level
-   programming), macros (enabling compile-time, generative, metaprogramming) and
-   runtime code generation (multi-stage programming).
-
-2. [Macros](./macros.md) are built on two well-known fundamental
-   operations: quotation and splicing.  Quotation converts program code to
-   data, specifically, a (tree-like) representation of this code. It is
-   expressed as `'{...}` for expressions and as `'[...]` for types. Splicing,
-   expressed as `${ ... }`, goes the other way: it converts a program's representation
-   to program code. Together with `inline`, these two abstractions allow
-   to construct program code programmatically.
-
-3. [Runtime Staging](./staging.md) Where macros construct code at _compile-time_,
-   staging lets programs construct new code at _runtime_. That way,
-   code generation can depend not only on static data but also on data available at runtime. This splits the evaluation of the program in two or more phases or ...
-   stages. Consequently, this method of generative programming is called "Multi-Stage Programming". Staging is built on the same foundations as macros. It uses
-   quotes and splices, but leaves out `inline`.
-
-4. [Reflection](./reflection.md) Quotations are a "black-box"
-   representation of code. They can be parameterized and composed using
-   splices, but their structure cannot be analyzed from the outside. TASTy
-   reflection gives a way to analyze code structure by partly revealing the representation type of a piece of code in a standard API. The representation
-   type is a form of typed abstract syntax tree, which gives rise to the `TASTy`
-   moniker.
-
-5. [TASTy Inspection](./tasty-inspect.md) Typed abstract syntax trees are serialized
-   in a custom compressed binary format stored in `.tasty` files. TASTy inspection allows
-   to load these files and analyze their content's tree structure.
-
diff --git a/docs/docs/reference/new-types/dependent-function-types-spec.md b/docs/docs/reference/new-types/dependent-function-types-spec.md
deleted file mode 100644
index e1dd839a9162..000000000000
--- a/docs/docs/reference/new-types/dependent-function-types-spec.md
+++ /dev/null
@@ -1,124 +0,0 @@
----
-layout: doc-page
-title: "Dependent Function Types - More Details"
----
-
-Initial implementation in [PR #3464](https://github.com/lampepfl/dotty/pull/3464).
-
-## Syntax
-
-```ebnf
-FunArgTypes       ::=  InfixType
-                    |  ‘(’ [ FunArgType {',' FunArgType } ] ‘)’
-                    |  ‘(’ TypedFunParam {',' TypedFunParam } ‘)’
-TypedFunParam     ::=  id ‘:’ Type
-```
-
-Dependent function types associate to the right, e.g.
-`(s: S) => (t: T) => U` is the same as `(s: S) => ((t: T) => U)`.
-
-## Implementation
-
-Dependent function types are shorthands for class types that define `apply`
-methods with a dependent result type. Dependent function types desugar to
-refinement types of `scala.FunctionN`. A dependent function type
-`(x1: K1, ..., xN: KN) => R` of arity `N` translates to:
-
-```scala
-FunctionN[K1, ..., Kn, R']:
-   def apply(x1: K1, ..., xN: KN): R
-```
-
-where the result type parameter `R'` is the least upper approximation of the
-precise result type `R` without any reference to value parameters `x1, ..., xN`.
-
-The syntax and semantics of anonymous dependent functions is identical to the
-one of regular functions. Eta expansion is naturally generalized to produce
-dependent function types for methods with dependent result types.
-
-Dependent functions can be implicit, and generalize to arity `N > 22` in the
-same way that other functions do, see
-[the corresponding documentation](../dropped-features/limit22.md).
-
-## Examples
-
-The example below defines a trait `C` and the two dependent function types
-`DF` and `IDF` and prints the results of the respective function applications:
-
-[depfuntype.scala]: https://github.com/lampepfl/dotty/blob/master/tests/pos/depfuntype.scala
-
-```scala
-trait C { type M; val m: M }
-
-type DF = (x: C) => x.M
-
-type IDF = (x: C) ?=> x.M
-
-@main def test =
-   val c = new C { type M = Int; val m = 3 }
-
-   val depfun: DF = (x: C) => x.m
-   val t = depfun(c)
-   println(s"t=$t")   // prints "t=3"
-
-   val idepfun: IDF = summon[C].m
-   val u = idepfun(using c)
-   println(s"u=$u")   // prints "u=3"
-
-```
-
-In the following example the depend type `f.Eff` refers to the effect type `CanThrow`:
-
-[eff-dependent.scala]: https://github.com/lampepfl/dotty/blob/master/tests/run/eff-dependent.scala
-
-```scala
-trait Effect
-
-// Type X => Y
-abstract class Fun[-X, +Y]:
-   type Eff <: Effect
-   def apply(x: X): Eff ?=> Y
-
-class CanThrow extends Effect
-class CanIO extends Effect
-
-given ct: CanThrow = new CanThrow
-given ci: CanIO = new CanIO
-
-class I2S extends Fun[Int, String]:
-   type Eff = CanThrow
-   def apply(x: Int) = x.toString
-
-class S2I extends Fun[String, Int]:
-   type Eff = CanIO
-   def apply(x: String) = x.length
-
-// def map(f: A => B)(xs: List[A]): List[B]
-def map[A, B](f: Fun[A, B])(xs: List[A]): f.Eff ?=> List[B] =
-   xs.map(f.apply)
-
-// def mapFn[A, B]: (A => B) -> List[A] -> List[B]
-def mapFn[A, B]: (f: Fun[A, B]) => List[A] => f.Eff ?=> List[B] =
-   f => xs => map(f)(xs)
-
-// def compose(f: A => B)(g: B => C)(x: A): C
-def compose[A, B, C](f: Fun[A, B])(g: Fun[B, C])(x: A):
-   f.Eff ?=> g.Eff ?=> C =
-   g(f(x))
-
-// def composeFn: (A => B) -> (B => C) -> A -> C
-def composeFn[A, B, C]:
-   (f: Fun[A, B]) => (g: Fun[B, C]) => A => f.Eff ?=> g.Eff ?=> C =
-   f => g => x => compose(f)(g)(x)
-
-@main def test =
-   val i2s = new I2S
-   val s2i = new S2I
-
-   assert(mapFn(i2s)(List(1, 2, 3)).mkString == "123")
-   assert(composeFn(i2s)(s2i)(22) == 2)
-```
-
-### Type Checking
-
-After desugaring no additional typing rules are required for dependent function types.
diff --git a/docs/docs/reference/other-new-features/matchable.md b/docs/docs/reference/other-new-features/matchable.md
deleted file mode 100644
index dd230a916537..000000000000
--- a/docs/docs/reference/other-new-features/matchable.md
+++ /dev/null
@@ -1,140 +0,0 @@
----
-layout: doc-page
-title: "The Matchable Trait"
----
-
-A new trait `Matchable` controls the ability to pattern match.
-
-### The Problem
-
-The Scala 3 standard library has a type `IArray` for immutable
-arrays that is defined like this:
-
-```scala
-  opaque type IArray[+T] = Array[_ <: T]
-```
-
-The `IArray` type offers extension methods for `length` and `apply`, but not for `update`; hence it seems values of type `IArray` cannot be updated.
-
-However, there is a potential hole due to pattern matching. Consider:
-
-```scala
-val imm: IArray[Int] = ...
-imm match
-   case a: Array[Int] => a(0) = 1
-```
-
-The test will succeed at runtime since `IArray`s _are_ represented as
-`Array`s at runtime. But if we allowed it, it would break the fundamental abstraction of immutable arrays.
-
-__Aside:__ One could also achieve the same by casting:
-
-```scala
-imm.asInstanceOf[Array[Int]](0) = 1
-```
-
-But that is not as much of a problem since in Scala `asInstanceOf` is understood to be low-level and unsafe. By contrast, a pattern match that compiles without warning or error should not break abstractions.
-
-Note also that the problem is not tied to opaque types as match selectors. The following slight variant with a value of parametric
-type `T` as match selector leads to the same problem:
-
-```scala
-def f[T](x: T) = x match
-   case a: Array[Int] => a(0) = 0
-f(imm)
-```
-
-Finally, note that the problem is not linked to just opaque types. No unbounded type parameter or abstract type should be decomposable with a pattern match.
-
-### The Solution
-
-There is a new type `scala.Matchable` that controls pattern matching. When typing a pattern match of a constructor pattern `C(...)` or
-a type pattern `_: C` it is required that the selector type conforms
-to `Matchable`. If that's not the case a warning is issued. For instance when compiling the example at the start of this section we get:
-
-```
-> sc ../new/test.scala -source future
--- Warning: ../new/test.scala:4:12 ---------------------------------------------
-4 |    case a: Array[Int] => a(0) = 0
-  |            ^^^^^^^^^^
-  |            pattern selector should be an instance of Matchable,
-  |            but it has unmatchable type IArray[Int] instead
-```
-
-To allow migration from Scala 2 and cross-compiling
-between Scala 2 and 3 the warning is turned on only for `-source future-migration` or higher.
-
-`Matchable` is a universal trait with `Any` as its parent class. It is
-extended by both `AnyVal` and `AnyRef`. Since `Matchable` is a supertype of every concrete value or reference class it means that instances of such classes can be matched as before. However, match selectors of the following types will produce a warning:
-
-- Type `Any`: if pattern matching is required one should use `Matchable` instead.
-- Unbounded type parameters and abstract types: If pattern matching is required they should have an upper bound `Matchable`.
-- Type parameters and abstract types that are only bounded by some
-  universal trait: Again, `Matchable` should be added as a bound.
-
-Here is the hierarchy of top-level classes and traits with their defined methods:
-
-```scala
-abstract class Any:
-   def getClass
-   def isInstanceOf
-   def asInstanceOf
-   def ==
-   def !=
-   def ##
-   def equals
-   def hashCode
-   def toString
-
-trait Matchable extends Any
-
-class AnyVal extends Any, Matchable
-class Object extends Any, Matchable
-```
-
-`Matchable` is currently a marker trait without any methods. Over time
-we might migrate methods `getClass` and `isInstanceOf` to it, since these are closely related to pattern-matching.
-
-### `Matchable` and Universal Equality
-
-Methods that pattern-match on selectors of type `Any` will need a cast once the
-Matchable warning is turned on. The most common such method is the universal
-`equals` method. It will have to be written as in the following example:
-
-```scala
-class C(val x: String):
-
-   override def equals(that: Any): Boolean =
-      that.asInstanceOf[Matchable] match
-         case that: C => this.x == that.x
-         case _ => false
-```
-
-The cast of `that` to `Matchable` serves as an indication that universal equality
-is unsafe in the presence of abstract types and opaque types since it cannot properly distinguish the meaning of a type from its representation. The cast
-is guaranteed to succeed at run-time since `Any` and `Matchable` both erase to
-`Object`.
-
-For instance, consider the definitions
-
-```scala
-opaque type Meter = Double
-def Meter(x: Double) = x
-
-opaque type Second = Double
-def Second(x: Double) = x
-```
-
-Here, universal `equals` will return true for
-
-```scala
-   Meter(10).equals(Second(10))
-```
-
-even though this is clearly false mathematically. With [multiversal equality](../contextual/multiversal-equality.md) one can mitigate that problem somewhat by turning
-
-```scala
-   Meter(10) == Second(10)
-```
-
-into a type error.
diff --git a/docs/docs/reference/other-new-features/opaques.md b/docs/docs/reference/other-new-features/opaques.md
deleted file mode 100644
index 3d1d5acd04a1..000000000000
--- a/docs/docs/reference/other-new-features/opaques.md
+++ /dev/null
@@ -1,166 +0,0 @@
----
-layout: doc-page
-title: "Opaque Type Aliases"
----
-
-Opaque types aliases provide type abstraction without any overhead. Example:
-
-```scala
-object MyMath:
-
-   opaque type Logarithm = Double
-
-   object Logarithm:
-
-      // These are the two ways to lift to the Logarithm type
-
-      def apply(d: Double): Logarithm = math.log(d)
-
-      def safe(d: Double): Option[Logarithm] =
-         if d > 0.0 then Some(math.log(d)) else None
-
-   end Logarithm
-
-   // Extension methods define opaque types' public APIs
-   extension (x: Logarithm)
-      def toDouble: Double = math.exp(x)
-      def + (y: Logarithm): Logarithm = Logarithm(math.exp(x) + math.exp(y))
-      def * (y: Logarithm): Logarithm = x + y
-
-end MyMath
-```
-
-This introduces `Logarithm` as a new abstract type, which is implemented as `Double`.
-The fact that `Logarithm` is the same as `Double` is only known in the scope where
-`Logarithm` is defined which in the above example corresponds to the object `MyMath`.
-Or in other words, within the scope it is treated as type alias, but this is opaque to the outside world
-where in consequence `Logarithm` is seen as an abstract type and has nothing to do with `Double`.
-
-The public API of `Logarithm` consists of the `apply` and `safe` methods defined in the companion object.
-They convert from `Double`s to `Logarithm` values. Moreover, an operation `toDouble` that converts the other way, and operations `+` and `*` are defined as extension methods on `Logarithm` values.
-The following operations would be valid because they use functionality implemented in the `MyMath` object.
-
-```scala
-import MyMath.Logarithm
-
-val l = Logarithm(1.0)
-val l2 = Logarithm(2.0)
-val l3 = l * l2
-val l4 = l + l2
-```
-
-But the following operations would lead to type errors:
-
-```scala
-val d: Double = l       // error: found: Logarithm, required: Double
-val l2: Logarithm = 1.0 // error: found: Double, required: Logarithm
-l * 2                   // error: found: Int(2), required: Logarithm
-l / l2                  // error: `/` is not a member of Logarithm
-```
-
-### Bounds For Opaque Type Aliases
-
-Opaque type aliases can also come with bounds. Example:
-
-```scala
-object Access:
-
-   opaque type Permissions = Int
-   opaque type PermissionChoice = Int
-   opaque type Permission <: Permissions & PermissionChoice = Int
-
-   extension (x: Permissions)
-      def & (y: Permissions): Permissions = x | y
-   extension (x: PermissionChoice)
-      def | (y: PermissionChoice): PermissionChoice = x | y
-   extension (granted: Permissions)
-      def is(required: Permissions) = (granted & required) == required
-   extension (granted: Permissions)
-      def isOneOf(required: PermissionChoice) = (granted & required) != 0
-
-   val NoPermission: Permission = 0
-   val Read: Permission = 1
-   val Write: Permission = 2
-   val ReadWrite: Permissions = Read | Write
-   val ReadOrWrite: PermissionChoice = Read | Write
-
-end Access
-```
-
-The `Access` object defines three opaque type aliases:
-
-- `Permission`, representing a single permission,
-- `Permissions`, representing a set of permissions with the meaning "all of these permissions granted",
-- `PermissionChoice`, representing a set of permissions with the meaning "at least one of these permissions granted".
-
-Outside the `Access` object, values of type `Permissions` may be combined using the `&` operator,
-where `x & y` means "all permissions in `x` *and* in `y` granted".
-Values of type `PermissionChoice` may be combined using the `|` operator,
-where `x | y` means "a permission in `x` *or* in `y` granted".
-
-Note that inside the `Access` object, the `&` and `|` operators always resolve to the corresponding methods of `Int`,
-because members always take precedence over extension methods.
-Because of that, the `|` extension method in `Access` does not cause infinite recursion.
-Also, the definition of `ReadWrite` must use `|`,
-even though an equivalent definition outside `Access` would use `&`.
-
-All three opaque type aliases have the same underlying representation type `Int`. The
-`Permission` type has an upper bound `Permissions & PermissionChoice`. This makes
-it known outside the `Access` object that `Permission` is a subtype of the other
-two types.  Hence, the following usage scenario type-checks.
-
-```scala
-object User:
-   import Access.*
-
-   case class Item(rights: Permissions)
-
-   val roItem = Item(Read)  // OK, since Permission <: Permissions
-   val rwItem = Item(ReadWrite)
-   val noItem = Item(NoPermission)
-
-   assert(!roItem.rights.is(ReadWrite))
-   assert(roItem.rights.isOneOf(ReadOrWrite))
-
-   assert(rwItem.rights.is(ReadWrite))
-   assert(rwItem.rights.isOneOf(ReadOrWrite))
-
-   assert(!noItem.rights.is(ReadWrite))
-   assert(!noItem.rights.isOneOf(ReadOrWrite))
-end User
-```
-
-On the other hand, the call `roItem.rights.isOneOf(ReadWrite)` would give a type error
-since `Permissions` and `PermissionChoice` are different, unrelated types outside `Access`.
-
-
-### Opaque Type Members on Classes
-While typically, opaque types are used together with objects to hide implementation details of a module, they can also be used with classes.
-
-For example, we can redefine the above example of Logarithms as a class.
-```scala
-class Logarithms:
-
-   opaque type Logarithm = Double
-
-   def apply(d: Double): Logarithm = math.log(d)
-
-   def safe(d: Double): Option[Logarithm] =
-      if d > 0.0 then Some(math.log(d)) else None
-
-   def mul(x: Logarithm, y: Logarithm) = x + y
-```
-
-Opaque type members of different instances are treated as different:
-```scala
-val l1 = new Logarithms
-val l2 = new Logarithms
-val x = l1(1.5)
-val y = l1(2.6)
-val z = l2(3.1)
-l1.mul(x, y) // type checks
-l1.mul(x, z) // error: found l2.Logarithm, required l1.Logarithm
-```
-In general, one can think of an opaque type as being only transparent in the scope of `private[this]`.
-
-[More details](opaques-details.md)
diff --git a/docs/docs/reference/other-new-features/parameter-untupling.md b/docs/docs/reference/other-new-features/parameter-untupling.md
deleted file mode 100644
index 5f8f322c5126..000000000000
--- a/docs/docs/reference/other-new-features/parameter-untupling.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-layout: doc-page
-title: "Parameter Untupling"
----
-
-Say you have a list of pairs
-
-```scala
-val xs: List[(Int, Int)]
-```
-
-and you want to map `xs` to a list of `Int`s so that each pair of numbers is mapped to
-their sum. Previously, the best way to do this was with a pattern-matching decomposition:
-
-```scala
-xs map {
-   case (x, y) => x + y
-}
-```
-
-While correct, this is also inconvenient and confusing, since the `case`
-suggests that the pattern match could fail. As a shorter and clearer alternative Scala 3 now allows
-
-```scala
-xs.map {
-   (x, y) => x + y
-}
-```
-
-or, equivalently:
-
-```scala
-xs.map(_ + _)
-```
-
-Generally, a function value with `n > 1` parameters is converted to a
-pattern-matching closure using `case` if the expected type is a unary
-function type of the form `((T_1, ..., T_n)) => U`.
-
-## Reference
-
-For more information see:
-
-* [More details](./parameter-untupling-spec.md)
-* [Issue #897](https://github.com/lampepfl/dotty/issues/897).
diff --git a/docs/docs/reference/other-new-features/safe-initialization.md b/docs/docs/reference/other-new-features/safe-initialization.md
deleted file mode 100644
index c095a1ac6214..000000000000
--- a/docs/docs/reference/other-new-features/safe-initialization.md
+++ /dev/null
@@ -1,306 +0,0 @@
----
-layout: doc-page
-title: "Safe Initialization"
----
-
-Scala 3 implements experimental safe initialization check, which can be enabled by the compiler option `-Ysafe-init`.
-
-## A Quick Glance
-
-To get a feel of how it works, we first show several examples below.
-
-### Parent-Child Interaction
-
-Given the following code snippet:
-
-``` scala
-abstract class AbstractFile:
-   def name: String
-   val extension: String = name.substring(4)
-
-class RemoteFile(url: String) extends AbstractFile:
-   val localFile: String = s"${url.##}.tmp"  // error: usage of `localFile` before it's initialized
-   def name: String = localFile
-```
-
-The checker will report:
-
-``` scala
--- Warning: tests/init/neg/AbstractFile.scala:7:4 ------------------------------
-7 |	val localFile: String = s"${url.##}.tmp"  // error: usage of `localFile` before it's initialized
-  |	    ^
-  |    Access non-initialized field value localFile. Calling trace:
-  |     -> val extension: String = name.substring(4)	[ AbstractFile.scala:3 ]
-  |      -> def name: String = localFile            	[ AbstractFile.scala:8 ]
-```
-
-### Inner-Outer Interaction
-
-Given the code below:
-
-``` scala
-object Trees:
-   class ValDef { counter += 1 }
-   class EmptyValDef extends ValDef
-   val theEmptyValDef = new EmptyValDef
-   private var counter = 0  // error
-```
-
-The checker will report:
-
-``` scala
--- Warning: tests/init/neg/trees.scala:5:14 ------------------------------------
-5 |  private var counter = 0  // error
-  |              ^
-  |             Access non-initialized field variable counter. Calling trace:
-  |              -> val theEmptyValDef = new EmptyValDef    [ trees.scala:4 ]
-  |               -> class EmptyValDef extends ValDef       [ trees.scala:3 ]
-  |                -> class ValDef { counter += 1 }	     [ trees.scala:2 ]
-```
-
-### Functions
-
-Given the code below:
-
-``` scala
-abstract class Parent:
-   val f: () => String = () => this.message
-   def message: String
-
-class Child extends Parent:
-   val a = f()
-   val b = "hello"           // error
-   def message: String = b
-```
-
-The checker reports:
-
-``` scala
--- Warning: tests/init/neg/features-high-order.scala:7:6 -----------------------
-7 |  val b = "hello"           // error
-  |      ^
-  |Access non-initialized field value b. Calling trace:
-  | -> val a = f()                              	[ features-high-order.scala:6 ]
-  |   -> val f: () => String = () => this.message	[ features-high-order.scala:2 ]
-  |    -> def message: String = b	                [ features-high-order.scala:8 ]
-```
-## Design Goals
-
-We establish the following design goals:
-
-- __Sound__: checking always terminates, and is sound for common and reasonable usage (over-approximation)
-- __Expressive__: support common and reasonable initialization patterns
-- __Friendly__: simple rules, minimal syntactic overhead, informative error messages
-- __Modular__: modular checking, no analysis beyond project boundary
-- __Fast__: instant feedback
-- __Simple__: no changes to core type system, explainable by a simple theory
-
-By _reasonable usage_, we include the following use cases (but not restricted to them):
-
-- Access fields on `this` and outer `this` during initialization
-- Call methods on `this` and outer `this` during initialization
-- Instantiate inner class and call methods on such instances during initialization
-- Capture fields in functions
-
-## Principles
-
-To achieve the goals, we uphold three fundamental principles:
-_stackability_, _monotonicity_ and _scopability_.
-
-Stackability means that all fields of a class are initialized at the end of the
-class body. Scala enforces this property in syntax by demanding that all fields
-are initialized at the end of the primary constructor, except for the language
-feature below:
-
-``` scala
-var x: T = _
-```
-
-Control effects such as exceptions may break this property, as the
-following example shows:
-
-``` scala
-class MyException(val b: B) extends Exception("")
-class A:
-   val b = try { new B } catch { case myEx: MyException => myEx.b }
-   println(b.a)
-
-class B:
-   throw new MyException(this)
-   val a: Int = 1
-```
-
-In the code above, the control effect teleport the uninitialized value
-wrapped in an exception. In the implementation, we avoid the problem
-by ensuring that the values that are thrown must be transitively initialized.
-
-Monotonicity means that the initialization status of an object should
-not go backward: initialized fields continue to be initialized, a
-field points to an initialized object may not later point to an
-object under initialization. As an example, the following code will be rejected:
-
-``` scala
-trait Reporter:
-   def report(msg: String): Unit
-
-class FileReporter(ctx: Context) extends Reporter:
-   ctx.typer.reporter = this                // ctx now reaches an uninitialized object
-   val file: File = new File("report.txt")
-   def report(msg: String) = file.write(msg)
-```
-
-In the code above, suppose `ctx` points to a transitively initialized
-object. Now the assignment at line 3 makes `this`, which is not fully
-initialized, reachable from `ctx`. This makes field usage dangerous,
-as it may indirectly reach uninitialized fields.
-
-Monotonicity is based on a well-known technique called _heap monotonic
-typestate_ to ensure soundness in the presence of aliasing
-[1]. Roughly speaking, it means initialization state should not go backwards.
-
-Scopability means that there are no side channels to access to partially constructed objects. Control effects like coroutines, delimited
-control, resumable exceptions may break the property, as they can transport a
-value upper in the stack (not in scope) to be reachable from the current scope.
-Static fields can also serve as a teleport thus breaks this property.  In the
-implementation, we need to enforce that teleported values are transitively
-initialized.
-
-The principles enable _local reasoning_ of initialization, which means:
-
-> An initialized environment can only produce initialized values.
-
-For example, if the arguments to an `new`-expression are transitively
-initialized, so is the result. If the receiver and arguments in a method call
-are transitively initialized, so is the result.
-
-## Rules
-
-With the established principles and design goals, following rules are imposed:
-
-1. In an assignment `o.x = e`, the expression `e` may only point to transitively initialized objects.
-
-   This is how monotonicity is enforced in the system. Note that in an
-   initialization `val f: T = e`, the expression `e` may point to an object
-   under initialization. This requires a distinction between mutation and
-   initialization in order to enforce different rules. Scala
-   has different syntax for them, it thus is not an issue.
-
-2. References to objects under initialization may not be passed as arguments to method calls or constructors.
-
-   Escape of `this` in the constructor is commonly regarded as an
-   anti-pattern, and it's rarely used in practice. This rule is simple
-   for the programmer to reason about initialization and it simplifies
-   implementation. The theory supports safe escape of `this` with the help of
-   annotations, we delay the extension until there is a strong need.
-
-3. Local definitions may only refer to transitively initialized objects.
-
-   It means that in a local definition `val x: T = e`, the expression `e` may
-   only evaluate to transitively initialized objects. The same goes for local
-   lazy variables and methods. This rule is again motivated for simplicity in
-   reasoning about initialization: programmers may safely assume that all local
-   definitions only point to transitively initialized objects.
-
-## Modularity (considered)
-
-Currently, the analysis works across project boundaries based on TASTy.
-The following is a proposal to make the checking more modular.
-The feedback from the community is welcome.
-
-For modularity, we need to forbid subtle initialization interaction beyond
-project boundaries. For example, the following code passes the check when the
-two classes are defined in the same project:
-
-```Scala
-class Base:
-   private val map: mutable.Map[Int, String] = mutable.Map.empty
-   def enter(k: Int, v: String) = map(k) = v
-
-class Child extends Base:
-   enter(1, "one")
-   enter(2, "two")
-```
-
-However, when the class `Base` and `Child` are defined in two different
-projects, the check can emit a warning for the calls to `enter` in the class
-`Child`. This restricts subtle initialization within project boundaries,
-and avoids accidental violation of contracts across library versions.
-
-We can impose the following rules to enforce modularity:
-
-1. A class or trait that may be extended in another project should not
-   call _virtual_ methods on `this` in its template/mixin evaluation,
-   directly or indirectly.
-
-2. The method call `o.m(args)` is forbidden if `o` is not transitively
-   initialized and the target of `m` is defined in an external project.
-
-3. The expression `new p.C(args)` is forbidden, if `p` is not transitively
-   initialized and `C` is defined in an external project.
-
-## Theory
-
-The theory is based on type-and-effect systems [2, 3]. We introduce two concepts,
-_effects_ and _potentials_:
-
-```
-π = this | Warm(C, π) | π.f | π.m | π.super[D] | Cold | Fun(Π, Φ) | π.outer[C]
-ϕ = π↑ | π.f! | π.m!
-```
-
-Potentials (π) represent values that are possibly under initialization.
-
-- `this`: current object
-- `Warm(C, π)`: an object of type `C` where all its fields are assigned, and the potential for `this` of its enclosing class is `π`.
-- `π.f`: the potential of the field `f` in the potential `π`
-- `π.m`: the potential of the field `f` in the potential `π`
-- `π.super[D]`: essentially the object π, used for virtual method resolution
-- `Cold`: an object with unknown initialization status
-- `Fun(Π, Φ)`: a function, when called produce effects Φ and return potentials Π.
-- `π.outer[C]`: the potential of `this` for the enclosing class of `C` when `C.this` is `π`.
-
-Effects are triggered from potentials:
-
-- `π↑`: promote the object pointed to by the potential `π` to fully-initialized
-- `π.f!`: access field `f` on the potential `π`
-- `π.m!`: call the method `m` on the potential `π`
-
-To ensure that the checking always terminate and for better
-performance, we restrict the length of potentials to be finite (by
-default 2). If the potential is too long, the checker stops
-tracking it by checking that the potential is actually transitively
-initialized.
-
-For an expression `e`, it may be summarized by the pair `(Π, Φ)`,
-which means evaluation of `e` may produce the effects Φ and return the
-potentials Π. Each field and method is associated with such a pair.
-We call such a pair _summary_. The expansion of proxy potentials and effects,
-such as `π.f`, `π.m` and `π.m!`, will take advantage of the summaries.
-Depending on the potential `π` for `this`, the summaries need to be rebased (`asSeenFrom`) before usage.
-
-The checking treats the templates of concrete classes as entry points.
-It maintains the set of initialized fields as initialization
-progresses, and check that only initialized fields are accessed during
-the initialization and there is no leaking of values under initialization.
-Virtual method calls on `this` is not a problem,
-as they can always be resolved statically.
-
-For a more detailed introduction of the theory, please refer to the paper _a type-and-effect system for safe initialization_ [3].
-
-## Back Doors
-
-Occasionally you may want to suppress warnings reported by the
-checker.  You can either write `e: @unchecked` to tell the checker to
-skip checking for the expression `e`, or you may use the old trick:
-mark some fields as lazy.
-
-## Caveats
-
-- The system cannot provide safety guarantee when extending Java or Scala 2 classes.
-- Safe initialization of global objects is only partially checked.
-
-## References
-
-1. Fähndrich, M. and Leino, K.R.M., 2003, July. [_Heap monotonic typestates_](https://www.microsoft.com/en-us/research/publication/heap-monotonic-typestate/). In International Workshop on Aliasing, Confinement and Ownership in object-oriented programming (IWACO).
-2. Lucassen, J.M. and Gifford, D.K., 1988, January. [_Polymorphic effect systems_](https://dl.acm.org/doi/10.1145/73560.73564). In Proceedings of the 15th ACM SIGPLAN-SIGACT symposium on Principles of programming languages (pp. 47-57). ACM.
-3. Fengyun Liu, Ondřej Lhoták, Aggelos Biboudis, Paolo G. Giarrusso, and Martin Odersky. 2020. [_A type-and-effect system for object initialization_](https://dl.acm.org/doi/10.1145/3428243). OOPSLA, 2020.
diff --git a/docs/docs/reference/other-new-features/targetName.md b/docs/docs/reference/other-new-features/targetName.md
deleted file mode 100644
index 572d7a5e2146..000000000000
--- a/docs/docs/reference/other-new-features/targetName.md
+++ /dev/null
@@ -1,119 +0,0 @@
----
-layout: doc-page
-title: "The @targetName annotation"
----
-
-A `@targetName` annotation on a definition defines an alternate name for the implementation of that definition. Example:
-
-```scala
-import scala.annotation.targetName
-
-object VecOps:
-   extension [T](xs: Vec[T])
-      @targetName("append")
-      def ++= [T] (ys: Vec[T]): Vec[T] = ...
-```
-
-Here, the `++=` operation is implemented (in Byte code or native code) under the name `append`. The implementation name affects the code that is generated, and is the name under which code from other languages can call the method. For instance, `++=` could be invoked from Java like this:
-
-```java
-VecOps.append(vec1, vec2)
-```
-
-The `@targetName` annotation has no bearing on Scala usages. Any application of that method in Scala has to use `++=`, not `append`.
-
-### Details
-
- 1. `@targetName` is defined in package `scala.annotation`. It takes a single argument
-    of type `String`. That string is called the _external name_ of the definition
-    that's annotated.
-
- 2. A `@targetName` annotation can be given for all kinds of definitions.
-
- 3. The name given in a `@targetName` annotation must be a legal name
-    for the defined entities on the host platform.
-
- 4. It is recommended that definitions with symbolic names have a `@targetName` annotation. This will establish an alternate name that is easier to search for and
- will avoid cryptic encodings in runtime diagnostics.
-
- 5. Definitions with names in backticks that are not legal host platform names
-    should also have a `@targetName` annotation.
-
-### Relationship with Overriding
-
-`@targetName` annotations are significant for matching two method definitions to decide whether they conflict or override each other. Two method definitions match if they have the same name, signature, and erased name. Here,
-
-- The _signature_ of a definition consists of the names of the erased types of all (value-) parameters and the method's result type.
-- The _erased name_ of a method definition is its target name if a `@targetName`
-  annotation is given and its defined name otherwise.
-
-This means that `@targetName` annotations can be used to disambiguate two method definitions that would otherwise clash. For instance.
-
-```scala
-def f(x: => String): Int = x.length
-def f(x: => Int): Int = x + 1  // error: double definition
-```
-
-The two definitions above clash since their erased parameter types are both `Function0`, which is the type of the translation of a by-name-parameter. Hence
-they have the same names and signatures. But we can avoid the clash by adding a `@targetName` annotation to either method or to both of them. Example:
-
-```scala
-@targetName("f_string")
-def f(x: => String): Int = x.length
-def f(x: => Int): Int = x + 1  // OK
-```
-
-This will produce methods `f_string` and `f` in the generated code.
-
-However, `@targetName` annotations are not allowed to break overriding relationships
-between two definitions that have otherwise the same names and types. So the following would be in error:
-
-```scala
-import annotation.targetName
-class A:
-   def f(): Int = 1
-class B extends A:
-   @targetName("g") def f(): Int = 2
-```
-
-The compiler reports here:
-
-```
--- Error: test.scala:6:23 ------------------------------------------------------
-6 |  @targetName("g") def f(): Int = 2
-  |                       ^
-  |error overriding method f in class A of type (): Int;
-  |  method f of type (): Int should not have a @targetName
-  |  annotation since the overridden member hasn't one either
-```
-
-The relevant overriding rules can be summarized as follows:
-
-- Two members can override each other if their names and signatures are the same,
-  and they either have the same erased names or the same types.
-- If two members override, then both their erased names and their types must be the same.
-
-As usual, any overriding relationship in the generated code must also
-be present in the original code. So the following example would also be in error:
-
-```scala
-import annotation.targetName
-class A:
-   def f(): Int = 1
-class B extends A:
-   @targetName("f") def g(): Int = 2
-```
-
-Here, the original methods `g` and `f` do not override each other since they have
-different names. But once we switch to target names, there is a clash that is reported by the compiler:
-
-```
--- [E120] Naming Error: test.scala:4:6 -----------------------------------------
-4 |class B extends A:
-  |      ^
-  |      Name clash between defined and inherited member:
-  |      def f(): Int in class A at line 3 and
-  |      def g(): Int in class B at line 5
-  |      have the same name and type after erasure.
-1 error found
-```
diff --git a/docs/docs/reference/other-new-features/threadUnsafe-annotation.md b/docs/docs/reference/other-new-features/threadUnsafe-annotation.md
deleted file mode 100644
index 2c5a3df9c82c..000000000000
--- a/docs/docs/reference/other-new-features/threadUnsafe-annotation.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-layout: doc-page
-title: "The @threadUnsafe annotation"
----
-
-A new annotation `@threadUnsafe` can be used on a field which defines
-a `lazy val`. When this annotation is used, the initialization of the
-`lazy val` will use a faster mechanism which is not thread-safe.
-
-### Example
-
-```scala
-import scala.annotation.threadUnsafe
-
-class Hello:
-   @threadUnsafe lazy val x: Int = 1
-```
diff --git a/docs/docs/reference/other-new-features/transparent-traits.md b/docs/docs/reference/other-new-features/transparent-traits.md
deleted file mode 100644
index 49ac906e0ef1..000000000000
--- a/docs/docs/reference/other-new-features/transparent-traits.md
+++ /dev/null
@@ -1,69 +0,0 @@
----
-layout: doc-page
-title: "Transparent Traits"
----
-
-Traits are used in two roles:
-
- 1. As mixins for other classes and traits
- 2. As types of vals, defs, or parameters
-
-Some traits are used primarily in the first role, and we usually do not want to see them in inferred types. An example is the `Product` trait that the compiler adds as a mixin trait to every case class or case object. In Scala 2, this parent trait sometimes makes inferred types more complicated than they should be. Example:
-
-```scala
-trait Kind
-case object Var extends Kind
-case object Val extends Kind
-val x = Set(if condition then Val else Var)
-```
-
-Here, the inferred type of `x` is `Set[Kind & Product & Serializable]` whereas one would have hoped it to be `Set[Kind]`. The reasoning for this particular type to be inferred is as follows:
-
-- The type of the conditional above is the [union type](../new-types/union-types.md) `Val | Var`.
-- A union type is widened in type inference to the least supertype that is not a union type.
-  In the example, this type is `Kind & Product & Serializable` since all three traits are traits of both `Val` and `Var`.
-  So that type becomes the inferred element type of the set.
-
-Scala 3 allows one to mark a mixin trait as `transparent`, which means that it can be suppressed in type inference. Here's an example that follows the lines of the code above, but now with a new transparent trait `S` instead of `Product`:
-
-```scala
-transparent trait S
-trait Kind
-object Var extends Kind, S
-object Val extends Kind, S
-val x = Set(if condition then Val else Var)
-```
-
-Now `x` has inferred type `Set[Kind]`. The common transparent trait `S` does not
-appear in the inferred type.
-
-## Transparent Traits
-
-The traits `scala.Product`, `java.lang.Serializable` and `java.lang.Comparable`
-are treated automatically as transparent. Other traits are turned into transparent traits using the modifier `transparent`. Scala 2 traits can also be made transparent
-by adding a [`@transparentTrait` annotation](https://dotty.epfl.ch/api/scala/annotation/transparentTrait.html). This annotation is defined in `scala.annotation`. It will be deprecated and phased out once Scala 2/3 interopability is no longer needed.
-
-Typically, transparent traits are traits
-that influence the implementation of inheriting classes and traits that are not usually used as types by themselves. Two examples from the standard collection library are:
-
-- `IterableOps`, which provides method implementations for an `Iterable`.
-- `StrictOptimizedSeqOps`, which optimises some of these implementations for sequences with efficient indexing.
-
-Generally, any trait that is extended recursively is a good candidate to be
-declared transparent.
-
-## Rules for Inference
-
-Transparent traits can be given as explicit types as usual. But they are often elided when types are inferred. Roughly, the rules for type inference say that transparent traits are dropped from intersections where possible.
-
-The precise rules are as follows:
-
-- When inferring a type of a type variable, or the type of a val, or the return type of a def,
-- where that type is not higher-kinded,
-- and where `B` is its known upper bound or `Any` if none exists:
-- If the type inferred so far is of the form `T1 & ... & Tn` where
-  `n >= 1`, replace the maximal number of transparent `Ti`s  by `Any`, while ensuring that
-  the resulting type is still a subtype of the bound `B`.
-- However, do not perform this widening if all transparent traits `Ti` can get replaced in that way.
-
-The last clause ensures that a single transparent trait instance such as `Product` is not widened to `Any`. Transparent trait instances are only dropped when they appear in conjunction with some other type.
diff --git a/docs/docs/reference/other-new-features/type-test.md b/docs/docs/reference/other-new-features/type-test.md
deleted file mode 100644
index 8c1661fd07f2..000000000000
--- a/docs/docs/reference/other-new-features/type-test.md
+++ /dev/null
@@ -1,180 +0,0 @@
----
-layout: doc-page
-title: "TypeTest"
----
-
-## TypeTest
-
-When pattern matching there are two situations where a runtime type test must be performed.
-The first case is an explicit type test using the ascription pattern notation.
-
-```scala
-(x: X) match
-   case y: Y =>
-```
-
-The second case is when an extractor takes an argument that is not a subtype of the scrutinee type.
-
-```scala
-(x: X) match
-   case y @ Y(n) =>
-
-object Y:
-   def unapply(x: Y): Some[Int] = ...
-```
-
-In both cases, a class test will be performed at runtime.
-But when the type test is on an abstract type (type parameter or type member), the test cannot be performed because the type is erased at runtime.
-
-A `TypeTest` can be provided to make this test possible.
-
-```scala
-package scala.reflect
-
-trait TypeTest[-S, T]:
-   def unapply(s: S): Option[s.type & T]
-```
-
-It provides an extractor that returns its argument typed as a `T` if the argument is a `T`.
-It can be used to encode a type test.
-
-```scala
-def f[X, Y](x: X)(using tt: TypeTest[X, Y]): Option[Y] = x match
-   case tt(x @ Y(1)) => Some(x)
-   case tt(x) => Some(x)
-   case _ => None
-```
-
-To avoid the syntactic overhead the compiler will look for a type test automatically if it detects that the type test is on abstract types.
-This means that `x: Y` is transformed to `tt(x)` and `x @ Y(_)` to `tt(x @ Y(_))` if there is a contextual `TypeTest[X, Y]` in scope.
-The previous code is equivalent to
-
-```scala
-def f[X, Y](x: X)(using TypeTest[X, Y]): Option[Y] = x match
-   case x @ Y(1) => Some(x)
-   case x: Y => Some(x)
-   case _ => None
-```
-
-We could create a type test at call site where the type test can be performed with runtime class tests directly as follows
-
-```scala
-val tt: TypeTest[Any, String] =
-   new TypeTest[Any, String]:
-      def unapply(s: Any): Option[s.type & String] = s match
-         case s: String => Some(s)
-         case _ => None
-
-f[AnyRef, String]("acb")(using tt)
-```
-
-The compiler will synthesize a new instance of a type test if none is found in scope as:
-
-```scala
-new TypeTest[A, B]:
-   def unapply(s: A): Option[s.type & B] = s match
-      case s: B => Some(s)
-      case _ => None
-```
-
-If the type tests cannot be done there will be an unchecked warning that will be raised on the `case s: B =>` test.
-
-The most common `TypeTest` instances are the ones that take any parameters (i.e. `TypeTest[Any, T]`).
-To make it possible to use such instances directly in context bounds we provide the alias
-
-```scala
-package scala.reflect
-
-type Typeable[T] = TypeTest[Any, T]
-```
-
-This alias can be used as
-
-```scala
-def f[T: Typeable]: Boolean =
-   "abc" match
-      case x: T => true
-      case _ => false
-
-f[String] // true
-f[Int] // false
-```
-
-## TypeTest and ClassTag
-
-`TypeTest` is a replacement for functionality provided previously by `ClassTag.unapply`.
-Using `ClassTag` instances was unsound since classtags can check only the class component of a type.
-`TypeTest` fixes that unsoundness.
-`ClassTag` type tests are still supported but a warning will be emitted after 3.0.
-
-
-## Example
-
-Given the following abstract definition of Peano numbers that provides two given instances of types `TypeTest[Nat, Zero]` and `TypeTest[Nat, Succ]`
-
-```scala
-import scala.reflect.*
-
-trait Peano:
-   type Nat
-   type Zero <: Nat
-   type Succ <: Nat
-
-   def safeDiv(m: Nat, n: Succ): (Nat, Nat)
-
-   val Zero: Zero
-
-   val Succ: SuccExtractor
-   trait SuccExtractor:
-      def apply(nat: Nat): Succ
-      def unapply(succ: Succ): Some[Nat]
-
-   given typeTestOfZero: TypeTest[Nat, Zero]
-   given typeTestOfSucc: TypeTest[Nat, Succ]
-```
-
-together with an implementation of Peano numbers based on type `Int`
-
-```scala
-object PeanoInt extends Peano:
-   type Nat  = Int
-   type Zero = Int
-   type Succ = Int
-
-   def safeDiv(m: Nat, n: Succ): (Nat, Nat) = (m / n, m % n)
-
-   val Zero: Zero = 0
-
-   val Succ: SuccExtractor = new:
-      def apply(nat: Nat): Succ = nat + 1
-      def unapply(succ: Succ) = Some(succ - 1)
-
-   def typeTestOfZero: TypeTest[Nat, Zero] = new:
-      def unapply(x: Nat): Option[x.type & Zero] =
-         if x == 0 then Some(x) else None
-
-   def typeTestOfSucc: TypeTest[Nat, Succ] = new:
-      def unapply(x: Nat): Option[x.type & Succ] =
-         if x > 0 then Some(x) else None
-```
-
-it is possible to write the following program
-
-```scala
-@main def test =
-   import PeanoInt.*
-
-   def divOpt(m: Nat, n: Nat): Option[(Nat, Nat)] =
-      n match
-         case Zero => None
-         case s @ Succ(_) => Some(safeDiv(m, s))
-
-   val two = Succ(Succ(Zero))
-   val five = Succ(Succ(Succ(two)))
-
-   println(divOpt(five, two))  // prints "Some((2,1))"
-   println(divOpt(two, five))  // prints "Some((0,2))"
-   println(divOpt(two, Zero))  // prints "None"
-```
-
-Note that without the `TypeTest[Nat, Succ]` the pattern `Succ.unapply(nat: Succ)` would be unchecked.
diff --git a/docs/docs/reference/overview.md b/docs/docs/reference/overview.md
deleted file mode 100644
index c79623ee5238..000000000000
--- a/docs/docs/reference/overview.md
+++ /dev/null
@@ -1,152 +0,0 @@
----
-layout: doc-page
-title: "Overview"
----
-Scala 3 implements many language changes and improvements over Scala 2.
-In this reference, we discuss design decisions and present important differences compared to Scala 2.
-
-## Goals
-
-The language redesign was guided by three main goals:
-
-- Strengthen Scala's foundations.
-  Make the full programming language compatible with the foundational work on the
-  [DOT calculus](https://infoscience.epfl.ch/record/227176/files/soundness_oopsla16.pdf)
-  and apply the lessons learned from that work.
-- Make Scala easier and safer to use.
-  Tame powerful constructs such as implicits to provide a gentler learning curve. Remove warts and puzzlers.
-- Further improve the consistency and expressiveness of Scala's language constructs.
-
-Corresponding to these goals, the language changes fall into seven categories:
-(1) Core constructs to strengthen foundations, (2) simplifications and (3) [restrictions](#restrictions), to make the language easier and safer to use, (4) [dropped constructs](#dropped-constructs) to make the language smaller and more regular, (5) [changed constructs](#changes) to remove warts, and increase consistency and usability, (6) [new constructs](#new-constructs) to fill gaps and increase expressiveness, (7) a new, principled approach to metaprogramming that replaces [Scala 2 experimental macros](https://docs.scala-lang.org/overviews/macros/overview.html).
-
-## Essential Foundations
-
-These new constructs directly model core features of DOT, higher-kinded types, and the [SI calculus for implicit resolution](https://infoscience.epfl.ch/record/229878/files/simplicitly_1.pdf).
-
-- [Intersection types](new-types/intersection-types.md), replacing compound types,
-- [Union types](new-types/union-types.md),
-- [Type lambdas](new-types/type-lambdas.md), replacing encodings using structural types and type projection.
-- [Context functions](contextual/context-functions.md), offering abstraction over given parameters.
-
-## Simplifications
-
-These constructs replace existing constructs with the aim of making the language safer and simpler to use, and to promote uniformity in code style.
-
-- [Trait parameters](other-new-features/trait-parameters.md)
-  replace [early initializers](dropped-features/early-initializers.md) with a more generally useful construct.
-- [Given instances](contextual/givens.md)
-  replace implicit objects and defs, focussing on intent over mechanism.
-- [Using clauses](contextual/using-clauses.md)
-  replace implicit parameters, avoiding their ambiguities.
-- [Extension methods](contextual/extension-methods.md)
-  replace implicit classes with a clearer and simpler mechanism.
-- [Opaque type aliases](other-new-features/opaques.md)
-  replace most uses of value classes while guaranteeing absence of boxing.
-- [Top-level definitions](dropped-features/package-objects.md)
-  replace package objects, dropping syntactic boilerplate.
-- [Export clauses](other-new-features/export.md)
-  provide a simple and general way to express aggregation, which can replace
-  the previous facade pattern of package objects inheriting from classes.
-- [Vararg splices](changed-features/vararg-splices.md)
-  now use the form `xs*` in function arguments and patterns instead of `xs: _*` and `xs @ _*`,
-- [Universal apply methods](other-new-features/creator-applications.md)
-  allow using simple function call syntax instead of `new` expressions. `new` expressions stay around
-  as a fallback for the cases where creator applications cannot be used.
-
-With the exception of [early initializers](dropped-features/early-initializers.md) and old-style vararg patterns, all superseded constructs continue to be available in Scala 3.0. The plan is to deprecate and phase them out later.
-
-Value classes (superseded by opaque type aliases) are a special case. There are currently no deprecation plans for value classes, since we might bring them back in a more general form if they are supported natively by the JVM as is planned by [project Valhalla](https://openjdk.java.net/projects/valhalla/).
-
-## Restrictions
-
-These constructs are restricted to make the language safer.
-
-- [Implicit Conversions](contextual/conversions.md):
-  there is only one way to define implicit conversions instead of many, and potentially surprising implicit conversions require a language import.
-- [Given Imports](contextual/given-imports.md):
-  implicits now require a special form of import, to make the import clearly visible.
-- [Type Projection](dropped-features/type-projection.md):
-  only classes can be used as prefix `C` of a type projection `C#A`. Type projection on abstract types is no longer supported since it is unsound.
-- [Multiversal Equality](contextual/multiversal-equality.md):
-  implement an "opt-in" scheme to rule out nonsensical comparisons with `==` and `!=`.
-- [infix](changed-features/operators.md):
-  make method application syntax uniform across code bases.
-
-Unrestricted implicit conversions continue to be available in Scala 3.0, but will be deprecated and removed later. Unrestricted versions of the other constructs in the list above are available only under `-source 3.0-migration`.
-
-## Dropped Constructs
-
-These constructs are proposed to be dropped without a new construct replacing them. The motivation for dropping these constructs is to simplify the language and its implementation.
-
-- [DelayedInit](dropped-features/delayed-init.md),
-- [Existential types](dropped-features/existential-types.md),
-- [Procedure syntax](dropped-features/procedure-syntax.md),
-- [Class shadowing](dropped-features/class-shadowing.md),
-- [XML literals](dropped-features/xml.md),
-- [Symbol literals](dropped-features/symlits.md),
-- [Auto application](dropped-features/auto-apply.md),
-- [Weak conformance](dropped-features/weak-conformance.md),
-- Compound types (replaced by [Intersection types](new-types/intersection-types.md)),
-- [Auto tupling](https://github.com/lampepfl/dotty/pull/4311) (implemented, but not merged).
-
-The date when these constructs are dropped varies. The current status is:
-
-- Not implemented at all:
-  - DelayedInit, existential types, weak conformance.
-- Supported under `-source 3.0-migration`:
-  - procedure syntax, class shadowing, symbol literals, auto application, auto tupling in a restricted form.
-- Supported in 3.0, to be deprecated and phased out later:
-  - [XML literals](dropped-features/xml.md), compound types.
-
-## Changes
-
-These constructs have undergone changes to make them more regular and useful.
-
-- [Structural Types](changed-features/structural-types.md):
-  They now allow pluggable implementations, which greatly increases their usefulness. Some usage patterns are restricted compared to the status quo.
-- [Name-based pattern matching](changed-features/pattern-matching.md):
-  The existing undocumented Scala 2 implementation has been codified in a slightly simplified form.
-- [Automatic Eta expansion](changed-features/eta-expansion.md):
-  Eta expansion is now performed universally also in the absence of an expected type. The postfix `_` operator is thus made redundant. It will be deprecated and dropped after Scala 3.0.
-- [Implicit Resolution](changed-features/implicit-resolution.md):
-  The implicit resolution rules have been cleaned up to make them more useful and less surprising. Implicit scope is restricted to no longer include package prefixes.
-
-Most aspects of old-style implicit resolution are still available under `-source 3.0-migration`. The other changes in this list are applied unconditionally.
-
-## New Constructs
-
-These are additions to the language that make it more powerful or pleasant to use.
-
-- [Enums](enums/enums.md) provide concise syntax for enumerations and [algebraic data types](enums/adts.md).
-- [Parameter untupling](other-new-features/parameter-untupling.md) avoids having to use `case` for tupled parameter destructuring.
-- [Dependent function types](new-types/dependent-function-types.md) generalize dependent methods to dependent function values and types.
-- [Polymorphic function types](new-types/polymorphic-function-types.md) generalize polymorphic methods to polymorphic function values and types.
-  _Current status_: There is a proposal and a merged prototype implementation, but the implementation has not been finalized (it is notably missing type inference support).
-- [Kind polymorphism](other-new-features/kind-polymorphism.md) allows the definition of operators working equally on types and type constructors.
-- [`@targetName` annotations](other-new-features/targetName.md) make it easier to interoperate with code written in other languages and give more flexibility for avoiding name clashes.
-
-## Metaprogramming
-
-The following constructs together aim to put metaprogramming in Scala on a new basis. So far, metaprogramming was achieved by a combination of macros and libraries such as [Shapeless](https://github.com/milessabin/shapeless) that were in turn based on some key macros. Current Scala 2 macro mechanisms are a thin veneer on top the current Scala 2 compiler, which makes them fragile and in many cases impossible to port to Scala 3.
-
-It's worth noting that macros were never included in the [Scala 2 language specification](https://scala-lang.org/files/archive/spec/2.13/) and were so far made available only under an `-experimental` flag. This has not prevented their widespread usage.
-
-To enable porting most uses of macros, we are experimenting with the advanced language constructs listed below. These designs are more provisional than the rest of the proposed language constructs for Scala 3.0. There might still be some changes until the final release. Stabilizing the feature set needed for metaprogramming is our first priority.
-
-- [Match Types](new-types/match-types.md)
-  allow computation on types.
-- [Inline](metaprogramming/inline.md)
-  provides by itself a straightforward implementation of some simple macros and is at the same time an essential building block for the implementation of complex macros.
-- [Quotes and Splices](metaprogramming/macros.md)
-  provide a principled way to express macros and staging with a unified set of abstractions.
-- [Type class derivation](contextual/derivation.md)
-  provides an in-language implementation of the `Gen` macro in Shapeless and other foundational libraries. The new implementation is more robust, efficient and easier to use than the macro.
-- [By-name context parameters](contextual/by-name-context-parameters.md)
-  provide a more robust in-language implementation of the `Lazy` macro in [Shapeless](https://github.com/milessabin/shapeless).
-
-## See Also
-
-[A classification of proposed language features](./features-classification.md) is
-an expanded version of this page that adds the status (i.e. relative importance to be a part of Scala 3, and relative urgency when to decide this) and expected migration cost
-of each language construct.
diff --git a/docs/docs/reference/syntax.md b/docs/docs/reference/syntax.md
deleted file mode 100644
index ddb523efd9ea..000000000000
--- a/docs/docs/reference/syntax.md
+++ /dev/null
@@ -1,442 +0,0 @@
----
-layout: doc-page
-title: "Scala 3 Syntax Summary"
----
-
-The following description of Scala tokens uses literal characters `‘c’` when
-referring to the ASCII fragment `\u0000` – `\u007F`.
-
-_Unicode escapes_ are used to represent the [Unicode character](https://www.w3.org/International/articles/definitions-characters/) with the given
-hexadecimal code:
-
-```ebnf
-UnicodeEscape ::= ‘\’ ‘u’ {‘u’} hexDigit hexDigit hexDigit hexDigit
-hexDigit      ::= ‘0’ | … | ‘9’ | ‘A’ | … | ‘F’ | ‘a’ | … | ‘f’
-```
-
-Informal descriptions are typeset as `“some comment”`.
-
-### Lexical Syntax
-
-The lexical syntax of Scala is given by the following grammar in EBNF
-form.
-
-```ebnf
-whiteSpace       ::=  ‘\u0020’ | ‘\u0009’ | ‘\u000D’ | ‘\u000A’
-upper            ::=  ‘A’ | … | ‘Z’ | ‘\$’ | ‘_’  “… and Unicode category Lu”
-lower            ::=  ‘a’ | … | ‘z’ “… and Unicode category Ll”
-letter           ::=  upper | lower “… and Unicode categories Lo, Lt, Nl”
-digit            ::=  ‘0’ | … | ‘9’
-paren            ::=  ‘(’ | ‘)’ | ‘[’ | ‘]’ | ‘{’ | ‘}’ | ‘'(’ | ‘'[’ | ‘'{’
-delim            ::=  ‘`’ | ‘'’ | ‘"’ | ‘.’ | ‘;’ | ‘,’
-opchar           ::=  “printableChar not matched by (whiteSpace | upper |
-                       lower | letter | digit | paren | delim | opchar |
-                       Unicode_Sm | Unicode_So)”
-printableChar    ::=  “all characters in [\u0020, \u007F] inclusive”
-charEscapeSeq    ::=  ‘\’ (‘b’ | ‘t’ | ‘n’ | ‘f’ | ‘r’ | ‘"’ | ‘'’ | ‘\’)
-
-op               ::=  opchar {opchar}
-varid            ::=  lower idrest
-alphaid          ::=  upper idrest
-                   |  varid
-plainid          ::=  alphaid
-                   |  op
-id               ::=  plainid
-                   |  ‘`’ { charNoBackQuoteOrNewline | UnicodeEscape | charEscapeSeq } ‘`’
-idrest           ::=  {letter | digit} [‘_’ op]
-quoteId          ::=  ‘'’ alphaid
-
-integerLiteral   ::=  (decimalNumeral | hexNumeral) [‘L’ | ‘l’]
-decimalNumeral   ::=  ‘0’ | nonZeroDigit [{digit | ‘_’} digit]
-hexNumeral       ::=  ‘0’ (‘x’ | ‘X’) hexDigit [{hexDigit | ‘_’} hexDigit]
-nonZeroDigit     ::=  ‘1’ | … | ‘9’
-
-floatingPointLiteral
-                 ::=  [decimalNumeral] ‘.’ digit [{digit | ‘_’} digit] [exponentPart] [floatType]
-                   |  decimalNumeral exponentPart [floatType]
-                   |  decimalNumeral floatType
-exponentPart     ::=  (‘E’ | ‘e’) [‘+’ | ‘-’] digit [{digit | ‘_’} digit]
-floatType        ::=  ‘F’ | ‘f’ | ‘D’ | ‘d’
-
-booleanLiteral   ::=  ‘true’ | ‘false’
-
-characterLiteral ::=  ‘'’ (printableChar | charEscapeSeq) ‘'’
-
-stringLiteral    ::=  ‘"’ {stringElement} ‘"’
-                   |  ‘"""’ multiLineChars ‘"""’
-stringElement    ::=  printableChar \ (‘"’ | ‘\’)
-                   |  UnicodeEscape
-                   |  charEscapeSeq
-multiLineChars   ::=  {[‘"’] [‘"’] char \ ‘"’} {‘"’}
-processedStringLiteral
-                 ::=  alphaid ‘"’ {[‘\’] processedStringPart | ‘\\’ | ‘\"’} ‘"’
-                   |  alphaid ‘"""’ {[‘"’] [‘"’] char \ (‘"’ | ‘$’) | escape} {‘"’} ‘"""’
-processedStringPart
-                 ::= printableChar \ (‘"’ | ‘$’ | ‘\’) | escape
-escape           ::=  ‘$$’
-                   |  ‘$’ letter { letter | digit }
-                   |  ‘{’ Block  [‘;’ whiteSpace stringFormat whiteSpace] ‘}’
-stringFormat     ::=  {printableChar \ (‘"’ | ‘}’ | ‘ ’ | ‘\t’ | ‘\n’)}
-
-symbolLiteral    ::=  ‘'’ plainid // until 2.13
-
-comment          ::=  ‘/*’ “any sequence of characters; nested comments are allowed” ‘*/’
-                   |  ‘//’ “any sequence of characters up to end of line”
-
-nl               ::=  “new line character”
-semi             ::=  ‘;’ |  nl {nl}
-```
-
-## Optional Braces
-
-The lexical analyzer also inserts `indent` and `outdent` tokens that represent regions of indented code [at certain points](./other-new-features/indentation.md).
-
-In the context-free productions below we use the notation `<<< ts >>>`
-to indicate a token sequence `ts` that is either enclosed in a pair of braces `{ ts }` or that constitutes an indented region `indent ts outdent`. Analogously, the
-notation `:<<< ts >>>` indicates a token sequence `ts` that is either enclosed in a pair of braces `{ ts }` or that constitutes an indented region `indent ts outdent` that follows
-a `:` at the end of a line.
-
-```
- <<< ts >>>   ::=  ‘{’ ts ‘}’
-                |  indent ts outdent
-:<<< ts >>>   ::=  [nl] ‘{’ ts ‘}’
-                |  `:` indent ts outdent
-```
-
-## Keywords
-
-### Regular keywords
-
-```
-abstract  case      catch     class     def       do        else
-enum      export    extends   false     final     finally   for
-given     if        implicit  import    lazy      match     new
-null      object    override  package   private   protected return
-sealed    super     then      throw     trait     true      try
-type      val       var       while     with      yield
-:         =         <-        =>        <:        :>        #
-@         =>>       ?=>
-```
-
-### Soft keywords
-
-```
-as  derives  end  extension  infix  inline  opaque  open  transparent  using  |  *  +  -
-```
-
-See the [separate section on soft keywords](./soft-modifier.md) for additional
-details on where a soft keyword is recognized.
-
-## Context-free Syntax
-
-The context-free syntax of Scala is given by the following EBNF
-grammar:
-
-### Literals and Paths
-```ebnf
-SimpleLiteral     ::=  [‘-’] integerLiteral
-                    |  [‘-’] floatingPointLiteral
-                    |  booleanLiteral
-                    |  characterLiteral
-                    |  stringLiteral
-Literal           ::=  SimpleLiteral
-                    |  processedStringLiteral
-                    |  symbolLiteral
-                    |  ‘null’
-
-QualId            ::=  id {‘.’ id}
-ids               ::=  id {‘,’ id}
-
-SimpleRef         ::=  id
-                    |  [id ‘.’] ‘this’
-                    |  [id ‘.’] ‘super’ [ClassQualifier] ‘.’ id
-
-ClassQualifier    ::=  ‘[’ id ‘]’
-```
-
-### Types
-```ebnf
-Type              ::=  FunType
-                    |  HkTypeParamClause ‘=>>’ Type
-                    |  FunParamClause ‘=>>’ Type
-                    |  MatchType
-                    |  InfixType
-FunType           ::=  FunTypeArgs (‘=>’ | ‘?=>’) Type
-                    |  HKTypeParamClause '=>' Type
-FunTypeArgs       ::=  InfixType
-                    |  ‘(’ [ FunArgTypes ] ‘)’
-                    |  FunParamClause
-FunParamClause    ::=  ‘(’ TypedFunParam {‘,’ TypedFunParam } ‘)’
-TypedFunParam     ::=  id ‘:’ Type
-MatchType         ::=  InfixType `match` <<< TypeCaseClauses >>>
-InfixType         ::=  RefinedType {id [nl] RefinedType}
-RefinedType       ::=  AnnotType {[nl] Refinement}
-AnnotType         ::=  SimpleType {Annotation}
-
-SimpleType        ::=  SimpleLiteral
-                    |  ‘?’ TypeBounds
-                    |  id
-                    |  Singleton ‘.’ id
-                    |  Singleton ‘.’ ‘type’
-                    |  ‘(’ Types ‘)’
-                    |  Refinement
-                    |  ‘$’ ‘{’ Block ‘}’
-                    |  SimpleType1 TypeArgs
-                    |  SimpleType1 ‘#’ id
-Singleton         ::=  SimpleRef
-                    |  SimpleLiteral
-                    |  Singleton ‘.’ id
-
-FunArgType        ::=  Type
-                    |  ‘=>’ Type
-FunArgTypes       ::=  FunArgType { ‘,’ FunArgType }
-ParamType         ::=  [‘=>’] ParamValueType
-ParamValueType    ::=  Type [‘*’]
-TypeArgs          ::=  ‘[’ Types ‘]’
-Refinement        ::=  ‘{’ [RefineDcl] {semi [RefineDcl]} ‘}’
-TypeBounds        ::=  [‘>:’ Type] [‘<:’ Type]
-TypeParamBounds   ::=  TypeBounds {‘:’ Type}
-Types             ::=  Type {‘,’ Type}
-```
-
-### Expressions
-```ebnf
-Expr              ::=  FunParams (‘=>’ | ‘?=>’) Expr
-                    |  Expr1
-BlockResult       ::=  FunParams (‘=>’ | ‘?=>’) Block
-                    |  Expr1
-FunParams         ::=  Bindings
-                    |  id
-                    |  ‘_’
-Expr1             ::=  [‘inline’] ‘if’ ‘(’ Expr ‘)’ {nl} Expr [[semi] ‘else’ Expr]
-                    |  [‘inline’] ‘if’  Expr ‘then’ Expr [[semi] ‘else’ Expr]
-                    |  ‘while’ ‘(’ Expr ‘)’ {nl} Expr
-                    |  ‘while’ Expr ‘do’ Expr
-                    |  ‘try’ Expr Catches [‘finally’ Expr]
-                    |  ‘try’ Expr [‘finally’ Expr]
-                    |  ‘throw’ Expr
-                    |  ‘return’ [Expr]
-                    |  ForExpr
-                    |  HkTypeParamClause ‘=>’ Expr
-                    |  [SimpleExpr ‘.’] id ‘=’ Expr
-                    |  SimpleExpr1 ArgumentExprs ‘=’ Expr
-                    |  PostfixExpr [Ascription]
-                    |  ‘inline’ InfixExpr MatchClause
-Ascription        ::=  ‘:’ InfixType
-                    |  ‘:’ Annotation {Annotation}
-Catches           ::=  ‘catch’ (Expr | ExprCaseClause)
-PostfixExpr       ::=  InfixExpr [id]                                          -- only if language.postfixOperators is enabled
-InfixExpr         ::=  PrefixExpr
-                    |  InfixExpr id [nl] InfixExpr
-                    |  InfixExpr MatchClause
-MatchClause       ::=  ‘match’ <<< CaseClauses >>>
-PrefixExpr        ::=  [‘-’ | ‘+’ | ‘~’ | ‘!’] SimpleExpr
-SimpleExpr        ::=  SimpleRef
-                    |  Literal
-                    |  ‘_’
-                    |  BlockExpr
-                    |  ‘$’ ‘{’ Block ‘}’
-                    |  Quoted
-                    |  quoteId                                                  -- only inside splices
-                    |  ‘new’ ConstrApp {‘with’ ConstrApp} [TemplateBody]
-                    |  ‘new’ TemplateBody
-                    |  ‘(’ ExprsInParens ‘)’
-                    |  SimpleExpr ‘.’ id
-                    |  SimpleExpr ‘.’ MatchClause
-                    |  SimpleExpr TypeArgs
-                    |  SimpleExpr ArgumentExprs
-Quoted            ::=  ‘'’ ‘{’ Block ‘}’
-                    |  ‘'’ ‘[’ Type ‘]’
-ExprsInParens     ::=  ExprInParens {‘,’ ExprInParens}
-ExprInParens      ::=  PostfixExpr ‘:’ Type
-                    |  Expr
-ParArgumentExprs  ::=  ‘(’ [‘using’] ExprsInParens ‘)’
-                    |  ‘(’ [ExprsInParens ‘,’] PostfixExpr ‘*’ ‘)’
-ArgumentExprs     ::=  ParArgumentExprs
-                    |  BlockExpr
-BlockExpr         ::=  <<< (CaseClauses | Block) >>>
-Block             ::=  {BlockStat semi} [BlockResult]
-BlockStat         ::=  Import
-                    |  {Annotation {nl}} {LocalModifier} Def
-                    |  Extension
-                    |  Expr1
-                    |  EndMarker
-
-ForExpr           ::=  ‘for’ (‘(’ Enumerators ‘)’ | ‘{’ Enumerators ‘}’) {nl} [‘yield’] Expr
-                    |  ‘for’ Enumerators (‘do’ Expr | ‘yield’ Expr)
-Enumerators       ::=  Generator {semi Enumerator | Guard}
-Enumerator        ::=  Generator
-                    |  Guard
-                    |  Pattern1 ‘=’ Expr
-Generator         ::=  [‘case’] Pattern1 ‘<-’ Expr
-Guard             ::=  ‘if’ PostfixExpr
-
-CaseClauses       ::=  CaseClause { CaseClause }
-CaseClause        ::=  ‘case’ Pattern [Guard] ‘=>’ Block
-ExprCaseClause    ::=  ‘case’ Pattern [Guard] ‘=>’ Expr
-TypeCaseClauses   ::=  TypeCaseClause { TypeCaseClause }
-TypeCaseClause    ::=  ‘case’ InfixType ‘=>’ Type [nl]
-
-Pattern           ::=  Pattern1 { ‘|’ Pattern1 }
-Pattern1          ::=  Pattern2 [‘:’ RefinedType]
-Pattern2          ::=  [id ‘@’] InfixPattern [‘*’]
-InfixPattern      ::=  SimplePattern { id [nl] SimplePattern }
-SimplePattern     ::=  PatVar
-                    |  Literal
-                    |  ‘(’ [Patterns] ‘)’
-                    |  Quoted
-                    |  SimplePattern1 [TypeArgs] [ArgumentPatterns]
-                    |  ‘given’ RefinedType
-SimplePattern1    ::=  SimpleRef
-                    |  SimplePattern1 ‘.’ id
-PatVar            ::=  varid
-                    |  ‘_’
-Patterns          ::=  Pattern {‘,’ Pattern}
-ArgumentPatterns  ::=  ‘(’ [Patterns] ‘)’
-                    |  ‘(’ [Patterns ‘,’] PatVar ‘*’ ‘)’
-```
-
-### Type and Value Parameters
-```ebnf
-ClsTypeParamClause::=  ‘[’ ClsTypeParam {‘,’ ClsTypeParam} ‘]’
-ClsTypeParam      ::=  {Annotation} [‘+’ | ‘-’] id [HkTypeParamClause] TypeParamBounds
-
-DefTypeParamClause::=  ‘[’ DefTypeParam {‘,’ DefTypeParam} ‘]’
-DefTypeParam      ::=  {Annotation} id [HkTypeParamClause] TypeParamBounds
-
-TypTypeParamClause::=  ‘[’ TypTypeParam {‘,’ TypTypeParam} ‘]’
-TypTypeParam      ::=  {Annotation} id [HkTypeParamClause] TypeBounds
-
-HkTypeParamClause ::=  ‘[’ HkTypeParam {‘,’ HkTypeParam} ‘]’
-HkTypeParam       ::=  {Annotation} [‘+’ | ‘-’] (id [HkTypeParamClause] | ‘_’) TypeBounds
-
-ClsParamClauses   ::=  {ClsParamClause} [[nl] ‘(’ [‘implicit’] ClsParams ‘)’]
-ClsParamClause    ::=  [nl] ‘(’ ClsParams ‘)’
-                    |  [nl] ‘(’ ‘using’ (ClsParams | FunArgTypes) ‘)’
-ClsParams         ::=  ClsParam {‘,’ ClsParam}
-ClsParam          ::=  {Annotation} [{Modifier} (‘val’ | ‘var’) | ‘inline’] Param
-Param             ::=  id ‘:’ ParamType [‘=’ Expr]
-
-DefParamClauses   ::=  {DefParamClause} [[nl] ‘(’ [‘implicit’] DefParams ‘)’]
-DefParamClause    ::=  [nl] ‘(’ DefParams ‘)’ | UsingParamClause
-UsingParamClause  ::=  [nl] ‘(’ ‘using’ (DefParams | FunArgTypes) ‘)’
-DefParams         ::=  DefParam {‘,’ DefParam}
-DefParam          ::=  {Annotation} [‘inline’] Param
-```
-
-### Bindings and Imports
-```ebnf
-Bindings          ::=  ‘(’ [Binding {‘,’ Binding}] ‘)’
-Binding           ::=  (id | ‘_’) [‘:’ Type]
-
-Modifier          ::=  LocalModifier
-                    |  AccessModifier
-                    |  ‘override’
-                    |  ‘opaque’
-LocalModifier     ::=  ‘abstract’
-                    |  ‘final’
-                    |  ‘sealed’
-                    |  ‘open’
-                    |  ‘implicit’
-                    |  ‘lazy’
-                    |  ‘inline’
-AccessModifier    ::=  (‘private’ | ‘protected’) [AccessQualifier]
-AccessQualifier   ::=  ‘[’ id ‘]’
-
-Annotation        ::=  ‘@’ SimpleType1 {ParArgumentExprs}
-
-Import            ::=  ‘import’ ImportExpr {‘,’ ImportExpr}
-Export            ::=  ‘export’ ImportExpr {‘,’ ImportExpr}
-ImportExpr        ::=  SimpleRef {‘.’ id} ‘.’ ImportSpec
-                    |  SimpleRef ‘as’ id
-ImportSpec        ::=  NamedSelector
-                    |  WildcardSelector
-                    | ‘{’ ImportSelectors) ‘}’
-NamedSelector     ::=  id [‘as’ (id | ‘_’)]
-WildCardSelector  ::=  ‘*' | ‘given’ [InfixType]
-ImportSelectors   ::=  NamedSelector [‘,’ ImportSelectors]
-                    |  WildCardSelector {‘,’ WildCardSelector}
-
-EndMarker         ::=  ‘end’ EndMarkerTag    -- when followed by EOL
-EndMarkerTag      ::=  id | ‘if’ | ‘while’ | ‘for’ | ‘match’ | ‘try’
-                    |  ‘new’ | ‘this’ | ‘given’ | ‘extension’ | ‘val’
-```
-
-### Declarations and Definitions
-```ebnf
-RefineDcl         ::=  ‘val’ ValDcl
-                    |  ‘def’ DefDcl
-                    |  ‘type’ {nl} TypeDcl
-Dcl               ::=  RefineDcl
-                    |  ‘var’ VarDcl
-ValDcl            ::=  ids ‘:’ Type
-VarDcl            ::=  ids ‘:’ Type
-DefDcl            ::=  DefSig ‘:’ Type
-DefSig            ::=  id [DefTypeParamClause] DefParamClauses
-TypeDcl           ::=  id [TypeParamClause] {FunParamClause} TypeBounds [‘=’ Type]
-
-Def               ::=  ‘val’ PatDef
-                    |  ‘var’ PatDef
-                    |  ‘def’ DefDef
-                    |  ‘type’ {nl} TypeDcl
-                    |  TmplDef
-PatDef            ::=  ids [‘:’ Type] ‘=’ Expr
-                    |  Pattern2 [‘:’ Type] ‘=’ Expr
-DefDef            ::=  DefSig [‘:’ Type] ‘=’ Expr
-                    |  ‘this’ DefParamClause DefParamClauses ‘=’ ConstrExpr
-
-TmplDef           ::=  ([‘case’] ‘class’ | ‘trait’) ClassDef
-                    |  [‘case’] ‘object’ ObjectDef
-                    |  ‘enum’ EnumDef
-                    |  ‘given’ GivenDef
-ClassDef          ::=  id ClassConstr [Template]
-ClassConstr       ::=  [ClsTypeParamClause] [ConstrMods] ClsParamClauses
-ConstrMods        ::=  {Annotation} [AccessModifier]
-ObjectDef         ::=  id [Template]
-EnumDef           ::=  id ClassConstr InheritClauses EnumBody
-GivenDef          ::=  [GivenSig] (AnnotType [‘=’ Expr] | StructuralInstance)
-GivenSig          ::=  [id] [DefTypeParamClause] {UsingParamClause} ‘:’         -- one of `id`, `DefParamClause`, `UsingParamClause` must be present
-StructuralInstance ::=  ConstrApp {‘with’ ConstrApp} ‘with’ TemplateBody
-Extension         ::=  ‘extension’ [DefTypeParamClause] ‘(’ DefParam ‘)’
-                       {UsingParamClause} ExtMethods
-ExtMethods        ::=  ExtMethod | [nl] <<< ExtMethod {semi ExtMethod} >>>
-ExtMethod         ::=  {Annotation [nl]} {Modifier} ‘def’ DefDef
-Template          ::=  InheritClauses [TemplateBody]
-InheritClauses    ::=  [‘extends’ ConstrApps] [‘derives’ QualId {‘,’ QualId}]
-ConstrApps        ::=  ConstrApp ({‘,’ ConstrApp} | {‘with’ ConstrApp})
-ConstrApp         ::=  SimpleType1 {Annotation} {ParArgumentExprs}
-ConstrExpr        ::=  SelfInvocation
-                    |  <<< SelfInvocation {semi BlockStat} >>>
-SelfInvocation    ::=  ‘this’ ArgumentExprs {ArgumentExprs}
-
-TemplateBody      ::=  :<<< [SelfType] TemplateStat {semi TemplateStat} >>>
-TemplateStat      ::=  Import
-                    |  Export
-                    |  {Annotation [nl]} {Modifier} Def
-                    |  {Annotation [nl]} {Modifier} Dcl
-                    |  Extension
-                    |  Expr1
-                    |  EndMarker
-                    |
-SelfType          ::=  id [‘:’ InfixType] ‘=>’
-                    |  ‘this’ ‘:’ InfixType ‘=>’
-
-EnumBody          ::=  :<<< [SelfType] EnumStat {semi EnumStat} >>>
-EnumStat          ::=  TemplateStat
-                    |  {Annotation [nl]} {Modifier} EnumCase
-EnumCase          ::=  ‘case’ (id ClassConstr [‘extends’ ConstrApps]] | ids)
-
-TopStats          ::=  TopStat {semi TopStat}
-TopStat           ::=  Import
-                    |  Export
-                    |  {Annotation [nl]} {Modifier} Def
-                    |  Extension
-                    |  Packaging
-                    |  PackageObject
-                    |  EndMarker
-                    |
-Packaging         ::=  ‘package’ QualId :<<< TopStats >>>
-PackageObject     ::=  ‘package’ ‘object’ ObjectDef
-
-CompilationUnit   ::=  {‘package’ QualId semi} TopStats
-```
diff --git a/docs/docs/resources/talks.md b/docs/docs/resources/talks.md
deleted file mode 100644
index 8f054d7bd96e..000000000000
--- a/docs/docs/resources/talks.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-layout: doc-page
-title: Talks
----
-
-Talks on Dotty
---------------
-- (ScalaDays 2019, Lausanne) [A Tour of Scala 3](https://www.youtube.com/watch?v=_Rnrx2lo9cw) by [Martin Odersky](http://twitter.com/odersky) [\[slides\]](https://www.slideshare.net/Odersky/a-tour-of-scala-3)
-
-- (ScalaDays 2016, Berlin) [Scala's Road Ahead](https://www.youtube.com/watch?v=GHzWqJKFCk4) by [Martin Odersky](http://twitter.com/odersky) [\[slides\]](http://www.slideshare.net/Odersky/scala-days-nyc-2016)
-
-- (JVMLS 2015) [Compilers are Databases](https://www.youtube.com/watch?v=WxyyJyB_Ssc) by [Martin Odersky](http://twitter.com/odersky) [\[slides\]](http://www.slideshare.net/Odersky/compilers-are-databases)
-
-- (Scala World 2015) [Dotty: Exploring the future of Scala](https://www.youtube.com/watch?v=aftdOFuVU1o) by [Dmitry Petrashko](http://twitter.com/darkdimius) [\[slides\]](https://d-d.me/scalaworld2015/#/). 
-Dmitry covers many of the new features that Dotty brings on the table such as Intersection and Union types, improved lazy val initialization and more. 
-Dmitry also covers dotty internals and in particular the high-level of contextual abstractions of Dotty. You will get to 
-become familiar with many core concepts such as `Denotations`, their evolution through (compilation) time, their 
-transformations and more.
-
-Deep Dive with Dotty
---------------------
-- (ScalaDays 2019, Lausanne) [Metaprogramming in Dotty](https://www.youtube.com/watch?v=ZfDS_gJyPTc) by [Nicolas Stucki](https://github.com/nicolasstucki).
-
-- (ScalaDays 2019, Lausanne) [Future-proofing Scala: the TASTY intermediate representation](https://www.youtube.com/watch?v=zQFjC3zLYwo) by [Guillaume Martres](http://guillaume.martres.me/).
-
-- (Mar 21, 2017) [Dotty Internals 1: Trees & Symbols](https://www.youtube.com/watch?v=yYd-zuDd3S8) by [Dmitry Petrashko](http://twitter.com/darkdimius) [\[meeting notes\]](../internals/dotty-internals-1-notes.md). 
-This is a recorded meeting between EPFL and Waterloo, where we introduce first notions inside Dotty: Trees and Symbols.
-
-- (Mar 21, 2017) [Dotty Internals 2: Types](https://www.youtube.com/watch?v=3gmLIYlGbKc) by [Martin Odersky](http://twitter.com/odersky) and [Dmitry Petrashko](http://twitter.com/darkdimius).
-This is a recorded meeting between EPFL and Waterloo, where we introduce how types are represented inside Dotty.
-
-- (Jun 15, 2017) [Dotty Internals 3: Denotations](https://youtu.be/9iPA7zMRGKY) by [Martin Odersky](http://twitter.com/odersky) and [Dmitry Petrashko](http://twitter.com/darkdimius).
-This is a recorded meeting between EPFL and Waterloo, where we introduce denotations in Dotty.
-
-- (JVM Language Summit) [How do we make the Dotty compiler fast](https://www.youtube.com/watch?v=9xYoSwnSPz0) by [Dmitry Petrashko](http://twitter.com/darkdimius).
-[Dmitry Petrashko](http://twitter.com/darkdimius) gives a high-level introduction on what was done to make Dotty .
-
-
-- (Typelevel Summit Oslo, May 2016) [Dotty and types: the story so far](https://www.youtube.com/watch?v=YIQjfCKDR5A) by 
-Guillaume Martres [\[slides\]](http://guillaume.martres.me/talks/typelevel-summit-oslo/).
-Guillaume focused on some of the practical improvements to the type system that Dotty makes, like the new type parameter 
-inference algorithm that is able to reason about the type safety of more situations than scalac.
-
-- (flatMap(Oslo) 2016) [AutoSpecialization in Dotty](https://vimeo.com/165928176) by [Dmitry Petrashko](http://twitter.com/darkdimius) [\[slides\]](https://d-d.me/talks/flatmap2016/#/). 
-The Dotty Linker analyses your program and its dependencies to 
-apply a new specialization scheme. It builds on our experience from Specialization, Miniboxing and the Valhalla Project, 
-and drastically reduces the size of the emitted bytecode. And, best of all, it's always enabled, happens behind the 
-scenes without annotations,  and results in speedups in excess of 20x. Additionally, it "just works" on Scala collections.
-
-- (ScalaSphere 2016) [Hacking on Dotty: A live demo](https://www.youtube.com/watch?v=0OOYGeZLHs4) by Guillaume Martres [\[slides\]](http://guillaume.martres.me/talks/dotty-live-demo/).
-Guillaume hacks on Dotty: a live demo during which he 
-creates a simple compiler phase to trace method calls at run-time.
-
-- (Scala By the Bay 2016) [Dotty: what is it and how it works](https://www.youtube.com/watch?v=wCFbYu7xEJA) by Guillaume 
-Martres [\[slides\]](http://guillaume.martres.me/talks/dotty-tutorial/#/). Guillaume provides a high-level view of the 
-compilation-pipeline of Dotty.
-
-- (ScalaDays 2015, Amsterdam) [Making your Scala applications smaller and faster with the Dotty linker](https://www.youtube.com/watch?v=xCeI1ArdXM4) by Dmitry Petrashko [\[slides\]](https://d-d.me/scaladays2015/#/). 
-Dmitry introduces the call-graph analysis algorithm 
-that Dotty implements and the performance benefits we can get in terms of number of methods, bytecode size, JVM code size 
-and the number of objects allocated in the end.
diff --git a/docs/docs/usage/getting-started.md b/docs/docs/usage/getting-started.md
deleted file mode 100644
index 1131db5ab233..000000000000
--- a/docs/docs/usage/getting-started.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-layout: doc-page
-title: Getting Started: Users
----
-
-## Trying out Dotty
-
-### In your web browser
-[Scastie](https://scastie.scala-lang.org/?target=dotty), the online Scala playground, supports Dotty.
-This is an easy way to try Dotty without installing anything, directly in your browser.
-
-### sbt
-The fastest way to create a new project compiled by Dotty is using [sbt](http://www.scala-sbt.org/)
-
-Create a simple Dotty project:
-```bash
-$ sbt new scala/scala3.g8
-```
-
-Or a Dotty project that cross compiles with Scala 2:
-```bash
-$ sbt new scala/scala3-cross.g8
-```
-
-You can then start a Dotty REPL directly from your sbt project:
-```bash
-$ sbt
-> console
-scala>
-```
-
-For more information, see the [Dotty Example Project](https://github.com/scala/scala3-example-project)
-
-### IDE support
-Start using the Dotty IDE in any Dotty project by following the
-[IDE guide](./ide-support.md).
-
-### Standalone installation
-Releases are available for download on the [Releases Section](https://github.com/lampepfl/dotty/releases)
-of the Dotty repository. Releases include three executables: `scalac` the Dotty compiler,
-`scaladoc` the [Scaladoc](./scaladoc/index.md) and `scala` the Dotty REPL.
-
-```
-.
-└── bin
-    ├── scalac
-    ├── scaladoc
-    └── scala
-```
-
-Add these executables to your `PATH` and you will be able to run the corresponding commands directly
-from your console:
-```bash
-# Compile code using Dotty
-$ scalac HelloWorld.scala
-
-# Run it with the proper classpath
-$ scala HelloWorld
-
-# Start a Dotty REPL
-$ scala
-Starting dotty REPL...
-scala>
-```
-
-If you're a Mac user, we also provide a [homebrew](https://brew.sh/) package that can be installed by running:
-
-```bash
-brew install lampepfl/brew/dotty
-```
-
-In case you have already installed Dotty via brew, you should instead update it:
-
-```bash
-brew upgrade dotty
-```
-
-### Scala 3 for Scripting
-If you have followed the steps in "Standalone Installation" section and have the `scala` executable on your `PATH`, you can run `*.scala` files as scripts. Given a source named Test.scala:
-
-```scala
-@main def Test(name: String): Unit =
-  println(s"Hello ${name}!")
-```
-
-You can run: `scala Test.scala World` to get an output `Hello World!`.
-
-A "script" is an ordinary Scala file which contains a main method. The semantics of the `scala Script.scala` command is as follows:
-
-- Compile `Script.scala` with `scalac` into a temporary directory.
-- Detect the main method in the `*.class` files produced by the compilation.
-- Execute the main method.
diff --git a/docs/docs/usage/ide-support.md b/docs/docs/usage/ide-support.md
deleted file mode 100644
index 43150994cb89..000000000000
--- a/docs/docs/usage/ide-support.md
+++ /dev/null
@@ -1,67 +0,0 @@
----
-layout: doc-page
-title: "IDE support for Scala 3"
----
-
-IDE support for Scala 3 is available in IDEs based on [Scala Metals](https://scalameta.org/metals/)
-(e.g., Visual Studio Code, vim) and in [IntelliJ IDEA](https://www.jetbrains.com/idea/).
-
-
-## Using Visual Studio Code
-
-To use Visual Studio Code on a Scala 3 project, ensure you have the
-[Metals](https://scalameta.org/metals/docs/editors/vscode.html) plugin installed. Then open the
-project directory in VS code and click the "Import build" button in notification.
-
-
-### Under the Hood
-
-VS Code implements semantic features (such as completions, "go to definition")
-using the [Language Server Protocol (LSP)](https://github.com/Microsoft/language-server-protocol),
-so it needs a language server implementation. Metals is the implementation of LSP for Scala. It
-extracts semantic information from [semanticdb](https://scalameta.org/docs/semanticdb/guide.html),
-which is generated directly by the Scala 3 compiler.
-
-You can read more about Scala 3 support in Metals in
-[this blog post](https://medium.com/virtuslab/introduction-to-metals-with-scala-3-79ebf3120a95).
-
-To communicate with the build tool (e.g., to import the project, trigger builds, run tests),
-Metals uses the [Build Server Protocol (BSP)](https://build-server-protocol.github.io/). The
-default BSP implementation used by metals is [Bloop](https://scalacenter.github.io/bloop/), which
-supports Scala 3 projects. Alternatively,
-[sbt can be used as a BSP server](https://scalameta.org/metals/blog/2020/11/06/sbt-BSP-support.html)
-as it directly implements BSP since version 1.4.
-
-
-## Using IntelliJ IDEA
-
-IntelliJ has its own implementation for semantic features, so it does not use Metals or the
-Language Server Protocol (LSP).
-
-In order to import a project into IntelliJ there are two possibilities:
-
-  - Use the built-in feature to import sbt builds
-  - Use IntelliJ's support for the
-    [Build Server Protocol (BSP)](https://www.jetbrains.com/help/idea/bsp-support.html)
-
-
-### Importing the sbt build
-
-To use IntelliJ's sbt import, go to "File" - "Open..." and select your project's `build.sbt` file.
-
-In this mode, IntelliJ starts sbt with a custom plugin to extract the project structure. After
-importing, IntelliJ no longer interacts with other sbt sessions. Building and running the project
-within the IDE is done by separate processes.
-
-
-### Importing the project using BSP
-
-To import a project using BSP, go to "File" - "New" - "Project from Existing Sources" and select
-the project directory. In the upcoming dialog select "BSP" to import the project. You may be asked
-to choose between "sbt" and "sbt with Bloop", the recommended option is "sbt".
-
-If the project import fails ("Problem executing BSP job"), navigate to your project in a terminal
-and just start `sbt`. Once sbt is running, open the "bsp" tab in IntelliJ click the "Reload" button.
-
-When using IntelliJ's BSP mode, build and run commands from the IDE are executed through sbt, so
-they have the same effect as building or running the project through sbt in the terminal.
diff --git a/docs/docs/usage/language-versions.md b/docs/docs/usage/language-versions.md
deleted file mode 100644
index f98105f5cc47..000000000000
--- a/docs/docs/usage/language-versions.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-layout: doc-page
-title: "Language Versions"
----
-
-The default Scala language version currently supported by the Dotty compiler is `3.0`. There are also other language versions that can be specified instead:
-
- - `3.0-migration`: Same as `3.0` but with a Scala 2 compatibility mode that helps moving Scala 2.13 sources over to Scala 3. In particular, it
-
-    - flags some Scala 2 constructs that are disallowed in Scala 3 as migration warnings instead of hard errors,
-    - changes some rules to be more lenient and backwards compatible with Scala 2.13
-    - gives some additional warnings where the semantics has changed between Scala 2.13 and 3.0
-    - in conjunction with `-rewrite`, offer code rewrites from Scala 2.13 to 3.0.
-
- - `future`: A preview of changes introduced in the next versions after 3.0. In the doc pages here we refer to the language version with these changes as `3.1`, but it might be that some of these changes will be rolled out in later `3.x` versions.
-
- Some Scala-2 specific idioms will be dropped in this version. The feature set supported by this version will be refined over time  as we approach its release.
-
- - `future-migration`: Same as `future` but with additional helpers to migrate from `3.0`. Similarly to the helpers available under `3.0-migration`, these include migration warnings and optional rewrites.
-
-There are two ways to specify a language version.
-
- - With a `-source` command line setting, e.g. `-source 3.0-migration`.
- - With a `scala.language` import at the top of a compilation unit, e.g:
-
-```scala
-package p
-import scala.language.`future-migration`
-
-class C { ... }
-```
-
-Language imports supersede command-line settings in the compilation units where they are specified. Only one language import specifying a source version is allowed in a compilation unit, and it must come before any definitions in that unit.
-
diff --git a/docs/docs/usage/sbt-projects.md b/docs/docs/usage/sbt-projects.md
deleted file mode 100644
index 4b0b72f78f77..000000000000
--- a/docs/docs/usage/sbt-projects.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: doc-page
-title: "Using Dotty with sbt"
----
-
-To try it in your project see the [Getting Started User Guide](./getting-started.md).
diff --git a/docs/docs/usage/scaladoc/blog.md b/docs/docs/usage/scaladoc/blog.md
deleted file mode 100644
index 14d6ff9e1de9..000000000000
--- a/docs/docs/usage/scaladoc/blog.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Built-in blog
----
-
-# {{page.title}}
-
-Scaladoc allows you to include a simple blog in your documentation. For now, it
-provides only basic features. In the future, we plan to include more advanced
-features like tagging or author pages.
diff --git a/docs/docs/usage/scaladoc/docComments.md b/docs/docs/usage/scaladoc/docComments.md
deleted file mode 100644
index 87ca35cba26d..000000000000
--- a/docs/docs/usage/scaladoc/docComments.md
+++ /dev/null
@@ -1,96 +0,0 @@
----
-title: API Documentation
----
-
-# {{ page.title }}
-
-Scaladoc's main feature is creating API documentation from code comments.
-
-By default, the code comments are understood as Markdown, though we also support
-Scaladoc's old [Wiki syntax](https://docs.scala-lang.org/style/scaladoc.html).
-
-## Syntax
-
-### Definition links
-
-Our definition link syntax is quite close to Scaladoc's syntax, though we have made some
-quality-of-life improvements.
-
-#### Basic syntax
-
-A definition link looks as follows: `[[scala.collection.immutable.List]]`.
-
-Which is to say, a definition link is a sequence of identifiers separated by
-`.`. The identifiers can be separated with `#` as well for Scaladoc compatibility.
-
-By default, an identifier `id` references the first (in source order) entity
-named `id`. An identifier can end with `$`, which forces it to refer to a value
-(an object, a value, a given); an identifier can also end with `!`, which forces
-it to refer to a type (a class, a type alias, a type member).
-
-The links are resolved relative to the current location in source. That is, when
-documenting a class, the links are relative to the entity enclosing the class (a
-package, a class, an object); the same applies to documenting definitions.
-
-Special characters in links can be backslash-escaped, which makes them part of
-identifiers instead. For example, `` [[scala.collection.immutable\.List]] ``
-references the class named `` `immutable.List` `` in package `scala.collection`.
-
-#### New syntax
-
-We have extended Scaladoc definition links to make them a bit more pleasant to
-write and read in source. The aim was also to bring the link and Scala syntax
-closer together. The new features are:
-
-1. `package` can be used as a prefix to reference the enclosing package
-    Example:
-    ```
-    package utils
-    class C {
-      def foo = "foo".
-    }
-    /** See also [[package.C]]. */
-    class D {
-      def bar = "bar".
-    }
-    ```
-    The `package` keyword helps make links to the enclosing package shorter
-    and a bit more resistant to name refactorings.
-1. `this` can be used as a prefix to reference the enclosing classlike
-    Example:
-    ```
-    class C {
-      def foo = "foo"
-      /** This is not [[this.foo]], this is bar. */
-      def bar = "bar"
-    }
-    ```
-    Using a Scala keyword here helps make the links more familiar, as well as
-    helps the links survive class name changes.
-1. Backticks can be used to escape identifiers
-    Example:
-    ```
-    def `([.abusive.])` = ???
-    /** TODO: Figure out what [[`([.abusive.])`]] is. */
-    def foo = `([.abusive.])`
-    ```
-    Previously (versions 2.x), Scaladoc required backslash-escaping to reference such identifiers. Now (3.x versions),
-    Scaladoc allows using the familiar Scala backtick quotation.
-
-#### Why keep the Wiki syntax for links?
-
-There are a few reasons why we've kept the Wiki syntax for documentation links
-instead of reusing the Markdown syntax. Those are:
-
-1. Nameless links in Markdown are ugly: `[](definition)` vs `[[definition]]`
-    By far, most links in documentation are nameless. It should be obvious how to
-    write them.
-2. Local member lookup collides with URL fragments: `[](#field)` vs `[[#field]]`
-3. Overload resolution collides with MD syntax: `[](meth(Int))` vs `[[meth(Int)]]`
-4. Now that we have a parser for the link syntax, we can allow spaces inside (in
-    Scaladoc one needed to slash-escape those), but that doesn't get recognized
-    as a link in Markdown: `[](meth(Int, Float))` vs `[[meth(Int, Float)]]`
-
-None of these make it completely impossible to use the standard Markdown link
-syntax, but they make it much more awkward and ugly than it needs to be. On top
-of that, Markdown link syntax doesn't even save any characters.
diff --git a/docs/docs/usage/scaladoc/index.md b/docs/docs/usage/scaladoc/index.md
deleted file mode 100644
index ef0db90daebf..000000000000
--- a/docs/docs/usage/scaladoc/index.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: scaladoc
----
-
-![scaladoc logo](/images/scaladoc-logo.png)
-
-scaladoc is a tool to generate documentation for your Scala 3 projects. It provides similar features to `javadoc` as well as `jekyll` or `docusaurus`.
-
-As you probably have guessed, this whole site was created using scaladoc.
-
-
-{% for post in site.posts %}
-## [{{ post.title }}](/{{ post.url }})
-
-{{ post.excerpt }}
-
-[ (read more) ](/{{ post.url }})
-
-{% endfor %}
-
-## Other extensions
-
-We would love to have your feedback on what you think would be good in order to
-render the documentation you want! Perhaps you would like to render method
-definitions or members? Do you want to have runnable code snippets? Let us know
-by filing [issues](https://github.com/lampepfl/dotty/issues/new)!
diff --git a/docs/docs/usage/scaladoc/specificTags.md b/docs/docs/usage/scaladoc/specificTags.md
deleted file mode 100644
index 0aa794add501..000000000000
--- a/docs/docs/usage/scaladoc/specificTags.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Scaladoc-specific Tags and Features
----
-
-# {{page.title}}
-
-Scaladoc extends Markdown with additional features, such as linking
-to API definitions. This can be used from within static documentation and blog
-posts to provide blend-in content.
-
-## Linking to API
-
-Scaladoc allows linking to API documentation with Wiki-style links. Linking to
-`scala.collection.immutable.List` is as simple as
-`[[scala.collection.immutable.List]]`. For more information on the exact syntax, see [doc comment documentation](./docComments.html#definition-links).
diff --git a/docs/docs/usage/scaladoc/staticSite.md b/docs/docs/usage/scaladoc/staticSite.md
deleted file mode 100644
index b84e84716214..000000000000
--- a/docs/docs/usage/scaladoc/staticSite.md
+++ /dev/null
@@ -1,125 +0,0 @@
----
-title: Static documentation
----
-
-# {{ page.title}}
-
-Scaladoc is able to generate static sites, known from [Jekyll](http://jekyllrb.com/) or [Docusaurus](https://docusaurus.io/).
-Having a combined tool allows to provide interaction between static documentation and API, thus allowing the two to blend naturally.
-
-Creating a site is just as simple as in Jekyll. The site root contains the
-layout of the site and all files placed there will be either considered static,
-or processed for template expansion.
-
-The files that are considered for template expansion must end in `*.{html,md}`
-and will from here on be referred to as "template files" or "templates".
-
-A simple "hello world" site could look something like this:
-
-```
-├── docs
-│   └── getting-started.md
-└── index.html
-```
-
-This will give you a site with the following files in generated documentation:
-
-```
-index.html
-docs/getting-started.html
-```
-
-Scaladoc can transform both files and directories (to organize your documentation into tree-like structure). By default directories has title based on file name and has empty content. There is an option to include `index.html` or `index.md` (not both) to provide both content and properties like title (see [Properties](#properties)).
-
-## Properties
-
-Scaladoc uses the [Liquid](https://shopify.github.io/liquid/) templating engine
-and provides a number of custom filters and tags specific to Scala
-documentation.
-
-In Scaladoc, all templates can contain YAML front-matter. The front-matter
-is parsed and put into the `page` variable available in templates via Liquid.
-
-Scaladoc uses some predefined properties to controls some aspect of page.
-
-Predefined properties:
-
- - **title** provide page title that will be used in navigation and html metadata.
- - **extraCss** additional `.css` files that will be included in this page. Paths should be relative to documentation root. **This setting is not exported to template engine.**
- - **extraJs** additional `.js` files that will be included in this page. Paths should be relative to documentation root. **This setting is not exported to template engine.**
- - **hasFrame** when set to `false` page will not include default layout (navigation, breadcrumbs etc.) but only token html wrapper to provide metadata and resources (js and css files). **This setting is not exported to template engine.**
-- **layout** - predefined layout to use, see below. **This setting is not exported to template engine.**
-
-
-## Using existing Templates and Layouts
-
-To perform template expansion, Dottydoc looks at the `layout` field in the front-matter.
-Here's a simple example of the templating system in action, `index.html`:
-
-```html
----
-layout: main
----
-
-<h1>Hello world!</h1>
-```
-
-With a simple main template like this:
-
-{% raw %}
-```html
-<html>
-    <head>
-        <title>Hello, world!</title>
-    </head>
-    <body>
-        {{ content }}
-    </body>
-</html>
-```
-
-Would result in `{{ content }}` being replaced by `<h1>Hello world!</h1>` from
-the `index.html` file.
-{% endraw %}
-
-Layouts must be placed in a `_layouts` directory in the site root:
-
-```
-├── _layouts
-│   └── main.html
-├── docs
-│   └── getting-started.md
-└── index.html
-```
-
-Sidebar
-=======
-Scaladoc by default uses layout of files in `docs` directory to create table of content. There is also ability to override it by providing a `sidebar.yml` file in the site root:
-
-```yaml
-sidebar:
-    - title: Blog
-      url: blog/index.html
-    - title: Docs
-      url: docs/index.html
-    - title: Usage
-      subsection:
-        - title: Dottydoc
-          url: docs/usage/dottydoc.html
-        - title: sbt-projects
-          url: docs/usage/sbt-projects.html
-```
-
-The `sidebar` key is mandatory, as well as `title` for each element. The
-default table of contents allows you to have subsections - albeit the current
-depth limit is 2 however it accepts both files and directories and latter can be used to provide deeper structures.
-
-The items which have on the `subsection` level does not accepts `url`.
-
-```
-├── blog
-│   └── _posts
-│       └── 2016-12-05-implicit-function-types.md
-├── index.html
-└── sidebar.yml
-```
diff --git a/docs/docs/usage/worksheet-mode.md b/docs/docs/usage/worksheet-mode.md
deleted file mode 100644
index 52739774c836..000000000000
--- a/docs/docs/usage/worksheet-mode.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-layout: doc-page
-title: "Worksheet mode with Dotty IDE"
----
-
-A worksheet is a Scala file that is evaluated on save, and the result of each
-expression is shown in a column to the right of your program. Worksheets are
-like a REPL session on steroids, and enjoy 1st class editor support: completion,
-hyperlinking, interactive errors-as-you-type, etc. Worksheet use the extension
-`.sc`.
-
-How to use the worksheets
-=========================
-The only supported client for the Worksheet mode is [Visual Studio
-Code](https://code.visualstudio.com/).
-
-To use the worksheets, start Dotty IDE by [following the
-instruction](ide-support.md) and create a new file `MyWorksheet.sc` and
-write some code:
-
-```scala
-val xyz = 123
-println("Hello, worksheets!")
-456 + xyz
-```
-
-On top of the buffer, the message `Run this worksheet` appears. Click it to
-evaluate the code of the worksheet. Each line of output is printed on the right
-of the expression that produced it. The worksheets run with the classes of your
-project and its dependencies on their classpath.
-
-![](images/worksheets/worksheet-run.png "Run worksheet")
-
-By default, the worksheets are also run when the file is saved. This can be
-configured in VSCode preferences:
-
-![](images/worksheets/config-autorun.png "Configure run on save")
-
-Note that the worksheet are fully integrated with the rest of Dotty IDE: While
-typing, errors are shown, completions are suggested, and you can use all the
-other features of Dotty IDE such as go to definition, find all references, etc.
-
-![](images/worksheets/worksheet-help.png "IDE features in the worksheet")
-
-Implementation details
-======================
-
-The implementation details of the worksheet mode and the information necessary to add support for
-other clients are available in [Worksheet mode - Implementation
-details](worksheet-mode-implementation-details.md).
diff --git a/docs/index.html b/docs/index.html
deleted file mode 100644
index a6e99cb73265..000000000000
--- a/docs/index.html
+++ /dev/null
@@ -1,104 +0,0 @@
----
-title: Scala 3
-layout: main
-hasFrame: false
-extraCSS:
-    - css/frontpage.css
----
-
-<section class="page bg-red bg-dark">
-    <header>
-        <nav class="navbar navbar-expand-md navbar-dark">
-            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarContent">
-                <i class="fas fa-bars"></i>
-            </button>
-            <div class="collapse navbar-collapse" id="navbarContent">
-                <ul class="navbar-nav ml-auto mr-0">
-                    <li class="nav-item">
-                        <a class="nav-link" href="#getting-started">
-                            Try it now
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="blog/index.html">
-                            Blog
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="docs/index.html">
-                            Reference
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="https://docs.scala-lang.org/scala3/">
-                            Docs
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="https://github.com/lampepfl/dotty">
-                            <i class="fab fa-github"></i>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </nav>
-    </header>
-    <div class="container">
-        <div class="scala-logo-container">
-            <img src="images/dotty-logo-white.svg" alt="logo" />
-            <div class="subtitle text-center">
-                <h1 id="dotty" class="above-byline">Scala 3</h1>
-                <p>A next-generation compiler for Scala</p>
-                <p>(scroll down for more info)</p>
-            </div>
-        </div>
-    </div>
-</section>
-<section class="page bg-blue bg-dark">
-  <div class="container">
-
-      <h1 id="getting-started">Try Scala 3</h1>
-      <p>There are multiple ways of <a href="https://docs.scala-lang.org/scala3/getting-started.html">getting started</a> with Scala 3.</p>
-      <ol>
-          <li>You can try Scala 3 in your browser with <a href="https://scastie.scala-lang.org/?target=dotty">Scastie</a>.</li>
-          <li>If you already have sbt installed, you can <a href="#getting-started-with-a-project">create a Scala 3 project</a> and sbt will take care of the rest.</li>
-          <li>You can install all necessary dependencies with <a href="https://get-coursier.io/">coursier</a> by running <code>cs setup</code>. You can also run <code>cs install scala3-compiler</code> or <code>cs install scala3-repl</code> to install command-line commands for the compiler and repl, correspondingly.</li>
-          <li>You can <a href="#install">manually install Scala 3</a> on your computer.</li>
-      </ol>
-
-      <h1 id="install">Install Scala 3</h1>
-      <p>If you are a <strong>Mac</strong> user, you can install Scala 3 with <a href="https://brew.sh/">brew</a>:</p>
-      <pre><code>brew install lampepfl/brew/dotty</code></pre>
-
-      <p>
-        If you are a <strong>Linux</strong> or <strong>Windows</strong> user, as a prerequisite you need a JDK 8 or later properly installed on your system. The environment variable <code>JAVA_HOME</code> should point to your Java installation.<br/>
-        For <strong>Windows</strong> users, we recommend using <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10">the Windows subsystem for linux</a> or some other bash shell like <a href="https://gitforwindows.org/">git bash</a>.<br/>
-        Then download the <a href="https://github.com/lampepfl/dotty/releases">latest release</a>. Optionally add the path of the folder <code>bin/</code> to the system environment variable <code>PATH</code>.
-      </p>
-
-      <p>Now you can compile Scala source code:</p>
-      <pre><code>scalac hello.scala</code></pre>
-
-      <p>To start the REPL, run: <code>scala</code>.</p>
-
-      <h1 id="getting-started-with-a-project">Create a Scala 3 Project</h1>
-      <p>The fastest way to create a new project in Scala 3 is using <a href="http://www.scala-sbt.org/">sbt (1.1.4+)</a>.</p>
-
-      <p>Create a Scala 3 project:</p>
-      <pre><code>sbt new <a href="https://github.com/lampepfl/dotty.g8">lampepfl/dotty.g8</a></code></pre>
-
-      <p>Or a Scala 3 project that cross compiles with Scala 2:</p>
-      <pre><code>sbt new <a href="https://github.com/lampepfl/dotty-cross.g8">lampepfl/dotty-cross.g8</a></code></pre>
-
-      <p>For documentation see the <a href="https://github.com/lampepfl/dotty-example-project">Scala 3 Example Project</a>.</p>
-
-      <h1 id="documentation">Learn more about Scala 3</h1>
-      <p>You can find much more information about Scala 3 in ...</p>
-      <ul>
-        <li>... the <a href="https://docs.scala-lang.org/scala3/">Scala 3 documentation</a>,</li>
-        <li>... the <a href="https://docs.scala-lang.org/scala3/book/introduction.html">Scala 3 book</a>,</li>
-        <li>... the <a href="docs/index.html">Scala 3 reference docs</a>,</li>
-        <li>... the <a href="https://docs.scala-lang.org/scala3/guides.html">Scala 3 guides</a>.</li>
-      </ul>
-  </div>
-</section>
diff --git a/docs/logo.svg b/docs/logo.svg
deleted file mode 100644
index 44c8b71850ce..000000000000
--- a/docs/logo.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<svg width="64px" height="109px" viewBox="0 0 64 109" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-    <g id="logo-background" transform="translate(0.000000, 16.000000)" fill="#CCC">
-      <path d="M0.5,59.5 C0.5,59.5 63.4,65.8 63.4,76.3 L63.4,51.1 C63.4,51.1 63.4,40.6 0.5,34.3 L0.5,59.5 L0.5,59.5 Z" id="logo-background-bottom"></path>
-      <path d="M0.5,25.9 C0.5,25.9 63.4,32.2 63.4,42.7 L63.4,17.5 C63.4,17.5 63.4,7 0.5,0.7 L0.5,10.5 L0.5,25.9 L0.5,25.9 Z" id="logo-background-top"></path>
-    </g>
-    <g id="logo-foreground" fill="#FFF">
-      <path d="M0.5,109 L0.5,83.8 C0.5,83.8 63.4,77.5 63.4,67 L63.4,92.2 C63.5,92.3 63.5,102.7 0.5,109" id="Logo_Foreground_Bottom"></path>
-      <path d="M0.5,50.3 C0.5,50.3 63.4,44 63.4,33.5 L63.4,58.7 C63.4,58.7 63.4,69.2 0.5,75.5 L0.5,50.3 L0.5,50.3 Z" id="Logo_Foreground_Middle"></path>
-      <path d="M63.5,0 L63.5,25.2 C63.5,25.2 63.5,35.7 0.6,42 L0.6,16.7 C0.5,16.7 63.5,10.5 63.5,0" id="logo-foreground-top"></path>
-    </g>
-    <g id="dots" transform="translate(4.000000, 10.000000)" fill="#B6B6B6">
-      <g id="bottom" transform="translate(0.000000, 67.500000)">
-        <path d="M1.4471104,12.2885536 C1.45019313,12.2881864 1.45019313,12.2881864 1.45327704,12.2878189 C1.91768952,12.2324787 2.24930811,11.8111359 2.1939679,11.3467234 C2.13862768,10.8823109 1.71728488,10.5506923 1.2528724,10.6060325 C1.24980572,10.606398 1.24980572,10.606398 1.24674021,10.6067632 C0.782326598,10.6620939 0.450699376,11.0834299 0.506030077,11.5478435 C0.561360778,12.0122571 0.982696791,12.3438844 1.4471104,12.2885536 L1.4471104,12.2885536 Z M9.34858965,12.1304907 C9.35409106,12.129756 9.35409106,12.129756 9.35959333,12.129021 C10.1807278,12.019341 10.7574756,11.2647668 10.6477955,10.4436323 C10.5381155,9.62249789 9.78354128,9.04575011 8.96240683,9.15543014 C8.95693539,9.15616095 8.95693539,9.15616095 8.95146479,9.15689157 C8.13032806,9.26655457 7.55356464,10.0211168 7.66322765,10.8422536 C7.77289065,11.6633903 8.52745292,12.2401537 9.34858965,12.1304907 L9.34858965,12.1304907 Z M17.0066591,11.0493128 C17.0121188,11.0484984 17.0121188,11.0484984 17.0175789,11.0476838 C17.8369369,10.9254384 18.4020584,10.1621181 18.279813,9.34276003 C18.1575677,8.52340201 17.3942473,7.95828052 16.5748893,8.08052587 C16.5694641,8.08133528 16.5694641,8.08133528 16.5640392,8.08214454 C15.7446783,8.20437064 15.1795389,8.96767771 15.301765,9.78703861 C15.4239911,10.6063995 16.1872982,11.1715389 17.0066591,11.0493128 L17.0066591,11.0493128 Z M24.8225082,10.4232459 C24.8297684,10.4220275 24.8297684,10.4220275 24.8370287,10.420809 C25.922252,10.2386672 26.6543441,9.21126476 26.4722023,8.12604147 C26.2900605,7.04081818 25.2626581,6.30872601 24.1774348,6.49086783 C24.1702314,6.4920768 24.1702314,6.4920768 24.1630282,6.49328559 C23.0777996,6.67539597 22.3456777,7.70277717 22.5277881,8.78800574 C22.7098984,9.87323431 23.7372796,10.6053563 24.8225082,10.4232459 L24.8225082,10.4232459 Z M32.4725265,9.05261002 C33.5532108,8.84532993 34.2612448,7.80122849 34.0539647,6.72054419 C33.8466846,5.63985989 32.8025831,4.93182589 31.7218988,5.13910599 C31.714724,5.14048211 31.714724,5.14048211 31.7075489,5.14185807 C30.6268567,5.34909665 29.9187826,6.39317088 30.1260211,7.47386314 C30.3332597,8.5545554 31.3773339,9.26262952 32.4580262,9.05539095 C32.4652764,9.05400057 32.4652764,9.05400057 32.4725265,9.05261002 Z M39.8723866,6.89476879 C39.877909,6.8935242 39.877909,6.8935242 39.883431,6.89227947 C40.6915794,6.71010471 41.1990314,5.90728916 41.0168566,5.09914075 C40.8346818,4.29099233 40.0318663,3.78354042 39.2237179,3.96571517 C39.218279,3.96694116 39.218279,3.96694116 39.2128397,3.96816703 C38.404681,4.15029588 37.8971834,4.9530826 38.0793123,5.76124136 C38.2614411,6.56940012 39.0642279,7.07689764 39.8723866,6.89476879 L39.8723866,6.89476879 Z M47.4276119,5.00828445 C47.4329844,5.00678549 47.4329844,5.00678549 47.4383562,5.00528637 C48.2362896,4.78258973 48.7026111,3.95520561 48.4799145,3.15727221 C48.2572179,2.35933881 47.4298337,1.89301728 46.6319003,2.11571391 C46.6266645,2.1171751 46.6266645,2.1171751 46.6214279,2.11863616 C45.8234736,2.34125773 45.3570742,3.16859798 45.5796958,3.96655233 C45.8023173,4.76450667 46.6296576,5.23090603 47.4276119,5.00828445 L47.4276119,5.00828445 Z M54.419759,2.30643871 C54.8556933,2.13695884 55.0716973,1.6461737 54.9022174,1.21023941 C54.7327376,0.774305114 54.2419524,0.558301127 53.8060181,0.727780997 C53.8032127,0.728871549 53.8032127,0.728871549 53.8004064,0.729962021 C53.3644359,0.89934874 53.148327,1.39008772 53.3177137,1.82605822 C53.4871005,2.26202871 53.9778394,2.47813756 54.4138099,2.30875084 C54.4167849,2.30759485 54.4167849,2.30759485 54.419759,2.30643871 Z" id="Shape"></path>
-        <path d="M1.67760355,20.096503 C1.68306395,20.0958524 1.68306395,20.0958524 1.68852642,20.0952015 C2.51113381,19.9971782 3.09852524,19.2508595 3.00050189,18.4282521 C2.90247854,17.6056447 2.15615986,17.0182533 1.33355246,17.1162767 C1.3281205,17.1169239 1.3281205,17.1169239 1.3226906,17.1175709 C0.500081196,17.2155774 -0.0873255124,17.961884 0.0106809923,18.7844934 C0.108687497,19.6071028 0.854994145,20.1945095 1.67760355,20.096503 L1.67760355,20.096503 Z M9.34858965,19.1274206 C9.35409106,19.1266859 9.35409106,19.1266859 9.35959333,19.1259509 C10.1807278,19.0162709 10.7574756,18.2616967 10.6477955,17.4405622 C10.5381155,16.6194278 9.78354128,16.04268 8.96240683,16.15236 C8.95693539,16.1530908 8.95693539,16.1530908 8.95146479,16.1538215 C8.13032806,16.2634845 7.55356464,17.0180467 7.66322765,17.8391835 C7.77289065,18.6603202 8.52745292,19.2370836 9.34858965,19.1274206 L9.34858965,19.1274206 Z M17.1767435,18.6256231 C17.1839958,18.6245412 17.1839958,18.6245412 17.1912486,18.6234592 C18.27963,18.4610765 19.0303002,17.4471319 18.8679175,16.3587506 C18.7055348,15.2703693 17.6915903,14.519699 16.6032089,14.6820817 C16.5960024,14.6831569 16.5960024,14.6831569 16.5887964,14.6842319 C15.5004112,14.846589 14.7497172,15.8605159 14.9120743,16.948901 C15.0744314,18.0372862 16.0883584,18.7879802 17.1767435,18.6256231 L17.1767435,18.6256231 Z M24.8370287,17.4177379 C25.922252,17.2355961 26.6543441,16.2081937 26.4722023,15.1229704 C26.2900605,14.0377471 25.2626581,13.3056549 24.1774348,13.4877968 C24.1702314,13.4890057 24.1702314,13.4890057 24.1630282,13.4902145 C23.0777996,13.6723249 22.3456777,14.6997061 22.5277881,15.7849347 C22.7098984,16.8701632 23.7372796,17.6022852 24.8225082,17.4201748 C24.8297684,17.4189565 24.8297684,17.4189565 24.8370287,17.4177379 Z M32.4725265,16.061085 C33.5532108,15.853199 34.2612448,14.8060455 34.0539647,13.7222022 C33.8466846,12.6383589 32.8025831,11.9282552 31.7218988,12.1361412 C31.714724,12.1375214 31.714724,12.1375214 31.7075489,12.1389013 C30.6268567,12.3467457 29.9187826,13.3938719 30.1260211,14.4777232 C30.3332597,15.5615745 31.3773339,16.2717185 32.4580262,16.0638741 C32.4652764,16.0624797 32.4652764,16.0624797 32.4725265,16.061085 Z M40.0707225,14.4695476 C40.0780573,14.4678946 40.0780573,14.4678946 40.0853916,14.4662413 C41.158768,14.2242783 41.8327617,13.1579849 41.5907986,12.0846085 C41.3488355,11.011232 40.2825422,10.3372384 39.2091657,10.5792015 C39.2019419,10.5808298 39.2019419,10.5808298 39.1947175,10.582458 C38.1213273,10.8243601 37.447273,11.8906152 37.6891752,12.9640053 C37.9310773,14.0373955 38.9973324,14.7114498 40.0707225,14.4695476 L40.0707225,14.4695476 Z M47.4276119,12.0082845 C47.4329844,12.0067855 47.4329844,12.0067855 47.4383562,12.0052864 C48.2362896,11.7825897 48.7026111,10.9552056 48.4799145,10.1572722 C48.2572179,9.35933881 47.4298337,8.89301728 46.6319003,9.11571391 C46.6266645,9.1171751 46.6266645,9.1171751 46.6214279,9.11863616 C45.8234736,9.34125773 45.3570742,10.168598 45.5796958,10.9665523 C45.8023173,11.7645067 46.6296576,12.230906 47.4276119,12.0082845 L47.4276119,12.0082845 Z M54.8999721,9.57562965 C54.9052414,9.57358217 54.9052414,9.57358217 54.9105092,9.57153441 C55.6826371,9.27135123 56.0652239,8.40207131 55.7650408,7.62994336 C55.4648576,6.85781542 54.5955777,6.4752286 53.8234497,6.77541179 C53.8184808,6.77734338 53.8184808,6.77734338 53.8135101,6.77927482 C53.0413181,7.07929302 52.6585455,7.94849117 52.9585637,8.72068323 C53.2585819,9.4928753 54.12778,9.87564785 54.8999721,9.57562965 L54.8999721,9.57562965 Z" id="Shape"></path>
-        <path d="M1.45327704,26.6978168 C1.54647464,26.6867112 1.63432439,26.660866 1.7147722,26.6228911 C2.03520341,26.4716332 2.23820252,26.1279362 2.1939679,25.7567213 C2.13862768,25.2923089 1.71728488,24.9606903 1.2528724,25.0160305 C1.24980572,25.0163959 1.24980572,25.0163959 1.24674021,25.0167611 C0.782326598,25.0720918 0.450699376,25.4934278 0.506030077,25.9578415 C0.561360778,26.4222551 0.982696791,26.7538823 1.4471104,26.6985516 C1.45019313,26.6981843 1.45019313,26.6981843 1.45327704,26.6978168 Z M9.34858965,26.1274206 C9.35409106,26.1266859 9.35409106,26.1266859 9.35959333,26.1259509 C10.1807278,26.0162709 10.7574756,25.2616967 10.6477955,24.4405622 C10.5381155,23.6194278 9.78354128,23.04268 8.96240683,23.15236 C8.95693539,23.1530908 8.95693539,23.1530908 8.95146479,23.1538215 C8.13032806,23.2634845 7.55356464,24.0180467 7.66322765,24.8391835 C7.77289065,25.6603202 8.52745292,26.2370836 9.34858965,26.1274206 L9.34858965,26.1274206 Z M17.0066591,25.0462427 C17.0121188,25.0454283 17.0121188,25.0454283 17.0175789,25.0446136 C17.8369369,24.9223683 18.4020584,24.1590479 18.279813,23.3396899 C18.1575677,22.5203319 17.3942473,21.9552104 16.5748893,22.0774558 C16.5694641,22.0782652 16.5694641,22.0782652 16.5640392,22.0790744 C15.7446783,22.2013005 15.1795389,22.9646076 15.301765,23.7839685 C15.4239911,24.6033294 16.1872982,25.1684688 17.0066591,25.0462427 L17.0066591,25.0462427 Z M24.8225082,24.4201748 C24.8297684,24.4189565 24.8297684,24.4189565 24.8370287,24.4177379 C25.922252,24.2355961 26.6543441,23.2081937 26.4722023,22.1229704 C26.2900605,21.0377471 25.2626581,20.3056549 24.1774348,20.4877968 C24.1702314,20.4890057 24.1702314,20.4890057 24.1630282,20.4902145 C23.0777996,20.6723249 22.3456777,21.6997061 22.5277881,22.7849347 C22.7098984,23.8701632 23.7372796,24.6022852 24.8225082,24.4201748 L24.8225082,24.4201748 Z M32.4725265,23.0495399 C33.5532108,22.8422598 34.2612448,21.7981584 34.0539647,20.7174741 C33.8466846,19.6367898 32.8025831,18.9287558 31.7218988,19.1360359 C31.714724,19.137412 31.714724,19.137412 31.7075489,19.138788 C30.6268567,19.3460265 29.9187826,20.3901008 30.1260211,21.470793 C30.3332597,22.5514853 31.3773339,23.2595594 32.4580262,23.0523208 C32.4652764,23.0509305 32.4652764,23.0509305 32.4725265,23.0495399 Z M39.8723866,20.8947688 C39.877909,20.8935242 39.877909,20.8935242 39.883431,20.8922795 C40.6915794,20.7101047 41.1990314,19.9072892 41.0168566,19.0991407 C40.8346818,18.2909923 40.0318663,17.7835404 39.2237179,17.9657152 C39.218279,17.9669412 39.218279,17.9669412 39.2128397,17.968167 C38.404681,18.1502959 37.8971834,18.9530826 38.0793123,19.7612414 C38.2614411,20.5694001 39.0642279,21.0768976 39.8723866,20.8947688 L39.8723866,20.8947688 Z M47.4276119,19.0082845 C47.4329844,19.0067855 47.4329844,19.0067855 47.4383562,19.0052864 C48.2362896,18.7825897 48.7026111,17.9552056 48.4799145,17.1572722 C48.2572179,16.3593388 47.4298337,15.8930173 46.6319003,16.1157139 C46.6266645,16.1171751 46.6266645,16.1171751 46.6214279,16.1186362 C45.8234736,16.3412577 45.3570742,17.168598 45.5796958,17.9665523 C45.8023173,18.7645067 46.6296576,19.230906 47.4276119,19.0082845 L47.4276119,19.0082845 Z M54.4138099,15.7087505 C54.4167849,15.7075945 54.4167849,15.7075945 54.419759,15.7064383 C54.8556933,15.5369585 55.0716973,15.0461733 54.9022174,14.610239 C54.7327376,14.1743047 54.2419524,13.9583007 53.8060181,14.1277806 C53.8032127,14.1288712 53.8032127,14.1288712 53.8004064,14.1299616 C53.3644359,14.2993484 53.148327,14.7900873 53.3177137,15.2260578 C53.4871005,15.6620283 53.9778394,15.8781372 54.4138099,15.7087505 L54.4138099,15.7087505 Z" id="Shape"></path>
-      </g>
-      <g id="middle" transform="translate(0.000000, 33.900002)">
-        <path d="M1.4471104,12.2885536 C1.45019313,12.2881864 1.45019313,12.2881864 1.45327704,12.2878189 C1.91768952,12.2324787 2.24930811,11.8111359 2.1939679,11.3467234 C2.13862768,10.8823109 1.71728488,10.5506923 1.2528724,10.6060325 C1.24980572,10.606398 1.24980572,10.606398 1.24674021,10.6067632 C0.782326598,10.6620939 0.450699376,11.0834299 0.506030077,11.5478435 C0.561360778,12.0122571 0.982696791,12.3438844 1.4471104,12.2885536 L1.4471104,12.2885536 Z M9.34858965,12.1304907 C9.35409106,12.129756 9.35409106,12.129756 9.35959333,12.129021 C10.1807278,12.019341 10.7574756,11.2647668 10.6477955,10.4436323 C10.5381155,9.62249789 9.78354128,9.04575011 8.96240683,9.15543014 C8.95693539,9.15616095 8.95693539,9.15616095 8.95146479,9.15689157 C8.13032806,9.26655457 7.55356464,10.0211168 7.66322765,10.8422536 C7.77289065,11.6633903 8.52745292,12.2401537 9.34858965,12.1304907 L9.34858965,12.1304907 Z M17.0066591,11.0493128 C17.0121188,11.0484984 17.0121188,11.0484984 17.0175789,11.0476838 C17.8369369,10.9254384 18.4020584,10.1621181 18.279813,9.34276003 C18.1575677,8.52340201 17.3942473,7.95828052 16.5748893,8.08052587 C16.5694641,8.08133528 16.5694641,8.08133528 16.5640392,8.08214454 C15.7446783,8.20437064 15.1795389,8.96767771 15.301765,9.78703861 C15.4239911,10.6063995 16.1872982,11.1715389 17.0066591,11.0493128 L17.0066591,11.0493128 Z M24.8225082,10.4232459 C24.8297684,10.4220275 24.8297684,10.4220275 24.8370287,10.420809 C25.922252,10.2386672 26.6543441,9.21126476 26.4722023,8.12604147 C26.2900605,7.04081818 25.2626581,6.30872601 24.1774348,6.49086783 C24.1702314,6.4920768 24.1702314,6.4920768 24.1630282,6.49328559 C23.0777996,6.67539597 22.3456777,7.70277717 22.5277881,8.78800574 C22.7098984,9.87323431 23.7372796,10.6053563 24.8225082,10.4232459 L24.8225082,10.4232459 Z M32.4725265,9.05261002 C33.5532108,8.84532993 34.2612448,7.80122849 34.0539647,6.72054419 C33.8466846,5.63985989 32.8025831,4.93182589 31.7218988,5.13910599 C31.714724,5.14048211 31.714724,5.14048211 31.7075489,5.14185807 C30.6268567,5.34909665 29.9187826,6.39317088 30.1260211,7.47386314 C30.3332597,8.5545554 31.3773339,9.26262952 32.4580262,9.05539095 C32.4652764,9.05400057 32.4652764,9.05400057 32.4725265,9.05261002 Z M39.8723866,6.89476879 C39.877909,6.8935242 39.877909,6.8935242 39.883431,6.89227947 C40.6915794,6.71010471 41.1990314,5.90728916 41.0168566,5.09914075 C40.8346818,4.29099233 40.0318663,3.78354042 39.2237179,3.96571517 C39.218279,3.96694116 39.218279,3.96694116 39.2128397,3.96816703 C38.404681,4.15029588 37.8971834,4.9530826 38.0793123,5.76124136 C38.2614411,6.56940012 39.0642279,7.07689764 39.8723866,6.89476879 L39.8723866,6.89476879 Z M47.4276119,5.00828445 C47.4329844,5.00678549 47.4329844,5.00678549 47.4383562,5.00528637 C48.2362896,4.78258973 48.7026111,3.95520561 48.4799145,3.15727221 C48.2572179,2.35933881 47.4298337,1.89301728 46.6319003,2.11571391 C46.6266645,2.1171751 46.6266645,2.1171751 46.6214279,2.11863616 C45.8234736,2.34125773 45.3570742,3.16859798 45.5796958,3.96655233 C45.8023173,4.76450667 46.6296576,5.23090603 47.4276119,5.00828445 L47.4276119,5.00828445 Z M54.419759,2.30643871 C54.8556933,2.13695884 55.0716973,1.6461737 54.9022174,1.21023941 C54.7327376,0.774305114 54.2419524,0.558301127 53.8060181,0.727780997 C53.8032127,0.728871549 53.8032127,0.728871549 53.8004064,0.729962021 C53.3644359,0.89934874 53.148327,1.39008772 53.3177137,1.82605822 C53.4871005,2.26202871 53.9778394,2.47813756 54.4138099,2.30875084 C54.4167849,2.30759485 54.4167849,2.30759485 54.419759,2.30643871 Z" id="Shape"></path>
-        <path d="M1.67760355,20.096503 C1.68306395,20.0958524 1.68306395,20.0958524 1.68852642,20.0952015 C2.51113381,19.9971782 3.09852524,19.2508595 3.00050189,18.4282521 C2.90247854,17.6056447 2.15615986,17.0182533 1.33355246,17.1162767 C1.3281205,17.1169239 1.3281205,17.1169239 1.3226906,17.1175709 C0.500081196,17.2155774 -0.0873255124,17.961884 0.0106809923,18.7844934 C0.108687497,19.6071028 0.854994145,20.1945095 1.67760355,20.096503 L1.67760355,20.096503 Z M9.34858965,19.1274206 C9.35409106,19.1266859 9.35409106,19.1266859 9.35959333,19.1259509 C10.1807278,19.0162709 10.7574756,18.2616967 10.6477955,17.4405622 C10.5381155,16.6194278 9.78354128,16.04268 8.96240683,16.15236 C8.95693539,16.1530908 8.95693539,16.1530908 8.95146479,16.1538215 C8.13032806,16.2634845 7.55356464,17.0180467 7.66322765,17.8391835 C7.77289065,18.6603202 8.52745292,19.2370836 9.34858965,19.1274206 L9.34858965,19.1274206 Z M17.1767435,18.6256231 C17.1839958,18.6245412 17.1839958,18.6245412 17.1912486,18.6234592 C18.27963,18.4610765 19.0303002,17.4471319 18.8679175,16.3587506 C18.7055348,15.2703693 17.6915903,14.519699 16.6032089,14.6820817 C16.5960024,14.6831569 16.5960024,14.6831569 16.5887964,14.6842319 C15.5004112,14.846589 14.7497172,15.8605159 14.9120743,16.948901 C15.0744314,18.0372862 16.0883584,18.7879802 17.1767435,18.6256231 L17.1767435,18.6256231 Z M24.8370287,17.4177379 C25.922252,17.2355961 26.6543441,16.2081937 26.4722023,15.1229704 C26.2900605,14.0377471 25.2626581,13.3056549 24.1774348,13.4877968 C24.1702314,13.4890057 24.1702314,13.4890057 24.1630282,13.4902145 C23.0777996,13.6723249 22.3456777,14.6997061 22.5277881,15.7849347 C22.7098984,16.8701632 23.7372796,17.6022852 24.8225082,17.4201748 C24.8297684,17.4189565 24.8297684,17.4189565 24.8370287,17.4177379 Z M32.4725265,16.061085 C33.5532108,15.853199 34.2612448,14.8060455 34.0539647,13.7222022 C33.8466846,12.6383589 32.8025831,11.9282552 31.7218988,12.1361412 C31.714724,12.1375214 31.714724,12.1375214 31.7075489,12.1389013 C30.6268567,12.3467457 29.9187826,13.3938719 30.1260211,14.4777232 C30.3332597,15.5615745 31.3773339,16.2717185 32.4580262,16.0638741 C32.4652764,16.0624797 32.4652764,16.0624797 32.4725265,16.061085 Z M40.0707225,14.4695476 C40.0780573,14.4678946 40.0780573,14.4678946 40.0853916,14.4662413 C41.158768,14.2242783 41.8327617,13.1579849 41.5907986,12.0846085 C41.3488355,11.011232 40.2825422,10.3372384 39.2091657,10.5792015 C39.2019419,10.5808298 39.2019419,10.5808298 39.1947175,10.582458 C38.1213273,10.8243601 37.447273,11.8906152 37.6891752,12.9640053 C37.9310773,14.0373955 38.9973324,14.7114498 40.0707225,14.4695476 L40.0707225,14.4695476 Z M47.4276119,12.0082845 C47.4329844,12.0067855 47.4329844,12.0067855 47.4383562,12.0052864 C48.2362896,11.7825897 48.7026111,10.9552056 48.4799145,10.1572722 C48.2572179,9.35933881 47.4298337,8.89301728 46.6319003,9.11571391 C46.6266645,9.1171751 46.6266645,9.1171751 46.6214279,9.11863616 C45.8234736,9.34125773 45.3570742,10.168598 45.5796958,10.9665523 C45.8023173,11.7645067 46.6296576,12.230906 47.4276119,12.0082845 L47.4276119,12.0082845 Z M54.8999721,9.57562965 C54.9052414,9.57358217 54.9052414,9.57358217 54.9105092,9.57153441 C55.6826371,9.27135123 56.0652239,8.40207131 55.7650408,7.62994336 C55.4648576,6.85781542 54.5955777,6.4752286 53.8234497,6.77541179 C53.8184808,6.77734338 53.8184808,6.77734338 53.8135101,6.77927482 C53.0413181,7.07929302 52.6585455,7.94849117 52.9585637,8.72068323 C53.2585819,9.4928753 54.12778,9.87564785 54.8999721,9.57562965 L54.8999721,9.57562965 Z" id="Shape"></path>
-        <path d="M1.45327704,26.6978168 C1.54647464,26.6867112 1.63432439,26.660866 1.7147722,26.6228911 C2.03520341,26.4716332 2.23820252,26.1279362 2.1939679,25.7567213 C2.13862768,25.2923089 1.71728488,24.9606903 1.2528724,25.0160305 C1.24980572,25.0163959 1.24980572,25.0163959 1.24674021,25.0167611 C0.782326598,25.0720918 0.450699376,25.4934278 0.506030077,25.9578415 C0.561360778,26.4222551 0.982696791,26.7538823 1.4471104,26.6985516 C1.45019313,26.6981843 1.45019313,26.6981843 1.45327704,26.6978168 Z M9.34858965,26.1274206 C9.35409106,26.1266859 9.35409106,26.1266859 9.35959333,26.1259509 C10.1807278,26.0162709 10.7574756,25.2616967 10.6477955,24.4405622 C10.5381155,23.6194278 9.78354128,23.04268 8.96240683,23.15236 C8.95693539,23.1530908 8.95693539,23.1530908 8.95146479,23.1538215 C8.13032806,23.2634845 7.55356464,24.0180467 7.66322765,24.8391835 C7.77289065,25.6603202 8.52745292,26.2370836 9.34858965,26.1274206 L9.34858965,26.1274206 Z M17.0066591,25.0462427 C17.0121188,25.0454283 17.0121188,25.0454283 17.0175789,25.0446136 C17.8369369,24.9223683 18.4020584,24.1590479 18.279813,23.3396899 C18.1575677,22.5203319 17.3942473,21.9552104 16.5748893,22.0774558 C16.5694641,22.0782652 16.5694641,22.0782652 16.5640392,22.0790744 C15.7446783,22.2013005 15.1795389,22.9646076 15.301765,23.7839685 C15.4239911,24.6033294 16.1872982,25.1684688 17.0066591,25.0462427 L17.0066591,25.0462427 Z M24.8225082,24.4201748 C24.8297684,24.4189565 24.8297684,24.4189565 24.8370287,24.4177379 C25.922252,24.2355961 26.6543441,23.2081937 26.4722023,22.1229704 C26.2900605,21.0377471 25.2626581,20.3056549 24.1774348,20.4877968 C24.1702314,20.4890057 24.1702314,20.4890057 24.1630282,20.4902145 C23.0777996,20.6723249 22.3456777,21.6997061 22.5277881,22.7849347 C22.7098984,23.8701632 23.7372796,24.6022852 24.8225082,24.4201748 L24.8225082,24.4201748 Z M32.4725265,23.0495399 C33.5532108,22.8422598 34.2612448,21.7981584 34.0539647,20.7174741 C33.8466846,19.6367898 32.8025831,18.9287558 31.7218988,19.1360359 C31.714724,19.137412 31.714724,19.137412 31.7075489,19.138788 C30.6268567,19.3460265 29.9187826,20.3901008 30.1260211,21.470793 C30.3332597,22.5514853 31.3773339,23.2595594 32.4580262,23.0523208 C32.4652764,23.0509305 32.4652764,23.0509305 32.4725265,23.0495399 Z M39.8723866,20.8947688 C39.877909,20.8935242 39.877909,20.8935242 39.883431,20.8922795 C40.6915794,20.7101047 41.1990314,19.9072892 41.0168566,19.0991407 C40.8346818,18.2909923 40.0318663,17.7835404 39.2237179,17.9657152 C39.218279,17.9669412 39.218279,17.9669412 39.2128397,17.968167 C38.404681,18.1502959 37.8971834,18.9530826 38.0793123,19.7612414 C38.2614411,20.5694001 39.0642279,21.0768976 39.8723866,20.8947688 L39.8723866,20.8947688 Z M47.4276119,19.0082845 C47.4329844,19.0067855 47.4329844,19.0067855 47.4383562,19.0052864 C48.2362896,18.7825897 48.7026111,17.9552056 48.4799145,17.1572722 C48.2572179,16.3593388 47.4298337,15.8930173 46.6319003,16.1157139 C46.6266645,16.1171751 46.6266645,16.1171751 46.6214279,16.1186362 C45.8234736,16.3412577 45.3570742,17.168598 45.5796958,17.9665523 C45.8023173,18.7645067 46.6296576,19.230906 47.4276119,19.0082845 L47.4276119,19.0082845 Z M54.4138099,15.7087505 C54.4167849,15.7075945 54.4167849,15.7075945 54.419759,15.7064383 C54.8556933,15.5369585 55.0716973,15.0461733 54.9022174,14.610239 C54.7327376,14.1743047 54.2419524,13.9583007 53.8060181,14.1277806 C53.8032127,14.1288712 53.8032127,14.1288712 53.8004064,14.1299616 C53.3644359,14.2993484 53.148327,14.7900873 53.3177137,15.2260578 C53.4871005,15.6620283 53.9778394,15.8781372 54.4138099,15.7087505 L54.4138099,15.7087505 Z" id="Shape"></path>
-      </g>
-      <g id="top">
-        <path d="M1.4471104,12.2885536 C1.45019313,12.2881864 1.45019313,12.2881864 1.45327704,12.2878189 C1.91768952,12.2324787 2.24930811,11.8111359 2.1939679,11.3467234 C2.13862768,10.8823109 1.71728488,10.5506923 1.2528724,10.6060325 C1.24980572,10.606398 1.24980572,10.606398 1.24674021,10.6067632 C0.782326598,10.6620939 0.450699376,11.0834299 0.506030077,11.5478435 C0.561360778,12.0122571 0.982696791,12.3438844 1.4471104,12.2885536 L1.4471104,12.2885536 Z M9.34858965,12.1304907 C9.35409106,12.129756 9.35409106,12.129756 9.35959333,12.129021 C10.1807278,12.019341 10.7574756,11.2647668 10.6477955,10.4436323 C10.5381155,9.62249789 9.78354128,9.04575011 8.96240683,9.15543014 C8.95693539,9.15616095 8.95693539,9.15616095 8.95146479,9.15689157 C8.13032806,9.26655457 7.55356464,10.0211168 7.66322765,10.8422536 C7.77289065,11.6633903 8.52745292,12.2401537 9.34858965,12.1304907 L9.34858965,12.1304907 Z M17.0066591,11.0493128 C17.0121188,11.0484984 17.0121188,11.0484984 17.0175789,11.0476838 C17.8369369,10.9254384 18.4020584,10.1621181 18.279813,9.34276003 C18.1575677,8.52340201 17.3942473,7.95828052 16.5748893,8.08052587 C16.5694641,8.08133528 16.5694641,8.08133528 16.5640392,8.08214454 C15.7446783,8.20437064 15.1795389,8.96767771 15.301765,9.78703861 C15.4239911,10.6063995 16.1872982,11.1715389 17.0066591,11.0493128 L17.0066591,11.0493128 Z M24.8225082,10.4232459 C24.8297684,10.4220275 24.8297684,10.4220275 24.8370287,10.420809 C25.922252,10.2386672 26.6543441,9.21126476 26.4722023,8.12604147 C26.2900605,7.04081818 25.2626581,6.30872601 24.1774348,6.49086783 C24.1702314,6.4920768 24.1702314,6.4920768 24.1630282,6.49328559 C23.0777996,6.67539597 22.3456777,7.70277717 22.5277881,8.78800574 C22.7098984,9.87323431 23.7372796,10.6053563 24.8225082,10.4232459 L24.8225082,10.4232459 Z M32.4725265,9.05261002 C33.5532108,8.84532993 34.2612448,7.80122849 34.0539647,6.72054419 C33.8466846,5.63985989 32.8025831,4.93182589 31.7218988,5.13910599 C31.714724,5.14048211 31.714724,5.14048211 31.7075489,5.14185807 C30.6268567,5.34909665 29.9187826,6.39317088 30.1260211,7.47386314 C30.3332597,8.5545554 31.3773339,9.26262952 32.4580262,9.05539095 C32.4652764,9.05400057 32.4652764,9.05400057 32.4725265,9.05261002 Z M39.8723866,6.89476879 C39.877909,6.8935242 39.877909,6.8935242 39.883431,6.89227947 C40.6915794,6.71010471 41.1990314,5.90728916 41.0168566,5.09914075 C40.8346818,4.29099233 40.0318663,3.78354042 39.2237179,3.96571517 C39.218279,3.96694116 39.218279,3.96694116 39.2128397,3.96816703 C38.404681,4.15029588 37.8971834,4.9530826 38.0793123,5.76124136 C38.2614411,6.56940012 39.0642279,7.07689764 39.8723866,6.89476879 L39.8723866,6.89476879 Z M47.4276119,5.00828445 C47.4329844,5.00678549 47.4329844,5.00678549 47.4383562,5.00528637 C48.2362896,4.78258973 48.7026111,3.95520561 48.4799145,3.15727221 C48.2572179,2.35933881 47.4298337,1.89301728 46.6319003,2.11571391 C46.6266645,2.1171751 46.6266645,2.1171751 46.6214279,2.11863616 C45.8234736,2.34125773 45.3570742,3.16859798 45.5796958,3.96655233 C45.8023173,4.76450667 46.6296576,5.23090603 47.4276119,5.00828445 L47.4276119,5.00828445 Z M54.419759,2.30643871 C54.8556933,2.13695884 55.0716973,1.6461737 54.9022174,1.21023941 C54.7327376,0.774305114 54.2419524,0.558301127 53.8060181,0.727780997 C53.8032127,0.728871549 53.8032127,0.728871549 53.8004064,0.729962021 C53.3644359,0.89934874 53.148327,1.39008772 53.3177137,1.82605822 C53.4871005,2.26202871 53.9778394,2.47813756 54.4138099,2.30875084 C54.4167849,2.30759485 54.4167849,2.30759485 54.419759,2.30643871 Z" id="Shape"></path>
-        <path d="M1.67760355,20.096503 C1.68306395,20.0958524 1.68306395,20.0958524 1.68852642,20.0952015 C2.51113381,19.9971782 3.09852524,19.2508595 3.00050189,18.4282521 C2.90247854,17.6056447 2.15615986,17.0182533 1.33355246,17.1162767 C1.3281205,17.1169239 1.3281205,17.1169239 1.3226906,17.1175709 C0.500081196,17.2155774 -0.0873255124,17.961884 0.0106809923,18.7844934 C0.108687497,19.6071028 0.854994145,20.1945095 1.67760355,20.096503 L1.67760355,20.096503 Z M9.34858965,19.1274206 C9.35409106,19.1266859 9.35409106,19.1266859 9.35959333,19.1259509 C10.1807278,19.0162709 10.7574756,18.2616967 10.6477955,17.4405622 C10.5381155,16.6194278 9.78354128,16.04268 8.96240683,16.15236 C8.95693539,16.1530908 8.95693539,16.1530908 8.95146479,16.1538215 C8.13032806,16.2634845 7.55356464,17.0180467 7.66322765,17.8391835 C7.77289065,18.6603202 8.52745292,19.2370836 9.34858965,19.1274206 L9.34858965,19.1274206 Z M17.1767435,18.6256231 C17.1839958,18.6245412 17.1839958,18.6245412 17.1912486,18.6234592 C18.27963,18.4610765 19.0303002,17.4471319 18.8679175,16.3587506 C18.7055348,15.2703693 17.6915903,14.519699 16.6032089,14.6820817 C16.5960024,14.6831569 16.5960024,14.6831569 16.5887964,14.6842319 C15.5004112,14.846589 14.7497172,15.8605159 14.9120743,16.948901 C15.0744314,18.0372862 16.0883584,18.7879802 17.1767435,18.6256231 L17.1767435,18.6256231 Z M24.8370287,17.4177379 C25.922252,17.2355961 26.6543441,16.2081937 26.4722023,15.1229704 C26.2900605,14.0377471 25.2626581,13.3056549 24.1774348,13.4877968 C24.1702314,13.4890057 24.1702314,13.4890057 24.1630282,13.4902145 C23.0777996,13.6723249 22.3456777,14.6997061 22.5277881,15.7849347 C22.7098984,16.8701632 23.7372796,17.6022852 24.8225082,17.4201748 C24.8297684,17.4189565 24.8297684,17.4189565 24.8370287,17.4177379 Z M32.4725265,16.061085 C33.5532108,15.853199 34.2612448,14.8060455 34.0539647,13.7222022 C33.8466846,12.6383589 32.8025831,11.9282552 31.7218988,12.1361412 C31.714724,12.1375214 31.714724,12.1375214 31.7075489,12.1389013 C30.6268567,12.3467457 29.9187826,13.3938719 30.1260211,14.4777232 C30.3332597,15.5615745 31.3773339,16.2717185 32.4580262,16.0638741 C32.4652764,16.0624797 32.4652764,16.0624797 32.4725265,16.061085 Z M40.0707225,14.4695476 C40.0780573,14.4678946 40.0780573,14.4678946 40.0853916,14.4662413 C41.158768,14.2242783 41.8327617,13.1579849 41.5907986,12.0846085 C41.3488355,11.011232 40.2825422,10.3372384 39.2091657,10.5792015 C39.2019419,10.5808298 39.2019419,10.5808298 39.1947175,10.582458 C38.1213273,10.8243601 37.447273,11.8906152 37.6891752,12.9640053 C37.9310773,14.0373955 38.9973324,14.7114498 40.0707225,14.4695476 L40.0707225,14.4695476 Z M47.4276119,12.0082845 C47.4329844,12.0067855 47.4329844,12.0067855 47.4383562,12.0052864 C48.2362896,11.7825897 48.7026111,10.9552056 48.4799145,10.1572722 C48.2572179,9.35933881 47.4298337,8.89301728 46.6319003,9.11571391 C46.6266645,9.1171751 46.6266645,9.1171751 46.6214279,9.11863616 C45.8234736,9.34125773 45.3570742,10.168598 45.5796958,10.9665523 C45.8023173,11.7645067 46.6296576,12.230906 47.4276119,12.0082845 L47.4276119,12.0082845 Z M54.8999721,9.57562965 C54.9052414,9.57358217 54.9052414,9.57358217 54.9105092,9.57153441 C55.6826371,9.27135123 56.0652239,8.40207131 55.7650408,7.62994336 C55.4648576,6.85781542 54.5955777,6.4752286 53.8234497,6.77541179 C53.8184808,6.77734338 53.8184808,6.77734338 53.8135101,6.77927482 C53.0413181,7.07929302 52.6585455,7.94849117 52.9585637,8.72068323 C53.2585819,9.4928753 54.12778,9.87564785 54.8999721,9.57562965 L54.8999721,9.57562965 Z" id="Shape"></path>
-        <path d="M1.45327704,26.6978168 C1.54647464,26.6867112 1.63432439,26.660866 1.7147722,26.6228911 C2.03520341,26.4716332 2.23820252,26.1279362 2.1939679,25.7567213 C2.13862768,25.2923089 1.71728488,24.9606903 1.2528724,25.0160305 C1.24980572,25.0163959 1.24980572,25.0163959 1.24674021,25.0167611 C0.782326598,25.0720918 0.450699376,25.4934278 0.506030077,25.9578415 C0.561360778,26.4222551 0.982696791,26.7538823 1.4471104,26.6985516 C1.45019313,26.6981843 1.45019313,26.6981843 1.45327704,26.6978168 Z M9.34858965,26.1274206 C9.35409106,26.1266859 9.35409106,26.1266859 9.35959333,26.1259509 C10.1807278,26.0162709 10.7574756,25.2616967 10.6477955,24.4405622 C10.5381155,23.6194278 9.78354128,23.04268 8.96240683,23.15236 C8.95693539,23.1530908 8.95693539,23.1530908 8.95146479,23.1538215 C8.13032806,23.2634845 7.55356464,24.0180467 7.66322765,24.8391835 C7.77289065,25.6603202 8.52745292,26.2370836 9.34858965,26.1274206 L9.34858965,26.1274206 Z M17.0066591,25.0462427 C17.0121188,25.0454283 17.0121188,25.0454283 17.0175789,25.0446136 C17.8369369,24.9223683 18.4020584,24.1590479 18.279813,23.3396899 C18.1575677,22.5203319 17.3942473,21.9552104 16.5748893,22.0774558 C16.5694641,22.0782652 16.5694641,22.0782652 16.5640392,22.0790744 C15.7446783,22.2013005 15.1795389,22.9646076 15.301765,23.7839685 C15.4239911,24.6033294 16.1872982,25.1684688 17.0066591,25.0462427 L17.0066591,25.0462427 Z M24.8225082,24.4201748 C24.8297684,24.4189565 24.8297684,24.4189565 24.8370287,24.4177379 C25.922252,24.2355961 26.6543441,23.2081937 26.4722023,22.1229704 C26.2900605,21.0377471 25.2626581,20.3056549 24.1774348,20.4877968 C24.1702314,20.4890057 24.1702314,20.4890057 24.1630282,20.4902145 C23.0777996,20.6723249 22.3456777,21.6997061 22.5277881,22.7849347 C22.7098984,23.8701632 23.7372796,24.6022852 24.8225082,24.4201748 L24.8225082,24.4201748 Z M32.4725265,23.0495399 C33.5532108,22.8422598 34.2612448,21.7981584 34.0539647,20.7174741 C33.8466846,19.6367898 32.8025831,18.9287558 31.7218988,19.1360359 C31.714724,19.137412 31.714724,19.137412 31.7075489,19.138788 C30.6268567,19.3460265 29.9187826,20.3901008 30.1260211,21.470793 C30.3332597,22.5514853 31.3773339,23.2595594 32.4580262,23.0523208 C32.4652764,23.0509305 32.4652764,23.0509305 32.4725265,23.0495399 Z M39.8723866,20.8947688 C39.877909,20.8935242 39.877909,20.8935242 39.883431,20.8922795 C40.6915794,20.7101047 41.1990314,19.9072892 41.0168566,19.0991407 C40.8346818,18.2909923 40.0318663,17.7835404 39.2237179,17.9657152 C39.218279,17.9669412 39.218279,17.9669412 39.2128397,17.968167 C38.404681,18.1502959 37.8971834,18.9530826 38.0793123,19.7612414 C38.2614411,20.5694001 39.0642279,21.0768976 39.8723866,20.8947688 L39.8723866,20.8947688 Z M47.4276119,19.0082845 C47.4329844,19.0067855 47.4329844,19.0067855 47.4383562,19.0052864 C48.2362896,18.7825897 48.7026111,17.9552056 48.4799145,17.1572722 C48.2572179,16.3593388 47.4298337,15.8930173 46.6319003,16.1157139 C46.6266645,16.1171751 46.6266645,16.1171751 46.6214279,16.1186362 C45.8234736,16.3412577 45.3570742,17.168598 45.5796958,17.9665523 C45.8023173,18.7645067 46.6296576,19.230906 47.4276119,19.0082845 L47.4276119,19.0082845 Z M54.4138099,15.7087505 C54.4167849,15.7075945 54.4167849,15.7075945 54.419759,15.7064383 C54.8556933,15.5369585 55.0716973,15.0461733 54.9022174,14.610239 C54.7327376,14.1743047 54.2419524,13.9583007 53.8060181,14.1277806 C53.8032127,14.1288712 53.8032127,14.1288712 53.8004064,14.1299616 C53.3644359,14.2993484 53.148327,14.7900873 53.3177137,15.2260578 C53.4871005,15.6620283 53.9778394,15.8781372 54.4138099,15.7087505 L54.4138099,15.7087505 Z" id="Shape"></path>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/docs/sidebar.yml b/docs/sidebar.yml
index 4e87972ed9b6..101de48b79bf 100644
--- a/docs/sidebar.yml
+++ b/docs/sidebar.yml
@@ -1,255 +1,190 @@
-sidebar:
-    - title: Blog
-      url: blog/index.html
-    - title: Usage
-      subsection:
-        - title: Getting Started
-          url: docs/usage/getting-started.html
-        - title: sbt-projects
-          url: docs/usage/sbt-projects.html
-        - title: IDE support for Dotty
-          url: docs/usage/ide-support.html
-        - title: Worksheet mode in Dotty IDE
-          url: docs/usage/worksheet-mode.html
-        - title: Language Versions
-          url: docs/usage/language-versions.html
-        - title: cbt-projects
-          url: docs/usage/cbt-projects.html
-        - title: Scaladoc
-          url: docs/usage/scaladoc
-        - title: Dottydoc [Legacy]
-          url: docs/usage/dottydoc.html
-    - title: Reference
-      subsection:
-        - title: Overview
-          url: docs/reference/overview.html
-        - title: New Types
-          subsection:
-            - title: Intersection types
-              url: docs/reference/new-types/intersection-types.html
-            - title: Union types
-              url: docs/reference/new-types/union-types.html
-            - title: Type lambdas
-              url: docs/reference/new-types/type-lambdas.html
-            - title: Match types
-              url: docs/reference/new-types/match-types.html
-            - title: Dependent Function Types
-              url: docs/reference/new-types/dependent-function-types.html
-            - title: Polymorphic Function Types
-              url: docs/reference/new-types/polymorphic-function-types.html
-        - title: Enums
-          subsection:
-            - title: Enumerations
-              url: docs/reference/enums/enums.html
-            - title: Algebraic Data Types
-              url: docs/reference/enums/adts.html
-            - title: Translation
-              url: docs/reference/enums/desugarEnums.html
-        - title: Contextual Abstractions
-          subsection:
-            - title: Overview
-              url: docs/reference/contextual/motivation.html
-            - title: Given Instances
-              url: docs/reference/contextual/givens.html
-            - title: Using Clauses
-              url: docs/reference/contextual/using-clauses.html
-            - title: Context Bounds
-              url: docs/reference/contextual/context-bounds.html
-            - title: Given Imports
-              url: docs/reference/contextual/given-imports.html
-            - title: Extension Methods
-              url: docs/reference/contextual/extension-methods.html
-            - title: Implementing Type classes
-              url: docs/reference/contextual/type-classes.html
-            - title: Type Class Derivation
-              url: docs/reference/contextual/derivation.html
-            - title: Multiversal Equality
-              url: docs/reference/contextual/multiversal-equality.html
-            - title: Context Functions
-              url: docs/reference/contextual/context-functions.html
-            - title: Implicit Conversions
-              url: docs/reference/contextual/conversions.html
-            - title: By-Name Context Parameters
-              url: docs/reference/contextual/by-name-context-parameters.html
-            - title: Relationship with Scala 2 Implicits
-              url: docs/reference/contextual/relationship-implicits.html
-        - title: Metaprogramming
-          subsection:
-            - title: Overview
-              url: docs/reference/metaprogramming/toc.html
-            - title: Inline
-              url: docs/reference/metaprogramming/inline.html
-            - title: Macros
-              url: docs/reference/metaprogramming/macros.html
-            - title: Runtime Staging
-              url: docs/reference/metaprogramming/staging.html
-            - title: Reflection
-              url: docs/reference/metaprogramming/reflection.html
-            - title: TASTy Inspection
-              url: docs/reference/metaprogramming/tasty-inspect.html
-        - title: Other New Features
-          subsection:
-            - title: Trait Parameters
-              url: docs/reference/other-new-features/trait-parameters.html
-            - title: Transparent Traits
-              url: docs/reference/other-new-features/transparent-traits.html
-            - title: Universal Applies
-              url: docs/reference/other-new-features/creator-applications.html
-            - title: Export Clauses
-              url: docs/reference/other-new-features/export.html
-            - title: Opaque Type Aliases
-              url: docs/reference/other-new-features/opaques.html
-            - title: Open Classes
-              url: docs/reference/other-new-features/open-classes.html
-            - title: Parameter Untupling
-              url: docs/reference/other-new-features/parameter-untupling.html
-            - title: Kind Polymorphism
-              url: docs/reference/other-new-features/kind-polymorphism.html
-            - title: Matchable Trait
-              url: docs/reference/other-new-features/matchable.html
-            - title: threadUnsafe Annotation
-              url: docs/reference/other-new-features/threadUnsafe-annotation.html
-            - title: targetName Annotation
-              url: docs/reference/other-new-features/targetName.html
-            - title: New Control Syntax
-              url: docs/reference/other-new-features/control-syntax.html
-            - title: Optional Braces
-              url: docs/reference/other-new-features/indentation.html
-            - title: Explicit Nulls
-              url: docs/reference/other-new-features/explicit-nulls.html
-            - title: Safe Initialization
-              url: docs/reference/other-new-features/safe-initialization.html
-            - title: TypeTest
-              url: docs/reference/other-new-features/type-test.html
-        - title: Other Changed Features
-          subsection:
-            - title: Numeric Literals
-              url: docs/reference/changed-features/numeric-literals.html
-            - title: Structural Types
-              url: docs/reference/changed-features/structural-types.html
-            - title: Operators
-              url: docs/reference/changed-features/operators.html
-            - title: Wildcard Types
-              url: docs/reference/changed-features/wildcards.html
-            - title: Imports
-              url: docs/reference/changed-features/imports.html
-            - title: Type Checking
-              url: docs/reference/changed-features/type-checking.html
-            - title: Type Inference
-              url: docs/reference/changed-features/type-inference.html
-            - title: Implicit Resolution
-              url: docs/reference/changed-features/implicit-resolution.html
-            - title: Implicit Conversions
-              url: docs/reference/changed-features/implicit-conversions.html
-            - title: Overload Resolution
-              url: docs/reference/changed-features/overload-resolution.html
-            - title: Match Expressions
-              url: docs/reference/changed-features/match-syntax.html
-            - title: Vararg Splices
-              url: docs/reference/changed-features/vararg-splices.html
-            - title: Pattern Bindings
-              url: docs/reference/changed-features/pattern-bindings.html
-            - title: Pattern Matching
-              url: docs/reference/changed-features/pattern-matching.html
-            - title: Eta Expansion
-              url: docs/reference/changed-features/eta-expansion.html
-            - title: Compiler Plugins
-              url: docs/reference/changed-features/compiler-plugins.html
-            - title: Lazy Vals initialization
-              url: docs/reference/changed-features/lazy-vals-init.html
-            - title: Main Functions
-              url: docs/reference/changed-features/main-functions.html
-        - title: Dropped Features
-          subsection:
-            - title: DelayedInit
-              url: docs/reference/dropped-features/delayed-init.html
-            - title: Macros
-              url: docs/reference/dropped-features/macros.html
-            - title: Existential Types
-              url: docs/reference/dropped-features/existential-types.html
-            - title: Type Projection
-              url: docs/reference/dropped-features/type-projection.html
-            - title: Do-While
-              url: docs/reference/dropped-features/do-while.html
-            - title: Procedure Syntax
-              url: docs/reference/dropped-features/procedure-syntax.html
-            - title: Package Objects
-              url: docs/reference/dropped-features/package-objects.html
-            - title: Early Initializers
-              url: docs/reference/dropped-features/early-initializers.html
-            - title: Class Shadowing
-              url: docs/reference/dropped-features/class-shadowing.html
-            - title: Limit 22
-              url: docs/reference/dropped-features/limit22.html
-            - title: XML literals
-              url: docs/reference/dropped-features/xml.html
-            - title: Symbol Literals
-              url: docs/reference/dropped-features/symlits.html
-            - title: Auto-Application
-              url: docs/reference/dropped-features/auto-apply.html
-            - title: Weak Conformance
-              url: docs/reference/dropped-features/weak-conformance.html
-            - title: Nonlocal Returns
-              url: docs/reference/dropped-features/nonlocal-returns.html
-            - title: "[this] Qualifier"
-              url: docs/reference/dropped-features/this-qualifier.html
-            - title: Wildcard initializers
-              url: docs/reference/dropped-features/wildcard-init.html
-        - title: Syntax Summary
-          url: docs/reference/syntax.html
-    - title: Contributing
-      subsection:
-        - title: Contribute Knowledge
-          url: docs/contributing/contribute-knowledge.html
-        - title: Getting Started
-          url: docs/contributing/getting-started.html
-        - title: Workflow
-          url: docs/contributing/workflow.html
-        - title: Testing
-          url: docs/contributing/testing.html
-        - title: Debugging
-          url: docs/contributing/debugging.html
-        - title: IDEs and Tools
-          subsection:
-            - title: IDEs
-              url: docs/contributing/tools/ide.html
-            - title: Mill
-              url: docs/contributing/tools/mill.html
-            - title: Scalafix
-              url: docs/contributing/tools/scalafix.html
-        - title: Procedures
-          subsection:
-            - title: Release Model
-              url: docs/contributing/procedures/release.html
-            - title: Modifying the Test Framework
-              url: docs/contributing/procedures/vulpix.html
-    - title: Internals
-      subsection:
-        - title: Backend
-          url: docs/internals/backend.html
-        - title: Classpaths
-          url: docs/internals/classpaths.html
-        - title: Core Data Structrues
-          url: docs/internals/core-data-structures.html
-        - title: Contexts
-          url: docs/internals/contexts.html
-        - title: Dotc vs Scalac
-          url: docs/internals/dotc-scalac.html
-        - title: Higher-Kinded Types
-          url: docs/internals/higher-kinded-v2.html
-        - title: Overall Structure
-          url: docs/internals/overall-structure.html
-        - title: Periods
-          url: docs/internals/periods.html
-        - title: Syntax
-          url: docs/internals/syntax.html
-        - title: Type System
-          url: docs/internals/type-system.html
-        - title: "Dotty Internals 1: Trees & Symbols (Meeting Notes)"
-          url: docs/internals/dotty-internals-1-notes.html
-        - title: Debug Macros
-          url: docs/internals/debug-macros.html
-    - title: Resources
-      subsection:
-        - title: Talks
-          url: docs/resources/talks.html
+index: index.md
+subsection:
+  - title: Usage
+    directory: docs/usage
+    subsection:
+      - page: usage/sbt-projects.md
+      - page: usage/ide-support.md
+      - page: usage/cbt-projects.md
+      - title: Scaladoc
+        index: usage/scaladoc/index.md
+        subsection:
+          - page: usage/scaladoc/docstrings.md
+          - page: usage/scaladoc/linking.md
+          - page: usage/scaladoc/search-engine.md
+          - page: usage/scaladoc/settings.md
+          - page: usage/scaladoc/site-versioning.md
+          - page: usage/scaladoc/static-site.md
+  - title: Reference
+    directory: docs/reference
+    subsection:
+      - page: reference/overview.md
+      - title: New Types
+        index: reference/new-types/new-types.md
+        subsection:
+          - page: reference/new-types/intersection-types.md
+          - page: reference/new-types/intersection-types-spec.md
+          - page: reference/new-types/union-types.md
+          - page: reference/new-types/union-types-spec.md
+          - page: reference/new-types/type-lambdas.md
+          - page: reference/new-types/type-lambdas-spec.md
+          - page: reference/new-types/match-types.md
+          - page: reference/new-types/dependent-function-types.md
+          - page: reference/new-types/dependent-function-types-spec.md
+          - page: reference/new-types/polymorphic-function-types.md
+      - title: Enums
+        index: reference/enums/enums-index.md
+        subsection:
+          - page: reference/enums/enums.md
+          - page: reference/enums/adts.md
+          - page: reference/enums/desugarEnums.md
+      - title: Contextual Abstractions
+        index: reference/contextual/contextual.md
+        directory: contextual
+        subsection:
+          - page: reference/contextual/givens.md
+          - page: reference/contextual/using-clauses.md
+          - page: reference/contextual/context-bounds.md
+          - page: reference/contextual/given-imports.md
+          - page: reference/contextual/extension-methods.md
+          - page: reference/contextual/right-associative-extension-methods.md
+          - page: reference/contextual/type-classes.md
+          - page: reference/contextual/derivation.md
+          - page: reference/contextual/derivation-macro.md
+          - page: reference/contextual/multiversal-equality.md
+          - page: reference/contextual/context-functions.md
+          - page: reference/contextual/context-functions-spec.md
+          - page: reference/contextual/conversions.md
+          - page: reference/contextual/by-name-context-parameters.md
+          - page: reference/contextual/relationship-implicits.md
+      - title: Metaprogramming
+        index: reference/metaprogramming/metaprogramming.md
+        subsection:
+          - page: reference/metaprogramming/inline.md
+          - page: reference/metaprogramming/compiletime-ops.md
+          - page: reference/metaprogramming/macros.md
+          - page: reference/metaprogramming/macros-spec.md
+          - page: reference/metaprogramming/staging.md
+          - page: reference/metaprogramming/reflection.md
+          - page: reference/metaprogramming/tasty-inspect.md
+      - title: Other New Features
+        index: reference/other-new-features/other-new-types.md
+        subsection:
+          - page: reference/other-new-features/trait-parameters.md
+          - page: reference/other-new-features/transparent-traits.md
+          - page: reference/other-new-features/creator-applications.md
+          - page: reference/other-new-features/export.md
+          - page: reference/other-new-features/opaques.md
+          - page: reference/other-new-features/opaques-details.md
+          - page: reference/other-new-features/open-classes.md
+          - page: reference/other-new-features/parameter-untupling.md
+          - page: reference/other-new-features/parameter-untupling-spec.md
+          - page: reference/other-new-features/kind-polymorphism.md
+          - page: reference/other-new-features/matchable.md
+          - page: reference/other-new-features/threadUnsafe-annotation.md
+          - page: reference/other-new-features/targetName.md
+          - page: reference/other-new-features/control-syntax.md
+          - page: reference/other-new-features/indentation.md
+          - page: reference/other-new-features/safe-initialization.md
+          - page: reference/other-new-features/type-test.md
+          - page: reference/other-new-features/experimental-defs.md
+      - title: Other Changed Features
+        directory: changed-features
+        index: reference/changed-features/changed-features.md
+        subsection:
+          - page: reference/changed-features/numeric-literals.md
+          - page: reference/changed-features/structural-types.md
+          - page: reference/changed-features/structural-types-spec.md
+          - page: reference/changed-features/operators.md
+          - page: reference/changed-features/wildcards.md
+          - page: reference/changed-features/imports.md
+          - page: reference/changed-features/type-checking.md
+          - page: reference/changed-features/type-inference.md
+          - page: reference/changed-features/implicit-resolution.md
+          - page: reference/changed-features/implicit-conversions.md
+          - page: reference/changed-features/implicit-conversions-spec.md
+          - page: reference/changed-features/overload-resolution.md
+          - page: reference/changed-features/match-syntax.md
+          - page: reference/changed-features/vararg-splices.md
+          - page: reference/changed-features/pattern-bindings.md
+          - page: reference/changed-features/pattern-matching.md
+          - page: reference/changed-features/eta-expansion.md
+          - page: reference/changed-features/eta-expansion-spec.md
+          - page: reference/changed-features/compiler-plugins.md
+          - page: reference/changed-features/lazy-vals-init.md
+          - page: reference/changed-features/main-functions.md
+      - title: Dropped Features
+        index: reference/dropped-features/dropped-features.md
+        subsection:
+          - page: reference/dropped-features/delayed-init.md
+          - page: reference/dropped-features/macros.md
+          - page: reference/dropped-features/existential-types.md
+          - page: reference/dropped-features/type-projection.md
+          - page: reference/dropped-features/do-while.md
+          - page: reference/dropped-features/procedure-syntax.md
+          - page: reference/dropped-features/package-objects.md
+          - page: reference/dropped-features/early-initializers.md
+          - page: reference/dropped-features/class-shadowing.md
+          - page: reference/dropped-features/class-shadowing-spec.md
+          - page: reference/dropped-features/limit22.md
+          - page: reference/dropped-features/xml.md
+          - page: reference/dropped-features/symlits.md
+          - page: reference/dropped-features/auto-apply.md
+          - page: reference/dropped-features/weak-conformance.md
+          - page: reference/dropped-features/weak-conformance-spec.md
+          - page: reference/dropped-features/nonlocal-returns.md
+          - page: reference/dropped-features/this-qualifier.md
+          - page: reference/dropped-features/wildcard-init.md
+      - title: Experimental Features
+        directory: experimental
+        subsection:
+          - page: reference/experimental/overview.md
+          - page: reference/experimental/canthrow.md
+          - page: reference/experimental/erased-defs.md
+          - page: reference/experimental/erased-defs-spec.md
+          - page: reference/experimental/named-typeargs.md
+          - page: reference/experimental/named-typeargs-spec.md
+          - page: reference/experimental/numeric-literals.md
+          - page: reference/experimental/explicit-nulls.md
+          - page: reference/experimental/cc.md
+      - page: reference/syntax.md
+      - title: Language Versions
+        index: reference/language-versions/language-versions.md
+        subsection:
+          - page: reference/language-versions/source-compatibility.md
+          - page: reference/language-versions/binary-compatibility.md
+      - page: reference/soft-modifier.md
+      - page: reference/features-classification.md
+  - title: Contributing
+    directory: docs/contributing
+    subsection:
+      - page: contributing/contribute-knowledge.md
+      - page: contributing/getting-started.md
+      - page: contributing/workflow.md
+      - page: contributing/testing.md
+      - page: contributing/debugging.md
+      - title: IDEs and Tools
+        directory: tools
+        subsection:
+          - page: contributing/tools/ide.md
+          - page: contributing/tools/mill.md
+          - page: contributing/tools/scalafix.md
+      - title: Procedures
+        subsection:
+          - page: contributing/procedures/release.md
+          - page: contributing/procedures/vulpix.md
+  - title: Internals
+    directory: docs/internals
+    subsection:
+      - page: internals/backend.md
+      - page: internals/classpaths.md
+      - page: internals/core-data-structures.md
+      - page: internals/contexts.md
+      - page: internals/dotc-scalac.md
+      - page: internals/higher-kinded-v2.md
+      - page: internals/overall-structure.md
+      - page: internals/periods.md
+      - page: internals/syntax.md
+      - page: internals/type-system.md
+      - page: internals/dotty-internals-1-notes.md
+      - page: internals/debug-macros.md
diff --git a/language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala b/language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala
index b95a21e10122..3f7c58b022d6 100644
--- a/language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala
+++ b/language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala
@@ -306,7 +306,9 @@ class DottyLanguageServer extends LanguageServer
 
     val pos = sourcePosition(driver, uri, params.getPosition)
     val items = driver.compilationUnits.get(uri) match {
-      case Some(unit) => Completion.completions(pos)(using ctx.fresh.setCompilationUnit(unit))._2
+      case Some(unit) =>
+        val freshCtx = ctx.fresh.setCompilationUnit(unit)
+        Completion.completions(pos)(using freshCtx)._2
       case None => Nil
     }
 
@@ -644,7 +646,7 @@ class DottyLanguageServer extends LanguageServer
 }
 
 object DottyLanguageServer {
-  /** Configuration file normally generated by sbt-dotty */
+  /** Configuration file normally generated by the DottyIDEPlugin */
   final val IDE_CONFIG_FILE = ".dotty-ide.json"
 
   final val RENAME_OVERRIDDEN_QUESTION = "Do you want to rename the base member, or only this member?"
diff --git a/language-server/src/dotty/tools/languageserver/Main.scala b/language-server/src/dotty/tools/languageserver/Main.scala
index 67c076bd4ad2..5d90efa4c23f 100644
--- a/language-server/src/dotty/tools/languageserver/Main.scala
+++ b/language-server/src/dotty/tools/languageserver/Main.scala
@@ -20,7 +20,7 @@ import org.eclipse.lsp4j.jsonrpc.Launcher
  *    coursier launch $artifact -M dotty.tools.languageserver.Main -- -stdio
  *
  *  Where $artifact comes from the `.dotty-ide-artifact` file in the current project, this file
- *  can be created by the sbt-dotty plugin by running `sbt configureIDE`.
+ *  can be created by the DottyIDEPlugin by running `sbt configureIDE`.
  *
  *  See vscode-dotty/ for an example integration of the Dotty Language Server into Visual Studio Code.
  */
diff --git a/language-server/test/dotty/tools/languageserver/CompletionTest.scala b/language-server/test/dotty/tools/languageserver/CompletionTest.scala
index ffb3f22d1ce1..b9b0ca1f037f 100644
--- a/language-server/test/dotty/tools/languageserver/CompletionTest.scala
+++ b/language-server/test/dotty/tools/languageserver/CompletionTest.scala
@@ -42,15 +42,15 @@ class CompletionTest {
 
   @Test def completionFromSyntheticPackageObject: Unit = {
     code"class Foo { val foo: IArr${m1} }".withSource
-      .completion(m1, Set(("IArray", Field, "scala.IArray"),
-                          ("IArray", Module, "scala.IArray$package.IArray$")))
+      .completion(m1, Set(("IArray", Module, "IArray"),
+                          ("IArray", Field, "scala.IArray")))
   }
 
   @Test def completionFromJavaDefaults: Unit = {
     code"class Foo { val foo: Runn${m1} }".withSource
       .completion(m1, Set(
         ("Runnable", Class, "java.lang.Runnable"),
-        ("Runnable", Module, "Runnable$")
+        ("Runnable", Module, "Runnable")
       ))
   }
 
@@ -121,7 +121,7 @@ class CompletionTest {
     withSources(
       code"""object O { object MyObject }""",
       code"""import O.My${m1}"""
-    ).completion(m1, Set(("MyObject", Module, "O.MyObject$")))
+    ).completion(m1, Set(("MyObject", Module, "O.MyObject")))
   }
 
   @Test def importCompleteWithClassAndCompanion: Unit = {
@@ -132,7 +132,7 @@ class CompletionTest {
       code"""package pgk1
              import pkg0.F${m1}"""
     ).completion(m1, Set(("Foo", Class, "pkg0.Foo"),
-                         ("Foo", Module, "pkg0.Foo$")))
+                         ("Foo", Module, "pkg0.Foo")))
   }
 
   @Test def importCompleteIncludePackage: Unit = {
@@ -157,7 +157,7 @@ class CompletionTest {
     ).completion(m1, Set(("myVal", Field, "Int"),
                          ("myDef", Method, "=> Int"),
                          ("myVar", Variable, "Int"),
-                         ("myObject", Module, "MyObject.myObject$"),
+                         ("myObject", Module, "MyObject.myObject"),
                          ("myClass", Class, "MyObject.myClass"),
                          ("myTrait", Class, "MyObject.myTrait")))
   }
@@ -165,7 +165,7 @@ class CompletionTest {
   @Test def importJavaClass: Unit = {
     code"""import java.io.FileDesc${m1}""".withSource
       .completion(m1, Set(("FileDescriptor", Class, "java.io.FileDescriptor"),
-                          ("FileDescriptor", Module, "java.io.FileDescriptor$")))
+                          ("FileDescriptor", Module, "java.io.FileDescriptor")))
   }
 
   @Test def importJavaStaticMethod: Unit = {
@@ -190,13 +190,13 @@ class CompletionTest {
     code"""object O {
              val out = java.io.FileDesc${m1}
            }""".withSource
-      .completion(m1, Set(("FileDescriptor", Module, "java.io.FileDescriptor$")))
+      .completion(m1, Set(("FileDescriptor", Module, "java.io.FileDescriptor")))
   }
 
   @Test def importRename: Unit = {
     code"""import java.io.{FileDesc${m1} => Foo}""".withSource
       .completion(m1, Set(("FileDescriptor", Class, "java.io.FileDescriptor"),
-                          ("FileDescriptor", Module, "java.io.FileDescriptor$")))
+                          ("FileDescriptor", Module, "java.io.FileDescriptor")))
   }
 
   @Test def importGivenByType: Unit = {
@@ -257,14 +257,14 @@ class CompletionTest {
           |  object bat
           |  val bizz: ba${m1}
           |}""".withSource
-      .completion(m1, Set(("bar", Field, "Bar"), ("bat", Module, "Foo.bat$")))
+      .completion(m1, Set(("bar", Field, "Bar"), ("bat", Module, "Foo.bat")))
   }
 
   @Test def completionOnRenamedImport: Unit = {
     code"""import java.io.{FileDescriptor => AwesomeStuff}
            trait Foo { val x: Awesom$m1 }""".withSource
       .completion(m1, Set(("AwesomeStuff", Class, "java.io.FileDescriptor"),
-                          ("AwesomeStuff", Module, "java.io.FileDescriptor$")))
+                          ("AwesomeStuff", Module, "java.io.FileDescriptor")))
   }
 
   @Test def completionOnRenamedImport2: Unit = {
@@ -274,7 +274,7 @@ class CompletionTest {
              val x: MyImp$m1
            }""".withSource
       .completion(m1, Set(("MyImportedSymbol", Class, "java.io.FileDescriptor"),
-                          ("MyImportedSymbol", Module, "java.io.FileDescriptor$")))
+                          ("MyImportedSymbol", Module, "java.io.FileDescriptor")))
   }
 
   @Test def completionRenamedAndOriginalNames: Unit = {
@@ -284,9 +284,9 @@ class CompletionTest {
           |  val x: Hash$m1
           |}""".withSource
       .completion(m1, Set(("HashMap", Class, "java.util.HashMap"),
-                          ("HashMap", Module, "java.util.HashMap$"),
+                          ("HashMap", Module, "java.util.HashMap"),
                           ("HashMap2", Class, "java.util.HashMap"),
-                          ("HashMap2", Module, "java.util.HashMap$")))
+                          ("HashMap2", Module, "java.util.HashMap")))
   }
 
   @Test def completionRenamedThrice: Unit = {
@@ -297,11 +297,11 @@ class CompletionTest {
           |  val x: MyHash$m1
           |}""".withSource
       .completion(m1, Set(("MyHashMap", Class, "java.util.HashMap"),
-                          ("MyHashMap", Module, "java.util.HashMap$"),
+                          ("MyHashMap", Module, "java.util.HashMap"),
                           ("MyHashMap2", Class, "java.util.HashMap"),
-                          ("MyHashMap2", Module, "java.util.HashMap$"),
+                          ("MyHashMap2", Module, "java.util.HashMap"),
                           ("MyHashMap3", Class, "java.util.HashMap"),
-                          ("MyHashMap3", Module, "java.util.HashMap$")))
+                          ("MyHashMap3", Module, "java.util.HashMap")))
   }
 
   @Test def completeFromWildcardImports: Unit = {
@@ -372,7 +372,7 @@ class CompletionTest {
     code"""object Test {
           |  def x = Tes$m1
           |}""".withSource
-      .completion(m1, Set(("Test", Module, "Test$")))
+      .completion(m1, Set(("Test", Module, "Test")))
   }
 
   @Test def completeBothDefinitionsForEqualNestingLevels: Unit = {
@@ -404,6 +404,19 @@ class CompletionTest {
       .completion(m1, Set())
   }
 
+  @Test def completeFromSameImportsForEqualNestingLevels: Unit = {
+    code"""object Foo {
+          |  def xxxx(i: Int): Int = i
+          |}
+          |object Test {
+          |  import Foo.xxxx
+          |  import Foo.xxxx
+          |  import Foo.xxxx
+          |  val x = xx$m1
+          |}""".withSource
+      .completion(m1, Set(("xxxx", Method, "(i: Int): Int")))
+  }
+
   @Test def preferLocalDefinitionToImportForEqualNestingLevels: Unit = {
     code"""object Foo {
           |  val xxxx = 1
@@ -524,9 +537,9 @@ class CompletionTest {
           |  val ZZZZ = YY$m1
           |  type ZZZZ = YY$m2
           |}""".withSource
-      .completion(m1, Set(("YYYY", Field, "Int$")))
+      .completion(m1, Set(("YYYY", Field, "Int")))
       .completion(m2, Set(("YYYY", Field, "XXXX.YYYY"),
-                          ("YYYY", Field, "Int$")))
+                          ("YYYY", Field, "Int")))
   }
 
   @Test def completeRespectingAccessModifiers: Unit = {
@@ -547,7 +560,8 @@ class CompletionTest {
   }
 
   @Test def completeFromPackageObjectWithInheritance: Unit = {
-    code"""trait Foo[A] { def xxxx(a: A) = a }
+    code"""package test
+          |trait Foo[A] { def xxxx(a: A) = a }
           |package object foo extends Foo[Int] {}
           |object Test {
           |  foo.xx$m1
@@ -842,4 +856,171 @@ class CompletionTest {
           |object Main { "abc".xx${m1} }""".withSource
       .completion(m1, Set())
   }
+
+  @Test def i13365: Unit = {
+    code"""|import scala.quoted._
+        |
+        |object Test {
+        |  def test(using Quotes)(str: String) = {
+        |    import quotes.reflect._
+        |    val msg = Expr(str)
+        |    val printHello = '{ print("sdsd") }
+        |    val tree = printHello.asTerm
+        |    tree.sh${m1}
+        |  }
+        |}""".withSource
+      .completion(m1, Set(("show",Method, "(using x$2: x$1.reflect.Printer[x$1.reflect.Tree]): String")))
+  }
+
+  @Test def syntheticThis: Unit = {
+    code"""|class Y() {
+           |  def bar: Unit =
+           |    val argument: Int = ???
+           |    arg${m1}
+           |
+           |  def arg: String = ???
+           |}
+           |""".withSource
+      .completion(m1, Set(("arg", Method, "=> String"),
+                          ("argument", Field, "Int")))
+  }
+
+  @Test def concatMethodWithImplicits: Unit = {
+    code"""|object A {
+           |  Array.concat${m1}
+           |}""".withSource
+      .completion(
+          m1,
+          Set(
+            (
+              "concat",
+              Method,
+              "[T](xss: Array[T]*)(implicit evidence$11: scala.reflect.ClassTag[T]): Array[T]"
+            )
+          )
+        )
+  }
+
+  @Test def i12465_hkt: Unit =
+    code"""???.asInstanceOf[scala.collection.Seq].${m1}""".withSource
+      .completion(m1, Set())
+
+  @Test def i12465_hkt_alias: Unit =
+    code"""???.asInstanceOf[Seq].${m1}""".withSource
+      .completion(m1, Set())
+
+  @Test def i13624_annotType: Unit =
+    code"""|object Foo{
+           |  class MyAnnotation extends annotation.StaticAnnotation
+           |}
+           |class MyAnnotation extends annotation.StaticAnnotation
+           |class Annotation2(a: String) extends annotation.StaticAnnotation
+           |val x = 1: @MyAnnot${m1}
+           |type X = Int @MyAnnot${m2}
+           |val y = 1: @Foo.MyAnnot${m3}
+           |val z = 1: @Foo.MyAnnotation @MyAnno${m4}
+           |type Y = Int @MyAnnotation @Foo.MyAnnota${m5}
+           |val w = 1: @Annotation2("abc": @Foo.MyAnnot${m6})
+           |""".withSource
+      .completion(
+        m1,
+        Set(
+          ("MyAnnotation", Class, "MyAnnotation"),
+          ("MyAnnotation", Module, "MyAnnotation")
+        )
+      ).completion(
+        m2,
+        Set(
+          ("MyAnnotation", Class, "MyAnnotation"),
+          ("MyAnnotation", Module, "MyAnnotation")
+        )
+      ).completion(
+        m3,
+        Set(
+          ("MyAnnotation", Class, "Foo.MyAnnotation"),
+          ("MyAnnotation", Module, "Foo.MyAnnotation")
+        )
+      ).completion(
+        m4,
+        Set(
+          ("MyAnnotation", Class, "MyAnnotation"),
+          ("MyAnnotation", Module, "MyAnnotation")
+        )
+      ).completion(
+        m5,
+        Set(
+          ("MyAnnotation", Class, "Foo.MyAnnotation"),
+          ("MyAnnotation", Module, "Foo.MyAnnotation")
+        )
+      ).completion(
+        m6,
+        Set(
+          ("MyAnnotation", Class, "Foo.MyAnnotation"),
+          ("MyAnnotation", Module, "Foo.MyAnnotation")
+        )
+      )
+
+  @Test def i13624_annotation : Unit =
+    code"""@annotation.implicitNot${m1}
+          |@annotation.implicitNotFound @mai${m2}"""
+          .withSource
+          .completion(m1,
+            Set(
+              ("implicitNotFound", Class, "scala.annotation.implicitNotFound"),
+              ("implicitNotFound", Module, "scala.annotation.implicitNotFound")
+            )
+          )
+          .completion(m2,
+            Set(
+              ("main", Class, "scala.main"),
+              ("main", Module, "main")
+            )
+          )
+
+  @Test def i13623_annotation : Unit =
+    code"""import annot${m1}"""
+          .withSource
+          .completion(m1,
+            Set(
+              ("annotation", Module, "scala.annotation")
+            )
+          )
+
+  @Test def importAnnotationAfterImport : Unit =
+    code"""import java.lang.annotation; import annot${m1}"""
+        .withSource
+        .completion(m1,
+          Set(
+            ("annotation", Module, "scala.annotation")
+          )
+        )
+  @Test def completeTemplateConstrArgType: Unit = {
+    val expected = Set(
+      ("Future", Class, "scala.concurrent.Future"),
+      ("Future", Module, "scala.concurrent.Future")
+    )
+    code"""import scala.concurrent.Future
+          |class Foo(x: Fut${m1})""".withSource
+      .completion(m1, expected) 
+  }
+
+  @Test def completeTemplateParents: Unit = {
+    val expected = Set(
+      ("Future", Class, "scala.concurrent.Future"),
+      ("Future", Module, "scala.concurrent.Future")
+    )
+    code"""import scala.concurrent.Future
+          |class Foo extends Futu${m1}""".withSource
+      .completion(m1, expected) 
+  }
+
+  @Test def completeTemplateSelfType: Unit = {
+    val expected = Set(
+      ("Future", Class, "scala.concurrent.Future"),
+      ("Future", Module, "scala.concurrent.Future")
+    )
+    code"""import scala.concurrent.Future
+          |class Foo[A]{ self: Futu${m1} => }""".withSource
+      .completion(m1, expected) 
+  }
 }
diff --git a/language-server/test/dotty/tools/languageserver/HoverTest.scala b/language-server/test/dotty/tools/languageserver/HoverTest.scala
index 54d3271f2565..f23aac2ad6b6 100644
--- a/language-server/test/dotty/tools/languageserver/HoverTest.scala
+++ b/language-server/test/dotty/tools/languageserver/HoverTest.scala
@@ -177,7 +177,7 @@ class HoverTest {
 
   @Test def i4678: Unit = {
     code"""class Foo {
-          |  val x: Int = (${m1}1:${m2} ${m3}@annot1 @annot2 @annot3 @annot4 @annot5${m4})
+          |  val x: Int = (${m1}1:${m2} ${m3}@annot1${m4} ${m5}@annot2${m6} ${m7}@annot3${m8} ${m9}@annot4${m10} ${m11}@annot5${m12})
           |}
           |class annot1 extends scala.annotation.Annotation
           |class annot2 extends scala.annotation.Annotation
@@ -186,7 +186,11 @@ class HoverTest {
           |class annot5 extends scala.annotation.Annotation
           |""".withSource
       .hover(m1 to m2, hoverContent("(1 : Int)"))
-      .hover(m3 to m4, hoverContent("(1 : Int) @annot1 @annot2 @annot3 @annot4 @annot5"))
+      .hover(m3 to m4, hoverContent("annot1"))
+      .hover(m5 to m6, hoverContent("annot2"))
+      .hover(m7 to m8, hoverContent("annot3"))
+      .hover(m9 to m10, hoverContent("annot4"))
+      .hover(m11 to m12, hoverContent("annot5"))
   }
 
   @Test def unicodeChar: Unit = {
@@ -209,4 +213,28 @@ class HoverTest {
       // sp the top-level definitions should be enclosed in an object called `Source0$package`.
       .hover(m1 to m2, hoverContent("(hello.Source0$package : hello.Source0$package.type)"))
   }
+
+  @Test def enumsRepeated: Unit = {
+    code"""|package example
+           |object SimpleEnum:
+           |  enum Color:
+           |    case ${m1}Red${m2}, Green, Blue
+           |""".withSource
+      .hover(m1 to m2, hoverContent("example.SimpleEnum.Color"))
+  }
+  
+  @Test def enums: Unit = {
+    code"""|package example
+           |enum TestEnum3:
+           | case ${m1}A${m2} // no tooltip
+           |
+           |""".withSource
+      .hover(m1 to m2, hoverContent("example.TestEnum3"))
+  }
+  
+  @Test def tuple: Unit = {
+    code"""|object A:
+           |  val (${m1}first${m2}, second) = (1, 2)""".withSource
+      .hover(m1 to m2, hoverContent("Int"))
+  }
 }
diff --git a/library/src/scala/CanEqual.scala b/library/src/scala/CanEqual.scala
index 39e5389df989..f09df1455c2c 100644
--- a/library/src/scala/CanEqual.scala
+++ b/library/src/scala/CanEqual.scala
@@ -1,6 +1,6 @@
 package scala
 
-import annotation.implicitNotFound
+import annotation.{ implicitNotFound, since }
 import scala.collection.{Seq, Set}
 
 /** A marker trait indicating that values of type `L` can be compared to values of type `R`. */
@@ -26,9 +26,22 @@ object CanEqual {
   given canEqualNumber: CanEqual[Number, Number] = derived
   given canEqualString: CanEqual[String, String] = derived
 
-  // The next three definitions can go into the companion objects of classes
-  // Seq and Set. For now they are here in order not to have to touch the
+  // The next 6 definitions can go into the companion objects of their corresponding
+  // classes. For now they are here in order not to have to touch the
   // source code of these classes
-  given canEqualSeq[T, U](using eq: CanEqual[T, U]): CanEqual[Seq[T], Seq[U]] = derived
+  @since("3.1")
+  given canEqualSeqs[T, U](using eq: CanEqual[T, U]): CanEqual[Seq[T], Seq[U]] = derived
+  given canEqualSeq[T](using eq: CanEqual[T, T]): CanEqual[Seq[T], Seq[T]] = derived // for `case Nil` in pattern matching
+
   given canEqualSet[T, U](using eq: CanEqual[T, U]): CanEqual[Set[T], Set[U]] = derived
+
+  @since("3.1")
+  given canEqualOptions[T, U](using eq: CanEqual[T, U]): CanEqual[Option[T], Option[U]] = derived
+  @since("3.1")
+  given canEqualOption[T](using eq: CanEqual[T, T]): CanEqual[Option[T], Option[T]] = derived // for `case None` in pattern matching
+
+  @since("3.1")
+  given canEqualEither[L1, R1, L2, R2](
+    using eqL: CanEqual[L1, L2], eqR: CanEqual[R1, R2]
+  ): CanEqual[Either[L1, R1], Either[L2, R2]] = derived
 }
diff --git a/library/src/scala/CanThrow.scala b/library/src/scala/CanThrow.scala
new file mode 100644
index 000000000000..fcfd11fc9197
--- /dev/null
+++ b/library/src/scala/CanThrow.scala
@@ -0,0 +1,16 @@
+package scala
+import language.experimental.erasedDefinitions
+import annotation.{implicitNotFound, experimental}
+
+/** A capability class that allows to throw exception `E`. When used with the
+ *  experimental.saferExceptions feature, a `throw Ex()` expression will require
+ *  a given of class `CanThrow[Ex]` to be available.
+ */
+@experimental
+@implicitNotFound("The capability to throw exception ${E} is missing.\nThe capability can be provided by one of the following:\n - Adding a using clause `(using CanThrow[${E}])` to the definition of the enclosing method\n - Adding `throws ${E}` clause after the result type of the enclosing method\n - Wrapping this piece of code with a `try` block that catches ${E}")
+erased class CanThrow[-E <: Exception]
+
+@experimental
+object unsafeExceptions:
+  given canThrowAny: CanThrow[Exception] = compiletime.erasedValue
+
diff --git a/library/src/scala/IArray.scala b/library/src/scala/IArray.scala
index 50d40b6f2f19..72124bdf8215 100644
--- a/library/src/scala/IArray.scala
+++ b/library/src/scala/IArray.scala
@@ -249,9 +249,11 @@ object IArray:
   extension [T](arr: IArray[T]) def takeWhile(p: T => Boolean): IArray[T] =
     genericArrayOps(arr).takeWhile(p)
 
-  /** Returns a mutable copy of this immutable array. */
-  extension [T](arr: IArray[T]) def toArray: Array[T] =
-    arr.clone.asInstanceOf[Array[T]]
+  extension [T](arr: IArray[T])
+    /** Returns a mutable copy of this immutable array. */
+    @deprecated("This method implementation is incorrect and calling it can crash your program, please use `IArray.genericWrapArray(myIArray).toArray` instead.", "3.0.1")
+    def toArray: Array[T] =
+      arr.clone.asInstanceOf[Array[T]]
 
   extension [T](arr: IArray[T])
     def ++[U >: T: ClassTag](suffix: IArray[U]): IArray[U] = genericArrayOps(arr) ++ suffix.toSeq
@@ -326,54 +328,59 @@ object IArray:
   extension [T, U >: T: ClassTag](x: T)
     def +:(arr: IArray[U]): IArray[U] = genericArrayOps(arr).prepended(x)
 
+  // For backwards compatibility with code compiled without -Yexplicit-nulls
+  private inline def mapNull[A, B](a: A, inline f: B): B =
+    if((a: A|Null) == null) null.asInstanceOf[B] else f
+
   /** Conversion from IArray to immutable.ArraySeq */
   implicit def genericWrapArray[T](arr: IArray[T]): ArraySeq[T] =
-    if arr eq null then null else ArraySeq.unsafeWrapArray(arr)
+    mapNull(arr, ArraySeq.unsafeWrapArray(arr))
 
   /** Conversion from IArray to immutable.ArraySeq */
   implicit def wrapRefArray[T <: AnyRef](arr: IArray[T]): ArraySeq.ofRef[T] =
     // Since the JVM thinks arrays are covariant, one 0-length Array[AnyRef]
     // is as good as another for all T <: AnyRef.  Instead of creating 100,000,000
     // unique ones by way of this implicit, let's share one.
-    if (arr eq null) null
-    else if (arr.length == 0) ArraySeq.empty[AnyRef].asInstanceOf[ArraySeq.ofRef[T]]
-    else ArraySeq.ofRef(arr.asInstanceOf[Array[T]])
+    mapNull(arr,
+      if (arr.length == 0) ArraySeq.empty[AnyRef].asInstanceOf[ArraySeq.ofRef[T]]
+      else ArraySeq.ofRef(arr.asInstanceOf[Array[T]])
+    )
 
   /** Conversion from IArray to immutable.ArraySeq */
   implicit def wrapIntArray(arr: IArray[Int]): ArraySeq.ofInt =
-    if (arr ne null) new ArraySeq.ofInt(arr.asInstanceOf[Array[Int]]) else null
+    mapNull(arr, new ArraySeq.ofInt(arr.asInstanceOf[Array[Int]]))
 
   /** Conversion from IArray to immutable.ArraySeq */
   implicit def wrapDoubleIArray(arr: IArray[Double]): ArraySeq.ofDouble =
-    if (arr ne null) new ArraySeq.ofDouble(arr.asInstanceOf[Array[Double]]) else null
+    mapNull(arr, new ArraySeq.ofDouble(arr.asInstanceOf[Array[Double]]))
 
   /** Conversion from IArray to immutable.ArraySeq */
   implicit def wrapLongIArray(arr: IArray[Long]): ArraySeq.ofLong =
-    if (arr ne null) new ArraySeq.ofLong(arr.asInstanceOf[Array[Long]]) else null
+    mapNull(arr, new ArraySeq.ofLong(arr.asInstanceOf[Array[Long]]))
 
   /** Conversion from IArray to immutable.ArraySeq */
   implicit def wrapFloatIArray(arr: IArray[Float]): ArraySeq.ofFloat =
-    if (arr ne null) new ArraySeq.ofFloat(arr.asInstanceOf[Array[Float]]) else null
+    mapNull(arr, new ArraySeq.ofFloat(arr.asInstanceOf[Array[Float]]))
 
   /** Conversion from IArray to immutable.ArraySeq */
   implicit def wrapCharIArray(arr: IArray[Char]): ArraySeq.ofChar =
-    if (arr ne null) new ArraySeq.ofChar(arr.asInstanceOf[Array[Char]]) else null
+    mapNull(arr, new ArraySeq.ofChar(arr.asInstanceOf[Array[Char]]))
 
   /** Conversion from IArray to immutable.ArraySeq */
   implicit def wrapByteIArray(arr: IArray[Byte]): ArraySeq.ofByte =
-    if (arr ne null) new ArraySeq.ofByte(arr.asInstanceOf[Array[Byte]]) else null
+    mapNull(arr, new ArraySeq.ofByte(arr.asInstanceOf[Array[Byte]]))
 
   /** Conversion from IArray to immutable.ArraySeq */
   implicit def wrapShortIArray(arr: IArray[Short]): ArraySeq.ofShort =
-    if (arr ne null) new ArraySeq.ofShort(arr.asInstanceOf[Array[Short]]) else null
+    mapNull(arr, new ArraySeq.ofShort(arr.asInstanceOf[Array[Short]]))
 
   /** Conversion from IArray to immutable.ArraySeq */
   implicit def wrapBooleanIArray(arr: IArray[Boolean]): ArraySeq.ofBoolean =
-    if (arr ne null) new ArraySeq.ofBoolean(arr.asInstanceOf[Array[Boolean]]) else null
+    mapNull(arr, new ArraySeq.ofBoolean(arr.asInstanceOf[Array[Boolean]]))
 
   /** Conversion from IArray to immutable.ArraySeq */
   implicit def wrapUnitIArray(arr: IArray[Unit]): ArraySeq.ofUnit =
-    if (arr ne null) new ArraySeq.ofUnit(arr.asInstanceOf[Array[Unit]]) else null
+    mapNull(arr, new ArraySeq.ofUnit(arr.asInstanceOf[Array[Unit]]))
 
   /** Convert an array into an immutable array without copying, the original array
    *   must _not_ be mutated after this or the guaranteed immutablity of IArray will
diff --git a/library/src/scala/Selectable.scala b/library/src/scala/Selectable.scala
index f89102ae4802..536c760988ab 100644
--- a/library/src/scala/Selectable.scala
+++ b/library/src/scala/Selectable.scala
@@ -1,5 +1,7 @@
 package scala
 
+import scala.annotation.since
+
 /** A marker trait for objects that support structural selection via
  *  `selectDynamic` and `applyDynamic`
  *
@@ -34,3 +36,19 @@ object Selectable:
   implicit def reflectiveSelectableFromLangReflectiveCalls(x: Any)(
       using scala.languageFeature.reflectiveCalls): scala.reflect.Selectable =
     scala.reflect.Selectable.reflectiveSelectable(x)
+
+  /** A marker trait for subclasses of `Selectable` indicating
+   *  that precise parameter types are not needed for method dispatch. That is,
+   *  a class inheriting from this trait and implementing
+   *
+   *     def applyDynamic(name: String, paramTypes: Class[_]*)(args: Any*)
+   *
+   *  should dispatch to a method with the given `name` without having to rely
+   *  on the precise `paramTypes`. Subtypes of `WithoutPreciseParameterTypes`
+   *  can have more relaxed subtyping rules for refinements. They do not need
+   *  the additional restriction that the signatures of the refinement and
+   *  the definition that implements the refinment must match.
+   */
+  @since("3.1")
+  trait WithoutPreciseParameterTypes extends Selectable
+end Selectable
diff --git a/library/src/scala/Tuple.scala b/library/src/scala/Tuple.scala
index 5e69db4fc5af..cc26061c203c 100644
--- a/library/src/scala/Tuple.scala
+++ b/library/src/scala/Tuple.scala
@@ -1,5 +1,6 @@
 package scala
-import annotation.showAsInfix
+
+import annotation.{experimental, showAsInfix, since}
 import compiletime._
 import compiletime.ops.int._
 
@@ -7,19 +8,24 @@ import compiletime.ops.int._
 sealed trait Tuple extends Product {
   import Tuple._
 
-  /** Create a copy this tuple as an Array */
+  /** Create a copy of this tuple as an Array */
   inline def toArray: Array[Object] =
     runtime.Tuples.toArray(this)
 
-  /** Create a copy this tuple as a List */
+  /** Create a copy of this tuple as a List */
   inline def toList: List[Union[this.type]] =
     this.productIterator.toList
       .asInstanceOf[List[Union[this.type]]]
 
-  /** Create a copy this tuple as an IArray */
+  /** Create a copy of this tuple as an IArray */
   inline def toIArray: IArray[Object] =
     runtime.Tuples.toIArray(this)
 
+  /** Return a copy of `this` tuple with an element appended */
+  @experimental
+  inline def :* [This >: this.type <: Tuple, L] (x: L): Append[This, L] =
+    runtime.Tuples.append(x, this).asInstanceOf[Append[This, L]]
+
   /** Return a new tuple by prepending the element to `this` tuple.
    *  This operation is O(this.size)
    */
@@ -77,23 +83,45 @@ sealed trait Tuple extends Product {
 
 object Tuple {
 
+  /** Type of a tuple with an element appended */
+  @experimental
+  type Append[X <: Tuple, Y] <: Tuple = X match {
+    case EmptyTuple => Y *: EmptyTuple
+    case x *: xs => x *: Append[xs, Y]
+  }
+
   /** Type of the head of a tuple */
   type Head[X <: NonEmptyTuple] = X match {
     case x *: _ => x
   }
 
+  /** Type of the initial part of the tuple without its last element */
+  @experimental
+  type Init[X <: Tuple] <: Tuple = X match {
+    case _ *: EmptyTuple => EmptyTuple
+    case x *: xs =>
+      x *: Init[xs]
+  }
+
   /** Type of the tail of a tuple */
   type Tail[X <: NonEmptyTuple] <: Tuple = X match {
     case _ *: xs => xs
   }
 
+  /** Type of the last element of a tuple */
+  @experimental
+  type Last[X <: Tuple] = X match {
+    case x *: EmptyTuple => x
+    case _ *: xs => Last[xs]
+  }
+
   /** Type of the concatenation of two tuples */
   type Concat[X <: Tuple, +Y <: Tuple] <: Tuple = X match {
     case EmptyTuple => Y
     case x1 *: xs1 => x1 *: Concat[xs1, Y]
   }
 
-  /** Type of the element a position N in the tuple X */
+  /** Type of the element at position N in the tuple X */
   type Elem[X <: Tuple, N <: Int] = X match {
     case x *: xs =>
       N match {
@@ -109,18 +137,18 @@ object Tuple {
   }
 
   /** Fold a tuple `(T1, ..., Tn)` into `F[T1, F[... F[Tn, Z]...]]]` */
-  type Fold[T <: Tuple, Z, F[_, _]] = T match
+  type Fold[Tup <: Tuple, Z, F[_, _]] = Tup match
     case EmptyTuple => Z
     case h *: t => F[h, Fold[t, Z, F]]
 
   /** Converts a tuple `(T1, ..., Tn)` to `(F[T1], ..., F[Tn])` */
-  type Map[Tup <: Tuple, F[_]] <: Tuple = Tup match {
+  type Map[Tup <: Tuple, F[_ <: Union[Tup]]] <: Tuple = Tup match {
     case EmptyTuple => EmptyTuple
     case h *: t => F[h] *: Map[t, F]
   }
 
   /** Converts a tuple `(T1, ..., Tn)` to a flattened `(..F[T1], ..., ..F[Tn])` */
-  type FlatMap[Tup <: Tuple, F[_] <: Tuple] <: Tuple = Tup match {
+  type FlatMap[Tup <: Tuple, F[_ <: Union[Tup]] <: Tuple] <: Tuple = Tup match {
     case EmptyTuple => EmptyTuple
     case h *: t => Concat[F[h], FlatMap[t, F]]
   }
@@ -212,18 +240,17 @@ object Tuple {
       case xs: Array[Object] => xs
       case xs => xs.map(_.asInstanceOf[Object])
     }
-    runtime.Tuples.fromArray(xs2).asInstanceOf[Tuple]
+    runtime.Tuples.fromArray(xs2)
   }
 
   /** Convert an immutable array into a tuple of unknown arity and types */
   def fromIArray[T](xs: IArray[T]): Tuple = {
     val xs2: IArray[Object] = xs match {
       case xs: IArray[Object] @unchecked => xs
-      case xs =>
-        // TODO support IArray.map
-        xs.asInstanceOf[Array[T]].map(_.asInstanceOf[Object]).asInstanceOf[IArray[Object]]
+      case _ =>
+        xs.map(_.asInstanceOf[Object])
     }
-    runtime.Tuples.fromIArray(xs2).asInstanceOf[Tuple]
+    runtime.Tuples.fromIArray(xs2)
   }
 
   /** Convert a Product into a tuple of unknown arity and types */
@@ -232,6 +259,13 @@ object Tuple {
 
   def fromProductTyped[P <: Product](p: P)(using m: scala.deriving.Mirror.ProductOf[P]): m.MirroredElemTypes =
     runtime.Tuples.fromProduct(p).asInstanceOf[m.MirroredElemTypes]
+
+  @since("3.1")
+  given canEqualEmptyTuple: CanEqual[EmptyTuple, EmptyTuple] = CanEqual.derived
+  @since("3.1")
+  given canEqualTuple[H1, T1 <: Tuple, H2, T2 <: Tuple](
+    using eqHead: CanEqual[H1, H2], eqTail: CanEqual[T1, T2]
+  ): CanEqual[H1 *: T1, H2 *: T2] = CanEqual.derived
 }
 
 /** A tuple of 0 elements */
@@ -264,6 +298,16 @@ sealed trait NonEmptyTuple extends Tuple {
   inline def head[This >: this.type <: NonEmptyTuple]: Head[This] =
     runtime.Tuples.apply(this, 0).asInstanceOf[Head[This]]
 
+  /** Get the initial part of the tuple without its last element */
+  @experimental
+  inline def init[This >: this.type <: NonEmptyTuple]: Init[This] =
+    runtime.Tuples.init(this).asInstanceOf[Init[This]]
+
+  /** Get the last of this tuple */
+  @experimental
+  inline def last[This >: this.type <: NonEmptyTuple]: Last[This] =
+    runtime.Tuples.last(this).asInstanceOf[Last[This]]
+
   /** Get the tail of this tuple.
    *  This operation is O(this.size)
    */
diff --git a/library/src/scala/annotation/experimental.scala b/library/src/scala/annotation/experimental.scala
new file mode 100644
index 000000000000..abd8012fbe54
--- /dev/null
+++ b/library/src/scala/annotation/experimental.scala
@@ -0,0 +1,9 @@
+package scala.annotation
+
+/** An annotation that can be used to mark a definition as experimental.
+ *
+ *  @see [[https://dotty.epfl.ch/docs/reference/other-new-features/experimental-defs]]
+ *  @syntax markdown
+ */
+@since("3.1")
+class experimental extends StaticAnnotation
diff --git a/library/src/scala/annotation/internal/ErasedParam.scala b/library/src/scala/annotation/internal/ErasedParam.scala
new file mode 100644
index 000000000000..769b9a710d5f
--- /dev/null
+++ b/library/src/scala/annotation/internal/ErasedParam.scala
@@ -0,0 +1,6 @@
+package scala.annotation
+package internal
+
+/** An annotation produced by Namer to indicate an erased parameter */
+@since("3.1")
+final class ErasedParam() extends Annotation
diff --git a/library/src/scala/annotation/internal/TransparentParam.scala b/library/src/scala/annotation/internal/InlineParam.scala
similarity index 100%
rename from library/src/scala/annotation/internal/TransparentParam.scala
rename to library/src/scala/annotation/internal/InlineParam.scala
diff --git a/library/src/scala/annotation/internal/ProvisionalSuperClass.scala b/library/src/scala/annotation/internal/ProvisionalSuperClass.scala
new file mode 100644
index 000000000000..a9748540de56
--- /dev/null
+++ b/library/src/scala/annotation/internal/ProvisionalSuperClass.scala
@@ -0,0 +1,7 @@
+package scala.annotation
+package internal
+
+/** An annotation to record a provisional super class */
+@since("3.1")
+class ProvisionalSuperClass extends StaticAnnotation
+
diff --git a/library/src/scala/annotation/since.scala b/library/src/scala/annotation/since.scala
new file mode 100644
index 000000000000..3c335dc020ba
--- /dev/null
+++ b/library/src/scala/annotation/since.scala
@@ -0,0 +1,4 @@
+package scala.annotation
+
+/** An annotation that is used to mark symbols added to the stdlib after 3.0 release */
+private[scala] class since(scalaRelease: String) extends scala.annotation.StaticAnnotation
diff --git a/library/src/scala/compiletime/ops/any.scala b/library/src/scala/compiletime/ops/any.scala
index 0cb7e6d06431..56605979474d 100644
--- a/library/src/scala/compiletime/ops/any.scala
+++ b/library/src/scala/compiletime/ops/any.scala
@@ -1,6 +1,8 @@
 package scala.compiletime
 package ops
 
+import annotation.experimental
+
 object any:
   /** Equality comparison of two singleton types.
    * ```scala
@@ -21,3 +23,33 @@ object any:
    * @syntax markdown
    */
   type !=[X, Y] <: Boolean
+
+  /** Tests if a type is a constant.
+   * ```scala
+   * val c1: IsConst[1] = true
+   * val c2: IsConst["hi"] = true
+   * val c3: IsConst[false] = true
+   * val c4: IsConst[Any] = false
+   * ```
+   * If the type is not yet known, then `IsConst` remains unevaluated, and
+   * will be evaluated only at its concrete type application. E.g.:
+   * ```scala
+   * //def `isConst`` returns the type `IsConst[X]`, since `X` is not yet known.
+   * def isConst[X] : IsConst[X] = ???
+   * val c5 : true = isConst[1] //now the type is known to be a constant
+   * val c6 : false = isConst[Any] //now the type is known to be not a constant
+   * ```
+   * @syntax markdown
+   */
+  @experimental
+  type IsConst[X] <: Boolean
+
+  /** String conversion of a constant singleton type.
+   *  ```scala
+   *  val s1: ToString[1] = "1"
+   *  val sTrue: ToString[true] = "true"
+   *  ```
+   *  @syntax markdown
+   */
+  @experimental
+  type ToString[X] <: String
\ No newline at end of file
diff --git a/library/src/scala/compiletime/ops/double.scala b/library/src/scala/compiletime/ops/double.scala
new file mode 100644
index 000000000000..e9b13ab9dcd6
--- /dev/null
+++ b/library/src/scala/compiletime/ops/double.scala
@@ -0,0 +1,139 @@
+package scala.compiletime
+package ops
+
+import scala.annotation.experimental
+
+@experimental
+object double:
+  /** Addition of two `Double` singleton types.
+   *  ```scala
+   *  val sum: 2.0 + 2.0 = 4.0
+   *  ```
+   *  @syntax markdown
+   */
+  type +[X <: Double, Y <: Double] <: Double
+
+  /** Subtraction of two `Double` singleton types.
+   *  ```scala
+   *  val sub: 4.0 - 2.0 = 2.0
+   *  ```
+   *  @syntax markdown
+   */
+  type -[X <: Double, Y <: Double] <: Double
+
+  /** Multiplication of two `Double` singleton types.
+   *  ```scala
+   *  val mul: 4.0 * 2.0 = 8.0
+   *  ```
+   *  @syntax markdown
+   */
+  type *[X <: Double, Y <: Double] <: Double
+
+  /** Integer division of two `Double` singleton types.
+   *  ```scala
+   *  val div: 5.0 / 2.0 = 2.5
+   *  ```
+   *  @syntax markdown
+   */
+  type /[X <: Double, Y <: Double] <: Double
+
+  /** Remainder of the division of `X` by `Y`.
+   *  ```scala
+   *  val mod: 5.0 % 2.0 = 1.0
+   *  ```
+   *  @syntax markdown
+   */
+  type %[X <: Double, Y <: Double] <: Double
+
+  /** Less-than comparison of two `Double` singleton types.
+   *  ```scala
+   *  val lt1: 4.0 < 2.0 = false
+   *  val lt2: 2.0 < 4.0 = true
+   *  ```
+   *  @syntax markdown
+   */
+  type <[X <: Double, Y <: Double] <: Boolean
+
+  /** Greater-than comparison of two `Double` singleton types.
+   *  ```scala
+   *  val gt1: 4.0 > 2.0 = true
+   *  val gt2: 2.0 > 2.0 = false
+   *  ```
+   *  @syntax markdown
+   */
+  type >[X <: Double, Y <: Double] <: Boolean
+
+  /** Greater-or-equal comparison of two `Double` singleton types.
+   *  ```scala
+   *  val ge1: 4.0 >= 2.0 = true
+   *  val ge2: 2.0 >= 3.0 = false
+   *  ```
+   *  @syntax markdown
+   */
+  type >=[X <: Double, Y <: Double] <: Boolean
+
+  /** Less-or-equal comparison of two `Double` singleton types.
+   *  ```scala
+   *  val lt1: 4.0 <= 2.0 = false
+   *  val lt2: 2.0 <= 2.0 = true
+   *  ```
+   *  @syntax markdown
+   */
+  type <=[X <: Double, Y <: Double] <: Boolean
+
+  /** Absolute value of an `Double` singleton type.
+   *  ```scala
+   *  val abs: Abs[-1.0] = 1.0
+   *  ```
+   *  @syntax markdown
+   */
+  type Abs[X <: Double] <: Double
+
+  /** Negation of an `Double` singleton type.
+   *  ```scala
+   *  val neg1: Negate[-1.0] = 1.0
+   *  val neg2: Negate[1.0] = -1.0
+   *  ```
+   *  @syntax markdown
+   */
+  type Negate[X <: Double] <: Double
+
+  /** Minimum of two `Double` singleton types.
+   *  ```scala
+   *  val min: Min[-1.0, 1.0] = -1.0
+   *  ```
+   *  @syntax markdown
+   */
+  type Min[X <: Double, Y <: Double] <: Double
+
+  /** Maximum of two `Double` singleton types.
+   *  ```scala
+   *  val max: Max[-1.0, 1.0] = 1.0
+   *  ```
+   *  @syntax markdown
+   */
+  type Max[X <: Double, Y <: Double] <: Double
+
+  /** Int conversion of a `Double` singleton type.
+   *  ```scala
+   *  val x: ToInt[1.0] = 1
+   *  ```
+   *  @syntax markdown
+   */
+  type ToInt[X <: Double] <: Int
+
+  /** Long conversion of a `Double` singleton type.
+   *  ```scala
+   *  val x: ToLong[1.0] = 1L
+   *  ```
+   *  @syntax markdown
+   */
+  type ToLong[X <: Double] <: Long
+
+  /** Float conversion of a `Double` singleton type.
+   *  ```scala
+   *  val x: ToFloat[1.0] = 1.0f
+   *  ```
+   *  @syntax markdown
+   */
+  type ToFloat[X <: Double] <: Float
\ No newline at end of file
diff --git a/library/src/scala/compiletime/ops/float.scala b/library/src/scala/compiletime/ops/float.scala
new file mode 100644
index 000000000000..27a1a19c17c1
--- /dev/null
+++ b/library/src/scala/compiletime/ops/float.scala
@@ -0,0 +1,139 @@
+package scala.compiletime
+package ops
+
+import scala.annotation.experimental
+
+@experimental
+object float:
+  /** Addition of two `Float` singleton types.
+   *  ```scala
+   *  val sum: 2.0f + 2.0f = 4.0f
+   *  ```
+   *  @syntax markdown
+   */
+  type +[X <: Float, Y <: Float] <: Float
+
+  /** Subtraction of two `Float` singleton types.
+   *  ```scala
+   *  val sub: 4.0f - 2.0f = 2.0f
+   *  ```
+   *  @syntax markdown
+   */
+  type -[X <: Float, Y <: Float] <: Float
+
+  /** Multiplication of two `Float` singleton types.
+   *  ```scala
+   *  val mul: 4.0f * 2.0f = 8.0f
+   *  ```
+   *  @syntax markdown
+   */
+  type *[X <: Float, Y <: Float] <: Float
+
+  /** Integer division of two `Float` singleton types.
+   *  ```scala
+   *  val div: 5.0f / 2.0f = 2.5f
+   *  ```
+   *  @syntax markdown
+   */
+  type /[X <: Float, Y <: Float] <: Float
+
+  /** Remainder of the division of `X` by `Y`.
+   *  ```scala
+   *  val mod: 5.0f % 2.0f = 1.0f
+   *  ```
+   *  @syntax markdown
+   */
+  type %[X <: Float, Y <: Float] <: Float
+
+  /** Less-than comparison of two `Float` singleton types.
+   *  ```scala
+   *  val lt1: 4.0f < 2.0f = false
+   *  val lt2: 2.0f < 4.0f = true
+   *  ```
+   *  @syntax markdown
+   */
+  type <[X <: Float, Y <: Float] <: Boolean
+
+  /** Greater-than comparison of two `Float` singleton types.
+   *  ```scala
+   *  val gt1: 4.0f > 2.0f = true
+   *  val gt2: 2.0f > 2.0f = false
+   *  ```
+   *  @syntax markdown
+   */
+  type >[X <: Float, Y <: Float] <: Boolean
+
+  /** Greater-or-equal comparison of two `Float` singleton types.
+   *  ```scala
+   *  val ge1: 4.0f >= 2.0f = true
+   *  val ge2: 2.0f >= 3.0f = false
+   *  ```
+   *  @syntax markdown
+   */
+  type >=[X <: Float, Y <: Float] <: Boolean
+
+  /** Less-or-equal comparison of two `Float` singleton types.
+   *  ```scala
+   *  val lt1: 4.0f <= 2.0f = false
+   *  val lt2: 2.0f <= 2.0f = true
+   *  ```
+   *  @syntax markdown
+   */
+  type <=[X <: Float, Y <: Float] <: Boolean
+
+  /** Absolute value of an `Float` singleton type.
+   *  ```scala
+   *  val abs: Abs[-1.0f] = 1.0f
+   *  ```
+   *  @syntax markdown
+   */
+  type Abs[X <: Float] <: Float
+
+  /** Negation of an `Float` singleton type.
+   *  ```scala
+   *  val neg1: Negate[-1.0f] = 1.0f
+   *  val neg2: Negate[1.0f] = -1.0f
+   *  ```
+   *  @syntax markdown
+   */
+  type Negate[X <: Float] <: Float
+
+  /** Minimum of two `Float` singleton types.
+   *  ```scala
+   *  val min: Min[-1.0f, 1.0f] = -1.0f
+   *  ```
+   *  @syntax markdown
+   */
+  type Min[X <: Float, Y <: Float] <: Float
+
+  /** Maximum of two `Float` singleton types.
+   *  ```scala
+   *  val max: Max[-1.0f, 1.0f] = 1.0f
+   *  ```
+   *  @syntax markdown
+   */
+  type Max[X <: Float, Y <: Float] <: Float
+
+  /** Int conversion of a `Float` singleton type.
+   *  ```scala
+   *  val x: ToInt[1.0f] = 1
+   *  ```
+   *  @syntax markdown
+   */
+  type ToInt[X <: Float] <: Int
+
+  /** Long conversion of a `Float` singleton type.
+   *  ```scala
+   *  val x: ToLong[1.0f] = 1L
+   *  ```
+   *  @syntax markdown
+   */
+  type ToLong[X <: Float] <: Long
+
+  /** Double conversion of a `Float` singleton type.
+   *  ```scala
+   *  val x: ToDouble[1.0f] = 1.0
+   *  ```
+   *  @syntax markdown
+   */
+  type ToDouble[X <: Float] <: Double
diff --git a/library/src/scala/compiletime/ops/int.scala b/library/src/scala/compiletime/ops/int.scala
index 0aa390ce29fd..c1f95dbf952b 100644
--- a/library/src/scala/compiletime/ops/int.scala
+++ b/library/src/scala/compiletime/ops/int.scala
@@ -1,15 +1,17 @@
 package scala.compiletime
 package ops
 
+import annotation.experimental
+
 object int:
-  /** Successor of a natural number where zero is the type 0 and successors are reduced as if the definition was
+  /** Successor of a natural number where zero is the type 0 and successors are reduced as if the definition was:
    *
    *  ```scala
    *  type S[N <: Int] <: Int = N match {
    *    case 0 => 1
    *    case 1 => 2
    *    case 2 => 3
-   *    ...
+   *    // ...
    *    case 2147483646 => 2147483647
    *  }
    *  ```
@@ -152,8 +154,8 @@ object int:
 
   /** Negation of an `Int` singleton type.
    *  ```scala
-   *  val neg1: Neg[-1] = 1
-   *  val neg2: Neg[1] = -1
+   *  val neg1: Negate[-1] = 1
+   *  val neg2: Negate[1] = -1
    *  ```
    *  @syntax markdown
    */
@@ -181,4 +183,47 @@ object int:
    *  ```
    *  @syntax markdown
    */
+  //@deprecated("Use compiletime.ops.any.ToString instead.","3.2.0") // uncomment when reaching 3.2.0
   type ToString[X <: Int] <: String
+
+  /** Long conversion of an `Int` singleton type.
+   *  ```scala
+   *  val x: ToLong[1] = 1L
+   *  ```
+   *  @syntax markdown
+   */
+  @experimental
+  type ToLong[X <: Int] <: Long
+
+  /** Float conversion of an `Int` singleton type.
+   *  ```scala
+   *  val x: ToFloat[1] = 1.0f
+   *  ```
+   *  @syntax markdown
+   */
+  @experimental
+  type ToFloat[X <: Int] <: Float
+
+  /** Double conversion of an `Int` singleton type.
+   *  ```scala
+   *  val x: ToDouble[1] = 1.0
+   *  ```
+   *  @syntax markdown
+   */
+  @experimental
+  type ToDouble[X <: Int] <: Double
+
+  /** Number of zero bits preceding the highest-order ("leftmost")
+   * one-bit in the two's complement binary representation of the specified `Int` singleton type.
+   * Returns 32 if the specified singleton type has no one-bits in its two's complement representation,
+   * in other words if it is equal to zero.
+   *  ```scala
+   *  val zero_lzc: NumberOfLeadingZeros[0] = 32
+   *  val eight_lzc: NumberOfLeadingZeros[8] = 28
+   *  type Log2[N <: Int] = 31 - NumberOfLeadingZeros[N]
+   *  val log2of8: Log2[8] = 3
+   *  ```
+   *  @syntax markdown
+   */
+  @experimental
+  type NumberOfLeadingZeros[X <: Int] <: Int
diff --git a/library/src/scala/compiletime/ops/long.scala b/library/src/scala/compiletime/ops/long.scala
new file mode 100644
index 000000000000..718dec710068
--- /dev/null
+++ b/library/src/scala/compiletime/ops/long.scala
@@ -0,0 +1,217 @@
+package scala.compiletime
+package ops
+
+import scala.annotation.experimental
+
+@experimental
+object long:
+  /** Successor of a natural number where zero is the type 0 and successors are reduced as if the definition was:
+   *
+   *  ```scala
+   *  type S[N <: Long] <: Long = N match {
+   *    case 0L => 1L
+   *    case 1L => 2L
+   *    case 2L => 3L
+   *    // ...
+   *    case 9223372036854775806L => 9223372036854775807L
+   *  }
+   *  ```
+   *  @syntax markdown
+   */
+  type S[N <: Long] <: Long
+
+  /** Addition of two `Long` singleton types.
+   *  ```scala
+   *  val sum: 2L + 2L = 4L
+   *  ```
+   *  @syntax markdown
+   */
+  type +[X <: Long, Y <: Long] <: Long
+
+  /** Subtraction of two `Long` singleton types.
+   *  ```scala
+   *  val sub: 4L - 2L = 2L
+   *  ```
+   *  @syntax markdown
+   */
+  type -[X <: Long, Y <: Long] <: Long
+
+  /** Multiplication of two `Long` singleton types.
+   *  ```scala
+   *  val mul: 4L * 2L = 8L
+   *  ```
+   *  @syntax markdown
+   */
+  type *[X <: Long, Y <: Long] <: Long
+
+  /** Integer division of two `Long` singleton types.
+   *  ```scala
+   *  val div: 5L / 2L = 2L
+   *  ```
+   *  @syntax markdown
+   */
+  type /[X <: Long, Y <: Long] <: Long
+
+  /** Remainder of the division of `X` by `Y`.
+   *  ```scala
+   *  val mod: 5L % 2L = 1L
+   *  ```
+   *  @syntax markdown
+   */
+  type %[X <: Long, Y <: Long] <: Long
+
+  /** Binary left shift of `X` by `Y`.
+   *  ```scala
+   *  val lshift: 1L << 2L = 4L
+   *  ```
+   *  @syntax markdown
+   */
+  type <<[X <: Long, Y <: Long] <: Long
+
+  /** Binary right shift of `X` by `Y`.
+   *  ```scala
+   *  val rshift: 10L >> 1L = 5L
+   *  ```
+   *  @syntax markdown
+   */
+  type >>[X <: Long, Y <: Long] <: Long
+
+  /** Binary right shift of `X` by `Y`, filling the left with zeros.
+   *  ```scala
+   *  val rshiftzero: 10L >>> 1L = 5L
+   *  ```
+   *  @syntax markdown
+   */
+  type >>>[X <: Long, Y <: Long] <: Long
+
+  /** Bitwise xor of `X` and `Y`.
+   *  ```scala
+   *  val xor: 10L ^ 30L = 20L
+   *  ```
+   *  @syntax markdown
+   */
+  type ^[X <: Long, Y <: Long] <: Long
+
+  /** Less-than comparison of two `Long` singleton types.
+   *  ```scala
+   *  val lt1: 4L < 2L = false
+   *  val lt2: 2L < 4L = true
+   *  ```
+   *  @syntax markdown
+   */
+  type <[X <: Long, Y <: Long] <: Boolean
+
+  /** Greater-than comparison of two `Long` singleton types.
+   *  ```scala
+   *  val gt1: 4L > 2L = true
+   *  val gt2: 2L > 2L = false
+   *  ```
+   *  @syntax markdown
+   */
+  type >[X <: Long, Y <: Long] <: Boolean
+
+  /** Greater-or-equal comparison of two `Long` singleton types.
+   *  ```scala
+   *  val ge1: 4L >= 2L = true
+   *  val ge2: 2L >= 3L = false
+   *  ```
+   *  @syntax markdown
+   */
+  type >=[X <: Long, Y <: Long] <: Boolean
+
+  /** Less-or-equal comparison of two `Long` singleton types.
+   *  ```scala
+   *  val lt1: 4L <= 2L = false
+   *  val lt2: 2L <= 2L = true
+   *  ```
+   *  @syntax markdown
+   */
+  type <=[X <: Long, Y <: Long] <: Boolean
+
+  /** Bitwise and of `X` and `Y`.
+   *  ```scala
+   *  val and1: BitwiseAnd[4L, 4L] = 4L
+   *  val and2: BitwiseAnd[10L, 5L] = 0L
+   *  ```
+   *  @syntax markdown
+   */
+  type BitwiseAnd[X <: Long, Y <: Long] <: Long
+
+  /** Bitwise or of `X` and `Y`.
+   *  ```scala
+   *  val or: BitwiseOr[10L, 11L] = 11L
+   *  ```
+   *  @syntax markdown
+   */
+  type BitwiseOr[X <: Long, Y <: Long] <: Long
+
+  /** Absolute value of an `Long` singleton type.
+   *  ```scala
+   *  val abs: Abs[-1L] = 1L
+   *  ```
+   *  @syntax markdown
+   */
+  type Abs[X <: Long] <: Long
+
+  /** Negation of an `Long` singleton type.
+   *  ```scala
+   *  val neg1: Negate[-1L] = 1L
+   *  val neg2: Negate[1L] = -1L
+   *  ```
+   *  @syntax markdown
+   */
+  type Negate[X <: Long] <: Long
+
+  /** Minimum of two `Long` singleton types.
+   *  ```scala
+   *  val min: Min[-1L, 1L] = -1L
+   *  ```
+   *  @syntax markdown
+   */
+  type Min[X <: Long, Y <: Long] <: Long
+
+  /** Maximum of two `Long` singleton types.
+   *  ```scala
+   *  val max: Max[-1L, 1L] = 1L
+   *  ```
+   *  @syntax markdown
+   */
+  type Max[X <: Long, Y <: Long] <: Long
+
+  /** Number of zero bits preceding the highest-order ("leftmost")
+   * one-bit in the two's complement binary representation of the specified `Long` singleton type.
+   * Returns 64 if the specified singleton type has no one-bits in its two's complement representation,
+   * in other words if it is equal to zero.
+   *  ```scala
+   *  val zero_lzc: NumberOfLeadingZeros[0L] = 64
+   *  val eight_lzc: NumberOfLeadingZeros[8L] = 60
+   *  type Log2[N <: Long] = int.-[63, NumberOfLeadingZeros[N]]
+   *  val log2of8: Log2[8L] = 3
+   *  ```
+   *  @syntax markdown
+   */
+  type NumberOfLeadingZeros[X <: Long] <: Int
+
+  /** Int conversion of a `Long` singleton type.
+   *  ```scala
+   *  val x: ToInt[1L] = 1
+   *  ```
+   *  @syntax markdown
+   */
+  type ToInt[X <: Long] <: Int
+
+  /** Float conversion of a `Long` singleton type.
+   *  ```scala
+   *  val x: ToFloat[1L] = 1.0f
+   *  ```
+   *  @syntax markdown
+   */
+  type ToFloat[X <: Long] <: Float
+
+  /** Double conversion of a `Long` singleton type.
+   *  ```scala
+   *  val x: ToDouble[1L] = 1.0
+   *  ```
+   *  @syntax markdown
+   */
+  type ToDouble[X <: Long] <: Double
diff --git a/library/src/scala/compiletime/ops/string.scala b/library/src/scala/compiletime/ops/string.scala
index 0969ceb60053..6214f983db32 100644
--- a/library/src/scala/compiletime/ops/string.scala
+++ b/library/src/scala/compiletime/ops/string.scala
@@ -1,6 +1,8 @@
 package scala.compiletime
 package ops
 
+import scala.annotation.experimental
+
 object string:
   /** Concatenation of two `String` singleton types.
    *  ```scala
@@ -9,3 +11,35 @@ object string:
    *  @syntax markdown
    */
   type +[X <: String, Y <: String] <: String
+
+  /** Length of a `String` singleton type.
+   *  ```scala
+   *  val helloSize: Length["hello"] = 5
+   *  ```
+   *  @syntax markdown
+   */
+  @experimental
+  type Length[X <: String] <: Int
+
+  /** Substring of a `String` singleton type, with a singleton type
+   * begin inclusive index `IBeg`, and a singleton type exclusive end index `IEnd`.
+   * The substring begins at the specified IBeg and extends to the character at index IEnd - 1.
+   * Thus the length of the substring is IEnd-IBeg.
+   *  ```scala
+   *  val x: Substring["hamburger", 4, 8] = "urge"
+   *  val y: Substring["smiles", 1, 5] = "mile"
+   *  ```
+   *  @syntax markdown
+   */
+  @experimental
+  type Substring[S <: String, IBeg <: Int, IEnd <: Int] <: String
+
+  /** Tests if this `String` singleton type matches the given
+   * regular expression `String` singleton type.
+   *  ```scala
+   *  val x: Matches["unhappy", "un.*"] = true
+   *  ```
+   *  @syntax markdown
+   */
+  @experimental
+  type Matches[S <: String, Regex <: String] <: Boolean
diff --git a/library/src/scala/compiletime/package.scala b/library/src/scala/compiletime/package.scala
index 84ac4fde4e29..ff00b83bcb79 100644
--- a/library/src/scala/compiletime/package.scala
+++ b/library/src/scala/compiletime/package.scala
@@ -7,21 +7,33 @@ import annotation.compileTimeOnly
  *  pattern match on it. For example, given a type `Tup <: Tuple`, one can
  *  pattern-match on it as follows:
  *  ```scala
+ *  //{
+ *  type Tup
+ *  inline def f = {
+ *  //}
  *  inline erasedValue[Tup] match {
- *    case _: EmptyTuple => ...
- *    case _: h *: t => ...
+ *    case _: EmptyTuple => ???
+ *    case _: (h *: t) => ???
  *  }
+ *  //{
+ *  }
+ *  //}
  *  ```
  *  This value can only be used in an inline match and the value cannot be used in
  *  the branches.
  *  @syntax markdown
  */
 // TODO add `erased` once it is not an experimental feature anymore
-def erasedValue[T]: T = ???
+def erasedValue[T]: T = erasedValue[T]
 
 /** Used as the initializer of a mutable class or object field, like this:
  *
- *    var x: T = uninitialized
+ *  ```scala
+ *  //{
+ *  type T
+ *  //}
+ *  var x: T = uninitialized
+ *  ```
  *
  *  This signifies that the field is not initialized on its own. It is still initialized
  *  as part of the bulk initialization of the object it belongs to, which assigns zero
@@ -33,7 +45,7 @@ def uninitialized: Nothing = ???
 /** The error method is used to produce user-defined compile errors during inline expansion.
  *  If an inline expansion results in a call error(msgStr) the compiler produces an error message containing the given msgStr.
  *
- *  ```scala
+ *  ```scala sc:fail
  *  error("My error message")
  *  ```
  *  or
@@ -71,13 +83,13 @@ transparent inline def codeOf(arg: Any): String =
  *  inlining and constant folding.
  *
  *  Usage:
- *  ```scala
+ *  ```scala sc:fail
  *  inline def twice(inline n: Int): Int =
  *    requireConst(n) // compile-time assertion that the parameter `n` is a constant
  *    n + n
  *
  *  twice(1)
- *  val m: Int = ...
+ *  val m: Int = ???
  *  twice(m) // error: expected a constant value but found: m
  *  ```
  *  @syntax markdown
@@ -116,7 +128,13 @@ end constValueTuple
 /** Summons first given matching one of the listed cases. E.g. in
  *
  *  ```scala
- *  given B { ... }
+ *  //{
+ *  type A
+ *  trait B
+ *  type C
+ *  inline def f = {
+ *  //}
+ *  given B with { }
  *
  *  summonFrom {
  *    case given A => 1
@@ -124,6 +142,9 @@ end constValueTuple
  *    case given C => 3
  *    case _ => 4
  *  }
+ *  //{
+ *  }
+ *  //}
  *  ```
  *  the returned value would be `2`.
  *  @syntax markdown
@@ -137,9 +158,8 @@ transparent inline def summonFrom[T](f: Nothing => T): T =
  *  @tparam T the type of the value to be summoned
  *  @return the given value typed as the provided type parameter
  */
-transparent inline def summonInline[T]: T = summonFrom {
-  case t: T => t
-}
+transparent inline def summonInline[T]: T =
+  error("Compiler bug: `summonInline` was not evaluated by the compiler")
 
 /** Given a tuple T, summons each of its member types and returns them in
  *  a Tuple.
@@ -168,4 +188,3 @@ def byName[T](x: => T): T = x
   */
 extension [T](x: T)
   transparent inline def asMatchable: x.type & Matchable = x.asInstanceOf[x.type & Matchable]
-
diff --git a/library/src/scala/quoted/Expr.scala b/library/src/scala/quoted/Expr.scala
index acc9581b210a..65de13f0d3ec 100644
--- a/library/src/scala/quoted/Expr.scala
+++ b/library/src/scala/quoted/Expr.scala
@@ -40,7 +40,7 @@ object Expr {
    *  Otherwise returns `None`.
    *
    *  Usage:
-   *  ```scala
+   *  ```scala sc:nocompile
    *  case '{ ... ${expr @ Expr(value)}: T ...} =>
    *    // expr: Expr[T]
    *    // value: T
@@ -69,7 +69,7 @@ object Expr {
    *  to an expression equivalent to
    *    `'{ List($e1, $e2, ...) }` typed as an `Expr[List[T]]`
    */
-  def  ofList[T](xs: Seq[Expr[T]])(using Type[T])(using Quotes): Expr[List[T]] =
+  def ofList[T](xs: Seq[Expr[T]])(using Type[T])(using Quotes): Expr[List[T]] =
     if (xs.isEmpty) Expr(Nil) else '{ List(${Varargs(xs)}: _*) }
 
   /** Creates an expression that will construct a copy of this tuple
diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala
index a864a4b3fd3b..a9e2db108f40 100644
--- a/library/src/scala/quoted/Quotes.scala
+++ b/library/src/scala/quoted/Quotes.scala
@@ -1,13 +1,14 @@
 package scala.quoted
 
+import scala.annotation.{ experimental, since }
 import scala.reflect.TypeTest
 
 /** Current Quotes in scope
  *
  *  Usage:
- *  ```scala
+ *  ```scala sc:nocompile
  *  def myExpr[T](using Quotes): Expr[T] = {
- *     import quotes.relect._
+ *     import quotes.reflect._
  *     ...
  *  }
  *  ```
@@ -30,7 +31,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
 
     /** Pattern matches `this` against `that`. Effectively performing a deep equality check.
     *  It does the equivalent of
-    *  ```scala
+    *  ```scala sc:nocompile
     *  this match
     *    case '{...} => true // where the contents of the pattern are the contents of `that`
     *    case _ => false
@@ -53,6 +54,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
      *  Emits an error and throws if the expression does not represent a value or possibly contains side effects.
      *  Otherwise returns the value.
      */
+    @deprecated("Use valueOrAbort", "3.1.0")
     def valueOrError(using FromExpr[T]): T =
       val fromExpr = summon[FromExpr[T]]
       def reportError =
@@ -61,6 +63,14 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
       given Quotes = Quotes.this
       fromExpr.unapply(self).getOrElse(reportError)
 
+    /** Return the value of this expression.
+     *
+     *  Emits an error and aborts if the expression does not represent a value or possibly contains side effects.
+     *  Otherwise returns the value.
+     */
+    @since("3.1")
+    def valueOrAbort(using FromExpr[T]): T
+
   end extension
 
   // Extension methods for `Expr[Any]` that take another explicit type parameter
@@ -82,7 +92,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
    *  def f(expr: Expr[Int])(using Quotes) =
    *    import quotes.reflect._
    *    val ast: Term = expr.asTerm
-   *    ...
+   *    ???
    *  ```
    *
    *  See `reflectModule` for full API.
@@ -112,7 +122,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
    *           |             |               +- DefDef
    *           |             |               +- ValDef
    *           |             |
-   *           |             +- Term --------+- Ref -+- Ident
+   *           |             +- Term --------+- Ref -+- Ident -+- Wildcard
    *           |                             |       +- Select
    *           |                             |
    *           |                             +- Literal
@@ -122,7 +132,6 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
    *           |                             +- Apply
    *           |                             +- TypeApply
    *           |                             +- Super
-   *           |                             +- Typed
    *           |                             +- Assign
    *           |                             +- Block
    *           |                             +- Closure
@@ -135,7 +144,15 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
    *           |                             +- Inlined
    *           |                             +- SelectOuter
    *           |                             +- While
+   *           |                             +---+- Typed
+   *           |                                /
+   *           +- TypedOrTest +----------------·
+   *           +- Bind
+   *           +- Unapply
+   *           +- Alternatives
    *           |
+   *           +- CaseDef
+   *           +- TypeCaseDef
    *           |
    *           +- TypeTree ----+- Inferred
    *           |               +- TypeIdent
@@ -153,13 +170,6 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
    *           |
    *           +- TypeBoundsTree
    *           +- WildcardTypeTree
-   *           |
-   *           +- CaseDef
-   *           |
-   *           +- TypeCaseDef
-   *           +- Bind
-   *           +- Unapply
-   *           +- Alternatives
    *
    *  +- ParamClause -+- TypeParamClause
    *                  +- TermParamClause
@@ -229,6 +239,15 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
        *  This will be true when the macro is used in a transparent inline.
        */
       def isWhileTyping: Boolean
+
+      /** Expose macro-specific settings as a list of strings.
+       *  Settings can be set from command line with help of -Xmacro-settings options.
+       *
+       *  These will be used to expand any transparent macros or any non-transparent macro that is forced to expand while expanding the transparent macro.
+       *  Non-transparent macros are not guaranteed to be expanded with the same set of settings.
+       */
+      @experimental
+      def XmacroSettings: List[String]
     }
 
 
@@ -285,15 +304,15 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
 
     /** Tree representing a package clause in the source code
      *
-     *  ```scala
+     *  ```scala sc:nocompile
      *  package foo {
-     *     // package stats
+     *    // package stats
      *  }
      *  ```
      *
      *  or
      *
-     *  ```scala
+     *  ```scala sc:nocompile
      *  package foo.bar
      *  // package stats
      *  ```
@@ -464,8 +483,11 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
         /** Self-type of the class
          *
          *  ```scala
+         *  //{
+         *  type T
+         *  //}
          *  class C { self: T =>
-         *     ...
+         *    ???
          *  }
          *  ```
          *  @syntax markdown
@@ -475,7 +497,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
          *
          *  ```scala
          *  class C {
-         *     ... // statements
+         *    ??? // statements
          *  }
          *  ```
          *  @syntax markdown
@@ -497,6 +519,14 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
 
     /** Methods of the module object `val DefDef` */
     trait DefDefModule { this: DefDef.type =>
+      /** Create a method definition `def f[..](...)` with the signature defined in the symbol.
+       *
+       *  The `rhsFn` is a function that receives references to its parameters and should return
+       *  `Some` containing the implementation of the method. Returns `None` the method has no implementation.
+       *  Any definition directly inside the implementation should have `symbol` as owner.
+       *
+       *  See also: `Tree.changeOwner`
+       */
       def apply(symbol: Symbol, rhsFn: List[List[Tree]] => Option[Term]): DefDef
       def copy(original: Tree)(name: String, paramss: List[ParamClause], tpt: TypeTree, rhs: Option[Term]): DefDef
       def unapply(ddef: DefDef): (String, List[ParamClause], TypeTree, Option[Term])
@@ -515,7 +545,11 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
          *
          *  Note: Non leading type parameters can be found in extension methods such as
          *  ```scala
-         *  extension (a: A) def f[T]() = ...
+         *  //{
+         *  type A
+         *  type T
+         *  //}
+         *  extension (a: A) def f[T]() = ???
          *  ```
          *  @syntax markdown
          */
@@ -526,7 +560,11 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
          *
          *  Non leading type parameters can be found in extension methods such as
          *  ```scala
-         *  extension (a: A) def f[T]() = ...
+         *  //{
+         *  type T
+         *  type A
+         *  //}
+         *  extension (a: A) def f[T]() = ???
          *  ```
          *  @syntax markdown
          */
@@ -558,19 +596,27 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
 
     /** Methods of the module object `val ValDef` */
     trait ValDefModule { this: ValDef.type =>
+      /** Create a value definition `val x`, `var x` or `lazy val x` with the signature defined in the symbol.
+       *
+       *  The `rhs` should return be `Some` containing the implementation of the method.
+       *  Returns `None` the method has no implementation.
+       *  Any definition directly inside the implementation should have `symbol` as owner.
+       *
+       *  See also: `Tree.changeOwner`
+       */
       def apply(symbol: Symbol, rhs: Option[Term]): ValDef
       def copy(original: Tree)(name: String, tpt: TypeTree, rhs: Option[Term]): ValDef
       def unapply(vdef: ValDef): (String, TypeTree, Option[Term])
 
       /** Creates a block `{ val <name> = <rhs: Term>; <body(x): Term> }` */
-      def let(owner: Symbol, name: String, rhs: Term)(body: Ident => Term): Term
+      def let(owner: Symbol, name: String, rhs: Term)(body: Ref => Term): Term
 
       /** Creates a block `{ val x = <rhs: Term>; <body(x): Term> }` */
-      def let(owner: Symbol, rhs: Term)(body: Ident => Term): Term =
+      def let(owner: Symbol, rhs: Term)(body: Ref => Term): Term =
         let(owner, "x", rhs)(body)
 
       /** Creates a block `{ val x1 = <terms(0): Term>; ...; val xn = <terms(n-1): Term>; <body(List(x1, ..., xn)): Term> }` */
-      def let(owner: Symbol, terms: List[Term])(body: List[Ident] => Term): Term
+      def let(owner: Symbol, terms: List[Term])(body: List[Ref] => Term): Term
     }
 
     /** Makes extension methods on `ValDef` available without any imports */
@@ -757,6 +803,26 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
       end extension
     end IdentMethods
 
+    /** Pattern representing a `_` wildcard. */
+    @since("3.1")
+    type Wildcard <: Ident
+
+    /** `TypeTest` that allows testing at runtime in a pattern match if a `Tree` is a `Wildcard` */
+    @since("3.1")
+    given WildcardTypeTest: TypeTest[Tree, Wildcard]
+
+    /** Module object of `type Wildcard`  */
+    val Wildcard: WildcardModule
+
+    /** Methods of the module object `val Wildcard` */
+    @since("3.1")
+    trait WildcardModule { this: Wildcard.type =>
+      /** Create a tree representing a `_` wildcard. */
+      def apply(): Wildcard
+      /** Match a tree representing a `_` wildcard. */
+      def unapply(wildcard: Wildcard): true
+    }
+
     /** Tree representing a selection of definition with a given name on a given prefix */
     type Select <: Ref
 
@@ -939,7 +1005,9 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
       end extension
     end NamedArgMethods
 
-    /** Tree an application of arguments. It represents a single list of arguments, multiple argument lists will have nested `Apply`s  */
+    /** Tree representing an application of arguments.
+     *  It represents a single list of arguments, multiple argument lists will have nested `Apply`s
+     */
     type Apply <: Term
 
     /** `TypeTest` that allows testing at runtime in a pattern match if a `Tree` is an `Apply` */
@@ -968,9 +1036,9 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
       extension (self: Apply)
         /** The `fun` part of an (implicit) application like `fun(args)`
          *
-         *  It maybe a partially applied method:
+         *  It may be a partially applied method:
          *  ```scala
-         *  def f(x1: Int)(x2: Int) = ...
+         *  def f(x1: Int)(x2: Int) = ???
          *  f(1)(2)
          *  ```
          *  - `fun` is `f(1)` in the `Apply` of `f(1)(2)`
@@ -980,9 +1048,9 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
         def fun: Term
         /** The arguments (implicitly) passed to the method
          *
-         *  The `Apply` maybe a partially applied method:
+         *  The `Apply` may be a partially applied method:
          *  ```scala
-         *  def f(x1: Int)(x2: Int) = ...
+         *  def f(x1: Int)(x2: Int) = ???
          *  f(1)(2)
          *  ```
          *  - `args` is `(2)` in the `Apply` of `f(1)(2)`
@@ -993,7 +1061,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
       end extension
     end ApplyMethods
 
-    /** Tree an application of type arguments */
+    /** Tree representing an application of type arguments */
     type TypeApply <: Term
 
     /** `TypeTest` that allows testing at runtime in a pattern match if a `Tree` is a `TypeApply` */
@@ -1022,11 +1090,14 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
       extension (self: TypeApply)
         /** The `fun` part of an (inferred) type application like `fun[Args]`
          *
-         *  It maybe a partially applied method:
+         *  It may be a partially applied method:
          *  ```scala
-         *  extension (x: Int) def f[T](y: T) = ...
+         *  //{
+         *  type T
+         *  //}
+         *  extension (x: Int) def f[T](y: T) = ???
          *  // represented as
-         *  // def f(x: Int)[T](y: T) = ...
+         *  // def f(x: Int)[T](y: T) = ???
          *
          *  1.f[Int](2)
          *  // represented as
@@ -1038,11 +1109,14 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
         def fun: Term
         /** The (inferred) type arguments passed to the method
          *
-         *  The `TypeApply` maybe a partially applied method:
+         *  The `TypeApply` may be a partially applied method:
          *  ```scala
-         *  extension (x: Int) def f[T](y: T) = ...
+         *  //{
+         *  type T
+         *  //}
+         *  extension (x: Int) def f[T](y: T) = ???
          *  // represented as
-         *  // def f(x: Int)[T](y: T) = ...
+         *  // def f(x: Int)[T](y: T) = ???
          *
          *  1.f[Int](2)
          *  // represented as
@@ -1091,8 +1165,12 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
     /** `TypeTest` that allows testing at runtime in a pattern match if a `Tree` is a `Typed` */
     given TypedTypeTest: TypeTest[Tree, Typed]
 
-    /** Tree representing a type ascription `x: T` in the source code */
-    type Typed <: Term
+    /** Tree representing a type ascription `x: T` in the source code.
+     *
+     *  Also represents a pattern that contains a term `x`.
+     *  Other `: T` patterns use the more general `TypedOrTest`.
+     */
+    type Typed <: Term & TypedOrTest
 
     /** Module object of `type Typed`  */
     val Typed: TypedModule
@@ -1225,7 +1303,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
     /** A lambda `(...) => ...` in the source code is represented as
      *  a local method and a closure:
      *
-     *  ```scala
+     *  ```scala sc:nocompile
      *  {
      *    def m(...) = ...
      *    closure(m)
@@ -1241,7 +1319,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
     /** Methods of the module object `val Lambda` */
     trait LambdaModule { this: Lambda.type =>
       /** Matches a lambda definition of the form
-       *  ```scala
+       *  ```scala sc:nocompile
        *  Block((DefDef(_, _, params :: Nil, _, Some(body))) :: Nil, Closure(meth, _))
        *  ```
        *  Extracts the parameter definitions and body.
@@ -1250,7 +1328,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
       def unapply(tree: Block): Option[(List[ValDef], Term)]
 
       /** Generates a lambda with the given method type.
-       *  ```scala
+       *  ```scala sc:nocompile
        *  Block((DefDef(_, _, params :: Nil, _, Some(rhsFn(meth, paramRefs)))) :: Nil, Closure(meth, _))
        *  ```
        *  @param owner: owner of the generated `meth` symbol
@@ -1539,6 +1617,44 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
       end extension
     end WhileMethods
 
+    /** `TypeTest` that allows testing at runtime in a pattern match if a `Tree` is a `TypedOrTest` */
+    @since("3.1")
+    given TypedOrTestTypeTest: TypeTest[Tree, TypedOrTest]
+
+    /** Tree representing a type ascription or type test pattern `x: T` in the source code. */
+    @since("3.1")
+    type TypedOrTest <: Tree
+
+    /** Module object of `type TypedOrTest`  */
+    @since("3.1")
+    val TypedOrTest: TypedOrTestModule
+
+    /** Methods of the module object `val TypedOrTest` */
+    @since("3.1")
+    trait TypedOrTestModule { this: TypedOrTest.type =>
+
+      /** Create a type ascription `<x: Tree>: <tpt: TypeTree>` */
+      def apply(expr: Tree, tpt: TypeTree): TypedOrTest
+
+      def copy(original: Tree)(expr: Tree, tpt: TypeTree): TypedOrTest
+
+      /** Matches `<expr: Tree>: <tpt: TypeTree>` */
+      def unapply(x: TypedOrTest): (Tree, TypeTree)
+    }
+
+    /** Makes extension methods on `TypedOrTest` available without any imports */
+    @since("3.1")
+    given TypedOrTestMethods: TypedOrTestMethods
+
+    /** Extension methods of `TypedOrTest` */
+    @since("3.1")
+    trait TypedOrTestMethods:
+      extension (self: TypedOrTest)
+        def tree: Tree
+        def tpt: TypeTree
+      end extension
+    end TypedOrTestMethods
+
     // ----- TypeTrees ------------------------------------------------
 
     /** Type tree representing a type written in the source */
@@ -1934,9 +2050,9 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
 
     /** Type tree representing wildcard type bounds written in the source.
     *  The wildcard type `_` (for example in in `List[_]`) will be a type tree that
-    *  represents a type but has `TypeBound`a inside.
+    *  represents a type but has `TypeBounds` inside.
     */
-    type WildcardTypeTree  <: Tree
+    type WildcardTypeTree <: Tree
 
     /** `TypeTest` that allows testing at runtime in a pattern match if a `Tree` is a `WildcardTypeTree` */
     given WildcardTypeTreeTypeTest: TypeTest[Tree, WildcardTypeTree]
@@ -2058,7 +2174,12 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
 
     /** Methods of the module object `val Unapply` */
     trait UnapplyModule { this: Unapply.type =>
+      /** Create an `Unapply` tree representing a pattern `<fun>(<patterns*>)(using <implicits*>)` */
+      @since("3.1")
+      def apply(fun: Term, implicits: List[Term], patterns: List[Tree]): Unapply
+      /** Copy an `Unapply` tree representing a pattern `<fun>(<patterns*>)(using <implicits*>)` */
       def copy(original: Tree)(fun: Term, implicits: List[Term], patterns: List[Tree]): Unapply
+      /** Matches an `Unapply(fun, implicits, patterns)` tree representing a pattern `<fun>(<patterns*>)(using <implicits*>)` */
       def unapply(x: Unapply): (Term, List[Term], List[Tree])
     }
 
@@ -2068,8 +2189,15 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
     /** Extension methods of `Unapply` */
     trait UnapplyMethods:
       extension (self: Unapply)
+        /** The extractor function of the pattern.
+         *
+         *  It may be a reference to the `unapply` method of the pattern or may be a
+         *  partially applied tree containing type parameters and leading given parameters.
+         */
         def fun: Term
+        /** Training implicit parameters of the `unapply` method */
         def implicits: List[Term]
+        /** List of nested patterns */
         def patterns: List[Tree]
       end extension
     end UnapplyMethods
@@ -2161,6 +2289,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
         /** Is this a given parameter clause `(using X1, ..., Xn)` or `(using x1: X1, ..., xn: Xn)` */
         def isGiven: Boolean
         /** Is this a erased parameter clause `(erased x1: X1, ..., xn: Xn)` */
+        @since("3.1")
         def isErased: Boolean
     end TermParamClauseMethods
 
@@ -2341,9 +2470,16 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
         *
         *  Usage:
         *  ```scala
+        *  //{
+        *  def f(using Quotes) = {
+        *  val typeRepr: TypeRepr = ???
+        *  //}
         *  typeRepr.asType match
-        *    case '[$t] =>
-        *      '{ val x: t = ... }
+        *    case '[t] =>
+        *      '{ val x: t = ??? }
+        *  //{
+        *  }
+        *  //}
         *  ```
         *  @syntax markdown
         */
@@ -2435,6 +2571,13 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
         */
         def isDependentFunctionType: Boolean
 
+        /** Is this type a `TupleN` type?
+         *
+         * @return true if the dealiased type of `self` is `TupleN[T1, T2, ..., Tn]`
+         */
+        @since("3.1")
+        def isTupleN: Boolean
+
         /** The type <this . sym>, reduced if possible */
         def select(sym: Symbol): TypeRepr
 
@@ -2444,6 +2587,15 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
         /** The current type applied to given type arguments: `this[targ0, ..., targN]` */
         def appliedTo(targs: List[TypeRepr]): TypeRepr
 
+        /** Substitute all types that refer in their symbol attribute to
+         *  one of the symbols in `from` by the corresponding types in `to`.
+         */
+        @experimental
+        def substituteTypes(from: List[Symbol], to: List[TypeRepr]): TypeRepr
+
+        /** The applied type arguments (empty if there is no such arguments) */
+        @experimental
+        def typeArgs: List[TypeRepr]
       end extension
     }
 
@@ -2712,12 +2864,15 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
      *
      *  May represent by-name parameter such as `thunk` in
      *  ```scala
-     *    def log[T](thunk: =>T): T = ...
+     *  //{
+     *  type T
+     *  //}
+     *  def log[T](thunk: => T): T = ???
      *  ```
      *
      *  May also represent a the return type of a parameterless method definition such as
      *  ```scala
-     *    def foo: Int = ...
+     *    def foo: Int = ???
      *  ```
      *  @syntax markdown
      */
@@ -3341,7 +3496,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
     /////////////
 
     /** Symbol of a definition.
-    *  Then can be compared with == to know if the definition is the same.
+    *   Symbols can be compared with `==` to know if two definitions are the same.
     */
     type Symbol <: AnyRef
 
@@ -3354,7 +3509,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
       /** Symbol of the definition that encloses the current splicing context.
        *
        *  For example, the following call to `spliceOwner` would return the symbol `x`.
-       *  ```scala
+       *  ```scala sc:nocompile
        *  val x = ${ ... Symbol.spliceOwner ... }
        *  ```
        *
@@ -3477,7 +3632,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
          *
          *  **Anti-pattern**: The following code is an anti-pattern:
          *
-         *      symbol.tree.info
+         *      symbol.tree.tpe
          *
          *  It should be replaced by the following code:
          *
@@ -3558,11 +3713,21 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
         def declaredFields: List[Symbol]
 
         /** Get named non-private fields declared or inherited */
+        @deprecated("Use fieldMember", "3.1.0")
         def memberField(name: String): Symbol
 
+        /** Get named non-private fields declared or inherited */
+        @since("3.1")
+        def fieldMember(name: String): Symbol
+
         /** Get all non-private fields declared or inherited */
+        @deprecated("Use fieldMembers", "3.1.0")
         def memberFields: List[Symbol]
 
+        /** Get all non-private fields declared or inherited */
+        @since("3.1")
+        def fieldMembers: List[Symbol]
+
         /** Get non-private named methods defined directly inside the class */
         def declaredMethod(name: String): List[Symbol]
 
@@ -3570,11 +3735,19 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
         def declaredMethods: List[Symbol]
 
         /** Get named non-private methods declared or inherited */
+        @deprecated("Use methodMember", "3.1.0")
         def memberMethod(name: String): List[Symbol]
 
+        /** Get named non-private methods declared or inherited */
+        def methodMember(name: String): List[Symbol]
+
         /** Get all non-private methods declared or inherited */
+        @deprecated("Use methodMembers", "3.1.0")
         def memberMethods: List[Symbol]
 
+        /** Get all non-private methods declared or inherited */
+        def methodMembers: List[Symbol]
+
         /** Get non-private named methods defined directly inside the class */
         def declaredType(name: String): List[Symbol]
 
@@ -3582,11 +3755,19 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
         def declaredTypes: List[Symbol]
 
         /** Type member with the given name directly declared in the class */
+        @deprecated("Use typeMember", "3.1.0")
         def memberType(name: String): Symbol
 
+        /** Type member with the given name directly declared in the class */
+        def typeMember(name: String): Symbol
+
         /** Type member directly declared in the class */
+        @deprecated("Use typeMembers", "3.1.0")
         def memberTypes: List[Symbol]
 
+        /** Type member directly declared in the class */
+        def typeMembers: List[Symbol]
+
         /** All members directly declared in the class */
         def declarations: List[Symbol]
 
@@ -3624,7 +3805,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
         /** The symbol of the companion module */
         def companionModule: Symbol
 
-        /** Case class or case object children of a sealed trait */
+        /** Case class or case object children of a sealed trait or cases of an `enum`. */
         def children: List[Symbol]
       end extension
     }
@@ -4085,9 +4266,23 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
     /** Extension methods of `SourceFile` */
     trait SourceFileMethods {
       extension (self: SourceFile)
-        /** Path to this source file */
+        /** Path to this source file. May be `null` for virtual files such as in the REPL.  */
+        @deprecated("Use getJPath, name, or path instead of jpath", "3.0.2")
         def jpath: java.nio.file.Path
 
+        /** Path to this source file. May be `None` for virtual files such as in the REPL. */
+        def getJPath: Option[java.nio.file.Path]
+
+        /** Name of the source file */
+        def name: String
+
+        /** Path of the source file.
+         *
+         *  It does not necessarily point to a path in the filesystem, it could be the path of a virtual file.
+         *  Use `getJPath` to get paths to the filesystem.
+         */
+        def path: String
+
         /** Content of this source file */
         def content: Option[String]
       end extension
@@ -4097,7 +4292,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
     // REPORTING //
     ///////////////
 
-    /** Module containing error and waring reporting. */
+    /** Module containing error and warning reporting. */
     val report: reportModule
 
     /** Methods of the module object `val report` */
@@ -4113,12 +4308,24 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
       def error(msg: String, pos: Position): Unit
 
       /** Report an error at the position of the macro expansion and throw a StopMacroExpansion */
+      def errorAndAbort(msg: String): Nothing
+
+      /** Report an error at the position of `expr` and throw a StopMacroExpansion */
+      def errorAndAbort(msg: String, expr: Expr[Any]): Nothing
+
+      /** Report an error message at the given position and throw a StopMacroExpansion */
+      def errorAndAbort(msg: String, pos: Position): Nothing
+
+      /** Report an error at the position of the macro expansion and throw a StopMacroExpansion */
+      @deprecated("Use errorAndAbort", "3.1.0")
       def throwError(msg: String): Nothing
 
-      /** Report an error at the position of `expr` */
+      /** Report an error at the position of `expr` and throw a StopMacroExpansion */
+      @deprecated("Use errorAndAbort", "3.1.0")
       def throwError(msg: String, expr: Expr[Any]): Nothing
 
       /** Report an error message at the given position and throw a StopMacroExpansion */
+      @deprecated("Use errorAndAbort", "3.1.0")
       def throwError(msg: String, pos: Position): Nothing
 
       /** Report a warning at the position of the macro expansion */
@@ -4151,9 +4358,8 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
     *
     *  Usage:
     *  ```scala
-    *  import quotes.reflect._
-    *  class MyTreeAccumulator extends TreeAccumulator[X] {
-    *    def foldTree(x: X, tree: Tree)(owner: Symbol): X = ...
+    *  class MyTreeAccumulator[X] extends TreeAccumulator[X] {
+    *    def foldTree(x: X, tree: Tree)(owner: Symbol): X = ???
     *  }
     *  ```
     *  @syntax markdown
@@ -4185,6 +4391,8 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
             foldTree(x, tpt)(owner)
           case Typed(expr, tpt) =>
             foldTree(foldTree(x, expr)(owner), tpt)(owner)
+          case TypedOrTest(expr, tpt) =>
+            foldTree(foldTree(x, expr)(owner), tpt)(owner)
           case NamedArg(_, arg) =>
             foldTree(x, arg)(owner)
           case Assign(lhs, rhs) =>
@@ -4255,9 +4463,8 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
     *
     *  Usage:
     *  ```scala
-    *  import quotes.relfect._
     *  class MyTraverser extends TreeTraverser {
-    *    override def traverseTree(tree: Tree)(owner: Symbol): Unit = ...
+    *    override def traverseTree(tree: Tree)(owner: Symbol): Unit = ???
     *  }
     *  ```
     *  @syntax markdown
@@ -4276,9 +4483,8 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
     *
     *  Usage:
     *  ```scala
-    *  import quotes.reflect._
     *  class MyTreeMap extends TreeMap {
-    *    override def transformTree(tree: Tree)(owner: Symbol): Tree = ...
+    *    override def transformTree(tree: Tree)(owner: Symbol): Tree = ???
     *  }
     *  ```
     *  @syntax markdown
@@ -4309,6 +4515,8 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
             Unapply.copy(pattern)(transformTerm(pattern.fun)(owner), transformSubTrees(pattern.implicits)(owner), transformTrees(pattern.patterns)(owner))
           case pattern: Alternatives =>
             Alternatives.copy(pattern)(transformTrees(pattern.patterns)(owner))
+          case TypedOrTest(inner, tpt) =>
+            TypedOrTest.copy(tree)(transformTree(inner)(owner), transformTypeTree(tpt)(owner))
         }
       }
 
diff --git a/library/src/scala/quoted/Type.scala b/library/src/scala/quoted/Type.scala
index 9077a626fc66..6f1f7aefede7 100644
--- a/library/src/scala/quoted/Type.scala
+++ b/library/src/scala/quoted/Type.scala
@@ -1,10 +1,10 @@
 package scala.quoted
 
-import scala.annotation.compileTimeOnly
+import scala.annotation.{compileTimeOnly, experimental, since}
 
 /** Type (or type constructor) `T` needed contextually when using `T` in a quoted expression `'{... T ...}` */
 abstract class Type[T <: AnyKind] private[scala]:
-  /** The type represented `Type` */
+  /** The type represented by `Type` */
   type Underlying = T
 end Type
 
@@ -21,23 +21,82 @@ object Type:
   given of[T <: AnyKind](using Quotes): Type[T] = ???
 
 
-  /** Extracts the value of singleton constant type, None otherwise.
+  /** Extracts the value of a singleton constant type.
+   *  Returns Some of the value of the type if it is a singleton constant type.
+   *  Returns None if the type is not a singleton constant type.
    *
    *  Example usage:
    *  ```scala
-   *  ... match
+   *  //{
+   *  import scala.deriving.*
+   *  def f(using Quotes) = {
+   *  import quotes.reflect.*
+   *  val expr: Expr[Any] = ???
+   *  //}
+   *  expr match {
    *    case '{ $mirrorExpr : Mirror.Sum { type MirroredLabel = label } } =>
    *      Type.valueOfConstant[label] // Option[String]
    *  }
+   *  //{
+   *  }
+   *  //}
    *  ```
    *  @syntax markdown
    */
   def valueOfConstant[T](using Type[T])(using Quotes): Option[T] =
+    ValueOf.unapply(quotes.reflect.TypeRepr.of[T]).asInstanceOf[Option[T]]
+
+  /** Extracts the value of a tuple of singleton constant types.
+   *  Returns Some of the tuple type if it is a tuple singleton constant types.
+   *  Returns None if the type is not a tuple singleton constant types.
+   *
+   *  Example usage:
+   *  ```scala
+   *  //{
+   *  import scala.deriving.*
+   *  def f(using Quotes) = {
+   *  import quotes.reflect.*
+   *  val expr: Expr[Any] = ???
+   *  //}
+   *  expr match {
+   *    case '{ type label <: Tuple; $mirrorExpr : Mirror.Sum { type MirroredElemLabels = `label` } } =>
+   *      Type.valueOfTuple[label] // Option[Tuple]
+   *  }
+   *  //{
+   *  }
+   *  //}
+   *  ```
+   *  @syntax markdown
+   */
+  @since("3.1")
+  def valueOfTuple[T <: Tuple](using Type[T])(using Quotes): Option[T] =
+    valueOfTuple(quotes.reflect.TypeRepr.of[T]).asInstanceOf[Option[T]]
+
+  private def valueOfTuple(using Quotes)(tpe: quotes.reflect.TypeRepr): Option[Tuple] =
     import quotes.reflect.*
-    def valueOf(tpe: TypeRepr): Option[T] =
-      tpe.dealias.widenTermRefByName match
-        case ConstantType(const) => Some(const.value.asInstanceOf[T])
+    val cons = Symbol.classSymbol("scala.*:")
+    def rec(tpe: TypeRepr): Option[Tuple] =
+      tpe.widenTermRefByName.dealias match
+        case AppliedType(fn, tpes) if defn.isTupleClass(fn.typeSymbol) =>
+          tpes.foldRight(Option[Tuple](EmptyTuple)) {
+            case (_, None) => None
+            case (ValueOf(v), Some(acc)) => Some(v *: acc)
+            case _ => None
+          }
+        case AppliedType(tp, List(ValueOf(headValue), tail)) if tp.derivesFrom(cons) =>
+          rec(tail) match
+            case Some(tailValue) => Some(headValue *: tailValue)
+            case None => None
+        case tpe =>
+          if tpe.derivesFrom(Symbol.classSymbol("scala.EmptyTuple")) then Some(EmptyTuple)
+          else None
+    rec(tpe)
+
+  private object ValueOf:
+    def unapply(using Quotes)(tpe: quotes.reflect.TypeRepr): Option[Any] =
+      import quotes.reflect.*
+      tpe.widenTermRefByName.dealias match
+        case ConstantType(const) => Some(const.value)
         case _ => None
-    valueOf(TypeRepr.of[T])
 
 end Type
diff --git a/library/src/scala/quoted/Varargs.scala b/library/src/scala/quoted/Varargs.scala
index 0825db460038..2d07ee94bf50 100644
--- a/library/src/scala/quoted/Varargs.scala
+++ b/library/src/scala/quoted/Varargs.scala
@@ -7,7 +7,8 @@ package scala.quoted
  */
 object Varargs {
 
-  /** Lifts this sequence of expressions into an expression of a sequence
+  /**
+   *  Lifts this sequence of expressions into an expression of a sequence
    *
    *  Transforms a sequence of expression
    *    `Seq(e1, e2, ...)` where `ei: Expr[T]`
@@ -16,7 +17,14 @@ object Varargs {
    *
    *  Usage:
    *  ```scala
-   *  '{ List(${Varargs(List(1, 2, 3))}: _*) } // equivalent to '{ List(1, 2, 3) }
+   *  //{
+   *  def f(using Quotes) = {
+   *  import quotes.reflect.*
+   *  //}
+   *  '{ List(${Varargs(List('{1}, '{2}, '{3}))}: _*) } // equivalent to '{ List(1, 2, 3) }
+   *  //{
+   *  }
+   *  //}
    *  ```
    *  @syntax markdown
    */
@@ -28,13 +36,18 @@ object Varargs {
   /** Matches a literal sequence of expressions and return a sequence of expressions.
    *
    *  Usage:
-   *  ```scala
+   *  ```scala sc:nocompile
+   *  //{
+   *  object O {
+   *  //}
    *  inline def sum(args: Int*): Int = ${ sumExpr('args) }
    *  def sumExpr(argsExpr: Expr[Seq[Int]])(using Quotes): Expr[Int] = argsExpr match
    *    case Varargs(argVarargs) =>
    *      // argVarargs: Seq[Expr[Int]]
-   *      ...
+   *      ???
+   *  //{
    *  }
+   *  //}
    *  ```
    *  @syntax markdown
    */
diff --git a/library/src/scala/quoted/runtime/StopMacroExpansion.scala b/library/src/scala/quoted/runtime/StopMacroExpansion.scala
index ebf9ad7e57b6..b4d570167621 100644
--- a/library/src/scala/quoted/runtime/StopMacroExpansion.scala
+++ b/library/src/scala/quoted/runtime/StopMacroExpansion.scala
@@ -1,4 +1,9 @@
 package scala.quoted.runtime
 
-/** Throwable used to stop the expansion of a macro after an error was reported */
-class StopMacroExpansion extends Throwable
+/** Throwable used to abort the expansion of a macro after an error was reported */
+class StopMacroExpansion extends Throwable:
+
+  // Do not fill the stacktrace for performance.
+  // We know that the stacktrace will be ignored
+  // and only the reported error message will be used.
+  override def fillInStackTrace(): Throwable = this
diff --git a/library/src/scala/reflect/Selectable.scala b/library/src/scala/reflect/Selectable.scala
index a9606fd7b45b..f0bc1f197f5d 100644
--- a/library/src/scala/reflect/Selectable.scala
+++ b/library/src/scala/reflect/Selectable.scala
@@ -21,7 +21,7 @@ trait Selectable extends scala.Selectable:
   final def selectDynamic(name: String): Any =
     val rcls = selectedValue.getClass
     try
-      val fld = rcls.getField(name)
+      val fld = rcls.getField(name).nn
       ensureAccessible(fld)
       fld.get(selectedValue)
     catch case ex: NoSuchFieldException =>
@@ -35,7 +35,7 @@ trait Selectable extends scala.Selectable:
    */
   final def applyDynamic(name: String, paramTypes: Class[_]*)(args: Any*): Any =
     val rcls = selectedValue.getClass
-    val mth = rcls.getMethod(name, paramTypes: _*)
+    val mth = rcls.getMethod(name, paramTypes: _*).nn
     ensureAccessible(mth)
     mth.invoke(selectedValue, args.asInstanceOf[Seq[AnyRef]]: _*)
 
@@ -49,3 +49,4 @@ object Selectable:
 
   @inline // important for Scala.js
   private final class DefaultSelectable(override protected val selectedValue: Any) extends Selectable
+end Selectable
diff --git a/library/src/scala/reflect/TypeTest.scala b/library/src/scala/reflect/TypeTest.scala
index 6eef9c457768..23dea5ec9ced 100644
--- a/library/src/scala/reflect/TypeTest.scala
+++ b/library/src/scala/reflect/TypeTest.scala
@@ -1,18 +1,19 @@
 package scala.reflect
 
-/** A `TypeTest[S, T] contains the logic needed to know at runtime if a value of
+/** A `TypeTest[S, T]` contains the logic needed to know at runtime if a value of
  *  type `S` is an instance of `T`.
  *
  *  If a pattern match is performed on a term of type `s: S` that is uncheckable with `s.isInstanceOf[T]` and
- *  the pattern are of the form:
+ *  the pattern is one of the following forms:
  *    - `t: T`
- *    - `t @ X()` where the `X.unapply` has takes an argument of type `T`
+ *    - `t @ X()` where `X.unapply` takes an argument of type `T`
  *  then a given instance of `TypeTest[S, T]` is summoned and used to perform the test.
  */
 @scala.annotation.implicitNotFound(msg = "No TypeTest available for [${S}, ${T}]")
 trait TypeTest[-S, T] extends Serializable:
 
-  /** A TypeTest[S, T] can serve as an extractor that matches if and only if S of type T.
+  /** A `TypeTest[S, T]` can serve as an extractor that matches if and only if a value of type `S` is
+   *  an instance of `T`.
    *
    * The compiler tries to turn unchecked type tests in pattern matches into checked ones
    * by wrapping a `(_: T)` type pattern as `tt(_: T)`, where `tt` is the `TypeTest[S, T]` instance.
diff --git a/library/src/scala/runtime/$throws.scala b/library/src/scala/runtime/$throws.scala
new file mode 100644
index 000000000000..af35f7402ca3
--- /dev/null
+++ b/library/src/scala/runtime/$throws.scala
@@ -0,0 +1,11 @@
+package scala.runtime
+import annotation.experimental
+
+/** A helper type to allow syntax like
+ *
+ *    def f(): T throws Ex1 | Ex2
+ *
+ *  Used in desugar.throws.
+ */
+@experimental
+infix type $throws[R, +E <: Exception] = CanThrow[E] ?=> R
diff --git a/library/src/scala/runtime/LazyVals.scala b/library/src/scala/runtime/LazyVals.scala
index 79a2afc9cb9b..85ca4f5cb3a0 100644
--- a/library/src/scala/runtime/LazyVals.scala
+++ b/library/src/scala/runtime/LazyVals.scala
@@ -5,13 +5,13 @@ package scala.runtime
  */
 object LazyVals {
   private[this] val unsafe: sun.misc.Unsafe =
-      classOf[sun.misc.Unsafe].getDeclaredFields.find { field =>
-        field.getType == classOf[sun.misc.Unsafe] && {
-          field.setAccessible(true)
+      classOf[sun.misc.Unsafe].getDeclaredFields.nn.find { field =>
+        field.nn.getType == classOf[sun.misc.Unsafe] && {
+          field.nn.setAccessible(true)
           true
         }
       }
-      .map(_.get(null).asInstanceOf[sun.misc.Unsafe])
+      .map(_.nn.get(null).asInstanceOf[sun.misc.Unsafe])
       .getOrElse {
         throw new ExceptionInInitializerError {
           new IllegalStateException("Can't find instance of sun.misc.Unsafe")
@@ -19,7 +19,7 @@ object LazyVals {
       }
 
   private[this] val base: Int = {
-    val processors = java.lang.Runtime.getRuntime.availableProcessors()
+    val processors = java.lang.Runtime.getRuntime.nn.availableProcessors()
     8 * processors * processors
   }
   private[this] val monitors: Array[Object] =
diff --git a/library/src/scala/runtime/Scala3RunTime.scala b/library/src/scala/runtime/Scala3RunTime.scala
index fa141628ceec..b1645f5242aa 100644
--- a/library/src/scala/runtime/Scala3RunTime.scala
+++ b/library/src/scala/runtime/Scala3RunTime.scala
@@ -15,7 +15,8 @@ object Scala3RunTime:
    *  Extracted to minimize the bytecode size at call site.
    */
   def nn[T](x: T | Null): x.type & T =
-    if (x == null) throw new NullPointerException("tried to cast away nullability, but value is null")
+    val isNull = x == null
+    if (isNull) throw new NullPointerException("tried to cast away nullability, but value is null")
     else x.asInstanceOf[x.type & T]
 
 end Scala3RunTime
diff --git a/library/src/scala/runtime/Tuples.scala b/library/src/scala/runtime/Tuples.scala
index 267e04f65aed..bfb863bcc0f0 100644
--- a/library/src/scala/runtime/Tuples.scala
+++ b/library/src/scala/runtime/Tuples.scala
@@ -1,5 +1,7 @@
 package scala.runtime
 
+import scala.annotation.experimental
+
 object Tuples {
 
   inline val MaxSpecialized = 22
@@ -355,6 +357,160 @@ object Tuples {
     case _ => specialCaseTail(self)
   }
 
+  // Append for TupleXXL
+  private def xxlAppend(x: Any, xxl: TupleXXL): TupleXXL = {
+    val arr = new Array[Object](xxl.productArity + 1)
+    arr(xxl.productArity) = x.asInstanceOf[Object]
+    System.arraycopy(xxl.elems, 0, arr, 0, xxl.productArity)
+    TupleXXL.fromIArray(arr.asInstanceOf[IArray[Object]])
+  }
+
+  // Append for Tuple1 to Tuple22
+  private def specialCaseAppend(x: Any, self: Tuple): Tuple = {
+    (self: Any) match {
+      case EmptyTuple =>
+        Tuple1(x)
+      case self: Tuple1[_] =>
+        Tuple2(self._1, x)
+      case self: Tuple2[_, _] =>
+        Tuple3(self._1, self._2, x)
+      case self: Tuple3[_, _, _] =>
+        Tuple4(self._1, self._2, self._3, x)
+      case self: Tuple4[_, _, _, _] =>
+        Tuple5(self._1, self._2, self._3, self._4, x)
+      case self: Tuple5[_, _, _, _, _] =>
+        Tuple6(self._1, self._2, self._3, self._4, self._5, x)
+      case self: Tuple6[_, _, _, _, _, _] =>
+        Tuple7(self._1, self._2, self._3, self._4, self._5, self._6, x)
+      case self: Tuple7[_, _, _, _, _, _, _] =>
+        Tuple8(self._1, self._2, self._3, self._4, self._5, self._6, self._7, x)
+      case self: Tuple8[_, _, _, _, _, _, _, _] =>
+        Tuple9(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, x)
+      case self: Tuple9[_, _, _, _, _, _, _, _, _] =>
+        Tuple10(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, x)
+      case self: Tuple10[_, _, _, _, _, _, _, _, _, _] =>
+        Tuple11(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, x)
+      case self: Tuple11[_, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple12(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, x)
+      case self: Tuple12[_, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple13(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, x)
+      case self: Tuple13[_, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple14(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, x)
+      case self: Tuple14[_, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple15(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, x)
+      case self: Tuple15[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple16(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, x)
+      case self: Tuple16[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple17(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, x)
+      case self: Tuple17[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple18(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, x)
+      case self: Tuple18[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple19(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, self._18, x)
+      case self: Tuple19[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple20(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, self._18, self._19, x)
+      case self: Tuple20[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple21(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, self._18, self._19, self._20, x)
+      case self: Tuple21[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple22(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, self._18, self._19, self._20, self._21, x)
+      case self: Tuple22[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        val arr: Array[Object] = Array(
+          self._1.asInstanceOf[Object], self._2.asInstanceOf[Object],
+          self._3.asInstanceOf[Object], self._4.asInstanceOf[Object], self._5.asInstanceOf[Object],
+          self._6.asInstanceOf[Object], self._7.asInstanceOf[Object], self._8.asInstanceOf[Object],
+          self._9.asInstanceOf[Object], self._10.asInstanceOf[Object], self._11.asInstanceOf[Object],
+          self._12.asInstanceOf[Object], self._13.asInstanceOf[Object], self._14.asInstanceOf[Object],
+          self._15.asInstanceOf[Object], self._16.asInstanceOf[Object], self._17.asInstanceOf[Object],
+          self._18.asInstanceOf[Object], self._19.asInstanceOf[Object], self._20.asInstanceOf[Object],
+          self._21.asInstanceOf[Object], self._22.asInstanceOf[Object], x.asInstanceOf[Object]
+        )
+        TupleXXL.fromIArray(arr.asInstanceOf[IArray[Object]]).asInstanceOf[Tuple]
+    }
+  }
+
+  @experimental
+  def append(x: Any, self: Tuple): Tuple = (self: Any) match {
+    case xxl: TupleXXL => xxlAppend(x, xxl).asInstanceOf[Tuple]
+    case _ => specialCaseAppend(x, self)
+  }
+
+  // Init for TupleXXL
+  private def xxlInit(xxl: TupleXXL): Tuple = {
+    if (xxl.productArity == 23) {
+      val elems = xxl.elems
+      Tuple22(
+        elems(0), elems(1), elems(2), elems(3), elems(4), elems(5),
+        elems(6), elems(7), elems(8), elems(9), elems(10), elems(11),
+        elems(12), elems(13), elems(14), elems(15), elems(16), elems(17),
+        elems(18), elems(19), elems(20), elems(21)
+      )
+    } else {
+      val arr = new Array[Object](xxl.elems.length - 1)
+      System.arraycopy(xxl.elems, 0, arr, 0, xxl.elems.length - 1)
+      TupleXXL.fromIArray(arr.asInstanceOf[IArray[Object]]).asInstanceOf[Tuple]
+    }
+  }
+
+  // Init for Tuple1 to Tuple22
+  private def specialCaseInit(self: Tuple): Tuple = {
+    (self: Any) match {
+      case _: Tuple1[_] =>
+        EmptyTuple
+      case self: Tuple2[_, _] =>
+        Tuple1(self._1)
+      case self: Tuple3[_, _, _] =>
+        Tuple2(self._1, self._2)
+      case self: Tuple4[_, _, _, _] =>
+        Tuple3(self._1, self._2, self._3)
+      case self: Tuple5[_, _, _, _, _] =>
+        Tuple4(self._1,self._2, self._3, self._4)
+      case self: Tuple6[_, _, _, _, _, _] =>
+        Tuple5(self._1, self._2, self._3, self._4, self._5)
+      case self: Tuple7[_, _, _, _, _, _, _] =>
+        Tuple6(self._1, self._2, self._3, self._4, self._5, self._6)
+      case self: Tuple8[_, _, _, _, _, _, _, _] =>
+        Tuple7(self._1, self._2, self._3, self._4, self._5, self._6, self._7)
+      case self: Tuple9[_, _, _, _, _, _, _, _, _] =>
+        Tuple8(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8)
+      case self: Tuple10[_, _, _, _, _, _, _, _, _, _] =>
+        Tuple9(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9)
+      case self: Tuple11[_, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple10(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10)
+      case self: Tuple12[_, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple11(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11)
+      case self: Tuple13[_, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple12(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12)
+      case self: Tuple14[_, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple13(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13)
+      case self: Tuple15[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple14(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14)
+      case self: Tuple16[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple15(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15)
+      case self: Tuple17[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple16(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16)
+      case self: Tuple18[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple17(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17)
+      case self: Tuple19[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple18(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, self._18)
+      case self: Tuple20[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple19(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, self._18, self._19)
+      case self: Tuple21[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple20(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, self._18, self._19, self._20)
+      case self: Tuple22[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =>
+        Tuple21(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, self._18, self._19, self._20, self._21)
+    }
+  }
+
+  @experimental
+  def init(self: NonEmptyTuple): Tuple = (self: Any) match {
+    case xxl: TupleXXL => xxlInit(xxl)
+    case _ => specialCaseInit(self)
+  }
+
+  @experimental
+  def last(self: NonEmptyTuple): Any = (self: Any) match {
+    case self: Product => self.productElement(self.productArity - 1)
+  }
+
   def apply(self: NonEmptyTuple, n: Int): Any =
     self.productElement(n)
 
diff --git a/library/src/scala/runtime/stdLibPatches/language.scala b/library/src/scala/runtime/stdLibPatches/language.scala
index 0d4fd95c9e53..7c8c116a106e 100644
--- a/library/src/scala/runtime/stdLibPatches/language.scala
+++ b/library/src/scala/runtime/stdLibPatches/language.scala
@@ -50,7 +50,16 @@ object language:
 
     /** Experimental support for using indentation for arguments
      */
+    @compileTimeOnly("`fewerBraces` can only be used at compile time in import statements")
     object fewerBraces
+
+    /** Experimental support for typechecked exception capabilities
+     *
+     *  @see [[https://dotty.epfl.ch/docs/reference/experimental/canthrow]]
+     */
+    @compileTimeOnly("`saferExceptions` can only be used at compile time in import statements")
+    object saferExceptions
+
   end experimental
 
   /** The deprecated object contains features that are no longer officially suypported in Scala.
@@ -127,29 +136,45 @@ object language:
 
   /** Set source version to 3.0-migration.
     *
-    * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]]
+    * @see [[https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html]]
     */
   @compileTimeOnly("`3.0-migration` can only be used at compile time in import statements")
   object `3.0-migration`
 
   /** Set source version to 3.0.
     *
-    * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]]
+    * @see [[https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html]]
     */
   @compileTimeOnly("`3.0` can only be used at compile time in import statements")
   object `3.0`
 
-/* This can be added when we go to 3.1
   /** Set source version to 3.1-migration.
     *
-    * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]]
+    * @see [[https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html]]
     */
+  @compileTimeOnly("`3.1-migration` can only be used at compile time in import statements")
   object `3.1-migration`
 
   /** Set source version to 3.1
     *
-    * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]]
+    * @see [[https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html]]
     */
+  @compileTimeOnly("`3.1` can only be used at compile time in import statements")
   object `3.1`
+
+/* This can be added when we go to 3.2
+  /** Set source version to 3.2-migration.
+    *
+    * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]]
+    */
+  @compileTimeOnly("`3.2-migration` can only be used at compile time in import statements")
+  object `3.2-migration`
+
+  /** Set source version to 3.2
+    *
+    * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]]
+    */
+  @compileTimeOnly("`3.2` can only be used at compile time in import statements")
+  object `3.2`
 */
 end language
diff --git a/library/src/scala/util/FromDigits.scala b/library/src/scala/util/FromDigits.scala
index 6064116d1443..1577f4103e03 100644
--- a/library/src/scala/util/FromDigits.scala
+++ b/library/src/scala/util/FromDigits.scala
@@ -3,6 +3,7 @@ import scala.math.{BigInt}
 import quoted._
 import annotation.internal.sharable
 
+
 /** A type class for types that admit numeric literals.
  */
 trait FromDigits[T] {
@@ -28,7 +29,7 @@ object FromDigits {
   trait WithRadix[T] extends FromDigits[T] {
     def fromDigits(digits: String): T = fromDigits(digits, 10)
 
-    /** Convert digits string with given radix to numberof type `T`.
+    /** Convert digits string with given radix to number of type `T`.
      *  E.g. if radix is 16, digits `a..f` and `A..F` are also allowed.
      */
     def fromDigits(digits: String, radix: Int): T
@@ -134,7 +135,7 @@ object FromDigits {
         case ex: NumberFormatException => throw MalformedNumber()
       }
     if (x.isInfinite) throw NumberTooLarge()
-    if (x == 0.0f && !zeroFloat.pattern.matcher(digits).matches) throw NumberTooSmall()
+    if (x == 0.0f && !zeroFloat.pattern.matcher(digits).nn.matches) throw NumberTooSmall()
     x
   }
 
@@ -152,7 +153,7 @@ object FromDigits {
         case ex: NumberFormatException => throw MalformedNumber()
       }
     if (x.isInfinite) throw NumberTooLarge()
-    if (x == 0.0d && !zeroFloat.pattern.matcher(digits).matches) throw NumberTooSmall()
+    if (x == 0.0d && !zeroFloat.pattern.matcher(digits).nn.matches) throw NumberTooSmall()
     x
   }
 
diff --git a/project/Build.scala b/project/Build.scala
index e21956e4c123..21321e60d6d7 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -14,29 +14,25 @@ import sbt.ScriptedPlugin.autoImport._
 import xerial.sbt.pack.PackPlugin
 import xerial.sbt.pack.PackPlugin.autoImport._
 import xerial.sbt.Sonatype.autoImport._
-
-import dotty.tools.sbtplugin.DottyPlugin.autoImport._
-import dotty.tools.sbtplugin.DottyPlugin.makeScalaInstance
-import dotty.tools.sbtplugin.DottyIDEPlugin.{ installCodeExtension, prepareCommand, runProcess }
+import com.typesafe.tools.mima.plugin.MimaPlugin.autoImport._
+import dotty.tools.sbtplugin.DottyIDEPlugin.{installCodeExtension, prepareCommand, runProcess}
 import dotty.tools.sbtplugin.DottyIDEPlugin.autoImport._
-
 import org.scalajs.sbtplugin.ScalaJSPlugin
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
-
 import sbtbuildinfo.BuildInfoPlugin
 import sbtbuildinfo.BuildInfoPlugin.autoImport._
 
 import scala.util.Properties.isJavaAtLeast
-
 import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
+import org.scalajs.linker.interface.ModuleInitializer
 
-abstract class DottyJSPlugin(settings: Seq[Setting[_]]) extends AutoPlugin {
+object DottyJSPlugin extends AutoPlugin {
   import Build._
 
   override def requires: Plugins = ScalaJSPlugin
 
   override def projectSettings: Seq[Setting[_]] = Def.settings(
-    settings,
+    commonBootstrappedSettings,
 
     /* #11709 Remove the dependency on scala3-library that ScalaJSPlugin adds.
      * Instead, in this build, we use `.dependsOn` relationships to depend on
@@ -51,7 +47,7 @@ abstract class DottyJSPlugin(settings: Seq[Setting[_]]) extends AutoPlugin {
       _.filter(!_.name.startsWith("junit-interface"))
     },
     libraryDependencies +=
-      ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion  % "test").withDottyCompat(scalaVersion.value),
+      ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion  % "test").cross(CrossVersion.for3Use2_13),
 
     // Typecheck the Scala.js IR found on the classpath
     scalaJSLinkerConfig ~= (_.withCheckIR(true)),
@@ -61,21 +57,40 @@ abstract class DottyJSPlugin(settings: Seq[Setting[_]]) extends AutoPlugin {
     excludeFromIDE := true
   )
 }
-object BootstrappedDottyJSPlugin extends DottyJSPlugin(Build.commonBootstrappedSettings)
-object NonBootstrappedDottyJSPlugin extends DottyJSPlugin(Build.commonNonBootstrappedSettings)
 
 object Build {
-  val referenceVersion = "3.0.0-RC2"
+  val referenceVersion = "3.1.2-RC1"
 
-  val baseVersion = "3.0.1-RC1"
-  val baseSbtDottyVersion = "0.5.5"
+  val baseVersion = "3.1.3-RC1"
 
   // Versions used by the vscode extension to create a new project
   // This should be the latest published releases.
   // TODO: Have the vscode extension fetch these numbers from the Internet
   // instead of hardcoding them ?
   val publishedDottyVersion = referenceVersion
-  val publishedSbtDottyVersion = "0.5.4"
+  val sbtDottyVersion = "0.5.5"
+
+  /** Version against which we check binary compatibility.
+   *
+   *  This must be the latest published release in the same versioning line.
+   *  For example, if the next version is going to be 3.1.4, then this must be
+   *  set to 3.1.3. If it is going to be 3.1.0, it must be set to the latest
+   *  3.0.x release.
+   */
+  val previousDottyVersion = "3.1.1"
+
+  object CompatMode {
+    final val BinaryCompatible = 0
+    final val SourceAndBinaryCompatible = 1
+  }
+
+  val compatMode = {
+    val VersionRE = """^\d+\.(\d+).(\d+).*""".r
+    baseVersion match {
+      case VersionRE(_, "0")   => CompatMode.BinaryCompatible
+      case _                   => CompatMode.SourceAndBinaryCompatible
+    }
+  }
 
   /** scala-library version required to compile Dotty.
    *
@@ -84,8 +99,8 @@ object Build {
    *  scala-library.
    */
   def stdlibVersion(implicit mode: Mode): String = mode match {
-    case NonBootstrapped => "2.13.5"
-    case Bootstrapped => "2.13.5"
+    case NonBootstrapped => "2.13.8"
+    case Bootstrapped => "2.13.8"
   }
 
   val dottyOrganization = "org.scala-lang"
@@ -104,11 +119,10 @@ object Build {
     else
       baseVersion + "-bin-SNAPSHOT"
   }
-  val dottyNonBootstrappedVersion = dottyVersion + "-nonbootstrapped"
-
-  val sbtDottyName = "sbt-dotty"
-  val sbtDottyVersion = {
-    if (isRelease) baseSbtDottyVersion else baseSbtDottyVersion + "-SNAPSHOT"
+  val dottyNonBootstrappedVersion = {
+    // Make sure sbt always computes the scalaBinaryVersion correctly
+    val bin = if (!dottyVersion.contains("-bin")) "-bin" else ""
+    dottyVersion + bin + "-nonbootstrapped"
   }
 
   val sbtCommunityBuildVersion = "0.1.0-SNAPSHOT"
@@ -132,6 +146,8 @@ object Build {
   // Used to run binaries similar to ./bin/scala script
   val scala = inputKey[Unit]("run compiled binary using the correct classpath, or the user supplied classpath")
 
+  val repl = taskKey[Unit]("spawns a repl with the correct classpath")
+
   // Compiles the documentation and static site
   val genDocs = inputKey[Unit]("run scaladoc to generate static documentation site")
 
@@ -164,7 +180,7 @@ object Build {
 
     (Compile / compile / javacOptions) ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"),
 
-    // Override `runCode` from sbt-dotty to use the language-server and
+    // Override `runCode` from DottyIDEPlugin to use the language-server and
     // vscode extension from the source repository of dotty instead of a
     // published version.
     runCode := (`scala3-language-server` / run).toTask("").value,
@@ -177,10 +193,8 @@ object Build {
     outputStrategy := Some(StdoutOutput),
 
     // enable verbose exception messages for JUnit
-    (Test / testOptions) += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
-  ) ++
-    // Spawns a repl with the correct classpath
-    addCommandAlias("repl", "scala3-compiler-bootstrapped/console")
+    (Test / testOptions) += Tests.Argument(TestFrameworks.JUnit, "-a", "-v", "-s"),
+  )
 
   // Settings shared globally (scoped in Global). Used in build.sbt
   lazy val globalSettings = Def.settings(
@@ -251,6 +265,13 @@ object Build {
     // If someone puts a source file at the root (e.g., for manual testing),
     // don't pick it up as part of any project.
     sourcesInBase := false,
+
+    // For compatibility with Java 9+ module system;
+    // without Automatic-Module-Name, the module name is derived from the jar file which is invalid because of the _3 suffix.
+    Compile / packageBin / packageOptions +=
+      Package.ManifestAttributes(
+        "Automatic-Module-Name" -> s"${dottyOrganization.replaceAll("-",".")}.${moduleName.value.replaceAll("-",".")}"
+      )
   )
 
   // Settings used for projects compiled only with Java
@@ -268,7 +289,12 @@ object Build {
   // Settings used when compiling dotty (both non-bootstrapped and bootstrapped)
   lazy val commonDottySettings = commonSettings ++ Seq(
     // Manually set the standard library to use
-    autoScalaLibrary := false
+    autoScalaLibrary := false,
+    classpathOptions ~= (old =>
+      old
+        .withAutoBoot(false)      // no library on the compiler bootclasspath - we may need a more recent version
+        .withFilterLibrary(false) // ...instead, we put it on the compiler classpath
+    ),
   )
 
   lazy val commonScala2Settings = commonSettings ++ Seq(
@@ -293,16 +319,17 @@ object Build {
 
   private lazy val currentYear: String = java.util.Calendar.getInstance().get(java.util.Calendar.YEAR).toString
 
-  lazy val scalacOptionsDocSettings = Seq(
-      "-external-mappings:" +
-        ".*scala.*::scaladoc3::http://dotty.epfl.ch/api/," +
-        ".*java.*::javadoc::https://docs.oracle.com/javase/8/docs/api/",
+  def scalacOptionsDocSettings(includeExternalMappings: Boolean = true) = {
+    val extMap = Seq("-external-mappings:" +
+        (if (includeExternalMappings) ".*scala/.*::scaladoc3::https://dotty.epfl.ch/api/," else "") +
+        ".*java/.*::javadoc::https://docs.oracle.com/javase/8/docs/api/")
+    Seq(
       "-skip-by-regex:.+\\.internal($|\\..+)",
       "-skip-by-regex:.+\\.impl($|\\..+)",
-      "-project-logo", "docs/logo.svg",
+      "-project-logo", "docs/_assets/images/logo.svg",
       "-social-links:" +
         "github::https://github.com/lampepfl/dotty," +
-        "gitter::https://gitter.im/scala/scala," +
+        "discord::https://discord.com/invite/scala," +
         "twitter::https://twitter.com/scala_lang",
       // contains special definitions which are "transplanted" elsewhere
       // and which therefore confuse Scaladoc when accessed from this pkg
@@ -313,8 +340,10 @@ object Build {
       "-skip-by-id:scala.runtime.MatchCase",
       "-project-footer", s"Copyright (c) 2002-$currentYear, LAMP/EPFL",
       "-author",
-      "-groups"
-  )
+      "-groups",
+      "-default-template", "static-site-main"
+    ) ++ extMap
+  }
 
   // Settings used when compiling dotty with a non-bootstrapped dotty
   lazy val commonBootstrappedSettings = commonDottySettings ++ NoBloopExport.settings ++ Seq(
@@ -349,8 +378,8 @@ object Build {
     // Compile using the non-bootstrapped and non-published dotty
     managedScalaInstance := false,
     scalaInstance := {
-      val externalNonBootstrappedDeps = (`scaladoc-nonBootstrapped` / Compile / externalDependencyClasspath).value
-      val scalaLibrary = findArtifact(externalNonBootstrappedDeps, "scala-library")
+      val externalLibraryDeps = (`scala3-library` / Compile / externalDependencyClasspath).value.map(_.data).toSet
+      val externalCompilerDeps = (`scala3-compiler` / Compile / externalDependencyClasspath).value.map(_.data).toSet
 
       // IMPORTANT: We need to use actual jars to form the ScalaInstance and not
       // just directories containing classfiles because sbt maintains a cache of
@@ -358,26 +387,46 @@ object Build {
       // however this is only implemented on jars, directories are never
       // invalidated.
       val tastyCore = (`tasty-core` / Compile / packageBin).value
-      val dottyLibrary = (`scala3-library` / Compile / packageBin).value
-      val dottyInterfaces = (`scala3-interfaces` / Compile / packageBin).value
-      val dottyCompiler = (`scala3-compiler` / Compile / packageBin).value
-      val scaladoc = (`scaladoc-nonBootstrapped` / Compile / packageBin).value
+      val scala3Library = (`scala3-library` / Compile / packageBin).value
+      val scala3Interfaces = (`scala3-interfaces` / Compile / packageBin).value
+      val scala3Compiler = (`scala3-compiler` / Compile / packageBin).value
 
-      val allJars = Seq(tastyCore, dottyLibrary, dottyInterfaces, dottyCompiler, scaladoc) ++ externalNonBootstrappedDeps.map(_.data)
+      val libraryJars = Array(scala3Library) ++ externalLibraryDeps
+      val compilerJars = Seq(tastyCore, scala3Interfaces, scala3Compiler) ++ (externalCompilerDeps -- externalLibraryDeps)
 
-      makeScalaInstance(
-        state.value,
+      Defaults.makeScalaInstance(
         scalaVersion.value,
-        scalaLibrary,
-        dottyLibrary,
-        dottyCompiler,
-        allJars,
-        appConfiguration.value
+        libraryJars = libraryJars,
+        allCompilerJars = compilerJars,
+        allDocJars = Seq.empty,
+        state.value,
+        scalaInstanceTopLoader.value
+      )
+    },
+    // We cannot include scaladoc in the regular `scalaInstance` task because
+    // it's a bootstrapped-only project, so we would run into a loop since we
+    // need the output of that task to compile scaladoc. But we can include it
+    // in the `scalaInstance` of the `doc` task which allows us to run
+    // `scala3-library-bootstrapped/doc` for example.
+    doc / scalaInstance := {
+      val externalDeps = (LocalProject("scaladoc") / Compile / externalDependencyClasspath).value.map(_.data)
+      val scalaDoc = (LocalProject("scaladoc") / Compile / packageBin).value
+      val docJars = Array(scalaDoc) ++ externalDeps
+
+      val base = scalaInstance.value
+      val docScalaInstance = Defaults.makeScalaInstance(
+        version = base.version,
+        libraryJars = base.libraryJars,
+        allCompilerJars = base.compilerJars,
+        allDocJars = docJars,
+        state.value,
+        scalaInstanceTopLoader.value
       )
+      // assert that sbt reuses the same compiler class loader
+      assert(docScalaInstance.loaderCompilerOnly == base.loaderCompilerOnly)
+      docScalaInstance
     },
-    Compile / doc / scalacOptions ++= scalacOptionsDocSettings,
-    // sbt-dotty defines `scalaInstance in doc` so we need to override it manually
-    doc / scalaInstance := scalaInstance.value,
+    Compile / doc / scalacOptions ++= scalacOptionsDocSettings()
   )
 
   lazy val commonBenchmarkSettings = Seq(
@@ -387,6 +436,22 @@ object Build {
     javaOptions += "-DBENCH_CLASS_PATH=" + Attributed.data((`scala3-library-bootstrapped` / Compile / fullClasspath).value).mkString("", File.pathSeparator, "")
   )
 
+  lazy val commonMiMaSettings = Def.settings(
+    mimaPreviousArtifacts += {
+      val thisProjectID = projectID.value
+      val crossedName = thisProjectID.crossVersion match {
+        case cv: Disabled => thisProjectID.name
+        case cv: Binary => s"${thisProjectID.name}_${cv.prefix}3${cv.suffix}"
+      }
+      (thisProjectID.organization % crossedName % previousDottyVersion)
+    },
+
+    mimaCheckDirection := (compatMode match {
+      case CompatMode.BinaryCompatible          => "backward"
+      case CompatMode.SourceAndBinaryCompatible => "both"
+    }),
+  )
+
   /** Projects -------------------------------------------------------------- */
 
   val dottyCompilerBootstrappedRef = LocalProject("scala3-compiler-bootstrapped")
@@ -406,7 +471,11 @@ object Build {
   lazy val `scala3-bootstrapped` = project.asDottyRoot(Bootstrapped)
 
   lazy val `scala3-interfaces` = project.in(file("interfaces")).
-    settings(commonJavaSettings)
+    settings(commonJavaSettings).
+    settings(commonMiMaSettings).
+    settings(
+      versionScheme := Some("semver-spec")
+    )
 
   /** Find an artifact with the given `name` in `classpath` */
   def findArtifact(classpath: Def.Classpath, name: String): File = classpath
@@ -447,7 +516,8 @@ object Build {
         Dependencies.oldCompilerInterface, // we stick to the old version to avoid deprecation warnings
         "org.jline" % "jline-reader" % "3.19.0",   // used by the REPL
         "org.jline" % "jline-terminal" % "3.19.0",
-        "org.jline" % "jline-terminal-jna" % "3.19.0" // needed for Windows
+        "org.jline" % "jline-terminal-jna" % "3.19.0", // needed for Windows
+        ("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
       ),
 
       // For convenience, change the baseDirectory when running the compiler
@@ -573,16 +643,17 @@ object Build {
         val printTasty = args0.contains("-print-tasty")
         val debugFromTasty = args0.contains("-Ythrough-tasty")
         val args = args0.filter(arg => arg != "-repl" && arg != "-decompile" &&
-            arg != "-with-compiler" && arg != "-Ythrough-tasty")
+            arg != "-with-compiler" && arg != "-Ythrough-tasty" && arg != "-print-tasty")
 
         val main =
-          if (decompile || printTasty) "dotty.tools.dotc.decompiler.Main"
+          if (decompile) "dotty.tools.dotc.decompiler.Main"
+          else if (printTasty) "dotty.tools.dotc.core.tasty.TastyPrinter"
           else if (debugFromTasty) "dotty.tools.dotc.fromtasty.Debug"
           else "dotty.tools.dotc.Main"
 
         var extraClasspath = Seq(scalaLib, dottyLib)
 
-        if ((decompile || printTasty) && !args.contains("-classpath"))
+        if (decompile && !args.contains("-classpath"))
           extraClasspath ++= Seq(".")
 
         if (args0.contains("-with-compiler")) {
@@ -597,7 +668,7 @@ object Build {
           extraClasspath ++= Seq(dottyCompiler, dottyInterfaces, asm, dottyStaging, dottyTastyInspector, tastyCore)
         }
 
-        val fullArgs = main :: insertClasspathInArgs(args, extraClasspath.mkString(File.pathSeparator))
+        val fullArgs = main :: (if (printTasty) args else insertClasspathInArgs(args, extraClasspath.mkString(File.pathSeparator)))
 
         (Compile / runMain).toTask(fullArgs.mkString(" ", " ", ""))
       }.evaluated,
@@ -610,7 +681,7 @@ object Build {
       ivyConfigurations += SourceDeps.hide,
       transitiveClassifiers := Seq("sources"),
       libraryDependencies +=
-        ("org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps").withDottyCompat(scalaVersion.value),
+        ("org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps").cross(CrossVersion.for3Use2_13),
       (Compile / sourceGenerators) += Def.task {
         val s = streams.value
         val cacheDir = s.cacheDirectory
@@ -685,14 +756,33 @@ object Build {
         "scala3-tasty-inspector"  -> (LocalProject("scala3-tasty-inspector") / Compile / packageBin).value.getAbsolutePath,
         "tasty-core"     -> (LocalProject("tasty-core-bootstrapped") / Compile / packageBin).value.getAbsolutePath,
       )
-    }
+    },
+    repl := (Compile / console).value,
+    Compile / console / scalacOptions := Nil, // reset so that we get stock REPL behaviour!  E.g. avoid -unchecked being enabled
   )
 
   def dottyCompilerSettings(implicit mode: Mode): sbt.Def.SettingsDefinition =
     if (mode == NonBootstrapped) nonBootstrapedDottyCompilerSettings else bootstrapedDottyCompilerSettings
 
   lazy val `scala3-compiler` = project.in(file("compiler")).asDottyCompiler(NonBootstrapped)
+
+  lazy val Scala3CompilerCoursierTest = config("scala3CompilerCoursierTest") extend Test
   lazy val `scala3-compiler-bootstrapped` = project.in(file("compiler")).asDottyCompiler(Bootstrapped)
+    .configs(Scala3CompilerCoursierTest)
+    .settings(
+      inConfig(Scala3CompilerCoursierTest)(Defaults.testSettings),
+      Scala3CompilerCoursierTest / scalaSource := baseDirectory.value / "test-coursier",
+      Scala3CompilerCoursierTest / fork := true,
+      Scala3CompilerCoursierTest / envVars := Map("DOTTY_BOOTSTRAPPED_VERSION" -> dottyVersion),
+      Scala3CompilerCoursierTest / unmanagedClasspath += (Scala3CompilerCoursierTest / scalaSource).value,
+      Scala3CompilerCoursierTest / test := ((Scala3CompilerCoursierTest / test) dependsOn (
+          publishLocal, // Had to enumarate all deps since calling `scala3-bootstrap` / publishLocal will lead to recursive dependency => stack overflow
+          `scala3-interfaces` / publishLocal,
+          dottyLibrary(Bootstrapped) / publishLocal,
+          tastyCore(Bootstrapped) / publishLocal,
+        ),
+      ).value,
+    )
 
   def dottyCompiler(implicit mode: Mode): Project = mode match {
     case NonBootstrapped => `scala3-compiler`
@@ -704,6 +794,7 @@ object Build {
     (Compile / scalacOptions) ++= Seq(
       // Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called
       "-sourcepath", (Compile / sourceDirectories).value.map(_.getAbsolutePath).distinct.mkString(File.pathSeparator),
+      "-Yexplicit-nulls",
     ),
   )
 
@@ -715,16 +806,6 @@ object Build {
     case Bootstrapped => `scala3-library-bootstrapped`
   }
 
-  lazy val `scala3-library-js`: Project = project.in(file("library-js")).
-    asDottyLibrary(NonBootstrapped).
-    enablePlugins(NonBootstrappedDottyJSPlugin).
-    settings(
-      libraryDependencies +=
-        ("org.scala-js" %% "scalajs-library" % scalaJSVersion).withDottyCompat(scalaVersion.value),
-      unmanagedSourceDirectories in Compile :=
-        (unmanagedSourceDirectories in (`scala3-library`, Compile)).value
-    )
-
   /** The dotty standard library compiled with the Scala.js back-end, to produce
    *  the corresponding .sjsir files.
    *
@@ -736,10 +817,10 @@ object Build {
    */
   lazy val `scala3-library-bootstrappedJS`: Project = project.in(file("library-js")).
     asDottyLibrary(Bootstrapped).
-    enablePlugins(BootstrappedDottyJSPlugin).
+    enablePlugins(DottyJSPlugin).
     settings(
       libraryDependencies +=
-        ("org.scala-js" %% "scalajs-library" % scalaJSVersion).withDottyCompat(scalaVersion.value),
+        ("org.scala-js" %% "scalajs-library" % scalaJSVersion).cross(CrossVersion.for3Use2_13),
       Compile / unmanagedSourceDirectories ++=
         (`scala3-library-bootstrapped` / Compile / unmanagedSourceDirectories).value,
 
@@ -748,7 +829,7 @@ object Build {
         if (isRelease) {
           val baseURI = (LocalRootProject / baseDirectory).value.toURI
           val dottyVersion = version.value
-          Seq(s"-scalajs-mapSourceURI:$baseURI->$dottyGithubRawUserContentUrl/v$dottyVersion/")
+          Seq(s"-scalajs-mapSourceURI:$baseURI->$dottyGithubRawUserContentUrl/$dottyVersion/")
         } else {
           Nil
         }
@@ -775,7 +856,7 @@ object Build {
   lazy val `scala3-staging` = project.in(file("staging")).
     withCommonSettings(Bootstrapped).
     // We want the compiler to be present in the compiler classpath when compiling this project but not
-    // when compiling a project that depends on scala3-staging (see sbt-dotty/sbt-test/sbt-dotty/quoted-example-project),
+    // when compiling a project that depends on scala3-staging (see sbt-test/sbt-dotty/quoted-example-project),
     // but we always need it to be present on the JVM classpath at runtime.
     dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
     settings(
@@ -785,24 +866,13 @@ object Build {
   lazy val `scala3-tasty-inspector` = project.in(file("tasty-inspector")).
     withCommonSettings(Bootstrapped).
     // We want the compiler to be present in the compiler classpath when compiling this project but not
-    // when compiling a project that depends on scala3-tasty-inspector (see sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project),
+    // when compiling a project that depends on scala3-tasty-inspector (see sbt-test/sbt-dotty/tasty-inspector-example-project),
     // but we always need it to be present on the JVM classpath at runtime.
     dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
     settings(
       javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value
     )
 
-  lazy val `scala3-tasty-inspector-nonbootstrapped` = project.in(file("tasty-inspector")).
-    withCommonSettings(NonBootstrapped).
-    // We want the compiler to be present in the compiler classpath when compiling this project but not
-    // when compiling a project that depends on scala3-tasty-inspector (see sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project),
-    // but we always need it to be present on the JVM classpath at runtime.
-    dependsOn(dottyCompiler(NonBootstrapped) % "provided; compile->runtime; test->test").
-    settings(commonNonBootstrappedSettings).
-    settings(
-      javaOptions := (`scala3-compiler` / javaOptions).value
-    )
-
   /** Scala library compiled by dotty using the latest published sources of the library */
   lazy val `stdlib-bootstrapped` = project.in(file("stdlib-bootstrapped")).
     withCommonSettings(Bootstrapped).
@@ -916,7 +986,7 @@ object Build {
   lazy val `scala3-sbt-bridge` = project.in(file("sbt-bridge/src")).
     // We cannot depend on any bootstrapped project to compile the bridge, since the
     // bridge is needed to compile these projects.
-    dependsOn(`scaladoc-nonBootstrapped` % Provided).
+    dependsOn(`scala3-compiler` % Provided).
     settings(commonJavaSettings).
     settings(
       description := "sbt compiler bridge for Dotty",
@@ -953,10 +1023,6 @@ object Build {
     dependsOn(dottyCompiler(Bootstrapped)).
     settings(commonBootstrappedSettings).
     settings(
-      // Sources representing the shared configuration file used to communicate between the sbt-dotty
-      // plugin and the language server
-      (Compile / unmanagedSourceDirectories) += baseDirectory.value / "../sbt-dotty/src/dotty/tools/sbtplugin/config",
-
       libraryDependencies ++= Seq(
         "org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.6.0",
         Dependencies.`jackson-databind`
@@ -1015,7 +1081,7 @@ object Build {
    *  useful, as that would not provide the linker and JS runners.
    */
   lazy val sjsSandbox = project.in(file("sandbox/scalajs")).
-    enablePlugins(BootstrappedDottyJSPlugin).
+    enablePlugins(DottyJSPlugin).
     dependsOn(`scala3-library-bootstrappedJS`).
     settings(
       // Required to run Scala.js tests.
@@ -1032,7 +1098,7 @@ object Build {
    *  It will grow in the future, as more stuff is confirmed to be supported.
    */
   lazy val sjsJUnitTests = project.in(file("tests/sjs-junit")).
-    enablePlugins(BootstrappedDottyJSPlugin).
+    enablePlugins(DottyJSPlugin).
     dependsOn(`scala3-library-bootstrappedJS`).
     settings(
       scalacOptions --= Seq("-Xfatal-warnings", "-deprecation"),
@@ -1071,7 +1137,7 @@ object Build {
 
       // We need JUnit in the Compile configuration
       libraryDependencies +=
-        ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion).withDottyCompat(scalaVersion.value),
+        ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion).cross(CrossVersion.for3Use2_13),
 
       (Compile / sourceGenerators) += Def.task {
         import org.scalajs.linker.interface.CheckedBehavior
@@ -1090,7 +1156,7 @@ object Build {
             (Compile / sourceManaged).value,
             "org.scalajs.testsuite.utils.BuildInfo",
             "scalaVersion" -> scalaVersion.value,
-            "hasSourceMaps" -> false, //BootstrappedDottyJSPlugin.wantSourceMaps.value,
+            "hasSourceMaps" -> false, //DottyJSPlugin.wantSourceMaps.value,
             "isNoModule" -> (moduleKind == ModuleKind.NoModule),
             "isESModule" -> (moduleKind == ModuleKind.ESModule),
             "isCommonJSModule" -> (moduleKind == ModuleKind.CommonJSModule),
@@ -1100,7 +1166,8 @@ object Build {
             "compliantModuleInit" -> (sems.moduleInit == CheckedBehavior.Compliant),
             "strictFloats" -> sems.strictFloats,
             "productionMode" -> sems.productionMode,
-            "es2015" -> linkerConfig.esFeatures.useECMAScript2015,
+            "esVersion" -> linkerConfig.esFeatures.esVersion.edition,
+            "useECMAScript2015Semantics" -> linkerConfig.esFeatures.useECMAScript2015Semantics,
         )
       }.taskValue,
 
@@ -1143,32 +1210,15 @@ object Build {
           ++ (dir / "shared/src/test/require-jdk7" ** "*.scala").get
 
           ++ (dir / "js/src/test/scala" ** (("*.scala": FileFilter)
-            -- "ObjectTest.scala" // compile errors caused by #9588
             -- "StackTraceTest.scala" // would require `npm install source-map-support`
             -- "UnionTypeTest.scala" // requires the Scala 2 macro defined in Typechecking*.scala
-            -- "PromiseMock.scala" // TODO: Enable once we use a Scala.js with https://github.com/scala-js/scala-js/pull/4451 in
-                                   // and remove copy in tests/sjs-junit
             )).get
 
-          ++ (dir / "js/src/test/require-2.12" ** (("*.scala": FileFilter)
-            -- "JSOptionalTest212.scala" // TODO: Enable once we use a Scala.js with https://github.com/scala-js/scala-js/pull/4451 in
-            )).get
+          ++ (dir / "js/src/test/require-2.12" ** "*.scala").get
           ++ (dir / "js/src/test/require-sam" ** "*.scala").get
           ++ (dir / "js/src/test/scala-new-collections" ** "*.scala").get
         )
       },
-
-      // A second blacklist for tests that compile and link, but do not pass at run-time.
-      // Putting them here instead of above makes sure that we do not regress on compilation+linking.
-      Test / testOptions += Tests.Filter { name =>
-        !Set[String](
-          // Not investigated so far
-          "org.scalajs.testsuite.junit.JUnitAbstractClassTestCheck",
-          "org.scalajs.testsuite.junit.JUnitNamesTestCheck",
-          "org.scalajs.testsuite.junit.JUnitSubClassTestCheck",
-          "org.scalajs.testsuite.junit.MultiCompilationSecondUnitTestCheck",
-        ).contains(name)
-      }
     )
 
   lazy val sjsCompilerTests = project.in(file("sjs-compiler-tests")).
@@ -1202,57 +1252,196 @@ object Build {
   // Note: the two tasks below should be one, but a bug in Tasty prevents that
   val generateScalaDocumentation = inputKey[Unit]("Generate documentation for dotty lib")
   val generateTestcasesDocumentation  = taskKey[Unit]("Generate documentation for testcases, usefull for debugging tests")
-  lazy val `scaladoc` = project.in(file("scaladoc")).asScaladoc
-  lazy val `scaladoc-nonBootstrapped` = project.in(file("scaladoc")).scaladocBasic(NonBootstrapped).settings(
-    // Unit tests in scaladoc depends on scaladoc-testcases
-    // we do not want to just cross compile them with bootstrapped and unbootstrapped compiler
-    Test / sources := Nil
-  )
 
-  def scalaDoc(implicit mode: Mode): Project = mode match {
-    case NonBootstrapped => `scaladoc-nonBootstrapped`
-    case Bootstrapped => scaladoc
-  }
+  lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")).
+    dependsOn(`scala3-compiler-bootstrapped`).
+    settings(commonBootstrappedSettings)
 
-  lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")).asScaladocTestcases(Bootstrapped)
-  lazy val `scaladoc-testcases-nonBootstrapped` = project.in(file("scaladoc-testcases")).asScaladocTestcases(NonBootstrapped)
 
-  def scalaDocTestcases(implicit mode: Mode): Project = mode match {
-    case NonBootstrapped => `scaladoc-testcases-nonBootstrapped`
-    case Bootstrapped => `scaladoc-testcases`
-  }
+  /**
+   * Collection of projects building targets for scaladoc, these are:
+   * - common - common module for javascript
+   * - main - main target for default scaladoc producing html webpage
+   * - contributors - not related project to any of forementioned modules. Used for presenting contributors for static site.
+   *                   Made as an indepented project to be scaladoc-agnostic.
+   */
+  lazy val `scaladoc-js-common` = project.in(file("scaladoc-js/common")).
+    enablePlugins(DottyJSPlugin).
+    dependsOn(`scala3-library-bootstrappedJS`).
+    settings(libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13))
 
-  lazy val `scaladoc-js` = project.in(file("scaladoc-js")).asScaladocJs(Bootstrapped)
-  lazy val `scaladoc-js-nonBootstrapped` = project.in(file("scaladoc-js")).asScaladocJs(NonBootstrapped)
+  lazy val `scaladoc-js-main` = project.in(file("scaladoc-js/main")).
+    enablePlugins(DottyJSPlugin).
+    dependsOn(`scaladoc-js-common`).
+    settings(
+      scalaJSUseMainModuleInitializer := true,
+      Test / fork := false
+    )
 
-  def scalaDocJs(implicit mode: Mode): Project = mode match {
-    case NonBootstrapped => `scaladoc-js-nonBootstrapped`
-    case Bootstrapped => `scaladoc-js`
-  }
+  lazy val `scaladoc-js-contributors` = project.in(file("scaladoc-js/contributors")).
+    enablePlugins(DottyJSPlugin).
+    dependsOn(`scala3-library-bootstrappedJS`).
+    settings(
+      Test / fork := false,
+      scalaJSUseMainModuleInitializer := true,
+      libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13)
+    )
 
-  // sbt plugin to use Dotty in your own build, see
-  // https://github.com/lampepfl/scala3-example-project for usage.
-  lazy val `sbt-dotty` = project.in(file("sbt-dotty")).
-    enablePlugins(SbtPlugin).
-    settings(commonSettings).
+  def generateDocumentation(targets: Seq[String], name: String, outDir: String, ref: String, params: Seq[String] = Nil, includeExternalMappings: Boolean = true) =
+    Def.taskDyn {
+      val distLocation = (dist / pack).value
+      val projectVersion = version.value
+      IO.createDirectory(file(outDir))
+      val stdLibVersion = stdlibVersion(NonBootstrapped)
+      val scalaLib = findArtifactPath(externalCompilerClasspathTask.value, "scala-library")
+      val dottyLib = (`scala3-library` / Compile / classDirectory).value
+      // TODO add versions etc.
+      def srcManaged(v: String, s: String) = s"out/bootstrap/stdlib-bootstrapped/scala-$v/src_managed/main/$s-library-src"
+      def scalaSrcLink(v: String, s: String) = s"-source-links:${s}github://scala/scala/v$v#src/library"
+      def dottySrcLink(v: String, sourcesPrefix: String = "", outputPrefix: String = "") =
+        sys.env.get("GITHUB_SHA") match {
+          case Some(sha) =>
+            s"-source-links:${sourcesPrefix}github://${sys.env("GITHUB_REPOSITORY")}/$sha$outputPrefix"
+          case None => s"-source-links:${sourcesPrefix}github://lampepfl/dotty/$v$outputPrefix"
+        }
+
+      val revision = Seq("-revision", ref, "-project-version", projectVersion)
+      val cmd = Seq(
+        "-d",
+        outDir,
+        "-project",
+        name,
+        scalaSrcLink(stdLibVersion, srcManaged(dottyNonBootstrappedVersion, "scala") + "="),
+        dottySrcLink(referenceVersion, srcManaged(dottyNonBootstrappedVersion, "dotty") + "=", "#library/src"),
+        dottySrcLink(referenceVersion),
+        "-Ygenerate-inkuire",
+      ) ++ scalacOptionsDocSettings(includeExternalMappings) ++ revision ++ params ++ targets
+      import _root_.scala.sys.process._
+      val escapedCmd = cmd.map(arg => if(arg.contains(" ")) s""""$arg"""" else arg)
+      Def.task {
+        (Compile / run).toTask(escapedCmd.mkString(" ", " ", "")).value
+      }
+    }
+
+  val SourceLinksIntegrationTest = config("sourceLinksIntegrationTest") extend Test
+
+  lazy val scaladoc = project.in(file("scaladoc")).
+    configs(SourceLinksIntegrationTest).
+    settings(commonBootstrappedSettings).
+    dependsOn(`scala3-compiler-bootstrapped`).
+    dependsOn(`scala3-tasty-inspector`).
+    settings(inConfig(SourceLinksIntegrationTest)(Defaults.testSettings)).
     settings(
-      name := sbtDottyName,
-      version := sbtDottyVersion,
-      organization := "ch.epfl.lamp",
-      // Keep in sync with inject-sbt-dotty.sbt
-      libraryDependencies ++= Seq(
-        Dependencies.`jackson-databind`,
-        Dependencies.newCompilerInterface
+      SourceLinksIntegrationTest / scalaSource := baseDirectory.value / "test-source-links",
+      SourceLinksIntegrationTest / test:= ((SourceLinksIntegrationTest / test) dependsOn generateScalaDocumentation.toTask("")).value,
+    ).
+    settings(
+      Compile / resourceGenerators += Def.task {
+        DocumentationWebsite.generateStaticAssets(
+          (`scaladoc-js-contributors` / Compile / fullOptJS).value.data,
+          (`scaladoc-js-main` / Compile / fullOptJS).value.data,
+          (`scaladoc-js-contributors` / Compile / baseDirectory).value / "css",
+          (`scaladoc-js-common` / Compile / baseDirectory).value / "css",
+          (Compile / resourceManaged).value,
+        )
+      }.taskValue,
+      libraryDependencies ++= Dependencies.flexmarkDeps ++ Seq(
+        "nl.big-o" % "liqp" % "0.8.2",
+        "org.jsoup" % "jsoup" % "1.14.3", // Needed to process .html files for static site
+        Dependencies.`jackson-dataformat-yaml`,
+
+        "com.novocode" % "junit-interface" % "0.11" % "test",
       ),
-      (Compile / unmanagedSourceDirectories) +=
-        baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config",
-      sbtTestDirectory := baseDirectory.value / "sbt-test",
+      Compile / mainClass := Some("dotty.tools.scaladoc.Main"),
+      Compile / buildInfoKeys := Seq[BuildInfoKey](version),
+      Compile / buildInfoPackage := "dotty.tools.scaladoc",
+      BuildInfoPlugin.buildInfoScopedSettings(Compile),
+      BuildInfoPlugin.buildInfoDefaultSettings,
+
+      Test / test := (Test / test).dependsOn(`scaladoc-testcases` / Compile / compile).value,
+      Test / testcasesOutputDir := (`scaladoc-testcases`/Compile/products).value.map(_.getAbsolutePath),
+      Test / testcasesSourceRoot := ((`scaladoc-testcases` / baseDirectory).value / "src").getAbsolutePath.toString,
+      run / baseDirectory := (ThisBuild / baseDirectory).value,
+      generateSelfDocumentation := Def.taskDyn {
+        generateDocumentation(
+          (Compile / classDirectory).value.getAbsolutePath :: Nil,
+          "scaladoc", "scaladoc/output/self", VersionUtil.gitHash, Seq("-usejavacp")
+        )
+      }.value,
+      generateScalaDocumentation := Def.inputTaskDyn {
+        val extraArgs = spaceDelimited("[output]").parsed
+        val dest = file(extraArgs.headOption.getOrElse("scaladoc/output/scala3")).getAbsoluteFile
+        val justAPI = extraArgs.drop(1).headOption == Some("--justAPI")
+        val majorVersion = (LocalProject("scala3-library-bootstrapped") / scalaBinaryVersion).value
+        val dottyJars: Seq[java.io.File] = Seq(
+          (`stdlib-bootstrapped`/Compile/products).value,
+          (`scala3-interfaces`/Compile/products).value,
+          (`tasty-core-bootstrapped`/Compile/products).value,
+        ).flatten
+
+        val roots = dottyJars.map(_.getAbsolutePath)
+
+        val managedSources =
+          (`stdlib-bootstrapped`/Compile/sourceManaged).value / "scala-library-src"
+        val projectRoot = (ThisBuild/baseDirectory).value.toPath
+        val stdLibRoot = projectRoot.relativize(managedSources.toPath.normalize())
+        val docRootFile = stdLibRoot.resolve("rootdoc.txt")
+
+        val dottyManagesSources =
+          (`stdlib-bootstrapped`/Compile/sourceManaged).value / "dotty-library-src"
+
+        val dottyLibRoot = projectRoot.relativize(dottyManagesSources.toPath.normalize())
+
+        def generateDocTask =
+          generateDocumentation(
+            roots, "Scala 3", dest.getAbsolutePath, "main",
+            Seq(
+              "-comment-syntax", "wiki",
+              s"-source-links:docs=github://lampepfl/dotty/main#docs",
+              "-doc-root-content", docRootFile.toString,
+              "-versions-dictionary-url",
+              "https://scala-lang.org/api/versions.json",
+              "-Ydocument-synthetic-types",
+              s"-snippet-compiler:${dottyLibRoot}/scala/quoted=compile,${dottyLibRoot}/scala/compiletime=compile"
+            ) ++ (if (justAPI) Nil else Seq("-siteroot", "docs", "-Yapi-subdirectory")), includeExternalMappings = false)
+
+        if (dottyJars.isEmpty) Def.task { streams.value.log.error("Dotty lib wasn't found") }
+        else if (justAPI) generateDocTask
+        else Def.task{
+          IO.write(dest / "versions" / "latest-nightly-base", majorVersion)
+
+          // This file is used by GitHub Pages when the page is available in a custom domain
+          IO.write(dest / "CNAME", "dotty.epfl.ch")
+        }.dependsOn(generateDocTask)
+      }.evaluated,
 
-      // ensure that sbt-dotty is built with sbt 1.4
-      pluginCrossBuild / sbtVersion := "1.4.9",
+      generateTestcasesDocumentation := Def.taskDyn {
+        generateDocumentation(
+          (Test / Build.testcasesOutputDir).value,
+          "scaladoc testcases",
+          "scaladoc/output/testcases",
+          "main",
+          Seq("-usejavacp", "-snippet-compiler:scaladoc-testcases/docs=compile", "-siteroot", "scaladoc-testcases/docs")
+        )
+      }.value,
+
+      Test / buildInfoKeys := Seq[BuildInfoKey](
+        (Test / Build.testcasesOutputDir),
+        (Test / Build.testcasesSourceRoot),
+        Build.testDocumentationRoot,
+      ),
+      testDocumentationRoot := (baseDirectory.value / "test-documentations").getAbsolutePath,
+      Test / buildInfoPackage := "dotty.tools.scaladoc.test",
+      BuildInfoPlugin.buildInfoScopedSettings(Test),
+    )
 
-      // scritped tests are run with current sbt version
-      scriptedSbt := sbtVersion.value,
+  // various scripted sbt tests
+  lazy val `sbt-test` = project.in(file("sbt-test")).
+    enablePlugins(ScriptedPlugin).
+    settings(commonSettings).
+    settings(
+      sbtTestDirectory := baseDirectory.value,
+      target := baseDirectory.value / ".." / "out" / name.value,
 
       // The batch mode accidentally became the default with no way to disable
       // it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195).
@@ -1262,6 +1451,7 @@ object Build {
       scriptedLaunchOpts ++= Seq(
         "-Dplugin.version=" + version.value,
         "-Dplugin.scalaVersion=" + dottyVersion,
+        "-Dplugin.scala2Version=" + stdlibVersion(Bootstrapped),
         "-Dplugin.scalaJSVersion=" + scalaJSVersion,
         "-Dsbt.boot.directory=" + ((ThisBuild / baseDirectory).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469
       ),
@@ -1300,7 +1490,7 @@ object Build {
           s"""scalaVersion := "$publishedDottyVersion"""")
         val dottyPluginSbtFile = baseDirectory.value / "out" / "scala3-plugin.sbt"
         IO.write(dottyPluginSbtFile,
-          s"""addSbtPlugin("$dottyOrganization" % "$sbtDottyName" % "$publishedSbtDottyVersion")""")
+          s"""addSbtPlugin("$dottyOrganization" % "sbt-dotty" % "$sbtDottyVersion")""")
         Seq(buildSbtFile, dottyPluginSbtFile)
       },
       Compile / compile := Def.task {
@@ -1374,8 +1564,7 @@ object Build {
         (`scala3-staging` / publishLocal),
         (`scala3-tasty-inspector` / publishLocal),
         (`scaladoc` / publishLocal),
-        (`scala3-bootstrapped` / publishLocal),
-        (`sbt-dotty` / publishLocal),
+        (`scala3-bootstrapped` / publishLocal)
       ).evaluated
    )
 
@@ -1393,7 +1582,6 @@ object Build {
         (`scala3-tasty-inspector` / publishLocal).value
         (`scaladoc` / publishLocal).value
         (`scala3-compiler-bootstrapped` / publishLocal).value
-        (`sbt-dotty` / publishLocal).value
         (`scala3-bootstrapped` / publishLocal).value
         (`scala3-library-bootstrappedJS` / publishLocal).value
         (`sbt-community-build` / publishLocal).value
@@ -1525,7 +1713,7 @@ object Build {
 
     // FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
     def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
-      aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, `scaladoc-nonBootstrapped`, `scala3-sbt-bridge`).
+      aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, `scala3-sbt-bridge`).
       bootstrappedAggregate(`scala3-language-server`, `scala3-staging`, `scala3-tasty-inspector`,
         `scala3-library-bootstrappedJS`, scaladoc).
       dependsOn(tastyCore).
@@ -1541,6 +1729,7 @@ object Build {
         // non-bootstrapped compiler), so publish the bootstrapped one by
         // default.
         addCommandAlias("publishLocal", "scala3-bootstrapped/publishLocal"),
+        repl := (`scala3-compiler-bootstrapped` / repl).value,
       ).
       settings(
         publish / skip := true
@@ -1556,19 +1745,25 @@ object Build {
       val base =
         project.withCommonSettings.
           settings(
-            libraryDependencies += "org.scala-lang" % "scala-library" % stdlibVersion
+            versionScheme := Some("semver-spec"),
+            libraryDependencies += "org.scala-lang" % "scala-library" % stdlibVersion,
+            // Make sure we do not refer to experimental features outside an experimental scope.
+            // In other words, disable NIGHTLY/SNAPSHOT experimental scope.
+            scalacOptions += "-Yno-experimental",
           ).
           settings(dottyLibrarySettings)
       if (mode == Bootstrapped) {
-        base.settings(Seq(
+        base.settings(
           (Compile/doc) := {
             // Workaround for
             // [error]    |object IArray cannot have the same name as object IArray in package scala
             // -- cannot define object member with the same name as a object member in self reference _.
             val doWork = (Compile/doc).result.value
             (Compile/doc/target).value
-          }
-        ))
+          },
+          commonMiMaSettings,
+          mimaBinaryIssueFilters ++= MiMaFilters.Library
+        )
       } else base
     }
 
@@ -1576,7 +1771,15 @@ object Build {
     def asTastyCore(implicit mode: Mode): Project = project.withCommonSettings.
       dependsOn(dottyLibrary).
       settings(tastyCoreSettings).
-      settings(disableDocSetting)
+      settings(disableDocSetting).
+      settings(
+        versionScheme := Some("semver-spec"),
+        if (mode == Bootstrapped) {
+          commonMiMaSettings
+        } else {
+          Nil
+        }
+      )
 
     def asTastyCoreScala2: Project = project.settings(commonScala2Settings)
 
@@ -1585,169 +1788,10 @@ object Build {
       settings(commonBenchmarkSettings).
       enablePlugins(JmhPlugin)
 
-    def scaladocBasic(implicit mode: Mode): Project = {
-      val flexmarkVersion = "0.42.12"
-
-      val base = if (mode == Bootstrapped)
-        project.settings(commonBootstrappedSettings)
-          .dependsOn(`scala3-compiler-bootstrapped`)
-          .dependsOn(`scala3-tasty-inspector`)
-      else
-        project.settings(commonNonBootstrappedSettings)
-          .dependsOn(`scala3-compiler`)
-          .dependsOn(`scala3-tasty-inspector-nonbootstrapped`)
-
-      base.settings(
-        Compile / resourceGenerators += Def.task {
-          val jsDestinationFile = (Compile / resourceManaged).value / "dotty_res" / "scripts" / "searchbar.js"
-          sbt.IO.copyFile((scalaDocJs / Compile / fullOptJS).value.data, jsDestinationFile)
-          Seq(jsDestinationFile)
-        }.taskValue,
-        Compile / resourceGenerators += Def.task {
-          val cssDesitnationFile = (Compile / resourceManaged).value / "dotty_res" / "styles" / "scaladoc-searchbar.css"
-          val cssSourceFile = (scalaDocJs / Compile / resourceDirectory).value / "scaladoc-searchbar.css"
-          sbt.IO.copyFile(cssSourceFile, cssDesitnationFile)
-          Seq(cssDesitnationFile)
-        }.taskValue,
-        libraryDependencies ++= Seq(
-          "com.vladsch.flexmark" % "flexmark" % flexmarkVersion,
-          "com.vladsch.flexmark" % "flexmark-html-parser" % flexmarkVersion,
-          "com.vladsch.flexmark" % "flexmark-ext-anchorlink" % flexmarkVersion,
-          "com.vladsch.flexmark" % "flexmark-ext-autolink" % flexmarkVersion,
-          "com.vladsch.flexmark" % "flexmark-ext-emoji" % flexmarkVersion,
-          "com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % flexmarkVersion,
-          "com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % flexmarkVersion,
-          "com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % flexmarkVersion,
-          "com.vladsch.flexmark" % "flexmark-ext-wikilink" % flexmarkVersion,
-          "com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,
-          "nl.big-o" % "liqp" % "0.6.7",
-          "org.jsoup" % "jsoup" % "1.13.1", // Needed to process .html files for static site
-          Dependencies.`jackson-dataformat-yaml`,
-
-          "com.novocode" % "junit-interface" % "0.11" % "test",
-        ),
-        Compile / mainClass := Some("dotty.tools.scaladoc.Main"),
-        Compile / buildInfoKeys := Seq[BuildInfoKey](version),
-        Compile / buildInfoPackage := "dotty.tools.scaladoc",
-        BuildInfoPlugin.buildInfoScopedSettings(Compile),
-        BuildInfoPlugin.buildInfoDefaultSettings,
-      )
-    }
-
-    def asScaladoc: Project = {
-      def generateDocumentation(targets: Seq[String], name: String, outDir: String, ref: String, params: Seq[String] = Nil) =
-        Def.taskDyn {
-          val distLocation = (dist / pack).value
-          val projectVersion = version.value
-          IO.createDirectory(file(outDir))
-          val scala3version = stdlibVersion(Bootstrapped)
-          // TODO add versions etc.
-          val srcManaged = s"out/bootstrap/stdlib-bootstrapped/scala-$baseVersion/src_managed/main/scala-library-src"
-          val sourceLinks = s"-source-links:$srcManaged=github://scala/scala/v${stdlibVersion(Bootstrapped)}#src/library"
-          val revision = Seq("-revision", ref, "-project-version", projectVersion)
-          val cmd = Seq("-d", outDir, "-project", name, sourceLinks) ++ scalacOptionsDocSettings ++ revision ++ params ++ targets
-          import _root_.scala.sys.process._
-          Def.task((s"$distLocation/bin/scaladoc" +: cmd).!)
-        }
-
-      def joinProducts(products: Seq[java.io.File]): String =
-        products.iterator.map(_.getAbsolutePath).mkString(" ")
-
-      val flexmarkVersion = "0.42.12"
-
-      scaladocBasic(Bootstrapped).settings(
-        Test / test := (Test / test).dependsOn(`scaladoc-testcases` / Compile / compile).value,
-        Test / testcasesOutputDir := (`scaladoc-testcases`/Compile/products).value.map(_.getAbsolutePath),
-        Test / testcasesSourceRoot := ((`scaladoc-testcases` / baseDirectory).value / "src").getAbsolutePath.toString,
-        run / baseDirectory := (ThisBuild / baseDirectory).value,
-        generateSelfDocumentation := Def.taskDyn {
-          generateDocumentation(
-            (Compile / classDirectory).value.getAbsolutePath :: Nil,
-            "scaladoc", "scaladoc/output/self", VersionUtil.gitHash,
-          )
-        }.value,
-        generateScalaDocumentation := Def.inputTaskDyn {
-          val extraArgs = spaceDelimited("[output]").parsed
-          val dest = file(extraArgs.headOption.getOrElse("scaladoc/output/scala3")).getAbsoluteFile
-          val majorVersion = (LocalProject("scala3-library-bootstrapped") / scalaBinaryVersion).value
-
-          val dottyJars: Seq[java.io.File] = Seq(
-            (`stdlib-bootstrapped`/Compile/products).value,
-            (`scala3-interfaces`/Compile/products).value,
-            (`tasty-core-bootstrapped`/Compile/products).value,
-          ).flatten
-
-          val roots = dottyJars.map(_.getAbsolutePath)
-
-          val managedSources =
-            (`stdlib-bootstrapped`/Compile/sourceManaged).value / "scala-library-src"
-          val projectRoot = (ThisBuild/baseDirectory).value.toPath
-          val stdLibRoot = projectRoot.relativize(managedSources.toPath.normalize())
-          val docRootFile = stdLibRoot.resolve("rootdoc.txt")
-
-          val dottyManagesSources =
-            (`stdlib-bootstrapped`/Compile/sourceManaged).value / "dotty-library-src"
-
-          val dottyLibRoot = projectRoot.relativize(dottyManagesSources.toPath.normalize())
-
-          if (dottyJars.isEmpty) Def.task { streams.value.log.error("Dotty lib wasn't found") }
-          else Def.task{
-            IO.write(dest / "versions" / "latest-nightly-base", majorVersion)
-
-            // This file is used by GitHub Pages when the page is available in a custom domain
-            IO.write(dest / "CNAME", "dotty.epfl.ch")
-          }.dependsOn(generateDocumentation(
-            roots, "Scala 3", dest.getAbsolutePath, "master",
-            Seq(
-              "-comment-syntax", "wiki",
-              "-siteroot", "docs",
-              s"-source-links:docs=github://lampepfl/dotty/master#docs",
-              "-doc-root-content", docRootFile.toString
-            )
-          ))
-        }.evaluated,
-
-        generateTestcasesDocumentation := Def.taskDyn {
-          generateDocumentation(
-            (Test / Build.testcasesOutputDir).value,
-            "scaladoc testcases",
-            "scaladoc/output/testcases",
-            "master")
-        }.value,
-
-        Test / buildInfoKeys := Seq[BuildInfoKey](
-          (Test / Build.testcasesOutputDir),
-          (Test / Build.testcasesSourceRoot),
-          Build.testDocumentationRoot,
-        ),
-        testDocumentationRoot := (baseDirectory.value / "test-documentations").getAbsolutePath,
-        Test / buildInfoPackage := "dotty.tools.scaladoc.test",
-        BuildInfoPlugin.buildInfoScopedSettings(Test),
-      )
-    }
-
-    def asScaladocTestcases(implicit mode: Mode): Project =
-      if (mode == Bootstrapped)
-        project.dependsOn(`scala3-compiler-bootstrapped`).settings(commonBootstrappedSettings)
-      else
-        project.dependsOn(`scala3-compiler`).settings(commonNonBootstrappedSettings)
-
-    def asScaladocJs(implicit mode: Mode): Project = {
-      val pr = if (mode == Bootstrapped)
-        project.enablePlugins(BootstrappedDottyJSPlugin).dependsOn(`scala3-library-bootstrappedJS`)
-      else
-        project.enablePlugins(NonBootstrappedDottyJSPlugin).dependsOn(`scala3-library-js`)
-      pr.settings(
-        Test / fork := false,
-        scalaJSUseMainModuleInitializer := true,
-        libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").withDottyCompat(scalaVersion.value)
-      )
-    }
-
     def asDist(implicit mode: Mode): Project = project.
       enablePlugins(PackPlugin).
       withCommonSettings.
-      dependsOn(`scala3-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `scala3-staging`, `scala3-tasty-inspector`, scalaDoc).
+      dependsOn(`scala3-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `scala3-staging`, `scala3-tasty-inspector`, scaladoc).
       settings(commonDistSettings).
       bootstrappedSettings(
         target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings
diff --git a/project/ConstantHolderGenerator.scala b/project/ConstantHolderGenerator.scala
index 9dc45313861d..e22609a305fd 100644
--- a/project/ConstantHolderGenerator.scala
+++ b/project/ConstantHolderGenerator.scala
@@ -35,6 +35,7 @@ object ConstantHolderGenerator {
   private final def literal(v: Any): String = v match {
     case s: String  => "raw\"\"\"" + s + "\"\"\""
     case b: Boolean => b.toString
+    case i: Int     => i.toString
     case f: File    => literal(f.getAbsolutePath)
 
     case _ =>
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index b15d5abaa355..23ee5b7b0427 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -4,12 +4,27 @@ import sbt._
  *  to ensure the same version of the dependency is used in all projects
  */
 object Dependencies {
-  private val jacksonVersion = "2.9.8"
+  private val jacksonVersion = "2.12.1"
   val `jackson-databind` =
     "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion
   val `jackson-dataformat-yaml` =
     "com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % jacksonVersion
 
+  private val flexmarkVersion = "0.42.12"
+
+  val flexmarkDeps = Seq(
+    "com.vladsch.flexmark" % "flexmark" % flexmarkVersion,
+    "com.vladsch.flexmark" % "flexmark-html-parser" % flexmarkVersion,
+    "com.vladsch.flexmark" % "flexmark-ext-anchorlink" % flexmarkVersion,
+    "com.vladsch.flexmark" % "flexmark-ext-autolink" % flexmarkVersion,
+    "com.vladsch.flexmark" % "flexmark-ext-emoji" % flexmarkVersion,
+    "com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % flexmarkVersion,
+    "com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % flexmarkVersion,
+    "com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % flexmarkVersion,
+    "com.vladsch.flexmark" % "flexmark-ext-wikilink" % flexmarkVersion,
+    "com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,
+  )
+
   val newCompilerInterface = "org.scala-sbt" % "compiler-interface" % "1.4.3"
   val oldCompilerInterface = "org.scala-sbt" % "compiler-interface" % "1.3.5"
 }
diff --git a/project/DocumentationWebsite.scala b/project/DocumentationWebsite.scala
new file mode 100644
index 000000000000..778c70ad2f0d
--- /dev/null
+++ b/project/DocumentationWebsite.scala
@@ -0,0 +1,85 @@
+import java.io.File
+import java.nio.file.Paths
+import sbt._
+import Build._
+
+object DocumentationWebsite {
+  def generateStaticAssets(
+    contributorsFile: File,
+    mainFile: File,
+    cssContentContributorsSourceBaseFile: File,
+    cssSourceFileBase: File,
+    baseDest: File
+  ): Seq[File] = {
+
+
+    val contributorsTestcasesDestinationFile = Paths.get("scaladoc-testcases", "docs", "_assets", "js", "contributors.js").toFile
+    val contributorsDestinationFile = Paths.get("docs", "_assets", "js", "contributors.js").toFile
+    sbt.IO.copyFile(contributorsFile, contributorsTestcasesDestinationFile)
+    sbt.IO.copyFile(contributorsFile, contributorsDestinationFile)
+
+    val mainDestinationFile = baseDest / "dotty_res" / "scripts" / "scaladoc-scalajs.js"
+    sbt.IO.copyFile(mainFile, mainDestinationFile)
+
+    val cssCodeSnippetsDesitnationFile = baseDest / "dotty_res" / "styles" / "code-snippets.css"
+    val cssCodeSnippetsSourceFile = cssSourceFileBase / "code-snippets.css"
+    sbt.IO.copyFile(cssCodeSnippetsSourceFile, cssCodeSnippetsDesitnationFile)
+
+    val cssContentContributorsTestcasesDesitnationFile = Paths.get("docs", "_assets", "css", "content-contributors.css").toFile
+    val cssContentContributorsDesitnationFile = Paths.get("scaladoc-testcases", "docs", "_assets", "css", "content-contributors.css").toFile
+    val cssContentContributorsSourceFile = cssContentContributorsSourceBaseFile / "content-contributors.css"
+    sbt.IO.copyFile(cssContentContributorsSourceFile, cssContentContributorsTestcasesDesitnationFile)
+    sbt.IO.copyFile(cssContentContributorsSourceFile, cssContentContributorsDesitnationFile)
+
+    val dests = Seq("searchbar.css", "social-links.css", "ux.css", "versions-dropdown.css").map { file =>
+      val cssDesitnationFile = baseDest / "dotty_res" / "styles" / file
+      val cssSourceFile = cssSourceFileBase / file
+      sbt.IO.copyFile(cssSourceFile, cssDesitnationFile)
+      cssDesitnationFile
+    }
+
+    import _root_.scala.sys.process._
+    import _root_.scala.concurrent._
+    import _root_.scala.concurrent.duration.Duration
+    import ExecutionContext.Implicits.global
+    val inkuireVersion = "1.0.0-M3"
+    val inkuireLink = s"https://github.com/VirtusLab/Inkuire/releases/download/$inkuireVersion/inkuire.js"
+    val inkuireDestinationFile = baseDest / "dotty_res" / "scripts" / "inkuire.js"
+    sbt.IO.touch(inkuireDestinationFile)
+
+    def tryFetch(retries: Int, timeout: Duration): Unit = {
+      val downloadProcess = (new java.net.URL(inkuireLink) #> inkuireDestinationFile).run()
+      val result: Future[Int] = Future(blocking(downloadProcess.exitValue()))
+      try {
+        Await.result(result, timeout) match {
+          case 0 =>
+          case res if retries > 0 =>
+            println(s"Failed to fetch inkuire.js from $inkuireLink: Error code $res. $retries retries left")
+            tryFetch(retries - 1, timeout)
+          case res => throw new MessageOnlyException(s"Failed to fetch inkuire.js from $inkuireLink: Error code $res")
+        }
+      } catch {
+        case e: TimeoutException =>
+          downloadProcess.destroy()
+          if (retries > 0) {
+            println(s"Failed to fetch inkuire.js from $inkuireLink: Download timeout. $retries retries left")
+            tryFetch(retries - 1, timeout)
+          }
+          else {
+            throw new MessageOnlyException(s"Failed to fetch inkuire.js from $inkuireLink: Download timeout")
+          }
+      }
+    }
+
+    tryFetch(5, Duration(60, "s"))
+    Seq(
+      inkuireDestinationFile,
+      mainDestinationFile,
+      contributorsDestinationFile,
+      cssContentContributorsDesitnationFile,
+      cssCodeSnippetsDesitnationFile,
+    ) ++ dests
+  }
+}
+
+
diff --git a/sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala b/project/DottyIDEPlugin.scala
similarity index 99%
rename from sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala
rename to project/DottyIDEPlugin.scala
index d85e3baa36d8..f455692a2672 100644
--- a/sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala
+++ b/project/DottyIDEPlugin.scala
@@ -13,7 +13,6 @@ import dotty.tools.languageserver.config.ProjectConfig
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import scala.collection.mutable.ListBuffer
-import DottyPlugin.autoImport._
 
 object DottyIDEPlugin extends AutoPlugin {
   object autoImport {
diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala
new file mode 100644
index 000000000000..cac81eecc141
--- /dev/null
+++ b/project/MiMaFilters.scala
@@ -0,0 +1,24 @@
+
+import com.typesafe.tools.mima.core._
+
+object MiMaFilters {
+  val Library: Seq[ProblemFilter] = Seq(
+    // Experimental APIs that can be added in 3.2.0
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.append"),
+    ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"),
+    ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.typeArgs"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.typeArgs"),
+    ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.double"),
+    ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.double$"),
+    ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.float"),
+    ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.float$"),
+    ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.long"),
+    ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.long$"),
+    ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#CompilationInfoModule.XmacroSettings"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#CompilationInfoModule.XmacroSettings"),
+
+    // Private to the compiler - needed for forward binary compatibility
+    ProblemFilters.exclude[MissingClassProblem]("scala.annotation.since")
+  )
+}
diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala
index f0297f56e0c0..1d385d75631d 100644
--- a/project/VersionUtil.scala
+++ b/project/VersionUtil.scala
@@ -3,7 +3,7 @@ import org.eclipse.jgit.lib.{Constants, ObjectId, Ref, Repository}
 import org.eclipse.jgit.revwalk.{RevCommit, RevWalk}
 
 import java.text.SimpleDateFormat
-import java.util.Date
+import java.util.{Date, TimeZone}
 
 object VersionUtil {
 
@@ -38,6 +38,7 @@ object VersionUtil {
   def gitHash: String = git.headCommitSha.substring(0, 7)
   def commitDate: String = {
     val format = new SimpleDateFormat("yyyyMMdd")
+    format.setTimeZone(TimeZone.getTimeZone("UTC"))
     format.format(git.headCommitDate)
   }
 }
diff --git a/project/build.properties b/project/build.properties
index e67343ae796c..3161d2146c63 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.0
+sbt.version=1.6.1
diff --git a/project/build.sbt b/project/build.sbt
index fe0b179ee6f5..e19492c42022 100644
--- a/project/build.sbt
+++ b/project/build.sbt
@@ -1,16 +1,7 @@
 // Used by VersionUtil to get gitHash and commitDate
 libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "4.11.0.201803080745-r"
 
-// Include the sources of the sbt-dotty plugin in the project build,
-// so that we can use the current in-development version of the plugin
-// in our build instead of a released version.
 
-Compile / unmanagedSourceDirectories += baseDirectory.value / "../sbt-dotty/src"
-
-// Keep in sync with `sbt-dotty` config in Build.scala
-libraryDependencies ++= Seq(
-  Dependencies.`jackson-databind`,
-  Dependencies.newCompilerInterface
-)
 Compile / unmanagedSourceDirectories +=
   baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config"
+libraryDependencies += Dependencies.`jackson-databind`
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 8b88da956299..1716bb51b7f1 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,9 +2,9 @@
 //
 // e.g. addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
 
@@ -13,3 +13,5 @@ addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.13")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.2")
 
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
+
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.0")
diff --git a/project/project/build.sbt b/project/project/build.sbt
index 41880f2a21f0..72edda4a4c1f 100644
--- a/project/project/build.sbt
+++ b/project/project/build.sbt
@@ -1,2 +1,2 @@
 // Some dependencies are shared between the regular build and the meta-build
-sources in Compile += baseDirectory.value / "../Dependencies.scala"
+Compile / sources += baseDirectory.value / "../Dependencies.scala"
diff --git a/project/scripts/bootstrapCmdTests b/project/scripts/bootstrapCmdTests
deleted file mode 100755
index 31b8368d5215..000000000000
--- a/project/scripts/bootstrapCmdTests
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source $(dirname $0)/cmdTestsCommon.inc.sh
-
-# check that benchmarks can run
-"$SBT" "scala3-bench/jmh:run 1 1 tests/pos/alias.scala"
-# The above is here as it relies on the bootstrapped library.
-"$SBT" "scala3-bench-bootstrapped/jmh:run 1 1 tests/pos/alias.scala"
-"$SBT" "scala3-bench-bootstrapped/jmh:run 1 1 -with-compiler compiler/src/dotty/tools/dotc/core/Types.scala"
-
-echo "testing scala.quoted.Expr.run from sbt scala"
-"$SBT" ";scala3-compiler-bootstrapped/scalac -with-compiler tests/run-staging/quote-run.scala; scala3-compiler-bootstrapped/scala -with-compiler Test" > "$tmp"
-grep -qe "val a: scala.Int = 3" "$tmp"
-
-
-# setup for `scalac`/`scala` script tests
-"$SBT" dist/pack
-
-# check that `scalac` compiles and `scala` runs it
-echo "testing ./bin/scalac and ./bin/scala"
-clear_out "$OUT"
-./bin/scalac "$SOURCE" -d "$OUT"
-./bin/scala -classpath "$OUT" "$MAIN" > "$tmp"
-test "$EXPECTED_OUTPUT" = "$(cat "$tmp")"
-
-# Test scaladoc based on compiled classes
-./bin/scaladoc -project Staging -d "$OUT1" "$OUT"
-clear_out "$OUT1"
-
-# check that `scalac` and `scala` works for staging
-clear_out "$OUT"
-./bin/scalac tests/run-staging/i4044f.scala -d "$OUT"
-./bin/scala -with-compiler -classpath "$OUT" Test > "$tmp"
-
-# check that `scalac -from-tasty` compiles and `scala` runs it
-echo "testing ./bin/scalac -from-tasty and scala -classpath"
-clear_out "$OUT1"
-./bin/scalac "$SOURCE" -d "$OUT"
-./bin/scalac -from-tasty -d "$OUT1" "$OUT/$TASTY"
-./bin/scala -classpath "$OUT1" "$MAIN" > "$tmp"
-test "$EXPECTED_OUTPUT" = "$(cat "$tmp")"
-
-# check that `sbt scalac -decompile` runs
-echo "testing sbt scalac -decompile from file"
-./bin/scalac -decompile -color:never "$OUT/$TASTY" > "$tmp"
-grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
-
-echo "testing loading tasty from .tasty file in jar"
-clear_out "$OUT"
-./bin/scalac -d "$OUT/out.jar" "$SOURCE"
-./bin/scalac -decompile -color:never "$OUT/out.jar" > "$tmp"
-grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
-
-# echo ":quit" | ./dist/target/pack/bin/scala  # not supported by CI
-
-echo "testing ./bin/scaladoc"
-clear_out "$OUT1"
-./bin/scaladoc -project Hello -d "$OUT1" "$OUT/out.jar"
-
-# check compilation when the class/tasty files already exist in the current directory
-echo "testing i11644"
-cwd=$(pwd)
-clear_out "$OUT"
-(cd "$OUT" && "$cwd/bin/scalac" "$cwd/tests/pos/i11644.scala" && "$cwd/bin/scalac" "$cwd/tests/pos/i11644.scala")
-
-# check options specified in files
-./bin/scalac @project/scripts/options "$SOURCE"
diff --git a/project/scripts/bootstrappedOnlyCmdTests b/project/scripts/bootstrappedOnlyCmdTests
new file mode 100755
index 000000000000..472426b23b20
--- /dev/null
+++ b/project/scripts/bootstrappedOnlyCmdTests
@@ -0,0 +1,123 @@
+#!/usr/bin/env bash
+
+set -e
+
+source $(dirname $0)/cmdTestsCommon.inc.sh
+
+# check that benchmarks can run
+"$SBT" "scala3-bench/jmh:run 1 1 tests/pos/alias.scala"
+# The above is here as it relies on the bootstrapped library.
+"$SBT" "scala3-bench-bootstrapped/jmh:run 1 1 tests/pos/alias.scala"
+"$SBT" "scala3-bench-bootstrapped/jmh:run 1 1 -with-compiler compiler/src/dotty/tools/dotc/core/Types.scala"
+
+echo "testing scala.quoted.Expr.run from sbt scala"
+"$SBT" ";scala3-compiler-bootstrapped/scalac -with-compiler tests/run-staging/quote-run.scala; scala3-compiler-bootstrapped/scala -with-compiler Test" > "$tmp"
+grep -qe "val a: scala.Int = 3" "$tmp"
+
+
+# setup for `scalac`/`scala` script tests
+"$SBT" dist/pack
+
+# check that `scalac` compiles and `scala` runs it
+echo "testing ./bin/scalac and ./bin/scala"
+clear_out "$OUT"
+./bin/scalac "$SOURCE" -d "$OUT"
+./bin/scala -classpath "$OUT" "$MAIN" > "$tmp"
+test "$EXPECTED_OUTPUT" = "$(cat "$tmp")"
+
+# Test scaladoc based on compiled classes
+./bin/scaladoc -project Staging -d "$OUT1" "$OUT"
+clear_out "$OUT1"
+
+# check that `scalac` and `scala` works for staging
+clear_out "$OUT"
+./bin/scalac tests/run-staging/i4044f.scala -d "$OUT"
+./bin/scala -with-compiler -classpath "$OUT" Test > "$tmp"
+
+# check that `scalac -from-tasty` compiles and `scala` runs it
+echo "testing ./bin/scalac -from-tasty and scala -classpath"
+clear_out "$OUT1"
+./bin/scalac "$SOURCE" -d "$OUT"
+./bin/scalac -from-tasty -d "$OUT1" "$OUT/$TASTY"
+./bin/scala -classpath "$OUT1" "$MAIN" > "$tmp"
+test "$EXPECTED_OUTPUT" = "$(cat "$tmp")"
+
+# check that `sbt scalac -decompile` runs
+echo "testing sbt scalac -decompile from file"
+./bin/scalac -decompile -color:never "$OUT/$TASTY" > "$tmp"
+grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
+
+echo "testing loading tasty from .tasty file in jar"
+clear_out "$OUT"
+./bin/scalac -d "$OUT/out.jar" "$SOURCE"
+./bin/scalac -decompile -color:never "$OUT/out.jar" > "$tmp"
+grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
+
+echo "testing sbt scalac with suspension"
+clear_out "$OUT"
+"$SBT" "scala3-compiler-bootstrapped/scalac -d $OUT tests/pos-macros/macros-in-same-project-1/Bar.scala tests/pos-macros/macros-in-same-project-1/Foo.scala"  > "$tmp"
+
+# echo ":quit" | ./dist/target/pack/bin/scala  # not supported by CI
+
+echo "testing ./bin/scaladoc"
+clear_out "$OUT1"
+./bin/scaladoc -project Hello -d "$OUT1" "$OUT/out.jar"
+
+# check compilation when the class/tasty files already exist in the current directory
+echo "testing i11644"
+cwd=$(pwd)
+clear_out "$OUT"
+(cd "$OUT" && "$cwd/bin/scalac" "$cwd/tests/pos/i11644.scala" && "$cwd/bin/scalac" "$cwd/tests/pos/i11644.scala")
+
+# check options specified in files
+./bin/scalac @project/scripts/options "$SOURCE"
+
+# test command line options
+./bin/scalac -help > "$tmp" 2>&1
+grep -qe "Usage: scalac <options> <source files>" "$tmp"
+
+./bin/scala -help > "$tmp" 2>&1
+grep -qe "Usage: scala <options> <source files>" "$tmp"
+
+./bin/scala -d hello.jar tests/run/hello.scala
+ls hello.jar
+
+echo "testing i12973"
+clear_out "$OUT"
+./bin/scalac -d "$OUT/out.jar" tests/pos/i12973.scala
+echo "Bug12973().check" | TERM=dumb ./bin/scala -cp "$OUT/out.jar" > "$tmp" 2>&1
+grep -qe "Bug12973 is fixed" "$tmp"
+
+echo "capturing scala version from dist/target/pack/VERSION"
+cwd=$(pwd)
+IFS=':=' read -ra versionProps < "$cwd/dist/target/pack/VERSION" # temporarily set IFS to ':=' to split versionProps
+[ ${#versionProps[@]} -eq 3 ] && \
+  [ ${versionProps[0]} = "version" ] && \
+  [ -n ${versionProps[2]} ] || die "Expected non-empty 'version' property in $cwd/dist/target/pack/VERSION"
+scala_version=${versionProps[2]}
+
+echo "testing -sourcepath with incremental compile: inlining changed inline def into a def"
+# Here we will test that a changed inline method symbol loaded from the sourcepath (-sourcepath compiler option)
+# will have its `defTree` correctly set when its method body is required for inlining.
+# So far I have not found a way to replicate issue https://github.com/lampepfl/dotty/issues/13994
+# with sbt scripted tests, if a way is found, move this test there.
+cwd=$(pwd)
+sbt_test_command="++${scala_version}!;clean;prepareSources;compile;copyChanges;compile"
+(cd "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline" && "$SBT" "$sbt_test_command")
+rm -rf "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/target"
+rm -rf "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/target"
+rm -f "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/src/main/scala/a/zz.scala"
+
+echo "testing -sourcepath with incremental compile: hashing reference to changed inline def from an inline def"
+# Here we will test that a changed inline method symbol loaded from the sourcepath (-sourcepath compiler option)
+# will have its `defTree` correctly set when its method body is hashed by extractAPI, when referenced from another
+# inline method.
+# So far I have not found a way to replicate https://github.com/lampepfl/dotty/pull/12931#discussion_r753212124
+# with sbt scripted tests, if a way is found, move this test there.
+cwd=$(pwd)
+sbt_test_dir="$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash"
+sbt_test_command="++${scala_version}!;clean;prepareSources;compile;copyChanges;compile"
+(cd "$sbt_test_dir" && "$SBT" "$sbt_test_command")
+rm -rf "$sbt_test_dir/target"
+rm -rf "$sbt_test_dir/project/target"
+rm -f "$sbt_test_dir/src/main/scala/a/zz.scala"
diff --git a/project/scripts/check-cla.sh b/project/scripts/check-cla.sh
index 8538a27f4bd1..21efa74eb2eb 100755
--- a/project/scripts/check-cla.sh
+++ b/project/scripts/check-cla.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 set -eux
 
-AUTHOR=$GITHUB_ACTOR
 echo "Pull request submitted by $AUTHOR";
 signed=$(curl -s https://www.lightbend.com/contribute/cla/scala/check/$AUTHOR | jq -r ".signed");
 if [ "$signed" = "true" ] ; then
diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests
new file mode 100755
index 000000000000..ff25bc6a3940
--- /dev/null
+++ b/project/scripts/cmdScaladocTests
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+source $(dirname $0)/cmdTestsCommon.inc.sh
+
+echo "testing scaladoc script"
+clear_out "$OUT"
+clear_out "$OUT1"
+
+
+STDLIB_COMMAND="$SBT \"eval println(Build.stdlibVersion(Modes.NonBootstrapped))\""
+STDLIB_VERSION=$(eval $STDLIB_COMMAND | tail -n 2 | head -n 1)
+
+DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyNonBootstrappedVersion)\""
+DOTTY_NONBOOTSTRAPPED_VERSION=$(eval $DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1)
+
+DOTTY_BOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyVersion)\""
+DOTTY_BOOTSTRAPPED_VERSION=$(eval $DOTTY_BOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1)
+
+GITHUB_REPOSITORY="lampepfl/dotty"
+GITHUB_SHA="3.0.0"
+
+"$SBT" "scaladoc/generateTestcasesDocumentation" > "$tmp" 2>&1 || echo "generated testcases project with sbt"
+dist/target/pack/bin/scaladoc \
+  -d "$OUT1" \
+  -project "scaladoc testcases" \
+  -source-links:out/bootstrap/stdlib-bootstrapped/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/src_managed/main/scala-library-src=github://scala/scala/v"${STDLIB_VERSION}"#src/library \
+  -source-links:out/bootstrap/stdlib-bootstrapped/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/src_managed/main/dotty-library-src=github://"${GITHUB_REPOSITORY}"/"${GITHUB_SHA}"\#library/src \
+  -source-links:github://"${GITHUB_REPOSITORY}"/"${GITHUB_SHA}" \
+  "-external-mappings:.*scala/.*::scaladoc3::https://dotty.epfl.ch/api/,.*java/.*::javadoc::https://docs.oracle.com/javase/8/docs/api/" \
+  "-skip-by-regex:.+\.internal($|\..+)" \
+  "-skip-by-regex:.+\.impl($|\..+)" \
+  -project-logo docs/_assets/images/logo.svg \
+  -social-links:github::https://github.com/lampepfl/dotty,discord::https://discord.com/invite/scala,twitter::https://twitter.com/scala_lang \
+  -Ygenerate-inkuire \
+  "-skip-by-id:scala.runtime.stdLibPatches" \
+  "-skip-by-id:scala.runtime.MatchCase" \
+  "-snippet-compiler:scaladoc-testcases/docs=compile" \
+  -siteroot scaladoc-testcases/docs \
+  -project-footer "Copyright (c) 2002-2022, LAMP/EPFL" \
+  -default-template static-site-main \
+  -author -groups -revision main -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \
+  out/bootstrap/scaladoc-testcases/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts"
+diff -rq "$OUT1" "scaladoc/output/testcases"
diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests
index 37bb8bcb706e..6a175db23e99 100755
--- a/project/scripts/cmdTests
+++ b/project/scripts/cmdTests
@@ -7,7 +7,7 @@ echo "testing sbt scalac and scala"
 "$SBT" ";scalac $SOURCE -d $OUT ;scala -classpath $OUT $MAIN" > "$tmp"
 grep -qe "$EXPECTED_OUTPUT" "$tmp"
 
-# check that `sbt scalac` compiles and `sbt scala` runs it
+# check that `sbt scalac -from-tasty` compiles and `sbt scala` runs it
 echo "testing sbt scalac -from-tasty and scala -classpath"
 clear_out "$OUT"
 "$SBT" ";scalac $SOURCE -d $OUT ;scalac -from-tasty -d $OUT1 $OUT/$TASTY ;scala -classpath $OUT1 $MAIN" > "$tmp"
@@ -23,11 +23,17 @@ clear_out "$OUT"
 "$SBT" ";scalac $SOURCE ; scala $MAIN" > "$tmp"
 grep -qe "$EXPECTED_OUTPUT" "$tmp"
 
+echo "testing sbt scalac -print-tasty"
+clear_out "$OUT"
+"$SBT" ";scalac $SOURCE -d $OUT ;scalac -print-tasty -color:never $TASTY" > "$tmp"
+grep -qe "0: ASTs" "$tmp"
+grep -qe "0: tests/pos/HelloWorld.scala" "$tmp"
+
 echo "testing that paths SourceFile annotations are relativized"
 clear_out "$OUT"
 "$SBT" "scalac -d $OUT/out.jar -sourceroot tests/pos $(pwd)/tests/pos/i10430/lib.scala $(pwd)/tests/pos/i10430/app.scala"
-"$SBT" "scalac -decompile -print-tasty -color:never $OUT/out.jar" > "$tmp"
-cat "$tmp" # for debugging
+"$SBT" "scalac -print-tasty -color:never $OUT/out.jar" > "$tmp"
+# cat "$tmp" # for debugging
 grep -q ": i10430/lib.scala" "$tmp"
 grep -q ": i10430/app.scala" "$tmp"
 grep -q "[i10430/lib.scala]" "$tmp"
@@ -41,10 +47,6 @@ if grep -q "tests/pos/i10430/app.scala" "$tmp"; then
   exit 1
 fi
 
-echo "testing sbt scalac with suspension"
-clear_out "$OUT"
-"$SBT" "scala3-compiler-bootstrapped/scalac -d $OUT tests/pos-macros/macros-in-same-project-1/Bar.scala tests/pos-macros/macros-in-same-project-1/Foo.scala"  > "$tmp"
-
 # check that missing source file does not crash message rendering
 echo "testing that missing source file does not crash message rendering"
 clear_out "$OUT"
@@ -54,6 +56,7 @@ cp tests/neg/i6371/B_2.scala $OUT/B.scala
 "$SBT" "scalac $OUT/A.scala -d $OUT1"
 rm $OUT/A.scala
 "$SBT" "scalac -classpath $OUT1 -d $OUT1 $OUT/B.scala" > "$tmp" 2>&1 || echo "ok"
+cat "$tmp" # for debugging
 grep -qe "B.scala:2:7" "$tmp"
 grep -qe "This location contains code that was inlined from A.scala:3" "$tmp"
 
@@ -82,3 +85,5 @@ clear_out "$OUT"
 #     fi
 #   fi
 # done 3<"$tmp1" 4<"./tests/vulpix-tests/meta/sbt-output.check"
+
+echo "cmdTests successful"
diff --git a/project/scripts/cmdTestsCommon.inc.sh b/project/scripts/cmdTestsCommon.inc.sh
index dc81a3e35b52..a37ab757c057 100644
--- a/project/scripts/cmdTestsCommon.inc.sh
+++ b/project/scripts/cmdTestsCommon.inc.sh
@@ -1,6 +1,8 @@
 set -eux
 
-SBT="./project/scripts/sbt" # if run on CI
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/../.."
+
+SBT="$ROOT/project/scripts/sbt" # if run on CI
 # SBT="sbt" # if run locally
 
 SOURCE="tests/pos/HelloWorld.scala"
@@ -12,6 +14,11 @@ OUT=$(mktemp -d)
 OUT1=$(mktemp -d)
 tmp=$(mktemp)
 
+die () {
+    echo >&2 "$@"
+    exit 1
+}
+
 clear_out()
 {
   local out="$1"
diff --git a/project/scripts/genDocs b/project/scripts/genDocs
index d9ec3ef2f66b..aa061d59b613 100755
--- a/project/scripts/genDocs
+++ b/project/scripts/genDocs
@@ -19,7 +19,7 @@ mkdir -pv "$PREVIOUS_SNAPSHOTS_DIR"
 git remote add doc-remote "https://github.com/lampepfl/dotty-website.git"
 git fetch doc-remote gh-pages
 git checkout gh-pages
-(cp -vr 0.*/ "$PREVIOUS_SNAPSHOTS_DIR"; true)  # Don't fail if no `0.*` found to copy
+(cp -vr [03].*/ "$PREVIOUS_SNAPSHOTS_DIR"; true)  # Don't fail if no `3.*` found to copy
 git checkout "$GIT_HEAD"
 
 ### Generate the current snapshot of the website ###
diff --git a/project/scripts/is-version-published.sh b/project/scripts/is-version-published.sh
new file mode 100755
index 000000000000..0bb4c1f91a56
--- /dev/null
+++ b/project/scripts/is-version-published.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+# Check whether a specific version of the Scala 3 compiler is published to Maven Central
+#
+# Usage:
+#   is-version-published.sh <version_string>
+# e.g.
+#   ./is-version-published.sh 3.0.1-RC1-bin-20210413-f3c1468-NIGHTLY
+#
+# Exit status:
+#   zero      if the specified version is published on Maven Central
+#   non-zero  otherwise
+#
+# Notes:
+#   Will always say 'not yet published' for versions prior to 3.0.1-RC1-bin-20210413-f3c1468-NIGHTLY
+#   since the binary version scheme was changed at that point.
+
+ver=$1
+if [[ -z "$ver" ]]; then
+  echo "error: missing version parameter"
+  echo "usage: $0 <version_string>"
+  exit 2
+fi
+
+set -eu
+
+# binary version is everything up to the first dot
+binaryVersion="${ver%%.*}"
+
+artifactId="scala3-compiler_$binaryVersion"
+pom="$artifactId-$ver.pom"
+
+maven_url=https://repo1.maven.org/maven2/org/scala-lang/$artifactId/$ver/$pom
+
+echo "Checking whether $ver is published"
+echo "at $maven_url"
+echo ""
+
+if curl --head --fail -L "$maven_url" ; then
+  echo "Version $ver is already published."
+  exit 0
+else
+  echo "Version $ver is not yet published."
+  exit 10
+fi
diff --git a/project/scripts/winCmdTests.bat b/project/scripts/winCmdTests.bat
new file mode 100644
index 000000000000..ee9b8237c694
--- /dev/null
+++ b/project/scripts/winCmdTests.bat
@@ -0,0 +1,25 @@
+@echo off
+setlocal
+
+@rem paths are relative to the root project directory
+set "_PREFIX=dist\target\pack"
+set "_SOURCE=tests\pos\HelloWorld.scala"
+set "_OUT_DIR=out"
+set "_SITE_DIR=_site"
+
+@rem if-tests mimic the non-existing bash instruction 'set -e'.
+call "%_PREFIX%\bin\scalac.bat" "@project\scripts\options" "%_SOURCE%"
+if not %ERRORLEVEL%==0 endlocal& exit /b 1
+
+call "%_PREFIX%\bin\scalac.bat" -d "%_OUT_DIR%" "%_SOURCE%"
+if not %ERRORLEVEL%==0 endlocal& exit /b 1
+
+call "%_PREFIX%\bin\scala.bat" -classpath "%_OUT_DIR%" HelloWorld
+if not %ERRORLEVEL%==0 endlocal& exit /b 1
+
+call "%_PREFIX%\bin\scala.bat" -classpath "%_OUT_DIR%" -J-Xmx512m HelloWorld
+if not %ERRORLEVEL%==0 endlocal& exit /b 1
+
+if not exist "%_SITE_DIR%" mkdir "%_SITE_DIR%"
+call "%_PREFIX%\bin\scaladoc.bat" -d "%_SITE_DIR%" -project Hello "%_SOURCE%"
+endlocal
diff --git a/sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java b/sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java
index 8a7f3ae2d22e..12291120b157 100644
--- a/sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java
+++ b/sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java
@@ -29,13 +29,13 @@ public CompilerBridgeDriver(String[] scalacOptions, Output output) {
     super();
     this.scalacOptions = scalacOptions;
 
-    if (!output.getSingleOutput().isPresent())
+    if (!output.getSingleOutputAsPath().isPresent())
       throw new IllegalArgumentException("output should be a SingleOutput, was a " + output.getClass().getName());
 
     this.args = new String[scalacOptions.length + 2];
     System.arraycopy(scalacOptions, 0, args, 0, scalacOptions.length);
     args[scalacOptions.length] = "-d";
-    args[scalacOptions.length + 1] = output.getSingleOutput().get().getAbsolutePath();
+    args[scalacOptions.length + 1] = output.getSingleOutputAsPath().get().toAbsolutePath().toString();
   }
 
   private static final String StopInfoError =
@@ -91,10 +91,10 @@ public int compare(VirtualFile x0, VirtualFile x1) {
           callback.problem(problem.category(), problem.position(), problem.message(), problem.severity(),
             true);
         }
+      } else {  
+        delegate.printSummary();
       }
 
-      delegate.printSummary();
-
       if (delegate.hasErrors()) {
         log.debug(() -> "Compilation failed");
         throw new InterfaceCompileFailed(args, delegate.problems(), "Compilation failed");
diff --git a/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java b/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java
index da436aa75b5d..6bf161fafebf 100644
--- a/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java
+++ b/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java
@@ -3,10 +3,14 @@
  */
 package dotty.tools.xsbt;
 
+import scala.Tuple2;
+import scala.collection.mutable.HashMap;
+
 import dotty.tools.dotc.core.Contexts.Context;
 import dotty.tools.dotc.reporting.AbstractReporter;
 import dotty.tools.dotc.reporting.Diagnostic;
 import dotty.tools.dotc.reporting.Message;
+import dotty.tools.dotc.util.SourceFile;
 import dotty.tools.dotc.util.SourcePosition;
 import xsbti.Position;
 import xsbti.Severity;
@@ -30,11 +34,11 @@ public void printSummary(Context ctx) {
 
   public void doReport(Diagnostic dia, Context ctx) {
     Severity severity = severityOf(dia.level());
-    Position position = positionOf(dia.pos());
+    Position position = positionOf(dia.pos().nonInlined());
 
-    Message message = dia.msg();
     StringBuilder rendered = new StringBuilder();
-    rendered.append(messageAndPos(message, dia.pos(), diagnosticLevel(dia), ctx));
+    rendered.append(messageAndPos(dia, ctx));
+    Message message = dia.msg();
     boolean shouldExplain = Diagnostic.shouldExplain(dia, ctx);
     if (shouldExplain && !message.explanation().isEmpty()) {
       rendered.append(explanation(message, ctx));
@@ -62,4 +66,11 @@ private static Position positionOf(SourcePosition pos) {
       return PositionBridge.noPosition;
     }
   }
+
+  @SuppressWarnings("unchecked")
+  // [warn] sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java:18:1: dotty$tools$dotc$reporting$UniqueMessagePositions$$positions() in dotty.tools.dotc.reporting.AbstractReporter implements dotty$tools$dotc$reporting$UniqueMessagePositions$$positions() in dotty.tools.dotc.reporting.UniqueMessagePositions
+  // [warn]   return type requires unchecked conversion from scala.collection.mutable.HashMap to scala.collection.mutable.HashMap<scala.Tuple2<dotty.tools.dotc.util.SourceFile,java.lang.Integer>,dotty.tools.dotc.reporting.Diagnostic>
+  public HashMap<Tuple2<SourceFile, Integer>, Diagnostic> dotty$tools$dotc$reporting$UniqueMessagePositions$$positions() {
+    return (HashMap<Tuple2<SourceFile, Integer>, Diagnostic>) super.dotty$tools$dotc$reporting$UniqueMessagePositions$$positions();
+  }
 }
diff --git a/sbt-bridge/src/dotty/tools/xsbt/PositionBridge.java b/sbt-bridge/src/dotty/tools/xsbt/PositionBridge.java
index 2f20609578db..075efd5b53e6 100644
--- a/sbt-bridge/src/dotty/tools/xsbt/PositionBridge.java
+++ b/sbt-bridge/src/dotty/tools/xsbt/PositionBridge.java
@@ -39,6 +39,10 @@ public Optional<Integer> pointer() {
     public Optional<String> pointerSpace() {
       return Optional.empty();
     }
+
+    public String toString() {
+      return "";
+    }
   };
 
   public PositionBridge(SourcePosition pos, SourceFile src) {
@@ -116,4 +120,58 @@ public Optional<String> pointerSpace() {
       result.append(lineContent.charAt(i) == '\t' ? '\t' : ' ');
     return Optional.of(result.toString());
   }
+
+  @Override
+  public String toString() {
+      return pos.toString();
+  }
+  
+  @Override
+  public Optional<Integer> startOffset() {
+    if (src.content().length == 0)
+      return Optional.empty();
+    else
+      return Optional.of(pos.start());
+  }
+
+  @Override
+  public Optional<Integer> endOffset() {
+    if (src.content().length == 0)
+      return Optional.empty();
+    else
+      return Optional.of(pos.end());
+  }
+
+  @Override
+  public Optional<Integer> startLine() {
+    if (src.content().length == 0)
+      return Optional.empty();
+    else
+      return Optional.of(pos.startLine() + 1);
+  }
+
+  @Override
+  public Optional<Integer> endLine() {
+    if (src.content().length == 0)
+      return Optional.empty();
+    else
+      return Optional.of(pos.endLine() + 1);
+  }
+
+  @Override
+  public Optional<Integer> startColumn() {
+    if (src.content().length == 0)
+      return Optional.empty();
+    else
+      return Optional.of(pos.startColumn());
+  }
+
+  @Override
+  public Optional<Integer> endColumn() {
+    if (src.content().length == 0)
+      return Optional.empty();
+    else
+      return Optional.of(pos.endColumn());
+  }
+
 }
diff --git a/sbt-bridge/src/xsbt/CachedCompilerImpl.java b/sbt-bridge/src/xsbt/CachedCompilerImpl.java
index 8ade3bf4b994..0b876475e51e 100644
--- a/sbt-bridge/src/xsbt/CachedCompilerImpl.java
+++ b/sbt-bridge/src/xsbt/CachedCompilerImpl.java
@@ -14,6 +14,9 @@
 import dotty.tools.xsbt.InterfaceCompileFailed;
 import dotty.tools.xsbt.DelegatingReporter;
 
+// deprecation warnings are suppressed because scala3-sbt-bridge must stay compatible with Zinc 1.3
+// see https://github.com/lampepfl/dotty/issues/10816
+@SuppressWarnings("deprecation")
 public class CachedCompilerImpl implements CachedCompiler {
   private final String[] args;
   private final String[] outputArgs;
diff --git a/sbt-bridge/src/xsbt/CompilerInterface.java b/sbt-bridge/src/xsbt/CompilerInterface.java
index 9f09ebbdeb06..3f26036eee6d 100644
--- a/sbt-bridge/src/xsbt/CompilerInterface.java
+++ b/sbt-bridge/src/xsbt/CompilerInterface.java
@@ -25,7 +25,7 @@ public CachedCompiler newCompiler(String[] options, Output output, Logger initia
       initialLog.warn(() ->
         "The compiler class loader is badly configured.\n" +
         "Consider using a more recent version of your build tool:\n" +
-        " - sbt >= 1.4.0 and sbt-dotty >= 1.5.0\n" +
+        " - sbt >= 1.5.0\n" +
         " - Mill >= 0.9.3-21-002361\n" +
         " - Bloop >= 1.4.6-23-20a501bc"
       );
diff --git a/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala b/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala
index 0b580e1cb77a..d6cebbfe3cac 100644
--- a/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala
+++ b/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala
@@ -15,6 +15,16 @@ object CommunityBuildPlugin extends AutoPlugin {
   override def requires = plugins.JvmPlugin
   override def trigger = allRequirements
 
+  object autoImport {
+    val isForwardCompatProject = settingKey[Boolean]("Is it a project used for testing forward binary compatibility?")
+  }
+
+  import autoImport._
+
+  override val globalSettings: Seq[Setting[_]] = Seq(
+    isForwardCompatProject := false
+  )
+
   override val projectSettings: Seq[Setting[_]] = Seq(
     publishLocal := Def.taskDyn {
       val pubLocalResult = publishLocal.value
@@ -23,14 +33,30 @@ object CommunityBuildPlugin extends AutoPlugin {
           CommunityBuildDependencies.publish(projectID.value)
         pubLocalResult
       }
-    }.value
+    }.value,
+    projectID := {
+      val id = projectID.value
+      if (isForwardCompatProject.value) {
+        val revision = if (id.revision.endsWith("-SNAPSHOT"))
+          id.revision.replace("-SNAPSHOT", "-forward-compat-SNAPSHOT")
+        else
+          id.revision + "-forward-compat"
+        id.withRevision(revision)
+      } else
+        id
+    }
   )
 
   override val buildSettings: Seq[Setting[_]] = Seq(
     dependencyOverrides ++= {
-      if (scalaVersion.value.startsWith("3."))
-        CommunityBuildDependencies.allOverrides(sLog.value)
-      else Nil
+      if (scalaVersion.value.startsWith("3.")) {
+        val forwardCompatFilter: ModuleID => Boolean = if (isForwardCompatProject.value) (_.revision.contains("-forward-compat")) else (!_.revision.contains("-forward-compat"))
+        val stdlibOverrides = Seq(
+          scalaOrganization.value %% "scala3-library" % scalaVersion.value,
+          scalaOrganization.value %% "scala3-library_sjs1" % scalaVersion.value
+        )
+        CommunityBuildDependencies.allOverrides(sLog.value).filter(forwardCompatFilter) ++ stdlibOverrides
+      } else Nil
     }
   )
 }
diff --git a/sbt-dotty/sbt-test/compilerReporter/i7442/project/Reporter.scala b/sbt-dotty/sbt-test/compilerReporter/i7442/project/Reporter.scala
deleted file mode 100644
index 1ccf1a8b914b..000000000000
--- a/sbt-dotty/sbt-test/compilerReporter/i7442/project/Reporter.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-import sbt._
-import Keys._
-import KeyRanks.DTask
-
-object Reporter {
-  import xsbti.{Reporter, Problem, Position, Severity}
-
-  lazy val check = TaskKey[Unit]("check", "make sure compilation info are forwared to sbt")
-
-  // compilerReporter is marked private in sbt
-  lazy val compilerReporter = TaskKey[xsbti.Reporter]("compilerReporter", "Experimental hook to listen (or send) compilation failure messages.", DTask)
-
-  lazy val reporter =
-    new xsbti.Reporter {
-      private val buffer = collection.mutable.ArrayBuffer.empty[Problem]
-      def reset(): Unit = buffer.clear()
-      def hasErrors: Boolean = buffer.exists(_.severity == Severity.Error)
-      def hasWarnings: Boolean = buffer.exists(_.severity == Severity.Warn)
-      def printSummary(): Unit = println(problems.mkString(System.lineSeparator))
-      def problems: Array[Problem] = buffer.toArray
-      def log(problem: Problem): Unit = buffer.append(problem)
-      def comment(pos: xsbti.Position, msg: String): Unit = ()
-    }
-
-  lazy val checkSettings = Seq(
-    Compile / compile / compilerReporter := reporter,
-    check := (compile in Compile).failure.map(_ => {
-      println(reporter.problems.toList)
-      assert(reporter.problems.length == 1)
-      val problem = reporter.problems.head
-      // Check that all methods on position can ba called without crashing
-      val pos = problem.position
-      println(pos.sourceFile)
-      println(pos.sourcePath)
-      println(pos.line)
-      println(pos.lineContent)
-      println(pos.offset)
-      println(pos.pointer)
-      println(pos.pointerSpace)
-    }).value
-  )
-}
diff --git a/sbt-dotty/sbt-test/compilerReporter/i7442/project/plugins.sbt b/sbt-dotty/sbt-test/compilerReporter/i7442/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/compilerReporter/i7442/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/compilerReporter/simple/project/Reporter.scala b/sbt-dotty/sbt-test/compilerReporter/simple/project/Reporter.scala
deleted file mode 100644
index 632219cd10e2..000000000000
--- a/sbt-dotty/sbt-test/compilerReporter/simple/project/Reporter.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-import sbt._
-import Keys._
-import KeyRanks.DTask
-
-object Reporter {
-  import xsbti.{Reporter, Problem, Position, Severity}
-
-  lazy val check = TaskKey[Unit]("check", "make sure compilation info are forwared to sbt")
-
-  // compilerReporter is marked private in sbt
-  lazy val compilerReporter = TaskKey[xsbti.Reporter]("compilerReporter", "Experimental hook to listen (or send) compilation failure messages.", DTask)
-
-  lazy val reporter =
-    new xsbti.Reporter {
-      private val buffer = collection.mutable.ArrayBuffer.empty[Problem]
-      def reset(): Unit = buffer.clear()
-      def hasErrors: Boolean = buffer.exists(_.severity == Severity.Error)
-      def hasWarnings: Boolean = buffer.exists(_.severity == Severity.Warn)
-      def printSummary(): Unit = println(problems.mkString(System.lineSeparator))
-      def problems: Array[Problem] = buffer.toArray
-      def log(problem: Problem): Unit = buffer.append(problem)
-      def comment(pos: xsbti.Position, msg: String): Unit = ()
-    }
-
-  lazy val checkSettings = Seq(
-    Compile / compile / compilerReporter := reporter,
-    check := (compile in Compile).failure.map(_ => {
-      val problems = reporter.problems
-      println(problems.toList)
-      assert(problems.size == 1)
-
-      // make sure position reported by zinc are proper
-      val mainProblem = problems.head
-
-      val line = mainProblem.position().line()
-      assert(line.isPresent() == true)
-      assert(line.get() == 9)
-
-      val pointer = mainProblem.position().pointer()
-      assert(pointer.isPresent() == true)
-      assert(pointer.get() == 10)
-
-      assert(problems.forall(_.position.offset.isPresent))
-
-      assert(problems.count(_.severity == Severity.Error) == 1) // not found: er1,
-    }).value
-  )
-}
diff --git a/sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt b/sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/discovery/test-discovery/project/plugins.sbt b/sbt-dotty/sbt-test/discovery/test-discovery/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/discovery/test-discovery/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties b/sbt-dotty/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties
deleted file mode 100644
index a919a9b5f46b..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-sbt.version=1.3.8
diff --git a/sbt-dotty/sbt-test/sbt-dotty/example-project/build.sbt b/sbt-dotty/sbt-test/sbt-dotty/example-project/build.sbt
deleted file mode 100644
index 4949483897d9..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/example-project/build.sbt
+++ /dev/null
@@ -1,4 +0,0 @@
-scalaVersion := sys.props("plugin.scalaVersion")
-
-libraryDependencies +=
-("org.scala-lang.modules" %% "scala-xml" % "1.2.0").withDottyCompat(scalaVersion.value)
diff --git a/sbt-dotty/sbt-test/sbt-dotty/example-project/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/example-project/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/example-project/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/sbt-dotty/i7897/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/i7897/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/i7897/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scala2/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/scala2/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/scala2/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/build.sbt b/sbt-dotty/sbt-test/sbt-dotty/scaladoc/build.sbt
deleted file mode 100644
index 87e6de42040f..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/build.sbt
+++ /dev/null
@@ -1,15 +0,0 @@
-scalaVersion := sys.props("plugin.scalaVersion")
-
-TaskKey[Unit]("assertUsingScaladoc") := {
-  assert(useScaladoc.value)
-}
-
-TaskKey[Unit]("checkScaladocOptions") := {
-  val options = (Compile / doc / scalacOptions).value
-  assert(options.count(_ == "-project") == 1)
-}
-
-TaskKey[Unit]("checkHtmlFiles") := {
-  val helloHtml = (Compile / doc / target).value / "api" / "hello.html"
-  assert(helloHtml.exists)
-}
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/scaladoc/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/test b/sbt-dotty/sbt-test/sbt-dotty/scaladoc/test
deleted file mode 100644
index 58bf06a4c940..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/test
+++ /dev/null
@@ -1,4 +0,0 @@
-> assertUsingScaladoc
-> checkScaladocOptions
-> doc
-> checkHtmlFiles
diff --git a/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/scala2-compat/akka/build.sbt b/sbt-dotty/sbt-test/scala2-compat/akka/build.sbt
deleted file mode 100644
index 296e8e082fed..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/akka/build.sbt
+++ /dev/null
@@ -1,8 +0,0 @@
-scalaVersion := sys.props("plugin.scalaVersion")
-
-libraryDependencies ++= {
-  Seq(
-    ("com.typesafe.akka" %% "akka-http"   % "10.1.10"),
-    ("com.typesafe.akka" %% "akka-stream" % "2.6.0")
-  ).map(_.withDottyCompat(scalaVersion.value))
-}
diff --git a/sbt-dotty/sbt-test/scala2-compat/akka/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/akka/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/akka/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/scala2-compat/eff/build.sbt b/sbt-dotty/sbt-test/scala2-compat/eff/build.sbt
deleted file mode 100644
index 953439793ce9..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/eff/build.sbt
+++ /dev/null
@@ -1,4 +0,0 @@
-scalaVersion := sys.props("plugin.scalaVersion")
-
-libraryDependencies +=
-   ("org.atnos" %% "eff" % "5.5.2").withDottyCompat(scalaVersion.value)
diff --git a/sbt-dotty/sbt-test/scala2-compat/eff/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/eff/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/eff/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/scala2-compat/erasure-scalajs/build.sbt b/sbt-dotty/sbt-test/scala2-compat/erasure-scalajs/build.sbt
deleted file mode 100644
index 6f30dbadc25b..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/erasure-scalajs/build.sbt
+++ /dev/null
@@ -1,15 +0,0 @@
-lazy val scala2Lib = project.in(file("scala2Lib"))
-  .enablePlugins(ScalaJSPlugin)
-  .settings(
-    scalaVersion := "2.13.5"
-  )
-
-lazy val dottyApp = project.in(file("dottyApp"))
-  .dependsOn(scala2Lib)
-  .enablePlugins(ScalaJSPlugin)
-  .settings(
-    scalaVersion := sys.props("plugin.scalaVersion"),
-
-    scalaJSUseMainModuleInitializer := true,
-    scalaJSLinkerConfig ~= (_.withCheckIR(true)),
-  )
diff --git a/sbt-dotty/sbt-test/scala2-compat/erasure-scalajs/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/erasure-scalajs/project/plugins.sbt
deleted file mode 100644
index f69df9c39cc7..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/erasure-scalajs/project/plugins.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion"))
diff --git a/sbt-dotty/sbt-test/scala2-compat/erasure/build.sbt b/sbt-dotty/sbt-test/scala2-compat/erasure/build.sbt
deleted file mode 100644
index 794d78b308c0..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/erasure/build.sbt
+++ /dev/null
@@ -1,10 +0,0 @@
-lazy val scala2Lib = project.in(file("scala2Lib"))
-  .settings(
-    scalaVersion := "2.13.5"
-  )
-
-lazy val dottyApp = project.in(file("dottyApp"))
-  .dependsOn(scala2Lib)
-  .settings(
-    scalaVersion := sys.props("plugin.scalaVersion")
-  )
diff --git a/sbt-dotty/sbt-test/scala2-compat/erasure/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/erasure/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/erasure/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/scala2-compat/i8001/build.sbt b/sbt-dotty/sbt-test/scala2-compat/i8001/build.sbt
deleted file mode 100644
index 27c7d9ea9b3c..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/i8001/build.sbt
+++ /dev/null
@@ -1,11 +0,0 @@
-val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
-
-lazy val lib = (project in file ("lib"))
-  .settings(scalaVersion := scala2Version)
-
-lazy val test = (project in file ("main"))
-  .dependsOn(lib)
-  .settings(
-    scalaVersion := scala3Version
-  )
diff --git a/sbt-dotty/sbt-test/scala2-compat/i8001/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/i8001/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/i8001/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/scala2-compat/i8847/build.sbt b/sbt-dotty/sbt-test/scala2-compat/i8847/build.sbt
deleted file mode 100644
index 6a579f2be966..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/i8847/build.sbt
+++ /dev/null
@@ -1,11 +0,0 @@
-val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
-
-lazy val `i8847-lib` = (project in file ("lib"))
-  .settings(scalaVersion := scala2Version)
-
-lazy val `i8847-test` = (project in file ("main"))
-  .dependsOn(`i8847-lib`)
-  .settings(
-    scalaVersion := scala3Version
-  )
diff --git a/sbt-dotty/sbt-test/scala2-compat/i8847/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/i8847/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/i8847/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916a/build.sbt b/sbt-dotty/sbt-test/scala2-compat/i9916a/build.sbt
deleted file mode 100644
index 1f5c07900161..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/i9916a/build.sbt
+++ /dev/null
@@ -1,11 +0,0 @@
-val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
-
-lazy val `i9916a-lib` = (project in file ("lib"))
-  .settings(scalaVersion := scala2Version)
-
-lazy val `i9916a-test` = (project in file ("main"))
-  .dependsOn(`i9916a-lib`)
-  .settings(
-    scalaVersion := scala3Version
-  )
diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916a/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/i9916a/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/i9916a/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916b/build.sbt b/sbt-dotty/sbt-test/scala2-compat/i9916b/build.sbt
deleted file mode 100644
index f597a8610607..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/i9916b/build.sbt
+++ /dev/null
@@ -1,11 +0,0 @@
-val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
-
-lazy val `i9916b-lib` = (project in file ("lib"))
-  .settings(scalaVersion := scala2Version)
-
-lazy val `i9916b-test` = (project in file ("main"))
-  .dependsOn(`i9916b-lib`)
-  .settings(
-    scalaVersion := scala3Version
-  )
diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916b/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/i9916b/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/i9916b/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/scala2-compat/longnames/build.sbt b/sbt-dotty/sbt-test/scala2-compat/longnames/build.sbt
deleted file mode 100644
index 61d8f34cd5f6..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/longnames/build.sbt
+++ /dev/null
@@ -1,9 +0,0 @@
-val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
-
-lazy val lib = (project in file ("lib"))
-  .settings(scalaVersion := scala2Version)
-
-lazy val test = (project in file ("main"))
-  .dependsOn(lib)
-  .settings(scalaVersion := scala3Version)
diff --git a/sbt-dotty/sbt-test/scala2-compat/longnames/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/longnames/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/longnames/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/scala2-compat/structural/build.sbt b/sbt-dotty/sbt-test/scala2-compat/structural/build.sbt
deleted file mode 100644
index 61d8f34cd5f6..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/structural/build.sbt
+++ /dev/null
@@ -1,9 +0,0 @@
-val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
-
-lazy val lib = (project in file ("lib"))
-  .settings(scalaVersion := scala2Version)
-
-lazy val test = (project in file ("main"))
-  .dependsOn(lib)
-  .settings(scalaVersion := scala3Version)
diff --git a/sbt-dotty/sbt-test/scala2-compat/structural/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/structural/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/scala2-compat/structural/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/scalajs/basic/build.sbt b/sbt-dotty/sbt-test/scalajs/basic/build.sbt
deleted file mode 100644
index 53f8bc4e52e6..000000000000
--- a/sbt-dotty/sbt-test/scalajs/basic/build.sbt
+++ /dev/null
@@ -1,8 +0,0 @@
-enablePlugins(ScalaJSPlugin)
-
-scalaVersion := sys.props("plugin.scalaVersion")
-
-// Test withDottyCompat for %%% dependencies
-libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").withDottyCompat(scalaVersion.value)
-
-scalaJSUseMainModuleInitializer := true
diff --git a/sbt-dotty/sbt-test/scalajs/basic/project/plugins.sbt b/sbt-dotty/sbt-test/scalajs/basic/project/plugins.sbt
deleted file mode 100644
index f69df9c39cc7..000000000000
--- a/sbt-dotty/sbt-test/scalajs/basic/project/plugins.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion"))
diff --git a/sbt-dotty/sbt-test/scalajs/basic/test b/sbt-dotty/sbt-test/scalajs/basic/test
deleted file mode 100644
index 62ea636c177f..000000000000
--- a/sbt-dotty/sbt-test/scalajs/basic/test
+++ /dev/null
@@ -1 +0,0 @@
-> run
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-override/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/abstract-override/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/abstract-override/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/added/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/added/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/added/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/binary/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/binary/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/binary/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/by-name/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/by-name/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/by-name/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/canon/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/canon/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/canon/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-classes/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/check-classes/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/check-classes/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-dependencies/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/check-dependencies/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/check-dependencies/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-products/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/check-products/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/check-products/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-recompilations/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/check-recompilations/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/check-recompilations/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/compactify/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/compactify/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/compactify/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/constants/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/constants/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/constants/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/continuations/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/continuations/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/continuations/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/cross-source/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/cross-source/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/cross-source/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/default-params/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/default-params/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/default-params/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/dup-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/dup-class/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/dup-class/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/empty-a/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/empty-a/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-modified-names/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/empty-modified-names/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/empty-modified-names/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-package/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/empty-package/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/empty-package/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/erasure/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/erasure/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/erasure/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/export-clauses/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/export-clauses/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/export-jars/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/export-jars/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars2/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/export-jars2/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/export-jars2/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/false-error/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/false-error/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/false-error/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/implicit/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/import-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/import-class/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/import-class/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/import-package/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/import-package/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/import-package/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inline-inherited/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inline/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/inline/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inner-class/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/inner-class/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-object/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inner-object/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/inner-object/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-anonymous/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-anonymous/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/java-anonymous/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-basic/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-basic/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/java-basic/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-enum/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-enum/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/java-enum/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-inner/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-inner/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/java-inner/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-lambda-typeparams/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-lambda-typeparams/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/java-lambda-typeparams/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-name-with-dollars/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-name-with-dollars/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/java-name-with-dollars/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-static/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-static/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/java-static/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/linearization/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/linearization/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/malformed-class-name/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/missing-annot/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/missing-annot/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/missing-annot/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/named/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/named/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/named/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/nested-type-params/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/override/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/override/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/override/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-implicit/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/package-object-implicit/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/package-object-implicit/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-name/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/package-object-name/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/package-object-name/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-nested-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/package-object-nested-class/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/package-object-nested-class/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-change/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/parent-change/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/parent-change/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-private-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/pkg-private-class/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/pkg-private-class/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/qualified-access/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/qualified-access/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/qualified-access/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/recorded-products/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/recorded-products/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/recorded-products/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/resident-java/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/resident-java/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/sealed/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/sealed/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/sealed/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/signature-change/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/signature-change/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/signature-change/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/specialized/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/specialized/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/specialized/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/stability-change/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/stability-change/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/stability-change/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-projection/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/struct-projection/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/struct-projection/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-usage/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/struct-usage/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/struct-usage/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/struct/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/struct/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-val/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-private-val/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/trait-private-val/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-super/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-super/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/trait-super/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-class/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/transitive-class/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-alias/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/type-alias/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/type-alias/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeargref/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/typeargref/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/typeargref/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/unexpanded-names/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/unexpanded-names/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/unexpanded-names/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/pending b/sbt-dotty/sbt-test/source-dependencies/value-class/pending
deleted file mode 100644
index a22df3dd1789..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/value-class/pending
+++ /dev/null
@@ -1,52 +0,0 @@
-## This failing test is pending because it will be solved by removing sbt-dotty
-
-## Case 1: value class as parameter of method
-$ copy-file changes/A0.scala src/main/scala/A.scala
-$ copy-file changes/B0.scala src/main/scala/B.scala
-$ copy-file changes/C0.scala src/main/scala/C.scala
-
-# A is a normal class. B.foo accepts a parameter of type A. C calls B.foo, giving it `null`.
-> compile
-> run
-
-# Make A a value class.
-$ copy-file changes/A1.scala src/main/scala/A.scala
-
-# The code no longer compiles because B.foo no longer accepts `null` as an argument.
-# This means that we have invalidated C.scala, as expected!
--> compile
-
-
-## Case 2: value class as return type of method with no parameter lists
-$ copy-file changes/A0.scala src/main/scala/A.scala
-$ copy-file changes/B1.scala src/main/scala/B.scala
-$ copy-file changes/C1.scala src/main/scala/C.scala
-
-# A is a normal class. B.bar takes no arguments and returns an instance of A. C calls B.bar.
-> compile
-> run
-
-# Make A a value class.
-$ copy-file changes/A1.scala src/main/scala/A.scala
-
-# The code compiles. It will run iff C is recompiled because the signature of B.bar has changed,
-# because A is now a value class.
-> run
-
-
-## Case 3: value class as return type of method with multiple parameter lists
-$ copy-file changes/A0.scala src/main/scala/A.scala
-$ copy-file changes/B2.scala src/main/scala/B.scala
-$ copy-file changes/C2.scala src/main/scala/C.scala
-
-# A is a normal class. B.bar takes two dummy arguments and returns an instance of A. C calls B.bar("")("").
-> compile
-> run
-
-# Make A a value class.
-$ copy-file changes/A1.scala src/main/scala/A.scala
-
-# The code compiles. It will run iff C is recompiled because the signature of B.bar has changed,
-# because A is now a value class.
-> run
-
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/value-class/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/value-class/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/var/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/var/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/var/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/source-dependencies/variance/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/variance/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/source-dependencies/variance/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-overload/project/plugins.sbt b/sbt-dotty/sbt-test/tasty-compat/add-overload/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/tasty-compat/add-overload/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-override/project/plugins.sbt b/sbt-dotty/sbt-test/tasty-compat/add-override/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/tasty-compat/add-override/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/project/plugins.sbt b/sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/tasty-compat/change-refinement/project/plugins.sbt b/sbt-dotty/sbt-test/tasty-compat/change-refinement/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/tasty-compat/change-refinement/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/tasty-compat/move-method/project/plugins.sbt b/sbt-dotty/sbt-test/tasty-compat/move-method/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/tasty-compat/move-method/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-override/project/plugins.sbt b/sbt-dotty/sbt-test/tasty-compat/remove-override/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/tasty-compat/remove-override/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-refinement/project/plugins.sbt b/sbt-dotty/sbt-test/tasty-compat/remove-refinement/project/plugins.sbt
deleted file mode 100644
index c17caab2d98c..000000000000
--- a/sbt-dotty/sbt-test/tasty-compat/remove-refinement/project/plugins.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
diff --git a/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala b/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala
deleted file mode 100644
index e8e4b437de23..000000000000
--- a/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala
+++ /dev/null
@@ -1,638 +0,0 @@
-package dotty.tools.sbtplugin
-
-import sbt._
-import sbt.Def.Initialize
-import sbt.Keys._
-import sbt.librarymanagement.{
-  ivy, DependencyResolution, ScalaModuleInfo, SemanticSelector, UpdateConfiguration, UnresolvedWarningConfiguration,
-  VersionNumber
-}
-import sbt.internal.inc.ScalaInstance
-import sbt.internal.inc.classpath.ClassLoaderCache
-import xsbti.compile._
-import xsbti.AppConfiguration
-import java.net.URLClassLoader
-import java.util.Optional
-import java.util.{Enumeration, Collections}
-import java.net.URL
-import scala.util.Properties.isJavaAtLeast
-
-
-object DottyPlugin extends AutoPlugin {
-  object autoImport {
-    val isDotty = settingKey[Boolean]("Is this project compiled with Dotty?")
-    val isDottyJS = settingKey[Boolean]("Is this project compiled with Dotty and Scala.js?")
-
-    val useScaladoc = settingKey[Boolean]("Use scaladoc as the documentation tool")
-    val useScala3doc = useScaladoc
-    val tastyFiles = taskKey[Seq[File]]("List all testy files")
-
-    // NOTE:
-    // - this is a def to support `scalaVersion := dottyLatestNightlyBuild`
-    // - if this was a taskKey, then you couldn't do `scalaVersion := dottyLatestNightlyBuild`
-    // - if this was a settingKey, then this would evaluate even if you don't use it.
-    def dottyLatestNightlyBuild(): Option[String] = {
-      import scala.io.Source
-
-      println("Fetching latest Dotty nightly version...")
-
-      val nightly = try {
-        // get majorVersion from dotty.epfl.ch
-        val source0 = Source.fromURL("https://dotty.epfl.ch/versions/latest-nightly-base")
-        val majorVersionFromWebsite = source0.getLines().toSeq.head
-        source0.close()
-
-        // get latest nightly version from maven
-        def fetchSource(version: String): (scala.io.BufferedSource, String) =
-          try {
-            val url =
-              if (version.startsWith("0"))
-                s"https://repo1.maven.org/maven2/ch/epfl/lamp/dotty-compiler_$version/maven-metadata.xml"
-              else
-                s"https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_$version/maven-metadata.xml"
-            Source.fromURL(url) -> version
-          }
-          catch { case t: java.io.FileNotFoundException =>
-            val major :: minor :: Nil = version.split('.').toList
-            if (minor.toInt <= 0) throw t
-            else fetchSource(s"$major.${minor.toInt - 1}")
-          }
-        val (source1, majorVersion) = fetchSource(majorVersionFromWebsite)
-        val Version = s"      <version>($majorVersion.*-bin.*)</version>".r
-        val nightly = source1
-          .getLines()
-          .collect { case Version(version) => version }
-          .toSeq
-          .lastOption
-        source1.close()
-        nightly
-      } catch {
-        case _:java.net.UnknownHostException =>
-          None
-      }
-
-      nightly match {
-        case Some(version) =>
-          println(s"Latest Dotty nightly build version: $version")
-        case None =>
-          println(s"Unable to get Dotty latest nightly build version. Make sure you are connected to internet")
-      }
-
-      nightly
-    }
-
-    implicit class DottyCompatModuleID(moduleID: ModuleID) {
-      /** If this ModuleID cross-version is a Dotty version, replace it
-       *  by the Scala 2.x version that the Dotty version is retro-compatible with,
-       *  otherwise do nothing.
-       *
-       *  This setting is useful when your build contains dependencies that have only
-       *  been published with Scala 2.x, if you have:
-       *  {{{
-       *  libraryDependencies += "a" %% "b" % "c"
-       *  }}}
-       *  you can replace it by:
-       *  {{{
-       *  libraryDependencies += ("a" %% "b" % "c").withDottyCompat(scalaVersion.value)
-       *  }}}
-       *  This will have no effect when compiling with Scala 2.x, but when compiling
-       *  with Dotty this will change the cross-version to a Scala 2.x one. This
-       *  works because Dotty is currently retro-compatible with Scala 2.x.
-       *
-       *  NOTE: As a special-case, the cross-version of scala3-library and scala3-compiler
-       *  will never be rewritten because we know that they're Scala 3 only.
-       *  This makes it possible to do something like:
-       *  {{{
-       *  libraryDependencies ~= (_.map(_.withDottyCompat(scalaVersion.value)))
-       *  }}}
-       */
-      def withDottyCompat(scalaVersion: String): ModuleID = {
-        val name = moduleID.name
-        if (name != "scala3-library" && name != "scala3-compiler" &&
-            name != "dotty" && name != "dotty-library" && name != "dotty-compiler")
-          moduleID.crossVersion match {
-            case binary: librarymanagement.Binary =>
-              val compatVersion =
-                CrossVersion.partialVersion(scalaVersion) match {
-                  case Some((3, _)) =>
-                    "2.13"
-                  case Some((0, minor)) =>
-                    if (minor > 18 || scalaVersion.startsWith("0.18.1"))
-                      "2.13"
-                    else
-                      "2.12"
-                  case _ =>
-                    ""
-                }
-              if (compatVersion.nonEmpty)
-                moduleID.cross(CrossVersion.constant(binary.prefix + compatVersion + binary.suffix))
-              else
-                moduleID
-            case _ =>
-              moduleID
-          }
-        else
-          moduleID
-      }
-    }
-  }
-
-  import autoImport._
-
-  override def requires: Plugins = plugins.JvmPlugin
-  override def trigger = allRequirements
-
-  /** Patches the IncOptions so that .tasty files are pruned as needed.
-   *
-   *  This code is adapted from `scalaJSPatchIncOptions` in Scala.js, which needs
-   *  to do the exact same thing but for .sjsir files.
-   *
-   *  This complicated logic patches the ClassfileManager factory of the given
-   *  IncOptions with one that is aware of .tasty files emitted by the Dotty
-   *  compiler. This makes sure that, when a .class file must be deleted, the
-   *  corresponding .tasty file is also deleted.
-   *
-   *  To support older versions of dotty, this also takes care of .hasTasty
-   *  files, although they are not used anymore.
-   */
-  def dottyPatchIncOptions(incOptions: IncOptions): IncOptions = {
-    val tastyFileManager = new TastyFileManager
-
-    // Once sbt/zinc#562 is fixed, can be:
-    // val newExternalHooks =
-    //   incOptions.externalHooks.withExternalClassFileManager(tastyFileManager)
-    val inheritedHooks = incOptions.externalHooks
-    val external = Optional.of(tastyFileManager: ClassFileManager)
-    val prevManager = inheritedHooks.getExternalClassFileManager
-    val fileManager: Optional[ClassFileManager] =
-      if (prevManager.isPresent) Optional.of(WrappedClassFileManager.of(prevManager.get, external))
-      else external
-    val newExternalHooks = new DefaultExternalHooks(inheritedHooks.getExternalLookup, fileManager)
-
-    incOptions.withExternalHooks(newExternalHooks)
-  }
-
-  override val globalSettings: Seq[Def.Setting[_]] = Seq(
-    Global / onLoad := (Global / onLoad).value.andThen { state =>
-
-      val requiredVersion = ">=1.4.4"
-
-      val sbtV = sbtVersion.value
-      if (!VersionNumber(sbtV).matchesSemVer(SemanticSelector(requiredVersion)))
-        sys.error(s"The sbt-dotty plugin cannot work with this version of sbt ($sbtV), sbt $requiredVersion is required.")
-
-      val deprecatedVersion = ">=1.5.0-RC2"
-      val logger = sLog.value
-      if (VersionNumber(sbtV).matchesSemVer(SemanticSelector(deprecatedVersion)))
-        logger.warn(s"The sbt-dotty plugin is no longer neeeded with sbt >= 1.5, please remove it from your build.")
-
-      state
-    }
-  )
-
-  // https://github.com/sbt/sbt/issues/3110
-  val Def = sbt.Def
-
-  private def scala3Artefact(version: String, name: String) =
-    if (version.startsWith("0.")) s"dotty-$name"
-    else if (version.startsWith("3.")) s"scala3-$name"
-    else throw new RuntimeException(
-      s"Cannot construct a Scala 3 artefact name $name for a non-Scala3 " +
-      s"scala version ${version}")
-
-  override def projectSettings: Seq[Setting[_]] = {
-    Seq(
-      isDotty := scalaVersion.value.startsWith("0.") || scalaVersion.value.startsWith("3."),
-
-      /* The way the integration with Scala.js works basically assumes that the settings of ScalaJSPlugin
-       * will be applied before those of DottyPlugin. It seems to be the case in the tests I did, perhaps
-       * because ScalaJSPlugin is explicitly enabled, while DottyPlugin is triggered. However, I could
-       * not find an authoritative source on the topic.
-       *
-       * There is an alternative implementation that would not have that assumption: it would be to have
-       * another DottyJSPlugin, that would be auto-triggered by the presence of *both* DottyPlugin and
-       * ScalaJSPlugin. That plugin would be guaranteed to have its settings be applied after both of them,
-       * by the documented rules. However, that would require sbt-dotty to depend on sbt-scalajs to be
-       * able to refer to ScalaJSPlugin.
-       *
-       * When the logic of sbt-dotty moves to sbt itself, the logic specific to the Dotty-Scala.js
-       * combination will have to move to sbt-scalajs. Doing so currently wouldn't work since we
-       * observe that the settings of DottyPlugin are applied after ScalaJSPlugin, so ScalaJSPlugin
-       * wouldn't be able to fix up things like the dependency on dotty-library.
-       */
-      isDottyJS := {
-        isDotty.value && (crossVersion.value match {
-          case binary: librarymanagement.Binary => binary.prefix.contains("sjs1_")
-          case _                                => false
-        })
-      },
-
-      scalaOrganization := {
-        if (scalaVersion.value.startsWith("0."))
-          "ch.epfl.lamp"
-        else if (scalaVersion.value.startsWith("3."))
-          "org.scala-lang"
-        else
-          scalaOrganization.value
-      },
-
-      Compile / incOptions := {
-        val inc = (Compile / incOptions).value
-        if (isDotty.value)
-          dottyPatchIncOptions(inc)
-        else
-          inc
-      },
-
-      scalaCompilerBridgeBinaryJar := Def.settingDyn {
-        if (isDotty.value) Def.task {
-          val updateReport = fetchArtifactsOf(
-            scalaOrganization.value % scala3Artefact(scalaVersion.value, "sbt-bridge") % scalaVersion.value,
-            dependencyResolution.value,
-            scalaModuleInfo.value,
-            updateConfiguration.value,
-            (update / unresolvedWarningConfiguration).value,
-            streams.value.log,
-          )
-          Option(getJar(updateReport, scalaOrganization.value, scala3Artefact(scalaVersion.value, "sbt-bridge"), scalaVersion.value))
-        }
-        else Def.task {
-          None: Option[File]
-        }
-      }.value,
-
-      // Prevent the consoleProject task from using the Scala 3 compiler bridge
-      // The consoleProject must load the Scala 2.12 instance and the sbt classpath
-      consoleProject / scalaCompilerBridgeBinaryJar := None,
-
-      // Needed for RCs publishing
-      scalaBinaryVersion := {
-        scalaVersion.value.split("[\\.-]").toList match {
-          case "0" :: minor :: _ => s"0.$minor"
-          case "3" :: "0" :: "0" :: milestone :: _ =>
-            s"3.0.0-$milestone"
-          case "3" :: _ =>
-            "3"
-          case _ => scalaBinaryVersion.value
-        }
-      },
-
-      // We want:
-      //
-      // 1. Nothing but the Java standard library on the _JVM_ bootclasspath
-      //    (starting with Java 9 we cannot inspect it so we don't have a choice)
-      //
-      // 2. scala-library, dotty-library, dotty-compiler and its dependencies on the _JVM_
-      //    classpath, because we need all of those to actually run the compiler.
-      //    NOTE: All of those should have the *same version* (equal to scalaVersion
-      //    for everything but scala-library).
-      //    (Complication: because dottydoc is a separate artifact with its own dependencies,
-      //     running it requires putting extra dependencies on the _JVM_ classpath)
-      //
-      // 3. scala-library, dotty-library on the _compiler_ bootclasspath or
-      //    classpath (the only difference between them is that the compiler
-      //    bootclasspath has higher priority, but that should never
-      //    make a difference in a sane environment).
-      //    NOTE: the versions of {scala,dotty}-library used here do not necessarily
-      //    match the one used in 2. because a dependency of the current project might
-      //    require a more recent standard library version, this is OK
-      //    TODO: ... but if macros are used we might be forced to use the same
-      //    versions in the JVM and compiler classpaths to avoid problems, this
-      //    needs to be investigated.
-      //
-      // 4. every other dependency of the user project on the _compiler_
-      //    classpath.
-      //
-      // By default, zinc will put on the compiler bootclasspath the
-      // scala-library used on the JVM classpath, even if the current project
-      // transitively depends on a newer scala-library (this works because Scala
-      // 2 guarantees forward- and backward- binary compatibility, but we don't
-      // necessarily want to keep doing that in Scala 3).
-      // So for the moment, let's just put nothing at all on the compiler
-      // bootclasspath, and instead let sbt dependency management choose which
-      // scala-library and dotty-library to put on the compiler classpath.
-      // Maybe eventually we should just remove the compiler bootclasspath since
-      // it's a source of complication with only dubious benefits.
-
-      // sbt crazy scoping rules mean that when we override `classpathOptions`
-      // below we also override `classpathOptions in console` which is normally
-      // set in https://github.com/sbt/sbt/blob/b6f02b9b8cd0abb15e3d8856fd76b570deb1bd61/main/src/main/scala/sbt/Defaults.scala#L503,
-      // this breaks `sbt console` in Scala 2 projects.
-      // There seems to be no way to avoid stomping over task-scoped settings,
-      // so we need to manually set `classpathOptions in console` to something sensible,
-      // ideally this would be "whatever would be set if this plugin was not enabled",
-      // but I can't find a way to do this, so we default to whatever is set in ThisBuild.
-      console / classpathOptions := {
-        if (isDotty.value)
-          classpathOptions.value // The Dotty REPL doesn't require anything special on its classpath
-        else
-          (ThisBuild / console / classpathOptions).value
-      },
-      classpathOptions := {
-        val old = classpathOptions.value
-        if (isDotty.value)
-          old
-            .withAutoBoot(false)      // we don't put the library on the compiler bootclasspath (as explained above)
-            .withFilterLibrary(false) // ...instead, we put it on the compiler classpath
-        else
-          old
-      },
-      // ... but when running under Java 8, we still need a compiler bootclasspath
-      // that contains the JVM bootclasspath, otherwise sbt incremental
-      // compilation breaks.
-      scalacOptions ++= {
-        if (isDotty.value && !isJavaAtLeast("9"))
-          Seq("-bootclasspath", sys.props("sun.boot.class.path"))
-        else
-          Seq()
-      },
-      // If the current scalaVersion is N and we transitively depend on
-      // {scala, dotty}-{library, compiler, ...} M where M > N, we want the
-      // newest version on our compiler classpath, but sbt by default will
-      // instead rewrite all our dependencies to version N, the following line
-      // prevents this behavior.
-      scalaModuleInfo := {
-        val old = scalaModuleInfo.value
-        if (isDotty.value)
-          old.map(_.withOverrideScalaVersion(false))
-        else
-          old
-      },
-      // Prevent sbt from creating a ScalaTool configuration
-      managedScalaInstance := {
-        val old = managedScalaInstance.value
-        if (isDotty.value)
-          false
-        else
-          old
-      },
-      // ... instead, we'll fetch the compiler and its dependencies ourselves.
-      scalaInstance := Def.taskDyn {
-        if (isDotty.value)
-          dottyScalaInstanceTask(scala3Artefact(scalaVersion.value, "compiler"))
-        else
-          Def.valueStrict { scalaInstance.taskValue }
-      }.value,
-
-      // Configuration for the doctool
-      resolvers ++= (if(!useScaladoc.value) Nil else Seq(Resolver.jcenterRepo)),
-      useScaladoc := {
-        val v = scalaVersion.value
-        v.startsWith("3") && !v.startsWith("3.0.0-M1") && !v.startsWith("3.0.0-M2")
-      },
-      // We need to add doctool classes to the classpath so they can be called
-      doc / scalaInstance := Def.taskDyn {
-        if (isDotty.value)
-          if (useScaladoc.value) {
-            val v = scalaVersion.value
-            val shouldUseScala3doc =
-              v.startsWith("3.0.0-M1") || v.startsWith("3.0.0-M2") || v.startsWith("3.0.0-M3")  || v.startsWith("3.0.0-RC1-bin-20210")
-            val name = if (shouldUseScala3doc) "scala3doc" else "scaladoc"
-            dottyScalaInstanceTask(name)
-          } else dottyScalaInstanceTask(scala3Artefact(scalaVersion.value, "doc"))
-        else
-          Def.valueStrict { (doc / scalaInstance).taskValue }
-      }.value,
-
-      // Because managedScalaInstance is false, sbt won't add the standard library to our dependencies for us
-      libraryDependencies ++= {
-        if (isDotty.value && autoScalaLibrary.value) {
-          val name =
-            if (isDottyJS.value) scala3Artefact(scalaVersion.value, "library_sjs1")
-            else scala3Artefact(scalaVersion.value, "library")
-          Seq(scalaOrganization.value %% name % scalaVersion.value)
-        } else
-          Seq()
-      },
-
-      // Patch up some more options if this is Dotty with Scala.js
-      scalacOptions := {
-        val prev = scalacOptions.value
-        /* The `&& !prev.contains("-scalajs")` is future-proof, for when sbt-scalajs adds that
-         * option itself but sbt-dotty is still required for the other Dotty-related stuff.
-         */
-        if (isDottyJS.value && !prev.contains("-scalajs")) prev :+ "-scalajs"
-        else prev
-      },
-      libraryDependencies := {
-        val prev = libraryDependencies.value
-        if (!isDottyJS.value) {
-          prev
-        } else {
-          prev
-            /* Remove the dependencies we don't want:
-             * * We don't want scalajs-library, because we need the one that comes
-             *   as a dependency of dotty-library_sjs1
-             * * We don't want scalajs-compiler, because that's a compiler plugin,
-             *   which is replaced by the `-scalajs` flag in dotc.
-             */
-            .filterNot { moduleID =>
-              moduleID.organization == "org.scala-js" && (
-                moduleID.name == "scalajs-library" || moduleID.name == "scalajs-compiler"
-              )
-            }
-            // Apply withDottyCompat to the dependency on scalajs-test-bridge
-            .map { moduleID =>
-              if (moduleID.organization == "org.scala-js" && moduleID.name == "scalajs-test-bridge")
-                moduleID.withDottyCompat(scalaVersion.value)
-              else
-                moduleID
-            }
-        }
-      },
-
-      // Turns off the warning:
-      // [warn] Binary version (0.9.0-RC1) for dependency ...;0.9.0-RC1
-      // [warn]  in ... differs from Scala binary version in project (0.9).
-      scalaModuleInfo := {
-        val old = scalaModuleInfo.value
-        if (isDotty.value)
-          old.map(_.withCheckExplicit(false))
-        else
-          old
-      }
-    ) ++ inConfig(Compile)(docSettings) ++ inConfig(Test)(docSettings)
-  }
-
-  private val docSettings = inTask(doc)(Seq(
-    tastyFiles := {
-      val sources = compile.value // Ensure that everything is compiled, so TASTy is available.
-      // sbt is too smart and do not start doc task if there are no *.scala files defined
-      file("___fake___.scala") +:
-        (classDirectory.value ** "*.tasty").get.map(_.getAbsoluteFile)
-    },
-    sources := Def.taskDyn[Seq[File]] {
-      val originalSources = sources.value
-      if (isDotty.value && useScaladoc.value && originalSources.nonEmpty)
-        Def.task { tastyFiles.value }
-      else Def.task { originalSources }
-    }.value,
-    scalacOptions ++= {
-      // From sbt 1.5 scaladoc is natively supported, and so the scalacOptions are already set.
-      val isSbt15 = VersionNumber(sbtVersion.value)
-        .matchesSemVer(SemanticSelector(">=1.5.0-M1"))
-      if (isDotty.value && !isSbt15) {
-        val projectName =
-          if (configuration.value == Compile)
-            name.value
-          else
-            s"${name.value}-${configuration.value}"
-        Seq(
-          "-project", projectName
-        )
-      }
-      else
-        Seq()
-    },
-  ))
-
-  /** Fetch artifacts for moduleID */
-  def fetchArtifactsOf(
-    moduleID: ModuleID,
-    dependencyRes: DependencyResolution,
-    scalaInfo: Option[ScalaModuleInfo],
-    updateConfig: UpdateConfiguration,
-    warningConfig: UnresolvedWarningConfiguration,
-    log: Logger): UpdateReport = {
-    val descriptor = dependencyRes.wrapDependencyInModule(moduleID, scalaInfo)
-
-    dependencyRes.update(descriptor, updateConfig, warningConfig, log) match {
-      case Right(report) =>
-        report
-      case Left(warning) =>
-        throw new MessageOnlyException(
-          s"Couldn't retrieve `$moduleID` : ${warning.resolveException.getMessage}.")
-    }
-  }
-
-  /** Get all jars in updateReport that match the given filter. */
-  def getJars(updateReport: UpdateReport, organization: NameFilter, name: NameFilter, revision: NameFilter): Seq[File] = {
-    updateReport.select(
-      configurationFilter(Runtime.name),
-      moduleFilter(organization, name, revision),
-      artifactFilter(extension = "jar", classifier = "")
-    )
-  }
-
-  /** Get the single jar in updateReport that match the given filter.
-   *  If zero or more than one jar match, an exception will be thrown.
-   */
-  def getJar(updateReport: UpdateReport, organization: NameFilter, name: NameFilter, revision: NameFilter): File = {
-    val jars = getJars(updateReport, organization, name, revision)
-    assert(jars.size == 1, s"There should only be one $name jar but found: $jars")
-    jars.head
-  }
-
-  /** Create a scalaInstance task that uses Dotty based on `moduleName`. */
-  def dottyScalaInstanceTask(moduleName: String): Initialize[Task[ScalaInstance]] = Def.task {
-    val updateReport =
-      fetchArtifactsOf(
-        scalaOrganization.value %% moduleName % scalaVersion.value,
-        dependencyResolution.value,
-        scalaModuleInfo.value,
-        updateConfiguration.value,
-        (update / unresolvedWarningConfiguration).value,
-        streams.value.log)
-    val scalaLibraryJar = getJar(updateReport,
-      "org.scala-lang", "scala-library", revision = AllPassFilter)
-    val dottyLibraryJar = getJar(updateReport,
-      scalaOrganization.value, scala3Artefact(scalaVersion.value, s"library_${scalaBinaryVersion.value}"), scalaVersion.value)
-    val compilerJar = getJar(updateReport,
-      scalaOrganization.value, scala3Artefact(scalaVersion.value, s"compiler_${scalaBinaryVersion.value}"), scalaVersion.value)
-    val allJars =
-      getJars(updateReport, AllPassFilter, AllPassFilter, AllPassFilter)
-
-    makeScalaInstance(
-      state.value,
-      scalaVersion.value,
-      scalaLibraryJar,
-      dottyLibraryJar,
-      compilerJar,
-      allJars,
-      appConfiguration.value
-    )
-  }
-
-  // Adapted from private mkScalaInstance in sbt
-  def makeScalaInstance(
-    state: State, dottyVersion: String, scalaLibrary: File, dottyLibrary: File, compiler: File, all: Seq[File], appConfiguration: AppConfiguration
-  ): ScalaInstance = {
-    /**
-      * The compiler bridge must load the xsbti classes from the sbt
-      * classloader, and similarly the Scala repl must load the sbt provided
-      * jline terminal. To do so we add the `appConfiguration` loader in
-      * the parent hierarchy of the scala 3 instance loader.
-      *
-      * The [[TopClassLoader]] ensures that the xsbti and jline classes
-      * only are loaded from the sbt loader. That is necessary because
-      * the sbt class loader contains the Scala 2.12 library and compiler
-      * bridge.
-      */
-    val topLoader = new TopClassLoader(appConfiguration.provider.loader)
-
-    val libraryJars = Array(dottyLibrary, scalaLibrary)
-    val libraryLoader = state.classLoaderCache.cachedCustomClassloader(
-      libraryJars.toList,
-      () => new URLClassLoader(libraryJars.map(_.toURI.toURL), topLoader)
-    )
-
-    class DottyLoader
-        extends URLClassLoader(all.map(_.toURI.toURL).toArray, libraryLoader)
-    val fullLoader = state.classLoaderCache.cachedCustomClassloader(
-      all.toList,
-      () => new DottyLoader
-    )
-    new ScalaInstance(
-      dottyVersion,
-      fullLoader,
-      libraryLoader,
-      libraryJars,
-      compiler,
-      all.toArray,
-      None)
-  }
-}
-
-/**
- * The parent classloader of the Scala compiler.
- *
- * A TopClassLoader is constructed from the sbt classloader.
- *
- * To understand why a custom parent classloader is needed for the compiler,
- * let us describe some alternatives that wouldn't work.
- *
- * - `new URLClassLoader(urls)`:
- *   The compiler contains sbt phases that callback to sbt using the `xsbti.*`
- *   interfaces. If `urls` does not contain the sbt interfaces we'll get a
- *   `ClassNotFoundException` in the compiler when we try to use them, if
- *   `urls` does contain the interfaces we'll get a `ClassCastException` or a
- *   `LinkageError` because if the same class is loaded by two different
- *   classloaders, they are considered distinct by the JVM.
- *
- * - `new URLClassLoader(urls, sbtLoader)`:
- *    Because of the JVM delegation model, this means that we will only load
- *    a class from `urls` if it's not present in the parent `sbtLoader`, but
- *    sbt uses its own version of the scala compiler and scala library which
- *    is not the one we need to run the compiler.
- *
- * Our solution is to implement an URLClassLoader whose parent is
- * `new TopClassLoader(sbtLoader)`. We override `loadClass` to load the
- * `xsbti.*` interfaces from `sbtLoader`.
- *
- * The parent loader of the TopClassLoader is set to `null` so that the JDK
- * classes and only the JDK classes are loade from it.
- */
-private class TopClassLoader(sbtLoader: ClassLoader) extends ClassLoader(null) {
-  // We can't use the loadClass overload with two arguments because it's
-  // protected, but we can do the same by hand (the classloader instance
-  // from which we call resolveClass does not matter).
-  // The one argument overload of loadClass delegates to this one.
-  override protected def loadClass(name: String, resolve: Boolean): Class[_] = {
-    if (name.startsWith("xsbti.") || name.startsWith("org.jline.")) {
-      val c = sbtLoader.loadClass(name)
-      if (resolve) resolveClass(c)
-      c
-    }
-    else super.loadClass(name, resolve)
-  }
-}
diff --git a/sbt-dotty/src/dotty/tools/sbtplugin/TastyFileManager.scala b/sbt-dotty/src/dotty/tools/sbtplugin/TastyFileManager.scala
deleted file mode 100644
index 39b2ce051c9a..000000000000
--- a/sbt-dotty/src/dotty/tools/sbtplugin/TastyFileManager.scala
+++ /dev/null
@@ -1,78 +0,0 @@
-package dotty.tools.sbtplugin
-
-import java.io.File
-import java.nio.file.Files
-
-import sbt.io.IO
-import xsbti.compile.ClassFileManager
-
-import scala.collection.mutable
-
-
-/** A class file manger that prunes .tasty as needed.
- *
- *  This makes sure that, when a .class file must be deleted, the
- *  corresponding .tasty file is also deleted.
- *
- *  This code is adapted from Zinc `TransactionalClassFileManager`.
- *  We need to duplicate the logic since forwarding to the default class
- *  file manager doesn't work: we need to backup tasty files in a different
- *  temporary directory as class files.
- *
- *  To support older versions of dotty, this also takes care of .hasTasty
- *  files, although they are not used anymore.
- */
-final class TastyFileManager extends ClassFileManager {
-  private[this] var _tempDir: File = null
-  private[this] def tempDir = {
-    if (_tempDir == null) {
-      _tempDir = Files.createTempDirectory("backup").toFile
-    }
-    _tempDir
-  }
-
-  private[this] val generatedTastyFiles = new mutable.HashSet[File]
-  private[this] val movedTastyFiles = new mutable.HashMap[File, File]
-
-  override def delete(classes: Array[File]): Unit = {
-    val tasties = tastyFiles(classes)
-    val toBeBackedUp = tasties
-      .filter(t => t.exists && !movedTastyFiles.contains(t) && !generatedTastyFiles(t))
-    for (c <- toBeBackedUp)
-      movedTastyFiles.put(c, move(c))
-    IO.deleteFilesEmptyDirs(tasties)
-  }
-
-  override def generated(classes: Array[File]): Unit =
-    generatedTastyFiles ++= tastyFiles(classes)
-
-  override def complete(success: Boolean): Unit = {
-    if (!success) {
-      IO.deleteFilesEmptyDirs(generatedTastyFiles)
-      for ((orig, tmp) <- movedTastyFiles) IO.move(tmp, orig)
-    }
-
-    generatedTastyFiles.clear()
-    movedTastyFiles.clear()
-    if (_tempDir != null) {
-      IO.delete(tempDir)
-      _tempDir = null
-    }
-  }
-
-  private def tastyFiles(classes: Array[File]): Array[File] = {
-    val tastySuffixes = List(".tasty", ".hasTasty")
-    classes.flatMap { classFile =>
-      if (classFile.getPath.endsWith(".class")) {
-        val prefix = classFile.getAbsolutePath.stripSuffix(".class")
-        tastySuffixes.map(suffix => new File(prefix + suffix)).filter(_.exists)
-      } else Nil
-    }
-  }
-
-  private def move(c: File): File = {
-    val target = File.createTempFile("sbt", ".tasty", tempDir)
-    IO.move(c, target)
-    target
-  }
-}
diff --git a/sbt-dotty/sbt-test/compilerReporter/i7442/a/A.scala b/sbt-test/compilerReporter/i7442/a/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/compilerReporter/i7442/a/A.scala
rename to sbt-test/compilerReporter/i7442/a/A.scala
diff --git a/sbt-dotty/sbt-test/compilerReporter/i7442/b/B.scala b/sbt-test/compilerReporter/i7442/b/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/compilerReporter/i7442/b/B.scala
rename to sbt-test/compilerReporter/i7442/b/B.scala
diff --git a/sbt-dotty/sbt-test/compilerReporter/i7442/build.sbt b/sbt-test/compilerReporter/i7442/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/compilerReporter/i7442/build.sbt
rename to sbt-test/compilerReporter/i7442/build.sbt
diff --git a/sbt-dotty/sbt-test/compilerReporter/i7442/project/DottyInjectedPlugin.scala b/sbt-test/compilerReporter/i7442/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/compilerReporter/i7442/project/DottyInjectedPlugin.scala
rename to sbt-test/compilerReporter/i7442/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/compilerReporter/i7442/project/Reporter.scala b/sbt-test/compilerReporter/i7442/project/Reporter.scala
new file mode 100644
index 000000000000..3df9cd0bdfca
--- /dev/null
+++ b/sbt-test/compilerReporter/i7442/project/Reporter.scala
@@ -0,0 +1,42 @@
+import sbt._
+import Keys._
+import KeyRanks.DTask
+
+object Reporter {
+  import xsbti.{Reporter, Problem, Position, Severity}
+
+  lazy val check = TaskKey[Unit]("check", "make sure compilation info are forwared to sbt")
+
+  // compilerReporter is marked private in sbt
+  lazy val compilerReporter = TaskKey[xsbti.Reporter]("compilerReporter", "Experimental hook to listen (or send) compilation failure messages.", DTask)
+
+  lazy val reporter =
+    new xsbti.Reporter {
+      private val buffer = collection.mutable.ArrayBuffer.empty[Problem]
+      def reset(): Unit = buffer.clear()
+      def hasErrors: Boolean = buffer.exists(_.severity == Severity.Error)
+      def hasWarnings: Boolean = buffer.exists(_.severity == Severity.Warn)
+      def printSummary(): Unit = println(problems.mkString(System.lineSeparator))
+      def problems: Array[Problem] = buffer.toArray
+      def log(problem: Problem): Unit = buffer.append(problem)
+      def comment(pos: xsbti.Position, msg: String): Unit = ()
+    }
+
+  lazy val checkSettings = Seq(
+    Compile / compile / compilerReporter := reporter,
+    check := (Compile / compile).failure.map(_ => {
+      println(reporter.problems.toList)
+      assert(reporter.problems.length == 1)
+      val problem = reporter.problems.head
+      // Check that all methods on position can ba called without crashing
+      val pos = problem.position
+      println(pos.sourceFile)
+      println(pos.sourcePath)
+      println(pos.line)
+      println(pos.lineContent)
+      println(pos.offset)
+      println(pos.pointer)
+      println(pos.pointerSpace)
+    }).value
+  )
+}
diff --git a/sbt-dotty/sbt-test/compilerReporter/i7442/test b/sbt-test/compilerReporter/i7442/test
similarity index 100%
rename from sbt-dotty/sbt-test/compilerReporter/i7442/test
rename to sbt-test/compilerReporter/i7442/test
diff --git a/sbt-dotty/sbt-test/compilerReporter/simple/Source.scala b/sbt-test/compilerReporter/simple/Source.scala
similarity index 100%
rename from sbt-dotty/sbt-test/compilerReporter/simple/Source.scala
rename to sbt-test/compilerReporter/simple/Source.scala
diff --git a/sbt-dotty/sbt-test/compilerReporter/simple/build.sbt b/sbt-test/compilerReporter/simple/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/compilerReporter/simple/build.sbt
rename to sbt-test/compilerReporter/simple/build.sbt
diff --git a/sbt-dotty/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala b/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala
rename to sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/compilerReporter/simple/project/Reporter.scala b/sbt-test/compilerReporter/simple/project/Reporter.scala
new file mode 100644
index 000000000000..f67d1ec51d91
--- /dev/null
+++ b/sbt-test/compilerReporter/simple/project/Reporter.scala
@@ -0,0 +1,48 @@
+import sbt._
+import Keys._
+import KeyRanks.DTask
+
+object Reporter {
+  import xsbti.{Reporter, Problem, Position, Severity}
+
+  lazy val check = TaskKey[Unit]("check", "make sure compilation info are forwared to sbt")
+
+  // compilerReporter is marked private in sbt
+  lazy val compilerReporter = TaskKey[xsbti.Reporter]("compilerReporter", "Experimental hook to listen (or send) compilation failure messages.", DTask)
+
+  lazy val reporter =
+    new xsbti.Reporter {
+      private val buffer = collection.mutable.ArrayBuffer.empty[Problem]
+      def reset(): Unit = buffer.clear()
+      def hasErrors: Boolean = buffer.exists(_.severity == Severity.Error)
+      def hasWarnings: Boolean = buffer.exists(_.severity == Severity.Warn)
+      def printSummary(): Unit = println(problems.mkString(System.lineSeparator))
+      def problems: Array[Problem] = buffer.toArray
+      def log(problem: Problem): Unit = buffer.append(problem)
+      def comment(pos: xsbti.Position, msg: String): Unit = ()
+    }
+
+  lazy val checkSettings = Seq(
+    Compile / compile / compilerReporter := reporter,
+    check := (Compile / compile).failure.map(_ => {
+      val problems = reporter.problems
+      println(problems.toList)
+      assert(problems.size == 1)
+
+      // make sure position reported by zinc are proper
+      val mainProblem = problems.head
+
+      val line = mainProblem.position().line()
+      assert(line.isPresent() == true)
+      assert(line.get() == 9)
+
+      val pointer = mainProblem.position().pointer()
+      assert(pointer.isPresent() == true)
+      assert(pointer.get() == 10)
+
+      assert(problems.forall(_.position.offset.isPresent))
+
+      assert(problems.count(_.severity == Severity.Error) == 1) // not found: er1,
+    }).value
+  )
+}
diff --git a/sbt-dotty/sbt-test/compilerReporter/simple/test b/sbt-test/compilerReporter/simple/test
similarity index 100%
rename from sbt-dotty/sbt-test/compilerReporter/simple/test
rename to sbt-test/compilerReporter/simple/test
diff --git a/sbt-dotty/sbt-test/discovery/test-discovery/build.sbt b/sbt-test/discovery/test-discovery/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/discovery/test-discovery/build.sbt
rename to sbt-test/discovery/test-discovery/build.sbt
diff --git a/sbt-dotty/sbt-test/discovery/test-discovery/changes/A2.scala b/sbt-test/discovery/test-discovery/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/discovery/test-discovery/changes/A2.scala
rename to sbt-test/discovery/test-discovery/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala b/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala
rename to sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/discovery/test-discovery/src/main/scala/A.scala b/sbt-test/discovery/test-discovery/src/main/scala/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/discovery/test-discovery/src/main/scala/A.scala
rename to sbt-test/discovery/test-discovery/src/main/scala/A.scala
diff --git a/sbt-dotty/sbt-test/discovery/test-discovery/src/test/scala/AbstractClassTest.scala b/sbt-test/discovery/test-discovery/src/test/scala/AbstractClassTest.scala
similarity index 100%
rename from sbt-dotty/sbt-test/discovery/test-discovery/src/test/scala/AbstractClassTest.scala
rename to sbt-test/discovery/test-discovery/src/test/scala/AbstractClassTest.scala
diff --git a/sbt-dotty/sbt-test/discovery/test-discovery/src/test/scala/TestA.scala b/sbt-test/discovery/test-discovery/src/test/scala/TestA.scala
similarity index 100%
rename from sbt-dotty/sbt-test/discovery/test-discovery/src/test/scala/TestA.scala
rename to sbt-test/discovery/test-discovery/src/test/scala/TestA.scala
diff --git a/sbt-dotty/sbt-test/discovery/test-discovery/src/test/scala/TraitTest.scala b/sbt-test/discovery/test-discovery/src/test/scala/TraitTest.scala
similarity index 100%
rename from sbt-dotty/sbt-test/discovery/test-discovery/src/test/scala/TraitTest.scala
rename to sbt-test/discovery/test-discovery/src/test/scala/TraitTest.scala
diff --git a/sbt-dotty/sbt-test/discovery/test-discovery/test b/sbt-test/discovery/test-discovery/test
similarity index 100%
rename from sbt-dotty/sbt-test/discovery/test-discovery/test
rename to sbt-test/discovery/test-discovery/test
diff --git a/sbt-test/java-compat/i9200/build.sbt b/sbt-test/java-compat/i9200/build.sbt
new file mode 100644
index 000000000000..fb95f4c5b959
--- /dev/null
+++ b/sbt-test/java-compat/i9200/build.sbt
@@ -0,0 +1,2 @@
+scalaVersion := sys.props("plugin.scalaVersion")
+compileOrder := CompileOrder.ScalaThenJava
diff --git a/sbt-test/java-compat/i9200/src/main/java/J.java b/sbt-test/java-compat/i9200/src/main/java/J.java
new file mode 100644
index 000000000000..d97a1beca3bd
--- /dev/null
+++ b/sbt-test/java-compat/i9200/src/main/java/J.java
@@ -0,0 +1 @@
+class J { T.O$ o; }
diff --git a/sbt-test/java-compat/i9200/src/main/scala/T.scala b/sbt-test/java-compat/i9200/src/main/scala/T.scala
new file mode 100644
index 000000000000..fbd5aa08b7ff
--- /dev/null
+++ b/sbt-test/java-compat/i9200/src/main/scala/T.scala
@@ -0,0 +1 @@
+trait T { object O }
diff --git a/sbt-dotty/sbt-test/scala2-compat/akka/test b/sbt-test/java-compat/i9200/test
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/akka/test
rename to sbt-test/java-compat/i9200/test
diff --git a/sbt-test/opaques/i12927/build.sbt b/sbt-test/opaques/i12927/build.sbt
new file mode 100644
index 000000000000..63e314982c41
--- /dev/null
+++ b/sbt-test/opaques/i12927/build.sbt
@@ -0,0 +1 @@
+scalaVersion := sys.props("plugin.scalaVersion")
diff --git a/sbt-test/opaques/i12927/changes/Foo.scala b/sbt-test/opaques/i12927/changes/Foo.scala
new file mode 100644
index 000000000000..5c4cbfafede5
--- /dev/null
+++ b/sbt-test/opaques/i12927/changes/Foo.scala
@@ -0,0 +1,7 @@
+object Foo:
+  opaque type BlaBla[+T, D] = Int
+  extension [T, D](token: BlaBla[T, D]) def data: D = ???
+
+//To cause the crash, after initial clean compilation
+//replace `???` with `value.data` to cause the compiler crash
+def foo[W <: Int](value: Bar.BlaBla[W]): Unit = value.data
diff --git a/sbt-test/opaques/i12927/src/main/scala/Bar.scala b/sbt-test/opaques/i12927/src/main/scala/Bar.scala
new file mode 100644
index 000000000000..5688944e6e3e
--- /dev/null
+++ b/sbt-test/opaques/i12927/src/main/scala/Bar.scala
@@ -0,0 +1,4 @@
+object Bar:
+  type Fuzzy[W <: Int] = Int
+  opaque type BlaBla[W <: Int] <: Foo.BlaBla[Fuzzy[W], Int] =
+    Foo.BlaBla[Fuzzy[W], Int]
diff --git a/sbt-test/opaques/i12927/src/main/scala/Foo.scala b/sbt-test/opaques/i12927/src/main/scala/Foo.scala
new file mode 100644
index 000000000000..24ab85caa49a
--- /dev/null
+++ b/sbt-test/opaques/i12927/src/main/scala/Foo.scala
@@ -0,0 +1,7 @@
+object Foo:
+  opaque type BlaBla[+T, D] = Int
+  extension [T, D](token: BlaBla[T, D]) def data: D = ???
+
+//To cause the crash, after initial clean compilation
+//replace `???` with `value.data` to cause the compiler crash
+def foo[W <: Int](value: Bar.BlaBla[W]): Unit = ??? //value.data
diff --git a/sbt-test/opaques/i12927/test b/sbt-test/opaques/i12927/test
new file mode 100644
index 000000000000..c0ed101b5606
--- /dev/null
+++ b/sbt-test/opaques/i12927/test
@@ -0,0 +1,3 @@
+> compile
+$ copy-file changes/Foo.scala src/main/scala/Foo.scala
+> compile
diff --git a/sbt-test/sbt-bridge/zinc-13-compat/build.sbt b/sbt-test/sbt-bridge/zinc-13-compat/build.sbt
new file mode 100644
index 000000000000..72977c705b71
--- /dev/null
+++ b/sbt-test/sbt-bridge/zinc-13-compat/build.sbt
@@ -0,0 +1,75 @@
+scalaVersion := "2.12.13"
+
+val Scala3Compiler = config("scala3-compiler")
+val Scala3Bridge = config("scala3-bridge")
+
+val scala3Version = sys.props("plugin.scalaVersion")
+
+lazy val root = project.in(file("."))
+  .configs(Scala3Compiler, Scala3Bridge)
+  .settings(
+    inConfig(Scala3Compiler)(Defaults.configSettings),
+    inConfig(Scala3Bridge)(Defaults.configSettings),
+    libraryDependencies ++= Seq(
+      "org.scala-sbt" %% "zinc" % "1.3.5",
+      "org.scala-lang" % "scala3-compiler_3" % scala3Version % Scala3Compiler,
+      "org.scala-lang" % "scala3-sbt-bridge" % scala3Version % Scala3Bridge
+    ),
+    autoScalaLibrary := false,
+    run / fork := true,
+    Compile / sourceGenerators += Def.task {
+      val scala3File = (Compile / sourceManaged).value / "Scala3.scala"
+      val inputFile = (Compile / sourceManaged).value / "Input.scala"
+
+      val allJars = (Scala3Compiler / managedClasspath).value.seq.map(_.data)
+      val compilerJar = allJars
+        .find(jar => jar.name.contains("scala3-compiler"))
+        .get.getAbsolutePath.toString
+      val libraryJars = allJars
+        .filter(jar => jar.name.contains("library"))
+        .map(_.getAbsolutePath.toString)
+
+      val bridgeJars = (Scala3Bridge / managedClasspath).value.seq.map(_.data)
+      val bridgeJar = bridgeJars
+        .find(att => att.name.contains("scala3-sbt-bridge"))
+        .get.getAbsolutePath.toString
+
+      IO.write(
+        scala3File,
+        s"""|
+            |import java.io.File
+            |
+            |object Scala3 {
+            |  val version = "$scala3Version"
+            |  val allJars = Array(
+            |    ${allJars.map(jar => s"""new File("${jar.getAbsolutePath}")""").mkString(",\n    ")}
+            |  )
+            |  val compilerJar = new File("$compilerJar")
+            |  val libraryJars = Array(
+            |    ${libraryJars.map(jar => s"""new File("$jar")""").mkString(",\n    ")}
+            |  )
+            |  val bridgeJar = new File("$bridgeJar")
+            |}
+            |""".stripMargin
+      )
+
+      val output = target.value / "test-output"
+      IO.createDirectory(output)
+
+      val sourceFile = baseDirectory.value / "tests" / "Hello.scala"
+
+      IO.write(
+        inputFile,
+        s"""|
+            |import java.io.File
+            |
+            |object Input {
+            |  val outputFile = new File("${output.getAbsolutePath}")
+            |  val sources = Array(new File("${sourceFile.getAbsolutePath}"))
+            |}
+            |""".stripMargin
+      )
+
+      Seq(scala3File, inputFile)
+    }
+  )
diff --git a/sbt-test/sbt-bridge/zinc-13-compat/src/main/scala/Main.scala b/sbt-test/sbt-bridge/zinc-13-compat/src/main/scala/Main.scala
new file mode 100644
index 000000000000..01dabb25d9d4
--- /dev/null
+++ b/sbt-test/sbt-bridge/zinc-13-compat/src/main/scala/Main.scala
@@ -0,0 +1,69 @@
+
+import java.net.URLClassLoader
+import java.io.File
+import java.util.{EnumSet, Set, HashSet}
+
+import org.apache.logging.log4j.LogManager
+
+import xsbti._
+import xsbti.api.ClassLike
+import xsbti.api.DependencyContext
+import xsbti.compile.DependencyChanges
+
+import sbt.internal.util.ManagedLogger
+import sbt.internal.inc.FreshCompilerCache
+import sbt.internal.inc.ZincUtil
+import sbt.internal.inc.ScalaInstance
+
+object Main extends App {
+  val loaderLibraryOnly = new URLClassLoader(Scala3.libraryJars.map(_.toURI.toURL), null)
+  val loader = new URLClassLoader(Scala3.allJars.map(_.toURI.toURL), loaderLibraryOnly)
+  val instance = new ScalaInstance(
+    Scala3.version,
+    loader,
+    loaderLibraryOnly,
+    Scala3.libraryJars,
+    Scala3.compilerJar,
+    Scala3.allJars,
+    Some(Scala3.version)
+  )
+  val compiler = ZincUtil.scalaCompiler(instance, Scala3.bridgeJar)
+
+  val noChanges = new DependencyChanges {
+    val modifiedBinaries = Array.empty[File]
+    val modifiedClasses = Array.empty[String]
+    def isEmpty(): Boolean = true
+  }
+  val noCallback = new AnalysisCallback {
+    override def startSource(x$1: File): Unit = ()
+    override def classDependency(x$1: String, x$2: String, x$3: DependencyContext): Unit = ()
+    override def binaryDependency(x$1: File, x$2: String, x$3: String, x$4: File, x$5: DependencyContext): Unit = ()
+    override def generatedNonLocalClass(x$1: File, x$2: File, x$3: String, x$4: String): Unit = ()
+    override def generatedLocalClass(x$1: File, x$2: File): Unit = ()
+    override def api(x$1: File, x$2: ClassLike): Unit = ()
+    override def mainClass(x$1: File, x$2: String): Unit = ()
+    override def usedName(x$1: String, x$2: String, x$3: EnumSet[UseScope]): Unit = ()
+    override def problem(x$1: String, x$2: Position, x$3: String, x$4: Severity, x$5: Boolean): Unit = ()
+    override def dependencyPhaseCompleted(): Unit = ()
+    override def apiPhaseCompleted(): Unit = ()
+    override def enabled(): Boolean = false
+    override def classesInOutputJar(): Set[String] = new HashSet[String]()
+  }
+  val cache = new FreshCompilerCache()
+  val log = new ManagedLogger("default", None, None, LogManager.getLogger())
+
+  compiler.apply(
+    Input.sources,
+    noChanges,
+    Scala3.libraryJars,
+    Input.outputFile,
+    options = Array(),
+    noCallback,
+    maximumErrors = 10,
+    cache,
+    log
+  )
+}
+
+
+
diff --git a/sbt-test/sbt-bridge/zinc-13-compat/test b/sbt-test/sbt-bridge/zinc-13-compat/test
new file mode 100644
index 000000000000..f7b3295e155c
--- /dev/null
+++ b/sbt-test/sbt-bridge/zinc-13-compat/test
@@ -0,0 +1,3 @@
+# this little app test that scala3-sbt-bridge is compatible with Zinc 1.3
+# this is necessary to maintain the compatibility with Bloop (see https://github.com/lampepfl/dotty/issues/10816)
+> run
diff --git a/sbt-test/sbt-bridge/zinc-13-compat/tests/Hello.scala b/sbt-test/sbt-bridge/zinc-13-compat/tests/Hello.scala
new file mode 100644
index 000000000000..92d8e2befc76
--- /dev/null
+++ b/sbt-test/sbt-bridge/zinc-13-compat/tests/Hello.scala
@@ -0,0 +1 @@
+@main def hello = println("Hello, World!")
diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/app/Hello.scala b/sbt-test/sbt-dotty/analyzer-plugin/app/Hello.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/app/Hello.scala
rename to sbt-test/sbt-dotty/analyzer-plugin/app/Hello.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/build.sbt b/sbt-test/sbt-dotty/analyzer-plugin/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/build.sbt
rename to sbt-test/sbt-dotty/analyzer-plugin/build.sbt
diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/changes/plugin.sbt b/sbt-test/sbt-dotty/analyzer-plugin/changes/plugin.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/changes/plugin.sbt
rename to sbt-test/sbt-dotty/analyzer-plugin/changes/plugin.sbt
diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/changes/retain.sbt b/sbt-test/sbt-dotty/analyzer-plugin/changes/retain.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/changes/retain.sbt
rename to sbt-test/sbt-dotty/analyzer-plugin/changes/retain.sbt
diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/lib/Lib.scala b/sbt-test/sbt-dotty/analyzer-plugin/lib/Lib.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/lib/Lib.scala
rename to sbt-test/sbt-dotty/analyzer-plugin/lib/Lib.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala b/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala
similarity index 96%
rename from sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala
rename to sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala
index 3d4b952644bd..c1fab5c13f42 100644
--- a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala
+++ b/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala
@@ -14,7 +14,7 @@ import Decorators._
 import Symbols.Symbol
 import Constants.Constant
 import Types._
-import transform.ElimRepeated
+import transform.ProtectedAccessors
 
 class InitPlugin extends StandardPlugin {
   import tpd._
@@ -31,7 +31,7 @@ class InitChecker extends PluginPhase {
   val phaseName = "symbolTreeChecker"
 
   override val runsAfter = Set(SetDefTree.name)
-  override val runsBefore = Set(ElimRepeated.name)
+  override val runsBefore = Set(ProtectedAccessors.name)
 
   private def checkDef(tree: Tree)(implicit ctx: Context): Tree = {
     if (tree.symbol.defTree.isEmpty)
diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/SetDefTree.scala b/sbt-test/sbt-dotty/analyzer-plugin/plugin/SetDefTree.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/SetDefTree.scala
rename to sbt-test/sbt-dotty/analyzer-plugin/plugin/SetDefTree.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/SetDefTreeOff.scala b/sbt-test/sbt-dotty/analyzer-plugin/plugin/SetDefTreeOff.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/SetDefTreeOff.scala
rename to sbt-test/sbt-dotty/analyzer-plugin/plugin/SetDefTreeOff.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/src/main/resources/plugin.properties b/sbt-test/sbt-dotty/analyzer-plugin/plugin/src/main/resources/plugin.properties
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/src/main/resources/plugin.properties
rename to sbt-test/sbt-dotty/analyzer-plugin/plugin/src/main/resources/plugin.properties
diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/test b/sbt-test/sbt-dotty/analyzer-plugin/test
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/test
rename to sbt-test/sbt-dotty/analyzer-plugin/test
diff --git a/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/app/src/main/scala/hello/Hello.scala b/sbt-test/sbt-dotty/compiler-plugin/app/src/main/scala/hello/Hello.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/app/src/main/scala/hello/Hello.scala
rename to sbt-test/sbt-dotty/compiler-plugin/app/src/main/scala/hello/Hello.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/appOK/src/main/scala/hello/Hello.scala b/sbt-test/sbt-dotty/compiler-plugin/appOK/src/main/scala/hello/Hello.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/appOK/src/main/scala/hello/Hello.scala
rename to sbt-test/sbt-dotty/compiler-plugin/appOK/src/main/scala/hello/Hello.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/build.sbt b/sbt-test/sbt-dotty/compiler-plugin/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/build.sbt
rename to sbt-test/sbt-dotty/compiler-plugin/build.sbt
diff --git a/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/changes/build.sbt b/sbt-test/sbt-dotty/compiler-plugin/changes/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/changes/build.sbt
rename to sbt-test/sbt-dotty/compiler-plugin/changes/build.sbt
diff --git a/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/plugin/DivideZero.scala b/sbt-test/sbt-dotty/compiler-plugin/plugin/DivideZero.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/plugin/DivideZero.scala
rename to sbt-test/sbt-dotty/compiler-plugin/plugin/DivideZero.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/plugin/src/main/resources/plugin.properties b/sbt-test/sbt-dotty/compiler-plugin/plugin/src/main/resources/plugin.properties
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/plugin/src/main/resources/plugin.properties
rename to sbt-test/sbt-dotty/compiler-plugin/plugin/src/main/resources/plugin.properties
diff --git a/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/test b/sbt-test/sbt-dotty/compiler-plugin/test
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/test
rename to sbt-test/sbt-dotty/compiler-plugin/test
diff --git a/sbt-dotty/sbt-test/sbt-dotty/dotty-knowledge.i17/build.sbt b/sbt-test/sbt-dotty/dotty-knowledge.i17/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/dotty-knowledge.i17/build.sbt
rename to sbt-test/sbt-dotty/dotty-knowledge.i17/build.sbt
diff --git a/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties b/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties
new file mode 100644
index 000000000000..3161d2146c63
--- /dev/null
+++ b/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.6.1
diff --git a/sbt-dotty/sbt-test/sbt-dotty/dotty-knowledge.i17/project/plugins.sbt b/sbt-test/sbt-dotty/dotty-knowledge.i17/project/plugins.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/dotty-knowledge.i17/project/plugins.sbt
rename to sbt-test/sbt-dotty/dotty-knowledge.i17/project/plugins.sbt
diff --git a/sbt-dotty/sbt-test/sbt-dotty/dotty-knowledge.i17/src/main/scala/Main.scala b/sbt-test/sbt-dotty/dotty-knowledge.i17/src/main/scala/Main.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/dotty-knowledge.i17/src/main/scala/Main.scala
rename to sbt-test/sbt-dotty/dotty-knowledge.i17/src/main/scala/Main.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/dotty-knowledge.i17/test b/sbt-test/sbt-dotty/dotty-knowledge.i17/test
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/dotty-knowledge.i17/test
rename to sbt-test/sbt-dotty/dotty-knowledge.i17/test
diff --git a/sbt-test/sbt-dotty/example-project/build.sbt b/sbt-test/sbt-dotty/example-project/build.sbt
new file mode 100644
index 000000000000..d96468b38ccb
--- /dev/null
+++ b/sbt-test/sbt-dotty/example-project/build.sbt
@@ -0,0 +1,4 @@
+scalaVersion := sys.props("plugin.scalaVersion")
+
+libraryDependencies +=
+  ("org.scala-lang.modules" %% "scala-xml" % "1.2.0").cross(CrossVersion.for3Use2_13)
diff --git a/sbt-dotty/sbt-test/sbt-dotty/example-project/src/main/scala/hello/Hello.scala b/sbt-test/sbt-dotty/example-project/src/main/scala/hello/Hello.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/example-project/src/main/scala/hello/Hello.scala
rename to sbt-test/sbt-dotty/example-project/src/main/scala/hello/Hello.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/example-project/test b/sbt-test/sbt-dotty/example-project/test
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/example-project/test
rename to sbt-test/sbt-dotty/example-project/test
diff --git a/sbt-dotty/sbt-test/sbt-dotty/i7897/build.sbt b/sbt-test/sbt-dotty/i7897/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/i7897/build.sbt
rename to sbt-test/sbt-dotty/i7897/build.sbt
diff --git a/sbt-dotty/sbt-test/sbt-dotty/i7897/changes/build-no-fork.sbt b/sbt-test/sbt-dotty/i7897/changes/build-no-fork.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/i7897/changes/build-no-fork.sbt
rename to sbt-test/sbt-dotty/i7897/changes/build-no-fork.sbt
diff --git a/sbt-dotty/sbt-test/sbt-dotty/i7897/src/main/scala/hello/i7897.scala b/sbt-test/sbt-dotty/i7897/src/main/scala/hello/i7897.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/i7897/src/main/scala/hello/i7897.scala
rename to sbt-test/sbt-dotty/i7897/src/main/scala/hello/i7897.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/i7897/test b/sbt-test/sbt-dotty/i7897/test
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/i7897/test
rename to sbt-test/sbt-dotty/i7897/test
diff --git a/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/build.sbt b/sbt-test/sbt-dotty/quoted-example-project/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/build.sbt
rename to sbt-test/sbt-dotty/quoted-example-project/build.sbt
diff --git a/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/src/changes/Hello.scala b/sbt-test/sbt-dotty/quoted-example-project/src/changes/Hello.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/src/changes/Hello.scala
rename to sbt-test/sbt-dotty/quoted-example-project/src/changes/Hello.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/src/main/scala/hello/Hello.scala b/sbt-test/sbt-dotty/quoted-example-project/src/main/scala/hello/Hello.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/src/main/scala/hello/Hello.scala
rename to sbt-test/sbt-dotty/quoted-example-project/src/main/scala/hello/Hello.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/src/test/scala/hello/Tests.scala b/sbt-test/sbt-dotty/quoted-example-project/src/test/scala/hello/Tests.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/src/test/scala/hello/Tests.scala
rename to sbt-test/sbt-dotty/quoted-example-project/src/test/scala/hello/Tests.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/test b/sbt-test/sbt-dotty/quoted-example-project/test
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/test
rename to sbt-test/sbt-dotty/quoted-example-project/test
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scala2/build.sbt b/sbt-test/sbt-dotty/scala2/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scala2/build.sbt
rename to sbt-test/sbt-dotty/scala2/build.sbt
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scala2/src/main/scala/hello/Hello.scala b/sbt-test/sbt-dotty/scala2/src/main/scala/hello/Hello.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scala2/src/main/scala/hello/Hello.scala
rename to sbt-test/sbt-dotty/scala2/src/main/scala/hello/Hello.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scala2/test b/sbt-test/sbt-dotty/scala2/test
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scala2/test
rename to sbt-test/sbt-dotty/scala2/test
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/build.sbt b/sbt-test/sbt-dotty/scaladoc-empty-test/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/build.sbt
rename to sbt-test/sbt-dotty/scaladoc-empty-test/build.sbt
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/src/main/scala/hello/Hello.scala b/sbt-test/sbt-dotty/scaladoc-empty-test/src/main/scala/hello/Hello.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/src/main/scala/hello/Hello.scala
rename to sbt-test/sbt-dotty/scaladoc-empty-test/src/main/scala/hello/Hello.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/test b/sbt-test/sbt-dotty/scaladoc-empty-test/test
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/test
rename to sbt-test/sbt-dotty/scaladoc-empty-test/test
diff --git a/sbt-test/sbt-dotty/scaladoc/build.sbt b/sbt-test/sbt-dotty/scaladoc/build.sbt
new file mode 100644
index 000000000000..eec38852797f
--- /dev/null
+++ b/sbt-test/sbt-dotty/scaladoc/build.sbt
@@ -0,0 +1,11 @@
+scalaVersion := sys.props("plugin.scalaVersion")
+
+TaskKey[Unit]("checkScaladocOptions") := {
+  val options = (Compile / doc / scalacOptions).value
+  assert(options.count(_ == "-project") == 1)
+}
+
+TaskKey[Unit]("checkHtmlFiles") := {
+  val helloHtml = (Compile / doc / target).value / "hello.html"
+  assert(helloHtml.exists)
+}
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/AutoParamTupling.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/AutoParamTupling.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/AutoParamTupling.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/AutoParamTupling.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/ContextQueries.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/ContextQueries.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/ContextQueries.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/ContextQueries.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/Conversion.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/Conversion.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/Conversion.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/Conversion.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/EnumTypes.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/EnumTypes.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/EnumTypes.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/EnumTypes.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/ImpliedInstances.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/ImpliedInstances.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/ImpliedInstances.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/ImpliedInstances.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/IntersectionTypes.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/IntersectionTypes.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/IntersectionTypes.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/IntersectionTypes.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/Main.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/Main.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/Main.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/Main.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/MultiversalEquality.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/MultiversalEquality.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/MultiversalEquality.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/MultiversalEquality.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/PatternMatching.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/PatternMatching.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/PatternMatching.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/PatternMatching.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/StructuralTypes.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/StructuralTypes.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/StructuralTypes.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/StructuralTypes.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/TraitParams.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/TraitParams.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/TraitParams.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/TraitParams.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/TypeLambdas.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/TypeLambdas.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/TypeLambdas.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/TypeLambdas.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/UnionTypes.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/UnionTypes.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/UnionTypes.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/UnionTypes.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/hello/Hello.scala b/sbt-test/sbt-dotty/scaladoc/src/main/scala/hello/Hello.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/scaladoc/src/main/scala/hello/Hello.scala
rename to sbt-test/sbt-dotty/scaladoc/src/main/scala/hello/Hello.scala
diff --git a/sbt-test/sbt-dotty/scaladoc/test b/sbt-test/sbt-dotty/scaladoc/test
new file mode 100644
index 000000000000..5a6525be92ec
--- /dev/null
+++ b/sbt-test/sbt-dotty/scaladoc/test
@@ -0,0 +1,3 @@
+> checkScaladocOptions
+> doc
+> checkHtmlFiles
diff --git a/sbt-test/sbt-dotty/tasty-inspector-cache/build.sbt b/sbt-test/sbt-dotty/tasty-inspector-cache/build.sbt
new file mode 100644
index 000000000000..3bece1b43fa7
--- /dev/null
+++ b/sbt-test/sbt-dotty/tasty-inspector-cache/build.sbt
@@ -0,0 +1,24 @@
+lazy val dottyVersion = sys.props("plugin.scalaVersion")
+
+lazy val lib = project
+  .in(file("lib"))
+  .settings(
+    scalaVersion := dottyVersion
+  )
+
+val jarDest = file("target") / "app.jar"
+
+val runTest = Def.taskKey[Unit]("run tests")
+
+lazy val inspector = project
+  .in(file("inspector"))
+  .settings(
+    scalaVersion := dottyVersion,
+    libraryDependencies += "org.scala-lang" %% "scala3-tasty-inspector" % scalaVersion.value,
+    runTest :=
+      Def.sequential(
+        Def.task(IO.copyFile((lib/Compile/packageBin).value, jarDest)),
+        (Compile/run).toTask(" " + jarDest.getAbsolutePath)
+      ).value
+  )
+  .dependsOn(lib)
diff --git a/sbt-test/sbt-dotty/tasty-inspector-cache/inspector/src/main/scala/main.scala b/sbt-test/sbt-dotty/tasty-inspector-cache/inspector/src/main/scala/main.scala
new file mode 100644
index 000000000000..8335a016578f
--- /dev/null
+++ b/sbt-test/sbt-dotty/tasty-inspector-cache/inspector/src/main/scala/main.scala
@@ -0,0 +1,14 @@
+import scala.quoted.Quotes
+import scala.quoted.quotes
+import scala.tasty.inspector as ins
+
+// Test for https://github.com/lampepfl/dotty/issues/13919
+class MyInspector extends ins.Inspector:
+  def inspect(using Quotes)(tastys: List[ins.Tasty[quotes.type]]): Unit =
+    import quotes.reflect._
+    TypeRepr.of[Int]
+    TypeRepr.of[String]
+
+
+@main def main(args: String*): Unit =
+  ins.TastyInspector.inspectTastyFilesInJar(args.head)(new MyInspector)
diff --git a/sbt-test/sbt-dotty/tasty-inspector-cache/lib/src/main/scala/dummy.scala b/sbt-test/sbt-dotty/tasty-inspector-cache/lib/src/main/scala/dummy.scala
new file mode 100644
index 000000000000..52d946a2a65d
--- /dev/null
+++ b/sbt-test/sbt-dotty/tasty-inspector-cache/lib/src/main/scala/dummy.scala
@@ -0,0 +1 @@
+class Dummy // we need at least one file for the tasty inspector to run
diff --git a/sbt-test/sbt-dotty/tasty-inspector-cache/test b/sbt-test/sbt-dotty/tasty-inspector-cache/test
new file mode 100644
index 000000000000..8fa783e886e2
--- /dev/null
+++ b/sbt-test/sbt-dotty/tasty-inspector-cache/test
@@ -0,0 +1 @@
+> inspector/runTest
diff --git a/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/app/Main.scala b/sbt-test/sbt-dotty/tasty-inspector-example-project/app/Main.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/app/Main.scala
rename to sbt-test/sbt-dotty/tasty-inspector-example-project/app/Main.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/build.sbt b/sbt-test/sbt-dotty/tasty-inspector-example-project/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/build.sbt
rename to sbt-test/sbt-dotty/tasty-inspector-example-project/build.sbt
diff --git a/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/lib/Foo.scala b/sbt-test/sbt-dotty/tasty-inspector-example-project/lib/Foo.scala
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/lib/Foo.scala
rename to sbt-test/sbt-dotty/tasty-inspector-example-project/lib/Foo.scala
diff --git a/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/test b/sbt-test/sbt-dotty/tasty-inspector-example-project/test
similarity index 100%
rename from sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/test
rename to sbt-test/sbt-dotty/tasty-inspector-example-project/test
diff --git a/sbt-test/sbt-dotty/tasty-inspector-jars/build.sbt b/sbt-test/sbt-dotty/tasty-inspector-jars/build.sbt
new file mode 100644
index 000000000000..59dd85290bf0
--- /dev/null
+++ b/sbt-test/sbt-dotty/tasty-inspector-jars/build.sbt
@@ -0,0 +1,24 @@
+lazy val dottyVersion = sys.props("plugin.scalaVersion")
+
+lazy val lib = project
+  .in(file("lib"))
+  .settings(
+    scalaVersion := dottyVersion
+  )
+
+val jarDest = file("target") / "app.jar"
+
+val runTest = Def.taskKey[Unit]("run tests")
+
+lazy val inspector = project
+  .in(file("inspector"))
+  .settings(
+    scalaVersion := dottyVersion,
+    libraryDependencies += "org.scala-lang" %% "scala3-tasty-inspector" % scalaVersion.value,
+    runTest := 
+      Def.sequential(
+        Def.task(IO.copyFile((lib/Compile/packageBin).value, jarDest)),
+        (Compile/run).toTask(" " + jarDest.getAbsolutePath)
+      ).value
+  )
+  .dependsOn(lib)
diff --git a/sbt-test/sbt-dotty/tasty-inspector-jars/inspector/src/main/scala/main.scala b/sbt-test/sbt-dotty/tasty-inspector-jars/inspector/src/main/scala/main.scala
new file mode 100644
index 000000000000..b27e9a59c66a
--- /dev/null
+++ b/sbt-test/sbt-dotty/tasty-inspector-jars/inspector/src/main/scala/main.scala
@@ -0,0 +1,12 @@
+import scala.quoted.Quotes
+import scala.quoted.quotes
+import scala.tasty.inspector as ins
+
+class MyInspector extends ins.Inspector:
+  def inspect(using Quotes)(tastys: List[ins.Tasty[quotes.type]]): Unit =
+    val sources = tastys.map(_.ast.pos.sourceFile.toString).toSet
+    val expectedSources = Set("lib/src/main/scala/toplevel.scala", "lib/src/main/scala/inpackage.scala")
+    assert(sources == expectedSources, s"expected $expectedSources tasty files but get: $sources")
+
+@main def main(args: String*): Unit =
+  ins.TastyInspector.inspectTastyFilesInJar(args.head)(new MyInspector)
diff --git a/sbt-test/sbt-dotty/tasty-inspector-jars/lib/src/main/scala/inpackage.scala b/sbt-test/sbt-dotty/tasty-inspector-jars/lib/src/main/scala/inpackage.scala
new file mode 100644
index 000000000000..82a15907dfad
--- /dev/null
+++ b/sbt-test/sbt-dotty/tasty-inspector-jars/lib/src/main/scala/inpackage.scala
@@ -0,0 +1,3 @@
+package pkg
+
+class A
diff --git a/sbt-test/sbt-dotty/tasty-inspector-jars/lib/src/main/scala/toplevel.scala b/sbt-test/sbt-dotty/tasty-inspector-jars/lib/src/main/scala/toplevel.scala
new file mode 100644
index 000000000000..337fa441878a
--- /dev/null
+++ b/sbt-test/sbt-dotty/tasty-inspector-jars/lib/src/main/scala/toplevel.scala
@@ -0,0 +1,3 @@
+// NOTE: no package, this is top-level!
+
+class A
diff --git a/sbt-test/sbt-dotty/tasty-inspector-jars/test b/sbt-test/sbt-dotty/tasty-inspector-jars/test
new file mode 100644
index 000000000000..8fa783e886e2
--- /dev/null
+++ b/sbt-test/sbt-dotty/tasty-inspector-jars/test
@@ -0,0 +1 @@
+> inspector/runTest
diff --git a/sbt-test/scala2-compat/akka/build.sbt b/sbt-test/scala2-compat/akka/build.sbt
new file mode 100644
index 000000000000..3e34f19ca7aa
--- /dev/null
+++ b/sbt-test/scala2-compat/akka/build.sbt
@@ -0,0 +1,8 @@
+scalaVersion := sys.props("plugin.scalaVersion")
+
+libraryDependencies ++= {
+  Seq(
+    ("com.typesafe.akka" %% "akka-http"   % "10.1.10"),
+    ("com.typesafe.akka" %% "akka-stream" % "2.6.0")
+  ).map(_.cross(CrossVersion.for3Use2_13))
+}
diff --git a/sbt-dotty/sbt-test/scala2-compat/akka/i3100.scala b/sbt-test/scala2-compat/akka/i3100.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/akka/i3100.scala
rename to sbt-test/scala2-compat/akka/i3100.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/eff/test b/sbt-test/scala2-compat/akka/test
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/eff/test
rename to sbt-test/scala2-compat/akka/test
diff --git a/sbt-test/scala2-compat/eff/build.sbt b/sbt-test/scala2-compat/eff/build.sbt
new file mode 100644
index 000000000000..f4f14267d1cc
--- /dev/null
+++ b/sbt-test/scala2-compat/eff/build.sbt
@@ -0,0 +1,4 @@
+scalaVersion := sys.props("plugin.scalaVersion")
+
+libraryDependencies +=
+  ("org.atnos" %% "eff" % "5.5.2").cross(CrossVersion.for3Use2_13)
diff --git a/sbt-dotty/sbt-test/scala2-compat/eff/i6484.scala b/sbt-test/scala2-compat/eff/i6484.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/eff/i6484.scala
rename to sbt-test/scala2-compat/eff/i6484.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/test b/sbt-test/scala2-compat/eff/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/test
rename to sbt-test/scala2-compat/eff/test
diff --git a/sbt-test/scala2-compat/erasure-scalajs/build.sbt b/sbt-test/scala2-compat/erasure-scalajs/build.sbt
new file mode 100644
index 000000000000..342c32fc4cdc
--- /dev/null
+++ b/sbt-test/scala2-compat/erasure-scalajs/build.sbt
@@ -0,0 +1,15 @@
+lazy val scala2Lib = project.in(file("scala2Lib"))
+  .enablePlugins(ScalaJSPlugin)
+  .settings(
+    scalaVersion := sys.props("plugin.scala2Version")
+  )
+
+lazy val dottyApp = project.in(file("dottyApp"))
+  .dependsOn(scala2Lib)
+  .enablePlugins(ScalaJSPlugin)
+  .settings(
+    scalaVersion := sys.props("plugin.scalaVersion"),
+
+    scalaJSUseMainModuleInitializer := true,
+    scalaJSLinkerConfig ~= (_.withCheckIR(true)),
+  )
diff --git a/sbt-dotty/sbt-test/scala2-compat/erasure-scalajs/dottyApp/Main.scala b/sbt-test/scala2-compat/erasure-scalajs/dottyApp/Main.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/erasure-scalajs/dottyApp/Main.scala
rename to sbt-test/scala2-compat/erasure-scalajs/dottyApp/Main.scala
diff --git a/sbt-test/scala2-compat/erasure-scalajs/project/plugins.sbt b/sbt-test/scala2-compat/erasure-scalajs/project/plugins.sbt
new file mode 100644
index 000000000000..b9ebfd07bf1f
--- /dev/null
+++ b/sbt-test/scala2-compat/erasure-scalajs/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion"))
diff --git a/sbt-dotty/sbt-test/scala2-compat/erasure-scalajs/scala2Lib/Api.scala b/sbt-test/scala2-compat/erasure-scalajs/scala2Lib/Api.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/erasure-scalajs/scala2Lib/Api.scala
rename to sbt-test/scala2-compat/erasure-scalajs/scala2Lib/Api.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/erasure-scalajs/test b/sbt-test/scala2-compat/erasure-scalajs/test
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/erasure-scalajs/test
rename to sbt-test/scala2-compat/erasure-scalajs/test
diff --git a/sbt-test/scala2-compat/erasure/build.sbt b/sbt-test/scala2-compat/erasure/build.sbt
new file mode 100644
index 000000000000..694101e79388
--- /dev/null
+++ b/sbt-test/scala2-compat/erasure/build.sbt
@@ -0,0 +1,10 @@
+lazy val scala2Lib = project.in(file("scala2Lib"))
+  .settings(
+    scalaVersion := sys.props("plugin.scala2Version")
+  )
+
+lazy val dottyApp = project.in(file("dottyApp"))
+  .dependsOn(scala2Lib)
+  .settings(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
diff --git a/sbt-dotty/sbt-test/scala2-compat/erasure/changes/Main.scala b/sbt-test/scala2-compat/erasure/changes/Main.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/erasure/changes/Main.scala
rename to sbt-test/scala2-compat/erasure/changes/Main.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/erasure/dottyApp/Api.scala b/sbt-test/scala2-compat/erasure/dottyApp/Api.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/erasure/dottyApp/Api.scala
rename to sbt-test/scala2-compat/erasure/dottyApp/Api.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/erasure/dottyApp/Main.scala b/sbt-test/scala2-compat/erasure/dottyApp/Main.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/erasure/dottyApp/Main.scala
rename to sbt-test/scala2-compat/erasure/dottyApp/Main.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/erasure/scala2Lib/Api.scala b/sbt-test/scala2-compat/erasure/scala2Lib/Api.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/erasure/scala2Lib/Api.scala
rename to sbt-test/scala2-compat/erasure/scala2Lib/Api.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/erasure/test b/sbt-test/scala2-compat/erasure/test
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/erasure/test
rename to sbt-test/scala2-compat/erasure/test
diff --git a/sbt-test/scala2-compat/i11173/app/App.scala b/sbt-test/scala2-compat/i11173/app/App.scala
new file mode 100644
index 000000000000..9e369179f2cf
--- /dev/null
+++ b/sbt-test/scala2-compat/i11173/app/App.scala
@@ -0,0 +1,3 @@
+import i11173.Bar
+
+def test(x: Bar[_]): Unit = ()
diff --git a/sbt-test/scala2-compat/i11173/build.sbt b/sbt-test/scala2-compat/i11173/build.sbt
new file mode 100644
index 000000000000..433a5e8baddf
--- /dev/null
+++ b/sbt-test/scala2-compat/i11173/build.sbt
@@ -0,0 +1,13 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val lib = project.in(file("lib"))
+  .settings(
+    scalaVersion := scala2Version
+  )
+
+lazy val app = project.in(file("app"))
+  .dependsOn(lib)
+  .settings(
+    scalaVersion := scala3Version
+  )
diff --git a/sbt-test/scala2-compat/i11173/lib/Lib.scala b/sbt-test/scala2-compat/i11173/lib/Lib.scala
new file mode 100644
index 000000000000..468d4767957c
--- /dev/null
+++ b/sbt-test/scala2-compat/i11173/lib/Lib.scala
@@ -0,0 +1,14 @@
+
+// Compile this with Scala 2.13
+package i11173
+
+trait DU[A, B]
+trait H[F[_]]
+
+trait Foo[E] {
+  def foo: H[({type L[A] = DU[E, A]})#L]
+}
+
+trait Bar[E] extends Foo[E] {
+  def bar = foo   // important note: return type not specified
+}
diff --git a/sbt-test/scala2-compat/i11173/test b/sbt-test/scala2-compat/i11173/test
new file mode 100644
index 000000000000..19aca297fdcf
--- /dev/null
+++ b/sbt-test/scala2-compat/i11173/test
@@ -0,0 +1 @@
+> app/compile
diff --git a/sbt-test/scala2-compat/i12109/app/App.scala b/sbt-test/scala2-compat/i12109/app/App.scala
new file mode 100644
index 000000000000..ca92cbd0db02
--- /dev/null
+++ b/sbt-test/scala2-compat/i12109/app/App.scala
@@ -0,0 +1,3 @@
+import i12109.*
+
+def test = JsonReaderDefaultValue
diff --git a/sbt-test/scala2-compat/i12109/build.sbt b/sbt-test/scala2-compat/i12109/build.sbt
new file mode 100644
index 000000000000..433a5e8baddf
--- /dev/null
+++ b/sbt-test/scala2-compat/i12109/build.sbt
@@ -0,0 +1,13 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val lib = project.in(file("lib"))
+  .settings(
+    scalaVersion := scala2Version
+  )
+
+lazy val app = project.in(file("app"))
+  .dependsOn(lib)
+  .settings(
+    scalaVersion := scala3Version
+  )
diff --git a/sbt-test/scala2-compat/i12109/lib/Lib.scala b/sbt-test/scala2-compat/i12109/lib/Lib.scala
new file mode 100644
index 000000000000..db42a2d9a92a
--- /dev/null
+++ b/sbt-test/scala2-compat/i12109/lib/Lib.scala
@@ -0,0 +1,10 @@
+package i12109
+
+object JsonReaderDefaultValue extends LowPriorityDefaultValue {
+  class ReaderDefaultValue extends scala.annotation.StaticAnnotation
+}
+
+trait LowPriorityDefaultValue {
+  @JsonReaderDefaultValue.ReaderDefaultValue
+  class NoDefaultValue
+}
diff --git a/sbt-test/scala2-compat/i12109/test b/sbt-test/scala2-compat/i12109/test
new file mode 100644
index 000000000000..19aca297fdcf
--- /dev/null
+++ b/sbt-test/scala2-compat/i12109/test
@@ -0,0 +1 @@
+> app/compile
diff --git a/sbt-test/scala2-compat/i12641/app/App.scala b/sbt-test/scala2-compat/i12641/app/App.scala
new file mode 100644
index 000000000000..ad94f2d8ac83
--- /dev/null
+++ b/sbt-test/scala2-compat/i12641/app/App.scala
@@ -0,0 +1,9 @@
+import cek.Async
+
+
+object demo {
+
+  def test1[F[_]](ev: Async[F]): Unit = ???
+  def test2[F[_]](ev: Async[F]): Unit = ???
+
+}
diff --git a/sbt-test/scala2-compat/i12641/build.sbt b/sbt-test/scala2-compat/i12641/build.sbt
new file mode 100644
index 000000000000..433a5e8baddf
--- /dev/null
+++ b/sbt-test/scala2-compat/i12641/build.sbt
@@ -0,0 +1,13 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val lib = project.in(file("lib"))
+  .settings(
+    scalaVersion := scala2Version
+  )
+
+lazy val app = project.in(file("app"))
+  .dependsOn(lib)
+  .settings(
+    scalaVersion := scala3Version
+  )
diff --git a/sbt-test/scala2-compat/i12641/lib/Lib.scala b/sbt-test/scala2-compat/i12641/lib/Lib.scala
new file mode 100644
index 000000000000..f58697edf4f8
--- /dev/null
+++ b/sbt-test/scala2-compat/i12641/lib/Lib.scala
@@ -0,0 +1,29 @@
+package cek
+
+trait Async[F[_]]
+
+object Async {
+  trait WriterTAsync[F[_], L1]
+      extends Async[({ type LL[A] = WriterT[F, L1, A] })#LL]
+      with MonadCancel.WriterTMonadCancel[F, L1] {
+
+    override def delegate = super.delegate
+  }
+
+}
+
+case class WriterT[F[_], L0, V]()
+
+trait MonadError[F[_]]
+trait MonadCancel[F[_]]
+
+object MonadCancel {
+
+  trait WriterTMonadCancel[F[_], L2]
+      extends MonadCancel[({ type LL[A] = WriterT[F, L2, A] })#LL] {
+
+    def delegate: MonadError[({ type LL[A] = WriterT[F, L2, A] })#LL] =
+      ???
+
+  }
+}
diff --git a/sbt-test/scala2-compat/i12641/test b/sbt-test/scala2-compat/i12641/test
new file mode 100644
index 000000000000..19aca297fdcf
--- /dev/null
+++ b/sbt-test/scala2-compat/i12641/test
@@ -0,0 +1 @@
+> app/compile
diff --git a/sbt-test/scala2-compat/i13238/app/App.scala b/sbt-test/scala2-compat/i13238/app/App.scala
new file mode 100644
index 000000000000..795c61a2f5e8
--- /dev/null
+++ b/sbt-test/scala2-compat/i13238/app/App.scala
@@ -0,0 +1,5 @@
+package app
+
+import lib.*
+
+def boom(foo: Foo) = foo.foo(foo) // error: no implicit argument of type lib.Bar was found for parameter bar of method foo in class Foo
diff --git a/sbt-test/scala2-compat/i13238/build.sbt b/sbt-test/scala2-compat/i13238/build.sbt
new file mode 100644
index 000000000000..e927413ece76
--- /dev/null
+++ b/sbt-test/scala2-compat/i13238/build.sbt
@@ -0,0 +1,14 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val lib = project.in(file("lib"))
+  .settings(
+    scalaVersion := scala2Version
+  )
+
+lazy val app = project.in(file("app"))
+  .dependsOn(lib)
+  .settings(Reporter.checkSettings)
+  .settings(
+    scalaVersion := scala3Version
+  )
diff --git a/sbt-test/scala2-compat/i13238/lib/Lib.scala b/sbt-test/scala2-compat/i13238/lib/Lib.scala
new file mode 100644
index 000000000000..a642f5883141
--- /dev/null
+++ b/sbt-test/scala2-compat/i13238/lib/Lib.scala
@@ -0,0 +1,6 @@
+package lib
+
+trait Bar
+class Foo {
+  def foo(out: Foo)(implicit bar: Bar): out.type = out
+}
diff --git a/sbt-test/scala2-compat/i13238/project/Reporter.scala b/sbt-test/scala2-compat/i13238/project/Reporter.scala
new file mode 100644
index 000000000000..1671bf80735f
--- /dev/null
+++ b/sbt-test/scala2-compat/i13238/project/Reporter.scala
@@ -0,0 +1,33 @@
+import sbt._
+import Keys._
+import KeyRanks.DTask
+
+object Reporter {
+  import xsbti.{Reporter, Problem, Position, Severity}
+
+  lazy val check = TaskKey[Unit]("check", "Check compilation output")
+
+  // compilerReporter is marked private in sbt
+  lazy val compilerReporter = TaskKey[xsbti.Reporter]("compilerReporter", "Experimental hook to listen (or send) compilation failure messages.", DTask)
+
+  lazy val reporter =
+    new xsbti.Reporter {
+      private val buffer = collection.mutable.ArrayBuffer.empty[Problem]
+      def reset(): Unit = buffer.clear()
+      def hasErrors: Boolean = buffer.exists(_.severity == Severity.Error)
+      def hasWarnings: Boolean = buffer.exists(_.severity == Severity.Warn)
+      def printSummary(): Unit = println(problems.mkString(System.lineSeparator))
+      def problems: Array[Problem] = buffer.toArray
+      def log(problem: Problem): Unit = buffer.append(problem)
+      def comment(pos: xsbti.Position, msg: String): Unit = ()
+    }
+
+  lazy val checkSettings = Seq(
+    Compile / compile / compilerReporter := reporter,
+    check := (Compile / compile).failure.map(_ => {
+      val problems = reporter.problems
+      assert(problems.size == 1, problems.size)
+      assert(problems.head.position.line.get() == 5, problems.head.position.line)
+    }).value
+  )
+}
diff --git a/sbt-test/scala2-compat/i13238/test b/sbt-test/scala2-compat/i13238/test
new file mode 100644
index 000000000000..b75c1ced2bbb
--- /dev/null
+++ b/sbt-test/scala2-compat/i13238/test
@@ -0,0 +1,2 @@
+> lib/compile
+> app/check
diff --git a/sbt-test/scala2-compat/i14223/app/App.scala b/sbt-test/scala2-compat/i14223/app/App.scala
new file mode 100644
index 000000000000..dc229c0b1a86
--- /dev/null
+++ b/sbt-test/scala2-compat/i14223/app/App.scala
@@ -0,0 +1,6 @@
+import kc.Encoder
+
+def test: Unit =
+  val cellEncoder = new Encoder[String] {
+    override def encode: String = ""
+  }
diff --git a/sbt-test/scala2-compat/i14223/build.sbt b/sbt-test/scala2-compat/i14223/build.sbt
new file mode 100644
index 000000000000..433a5e8baddf
--- /dev/null
+++ b/sbt-test/scala2-compat/i14223/build.sbt
@@ -0,0 +1,13 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val lib = project.in(file("lib"))
+  .settings(
+    scalaVersion := scala2Version
+  )
+
+lazy val app = project.in(file("app"))
+  .dependsOn(lib)
+  .settings(
+    scalaVersion := scala3Version
+  )
diff --git a/sbt-test/scala2-compat/i14223/lib/Lib.scala b/sbt-test/scala2-compat/i14223/lib/Lib.scala
new file mode 100644
index 000000000000..5311bd22f313
--- /dev/null
+++ b/sbt-test/scala2-compat/i14223/lib/Lib.scala
@@ -0,0 +1,12 @@
+package kc
+
+trait Encoder[E] {
+  def encode: E
+
+  @SuppressWarnings(Array("foo"))
+  def tag1: Encoder[E] = ???
+
+  // Make sure we handle empty Array literals too where we can't guess the Array type from its elements
+  @SuppressWarnings(Array())
+  def tag2: Encoder[E] = ???
+}
diff --git a/sbt-test/scala2-compat/i14223/test b/sbt-test/scala2-compat/i14223/test
new file mode 100644
index 000000000000..19aca297fdcf
--- /dev/null
+++ b/sbt-test/scala2-compat/i14223/test
@@ -0,0 +1 @@
+> app/compile
diff --git a/sbt-test/scala2-compat/i8001/build.sbt b/sbt-test/scala2-compat/i8001/build.sbt
new file mode 100644
index 000000000000..1dc85ed7cac0
--- /dev/null
+++ b/sbt-test/scala2-compat/i8001/build.sbt
@@ -0,0 +1,11 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val lib = (project in file ("lib"))
+  .settings(scalaVersion := scala2Version)
+
+lazy val test = (project in file ("main"))
+  .dependsOn(lib)
+  .settings(
+    scalaVersion := scala3Version
+  )
diff --git a/sbt-dotty/sbt-test/scala2-compat/i8001/lib/lib.scala b/sbt-test/scala2-compat/i8001/lib/lib.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/i8001/lib/lib.scala
rename to sbt-test/scala2-compat/i8001/lib/lib.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/i8001/main/test.scala b/sbt-test/scala2-compat/i8001/main/test.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/i8001/main/test.scala
rename to sbt-test/scala2-compat/i8001/main/test.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/i8001/test b/sbt-test/scala2-compat/i8001/test
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/i8001/test
rename to sbt-test/scala2-compat/i8001/test
diff --git a/sbt-test/scala2-compat/i8847/build.sbt b/sbt-test/scala2-compat/i8847/build.sbt
new file mode 100644
index 000000000000..1e7c318b5880
--- /dev/null
+++ b/sbt-test/scala2-compat/i8847/build.sbt
@@ -0,0 +1,11 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val `i8847-lib` = (project in file ("lib"))
+  .settings(scalaVersion := scala2Version)
+
+lazy val `i8847-test` = (project in file ("main"))
+  .dependsOn(`i8847-lib`)
+  .settings(
+    scalaVersion := scala3Version
+  )
diff --git a/sbt-dotty/sbt-test/scala2-compat/i8847/lib/i8847-lib.scala b/sbt-test/scala2-compat/i8847/lib/i8847-lib.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/i8847/lib/i8847-lib.scala
rename to sbt-test/scala2-compat/i8847/lib/i8847-lib.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/i8847/main/i8847-test.scala b/sbt-test/scala2-compat/i8847/main/i8847-test.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/i8847/main/i8847-test.scala
rename to sbt-test/scala2-compat/i8847/main/i8847-test.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/i8847/test b/sbt-test/scala2-compat/i8847/test
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/i8847/test
rename to sbt-test/scala2-compat/i8847/test
diff --git a/sbt-test/scala2-compat/i9916a/build.sbt b/sbt-test/scala2-compat/i9916a/build.sbt
new file mode 100644
index 000000000000..5da7a83d315f
--- /dev/null
+++ b/sbt-test/scala2-compat/i9916a/build.sbt
@@ -0,0 +1,11 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val `i9916a-lib` = (project in file ("lib"))
+  .settings(scalaVersion := scala2Version)
+
+lazy val `i9916a-test` = (project in file ("main"))
+  .dependsOn(`i9916a-lib`)
+  .settings(
+    scalaVersion := scala3Version
+  )
diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916a/lib/i9916a-lib.scala b/sbt-test/scala2-compat/i9916a/lib/i9916a-lib.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/i9916a/lib/i9916a-lib.scala
rename to sbt-test/scala2-compat/i9916a/lib/i9916a-lib.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916a/main/i9916a-test.scala b/sbt-test/scala2-compat/i9916a/main/i9916a-test.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/i9916a/main/i9916a-test.scala
rename to sbt-test/scala2-compat/i9916a/main/i9916a-test.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916a/test b/sbt-test/scala2-compat/i9916a/test
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/i9916a/test
rename to sbt-test/scala2-compat/i9916a/test
diff --git a/sbt-test/scala2-compat/i9916b/build.sbt b/sbt-test/scala2-compat/i9916b/build.sbt
new file mode 100644
index 000000000000..14a979bb173c
--- /dev/null
+++ b/sbt-test/scala2-compat/i9916b/build.sbt
@@ -0,0 +1,11 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val `i9916b-lib` = (project in file ("lib"))
+  .settings(scalaVersion := scala2Version)
+
+lazy val `i9916b-test` = (project in file ("main"))
+  .dependsOn(`i9916b-lib`)
+  .settings(
+    scalaVersion := scala3Version
+  )
diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916b/lib/i9916b-lib.scala b/sbt-test/scala2-compat/i9916b/lib/i9916b-lib.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/i9916b/lib/i9916b-lib.scala
rename to sbt-test/scala2-compat/i9916b/lib/i9916b-lib.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916b/main/i9916b-test.scala b/sbt-test/scala2-compat/i9916b/main/i9916b-test.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/i9916b/main/i9916b-test.scala
rename to sbt-test/scala2-compat/i9916b/main/i9916b-test.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916b/test b/sbt-test/scala2-compat/i9916b/test
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/i9916b/test
rename to sbt-test/scala2-compat/i9916b/test
diff --git a/sbt-test/scala2-compat/longnames/build.sbt b/sbt-test/scala2-compat/longnames/build.sbt
new file mode 100644
index 000000000000..df60250f06f1
--- /dev/null
+++ b/sbt-test/scala2-compat/longnames/build.sbt
@@ -0,0 +1,9 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val lib = (project in file ("lib"))
+  .settings(scalaVersion := scala2Version)
+
+lazy val test = (project in file ("main"))
+  .dependsOn(lib)
+  .settings(scalaVersion := scala3Version)
diff --git a/sbt-dotty/sbt-test/scala2-compat/longnames/lib/lib.scala b/sbt-test/scala2-compat/longnames/lib/lib.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/longnames/lib/lib.scala
rename to sbt-test/scala2-compat/longnames/lib/lib.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/longnames/main/test.scala b/sbt-test/scala2-compat/longnames/main/test.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/longnames/main/test.scala
rename to sbt-test/scala2-compat/longnames/main/test.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/longnames/test b/sbt-test/scala2-compat/longnames/test
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/longnames/test
rename to sbt-test/scala2-compat/longnames/test
diff --git a/sbt-test/scala2-compat/structural/build.sbt b/sbt-test/scala2-compat/structural/build.sbt
new file mode 100644
index 000000000000..df60250f06f1
--- /dev/null
+++ b/sbt-test/scala2-compat/structural/build.sbt
@@ -0,0 +1,9 @@
+val scala3Version = sys.props("plugin.scalaVersion")
+val scala2Version = sys.props("plugin.scala2Version")
+
+lazy val lib = (project in file ("lib"))
+  .settings(scalaVersion := scala2Version)
+
+lazy val test = (project in file ("main"))
+  .dependsOn(lib)
+  .settings(scalaVersion := scala3Version)
diff --git a/sbt-dotty/sbt-test/scala2-compat/structural/lib/lib.scala b/sbt-test/scala2-compat/structural/lib/lib.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/structural/lib/lib.scala
rename to sbt-test/scala2-compat/structural/lib/lib.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/structural/main/test.scala b/sbt-test/scala2-compat/structural/main/test.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/structural/main/test.scala
rename to sbt-test/scala2-compat/structural/main/test.scala
diff --git a/sbt-dotty/sbt-test/scala2-compat/structural/test b/sbt-test/scala2-compat/structural/test
similarity index 100%
rename from sbt-dotty/sbt-test/scala2-compat/structural/test
rename to sbt-test/scala2-compat/structural/test
diff --git a/sbt-test/scala3-backcompat/hierarchical-mirrors/app/Main.scala b/sbt-test/scala3-backcompat/hierarchical-mirrors/app/Main.scala
new file mode 100644
index 000000000000..1a6691dfd280
--- /dev/null
+++ b/sbt-test/scala3-backcompat/hierarchical-mirrors/app/Main.scala
@@ -0,0 +1,8 @@
+package app
+
+import scala.deriving.Mirror
+
+object Main:
+  def main(args: Array[String]): Unit =
+    val mirrorTop = summon[Mirror.SumOf[lib.Top]]
+    assert(mirrorTop.ordinal(lib.Middle()) == 0)
diff --git a/sbt-test/scala3-backcompat/hierarchical-mirrors/build.sbt b/sbt-test/scala3-backcompat/hierarchical-mirrors/build.sbt
new file mode 100644
index 000000000000..82f800d59aab
--- /dev/null
+++ b/sbt-test/scala3-backcompat/hierarchical-mirrors/build.sbt
@@ -0,0 +1,7 @@
+lazy val lib = project.in(file("lib"))
+  .settings(
+    scalaVersion := "3.0.2"
+  )
+
+lazy val app = project.in(file("app"))
+  .dependsOn(lib)
diff --git a/sbt-test/scala3-backcompat/hierarchical-mirrors/lib/Top.scala b/sbt-test/scala3-backcompat/hierarchical-mirrors/lib/Top.scala
new file mode 100644
index 000000000000..e7e3ac40700b
--- /dev/null
+++ b/sbt-test/scala3-backcompat/hierarchical-mirrors/lib/Top.scala
@@ -0,0 +1,7 @@
+package lib
+
+sealed trait Top
+object Top // companion is necessary
+
+case class Middle() extends Top with Bottom
+sealed trait Bottom extends Top
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/project/DottyInjectedPlugin.scala b/sbt-test/scala3-backcompat/hierarchical-mirrors/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline-inherited/project/DottyInjectedPlugin.scala
rename to sbt-test/scala3-backcompat/hierarchical-mirrors/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/scala3-backcompat/hierarchical-mirrors/test b/sbt-test/scala3-backcompat/hierarchical-mirrors/test
new file mode 100644
index 000000000000..63092ffa4a03
--- /dev/null
+++ b/sbt-test/scala3-backcompat/hierarchical-mirrors/test
@@ -0,0 +1 @@
+> app/run
diff --git a/sbt-dotty/sbt-test/scalajs/basic/Main.scala b/sbt-test/scalajs/basic/Main.scala
similarity index 100%
rename from sbt-dotty/sbt-test/scalajs/basic/Main.scala
rename to sbt-test/scalajs/basic/Main.scala
diff --git a/sbt-test/scalajs/basic/build.sbt b/sbt-test/scalajs/basic/build.sbt
new file mode 100644
index 000000000000..431f46f40fe0
--- /dev/null
+++ b/sbt-test/scalajs/basic/build.sbt
@@ -0,0 +1,53 @@
+lazy val testIRPositions = taskKey[Unit]("test IR positions (#14240)")
+
+enablePlugins(ScalaJSPlugin)
+
+scalaVersion := sys.props("plugin.scalaVersion")
+
+// Test withDottyCompat for %%% dependencies
+libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13)
+
+scalaJSUseMainModuleInitializer := true
+
+// #14240 Make sure that generated IR positions are 0-based
+testIRPositions := {
+  import scala.concurrent.{Future, _}
+  import scala.concurrent.ExecutionContext.Implicits.global
+  import scala.concurrent.duration._
+  import scala.util.{Failure, Success}
+
+  import org.scalajs.ir.Names._
+  import org.scalajs.ir.Position
+  import org.scalajs.ir.Trees._
+  import org.scalajs.linker.interface.unstable.IRFileImpl
+
+  val ir = (Compile / scalaJSIR).value
+  val classNameToTest = ClassName("test.Main$")
+
+  val classDefFuture = {
+    // This logic is copied from the implementation of `scalajsp` in sbt-scalajs
+    Future.traverse(ir.data) { irFile =>
+      val ir = IRFileImpl.fromIRFile(irFile)
+      ir.entryPointsInfo.map { i =>
+        if (i.className == classNameToTest) Success(Some(ir))
+        else Success(None)
+      }.recover { case t => Failure(t) }
+    }.flatMap { irs =>
+      irs.collectFirst {
+        case Success(Some(f)) => f.tree
+      }.getOrElse {
+        val t = new MessageOnlyException(s"class ${classNameToTest.nameString} not found on classpath")
+        irs.collect { case Failure(st) => t.addSuppressed(st) }
+        throw t
+      }
+    }
+  }
+  val classDef = Await.result(classDefFuture, Duration.Inf)
+
+  def testPos(pos: Position, expectedLine: Int, expectedColumn: Int): Unit = {
+    if (!pos.source.getPath.endsWith("/Main.scala") || pos.line != expectedLine || pos.column != expectedColumn)
+      throw new MessageOnlyException(s"Expected Main.scala@$expectedLine:$expectedColumn but got $pos")
+  }
+
+  testPos(classDef.pos, 5, 7)
+}
diff --git a/sbt-test/scalajs/basic/project/plugins.sbt b/sbt-test/scalajs/basic/project/plugins.sbt
new file mode 100644
index 000000000000..b30c6e8c5ec8
--- /dev/null
+++ b/sbt-test/scalajs/basic/project/plugins.sbt
@@ -0,0 +1,2 @@
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion"))
diff --git a/sbt-test/scalajs/basic/test b/sbt-test/scalajs/basic/test
new file mode 100644
index 000000000000..60e897d4bee8
--- /dev/null
+++ b/sbt-test/scalajs/basic/test
@@ -0,0 +1,2 @@
+> run
+> testIRPositions
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-override/A.scala b/sbt-test/source-dependencies/abstract-override/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-override/A.scala
rename to sbt-test/source-dependencies/abstract-override/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-override/B.scala b/sbt-test/source-dependencies/abstract-override/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-override/B.scala
rename to sbt-test/source-dependencies/abstract-override/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-override/C.scala b/sbt-test/source-dependencies/abstract-override/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-override/C.scala
rename to sbt-test/source-dependencies/abstract-override/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-override/D.scala b/sbt-test/source-dependencies/abstract-override/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-override/D.scala
rename to sbt-test/source-dependencies/abstract-override/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-override/changes/C2.scala b/sbt-test/source-dependencies/abstract-override/changes/C2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-override/changes/C2.scala
rename to sbt-test/source-dependencies/abstract-override/changes/C2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-override/test b/sbt-test/source-dependencies/abstract-override/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-override/test
rename to sbt-test/source-dependencies/abstract-override/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/build.sbt b/sbt-test/source-dependencies/abstract-type-override/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type-override/build.sbt
rename to sbt-test/source-dependencies/abstract-type-override/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala b/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala
rename to sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/CompileState.scala b/sbt-test/source-dependencies/abstract-type-override/project/CompileState.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/CompileState.scala
rename to sbt-test/source-dependencies/abstract-type-override/project/CompileState.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala b/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala
rename to sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala b/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala
rename to sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala b/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala
rename to sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/test b/sbt-test/source-dependencies/abstract-type-override/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type-override/test
rename to sbt-test/source-dependencies/abstract-type-override/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type/A.scala b/sbt-test/source-dependencies/abstract-type/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type/A.scala
rename to sbt-test/source-dependencies/abstract-type/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type/B.scala b/sbt-test/source-dependencies/abstract-type/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type/B.scala
rename to sbt-test/source-dependencies/abstract-type/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type/changes/A.scala b/sbt-test/source-dependencies/abstract-type/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type/changes/A.scala
rename to sbt-test/source-dependencies/abstract-type/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type/test b/sbt-test/source-dependencies/abstract-type/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/abstract-type/test
rename to sbt-test/source-dependencies/abstract-type/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/added/changes/A1.scala b/sbt-test/source-dependencies/added/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/added/changes/A1.scala
rename to sbt-test/source-dependencies/added/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/added/changes/A2.scala b/sbt-test/source-dependencies/added/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/added/changes/A2.scala
rename to sbt-test/source-dependencies/added/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/added/changes/A3.scala b/sbt-test/source-dependencies/added/changes/A3.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/added/changes/A3.scala
rename to sbt-test/source-dependencies/added/changes/A3.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/added/changes/B1.scala b/sbt-test/source-dependencies/added/changes/B1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/added/changes/B1.scala
rename to sbt-test/source-dependencies/added/changes/B1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/added/changes/B2.scala b/sbt-test/source-dependencies/added/changes/B2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/added/changes/B2.scala
rename to sbt-test/source-dependencies/added/changes/B2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/added/test b/sbt-test/source-dependencies/added/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/added/test
rename to sbt-test/source-dependencies/added/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/JJ.java b/sbt-test/source-dependencies/anon-class-java-depends-on-scala/JJ.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/JJ.java
rename to sbt-test/source-dependencies/anon-class-java-depends-on-scala/JJ.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/build.sbt b/sbt-test/source-dependencies/anon-class-java-depends-on-scala/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/build.sbt
rename to sbt-test/source-dependencies/anon-class-java-depends-on-scala/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/changes/S1.scala b/sbt-test/source-dependencies/anon-class-java-depends-on-scala/changes/S1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/changes/S1.scala
rename to sbt-test/source-dependencies/anon-class-java-depends-on-scala/changes/S1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/changes/S2.scala b/sbt-test/source-dependencies/anon-class-java-depends-on-scala/changes/S2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/changes/S2.scala
rename to sbt-test/source-dependencies/anon-class-java-depends-on-scala/changes/S2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/anon-class-java-depends-on-scala/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/anon-class-java-depends-on-scala/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/test b/sbt-test/source-dependencies/anon-class-java-depends-on-scala/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/test
rename to sbt-test/source-dependencies/anon-class-java-depends-on-scala/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/A.java b/sbt-test/source-dependencies/anon-java-scala-class/A.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/A.java
rename to sbt-test/source-dependencies/anon-java-scala-class/A.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/B.java b/sbt-test/source-dependencies/anon-java-scala-class/B.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/B.java
rename to sbt-test/source-dependencies/anon-java-scala-class/B.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/C.scala b/sbt-test/source-dependencies/anon-java-scala-class/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/C.scala
rename to sbt-test/source-dependencies/anon-java-scala-class/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/D.scala b/sbt-test/source-dependencies/anon-java-scala-class/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/D.scala
rename to sbt-test/source-dependencies/anon-java-scala-class/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/changes/A2.java b/sbt-test/source-dependencies/anon-java-scala-class/changes/A2.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/changes/A2.java
rename to sbt-test/source-dependencies/anon-java-scala-class/changes/A2.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/disabled b/sbt-test/source-dependencies/anon-java-scala-class/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/disabled
rename to sbt-test/source-dependencies/anon-java-scala-class/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/anon-java-scala-class/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/anon-java-scala-class/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/A.scala b/sbt-test/source-dependencies/as-seen-from-a/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/A.scala
rename to sbt-test/source-dependencies/as-seen-from-a/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/B.scala b/sbt-test/source-dependencies/as-seen-from-a/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/B.scala
rename to sbt-test/source-dependencies/as-seen-from-a/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/C.scala b/sbt-test/source-dependencies/as-seen-from-a/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/C.scala
rename to sbt-test/source-dependencies/as-seen-from-a/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/D.scala b/sbt-test/source-dependencies/as-seen-from-a/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/D.scala
rename to sbt-test/source-dependencies/as-seen-from-a/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala b/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala
rename to sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/test b/sbt-test/source-dependencies/as-seen-from-a/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/test
rename to sbt-test/source-dependencies/as-seen-from-a/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/A.scala b/sbt-test/source-dependencies/as-seen-from-b/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/A.scala
rename to sbt-test/source-dependencies/as-seen-from-b/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/B.scala b/sbt-test/source-dependencies/as-seen-from-b/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/B.scala
rename to sbt-test/source-dependencies/as-seen-from-b/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/C.scala b/sbt-test/source-dependencies/as-seen-from-b/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/C.scala
rename to sbt-test/source-dependencies/as-seen-from-b/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/D.scala b/sbt-test/source-dependencies/as-seen-from-b/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/D.scala
rename to sbt-test/source-dependencies/as-seen-from-b/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala b/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala
rename to sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/test b/sbt-test/source-dependencies/as-seen-from-b/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/test
rename to sbt-test/source-dependencies/as-seen-from-b/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/A.scala b/sbt-test/source-dependencies/backtick-quoted-names/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/A.scala
rename to sbt-test/source-dependencies/backtick-quoted-names/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/B.scala b/sbt-test/source-dependencies/backtick-quoted-names/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/B.scala
rename to sbt-test/source-dependencies/backtick-quoted-names/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala b/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala
rename to sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/test b/sbt-test/source-dependencies/backtick-quoted-names/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/test
rename to sbt-test/source-dependencies/backtick-quoted-names/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/binary/build.sbt b/sbt-test/source-dependencies/binary/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/binary/build.sbt
rename to sbt-test/source-dependencies/binary/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/binary/changes/Break.scala b/sbt-test/source-dependencies/binary/changes/Break.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/binary/changes/Break.scala
rename to sbt-test/source-dependencies/binary/changes/Break.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/binary/dep/A.scala b/sbt-test/source-dependencies/binary/dep/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/binary/dep/A.scala
rename to sbt-test/source-dependencies/binary/dep/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/binary/project/P.scala b/sbt-test/source-dependencies/binary/project/P.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/binary/project/P.scala
rename to sbt-test/source-dependencies/binary/project/P.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/binary/test b/sbt-test/source-dependencies/binary/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/binary/test
rename to sbt-test/source-dependencies/binary/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/binary/use/B.scala b/sbt-test/source-dependencies/binary/use/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/binary/use/B.scala
rename to sbt-test/source-dependencies/binary/use/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/by-name/A.scala b/sbt-test/source-dependencies/by-name/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/by-name/A.scala
rename to sbt-test/source-dependencies/by-name/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/by-name/B.scala b/sbt-test/source-dependencies/by-name/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/by-name/B.scala
rename to sbt-test/source-dependencies/by-name/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/by-name/changes/A.scala b/sbt-test/source-dependencies/by-name/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/by-name/changes/A.scala
rename to sbt-test/source-dependencies/by-name/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/by-name/test b/sbt-test/source-dependencies/by-name/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/by-name/test
rename to sbt-test/source-dependencies/by-name/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/canon/Use.scala b/sbt-test/source-dependencies/canon/Use.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/canon/Use.scala
rename to sbt-test/source-dependencies/canon/Use.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/canon/actual/A.java b/sbt-test/source-dependencies/canon/actual/A.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/canon/actual/A.java
rename to sbt-test/source-dependencies/canon/actual/A.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/canon/actual/a.jar b/sbt-test/source-dependencies/canon/actual/a.jar
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/canon/actual/a.jar
rename to sbt-test/source-dependencies/canon/actual/a.jar
diff --git a/sbt-dotty/sbt-test/source-dependencies/canon/build.sbt b/sbt-test/source-dependencies/canon/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/canon/build.sbt
rename to sbt-test/source-dependencies/canon/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/canon/lib/a.jar b/sbt-test/source-dependencies/canon/lib/a.jar
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/canon/lib/a.jar
rename to sbt-test/source-dependencies/canon/lib/a.jar
diff --git a/sbt-dotty/sbt-test/source-dependencies/canon/project/CompileState.scala b/sbt-test/source-dependencies/canon/project/CompileState.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/canon/project/CompileState.scala
rename to sbt-test/source-dependencies/canon/project/CompileState.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/canon/test b/sbt-test/source-dependencies/canon/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/canon/test
rename to sbt-test/source-dependencies/canon/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/changed/Sealed1.scala b/sbt-test/source-dependencies/changedTypeOfChildOfSealed/changed/Sealed1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/changed/Sealed1.scala
rename to sbt-test/source-dependencies/changedTypeOfChildOfSealed/changed/Sealed1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/changed/Sealed2.scala b/sbt-test/source-dependencies/changedTypeOfChildOfSealed/changed/Sealed2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/changed/Sealed2.scala
rename to sbt-test/source-dependencies/changedTypeOfChildOfSealed/changed/Sealed2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/incOptions.properties b/sbt-test/source-dependencies/changedTypeOfChildOfSealed/incOptions.properties
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/incOptions.properties
rename to sbt-test/source-dependencies/changedTypeOfChildOfSealed/incOptions.properties
diff --git a/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/pending b/sbt-test/source-dependencies/changedTypeOfChildOfSealed/pending
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/pending
rename to sbt-test/source-dependencies/changedTypeOfChildOfSealed/pending
diff --git a/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/changedTypeOfChildOfSealed/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/changedTypeOfChildOfSealed/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/src/main/scala/foo/Sealed.scala b/sbt-test/source-dependencies/changedTypeOfChildOfSealed/src/main/scala/foo/Sealed.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/src/main/scala/foo/Sealed.scala
rename to sbt-test/source-dependencies/changedTypeOfChildOfSealed/src/main/scala/foo/Sealed.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/src/main/scala/foo/Usage.scala b/sbt-test/source-dependencies/changedTypeOfChildOfSealed/src/main/scala/foo/Usage.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/src/main/scala/foo/Usage.scala
rename to sbt-test/source-dependencies/changedTypeOfChildOfSealed/src/main/scala/foo/Usage.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-classes/A.scala b/sbt-test/source-dependencies/check-classes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-classes/A.scala
rename to sbt-test/source-dependencies/check-classes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-classes/disabled b/sbt-test/source-dependencies/check-classes/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-classes/disabled
rename to sbt-test/source-dependencies/check-classes/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-classes/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/check-classes/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-classes/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/check-classes/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-dependencies/A.scala b/sbt-test/source-dependencies/check-dependencies/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-dependencies/A.scala
rename to sbt-test/source-dependencies/check-dependencies/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-dependencies/B.scala b/sbt-test/source-dependencies/check-dependencies/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-dependencies/B.scala
rename to sbt-test/source-dependencies/check-dependencies/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-dependencies/C.scala b/sbt-test/source-dependencies/check-dependencies/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-dependencies/C.scala
rename to sbt-test/source-dependencies/check-dependencies/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-dependencies/disabled b/sbt-test/source-dependencies/check-dependencies/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-dependencies/disabled
rename to sbt-test/source-dependencies/check-dependencies/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-dependencies/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/check-dependencies/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-dependencies/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/check-dependencies/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-products/A.scala b/sbt-test/source-dependencies/check-products/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-products/A.scala
rename to sbt-test/source-dependencies/check-products/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-products/disabled b/sbt-test/source-dependencies/check-products/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-products/disabled
rename to sbt-test/source-dependencies/check-products/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-products/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/check-products/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-products/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/check-products/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-recompilations/A.scala b/sbt-test/source-dependencies/check-recompilations/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-recompilations/A.scala
rename to sbt-test/source-dependencies/check-recompilations/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-recompilations/B.scala b/sbt-test/source-dependencies/check-recompilations/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-recompilations/B.scala
rename to sbt-test/source-dependencies/check-recompilations/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-recompilations/C.scala b/sbt-test/source-dependencies/check-recompilations/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-recompilations/C.scala
rename to sbt-test/source-dependencies/check-recompilations/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-recompilations/D.scala b/sbt-test/source-dependencies/check-recompilations/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-recompilations/D.scala
rename to sbt-test/source-dependencies/check-recompilations/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-recompilations/changes/A.scala b/sbt-test/source-dependencies/check-recompilations/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-recompilations/changes/A.scala
rename to sbt-test/source-dependencies/check-recompilations/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-recompilations/disabled b/sbt-test/source-dependencies/check-recompilations/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-recompilations/disabled
rename to sbt-test/source-dependencies/check-recompilations/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/check-recompilations/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/check-recompilations/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/check-recompilations/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/check-recompilations/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/changes/A1.scala b/sbt-test/source-dependencies/class-based-inheritance/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/changes/A1.scala
rename to sbt-test/source-dependencies/class-based-inheritance/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/changes/A2.scala b/sbt-test/source-dependencies/class-based-inheritance/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/changes/A2.scala
rename to sbt-test/source-dependencies/class-based-inheritance/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/disabled b/sbt-test/source-dependencies/class-based-inheritance/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/disabled
rename to sbt-test/source-dependencies/class-based-inheritance/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/class-based-inheritance/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/class-based-inheritance/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/src/main/scala/A.scala b/sbt-test/source-dependencies/class-based-inheritance/src/main/scala/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/src/main/scala/A.scala
rename to sbt-test/source-dependencies/class-based-inheritance/src/main/scala/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/src/main/scala/B.scala b/sbt-test/source-dependencies/class-based-inheritance/src/main/scala/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/src/main/scala/B.scala
rename to sbt-test/source-dependencies/class-based-inheritance/src/main/scala/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/src/main/scala/C.scala b/sbt-test/source-dependencies/class-based-inheritance/src/main/scala/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/src/main/scala/C.scala
rename to sbt-test/source-dependencies/class-based-inheritance/src/main/scala/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/changes/A1.scala b/sbt-test/source-dependencies/class-based-memberRef/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/changes/A1.scala
rename to sbt-test/source-dependencies/class-based-memberRef/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/disabled b/sbt-test/source-dependencies/class-based-memberRef/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/disabled
rename to sbt-test/source-dependencies/class-based-memberRef/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/incOptions.properties b/sbt-test/source-dependencies/class-based-memberRef/incOptions.properties
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/incOptions.properties
rename to sbt-test/source-dependencies/class-based-memberRef/incOptions.properties
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/class-based-memberRef/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/class-based-memberRef/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/src/main/scala/A.scala b/sbt-test/source-dependencies/class-based-memberRef/src/main/scala/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/src/main/scala/A.scala
rename to sbt-test/source-dependencies/class-based-memberRef/src/main/scala/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/src/main/scala/B.scala b/sbt-test/source-dependencies/class-based-memberRef/src/main/scala/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/src/main/scala/B.scala
rename to sbt-test/source-dependencies/class-based-memberRef/src/main/scala/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/compactify/build.sbt b/sbt-test/source-dependencies/compactify/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/compactify/build.sbt
rename to sbt-test/source-dependencies/compactify/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/compactify/src/main/scala/For.scala b/sbt-test/source-dependencies/compactify/src/main/scala/For.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/compactify/src/main/scala/For.scala
rename to sbt-test/source-dependencies/compactify/src/main/scala/For.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala b/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala
rename to sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/compactify/test b/sbt-test/source-dependencies/compactify/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/compactify/test
rename to sbt-test/source-dependencies/compactify/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/constants/changes/A1.scala b/sbt-test/source-dependencies/constants/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/constants/changes/A1.scala
rename to sbt-test/source-dependencies/constants/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/constants/changes/A2.scala b/sbt-test/source-dependencies/constants/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/constants/changes/A2.scala
rename to sbt-test/source-dependencies/constants/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/constants/changes/B.scala b/sbt-test/source-dependencies/constants/changes/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/constants/changes/B.scala
rename to sbt-test/source-dependencies/constants/changes/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/constants/test b/sbt-test/source-dependencies/constants/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/constants/test
rename to sbt-test/source-dependencies/constants/test
diff --git a/sbt-test/source-dependencies/constructors-curried/A.scala b/sbt-test/source-dependencies/constructors-curried/A.scala
new file mode 100644
index 000000000000..b81025bada4d
--- /dev/null
+++ b/sbt-test/source-dependencies/constructors-curried/A.scala
@@ -0,0 +1 @@
+class A(a: Int)
diff --git a/sbt-test/source-dependencies/constructors-curried/B.scala b/sbt-test/source-dependencies/constructors-curried/B.scala
new file mode 100644
index 000000000000..e44b1d4c7852
--- /dev/null
+++ b/sbt-test/source-dependencies/constructors-curried/B.scala
@@ -0,0 +1 @@
+class B { val y = new A(2) }
diff --git a/sbt-test/source-dependencies/constructors-curried/changes/A2.scala b/sbt-test/source-dependencies/constructors-curried/changes/A2.scala
new file mode 100644
index 000000000000..d5dcc57395eb
--- /dev/null
+++ b/sbt-test/source-dependencies/constructors-curried/changes/A2.scala
@@ -0,0 +1 @@
+class A(a: Int)(b: String)
diff --git a/sbt-test/source-dependencies/constructors-curried/changes/B2.scala b/sbt-test/source-dependencies/constructors-curried/changes/B2.scala
new file mode 100644
index 000000000000..83ef0b737c5a
--- /dev/null
+++ b/sbt-test/source-dependencies/constructors-curried/changes/B2.scala
@@ -0,0 +1 @@
+class B { val y = new A(2)("a") }
diff --git a/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/constructors-curried/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/constructors-curried/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/constructors-curried/test b/sbt-test/source-dependencies/constructors-curried/test
new file mode 100644
index 000000000000..b2c9830cf971
--- /dev/null
+++ b/sbt-test/source-dependencies/constructors-curried/test
@@ -0,0 +1,10 @@
+> compile
+$ copy-file changes/A2.scala A.scala
+# we should detect that A has changed,
+# this should trigger recompilation of B,
+# which should fail due to missing curried argument
+-> compile
+$ copy-file changes/B2.scala B.scala
+# B is updated so that it passes an extra
+# argument to A's constructor, it should compile
+> compile
diff --git a/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/A.scala b/sbt-test/source-dependencies/constructors-unrelated/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/A.scala
rename to sbt-test/source-dependencies/constructors-unrelated/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/B.scala b/sbt-test/source-dependencies/constructors-unrelated/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/B.scala
rename to sbt-test/source-dependencies/constructors-unrelated/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/build.sbt b/sbt-test/source-dependencies/constructors-unrelated/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/build.sbt
rename to sbt-test/source-dependencies/constructors-unrelated/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/changes/A2.scala b/sbt-test/source-dependencies/constructors-unrelated/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/changes/A2.scala
rename to sbt-test/source-dependencies/constructors-unrelated/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/project/CompileState.scala b/sbt-test/source-dependencies/constructors-unrelated/project/CompileState.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/project/CompileState.scala
rename to sbt-test/source-dependencies/constructors-unrelated/project/CompileState.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/continuations/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/constructors-unrelated/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/continuations/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/constructors-unrelated/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/test b/sbt-test/source-dependencies/constructors-unrelated/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/test
rename to sbt-test/source-dependencies/constructors-unrelated/test
diff --git a/sbt-test/source-dependencies/constructors/A.scala b/sbt-test/source-dependencies/constructors/A.scala
new file mode 100644
index 000000000000..b81025bada4d
--- /dev/null
+++ b/sbt-test/source-dependencies/constructors/A.scala
@@ -0,0 +1 @@
+class A(a: Int)
diff --git a/sbt-test/source-dependencies/constructors/B.scala b/sbt-test/source-dependencies/constructors/B.scala
new file mode 100644
index 000000000000..e44b1d4c7852
--- /dev/null
+++ b/sbt-test/source-dependencies/constructors/B.scala
@@ -0,0 +1 @@
+class B { val y = new A(2) }
diff --git a/sbt-test/source-dependencies/constructors/changes/A2.scala b/sbt-test/source-dependencies/constructors/changes/A2.scala
new file mode 100644
index 000000000000..edd9e160e7bf
--- /dev/null
+++ b/sbt-test/source-dependencies/constructors/changes/A2.scala
@@ -0,0 +1 @@
+class A(a: String)
diff --git a/sbt-test/source-dependencies/constructors/changes/B2.scala b/sbt-test/source-dependencies/constructors/changes/B2.scala
new file mode 100644
index 000000000000..701f0514685f
--- /dev/null
+++ b/sbt-test/source-dependencies/constructors/changes/B2.scala
@@ -0,0 +1 @@
+class B { val y = new A("a") }
diff --git a/sbt-dotty/sbt-test/source-dependencies/cross-source/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/constructors/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/cross-source/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/constructors/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/constructors/test b/sbt-test/source-dependencies/constructors/test
new file mode 100644
index 000000000000..fbf8ac8d2f0e
--- /dev/null
+++ b/sbt-test/source-dependencies/constructors/test
@@ -0,0 +1,10 @@
+> compile
+$ copy-file changes/A2.scala A.scala
+# we should detect that A has changed,
+# this should trigger recompilation of B,
+# which should fail due to mismatched arguments
+-> compile
+$ copy-file changes/B2.scala B.scala
+# B is updated so that it passes a correct
+# argument to A's constructor, it should compile
+> compile
diff --git a/sbt-dotty/sbt-test/source-dependencies/continuations/Foo.scala b/sbt-test/source-dependencies/continuations/Foo.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/continuations/Foo.scala
rename to sbt-test/source-dependencies/continuations/Foo.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/continuations/Use.scala b/sbt-test/source-dependencies/continuations/Use.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/continuations/Use.scala
rename to sbt-test/source-dependencies/continuations/Use.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/continuations/build.sbt b/sbt-test/source-dependencies/continuations/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/continuations/build.sbt
rename to sbt-test/source-dependencies/continuations/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/continuations/changes/Def1.scala b/sbt-test/source-dependencies/continuations/changes/Def1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/continuations/changes/Def1.scala
rename to sbt-test/source-dependencies/continuations/changes/Def1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/continuations/changes/Def2.scala b/sbt-test/source-dependencies/continuations/changes/Def2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/continuations/changes/Def2.scala
rename to sbt-test/source-dependencies/continuations/changes/Def2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/continuations/pending b/sbt-test/source-dependencies/continuations/pending
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/continuations/pending
rename to sbt-test/source-dependencies/continuations/pending
diff --git a/sbt-dotty/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/continuations/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/continuations/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/cross-source/pending b/sbt-test/source-dependencies/cross-source/pending
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/cross-source/pending
rename to sbt-test/source-dependencies/cross-source/pending
diff --git a/sbt-dotty/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/cross-source/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/cross-source/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/cross-source/src/main/scala-2.10/B.scala b/sbt-test/source-dependencies/cross-source/src/main/scala-2.10/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/cross-source/src/main/scala-2.10/B.scala
rename to sbt-test/source-dependencies/cross-source/src/main/scala-2.10/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/cross-source/src/main/scala-2.9.3/B.scala b/sbt-test/source-dependencies/cross-source/src/main/scala-2.9.3/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/cross-source/src/main/scala-2.9.3/B.scala
rename to sbt-test/source-dependencies/cross-source/src/main/scala-2.9.3/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/cross-source/src/main/scala/A.scala b/sbt-test/source-dependencies/cross-source/src/main/scala/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/cross-source/src/main/scala/A.scala
rename to sbt-test/source-dependencies/cross-source/src/main/scala/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/default-params/A.scala b/sbt-test/source-dependencies/default-params/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/default-params/A.scala
rename to sbt-test/source-dependencies/default-params/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/default-params/B.scala b/sbt-test/source-dependencies/default-params/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/default-params/B.scala
rename to sbt-test/source-dependencies/default-params/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/default-params/changes/A.scala b/sbt-test/source-dependencies/default-params/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/default-params/changes/A.scala
rename to sbt-test/source-dependencies/default-params/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/default-params/test b/sbt-test/source-dependencies/default-params/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/default-params/test
rename to sbt-test/source-dependencies/default-params/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/dup-class/changes/A.scala b/sbt-test/source-dependencies/dup-class/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/dup-class/changes/A.scala
rename to sbt-test/source-dependencies/dup-class/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/dup-class/changes/A2.scala b/sbt-test/source-dependencies/dup-class/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/dup-class/changes/A2.scala
rename to sbt-test/source-dependencies/dup-class/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/dup-class/changes/B.scala b/sbt-test/source-dependencies/dup-class/changes/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/dup-class/changes/B.scala
rename to sbt-test/source-dependencies/dup-class/changes/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-modified-names/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-modified-names/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/dup-class/test b/sbt-test/source-dependencies/dup-class/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/dup-class/test
rename to sbt-test/source-dependencies/dup-class/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-a/changes/A.scala b/sbt-test/source-dependencies/empty-a/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-a/changes/A.scala
rename to sbt-test/source-dependencies/empty-a/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-a/changes/A2.scala b/sbt-test/source-dependencies/empty-a/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-a/changes/A2.scala
rename to sbt-test/source-dependencies/empty-a/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-a/changes/B.scala b/sbt-test/source-dependencies/empty-a/changes/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-a/changes/B.scala
rename to sbt-test/source-dependencies/empty-a/changes/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-a/test b/sbt-test/source-dependencies/empty-a/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-a/test
rename to sbt-test/source-dependencies/empty-a/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-modified-names/T.scala b/sbt-test/source-dependencies/empty-modified-names/T.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-modified-names/T.scala
rename to sbt-test/source-dependencies/empty-modified-names/T.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-modified-names/changes/T.scala b/sbt-test/source-dependencies/empty-modified-names/changes/T.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-modified-names/changes/T.scala
rename to sbt-test/source-dependencies/empty-modified-names/changes/T.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/empty-modified-names/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/empty-modified-names/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-modified-names/test b/sbt-test/source-dependencies/empty-modified-names/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-modified-names/test
rename to sbt-test/source-dependencies/empty-modified-names/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-package/changes/Define1.scala b/sbt-test/source-dependencies/empty-package/changes/Define1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-package/changes/Define1.scala
rename to sbt-test/source-dependencies/empty-package/changes/Define1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-package/changes/Define2.scala b/sbt-test/source-dependencies/empty-package/changes/Define2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-package/changes/Define2.scala
rename to sbt-test/source-dependencies/empty-package/changes/Define2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-package/changes/Use.scala b/sbt-test/source-dependencies/empty-package/changes/Use.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-package/changes/Use.scala
rename to sbt-test/source-dependencies/empty-package/changes/Use.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-package/test b/sbt-test/source-dependencies/empty-package/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/empty-package/test
rename to sbt-test/source-dependencies/empty-package/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/erasure/A.scala b/sbt-test/source-dependencies/erasure/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/erasure/A.scala
rename to sbt-test/source-dependencies/erasure/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/erasure/B.scala b/sbt-test/source-dependencies/erasure/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/erasure/B.scala
rename to sbt-test/source-dependencies/erasure/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/erasure/changes/A.scala b/sbt-test/source-dependencies/erasure/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/erasure/changes/A.scala
rename to sbt-test/source-dependencies/erasure/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-clauses/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/erasure/test b/sbt-test/source-dependencies/erasure/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/erasure/test
rename to sbt-test/source-dependencies/erasure/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/changed/FactoryProvider.scala b/sbt-test/source-dependencies/expanded-type-projection/changed/FactoryProvider.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/changed/FactoryProvider.scala
rename to sbt-test/source-dependencies/expanded-type-projection/changed/FactoryProvider.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/expanded-type-projection/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/expanded-type-projection/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/src/main/scala/foo/FactoryProvider.scala b/sbt-test/source-dependencies/expanded-type-projection/src/main/scala/foo/FactoryProvider.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/src/main/scala/foo/FactoryProvider.scala
rename to sbt-test/source-dependencies/expanded-type-projection/src/main/scala/foo/FactoryProvider.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/src/main/scala/foo/Lib.scala b/sbt-test/source-dependencies/expanded-type-projection/src/main/scala/foo/Lib.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/src/main/scala/foo/Lib.scala
rename to sbt-test/source-dependencies/expanded-type-projection/src/main/scala/foo/Lib.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/src/main/scala/foo/Usage.scala b/sbt-test/source-dependencies/expanded-type-projection/src/main/scala/foo/Usage.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/src/main/scala/foo/Usage.scala
rename to sbt-test/source-dependencies/expanded-type-projection/src/main/scala/foo/Usage.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/test b/sbt-test/source-dependencies/expanded-type-projection/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/test
rename to sbt-test/source-dependencies/expanded-type-projection/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/A.scala b/sbt-test/source-dependencies/export-clauses/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-clauses/A.scala
rename to sbt-test/source-dependencies/export-clauses/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/B.scala b/sbt-test/source-dependencies/export-clauses/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-clauses/B.scala
rename to sbt-test/source-dependencies/export-clauses/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/C.scala b/sbt-test/source-dependencies/export-clauses/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-clauses/C.scala
rename to sbt-test/source-dependencies/export-clauses/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/D.scala b/sbt-test/source-dependencies/export-clauses/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-clauses/D.scala
rename to sbt-test/source-dependencies/export-clauses/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/build.sbt b/sbt-test/source-dependencies/export-clauses/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-clauses/build.sbt
rename to sbt-test/source-dependencies/export-clauses/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/changes/B1.scala b/sbt-test/source-dependencies/export-clauses/changes/B1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-clauses/changes/B1.scala
rename to sbt-test/source-dependencies/export-clauses/changes/B1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/changes/C1.scala b/sbt-test/source-dependencies/export-clauses/changes/C1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-clauses/changes/C1.scala
rename to sbt-test/source-dependencies/export-clauses/changes/C1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/changes/D1.scala b/sbt-test/source-dependencies/export-clauses/changes/D1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-clauses/changes/D1.scala
rename to sbt-test/source-dependencies/export-clauses/changes/D1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/project/CompileState.scala b/sbt-test/source-dependencies/export-clauses/project/CompileState.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-clauses/project/CompileState.scala
rename to sbt-test/source-dependencies/export-clauses/project/CompileState.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars2/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/export-clauses/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars2/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/export-clauses/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/test b/sbt-test/source-dependencies/export-clauses/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-clauses/test
rename to sbt-test/source-dependencies/export-clauses/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars/build.sbt b/sbt-test/source-dependencies/export-jars/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars/build.sbt
rename to sbt-test/source-dependencies/export-jars/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars/changes/A1.scala b/sbt-test/source-dependencies/export-jars/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars/changes/A1.scala
rename to sbt-test/source-dependencies/export-jars/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars/changes/A2.scala b/sbt-test/source-dependencies/export-jars/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars/changes/A2.scala
rename to sbt-test/source-dependencies/export-jars/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars/changes/A3.scala b/sbt-test/source-dependencies/export-jars/changes/A3.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars/changes/A3.scala
rename to sbt-test/source-dependencies/export-jars/changes/A3.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars/changes/B.scala b/sbt-test/source-dependencies/export-jars/changes/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars/changes/B.scala
rename to sbt-test/source-dependencies/export-jars/changes/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars/changes/build2.sbt b/sbt-test/source-dependencies/export-jars/changes/build2.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars/changes/build2.sbt
rename to sbt-test/source-dependencies/export-jars/changes/build2.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars/test b/sbt-test/source-dependencies/export-jars/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars/test
rename to sbt-test/source-dependencies/export-jars/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars2/a/A.scala b/sbt-test/source-dependencies/export-jars2/a/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars2/a/A.scala
rename to sbt-test/source-dependencies/export-jars2/a/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars2/b/B.scala b/sbt-test/source-dependencies/export-jars2/b/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars2/b/B.scala
rename to sbt-test/source-dependencies/export-jars2/b/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars2/build.sbt b/sbt-test/source-dependencies/export-jars2/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars2/build.sbt
rename to sbt-test/source-dependencies/export-jars2/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars2/changes/A1.scala b/sbt-test/source-dependencies/export-jars2/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars2/changes/A1.scala
rename to sbt-test/source-dependencies/export-jars2/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars2/changes/B1.scala b/sbt-test/source-dependencies/export-jars2/changes/B1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars2/changes/B1.scala
rename to sbt-test/source-dependencies/export-jars2/changes/B1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/export-jars2/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/export-jars2/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars2/test b/sbt-test/source-dependencies/export-jars2/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/export-jars2/test
rename to sbt-test/source-dependencies/export-jars2/test
diff --git a/sbt-test/source-dependencies/extension-change-second-tparams/A.scala b/sbt-test/source-dependencies/extension-change-second-tparams/A.scala
new file mode 100644
index 000000000000..9726ab97fa95
--- /dev/null
+++ b/sbt-test/source-dependencies/extension-change-second-tparams/A.scala
@@ -0,0 +1,7 @@
+object A {
+
+  class Box[T](val value: T)
+
+  extension (box: Box[Int]) def map[I <: Int](f: Int => I): Box[I] = new Box(f(box.value))
+
+}
diff --git a/sbt-test/source-dependencies/extension-change-second-tparams/B.scala b/sbt-test/source-dependencies/extension-change-second-tparams/B.scala
new file mode 100644
index 000000000000..9faedc0666d3
--- /dev/null
+++ b/sbt-test/source-dependencies/extension-change-second-tparams/B.scala
@@ -0,0 +1,6 @@
+import A.Box
+import A.map
+
+class B {
+  val n = Box(5).map(x => x * 3)
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/build.sbt b/sbt-test/source-dependencies/extension-change-second-tparams/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline-inherited/build.sbt
rename to sbt-test/source-dependencies/extension-change-second-tparams/build.sbt
diff --git a/sbt-test/source-dependencies/extension-change-second-tparams/changes/A1.scala b/sbt-test/source-dependencies/extension-change-second-tparams/changes/A1.scala
new file mode 100644
index 000000000000..505d037ceb6b
--- /dev/null
+++ b/sbt-test/source-dependencies/extension-change-second-tparams/changes/A1.scala
@@ -0,0 +1,7 @@
+object A {
+
+  class Box[T](val value: T)
+
+  extension (box: Box[Int]) def map[I](f: Int => I): Box[I] = new Box(f(box.value))
+
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/project/CompileState.scala b/sbt-test/source-dependencies/extension-change-second-tparams/project/CompileState.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline-inherited/project/CompileState.scala
rename to sbt-test/source-dependencies/extension-change-second-tparams/project/CompileState.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/extension-change-second-tparams/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/extension-change-second-tparams/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/extension-change-second-tparams/test b/sbt-test/source-dependencies/extension-change-second-tparams/test
new file mode 100644
index 000000000000..9b96674ac362
--- /dev/null
+++ b/sbt-test/source-dependencies/extension-change-second-tparams/test
@@ -0,0 +1,7 @@
+> compile
+> recordPreviousIterations
+# Force recompilation of B because A.map, called by B.n, has changed
+$ copy-file changes/A1.scala A.scala
+> compile
+# 1 to recompile A, then 1 more to recompile B due to A.map change
+> checkIterations 2
diff --git a/sbt-dotty/sbt-test/source-dependencies/false-error/A.scala b/sbt-test/source-dependencies/false-error/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/false-error/A.scala
rename to sbt-test/source-dependencies/false-error/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/false-error/B.scala b/sbt-test/source-dependencies/false-error/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/false-error/B.scala
rename to sbt-test/source-dependencies/false-error/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/false-error/changes/A.scala b/sbt-test/source-dependencies/false-error/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/false-error/changes/A.scala
rename to sbt-test/source-dependencies/false-error/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/false-error/pending b/sbt-test/source-dependencies/false-error/pending
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/false-error/pending
rename to sbt-test/source-dependencies/false-error/pending
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala b/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala
rename to sbt-test/source-dependencies/fbounded-existentials/fbounds.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/test b/sbt-test/source-dependencies/fbounded-existentials/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/test
rename to sbt-test/source-dependencies/fbounded-existentials/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-params/A.scala b/sbt-test/source-dependencies/implicit-params/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-params/A.scala
rename to sbt-test/source-dependencies/implicit-params/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-params/B.scala b/sbt-test/source-dependencies/implicit-params/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-params/B.scala
rename to sbt-test/source-dependencies/implicit-params/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-params/changes/A.scala b/sbt-test/source-dependencies/implicit-params/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-params/changes/A.scala
rename to sbt-test/source-dependencies/implicit-params/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-params/test b/sbt-test/source-dependencies/implicit-params/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-params/test
rename to sbt-test/source-dependencies/implicit-params/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala b/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala
rename to sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala b/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala
rename to sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala b/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala
rename to sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala b/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala
rename to sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala b/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala
rename to sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/test b/sbt-test/source-dependencies/implicit-search-companion-scope/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/test
rename to sbt-test/source-dependencies/implicit-search-companion-scope/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A1.scala b/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A1.scala
rename to sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A2.scala b/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A2.scala
rename to sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/B.scala b/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/B.scala
rename to sbt-test/source-dependencies/implicit-search-higher-kinded/changes/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/C.scala b/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/C.scala
rename to sbt-test/source-dependencies/implicit-search-higher-kinded/changes/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/M.scala b/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/M.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/M.scala
rename to sbt-test/source-dependencies/implicit-search-higher-kinded/changes/M.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/implicit-search-higher-kinded/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/implicit-search-higher-kinded/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/test b/sbt-test/source-dependencies/implicit-search-higher-kinded/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/test
rename to sbt-test/source-dependencies/implicit-search-higher-kinded/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/A1.scala b/sbt-test/source-dependencies/implicit-search/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/A1.scala
rename to sbt-test/source-dependencies/implicit-search/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/A2.scala b/sbt-test/source-dependencies/implicit-search/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/A2.scala
rename to sbt-test/source-dependencies/implicit-search/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/B.scala b/sbt-test/source-dependencies/implicit-search/changes/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/B.scala
rename to sbt-test/source-dependencies/implicit-search/changes/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/C.scala b/sbt-test/source-dependencies/implicit-search/changes/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/C.scala
rename to sbt-test/source-dependencies/implicit-search/changes/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search/test b/sbt-test/source-dependencies/implicit-search/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit-search/test
rename to sbt-test/source-dependencies/implicit-search/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit/A.scala b/sbt-test/source-dependencies/implicit/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit/A.scala
rename to sbt-test/source-dependencies/implicit/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit/B.scala b/sbt-test/source-dependencies/implicit/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit/B.scala
rename to sbt-test/source-dependencies/implicit/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit/changes/A.scala b/sbt-test/source-dependencies/implicit/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit/changes/A.scala
rename to sbt-test/source-dependencies/implicit/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit/test b/sbt-test/source-dependencies/implicit/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/implicit/test
rename to sbt-test/source-dependencies/implicit/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/import-class/A.scala b/sbt-test/source-dependencies/import-class/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/import-class/A.scala
rename to sbt-test/source-dependencies/import-class/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/import-class/B.scala b/sbt-test/source-dependencies/import-class/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/import-class/B.scala
rename to sbt-test/source-dependencies/import-class/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/import-class/changes/A.scala b/sbt-test/source-dependencies/import-class/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/import-class/changes/A.scala
rename to sbt-test/source-dependencies/import-class/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/import-class/test b/sbt-test/source-dependencies/import-class/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/import-class/test
rename to sbt-test/source-dependencies/import-class/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/import-package/A.scala b/sbt-test/source-dependencies/import-package/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/import-package/A.scala
rename to sbt-test/source-dependencies/import-package/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/import-package/B.scala b/sbt-test/source-dependencies/import-package/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/import-package/B.scala
rename to sbt-test/source-dependencies/import-package/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/import-package/changes/A.scala b/sbt-test/source-dependencies/import-package/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/import-package/changes/A.scala
rename to sbt-test/source-dependencies/import-package/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/import-package/pending b/sbt-test/source-dependencies/import-package/pending
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/import-package/pending
rename to sbt-test/source-dependencies/import-package/pending
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/A.java b/sbt-test/source-dependencies/inherited-deps-java/A.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/A.java
rename to sbt-test/source-dependencies/inherited-deps-java/A.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/B.java b/sbt-test/source-dependencies/inherited-deps-java/B.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/B.java
rename to sbt-test/source-dependencies/inherited-deps-java/B.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/C.java b/sbt-test/source-dependencies/inherited-deps-java/C.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/C.java
rename to sbt-test/source-dependencies/inherited-deps-java/C.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/D.java b/sbt-test/source-dependencies/inherited-deps-java/D.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/D.java
rename to sbt-test/source-dependencies/inherited-deps-java/D.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/E.java b/sbt-test/source-dependencies/inherited-deps-java/E.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/E.java
rename to sbt-test/source-dependencies/inherited-deps-java/E.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/F.java b/sbt-test/source-dependencies/inherited-deps-java/F.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/F.java
rename to sbt-test/source-dependencies/inherited-deps-java/F.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/G.java b/sbt-test/source-dependencies/inherited-deps-java/G.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/G.java
rename to sbt-test/source-dependencies/inherited-deps-java/G.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/J.java b/sbt-test/source-dependencies/inherited-deps-java/J.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/J.java
rename to sbt-test/source-dependencies/inherited-deps-java/J.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/build.sbt b/sbt-test/source-dependencies/inherited-deps-java/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/build.sbt
rename to sbt-test/source-dependencies/inherited-deps-java/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/disabled b/sbt-test/source-dependencies/inherited-deps-java/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/disabled
rename to sbt-test/source-dependencies/inherited-deps-java/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/A.scala b/sbt-test/source-dependencies/inherited_type_params/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited_type_params/A.scala
rename to sbt-test/source-dependencies/inherited_type_params/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/build.sbt b/sbt-test/source-dependencies/inherited_type_params/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited_type_params/build.sbt
rename to sbt-test/source-dependencies/inherited_type_params/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/test b/sbt-test/source-dependencies/inherited_type_params/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inherited_type_params/test
rename to sbt-test/source-dependencies/inherited_type_params/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/A.scala b/sbt-test/source-dependencies/inline-inherited/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline-inherited/A.scala
rename to sbt-test/source-dependencies/inline-inherited/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/B.scala b/sbt-test/source-dependencies/inline-inherited/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline-inherited/B.scala
rename to sbt-test/source-dependencies/inline-inherited/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/C.scala b/sbt-test/source-dependencies/inline-inherited/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline-inherited/C.scala
rename to sbt-test/source-dependencies/inline-inherited/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class/build.sbt b/sbt-test/source-dependencies/inline-inherited/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class/build.sbt
rename to sbt-test/source-dependencies/inline-inherited/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/changes/B1.scala b/sbt-test/source-dependencies/inline-inherited/changes/B1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline-inherited/changes/B1.scala
rename to sbt-test/source-dependencies/inline-inherited/changes/B1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/dbg.sbt b/sbt-test/source-dependencies/inline-inherited/dbg.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline-inherited/dbg.sbt
rename to sbt-test/source-dependencies/inline-inherited/dbg.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class/project/CompileState.scala b/sbt-test/source-dependencies/inline-inherited/project/CompileState.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class/project/CompileState.scala
rename to sbt-test/source-dependencies/inline-inherited/project/CompileState.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-inherited/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inline-inherited/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/test b/sbt-test/source-dependencies/inline-inherited/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline-inherited/test
rename to sbt-test/source-dependencies/inline-inherited/test
diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/A.scala b/sbt-test/source-dependencies/inline-rec-change-inline/A.scala
new file mode 100644
index 000000000000..d06100a22564
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-inline/A.scala
@@ -0,0 +1,5 @@
+object A {
+
+  inline def callInline: Any = B.inlinedAny("yyy")
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/B.scala b/sbt-test/source-dependencies/inline-rec-change-inline/B.scala
new file mode 100644
index 000000000000..61e61a620957
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-inline/B.scala
@@ -0,0 +1,5 @@
+object B {
+
+  inline def inlinedAny(x: String): x.type = x
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/C.scala b/sbt-test/source-dependencies/inline-rec-change-inline/C.scala
new file mode 100644
index 000000000000..e6511852afa1
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-inline/C.scala
@@ -0,0 +1,3 @@
+class C {
+  val n = A.callInline
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-object/build.sbt b/sbt-test/source-dependencies/inline-rec-change-inline/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-object/build.sbt
rename to sbt-test/source-dependencies/inline-rec-change-inline/build.sbt
diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/changes/B1.scala b/sbt-test/source-dependencies/inline-rec-change-inline/changes/B1.scala
new file mode 100644
index 000000000000..4a1c47d38572
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-inline/changes/B1.scala
@@ -0,0 +1,5 @@
+object B {
+
+  inline def inlinedAny(inline x: String): x.type = x
+
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-object/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-change-inline/project/CompileState.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-object/project/CompileState.scala
rename to sbt-test/source-dependencies/inline-rec-change-inline/project/CompileState.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-object/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-change-inline/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-object/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inline-rec-change-inline/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/test b/sbt-test/source-dependencies/inline-rec-change-inline/test
new file mode 100644
index 000000000000..c06f4da8cd78
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-inline/test
@@ -0,0 +1,9 @@
+> compile
+> recordPreviousIterations
+# Force recompilation of A because B.inlinedAny, called by A.callInline, has added
+# the inline flag to one of its parameters.
+$ copy-file changes/B1.scala B.scala
+> compile
+# 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change,
+# then 1 final compilation to recompile C due to A.callInline change
+> checkIterations 3
diff --git a/sbt-test/source-dependencies/inline-rec-change-param/A.scala b/sbt-test/source-dependencies/inline-rec-change-param/A.scala
new file mode 100644
index 000000000000..d06100a22564
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-param/A.scala
@@ -0,0 +1,5 @@
+object A {
+
+  inline def callInline: Any = B.inlinedAny("yyy")
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-param/B.scala b/sbt-test/source-dependencies/inline-rec-change-param/B.scala
new file mode 100644
index 000000000000..61e61a620957
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-param/B.scala
@@ -0,0 +1,5 @@
+object B {
+
+  inline def inlinedAny(x: String): x.type = x
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-param/C.scala b/sbt-test/source-dependencies/inline-rec-change-param/C.scala
new file mode 100644
index 000000000000..e6511852afa1
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-param/C.scala
@@ -0,0 +1,3 @@
+class C {
+  val n = A.callInline
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/build.sbt b/sbt-test/source-dependencies/inline-rec-change-param/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/build.sbt
rename to sbt-test/source-dependencies/inline-rec-change-param/build.sbt
diff --git a/sbt-test/source-dependencies/inline-rec-change-param/changes/B1.scala b/sbt-test/source-dependencies/inline-rec-change-param/changes/B1.scala
new file mode 100644
index 000000000000..5e0e374ed105
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-param/changes/B1.scala
@@ -0,0 +1,5 @@
+object B {
+
+  inline def inlinedAny(x: Any): x.type = x
+
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-change-param/project/CompileState.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/CompileState.scala
rename to sbt-test/source-dependencies/inline-rec-change-param/project/CompileState.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-change-param/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inline-rec-change-param/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/inline-rec-change-param/test b/sbt-test/source-dependencies/inline-rec-change-param/test
new file mode 100644
index 000000000000..22468b12f690
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-param/test
@@ -0,0 +1,9 @@
+> compile
+> recordPreviousIterations
+# Force recompilation of A because B.inlinedAny, called by A.callInline, has changed
+# the type of its parameters.
+$ copy-file changes/B1.scala B.scala
+> compile
+# 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change,
+# then 1 final compilation to recompile C due to A.callInline change
+> checkIterations 3
diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/A.scala b/sbt-test/source-dependencies/inline-rec-change-res-transparent/A.scala
new file mode 100644
index 000000000000..d06100a22564
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/A.scala
@@ -0,0 +1,5 @@
+object A {
+
+  inline def callInline: Any = B.inlinedAny("yyy")
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/B.scala b/sbt-test/source-dependencies/inline-rec-change-res-transparent/B.scala
new file mode 100644
index 000000000000..8a04e33a0428
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/B.scala
@@ -0,0 +1,5 @@
+object B {
+
+  transparent inline def inlinedAny(x: String): x.type = x
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/C.scala b/sbt-test/source-dependencies/inline-rec-change-res-transparent/C.scala
new file mode 100644
index 000000000000..e6511852afa1
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/C.scala
@@ -0,0 +1,3 @@
+class C {
+  val n = A.callInline
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/build.sbt b/sbt-test/source-dependencies/inline-rec-change-res-transparent/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv/build.sbt
rename to sbt-test/source-dependencies/inline-rec-change-res-transparent/build.sbt
diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/changes/B1.scala b/sbt-test/source-dependencies/inline-rec-change-res-transparent/changes/B1.scala
new file mode 100644
index 000000000000..6cbe84dbb2b8
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/changes/B1.scala
@@ -0,0 +1,5 @@
+object B {
+
+  transparent inline def inlinedAny(x: String): String = x
+
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-change-res-transparent/project/CompileState.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/CompileState.scala
rename to sbt-test/source-dependencies/inline-rec-change-res-transparent/project/CompileState.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-change-res-transparent/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inline-rec-change-res-transparent/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/test b/sbt-test/source-dependencies/inline-rec-change-res-transparent/test
new file mode 100644
index 000000000000..7cd958b92dd6
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/test
@@ -0,0 +1,9 @@
+> compile
+> recordPreviousIterations
+# Force recompilation of A because B.inlinedAny, called by A.callInline, has changed
+# the type of its result, while being an inline method.
+$ copy-file changes/B1.scala B.scala
+> compile
+# 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change,
+# then 1 final compilation to recompile C due to A.callInline change
+> checkIterations 3
diff --git a/sbt-test/source-dependencies/inline-rec-change-res/A.scala b/sbt-test/source-dependencies/inline-rec-change-res/A.scala
new file mode 100644
index 000000000000..d06100a22564
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-res/A.scala
@@ -0,0 +1,5 @@
+object A {
+
+  inline def callInline: Any = B.inlinedAny("yyy")
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-res/B.scala b/sbt-test/source-dependencies/inline-rec-change-res/B.scala
new file mode 100644
index 000000000000..61e61a620957
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-res/B.scala
@@ -0,0 +1,5 @@
+object B {
+
+  inline def inlinedAny(x: String): x.type = x
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-res/C.scala b/sbt-test/source-dependencies/inline-rec-change-res/C.scala
new file mode 100644
index 000000000000..e6511852afa1
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-res/C.scala
@@ -0,0 +1,3 @@
+class C {
+  val n = A.callInline
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/restore-classes/build.sbt b/sbt-test/source-dependencies/inline-rec-change-res/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/restore-classes/build.sbt
rename to sbt-test/source-dependencies/inline-rec-change-res/build.sbt
diff --git a/sbt-test/source-dependencies/inline-rec-change-res/changes/B1.scala b/sbt-test/source-dependencies/inline-rec-change-res/changes/B1.scala
new file mode 100644
index 000000000000..eaeef8d57ece
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-res/changes/B1.scala
@@ -0,0 +1,5 @@
+object B {
+
+  inline def inlinedAny(x: String): String = x
+
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-change-res/project/CompileState.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/restore-classes/project/CompileState.scala
rename to sbt-test/source-dependencies/inline-rec-change-res/project/CompileState.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-change-res/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inline-rec-change-res/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/inline-rec-change-res/test b/sbt-test/source-dependencies/inline-rec-change-res/test
new file mode 100644
index 000000000000..5972abf58136
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-res/test
@@ -0,0 +1,9 @@
+> compile
+> recordPreviousIterations
+# Force recompilation of A because B.inlinedAny, called by A.callInline, has changed
+# the type of its result.
+$ copy-file changes/B1.scala B.scala
+> compile
+# 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change,
+# then 1 final compilation to recompile C due to A.callInline change
+> checkIterations 3
diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/A.scala b/sbt-test/source-dependencies/inline-rec-change-typaram/A.scala
new file mode 100644
index 000000000000..fadbc929841a
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-typaram/A.scala
@@ -0,0 +1,5 @@
+object A {
+
+  inline def callInline: Any = B.inlinedAny(List("yyy"))
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/B.scala b/sbt-test/source-dependencies/inline-rec-change-typaram/B.scala
new file mode 100644
index 000000000000..8501c4c676a0
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-typaram/B.scala
@@ -0,0 +1,5 @@
+object B {
+
+  inline def inlinedAny[F[_], T](x: F[T]): x.type = x
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/C.scala b/sbt-test/source-dependencies/inline-rec-change-typaram/C.scala
new file mode 100644
index 000000000000..e6511852afa1
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-typaram/C.scala
@@ -0,0 +1,3 @@
+class C {
+  val n = A.callInline
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/build.sbt b/sbt-test/source-dependencies/inline-rec-change-typaram/build.sbt
new file mode 100644
index 000000000000..1036709ccfc1
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-typaram/build.sbt
@@ -0,0 +1,25 @@
+import sbt.internal.inc.Analysis
+import complete.DefaultParsers._
+
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
+
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
+
+checkIterations := {
+  val expected: Int = (Space ~> NatBasic).parsed
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
+  assert(expected == actual, s"Expected $expected compilations, got $actual")
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/changes/B1.scala b/sbt-test/source-dependencies/inline-rec-change-typaram/changes/B1.scala
new file mode 100644
index 000000000000..73e33ccdfd96
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-typaram/changes/B1.scala
@@ -0,0 +1,5 @@
+object B {
+
+  inline def inlinedAny[F[X] >: List[X] <: List[X], T <: String](x: F[T]): x.type = x
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-change-typaram/project/CompileState.scala
new file mode 100644
index 000000000000..078db9c7bf56
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-typaram/project/CompileState.scala
@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/missing-annot/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-change-typaram/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/missing-annot/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inline-rec-change-typaram/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/test b/sbt-test/source-dependencies/inline-rec-change-typaram/test
new file mode 100644
index 000000000000..7e18665f3c27
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-change-typaram/test
@@ -0,0 +1,9 @@
+> compile
+> recordPreviousIterations
+# Force recompilation of A because B.inlinedAny, called by A.callInline, has changed
+# the type of its type parameters.
+$ copy-file changes/B1.scala B.scala
+> compile
+# 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change,
+# then 1 final compilation to recompile C due to A.callInline change
+> checkIterations 3
diff --git a/sbt-test/source-dependencies/inline-rec-deep/A.scala b/sbt-test/source-dependencies/inline-rec-deep/A.scala
new file mode 100644
index 000000000000..799104b58ba3
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-deep/A.scala
@@ -0,0 +1,5 @@
+object A {
+
+  inline def callInline: Any = B.delegated
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-deep/B.scala b/sbt-test/source-dependencies/inline-rec-deep/B.scala
new file mode 100644
index 000000000000..4ed6616db186
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-deep/B.scala
@@ -0,0 +1,5 @@
+object B {
+
+  inline def delegated: Any = C.inlinedAny(x = "yyy", y = 23)
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-deep/C.scala b/sbt-test/source-dependencies/inline-rec-deep/C.scala
new file mode 100644
index 000000000000..57ce05b0d2cf
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-deep/C.scala
@@ -0,0 +1,5 @@
+object C {
+
+  inline def inlinedAny(x: String, y: Int): x.type = x
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-deep/D.scala b/sbt-test/source-dependencies/inline-rec-deep/D.scala
new file mode 100644
index 000000000000..3f87831200d3
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-deep/D.scala
@@ -0,0 +1,3 @@
+class D {
+  val n = A.callInline
+}
diff --git a/sbt-test/source-dependencies/inline-rec-deep/build.sbt b/sbt-test/source-dependencies/inline-rec-deep/build.sbt
new file mode 100644
index 000000000000..1036709ccfc1
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-deep/build.sbt
@@ -0,0 +1,25 @@
+import sbt.internal.inc.Analysis
+import complete.DefaultParsers._
+
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
+
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
+
+checkIterations := {
+  val expected: Int = (Space ~> NatBasic).parsed
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
+  assert(expected == actual, s"Expected $expected compilations, got $actual")
+}
diff --git a/sbt-test/source-dependencies/inline-rec-deep/changes/C1.scala b/sbt-test/source-dependencies/inline-rec-deep/changes/C1.scala
new file mode 100644
index 000000000000..4456cc87e252
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-deep/changes/C1.scala
@@ -0,0 +1,5 @@
+object C {
+
+  inline def inlinedAny(y: Int, x: String): x.type = x
+
+}
diff --git a/sbt-test/source-dependencies/inline-rec-deep/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-deep/project/CompileState.scala
new file mode 100644
index 000000000000..078db9c7bf56
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-deep/project/CompileState.scala
@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-overload/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-deep/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-overload/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inline-rec-deep/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/inline-rec-deep/test b/sbt-test/source-dependencies/inline-rec-deep/test
new file mode 100644
index 000000000000..5381ef195868
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-deep/test
@@ -0,0 +1,10 @@
+> compile
+> recordPreviousIterations
+# Force recompilation of B because C.inlinedAny, called by B.delegated, has changed
+# the order of its parameters.
+$ copy-file changes/C1.scala C.scala
+> compile
+# 1 to recompile C, then 1 more to recompile B due to C.inlinedAny change,
+# then 1 more to recompile A due to B.delegated change, then 1 final compilation
+# to recompile D due to A.callInline change
+> checkIterations 4
diff --git a/sbt-test/source-dependencies/inline-rec-mut/A.scala b/sbt-test/source-dependencies/inline-rec-mut/A.scala
new file mode 100644
index 000000000000..31e281b8028f
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-mut/A.scala
@@ -0,0 +1,8 @@
+object A {
+  inline def isEven(inline x: Int): Boolean = {
+    inline if x % 2 == 0 then
+      true
+    else
+      !B.isOdd(x)
+  }
+}
diff --git a/sbt-test/source-dependencies/inline-rec-mut/B.scala b/sbt-test/source-dependencies/inline-rec-mut/B.scala
new file mode 100644
index 000000000000..d01bf3cc7265
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-mut/B.scala
@@ -0,0 +1,8 @@
+object B {
+  inline def isOdd(inline x: Int): Boolean = {
+    inline if x % 2 != 0 then
+      true
+    else
+      !A.isEven(x)
+  }
+}
diff --git a/sbt-test/source-dependencies/inline-rec-mut/C.scala b/sbt-test/source-dependencies/inline-rec-mut/C.scala
new file mode 100644
index 000000000000..d286cb59c060
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-mut/C.scala
@@ -0,0 +1,3 @@
+class C {
+  val n = A.isEven(23)
+}
diff --git a/sbt-test/source-dependencies/inline-rec-mut/build.sbt b/sbt-test/source-dependencies/inline-rec-mut/build.sbt
new file mode 100644
index 000000000000..1036709ccfc1
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-mut/build.sbt
@@ -0,0 +1,25 @@
+import sbt.internal.inc.Analysis
+import complete.DefaultParsers._
+
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
+
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
+
+checkIterations := {
+  val expected: Int = (Space ~> NatBasic).parsed
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
+  assert(expected == actual, s"Expected $expected compilations, got $actual")
+}
diff --git a/sbt-test/source-dependencies/inline-rec-mut/changes/B1.scala b/sbt-test/source-dependencies/inline-rec-mut/changes/B1.scala
new file mode 100644
index 000000000000..8849df65f516
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-mut/changes/B1.scala
@@ -0,0 +1,9 @@
+object B {
+  inline def isOdd(inline x: Int): Boolean = {
+    inline if x % 2 == 0 then
+      val cached = A.isEven(x)
+      !(cached || cached)
+    else
+      true
+  }
+}
diff --git a/sbt-test/source-dependencies/inline-rec-mut/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-mut/project/CompileState.scala
new file mode 100644
index 000000000000..078db9c7bf56
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-mut/project/CompileState.scala
@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-override/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-mut/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-override/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inline-rec-mut/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/inline-rec-mut/test b/sbt-test/source-dependencies/inline-rec-mut/test
new file mode 100644
index 000000000000..0cca3a11d161
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-mut/test
@@ -0,0 +1,11 @@
+> compile
+> recordPreviousIterations
+# Force recompilation of A because B.isOdd, called by A.isEven,
+# has changed, this should force C to recompile
+$ copy-file changes/B1.scala B.scala
+> compile
+# 1 to recompile B, then 1 more to recompile:
+# - A due to B.isOdd change
+# - B due to A.isEven change
+# - C due to A.isEven change
+> checkIterations 2
diff --git a/sbt-test/source-dependencies/inline-rec-val/A.scala b/sbt-test/source-dependencies/inline-rec-val/A.scala
new file mode 100644
index 000000000000..21c4f75fd4f0
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-val/A.scala
@@ -0,0 +1,5 @@
+object A {
+  inline def callInline: Int = inlinedInt
+
+  inline val inlinedInt = 23
+}
diff --git a/sbt-test/source-dependencies/inline-rec-val/B.scala b/sbt-test/source-dependencies/inline-rec-val/B.scala
new file mode 100644
index 000000000000..eed1cb60271e
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-val/B.scala
@@ -0,0 +1,3 @@
+class B {
+  val n = A.callInline
+}
diff --git a/sbt-test/source-dependencies/inline-rec-val/build.sbt b/sbt-test/source-dependencies/inline-rec-val/build.sbt
new file mode 100644
index 000000000000..1036709ccfc1
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-val/build.sbt
@@ -0,0 +1,25 @@
+import sbt.internal.inc.Analysis
+import complete.DefaultParsers._
+
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
+
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
+
+checkIterations := {
+  val expected: Int = (Space ~> NatBasic).parsed
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
+  assert(expected == actual, s"Expected $expected compilations, got $actual")
+}
diff --git a/sbt-test/source-dependencies/inline-rec-val/changes/A1.scala b/sbt-test/source-dependencies/inline-rec-val/changes/A1.scala
new file mode 100644
index 000000000000..2c687006f58f
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-val/changes/A1.scala
@@ -0,0 +1,5 @@
+object A {
+  inline def callInline: Int = inlinedInt
+
+  inline val inlinedInt = 47
+}
diff --git a/sbt-test/source-dependencies/inline-rec-val/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-val/project/CompileState.scala
new file mode 100644
index 000000000000..078db9c7bf56
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-val/project/CompileState.scala
@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-val/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inline-rec-val/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/inline-rec-val/test b/sbt-test/source-dependencies/inline-rec-val/test
new file mode 100644
index 000000000000..1716f03c6c82
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec-val/test
@@ -0,0 +1,7 @@
+> compile
+> recordPreviousIterations
+# Force recompilation of B because A.inlinedInt, called by A.callInline, has changed
+$ copy-file changes/A1.scala A.scala
+> compile
+# 1 to recompile A, then 1 more to recompile B due to A.inlinedInt change
+> checkIterations 2
diff --git a/sbt-test/source-dependencies/inline-rec/A.scala b/sbt-test/source-dependencies/inline-rec/A.scala
new file mode 100644
index 000000000000..6bf7ee29cda2
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec/A.scala
@@ -0,0 +1,5 @@
+object A {
+  inline def callInline: Int = inlinedInt
+
+  inline def inlinedInt: Int = 23
+}
diff --git a/sbt-test/source-dependencies/inline-rec/B.scala b/sbt-test/source-dependencies/inline-rec/B.scala
new file mode 100644
index 000000000000..eed1cb60271e
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec/B.scala
@@ -0,0 +1,3 @@
+class B {
+  val n = A.callInline
+}
diff --git a/sbt-test/source-dependencies/inline-rec/build.sbt b/sbt-test/source-dependencies/inline-rec/build.sbt
new file mode 100644
index 000000000000..1036709ccfc1
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec/build.sbt
@@ -0,0 +1,25 @@
+import sbt.internal.inc.Analysis
+import complete.DefaultParsers._
+
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
+
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
+
+checkIterations := {
+  val expected: Int = (Space ~> NatBasic).parsed
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
+  assert(expected == actual, s"Expected $expected compilations, got $actual")
+}
diff --git a/sbt-test/source-dependencies/inline-rec/changes/A1.scala b/sbt-test/source-dependencies/inline-rec/changes/A1.scala
new file mode 100644
index 000000000000..32941f30d8ab
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec/changes/A1.scala
@@ -0,0 +1,5 @@
+object A {
+  inline def callInline: Int = inlinedInt
+
+  inline def inlinedInt: Int = 47
+}
diff --git a/sbt-test/source-dependencies/inline-rec/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec/project/CompileState.scala
new file mode 100644
index 000000000000..078db9c7bf56
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec/project/CompileState.scala
@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/change-refinement/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/change-refinement/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inline-rec/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/inline-rec/test b/sbt-test/source-dependencies/inline-rec/test
new file mode 100644
index 000000000000..1716f03c6c82
--- /dev/null
+++ b/sbt-test/source-dependencies/inline-rec/test
@@ -0,0 +1,7 @@
+> compile
+> recordPreviousIterations
+# Force recompilation of B because A.inlinedInt, called by A.callInline, has changed
+$ copy-file changes/A1.scala A.scala
+> compile
+# 1 to recompile A, then 1 more to recompile B due to A.inlinedInt change
+> checkIterations 2
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline/A.scala b/sbt-test/source-dependencies/inline/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline/A.scala
rename to sbt-test/source-dependencies/inline/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline/C.scala b/sbt-test/source-dependencies/inline/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline/C.scala
rename to sbt-test/source-dependencies/inline/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline/changes/B1.scala b/sbt-test/source-dependencies/inline/changes/B1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline/changes/B1.scala
rename to sbt-test/source-dependencies/inline/changes/B1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline/changes/B2.scala b/sbt-test/source-dependencies/inline/changes/B2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline/changes/B2.scala
rename to sbt-test/source-dependencies/inline/changes/B2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline/changes/B3.scala b/sbt-test/source-dependencies/inline/changes/B3.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline/changes/B3.scala
rename to sbt-test/source-dependencies/inline/changes/B3.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/move-method/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/move-method/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inline/test b/sbt-test/source-dependencies/inline/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inline/test
rename to sbt-test/source-dependencies/inline/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/JJ.java b/sbt-test/source-dependencies/inner-class-java-depends-on-scala/JJ.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/JJ.java
rename to sbt-test/source-dependencies/inner-class-java-depends-on-scala/JJ.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/build.sbt b/sbt-test/source-dependencies/inner-class-java-depends-on-scala/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/build.sbt
rename to sbt-test/source-dependencies/inner-class-java-depends-on-scala/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/changes/S1.scala b/sbt-test/source-dependencies/inner-class-java-depends-on-scala/changes/S1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/changes/S1.scala
rename to sbt-test/source-dependencies/inner-class-java-depends-on-scala/changes/S1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/changes/S2.scala b/sbt-test/source-dependencies/inner-class-java-depends-on-scala/changes/S2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/changes/S2.scala
rename to sbt-test/source-dependencies/inner-class-java-depends-on-scala/changes/S2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inner-class-java-depends-on-scala/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inner-class-java-depends-on-scala/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/test b/sbt-test/source-dependencies/inner-class-java-depends-on-scala/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/test
rename to sbt-test/source-dependencies/inner-class-java-depends-on-scala/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class/A.scala b/sbt-test/source-dependencies/inner-class/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class/A.scala
rename to sbt-test/source-dependencies/inner-class/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class/B.scala b/sbt-test/source-dependencies/inner-class/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class/B.scala
rename to sbt-test/source-dependencies/inner-class/B.scala
diff --git a/sbt-test/source-dependencies/inner-class/build.sbt b/sbt-test/source-dependencies/inner-class/build.sbt
new file mode 100644
index 000000000000..1036709ccfc1
--- /dev/null
+++ b/sbt-test/source-dependencies/inner-class/build.sbt
@@ -0,0 +1,25 @@
+import sbt.internal.inc.Analysis
+import complete.DefaultParsers._
+
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
+
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
+
+checkIterations := {
+  val expected: Int = (Space ~> NatBasic).parsed
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
+  assert(expected == actual, s"Expected $expected compilations, got $actual")
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class/changes/A2.scala b/sbt-test/source-dependencies/inner-class/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class/changes/A2.scala
rename to sbt-test/source-dependencies/inner-class/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class/changes/B2.scala b/sbt-test/source-dependencies/inner-class/changes/B2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class/changes/B2.scala
rename to sbt-test/source-dependencies/inner-class/changes/B2.scala
diff --git a/sbt-test/source-dependencies/inner-class/project/CompileState.scala b/sbt-test/source-dependencies/inner-class/project/CompileState.scala
new file mode 100644
index 000000000000..078db9c7bf56
--- /dev/null
+++ b/sbt-test/source-dependencies/inner-class/project/CompileState.scala
@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-override/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inner-class/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/remove-override/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inner-class/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class/test b/sbt-test/source-dependencies/inner-class/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-class/test
rename to sbt-test/source-dependencies/inner-class/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-object/A.scala b/sbt-test/source-dependencies/inner-object/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-object/A.scala
rename to sbt-test/source-dependencies/inner-object/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-object/B.scala b/sbt-test/source-dependencies/inner-object/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-object/B.scala
rename to sbt-test/source-dependencies/inner-object/B.scala
diff --git a/sbt-test/source-dependencies/inner-object/build.sbt b/sbt-test/source-dependencies/inner-object/build.sbt
new file mode 100644
index 000000000000..1036709ccfc1
--- /dev/null
+++ b/sbt-test/source-dependencies/inner-object/build.sbt
@@ -0,0 +1,25 @@
+import sbt.internal.inc.Analysis
+import complete.DefaultParsers._
+
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
+
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
+
+checkIterations := {
+  val expected: Int = (Space ~> NatBasic).parsed
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
+  assert(expected == actual, s"Expected $expected compilations, got $actual")
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-object/changes/A2.scala b/sbt-test/source-dependencies/inner-object/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-object/changes/A2.scala
rename to sbt-test/source-dependencies/inner-object/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-object/changes/B2.scala b/sbt-test/source-dependencies/inner-object/changes/B2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-object/changes/B2.scala
rename to sbt-test/source-dependencies/inner-object/changes/B2.scala
diff --git a/sbt-test/source-dependencies/inner-object/project/CompileState.scala b/sbt-test/source-dependencies/inner-object/project/CompileState.scala
new file mode 100644
index 000000000000..078db9c7bf56
--- /dev/null
+++ b/sbt-test/source-dependencies/inner-object/project/CompileState.scala
@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-refinement/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inner-object/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/remove-refinement/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/inner-object/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-object/test b/sbt-test/source-dependencies/inner-object/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/inner-object/test
rename to sbt-test/source-dependencies/inner-object/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/intermediate-error/A.scala b/sbt-test/source-dependencies/intermediate-error/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/intermediate-error/A.scala
rename to sbt-test/source-dependencies/intermediate-error/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/intermediate-error/B.scala b/sbt-test/source-dependencies/intermediate-error/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/intermediate-error/B.scala
rename to sbt-test/source-dependencies/intermediate-error/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/intermediate-error/changes/A2.scala b/sbt-test/source-dependencies/intermediate-error/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/intermediate-error/changes/A2.scala
rename to sbt-test/source-dependencies/intermediate-error/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/intermediate-error/changes/A3.scala b/sbt-test/source-dependencies/intermediate-error/changes/A3.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/intermediate-error/changes/A3.scala
rename to sbt-test/source-dependencies/intermediate-error/changes/A3.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-anonymous/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-anonymous/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/intermediate-error/test b/sbt-test/source-dependencies/intermediate-error/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/intermediate-error/test
rename to sbt-test/source-dependencies/intermediate-error/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java b/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java
rename to sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt b/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt
rename to sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/java-analysis-serialization-error/test b/sbt-test/source-dependencies/java-analysis-serialization-error/test
new file mode 100644
index 000000000000..5df2af1f3956
--- /dev/null
+++ b/sbt-test/source-dependencies/java-analysis-serialization-error/test
@@ -0,0 +1 @@
+> compile
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-anonymous/Outer.java b/sbt-test/source-dependencies/java-anonymous/Outer.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-anonymous/Outer.java
rename to sbt-test/source-dependencies/java-anonymous/Outer.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-enum/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/java-anonymous/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-enum/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/java-anonymous/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-anonymous/test b/sbt-test/source-dependencies/java-anonymous/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-anonymous/test
rename to sbt-test/source-dependencies/java-anonymous/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-basic/changes/A.java b/sbt-test/source-dependencies/java-basic/changes/A.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-basic/changes/A.java
rename to sbt-test/source-dependencies/java-basic/changes/A.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-basic/changes/A2.java b/sbt-test/source-dependencies/java-basic/changes/A2.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-basic/changes/A2.java
rename to sbt-test/source-dependencies/java-basic/changes/A2.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-basic/changes/B1.java b/sbt-test/source-dependencies/java-basic/changes/B1.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-basic/changes/B1.java
rename to sbt-test/source-dependencies/java-basic/changes/B1.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-basic/changes/B2.java b/sbt-test/source-dependencies/java-basic/changes/B2.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-basic/changes/B2.java
rename to sbt-test/source-dependencies/java-basic/changes/B2.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-basic/changes/B3.java b/sbt-test/source-dependencies/java-basic/changes/B3.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-basic/changes/B3.java
rename to sbt-test/source-dependencies/java-basic/changes/B3.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-basic/test b/sbt-test/source-dependencies/java-basic/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-basic/test
rename to sbt-test/source-dependencies/java-basic/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-enum/changes/SomeEnum.java b/sbt-test/source-dependencies/java-enum/changes/SomeEnum.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-enum/changes/SomeEnum.java
rename to sbt-test/source-dependencies/java-enum/changes/SomeEnum.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-inner/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/java-enum/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-inner/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/java-enum/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-enum/test b/sbt-test/source-dependencies/java-enum/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-enum/test
rename to sbt-test/source-dependencies/java-enum/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/A.java b/sbt-test/source-dependencies/java-generic-workaround/A.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/A.java
rename to sbt-test/source-dependencies/java-generic-workaround/A.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java b/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java
rename to sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java b/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java
rename to sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java b/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java
rename to sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-lambda-typeparams/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-lambda-typeparams/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/test b/sbt-test/source-dependencies/java-generic-workaround/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/test
rename to sbt-test/source-dependencies/java-generic-workaround/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-inner/A.java b/sbt-test/source-dependencies/java-inner/A.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-inner/A.java
rename to sbt-test/source-dependencies/java-inner/A.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-inner/C.java b/sbt-test/source-dependencies/java-inner/C.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-inner/C.java
rename to sbt-test/source-dependencies/java-inner/C.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-inner/D.java b/sbt-test/source-dependencies/java-inner/D.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-inner/D.java
rename to sbt-test/source-dependencies/java-inner/D.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-inner/disabled b/sbt-test/source-dependencies/java-inner/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-inner/disabled
rename to sbt-test/source-dependencies/java-inner/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/java-inner/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/java-inner/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-lambda-typeparams/Example.java b/sbt-test/source-dependencies/java-lambda-typeparams/Example.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-lambda-typeparams/Example.java
rename to sbt-test/source-dependencies/java-lambda-typeparams/Example.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-name-with-dollars/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/java-lambda-typeparams/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-name-with-dollars/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/java-lambda-typeparams/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-lambda-typeparams/test b/sbt-test/source-dependencies/java-lambda-typeparams/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-lambda-typeparams/test
rename to sbt-test/source-dependencies/java-lambda-typeparams/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-mixed/JJ.java b/sbt-test/source-dependencies/java-mixed/JJ.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-mixed/JJ.java
rename to sbt-test/source-dependencies/java-mixed/JJ.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-mixed/build.sbt b/sbt-test/source-dependencies/java-mixed/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-mixed/build.sbt
rename to sbt-test/source-dependencies/java-mixed/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-mixed/changes/S1.scala b/sbt-test/source-dependencies/java-mixed/changes/S1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-mixed/changes/S1.scala
rename to sbt-test/source-dependencies/java-mixed/changes/S1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-mixed/changes/S2.scala b/sbt-test/source-dependencies/java-mixed/changes/S2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-mixed/changes/S2.scala
rename to sbt-test/source-dependencies/java-mixed/changes/S2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-mixed/changes/build.sbt b/sbt-test/source-dependencies/java-mixed/changes/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-mixed/changes/build.sbt
rename to sbt-test/source-dependencies/java-mixed/changes/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-mixed/test b/sbt-test/source-dependencies/java-mixed/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-mixed/test
rename to sbt-test/source-dependencies/java-mixed/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-name-with-dollars/JFunction2$mcJDD$sp.java b/sbt-test/source-dependencies/java-name-with-dollars/JFunction2$mcJDD$sp.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-name-with-dollars/JFunction2$mcJDD$sp.java
rename to sbt-test/source-dependencies/java-name-with-dollars/JFunction2$mcJDD$sp.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/java-name-with-dollars/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/java-name-with-dollars/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-name-with-dollars/test b/sbt-test/source-dependencies/java-name-with-dollars/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-name-with-dollars/test
rename to sbt-test/source-dependencies/java-name-with-dollars/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-static/changes/J1.java b/sbt-test/source-dependencies/java-static/changes/J1.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-static/changes/J1.java
rename to sbt-test/source-dependencies/java-static/changes/J1.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-static/changes/J2.java b/sbt-test/source-dependencies/java-static/changes/J2.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-static/changes/J2.java
rename to sbt-test/source-dependencies/java-static/changes/J2.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-static/changes/S.scala b/sbt-test/source-dependencies/java-static/changes/S.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-static/changes/S.scala
rename to sbt-test/source-dependencies/java-static/changes/S.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/java-static/test b/sbt-test/source-dependencies/java-static/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/java-static/test
rename to sbt-test/source-dependencies/java-static/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/lazy-val/A.scala b/sbt-test/source-dependencies/lazy-val/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/lazy-val/A.scala
rename to sbt-test/source-dependencies/lazy-val/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/lazy-val/B.scala b/sbt-test/source-dependencies/lazy-val/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/lazy-val/B.scala
rename to sbt-test/source-dependencies/lazy-val/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/lazy-val/changes/A.scala b/sbt-test/source-dependencies/lazy-val/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/lazy-val/changes/A.scala
rename to sbt-test/source-dependencies/lazy-val/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/lazy-val/test b/sbt-test/source-dependencies/lazy-val/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/lazy-val/test
rename to sbt-test/source-dependencies/lazy-val/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/A.java b/sbt-test/source-dependencies/less-inter-inv-java/A.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/A.java
rename to sbt-test/source-dependencies/less-inter-inv-java/A.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/B.java b/sbt-test/source-dependencies/less-inter-inv-java/B.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/B.java
rename to sbt-test/source-dependencies/less-inter-inv-java/B.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/C.java b/sbt-test/source-dependencies/less-inter-inv-java/C.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/C.java
rename to sbt-test/source-dependencies/less-inter-inv-java/C.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/D.java b/sbt-test/source-dependencies/less-inter-inv-java/D.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/D.java
rename to sbt-test/source-dependencies/less-inter-inv-java/D.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/E.java b/sbt-test/source-dependencies/less-inter-inv-java/E.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/E.java
rename to sbt-test/source-dependencies/less-inter-inv-java/E.java
diff --git a/sbt-test/source-dependencies/less-inter-inv-java/build.sbt b/sbt-test/source-dependencies/less-inter-inv-java/build.sbt
new file mode 100644
index 000000000000..1036709ccfc1
--- /dev/null
+++ b/sbt-test/source-dependencies/less-inter-inv-java/build.sbt
@@ -0,0 +1,25 @@
+import sbt.internal.inc.Analysis
+import complete.DefaultParsers._
+
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
+
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
+
+checkIterations := {
+  val expected: Int = (Space ~> NatBasic).parsed
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
+  assert(expected == actual, s"Expected $expected compilations, got $actual")
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java b/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java
rename to sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java
diff --git a/sbt-test/source-dependencies/less-inter-inv-java/project/CompileState.scala b/sbt-test/source-dependencies/less-inter-inv-java/project/CompileState.scala
new file mode 100644
index 000000000000..078db9c7bf56
--- /dev/null
+++ b/sbt-test/source-dependencies/less-inter-inv-java/project/CompileState.scala
@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/test b/sbt-test/source-dependencies/less-inter-inv-java/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/test
rename to sbt-test/source-dependencies/less-inter-inv-java/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/A.scala b/sbt-test/source-dependencies/less-inter-inv/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv/A.scala
rename to sbt-test/source-dependencies/less-inter-inv/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/B.scala b/sbt-test/source-dependencies/less-inter-inv/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv/B.scala
rename to sbt-test/source-dependencies/less-inter-inv/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/C.scala b/sbt-test/source-dependencies/less-inter-inv/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv/C.scala
rename to sbt-test/source-dependencies/less-inter-inv/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/D.scala b/sbt-test/source-dependencies/less-inter-inv/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv/D.scala
rename to sbt-test/source-dependencies/less-inter-inv/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/E.scala b/sbt-test/source-dependencies/less-inter-inv/E.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv/E.scala
rename to sbt-test/source-dependencies/less-inter-inv/E.scala
diff --git a/sbt-test/source-dependencies/less-inter-inv/build.sbt b/sbt-test/source-dependencies/less-inter-inv/build.sbt
new file mode 100644
index 000000000000..1036709ccfc1
--- /dev/null
+++ b/sbt-test/source-dependencies/less-inter-inv/build.sbt
@@ -0,0 +1,25 @@
+import sbt.internal.inc.Analysis
+import complete.DefaultParsers._
+
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
+
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
+
+checkIterations := {
+  val expected: Int = (Space ~> NatBasic).parsed
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
+  assert(expected == actual, s"Expected $expected compilations, got $actual")
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala b/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala
rename to sbt-test/source-dependencies/less-inter-inv/changes/A2.scala
diff --git a/sbt-test/source-dependencies/less-inter-inv/project/CompileState.scala b/sbt-test/source-dependencies/less-inter-inv/project/CompileState.scala
new file mode 100644
index 000000000000..078db9c7bf56
--- /dev/null
+++ b/sbt-test/source-dependencies/less-inter-inv/project/CompileState.scala
@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/test b/sbt-test/source-dependencies/less-inter-inv/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/less-inter-inv/test
rename to sbt-test/source-dependencies/less-inter-inv/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/A.scala b/sbt-test/source-dependencies/linearization/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/linearization/A.scala
rename to sbt-test/source-dependencies/linearization/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/B.scala b/sbt-test/source-dependencies/linearization/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/linearization/B.scala
rename to sbt-test/source-dependencies/linearization/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/C.scala b/sbt-test/source-dependencies/linearization/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/linearization/C.scala
rename to sbt-test/source-dependencies/linearization/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/D.scala b/sbt-test/source-dependencies/linearization/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/linearization/D.scala
rename to sbt-test/source-dependencies/linearization/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/E.scala b/sbt-test/source-dependencies/linearization/E.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/linearization/E.scala
rename to sbt-test/source-dependencies/linearization/E.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/F.scala b/sbt-test/source-dependencies/linearization/F.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/linearization/F.scala
rename to sbt-test/source-dependencies/linearization/F.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/changes/D.scala b/sbt-test/source-dependencies/linearization/changes/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/linearization/changes/D.scala
rename to sbt-test/source-dependencies/linearization/changes/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/test b/sbt-test/source-dependencies/linearization/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/linearization/test
rename to sbt-test/source-dependencies/linearization/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/A.java b/sbt-test/source-dependencies/local-class-inheritance-from-java/A.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/A.java
rename to sbt-test/source-dependencies/local-class-inheritance-from-java/A.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/B.java b/sbt-test/source-dependencies/local-class-inheritance-from-java/B.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/B.java
rename to sbt-test/source-dependencies/local-class-inheritance-from-java/B.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/C.scala b/sbt-test/source-dependencies/local-class-inheritance-from-java/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/C.scala
rename to sbt-test/source-dependencies/local-class-inheritance-from-java/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/D.scala b/sbt-test/source-dependencies/local-class-inheritance-from-java/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/D.scala
rename to sbt-test/source-dependencies/local-class-inheritance-from-java/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/changes/A2.java b/sbt-test/source-dependencies/local-class-inheritance-from-java/changes/A2.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/changes/A2.java
rename to sbt-test/source-dependencies/local-class-inheritance-from-java/changes/A2.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/disabled b/sbt-test/source-dependencies/local-class-inheritance-from-java/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/disabled
rename to sbt-test/source-dependencies/local-class-inheritance-from-java/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/local-class-inheritance-from-java/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/local-class-inheritance-from-java/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/A.scala b/sbt-test/source-dependencies/local-class-inheritance/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/A.scala
rename to sbt-test/source-dependencies/local-class-inheritance/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/B.scala b/sbt-test/source-dependencies/local-class-inheritance/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/B.scala
rename to sbt-test/source-dependencies/local-class-inheritance/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/C.scala b/sbt-test/source-dependencies/local-class-inheritance/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/C.scala
rename to sbt-test/source-dependencies/local-class-inheritance/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/D.scala b/sbt-test/source-dependencies/local-class-inheritance/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/D.scala
rename to sbt-test/source-dependencies/local-class-inheritance/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/changes/A2.scala b/sbt-test/source-dependencies/local-class-inheritance/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/changes/A2.scala
rename to sbt-test/source-dependencies/local-class-inheritance/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/disabled b/sbt-test/source-dependencies/local-class-inheritance/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/disabled
rename to sbt-test/source-dependencies/local-class-inheritance/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/local-class-inheritance/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/malformed-class-name/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/local-class-inheritance/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/Macro.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/Macro.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/Macro.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/Macro.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/MacroCompileError.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/MacroCompileError.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/MacroCompileError.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/MacroCompileError.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/MacroRuntimeError.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/MacroRuntimeError.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/MacroRuntimeError.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/MacroRuntimeError.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/Main.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/Main.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/Main.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-1/changes/Main.scala
diff --git a/sbt-test/source-dependencies/macro-expansion-dependencies-1/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-1/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..fb946c4b8c61
--- /dev/null
+++ b/sbt-test/source-dependencies/macro-expansion-dependencies-1/project/DottyInjectedPlugin.scala
@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/test b/sbt-test/source-dependencies/macro-expansion-dependencies-1/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/test
rename to sbt-test/source-dependencies/macro-expansion-dependencies-1/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/Macro.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-2/Macro.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/Macro.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-2/Macro.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntime.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntime.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntime.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntime.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntimeCompileError.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntimeCompileError.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntimeCompileError.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntimeCompileError.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntimeRuntimeError.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntimeRuntimeError.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntimeRuntimeError.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/MacroRuntimeRuntimeError.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/Main.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/Main.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/Main.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-2/changes/Main.scala
diff --git a/sbt-test/source-dependencies/macro-expansion-dependencies-2/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-2/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..fb946c4b8c61
--- /dev/null
+++ b/sbt-test/source-dependencies/macro-expansion-dependencies-2/project/DottyInjectedPlugin.scala
@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/test b/sbt-test/source-dependencies/macro-expansion-dependencies-2/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/test
rename to sbt-test/source-dependencies/macro-expansion-dependencies-2/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/Macros.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-3/Macros.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/Macros.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-3/Macros.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/Test.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-3/Test.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/Test.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-3/Test.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/TestB.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-3/TestB.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/TestB.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-3/TestB.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/changes/TestB.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-3/changes/TestB.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/changes/TestB.scala
rename to sbt-test/source-dependencies/macro-expansion-dependencies-3/changes/TestB.scala
diff --git a/sbt-test/source-dependencies/macro-expansion-dependencies-3/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/macro-expansion-dependencies-3/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..fb946c4b8c61
--- /dev/null
+++ b/sbt-test/source-dependencies/macro-expansion-dependencies-3/project/DottyInjectedPlugin.scala
@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/test b/sbt-test/source-dependencies/macro-expansion-dependencies-3/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/test
rename to sbt-test/source-dependencies/macro-expansion-dependencies-3/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/B.java b/sbt-test/source-dependencies/malformed-class-name-with-dollar/B.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/B.java
rename to sbt-test/source-dependencies/malformed-class-name-with-dollar/B.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/changes/A.scala b/sbt-test/source-dependencies/malformed-class-name-with-dollar/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/changes/A.scala
rename to sbt-test/source-dependencies/malformed-class-name-with-dollar/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/malformed-class-name-with-dollar/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/malformed-class-name-with-dollar/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/test b/sbt-test/source-dependencies/malformed-class-name-with-dollar/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/test
rename to sbt-test/source-dependencies/malformed-class-name-with-dollar/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name/Boo.scala b/sbt-test/source-dependencies/malformed-class-name/Boo.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/malformed-class-name/Boo.scala
rename to sbt-test/source-dependencies/malformed-class-name/Boo.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name/changes/BooUser.java b/sbt-test/source-dependencies/malformed-class-name/changes/BooUser.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/malformed-class-name/changes/BooUser.java
rename to sbt-test/source-dependencies/malformed-class-name/changes/BooUser.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/malformed-class-name/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/malformed-class-name/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name/test b/sbt-test/source-dependencies/malformed-class-name/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/malformed-class-name/test
rename to sbt-test/source-dependencies/malformed-class-name/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/missing-annot/a/A.scala b/sbt-test/source-dependencies/missing-annot/a/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/missing-annot/a/A.scala
rename to sbt-test/source-dependencies/missing-annot/a/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/missing-annot/a/JavaAnnot.java b/sbt-test/source-dependencies/missing-annot/a/JavaAnnot.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/missing-annot/a/JavaAnnot.java
rename to sbt-test/source-dependencies/missing-annot/a/JavaAnnot.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/missing-annot/a/ScalaAnnot.scala b/sbt-test/source-dependencies/missing-annot/a/ScalaAnnot.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/missing-annot/a/ScalaAnnot.scala
rename to sbt-test/source-dependencies/missing-annot/a/ScalaAnnot.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/missing-annot/b/B.scala b/sbt-test/source-dependencies/missing-annot/b/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/missing-annot/b/B.scala
rename to sbt-test/source-dependencies/missing-annot/b/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/missing-annot/build.sbt b/sbt-test/source-dependencies/missing-annot/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/missing-annot/build.sbt
rename to sbt-test/source-dependencies/missing-annot/build.sbt
diff --git a/sbt-test/source-dependencies/missing-annot/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/missing-annot/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..fb946c4b8c61
--- /dev/null
+++ b/sbt-test/source-dependencies/missing-annot/project/DottyInjectedPlugin.scala
@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/missing-annot/test b/sbt-test/source-dependencies/missing-annot/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/missing-annot/test
rename to sbt-test/source-dependencies/missing-annot/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/named/A.scala b/sbt-test/source-dependencies/named/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/named/A.scala
rename to sbt-test/source-dependencies/named/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/named/B.scala b/sbt-test/source-dependencies/named/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/named/B.scala
rename to sbt-test/source-dependencies/named/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/named/changes/A.scala b/sbt-test/source-dependencies/named/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/named/changes/A.scala
rename to sbt-test/source-dependencies/named/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-type-params/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/named/test b/sbt-test/source-dependencies/named/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/named/test
rename to sbt-test/source-dependencies/named/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-case-class/changes/A0.scala b/sbt-test/source-dependencies/nested-case-class/changes/A0.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-case-class/changes/A0.scala
rename to sbt-test/source-dependencies/nested-case-class/changes/A0.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-case-class/changes/A1.scala b/sbt-test/source-dependencies/nested-case-class/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-case-class/changes/A1.scala
rename to sbt-test/source-dependencies/nested-case-class/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-case-class/test b/sbt-test/source-dependencies/nested-case-class/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-case-class/test
rename to sbt-test/source-dependencies/nested-case-class/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/A.scala b/sbt-test/source-dependencies/nested-type-params/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-type-params/A.scala
rename to sbt-test/source-dependencies/nested-type-params/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/B.scala b/sbt-test/source-dependencies/nested-type-params/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-type-params/B.scala
rename to sbt-test/source-dependencies/nested-type-params/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/Bar.scala b/sbt-test/source-dependencies/nested-type-params/Bar.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-type-params/Bar.scala
rename to sbt-test/source-dependencies/nested-type-params/Bar.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/Foo.scala b/sbt-test/source-dependencies/nested-type-params/Foo.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-type-params/Foo.scala
rename to sbt-test/source-dependencies/nested-type-params/Foo.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/Providers.scala b/sbt-test/source-dependencies/nested-type-params/Providers.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-type-params/Providers.scala
rename to sbt-test/source-dependencies/nested-type-params/Providers.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/changes/Bar.scala b/sbt-test/source-dependencies/nested-type-params/changes/Bar.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-type-params/changes/Bar.scala
rename to sbt-test/source-dependencies/nested-type-params/changes/Bar.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/changes/Providers.scala b/sbt-test/source-dependencies/nested-type-params/changes/Providers.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-type-params/changes/Providers.scala
rename to sbt-test/source-dependencies/nested-type-params/changes/Providers.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/nested-type-params/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/nested-type-params/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/test b/sbt-test/source-dependencies/nested-type-params/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/nested-type-params/test
rename to sbt-test/source-dependencies/nested-type-params/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/new-cyclic/changes/A2.scala b/sbt-test/source-dependencies/new-cyclic/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/new-cyclic/changes/A2.scala
rename to sbt-test/source-dependencies/new-cyclic/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/new-cyclic/pending b/sbt-test/source-dependencies/new-cyclic/pending
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/new-cyclic/pending
rename to sbt-test/source-dependencies/new-cyclic/pending
diff --git a/sbt-dotty/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala b/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala
rename to sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala b/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala
rename to sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java b/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java
rename to sbt-test/source-dependencies/new-pkg-dep/changes/A1.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala b/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala
rename to sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala b/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala
rename to sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-implicit/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/package-object-implicit/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/test b/sbt-test/source-dependencies/new-pkg-dep/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/test
rename to sbt-test/source-dependencies/new-pkg-dep/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/override/A.scala b/sbt-test/source-dependencies/override/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/override/A.scala
rename to sbt-test/source-dependencies/override/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/override/B.scala b/sbt-test/source-dependencies/override/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/override/B.scala
rename to sbt-test/source-dependencies/override/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/override/C.scala b/sbt-test/source-dependencies/override/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/override/C.scala
rename to sbt-test/source-dependencies/override/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/override/D.scala b/sbt-test/source-dependencies/override/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/override/D.scala
rename to sbt-test/source-dependencies/override/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/override/changes/B2.scala b/sbt-test/source-dependencies/override/changes/B2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/override/changes/B2.scala
rename to sbt-test/source-dependencies/override/changes/B2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-name/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/package-object-name/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/override/test b/sbt-test/source-dependencies/override/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/override/test
rename to sbt-test/source-dependencies/override/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-implicit/Test.scala b/sbt-test/source-dependencies/package-object-implicit/Test.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/package-object-implicit/Test.scala
rename to sbt-test/source-dependencies/package-object-implicit/Test.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-implicit/changes/package.scala b/sbt-test/source-dependencies/package-object-implicit/changes/package.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/package-object-implicit/changes/package.scala
rename to sbt-test/source-dependencies/package-object-implicit/changes/package.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-implicit/pending b/sbt-test/source-dependencies/package-object-implicit/pending
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/package-object-implicit/pending
rename to sbt-test/source-dependencies/package-object-implicit/pending
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-nested-class/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/package-object-implicit/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/package-object-nested-class/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/package-object-implicit/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-name/A.scala b/sbt-test/source-dependencies/package-object-name/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/package-object-name/A.scala
rename to sbt-test/source-dependencies/package-object-name/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-name/b.scala b/sbt-test/source-dependencies/package-object-name/b.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/package-object-name/b.scala
rename to sbt-test/source-dependencies/package-object-name/b.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-name/changes/A1.scala b/sbt-test/source-dependencies/package-object-name/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/package-object-name/changes/A1.scala
rename to sbt-test/source-dependencies/package-object-name/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/package-object-name/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/package-object-name/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-name/test b/sbt-test/source-dependencies/package-object-name/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/package-object-name/test
rename to sbt-test/source-dependencies/package-object-name/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-nested-class/A.scala b/sbt-test/source-dependencies/package-object-nested-class/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/package-object-nested-class/A.scala
rename to sbt-test/source-dependencies/package-object-nested-class/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/package-object-nested-class/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/package-object-nested-class/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-nested-class/test b/sbt-test/source-dependencies/package-object-nested-class/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/package-object-nested-class/test
rename to sbt-test/source-dependencies/package-object-nested-class/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/Bar.scala b/sbt-test/source-dependencies/packageobject-and-traits/Bar.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/Bar.scala
rename to sbt-test/source-dependencies/packageobject-and-traits/Bar.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/Baz.scala b/sbt-test/source-dependencies/packageobject-and-traits/Baz.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/Baz.scala
rename to sbt-test/source-dependencies/packageobject-and-traits/Baz.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/Foo.scala b/sbt-test/source-dependencies/packageobject-and-traits/Foo.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/Foo.scala
rename to sbt-test/source-dependencies/packageobject-and-traits/Foo.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/changes/package.scala b/sbt-test/source-dependencies/packageobject-and-traits/changes/package.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/changes/package.scala
rename to sbt-test/source-dependencies/packageobject-and-traits/changes/package.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/pending b/sbt-test/source-dependencies/packageobject-and-traits/pending
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/pending
rename to sbt-test/source-dependencies/packageobject-and-traits/pending
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/packageobject-and-traits/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/packageobject-and-traits/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-change/W.scala b/sbt-test/source-dependencies/parent-change/W.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/parent-change/W.scala
rename to sbt-test/source-dependencies/parent-change/W.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-change/Y.scala b/sbt-test/source-dependencies/parent-change/Y.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/parent-change/Y.scala
rename to sbt-test/source-dependencies/parent-change/Y.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-change/Z.scala b/sbt-test/source-dependencies/parent-change/Z.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/parent-change/Z.scala
rename to sbt-test/source-dependencies/parent-change/Z.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-change/changes/W.scala b/sbt-test/source-dependencies/parent-change/changes/W.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/parent-change/changes/W.scala
rename to sbt-test/source-dependencies/parent-change/changes/W.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-private-class/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/pkg-private-class/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-change/test b/sbt-test/source-dependencies/parent-change/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/parent-change/test
rename to sbt-test/source-dependencies/parent-change/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-member-change/A.scala b/sbt-test/source-dependencies/parent-member-change/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/parent-member-change/A.scala
rename to sbt-test/source-dependencies/parent-member-change/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-member-change/B.scala b/sbt-test/source-dependencies/parent-member-change/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/parent-member-change/B.scala
rename to sbt-test/source-dependencies/parent-member-change/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-member-change/C.scala b/sbt-test/source-dependencies/parent-member-change/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/parent-member-change/C.scala
rename to sbt-test/source-dependencies/parent-member-change/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-member-change/changes/A.scala b/sbt-test/source-dependencies/parent-member-change/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/parent-member-change/changes/A.scala
rename to sbt-test/source-dependencies/parent-member-change/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-member-change/test b/sbt-test/source-dependencies/parent-member-change/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/parent-member-change/test
rename to sbt-test/source-dependencies/parent-member-change/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-private-class/A.scala b/sbt-test/source-dependencies/pkg-private-class/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/pkg-private-class/A.scala
rename to sbt-test/source-dependencies/pkg-private-class/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-private-class/B.scala b/sbt-test/source-dependencies/pkg-private-class/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/pkg-private-class/B.scala
rename to sbt-test/source-dependencies/pkg-private-class/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-private-class/changes/A.scala b/sbt-test/source-dependencies/pkg-private-class/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/pkg-private-class/changes/A.scala
rename to sbt-test/source-dependencies/pkg-private-class/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/pkg-private-class/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/pkg-private-class/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-private-class/test b/sbt-test/source-dependencies/pkg-private-class/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/pkg-private-class/test
rename to sbt-test/source-dependencies/pkg-private-class/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/A1.scala b/sbt-test/source-dependencies/pkg-self/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/A1.scala
rename to sbt-test/source-dependencies/pkg-self/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/A2.scala b/sbt-test/source-dependencies/pkg-self/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/A2.scala
rename to sbt-test/source-dependencies/pkg-self/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/B.scala b/sbt-test/source-dependencies/pkg-self/changes/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/B.scala
rename to sbt-test/source-dependencies/pkg-self/changes/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/package.scala b/sbt-test/source-dependencies/pkg-self/changes/package.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/package.scala
rename to sbt-test/source-dependencies/pkg-self/changes/package.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/recorded-products/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/recorded-products/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-self/test b/sbt-test/source-dependencies/pkg-self/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/pkg-self/test
rename to sbt-test/source-dependencies/pkg-self/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/qualified-access/A.scala b/sbt-test/source-dependencies/qualified-access/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/qualified-access/A.scala
rename to sbt-test/source-dependencies/qualified-access/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/qualified-access/B.scala b/sbt-test/source-dependencies/qualified-access/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/qualified-access/B.scala
rename to sbt-test/source-dependencies/qualified-access/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/qualified-access/changes/A.scala b/sbt-test/source-dependencies/qualified-access/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/qualified-access/changes/A.scala
rename to sbt-test/source-dependencies/qualified-access/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/qualified-access/test b/sbt-test/source-dependencies/qualified-access/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/qualified-access/test
rename to sbt-test/source-dependencies/qualified-access/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/recorded-products/DefaultPkg.scala b/sbt-test/source-dependencies/recorded-products/DefaultPkg.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/recorded-products/DefaultPkg.scala
rename to sbt-test/source-dependencies/recorded-products/DefaultPkg.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/recorded-products/Local.scala b/sbt-test/source-dependencies/recorded-products/Local.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/recorded-products/Local.scala
rename to sbt-test/source-dependencies/recorded-products/Local.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/recorded-products/Nested.scala b/sbt-test/source-dependencies/recorded-products/Nested.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/recorded-products/Nested.scala
rename to sbt-test/source-dependencies/recorded-products/Nested.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/recorded-products/disabled b/sbt-test/source-dependencies/recorded-products/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/recorded-products/disabled
rename to sbt-test/source-dependencies/recorded-products/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/recorded-products/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/recorded-products/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-a/changes/1.scala b/sbt-test/source-dependencies/remove-test-a/changes/1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/remove-test-a/changes/1.scala
rename to sbt-test/source-dependencies/remove-test-a/changes/1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-a/test b/sbt-test/source-dependencies/remove-test-a/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/remove-test-a/test
rename to sbt-test/source-dependencies/remove-test-a/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/A2.scala b/sbt-test/source-dependencies/remove-test-b/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/A2.scala
rename to sbt-test/source-dependencies/remove-test-b/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/B3.scala b/sbt-test/source-dependencies/remove-test-b/changes/B3.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/B3.scala
rename to sbt-test/source-dependencies/remove-test-b/changes/B3.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/B4.scala b/sbt-test/source-dependencies/remove-test-b/changes/B4.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/B4.scala
rename to sbt-test/source-dependencies/remove-test-b/changes/B4.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/B5.scala b/sbt-test/source-dependencies/remove-test-b/changes/B5.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/B5.scala
rename to sbt-test/source-dependencies/remove-test-b/changes/B5.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala b/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala
rename to sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala b/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala
rename to sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/test b/sbt-test/source-dependencies/remove-test-b/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/remove-test-b/test
rename to sbt-test/source-dependencies/remove-test-b/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/A.scala b/sbt-test/source-dependencies/repeated-parameters/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/repeated-parameters/A.scala
rename to sbt-test/source-dependencies/repeated-parameters/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/B.scala b/sbt-test/source-dependencies/repeated-parameters/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/repeated-parameters/B.scala
rename to sbt-test/source-dependencies/repeated-parameters/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/changes/A.scala b/sbt-test/source-dependencies/repeated-parameters/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/repeated-parameters/changes/A.scala
rename to sbt-test/source-dependencies/repeated-parameters/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/test b/sbt-test/source-dependencies/repeated-parameters/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/repeated-parameters/test
rename to sbt-test/source-dependencies/repeated-parameters/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/replace-test-a/build.sbt b/sbt-test/source-dependencies/replace-test-a/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/replace-test-a/build.sbt
rename to sbt-test/source-dependencies/replace-test-a/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/replace-test-a/changes/first.scala b/sbt-test/source-dependencies/replace-test-a/changes/first.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/replace-test-a/changes/first.scala
rename to sbt-test/source-dependencies/replace-test-a/changes/first.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/replace-test-a/changes/second.scala b/sbt-test/source-dependencies/replace-test-a/changes/second.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/replace-test-a/changes/second.scala
rename to sbt-test/source-dependencies/replace-test-a/changes/second.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/replace-test-a/test b/sbt-test/source-dependencies/replace-test-a/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/replace-test-a/test
rename to sbt-test/source-dependencies/replace-test-a/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-java/build.sbt b/sbt-test/source-dependencies/resident-java/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-java/build.sbt
rename to sbt-test/source-dependencies/resident-java/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-java/changes/A1.java b/sbt-test/source-dependencies/resident-java/changes/A1.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-java/changes/A1.java
rename to sbt-test/source-dependencies/resident-java/changes/A1.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-java/changes/A2.java b/sbt-test/source-dependencies/resident-java/changes/A2.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-java/changes/A2.java
rename to sbt-test/source-dependencies/resident-java/changes/A2.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-java/changes/B0.scala b/sbt-test/source-dependencies/resident-java/changes/B0.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-java/changes/B0.scala
rename to sbt-test/source-dependencies/resident-java/changes/B0.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-java/changes/B1.scala b/sbt-test/source-dependencies/resident-java/changes/B1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-java/changes/B1.scala
rename to sbt-test/source-dependencies/resident-java/changes/B1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-java/changes/B2.scala b/sbt-test/source-dependencies/resident-java/changes/B2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-java/changes/B2.scala
rename to sbt-test/source-dependencies/resident-java/changes/B2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-java/test b/sbt-test/source-dependencies/resident-java/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-java/test
rename to sbt-test/source-dependencies/resident-java/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-package-object/build.sbt b/sbt-test/source-dependencies/resident-package-object/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-package-object/build.sbt
rename to sbt-test/source-dependencies/resident-package-object/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-package-object/changes/A.scala b/sbt-test/source-dependencies/resident-package-object/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-package-object/changes/A.scala
rename to sbt-test/source-dependencies/resident-package-object/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-package-object/changes/package.scala b/sbt-test/source-dependencies/resident-package-object/changes/package.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-package-object/changes/package.scala
rename to sbt-test/source-dependencies/resident-package-object/changes/package.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-package-object/changes/package2.scala b/sbt-test/source-dependencies/resident-package-object/changes/package2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-package-object/changes/package2.scala
rename to sbt-test/source-dependencies/resident-package-object/changes/package2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-package-object/test b/sbt-test/source-dependencies/resident-package-object/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/resident-package-object/test
rename to sbt-test/source-dependencies/resident-package-object/test
diff --git a/sbt-test/source-dependencies/restore-classes/build.sbt b/sbt-test/source-dependencies/restore-classes/build.sbt
new file mode 100644
index 000000000000..1036709ccfc1
--- /dev/null
+++ b/sbt-test/source-dependencies/restore-classes/build.sbt
@@ -0,0 +1,25 @@
+import sbt.internal.inc.Analysis
+import complete.DefaultParsers._
+
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
+
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
+
+checkIterations := {
+  val expected: Int = (Space ~> NatBasic).parsed
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
+  assert(expected == actual, s"Expected $expected compilations, got $actual")
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/restore-classes/changes/A1.scala b/sbt-test/source-dependencies/restore-classes/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/restore-classes/changes/A1.scala
rename to sbt-test/source-dependencies/restore-classes/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/restore-classes/changes/A2.scala b/sbt-test/source-dependencies/restore-classes/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/restore-classes/changes/A2.scala
rename to sbt-test/source-dependencies/restore-classes/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/restore-classes/changes/B.scala b/sbt-test/source-dependencies/restore-classes/changes/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/restore-classes/changes/B.scala
rename to sbt-test/source-dependencies/restore-classes/changes/B.scala
diff --git a/sbt-test/source-dependencies/restore-classes/project/CompileState.scala b/sbt-test/source-dependencies/restore-classes/project/CompileState.scala
new file mode 100644
index 000000000000..078db9c7bf56
--- /dev/null
+++ b/sbt-test/source-dependencies/restore-classes/project/CompileState.scala
@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/restore-classes/test b/sbt-test/source-dependencies/restore-classes/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/restore-classes/test
rename to sbt-test/source-dependencies/restore-classes/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/A.scala b/sbt-test/source-dependencies/same-file-used-names/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/same-file-used-names/A.scala
rename to sbt-test/source-dependencies/same-file-used-names/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/B.scala b/sbt-test/source-dependencies/same-file-used-names/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/same-file-used-names/B.scala
rename to sbt-test/source-dependencies/same-file-used-names/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/changes/B.scala b/sbt-test/source-dependencies/same-file-used-names/changes/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/same-file-used-names/changes/B.scala
rename to sbt-test/source-dependencies/same-file-used-names/changes/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/test b/sbt-test/source-dependencies/same-file-used-names/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/same-file-used-names/test
rename to sbt-test/source-dependencies/same-file-used-names/test
diff --git a/sbt-test/source-dependencies/sealed-extends-sealed/A.scala b/sbt-test/source-dependencies/sealed-extends-sealed/A.scala
new file mode 100644
index 000000000000..680c28adc94a
--- /dev/null
+++ b/sbt-test/source-dependencies/sealed-extends-sealed/A.scala
@@ -0,0 +1,4 @@
+sealed trait Z
+sealed trait A extends Z
+class B extends A
+class C extends A
diff --git a/sbt-test/source-dependencies/sealed-extends-sealed/App.scala b/sbt-test/source-dependencies/sealed-extends-sealed/App.scala
new file mode 100644
index 000000000000..e41c9149d06e
--- /dev/null
+++ b/sbt-test/source-dependencies/sealed-extends-sealed/App.scala
@@ -0,0 +1,6 @@
+object App {
+	def foo(z: Z) = z match {
+		case _: B =>
+		case _: C =>
+	}
+}
diff --git a/sbt-test/source-dependencies/sealed-extends-sealed/changes/A.scala b/sbt-test/source-dependencies/sealed-extends-sealed/changes/A.scala
new file mode 100644
index 000000000000..c8eb7651f412
--- /dev/null
+++ b/sbt-test/source-dependencies/sealed-extends-sealed/changes/A.scala
@@ -0,0 +1,5 @@
+sealed trait Z
+sealed trait A extends Z
+class B extends A
+class C extends A
+class D extends A
diff --git a/sbt-test/source-dependencies/sealed-extends-sealed/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/sealed-extends-sealed/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..fc8fd26fc29e
--- /dev/null
+++ b/sbt-test/source-dependencies/sealed-extends-sealed/project/DottyInjectedPlugin.scala
@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion"),
+    scalacOptions ++= Seq("-source:3.0-migration", "-Xfatal-warnings")
+  )
+}
diff --git a/sbt-test/source-dependencies/sealed-extends-sealed/test b/sbt-test/source-dependencies/sealed-extends-sealed/test
new file mode 100644
index 000000000000..6cae243fdcd5
--- /dev/null
+++ b/sbt-test/source-dependencies/sealed-extends-sealed/test
@@ -0,0 +1,8 @@
+> compile
+
+# Introduce a new class C that also extends A
+$ copy-file changes/A.scala A.scala
+
+# App.scala needs recompiling because the pattern match in it
+# is no longer exhaustive, which emits a warning
+-> compile
diff --git a/sbt-dotty/sbt-test/source-dependencies/sealed/A.scala b/sbt-test/source-dependencies/sealed/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/sealed/A.scala
rename to sbt-test/source-dependencies/sealed/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/sealed/D.scala b/sbt-test/source-dependencies/sealed/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/sealed/D.scala
rename to sbt-test/source-dependencies/sealed/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/sealed/changes/A.scala b/sbt-test/source-dependencies/sealed/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/sealed/changes/A.scala
rename to sbt-test/source-dependencies/sealed/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/sealed/test b/sbt-test/source-dependencies/sealed/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/sealed/test
rename to sbt-test/source-dependencies/sealed/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/signature-change/B.scala b/sbt-test/source-dependencies/signature-change/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/signature-change/B.scala
rename to sbt-test/source-dependencies/signature-change/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A0.scala b/sbt-test/source-dependencies/signature-change/changes/A0.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A0.scala
rename to sbt-test/source-dependencies/signature-change/changes/A0.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A1.scala b/sbt-test/source-dependencies/signature-change/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A1.scala
rename to sbt-test/source-dependencies/signature-change/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A2.scala b/sbt-test/source-dependencies/signature-change/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A2.scala
rename to sbt-test/source-dependencies/signature-change/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A3.scala b/sbt-test/source-dependencies/signature-change/changes/A3.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A3.scala
rename to sbt-test/source-dependencies/signature-change/changes/A3.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/signature-change/test b/sbt-test/source-dependencies/signature-change/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/signature-change/test
rename to sbt-test/source-dependencies/signature-change/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/specialized/A.scala b/sbt-test/source-dependencies/specialized/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/specialized/A.scala
rename to sbt-test/source-dependencies/specialized/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/specialized/B.scala b/sbt-test/source-dependencies/specialized/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/specialized/B.scala
rename to sbt-test/source-dependencies/specialized/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/specialized/changes/A.scala b/sbt-test/source-dependencies/specialized/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/specialized/changes/A.scala
rename to sbt-test/source-dependencies/specialized/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-projection/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct-projection/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/specialized/test b/sbt-test/source-dependencies/specialized/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/specialized/test
rename to sbt-test/source-dependencies/specialized/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/stability-change/A.scala b/sbt-test/source-dependencies/stability-change/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/stability-change/A.scala
rename to sbt-test/source-dependencies/stability-change/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/stability-change/B.scala b/sbt-test/source-dependencies/stability-change/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/stability-change/B.scala
rename to sbt-test/source-dependencies/stability-change/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/stability-change/C.scala b/sbt-test/source-dependencies/stability-change/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/stability-change/C.scala
rename to sbt-test/source-dependencies/stability-change/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/stability-change/changes/A.scala b/sbt-test/source-dependencies/stability-change/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/stability-change/changes/A.scala
rename to sbt-test/source-dependencies/stability-change/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-usage/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct-usage/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/stability-change/test b/sbt-test/source-dependencies/stability-change/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/stability-change/test
rename to sbt-test/source-dependencies/stability-change/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-projection/A.scala b/sbt-test/source-dependencies/struct-projection/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct-projection/A.scala
rename to sbt-test/source-dependencies/struct-projection/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-projection/B.scala b/sbt-test/source-dependencies/struct-projection/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct-projection/B.scala
rename to sbt-test/source-dependencies/struct-projection/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-projection/changes/A.scala b/sbt-test/source-dependencies/struct-projection/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct-projection/changes/A.scala
rename to sbt-test/source-dependencies/struct-projection/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/struct-projection/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/struct-projection/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-projection/test b/sbt-test/source-dependencies/struct-projection/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct-projection/test
rename to sbt-test/source-dependencies/struct-projection/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-usage/A.scala b/sbt-test/source-dependencies/struct-usage/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct-usage/A.scala
rename to sbt-test/source-dependencies/struct-usage/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-usage/B.scala b/sbt-test/source-dependencies/struct-usage/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct-usage/B.scala
rename to sbt-test/source-dependencies/struct-usage/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-usage/changes/A.scala b/sbt-test/source-dependencies/struct-usage/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct-usage/changes/A.scala
rename to sbt-test/source-dependencies/struct-usage/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-usage/pending b/sbt-test/source-dependencies/struct-usage/pending
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct-usage/pending
rename to sbt-test/source-dependencies/struct-usage/pending
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/struct-usage/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/struct-usage/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct/A.scala b/sbt-test/source-dependencies/struct/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct/A.scala
rename to sbt-test/source-dependencies/struct/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct/B.scala b/sbt-test/source-dependencies/struct/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct/B.scala
rename to sbt-test/source-dependencies/struct/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct/C.scala b/sbt-test/source-dependencies/struct/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct/C.scala
rename to sbt-test/source-dependencies/struct/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct/changes/A.scala b/sbt-test/source-dependencies/struct/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct/changes/A.scala
rename to sbt-test/source-dependencies/struct/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/struct/disabled b/sbt-test/source-dependencies/struct/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/struct/disabled
rename to sbt-test/source-dependencies/struct/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/struct/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/struct/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/subproject-dependency-b/build.sbt b/sbt-test/source-dependencies/subproject-dependency-b/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/subproject-dependency-b/build.sbt
rename to sbt-test/source-dependencies/subproject-dependency-b/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/subproject-dependency-b/changes/A1.scala b/sbt-test/source-dependencies/subproject-dependency-b/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/subproject-dependency-b/changes/A1.scala
rename to sbt-test/source-dependencies/subproject-dependency-b/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/subproject-dependency-b/changes/A2.scala b/sbt-test/source-dependencies/subproject-dependency-b/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/subproject-dependency-b/changes/A2.scala
rename to sbt-test/source-dependencies/subproject-dependency-b/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/subproject-dependency-b/pending b/sbt-test/source-dependencies/subproject-dependency-b/pending
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/subproject-dependency-b/pending
rename to sbt-test/source-dependencies/subproject-dependency-b/pending
diff --git a/sbt-dotty/sbt-test/source-dependencies/subproject-dependency-b/provider/A.scala b/sbt-test/source-dependencies/subproject-dependency-b/provider/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/subproject-dependency-b/provider/A.scala
rename to sbt-test/source-dependencies/subproject-dependency-b/provider/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/subproject-dependency-b/use/B.scala b/sbt-test/source-dependencies/subproject-dependency-b/use/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/subproject-dependency-b/use/B.scala
rename to sbt-test/source-dependencies/subproject-dependency-b/use/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/build.sbt b/sbt-test/source-dependencies/trait-member-modified/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-member-modified/build.sbt
rename to sbt-test/source-dependencies/trait-member-modified/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala b/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala
rename to sbt-test/source-dependencies/trait-member-modified/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/CompileState.scala b/sbt-test/source-dependencies/trait-member-modified/project/CompileState.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/CompileState.scala
rename to sbt-test/source-dependencies/trait-member-modified/project/CompileState.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-val/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-val/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala b/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala
rename to sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala b/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala
rename to sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/test b/sbt-test/source-dependencies/trait-member-modified/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-member-modified/test
rename to sbt-test/source-dependencies/trait-member-modified/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-object/A.scala b/sbt-test/source-dependencies/trait-private-object/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-object/A.scala
rename to sbt-test/source-dependencies/trait-private-object/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-object/B.scala b/sbt-test/source-dependencies/trait-private-object/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-object/B.scala
rename to sbt-test/source-dependencies/trait-private-object/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-object/changes/A.scala b/sbt-test/source-dependencies/trait-private-object/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-object/changes/A.scala
rename to sbt-test/source-dependencies/trait-private-object/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-object/test b/sbt-test/source-dependencies/trait-private-object/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-object/test
rename to sbt-test/source-dependencies/trait-private-object/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-val/changes/Base.scala b/sbt-test/source-dependencies/trait-private-val/changes/Base.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-val/changes/Base.scala
rename to sbt-test/source-dependencies/trait-private-val/changes/Base.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/trait-private-val/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/trait-private-val/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-val/src/main/scala/foo/Base.scala b/sbt-test/source-dependencies/trait-private-val/src/main/scala/foo/Base.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-val/src/main/scala/foo/Base.scala
rename to sbt-test/source-dependencies/trait-private-val/src/main/scala/foo/Base.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-val/src/main/scala/foo/TestApp.scala b/sbt-test/source-dependencies/trait-private-val/src/main/scala/foo/TestApp.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-val/src/main/scala/foo/TestApp.scala
rename to sbt-test/source-dependencies/trait-private-val/src/main/scala/foo/TestApp.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-val/test b/sbt-test/source-dependencies/trait-private-val/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-val/test
rename to sbt-test/source-dependencies/trait-private-val/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-var/B.scala b/sbt-test/source-dependencies/trait-private-var/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-var/B.scala
rename to sbt-test/source-dependencies/trait-private-var/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-var/changes/A0.scala b/sbt-test/source-dependencies/trait-private-var/changes/A0.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-var/changes/A0.scala
rename to sbt-test/source-dependencies/trait-private-var/changes/A0.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-var/changes/A1.scala b/sbt-test/source-dependencies/trait-private-var/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-var/changes/A1.scala
rename to sbt-test/source-dependencies/trait-private-var/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-var/changes/A2.scala b/sbt-test/source-dependencies/trait-private-var/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-var/changes/A2.scala
rename to sbt-test/source-dependencies/trait-private-var/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-var/test b/sbt-test/source-dependencies/trait-private-var/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-private-var/test
rename to sbt-test/source-dependencies/trait-private-var/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-super/A.scala b/sbt-test/source-dependencies/trait-super/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-super/A.scala
rename to sbt-test/source-dependencies/trait-super/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-super/B.scala b/sbt-test/source-dependencies/trait-super/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-super/B.scala
rename to sbt-test/source-dependencies/trait-super/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-super/Main.scala b/sbt-test/source-dependencies/trait-super/Main.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-super/Main.scala
rename to sbt-test/source-dependencies/trait-super/Main.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-super/changes/B2.scala b/sbt-test/source-dependencies/trait-super/changes/B2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-super/changes/B2.scala
rename to sbt-test/source-dependencies/trait-super/changes/B2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-super/changes/B3.scala b/sbt-test/source-dependencies/trait-super/changes/B3.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-super/changes/B3.scala
rename to sbt-test/source-dependencies/trait-super/changes/B3.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-super/test b/sbt-test/source-dependencies/trait-super/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/trait-super/test
rename to sbt-test/source-dependencies/trait-super/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-a/changes/A2.scala b/sbt-test/source-dependencies/transitive-a/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-a/changes/A2.scala
rename to sbt-test/source-dependencies/transitive-a/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-class/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-class/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala b/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala
rename to sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala b/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala
rename to sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala b/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala
rename to sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-a/test b/sbt-test/source-dependencies/transitive-a/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-a/test
rename to sbt-test/source-dependencies/transitive-a/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-b/changes/A2.scala b/sbt-test/source-dependencies/transitive-b/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-b/changes/A2.scala
rename to sbt-test/source-dependencies/transitive-b/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala b/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala
rename to sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala b/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala
rename to sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala b/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala
rename to sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-b/test b/sbt-test/source-dependencies/transitive-b/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-b/test
rename to sbt-test/source-dependencies/transitive-b/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-class/A.scala b/sbt-test/source-dependencies/transitive-class/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-class/A.scala
rename to sbt-test/source-dependencies/transitive-class/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-class/BC.scala b/sbt-test/source-dependencies/transitive-class/BC.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-class/BC.scala
rename to sbt-test/source-dependencies/transitive-class/BC.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-class/D.scala b/sbt-test/source-dependencies/transitive-class/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-class/D.scala
rename to sbt-test/source-dependencies/transitive-class/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-class/changes/A.scala b/sbt-test/source-dependencies/transitive-class/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-class/changes/A.scala
rename to sbt-test/source-dependencies/transitive-class/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-class/disabled b/sbt-test/source-dependencies/transitive-class/disabled
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-class/disabled
rename to sbt-test/source-dependencies/transitive-class/disabled
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/transitive-class/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/transitive-class/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/A.java b/sbt-test/source-dependencies/transitive-inherit-java/A.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/A.java
rename to sbt-test/source-dependencies/transitive-inherit-java/A.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/B.java b/sbt-test/source-dependencies/transitive-inherit-java/B.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/B.java
rename to sbt-test/source-dependencies/transitive-inherit-java/B.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/C.java b/sbt-test/source-dependencies/transitive-inherit-java/C.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/C.java
rename to sbt-test/source-dependencies/transitive-inherit-java/C.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java b/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java
rename to sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/test b/sbt-test/source-dependencies/transitive-inherit-java/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/test
rename to sbt-test/source-dependencies/transitive-inherit-java/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/A.scala b/sbt-test/source-dependencies/transitive-inherit/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-inherit/A.scala
rename to sbt-test/source-dependencies/transitive-inherit/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/B.scala b/sbt-test/source-dependencies/transitive-inherit/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-inherit/B.scala
rename to sbt-test/source-dependencies/transitive-inherit/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/C.scala b/sbt-test/source-dependencies/transitive-inherit/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-inherit/C.scala
rename to sbt-test/source-dependencies/transitive-inherit/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala b/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala
rename to sbt-test/source-dependencies/transitive-inherit/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/test b/sbt-test/source-dependencies/transitive-inherit/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-inherit/test
rename to sbt-test/source-dependencies/transitive-inherit/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/build.sbt b/sbt-test/source-dependencies/transitive-memberRef/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/build.sbt
rename to sbt-test/source-dependencies/transitive-memberRef/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala b/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala
rename to sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/CompileState.scala b/sbt-test/source-dependencies/transitive-memberRef/project/CompileState.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/CompileState.scala
rename to sbt-test/source-dependencies/transitive-memberRef/project/CompileState.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala b/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala
rename to sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala b/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala
rename to sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala b/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala
rename to sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala b/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala
rename to sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala b/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala
rename to sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala b/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala
rename to sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/test b/sbt-test/source-dependencies/transitive-memberRef/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/test
rename to sbt-test/source-dependencies/transitive-memberRef/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-alias/A.scala b/sbt-test/source-dependencies/type-alias/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-alias/A.scala
rename to sbt-test/source-dependencies/type-alias/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-alias/B.scala b/sbt-test/source-dependencies/type-alias/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-alias/B.scala
rename to sbt-test/source-dependencies/type-alias/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-alias/build.sbt b/sbt-test/source-dependencies/type-alias/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-alias/build.sbt
rename to sbt-test/source-dependencies/type-alias/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-alias/changes/A.scala b/sbt-test/source-dependencies/type-alias/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-alias/changes/A.scala
rename to sbt-test/source-dependencies/type-alias/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-alias/test b/sbt-test/source-dependencies/type-alias/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-alias/test
rename to sbt-test/source-dependencies/type-alias/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/A.scala b/sbt-test/source-dependencies/type-member-nested-object/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/A.scala
rename to sbt-test/source-dependencies/type-member-nested-object/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/B.scala b/sbt-test/source-dependencies/type-member-nested-object/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/B.scala
rename to sbt-test/source-dependencies/type-member-nested-object/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/C.scala b/sbt-test/source-dependencies/type-member-nested-object/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/C.scala
rename to sbt-test/source-dependencies/type-member-nested-object/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/changes/B2.scala b/sbt-test/source-dependencies/type-member-nested-object/changes/B2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/changes/B2.scala
rename to sbt-test/source-dependencies/type-member-nested-object/changes/B2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeargref/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/type-member-nested-object/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeargref/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/type-member-nested-object/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/test b/sbt-test/source-dependencies/type-member-nested-object/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/test
rename to sbt-test/source-dependencies/type-member-nested-object/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-parameter/A.scala b/sbt-test/source-dependencies/type-parameter/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-parameter/A.scala
rename to sbt-test/source-dependencies/type-parameter/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-parameter/B.scala b/sbt-test/source-dependencies/type-parameter/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-parameter/B.scala
rename to sbt-test/source-dependencies/type-parameter/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-parameter/C.scala b/sbt-test/source-dependencies/type-parameter/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-parameter/C.scala
rename to sbt-test/source-dependencies/type-parameter/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-parameter/D.scala b/sbt-test/source-dependencies/type-parameter/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-parameter/D.scala
rename to sbt-test/source-dependencies/type-parameter/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-parameter/changes/A.scala b/sbt-test/source-dependencies/type-parameter/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-parameter/changes/A.scala
rename to sbt-test/source-dependencies/type-parameter/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/type-parameter/test b/sbt-test/source-dependencies/type-parameter/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/type-parameter/test
rename to sbt-test/source-dependencies/type-parameter/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeargref/A.scala b/sbt-test/source-dependencies/typeargref/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeargref/A.scala
rename to sbt-test/source-dependencies/typeargref/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeargref/B.scala b/sbt-test/source-dependencies/typeargref/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeargref/B.scala
rename to sbt-test/source-dependencies/typeargref/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeargref/changes/A1.scala b/sbt-test/source-dependencies/typeargref/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeargref/changes/A1.scala
rename to sbt-test/source-dependencies/typeargref/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/typeargref/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/typeargref/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeargref/test b/sbt-test/source-dependencies/typeargref/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeargref/test
rename to sbt-test/source-dependencies/typeargref/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-only/A.scala b/sbt-test/source-dependencies/typeref-only/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeref-only/A.scala
rename to sbt-test/source-dependencies/typeref-only/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-only/B.scala b/sbt-test/source-dependencies/typeref-only/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeref-only/B.scala
rename to sbt-test/source-dependencies/typeref-only/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-only/build.sbt b/sbt-test/source-dependencies/typeref-only/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeref-only/build.sbt
rename to sbt-test/source-dependencies/typeref-only/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-only/test b/sbt-test/source-dependencies/typeref-only/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeref-only/test
rename to sbt-test/source-dependencies/typeref-only/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-return/A.scala b/sbt-test/source-dependencies/typeref-return/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeref-return/A.scala
rename to sbt-test/source-dependencies/typeref-return/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-return/B.scala b/sbt-test/source-dependencies/typeref-return/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeref-return/B.scala
rename to sbt-test/source-dependencies/typeref-return/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-return/changes/A.scala b/sbt-test/source-dependencies/typeref-return/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeref-return/changes/A.scala
rename to sbt-test/source-dependencies/typeref-return/changes/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-return/test b/sbt-test/source-dependencies/typeref-return/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/typeref-return/test
rename to sbt-test/source-dependencies/typeref-return/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/A.scala b/sbt-test/source-dependencies/types-in-used-names-a/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/A.scala
rename to sbt-test/source-dependencies/types-in-used-names-a/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/B.scala b/sbt-test/source-dependencies/types-in-used-names-a/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/B.scala
rename to sbt-test/source-dependencies/types-in-used-names-a/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/C.scala b/sbt-test/source-dependencies/types-in-used-names-a/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/C.scala
rename to sbt-test/source-dependencies/types-in-used-names-a/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/D.scala b/sbt-test/source-dependencies/types-in-used-names-a/D.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/D.scala
rename to sbt-test/source-dependencies/types-in-used-names-a/D.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala b/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala
rename to sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/unexpanded-names/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/unexpanded-names/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/test b/sbt-test/source-dependencies/types-in-used-names-a/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/test
rename to sbt-test/source-dependencies/types-in-used-names-a/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/A.scala b/sbt-test/source-dependencies/types-in-used-names-b/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/A.scala
rename to sbt-test/source-dependencies/types-in-used-names-b/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/B.scala b/sbt-test/source-dependencies/types-in-used-names-b/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/B.scala
rename to sbt-test/source-dependencies/types-in-used-names-b/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala b/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala
rename to sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class-underlying/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/test b/sbt-test/source-dependencies/types-in-used-names-b/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/test
rename to sbt-test/source-dependencies/types-in-used-names-b/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/unexpanded-names/Foo.scala b/sbt-test/source-dependencies/unexpanded-names/Foo.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/unexpanded-names/Foo.scala
rename to sbt-test/source-dependencies/unexpanded-names/Foo.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/unexpanded-names/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/unexpanded-names/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/unexpanded-names/test b/sbt-test/source-dependencies/unexpanded-names/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/unexpanded-names/test
rename to sbt-test/source-dependencies/unexpanded-names/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/A.scala b/sbt-test/source-dependencies/value-class-underlying/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class-underlying/A.scala
rename to sbt-test/source-dependencies/value-class-underlying/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/B.scala b/sbt-test/source-dependencies/value-class-underlying/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class-underlying/B.scala
rename to sbt-test/source-dependencies/value-class-underlying/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/C.scala b/sbt-test/source-dependencies/value-class-underlying/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class-underlying/C.scala
rename to sbt-test/source-dependencies/value-class-underlying/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/build.sbt b/sbt-test/source-dependencies/value-class-underlying/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class-underlying/build.sbt
rename to sbt-test/source-dependencies/value-class-underlying/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala b/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala
rename to sbt-test/source-dependencies/value-class-underlying/changes/A2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/value-class-underlying/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/value-class-underlying/project/DottyInjectedPlugin.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/test b/sbt-test/source-dependencies/value-class-underlying/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class-underlying/test
rename to sbt-test/source-dependencies/value-class-underlying/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/build.sbt b/sbt-test/source-dependencies/value-class/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class/build.sbt
rename to sbt-test/source-dependencies/value-class/build.sbt
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/A0.scala b/sbt-test/source-dependencies/value-class/changes/A0.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class/changes/A0.scala
rename to sbt-test/source-dependencies/value-class/changes/A0.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/A1.scala b/sbt-test/source-dependencies/value-class/changes/A1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class/changes/A1.scala
rename to sbt-test/source-dependencies/value-class/changes/A1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/B0.scala b/sbt-test/source-dependencies/value-class/changes/B0.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class/changes/B0.scala
rename to sbt-test/source-dependencies/value-class/changes/B0.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/B1.scala b/sbt-test/source-dependencies/value-class/changes/B1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class/changes/B1.scala
rename to sbt-test/source-dependencies/value-class/changes/B1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/B2.scala b/sbt-test/source-dependencies/value-class/changes/B2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class/changes/B2.scala
rename to sbt-test/source-dependencies/value-class/changes/B2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C0.scala b/sbt-test/source-dependencies/value-class/changes/C0.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class/changes/C0.scala
rename to sbt-test/source-dependencies/value-class/changes/C0.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C1.scala b/sbt-test/source-dependencies/value-class/changes/C1.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class/changes/C1.scala
rename to sbt-test/source-dependencies/value-class/changes/C1.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C2.scala b/sbt-test/source-dependencies/value-class/changes/C2.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/value-class/changes/C2.scala
rename to sbt-test/source-dependencies/value-class/changes/C2.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala
rename to sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala
diff --git a/sbt-test/source-dependencies/value-class/test b/sbt-test/source-dependencies/value-class/test
new file mode 100644
index 000000000000..268274bf6a4a
--- /dev/null
+++ b/sbt-test/source-dependencies/value-class/test
@@ -0,0 +1,50 @@
+## Case 1: value class as parameter of method
+$ copy-file changes/A0.scala src/main/scala/A.scala
+$ copy-file changes/B0.scala src/main/scala/B.scala
+$ copy-file changes/C0.scala src/main/scala/C.scala
+
+# A is a normal class. B.foo accepts a parameter of type A. C calls B.foo, giving it `null`.
+> compile
+> run
+
+# Make A a value class.
+$ copy-file changes/A1.scala src/main/scala/A.scala
+
+# The code no longer compiles because B.foo no longer accepts `null` as an argument.
+# This means that we have invalidated C.scala, as expected!
+-> compile
+
+
+## Case 2: value class as return type of method with no parameter lists
+$ copy-file changes/A0.scala src/main/scala/A.scala
+$ copy-file changes/B1.scala src/main/scala/B.scala
+$ copy-file changes/C1.scala src/main/scala/C.scala
+
+# A is a normal class. B.bar takes no arguments and returns an instance of A. C calls B.bar.
+> compile
+> run
+
+# Make A a value class.
+$ copy-file changes/A1.scala src/main/scala/A.scala
+
+# The code compiles. It will run iff C is recompiled because the signature of B.bar has changed,
+# because A is now a value class.
+> run
+
+
+## Case 3: value class as return type of method with multiple parameter lists
+$ copy-file changes/A0.scala src/main/scala/A.scala
+$ copy-file changes/B2.scala src/main/scala/B.scala
+$ copy-file changes/C2.scala src/main/scala/C.scala
+
+# A is a normal class. B.bar takes two dummy arguments and returns an instance of A. C calls B.bar("")("").
+> compile
+> run
+
+# Make A a value class.
+$ copy-file changes/A1.scala src/main/scala/A.scala
+
+# The code compiles. It will run iff C is recompiled because the signature of B.bar has changed,
+# because A is now a value class.
+> run
+
diff --git a/sbt-dotty/sbt-test/source-dependencies/var/A.scala b/sbt-test/source-dependencies/var/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/var/A.scala
rename to sbt-test/source-dependencies/var/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/var/B.scala b/sbt-test/source-dependencies/var/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/var/B.scala
rename to sbt-test/source-dependencies/var/B.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/var/changes/A.scala b/sbt-test/source-dependencies/var/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/var/changes/A.scala
rename to sbt-test/source-dependencies/var/changes/A.scala
diff --git a/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..69f15d168bfc
--- /dev/null
+++ b/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala
@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion"),
+    scalacOptions += "-source:3.0-migration"
+  )
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/var/test b/sbt-test/source-dependencies/var/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/var/test
rename to sbt-test/source-dependencies/var/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/variance/A.scala b/sbt-test/source-dependencies/variance/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/variance/A.scala
rename to sbt-test/source-dependencies/variance/A.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/variance/C.scala b/sbt-test/source-dependencies/variance/C.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/variance/C.scala
rename to sbt-test/source-dependencies/variance/C.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/variance/changes/A.scala b/sbt-test/source-dependencies/variance/changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/variance/changes/A.scala
rename to sbt-test/source-dependencies/variance/changes/A.scala
diff --git a/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..69f15d168bfc
--- /dev/null
+++ b/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala
@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion"),
+    scalacOptions += "-source:3.0-migration"
+  )
+}
diff --git a/sbt-dotty/sbt-test/source-dependencies/variance/test b/sbt-test/source-dependencies/variance/test
similarity index 100%
rename from sbt-dotty/sbt-test/source-dependencies/variance/test
rename to sbt-test/source-dependencies/variance/test
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-overload/a-changes/A.scala b/sbt-test/tasty-compat/add-overload/a-changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-overload/a-changes/A.scala
rename to sbt-test/tasty-compat/add-overload/a-changes/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-overload/a/A.scala b/sbt-test/tasty-compat/add-overload/a/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-overload/a/A.scala
rename to sbt-test/tasty-compat/add-overload/a/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-overload/b/B.scala b/sbt-test/tasty-compat/add-overload/b/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-overload/b/B.scala
rename to sbt-test/tasty-compat/add-overload/b/B.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-overload/build.sbt b/sbt-test/tasty-compat/add-overload/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-overload/build.sbt
rename to sbt-test/tasty-compat/add-overload/build.sbt
diff --git a/sbt-test/tasty-compat/add-overload/project/DottyInjectedPlugin.scala b/sbt-test/tasty-compat/add-overload/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..fb946c4b8c61
--- /dev/null
+++ b/sbt-test/tasty-compat/add-overload/project/DottyInjectedPlugin.scala
@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-overload/test b/sbt-test/tasty-compat/add-overload/test
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-overload/test
rename to sbt-test/tasty-compat/add-overload/test
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-override/a-changes/A.scala b/sbt-test/tasty-compat/add-override/a-changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-override/a-changes/A.scala
rename to sbt-test/tasty-compat/add-override/a-changes/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-override/a/A.scala b/sbt-test/tasty-compat/add-override/a/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-override/a/A.scala
rename to sbt-test/tasty-compat/add-override/a/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-override/b/B.scala b/sbt-test/tasty-compat/add-override/b/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-override/b/B.scala
rename to sbt-test/tasty-compat/add-override/b/B.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-override/build.sbt b/sbt-test/tasty-compat/add-override/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-override/build.sbt
rename to sbt-test/tasty-compat/add-override/build.sbt
diff --git a/sbt-test/tasty-compat/add-override/project/DottyInjectedPlugin.scala b/sbt-test/tasty-compat/add-override/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..fb946c4b8c61
--- /dev/null
+++ b/sbt-test/tasty-compat/add-override/project/DottyInjectedPlugin.scala
@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-override/test b/sbt-test/tasty-compat/add-override/test
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-override/test
rename to sbt-test/tasty-compat/add-override/test
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/a-changes/A.scala b/sbt-test/tasty-compat/add-refinement-change-names/a-changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/a-changes/A.scala
rename to sbt-test/tasty-compat/add-refinement-change-names/a-changes/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/a/A.scala b/sbt-test/tasty-compat/add-refinement-change-names/a/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/a/A.scala
rename to sbt-test/tasty-compat/add-refinement-change-names/a/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/b/B.scala b/sbt-test/tasty-compat/add-refinement-change-names/b/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/b/B.scala
rename to sbt-test/tasty-compat/add-refinement-change-names/b/B.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/build.sbt b/sbt-test/tasty-compat/add-refinement-change-names/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/build.sbt
rename to sbt-test/tasty-compat/add-refinement-change-names/build.sbt
diff --git a/sbt-test/tasty-compat/add-refinement-change-names/project/DottyInjectedPlugin.scala b/sbt-test/tasty-compat/add-refinement-change-names/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..fb946c4b8c61
--- /dev/null
+++ b/sbt-test/tasty-compat/add-refinement-change-names/project/DottyInjectedPlugin.scala
@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/test b/sbt-test/tasty-compat/add-refinement-change-names/test
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/add-refinement-change-names/test
rename to sbt-test/tasty-compat/add-refinement-change-names/test
diff --git a/sbt-dotty/sbt-test/tasty-compat/change-refinement/a-changes/A.scala b/sbt-test/tasty-compat/change-refinement/a-changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/change-refinement/a-changes/A.scala
rename to sbt-test/tasty-compat/change-refinement/a-changes/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/change-refinement/a/A.scala b/sbt-test/tasty-compat/change-refinement/a/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/change-refinement/a/A.scala
rename to sbt-test/tasty-compat/change-refinement/a/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/change-refinement/b/B.scala b/sbt-test/tasty-compat/change-refinement/b/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/change-refinement/b/B.scala
rename to sbt-test/tasty-compat/change-refinement/b/B.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/change-refinement/build.sbt b/sbt-test/tasty-compat/change-refinement/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/change-refinement/build.sbt
rename to sbt-test/tasty-compat/change-refinement/build.sbt
diff --git a/sbt-test/tasty-compat/change-refinement/project/DottyInjectedPlugin.scala b/sbt-test/tasty-compat/change-refinement/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..fb946c4b8c61
--- /dev/null
+++ b/sbt-test/tasty-compat/change-refinement/project/DottyInjectedPlugin.scala
@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/change-refinement/test b/sbt-test/tasty-compat/change-refinement/test
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/change-refinement/test
rename to sbt-test/tasty-compat/change-refinement/test
diff --git a/sbt-dotty/sbt-test/tasty-compat/move-method/a-changes/A.scala b/sbt-test/tasty-compat/move-method/a-changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/move-method/a-changes/A.scala
rename to sbt-test/tasty-compat/move-method/a-changes/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/move-method/a/A.scala b/sbt-test/tasty-compat/move-method/a/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/move-method/a/A.scala
rename to sbt-test/tasty-compat/move-method/a/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/move-method/b/B.scala b/sbt-test/tasty-compat/move-method/b/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/move-method/b/B.scala
rename to sbt-test/tasty-compat/move-method/b/B.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/move-method/build.sbt b/sbt-test/tasty-compat/move-method/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/move-method/build.sbt
rename to sbt-test/tasty-compat/move-method/build.sbt
diff --git a/sbt-test/tasty-compat/move-method/project/DottyInjectedPlugin.scala b/sbt-test/tasty-compat/move-method/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..fb946c4b8c61
--- /dev/null
+++ b/sbt-test/tasty-compat/move-method/project/DottyInjectedPlugin.scala
@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/move-method/test b/sbt-test/tasty-compat/move-method/test
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/move-method/test
rename to sbt-test/tasty-compat/move-method/test
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-override/a-changes/A.scala b/sbt-test/tasty-compat/remove-override/a-changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/remove-override/a-changes/A.scala
rename to sbt-test/tasty-compat/remove-override/a-changes/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-override/a/A.scala b/sbt-test/tasty-compat/remove-override/a/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/remove-override/a/A.scala
rename to sbt-test/tasty-compat/remove-override/a/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-override/b/B.scala b/sbt-test/tasty-compat/remove-override/b/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/remove-override/b/B.scala
rename to sbt-test/tasty-compat/remove-override/b/B.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-override/build.sbt b/sbt-test/tasty-compat/remove-override/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/remove-override/build.sbt
rename to sbt-test/tasty-compat/remove-override/build.sbt
diff --git a/sbt-test/tasty-compat/remove-override/project/DottyInjectedPlugin.scala b/sbt-test/tasty-compat/remove-override/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..fb946c4b8c61
--- /dev/null
+++ b/sbt-test/tasty-compat/remove-override/project/DottyInjectedPlugin.scala
@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-override/test b/sbt-test/tasty-compat/remove-override/test
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/remove-override/test
rename to sbt-test/tasty-compat/remove-override/test
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-refinement/a-changes/A.scala b/sbt-test/tasty-compat/remove-refinement/a-changes/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/remove-refinement/a-changes/A.scala
rename to sbt-test/tasty-compat/remove-refinement/a-changes/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-refinement/a/A.scala b/sbt-test/tasty-compat/remove-refinement/a/A.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/remove-refinement/a/A.scala
rename to sbt-test/tasty-compat/remove-refinement/a/A.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-refinement/b/B.scala b/sbt-test/tasty-compat/remove-refinement/b/B.scala
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/remove-refinement/b/B.scala
rename to sbt-test/tasty-compat/remove-refinement/b/B.scala
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-refinement/build.sbt b/sbt-test/tasty-compat/remove-refinement/build.sbt
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/remove-refinement/build.sbt
rename to sbt-test/tasty-compat/remove-refinement/build.sbt
diff --git a/sbt-test/tasty-compat/remove-refinement/project/DottyInjectedPlugin.scala b/sbt-test/tasty-compat/remove-refinement/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000000..fb946c4b8c61
--- /dev/null
+++ b/sbt-test/tasty-compat/remove-refinement/project/DottyInjectedPlugin.scala
@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}
diff --git a/sbt-dotty/sbt-test/tasty-compat/remove-refinement/test b/sbt-test/tasty-compat/remove-refinement/test
similarity index 100%
rename from sbt-dotty/sbt-test/tasty-compat/remove-refinement/test
rename to sbt-test/tasty-compat/remove-refinement/test
diff --git a/scaladoc-js/common/css/code-snippets.css b/scaladoc-js/common/css/code-snippets.css
new file mode 100644
index 000000000000..861d44d4b2d7
--- /dev/null
+++ b/scaladoc-js/common/css/code-snippets.css
@@ -0,0 +1,311 @@
+/* Snippets */
+
+.snippet {
+  padding: 12px 8px 10px 12px;
+  background: var(--code-bg);
+  margin: 1em 0px;
+  border-radius: 2px;
+  box-shadow: 0 0 2px #888;
+  cursor: default;
+}
+.snippet-error {
+  border-bottom: 2px dotted red;
+}
+.snippet-warn {
+  border-bottom: 2px dotted orange;
+}
+.snippet-info {
+  border-bottom: 2px dotted teal;
+}
+.snippet-debug {
+  border-bottom: 2px dotted pink;
+}
+
+.snippet .snippet-meta {
+  border-top: 2px solid var(--inactive-bg);
+  color: var(--inactive-fg);
+  margin-top: 10px;
+  padding-top: 10px;
+  font-size: 0.75em;
+}
+
+.snippet-meta .snippet-label {
+  font-weight: bold;
+}
+
+.snippet .buttons {
+  --icon-size: 16px;
+}
+
+.snippet-showhide {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  --slider-width: 40px;
+  --slider-height: 16px;
+  --slider-diameter: calc(var(--slider-height) - 4px);
+}
+
+.buttons p {
+  margin-left: 4px;
+  margin-bottom: 0;
+  margin-top: 0;
+  color: var(--inactive-fg);
+}
+
+.snippet-showhide-button {
+  display: inline-block;
+  position: relative;
+  width: var(--slider-width);
+  height: var(--slider-height);
+  margin-bottom: 0;
+}
+
+.snippet-showhide-button input {
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+.snippet-showhide-button .slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: var(--inactive-bg);
+  -webkit-transition: .4s;
+  transition: .4s;
+  border-radius: var(--slider-height);
+}
+
+.snippet-showhide-button .slider:before {
+  position: absolute;
+  content: "";
+  height: var(--slider-diameter);
+  width: var(--slider-diameter);
+  left: 2px;
+  bottom: 2px;
+  background-color: var(--inactive-fg);
+  -webkit-transition: .4s;
+  transition: .4s;
+  border-radius: 50%;
+}
+
+.snippet-showhide-button .slider:hover::before {
+  background-color: var(--active-fg);
+}
+
+input:checked + .slider {
+  background-color: var(--active-bg);
+}
+
+input:focus + .slider {
+  box-shadow: 0 0 1px var(--active-bg-shadow);
+}
+
+input:checked + .slider:before {
+  --translation-size: calc(var(--slider-width) - var(--slider-diameter) - 4px);
+  -webkit-transform: translateX(var(--translation-size));
+  -ms-transform: translateX(var(--translation-size));
+  transform: translateX(var(--translation-size));
+}
+
+.tooltip-container {
+  display: none;
+}
+.tooltip:hover .tooltip-container {
+  display: block;
+}
+.tooltip:hover .tooltip-container::after {
+  content: attr(label);
+  padding: 4px 8px;
+  color: white;
+  background-color:black;
+  position: absolute;
+  z-index:10;
+  box-shadow:0 0 3px #444;
+  opacity: 0.8;
+}
+
+.snippet .buttons .tooltip::after {
+  top: 32px;
+}
+
+.snippet .buttons {
+  display: flex;
+  flex-direction: row-reverse;
+  justify-content: flex-start;
+}
+
+.snippet .buttons button {
+  outline: none;
+  background: none;
+  border: none;
+  font-size: var(--icon-size);
+  color: var(--inactive-fg);
+  cursor: pointer;
+}
+
+.snippet .buttons button:hover:not(:disabled) {
+  color: var(--inactive-fg-shadow)
+}
+
+.snippet .buttons button:active:not(:disabled) {
+  transform: translateY(2px);
+  color: var(--active-fg)
+}
+
+.snippet .buttons button:disabled {
+  color: var(--inactive-bg)
+}
+
+
+.snippet .buttons>:not(:first-child) {
+  border-right: 2px solid var(--inactive-bg);
+}
+
+.snippet .buttons>* {
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+.unselectable {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.included-section {
+  display: flex;
+  flex-direction: column;
+}
+
+.included-section a {
+  color: var(--inactive-fg) !important;
+  font-size: 0.75em;
+}
+
+.included-section b {
+  font-weight: bold;
+}
+
+.hideable.hidden {
+  display: none;
+}
+
+.snippet .scastie.embedded {
+  width: 100%;
+}
+
+.snippet .scastie.embedded .content {
+  height: unset;
+}
+
+.snippet .scastie.embedded .editor-container {
+  height: unset;
+}
+
+.snippet .scastie.embedded .editor-container .code {
+  height: unset;
+}
+
+.snippet .scastie.embedded .editor-container .editor-wrapper {
+  height: unset;
+}
+
+.snippet .scastie .CodeMirror, .snippet .scastie .CodeMirror-scroll {
+  height:unset;
+}
+
+.snippet .scastie.embedded .app.light .editor-container .code .CodeMirror-scroll {
+  height:unset;
+  min-height: 50px;
+}
+
+.snippet .scastie .app.light .editor-container .console-container .console {
+  height: unset;
+}
+
+.snippet .scastie .app.light .CodeMirror-gutters {
+  background-color: var(--code-bg) !important;
+  border-color: var(--code-bg) !important;
+}
+
+.snippet .scastie .app.light .CodeMirror {
+  color: var(--code-fg);
+  background-color: var(--code-bg);
+}
+
+
+.snippet .scastie .app.light .output-console pre {
+  color: white;
+  background-color: rgb(0, 43, 54);
+}
+
+.snippet .scastie .app.light .editor-container .handler {
+  background-color: var(--code-bg);
+}
+
+.snippet .scastie .console-container {
+  margin-left: 30px;
+}
+
+.snippet .scastie .app.light .main-panel {
+  background-color: unset;
+}
+
+.snippet .scastie .cm-s-solarized.cm-s-light .CodeMirror-widget .fold,
+.snippet .scastie .cm-s-solarized.cm-s-light .CodeMirror-linewidget .compilation-info,
+.snippet .scastie .cm-s-solarized.cm-s-light .CodeMirror-linewidget .runtime-error,
+.snippet .scastie .cm-s-solarized.cm-s-light .CodeMirror-linewidget .line,
+.snippet .scastie .cm-s-solarized.cm-s-light .CodeMirror-linewidget .inline {
+  background-color: var(--code-bg);
+}
+
+.snippet .scastie .ansi-color-yellow {
+  color: #b58900;
+}
+
+.snippet .scastie .ansi-color-magenta {
+  color: var(--red500);
+}
+
+.snippet .fa-warning:before, .fa-exclamation-triangle:before {
+  color: #b58900;
+}
+
+@media(max-width: 836px) {
+  .snippet .buttons {
+    --icon-size: 16px;
+    font-size: 0px;
+  }
+
+  .snippet .buttons p {
+    --icon-size: 16px;
+    font-size: 0px;
+  }
+}
+
+@media(max-width: 576px) {
+  .snippet-showhide {
+      --slider-width: 32px;
+      --slider-height: 16px;
+  }
+}
+
+@media(max-width: 360px) {
+  .snippet-showhide {
+      --slider-width: 32px;
+      --slider-height: 16px;
+  }
+}
+
+@media(max-width: 240px) {
+  .snippet-showhide {
+      --slider-width: 24px;
+      --slider-height: 10px;
+  }
+}
diff --git a/scaladoc-js/common/css/searchbar.css b/scaladoc-js/common/css/searchbar.css
new file mode 100644
index 000000000000..103b830e0ca4
--- /dev/null
+++ b/scaladoc-js/common/css/searchbar.css
@@ -0,0 +1,255 @@
+/* Global search */
+.search-content {
+  padding: 0;
+  margin: var(--content-padding);
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 5;
+  background: none;
+}
+
+/* popup */
+.popup-wrapper {
+  box-shadow: 0 0 10px var(--border-light) !important;
+  border: 2px solid var(--border-light) !important;
+  font-family: var(--mono-font) !important;
+  width: calc(100% - var(--side-width) - 84px);
+  left: calc(var(--side-width) + 42px) !important;
+}
+.popup-wrapper .indented {
+  text-indent: 1.5em !important;
+}
+.popup-wrapper .disabled {
+  color: var(--inactive-fg) !important;
+  font-weight: 500 !important;
+}
+.action_def:hover, .action_def.hover_a79 {
+  color: var(--selected-fg);
+  background: var(--selected-bg) !important;
+  font-weight: 500;
+}
+.action_def .template-description {
+  margin-left: 2rem;
+  font-style: italic;
+}
+
+/* Landscape phones, portait tablets */
+@media(max-width: 768px) {
+  .popup-wrapper {
+    width: calc(100% - 48px);
+    left: 24px !important;
+  }
+}
+
+/* Portrait phones */
+@media(max-width: 576px) {
+  .search-content {
+    margin: 0 !important;
+    top: 9px !important;
+    right: 12px !important;
+  }
+  .popup-wrapper {
+    width: 100%;
+    left: 0 !important;
+    top: 36px !important;
+  }
+  /* Allow to scroll horizontally in the search results, which is useful on small screens */
+  .popup-wrapper div.ReactVirtualized__Grid__innerScrollContainer {
+    overflow: auto !important;
+  }
+  .popup-wrapper div.ReactVirtualized__Grid__innerScrollContainer > div {
+    min-width: 100%;
+    width: auto !important;
+  }
+}
+
+/* Loading */
+.loading-wrapper {
+  text-align: center;
+  padding: 4px;
+}
+
+.loading, .loading::before, .loading::after {
+  content: '';
+  width: 10px;
+  height: 10px;
+  border-radius: 5px;
+  background-color: var(--leftbar-bg);
+  color: var(--leftbar-bg);
+  animation-name: dotFlashing;
+  animation-duration: 1.6s;
+  animation-iteration-count: infinite;
+  animation-direction: normal;
+  animation-timing-function: ease-in-out;
+  display: inline-block;
+  position: absolute;
+  top: 0;
+}
+
+.loading {
+  position: relative;
+  animation-delay: .2s;
+}
+
+.loading::before {
+  left: -15px;
+  animation-delay: 0s;
+}
+
+.loading::after {
+  left: 15px;
+  animation-delay: .4s;
+}
+
+@keyframes dotFlashing {
+  0% {
+    background-color: var(--leftbar-bg);
+  }
+  25% {
+    background-color: var(--shadow);
+  }
+  50% {
+    background-color: var(--leftbar-bg);
+  }
+}
+
+.scaladoc-searchbar-inkuire-package {
+  display: none;
+  color: var(--symbol-fg)
+}
+
+div[selected] > .scaladoc-searchbar-inkuire-package {
+  display: flex;
+}
+
+.scaladoc-searchbar-inkuire-package > .micon {
+  float: right;
+  margin-left: auto !important;
+}
+
+/* button */
+.search span {
+  background: var(--red500);
+  fill: var(--white);
+  cursor: pointer;
+  border: none;
+  padding: 9px;
+  border-radius: 24px;
+  box-shadow: 0 0 16px var(--code-bg);
+}
+.search span:hover {
+  background: var(--red600);
+}
+
+@media(max-width: 576px) {
+  .search span {
+      background: none;
+      fill: var(--icon-color);
+      cursor: pointer;
+      border: none;
+      padding: 0;
+      box-shadow: none;
+      margin-top: 2px;
+  }
+
+  .search span:hover {
+      fill: var(--link-hover-fg);
+  }
+}
+
+#scaladoc-search {
+  margin-top: 16px;
+  cursor: pointer;
+  position: fixed;
+  top: 0;
+  right: 20px;
+  z-index: 5;
+}
+
+#scaladoc-searchbar.hidden {
+  display: none;
+}
+
+#scaladoc-searchbar {
+  position: fixed;
+  top: 50px;
+  left: calc(5% + var(--side-width));
+  z-index: 5;
+  width: calc(90% - var(--side-width));
+  box-shadow: 0 2px 16px 0 rgba(0, 42, 76, 0.15);
+  font-size: 13px;
+  font-family: system-ui, -apple-system, Segoe UI, Roboto, Noto Sans, Ubuntu, Cantarell, Helvetica Neue, Arial, sans-serif;
+  background-color: var(--leftbar-bg);
+  color: var(--leftbar-fg);
+  box-shadow: 0 0 2px var(--shadow);
+}
+
+#scaladoc-searchbar-input {
+  width: 100%;
+  min-height: 32px;
+  border: none;
+  border-bottom: 1px solid #bbb;
+  padding: 10px;
+  background-color: var(--leftbar-bg);
+  color: var(--leftbar-fg);
+}
+
+#scaladoc-searchbar-input:focus {
+  outline: none;
+}
+
+#scaladoc-searchbar-results {
+  display: flex;
+  flex-direction: column;
+  max-height: 500px;
+  overflow: auto;
+}
+
+.scaladoc-searchbar-result {
+  background-color: var(--leftbar-bg);
+  color: var(--leftbar-fg);
+  line-height: 24px;
+  padding: 4px 10px 4px 10px;
+}
+
+.scaladoc-searchbar-result-row {
+  display: flex;
+}
+
+.scaladoc-searchbar-result .micon {
+  height: 16px;
+  width: 16px;
+  margin: 4px 8px 0px 0px;
+}
+
+.scaladoc-searchbar-result:first-of-type {
+  margin-top: 10px;
+}
+
+.scaladoc-searchbar-result[selected] {
+  background-color: var(--leftbar-hover-bg);
+  color: var(--leftbar-hover-fg);
+}
+
+.scaladoc-searchbar-result a {
+  /* for some reason, with display:block if there's a wrap between the
+   * search result text and the location span, the dead space to the
+   * left of the location span doesn't get treated as part of the block,
+   * which defeats the purpose of making the <a> a block element.
+   * But inline-block with width:100% works as desired.
+   */
+  display: inline-block;
+  width: 100%;
+  text-indent: -20px;
+  padding-left: 20px;
+}
+
+#searchBar {
+  display: inline-flex;
+}
+
+.pull-right {
+  float: right;
+  margin-left: auto;
+}
diff --git a/scaladoc-js/common/css/social-links.css b/scaladoc-js/common/css/social-links.css
new file mode 100644
index 000000000000..f0edfafa7d6d
--- /dev/null
+++ b/scaladoc-js/common/css/social-links.css
@@ -0,0 +1,17 @@
+.theme-dark footer .social-icon {
+  /* "Poor man's dark mode" for images.
+   * This works great with black images,
+   * and just-okay with colored images.
+   */
+  filter: invert(100%) hue-rotate(180deg);
+}
+
+.social-icon {
+  padding-right: 5px;
+  padding-left: 5px;
+}
+
+.social-icon img {
+  height: 20px;
+  width: 20px;
+}
diff --git a/scaladoc-js/common/css/ux.css b/scaladoc-js/common/css/ux.css
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/scaladoc-js/common/css/versions-dropdown.css b/scaladoc-js/common/css/versions-dropdown.css
new file mode 100644
index 000000000000..5e3e8236137b
--- /dev/null
+++ b/scaladoc-js/common/css/versions-dropdown.css
@@ -0,0 +1,107 @@
+/* The container <div> - needed to position the dropdown content */
+
+.versions-dropdown {
+  margin-left: 10px;
+  margin-right: 10px;
+  position: relative;
+}
+
+/* Dropdown Button */
+.dropdownbtn {
+  padding: 4px 12px;
+  border: none;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  border-radius: 3px;
+}
+
+.dropdownbtnactive {
+  background-color: var(--leftbar-dropdown-bg);
+}
+
+/* Dropdown button on hover & focus */
+.dropdownbtnactive:hover, .dropdownbtnactive:focus {
+  background-color: var(--leftbar-hover-bg);
+  cursor: pointer;
+}
+
+.dropdownbtn span.ar {
+  display: none;
+}
+
+.dropdownbtnactive span.ar {
+  display: unset;
+  position:absolute;
+  right: 10px;
+  z-index: 100;
+}
+
+.dropdownbtnactive span.ar:before {
+  content: '\e903';
+}
+
+.dropdownbtnactive.expanded span.ar:before {
+  content: '\e905';
+}
+
+/* The search field */
+#dropdown-input {
+  box-sizing: border-box;
+  background-color: var(--leftbar-dropdown-bg);
+  color: var(--leftbar-fg);
+  width: 100%;
+  font-size: var(--leftbar-font-size);
+  border-radius: 3px;
+  padding: 4px 12px;
+}
+
+#dropdown-input::placeholder{
+  color: var(--inactive-fg);
+}
+
+#dropdown-input, #dropdown-input:focus {
+  outline: none;
+  border: none;
+  border-bottom: 1px solid var(--border-medium);
+}
+
+
+/* Dropdown Content (Hidden by Default) */
+.dropdown-content {
+  display: none;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  background-color: var(--leftbar-dropdown-bg);
+  font-size: var(--leftbar-font-size);
+  min-width: 230px;
+  border-radius: 3px;
+  z-index: 1;
+}
+
+/* Links inside the dropdown */
+.dropdown-content a {
+  color: var(--leftbar-fg);
+  text-decoration: none;
+  padding: 4px 12px;
+  display: block;
+  border-radius: 3px;
+}
+
+/* Change color of dropdown links on hover */
+.dropdown-content a:hover {
+  background-color: var(--leftbar-hover-bg);
+  color: var(--leftbar-fg);
+}
+
+/* Show the dropdown menu (use JS to add this class to the .dropdown-content container when the user clicks on the dropdown button) */
+.show {
+  display:block;
+}
+
+/* Filtered entries in dropdown menu */
+.dropdown-content a.filtered {
+  display: none;
+}
diff --git a/scaladoc-js/common/src/code-snippets/CodeSnippets.scala b/scaladoc-js/common/src/code-snippets/CodeSnippets.scala
new file mode 100644
index 000000000000..3d4b4af2ab64
--- /dev/null
+++ b/scaladoc-js/common/src/code-snippets/CodeSnippets.scala
@@ -0,0 +1,220 @@
+package dotty.tools.scaladoc
+
+import scala.scalajs.js
+import org.scalajs.dom._
+import org.scalajs.dom.ext._
+
+import CodeSnippetsGlobals._
+
+class CodeSnippets:
+  lazy val scastieConfig = getScastieConfiguration
+
+  private def getScastieConfiguration: js.Dynamic =
+    js.Dynamic.literal(
+      sbtConfig = scastieConfiguration,
+      targetType = "scala3"
+    )
+
+  private def getButtonsSection(snippet: html.Element): Option[html.Div] = snippet.querySelector("div.buttons") match {
+    case div: html.Div => Some(div)
+    case _ => None
+  }
+
+  def enrichSnippets() = document.querySelectorAll("div.snippet[scala-snippet]").foreach {
+    case snippet: html.Element =>
+      snippet.addEventListener("click", (e: MouseEvent) => e.asInstanceOf[js.Dynamic].fromSnippet = true)
+      snippetAnchor(snippet)
+      handleHideableCode(snippet)
+      handleImportedCode(snippet)
+      copyRunButtons(snippet)
+  }
+
+  private def handleHideableCode(snippet: html.Element): Unit = {
+    def toggleHide(e: html.Element | html.Document) = e.querySelectorAll(".hideable").foreach {
+      case e: html.Element => e.classList.toggle("hidden")
+      case _ =>
+    }
+    def createShowHideButton(toggleRoot: html.Element) = {
+      val div = document.createElement("div")
+      div.classList.add("snippet-showhide")
+      val p = document.createElement("p")
+      p.textContent = "Show collapsed lines"
+      val showHideButton = document.createElement("label")
+      showHideButton.classList.add("snippet-showhide-button")
+      val checkbox = document.createElement("input").asInstanceOf[html.Input]
+      checkbox.`type` = "checkbox"
+      val slider = document.createElement("span")
+      slider.classList.add("slider")
+      showHideButton.appendChild(checkbox)
+      showHideButton.appendChild(slider)
+      checkbox.addEventListener("change", _ => toggleHide(toggleRoot))
+      div.appendChild(showHideButton)
+      div.appendChild(p)
+      div
+    }
+
+    toggleHide(snippet)
+    val buttonsSection = getButtonsSection(snippet)
+    val hideables = snippet.querySelectorAll(".hideable")
+    if hideables != null && hideables.nonEmpty then {
+      val showHideButton = createShowHideButton(snippet)
+      buttonsSection.foreach(_.appendChild(showHideButton))
+    }
+  }
+
+  private def snippetAnchor(snippet: html.Element): Unit = snippet.querySelector(".snippet-meta .snippet-label") match {
+    case e: html.Element =>
+      val name = e.textContent.trim
+      val anchor = document.createElement("a").asInstanceOf[html.Anchor]
+      anchor.id = s"snippet-$name"
+      snippet.insertBefore(anchor, snippet.firstChild)
+    case _ =>
+  }
+
+  private def handleImportedCode(snippet: html.Element): Unit = {
+    val included = snippet.querySelectorAll("code span.include")
+    val pre = snippet.querySelector("pre")
+    if included != null && included.nonEmpty && pre != null then {
+      val includesDiv = document.createElement("div")
+      includesDiv.classList.add("included-section")
+      includesDiv.classList.add("hideable")
+      included
+        .collect { case e: html.Element => e }
+        .toList
+        .filter(_.hasAttribute("name"))
+        .map(_.getAttribute("name"))
+        .distinct
+        .map { name =>
+          val a = document.createElement("a").asInstanceOf[html.Anchor]
+          a.classList.add("unselectable")
+          a.href = s"#snippet-$name"
+          a.innerHTML = s"included <b>$name</b>"
+          a
+        }
+        .foreach(a => includesDiv.appendChild(a))
+
+      snippet.insertBefore(includesDiv, pre)
+    }
+  }
+
+  private def copyRunButtons(snippet: html.Element) = {
+    def copyButton = {
+      val div = document.createElement("div")
+      val button = document.createElement("button")
+      val icon = document.createElement("i")
+      icon.classList.add("far")
+      icon.classList.add("fa-clone")
+      button.appendChild(icon)
+      button.classList.add("copy-button")
+      button.addEventListener("click", _ => {
+        val code = snippet.querySelectorAll("code>span:not(.hidden)")
+          .map(_.textContent)
+          .mkString
+        window.navigator.clipboard.writeText(code)
+      })
+      div.appendChild(button)
+      div
+    }
+    def runButton = {
+      val div = document.createElement("div").asInstanceOf[html.Div]
+      val runButton = document.createElement("button").asInstanceOf[html.Button]
+      val runIcon = document.createElement("i")
+      runIcon.classList.add("fas")
+      runIcon.classList.add("fa-play")
+      runButton.classList.add("run-button")
+      runButton.appendChild(runIcon)
+
+      runButton.addEventListener("click", _ =>
+        if !runButton.hasAttribute("opened") then {
+          scastie.Embedded(snippet.querySelector("pre"), scastieConfig)
+          runButton.setAttribute("opened", "opened")
+        }
+        snippet.querySelector(".scastie .embedded-menu") match {
+          case btn: html.Element =>
+            btn.style = "display:none;"
+          case _ =>
+        }
+        snippet.querySelector(".scastie .embedded-menu .run-button") match {
+          case btn: html.Element => btn.click()
+          case _ =>
+        }
+        snippet.querySelector(".buttons .exit-button") match {
+          case btn: html.Element => btn.parentElement.style = ""
+          case _ =>
+        }
+        snippet.querySelector(".buttons .to-scastie-button") match {
+          case btn: html.Element => btn.parentElement.style = ""
+          case _ =>
+        }
+      )
+
+      div.appendChild(runButton)
+      div
+    }
+    def exitButton = {
+      val div = document.createElement("div").asInstanceOf[html.Div]
+      val exitButton = document.createElement("button").asInstanceOf[html.Element]
+      val exitIcon = document.createElement("i")
+      exitIcon.classList.toggle("fas")
+      exitIcon.classList.toggle("fa-times")
+      exitButton.classList.add("exit-button")
+      div.style = "display:none;"
+      exitButton.appendChild(exitIcon)
+
+      exitButton.addEventListener("click", _ =>
+        snippet.querySelector("pre") match {
+          case p: html.Element => p.style = ""
+          case _ =>
+        }
+        snippet.querySelector(".scastie.embedded") match {
+          case s: html.Element => snippet.removeChild(s)
+          case _ =>
+        }
+        snippet.querySelector(".buttons .run-button") match {
+          case btn: html.Element => btn.removeAttribute("opened")
+          case _ =>
+        }
+        snippet.querySelector(".buttons .to-scastie-button") match {
+          case btn: html.Element => btn.parentElement.style = "display:none;"
+          case _ =>
+        }
+        div.style = "display:none;"
+      )
+
+      div.appendChild(exitButton)
+      div
+    }
+    def toScastieButton = {
+      val div = document.createElement("div").asInstanceOf[html.Div]
+      val toScastieButton = document.createElement("button").asInstanceOf[html.Element]
+      val toScastieIcon = document.createElement("i").asInstanceOf[html.Image]
+
+      toScastieIcon.classList.add("fas")
+      toScastieIcon.classList.add("fa-external-link-alt")
+      toScastieButton.classList.add("to-scastie-button")
+      div.style = "display:none;"
+      toScastieButton.appendChild(toScastieIcon)
+
+      toScastieButton.addEventListener("click", _ =>
+        snippet.querySelector(".embedded-menu li.logo") match {
+          case toScastie: html.Element => toScastie.click()
+          case _ =>
+        }
+      )
+
+      div.appendChild(toScastieButton)
+      div
+    }
+    val buttonsSection = getButtonsSection(snippet)
+    buttonsSection.foreach(s =>
+      s.appendChild(copyButton)
+      if !snippet.hasAttribute("hasContext") then {
+        s.appendChild(toScastieButton)
+        s.appendChild(runButton)
+        s.appendChild(exitButton)
+      }
+    )
+  }
+
+  enrichSnippets()
+
diff --git a/scaladoc-js/common/src/code-snippets/CodeSnippetsGlobals.scala b/scaladoc-js/common/src/code-snippets/CodeSnippetsGlobals.scala
new file mode 100644
index 000000000000..f457602c601e
--- /dev/null
+++ b/scaladoc-js/common/src/code-snippets/CodeSnippetsGlobals.scala
@@ -0,0 +1,11 @@
+package dotty.tools.scaladoc
+
+import scala.scalajs.js
+import scala.scalajs.js.annotation.JSGlobalScope
+
+@js.native
+@JSGlobalScope
+object CodeSnippetsGlobals extends js.Object {
+  val scastie: Scastie = js.native
+  val scastieConfiguration: String = js.native
+}
\ No newline at end of file
diff --git a/scaladoc-js/common/src/code-snippets/Scastie.scala b/scaladoc-js/common/src/code-snippets/Scastie.scala
new file mode 100644
index 000000000000..fae9d4363f22
--- /dev/null
+++ b/scaladoc-js/common/src/code-snippets/Scastie.scala
@@ -0,0 +1,9 @@
+package dotty.tools.scaladoc
+
+import scala.scalajs.js
+import org.scalajs.dom._
+
+@js.native
+trait Scastie extends js.Object:
+    def Embedded(selector: String | Node, config: js.Dynamic): Unit = js.native
+    def Embedded(selector: String | Node): Unit = js.native
\ No newline at end of file
diff --git a/scaladoc-js/contributors/css/content-contributors.css b/scaladoc-js/contributors/css/content-contributors.css
new file mode 100644
index 000000000000..733d6908cc52
--- /dev/null
+++ b/scaladoc-js/contributors/css/content-contributors.css
@@ -0,0 +1,24 @@
+.content-contributors.hidden {
+  display: none;
+}
+.content-contributors .contributors-container {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  padding-bottom: 25px;
+}
+.content-contributors .contributors-container div {
+  margin: 5px;
+}
+.content-contributors .contributors-container div a {
+  vertical-align: middle;
+  padding: 3px;
+  text-decoration: none;
+}
+.content-contributors .contributors-container div img {
+  vertical-align: middle;
+  width: 35px;
+  height: 35px;
+  margin-bottom: 0;
+  border-radius: 7px;
+}
diff --git a/scaladoc-js/contributors/src/Globals.scala b/scaladoc-js/contributors/src/Globals.scala
new file mode 100644
index 000000000000..51bbf39ab3a3
--- /dev/null
+++ b/scaladoc-js/contributors/src/Globals.scala
@@ -0,0 +1,12 @@
+package dotty.tools.scaladoc
+
+import scala.scalajs.js
+import scala.scalajs.js.annotation.JSGlobalScope
+
+@js.native
+@JSGlobalScope
+object Globals extends js.Object {
+  val githubContributorsUrl: String = js.native
+  val githubContributorsFilename: String = js.native
+}
+
diff --git a/scaladoc-js/contributors/src/Main.scala b/scaladoc-js/contributors/src/Main.scala
new file mode 100644
index 000000000000..5260e11538e8
--- /dev/null
+++ b/scaladoc-js/contributors/src/Main.scala
@@ -0,0 +1,5 @@
+package dotty.tools.scaladoc
+import scala.scalajs.js.annotation._
+
+object Main extends App:
+  ContentContributors()
diff --git a/scaladoc-js/contributors/src/content-contributors/ContentContributors.scala b/scaladoc-js/contributors/src/content-contributors/ContentContributors.scala
new file mode 100644
index 000000000000..bbc9c4787dc6
--- /dev/null
+++ b/scaladoc-js/contributors/src/content-contributors/ContentContributors.scala
@@ -0,0 +1,115 @@
+package dotty.tools.scaladoc
+
+import org.scalajs.dom._
+import org.scalajs.dom.ext._
+
+import scala.util.matching.Regex._
+import scala.util.matching._
+import org.scalajs.dom.ext.Ajax
+import scala.scalajs.js.JSON
+import scala.scalajs.js
+
+import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.Future
+import scala.util.{Success,Failure}
+
+// Contributors widget
+// see https://stackoverflow.com/a/19200303/4496364
+// Copied from https://github.com/scala/docs.scala-lang/blob/main/resources/js/functions.js and rewritten to Scala.js
+
+case class FullAuthor(name: String, url: String, image: String)
+
+trait FallbackAuthor extends js.Object:
+  def name: String
+
+trait CommitBottom extends js.Object:
+  def author: FallbackAuthor
+
+trait Author extends js.Object:
+  def login: String
+  def avatar_url: String
+  def html_url: String
+
+trait CommitTop extends js.Object:
+  def commit: CommitBottom
+  def author: Author
+  def url: String
+
+trait Commits extends js.Array[CommitTop]
+
+trait CommitDescription extends js.Object:
+  def files: js.Array[FileChange]
+
+trait FileChange extends js.Object:
+  def filename: String
+  def status: String
+  def previous_filename: String
+
+class ContentContributors:
+  val indenticonsUrl = "https://github.com/identicons"
+  def linkForFilename(filename: String) = Globals.githubContributorsUrl + s"/commits?path=$filename"
+  def getAuthorsForFilename(filename: String): Future[List[FullAuthor]] = {
+    val link = linkForFilename(filename)
+    Ajax.get(link).map(_.responseText).flatMap { json =>
+      val res = JSON.parse(json).asInstanceOf[Commits]
+      val authors = res.map { commit =>
+        commit.author match
+          case null =>
+            FullAuthor(commit.commit.author.name, "", s"$indenticonsUrl/${commit.commit.author.name}.png")
+          case author =>
+            FullAuthor(author.login, author.html_url, author.avatar_url)
+      }
+      val lastCommit = res.lastOption
+      val lastCommitDescriptionLink = lastCommit.map(_.url)
+      val previousFilename = lastCommitDescriptionLink
+        .fold(Future.successful(None)) { link =>
+          findRename(link, filename)
+        }
+      val previousAuthors = previousFilename.flatMap {
+        case Some(filename) => getAuthorsForFilename(filename)
+        case None => Future.successful(List.empty)
+      }.fallbackTo(Future.successful(List.empty))
+
+      previousAuthors.map(_ ++ authors).map(_.distinct)
+    }
+  }
+  def findRename(link: String, filename: String): Future[Option[String]] = {
+    Ajax.get(link).map(_.responseText).map { json =>
+        val res = JSON.parse(json).asInstanceOf[CommitDescription]
+        val files = res.files
+        files
+          .find(_.filename == filename)
+          .filter(_.status == "renamed")
+          .map(_.previous_filename)
+    }
+  }
+  document.addEventListener("DOMContentLoaded", (e: Event) => {
+    if js.typeOf(Globals.githubContributorsUrl) != "undefined" &&
+      js.typeOf(Globals.githubContributorsFilename) != "undefined"
+    then {
+      getAuthorsForFilename(Globals.githubContributorsFilename.stripPrefix("/")).onComplete {
+        case Success(authors) =>
+          val maybeDiv = Option(document.getElementById("documentation-contributors"))
+          maybeDiv.foreach { div =>
+            authors.foreach { case FullAuthor(name, url, img) =>
+              val divN = document.createElement("div")
+              val imgN = document.createElement("img").asInstanceOf[html.Image]
+              imgN.src = img
+              val autN = document.createElement("a").asInstanceOf[html.Anchor]
+              autN.href = url
+              autN.text = name
+              divN.appendChild(imgN)
+              divN.appendChild(autN)
+              div.appendChild(divN)
+            }
+
+            if authors.nonEmpty then
+              div.asInstanceOf[html.Div].parentElement.classList.toggle("hidden")
+        }
+        case Failure(err) =>
+          println(s"Couldn't fetch contributors. $err")
+          None
+      }
+    }
+  })
+
diff --git a/scaladoc-js/main/src/Globals.scala b/scaladoc-js/main/src/Globals.scala
new file mode 100644
index 000000000000..15c3fd81c5b8
--- /dev/null
+++ b/scaladoc-js/main/src/Globals.scala
@@ -0,0 +1,18 @@
+package dotty.tools.scaladoc
+
+import scala.scalajs.js
+import scala.scalajs.js.annotation.JSGlobalScope
+
+@js.native
+@JSGlobalScope
+object Globals extends js.Object {
+  val pathToRoot: String = js.native
+  val versionsDictionaryUrl: String = js.native
+}
+
+object StringUtils {
+  def createCamelCaseTokens(s: String): List[String] =
+    if s.isEmpty then List.empty
+    else if s.tail.indexWhere(_.isUpper) == -1 then List(s)
+    else List(s.take(s.tail.indexWhere(_.isUpper) + 1)) ++ createCamelCaseTokens(s.drop(s.tail.indexWhere(_.isUpper) + 1))
+}
diff --git a/scaladoc-js/main/src/Main.scala b/scaladoc-js/main/src/Main.scala
new file mode 100644
index 000000000000..924b45400eb0
--- /dev/null
+++ b/scaladoc-js/main/src/Main.scala
@@ -0,0 +1,10 @@
+package dotty.tools.scaladoc
+import scala.scalajs.js.annotation._
+
+object Main extends App:
+  Searchbar()
+  SocialLinks()
+  DropdownHandler()
+  Ux()
+  TooltipNormalizer()
+  CodeSnippets()
diff --git a/scaladoc-js/main/src/searchbar/PageEntry.scala b/scaladoc-js/main/src/searchbar/PageEntry.scala
new file mode 100644
index 000000000000..7b0837e87a95
--- /dev/null
+++ b/scaladoc-js/main/src/searchbar/PageEntry.scala
@@ -0,0 +1,41 @@
+package dotty.tools.scaladoc
+
+import scala.scalajs.js
+
+@js.native
+trait PageEntryJS extends js.Object {
+  val n: String = js.native
+  val t: String = js.native
+  val d: String = js.native
+  val l: String = js.native
+  val k: String = js.native
+}
+
+case class PageEntry(
+  fullName: String,
+  description: String,
+  location: String,
+  shortName: String,
+  kind: String,
+  tokens: List[String]
+)
+
+case class InkuireMatch(
+  prettifiedSignature: String,
+  functionName:        String,
+  packageLocation:     String,
+  pageLocation:        String,
+  entryType:           String,
+  mq:                  Int
+)
+
+object PageEntry {
+  def apply(jsObj: PageEntryJS): PageEntry = PageEntry(
+      jsObj.t,
+      jsObj.d,
+      jsObj.l,
+      jsObj.n.toLowerCase,
+      jsObj.k,
+      StringUtils.createCamelCaseTokens(jsObj.n)
+    )
+}
diff --git a/scaladoc-js/main/src/searchbar/Searchbar.scala b/scaladoc-js/main/src/searchbar/Searchbar.scala
new file mode 100644
index 000000000000..687888cbae61
--- /dev/null
+++ b/scaladoc-js/main/src/searchbar/Searchbar.scala
@@ -0,0 +1,9 @@
+package dotty.tools.scaladoc
+
+class Searchbar {
+  val pages = SearchbarGlobals.pages.toList.map(PageEntry.apply)
+  val parser = QueryParser()
+  val searchEngine = SearchbarEngine(pages)
+  val inkuireEngine = InkuireJSSearchEngine()
+  val component = SearchbarComponent(searchEngine, inkuireEngine, parser)
+}
\ No newline at end of file
diff --git a/scaladoc-js/main/src/searchbar/SearchbarComponent.scala b/scaladoc-js/main/src/searchbar/SearchbarComponent.scala
new file mode 100644
index 000000000000..33f38e690a1e
--- /dev/null
+++ b/scaladoc-js/main/src/searchbar/SearchbarComponent.scala
@@ -0,0 +1,307 @@
+package dotty.tools.scaladoc
+
+import org.scalajs.dom._
+import org.scalajs.dom.ext._
+import org.scalajs.dom.html.Input
+import scala.scalajs.js.timers._
+import scala.concurrent.duration._
+
+import java.net.URI
+
+class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireJSSearchEngine, parser: QueryParser):
+  val resultsChunkSize = 100
+  extension (p: PageEntry)
+    def toHTML =
+      val wrapper = document.createElement("div").asInstanceOf[html.Div]
+      wrapper.classList.add("scaladoc-searchbar-result")
+      wrapper.classList.add("scaladoc-searchbar-result-row")
+      wrapper.classList.add("monospace")
+
+      val icon = document.createElement("span").asInstanceOf[html.Span]
+      icon.classList.add("micon")
+      icon.classList.add(p.kind.take(2))
+
+      val resultA = document.createElement("a").asInstanceOf[html.Anchor]
+      resultA.href = Globals.pathToRoot + p.location
+      resultA.text = s"${p.fullName}"
+      resultA.onclick = (event: Event) =>
+        if (document.body.contains(rootDiv)) {
+          document.body.removeChild(rootDiv)
+        }
+
+      val location = document.createElement("span")
+      location.classList.add("pull-right")
+      location.classList.add("scaladoc-searchbar-location")
+      location.textContent = p.description
+
+      wrapper.appendChild(icon)
+      wrapper.appendChild(resultA)
+      resultA.appendChild(location)
+      wrapper.addEventListener("mouseover", {
+        case e: MouseEvent => handleHover(wrapper)
+      })
+      wrapper
+
+  extension (m: InkuireMatch)
+    def toHTML =
+      val wrapper = document.createElement("div").asInstanceOf[html.Div]
+      wrapper.classList.add("scaladoc-searchbar-result")
+      wrapper.classList.add("monospace")
+      wrapper.setAttribute("mq", m.mq.toString)
+
+      val resultDiv = document.createElement("div").asInstanceOf[html.Div]
+      resultDiv.classList.add("scaladoc-searchbar-result-row")
+
+      val icon = document.createElement("span").asInstanceOf[html.Span]
+      icon.classList.add("micon")
+      icon.classList.add(m.entryType.take(2))
+
+      val resultA = document.createElement("a").asInstanceOf[html.Anchor]
+      resultA.href = 
+        if(new URI(m.pageLocation).isAbsolute()) {
+          m.pageLocation
+        } else {
+          Globals.pathToRoot + m.pageLocation
+        } 
+      resultA.text = m.functionName
+      resultA.onclick = (event: Event) =>
+        if (document.body.contains(rootDiv)) {
+          document.body.removeChild(rootDiv)
+        }
+
+      val packageDiv = document.createElement("div").asInstanceOf[html.Div]
+      packageDiv.classList.add("scaladoc-searchbar-inkuire-package")
+
+      val packageIcon = document.createElement("span").asInstanceOf[html.Span]
+      packageIcon.classList.add("micon")
+      packageIcon.classList.add("pa")
+
+      val packageSpan = document.createElement("span").asInstanceOf[html.Span]
+      packageSpan.textContent = m.packageLocation
+
+      val signature = document.createElement("span")
+      signature.classList.add("pull-right")
+      signature.classList.add("scaladoc-searchbar-inkuire-signature")
+      signature.textContent = m.prettifiedSignature
+
+      wrapper.appendChild(resultDiv)
+      resultDiv.appendChild(icon)
+      resultDiv.appendChild(resultA)
+      resultA.appendChild(signature)
+      wrapper.appendChild(packageDiv)
+      packageDiv.appendChild(packageIcon)
+      packageDiv.appendChild(packageSpan)
+      wrapper.addEventListener("mouseover", {
+        case e: MouseEvent => handleHover(wrapper)
+      })
+      wrapper
+
+  def handleNewFluffQuery(matchers: List[Matchers]) =
+    val result = engine.query(matchers).map(_.toHTML)
+    resultsDiv.scrollTop = 0
+    while (resultsDiv.hasChildNodes()) resultsDiv.removeChild(resultsDiv.lastChild)
+    val fragment = document.createDocumentFragment()
+    result.take(resultsChunkSize).foreach(fragment.appendChild)
+    resultsDiv.appendChild(fragment)
+    def loadMoreResults(result: List[raw.HTMLElement]): Unit = {
+      resultsDiv.onscroll = (event: Event) => {
+        if (resultsDiv.scrollHeight - resultsDiv.scrollTop == resultsDiv.clientHeight) {
+          val fragment = document.createDocumentFragment()
+          result.take(resultsChunkSize).foreach(fragment.appendChild)
+          resultsDiv.appendChild(fragment)
+          loadMoreResults(result.drop(resultsChunkSize))
+        }
+      }
+    }
+    loadMoreResults(result.drop(resultsChunkSize))
+
+  extension (s: String)
+    def toHTMLError =
+      val wrapper = document.createElement("div").asInstanceOf[html.Div]
+      wrapper.classList.add("scaladoc-searchbar-result")
+      wrapper.classList.add("monospace")
+
+      val errorSpan = document.createElement("span").asInstanceOf[html.Span]
+      errorSpan.classList.add("search-error")
+      errorSpan.textContent = s
+
+      wrapper.appendChild(errorSpan)
+      wrapper
+
+  var timeoutHandle: SetTimeoutHandle = null
+  def handleNewQuery(query: String) =
+    clearTimeout(timeoutHandle)
+    resultsDiv.scrollTop = 0
+    resultsDiv.onscroll = (event: Event) => { }
+    while (resultsDiv.hasChildNodes()) resultsDiv.removeChild(resultsDiv.lastChild)
+    val fragment = document.createDocumentFragment()
+    parser.parse(query) match {
+      case EngineMatchersQuery(matchers) =>
+        handleNewFluffQuery(matchers)
+      case BySignature(signature) =>
+        timeoutHandle = setTimeout(1.second) {
+          val properResultsDiv = document.createElement("div").asInstanceOf[html.Div]
+          resultsDiv.appendChild(properResultsDiv)
+          val loading = document.createElement("div").asInstanceOf[html.Div]
+          loading.classList.add("loading-wrapper")
+          val animation = document.createElement("div").asInstanceOf[html.Div]
+          animation.classList.add("loading")
+          loading.appendChild(animation)
+          properResultsDiv.appendChild(loading)
+          inkuireEngine.query(query) { (m: InkuireMatch) =>
+            val next = properResultsDiv.children.foldLeft[Option[Element]](None) {
+              case (acc, child) if !acc.isEmpty => acc
+              case (_, child) =>
+                Option.when(child.hasAttribute("mq") && Integer.parseInt(child.getAttribute("mq")) > m.mq)(child)
+            }
+            next.fold {
+              properResultsDiv.appendChild(m.toHTML)
+            } { next =>
+              properResultsDiv.insertBefore(m.toHTML, next)
+            }
+          } { (s: String) =>
+            animation.classList.remove("loading")
+            properResultsDiv.appendChild(s.toHTMLError)
+          }
+        }
+    }
+
+  private val searchIcon: html.Div =
+    val span = document.createElement("span").asInstanceOf[html.Span]
+    span.innerHTML = """<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><path d="M19.64 18.36l-6.24-6.24a7.52 7.52 0 10-1.28 1.28l6.24 6.24zM7.5 13.4a5.9 5.9 0 115.9-5.9 5.91 5.91 0 01-5.9 5.9z"></path></svg>"""
+    span.id = "scaladoc-search"
+    span.onclick = (event: Event) =>
+      if (document.body.contains(rootDiv)) {
+        document.body.removeChild(rootDiv)
+      }
+      else {
+        document.body.appendChild(rootDiv)
+        input.focus()
+      }
+    // open the search if the user hits the `s` key when not focused on a text input
+    document.body.addEventListener("keydown", (e: KeyboardEvent) => handleGlobalKeyDown(e))
+
+    val element = createNestingDiv("search-content")(
+      createNestingDiv("search-container")(
+        createNestingDiv("search")(
+          span
+        )
+      )
+    )
+    document.getElementById("scaladoc-searchBar").appendChild(element)
+    element
+
+  private val input: html.Input =
+    val element = document.createElement("input").asInstanceOf[html.Input]
+    element.id = "scaladoc-searchbar-input"
+    element.addEventListener("input", (e) => handleNewQuery(e.target.asInstanceOf[html.Input].value))
+    element.autocomplete = "off"
+    element
+
+  private val resultsDiv: html.Div =
+    val element = document.createElement("div").asInstanceOf[html.Div]
+    element.id = "scaladoc-searchbar-results"
+    element
+
+  private val rootHiddenClasses = "hidden"
+  private val rootShowClasses   = ""
+
+  private def createNestingDiv(className: String)(innerElement: html.Element): html.Div =
+    val element = document.createElement("div").asInstanceOf[html.Div]
+    element.className = className
+    element.appendChild(innerElement)
+    element
+
+  private val rootDiv: html.Div =
+    val element = document.createElement("div").asInstanceOf[html.Div]
+    element.addEventListener("mousedown", (e: Event) => e.stopPropagation())
+    searchIcon.addEventListener("mousedown", (e: Event) => e.stopPropagation())
+    document.body.addEventListener("mousedown", (e: Event) =>
+      if (document.body.contains(element)) {
+        document.body.removeChild(element)
+      }
+    )
+    element.addEventListener("keydown", {
+      case e: KeyboardEvent =>
+        if e.keyCode == 40 then handleArrowDown()
+        else if e.keyCode == 38 then handleArrowUp()
+        else if e.keyCode == 13 then handleEnter()
+        else if e.keyCode == 27 then handleEscape()
+    })
+    element.id = "scaladoc-searchbar"
+    element.appendChild(input)
+    element.appendChild(resultsDiv)
+    element
+
+  private def handleArrowUp() = {
+    val selectedElement = resultsDiv.querySelector("[selected]")
+    if selectedElement != null then {
+      selectedElement.removeAttribute("selected")
+      val sibling = selectedElement.previousElementSibling
+      if sibling != null && sibling.classList.contains("scaladoc-searchbar-result") then {
+        sibling.setAttribute("selected", "")
+        resultsDiv.scrollTop = sibling.asInstanceOf[html.Element].offsetTop - (2 * sibling.asInstanceOf[html.Element].clientHeight)
+      }
+    }
+  }
+  private def handleArrowDown() = {
+    val selectedElement = resultsDiv.querySelector("[selected]")
+    if selectedElement != null then {
+      val sibling = selectedElement.nextElementSibling
+      if sibling != null then {
+        selectedElement.removeAttribute("selected")
+        sibling.setAttribute("selected", "")
+        resultsDiv.scrollTop = sibling.asInstanceOf[html.Element].offsetTop - (2 * sibling.asInstanceOf[html.Element].clientHeight)
+      }
+    } else {
+      val firstResult = resultsDiv.firstElementChild
+      if firstResult != null && firstResult.classList.contains("scaladoc-searchbar-result") then {
+        firstResult.setAttribute("selected", "")
+        resultsDiv.scrollTop = firstResult.asInstanceOf[html.Element].offsetTop - (2 * firstResult.asInstanceOf[html.Element].clientHeight)
+      } else if firstResult != null && firstResult.firstElementChild != null && firstResult.firstElementChild.nextElementSibling != null then {
+        // for Inkuire there is another wrapper to avoid displaying old results + the first (child) div is a loading animation wrapper | should be resolved in #12995
+        val properFirstResult = firstResult.firstElementChild.nextElementSibling
+        properFirstResult.setAttribute("selected", "")
+        resultsDiv.scrollTop = properFirstResult.asInstanceOf[html.Element].offsetTop - (2 * properFirstResult.asInstanceOf[html.Element].clientHeight)
+      }
+    }
+  }
+  private def handleEnter() = {
+    val selectedElement = resultsDiv.querySelector("[selected] a").asInstanceOf[html.Element]
+    if selectedElement != null then {
+      selectedElement.click()
+    }
+  }
+  private def handleEscape() = {
+    // clear the search input and close the search
+    input.value = ""
+    handleNewQuery("")
+    document.body.removeChild(rootDiv)
+  }
+
+  private def handleHover(elem: html.Element) = {
+    val selectedElement = resultsDiv.querySelector("[selected]")
+    if selectedElement != null then {
+      selectedElement.removeAttribute("selected")
+    }
+    elem.setAttribute("selected","")
+  }
+
+  private def handleGlobalKeyDown(e: KeyboardEvent) = {
+    // if the user presses the "S" key while not focused on an input, open the search
+    if (e.key == "s" || e.key == "/") {
+      val tag = e.target.asInstanceOf[html.Element].tagName
+      if (tag != "INPUT" && tag != "TEXTAREA") {
+        if (!document.body.contains(rootDiv)) {
+          // Firefox's "quick find" uses "/" as a trigger; prevent that.
+          e.preventDefault()
+
+          document.body.appendChild(rootDiv)
+          // if we focus during the event handler, the `s` gets typed into the input
+          window.setTimeout(() => input.focus(), 1.0)
+        }
+      }
+    }
+  }
+
+  handleNewQuery("")
diff --git a/scaladoc-js/src/searchbar/SearchbarGlobals.scala b/scaladoc-js/main/src/searchbar/SearchbarGlobals.scala
similarity index 100%
rename from scaladoc-js/src/searchbar/SearchbarGlobals.scala
rename to scaladoc-js/main/src/searchbar/SearchbarGlobals.scala
diff --git a/scaladoc-js/main/src/searchbar/engine/InkuireJSSearchEngine.scala b/scaladoc-js/main/src/searchbar/engine/InkuireJSSearchEngine.scala
new file mode 100644
index 000000000000..f3e7cfd52417
--- /dev/null
+++ b/scaladoc-js/main/src/searchbar/engine/InkuireJSSearchEngine.scala
@@ -0,0 +1,48 @@
+package dotty.tools.scaladoc
+
+import scala.io.Source
+import dotty.tools.scaladoc.PageEntry
+import org.scalajs.dom.webworkers.Worker
+import org.scalajs.dom._
+import scala.scalajs.js.{ JSON, Dynamic }
+import scala.collection.mutable.ListBuffer
+import scala.scalajs.js
+import scala.scalajs.js.timers._
+import org.scalajs.dom.ext.Ajax
+import scala.scalajs.js.URIUtils
+
+class InkuireJSSearchEngine {
+
+  val scriptPath     = Globals.pathToRoot + "scripts/"
+  val worker: Worker = new Worker(scriptPath + "inkuire-worker.js")
+
+  def dynamicToMatch(d: Dynamic): InkuireMatch = {
+    InkuireMatch(
+      d.prettifiedSignature.asInstanceOf[String],
+      d.functionName.asInstanceOf[String],
+      d.packageLocation.asInstanceOf[String],
+      d.pageLocation.asInstanceOf[String],
+      d.entryType.asInstanceOf[String],
+      d.mq.asInstanceOf[Int]
+    )
+  }
+
+  def query(s: String)(callback: InkuireMatch => Unit)(endCallback: String => Unit): Unit = {
+    worker.onmessage = _ => ()
+    val func = (msg: MessageEvent) => {
+      msg.data.asInstanceOf[String] match {
+        case "engine_ready" =>
+        case "new_query" =>
+        case endMsg if endMsg.startsWith("query_ended") =>
+          endCallback(endMsg.drop("query_ended".length))
+        case q =>
+          val matches = JSON.parse(q).matches
+          val actualMatches = matches.asInstanceOf[js.Array[Dynamic]].map(dynamicToMatch)
+          actualMatches.foreach(callback)
+      }
+    }
+    worker.onmessage = func
+    worker.postMessage(s)
+  }
+
+}
\ No newline at end of file
diff --git a/scaladoc-js/src/searchbar/engine/Matchers.scala b/scaladoc-js/main/src/searchbar/engine/Matchers.scala
similarity index 85%
rename from scaladoc-js/src/searchbar/engine/Matchers.scala
rename to scaladoc-js/main/src/searchbar/engine/Matchers.scala
index ceca8afd357e..14b7eeea9653 100644
--- a/scaladoc-js/src/searchbar/engine/Matchers.scala
+++ b/scaladoc-js/main/src/searchbar/engine/Matchers.scala
@@ -1,5 +1,9 @@
 package dotty.tools.scaladoc
 
+sealed trait EngineQuery
+case class EngineMatchersQuery(matchers: List[Matchers]) extends EngineQuery
+case class BySignature(signature: String) extends EngineQuery
+
 sealed trait Matchers extends Function1[PageEntry, Int]
 
 case class ByName(query: String) extends Matchers:
diff --git a/scaladoc-js/main/src/searchbar/engine/QueryParser.scala b/scaladoc-js/main/src/searchbar/engine/QueryParser.scala
new file mode 100644
index 000000000000..c03becb0026e
--- /dev/null
+++ b/scaladoc-js/main/src/searchbar/engine/QueryParser.scala
@@ -0,0 +1,34 @@
+package dotty.tools.scaladoc
+
+import scala.util.matching.Regex._
+import scala.util.matching._
+
+class QueryParser:
+  val kinds = Seq(
+    "class",
+    "trait",
+    "enum",
+    "object",
+    "def",
+    "val",
+    "var",
+    "package",
+    "given",
+    "type"
+  )
+  val kindRegex = ("(?i)" + kinds.mkString("(","|",")") + " (.*)").r
+  val restRegex = raw"(.*)".r
+  val escapedRegex = raw"`(.*)`".r
+  val signatureRegex = raw"(.*=>.*)".r
+
+  def parseMatchers(query: String): List[Matchers] = query match {
+    case escapedRegex(rest) => List(ByName(rest))
+    case kindRegex(kind, rest) => List(ByKind(kind)) ++ parseMatchers(rest)
+    case restRegex(name) => List(ByName(name))
+    case _ => List()
+  }
+
+  def parse(query: String): EngineQuery = query match {
+    case signatureRegex(signature) => BySignature(signature)
+    case other => EngineMatchersQuery(parseMatchers(other))
+  }
\ No newline at end of file
diff --git a/scaladoc-js/src/searchbar/engine/SearchbarEngine.scala b/scaladoc-js/main/src/searchbar/engine/SearchbarEngine.scala
similarity index 94%
rename from scaladoc-js/src/searchbar/engine/SearchbarEngine.scala
rename to scaladoc-js/main/src/searchbar/engine/SearchbarEngine.scala
index cbc43eaec051..c7b56b482047 100644
--- a/scaladoc-js/src/searchbar/engine/SearchbarEngine.scala
+++ b/scaladoc-js/main/src/searchbar/engine/SearchbarEngine.scala
@@ -1,6 +1,7 @@
 package dotty.tools.scaladoc
 
 import math.Ordering.Implicits.seqOrdering
+import org.scalajs.dom.Node
 
 class SearchbarEngine(pages: List[PageEntry]):
   def query(query: List[Matchers]): List[PageEntry] =
diff --git a/scaladoc-js/src/social-links/SocialLinks.scala b/scaladoc-js/main/src/social-links/SocialLinks.scala
similarity index 100%
rename from scaladoc-js/src/social-links/SocialLinks.scala
rename to scaladoc-js/main/src/social-links/SocialLinks.scala
diff --git a/scaladoc-js/main/src/tooltip-normalizer/TooltipNormalizer.scala b/scaladoc-js/main/src/tooltip-normalizer/TooltipNormalizer.scala
new file mode 100644
index 000000000000..c2ad5f413979
--- /dev/null
+++ b/scaladoc-js/main/src/tooltip-normalizer/TooltipNormalizer.scala
@@ -0,0 +1,25 @@
+package dotty.tools.scaladoc
+
+
+import org.scalajs.dom._
+import org.scalajs.dom.ext._
+import scala.scalajs.js
+import scalajs.js.DynamicImplicits.truthValue
+
+
+// Handful of links
+// https://css-tricks.com/popping-hidden-overflow/
+// https://github.com/highlightjs/highlight.js/issues/728
+// https://stackoverflow.com/a/54482317/14320995
+class TooltipNormalizer:
+  document.addEventListener("mouseover", (e: Event) => {
+    if e.target.asInstanceOf[js.Dynamic].closest(".snippet-error.tooltip") then
+      val tooltipParent = e.target.asInstanceOf[html.Span]
+      val tooltipContainer = tooltipParent.querySelector(".tooltip-container")
+      js.typeOf(tooltipContainer) match
+        case "undefined" =>
+        case _ =>
+          tooltipContainer match
+            case casted: html.Span => casted.style = s"left: ${Math.round(tooltipParent.offsetLeft)}"
+            case _ =>
+  })
diff --git a/scaladoc-js/main/src/ux/Ux.scala b/scaladoc-js/main/src/ux/Ux.scala
new file mode 100644
index 000000000000..414d26322911
--- /dev/null
+++ b/scaladoc-js/main/src/ux/Ux.scala
@@ -0,0 +1,23 @@
+package dotty.tools.scaladoc
+
+import org.scalajs.dom._
+import org.scalajs.dom.ext._
+
+import scala.util.matching.Regex._
+import scala.util.matching._
+
+class Ux():
+  def sideMenuItemsWordBreaking(): Unit =
+    val matchingRegex = raw"([.A-Z])".r
+
+    def modifySpan = (span: html.Span) => {
+      val textNodes = span.childNodes.filter(_.nodeType == 3)
+      val texts = textNodes.map(_.nodeValue).mkString
+      span.innerHTML = matchingRegex.replaceAllIn(texts, m => s"<wbr>${m.group(0)}")
+    }
+
+    val nodes = document.querySelectorAll("#sideMenu2 a span").collect {
+        case e: html.Span => e
+      }.foreach(modifySpan)
+
+  sideMenuItemsWordBreaking()
\ No newline at end of file
diff --git a/scaladoc-js/main/src/versions-dropdown/DropdownHandler.scala b/scaladoc-js/main/src/versions-dropdown/DropdownHandler.scala
new file mode 100644
index 000000000000..53187cf066ab
--- /dev/null
+++ b/scaladoc-js/main/src/versions-dropdown/DropdownHandler.scala
@@ -0,0 +1,92 @@
+package dotty.tools.scaladoc
+
+import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.Future
+import scala.util.{Success,Failure}
+
+import org.scalajs.dom._
+import org.scalajs.dom.ext._
+import scala.scalajs.js.annotation.JSExportTopLevel
+import org.scalajs.dom.ext.Ajax
+import scala.scalajs.js
+import scala.scalajs.js.JSON
+
+trait Versions extends js.Object:
+  def versions: js.Dictionary[String]
+
+class DropdownHandler:
+
+  val KEY = "versions-json"
+  val UNDEFINED_VERSIONS = "undefined_versions"
+
+  private def addVersionsList(json: String) =
+    val ver = JSON.parse(json).asInstanceOf[Versions]
+    val ddc = document.getElementById("dropdown-content")
+    for (k, v) <- ver.versions do
+      var child = document.createElement("a").asInstanceOf[html.Anchor]
+      child.href = v
+      child.text = k
+      ddc.appendChild(child)
+    val arrow = document.createElement("span").asInstanceOf[html.Span]
+    arrow.classList.add("ar")
+    document.getElementById("dropdown-button").appendChild(arrow)
+
+  private def disableButton() =
+    val btn = document.getElementById("dropdown-button").asInstanceOf[html.Button]
+    btn.disabled = true
+    btn.classList.remove("dropdownbtnactive")
+
+  private def getURLContent(url: String): Future[String] = Ajax.get(url).map(_.responseText)
+
+  window.sessionStorage.getItem(KEY) match
+    case null => // If no key, returns null
+      js.typeOf(Globals.versionsDictionaryUrl) match
+        case "undefined" =>
+          window.sessionStorage.setItem(KEY, UNDEFINED_VERSIONS)
+          disableButton()
+        case _ =>
+          getURLContent(Globals.versionsDictionaryUrl).onComplete {
+            case Success(json: String) =>
+              window.sessionStorage.setItem(KEY, json)
+              addVersionsList(json)
+            case Failure(_) =>
+              window.sessionStorage.setItem(KEY, UNDEFINED_VERSIONS)
+              disableButton()
+          }
+    case value => value match
+      case UNDEFINED_VERSIONS =>
+        disableButton()
+      case json =>
+        addVersionsList(json)
+
+  document.addEventListener("click", (e: Event) => {
+    document.getElementById("dropdown-content").classList.remove("show")
+    document.getElementById("dropdown-button").classList.remove("expanded")
+  })
+
+  document.getElementById("version").asInstanceOf[html.Span].addEventListener("click", (e: Event) => e.stopPropagation())
+end DropdownHandler
+
+@JSExportTopLevel("dropdownHandler")
+def dropdownHandler() =
+  if document.getElementById("dropdown-content").getElementsByTagName("a").size > 0 &&
+     window.getSelection.toString.length == 0 then
+    document.getElementById("dropdown-content").classList.toggle("show")
+    document.getElementById("dropdown-button").classList.toggle("expanded")
+    document.getElementById("dropdown-input").asInstanceOf[html.Input].focus()
+
+@JSExportTopLevel("filterFunction")
+def filterFunction() =
+  val input = document.getElementById("dropdown-input").asInstanceOf[html.Input]
+  val filter = input.value.toUpperCase
+  val div = document.getElementById("dropdown-content")
+  val as = div.getElementsByTagName("a")
+
+  as.foreach { a =>
+    val txtValue = a.innerText
+    val cl = a.asInstanceOf[html.Anchor].classList
+    if txtValue.toUpperCase.indexOf(filter) > -1 then
+      cl.remove("filtered")
+    else
+      cl.add("filtered")
+  }
diff --git a/scaladoc-js/test/dotty/dokka/MatchersTest.scala b/scaladoc-js/main/test/dotty/tools/scaladoc/MatchersTest.scala
similarity index 99%
rename from scaladoc-js/test/dotty/dokka/MatchersTest.scala
rename to scaladoc-js/main/test/dotty/tools/scaladoc/MatchersTest.scala
index deaa188a6c7c..b10ad501bae0 100644
--- a/scaladoc-js/test/dotty/dokka/MatchersTest.scala
+++ b/scaladoc-js/main/test/dotty/tools/scaladoc/MatchersTest.scala
@@ -35,6 +35,7 @@ class MatchersTest:
     "",
     "",
     s"$name",
+    kind,
     StringUtils.createCamelCaseTokens(name)
   )
 
diff --git a/scaladoc-js/main/test/dotty/tools/scaladoc/QueryParserTest.scala b/scaladoc-js/main/test/dotty/tools/scaladoc/QueryParserTest.scala
new file mode 100644
index 000000000000..8a79a28abdd1
--- /dev/null
+++ b/scaladoc-js/main/test/dotty/tools/scaladoc/QueryParserTest.scala
@@ -0,0 +1,35 @@
+package dotty.tools.scaladoc
+
+import org.junit.{Test, Assert}
+import org.junit.Assert._
+
+class QueryParserTest:
+  val queryParser = QueryParser()
+  val kinds = Seq(
+    "class",
+    "trait",
+    "enum",
+    "object",
+    "def",
+    "val",
+    "var",
+    "package",
+    "given",
+    "type"
+  )
+  private def testCase(query: String, result: EngineQuery) = {
+    val parsed = queryParser.parse(query)
+    assertEquals(
+      s"Query parser test error: for query: $query expected $result but found $parsed",
+      parsed,
+      result
+    )
+  }
+
+  @Test
+  def queryParserTests() = {
+    kinds.foreach(k => testCase(s"$k ", EngineMatchersQuery(List(ByKind(k), ByName("")))))
+    testCase("trait", EngineMatchersQuery(List(ByName("trait"))))
+    testCase("trait A", EngineMatchersQuery(List(ByKind("trait"), ByName("A"))))
+    testCase("`trait A`", EngineMatchersQuery(List(ByName("trait A"))))
+  }
diff --git a/scaladoc-js/resources/scaladoc-searchbar.css b/scaladoc-js/resources/scaladoc-searchbar.css
deleted file mode 100644
index 035adbee6555..000000000000
--- a/scaladoc-js/resources/scaladoc-searchbar.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* button */
-.search span {
-    background: #ED3522;
-    fill: #fff;
-    cursor: pointer;
-    border: none;
-    padding: 9px;
-    border-radius: 24px;
-    box-shadow: 0 0 16px #F27264;
-}
-.search span:hover {
-    fill: #F27264;
-}
-
-@media(max-width: 576px) {
-    .search span {
-        background: none;
-        fill: var(--icon-color);
-        cursor: pointer;
-        border: none;
-        padding: 0;
-        box-shadow: none;
-        margin-top: 2px;
-    }
-    .search span:hover {
-        fill: var(--link-hover-fg);
-    }
-}
-
-#scaladoc-search {
-    margin-top: 10px;
-    cursor: pointer;
-    position: fixed;
-    top: 0;
-    right: 20px;
-    z-index: 5;
-}
-
-#scaladoc-searchbar.hidden {
-    display: none;
-}
-
-#scaladoc-searchbar {
-    position: fixed;
-    top: 50px;
-    right: 40px;
-    z-index: 5;
-    width: calc(100% - 360px);
-    box-shadow: 0 2px 16px 0 rgba(0, 42, 76, 0.15);
-    font-size: 13px;
-    font-family: system-ui, -apple-system, Segoe UI, Roboto, Noto Sans, Ubuntu, Cantarell, Helvetica Neue, Arial, sans-serif;
-}
-
-#scaladoc-searchbar-input {
-    width: 100%;
-    min-height: 32px;
-    border: none;
-    border-bottom: 1px solid #bbb;
-    padding: 10px;
-}
-
-#scaladoc-searchbar-input:focus {
-    outline: none;
-}
-
-#scaladoc-searchbar-results {
-    background: white;
-    display: flex;
-    flex-direction: column;
-    max-height: 500px;
-    overflow: auto;
-}
-
-.scaladoc-searchbar-result {
-    background: white;
-    line-height: 32px;
-    padding-left: 10px;
-    padding-right: 10px;
-}
-
-.scaladoc-searchbar-result:first-of-type {
-    margin-top: 10px;
-}
-
-.scaladoc-searchbar-result[selected] {
-    background-color: #d4edff;
-}
-
-.scaladoc-searchbar-result a {
-    color: #1f2326;
-}
-
-.scaladoc-searchbar-result .scaladoc-searchbar-location {
-    color: gray;
-}
-
-#searchBar {
-    display: inline-flex;
-}
-
-.pull-right {
-    float: right;
-    margin-left: auto
-}
diff --git a/scaladoc-js/src/Globals.scala b/scaladoc-js/src/Globals.scala
deleted file mode 100644
index c04235dd607e..000000000000
--- a/scaladoc-js/src/Globals.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package dotty.tools.scaladoc
-
-import scala.scalajs.js
-import scala.scalajs.js.annotation.JSGlobalScope
-
-@js.native
-@JSGlobalScope
-object Globals extends js.Object {
-  val pathToRoot: String = js.native
-}
-
-object StringUtils {
-  def createCamelCaseTokens(s: String): List[String] =
-    if s.isEmpty then List.empty
-    else if s.tail.indexWhere(_.isUpper) == -1 then List(s)
-    else List(s.take(s.tail.indexWhere(_.isUpper) + 1)) ++ createCamelCaseTokens(s.drop(s.tail.indexWhere(_.isUpper) + 1))
-}
\ No newline at end of file
diff --git a/scaladoc-js/src/Main.scala b/scaladoc-js/src/Main.scala
deleted file mode 100644
index 7b32aed9a1ea..000000000000
--- a/scaladoc-js/src/Main.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package dotty.tools.scaladoc
-
-object Main extends App {
-  Searchbar()
-  SocialLinks()
-}
diff --git a/scaladoc-js/src/searchbar/PageEntry.scala b/scaladoc-js/src/searchbar/PageEntry.scala
deleted file mode 100644
index 7e335a9b0e0b..000000000000
--- a/scaladoc-js/src/searchbar/PageEntry.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-package dotty.tools.scaladoc
-
-import scala.scalajs.js
-
-@js.native
-trait PageEntryJS extends js.Object {
-  val n: String = js.native
-  val t: String = js.native
-  val d: String = js.native
-  val l: String = js.native
-}
-
-case class PageEntry(
-  fullName: String,
-  description: String,
-  location: String,
-  shortName: String,
-  tokens: List[String]
-)
-
-object PageEntry {
-  def apply(jsObj: PageEntryJS): PageEntry = PageEntry(
-      jsObj.t,
-      jsObj.d,
-      jsObj.l,
-      jsObj.n.toLowerCase,
-      StringUtils.createCamelCaseTokens(jsObj.n)
-    )
-}
diff --git a/scaladoc-js/src/searchbar/Searchbar.scala b/scaladoc-js/src/searchbar/Searchbar.scala
deleted file mode 100644
index a3dce6bb3a09..000000000000
--- a/scaladoc-js/src/searchbar/Searchbar.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package dotty.tools.scaladoc
-
-class Searchbar {
-  val pages = SearchbarGlobals.pages.toList.map(PageEntry.apply)
-  val engine = SearchbarEngine(pages)
-  val parser = QueryParser()
-  val component = SearchbarComponent(q => engine.query(parser.parse(q)))
-}
diff --git a/scaladoc-js/src/searchbar/SearchbarComponent.scala b/scaladoc-js/src/searchbar/SearchbarComponent.scala
deleted file mode 100644
index 20f7842ad749..000000000000
--- a/scaladoc-js/src/searchbar/SearchbarComponent.scala
+++ /dev/null
@@ -1,158 +0,0 @@
-package dotty.tools.scaladoc
-
-import org.scalajs.dom._
-import org.scalajs.dom.html.Input
-
-class SearchbarComponent(val callback: (String) => List[PageEntry]):
-  val resultsChunkSize = 100
-  extension (p: PageEntry)
-    def toHTML =
-      val wrapper = document.createElement("div").asInstanceOf[html.Div]
-      wrapper.classList.add("scaladoc-searchbar-result")
-      wrapper.classList.add("monospace")
-
-      val resultA = document.createElement("a").asInstanceOf[html.Anchor]
-      resultA.href = Globals.pathToRoot + p.location
-      resultA.text = s"${p.fullName}"
-
-      val location = document.createElement("span")
-      location.classList.add("pull-right")
-      location.classList.add("scaladoc-searchbar-location")
-      location.textContent = p.description
-
-      wrapper.appendChild(resultA)
-      wrapper.appendChild(location)
-      wrapper.addEventListener("mouseover", {
-        case e: MouseEvent => handleHover(wrapper)
-      })
-      wrapper
-
-  def handleNewQuery(query: String) =
-    val result = callback(query).map(_.toHTML)
-    resultsDiv.scrollTop = 0
-    while (resultsDiv.hasChildNodes()) resultsDiv.removeChild(resultsDiv.lastChild)
-    val fragment = document.createDocumentFragment()
-    result.take(resultsChunkSize).foreach(fragment.appendChild)
-    resultsDiv.appendChild(fragment)
-    def loadMoreResults(result: List[raw.HTMLElement]): Unit = {
-      resultsDiv.onscroll = (event: Event) => {
-          if (resultsDiv.scrollHeight - resultsDiv.scrollTop == resultsDiv.clientHeight)
-          {
-              val fragment = document.createDocumentFragment()
-              result.take(resultsChunkSize).foreach(fragment.appendChild)
-              resultsDiv.appendChild(fragment)
-              loadMoreResults(result.drop(resultsChunkSize))
-          }
-      }
-    }
-    loadMoreResults(result.drop(resultsChunkSize))
-
-  private val searchIcon: html.Div =
-    val span = document.createElement("span").asInstanceOf[html.Span]
-    span.innerHTML = """<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><path d="M19.64 18.36l-6.24-6.24a7.52 7.52 0 10-1.28 1.28l6.24 6.24zM7.5 13.4a5.9 5.9 0 115.9-5.9 5.91 5.91 0 01-5.9 5.9z"></path></svg>"""
-    span.id = "scaladoc-search"
-    span.onclick = (event: Event) =>
-      if (document.body.contains(rootDiv)) {
-        document.body.removeChild(rootDiv)
-      }
-      else {
-        document.body.appendChild(rootDiv)
-        input.focus()
-      }
-
-    val element = createNestingDiv("search-content")(
-      createNestingDiv("search-container")(
-        createNestingDiv("search")(
-          span
-        )
-      )
-    )
-    document.getElementById("scaladoc-searchBar").appendChild(element)
-    element
-
-
-  private val input: html.Input =
-    val element = document.createElement("input").asInstanceOf[html.Input]
-    element.id = "scaladoc-searchbar-input"
-    element.addEventListener("input", (e) => handleNewQuery(e.target.asInstanceOf[html.Input].value))
-    element.autocomplete = "off"
-    element
-
-  private val resultsDiv: html.Div =
-    val element = document.createElement("div").asInstanceOf[html.Div]
-    element.id = "scaladoc-searchbar-results"
-    element
-
-  private val rootHiddenClasses = "hidden"
-  private val rootShowClasses   = ""
-
-  private def createNestingDiv(className: String)(innerElement: html.Element): html.Div =
-    val element = document.createElement("div").asInstanceOf[html.Div]
-    element.className = className
-    element.appendChild(innerElement)
-    element
-
-  private val rootDiv: html.Div =
-    val element = document.createElement("div").asInstanceOf[html.Div]
-    element.addEventListener("mousedown", (e: Event) => e.stopPropagation())
-    searchIcon.addEventListener("mousedown", (e: Event) => e.stopPropagation())
-    document.body.addEventListener("mousedown", (e: Event) =>
-      if (document.body.contains(element)) {
-        document.body.removeChild(element)
-      }
-    )
-    element.addEventListener("keydown", {
-      case e: KeyboardEvent =>
-        if e.keyCode == 40 then handleArrowDown()
-        else if e.keyCode == 38 then handleArrowUp()
-        else if e.keyCode == 13 then handleEnter()
-    })
-    element.id = "scaladoc-searchbar"
-    element.appendChild(input)
-    element.appendChild(resultsDiv)
-    element
-
-  private def handleArrowUp() = {
-    val selectedElement = resultsDiv.querySelector("[selected]")
-    if selectedElement != null then {
-      selectedElement.removeAttribute("selected")
-      val sibling = selectedElement.previousElementSibling
-      if sibling != null then {
-        sibling.setAttribute("selected", "")
-        resultsDiv.scrollTop = sibling.asInstanceOf[html.Element].offsetTop - (2 * sibling.asInstanceOf[html.Element].clientHeight)
-      }
-    }
-  }
-  private def handleArrowDown() = {
-    val selectedElement = resultsDiv.querySelector("[selected]")
-    if selectedElement != null then {
-      val sibling = selectedElement.nextElementSibling
-      if sibling != null then {
-        selectedElement.removeAttribute("selected")
-        sibling.setAttribute("selected", "")
-        resultsDiv.scrollTop = sibling.asInstanceOf[html.Element].offsetTop - (2 * sibling.asInstanceOf[html.Element].clientHeight)
-      }
-    } else {
-      val firstResult = resultsDiv.firstElementChild
-      if firstResult != null then {
-        firstResult.setAttribute("selected", "")
-        resultsDiv.scrollTop = firstResult.asInstanceOf[html.Element].offsetTop - (2 * firstResult.asInstanceOf[html.Element].clientHeight)
-      }
-    }
-  }
-  private def handleEnter() = {
-    val selectedElement = resultsDiv.querySelector("[selected] a").asInstanceOf[html.Element]
-    if selectedElement != null then {
-      selectedElement.click()
-    }
-  }
-
-  private def handleHover(elem: html.Element) = {
-    val selectedElement = resultsDiv.querySelector("[selected]")
-    if selectedElement != null then {
-      selectedElement.removeAttribute("selected")
-    }
-    elem.setAttribute("selected","")
-  }
-
-  handleNewQuery("")
diff --git a/scaladoc-js/src/searchbar/engine/QueryParser.scala b/scaladoc-js/src/searchbar/engine/QueryParser.scala
deleted file mode 100644
index f5996484188c..000000000000
--- a/scaladoc-js/src/searchbar/engine/QueryParser.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package dotty.tools.scaladoc
-
-import scala.util.matching.Regex._
-import scala.util.matching._
-
-class QueryParser:
-  val kinds = Seq(
-    "class",
-    "trait",
-    "enum",
-    "object",
-    "def",
-    "val",
-    "var",
-    "package",
-    "given",
-    "type"
-  )
-  val kindRegex = ("(?i)" + kinds.mkString("(","|",")") + " (.*)").r
-  val restRegex = raw"(.*)".r
-  val escapedRegex = raw"`(.*)`".r
-
-  def parse(query: String): List[Matchers] = query match {
-    case escapedRegex(rest) => List(ByName(rest))
-    case kindRegex(kind, rest) => List(ByKind(kind)) ++ parse(rest)
-    case restRegex(name) => List(ByName(name))
-    case _ => List()
-  }
\ No newline at end of file
diff --git a/scaladoc-js/test/dotty/dokka/QueryParserTest.scala b/scaladoc-js/test/dotty/dokka/QueryParserTest.scala
deleted file mode 100644
index b89c7502714f..000000000000
--- a/scaladoc-js/test/dotty/dokka/QueryParserTest.scala
+++ /dev/null
@@ -1,35 +0,0 @@
-package dotty.tools.scaladoc
-
-import org.junit.{Test, Assert}
-import org.junit.Assert._
-
-class QueryParserTest:
-  val queryParser = QueryParser()
-  val kinds = Seq(
-    "class",
-    "trait",
-    "enum",
-    "object",
-    "def",
-    "val",
-    "var",
-    "package",
-    "given",
-    "type"
-  )
-  private def testCase(query: String, result: List[Matchers]) = {
-    val parsed = queryParser.parse(query)
-    assertEquals(
-      s"Query parser test error: for query: $query expected $result but found $parsed",
-      parsed,
-      result
-    )
-  }
-
-  @Test
-  def queryParserTests() = {
-    kinds.foreach(k => testCase(s"$k ", List(ByKind(k), ByName(""))))
-    testCase("trait", List(ByName("trait")))
-    testCase("trait A", List(ByKind("trait"), ByName("A")))
-    testCase("`trait A`", List(ByName("trait A")))
-  }
\ No newline at end of file
diff --git a/scaladoc-testcases/docs/_assets/css/bootstrap.min.css b/scaladoc-testcases/docs/_assets/css/bootstrap.min.css
new file mode 100644
index 000000000000..d9bbfab3ab34
--- /dev/null
+++ b/scaladoc-testcases/docs/_assets/css/bootstrap.min.css
@@ -0,0 +1 @@
+@import url("https://fonts.googleapis.com/css?family=Lato:400,700|Fira+Code:400,700&display=fallback");:root{--light:#fafafa;--toolbar:#414551;--toolbar-entry:#fafafa;--toolbar-active:#7c8296;--sidebar:#fafafa;--sidebar-category:#000;--sidebar-page:#414551;--sidebar-active:#ca445e;--pre-bg:#fafafa;--doc-bg:rgba(202,68,94,0.135);--primary:#414551;--secondary:#ca445e;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:"Lato",sans-serif;--font-family-monospace:"Fira Code","Andale Mono",monospace}*,:after,:before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(0,0,0,0)}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:Lato,sans-serif;font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{font-style:normal;line-height:inherit}address,dl,ol,ul{margin-bottom:1rem}dl,ol,ul{margin-top:0}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]),a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:Fira Code,Andale Mono,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{border-style:none}img,svg{vertical-align:middle}svg{overflow:hidden}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}select{word-wrap:normal}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:.5rem;font-family:Lato,sans-serif;font-weight:400;line-height:1.2}.h1,h1{font-size:2.5rem}.h2,h2{font-size:2rem}.h3,h3{font-size:1.75rem}.h4,h4{font-size:1.5rem}.h5,h5{font-size:1.25rem}.h6,h6{font-size:1rem}.lead{font-size:1.25rem;font-weight:300}.display-1{font-size:6rem}.display-1,.display-2{font-weight:300;line-height:1.2}.display-2{font-size:5.5rem}.display-3{font-size:4.5rem}.display-3,.display-4{font-weight:300;line-height:1.2}.display-4{font-size:3.5rem}hr{margin-top:1rem;margin-bottom:1rem;border:0;border-top:1px solid rgba(0,0,0,.1)}.small,small{font-size:80%;font-weight:400}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-inline,.list-unstyled{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:1rem;font-size:1.25rem}.blockquote-footer{display:block;font-size:80%;color:#6c757d}.blockquote-footer:before{content:"\2014\00A0"}.img-fluid,.img-thumbnail{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:#fff;border:1px solid #dee2e6;border-radius:.25rem}.figure{display:inline-block}.figure-img{margin-bottom:.5rem;line-height:1}.figure-caption{font-size:90%;color:#6c757d}code{font-size:87.5%;color:#ca445e;word-break:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:#212529}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{max-width:720px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:960px}}.container-fluid{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{display:flex;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}.col,.col-1,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-10,.col-11,.col-12,.col-auto,.col-lg,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-auto,.col-md,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-md-auto,.col-sm,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-auto{position:relative;width:100%;padding-right:15px;padding-left:15px}.col{flex-basis:0;flex-grow:1;max-width:100%}.col-auto{flex:0 0 auto;width:auto;max-width:100%}.col-1{flex:0 0 8.333333%;max-width:8.333333%}.col-2{flex:0 0 16.666667%;max-width:16.666667%}.col-3{flex:0 0 25%;max-width:25%}.col-4{flex:0 0 33.333333%;max-width:33.333333%}.col-5{flex:0 0 41.666667%;max-width:41.666667%}.col-6{flex:0 0 50%;max-width:50%}.col-7{flex:0 0 58.333333%;max-width:58.333333%}.col-8{flex:0 0 66.666667%;max-width:66.666667%}.col-9{flex:0 0 75%;max-width:75%}.col-10{flex:0 0 83.333333%;max-width:83.333333%}.col-11{flex:0 0 91.666667%;max-width:91.666667%}.col-12{flex:0 0 100%;max-width:100%}.order-first{order:-1}.order-last{order:13}.order-0{order:0}.order-1{order:1}.order-2{order:2}.order-3{order:3}.order-4{order:4}.order-5{order:5}.order-6{order:6}.order-7{order:7}.order-8{order:8}.order-9{order:9}.order-10{order:10}.order-11{order:11}.order-12{order:12}.offset-1{margin-left:8.333333%}.offset-2{margin-left:16.666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.333333%}.offset-5{margin-left:41.666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.333333%}.offset-8{margin-left:66.666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.333333%}.offset-11{margin-left:91.666667%}@media (min-width:576px){.col-sm{flex-basis:0;flex-grow:1;max-width:100%}.col-sm-auto{flex:0 0 auto;width:auto;max-width:100%}.col-sm-1{flex:0 0 8.333333%;max-width:8.333333%}.col-sm-2{flex:0 0 16.666667%;max-width:16.666667%}.col-sm-3{flex:0 0 25%;max-width:25%}.col-sm-4{flex:0 0 33.333333%;max-width:33.333333%}.col-sm-5{flex:0 0 41.666667%;max-width:41.666667%}.col-sm-6{flex:0 0 50%;max-width:50%}.col-sm-7{flex:0 0 58.333333%;max-width:58.333333%}.col-sm-8{flex:0 0 66.666667%;max-width:66.666667%}.col-sm-9{flex:0 0 75%;max-width:75%}.col-sm-10{flex:0 0 83.333333%;max-width:83.333333%}.col-sm-11{flex:0 0 91.666667%;max-width:91.666667%}.col-sm-12{flex:0 0 100%;max-width:100%}.order-sm-first{order:-1}.order-sm-last{order:13}.order-sm-0{order:0}.order-sm-1{order:1}.order-sm-2{order:2}.order-sm-3{order:3}.order-sm-4{order:4}.order-sm-5{order:5}.order-sm-6{order:6}.order-sm-7{order:7}.order-sm-8{order:8}.order-sm-9{order:9}.order-sm-10{order:10}.order-sm-11{order:11}.order-sm-12{order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.333333%}.offset-sm-2{margin-left:16.666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.333333%}.offset-sm-5{margin-left:41.666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.333333%}.offset-sm-8{margin-left:66.666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.333333%}.offset-sm-11{margin-left:91.666667%}}@media (min-width:768px){.col-md{flex-basis:0;flex-grow:1;max-width:100%}.col-md-auto{flex:0 0 auto;width:auto;max-width:100%}.col-md-1{flex:0 0 8.333333%;max-width:8.333333%}.col-md-2{flex:0 0 16.666667%;max-width:16.666667%}.col-md-3{flex:0 0 25%;max-width:25%}.col-md-4{flex:0 0 33.333333%;max-width:33.333333%}.col-md-5{flex:0 0 41.666667%;max-width:41.666667%}.col-md-6{flex:0 0 50%;max-width:50%}.col-md-7{flex:0 0 58.333333%;max-width:58.333333%}.col-md-8{flex:0 0 66.666667%;max-width:66.666667%}.col-md-9{flex:0 0 75%;max-width:75%}.col-md-10{flex:0 0 83.333333%;max-width:83.333333%}.col-md-11{flex:0 0 91.666667%;max-width:91.666667%}.col-md-12{flex:0 0 100%;max-width:100%}.order-md-first{order:-1}.order-md-last{order:13}.order-md-0{order:0}.order-md-1{order:1}.order-md-2{order:2}.order-md-3{order:3}.order-md-4{order:4}.order-md-5{order:5}.order-md-6{order:6}.order-md-7{order:7}.order-md-8{order:8}.order-md-9{order:9}.order-md-10{order:10}.order-md-11{order:11}.order-md-12{order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.333333%}.offset-md-2{margin-left:16.666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.333333%}.offset-md-5{margin-left:41.666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.333333%}.offset-md-8{margin-left:66.666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.333333%}.offset-md-11{margin-left:91.666667%}}@media (min-width:992px){.col-lg{flex-basis:0;flex-grow:1;max-width:100%}.col-lg-auto{flex:0 0 auto;width:auto;max-width:100%}.col-lg-1{flex:0 0 8.333333%;max-width:8.333333%}.col-lg-2{flex:0 0 16.666667%;max-width:16.666667%}.col-lg-3{flex:0 0 25%;max-width:25%}.col-lg-4{flex:0 0 33.333333%;max-width:33.333333%}.col-lg-5{flex:0 0 41.666667%;max-width:41.666667%}.col-lg-6{flex:0 0 50%;max-width:50%}.col-lg-7{flex:0 0 58.333333%;max-width:58.333333%}.col-lg-8{flex:0 0 66.666667%;max-width:66.666667%}.col-lg-9{flex:0 0 75%;max-width:75%}.col-lg-10{flex:0 0 83.333333%;max-width:83.333333%}.col-lg-11{flex:0 0 91.666667%;max-width:91.666667%}.col-lg-12{flex:0 0 100%;max-width:100%}.order-lg-first{order:-1}.order-lg-last{order:13}.order-lg-0{order:0}.order-lg-1{order:1}.order-lg-2{order:2}.order-lg-3{order:3}.order-lg-4{order:4}.order-lg-5{order:5}.order-lg-6{order:6}.order-lg-7{order:7}.order-lg-8{order:8}.order-lg-9{order:9}.order-lg-10{order:10}.order-lg-11{order:11}.order-lg-12{order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.333333%}.offset-lg-2{margin-left:16.666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.333333%}.offset-lg-5{margin-left:41.666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.333333%}.offset-lg-8{margin-left:66.666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.333333%}.offset-lg-11{margin-left:91.666667%}}@media (min-width:1200px){.col-xl{flex-basis:0;flex-grow:1;max-width:100%}.col-xl-auto{flex:0 0 auto;width:auto;max-width:100%}.col-xl-1{flex:0 0 8.333333%;max-width:8.333333%}.col-xl-2{flex:0 0 16.666667%;max-width:16.666667%}.col-xl-3{flex:0 0 25%;max-width:25%}.col-xl-4{flex:0 0 33.333333%;max-width:33.333333%}.col-xl-5{flex:0 0 41.666667%;max-width:41.666667%}.col-xl-6{flex:0 0 50%;max-width:50%}.col-xl-7{flex:0 0 58.333333%;max-width:58.333333%}.col-xl-8{flex:0 0 66.666667%;max-width:66.666667%}.col-xl-9{flex:0 0 75%;max-width:75%}.col-xl-10{flex:0 0 83.333333%;max-width:83.333333%}.col-xl-11{flex:0 0 91.666667%;max-width:91.666667%}.col-xl-12{flex:0 0 100%;max-width:100%}.order-xl-first{order:-1}.order-xl-last{order:13}.order-xl-0{order:0}.order-xl-1{order:1}.order-xl-2{order:2}.order-xl-3{order:3}.order-xl-4{order:4}.order-xl-5{order:5}.order-xl-6{order:6}.order-xl-7{order:7}.order-xl-8{order:8}.order-xl-9{order:9}.order-xl-10{order:10}.order-xl-11{order:11}.order-xl-12{order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.333333%}.offset-xl-2{margin-left:16.666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.333333%}.offset-xl-5{margin-left:41.666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.333333%}.offset-xl-8{margin-left:66.666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.333333%}.offset-xl-11{margin-left:91.666667%}}.table{width:100%;margin-bottom:1rem;color:#212529}.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #dee2e6}.table thead th{vertical-align:bottom;border-bottom:2px solid #dee2e6}.table tbody+tbody{border-top:2px solid #dee2e6}.table-sm td,.table-sm th{padding:.3rem}.table-bordered,.table-bordered td,.table-bordered th{border:1px solid #dee2e6}.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}.table-borderless tbody+tbody,.table-borderless td,.table-borderless th,.table-borderless thead th{border:0}.table-striped tbody tr:nth-of-type(odd){background-color:rgba(0,0,0,.05)}.table-hover tbody tr:hover{color:#212529;background-color:rgba(0,0,0,.075)}.table-primary,.table-primary>td,.table-primary>th{background-color:#cacbce}.table-primary tbody+tbody,.table-primary td,.table-primary th,.table-primary thead th{border-color:#9c9ea5}.table-hover .table-primary:hover,.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#bdbec2}.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#f0cbd2}.table-secondary tbody+tbody,.table-secondary td,.table-secondary th,.table-secondary thead th{border-color:#e39eab}.table-hover .table-secondary:hover,.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#eab7c1}.table-active,.table-active>td,.table-active>th,.table-hover .table-active:hover,.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(0,0,0,.075)}.table .thead-dark th{color:#fff;background-color:#343a40;border-color:#454d55}.table .thead-light th{color:#495057;background-color:#e9ecef;border-color:#dee2e6}.table-dark{color:#fff;background-color:#343a40}.table-dark td,.table-dark th,.table-dark thead th{border-color:#454d55}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:hsla(0,0%,100%,.05)}.table-dark.table-hover tbody tr:hover{color:#fff;background-color:hsla(0,0%,100%,.075)}@media (max-width:575.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-sm>.table-bordered{border:0}}@media (max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-md>.table-bordered{border:0}}@media (max-width:991.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-lg>.table-bordered{border:0}}@media (max-width:1199.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive>.table-bordered{border:0}.btn{display:inline-block;font-weight:400;color:#212529;text-align:center;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:transparent;border:1px solid transparent;padding:.375rem .75rem;font-size:1rem;line-height:1.5;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.btn{transition:none}}.btn:hover{color:#212529;text-decoration:none}.btn.focus,.btn:focus{outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.btn.disabled,.btn:disabled{opacity:.65}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#fff;background-color:#414551;border-color:#414551}.btn-primary:hover{color:#fff;background-color:#30333c;border-color:#2a2d35}.btn-primary.focus,.btn-primary:focus{box-shadow:0 0 0 .2rem rgba(94,97,107,.5)}.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#414551;border-color:#414551}.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#2a2d35;border-color:#25272e}.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(94,97,107,.5)}.btn-secondary{color:#fff;background-color:#ca445e;border-color:#ca445e}.btn-secondary:hover{color:#fff;background-color:#b5334c;border-color:#ab3048}.btn-secondary.focus,.btn-secondary:focus{box-shadow:0 0 0 .2rem rgba(210,96,118,.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#ca445e;border-color:#ca445e}.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#ab3048;border-color:#a12e44}.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(210,96,118,.5)}.btn-outline-primary{color:#414551;border-color:#414551}.btn-outline-primary:hover{color:#fff;background-color:#414551;border-color:#414551}.btn-outline-primary.focus,.btn-outline-primary:focus{box-shadow:0 0 0 .2rem rgba(65,69,81,.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#414551;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color:#414551;border-color:#414551}.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(65,69,81,.5)}.btn-outline-secondary{color:#ca445e;border-color:#ca445e}.btn-outline-secondary:hover{color:#fff;background-color:#ca445e;border-color:#ca445e}.btn-outline-secondary.focus,.btn-outline-secondary:focus{box-shadow:0 0 0 .2rem rgba(202,68,94,.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#ca445e;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#ca445e;border-color:#ca445e}.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(202,68,94,.5)}.btn-link{font-weight:400;color:#007bff;text-decoration:none}.btn-link:hover{color:#0056b3;text-decoration:underline}.btn-link.focus,.btn-link:focus{text-decoration:underline;box-shadow:none}.btn-link.disabled,.btn-link:disabled{color:#6c757d;pointer-events:none}.btn-lg{padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}.btn-sm{padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:.5rem}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{transition:opacity .15s linear}@media (prefers-reduced-motion:reduce){.fade{transition:none}}.fade:not(.show){opacity:0}.collapse:not(.show){display:none}.collapsing{position:relative;height:0;overflow:hidden;transition:height .35s ease}@media (prefers-reduced-motion:reduce){.collapsing{transition:none}}.nav{display:flex;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:.5rem 1rem}.nav-link:focus,.nav-link:hover{text-decoration:none}.nav-link.disabled{color:#6c757d;pointer-events:none;cursor:default}.nav-tabs{border-bottom:1px solid #dee2e6}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:.25rem;border-top-right-radius:.25rem}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{border-color:#e9ecef #e9ecef #dee2e6}.nav-tabs .nav-link.disabled{color:#6c757d;background-color:transparent;border-color:transparent}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#495057;background-color:#fff;border-color:#dee2e6 #dee2e6 #fff}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:.25rem}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#007bff}.nav-fill .nav-item{flex:1 1 auto;text-align:center}.nav-justified .nav-item{flex-basis:0;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;padding:.5rem 1rem}.navbar,.navbar>.container,.navbar>.container-fluid{display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:.3125rem;padding-bottom:.3125rem;margin-right:1rem;font-size:1.25rem;line-height:inherit;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-nav{display:flex;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:.5rem;padding-bottom:.5rem}.navbar-collapse{flex-basis:100%;flex-grow:1;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.25rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:.25rem}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat 50%;background-size:100% 100%}@media (max-width:575.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:576px){.navbar-expand-sm{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-sm .navbar-nav{flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}}@media (max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:768px){.navbar-expand-md{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-md .navbar-nav{flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}}@media (max-width:991.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:992px){.navbar-expand-lg{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-lg .navbar-nav{flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}}@media (max-width:1199.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:1200px){.navbar-expand-xl{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-xl .navbar-nav{flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}}.navbar-expand{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid{flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-light .navbar-brand,.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(0,0,0,.9)}.navbar-light .navbar-nav .nav-link{color:rgba(0,0,0,.5)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(0,0,0,.7)}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(0,0,0,.3)}.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(0,0,0,.9)}.navbar-light .navbar-toggler{color:rgba(0,0,0,.5);border-color:rgba(0,0,0,.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-light .navbar-text{color:rgba(0,0,0,.5)}.navbar-light .navbar-text a,.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(0,0,0,.9)}.navbar-dark .navbar-brand,.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:hsla(0,0%,100%,.75)}.navbar-dark .navbar-nav .nav-link.disabled{color:hsla(0,0%,100%,.25)}.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}.navbar-dark .navbar-toggler{color:hsla(0,0%,100%,.5);border-color:hsla(0,0%,100%,.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-dark .navbar-text{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-text a,.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}.breadcrumb{display:flex;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:.25rem}.breadcrumb-item+.breadcrumb-item{padding-left:.5rem}.breadcrumb-item+.breadcrumb-item:before{display:inline-block;padding-right:.5rem;color:#6c757d;content:"/"}.breadcrumb-item+.breadcrumb-item:hover:before{text-decoration:underline;text-decoration:none}.breadcrumb-item.active{color:#6c757d}.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.badge{transition:none}}a.badge:focus,a.badge:hover{text-decoration:none}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}.badge-primary{color:#fff;background-color:#414551}a.badge-primary:focus,a.badge-primary:hover{color:#fff;background-color:#2a2d35}a.badge-primary.focus,a.badge-primary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(65,69,81,.5)}.badge-secondary{color:#fff;background-color:#ca445e}a.badge-secondary:focus,a.badge-secondary:hover{color:#fff;background-color:#ab3048}a.badge-secondary.focus,a.badge-secondary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(202,68,94,.5)}@-webkit-keyframes spinner-border{to{transform:rotate(1turn)}}@keyframes spinner-border{to{transform:rotate(1turn)}}.spinner-border{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;border:.25em solid;border-right:.25em solid transparent;border-radius:50%;-webkit-animation:spinner-border .75s linear infinite;animation:spinner-border .75s linear infinite}.spinner-border-sm{width:1rem;height:1rem;border-width:.2em}@-webkit-keyframes spinner-grow{0%{transform:scale(0)}50%{opacity:1}}@keyframes spinner-grow{0%{transform:scale(0)}50%{opacity:1}}.spinner-grow{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;background-color:currentColor;border-radius:50%;opacity:0;-webkit-animation:spinner-grow .75s linear infinite;animation:spinner-grow .75s linear infinite}.spinner-grow-sm{width:1rem;height:1rem}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.bg-primary{background-color:#414551!important}a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#2a2d35!important}.bg-secondary{background-color:#ca445e!important}a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#ab3048!important}.bg-white{background-color:#fff!important}.bg-transparent{background-color:transparent!important}.border{border:1px solid #dee2e6!important}.border-top{border-top:1px solid #dee2e6!important}.border-right{border-right:1px solid #dee2e6!important}.border-bottom{border-bottom:1px solid #dee2e6!important}.border-left{border-left:1px solid #dee2e6!important}.border-0{border:0!important}.border-top-0{border-top:0!important}.border-right-0{border-right:0!important}.border-bottom-0{border-bottom:0!important}.border-left-0{border-left:0!important}.border-primary{border-color:#414551!important}.border-secondary{border-color:#ca445e!important}.border-white{border-color:#fff!important}.rounded-sm{border-radius:.2rem!important}.rounded{border-radius:.25rem!important}.rounded-top{border-top-left-radius:.25rem!important}.rounded-right,.rounded-top{border-top-right-radius:.25rem!important}.rounded-bottom,.rounded-right{border-bottom-right-radius:.25rem!important}.rounded-bottom,.rounded-left{border-bottom-left-radius:.25rem!important}.rounded-left{border-top-left-radius:.25rem!important}.rounded-lg{border-radius:.3rem!important}.rounded-circle{border-radius:50%!important}.rounded-pill{border-radius:50rem!important}.rounded-0{border-radius:0!important}.clearfix:after{display:block;clear:both;content:""}.d-none{display:none!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:flex!important}.d-inline-flex{display:inline-flex!important}@media (min-width:576px){.d-sm-none{display:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:flex!important}.d-sm-inline-flex{display:inline-flex!important}}@media (min-width:768px){.d-md-none{display:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:flex!important}.d-md-inline-flex{display:inline-flex!important}}@media (min-width:992px){.d-lg-none{display:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:flex!important}.d-lg-inline-flex{display:inline-flex!important}}@media (min-width:1200px){.d-xl-none{display:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:flex!important}.d-xl-inline-flex{display:inline-flex!important}}@media print{.d-print-none{display:none!important}.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:flex!important}.d-print-inline-flex{display:inline-flex!important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive:before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9:before{padding-top:42.857143%}.embed-responsive-16by9:before{padding-top:56.25%}.embed-responsive-4by3:before{padding-top:75%}.embed-responsive-1by1:before{padding-top:100%}.flex-row{flex-direction:row!important}.flex-column{flex-direction:column!important}.flex-row-reverse{flex-direction:row-reverse!important}.flex-column-reverse{flex-direction:column-reverse!important}.flex-wrap{flex-wrap:wrap!important}.flex-nowrap{flex-wrap:nowrap!important}.flex-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-fill{flex:1 1 auto!important}.flex-grow-0{flex-grow:0!important}.flex-grow-1{flex-grow:1!important}.flex-shrink-0{flex-shrink:0!important}.flex-shrink-1{flex-shrink:1!important}.justify-content-start{justify-content:flex-start!important}.justify-content-end{justify-content:flex-end!important}.justify-content-center{justify-content:center!important}.justify-content-between{justify-content:space-between!important}.justify-content-around{justify-content:space-around!important}.align-items-start{align-items:flex-start!important}.align-items-end{align-items:flex-end!important}.align-items-center{align-items:center!important}.align-items-baseline{align-items:baseline!important}.align-items-stretch{align-items:stretch!important}.align-content-start{align-content:flex-start!important}.align-content-end{align-content:flex-end!important}.align-content-center{align-content:center!important}.align-content-between{align-content:space-between!important}.align-content-around{align-content:space-around!important}.align-content-stretch{align-content:stretch!important}.align-self-auto{align-self:auto!important}.align-self-start{align-self:flex-start!important}.align-self-end{align-self:flex-end!important}.align-self-center{align-self:center!important}.align-self-baseline{align-self:baseline!important}.align-self-stretch{align-self:stretch!important}@media (min-width:576px){.flex-sm-row{flex-direction:row!important}.flex-sm-column{flex-direction:column!important}.flex-sm-row-reverse{flex-direction:row-reverse!important}.flex-sm-column-reverse{flex-direction:column-reverse!important}.flex-sm-wrap{flex-wrap:wrap!important}.flex-sm-nowrap{flex-wrap:nowrap!important}.flex-sm-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-sm-fill{flex:1 1 auto!important}.flex-sm-grow-0{flex-grow:0!important}.flex-sm-grow-1{flex-grow:1!important}.flex-sm-shrink-0{flex-shrink:0!important}.flex-sm-shrink-1{flex-shrink:1!important}.justify-content-sm-start{justify-content:flex-start!important}.justify-content-sm-end{justify-content:flex-end!important}.justify-content-sm-center{justify-content:center!important}.justify-content-sm-between{justify-content:space-between!important}.justify-content-sm-around{justify-content:space-around!important}.align-items-sm-start{align-items:flex-start!important}.align-items-sm-end{align-items:flex-end!important}.align-items-sm-center{align-items:center!important}.align-items-sm-baseline{align-items:baseline!important}.align-items-sm-stretch{align-items:stretch!important}.align-content-sm-start{align-content:flex-start!important}.align-content-sm-end{align-content:flex-end!important}.align-content-sm-center{align-content:center!important}.align-content-sm-between{align-content:space-between!important}.align-content-sm-around{align-content:space-around!important}.align-content-sm-stretch{align-content:stretch!important}.align-self-sm-auto{align-self:auto!important}.align-self-sm-start{align-self:flex-start!important}.align-self-sm-end{align-self:flex-end!important}.align-self-sm-center{align-self:center!important}.align-self-sm-baseline{align-self:baseline!important}.align-self-sm-stretch{align-self:stretch!important}}@media (min-width:768px){.flex-md-row{flex-direction:row!important}.flex-md-column{flex-direction:column!important}.flex-md-row-reverse{flex-direction:row-reverse!important}.flex-md-column-reverse{flex-direction:column-reverse!important}.flex-md-wrap{flex-wrap:wrap!important}.flex-md-nowrap{flex-wrap:nowrap!important}.flex-md-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-md-fill{flex:1 1 auto!important}.flex-md-grow-0{flex-grow:0!important}.flex-md-grow-1{flex-grow:1!important}.flex-md-shrink-0{flex-shrink:0!important}.flex-md-shrink-1{flex-shrink:1!important}.justify-content-md-start{justify-content:flex-start!important}.justify-content-md-end{justify-content:flex-end!important}.justify-content-md-center{justify-content:center!important}.justify-content-md-between{justify-content:space-between!important}.justify-content-md-around{justify-content:space-around!important}.align-items-md-start{align-items:flex-start!important}.align-items-md-end{align-items:flex-end!important}.align-items-md-center{align-items:center!important}.align-items-md-baseline{align-items:baseline!important}.align-items-md-stretch{align-items:stretch!important}.align-content-md-start{align-content:flex-start!important}.align-content-md-end{align-content:flex-end!important}.align-content-md-center{align-content:center!important}.align-content-md-between{align-content:space-between!important}.align-content-md-around{align-content:space-around!important}.align-content-md-stretch{align-content:stretch!important}.align-self-md-auto{align-self:auto!important}.align-self-md-start{align-self:flex-start!important}.align-self-md-end{align-self:flex-end!important}.align-self-md-center{align-self:center!important}.align-self-md-baseline{align-self:baseline!important}.align-self-md-stretch{align-self:stretch!important}}@media (min-width:992px){.flex-lg-row{flex-direction:row!important}.flex-lg-column{flex-direction:column!important}.flex-lg-row-reverse{flex-direction:row-reverse!important}.flex-lg-column-reverse{flex-direction:column-reverse!important}.flex-lg-wrap{flex-wrap:wrap!important}.flex-lg-nowrap{flex-wrap:nowrap!important}.flex-lg-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-lg-fill{flex:1 1 auto!important}.flex-lg-grow-0{flex-grow:0!important}.flex-lg-grow-1{flex-grow:1!important}.flex-lg-shrink-0{flex-shrink:0!important}.flex-lg-shrink-1{flex-shrink:1!important}.justify-content-lg-start{justify-content:flex-start!important}.justify-content-lg-end{justify-content:flex-end!important}.justify-content-lg-center{justify-content:center!important}.justify-content-lg-between{justify-content:space-between!important}.justify-content-lg-around{justify-content:space-around!important}.align-items-lg-start{align-items:flex-start!important}.align-items-lg-end{align-items:flex-end!important}.align-items-lg-center{align-items:center!important}.align-items-lg-baseline{align-items:baseline!important}.align-items-lg-stretch{align-items:stretch!important}.align-content-lg-start{align-content:flex-start!important}.align-content-lg-end{align-content:flex-end!important}.align-content-lg-center{align-content:center!important}.align-content-lg-between{align-content:space-between!important}.align-content-lg-around{align-content:space-around!important}.align-content-lg-stretch{align-content:stretch!important}.align-self-lg-auto{align-self:auto!important}.align-self-lg-start{align-self:flex-start!important}.align-self-lg-end{align-self:flex-end!important}.align-self-lg-center{align-self:center!important}.align-self-lg-baseline{align-self:baseline!important}.align-self-lg-stretch{align-self:stretch!important}}@media (min-width:1200px){.flex-xl-row{flex-direction:row!important}.flex-xl-column{flex-direction:column!important}.flex-xl-row-reverse{flex-direction:row-reverse!important}.flex-xl-column-reverse{flex-direction:column-reverse!important}.flex-xl-wrap{flex-wrap:wrap!important}.flex-xl-nowrap{flex-wrap:nowrap!important}.flex-xl-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-xl-fill{flex:1 1 auto!important}.flex-xl-grow-0{flex-grow:0!important}.flex-xl-grow-1{flex-grow:1!important}.flex-xl-shrink-0{flex-shrink:0!important}.flex-xl-shrink-1{flex-shrink:1!important}.justify-content-xl-start{justify-content:flex-start!important}.justify-content-xl-end{justify-content:flex-end!important}.justify-content-xl-center{justify-content:center!important}.justify-content-xl-between{justify-content:space-between!important}.justify-content-xl-around{justify-content:space-around!important}.align-items-xl-start{align-items:flex-start!important}.align-items-xl-end{align-items:flex-end!important}.align-items-xl-center{align-items:center!important}.align-items-xl-baseline{align-items:baseline!important}.align-items-xl-stretch{align-items:stretch!important}.align-content-xl-start{align-content:flex-start!important}.align-content-xl-end{align-content:flex-end!important}.align-content-xl-center{align-content:center!important}.align-content-xl-between{align-content:space-between!important}.align-content-xl-around{align-content:space-around!important}.align-content-xl-stretch{align-content:stretch!important}.align-self-xl-auto{align-self:auto!important}.align-self-xl-start{align-self:flex-start!important}.align-self-xl-end{align-self:flex-end!important}.align-self-xl-center{align-self:center!important}.align-self-xl-baseline{align-self:baseline!important}.align-self-xl-stretch{align-self:stretch!important}}.float-left{float:left!important}.float-right{float:right!important}.float-none{float:none!important}@media (min-width:576px){.float-sm-left{float:left!important}.float-sm-right{float:right!important}.float-sm-none{float:none!important}}@media (min-width:768px){.float-md-left{float:left!important}.float-md-right{float:right!important}.float-md-none{float:none!important}}@media (min-width:992px){.float-lg-left{float:left!important}.float-lg-right{float:right!important}.float-lg-none{float:none!important}}@media (min-width:1200px){.float-xl-left{float:left!important}.float-xl-right{float:right!important}.float-xl-none{float:none!important}}.overflow-auto{overflow:auto!important}.overflow-hidden{overflow:hidden!important}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:-webkit-sticky!important;position:sticky!important}.fixed-top{top:0}.fixed-bottom,.fixed-top{position:fixed;right:0;left:0;z-index:1030}.fixed-bottom{bottom:0}@supports ((position:-webkit-sticky) or (position:sticky)){.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal}.shadow-sm{box-shadow:0 .125rem .25rem rgba(0,0,0,.075)!important}.shadow{box-shadow:0 .5rem 1rem rgba(0,0,0,.15)!important}.shadow-lg{box-shadow:0 1rem 3rem rgba(0,0,0,.175)!important}.shadow-none{box-shadow:none!important}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.w-auto{width:auto!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.h-auto{height:auto!important}.mw-100{max-width:100%!important}.mh-100{max-height:100%!important}.min-vw-100{min-width:100vw!important}.min-vh-100{min-height:100vh!important}.vw-100{width:100vw!important}.vh-100{height:100vh!important}.stretched-link:after{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;pointer-events:auto;content:"";background-color:transparent}.m-0{margin:0!important}.mt-0,.my-0{margin-top:0!important}.mr-0,.mx-0{margin-right:0!important}.mb-0,.my-0{margin-bottom:0!important}.ml-0,.mx-0{margin-left:0!important}.m-1{margin:.25rem!important}.mt-1,.my-1{margin-top:.25rem!important}.mr-1,.mx-1{margin-right:.25rem!important}.mb-1,.my-1{margin-bottom:.25rem!important}.ml-1,.mx-1{margin-left:.25rem!important}.m-2{margin:.5rem!important}.mt-2,.my-2{margin-top:.5rem!important}.mr-2,.mx-2{margin-right:.5rem!important}.mb-2,.my-2{margin-bottom:.5rem!important}.ml-2,.mx-2{margin-left:.5rem!important}.m-3{margin:1rem!important}.mt-3,.my-3{margin-top:1rem!important}.mr-3,.mx-3{margin-right:1rem!important}.mb-3,.my-3{margin-bottom:1rem!important}.ml-3,.mx-3{margin-left:1rem!important}.m-4{margin:1.5rem!important}.mt-4,.my-4{margin-top:1.5rem!important}.mr-4,.mx-4{margin-right:1.5rem!important}.mb-4,.my-4{margin-bottom:1.5rem!important}.ml-4,.mx-4{margin-left:1.5rem!important}.m-5{margin:3rem!important}.mt-5,.my-5{margin-top:3rem!important}.mr-5,.mx-5{margin-right:3rem!important}.mb-5,.my-5{margin-bottom:3rem!important}.ml-5,.mx-5{margin-left:3rem!important}.p-0{padding:0!important}.pt-0,.py-0{padding-top:0!important}.pr-0,.px-0{padding-right:0!important}.pb-0,.py-0{padding-bottom:0!important}.pl-0,.px-0{padding-left:0!important}.p-1{padding:.25rem!important}.pt-1,.py-1{padding-top:.25rem!important}.pr-1,.px-1{padding-right:.25rem!important}.pb-1,.py-1{padding-bottom:.25rem!important}.pl-1,.px-1{padding-left:.25rem!important}.p-2{padding:.5rem!important}.pt-2,.py-2{padding-top:.5rem!important}.pr-2,.px-2{padding-right:.5rem!important}.pb-2,.py-2{padding-bottom:.5rem!important}.pl-2,.px-2{padding-left:.5rem!important}.p-3{padding:1rem!important}.pt-3,.py-3{padding-top:1rem!important}.pr-3,.px-3{padding-right:1rem!important}.pb-3,.py-3{padding-bottom:1rem!important}.pl-3,.px-3{padding-left:1rem!important}.p-4{padding:1.5rem!important}.pt-4,.py-4{padding-top:1.5rem!important}.pr-4,.px-4{padding-right:1.5rem!important}.pb-4,.py-4{padding-bottom:1.5rem!important}.pl-4,.px-4{padding-left:1.5rem!important}.p-5{padding:3rem!important}.pt-5,.py-5{padding-top:3rem!important}.pr-5,.px-5{padding-right:3rem!important}.pb-5,.py-5{padding-bottom:3rem!important}.pl-5,.px-5{padding-left:3rem!important}.m-n1{margin:-.25rem!important}.mt-n1,.my-n1{margin-top:-.25rem!important}.mr-n1,.mx-n1{margin-right:-.25rem!important}.mb-n1,.my-n1{margin-bottom:-.25rem!important}.ml-n1,.mx-n1{margin-left:-.25rem!important}.m-n2{margin:-.5rem!important}.mt-n2,.my-n2{margin-top:-.5rem!important}.mr-n2,.mx-n2{margin-right:-.5rem!important}.mb-n2,.my-n2{margin-bottom:-.5rem!important}.ml-n2,.mx-n2{margin-left:-.5rem!important}.m-n3{margin:-1rem!important}.mt-n3,.my-n3{margin-top:-1rem!important}.mr-n3,.mx-n3{margin-right:-1rem!important}.mb-n3,.my-n3{margin-bottom:-1rem!important}.ml-n3,.mx-n3{margin-left:-1rem!important}.m-n4{margin:-1.5rem!important}.mt-n4,.my-n4{margin-top:-1.5rem!important}.mr-n4,.mx-n4{margin-right:-1.5rem!important}.mb-n4,.my-n4{margin-bottom:-1.5rem!important}.ml-n4,.mx-n4{margin-left:-1.5rem!important}.m-n5{margin:-3rem!important}.mt-n5,.my-n5{margin-top:-3rem!important}.mr-n5,.mx-n5{margin-right:-3rem!important}.mb-n5,.my-n5{margin-bottom:-3rem!important}.ml-n5,.mx-n5{margin-left:-3rem!important}.m-auto{margin:auto!important}.mt-auto,.my-auto{margin-top:auto!important}.mr-auto,.mx-auto{margin-right:auto!important}.mb-auto,.my-auto{margin-bottom:auto!important}.ml-auto,.mx-auto{margin-left:auto!important}@media (min-width:576px){.m-sm-0{margin:0!important}.mt-sm-0,.my-sm-0{margin-top:0!important}.mr-sm-0,.mx-sm-0{margin-right:0!important}.mb-sm-0,.my-sm-0{margin-bottom:0!important}.ml-sm-0,.mx-sm-0{margin-left:0!important}.m-sm-1{margin:.25rem!important}.mt-sm-1,.my-sm-1{margin-top:.25rem!important}.mr-sm-1,.mx-sm-1{margin-right:.25rem!important}.mb-sm-1,.my-sm-1{margin-bottom:.25rem!important}.ml-sm-1,.mx-sm-1{margin-left:.25rem!important}.m-sm-2{margin:.5rem!important}.mt-sm-2,.my-sm-2{margin-top:.5rem!important}.mr-sm-2,.mx-sm-2{margin-right:.5rem!important}.mb-sm-2,.my-sm-2{margin-bottom:.5rem!important}.ml-sm-2,.mx-sm-2{margin-left:.5rem!important}.m-sm-3{margin:1rem!important}.mt-sm-3,.my-sm-3{margin-top:1rem!important}.mr-sm-3,.mx-sm-3{margin-right:1rem!important}.mb-sm-3,.my-sm-3{margin-bottom:1rem!important}.ml-sm-3,.mx-sm-3{margin-left:1rem!important}.m-sm-4{margin:1.5rem!important}.mt-sm-4,.my-sm-4{margin-top:1.5rem!important}.mr-sm-4,.mx-sm-4{margin-right:1.5rem!important}.mb-sm-4,.my-sm-4{margin-bottom:1.5rem!important}.ml-sm-4,.mx-sm-4{margin-left:1.5rem!important}.m-sm-5{margin:3rem!important}.mt-sm-5,.my-sm-5{margin-top:3rem!important}.mr-sm-5,.mx-sm-5{margin-right:3rem!important}.mb-sm-5,.my-sm-5{margin-bottom:3rem!important}.ml-sm-5,.mx-sm-5{margin-left:3rem!important}.p-sm-0{padding:0!important}.pt-sm-0,.py-sm-0{padding-top:0!important}.pr-sm-0,.px-sm-0{padding-right:0!important}.pb-sm-0,.py-sm-0{padding-bottom:0!important}.pl-sm-0,.px-sm-0{padding-left:0!important}.p-sm-1{padding:.25rem!important}.pt-sm-1,.py-sm-1{padding-top:.25rem!important}.pr-sm-1,.px-sm-1{padding-right:.25rem!important}.pb-sm-1,.py-sm-1{padding-bottom:.25rem!important}.pl-sm-1,.px-sm-1{padding-left:.25rem!important}.p-sm-2{padding:.5rem!important}.pt-sm-2,.py-sm-2{padding-top:.5rem!important}.pr-sm-2,.px-sm-2{padding-right:.5rem!important}.pb-sm-2,.py-sm-2{padding-bottom:.5rem!important}.pl-sm-2,.px-sm-2{padding-left:.5rem!important}.p-sm-3{padding:1rem!important}.pt-sm-3,.py-sm-3{padding-top:1rem!important}.pr-sm-3,.px-sm-3{padding-right:1rem!important}.pb-sm-3,.py-sm-3{padding-bottom:1rem!important}.pl-sm-3,.px-sm-3{padding-left:1rem!important}.p-sm-4{padding:1.5rem!important}.pt-sm-4,.py-sm-4{padding-top:1.5rem!important}.pr-sm-4,.px-sm-4{padding-right:1.5rem!important}.pb-sm-4,.py-sm-4{padding-bottom:1.5rem!important}.pl-sm-4,.px-sm-4{padding-left:1.5rem!important}.p-sm-5{padding:3rem!important}.pt-sm-5,.py-sm-5{padding-top:3rem!important}.pr-sm-5,.px-sm-5{padding-right:3rem!important}.pb-sm-5,.py-sm-5{padding-bottom:3rem!important}.pl-sm-5,.px-sm-5{padding-left:3rem!important}.m-sm-n1{margin:-.25rem!important}.mt-sm-n1,.my-sm-n1{margin-top:-.25rem!important}.mr-sm-n1,.mx-sm-n1{margin-right:-.25rem!important}.mb-sm-n1,.my-sm-n1{margin-bottom:-.25rem!important}.ml-sm-n1,.mx-sm-n1{margin-left:-.25rem!important}.m-sm-n2{margin:-.5rem!important}.mt-sm-n2,.my-sm-n2{margin-top:-.5rem!important}.mr-sm-n2,.mx-sm-n2{margin-right:-.5rem!important}.mb-sm-n2,.my-sm-n2{margin-bottom:-.5rem!important}.ml-sm-n2,.mx-sm-n2{margin-left:-.5rem!important}.m-sm-n3{margin:-1rem!important}.mt-sm-n3,.my-sm-n3{margin-top:-1rem!important}.mr-sm-n3,.mx-sm-n3{margin-right:-1rem!important}.mb-sm-n3,.my-sm-n3{margin-bottom:-1rem!important}.ml-sm-n3,.mx-sm-n3{margin-left:-1rem!important}.m-sm-n4{margin:-1.5rem!important}.mt-sm-n4,.my-sm-n4{margin-top:-1.5rem!important}.mr-sm-n4,.mx-sm-n4{margin-right:-1.5rem!important}.mb-sm-n4,.my-sm-n4{margin-bottom:-1.5rem!important}.ml-sm-n4,.mx-sm-n4{margin-left:-1.5rem!important}.m-sm-n5{margin:-3rem!important}.mt-sm-n5,.my-sm-n5{margin-top:-3rem!important}.mr-sm-n5,.mx-sm-n5{margin-right:-3rem!important}.mb-sm-n5,.my-sm-n5{margin-bottom:-3rem!important}.ml-sm-n5,.mx-sm-n5{margin-left:-3rem!important}.m-sm-auto{margin:auto!important}.mt-sm-auto,.my-sm-auto{margin-top:auto!important}.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}}@media (min-width:768px){.m-md-0{margin:0!important}.mt-md-0,.my-md-0{margin-top:0!important}.mr-md-0,.mx-md-0{margin-right:0!important}.mb-md-0,.my-md-0{margin-bottom:0!important}.ml-md-0,.mx-md-0{margin-left:0!important}.m-md-1{margin:.25rem!important}.mt-md-1,.my-md-1{margin-top:.25rem!important}.mr-md-1,.mx-md-1{margin-right:.25rem!important}.mb-md-1,.my-md-1{margin-bottom:.25rem!important}.ml-md-1,.mx-md-1{margin-left:.25rem!important}.m-md-2{margin:.5rem!important}.mt-md-2,.my-md-2{margin-top:.5rem!important}.mr-md-2,.mx-md-2{margin-right:.5rem!important}.mb-md-2,.my-md-2{margin-bottom:.5rem!important}.ml-md-2,.mx-md-2{margin-left:.5rem!important}.m-md-3{margin:1rem!important}.mt-md-3,.my-md-3{margin-top:1rem!important}.mr-md-3,.mx-md-3{margin-right:1rem!important}.mb-md-3,.my-md-3{margin-bottom:1rem!important}.ml-md-3,.mx-md-3{margin-left:1rem!important}.m-md-4{margin:1.5rem!important}.mt-md-4,.my-md-4{margin-top:1.5rem!important}.mr-md-4,.mx-md-4{margin-right:1.5rem!important}.mb-md-4,.my-md-4{margin-bottom:1.5rem!important}.ml-md-4,.mx-md-4{margin-left:1.5rem!important}.m-md-5{margin:3rem!important}.mt-md-5,.my-md-5{margin-top:3rem!important}.mr-md-5,.mx-md-5{margin-right:3rem!important}.mb-md-5,.my-md-5{margin-bottom:3rem!important}.ml-md-5,.mx-md-5{margin-left:3rem!important}.p-md-0{padding:0!important}.pt-md-0,.py-md-0{padding-top:0!important}.pr-md-0,.px-md-0{padding-right:0!important}.pb-md-0,.py-md-0{padding-bottom:0!important}.pl-md-0,.px-md-0{padding-left:0!important}.p-md-1{padding:.25rem!important}.pt-md-1,.py-md-1{padding-top:.25rem!important}.pr-md-1,.px-md-1{padding-right:.25rem!important}.pb-md-1,.py-md-1{padding-bottom:.25rem!important}.pl-md-1,.px-md-1{padding-left:.25rem!important}.p-md-2{padding:.5rem!important}.pt-md-2,.py-md-2{padding-top:.5rem!important}.pr-md-2,.px-md-2{padding-right:.5rem!important}.pb-md-2,.py-md-2{padding-bottom:.5rem!important}.pl-md-2,.px-md-2{padding-left:.5rem!important}.p-md-3{padding:1rem!important}.pt-md-3,.py-md-3{padding-top:1rem!important}.pr-md-3,.px-md-3{padding-right:1rem!important}.pb-md-3,.py-md-3{padding-bottom:1rem!important}.pl-md-3,.px-md-3{padding-left:1rem!important}.p-md-4{padding:1.5rem!important}.pt-md-4,.py-md-4{padding-top:1.5rem!important}.pr-md-4,.px-md-4{padding-right:1.5rem!important}.pb-md-4,.py-md-4{padding-bottom:1.5rem!important}.pl-md-4,.px-md-4{padding-left:1.5rem!important}.p-md-5{padding:3rem!important}.pt-md-5,.py-md-5{padding-top:3rem!important}.pr-md-5,.px-md-5{padding-right:3rem!important}.pb-md-5,.py-md-5{padding-bottom:3rem!important}.pl-md-5,.px-md-5{padding-left:3rem!important}.m-md-n1{margin:-.25rem!important}.mt-md-n1,.my-md-n1{margin-top:-.25rem!important}.mr-md-n1,.mx-md-n1{margin-right:-.25rem!important}.mb-md-n1,.my-md-n1{margin-bottom:-.25rem!important}.ml-md-n1,.mx-md-n1{margin-left:-.25rem!important}.m-md-n2{margin:-.5rem!important}.mt-md-n2,.my-md-n2{margin-top:-.5rem!important}.mr-md-n2,.mx-md-n2{margin-right:-.5rem!important}.mb-md-n2,.my-md-n2{margin-bottom:-.5rem!important}.ml-md-n2,.mx-md-n2{margin-left:-.5rem!important}.m-md-n3{margin:-1rem!important}.mt-md-n3,.my-md-n3{margin-top:-1rem!important}.mr-md-n3,.mx-md-n3{margin-right:-1rem!important}.mb-md-n3,.my-md-n3{margin-bottom:-1rem!important}.ml-md-n3,.mx-md-n3{margin-left:-1rem!important}.m-md-n4{margin:-1.5rem!important}.mt-md-n4,.my-md-n4{margin-top:-1.5rem!important}.mr-md-n4,.mx-md-n4{margin-right:-1.5rem!important}.mb-md-n4,.my-md-n4{margin-bottom:-1.5rem!important}.ml-md-n4,.mx-md-n4{margin-left:-1.5rem!important}.m-md-n5{margin:-3rem!important}.mt-md-n5,.my-md-n5{margin-top:-3rem!important}.mr-md-n5,.mx-md-n5{margin-right:-3rem!important}.mb-md-n5,.my-md-n5{margin-bottom:-3rem!important}.ml-md-n5,.mx-md-n5{margin-left:-3rem!important}.m-md-auto{margin:auto!important}.mt-md-auto,.my-md-auto{margin-top:auto!important}.mr-md-auto,.mx-md-auto{margin-right:auto!important}.mb-md-auto,.my-md-auto{margin-bottom:auto!important}.ml-md-auto,.mx-md-auto{margin-left:auto!important}}@media (min-width:992px){.m-lg-0{margin:0!important}.mt-lg-0,.my-lg-0{margin-top:0!important}.mr-lg-0,.mx-lg-0{margin-right:0!important}.mb-lg-0,.my-lg-0{margin-bottom:0!important}.ml-lg-0,.mx-lg-0{margin-left:0!important}.m-lg-1{margin:.25rem!important}.mt-lg-1,.my-lg-1{margin-top:.25rem!important}.mr-lg-1,.mx-lg-1{margin-right:.25rem!important}.mb-lg-1,.my-lg-1{margin-bottom:.25rem!important}.ml-lg-1,.mx-lg-1{margin-left:.25rem!important}.m-lg-2{margin:.5rem!important}.mt-lg-2,.my-lg-2{margin-top:.5rem!important}.mr-lg-2,.mx-lg-2{margin-right:.5rem!important}.mb-lg-2,.my-lg-2{margin-bottom:.5rem!important}.ml-lg-2,.mx-lg-2{margin-left:.5rem!important}.m-lg-3{margin:1rem!important}.mt-lg-3,.my-lg-3{margin-top:1rem!important}.mr-lg-3,.mx-lg-3{margin-right:1rem!important}.mb-lg-3,.my-lg-3{margin-bottom:1rem!important}.ml-lg-3,.mx-lg-3{margin-left:1rem!important}.m-lg-4{margin:1.5rem!important}.mt-lg-4,.my-lg-4{margin-top:1.5rem!important}.mr-lg-4,.mx-lg-4{margin-right:1.5rem!important}.mb-lg-4,.my-lg-4{margin-bottom:1.5rem!important}.ml-lg-4,.mx-lg-4{margin-left:1.5rem!important}.m-lg-5{margin:3rem!important}.mt-lg-5,.my-lg-5{margin-top:3rem!important}.mr-lg-5,.mx-lg-5{margin-right:3rem!important}.mb-lg-5,.my-lg-5{margin-bottom:3rem!important}.ml-lg-5,.mx-lg-5{margin-left:3rem!important}.p-lg-0{padding:0!important}.pt-lg-0,.py-lg-0{padding-top:0!important}.pr-lg-0,.px-lg-0{padding-right:0!important}.pb-lg-0,.py-lg-0{padding-bottom:0!important}.pl-lg-0,.px-lg-0{padding-left:0!important}.p-lg-1{padding:.25rem!important}.pt-lg-1,.py-lg-1{padding-top:.25rem!important}.pr-lg-1,.px-lg-1{padding-right:.25rem!important}.pb-lg-1,.py-lg-1{padding-bottom:.25rem!important}.pl-lg-1,.px-lg-1{padding-left:.25rem!important}.p-lg-2{padding:.5rem!important}.pt-lg-2,.py-lg-2{padding-top:.5rem!important}.pr-lg-2,.px-lg-2{padding-right:.5rem!important}.pb-lg-2,.py-lg-2{padding-bottom:.5rem!important}.pl-lg-2,.px-lg-2{padding-left:.5rem!important}.p-lg-3{padding:1rem!important}.pt-lg-3,.py-lg-3{padding-top:1rem!important}.pr-lg-3,.px-lg-3{padding-right:1rem!important}.pb-lg-3,.py-lg-3{padding-bottom:1rem!important}.pl-lg-3,.px-lg-3{padding-left:1rem!important}.p-lg-4{padding:1.5rem!important}.pt-lg-4,.py-lg-4{padding-top:1.5rem!important}.pr-lg-4,.px-lg-4{padding-right:1.5rem!important}.pb-lg-4,.py-lg-4{padding-bottom:1.5rem!important}.pl-lg-4,.px-lg-4{padding-left:1.5rem!important}.p-lg-5{padding:3rem!important}.pt-lg-5,.py-lg-5{padding-top:3rem!important}.pr-lg-5,.px-lg-5{padding-right:3rem!important}.pb-lg-5,.py-lg-5{padding-bottom:3rem!important}.pl-lg-5,.px-lg-5{padding-left:3rem!important}.m-lg-n1{margin:-.25rem!important}.mt-lg-n1,.my-lg-n1{margin-top:-.25rem!important}.mr-lg-n1,.mx-lg-n1{margin-right:-.25rem!important}.mb-lg-n1,.my-lg-n1{margin-bottom:-.25rem!important}.ml-lg-n1,.mx-lg-n1{margin-left:-.25rem!important}.m-lg-n2{margin:-.5rem!important}.mt-lg-n2,.my-lg-n2{margin-top:-.5rem!important}.mr-lg-n2,.mx-lg-n2{margin-right:-.5rem!important}.mb-lg-n2,.my-lg-n2{margin-bottom:-.5rem!important}.ml-lg-n2,.mx-lg-n2{margin-left:-.5rem!important}.m-lg-n3{margin:-1rem!important}.mt-lg-n3,.my-lg-n3{margin-top:-1rem!important}.mr-lg-n3,.mx-lg-n3{margin-right:-1rem!important}.mb-lg-n3,.my-lg-n3{margin-bottom:-1rem!important}.ml-lg-n3,.mx-lg-n3{margin-left:-1rem!important}.m-lg-n4{margin:-1.5rem!important}.mt-lg-n4,.my-lg-n4{margin-top:-1.5rem!important}.mr-lg-n4,.mx-lg-n4{margin-right:-1.5rem!important}.mb-lg-n4,.my-lg-n4{margin-bottom:-1.5rem!important}.ml-lg-n4,.mx-lg-n4{margin-left:-1.5rem!important}.m-lg-n5{margin:-3rem!important}.mt-lg-n5,.my-lg-n5{margin-top:-3rem!important}.mr-lg-n5,.mx-lg-n5{margin-right:-3rem!important}.mb-lg-n5,.my-lg-n5{margin-bottom:-3rem!important}.ml-lg-n5,.mx-lg-n5{margin-left:-3rem!important}.m-lg-auto{margin:auto!important}.mt-lg-auto,.my-lg-auto{margin-top:auto!important}.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}}@media (min-width:1200px){.m-xl-0{margin:0!important}.mt-xl-0,.my-xl-0{margin-top:0!important}.mr-xl-0,.mx-xl-0{margin-right:0!important}.mb-xl-0,.my-xl-0{margin-bottom:0!important}.ml-xl-0,.mx-xl-0{margin-left:0!important}.m-xl-1{margin:.25rem!important}.mt-xl-1,.my-xl-1{margin-top:.25rem!important}.mr-xl-1,.mx-xl-1{margin-right:.25rem!important}.mb-xl-1,.my-xl-1{margin-bottom:.25rem!important}.ml-xl-1,.mx-xl-1{margin-left:.25rem!important}.m-xl-2{margin:.5rem!important}.mt-xl-2,.my-xl-2{margin-top:.5rem!important}.mr-xl-2,.mx-xl-2{margin-right:.5rem!important}.mb-xl-2,.my-xl-2{margin-bottom:.5rem!important}.ml-xl-2,.mx-xl-2{margin-left:.5rem!important}.m-xl-3{margin:1rem!important}.mt-xl-3,.my-xl-3{margin-top:1rem!important}.mr-xl-3,.mx-xl-3{margin-right:1rem!important}.mb-xl-3,.my-xl-3{margin-bottom:1rem!important}.ml-xl-3,.mx-xl-3{margin-left:1rem!important}.m-xl-4{margin:1.5rem!important}.mt-xl-4,.my-xl-4{margin-top:1.5rem!important}.mr-xl-4,.mx-xl-4{margin-right:1.5rem!important}.mb-xl-4,.my-xl-4{margin-bottom:1.5rem!important}.ml-xl-4,.mx-xl-4{margin-left:1.5rem!important}.m-xl-5{margin:3rem!important}.mt-xl-5,.my-xl-5{margin-top:3rem!important}.mr-xl-5,.mx-xl-5{margin-right:3rem!important}.mb-xl-5,.my-xl-5{margin-bottom:3rem!important}.ml-xl-5,.mx-xl-5{margin-left:3rem!important}.p-xl-0{padding:0!important}.pt-xl-0,.py-xl-0{padding-top:0!important}.pr-xl-0,.px-xl-0{padding-right:0!important}.pb-xl-0,.py-xl-0{padding-bottom:0!important}.pl-xl-0,.px-xl-0{padding-left:0!important}.p-xl-1{padding:.25rem!important}.pt-xl-1,.py-xl-1{padding-top:.25rem!important}.pr-xl-1,.px-xl-1{padding-right:.25rem!important}.pb-xl-1,.py-xl-1{padding-bottom:.25rem!important}.pl-xl-1,.px-xl-1{padding-left:.25rem!important}.p-xl-2{padding:.5rem!important}.pt-xl-2,.py-xl-2{padding-top:.5rem!important}.pr-xl-2,.px-xl-2{padding-right:.5rem!important}.pb-xl-2,.py-xl-2{padding-bottom:.5rem!important}.pl-xl-2,.px-xl-2{padding-left:.5rem!important}.p-xl-3{padding:1rem!important}.pt-xl-3,.py-xl-3{padding-top:1rem!important}.pr-xl-3,.px-xl-3{padding-right:1rem!important}.pb-xl-3,.py-xl-3{padding-bottom:1rem!important}.pl-xl-3,.px-xl-3{padding-left:1rem!important}.p-xl-4{padding:1.5rem!important}.pt-xl-4,.py-xl-4{padding-top:1.5rem!important}.pr-xl-4,.px-xl-4{padding-right:1.5rem!important}.pb-xl-4,.py-xl-4{padding-bottom:1.5rem!important}.pl-xl-4,.px-xl-4{padding-left:1.5rem!important}.p-xl-5{padding:3rem!important}.pt-xl-5,.py-xl-5{padding-top:3rem!important}.pr-xl-5,.px-xl-5{padding-right:3rem!important}.pb-xl-5,.py-xl-5{padding-bottom:3rem!important}.pl-xl-5,.px-xl-5{padding-left:3rem!important}.m-xl-n1{margin:-.25rem!important}.mt-xl-n1,.my-xl-n1{margin-top:-.25rem!important}.mr-xl-n1,.mx-xl-n1{margin-right:-.25rem!important}.mb-xl-n1,.my-xl-n1{margin-bottom:-.25rem!important}.ml-xl-n1,.mx-xl-n1{margin-left:-.25rem!important}.m-xl-n2{margin:-.5rem!important}.mt-xl-n2,.my-xl-n2{margin-top:-.5rem!important}.mr-xl-n2,.mx-xl-n2{margin-right:-.5rem!important}.mb-xl-n2,.my-xl-n2{margin-bottom:-.5rem!important}.ml-xl-n2,.mx-xl-n2{margin-left:-.5rem!important}.m-xl-n3{margin:-1rem!important}.mt-xl-n3,.my-xl-n3{margin-top:-1rem!important}.mr-xl-n3,.mx-xl-n3{margin-right:-1rem!important}.mb-xl-n3,.my-xl-n3{margin-bottom:-1rem!important}.ml-xl-n3,.mx-xl-n3{margin-left:-1rem!important}.m-xl-n4{margin:-1.5rem!important}.mt-xl-n4,.my-xl-n4{margin-top:-1.5rem!important}.mr-xl-n4,.mx-xl-n4{margin-right:-1.5rem!important}.mb-xl-n4,.my-xl-n4{margin-bottom:-1.5rem!important}.ml-xl-n4,.mx-xl-n4{margin-left:-1.5rem!important}.m-xl-n5{margin:-3rem!important}.mt-xl-n5,.my-xl-n5{margin-top:-3rem!important}.mr-xl-n5,.mx-xl-n5{margin-right:-3rem!important}.mb-xl-n5,.my-xl-n5{margin-bottom:-3rem!important}.ml-xl-n5,.mx-xl-n5{margin-left:-3rem!important}.m-xl-auto{margin:auto!important}.mt-xl-auto,.my-xl-auto{margin-top:auto!important}.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}}.text-monospace{font-family:Fira Code,Andale Mono,monospace!important}.text-justify{text-align:justify!important}.text-wrap{white-space:normal!important}.text-nowrap{white-space:nowrap!important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}@media (min-width:576px){.text-sm-left{text-align:left!important}.text-sm-right{text-align:right!important}.text-sm-center{text-align:center!important}}@media (min-width:768px){.text-md-left{text-align:left!important}.text-md-right{text-align:right!important}.text-md-center{text-align:center!important}}@media (min-width:992px){.text-lg-left{text-align:left!important}.text-lg-right{text-align:right!important}.text-lg-center{text-align:center!important}}@media (min-width:1200px){.text-xl-left{text-align:left!important}.text-xl-right{text-align:right!important}.text-xl-center{text-align:center!important}}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.font-weight-light{font-weight:300!important}.font-weight-lighter{font-weight:lighter!important}.font-weight-normal{font-weight:400!important}.font-weight-bold{font-weight:700!important}.font-weight-bolder{font-weight:bolder!important}.font-italic{font-style:italic!important}.text-white{color:#fff!important}.text-primary{color:#414551!important}a.text-primary:focus,a.text-primary:hover{color:#1f2127!important}.text-secondary{color:#ca445e!important}a.text-secondary:focus,a.text-secondary:hover{color:#972b40!important}.text-body{color:#212529!important}.text-muted{color:#6c757d!important}.text-black-50{color:rgba(0,0,0,.5)!important}.text-white-50{color:hsla(0,0%,100%,.5)!important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.text-decoration-none{text-decoration:none!important}.text-break{word-break:break-word!important;overflow-wrap:break-word!important}.text-reset{color:inherit!important}.visible{visibility:visible!important}.invisible{visibility:hidden!important}:root{--font-family-toolbar-main:"Lato",sans-serif;--font-weight-toolbar-main:400;--font-family-toolbar-details:"Lato",sans-serif;--font-weight-toolbar-details:400;--font-family-sidebar:"Lato",sans-serif;--font-size-sidebar-category:18px;--font-weight-sidebar-category:400;--font-size-sidebar-page:1rem;--font-weight-sidebar-page:400}
\ No newline at end of file
diff --git a/scaladoc-testcases/docs/_docs/docs/f1.md b/scaladoc-testcases/docs/_docs/docs/f1.md
new file mode 100644
index 000000000000..f5b5556f90ac
--- /dev/null
+++ b/scaladoc-testcases/docs/_docs/docs/f1.md
@@ -0,0 +1,7 @@
+---
+layout: static-site-main
+redirectFrom:
+  - docs/fr.html
+  - docs/my-custom-link
+---
+F1
diff --git a/scaladoc-testcases/docs/_docs/docs/f2.md b/scaladoc-testcases/docs/_docs/docs/f2.md
new file mode 100644
index 000000000000..2b78acc99544
--- /dev/null
+++ b/scaladoc-testcases/docs/_docs/docs/f2.md
@@ -0,0 +1,4 @@
+---
+layout: static-site-main
+---
+F2
diff --git a/scaladoc-testcases/docs/_docs/docs/f3.md b/scaladoc-testcases/docs/_docs/docs/f3.md
new file mode 100644
index 000000000000..4f66928a6431
--- /dev/null
+++ b/scaladoc-testcases/docs/_docs/docs/f3.md
@@ -0,0 +1,4 @@
+---
+layout: static-site-main
+---
+F3
diff --git a/scaladoc-testcases/docs/_docs/docs/f4.md b/scaladoc-testcases/docs/_docs/docs/f4.md
new file mode 100644
index 000000000000..c70fac051d13
--- /dev/null
+++ b/scaladoc-testcases/docs/_docs/docs/f4.md
@@ -0,0 +1,4 @@
+---
+layout: static-site-main
+---
+F4
diff --git a/scaladoc-testcases/docs/_docs/index.md b/scaladoc-testcases/docs/_docs/index.md
new file mode 100644
index 000000000000..42cb5f62dae8
--- /dev/null
+++ b/scaladoc-testcases/docs/_docs/index.md
@@ -0,0 +1,17 @@
+---
+
+
+---
+
+```scala
+val someVariable: Int = 2
+```
+
+```scala sc:fail
+trait RenderingContext
+class Renderer(using RenderingContext)
+val renderer: Renderer = Renderer()
+```
+
+
+
diff --git a/scaladoc-testcases/docs/_layouts/redirect.html b/scaladoc-testcases/docs/_layouts/redirect.html
new file mode 100644
index 000000000000..d0c2329189d8
--- /dev/null
+++ b/scaladoc-testcases/docs/_layouts/redirect.html
@@ -0,0 +1,14 @@
+---
+hasFrame: false
+---
+<!DOCTYPE html>
+<html lang="en-US">
+  <meta charset="utf-8">
+  <title>Redirecting&hellip;</title>
+  <link rel="canonical" href="{{ redirectTo }}">
+  <script>location="{{ redirectTo }}"</script>
+  <meta http-equiv="refresh" content="0; url={{ redirectTo }}">
+  <meta name="robots" content="noindex">
+  <h1>Redirecting&hellip;</h1>
+  <a href="{{ redirectTo }}">Click here if you were not redirected.</a>
+</html>
diff --git a/scaladoc-testcases/docs/_layouts/static-site-main.html b/scaladoc-testcases/docs/_layouts/static-site-main.html
new file mode 100644
index 000000000000..2d4c086446fc
--- /dev/null
+++ b/scaladoc-testcases/docs/_layouts/static-site-main.html
@@ -0,0 +1,22 @@
+---
+extraJS:
+  - js/contributors.js
+extraCSS:
+  - css/bootstrap.min.css
+  - css/content-contributors.css
+---
+<div class="container">
+  {{ content }}
+  <nav class="arrows-wrapper" aria-label="Page navigation">
+    {% if page.previous %}
+    <a rel="prev" href="{{ page.previous }}" class="arrows previous" aria-keyshortcuts="Left">
+        <i class="fa fa-angle-left"></i>
+    </a>
+    {% endif %}
+    {% if page.next %}
+    <a rel="next" href="{{ page.next }}" class="arrows next" aria-keyshortcuts="Right">
+        <i class="fa fa-angle-right"></i>
+    </a>
+    {% endif %}
+  </nav>
+</div>
diff --git a/scaladoc-testcases/docs/sidebar.yml b/scaladoc-testcases/docs/sidebar.yml
new file mode 100644
index 000000000000..51f8e87f2ad6
--- /dev/null
+++ b/scaladoc-testcases/docs/sidebar.yml
@@ -0,0 +1,6 @@
+index: index.md
+subsection:
+  - page: docs/f1.md
+  - page: docs/f2.md
+  - page: docs/f3.md
+  - page: docs/f4.md
diff --git a/scaladoc-testcases/src/_docs/tests/Adoc.scala b/scaladoc-testcases/src/_docs/tests/Adoc.scala
new file mode 100644
index 000000000000..04b2c3918023
--- /dev/null
+++ b/scaladoc-testcases/src/_docs/tests/Adoc.scala
@@ -0,0 +1,4 @@
+package _docs.tests
+
+class Adoc:
+  def foo = 123
diff --git a/scaladoc-testcases/src/example/level2/Documentation.scala b/scaladoc-testcases/src/example/level2/Documentation.scala
index e6f8a3f73f98..bbfd31669f3c 100644
--- a/scaladoc-testcases/src/example/level2/Documentation.scala
+++ b/scaladoc-testcases/src/example/level2/Documentation.scala
@@ -134,6 +134,34 @@ abstract class Documentation[T, A <: Int, B >: String, -X, +Y](c1: String, val c
   def useOfOutsideTypeInsideObject(): ReturnObjectWithType.returnType = ???
   def useOfSameLevelOutsideType(): SameLevelTypeLinking = ???
 
+  /** Lorem ipsum
+    *
+    *
+    *
+    * Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur scelerisque facilisis sapien a lobortis. Fusce ultricies erat ante, sit amet bibendum orci commodo in. Sed elementum tempus ipsum id sodales. Ut quis nisi vitae turpis lacinia mattis id nec orci. Nullam tincidunt accumsan nisl, ac maximus quam eleifend tincidunt. Nunc ipsum nulla, mattis vitae auctor blandit, euismod sit amet elit. Proin sed porttitor nisi. Curabitur tristique pretium nisi. Vestibulum sagittis condimentum blandit. In ac consequat odio, in fermentum turpis. In hac habitasse platea dictumst.
+    * Proin scelerisque est sed magna fermentum, at ullamcorper purus porta. Aliquam posuere arcu elit, molestie fermentum justo malesuada non. In eget massa risus. Proin rutrum maximus arcu, et lacinia est suscipit nec. Morbi varius odio pretium turpis ornare, ut sollicitudin nunc egestas. Aliquam pulvinar massa odio, id tempor purus suscipit id. Nunc imperdiet sapien ligula, ut pretium lacus efficitur sit amet. Sed sed urna sed erat tempus sagittis quis eget elit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Duis accumsan hendrerit nunc, in sagittis tellus. Vivamus mattis ligula sed dolor lacinia iaculis. Pellentesque vel turpis est. Nam pellentesque diam id arcu pharetra, et consectetur eros facilisis. Aliquam erat volutpat.
+    *
+    * Phasellus ac quam pretium, convallis dui id, vestibulum nibh. Fusce vulputate interdum ullamcorper. Sed nec erat varius, sagittis ipsum eget, interdum ex. Ut sed leo sit amet ligula ullamcorper facilisis et convallis tellus. Nullam consectetur vitae lorem vel mattis. Suspendisse ultrices ornare leo, ut porttitor est finibus vel. Ut faucibus arcu eget sapien lobortis, a luctus arcu posuere. Vivamus faucibus mauris facilisis enim ornare dapibus.
+    *
+    * Quisque pharetra et orci non aliquet. Sed urna ipsum, commodo et ultricies sed, volutpat at nunc. Cras non lectus ac mauris lobortis efficitur vel ac ante. Mauris vestibulum risus at mauris pretium, vel iaculis dolor pretium. Nam fringilla fermentum lacus et varius. Nulla pulvinar maximus tortor, et venenatis ipsum luctus id. Integer hendrerit tellus felis, eget hendrerit dolor aliquam sit amet.
+    *
+    * Aenean elementum risus sed enim egestas, vitae imperdiet urna eleifend. Donec elementum leo neque, eu consequat eros placerat vel. Integer pulvinar sem feugiat, tincidunt erat a, porta nulla. Mauris eu urna egestas, facilisis ex sodales, sollicitudin quam. Integer porta metus et nunc blandit lacinia. Integer posuere mauris et dui ornare, a finibus neque tristique. Cras sit amet lectus nunc. Nam facilisis tincidunt efficitur.
+    */
+  def loremIpsum[T](a: T): Map[T, T] = ???
+
+  /**
+    *  &nbsp;
+    * | How to convert ... | to a [[PartialFunction]] | to an optional [[Function]] | to an extractor |
+    * | :---:  | ---  | --- | --- |
+    * | from a [[PartialFunction]] | [[Predef.identity]] | [[lift]] | [[Predef.identity]] |
+    * | from optional [[Function]] | [[Function1.UnliftOps#unlift]] or [[Function.unlift]] | [[Predef.identity]] | [[Function1.UnliftOps#unlift]] |
+    * | from an extractor | `{ case extractor(x) => x }` | `extractor.unapply _` | [[Predef.identity]] |
+    *  &nbsp;
+    *
+    * @syntax wiki
+    */
+  def table(foo: String) = ???
+
   protected[example] val valWithScopeModifier = ???
   protected[this] val valWithScopeModifierThis = ???
 
diff --git a/scaladoc-testcases/src/resources/tests/Adoc.scala b/scaladoc-testcases/src/resources/tests/Adoc.scala
new file mode 100644
index 000000000000..492d9637fdfd
--- /dev/null
+++ b/scaladoc-testcases/src/resources/tests/Adoc.scala
@@ -0,0 +1,4 @@
+package resources.tests
+
+class Adoc:
+  def foo = 123
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/anImplicitClass.scala b/scaladoc-testcases/src/tests/anImplicitClass.scala
new file mode 100644
index 000000000000..3653e867302c
--- /dev/null
+++ b/scaladoc-testcases/src/tests/anImplicitClass.scala
@@ -0,0 +1,4 @@
+package tests.anImplicitClass
+
+implicit class AddingOps(n: Int):
+  def inc: Int = n + 1
diff --git a/scaladoc-testcases/src/tests/annotatedmarkdowncomment.scala b/scaladoc-testcases/src/tests/annotatedmarkdowncomment.scala
new file mode 100644
index 000000000000..9803a8453a2d
--- /dev/null
+++ b/scaladoc-testcases/src/tests/annotatedmarkdowncomment.scala
@@ -0,0 +1,17 @@
+package tests.annotatedmarkdowncomment
+
+/**
+ *
+ *  This comment should be correctly rendered.
+ *
+ *  ```scala
+ *  @experimental
+ *  class NotExperimental extends Any
+ *
+ *  @deprecated
+ *  def commentInSwedish: String = "kommentar"
+ *  ```
+ *
+ *  @syntax markdown
+ */
+class Luokassa
diff --git a/scaladoc-testcases/src/tests/caseClassesWithVars.scala b/scaladoc-testcases/src/tests/caseClassesWithVars.scala
new file mode 100644
index 000000000000..8782846665ed
--- /dev/null
+++ b/scaladoc-testcases/src/tests/caseClassesWithVars.scala
@@ -0,0 +1,6 @@
+package tests.caseClassesWithVars
+
+case class Sheep(var numberOfLegs: Int):
+  var name: String = "Lawrence"
+
+class Goat(var numberOfLegs: Int)
diff --git a/scaladoc-testcases/src/tests/classModifiers.scala b/scaladoc-testcases/src/tests/classModifiers.scala
index a189c0e0c53b..c129ef92de2c 100644
--- a/scaladoc-testcases/src/tests/classModifiers.scala
+++ b/scaladoc-testcases/src/tests/classModifiers.scala
@@ -11,3 +11,5 @@ sealed case class D(c: String)
 final case class E(c: String)
 
 open class F
+
+implicit class Foo(i: Int)
diff --git a/scaladoc-testcases/src/tests/contextBounds.scala b/scaladoc-testcases/src/tests/contextBounds.scala
new file mode 100644
index 000000000000..1925f7f40994
--- /dev/null
+++ b/scaladoc-testcases/src/tests/contextBounds.scala
@@ -0,0 +1,39 @@
+package tests
+package contextBounds
+
+import scala.reflect.ClassTag
+
+class A:
+  def basic[A : ClassTag]: A
+    = ???
+
+  def basic2[A : ClassTag, B : List]: A
+    = ???
+
+  trait Build[X, Y]
+  trait From[A, B]
+  def b[T : ([T] =>> Build[From[T, T], T])](t: T): T
+    = t
+
+  trait Build2[X[_], Y]
+  trait From2[A, B]
+
+  def b2[T : ([T] =>> Build2[[Y] =>> From2[T, Y], T])](t: T): T
+    = t
+
+  // Tests not support multiline signatures
+  def a[T <: String | Int : ([T] =>> T match { case String => A case Int => B })](t: T): T
+    = t
+
+  def falsePositive[T](evidence$1: ClassTag[T]): Int 
+    = 1
+
+  // Scala spec stats that behaviour of names with `$` is undefined.
+  // Scaladoc documents definition below as `def falsePositive2[T: ClassTag]: Int`
+  // that is equivalent of methods below
+  // def falsePositive2[T](implicit evidence$3: ClassTag[T]): Int 
+  //   = 1
+
+  class Outer[A]:
+    def falsePositiveInner[T](implicit evidence$3: ClassTag[A]): Int 
+      = 1
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/contextfunctions.scala b/scaladoc-testcases/src/tests/contextfunctions.scala
new file mode 100644
index 000000000000..527053943b5e
--- /dev/null
+++ b/scaladoc-testcases/src/tests/contextfunctions.scala
@@ -0,0 +1,4 @@
+package tests.contextfunctions
+
+val x: Int ?=> Float
+  = 5.0f
diff --git a/scaladoc-testcases/src/tests/emptyparens.scala b/scaladoc-testcases/src/tests/emptyparens.scala
new file mode 100644
index 000000000000..1d2c3d0843fa
--- /dev/null
+++ b/scaladoc-testcases/src/tests/emptyparens.scala
@@ -0,0 +1,27 @@
+package tests.emptyparens
+
+class C {
+  def f1()(implicit i: Int) = i
+
+  def f2()(using i: Int) = i
+
+  def f3(s: String)(implicit i: Int) = i
+
+  def f4(s: String)(using i: Int) = i
+
+  def f5()()(using i: Int) = i
+
+  def f6() = 1
+
+  def f7()() = 2
+
+  def f8(i: Int)() = 1
+}
+
+class C1()(implicit i: Int)
+
+class C2()(using i: Int)
+
+class C3()()
+
+class C4()(i: Int)
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/exports.scala b/scaladoc-testcases/src/tests/exports.scala
deleted file mode 100644
index 4e1267680575..000000000000
--- a/scaladoc-testcases/src/tests/exports.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-package tests
-package exports 
-
-class A:
-  def aDefInt: Int = 1
-  def aDef1: 1 = 1
-  val aValInt: Int = 1
-  val aVal1: 1 = 1
-  var aVarInt: Int = 1
-  var aVar1: 1 = 1
-
-object X:
-  def xDefInt: Int = 1
-  def xDef1: 1 = 1
-  val xValInt: Int = 1
-  val xVal1: 1 = 1
-  var xVarInt: Int = 1
-  var xVar1: 1 = 1
-
-class B:
-  val a = new A
-  export a._
-  export X._
diff --git a/scaladoc-testcases/src/tests/exports1.scala b/scaladoc-testcases/src/tests/exports1.scala
new file mode 100644
index 000000000000..8c47ddc94b79
--- /dev/null
+++ b/scaladoc-testcases/src/tests/exports1.scala
@@ -0,0 +1,45 @@
+package tests
+package exports1
+
+class A: //unexpected
+  def aDefInt: Int
+   = 1
+  def aDef1: 1
+   = 1
+  val aValInt: Int
+   = 1
+  val aVal1: 1
+   = 1
+  var aVarInt: Int
+   = 1
+  var aVar1: 1
+   = 1
+  type HKT[T[_], X] //expected: final type HKT = [T[_], X] =>> HKT[T, X]
+   = T[X]
+  type SomeRandomType = (List[_] | Seq[_]) & String //expected: final type SomeRandomType = SomeRandomType
+  def x[T[_], X](x: X): HKT[T, X]
+   = ???
+  def fn[T, U]: T => U
+   = ???
+  object Object //expected: val Obj: Object.type
+  val x: HKT[List, Int]
+   = ???
+  class Class(val a: Int, val b: Int) extends Serializable //expected: final type Class = Class
+  enum Enum: //expected: final type Enum = Enum
+    case A
+    case B(i: Int)
+    case C[T]() extends Enum
+
+object X: //unexpected
+  def xDefInt: Int
+   = 1
+  def xDef1: 1
+   = 1
+  val xValInt: Int
+   = 1
+  val xVal1: 1
+   = 1
+  var xVarInt: Int
+   = 1
+  var xVar1: 1
+   = 1
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/exports2.scala b/scaladoc-testcases/src/tests/exports2.scala
new file mode 100644
index 000000000000..c6450265ab1b
--- /dev/null
+++ b/scaladoc-testcases/src/tests/exports2.scala
@@ -0,0 +1,12 @@
+package tests
+package exports2
+
+import exports1._
+
+class B:
+  val a: A
+   = new A
+  export a.{Object => Obj, _}
+  export X._
+  def obj: Obj.type
+   = Obj
diff --git a/scaladoc-testcases/src/tests/extensionParams.scala b/scaladoc-testcases/src/tests/extensionParams.scala
new file mode 100644
index 000000000000..231a8a1fefbf
--- /dev/null
+++ b/scaladoc-testcases/src/tests/extensionParams.scala
@@ -0,0 +1,22 @@
+package tests.extensionParams
+
+extension [A](thiz: A)
+  def toTuple2[B](that: B): (A, B) = thiz -> that
+
+extension [A](a: A)(using Int)
+  def f[B](b: B): (A, B) = ???
+
+extension [A](a: A)(using Int)
+  def ff(b: A): (A, A) = ???
+
+extension [A](a: A)(using Int)
+  def fff(using String)(b: A): (A, A) = ???
+
+extension (a: Char)(using Int)
+  def ffff(using String)(b: Int): Unit = ???
+
+extension (a: Char)(using Int)
+  def fffff[B](using String)(b: B): Unit = ???
+
+extension [A <: List[Char]](a: A)(using Int)
+  def ffffff[B](b: B): (A, B) = ???
diff --git a/scaladoc-testcases/src/tests/externalLocations/externalStubs.scala b/scaladoc-testcases/src/tests/externalLocations/externalStubs.scala
new file mode 100644
index 000000000000..01eb2fbc3a3f
--- /dev/null
+++ b/scaladoc-testcases/src/tests/externalLocations/externalStubs.scala
@@ -0,0 +1,5 @@
+package tests.externalStubs
+
+trait \/
+
+trait /\
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/externalLocations/scaladoc2.scala b/scaladoc-testcases/src/tests/externalLocations/scaladoc2.scala
index b7d024ff5eb4..3319b1ab4e90 100644
--- a/scaladoc-testcases/src/tests/externalLocations/scaladoc2.scala
+++ b/scaladoc-testcases/src/tests/externalLocations/scaladoc2.scala
@@ -1,6 +1,8 @@
-package tests.externalScaladoc2
+package tests
+package externalScaladoc2
 
 import scala.util.matching.*
+import externalStubs._
 
 class Test {
   def a: String = ???
@@ -10,5 +12,7 @@ class Test {
   def c: Regex.Match = ???
 }
 
+class Test2 extends \/ with /\
+
 abstract class MySeq[T] extends scala.collection.immutable.Seq[T]
 
diff --git a/scaladoc-testcases/src/tests/externalLocations/scaladoc3.scala b/scaladoc-testcases/src/tests/externalLocations/scaladoc3.scala
index 590c19ffaa6c..0eb8c7318d75 100644
--- a/scaladoc-testcases/src/tests/externalLocations/scaladoc3.scala
+++ b/scaladoc-testcases/src/tests/externalLocations/scaladoc3.scala
@@ -1,6 +1,8 @@
-package tests.externalScaladoc3
+package tests
+package externalScaladoc3
 
 import scala.util.matching.*
+import externalStubs._
 
 class Test {
   def a: String = ???
@@ -10,3 +12,5 @@ class Test {
   def c: Regex.Match = ???
 }
 
+class Test2 extends \/ with /\
+
diff --git a/scaladoc-testcases/src/tests/fboundedTypeParameters.scala b/scaladoc-testcases/src/tests/fboundedTypeParameters.scala
new file mode 100644
index 000000000000..69c1702673f0
--- /dev/null
+++ b/scaladoc-testcases/src/tests/fboundedTypeParameters.scala
@@ -0,0 +1,5 @@
+package tests
+package fboundedTypeParameters
+
+trait AOps[X[_]]
+trait A[T] extends AOps[A]
diff --git a/scaladoc-testcases/src/tests/givenSignatures.scala b/scaladoc-testcases/src/tests/givenSignatures.scala
index a1143e908da9..ff447ffc4553 100644
--- a/scaladoc-testcases/src/tests/givenSignatures.scala
+++ b/scaladoc-testcases/src/tests/givenSignatures.scala
@@ -4,9 +4,9 @@ package givenSignatures
 
 object Obj
 
-given Seq[String] = Nil
+given Seq[String] = Nil //expected: given given_Seq_String: Seq[String]
 
-given GivenType = GivenType()
+given GivenType = GivenType() //expected: given given_GivenType: GivenType
 
 class GivenType
 
@@ -14,3 +14,9 @@ trait Ord[T]
 
 given listOrd[T](using ord: Ord[T]): Ord[List[T]]
   = ???
+
+trait Foo[A]
+
+given listOrd: Foo[String] with { val i: Int = 1 } //expected: given listOrd: listOrd.type
+
+trait Placeholder //expected: object listOrd extends Foo[String]
diff --git a/scaladoc-testcases/src/tests/hugetype.scala b/scaladoc-testcases/src/tests/hugetype.scala
new file mode 100644
index 000000000000..2f0f7f79540b
--- /dev/null
+++ b/scaladoc-testcases/src/tests/hugetype.scala
@@ -0,0 +1,48 @@
+package tests.hugetype
+
+import compiletime._
+import compiletime.ops.int._
+import scala.annotation.experimental
+
+/**
+ * a particular group of people or things that share similar characteristics and form a smaller division of a larger set:
+ * - There were so many different types of bread that I didn't know which to buy.
+ * - What type of clothes does she wear?
+ * - It was dark so I didn't notice what type of car it was.
+ * - He's the type of man you could take home to your mother.
+ * - He's very attractive, if you like the blond, athletic type.
+ * - They sell dried flowers and baskets and that type of thing.
+ * - We have a range of moisturizers for all different skin types.
+ * - She was young and she was wearing student-type clothes, so I assumed she was studying here.
+ * - He took me to a bar full of actor types trying to get noticed.
+ *
+ */
+type Take[T <: Tuple, N <: Int] <: Tuple = N match {
+  case 0 => EmptyTuple
+  case S[n1] => T match {
+    case EmptyTuple => EmptyTuple
+    case x *: xs => x *: Take[xs, n1]
+  }
+}
+
+trait E:
+  @experimental
+  @deprecated
+  protected implicit def same[A](a: A): A
+
+trait XD extends E:
+  /**
+   * Some important information :o
+   *
+   * @param a any value of type forall a. a
+   * @return Nothing, because I haven't implemented it yet ^^
+   */
+  @experimental
+  @deprecated
+  protected override final implicit transparent inline abstract infix def same[A](a: A): A = a
+
+trait Parent[X, A[_], B[_, _]]
+
+trait HugeTrait[X] extends Parent[X, HugeTrait, Map]
+
+trait EvenBiggerTrait[X, Y] extends Parent[X, Seq, EvenBiggerTrait]
diff --git a/scaladoc-testcases/src/tests/inheritDoc.scala b/scaladoc-testcases/src/tests/inheritDoc.scala
new file mode 100644
index 000000000000..604c359112d2
--- /dev/null
+++ b/scaladoc-testcases/src/tests/inheritDoc.scala
@@ -0,0 +1,7 @@
+package tests
+package inheritDoc
+
+class Test {
+  /** {@inheritDoc} */
+  def f: Unit = { }
+}
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/inheritedMembers1.scala b/scaladoc-testcases/src/tests/inheritedMembers1.scala
index 6a86c523bd19..d8fa44607e5e 100644
--- a/scaladoc-testcases/src/tests/inheritedMembers1.scala
+++ b/scaladoc-testcases/src/tests/inheritedMembers1.scala
@@ -10,7 +10,11 @@ class A
       = ???
     object X
     trait Z
-    given B with {}
+    given B with { val x = 1 }//expected: given given_B: given_B.type
+    trait Placeholder//expected: object given_B extends B
+
+    object Y extends Z
+
     type I = Int
     /*<-*/extension (a: A) /*->*/def extension: String
       = ???
diff --git a/scaladoc-testcases/src/tests/inkuire.scala b/scaladoc-testcases/src/tests/inkuire.scala
new file mode 100644
index 000000000000..2d70a70fb6f5
--- /dev/null
+++ b/scaladoc-testcases/src/tests/inkuire.scala
@@ -0,0 +1,20 @@
+package tests.inkuire
+
+trait InType1
+trait InType2 extends InType1
+
+trait OutType1
+trait OutType2 extends OutType1
+
+class JustAClass {
+  def mathod(l: InType1): OutType1 = ???
+}
+
+class JustAnotherClass extends JustAClass {
+  def method(i: InType2): OutType2 = ???
+}
+
+object InkuireObject {
+  def function(i: InType1): OutType1 = ???
+  val value: InType1 => OutType1 = ???
+}
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/justmethods.scala b/scaladoc-testcases/src/tests/justmethods.scala
new file mode 100644
index 000000000000..13c957305aa8
--- /dev/null
+++ b/scaladoc-testcases/src/tests/justmethods.scala
@@ -0,0 +1,5 @@
+package tests.justmethods
+
+trait Animal
+
+def whatSoundDoIMake(animal: Animal): String = "IoIo"
diff --git a/scaladoc-testcases/src/tests/lookupInheritedMembers.scala b/scaladoc-testcases/src/tests/lookupInheritedMembers.scala
index d39bd0fe4422..70bffa0c9109 100644
--- a/scaladoc-testcases/src/tests/lookupInheritedMembers.scala
+++ b/scaladoc-testcases/src/tests/lookupInheritedMembers.scala
@@ -15,6 +15,15 @@ package lookupInheritedMembers {
    * [[tests.lookupInheritedMembers.pack2.B.x]]
    * [[tests.lookupInheritedMembers.pack2.B.y]]
    * [[tests.lookupInheritedMembers.pack2.B.MyType]]
+   *
    */
   class LookupInheritedMembers
+
+  /**
+   * This look up is problematic, because is lazyloaded by dotty.
+   *
+   * [[java.util.Formatter]]
+   */
+  class JavaInheritedMembers
 }
+
diff --git a/scaladoc-testcases/src/tests/markdowncode.scala b/scaladoc-testcases/src/tests/markdowncode.scala
new file mode 100644
index 000000000000..ac8238b7f0f6
--- /dev/null
+++ b/scaladoc-testcases/src/tests/markdowncode.scala
@@ -0,0 +1,5 @@
+package tests.markdowncode
+
+/** Some text `{ <statements: List[Statement]>; <expr: Term> }` */
+val aVal: Float
+  = 1.2f
diff --git a/scaladoc-testcases/src/tests/methodsAndConstructors.scala b/scaladoc-testcases/src/tests/methodsAndConstructors.scala
index d0f3386730bc..b8925c593b4c 100644
--- a/scaladoc-testcases/src/tests/methodsAndConstructors.scala
+++ b/scaladoc-testcases/src/tests/methodsAndConstructors.scala
@@ -54,3 +54,9 @@ class Methods:
  def ++:(a: Int)(b: Double): Int
  = ???
 
+ def withImplicitParam(implicit a: Int): Int
+ = ???
+
+ def withImplicitParam2(v: String)(implicit ab: Double, a: Int, b: String): String
+ = ???
+
diff --git a/scaladoc-testcases/src/tests/noLinkWarnings.scala b/scaladoc-testcases/src/tests/noLinkWarnings.scala
new file mode 100644
index 000000000000..f888a843e432
--- /dev/null
+++ b/scaladoc-testcases/src/tests/noLinkWarnings.scala
@@ -0,0 +1,14 @@
+package tests
+package noLinkWarnings
+
+/**
+ * [[doesnt.exist]]
+ *
+ */
+class NoLinkWarnings
+
+
+/**
+ * [[NoLinkWarnings]]
+ */
+class Exists
diff --git a/scaladoc-testcases/src/tests/packageobjdocs/package.scala b/scaladoc-testcases/src/tests/packageobjdocs/package.scala
new file mode 100644
index 000000000000..a0abe146f1f2
--- /dev/null
+++ b/scaladoc-testcases/src/tests/packageobjdocs/package.scala
@@ -0,0 +1,10 @@
+package tests
+
+/** Some documentation that should be present in Scaladoc
+ *
+ * It's a test
+ *
+ */
+package object packageobjdocs {
+  def placeholder: Int = 42
+}
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/selftypes.scala b/scaladoc-testcases/src/tests/selftypes.scala
new file mode 100644
index 000000000000..d28c17a3ea21
--- /dev/null
+++ b/scaladoc-testcases/src/tests/selftypes.scala
@@ -0,0 +1,14 @@
+package tests.selftypes
+
+class A:
+  def a: Unit = ???
+
+class C
+
+class HasAnAndSelfType:
+  self: A & C =>
+  def b: Unit = ???
+
+class HasASelfType:
+  self: A =>
+  def b: Unit = ???
diff --git a/scaladoc-testcases/src/tests/slashMembers.scala b/scaladoc-testcases/src/tests/slashMembers.scala
new file mode 100644
index 000000000000..f13e36f82aae
--- /dev/null
+++ b/scaladoc-testcases/src/tests/slashMembers.scala
@@ -0,0 +1,8 @@
+package tests
+package slashMembers
+
+class A
+
+trait \/
+
+trait /\
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/snippetComments.scala b/scaladoc-testcases/src/tests/snippetComments.scala
new file mode 100644
index 000000000000..39b15648103e
--- /dev/null
+++ b/scaladoc-testcases/src/tests/snippetComments.scala
@@ -0,0 +1,31 @@
+package tests.snippetComments
+
+
+/**
+ * This is my codeblock
+ * 
+ * ```
+ * //{{
+ * import xd
+ * import xd2
+ * //}}
+ *
+ *
+ * val x = 1 // This is my valid comment
+ *
+ * /*
+ *  multi line comment
+ *  */
+ * val reallyFLongDeclaration = "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+ * val y = 2 // comment in the same line
+ * // comment in new line
+ * val z = 3
+ * 
+ * //{{
+ * val hideMe = 7
+ * //}}
+ * ```
+ *
+ * The end of my codeblock
+ */
+class A
diff --git a/scaladoc-testcases/src/tests/snippetCompilerTests.scala b/scaladoc-testcases/src/tests/snippetCompilerTests.scala
new file mode 100644
index 000000000000..3d03438f7f3c
--- /dev/null
+++ b/scaladoc-testcases/src/tests/snippetCompilerTests.scala
@@ -0,0 +1,68 @@
+package tests
+package snippetCompilerTests
+
+/**
+  * ```scala sc:fail
+  * //{
+  * import scala.collection.Seq
+  * //}
+  *
+  * def a = 2
+  * val x = 1 + List()
+  * a
+  *
+  * try {
+  *   2+3
+  * }
+  *
+  * /*
+  *   Huge comment
+  * */
+  * val xd: String = 42
+  *
+  * def a(i: Int): Boolean = i match // This is a function
+  *   case 1 => true
+  *
+  * val b: Int = 2.3 /* Also quite a big comment */
+  *
+  * val d: Long = "asd"
+  * ```
+  *
+  * ```scala sc:fail
+  * def a = 2
+  * val x = 1 + List()
+  * a
+  * ```
+  *
+  * ```scala sc:compile
+  * def a = 2
+  * ```
+  *
+  * ```scala sc:nocompile
+  * def a = 3
+  * a()
+  * ```
+  */
+class A {
+  trait B
+}
+
+/**
+ * ```scala sc:fail
+ * val c: Int = 4.5
+ * ```
+ */
+class B { }
+
+trait Quotes {
+  val reflect: reflectModule = ???
+  trait reflectModule { self: reflect.type =>
+    /**
+      * ```scala sc:fail
+      * 2 + List()
+      * ```
+      *
+      */
+    def a = 3
+  }
+}
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/snippetTestcase1.scala b/scaladoc-testcases/src/tests/snippetTestcase1.scala
new file mode 100644
index 000000000000..dccb92368041
--- /dev/null
+++ b/scaladoc-testcases/src/tests/snippetTestcase1.scala
@@ -0,0 +1,29 @@
+package tests.snippetTestcase1
+
+class SnippetTestcase1:
+  /**
+    * SNIPPET(OUTERLINEOFFSET:8,OUTERCOLUMNOFFSET:6,INNERLINEOFFSET:5,INNERCOLUMNOFFSET:2)
+    * ERROR(LINE:8,COLUMN:8)
+    * ```scala sc:fail
+    * 2 + List()
+    * ```
+    *
+    */
+  def a = 3
+  /**
+    * SNIPPET(OUTERLINEOFFSET:16,OUTERCOLUMNOFFSET:6,INNERLINEOFFSET:5,INNERCOLUMNOFFSET:2)
+    * ```scala sc:compile sc-name:1
+    * val xs: List[Int] = List()
+    * ```
+    *
+    * SNIPPET(OUTERLINEOFFSET:21,OUTERCOLUMNOFFSET:6,INNERLINEOFFSET:5,INNERCOLUMNOFFSET:2)
+    * ```scala sc:compile sc-compile-with:1 sc-name:2
+    * val ys = xs.map(x => x * 2)
+    * ```
+    *
+    * SNIPPET(OUTERLINEOFFSET:26,OUTERCOLUMNOFFSET:6,INNERLINEOFFSET:5,INNERCOLUMNOFFSET:2)
+    * ```scala sc:compile sc-compile-with:2
+    * xs ++ ys
+    * ```
+    */
+  def b = 3
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/snippetTestcase2.scala b/scaladoc-testcases/src/tests/snippetTestcase2.scala
new file mode 100644
index 000000000000..3f99b316592f
--- /dev/null
+++ b/scaladoc-testcases/src/tests/snippetTestcase2.scala
@@ -0,0 +1,58 @@
+package tests
+package snippetTestcase2
+
+trait Quotes2[A] {
+  val r1: r1Module[_] = ???
+  trait r1Module[A] {
+    type X
+    object Y {
+      /**
+        * SNIPPET(OUTERLINEOFFSET:13,OUTERCOLUMNOFFSET:10,INNERLINEOFFSET:8,INNERCOLUMNOFFSET:6)
+        * ERROR(LINE:13,COLUMN:12)
+        * ```scala sc:fail
+        * 2 + List()
+        * ```
+        *
+        */
+       type YY
+     }
+     val z: zModule = ???
+     trait zModule {
+      /**
+        * SNIPPET(OUTERLINEOFFSET:25,OUTERCOLUMNOFFSET:10,INNERLINEOFFSET:9,INNERCOLUMNOFFSET:6)
+        * ERROR(LINE:25,COLUMN:12)
+        * ```scala sc:fail
+        * 2 + List()
+        * ```
+        *
+        */
+       type ZZ
+     }
+  }
+  object r2 {
+    type X
+    object Y {
+      /**
+        * SNIPPET(OUTERLINEOFFSET:39,OUTERCOLUMNOFFSET:10,INNERLINEOFFSET:7,INNERCOLUMNOFFSET:6)
+        * ERROR(LINE:39,COLUMN:12)
+        * ```scala sc:fail
+        * 2 + List()
+        * ```
+        *
+        */
+      type YY
+    }
+    val z: zModule = ???
+    trait zModule {
+      /**
+        * SNIPPET(OUTERLINEOFFSET:51,OUTERCOLUMNOFFSET:10,INNERLINEOFFSET:8,INNERCOLUMNOFFSET:6)
+        * ERROR(LINE:51,COLUMN:12)
+        * ```scala sc:fail
+        * 2 + List()
+        * ```
+        *
+        */
+      type ZZ
+    }
+  }
+}
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/snippetTestcase3.scala b/scaladoc-testcases/src/tests/snippetTestcase3.scala
new file mode 100644
index 000000000000..bb7def9a4b4c
--- /dev/null
+++ b/scaladoc-testcases/src/tests/snippetTestcase3.scala
@@ -0,0 +1,35 @@
+package tests
+
+package snippetTestcase3
+
+class SnippetTestcase3:
+  /** Text on line 0.
+   *
+   * SNIPPET(OUTERLINEOFFSET:11,OUTERCOLUMNOFFSET:6,INNERLINEOFFSET:5,INNERCOLUMNOFFSET:2)
+   * ERROR(LINE:11,COLUMN:8)
+   * ```scala sc:fail
+   * 2 + List()
+   * ```
+   */
+  def a = 3
+  /**
+   * Text on line 1.
+   *
+   * SNIPPET(OUTERLINEOFFSET:21,OUTERCOLUMNOFFSET:6,INNERLINEOFFSET:5,INNERCOLUMNOFFSET:2)
+   * ERROR(LINE:21,COLUMN:8)
+   * ```scala sc:fail
+   * 2 + List()
+   * ```
+   */
+  def b = 3
+  /**
+   *
+   * Text on line 2.
+   *
+   * SNIPPET(OUTERLINEOFFSET:32,OUTERCOLUMNOFFSET:6,INNERLINEOFFSET:5,INNERCOLUMNOFFSET:2)
+   * ERROR(LINE:32,COLUMN:8)
+   * ```scala sc:fail
+   * 2 + List()
+   * ```
+   */
+  def c = 3
\ No newline at end of file
diff --git a/scaladoc-testcases/src/tests/syntaxes.scala b/scaladoc-testcases/src/tests/syntaxes.scala
new file mode 100644
index 000000000000..51c929bf0ae3
--- /dev/null
+++ b/scaladoc-testcases/src/tests/syntaxes.scala
@@ -0,0 +1,11 @@
+package test.syntaxes
+
+class DoingStuffOps[A](a: A):
+  def doStuff: Unit = ()
+
+trait DoingStuffSyntax:
+  implicit def toDoingStuffOps[A](a: A): DoingStuffOps[A] = DoingStuffOps(a)
+
+trait AllSyntaxes extends DoingStuffSyntax
+
+object doingstuff extends AllSyntaxes
diff --git a/scaladoc-testcases/src/tests/typesSignatures.scala b/scaladoc-testcases/src/tests/typesSignatures.scala
index a66c2a521ce8..4d8d99f6ce73 100644
--- a/scaladoc-testcases/src/tests/typesSignatures.scala
+++ b/scaladoc-testcases/src/tests/typesSignatures.scala
@@ -35,6 +35,10 @@ class Base
   type H = () => String
 
   type I = (Int, String, Int) => (String, Int)
+
+  type J = (a: A) => a.type
+
+  type K = [A] => (a: A) => a.type
 }
 
 class Operators
diff --git a/scaladoc-testcases/src/toplevel.scala b/scaladoc-testcases/src/toplevel.scala
index 764e9cbaf9cf..b82b5980263c 100644
--- a/scaladoc-testcases/src/toplevel.scala
+++ b/scaladoc-testcases/src/toplevel.scala
@@ -1,3 +1,3 @@
 def toplevelDef = 123
 
-class ToplevelClass
\ No newline at end of file
+class ToplevelClass
diff --git a/scaladoc/README.md b/scaladoc/README.md
index c55a256e342d..5f7560372976 100644
--- a/scaladoc/README.md
+++ b/scaladoc/README.md
@@ -1,8 +1,8 @@
 # Scaladoc
 
 Scaladoc  is the documentation tool for
-[Scala 3](https://github.com/lampepfl/dotty), which is scheduled to become
-Scala 3.  It uses the TastyInspector to access definitions,
+[Scala 3](https://github.com/lampepfl/dotty).
+It uses the TastyInspector to access definitions,
 which is an officially supported way to access Scala 3's perspective of a
 codebase.
 
@@ -23,43 +23,36 @@ sbt scaladoc/generateSelfDocumentation
 sbt scaladoc/generateScalaDocumentation
 ```
 
-To actually view the documentation, the easiest way is to run the following in project root:
+To actually view the documentation, the easiest way is to run the following in the project root:
 
 ```
-cd output
+cd scaladoc/output
 python3 -m http.server 8080
 ```
 
 And afterwards point your browser to <http://localhost:8080/self> or
-<http://localhost:8080/stdLib> for this project and for Dotty documentation
+<http://localhost:8080/scala3> for this project and for Dotty documentation
 respectively.
 
 It's not strictly necessary to go through an HTTP server, but because of CORS
 the documentation won't work completely if you don't.
 
-## CLI Documentation
+## CLI and SBT Documentation
 
-CLI command for running our tool is in form: `sbt main -n <name> -o <output> -t <tasty-files> -cp <classpath> -s { <sources> } -d <documentation> ` where:
-
-- `<name>`: name of module in generated documentation
-- `<output>`: location where documentation should be created
-- `<tasty-files>`: is list of dirs or jars that contains tasty files that should be documented
-- `<classpath>`: classpath that was used to generate tasty files
-- `<sources>`: links to source files of module that are used to link symbols on pages to their source file. They need to be supplied in form:
-  `local_dir=remote_dir#line_suffix` e.g. `src/main/scala=https://github.com/lampepfl/scaladoc/tree/master/src/main/scala#L`
-- `<documentation>`: directory of static documentation that you would like to render with API documentation.
+The preferred way to use scaladoc is calling it from sbt `Compile/doc` task or to use CLI interface provided inside `dotty/bin/scaladoc` bash script.
+More information about specific scaladoc flags you can find inside [Usage docs](https://dotty.epfl.ch/docs/usage/scaladoc/settings.html)
 
 ## Developing
 
 At least two of our contributors use [Metals](https://scalameta.org/metals/) to
 work on the project.
 
-For every PR, we build documentation for scaladoc and Dotty. For example, for
-PR 123 you can find them at:
+For every PR named with prefix `scaladoc/`, we build documentation for scaladoc and Dotty. For example, for
+PR `scaladoc/update-docs` you can find them at:
 
-- <https://scala3doc.virtuslab.com/pr-123/self/main/index.html>
-- <https://scala3doc.virtuslab.com/pr-123/scala3/main/index.html>
-- <https://scala3doc.virtuslab.com/pr-123/testcases/main/index.html>
+- <https://scala3doc.virtuslab.com/pr-update-docs/self/main/index.html>
+- <https://scala3doc.virtuslab.com/pr-update-docs/scala3/main/index.html>
+- <https://scala3doc.virtuslab.com/pr-update-docs/testcases/main/index.html>
 
 Note that these correspond to the contents of `output` directory - that's
 precisely what they are.
@@ -73,21 +66,18 @@ You can also find the result of building the same sites for latest `master` at:
 ### Testing
 
 Most tests rely on comparing signatures (of classes, methods, objects etc.) extracted from the generated documentation
-to signatures found in source files. Such tests are defined using [MultipleFileTest](test/dotty/tools/scala3doc/MultipleFileTest.scala) class
-and its subtypes (such as [SingleFileTest](test/dotty/tools/scala3doc/SingleFileTest.scala))
+to signatures found in source files. Such tests are defined using [SignatureTest](test/dotty/tools/scaladoc/signatures/SignatureTest.scala) class
+and its subtypes (such as [TranslatableSignaturesTestCases](test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala))
 
 WARNING: As the classes mentioned above are likely to evolve, the description below might easily get out of date.
 In case of any discrepancies rely on the source files instead.
 
-`MultipleFileTest` requires that you specify the names of the files used to extract signatures,
+`SignatureTest` requires that you specify the names of the files used to extract signatures,
 the names of directories containing corresponding TASTY files
 and the kinds of signatures from source files (corresponding to keywords used to declare them like `def`, `class`, `object` etc.)
 whose presence in the generated documentation will be checked (other signatures, when missing, will be ignored).
-The mentioned source files should be located directly inside `src/main/scala/tests` directory
+The mentioned source files should be located directly inside [](../scaladoc-testcases/src/tests) directory
 but the file names passed as parameters should contain neither this path prefix nor `.scala` suffix.
-The TASTY folders are expected to be located in `target/${dottyVersion}/classes/tests` (after successful compilation of the project)
-and similarly only their names relative to this path should be provided as tests' parameters.
-For `SingleFileTest` the name of the source file and the TASTY folder are expected to be the same.
 
 By default it's expected that all signatures from the source files will be present in the documentation
 but not vice versa (because the documentation can contain also inherited signatures).
@@ -129,20 +119,6 @@ class Bar
 
 Otherwise the implementation would be treated as a part of the signature.
 
-## Roadmap
-
-1. Publish an initial version of the tool together with an SBT plugin
-1. Replace Dottydoc as the dedicated tool for documenting Dotty code
-
-   This includes:
-
-   - supporting Dotty's doc pages
-   - releasing together with Dotty as the dedicated documentation tool
-
-1. Support all kinds of Dotty definition and generate documentation for the
-   standard library
-1. Reach feature parity with Scaladoc
-
 ## Contributing
 
 We're happy that you'd like to help us!
diff --git a/scaladoc/documentation/docs/design.md b/scaladoc/documentation/docs/design.md
index 3ca5639cf430..475c50bab0ae 100644
--- a/scaladoc/documentation/docs/design.md
+++ b/scaladoc/documentation/docs/design.md
@@ -1,7 +1,120 @@
 # Design of scaladoc
 
-**BEWARE this is not complete documentation yet but rather a draft mainly to test linking from static site to code**
+Scaladoc is divided into 3 modules, that are:
+- scaladoc
+- scaladoc-js
+- scaladoc-testcases
 
-## Interface
+##### scaladoc
 
-scaladoc is intednted to be use with sbt as well as from commend line or from other buildtools. The main entry point to processing is [Main](dotty.tools.scaladoc.Main$) class with [[dotty.tools.scaladoc.Main$.main]].
\ No newline at end of file
+This module contains the core source code and assets (css, js) used for building Scaladoc.
+
+##### scaladoc-js
+
+This module contains Scala source code that is compiled to JavaScript. It is used by scaladoc for:
+- searchbar
+- social links
+- snippets processor
+
+##### scaladoc-testcases
+
+Project that is used for manual testing as well as for end-to-end tests of Scaladoc.
+
+## scaladoc
+
+### Interface
+
+scaladoc is intended to be use with sbt as well as from command line or from any other buildtool. The main entry point
+- for sbt is [dotty.tools.dottydoc.Main](../../src/dotty/tools/dottydoc/Main.scala)
+  This class is just for compatibility with old dottydoc and should be removed in the near future.
+- for CLI is [dotty.tools.scaladoc.Main](../../src/dotty/tools/scaladoc/Main.scala)
+
+### The base pipeline
+
+The base pipeline of processing the files is as follows:
+
+1. Gathering code data from TASTY files.
+2. Creation of Members
+3. Apply transformers
+4. Rendering the members into HTML
+
+Main processing starts from [Scaladoc](../../src/dotty/tools/scaladoc/Scaladoc.scala) class. This class is reponsible for checking
+input settings and setting up [DocContext](../../src/dotty/tools/scaladoc/DocContext.scala) properly, which is wrapping `CompilerContext` with
+all additional information required by Scaladoc.
+
+Then everything goes to [ScalaModuleProvider](../../src/dotty/tools/scaladoc/ScalaModuleProvider.scala) where [Members](../../src/dotty/tools/scaladoc/api.scala) are created and then
+transformations are applied.
+
+Transformers are used to add additional data that could not be added at `Member`'s tree creation time.
+
+Example transformers used are: [ImplicitMembersExtensionTransformer](../../src/dotty/tools/scaladoc/transformers/ImplicitMembersExtensionTransformer.scala),
+[InheritanceInformationTransformer](../../src/dotty/tools/scaladoc/transformers/InheritanceInformationTransformer.scala),
+[SealedMarksGraphTransformer](../../src/dotty/tools/scaladoc/transformers/SealedMarksGraphTransformer.scala).
+
+The last step is serialization members into HTML pages. Everything that lies under package [dotty.tools.scaladoc.renderers](../../src/dotty/tools/scaladoc/renderers). It's worth noticing that whole template of page is coded as HTML building DSL like scalatags. The DocStrings are rendered by:
+- if they are Markdown syntax comments - by flexmark dependency
+- if they are WikiDoc syntax comments - by our own implementation
+
+Unmentioned packages are:
+#### [dotty.tools.scaladoc.parsers](../../src/dotty/tools/scaladoc/parsers)
+
+Contains legacy parser for WikiDoc syntax CodeBlocks `{{{ }}}`.
+
+#### [dotty.tools.scaladoc.site](../../src/dotty/tools/scaladoc/site)
+
+Package responsible for generation static pages for blog and documentation.
+
+#### [dotty.tools.scaladoc.tasty](../../src/dotty/tools/scaladoc/tasty)
+
+Package havily used during `Members` creation. Contains preprocessors and parsers to extract `DocString` comments and
+all semantic data from TASTY files.
+
+Worth mentioning are:
+- [TypesSupport](../../src/dotty/tools/scaladoc/tasty/TypesSupport.scala) - used to gather types that are human readable out of `Quotes` AST
+- [ClassLikeSupport](../../src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala) - used to gather Members information out of `Quotes` AST
+
+#### [dotty.tools.scaladoc.translators](../../src/dotty/tools/scaladoc/translators)
+
+Utilities to create signatures for given Member.
+
+#### [dotty.tools.scaladoc.util](../../src/dotty/tools/scaladoc/util)
+
+Utilities for html, IO and JSONs.
+
+### Important model classes
+
+The core model class is called [Member](../../src/dotty/tools/scaladoc/api.scala) which aggregates all semantic data about some element of code.
+It can represent Package, Class, Method etc. Members create Tree-like structure just like Classes do. Every `Member` has it's own identifier called
+[DRI](../../src/dotty/tools/scaladoc/DRI.scala). `DRI` is easily serializable and unique. It's name is related to `DRI` model class from dokka,
+on which scaladoc was firstly based. `DRI` lets you get URL of resource easily, doesn't matter if this is symbol from the same project or any external
+dependency (given that correct external dependency is configured).
+
+### Testing
+
+In project we have some unit tests and end-to-end tests.
+Unit tests are nothing special, just put them under `test` directory.
+If you would like to creat some end-to-end tests you should visit [ScaladocTest](../../test/dotty/tools/scaladoc/ScaladocTest.scala) or
+[BaseSignatureTest](../../test/dotty/tools/scaladoc/signatures/SignatureTest.scala).
+The former is useful for any end-to-end tests, especially when used with JSoup html parsing.
+The latter is used to compare expected/actual signatures of classes/methods etc.
+
+To run tests just run `sbt scaladoc/test`
+
+### Hack methods
+
+Across the project there are multiple `hackXXX` methods around. The reasons why method is called like that can be various, however they probably do
+some nasty casting, try-catching or any other procedure that was becuase of TASTY/dotty shortcomings or minor bugs. In the near future we should
+revisit each of them and fix them on `dotty side or fix in any other way.
+
+## scaladoc-js
+
+### Interface
+
+scaladoc-js is appended to js resources of published scaladoc. The main entry point is [Main](../../../scaladoc-js/src/Main.scala)
+As a main method just append your javascripts transfomers that you find sufficient.
+For now scaladoc-js handles Social Links and Searchbar, though there are plans to rewrite more js scipts like Diagram handler to Scala.js
+
+## scaladoc-testcases
+
+There is no general rule how to treat this package. If you want to use it as `easy to look up scaladoc output` module, just add your scala definitions
+somewhere under `src` directory and run `sbt scaladoc/generateTestcasesDocumentation`. If you would like to use it as end-to-end test sourcecode input, check out [Testing](#testing) chapter.
diff --git a/scaladoc/resources/dotty_res/images/enum.svg b/scaladoc/resources/dotty_res/images/enum.svg
index 8d09d1bdc019..6447349a6676 100644
--- a/scaladoc/resources/dotty_res/images/enum.svg
+++ b/scaladoc/resources/dotty_res/images/enum.svg
@@ -1,249 +1,55 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="72px"
-   height="72px"
-   viewBox="0 0 72 72"
-   version="1.1"
-   id="svg66"
-   sodipodi:docname="enum.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
-  <metadata
-     id="metadata70">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1848"
-     inkscape:window-height="1016"
-     id="namedview68"
-     showgrid="false"
-     inkscape:zoom="5.9861111"
-     inkscape:cx="35.68296"
-     inkscape:cy="41.46843"
-     inkscape:window-x="72"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg66" />
-  <defs
-     id="defs50">
-    <filter
-       x="-50%"
-       y="-50%"
-       width="200%"
-       height="200%"
-       filterUnits="objectBoundingBox"
-       id="filter-1">
-      <feOffset
-         dx="0"
-         dy="4"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset2" />
-      <feGaussianBlur
-         stdDeviation="2"
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         id="feGaussianBlur4" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0"
-         in="shadowBlurOuter1"
-         type="matrix"
-         result="shadowMatrixOuter1"
-         id="feColorMatrix6" />
-      <feMerge
-         id="feMerge12">
-        <feMergeNode
-           in="shadowMatrixOuter1"
-           id="feMergeNode8" />
-        <feMergeNode
-           in="SourceGraphic"
-           id="feMergeNode10" />
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="72px" height="72px" viewBox="0 0 72 72" version="1.1">
+  <defs>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
       </feMerge>
     </filter>
-    <circle
-       id="path-2"
-       cx="32"
-       cy="32"
-       r="32" />
-    <filter
-       x="-50%"
-       y="-50%"
-       width="200%"
-       height="200%"
-       filterUnits="objectBoundingBox"
-       id="filter-4">
-      <feOffset
-         dx="0"
-         dy="4"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset16" />
-      <feGaussianBlur
-         stdDeviation="2"
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         id="feGaussianBlur18" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0"
-         in="shadowBlurOuter1"
-         type="matrix"
-         result="shadowMatrixOuter1"
-         id="feColorMatrix20" />
-      <feOffset
-         dx="0"
-         dy="1"
-         in="SourceAlpha"
-         result="shadowOffsetInner1"
-         id="feOffset22" />
-      <feGaussianBlur
-         stdDeviation="0"
-         in="shadowOffsetInner1"
-         result="shadowBlurInner1"
-         id="feGaussianBlur24" />
-      <feComposite
-         in="shadowBlurInner1"
-         in2="SourceAlpha"
-         operator="arithmetic"
-         k2="-1"
-         k3="1"
-         result="shadowInnerInner1"
-         id="feComposite26" />
-      <feColorMatrix
-         values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0"
-         in="shadowInnerInner1"
-         type="matrix"
-         result="shadowMatrixInner1"
-         id="feColorMatrix28" />
-      <feOffset
-         dx="0"
-         dy="-1"
-         in="SourceAlpha"
-         result="shadowOffsetInner2"
-         id="feOffset30" />
-      <feGaussianBlur
-         stdDeviation="0"
-         in="shadowOffsetInner2"
-         result="shadowBlurInner2"
-         id="feGaussianBlur32" />
-      <feComposite
-         in="shadowBlurInner2"
-         in2="SourceAlpha"
-         operator="arithmetic"
-         k2="-1"
-         k3="1"
-         result="shadowInnerInner2"
-         id="feComposite34" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0"
-         in="shadowInnerInner2"
-         type="matrix"
-         result="shadowMatrixInner2"
-         id="feColorMatrix36" />
-      <feMerge
-         id="feMerge46">
-        <feMergeNode
-           in="shadowMatrixOuter1"
-           id="feMergeNode38" />
-        <feMergeNode
-           in="SourceGraphic"
-           id="feMergeNode40" />
-        <feMergeNode
-           in="shadowMatrixInner1"
-           id="feMergeNode42" />
-        <feMergeNode
-           in="shadowMatrixInner2"
-           id="feMergeNode44" />
+    <circle id="path-2" cx="32" cy="32" r="32"/>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"/>
+      <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"/>
+      <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"/>
+      <feOffset dx="0" dy="-1" in="SourceAlpha" result="shadowOffsetInner2"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner2" result="shadowBlurInner2"/>
+      <feComposite in="shadowBlurInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowInnerInner2" type="matrix" result="shadowMatrixInner2"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+        <feMergeNode in="shadowMatrixInner1"/>
+        <feMergeNode in="shadowMatrixInner2"/>
       </feMerge>
     </filter>
-    <path
-       id="path-5"
-       d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z" />
+    <path id="path-5" d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z"/>
   </defs>
-  <g
-     id="Artboard-1"
-     transform="translate(-298,-87)"
-     style="fill:#b66722;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1">
-    <g
-       id="BG"
-       transform="translate(302,91)"
-       style="fill:#b66722;fill-opacity:1">
-      <g
-         id="Icon"
-         style="fill:#b66722;fill-opacity:1">
-        <mask
-           id="mask-3"
-           fill="#ffffff">
-          <use
-             xlink:href="#path-2"
-             id="use52"
-             x="0"
-             y="0"
-             width="100%"
-             height="100%" />
-        </mask>
-        <use
-           id="Mask"
-           fill="#44ad7d"
-           filter="url(#filter-1)"
-           xlink:href="#path-2"
-           x="0"
-           y="0"
-           width="100%"
-           height="100%"
-           style="fill:#b66722;fill-opacity:1" />
-        <mask
-           id="mask-6"
-           fill="#ffffff">
-          <use
-             xlink:href="#path-5"
-             id="use56"
-             x="0"
-             y="0"
-             width="100%"
-             height="100%" />
-        </mask>
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Artboard-1" transform="translate(-298.000000, -91.000000)">
+      <g id="BG" transform="translate(302.000000, 91.000000)">
+        <g id="Icon">
+          <mask id="mask-3" fill="white">
+            <use xlink:href="#path-2"/>
+          </mask>
+          <use id="Mask" fill="saddlebrown" filter="url(#filter-1)" xlink:href="#path-2"/>
+          <mask id="mask-6" fill="white">
+            <use xlink:href="#path-5"/>
+          </mask>
+          <text id="C" mask="url(#mask-6)" font-family="Open Sans, Helvetica Neueu, Sans-serif" font-size="40" font-weight="normal" fill="#FFFFFF">
+            <tspan x="21" y="43">
+              e
+            </tspan>
+          </text>
+        </g>
       </g>
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="E">
-    <text
-       id="C"
-       mask="url(#mask-6)"
-       font-family="'Open Sans', 'Helvetica Neueu', Sans-serif"
-       font-size="40px"
-       font-weight="normal"
-       fill="#ffffff"
-       transform="translate(6.65625,-0.08203125)"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1"><tspan
-         x="17"
-         y="47"
-         id="tspan59"
-         style="fill:#ffffff;fill-opacity:1">e</tspan></text>
-  </g>
 </svg>
+
diff --git a/scaladoc/resources/dotty_res/images/enum_comp.svg b/scaladoc/resources/dotty_res/images/enum_comp.svg
index d601c7692689..b38308b68106 100644
--- a/scaladoc/resources/dotty_res/images/enum_comp.svg
+++ b/scaladoc/resources/dotty_res/images/enum_comp.svg
@@ -1,273 +1,58 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="72px"
-   height="72px"
-   viewBox="0 0 72 72"
-   version="1.1"
-   id="svg71"
-   sodipodi:docname="enum_comp.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
-  <metadata
-     id="metadata75">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1848"
-     inkscape:window-height="1016"
-     id="namedview73"
-     showgrid="false"
-     inkscape:zoom="5.9861111"
-     inkscape:cx="5.30935"
-     inkscape:cy="44.795589"
-     inkscape:window-x="72"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg71" />
-  <defs
-     id="defs50">
-    <filter
-       x="-50%"
-       y="-50%"
-       width="200%"
-       height="200%"
-       filterUnits="objectBoundingBox"
-       id="filter-1">
-      <feOffset
-         dx="0"
-         dy="4"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset2" />
-      <feGaussianBlur
-         stdDeviation="2"
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         id="feGaussianBlur4" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0"
-         in="shadowBlurOuter1"
-         type="matrix"
-         result="shadowMatrixOuter1"
-         id="feColorMatrix6" />
-      <feMerge
-         id="feMerge12">
-        <feMergeNode
-           in="shadowMatrixOuter1"
-           id="feMergeNode8" />
-        <feMergeNode
-           in="SourceGraphic"
-           id="feMergeNode10" />
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="72px" height="72px" viewBox="0 0 72 72" version="1.1">
+  <defs>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
       </feMerge>
     </filter>
-    <circle
-       id="path-2"
-       cx="32"
-       cy="32"
-       r="32" />
-    <filter
-       x="-50%"
-       y="-50%"
-       width="200%"
-       height="200%"
-       filterUnits="objectBoundingBox"
-       id="filter-4">
-      <feOffset
-         dx="0"
-         dy="4"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset16" />
-      <feGaussianBlur
-         stdDeviation="2"
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         id="feGaussianBlur18" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0"
-         in="shadowBlurOuter1"
-         type="matrix"
-         result="shadowMatrixOuter1"
-         id="feColorMatrix20" />
-      <feOffset
-         dx="0"
-         dy="1"
-         in="SourceAlpha"
-         result="shadowOffsetInner1"
-         id="feOffset22" />
-      <feGaussianBlur
-         stdDeviation="0"
-         in="shadowOffsetInner1"
-         result="shadowBlurInner1"
-         id="feGaussianBlur24" />
-      <feComposite
-         in="shadowBlurInner1"
-         in2="SourceAlpha"
-         operator="arithmetic"
-         k2="-1"
-         k3="1"
-         result="shadowInnerInner1"
-         id="feComposite26" />
-      <feColorMatrix
-         values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0"
-         in="shadowInnerInner1"
-         type="matrix"
-         result="shadowMatrixInner1"
-         id="feColorMatrix28" />
-      <feOffset
-         dx="0"
-         dy="-1"
-         in="SourceAlpha"
-         result="shadowOffsetInner2"
-         id="feOffset30" />
-      <feGaussianBlur
-         stdDeviation="0"
-         in="shadowOffsetInner2"
-         result="shadowBlurInner2"
-         id="feGaussianBlur32" />
-      <feComposite
-         in="shadowBlurInner2"
-         in2="SourceAlpha"
-         operator="arithmetic"
-         k2="-1"
-         k3="1"
-         result="shadowInnerInner2"
-         id="feComposite34" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0"
-         in="shadowInnerInner2"
-         type="matrix"
-         result="shadowMatrixInner2"
-         id="feColorMatrix36" />
-      <feMerge
-         id="feMerge46">
-        <feMergeNode
-           in="shadowMatrixOuter1"
-           id="feMergeNode38" />
-        <feMergeNode
-           in="SourceGraphic"
-           id="feMergeNode40" />
-        <feMergeNode
-           in="shadowMatrixInner1"
-           id="feMergeNode42" />
-        <feMergeNode
-           in="shadowMatrixInner2"
-           id="feMergeNode44" />
+    <circle id="path-2" cx="32" cy="32" r="32"/>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"/>
+      <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"/>
+      <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"/>
+      <feOffset dx="0" dy="-1" in="SourceAlpha" result="shadowOffsetInner2"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner2" result="shadowBlurInner2"/>
+      <feComposite in="shadowBlurInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowInnerInner2" type="matrix" result="shadowMatrixInner2"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+        <feMergeNode in="shadowMatrixInner1"/>
+        <feMergeNode in="shadowMatrixInner2"/>
       </feMerge>
     </filter>
-    <path
-       id="path-5"
-       d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z" />
+    <path id="path-5" d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z"/>
   </defs>
-  <g
-     id="Page-1"
-     stroke="none"
-     stroke-width="1"
-     fill="none"
-     fill-rule="evenodd"
-     transform="translate(0,4)">
-    <g
-       id="Artboard-1"
-       transform="translate(-298,-91)">
-      <g
-         id="BG"
-         transform="translate(302,91)">
-        <g
-           id="Icon">
-          <mask
-             id="mask-3"
-             fill="#ffffff">
-            <use
-               xlink:href="#path-2"
-               id="use52"
-               x="0"
-               y="0"
-               width="100%"
-               height="100%" />
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Artboard-1" transform="translate(-298.000000, -91.000000)">
+      <g id="BG" transform="translate(302.000000, 91.000000)">
+        <g id="Icon">
+          <mask id="mask-3" fill="white">
+            <use xlink:href="#path-2"/>
           </mask>
-          <use
-             id="Mask"
-             fill="#2c6c8d"
-             filter="url(#filter-1)"
-             xlink:href="#path-2"
-             x="0"
-             y="0"
-             width="100%"
-             height="100%" />
-          <rect
-             id="Rectangle-2"
-             opacity="0.3"
-             fill="#000000"
-             mask="url(#mask-3)"
-             x="-8"
-             y="33"
-             width="80"
-             height="31" />
-          <mask
-             id="mask-6"
-             fill="#ffffff">
-            <use
-               xlink:href="#path-5"
-               id="use57"
-               x="0"
-               y="0"
-               width="100%"
-               height="100%" />
+          <use id="Mask" fill="#2C6C8D" filter="url(#filter-1)" xlink:href="#path-2"/>
+          <rect id="Rectangle-2" opacity="0.3" fill="#000000" mask="url(#mask-3)" x="-8" y="33" width="80" height="31"/>
+          <mask id="mask-6" fill="white">
+            <use xlink:href="#path-5"/>
           </mask>
-          <use
-             id="use60"
-             fill="#B66722"
-             filter="url(#filter-4)"
-             xlink:href="#path-5"
-             x="0"
-             y="0"
-             width="100%"
-             height="100%" />
-          <text
-             id="C"
-             mask="url(#mask-6)"
-             font-family="'Open Sans', 'Helvetica Neueu', Sans-serif"
-             font-size="40px"
-             font-weight="normal"
-             fill="#ffffff"
-             transform="translate(2.65625,-4.0820312)"><tspan
-               x="17"
-               y="47"
-               id="tspan62">e</tspan></text>
-          <rect
-             id="rect65"
-             opacity="0.190065"
-             fill="#000000"
-             mask="url(#mask-6)"
-             x="-8"
-             y="2"
-             width="80"
-             height="31" />
+          <use id="Mask" fill="saddlebrown" filter="url(#filter-4)" xlink:href="#path-5"/>
+          <text id="C" mask="url(#mask-6)" font-family="Open Sans, Helvetica Neueu, Sans-serif" font-size="40" font-weight="normal" fill="#FFFFFF">
+            <tspan x="21" y="43">
+              e
+            </tspan>
+          </text>
+          <rect id="Rectangle-2" opacity="0.190065299" fill="#000000" mask="url(#mask-6)" x="-8" y="2" width="80" height="31"/>
         </g>
       </g>
     </g>
   </g>
 </svg>
+
diff --git a/scaladoc/resources/dotty_res/images/given.svg b/scaladoc/resources/dotty_res/images/given.svg
index 02e882665efc..d210eddbc9d5 100644
--- a/scaladoc/resources/dotty_res/images/given.svg
+++ b/scaladoc/resources/dotty_res/images/given.svg
@@ -1,250 +1,55 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="72px"
-   height="72px"
-   viewBox="0 0 72 72"
-   version="1.1"
-   id="svg66"
-   sodipodi:docname="given.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
-  <metadata
-     id="metadata70">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1848"
-     inkscape:window-height="1016"
-     id="namedview68"
-     showgrid="false"
-     inkscape:zoom="5.9861111"
-     inkscape:cx="35.68296"
-     inkscape:cy="41.46843"
-     inkscape:window-x="72"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer3"
-     inkscape:document-rotation="0" />
-  <defs
-     id="defs50">
-    <filter
-       x="-50%"
-       y="-50%"
-       width="200%"
-       height="200%"
-       filterUnits="objectBoundingBox"
-       id="filter-1">
-      <feOffset
-         dx="0"
-         dy="4"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset2" />
-      <feGaussianBlur
-         stdDeviation="2"
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         id="feGaussianBlur4" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0"
-         in="shadowBlurOuter1"
-         type="matrix"
-         result="shadowMatrixOuter1"
-         id="feColorMatrix6" />
-      <feMerge
-         id="feMerge12">
-        <feMergeNode
-           in="shadowMatrixOuter1"
-           id="feMergeNode8" />
-        <feMergeNode
-           in="SourceGraphic"
-           id="feMergeNode10" />
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="72px" height="72px" viewBox="0 0 72 72" version="1.1">
+  <defs>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
       </feMerge>
     </filter>
-    <circle
-       id="path-2"
-       cx="32"
-       cy="32"
-       r="32" />
-    <filter
-       x="-50%"
-       y="-50%"
-       width="200%"
-       height="200%"
-       filterUnits="objectBoundingBox"
-       id="filter-4">
-      <feOffset
-         dx="0"
-         dy="4"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset16" />
-      <feGaussianBlur
-         stdDeviation="2"
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         id="feGaussianBlur18" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0"
-         in="shadowBlurOuter1"
-         type="matrix"
-         result="shadowMatrixOuter1"
-         id="feColorMatrix20" />
-      <feOffset
-         dx="0"
-         dy="1"
-         in="SourceAlpha"
-         result="shadowOffsetInner1"
-         id="feOffset22" />
-      <feGaussianBlur
-         stdDeviation="0"
-         in="shadowOffsetInner1"
-         result="shadowBlurInner1"
-         id="feGaussianBlur24" />
-      <feComposite
-         in="shadowBlurInner1"
-         in2="SourceAlpha"
-         operator="arithmetic"
-         k2="-1"
-         k3="1"
-         result="shadowInnerInner1"
-         id="feComposite26" />
-      <feColorMatrix
-         values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0"
-         in="shadowInnerInner1"
-         type="matrix"
-         result="shadowMatrixInner1"
-         id="feColorMatrix28" />
-      <feOffset
-         dx="0"
-         dy="-1"
-         in="SourceAlpha"
-         result="shadowOffsetInner2"
-         id="feOffset30" />
-      <feGaussianBlur
-         stdDeviation="0"
-         in="shadowOffsetInner2"
-         result="shadowBlurInner2"
-         id="feGaussianBlur32" />
-      <feComposite
-         in="shadowBlurInner2"
-         in2="SourceAlpha"
-         operator="arithmetic"
-         k2="-1"
-         k3="1"
-         result="shadowInnerInner2"
-         id="feComposite34" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0"
-         in="shadowInnerInner2"
-         type="matrix"
-         result="shadowMatrixInner2"
-         id="feColorMatrix36" />
-      <feMerge
-         id="feMerge46">
-        <feMergeNode
-           in="shadowMatrixOuter1"
-           id="feMergeNode38" />
-        <feMergeNode
-           in="SourceGraphic"
-           id="feMergeNode40" />
-        <feMergeNode
-           in="shadowMatrixInner1"
-           id="feMergeNode42" />
-        <feMergeNode
-           in="shadowMatrixInner2"
-           id="feMergeNode44" />
+    <circle id="path-2" cx="32" cy="32" r="32"/>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"/>
+      <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"/>
+      <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"/>
+      <feOffset dx="0" dy="-1" in="SourceAlpha" result="shadowOffsetInner2"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner2" result="shadowBlurInner2"/>
+      <feComposite in="shadowBlurInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowInnerInner2" type="matrix" result="shadowMatrixInner2"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+        <feMergeNode in="shadowMatrixInner1"/>
+        <feMergeNode in="shadowMatrixInner2"/>
       </feMerge>
     </filter>
-    <path
-       id="path-5"
-       d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z" />
+    <path id="path-5" d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z"/>
   </defs>
-  <g
-     id="Artboard-1"
-     transform="translate(-298,-87)"
-     style="fill:#b66722;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1">
-    <g
-       id="BG"
-       transform="translate(302,91)"
-       style="fill:#b66722;fill-opacity:1">
-      <g
-         id="Icon"
-         style="fill:#b66722;fill-opacity:1">
-        <mask
-           id="mask-3"
-           fill="#ffffff">
-          <use
-             xlink:href="#path-2"
-             id="use52"
-             x="0"
-             y="0"
-             width="100%"
-             height="100%" />
-        </mask>
-        <use
-           id="Mask"
-           fill="#7521bf"
-           filter="url(#filter-1)"
-           xlink:href="#path-2"
-           x="0"
-           y="0"
-           width="100%"
-           height="100%"
-           style="fill:#7d2fc2;fill-opacity:1" />
-        <mask
-           id="mask-6"
-           fill="#ffffff">
-          <use
-             xlink:href="#path-5"
-             id="use56"
-             x="0"
-             y="0"
-             width="100%"
-             height="100%" />
-        </mask>
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Artboard-1" transform="translate(-298.000000, -91.000000)">
+      <g id="BG" transform="translate(302.000000, 91.000000)">
+        <g id="Icon">
+          <mask id="mask-3" fill="white">
+            <use xlink:href="#path-2"/>
+          </mask>
+          <use id="Mask" fill="purple" filter="url(#filter-1)" xlink:href="#path-2"/>
+          <mask id="mask-6" fill="white">
+            <use xlink:href="#path-5"/>
+          </mask>
+          <text id="C" mask="url(#mask-6)" font-family="Open Sans, Helvetica Neueu, Sans-serif" font-size="40" font-weight="normal" fill="#FFFFFF">
+            <tspan x="21" y="39">
+              g
+            </tspan>
+          </text>
+        </g>
       </g>
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="E">
-    <text
-       id="C"
-       mask="url(#mask-6)"
-       font-family="'Open Sans', 'Helvetica Neueu', Sans-serif"
-       font-size="40px"
-       font-weight="normal"
-       fill="#ffffff"
-       transform="translate(7.0175781,-3.9589844)"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1"><tspan
-         x="17"
-         y="47"
-         id="tspan59"
-         style="fill:#ffffff;fill-opacity:1">g</tspan></text>
-  </g>
 </svg>
+
diff --git a/scaladoc/resources/dotty_res/images/method.svg b/scaladoc/resources/dotty_res/images/method.svg
new file mode 100644
index 000000000000..07f4d06b1b24
--- /dev/null
+++ b/scaladoc/resources/dotty_res/images/method.svg
@@ -0,0 +1,54 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="72px" height="72px" viewBox="0 0 72 72" version="1.1">
+  <defs>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+    <circle id="path-2" cx="32" cy="32" r="32"/>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"/>
+      <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"/>
+      <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"/>
+      <feOffset dx="0" dy="-1" in="SourceAlpha" result="shadowOffsetInner2"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner2" result="shadowBlurInner2"/>
+      <feComposite in="shadowBlurInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowInnerInner2" type="matrix" result="shadowMatrixInner2"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+        <feMergeNode in="shadowMatrixInner1"/>
+        <feMergeNode in="shadowMatrixInner2"/>
+      </feMerge>
+    </filter>
+    <path id="path-5" d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z"/>
+  </defs>
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Artboard-1" transform="translate(-298.000000, -91.000000)">
+      <g id="BG" transform="translate(302.000000, 91.000000)">
+        <g id="Icon">
+          <mask id="mask-3" fill="white">
+            <use xlink:href="#path-2"/>
+          </mask>
+          <use id="Mask" fill="darkgreen" filter="url(#filter-1)" xlink:href="#path-2"/>
+          <mask id="mask-6" fill="white">
+            <use xlink:href="#path-5"/>
+          </mask>
+          <text id="C" mask="url(#mask-6)" font-family="Open Sans, Helvetica Neueu, Sans-serif" font-size="40" font-weight="normal" fill="#FFFFFF">
+            <tspan x="19" y="44">
+              d
+            </tspan>
+          </text>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/scaladoc/resources/dotty_res/images/package.svg b/scaladoc/resources/dotty_res/images/package.svg
new file mode 100644
index 000000000000..35d916dbfddb
--- /dev/null
+++ b/scaladoc/resources/dotty_res/images/package.svg
@@ -0,0 +1,54 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="72px" height="72px" viewBox="0 0 72 72" version="1.1">
+  <defs>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+    <circle id="path-2" cx="32" cy="32" r="32"/>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"/>
+      <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"/>
+      <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"/>
+      <feOffset dx="0" dy="-1" in="SourceAlpha" result="shadowOffsetInner2"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner2" result="shadowBlurInner2"/>
+      <feComposite in="shadowBlurInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowInnerInner2" type="matrix" result="shadowMatrixInner2"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+        <feMergeNode in="shadowMatrixInner1"/>
+        <feMergeNode in="shadowMatrixInner2"/>
+      </feMerge>
+    </filter>
+    <path id="path-5" d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z"/>
+  </defs>
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Artboard-1" transform="translate(-298.000000, -91.000000)">
+      <g id="BG" transform="translate(302.000000, 91.000000)">
+        <g id="Icon">
+          <mask id="mask-3" fill="white">
+            <use xlink:href="#path-2"/>
+          </mask>
+          <use id="Mask" fill="goldenrod" filter="url(#filter-1)" xlink:href="#path-2"/>
+          <mask id="mask-6" fill="white">
+            <use xlink:href="#path-5"/>
+          </mask>
+          <text id="C" mask="url(#mask-6)" font-family="Open Sans, Helvetica Neueu, Sans-serif" font-size="40" font-weight="normal" fill="#FFFFFF">
+            <tspan x="20" y="47">
+              P
+            </tspan>
+          </text>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/scaladoc/resources/dotty_res/images/scaladoc_logo.svg b/scaladoc/resources/dotty_res/images/scaladoc_logo.svg
index 40101df90c9d..177451963957 100644
--- a/scaladoc/resources/dotty_res/images/scaladoc_logo.svg
+++ b/scaladoc/resources/dotty_res/images/scaladoc_logo.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 680 270.1"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:none;}.cls-3{fill:#7f0c1d;opacity:0.25;}.cls-4,.cls-5{opacity:0.75;}.cls-4{fill:url(#linear-gradient-2);}.cls-5{fill:url(#linear-gradient-3);}.cls-6{fill:#fff;}.cls-7{fill:url(#linear-gradient-4);}.cls-8{fill:url(#linear-gradient-5);}</style><linearGradient id="linear-gradient" x1="58.49" y1="135.05" x2="164.99" y2="135.05" gradientUnits="userSpaceOnUse"><stop offset="0.04" stop-color="#b92d2a"/><stop offset="0.29" stop-color="#e42d2a"/><stop offset="0.42" stop-color="#dd312e"/><stop offset="0.81" stop-color="#df3e3c"/><stop offset="1" stop-color="#e4322f"/></linearGradient><linearGradient id="linear-gradient-2" x1="85.69" y1="146.74" x2="148.67" y2="146.74" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#480c13"/><stop offset="0.17" stop-color="#520c15"/><stop offset="0.44" stop-color="#6c0c1a"/><stop offset="0.61" stop-color="#7f0c1d"/></linearGradient><linearGradient id="linear-gradient-3" x1="85.69" y1="115.25" x2="148.67" y2="115.25" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-4" x1="148.74" y1="86.25" x2="114.38" y2="115.8" gradientUnits="userSpaceOnUse"><stop offset="0" stop-opacity="0.7"/><stop offset="0.7" stop-opacity="0.3"/><stop offset="1" stop-color="#4f4f4f" stop-opacity="0.1"/></linearGradient><linearGradient id="linear-gradient-5" x1="128.87" y1="105.31" x2="151.2" y2="82.99" gradientUnits="userSpaceOnUse"><stop offset="0.2" stop-color="#7f0c1d"/><stop offset="0.74" stop-color="#7f0c1d"/><stop offset="0.93" stop-color="#590c16"/><stop offset="1" stop-color="#480c13"/></linearGradient></defs><path d="M240.7,114.31a5.22,5.22,0,0,1-1.28,1.5,2.81,2.81,0,0,1-1.68.47,4.16,4.16,0,0,1-2.13-.69c-.76-.47-1.65-1-2.67-1.51a25.19,25.19,0,0,0-3.5-1.5,14,14,0,0,0-4.62-.7q-4.66,0-7,2.09a7,7,0,0,0-2.33,5.45,5.08,5.08,0,0,0,1.28,3.57,11.13,11.13,0,0,0,3.36,2.44,31.34,31.34,0,0,0,4.73,1.84q2.65.81,5.43,1.77a47.85,47.85,0,0,1,5.43,2.27,19.36,19.36,0,0,1,4.73,3.27,15.06,15.06,0,0,1,3.37,4.83,16.92,16.92,0,0,1,1.28,6.93,22.3,22.3,0,0,1-1.55,8.32,19.6,19.6,0,0,1-4.47,6.77,20.64,20.64,0,0,1-7.2,4.56,26.82,26.82,0,0,1-9.71,1.66A30.69,30.69,0,0,1,216,167a35.45,35.45,0,0,1-5.92-1.75,32.75,32.75,0,0,1-5.36-2.69,24.28,24.28,0,0,1-4.4-3.5l4-6.37a3.92,3.92,0,0,1,1.3-1.19,3.39,3.39,0,0,1,1.71-.47,4.6,4.6,0,0,1,2.55.9c.9.59,1.93,1.25,3.1,2a24.38,24.38,0,0,0,4.06,2,15.28,15.28,0,0,0,5.54.9q4.71,0,7.29-2.15t2.58-6.42a6,6,0,0,0-1.28-4,10.3,10.3,0,0,0-3.34-2.56,26.31,26.31,0,0,0-4.71-1.77c-1.77-.49-3.57-1-5.43-1.64a45.06,45.06,0,0,1-5.43-2.15,16.89,16.89,0,0,1-4.71-3.32,15.84,15.84,0,0,1-3.34-5.11,19.79,19.79,0,0,1-1.28-7.59,18.09,18.09,0,0,1,5.65-13.1,21.3,21.3,0,0,1,6.85-4.26,25.14,25.14,0,0,1,9.3-1.61,31.64,31.64,0,0,1,10.88,1.81,24.53,24.53,0,0,1,8.46,5Z"/><path d="M286.64,131a5.07,5.07,0,0,1-1.08,1.09,2.57,2.57,0,0,1-1.52.39,3.26,3.26,0,0,1-1.73-.52c-.55-.34-1.19-.72-1.91-1.12a15,15,0,0,0-2.55-1.12,11.17,11.17,0,0,0-3.68-.52,10.85,10.85,0,0,0-4.83,1A9,9,0,0,0,266,133.1a13,13,0,0,0-2,4.58,26,26,0,0,0-.65,6.06q0,7.08,2.85,10.85a9.23,9.23,0,0,0,7.78,3.77,13.16,13.16,0,0,0,2.94-.29,10,10,0,0,0,2.15-.74,8.41,8.41,0,0,0,1.6-1c.45-.36.87-.69,1.28-1a7.5,7.5,0,0,1,1.21-.75,3.17,3.17,0,0,1,1.37-.29,2.65,2.65,0,0,1,2.24,1.08l3.54,4.49a21.18,21.18,0,0,1-4.21,3.79,21.71,21.71,0,0,1-4.65,2.37,23.32,23.32,0,0,1-4.87,1.22,36.74,36.74,0,0,1-4.89.33,20.74,20.74,0,0,1-8.07-1.59,19.29,19.29,0,0,1-6.68-4.64,22.21,22.21,0,0,1-4.56-7.5,28.5,28.5,0,0,1-1.68-10.13,29,29,0,0,1,1.48-9.42,21.41,21.41,0,0,1,4.35-7.54,20.18,20.18,0,0,1,7.11-5,24.76,24.76,0,0,1,9.8-1.82,23.62,23.62,0,0,1,9.29,1.7,22.57,22.57,0,0,1,7.18,4.94Z"/><path d="M295.48,127.09a27.63,27.63,0,0,1,9-5.49,30.71,30.71,0,0,1,10.68-1.82,19.11,19.11,0,0,1,7.38,1.35,15.64,15.64,0,0,1,5.52,3.74,16.33,16.33,0,0,1,3.47,5.72,21,21,0,0,1,1.22,7.27v29.07H327.1a5.8,5.8,0,0,1-2.67-.49,3.68,3.68,0,0,1-1.5-2.07l-1-3a40.89,40.89,0,0,1-3.38,2.69,19.63,19.63,0,0,1-3.39,2,17.47,17.47,0,0,1-3.75,1.19,22.5,22.5,0,0,1-4.46.41,18,18,0,0,1-5.56-.81,12.09,12.09,0,0,1-4.33-2.4,10.66,10.66,0,0,1-2.81-4,14.35,14.35,0,0,1-1-5.47,11.18,11.18,0,0,1,1.3-5.12,12.59,12.59,0,0,1,4.46-4.64,28.54,28.54,0,0,1,8.44-3.46,59.09,59.09,0,0,1,13.21-1.54v-2.38c0-2.9-.62-5-1.84-6.39a6.77,6.77,0,0,0-5.3-2,13,13,0,0,0-4.26.6,21.08,21.08,0,0,0-3,1.3l-2.4,1.3a5.34,5.34,0,0,1-2.6.61,3.57,3.57,0,0,1-2.18-.65,6.14,6.14,0,0,1-1.46-1.55Zm25.21,20.5a58.43,58.43,0,0,0-7.54.79,18,18,0,0,0-4.78,1.46,6.28,6.28,0,0,0-2.51,2,4.51,4.51,0,0,0-.74,2.49,4.46,4.46,0,0,0,1.5,3.81,6.9,6.9,0,0,0,4.2,1.12,12.07,12.07,0,0,0,5.36-1.1,16.11,16.11,0,0,0,4.51-3.43Z"/><path d="M354.92,100v66.89H342.53V100Z"/><path d="M364.2,127.09a27.67,27.67,0,0,1,9-5.49,30.71,30.71,0,0,1,10.68-1.82,19.11,19.11,0,0,1,7.38,1.35,15.69,15.69,0,0,1,5.51,3.74,16.5,16.5,0,0,1,3.48,5.72,21,21,0,0,1,1.21,7.27v29.07h-5.65a5.75,5.75,0,0,1-2.67-.49,3.68,3.68,0,0,1-1.5-2.07l-1-3a41,41,0,0,1-3.39,2.69,19.55,19.55,0,0,1-3.38,2,17.47,17.47,0,0,1-3.75,1.19,22.5,22.5,0,0,1-4.46.41,18.1,18.1,0,0,1-5.57-.81,12.26,12.26,0,0,1-4.33-2.4,10.64,10.64,0,0,1-2.8-4,14.16,14.16,0,0,1-1-5.47,11.19,11.19,0,0,1,1.31-5.12,12.51,12.51,0,0,1,4.46-4.64,28.58,28.58,0,0,1,8.43-3.46,59.24,59.24,0,0,1,13.21-1.54v-2.38q0-4.35-1.83-6.39a6.78,6.78,0,0,0-5.3-2,13,13,0,0,0-4.26.6,20.58,20.58,0,0,0-3,1.3l-2.4,1.3a5.35,5.35,0,0,1-2.61.61,3.56,3.56,0,0,1-2.17-.65A6.14,6.14,0,0,1,366.4,131Zm25.21,20.5a58.25,58.25,0,0,0-7.53.79,17.88,17.88,0,0,0-4.78,1.46,6.28,6.28,0,0,0-2.51,2,5.15,5.15,0,0,0,.76,6.3,6.88,6.88,0,0,0,4.2,1.12,12.07,12.07,0,0,0,5.36-1.1,15.94,15.94,0,0,0,4.5-3.43Z"/><path d="M433.87,101.93a23.42,23.42,0,0,1,7.54,1.16,17.7,17.7,0,0,1,5.94,3.32,15,15,0,0,1,3.88,5.2,16.15,16.15,0,0,1,1.39,6.78,17.62,17.62,0,0,1-.78,5.45,13.21,13.21,0,0,1-2.24,4.22,13.57,13.57,0,0,1-3.53,3.07,19.39,19.39,0,0,1-4.62,2q6.29,1.66,9.45,5.56a15,15,0,0,1,3.16,9.78,18.46,18.46,0,0,1-1.68,8,18,18,0,0,1-4.6,6,20.57,20.57,0,0,1-6.8,3.81,25.37,25.37,0,0,1-8.32,1.33,26.53,26.53,0,0,1-8.75-1.28,18.14,18.14,0,0,1-6.14-3.52,18.79,18.79,0,0,1-4.13-5.32,39.85,39.85,0,0,1-2.74-6.66l3.41-1.44a4.76,4.76,0,0,1,1.89-.4,3.34,3.34,0,0,1,1.59.38,2.46,2.46,0,0,1,1,1.19l.18.38.18.43c.42.87.93,1.84,1.53,2.94a12.48,12.48,0,0,0,2.42,3.07,13.12,13.12,0,0,0,3.79,2.42,14.09,14.09,0,0,0,5.63,1,14.79,14.79,0,0,0,5.9-1.1,12.76,12.76,0,0,0,4.22-2.85,12.06,12.06,0,0,0,2.53-3.9,11.51,11.51,0,0,0,.85-4.26,15.55,15.55,0,0,0-.69-4.76,8.1,8.1,0,0,0-2.51-3.72,12.92,12.92,0,0,0-5-2.47,31.19,31.19,0,0,0-8.23-.9V131a24.9,24.9,0,0,0,7-.85,13.59,13.59,0,0,0,4.73-2.34,8.68,8.68,0,0,0,2.67-3.54,13.4,13.4,0,0,0-.05-9.42,9.23,9.23,0,0,0-2.4-3.41,10,10,0,0,0-3.61-2,14.55,14.55,0,0,0-4.51-.67,13.49,13.49,0,0,0-4.48.72,12,12,0,0,0-3.66,2,11.66,11.66,0,0,0-2.67,3,14.26,14.26,0,0,0-1.61,3.83,3.55,3.55,0,0,1-1.08,1.88,2.82,2.82,0,0,1-1.84.58,3.77,3.77,0,0,1-.47,0l-.56-.06-4.17-.71a23.29,23.29,0,0,1,2.42-7.78,18.64,18.64,0,0,1,4.55-5.68,19.68,19.68,0,0,1,6.33-3.48A24.25,24.25,0,0,1,433.87,101.93Z"/><path d="M496.63,166.93a2,2,0,0,1-2.15-1.66l-.72-5.52a23.87,23.87,0,0,1-6.66,5.68,17.08,17.08,0,0,1-8.59,2.13,16.29,16.29,0,0,1-7.09-1.51,14.76,14.76,0,0,1-5.43-4.41,21.08,21.08,0,0,1-3.45-7.27,37.35,37.35,0,0,1-1.21-10,31.26,31.26,0,0,1,1.34-9.35,22.75,22.75,0,0,1,3.88-7.51A17.75,17.75,0,0,1,481,120.68a16.48,16.48,0,0,1,7.13,1.41,17.11,17.11,0,0,1,5.29,4V100.85h8v66.08Zm-15.48-5.83a12.85,12.85,0,0,0,6.85-1.8,19.57,19.57,0,0,0,5.4-5.07v-22a12.6,12.6,0,0,0-4.82-4.15,14,14,0,0,0-5.81-1.19q-6.37,0-9.78,4.53t-3.41,12.92a32.85,32.85,0,0,0,.76,7.61,14.57,14.57,0,0,0,2.25,5.2,8.77,8.77,0,0,0,3.63,3A12.35,12.35,0,0,0,481.15,161.1Z"/><path d="M533.19,120.77a23.32,23.32,0,0,1,9,1.66,18.87,18.87,0,0,1,6.82,4.71,20.74,20.74,0,0,1,4.3,7.38,31.75,31.75,0,0,1,0,19.35,20.73,20.73,0,0,1-4.3,7.36,18.7,18.7,0,0,1-6.82,4.69,25.49,25.49,0,0,1-18,0,18.78,18.78,0,0,1-6.84-4.69,20.68,20.68,0,0,1-4.35-7.36,31.36,31.36,0,0,1,0-19.35,20.68,20.68,0,0,1,4.35-7.38,19,19,0,0,1,6.84-4.71A23.23,23.23,0,0,1,533.19,120.77Zm0,40.55q6.73,0,10-4.51t3.32-12.58q0-8.11-3.32-12.65t-10-4.53a14.08,14.08,0,0,0-5.92,1.16,11.09,11.09,0,0,0-4.19,3.37,15.08,15.08,0,0,0-2.52,5.4,29.19,29.19,0,0,0-.83,7.25,28.83,28.83,0,0,0,.83,7.22,14.8,14.8,0,0,0,2.52,5.36,11.23,11.23,0,0,0,4.19,3.35A14.08,14.08,0,0,0,533.19,161.32Z"/><path d="M595.69,129.56a3.54,3.54,0,0,1-.72.76,1.71,1.71,0,0,1-1,.27,2.51,2.51,0,0,1-1.46-.56,23.23,23.23,0,0,0-2-1.23,17.22,17.22,0,0,0-2.94-1.24,14,14,0,0,0-4.24-.56,13.8,13.8,0,0,0-5.87,1.19,11.39,11.39,0,0,0-4.29,3.43,15.58,15.58,0,0,0-2.6,5.43,27.09,27.09,0,0,0-.87,7.13,26,26,0,0,0,.94,7.34,16,16,0,0,0,2.64,5.38,11.3,11.3,0,0,0,4.15,3.32,12.74,12.74,0,0,0,5.5,1.15,13.91,13.91,0,0,0,4.8-.7,14.35,14.35,0,0,0,3.14-1.55,20.75,20.75,0,0,0,2.06-1.54,2.47,2.47,0,0,1,1.62-.7,1.67,1.67,0,0,1,1.52.76l2.25,2.92a17.4,17.4,0,0,1-7.4,5.32,26.33,26.33,0,0,1-9.38,1.68,20,20,0,0,1-7.92-1.57,18.13,18.13,0,0,1-6.35-4.56A21.71,21.71,0,0,1,563,154.1a29.56,29.56,0,0,1-1.54-9.92,30,30,0,0,1,1.41-9.37,21.25,21.25,0,0,1,4.13-7.43,18.71,18.71,0,0,1,6.7-4.86,22.56,22.56,0,0,1,9.15-1.75,21.64,21.64,0,0,1,8.44,1.54,20.2,20.2,0,0,1,6.5,4.38Z"/><path class="cls-1" d="M163.55,110.14V191.5a8,8,0,0,1-8,8h-77a7.77,7.77,0,0,1-4.22-1.21l0,0a7.93,7.93,0,0,1-3.7-6.72V78.58a8,8,0,0,1,8-8h45.49a2.64,2.64,0,0,1,1.2.28h0l.13.06.19.1a1.78,1.78,0,0,1,.33.23l37,37a2.61,2.61,0,0,1,.39.64h0A3,3,0,0,1,163.55,110.14Z"/><path class="cls-2" d="M163.43,108.93h-35.5a2.83,2.83,0,0,1-2.52-2.81V70.92a2.67,2.67,0,0,1,.65.39l37,37A2.71,2.71,0,0,1,163.43,108.93Z"/><path class="cls-3" d="M89.26,146.37v7.87c0,1.32,28.62,3.55,47.28,7.87h0c9-2.09,15.69-4.67,15.69-7.87h0v-7.87c0-3.21-6.68-5.79-15.69-7.88h0c-18.66,4.33-47.28,6.55-47.28,7.88"/><path class="cls-3" d="M89.26,114.88v7.87c0,1.33,28.62,3.55,47.28,7.87h0c9-2.09,15.69-4.66,15.69-7.87h0v-7.87c0-3.21-6.68-5.79-15.69-7.87h0c-18.66,4.32-47.28,6.54-47.28,7.87"/><path class="cls-3" d="M89.26,133.51v23.62c0-2,63-5.91,63-15.75h0V117.77c0,9.84-63,13.77-63,15.74"/><path class="cls-3" d="M152.23,105.81v4.09c0,9.84-63,13.78-63,15.73V102c0-1.4,32.16-3.82,50.51-8.67Z"/><path class="cls-3" d="M89.26,165v23.62c0-2,63-5.91,63-15.75h0V149.26c0,9.84-63,13.77-63,15.74"/><path class="cls-4" d="M85.69,142.8v7.88c0,1.32,28.63,3.55,47.28,7.87h0c9-2.09,15.7-4.67,15.7-7.87h0V142.8c0-3.2-6.68-5.78-15.7-7.87h0c-18.65,4.33-47.28,6.55-47.28,7.87"/><path class="cls-5" d="M85.69,111.32v7.87c0,1.32,28.63,3.55,47.28,7.87h0c9-2.09,15.7-4.67,15.7-7.87h0v-7.87c0-3.21-6.68-5.79-15.7-7.88h0c-18.65,4.33-47.28,6.55-47.28,7.88"/><path class="cls-6" d="M85.69,130v23.62c0-2,63-5.91,63-15.75h0V114.21c0,9.84-63,13.77-63,15.74"/><path class="cls-6" d="M148.67,102.25v4.09c0,9.84-63,13.78-63,15.73V98.47c0-1.41,32.16-3.82,50.51-8.68Z"/><path class="cls-6" d="M85.69,161.44v23.61c0-2,63-5.9,63-15.74h0V145.69c0,9.84-63,13.78-63,15.75"/><path class="cls-7" d="M163.55,110.41v7.8l-1.47-1.74a5.48,5.48,0,0,0-5.71-1.75c-8,2.3-27.8,8-37.2,10.11a3.35,3.35,0,0,1-4.09-3.6l4.6-43.39a6.4,6.4,0,0,0-2.91-6.08l-1.85-1.13h9.15v36.69a3.09,3.09,0,0,0,3.09,3.09Z"/><path class="cls-8" d="M163.55,110.14v6.25a6,6,0,0,0-6-5.94h-31a3.12,3.12,0,0,1-2.19-1.11v0a2.91,2.91,0,0,1-.6-1.28,2.63,2.63,0,0,1-.08-.65V76.58a6,6,0,0,0-5.94-6H124a2.74,2.74,0,0,1,1.23.28h0l.13.06.19.1a1.78,1.78,0,0,1,.33.23l37,37a2.61,2.61,0,0,1,.39.64h0A3,3,0,0,1,163.55,110.14Z"/></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 680 270.1"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:none;}.cls-3{fill:#7f0c1d;opacity:0.25;}.cls-4,.cls-5{opacity:0.75;}.cls-4{fill:url(#linear-gradient-2);}.cls-5{fill:url(#linear-gradient-3);}.cls-6{fill:#fff;}.cls-7{fill:url(#linear-gradient-4);}.cls-8{fill:url(#linear-gradient-5);}</style><linearGradient id="linear-gradient" x1="86.94" y1="135.05" x2="193.44" y2="135.05" gradientUnits="userSpaceOnUse"><stop offset="0.04" stop-color="#b92d2a"/><stop offset="0.29" stop-color="#e42d2a"/><stop offset="0.42" stop-color="#dd312e"/><stop offset="0.81" stop-color="#df3e3c"/><stop offset="1" stop-color="#e4322f"/></linearGradient><linearGradient id="linear-gradient-2" x1="114.15" y1="146.74" x2="177.12" y2="146.74" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#480c13"/><stop offset="0.17" stop-color="#520c15"/><stop offset="0.44" stop-color="#6c0c1a"/><stop offset="0.61" stop-color="#7f0c1d"/></linearGradient><linearGradient id="linear-gradient-3" x1="114.15" y1="115.25" x2="177.12" y2="115.25" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-4" x1="177.19" y1="86.25" x2="142.83" y2="115.8" gradientUnits="userSpaceOnUse"><stop offset="0" stop-opacity="0.7"/><stop offset="0.7" stop-opacity="0.3"/><stop offset="1" stop-color="#4f4f4f" stop-opacity="0.1"/></linearGradient><linearGradient id="linear-gradient-5" x1="157.33" y1="105.31" x2="179.65" y2="82.99" gradientUnits="userSpaceOnUse"><stop offset="0.2" stop-color="#7f0c1d"/><stop offset="0.74" stop-color="#7f0c1d"/><stop offset="0.93" stop-color="#590c16"/><stop offset="1" stop-color="#480c13"/></linearGradient></defs><path d="M269.15,114.31a5.21,5.21,0,0,1-1.27,1.5,2.86,2.86,0,0,1-1.69.47,4.16,4.16,0,0,1-2.13-.69c-.76-.47-1.65-1-2.67-1.51a24.68,24.68,0,0,0-3.5-1.5,13.94,13.94,0,0,0-4.62-.7q-4.67,0-7,2.09a7,7,0,0,0-2.33,5.45,5.12,5.12,0,0,0,1.28,3.57,11.13,11.13,0,0,0,3.36,2.44,31.48,31.48,0,0,0,4.74,1.84q2.64.81,5.43,1.77a48.47,48.47,0,0,1,5.42,2.27,19.23,19.23,0,0,1,4.74,3.27,15,15,0,0,1,3.36,4.83,16.92,16.92,0,0,1,1.28,6.93,22.3,22.3,0,0,1-1.55,8.32,19.72,19.72,0,0,1-4.46,6.77,20.82,20.82,0,0,1-7.2,4.56,26.9,26.9,0,0,1-9.71,1.66,30.62,30.62,0,0,1-6.17-.63,35.17,35.17,0,0,1-5.92-1.75,32.85,32.85,0,0,1-5.37-2.69,23.86,23.86,0,0,1-4.39-3.5l3.95-6.37a3.83,3.83,0,0,1,1.3-1.19,3.33,3.33,0,0,1,1.7-.47,4.65,4.65,0,0,1,2.56.9c.9.59,1.93,1.25,3.09,2a24.38,24.38,0,0,0,4.06,2,15.28,15.28,0,0,0,5.54.9q4.71,0,7.29-2.15t2.58-6.42a6,6,0,0,0-1.27-4,10.35,10.35,0,0,0-3.35-2.56,25.74,25.74,0,0,0-4.71-1.77q-2.64-.74-5.43-1.64a44.27,44.27,0,0,1-5.42-2.15,16.6,16.6,0,0,1-4.71-3.32,15.86,15.86,0,0,1-3.35-5.11,19.79,19.79,0,0,1-1.28-7.59A18,18,0,0,1,237,107a21.15,21.15,0,0,1,6.84-4.26,25.19,25.19,0,0,1,9.31-1.61A31.69,31.69,0,0,1,264,102.93a24.57,24.57,0,0,1,8.45,5Z"/><path d="M315.09,131a5.28,5.28,0,0,1-1.07,1.09,2.58,2.58,0,0,1-1.53.39,3.29,3.29,0,0,1-1.73-.52c-.55-.34-1.19-.72-1.9-1.12a15.08,15.08,0,0,0-2.56-1.12,11.13,11.13,0,0,0-3.68-.52,10.8,10.8,0,0,0-4.82,1,9.08,9.08,0,0,0-3.39,2.89,13.15,13.15,0,0,0-2,4.58,26,26,0,0,0-.65,6.06q0,7.08,2.85,10.85a9.25,9.25,0,0,0,7.79,3.77,13.13,13.13,0,0,0,2.93-.29,10.1,10.1,0,0,0,2.16-.74,8.64,8.64,0,0,0,1.59-1c.45-.36.88-.69,1.28-1a8,8,0,0,1,1.21-.75,3.17,3.17,0,0,1,1.37-.29,2.64,2.64,0,0,1,2.24,1.08l3.55,4.49a21,21,0,0,1-8.86,6.16,23.47,23.47,0,0,1-4.87,1.22,37,37,0,0,1-4.89.33A20.79,20.79,0,0,1,292,166a19.29,19.29,0,0,1-6.68-4.64,22.19,22.19,0,0,1-4.55-7.5,28.28,28.28,0,0,1-1.69-10.13,29.25,29.25,0,0,1,1.48-9.42,21.28,21.28,0,0,1,4.36-7.54,20,20,0,0,1,7.11-5,24.69,24.69,0,0,1,9.8-1.82,23.57,23.57,0,0,1,9.28,1.7,22.35,22.35,0,0,1,7.18,4.94Z"/><path d="M323.93,127.09a27.67,27.67,0,0,1,9-5.49,30.65,30.65,0,0,1,10.67-1.82,19.11,19.11,0,0,1,7.38,1.35,15.64,15.64,0,0,1,5.52,3.74,16.5,16.5,0,0,1,3.48,5.72,21,21,0,0,1,1.21,7.27v29.07h-5.65a5.75,5.75,0,0,1-2.67-.49,3.64,3.64,0,0,1-1.51-2.07l-1-3A42.69,42.69,0,0,1,347,164.1a19.27,19.27,0,0,1-3.39,2,17.21,17.21,0,0,1-3.74,1.19,22.53,22.53,0,0,1-4.47.41,18.08,18.08,0,0,1-5.56-.81,12.17,12.17,0,0,1-4.33-2.4,10.64,10.64,0,0,1-2.8-4,14.16,14.16,0,0,1-1-5.47,11.18,11.18,0,0,1,1.3-5.12,12.63,12.63,0,0,1,4.47-4.64,28.47,28.47,0,0,1,8.43-3.46,59.16,59.16,0,0,1,13.21-1.54v-2.38q0-4.35-1.84-6.39a6.75,6.75,0,0,0-5.29-2,12.92,12.92,0,0,0-4.26.6,21.23,21.23,0,0,0-3,1.3l-2.4,1.3a5.29,5.29,0,0,1-2.6.61,3.54,3.54,0,0,1-2.17-.65,6,6,0,0,1-1.46-1.55Zm25.21,20.5a58.63,58.63,0,0,0-7.54.79,17.91,17.91,0,0,0-4.77,1.46,6.39,6.39,0,0,0-2.52,2,4.51,4.51,0,0,0-.74,2.49,4.44,4.44,0,0,0,1.51,3.81,6.86,6.86,0,0,0,4.19,1.12,12,12,0,0,0,5.36-1.1,16,16,0,0,0,4.51-3.43Z"/><path d="M383.37,100v66.89H371V100Z"/><path d="M392.66,127.09a27.63,27.63,0,0,1,9-5.49,30.71,30.71,0,0,1,10.68-1.82,19.11,19.11,0,0,1,7.38,1.35,15.64,15.64,0,0,1,5.52,3.74,16.5,16.5,0,0,1,3.48,5.72,21.24,21.24,0,0,1,1.21,7.27v29.07h-5.66a5.8,5.8,0,0,1-2.67-.49,3.68,3.68,0,0,1-1.5-2.07l-1-3a40.89,40.89,0,0,1-3.38,2.69,19.27,19.27,0,0,1-3.39,2,17.29,17.29,0,0,1-3.75,1.19,22.43,22.43,0,0,1-4.46.41,18,18,0,0,1-5.56-.81,12.09,12.09,0,0,1-4.33-2.4,10.66,10.66,0,0,1-2.81-4,14.35,14.35,0,0,1-1-5.47,11.18,11.18,0,0,1,1.3-5.12,12.59,12.59,0,0,1,4.46-4.64,28.54,28.54,0,0,1,8.44-3.46,59.09,59.09,0,0,1,13.21-1.54v-2.38c0-2.9-.62-5-1.84-6.39a6.76,6.76,0,0,0-5.29-2,13,13,0,0,0-4.27.6,21.08,21.08,0,0,0-3,1.3l-2.4,1.3a5.31,5.31,0,0,1-2.6.61,3.59,3.59,0,0,1-2.18-.65,6.14,6.14,0,0,1-1.46-1.55Zm25.21,20.5a58.43,58.43,0,0,0-7.54.79,18,18,0,0,0-4.78,1.46,6.35,6.35,0,0,0-2.51,2,4.51,4.51,0,0,0-.74,2.49,4.46,4.46,0,0,0,1.5,3.81,6.9,6.9,0,0,0,4.2,1.12,12.07,12.07,0,0,0,5.36-1.1,16.11,16.11,0,0,0,4.51-3.43Z"/><path d="M473.05,166.93a2,2,0,0,1-2.16-1.66l-.71-5.52a24.05,24.05,0,0,1-6.67,5.68,17.05,17.05,0,0,1-8.59,2.13,16.33,16.33,0,0,1-7.09-1.51,14.65,14.65,0,0,1-5.42-4.41,21.09,21.09,0,0,1-3.46-7.27,37.76,37.76,0,0,1-1.21-10,31.26,31.26,0,0,1,1.35-9.35A22.56,22.56,0,0,1,443,127.5a17.75,17.75,0,0,1,14.42-6.82,16.45,16.45,0,0,1,7.13,1.41,17.15,17.15,0,0,1,5.3,4V100.85h8v66.08Zm-15.48-5.83a12.84,12.84,0,0,0,6.84-1.8,19.6,19.6,0,0,0,5.41-5.07v-22A12.69,12.69,0,0,0,465,128.1a13.89,13.89,0,0,0-5.8-1.19q-6.37,0-9.78,4.53T446,144.36a32.85,32.85,0,0,0,.76,7.61,14.56,14.56,0,0,0,2.24,5.2,8.86,8.86,0,0,0,3.64,3A12.31,12.31,0,0,0,457.57,161.1Z"/><path d="M509.61,120.77a23.23,23.23,0,0,1,9,1.66,18.79,18.79,0,0,1,6.82,4.71,20.75,20.75,0,0,1,4.31,7.38,32,32,0,0,1,0,19.35,20.75,20.75,0,0,1-4.31,7.36,18.62,18.62,0,0,1-6.82,4.69,25.49,25.49,0,0,1-18,0,19,19,0,0,1-6.84-4.69,21,21,0,0,1-4.35-7.36,31.55,31.55,0,0,1,0-19.35,21,21,0,0,1,4.35-7.38,19.12,19.12,0,0,1,6.84-4.71A23.32,23.32,0,0,1,509.61,120.77Zm0,40.55q6.72,0,10-4.51T523,144.23q0-8.11-3.32-12.65t-10-4.53a14,14,0,0,0-5.92,1.16,11,11,0,0,0-4.2,3.37A14.91,14.91,0,0,0,497,137a29.19,29.19,0,0,0-.83,7.25,28.83,28.83,0,0,0,.83,7.22,14.63,14.63,0,0,0,2.51,5.36,11.18,11.18,0,0,0,4.2,3.35A14,14,0,0,0,509.61,161.32Z"/><path d="M572.1,129.56a3.54,3.54,0,0,1-.72.76,1.69,1.69,0,0,1-1,.27,2.54,2.54,0,0,1-1.46-.56,22.87,22.87,0,0,0-2-1.23,17.22,17.22,0,0,0-2.94-1.24,15.6,15.6,0,0,0-10.12.63,11.43,11.43,0,0,0-4.28,3.43,15.58,15.58,0,0,0-2.6,5.43,26.67,26.67,0,0,0-.88,7.13,26.36,26.36,0,0,0,.94,7.34,15.83,15.83,0,0,0,2.65,5.38,11.3,11.3,0,0,0,4.15,3.32,12.71,12.71,0,0,0,5.5,1.15,13.91,13.91,0,0,0,4.8-.7,14.58,14.58,0,0,0,3.14-1.55,23.42,23.42,0,0,0,2.06-1.54,2.47,2.47,0,0,1,1.61-.7,1.69,1.69,0,0,1,1.53.76l2.24,2.92a17.34,17.34,0,0,1-7.4,5.32,26.29,26.29,0,0,1-9.38,1.68A19.91,19.91,0,0,1,550,166a18,18,0,0,1-6.35-4.56,21.39,21.39,0,0,1-4.24-7.33,29.55,29.55,0,0,1-1.55-9.92,30,30,0,0,1,1.41-9.37,21.41,21.41,0,0,1,4.13-7.43,18.75,18.75,0,0,1,6.71-4.86,22.53,22.53,0,0,1,9.15-1.75,21.59,21.59,0,0,1,8.43,1.54,20.14,20.14,0,0,1,6.51,4.38Z"/><path class="cls-1" d="M192,110.14V191.5a8,8,0,0,1-8,8h-77a7.74,7.74,0,0,1-4.21-1.21l0,0a7.93,7.93,0,0,1-3.7-6.72V78.58a8,8,0,0,1,8-8h45.48a2.61,2.61,0,0,1,1.2.28h0l.14.06.18.1a1.5,1.5,0,0,1,.33.23l37,37a2.61,2.61,0,0,1,.39.64h0A3,3,0,0,1,192,110.14Z"/><path class="cls-2" d="M191.89,108.93H156.38a2.82,2.82,0,0,1-2.51-2.81V70.92a2.81,2.81,0,0,1,.64.39l37,37A3.54,3.54,0,0,1,191.89,108.93Z"/><path class="cls-3" d="M117.71,146.37v7.87c0,1.32,28.63,3.55,47.28,7.87h0c9-2.09,15.69-4.67,15.69-7.87h0v-7.87c0-3.21-6.68-5.79-15.69-7.88h0c-18.65,4.33-47.28,6.55-47.28,7.88"/><path class="cls-3" d="M117.71,114.88v7.87c0,1.33,28.63,3.55,47.28,7.87h0c9-2.09,15.69-4.66,15.69-7.87h0v-7.87c0-3.21-6.68-5.79-15.69-7.87h0c-18.65,4.32-47.28,6.54-47.28,7.87"/><path class="cls-3" d="M117.71,133.51v23.62c0-2,63-5.91,63-15.75h0V117.77c0,9.84-63,13.77-63,15.74"/><path class="cls-3" d="M180.68,105.81v4.09c0,9.84-63,13.78-63,15.73V102c0-1.4,32.17-3.82,50.52-8.67Z"/><path class="cls-3" d="M117.71,165v23.62c0-2,63-5.91,63-15.75h0V149.26c0,9.84-63,13.77-63,15.74"/><path class="cls-4" d="M114.15,142.8v7.88c0,1.32,28.63,3.55,47.28,7.87h0c9-2.09,15.69-4.67,15.69-7.87h0V142.8c0-3.2-6.68-5.78-15.69-7.87h0c-18.65,4.33-47.28,6.55-47.28,7.87"/><path class="cls-5" d="M114.15,111.32v7.87c0,1.32,28.63,3.55,47.28,7.87h0c9-2.09,15.69-4.67,15.69-7.87h0v-7.87c0-3.21-6.68-5.79-15.69-7.88h0c-18.65,4.33-47.28,6.55-47.28,7.88"/><path class="cls-6" d="M114.15,130v23.62c0-2,63-5.91,63-15.75h0V114.21c0,9.84-63,13.77-63,15.74"/><path class="cls-6" d="M177.12,102.25v4.09c0,9.84-63,13.78-63,15.73V98.47c0-1.41,32.17-3.82,50.52-8.68Z"/><path class="cls-6" d="M114.15,161.44v23.61c0-2,63-5.9,63-15.74h0V145.69c0,9.84-63,13.78-63,15.75"/><path class="cls-7" d="M192,110.41v7.8l-1.47-1.74a5.48,5.48,0,0,0-5.71-1.75c-7.95,2.3-27.8,8-37.2,10.11a3.34,3.34,0,0,1-4.08-3.6l4.6-43.39a6.41,6.41,0,0,0-2.92-6.08l-1.85-1.13h9.15v36.69a3.1,3.1,0,0,0,3.09,3.09Z"/><path class="cls-8" d="M192,110.14v6.25a6,6,0,0,0-5.94-5.94h-31a3.12,3.12,0,0,1-2.2-1.11v0a2.91,2.91,0,0,1-.6-1.28,2.64,2.64,0,0,1-.07-.65V76.58a6,6,0,0,0-5.95-6h6.25a2.73,2.73,0,0,1,1.22.28h0l.14.06.18.1a1.5,1.5,0,0,1,.33.23l37,37a2.61,2.61,0,0,1,.39.64h0A3,3,0,0,1,192,110.14Z"/></svg>
\ No newline at end of file
diff --git a/scaladoc/resources/dotty_res/images/scaladoc_logo_dark.svg b/scaladoc/resources/dotty_res/images/scaladoc_logo_dark.svg
new file mode 100644
index 000000000000..a203e185dd7a
--- /dev/null
+++ b/scaladoc/resources/dotty_res/images/scaladoc_logo_dark.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 680 270.1"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:url(#linear-gradient);}.cls-3{fill:none;}.cls-4{fill:#7f0c1d;opacity:0.25;}.cls-5,.cls-6{opacity:0.75;}.cls-5{fill:url(#linear-gradient-2);}.cls-6{fill:url(#linear-gradient-3);}.cls-7{fill:url(#linear-gradient-4);}.cls-8{fill:url(#linear-gradient-5);}</style><linearGradient id="linear-gradient" x1="86.94" y1="135.05" x2="193.44" y2="135.05" gradientUnits="userSpaceOnUse"><stop offset="0.04" stop-color="#b92d2a"/><stop offset="0.29" stop-color="#e42d2a"/><stop offset="0.42" stop-color="#dd312e"/><stop offset="0.81" stop-color="#df3e3c"/><stop offset="1" stop-color="#e4322f"/></linearGradient><linearGradient id="linear-gradient-2" x1="114.15" y1="146.74" x2="177.12" y2="146.74" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#480c13"/><stop offset="0.17" stop-color="#520c15"/><stop offset="0.44" stop-color="#6c0c1a"/><stop offset="0.61" stop-color="#7f0c1d"/></linearGradient><linearGradient id="linear-gradient-3" x1="114.15" y1="115.25" x2="177.12" y2="115.25" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-4" x1="177.19" y1="86.25" x2="142.83" y2="115.8" gradientUnits="userSpaceOnUse"><stop offset="0" stop-opacity="0.7"/><stop offset="0.7" stop-opacity="0.3"/><stop offset="1" stop-color="#4f4f4f" stop-opacity="0.1"/></linearGradient><linearGradient id="linear-gradient-5" x1="157.33" y1="105.31" x2="179.65" y2="82.99" gradientUnits="userSpaceOnUse"><stop offset="0.2" stop-color="#7f0c1d"/><stop offset="0.74" stop-color="#7f0c1d"/><stop offset="0.93" stop-color="#590c16"/><stop offset="1" stop-color="#480c13"/></linearGradient></defs><path class="cls-1" d="M269.15,114.31a5.07,5.07,0,0,1-1.28,1.5,2.81,2.81,0,0,1-1.68.47,4.16,4.16,0,0,1-2.13-.69c-.76-.47-1.65-1-2.67-1.51a24.68,24.68,0,0,0-3.5-1.5,13.94,13.94,0,0,0-4.62-.7q-4.67,0-7,2.09a7,7,0,0,0-2.33,5.45,5.12,5.12,0,0,0,1.28,3.57,11.13,11.13,0,0,0,3.36,2.44,31.06,31.06,0,0,0,4.74,1.84q2.64.81,5.43,1.77a48.47,48.47,0,0,1,5.42,2.27,19.23,19.23,0,0,1,4.74,3.27,15,15,0,0,1,3.36,4.83,16.92,16.92,0,0,1,1.28,6.93,22.3,22.3,0,0,1-1.55,8.32,19.72,19.72,0,0,1-4.46,6.77,20.82,20.82,0,0,1-7.2,4.56,26.9,26.9,0,0,1-9.71,1.66,30.54,30.54,0,0,1-6.17-.63,35.56,35.56,0,0,1-5.93-1.75,33.15,33.15,0,0,1-5.36-2.69,23.86,23.86,0,0,1-4.39-3.5l3.95-6.37a3.83,3.83,0,0,1,1.3-1.19,3.33,3.33,0,0,1,1.7-.47,4.65,4.65,0,0,1,2.56.9c.9.59,1.93,1.25,3.09,2a24.38,24.38,0,0,0,4.06,2,15.28,15.28,0,0,0,5.54.9q4.71,0,7.29-2.15t2.58-6.42a6,6,0,0,0-1.27-4,10.35,10.35,0,0,0-3.35-2.56,25.74,25.74,0,0,0-4.71-1.77q-2.64-.74-5.43-1.64a44.27,44.27,0,0,1-5.42-2.15,16.6,16.6,0,0,1-4.71-3.32,15.86,15.86,0,0,1-3.35-5.11,19.79,19.79,0,0,1-1.28-7.59A18,18,0,0,1,237,107a21.15,21.15,0,0,1,6.84-4.26,25.19,25.19,0,0,1,9.31-1.61A31.69,31.69,0,0,1,264,102.93a24.57,24.57,0,0,1,8.45,5Z"/><path class="cls-1" d="M315.09,131a5.28,5.28,0,0,1-1.07,1.09,2.58,2.58,0,0,1-1.53.39,3.29,3.29,0,0,1-1.73-.52c-.55-.34-1.19-.72-1.9-1.12a15.08,15.08,0,0,0-2.56-1.12,11.13,11.13,0,0,0-3.68-.52,10.8,10.8,0,0,0-4.82,1,9.08,9.08,0,0,0-3.39,2.89,13.15,13.15,0,0,0-2,4.58,26,26,0,0,0-.65,6.06q0,7.08,2.85,10.85a9.25,9.25,0,0,0,7.79,3.77,13.13,13.13,0,0,0,2.93-.29,10.1,10.1,0,0,0,2.16-.74,8.64,8.64,0,0,0,1.59-1c.45-.36.88-.69,1.28-1a8,8,0,0,1,1.21-.75,3.17,3.17,0,0,1,1.37-.29,2.64,2.64,0,0,1,2.24,1.08l3.55,4.49a21.5,21.5,0,0,1-4.22,3.79,21.88,21.88,0,0,1-4.64,2.37,23.47,23.47,0,0,1-4.87,1.22,37,37,0,0,1-4.89.33A20.79,20.79,0,0,1,292,166a19.29,19.29,0,0,1-6.68-4.64,22.19,22.19,0,0,1-4.55-7.5,28.28,28.28,0,0,1-1.69-10.13,29.25,29.25,0,0,1,1.48-9.42,21.41,21.41,0,0,1,4.35-7.54,20.13,20.13,0,0,1,7.12-5,24.69,24.69,0,0,1,9.8-1.82,23.57,23.57,0,0,1,9.28,1.7,22.35,22.35,0,0,1,7.18,4.94Z"/><path class="cls-1" d="M323.93,127.09a27.67,27.67,0,0,1,9-5.49,30.65,30.65,0,0,1,10.67-1.82,19.11,19.11,0,0,1,7.38,1.35,15.64,15.64,0,0,1,5.52,3.74,16.5,16.5,0,0,1,3.48,5.72,21.24,21.24,0,0,1,1.21,7.27v29.07h-5.65a5.75,5.75,0,0,1-2.67-.49,3.64,3.64,0,0,1-1.51-2.07l-1-3A42.69,42.69,0,0,1,347,164.1a19.27,19.27,0,0,1-3.39,2,17.21,17.21,0,0,1-3.74,1.19,22.53,22.53,0,0,1-4.47.41,18.08,18.08,0,0,1-5.56-.81,12.09,12.09,0,0,1-4.33-2.4,10.64,10.64,0,0,1-2.8-4,14.16,14.16,0,0,1-1-5.47,11.18,11.18,0,0,1,1.3-5.12,12.63,12.63,0,0,1,4.47-4.64,28.36,28.36,0,0,1,8.43-3.46,59.16,59.16,0,0,1,13.21-1.54v-2.38q0-4.35-1.84-6.39a6.76,6.76,0,0,0-5.29-2,12.92,12.92,0,0,0-4.26.6,21.23,21.23,0,0,0-3,1.3l-2.4,1.3a5.31,5.31,0,0,1-2.6.61,3.54,3.54,0,0,1-2.17-.65,6,6,0,0,1-1.46-1.55Zm25.21,20.5a58.63,58.63,0,0,0-7.54.79,17.91,17.91,0,0,0-4.77,1.46,6.32,6.32,0,0,0-2.52,2,4.51,4.51,0,0,0-.74,2.49,4.44,4.44,0,0,0,1.51,3.81,6.86,6.86,0,0,0,4.19,1.12,12,12,0,0,0,5.36-1.1,16,16,0,0,0,4.51-3.43Z"/><path class="cls-1" d="M383.37,100v66.89H371V100Z"/><path class="cls-1" d="M392.66,127.09a27.63,27.63,0,0,1,9-5.49,30.71,30.71,0,0,1,10.68-1.82,19.11,19.11,0,0,1,7.38,1.35,15.64,15.64,0,0,1,5.52,3.74,16.33,16.33,0,0,1,3.47,5.72,21,21,0,0,1,1.22,7.27v29.07h-5.66a5.8,5.8,0,0,1-2.67-.49,3.68,3.68,0,0,1-1.5-2.07l-1-3a40.89,40.89,0,0,1-3.38,2.69,19.27,19.27,0,0,1-3.39,2,17.47,17.47,0,0,1-3.75,1.19,22.5,22.5,0,0,1-4.46.41,18,18,0,0,1-5.56-.81,12.09,12.09,0,0,1-4.33-2.4,10.66,10.66,0,0,1-2.81-4,14.35,14.35,0,0,1-1-5.47,11.18,11.18,0,0,1,1.3-5.12,12.59,12.59,0,0,1,4.46-4.64,28.54,28.54,0,0,1,8.44-3.46,59.09,59.09,0,0,1,13.21-1.54v-2.38c0-2.9-.62-5-1.84-6.39a6.77,6.77,0,0,0-5.3-2,13,13,0,0,0-4.26.6,21.08,21.08,0,0,0-3,1.3l-2.4,1.3a5.34,5.34,0,0,1-2.6.61,3.59,3.59,0,0,1-2.18-.65,6.14,6.14,0,0,1-1.46-1.55Zm25.21,20.5a58.43,58.43,0,0,0-7.54.79,18,18,0,0,0-4.78,1.46,6.28,6.28,0,0,0-2.51,2,4.51,4.51,0,0,0-.74,2.49,4.46,4.46,0,0,0,1.5,3.81,6.9,6.9,0,0,0,4.2,1.12,12.07,12.07,0,0,0,5.36-1.1,16.11,16.11,0,0,0,4.51-3.43Z"/><path class="cls-1" d="M473.05,166.93a2,2,0,0,1-2.16-1.66l-.71-5.52a24.05,24.05,0,0,1-6.67,5.68,17.05,17.05,0,0,1-8.59,2.13,16.33,16.33,0,0,1-7.09-1.51,14.65,14.65,0,0,1-5.42-4.41,21.09,21.09,0,0,1-3.46-7.27,37.35,37.35,0,0,1-1.21-10,31.26,31.26,0,0,1,1.35-9.35A22.56,22.56,0,0,1,443,127.5a17.75,17.75,0,0,1,14.42-6.82,16.45,16.45,0,0,1,7.13,1.41,17.15,17.15,0,0,1,5.3,4V100.85h8v66.08Zm-15.48-5.83a12.84,12.84,0,0,0,6.84-1.8,19.6,19.6,0,0,0,5.41-5.07v-22A12.69,12.69,0,0,0,465,128.1a13.94,13.94,0,0,0-5.81-1.19q-6.36,0-9.78,4.53T446,144.36a32.85,32.85,0,0,0,.76,7.61,14.56,14.56,0,0,0,2.24,5.2,8.9,8.9,0,0,0,3.63,3A12.36,12.36,0,0,0,457.57,161.1Z"/><path class="cls-1" d="M509.61,120.77a23.23,23.23,0,0,1,9,1.66,18.79,18.79,0,0,1,6.82,4.71,20.75,20.75,0,0,1,4.31,7.38,32,32,0,0,1,0,19.35,20.75,20.75,0,0,1-4.31,7.36,18.62,18.62,0,0,1-6.82,4.69,25.49,25.49,0,0,1-18,0,19,19,0,0,1-6.84-4.69,21,21,0,0,1-4.35-7.36,31.55,31.55,0,0,1,0-19.35,21,21,0,0,1,4.35-7.38,19.12,19.12,0,0,1,6.84-4.71A23.32,23.32,0,0,1,509.61,120.77Zm0,40.55q6.72,0,10-4.51T523,144.23q0-8.11-3.32-12.65t-10-4.53a14,14,0,0,0-5.92,1.16,11,11,0,0,0-4.2,3.37A14.91,14.91,0,0,0,497,137a29.19,29.19,0,0,0-.83,7.25,28.83,28.83,0,0,0,.83,7.22,14.63,14.63,0,0,0,2.51,5.36,11.18,11.18,0,0,0,4.2,3.35A14,14,0,0,0,509.61,161.32Z"/><path class="cls-1" d="M572.1,129.56a3.54,3.54,0,0,1-.72.76,1.69,1.69,0,0,1-1,.27,2.54,2.54,0,0,1-1.46-.56,22.87,22.87,0,0,0-2-1.23,17.22,17.22,0,0,0-2.94-1.24,14,14,0,0,0-4.24-.56,13.84,13.84,0,0,0-5.88,1.19,11.43,11.43,0,0,0-4.28,3.43,15.58,15.58,0,0,0-2.6,5.43,26.67,26.67,0,0,0-.88,7.13,26,26,0,0,0,.94,7.34,15.83,15.83,0,0,0,2.65,5.38,11.3,11.3,0,0,0,4.15,3.32,12.71,12.71,0,0,0,5.5,1.15,13.91,13.91,0,0,0,4.8-.7,14.58,14.58,0,0,0,3.14-1.55,23.42,23.42,0,0,0,2.06-1.54,2.47,2.47,0,0,1,1.61-.7,1.69,1.69,0,0,1,1.53.76l2.24,2.92a17.34,17.34,0,0,1-7.4,5.32,26.29,26.29,0,0,1-9.38,1.68A19.91,19.91,0,0,1,550,166a18,18,0,0,1-6.35-4.56,21.39,21.39,0,0,1-4.24-7.33,29.55,29.55,0,0,1-1.55-9.92,30,30,0,0,1,1.41-9.37,21.41,21.41,0,0,1,4.13-7.43,18.75,18.75,0,0,1,6.71-4.86,22.53,22.53,0,0,1,9.15-1.75,21.59,21.59,0,0,1,8.43,1.54,20.24,20.24,0,0,1,6.51,4.38Z"/><path class="cls-2" d="M192,110.14V191.5a8,8,0,0,1-8,8h-77a7.74,7.74,0,0,1-4.21-1.21l0,0a7.93,7.93,0,0,1-3.7-6.72V78.58a8,8,0,0,1,8-8h45.48a2.61,2.61,0,0,1,1.2.28h0l.14.06.18.1a1.5,1.5,0,0,1,.33.23l37,37a2.61,2.61,0,0,1,.39.64h0A3,3,0,0,1,192,110.14Z"/><path class="cls-3" d="M191.89,108.93H156.38a2.82,2.82,0,0,1-2.51-2.81V70.92a2.81,2.81,0,0,1,.64.39l37,37A3.54,3.54,0,0,1,191.89,108.93Z"/><path class="cls-4" d="M117.71,146.37v7.87c0,1.32,28.63,3.55,47.28,7.87h0c9-2.09,15.69-4.67,15.69-7.87h0v-7.87c0-3.21-6.68-5.79-15.69-7.88h0c-18.65,4.33-47.28,6.55-47.28,7.88"/><path class="cls-4" d="M117.71,114.88v7.87c0,1.33,28.63,3.55,47.28,7.87h0c9-2.09,15.69-4.66,15.69-7.87h0v-7.87c0-3.21-6.68-5.79-15.69-7.87h0c-18.65,4.32-47.28,6.54-47.28,7.87"/><path class="cls-4" d="M117.71,133.51v23.62c0-2,63-5.91,63-15.75h0V117.77c0,9.84-63,13.77-63,15.74"/><path class="cls-4" d="M180.68,105.81v4.09c0,9.84-63,13.78-63,15.73V102c0-1.4,32.17-3.82,50.52-8.67Z"/><path class="cls-4" d="M117.71,165v23.62c0-2,63-5.91,63-15.75h0V149.26c0,9.84-63,13.77-63,15.74"/><path class="cls-5" d="M114.15,142.8v7.88c0,1.32,28.63,3.55,47.28,7.87h0c9-2.09,15.69-4.67,15.69-7.87h0V142.8c0-3.2-6.68-5.78-15.69-7.87h0c-18.65,4.33-47.28,6.55-47.28,7.87"/><path class="cls-6" d="M114.15,111.32v7.87c0,1.32,28.63,3.55,47.28,7.87h0c9-2.09,15.69-4.67,15.69-7.87h0v-7.87c0-3.21-6.68-5.79-15.69-7.88h0c-18.65,4.33-47.28,6.55-47.28,7.88"/><path class="cls-1" d="M114.15,130v23.62c0-2,63-5.91,63-15.75h0V114.21c0,9.84-63,13.77-63,15.74"/><path class="cls-1" d="M177.12,102.25v4.09c0,9.84-63,13.78-63,15.73V98.47c0-1.41,32.17-3.82,50.52-8.68Z"/><path class="cls-1" d="M114.15,161.44v23.61c0-2,63-5.9,63-15.74h0V145.69c0,9.84-63,13.78-63,15.75"/><path class="cls-7" d="M192,110.41v7.8l-1.47-1.74a5.48,5.48,0,0,0-5.71-1.75c-7.95,2.3-27.8,8-37.2,10.11a3.34,3.34,0,0,1-4.08-3.6l4.6-43.39a6.41,6.41,0,0,0-2.92-6.08l-1.85-1.13h9.15v36.69a3.1,3.1,0,0,0,3.09,3.09Z"/><path class="cls-8" d="M192,110.14v6.25a6,6,0,0,0-5.94-5.94h-31a3.12,3.12,0,0,1-2.2-1.11v0a2.91,2.91,0,0,1-.6-1.28,2.64,2.64,0,0,1-.07-.65V76.58a6,6,0,0,0-5.95-6h6.25a2.73,2.73,0,0,1,1.22.28h0l.14.06.18.1a1.5,1.5,0,0,1,.33.23l37,37a2.61,2.61,0,0,1,.39.64h0A3,3,0,0,1,192,110.14Z"/></svg>
\ No newline at end of file
diff --git a/scaladoc/resources/dotty_res/images/static.svg b/scaladoc/resources/dotty_res/images/static.svg
new file mode 100644
index 000000000000..a857b85c8414
--- /dev/null
+++ b/scaladoc/resources/dotty_res/images/static.svg
@@ -0,0 +1,55 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="72px" height="72px" viewBox="0 0 72 72" version="1.1">
+  <defs>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+    <circle id="path-2" cx="32" cy="35" r="32"/>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"/>
+      <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"/>
+      <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"/>
+      <feOffset dx="0" dy="-1" in="SourceAlpha" result="shadowOffsetInner2"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner2" result="shadowBlurInner2"/>
+      <feComposite in="shadowBlurInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowInnerInner2" type="matrix" result="shadowMatrixInner2"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+        <feMergeNode in="shadowMatrixInner1"/>
+        <feMergeNode in="shadowMatrixInner2"/>
+      </feMerge>
+    </filter>
+    <path id="path-5" d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z"/>
+  </defs>
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Artboard-1" transform="translate(-298.000000, -91.000000)">
+      <g id="BG" transform="translate(302.000000, 91.000000)">
+        <g id="Icon">
+          <mask id="mask-3" fill="white">
+            <use xlink:href="#path-2"/>
+          </mask>
+          <use xlink:href="#path-2" stroke="black" stroke-width="3"/>
+          <use id="Mask" fill="white" filter="url(#filter-1)" xlink:href="#path-2"/>
+          <mask id="mask-6" fill="white">
+            <use xlink:href="#path-5"/>
+          </mask>
+          <text id="C" mask="url(#mask-6)" font-family="Open Sans, Helvetica Neueu, Sans-serif" font-size="40" font-weight="normal" fill="black">
+            <tspan x="19" y="49">
+              S
+            </tspan>
+          </text>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/scaladoc/resources/dotty_res/images/type.svg b/scaladoc/resources/dotty_res/images/type.svg
new file mode 100644
index 000000000000..f9c17784ca46
--- /dev/null
+++ b/scaladoc/resources/dotty_res/images/type.svg
@@ -0,0 +1,54 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="72px" height="72px" viewBox="0 0 72 72" version="1.1">
+  <defs>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+    <circle id="path-2" cx="32" cy="32" r="32"/>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"/>
+      <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"/>
+      <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"/>
+      <feOffset dx="0" dy="-1" in="SourceAlpha" result="shadowOffsetInner2"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner2" result="shadowBlurInner2"/>
+      <feComposite in="shadowBlurInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowInnerInner2" type="matrix" result="shadowMatrixInner2"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+        <feMergeNode in="shadowMatrixInner1"/>
+        <feMergeNode in="shadowMatrixInner2"/>
+      </feMerge>
+    </filter>
+    <path id="path-5" d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z"/>
+  </defs>
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Artboard-1" transform="translate(-298.000000, -91.000000)">
+      <g id="BG" transform="translate(302.000000, 91.000000)">
+        <g id="Icon">
+          <mask id="mask-3" fill="white">
+            <use xlink:href="#path-2"/>
+          </mask>
+          <use id="Mask" fill="crimson" filter="url(#filter-1)" xlink:href="#path-2"/>
+          <mask id="mask-6" fill="white">
+            <use xlink:href="#path-5"/>
+          </mask>
+          <text id="C" mask="url(#mask-6)" font-family="Open Sans, Helvetica Neueu, Sans-serif" font-size="40" font-weight="normal" fill="#FFFFFF">
+            <tspan x="20" y="48">
+              T
+            </tspan>
+          </text>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/scaladoc/resources/dotty_res/images/val.svg b/scaladoc/resources/dotty_res/images/val.svg
new file mode 100644
index 000000000000..d3431c5dee3a
--- /dev/null
+++ b/scaladoc/resources/dotty_res/images/val.svg
@@ -0,0 +1,54 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="72px" height="72px" viewBox="0 0 72 72" version="1.1">
+  <defs>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+    <circle id="path-2" cx="32" cy="32" r="32"/>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"/>
+      <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"/>
+      <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"/>
+      <feOffset dx="0" dy="-1" in="SourceAlpha" result="shadowOffsetInner2"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner2" result="shadowBlurInner2"/>
+      <feComposite in="shadowBlurInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowInnerInner2" type="matrix" result="shadowMatrixInner2"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+        <feMergeNode in="shadowMatrixInner1"/>
+        <feMergeNode in="shadowMatrixInner2"/>
+      </feMerge>
+    </filter>
+    <path id="path-5" d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z"/>
+  </defs>
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Artboard-1" transform="translate(-298.000000, -91.000000)">
+      <g id="BG" transform="translate(302.000000, 91.000000)">
+        <g id="Icon">
+          <mask id="mask-3" fill="white">
+            <use xlink:href="#path-2"/>
+          </mask>
+          <use id="Mask" fill="darkgreen" filter="url(#filter-1)" xlink:href="#path-2"/>
+          <mask id="mask-6" fill="white">
+            <use xlink:href="#path-5"/>
+          </mask>
+          <text id="C" mask="url(#mask-6)" font-family="Open Sans, Helvetica Neueu, Sans-serif" font-size="40" font-weight="normal" fill="#FFFFFF">
+            <tspan x="22" y="44">
+              v
+            </tspan>
+          </text>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/scaladoc/resources/dotty_res/scripts/components/DocumentableList.js b/scaladoc/resources/dotty_res/scripts/components/DocumentableList.js
index 42b779f79bea..8273d5e8d83a 100644
--- a/scaladoc/resources/dotty_res/scripts/components/DocumentableList.js
+++ b/scaladoc/resources/dotty_res/scripts/components/DocumentableList.js
@@ -47,6 +47,13 @@ class DocumentableList extends Component {
               return isElementVisible;
             }).length;
 
+          findRefs("span.groupHeader", listRef).forEach(h => {
+            const headerSiblings = this.state.list.getSectionListElementsRefs(h.parentNode).map(ref => this.state.list.toListElement(ref))
+            const isHeaderVisible = headerSiblings.filter(s => this.state.list.isElementVisible(s, filter)) != 0
+
+            this.toggleDisplayStyles(isHeaderVisible, h)
+          })
+
           this.toggleDisplayStyles(isListVisible, listRef);
 
           return isListVisible;
@@ -132,7 +139,9 @@ class List {
       : includesInputValue()
 
     function includesInputValue() {
-      return elementData.name.includes(filter.value) || elementData.description.includes(filter.value);
+      const lcValue = filter.value.toLowerCase()
+      return elementData.name.toLowerCase().includes(lcValue) 
+          || elementData.description.toLowerCase().includes(lcValue);
     }
 
     function areFiltersFromElementSelected() {
diff --git a/scaladoc/resources/dotty_res/scripts/components/Filter.js b/scaladoc/resources/dotty_res/scripts/components/Filter.js
index fa30565210d2..b9f05defb478 100644
--- a/scaladoc/resources/dotty_res/scripts/components/Filter.js
+++ b/scaladoc/resources/dotty_res/scripts/components/Filter.js
@@ -75,12 +75,14 @@ class Filter {
   * @returns { Filters }
   */
   _generateFiltersOnTyping(value) {
+    const lcValue = value.toLowerCase()
+
     const elementsDatasets = this.elementsRefs
       .filter(element => {
-        const name = getElementTextContent(getElementNameRef(element));
-        const description = getElementTextContent(getElementDescription(element));
+        const lcName = getElementTextContent(getElementNameRef(element)).toLowerCase();
+        const lcDescription = getElementTextContent(getElementDescription(element)).toLowerCase();
 
-        return name.includes(value) || description.includes(value);
+        return lcName.includes(lcValue) || lcDescription.includes(lcValue);
       })
       .map(element => this._getDatasetWithKeywordData(element.dataset))
 
diff --git a/scaladoc/resources/dotty_res/scripts/components/Input.js b/scaladoc/resources/dotty_res/scripts/components/Input.js
index 0c7a449fa1e7..dbe6ad2d724a 100644
--- a/scaladoc/resources/dotty_res/scripts/components/Input.js
+++ b/scaladoc/resources/dotty_res/scripts/components/Input.js
@@ -4,15 +4,27 @@ class Input extends Component {
 
     this.inputRef = findRef(".filterableInput");
     this.onChangeFn = withEvent(this.inputRef, "input", this.onInputChange);
+    this.onKeydownFn = withEvent(this.inputRef, "keydown", this.onKeydown);
   }
 
   onInputChange = ({ currentTarget: { value } }) => {
     this.props.onInputChange(value);
   };
 
+  onKeydown = (e) => {
+    // if the user hits Escape while typing in the filter input,
+    // clear the filter and un-focus the input
+    if (e.keyCode == 27) {
+      this.inputRef.value = '';
+      this.onInputChange(e);
+      setTimeout(() => this.inputRef.blur(), 1);
+    }
+  }
+
   componentWillUnmount() {
     if (this.onChangeFn) {
       this.onChangeFn();
+      this.onKeydownFn();
     }
   }
 }
diff --git a/scaladoc/resources/dotty_res/scripts/hljs-scala3.js b/scaladoc/resources/dotty_res/scripts/hljs-scala3.js
index 621c62810306..91541a6007b0 100644
--- a/scaladoc/resources/dotty_res/scripts/hljs-scala3.js
+++ b/scaladoc/resources/dotty_res/scripts/hljs-scala3.js
@@ -229,7 +229,7 @@ function highlightDotty(hljs) {
       {
         className: 'emphasis',
         variants: [
-          {begin: /\*(?![\*\s/])/, end: /\*/},
+          {begin: /\*(?!([\*\s/])|([^\*]*\*[\*/]))/, end: /\*/},
           {begin: /_/, end: /_/}
         ],
       },
diff --git a/scaladoc/resources/dotty_res/scripts/inkuire-worker.js b/scaladoc/resources/dotty_res/scripts/inkuire-worker.js
new file mode 100644
index 000000000000..0b37ba58335e
--- /dev/null
+++ b/scaladoc/resources/dotty_res/scripts/inkuire-worker.js
@@ -0,0 +1,2 @@
+importScripts("inkuire.js");
+WorkerMain.main();
diff --git a/scaladoc/resources/dotty_res/scripts/inkuire.md b/scaladoc/resources/dotty_res/scripts/inkuire.md
new file mode 100644
index 000000000000..387f58e788ef
--- /dev/null
+++ b/scaladoc/resources/dotty_res/scripts/inkuire.md
@@ -0,0 +1,59 @@
+# Inkuire
+
+Inkuire is a Hoogle-like search engine for Scala 3 (and Kotlin).
+
+# Usage
+
+To include Inkuire in scaladoc one should add `-Ygenerate-inkuire` flag. This will allow the usage of Inkuire for generated Scaladoc with project sources and available sources from external-mappings.
+
+The Inkuire worker works in Scaladoc searchbar. It is triggered once an input containing `=>` is detected in searchbar. There is 1s debounce on searches with Inkuire.
+
+## Generated Files
+
+When including `-Ygenerate-inkuire` flag database for project sources and a config should be generated. Which are namely files: `inkuire-db.json` and `scripts/inkuire-config.json`. Config file includes addresses of possible inkuire-db files. There always is at least one - generated one. But also links for external mappings are addes on relative path `../inkuire-db.json`.
+
+`inkuire-db.json` contains a json with Inkuire engine's representation of:
+- types (or rather classes and objects for now)
+- functions
+- implicit conversions
+
+
+## Code
+
+The source code is available [here](https://github.com/VirtusLab/Inkuire).
+
+Important parts are:
+- engineCommon - provides most of the logic for search engine
+- engineJs - provides the way of using Inkuire as a Web Worker
+
+## Integration with Scaladoc
+
+Since Inkuire has quite a lot of dependencies it's sources cannot be easily integrated into Scaladoc.
+That is why Inkuire is included as a resource, namely `inkuire.js` file and loaded as Web Worker.
+
+Web worker accepts String messages. Each message should be a requested signature.
+Web worker can send different messages:
+- engine_ready - sent after database has been loaded
+- new_query - sent once a new signature is accepted
+- query_ended(`msg`) - After processing a single signature has finished. `msg` is optional and contains an error to be displayed.
+- json of format [`ResultFormat`](https://github.com/VirtusLab/Inkuire/blob/68d1e0bb2732deda714de9cfca3fe45f75fb5239/engineCommon/shared/src/main/scala/org/virtuslab/inkuire/engine/common/model/OutputFormat.scala#L12) - resulting function found with some additional information, like package location and documentation link.
+
+## Input format
+
+Signature format accepted by Inkuire is pretty much a Scala curried function. With some minor changes:
+- Types with names as single letters or single letters with digits are considered by default type variables. But other type variables can be declared with [polymorphic function types syntax](https://dotty.epfl.ch/docs/reference/new-types/polymorphic-function-types.html).
+- `_` is treated as sort of wildcard, so matches to any type on any position. So searching for any one-argument function from `Int` can be done like this: `Int => _`.
+
+Some example signatures with expected (not exclusive)results:
+- `Seq[Int] => (Int => Long) => Seq[Long]` -> `IterableOps.map`
+- `(A, B) => A` -> `Product2._1`
+- `Set[Long] => Long => Boolean` -> `SetOps.contains`
+- `BigDecimal => Byte` -> `ScalaNumericAnyConversions.toByte`
+- `Int => Long => Int` -> `Function.const`
+- `String => Int => Char` -> `StringOps.apply`
+
+## Signature processing
+
+Some improvements done on engine side:
+- first argument can be interpreted as a receiver. More specifically there is no difference between a function on type `A` and a function with the first parameter as `A` (provided other parameters and return type are the same).
+- permutating arguments. This may have to be dropped/limited in the future. But for now every permutation of arguments can be matched, so for example: `Int => String => String` matches `Function.const`, even though the arguments are switched.
\ No newline at end of file
diff --git a/scaladoc/resources/dotty_res/scripts/theme.js b/scaladoc/resources/dotty_res/scripts/theme.js
new file mode 100644
index 000000000000..b5cf46b1a221
--- /dev/null
+++ b/scaladoc/resources/dotty_res/scripts/theme.js
@@ -0,0 +1,48 @@
+;(function () {
+  const supportsLocalStorage = (() => {
+    try {
+      localStorage.setItem('test', 'test');
+      localStorage.removeItem('test');
+      return true;
+    } catch (e) {
+      return false;
+    }
+  })();
+
+  const settingKey = "use-dark-theme";
+
+  function toggleDarkTheme(isDark) {
+    currentlyDark = isDark
+    // this triggers the `:root.theme-dark` rule from scalastyle.css,
+    // which changes the values of a bunch of CSS color variables
+    document.documentElement.classList.toggle("theme-dark", isDark);
+    supportsLocalStorage && localStorage.setItem(settingKey, isDark);
+  }
+
+  /* Infer a dark/light theme preference from the user's system */
+  const colorSchemePrefMql = window.matchMedia("(prefers-color-scheme: dark)");
+
+  /* This needs to happen ASAP so we don't get a FOUC of bright colors before the dark theme is applied */
+  const initiallyDark = (() => {
+    const storedSetting = supportsLocalStorage && localStorage.getItem(settingKey);
+    return (storedSetting === null) ? colorSchemePrefMql.matches : storedSetting === "true";
+  })();
+  let currentlyDark = initiallyDark;
+  toggleDarkTheme(initiallyDark);
+
+  /* Wait for the DOM to be loaded before we try to attach event listeners to things in the DOM */
+  window.addEventListener("DOMContentLoaded", () => {
+    const themeToggler = document.querySelector('#theme-toggle input');
+    themeToggler.checked = !currentlyDark;
+    themeToggler.addEventListener("change", e => {
+      toggleDarkTheme(!e.target.checked);
+    });
+
+    /* Auto-swap the dark/light theme if the user changes it in their system */
+    colorSchemePrefMql.addEventListener('change', e => {
+      const preferDark = e.matches;
+      themeToggler.checked = !preferDark;
+      toggleDarkTheme(preferDark);
+    });
+  });
+})();
diff --git a/scaladoc/resources/dotty_res/scripts/ux.js b/scaladoc/resources/dotty_res/scripts/ux.js
index 710aa6ba3e05..2a631e987bd0 100644
--- a/scaladoc/resources/dotty_res/scripts/ux.js
+++ b/scaladoc/resources/dotty_res/scripts/ux.js
@@ -10,7 +10,7 @@ window.addEventListener("DOMContentLoaded", () => {
   if (elements) {
     for (i = 0; i < elements.length; i++) {
       elements[i].onclick = function(e) {
-        if(!$(e.target).is("a"))
+        if(!$(e.target).is("a") && e.fromSnippet !== true)
           this.classList.toggle("expand")
       }
     }
@@ -20,7 +20,9 @@ window.addEventListener("DOMContentLoaded", () => {
     $(this).parent().toggleClass("expanded")
   });
 
-  $('.names .tab').on('click', function(){
+  document.querySelectorAll("#sideMenu2 a").forEach(elem => elem.addEventListener('click', e => e.stopPropagation()))
+
+  $('.names .tab').on('click', function() {
     parent = $(this).parents(".tabs").first()
     shown = $(this).hasClass('selected')
     single = parent.hasClass("single")
@@ -32,16 +34,21 @@ window.addEventListener("DOMContentLoaded", () => {
     if (!shown) { myTab.addClass('selected') }
     if (shown && !single) myTab.removeClass('selected')
 
-    if(!shown && $(this).find(".showGraph")){
+    if(!shown && $(this).filter(".showGraph").length > 0) {
       showGraph()
       $(this).find(".showGraph").removeClass("showGraph")
     }
   })
 
   if (location.hash) {
-    var selected = document.getElementById(location.hash.substring(1));
-    if (selected){
-      selected.classList.toggle("expand");
+    var target = location.hash.substring(1);
+    // setting the 'expand' class on the top-level container causes undesireable styles
+    // to apply to the top-level docs, so we avoid this logic for that element.
+    if (target != 'container') {
+      var selected = document.getElementById(location.hash.substring(1));
+      if (selected) {
+        selected.classList.toggle("expand");
+      }
     }
   }
 
@@ -51,9 +58,36 @@ window.addEventListener("DOMContentLoaded", () => {
       window.location = pathToRoot; // global variable pathToRoot is created by the html renderer
     };
   }
+
+  document.querySelectorAll('.documentableAnchor').forEach(elem => {
+    elem.addEventListener('click', event => {
+      var $temp = $("<input>")
+      $("body").append($temp)
+      var a = document.createElement('a')
+      a.href = $(elem).attr("link")
+      $temp.val(a.href).select();
+      document.execCommand("copy")
+      $temp.remove();
+    })
+  })
+
   hljs.registerLanguage("scala", highlightDotty);
   hljs.registerAliases(["dotty", "scala3"], "scala");
   hljs.initHighlighting();
+
+  /* listen for the `F` key to be pressed, to focus on the member filter input (if it's present) */
+  document.body.addEventListener('keydown', e => {
+    if (e.key == "f") {
+      const tag = e.target.tagName;
+      if (tag != "INPUT" && tag != "TEXTAREA") {
+        const filterInput = findRef('.documentableFilter input.filterableInput');
+        if (filterInput != null) {
+          // if we focus during this event handler, the `f` key gets typed into the input
+          setTimeout(() => filterInput.focus(), 1);
+        }
+      }
+    }
+  })
 });
 
 var zoom;
@@ -65,8 +99,8 @@ function showGraph() {
     if (dotNode){
       var svg = d3.select("#graph");
       var radialGradient = svg.append("defs").append("radialGradient").attr("id", "Gradient");
-      radialGradient.append("stop").attr("stop-color", "#ffd47f").attr("offset", "20%");
-      radialGradient.append("stop").attr("stop-color", "white").attr("offset", "100%");
+      radialGradient.append("stop").attr("stop-color", "var(--aureole)").attr("offset", "20%");
+      radialGradient.append("stop").attr("stop-color", "var(--code-bg)").attr("offset", "100%");
 
       var inner = svg.append("g");
 
diff --git a/scaladoc/resources/dotty_res/styles/colors.css b/scaladoc/resources/dotty_res/styles/colors.css
new file mode 100644
index 000000000000..1ef13486bb6c
--- /dev/null
+++ b/scaladoc/resources/dotty_res/styles/colors.css
@@ -0,0 +1,145 @@
+:root {
+  /* White */
+  --white: hsl(193, 24%, 99%);
+
+  /* Black */
+  --black: hsl(200, 72%, 6%);
+
+  /* Grey */
+  --grey100: hsl(193, 24%, 97%);
+  --grey200: hsl(193, 20%, 95%);
+  --grey300: hsl(193, 16%, 86%);
+  --grey400: hsl(193, 16%, 74%);
+  --grey500: hsl(193, 16%, 66%);
+  --grey600: hsl(193, 14%, 52%);
+  --grey700: hsl(193, 14%, 42%);
+  --grey800: hsl(193, 12%, 28%);
+  --grey850: hsl(193, 12%, 22%);
+  --grey900: hsl(193, 12%, 16%);
+  --grey930: hsl(193, 11%, 14%);
+
+  /* Blue */
+  --blue100: hsl(200, 64%, 92%);
+  --blue200: hsl(200, 66%, 82%);
+  --blue300: hsl(200, 68%, 70%);
+  --blue400: hsl(200, 62%, 58%);
+  --blue500: hsl(200, 72%, 42%);
+  --blue600: hsl(200, 71%, 24%);
+  --blue700: hsl(200, 72%, 18%);
+  --blue800: hsl(200, 72%, 12%);
+  --blue900: hsl(200, 72%, 8%);
+
+  /* Red */
+  --red100: hsl(1 , 60%, 92%);
+  --red200: hsl(1 , 64%, 84%);
+  --red300: hsl(1 , 66%, 72%);
+  --red400: hsl(1 , 66% , 64%);
+  --red500: hsl(1 , 71% , 52%);
+  --red600: hsl(1 , 71% , 40%);
+  --red700: hsl(1 , 72% , 32%);
+  --red800: hsl(1 , 72% , 24%);
+  --red900: hsl(1 , 75% , 12%);
+
+  /* Diagram central node aureole */
+
+  --aureole: hsl(40, 100%, 75%);
+
+  /* Light Mode */
+  --border-light: var(--grey200);
+  --border-medium: var(--grey300);
+
+  --body-bg: var(--white);
+  --body-fg: var(--grey900);
+  --title-fg: var(--grey800);
+
+  --active-bg: var(--blue300);
+  --active-bg-shadow: var(--blue400);
+  --active-fg: var(--grey900);
+
+  --inactive-bg: var(--grey400);
+  --inactive-bg-shadow: var(--grey700);
+  --inactive-fg: var(--grey700);
+
+  --code-bg: var(--grey200);
+  --code-fg: var(--grey800);
+  --symbol-fg: var(--grey900);
+  --documentable-bg: var(--grey200);
+
+  --link-fg: var(--blue500);
+  --link-hover-fg: var(--blue600);
+  --link-sig-fg: var(--blue500);
+
+  --leftbar-bg: var(--grey100);
+  --leftbar-fg: var(--grey900);
+  --leftbar-current-bg: var(--blue100);
+  --leftbar-current-fg: var(--blue500);
+  --leftbar-hover-bg: var(--blue100);
+  --leftbar-hover-fg: var(--grey900);
+  --leftbar-border: var(--grey300);
+
+  --leftbar-dropdown-bg: var(--grey200);
+
+  --footer-bg: var(--white);
+  --footer-fg: var(--grey700);
+
+  --icon-color: var(--grey400);
+  --selected-fg: var(--blue900);
+  --selected-bg: var(--blue200);
+
+  --shadow: var(--black);
+
+  --aside-warning-bg: var(--red100);
+}
+
+  /* Dark Mode */
+:root.theme-dark {
+  color-scheme: dark;
+
+  --border-light: var(--grey800);
+  --border-medium: var(--grey600);
+
+  --body-bg: var(--grey930);
+  --body-fg: var(--grey300);
+  --title-fg: var(--grey200);
+
+  --active-bg: var(--blue500);
+  --active-bg-shadow: var(--blue400);
+  --active-fg: var(--grey300);
+
+  --inactive-bg: var(--grey700);
+  --inactive-bg-shadow: var(--grey500);
+  --inactive-fg: var(--grey500);
+
+  --code-bg: var(--grey850);
+  --code-fg: var(--grey400);
+  --symbol-fg: var(--grey300);
+  --documentable-bg: var(--grey850);
+
+  --link-fg: var(--blue400);
+  --link-hover-fg: var(--blue300);
+  --link-sig-fg: var(--blue400);
+
+  --leftbar-bg: var(--grey930);
+  --leftbar-fg: var(--grey300);
+  --leftbar-current-bg: var(--grey700);
+  --leftbar-current-fg: var(--white);
+  --leftbar-hover-bg: var(--grey800);
+  --leftbar-hover-fg: var(--grey300);
+  --leftbar-border: var(--grey800);
+
+  --leftbar-dropdown-bg: var(--grey850);
+
+  --footer-bg: var(--grey930);
+  --footer-fg: var(--grey400);
+
+  --icon-color: var(--grey600);
+  --selected-fg: var(--grey800);
+  --selected-bg: var(--grey200);
+
+  --tab-selected: var(--white);
+  --tab-default: var(--grey300);
+
+  --shadow: var(--white);
+
+  --aside-warning-bg: var(--red800);
+}
diff --git a/scaladoc/resources/dotty_res/styles/diagram.css b/scaladoc/resources/dotty_res/styles/diagram.css
index 1960ad9dcba7..67d25dc0efb3 100644
--- a/scaladoc/resources/dotty_res/styles/diagram.css
+++ b/scaladoc/resources/dotty_res/styles/diagram.css
@@ -1,17 +1,17 @@
 .node {
-  stroke: #333;
+  stroke: var(--inactive-bg);
   stroke-width: 2.5px;
-  fill: white;
+  fill: var(--inactive-bg);
 }
 
 .edgeLabel {
-  fill: white;
+  fill: var(--inactive-fg);
 }
 
 .edgePath {
-  stroke: #333;
+  stroke: var(--inactive-fg);
   stroke-width: 1.5px;
-  fill: #333;
+  fill: var(--inactive-fg);
 }
 
 #graph {
@@ -19,6 +19,11 @@
   height: 400px;
 }
 
+.diagram-class {
+  background-color: var(--code-bg);
+  margin-bottom: 16px;
+}
+
 .diagram-class a {
   text-decoration: underline;
   color: #FFF;
@@ -39,9 +44,9 @@
   margin: 4px 2px;
   transition-duration: 0.4s;
   cursor: pointer;
-  background-color: white;
-  color: black;
-  border: 2px solid #003048;
+  background-color: var(--body-bg);
+  color: var(--body-fg);
+  border: 2px solid var(--body-fg);
   position: absolute;
   top: 0;
   left: 0;
@@ -49,6 +54,6 @@
 }
 
 .btn:hover {
-  background-color: #003048;
-  color: white;
+  background-color: var(--active-bg);
+  color: var(--active-fg);
 }
diff --git a/scaladoc/resources/dotty_res/styles/filter-bar.css b/scaladoc/resources/dotty_res/styles/filter-bar.css
index f8ed5eb9d94d..afa16658aeb3 100644
--- a/scaladoc/resources/dotty_res/styles/filter-bar.css
+++ b/scaladoc/resources/dotty_res/styles/filter-bar.css
@@ -1,6 +1,6 @@
 .documentableFilter {
-  padding: 24px 12px;
-  background-color: var(--leftbar-bg);
+  padding: 24px 24px 24px 12px;
+  background-color: var(--documentable-bg);
 }
 
 .documentableFilter.active .filterToggleButton svg {
@@ -26,22 +26,28 @@
 }
 
 .filterToggleButton svg {
-  fill: var(--code-bg);
+  fill: var(--icon-color);
   transition: fill 0.1s ease-in, transform 0.1s ease-in-out;
 }
 
 .filterToggleButton:hover svg,
 .filterToggleButton:focus svg {
-  fill: var(--active-tab-color);
+  fill: var(--icon-color);
 }
 
 .filterableInput {
-  padding: 6px 4px;
   flex: 1;
   outline: 0;
-  border: 0;
+  border: 1px solid var(--border-medium);
   border-radius: 3px;
-  background-color: var(--code-bg);
+  background-color: var(--body-bg);
+  font-family: "Lato", sans-serif;
+  padding: 8px;
+  margin-left: 8px;
+}
+
+.filterableInput:focus {
+  border: 1px solid var(--active-bg-shadow);
 }
 
 .filterLowerContainer {
@@ -50,12 +56,11 @@
 }
 
 .filterGroup {
-  display: flex;
   margin-bottom: 16px;
 }
 
 .filterList {
-  margin-left: 10px;
+  margin: 0.5em;
 }
 
 .filterButtonItem {
@@ -66,12 +71,12 @@
   outline: 0;
   border: 0;
   border-radius: 3px;
-  color: var(--leftbar-bg);
-  background-color: var(--code-bg);
+  color: var(--inactive-fg);
+  background-color: var(--inactive-bg);
   font-size: 12px;
   font-weight: 700;
   cursor: pointer;
-  border-bottom: 2px solid var(--inactive-fg);
+  border-bottom: 2px solid var(--inactive-bg-shadow);
   transition: all 0.1s ease-in;
 }
 
@@ -81,9 +86,9 @@
 }
 
 .filterButtonItem.active {
-  color: var(--code-bg);
-  border-bottom-color: var(--link-fg);
-  background-color: var(--active-tab-color);
+  color: var(--active-fg);
+  border-bottom-color: var(--active-bg-shadow);
+  background-color: var(--active-bg);
 }
 
 .filterButtonItem.visible {
@@ -91,17 +96,19 @@
 }
 
 .groupTitle {
-  min-width: 98px;
-  margin-top: 4px;
+  margin-bottom: 4px;
   font-weight: 700;
-  font-size: 14px;
-  color: var(--code-bg);
+  color: var(--body-fg);
+}
+.groupTitle > span {
+  display: inline-block;
+  vertical-align: baseline;
 }
 
 .groupButtonsContainer {
-  display: flex;
-  align-items: center;
-  margin-top: 4px;
+  display: inline-block;
+  vertical-align: baseline;
+  margin-left: 1em;
 }
 
 .selectAll {
@@ -114,8 +121,8 @@
   border: 0;
   background-color: transparent;
   padding: 0;
-  color: var(--code-bg);
-  font-size: 8px;
+  color: var(--active-fg);
+  font-size: 0.7em;
   cursor: pointer;
   transition: all 0.1s ease-in;
 }
@@ -123,7 +130,7 @@
 .selectAll {
   padding: 4px;
   border-radius: 2px;
-  background-color: var(--active-tab-color);
+  background-color: var(--active-bg);
 }
 
 .selectAll:hover,
@@ -133,5 +140,5 @@
 
 .deselectAll:hover,
 .deselectAll:focus {
-  color: var(--active-tab-color);
+  color: var(--active-bg);
 }
diff --git a/scaladoc/resources/dotty_res/styles/fontawesome.css b/scaladoc/resources/dotty_res/styles/fontawesome.css
new file mode 100644
index 000000000000..6280d727a6dc
--- /dev/null
+++ b/scaladoc/resources/dotty_res/styles/fontawesome.css
@@ -0,0 +1,4619 @@
+/*!
+ * Font Awesome Free 5.15.3 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+.fa,
+.fas,
+.far,
+.fal,
+.fad,
+.fab {
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  display: inline-block;
+  font-style: normal;
+  font-variant: normal;
+  text-rendering: auto;
+  line-height: 1; }
+
+.fa-lg {
+  font-size: 1.33333em;
+  line-height: 0.75em;
+  vertical-align: -.0667em; }
+
+.fa-xs {
+  font-size: .75em; }
+
+.fa-sm {
+  font-size: .875em; }
+
+.fa-1x {
+  font-size: 1em; }
+
+.fa-2x {
+  font-size: 2em; }
+
+.fa-3x {
+  font-size: 3em; }
+
+.fa-4x {
+  font-size: 4em; }
+
+.fa-5x {
+  font-size: 5em; }
+
+.fa-6x {
+  font-size: 6em; }
+
+.fa-7x {
+  font-size: 7em; }
+
+.fa-8x {
+  font-size: 8em; }
+
+.fa-9x {
+  font-size: 9em; }
+
+.fa-10x {
+  font-size: 10em; }
+
+.fa-fw {
+  text-align: center;
+  width: 1.25em; }
+
+.fa-ul {
+  list-style-type: none;
+  margin-left: 2.5em;
+  padding-left: 0; }
+  .fa-ul > li {
+    position: relative; }
+
+.fa-li {
+  left: -2em;
+  position: absolute;
+  text-align: center;
+  width: 2em;
+  line-height: inherit; }
+
+.fa-border {
+  border: solid 0.08em #eee;
+  border-radius: .1em;
+  padding: .2em .25em .15em; }
+
+.fa-pull-left {
+  float: left; }
+
+.fa-pull-right {
+  float: right; }
+
+.fa.fa-pull-left,
+.fas.fa-pull-left,
+.far.fa-pull-left,
+.fal.fa-pull-left,
+.fab.fa-pull-left {
+  margin-right: .3em; }
+
+.fa.fa-pull-right,
+.fas.fa-pull-right,
+.far.fa-pull-right,
+.fal.fa-pull-right,
+.fab.fa-pull-right {
+  margin-left: .3em; }
+
+.fa-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+          animation: fa-spin 2s infinite linear; }
+
+.fa-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+          animation: fa-spin 1s infinite steps(8); }
+
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg); } }
+
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg); } }
+
+.fa-rotate-90 {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
+  -webkit-transform: rotate(90deg);
+          transform: rotate(90deg); }
+
+.fa-rotate-180 {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
+  -webkit-transform: rotate(180deg);
+          transform: rotate(180deg); }
+
+.fa-rotate-270 {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
+  -webkit-transform: rotate(270deg);
+          transform: rotate(270deg); }
+
+.fa-flip-horizontal {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
+  -webkit-transform: scale(-1, 1);
+          transform: scale(-1, 1); }
+
+.fa-flip-vertical {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
+  -webkit-transform: scale(1, -1);
+          transform: scale(1, -1); }
+
+.fa-flip-both, .fa-flip-horizontal.fa-flip-vertical {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
+  -webkit-transform: scale(-1, -1);
+          transform: scale(-1, -1); }
+
+:root .fa-rotate-90,
+:root .fa-rotate-180,
+:root .fa-rotate-270,
+:root .fa-flip-horizontal,
+:root .fa-flip-vertical,
+:root .fa-flip-both {
+  -webkit-filter: none;
+          filter: none; }
+
+.fa-stack {
+  display: inline-block;
+  height: 2em;
+  line-height: 2em;
+  position: relative;
+  vertical-align: middle;
+  width: 2.5em; }
+
+.fa-stack-1x,
+.fa-stack-2x {
+  left: 0;
+  position: absolute;
+  text-align: center;
+  width: 100%; }
+
+.fa-stack-1x {
+  line-height: inherit; }
+
+.fa-stack-2x {
+  font-size: 2em; }
+
+.fa-inverse {
+  color: #fff; }
+
+/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+readers do not read off random characters that represent icons */
+.fa-500px:before {
+  content: "\f26e"; }
+
+.fa-accessible-icon:before {
+  content: "\f368"; }
+
+.fa-accusoft:before {
+  content: "\f369"; }
+
+.fa-acquisitions-incorporated:before {
+  content: "\f6af"; }
+
+.fa-ad:before {
+  content: "\f641"; }
+
+.fa-address-book:before {
+  content: "\f2b9"; }
+
+.fa-address-card:before {
+  content: "\f2bb"; }
+
+.fa-adjust:before {
+  content: "\f042"; }
+
+.fa-adn:before {
+  content: "\f170"; }
+
+.fa-adversal:before {
+  content: "\f36a"; }
+
+.fa-affiliatetheme:before {
+  content: "\f36b"; }
+
+.fa-air-freshener:before {
+  content: "\f5d0"; }
+
+.fa-airbnb:before {
+  content: "\f834"; }
+
+.fa-algolia:before {
+  content: "\f36c"; }
+
+.fa-align-center:before {
+  content: "\f037"; }
+
+.fa-align-justify:before {
+  content: "\f039"; }
+
+.fa-align-left:before {
+  content: "\f036"; }
+
+.fa-align-right:before {
+  content: "\f038"; }
+
+.fa-alipay:before {
+  content: "\f642"; }
+
+.fa-allergies:before {
+  content: "\f461"; }
+
+.fa-amazon:before {
+  content: "\f270"; }
+
+.fa-amazon-pay:before {
+  content: "\f42c"; }
+
+.fa-ambulance:before {
+  content: "\f0f9"; }
+
+.fa-american-sign-language-interpreting:before {
+  content: "\f2a3"; }
+
+.fa-amilia:before {
+  content: "\f36d"; }
+
+.fa-anchor:before {
+  content: "\f13d"; }
+
+.fa-android:before {
+  content: "\f17b"; }
+
+.fa-angellist:before {
+  content: "\f209"; }
+
+.fa-angle-double-down:before {
+  content: "\f103"; }
+
+.fa-angle-double-left:before {
+  content: "\f100"; }
+
+.fa-angle-double-right:before {
+  content: "\f101"; }
+
+.fa-angle-double-up:before {
+  content: "\f102"; }
+
+.fa-angle-down:before {
+  content: "\f107"; }
+
+.fa-angle-left:before {
+  content: "\f104"; }
+
+.fa-angle-right:before {
+  content: "\f105"; }
+
+.fa-angle-up:before {
+  content: "\f106"; }
+
+.fa-angry:before {
+  content: "\f556"; }
+
+.fa-angrycreative:before {
+  content: "\f36e"; }
+
+.fa-angular:before {
+  content: "\f420"; }
+
+.fa-ankh:before {
+  content: "\f644"; }
+
+.fa-app-store:before {
+  content: "\f36f"; }
+
+.fa-app-store-ios:before {
+  content: "\f370"; }
+
+.fa-apper:before {
+  content: "\f371"; }
+
+.fa-apple:before {
+  content: "\f179"; }
+
+.fa-apple-alt:before {
+  content: "\f5d1"; }
+
+.fa-apple-pay:before {
+  content: "\f415"; }
+
+.fa-archive:before {
+  content: "\f187"; }
+
+.fa-archway:before {
+  content: "\f557"; }
+
+.fa-arrow-alt-circle-down:before {
+  content: "\f358"; }
+
+.fa-arrow-alt-circle-left:before {
+  content: "\f359"; }
+
+.fa-arrow-alt-circle-right:before {
+  content: "\f35a"; }
+
+.fa-arrow-alt-circle-up:before {
+  content: "\f35b"; }
+
+.fa-arrow-circle-down:before {
+  content: "\f0ab"; }
+
+.fa-arrow-circle-left:before {
+  content: "\f0a8"; }
+
+.fa-arrow-circle-right:before {
+  content: "\f0a9"; }
+
+.fa-arrow-circle-up:before {
+  content: "\f0aa"; }
+
+.fa-arrow-down:before {
+  content: "\f063"; }
+
+.fa-arrow-left:before {
+  content: "\f060"; }
+
+.fa-arrow-right:before {
+  content: "\f061"; }
+
+.fa-arrow-up:before {
+  content: "\f062"; }
+
+.fa-arrows-alt:before {
+  content: "\f0b2"; }
+
+.fa-arrows-alt-h:before {
+  content: "\f337"; }
+
+.fa-arrows-alt-v:before {
+  content: "\f338"; }
+
+.fa-artstation:before {
+  content: "\f77a"; }
+
+.fa-assistive-listening-systems:before {
+  content: "\f2a2"; }
+
+.fa-asterisk:before {
+  content: "\f069"; }
+
+.fa-asymmetrik:before {
+  content: "\f372"; }
+
+.fa-at:before {
+  content: "\f1fa"; }
+
+.fa-atlas:before {
+  content: "\f558"; }
+
+.fa-atlassian:before {
+  content: "\f77b"; }
+
+.fa-atom:before {
+  content: "\f5d2"; }
+
+.fa-audible:before {
+  content: "\f373"; }
+
+.fa-audio-description:before {
+  content: "\f29e"; }
+
+.fa-autoprefixer:before {
+  content: "\f41c"; }
+
+.fa-avianex:before {
+  content: "\f374"; }
+
+.fa-aviato:before {
+  content: "\f421"; }
+
+.fa-award:before {
+  content: "\f559"; }
+
+.fa-aws:before {
+  content: "\f375"; }
+
+.fa-baby:before {
+  content: "\f77c"; }
+
+.fa-baby-carriage:before {
+  content: "\f77d"; }
+
+.fa-backspace:before {
+  content: "\f55a"; }
+
+.fa-backward:before {
+  content: "\f04a"; }
+
+.fa-bacon:before {
+  content: "\f7e5"; }
+
+.fa-bacteria:before {
+  content: "\e059"; }
+
+.fa-bacterium:before {
+  content: "\e05a"; }
+
+.fa-bahai:before {
+  content: "\f666"; }
+
+.fa-balance-scale:before {
+  content: "\f24e"; }
+
+.fa-balance-scale-left:before {
+  content: "\f515"; }
+
+.fa-balance-scale-right:before {
+  content: "\f516"; }
+
+.fa-ban:before {
+  content: "\f05e"; }
+
+.fa-band-aid:before {
+  content: "\f462"; }
+
+.fa-bandcamp:before {
+  content: "\f2d5"; }
+
+.fa-barcode:before {
+  content: "\f02a"; }
+
+.fa-bars:before {
+  content: "\f0c9"; }
+
+.fa-baseball-ball:before {
+  content: "\f433"; }
+
+.fa-basketball-ball:before {
+  content: "\f434"; }
+
+.fa-bath:before {
+  content: "\f2cd"; }
+
+.fa-battery-empty:before {
+  content: "\f244"; }
+
+.fa-battery-full:before {
+  content: "\f240"; }
+
+.fa-battery-half:before {
+  content: "\f242"; }
+
+.fa-battery-quarter:before {
+  content: "\f243"; }
+
+.fa-battery-three-quarters:before {
+  content: "\f241"; }
+
+.fa-battle-net:before {
+  content: "\f835"; }
+
+.fa-bed:before {
+  content: "\f236"; }
+
+.fa-beer:before {
+  content: "\f0fc"; }
+
+.fa-behance:before {
+  content: "\f1b4"; }
+
+.fa-behance-square:before {
+  content: "\f1b5"; }
+
+.fa-bell:before {
+  content: "\f0f3"; }
+
+.fa-bell-slash:before {
+  content: "\f1f6"; }
+
+.fa-bezier-curve:before {
+  content: "\f55b"; }
+
+.fa-bible:before {
+  content: "\f647"; }
+
+.fa-bicycle:before {
+  content: "\f206"; }
+
+.fa-biking:before {
+  content: "\f84a"; }
+
+.fa-bimobject:before {
+  content: "\f378"; }
+
+.fa-binoculars:before {
+  content: "\f1e5"; }
+
+.fa-biohazard:before {
+  content: "\f780"; }
+
+.fa-birthday-cake:before {
+  content: "\f1fd"; }
+
+.fa-bitbucket:before {
+  content: "\f171"; }
+
+.fa-bitcoin:before {
+  content: "\f379"; }
+
+.fa-bity:before {
+  content: "\f37a"; }
+
+.fa-black-tie:before {
+  content: "\f27e"; }
+
+.fa-blackberry:before {
+  content: "\f37b"; }
+
+.fa-blender:before {
+  content: "\f517"; }
+
+.fa-blender-phone:before {
+  content: "\f6b6"; }
+
+.fa-blind:before {
+  content: "\f29d"; }
+
+.fa-blog:before {
+  content: "\f781"; }
+
+.fa-blogger:before {
+  content: "\f37c"; }
+
+.fa-blogger-b:before {
+  content: "\f37d"; }
+
+.fa-bluetooth:before {
+  content: "\f293"; }
+
+.fa-bluetooth-b:before {
+  content: "\f294"; }
+
+.fa-bold:before {
+  content: "\f032"; }
+
+.fa-bolt:before {
+  content: "\f0e7"; }
+
+.fa-bomb:before {
+  content: "\f1e2"; }
+
+.fa-bone:before {
+  content: "\f5d7"; }
+
+.fa-bong:before {
+  content: "\f55c"; }
+
+.fa-book:before {
+  content: "\f02d"; }
+
+.fa-book-dead:before {
+  content: "\f6b7"; }
+
+.fa-book-medical:before {
+  content: "\f7e6"; }
+
+.fa-book-open:before {
+  content: "\f518"; }
+
+.fa-book-reader:before {
+  content: "\f5da"; }
+
+.fa-bookmark:before {
+  content: "\f02e"; }
+
+.fa-bootstrap:before {
+  content: "\f836"; }
+
+.fa-border-all:before {
+  content: "\f84c"; }
+
+.fa-border-none:before {
+  content: "\f850"; }
+
+.fa-border-style:before {
+  content: "\f853"; }
+
+.fa-bowling-ball:before {
+  content: "\f436"; }
+
+.fa-box:before {
+  content: "\f466"; }
+
+.fa-box-open:before {
+  content: "\f49e"; }
+
+.fa-box-tissue:before {
+  content: "\e05b"; }
+
+.fa-boxes:before {
+  content: "\f468"; }
+
+.fa-braille:before {
+  content: "\f2a1"; }
+
+.fa-brain:before {
+  content: "\f5dc"; }
+
+.fa-bread-slice:before {
+  content: "\f7ec"; }
+
+.fa-briefcase:before {
+  content: "\f0b1"; }
+
+.fa-briefcase-medical:before {
+  content: "\f469"; }
+
+.fa-broadcast-tower:before {
+  content: "\f519"; }
+
+.fa-broom:before {
+  content: "\f51a"; }
+
+.fa-brush:before {
+  content: "\f55d"; }
+
+.fa-btc:before {
+  content: "\f15a"; }
+
+.fa-buffer:before {
+  content: "\f837"; }
+
+.fa-bug:before {
+  content: "\f188"; }
+
+.fa-building:before {
+  content: "\f1ad"; }
+
+.fa-bullhorn:before {
+  content: "\f0a1"; }
+
+.fa-bullseye:before {
+  content: "\f140"; }
+
+.fa-burn:before {
+  content: "\f46a"; }
+
+.fa-buromobelexperte:before {
+  content: "\f37f"; }
+
+.fa-bus:before {
+  content: "\f207"; }
+
+.fa-bus-alt:before {
+  content: "\f55e"; }
+
+.fa-business-time:before {
+  content: "\f64a"; }
+
+.fa-buy-n-large:before {
+  content: "\f8a6"; }
+
+.fa-buysellads:before {
+  content: "\f20d"; }
+
+.fa-calculator:before {
+  content: "\f1ec"; }
+
+.fa-calendar:before {
+  content: "\f133"; }
+
+.fa-calendar-alt:before {
+  content: "\f073"; }
+
+.fa-calendar-check:before {
+  content: "\f274"; }
+
+.fa-calendar-day:before {
+  content: "\f783"; }
+
+.fa-calendar-minus:before {
+  content: "\f272"; }
+
+.fa-calendar-plus:before {
+  content: "\f271"; }
+
+.fa-calendar-times:before {
+  content: "\f273"; }
+
+.fa-calendar-week:before {
+  content: "\f784"; }
+
+.fa-camera:before {
+  content: "\f030"; }
+
+.fa-camera-retro:before {
+  content: "\f083"; }
+
+.fa-campground:before {
+  content: "\f6bb"; }
+
+.fa-canadian-maple-leaf:before {
+  content: "\f785"; }
+
+.fa-candy-cane:before {
+  content: "\f786"; }
+
+.fa-cannabis:before {
+  content: "\f55f"; }
+
+.fa-capsules:before {
+  content: "\f46b"; }
+
+.fa-car:before {
+  content: "\f1b9"; }
+
+.fa-car-alt:before {
+  content: "\f5de"; }
+
+.fa-car-battery:before {
+  content: "\f5df"; }
+
+.fa-car-crash:before {
+  content: "\f5e1"; }
+
+.fa-car-side:before {
+  content: "\f5e4"; }
+
+.fa-caravan:before {
+  content: "\f8ff"; }
+
+.fa-caret-down:before {
+  content: "\f0d7"; }
+
+.fa-caret-left:before {
+  content: "\f0d9"; }
+
+.fa-caret-right:before {
+  content: "\f0da"; }
+
+.fa-caret-square-down:before {
+  content: "\f150"; }
+
+.fa-caret-square-left:before {
+  content: "\f191"; }
+
+.fa-caret-square-right:before {
+  content: "\f152"; }
+
+.fa-caret-square-up:before {
+  content: "\f151"; }
+
+.fa-caret-up:before {
+  content: "\f0d8"; }
+
+.fa-carrot:before {
+  content: "\f787"; }
+
+.fa-cart-arrow-down:before {
+  content: "\f218"; }
+
+.fa-cart-plus:before {
+  content: "\f217"; }
+
+.fa-cash-register:before {
+  content: "\f788"; }
+
+.fa-cat:before {
+  content: "\f6be"; }
+
+.fa-cc-amazon-pay:before {
+  content: "\f42d"; }
+
+.fa-cc-amex:before {
+  content: "\f1f3"; }
+
+.fa-cc-apple-pay:before {
+  content: "\f416"; }
+
+.fa-cc-diners-club:before {
+  content: "\f24c"; }
+
+.fa-cc-discover:before {
+  content: "\f1f2"; }
+
+.fa-cc-jcb:before {
+  content: "\f24b"; }
+
+.fa-cc-mastercard:before {
+  content: "\f1f1"; }
+
+.fa-cc-paypal:before {
+  content: "\f1f4"; }
+
+.fa-cc-stripe:before {
+  content: "\f1f5"; }
+
+.fa-cc-visa:before {
+  content: "\f1f0"; }
+
+.fa-centercode:before {
+  content: "\f380"; }
+
+.fa-centos:before {
+  content: "\f789"; }
+
+.fa-certificate:before {
+  content: "\f0a3"; }
+
+.fa-chair:before {
+  content: "\f6c0"; }
+
+.fa-chalkboard:before {
+  content: "\f51b"; }
+
+.fa-chalkboard-teacher:before {
+  content: "\f51c"; }
+
+.fa-charging-station:before {
+  content: "\f5e7"; }
+
+.fa-chart-area:before {
+  content: "\f1fe"; }
+
+.fa-chart-bar:before {
+  content: "\f080"; }
+
+.fa-chart-line:before {
+  content: "\f201"; }
+
+.fa-chart-pie:before {
+  content: "\f200"; }
+
+.fa-check:before {
+  content: "\f00c"; }
+
+.fa-check-circle:before {
+  content: "\f058"; }
+
+.fa-check-double:before {
+  content: "\f560"; }
+
+.fa-check-square:before {
+  content: "\f14a"; }
+
+.fa-cheese:before {
+  content: "\f7ef"; }
+
+.fa-chess:before {
+  content: "\f439"; }
+
+.fa-chess-bishop:before {
+  content: "\f43a"; }
+
+.fa-chess-board:before {
+  content: "\f43c"; }
+
+.fa-chess-king:before {
+  content: "\f43f"; }
+
+.fa-chess-knight:before {
+  content: "\f441"; }
+
+.fa-chess-pawn:before {
+  content: "\f443"; }
+
+.fa-chess-queen:before {
+  content: "\f445"; }
+
+.fa-chess-rook:before {
+  content: "\f447"; }
+
+.fa-chevron-circle-down:before {
+  content: "\f13a"; }
+
+.fa-chevron-circle-left:before {
+  content: "\f137"; }
+
+.fa-chevron-circle-right:before {
+  content: "\f138"; }
+
+.fa-chevron-circle-up:before {
+  content: "\f139"; }
+
+.fa-chevron-down:before {
+  content: "\f078"; }
+
+.fa-chevron-left:before {
+  content: "\f053"; }
+
+.fa-chevron-right:before {
+  content: "\f054"; }
+
+.fa-chevron-up:before {
+  content: "\f077"; }
+
+.fa-child:before {
+  content: "\f1ae"; }
+
+.fa-chrome:before {
+  content: "\f268"; }
+
+.fa-chromecast:before {
+  content: "\f838"; }
+
+.fa-church:before {
+  content: "\f51d"; }
+
+.fa-circle:before {
+  content: "\f111"; }
+
+.fa-circle-notch:before {
+  content: "\f1ce"; }
+
+.fa-city:before {
+  content: "\f64f"; }
+
+.fa-clinic-medical:before {
+  content: "\f7f2"; }
+
+.fa-clipboard:before {
+  content: "\f328"; }
+
+.fa-clipboard-check:before {
+  content: "\f46c"; }
+
+.fa-clipboard-list:before {
+  content: "\f46d"; }
+
+.fa-clock:before {
+  content: "\f017"; }
+
+.fa-clone:before {
+  content: "\f24d"; }
+
+.fa-closed-captioning:before {
+  content: "\f20a"; }
+
+.fa-cloud:before {
+  content: "\f0c2"; }
+
+.fa-cloud-download-alt:before {
+  content: "\f381"; }
+
+.fa-cloud-meatball:before {
+  content: "\f73b"; }
+
+.fa-cloud-moon:before {
+  content: "\f6c3"; }
+
+.fa-cloud-moon-rain:before {
+  content: "\f73c"; }
+
+.fa-cloud-rain:before {
+  content: "\f73d"; }
+
+.fa-cloud-showers-heavy:before {
+  content: "\f740"; }
+
+.fa-cloud-sun:before {
+  content: "\f6c4"; }
+
+.fa-cloud-sun-rain:before {
+  content: "\f743"; }
+
+.fa-cloud-upload-alt:before {
+  content: "\f382"; }
+
+.fa-cloudflare:before {
+  content: "\e07d"; }
+
+.fa-cloudscale:before {
+  content: "\f383"; }
+
+.fa-cloudsmith:before {
+  content: "\f384"; }
+
+.fa-cloudversify:before {
+  content: "\f385"; }
+
+.fa-cocktail:before {
+  content: "\f561"; }
+
+.fa-code:before {
+  content: "\f121"; }
+
+.fa-code-branch:before {
+  content: "\f126"; }
+
+.fa-codepen:before {
+  content: "\f1cb"; }
+
+.fa-codiepie:before {
+  content: "\f284"; }
+
+.fa-coffee:before {
+  content: "\f0f4"; }
+
+.fa-cog:before {
+  content: "\f013"; }
+
+.fa-cogs:before {
+  content: "\f085"; }
+
+.fa-coins:before {
+  content: "\f51e"; }
+
+.fa-columns:before {
+  content: "\f0db"; }
+
+.fa-comment:before {
+  content: "\f075"; }
+
+.fa-comment-alt:before {
+  content: "\f27a"; }
+
+.fa-comment-dollar:before {
+  content: "\f651"; }
+
+.fa-comment-dots:before {
+  content: "\f4ad"; }
+
+.fa-comment-medical:before {
+  content: "\f7f5"; }
+
+.fa-comment-slash:before {
+  content: "\f4b3"; }
+
+.fa-comments:before {
+  content: "\f086"; }
+
+.fa-comments-dollar:before {
+  content: "\f653"; }
+
+.fa-compact-disc:before {
+  content: "\f51f"; }
+
+.fa-compass:before {
+  content: "\f14e"; }
+
+.fa-compress:before {
+  content: "\f066"; }
+
+.fa-compress-alt:before {
+  content: "\f422"; }
+
+.fa-compress-arrows-alt:before {
+  content: "\f78c"; }
+
+.fa-concierge-bell:before {
+  content: "\f562"; }
+
+.fa-confluence:before {
+  content: "\f78d"; }
+
+.fa-connectdevelop:before {
+  content: "\f20e"; }
+
+.fa-contao:before {
+  content: "\f26d"; }
+
+.fa-cookie:before {
+  content: "\f563"; }
+
+.fa-cookie-bite:before {
+  content: "\f564"; }
+
+.fa-copy:before {
+  content: "\f0c5"; }
+
+.fa-copyright:before {
+  content: "\f1f9"; }
+
+.fa-cotton-bureau:before {
+  content: "\f89e"; }
+
+.fa-couch:before {
+  content: "\f4b8"; }
+
+.fa-cpanel:before {
+  content: "\f388"; }
+
+.fa-creative-commons:before {
+  content: "\f25e"; }
+
+.fa-creative-commons-by:before {
+  content: "\f4e7"; }
+
+.fa-creative-commons-nc:before {
+  content: "\f4e8"; }
+
+.fa-creative-commons-nc-eu:before {
+  content: "\f4e9"; }
+
+.fa-creative-commons-nc-jp:before {
+  content: "\f4ea"; }
+
+.fa-creative-commons-nd:before {
+  content: "\f4eb"; }
+
+.fa-creative-commons-pd:before {
+  content: "\f4ec"; }
+
+.fa-creative-commons-pd-alt:before {
+  content: "\f4ed"; }
+
+.fa-creative-commons-remix:before {
+  content: "\f4ee"; }
+
+.fa-creative-commons-sa:before {
+  content: "\f4ef"; }
+
+.fa-creative-commons-sampling:before {
+  content: "\f4f0"; }
+
+.fa-creative-commons-sampling-plus:before {
+  content: "\f4f1"; }
+
+.fa-creative-commons-share:before {
+  content: "\f4f2"; }
+
+.fa-creative-commons-zero:before {
+  content: "\f4f3"; }
+
+.fa-credit-card:before {
+  content: "\f09d"; }
+
+.fa-critical-role:before {
+  content: "\f6c9"; }
+
+.fa-crop:before {
+  content: "\f125"; }
+
+.fa-crop-alt:before {
+  content: "\f565"; }
+
+.fa-cross:before {
+  content: "\f654"; }
+
+.fa-crosshairs:before {
+  content: "\f05b"; }
+
+.fa-crow:before {
+  content: "\f520"; }
+
+.fa-crown:before {
+  content: "\f521"; }
+
+.fa-crutch:before {
+  content: "\f7f7"; }
+
+.fa-css3:before {
+  content: "\f13c"; }
+
+.fa-css3-alt:before {
+  content: "\f38b"; }
+
+.fa-cube:before {
+  content: "\f1b2"; }
+
+.fa-cubes:before {
+  content: "\f1b3"; }
+
+.fa-cut:before {
+  content: "\f0c4"; }
+
+.fa-cuttlefish:before {
+  content: "\f38c"; }
+
+.fa-d-and-d:before {
+  content: "\f38d"; }
+
+.fa-d-and-d-beyond:before {
+  content: "\f6ca"; }
+
+.fa-dailymotion:before {
+  content: "\e052"; }
+
+.fa-dashcube:before {
+  content: "\f210"; }
+
+.fa-database:before {
+  content: "\f1c0"; }
+
+.fa-deaf:before {
+  content: "\f2a4"; }
+
+.fa-deezer:before {
+  content: "\e077"; }
+
+.fa-delicious:before {
+  content: "\f1a5"; }
+
+.fa-democrat:before {
+  content: "\f747"; }
+
+.fa-deploydog:before {
+  content: "\f38e"; }
+
+.fa-deskpro:before {
+  content: "\f38f"; }
+
+.fa-desktop:before {
+  content: "\f108"; }
+
+.fa-dev:before {
+  content: "\f6cc"; }
+
+.fa-deviantart:before {
+  content: "\f1bd"; }
+
+.fa-dharmachakra:before {
+  content: "\f655"; }
+
+.fa-dhl:before {
+  content: "\f790"; }
+
+.fa-diagnoses:before {
+  content: "\f470"; }
+
+.fa-diaspora:before {
+  content: "\f791"; }
+
+.fa-dice:before {
+  content: "\f522"; }
+
+.fa-dice-d20:before {
+  content: "\f6cf"; }
+
+.fa-dice-d6:before {
+  content: "\f6d1"; }
+
+.fa-dice-five:before {
+  content: "\f523"; }
+
+.fa-dice-four:before {
+  content: "\f524"; }
+
+.fa-dice-one:before {
+  content: "\f525"; }
+
+.fa-dice-six:before {
+  content: "\f526"; }
+
+.fa-dice-three:before {
+  content: "\f527"; }
+
+.fa-dice-two:before {
+  content: "\f528"; }
+
+.fa-digg:before {
+  content: "\f1a6"; }
+
+.fa-digital-ocean:before {
+  content: "\f391"; }
+
+.fa-digital-tachograph:before {
+  content: "\f566"; }
+
+.fa-directions:before {
+  content: "\f5eb"; }
+
+.fa-discord:before {
+  content: "\f392"; }
+
+.fa-discourse:before {
+  content: "\f393"; }
+
+.fa-disease:before {
+  content: "\f7fa"; }
+
+.fa-divide:before {
+  content: "\f529"; }
+
+.fa-dizzy:before {
+  content: "\f567"; }
+
+.fa-dna:before {
+  content: "\f471"; }
+
+.fa-dochub:before {
+  content: "\f394"; }
+
+.fa-docker:before {
+  content: "\f395"; }
+
+.fa-dog:before {
+  content: "\f6d3"; }
+
+.fa-dollar-sign:before {
+  content: "\f155"; }
+
+.fa-dolly:before {
+  content: "\f472"; }
+
+.fa-dolly-flatbed:before {
+  content: "\f474"; }
+
+.fa-donate:before {
+  content: "\f4b9"; }
+
+.fa-door-closed:before {
+  content: "\f52a"; }
+
+.fa-door-open:before {
+  content: "\f52b"; }
+
+.fa-dot-circle:before {
+  content: "\f192"; }
+
+.fa-dove:before {
+  content: "\f4ba"; }
+
+.fa-download:before {
+  content: "\f019"; }
+
+.fa-draft2digital:before {
+  content: "\f396"; }
+
+.fa-drafting-compass:before {
+  content: "\f568"; }
+
+.fa-dragon:before {
+  content: "\f6d5"; }
+
+.fa-draw-polygon:before {
+  content: "\f5ee"; }
+
+.fa-dribbble:before {
+  content: "\f17d"; }
+
+.fa-dribbble-square:before {
+  content: "\f397"; }
+
+.fa-dropbox:before {
+  content: "\f16b"; }
+
+.fa-drum:before {
+  content: "\f569"; }
+
+.fa-drum-steelpan:before {
+  content: "\f56a"; }
+
+.fa-drumstick-bite:before {
+  content: "\f6d7"; }
+
+.fa-drupal:before {
+  content: "\f1a9"; }
+
+.fa-dumbbell:before {
+  content: "\f44b"; }
+
+.fa-dumpster:before {
+  content: "\f793"; }
+
+.fa-dumpster-fire:before {
+  content: "\f794"; }
+
+.fa-dungeon:before {
+  content: "\f6d9"; }
+
+.fa-dyalog:before {
+  content: "\f399"; }
+
+.fa-earlybirds:before {
+  content: "\f39a"; }
+
+.fa-ebay:before {
+  content: "\f4f4"; }
+
+.fa-edge:before {
+  content: "\f282"; }
+
+.fa-edge-legacy:before {
+  content: "\e078"; }
+
+.fa-edit:before {
+  content: "\f044"; }
+
+.fa-egg:before {
+  content: "\f7fb"; }
+
+.fa-eject:before {
+  content: "\f052"; }
+
+.fa-elementor:before {
+  content: "\f430"; }
+
+.fa-ellipsis-h:before {
+  content: "\f141"; }
+
+.fa-ellipsis-v:before {
+  content: "\f142"; }
+
+.fa-ello:before {
+  content: "\f5f1"; }
+
+.fa-ember:before {
+  content: "\f423"; }
+
+.fa-empire:before {
+  content: "\f1d1"; }
+
+.fa-envelope:before {
+  content: "\f0e0"; }
+
+.fa-envelope-open:before {
+  content: "\f2b6"; }
+
+.fa-envelope-open-text:before {
+  content: "\f658"; }
+
+.fa-envelope-square:before {
+  content: "\f199"; }
+
+.fa-envira:before {
+  content: "\f299"; }
+
+.fa-equals:before {
+  content: "\f52c"; }
+
+.fa-eraser:before {
+  content: "\f12d"; }
+
+.fa-erlang:before {
+  content: "\f39d"; }
+
+.fa-ethereum:before {
+  content: "\f42e"; }
+
+.fa-ethernet:before {
+  content: "\f796"; }
+
+.fa-etsy:before {
+  content: "\f2d7"; }
+
+.fa-euro-sign:before {
+  content: "\f153"; }
+
+.fa-evernote:before {
+  content: "\f839"; }
+
+.fa-exchange-alt:before {
+  content: "\f362"; }
+
+.fa-exclamation:before {
+  content: "\f12a"; }
+
+.fa-exclamation-circle:before {
+  content: "\f06a"; }
+
+.fa-exclamation-triangle:before {
+  content: "\f071"; }
+
+.fa-expand:before {
+  content: "\f065"; }
+
+.fa-expand-alt:before {
+  content: "\f424"; }
+
+.fa-expand-arrows-alt:before {
+  content: "\f31e"; }
+
+.fa-expeditedssl:before {
+  content: "\f23e"; }
+
+.fa-external-link-alt:before {
+  content: "\f35d"; }
+
+.fa-external-link-square-alt:before {
+  content: "\f360"; }
+
+.fa-eye:before {
+  content: "\f06e"; }
+
+.fa-eye-dropper:before {
+  content: "\f1fb"; }
+
+.fa-eye-slash:before {
+  content: "\f070"; }
+
+.fa-facebook:before {
+  content: "\f09a"; }
+
+.fa-facebook-f:before {
+  content: "\f39e"; }
+
+.fa-facebook-messenger:before {
+  content: "\f39f"; }
+
+.fa-facebook-square:before {
+  content: "\f082"; }
+
+.fa-fan:before {
+  content: "\f863"; }
+
+.fa-fantasy-flight-games:before {
+  content: "\f6dc"; }
+
+.fa-fast-backward:before {
+  content: "\f049"; }
+
+.fa-fast-forward:before {
+  content: "\f050"; }
+
+.fa-faucet:before {
+  content: "\e005"; }
+
+.fa-fax:before {
+  content: "\f1ac"; }
+
+.fa-feather:before {
+  content: "\f52d"; }
+
+.fa-feather-alt:before {
+  content: "\f56b"; }
+
+.fa-fedex:before {
+  content: "\f797"; }
+
+.fa-fedora:before {
+  content: "\f798"; }
+
+.fa-female:before {
+  content: "\f182"; }
+
+.fa-fighter-jet:before {
+  content: "\f0fb"; }
+
+.fa-figma:before {
+  content: "\f799"; }
+
+.fa-file:before {
+  content: "\f15b"; }
+
+.fa-file-alt:before {
+  content: "\f15c"; }
+
+.fa-file-archive:before {
+  content: "\f1c6"; }
+
+.fa-file-audio:before {
+  content: "\f1c7"; }
+
+.fa-file-code:before {
+  content: "\f1c9"; }
+
+.fa-file-contract:before {
+  content: "\f56c"; }
+
+.fa-file-csv:before {
+  content: "\f6dd"; }
+
+.fa-file-download:before {
+  content: "\f56d"; }
+
+.fa-file-excel:before {
+  content: "\f1c3"; }
+
+.fa-file-export:before {
+  content: "\f56e"; }
+
+.fa-file-image:before {
+  content: "\f1c5"; }
+
+.fa-file-import:before {
+  content: "\f56f"; }
+
+.fa-file-invoice:before {
+  content: "\f570"; }
+
+.fa-file-invoice-dollar:before {
+  content: "\f571"; }
+
+.fa-file-medical:before {
+  content: "\f477"; }
+
+.fa-file-medical-alt:before {
+  content: "\f478"; }
+
+.fa-file-pdf:before {
+  content: "\f1c1"; }
+
+.fa-file-powerpoint:before {
+  content: "\f1c4"; }
+
+.fa-file-prescription:before {
+  content: "\f572"; }
+
+.fa-file-signature:before {
+  content: "\f573"; }
+
+.fa-file-upload:before {
+  content: "\f574"; }
+
+.fa-file-video:before {
+  content: "\f1c8"; }
+
+.fa-file-word:before {
+  content: "\f1c2"; }
+
+.fa-fill:before {
+  content: "\f575"; }
+
+.fa-fill-drip:before {
+  content: "\f576"; }
+
+.fa-film:before {
+  content: "\f008"; }
+
+.fa-filter:before {
+  content: "\f0b0"; }
+
+.fa-fingerprint:before {
+  content: "\f577"; }
+
+.fa-fire:before {
+  content: "\f06d"; }
+
+.fa-fire-alt:before {
+  content: "\f7e4"; }
+
+.fa-fire-extinguisher:before {
+  content: "\f134"; }
+
+.fa-firefox:before {
+  content: "\f269"; }
+
+.fa-firefox-browser:before {
+  content: "\e007"; }
+
+.fa-first-aid:before {
+  content: "\f479"; }
+
+.fa-first-order:before {
+  content: "\f2b0"; }
+
+.fa-first-order-alt:before {
+  content: "\f50a"; }
+
+.fa-firstdraft:before {
+  content: "\f3a1"; }
+
+.fa-fish:before {
+  content: "\f578"; }
+
+.fa-fist-raised:before {
+  content: "\f6de"; }
+
+.fa-flag:before {
+  content: "\f024"; }
+
+.fa-flag-checkered:before {
+  content: "\f11e"; }
+
+.fa-flag-usa:before {
+  content: "\f74d"; }
+
+.fa-flask:before {
+  content: "\f0c3"; }
+
+.fa-flickr:before {
+  content: "\f16e"; }
+
+.fa-flipboard:before {
+  content: "\f44d"; }
+
+.fa-flushed:before {
+  content: "\f579"; }
+
+.fa-fly:before {
+  content: "\f417"; }
+
+.fa-folder:before {
+  content: "\f07b"; }
+
+.fa-folder-minus:before {
+  content: "\f65d"; }
+
+.fa-folder-open:before {
+  content: "\f07c"; }
+
+.fa-folder-plus:before {
+  content: "\f65e"; }
+
+.fa-font:before {
+  content: "\f031"; }
+
+.fa-font-awesome:before {
+  content: "\f2b4"; }
+
+.fa-font-awesome-alt:before {
+  content: "\f35c"; }
+
+.fa-font-awesome-flag:before {
+  content: "\f425"; }
+
+.fa-font-awesome-logo-full:before {
+  content: "\f4e6"; }
+
+.fa-fonticons:before {
+  content: "\f280"; }
+
+.fa-fonticons-fi:before {
+  content: "\f3a2"; }
+
+.fa-football-ball:before {
+  content: "\f44e"; }
+
+.fa-fort-awesome:before {
+  content: "\f286"; }
+
+.fa-fort-awesome-alt:before {
+  content: "\f3a3"; }
+
+.fa-forumbee:before {
+  content: "\f211"; }
+
+.fa-forward:before {
+  content: "\f04e"; }
+
+.fa-foursquare:before {
+  content: "\f180"; }
+
+.fa-free-code-camp:before {
+  content: "\f2c5"; }
+
+.fa-freebsd:before {
+  content: "\f3a4"; }
+
+.fa-frog:before {
+  content: "\f52e"; }
+
+.fa-frown:before {
+  content: "\f119"; }
+
+.fa-frown-open:before {
+  content: "\f57a"; }
+
+.fa-fulcrum:before {
+  content: "\f50b"; }
+
+.fa-funnel-dollar:before {
+  content: "\f662"; }
+
+.fa-futbol:before {
+  content: "\f1e3"; }
+
+.fa-galactic-republic:before {
+  content: "\f50c"; }
+
+.fa-galactic-senate:before {
+  content: "\f50d"; }
+
+.fa-gamepad:before {
+  content: "\f11b"; }
+
+.fa-gas-pump:before {
+  content: "\f52f"; }
+
+.fa-gavel:before {
+  content: "\f0e3"; }
+
+.fa-gem:before {
+  content: "\f3a5"; }
+
+.fa-genderless:before {
+  content: "\f22d"; }
+
+.fa-get-pocket:before {
+  content: "\f265"; }
+
+.fa-gg:before {
+  content: "\f260"; }
+
+.fa-gg-circle:before {
+  content: "\f261"; }
+
+.fa-ghost:before {
+  content: "\f6e2"; }
+
+.fa-gift:before {
+  content: "\f06b"; }
+
+.fa-gifts:before {
+  content: "\f79c"; }
+
+.fa-git:before {
+  content: "\f1d3"; }
+
+.fa-git-alt:before {
+  content: "\f841"; }
+
+.fa-git-square:before {
+  content: "\f1d2"; }
+
+.fa-github:before {
+  content: "\f09b"; }
+
+.fa-github-alt:before {
+  content: "\f113"; }
+
+.fa-github-square:before {
+  content: "\f092"; }
+
+.fa-gitkraken:before {
+  content: "\f3a6"; }
+
+.fa-gitlab:before {
+  content: "\f296"; }
+
+.fa-gitter:before {
+  content: "\f426"; }
+
+.fa-glass-cheers:before {
+  content: "\f79f"; }
+
+.fa-glass-martini:before {
+  content: "\f000"; }
+
+.fa-glass-martini-alt:before {
+  content: "\f57b"; }
+
+.fa-glass-whiskey:before {
+  content: "\f7a0"; }
+
+.fa-glasses:before {
+  content: "\f530"; }
+
+.fa-glide:before {
+  content: "\f2a5"; }
+
+.fa-glide-g:before {
+  content: "\f2a6"; }
+
+.fa-globe:before {
+  content: "\f0ac"; }
+
+.fa-globe-africa:before {
+  content: "\f57c"; }
+
+.fa-globe-americas:before {
+  content: "\f57d"; }
+
+.fa-globe-asia:before {
+  content: "\f57e"; }
+
+.fa-globe-europe:before {
+  content: "\f7a2"; }
+
+.fa-gofore:before {
+  content: "\f3a7"; }
+
+.fa-golf-ball:before {
+  content: "\f450"; }
+
+.fa-goodreads:before {
+  content: "\f3a8"; }
+
+.fa-goodreads-g:before {
+  content: "\f3a9"; }
+
+.fa-google:before {
+  content: "\f1a0"; }
+
+.fa-google-drive:before {
+  content: "\f3aa"; }
+
+.fa-google-pay:before {
+  content: "\e079"; }
+
+.fa-google-play:before {
+  content: "\f3ab"; }
+
+.fa-google-plus:before {
+  content: "\f2b3"; }
+
+.fa-google-plus-g:before {
+  content: "\f0d5"; }
+
+.fa-google-plus-square:before {
+  content: "\f0d4"; }
+
+.fa-google-wallet:before {
+  content: "\f1ee"; }
+
+.fa-gopuram:before {
+  content: "\f664"; }
+
+.fa-graduation-cap:before {
+  content: "\f19d"; }
+
+.fa-gratipay:before {
+  content: "\f184"; }
+
+.fa-grav:before {
+  content: "\f2d6"; }
+
+.fa-greater-than:before {
+  content: "\f531"; }
+
+.fa-greater-than-equal:before {
+  content: "\f532"; }
+
+.fa-grimace:before {
+  content: "\f57f"; }
+
+.fa-grin:before {
+  content: "\f580"; }
+
+.fa-grin-alt:before {
+  content: "\f581"; }
+
+.fa-grin-beam:before {
+  content: "\f582"; }
+
+.fa-grin-beam-sweat:before {
+  content: "\f583"; }
+
+.fa-grin-hearts:before {
+  content: "\f584"; }
+
+.fa-grin-squint:before {
+  content: "\f585"; }
+
+.fa-grin-squint-tears:before {
+  content: "\f586"; }
+
+.fa-grin-stars:before {
+  content: "\f587"; }
+
+.fa-grin-tears:before {
+  content: "\f588"; }
+
+.fa-grin-tongue:before {
+  content: "\f589"; }
+
+.fa-grin-tongue-squint:before {
+  content: "\f58a"; }
+
+.fa-grin-tongue-wink:before {
+  content: "\f58b"; }
+
+.fa-grin-wink:before {
+  content: "\f58c"; }
+
+.fa-grip-horizontal:before {
+  content: "\f58d"; }
+
+.fa-grip-lines:before {
+  content: "\f7a4"; }
+
+.fa-grip-lines-vertical:before {
+  content: "\f7a5"; }
+
+.fa-grip-vertical:before {
+  content: "\f58e"; }
+
+.fa-gripfire:before {
+  content: "\f3ac"; }
+
+.fa-grunt:before {
+  content: "\f3ad"; }
+
+.fa-guilded:before {
+  content: "\e07e"; }
+
+.fa-guitar:before {
+  content: "\f7a6"; }
+
+.fa-gulp:before {
+  content: "\f3ae"; }
+
+.fa-h-square:before {
+  content: "\f0fd"; }
+
+.fa-hacker-news:before {
+  content: "\f1d4"; }
+
+.fa-hacker-news-square:before {
+  content: "\f3af"; }
+
+.fa-hackerrank:before {
+  content: "\f5f7"; }
+
+.fa-hamburger:before {
+  content: "\f805"; }
+
+.fa-hammer:before {
+  content: "\f6e3"; }
+
+.fa-hamsa:before {
+  content: "\f665"; }
+
+.fa-hand-holding:before {
+  content: "\f4bd"; }
+
+.fa-hand-holding-heart:before {
+  content: "\f4be"; }
+
+.fa-hand-holding-medical:before {
+  content: "\e05c"; }
+
+.fa-hand-holding-usd:before {
+  content: "\f4c0"; }
+
+.fa-hand-holding-water:before {
+  content: "\f4c1"; }
+
+.fa-hand-lizard:before {
+  content: "\f258"; }
+
+.fa-hand-middle-finger:before {
+  content: "\f806"; }
+
+.fa-hand-paper:before {
+  content: "\f256"; }
+
+.fa-hand-peace:before {
+  content: "\f25b"; }
+
+.fa-hand-point-down:before {
+  content: "\f0a7"; }
+
+.fa-hand-point-left:before {
+  content: "\f0a5"; }
+
+.fa-hand-point-right:before {
+  content: "\f0a4"; }
+
+.fa-hand-point-up:before {
+  content: "\f0a6"; }
+
+.fa-hand-pointer:before {
+  content: "\f25a"; }
+
+.fa-hand-rock:before {
+  content: "\f255"; }
+
+.fa-hand-scissors:before {
+  content: "\f257"; }
+
+.fa-hand-sparkles:before {
+  content: "\e05d"; }
+
+.fa-hand-spock:before {
+  content: "\f259"; }
+
+.fa-hands:before {
+  content: "\f4c2"; }
+
+.fa-hands-helping:before {
+  content: "\f4c4"; }
+
+.fa-hands-wash:before {
+  content: "\e05e"; }
+
+.fa-handshake:before {
+  content: "\f2b5"; }
+
+.fa-handshake-alt-slash:before {
+  content: "\e05f"; }
+
+.fa-handshake-slash:before {
+  content: "\e060"; }
+
+.fa-hanukiah:before {
+  content: "\f6e6"; }
+
+.fa-hard-hat:before {
+  content: "\f807"; }
+
+.fa-hashtag:before {
+  content: "\f292"; }
+
+.fa-hat-cowboy:before {
+  content: "\f8c0"; }
+
+.fa-hat-cowboy-side:before {
+  content: "\f8c1"; }
+
+.fa-hat-wizard:before {
+  content: "\f6e8"; }
+
+.fa-hdd:before {
+  content: "\f0a0"; }
+
+.fa-head-side-cough:before {
+  content: "\e061"; }
+
+.fa-head-side-cough-slash:before {
+  content: "\e062"; }
+
+.fa-head-side-mask:before {
+  content: "\e063"; }
+
+.fa-head-side-virus:before {
+  content: "\e064"; }
+
+.fa-heading:before {
+  content: "\f1dc"; }
+
+.fa-headphones:before {
+  content: "\f025"; }
+
+.fa-headphones-alt:before {
+  content: "\f58f"; }
+
+.fa-headset:before {
+  content: "\f590"; }
+
+.fa-heart:before {
+  content: "\f004"; }
+
+.fa-heart-broken:before {
+  content: "\f7a9"; }
+
+.fa-heartbeat:before {
+  content: "\f21e"; }
+
+.fa-helicopter:before {
+  content: "\f533"; }
+
+.fa-highlighter:before {
+  content: "\f591"; }
+
+.fa-hiking:before {
+  content: "\f6ec"; }
+
+.fa-hippo:before {
+  content: "\f6ed"; }
+
+.fa-hips:before {
+  content: "\f452"; }
+
+.fa-hire-a-helper:before {
+  content: "\f3b0"; }
+
+.fa-history:before {
+  content: "\f1da"; }
+
+.fa-hive:before {
+  content: "\e07f"; }
+
+.fa-hockey-puck:before {
+  content: "\f453"; }
+
+.fa-holly-berry:before {
+  content: "\f7aa"; }
+
+.fa-home:before {
+  content: "\f015"; }
+
+.fa-hooli:before {
+  content: "\f427"; }
+
+.fa-hornbill:before {
+  content: "\f592"; }
+
+.fa-horse:before {
+  content: "\f6f0"; }
+
+.fa-horse-head:before {
+  content: "\f7ab"; }
+
+.fa-hospital:before {
+  content: "\f0f8"; }
+
+.fa-hospital-alt:before {
+  content: "\f47d"; }
+
+.fa-hospital-symbol:before {
+  content: "\f47e"; }
+
+.fa-hospital-user:before {
+  content: "\f80d"; }
+
+.fa-hot-tub:before {
+  content: "\f593"; }
+
+.fa-hotdog:before {
+  content: "\f80f"; }
+
+.fa-hotel:before {
+  content: "\f594"; }
+
+.fa-hotjar:before {
+  content: "\f3b1"; }
+
+.fa-hourglass:before {
+  content: "\f254"; }
+
+.fa-hourglass-end:before {
+  content: "\f253"; }
+
+.fa-hourglass-half:before {
+  content: "\f252"; }
+
+.fa-hourglass-start:before {
+  content: "\f251"; }
+
+.fa-house-damage:before {
+  content: "\f6f1"; }
+
+.fa-house-user:before {
+  content: "\e065"; }
+
+.fa-houzz:before {
+  content: "\f27c"; }
+
+.fa-hryvnia:before {
+  content: "\f6f2"; }
+
+.fa-html5:before {
+  content: "\f13b"; }
+
+.fa-hubspot:before {
+  content: "\f3b2"; }
+
+.fa-i-cursor:before {
+  content: "\f246"; }
+
+.fa-ice-cream:before {
+  content: "\f810"; }
+
+.fa-icicles:before {
+  content: "\f7ad"; }
+
+.fa-icons:before {
+  content: "\f86d"; }
+
+.fa-id-badge:before {
+  content: "\f2c1"; }
+
+.fa-id-card:before {
+  content: "\f2c2"; }
+
+.fa-id-card-alt:before {
+  content: "\f47f"; }
+
+.fa-ideal:before {
+  content: "\e013"; }
+
+.fa-igloo:before {
+  content: "\f7ae"; }
+
+.fa-image:before {
+  content: "\f03e"; }
+
+.fa-images:before {
+  content: "\f302"; }
+
+.fa-imdb:before {
+  content: "\f2d8"; }
+
+.fa-inbox:before {
+  content: "\f01c"; }
+
+.fa-indent:before {
+  content: "\f03c"; }
+
+.fa-industry:before {
+  content: "\f275"; }
+
+.fa-infinity:before {
+  content: "\f534"; }
+
+.fa-info:before {
+  content: "\f129"; }
+
+.fa-info-circle:before {
+  content: "\f05a"; }
+
+.fa-innosoft:before {
+  content: "\e080"; }
+
+.fa-instagram:before {
+  content: "\f16d"; }
+
+.fa-instagram-square:before {
+  content: "\e055"; }
+
+.fa-instalod:before {
+  content: "\e081"; }
+
+.fa-intercom:before {
+  content: "\f7af"; }
+
+.fa-internet-explorer:before {
+  content: "\f26b"; }
+
+.fa-invision:before {
+  content: "\f7b0"; }
+
+.fa-ioxhost:before {
+  content: "\f208"; }
+
+.fa-italic:before {
+  content: "\f033"; }
+
+.fa-itch-io:before {
+  content: "\f83a"; }
+
+.fa-itunes:before {
+  content: "\f3b4"; }
+
+.fa-itunes-note:before {
+  content: "\f3b5"; }
+
+.fa-java:before {
+  content: "\f4e4"; }
+
+.fa-jedi:before {
+  content: "\f669"; }
+
+.fa-jedi-order:before {
+  content: "\f50e"; }
+
+.fa-jenkins:before {
+  content: "\f3b6"; }
+
+.fa-jira:before {
+  content: "\f7b1"; }
+
+.fa-joget:before {
+  content: "\f3b7"; }
+
+.fa-joint:before {
+  content: "\f595"; }
+
+.fa-joomla:before {
+  content: "\f1aa"; }
+
+.fa-journal-whills:before {
+  content: "\f66a"; }
+
+.fa-js:before {
+  content: "\f3b8"; }
+
+.fa-js-square:before {
+  content: "\f3b9"; }
+
+.fa-jsfiddle:before {
+  content: "\f1cc"; }
+
+.fa-kaaba:before {
+  content: "\f66b"; }
+
+.fa-kaggle:before {
+  content: "\f5fa"; }
+
+.fa-key:before {
+  content: "\f084"; }
+
+.fa-keybase:before {
+  content: "\f4f5"; }
+
+.fa-keyboard:before {
+  content: "\f11c"; }
+
+.fa-keycdn:before {
+  content: "\f3ba"; }
+
+.fa-khanda:before {
+  content: "\f66d"; }
+
+.fa-kickstarter:before {
+  content: "\f3bb"; }
+
+.fa-kickstarter-k:before {
+  content: "\f3bc"; }
+
+.fa-kiss:before {
+  content: "\f596"; }
+
+.fa-kiss-beam:before {
+  content: "\f597"; }
+
+.fa-kiss-wink-heart:before {
+  content: "\f598"; }
+
+.fa-kiwi-bird:before {
+  content: "\f535"; }
+
+.fa-korvue:before {
+  content: "\f42f"; }
+
+.fa-landmark:before {
+  content: "\f66f"; }
+
+.fa-language:before {
+  content: "\f1ab"; }
+
+.fa-laptop:before {
+  content: "\f109"; }
+
+.fa-laptop-code:before {
+  content: "\f5fc"; }
+
+.fa-laptop-house:before {
+  content: "\e066"; }
+
+.fa-laptop-medical:before {
+  content: "\f812"; }
+
+.fa-laravel:before {
+  content: "\f3bd"; }
+
+.fa-lastfm:before {
+  content: "\f202"; }
+
+.fa-lastfm-square:before {
+  content: "\f203"; }
+
+.fa-laugh:before {
+  content: "\f599"; }
+
+.fa-laugh-beam:before {
+  content: "\f59a"; }
+
+.fa-laugh-squint:before {
+  content: "\f59b"; }
+
+.fa-laugh-wink:before {
+  content: "\f59c"; }
+
+.fa-layer-group:before {
+  content: "\f5fd"; }
+
+.fa-leaf:before {
+  content: "\f06c"; }
+
+.fa-leanpub:before {
+  content: "\f212"; }
+
+.fa-lemon:before {
+  content: "\f094"; }
+
+.fa-less:before {
+  content: "\f41d"; }
+
+.fa-less-than:before {
+  content: "\f536"; }
+
+.fa-less-than-equal:before {
+  content: "\f537"; }
+
+.fa-level-down-alt:before {
+  content: "\f3be"; }
+
+.fa-level-up-alt:before {
+  content: "\f3bf"; }
+
+.fa-life-ring:before {
+  content: "\f1cd"; }
+
+.fa-lightbulb:before {
+  content: "\f0eb"; }
+
+.fa-line:before {
+  content: "\f3c0"; }
+
+.fa-link:before {
+  content: "\f0c1"; }
+
+.fa-linkedin:before {
+  content: "\f08c"; }
+
+.fa-linkedin-in:before {
+  content: "\f0e1"; }
+
+.fa-linode:before {
+  content: "\f2b8"; }
+
+.fa-linux:before {
+  content: "\f17c"; }
+
+.fa-lira-sign:before {
+  content: "\f195"; }
+
+.fa-list:before {
+  content: "\f03a"; }
+
+.fa-list-alt:before {
+  content: "\f022"; }
+
+.fa-list-ol:before {
+  content: "\f0cb"; }
+
+.fa-list-ul:before {
+  content: "\f0ca"; }
+
+.fa-location-arrow:before {
+  content: "\f124"; }
+
+.fa-lock:before {
+  content: "\f023"; }
+
+.fa-lock-open:before {
+  content: "\f3c1"; }
+
+.fa-long-arrow-alt-down:before {
+  content: "\f309"; }
+
+.fa-long-arrow-alt-left:before {
+  content: "\f30a"; }
+
+.fa-long-arrow-alt-right:before {
+  content: "\f30b"; }
+
+.fa-long-arrow-alt-up:before {
+  content: "\f30c"; }
+
+.fa-low-vision:before {
+  content: "\f2a8"; }
+
+.fa-luggage-cart:before {
+  content: "\f59d"; }
+
+.fa-lungs:before {
+  content: "\f604"; }
+
+.fa-lungs-virus:before {
+  content: "\e067"; }
+
+.fa-lyft:before {
+  content: "\f3c3"; }
+
+.fa-magento:before {
+  content: "\f3c4"; }
+
+.fa-magic:before {
+  content: "\f0d0"; }
+
+.fa-magnet:before {
+  content: "\f076"; }
+
+.fa-mail-bulk:before {
+  content: "\f674"; }
+
+.fa-mailchimp:before {
+  content: "\f59e"; }
+
+.fa-male:before {
+  content: "\f183"; }
+
+.fa-mandalorian:before {
+  content: "\f50f"; }
+
+.fa-map:before {
+  content: "\f279"; }
+
+.fa-map-marked:before {
+  content: "\f59f"; }
+
+.fa-map-marked-alt:before {
+  content: "\f5a0"; }
+
+.fa-map-marker:before {
+  content: "\f041"; }
+
+.fa-map-marker-alt:before {
+  content: "\f3c5"; }
+
+.fa-map-pin:before {
+  content: "\f276"; }
+
+.fa-map-signs:before {
+  content: "\f277"; }
+
+.fa-markdown:before {
+  content: "\f60f"; }
+
+.fa-marker:before {
+  content: "\f5a1"; }
+
+.fa-mars:before {
+  content: "\f222"; }
+
+.fa-mars-double:before {
+  content: "\f227"; }
+
+.fa-mars-stroke:before {
+  content: "\f229"; }
+
+.fa-mars-stroke-h:before {
+  content: "\f22b"; }
+
+.fa-mars-stroke-v:before {
+  content: "\f22a"; }
+
+.fa-mask:before {
+  content: "\f6fa"; }
+
+.fa-mastodon:before {
+  content: "\f4f6"; }
+
+.fa-maxcdn:before {
+  content: "\f136"; }
+
+.fa-mdb:before {
+  content: "\f8ca"; }
+
+.fa-medal:before {
+  content: "\f5a2"; }
+
+.fa-medapps:before {
+  content: "\f3c6"; }
+
+.fa-medium:before {
+  content: "\f23a"; }
+
+.fa-medium-m:before {
+  content: "\f3c7"; }
+
+.fa-medkit:before {
+  content: "\f0fa"; }
+
+.fa-medrt:before {
+  content: "\f3c8"; }
+
+.fa-meetup:before {
+  content: "\f2e0"; }
+
+.fa-megaport:before {
+  content: "\f5a3"; }
+
+.fa-meh:before {
+  content: "\f11a"; }
+
+.fa-meh-blank:before {
+  content: "\f5a4"; }
+
+.fa-meh-rolling-eyes:before {
+  content: "\f5a5"; }
+
+.fa-memory:before {
+  content: "\f538"; }
+
+.fa-mendeley:before {
+  content: "\f7b3"; }
+
+.fa-menorah:before {
+  content: "\f676"; }
+
+.fa-mercury:before {
+  content: "\f223"; }
+
+.fa-meteor:before {
+  content: "\f753"; }
+
+.fa-microblog:before {
+  content: "\e01a"; }
+
+.fa-microchip:before {
+  content: "\f2db"; }
+
+.fa-microphone:before {
+  content: "\f130"; }
+
+.fa-microphone-alt:before {
+  content: "\f3c9"; }
+
+.fa-microphone-alt-slash:before {
+  content: "\f539"; }
+
+.fa-microphone-slash:before {
+  content: "\f131"; }
+
+.fa-microscope:before {
+  content: "\f610"; }
+
+.fa-microsoft:before {
+  content: "\f3ca"; }
+
+.fa-minus:before {
+  content: "\f068"; }
+
+.fa-minus-circle:before {
+  content: "\f056"; }
+
+.fa-minus-square:before {
+  content: "\f146"; }
+
+.fa-mitten:before {
+  content: "\f7b5"; }
+
+.fa-mix:before {
+  content: "\f3cb"; }
+
+.fa-mixcloud:before {
+  content: "\f289"; }
+
+.fa-mixer:before {
+  content: "\e056"; }
+
+.fa-mizuni:before {
+  content: "\f3cc"; }
+
+.fa-mobile:before {
+  content: "\f10b"; }
+
+.fa-mobile-alt:before {
+  content: "\f3cd"; }
+
+.fa-modx:before {
+  content: "\f285"; }
+
+.fa-monero:before {
+  content: "\f3d0"; }
+
+.fa-money-bill:before {
+  content: "\f0d6"; }
+
+.fa-money-bill-alt:before {
+  content: "\f3d1"; }
+
+.fa-money-bill-wave:before {
+  content: "\f53a"; }
+
+.fa-money-bill-wave-alt:before {
+  content: "\f53b"; }
+
+.fa-money-check:before {
+  content: "\f53c"; }
+
+.fa-money-check-alt:before {
+  content: "\f53d"; }
+
+.fa-monument:before {
+  content: "\f5a6"; }
+
+.fa-moon:before {
+  content: "\f186"; }
+
+.fa-mortar-pestle:before {
+  content: "\f5a7"; }
+
+.fa-mosque:before {
+  content: "\f678"; }
+
+.fa-motorcycle:before {
+  content: "\f21c"; }
+
+.fa-mountain:before {
+  content: "\f6fc"; }
+
+.fa-mouse:before {
+  content: "\f8cc"; }
+
+.fa-mouse-pointer:before {
+  content: "\f245"; }
+
+.fa-mug-hot:before {
+  content: "\f7b6"; }
+
+.fa-music:before {
+  content: "\f001"; }
+
+.fa-napster:before {
+  content: "\f3d2"; }
+
+.fa-neos:before {
+  content: "\f612"; }
+
+.fa-network-wired:before {
+  content: "\f6ff"; }
+
+.fa-neuter:before {
+  content: "\f22c"; }
+
+.fa-newspaper:before {
+  content: "\f1ea"; }
+
+.fa-nimblr:before {
+  content: "\f5a8"; }
+
+.fa-node:before {
+  content: "\f419"; }
+
+.fa-node-js:before {
+  content: "\f3d3"; }
+
+.fa-not-equal:before {
+  content: "\f53e"; }
+
+.fa-notes-medical:before {
+  content: "\f481"; }
+
+.fa-npm:before {
+  content: "\f3d4"; }
+
+.fa-ns8:before {
+  content: "\f3d5"; }
+
+.fa-nutritionix:before {
+  content: "\f3d6"; }
+
+.fa-object-group:before {
+  content: "\f247"; }
+
+.fa-object-ungroup:before {
+  content: "\f248"; }
+
+.fa-octopus-deploy:before {
+  content: "\e082"; }
+
+.fa-odnoklassniki:before {
+  content: "\f263"; }
+
+.fa-odnoklassniki-square:before {
+  content: "\f264"; }
+
+.fa-oil-can:before {
+  content: "\f613"; }
+
+.fa-old-republic:before {
+  content: "\f510"; }
+
+.fa-om:before {
+  content: "\f679"; }
+
+.fa-opencart:before {
+  content: "\f23d"; }
+
+.fa-openid:before {
+  content: "\f19b"; }
+
+.fa-opera:before {
+  content: "\f26a"; }
+
+.fa-optin-monster:before {
+  content: "\f23c"; }
+
+.fa-orcid:before {
+  content: "\f8d2"; }
+
+.fa-osi:before {
+  content: "\f41a"; }
+
+.fa-otter:before {
+  content: "\f700"; }
+
+.fa-outdent:before {
+  content: "\f03b"; }
+
+.fa-page4:before {
+  content: "\f3d7"; }
+
+.fa-pagelines:before {
+  content: "\f18c"; }
+
+.fa-pager:before {
+  content: "\f815"; }
+
+.fa-paint-brush:before {
+  content: "\f1fc"; }
+
+.fa-paint-roller:before {
+  content: "\f5aa"; }
+
+.fa-palette:before {
+  content: "\f53f"; }
+
+.fa-palfed:before {
+  content: "\f3d8"; }
+
+.fa-pallet:before {
+  content: "\f482"; }
+
+.fa-paper-plane:before {
+  content: "\f1d8"; }
+
+.fa-paperclip:before {
+  content: "\f0c6"; }
+
+.fa-parachute-box:before {
+  content: "\f4cd"; }
+
+.fa-paragraph:before {
+  content: "\f1dd"; }
+
+.fa-parking:before {
+  content: "\f540"; }
+
+.fa-passport:before {
+  content: "\f5ab"; }
+
+.fa-pastafarianism:before {
+  content: "\f67b"; }
+
+.fa-paste:before {
+  content: "\f0ea"; }
+
+.fa-patreon:before {
+  content: "\f3d9"; }
+
+.fa-pause:before {
+  content: "\f04c"; }
+
+.fa-pause-circle:before {
+  content: "\f28b"; }
+
+.fa-paw:before {
+  content: "\f1b0"; }
+
+.fa-paypal:before {
+  content: "\f1ed"; }
+
+.fa-peace:before {
+  content: "\f67c"; }
+
+.fa-pen:before {
+  content: "\f304"; }
+
+.fa-pen-alt:before {
+  content: "\f305"; }
+
+.fa-pen-fancy:before {
+  content: "\f5ac"; }
+
+.fa-pen-nib:before {
+  content: "\f5ad"; }
+
+.fa-pen-square:before {
+  content: "\f14b"; }
+
+.fa-pencil-alt:before {
+  content: "\f303"; }
+
+.fa-pencil-ruler:before {
+  content: "\f5ae"; }
+
+.fa-penny-arcade:before {
+  content: "\f704"; }
+
+.fa-people-arrows:before {
+  content: "\e068"; }
+
+.fa-people-carry:before {
+  content: "\f4ce"; }
+
+.fa-pepper-hot:before {
+  content: "\f816"; }
+
+.fa-perbyte:before {
+  content: "\e083"; }
+
+.fa-percent:before {
+  content: "\f295"; }
+
+.fa-percentage:before {
+  content: "\f541"; }
+
+.fa-periscope:before {
+  content: "\f3da"; }
+
+.fa-person-booth:before {
+  content: "\f756"; }
+
+.fa-phabricator:before {
+  content: "\f3db"; }
+
+.fa-phoenix-framework:before {
+  content: "\f3dc"; }
+
+.fa-phoenix-squadron:before {
+  content: "\f511"; }
+
+.fa-phone:before {
+  content: "\f095"; }
+
+.fa-phone-alt:before {
+  content: "\f879"; }
+
+.fa-phone-slash:before {
+  content: "\f3dd"; }
+
+.fa-phone-square:before {
+  content: "\f098"; }
+
+.fa-phone-square-alt:before {
+  content: "\f87b"; }
+
+.fa-phone-volume:before {
+  content: "\f2a0"; }
+
+.fa-photo-video:before {
+  content: "\f87c"; }
+
+.fa-php:before {
+  content: "\f457"; }
+
+.fa-pied-piper:before {
+  content: "\f2ae"; }
+
+.fa-pied-piper-alt:before {
+  content: "\f1a8"; }
+
+.fa-pied-piper-hat:before {
+  content: "\f4e5"; }
+
+.fa-pied-piper-pp:before {
+  content: "\f1a7"; }
+
+.fa-pied-piper-square:before {
+  content: "\e01e"; }
+
+.fa-piggy-bank:before {
+  content: "\f4d3"; }
+
+.fa-pills:before {
+  content: "\f484"; }
+
+.fa-pinterest:before {
+  content: "\f0d2"; }
+
+.fa-pinterest-p:before {
+  content: "\f231"; }
+
+.fa-pinterest-square:before {
+  content: "\f0d3"; }
+
+.fa-pizza-slice:before {
+  content: "\f818"; }
+
+.fa-place-of-worship:before {
+  content: "\f67f"; }
+
+.fa-plane:before {
+  content: "\f072"; }
+
+.fa-plane-arrival:before {
+  content: "\f5af"; }
+
+.fa-plane-departure:before {
+  content: "\f5b0"; }
+
+.fa-plane-slash:before {
+  content: "\e069"; }
+
+.fa-play:before {
+  content: "\f04b"; }
+
+.fa-play-circle:before {
+  content: "\f144"; }
+
+.fa-playstation:before {
+  content: "\f3df"; }
+
+.fa-plug:before {
+  content: "\f1e6"; }
+
+.fa-plus:before {
+  content: "\f067"; }
+
+.fa-plus-circle:before {
+  content: "\f055"; }
+
+.fa-plus-square:before {
+  content: "\f0fe"; }
+
+.fa-podcast:before {
+  content: "\f2ce"; }
+
+.fa-poll:before {
+  content: "\f681"; }
+
+.fa-poll-h:before {
+  content: "\f682"; }
+
+.fa-poo:before {
+  content: "\f2fe"; }
+
+.fa-poo-storm:before {
+  content: "\f75a"; }
+
+.fa-poop:before {
+  content: "\f619"; }
+
+.fa-portrait:before {
+  content: "\f3e0"; }
+
+.fa-pound-sign:before {
+  content: "\f154"; }
+
+.fa-power-off:before {
+  content: "\f011"; }
+
+.fa-pray:before {
+  content: "\f683"; }
+
+.fa-praying-hands:before {
+  content: "\f684"; }
+
+.fa-prescription:before {
+  content: "\f5b1"; }
+
+.fa-prescription-bottle:before {
+  content: "\f485"; }
+
+.fa-prescription-bottle-alt:before {
+  content: "\f486"; }
+
+.fa-print:before {
+  content: "\f02f"; }
+
+.fa-procedures:before {
+  content: "\f487"; }
+
+.fa-product-hunt:before {
+  content: "\f288"; }
+
+.fa-project-diagram:before {
+  content: "\f542"; }
+
+.fa-pump-medical:before {
+  content: "\e06a"; }
+
+.fa-pump-soap:before {
+  content: "\e06b"; }
+
+.fa-pushed:before {
+  content: "\f3e1"; }
+
+.fa-puzzle-piece:before {
+  content: "\f12e"; }
+
+.fa-python:before {
+  content: "\f3e2"; }
+
+.fa-qq:before {
+  content: "\f1d6"; }
+
+.fa-qrcode:before {
+  content: "\f029"; }
+
+.fa-question:before {
+  content: "\f128"; }
+
+.fa-question-circle:before {
+  content: "\f059"; }
+
+.fa-quidditch:before {
+  content: "\f458"; }
+
+.fa-quinscape:before {
+  content: "\f459"; }
+
+.fa-quora:before {
+  content: "\f2c4"; }
+
+.fa-quote-left:before {
+  content: "\f10d"; }
+
+.fa-quote-right:before {
+  content: "\f10e"; }
+
+.fa-quran:before {
+  content: "\f687"; }
+
+.fa-r-project:before {
+  content: "\f4f7"; }
+
+.fa-radiation:before {
+  content: "\f7b9"; }
+
+.fa-radiation-alt:before {
+  content: "\f7ba"; }
+
+.fa-rainbow:before {
+  content: "\f75b"; }
+
+.fa-random:before {
+  content: "\f074"; }
+
+.fa-raspberry-pi:before {
+  content: "\f7bb"; }
+
+.fa-ravelry:before {
+  content: "\f2d9"; }
+
+.fa-react:before {
+  content: "\f41b"; }
+
+.fa-reacteurope:before {
+  content: "\f75d"; }
+
+.fa-readme:before {
+  content: "\f4d5"; }
+
+.fa-rebel:before {
+  content: "\f1d0"; }
+
+.fa-receipt:before {
+  content: "\f543"; }
+
+.fa-record-vinyl:before {
+  content: "\f8d9"; }
+
+.fa-recycle:before {
+  content: "\f1b8"; }
+
+.fa-red-river:before {
+  content: "\f3e3"; }
+
+.fa-reddit:before {
+  content: "\f1a1"; }
+
+.fa-reddit-alien:before {
+  content: "\f281"; }
+
+.fa-reddit-square:before {
+  content: "\f1a2"; }
+
+.fa-redhat:before {
+  content: "\f7bc"; }
+
+.fa-redo:before {
+  content: "\f01e"; }
+
+.fa-redo-alt:before {
+  content: "\f2f9"; }
+
+.fa-registered:before {
+  content: "\f25d"; }
+
+.fa-remove-format:before {
+  content: "\f87d"; }
+
+.fa-renren:before {
+  content: "\f18b"; }
+
+.fa-reply:before {
+  content: "\f3e5"; }
+
+.fa-reply-all:before {
+  content: "\f122"; }
+
+.fa-replyd:before {
+  content: "\f3e6"; }
+
+.fa-republican:before {
+  content: "\f75e"; }
+
+.fa-researchgate:before {
+  content: "\f4f8"; }
+
+.fa-resolving:before {
+  content: "\f3e7"; }
+
+.fa-restroom:before {
+  content: "\f7bd"; }
+
+.fa-retweet:before {
+  content: "\f079"; }
+
+.fa-rev:before {
+  content: "\f5b2"; }
+
+.fa-ribbon:before {
+  content: "\f4d6"; }
+
+.fa-ring:before {
+  content: "\f70b"; }
+
+.fa-road:before {
+  content: "\f018"; }
+
+.fa-robot:before {
+  content: "\f544"; }
+
+.fa-rocket:before {
+  content: "\f135"; }
+
+.fa-rocketchat:before {
+  content: "\f3e8"; }
+
+.fa-rockrms:before {
+  content: "\f3e9"; }
+
+.fa-route:before {
+  content: "\f4d7"; }
+
+.fa-rss:before {
+  content: "\f09e"; }
+
+.fa-rss-square:before {
+  content: "\f143"; }
+
+.fa-ruble-sign:before {
+  content: "\f158"; }
+
+.fa-ruler:before {
+  content: "\f545"; }
+
+.fa-ruler-combined:before {
+  content: "\f546"; }
+
+.fa-ruler-horizontal:before {
+  content: "\f547"; }
+
+.fa-ruler-vertical:before {
+  content: "\f548"; }
+
+.fa-running:before {
+  content: "\f70c"; }
+
+.fa-rupee-sign:before {
+  content: "\f156"; }
+
+.fa-rust:before {
+  content: "\e07a"; }
+
+.fa-sad-cry:before {
+  content: "\f5b3"; }
+
+.fa-sad-tear:before {
+  content: "\f5b4"; }
+
+.fa-safari:before {
+  content: "\f267"; }
+
+.fa-salesforce:before {
+  content: "\f83b"; }
+
+.fa-sass:before {
+  content: "\f41e"; }
+
+.fa-satellite:before {
+  content: "\f7bf"; }
+
+.fa-satellite-dish:before {
+  content: "\f7c0"; }
+
+.fa-save:before {
+  content: "\f0c7"; }
+
+.fa-schlix:before {
+  content: "\f3ea"; }
+
+.fa-school:before {
+  content: "\f549"; }
+
+.fa-screwdriver:before {
+  content: "\f54a"; }
+
+.fa-scribd:before {
+  content: "\f28a"; }
+
+.fa-scroll:before {
+  content: "\f70e"; }
+
+.fa-sd-card:before {
+  content: "\f7c2"; }
+
+.fa-search:before {
+  content: "\f002"; }
+
+.fa-search-dollar:before {
+  content: "\f688"; }
+
+.fa-search-location:before {
+  content: "\f689"; }
+
+.fa-search-minus:before {
+  content: "\f010"; }
+
+.fa-search-plus:before {
+  content: "\f00e"; }
+
+.fa-searchengin:before {
+  content: "\f3eb"; }
+
+.fa-seedling:before {
+  content: "\f4d8"; }
+
+.fa-sellcast:before {
+  content: "\f2da"; }
+
+.fa-sellsy:before {
+  content: "\f213"; }
+
+.fa-server:before {
+  content: "\f233"; }
+
+.fa-servicestack:before {
+  content: "\f3ec"; }
+
+.fa-shapes:before {
+  content: "\f61f"; }
+
+.fa-share:before {
+  content: "\f064"; }
+
+.fa-share-alt:before {
+  content: "\f1e0"; }
+
+.fa-share-alt-square:before {
+  content: "\f1e1"; }
+
+.fa-share-square:before {
+  content: "\f14d"; }
+
+.fa-shekel-sign:before {
+  content: "\f20b"; }
+
+.fa-shield-alt:before {
+  content: "\f3ed"; }
+
+.fa-shield-virus:before {
+  content: "\e06c"; }
+
+.fa-ship:before {
+  content: "\f21a"; }
+
+.fa-shipping-fast:before {
+  content: "\f48b"; }
+
+.fa-shirtsinbulk:before {
+  content: "\f214"; }
+
+.fa-shoe-prints:before {
+  content: "\f54b"; }
+
+.fa-shopify:before {
+  content: "\e057"; }
+
+.fa-shopping-bag:before {
+  content: "\f290"; }
+
+.fa-shopping-basket:before {
+  content: "\f291"; }
+
+.fa-shopping-cart:before {
+  content: "\f07a"; }
+
+.fa-shopware:before {
+  content: "\f5b5"; }
+
+.fa-shower:before {
+  content: "\f2cc"; }
+
+.fa-shuttle-van:before {
+  content: "\f5b6"; }
+
+.fa-sign:before {
+  content: "\f4d9"; }
+
+.fa-sign-in-alt:before {
+  content: "\f2f6"; }
+
+.fa-sign-language:before {
+  content: "\f2a7"; }
+
+.fa-sign-out-alt:before {
+  content: "\f2f5"; }
+
+.fa-signal:before {
+  content: "\f012"; }
+
+.fa-signature:before {
+  content: "\f5b7"; }
+
+.fa-sim-card:before {
+  content: "\f7c4"; }
+
+.fa-simplybuilt:before {
+  content: "\f215"; }
+
+.fa-sink:before {
+  content: "\e06d"; }
+
+.fa-sistrix:before {
+  content: "\f3ee"; }
+
+.fa-sitemap:before {
+  content: "\f0e8"; }
+
+.fa-sith:before {
+  content: "\f512"; }
+
+.fa-skating:before {
+  content: "\f7c5"; }
+
+.fa-sketch:before {
+  content: "\f7c6"; }
+
+.fa-skiing:before {
+  content: "\f7c9"; }
+
+.fa-skiing-nordic:before {
+  content: "\f7ca"; }
+
+.fa-skull:before {
+  content: "\f54c"; }
+
+.fa-skull-crossbones:before {
+  content: "\f714"; }
+
+.fa-skyatlas:before {
+  content: "\f216"; }
+
+.fa-skype:before {
+  content: "\f17e"; }
+
+.fa-slack:before {
+  content: "\f198"; }
+
+.fa-slack-hash:before {
+  content: "\f3ef"; }
+
+.fa-slash:before {
+  content: "\f715"; }
+
+.fa-sleigh:before {
+  content: "\f7cc"; }
+
+.fa-sliders-h:before {
+  content: "\f1de"; }
+
+.fa-slideshare:before {
+  content: "\f1e7"; }
+
+.fa-smile:before {
+  content: "\f118"; }
+
+.fa-smile-beam:before {
+  content: "\f5b8"; }
+
+.fa-smile-wink:before {
+  content: "\f4da"; }
+
+.fa-smog:before {
+  content: "\f75f"; }
+
+.fa-smoking:before {
+  content: "\f48d"; }
+
+.fa-smoking-ban:before {
+  content: "\f54d"; }
+
+.fa-sms:before {
+  content: "\f7cd"; }
+
+.fa-snapchat:before {
+  content: "\f2ab"; }
+
+.fa-snapchat-ghost:before {
+  content: "\f2ac"; }
+
+.fa-snapchat-square:before {
+  content: "\f2ad"; }
+
+.fa-snowboarding:before {
+  content: "\f7ce"; }
+
+.fa-snowflake:before {
+  content: "\f2dc"; }
+
+.fa-snowman:before {
+  content: "\f7d0"; }
+
+.fa-snowplow:before {
+  content: "\f7d2"; }
+
+.fa-soap:before {
+  content: "\e06e"; }
+
+.fa-socks:before {
+  content: "\f696"; }
+
+.fa-solar-panel:before {
+  content: "\f5ba"; }
+
+.fa-sort:before {
+  content: "\f0dc"; }
+
+.fa-sort-alpha-down:before {
+  content: "\f15d"; }
+
+.fa-sort-alpha-down-alt:before {
+  content: "\f881"; }
+
+.fa-sort-alpha-up:before {
+  content: "\f15e"; }
+
+.fa-sort-alpha-up-alt:before {
+  content: "\f882"; }
+
+.fa-sort-amount-down:before {
+  content: "\f160"; }
+
+.fa-sort-amount-down-alt:before {
+  content: "\f884"; }
+
+.fa-sort-amount-up:before {
+  content: "\f161"; }
+
+.fa-sort-amount-up-alt:before {
+  content: "\f885"; }
+
+.fa-sort-down:before {
+  content: "\f0dd"; }
+
+.fa-sort-numeric-down:before {
+  content: "\f162"; }
+
+.fa-sort-numeric-down-alt:before {
+  content: "\f886"; }
+
+.fa-sort-numeric-up:before {
+  content: "\f163"; }
+
+.fa-sort-numeric-up-alt:before {
+  content: "\f887"; }
+
+.fa-sort-up:before {
+  content: "\f0de"; }
+
+.fa-soundcloud:before {
+  content: "\f1be"; }
+
+.fa-sourcetree:before {
+  content: "\f7d3"; }
+
+.fa-spa:before {
+  content: "\f5bb"; }
+
+.fa-space-shuttle:before {
+  content: "\f197"; }
+
+.fa-speakap:before {
+  content: "\f3f3"; }
+
+.fa-speaker-deck:before {
+  content: "\f83c"; }
+
+.fa-spell-check:before {
+  content: "\f891"; }
+
+.fa-spider:before {
+  content: "\f717"; }
+
+.fa-spinner:before {
+  content: "\f110"; }
+
+.fa-splotch:before {
+  content: "\f5bc"; }
+
+.fa-spotify:before {
+  content: "\f1bc"; }
+
+.fa-spray-can:before {
+  content: "\f5bd"; }
+
+.fa-square:before {
+  content: "\f0c8"; }
+
+.fa-square-full:before {
+  content: "\f45c"; }
+
+.fa-square-root-alt:before {
+  content: "\f698"; }
+
+.fa-squarespace:before {
+  content: "\f5be"; }
+
+.fa-stack-exchange:before {
+  content: "\f18d"; }
+
+.fa-stack-overflow:before {
+  content: "\f16c"; }
+
+.fa-stackpath:before {
+  content: "\f842"; }
+
+.fa-stamp:before {
+  content: "\f5bf"; }
+
+.fa-star:before {
+  content: "\f005"; }
+
+.fa-star-and-crescent:before {
+  content: "\f699"; }
+
+.fa-star-half:before {
+  content: "\f089"; }
+
+.fa-star-half-alt:before {
+  content: "\f5c0"; }
+
+.fa-star-of-david:before {
+  content: "\f69a"; }
+
+.fa-star-of-life:before {
+  content: "\f621"; }
+
+.fa-staylinked:before {
+  content: "\f3f5"; }
+
+.fa-steam:before {
+  content: "\f1b6"; }
+
+.fa-steam-square:before {
+  content: "\f1b7"; }
+
+.fa-steam-symbol:before {
+  content: "\f3f6"; }
+
+.fa-step-backward:before {
+  content: "\f048"; }
+
+.fa-step-forward:before {
+  content: "\f051"; }
+
+.fa-stethoscope:before {
+  content: "\f0f1"; }
+
+.fa-sticker-mule:before {
+  content: "\f3f7"; }
+
+.fa-sticky-note:before {
+  content: "\f249"; }
+
+.fa-stop:before {
+  content: "\f04d"; }
+
+.fa-stop-circle:before {
+  content: "\f28d"; }
+
+.fa-stopwatch:before {
+  content: "\f2f2"; }
+
+.fa-stopwatch-20:before {
+  content: "\e06f"; }
+
+.fa-store:before {
+  content: "\f54e"; }
+
+.fa-store-alt:before {
+  content: "\f54f"; }
+
+.fa-store-alt-slash:before {
+  content: "\e070"; }
+
+.fa-store-slash:before {
+  content: "\e071"; }
+
+.fa-strava:before {
+  content: "\f428"; }
+
+.fa-stream:before {
+  content: "\f550"; }
+
+.fa-street-view:before {
+  content: "\f21d"; }
+
+.fa-strikethrough:before {
+  content: "\f0cc"; }
+
+.fa-stripe:before {
+  content: "\f429"; }
+
+.fa-stripe-s:before {
+  content: "\f42a"; }
+
+.fa-stroopwafel:before {
+  content: "\f551"; }
+
+.fa-studiovinari:before {
+  content: "\f3f8"; }
+
+.fa-stumbleupon:before {
+  content: "\f1a4"; }
+
+.fa-stumbleupon-circle:before {
+  content: "\f1a3"; }
+
+.fa-subscript:before {
+  content: "\f12c"; }
+
+.fa-subway:before {
+  content: "\f239"; }
+
+.fa-suitcase:before {
+  content: "\f0f2"; }
+
+.fa-suitcase-rolling:before {
+  content: "\f5c1"; }
+
+.fa-sun:before {
+  content: "\f185"; }
+
+.fa-superpowers:before {
+  content: "\f2dd"; }
+
+.fa-superscript:before {
+  content: "\f12b"; }
+
+.fa-supple:before {
+  content: "\f3f9"; }
+
+.fa-surprise:before {
+  content: "\f5c2"; }
+
+.fa-suse:before {
+  content: "\f7d6"; }
+
+.fa-swatchbook:before {
+  content: "\f5c3"; }
+
+.fa-swift:before {
+  content: "\f8e1"; }
+
+.fa-swimmer:before {
+  content: "\f5c4"; }
+
+.fa-swimming-pool:before {
+  content: "\f5c5"; }
+
+.fa-symfony:before {
+  content: "\f83d"; }
+
+.fa-synagogue:before {
+  content: "\f69b"; }
+
+.fa-sync:before {
+  content: "\f021"; }
+
+.fa-sync-alt:before {
+  content: "\f2f1"; }
+
+.fa-syringe:before {
+  content: "\f48e"; }
+
+.fa-table:before {
+  content: "\f0ce"; }
+
+.fa-table-tennis:before {
+  content: "\f45d"; }
+
+.fa-tablet:before {
+  content: "\f10a"; }
+
+.fa-tablet-alt:before {
+  content: "\f3fa"; }
+
+.fa-tablets:before {
+  content: "\f490"; }
+
+.fa-tachometer-alt:before {
+  content: "\f3fd"; }
+
+.fa-tag:before {
+  content: "\f02b"; }
+
+.fa-tags:before {
+  content: "\f02c"; }
+
+.fa-tape:before {
+  content: "\f4db"; }
+
+.fa-tasks:before {
+  content: "\f0ae"; }
+
+.fa-taxi:before {
+  content: "\f1ba"; }
+
+.fa-teamspeak:before {
+  content: "\f4f9"; }
+
+.fa-teeth:before {
+  content: "\f62e"; }
+
+.fa-teeth-open:before {
+  content: "\f62f"; }
+
+.fa-telegram:before {
+  content: "\f2c6"; }
+
+.fa-telegram-plane:before {
+  content: "\f3fe"; }
+
+.fa-temperature-high:before {
+  content: "\f769"; }
+
+.fa-temperature-low:before {
+  content: "\f76b"; }
+
+.fa-tencent-weibo:before {
+  content: "\f1d5"; }
+
+.fa-tenge:before {
+  content: "\f7d7"; }
+
+.fa-terminal:before {
+  content: "\f120"; }
+
+.fa-text-height:before {
+  content: "\f034"; }
+
+.fa-text-width:before {
+  content: "\f035"; }
+
+.fa-th:before {
+  content: "\f00a"; }
+
+.fa-th-large:before {
+  content: "\f009"; }
+
+.fa-th-list:before {
+  content: "\f00b"; }
+
+.fa-the-red-yeti:before {
+  content: "\f69d"; }
+
+.fa-theater-masks:before {
+  content: "\f630"; }
+
+.fa-themeco:before {
+  content: "\f5c6"; }
+
+.fa-themeisle:before {
+  content: "\f2b2"; }
+
+.fa-thermometer:before {
+  content: "\f491"; }
+
+.fa-thermometer-empty:before {
+  content: "\f2cb"; }
+
+.fa-thermometer-full:before {
+  content: "\f2c7"; }
+
+.fa-thermometer-half:before {
+  content: "\f2c9"; }
+
+.fa-thermometer-quarter:before {
+  content: "\f2ca"; }
+
+.fa-thermometer-three-quarters:before {
+  content: "\f2c8"; }
+
+.fa-think-peaks:before {
+  content: "\f731"; }
+
+.fa-thumbs-down:before {
+  content: "\f165"; }
+
+.fa-thumbs-up:before {
+  content: "\f164"; }
+
+.fa-thumbtack:before {
+  content: "\f08d"; }
+
+.fa-ticket-alt:before {
+  content: "\f3ff"; }
+
+.fa-tiktok:before {
+  content: "\e07b"; }
+
+.fa-times:before {
+  content: "\f00d"; }
+
+.fa-times-circle:before {
+  content: "\f057"; }
+
+.fa-tint:before {
+  content: "\f043"; }
+
+.fa-tint-slash:before {
+  content: "\f5c7"; }
+
+.fa-tired:before {
+  content: "\f5c8"; }
+
+.fa-toggle-off:before {
+  content: "\f204"; }
+
+.fa-toggle-on:before {
+  content: "\f205"; }
+
+.fa-toilet:before {
+  content: "\f7d8"; }
+
+.fa-toilet-paper:before {
+  content: "\f71e"; }
+
+.fa-toilet-paper-slash:before {
+  content: "\e072"; }
+
+.fa-toolbox:before {
+  content: "\f552"; }
+
+.fa-tools:before {
+  content: "\f7d9"; }
+
+.fa-tooth:before {
+  content: "\f5c9"; }
+
+.fa-torah:before {
+  content: "\f6a0"; }
+
+.fa-torii-gate:before {
+  content: "\f6a1"; }
+
+.fa-tractor:before {
+  content: "\f722"; }
+
+.fa-trade-federation:before {
+  content: "\f513"; }
+
+.fa-trademark:before {
+  content: "\f25c"; }
+
+.fa-traffic-light:before {
+  content: "\f637"; }
+
+.fa-trailer:before {
+  content: "\e041"; }
+
+.fa-train:before {
+  content: "\f238"; }
+
+.fa-tram:before {
+  content: "\f7da"; }
+
+.fa-transgender:before {
+  content: "\f224"; }
+
+.fa-transgender-alt:before {
+  content: "\f225"; }
+
+.fa-trash:before {
+  content: "\f1f8"; }
+
+.fa-trash-alt:before {
+  content: "\f2ed"; }
+
+.fa-trash-restore:before {
+  content: "\f829"; }
+
+.fa-trash-restore-alt:before {
+  content: "\f82a"; }
+
+.fa-tree:before {
+  content: "\f1bb"; }
+
+.fa-trello:before {
+  content: "\f181"; }
+
+.fa-tripadvisor:before {
+  content: "\f262"; }
+
+.fa-trophy:before {
+  content: "\f091"; }
+
+.fa-truck:before {
+  content: "\f0d1"; }
+
+.fa-truck-loading:before {
+  content: "\f4de"; }
+
+.fa-truck-monster:before {
+  content: "\f63b"; }
+
+.fa-truck-moving:before {
+  content: "\f4df"; }
+
+.fa-truck-pickup:before {
+  content: "\f63c"; }
+
+.fa-tshirt:before {
+  content: "\f553"; }
+
+.fa-tty:before {
+  content: "\f1e4"; }
+
+.fa-tumblr:before {
+  content: "\f173"; }
+
+.fa-tumblr-square:before {
+  content: "\f174"; }
+
+.fa-tv:before {
+  content: "\f26c"; }
+
+.fa-twitch:before {
+  content: "\f1e8"; }
+
+.fa-twitter:before {
+  content: "\f099"; }
+
+.fa-twitter-square:before {
+  content: "\f081"; }
+
+.fa-typo3:before {
+  content: "\f42b"; }
+
+.fa-uber:before {
+  content: "\f402"; }
+
+.fa-ubuntu:before {
+  content: "\f7df"; }
+
+.fa-uikit:before {
+  content: "\f403"; }
+
+.fa-umbraco:before {
+  content: "\f8e8"; }
+
+.fa-umbrella:before {
+  content: "\f0e9"; }
+
+.fa-umbrella-beach:before {
+  content: "\f5ca"; }
+
+.fa-uncharted:before {
+  content: "\e084"; }
+
+.fa-underline:before {
+  content: "\f0cd"; }
+
+.fa-undo:before {
+  content: "\f0e2"; }
+
+.fa-undo-alt:before {
+  content: "\f2ea"; }
+
+.fa-uniregistry:before {
+  content: "\f404"; }
+
+.fa-unity:before {
+  content: "\e049"; }
+
+.fa-universal-access:before {
+  content: "\f29a"; }
+
+.fa-university:before {
+  content: "\f19c"; }
+
+.fa-unlink:before {
+  content: "\f127"; }
+
+.fa-unlock:before {
+  content: "\f09c"; }
+
+.fa-unlock-alt:before {
+  content: "\f13e"; }
+
+.fa-unsplash:before {
+  content: "\e07c"; }
+
+.fa-untappd:before {
+  content: "\f405"; }
+
+.fa-upload:before {
+  content: "\f093"; }
+
+.fa-ups:before {
+  content: "\f7e0"; }
+
+.fa-usb:before {
+  content: "\f287"; }
+
+.fa-user:before {
+  content: "\f007"; }
+
+.fa-user-alt:before {
+  content: "\f406"; }
+
+.fa-user-alt-slash:before {
+  content: "\f4fa"; }
+
+.fa-user-astronaut:before {
+  content: "\f4fb"; }
+
+.fa-user-check:before {
+  content: "\f4fc"; }
+
+.fa-user-circle:before {
+  content: "\f2bd"; }
+
+.fa-user-clock:before {
+  content: "\f4fd"; }
+
+.fa-user-cog:before {
+  content: "\f4fe"; }
+
+.fa-user-edit:before {
+  content: "\f4ff"; }
+
+.fa-user-friends:before {
+  content: "\f500"; }
+
+.fa-user-graduate:before {
+  content: "\f501"; }
+
+.fa-user-injured:before {
+  content: "\f728"; }
+
+.fa-user-lock:before {
+  content: "\f502"; }
+
+.fa-user-md:before {
+  content: "\f0f0"; }
+
+.fa-user-minus:before {
+  content: "\f503"; }
+
+.fa-user-ninja:before {
+  content: "\f504"; }
+
+.fa-user-nurse:before {
+  content: "\f82f"; }
+
+.fa-user-plus:before {
+  content: "\f234"; }
+
+.fa-user-secret:before {
+  content: "\f21b"; }
+
+.fa-user-shield:before {
+  content: "\f505"; }
+
+.fa-user-slash:before {
+  content: "\f506"; }
+
+.fa-user-tag:before {
+  content: "\f507"; }
+
+.fa-user-tie:before {
+  content: "\f508"; }
+
+.fa-user-times:before {
+  content: "\f235"; }
+
+.fa-users:before {
+  content: "\f0c0"; }
+
+.fa-users-cog:before {
+  content: "\f509"; }
+
+.fa-users-slash:before {
+  content: "\e073"; }
+
+.fa-usps:before {
+  content: "\f7e1"; }
+
+.fa-ussunnah:before {
+  content: "\f407"; }
+
+.fa-utensil-spoon:before {
+  content: "\f2e5"; }
+
+.fa-utensils:before {
+  content: "\f2e7"; }
+
+.fa-vaadin:before {
+  content: "\f408"; }
+
+.fa-vector-square:before {
+  content: "\f5cb"; }
+
+.fa-venus:before {
+  content: "\f221"; }
+
+.fa-venus-double:before {
+  content: "\f226"; }
+
+.fa-venus-mars:before {
+  content: "\f228"; }
+
+.fa-vest:before {
+  content: "\e085"; }
+
+.fa-vest-patches:before {
+  content: "\e086"; }
+
+.fa-viacoin:before {
+  content: "\f237"; }
+
+.fa-viadeo:before {
+  content: "\f2a9"; }
+
+.fa-viadeo-square:before {
+  content: "\f2aa"; }
+
+.fa-vial:before {
+  content: "\f492"; }
+
+.fa-vials:before {
+  content: "\f493"; }
+
+.fa-viber:before {
+  content: "\f409"; }
+
+.fa-video:before {
+  content: "\f03d"; }
+
+.fa-video-slash:before {
+  content: "\f4e2"; }
+
+.fa-vihara:before {
+  content: "\f6a7"; }
+
+.fa-vimeo:before {
+  content: "\f40a"; }
+
+.fa-vimeo-square:before {
+  content: "\f194"; }
+
+.fa-vimeo-v:before {
+  content: "\f27d"; }
+
+.fa-vine:before {
+  content: "\f1ca"; }
+
+.fa-virus:before {
+  content: "\e074"; }
+
+.fa-virus-slash:before {
+  content: "\e075"; }
+
+.fa-viruses:before {
+  content: "\e076"; }
+
+.fa-vk:before {
+  content: "\f189"; }
+
+.fa-vnv:before {
+  content: "\f40b"; }
+
+.fa-voicemail:before {
+  content: "\f897"; }
+
+.fa-volleyball-ball:before {
+  content: "\f45f"; }
+
+.fa-volume-down:before {
+  content: "\f027"; }
+
+.fa-volume-mute:before {
+  content: "\f6a9"; }
+
+.fa-volume-off:before {
+  content: "\f026"; }
+
+.fa-volume-up:before {
+  content: "\f028"; }
+
+.fa-vote-yea:before {
+  content: "\f772"; }
+
+.fa-vr-cardboard:before {
+  content: "\f729"; }
+
+.fa-vuejs:before {
+  content: "\f41f"; }
+
+.fa-walking:before {
+  content: "\f554"; }
+
+.fa-wallet:before {
+  content: "\f555"; }
+
+.fa-warehouse:before {
+  content: "\f494"; }
+
+.fa-watchman-monitoring:before {
+  content: "\e087"; }
+
+.fa-water:before {
+  content: "\f773"; }
+
+.fa-wave-square:before {
+  content: "\f83e"; }
+
+.fa-waze:before {
+  content: "\f83f"; }
+
+.fa-weebly:before {
+  content: "\f5cc"; }
+
+.fa-weibo:before {
+  content: "\f18a"; }
+
+.fa-weight:before {
+  content: "\f496"; }
+
+.fa-weight-hanging:before {
+  content: "\f5cd"; }
+
+.fa-weixin:before {
+  content: "\f1d7"; }
+
+.fa-whatsapp:before {
+  content: "\f232"; }
+
+.fa-whatsapp-square:before {
+  content: "\f40c"; }
+
+.fa-wheelchair:before {
+  content: "\f193"; }
+
+.fa-whmcs:before {
+  content: "\f40d"; }
+
+.fa-wifi:before {
+  content: "\f1eb"; }
+
+.fa-wikipedia-w:before {
+  content: "\f266"; }
+
+.fa-wind:before {
+  content: "\f72e"; }
+
+.fa-window-close:before {
+  content: "\f410"; }
+
+.fa-window-maximize:before {
+  content: "\f2d0"; }
+
+.fa-window-minimize:before {
+  content: "\f2d1"; }
+
+.fa-window-restore:before {
+  content: "\f2d2"; }
+
+.fa-windows:before {
+  content: "\f17a"; }
+
+.fa-wine-bottle:before {
+  content: "\f72f"; }
+
+.fa-wine-glass:before {
+  content: "\f4e3"; }
+
+.fa-wine-glass-alt:before {
+  content: "\f5ce"; }
+
+.fa-wix:before {
+  content: "\f5cf"; }
+
+.fa-wizards-of-the-coast:before {
+  content: "\f730"; }
+
+.fa-wodu:before {
+  content: "\e088"; }
+
+.fa-wolf-pack-battalion:before {
+  content: "\f514"; }
+
+.fa-won-sign:before {
+  content: "\f159"; }
+
+.fa-wordpress:before {
+  content: "\f19a"; }
+
+.fa-wordpress-simple:before {
+  content: "\f411"; }
+
+.fa-wpbeginner:before {
+  content: "\f297"; }
+
+.fa-wpexplorer:before {
+  content: "\f2de"; }
+
+.fa-wpforms:before {
+  content: "\f298"; }
+
+.fa-wpressr:before {
+  content: "\f3e4"; }
+
+.fa-wrench:before {
+  content: "\f0ad"; }
+
+.fa-x-ray:before {
+  content: "\f497"; }
+
+.fa-xbox:before {
+  content: "\f412"; }
+
+.fa-xing:before {
+  content: "\f168"; }
+
+.fa-xing-square:before {
+  content: "\f169"; }
+
+.fa-y-combinator:before {
+  content: "\f23b"; }
+
+.fa-yahoo:before {
+  content: "\f19e"; }
+
+.fa-yammer:before {
+  content: "\f840"; }
+
+.fa-yandex:before {
+  content: "\f413"; }
+
+.fa-yandex-international:before {
+  content: "\f414"; }
+
+.fa-yarn:before {
+  content: "\f7e3"; }
+
+.fa-yelp:before {
+  content: "\f1e9"; }
+
+.fa-yen-sign:before {
+  content: "\f157"; }
+
+.fa-yin-yang:before {
+  content: "\f6ad"; }
+
+.fa-yoast:before {
+  content: "\f2b1"; }
+
+.fa-youtube:before {
+  content: "\f167"; }
+
+.fa-youtube-square:before {
+  content: "\f431"; }
+
+.fa-zhihu:before {
+  content: "\f63f"; }
+
+.sr-only {
+  border: 0;
+  clip: rect(0, 0, 0, 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px; }
+
+.sr-only-focusable:active, .sr-only-focusable:focus {
+  clip: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  position: static;
+  width: auto; }
+@font-face {
+  font-family: 'Font Awesome 5 Brands';
+  font-style: normal;
+  font-weight: 400;
+  font-display: block;
+  src: url("../webfonts/fa-brands-400.eot");
+  src: url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.woff") format("woff"), url("../webfonts/fa-brands-400.ttf") format("truetype"), url("../webfonts/fa-brands-400.svg#fontawesome") format("svg"); }
+
+.fab {
+  font-family: 'Font Awesome 5 Brands';
+  font-weight: 400; }
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-style: normal;
+  font-weight: 400;
+  font-display: block;
+  src: url("../webfonts/fa-regular-400.eot");
+  src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
+
+.far {
+  font-family: 'Font Awesome 5 Free';
+  font-weight: 400; }
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-style: normal;
+  font-weight: 900;
+  font-display: block;
+  src: url("../webfonts/fa-solid-900.eot");
+  src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
+
+.fa,
+.fas {
+  font-family: 'Font Awesome 5 Free';
+  font-weight: 900; }
diff --git a/scaladoc/resources/dotty_res/styles/nord-light.css b/scaladoc/resources/dotty_res/styles/nord-light.css
index 71eac33c4930..9d1604dd0364 100644
--- a/scaladoc/resources/dotty_res/styles/nord-light.css
+++ b/scaladoc/resources/dotty_res/styles/nord-light.css
@@ -1,14 +1,37 @@
 /* Theme inspired by nordtheme. The colors have been darkened to work on light backgrounds. */
+:root {
+  --hljs-bg: var(--code-bg);
+  --hljs-fg: var(--code-fg);
+  --hljs-comment: #90A1C1;
+  --hljs-doctag: #4B6B92;
+  --hljs-meta: hsl(40, 100%, 40%);
+  --hljs-subst: hsl(40, 100%, 40%);
+  --hljs-title: hsl(193, 60%, 42%);
+  --hljs-type: hsl(179, 61%, 30%);
+  --hljs-keyword: hsl(213, 60%, 45%);
+  --hljs-string: hsl(92, 46%, 43%);
+  --hljs-literal: hsl(311, 30%, 47%);
+}
+:root.theme-dark {
+  --hljs-meta: hsl(40, 100%, 49%);
+  --hljs-subst: hsl(40, 100%, 49%);
+  --hljs-title: hsl(193, 60%, 58%);
+  --hljs-keyword: hsl(213, 60%, 60%);
+  --hljs-type: hsl(179, 61%, 45%);
+  --hljs-string: hsl(92, 46%, 68%);
+  --hljs-literal: hsl(311, 30%, 62%);
+}
+
 pre, .hljs {
-  background: #F4F5FA;
-  color: #4C566A;
+  background: var(--hljs-bg);
+  color: var(--code-fg);
 }
 
 .hljs-comment {
-  color: #90A1C1;
+  color: var(--hljs-comment);
 }
 .hljs-doctag {
-  color: #4B6B92;
+  color: var(--hljs-doctag);
   font-weight: 500;
 }
 .hljs-emphasis {
@@ -19,26 +42,26 @@ pre, .hljs {
 }
 
 .hljs-meta {
-  color: #F9A600;
+  color: var(--hljs-meta);
   font-weight: 500;
 }
 .hljs-subst {
-  color: #F9A600;
+  color: var(--hljs-subst);
 }
 .hljs-title {
-  color: #2B8FAC;
+  color: var(--hljs-title);
   font-weight: 500;
 }
 .hljs-type {
-  color: #1E7C7A;
+  color: var(--hljs-type);
 }
 .hljs-keyword {
-  color: #2E6BB8;
+  color: var(--hljs-keyword);
   font-weight: 500;
 }
 .hljs-string {
-  color: #6AA13B;
+  color: var(--hljs-string);
 }
 .hljs-built_in, .hljs-number, .hljs-literal {
-  color: #9D5490;
+  color: var(--hljs-literal);
 }
diff --git a/scaladoc/resources/dotty_res/styles/scalastyle.css b/scaladoc/resources/dotty_res/styles/scalastyle.css
index 634416eb8048..0c639a324f24 100644
--- a/scaladoc/resources/dotty_res/styles/scalastyle.css
+++ b/scaladoc/resources/dotty_res/styles/scalastyle.css
@@ -1,41 +1,15 @@
-@import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@400;500&family=Lato:wght@400;700&family=Roboto+Slab:wght@700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@400;500&family=Lato:wght@400;700&family=Roboto+Slab:wght@400;700&display=swap');
+@import 'colors.css';
 
 :root {
-  /* Color Settings */
-  --border-light: #DADFE6;
-  --border-medium: #abc;
-
-  --code-bg: #F4F5FA;
-  --symbol-fg: #333;
-  --link-fg: #00607D;
-  --link-hover-fg: #00A0D0;
-  --inactive-fg: #777;
-  --title-fg: #00485E;
-
-  --link-sig-fd: #2da0d1;
-  --link-sig-hover-fd: #7c99a5;
-
-  --leftbar-bg: #003048;
-  --leftbar-fg: #fff;
-  --leftbar-current-bg: #0090BB;
-  --leftbar-current-fg: #fff;
-  --leftbar-hover-bg: #00485E;
-  --leftbar-hover-fg: #fff;
-  --logo-fg: var(--leftbar-fg);
-
-  --icon-color: #00485E;
-  --active-tab-color: #00A0D0;
-  --selected-fg: #00303E;
-  --selected-bg: #BFE7F3;
-
   /* Font Settings */
   --mono-font: "Fira Code", monospace;
   --text-font: "Lato", sans-serif;
   --title-font: "Roboto Slab", serif;
-  --leftbar-font-size: 15px;
+  --leftbar-font-size: 14px;
 
   /* Layout Settings (changes on small screens) */
-  --side-width: 255px;
+  --side-width: 300px;
   --content-padding: 24px 42px;
   --footer-height: 42px;
 }
@@ -44,7 +18,11 @@ body {
   margin: 0;
   padding: 0;
   font-family: "Lato", sans-serif;
-  font-size: 16px;
+  font-size: 18px;
+  background: var(--body-bg);
+}
+body, button, input {
+  color: var(--body-fg);
 }
 
 /* Page layout */
@@ -56,26 +34,40 @@ body {
   width: var(--side-width);
   height: 100%;
   border-right: none;
-  background: var(--leftbar-bg);
+  background: var(--body-bg);
   display: flex;
   flex-direction: column;
   z-index: 5;
+  border-right: solid 1px var(--leftbar-border);
 }
-main {
+#main-content {
   min-height: calc(100vh - var(--footer-height) - 24px);
-}
-#content {
   margin-left: var(--side-width);
   padding: var(--content-padding);
   padding-bottom: calc(24px + var(--footer-height));
+
+  display:flex;
+  flex-direction: column;
+  align-items: center;
+}
+#content {
+  max-width: 1100px;
+  width: 100%;
 }
 
 /* Text */
 h1, h2, h3 {
   font-family: var(--title-font);
   color: var(--title-fg);
+  font-weight: normal;
 }
-pre, code, .monospace, .hljs {
+.monospace {
+  font-family: var(--mono-font);
+  background: var(--documentable-bg);
+  font-variant-ligatures: none;
+  /* padding: 8px; */
+}
+pre, code, .hljs {
   font-family: var(--mono-font);
   background: var(--code-bg);
   font-variant-ligatures: none;
@@ -84,14 +76,29 @@ code {
   font-size: .8em;
   padding: 0 .3em;
 }
+pre {
+  overflow-x: auto;
+  scrollbar-width: thin;
+  margin: 0px;
+}
 pre code, pre code.hljs {
   font-size: 1em;
   padding: 0;
 }
+
 pre, .symbol.monospace {
-  padding: 10px 8px 10px 12px;
   font-weight: 500;
-  font-size: 12px;
+  font-size: 14px;
+  padding: 8px;
+  margin-top: 8px;
+  margin-bottom: 8px;
+}
+pre .hljs-comment {
+  /* Fold comments in snippets */
+  white-space: normal;
+}
+.symbol.monospace {
+  padding: 12px 8px 10px 12px;
 }
 a, a:visited, span[data-unresolved-link] {
   text-decoration: none;
@@ -99,7 +106,6 @@ a, a:visited, span[data-unresolved-link] {
 }
 a:hover, a:active {
   color: var(--link-hover-fg);
-  text-decoration: underline;
 }
 
 /* Tables */
@@ -128,13 +134,13 @@ th {
 }
 #logo>span {
   display: inline-block;
-  padding: 8px 8px 8px 8px;
   vertical-align: middle;
 }
 
-#logo img {
-  max-height: 54px;
-  max-width: 54px;
+#logo>span>img {
+  max-height: 40px;
+  max-width: 40px;
+  margin: 16px 8px 8px 16px;
   cursor: pointer;
 }
 
@@ -142,41 +148,75 @@ th {
   color: var(--leftbar-fg);
   font-size: 28px;
   font-weight: bold;
+  padding: 4px 0px 0px 4px;
 }
 
 #logo .projectVersion {
-  color: var(--leftbar-fg);
   font-size: 12px;
+  display: flex;
+  padding-left: 2px;
+  padding-right: calc(0.08 * var(--side-width));
 }
 
 .scaladoc_logo {
   width: 116px;
+  margin-left: -16px;
+}
+
+.theme-dark .scaladoc_logo {
+  display: none;
+}
+
+.scaladoc_logo_dark {
+  display: none;
+}
+
+.theme-dark .scaladoc_logo_dark {
+  width: 116px;
+  margin-left: -16px;
+  display: block;
 }
 
 /* Navigation */
 #sideMenu2 {
-  overflow: auto;
+  overflow-y: auto;
   overflow-x: hidden;
-  overflow-y: scroll;
-  scrollbar-width: thin;
+
   height: 100%;
   font-size: var(--leftbar-font-size);
+  margin-top: 8px;
 }
 
 /* divs in sidebar represent entry and its children */
-#sideMenu2 div {
-  padding-left: 0.7em;
-  position: relative;
+#sideMenu2 .ni {
+  padding-left: 0.8em;
+}
+
+#sideMenu2 > .ni {
+  padding-left: 0em;
+}
+
+#sideMenu2 .ni {
   display: none;
 }
 
-#sideMenu2 div.expanded {
+#sideMenu2 > .ni {
   display: block;
 }
 
-/* hide children of hidden entries even if are expanded */
-#sideMenu2 div>div.expanded {
-  display: none;
+#sideMenu2 .nh a:only-child {
+  padding-left: 20px;
+}
+
+#sideMenu2 .nh {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  border-radius: 3px;
+}
+
+#sideMenu2 .ni.expanded > .ni {
+  display: block;
 }
 
 /* show direct children of currently exmanded node*/
@@ -198,58 +238,58 @@ th {
 #sideMenu2 a {
   display: flex;
   align-items: center;
-  flex: 1;
-  overflow-x: hidden;
   overflow-wrap: anywhere;
   color: var(--leftbar-fg);
-  margin-right: .5rem;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  margin-top: 1px;
-  margin-bottom: 1px;
-  width: 100%;
-  /* This trick adds selected background stretching to the left side of screen */
-  margin-left: calc(0px - var(--side-width));
-  padding-left: var(--side-width);
-  width: calc(2 * var(--side-width));
+  padding-top: 2%;
+  padding-bottom: 2%;
+  box-sizing: border-box;
+}
+
+#sideMenu2 a:hover {
+  color: var(--link-hover-fg);
 }
 
-#sideMenu2 a.selected {
+#sideMenu2 a span:not(.micon) {
+  margin-right: 0.75ex;
+  text-indent: -1.5em;
+  padding-left: 1.5em;
+}
+
+#sideMenu2 a.selected span:not(.micon) {
+  margin-right: 0.5ex;
+}
+
+#sideMenu2 .nh.selected {
   background: var(--leftbar-current-bg);
+  color: var(--leftbar-current-fg);
   font-weight: bold;
 }
 
-#sideMenu2 a:hover {
+#sideMenu2 .nh:hover {
   color: var(--leftbar-hover-fg);
   background: var(--leftbar-hover-bg);
+  cursor: pointer;
 }
-
 /* spans represent a expand button */
-#sideMenu2 span.ar {
-  align-items: center;
+span.ar {
   cursor: pointer;
-  position: absolute;
-  right: 1em;
-  top: 0px;
-  padding: 4px;
 }
 
-#sideMenu2 span.ar::before {
-  content: "\e903"; /* arrow down */
+span.ar::before {
+  content: "\e904"; /* arrow right */
   font-family: "dotty-icons" !important;
   font-size: 20px;
-  line-height: var(--leftbar-font-size);
-  color: var(--leftbar-fg);
+  color: var(--icon-color);
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: center;
 }
-#sideMenu2 .expanded>span.ar::before {
-  content: "\e905"; /* arrow up */
+.ni.expanded > .nh > span.ar::before {
+  content: "\e903"; /* arrow down */
 }
 
-#sideMenu2 .div:hover>span.ar::before {
+.div:hover>span.ar::before {
   color: var(--leftbar-current-bg);
 }
 
@@ -267,13 +307,13 @@ th {
   background: transparent;
   padding: 0 6px 4px 6px;
   margin: 1rem 1rem 0 0;
-  border-bottom: 1px solid grey;
+  border-bottom: 1px solid var(--border-light);
   cursor: pointer;
 }
 .section-tab[data-active=""] {
   color: unset;
   font-weight: bold;
-  border-bottom: 2px solid var(--active-tab-color);
+  border-bottom: 1px solid var(--active-bg);
 }
 .tabs-section-body > :not([data-active]) {
   display: none;
@@ -379,7 +419,6 @@ dl > div > ol {
 dl.attributes > dt {
   display: block;
   float: left;
-  font-style: italic;
   font-weight: bold;
 }
 dl.attributes > dt.implicit {
@@ -388,9 +427,8 @@ dl.attributes > dt.implicit {
 }
 dl.attributes > dd {
   display: block;
-  padding-left: 6em;
-  margin-bottom: 5px;
-  min-height: 15px;
+  padding-left: 7em;
+  min-height: 24px;
 }
 
 /* params list documentation */
@@ -431,7 +469,11 @@ Same solution is already used in Dokka.
 
 /* Footer */
 footer {
+  background: var(--footer-bg);
+  color: var(--footer-fg);
   display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
   bottom: 0px;
   align-items: center;
   position: fixed;
@@ -440,21 +482,9 @@ footer {
   width: calc(100% - var(--side-width));
   min-height: var(--footer-height);
   border-top: 1px solid var(--border-light);
+  font-size: 14px;
 }
-footer span.go-to-top-icon {
-  background-color: white;
-}
-footer > span:first-child {
-  margin-left: 24px;
-  padding-left: 0;
-}
-footer > span:last-child {
-  margin-right: 24px;
-  padding-right: 0;
-}
-footer > span {
-  padding: 0 16px;
-}
+
 footer .padded-icon {
   padding-left: 0.5em;
 }
@@ -462,75 +492,167 @@ footer .pull-right {
   margin-left: auto;
 }
 
+footer .mode {
+  display: flex;
+  align-items: center;
+}
+
+@media(max-height:640px) {
+  footer {
+    position: unset;
+  }
+}
+
+/* Theme Toggle */
+.switch {
+  /* The switch - the box around the slider */
+  position: relative;
+  display: inline-block;
+  width: 60px;
+  min-width: 60px;
+  height: 32px;
+}
+.switch input {
+  /* Hide default HTML checkbox */
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+.switch .slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border-radius: 34px;
+  background-color: var(--border-medium);
+  -webkit-transition: 0.4s;
+  transition: 0.4s;
+}
+.switch .slider:before {
+  position: absolute;
+  content: "🌘";
+  height: 28px;
+  width: 28px;
+  line-height:28px;
+  font-size:24px;
+  text-align: center;
+  left: 2px;
+  bottom: 4px;
+  top: 0;
+  bottom: 0;
+  border-radius: 50%;
+  margin: auto 0;
+  -webkit-transition: 0.4s;
+  transition: 0.4s;
+  background: transparent;
+}
+.switch input:checked + .slider {
+  background-color: var(--blue100); /* --active-bg, but not affected by the theme */
+}
+.switch input:checked + .slider:before {
+  content: "🌞";
+  -webkit-transform: translateX(28px);
+  -ms-transform: translateX(28px);
+  transform: translateX(28px);
+}
 
 .documentableElement .modifiers {
   display: table-cell;
-  padding-right: 0.5em;
   min-width: 10em;
   max-width: 10em;
+  width: 10em;
   overflow: hidden;
-  direction: rtl;
+  text-align: right;
   white-space: nowrap;
+  text-overflow: ellipsis;
   text-indent: 0em;
+  padding-right: 0.5em;
 }
 
-.documentableElement .modifiers .other-modifiers {
-  color: gray;
+.documentableElement.expand .modifiers {
+  white-space: break-spaces;
+  text-overflow: unset;
 }
 
-.kind {
-  margin-left: 0.5em;
+.documentableElement .docs {
+  width: 100%;
+  table-layout: fixed;
+}
+
+.documentableElement .modifiers .other-modifiers {
+  color: var(--grey600);
 }
 
 .other-modifiers a, .other-modifiers a:visited, .other-modifiers span[data-unresolved-link] {
-  color: var(--link-sig-fd);
+  color: var(--link-sig-fg);
 }
 
 .documentableElement.expand .modifiers {
-  display: inline-table;
-  min-width: 7em;
+  display: table-cell;
 }
 
 .documentableElement .signature {
-  color: #5a5a5a;
-  display: table-cell;
+  color: var(--code-fg);
+  display: table-row;
   white-space: pre-wrap;
+  font-size: 14px;
+}
+
+.docs .modifiers {
+  font-size: 14px;
+}
+
+.signature, .documentableElement {
+  font-weight: 500;
+}
+
+.signature.monospace {
+  padding: 8px;
+  display: flex;
+  flex-direction: column;
+  border-radius: 3px;
+}
+
+.signature.monospace .modifiers {
+  white-space: break-spaces;
 }
 
 .signature a, .signature a:visited, .signature span[data-unresolved-link] {
-  color: var(--link-sig-fd);
+  color: var(--link-sig-fg);
+}
+
+.signature a:hover {
+  color: var(--link-hover-fg);
 }
 
 .expand .signature {
-  display: inline;
+  display: table-row;
+}
+
+.documentableFilter {
+  border-radius: 3px;
 }
 
 .documentableElement {
-  width: 100%;
   color: var(--symbol-fg);
   white-space: normal;
   position: relative;
-  margin: 0;
-  padding: 5px 4px 5px 4px;
-  font-weight: 500;
+  padding: 8px;
   font-size: 12px;
-  background: var(--code-bg);
-  border: 0.25em solid white;
+  background: var(--documentable-bg);
+  border-left: 0.25em solid transparent;
+  margin: 0.5em 0;
+  border-radius: 3px;
 }
 
 .documentableElement>div {
   display: table;
 }
 
-.expand.documentableElement>div {
-  display: block;
-  padding-left: 3em;
-}
-
 .expand.documentableElement>div.header {
-  display: block;
-  padding-left: 7.5em;
-  text-indent: -4.5em;
+  display: inline-table;
 }
 
 .documentableElement>div .cover {
@@ -541,24 +663,22 @@ footer .pull-right {
   display: block;
 }
 
-.expand .doc {
-  margin-left: 6.5em;
-}
-
 .doc code {
   padding: 0;
 }
 
 .documentableElement:hover {
   cursor: pointer;
-  border-left: 0.25em solid var(--leftbar-bg);
+  border-left-color: var(--active-bg);
 }
 
 .expand.documentableElement {
-  border-left: 0.25em solid var(--leftbar-bg);
+  border-left-color: var(--active-bg);
 }
 .documentableElement .annotations {
-  color: gray;
+  color: var(--grey600);
+  margin-left: 10.5em;
+  font-size: 14px;
   display: none;
 }
 
@@ -570,15 +690,50 @@ footer .pull-right {
   display: none;
 }
 
-.documentableAnchor {
+.documentableElement:before {
+  content: ' ';
   position: absolute;
-  width: 24px;
-  height: 24px;
-  background: url('data:image/svg+xml;utf8,<svg width="24" height="24" viewBox="0 0 24 24" fill="darkgray" xmlns="http://www.w3.org/2000/svg"><path d="M21.2496 5.3C20.3496 4.5 19.2496 4 18.0496 4C16.8496 4 15.6496 4.5 14.8496 5.3L10.3496 9.8L11.7496 11.2L16.2496 6.7C17.2496 5.7 18.8496 5.7 19.8496 6.7C20.8496 7.7 20.8496 9.3 19.8496 10.3L15.3496 14.8L16.7496 16.2L21.2496 11.7C22.1496 10.8 22.5496 9.7 22.5496 8.5C22.5496 7.3 22.1496 6.2 21.2496 5.3Z"></path><path d="M8.35 16.7998C7.35 17.7998 5.75 17.7998 4.75 16.7998C3.75 15.7998 3.75 14.1998 4.75 13.1998L9.25 8.6998L7.85 7.2998L3.35 11.7998C1.55 13.5998 1.55 16.3998 3.35 18.1998C4.25 19.0998 5.35 19.4998 6.55 19.4998C7.75 19.4998 8.85 19.0998 9.75 18.1998L14.25 13.6998L12.85 12.2998L8.35 16.7998Z"></path></svg> ');
+  width: 32px;
+  height: 100%;
+  top: 0px;
+  left: -32px;
+}
+
+.documentableElement:hover .documentableAnchor:before {
+  display: flex;
+}
+
+.documentableElement::before:hover .documentableAnchor:before {
+  display: flex;
+}
+
+.documentableAnchor:before {
+  content: "\e901"; /* arrow down */
+  font-family: "dotty-icons" !important;
+  transform: rotate(-45deg);
+  font-size: 20px;
+  color: var(--link-fg);
+  display: none;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  top: 6px;
+  left: -32px;
+}
+
+.documentableAnchor:hover:before {
+  color: var(--link-hover-fg);
+}
+
+.documentableAnchor:active:before {
+  color: var(--link-hover-fg);
+  top: 8px;
 }
 
 .memberDocumentation {
-  font-size: 14px;
+  font-size: 15px;
+  line-height: 1.5;
 }
 
 .memberDocumentation>p{
@@ -589,16 +744,19 @@ footer .pull-right {
   border: none;
   outline: none;
   background: transparent;
-  padding: 0 6px 4px 6px;
-  margin: 1rem 1rem 0 0;
-  border-bottom: 1px solid grey;
+  color: var(--tab-default);
+  padding: 0 2px 8px 2px;
+  margin: 4em 1em 0 0;
+  border-bottom: 2px solid var(--border-medium);
   cursor: pointer;
+  font-size: 16px;
+  font-family: var(--text-font);
 }
 
 .tabs .names .tab.selected {
-  color: unset;
+  color: var(--tab-selected);
   font-weight: bold;
-  border-bottom: 2px solid var(--active-tab-color);
+  border-bottom: 2px solid var(--link-fg);
 }
 
 .tabs .names {
@@ -627,79 +785,151 @@ footer .pull-right {
 
 .micon {
   box-sizing: content-box;
-  height: 5.7em;
-  width: 5.7em;
+  margin-right: 8px;
   color:transparent;
 }
+.theme-dark .micon {
+  filter: brightness(120%);
+}
 
-.micon.c {
+.micon.cl {
   content: url("../images/class.svg")
 }
 
-.micon.c-wc {
+.micon.cl-wc {
   content: url("../images/class_comp.svg")
 }
 
-.micon.o {
+.micon.ob {
   content: url("../images/object.svg")
 }
 
-.micon.o-wc {
+.micon.ob-wc {
   content: url("../images/object_comp.svg")
 }
 
-.micon.t {
+.micon.tr {
   content: url("../images/trait.svg")
 }
 
-.micon.t-wc {
+.micon.tr-wc {
   content: url("../images/trait_comp.svg")
 }
 
-.micon.e {
+.micon.en {
   content: url("../images/enum.svg")
 }
 
-.micon.e-wc {
+.micon.en-wc {
   content: url("../images/enum_comp.svg")
 }
 
-.micon.g {
+.micon.gi {
   content: url("../images/given.svg")
 }
 
-#leftColumn .socials {
-  margin-left: 5%;
-  margin-right: 5%;
+.micon.va {
+  content: url("../images/val.svg")
 }
 
-footer {
-  color: grey;
+.micon.ty {
+  content: url("../images/type.svg")
+}
+
+.micon.st {
+  content: url("../images/static.svg")
+}
+
+.micon.pa {
+  content: url("../images/package.svg")
+}
+
+.micon.de {
+  content: url("../images/method.svg")
+}
+
+#leftColumn .socials {
+  display: none;
 }
 
 footer .socials {
-  margin-left: 10px;
-  margin-right: 10px;
   display: flex;
   align-items: center;
 }
 
-.social-icon {
-  padding-right: 5px;
-  padding-left: 5px;
-}
-
-.social-icon img {
-  height: 20px;
-  width: 20px;
+.footer-text {
+  margin-right: 8px;
 }
 
 #generated-by {
-  margin-right: 20px;
   display: flex;
   align-items: center;
 }
 
+/* Scrollbars */
+
+:root {
+  --scrollbar-bg-color: var(--border-light);
+  --scrollbar-fg-color: var(--border-medium);
+  --scrollbar-fg-hover-color: var(--grey500);
+}
+
+/*   For Firefox */
+#sideMenu2 {
+  scrollbar-color: var(--scrollbar-fg-color) var(--scrollbar-bg-color);
+  scrollbar-width: thin;
+}
+
+/*   For Chrome */
+
+#sideMenu2::-webkit-scrollbar-track {
+  background-color: var(--scrollbar-bg-color);
+  border-radius: 3px;
+}
+
+#sideMenu2::-webkit-scrollbar-thumb {
+  background-color: var(--scrollbar-fg-color);
+  border-radius: 3px;
+}
+
+#sideMenu2::-webkit-scrollbar-thumb:hover {
+  background-color: var(--scrollbar-fg-hover-color);
+}
+
+#sideMenu2::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+/* Signature coloring */
+
+:root {
+  --type-link: var(--blue500);
+  --type: var(--grey700);
+  --keyword: var(--red500);
+}
+
+:root.theme-dark {
+  --type-link: var(--blue400);
+  --keyword: var(--red400);
+}
+
+.signature *[t="t"]:not([href]) { /* Types without links */
+  color: var(--type);
+}
+
+.signature *[t="t"] { /* Types with links */
+  color: var(--type-link);
+}
+
+.signature *[t="k"] { /* Keywords */
+  color: var(--keyword);
+}
+
+.signature *:not[t] { /* Plain text */
+
+}
+
 /* Large Screens */
 @media(min-width: 1100px) {
   :root {
@@ -730,11 +960,19 @@ footer .socials {
   footer > span:last-child {
     margin-right: 12px;
   }
+
+  footer {
+    position: unset;
+  }
+
+  .footer-text {
+    display: none;
+  }
 }
 /* Portrait phones */
 @media(max-width: 576px) {
   :root {
-    --side-width: 0;
+    --side-width: 0px;
     --content-padding: 48px 12px;
   }
 
@@ -760,8 +998,10 @@ footer .socials {
     font-size: 30px;
   }
   #leftColumn.open ~ #main #leftToggler {
+    position: fixed;
     left: unset;
-    right: 5vw;
+    right: 16vw;
+    color: var(--leftbar-fg);
   }
   .icon-toggler::before {
     content: "\e90a"; /* menu icon */
@@ -781,6 +1021,90 @@ footer .socials {
   }
 }
 
-footer {
-  background-color: white;
+/* Breadcrumbs */
+
+.breadcrumbs a {
+  margin: 0 8px;
+}
+
+.breadcrumbs a:first-child {
+  margin: 0 8px 0 0;
+}
+
+.breadcrumbs {
+  align-self: flex-start;
+}
+
+/* Header from docs.scala-lang */
+
+.navigation .navigation-menu {
+  padding-left: 0px;
+  margin: 18px 0px;
+}
+.navigation .navigation-menu .navigation-menu-item {
+  margin: 5px 0px;
+  display: inline-block;
+}
+.navigation .navigation-menu .navigation-menu-item:last-child {
+  margin-right: 0px;
+}
+.navigation .navigation-menu .navigation-menu-item a {
+  padding: 5px 15px;
+  text-transform: uppercase;
+  border-radius: 300px;
+  font-weight: 700;
+  color: var(--title-fg);
+}
+.navigation .navigation-menu .navigation-menu-item a:active, .navigation .navigation-menu .navigation-menu-item a:focus, .navigation .navigation-menu .navigation-menu-item a:hover, .navigation .navigation-menu .navigation-menu-item a.active {
+  background: var(--red500);
+  text-decoration: none;
+}
+.two-columns {
+  display: flex;
+  justify-content: space-between;
+}
+
+/* Nav Icons */
+
+.arrows {
+  font-size: 3em;
+  text-align: center;
+
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  margin: 0;
+  max-width: 150px;
+  min-width: 90px;
+
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+
+  transition: color 0.5s, background-color 0.5s;
+}
+
+.arrows.previous, .arrows.next {
+  color: var(--grey400);
+}
+
+.arrows:hover {
+  text-decoration: none;
+  color: var(--grey300);
+  background-color: var(--grey900);
+  transition: background-color 0.15s, color 0.15s;
+}
+
+.previous {
+  left: var(--side-width);
+  float: left;
+}
+
+.next {
+  right: 0;
+  float: right;
+}
+
+@media screen and (max-width: 1000px) {
+  .arrows-wrapper { display: none; }
 }
diff --git a/scaladoc/resources/dotty_res/styles/search-bar.css b/scaladoc/resources/dotty_res/styles/search-bar.css
deleted file mode 100644
index fc5c7ed45c15..000000000000
--- a/scaladoc/resources/dotty_res/styles/search-bar.css
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Global search */
-.search-content {
-  padding: 0;
-  margin: var(--content-padding);
-  position: fixed;
-  top: 0;
-  right: 0;
-  z-index: 5;
-  background: none;
-}
-
-/* popup */
-.popup-wrapper {
-  box-shadow: 0 0 10px var(--border-light) !important;
-  border: 2px solid var(--border-light) !important;
-  font-family: var(--mono-font) !important;
-  width: calc(100% - var(--side-width) - 84px);
-  left: calc(var(--side-width) + 42px) !important;
-}
-.popup-wrapper .indented {
-  text-indent: 1.5em !important;
-}
-.popup-wrapper .disabled {
-  color: var(--inactive-fg) !important;
-  font-weight: 500 !important;
-}
-.action_def:hover, .action_def.hover_a79 {
-  color: var(--selected-fg);
-  background: var(--selected-bg) !important;
-  font-weight: 500;
-}
-.action_def .template-description {
-  margin-left: 2rem;
-  font-style: italic;
-}
-
-/* Landscape phones, portait tablets */
-@media(max-width: 768px) {
-  .popup-wrapper {
-    width: calc(100% - 48px);
-    left: 24px !important;
-  }
-}
-
-/* Portrait phones */
-@media(max-width: 576px) {
-  .search-content {
-    margin: 0 !important;
-    top: 9px !important;
-    right: 12px !important;
-  }
-  .popup-wrapper {
-    width: 100%;
-    left: 0 !important;
-    top: 36px !important;
-  }
-  /* Allow to scroll horizontally in the search results, which is useful on small screens */
-  .popup-wrapper div.ReactVirtualized__Grid__innerScrollContainer {
-    overflow: auto !important;
-  }
-  .popup-wrapper div.ReactVirtualized__Grid__innerScrollContainer > div {
-    min-width: 100%;
-    width: auto !important;
-  }
-}
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-brands-400.eot b/scaladoc/resources/dotty_res/webfonts/fa-brands-400.eot
new file mode 100644
index 000000000000..d05ea581fbbf
Binary files /dev/null and b/scaladoc/resources/dotty_res/webfonts/fa-brands-400.eot differ
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-brands-400.svg b/scaladoc/resources/dotty_res/webfonts/fa-brands-400.svg
new file mode 100644
index 000000000000..4e48a4669730
--- /dev/null
+++ b/scaladoc/resources/dotty_res/webfonts/fa-brands-400.svg
@@ -0,0 +1,3717 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+<metadata>
+Created by FontForge 20201107 at Tue Mar 16 10:15:04 2021
+ By Robert Madole
+Copyright (c) Font Awesome
+</metadata>
+<!-- Font Awesome Free 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><defs>
+<font id="FontAwesome5Brands-Regular" horiz-adv-x="448" >
+  <font-face 
+    font-family="Font Awesome 5 Brands Regular"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="512"
+    panose-1="2 0 5 3 0 0 0 0 0 0"
+    ascent="448"
+    descent="-64"
+    bbox="-0.200195 -66.9505 641.5 448.3"
+    underline-thickness="25"
+    underline-position="-50"
+    unicode-range="U+0020-F8E8"
+  />
+    <missing-glyph />
+    <glyph glyph-name="firefox-browser" unicode="&#xe007;" horiz-adv-x="512" 
+d="M130.63 324.51c0.160156 -0.00976562 0.0800781 -0.00976562 0 0zM482.05 279.16c15.2803 -36.7598 20.6709 -80.748 15.8213 -122.578c-0.370117 -3.15039 -0.700195 -6.29004 -1.11035 -9.41016c-19.6094 -115.04 -119.79 -202.62 -240.43 -202.62
+c-134.71 0 -243.92 109.19 -243.92 243.891v1.23926c0.149414 2.70996 0.30957 5.41016 0.490234 8.12012c0.0498047 0.240234 0.0498047 0.480469 0.0498047 0.719727c0.439453 6.29004 0.870117 10.3105 1.43945 14c0.240234 1.91309 0.5 3.82617 0.780273 5.73926
+c1.66992 12.2705 3.94043 22.21 4 22.4805c5.99219 26.8799 17.3516 52.1084 32.7305 73.8994v0c6.86816 9.79785 14.3965 18.8301 22.7695 27.3301c7.36719 7.53418 15.2451 14.2881 23.8398 20.4307c0.930664 0.629883 8.03027 4.83984 8.15039 4.30957
+c-0.570312 -8.42969 -1.24023 -48.8301 8.42969 -61.0801h0.120117c14.1602 15.9199 33.6504 33.96 58.71 45.3701c-2.38477 -9.13379 -3.64844 -18.6562 -3.64844 -28.5332c0 -10.7832 1.51367 -21.2158 4.33887 -31.0967
+c2.20508 -1.47852 4.29199 -3.05566 6.30957 -4.77051c3.71973 -3.14941 7.91992 -7.34961 16.7705 -16.0596c16.5498 -16.3096 59 -33.1797 59.0898 -35.1797c-0.400391 -6.08008 -21.8301 -27 -29.3301 -27c-69.3701 0 -80.6201 -41.9502 -80.6201 -41.9502
+c3.07031 -35.3301 27.6699 -64.4102 57.5098 -79.75c1.36035 -0.730469 2.74023 -1.37012 4.12012 -2c2.36035 -1.04004 4.74023 -2.02051 7.16016 -2.92969c9.95996 -3.52539 20.6885 -5.66895 31.7402 -6.12012c121.569 -5.7002 145.13 145.34 57.3896 189.199
+c22.4697 3.91016 45.8203 -5.12988 58.8203 -14.2793c-10.374 18.1104 -24.9414 33.167 -42.6602 44.1299c-0.993164 0.620117 -1.99316 1.21973 -3 1.7998c-1.55957 0.913086 -3.13965 1.79004 -4.74023 2.62988c-0.75 0.390625 -1.5 0.759766 -2.25 1.12988
+c-1.65332 0.813477 -3.32031 1.59668 -5.00098 2.34961c-1.07031 0.469727 -2.16016 0.910156 -3.25 1.34961c-1.33984 0.580078 -2.68945 1.08008 -4.0498 1.58008c-1.86035 0.669922 -3.73047 1.2998 -5.62012 1.87012c-0.679688 0.209961 -1.33008 0.429688 -2 0.629883
+c-10.8193 3.12793 -22.2139 4.82422 -34.0352 4.82422c-0.338867 0 -0.676758 -0.00195312 -1.01465 -0.00390625c-2 -0.0205078 -4 -0.100586 -6 -0.220703l-1.41992 -0.0996094c-14.8984 -1.04102 -29.2461 -4.92383 -42.1104 -11l-0.519531 -0.209961
+c-0.625977 -0.21582 -1.29688 -0.335938 -1.99609 -0.335938c-2.68164 0 -4.96289 1.72559 -5.79395 4.12598c-0.246094 0.669922 -0.388672 1.39258 -0.388672 2.14746c0 2.4541 1.41797 4.58008 3.47852 5.60254c14.7295 6.98535 31.1982 11.3564 48.3301 12.3301
+c5.7793 35.3994 28.2695 91.0098 82.5 122.78l-0.100586 -0.140625l0.180664 0.100586l0.120117 0.0693359c0.0732422 0.0195312 0.149414 0.0302734 0.229492 0.0302734c0.0791016 0 0.15625 -0.0107422 0.230469 -0.0302734
+c0.30957 -0.0390625 0.550781 -0.303711 0.550781 -0.624023c0 -0.0117188 -0.000976562 -0.0244141 -0.000976562 -0.0361328c0.84375 -3.34961 2.08887 -6.61523 3.63965 -9.61914c0.830078 -1.70996 1.69043 -3.40039 2.69043 -5.05078
+c1.87988 -3.21973 3.80957 -6.2793 5.73926 -9.33008c38.2002 -60.3594 84.9707 -88.0791 112.551 -156.829c-0.0507812 0.269531 -0.0507812 0.40918 -0.0507812 0.40918c-3.0293 20.1201 -10.9795 47.1104 -24.6992 74
+c16.8594 -8.72949 38.3301 -36.2295 48.9395 -61.7295z" />
+    <glyph glyph-name="ideal" unicode="&#xe013;" horiz-adv-x="576" 
+d="M125.61 282.52c27.0713 -0.0107422 49.0488 -21.9873 49.0596 -49.0596v-0.00976562c0 -27.083 -21.9873 -49.0703 -49.0703 -49.0703c-27.082 0 -49.0693 21.9873 -49.0693 49.0703c0 27.082 21.9873 49.0693 49.0693 49.0693h0.0107422zM86.1504 22.1602v140.52
+h78.9395v-140.52h-78.9395zM237.61 233.76c0 -20.4502 -8.99023 -23.2598 -18.7402 -23.2598h-14.0498v45.79h14.0498c8.74023 0 18.7402 -2.53027 18.7402 -22.5303zM439.3 187.76h57.0898c-1.7793 -98.4795 -52.1094 -165.64 -196.72 -165.64h-94.8301v165.62h14
+c25.9805 0 41.5 17.1895 41.5 46c0 27.9102 -15.8994 45.2598 -41.5 45.2598h-14v82.8096h94.8301c88.9404 0 186.83 -26.8896 196.07 -151.31h-33.6904v68.5703h-22.75v-91.3105zM329.55 187.76l-0.0400391 22.7402h-33.5098v12.5h30v22.6904h-30v10.5791h31.7305v22.7305
+h-54.4307v-91.2402h56.25zM404.21 187.76l23.6699 -0.0195312l-27.5303 91.3398h-32.3496l-27.5303 -91.3203h23.6602l5.17969 17.6699h29.7402zM299.65 416c218.35 0 250.97 -140 251 -223.48c0 -144.789 -89.1504 -224.52 -251 -224.52h-267.65v448h267.65z
+M299.65 -10.9199c148.899 0 229.899 69.3496 229.899 203.439c0 137.801 -87.7998 202.41 -229.899 202.41h-246.58v-405.85h246.58zM383.51 253.93h1.37012l7.52051 -25.8096h-16.4004z" />
+    <glyph glyph-name="microblog" unicode="&#xe01a;" 
+d="M399.36 85.7695l0.149414 0.0605469c-13.5439 -15.3408 -21.7432 -35.5967 -21.7432 -57.6494c0 -19.957 6.73438 -38.3545 18.0537 -53.041c0.589844 -0.745117 0.944336 -1.68652 0.944336 -2.71094c0 -0.311523 -0.0322266 -0.615234 -0.0947266 -0.90918
+c-0.416992 -2.00684 -2.19434 -3.52051 -4.32422 -3.52051c-0.306641 0 -0.606445 0.03125 -0.895508 0.0908203c-32.2803 7.17969 -61.3105 24.8301 -79.8906 49.9199c-1.30566 1.78906 -3.41699 2.94434 -5.7998 2.94434
+c-0.811523 0 -1.5918 -0.135742 -2.31934 -0.383789c-24.7363 -8.66016 -51.3818 -13.4404 -79.0586 -13.4404h-0.381836c-122.86 0 -222.46 91.4805 -222.46 204.43c0 112.95 99.5996 204.44 222.46 204.44s222.46 -91.4902 222.46 -204.44
+c0 -47.4492 -17.6104 -91.0996 -47.0996 -125.79zM329.52 235.6c1.56738 1.18652 2.57324 3.03516 2.57324 5.15039c0 3.57227 -2.88672 6.47461 -6.45312 6.5l-71.8799 1.50977l-23.6602 67.9199c-0.882812 2.54199 -3.29688 4.36914 -6.1377 4.36914
+s-5.25879 -1.82715 -6.1416 -4.36914l-23.6602 -67.9199l-71.8799 -1.50977c-3.5293 -0.0673828 -6.38086 -2.95117 -6.38086 -6.49609c0 -2.11523 1.01367 -3.99707 2.58105 -5.18359l57.2998 -43.4902l-20.79 -68.8604
+c-0.178711 -0.59375 -0.269531 -1.21875 -0.269531 -1.87109c0 -3.59277 2.91699 -6.50977 6.50977 -6.50977c1.37793 0 2.65723 0.429688 3.70996 1.16113l59.0596 41.0801l59.0596 -41.0498c1.05371 -0.735352 2.33984 -1.1709 3.71973 -1.1709
+c3.58789 0 6.5 2.91211 6.5 6.5c0 0.657227 -0.0976562 1.29199 -0.279297 1.89062l-20.7803 68.8604z" />
+    <glyph glyph-name="pied-piper-square" unicode="&#xe01e;" 
+d="M32 29l-32 -60.2002l0.799805 328c0 65.9004 53.2002 119.2 119.2 119.2h327.2c-93 -28.9004 -189.9 -94.2002 -253.9 -168.6c-70.5996 -81.4004 -110.7 -137.4 -161.3 -218.4zM448 416c0 0 0 -328.8 0.0996094 -328.8c0 -65.9004 -53.2998 -119.2 -119.3 -119.2
+h-328.399c18.5 25.5 61.6992 54 84.8994 66c35.5 18.0996 76.4004 28.5 105.3 56.2998c42.1006 40.5 47.8008 105 71 158.601c43.6006 100.3 186.4 167.1 186.4 167.1z" />
+    <glyph glyph-name="unity" unicode="&#xe049;" horiz-adv-x="576" 
+d="M498.11 241.6l-30 -49.5996l30 -49.6299l-52.8008 -191.62l-197.079 51.3604l-29.2402 50l-59.1699 -0.430664l-144.28 140.32l144.26 140.29l59.2002 -0.429688l29.2002 50.0596l197.109 51.3604zM223.77 323.8l-108.899 -108.13h173.13l86.5498 145.82zM223.77 60.1699
+l150.78 -37.6895l-86.5498 145.81h-173.13zM416.77 46.1699l41.79 145.83l-41.8096 145.84l-86.5801 -145.84z" />
+    <glyph glyph-name="dailymotion" unicode="&#xe052;" 
+d="M298.93 181c7.14062 -4 12.9844 -9.85254 16.9727 -17c3.86426 -6.83691 6.10059 -14.7783 6.10059 -23.1865c0 -0.0947266 0 -0.188477 -0.000976562 -0.283203c-0.0332031 -13.6602 -4.58691 -25.084 -13.6602 -34.2705s-20.4434 -13.7793 -34.1104 -13.7793
+c-13.4336 0 -24.5771 4.47949 -33.4307 13.4395s-13.2803 20.4932 -13.2803 34.5996c0 13.4336 4.53711 24.5742 13.6104 33.4209s20.2197 13.2695 33.4395 13.2695c0.214844 0.00292969 0.469727 -0.0263672 0.685547 -0.0263672
+c8.59668 0 16.6738 -2.24609 23.6738 -6.18359zM0.00195312 416h448v-448h-448v448zM374.712 42.7402l-0.0302734 264.349l-55.79 -12.0898v-77.9199c-7.81348 7.86035 -16.1465 13.5273 -25 17.001c-8.87695 3.35352 -18.5127 5.21875 -28.5576 5.21875
+c-0.394531 0 -0.789062 -0.00292969 -1.18164 -0.00878906c-17.6934 -0.00683594 -33.6006 -4.37305 -47.7207 -13.0996c-14.0625 -8.68066 -25.4102 -20.9805 -32.9297 -35.7803c-7.83984 -15.1064 -11.7598 -31.8467 -11.7598 -50.2197
+c-0.00683594 -18.8066 3.85645 -35.7705 11.5898 -50.8906c7.45215 -14.8447 18.8232 -27.1611 32.9395 -35.7695c14.2197 -8.7334 30.5166 -13.1006 48.8906 -13.1006c26.6602 0 45.2539 8.7334 55.7803 26.2002h0.669922v-23.8896h53.0996z" />
+    <glyph glyph-name="instagram-square" unicode="&#xe055;" 
+d="M224 245.34c29.4385 -0.0107422 53.3379 -23.9043 53.3604 -53.3398c0 -29.4395 -23.9004 -53.3398 -53.3398 -53.3398s-53.3398 23.9004 -53.3398 53.3398c0 29.4326 23.8896 53.3291 53.3193 53.3398zM348.71 286.34
+c8.34961 -21.0703 6.46973 -71.0596 6.46973 -94.3398s1.91992 -73.3301 -6.42969 -94.3301c-5.4834 -13.8955 -16.5146 -24.9268 -30.4102 -30.4102c-21.0596 -8.35938 -70.9902 -6.42969 -94.2998 -6.42969s-73.3096 -1.86035 -94.3096 6.42969
+c-13.8955 5.4834 -24.9277 16.5146 -30.4102 30.4102c-8.32031 21.0703 -6.4707 71.0605 -6.4707 94.3398c0 23.2803 -1.84961 73.3301 6.43066 94.3301c5.48242 13.8955 16.5146 24.9268 30.4102 30.4102c21.0596 8.36035 71.0098 6.42969 94.3096 6.42969
+s73.2998 1.86035 94.2998 -6.42969c13.8955 -5.4834 24.9268 -16.5146 30.4102 -30.4102zM224 110c0.0341797 0 0.0664062 -0.00195312 0.0996094 -0.00195312c45.2021 0 81.9004 36.6982 81.9004 81.9004v0.101562c0 45.2568 -36.7432 82 -82 82s-82 -36.7432 -82 -82
+s36.7432 -82 82 -82zM309.38 258.3c10.5371 0.00585938 19.1299 8.52051 19.1299 19.0586v0.0820312c0 10.5635 -8.57617 19.1396 -19.1396 19.1396c-10.5645 0 -19.1406 -8.57617 -19.1406 -19.1396c0 -10.5645 8.57617 -19.1406 19.1406 -19.1406h0.00976562zM400 416
+c26.4922 0 48 -21.5078 48 -48v-352c0 -26.4922 -21.5078 -48 -48 -48h-352c-26.4922 0 -48 21.5078 -48 48v352c0 26.4922 21.5078 48 48 48h352zM382.88 126c1.49023 26.4404 1.49023 105.56 0 131.88c-1.21973 25.6299 -7.17969 48.3506 -25.8496 67.0498
+c-18.6699 18.7002 -41.3701 24.5605 -67 25.8506c-26.4102 1.48926 -105.59 1.48926 -132 0c-25.5303 -1.2207 -48.2207 -7.12012 -67 -25.7803c-18.7803 -18.6602 -24.5605 -41.3701 -25.8506 -67c-1.48926 -26.3896 -1.48926 -105.58 0 -132
+c1.2207 -25.5801 7.11035 -48.2998 25.8506 -67c18.7393 -18.7002 41.3701 -24.5596 67 -25.8496c26.4102 -1.49023 105.59 -1.49023 132 0c25.5996 1.21973 48.29 7.18945 67 25.8496s24.5596 41.3701 25.8496 67z" />
+    <glyph glyph-name="mixer" unicode="&#xe056;" horiz-adv-x="512" 
+d="M114.57 371.93l128.319 -172.399c1.44531 -1.99805 2.29785 -4.47461 2.29785 -7.12598c0 -2.65234 -0.852539 -5.10645 -2.29785 -7.10449l-128.89 -173.24c-8.33594 -11.1826 -21.6582 -18.3877 -36.666 -18.3877c-11.877 0 -22.7031 4.54004 -30.834 11.9785
+c-17.8496 16.1797 -18.9697 43.5195 -4.74023 62.7695l92.3301 124.15l-91.7803 123c-14.25 19.25 -12.8291 46.5898 4.75 62.7695c8.13281 7.44141 18.9551 12.0264 30.8359 12.0264c15.0088 0 28.3389 -7.25 36.6748 -18.4365zM470.24 68.4199
+c14.2295 -19.25 13.1094 -46.5898 -4.73047 -62.7695c-8.13184 -7.44141 -18.9551 -12.0264 -30.835 -12.0264c-15.0098 0 -28.3389 7.25 -36.6748 18.4355l-128.57 173.5c-1.44434 1.99805 -2.29688 4.47461 -2.29688 7.12598c0 2.65234 0.852539 5.10645 2.29688 7.10449
+l128 172.12c8.33594 11.1855 21.6602 18.3926 36.6699 18.3926c11.8809 0 22.708 -4.54199 30.8408 -11.9824c17.5791 -16.1807 18.9697 -43.5205 4.75 -62.7705l-91.7803 -123z" />
+    <glyph glyph-name="shopify" unicode="&#xe057;" 
+d="M388.32 343.9c0.399414 -2.40039 54.4395 -367.9 54.4395 -367.9l-125.689 -31.2002v432.73c8.00977 -8.01074 29.6201 -28.8301 29.6201 -28.8301s35.2295 -0.799805 37.2295 -0.799805c2.25 -0.103516 4.08887 -1.81055 4.40039 -4zM288.65 377.53
+c9.20996 2.7998 13.3604 4.18945 14.8096 4.39941c1.4502 0.209961 2.90625 0.34375 4.40039 0.400391v-438.33l-302.58 52.4805s36.7998 281.819 38 291.819c1.58984 13.2002 2 13.6006 16 18c0.399414 0.400391 19.6094 6.41016 47.2295 14.8105
+c2.82031 21.2197 13.21 48.4395 26.8203 70.0596c19.25 30.8301 43.25 48.0303 67.25 48.8301c12.4199 0.370117 22.8203 -3.62988 30.8203 -12.4004c0.399414 -0.799805 1.19922 -1.19922 1.59961 -2c1.11914 0.267578 2.27051 0.40918 3.4707 0.40918
+c0.176758 0 0.353516 -0.00292969 0.529297 -0.00878906c18.4199 0 34 -10.8496 44.4404 -30.8604c2.84082 -5.58887 5.28809 -11.5479 7.20996 -17.6094zM233.41 360.31c0.399414 13.21 -1.2002 32.8301 -8.00977 47.2002
+c-6.80078 -3.2002 -12.8105 -8.41016 -17.21 -12.8096c-11.21 -12.3701 -20.8203 -31.1807 -25.6201 -50c17.21 5.20996 34.8398 10.8096 50.8398 15.6094zM200.58 423.56c-36.8301 -0.799805 -69.25 -58.8398 -78.0098 -97.2295c13.1699 4 27.5801 8.40039 42 12.8096
+c4.7998 24.4502 16.4102 50.0303 31.6201 66.4502c6 6 12.4092 11.21 18.8096 14.4102c-3.99414 2.26367 -8.625 3.57422 -13.54 3.57422c-0.293945 0 -0.587891 -0.00488281 -0.879883 -0.0146484zM154.15 203.39c-0.400391 4.81055 0 23.6104 29.6191 25.6201
+c20.4209 1.60059 37.6309 -6.39941 37.6309 -6.39941l15.21 57.5996s-13.2305 6.41016 -39.2305 4.80957c-67.25 -4.40918 -97.6699 -51.2393 -94.4697 -97.6797c3.59961 -55.2402 58.8398 -53.2402 60.8398 -86.8594
+c0.410156 -8.01074 -4.80957 -19.6201 -18.8096 -20.4209c-21.6201 -1.59961 -48.4404 18.8203 -48.4404 18.8203l-10.4004 -44s26.8203 -28.8203 75.6504 -25.6201c40.4297 2.41016 68.4502 34.8301 65.6504 82.4707c-4 60.4395 -71.6504 66.0498 -73.25 91.6592z
+M249.42 365.12c8.80664 2.7998 16.8135 5.2002 24.0205 7.2002c-4.01074 12.4297 -12.8105 32.8301 -31.2305 36.4297c5.61035 -14.4102 7.20996 -31.6299 7.20996 -43.6299z" />
+    <glyph glyph-name="deezer" unicode="&#xe077;" horiz-adv-x="576" 
+d="M451.46 203.29v72.71h124.54v-72.71h-124.54zM451.46 377.18h124.54v-72.6699h-124.54v72.6699zM451.46 102.12v72.6797h124.54v-72.6797h-124.54zM0 0.910156v72.6699h124.54v-72.6699h-124.54zM150.47 0.910156v72.6699h124.53v-72.6699h-124.53zM300.99 0.910156
+l0.00976562 72.6699h124.53v-72.6699h-124.54zM451.46 0.910156v72.6699h124.54v-72.6699h-124.54zM301 102.12v72.6797h124.53v-72.6797h-124.53zM150.48 102.12l-0.0107422 72.6797h124.53v-72.6797h-124.52zM150.48 203.29l-0.0107422 72.71h124.53v-72.71h-124.52z" />
+    <glyph glyph-name="edge-legacy" unicode="&#xe078;" horiz-adv-x="512" 
+d="M25.71 219.84l0.349609 0.480469c0 -0.160156 0 -0.320312 -0.0693359 -0.480469h-0.280273zM486.29 204.33v-52.0703h-314.08c1.38965 -128.49 191.39 -124.06 272.26 -67.5693v-104.431c-47.3594 -28.5293 -156.779 -53.1699 -240.13 -21.3301
+c-70.6201 27.1602 -119.92 100.551 -120.75 172c-1.09961 92.2207 45.7002 153.42 120.75 188.32c-15.79 -19.9297 -27.9697 -41.54 -34.3398 -78.9297h175.85c10.25 105 -99.4199 105 -99.4199 105c-103.3 -3.62012 -177.949 -63.6904 -220.37 -125
+c14.5605 114.47 92.9404 219.96 232.83 219.68c85.0205 0 157.61 -39.8799 198.591 -113.27c21.0498 -37.9404 28.8096 -78.4004 28.8096 -122.4z" />
+    <glyph glyph-name="google-pay" unicode="&#xe079;" horiz-adv-x="640" 
+d="M105.72 233h99.6602c1.1543 -7.06152 1.75 -14.1768 1.75 -21.5635v-0.216797c0 -32.7598 -11.4102 -60.2998 -31.4102 -78.9102c-17.4502 -16.3799 -41.5293 -25.9092 -70 -25.9092c-41.4531 0.103516 -77.2598 24.0869 -94.3799 59v0.149414
+c-7.21582 14.4512 -11.2773 30.957 -11.2773 48.1943c0 17.2383 4.06152 33.5352 11.2773 47.9863c17.1172 34.9355 52.9199 58.9502 94.3799 59.1094c0.344727 0.00390625 0.699219 0.00585938 1.04492 0.00585938c27 0 51.5469 -10.5928 69.7051 -27.8457
+l-30.2793 -30.6201c-10.1777 9.95508 -24.0938 16.0898 -39.4404 16.0898c-0.357422 0 -0.713867 -0.00292969 -1.07031 -0.00976562c-27.5996 0 -50.9297 -18.9102 -59.2998 -44.3701v0c-2.12109 -6.44824 -3.26855 -13.3545 -3.26855 -20.5088
+s1.14746 -14.043 3.26855 -20.4912c8.37012 -25.3096 31.7002 -44.2197 59.2998 -44.2197c14.2803 0 26.46 3.72949 36 10.2803c10.9629 7.39648 18.7705 19.0664 21.1406 32.5996h-57.1006v41.25zM495.13 237c10.1299 -9.33984 15.1201 -22.4502 15.0498 -39v-78.7002
+h-22.6094v17.7197h-1c-9.79004 -14.5898 -22.71 -21.8896 -39 -21.8896c-13.79 0 -25.54 4.16992 -34.79 12.5098c-8.55078 7.29199 -13.9541 18.1143 -13.9541 30.2207c0 0.350586 0.00488281 0.701172 0.0136719 1.0498c0 13.25 4.98047 23.6699 14.8203 31.5596
+c9.83984 7.89062 23.0498 11.7705 39.4902 11.7705c14.0898 0 25.54 -2.68066 34.6396 -7.75v5.50977c-0.00488281 8.47461 -3.75098 16.0723 -9.69043 21.2305c-6.02051 5.44141 -14.0078 8.76855 -22.75 8.78906c-13.2061 0 -23.626 -5.66699 -31.2598 -17
+l-20.8496 13.2607c11.1602 16.5195 28.04 24.8594 50.5 24.8594c17.46 0 31.2598 -4.75977 41.3896 -14.1396zM475.9 147.7c7.7793 7.4502 11.7393 16.2295 11.7393 26.3594c-7.33984 5.94043 -17.6396 8.94043 -30.7998 8.78027c-9.54004 0 -17.75 -2.38965 -24.0703 -7
+c-6.31934 -4.60938 -9.53906 -10.4199 -9.53906 -17.4199c-0.000976562 -0.0332031 -0.0166016 -0.0546875 -0.0166016 -0.0878906c0 -6.35449 3.05957 -12 7.78613 -15.542c4.8916 -3.90625 11.1035 -6.25391 17.8447 -6.25391
+c0.162109 0 0.324219 0.000976562 0.485352 0.00390625c10.3965 0.0126953 19.8076 4.2793 26.5703 11.1602zM382.25 289.7c10.4268 -9.92188 16.9102 -23.9102 16.9102 -39.4248c0 -14.166 -5.4209 -27.0752 -14.2998 -36.7656
+c-0.890625 -0.889648 -1.77051 -1.79004 -2.65039 -2.67969c-11.0098 -10.5703 -24.5098 -15.9297 -40.5098 -15.9297h-39v-75.6406h-23.6299v186.74h62.6699c0.379883 0.0078125 0.749023 0.0185547 1.13086 0.0185547c15.3701 0 29.2949 -6.23828 39.3789 -16.3184z
+M365.67 227.47c5.5957 5.94141 9.03223 13.9971 9.03223 22.7939c0 9.18164 -3.7373 17.4961 -9.77246 23.5059c-5.78027 5.70801 -13.7236 9.23047 -22.4814 9.23047h-0.118164h-39.6299v-65.21h39.6299c0.328125 -0.0107422 0.640625 -0.0253906 0.970703 -0.0253906
+c8.82031 0 16.7754 3.7334 22.3691 9.70508zM614.31 247h25.6904l-79 -183.87h-24.3496l29.3496 64.3203l-51.79 119.55h25.6904l37.4199 -91.7002h0.449219z" />
+    <glyph glyph-name="rust" unicode="&#xe07a;" horiz-adv-x="512" 
+d="M508.52 198.25c2.09375 -1.2959 3.44043 -3.60449 3.44043 -6.24512c0 -2.6416 -1.39648 -4.95898 -3.49023 -6.25488l-21.8193 -13.5098c-0.169922 -1.95996 -0.34082 -3.91992 -0.550781 -5.87012l18.7207 -17.5c1.43457 -1.3418 2.33203 -3.24805 2.33203 -5.36523
+c0 -3.15039 -1.98535 -5.83984 -4.77246 -6.88477l-24 -9c-0.540039 -1.88965 -1.08008 -3.78027 -1.66992 -5.65039l15 -20.8301c0.865234 -1.20508 1.37207 -2.68945 1.37207 -4.28516c0 -3.65234 -2.66992 -6.68555 -6.16211 -7.25488l-25.4199 -4.14941
+c-0.900391 -1.71973 -1.79004 -3.4502 -2.73047 -5.15039l10.6807 -23.4199c0.420898 -0.925781 0.655273 -1.96875 0.655273 -3.05176c0 -1.50781 -0.455078 -2.91113 -1.23535 -4.07812c-1.29199 -1.97168 -3.51172 -3.26758 -6.04297 -3.26758
+c-0.109375 0 -0.21875 0.00292969 -0.327148 0.0078125l-25.8203 0.910156c-1.18652 -1.4873 -2.38965 -2.9541 -3.60938 -4.40039l5.92969 -25.1602c0.125977 -0.538086 0.196289 -1.0957 0.196289 -1.67188c0 -4.0625 -3.29785 -7.36035 -7.35938 -7.36035
+c-0.577148 0 -1.13867 0.0664062 -1.67676 0.192383l-25.1504 5.92969c-1.45312 -1.21289 -2.91992 -2.41602 -4.39941 -3.60938l0.90918 -25.8203c0.00390625 -0.0878906 -0.000976562 -0.167969 -0.000976562 -0.256836c0 -4.05664 -3.29395 -7.34961 -7.34961 -7.34961
+c-1.08398 0 -2.1123 0.235352 -3.03906 0.65625l-23.4199 10.6807c-1.7002 -0.94043 -3.42969 -1.83008 -5.15039 -2.73047l-4.14941 -25.4199c-0.56543 -3.49121 -3.60254 -6.16309 -7.25293 -6.16309c-1.59961 0 -3.08105 0.512695 -4.28711 1.38281l-20.8203 15
+c-1.87012 -0.599609 -3.75977 -1.12988 -5.64941 -1.67969l-9 -24c-1.05078 -2.7832 -3.7373 -4.7627 -6.88574 -4.7627c-2.11426 0 -4.02148 0.892578 -5.36426 2.32227l-17.5 18.7305c-1.9502 -0.219727 -3.88086 -0.390625 -5.88086 -0.560547l-13.5098 -21.8193
+c-1.2959 -2.09375 -3.60352 -3.49023 -6.24512 -3.49023s-4.95898 1.39648 -6.25488 3.49023l-13.5098 21.8193c-1.95996 0.169922 -3.92969 0.34082 -5.87988 0.550781l-17.5 -18.7207c-1.34277 -1.42969 -3.24707 -2.32422 -5.36133 -2.32422
+c-3.14844 0 -5.83789 1.98145 -6.88867 4.76465l-9 24c-1.88965 0.549805 -3.79004 1.08008 -5.65039 1.67969l-20.8301 -15c-1.20605 -0.870117 -2.69434 -1.37988 -4.29395 -1.37988c-3.64941 0 -6.68066 2.66895 -7.24609 6.16016l-4.14941 25.4199
+c-1.71973 0.900391 -3.4502 1.79004 -5.14062 2.73047l-23.4297 -10.6807c-0.925781 -0.420898 -1.96094 -0.664062 -3.04492 -0.664062c-4.05664 0 -7.34961 3.29297 -7.34961 7.34961c0 0.0888672 0.00195312 0.176758 0.00488281 0.264648l0.919922 25.8203
+c-1.4873 1.18652 -2.95703 2.38965 -4.41016 3.60938l-25.1602 -5.92969c-0.538086 -0.125977 -1.0957 -0.196289 -1.67188 -0.196289c-4.0625 0 -7.36035 3.29785 -7.36035 7.35938c0 0.577148 0.0664062 1.13867 0.192383 1.67676l5.92969 25.1602
+c-1.21973 1.45312 -2.41992 2.91992 -3.59961 4.40039l-25.8301 -0.910156c-0.125977 -0.00683594 -0.243164 -0.0175781 -0.371094 -0.0175781c-2.5166 0 -4.72949 1.30664 -5.99902 3.27734c-0.776367 1.16504 -1.23047 2.57812 -1.23047 4.08301
+c0 1.08691 0.236328 2.11816 0.660156 3.04688l10.6309 23.4297c-0.94043 1.69043 -1.83008 3.4209 -2.73047 5.14062l-25.4199 4.14941c-3.49219 0.569336 -6.16504 3.60938 -6.16504 7.26172c0 1.5957 0.509766 3.07324 1.375 4.27832l15 20.8301
+c-0.599609 1.87012 -1.12988 3.76074 -1.67969 5.65039l-24 9c-2.78711 1.04492 -4.77148 3.73145 -4.77148 6.88184c0 2.11719 0.896484 4.02637 2.33105 5.36816l18.7197 17.5c-0.209961 1.9502 -0.379883 3.87012 -0.549805 5.87012l-21.8193 13.5098
+c-2.09473 1.2959 -3.49023 3.60449 -3.49023 6.24512c0 2.6416 1.39551 4.95898 3.49023 6.25488l21.8594 13.5c0.169922 1.96973 0.339844 3.92969 0.549805 5.87988l-18.7197 17.5c-1.43457 1.3418 -2.33203 3.24805 -2.33203 5.36523
+c0 3.15039 1.98535 5.83984 4.77246 6.88477l24 9c0.549805 1.88965 1.08984 3.79004 1.67969 5.66016l-15 20.8203c-0.865234 1.20508 -1.37207 2.68945 -1.37207 4.28516c0 3.65234 2.66992 6.68555 6.16211 7.25488l25.4102 4.13965
+c0.899414 1.72949 1.79004 3.45996 2.72949 5.16016l-10.6602 23.4102c-0.423828 0.927734 -0.65918 1.97363 -0.65918 3.06055c0 1.50391 0.453125 2.90332 1.22949 4.06934c1.33398 1.97266 3.58398 3.26367 6.14258 3.26367
+c0.0761719 0 0.152344 -0.00195312 0.227539 -0.00390625l25.8096 -0.910156c1.19043 1.48047 2.39062 2.95996 3.62012 4.41016l-5.92969 25.1602c-0.125977 0.538086 -0.196289 1.0957 -0.196289 1.67188c0 4.0625 3.29785 7.36035 7.35938 7.36035
+c0.577148 0 1.13867 -0.0664062 1.67676 -0.192383l25.1504 -5.96973c1.41992 1.21973 2.92969 2.41992 4.41992 3.60938l-0.919922 25.8105c-0.00488281 0.104492 -0.000976562 0.201172 -0.000976562 0.307617c0 4.05566 3.29395 7.34961 7.35059 7.34961
+c1.08398 0 2.11328 -0.235352 3.04004 -0.657227l23.4004 -10.6299c1.70996 0.939453 3.42969 1.83008 5.16016 2.72949l4.14941 25.4102c0.569336 3.49219 3.60938 6.16504 7.26172 6.16504c1.5957 0 3.07324 -0.509766 4.27832 -1.375l20.8203 -15
+c1.87012 0.599609 3.76953 1.12988 5.66016 1.67969l9 24c1.04492 2.78711 3.73145 4.77148 6.88184 4.77148c2.11719 0 4.02637 -0.896484 5.36816 -2.33105l17.5 -18.7197c1.94922 0.209961 3.87988 0.379883 5.87988 0.549805l13.5098 21.8193
+c1.2959 2.09473 3.60449 3.49023 6.24512 3.49023c2.6416 0 4.95898 -1.39551 6.25488 -3.49023l13.4805 -21.8398c1.96973 -0.169922 3.92969 -0.339844 5.87988 -0.549805l17.5 18.7197c1.3418 1.43457 3.24805 2.33301 5.36523 2.33301
+c3.14941 0 5.83984 -1.98535 6.88477 -4.77246l9 -24c1.88965 -0.540039 3.7793 -1.08008 5.63965 -1.66992l20.8604 14.9697c1.20508 0.865234 2.68945 1.37207 4.28516 1.37207c3.65234 0 6.68555 -2.66992 7.25488 -6.16211l4.14941 -25.4199
+c1.71973 -0.889648 3.4502 -1.79004 5.15039 -2.73047l23.4199 10.7305c0.926758 0.421875 1.96289 0.666016 3.04688 0.666016c4.05664 0 7.34961 -3.29395 7.34961 -7.35059c0 -0.105469 -0.00195312 -0.210938 -0.00683594 -0.31543l-0.910156 -25.8203
+c1.4873 -1.18652 2.9541 -2.38965 4.40039 -3.60938l25.1602 5.92969c0.538086 0.125977 1.0957 0.196289 1.67188 0.196289c4.0625 0 7.36035 -3.29785 7.36035 -7.35938c0 -0.577148 -0.0664062 -1.13867 -0.192383 -1.67676l-5.87988 -25.1602
+c1.21387 -1.45312 2.41699 -2.91992 3.61035 -4.40039l25.8193 0.910156c0.0878906 0.00292969 0.167969 -0.000976562 0.256836 -0.000976562c4.05664 0 7.34961 -3.29395 7.34961 -7.35059c0 -1.08301 -0.234375 -2.1123 -0.65625 -3.03809l-10.6797 -23.4199
+c0.939453 -1.7002 1.83008 -3.41992 2.72949 -5.15039l25.4199 -4.14941c3.49219 -0.569336 6.16504 -3.60938 6.16504 -7.26172c0 -1.5957 -0.509766 -3.07324 -1.375 -4.27832l-15 -20.8301c0.589844 -1.86035 1.12988 -3.76074 1.66992 -5.64062l24 -9
+c2.78711 -1.04492 4.77148 -3.73145 4.77148 -6.88184c0 -2.11719 -0.896484 -4.02637 -2.33105 -5.36816l-18.7197 -17.5c0.209961 -1.94922 0.379883 -3.87988 0.549805 -5.87988zM357.52 69.1699l32.1406 -6.87988c6.28125 6.3125 12.0029 12.9395 17.3398 20.0898
+h-79.0498c-12.5 0 -24.21 17.6396 -27.1006 26.46c-2.88965 7.86035 -7.14941 32.4502 -9.05957 40c-6.12988 24.5898 -25.3799 25.8701 -29.79 25.8701h-48.4805l-0.0498047 -34.3496h44.8301c1.71973 0 2.89062 -0.34082 2.89062 -1.91016v-54.1904
+c0 -1.62012 -1.1709 -1.91016 -2.89062 -1.91016h-153.17c5.01953 -6.80957 10.3848 -13.1465 16.2598 -19.21l31.5107 6.76074c0.935547 0.199219 1.89746 0.294922 2.89258 0.294922c6.66211 0 12.2344 -4.70801 13.5674 -10.9756l7.63965 -35.6602
+c23.9688 -11.1318 50.9941 -17.3506 79.1416 -17.3506c27.5205 0 53.665 5.94141 77.2188 16.6113l7.63965 35.6699c1.34668 6.27246 6.91797 10.9893 13.5908 10.9893c1.00488 0 1.98438 -0.106445 2.92871 -0.30957zM383.29 34.6797
+c0 0.00585938 -0.0576172 0.0107422 -0.0576172 0.0166016c0 8.25977 -6.58887 14.9922 -14.792 15.2236h-0.44043c-8.3877 -0.0273438 -15.1904 -6.8457 -15.1904 -15.2402c0 -8.41113 6.8291 -15.2393 15.2402 -15.2393s15.2402 6.82812 15.2402 15.2393zM157.67 35.3604
+c0 0.00195312 -0.0576172 0.00488281 -0.0576172 0.0078125c0 8.24707 -6.56055 14.9736 -14.7422 15.2422h-0.450195c-8.40625 -0.00585938 -15.2295 -6.83203 -15.2295 -15.2402c0 -8.41113 6.82812 -15.2402 15.2393 -15.2402c8.4082 0 15.2344 6.82324 15.2402 15.2305z
+M69.5703 213.85c-0.725586 -6.69922 -1.0625 -13.2754 -1.0625 -20.167c0 -17.8242 2.49023 -35.0713 7.14258 -51.4131h53.5996v119.73h-26.5596l6.76953 -15.2197c0.765625 -1.7207 1.20801 -3.62988 1.20801 -5.63281c0 -5.66406 -3.39941 -10.54 -8.26758 -12.6973z
+M58.3096 249.91c0.00292969 -8.4082 6.84375 -15.2236 15.2529 -15.2236c8.41113 0 15.2402 6.82812 15.2402 15.2393c0 8.26562 -6.59375 15.0029 -14.8027 15.2344h-0.459961c-8.40625 -0.00585938 -15.2305 -6.83203 -15.2305 -15.2402v-0.00976562zM213.47 225.42
+h58.7002c12.4902 0 27.6797 4.41016 27.6797 16.7002c0 14.8496 -19.79 18.6201 -23.0693 18.6201h-63.2607zM399 141.29c10.3096 1.12988 22 5.70996 22.0195 26.46v8.82031c0 1.85938 0.780273 3.12988 2.69043 3.12988h19.2803
+c0.349609 4.6709 0.529297 9.02832 0.529297 13.7891c0 6.32812 -0.314453 12.583 -0.929688 18.751l-34.5898 15.3301c-4.86621 2.19434 -8.23828 7.0918 -8.23828 12.7725c0 1.97363 0.410156 3.85352 1.14844 5.55762l18 40.5693
+c-26.8047 47.0127 -73.3965 81.1328 -128.37 91.4307l-26.2598 -25c-2.48535 -2.39062 -5.86523 -3.86523 -9.58203 -3.86523c-3.94141 0 -7.5 1.6543 -10.0186 4.30469l-23.4697 24.6006c-41.29 -7.80371 -77.9434 -29.083 -104.89 -59.1904h198.899
+c4.99023 0 23.5107 -2.23047 40.2705 -13.2305c11.9102 -7.88965 29.3994 -23.96 29.3994 -49.4795c0 -23.6201 -19.5996 -41.3096 -38.46 -53.2598c15.1807 -12 24.79 -18.9102 30.5703 -51.4004c1.37012 -5.96973 12.2002 -11.2197 22 -10.0898zM240 387.79
+c0 -0.0078125 -0.00683594 -0.015625 -0.00683594 -0.0244141c0 -8.41113 6.82812 -15.2393 15.2402 -15.2393c8.41113 0 15.2393 6.82812 15.2393 15.2393c0 8.26855 -6.59863 15.0078 -14.8125 15.2344h-0.450195c-8.38672 -0.0166016 -15.1934 -6.82324 -15.21 -15.21z
+M436.84 234c0.0742188 -0.000976562 0.141602 -0.00195312 0.21582 -0.00195312c8.41211 0 15.2422 6.83008 15.2422 15.2422c0 8.33691 -6.70898 15.1201 -15.0176 15.2402h-0.44043c-8.41113 0 -15.2402 -6.8291 -15.2402 -15.2402s6.8291 -15.2402 15.2402 -15.2402z" />
+    <glyph glyph-name="tiktok" unicode="&#xe07b;" 
+d="M448 238.09h-0.512695c-45.5098 0 -87.8428 14.6162 -122.257 39.25v-178.72c-0.0332031 -89.6855 -72.8574 -162.489 -162.551 -162.489c-89.7139 0 -162.55 72.8359 -162.55 162.55s72.8359 162.55 162.55 162.55c7.62891 0 14.9697 -0.521484 22.3203 -1.54004
+v-89.8906c-7.06836 2.22363 -14.5889 3.42285 -22.3877 3.42285c-41.1836 0 -74.6201 -33.4365 -74.6201 -74.6201c0 -41.1846 33.4365 -74.6201 74.6201 -74.6201c41.1846 0 74.6182 33.4541 74.6182 74.6377v349.38h88
+c-0.00292969 -0.337891 -0.00488281 -0.676758 -0.00488281 -1.01562c0 -7.25977 0.638672 -14.2441 1.86426 -21.1543v0c6.28613 -33.5771 26.1982 -62.3613 53.9102 -80.2197c19.1787 -12.6816 42.1592 -20.0674 66.8506 -20.0674
+c0.00878906 0 0.140625 -0.0732422 0.149414 -0.0732422v-87.3799z" />
+    <glyph glyph-name="unsplash" unicode="&#xe07c;" 
+d="M448 217.83v-249.83h-448v249.83h141.13v-124.92h165.74v124.92h141.13zM306.87 416v-124.91h-165.74v124.91h165.74z" />
+    <glyph glyph-name="cloudflare" unicode="&#xe07d;" horiz-adv-x="640" 
+d="M407.906 128.087c12.1836 -0.574219 22.2178 -5.50977 28.2334 -13.9023c6.54883 -9.09961 8 -21.5 4.10059 -34.8994l-3.27344 -11.2656c-0.681641 -2.28125 -2.7793 -3.95508 -5.27051 -4c-0.0419922 -0.000976562 -0.0791016 -0.0195312 -0.12207 -0.0195312
+l-426.101 0.0507812c-2.26172 0.00878906 -4.13379 1.69238 -4.44434 3.87109c-0.676758 4.58691 -1.02637 9.18457 -1.0293 13.958c0 52.3926 41.9238 95.0137 94.2002 96.5303c-1.37402 5.39062 -2.05469 10.9785 -2.05469 16.7939
+c0 37.5967 30.5234 68.1201 68.1201 68.1201c15.3838 0 29.583 -5.11035 40.9912 -13.7246c20.542 59.582 77.085 102.308 143.607 102.308c72.1562 0 132.629 -50.417 148.085 -117.914c0.107422 -0.513672 0.164062 -1.03906 0.164062 -1.58398v-0.046875
+c0 -0.0332031 -0.00292969 -0.0683594 -0.00292969 -0.101562c0 -0.998047 -0.18457 -1.9541 -0.521484 -2.83496l-13.2861 -34.542c-10.4756 -27.21 -40.3906 -49.5234 -68.0215 -50.7842l-232.94 -2.93555c-2.48145 -0.173828 -4.5625 -1.82227 -5.36035 -4.07617
+c-0.178711 -0.493164 -0.275391 -1.03223 -0.275391 -1.58691c0 -0.945312 0.283203 -1.8252 0.768555 -2.55957c0.8125 -1.14258 2.13379 -1.89355 3.63281 -1.92676zM513.856 226.9c69.668 0 126.144 -56.2002 126.147 -125.533
+c0 -0.0458984 -0.0175781 -0.0644531 -0.0175781 -0.110352c0 -11.7441 -1.62598 -23.1123 -4.66406 -33.8896c-0.571289 -1.94629 -2.37012 -3.37012 -4.5 -3.37012h-0.0390625h-175.91c-0.0478516 0 -0.0898438 0.0166016 -0.135742 0.0166016
+c-1.44727 0.0595703 -2.60449 1.25391 -2.60449 2.71484c0 0.339844 0.0634766 0.666016 0.176758 0.96582l3.69531 9.60547c10.4766 27.21 40.3916 49.5146 68.1455 50.7842l51.125 2.93945c2.47559 0.179688 4.55078 1.82617 5.35059 4.07422
+c0.177734 0.492188 0.274414 1.03027 0.274414 1.58301c0 0.957031 -0.291016 1.84766 -0.788086 2.58594c-0.785156 1.11035 -2.06152 1.84375 -3.51074 1.89453l-49.1992 2.93848c-12.1846 0.577148 -22.2188 5.5 -28.2383 13.9004
+c-6.54883 9.10352 -8 21.4902 -4.09961 34.8896l9.07617 31.1934c0.447266 1.45508 1.75391 2.53613 3.32422 2.65332c2.12012 0.101562 4.25 0.164062 6.3916 0.164062z" />
+    <glyph glyph-name="guilded" unicode="&#xe07e;" 
+d="M443.427 384c0.00195312 -0.518555 0.0253906 -0.367188 0.0253906 -0.885742c0 -29.1934 -2.00293 -57.9229 -5.87891 -86.0576h-336.147s0.366211 -52.0498 27.0918 -105.883c27.458 -51.8174 65.3164 -85.1025 96.5488 -98.3623
+c32.2695 15.082 63.4434 41.2695 80.4561 69.4824h-88.5898c-22.9229 18.998 -40.96 50.5146 -45.0996 86.9443h259.889c-12.8154 -58.5713 -40.0088 -111.838 -65.916 -145.762c-35.8154 -46.7773 -84.2695 -82.8105 -140.55 -103.477
+c-1.25586 0 -113.21 33.8652 -177.267 161.642c-21.2266 42.2988 -43.418 119.099 -43.418 222.358h438.855z" />
+    <glyph glyph-name="hive" unicode="&#xe07f;" horiz-adv-x="512" 
+d="M260.353 193.122c0.191406 -0.329102 0.300781 -0.716797 0.300781 -1.12402c0 -0.404297 -0.107422 -0.783203 -0.294922 -1.11133l-127.412 -221.777c-0.380859 -0.666992 -1.09473 -1.11621 -1.91602 -1.11621c-0.818359 0 -1.53223 0.445312 -1.91406 1.10645
+l-128.816 221.778c-0.189453 0.328125 -0.297852 0.713867 -0.297852 1.12012s0.108398 0.787109 0.297852 1.11523l127.409 221.777c0.380859 0.666016 1.09473 1.11523 1.91602 1.11523c0.817383 0 1.53125 -0.445312 1.91309 -1.10547zM299.431 218.835l-110.624 193.824
+c-0.189453 0.327148 -0.298828 0.709961 -0.298828 1.11523c0 1.21973 0.983398 2.21094 2.19922 2.22559h66.5078c0.81543 -0.00195312 1.52539 -0.447266 1.90039 -1.11133l110.625 -193.823c0.189453 -0.328125 0.298828 -0.709961 0.298828 -1.11523
+c0 -1.21973 -0.983398 -2.21191 -2.19922 -2.22656h-66.5088c-0.81543 0.00292969 -1.52441 0.448242 -1.90039 1.11133zM511.7 193.114c0.1875 -0.328125 0.294922 -0.711914 0.294922 -1.11621c0 -0.405273 -0.107422 -0.78418 -0.294922 -1.1123l-126.808 -221.773
+c-0.376953 -0.664062 -1.08887 -1.11035 -1.90527 -1.1123h-66.6006c-1.21875 0.0117188 -2.20312 1.00684 -2.20312 2.22852c0 0.404297 0.108398 0.78418 0.297852 1.11133l126.171 220.66l-126.168 220.66c-0.189453 0.327148 -0.298828 0.708984 -0.298828 1.11426
+c0 1.2207 0.985352 2.21387 2.2041 2.22559h66.6006c0.818359 -0.000976562 1.53125 -0.447266 1.91016 -1.1123zM366.016 163.083c1.2168 -0.0136719 2.19922 -1.00879 2.19922 -2.22852c0 -0.405273 -0.108398 -0.785156 -0.297852 -1.1123l-108.8 -190.631
+c-0.375 -0.664062 -1.08496 -1.10938 -1.90039 -1.11133h-66.5088c-1.21582 0.0146484 -2.19824 1.00879 -2.19824 2.22852c0 0.405273 0.108398 0.785156 0.297852 1.1123l108.801 190.631c0.374023 0.664062 1.08398 1.10938 1.89941 1.11133h66.5078z" />
+    <glyph glyph-name="innosoft" unicode="&#xe080;" 
+d="M422.559 288.29l0.00292969 -190.955c0.0253906 -12.4102 -5.87793 -22.8965 -16.623 -29.5283l-164.527 -94.9951c-5.08008 -3.04102 -11.0938 -4.79004 -17.4404 -4.79004c-6.11523 0 -11.8545 1.62402 -16.8096 4.46387l-118.794 68.583l247.049 142.627v-56
+l-150.051 -86.627l32.7227 -18.9004c1.74805 -0.97168 3.78613 -1.52441 5.92676 -1.52441c2.18457 0 4.23633 0.576172 6.01074 1.58691l138.111 79.7441c3.54883 2.08008 5.91992 5.92578 5.91992 10.332v0.0361328v138.281l-308.407 -178.066
+c-3.94629 -2.25293 -8.57129 -3.54102 -13.4365 -3.54102c-4.83301 0 -9.37207 1.27051 -13.2998 3.49609c-8.39453 4.75586 -13.3037 13.293 -13.4736 23.4287v191.5c0.518555 12.7334 6.65527 23.0039 17.2891 29.124l164.601 95.0254
+c11.5 5.98535 22.8076 5.85938 33.7998 -0.269531l118.513 -68.4072l-247.061 -142.637v56l150.062 86.6367l-32.6553 18.8525c-1.76367 0.998047 -3.82715 1.56738 -5.99609 1.56738c-2.15137 0 -4.17285 -0.55957 -5.92578 -1.54199l-138.076 -79.7129
+c-3.60352 -2.04785 -6.02734 -5.90723 -6.04688 -10.3398v-138.387l308.539 178.142c3.88281 2.24414 8.44531 3.5293 13.25 3.5293c4.70801 0 9.13086 -1.23438 12.9609 -3.39648c8.16406 -4.63184 13.6914 -13.3291 13.8652 -23.3369z" />
+    <glyph glyph-name="instalod" unicode="&#xe081;" horiz-adv-x="512" 
+d="M153.384 -32l50.8447 146.789l298.325 57.4463l-115.44 -204.235h-233.729zM504.726 207.922l-144.495 -27.8223l-204.562 235.9h231.444zM124.386 399.191l101.241 -116.752l-102.391 -295.594l-115.962 205.154z" />
+    <glyph glyph-name="octopus-deploy" unicode="&#xe082;" horiz-adv-x="512" 
+d="M455.6 98.7998c12.4395 -10.5996 42.6348 -26.4775 42.5244 -45.2666c-0.15332 -24.6084 -48.4248 5.24121 -53.8184 9.51953c6.13965 -10.7275 66.998 -74.1787 28.2627 -78.6943c-35.6562 -4.1582 -67.1406 45.6416 -88.5615 67.0225
+c-36 35.9082 -29.7373 -43.5332 -29.8994 -59.9443c-0.257812 -25.9082 -18.5586 -78.4209 -51.4121 -44.2207c-27.1387 28.2314 -16.873 73.2607 -35.7383 104.622c-20.6641 34.3535 -55.0361 -34.3535 -63.627 -46.9258
+c-9.59668 -14.042 -57.6094 -82.041 -76.709 -45.8125c-15.499 29.4004 9.2793 75.5127 21.4629 102.103c-4.44336 -9.65723 -35.9297 -23.9414 -45.1299 -28.5879c-20.7871 -10.4971 -41.8867 -16.7256 -65.2646 -15.0449
+c-27.8916 2.00098 -38.3789 11.6572 8.42773 41.8574c38.5615 24.8389 83.8613 67.4209 66.6621 117.582c-9.37305 27.3301 -22.3574 50.7568 -24.0898 80.2998c-0.209961 3.56152 -0.25 7.08008 -0.25 10.6924c0 22.0957 3.9707 43.2715 11.2373 62.8516
+c34.5752 92.8066 137.363 136.747 230.253 108.848c86.0371 -25.8398 145.23 -125.74 109.575 -212.79c-20.5752 -50.2334 -29.7959 -89.0205 16.0947 -128.11z" />
+    <glyph glyph-name="perbyte" unicode="&#xe083;" 
+d="M305.314 163.422c15.9307 0.000976562 28.5732 -4.5 37.9277 -13.5059s14.0322 -20.7842 14.0322 -35.335c0 -14.8936 -4.58984 -26.9307 -13.7705 -36.1113c-9.17969 -9.17969 -21.9111 -13.7695 -38.1934 -13.7695h-58.7109v98.7217h58.7148zM149.435 319.301
+c15.9346 0.00488281 28.5791 -4.49609 37.9316 -13.5039s14.0283 -20.7871 14.0283 -35.3379c0 -14.8896 -4.58984 -26.9258 -13.7695 -36.1084c-9.17969 -9.18164 -21.9102 -13.7725 -38.1904 -13.7725h-58.7109v98.7227h58.7109zM366.648 416.002
+c22.4385 -0.0253906 41.5996 -7.98145 57.4854 -23.8672s23.8418 -35.0479 23.8672 -57.4854v-285.296c-0.0253906 -22.4375 -7.98145 -41.5996 -23.8672 -57.4854s-35.0479 -23.8418 -57.4854 -23.8672h-285.295c-22.4385 0.0253906 -41.6006 7.98145 -57.4863 23.8672
+s-23.8418 35.0479 -23.8672 57.4863v285.296c0.0253906 22.4375 7.98145 41.5996 23.8672 57.4854s35.0479 23.8408 57.4863 23.8662h285.295zM430.282 49.3535l-0.000976562 285.296c-0.0195312 17.5518 -6.24219 32.54 -18.668 44.9658s-27.4141 18.6484 -44.9648 18.668
+h-285.295c-17.5508 -0.0195312 -32.5391 -6.24219 -44.9648 -18.668s-18.6484 -27.4141 -18.668 -44.9658v-285.296c0.0195312 -17.5508 6.24219 -32.5391 18.668 -44.9648s27.4141 -18.6484 44.9648 -18.668h285.295c17.5518 0.0195312 32.54 6.24219 44.9658 18.668
+s18.6484 27.4141 18.668 44.9648zM305.313 319.301c15.9307 0.00488281 28.5732 -4.49609 37.9277 -13.5039s14.0322 -20.7871 14.0322 -35.3379c0 -14.8896 -4.58984 -26.9258 -13.7705 -36.1084c-9.17969 -9.18164 -21.9111 -13.7725 -38.1934 -13.7725h-58.7109v98.7227
+h58.7148z" />
+    <glyph glyph-name="uncharted" unicode="&#xe084;" 
+d="M171.73 215.187c-0.0605469 -0.00195312 -0.12207 -0.000976562 -0.183594 -0.000976562c-0.673828 0 -1.3125 0.148438 -1.88672 0.414062l-115.933 67.9004v-85.2891c-0.0830078 -2.71289 -1.16895 -5.18555 -2.89941 -7.03906
+c-1.6748 -1.54297 -3.91113 -2.4873 -6.36621 -2.4873c-0.0859375 0 -0.172852 0.000976562 -0.258789 0.00390625c-0.146484 -0.0078125 -0.296875 -0.00585938 -0.444336 -0.00585938c-1.65332 0 -3.2002 0.455078 -4.52344 1.24707l-22.3584 12.835
+c-2.9541 1.50684 -4.9707 4.57031 -4.9707 8.1123c0 0.0566406 0.000976562 0.112305 0.00195312 0.168945v115.107c0.118164 3.54102 2.08105 6.61523 4.96875 8.28027l100.2 57.9668c1.40625 0.787109 3.04688 1.23535 4.77148 1.23535s3.3457 -0.448242 4.75098 -1.23535
+l22.3584 -12.8389c2.9541 -1.50586 4.96973 -4.56934 4.96973 -8.11035c0 -0.0566406 -0.000976562 -0.113281 -0.00195312 -0.169922c-0.117188 -3.54199 -2.08008 -6.61523 -4.96777 -8.28125l-74.5293 -43.4727l116.757 -68.3184
+c1.16016 -0.680664 1.96191 -1.89941 2.07129 -3.31152c0 -1.65723 -0.414062 -3.31348 -1.65723 -4.1416c-7.34473 -6.5459 -12.6475 -15.3301 -14.8994 -25.2559c-0.810547 -1.94629 -2.72949 -3.31348 -4.96777 -3.31348h-0.00195312zM323.272 70.2695
+c4.96777 0 9.52734 -4.55469 10.3506 -9.1084v-26.085c-0.117188 -3.54199 -2.08105 -6.61523 -4.96777 -8.28125l-100.2 -57.5527c-1.48633 -0.772461 -3.18359 -1.22363 -4.96875 -1.24219c-0.146484 -0.00683594 -0.296875 -0.00488281 -0.444336 -0.00488281
+c-1.65332 0 -3.2002 0.455078 -4.52441 1.24707l-100.199 57.5527c-2.95508 1.50586 -4.9707 4.56934 -4.9707 8.11035c0 0.0576172 0 0.114258 0.000976562 0.170898v26.085c0.0585938 5.22852 4.29492 9.46484 9.52344 9.52246
+c0.146484 0.0078125 0.296875 0.00585938 0.444336 0.00585938c1.65332 0 3.20117 -0.456055 4.52441 -1.24707l74.5293 -43.0615v133.323c0.0615234 2.62891 2.21387 4.74609 4.85742 4.74609c0.469727 0 0.922852 -0.0673828 1.35254 -0.191406
+c4.39453 -1.18066 8.99414 -1.80664 13.7588 -1.80664c5.29102 0 10.4023 0.776367 15.2256 2.2207c3.31055 1.24512 6.21094 -1.65527 6.21094 -4.55469v-134.152l74.5273 43.0625c1.50684 0.730469 3.2002 1.17383 4.96973 1.24121zM286.007 370
+c-12.6943 0 -23 10.3057 -23 23s10.3057 23 23 23s23 -10.3057 23 -23s-10.3057 -23 -23 -23zM349.634 380.086c12.6943 0 23 -10.3057 23 -23s-10.3057 -23 -23 -23c-12.6934 0 -23 10.3057 -23 23s10.3066 23 23 23zM412.816 296.4c-12.6943 0 -23 10.3057 -23 23
+c0 12.6934 10.3057 23 23 23c12.6934 0 23 -10.3066 23 -23c0 -12.6943 -10.3066 -23 -23 -23zM349.634 305.6c12.6943 0 23 -10.3057 23 -23c0 -12.6934 -10.3057 -23 -23 -23c-12.6934 0 -23 10.3066 -23 23c0 12.6943 10.3066 23 23 23zM286.007 222.356
+c-12.6943 0 -23 10.3018 -23 22.9951v0.00488281c0 12.6934 10.3057 23 23 23s23 -10.3066 23 -23c0 -12.6943 -10.3057 -23 -23 -23zM223.933 185.998c-12.6934 0 -23 10.3018 -23 22.9961v0.00390625c0 12.6943 10.3066 23 23 23c12.6943 0 23 -10.3057 23 -23
+s-10.3057 -23 -23 -23zM412.816 268.356c12.6924 0 22.9971 -10.3086 23 -23c0 -12.6943 -10.3066 -23 -23 -23c-12.6943 0 -23 10.3057 -23 23c0 12.6934 10.3057 23 23 23zM412.816 196.084c12.6924 0 22.9971 -10.3076 23 -23c0 -12.6943 -10.3066 -23 -23 -23
+c-12.6943 0 -23 10.3057 -23 23s10.3057 23 23 23z" />
+    <glyph glyph-name="watchman-monitoring" unicode="&#xe087;" horiz-adv-x="512" 
+d="M256 432c132.548 0 240 -107.452 240 -240s-107.452 -240 -240 -240s-240 107.452 -240 240s107.452 240 240 240zM121.69 18.8779l27.6846 204.861l-9.46777 7.39941c-2.98242 2.34082 -4.89062 5.9668 -4.89062 10.0479
+c0 0.100586 0.000976562 0.201172 0.00292969 0.301758c0 7.04883 0.144531 19.5488 0.144531 19.5488l13.9434 2.0127l0.120117 10.9668l-102.899 -17.8945c-6.20508 -20.251 -9.58691 -41.7412 -9.58691 -64.0137v-0.108398c0 -70.3223 33.3145 -132.972 84.9492 -173.122
+zM227.382 302.148l0.0400391 -3.61816l193.512 37.7002c-40.1152 46.0273 -99.1426 75.0244 -164.934 75.0244c-74.4863 0 -140.374 -37.3623 -180.018 -94.2998l73.5068 -19.1758l0.0478516 4.36914l-8.48145 7.61719s-6.93359 5.38086 0.144531 9.34473
+c7.18652 4.02539 39.5283 34.5 39.5283 34.5c7.20312 7.34668 10.1123 5.47656 15.4609 0c0 0 32.3418 -30.4766 39.5293 -34.5c7.07715 -3.96387 0.143555 -9.34473 0.143555 -9.34473zM261.445 -27.1211c118.386 2.90918 213.813 100.047 213.813 219.121
+c-0.0107422 17.2881 -2.04297 33.9951 -5.85059 50.1299l-241.711 31.3916l0.116211 -10.4746l13.9424 -2.0127s0.144531 -12.5049 0.144531 -19.5488c0.00195312 -0.100586 0.0126953 -0.19043 0.0126953 -0.290039c0 -4.08203 -1.91797 -7.71973 -4.90137 -10.0596
+l-9.4668 -7.39941z" />
+    <glyph glyph-name="wodu" unicode="&#xe088;" horiz-adv-x="640" 
+d="M178.414 108.294h-37.3145l-28.9336 116.231h-0.477539l-28.4609 -116.231h-38.0273l-45.2002 170.76h37.5479l27.0264 -116.23h0.477539l29.6553 116.23h35.1572l29.1777 -117.667h0.479492l27.9785 117.667h36.8311zM271.4 235.287
+c38.9834 0 64.0996 -25.8281 64.0996 -65.291c0 -39.2217 -25.1113 -65.0498 -64.0996 -65.0498c-38.7432 0 -63.8555 25.8281 -63.8555 65.0498c0.00195312 39.4629 25.1143 65.291 63.8555 65.291zM271.4 130.534c23.1992 0 30.1328 19.8516 30.1328 39.4619
+c0 19.8516 -6.93457 39.7002 -30.1328 39.7002c-27.7002 0 -29.8945 -19.8506 -29.8945 -39.7002c0.00195312 -19.6104 6.9375 -39.4619 29.8945 -39.4619zM435.084 124.078h-0.477539c-7.89355 -13.3926 -21.7656 -19.1318 -37.5488 -19.1318
+c-37.3096 0 -55.4844 32.0449 -55.4844 66.2461c0 33.2422 18.415 64.0947 54.7666 64.0947c14.5889 0 28.9385 -6.21777 36.8311 -18.416h0.240234v62.1826h33.96v-170.76h-32.2871v15.7842zM405.428 209.7c-22.2393 0 -29.8936 -19.1338 -29.8936 -39.4629
+c0 -19.3711 8.84766 -39.7002 29.8936 -39.7002c22.4824 0 29.1787 19.6133 29.1787 39.9395c0 20.0879 -7.1748 39.2236 -29.1787 39.2236zM592.96 108.294h-32.2871v17.2188h-0.717773c-8.60938 -13.8701 -23.4365 -20.5664 -37.7861 -20.5664
+c-36.1133 0 -45.2002 20.3281 -45.2002 50.9404v76.0527h33.959v-69.8398c0 -20.3281 5.97949 -30.3721 21.7656 -30.3721c18.415 0 26.3057 10.2832 26.3057 35.3936v64.8184h33.9609v-123.646zM602.453 145.124h37.5469v-36.8301h-37.5469v36.8301z" />
+    <glyph glyph-name="twitter-square" unicode="&#xf081;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM351.1 257.2c12.8008 9.2998 24 20.8994 32.9004 34c-11.7998 -5.10059 -24.5996 -8.7998 -37.7998 -10.2002
+c13.5996 8.09961 23.8994 20.9004 28.7998 36.0996c-12.5996 -7.5 -26.7998 -13 -41.5996 -15.7998c-12 12.7998 -29 20.7002 -47.9004 20.7002c-40 0 -73.2998 -36.0996 -64 -80.5996c-54.4004 2.7998 -102.9 28.7998 -135.2 68.5996
+c-5.7002 -9.7002 -8.89941 -20.9004 -8.89941 -33.0996c0 -0.0371094 -0.0664062 -0.0322266 -0.0664062 -0.0683594c0 -22.749 11.6309 -42.8018 29.2656 -54.5322c-10.6992 0.400391 -20.8994 3.40039 -29.5996 8.2998v-0.799805c0 -31.8994 22.5 -58.2998 52.5 -64.3994
+c-10.4004 -2.7002 -19.5 -2.7002 -29.5996 -1.2002c8.2998 -26 32.5 -44.9004 61.2998 -45.5c-22.5 -17.6006 -50.7002 -28 -81.4004 -28c-5.39941 0 -10.5 0.200195 -15.7998 0.799805c29 -18.5996 63.5 -29.4004 100.7 -29.4004c120.6 0 186.6 99.9004 186.6 186.601
+c0 2.7998 0 5.7002 -0.200195 8.5z" />
+    <glyph glyph-name="facebook-square" unicode="&#xf082;" 
+d="M400 416c26.4922 0 48 -21.5078 48 -48v-352c0 -26.4922 -21.5078 -48 -48 -48h-137.25v152.31h57.7803l11 71.6904h-68.7803v46.5498c0 19.6104 9.61035 38.7305 40.4199 38.7305h31.2705v61s-28.3809 4.83984 -55.5205 4.83984
+c-56.6699 0 -93.6699 -34.3301 -93.6699 -96.4805v-54.6396h-63v-71.6904h63v-152.31h-137.25c-26.4922 0 -48 21.5078 -48 48v352c0 26.4922 21.5078 48 48 48h352z" />
+    <glyph glyph-name="linkedin" unicode="&#xf08c;" 
+d="M416 416c17.5996 0 32 -14.5 32 -32.2998v-383.4c0 -17.7998 -14.4004 -32.2998 -32 -32.2998h-384.1c-17.6006 0 -31.9004 14.5 -31.9004 32.2998v383.4c0 17.7998 14.2998 32.2998 31.9004 32.2998h384.1zM135.4 32h0.0996094v213.8h-66.5v-213.8h66.4004zM102.2 275
+c21.2998 0 38.5 17.2002 38.5 38.5c0 21.2002 -17.2998 38.5 -38.5 38.5c-21.2998 0 -38.5 -17.2998 -38.5 -38.5s17.2002 -38.5 38.5 -38.5zM384.3 32v117.2c0 57.5996 -12.5 101.899 -79.7002 101.899c-32.2998 0 -54 -17.6992 -62.8994 -34.5h-0.900391v29.2002h-63.7002
+v-213.8h66.4004v105.8c0 27.9004 5.2998 54.9004 39.9004 54.9004c34 0 34.5 -31.9004 34.5 -56.7002v-104h66.3994z" />
+    <glyph glyph-name="github-square" unicode="&#xf092;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM277.3 32.2998c66 22 110.8 84.9004 110.7 158.3c0 91.8008 -74.4004 161.5 -166.2 161.5s-162 -69.6992 -162 -161.5
+c0 -73.3994 46.2002 -136.199 112.2 -158.3c8.5 -1.5 11.5 3.7002 11.5 8c0 4.10059 -0.200195 26.7002 -0.200195 40.6006c0 0 -46.3994 -10 -56.0996 19.6992c0 0 -7.60059 19.2002 -18.4004 24.2002c0 0 -15.0996 10.4004 1.10059 10.2002
+c0 0 16.3994 -1.2998 25.5 -17.0996c14.5 -25.6006 38.7998 -18.2002 48.2998 -13.9004c1.5 10.5996 5.7998 18 10.5996 22.2998c-37 4.10059 -74.2998 9.5 -74.2998 73.1006c0 18.1992 5 27.2998 15.5996 39c-1.7998 4.39941 -7.39941 22.0996 1.7002 45
+c13.9004 4.2998 45.7002 -17.9004 45.7002 -17.9004c13.2002 3.7002 27.5 5.59961 41.5996 5.59961c14.1006 0 28.4004 -1.89941 41.6006 -5.59961c0 0 31.7998 22.2002 45.7002 17.9004c9.09961 -23 3.39941 -40.7002 1.69922 -45
+c10.6006 -11.7002 17.1006 -20.8008 17.1006 -39c0 -63.9004 -39 -69 -76 -73.1006c6.09961 -5.2002 11.2998 -15.0996 11.2998 -30.7002c0 -22.2998 -0.200195 -49.8994 -0.200195 -55.2998c0 -4.2998 3.10059 -9.5 11.5 -8zM179.2 93.4004
+c-1.90039 -0.400391 -3.7002 0.399414 -3.90039 1.69922c-0.200195 1.5 1.10059 2.80078 3 3.2002c1.90039 0.200195 3.7002 -0.599609 3.90039 -1.89941c0.299805 -1.30078 -1 -2.60059 -3 -3zM169.7 94.2998c0 1.5 -1.7998 2.60059 -3.7002 2.40039
+c-2 0 -3.5 -1.10059 -3.5 -2.40039c0 -1.5 1.5 -2.59961 3.7002 -2.39941c2 0 3.5 1.09961 3.5 2.39941zM156 95.4004c-0.400391 -1.30078 -2.40039 -1.90039 -4.09961 -1.30078c-1.90039 0.400391 -3.2002 1.90039 -2.80078 3.2002
+c0.400391 1.2998 2.40039 1.90039 4.10059 1.5c2 -0.599609 3.2998 -2.09961 2.7998 -3.39941zM143.7 100.8c0.899414 0.799805 0.399414 2.7998 -0.900391 4.10059c-1.5 1.5 -3.39941 1.69922 -4.2998 0.599609c-1 -0.900391 -0.599609 -2.7998 0.900391 -4.09961
+c1.5 -1.5 3.39941 -1.7002 4.2998 -0.600586zM134.6 109.9c1.10059 0.799805 1.10059 2.59961 0 4.09961c-0.899414 1.5 -2.59961 2.2002 -3.69922 1.2998c-1.10059 -0.700195 -1.10059 -2.39941 0 -3.89941c1.09961 -1.5 2.7998 -2.10059 3.69922 -1.5zM128.1 119.6
+c0.900391 0.700195 0.700195 2.2002 -0.399414 3.5c-1.10059 1 -2.60059 1.5 -3.5 0.600586c-0.900391 -0.700195 -0.700195 -2.2002 0.399414 -3.5c1.10059 -1 2.60059 -1.5 3.5 -0.600586zM121.4 127c0.399414 0.799805 -0.200195 1.90039 -1.5 2.59961
+c-1.30078 0.5 -2.40039 0.200195 -2.80078 -0.399414c-0.399414 -0.900391 0.200195 -2 1.5 -2.60059c1.10059 -0.699219 2.40039 -0.5 2.80078 0.400391z" />
+    <glyph glyph-name="twitter" unicode="&#xf099;" horiz-adv-x="512" 
+d="M459.37 296.284c0.325195 -4.54785 0.325195 -9.09766 0.325195 -13.6455c0 -138.72 -105.583 -298.558 -298.559 -298.558c-59.4521 0 -114.68 17.2188 -161.137 47.1055c8.44727 -0.973633 16.5684 -1.29883 25.3398 -1.29883
+c49.0547 0 94.2129 16.5684 130.274 44.832c-46.1318 0.975586 -84.792 31.1885 -98.1123 72.7725c6.49805 -0.974609 12.9951 -1.62402 19.8184 -1.62402c9.4209 0 18.8428 1.2998 27.6133 3.57324c-48.0811 9.74707 -84.1426 51.9795 -84.1426 102.984v1.29883
+c13.9688 -7.79688 30.2139 -12.6699 47.4307 -13.3184c-28.2637 18.8428 -46.7803 51.0049 -46.7803 87.3906c0 19.4922 5.19629 37.3604 14.2939 52.9541c51.6543 -63.6748 129.3 -105.258 216.364 -109.807c-1.62402 7.79688 -2.59863 15.918 -2.59863 24.04
+c0 57.8271 46.7822 104.934 104.934 104.934c30.2139 0 57.502 -12.6699 76.6709 -33.1367c23.7148 4.54785 46.4551 13.3193 66.5986 25.3398c-7.79785 -24.3662 -24.3662 -44.833 -46.1318 -57.8271c21.1172 2.27344 41.584 8.12207 60.4258 16.2432
+c-14.292 -20.791 -32.1611 -39.3086 -52.6279 -54.2529z" />
+    <glyph glyph-name="facebook" unicode="&#xf09a;" horiz-adv-x="512" 
+d="M504 192c0 -123.78 -90.6904 -226.38 -209.25 -245v173.31h57.7803l11 71.6904h-68.7803v46.5498c0 19.6104 9.61035 38.7305 40.4102 38.7305h31.2803v61s-28.3809 4.83984 -55.5205 4.83984c-56.6699 0 -93.6699 -34.3301 -93.6699 -96.4805v-54.6396h-63v-71.6904h63
+v-173.31c-118.56 18.6201 -209.25 121.22 -209.25 245c0 137 111 248 248 248s248 -111 248 -248z" />
+    <glyph glyph-name="github" unicode="&#xf09b;" horiz-adv-x="496" 
+d="M165.9 50.5996c0 -2 -2.30078 -3.59961 -5.2002 -3.59961c-3.2998 -0.299805 -5.60059 1.2998 -5.60059 3.59961c0 2 2.30078 3.60059 5.2002 3.60059c3 0.299805 5.60059 -1.2998 5.60059 -3.60059zM134.8 55.0996c0.700195 2 3.60059 3 6.2002 2.30078
+c3 -0.900391 4.90039 -3.2002 4.2998 -5.2002c-0.599609 -2 -3.59961 -3 -6.2002 -2c-3 0.599609 -5 2.89941 -4.2998 4.89941zM179 56.7998c2.90039 0.299805 5.59961 -1 5.90039 -2.89941c0.299805 -2 -1.7002 -3.90039 -4.60059 -4.60059
+c-3 -0.700195 -5.59961 0.600586 -5.89941 2.60059c-0.300781 2.2998 1.69922 4.19922 4.59961 4.89941zM244.8 440c138.7 0 251.2 -105.3 251.2 -244c0 -110.9 -67.7998 -205.8 -167.8 -239c-12.7002 -2.2998 -17.2998 5.59961 -17.2998 12.0996
+c0 8.2002 0.299805 49.9004 0.299805 83.6006c0 23.5 -7.7998 38.5 -17 46.3994c55.8994 6.30078 114.8 14 114.8 110.5c0 27.4004 -9.7998 41.2002 -25.7998 58.9004c2.59961 6.5 11.0996 33.2002 -2.60059 67.9004c-20.8994 6.59961 -69 -27 -69 -27
+c-20 5.59961 -41.5 8.5 -62.7998 8.5s-42.7998 -2.90039 -62.7998 -8.5c0 0 -48.0996 33.5 -69 27c-13.7002 -34.6006 -5.2002 -61.4004 -2.59961 -67.9004c-16 -17.5996 -23.6006 -31.4004 -23.6006 -58.9004c0 -96.1992 56.4004 -104.3 112.3 -110.5
+c-7.19922 -6.59961 -13.6992 -17.6992 -16 -33.6992c-14.2998 -6.60059 -51 -17.7002 -72.8994 20.8994c-13.7002 23.7998 -38.6006 25.7998 -38.6006 25.7998c-24.5 0.300781 -1.59961 -15.3994 -1.59961 -15.3994c16.4004 -7.5 27.7998 -36.6006 27.7998 -36.6006
+c14.7002 -44.7998 84.7002 -29.7998 84.7002 -29.7998c0 -21 0.299805 -55.2002 0.299805 -61.3994c0 -6.5 -4.5 -14.4004 -17.2998 -12.1006c-99.7002 33.4004 -169.5 128.3 -169.5 239.2c0 138.7 106.1 244 244.8 244zM97.2002 95.0996
+c1.2998 1.30078 3.59961 0.600586 5.2002 -1c1.69922 -1.89941 2 -4.19922 0.699219 -5.19922c-1.2998 -1.30078 -3.59961 -0.600586 -5.19922 1c-1.7002 1.89941 -2 4.19922 -0.700195 5.19922zM86.4004 103.2c0.699219 1 2.2998 1.2998 4.2998 0.700195
+c2 -1 3 -2.60059 2.2998 -3.90039c-0.700195 -1.40039 -2.7002 -1.7002 -4.2998 -0.700195c-2 1 -3 2.60059 -2.2998 3.90039zM118.8 67.5996c1.2998 1.60059 4.2998 1.30078 6.5 -1c2 -1.89941 2.60059 -4.89941 1.2998 -6.19922
+c-1.2998 -1.60059 -4.19922 -1.30078 -6.5 1c-2.2998 1.89941 -2.89941 4.89941 -1.2998 6.19922zM107.4 82.2998c1.59961 1.2998 4.19922 0.299805 5.59961 -2c1.59961 -2.2998 1.59961 -4.89941 0 -6.2002c-1.2998 -1 -4 0 -5.59961 2.30078
+c-1.60059 2.2998 -1.60059 4.89941 0 5.89941z" />
+    <glyph glyph-name="pinterest" unicode="&#xf0d2;" horiz-adv-x="496" 
+d="M496 192c0 -137 -111 -248 -248 -248c-25.5996 0 -50.2002 3.90039 -73.4004 11.0996c10.1006 16.5 25.2002 43.5 30.8008 65c3 11.6006 15.3994 59 15.3994 59c8.10059 -15.3994 31.7002 -28.5 56.7998 -28.5c74.8008 0 128.7 68.8008 128.7 154.301
+c0 81.8994 -66.8994 143.199 -152.899 143.199c-107 0 -163.9 -71.7998 -163.9 -150.1c0 -36.4004 19.4004 -81.7002 50.2998 -96.0996c4.7002 -2.2002 7.2002 -1.2002 8.2998 3.2998c0.800781 3.39941 5 20.2998 6.90039 28.0996
+c0.599609 2.5 0.299805 4.7002 -1.7002 7.10059c-10.0996 12.5 -18.2998 35.2998 -18.2998 56.5996c0 54.7002 41.4004 107.6 112 107.6c60.9004 0 103.6 -41.5 103.6 -100.899c0 -67.1006 -33.8994 -113.601 -78 -113.601c-24.2998 0 -42.5996 20.1006 -36.6992 44.8008
+c7 29.5 20.5 61.2998 20.5 82.5996c0 19 -10.2002 34.9004 -31.4004 34.9004c-24.9004 0 -44.9004 -25.7002 -44.9004 -60.2002c0 -22 7.40039 -36.7998 7.40039 -36.7998s-24.5 -103.801 -29 -123.2c-5 -21.4004 -3 -51.6006 -0.900391 -71.2002
+c-92.1992 36.0996 -157.6 125.9 -157.6 231c0 137 111 248 248 248s248 -111 248 -248z" />
+    <glyph glyph-name="pinterest-square" unicode="&#xf0d3;" 
+d="M448 368v-352c0 -26.5 -21.5 -48 -48 -48h-245.6c9.7998 16.4004 22.3994 40 27.3994 59.2998c3 11.5 15.2998 58.4004 15.2998 58.4004c8 -15.2998 31.4004 -28.2002 56.3008 -28.2002c74.0996 0 127.399 68.0996 127.399 152.7
+c0 81.0996 -66.2002 141.8 -151.399 141.8c-106 0 -162.2 -71.0996 -162.2 -148.6c0 -36 19.2002 -80.8008 49.7998 -95.1006c4.7002 -2.2002 7.09961 -1.2002 8.2002 3.2998c0.799805 3.40039 5 20.1006 6.7998 27.8008c0.599609 2.5 0.299805 4.59961 -1.7002 7
+c-10.0996 12.2998 -18.2998 34.8994 -18.2998 56c0 54.1992 41 106.6 110.9 106.6c60.2998 0 102.6 -41.0996 102.6 -99.9004c0 -66.3994 -33.5 -112.399 -77.2002 -112.399c-24.0996 0 -42.0996 19.8994 -36.3994 44.3994c6.89941 29.2002 20.2998 60.7002 20.2998 81.8008
+c0 53 -75.5 45.6992 -75.5 -25c0 -21.7002 7.2998 -36.5 7.2998 -36.5c-31.4004 -132.801 -36.0996 -134.5 -29.5996 -192.601l2.19922 -0.799805h-88.5996c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48z" />
+    <glyph glyph-name="google-plus-square" unicode="&#xf0d4;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM164 92c57.7002 0 96 40.5 96 97.5996c0 6.5 -0.599609 11.6006 -1.59961 16.6006h-94.4004v-34.4004h56.9004
+c-2.40039 -14.5996 -17.2002 -43.0996 -56.8008 -43.0996c-34.0996 0 -61.8994 28.2998 -61.8994 63.2002c0 35 27.7998 63.1992 61.8994 63.1992c19.5 0 32.4004 -8.2998 39.8008 -15.3994l27.0996 26.0996c-17.5 16.4004 -40 26.2002 -67 26.2002
+c-55.2998 0 -100 -44.7002 -100 -100s44.7002 -100 100 -100zM384 173.8v29.2002h-29v29h-29.2002v-29h-29v-29.2002h29v-29h29.2002v29h29z" />
+    <glyph glyph-name="google-plus-g" unicode="&#xf0d5;" horiz-adv-x="640" 
+d="M386.061 219.504c1.83398 -9.69238 3.14355 -19.3838 3.14355 -31.9561c0 -109.753 -73.6055 -187.548 -184.404 -187.548c-106.084 0 -192 85.915 -192 192s85.916 192 192 192c51.8643 0 95.083 -18.8594 128.611 -50.292l-52.126 -50.0303
+c-14.1455 13.6211 -39.0283 29.5996 -76.4854 29.5996c-65.4834 0 -118.92 -54.2217 -118.92 -121.277s53.4365 -121.277 118.92 -121.277c75.9609 0 104.514 54.7451 108.965 82.7734h-108.965v66.0088h181.261v-0.000976562zM571.467 213.067h55.7334v-56.001h-55.7334
+v-55.7334h-56.001v55.7334h-55.7324v56.001h55.7324v55.7324h56.001v-55.7324z" />
+    <glyph glyph-name="linkedin-in" unicode="&#xf0e1;" 
+d="M100.28 0h-92.8799v299.1h92.8799v-299.1zM53.79 339.9c-29.7002 0 -53.79 24.5996 -53.79 54.2998c0 29.6875 24.1025 53.79 53.79 53.79s53.79 -24.1025 53.79 -53.79c0 -29.7002 -24.0996 -54.2998 -53.79 -54.2998zM447.9 0h-92.6807v145.6
+c0 34.7002 -0.700195 79.2002 -48.29 79.2002c-48.29 0 -55.6895 -37.7002 -55.6895 -76.7002v-148.1h-92.7803v299.1h89.0801v-40.7998h1.2998c12.4004 23.5 42.6904 48.2998 87.8799 48.2998c94 0 111.28 -61.8994 111.28 -142.3v-164.3h-0.0996094z" />
+    <glyph glyph-name="github-alt" unicode="&#xf113;" horiz-adv-x="480" 
+d="M186.1 119.3c0 -20.8994 -10.8994 -55.0996 -36.6992 -55.0996c-25.8008 0 -36.7002 34.2002 -36.7002 55.0996c0 20.9004 10.8994 55.1006 36.7002 55.1006c25.7998 0 36.6992 -34.2002 36.6992 -55.1006zM480 169.8c0 -31.8994 -3.2002 -65.7002 -17.5 -95
+c-37.9004 -76.5996 -142.1 -74.7998 -216.7 -74.7998c-75.7998 0 -186.2 -2.7002 -225.6 74.7998c-14.6006 29 -20.2002 63.1006 -20.2002 95c0 41.9004 13.9004 81.5 41.5 113.601c-5.2002 15.7998 -7.7002 32.3994 -7.7002 48.7998
+c0 21.5 4.90039 32.2998 14.6006 51.7998c45.2998 0 74.2998 -9 108.8 -36c29 6.90039 58.7998 10 88.7002 10c27 0 54.1992 -2.90039 80.3994 -9.2002c34 26.7002 63 35.2002 107.8 35.2002c9.80078 -19.5 14.6006 -30.2998 14.6006 -51.7998
+c0 -16.4004 -2.60059 -32.7002 -7.7002 -48.2002c27.5 -32.4004 39 -72.2998 39 -114.2zM415.7 119.3c0 43.9004 -26.7002 82.6006 -73.5 82.6006c-18.9004 0 -37 -3.40039 -56 -6c-14.9004 -2.30078 -29.7998 -3.2002 -45.1006 -3.2002
+c-15.1992 0 -30.0996 0.899414 -45.0996 3.2002c-18.7002 2.59961 -37 6 -56 6c-46.7998 0 -73.5 -38.7002 -73.5 -82.6006c0 -87.7998 80.4004 -101.3 150.4 -101.3h48.1992c70.3008 0 150.601 13.4004 150.601 101.3zM333.1 174.4
+c25.8008 0 36.7002 -34.2002 36.7002 -55.1006c0 -20.8994 -10.8994 -55.0996 -36.7002 -55.0996c-25.7998 0 -36.6992 34.2002 -36.6992 55.0996c0 20.9004 10.8994 55.1006 36.6992 55.1006z" />
+    <glyph glyph-name="maxcdn" unicode="&#xf136;" horiz-adv-x="512" 
+d="M461.1 5.2998h-97.3994l51.8994 242.7c2.30078 10.2002 0.900391 19.5 -4.39941 25.7002c-5 6.09961 -13.7002 9.59961 -24.2002 9.59961h-49.2998l-59.5 -278h-97.4004l59.5 278h-83.3994l-59.5 -278h-97.4004l59.5 278l-44.5996 95.4004h372.1
+c39.4004 0 75.2998 -16.2998 98.2998 -44.9004c23.2998 -28.5996 31.7998 -67.3994 23.6006 -105.899z" />
+    <glyph glyph-name="html5" unicode="&#xf13b;" horiz-adv-x="384" 
+d="M0 416h384l-34.9004 -395.8l-157.6 -52.2002l-156.6 52.2002zM308.2 288.1l4.39941 47.7002h-241.1l12.7998 -145.6h166.9l-6 -62.2002l-53.7002 -14.5l-53.5 14.5l-3.5 38.0996h-47.7002l6 -75.7998l98.7002 -27.2998h1.09961v0.299805l97.9004 27l13.5996 148.4h-175.6
+l-4.09961 49.3994h183.8z" />
+    <glyph glyph-name="css3" unicode="&#xf13c;" horiz-adv-x="512" 
+d="M480 416l-64 -368l-223.3 -80l-192.7 80l19.5996 94.7998h82l-8 -40.5996l116.4 -44.4004l134.1 44.4004l18.8008 97.0996h-333.4l16 82h333.7l10.5 52.7002h-333.4l16.2998 82h407.4z" />
+    <glyph glyph-name="btc" unicode="&#xf15a;" horiz-adv-x="384" 
+d="M310.204 205.362c46.0059 -11.0283 74.9971 -38.4443 69.3262 -99.8906c-7.24805 -76.5723 -61.5967 -97.0547 -142.896 -101.467v-68.0049h-48.5273v66.7451c-12.29 0 -25.21 0 -38.4443 0.314453v-67.0596h-48.5283v68.0049s-8.88867 0.31543 -97.3701 0.31543
+l9.76758 57.666c34.7305 -0.614258 50.3301 -3.4209 53.2549 16.0703v217.43c-4.60645 24.5664 -24.709 22.1045 -63.0234 21.4268v51.6777c58.748 -0.275391 79.5283 -0.539062 97.3701 0v79.4092h48.5283v-77.833c12.9189 0.31543 25.8389 0.629883 38.4443 0.629883
+v77.2031h48.5273v-79.4092c62.3926 -5.35547 109.492 -24.5781 114.851 -81.9287c4.09668 -41.9102 -13.5508 -67.1201 -41.2803 -81.2998zM150.608 313.447v-96.7402c27.416 0 113.126 -6.30273 113.126 48.2119c0 57.0352 -85.7109 48.5283 -113.126 48.5283z
+M150.608 61.6709c32.7715 0 133.126 -6.93262 133.127 53.2529c0 62.3936 -100.355 53.2549 -133.127 53.2549v-106.508z" />
+    <glyph glyph-name="youtube" unicode="&#xf167;" horiz-adv-x="576" 
+d="M549.655 323.917c11.4121 -42.8672 11.4121 -132.305 11.4121 -132.305s0 -89.4385 -11.4121 -132.306c-6.28125 -23.6494 -24.7871 -41.5 -48.2842 -47.8203c-42.5908 -11.4863 -213.371 -11.4863 -213.371 -11.4863s-170.78 0 -213.371 11.4863
+c-23.4971 6.32031 -42.0029 24.1709 -48.2842 47.8203c-11.4121 42.8672 -11.4121 132.306 -11.4121 132.306s0 89.4375 11.4121 132.305c6.28125 23.6504 24.7871 42.2754 48.2842 48.5967c42.5908 11.4863 213.371 11.4863 213.371 11.4863s170.781 0 213.371 -11.4863
+c23.4971 -6.32031 42.0029 -24.9463 48.2842 -48.5967zM232.145 110.409l142.739 81.2012l-142.739 81.2051v-162.406z" />
+    <glyph glyph-name="xing" unicode="&#xf168;" horiz-adv-x="384" 
+d="M162.7 238c-1.7998 -3.2998 -25.2002 -44.4004 -70.1006 -123.5c-4.89941 -8.2998 -10.7998 -12.5 -17.6992 -12.5h-65.1006c-7.7002 0 -12.0996 7.5 -8.5 14.4004l69 121.3c0.200195 0 0.200195 0.0996094 0 0.299805l-43.8994 75.5996
+c-4.30078 7.80078 0.299805 14.1006 8.5 14.1006h65.0996c7.2998 0 13.2998 -4.10059 18 -12.2002zM382.6 401.9l-144 -253v-0.300781l91.6006 -166.6c3.89941 -7.09961 0.200195 -14.0996 -8.5 -14.0996h-65.2002c-7.59961 0 -13.5996 4 -18 12.1992l-92.4004 168.5
+c3.30078 5.80078 51.5 90.8008 144.801 255.2c4.59961 8.10059 10.3994 12.2002 17.5 12.2002h65.6992c8 0 12.3008 -6.7002 8.5 -14.0996z" />
+    <glyph glyph-name="xing-square" unicode="&#xf169;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM140.4 127.8c4.89941 0 9.09961 2.90039 12.5996 9.10059c32.0996 56.5 48.7998 85.8994 50.0996 88.1992l-31.8994 55.3008
+c-3.40039 5.7998 -7.7002 8.69922 -12.9004 8.69922h-46.5996c-5.7998 0 -9 -4.5 -6 -10.0996l31.3994 -54c0.100586 -0.0996094 0.100586 -0.200195 0 -0.200195l-49.2998 -86.7002c-2.7002 -5 0.5 -10.2998 6 -10.2998h46.6006zM360.1 341.9
+c2.80078 5.2998 -0.299805 10.0996 -6 10h-46.8994c-5.10059 0 -9.2002 -2.90039 -12.5 -8.7002c-66.6006 -117.4 -101.101 -178.2 -103.4 -182.3l66 -120.301c3.2002 -5.7998 7.40039 -8.69922 12.9004 -8.69922h46.5996c6.10059 0 8.7998 5 6 10.0996l-65.5 119v0.200195z
+" />
+    <glyph glyph-name="dropbox" unicode="&#xf16b;" horiz-adv-x="528" 
+d="M264.4 331.7l-132 -84.2998l132 -84.3008l-132 -84.2998l-132.4 85.1006l132.3 84.2998l-132.3 83.5l132.3 84.2998zM131.6 52.2998l132 84.2998l132 -84.2998l-132 -84.2998zM264.4 163.9l132 84.2998l-132 83.5996l131.3 84.2002l132.3 -84.2998l-132.3 -84.2998
+l132.3 -84.2002l-132.3 -84.2998z" />
+    <glyph glyph-name="stack-overflow" unicode="&#xf16c;" horiz-adv-x="384" 
+d="M290.7 137l-8.2002 -39l-195.7 41l8.2002 39.2998zM341.7 224l-25.5 -30.7998l-153.5 128.3l25.5 30.7998zM310.5 184.3l-16.7998 -36.2998l-181.2 84.5l16.7002 36.5zM262 416l119.3 -160.3l-32 -24l-119.3 160.3zM282.5 88v-39.7002h-200v39.7002h200zM322.2 8v120h40
+v-160h-359.5v160h40v-120h279.5z" />
+    <glyph glyph-name="instagram" unicode="&#xf16d;" 
+d="M224.1 307c63.6006 0 114.9 -51.2998 114.9 -114.9c0 -63.5996 -51.2998 -114.899 -114.9 -114.899c-63.5996 0 -114.899 51.2998 -114.899 114.899c0 63.6006 51.2998 114.9 114.899 114.9zM224.1 117.4c41.1006 0 74.7002 33.5 74.7002 74.6992
+c0 41.2002 -33.5 74.7002 -74.7002 74.7002c-41.1992 0 -74.6992 -33.5 -74.6992 -74.7002c0 -41.1992 33.5996 -74.6992 74.6992 -74.6992zM370.5 311.7c0 -14.9004 -12 -26.7998 -26.7998 -26.7998c-14.9004 0 -26.7998 12 -26.7998 26.7998s12 26.7998 26.7998 26.7998
+s26.7998 -12 26.7998 -26.7998zM446.6 284.5c2.10059 -37 2.10059 -147.8 0 -184.8c-1.7998 -35.9004 -10 -67.7002 -36.1992 -93.9004c-26.2002 -26.2998 -58 -34.5 -93.9004 -36.2002c-37 -2.09961 -147.9 -2.09961 -184.9 0
+c-35.8994 1.80078 -67.5996 10 -93.8994 36.2002s-34.5 58 -36.2002 93.9004c-2.09961 37 -2.09961 147.899 0 184.899c1.7998 35.9004 9.90039 67.7002 36.2002 93.9004s58.0996 34.4004 93.8994 36.0996c37 2.10059 147.9 2.10059 184.9 0
+c35.9004 -1.7998 67.7002 -10 93.9004 -36.1992c26.2998 -26.2002 34.5 -58 36.1992 -93.9004zM398.8 60c11.7002 29.4004 9 99.5 9 132.1c0 32.6006 2.7002 102.601 -9 132.101c-7.89941 19.7002 -23 34.7998 -42.5996 42.5996c-29.4004 11.6006 -99.5 9 -132.101 9
+c-32.5996 0 -102.6 2.7002 -132.1 -9c-19.7002 -7.89941 -34.7998 -23 -42.5996 -42.5996c-11.6006 -29.4004 -9 -99.5 -9 -132.101c0 -32.5996 -2.7002 -102.6 9 -132.1c7.89941 -19.7002 23 -34.7998 42.5996 -42.5996c29.4004 -11.6006 99.5 -9 132.1 -9
+c32.6006 0 102.601 -2.7002 132.101 9c19.7002 7.89941 34.7998 23 42.5996 42.5996z" />
+    <glyph glyph-name="flickr" unicode="&#xf16e;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM144.5 129c35.0996 0 63.5 28.4004 63.5 63.5s-28.4004 63.5 -63.5 63.5s-63.5 -28.4004 -63.5 -63.5s28.4004 -63.5 63.5 -63.5z
+M303.5 129c35.0996 0 63.5 28.4004 63.5 63.5s-28.4004 63.5 -63.5 63.5s-63.5 -28.4004 -63.5 -63.5s28.4004 -63.5 63.5 -63.5z" />
+    <glyph glyph-name="adn" unicode="&#xf170;" horiz-adv-x="496" 
+d="M248 280.5l64.9004 -98.7998h-129.801zM496 192c0 -136.9 -111.1 -248 -248 -248s-248 111.1 -248 248s111.1 248 248 248s248 -111.1 248 -248zM396.2 109.3l-148.2 223.2l-148.2 -223.2h30.4004l33.5996 51.7002h168.601l33.5996 -51.7002h30.2002z" />
+    <glyph glyph-name="bitbucket" unicode="&#xf171;" horiz-adv-x="512" 
+d="M22.2002 416l466.8 -0.200195c0.954102 -0.0136719 1.875 -0.0800781 2.7998 -0.200195c7.58789 -1.25 13.3994 -7.83203 13.3994 -15.7715c0 -0.860352 -0.0683594 -1.7041 -0.199219 -2.52832l-67.9004 -416.8c-1.24902 -7.58887 -7.84277 -13.4014 -15.7832 -13.4014
+c-0.0722656 0 -0.144531 0 -0.216797 0.000976562h-325.699c-10.7129 0.0869141 -19.5967 7.94727 -21.3008 18.2002l-67.8994 412.101c-0.116211 0.924805 -0.182617 1.84668 -0.200195 2.7998c0.108398 8.7373 7.23242 15.8008 15.9951 15.8008
+c0.0683594 0 0.136719 0 0.205078 -0.000976562zM308.1 118.2l25.2002 147h-157.3l28.0996 -147h104z" />
+    <glyph glyph-name="tumblr" unicode="&#xf173;" horiz-adv-x="320" 
+d="M309.8 -32.2998c-13.5996 -14.5 -50 -31.7002 -97.3994 -31.7002c-120.801 0 -147 88.7998 -147 140.6v144h-47.5c-5.5 0 -10 4.5 -10 10v68c0 7.2002 4.5 13.6006 11.2998 16c62 21.8008 81.5 76 84.2998 117.101c0.799805 11 6.5 16.2998 16.0996 16.2998h70.9004
+c5.5 0 10 -4.5 10 -10v-115.2h83c5.5 0 10 -4.39941 10 -9.89941v-81.7002c0 -5.5 -4.5 -10 -10 -10h-83.4004v-133.2c0 -34.2002 23.7002 -53.5996 68 -35.7998c4.80078 1.89941 9 3.2002 12.7002 2.2002c3.5 -0.900391 5.7998 -3.40039 7.40039 -7.90039l22 -64.2998
+c1.7998 -5 3.2998 -10.6006 -0.400391 -14.5z" />
+    <glyph glyph-name="tumblr-square" unicode="&#xf174;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM317.7 51.7998c2.2998 2.40039 1.2998 5.90039 0.299805 9.10059l-13.7998 40.1992c-1 2.80078 -2.40039 4.40039 -4.60059 4.90039
+c-2.39941 0.599609 -5 -0.200195 -8 -1.40039c-27.6992 -11.0996 -42.5 1 -42.5 22.4004v83.2998h52.1006c3.39941 0 6.2002 2.7998 6.2002 6.2002v51.0996c0 3.40039 -2.80078 6.2002 -6.2002 6.2002h-51.9004v72c0 3.40039 -2.7998 6.2002 -6.2002 6.2002h-44.2998
+c-5.89941 0 -9.5 -3.2998 -10 -10.2002c-1.7998 -25.7002 -13.8994 -59.5 -52.7002 -73.2002c-4.2998 -1.5 -7.09961 -5.5 -7.09961 -10v-42.5c0 -3.39941 2.7998 -6.19922 6.2002 -6.19922h29.7002v-90c0 -32.4004 16.3994 -87.9004 91.8994 -87.9004
+c29.7002 0 52.4004 10.7002 60.9004 19.7998z" />
+    <glyph glyph-name="apple" unicode="&#xf179;" horiz-adv-x="384" 
+d="M318.7 179.3c0 -1.89941 -3.5 -61.2002 61.7002 -91.8994c-12.2002 -36.8008 -54 -118.601 -102.601 -119.301c-28.0996 0 -44.5996 17.9004 -76.3994 17.9004c-32.8008 0 -50.6006 -17.2998 -75.8008 -17.9004c-48.1992 -1.5 -94.3994 88.5 -107.199 125.2
+c-9.60059 27.9336 -14.4004 55 -14.4004 81.2002c0 88.7002 59.2998 132.3 115.1 133.2c27 0 61.4004 -19.7002 76.4004 -19.7002c14.2002 0 53 23.5 88.5 20.7002c37.5 -2.90039 65.9004 -17.7002 84.7002 -44.6006c-33.6006 -20.3994 -50.2002 -48.0996 -50 -84.7998z
+M262.1 343.5c-19.5996 -22.9004 -43.3994 -36.2998 -69.5 -34.2998c-2.19922 27.5996 8.10059 52.0996 25.6006 71.8994c15.8994 18.5 43.7998 33.5 67.8994 34.9004c0.800781 -10.5996 3.30078 -40.0996 -24 -72.5z" />
+    <glyph glyph-name="windows" unicode="&#xf17a;" 
+d="M0 354.3l183.6 25.2998v-177.399h-183.6v152.1zM0 29.7002v149.899h183.6v-175.199zM203.8 1.7002v177.899h244.2v-211.6zM203.8 382.3l244.2 33.7002v-213.8h-244.2v180.1z" />
+    <glyph glyph-name="android" unicode="&#xf17b;" horiz-adv-x="576" 
+d="M420.55 146.07c-13.2461 0 -24 10.7539 -24 24s10.7539 24 24 24s24 -10.7539 24 -24s-10.7539 -24 -24 -24zM155.45 146.07c-13.2461 0 -24 10.7539 -24 24s10.7539 24 24 24s24 -10.7539 24 -24s-10.7539 -24 -24 -24zM429.15 290.55l47.9395 83
+c1.06738 1.59082 1.69043 3.50391 1.69043 5.5625c0 5.51855 -4.48047 10 -10 10c-3.93359 0 -7.32812 -2.25684 -8.95996 -5.5625v0l-48.54 -84.0693c-37.5742 16.8516 -79.2197 26.2266 -123.037 26.2266c-43.8164 0 -85.9492 -9.375 -123.523 -26.2266l-48.54 84.0693
+c-1.63184 3.30566 -5.03809 5.58203 -8.97168 5.58203c-5.51953 0 -10 -4.48145 -10 -10c0 -2.05859 0.634766 -3.99121 1.70215 -5.58203v0l47.9395 -83c-82.3193 -44.7695 -138.609 -128.1 -146.85 -226.55h576c-8.24023 98.4502 -64.54 181.78 -146.85 226.55z" />
+    <glyph glyph-name="linux" unicode="&#xf17c;" 
+d="M220.8 324.7c-1.09961 0.599609 -3.09961 0.399414 -3.39941 1.7002c-0.200195 0.399414 0.199219 0.899414 0.599609 1.09961c1.59961 0.900391 3.7998 0.599609 5.5 -0.0996094c1.2998 -0.600586 3.40039 -1.5 3.2002 -2.90039
+c-0.100586 -1.09961 -1.7998 -1.5 -2.90039 -1.5c-1.2002 0 -2 1.2002 -3 1.7002zM198.9 323c-1 -0.0996094 -2.7002 0.400391 -2.80078 1.40039c-0.199219 1.39941 1.90039 2.2998 3.2002 2.89941c1.7002 0.700195 3.90039 1 5.5 0.100586
+c0.400391 -0.200195 0.799805 -0.700195 0.600586 -1.10059c-0.400391 -1.2002 -2.40039 -1 -3.5 -1.59961c-1 -0.5 -1.80078 -1.7002 -3 -1.7002zM420 44.2002c11.0996 -12.4004 15.9004 -21.5 15.5 -29.7002c-0.5 -8.2002 -6.5 -13.7998 -13.9004 -18.2998
+c-14.8994 -9 -37.2998 -15.7998 -50.8994 -32.2002c-14.2002 -16.9004 -31.7002 -26.5996 -48.2998 -27.9004c-16.5 -1.2998 -32 6.30078 -40.3008 23v0.100586c-1.09961 2.09961 -1.89941 4.39941 -2.5 6.7002c-21.5 -1.2002 -40.1992 5.2998 -55.0996 4.09961
+c-22 -1.2002 -35.7998 -6.5 -48.2998 -6.59961c-4.7998 -10.6006 -14.2998 -17.6006 -25.9004 -20.2002c-16 -3.7002 -36.0996 0 -55.8994 10.3994c-18.5 9.80078 -42 8.90039 -59.3008 12.5c-8.69922 1.80078 -16.2998 5 -20.0996 12.3008
+c-3.7002 7.2998 -3 17.2998 2.2002 31.6992c1.7002 5.10059 0.399414 12.7002 -0.799805 20.8008c-0.600586 3.89941 -1.2002 7.89941 -1.2002 11.7998c0 4.2998 0.700195 8.5 2.7998 12.3994c4.5 8.5 11.7998 12.1006 18.5 14.5c6.7002 2.40039 12.7998 4 17 8.30078
+c5.2002 5.5 10.0996 14.3994 16.5996 20.1992c-2.59961 17.2002 0.200195 35.4004 6.2002 53.3008c12.6006 37.8994 39.2002 74.1992 58.1006 96.6992c16.0996 22.9004 20.7998 41.3008 22.5 64.7002c1.09961 31.7998 -24.5 135.4 77.8994 135.2
+c80.9004 -0.0996094 76.2998 -85.4004 75.7998 -131.3c-0.299805 -30.1006 16.3008 -50.5 33.4004 -72c15.2002 -18 35.0996 -44.2998 46.5 -74.4004c9.2998 -24.5996 12.9004 -51.7998 3.7002 -79.0996c1.39941 -0.5 2.7998 -1.2002 4.09961 -2
+c1.40039 -0.799805 2.7002 -1.7998 4 -2.90039c6.60059 -5.59961 8.7002 -14.2998 10.5 -22.3994c1.90039 -8.10059 3.60059 -15.7002 7.2002 -19.7002zM223.7 360.7c-3.2002 -7.2002 -3.90039 -14.9004 -2.90039 -21.7998c3.60059 -0.900391 8.90039 -2.40039 13 -4.40039
+c-2.09961 12.2002 4.5 23.5 11.7998 23c8.90039 -0.299805 13.9004 -15.5 9.10059 -27.2998c-0.799805 -1.90039 -2.7998 -3.40039 -3.90039 -4.60059c6.7002 -2.2998 11 -4.09961 12.6006 -4.89941c7.89941 9.5 10.7998 26.2002 4.2998 40.3994
+c-9.7998 21.4004 -34.2002 21.8008 -44 -0.399414zM183 372.2c-18.9004 0 -24 -37.5 -8.40039 -52.1006c7.80078 5.7002 6.90039 4.7002 5.90039 5.5c-8 6.90039 -6.59961 27.4004 1.7998 28.1006c6.2998 0.5 10.7998 -10.7002 9.60059 -19.6006
+c3.09961 2.10059 6.69922 3.60059 10.1992 4.60059c1.7002 19.2998 -9 33.5 -19.0996 33.5zM169.4 311.5c-4.2002 -3.2998 -5.60059 -7.40039 -4.2002 -12.2998c1.5 -4.90039 6.09961 -10.5 14.7002 -15.2998c7.7998 -4.60059 12 -11.5 20 -15
+c2.59961 -1.10059 5.69922 -1.90039 9.59961 -2.10059c18.4004 -1.09961 27.0996 11.2998 38.2002 14.9004c11.7002 3.7002 20.0996 11 22.7002 18.0996c3.19922 8.5 -2.10059 14.7002 -10.5 18.2002c-11.3008 4.90039 -16.3008 5.2002 -22.6006 9.2998
+c-10.2998 6.60059 -18.7998 8.90039 -25.8994 8.90039c-14.4004 0 -23.2002 -9.7998 -27.9004 -14.2002c-0.5 -0.5 -7.90039 -5.90039 -14.0996 -10.5zM172.7 -22.5c2.09961 20.5 -31.5 49 -41 68.9004l-19.6006 35.5996c-6.7998 9.2002 -13.7998 14.7998 -21.8994 16
+c-7.7002 1.2002 -12.6006 -1.40039 -17.7002 -6.90039c-4.7998 -5.09961 -8.7998 -12.2998 -14.2998 -18c-7.7998 -6.5 -9.2998 -6.19922 -19.6006 -9.89941c-6.2998 -2.2002 -11.2998 -4.60059 -14.7998 -11.2998c-2.7002 -5 -2.09961 -12.2002 -0.899414 -20
+c1.19922 -7.90039 3 -16.3008 0.599609 -23.9004v-0.200195c-5 -13.7002 -5 -21.7002 -2.59961 -26.3994c7.89941 -15.4004 46.5996 -6.10059 76.5 -21.9004c31.3994 -16.4004 72.5996 -17.0996 75.2998 18zM171.3 3.40039c37.6006 -25.7002 82.2002 -15.7002 114.3 7.19922
+c3.2002 11 6.30078 21.3008 6.80078 29c0.799805 15.2002 1.59961 28.7002 4.39941 39.9004c3.10059 12.5996 9.2998 23.0996 21.4004 27.2998c2.2998 21.1006 18.7002 21.1006 38.2998 12.5c18.9004 -8.5 26 -16 22.7998 -26.0996c1 0 2 0.0996094 4.2002 0
+c5.2002 16.8994 -14.2998 28 -30.7002 34.7998c2.90039 12 2.40039 24.0996 -0.399414 35.7002c-6 25.2998 -22.6006 47.7998 -35.2002 59c-2.2998 0.0996094 -2.10059 -1.90039 2.59961 -6.5c11.6006 -10.7002 37.1006 -49.2002 23.2998 -84.9004
+c-3.89941 1 -7.59961 1.5 -10.8994 1.40039c-5.2998 29.0996 -17.5 53.2002 -23.6006 64.5996c-11.5 21.4004 -29.5 65.2998 -37.1992 95.7002c-4.5 -6.40039 -12.4004 -11.9004 -22.3008 -15c-4.69922 -1.5 -9.69922 -5.5 -15.8994 -9
+c-13.9004 -8 -30 -8.7998 -42.4004 1.2002c-4.5 3.59961 -8 7.59961 -12.5996 10.2998c-1.60059 0.900391 -5.10059 3.2998 -6.2002 4.09961c-2 -37.7998 -27.2998 -85.2998 -39.2998 -112.699c-8.2998 -19.7002 -13.2002 -40.8008 -13.7998 -61.5
+c-21.8008 29.0996 -5.90039 66.2998 2.59961 82.3994c9.5 17.6006 11 22.5 8.7002 20.7998c-8.60059 -14 -22 -36.2998 -27.2002 -59.1992c-2.7002 -11.9004 -3.2002 -24 0.299805 -35.2002s11.1006 -21.5 24.6006 -29.9004c0 0 24.7998 -14.2998 38.2998 -32.5
+c7.39941 -10 9.7002 -18.7002 7.39941 -24.8994c-2.5 -6.7002 -9.59961 -8.90039 -16.6992 -8.90039c4.7998 -6 10.2998 -13 14.3994 -19.5996zM428.7 14.9004c0.299805 5.09961 -3.10059 13 -13.7002 24.5996c-10 11.2998 -7.2002 33.0996 -17.0996 41.5996
+c-6.90039 6 -13.6006 5.40039 -22.6006 5.10059c-7.7002 -8.7998 -25.7998 -19.6006 -38.3994 -16.2998c-11.5 2.89941 -18 16.2998 -18.8008 29.5c-0.299805 -0.200195 -0.699219 -0.300781 -1 -0.5c-7.09961 -3.90039 -11.0996 -10.8008 -13.6992 -21.1006
+c-2.5 -10.2002 -3.40039 -23.5 -4.2002 -38.7002c-0.700195 -11.7998 -6.2002 -26.3994 -9.90039 -40.5996c-3.5 -13.2002 -5.7998 -25.2002 -1.09961 -36.2998c7.2002 -14.5 19.5 -20.4004 33.7002 -19.2998c14.1992 1.09961 30.3994 9.7998 43.5996 25.5
+c22 26.5996 62.2998 29.6992 63.2002 46.5zM173.3 299.3c-3.5 2.7998 -3.09961 6.60059 -1.7002 6.5c2.40039 -0.299805 2.80078 -3.5 4.30078 -4.89941c2 -1.90039 4.59961 -4.40039 7.69922 -6.90039c6.2002 -4.90039 14.5 -9.7002 24.9004 -9.7002
+s22.5 6 29.9004 10.2002c4.19922 2.40039 9.5 6.59961 13.8994 9.7998c3.40039 2.5 3.2002 5.40039 6 5.10059c2.7998 -0.300781 0.799805 -3.2002 -3.09961 -6.60059c-3.90039 -3.39941 -9.90039 -7.7998 -14.7998 -10.3994
+c-9.30078 -4.90039 -20.2002 -10.8008 -31.8008 -10.8008c-11.5 0 -20.6992 5.40039 -27.2998 10.6006c-3.2998 2.59961 -6 5.2002 -8 7.09961z" />
+    <glyph glyph-name="dribbble" unicode="&#xf17d;" horiz-adv-x="512" 
+d="M256 440c136.748 0 248 -111.252 248 -248s-111.252 -248 -248 -248s-248 111.252 -248 248s111.252 248 248 248zM419.97 325.634c-4.46582 -6.04102 -39.9629 -51.5459 -118.284 -83.5225c7.43652 -15.2217 12.8652 -27.5732 18.6172 -41.6143
+c70.4844 8.86426 140.519 -5.34082 147.502 -6.81836c-0.46582 49.998 -18.332 95.9092 -47.835 131.955zM396.421 350.13c-52.0947 46.2188 -122.885 63.6816 -190.061 47.4893c5.85449 -7.83984 44.3281 -60.2324 79.04 -124.008
+c75.3232 28.2324 107.211 71.0918 111.021 76.5186zM165.941 383.38c-59.2637 -27.9531 -103.562 -82.585 -117.298 -148.318c9.47461 -0.125 96.7471 -0.503906 195.834 25.8096c-35.0986 62.3926 -72.9512 114.85 -78.5361 122.509zM44.1699 191.677
+c0 -54.4072 20.624 -104.082 54.457 -141.636c34.3369 58.7793 103.932 120.731 180.531 142.306c-5.31738 12.0342 -11.1104 24.0811 -17.1738 35.9492c-105.786 -31.6592 -208.438 -30.3359 -217.706 -30.1455c-0.0654297 -2.15137 -0.108398 -4.30762 -0.108398 -6.47363
+zM125.977 24.5645c62.7539 -48.9355 144.656 -56.8955 212.769 -27.8828c-3.15039 18.585 -15.4492 83.3555 -45.1895 160.639c-85.4004 -29.1348 -145.452 -87.5234 -167.579 -132.756zM374.357 16.0752c47.5215 32.1338 81.3525 83.0371 90.7949 141.978
+c-7.24707 2.28711 -65.5674 19.6816 -131.947 9.05566c27.7061 -76.1367 38.9805 -138.147 41.1523 -151.033z" />
+    <glyph glyph-name="skype" unicode="&#xf17e;" 
+d="M424.7 148.2c14.5996 -18.9004 23.2998 -42.5 23.2002 -68.1006c0 -61.7998 -50.2002 -112 -112 -112c-25.6006 0 -49.2002 8.7002 -68.2002 23.3008c-14.1006 -3 -28.9004 -4.7002 -43.7998 -4.7002c-113.4 0 -205.301 91.7998 -205.301 205.3
+c0 14.9004 1.80078 29.7998 4.7002 43.7998c-14.5996 18.9004 -23.2998 42.5 -23.2998 68.2002c0 61.7998 50.2002 112 112 112c25.7002 0 49.2998 -8.7002 68.2998 -23.4004c14.1006 3 28.9004 4.7002 43.7998 4.7002c113.4 0 205.301 -91.7998 205.301 -205.3
+c0 -14.9004 -1.80078 -29.7998 -4.7002 -43.7998zM230.1 56.7002c54.9004 0 112 27.3994 112 86.5c0 50.7998 -49.2998 68.2998 -90.6992 77.5996c-48.3008 11.2002 -69.1006 13.2002 -69.1006 33c0 15.5 16.2998 22.5 42 22.5c45.7998 0 46.7002 -33.5 75 -33.5
+c18.9004 0 30.2998 14.9004 30.2998 31.7998c0 33.5 -55.6992 55.4004 -110.8 55.4004c-50.5 0 -109.1 -21.9004 -109.1 -81.0996c0 -65.2002 55.2998 -71.8008 117.8 -87.2002c26 -6.40039 42 -9.2998 42 -28c0 -14.9004 -16.5996 -26.2998 -42.2998 -26.2998
+c-54 0 -56.9004 44.8994 -88.1006 44.8994c-20.5 0 -29.5 -14.5996 -29.5 -30.5996c0 -35.7998 54.9004 -65 120.5 -65z" />
+    <glyph glyph-name="foursquare" unicode="&#xf180;" horiz-adv-x="368" 
+d="M323.1 445c40 0 50.7002 -22.7998 42.2002 -65.2002l-48.5996 -243c-3.7002 -14.5 -9.2002 -39.7002 -44.2998 -39.7002h-83.4004c-3.40039 0 -3.7002 0.300781 -6.7998 -3.09961c0 0 -2.2002 -2.5 -131.101 -151.9
+c-10.0996 -11.6992 -26.6992 -9.59961 -32.8994 -7.09961c-6.10059 2.40039 -18.2002 9.7998 -18.2002 30.0996v433.801c0 17.7998 12.4004 46.0996 49.9004 46.0996h273.199zM306.8 371.2c2.10059 9.7998 -5.2998 17.5 -13.5 17.5h-219
+c-9.7998 0 -16.5996 -8.90039 -16.5996 -16.6006v-338.8c0 -0.899414 0.899414 -1.2002 1.7998 -0.299805c80.5996 96.9004 89.5 108.3 89.5 108.3c9.2998 10.7998 13 12.6006 26.5 12.6006h73.5c10.0996 0 16 8.59961 16.9004 13.5
+c0.899414 5 9.59961 49.8994 11.3994 58.7998c1.7998 9 -6.5 18.2002 -14.7998 18.2002h-90.4004c-12 0 -20.5996 8.59961 -20.5996 20.5996v13c0 12 8.59961 20.2998 20.5996 20.2998h106.4c7.40039 0 15.7002 6.7002 16.9004 13.2002z" />
+    <glyph glyph-name="trello" unicode="&#xf181;" 
+d="M392.3 416c30.7998 -0.200195 55.7002 -25.2002 55.6006 -56v-336c0 -30.7998 -24.9004 -55.7998 -55.7002 -56h-336.2c-30.9004 0 -56 25.0996 -56 56c0 340 -0.0996094 336 0 336c0 30.9004 25.0996 56 56.0996 56h336.2zM197 76.7002h0.0996094v254.2
+c0 14.8994 -12.0996 26.8994 -26.8994 26.8994h-82.9004c-14.8994 0 -26.8994 -12.0996 -26.8994 -26.8994v-254.2c0.0996094 -14.7998 12.1992 -26.7002 27 -26.6006h82.6992c14.8008 0 26.7002 11.9004 26.9004 26.6006zM390.1 188.7v142.1
+c0 14.9004 -12.0996 26.9004 -26.8994 26.9004h-81.1006c-14.7998 0 -26.7998 -12.1006 -26.7998 -26.9004v-142.1c0 -14.9004 12.1006 -26.9004 26.9004 -26.9004h81c14.8994 0 26.8994 12.1006 26.8994 26.9004z" />
+    <glyph glyph-name="gratipay" unicode="&#xf184;" horiz-adv-x="496" 
+d="M248 440c136.9 0 248 -111.1 248 -248s-111.1 -248 -248 -248s-248 111.1 -248 248s111.1 248 248 248zM362.6 213.6c8.80078 12 19.1006 50.4004 -13.7998 72c-27.7002 18.1006 -54.2002 4.2002 -68.0996 -11.8994c-15.1006 -16.9004 -45.7998 -17.9004 -61.7002 0
+c-13.9004 16.0996 -40.4004 30 -68.5 11.8994c-32.7002 -21.5996 -22.2998 -60.0996 -13.5996 -72l112.699 -152.699z" />
+    <glyph glyph-name="vk" unicode="&#xf189;" horiz-adv-x="576" 
+d="M545 330.3c-7.40039 -34.2998 -79.2998 -135.5 -79.4004 -135.6c-6.19922 -10 -8.69922 -15 0 -26.2002c3.40039 -4.7998 79.1006 -76.5996 90.3008 -111.5c4.89941 -16.5996 -3.60059 -25 -20.4004 -25h-58.9004c-22.3994 0 -29 17.9004 -69 57.9004
+c-35 33.6992 -50 38.0996 -58.6992 38.0996c-18.8008 0 -15.4004 -6.2998 -15.4004 -73.0996c0 -14.5 -4.59961 -22.9004 -42.0996 -22.9004c-62.4004 0 -131 37.9004 -179.7 107.8c-73.1006 102.4 -93.1006 179.9 -93.1006 195.5c0 8.7998 3.40039 16.7002 20.2002 16.7002
+h58.9004c15.0996 0 20.7998 -6.59961 26.5996 -22.9004c28.7998 -84 77.4004 -157.399 97.4004 -157.399c7.5 0 10.8994 3.5 10.8994 22.5v86.7998c-2.19922 40 -23.3994 43.2998 -23.3994 57.5c0 6.5 5.59961 13.5 15 13.5h92.5996
+c12.4004 0 16.6006 -6.7002 16.6006 -21.7002v-116.7c0 -12.5 5.69922 -16.8994 9.39941 -16.8994c7.5 0 13.7998 4.39941 27.5 18.0996c42.4004 47.4004 72.4004 120.5 72.4004 120.5c3.7002 8.7998 10.5996 16.7002 25.5996 16.7002h58.9004
+c17.7998 0 21.5 -9.2002 17.7998 -21.7002z" />
+    <glyph glyph-name="weibo" unicode="&#xf18a;" horiz-adv-x="512" 
+d="M407 270.4c7.59961 24 -13.4004 46.7998 -37.4004 41.6992c-22 -4.7998 -28.7998 28.1006 -7.09961 32.8008c50.0996 10.8994 92.2998 -37.1006 76.5 -84.8008c-6.7998 -21.1992 -38.7998 -10.7998 -32 10.3008zM214.8 1.2998c-106.3 0 -214.8 51.4004 -214.8 136.3
+c0 44.3008 28 95.4004 76.2998 143.7c99.7002 99.7002 203.2 100.9 173.601 5.7002c-4 -13.0996 12.2998 -5.7002 12.2998 -6c79.5 33.5996 140.5 16.7998 114 -51.4004c-3.7002 -9.39941 1.09961 -10.8994 8.2998 -13.0996c135.7 -42.2998 34.7998 -215.2 -169.7 -215.2z
+M358.5 147.6c-5.40039 55.7002 -78.5 94 -163.4 85.7002c-84.7998 -8.59961 -148.8 -60.2998 -143.399 -116c5.39941 -55.7002 78.5 -94 163.399 -85.7002c84.8008 8.60059 148.801 60.3008 143.4 116zM347.9 412.9c102.3 21.5996 189.3 -74.5 157.399 -174.301
+c-8.2998 -25 -44.7998 -12.1992 -37.3994 12c23.0996 71.2002 -39.4004 139.2 -111.7 124c-25.1006 -5.39941 -34.2002 32.7002 -8.2998 38.3008zM269.4 101.9c-17.1006 -38.8008 -66.8008 -60 -109.101 -46.3008c-40.7998 13.1006 -58 53.4004 -40.2998 89.7002
+c17.7002 35.4004 63.0996 55.4004 103.4 45.1006c42 -10.8008 63.0996 -50.2002 46 -88.5zM183.1 131.9c-12.8994 5.39941 -30 -0.300781 -38 -12.9004c-8.2998 -12.9004 -4.2998 -28 8.60059 -34c13.0996 -6 30.7998 -0.299805 39.0996 12.9004
+c8 13.0996 3.7002 28.2998 -9.7002 34zM215.7 145.3c-5.10059 1.7002 -11.4004 -0.599609 -14.2998 -5.39941c-2.90039 -5.10059 -1.40039 -10.6006 3.69922 -12.9004c5.10059 -2 11.7002 0.299805 14.6006 5.40039c2.7998 5.19922 1.09961 10.8994 -4 12.8994z" />
+    <glyph glyph-name="renren" unicode="&#xf18b;" horiz-adv-x="512" 
+d="M214 278.9c0 -110.4 -61 -205.4 -147.6 -247.4c-36.4004 43.2998 -58.4004 98.7998 -58.4004 159.9c0 122.699 89.0996 224.399 206 244.1v-156.6zM255 -56c-42.9004 0 -83.2998 11 -118.5 30.4004c57.2002 36.0996 103.4 90.6992 118.5 154.6
+c15.5 -63.9004 61.7002 -118.5 118.8 -154.7c-35.0996 -19.2998 -75.5 -30.2998 -118.8 -30.2998zM445.6 31.5c-86.5996 42 -147.6 136.9 -147.6 247.4v156.6c116.9 -19.7002 206 -121.4 206 -244.1c0 -61.1006 -22 -116.601 -58.4004 -159.9z" />
+    <glyph glyph-name="pagelines" unicode="&#xf18c;" horiz-adv-x="384" 
+d="M384 135.3c-55.0996 -136.7 -187.1 -54 -187.1 -54c-40.5 -81.7998 -107.4 -134.399 -184.601 -134.7c-16.0996 0 -16.5996 24.4004 0 24.4004c64.4004 0.299805 120.5 42.7002 157.2 110.1c-41.0996 -15.8994 -118.6 -27.8994 -161.6 82.2002
+c109 44.9004 159.1 -11.2002 178.3 -45.5c9.89941 24.4004 17 50.9004 21.5996 79.7002c0 0 -139.7 -21.9004 -149.5 98.0996c119.101 47.9004 152.601 -76.6992 152.601 -76.6992c1.59961 16.6992 3.2998 52.5996 3.2998 53.3994c0 0 -106.3 73.7002 -38.1006 165.2
+c124.601 -43 61.4004 -162.4 61.4004 -162.4c0.5 -1.59961 0.5 -23.7998 0 -33.3994c0 0 45.2002 89 136.4 57.5c-4.2002 -134 -141.9 -106.4 -141.9 -106.4c-4.40039 -27.3994 -11.2002 -53.3994 -20 -77.5c0 0 83 91.7998 172 20z" />
+    <glyph glyph-name="stack-exchange" unicode="&#xf18d;" 
+d="M17.7002 115.7h412.7v-22c0 -37.7002 -29.3008 -68 -65.3008 -68h-19l-86.7998 -89.7002v89.7002h-176.3c-36 0 -65.2998 30.2998 -65.2998 68v22zM17.7002 139.3v85h412.7v-85h-412.7zM17.7002 248.7v85h412.7v-85h-412.7zM365 448
+c36 0 65.2998 -30.2998 65.4004 -67.7002v-22.2998h-412.7v22.2998c0 37.4004 29.2998 67.7002 65.2998 67.7002h282z" />
+    <glyph glyph-name="vimeo-square" unicode="&#xf194;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM383.8 266.4c1.90039 41.5996 -13.5996 63 -46.5 64c-44.2998 1.39941 -74.3994 -23.6006 -90.0996 -75.1006
+c19.5996 8.40039 48.5996 10.6006 45.2002 -22.2002c-0.900391 -11.0996 -8.10059 -27.0996 -21.5 -48.2998c-37.2002 -58.7002 -46.3008 -39.0996 -66.8008 90.5c-5.7998 36.5 -21.0996 53.5 -46 51.1006c-22 -2 -57.1992 -38 -94.0996 -70.4004l15 -19.4004
+c14.2998 10.1006 22.7002 15.1006 25.0996 15.1006c20.8008 0 31.5 -54.1006 56.7002 -146.4c12.9004 -34.3994 28.6006 -51.5996 47.2998 -51.5996c30.1006 0 66.9004 28.2998 110.4 84.7998c42.0996 54.0996 63.9004 96.7998 65.2998 127.9z" />
+    <glyph glyph-name="slack" unicode="&#xf198;" 
+d="M94.1201 132.9c0 -25.9004 -21.1602 -47.0605 -47.0605 -47.0605c-25.8994 0 -47.0596 21.1602 -47.0596 47.0605c0 25.8994 21.1602 47.0596 47.0596 47.0596h47.0605v-47.0596zM117.84 132.9c0 25.8994 21.1602 47.0596 47.0605 47.0596
+c25.8994 0 47.0596 -21.1602 47.0596 -47.0596v-117.841c0 -25.8994 -21.1602 -47.0596 -47.0596 -47.0596c-25.9004 0 -47.0605 21.1602 -47.0605 47.0596v117.841zM164.9 321.88c-25.9004 0 -47.0605 21.1602 -47.0605 47.0605c0 25.8994 21.1602 47.0596 47.0605 47.0596
+c25.8994 0 47.0596 -21.1602 47.0596 -47.0596v-47.0605h-47.0596zM164.9 298.16c25.8994 0 47.0596 -21.1602 47.0596 -47.0605c0 -25.8994 -21.1602 -47.0596 -47.0596 -47.0596h-117.841c-25.8994 0 -47.0596 21.1602 -47.0596 47.0596
+c0 25.9004 21.1602 47.0605 47.0596 47.0605h117.841zM353.88 251.1c0 25.9004 21.1602 47.0605 47.0605 47.0605c25.8994 0 47.0596 -21.1602 47.0596 -47.0605c0 -25.8994 -21.1602 -47.0596 -47.0596 -47.0596h-47.0605v47.0596zM330.16 251.1
+c0 -25.8994 -21.1602 -47.0596 -47.0605 -47.0596c-25.8994 0 -47.0596 21.1602 -47.0596 47.0596v117.841c0 25.8994 21.1602 47.0596 47.0596 47.0596c25.9004 0 47.0605 -21.1602 47.0605 -47.0596v-117.841zM283.1 62.1201c25.9004 0 47.0605 -21.1602 47.0605 -47.0605
+c0 -25.8994 -21.1602 -47.0596 -47.0605 -47.0596c-25.8994 0 -47.0596 21.1602 -47.0596 47.0596v47.0605h47.0596zM283.1 85.8398c-25.8994 0 -47.0596 21.1602 -47.0596 47.0605c0 25.8994 21.1602 47.0596 47.0596 47.0596h117.841
+c25.8994 0 47.0596 -21.1602 47.0596 -47.0596c0 -25.9004 -21.1602 -47.0605 -47.0596 -47.0605h-117.841z" />
+    <glyph glyph-name="wordpress" unicode="&#xf19a;" horiz-adv-x="512" 
+d="M61.7002 278.6l101.5 -278c-71 34.4004 -119.9 107.2 -119.9 191.4c0 30.9004 6.60059 60.0996 18.4004 86.5996zM399.6 202.7c0 -18.2002 -7 -39.2998 -16 -68.7002l-21.1992 -70.9004l-76.9004 228.7c12.7998 0.700195 24.2998 2 24.2998 2
+c11.4004 1.2998 10.1006 18.2002 -1.39941 17.5c0 0 -34.5 -2.7002 -56.7002 -2.7002c-20.9004 0 -56 2.7002 -56 2.7002c-11.4004 0.700195 -12.7998 -16.7998 -1.2998 -17.5c0 0 10.7998 -1.2998 22.2998 -2l33.0996 -90.7998l-46.5996 -139.6l-77.5 230.399
+c12.7998 0.700195 24.2998 2 24.2998 2c11.4004 1.2998 10.0996 18.2002 -1.40039 17.5c0 0 -34.5 -2.7002 -56.6992 -2.7002c-4 0 -8.7002 0.100586 -13.7002 0.300781c38.0996 57.7998 103.5 95.8994 177.8 95.8994c55.4004 0 105.8 -21.2002 143.7 -55.8994
+c-1 0.0996094 -1.90039 0.199219 -2.7998 0.199219c-20.9004 0 -35.7002 -18.1992 -35.7002 -37.7998c0 -17.5 10.0996 -32.3994 20.8994 -49.8994c8.10059 -14.2002 17.5 -32.4004 17.5 -58.7002zM259.7 173.4l65.3994 -179.2c0.400391 -1 0.900391 -2 1.5 -2.90039
+c-22.0996 -7.7998 -45.7998 -12.0996 -70.5996 -12.0996c-20.9004 0 -41 3.09961 -60.0996 8.7002zM442.7 294.1c16.5996 -30.2998 26 -65.0996 26 -102.1c0 -78.5 -42.5 -147 -105.8 -183.9l65 187.9c12.1992 30.4004 16.1992 54.5996 16.1992 76.2002
+c0 7.89941 -0.5 15.0996 -1.39941 21.8994zM504 192c0 -136.8 -111.3 -248 -248 -248c-136.8 0 -248 111.3 -248 248c0 136.8 111.2 248 248 248c136.7 0 248 -111.2 248 -248zM492.6 192c0 130.5 -106.199 236.6 -236.6 236.6c-130.5 0 -236.6 -106.1 -236.6 -236.6
+s106.199 -236.6 236.6 -236.6c130.5 0 236.6 106.1 236.6 236.6z" />
+    <glyph glyph-name="openid" unicode="&#xf19b;" 
+d="M271.5 16l-68 -32c-115 10.2998 -203.5 71.5 -203.5 145.8c0 71.5 82.5 131 191.7 144.3v-43c-71.5 -12.5 -124 -53 -124 -101.3c0 -51 58.5 -93.2998 135.7 -103v340l68 33.2002v-384h0.0996094zM448 157l-131.3 28.5l36.7998 20.7002c-19.5 11.5 -43.5 20 -70 24.7998
+v43c46.2002 -5.5 87.7002 -19.5 120.3 -39.2998l35 19.7998z" />
+    <glyph glyph-name="yahoo" unicode="&#xf19e;" horiz-adv-x="512" 
+d="M223.69 306.94h93.5791l-140.909 -338.94h-94.1699l38.5693 89.8096l-105.83 249.131h96.0703l56 -143.171zM329.09 171.15c32.1328 0 58.2197 -26.0879 58.2197 -58.2207c0 -32.1318 -26.0869 -58.2197 -58.2197 -58.2197s-58.2197 26.0879 -58.2197 58.2197
+c0 32.1328 26.0869 58.2207 58.2197 58.2207zM394.65 416h104.42l-92.6299 -223.47h-104.79z" />
+    <glyph glyph-name="google" unicode="&#xf1a0;" horiz-adv-x="488" 
+d="M488 186.2c0 -141.5 -96.9004 -242.2 -240 -242.2c-137.2 0 -248 110.8 -248 248s110.8 248 248 248c66.7998 0 123 -24.5 166.3 -64.9004l-67.5 -64.8994c-88.2998 85.2002 -252.5 21.2002 -252.5 -118.2c0 -86.5 69.1006 -156.6 153.7 -156.6
+c98.2002 0 135 70.3994 140.8 106.899h-140.8v85.2998h236.1c2.30078 -12.6992 3.90039 -24.8994 3.90039 -41.3994z" />
+    <glyph glyph-name="reddit" unicode="&#xf1a1;" horiz-adv-x="512" 
+d="M201.5 142.5c-13.7998 0 -24.9004 11.0996 -24.9004 24.5996c0 13.8008 11.1006 24.9004 24.9004 24.9004c13.5996 0 24.5996 -11.0996 24.5996 -24.9004c0 -13.5996 -11.0996 -24.5996 -24.5996 -24.5996zM504 192c0 -137 -111 -248 -248 -248s-248 111 -248 248
+s111 248 248 248s248 -111 248 -248zM371.7 233.2c-9.40039 0 -17.7002 -3.90039 -23.7998 -10c-22.4004 15.5 -52.6006 25.5 -86.1006 26.5996l17.4004 78.2998l55.3994 -12.5c0 -13.5996 11.1006 -24.5996 24.6006 -24.5996c13.7998 0 24.8994 11.2998 24.8994 24.9004
+c0 13.5996 -11.0996 24.8994 -24.8994 24.8994c-9.7002 0 -18 -5.7998 -22.1006 -13.7998l-61.1992 13.5996c-3 0.800781 -6.10059 -1.39941 -6.90039 -4.39941l-19.0996 -86.4004c-33.2002 -1.39941 -63.1006 -11.2998 -85.5 -26.7998
+c-6.10059 6.40039 -14.7002 10.2002 -24.1006 10.2002c-34.8994 0 -46.2998 -46.9004 -14.3994 -62.7998c-1.10059 -5 -1.7002 -10.2002 -1.7002 -15.5c0 -52.6006 59.2002 -95.2002 132 -95.2002c73.0996 0 132.3 42.5996 132.3 95.2002
+c0 5.2998 -0.599609 10.7998 -1.90039 15.7998c31.3008 16 19.8008 62.5 -14.8994 62.5zM302.8 117c2.2002 2.2002 6.10059 2.2002 8.2998 0c2.5 -2.5 2.5 -6.40039 0 -8.59961c-22.8994 -22.8008 -87.3994 -22.8008 -110.199 0c-2.5 2.19922 -2.5 6.09961 0 8.59961
+c2.19922 2.2002 6.09961 2.2002 8.2998 0c17.5 -17.9004 75.3994 -18.2002 93.5996 0zM310.5 192c13.9004 0 24.9004 -11.0996 24.9004 -24.9004c0 -13.5 -11.1006 -24.5996 -24.9004 -24.5996c-13.5 0 -24.5996 11 -24.5996 24.5996c0 13.8008 11 24.9004 24.5996 24.9004z
+" />
+    <glyph glyph-name="reddit-square" unicode="&#xf1a2;" 
+d="M283.2 102.5c2.7002 -2.7002 2.7002 -6.7998 0 -9.2002c-24.5 -24.5 -93.7998 -24.5996 -118.4 0c-2.7002 2.40039 -2.7002 6.5 0 9.2002c2.40039 2.40039 6.5 2.40039 8.90039 0c18.7002 -19.2002 81 -19.5996 100.5 0c2.39941 2.2998 6.59961 2.2998 9 0zM191.9 156.3
+c0 -14.5996 -11.9004 -26.5 -26.5 -26.5c-14.9004 0 -26.8008 11.9004 -26.8008 26.5c0 14.9004 11.9004 26.7998 26.8008 26.7998c14.5996 0 26.5 -11.8994 26.5 -26.7998zM282.6 183.1c14.9004 0 26.8008 -11.8994 26.8008 -26.7998
+c0 -14.5996 -11.9004 -26.5 -26.8008 -26.5c-14.5996 0 -26.5 11.9004 -26.5 26.5c0 14.9004 11.9004 26.7998 26.5 26.7998zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48zM348.3 227.4
+c-10.0996 0 -19 -4.2002 -25.5996 -10.7002c-24.1006 16.7002 -56.5 27.3994 -92.5 28.5996l18.7002 84.2002l59.5 -13.4004c0 -14.5996 11.8994 -26.5 26.5 -26.5c14.8994 0 26.7998 12.2002 26.7998 26.8008c0 14.5996 -11.9004 26.7998 -26.7998 26.7998
+c-10.4004 0 -19.3008 -6.2002 -23.8008 -14.9004l-65.6992 14.6006c-3.30078 0.899414 -6.5 -1.5 -7.40039 -4.80078l-20.5 -92.7998c-35.7002 -1.5 -67.7998 -12.2002 -91.9004 -28.8994c-6.5 6.7998 -15.7998 11 -25.8994 11c-37.5 0 -49.7998 -50.4004 -15.5 -67.5
+c-1.2002 -5.40039 -1.7998 -11 -1.7998 -16.7002c0 -56.5 63.6992 -102.3 141.899 -102.3c78.5 0 142.2 45.7998 142.2 102.3c0 5.7002 -0.599609 11.5996 -2.09961 17c33.5996 17.2002 21.1992 67.2002 -16.1006 67.2002z" />
+    <glyph glyph-name="stumbleupon-circle" unicode="&#xf1a3;" horiz-adv-x="496" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM256 262.5c9.7998 0 17.7998 -8 17.7002 -17.5996v-20.6006l22.8994 -10.7002l34.1006 10.1006v23.7002c0 40.2998 -34 72.5996 -74.7002 72.5996
+c-40.5 0 -74.7002 -32.0996 -74.7002 -72.0996v-108.4c0 -9.90039 -8 -17.7998 -17.7998 -17.7998s-17.7998 7.7998 -17.7998 17.7998v45.7998h-57.2998v-46.5c0 -41.3994 33.5 -74.8994 74.8994 -74.8994c41 0 74.9004 33 74.9004 73.8994v106.9
+c0 9.7998 8 17.7998 17.7998 17.7998zM423.6 138.9c0 0 0 0.5 0.100586 46.3994h-57.2998v-48c0 -9.7002 -8 -17.5996 -17.8008 -17.5996c-9.7998 0 -17.7998 7.7998 -17.7998 17.5996v47.1006l-34.0996 -10.1006l-22.9004 10.7002v-46.7998
+c0 -41 33.7002 -74.2002 74.9004 -74.2002c41.3994 0 74.8994 33.5 74.8994 74.9004z" />
+    <glyph glyph-name="stumbleupon" unicode="&#xf1a4;" horiz-adv-x="512" 
+d="M502.9 182v-69.7002c0 -62.0996 -50.3008 -112.399 -112.4 -112.399c-61.7998 0 -112.4 49.7998 -112.4 111.3v70.2002l34.3008 -16l51.0996 15.1992v-70.5996c0 -14.7002 12 -26.5 26.7002 -26.5s26.7998 11.7998 26.7998 26.5v72h85.9004zM278.2 240.2v30.8994
+c0 14.7002 -12 26.7002 -26.7002 26.7002s-26.7002 -12 -26.7002 -26.7002v-160.3c0 -61.2998 -50.7998 -110.8 -112.399 -110.8c-62.1006 0 -112.4 50.2998 -112.4 112.3v69.7002h86v-68.5996c0 -14.9004 12 -26.7002 26.7002 -26.7002s26.7002 11.7998 26.7002 26.7002
+v162.399c0 60 51.2998 108.2 112.1 108.2c61 0 112.1 -48.5 112.1 -109v-35.5996l-51.0996 -15.2002z" />
+    <glyph glyph-name="delicious" unicode="&#xf1a5;" 
+d="M446.5 380c1 -3.7998 1.5 -7.90039 1.59961 -12v-352.1c0 -26.5 -21.5 -48 -48 -48h-352c-4.09961 0 -8.19922 0.5 -12 1.5c-7.69922 2 -14.5996 5.7998 -20.2998 11c-1.2002 1.09961 -2.2998 2.19922 -3.2998 3.2998c-5.2002 5.7002 -9 12.5996 -11 20.2998
+c-1 3.7998 -1.5 7.90039 -1.5 12v352c0 26.5 21.5 48 48 47.9004h352c4.09961 0 8.2002 -0.5 12 -1.5c1.90039 -0.400391 3.7002 -1 5.40039 -1.7002c1.89941 -0.700195 3.69922 -1.5 5.5 -2.5c1.39941 -0.700195 2.69922 -1.5 4 -2.40039
+c1.09961 -0.799805 2.19922 -1.59961 3.2998 -2.5c2.5 -2 4.7998 -4.2998 6.89941 -6.7998c1.7002 -2.09961 3.30078 -4.5 4.7002 -6.90039c1.2998 -2.2998 2.40039 -4.59961 3.2998 -7.09961c0.5 -1.5 1 -3 1.40039 -4.5zM416 16v176h-192v192h-176
+c-8.7998 0 -16 -7.2002 -16 -16v-176h192v-192h176c8.7998 0 16 7.2002 16 16z" />
+    <glyph glyph-name="digg" unicode="&#xf1a6;" horiz-adv-x="512" 
+d="M81.7002 275.7v76.2998h51v-250.7h-132.7v174.4h81.7002zM81.7002 142.3v92.2998h-30.7998v-92.2998h30.7998zM378.9 275.7h133.1v-243.7h-133.1v40.7998h81.7998v28.5h-81.7998v174.4zM460.7 142.3v92.2998h-30.7998v-92.2998h30.7998zM225.1 101.3v174.4h133.301
+v-243.7h-133.301v40.7998h82.1006v28.5h-82.1006zM276.3 234.6v-92.2998h30.7998v92.2998h-30.7998zM153.3 352h51.2998v-51h-51.2998v51zM153.3 275.7h51.2998v-174.4h-51.2998v174.4z" />
+    <glyph glyph-name="pied-piper-pp" unicode="&#xf1a7;" 
+d="M205.3 273.4c0 -21.1006 -14.2002 -38.1006 -31.7002 -38.1006c-7.09961 0 -12.7998 1.2002 -17.1992 3.7002v68c4.39941 2.7002 10.0996 4.2002 17.1992 4.2002c17.5 0 31.7002 -16.9004 31.7002 -37.7998zM257.9 206.4c17.3994 0 31.6992 -17 31.6992 -38.1006
+c0 -20.8994 -14.2998 -37.7998 -31.6992 -37.7998c-7.10059 0 -12.8008 1.2002 -17.2002 3.7002v68c4.39941 2.7002 10.0996 4.2002 17.2002 4.2002zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352
+c26.5 0 48 -21.5 48 -48zM185 192.9c41 0 74.2002 35.5996 74.2002 79.5996s-33.2002 79.5996 -74.2002 79.5996c-12 0 -24.0996 -3.19922 -34.5996 -8.7998h-45.7002v-206.3l51.7998 10.0996v50.6006c8.59961 -3.10059 18.0996 -4.7998 28.5 -4.7998zM343.4 167.6
+c0 44 -33.2002 79.6006 -73.9004 79.6006c-3.2002 0 -6.40039 -0.200195 -9.59961 -0.700195c-3.7002 -12.5 -10.1006 -23.7998 -19.2002 -33.4004c-13.7998 -15 -32.2002 -23.7998 -51.7998 -24.7998v-156.3l51.7998 10.0996v50.6006
+c8.59961 -3.2002 18.2002 -4.7002 28.7002 -4.7002c40.7998 0 74 35.5996 74 79.5996z" />
+    <glyph glyph-name="pied-piper-alt" unicode="&#xf1a8;" horiz-adv-x="576" 
+d="M244 202l-27.7002 -5.7002l-1.7002 4.90039c6.7002 0.5 12.7002 3.7002 19.3008 3.7002c3.7998 0 6.89941 -0.900391 10.0996 -2.90039zM379.9 4.09961c9.5 0 28.1992 -45.0996 33 -55.0996c-35.9004 -13.4004 -70.3008 -15.9004 -106 -9.7998l-6.90039 45.0996
+c15.7998 10.2998 60.9004 19.7998 79.9004 19.7998zM340.8 271c-7.59961 3.5 -63.8994 6.40039 -98.7998 -10c6.2998 11.7998 13.2002 17 25.9004 21.7998c27.2998 10.2998 40.1992 30.5 58.8994 51.1006c11.9004 -8.40039 12 -24.6006 31.6006 -23v-21.8008
+l6.2998 -0.299805c37.3994 14.4004 74.7002 30.2002 106.6 54.6006c48.2998 36.7998 52.9004 50 81.2998 100l2 2.59961c-0.599609 -14.0996 -6.2998 -27.2998 -12.3994 -39.9004c-30.5 -63.7998 -78.7002 -100.3 -146.8 -116.699
+c-12.4004 -2.90039 -26.4004 -3.2002 -37.6006 -8.90039c1.40039 -9.7998 13.2002 -18.0996 13.2002 -23c0 -3.40039 -5.5 -7.2002 -7.5 -8.59961c-11.2002 12.8994 -16.0996 19.2998 -22.7002 22.0996zM555.5 448l-0.299805 -1.40039l-0.600586 -0.599609
+l0.300781 0.900391zM496.3 65.9004c20.1006 -34.2002 43.7002 -54.3008 72.7002 -79.9004c-31 -19.2998 -70.4004 -32.2002 -103.5 -47.2002c-55.2002 46.2998 -23 229.9 -111.5 229.9c-3.5 -0.700195 -2.40039 -0.299805 -4.59961 -1.7002
+c1.09961 -1.40039 2.59961 -2.90039 3.69922 -4c23.9004 -20.0996 33.4004 -24.4004 34.8008 -58.5996l0.299805 -9.5c0.799805 -21.6006 -5.5 -42.5 -9.7998 -63.5c-25.9004 0.699219 -51.2002 -11 -77.9004 -2.90039c-0.700195 5.90039 -1.09961 30.9004 0.299805 41.0996
+c1.40039 9.5 33.6006 29.9004 33 43.7002c-5.5 0.600586 -9.2002 -2.59961 -12.3994 -6.89941c-13.3008 -19.5 -47.2002 -41.9004 -71.3008 -41.9004c-16.5996 0 -56.2998 71.5 -76.3994 85.9004c-3.2002 2.2998 -5.2002 5.39941 -7.7998 8.59961
+c-16.1006 -3.7998 -139.4 -32.2002 -147.4 -32.2002c-6 0 -11.5 4.90039 -11.5 10.9004c0 5.5 3.40039 10.7002 8.90039 11.7998l139.6 30.4004c-9.5 17.1992 12.2998 17.5 21.5 20.0996c3.2002 0.799805 6.2998 4 9.5 4c6.2998 0 11.7998 -8.90039 13.7998 -14.0996
+c6.2998 1.39941 45.7002 10.5996 49.4004 10.5996c15.2002 0 15.8994 -20.0996 2.89941 -22.7002l-52.2998 -11.5l-0.299805 -4.59961c-0.299805 -10.1006 45.4004 -60.1006 53.4004 -60.1006c18.0996 0 54.8994 41.7002 54.8994 60.1006
+c0 30.7002 -42.7998 12.5996 -42.7998 33.5996c0 3.5 1.2002 6.60059 2.90039 9.7998l-19.5 5.5c13.0996 13.6006 13.7998 31.7002 10.8994 50.3008c14.7002 2.89941 26.7002 4.59961 41.4004 4.59961c56.8994 0 45.7002 -8.59961 65.5 -54.2998l14.3994 7.2002
+c-2.2998 -34.2002 -36.1992 -17.5 -35.0996 -31l0.299805 -6c74.7002 2.89941 116.101 -58.6006 150 -115.5zM300.1 19.7998h8.90039l2.90039 -23.7998l-11.8008 -3.40039v27.2002zM231.4 170.2l13.7998 3.5l31.2998 -50.9004l-21 -13.7998zM315.8 15.2998
+c22.6006 2.5 32.7002 6.2998 59.5 6.2998c0.299805 -1.39941 0.900391 -3.19922 0.900391 -4.59961c0 -7.5 -49.4004 -12.5996 -58.4004 -14.0996z" />
+    <glyph glyph-name="drupal" unicode="&#xf1a9;" 
+d="M319.5 333.3c13.5 -8.2998 96.5 -67 96.5 -179.3c0 -112 -88.5 -186 -190.2 -186c-102 0 -193.8 80.2998 -193.8 189.5c0 109 85 167.5 100.8 175.8c18.7002 10.1006 32.2002 15.2998 53.5 32.2998c10.5 8.30078 19.2998 20.2002 22 49.5
+c15.2002 -18.2998 33.5 -39.5 46.5 -48.2998c21.2002 -14 42.5 -19.5 64.7002 -33.5zM322 7.7002c4.2002 4.2002 1.90039 13.0996 -4.2002 8.5c-8.5 -6.2998 -27.5 -14 -54.5 -14c-34.5 0 -51.5 13.2998 -51.5 13.2998c-6.2002 0 -11.2998 -7.2002 -6.5 -12
+c26.6006 -24.5 96.6006 -15.9004 116.7 4.2002zM267.5 60.2998c-6.5 -2.7002 -28.4004 -16.7998 -22.4004 -25c2.40039 -3.2998 5.2002 -1.2998 12.2002 4.7002c7.2002 5.7998 12 11 26.7002 11c25.2998 0 18.0996 -19.9004 26.5 -15.7002
+c9.90039 4.90039 -2.09961 20.9004 -6.2002 23.7002c-7.7998 5.09961 -28.0996 4.90039 -36.7998 1.2998zM360 43c39.0996 -3.2998 64.5 106 15.7998 106c-20 0 -60.5 -41.5 -81.7998 -41.7998c-24.7002 -0.5 -59 49 -108.5 48.5
+c-66.4004 -0.400391 -90.5996 -78.6006 -51.7998 -105.2c57.2002 -38.7002 130.399 42.9004 161.3 42c19.5 -0.700195 49.7998 -48.5 65 -49.5z" />
+    <glyph glyph-name="joomla" unicode="&#xf1aa;" 
+d="M0.599609 355.9c0 33.2998 26.8008 60.0996 59.8008 60.0996c30 0 54.5 -21.9004 59.1992 -50.2002c32.6006 7.60059 67.1006 -0.599609 96.5 -30l-44.2998 -44.2998c-20.5 20.5 -42.5996 16.2998 -55.3994 3.5c-14.3008 -14.2998 -14.3008 -37.9004 0 -52.2002
+l99.5 -99.5l-44 -44.2998c-87.7002 87.2002 -49.7002 49.7002 -99.8008 99.7002c-26.7998 26.5 -35 64.7998 -24.7998 98.8994c-26.8994 5.80078 -46.7002 29.7002 -46.7002 58.3008zM130.1 239.5c28.5 28.4004 81.3008 80.7998 99.6006 99.9004
+c26.5996 26.5996 64.5 35 98.2998 25.0996c4.09961 29.0996 29.2002 51.5996 59.5 51.5996c33 0 59.7998 -26.8994 59.7998 -60.0996c0 -30.2998 -22.7002 -55.4004 -51.8994 -59.5c9.59961 -33.5996 2.2998 -70 -28.9004 -101.2l-44 44.2998
+c20.5 20.4004 16.2998 42.6006 3.5 55.4004c-14.2998 14.2998 -37.5996 14.2998 -51.9004 0c-10 -10.0996 -89.6992 -89.7998 -99.6992 -99.7998zM396.4 87.2998c29.0996 -4.09961 51.5996 -28.8994 51.5996 -59.0996c0 -33.2998 -26.7998 -60.1006 -59.7998 -60.1006
+c-29.2002 0 -53.4004 20.7002 -58.9004 48.1006c-34.7002 -10.7998 -75.0996 -2.2002 -102.7 28l44 44.2998c20.4004 -20.5 42.6006 -16.2998 55.4004 -3.5c14.2998 14.2998 14.2998 37.5996 0 51.9004l-99.7002 99.6992l44.2998 44.3008
+c104.5 -104.4 87.7002 -87.5 99.5 -99.7002c25.4004 -25.4004 34.5 -61.2002 26.3008 -93.9004zM312.1 140.4c-87.2998 -87.3008 -67.3994 -67.7002 -99.5 -99.7002c-25.6992 -25.4004 -61.5 -34.2002 -94.1992 -26c-6.10059 -26.9004 -30 -46.7002 -58.6006 -46.7002
+c-33 0 -59.7998 26.7998 -59.7998 60.0996c0 28.3008 19.5 52.2002 46.2002 58.2002c-8.5 33.1006 -0.700195 68.1006 29.5 98.2998l44 -44.2998c-20.1006 -20.0996 -16.2998 -42 -3.2002 -55.3994c14.2998 -14.3008 37.5996 -14.3008 51.9004 0
+c49.2998 49.3994 12.6992 13.3994 99.6992 99.7998z" />
+    <glyph glyph-name="behance" unicode="&#xf1b4;" horiz-adv-x="576" 
+d="M232 210.8c43.5996 -12.2998 64.7002 -45.2002 64.7002 -89.7002c0 -72 -60.5 -102.899 -124.9 -102.899h-171.8v354.399h167.1c60.7002 0 113.301 -17.1992 113.301 -87.7998c0 -35.7998 -16.6006 -58.7998 -48.4004 -74zM77.9004 312.1v-82.6992h79
+c27.7998 0 47.5 12.0996 47.5 42.1992c0 32.6006 -25.3008 40.5 -53.4004 40.5h-73.0996zM161.2 78.4004c31.7002 0 57.5996 11.1992 57.5996 47c0 36.2998 -21.7002 50.5996 -56 50.5996h-84.8994v-97.5996h83.2998zM519.7 319.1h-143.7v34.9004h143.7v-34.9004zM576 142.8
+c0 -4.5 -0.299805 -9 -0.599609 -13.2002h-185.101c0 -41.0996 21.7002 -65.2998 63 -65.2998c21.4004 0 49 11.6006 55.7002 33.5h62.2002c-19.1006 -58.7002 -58.7998 -86.2998 -120.101 -86.2998c-81 0 -131.3 54.7998 -131.3 134.7c0 77 53.1006 135.8 131.3 135.8
+c80.5 0 124.9 -63.2998 124.9 -139.2zM390.4 174h114.699c-3 34 -20.7998 54.7998 -56.1992 54.7998c-33.8008 0 -56.2002 -21.0996 -58.5 -54.7998z" />
+    <glyph glyph-name="behance-square" unicode="&#xf1b5;" 
+d="M186.5 155c0 -19.2998 -14 -25.4004 -31.2002 -25.4004h-45.0996v52.9004h46c18.5996 -0.0996094 30.2998 -7.7998 30.2998 -27.5zM178.8 237.3c0 -16.2998 -10.7002 -22.8994 -25.7998 -22.8994h-42.7002v44.7998h39.6006c15.1992 0 28.8994 -4.2002 28.8994 -21.9004z
+M311.1 214.1c19.2002 0 28.8008 -11.1992 30.5 -29.6992h-62.1992c1.19922 18.2998 13.3994 29.6992 31.6992 29.6992zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48zM271.7 263h77.7998
+v18.9004h-77.7998v-18.9004zM228.7 152.7c0 24.0996 -11.4004 44.8994 -35 51.5996c17.2002 8.2002 26.2002 17.7002 26.2002 37c0 38.2002 -28.5 47.5 -61.4004 47.5h-90.5v-192h93.0996c34.9004 0.200195 67.6006 16.9004 67.6006 55.9004zM380 167.5
+c0 41.0996 -24.0996 75.4004 -67.5996 75.4004c-42.4004 0 -71.1006 -31.8008 -71.1006 -73.6006c0 -43.2998 27.2998 -73 71.1006 -73c33.1992 0 54.6992 14.9004 65.0996 46.7998h-33.7002c-3.7002 -11.8994 -18.5996 -18.0996 -30.2002 -18.0996
+c-22.3994 0 -34.0996 13.0996 -34.0996 35.2998h100.2c0.0996094 2.2998 0.299805 4.7998 0.299805 7.2002z" />
+    <glyph glyph-name="steam" unicode="&#xf1b6;" horiz-adv-x="496" 
+d="M496 192c0 -137 -111.2 -248 -248.4 -248c-113.8 0 -209.6 76.2998 -239 180.4l95.2002 -39.3008c6.40039 -32.0996 34.9004 -56.3994 68.9004 -56.3994c39.2002 0 71.8994 32.3994 70.2002 73.5l84.5 60.2002c52.0996 -1.30078 95.7998 40.8994 95.7998 93.5
+c0 51.5996 -42 93.5 -93.7002 93.5s-93.7002 -42 -93.7002 -93.5v-1.2002l-59.2002 -85.7002c-15.5 0.900391 -30.6992 -3.40039 -43.5 -12.0996l-133.1 55c10.2002 127.699 117.1 228.1 247.6 228.1c137.2 0 248.4 -111 248.4 -248zM155.7 63.7002
+c19.7998 -8.2002 42.5 1.09961 50.7998 21c8.2998 19.7998 -1.09961 42.5 -20.9004 50.7002l-31.5 13c12.2002 4.59961 26 4.7998 38.9004 -0.600586c13 -5.39941 23.0996 -15.5996 28.5 -28.5996s5.2998 -27.2998 -0.0996094 -40.2998
+c-11.2002 -26.8008 -42.1006 -39.6006 -69 -28.4004c-11.9453 4.99414 -21.6055 14.1826 -27.2002 25.7998zM329.5 193.6c-34.4004 0 -62.4004 28 -62.4004 62.3008c0 34.2998 28 62.2998 62.4004 62.2998s62.4004 -28 62.4004 -62.2998
+c0 -34.3008 -27.9004 -62.3008 -62.4004 -62.3008zM329.6 209.2c25.9004 0 46.9004 21 46.9004 46.7998c0 25.9004 -21 46.7998 -46.9004 46.7998c-25.8994 0 -46.8994 -21 -46.8994 -46.7998c0.0996094 -25.7998 21.0996 -46.7998 46.8994 -46.7998z" />
+    <glyph glyph-name="steam-square" unicode="&#xf1b7;" 
+d="M185.2 91.5c7.7002 18.5 -1 39.7002 -19.6006 47.4004l-29.5 12.1992c11.4004 4.30078 24.3008 4.5 36.4004 -0.5c12.2002 -5.09961 21.5996 -14.5996 26.7002 -26.6992c5 -12.2002 5 -25.6006 -0.100586 -37.7002c-10.5 -25.1006 -39.3994 -37 -64.5996 -26.5
+c-11.5996 4.7998 -20.4004 13.5996 -25.4004 24.2002l28.5 -11.8008c18.6006 -7.7998 39.9004 0.900391 47.6006 19.4004zM400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v112.8l89.0996 -36.8994
+c6 -30 32.7002 -52.7002 64.5 -52.7002c36.6006 0 67.3008 30.2998 65.7002 68.7998l79 56.2998c48.7002 -1.2002 89.6006 38.2998 89.6006 87.5c0 48.2002 -39.3008 87.5 -87.6006 87.5s-87.5996 -39.2998 -87.5996 -87.5v-1.09961l-55.4004 -80.2002
+c-14.5 0.799805 -28.7002 -3.09961 -40.7002 -11.2998l-116.6 48.0996v160.7c0 26.5 21.5 48 48 48h352zM300.3 193.5c-32.2002 0 -58.3994 26.0996 -58.3994 58.2998s26.1992 58.2998 58.3994 58.2998s58.4004 -26.1992 58.4004 -58.2998
+c0 -32.0996 -26.2002 -58.2998 -58.4004 -58.2998zM300.4 208.1c24.1992 0 43.8994 19.6006 43.8994 43.8008c0 24.1992 -19.5996 43.7998 -43.8994 43.7998c-24.2002 0 -43.9004 -19.6006 -43.9004 -43.7998c0 -24.2002 19.7002 -43.8008 43.9004 -43.8008z" />
+    <glyph glyph-name="spotify" unicode="&#xf1bc;" horiz-adv-x="496" 
+d="M248 440c136.9 0 248 -111.1 248 -248s-111.1 -248 -248 -248s-248 111.1 -248 248s111.1 248 248 248zM348.7 75.0996c8.09961 0 15.2002 6.30078 15.2002 15.4004s-3.60059 12.5996 -9.7002 16.5c-71.4004 42.7002 -155.101 44.2998 -237 26.2002
+c-7.5 -1.60059 -13.6006 -6.5 -13.6006 -16.7998c0 -8.10059 6.10059 -15.8008 15.8008 -15.8008c2.89941 0 8 1.60059 11.8994 2.60059c71.7002 14.7002 144.3 13.0996 206.7 -24.5c3.90039 -2.2998 6.5 -3.60059 10.7002 -3.60059zM375.6 140.7
+c10.9004 0 19.3008 8.7002 19.4004 19.5c0 8.7002 -3.2002 14.8994 -11.2998 19.7002c-49.4004 29.3994 -112.101 45.5 -177 45.5c-41.6006 0 -70 -5.80078 -97.7998 -13.6006c-10.3008 -2.89941 -15.5 -10 -15.5 -20.7002c0 -10.6992 8.69922 -19.3994 19.3994 -19.3994
+c4.5 0 7.10059 1.2998 11.9004 2.59961c82.8994 22.5 176.1 7.60059 238.6 -29.3994c3.60059 -1.90039 7.10059 -4.2002 12.2998 -4.2002zM406.6 216.9c12.2002 0 23.2002 9.69922 23.2002 23.2998c0 11.8994 -5.09961 18.0996 -12.8994 22.5996
+c-55.9004 32.6006 -132.4 47.7998 -205.4 47.7998c-42.9004 0 -82.2998 -4.89941 -117.5 -15.1992c-9 -2.60059 -17.4004 -10.3008 -17.4004 -23.9004c0 -13.2998 10.1006 -23.5996 23.3008 -23.5996c4.7998 0 9.2998 1.59961 12.8994 2.59961
+c82.4004 23 209.7 12.7998 280.9 -29.7002c4.5 -2.59961 7.7002 -3.89941 12.8994 -3.89941z" />
+    <glyph glyph-name="deviantart" unicode="&#xf1bd;" horiz-adv-x="320" 
+d="M320 354.8l-98.2002 -179.1l7.40039 -9.5h90.7998v-127.7h-160.9l-13.5 -9.2002l-43.6992 -84c-0.300781 0 -8.60059 -8.59961 -9.2002 -9.2002h-92.7002v93.2002l93.2002 179.4l-7.40039 9.2002h-85.7998v127.6h156l13.5 9.2002l43.7002 84
+c0.299805 0 8.59961 8.59961 9.2002 9.2002h97.5996v-93.1006z" />
+    <glyph glyph-name="soundcloud" unicode="&#xf1be;" horiz-adv-x="640" 
+d="M111.4 191.7l5.7998 -65l-5.7998 -68.2998c-0.300781 -2.5 -2.2002 -4.40039 -4.40039 -4.40039s-4.2002 1.90039 -4.2002 4.40039l-5.59961 68.2998l5.59961 65c0 2.2002 1.90039 4.2002 4.2002 4.2002c2.2002 0 4.09961 -2 4.40039 -4.2002zM132.8 237.3
+c2.5 0 4.7002 -2.2002 4.7002 -5l5.7998 -105.6l-5.7998 -68.2998c0 -2.80078 -2.2002 -5 -4.7002 -5c-2.7998 0 -4.7002 2.19922 -5 5l-5 68.2998l5 105.6c0.299805 2.7998 2.2002 5 5 5zM158.3 261.4c2.7998 0 5.2998 -2.2002 5.2998 -5.30078l5.30078 -130
+l-5.30078 -67.7998c0 -3.09961 -2.5 -5.2998 -5.2998 -5.2998c-3.09961 0 -5.2998 2.2002 -5.59961 5.2998l-4.40039 67.7998l4.40039 130c0.299805 3.10059 2.5 5.30078 5.59961 5.30078zM7.2002 164.8c1.39941 0 2.2002 -1.09961 2.5 -2.5l5.59961 -35.5996l-5.59961 -35
+c-0.299805 -1.40039 -1.10059 -2.5 -2.5 -2.5c-1.40039 0 -2.2002 1.09961 -2.5 2.5l-4.7002 35l4.7002 35.5996c0.299805 1.40039 1.09961 2.5 2.5 2.5zM30.7998 186.7c1.40039 0 2.5 -1.10059 2.7998 -2.5l7.2002 -57.5l-7.2002 -56.4004
+c-0.299805 -1.39941 -1.39941 -2.5 -2.7998 -2.5c-1.39941 0 -2.5 1.10059 -2.5 2.7998l-6.39941 56.1006l6.39941 57.5c0 1.39941 1.10059 2.5 2.5 2.5zM56.0996 198.1c1.7002 0 3.10059 -1.39941 3.10059 -3.2998l6.89941 -68.0996l-6.89941 -65.7998
+c0 -1.7002 -1.40039 -3.10059 -3.10059 -3.10059c-1.59961 0 -3 1.40039 -3.2998 3.10059l-5.7998 65.7998l5.7998 68.0996c0.200195 1.90039 1.60059 3.2998 3.2998 3.2998zM81.4004 200.3c1.89941 0 3.59961 -1.39941 3.89941 -3.59961l6.40039 -70l-6.40039 -67.7998
+c-0.299805 -2.2002 -2 -3.60059 -3.89941 -3.60059c-1.90039 0 -3.60059 1.40039 -3.60059 3.60059l-5.7998 67.7998l5.7998 70c0 2.2002 1.7002 3.59961 3.60059 3.59961zM322.8 311.2c2.5 -1.40039 4.10059 -4.2002 4.5 -7.2002l3.90039 -177.5l-3.90039 -64.2002
+c0 -4.7002 -3.89941 -8.59961 -8.59961 -8.59961s-8.60059 3.89941 -8.90039 8.59961l-1.7002 31.7002l-1.69922 32.5l3.2998 176.7v0.799805c0.200195 2.5 1.39941 5 3.2998 6.7002c1.40039 1.09961 3.40039 1.89941 5.59961 1.89941
+c1.40039 0 3.10059 -0.599609 4.2002 -1.39941zM296.1 295.9c2.2002 -1.40039 3.60059 -3.90039 3.90039 -6.7002l3.2998 -162.8l-3.09961 -58.6006l-0.299805 -6.7002c0 -2.2998 -0.800781 -4.19922 -2.5 -5.59961c-1.40039 -1.40039 -3.40039 -2.5 -5.60059 -2.5
+c-2.5 0 -4.7002 1.2002 -6.39941 3.09961c-1.10059 1.40039 -1.7002 3 -1.7002 4.7002v0.299805c-3.10059 65.3008 -3.10059 65.6006 -3.10059 65.6006l2.80078 160.8l0.299805 1.7002c0 2.7998 1.39941 5.2998 3.59961 6.7002
+c1.2998 0.799805 2.7998 1.39941 4.40039 1.39941c1.59961 0 3 -0.599609 4.39941 -1.39941zM184.7 273.4c3.39941 0 5.89941 -2.80078 6.09961 -6.10059l5 -140.6l-5 -67.2002c-0.299805 -3.2998 -2.7998 -5.7998 -6.09961 -5.7998c-3 0 -5.5 2.5 -5.7998 5.7998
+l-4.40039 67.2002l4.40039 140.6c0 3.2998 2.69922 6.10059 5.7998 6.10059zM561.4 210.6c43.2998 0 78.5996 -35.2998 78.5 -78.8994c0 -43.2998 -35.3008 -78.2998 -78.6006 -78.2998h-218.3c-4.7002 0.599609 -8.59961 4.19922 -8.59961 9.19922v249.7
+c0 4.7998 1.69922 7 7.7998 9.2002c15.2998 6.09961 32.5 9.40039 50.2998 9.40039c72.5 0 131.9 -55.6006 138.3 -126.4c9.5 3.90039 19.7998 6.09961 30.6006 6.09961zM264.7 270.9c4.2002 0 7.2002 -3.30078 7.5 -7.80078l3.89941 -136.699l-3.89941 -65.6006
+c0 -4.2002 -3.2998 -7.5 -7.5 -7.5s-7.5 3.2998 -7.7998 7.5l-3.30078 65.6006l3.30078 136.699c0.299805 4.5 3.59961 7.80078 7.7998 7.80078zM211.1 278.7c3.60059 0 6.40039 -3.10059 6.7002 -6.7002l4.40039 -145.3l-4.40039 -66.9004
+c-0.299805 -3.59961 -3.09961 -6.39941 -6.7002 -6.39941c-3.2998 0 -6.09961 2.7998 -6.39941 6.39941l-3.90039 66.9004l3.90039 145.3c0 3.59961 3.09961 6.7002 6.39941 6.7002zM237.8 275.3c3.90039 0 6.90039 -3 6.90039 -6.89941l4.2002 -141.7l-4.2002 -66.4004
+c0 -3.7998 -3.10059 -6.89941 -6.90039 -6.89941s-6.59961 3 -6.89941 6.89941l-3.90039 66.4004l3.90039 141.7c0 3.7998 3 6.89941 6.89941 6.89941z" />
+    <glyph glyph-name="vine" unicode="&#xf1ca;" horiz-adv-x="384" 
+d="M384 193.3v-52.0996c-18.4004 -4.2002 -36.9004 -6.10059 -52.0996 -6.10059c-36.9004 -77.3994 -103 -143.8 -125.101 -156.199c-14 -7.90039 -27.0996 -8.40039 -42.7002 0.799805c-27.0996 16.2998 -129.899 100.6 -164.1 365.6h74.5
+c18.7002 -159.1 64.5 -240.7 114.8 -301.8c27.9004 27.9004 54.7998 65.0996 75.6006 106.9c-49.8008 25.2998 -80.1006 80.8994 -80.1006 145.6c0 65.5996 37.7002 115.1 102.2 115.1c114.9 0 106.2 -127.899 81.5996 -181.5c0 0 -46.3994 -9.19922 -63.5 20.5
+c3.40039 11.3008 8.2002 30.8008 8.2002 48.5c0 31.3008 -11.2998 46.6006 -28.3994 46.6006c-18.2002 0 -30.8008 -17.1006 -30.8008 -50c0.100586 -79.2002 59.4004 -118.7 129.9 -101.9z" />
+    <glyph glyph-name="codepen" unicode="&#xf1cb;" horiz-adv-x="512" 
+d="M502.285 288.296c6.00098 -3.99902 9.71484 -11.1426 9.71582 -18.2852v-155.999c0 -7.14258 -3.71484 -14.2871 -9.71484 -18.2861l-234 -156.021c-8.06055 -4.95996 -16.584 -4.91504 -24.5713 0l-234 156.021c-6.00098 4 -9.71484 11.1436 -9.71484 18.2861v155.999
+c0 7.14258 3.71387 14.2861 9.71387 18.2852l234 156c8.06055 4.95996 16.584 4.91504 24.5713 0zM278 384.869v-102.572l95.4287 -63.7148l76.8574 51.4287zM234 384.869l-172.286 -114.858l76.8574 -51.4287l95.4287 63.7148v102.572zM44 228.868v-73.7139
+l55.1426 36.8564zM234 -0.84668v102.571l-95.4287 63.7158l-76.8574 -51.4297zM256 140.011l77.7148 52l-77.7148 52l-77.7148 -52zM278 -0.84668l172.286 114.857l-76.8574 51.4297l-95.4287 -63.7158v-102.571zM468 155.154v73.7139l-55.1426 -36.8574z" />
+    <glyph glyph-name="jsfiddle" unicode="&#xf1cc;" horiz-adv-x="576" 
+d="M510.634 210.538c45.6885 -25.334 68.3721 -74.5605 56.832 -122.634c-12.1035 -50.4199 -55.5479 -86.6592 -108.212 -87.293c-84.0303 -1.01172 -168.079 -0.458984 -252.12 -0.480469c-30.3223 -0.00683594 -60.668 -0.492188 -90.959 0.539062
+c-48.0938 1.63672 -91.7764 35.8643 -105.607 81.4326c-14.1289 46.5508 2.18945 94.623 41.9014 124.615c2.54688 1.92383 4.86914 6.52051 4.51465 9.54492c-3.74609 31.8604 7.14453 57.6709 32.6758 76.4082c26.2822 19.2881 55.2285 21.5879 85.3311 9.16699
+c2.36621 -0.975586 4.63965 -2.17773 7.82422 -3.68555c16.5215 27.5332 38.1221 48.6523 65.4922 63.9023c92.8594 51.7402 210.954 8.31152 246.85 -91.6455c5.55762 -15.4766 6.74512 -32.6074 9.09668 -49.0947c0.716797 -5.02832 1.6543 -8.15527 6.38086 -10.7764z
+M531.741 53.6582c39.3135 48.375 22.418 117.668 -35.1426 144.497c-7.43555 3.46582 -9.72559 7.74414 -9.84766 15.8936c-1.87012 125.129 -132.78 187.063 -230.24 132.697c-26.1133 -14.5674 -46.4492 -34.8955 -60.6709 -61.2939
+c-7.59082 -14.0908 -11.9287 -7.97754 -22.1982 -2.52734c-24.6113 13.0635 -49.0469 12.6406 -72.0332 -3.08301c-21.9678 -15.0244 -31.9102 -36.6201 -26.4199 -62.9805c2.4082 -11.5703 -0.914062 -17.0635 -10.0967 -23.1367
+c-38.1895 -25.2578 -53.0879 -74.8604 -34.1855 -116.105c18.4355 -40.2295 51.3135 -59.6631 95.1748 -59.9951c0.700195 -0.00488281 163.728 -0.545898 163.728 0.154297c56.8857 0 113.778 -0.551758 170.652 0.229492
+c28.9375 0.397461 53.0498 13.2178 71.2803 35.6504zM443.952 134.157c-5.84863 -31.1572 -34.6221 -55.0967 -66.666 -55.0957c-16.9531 0.00195312 -32.0586 6.5459 -44.0791 17.7051c-27.6973 25.7139 -71.1406 74.9805 -95.9375 93.3877
+c-20.0557 14.8877 -41.9893 12.333 -60.2715 -3.78223c-49.9961 -44.0713 15.8594 -121.775 67.0625 -77.1885c4.54883 3.95996 7.84082 9.54297 12.7441 12.8447c8.18457 5.50879 20.7666 0.883789 13.168 -10.6221c-17.3574 -26.2842 -49.3301 -38.1973 -78.8623 -29.3008
+c-28.8975 8.70312 -48.8408 35.9678 -48.626 70.1787c1.22461 22.4844 12.3633 43.0596 35.4141 55.9648c22.5742 12.6377 46.3682 13.1455 66.9902 -2.47363c50.791 -38.4756 75.5781 -81.7451 107.296 -101.245c24.5586 -15.0996 54.2549 -7.36328 68.8232 17.5059
+c28.8301 49.209 -34.5918 105.016 -78.8682 63.46c-3.98828 -3.74414 -6.91699 -8.93164 -11.4092 -11.7197c-10.9756 -6.81152 -17.333 4.1123 -12.8096 10.3525c20.7031 28.5537 50.4639 40.4404 83.2715 28.2139c31.4287 -11.7139 49.1074 -44.3662 42.7598 -78.1855z
+" />
+    <glyph glyph-name="rebel" unicode="&#xf1d0;" horiz-adv-x="512" 
+d="M256.5 -56c-139.3 0 -247.5 116.2 -243.3 254.1c2.7998 79.2002 43.2002 152.2 116.5 200.4c0.299805 0 1.89941 0.599609 1.09961 -0.799805c-5.7998 -5.5 -111.3 -129.8 -14.0996 -226.4c49.7998 -49.5 90 -2.5 90 -2.5c38.5 50.1006 -0.600586 125.9 -0.600586 125.9
+c-10 24.8994 -45.6992 40.0996 -45.6992 40.0996l28.7998 31.7998c24.3994 -10.5 43.2002 -38.6992 43.2002 -38.6992c0.799805 29.5996 -21.9004 61.3994 -21.9004 61.3994l44.5996 50.7002l44.3008 -50.0996c-20.5 -28.8008 -21.9004 -62.6006 -21.9004 -62.6006
+c13.7998 23 43.5 39.2998 43.5 39.2998l28.5 -31.7998c-27.4004 -8.89941 -45.4004 -39.8994 -45.4004 -39.8994c-15.7998 -28.5 -27.0996 -89.4004 0.600586 -127.301c32.3994 -44.5996 87.7002 2.80078 87.7002 2.80078c102.699 91.8994 -10.5 225 -10.5 225
+c-6.10059 5.5 0.799805 2.7998 0.799805 2.7998c50.0996 -36.5 114.6 -84.4004 116.2 -204.8c2 -145.601 -99.9004 -249.4 -242.4 -249.4z" />
+    <glyph glyph-name="empire" unicode="&#xf1d1;" horiz-adv-x="496" 
+d="M287.6 393.8c-10.7998 2.2002 -22.0996 3.2998 -33.5 3.60059v18.1992c78.1006 -2.19922 146.101 -44 184.601 -106.6l-15.7998 -9.09961c-6.10059 9.69922 -12.7002 18.7998 -20.2002 27.0996l-18 -15.5c-26 29.5996 -61.4004 50.7002 -101.9 58.4004zM53.4004 125.6
+c3.89941 -10.7998 8.2998 -21.0996 13.5996 -31.0996l-15.7998 -9.09961c-17.1006 31.5996 -27.1006 68.0996 -27.1006 106.6s9.90039 75 27.1006 106.5l15.7998 -9.09961c-5.2998 -9.7002 -10 -20.2002 -13.5996 -31l22.6992 -7.7002
+c-6.39941 -18.2998 -9.69922 -38.2002 -9.69922 -58.7002s3.59961 -40.4004 10 -58.7002zM213.1 14l-4.69922 -23.7998c10.7998 -1.90039 22.1992 -3.2998 33.5 -3.60059v-18.2998c-78.1006 2.2998 -146.4 44.2998 -184.9 106.601l16 9.39941
+c5.7998 -9.7002 12.7002 -18.7998 20.2002 -27.3994l18 15.7998c26.0996 -29.6006 61.5 -50.7002 101.899 -58.7002zM93.2998 327.1c-7.5 -8.2998 -14.0996 -17.5 -20.0996 -27.1992l-15.7998 9.09961c38.5 62.5996 106.5 104.4 184.6 106.6v-18.1992
+c-11.4004 -0.300781 -22.7002 -1.40039 -33.5 -3.60059l4.7002 -23.7998c-40.5 -7.7002 -75.9004 -28.7998 -101.9 -58.4004zM402.7 56.9004c7.5 8.59961 14.3994 17.6992 20.0996 27.3994l16.1006 -9.39941c-38.5 -62.3008 -106.801 -104.4 -184.9 -106.601v18.2998
+c11.4004 0.300781 22.7002 1.7002 33.5 3.60059l-4.7002 23.7998c40.5 8 75.9004 29.0996 101.9 58.7002zM496 192c0 -137 -111 -248 -248 -248s-248 111 -248 248s111 248 248 248s248 -111 248 -248zM483.8 192c0 130.1 -105.7 235.8 -235.8 235.8
+s-235.8 -105.7 -235.8 -235.8s105.7 -235.8 235.8 -235.8s235.8 105.7 235.8 235.8zM444.8 298.6c17.2002 -31.5996 27.1006 -68.0996 27.1006 -106.6s-9.90039 -75 -27.1006 -106.4l-15.7998 9.10059c5.2998 10 9.7002 20.2002 13.5996 31l-23 7.7002
+c6.40039 18.2998 10 38.1992 10 58.6992s-3.2998 40.4004 -9.69922 58.7002l22.6992 7.7002c-3.59961 10.7998 -8.2998 21.2998 -13.5996 31zM261.8 120.9l13.2998 -66.7002c-8.59961 -1.7002 -17.6992 -2.7998 -27.0996 -2.7998s-18.5 1.09961 -27.0996 2.7998
+l13.2998 66.7002c-16.2998 3.2998 -30.5 11.5996 -40.7002 23.5l-51.2002 -44.8008c-11.8994 13.6006 -21.2998 29.4004 -27.0996 46.8008l64.2002 22.0996c-2.5 7.40039 -3.90039 15.2002 -3.90039 23.5s1.40039 16 3.90039 23.5l-64.5 22.0996
+c6.09961 17.5 15.5 33.2002 27.3994 46.8008l51.2002 -44.8008c10.2998 11.9004 24.4004 20.5 40.7002 23.8008l-13.2998 66.3994c8.59961 2 17.6992 2.7998 27.0996 2.7998s18.5 -0.899414 27.0996 -2.7998l-13.2998 -66.3994
+c16.2998 -3.30078 30.5 -11.9004 40.7002 -23.8008l51.2002 44.8008c11.8994 -13.6006 21.2998 -29.4004 27.3994 -46.8008l-64.5 -22.0996c2.5 -7.40039 3.90039 -15.2002 3.90039 -23.5s-1.40039 -16 -3.90039 -23.5l64.2002 -22.0996
+c-5.7998 -17.5 -15.2002 -33.2002 -27.0996 -46.8008l-51.2002 44.8008c-10.2998 -11.9004 -24.4004 -20.2002 -40.7002 -23.5z" />
+    <glyph glyph-name="git-square" unicode="&#xf1d2;" 
+d="M100.59 113.76c48.5703 -3.30957 58.9502 -2.10938 58.9502 -11.9395c0 -20 -65.5498 -20.0605 -65.5498 -1.52051c0.00976562 5.08984 3.29004 9.40039 6.59961 13.46zM128.54 230.4c30.96 0 31.7598 -44.4707 -0.75 -44.4707c-33 0 -31.54 44.4707 0.75 44.4707z
+M448 368v-352c0 -26.4922 -21.5078 -48 -48 -48h-352c-26.4922 0 -48 21.5078 -48 48v352c0 26.4922 21.5078 48 48 48h352c26.4922 0 48 -21.5078 48 -48zM221 298.69c0 -14.4902 8.37988 -22.8809 22.8604 -22.8809c14.7393 0 23.1299 8.39062 23.1299 22.8809
+c0 14.4893 -8.37012 22.3096 -23.1104 22.3096c-14.4795 0 -22.8799 -7.83984 -22.8799 -22.3096zM199.18 253h-49.5498c-25 6.5498 -81.5596 4.84961 -81.5596 -46.75c0 -18.7998 9.39941 -32 21.8496 -38.1104c-15.6895 -14.3701 -23.1201 -21.1396 -23.1201 -30.7393
+c0 -6.87012 2.79004 -13.2207 11.1807 -16.7607c-8.90039 -8.39941 -14 -14.4795 -14 -25.9199c0.0195312 -20.0693 17.5498 -31.7197 63.5391 -31.7197c44.2207 0 69.8701 16.5098 69.8701 45.7305c0 36.6699 -28.2295 35.3193 -94.7695 39.3799l8.37988 13.4297
+c17 -4.74023 74.1904 -6.23047 74.1904 42.4297c0 11.6904 -4.83008 19.8203 -9.40039 25.6699l23.3799 1.78027zM283.52 143.16l-13 1.78027c-3.81934 0.509766 -4.06934 1 -4.06934 5.08984v105.45h-52.6006l-2.79004 -20.5703c15.75 -5.5498 17 -4.86035 17 -10.1699
+v-74.7402c0 -5.62012 -0.30957 -4.58008 -17 -6.87012v-20.0596h72.4209zM384 133l-6.87012 22.3701c-40.9297 -15.3701 -37.8496 12.4102 -37.8496 16.7295v60.7207h37.8496v25.4102h-35.8203c-2.86914 0 -2 -2.52051 -2 38.6299h-24.1797
+c-2.79004 -27.7002 -11.6797 -38.8799 -34 -41.4199v-22.6201c20.4697 0 19.8203 0.849609 19.8203 -2.54004v-66.5703c0 -28.7197 11.4297 -40.9102 41.6699 -40.9102c14.4502 0 30.4502 4.83008 41.3799 10.2002z" />
+    <glyph glyph-name="git" unicode="&#xf1d3;" horiz-adv-x="512" 
+d="M216.29 289.61l0.0400391 -34.5508l-37.4102 -2.83984c7.27051 -9.35938 15 -22.3701 15 -41.0693c0 -77.8906 -91.4297 -75.4707 -118.7 -67.8906l-13.4297 -21.5498c106.47 -6.5 151.63 -4.33984 151.63 -63c0 -46.7598 -41.04 -73.1797 -111.79 -73.1797
+c-73.5801 0 -101.63 18.71 -101.63 50.8193c0 18.3008 8.12988 28.04 22.4004 41.4502c-13.4199 5.66992 -17.8906 15.8105 -17.8906 26.8105c0 15.3594 11.9004 26.21 37 49.21c-20 9.76953 -35 30.9102 -35 61c0 82.5498 90.4902 85.2793 130.49 74.79h79.29z
+M152.87 47.71c0 15.7402 -16.6104 13.8096 -94.3203 19.1104c-5.2998 -6.54004 -10.5693 -13.4004 -10.5693 -21.54c0 -29.6699 104.89 -29.6299 104.89 2.42969zM102.06 182.29c52.0205 0 50.7402 71.1602 1.2002 71.1602c-51.6602 0 -54 -71.1602 -1.2002 -71.1602z
+M235.36 81.7803v32.0996c26.75 3.66016 27.2393 2 27.2393 11v119.51c0 8.5 -2.0498 7.37988 -27.2393 16.2607l4.46973 32.9199h84.1699v-168.71c0 -6.51074 0.400391 -7.32031 6.50977 -8.14062l20.7305 -2.83984v-32.0996h-115.88zM287.81 326.09
+c-23.1699 0 -36.5898 13.4297 -36.5898 36.6104c0 23.1797 13.4199 35.7695 36.5898 35.7695c23.5801 0 37 -12.6201 37 -35.7695c0 -23.1504 -13.4199 -36.6104 -37 -36.6104zM512 97.54c-17.4902 -8.53027 -43.0996 -16.2598 -66.2803 -16.2598
+c-48.3799 0 -66.6699 19.5 -66.6699 65.46v106.51c0 5.41992 1.0498 4.05957 -31.71 4.05957v36.1904c35.7803 4.07031 50 22 54.4697 66.2695h38.6309c0 -65.8291 -1.34082 -61.8096 3.25977 -61.8096h57.2998v-40.6504h-60.5596v-97.1494
+c0 -6.91992 -4.9209 -51.4102 60.5693 -26.8398z" />
+    <glyph glyph-name="hacker-news" unicode="&#xf1d4;" 
+d="M0 416h448v-448h-448v448zM21.2002 218.8h-0.200195c0.0996094 0.100586 0.200195 0.299805 0.299805 0.400391c0 -0.100586 0 -0.299805 -0.0996094 -0.400391zM239.2 164.9l80.7998 155.1h-34.7998c-54.7998 -101.2 -48.2998 -98.5996 -60.6006 -125.6
+c-10.0996 24.3994 -6.7998 27.2998 -59.2998 125.6h-37.2998l79.7998 -153.3v-102.7h31.4004v100.9z" />
+    <glyph glyph-name="tencent-weibo" unicode="&#xf1d5;" horiz-adv-x="384" 
+d="M72.2998 -47.7998c1.40039 -19.9004 -27.5996 -22.2002 -29.7002 -2.90039c-11.5996 129.9 31.1006 239.5 101.4 313.2c-15.5996 34 9.2002 77.0996 50.5996 77.0996c30.3008 0 55.1006 -24.5996 55.1006 -55.0996c0 -44 -49.5 -70.7998 -86.9004 -45.0996
+c-65.7002 -71.3008 -101.399 -169.801 -90.5 -287.2zM192 447.9c92 0 166.6 -74.6006 166.6 -166.5c0 -102.301 -93.2998 -185.5 -204 -162.301c-19 4.7002 -12.5 33.2002 6.60059 29.1006c80.7998 -20.7998 167.7 42.2998 167.7 133.1c0 75.5 -61.5 136.9 -136.9 136.9
+c-101 0 -168.3 -106.601 -122 -199.2c9 -17.9004 -17.5996 -30.7998 -26.2998 -13.4004c-56 108.101 22.3994 242.301 148.3 242.301z" />
+    <glyph glyph-name="qq" unicode="&#xf1d6;" 
+d="M433.754 27.5547c-11.5264 -1.39258 -44.8604 52.7412 -44.8604 52.7412c0 -31.3447 -16.1357 -72.2471 -51.0508 -101.786c16.8418 -5.19141 54.8428 -19.167 45.8037 -34.4209c-7.31641 -12.3428 -125.511 -7.88086 -159.633 -4.03711
+c-34.1221 -3.84375 -152.315 -8.30566 -159.632 4.03711c-9.04492 15.25 28.918 29.2139 45.7832 34.415c-34.9199 29.5391 -51.0586 70.4453 -51.0586 101.792c0 0 -33.334 -54.1338 -44.8594 -52.7412c-5.37012 0.650391 -12.4238 29.6445 9.34668 99.7041
+c10.2617 33.0244 21.9951 60.4785 40.1445 105.779c-3.05566 116.898 45.2441 214.956 160.262 214.962c113.737 -0.00585938 163.156 -96.1328 160.264 -214.963c18.1182 -45.2227 29.9121 -72.8506 40.1445 -105.778c21.7676 -70.0596 14.7158 -99.0527 9.3457 -99.7041z
+" />
+    <glyph glyph-name="weixin" unicode="&#xf1d7;" horiz-adv-x="576" 
+d="M385.2 280.4c-92.4004 0 -165.4 -69.1006 -165.3 -154c0 -14.2002 2.19922 -27.9004 6.19922 -40.8008c-6.19922 -0.5 -12.0996 -0.799805 -18.2998 -0.799805c-24.3994 0 -43.7998 4.90039 -68.2002 9.7002l-68 -34.0996l19.3008 58.5996
+c-48.6006 34.0996 -77.9004 78.2002 -77.9004 131.6c0 92.6006 87.5 165.4 194.7 165.4c95.5996 0 179.7 -58.2998 196.3 -136.7c-6.2002 0.799805 -12.4004 1.10059 -18.7998 1.10059zM280.7 333.3c-14.7002 0 -29.2002 -9.7002 -29.2998 -24.3994
+c0 -14.5 14.5 -24.2002 29.2998 -24.2002c14.5 0 24.2002 9.7002 24.2002 24.2002c0 14.6992 -9.7002 24.3994 -24.2002 24.3994zM144.3 284.7c14.7998 0 24.4004 9.59961 24.4004 24.2002c0 14.6992 -9.60059 24.3994 -24.4004 24.3994
+c-14.5 0 -29.2998 -9.59961 -29.2998 -24.3994c0 -14.5 14.7998 -24.2002 29.2998 -24.2002zM563 128.6c0 -43.7998 -29 -82.6992 -68.2002 -112.1l14.7998 -48.5996l-53.3994 29.2998c-19.7002 -4.7998 -39.2998 -9.90039 -58.6006 -9.90039
+c-92.5996 0 -165.399 63.4004 -165.399 141.3c0 77.9004 72.7002 141.301 165.399 141.301c87.5 0 165.4 -63.4004 165.4 -141.301zM343.9 153.1c14.6992 0 24.3994 9.60059 24.3994 19.6006c0 9.59961 -9.59961 19.2998 -24.3994 19.2998
+c-9.60059 0 -19.3008 -9.59961 -19.3008 -19.2998c0 -9.90039 9.60059 -19.6006 19.3008 -19.6006zM451 153.1c14.5 0 24.5 9.60059 24.4004 19.6006c0 9.59961 -9.90039 19.2998 -24.4004 19.2998c-9.59961 0 -19.2998 -9.59961 -19.2998 -19.2998
+c0 -9.90039 9.59961 -19.6006 19.2998 -19.6006z" />
+    <glyph glyph-name="slideshare" unicode="&#xf1e7;" horiz-adv-x="512" 
+d="M187.7 294.3c34 0 61.7002 -25.7002 61.7002 -57.7002c0 -31.6992 -27.7002 -57.6992 -61.7002 -57.6992s-61.7002 26 -61.7002 57.6992c0 32 27.7002 57.7002 61.7002 57.7002zM331.1 294.3c34.3008 0 61.8008 -25.7002 61.7002 -57.7002
+c0 -31.6992 -27.3994 -57.6992 -61.7002 -57.6992c-34 0 -61.6992 26 -61.6992 57.6992c0 32 27.6992 57.7002 61.6992 57.7002zM487.7 204.3c15.2002 10.5 25.2002 -4 16.0996 -17.7998c-18.2998 -22.5996 -53.2002 -50.2998 -106.3 -72
+c56.2998 -191.7 -137.4 -222.3 -134.3 -124c0 0.700195 -0.299805 53.7998 -0.299805 93.5c-4.30078 0.799805 -8.60059 2 -13.7002 3.09961c0 -40 -0.299805 -95.8994 -0.299805 -96.5996c3.09961 -98.2002 -190.601 -67.5996 -134.301 124.1
+c-53.1992 21.7002 -88 49.4004 -106.3 72c-9.09961 13.7002 0.900391 28.3008 16 17.7002c2 -1.39941 4.2998 -2.89941 6.2998 -4.2998v198.3c0 27.4004 20.6006 49.7002 46 49.7002h359.101c25.3994 0 46 -22.2998 46 -49.7002v-198.3zM457.2 185.1h0.0996094v190.601
+c0 32.7998 -10.5996 45.7002 -40.8994 45.7002h-317.7c-31.7002 0 -40.6006 -10.8008 -40.6006 -45.7002v-192.4c67.7002 -35.3994 125.7 -29.0996 157.4 -28c13.4004 0.299805 22 -2.2998 27.0996 -7.7002c1.7002 -1.59961 10 -9.39941 20.3008 -17.0996
+c1.09961 15.7998 10 25.7998 33.6992 24.9004c32.3008 -1.40039 91.7002 -7.7002 160.601 29.6992z" />
+    <glyph glyph-name="twitch" unicode="&#xf1e8;" horiz-adv-x="512" 
+d="M391.17 344.53v-109.7h-38.6299v109.7h38.6299zM285 345v-109.75h-38.6299v109.75h38.6299zM120.83 448h366.86v-256l-173.771 -164.58h-77.25l-96.5303 -91.4199v91.4199h-115.83v329.16zM449.07 210.25v201.17h-308.931v-274.29h86.8701v-64l67.6006 64h77.2393z" />
+    <glyph glyph-name="yelp" unicode="&#xf1e9;" horiz-adv-x="384" 
+d="M42.9004 207.68l99.6191 -48.6094c19.2002 -9.40039 16.2002 -37.5107 -4.5 -42.71l-107.52 -26.8105c-1.78223 -0.448242 -3.64746 -0.685547 -5.56738 -0.685547c-11.7246 0 -21.3848 8.89453 -22.6426 20.2861c-0.853516 7.44141 -1.29297 15.0078 -1.29297 22.6768
+c0 21.9561 3.65723 42.9111 10.293 62.6426c3.03906 9.02148 11.5723 15.5264 21.6133 15.5264c3.5791 0 6.98145 -0.84375 9.99707 -2.31641zM86.9004 -31.5703c-6.01172 4.1123 -9.9248 11.0195 -9.9248 18.8457c0 5.85742 2.21191 11.2021 5.84473 15.2441l74.21 82.4004
+c14.3096 15.8105 40.5098 5.2002 39.8096 -16.0996l-3.89941 -110.82c-0.414062 -12.21 -10.4365 -22.0088 -22.7461 -22.0088c-1.32129 0 -2.61523 0.112305 -3.87402 0.329102c-28.9365 4.90039 -56.1416 16.1621 -79.4199 32.1094zM232.24 78.3496
+c-11.2998 18.1104 6.2002 40.4102 26.5098 33.9102l105.42 -34.2598c9.14453 -3.04102 15.7305 -11.6855 15.7305 -21.8447c0 -3.46289 -0.767578 -6.74805 -2.14062 -9.69531c-12.5361 -26.3281 -30.4697 -49.2246 -52.71 -67.6104
+c-3.96191 -3.26465 -9.03809 -5.25781 -14.5674 -5.25781c-8.18555 0 -15.375 4.29785 -19.4326 10.7578zM380.57 210.58c1.21289 -2.79883 1.93359 -5.89941 1.93359 -9.1416c0 -10.4385 -6.96875 -19.2627 -16.5039 -22.0684l-106.64 -30.5098
+c-20.5 -5.90039 -37.1006 17.0098 -25.2002 34.71l62 91.9199c4.10742 6.08398 11.0635 10.0615 18.9502 10.0615c5.76172 0 11.0283 -2.1377 15.0498 -5.66211c21.5781 -19.0479 38.7783 -42.5518 50.4102 -69.3096zM62.1104 417.82
+c34.3301 16.3438 72.6104 26.9434 112.33 30.0996c0.610352 0.0498047 1.20703 0.078125 1.83008 0.078125c12.5127 0 22.6709 -10.1582 22.6709 -22.6699c0 -0.0693359 -0.000976562 -0.138672 -0.000976562 -0.208008v-208.34
+c0 -23.2998 -30.9102 -31.6006 -42.6104 -11.4004l-104.12 180.44c-1.92871 3.35059 -3.06738 7.24805 -3.06738 11.3887c0 9.07422 5.29883 16.9199 12.9678 20.6113z" />
+    <glyph glyph-name="paypal" unicode="&#xf1ed;" horiz-adv-x="384" 
+d="M111.4 152.1c-3.5 -19.1992 -17.4004 -108.699 -21.5 -134c-0.300781 -1.7998 -1 -2.5 -3 -2.5h-74.6006c-7.59961 0 -13.0996 6.60059 -12.0996 13.9004l58.5996 371.9c1.5 9.59961 10.1006 16.8994 20 16.8994c152.3 0 165.101 3.7002 204 -11.3994
+c60.1006 -23.3008 65.6006 -79.5 44 -140.301c-21.5 -62.5996 -72.5 -89.5 -140.1 -90.2998c-43.4004 -0.700195 -69.5 7 -75.2998 -24.2002zM357.1 296c28.4004 -21.2002 30.3008 -57.7998 23.8008 -92.5996c-16.5 -83.5 -71.9004 -112.301 -142.9 -112.301
+c-15 0 -24.7002 2.30078 -29.2998 -19.6992c-15.5 -97.4004 -13.7002 -85.9004 -14.4004 -91.3008c-1.7002 -8.59961 -8.7998 -14.8994 -17.3994 -14.8994h-63.5c-7.10059 0 -11.6006 5.7998 -10.6006 12.8994c0 0 4.5 29.3008 27.1006 169.7
+c0.799805 6.10059 4.7998 9.40039 10.8994 9.40039c54 0 164.601 -9.90039 204.5 103.899c3.7002 11.1006 6.7998 22.2002 8.7998 33.6006c0.5 3.09961 1.2002 2.59961 3 1.2998z" />
+    <glyph glyph-name="google-wallet" unicode="&#xf1ee;" 
+d="M156.8 321.2c37.6006 -60.6006 64.2002 -113.101 84.2998 -162.5c-8.2998 -33.7998 -18.7998 -66.5 -31.2998 -98.2998c-13.2002 52.2998 -26.5 101.3 -56 148.5c6.5 36.3994 2.2998 73.5996 3 112.3zM109.3 248c5 0 10 -2.5 13 -6.5
+c43.7998 -59.7998 66.2998 -123.8 82.5 -193.5h-103.5c-20 69.5 -49.5 133 -91.7002 187.3c-4 5.2002 0 12.7002 6.5 12.7002h93.2002zM157.1 336h108.7c74.7998 -103 131.2 -230 143.2 -368h-113.7c-8.2002 133.5 -69.7002 260 -138.2 368zM408.9 404.5
+c19 -67.5 31.0996 -139 31.0996 -212.6c0 -69.5 -9.5 -142.5 -25.2998 -203c-10.9004 92.5 -42.4004 184.6 -90.6006 270.8c-4.19922 50.5 -13.2998 99.5 -26.5 146c-1.19922 5.2998 2.5 10.2998 7.80078 10.2998h88.2998c7 0 13.3994 -4.7002 15.2002 -11.5z" />
+    <glyph glyph-name="cc-visa" unicode="&#xf1f0;" horiz-adv-x="576" 
+d="M470.1 216.7c0 0 7.60059 -37.2002 9.30078 -45h-33.4004c3.2998 8.89941 16 43.5 16 43.5c-0.200195 -0.299805 3.2998 9.09961 5.2998 14.8994zM576 368v-352c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h480
+c26.5 0 48 -21.5 48 -48zM152.5 116.8l63.2002 155.2h-42.5l-39.2998 -106l-4.30078 21.5l-14 71.4004c-2.2998 9.89941 -9.39941 12.6992 -18.1992 13.0996h-64.7002l-0.700195 -3.09961c15.7998 -4 29.9004 -9.80078 42.2002 -17.1006l35.7998 -135h42.5zM246.9 116.6
+l25.1992 155.4h-40.1992l-25.1006 -155.4h40.1006zM386.8 167.4c0.200195 17.6992 -10.5996 31.1992 -33.7002 42.2998c-14.0996 7.09961 -22.6992 11.8994 -22.6992 19.2002c0.199219 6.59961 7.2998 13.3994 23.0996 13.3994
+c13.0996 0.299805 22.7002 -2.7998 29.9004 -5.89941l3.59961 -1.7002l5.5 33.5996c-7.90039 3.10059 -20.5 6.60059 -36 6.60059c-39.7002 0 -67.5996 -21.2002 -67.7998 -51.4004c-0.299805 -22.2998 20 -34.7002 35.2002 -42.2002
+c15.5 -7.59961 20.7998 -12.5996 20.7998 -19.2998c-0.200195 -10.4004 -12.6006 -15.2002 -24.1006 -15.2002c-16 0 -24.5996 2.5 -37.6992 8.2998l-5.30078 2.5l-5.59961 -34.8994c9.40039 -4.2998 26.7998 -8.10059 44.7998 -8.2998
+c42.2002 -0.100586 69.7002 20.7998 70 53zM528 116.6l-32.4004 155.4h-31.0996c-9.59961 0 -16.9004 -2.7998 -21 -12.9004l-59.7002 -142.5h42.2002s6.90039 19.2002 8.40039 23.3008h51.5996c1.2002 -5.5 4.7998 -23.3008 4.7998 -23.3008h37.2002z" />
+    <glyph glyph-name="cc-mastercard" unicode="&#xf1f1;" horiz-adv-x="576" 
+d="M482.9 37.7002c0 -6.7998 -4.60059 -11.7002 -11.2002 -11.7002c-6.7998 0 -11.2002 5.2002 -11.2002 11.7002s4.40039 11.7002 11.2002 11.7002c6.59961 0 11.2002 -5.2002 11.2002 -11.7002zM172.1 49.4004c6.5 0 10.8008 -5.2002 10.9004 -11.7002
+c0 -6.7998 -4.40039 -11.7002 -10.9004 -11.7002c-7.09961 0 -11.1992 5.2002 -11.1992 11.7002s4.09961 11.7002 11.1992 11.7002zM289.6 49.7002c5.2002 0 8.7002 -3 9.60059 -8.7002h-19.1006c0.800781 5.2002 4.10059 8.7002 9.5 8.7002zM397.4 49.4004
+c6.7998 0 11.1992 -5.2002 11.1992 -11.7002c0 -6.7998 -4.39941 -11.7002 -11.1992 -11.7002c-6.80078 0 -10.9004 5.2002 -10.9004 11.7002s4.09961 11.7002 10.9004 11.7002zM503.3 23.2998c0 -0.299805 0.299805 -0.5 0.299805 -1.09961
+c0 -0.299805 -0.299805 -0.5 -0.299805 -1.10059c-0.299805 -0.299805 -0.299805 -0.5 -0.5 -0.799805c-0.299805 -0.299805 -0.5 -0.5 -1.09961 -0.5c-0.299805 -0.299805 -0.5 -0.299805 -1.10059 -0.299805c-0.299805 0 -0.5 0 -1.09961 0.299805
+c-0.299805 0 -0.5 0.299805 -0.799805 0.5c-0.299805 0.299805 -0.5 0.5 -0.5 0.799805c-0.299805 0.5 -0.299805 0.800781 -0.299805 1.10059c0 0.5 0 0.799805 0.299805 1.09961c0 0.5 0.299805 0.799805 0.5 1.10059c0.299805 0.299805 0.5 0.299805 0.799805 0.5
+c0.5 0.299805 0.799805 0.299805 1.09961 0.299805c0.5 0 0.800781 0 1.10059 -0.299805c0.5 -0.300781 0.799805 -0.300781 1.09961 -0.5c0.299805 -0.200195 0.200195 -0.600586 0.5 -1.10059zM501.1 21.9004c0.5 0 0.5 0.299805 0.800781 0.299805
+c0.299805 0.299805 0.299805 0.5 0.299805 0.799805s0 0.5 -0.299805 0.799805c-0.300781 0 -0.5 0.299805 -1.10059 0.299805h-1.59961v-3.5h0.799805v1.40039h0.299805l1.10059 -1.40039h0.799805zM576 367v-352c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48
+v352c0 26.5 21.5 48 48 48h480c26.5 0 48 -21.5 48 -48zM64 227.4c0 -76.5 62.0996 -138.5 138.5 -138.5c27.2002 0 53.9004 8.19922 76.5 23.0996c-72.9004 59.2998 -72.4004 171.2 0 230.5c-22.5996 15 -49.2998 23.0996 -76.5 23.0996
+c-76.4004 0.100586 -138.5 -62 -138.5 -138.199zM288 118.6c70.5 55 70.2002 162.2 0 217.5c-70.2002 -55.2998 -70.5 -162.6 0 -217.5zM145.7 42.2998c0 8.7002 -5.7002 14.4004 -14.7002 14.7002c-4.59961 0 -9.5 -1.40039 -12.7998 -6.5
+c-2.40039 4.09961 -6.5 6.5 -12.2002 6.5c-3.7998 0 -7.59961 -1.40039 -10.5996 -5.40039v4.40039h-8.2002v-36.7002h8.2002c0 18.9004 -2.5 30.2002 9 30.2002c10.1992 0 8.19922 -10.2002 8.19922 -30.2002h7.90039c0 18.2998 -2.5 30.2002 9 30.2002
+c10.2002 0 8.2002 -10 8.2002 -30.2002h8.2002v23h-0.200195zM190.6 56h-7.89941v-4.40039c-2.7002 3.30078 -6.5 5.40039 -11.7002 5.40039c-10.2998 0 -18.2002 -8.2002 -18.2002 -19.2998c0 -11.2002 7.90039 -19.2998 18.2002 -19.2998
+c5.2002 0 9 1.89941 11.7002 5.39941v-4.59961h7.89941v36.7998zM231.1 30.4004c0 15 -22.8994 8.19922 -22.8994 15.1992c0 5.7002 11.8994 4.80078 18.5 1.10059l3.2998 6.5c-9.40039 6.09961 -30.2002 6 -30.2002 -8.2002c0 -14.2998 22.9004 -8.2998 22.9004 -15
+c0 -6.2998 -13.5 -5.7998 -20.7002 -0.799805l-3.5 -6.2998c11.2002 -7.60059 32.5996 -6 32.5996 7.5zM266.5 21.0996l-2.2002 6.80078c-3.7998 -2.10059 -12.2002 -4.40039 -12.2002 4.09961v16.5996h13.1006v7.40039h-13.1006v11.2002h-8.19922v-11.2002h-7.60059
+v-7.2998h7.60059v-16.7002c0 -17.5996 17.2998 -14.4004 22.5996 -10.9004zM279.8 34.5h27.5c0 16.2002 -7.39941 22.5996 -17.3994 22.5996c-10.6006 0 -18.2002 -7.89941 -18.2002 -19.2998c0 -20.5 22.5996 -23.8994 33.7998 -14.2002l-3.7998 6
+c-7.7998 -6.39941 -19.6006 -5.7998 -21.9004 4.90039zM338.9 56c-4.60059 2 -11.6006 1.7998 -15.2002 -4.40039v4.40039h-8.2002v-36.7002h8.2002v20.7002c0 11.5996 9.5 10.0996 12.7998 8.40039zM349.5 37.7002c0 11.3994 11.5996 15.0996 20.7002 8.39941l3.7998 6.5
+c-11.5996 9.10059 -32.7002 4.10059 -32.7002 -15c0 -19.7998 22.4004 -23.7998 32.7002 -15l-3.7998 6.5c-9.2002 -6.5 -20.7002 -2.59961 -20.7002 8.60059zM416.2 56h-8.2002v-4.40039c-8.2998 11 -29.9004 4.80078 -29.9004 -13.8994
+c0 -19.2002 22.4004 -24.7002 29.9004 -13.9004v-4.59961h8.2002v36.7998zM449.9 56c-2.40039 1.2002 -11 2.90039 -15.2002 -4.40039v4.40039h-7.90039v-36.7002h7.90039v20.7002c0 11 9 10.2998 12.7998 8.40039zM490.2 70.9004h-7.90039v-19.3008
+c-8.2002 10.9004 -29.8994 5.10059 -29.8994 -13.8994c0 -19.4004 22.5 -24.6006 29.8994 -13.9004v-4.59961h7.90039v51.7002zM497.8 146v-4.59961h0.799805v4.59961h1.90039v0.799805h-4.59961v-0.799805h1.89941zM504.4 22.2002c0 0.5 0 1.09961 -0.300781 1.59961
+c-0.299805 0.299805 -0.5 0.799805 -0.799805 1.10059c-0.299805 0.299805 -0.799805 0.5 -1.09961 0.799805c-0.5 0 -1.10059 0.299805 -1.60059 0.299805c-0.299805 0 -0.799805 -0.299805 -1.39941 -0.299805c-0.5 -0.299805 -0.799805 -0.5 -1.10059 -0.799805
+c-0.5 -0.300781 -0.799805 -0.800781 -0.799805 -1.10059c-0.299805 -0.5 -0.299805 -1.09961 -0.299805 -1.59961c0 -0.299805 0 -0.799805 0.299805 -1.40039c0 -0.299805 0.299805 -0.799805 0.799805 -1.09961c0.300781 -0.299805 0.5 -0.5 1.10059 -0.799805
+c0.5 -0.300781 1.09961 -0.300781 1.39941 -0.300781c0.5 0 1.10059 0 1.60059 0.300781c0.299805 0.299805 0.799805 0.5 1.09961 0.799805s0.5 0.799805 0.799805 1.09961c0.300781 0.600586 0.300781 1.10059 0.300781 1.40039zM507.6 146.9h-1.39941l-1.60059 -3.5
+l-1.59961 3.5h-1.40039v-5.40039h0.800781v4.09961l1.59961 -3.5h1.09961l1.40039 3.5v-4.09961h1.09961v5.40039zM512 227.4c0 76.1992 -62.0996 138.3 -138.5 138.3c-27.2002 0 -53.9004 -8.2002 -76.5 -23.1006c72.0996 -59.2998 73.2002 -171.5 0 -230.5
+c22.5996 -15 49.5 -23.0996 76.5 -23.0996c76.4004 -0.0996094 138.5 61.9004 138.5 138.4z" />
+    <glyph glyph-name="cc-discover" unicode="&#xf1f2;" horiz-adv-x="576" 
+d="M520.4 251.9c0 -8.40039 -5.5 -12.8008 -15.8008 -12.8008h-4.69922v24.9004h4.89941c10.1006 0 15.6006 -4.2002 15.6006 -12.0996zM528 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h480z
+M483.9 277.1v-82h16v32.8008h2.19922l22.2002 -32.8008h19.6006l-25.8008 34.4004c12.1006 2.5 18.7002 10.5996 18.7002 23.2002c0 28.5 -30.2998 24.3994 -52.8994 24.3994zM428 277v-82h45.2998v13.7998h-29.2998v22.2002h28.2998v13.7998h-28.2998v18.2002h29.2998v14
+h-45.2998zM359.3 277h-17.5l35 -84.2002h8.60059l35.5 84.2002h-17.5l-22.2002 -55.2002zM303.4 280c-24.6006 0 -44.6006 -19.9004 -44.6006 -44.5996c0 -24.6006 19.9004 -44.6006 44.6006 -44.6006c24.5996 0 44.5996 19.9004 44.5996 44.6006
+c0 24.5996 -19.9004 44.5996 -44.5996 44.5996zM254.1 273.9c-30.1992 15 -63.2998 -6.80078 -63.2998 -38c0 -32.5 33.6006 -52.5 63.2998 -38.2002v19c-19.2998 -19.2998 -46.7998 -5.7998 -46.7998 19.2002c0 23.6992 26.7002 39.0996 46.7998 19v19zM156.9 207.6
+c-7.60059 0 -13.8008 3.7002 -17.5 10.8008l-10.3008 -9.90039c17.8008 -26.0996 56.6006 -18.2002 56.6006 11.2998c0 13.1006 -5.40039 19 -23.6006 25.6006c-9.59961 3.39941 -12.2998 5.89941 -12.2998 10.2998c0 8.7002 14.5 14.0996 24.9004 2.5l8.39941 10.7998
+c-19.0996 17.0996 -49.6992 8.90039 -49.6992 -14.2998c0 -11.2998 5.19922 -17.2002 20.1992 -22.7002c25.7002 -9.09961 14.7002 -24.4004 3.30078 -24.4004zM55.4004 195c30.8994 0 44.0996 22.4004 44.0996 40.9004c0 24.0996 -18 41.0996 -44.0996 41.0996h-23.4004
+v-82h23.4004zM122.9 195v82h-16v-82h16zM544 15v145c-33.2998 -20.7998 -226.4 -124.4 -416 -160h401c8.2002 0 15 6.7998 15 15zM74.0996 256.4c5.7002 -5 8.90039 -12.6006 8.90039 -20.5c0 -7.90039 -3.2002 -15.5 -8.90039 -20.7002
+c-4.89941 -4.40039 -11.5996 -6.40039 -21.8994 -6.40039h-4.2002v54.2002h4.2002c10.2998 0 16.7002 -1.7002 21.8994 -6.59961z" />
+    <glyph glyph-name="cc-amex" unicode="&#xf1f3;" horiz-adv-x="576" 
+d="M325.1 280.2c0.100586 -8 -4.2998 -15.7002 -11.6992 -18.7002c9.5 -3.2998 11 -9.2002 11 -18.4004v-13.5h-16.6006c-0.299805 14.8008 3.60059 25.1006 -14.7998 25.1006h-18v-25.1006h-16.4004v69.3008l39.1006 -0.300781c13.2998 0 27.3994 -2 27.3994 -18.3994z
+M295.7 268.9c5.7002 0 11 1.2998 11 7.89941c0 6.40039 -5.60059 7.40039 -10.7002 7.40039h-21v-15.2998h20.7002zM279 179.4c15.5996 0 27.9004 -5.40039 27.9004 -22.7002c0 -27.9004 -30.4004 -23.2998 -49.3008 -23.2998l-0.0996094 -23.3008h-32.2002l-20.3994 23
+l-21.3008 -23h-65.3994l0.0996094 69.3008h66.5l20.5 -22.8008l21 22.8008h52.7002zM175.2 124.7l19 20.2002l-17.9004 20.1992h-41.7002v-12.5h36.3008v-14.0996h-36.3008v-13.7998h40.6006zM241 116.5v55.5l-25.2998 -27.4004zM278.8 147.5
+c5.90039 0 10.5 2.7998 10.5 9.2002c0 6.09961 -4.59961 8.39941 -10.2002 8.39941h-21.5v-17.5996h21.2002zM247.2 284.2h-38.9004v-12.5h37.7998v-14.1006h-37.7998v-13.7998h38.9004v-14.2998h-55.5v69.2998h55.5v-14.5996zM576 192.6h-0.200195h0.200195zM381.4 160.7
+c-0.100586 -7.60059 -4.2002 -15.2998 -11.9004 -18.4004c9.2002 -3.2998 11 -9.5 11 -18.3994l-0.0996094 -13.8008h-16.6006l0.100586 11.5c0 11.8008 -3.80078 13.8008 -14.8008 13.8008h-17.5996l-0.0996094 -25.3008h-16.6006l0.100586 69.3008h39.3994
+c13 0 27.1006 -2.30078 27.1006 -18.7002zM352.2 149.5c5.59961 0 11 1.2998 11 8.2002c0 6.39941 -5.60059 7.39941 -10.7002 7.39941h-21v-15.5996h20.7002zM179.4 229.5h-16.8008v54.2002l-24 -54.2002h-14.5996l-24 54.2002v-54.2002h-33.7998l-6.40039 15.2998h-34.5
+l-6.39941 -15.2998h-17.9004l29.7002 69.2998h24.5l28.0996 -65.7002v65.7002h27.1006l21.6992 -47l19.7002 47h27.6006v-69.2998zM31.2002 259.2h22.7002l-11.5 27.5996zM508.6 100.3c34.8008 0 54.8008 -2.2002 67.5 6.10059v-90.4004c0 -26.5 -21.5 -48 -48 -48h-480.1
+c-26.5 0 -48 21.5 -48 48v203.7h26.5996c4.2002 10.0996 2.2002 5.2998 6.40039 15.2998h19.2002c4.2002 -10 2.2002 -5.2002 6.39941 -15.2998h52.9004v11.3994c2.2002 -5 1.09961 -2.5 5.09961 -11.3994h29.5c2.40039 5.5 2.60059 5.7998 5.10059 11.3994v-11.3994h135.5
+v25.0996c6.39941 0 8 0.100586 9.7998 -0.200195c0 0 -0.200195 -10.8994 0.0996094 -24.7998h66.5v8.90039c7.40039 -5.90039 17.4004 -8.90039 29.7002 -8.90039h26.7998c4.2002 10.1006 2.2002 5.2998 6.40039 15.2998h19c6.5 -15 0.200195 -0.5 6.59961 -15.2998
+h52.8008v21.9004c11.7998 -19.7002 7.7998 -12.9004 13.1992 -21.9004h41.6006v92h-39.9004v-18.3994c-12.2002 20.1992 -6.2998 10.3994 -11.2002 18.3994h-43.2998v-20.5996c-6.2002 14.5996 -4.59961 10.7998 -8.7998 20.5996h-32.4004
+c-0.399414 0 -2.2998 -0.200195 -2.2998 0.299805h-27.5996c-12.7998 0 -23.1006 -3.19922 -30.7002 -9.2998v9.2998h-39.9004v-5.2998c-10.7998 6.10059 -20.6992 5.10059 -64.3994 5.2998c-0.100586 0 -11.6006 0.100586 -11.6006 0h-103
+c-2.5 -6.09961 -6.7998 -16.3994 -12.5996 -30c-2.7998 6 -11 23.8008 -13.9004 30h-46v-21.0996c-7.39941 17.4004 -4.69922 11 -9 21.0996h-39.6992c-3.40039 -7.89941 -13.7002 -32 -23.1006 -53.8994v109.8c0 26.5 21.5 48 48 48h480c26.5 0 48 -21.5 48 -48v-175.4
+c-37.7002 0.200195 -44 0.900391 -54.2998 -5v5c-45.2998 0 -53.5 1.7002 -64.9004 -5.19922v5.19922h-78.1992v-5.09961c-11.4004 6.5 -21.4004 5.09961 -75.7002 5.09961v-5.59961c-6.2998 3.7002 -14.5 5.59961 -24.2998 5.59961h-58
+c-3.5 -3.7998 -12.5 -13.6992 -15.7002 -17.1992c-12.7002 14.0996 -10.5 11.5996 -15.5 17.1992h-83.1006v-92.2998h82c3.30078 3.5 12.9004 13.9004 16.1006 17.4004c12.7002 -14.2998 10.2998 -11.7002 15.3994 -17.4004h48.9004
+c0 14.7002 0.0996094 8.2998 0.0996094 23c11.5 -0.200195 24.3008 0.200195 34.3008 6.2002c0 -13.9004 -0.100586 -17.0996 -0.100586 -29.2002h39.6006c0 18.5 0.0996094 7.40039 0.0996094 25.2998c6.2002 0 7.7002 0 9.40039 -0.0996094
+c0.0996094 -1.2998 0 0 0 -25.2002c152.8 0 145.899 -1.09961 156.699 4.5v-4.5zM544.9 164.8c-4.60059 0 -9.2002 -0.700195 -9.2002 -6.5c0 -12.2002 28.7998 0.299805 39.2998 -13.5v-25.7998c-4.90039 -7.09961 -14.0996 -8.90039 -22.5 -8.90039h-32l0.0996094 14.8008
+h32c4.10059 0 8.40039 1.2998 8.40039 6.39941c0 14.6006 -42.7002 -5.59961 -42.7002 27.4004c0 14.0996 11 20.7002 23.7998 20.7002h32.9004v-14.6006h-30.0996zM487.9 125c4.09961 0 8.69922 1 8.7998 6.40039c0 14.8994 -42.7002 -5.60059 -42.7002 27.3994
+c0 14.1006 10.7002 20.7002 23.5 20.7002h33.2002v-14.5996h-30.4004c-4.2998 0 -9.2002 -0.800781 -9.2002 -6.40039c0 -15.0996 42.9004 6.90039 42.9004 -26.2998c0 -16.4004 -11.4004 -22 -26.2002 -22h-32.2002l0.100586 14.7998h32.2002zM445.7 165.1h-38.5v-12.5
+h37.7998v-14.0996h-37.9004v-13.7998l38.6006 -0.299805l-0.100586 -14.3008h-55.1992l0.0996094 69.3008h55.2002v-14.3008zM389.4 273.2c0.299805 0.299805 1.69922 1 7.2998 1c1 0 2 -0.100586 3.09961 -0.100586l-7.2998 -16.8994
+c-2.2998 0 -3.2002 0.399414 -3.40039 0.5c-0.199219 0.200195 -1.09961 1.89941 -1.09961 7.89941c0 5.40039 1.09961 7.40039 1.40039 7.60059zM409.8 283.7h-0.0996094h0.0996094zM393.6 298.9h16.1006v-15.2002c-17.4004 0.299805 -33.1006 4.09961 -33.1006 -19.7002
+c0 -11.7998 2.80078 -19.9004 16.1006 -19.9004h7.39941l23.5 54.5h24.8008l27.8994 -65.3994v65.3994h25.2998l29.1006 -48.0996v48.0996h16.8994v-69h-23.5996l-31.2002 51.9004v-51.9004h-33.7002l-6.59961 15.3008h-34.2998l-6.40039 -15.3008h-19.2002
+c-22.7998 0 -33 11.8008 -33 34c0 23.3008 10.5 35.3008 34 35.3008zM435.7 286.8l-11.6006 -27.5996h22.8008zM334.6 298.8h16.9004v-69.2998h-16.9004v69.2998z" />
+    <glyph glyph-name="cc-paypal" unicode="&#xf1f4;" horiz-adv-x="576" 
+d="M186.3 189.8c0 -12.2002 -9.7002 -21.5 -22 -21.5c-9.2002 0 -16 5.2002 -16 15c0 12.2002 9.5 22 21.7002 22c9.2998 0 16.2998 -5.7002 16.2998 -15.5zM80.5 238.3c11.2998 0 19.7998 -1.5 17.5 -14.8994c-2 -12.7002 -10.5 -14.2002 -21.5 -14.2002l-8.2002 -0.299805
+l4.2998 26.6992c0.200195 1.7002 1.7002 2.7002 3.2002 2.7002h4.7002zM364.5 238.3c8.5 0 18 -0.5 18.0996 -11.0996c0 -15 -9 -18 -22 -18l-8 -0.299805l4.2002 26.6992c0.200195 1.7002 1.40039 2.7002 3.2002 2.7002h4.5zM576 368v-352c0 -26.5 -21.5 -48 -48 -48h-480
+c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h480c26.5 0 48 -21.5 48 -48zM128.3 232.6c0 21 -16.2002 28 -34.7002 28h-40c-2.5 0 -5 -2 -5.19922 -4.69922l-16.4004 -102.101c-0.299805 -2 1.2002 -4 3.2002 -4h19c2.7002 0 5.2002 2.90039 5.5 5.7002l4.5 26.5996
+c1 7.2002 13.2002 4.7002 18 4.7002c28.5996 0 46.0996 17 46.0996 45.7998zM212.5 223.8h-19c-3.7998 0 -4 -5.5 -4.2002 -8.2002c-5.7998 8.5 -14.2002 10 -23.7002 10c-24.5 0 -43.1992 -21.5 -43.1992 -45.1992c0 -19.5 12.1992 -32.2002 31.6992 -32.2002
+c9 0 20.2002 4.89941 26.5 11.8994c-0.5 -1.5 -1 -4.69922 -1 -6.19922c0 -2.30078 1 -4 3.2002 -4h17.2002c2.7002 0 5 2.89941 5.5 5.69922l10.2002 64.3008c0.299805 1.89941 -1.2002 3.89941 -3.2002 3.89941zM253 125.9l63.7002 92.5996c0.5 0.5 0.5 1 0.5 1.7002
+c0 1.7002 -1.5 3.5 -3.2002 3.5h-19.2002c-1.7002 0 -3.5 -1 -4.5 -2.5l-26.5 -39l-11 37.5c-0.799805 2.2002 -3 4 -5.5 4h-18.7002c-1.69922 0 -3.19922 -1.7998 -3.19922 -3.5c0 -1.2002 19.5 -56.7998 21.1992 -62.1006c-2.69922 -3.7998 -20.5 -28.5996 -20.5 -31.5996
+c0 -1.7998 1.5 -3.2002 3.2002 -3.2002h19.2002c1.7998 0.100586 3.5 1.10059 4.5 2.60059zM412.3 232.6c0 21 -16.2002 28 -34.7002 28h-39.6992c-2.7002 0 -5.2002 -2 -5.5 -4.69922l-16.2002 -102c-0.200195 -2 1.2998 -4 3.2002 -4h20.5c2 0 3.5 1.5 4 3.19922l4.5 29
+c1 7.2002 13.1992 4.7002 18 4.7002c28.3994 0 45.8994 17 45.8994 45.7998zM496.5 223.8h-19c-3.7998 0 -4 -5.5 -4.2998 -8.2002c-5.5 8.5 -14 10 -23.7002 10c-24.5 0 -43.2002 -21.5 -43.2002 -45.1992c0 -19.5 12.2002 -32.2002 31.7002 -32.2002
+c9.2998 0 20.5 4.89941 26.5 11.8994c-0.299805 -1.5 -1 -4.69922 -1 -6.19922c0 -2.30078 1 -4 3.2002 -4h17.2998c2.7002 0 5 2.89941 5.5 5.69922l10.2002 64.3008c0.299805 1.89941 -1.2002 3.89941 -3.2002 3.89941zM544 257.1c0 2 -1.5 3.5 -3.2002 3.5h-18.5
+c-1.5 0 -3 -1.19922 -3.2002 -2.69922l-16.1992 -104l-0.300781 -0.5c0 -1.80078 1.5 -3.5 3.5 -3.5h16.5c2.5 0 5 2.89941 5.2002 5.69922l16.2002 101.2v0.299805zM454 205.3c9.2998 0 16.2998 -5.7002 16.2002 -15.5c0 -12.2998 -9.7002 -21.5 -21.7002 -21.5
+c-9.2002 0 -16.2002 5.2998 -16.2002 15c0 12.2998 9.5 22 21.7002 22z" />
+    <glyph glyph-name="cc-stripe" unicode="&#xf1f5;" horiz-adv-x="576" 
+d="M492.4 227.2c8.69922 0 18 -6.7002 18 -22.7002h-36.7002c0 16 9.7998 22.7002 18.7002 22.7002zM375 224.6c12.9004 0.100586 21.9004 -14.5 21.9004 -33.0996c0 -19.0996 -8.80078 -33.4004 -21.9004 -33.4004c-8.2998 0 -13.2998 3 -16.7998 6.7002l-0.200195 52.7998
+c3.7002 4.10059 8.7998 7 17 7zM528 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h480zM122.2 166.9c0 42.2998 -54.2998 34.6992 -54.2998 50.6992c0 5.5 4.59961 7.7002 12.0996 7.7002
+c10.7998 0 24.5 -3.2998 35.2998 -9.09961v33.3994c-11.7998 4.7002 -23.5 6.5 -35.2998 6.5c-28.7998 0 -48 -15 -48 -40.1992c0 -39.3008 54 -32.9004 54 -49.9004c0 -6.59961 -5.7002 -8.7002 -13.5996 -8.7002c-11.8008 0 -26.9004 4.90039 -38.9004 11.2998v-33.8994
+c13.2002 -5.7002 26.5996 -8.10059 38.7998 -8.10059c29.6006 0.200195 49.9004 14.7002 49.9004 40.3008zM191 223.5v30.2998h-26.9004v30.7998l-34.6992 -7.39941l-0.200195 -113.9c0 -21 15.7998 -36.5 36.8994 -36.5c11.6006 0 20.2002 2.10059 24.9004 4.7002v28.9004
+c-4.5 -1.80078 -27 -8.30078 -27 12.5996v50.5h27zM265 221.1v32.7002h-0.0996094c-4.7002 1.7002 -21.3008 4.7998 -29.6006 -10.5l-2.2002 10.5h-30.6992v-124.5h35.5v84.4004c8.39941 11 22.5996 8.89941 27.0996 7.39941zM309.1 129.3v124.5h-35.6992v-124.5h35.6992z
+M309.1 272.2v28.8994l-35.6992 -7.59961v-28.9004zM383.2 126.7c25.3994 0.0996094 48.5996 20.5 48.5996 65.5996c0 41.2998 -23.5 63.7998 -48.3994 63.7998c-13.9004 0 -22.9004 -6.59961 -27.8008 -11.0996l-1.7998 8.7998h-31.2998v-165.8l35.5 7.5l0.0996094 40.2002
+c5.10059 -3.7002 12.7002 -9 25.1006 -9zM543.6 178.2c0.100586 2 0.400391 9.39941 0.400391 12.8994c0 36.4004 -17.5996 65.1006 -51.2998 65.1006c-33.7998 0 -54.2998 -28.7002 -54.2998 -64.9004c0 -42.7998 24.1992 -64.5 58.7998 -64.5
+c17 0 29.7002 3.90039 39.3994 9.2002v28.5996c-9.69922 -4.89941 -20.7998 -7.89941 -34.8994 -7.89941c-13.7998 0 -26 4.89941 -27.6006 21.5h69.5z" />
+    <glyph glyph-name="lastfm" unicode="&#xf202;" horiz-adv-x="512" 
+d="M225.8 80.9004c0 0 -31.7002 -31.1006 -97.8994 -31.1006c-82.2002 0 -127.9 48.1006 -127.9 137.2c0 92.7002 45.7002 147.2 131.8 147.2c117.7 0 129.3 -66.2002 161.3 -163c14 -42.7998 38.7002 -73.9004 97.9004 -73.9004c39.9004 0 61 8.7998 61 30.5
+c0 31.9004 -34.9004 35.1006 -79.7998 45.7002c-48.6006 11.7002 -68 36.9004 -68 76.7998c0 64 51.5996 83.9004 104.399 83.9004c59.8008 0 96.2002 -21.7002 100.9 -74.5l-58.5996 -7c-2.30078 25.2002 -17.5 35.7998 -45.7002 35.7998
+c-25.7998 0 -41.6006 -11.7998 -41.6006 -31.7002c0 -17.5996 7.60059 -28.0996 33.4004 -34c52.2998 -11.5 115 -19.2002 115 -92.0996c0 -58.6006 -49.2998 -80.9004 -122 -80.9004c-101.4 0 -136.6 45.7002 -155.4 102.601
+c-26.0996 81.5996 -34.3994 134.899 -100.899 134.899c-35.7002 0 -72.1006 -25.7998 -72.1006 -97.8994c0 -56.3008 28.7002 -91.5 69.2002 -91.5c45.7002 0 76.2002 34 76.2002 34z" />
+    <glyph glyph-name="lastfm-square" unicode="&#xf203;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM307.8 103.1c45.4004 0 76.2002 13.9004 76.1006 50.6006c0 45.5 -39.1006 50.3994 -71.8008 57.5
+c-16.0996 3.7002 -20.8994 10.2998 -20.8994 21.2998c0 12.5 9.89941 19.7998 26 19.7998c17.5996 0 27.0996 -6.59961 28.5996 -22.3994l36.7002 4.39941c-2.90039 33 -25.5996 46.6006 -63 46.6006c-32.9004 0 -65.2002 -12.4004 -65.2002 -52.4004
+c0 -24.9004 12.1006 -40.7002 42.5 -48c28.1006 -6.59961 49.9004 -8.7002 49.9004 -28.5996c0 -13.6006 -13.2002 -19.1006 -38.1006 -19.1006c-37 0 -52.3994 19.4004 -61.1992 46.2002c-20 60.5 -27.3008 101.9 -100.801 101.9c-53.8994 0 -82.5 -34.1006 -82.5 -92
+c0 -55.7002 28.6006 -85.8008 79.9004 -85.8008c41.4004 0 61.2002 19.4004 61.2002 19.4004l-11.7002 31.9004s-19 -21.3008 -47.5996 -21.3008c-25.3008 0 -43.3008 22 -43.3008 57.2002c0 45.1006 22.7002 61.2002 45.1006 61.2002c41.5 0 46.7002 -33.2998 63 -84.2998
+c11.7002 -35.5 33.7002 -64.1006 97.0996 -64.1006z" />
+    <glyph glyph-name="ioxhost" unicode="&#xf208;" horiz-adv-x="640" 
+d="M616 288c13.2998 0 24 -10.7002 24 -24c0 -13.2002 -10.7002 -24 -24 -24h-52.7002c3.10059 -15.5 4.7002 -31.5996 4.7002 -48c0 -137 -111 -248 -248 -248c-102.9 0 -191.2 62.7002 -228.7 152h-67.2998c-13.2998 0 -24 10.7002 -24 24c0 13.2002 10.7002 24 24 24
+h52.7002c-3.10059 15.5 -4.7002 31.5996 -4.7002 48c0 137 111 248 248 248c102.9 0 191.2 -62.7002 228.7 -152h67.2998zM520 192c0 16.5996 -2 32.5996 -5.7998 48h-298.2c-13.2998 0 -24 10.7002 -24 24c0 13.2002 10.7002 24 24 24h279.5
+c-33.9004 62 -99.7998 104 -175.5 104c-110.5 0 -200 -89.5 -200 -200c0 -16.5996 2 -32.5996 5.7998 -48h298.2c13.2998 0 24 -10.7002 24 -24c0 -13.2002 -10.7002 -24 -24 -24h-279.5c33.9004 -62 99.7998 -104 175.5 -104c110.5 0 200 89.5 200 200zM216 216h208
+c13.2998 0 24 -10.7002 24 -24c0 -13.2002 -10.7002 -24 -24 -24h-208c-13.2998 0 -24 10.7002 -24 24c0 13.2002 10.7002 24 24 24z" />
+    <glyph glyph-name="angellist" unicode="&#xf209;" 
+d="M347.1 232.6c48 -11.6992 54.9004 -50.5996 54.9004 -93.6992c0 -114.301 -73.4004 -202.9 -191.4 -202.9c-96.1992 0 -164.6 76.4004 -164.5 148.6c0 37.1006 14.2002 61.7002 51.1006 71.7002c-3.10059 8.2998 -8 20.7998 -8 29.7002
+c0 23.5 24.8994 52.5996 48.2998 52.5996c6.90039 0 13.7002 -2 20 -4.2998c-12.4004 35.2002 -46.5996 126.7 -46.5996 162c0 28.7998 14.5996 51.7002 45.6992 51.7002c40 0 85.4004 -144 95.1006 -172.5c12.5 31.4004 52.5 163.1 97.0996 163.1
+c28 0 43.7002 -22.2998 43.7002 -48.8994c0 -30.2002 -33.7002 -124.5 -45.4004 -157.101zM311.7 340l-33.1006 -93.7002l34 -6c8.5 23.4004 47.1006 128.9 47.1006 148c0 7.10059 -2.2998 16 -10.9004 16c-16 0 -33.0996 -52 -37.0996 -64.2998zM142.3 399.7
+c0 -29.1006 34.6006 -120 45.5 -148.8c7.7002 4.39941 19.7998 2.69922 35.4004 1.39941l-34.6006 100.3c-31.7998 92.8008 -46.2998 59 -46.2998 47.1006zM140 204c-7.7002 0 -20.2998 -13.4004 -20.4004 -21.0996c0 -20.8008 56 -97.7002 76.9004 -97.7002
+c5.7002 0 10.5996 6.2998 10.5996 11.3994c0 12.8008 -37.7998 107.4 -67.0996 107.4zM324.3 17.7002c55.2998 61.5 49.1006 158.6 31 174.7c-24 21.0996 -106 29.0996 -138.3 29.0996c-17.2998 0 -17.4004 -6.40039 -17.4004 -13.0996
+c0 -43.7002 92.9004 -39.7002 120.601 -39.7002c11.2002 0 15.7998 -9.90039 16.8994 -21.1006c-7.39941 -7.39941 -17.6992 -11.6992 -27.3994 -15.3994c-9.40039 -3.40039 -19.1006 -7.10059 -27.1006 -13.1006c-22 -16 -43.6992 -43.3994 -43.6992 -71.6992
+c0 -17.7002 10.5996 -32.9004 10.5996 -50.3008c0 -0.299805 -2 -6.5 -2 -7.39941c-32.5996 2.2998 -40.5996 34.5996 -41.7002 61.7002c-3.39941 -0.900391 -8 -0.600586 -11.7002 -0.600586c5.10059 -17.7998 -11.8994 -42 -38 -42
+c-37.7998 0 -88 57.2002 -58.2998 86.9004c28.7002 -35.9004 35 -51.4004 51.1006 -51.4004c4 0 11.6992 3.40039 11.6992 8.2998c0 12.8008 -42.8994 73.1006 -54.2998 73.1006c-16.7998 0 -37.7002 -24.9004 -20.5996 -68.2998
+c22.5996 -55.7002 69.5 -88.3008 128.899 -88.3008c43.4004 0 80.6006 16.6006 109.7 48.6006zM225.7 143.7c3.2002 -8.2998 6.59961 -16.6006 9.39941 -25.1006c6.30078 7.10059 12.9004 13.7002 20.3008 19.1006c-10 2 -20 2.89941 -29.7002 6z" />
+    <glyph glyph-name="buysellads" unicode="&#xf20d;" 
+d="M224 297.3l42.9004 -160.7h-85.8008zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48zM382.7 42.7002l-94.5 298.7h-128.4l-94.5 -298.7h90.7002l111.7 91.5996l24.2002 -91.5996h90.7998z
+" />
+    <glyph glyph-name="connectdevelop" unicode="&#xf20e;" horiz-adv-x="576" 
+d="M550.5 207c6.69629 -1.33887 11.7861 -7.5 11.7881 -14.7324c0 -7.5 -5.3584 -13.6602 -12.3223 -15l-54.9111 -95.3574c0.536133 -1.60742 0.804688 -3.21387 0.804688 -4.82129c0 -7.23145 -5.09082 -13.3926 -12.0547 -14.7314l-51.6963 -90.2686
+c0.535156 -1.33887 0.802734 -2.67773 0.802734 -4.28516c0 -8.30371 -6.69727 -15.2676 -15.2686 -15.2676c-4.28516 0 -8.30371 1.875 -10.9814 4.82129h-107.144c-2.67871 -3.21484 -6.96484 -5.35742 -11.5176 -5.35742s-8.83887 2.14258 -11.5166 5.35645h-106.875
+c-2.67969 -3.21484 -6.69727 -5.35742 -11.5186 -5.35742c-8.30371 0 -15.2676 6.69727 -15.2676 15.2676c0 1.875 0.535156 3.75 1.07031 5.35742l-51.6963 89.7324c-6.96484 1.33887 -12.0547 7.5 -12.0547 14.7314c0 1.875 0.268555 3.21387 0.804688 4.82129
+l-55.1797 95.3574c-6.96484 1.60742 -12.0537 7.76855 -12.0537 15c0 7.5 5.3584 13.6611 12.5898 15l53.3047 92.1436c0 0.536133 -0.268555 1.07227 -0.268555 1.60645c0 6.16113 3.75098 11.251 9.10742 13.6611l55.9824 97.2334
+c-0.536133 1.33887 -1.07129 3.21387 -1.07129 4.82129c0 8.57129 6.96484 15.2676 15.2676 15.2676c4.82227 0 8.83887 -2.14258 11.7861 -5.625h106.071c2.67871 3.48242 6.69629 5.625 11.5176 5.625s8.83887 -2.14258 11.5176 -5.62402h106.606
+c2.94727 3.48242 6.96484 5.625 11.7861 5.625c8.30371 0 15.2676 -6.69727 15.2676 -15.2676c0 -1.60742 -0.535156 -3.21484 -1.07031 -4.82129l55.4463 -95.8936c8.03613 -0.267578 14.7324 -6.96484 14.7324 -15.001c0 -2.67871 -0.803711 -5.08984 -1.875 -7.23145z
+M153.535 -2.73242v75.8037h-43.6602zM153.535 81.1074v50.624l-44.999 -47.4102c0.535156 -1.07227 1.07129 -2.14355 1.33887 -3.21387h43.6602zM153.535 143.518l0.000976562 92.9463l-50.0889 51.9648c-2.41113 -1.60645 -5.08887 -2.41113 -7.76855 -2.67871
+l-51.9648 -90c0.268555 -1.07227 0.268555 -2.14258 0.268555 -3.48242c0 -1.33887 0 -2.67871 -0.535156 -4.01758l55.7129 -96.4287c1.33887 -0.267578 2.67871 -1.07129 4.01758 -1.60742zM153.535 245.84v72.0527l-43.9277 -15.8037
+c0 -0.267578 0.267578 -0.803711 0.267578 -1.07227c0 -2.94531 -0.803711 -5.62402 -2.14258 -7.7666zM153.535 326.465v59.7324l-43.6602 -75.5361zM480.054 287.357l-0.267578 0.267578l-98.0361 -101.518l63.75 -67.2324l35.3584 167.143zM291.75 92.8926
+l-11.25 -11.7852h22.7676zM291.482 104.143l79.2852 82.2324l-83.0352 87.5889l-79.5537 -84.375zM296.839 98.25l16.875 -17.1426h124.02l5.8916 28.125l-67.5 71.25zM410.411 403.607l-117.053 -124.019l83.0342 -87.5889l97.5 101.25
+c-1.33984 2.14258 -2.14258 4.82129 -2.14258 7.7666v0.536133l-57.8574 100.714c-1.33984 0.268555 -2.41016 0.804688 -3.48145 1.34082zM401.304 405.75h-4.28711l-166.339 -60l57.0547 -60.2676zM277.821 405.75h-103.929l50.8936 -53.5713l148.393 53.5713h-75
+c-2.67871 -2.67773 -6.16016 -4.28516 -10.1787 -4.28516s-7.50098 1.60742 -10.1787 4.28516zM161.572 400.125v-70.7148l54.9111 19.8213l-51.1611 53.8398c-0.870117 -0.300781 -1.77832 -0.574219 -2.67969 -0.804688zM161.572 320.839v-83.3037l40.9814 -42.0527
+l79.5537 84.1064l-59.7324 63.2139zM161.572 228.161v-76.0723l36.4277 38.3037zM161.572 140.303v-59.1953h107.678l17.1426 17.6777l-82.7676 85.9814zM168.536 -21.75h1.33887l91.6074 94.8213h-99.9102v-89.7324l1.07031 -1.60645
+c2.41113 -0.804688 4.28613 -1.875 5.89355 -3.48242zM298.447 -21.75h104.194l-91.6064 94.8213h-38.3037l-91.6074 -94.8213h96.4287c2.68066 2.41016 6.42871 4.28516 10.4473 4.28516s7.76758 -1.875 10.4473 -4.28516zM418.447 -9.96387l17.4121 83.0361h-114.376
+l89.1953 -91.875c1.07227 0.536133 2.14355 1.07031 3.48242 1.33887zM431.303 12.2676l34.8223 60.8037h-21.9639zM466.125 81.1074c0.267578 1.07129 0.803711 2.14258 1.33887 2.94531l-17.1426 18.2139l-4.55371 -21.1592h20.3574zM532.286 188.518
+c-0.268555 1.33984 -0.536133 2.41113 -0.536133 3.75c0 1.60742 0.536133 2.94629 0.802734 4.28516l-45.8027 79.2861l-34.5537 -163.928l20.625 -21.9639c1.33887 0.802734 2.67871 1.33887 4.01758 1.87402z" />
+    <glyph glyph-name="dashcube" unicode="&#xf210;" 
+d="M326.6 344l102.2 104v-427c0 -50.5 -40.0996 -85 -91.2002 -85h-227.199c-51.1006 0 -91.2002 34.5 -91.2002 85v229.5c0 50.2002 40.0996 93.5 91.2002 93.5h216.199zM153.9 31.5v-0.0996094h223.8l-51.1006 52.2998v123.5c0 17.7002 -14.2998 32.5 -32 32.5h-140.699
+c-17.7002 0 -32.4004 -14.7998 -32.4004 -32.5v-142.9c0 -17.7002 14.7002 -32.7998 32.4004 -32.7998z" />
+    <glyph glyph-name="forumbee" unicode="&#xf211;" 
+d="M5.7998 138.3c-3.7998 17 -5.7998 34.2002 -5.7998 51.4004c0 123.3 99.7998 223.3 223.1 223.3c16.6006 0 33.3008 -2 49.3008 -5.5c-123.4 -47 -220.5 -145.5 -266.601 -269.2zM398.7 327.5c-151.101 -44 -269.2 -164.4 -312.3 -315.7
+c-17.2002 13.4004 -32.7002 30.9004 -45.2002 49c43.3994 149.9 160.1 267.7 309.7 312c18.0996 -12.5996 34.0996 -27.7998 47.7998 -45.2998zM414.5 74.7998c13.0996 -35.2998 24.2002 -73.2998 33.5 -109.8c-36.0996 9.2998 -72 20.5 -107 33.5996
+c-25.7002 -16 -54.5996 -26.8994 -84.5996 -31.2998c42.5996 79.7002 108.199 147.4 187.6 190.3c-4.09961 -29.0996 -14.2998 -57.6992 -29.5 -82.7998zM444.2 220.3c-113.7 -46.7002 -204.2 -139.399 -250.5 -253.5c-19.6006 2.7002 -38.5 7.60059 -56.6006 15.2002
+c44.9004 138.5 153.4 249.3 291.301 295.1c7.89941 -18.0996 13.1992 -37.2998 15.7998 -56.7998z" />
+    <glyph glyph-name="leanpub" unicode="&#xf212;" horiz-adv-x="576" 
+d="M386.539 336.515l15.0957 -248.955l-10.9785 0.275391c-36.2324 0.824219 -71.6406 -8.7832 -102.657 -27.9971c-31.0156 19.2139 -66.4238 27.9971 -102.657 27.9971c-45.5635 0 -82.0693 -10.7051 -123.516 -27.7227l31.291 258.288
+c28.5459 11.8027 61.4834 18.1143 92.2256 18.1143c41.1729 0 73.8359 -13.1748 102.657 -42.5439c27.7227 28.2715 59.0127 41.7217 98.5391 42.5439zM569.07 0c-25.5264 0 -47.4854 5.21484 -70.542 15.6445c-34.3105 15.6455 -69.9932 24.9785 -107.871 24.9785
+c-38.9775 0 -74.9346 -12.9014 -102.657 -40.623c-27.7227 27.7227 -63.6797 40.623 -102.657 40.623c-37.8779 0 -73.5605 -9.33301 -107.871 -24.9785c-22.2324 -9.88086 -44.7402 -15.6445 -69.1689 -15.6445h-1.37305l42.5449 349.141
+c39.251 22.2334 87.0117 34.8594 132.301 34.8594c37.0547 0 75.209 -7.68457 106.225 -29.0947c31.0156 21.4102 69.1699 29.0947 106.225 29.0947c45.2891 0 93.0498 -12.626 132.301 -34.8594zM525.702 44.7412l-34.0361 280.246
+c-30.7422 13.999 -67.248 21.4102 -101.009 21.4102c-38.4287 0 -74.3848 -12.0771 -102.657 -38.7021c-28.2725 26.625 -64.2275 38.7021 -102.657 38.7021c-33.7607 0 -70.2666 -7.41113 -101.009 -21.4102l-34.0361 -280.246
+c47.2109 19.4863 82.8945 33.4854 135.045 33.4854c37.6045 0 70.8174 -9.60547 102.657 -29.6436c31.8398 20.0381 65.0518 29.6436 102.657 29.6436c52.1504 0 87.834 -13.999 135.045 -33.4854z" />
+    <glyph glyph-name="sellsy" unicode="&#xf213;" horiz-adv-x="640" 
+d="M539.71 210.692c55.1572 -13.4834 94.0742 -63.124 94.0732 -119.509c0 -68.0264 -55.4639 -123.184 -123.185 -123.184h-381.197c-67.7217 0 -123.186 55.1572 -123.185 123.185c0 47.4961 27.8848 91.0098 70.7852 111.234
+c-2.14453 7.35449 -3.06543 15.0146 -3.06543 22.3691c0 46.2705 37.6914 83.9609 83.9629 83.9609c20.2227 0 39.835 -7.35449 55.1562 -20.5303c18.3867 74.7695 85.8008 127.781 163.021 127.781c92.542 0 167.924 -75.3818 167.924 -167.924
+c0 -12.5635 -1.22559 -25.127 -4.29004 -37.3838zM199.88 46.4463v110.928c0 8.27344 -7.04688 15.3213 -15.3213 15.3213h-30.9482c-8.27344 0 -15.3213 -7.04785 -15.3213 -15.3213v-110.928c0 -8.27344 7.04688 -15.3213 15.3213 -15.3213h30.9482
+c8.27344 0 15.3213 7.04688 15.3213 15.3213zM289.357 46.4463v131.458c0 8.27246 -7.04883 15.3203 -15.3223 15.3203h-30.9492c-8.27246 0 -15.3213 -7.04688 -15.3213 -15.3203v-131.458c0 -8.27344 7.04688 -15.3213 15.3213 -15.3213h30.9492
+c8.27344 0 15.3223 7.04688 15.3223 15.3213zM378.834 46.4463v162.714c0 8.27246 -7.04688 15.3213 -15.3213 15.3213h-30.9482c-8.27441 0 -15.3223 -7.04785 -15.3223 -15.3213v-162.714c0 -8.27344 7.04785 -15.3213 15.3223 -15.3213h30.9482
+c8.27441 0 15.3213 7.04688 15.3213 15.3213zM465.861 46.4463v224.612c0 8.58008 -7.04785 15.6279 -15.3223 15.6279h-28.4971c-8.27441 0 -15.3213 -7.04883 -15.3213 -15.6279v-224.612c0 -8.27344 7.04688 -15.3213 15.3213 -15.3213h28.4971
+c8.27441 0 15.3223 7.04688 15.3223 15.3213z" />
+    <glyph glyph-name="shirtsinbulk" unicode="&#xf214;" 
+d="M100 37.7002l4.40039 9.89941l30.5996 -13.3994l-4.40039 -9.90039zM139.4 20.2002l4.39941 9.89941l30.6006 -13.3994l-4.40039 -9.90039zM311.5 34.2002l30.5996 13.3994l4.40039 -9.89941l-30.5996 -13.4004zM179.1 3l4.40039 9.59961l30.2998 -13.3994
+l-4.39941 -9.90039zM60.4004 55.2002l4.39941 9.89941l30.6006 -13.6992l-4.40039 -9.60059zM271.8 16.7002l30.6006 13.3994l4.39941 -9.89941l-30.5996 -13.4004zM232.5 -0.799805l30.5996 13.3994l4.40039 -9.59961l-30.5996 -13.7002zM350.9 51.4004l30.5996 13.6992
+l4.40039 -9.89941l-30.6006 -13.4004zM170 401.4v-10.5h-33.5v10.5h33.5zM122.8 401.4l-0.0996094 -10.5h-33.5v10.5h33.5996zM75.5 401.4l0.0996094 -10.5h-33.2998v10.5h33.2002zM217 401.4v-10.5h-33.2002v10.5h33.2002zM311.5 401.4v-10.5h-33.5v10.5h33.5zM358.8 401.4
+v-10.5h-33.5v10.5h33.5zM264.2 401.4v-10.5h-33.2002v10.5h33.2002zM405.7 401.4v-10.5h-33.2998v10.5h33.2998zM52.7998 96.9004v-33.5h-10.7998v33.5h10.7998zM122.8 312.8l-0.0996094 -10.5h-33.5v10.5h33.5996zM52.7998 302.2v-23h-10.7998v33.5h33.5996v-10.5h-22.7998
+zM221.7 73.5996c-50.2002 0 -91.2998 40.8008 -91.2998 91.3008c0 50.1992 41.0996 91.2998 91.2998 91.2998c50.5 0 91.2998 -41.1006 91.2998 -91.2998c0 -50.5 -40.7998 -91.3008 -91.2998 -91.3008zM173.5 184.7c0 -44.2998 77.5996 -11.9004 77.5996 -38
+c0 -13.1006 -24 -14.2998 -32.6992 -14.2998c-12.3008 0 -29.8008 2.69922 -35.9004 14.8994h-0.900391l-9 -18.3994c14.8008 -9.30078 29.1006 -12.2002 47.2002 -12.2002c19.5 0 51 5.7998 51 31.2002c0 48.0996 -78.5 16.2998 -78.5 37.8994
+c0 13.1006 20.7998 14.9004 29.7998 14.9004c10.8008 0 29.2002 -3.2002 35.6006 -13.1006h0.899414l8.80078 16.9004c-15.1006 6.2002 -27.4004 12 -44.3008 12c-20.0996 0 -49.5996 -6.40039 -49.5996 -31.7998zM52.7998 269.6v-33.5996h-10.7998v33.5996h10.7998z
+M395.2 63.4004v33.5h10.7998v-33.5h-10.7998zM52.7998 140.1v-33.5h-10.7998v33.5h10.7998zM0 444.3h448v-406l-226.3 -98.5996l-221.7 98.5996v406zM418.8 57.2002h0.100586v270.1h-389.7v-270.1l192.8 -85.7002zM418.8 356.5h0.100586v58.5996h-389.7v-58.5996h389.6z
+M52.7998 226.4v-33.5h-10.7998v33.5h10.7998zM52.7998 183.2v-33.5h-10.7998v33.5h10.7998zM170 312.8v-10.5h-33.5v10.5h33.5zM395.2 149.7v33.5h10.7998v-33.5h-10.7998zM395.2 192.9v33.5h10.7998v-33.5h-10.7998zM217 312.8v-10.5h-33.2002v10.5h33.2002zM395.2 236
+v33.5h10.7998v-33.5h-10.7998zM395.2 106.5v33.5h10.7998v-33.5h-10.7998zM264.2 312.8v-10.5h-33.2002v10.5h33.2002zM311.5 312.8v-10.5h-33.5v10.5h33.5zM395.2 279.2l0.0996094 23h-22.7998v10.5h33.5v-33.5h-10.7998zM358.8 312.8v-10.5h-33.5v10.5h33.5z" />
+    <glyph glyph-name="simplybuilt" unicode="&#xf215;" horiz-adv-x="512" 
+d="M481.2 384c14.7002 0 26.5 -11.7998 26.7002 -26.2998v-331.4c0 -14.5 -11.8008 -26.2998 -26.6006 -26.2998h-450.399c-14.8008 0 -26.6006 11.7998 -26.6006 26.2998v331.4c0 14.5 11.7998 26.2998 26.4004 26.2998h106c14.5996 0 26.5996 -11.7998 26.5996 -26.2998
+v-39.6006h185.3v39.6006c0 14.5 12.1006 26.2998 26.6006 26.2998h106zM149.8 92.2002c36.9004 0 66.6006 29.7002 66.6006 66.3994c0 36.9004 -29.7002 66.6006 -66.6006 66.6006c-36.7002 0 -66.3994 -29.7002 -66.3994 -66.6006
+c0 -36.6992 29.7998 -66.3994 66.3994 -66.3994zM362.2 92.2002c36.5996 0 66.3994 29.7002 66.3994 66.5996c0 36.7002 -29.7998 66.4004 -66.3994 66.4004c-36.9004 0 -66.6006 -29.7998 -66.6006 -66.4004c0 -36.8994 29.7002 -66.5996 66.6006 -66.5996z" />
+    <glyph glyph-name="skyatlas" unicode="&#xf216;" horiz-adv-x="640" 
+d="M640 118.7c0 -65.9004 -52.5 -114.4 -117.5 -114.4c-165.9 0 -196.6 249.7 -359.7 249.7c-146.899 0 -147.1 -212.2 5.60059 -212.2c42.5 0 90.8994 17.7998 125.3 42.5c5.59961 4.10059 16.8994 16.2998 22.7998 16.2998s10.9004 -5 10.9004 -10.8994
+c0 -7.7998 -13.1006 -19.1006 -18.7002 -24.1006c-40.9004 -35.5996 -100.3 -61.1992 -154.7 -61.1992c-83.4004 -0.100586 -154 59 -154 144.899c0 85.9004 67.5 149.101 152.8 149.101c185.3 0 222.5 -245.9 361.9 -245.9c99.8994 0 94.7998 139.7 3.39941 139.7
+c-17.5 0 -35 -11.6006 -46.8994 -11.6006c-8.40039 0 -15.9004 7.2002 -15.9004 15.6006c0 11.5996 5.2998 23.7002 5.2998 36.2998c0 66.5996 -50.8994 114.7 -116.899 114.7c-53.1006 0 -80 -36.9004 -88.7998 -36.9004c-6.2002 0 -11.2002 5 -11.2002 11.2002
+c0 5.59961 4.09961 10.2998 7.7998 14.4004c25.2998 28.7998 64.7002 43.6992 102.8 43.6992c79.4004 0 139.101 -58.3994 139.101 -137.8c0 -6.89941 -0.300781 -13.7002 -1.2002 -20.5996c11.8994 3.09961 24.0996 4.7002 35.8994 4.7002
+c60.7002 0 111.9 -45.3008 111.9 -107.2z" />
+    <glyph glyph-name="pinterest-p" unicode="&#xf231;" horiz-adv-x="384" 
+d="M204 441.5c94.2002 0 180 -64.7998 180 -164.1c0 -93.3008 -47.7002 -196.801 -153.9 -196.801c-25.1992 0 -57 12.6006 -69.2998 36c-22.7998 -90.2998 -21 -103.8 -71.3994 -172.8c-5.2002 -1.89941 -3.5 -2.2998 -6.90039 1.5c-1.7998 18.9004 -4.5 37.5 -4.5 56.4004
+c0 61.2002 28.2002 149.7 42 209.1c-7.5 15.2998 -9.59961 33.9004 -9.59961 50.7002c0 80 93.8994 92 93.8994 25.7998c0 -39 -26.3994 -75.5996 -26.3994 -113.399c0 -25.8008 21.2998 -43.8008 46.1992 -43.8008c69 0 90.3008 99.6006 90.3008 152.7
+c0 71.1006 -50.4004 109.8 -118.5 109.8c-79.2002 0 -140.4 -57 -140.4 -137.399c0 -38.7002 23.7002 -58.5 23.7002 -67.7998c0 -7.80078 -5.7002 -35.4004 -15.6006 -35.4004c-24 0 -63.5996 40 -63.5996 110.4c0 110.699 101.4 179.1 204 179.1z" />
+    <glyph glyph-name="whatsapp" unicode="&#xf232;" 
+d="M380.9 350.9c41.8994 -42 67.0996 -97.7002 67.0996 -157c0 -122.4 -101.8 -222 -224.1 -222h-0.100586c-37.2002 0 -73.7002 9.2998 -106.1 27l-117.7 -30.9004l31.5 115c-19.4004 33.7002 -29.5996 71.9004 -29.5996 111c0 122.4 99.5996 222 222 222
+c59.2998 0 115.1 -23.0996 157 -65.0996zM223.9 9.2998c101.699 0 186.6 82.7998 186.6 184.601c0.0996094 49.2998 -21.2998 95.5996 -56.0996 130.5c-34.8008 34.8994 -81.1006 54.0996 -130.4 54.0996c-101.8 0 -184.6 -82.7998 -184.6 -184.5
+c0 -34.9004 9.69922 -68.7998 28.1992 -98.2002l4.40039 -7l-18.5996 -68.0996l69.7998 18.2998l6.7002 -4c28.2998 -16.7998 60.7998 -25.7002 94 -25.7002zM325.1 147.5c5.5 -2.7002 9.2002 -4.09961 10.5 -6.59961c1.40039 -2.30078 1.40039 -13.4004 -3.19922 -26.4004
+c-4.60059 -13 -26.7002 -24.7998 -37.4004 -26.4004c-17.5996 -2.59961 -31.4004 -1.2998 -66.5996 13.9004c-55.7002 24.0996 -92 80.0996 -94.8008 83.7998c-2.69922 3.7002 -22.5996 30.1006 -22.5996 57.4004s14.2998 40.7002 19.4004 46.2998
+c5.09961 5.5 11.0996 6.90039 14.7998 6.90039s7.39941 0 10.5996 -0.200195c3.40039 -0.200195 8 1.2998 12.5 -9.5c4.60059 -11.1006 15.7002 -38.4004 17.1006 -41.2002c1.39941 -2.7998 2.2998 -6 0.5 -9.7002c-10.6006 -21.2002 -22 -20.5 -16.3008 -30.2998
+c21.5 -36.9004 42.9004 -49.7002 75.5 -66c5.5 -2.7998 8.80078 -2.2998 12 1.40039c3.30078 3.7998 13.9004 16.1992 17.6006 21.7998c3.7002 5.59961 7.39941 4.7002 12.5 2.7998c5.09961 -1.7998 32.3994 -15.2002 37.8994 -18z" />
+    <glyph glyph-name="viacoin" unicode="&#xf237;" horiz-adv-x="384" 
+d="M384 416l-48 -112h48v-48h-68.5l-13.7998 -32h82.2998v-48h-102.8l-89.2002 -208l-89.2002 208h-102.8v48h82.2998l-13.7998 32h-68.5v48h48l-48 112h64l80.7998 -192h94.5l80.7002 192h64zM192 112l27 64h-54z" />
+    <glyph glyph-name="medium" unicode="&#xf23a;" 
+d="M0 416h448v-448h-448v448zM372.2 309.9v5h-83.2002l-59.2998 -147.9l-67.4004 148h-87.2998v-5.09961l28.0996 -33.9004c2.80078 -2.5 4.2002 -6.09961 3.80078 -9.7998v-133c0.799805 -4.7998 -0.700195 -9.7002 -4.10059 -13.2002l-31.5996 -38.2998v-5.10059h89.7998
+v5.10059l-31.5996 38.2998c-3.40039 3.5 -5.10059 8.40039 -4.40039 13.2002v115l78.7002 -171.601h9.09961l67.6006 171.601v-136.9c0 -3.59961 0 -4.2998 -2.40039 -6.7002l-24.2998 -23.5996v-4.90039h118v5.10059l-23.5 23
+c-2.10059 1.5 -3.10059 4.09961 -2.7002 6.7002v169.3c-0.400391 2.5 0.599609 5.09961 2.7002 6.7002z" />
+    <glyph glyph-name="y-combinator" unicode="&#xf23b;" 
+d="M448 416v-448h-448v448h448zM236 160.5l77.5 145.5h-32.7002l-45.7998 -91c-4.7002 -9.2998 -9 -18.2998 -12.7998 -26.7998l-12.2002 26.7998l-45.2002 91h-35l76.7002 -143.8v-94.5h29.5v92.7998z" />
+    <glyph glyph-name="optin-monster" unicode="&#xf23c;" horiz-adv-x="576" 
+d="M572.6 26.5996c1 -3.5 1.90039 -7 1.7002 -10.6992c0.799805 -31.6006 -44.2998 -64 -73.5 -65.1006c-17.2998 -0.799805 -34.5996 8.40039 -42.7002 23.5c-113.5 -4.09961 -227 -4.89941 -340.199 0c-8.40039 -15.0996 -25.7002 -24 -43 -23.5
+c-28.9004 1.10059 -74 33.5 -73.5 65.1006c0.299805 3.7998 0.799805 7.2998 1.89941 10.7998c-5.59961 9.39941 -4.7998 15.2998 5.40039 11.5996c3.2998 5.2002 7 9.5 11.0996 13.7998c-2.5 10.9004 1.2998 14.1006 11.1006 9.2002c4.5 3.2998 10 6.5 15.8994 9.2002
+c0 15.7998 11.7998 11.2002 17.2998 5.7002c12.5 1.7998 20.2002 -0.700195 26.8008 -5.7002v19.7002c-12.9004 0 -40.6006 11.3994 -45.9004 36.2002c-5 20.7998 2.59961 38.0996 25.0996 47.5996c0.800781 5.90039 8.10059 14 14.9004 15.9004
+c7.59961 1.89941 12.5 -4.60059 14.0996 -10.3008c7.40039 0 17.8008 -1.5 21.1006 -8.09961c5.39941 0.5 11.0996 1.40039 16.5 1.90039c-2.40039 1.89941 -5.10059 3.5 -8.10059 4.59961c-5.09961 8.90039 -13.7998 11.0996 -24.5996 11.5996
+c0 0.800781 0 1.60059 0.299805 2.7002c-19.7998 0.5 -44.0996 5.60059 -54.8994 17.7998c-21.3008 23.6006 -15.9004 83.6006 12.1992 103.5c8.40039 5.7002 21.6006 0.800781 22.7002 -9.69922c2.40039 -20.6006 0.400391 -26.8008 26.2002 -25.9004
+c8.09961 7.7998 16.7998 14.5996 26.5 20c-14.9004 1.2998 -28.9004 -1.59961 -43.7998 -3.7998c12.7002 12.5 23.8994 25.3994 56.7002 42.3994c23.5 11.9004 50 20.8008 76.1992 23.2002c-18.5996 7.90039 -40 11.9004 -59.6992 16.5
+c76.5 16.2002 174.6 22.1006 244.199 -37.5996c18.1006 -15.4004 32.4004 -36.2002 42.7002 -60c39.7998 -4.90039 36.4004 5.5 38.6006 25.0996c1.09961 10.2998 14.2998 15.4004 22.6992 9.5c14.9004 -10.5 22.2002 -30.7998 24.6006 -48.0996
+c2.2002 -17.7998 0.299805 -41.2998 -12.4004 -55.1006c-10.7998 -12.1992 -34.2998 -17.5996 -53.7998 -18.0996v-2.7998c-11.0996 -0.200195 -20.2998 -2.40039 -25.7002 -11.6006c-3 -1.09961 -5.7002 -2.69922 -8.39941 -4.59961
+c5.69922 -0.5 11.3994 -1.40039 16.7998 -1.90039c1.89941 5.60059 12.5996 8.40039 21.0996 8.40039c1.7002 5.40039 6.7998 11.9004 14.1006 10.2998c7.2998 -1.59961 14.0996 -10 14.8994 -15.8994c10.7998 -4.40039 22.1006 -12.2002 25.1006 -25.7002
+c1.89941 -8.10059 1.69922 -15.1006 0.299805 -21.9004c-5.7002 -25.2002 -33.2998 -36.2002 -45.9004 -36.2002c0 -6.69922 0 -13.1992 -0.299805 -19.6992c8.09961 6 16.4004 7.19922 26.7998 5.69922c6 5.90039 17.6006 9.40039 17.6006 -5.69922
+c5.59961 -2.7002 11.2998 -6 15.8994 -9.2002c10.1006 5 13.7002 0.5 10.7998 -9.2002c4.10059 -4.2998 8.10059 -8.90039 11.1006 -13.7998c10.0996 3.59961 11 -2.10059 5.39941 -11.6006zM498.8 280.6c17.2998 -6.69922 26.2002 -22.0996 30.2998 -35.6992
+c1.10059 10.5996 -2.69922 39.5 -13.7998 51.0996c-7.2998 7.2998 -14.0996 5.09961 -14.0996 -0.799805c0 -6.2002 -1.2998 -11.6006 -2.40039 -14.6006zM494.2 273.9c-3.2002 -3.30078 -9.2002 -4.90039 -14.1006 -5.7002c13 -15.7002 17 -41.7002 12.7002 -63
+c10.7998 2.2002 20.5 6.2998 26.2002 12.2002c1.90039 2.19922 3.7998 4.89941 4.90039 7.59961c-1.10059 21.2998 -10.2002 42.7002 -29.7002 48.9004zM470.1 267.1c-3.69922 0 -8.09961 0 -11.7998 0.300781c7.5 -20.6006 12.4004 -42.7002 14.2998 -64.6006
+c3.5 0 7.5 0.299805 11.6006 0.799805c5.89941 24.3008 -0.299805 51.6006 -14.1006 63.5zM47.5 245c4.09961 13.5 13 28.9004 30.2998 35.7002c-1 3 -2.39941 8.39941 -2.39941 14.5996c0 5.90039 -7.10059 8.10059 -14.1006 0.799805
+c-11.3994 -11.5996 -14.8994 -40.5996 -13.7998 -51.0996zM57.2002 217.4c5.7002 -6.2002 15.3994 -10 26.2002 -12.2002c-4.30078 21.3994 -0.300781 47.2998 12.6992 63c-4.89941 0.799805 -10.8994 2.5 -14.0996 5.7002
+c-19.4004 -6.2002 -28.2998 -27.6006 -29.7002 -48.9004c1.40039 -2.7002 3 -5.40039 4.90039 -7.59961zM105.1 202.8c2.40039 22.2002 9.10059 43.7998 19.8008 63.5c-5.2002 -1.09961 -10 -3 -14.9004 -4.89941l-12.2002 -5.10059v0.299805
+c-7.2998 -14.0996 -10 -34.3994 -5.39941 -53c4.59961 -0.5 8.59961 -0.799805 12.6992 -0.799805zM289.1 365.5c-41.8994 0 -76.1992 -34.0996 -76.1992 -75.9004c0 -42.1992 34.2998 -76.1992 76.1992 -76.1992c41.9004 0 76.2002 34 76.2002 76.1992
+c0 41.9004 -34.2998 75.9004 -76.2002 75.9004zM404.7 191.2c-12.9004 0.799805 -26.2002 0.799805 -39.5 1.09961c10 -50.5996 3.2998 -64.7002 16.5 -58.0996c16 8.09961 22.7002 39.2002 23 57zM350.7 192.8c-18.9004 0.299805 -38.1006 0.299805 -57 0v0.299805
+c-0.299805 -5.19922 0.200195 -38.0996 4.2998 -41.0996c11.0996 -5.40039 39.5 -4.59961 51.0996 -1.09961c5.40039 1.59961 2.40039 37 1.60059 41.8994zM278.3 139c4.60059 2.5 2.40039 45.4004 1.2998 53.7002v0.299805
+c-19.3994 -0.299805 -38.5996 -0.299805 -57.7998 -0.799805c-1.89941 -9.2002 -4.59961 -48.9004 1.90039 -51.6006c13 -5.69922 41.5996 -5.09961 54.5996 -1.59961zM171.8 190.1c-5.39941 -19.6992 0.299805 -45.0996 22.2002 -54.8994
+c5.40039 -2.5 8.59961 -2.5 9.7002 4.2998c1.89941 8.7002 2.5 36.7998 4.89941 52.2002c-12.1992 -0.200195 -24.5996 -0.799805 -36.7998 -1.60059zM136.4 158.8c2.39941 -3.7002 1.59961 -9.09961 -8 -12.5c43.7998 -47 92.6992 -85.7002 155.899 -106.5
+c67.5 19.2002 115.601 60 163.2 107c-11.0996 4.2998 -7.7002 10.2998 -7.2998 11.6006c-8.90039 0.799805 -17.9004 1.89941 -26.5 2.69922c-9.5 -33 -36 -52.8994 -46.7998 -31.5996c-2.7002 5.2002 -3.5 11.7002 -4.60059 16.7998
+c-3.7998 -8.39941 -13.2998 -8.09961 -24.5996 -8.89941c-13.2002 -1.10059 -31.6006 -1.30078 -44 3c-3 -12.9004 -11.1006 -12.9004 -26.7998 -14.3008c-14.1006 -1.39941 -48.7002 -4.09961 -54.9004 10.8008c-1.09961 -28.7002 -35.0996 -10 -45.0996 7
+c-3.2002 5.69922 -5.40039 11.3994 -7 17.5996c-7.80078 -0.799805 -15.7002 -1.59961 -23.5 -2.7002zM114.8 -13.7002c0.5 2.5 0.799805 5.2002 0.799805 8.2002c-5.69922 23.2002 -18.5996 49.7002 -33.5 54c-22.3994 6.7002 -68.8994 -23.5 -66.1992 -54.5996
+c12.6992 -19.5 40 -35.7002 59.1992 -36.5c17.8008 -0.800781 35.9004 11.0996 39.7002 28.8994zM106.1 52.2998c9 -16 15.5 -33.2998 16.7002 -51.8994c33.5 19.3994 69.1006 35.6992 105.9 47c-38.7002 20.5 -68.1006 47.7998 -97.2998 77
+c-2.10059 -1.30078 -5.10059 -2.40039 -7.80078 -3.5c-1.59961 -4.90039 8.7002 -5.30078 5.40039 -12.4004c-2.09961 -4.09961 -8.59961 -7.59961 -15.0996 -9.2002c-2.10059 -2.7002 -5.10059 -4.89941 -7.80078 -6.5h-0.299805
+c-0.200195 -13.5 -0.200195 -27 0.299805 -40.5zM443.7 -12.2998c-36.7998 21.2998 -74.1006 41.2998 -115.601 53c-13.7998 -6.2002 -27.8994 -11.2998 -42.1992 -15.4004c-2.10059 -0.799805 -2.10059 -0.799805 -4.30078 0
+c-11.8994 3.7002 -23.2998 8.10059 -34.8994 13.2002c-40.2002 -11.5996 -77.2998 -29.2002 -112.4 -50.7998h-0.299805v-0.299805c0.299805 0 0.299805 0 0.299805 0.299805c103.2 -4.10059 206.4 -3.5 309.4 0zM454.2 0.0996094c1 14.7002 7.2002 35.8008 16.5 51.7002
+l-0.299805 -0.299805c0.5 13.7002 0.799805 27.5 0.799805 41.2998c-3 1.7002 -5.7002 4.10059 -8.10059 6.7998c-6.5 1.30078 -12.8994 5.10059 -15.0996 8.90039c-1.90039 4.09961 1.2998 7.59961 5.90039 10.2998c-0.200195 0.5 -0.5 1.60059 -0.5 2.40039
+c-3 0.799805 -5.40039 1.7998 -7.60059 3.2002c-31.5996 -29.4004 -65.3994 -56.7002 -103.5 -76.7002c38.9004 -11.7002 76 -28.1006 111.9 -47.6006zM560.1 -6.09961c3 31.0996 -43.5 61.3994 -66.1992 54.5c-14.6006 -4.30078 -27.8008 -30.8008 -33.5 -54
+c0 -23.8008 21.1992 -37.9004 40.5 -37c19.1992 0.799805 46.5 17 59.1992 36.5zM372.9 372.8c-35.7002 39.2002 -81.4004 47.7998 -126 23.5c25.1992 56.2002 122.199 48.6006 126 -23.5zM74.7998 40.9004c14.9004 1.89941 24.6006 -19.2002 18.6006 -30.8008
+c-4.80078 -9.69922 -23.7002 -24.0996 -35.9004 -27.2998c-16.5 -4.59961 -32.2002 3.2998 -32.2002 14.9004c0 17.7998 33.7998 41.5996 49.5 43.2002zM290.7 217.1c-30.9004 0 -57.6006 25.7002 -50.2998 59.8008c13.1992 -20.7002 46.5 -12 46.5 11.2998
+c0 10 -7 18.5996 -16.5 21.5996c31.6992 13.7998 72.1992 -8.2002 72.1992 -44.2998c0 -26.7998 -23.2998 -48.4004 -51.8994 -48.4004zM68 -26.0996c-0.5 8.39941 20.2998 23.5 29.2002 25.0996c8.59961 1.59961 12.7002 -11.4004 9.7002 -18.4004
+c-2.7002 -5.69922 -10.5 -13.5 -17.3008 -16.1992c-9.39941 -3.2002 -21.0996 3 -21.5996 9.5zM501.2 40.9004c15.7002 -1.60059 49.5 -25.4004 49.5 -43.2002c0 -11.7002 -15.7002 -19.5 -32.2002 -14.9004c-12.0996 3.2002 -31.2998 17.6006 -36.2002 27.2998
+c-5.7002 11.6006 4 32.7002 18.9004 30.8008zM478.8 -1c8.90039 -1.59961 30 -16.7002 29.1006 -25.0996c-0.200195 -6.5 -12.1006 -12.7002 -21.3008 -9.5c-7 2.69922 -14.8994 10.5 -17.2998 16.1992c-2.89941 7.10059 1.10059 20 9.5 18.4004z" />
+    <glyph glyph-name="opencart" unicode="&#xf23d;" horiz-adv-x="640" 
+d="M423.3 7.2998c0 -25.2998 -20.2998 -45.5996 -45.5996 -45.5996s-45.7998 20.2998 -45.7998 45.5996s20.5996 45.7998 45.7998 45.7998c25.3994 0 45.5996 -20.5 45.5996 -45.7998zM169.4 53.0996c25.2998 0 45.7998 -20.5 45.7998 -45.7998
+s-20.5 -45.5996 -45.7998 -45.5996c-25.3008 0 -45.6006 20.3994 -45.6006 45.5996s20.2998 45.7998 45.6006 45.7998zM461.1 323.1c302.2 0 169.5 -67.1992 -17.1992 -233.899c59.1992 102.8 262.5 193.899 -70.8008 188.899c-319.8 -4.69922 -338.699 92.5 -373.1 144.2
+c81.9004 -86.3994 158.9 -99.2002 461.1 -99.2002z" />
+    <glyph glyph-name="expeditedssl" unicode="&#xf23e;" horiz-adv-x="496" 
+d="M248 404.6c117.4 0 212.6 -95.1992 212.6 -212.6s-95.1992 -212.6 -212.6 -212.6s-212.6 95.1992 -212.6 212.6s95.1992 212.6 212.6 212.6zM150.6 271.7h-0.199219v-26.6006c0 -5 3.89941 -8.89941 8.89941 -8.89941h17.7002c5 0 8.90039 3.89941 8.90039 8.89941
+v26.6006c0 82.0996 124 82.0996 124 0v-26.6006c0 -5 3.89941 -8.89941 8.89941 -8.89941h17.7002c5 0 8.90039 3.89941 8.90039 8.89941v26.6006c0 53.7002 -43.7002 97.3994 -97.4004 97.3994s-97.4004 -43.6992 -97.4004 -97.3994zM389.7 68v141.7
+c0 9.7002 -8 17.7002 -17.7002 17.7002h-248c-9.7002 0 -17.7002 -8 -17.7002 -17.7002v-141.7c0 -9.7002 8 -17.7002 17.7002 -17.7002h248c9.7002 0 17.7002 8 17.7002 17.7002zM141.7 205.3v-132.899c0 -2.5 -1.90039 -4.40039 -4.40039 -4.40039h-8.89941
+c-2.5 0 -4.40039 1.90039 -4.40039 4.40039v132.899c0 2.5 1.90039 4.40039 4.40039 4.40039h8.89941c2.5 0 4.40039 -1.90039 4.40039 -4.40039zM283.4 156.6c0 -13 -7.2002 -24.3994 -17.7002 -30.3994v-31.6006c0 -5 -3.90039 -8.89941 -8.90039 -8.89941h-17.7002
+c-5 0 -8.89941 3.89941 -8.89941 8.89941v31.6006c-10.5 6.09961 -17.7002 17.3994 -17.7002 30.3994c0 19.7002 15.7998 35.4004 35.4004 35.4004c19.5996 0 35.5 -15.7998 35.5 -35.4004zM248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248
+s111 248 248 248zM248 -38.2998c127 0 230.3 103.3 230.3 230.3s-103.3 230.3 -230.3 230.3s-230.3 -103.3 -230.3 -230.3s103.3 -230.3 230.3 -230.3z" />
+    <glyph glyph-name="cc-jcb" unicode="&#xf24b;" horiz-adv-x="576" 
+d="M431.5 203.7v32.2998c41.2002 0 38.5 -0.200195 38.5 -0.200195c7.2998 -1.2998 13.2998 -7.2998 13.2998 -16c0 -8.7998 -6 -14.5 -13.2998 -15.7998c-1.2002 -0.400391 -3.2998 -0.299805 -38.5 -0.299805zM474.3 183.5c7.5 -1.5 13.5 -8.2998 13.5 -17
+c0 -9 -6 -15.5 -13.5 -17c-2.7998 -0.700195 -3.2002 -0.5 -42.7998 -0.5v35c39.5 0 40 0.200195 42.7998 -0.5zM576 368v-352c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h480c26.5 0 48 -21.5 48 -48zM182 255.7h-57
+c0 -67.1006 10.7002 -109.7 -35.7998 -109.7c-19.5 0 -38.7998 5.7002 -57.2002 14.7998v-28c30 -8.2998 68 -8.2998 68 -8.2998c97.9004 0 82 47.7002 82 131.2zM360.5 251.2c-63.4004 16 -165 14.8994 -165 -59.2998c0 -77.1006 108.2 -73.6006 165 -59.2002v28.2998
+c-47.5996 -24.7002 -107.5 -22 -107.5 31s59.7998 55.5996 107.5 31.2002v28zM544 161.5c0 18.5 -16.5 30.5 -38 32v0.799805c19.5 2.7002 30.2998 15.5 30.2998 30.2002c0 19 -15.7002 30 -37 31c0 0 6.2998 0.299805 -120.3 0.299805v-127.5h122.7
+c24.2998 -0.0996094 42.2998 12.9004 42.2998 33.2002z" />
+    <glyph glyph-name="cc-diners-club" unicode="&#xf24c;" horiz-adv-x="576" 
+d="M239.7 368.1c97.2002 0 175.8 -78.5996 175.8 -175.8c0 -96.8994 -78.5996 -175.8 -175.8 -175.8c-96.9004 0 -175.8 78.9004 -175.8 175.8c0 97.2002 78.8994 175.8 175.8 175.8zM199.8 88.5v207.9c-41.7002 -16.2002 -71.3994 -56.7002 -71.3994 -104.101
+c0 -47.3994 29.6992 -87.8994 71.3994 -103.8zM279.6 88.2002c41.7002 16.2002 71.4004 56.7002 71.4004 104.1c0 47.4004 -29.7002 87.9004 -71.4004 104.101v-208.2zM528 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48v352
+c0 26.5 21.5 48 48 48h480zM329.7 0c105 0 200.7 85.5 200.7 190.2c0 114.6 -95.7002 193.8 -200.7 193.8h-90.2998c-106.2 0 -193.801 -79.2002 -193.801 -193.8c0 -104.7 87.6006 -190.2 193.801 -190.2h90.2998z" />
+    <glyph glyph-name="creative-commons" unicode="&#xf25e;" horiz-adv-x="496" 
+d="M245.83 233.13l-33.2197 -17.2803c-9.43066 19.5801 -25.2402 19.9307 -27.46 19.9307c-22.1309 0 -33.2207 -14.6104 -33.2207 -43.8398c0 -23.5703 9.20996 -43.8408 33.2207 -43.8408c14.4697 0 24.6494 7.09082 30.5693 21.2607l30.5498 -15.5
+c-6.16992 -11.5107 -25.6895 -38.9805 -65.0996 -38.9805c-22.5996 0 -73.96 10.3203 -73.96 77.0498c0 58.6904 43 77.0605 72.6299 77.0605c30.7197 0.00976562 52.7002 -11.9502 65.9902 -35.8604zM388.88 233.13l-32.7803 -17.2803
+c-9.5 19.7705 -25.7197 19.9307 -27.8994 19.9307c-22.1406 0 -33.2197 -14.6104 -33.2197 -43.8398c0 -23.5508 9.22949 -43.8408 33.2197 -43.8408c14.4502 0 24.6494 7.09082 30.54 21.2607l31 -15.5c-2.10059 -3.75 -21.3906 -38.9805 -65.0898 -38.9805
+c-22.6904 0 -73.96 9.87012 -73.96 77.0498c0 58.6699 42.9697 77.0605 72.6299 77.0605c30.71 0.00976562 52.5801 -11.9502 65.5596 -35.8604zM247.56 439.95c141.82 0 248.44 -110.13 248.44 -248c0 -147.13 -118.51 -248 -248.44 -248
+c-133.96 0 -247.56 109.51 -247.56 248c0 132.939 104.74 248 247.56 248zM248.43 -10.8604c103.16 0 202.83 81.1299 202.84 202.82c0 113.8 -90.2891 203.26 -202.819 203.26c-118.29 0 -203.72 -97.8496 -203.72 -203.27c0 -109.771 91.1592 -202.811 203.699 -202.811z
+" />
+    <glyph glyph-name="gg" unicode="&#xf260;" horiz-adv-x="512" 
+d="M179.2 217.6l102.399 -102.399l-102.399 -102.4l-179.2 179.2l179.2 179.2l44.7998 -44.7998l-25.5996 -25.6006l-19.2002 19.2002l-128 -128l128 -128l51.5 51.5l-77.1006 76.5zM332.8 371.2l179.2 -179.2l-179.2 -179.2l-44.7998 44.7998l25.5996 25.6006
+l19.2002 -19.2002l128 128l-128 128l-51.5 -51.5l77.1006 -76.5l-25.6006 -25.5996l-102.399 102.399z" />
+    <glyph glyph-name="gg-circle" unicode="&#xf261;" horiz-adv-x="512" 
+d="M257 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM207.5 65.2002l75 75.2002l-77.2002 77.1992l-24.3994 -24.3994l53.0996 -52.9004l-26.5996 -26.5996l-77.2002 77.2002l77.2002 77.1992l11.0996 -11.0996l24.2002 24.2002
+l-35.2002 35.3994l-125.7 -125.699zM306.5 67.4004l125.7 125.6l-125.7 125.7l-75 -75l77.2002 -77.2002l24.3994 24.4004l-53.0996 52.8994l26.5 26.5l77.2002 -77.2002l-77.2002 -77.1992l-11.0996 11.0996l-24.1006 -24.4004z" />
+    <glyph glyph-name="tripadvisor" unicode="&#xf262;" horiz-adv-x="576" 
+d="M528.91 269.18c28.8652 -26.2666 46.9404 -64.1113 46.9404 -106.176c0 -0.0615234 -0.000976562 -0.12207 -0.000976562 -0.183594h0.0302734c-0.00195312 -79.4414 -64.5479 -143.928 -143.989 -143.928c-37.7363 0 -72.0996 14.5527 -97.7803 38.3477
+l-46.1104 -50.1699l-46.1396 50.1992c-25.6064 -23.4443 -59.8145 -37.7793 -97.2334 -37.7793c-79.4268 0 -143.911 64.4844 -143.911 143.911c0 41.8076 17.8662 79.4756 46.374 105.778l-47.0898 51.2402h104.66c52.2266 35.5498 115.938 56.3369 183.822 56.3369
+s130.95 -20.7871 183.178 -56.3369h104.34zM144.06 65.4297c53.751 0 97.3906 43.6396 97.3906 97.3906s-43.6396 97.3896 -97.3906 97.3896s-97.3896 -43.6387 -97.3896 -97.3896s43.6387 -97.3906 97.3896 -97.3906zM288 165.63c0 64.0801 46.6104 119.07 108.08 142.59
+c-33.2285 13.8467 -70.0527 21.4941 -108.272 21.4941c-38.2207 0 -74.6689 -7.64746 -107.897 -21.4941c61.4697 -23.5098 108.09 -78.5 108.09 -142.59zM431.88 65.4297c53.7568 0.00292969 97.4004 43.6475 97.4004 97.4053c0 53.7598 -43.6455 97.4053 -97.4053 97.4053
+c-53.7588 0 -97.4053 -43.6455 -97.4053 -97.4053c0 -53.7578 43.6436 -97.4023 97.4004 -97.4053h0.00976562zM144.06 213.88c0.0175781 0 0.0332031 -0.000976562 0.0507812 -0.000976562c28.1299 0 50.9717 -22.8242 51 -50.9492v-0.109375
+c0 -28.1807 -22.8799 -51.0605 -51.0605 -51.0605s-51.0596 22.8799 -51.0596 51.0605s22.8789 51.0596 51.0596 51.0596h0.00976562zM431.88 213.88c28.1807 0 51.0605 -22.8789 51.0605 -51.0596s-22.8799 -51.0605 -51.0605 -51.0605s-51.0596 22.8799 -51.0596 51.0605
+s22.8789 51.0596 51.0596 51.0596z" />
+    <glyph glyph-name="odnoklassniki" unicode="&#xf263;" horiz-adv-x="320" 
+d="M275.1 114c-27.3994 -17.4004 -65.0996 -24.2998 -90 -26.9004l20.9004 -20.5996l76.2998 -76.2998c27.9004 -28.6006 -17.5 -73.2998 -45.7002 -45.7002c-19.0996 19.4004 -47.0996 47.4004 -76.2998 76.5996l-76.2998 -76.5
+c-28.2002 -27.5 -73.5996 17.6006 -45.4004 45.7002c19.4004 19.4004 47.1006 47.4004 76.3008 76.2998l20.5996 20.6006c-24.5996 2.59961 -62.9004 9.09961 -90.5996 26.8994c-32.6006 21 -46.9004 33.3008 -34.3008 59c7.40039 14.6006 27.7002 26.9004 54.6006 5.7002
+c0 0 36.2998 -28.8994 94.8994 -28.8994c58.6006 0 94.9004 28.8994 94.9004 28.8994c26.9004 21.1006 47.0996 8.90039 54.5996 -5.7002c12.4004 -25.6992 -1.89941 -38 -34.5 -59.0996zM30.2998 318.3c0 71.7002 58.2998 129.7 129.7 129.7s129.7 -58 129.7 -129.7
+c0 -71.3994 -58.2998 -129.399 -129.7 -129.399s-129.7 58 -129.7 129.399zM96.2998 318.3c0 -35.0996 28.6006 -63.7002 63.7002 -63.7002s63.7002 28.6006 63.7002 63.7002c0 35.4004 -28.6006 64 -63.7002 64s-63.7002 -28.5996 -63.7002 -64z" />
+    <glyph glyph-name="odnoklassniki-square" unicode="&#xf264;" 
+d="M184.2 270.9c0 22.0996 17.8994 40 39.7998 40s39.7998 -17.9004 39.7998 -40c0 -22 -17.8994 -39.8008 -39.7998 -39.8008s-39.7998 17.9004 -39.7998 39.8008zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352
+c26.5 0 48 -21.5 48 -48zM142.9 270.9c0 -44.6006 36.3994 -80.9004 81.0996 -80.9004s81.0996 36.2002 81.0996 80.9004c0 44.7998 -36.3994 81.0996 -81.0996 81.0996s-81.0996 -36.2002 -81.0996 -81.0996zM317.4 180.2
+c-4.60059 9.09961 -17.3008 16.7998 -34.1006 3.59961c0 0 -22.7002 -18 -59.2998 -18s-59.2998 18 -59.2998 18c-16.7998 13.2002 -29.5 5.5 -34.1006 -3.59961c-7.89941 -16.1006 1.10059 -23.7002 21.4004 -37c17.2998 -11.1006 41.2002 -15.2002 56.5996 -16.7998
+l-12.8994 -12.9004c-18.2002 -18 -35.5 -35.5 -47.7002 -47.7002c-17.5996 -17.5996 10.7002 -45.7998 28.4004 -28.5996l47.6992 47.8994c18.2002 -18.1992 35.7002 -35.6992 47.7002 -47.8994c17.6006 -17.2002 46 10.7002 28.6006 28.5996l-47.7002 47.7002l-13 12.9004
+c15.5 1.59961 39.0996 5.89941 56.2002 16.7998c20.3994 13.2998 29.2998 21 21.5 37z" />
+    <glyph glyph-name="get-pocket" unicode="&#xf265;" 
+d="M407.6 384c22.7002 0 40.4004 -18.2002 40.4004 -40.5996v-135.2c0 -124.7 -99.7998 -224.2 -223.8 -224.2c-124.5 0 -224.2 99.5 -224.2 224.2v135.2c0 22.0996 18.5 40.5996 40.5996 40.5996h367zM245.6 115.5c111.9 107.5 114.801 105.4 114.801 123.2
+c0 16.8994 -13.8008 30.7002 -30.7002 30.7002c-16.9004 0 -14.9004 -2.40039 -105.5 -89.3008c-89.1006 85.5 -88.2002 89.3008 -105.2 89.3008c-16.9004 0 -30.7002 -13.8008 -30.7002 -30.7002c0 -18.1006 1.2002 -14.2998 114.9 -123.2
+c11 -11.0996 30 -11.7998 42.3994 0z" />
+    <glyph glyph-name="wikipedia-w" unicode="&#xf266;" horiz-adv-x="640" 
+d="M640 396.8l-0.299805 -12.2002c-28.1006 -0.799805 -45 -15.7998 -55.7998 -40.2998c-25 -57.7998 -103.301 -240 -155.301 -358.6h-13.5996l-81.9004 193.1c-32.5 -63.5996 -68.2998 -130 -99.1992 -193.1c-0.300781 -0.299805 -15 0 -15 0.299805
+c-46.9004 109.7 -96.1006 218.6 -143.101 328.6c-11.3994 26.7002 -49.3994 70 -75.5996 69.7002c0 3.10059 -0.299805 10 -0.299805 14.2002h161.899v-13.9004c-19.2002 -1.09961 -52.7998 -13.2998 -43.2998 -34.1992c21.9004 -49.7002 103.6 -240.301 125.6 -288.601
+c15 29.7002 57.8008 109.2 75.3008 142.8c-13.9004 28.3008 -58.6006 133.9 -72.8008 160c-9.69922 17.8008 -36.0996 19.4004 -55.7998 19.7002v13.9004l142.5 -0.299805v-13.1006c-19.3994 -0.599609 -38.0996 -7.7998 -29.3994 -26.0996
+c18.8994 -40 30.5996 -68.1006 48.0996 -104.7c5.59961 10.7998 34.7002 69.4004 48.0996 100.8c8.90039 20.6006 -3.89941 28.6006 -38.5996 29.4004c0.299805 3.59961 0 10.2998 0.299805 13.5996c44.4004 0.299805 111.101 0.299805 123.101 0.600586v-13.6006
+c-22.5 -0.799805 -45.8008 -12.7998 -58.1006 -31.7002l-59.2002 -122.8c6.40039 -16.0996 63.3008 -142.8 69.2002 -156.7l122.4 282.601c-8.60059 23.0996 -36.4004 28.0996 -47.2002 28.2998v13.9004l127.8 -1.10059z" />
+    <glyph glyph-name="safari" unicode="&#xf267;" horiz-adv-x="512" 
+d="M274.69 173.31l-108.69 -71.3096l71.3096 108.69zM256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM411.85 265.21c-2.88672 -1.20801 -4.9082 -4.0625 -4.9082 -7.38574c0 -1.08496 0.21582 -2.12012 0.608398 -3.06445v0
+c1.20215 -2.90039 4.06348 -4.93457 7.39648 -4.93457c1.08105 0 2.1123 0.214844 3.05371 0.604492l14.75 6.11035c2.90234 1.20117 4.93848 4.06348 4.93848 7.39746c0 1.08496 -0.216797 2.11914 -0.608398 3.0625v0c-1.2002 2.90527 -4.06348 4.94336 -7.39941 4.94336
+c-1.08008 0 -2.11035 -0.214844 -3.05078 -0.603516zM314.43 354c-0.396484 -0.949219 -0.625 -1.99219 -0.625 -3.08496c0 -3.33398 2.04395 -6.19336 4.94531 -7.39551v0c0.941406 -0.388672 1.97461 -0.613281 3.05566 -0.613281
+c3.33301 0 6.19238 2.04297 7.39453 4.94336l6.12988 14.7803c0.389648 0.941406 0.613281 1.97461 0.613281 3.05566c0 3.33301 -2.04297 6.19238 -4.94336 7.39453v0c-0.944336 0.392578 -1.98047 0.618164 -3.06641 0.618164
+c-3.32324 0 -6.17578 -2.03125 -7.38379 -4.91797zM256 388c-4.41504 0 -8 -3.58496 -8 -8v-16c0 -4.41504 3.58496 -8 8 -8v0c4.41504 0 8 3.58496 8 8v16c0 4.41504 -3.58496 8 -8 8v0zM181 373.08c-2.89941 -1.20215 -4.93262 -4.0625 -4.93262 -7.39551
+c0 -1.06934 0.210938 -2.09082 0.592773 -3.02441l6.12988 -14.7803c1.16504 -2.97754 4.05762 -5.07812 7.44531 -5.07812c4.41602 0 8 3.58496 8 8c0 1.13672 -0.237305 2.21875 -0.665039 3.19824l-6.11035 14.75c-1.20117 2.90234 -4.06348 4.93848 -7.39746 4.93848
+c-1.08496 0 -2.11914 -0.216797 -3.0625 -0.608398zM117.42 330.59c-1.44727 -1.44824 -2.35254 -3.44922 -2.35254 -5.65625c0 -2.19141 0.883789 -4.17773 2.3125 -5.62402l11.3105 -11.3096c1.44727 -1.44727 3.44922 -2.34277 5.65527 -2.34277
+c2.20703 0 4.20605 0.895508 5.6543 2.34277v0c1.43848 1.44629 2.32715 3.44238 2.32715 5.6416c0 2.19824 -0.888672 4.19141 -2.32715 5.63867l-11.2695 11.3096c-1.44824 1.44727 -3.4502 2.34277 -5.65625 2.34277c-2.20703 0 -4.20605 -0.895508 -5.6543 -2.34277v0z
+M60 192c0 -4.41504 3.58496 -8 8 -8h16c4.41504 0 8 3.58496 8 8v0c0 4.41504 -3.58496 8 -8 8h-16c-4.41504 0 -8 -3.58496 -8 -8v0zM100.15 118.79c2.88672 1.20801 4.9082 4.0625 4.9082 7.38574c0 1.08496 -0.21582 2.12012 -0.608398 3.06445v0
+c-1.20215 2.90039 -4.06348 4.93457 -7.39648 4.93457c-1.08105 0 -2.1123 -0.214844 -3.05371 -0.604492l-14.75 -6.11035c-2.90234 -1.20117 -4.93848 -4.06348 -4.93848 -7.39746c0 -1.08496 0.216797 -2.11914 0.608398 -3.0625v0
+c1.2002 -2.90527 4.06348 -4.94336 7.39941 -4.94336c1.08008 0 2.11035 0.214844 3.05078 0.603516zM104.48 254.79c0.386719 0.939453 0.609375 1.93945 0.609375 3.0166c0 3.33203 -2.04102 6.19043 -4.93945 7.39355l-14.7803 6.12988
+c-0.941406 0.389648 -1.97461 0.613281 -3.05566 0.613281c-3.33301 0 -6.19238 -2.04297 -7.39453 -4.94336v0c-0.392578 -0.944336 -0.618164 -1.98047 -0.618164 -3.06641c0 -3.32324 2.03125 -6.17578 4.91797 -7.38379l14.7803 -6.12012
+c0.945312 -0.393555 1.9834 -0.619141 3.07129 -0.619141c3.34668 0 6.21582 2.05957 7.40918 4.97949v0zM197.57 30c0.427734 0.979492 0.672852 2.07129 0.672852 3.20801c0 4.41602 -3.58496 8 -8 8c-3.38867 0 -6.28809 -2.11035 -7.45312 -5.08789l-6.12988 -14.7803
+c-0.389648 -0.941406 -0.611328 -1.9834 -0.611328 -3.06543c0 -4.41699 3.58594 -8.00293 8.00293 -8.00293c3.33496 0 6.19727 2.04492 7.39844 4.94824zM264 4v16c0 4.41504 -3.58496 8 -8 8v0c-4.41504 0 -8 -3.58496 -8 -8v-16c0 -4.41504 3.58496 -8 8 -8v0
+c4.41504 0 8 3.58496 8 8zM331 10.9199c2.89941 1.20215 4.93262 4.0625 4.93262 7.39551c0 1.06934 -0.210938 2.09082 -0.592773 3.02441l-6.12988 14.7803c-1.20215 2.90039 -4.06348 4.93457 -7.39648 4.93457c-1.08105 0 -2.1123 -0.214844 -3.05371 -0.604492v0
+c-2.90039 -1.20215 -4.93457 -4.06348 -4.93457 -7.39648c0 -1.08105 0.214844 -2.1123 0.604492 -3.05371l6.11035 -14.75c1.20117 -2.90234 4.06348 -4.93848 7.39746 -4.93848c1.08496 0 2.11914 0.216797 3.0625 0.608398v0zM394.58 53.4102
+c1.44727 1.44824 2.35254 3.44922 2.35254 5.65625c0 2.19141 -0.883789 4.17773 -2.3125 5.62402l-11.3105 11.3096c-1.44727 1.44727 -3.44922 2.34277 -5.65527 2.34277c-2.20703 0 -4.20605 -0.895508 -5.6543 -2.34277v0
+c-1.43848 -1.44629 -2.32715 -3.44238 -2.32715 -5.6416c0 -2.19824 0.888672 -4.19141 2.32715 -5.63867l11.2695 -11.3096c1.44824 -1.44727 3.4502 -2.34277 5.65625 -2.34277c2.20703 0 4.20605 0.895508 5.6543 2.34277v0zM286.25 161.75l115.41 175.91
+l-175.91 -115.41l-115.41 -175.91zM437.08 117c0.392578 0.944336 0.618164 1.98047 0.618164 3.06641c0 3.32324 -2.03125 6.17578 -4.91797 7.38379l-14.7803 6.12012c-0.949219 0.396484 -1.99219 0.625 -3.08496 0.625c-3.33398 0 -6.19336 -2.04395 -7.39551 -4.94531
+v0c-0.388672 -0.941406 -0.613281 -1.97461 -0.613281 -3.05566c0 -3.33301 2.04297 -6.19238 4.94336 -7.39453l14.7803 -6.12988c0.941406 -0.389648 1.97461 -0.613281 3.05566 -0.613281c3.33301 0 6.19238 2.04297 7.39453 4.94336v0zM444 184c4.41504 0 8 3.58496 8 8
+v0c0 4.41504 -3.58496 8 -8 8h-16c-4.41504 0 -8 -3.58496 -8 -8v0c0 -4.41504 3.58496 -8 8 -8h16z" />
+    <glyph glyph-name="chrome" unicode="&#xf268;" horiz-adv-x="496" 
+d="M131.5 230.5l-76.4004 117.4c47.6006 59.1992 119 91.7998 192 92.0996c42.3008 0.299805 85.5 -10.5 124.801 -33.2002c43.3994 -25.2002 76.3994 -61.3994 97.3994 -103l-205.3 10.7998c-58.0996 3.40039 -113.4 -29.2998 -132.5 -84.0996zM164.4 192
+c0 46.2998 37.3994 83.5996 83.5996 83.5996s83.5996 -37.3994 83.5996 -83.5996s-37.3994 -83.5996 -83.5996 -83.5996s-83.5996 37.3994 -83.5996 83.5996zM479.3 281.2c43.5 -111.9 0 -241.9 -107.399 -303.9c-43.4004 -25.2002 -91.3008 -35.3994 -137.801 -32.8994
+l112.101 172.399c31.8994 49 31.2998 112.9 -6.60059 157.2zM133.7 144.4c26.2998 -51.7002 81.8994 -83.3008 139.5 -72.5l-63.7002 -124.801c-118.7 18.2002 -209.5 120.9 -209.5 244.9c0 50.0996 14.9004 96.9004 40.4004 135.9z" />
+    <glyph glyph-name="firefox" unicode="&#xf269;" horiz-adv-x="512" 
+d="M503.52 206.52c0.240234 -4.43945 0.360352 -9 0.480469 -13.5195c0 -137.19 -111.23 -248.42 -248.32 -248.42c-122.779 0 -224.859 89.2695 -244.779 206.38c-0.360352 3.24023 -0.720703 6.36035 -1.08008 9.59961c-4.91992 42.6006 0.479492 87.3604 16.0801 124.79
+c10.7998 25.8809 32.6396 54 49.7998 62.8809c-16.2002 -31.8008 -24.1201 -63 -25.7998 -83.8809c11.2793 37.2002 32.6299 68.3604 62.5098 90.3604c51.2402 37.6699 120.229 39.3604 147.71 15.3604c-51 -17.5107 -106.55 -87.96 -94.3105 -170.511
+c2.00586 -13.791 6.21289 -27.1582 12.1201 -39.2393c-9.51953 25.0801 -10.3594 60.3594 5 83.2793c17.1602 25.5508 41.6299 30.9502 54.71 28.1904c-5.15918 1.08008 -16.5596 -20.75 -18.2393 -24.5898c-3.99609 -9.09863 -6.25098 -19.1865 -6.25098 -29.7539
+c0 -0.416016 0.00390625 -0.832031 0.0107422 -1.24609c0.392578 -23.1182 10.1045 -44.0088 25.5596 -59c47.6504 -46.4307 124.561 -28.1602 159 24.8398c23.6406 36.4795 26.5205 98.3896 -3.83984 147.59c-7.62891 12.0801 -16.5693 22.9639 -26.8799 32.7598
+c-47.6602 45.4707 -116.06 64.6699 -180.24 52.9902c-0.240234 0 -0.599609 -0.120117 -0.839844 -0.120117c-1.7998 -0.359375 -3.47949 -0.719727 -5.16016 -1.08008c-0.359375 -0.120117 -0.839844 -0.120117 -1.2002 -0.239258l-5.87988 -1.44043
+c-14.5195 -3.55957 -34.7998 -10.7998 -49.4395 -19.5596c-0.09375 -0.0136719 -0.176758 -0.0566406 -0.240234 -0.120117l0.120117 0.120117c0 -0.0664062 -0.0537109 -0.120117 -0.120117 -0.120117l-0.120117 -0.120117l0.120117 0.120117h-0.129883l0.479492 0.479492
+c0.480469 0.480469 1.32031 1.16016 2.40039 2.16016c19.6797 17.7598 49.3203 31.9199 82.9102 39c14.7383 3.09766 29.8691 4.81543 45.4795 5h10.6299c12.9863 -0.311523 25.6123 -1.67188 38 -4c0.960938 -0.120117 1.76074 -0.360352 2.76074 -0.479492h0.120117
+c1.7998 -0.360352 3.71973 -0.84082 5.63965 -1.2002c19.2676 -4.375 38.0977 -11.0762 55.4297 -19.5605c2.40039 -1.2002 4.7998 -2.39941 7.2002 -3.71973c8.6748 -4.32129 16.8906 -9.37891 24.5996 -15.1201c4.32031 -3.12012 8.48047 -6.36035 12.4805 -9.83984
+c6.50781 -5.19434 12.5332 -10.6973 18.29 -16.7002c8.51074 -8.35645 16.2646 -17.1406 23.5098 -26.6396c0.959961 -1.2002 1.75977 -2.40039 2.75977 -3.71973c0.400391 -0.480469 0.640625 -0.84082 1 -1.32031l1.80078 -2.52051
+c0.359375 -0.479492 0.719727 -1.08008 1.08008 -1.55957c0.479492 -0.719727 1.0791 -1.56055 1.55957 -2.28027c0.441406 -0.571289 0.839844 -1.16992 1.2002 -1.7998l1.43945 -2.12988c0.441406 -0.571289 0.84082 -1.16992 1.2002 -1.7998
+c0.480469 -0.720703 0.959961 -1.56055 1.32031 -2.16016c0.359375 -0.600586 0.839844 -1.24023 1.2002 -1.91992c0.359375 -0.680664 0.839844 -1.32031 1.19922 -2c0.360352 -0.680664 0.84082 -1.28027 1.2002 -2c0.441406 -0.638672 0.842773 -1.30566 1.2002 -2
+c0.360352 -0.720703 0.839844 -1.56055 1.2002 -2.16016c0.359375 -0.599609 0.719727 -1.32031 1.08008 -1.91992c0.359375 -0.839844 0.799805 -1.67969 1.2002 -2.28027c0.399414 -0.599609 0.639648 -1.2002 1 -1.7998
+c0.359375 -0.839844 0.839844 -1.56055 1.19922 -2.40039c0.240234 -0.479492 0.480469 -1.08008 0.720703 -1.55957c0.479492 -0.839844 0.839844 -1.63965 1.31934 -2.63965l0.360352 -0.720703c1.75977 -3.71973 3.44043 -7.55957 5 -11.3994
+c0 -0.120117 0.120117 -0.240234 0.120117 -0.360352c0.439453 -1.2002 0.959961 -2.28027 1.43945 -3.48047c0.120117 -0.239258 0.240234 -0.599609 0.360352 -0.839844c0.480469 -1.08008 0.839844 -2.2793 1.32031 -3.35938
+c0.138672 -0.321289 0.261719 -0.660156 0.359375 -1c0.360352 -1.08008 0.84082 -2.28027 1.2002 -3.36035l0.360352 -1.08008c0.479492 -1.2002 0.839844 -2.28027 1.2002 -3.47949c0.119141 -0.400391 0.239258 -0.640625 0.359375 -1
+c0.360352 -1.08008 0.720703 -2.28027 1.08008 -3.48047c0.120117 -0.240234 0.120117 -0.599609 0.240234 -0.839844c0.360352 -1.2002 0.719727 -2.52051 1.08008 -3.71973c0.120117 -0.120117 0.120117 -0.360352 0.240234 -0.600586l1.08008 -4
+c0.119141 -0.120117 0.119141 -0.120117 0.119141 -0.240234c3.54297 -13.2549 6.04102 -27.1152 7.32031 -41.1494v-0.120117l0.360352 -4.67969v-0.120117c0 -1.56055 0.120117 -3.12012 0.239258 -4.68066z" />
+    <glyph glyph-name="opera" unicode="&#xf26a;" horiz-adv-x="496" 
+d="M313.9 415.3c-170.2 0 -252.601 -223.8 -147.5 -355.1c36.5 -45.4004 88.5996 -75.6006 147.5 -75.6006c36.2998 0 70.2998 11.1006 99.3994 30.4004c-43.7998 -39.2002 -101.899 -63 -165.3 -63c-3.90039 0 -8 0 -11.9004 0.299805
+c-131.5 6.10059 -236.1 114.601 -236.1 247.7c0 137 111 248 248 248h0.799805c63.1006 -0.299805 120.7 -24.0996 164.4 -63.0996c-29 19.3994 -63.1006 30.3994 -99.2998 30.3994zM415.7 17.5996c-40.9004 -24.6992 -90.7002 -23.5996 -132 5.80078
+c56.2002 20.5 97.7002 91.5996 97.7002 176.6c0 84.7002 -41.2002 155.8 -97.4004 176.6c41.7998 29.2002 91.2002 30.3008 132.9 5c105.899 -98.6992 105.5 -265.699 -1.2002 -364z" />
+    <glyph glyph-name="internet-explorer" unicode="&#xf26b;" horiz-adv-x="512" 
+d="M483.049 288.294c25.1963 -45.4473 33.2578 -97.5811 26.8516 -141.162h-328.792c0 -100.432 144.31 -136.029 196.818 -47.4355h120.833c-32.5645 -91.7285 -119.689 -146.022 -216.813 -146.022c-35.1367 0 -70.2725 0.143555 -101.695 15.5732
+c-87.3975 -44.4941 -180.251 -56.5693 -180.251 42.0059c0 45.8066 23.2461 107.096 43.9922 145.022c35.1357 63.7227 81.4121 124.875 135.687 173.168c-43.7061 -18.8604 -91.125 -66.2959 -121.977 -101.158c25.877 112.787 129.466 193.638 237.098 186.457
+c130.032 59.7939 209.673 34.1445 209.673 -38.5771c0 -27.4326 -10.5684 -63.2959 -21.4238 -87.8711zM64.5586 101.123c-73.001 -152.4 11.5254 -172.244 100.267 -123.304c-46.5635 27.4326 -82.5557 72.1533 -100.267 123.304zM180.536 209.996h207.961
+c-2 55.1514 -50.5635 94.8711 -103.981 94.8711c-53.7041 0 -101.979 -39.7197 -103.979 -94.8711zM365.072 397.596c46.2764 -18.002 85.9824 -57.2939 112.263 -99.5859c7.1416 18.8604 14.5693 47.8643 14.5693 67.8672c0 32.0049 -22.8525 53.7217 -54.2744 53.7217
+c-23.9951 0 -51.1328 -11.7158 -72.5576 -22.0029z" />
+    <glyph glyph-name="contao" unicode="&#xf26d;" horiz-adv-x="512" 
+d="M45.4004 143c14.3994 -67.0996 26.3994 -129 68.1992 -175h-79.5996c-18.7002 0 -34 15.2002 -34 34v380c0 18.7002 15.2002 34 34 34h57.7002c-13.7998 -12.5996 -26.1006 -27.2002 -36.9004 -43.5996c-45.3994 -70 -27 -146.801 -9.39941 -229.4zM478 416
+c18.7998 0 34 -15.2002 34 -34v-380.1c0 -18.8008 -15.2998 -34 -34 -34h-52.0996c38.6992 38.3994 60.5996 92.0996 57.3994 163.6l-137.399 -29.5996c-1.7002 -32.5 -12.9004 -63.8008 -57.4004 -73.2002c-24.9004 -5.2998 -45.4004 0.599609 -58.2998 11.7002
+c-15.7998 13.5 -28.4004 31 -49.5 131.199c-21.4004 100.5 -17 121.601 -8.2002 140.301c7.2998 15.2998 23.7002 29.2998 48.2998 34.5996c44.7998 9.40039 67.7002 -14.9004 82.6006 -43.9004l137.1 29.3008c-13.5 34.5996 -31.2998 62.6992 -52.7002 84.0996h90.2002z
+" />
+    <glyph glyph-name="500px" unicode="&#xf26e;" 
+d="M103.3 103.7c-6.5 14.2002 -6.89941 18.2998 7.40039 23.0996c25.5996 8 8 -9.2002 43.2002 -49.2002h0.299805v93.9004c1.2002 50.2002 44 92.2002 97.7002 92.2002c53.8994 0 97.6992 -43.5 97.6992 -96.7998c0 -63.4004 -60.7998 -113.2 -128.5 -93.3008
+c-10.5 4.2002 -2.09961 31.7002 8.5 28.6006c53 0 89.4004 10.0996 89.4004 64.3994c0 61 -77.0996 89.6006 -116.9 44.6006c-23.5 -26.4004 -17.5996 -42.1006 -17.5996 -157.601c50.7002 -31 118.3 -22 160.4 20.1006c24.7998 24.7998 38.5 58 38.5 93
+c0 35.2002 -13.8008 68.2002 -38.8008 93.2998c-24.7998 24.7998 -57.7998 38.5 -93.2998 38.5s-68.7998 -13.7998 -93.5 -38.5c-0.299805 -0.299805 -16 -16.5 -21.2002 -23.9004l-0.5 -0.599609c-3.2998 -4.7002 -6.2998 -9.09961 -20.0996 -6.09961
+c-6.90039 1.69922 -14.2998 5.7998 -14.2998 11.7998v186.8c0 5 3.89941 10.5 10.5 10.5h241.3c8.2998 0 8.2998 -11.5996 8.2998 -15.0996c0 -3.90039 0 -15.1006 -8.2998 -15.1006h-223.2v-132.899h0.299805c104.2 109.8 282.801 36 282.801 -108.9
+c0 -178.1 -244.801 -220.3 -310.101 -62.7998zM166.6 364.5c3.80078 18.7998 145.101 50.7998 238.301 -38.2002c8.5 -7.5 -9.5 -22.7998 -14.3008 -22.7998c-6.59961 0 -84.5996 87.9004 -209.399 40.4004c-10 -3.90039 -15.1006 16.3994 -14.6006 20.5996zM393 33.2998
+c8.09961 8 27.5996 -12.5996 20.7002 -20.3994c-135.601 -135.601 -357.601 -52.1006 -381.601 121.3c-1.5 10.7002 28.9004 15.5 28.9004 3.2998c33 -165 222 -214.1 332 -104.2zM213.6 141.4c0 3.39941 2.30078 4.69922 20.4004 22.5996l-18.2002 18.2002
+c-5.59961 5.59961 7.40039 17.2998 12.4004 17.2998c3.09961 0 2.89941 -0.700195 21.5 -19.5l17.8994 17.9004c6.10059 6.09961 22.5 -8.90039 16.2002 -15.7002l-18.2002 -18.2002l17.3008 -17.2998c7.7998 -7.7998 -5.30078 -18.2002 -10.7002 -18.2002
+c-3.2002 0 -2.7002 0.200195 -22.2998 19.5c-19.7002 -19.7002 -18.5 -19.5 -22.3008 -19.5c-2.39941 0 -5.5 1.40039 -8.5 4.40039c-1.19922 1.19922 -5.5 4.5 -5.5 8.5z" />
+    <glyph glyph-name="amazon" unicode="&#xf270;" 
+d="M257.2 285.3c0 39.2998 5.2002 69.2002 -35.5 69.1006c0 0 -37.9004 0 -54.2002 -49.5l-73.5 6.7998c0 49.2998 46.7002 104.3 134.7 104.3c87.7998 0 112.3 -57 112.3 -82.2998v-147.101c0 -27.5 32.2998 -52.7998 32.2998 -52.7998l-56.7998 -56
+c-9.90039 9.2998 -38.7998 36.6006 -45.2998 46.7998c-45.2002 -70.7998 -183.5 -66.2998 -183.5 43.2002c0 102 120.8 115.7 169.5 117.5zM257.2 198.5v40.5996c-33.7002 -1.09961 -84.2002 -10.5996 -84.2002 -57.7998c0 -50.7998 84.2002 -62.7998 84.2002 17.2002z
+M393.2 35c-7.7002 -10 -70 -67 -174.5 -67s-184.5 71.5 -209 101c-6.7998 7.7002 1 11.2998 5.5 8.2998c73.2998 -44.5 187.8 -117.8 372.5 -30.2998c7.5 3.7002 13.2998 -2 5.5 -12zM433 32.7998c-6.5 -15.7998 -16 -26.7998 -21.2002 -31
+c-5.5 -4.5 -9.5 -2.7002 -6.5 3.7998s19.2998 46.5 12.7002 55c-6.5 8.30078 -37 4.30078 -48 3.2002c-10.7998 -1 -13 -2 -14 0.299805c-2.2998 5.7002 21.7002 15.5 37.5 17.5c15.7002 1.80078 41 0.800781 46 -5.69922c3.7002 -5.10059 0 -27.1006 -6.5 -43.1006z" />
+    <glyph glyph-name="houzz" unicode="&#xf27c;" 
+d="M275.9 117.3h-104.601v-149.3h-154.3v448h109.5v-104.5l305.1 -85.5996v-257.9h-155.699v149.3z" />
+    <glyph glyph-name="vimeo-v" unicode="&#xf27d;" 
+d="M447.8 294.4c-2 -43.6006 -32.3994 -103.301 -91.3994 -179.101c-60.9004 -79.2002 -112.4 -118.8 -154.601 -118.8c-26.0996 0 -48.2002 24.0996 -66.2998 72.2998c-35.2002 129.2 -50.2002 204.9 -79.2998 204.9c-3.40039 0 -15.1006 -7.10059 -35.2002 -21.1006
+l-21 27.2002c51.5996 45.2998 100.9 95.7002 131.8 98.5c34.9004 3.40039 56.2998 -20.5 64.4004 -71.5c28.7002 -181.5 41.3994 -208.899 93.5996 -126.7c18.7002 29.6006 28.7998 52.1006 30.2002 67.6006c4.7998 45.8994 -35.7998 42.7998 -63.2998 31
+c22 72.0996 64.0996 107.1 126.2 105.1c45.7998 -1.2002 67.5 -31.0996 64.8994 -89.3994z" />
+    <glyph glyph-name="black-tie" unicode="&#xf27e;" 
+d="M0 416h448v-448h-448v448zM316.5 90.7998l-64.5 184l64.4004 86.6006h-184.9l64.5 -86.6006l-64.5 -184l92.5 -88.7002z" />
+    <glyph glyph-name="fonticons" unicode="&#xf280;" 
+d="M0 416h448v-448h-448v448zM187 275.1c11.9004 0 16.5996 -4.2998 16.2998 -23l50.7002 6.10059c0 44.5996 -30.5996 52.7998 -64.7002 52.7998c-50.7998 0 -77.2998 -20.4004 -77.2998 -70v-21h-28v-37.4004h22.2002c2.89941 0 5.7998 0 5.7998 -2.2998v-111.399
+c0 -5.60059 -1.5 -7.30078 -6.7002 -7.90039l-21.2998 -2v-25.7002h130.7v25.1006l-43.5 4.09961c-5.2002 0.599609 -3.2002 1.5 -3.2002 7.2998v112.9h55.7002l11.0996 37.2998h-67.3994c-2.90039 0 0.599609 2 0.599609 4.40039v23.2998
+c0 17.5 0.599609 27.3994 19 27.3994zM261.3 33.2998h102.601v25.1006l-15.7002 2.59961c-5.5 0.900391 -2.90039 1.5 -2.90039 7.2998v151.7h-80.2002l-6.69922 -29.5l24.1992 -6.40039c3.80078 -1.19922 6.7002 -3.7998 6.7002 -7.89941v-107.9
+c0 -5.59961 -2.39941 -6.7002 -7.59961 -7.2998l-20.4004 -2.59961v-25.1006zM342.1 288.8l21.9004 24.2002l-3.5 9.59961h-27.7002l-15.5 28h-9.2998l-15.5 -28h-27.7002l-3.5 -9.59961l21.7998 -24.2002l-9 -33.2002l7.30078 -7.2998l31.1992 16.6006l31.2002 -16.6006
+l7.2998 7.2998z" />
+    <glyph glyph-name="reddit-alien" unicode="&#xf281;" horiz-adv-x="512" 
+d="M440.3 244.5c55.2998 0 73.7002 -74.0996 23.7998 -99.7002c2.2002 -7.89941 3.10059 -16.7002 3.10059 -25.0996c0 -83.7998 -94.4004 -151.7 -210.8 -151.7c-115.9 0 -210.301 67.9004 -210.301 151.7c0 8.39941 0.800781 16.7998 2.60059 24.7002
+c-50.9004 25.5 -32.7002 100.1 22.8994 100.1c15 0 28.7002 -6.2002 38.4004 -16.2998c35.7998 24.7002 83.4004 40.5996 136.3 42.7998l30.4004 137.6c1.2998 4.90039 6.09961 8.40039 11 7.10059l97.3994 -21.6006c6.60059 12.7002 19.9004 22 35.3008 22
+c22.0996 0 39.6992 -18.0996 39.6992 -39.6992c0 -21.6006 -17.6992 -39.7002 -39.6992 -39.7002c-21.6006 0 -39.2002 17.5996 -39.2002 39.2002l-88.2002 19.7998l-27.7002 -124.8c53.2998 -1.7002 101.4 -17.6006 137.101 -42.3008
+c9.69922 9.7002 22.8994 15.9004 37.8994 15.9004zM129.4 139.1c0 -21.5996 17.6992 -39.2998 39.6992 -39.1992c21.6006 0 39.2002 17.5996 39.2002 39.1992c0 22.1006 -17.5996 39.7002 -39.2002 39.7002c-22.0996 0 -39.6992 -17.7002 -39.6992 -39.7002zM343.7 45.5996
+c4 3.5 4 9.7002 -0.100586 13.7002c-3.5 3.5 -9.69922 3.5 -13.1992 0c-29 -29 -121.2 -28.5 -149 0c-3.5 3.5 -9.7002 3.5 -13.2002 0c-4 -4 -4 -10.2002 0 -13.7002c36.3994 -36.3994 139.1 -36.3994 175.5 0zM342.9 99.7998c22 0 39.5996 17.7002 39.6992 39.2002
+c0 22.0996 -17.6992 39.7002 -39.6992 39.7002c-21.6006 0 -39.2002 -17.7002 -39.2002 -39.7002c0 -21.5996 17.5996 -39.2002 39.2002 -39.2002z" />
+    <glyph glyph-name="edge" unicode="&#xf282;" horiz-adv-x="512" 
+d="M481.92 313.52c6.46973 -12.7793 22.4697 -41.6494 21.9697 -85.0791c-0.0917969 -43.7148 -23.6953 -81.8525 -58.9492 -102.44c-17.1387 -10.1797 -37.2617 -16.1211 -58.6104 -16.1797c-0.139648 0 -52.6504 -2.56055 -80.5098 16.8096
+c-5.85059 4.08008 -9.14062 8.94043 -9.14062 14c0 6.16016 4.82031 9 6.39062 11c9.7998 12.75 15.1094 28.1699 15.1094 38.5703c0 32.71 -11 59.2998 -33 83.0996c-1.16016 1.25 -42.9795 50.1807 -122.25 50.1807c-63.2393 0 -123.46 -32.6504 -149.46 -79.1406
+c24.04 111.98 123.58 195.66 242.44 195.66c96.3496 0 184.96 -46.1797 226.01 -126.48zM212.77 -27.6699c1.28027 -0.570312 29.0107 -20.5898 67.1309 -27.21c-7.89551 -0.759766 -15.5156 -1.3584 -23.6084 -1.3584c-99.3408 0 -185.118 58.5361 -224.692 142.969
+c-25.75 55.4697 -24.0801 105.96 -23 118.27c4.16992 34.2803 27.0801 59.7002 46.8408 74.7998c29.6299 22.6904 68.8193 35.6904 107.529 35.6904c7.0498 0 43.9199 -0.900391 77.6406 -18.5898c32.5596 -17.1006 47.3193 -37.5801 56.5596 -53.5107
+c1.84961 -3.23242 3.49902 -6.64551 4.88965 -10.1396c-4.21973 4.65039 -40.0596 44.2002 -99.0596 -1c-26.6719 -19.334 -46.8008 -46.8369 -56.9697 -78.9199c-14.1406 -40.4004 -12.8398 -88.5801 20.0996 -136c12.2471 -18.1914 27.9951 -33.3955 46.6396 -45z
+M463.49 70.6602c2.1748 -1.37305 3.60742 -3.80176 3.60742 -6.56152c0 -1.53418 -0.447266 -2.96484 -1.21777 -4.16895c-47.5703 -75.4297 -127.86 -108.87 -163 -108.87c-22.7002 0 -48.1299 6.95996 -71.7002 19.6104c-33 17.6699 -49.4893 38.7598 -56 47.6699
+c-46.3301 63.5303 -28.25 122.29 -13.3301 151.66c9.73145 19.1172 22.8193 35.9404 38.7607 50c-4.04688 -8.04102 -6.40625 -17.168 -6.52051 -26.75c0 -80.9404 79.8506 -144 171.521 -144c0.116211 0 0.310547 0.0693359 0.426758 0.0693359
+c24.3125 0 47.6045 4.40137 69.123 12.4502c6.98145 2.61816 13.8652 5.69824 20.4102 9.12012c1.11328 0.618164 2.41113 0.970703 3.77441 0.970703c1.52344 0 2.94531 -0.44043 4.14551 -1.2002z" />
+    <glyph glyph-name="codiepie" unicode="&#xf284;" horiz-adv-x="472" 
+d="M422.5 245.1c30.7002 0 33.5 -53.0996 -0.299805 -53.0996h-10.7998v-44.2998h-26.6006v97.3994h37.7002zM472 95.4004c-42.0996 -91.9004 -121.6 -151.4 -224 -151.4c-137 0 -248 111 -248 248s111 248 248 248c97.4004 0 172.8 -53.7002 218.2 -138.4l-186 -108.8z
+M433.5 82.9004l-60.2998 30.6992c-27.1006 -44.2998 -70.4004 -71.3994 -122.4 -71.3994c-82.5 0 -149.2 66.7002 -149.2 148.899c0 82.5 66.7002 149.2 149.2 149.2c48.4004 0 88.9004 -23.5 116.9 -63.3994l59.5 34.5996c-40.7002 62.5996 -104.7 100 -179.2 100
+c-121.2 0 -219.5 -98.2998 -219.5 -219.5s98.2998 -219.5 219.5 -219.5c78.5996 0 146.5 42.0996 185.5 110.4z" />
+    <glyph glyph-name="modx" unicode="&#xf285;" 
+d="M356 206.2l36.7002 -23.7002v-214.5l-133 83.7998zM440 373l-83.2002 -134.3l-153.5 96.5l23 37.7998h213.7zM351 230.2l-249.8 -57.7002l-46 29v214.5zM97 153.8l249.7 57.7002l-125 -200.5h-213.7z" />
+    <glyph glyph-name="fort-awesome" unicode="&#xf286;" horiz-adv-x="512" 
+d="M489.2 160.1c2.59961 0 4.59961 -2 4.5 -4.59961v-219.5h-182.9v96c0 72.5996 -109.7 72.5996 -109.7 0v-96h-182.899v219.5c0 2.59961 2 4.59961 4.59961 4.59961h27.4004c2.59961 0 4.59961 -2 4.59961 -4.59961v-32h36.6006v178.3
+c0 2.60059 2 4.60059 4.59961 4.60059h27.4004c2.59961 0 4.59961 -2 4.59961 -4.60059v-32h36.2998v32c0 2.60059 2 4.60059 4.60059 4.60059h27.3994c2.60059 0 4.60059 -2 4.60059 -4.60059v-32h36.5996v32c0 6 8 4.60059 11.7002 4.60059v111.699
+c-5.40039 2.60059 -9.10059 8.30078 -9.10059 14.3008c0 20.7998 31.4004 20.6992 31.4004 0c0 -6 -3.7002 -11.7002 -9.09961 -14.3008v-4.89941c7.69922 1.7998 15.6992 2.89941 23.6992 2.89941c11.7002 0 22.9004 -4.2998 32.6006 -4.2998
+c8.89941 0 18.8994 4.2998 24 4.2998c2.59961 0 4.59961 -2 4.59961 -4.59961v-60c0 -6.90039 -23.0996 -8 -27.7002 -8c-10.5 0 -20.5 4.2998 -31.3994 4.2998c-8.60059 0 -17.4004 -1.39941 -25.7002 -3.39941v-38c3.7002 0 11.7002 1.39941 11.7002 -4.60059v-32h36.5996
+v32c0 2.60059 2 4.60059 4.60059 4.60059h27.3994c2.60059 0 4.60059 -2 4.60059 -4.60059v-32h36.5996v32c0 2.60059 2 4.60059 4.59961 4.60059h27.4004c2.59961 0 4.59961 -2 4.59961 -4.60059v-178.3h36.6006v32c0 2.59961 2 4.59961 4.59961 4.59961h27.4004z
+M201.1 164.6v64c0 2.60059 -2 4.60059 -4.59961 4.60059h-27.4004c-2.59961 0 -4.59961 -2 -4.59961 -4.60059v-64c0 -2.59961 2 -4.59961 4.59961 -4.59961h27.4004c2.59961 0 4.59961 2 4.59961 4.59961zM347.5 164.6v64c0 2.60059 -2 4.60059 -4.59961 4.60059h-27.4004
+c-2.59961 0 -4.59961 -2 -4.59961 -4.60059v-64c0 -2.59961 2 -4.59961 4.59961 -4.59961h27.4004c2.59961 0 4.59961 2 4.59961 4.59961z" />
+    <glyph glyph-name="usb" unicode="&#xf287;" horiz-adv-x="640" 
+d="M641.5 192c0 -3.09961 -1.7002 -6.09961 -4.5 -7.5l-89.0996 -53.5c-1.40039 -0.799805 -2.80078 -1.40039 -4.5 -1.40039c-1.40039 0 -3.10059 0.300781 -4.5 1.10059c-2.80078 1.7002 -4.5 4.5 -4.5 7.7998v35.5996h-238.7
+c25.2998 -39.5996 40.5 -106.899 69.5996 -106.899h26.7002v26.7998c0 5 3.90039 8.90039 8.90039 8.90039h89.0996c5 0 8.90039 -3.90039 8.90039 -8.90039v-89.0996c0 -5 -3.90039 -8.90039 -8.90039 -8.90039h-89.0996c-5 0 -8.90039 3.90039 -8.90039 8.90039v26.6992
+h-26.7002c-75.3994 0 -81.0996 142.5 -124.7 142.5h-100.3c-8.09961 -30.5996 -35.8994 -53.5 -69 -53.5c-39.2998 0.100586 -71.2998 32.1006 -71.2998 71.4004s32 71.2998 71.2998 71.2998c33.1006 0 61 -22.7998 69 -53.5c39.1006 0 43.9004 -9.5 74.6006 60.4004
+c40.0996 89.0996 58.0996 82.0996 108.899 82.0996c7.5 20.9004 27 35.6006 50.4004 35.6006c29.5 0 53.5 -23.9004 53.5 -53.5c0 -29.6006 -23.9004 -53.5 -53.5 -53.5c-23.4004 0 -42.9004 14.7998 -50.4004 35.5996h-29.7998
+c-29.0996 0 -44.2998 -67.4004 -69.5996 -106.9h310.1v35.6006c0 3.2998 1.7002 6.09961 4.5 7.7998s6.40039 1.40039 8.90039 -0.299805l89.0996 -53.5c2.7998 -1.10059 4.5 -4.10059 4.5 -7.2002z" />
+    <glyph glyph-name="product-hunt" unicode="&#xf288;" horiz-adv-x="512" 
+d="M326.3 229.2c0 -20.5 -16.7002 -37.2002 -37.2002 -37.2002h-70.2998v74.4004h70.2998c20.5 0 37.2002 -16.7002 37.2002 -37.2002zM504 192c0 -137 -111 -248 -248 -248s-248 111 -248 248s111 248 248 248s248 -111 248 -248zM375.9 229.2
+c0 47.8994 -38.9004 86.7998 -86.8008 86.7998h-119.899v-248h49.5996v74.4004h70.2998c47.9004 0 86.8008 38.8994 86.8008 86.7998z" />
+    <glyph glyph-name="mixcloud" unicode="&#xf289;" horiz-adv-x="640" 
+d="M424.43 228.271c42.3623 -9.1377 74.4805 -47.0693 74.4805 -92.2002c0 -52.3311 -42.6406 -94.6934 -94.9688 -94.6934h-289.614c-62.5752 0 -113.243 50.668 -113.243 112.966c0 56.7598 42.085 103.554 96.6299 111.582
+c22.9814 67.5586 86.9395 114.074 159.205 114.074c87.2158 0 159.205 -66.7266 167.511 -151.729zM403.941 83.7412c29.0713 0 52.6064 23.5352 52.6064 52.3301c0 22.1494 -14.1211 40.9766 -33.502 48.4531c-1.38477 -8.58301 -3.59961 -17.166 -6.36914 -25.4727
+c-8.01367 -25.6484 -49.0898 -14.2266 -40.1465 13.29c4.15332 12.7373 6.36914 26.0264 6.36914 39.5938c0 69.2197 -56.4834 125.702 -125.979 125.702c-49.8379 0 -94.6934 -29.626 -114.628 -73.9258c19.3809 -4.98438 37.3779 -14.9512 52.0527 -29.3486
+c19.9531 -19.9531 -10.2168 -50.1436 -30.1797 -30.1807c-13.29 13.291 -31.0107 20.7666 -49.8379 20.7666c-39.04 0 -70.8809 -31.5645 -70.8809 -70.6045s31.8408 -70.6035 70.8809 -70.6035h289.614zM639.01 136.071c0 -44.0244 -12.7363 -86.3867 -37.1016 -122.657
+c-4.15332 -6.0918 -10.7979 -9.41406 -17.7197 -9.41406c-16.3174 0 -27.1279 18.8262 -17.4434 32.9492c19.3809 29.3486 29.9033 63.6816 29.9033 99.1221c0 35.4395 -10.5215 69.7725 -29.9033 98.8447c-15.6553 22.8311 19.3613 47.2402 35.1631 23.5342
+c24.3662 -35.9932 37.1016 -78.3564 37.1016 -122.379zM568.13 136.071c0 -31.5654 -9.13672 -62.0215 -26.8564 -88.3252c-4.15332 -6.09082 -10.7988 -9.13574 -17.7207 -9.13574c-17.2012 0 -27.0215 18.9785 -17.4424 32.9473
+c13.0127 19.1045 19.6572 41.2559 19.6572 64.5137c0 22.9805 -6.64453 45.4072 -19.6572 64.5117c-15.7617 22.9863 19.0078 47.0947 35.1631 23.5352c17.7188 -26.0264 26.8564 -56.4834 26.8564 -88.0469z" />
+    <glyph glyph-name="scribd" unicode="&#xf28a;" horiz-adv-x="384" 
+d="M42.2998 195.3c-16.0996 19 -24.7002 45.9004 -24.7998 79.9004c0 100.399 75.2002 153.1 167.2 153.1c98.5996 1.60059 156.8 -49 184.3 -70.5996l-50.5 -72.1006l-37.2998 24.6006l26.8994 38.5996c-36.5 24 -79.3994 36.5 -123 35.7998
+c-50.6992 0.800781 -111.699 -27.1992 -111.699 -76.1992c0 -18.7002 11.1992 -20.7002 28.5996 -15.6006c23.2998 5.2998 41.9004 -0.599609 55.7998 -14c26.4004 -24.2998 23.2002 -67.5996 -0.700195 -91.8994c-29.1992 -29.5 -85.1992 -27.3008 -114.8 8.39941z
+M360 189.4c33.9004 -40.4004 36.7998 -138.2 -20.2998 -189.601c-39.2002 -33.5996 -82.2002 -44.0996 -133.601 -44.0996c-70.2998 -0.299805 -138.199 25.3994 -190.699 72.2002l-15.4004 13.7998l60.7998 71.7998l35.6006 -27.4004l-33.7002 -39.3994
+c41.7002 -30.9004 92.2002 -47.5 144.1 -47.2998c61.9004 0 104.7 23.5 121.4 64.3994c0.899414 4.2002 1.39941 8.40039 1.39941 12.7002c0 18.7002 -11.1992 20.7002 -28.5996 15.5996c-23.2998 -5.2998 -42.2002 0.5 -56.2998 14.4004
+c-12.4004 11.2998 -19.1006 27.5 -18.4004 44.2998c-0.599609 39.2002 32.4004 69.2002 70.5 67.2002c24.2998 0.799805 47.7002 -9.7998 63.2002 -28.5996z" />
+    <glyph glyph-name="bluetooth" unicode="&#xf293;" 
+d="M292.6 276.9l-42.8994 -42.9004l-0.299805 86zM249.4 57.0996l0.199219 86l42.9004 -42.8994zM416 188.6c0 -205.6 -71.9004 -252.6 -185.1 -252.6c-113.2 0 -198.9 47 -198.9 252.6c0 205.601 83.4004 259.4 196.6 259.4c113.2 0 187.4 -53.9004 187.4 -259.4z
+M257.5 188.6l79.4004 88.6006l-125.101 134.3v-176.9l-73.7998 73.8008l-27 -26.9004l92.7002 -93l-92.7002 -93l26.9004 -26.9004l73.7998 73.8008l2.2998 -170l127.4 127.5z" />
+    <glyph glyph-name="bluetooth-b" unicode="&#xf294;" horiz-adv-x="320" 
+d="M196.48 187.977l97.9111 -103.333l-148.552 -148.644l-2.71484 198.284l-86.1113 -86.1113l-31.4053 31.4053l108.061 108.398l-108.061 108.399l31.4053 31.4053l86.1113 -86.1113v206.33l145.981 -156.69zM237.34 290.973l-50.3145 50.3174l0.337891 -100.295z
+M187.363 134.96l-0.337891 -100.294l50.3145 50.3164z" />
+    <glyph glyph-name="gitlab" unicode="&#xf296;" horiz-adv-x="512" 
+d="M105.2 423.1c0 0 56.5 -174.8 56.5996 -174.8h-132l56.5 174.8c3.2002 8.90039 15.7998 8.90039 18.9004 0zM0.900391 160.3l28.7998 88l226.2 -294l-247.9 184c-6.7998 5.10059 -9.7002 14 -7.09961 22zM161.7 248.3h188.6l-94.2998 -294zM511.1 160.3
+c2.5 -8 -0.299805 -16.8994 -7.19922 -22l-247.9 -184l226.3 294zM425.7 423.1l56.5 -174.8h-132l56.5996 174.8c3.2002 8.90039 15.7998 8.90039 18.9004 0z" />
+    <glyph glyph-name="wpbeginner" unicode="&#xf297;" horiz-adv-x="512" 
+d="M462.799 125.626c56.2109 -64.3076 4.16211 -157.626 -91.8545 -157.626c-39.6025 0 -78.8242 17.6865 -100.143 50.04c-6.88672 -0.356445 -22.7021 -0.356445 -29.5898 0c-21.3643 -32.4209 -60.624 -50.04 -100.143 -50.04
+c-95.4902 0 -148.349 92.9961 -91.8555 157.626c-79.1387 131.851 31.2646 290.374 206.792 290.374c175.632 0 285.87 -158.626 206.793 -290.374zM123.152 208.598h41.5283v58.0752h-41.5283v-58.0752zM340.332 122.526v23.8389
+c-60.5059 -20.915 -132.355 -9.19824 -187.589 33.9707l0.246094 -24.8965c51.1006 -46.3672 131.746 -57.875 187.343 -32.9131zM189.579 208.598h166.058v58.0752h-166.058v-58.0752z" />
+    <glyph glyph-name="wpforms" unicode="&#xf298;" 
+d="M448 372.8v-361.7c0 -24.2998 -19 -43.1992 -43.2002 -43.1992h-361.6c-23.9004 0.0996094 -43.2002 18.6992 -43.2002 43.2998v361.6c0 24.1006 18.7998 43.2002 43.2002 43.2002h361.7c24 0 43.0996 -18.7998 43.0996 -43.2002zM410.7 11.2002v361.6
+c0 3 -2.60059 5.7998 -5.7998 5.7998h-9.30078l-110.3 -74.5996l-61.2998 49.9004l-61.2002 -49.9004l-110.3 74.7002h-9.2998c-3.2002 0 -5.7998 -2.7998 -5.7998 -5.7998v-361.7c0 -3 2.59961 -5.7998 5.7998 -5.7998h361.7
+c3.19922 -0.100586 5.7998 2.69922 5.7998 5.7998zM150.2 262v-37h-73.5v37h73.5zM150.2 187.6v-37.2998h-73.5v37.2998h73.5zM161.3 334.9l54 43.6992h-118.5zM371.3 262v-37h-196v37h196zM371.3 187.6v-37.2998h-196v37.2998h196zM286.7 334.9l64.5 43.6992h-118.4z
+M371.3 113v-37.2998h-99.3994v37.2998h99.3994z" />
+    <glyph glyph-name="envira" unicode="&#xf299;" 
+d="M0 416c477.6 0 366.6 -317.3 367.1 -366.3l80.9004 -81.7002h-26l-70.4004 71.2002c-39 -4.2002 -124.399 -34.5 -214.399 37c-90.2002 71.5 -85.2002 157.1 -137.2 339.8zM79.7002 370c-49.7002 23.5 -5.2002 -9.2002 -5.2002 -9.2002
+c45.2002 -31.2002 66 -73.7002 90.2002 -119.899c31.5 -60.2002 79 -139.7 144.2 -167.7c65 -28 34.1992 -12.5 6 8.5c-28.2002 21.2002 -68.2002 87 -91 130.2c-31.7002 60 -61 118.6 -144.2 158.1z" />
+    <glyph glyph-name="glide" unicode="&#xf2a5;" 
+d="M252.8 299.4c0 -8.80078 -1.59961 -17.7002 -3.39941 -26.4004c-5.80078 -27.7998 -11.6006 -55.7998 -17.3008 -83.5996c-1.39941 -6.30078 -8.2998 -4.90039 -13.6992 -4.90039c-23.8008 0 -30.5 26 -30.5 45.5c0 29.2998 11.1992 68.0996 38.5 83.0996
+c4.2998 2.5 9.19922 4.2002 14.0996 4.2002c11.4004 0 12.2998 -8.2998 12.2998 -17.8994zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48zM384 181c0 5.09961 -20.7998 37.7002 -25.5 39.5
+c-2.2002 0.900391 -7.2002 2.2998 -9.59961 2.2998c-23.1006 0 -38.7002 -10.5 -58.2002 -21.5l-0.5 0.5c4.2998 29.4004 14.5996 57.2002 14.5996 87.4004c0 44.5996 -23.7998 62.7002 -67.5 62.7002c-71.7002 0 -108 -70.8008 -108 -123.5c0 -54.7002 32 -85 86.2998 -85
+c7.5 0 6.90039 0.599609 6.90039 -2.30078c-10.5 -80.2998 -56.5 -82.8994 -56.5 -58.8994c0 24.3994 28 36.5 28.2998 38c-0.200195 7.59961 -29.2998 17.2002 -36.7002 17.2002c-21.0996 0 -32.6992 -33 -32.6992 -50.6006c0 -32.2998 20.3994 -54.7002 53.2998 -54.7002
+c48.2002 0 83.3994 49.7002 94.2998 91.7002c9.40039 37.7002 7 39.4004 12.2998 42.1006c20 10.0996 35.7998 16.7998 58.4004 16.7998c11.0996 0 19 -2.2998 36.7002 -5.2002c1.7998 -0.0996094 4.09961 1.7002 4.09961 3.5z" />
+    <glyph glyph-name="glide-g" unicode="&#xf2a6;" 
+d="M407.1 236.8c7.5 -2.89941 40.9004 -55.3994 40.9004 -63.3994c0 -2.90039 -3.7998 -5.80078 -6.7002 -5.80078c-28.3994 4.7002 -41.0996 8.40039 -58.8994 8.40039c-36.3008 0 -61.6006 -10.7998 -93.8008 -27c-8.5 -4.2998 -4.59961 -7.09961 -19.6992 -67.5996
+c-17.4004 -67.6006 -74 -145.4 -151.4 -145.4c-52.7002 0 -85.5 36 -85.5 87.9004c0 28.0996 18.5 79.1992 52.4004 79.2998c11.8994 0 58.5996 -15.4004 58.8994 -27.6006c-0.5 -2.39941 -45.5 -21.7998 -45.5 -61c0 -38.5 73.9004 -34.2998 90.7998 94.6006
+c0 4.7998 1 3.7998 -11 3.7998c-87.2998 0 -138.6 48.7002 -138.6 136.6c0 84.7002 58.2998 198.4 173.4 198.4c70.1992 0 108.399 -29.0996 108.399 -100.6c0 -48.5 -16.5 -93.1006 -23.5 -140.4l0.900391 -0.900391c31.2998 17.7002 56.3994 34.5 93.5 34.5
+c3.7998 0 11.8994 -2.39941 15.3994 -3.7998zM231.8 321.2c2.90039 13.8994 5.5 28.0996 5.60059 42.3994c0 15.4004 -1.40039 28.7002 -20 28.7002c-7.80078 0 -15.6006 -2.59961 -22.6006 -6.7002c-43.7998 -24.0996 -61.7998 -86.3994 -61.7998 -133.399
+c0 -31.2998 10.7002 -73.1006 49 -73.1006c8.7002 0 19.7002 -2.39941 22 7.80078c9.2002 44.6992 18.5 89.5996 27.7998 134.3z" />
+    <glyph glyph-name="viadeo" unicode="&#xf2a9;" 
+d="M276.2 297.5v-0.700195c-17.9004 52.6006 -42.6006 103.4 -70.7998 151.2c43.2998 -29.2002 67 -100 70.7998 -150.5zM308.9 175.8c15.0996 3.10059 29.5 9 42.1992 17c24.5 -58.5996 20.2002 -139.7 -36.3994 -201c-67.7998 -73.8994 -191.9 -74.5996 -259.8 0
+c-108.801 117.8 -31.6006 313.7 129.899 313.7c21.2998 0 42.6006 -3.5 62.5 -10.7002c-6.89941 -13.3994 -11.7002 -28.2002 -13.3994 -43.2998c-15.4004 6.5 -32.3008 9.59961 -49.1006 9.59961c-78 0 -135.399 -66.6992 -135.399 -142.3
+c0 -68.7998 45.5996 -126 111.3 -137.399c98.5 38.3994 116.6 188.199 116.6 280c0 11.6992 0 23.6992 -1 35.3994c12.4004 -36.0996 18.9004 -73.8994 18.9004 -112c0 -86.5 -35.1006 -158.399 -109.3 -205.1l-3.80078 -0.299805
+c80 -1.60059 137.801 61.6992 137.801 139.399c0 19.5 -3.40039 38.7998 -11 57zM418.1 436.3c52 -74 20.9004 -208.6 -58.0996 -208.6c-21.2998 0 -40.2002 11.3994 -55 25.7998c35.0996 19.2998 79.4004 49.2002 99.7002 84.9004
+c2.39941 4.7998 6.5 13.6992 7.2002 19.1992c-19.9004 -44.6992 -70.8008 -79.6992 -118.2 -90.6992c-7.5 11.6992 -12 24.6992 -12 38.7998c0 16.5 8.2002 38.5 20.5996 50.5c34.5 32.8994 84.7998 13.5996 115.8 80.0996z" />
+    <glyph glyph-name="viadeo-square" unicode="&#xf2aa;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM280.7 66.7998c35.3994 38.2998 38.0996 89 22.7998 125.601c-7.90039 -4.90039 -16.9004 -8.60059 -26.4004 -10.5
+c4.80078 -11.4004 6.90039 -23.5 6.90039 -35.7002c0 -48.6006 -36.2002 -88.2002 -86.2002 -87.2002l2.40039 0.200195c46.3994 29.2002 68.2998 74.0996 68.2998 128.2c0 23.7998 -4.09961 47.5 -11.7998 70v0.399414c-2.2998 31.6006 -17.1006 75.7998 -44.2002 94.1006
+c17.5996 -29.9004 33 -61.6006 44.2002 -94.5c0.599609 -7.30078 0.599609 -14.8008 0.599609 -22.1006c0 -57.3994 -11.3994 -151 -72.8994 -175c-41 7.2002 -69.5 42.9004 -69.5 85.9004c0 47.2002 35.7998 88.8994 84.5996 88.8994c10.5 0 21 -1.89941 30.7002 -6
+c1.09961 9.5 4.09961 18.7002 8.39941 27.1006c-12.5 4.59961 -25.7998 6.7002 -39.0996 6.7002c-101 0 -149.2 -122.5 -81.2002 -196.101c42.4004 -46.5996 120 -46.2002 162.4 0zM309 214.3c49.4004 0 68.7998 84.1006 36.2998 130.3
+c-19.3994 -41.5 -50.7998 -29.5 -72.3994 -50c-7.7002 -7.5 -12.9004 -21.2998 -12.9004 -31.5996c0 -8.7998 2.7998 -17 7.5 -24.2998c29.7002 6.89941 61.4004 28.7998 73.9004 56.7002c-0.400391 -3.40039 -3 -9 -4.5 -12c-12.7002 -22.3008 -40.4004 -41 -62.3008 -53
+c9.30078 -9 21.1006 -16.1006 34.4004 -16.1006z" />
+    <glyph glyph-name="snapchat" unicode="&#xf2ab;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM417.5 101.1c2.2002 5.30078 -0.900391 9.80078 -4.90039 10.8008c-46.2998 7.59961 -67.0996 55.0996 -68 57.0996
+c-0.0996094 0.0996094 -0.0996094 0.200195 -0.199219 0.299805c-2.40039 5 -3 9.2002 -1.60059 12.5c2.60059 6.2998 12.5 9.40039 19 11.5c1.7998 0.600586 3.5 1.10059 4.90039 1.7002c11.5 4.5 17.2998 10.0996 17.2002 16.5996
+c-0.100586 5.10059 -4.10059 9.60059 -10.4004 11.9004c-4 1.59961 -9.59961 1.90039 -13.5996 0c-5.5 -2.59961 -10.4004 -4 -14.7002 -4.2002c-2.7998 0.100586 -4.60059 0.799805 -5.7002 1.40039c1.40039 24 4.7002 58 -3.7998 77.0996
+c-16.2998 36.5 -49.6006 54.2998 -84.2998 54.2998c-0.600586 0 -6.10059 -0.0996094 -6.7002 -0.0996094c-14 0 -61.6006 -4 -84.1006 -54.2998c-8.5 -19.1006 -5.19922 -53.2002 -3.7998 -77.1006c-1.09961 -0.599609 -3.2998 -1.39941 -6.59961 -1.39941
+c-4.5 0 -9.7998 1.39941 -15.7002 4.2002c-7.5 3.5 -20.2998 -1.80078 -21.9004 -10.3008c-1 -4.89941 1.2002 -12.0996 17 -18.2998c6.10059 -2.5 20.6006 -5.2998 24 -13.2002c1.40039 -3.2998 0.900391 -7.5 -1.59961 -12.5
+c-0.0996094 -0.0996094 -0.200195 -0.199219 -0.200195 -0.299805c-0.899414 -2 -21.7002 -49.5 -68 -57.0996c-3.59961 -0.600586 -6.09961 -3.7998 -5.89941 -7.40039c0.699219 -13.8994 31.6992 -19.2998 45.5 -21.3994c1.39941 -1.90039 2.5 -9.90039 4.2998 -16
+c0.799805 -2.7002 2.89941 -6 8.2998 -6s13.2998 3.09961 25.7998 3.09961c17.6006 0 23.6006 -4 37.4004 -13.7002c9.89941 -7 27.5 -19.7998 48.5 -18.2002c20.7998 -0.899414 34.7002 7.90039 49.2002 18.2002c13.6992 9.7002 19.7998 13.7002 37.3994 13.7002
+c13 0 19.6006 -2.90039 25.7998 -2.90039h0.200195c4.40039 0 7 2.2002 8.10059 5.90039c1.7998 6.09961 2.89941 14 4.2998 15.9004c26.7002 4.19922 41.2998 10.0996 44.7998 18.1992z" />
+    <glyph glyph-name="snapchat-ghost" unicode="&#xf2ac;" horiz-adv-x="512" 
+d="M510.846 55.3271c-5.21094 -12.1572 -27.2383 -21.0889 -67.3594 -27.3184c-2.06445 -2.78613 -3.77539 -14.6855 -6.50781 -23.9561c-1.625 -5.56543 -5.62207 -8.86914 -12.1279 -8.86914l-0.296875 0.00585938c-9.39453 0 -19.2031 4.32227 -38.8516 4.32227
+c-26.5215 0 -35.6621 -6.04297 -56.2539 -20.5879c-21.832 -15.4375 -42.7715 -28.7637 -74.0273 -27.3984c-31.6455 -2.33398 -58.0244 16.9072 -72.8711 27.4033c-20.7139 14.6436 -29.8281 20.582 -56.2412 20.582c-18.8633 0 -30.7354 -4.71973 -38.8516 -4.71973
+c-8.07324 0 -11.2129 4.92188 -12.4219 9.04004c-2.70312 9.18848 -4.4043 21.2627 -6.52344 24.1299c-20.6787 3.20898 -67.3096 11.3438 -68.498 32.1504c-0.0107422 0.196289 -0.015625 0.393555 -0.015625 0.591797c0 5.27148 3.85645 9.64355 8.89258 10.4766
+c69.583 11.4551 100.925 82.9014 102.228 85.9346c0.0742188 0.175781 0.155273 0.34375 0.237305 0.514648c3.71289 7.53711 4.54395 13.8486 2.46289 18.7529c-5.05078 11.8965 -26.8721 16.1641 -36.0537 19.7959c-23.7148 9.36621 -27.0146 20.1279 -25.6113 27.5039
+c2.43652 12.8359 21.7246 20.7354 33.002 15.4531c8.91895 -4.18066 16.8428 -6.29688 23.5469 -6.29688c5.02148 0 8.21191 1.2041 9.95996 2.1709c-2.04297 35.9365 -7.10156 87.29 5.68652 115.969c33.7734 75.7188 105.356 81.6025 126.478 81.6025
+c0.943359 0 9.14062 0.0888672 10.1094 0.0888672c52.1484 0 102.255 -26.7803 126.724 -81.6426c12.7764 -28.6504 7.74902 -79.792 5.69434 -116.01c1.58203 -0.87207 4.35742 -1.94141 8.59961 -2.13867c6.39648 0.286133 13.8145 2.38867 22.0693 6.25684
+c6.08496 2.84668 14.4053 2.46094 20.4795 -0.0576172l0.0292969 -0.00976562c9.47559 -3.38574 15.4385 -10.2158 15.5889 -17.8701c0.183594 -9.74707 -8.52246 -18.165 -25.8779 -25.0186c-2.11816 -0.834961 -4.69434 -1.6543 -7.43457 -2.52441
+c-9.79688 -3.10645 -24.5996 -7.80566 -28.6152 -17.2715c-2.0791 -4.9043 -1.25684 -11.2109 2.45996 -18.748c0.0869141 -0.167969 0.166016 -0.341797 0.238281 -0.514648c1.30176 -3.03027 32.6152 -74.46 102.23 -85.9346
+c6.42676 -1.05762 11.1631 -7.87695 7.72461 -15.8584z" />
+    <glyph glyph-name="snapchat-square" unicode="&#xf2ad;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM393.5 101.1c2.2002 5.30078 -0.900391 9.80078 -4.90039 10.8008c-46.2998 7.59961 -67.0996 55.0996 -68 57.0996
+c-0.0996094 0.0996094 -0.0996094 0.200195 -0.199219 0.299805c-2.40039 5 -3 9.2002 -1.60059 12.5c2.60059 6.2998 12.5 9.40039 19 11.5c1.7998 0.600586 3.5 1.10059 4.90039 1.7002c11.5 4.5 17.2998 10.0996 17.2002 16.5996
+c-0.100586 5.10059 -4.10059 9.60059 -10.4004 11.9004c-4 1.59961 -9.59961 1.90039 -13.5996 0c-5.5 -2.59961 -10.4004 -4 -14.7002 -4.2002c-2.7998 0.100586 -4.60059 0.799805 -5.7002 1.40039c1.40039 24 4.7002 58 -3.7998 77.0996
+c-16.2998 36.5 -49.6006 54.2998 -84.2998 54.2998c-0.600586 0 -6.10059 -0.0996094 -6.7002 -0.0996094c-14 0 -61.6006 -4 -84.1006 -54.2998c-8.5 -19.1006 -5.19922 -53.2002 -3.7998 -77.1006c-1.09961 -0.599609 -3.2998 -1.39941 -6.59961 -1.39941
+c-4.5 0 -9.7998 1.39941 -15.7002 4.2002c-7.5 3.5 -20.2998 -1.80078 -21.9004 -10.3008c-1 -4.89941 1.2002 -12.0996 17 -18.2998c6.10059 -2.5 20.6006 -5.2998 24 -13.2002c1.40039 -3.2998 0.900391 -7.5 -1.59961 -12.5
+c-0.0996094 -0.0996094 -0.200195 -0.199219 -0.200195 -0.299805c-0.899414 -2 -21.7002 -49.5 -68 -57.0996c-3.59961 -0.600586 -6.09961 -3.7998 -5.89941 -7.40039c0.699219 -13.8994 31.6992 -19.2998 45.5 -21.3994c1.39941 -1.90039 2.5 -9.90039 4.2998 -16
+c0.799805 -2.7002 2.89941 -6 8.2998 -6s13.2998 3.09961 25.7998 3.09961c17.6006 0 23.6006 -4 37.4004 -13.7002c9.89941 -7 27.5 -19.7998 48.5 -18.2002c20.7998 -0.899414 34.7002 7.90039 49.2002 18.2002c13.6992 9.7002 19.7998 13.7002 37.3994 13.7002
+c13 0 19.6006 -2.90039 25.7998 -2.90039h0.200195c4.40039 0 7 2.2002 8.10059 5.90039c1.7998 6.09961 2.89941 14 4.2998 15.9004c26.7002 4.19922 41.2998 10.0996 44.7998 18.1992z" />
+    <glyph glyph-name="pied-piper" unicode="&#xf2ae;" horiz-adv-x="480" 
+d="M455.93 424.8c9.41992 2.40039 15.0703 -10.25 6.99023 -15.6797c-98.2295 -65.9199 -120.439 -127.561 -126.229 -160.18c-33.5205 -188.881 -101.37 -119.32 -184.311 -226.65c25.7607 -14.8125 55.8076 -23.3984 87.6299 -23.4004
+c97.6504 0 177.09 79.4502 177.09 177.11c-0.00488281 45.0508 -16.9824 86.25 -44.8496 117.41c4.72754 9.75293 10.4238 18.9131 17 27.3994c36.3574 -37.3457 58.75 -88.3779 58.75 -144.564v-0.245117c0 -114.87 -93.1299 -208 -208 -208s-208 93.1201 -208 208
+s93.1299 208 208 208c36.7422 -0.000976562 71.4697 -9.77246 101.35 -26.6602c46.4404 38.9697 87.8809 60.6602 114.58 67.46zM125 41.5996c64.7695 140.881 125.64 231.641 191.63 293.75c-23.0674 11.3037 -49.1611 17.75 -76.5615 17.75h-0.0683594
+c-97.6504 0 -177.1 -79.4395 -177.1 -177.1c0.0234375 -53.8203 24.0684 -102.002 62.0996 -134.4z" />
+    <glyph glyph-name="first-order" unicode="&#xf2b0;" 
+d="M12.9004 218.8c0.0996094 0.100586 0.199219 0.299805 0.299805 0.400391c0 -0.100586 0 -0.299805 -0.100586 -0.400391h-0.199219zM224 351.4c7.40039 0 14.5996 -0.5 21.7002 -1.7002l-4 -67.7002l22.2998 64.2998c14.2998 -3.7998 27.7002 -9.5 40 -16.8994
+l-29.4004 -61.1006l45.1006 50.9004c11.5 -8.90039 21.7002 -19.2002 30.5996 -30.9004l-50.5996 -45.3994l60.8994 29.6992c7.5 -12.2998 12.9004 -26 16.6006 -40.2998l-64 -22.2998l67.7002 4c1.09961 -7.09961 1.39941 -14.5996 1.39941 -22
+s-0.299805 -14.5996 -1.39941 -21.7002l-67.4004 4l64 -22.2998c-3.7002 -14.5996 -9.5 -28 -16.5996 -40.2998l-61.1006 29.3994l50.6006 -45.0996c-8.60059 -11.7998 -18.9004 -22 -30.6006 -30.9004l-44.8994 50.9004l29.3994 -61.2998
+c-12.2998 -7.5 -25.7002 -12.9004 -40 -16.9004l-22.5996 65.1006l4 -68.6006c-7.10059 -1.09961 -14.2998 -1.7002 -21.7002 -1.7002c-7.09961 0 -14.5996 0.600586 -21.7002 1.7002l4 68l-22.2998 -64.5996c-14.2998 3.7998 -27.7002 9.5 -40 16.8994l29.5 61.4004
+l-44.9004 -50.9004c-11.7998 8.60059 -22 19.2002 -30.8994 30.9004l50.8994 45.0996l-61.0996 -29.6992c-7.2002 12.5996 -12.9004 26 -16.5996 40.2998l64 22.5996l-67.7002 -4c-0.799805 7.10059 -1.40039 14.2998 -1.40039 21.7002s0.5 14.9004 1.40039 22l68 -4
+l-64.2998 22.5996c3.69922 14.3008 9.5 27.7002 16.5996 40l61.0996 -29.6992l-50.5996 45.3994c8.90039 11.7998 19.2002 22 30.5996 30.9004l45.1006 -50.9004l-29.4004 61.4004c12.2998 7.2002 25.7002 12.8994 40 16.5996l22 -64l-3.7002 67.4004
+c6.80078 1.09961 14.3008 1.7002 21.4004 1.7002zM443.4 320v-256l-219.4 -128l-219.4 128v256l219.4 128zM426.3 309.7l-202.3 117.399l-202.3 -117.399v-235.101l202.3 -117.699l202.3 117.699v235.101zM224 410.9l187.7 -109.4v-218.9l-187.7 -109.5l-187.7 109.5
+v218.801zM224 360c-92.2998 0 -166.9 -75.0996 -166.9 -168c0 -92.5996 74.6006 -167.7 166.9 -167.7c92 0 166.9 75.1006 166.9 167.7c0 92.9004 -74.9004 168 -166.9 168z" />
+    <glyph glyph-name="yoast" unicode="&#xf2b1;" 
+d="M91.2998 372h186l-7 -18.9004h-179c-39.7002 0 -71.8994 -31.5996 -71.8994 -70.2998v-205.399c0 -35.4004 24.8994 -70.3008 84 -70.3008v-19.0996h-12.1006c-50.0996 0 -91.2998 40.2002 -91.2998 89.5v205.3c0 49.2998 40.7002 89.2002 91.2998 89.2002zM320.4 428
+h66.5c-143.801 -378.1 -145.7 -398.9 -184.7 -439.3c-20.7998 -21.6006 -49.2998 -31.7002 -78.2998 -32.7002v51.0996c49.1992 7.7002 64.5996 49.9004 64.5996 75.3008c0 20.0996 0.599609 12.5996 -82.0996 223.199h61.3994l50.4004 -156.6zM448 286.5v-298.5h-214
+c6.59961 9.59961 10.7002 16.2998 12.0996 19.4004h182.5v279.1c0 32.5 -17.0996 51.9004 -48.1992 62.9004l6.69922 17.5996c41.7002 -13.5996 60.9004 -43.0996 60.9004 -80.5z" />
+    <glyph glyph-name="themeisle" unicode="&#xf2b2;" horiz-adv-x="512" 
+d="M208 359.714c0 10 6.28613 21.7139 17.7148 21.7139c11.1426 0 17.7139 -11.7139 17.7139 -21.7139c0 -10.2852 -6.57129 -21.7139 -17.7139 -21.7139c-11.4287 0 -17.7148 11.4287 -17.7148 21.7139zM512 199.714c0 -36.001 -11.4287 -102.286 -36.2861 -129.714
+c-22.8574 -24.8584 -87.4277 -61.1426 -120.856 -70.5723l-1.14355 -0.286133v-32.5703c0 -16.2861 -12.5723 -30.5713 -29.1426 -30.5713c-10 0 -19.4297 5.71387 -24.5723 14.2861c-5.42676 -8.57227 -14.8564 -14.2861 -24.8564 -14.2861
+s-19.4287 5.71387 -24.8574 14.2861c-5.14258 -8.57227 -14.5713 -14.2861 -24.5703 -14.2861c-10.2861 0 -19.4287 5.71387 -24.8574 14.2861c-5.14355 -8.57227 -14.5713 -14.2861 -24.5713 -14.2861c-18.8574 0 -29.4287 15.7139 -29.4287 32.8574
+c-16.2861 -12.2852 -35.7158 -19.4287 -56.5713 -19.4287c-22 0 -43.4287 8.28516 -60.2861 22.8574c10.2852 0.286133 20.5713 2.28613 30.2852 5.71387c-20.8574 5.71387 -39.4277 18.8574 -52 36.2861c21.3701 -4.64551 46.209 -1.67285 67.1426 11.1426
+c-22 22 -56.5703 58.8574 -68.5713 87.4287c-5.71387 13.4287 -6.85645 31.4287 -6.85645 45.7139c0 49.7139 20.2861 160 86.2861 160c10.5713 0 18.8564 -4.8584 23.1426 -14.8574c3.7041 5.41992 7.6709 10.5186 12 15.4277c2 2.57227 5.71387 5.42969 7.14355 8.28613
+c7.99902 12.5713 11.7139 21.1426 21.7139 34c32.2852 41.1445 81.7139 69.4297 134.856 69.4297c6 0 12 -0.285156 17.7148 -1.14355c10.8564 11.7148 26 18.2861 41.7148 18.2861c14.5703 0 29.7139 -6 40 -16.2861c0.856445 -0.857422 1.42773 -2.28613 1.42773 -3.42773
+c0 -3.71387 -10.2852 -13.4287 -12.8574 -16.2861c4.28613 -1.42871 15.7148 -6.8584 15.7148 -12c0 -2.85742 -2.85742 -5.14258 -4.57129 -7.14258c31.4287 -27.7148 49.4287 -67.1436 56.2861 -108c4.28613 5.14258 10.2852 8.57129 17.1426 8.57129
+c10.5713 0 20.8574 -7.14355 28.5713 -14.001c20.8564 -18.5703 25.7139 -53.1416 25.7139 -79.7139zM188 358.572c0 -18.2861 12.5713 -37.1436 32.2861 -37.1436c19.7139 0 32.2852 18.8574 32.2852 37.1436c0 18 -12.5713 36.8564 -32.2852 36.8564
+c-19.7148 0 -32.2861 -18.8574 -32.2861 -36.8564zM237.714 254c0 19.7139 3.71387 39.1426 8.57129 58.2861c-52.0391 -79.5342 -13.5312 -184.571 68.8574 -184.571c21.4287 0 42.5713 7.71387 60 20c2 7.42871 3.71484 14.8574 3.71484 22.5723
+c0 14.2861 -6.28613 21.4277 -20.5723 21.4277c-4.57129 0 -9.14355 -0.856445 -13.4287 -1.71387c-63.3438 -12.668 -107.143 -3.66895 -107.143 63.999zM196.572 -0.858398c0 11.1436 -8.8584 20.8574 -20.2861 20.8574c-11.4287 0 -20 -9.71484 -20 -20.8574v-32.5703
+c0 -11.1436 8.57129 -21.1426 20 -21.1426c11.4277 0 20.2861 9.71484 20.2861 21.1426v32.5703zM245.715 -0.858398c0 11.1436 -8.57227 20.8574 -20 20.8574c-11.4287 0 -20.2861 -9.71484 -20.2861 -20.8574v-32.5703c0 -11.1436 8.85742 -21.1426 20.2861 -21.1426
+c11.4277 0 20 10 20 21.1426v32.5703zM295.428 -0.858398c0 11.1436 -8.85645 20.8574 -20.2852 20.8574s-20.2852 -9.71484 -20.2852 -20.8574v-32.5703c0 -11.1436 8.85645 -21.1426 20.2852 -21.1426s20.2852 9.71484 20.2852 21.1426v32.5703zM345.143 -0.858398
+c0 11.1436 -8.85645 20.8574 -20.2852 20.8574s-20.2861 -9.71484 -20.2861 -20.8574v-32.5703c0 -11.1436 8.85742 -21.1426 20.2861 -21.1426s20.2852 10 20.2852 21.1426v32.5703zM421.714 162c-30.8564 -59.1416 -90.2852 -102.572 -158.571 -102.572
+c-96.5703 0 -160.57 84.5723 -160.57 176.572c0 16.8574 2 33.4287 6 49.7139c-20 -33.7148 -29.7139 -72.5723 -29.7139 -111.429c0 -60.2861 24.8564 -121.715 71.4287 -160.857c5.14258 9.71387 14.8564 16.2861 26 16.2861c10 0 19.4277 -5.71387 24.5713 -14.2861
+c5.42871 8.57129 14.5703 14.2861 24.8574 14.2861c10 0 19.4277 -5.71387 24.5713 -14.2861c5.42871 8.57129 14.8564 14.2861 24.8574 14.2861c10 0 19.4287 -5.71387 24.8574 -14.2861c5.14258 8.57129 14.5713 14.2861 24.5723 14.2861
+c10.8564 0 20.8564 -6.57227 25.7139 -16c43.4268 36.2861 68.5693 92 71.4258 148.286zM432.286 261.714c0 53.7139 -34.5713 105.714 -92.5723 105.714c-30.2852 0 -58.5713 -15.1426 -78.8564 -36.8564c-19.9951 -66.3828 -27.4473 -136.571 41.4287 -136.571
+c28.8047 0 97.3564 28.5381 84.2861 -36.8574c28.8564 26 45.7139 65.7148 45.7139 104.571z" />
+    <glyph glyph-name="google-plus" unicode="&#xf2b3;" horiz-adv-x="512" 
+d="M256 440c136.9 0 248 -111.1 248 -248s-111.1 -248 -248 -248s-248 111.1 -248 248s111.1 248 248 248zM185.3 68c71.2998 0 118.8 50.4004 118.8 121.2c0.000976562 0.140625 0.00195312 0.182617 0.00195312 0.323242c0 6.96289 -0.65332 13.7744 -1.90137 20.377
+h-116.9v-42.6006h70.1006c-5.2002 -34.2002 -37.5 -53.2998 -70.1006 -53.2998c-43 0 -77.2002 35.5 -77.2002 78.0996c0 42.6006 34.3008 78.1006 77.2002 78.1006c18.1006 0 36.2002 -6.2002 49.4004 -19.1006l33.5996 32.6006
+c-22.8994 21.2998 -51.7002 32.2998 -83 32.2998c-68.4375 0 -124 -55.5625 -124 -124s55.5625 -124 124 -124zM415.5 174.2h35.2002v35.5h-35.2002v35.5h-35.5v-35.5h-35.5v-35.5h35.5v-35.5h35.5v35.5z" />
+    <glyph glyph-name="font-awesome" unicode="&#xf2b4;" 
+d="M397.8 416c27.5 0 50.2002 -22.7002 50.2002 -50.2002v-347.6c0 -27.5 -22.7002 -50.2002 -50.2002 -50.2002h-347.6c-27.5 0 -50.2002 22.7002 -50.2002 50.2002v347.6c0 27.5 22.7002 50.2002 50.2002 50.2002h347.6zM352.4 131.7h0.0996094v140.3
+c0 4.2002 -4.2002 7.7998 -9 7.7998c-6 0 -31.0996 -16.0996 -53.7998 -16.0996c-4.7002 0 -8.90039 0.599609 -13.1006 2.39941c-20.2998 7.7002 -38.1992 13.7002 -60.8994 13.7002c-20.9004 0 -43 -6.5 -61.5 -14.2998
+c-1.7998 -1.2002 -3.60059 -1.7998 -5.40039 -2.40039v18.5c8.2998 6 13.1006 15.5 13.1006 26.3008c0 18.5996 -15 33.5 -33.5 33.5c-18.6006 0 -33.5 -15 -33.5 -33.5c0 -10.8008 5.2998 -20.3008 13.0996 -26.3008v-218.6c0 -11.2998 9 -20.2998 20.2998 -20.2998
+c8.90039 0 16.7002 5.89941 19.1006 14.2998v1.2002c0.599609 1.2002 0.599609 3 0.599609 4.7998v45.4004c1.2002 0.599609 2.40039 0.599609 3.59961 1.19922c19.7002 8.90039 44.2002 17.3008 67.5 17.3008c32.3008 0 44.8008 -16.7002 71.7002 -16.7002
+c19.2002 0 37.1006 6.5 53.7998 13.7002c4.2002 1.7998 7.80078 3.59961 7.80078 7.7998z" />
+    <glyph glyph-name="linode" unicode="&#xf2b8;" 
+d="M437.4 221.7c0.599609 -2 -8.80078 -66.2998 -9.7002 -72.7998c0 -0.900391 -0.5 -1.7002 -1.10059 -2l-54.5996 -43.7002c-1.09961 -0.900391 -2.59961 -0.900391 -3.7002 0l-20.2998 14l-2.2998 -33.4004c0 -0.899414 -0.200195 -1.7002 -1.10059 -2.2998
+l-66.8994 -53.4004c-1.10059 -0.899414 -2.90039 -0.899414 -4 0l-28 23.7002l2 -46c0 -0.899414 -0.200195 -1.7002 -1.10059 -2.2998l-83.6992 -66.9004c-0.600586 -0.299805 -1.10059 -0.599609 -1.7002 -0.599609c-0.900391 0.299805 -1.7002 0.299805 -2.2998 0.900391
+l-65.1006 69.0996c-1.5 1.40039 -15.5 72 -16.8994 79.0996c-0.300781 1.10059 0.5 2.5 1.39941 3.10059l17.4004 10.5996c-3.40039 3.2002 -26.5 23.4004 -27.1006 26.2998l-20.5996 100.301c-0.299805 1.09961 0.299805 2.5 1.7002 3.39941l26.8994 12.9004
+c-4.59961 3.5 -37.6992 27.5 -38.5996 30.8994l-27.4004 133.101c-0.299805 1.7002 0.600586 3.09961 2 3.7002l123.7 38.5996c0.600586 0 1.40039 0 2.2998 -0.299805l90.6006 -43.7002c0.799805 -0.599609 1.7002 -1.7002 1.7002 -2.59961l5.69922 -132.301
+c0 -1.19922 -0.599609 -2.2998 -1.69922 -2.89941l-33.7002 -17.4004l36 -24.2998c0.799805 -0.299805 1.39941 -1.40039 1.39941 -2.2998l1.40039 -35.1006l34.5996 21.2002c0.800781 0.600586 2.2002 0.600586 3.10059 0l24 -16l0.899414 31.4004
+c0 0.899414 0.5 2 1.40039 2.59961l58.9004 36c1.09961 0.600586 2.19922 0.600586 3.09961 0l70 -38.5996c0.5 -0.600586 1.09961 -1.10059 1.40039 -2zM232.6 216.9l-100.6 -57.2002l14 -96.6006l90.5996 61.2002zM224.9 396.9l-120.9 -46.6006l19.7002 -134.8
+l106.6 55.4004zM44 274.9l73.0996 -57.2002l-19.3994 132.899l-79.7002 49.4004zM74.5996 127.1l64.8008 -60.7998l-13.7002 93.4004l-70 58.2998zM98.9004 9.40039l57.6992 -61.2002l-9.69922 67.3994l-61.7002 60.9004zM163.4 -55.0996l78.1992 62.2998l-3.09961 70
+l-85.7002 -61.4004zM245.4 60l27.0996 -22.9004l-0.599609 68.3008l-29.4004 22.5996c0 -2.2998 1.2002 -6.2998 -1.09961 -8l-22.3008 -14.9004l24.3008 -20c2.89941 -2.19922 2 -21.6992 2 -25.0996zM339.7 85.4004l4.2002 66.8994l-65.7002 -46.8994l0.599609 -68.6006z
+M367.4 111.1l5.7998 66.6006l-64.6006 40.5996l-0.599609 -30l41.2002 -27.2002c0.799805 -0.599609 1.39941 -1.69922 1.09961 -2.59961l-2 -34zM422 150.9l8.5 63.3994l-51.0996 -36.5996l-5.7002 -65.1006z" />
+    <glyph glyph-name="quora" unicode="&#xf2c4;" 
+d="M440.5 61.2998c1.7998 -18 -7.2002 -93.2998 -89 -93.2998c-49.5 0 -75.5 28.7002 -95.2002 62.2998c-117.7 -32.5996 -249 54.9004 -249 189c0 117 98 196.7 197.7 196.7c101.8 0 198.5 -79.2002 198.4 -196.7c0 -65.5 -30.5 -118.8 -74.7002 -153
+c14.2002 -21.5996 29 -35.7998 49.5 -35.7998c22.5 0 31.5 17.2998 33 30.7998h29.2998zM297 118.8c11.2998 24.9004 16.7998 58.7002 16.7002 100.5c0 104.2 -32.5 157.7 -108.7 157.7c-75 0 -107.5 -53.5 -107.5 -157.9c0 -103.699 32.5 -156.699 107.5 -156.699
+c12 0 22.7002 1.19922 32.7002 4.19922c-15.5 30.5 -33.7002 61.3008 -69.2002 61.3008c-6.7998 0 -13.5996 -1 -19.7998 -4l-12.2002 24.2998c14.7002 12.7998 38.5 22.7998 69 22.7998c47.7998 0 72 -23 91.5 -52.2002z" />
+    <glyph glyph-name="free-code-camp" unicode="&#xf2c5;" horiz-adv-x="576" 
+d="M97.2197 351.79c-43.2197 -41.6201 -64.9697 -92.5898 -64.8193 -154.021c0.15918 -68 23.0293 -122.67 67.4795 -165c9.33984 -8.34961 13.2002 -14.9199 13.2002 -20.5498c0 -2.75 -1.90039 -5.62012 -3.81055 -8.37988
+c-2.19141 -2.1543 -5.12598 -3.56836 -8.36914 -3.83984c-10.2803 0 -24.6807 12.1396 -43.4707 35.79c-36.5898 44.8701 -53.1992 94.3398 -54.0596 161.87s20.3096 113.34 61.79 160.6c14.9199 16.9004 27.3594 25.6904 35.8398 25.6904
+c3.12402 -0.0712891 6.03027 -1.11914 8.38965 -2.83984c1.91016 -1.91016 3.83008 -4.66016 3.83008 -7.41992c0 -4.78027 -5.63965 -11.25 -16 -21.9004zM239.47 27.9297c0.580078 -0.370117 0.910156 -0.549805 0.910156 -0.549805zM333.26 27.3799l0.169922 0.129883
+c-0.189453 -0.129883 -0.259766 -0.179688 -0.169922 -0.129883zM336.39 185.56c16.2305 -4.14941 24.04 24.04 30.0303 30.0508c84.71 -110.101 -27.5098 -184.45 -33 -188.101c3.86035 3.04004 44.3301 49.7705 21.5801 76.5498
+c-1 1.03027 -67.2998 -20.0596 -54.8398 53.54c8.30957 48.6807 -7.60059 71.1309 -7.60059 71.1309c-17.9697 -37.29 -32.5 -53.8604 -43.5 -72.1602c-56.9492 -92.9404 -16.2793 -124.29 -9.5498 -128.641c-10.54 6.5 -108.27 70.8799 -34 175.23
+c78.3701 110.189 62.8301 159.57 62.8301 159.57c118.46 -94.2803 51.8105 -173.021 68.0498 -177.171zM510.88 358.31c41.4404 -47.3096 62.6699 -93.1592 61.75 -160.649s-17.4697 -117.021 -54.0596 -161.87c-18.79 -23.6602 -33.1904 -35.79 -43.4707 -35.79
+c-3.24219 0.279297 -6.17676 1.69629 -8.36914 3.84961c-1.91016 2.76074 -3.81055 5.63086 -3.81055 8.38086c0.0205078 5.62988 3.86035 12.1992 13.2002 20.5498c44.4795 42.3701 67.3203 97 67.4795 165c0.180664 61.4697 -21.5898 112.45 -64.8193 154.06
+c-10.4004 10.6406 -16 17.1201 -16 21.9004c0 2.75977 1.91992 5.50977 3.83008 7.41992c2.35938 1.7207 5.26562 2.76855 8.38965 2.83984c8.51953 0 21 -8.79004 35.8799 -25.6904z" />
+    <glyph glyph-name="telegram" unicode="&#xf2c6;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM369.8 270.1c3.60059 16.8008 -6.09961 23.5 -17.2002 19.5l-239.1 -92.1992c-16.4004 -6.40039 -16.0996 -15.5 -2.7998 -19.7002l61.2002 -19.1006l142 89.4004
+c6.59961 4.40039 12.6992 1.90039 7.69922 -2.5l-114.899 -103.8l-4.40039 -63.1006c6.40039 0 9.2002 2.80078 12.5 6.10059l29.9004 28.7998l62 -45.7002c11.2998 -6.39941 19.3994 -3.09961 22.3994 10.5z" />
+    <glyph glyph-name="bandcamp" unicode="&#xf2d5;" horiz-adv-x="512" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM304.2 113.9l84.7002 156.1h-181l-84.7002 -156.1h181z" />
+    <glyph glyph-name="grav" unicode="&#xf2d6;" horiz-adv-x="512" 
+d="M301.1 236c4.40039 -4.40039 4.40039 -11.9004 0 -16.2998l-9.69922 -9.7002c-4.40039 -4.7002 -11.9004 -4.7002 -16.6006 0l-10.5 10.5c-4.39941 4.7002 -4.39941 11.9004 0 16.5996l9.7002 9.7002c4.40039 4.40039 11.9004 4.40039 16.5996 0zM270.9 255.7
+c-2.7002 -2.7998 -7.40039 -2.7998 -10.5 0c-2.80078 3 -2.80078 7.7002 0 10.5c3 3 7.69922 3 10.5 0c3 -2.7002 3 -7.5 0 -10.5zM244.9 250.4c2.7998 3 7.5 3 10.5 0c2.7998 -2.7002 2.7998 -7.40039 0 -10.2002c-3 -3 -7.7002 -3 -10.5 0c-3 2.7002 -3 7.39941 0 10.2002
+zM317.4 263.7c-19.9004 14.3994 -33.8008 43.2002 -11.9004 68.0996c21.5996 24.9004 40.7002 17.2002 59.7998 -0.799805c11.9004 -11.2998 29.2998 -24.9004 17.2002 -48.2002c-12.5 -23.5 -45.0996 -33.2002 -65.0996 -19.0996zM365.1 308.2
+c-8.89941 10 -23.2998 -6.90039 -15.5 -16.1006c7.40039 -9 32.1006 -2.39941 15.5 16.1006zM504 192c0 -137 -111 -248 -248 -248s-248 111 -248 248s111 248 248 248s248 -111 248 -248zM437.8 149.4c2.5 16.0996 -20.2002 16.5996 -25.2002 25.6992
+c-13.5996 24.1006 -27.6992 36.8008 -54.5 30.4004c11.6006 8 23.5 6.09961 23.5 6.09961c0.300781 6.40039 0 13 -9.39941 24.9004c3.89941 12.5 0.299805 22.4004 0.299805 22.4004c15.5 8.59961 26.7998 24.3994 29.0996 43.1992
+c3.60059 31 -18.7998 59.2002 -49.7998 62.8008c-22.0996 2.5 -43.7002 -7.7002 -54.2998 -25.7002c-23.2002 -40.1006 1.40039 -70.9004 22.4004 -81.4004c-14.4004 1.40039 -34.3008 11.9004 -40.1006 34.2998c-6.59961 25.7002 2.7998 49.8008 8.90039 61.4004
+c0 0 -4.40039 5.7998 -8 8.90039c0 0 -13.7998 0 -24.6006 -5.30078c11.9004 15.2002 25.2002 14.4004 25.2002 14.4004c0 6.40039 -0.599609 14.9004 -3.59961 21.5996c-5.40039 11 -23.7998 12.9004 -31.7002 -2.7998c0.0996094 0.200195 0.299805 0.400391 0.400391 0.5
+c-5 -11.8994 -1.10059 -55.8994 16.8994 -87.2002c-2.5 -1.39941 -9.09961 -6.09961 -13 -10c-21.5996 -9.69922 -56.2002 -60.2998 -56.2002 -60.2998c-28.1992 -10.7998 -77.1992 -50.8994 -70.5996 -79.7002c0.299805 -3 1.40039 -5.5 3 -7.5
+c-2.7998 -2.19922 -5.5 -5 -8.2998 -8.2998c-11.9004 -13.7998 -5.2998 -35.2002 17.7002 -24.3994c15.7998 7.19922 29.5996 20.1992 36.2998 30.3994c0 0 -5.5 5 -16.2998 4.40039c27.6992 6.59961 34.2998 9.39941 46.1992 9.09961c8 -3.89941 8 34.2998 8 34.2998
+c0 14.7002 -2.19922 31 -11.0996 41.5c12.5 -12.1992 29.0996 -32.6992 28 -60.5996c-0.799805 -18.2998 -15.2002 -23 -15.2002 -23c-9.09961 -16.5996 -43.2002 -65.9004 -30.3994 -106c0 0 -9.7002 14.9004 -10.2002 22.0996
+c-17.4004 -19.3994 -46.5 -52.2998 -24.6006 -64.5c26.6006 -14.6992 108.801 88.6006 126.2 142.301c34.6006 20.7998 55.4004 47.2998 63.9004 65c22 -43.5 95.2998 -94.5 101.1 -59z" />
+    <glyph glyph-name="etsy" unicode="&#xf2d7;" horiz-adv-x="384" 
+d="M384 100c-1.75 -10.75 -13.75 -110 -15.5 -132c-117.879 4.29883 -219.895 4.74316 -368.5 0v25.5c45.457 8.94824 60.627 8.01855 61 35.25c1.79297 72.3223 3.52441 244.143 0 322c-1.0293 28.46 -12.1299 26.7646 -61 36v25.5
+c73.8857 -2.3584 255.933 -8.55078 362.999 3.75c-3.5 -38.25 -7.75 -126.5 -7.75 -126.5h-23.249c-11.0527 42.835 -18.7588 90.5 -54.75 90.5h-137c-10.25 0 -10.75 -3.5 -10.75 -9.75v-163.75c58 -0.5 88.5 2.5 88.5 2.5c29.7695 0.951172 27.5596 8.50195 40.75 65.251
+h25.75c-4.40723 -101.351 -3.91016 -61.8291 -1.75 -160.25h-25.75c-9.15527 40.0859 -9.06543 61.0449 -39.501 61.5c0 0 -21.5 2 -88 2v-139c0 -26 14.25 -38.25 44.25 -38.25h89.251c63.6357 0 66.5645 24.9961 98.751 99.75h22.249v-0.000976562z" />
+    <glyph glyph-name="imdb" unicode="&#xf2d8;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM21.2998 218.8h-0.299805c0.0996094 0.100586 0.200195 0.299805 0.299805 0.400391v-0.400391zM97 128.2v127.8h-33v-127.8h33z
+M210.2 128.2v127.8h-43l-7.60059 -59.9004c-2.69922 20 -5.39941 40.1006 -8.69922 59.9004h-42.8008v-127.8h29v84.5l12.2002 -84.5h20.6006l11.5996 86.3994v-86.3994h28.7002zM221.6 128.2c86.1006 -0.100586 75 -6 75 82.5c0 8.09961 0.300781 16.7998 -1.39941 24.3994
+c-4.2998 22.5 -31.4004 20.9004 -49 20.9004h-24.6006v-127.8zM382.5 157.4v36c0 17.2998 -0.799805 30.0996 -22.2002 30.0996c-8.89941 0 -14.8994 -2.7002 -20.8994 -9.2002v41.7002h-31.7002v-127.8h29.7998l1.90039 8.09961
+c5.69922 -6.7998 11.8994 -9.7998 20.8994 -9.7998c19.7998 0 22.2002 15.2002 22.2002 30.9004zM265 218.1v-49.2998c0 -9.7002 1.90039 -18.7002 -10.2998 -18.3994v83.6992c11.8994 0 10.2998 -6.2998 10.2998 -16zM350.5 192v-32.7002
+c0 -5.39941 1.59961 -14.3994 -6.2002 -14.3994c-1.59961 0 -3 0.799805 -3.7998 2.39941c-2.2002 5.10059 -1.09961 44.1006 -1.09961 44.7002c0 3.7998 -1.10059 12.7002 4.89941 12.7002c7.2998 0 6.2002 -7.2998 6.2002 -12.7002z" />
+    <glyph glyph-name="ravelry" unicode="&#xf2d9;" horiz-adv-x="512" 
+d="M498.252 213.777c0.129883 -0.613281 0.322266 -1.21777 0.561523 -1.78223v-37.0557c-0.194336 -0.300781 -0.516602 -0.583008 -0.552734 -0.900391c-0.619141 -5.36426 -0.837891 -10.8076 -1.87012 -16.0869c-2.06934 -10.6074 -4.15723 -21.2393 -7.0166 -31.6523
+c-4.94531 -18.0205 -12.7578 -34.8809 -22.2998 -50.9258c-8.94336 -15.126 -19.4043 -28.9668 -31.4268 -41.6387c-3.74609 -3.92188 -7.54688 -7.80078 -11.5107 -11.5c-5.31152 -4.95703 -10.5146 -10.1094 -16.2998 -14.457
+c-9.3418 -7.02344 -18.9883 -13.6533 -28.7373 -20.1006c-15.083 -9.81543 -31.6211 -17.9053 -48.9512 -23.8174c-15.3828 -5.38281 -31.1533 -9.38574 -47.4893 -10.7178c-2.52734 -0.206055 -5.02051 -0.753906 -7.52734 -1.14258h-32.2891
+c-0.358398 0.245117 -0.762695 0.436523 -1.18945 0.55957c-6.1377 0.620117 -12.3418 0.863281 -18.4121 1.87305c-13.8301 2.22949 -27.5977 5.58398 -40.6416 9.83496c-19.5498 6.43359 -38.4463 15.0176 -55.8994 25.2773
+c-15.0488 8.79004 -28.9365 18.9688 -41.7871 30.5859c-9.6875 8.70605 -18.3936 18.0898 -26.3584 28.416c-9.38184 12.1963 -17.4385 25.4316 -24 39.5283c-7.5918 16.6592 -13.3467 34.7812 -16.7295 53.2998c-2.35547 13.1611 -3.85059 26.5459 -4.4248 40.2402
+c-0.136719 3.0332 -0.209961 5.74121 -0.209961 8.80859c0 9.05566 0.599609 17.9717 1.76172 26.7119c1.52637 11.874 4.15625 23.6367 7.69043 34.7588c5.05762 15.7021 12.0283 30.7871 20.4941 44.6006c9.58203 15.9961 20.7793 30.6025 33.6484 43.9502
+c9.55469 9.83496 19.7539 19.0605 29.9268 28.2676c5.70605 5.1582 11.8066 9.9082 17.9736 14.5186c12.0029 9.04004 24.6963 17.1025 38.0801 24.1572c12.5137 6.63281 25.9795 12.1963 39.7686 16.3555c10.9453 3.41016 22.5254 5.84375 34.2559 7.09961
+c2.42773 0.225586 4.82617 0.761719 7.23633 1.15039c10.7627 -0.00195312 21.5254 0 32.2881 0.00585938c0.299805 -0.195312 0.583984 -0.516602 0.899414 -0.552734c6.87793 -0.81543 13.8467 -1.16797 20.627 -2.48242
+c11.2432 -2.18359 22.4971 -4.51465 33.5156 -7.61523c19.999 -5.78125 39.2266 -14.2031 56.7227 -24.668c17.2832 -10.0947 32.9639 -22.1357 47.1133 -36.1152c6.71973 -6.90527 12.9209 -14.0508 18.8174 -21.6895c13.4639 -16.959 24.0283 -36.4561 30.874 -57.5
+c3.88867 -11.8086 7.16211 -24.2148 9.62207 -36.5996c2.0459 -10.1748 2.53809 -20.6602 3.74609 -31zM337.135 214.927l0.00488281 67.2695c-35.2686 0 -53.1152 -9.36719 -62.04 -36.1895v31.9316h-73.5176v-190.738h73.5127v93.667
+c0 22.1396 6.37012 37.04 33.5703 37.04c11.8984 0 28.4697 -2.98047 28.4697 -2.98047z" />
+    <glyph glyph-name="sellcast" unicode="&#xf2da;" 
+d="M353.4 416c52.0996 0 94.6992 -42.5996 94.6992 -94.5996v-258.801c0 -52 -42.5996 -94.5996 -94.6992 -94.5996h-258.7c-52.1006 0 -94.7002 42.5996 -94.7002 94.7002v258.7c0 52 42.5996 94.5996 94.7002 94.5996h258.7zM303.4 99.5996
+c27.8994 48.2002 11.1992 110.5 -37.2002 138.5c-18.6006 10.8008 0.0996094 -0.0996094 -18.5 10.7002c-25 14.4004 -46.2002 -23.2998 -21.6006 -37.5c18 -10.2002 0.800781 -0.399414 18.6006 -10.5996c27.5996 -16 37.2002 -51.7998 21.2998 -79.4004
+c-16 -27.5996 -51.7998 -37.2002 -79.4004 -21.2998c-18.5996 10.7998 0.100586 -0.0996094 -18.5 10.7002c-10.2998 6 -23.5996 2.39941 -29.5 -7.90039l-15.6992 -27.2002c-12.6006 -21.7998 19.3994 -53 42.2998 -13.1992c48.2998 -27.7002 110.3 -11 138.2 37.1992z
+M325.2 308.4c14.2998 24.7998 -23.4004 46.3994 -37.7002 21.5l-4.7998 -8.40039c-48.2998 27.7002 -110.3 11 -138.2 -37.2002c-27.7998 -48.2998 -11.0996 -110.6 37.0996 -138.399c18.6006 -10.8008 -0.0996094 0.0996094 18.5 -10.7002
+c25 -14.4004 46.2002 23.2998 21.6006 37.5c-0.100586 0 -18.6006 10.5996 -18.6006 10.5996c-27.5996 16 -37.2998 51.7998 -21.2998 79.4004c16 27.5996 51.7998 37.2002 79.4004 21.2998c18.5996 -10.7998 -0.100586 0.0996094 18.5 -10.7002
+c10.2002 -5.09961 20 -2.89941 26.5 3.60059c2.7002 2.69922 2 2 19 31.5z" />
+    <glyph glyph-name="superpowers" unicode="&#xf2dd;" 
+d="M448 416l-87.2002 -87c39.7002 -38.7002 61.2002 -92.7002 57.7002 -148.2c-5.40039 -93 -76.9004 -167.3 -168.7 -179.8c-83.2998 -11 -166.5 -22 -249.8 -33l86.7998 86.7998c-39.7998 38.7002 -61.0996 92.7002 -57.7998 148.2c5.7002 93.2998 77 167.5 169 180
+c83.2002 11 166.7 22 250 33zM368.3 183.7c4.40039 80 -56.7998 146.3 -136.1 151c-78.7002 4.7998 -148.5 -55.2998 -153 -134.5c-4.40039 -80 56.7998 -146.3 136.3 -151c78.7998 -4.7002 148.6 55 152.8 134.5z" />
+    <glyph glyph-name="wpexplorer" unicode="&#xf2de;" horiz-adv-x="512" 
+d="M512 192c0 -141.2 -114.7 -256 -256 -256c-141.2 0 -256 114.7 -256 256s114.7 256 256 256s256 -114.7 256 -256zM480 192c0 123.2 -100.3 224 -224 224c-123.5 0 -224 -100.5 -224 -224s100.5 -224 224 -224s224 100.5 224 224zM160.9 323.4l86.8994 -37.1006
+l-37.0996 -86.8994l-86.9004 37.0996zM270.9 154.3l46.5996 -94h-14.5996l-50 100l-48.9004 -100h-14l51.0996 106.9l-22.2998 9.39941l6 14l68.6006 -29.0996l-6 -14.2998zM259.1 270.6l68.6006 -29.3994l-29.4004 -68.2998l-68.2998 29.0996zM339.4 227.7
+l54.5996 -23.1006l-23.4004 -54.2998l-54.2998 23.1006z" />
+    <glyph glyph-name="meetup" unicode="&#xf2e0;" horiz-adv-x="512" 
+d="M99 33.7002c1.09961 -5.7002 -2.2998 -11.1006 -8 -12.2998c-5.40039 -1.10059 -10.9004 2.2998 -12 8c-1.09961 5.39941 2.2998 11.0996 7.7002 12.2998c5.39941 1.2002 11.0996 -2.2998 12.2998 -8zM242.1 -37.7002c6.60059 4.60059 15.5 2.7998 19.7002 -3.7002
+c4.60059 -6.59961 2.90039 -15.3994 -3.39941 -20c-6.60059 -4.59961 -15.4004 -2.89941 -20 3.7002c-4.30078 6.60059 -2.60059 15.4004 3.69922 20zM156.1 424.6c-6.2998 -1.5 -12.5 2.5 -13.8994 9.10059c-1.2002 6.2998 2.7998 12.5996 9.09961 14
+c6.2998 1.5 12.6006 -2.5 13.7002 -9.10059c1.40039 -6.2998 -2.59961 -12.5996 -8.90039 -14zM34.4004 221.7c10 -7.10059 12.5996 -20.7998 5.69922 -31.2002c-6.89941 -10.2998 -20.5996 -12.7998 -30.5996 -5.7002c-10 6.90039 -12.5996 20.9004 -5.7002 30.9004
+c6.90039 10.2998 20.6006 12.8994 30.6006 6zM306.4 392.6c-10.3008 -6.2998 -23.7002 -2.89941 -29.7002 7.40039c-6.2998 10.5996 -2.90039 24.2998 7.39941 30.5996c10.3008 6.30078 23.7002 2.90039 30 -7.69922c6 -10.3008 2.90039 -24 -7.69922 -30.3008zM115.3 334.6
+c-7.5 -5.19922 -18 -3.5 -23.0996 4.30078c-5.10059 7.69922 -3.40039 18.2998 4.2998 23.6992c7.40039 5.10059 18 3.40039 23.0996 -4.2998c5.10059 -7.7002 3.40039 -18.2998 -4.2998 -23.7002zM487.6 178.6c7.40039 1.40039 14.8008 -3.5 16.3008 -10.8994
+c1.69922 -7.7002 -3.2002 -15.2002 -10.6006 -16.6006c-7.39941 -1.69922 -14.8994 3.2002 -16.2998 10.6006c-1.7002 7.7998 3.2002 15.2002 10.5996 16.8994zM527.3 235.4c1.40039 -5.7002 -2.2998 -11.1006 -7.7002 -12.6006
+c-5.69922 -1.09961 -11.1992 2.60059 -12.2998 8c-1.09961 5.7002 2.2998 11.5 8 12.6006c5.40039 1.09961 10.9004 -2.30078 12 -8zM447 309.1c8.2998 6 20 3.80078 25.7002 -4.89941c5.7002 -8.60059 3.7002 -20.2998 -4.60059 -26.2998
+c-8.59961 -5.7002 -20.2998 -3.7002 -26 4.89941c-5.69922 8.60059 -3.69922 20.2998 4.90039 26.2998zM440.7 169.7c26.2998 -43.1006 15.0996 -100 -26.2998 -129.101c-17.4004 -12.2998 -37.1006 -17.6992 -56.9004 -17.0996
+c-12 -47.0996 -69.4004 -64.5996 -105.1 -32.5996c-1.10059 -0.900391 -2.60059 -1.7002 -3.7002 -2.90039c-39.1006 -27.0996 -92.2998 -17.4004 -119.4 22.2998c-9.7002 14.2998 -14.5996 30.6006 -15.0996 46.9004c-65.4004 10.8994 -90 94 -41.1006 139.7
+c-28.2998 46.8994 0.600586 107.399 53.4004 114.899c25.0996 66.2002 107.6 97.6006 163.6 54.2002c67.4004 22.2998 136.301 -29.4004 130.9 -101.1c41.0996 -12.6006 52.7998 -66.9004 19.7002 -95.2002zM370.7 95.4004
+c-3.10059 20.5996 -40.9004 4.59961 -43.1006 27.0996c-3.09961 32 43.7002 101.1 40 128c-3.39941 24 -19.3994 29.0996 -33.3994 29.4004c-13.4004 0.299805 -16.9004 -2 -21.4004 -4.60059c-2.89941 -1.7002 -6.59961 -4.89941 -11.7002 0.299805
+c-6.2998 6 -11.0996 11.7002 -19.3994 12.9004c-12.2998 2 -17.7002 -2 -26.6006 -9.7002c-3.39941 -2.89941 -12 -12.8994 -20 -9.09961c-3.39941 1.7002 -15.3994 7.7002 -24 11.3994c-16.2998 7.10059 -40 -4.59961 -48.5996 -20
+c-12.9004 -22.8994 -38 -113.1 -41.7002 -125.1c-8.59961 -26.5996 10.9004 -48.5996 36.9004 -47.0996c11.0996 0.599609 18.2998 4.59961 25.3994 17.3994c4 7.40039 41.7002 107.7 44.6006 112.601c2 3.39941 8.89941 8 14.5996 5.09961
+c5.7002 -3.09961 6.90039 -9.40039 6 -15.0996c-1.09961 -9.7002 -28 -70.9004 -28.8994 -77.7002c-3.40039 -22.9004 26.8994 -26.6006 38.5996 -4c3.7002 7.09961 45.7002 92.5996 49.4004 98.2998c4.2998 6.2998 7.39941 8.2998 11.6992 8
+c3.10059 0 8.30078 -0.900391 7.10059 -10.9004c-1.40039 -9.39941 -35.1006 -72.2998 -38.9004 -87.6992c-4.59961 -20.6006 6.60059 -41.4004 24.9004 -50.6006c11.3994 -5.7002 62.5 -15.7002 58.5 11.1006zM376.4 3.09961c10.5996 7.5 24.8994 4.60059 32.2998 -6
+c7.09961 -10.5996 4.59961 -25.1992 -6 -32.5996c-10.6006 -7.09961 -24.9004 -4.59961 -32 6c-7.2002 10.5996 -4.60059 25.2002 5.7002 32.5996z" />
+    <glyph glyph-name="font-awesome-alt" unicode="&#xf35c;" 
+d="M339.3 276.8c5.40039 0 9.5 -3 7.7002 -7.09961v-134.4c0 -4.2002 -3 -6 -7.2002 -7.7998c-15.5996 -7.09961 -33.5 -13.7002 -52 -13.7002c-26.2998 0 -38.2002 16.1006 -69.2998 16.1006c-22.7002 0 -46 -8.30078 -65.7002 -16.7002
+c-0.599609 -0.600586 -1.7998 -1.2002 -3 -1.2002v-44.2002c0 -1.7998 0 -3 -0.599609 -4.7998v-1.2998c-2.40039 -7.7002 -9.5 -13.7002 -18.5 -13.7002c-10.7002 0 -19.7002 8.90039 -19.7002 19.7002v212.1c-7.7002 6 -12.5 15.5 -12.5 25.7002
+c0 18 14.2998 32.2998 32.2998 32.2998s32.2998 -14.3994 32.2998 -32.2998c0 -10.7998 -4.69922 -19.7002 -12.5 -25.7002v-17.8994c1.2002 0.599609 3 1.19922 4.80078 1.7998c17.8994 7.09961 39.3994 13.7002 59.6992 13.7002
+c22.1006 0 39.4004 -5.90039 59.1006 -13.7002c4.09961 -1.7998 8.2998 -2.40039 12.5 -2.40039c22.7002 0 46.5996 15.5 52.5996 15.5zM397.8 416c27.5 0 50.2002 -22.7002 50.2002 -50.2002v-347.6c0 -27.5 -22.7002 -50.2002 -50.2002 -50.2002h-347.6
+c-27.5 0 -50.2002 22.7002 -50.2002 50.2002v347.6c0 27.5 22.7002 50.2002 50.2002 50.2002h347.6zM412.1 18.2998v347.601c0 7.69922 -6.5 14.2998 -14.2998 14.2998v-0.100586h-347.6c-7.7002 0 -14.2998 -6.5 -14.2998 -14.2998v-347.5
+c0 -7.7002 6.5 -14.2998 14.2998 -14.2998h347.6c7.7002 0 14.2998 6.5 14.2998 14.2998z" />
+    <glyph glyph-name="accessible-icon" unicode="&#xf368;" 
+d="M423.9 192.2l-12.9004 -157.3c-3.2998 -40.7002 -63.9004 -35.1006 -60.5996 4.89941l10 122.5l-41.1006 -2.2998c10.1006 -20.7002 15.7998 -43.9004 15.7998 -68.5c0 -41.2002 -16.0996 -78.7002 -42.2998 -106.5l-39.2998 39.2998
+c57.9004 63.7002 13.0996 167.2 -74 167.2c-25.9004 0 -49.5 -9.90039 -67.2002 -26l-39.2998 39.2998c22 20.7002 50.0996 35.1006 81.4004 40.2002l75.2998 85.7002l-42.6006 24.7998l-51.5996 -46c-30 -26.7998 -70.5996 18.5 -40.5 45.4004l68 60.6992
+c9.7998 8.80078 24.0996 10.2002 35.5 3.60059c0 0 139.3 -80.9004 139.5 -81.1006c16.2002 -10.0996 20.7002 -36 6.09961 -52.5996l-58.3994 -66.5l106.1 5.90039c18.5 1.09961 33.6006 -14.4004 32.1006 -32.7002zM359 346.2
+c-28.0996 0 -50.9004 22.7998 -50.9004 50.8994c0 28.1006 22.8008 50.9004 50.9004 50.9004s50.9004 -22.7998 50.9004 -50.9004c0 -28.0996 -22.8008 -50.8994 -50.9004 -50.8994zM179.6 -8.5c20.8008 0 40.1006 6.40039 56.1006 17.2998l39.7002 -39.7002
+c-100.7 -78.8994 -251.4 -8.19922 -251.4 122.5c0 36.1006 12.4004 69.4004 33.2002 95.7002l39.7002 -39.7002c-44.7002 -65.5 2.09961 -156.1 82.6992 -156.1z" />
+    <glyph glyph-name="accusoft" unicode="&#xf369;" horiz-adv-x="640" 
+d="M322.1 196c-1.69922 -1.59961 -89.5996 -82.5 -90.1992 -83.2998l-92.6006 -33.7998c-4.7998 -2 -7.59961 -3.7002 -7 -8.90039c0.200195 -1.5 0.600586 -22.5996 1 -27.7002c-0.700195 -0.5 -0.0996094 0 -0.599609 -0.599609c0 0 -113.7 -36.6006 -114.5 -36.6006
+c-14.1006 -5.09961 -22.7002 -8.2998 -15.7002 1.7002c1.2998 1.7998 234.4 231.601 243.4 240.9c13 13.5 25 15.0996 25 15.0996l51.1992 -65.7998v-1zM482.2 75.9004c-5.7002 6.89941 -232.2 297.1 -239.9 306.6c-13.7002 17.2002 0 16.7998 19.2002 16.9004
+c9.7002 0.0996094 106.3 0.599609 116.5 0.599609c24.0996 0.0996094 28.7002 -0.599609 38.4004 -12.7998c2.09961 -2.7002 205.1 -245.8 207.199 -248.3c5.5 -6.7002 15.2002 -19.1006 7.2002 -23.4004c-2.39941 -1.2998 -114.6 -47.7002 -117.8 -48.9004
+c-10.0996 -4 -17.5 -6.7998 -30.7998 9.30078zM634.9 74.2998c6 -1.39941 7.09961 -4.2002 1.69922 -8.2002c-2 -1.39941 -123.699 -76.5996 -125.8 -77.7998c-15.0996 -8.7998 -38 -1.59961 -53.5996 1.7002c-7.10059 1.5 -305.3 68.2998 -308 69.0996
+c-2.60059 0.900391 -4.40039 1 -4.60059 3.5c-0.299805 4 6 5.60059 11.1006 7.60059c5 1.89941 145.3 52.5996 150.2 54.7002c4.7998 2.09961 11.2998 2.69922 14.3994 2.89941c4.90039 0.299805 59.9004 -8.39941 65.2998 -9.2998l57.1006 -74
+c9.7998 -11.4004 20.7002 -21.9004 36.7002 -14.5996c2.5 1.19922 117.5 51.5996 117.5 51.5996c13.3994 -2.5 35.6992 -6.90039 38 -7.2002z" />
+    <glyph glyph-name="adversal" unicode="&#xf36a;" horiz-adv-x="512" 
+d="M482.1 416c24.5 0 29.9004 -5.59961 29.9004 -30.2002v-388.1c0 -24.5 -5.5 -29.7002 -29.9004 -29.7002h-453.399c-22.9004 0 -28.7002 5.59961 -28.7002 28.9004v390.199c0 23 5.7998 28.9004 28.7002 28.9004h453.399zM178.4 227.7
+c9.39941 -7.2002 12.3994 -17.1006 11.2998 -27.2998c-1.7998 -19.1006 -75.7998 -11.4004 -114 -30.9004c-27.2002 -13.9004 -42.7002 -41.7002 -39.6006 -71c6.7002 -64.7002 89.6006 -79.7002 147 -43.2998c4.60059 3.2002 8.30078 4.89941 11.9004 1
+c2.09961 -2.60059 2 -4 3.90039 -6.2002c7.2998 -9.59961 38.1992 -14.0996 46.5996 -7.40039c3.09961 2.80078 4.59961 6.30078 2.7002 10.7002c-13.6006 30.5 -6.60059 63 -9.2998 88.7998c0 69.3008 6.39941 111.7 -34.5 128.5
+c-41.9004 17.4004 -84.2002 16.6006 -125.301 -4.7998c-16.2998 -9 -53.6992 -52.8994 -24.8994 -64.2998c5.2998 -2.2998 12.7998 -4 22.5 -5.5c8.2002 -1.2002 13.2002 -2.7998 17.5 8.2998c12.0996 32.1006 56.7002 43.6006 84.2002 23.4004zM465.1 5.7002
+c0 14.2998 -9.7998 9.89941 -16.5996 9.89941c-132.3 0.400391 -264.5 0.400391 -396.8 0c-6.60059 0 -16.7002 4.80078 -17.1006 -9.09961c-0.399414 -15.5 10.4004 -10.7002 17.8008 -10.7002h394.899c6.7002 0 17.7998 -5.2002 17.7998 9.90039zM468.9 346.2
+c0 0.200195 0 0.299805 0.0996094 0.5c0 9.89941 -3.5 15.0996 -13.5996 14.2998c-3.10059 -0.400391 -6.60059 0 -9.7002 0c-26.1006 0 -26 0 -26 -26.2002v-71c-79.2002 45.6006 -124.3 -6.59961 -136.101 -30.5c-16.3994 -32.8994 -21.7998 -66.5996 -15.6992 -100
+c16.2998 -92.2998 91 -114.899 144.399 -85.2002c4.60059 2.80078 6.60059 7.5 12.4004 -1.19922c8.59961 -12.7002 23.7002 -5.2002 36.0996 -5.60059c7.40039 0 8.10059 8.2002 8.10059 13.9004v291zM417.4 113.9c-19.5 -47.6006 -72.9004 -43.3008 -90 -5.2002
+c-15.1006 33.2998 -15.5 68.2002 0.399414 101.5c16.2998 34.0996 59.7002 35.7002 81.5 4.7998c20.6006 -28.7998 14.9004 -84.5996 8.10059 -101.1zM122.6 78.5996c-7.5 1.30078 -33 3.30078 -33.6992 27.8008c-0.400391 13.8994 7.7998 23 19.7998 25.7998
+c24.3994 5.89941 49.2998 9.89941 73.7002 14.7002c8.89941 2 7.39941 -4.40039 7.7998 -9.5c1.39941 -33 -26.1006 -59.2002 -67.6006 -58.8008z" />
+    <glyph glyph-name="affiliatetheme" unicode="&#xf36b;" horiz-adv-x="512" 
+d="M159.7 210.6c-51.2998 -70.8994 -116.601 -110.8 -145.7 -89.1992c-29.2002 21.6992 -11.2002 96.5996 40.2002 167.5c51.2998 70.8994 116.6 110.8 145.7 89.1992c29.0996 -21.5996 11.0996 -96.5996 -40.2002 -167.5zM510.9 267.9
+c0.699219 -8.2002 1.09961 -16.5 1 -25c0 -151.801 -121.601 -274.9 -271.601 -274.9c-82.8994 0 -157.2 37.5996 -207 96.9004c71.2998 19.3994 130.5 68.3994 164.101 133.199c7.69922 -32.5996 24 -58.5996 49 -73.7998c72.5996 -44.0996 190.699 20.2002 264.5 143.601z
+" />
+    <glyph glyph-name="algolia" unicode="&#xf36c;" 
+d="M229.3 265.4c49.2002 0 89.2002 -39.9004 89.2002 -89.2002s-39.9004 -89.2002 -89.2002 -89.2002s-89.2002 39.9004 -89.2002 89.2002s39.9004 89.2002 89.2002 89.2002zM292 208.8c1.2998 0.700195 1.7998 2.40039 1.09961 3.7002
+c-12.1992 21.4004 -34.8994 36.0996 -61.0996 37.0996c-1.40039 0.100586 -2.7002 -1.09961 -2.7002 -2.59961v-66.5c0 -1.90039 2 -3.2002 3.7998 -2.2998zM389.1 416c32.5 0 58.9004 -26.4004 58.8008 -58.9004v-330.199c0 -32.5 -26.3008 -58.9004 -58.9004 -58.9004
+h-330.1c-32.5 0 -58.9004 26.4004 -58.9004 59v330.1c0 32.5 26.4004 58.9004 58.9004 58.9004h330.199zM186.5 331.3h0.0996094v-15.7998c0 -1.7002 1.7002 -3 3.40039 -2.5c12.7002 3.7002 25.9004 5.5 39.4004 5.5c13 0 25.7998 -1.7002 38.0996 -5.09961
+c1.59961 -0.5 3.2998 0.699219 3.2998 2.5v15.3994c0 10.7998 -8.7002 19.5 -19.5 19.5h-45.2998c-10.7998 0 -19.5 -8.7002 -19.5 -19.5zM102.1 294.3c-7.59961 -7.59961 -7.59961 -19.8994 0 -27.3994l7.7002 -7.7002c1.10059 -1.2002 3 -1 4 0.299805
+c4.40039 6.09961 9.40039 12 14.7998 17.4004c5.5 5.5 11.4004 10.3994 17.6006 14.8994c1.2998 1 1.39941 2.90039 0.299805 4l-7.7002 7.7002c-7.59961 7.59961 -19.8994 7.59961 -27.5 0zM229.3 49.5c69.9004 0 126.601 56.7998 126.601 126.6
+c0 70 -56.6006 126.601 -126.601 126.601c-69.8994 0 -126.6 -56.7002 -126.6 -126.601c0 -69.8994 56.5996 -126.6 126.6 -126.6z" />
+    <glyph glyph-name="amilia" unicode="&#xf36d;" 
+d="M240.1 416c134.101 0 191.9 -55.7002 192 -136v-296.6c0 -3 -1 -8.10059 -5.09961 -9.10059c-4 -1 -57.2998 -0.700195 -66.5 -0.700195s-56.7998 1 -59.9004 2c-4 0.900391 -6.09961 6.10059 -6.09961 9.10059v25.3994
+c-39.5996 -21.3994 -105.5 -42.0996 -153.3 -42.0996c-109.7 0 -124.9 85.7002 -124.9 104s-5.09961 95.5 30.4004 111.8c31.5 13.2002 156.3 36.5 243.7 47.7998v38.5c0 44.7002 -1 73.1006 -58.9004 73.1006c-55.7998 0 -119.8 -25.4004 -152.3 -47.7002
+c-6.10059 -4.09961 -16.2002 -4.09961 -20.2998 6.09961c-5.10059 12.2002 -9.10059 34.5 -10.2002 39.6006c-1.90039 10.2002 2.09961 16.2998 7.2002 19.3994c52.6992 38.5 122.3 55.4004 184.199 55.4004zM290.3 68v106.7c-44.7002 -4.10059 -95.5 -20.2998 -119.8 -33.5
+c-21.2998 -10.2002 -18.2998 -40.7002 -18.2998 -52.9004c0.0996094 -11.2002 6.2002 -44.7002 59 -44.7002c30.3994 0 57.7002 11.2002 79.0996 24.4004z" />
+    <glyph glyph-name="angrycreative" unicode="&#xf36e;" horiz-adv-x="640" 
+d="M640 209.8l-3.2002 -28.2002l-34.5 -2.2998l-2 -18.0996l34.5 2.2998l-3.2002 -28.2002l-34.3994 -2.2002l-2.2998 -20.0996l34.3994 2.2002l-3 -26.1006l-64.7002 -4.09961l12.7002 113.2l-47.2998 -115.4l-31.9004 -2l-23.7998 117.8l30.2998 2l13.6006 -79.3994
+l31.7002 82.3994zM426.8 76.5l12.7998 120l28.4004 1.90039l-12.9004 -120.101zM162 59.9004l-19.4004 36l-3.5 -37.4004l-28.1992 -1.7002l2.69922 29.1006c-11 -18 -32 -34.3008 -56.8994 -35.8008c-32.7998 -2 -59.7002 20.9004 -56.4004 58.2002
+c2.60059 29.2998 26.7002 62.7998 67.5 65.4004c37.7002 2.39941 47.6006 -23.2002 51.2998 -28.7998l2.80078 30.7998l38.8994 2.5c20.1006 1.2998 38.7002 -3.7002 42.5 -23.7002l2.60059 26.5996l64.7998 4.2002l-2.7002 -27.8994l-36.4004 -2.40039l-1.69922 -17.9004
+l36.3994 2.30078l-2.7002 -27.9004l-36.3994 -2.2998l-1.90039 -19.9004l36.2998 2.2998l-2.09961 -20.7998l55 117.2l23.7998 1.59961l32.1006 -110.6l8.89941 85.5996l-22.2998 -1.39941l2.90039 27.8994l75 4.90039l-3 -28l-24.3008 -1.59961l-9.69922 -91.9004
+l-58 -3.7002l-4.30078 15.6006l-39.3994 -2.5l-8 -16.3008zM117.7 130.1l-26.4004 -1.69922c-6.7002 12.3994 -14.3994 16.5996 -26.2998 15.7998c-19 -1.2002 -33.2998 -17.5 -34.5996 -33.2998c-1.40039 -16 7.2998 -32.5 28.6992 -31.2002
+c12.8008 0.799805 21.3008 8.59961 28.9004 18.8994l27 1.7002zM173.8 137.8c1.2002 12.9004 -7.59961 13.6006 -26.0996 12.4004l-2.7002 -28.5c14.2002 0.899414 27.5 2.09961 28.7998 16.0996zM194.9 67l5.7998 60c-5 -13.5 -14.7002 -21.0996 -27.9004 -26.5996z
+M330.3 112l-7.89941 37.7998l-15.8008 -39.2998zM160.2 186.6l-4.2998 17.5l-39.6006 -2.59961l-8.09961 -18.2002l-31.9004 -2.09961l57 121.899l23.9004 1.60059l30.7002 -102l9.89941 104.7l27 1.7998l37.7998 -63.6006l6.5 66.6006l28.5 1.89941l-4 -41.1992
+c7.40039 13.5 22.9004 44.6992 63.6006 47.5c40.5 2.7998 52.3994 -29.3008 53.3994 -30.3008l3.30078 32l39.2998 2.7002c12.7002 0.900391 27.7998 -0.299805 36.2998 -9.7002l-4.40039 11.9004l32.2002 2.2002l12.9004 -43.2002l23 45.7002l31 2.2002l-43.6006 -78.4004
+l-4.7998 -44.2998l-28.3994 -1.90039l4.7998 44.2998l-15.7998 43c1 -22.2998 -9.2002 -40.0996 -32 -49.5996l25.1992 -38.7998l-36.3994 -2.40039l-19.2002 36.7998l-4 -38.2998l-28.4004 -1.89941l3.30078 31.5c-6.7002 -9.30078 -19.7002 -35.4004 -59.6006 -38
+c-26.2002 -1.7002 -45.5996 10.2998 -55.3994 39.1992l-4 -40.2998l-25 -1.59961l-37.6006 63.2998l-6.2998 -66.2002zM436.8 268.7c10.2002 0.700195 17.5 2.09961 21.6006 4.2998c4.5 2.40039 7 6.40039 7.59961 12.0996
+c0.599609 5.30078 -0.599609 8.80078 -3.40039 10.4004c-3.59961 2.09961 -10.5996 2.7998 -22.8994 2zM327.7 234c5.59961 -5.90039 12.7002 -8.5 21.2998 -7.90039c4.7002 0.300781 9.09961 1.80078 13.2998 4.10059c5.5 3 10.6006 8 15.1006 14.2998l-34.2002 -2.2998
+l2.39941 23.8994l63.1006 4.30078l1.2002 12l-31.2002 -2.10059c-4.10059 3.7002 -7.7998 6.60059 -11.1006 8.10059c-4 1.69922 -8.09961 2.7998 -12.1992 2.5c-8 -0.5 -15.3008 -3.60059 -22 -9.2002c-7.7002 -6.40039 -12 -14.5 -12.9004 -24.4004
+c-1.09961 -9.59961 1.40039 -17.2998 7.2002 -23.2998zM126.4 225.8l23.7998 1.60059l-8.2998 37.5996z" />
+    <glyph glyph-name="app-store" unicode="&#xf36f;" horiz-adv-x="512" 
+d="M255.9 327.1l9.09961 15.7002c5.59961 9.7998 18.0996 13.1006 27.9004 7.5c9.7998 -5.59961 13.0996 -18.0996 7.5 -27.8994l-87.5 -151.5h63.2998c20.5 0 32 -24.1006 23.0996 -40.8008h-185.5c-11.2998 0 -20.3994 9.10059 -20.3994 20.4004
+s9.09961 20.4004 20.3994 20.4004h52l66.6006 115.399l-20.8008 36.1006c-5.59961 9.7998 -2.2998 22.1992 7.5 27.8994c9.80078 5.60059 22.2002 2.2998 27.9004 -7.5zM177.2 109.1l-19.6006 -34c-5.59961 -9.7998 -18.0996 -13.0996 -27.8994 -7.5
+c-9.7998 5.60059 -13.1006 18.1006 -7.5 27.9004l14.5996 25.2002c16.4004 5.09961 29.7998 1.2002 40.4004 -11.6006zM346.1 170.8h53.1006c11.2998 0 20.3994 -9.09961 20.3994 -20.3994c0 -11.3008 -9.09961 -20.4004 -20.3994 -20.4004h-29.5l19.8994 -34.5
+c5.60059 -9.7998 2.30078 -22.2002 -7.5 -27.9004c-9.7998 -5.59961 -22.1992 -2.2998 -27.8994 7.5c-33.5 58.1006 -58.7002 101.601 -75.4004 130.601c-17.0996 29.5 -4.89941 59.0996 7.2002 69.0996c13.4004 -23 33.4004 -57.7002 60.0996 -104zM256 440
+c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM472 192c0 119.9 -97.2998 216 -216 216c-119.9 0 -216 -97.2998 -216 -216c0 -119.9 97.2998 -216 216 -216c119.9 0 216 97.2998 216 216z" />
+    <glyph glyph-name="app-store-ios" unicode="&#xf370;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM127 63.5l19.2998 33.2998c-10.2998 12.5 -23.5 16.2998 -39.5996 11.4004l-14.2998 -24.7002
+c-5.5 -9.5 -2.30078 -21.7998 7.2998 -27.2998c9.5 -5.5 21.7998 -2.2998 27.2998 7.2998zM265.9 117.4c8.7998 16.2998 -2.5 40 -22.7002 40h-62.1006l85.8008 148.6c5.5 9.5 2.2998 21.7998 -7.30078 27.2998c-9.5 5.5 -21.7998 2.2998 -27.2998 -7.2998
+l-8.89941 -15.4004l-8.90039 15.4004c-5.5 9.5 -17.7002 12.7998 -27.2998 7.2998c-9.5 -5.5 -12.7998 -17.7002 -7.2998 -27.2998l20.5 -35.4004l-65.4004 -113.199h-51c-11 0 -20 -9 -20 -20s9 -20 20 -20h181.9zM364 117.4c11 0 20 8.89941 20 20c0 11 -9 20 -20 20h-52
+c-26.2002 45.2998 -45.7998 79.2998 -58.9004 102c-11.8994 -9.80078 -23.7998 -38.8008 -7.09961 -67.8008c16.5 -28.3994 41.0996 -71.1992 74 -128.1c5.5 -9.5 17.7002 -12.7998 27.2998 -7.2998c9.5 5.5 12.7998 17.7002 7.2998 27.2998l-19.5996 33.9004h29z" />
+    <glyph glyph-name="apper" unicode="&#xf371;" horiz-adv-x="640" 
+d="M42.0996 208.9c22.2002 0 29 -2.80078 33.5 -14.6006h0.800781v22.9004c0 11.2998 -4.80078 15.3994 -17.9004 15.3994c-11.2998 0 -14.4004 -2.5 -15.0996 -12.7998h-38.6006c0.299805 13.9004 1.5 19.1006 5.7998 24.4004
+c7.30078 8.7998 18.9004 11.7998 46.1006 11.7998c33 0 47.0996 -5 53.8994 -18.9004c2 -4.2998 4 -15.5996 4 -23.6992v-76.3008h-38.2998l1.2998 19.1006h-1c-5.2998 -15.6006 -13.5996 -20.4004 -35.5 -20.4004c-30.2998 0 -41.0996 10.1006 -41.0996 37.2998
+c0 25.2002 12.2998 35.8008 42.0996 35.8008zM59.2002 160.8c13.0996 0 16.8994 3 16.8994 13.4004c0 9.09961 -4.2998 11.5996 -19.5996 11.5996c-13.0996 0 -17.9004 -3 -17.9004 -12.0996c-0.0996094 -10.4004 3.7002 -12.9004 20.6006 -12.9004zM137 255.7h38.2998
+l-1.5 -20.6006h0.799805c9.10059 17.1006 15.9004 20.9004 37.5 20.9004c14.4004 0 24.7002 -3 31.5 -9.09961c9.80078 -8.60059 12.8008 -20.4004 12.8008 -48.1006c0 -30 -3 -43.0996 -12.1006 -52.8994c-6.7998 -7.30078 -16.3994 -10.1006 -33.2002 -10.1006
+c-20.3994 0 -29.1992 5.5 -33.7998 21.2002h-0.799805v-70.2998h-39.5v169zM217.9 195c0 27.5 -3.30078 32.5 -20.7002 32.5c-16.9004 0 -20.7002 -5 -20.7002 -28.7002c0 -28 3.5 -33.5 21.2002 -33.5c16.3994 0 20.2002 5.60059 20.2002 29.7002zM275.8 255.7h38.2998
+l-1.5 -20.6006h0.800781c9.09961 17.1006 15.8994 20.9004 37.5 20.9004c14.3994 0 24.6992 -3 31.5 -9.09961c9.7998 -8.60059 12.7998 -20.4004 12.7998 -48.1006c0 -30 -3 -43.0996 -12.1006 -52.8994c-6.7998 -7.30078 -16.3994 -10.1006 -33.2998 -10.1006
+c-20.3994 0 -29.2002 5.5 -33.7998 21.2002h-0.799805v-70.2998h-39.5v169h0.0996094zM356.7 195c0 27.5 -3.2998 32.5 -20.7002 32.5c-16.9004 0 -20.7002 -5 -20.7002 -28.7002c0 -28 3.5 -33.5 21.2002 -33.5c16.4004 0 20.2002 5.60059 20.2002 29.7002zM410.5 198.8
+c0 25.4004 3.2998 37.7998 12.2998 45.7998c8.7998 8.10059 22.2002 11.3008 45.1006 11.3008c42.7998 0 55.6992 -12.8008 55.6992 -55.7002v-11.1006h-75.2998c-0.299805 -2 -0.299805 -4 -0.299805 -4.7998c0 -16.8994 4.5 -21.8994 20.0996 -21.8994
+c13.9004 0 17.9004 3 17.9004 13.8994h37.5v-2.2998c0 -9.7998 -2.5 -18.9004 -6.7998 -24.7002c-7.2998 -9.7998 -19.6006 -13.5996 -44.2998 -13.5996c-27.5 0 -41.6006 3.2998 -50.6006 12.2998c-8.5 8.5 -11.2998 21.2998 -11.2998 50.7998zM486.9 210.4
+c-0.300781 1.7998 -0.300781 3.2998 -0.300781 3.7998c0 12.2998 -3.2998 14.5996 -19.5996 14.5996c-14.4004 0 -17.0996 -3 -18.0996 -15.0996l-0.300781 -3.2998h38.3008zM542.5 255.7h38.2998l-1.7998 -19.9004h0.700195
+c6.7998 14.9004 14.3994 20.2002 29.7002 20.2002c10.7998 0 19.0996 -3.2998 23.3994 -9.2998c5.2998 -7.2998 6.7998 -14.4004 6.7998 -34c0 -1.5 0 -5 0.200195 -9.2998h-35c0.299805 1.7998 0.299805 3.2998 0.299805 4c0 15.3994 -2 19.3994 -10.2998 19.3994
+c-6.2998 0 -10.7998 -3.2998 -13.0996 -9.2998c-1 -3 -1 -4.2998 -1 -12.2998v-68h-38.2998v118.5h0.0996094z" />
+    <glyph glyph-name="asymmetrik" unicode="&#xf372;" horiz-adv-x="576" 
+d="M517.5 138.8c-13.9004 -14.2998 -30.4004 -27.7002 -48.9004 -39.7998l73.4004 -110.4h-101.6l-45.9004 71.8008c-17.5996 -7.2002 -35.9004 -13.4004 -54.5 -18.7002l32.5996 -53.1006h-135.5l22.8008 37.1006c-23.3008 -2.7002 -46.4004 -3.7002 -68.6006 -2.7002
+l-22 -34.4004h-101.6l34.5 51.7002c-45 17.9004 -68.9004 47.9004 -68.4004 83c0.299805 25.7998 14 54.2998 41.7002 82.9004c38.9004 40 96.5 72.5996 161.6 92.8994c-22.2998 -8.09961 -42 -18.5 -62 -30.6992c-31.1992 -16.2002 -58.6992 -35.9004 -79.5 -58.1006
+c-57.3994 -61 -46.5 -121.8 19.1006 -151.2l190.2 285.5l150.899 -226.399c13 9.5 24.7998 19.7998 35 30.5996c98 104.2 53.7002 207.9 -98.7998 231.7c-68.2998 10.5996 -146.8 5.7002 -221.3 -14.7998c-60.1006 -10 -118.7 -31.7002 -170.7 -58.2002
+c118.1 66.9004 277.9 102.1 406.6 82.4004c110 -16.8008 170.2 -69.5 169.4 -135c-0.400391 -36.1006 -19.7002 -76.1006 -58.5 -116.101zM329.9 58.2998c18.3994 5.2998 36.5 11.7998 53.6992 19.2002l-78.6992 123l-101.9 -159.3
+c22.5 -0.700195 45.7998 0.899414 69.2002 4.39941l32.7002 53.3008z" />
+    <glyph glyph-name="audible" unicode="&#xf373;" horiz-adv-x="640" 
+d="M640 248.1v-54l-320 -200l-320 199.9v54l320 -200zM445.5 176.1c-70.7998 94.4004 -200.5 110.7 -290.2 36.3008c-2.59961 -2.2002 -5.2002 -4.40039 -7.7002 -6.7002h-0.299805c37.1006 55.7002 100.601 92.3994 172.601 92.3994s135.5 -36.7998 172.699 -92.5996z
+M225.4 157.3c21 29.6006 55.5 49 94.3994 49c39.2002 0 73.9004 -19.5996 94.7998 -49.5l-45.3994 -28.3994c-21.2002 29.1992 -52 47.5996 -86.4004 47.5996c-20.8994 0 -40.5 -6.7998 -57.3994 -18.7002zM103.6 286.9c-11.5 -9.10059 -24.2998 -22.1006 -34.1992 -32.6006
+c53.8994 82.1006 147 135.601 250.5 135.601c104.899 0 197.199 -54 250.699 -135.7l-48.7998 -30.4004l-0.700195 1c-99.2998 138.5 -285.699 166.4 -417.5 62.1006zM570.6 254.2z" />
+    <glyph glyph-name="avianex" unicode="&#xf374;" horiz-adv-x="512" 
+d="M453.1 416c39 0 64.8008 -31.2002 57.8008 -69.7998l-56.7002 -308.5c-7.10059 -38.5 -44.4004 -69.7002 -83.2998 -69.7002h-312c-39 0 -64.8008 31.2002 -57.7002 69.7002l56.5996 308.6c7.10059 38.5 44.4004 69.7002 83.2998 69.7002h312zM394.9 68.7002
+l6.2998 7.89941l-94.9004 119.4l-4.5 7.2998c19.7998 14.2002 33.5 24.2998 35.2998 25.6006c7.90039 6.59961 6.30078 20.7998 -2.69922 31.2998c-9.2002 10.7998 -23 14.3994 -30.7002 7.89941c0 0 -14.4004 -13.5996 -33.7998 -32.3994l-4.90039 4.5l-103.1 112.399
+l-8.90039 -4.7998l-18.7998 -28.8994l68.7998 -99.8008l20.5 -29.5996c-12 -12.2998 -23.5 -24.4004 -32.7998 -34.9004l-58 31.1006l-15.7002 -15.4004l52.4004 -48.0996l40.5996 -61l17.9004 12.7002l-22.1006 64.1992c12.5 7.60059 27 17.1006 41.7002 27.1006
+l115.4 -110z" />
+    <glyph glyph-name="aws" unicode="&#xf375;" horiz-adv-x="640" 
+d="M180.41 244.99c-0.719727 -22.6504 10.5996 -32.6807 10.8799 -39.0498c-0.276367 -2.69141 -1.85352 -4.99902 -4.09961 -6.27051l-12.8008 -8.95996c-1.60352 -1.12402 -3.54785 -1.82422 -5.62988 -1.91992c-0.429688 0.0195312 -8.18945 -1.83008 -20.4795 25.6104
+c-14.4111 -17.9883 -36.5596 -29.5156 -61.3789 -29.5156c-0.427734 0 -0.804688 0.0585938 -1.23145 0.0654297c-16.2803 -0.890625 -60.4004 9.24023 -58.1299 56.21c-1.58984 38.2803 34.0596 62.0596 70.9297 60.0498
+c7.10059 -0.0195312 21.6006 -0.370117 46.9902 -6.26953v15.6191c2.69043 26.46 -14.7002 46.9902 -44.8096 43.9102c-2.40039 -0.00976562 -19.4004 0.5 -45.8408 -10.1094c-7.35938 -3.37988 -8.2998 -2.82031 -10.75 -2.82031
+c-7.40918 0 -4.35938 21.4795 -2.93945 24.2002c5.20996 6.39941 35.8604 18.3496 65.9395 18.1797c2.25586 0.199219 4.53906 0.301758 6.84668 0.301758c18.5547 0 35.5566 -6.61719 48.8438 -17.582c11.1152 -12.4326 17.877 -28.8398 17.877 -46.8135
+c0 -1.87891 -0.0615234 -3.70508 -0.207031 -5.5459zM93.9902 212.6c32.4297 0.470703 46.1602 19.9707 49.29 30.4707c2.45996 10.0498 2.0498 16.4102 2.0498 27.3994c-9.66992 2.32031 -23.5898 4.85059 -39.5605 4.87012
+c-15.1494 1.14062 -42.8193 -5.62988 -41.7393 -32.2598c-1.24023 -16.79 11.1201 -31.4004 29.96 -30.4805zM264.91 189.55c-7.86035 -0.719727 -11.5205 4.86035 -12.6797 10.3701l-49.8008 164.65c-0.969727 2.7793 -1.60938 5.64941 -1.91992 8.58008
+c-0.0341797 0.227539 -0.0527344 0.459961 -0.0527344 0.697266c0 2.30566 1.70117 4.21387 3.91309 4.55273c0.240234 0.0400391 -2.12988 0 22.25 0c8.78027 0.879883 11.6396 -6.03027 12.5498 -10.3701l35.7197 -140.83l33.1602 140.83
+c0.530273 3.21973 2.94043 11.0693 12.7998 10.2393h17.1602c2.16992 0.180664 11.1104 0.5 12.6807 -10.3691l33.4199 -142.631l36.8701 142.631c0.479492 2.17969 2.71973 11.3691 12.6797 10.3691h19.7197c0.850586 0.130859 6.15039 0.810547 5.25 -8.5791
+c-0.429688 -1.85059 3.41016 10.6592 -52.75 -169.9c-1.14941 -5.50977 -4.82031 -11.0898 -12.6797 -10.3701h-18.6904c-10.9395 -1.15039 -12.5098 9.66016 -12.6797 10.75l-33.1602 137.13l-32.7803 -136.99c-0.15918 -1.08984 -1.72949 -11.8994 -12.6797 -10.75
+h-18.2998v-0.00976562zM538.39 183.92c-5.87988 -0.00976562 -33.9199 0.299805 -57.3594 12.29c-4.59375 1.94531 -7.81934 6.49609 -7.81934 11.7949c0 0.0410156 0.00878906 0.0742188 0.00878906 0.115234v10.75c0 8.4502 6.2002 6.89941 8.83008 5.88965
+c10.04 -4.05957 16.4805 -7.13965 28.8105 -9.59961c36.6494 -7.53027 52.7695 2.2998 56.7197 4.47949c13.1504 7.81055 14.1895 25.6807 5.25 34.9502c-10.4805 8.79004 -15.4805 9.12012 -53.1299 21c-4.64062 1.29004 -43.7002 13.6104 -43.79 52.3604
+c-0.610352 28.2402 25.0498 56.1797 69.5195 55.9502c12.6699 0.00976562 46.4307 -4.13086 55.5703 -15.6201c1.34961 -2.08984 2.01953 -4.5498 1.91992 -7.04004v-10.1104c0 -4.43945 -1.62012 -6.66016 -4.87012 -6.66016
+c-7.70996 0.860352 -21.3896 11.1699 -49.1602 10.75c-6.88965 0.360352 -39.8896 -0.910156 -38.4092 -24.9697c-0.430664 -18.96 26.6094 -26.0703 29.6992 -26.8896c36.46 -10.9707 48.6504 -12.79 63.1201 -29.5801c17.1406 -22.25 7.90039 -48.2998 4.35059 -55.4404
+c-19.0801 -37.4902 -68.4199 -34.4395 -69.2607 -34.4199zM578.59 79.0596c-70.0303 -51.7197 -171.689 -79.25 -258.49 -79.25c-1.0498 -0.00683594 -2.10059 -0.00976562 -3.15234 -0.00976562c-120.699 0 -230.949 45.7383 -314.117 120.74
+c-6.53027 5.88965 -0.770508 13.96 7.16992 9.46973c93.1143 -53.2637 200.925 -83.7148 315.791 -83.7148c0.138672 0 0.950195 -0.405273 1.08887 -0.405273c85.4404 0.458984 167.381 18.2432 241.59 49.5508c11.7803 5 21.7705 -7.80078 10.1201 -16.3809z
+M607.78 112.35c-8.95996 11.5205 -59.2803 5.38086 -81.8105 2.69043c-6.79004 -0.770508 -7.93945 5.12012 -1.79004 9.46973c40.0703 28.1699 105.88 20.1006 113.44 10.6299c7.5498 -9.46973 -2.0498 -75.4092 -39.5605 -106.909
+c-5.75977 -4.87012 -11.2695 -2.30078 -8.70996 4.09961c8.44043 21.25 27.3906 68.4902 18.4307 80.0195z" />
+    <glyph glyph-name="bimobject" unicode="&#xf378;" 
+d="M416 416c17.5996 0 32 -14.4004 32 -32v-384c0 -17.5996 -14.4004 -32 -32 -32h-384c-17.5996 0 -32 14.4004 -32 32v384c0 17.5996 14.4004 32 32 32h384zM352 158.6h-0.0996094v35c0 49.4004 -11.4004 82.5 -103.801 82.5h-17.2998
+c-30 0 -65.0996 -8.2998 -69.7002 -38.7998h-1.09961v74.7002h-64v-232h64v34.7998h0.900391c8 -23.8994 26.2998 -38.7998 70.3994 -38.7998h16.9004c92.3994 0 103.8 33.2002 103.8 82.5996zM288 187.5v-22.9004c0 -21.6992 -3.40039 -33.7998 -38.4004 -33.7998h-45.2998
+c-28.8994 0 -44.0996 6.5 -44.0996 35.7002v19c0 29.2998 15.2002 35.7002 44.0996 35.7002h45.2998c35 0.200195 38.4004 -12 38.4004 -33.7002z" />
+    <glyph glyph-name="bitcoin" unicode="&#xf379;" horiz-adv-x="512" 
+d="M504 192c0 -136.967 -111.033 -248 -248 -248s-248 111.033 -248 248s111.033 248 248 248s248 -111.033 248 -248zM362.349 227.33c4.9375 32.999 -20.1904 50.7393 -54.5498 62.5732l11.1465 44.7021l-27.2129 6.78027l-10.8516 -43.5234
+c-7.1543 1.78223 -14.502 3.46387 -21.8027 5.12988l10.9287 43.8096l-27.1982 6.78125l-11.1523 -44.6855c-5.92188 1.34863 -11.7354 2.68164 -17.377 4.08398l0.0302734 0.139648l-37.5293 9.37012l-7.23926 -29.0625s20.1914 -4.62695 19.7646 -4.91309
+c11.0225 -2.75098 13.0146 -10.0439 12.6807 -15.8242l-12.6963 -50.9258c0.759766 -0.193359 1.74414 -0.472656 2.8291 -0.90625c-0.907227 0.224609 -1.87598 0.472656 -2.87598 0.712891l-17.7959 -71.3379c-1.34961 -3.34863 -4.76758 -8.37012 -12.4717 -6.46484
+c0.271484 -0.394531 -19.7793 4.9375 -19.7793 4.9375l-13.5107 -31.1475l35.4141 -8.82617c6.58887 -1.65137 13.0449 -3.37988 19.4004 -5.00684l-11.2617 -45.2129l27.1816 -6.78027l11.1533 44.7324c7.14062 -1.93457 14.4863 -3.84082 21.6865 -5.62695
+l-11.1152 -44.5225l27.2139 -6.78125l11.2617 45.1279c46.4043 -8.78125 81.2988 -5.23926 95.9863 36.7266c11.8359 33.79 -0.589844 53.2812 -25.0049 65.9912c17.7803 4.09766 31.1748 15.792 34.7471 39.9492zM300.172 140.151
+c-8.41016 -33.79 -65.3076 -15.5234 -83.7549 -10.9434l14.9443 59.8994c18.4453 -4.60352 77.5996 -13.7178 68.8105 -48.9561zM308.589 227.818c-7.67285 -30.7363 -55.0312 -15.1201 -70.3926 -11.292l13.5479 54.3262
+c15.3633 -3.82715 64.8359 -10.9727 56.8447 -43.0342z" />
+    <glyph glyph-name="bity" unicode="&#xf37a;" horiz-adv-x="496" 
+d="M78.4004 380.8c95.3994 89.2002 246.1 91.2002 343.1 -3.7998c14.2998 -14.0996 -6.40039 -37.0996 -22.4004 -21.5c-84.7998 82.4004 -215.8 80.2998 -298.899 3.2002c-16.2998 -15.1006 -36.5 8.2998 -21.7998 22.0996zM177.3 -37.7998
+c-128.7 38.2998 -201.899 170.7 -169.8 298.1c5.2998 21 35.2002 12.5 30.2002 -7.09961c-28.2998 -111.3 35.2998 -227.101 147.5 -261c21.3994 -6.40039 11.3994 -35.7002 -7.90039 -30zM325.4 -35.7998c-19.2002 -6.2998 -30 22.7002 -8.80078 29.7002
+c106.101 35.5 167.4 145.699 143.2 253.399c-4.89941 21.7002 25.5 27.6006 30 7.90039c28.5 -124.101 -42.5 -250.8 -164.399 -291zM262.5 43.2002c0 -8.2002 -6.59961 -14.7998 -14.7998 -14.7998s-14.7998 6.59961 -14.7998 14.7998l0.199219 71.7998
+c0 8.09961 6.60059 14.7998 14.8008 14.7998c8.19922 0 14.7998 -6.59961 14.7998 -14.7998zM333.5 312.2c0 21.7998 32.5 19.5996 32.5 0v-71.6006c0 -69.2998 -60.7002 -90.8994 -118 -90.0996c-57.2998 -0.799805 -118 20.7998 -118 90.0996v71.6006
+c0 19.5996 32.5 21.7998 32.5 0c-1.40039 -88.2002 -7 -131.8 85.5 -132.5c90.2002 0.599609 87.5996 41.5996 85.5 132.5z" />
+    <glyph glyph-name="blackberry" unicode="&#xf37b;" horiz-adv-x="512" 
+d="M166 331.1c0 -23.3994 -16.4004 -49.0996 -72.5 -49.0996h-70.0996l21 88.7998h67.7998c42.0996 0 53.7998 -23.2998 53.7998 -39.7002zM292.2 370.8c42.0996 0 53.7998 -23.2998 53.7002 -39.7002c0 -23.3994 -16.3008 -49.0996 -70.1006 -49.0996h-70.0996
+l18.7002 88.7998h67.7998zM88.7998 239.9c42.1006 0 53.7998 -23.4004 53.7998 -39.7002c0 -25.7002 -16.3994 -49.1006 -72.5 -49.1006h-70.0996l21 88.8008h67.7998zM268.9 239.9c42 0 53.6992 -23.4004 53.6992 -39.7002c0 -25.7002 -16.2998 -49.1006 -70.0996 -49.1006
+h-70.0996l18.6992 88.8008h67.8008zM458.2 293.7c42.0996 0 53.7998 -23.4004 53.7002 -39.7002c0 -25.7002 -16.3008 -49.0996 -70.1006 -49.0996h-70.0996l18.7002 88.7998h67.7998zM430.2 155.8c42.0996 0 53.7002 -23.3994 53.7002 -39.7002
+c0 -25.6992 -14 -49.0996 -70.1006 -49.0996h-70.0996l18.7002 88.7998h67.7998zM240.8 102c42.1006 0 53.7998 -23.4004 53.7002 -39.7002c0 -23.3994 -14 -49.0996 -70.0996 -49.0996h-70.1006l18.7002 88.7998h67.7998z" />
+    <glyph glyph-name="blogger" unicode="&#xf37c;" 
+d="M162.4 252c4.7998 4.90039 6.19922 5.09961 36.3994 5.09961c27.2002 0 28.1006 -0.0996094 32.1006 -2.09961c5.7998 -2.90039 8.2998 -7 8.2998 -13.5996c0 -5.90039 -2.40039 -10 -7.60059 -13.4004c-2.7998 -1.7998 -4.5 -1.90039 -31.0996 -2.09961
+c-16.4004 -0.100586 -29.5 0.199219 -31.5 0.799805c-10.2998 2.89941 -14.0996 17.7002 -6.59961 25.2998zM223.8 157.5c55.4004 0 55.1006 0 60.4004 -4.7002c7.39941 -7 5.89941 -19.2998 -3.10059 -24.3994l-9.19922 -1.5l-47.9004 -0.600586
+c-42.2002 -0.5 -54.0996 0.200195 -56.2998 1.2002c-4.40039 1.90039 -8.5 7.2998 -9.2002 12c-0.599609 4.5 1.59961 10.7998 5.09961 13.9004c4.40039 3.89941 6.30078 4.09961 60.2002 4.09961zM447.2 27.4004c-3.5 -28.4004 -23 -50.4004 -51.1006 -57.5
+c-7.19922 -1.80078 -9.69922 -1.90039 -172.899 -1.80078c-157.8 0 -165.9 0.100586 -172 1.80078c-8.40039 2.19922 -15.6006 5.5 -22.2998 10c-5.60059 3.7998 -13.9004 11.7998 -17 16.3994c-3.80078 5.60059 -8.2002 15.2998 -10 22
+c-1.80078 6.7002 -1.90039 9.40039 -1.90039 173.4c0 163.1 0 166.6 1.7998 173.7c6.2998 24.6992 25.9004 43.5996 51.2002 49.1992c7.2998 1.60059 332.1 1.90039 340 0.300781c21.2002 -4.30078 37.9004 -17.1006 47.5996 -36.4004c7.7002 -15.2998 7 1.5 7.30078 -180.6
+c0.199219 -115.801 0 -164.5 -0.700195 -170.5zM361.8 212.6c-1.09961 5 -4.2002 9.60059 -7.7002 11.5c-1.09961 0.600586 -8 1.30078 -15.5 1.7002c-12.3994 0.600586 -13.7998 0.799805 -17.7998 3.10059c-6.2002 3.59961 -7.89941 7.59961 -8 18.2998
+c0 20.3994 -8.5 39.3994 -25.2998 56.5c-12 12.2002 -25.2998 20.5 -40.5996 25.0996c-3.60059 1.10059 -11.8008 1.5 -39.2002 1.7998c-42.9004 0.5 -52.5 -0.399414 -67.1006 -6.19922c-27 -10.7002 -46.2998 -33.4004 -53.3994 -62.4004
+c-1.2998 -5.40039 -1.60059 -14.2002 -1.90039 -64.2998c-0.399414 -62.7998 0 -72.1006 4 -84.5c9.7002 -30.7002 37.1006 -53.4004 64.6006 -58.4004c9.19922 -1.7002 122.199 -2.09961 133.699 -0.5c20.1006 2.7002 35.9004 10.7998 50.7002 25.9004
+c10.7002 10.8994 17.4004 22.7998 21.7998 38.5c3.2002 10.8994 2.90039 88.3994 1.7002 93.8994z" />
+    <glyph glyph-name="blogger-b" unicode="&#xf37d;" 
+d="M446.6 225.3c2 -8.89941 2.40039 -134.1 -2.5 -151.7c-7.09961 -25.2998 -17.8994 -44.3994 -35.1992 -62.0996c-23.9004 -24.4004 -49.4004 -37.5 -81.9004 -41.9004c-18.7002 -2.5 -201.2 -1.89941 -216 0.800781c-44.5 8 -88.7998 44.6992 -104.4 94.2998
+c-6.2998 20.0996 -7 35 -6.39941 136.5c0.5 81 1 95.0996 3.09961 103.899c11.4004 46.8008 42.6006 83.4004 86.1006 100.601c23.5996 9.39941 39 10.7998 108.399 10c44.2002 -0.5 57.4004 -1.10059 63.2998 -2.90039c24.6006 -7.5 46.2002 -20.7998 65.5 -40.5
+c27.1006 -27.5996 40.8008 -58.2998 40.9004 -91.2998c0.0996094 -17.2002 2.7998 -23.5996 12.9004 -29.5c6.39941 -3.7002 8.59961 -4.09961 28.6992 -5c12 -0.5 23.2002 -1.7002 25 -2.7002c5.7002 -3.09961 10.7002 -10.5 12.5 -18.5zM124.5 288.9
+c-12.2002 -12.3008 -6 -36.1006 10.5996 -40.8008c3.10059 -0.799805 24.3008 -1.39941 50.8008 -1.19922c43 0.199219 45.6992 0.399414 50.2998 3.2998c8.5 5.39941 12.2998 12.0996 12.2998 21.5996c0 10.6006 -4.09961 17.2002 -13.4004 21.9004
+c-6.39941 3.2998 -7.89941 3.39941 -51.7998 3.39941c-48.7998 0 -51 -0.299805 -58.7998 -8.19922zM316.3 89.0996c14.4004 8.2002 17 28.1006 4.90039 39.4004c-8.5 7.90039 -8 7.90039 -97.6006 7.7998c-87.0996 -0.0996094 -90.1992 -0.299805 -97.2998 -6.7002
+c-5.59961 -5.09961 -9.2998 -15.0996 -8.2002 -22.3994c1.10059 -7.7002 7.80078 -16.2998 14.9004 -19.4004c3.59961 -1.59961 22.7998 -2.7998 90.9004 -2l77.5 0.900391z" />
+    <glyph glyph-name="buromobelexperte" unicode="&#xf37f;" 
+d="M0 416h128v-128h-128v128zM120 296v112h-112v-112h112zM160 416h128v-128h-128v128zM280 296v112h-112v-112h112zM320 416h128v-128h-128v128zM440 296v112h-112v-112h112zM0 256h128v-128h-128v128zM120 136v112h-112v-112h112zM160 256h128v-128h-128v128zM280 136v112
+h-112v-112h112zM320 256h128v-128h-128v128zM440 136v112h-112v-112h112zM0 96h128v-128h-128v128zM120 -24v112h-112v-112h112zM160 96h128v-128h-128v128zM280 -24v112h-112v-112h112zM320 96h128v-128h-128v128z" />
+    <glyph glyph-name="centercode" unicode="&#xf380;" horiz-adv-x="512" 
+d="M329.2 179.4c-3.7998 -35.2002 -35.4004 -60.6006 -70.6006 -56.8008c-35.1992 3.80078 -60.5996 35.4004 -56.7998 70.6006s35.4004 60.5996 70.6006 56.7998c35.0996 -3.7998 60.5996 -35.4004 56.7998 -70.5996zM243.4 -55.7002
+c-146.7 7.7002 -251.601 138.2 -233.301 279.4c11.2002 86.5996 65.8008 156.899 139.101 192c161 77.0996 349.7 -37.4004 354.7 -216.601c4.09961 -147 -118.4 -262.199 -260.5 -254.8zM423.3 124.3c27.9004 118 -160.5 205.9 -237.2 234.2
+c-57.5 -56.2998 -69.0996 -188.6 -33.7998 -344.4c68.7998 -15.7998 169.101 26.4004 271 110.2z" />
+    <glyph glyph-name="cloudscale" unicode="&#xf383;" 
+d="M318.1 294c6.2002 6.2998 15.8008 -3.09961 9.5 -9.59961l-75.1992 -88.8008c0.899414 -8.19922 -1.80078 -16.7998 -8.10059 -23.0996c-11.0996 -11 -28.8994 -11 -40 0c-11.0996 11.0996 -11.0996 29 0 40c6.2998 6.2998 14.7998 9 23.1006 8.09961l25.1992 20.4004
+c-16.3994 15.2998 -38.3994 24.7002 -62.5996 24.7002c-50.7998 0 -94.5996 -41.4004 -92.5996 -97.4004c-1 6.2998 -1.40039 12.7998 -1.40039 19.4004c0 71.5 57.7998 132.3 129.4 132.3c31.7998 0 60.7998 -14.2998 83.2998 -33.5996zM234.3 182.5
+c5.60059 5.5 5.60059 14.5996 0 20.2002c-5.59961 5.59961 -14.5996 5.59961 -20.2002 0c-5.59961 -5.60059 -5.59961 -14.6006 0 -20.2002c5.60059 -5.5 14.6006 -5.5 20.2002 0zM224 416c123.5 0 224 -100.5 224 -224s-100.5 -224 -224 -224s-224 100.5 -224 224
+s100.5 224 224 224zM224 32c88.2002 0 160 71.7998 160 160s-71.7998 160 -160 160s-160 -71.7998 -160 -160s71.7998 -160 160 -160z" />
+    <glyph glyph-name="cloudsmith" unicode="&#xf384;" horiz-adv-x="332" 
+d="M332.5 28.0996c0 -46.3994 -37.5996 -84.0996 -84 -84.0996s-84 37.7002 -84 84.0996c0 46.4004 37.5996 84 84 84s84 -37.5996 84 -84zM248.5 272c-46.4004 0 -80 -33.5996 -80 -80s-37.5996 -80 -84 -80s-84 33.5996 -84 80s37.5996 88 84 88s76 29.5996 76 76
+s41.5996 84 88 84s80 -37.5996 80 -84s-33.5996 -84 -80 -84z" />
+    <glyph glyph-name="cloudversify" unicode="&#xf385;" horiz-adv-x="616" 
+d="M148.6 144v-0.0996094h-48.8994c-6.40039 0 -11.7002 5.39941 -11.7002 11.7998v40.3994c0 7.60059 7 11.9004 10.7998 11.9004h46.7998v-6.59961c0 -10.7002 8.80078 -16.7002 19.5 -16.7002h20.2002c10.7998 0 19.5 8.7998 19.5 19.5v20.3994
+c0 10.6006 -3.5 19.5 -15.2002 19.5c18.5 15.2002 37.2002 21.4004 45 24.1006c15 56.5 42 92.3994 99.3008 109.7c55.0996 16.5 153.5 3.09961 186.5 -85c73.8994 -22.6006 106.899 -92.6006 92.0996 -155.101c-13 -54.8994 -62.2998 -100.6 -131.5 -99.5
+c-49.5996 -51.3994 -135.2 -48.8994 -186.4 -5.59961c-78.5996 -4.2002 -137.8 42.7998 -146 111.3zM376 136c8.7002 -54.0996 59.7002 -65.5 91.7998 -59.2002c39.1006 7.7002 70.5 37.5 79.7002 76.5c5.7998 24.4004 2.40039 50 -9.40039 72l-10.5 19.6006
+c1.2002 -22.5 -12.5 -60.6006 -47.5 -76.9004c65.5 67.7002 2.10059 141.2 -67.6992 150.5c-49.8008 6.59961 -83.3008 -13 -114.2 -43.7002c48 -4.7002 87.7002 -26.7998 101.8 -74.7998c-30.0996 49.2998 -103 56.5996 -133.6 40.7998
+c-35.5 -18.2002 -60 -54 -57 -93.8994c3.59961 -47.4004 39.5 -67.4004 57.3994 -79.8008c-4.5 21.7002 -4 71.3008 29.2002 92.9004c-36.2998 -60 28.0996 -144.6 135.3 -110.8c-33.5996 14.3994 -66 40.5 -55.2998 86.7998zM128 240h-39.7998
+c-8.90039 0 -16.2002 7.2998 -16.2002 16.2002v39.5996c0 8.90039 7.2998 16.2002 16.2002 16.2002h39.7998c8.90039 0 16.2002 -7.2998 16.2002 -16.2002v-39.5996c0 -8.90039 -7.2998 -16.2002 -16.2002 -16.2002zM10.0996 280c-5.59961 0 -10.0996 4.5 -10.0996 10.0996
+v27.8008c0 5.59961 4.5 10.0996 10.0996 10.0996h27.7002c5.5 0 10.1006 -4.5 10.1006 -10.0996v-27.8008c0 -5.59961 -4.5 -10.0996 -10.1006 -10.0996h-27.7002zM168 305.3v21.4004c0 5.09961 4.2002 9.2998 9.2998 9.2998h21.4004
+c5.09961 0 9.2998 -4.2002 9.2998 -9.2998v-21.4004c0 -5.09961 -4.2002 -9.2998 -9.2998 -9.2998h-21.4004c-5.09961 0 -9.2998 4.2002 -9.2998 9.2998zM56 212.5v-25c0 -6.2998 -5.09961 -11.5 -11.4004 -11.5h-25.1992c-6.30078 0 -11.4004 5.2002 -11.4004 11.5v25
+c0 6.2998 5.09961 11.5 11.4004 11.5h25.0996c6.40039 0 11.5 -5.2002 11.5 -11.5z" />
+    <glyph glyph-name="cpanel" unicode="&#xf388;" horiz-adv-x="640" 
+d="M210.3 227.8c6.60059 -29.0996 -14.5 -65.2998 -51.7002 -65.2998h-32l6.40039 23.7998c1.7998 6.2002 7.2998 10.7998 14.2998 10.7998h10.2998c12.4004 0 20.8008 11.7002 18.3008 22.6006c-2.10059 9.2002 -9.90039 14.7998 -18.3008 14.7998h-19.7998
+l-25.7998 -95.7002c-1.90039 -6.2002 -7.40039 -10.7002 -14.2002 -10.7002l-24.7002 -0.0996094l34.9004 130.1c1.7998 6.40039 7.2002 10.9004 14.2998 10.9004h37c24.1006 0 45.4004 -16.4004 51 -41.2002zM53.7998 199.8c-24.8994 0 -24.7002 -37.3994 0 -37.3994
+h11.2998c4.2002 0 7.60059 -3.90039 6.40039 -8.30078l-7.09961 -26.0996h-12.4004c-33.5 0 -59 31.4004 -50.2998 65.2002c7.2998 27 28.2998 41.0996 51.2002 41.0996h40l-6.2002 -23.5996c-1.90039 -6.5 -7.40039 -10.9004 -14.2998 -10.9004h-18.6006zM301.3 234.6
+c18.7998 0 33.2998 -17.5996 28.5 -36.7998l-14 -51.7998c-2.7998 -10.5996 -12.2002 -17.7998 -23.3994 -17.7998l-57.5 0.200195c-42.9004 0 -38.5 63.7998 0.699219 63.7998h48.4004l-3.5 -13.2002c-1.90039 -6.2002 -7.40039 -10.7998 -14.2002 -10.7998h-21.5996
+c-5.2998 0 -5.2998 -7.90039 0 -7.90039h34.8994c4.60059 0 5.10059 3.90039 5.5 5.2998l8.60059 31.8008c0.299805 1 1.89941 5.2998 -2.10059 5.2998h-57.5c-9.69922 0 -16.5996 8.89941 -14.1992 18.5l3.5 13.3994h77.8994zM633.1 269c4.5 0 7.7002 -4 6.5 -8.2998
+l-26.5 -98.2002c-5.09961 -20.7002 -24.1992 -34.5 -44.8994 -34.5l35.5996 133.1c1.2002 4.7002 5.5 7.90039 10.4004 7.90039h18.8994zM396.8 234.3c34.4004 0 59.2998 -32.2998 50.2998 -65.3994l-8.7998 -33.1006c-1.2002 -4.89941 -5.7002 -7.7998 -10.2998 -7.7998
+h-19.0996c-4.5 0 -7.60059 4 -6.40039 8.2998l10.5996 40c3.30078 11.6006 -5.59961 23.4004 -18.0996 23.4004h-19.7998l-17.2002 -64c-1.2002 -4.7998 -5.59961 -7.7998 -10.4004 -7.7998h-18.8994c-4.2002 0 -7.60059 3.89941 -6.40039 8.2998l26.2002 98h48.2998
+v0.0996094zM495.1 159.7h73.3008l-5.7002 -21c-1.90039 -6.2002 -7.40039 -10.7002 -14.2002 -10.7002h-66.7002c-20 0 -33.2998 19 -28.2998 36.7002l10.7998 40c4.7998 17.5996 20.7002 29.5996 38.6006 29.5996h47.2998c19 0 33.2002 -17.7002 28.2998 -36.7998
+l-3.2002 -12c-2.89941 -11 -12.7002 -17.5996 -23.2002 -17.5996h-53.3994l3.5 13c1.59961 6.19922 7.2002 10.7998 14.2002 10.7998h21.5996c2 0 3.2998 1 3.90039 3l0.699219 2.59961c0.700195 2.7002 -1.2998 5.10059 -3.89941 5.10059h-32.9004
+c-4.09961 0 -6.89941 -2.10059 -7.7998 -6l-8 -30c-0.900391 -3.30078 1.5 -6.7002 5.09961 -6.7002z" />
+    <glyph glyph-name="css3-alt" unicode="&#xf38b;" horiz-adv-x="384" 
+d="M0 416h384l-34.9004 -395.8l-157.1 -52.2002l-157.1 52.2002zM313.1 336h-242.199l5.7998 -47.2998h122.899l-6.5 -2.7002l-112.1 -46.7002l3.59961 -46.2998l0.200195 0.0996094v-0.0996094l166.3 -0.5l-3.69922 -61.5996l-54.7002 -15.4004l-52.6006 13.2998
+l-3.19922 38.2998h-48.9004l6.40039 -73.8994l98.7998 -29.2002l98.2002 28.7002l12.7998 146.6h-111.5l0.299805 0.100586l115.3 49.2998z" />
+    <glyph glyph-name="cuttlefish" unicode="&#xf38c;" horiz-adv-x="440" 
+d="M344 142.5c13.7002 -50.9004 41.7002 -93.2998 87 -117.8c-45.2998 -49.6006 -110.5 -80.7002 -183 -80.7002c-137 0 -248 111 -248 248s111 248 248 248c72.5 0 137.7 -31.0996 183 -80.7002c-45.2998 -24.5 -73.2998 -66.8994 -87 -117.8
+c-17.5 31.5996 -57.4004 54.5 -96 54.5c-56.5996 0 -104 -47.4004 -104 -104s47.4004 -104 104 -104c38.5996 0 78.5 22.9004 96 54.5z" />
+    <glyph glyph-name="d-and-d" unicode="&#xf38d;" horiz-adv-x="576" 
+d="M82.5 349.1c-0.599609 17.2002 2 33.8008 12.7002 48.2002c0.299805 -7.39941 1.2002 -14.5 4.2002 -21.5996c5.89941 27.5 19.6992 49.2998 42.2998 65.5c-1.90039 -5.90039 -3.5 -11.7998 -3 -17.7002c8.7002 7.40039 18.7998 17.7998 44.3994 22.7002
+c14.7002 2.7998 29.7002 2 42.1006 -1c38.5 -9.2998 61 -34.2998 69.7002 -72.2998c5.2998 -23.1006 0.699219 -45 -8.30078 -66.4004c-5.19922 -12.4004 -12 -24.4004 -20.6992 -35.0996c-2 1.89941 -3.90039 3.7998 -5.80078 5.59961
+c-42.7998 40.7998 -26.7998 25.2002 -37.3994 37.4004c-1.10059 1.19922 -1 2.19922 -0.100586 3.59961c8.30078 13.5 11.8008 28.2002 10 44c-1.09961 9.7998 -4.2998 18.9004 -11.2998 26.2002c-14.5 15.2998 -39.2002 15 -53.5 -0.600586
+c-11.3994 -12.5 -14.0996 -27.3994 -10.8994 -43.5996c0.199219 -1.2998 0.399414 -2.7002 0 -3.90039c-3.40039 -13.6992 -4.60059 -27.5996 -2.5 -41.5996c0.0996094 -0.5 0.0996094 -1.09961 0.0996094 -1.59961c0 -0.300781 -0.0996094 -0.5 -0.200195 -1.10059
+c-21.7998 11 -36 28.2998 -43.2002 52.2002c-8.2998 -17.7998 -11.0996 -35.5 -6.59961 -54.0996c-15.5996 15.1992 -21.2998 34.2998 -22 55.1992zM552.1 225.9c0.5 -0.600586 1.2002 -1 1.7002 -1.40039v-0.5c-15 3.59961 -29.7998 1.7998 -44.5 -1.2998
+c-9.2998 -2 -18.2998 -4.7002 -26.7002 -9c-2.89941 -1.5 -5.69922 -3.2998 -8 -4.7002c-5.7998 2.40039 -11.2998 5.5 -17.1992 6.7998c-24.5 5.2998 -45.8008 -1.2002 -62.5 -20c-19.7002 -22.2002 -34.5 -47.5996 -46.7002 -74.5l-1.2002 -2.7002
+c-0.0996094 -0.199219 -0.200195 -0.299805 -0.400391 -0.399414c-12.0996 8.2998 -21.5996 20.2998 -36.0996 25.5996c0.299805 0.400391 0.400391 0.900391 0.700195 1.2998c20.5996 28.2002 44.8994 52.5 75.0996 70.4004c16 9.5 33 16.0996 51.5 18.5
+c1.7998 0.200195 3.5 0.400391 5.2998 1.09961c-4.39941 0 -8.7998 0.300781 -13.0996 -0.0996094c-21.2002 -1.90039 -40.5 -9.59961 -58.7002 -20.2002c-13.7998 -8 -26.2002 -17.7002 -36.5996 -29.7998c-0.400391 -0.5 -0.600586 -1.09961 -0.900391 -1.7002
+c-0.299805 0.299805 -0.700195 0.600586 -1 0.900391c11 30.8994 30.7002 55 57.7002 73.2998c0.200195 -0.200195 0.5 -0.299805 0.700195 -0.5c-1.2002 -1.7002 -2.5 -3.2998 -3.5 -5.09961c-1.7998 -3.30078 -3.7002 -6.5 -5.10059 -10
+c-1.7998 -4.30078 1.60059 -8.60059 12 -0.5c18.2002 14.0996 29.6006 26.2998 48.9004 29.5996c0.700195 0.0996094 1.2998 0.299805 1.90039 0.299805h2.5c-1 -0.700195 -1.60059 -1.09961 -2.2002 -1.5c-11.6006 -7.7998 -11.7998 -7.39941 -15 -12
+c-2.60059 -3.7002 -0.200195 -8 4.7002 -6.7998c2.59961 0.599609 5.19922 1.2998 7.69922 2.2002c9.40039 3.2998 19 5.7998 29 6.39941c13.9004 0.800781 27.1006 -1.89941 39.9004 -7.09961c15.0996 -6.2002 28.5 -15 40.0996 -26.5996zM316.7 50.4004
+c1.5 -1.30078 1.89941 -2.40039 0.899414 -4.2002c-25.2998 -50.2002 -61.0996 -89.1006 -116 -98.7998c-26.7998 -4.7002 -52.8994 -2.7002 -77.8994 8.59961c-18.5 8.2002 -34.6006 19.5996 -47.2002 35.5996c-2 2.60059 -3.7002 5.40039 -5.90039 8.60059
+c-0.699219 -7.7998 0.100586 -14.9004 1.5 -21.9004c-0.199219 -0.200195 -0.399414 -0.299805 -0.599609 -0.5c-3.2002 3.40039 -6.59961 6.60059 -9.5 10.2998c-12.2002 15.5 -19.5 33.3008 -24.0996 52.3008c-11.8008 48.2998 -0.5 78.7998 7.7998 101.1
+c-8.7002 -4.7998 -16.2002 -10.2998 -23.6006 -16.2002c11.6006 32.7998 31.9004 59.9004 56.1006 84.6006c2.39941 -2.10059 3.2998 -4.7002 3 -7.40039c-0.200195 -1 -5.90039 -38.9004 -5.60059 -44.7002c18.9004 18.9004 40.5 33.2998 64.8008 43.9004
+c-7.5 -11.1006 -11 -23.4004 -11.8008 -37.2998c13.4004 12.1992 27.7002 20.0996 46.4004 13.8994c-8.5 -9.09961 -30.7998 -30.5 -38.5996 -64.2998c-5.10059 -21.9004 -3.80078 -43.0996 8.19922 -62.5996c11.2002 -18.3008 27.8008 -27.8008 49.4004 -27.8008
+c12.5996 0 23.7998 5 34.0996 11.8008c18.5 12.2998 32.8008 28.5 44 47.5996c1.90039 3.2002 1.10059 2.09961 1.90039 3c19.9004 -16.0996 3.2998 -2.59961 42.7002 -35.5996zM488.7 96.7998c20.2002 -6.59961 35.5 -18.7998 43.7998 -38.8994
+c9.2002 -23.1006 2.09961 -49.4004 -17.4004 -66c-16.3994 -14 -35.6992 -19.2002 -57 -17.4004c-0.599609 0 -1.19922 0 -1.89941 -0.299805c15.0996 -10.7002 31.5996 -15.2002 50.8994 -10.6006c-2.19922 -2.39941 -3.89941 -4.69922 -5.89941 -6.5
+c-12.2998 -10.8994 -26.9004 -16.8994 -42.9004 -19.7998c-39.5996 -7.2998 -75.5996 12.7998 -85 56.9004c-0.5 2.09961 -0.599609 4.2002 -0.899414 6.39941c-10.8008 -8.19922 -16.4004 -34.0996 -0.700195 -52.2998c-1.60059 0.5 -2.60059 0.700195 -3.60059 1.10059
+c-21.2998 8.2998 -34.3994 28.2998 -33.5 51.1992c0.900391 23.2002 4.90039 41 -13 56c-16.5 13.8008 -33 27.4004 -49.5 41.1006c-8.09961 6.7002 -14.7998 14.5 -17 25.0996c-1 4.60059 -1.39941 9.40039 -1.7998 14.1006c-0.5 6.09961 -3.2998 11 -7.89941 14.7998
+c-4.5 3.89941 -9.30078 7.39941 -13.8008 11.2002c-8.89941 7.5 -12.2998 18.8994 -7.2998 29.8994c2.7998 -12.8994 9.60059 -18.8994 22.6006 -20.2998c4.39941 -0.5 8.89941 -0.799805 13.2998 -1.5c8.09961 -1.2002 12.7998 -6.09961 14.2998 -14.2002
+c0.700195 -3.39941 1.2998 -6.7998 2.2002 -10.2002c1.59961 -5.59961 4.5 -8 10.3994 -8.39941c4.60059 -0.299805 9.30078 -0.5 13.9004 -0.900391c7.59961 -0.599609 14.2002 -3.7998 20.0996 -8.7002c19.4004 -16.1992 39 -32.1992 58.5 -48.2998
+c5.7002 -4.7002 12 -8.2002 19.6006 -8.5c16.7002 -0.599609 29 15.2002 24.7998 31.7998c-0.200195 0.700195 -0.400391 1.5 -0.0996094 2.80078c2.39941 -2 4.89941 -3.80078 7 -5.90039c14.0996 -14 18.0996 -39.2998 8.69922 -56.0996
+c-2.09961 -3.80078 -5.2998 -7.10059 -8.09961 -10.8008c0.700195 -0.199219 1.7998 -0.5 3 -0.599609c14 -1.40039 27.2002 1 38.9004 9.09961c15.7998 10.9004 18 31.2002 5.39941 45.6006c-4.7002 5.39941 -8.89941 8 -18.7998 12
+c6.5 1.2998 19.2002 0.200195 28.7002 -2.90039zM99.4004 268.7c-5.30078 9.2002 -13.2002 15.5996 -22.1006 21.2998c13.7002 0.5 26.6006 -0.200195 39.6006 -3.7002c-7 12.2002 -8.5 24.7002 -5 38.7002c5.2998 -11.9004 13.6992 -20.0996 23.5996 -26.7998
+c19.7002 -13.2002 35.7002 -19.6006 46.7002 -30.2002c3.39941 -3.2998 6.2998 -7.09961 9.59961 -10.9004c-0.799805 2.10059 -1.39941 4.10059 -2.2002 6c-5 10.6006 -13 18.6006 -22.5996 25c-1.7998 1.2002 -2.7998 2.5 -3.40039 4.5
+c-3.2998 12.5 -3 25.1006 -0.699219 37.6006c1 5.5 2.7998 10.8994 4.5 16.2998c0.799805 2.40039 2.2998 4.59961 4 6.59961c0.599609 -6.89941 0 -25.5 19.5996 -46c10.7998 -11.2998 22.4004 -21.8994 33.9004 -32.6992c9 -8.5 18.2998 -16.7002 25.5 -26.8008
+c1.09961 -1.59961 2.19922 -3.2998 3.7998 -4.69922c-5 13 -14.2002 24.0996 -24.2002 33.7998c-9.59961 9.2998 -19.4004 18.3994 -29.2002 27.3994c-3.2998 3 -4.59961 6.7002 -5.09961 10.9004c-1.2002 10.4004 0 20.5996 4.2998 30.2002c0.5 1 1.09961 2 1.90039 3.2998
+c0.5 -4.2002 0.599609 -7.90039 1.39941 -11.5996c4.7998 -23.1006 20.4004 -36.3008 49.2998 -63.5c10 -9.40039 19.3008 -19.2002 25.6006 -31.6006c4.7998 -9.2998 7.2998 -19 5.7002 -29.5996c-0.100586 -0.600586 0.5 -1.7002 1.09961 -2
+c6.2002 -2.60059 10 -6.90039 9.7002 -14.2998c7.7002 2.59961 12.5 8 16.3994 14.5c4.2002 -20.2002 -9.09961 -50.3008 -27.1992 -58.7002c0.399414 4.5 5 23.3994 -16.5 27.7002c-6.80078 1.2998 -12.8008 1.2998 -22.9004 2.09961c4.7002 9 10.4004 20.5996 0.5 22.4004
+c-24.9004 4.59961 -52.7998 -1.90039 -57.7998 -4.60059c8.2002 -0.399414 16.2998 -1 23.5 -3.2998c-2 -6.5 -4 -12.7002 -5.7998 -18.9004c-1.90039 -6.5 2.09961 -14.5996 9.2998 -9.59961c1.2002 0.900391 2.2998 1.90039 3.2998 2.7002
+c-3.09961 -17.9004 -2.90039 -15.9004 -2.7998 -18.2998c0.299805 -10.2002 9.5 -7.80078 15.7002 -7.30078c-2.5 -11.7998 -29.5 -27.2998 -45.4004 -25.7998c7 4.7002 12.7002 10.2998 15.9004 17.9004c-6.5 -0.799805 -12.9004 -1.60059 -19.2002 -2.40039
+l-0.299805 0.900391c4.69922 3.39941 8 7.7998 10.1992 13.0996c8.7002 21.1006 -3.59961 38 -25 39.9004c-9.09961 0.799805 -17.7998 -0.799805 -25.8994 -5.5c6.2002 15.5996 17.2002 26.5996 32.5996 34.5c-15.2002 4.2998 -8.89941 2.7002 -24.5996 6.2998
+c14.5996 9.2998 30.2002 13.2002 46.5 14.5996c-5.2002 3.2002 -48.1006 3.60059 -70.2002 -20.8994c7.90039 -1.40039 15.5 -2.7998 23.2002 -4.2002c-23.7998 -7 -44 -19.7002 -62.4004 -35.5996c1.10059 4.7998 2.7002 9.5 3.2998 14.2998
+c0.600586 4.5 0.800781 9.2002 0.100586 13.5996c-1.5 9.40039 -8.90039 15.1006 -19.7002 16.2998c-7.90039 0.900391 -15.5996 -0.0996094 -23.2998 -1.2998c-0.900391 -0.0996094 -1.7002 -0.299805 -2.90039 0c15.7998 14.7998 36 21.7002 53.1006 33.5
+c6 4.5 6.7998 8.2002 3 14.9004zM227.8 241.9c3.2998 -16 12.6006 -25.5 23.7998 -24.3008c-4.59961 11.3008 -12.0996 19.5 -23.7998 24.3008z" />
+    <glyph glyph-name="deploydog" unicode="&#xf38e;" horiz-adv-x="512" 
+d="M382.2 312h51.7002v-239.6h-51.7002v20.6992c-19.7998 -24.7998 -52.7998 -24.0996 -73.7998 -14.6992c-26.2002 11.6992 -44.3008 38.0996 -44.3008 71.7998c0 29.7998 14.8008 57.8994 43.3008 70.7998c20.1992 9.09961 52.6992 10.5996 74.7998 -12.9004v103.9z
+M317.5 150.2c0 -18.2002 13.5996 -33.5 33.2002 -33.5c19.7998 0 33.2002 16.3994 33.2002 32.8994c0 17.1006 -13.7002 33.2002 -33.2002 33.2002c-19.6006 0 -33.2002 -16.3994 -33.2002 -32.5996zM188.5 312h51.7002v-239.6h-51.7002v20.6992
+c-19.7998 -24.7998 -52.7998 -24.0996 -73.7998 -14.6992c-26.2002 11.6992 -44.2998 38.0996 -44.2998 71.7998c0 29.7998 14.7998 57.8994 43.2998 70.7998c20.2002 9.09961 52.7002 10.5996 74.7998 -12.9004v103.9zM123.8 150.2c0 -18.2002 13.6006 -33.5 33.2002 -33.5
+c19.7998 0 33.2002 16.3994 33.2002 32.8994c0 17.1006 -13.7002 33.2002 -33.2002 33.2002c-19.7002 0 -33.2002 -16.3994 -33.2002 -32.5996zM448 352h-384c-17.5996 0 -32 -14.5 -32 -32v-256c0 -17.5996 14.5 -32 32 -32h384c17.5996 0 32 14.5 32 32v256
+c0 17.5996 -14.5 32 -32 32zM448 384c35.2002 0 64 -28.7998 64 -64v-256c0 -35.2002 -28.7998 -64 -64 -64h-384c-35.2002 0 -64 28.7998 -64 64v256c0 35.2002 28.7998 64 64 64h384z" />
+    <glyph glyph-name="deskpro" unicode="&#xf38f;" horiz-adv-x="480" 
+d="M205.9 -64l31.0996 38.4004c12.2998 0.199219 25.5996 1.39941 36.5 6.59961c38.9004 18.5996 38.4004 61.9004 38.2998 63.7998c-0.0996094 5 -0.799805 4.40039 -28.8994 37.4004h79.0996c-0.200195 -50.1006 -7.2998 -68.5 -10.2002 -75.7002
+c-9.39941 -23.7002 -43.8994 -62.7998 -95.2002 -69.4004c-8.69922 -1.09961 -32.7998 -1.19922 -50.6992 -1.09961zM406.3 103.7l-119.2 -0.100586l17.4004 31.3008l175.5 -0.300781c-15.2002 -17.2998 -35.0996 -30.8994 -73.7002 -30.8994zM362.7 327.6v-168.3h-73.5
+l-32.7002 -55.5h-6.5c-52.2998 0 -58.0996 56.5 -58.2998 58.9004c-1.2002 13.2002 -21.2998 11.5996 -20.1006 -1.7998c1.40039 -15.8008 8.80078 -40 26.4004 -57.1006h-91c-25.5 0 -110.8 26.7998 -107 114v213.3c0 16 9.7002 16.6006 15 16.8008h82
+c0.200195 0 0.299805 -0.100586 0.5 -0.100586c4.2998 0.400391 50.0996 2.10059 50.0996 -43.7002c0 -13.2998 20.2002 -13.3994 20.2002 0c0 18.2002 -5.5 32.8008 -15.7998 43.7002h84.2002c108.7 0.400391 126.5 -79.3994 126.5 -120.2zM230.2 271.6l64 -29.2998
+c13.2998 45.5 -42.2002 71.7002 -64 29.2998z" />
+    <glyph glyph-name="digital-ocean" unicode="&#xf391;" horiz-adv-x="512" 
+d="M87 -33.7998v73.5996h73.7002v-73.5996h-73.7002zM25.4004 101.4h61.5996v-61.6006h-61.5996v61.6006zM491.6 271.1c53.2002 -170.3 -73 -327.1 -235.6 -327.1v95.7998h0.299805v0.299805c101.7 0.200195 180.5 101 141.4 208
+c-14.2998 39.6006 -46.1006 71.4004 -85.7998 85.7002c-107.101 38.7998 -208.101 -39.8994 -208.101 -141.7h-95.7998c0 162.2 156.9 288.7 327 235.601c74.2002 -23.2998 133.6 -82.4004 156.6 -156.601zM256.3 40.0996h-0.299805v-0.299805h-95.2998v95.6006h95.5996
+v-95.3008z" />
+    <glyph glyph-name="discord" unicode="&#xf392;" 
+d="M297.216 204.8c0 -15.6162 -11.5195 -28.416 -26.1123 -28.416c-14.3359 0 -26.1113 12.7998 -26.1113 28.416s11.5195 28.416 26.1113 28.416c14.5928 0 26.1123 -12.7998 26.1123 -28.416zM177.664 233.216c14.5918 0 26.3682 -12.7998 26.1123 -28.416
+c0 -15.6162 -11.5205 -28.416 -26.1123 -28.416c-14.3359 0 -26.1123 12.7998 -26.1123 28.416s11.5205 28.416 26.1123 28.416zM448 395.264v-459.264c-64.4941 56.9941 -43.8682 38.1279 -118.784 107.776l13.5684 -47.3604h-290.304
+c-28.9287 0 -52.4805 23.5518 -52.4805 52.7363v346.111c0 29.1846 23.5518 52.7363 52.4805 52.7363h343.039c28.9287 0 52.4805 -23.5518 52.4805 -52.7363zM375.04 152.576c0 82.4316 -36.8643 149.248 -36.8643 149.248
+c-36.8643 27.6475 -71.9355 26.8799 -71.9355 26.8799l-3.58398 -4.0957c43.5195 -13.3125 63.7441 -32.5127 63.7441 -32.5127c-60.8115 33.3291 -132.244 33.335 -191.232 7.42383c-9.47168 -4.35156 -15.1035 -7.42383 -15.1035 -7.42383
+s21.2471 20.2246 67.3271 33.5361l-2.55957 3.07227s-35.0723 0.767578 -71.9355 -26.8799c0 0 -36.8643 -66.8164 -36.8643 -149.248c0 0 21.5039 -37.1201 78.0801 -38.9121c0 0 9.47168 11.5195 17.1514 21.248c-32.5117 9.72754 -44.7998 30.208 -44.7998 30.208
+c3.7666 -2.63574 9.97656 -6.05273 10.4961 -6.40039c43.21 -24.1973 104.588 -32.126 159.744 -8.95996c8.95996 3.32812 18.9443 8.19238 29.4395 15.1045c0 0 -12.7998 -20.9922 -46.3359 -30.4639c7.68066 -9.72852 16.8965 -20.7363 16.8965 -20.7363
+c56.5762 1.79199 78.3359 38.9121 78.3359 38.9121z" />
+    <glyph glyph-name="discourse" unicode="&#xf393;" 
+d="M225.9 416c122.699 0 222.1 -102.3 222.1 -223.9c0 -121.6 -99.4004 -223.899 -222.1 -223.899l-225.801 -0.200195s-0.0996094 224 -0.0996094 227.9c0 121.6 103.3 220.1 225.9 220.1zM224 64c70.7002 0 128 57.2998 128 128s-57.2998 128 -128 128
+s-128 -57.2998 -128 -128c0 -22.0996 5.59961 -42.9004 15.4004 -61l-22.9004 -75l81.0996 20.0996c16.5 -7.7998 35 -12.0996 54.4004 -12.0996z" />
+    <glyph glyph-name="dochub" unicode="&#xf394;" horiz-adv-x="416" 
+d="M397.9 288h-141.9v140.4zM304 256h96v-126.1c0 -129.301 -70.2998 -193.9 -210.8 -193.9h-189.2v512h189.2c12.2002 0 23.7002 -1.09961 34.5996 -3.2998v-84c-10 1.7002 -21.0996 2.5 -33.0996 2.5h-94.7002v-337.3h94.7002c76.7998 0 113.3 33.2998 113.3 100.1v130z
+" />
+    <glyph glyph-name="docker" unicode="&#xf395;" horiz-adv-x="640" 
+d="M349.9 211.7h-66.1006v59.3994h66.1006v-59.3994zM349.9 416v-60.7002h-66.1006v60.7002h66.1006zM428.1 271.2v-59.4004h-66.0996v59.4004h66.0996zM271.8 343.3v-60.0996h-66.0996v60.0996h66.0996zM349.9 343.3v-60.0996h-66.1006v60.0996h66.1006zM626.7 243.3
+l13.2998 -8.89941c-1.90039 -3.90039 -7 -14.6006 -8.5 -17.1006c-23.7002 -45.2998 -69.9004 -45.5996 -91.2998 -45.2002c-54.5 -131.699 -171 -204.199 -328.4 -204.199c-72.7002 0 -128.3 22.2998 -165.399 66.1992c-38.2002 45.3008 -52.7002 111.301 -44 162.101
+h434.699c22.6006 -0.400391 39.7002 6 48.4004 10.7002c-19.7002 30.1992 -14.7002 76 3.7002 103.8l9.2998 14l14 -9.2998c24.4004 -18.8008 37.7998 -39.7002 41.0996 -63.7002c25.5 4.7998 58.7002 1.2998 73.1006 -8.40039zM115.6 271.2h0.100586v-59.4004h-66.1006
+v59.4004h66zM193.7 271.2v-59.4004h-66.1006v59.4004h66.1006zM271.8 271.2v-59.4004h-66.0996v59.4004h66.0996zM193.7 343.3v-60.0996h-66.1006v60.0996h66.1006z" />
+    <glyph glyph-name="draft2digital" unicode="&#xf396;" horiz-adv-x="480" 
+d="M480 49.9004l-144 -81.9004v64.2002l-336 -0.100586c18.2998 19.1006 84.5 87.8008 161.1 174.801c32.6006 37.1992 78 83.2998 69.7002 127.6c-5.2998 28.2998 -42.2002 50.7998 -83.2998 33.5c-8.59961 -3.59961 -24.5 -17.4004 -26.2998 -24.7002
+c28.2998 -4.7002 48 -29.7002 48 -56.7998c0 -31.7002 -25.6006 -57.4004 -57.2998 -57.4004c-37.3008 0 -62.2002 34.1006 -56.7002 67.1006c1.2002 7.89941 5.09961 26.7998 18.2002 47.7002c14.8994 23.8994 45.1992 54.8994 104.3 67.2998
+c103.8 21.7002 161.6 -36.6006 166 -41.2002c28.8994 -29.9004 48 -90.7002 12.7998 -153.3c-30 -53.4004 -81 -114.3 -111.8 -149.3h91.2998v64.6992zM369.9 77v-54.4004l47.0996 27.2002zM134.2 286.6c0 12.3008 -10 22.4004 -22.4004 22.4004
+c-12.3994 0 -22.3994 -10 -22.3994 -22.4004c0 -12.3994 10 -22.3994 22.3994 -22.3994c12.4004 0 22.4004 10 22.4004 22.3994zM82.5 67.5h114.4c17.5996 19.2002 91.5 100.8 128.5 166.7c36.5996 65.0996 -5.80078 113.3 -5.80078 113.3
+c-14.1992 14.9004 -36.8994 36.2002 -82.1992 38.2998c6.7998 -5.5 16.8994 -16.8994 24.2998 -35.7002c11.8994 -30.2998 6.7002 -69.5996 -28.4004 -112.699c-53.0996 -65.2002 -125.2 -142.5 -150.8 -169.9z" />
+    <glyph glyph-name="dribbble-square" unicode="&#xf397;" 
+d="M90.2002 219.8c8.89941 42.4004 37.3994 77.7002 75.7002 95.7002c3.59961 -4.90039 28 -38.7998 50.6992 -79c-64 -17 -120.3 -16.7998 -126.399 -16.7002zM314.6 294c-2.5 -3.5 -23 -31.0996 -71.5996 -49.4004c-22.4004 41.1006 -47.2002 74.9004 -51 80
+c43.2998 10.5 89 -0.799805 122.6 -30.5996zM140.1 84c14.3008 29.2002 53 66.7998 108.101 85.5996c19.2002 -49.7998 27.2002 -91.5996 29.2002 -103.6c-44 -18.7002 -96.8008 -13.5996 -137.301 18zM238.9 192.2c-49.4004 -13.9004 -94.3008 -53.9004 -116.5 -91.7998
+c-21.8008 24.2998 -35.1006 56.2998 -35.1006 91.3994c0 1.40039 0.100586 2.7998 0.100586 4.2002c6 -0.200195 72.1992 -1 140.399 19.4004c3.90039 -7.7002 7.7002 -15.4004 11.1006 -23.2002zM273.8 175.9c42.7998 6.89941 80.5 -4.30078 85.1006 -5.80078
+c-6.10059 -38 -27.9004 -70.8994 -58.6006 -91.5996c-1.39941 8.2998 -8.59961 48.2998 -26.5 97.4004zM253.5 224.3c50.5 20.7002 73.4004 50 76.2998 53.9004c19.1006 -23.2002 30.6006 -52.7998 30.9004 -85.1006c-4.5 1 -49.7002 10.1006 -95.2002 4.40039
+c-3.7002 9 -7.2002 17 -12 26.7998zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48zM384 192c0 88.2002 -71.7998 160 -160 160s-160 -71.7998 -160 -160s71.7998 -160 160 -160
+s160 71.7998 160 160z" />
+    <glyph glyph-name="dyalog" unicode="&#xf399;" horiz-adv-x="416" 
+d="M0 416h171.2c74.5 0 137.7 -24 182.5 -69.5996c40.2002 -40.9004 62.2998 -95.6006 62.2998 -154.301c0 -111.399 -84.0996 -224.1 -244.8 -224.1h-171.2v64h171.2c122.2 0 180.8 84 180.8 160.1c0 79.7002 -67.4004 159.9 -180.8 159.9h-107.2v-55.2002h-64v119.2z" />
+    <glyph glyph-name="earlybirds" unicode="&#xf39a;" horiz-adv-x="480" 
+d="M313.2 400.5c1.2002 13 21.2998 14 36.5996 8.7002c0.900391 -0.299805 26.2002 -9.7002 19 -15.2002c-27.8994 7.40039 -56.3994 -18.2002 -55.5996 6.5zM112.2 393.6c-7.7998 6.2002 19.8994 16.4004 20.8994 16.7002c16.8008 5.7002 38.9004 4.60059 40.2002 -9.59961
+c0.900391 -27.1006 -30.3994 1 -61.0996 -7.10059zM319.4 288c8.7998 0 16 -7.2002 16 -16s-7.2002 -16 -16 -16c-8.80078 0 -16 7.2002 -16 16s7.19922 16 16 16zM159.7 288c8.7998 0 16 -7.2002 16 -16s-7.2002 -16 -16 -16s-16 7.2002 -16 16s7.2002 16 16 16z
+M478.2 124.8c-9.90039 -24 -40.7002 -11 -63.9004 1.2002c-13.5 -69.0996 -58.0996 -111.4 -126.3 -124.2c0.299805 -0.899414 -2 0.100586 24 -1c33.5996 -1.39941 63.7998 3.10059 97.4004 8c-19.8008 13.7998 -11.4004 37.1006 -9.80078 38.1006
+c1.40039 0.899414 14.7002 -1.7002 21.6006 -11.5c8.59961 12.5 28.3994 14.7998 30.2002 13.5996c1.59961 -1.09961 6.59961 -20.9004 -6.90039 -34.5996c4.7002 0.899414 8.2002 1.59961 9.7998 2.09961c2.60059 0.799805 17.7002 -11.2998 3.10059 -13.2998
+c-14.3008 -2.2998 -22.6006 -5.10059 -47.1006 -10.7998c-45.8994 -10.7002 -85.8994 -11.8008 -117.7 -12.8008l1 -11.5996c3.80078 -18.0996 -23.3994 -24.2998 -27.5996 -6.2002c0.799805 -17.8994 -27.0996 -21.7998 -28.4004 1l-0.5 -5.2998
+c-0.699219 -18.4004 -28.3994 -17.9004 -28.2998 0.599609c-7.5 -13.5 -28.0996 -6.7998 -26.3994 8.5l1.19922 12.4004c-36.6992 -0.900391 -59.6992 -3.09961 -61.7998 -3.09961c-20.8994 0 -20.8994 31.5996 0 31.5996c2.40039 0 27.7002 -1.2998 63.2002 -2.7998
+c-61.0996 15.5 -103.7 55 -114.9 118.2c-25 -12.8008 -57.5 -26.8008 -68.1992 -0.800781c-10.5 25.4004 21.5 42.6006 66.7998 73.4004c0.700195 6.59961 1.59961 13.2998 2.7002 19.7998c-14.4004 19.6006 -11.6006 36.2998 -16.1006 60.4004
+c-16.7998 -2.40039 -23.2002 9.09961 -23.5996 23.0996c0.299805 7.2998 2.09961 14.9004 2.39941 15.4004c1.10059 1.7998 10.1006 2 12.7002 2.59961c6 31.7002 50.6006 33.2002 90.9004 34.5c19.7002 21.7998 45.2002 41.5 80.8994 48.2998
+c-15.2998 19.4004 -3.39941 39.9004 -2.39941 40.4004c1.7002 0.799805 21.2002 -4.2998 26.2998 -23.2002c5.2002 8.7998 18.2998 11.4004 19.5996 10.7002c1.10059 -0.599609 6.40039 -15 -4.89941 -25.9004c40.2998 -3.5 72.2002 -24.6992 96 -50.6992
+c36.0996 -1.5 71.7998 -5.90039 77.0996 -34c2.7002 -0.600586 11.6006 -0.800781 12.7002 -2.60059c0.299805 -0.5 2.09961 -8.09961 2.40039 -15.3994c-0.5 -13.9004 -6.80078 -25.4004 -23.6006 -23.1006c-3.2002 -17.2998 -2.7002 -32.8994 -8.7002 -47.7002
+c2.40039 -11.6992 4 -23.7998 4.80078 -36.3994c37 -25.4004 70.2998 -42.5 60.2998 -66.9004zM207.4 288.1c0.899414 44 -37.9004 42.2002 -78.6006 40.3008c-21.7002 -1 -38.8994 -1.90039 -45.5 -13.9004c-11.3994 -20.9004 5.90039 -92.9004 23.2002 -101.2
+c9.7998 -4.7002 73.4004 -7.89941 86.2998 7.10059c8.2002 9.39941 15 49.3994 14.6006 67.6992zM259.4 229.8c-4.30078 12.4004 -6 30.1006 -15.3008 32.7002c-2 0.5 -9 0.5 -11 0c-10 -2.7998 -10.7998 -22.0996 -17 -37.2002c15.4004 0 19.3008 -9.7002 23.7002 -9.7002
+c4.2998 0 6.2998 11.3008 19.6006 14.2002zM395.1 314.5c-6.59961 12.0996 -24.7998 12.9004 -46.5 13.9004c-40.1992 1.89941 -78.1992 3.7998 -77.2998 -40.3008c-0.5 -18.2998 5 -58.2998 13.2002 -67.7998c13 -14.8994 76.5996 -11.7998 86.2998 -7.09961
+c15.7998 7.59961 36.5 78.8994 24.2998 101.3z" />
+    <glyph glyph-name="erlang" unicode="&#xf39d;" horiz-adv-x="640" 
+d="M87.2002 394.5c-41.5 -50.2002 -65.6006 -116.2 -65.5 -192.9c-0.100586 -86.7998 29 -159.5 78.7002 -212.1h-100.4v405h87.2002zM325.4 384.8c46.1992 -0.0996094 79.5996 -33.5 80.6992 -83.2002h-169.899c4.09961 49.7002 43.2998 83.1006 89.2002 83.2002z
+M556.1 394.4h0.300781l-0.100586 0.0996094zM556.4 394.4h83.5996v-405h-80.7998c21.3994 23 40.5 49.8994 57.8994 80.7998l-96.3994 48.2002c-33.9004 -55.1006 -83.4004 -105.801 -151.9 -106.101c-99.7002 0.400391 -138.8 85.6006 -138.6 195.3h372.399
+c0.5 12.4004 0.5 18.1006 0 24.1006c2.5 65.2002 -14.7998 120 -46.1992 162.7z" />
+    <glyph glyph-name="facebook-f" unicode="&#xf39e;" horiz-adv-x="320" 
+d="M279.14 160h-74.6895v-224h-100.17v224h-81.3906v92.6602h81.3906v70.6201c0 80.3398 47.8594 124.72 121.08 124.72c35.0693 0 71.75 -6.25977 71.75 -6.25977v-78.8906h-40.4199c-39.8203 0 -52.2402 -24.71 -52.2402 -50.0596v-60.1299h88.9102z" />
+    <glyph glyph-name="facebook-messenger" unicode="&#xf39f;" horiz-adv-x="512" 
+d="M256.55 440c140.04 0 247.45 -102.34 247.45 -240.57c0 -175.13 -166.15 -273.229 -319.44 -231.04c-8.96973 2.44043 -9.64941 0.600586 -62.5596 -22.6992c-2.4375 -1.06445 -5.14355 -1.6543 -7.97168 -1.6543c-10.7617 0 -19.541 8.55176 -19.9082 19.2236
+c-1.41992 46.3701 0.299805 50.7207 -8.0498 58.2305c-48.3604 43.1602 -78.0703 105.64 -78.0703 177.939c0 138.23 108.52 240.57 248.55 240.57zM405.79 254.87c7.0498 11.0801 -6.65039 23.5996 -17.0898 15.6201l-78.4102 -59.3799
+c-2.50586 -1.87988 -5.64258 -2.99316 -9.0127 -2.99316s-6.48145 1.11328 -8.9873 2.99316l-58.0596 43.46c-6.23047 4.65234 -13.9668 7.46582 -22.333 7.46582c-13.2803 0 -24.9512 -6.94434 -31.5771 -17.3965l-73 -115.569
+c-7.05078 -11.0703 6.64941 -23.6006 17.1094 -15.6699l78.3701 59.4395c2.50586 1.87891 5.64258 2.99316 9.0127 2.99316s6.48242 -1.11426 8.9873 -2.99316l58.0801 -43.4697c6.23047 -4.65039 13.9658 -7.46191 22.3301 -7.46191
+c13.2803 0 24.9512 6.94141 31.5801 17.3916z" />
+    <glyph glyph-name="firstdraft" unicode="&#xf3a1;" horiz-adv-x="384" 
+d="M384 256h-64v-128h-128v-128h-192v25.5996h166.4v128h128v128h89.5996v-25.5996zM358.4 217.6h25.5996v-153.6h-128v-128h-192v25.5996h166.4v128h128v128zM384 25.5996v-25.5996h-64v-64h-25.5996v89.5996h89.5996zM0 448h384v-128h-128v-128h-128v-128h-128v384z" />
+    <glyph glyph-name="fonticons-fi" unicode="&#xf3a2;" horiz-adv-x="384" 
+d="M114.4 224h92.3994l-15.2002 -51.2002h-76.3994v-157.8c0 -8 -2.7998 -9.2002 4.39941 -10l59.6006 -5.59961v-34.4004h-179.2v35.2002l29.2002 2.7998c7.2002 0.799805 9.2002 3.2002 9.2002 10.7998v155.8c0 3.2002 -4 3.2002 -8 3.2002h-30.4004v51.2002h38.4004
+v28.7998c0 68 36.3994 96 106 96c46.7998 0 88.7998 -11.2002 88.7998 -72.3994l-69.6006 -8.40039c0.400391 25.5996 -6 31.5996 -22.3994 31.5996c-25.2002 0 -26 -13.5996 -26 -37.5996v-32c0 -3.2002 -4.7998 -6 -0.799805 -6zM384 -35h-140.8v34.4004l28 3.59961
+c7.2002 0.799805 10.3994 2.40039 10.3994 10v148c0 5.59961 -4 9.2002 -9.19922 10.7998l-33.2002 8.7998l9.2002 40.4004h110v-208c0 -8 -3.60059 -8.7998 4 -10l21.5996 -3.59961v-34.4004zM354 312.2l12.4004 -45.6006l-10 -10l-42.8008 22.8008l-42.7998 -22.8008
+l-10 10l12.4004 45.6006l-30 36.3994l4.7998 10h38l21.2002 38.4004h12.7998l21.2002 -38.4004h38l4.7998 -13.1992z" />
+    <glyph glyph-name="fort-awesome-alt" unicode="&#xf3a3;" horiz-adv-x="512" 
+d="M208 210.6c2.09961 0 3.7002 -1.59961 3.7002 -3.69922v-51.7002c0 -2.10059 -1.60059 -3.7002 -3.7002 -3.7002h-22.2002c-2.09961 0 -3.7002 1.59961 -3.7002 3.7002v51.7002c0 2.09961 1.60059 3.69922 3.7002 3.69922h22.2002zM326.2 210.6
+c2 0 3.59961 -1.59961 3.7002 -3.69922v-51.7002c0 -2.10059 -1.60059 -3.7002 -3.7002 -3.7002h-22.2002c-2.09961 0 -3.7002 1.59961 -3.7002 3.7002v51.7002c0 2.09961 1.60059 3.69922 3.7002 3.69922h22.2002zM458.2 335.7
+c28.8994 -40.7002 45.7998 -90.2002 45.7998 -143.7c0 -2 0 -4 -0.0996094 -6c0 -0.700195 0 -1.2998 -0.100586 -2c0 -1.2998 -0.0996094 -2.7002 -0.200195 -4c0 -0.799805 -0.0996094 -1.5 -0.0996094 -2.2998
+c-0.0996094 -1.2002 -0.0996094 -2.40039 -0.200195 -0.700195c-0.0996094 -0.799805 -0.0996094 -1.59961 -0.200195 -2.40039c-0.0996094 -1.19922 -0.199219 -2.39941 -0.299805 -3.5c-0.0996094 -0.799805 -0.200195 -1.59961 -0.200195 -2.39941
+c-0.0996094 -1.2002 -0.299805 -2.40039 -0.399414 -3.60059c-0.100586 -0.799805 -0.200195 -1.5 -0.299805 -2.2998c-0.200195 -1.2998 -0.400391 -2.59961 -0.5 -3.89941c-0.100586 -0.600586 -0.200195 -1.30078 -0.300781 -1.90039l-0.899414 -5.7002
+c-0.100586 -0.599609 -0.200195 -1.09961 -0.299805 -1.7002c-0.200195 -1.2998 -0.5 -2.69922 -0.800781 -4c-0.199219 -0.799805 -0.299805 -1.59961 -0.5 -2.39941c-0.199219 -1.10059 -0.5 -2.2002 -0.699219 -3.2002
+c-0.200195 -0.900391 -0.400391 -1.7002 -0.600586 -2.59961c-0.200195 -1 -0.5 -2 -0.700195 -3c-0.199219 -0.900391 -0.5 -1.80078 -0.699219 -2.7002c-0.300781 -1 -0.5 -1.90039 -0.800781 -2.90039c-0.199219 -0.899414 -0.5 -1.7998 -0.799805 -2.7002
+c-0.299805 -0.899414 -0.599609 -1.89941 -0.799805 -2.7998c-0.299805 -0.899414 -0.5 -1.7998 -0.799805 -2.7002c-0.299805 -0.899414 -0.600586 -1.7998 -0.900391 -2.7998c-0.5 -1.59961 -1.09961 -3.2998 -1.7002 -4.89941
+c-0.299805 -0.900391 -0.599609 -1.80078 -1 -2.80078c-0.399414 -1 -0.699219 -2 -1.09961 -3c-0.299805 -0.799805 -0.599609 -1.5 -0.900391 -2.2998l-1.19922 -3c-0.300781 -0.700195 -0.600586 -1.5 -0.900391 -2.2002c-0.400391 -1 -0.799805 -2 -1.2998 -3
+l-0.900391 -2.09961c-0.399414 -1 -0.899414 -2 -1.39941 -3c-0.300781 -0.700195 -0.600586 -1.2998 -0.900391 -2c-0.5 -1 -1 -2.09961 -1.5 -3.09961c-0.299805 -0.600586 -0.599609 -1.10059 -0.799805 -1.7002c-0.600586 -1.10059 -1.10059 -2.2002 -1.7002 -3.2998
+c-0.0996094 -0.200195 -0.200195 -0.300781 -0.299805 -0.5c-2.2002 -4.10059 -4.40039 -8.2002 -6.7998 -12.2002c-0.200195 -0.400391 -0.5 -0.799805 -0.700195 -1.2002c-0.700195 -1.09961 -1.2998 -2.2002 -2 -3.2998
+c-0.299805 -0.5 -0.600586 -0.900391 -0.900391 -1.40039c-0.700195 -1.09961 -1.39941 -2.09961 -2 -3.2002c-0.299805 -0.5 -0.599609 -0.899414 -0.899414 -1.39941c-0.700195 -1.10059 -1.40039 -2.10059 -2.10059 -3.2002
+c-0.299805 -0.400391 -0.599609 -0.799805 -0.799805 -1.2002c-0.799805 -1.09961 -1.5 -2.2002 -2.2998 -3.2998c-0.200195 -0.200195 -0.299805 -0.5 -0.5 -0.700195c-37.6006 -54.7002 -94.5 -91.3994 -160.101 -102.399
+c-0.899414 -0.100586 -1.69922 -0.300781 -2.59961 -0.400391c-1 -0.200195 -2.09961 -0.299805 -3.09961 -0.5c-0.900391 -0.0996094 -1.80078 -0.299805 -2.80078 -0.400391c-1 -0.0996094 -2 -0.299805 -3 -0.399414c-1 -0.100586 -2 -0.200195 -2.89941 -0.299805
+c-1 -0.100586 -1.90039 -0.200195 -2.90039 -0.300781c-1 -0.0996094 -2.09961 -0.199219 -3.09961 -0.299805c-0.900391 -0.0996094 -1.7998 -0.200195 -2.7002 -0.200195c-1.09961 -0.0996094 -2.2998 -0.0996094 -3.40039 -0.199219
+c-0.799805 0 -1.69922 -0.100586 -2.5 -0.100586c-1.2998 -0.0996094 -2.59961 -0.0996094 -3.89941 -0.0996094c-0.700195 0 -1.40039 -0.100586 -2.10059 -0.100586c-2 0 -4 -0.0996094 -6 -0.0996094s-4 0 -6 0.0996094c-0.699219 0 -1.39941 0 -2.09961 0.100586
+c-1.2998 0 -2.59961 0.0996094 -3.90039 0.0996094c-0.799805 0 -1.69922 0.100586 -2.5 0.100586c-1.09961 0.0996094 -2.2998 0.0996094 -3.39941 0.199219c-0.900391 0.100586 -1.7998 0.100586 -2.7002 0.200195c-1 0.100586 -2.09961 0.200195 -3.09961 0.299805
+c-1 0.100586 -1.90039 0.200195 -2.90039 0.300781c-1 0.0996094 -2 0.199219 -2.90039 0.299805c-1 0.0996094 -2 0.200195 -3 0.399414c-0.899414 0.100586 -1.7998 0.300781 -2.7998 0.400391s-2.09961 0.299805 -3.09961 0.5
+c-0.900391 0.0996094 -1.7002 0.299805 -2.60059 0.400391c-65.5996 10.8994 -122.5 47.6992 -160 99.3994c-0.199219 0.200195 -0.299805 0.5 -0.5 0.700195c-0.799805 1.09961 -1.59961 2.2002 -2.2998 3.2998c-0.299805 0.400391 -0.599609 0.799805 -0.799805 1.2002
+c-0.700195 1.09961 -1.40039 2.09961 -2.09961 3.2002c-0.300781 0.5 -0.600586 0.899414 -0.900391 1.39941c-0.700195 1.10059 -1.40039 2.10059 -2 3.2002c-0.299805 0.5 -0.599609 0.900391 -0.900391 1.40039c-0.699219 1.09961 -1.2998 2.2002 -2 3.2998
+c-0.199219 0.400391 -0.5 0.799805 -0.699219 1.2002c-2.40039 4 -4.60059 8.09961 -6.80078 12.2002c-0.0996094 0.199219 -0.199219 0.299805 -0.299805 0.5c-0.599609 1.09961 -1.09961 2.19922 -1.7002 3.2998c-0.299805 0.599609 -0.599609 1.09961 -0.799805 1.7002
+c-0.5 1 -1 2.09961 -1.5 3.09961c-0.299805 0.700195 -0.599609 1.2998 -0.899414 2c-0.5 1 -0.900391 2 -1.40039 3l-0.900391 2.09961c-0.399414 1 -0.899414 2 -1.2998 3c-0.299805 0.700195 -0.599609 1.5 -0.899414 2.2002l-1.2002 3
+c-0.299805 0.799805 -0.600586 1.5 -0.900391 2.2998c-0.399414 1 -0.799805 2 -1.09961 3c-0.299805 0.900391 -0.600586 1.80078 -1 2.80078c-0.600586 1.59961 -1.10059 3.2998 -1.7002 4.89941c-0.299805 0.900391 -0.599609 1.7998 -0.900391 2.7998
+c-0.299805 0.900391 -0.5 1.80078 -0.799805 2.7002c-0.299805 0.900391 -0.599609 1.90039 -0.799805 2.7998c-0.299805 0.900391 -0.5 1.80078 -0.799805 2.7002c-0.299805 1 -0.5 1.90039 -0.799805 2.90039c-0.200195 0.899414 -0.5 1.7998 -0.700195 2.7002
+c-0.299805 1 -0.5 2 -0.700195 3c-0.200195 0.899414 -0.400391 1.69922 -0.599609 2.59961c-0.200195 1.09961 -0.5 2.2002 -0.700195 3.2002c-0.200195 0.799805 -0.299805 1.59961 -0.5 2.39941c-0.299805 1.30078 -0.5 2.7002 -0.799805 4
+c-0.100586 0.600586 -0.200195 1.10059 -0.300781 1.7002l-0.899414 5.7002c-0.100586 0.599609 -0.200195 1.2998 -0.299805 1.90039c-0.200195 1.2998 -0.400391 2.59961 -0.5 3.89941c-0.100586 0.799805 -0.200195 1.5 -0.300781 2.2998
+c-0.0996094 1.2002 -0.299805 2.40039 -0.399414 3.60059c-0.100586 0.799805 -0.200195 1.59961 -0.200195 2.39941c-0.0996094 1.2002 -0.200195 2.40039 -0.299805 3.5c-0.100586 0.800781 -0.100586 1.60059 -0.200195 2.40039
+c-0.0996094 1.2002 -0.200195 2.40039 -0.200195 3.7002c0 0.799805 -0.0996094 1.5 -0.0996094 2.2998c-0.100586 1.2998 -0.100586 2.7002 -0.200195 4c0 0.700195 0 1.2998 -0.0996094 2c0 2 -0.100586 4 -0.100586 6c0 53.5 16.9004 103 45.7998 143.6
+c2.30078 3.2002 4.7002 6.40039 7.10059 9.5c4.89941 6.2002 10.0996 12.3008 15.5996 18c2.7002 2.90039 5.5 5.7002 8.40039 8.40039c2.89941 2.7002 5.7998 5.40039 8.7998 8c4.5 3.90039 9.09961 7.59961 13.9004 11.2002c1.59961 1.2002 3.19922 2.39941 4.7998 3.5
+c27.2998 19.5996 59 33.7002 93.2998 40.7998c16.0996 3.2998 32.9004 5 50 5s33.7998 -1.7002 50 -5c34.2998 -7 66 -21.0996 93.5996 -40.7002c1.60059 -1.2002 3.2002 -2.2998 4.80078 -3.5c4.7998 -3.59961 9.39941 -7.2998 13.8994 -11.2002
+c12 -10.3994 23 -21.8994 32.7998 -34.3994c2.5 -3.10059 4.80078 -6.2998 7.10059 -9.5zM448 76.5v71.2998c0 2.10059 -1.59961 3.7002 -3.7002 3.7002h-22.2002c-2.09961 0 -3.69922 -1.59961 -3.69922 -3.7002v-25.7998h-29.5v144
+c0 2.09961 -1.60059 3.7002 -3.7002 3.7002h-22.1006c-2.09961 0 -3.69922 -1.60059 -3.69922 -3.7002v-25.9004h-29.5v25.9004c0 2.09961 -1.60059 3.7002 -3.7002 3.7002h-22.2002c-2.09961 0 -3.7002 -1.60059 -3.7002 -3.7002v-25.9004h-29.5v25.9004
+c0 4.7998 -6.5 3.7002 -9.5 3.7002v30.7002c6.7002 1.59961 13.7998 2.7998 20.7998 2.7998c8.80078 0 16.8008 -3.5 25.4004 -3.5c3.7002 0 22.4004 0.899414 22.4004 6.5v48.3994c0 2.10059 -1.60059 3.7002 -3.7002 3.7002c-4.2002 0 -12.2002 -3.5 -19.4004 -3.5
+c-7.89941 0 -16.8994 3.5 -26.2998 3.5c-6.5 0 -12.9004 -0.899414 -19.2002 -2.2998v3.90039c4.40039 2.09961 7.40039 6.69922 7.40039 11.5c0 16.7998 -25.4004 16.7998 -25.4004 0c0 -4.80078 3 -9.5 7.40039 -11.5v-90.2002c-3 0 -9.5 1.09961 -9.5 -3.7002v-25.9004
+h-29.5v25.9004c0 2.09961 -1.60059 3.7002 -3.7002 3.7002h-22.2002c-2.09961 0 -3.7002 -1.60059 -3.7002 -3.7002v-25.9004h-29.5v25.9004c0 2.09961 -1.59961 3.7002 -3.69922 3.7002h-22.1006c-2.09961 0 -3.7002 -1.60059 -3.7002 -3.7002v-144h-29.5996v25.7998
+c0 2.10059 -1.59961 3.7002 -3.7002 3.7002h-22.0996c-2.10059 0 -3.7002 -1.59961 -3.7002 -3.7002v-71.2998c9.40039 -15.5 20.5996 -29.9004 33.5996 -42.9004c20.6006 -20.5996 44.5 -36.6992 71.2002 -48c13.9004 -5.89941 28.2002 -10.2998 42.9004 -13.1992v75.7998
+c0 58.5996 88.5996 58.5996 88.5996 0v-75.7998c14.7002 2.89941 29 7.39941 42.9004 13.1992c26.7002 11.3008 50.5996 27.4004 71.2002 48c13 13 24.1992 27.4004 33.5996 42.9004z" />
+    <glyph glyph-name="freebsd" unicode="&#xf3a4;" 
+d="M303.7 351.8c11.0996 11.1006 115.5 77 139.2 53.2002c23.6992 -23.7002 -42.1006 -128.1 -53.2002 -139.2c-11.1006 -11.0996 -39.4004 -0.899414 -63.1006 22.9004c-23.7998 23.7002 -34.0996 52 -22.8994 63.0996zM109.9 379.9
+c-31.6006 -19.4004 -57.9004 -46.5 -76.4004 -78.7002c-20.7998 36.2998 -44.5 89.0996 -27.9004 105.7c16.4004 16.5 68 -6.40039 104.301 -27zM406.7 274c3.2998 5.5 7 11.7998 10.8994 18.7998c17.6006 -31.2998 27.7002 -67.3994 27.7002 -105.8
+c0 -119.1 -96.5 -215.6 -215.6 -215.6c-119.101 0 -215.601 96.5996 -215.601 215.6c0 119.1 96.5 215.6 215.601 215.6c35.8994 0 69.7002 -8.7998 99.5 -24.2998c-7.2998 -4 -13.9004 -8 -19.6006 -11.5996c-26 4.7002 -32.8994 -16.4004 -14.8994 -48.7002
+c21.7998 -43.0996 89 -90.4004 109.3 -70.0996c5.40039 5.39941 6 14.7998 2.7002 26.0996z" />
+    <glyph glyph-name="gitkraken" unicode="&#xf3a6;" horiz-adv-x="592" 
+d="M565.7 329.9c11.7998 -31.6006 18.2998 -65.7002 18.2998 -101.4c0 -155.1 -122.6 -281.6 -276.3 -287.7v145.8c-8.40039 -0.5 -16.6006 -0.399414 -23.4004 0v-145.899c-153.7 6.2002 -276.3 132.7 -276.3 287.8c0 35.7002 6.5 69.7998 18.2998 101.3
+c2.2998 6.2002 9.2998 9.2002 15.2998 6.60059c5.7002 -2.40039 8.5 -8.80078 6.30078 -14.6006c-10.9004 -29 -16.9004 -60.5 -16.9004 -93.2998c0 -134.6 100.4 -245.7 230.2 -262.7v123.7c-7.90039 1.59961 -15.4004 3.7002 -23 6.2002v-104
+c-106.7 26 -185.9 122.1 -185.9 236.8c0 91.7998 50.7998 171.8 125.8 213.3c5.80078 3.2002 13 0.900391 15.9004 -5c2.7002 -5.5 0.700195 -12.0996 -4.7002 -15.0996c-67.8994 -37.7002 -113.899 -110.101 -113.899 -193.2c0 -93.4004 57.8994 -173.2 139.8 -205.4
+v92.2002c-14.2002 4.5 -24.7998 17.7002 -24.7998 33.5c0 13.1006 6.69922 24.4004 17.2998 30.5c-8.2002 79.6006 -44.5 58.6006 -44.5 83.9004v14.7998c0 38 87.8994 161.7 129.1 164.7c2.60059 0.200195 5.10059 0.200195 7.60059 0
+c41.0996 -2.90039 129 -126.7 129 -164.7v-14.7002c0 -25.2998 -36.2002 -4.39941 -44.5 -83.8994c10.5 -6.10059 17.2998 -17.4004 17.2998 -30.5c0 -15.8008 -10.7002 -29 -24.9004 -33.5v-92.2002c81.9004 32.2998 139.8 112.1 139.8 205.399
+c0 83.2002 -46 155.601 -113.899 193.2c-5.2998 2.90039 -7.40039 9.60059 -4.7002 15.1006c2.90039 5.89941 10.2002 8.19922 15.9004 5c75 -41.5 125.8 -121.5 125.8 -213.301c0 -114.699 -79.2002 -210.899 -185.9 -236.8v104
+c-7.5 -2.59961 -15.0996 -4.7002 -23 -6.2002v-123.699c129.9 17 230.2 128.1 230.2 262.699c0 32.8008 -6 64.3008 -16.9004 93.3008c-2.19922 5.69922 0.600586 12.1992 6.30078 14.5996c6 2.59961 13 -0.5 15.2998 -6.59961zM365.9 172.5
+c-13.1006 0 -23.7002 -10.5996 -23.7002 -23.7002c0 -13.2002 10.7002 -23.7002 23.7002 -23.7002c13.0996 0 23.6992 10.6006 23.6992 23.7002c0 13.2002 -10.6992 23.7002 -23.6992 23.7002zM226.1 125.2c13.2002 0 23.7002 10.7002 23.7002 23.7002
+c0 13.0996 -10.5996 23.6992 -23.7002 23.6992c-13.1992 0 -23.6992 -10.6992 -23.6992 -23.6992s10.5 -23.7002 23.6992 -23.7002z" />
+    <glyph glyph-name="gofore" unicode="&#xf3a7;" horiz-adv-x="400" 
+d="M324 128.2c54.2998 0 65.7002 -50.1006 67.7002 -77.7002c-46.5 -56.2998 -107.8 -82.5 -171 -82.5c-123.7 0 -220.7 101.5 -220.7 224c0 123.4 98 224 220.7 224c59 0 114.3 -23.2998 156.1 -65.5996l-62.2998 -63.3008c-25 25.4004 -58.2998 39.4004 -93.5996 39.4004
+c-73.2002 0 -132.4 -60.2998 -132.4 -134.4c0 -74.1992 59.2002 -134.399 132.4 -134.399c33.5996 0 65.3994 12.7002 89.8994 35.7998v34.7002h13.2002zM311.9 240.7c47.6992 0 88.0996 -35 88.0996 -100.2v-30.5996c-15.5 26.6992 -42.5 41.7998 -76 41.7998h-118.4v89
+h106.301z" />
+    <glyph glyph-name="goodreads" unicode="&#xf3a8;" 
+d="M299.9 256.8c5.09961 -37.2998 -4.7002 -79 -35.9004 -100.7c-22.2998 -15.5 -52.7998 -14.0996 -70.7998 -5.69922c-37.1006 17.2998 -49.5 58.5996 -46.7998 97.1992c4.2998 60.9004 40.8994 87.9004 75.2998 87.5c46.8994 0.200195 71.7998 -31.7998 78.2002 -78.2998
+zM448 360v-336c0 -30.9004 -25.0996 -56 -56 -56h-336c-30.9004 0 -56 25.0996 -56 56v336c0 30.9004 25.0996 56 56 56h336c30.9004 0 56 -25.0996 56 -56zM330 134.8c0 0 -0.0996094 34 -0.0996094 217.3h-29v-40.2998c-0.800781 -0.299805 -1.2002 0.5 -1.60059 1.2002
+c-9.59961 20.7002 -35.8994 46.2998 -76 46c-51.8994 -0.400391 -87.2002 -31.2002 -100.6 -77.7998c-4.2998 -14.9004 -5.7998 -30.1006 -5.5 -45.6006c1.7002 -77.8994 45.0996 -117.8 112.399 -115.199c28.9004 1.09961 54.5 17 69 45.1992
+c0.5 1 1.10059 1.90039 1.7002 2.90039c0.200195 -0.0996094 0.400391 -0.0996094 0.600586 -0.200195c0.299805 -3.7998 0.199219 -30.7002 0.0996094 -34.5c-0.200195 -14.7998 -2 -29.5 -7.2002 -43.5c-7.7998 -21 -22.2998 -34.7002 -44.5 -39.5
+c-17.7998 -3.89941 -35.5996 -3.7998 -53.2002 1.2002c-21.5 6.09961 -36.5 19 -41.0996 41.7998c-0.299805 1.60059 -1.2998 1.2998 -2.2998 1.2998h-26.7998c0.799805 -10.5996 3.19922 -20.2998 8.5 -29.1992c24.1992 -40.5 82.6992 -48.5 128.199 -37.4004
+c49.9004 12.2998 67.3008 54.9004 67.4004 106.3z" />
+    <glyph glyph-name="goodreads-g" unicode="&#xf3a9;" horiz-adv-x="384" 
+d="M42.5996 44.7002h2.80078c12.6992 0 25.5 0 38.1992 -0.100586c1.60059 0 3.10059 0.400391 3.60059 -2.09961c7.09961 -34.9004 30 -54.5996 62.8994 -63.9004c26.9004 -7.59961 54.1006 -7.7998 81.3008 -1.7998c33.7998 7.40039 56 28.2998 68 60.4004
+c8 21.5 10.6992 43.7998 11 66.5c0.0996094 5.7998 0.299805 47 -0.200195 52.7998l-0.900391 0.299805c-0.799805 -1.5 -1.7002 -2.89941 -2.5 -4.39941c-22.0996 -43.1006 -61.2998 -67.4004 -105.399 -69.1006c-103 -4 -169.4 57 -172 176.2
+c-0.5 23.7002 1.7998 46.9004 8.2998 69.7002c20.5996 71.0996 74.5996 118.2 153.899 118.8c61.3008 0.400391 101.5 -38.7002 116.2 -70.2998c0.5 -1.10059 1.2998 -2.2998 2.40039 -1.90039v61.6006h44.2998c0 -280.301 0.0996094 -332.2 0.0996094 -332.2
+c-0.0996094 -78.5 -26.6992 -143.7 -103 -162.2c-69.5 -16.9004 -159 -4.7998 -196 57.2002c-8 13.5 -11.7998 28.2998 -13 44.5zM188.9 411.5c-52.5 0.5 -108.5 -40.7002 -115 -133.8c-4.10059 -59 14.7998 -122.2 71.5 -148.601
+c27.5996 -12.8994 74.2998 -15 108.3 8.7002c47.5996 33.2002 62.7002 97 54.7998 154c-9.7002 71.1006 -47.7998 120 -119.6 119.7z" />
+    <glyph glyph-name="google-drive" unicode="&#xf3aa;" horiz-adv-x="512" 
+d="M339 133.1l-163.6 282.9h161.199l163.601 -282.9h-161.2zM201.5 109.5h310.5l-80.5996 -141.5h-310.5zM154.1 380.6l82.9004 -141.399l-156.4 -271.2l-80.5996 141.5z" />
+    <glyph glyph-name="google-play" unicode="&#xf3ab;" horiz-adv-x="512" 
+d="M325.3 213.7l-220.7 221.3l280.801 -161.2zM47 448l256.6 -255.9l-256.6 -256c-13 6.80078 -21.7002 19.2002 -21.7002 35.3008v441.3c0 16.0996 8.7002 28.5 21.7002 35.2998zM472.2 222.4c19.2002 -14.3008 19.2002 -46.5 1.2002 -60.8008l-60.1006 -34.0996
+l-65.7002 64.5l65.7002 64.5zM104.6 -51l220.7 221.3l60.1006 -60.0996z" />
+    <glyph glyph-name="gripfire" unicode="&#xf3ac;" horiz-adv-x="384" 
+d="M112.5 146.6c0 -26.8994 16.5996 -47.1992 32.5996 -69.5c22.5 -30.1992 44.2002 -56.8994 44.2002 -86.5c-0.0996094 -14.5 -4.39941 -29.6992 -17.5 -46.3994c0 5.2998 4.7998 12.2002 4.7998 22.2998c0 15.2002 -13 39.9004 -78.0996 86.5996
+c-34.2998 29.1006 -66.5 58.5 -66.5 108.301c0 114.699 147.1 176.5 147.1 268.6c0 3.2998 -0.199219 6.7002 -0.599609 10c5.09961 -2.40039 39.0996 -43.2998 39.0996 -90.4004c0 -80.5 -105.1 -129.199 -105.1 -203zM317.8 185.6
+c1.5 -8.39941 2.2002 -16.5996 2.2002 -24.5996c0 -51.7998 -29.4004 -97.5 -67.2998 -136.8c-1 -1 -2.2002 -2.40039 -3.2002 -2.40039c-3.59961 0 -35.5 41.6006 -35.5 53.2002c0 0 41.7998 55.7002 41.7998 96.9004c0 10.7998 -2.7002 21.6992 -9.09961 33.3994
+c-1.5 -32.2998 -55.7002 -87.7002 -58.1006 -87.7002c-2.69922 0 -17.8994 22 -17.8994 42.1006c0 5.2998 1 10.7002 3.2002 15.7998c2.39941 5.5 56.5996 72 56.5996 116.7c0 6.2002 -1 12 -3.40039 17.0996l-4 7.2002c16.7002 -6.5 82.6006 -64.0996 94.7002 -130.9z" />
+    <glyph glyph-name="grunt" unicode="&#xf3ad;" horiz-adv-x="384" 
+d="M61.2998 258.7c0.5 4.89941 2.7998 10 7 12h0.100586c-4.60059 1.7002 -9.2002 3.09961 -13.5 4.09961c42.1992 10.2002 73.3994 -20.5996 83.0996 -31.7998c16.5996 -19.2002 35.5 -8.7998 35.5 -8.7998c0.299805 -11.1006 -10.2998 -19 -21.0996 -19.5
+c1.19922 -15.4004 -13.9004 -32.5 -13.9004 -32.5s5.59961 15 2.7002 25.2998c-0.900391 3.2002 -2 6.09961 -3 8.5c-19.2998 -17.2002 -48 -1.5 -54.9004 6.09961c-9.59961 10.6006 -12.3994 23.8008 -12.7998 34.1006c-1.7998 -3.7998 -3.2998 -9.10059 -4 -16.6006
+c0 0 -6.2998 9.10059 -5.2002 19.1006zM89.5996 260.5c-2.89941 -9.09961 -3.39941 -27.7002 6.90039 -35.2998c16.2998 -12.1006 32.2998 -5 38 -1.7002c-7.5 11.2998 -25.4004 26 -44.9004 37zM231.7 214.7c-10.7998 0.399414 -21.4004 8.39941 -21.2002 19.2998
+c0 0 18.7998 -10.4004 35.5 8.7998c9.7002 11.2002 40.7998 42 83.0996 31.7998c-4.2998 -0.899414 -8.89941 -2.2998 -13.5 -4.09961h0.100586c4.09961 -1.7998 6.39941 -6.7998 7 -11.7998c1.2002 -10 -5.2002 -19.1006 -5.2002 -19.1006
+c-0.599609 7.5 -2.2002 12.8008 -4 16.6006c-0.5 -10.2998 -3.2002 -23.5 -12.7998 -34.1006c-6.7998 -7.59961 -35.5 -23.3994 -54.7998 -6.09961c-1 -2.5 -2.10059 -5.2998 -3 -8.5c-2.90039 -10.2998 2.69922 -25.2998 2.69922 -25.2998s-15.0996 17 -13.8994 32.5z
+M294.4 260.5c-19.5 -11 -37.4004 -25.5996 -44.9004 -37c5.7002 -3.40039 21.5996 -10.5 37.9004 1.59961c10.3994 7.7002 10 26.3008 7 35.4004zM160 29.5c4.09961 0 7 -0.900391 8.7998 -2.7002c2.2002 -2.2998 1.5 -5.2998 0.900391 -6.7998
+c-1.10059 -2.7002 -5.5 -11.5996 -13 -19.7998c-2.7002 -2.90039 -6.60059 -4.60059 -11 -4.60059c-4.2998 0 -8.7002 1.60059 -11.7998 4.30078c-2.30078 2.09961 -10.2002 9.5 -13.7002 18.5996c-1.2998 3.40039 -1 6.09961 0.899414 8.09961
+c1.30078 1.30078 4 2.90039 9.5 2.90039h29.4004zM349.2 130.7c0 0 29.2998 -22.5 21.0996 -70.9004c-5.2998 -29.5 -23.2002 -46 -47 -54.7002c-8.7998 -19.0996 -29.3994 -45.6992 -67.2998 -49.5996c-14.5 -11.7998 -34.5 -19.5 -63.5996 -19.5h-0.200195
+c-29.2002 0 -49.2002 7.7002 -63.6006 19.5c-37.8994 3.90039 -58.5 30.5 -67.2998 49.5996c-23.7998 8.60059 -41.7998 25.2002 -47 54.7002c-8.59961 48.2002 20.6006 70.7998 20.6006 70.7998c2.39941 -17.8994 13 -33.8994 24.5996 -43.7998
+c3.09961 22.7002 3.7002 55.5 3.7002 62.4004c0 14.7002 -9.5 24.5 -12.2002 26.0996c-2.5 1.5 -5.2998 3 -8.2998 4.60059c-18 9.59961 -40.4004 21.5996 -40.4004 43.6992c0 16.1006 9.2998 23.2002 15.4004 27.8008c0.799805 0.599609 1.5 1.19922 2.2002 1.69922
+c2.09961 1.7002 3.69922 3 4.2998 4.40039c4.39941 9.7998 3.59961 34.2002 1.7002 37.5996c-0.600586 0.700195 -16.8008 21 -11.8008 39.2002c2 7.40039 6.90039 13.2998 14.1006 17c5.2998 2.7002 11.7998 4.2002 19.5 4.5c0.0996094 2 0.5 4 0.899414 5.90039
+c0.5 2.59961 1.10059 5.2998 0.900391 8.09961c-0.400391 4.7002 -0.799805 9.10059 -2.2002 11.2998c-8.39941 13.3008 -28.7998 17.6006 -29 17.6006l-12.2998 2.39941l8.09961 9.40039c0.200195 0.200195 17.3008 17.5 46.3008 17.5c7.89941 0 16 -1.2998 23.8994 -3.5
+c24.2998 -7.7998 42.9004 -30.5 49.4004 -39.2998c2 0.599609 3.89941 1.2002 5.89941 1.7002c-1 26.3994 20.7002 47.3994 28.2002 48.2998c0.5 -4.5 -0.399414 -22.2002 7.2002 -27.6006c2.2002 14.4004 9.59961 30.3008 39.0996 40.7002
+c-6.2998 -16.7002 -0.799805 -30.7002 1.80078 -37.2002c20.0996 18.2002 33.6992 15.2002 33.6992 15.2002s-13.1992 -22.7002 -9 -38.5c3.30078 -0.799805 6.5 -1.7002 9.60059 -2.7002c6.5 8.80078 25.2002 31.5 49.3994 39.3008
+c8.10059 2.59961 16.2002 3.89941 24.1006 3.89941c29 0 46.2002 -17.2998 46.2998 -17.5l8.09961 -9.5l-12.2998 -2.39941c-0.200195 0 -20.5996 -4.30078 -29 -17.6006c-1.39941 -2.2998 -1.7998 -6.59961 -2.2002 -11.2998
+c-0.199219 -2.7998 0.300781 -5.5 0.900391 -8.09961c0.400391 -2 0.799805 -3.90039 0.900391 -5.90039c7.59961 -0.299805 14.1992 -1.7998 19.5 -4.5c7.19922 -3.7002 12.0996 -9.59961 14.0996 -17c4.90039 -18.2998 -11.2002 -38.5996 -11.7998 -39.2002
+c-1.90039 -3.39941 -2.7002 -27.7998 1.7002 -37.5996c0.599609 -1.40039 2.19922 -2.7002 4.2998 -4.40039c0.700195 -0.599609 1.39941 -1.09961 2.2002 -1.7002c6.09961 -4.59961 15.3994 -11.5996 15.3994 -27.7998c0 -22.0996 -22.3994 -34.0996 -40.3994 -43.7002
+c-2.90039 -1.59961 -5.80078 -3.09961 -8.30078 -4.59961c-2.69922 -1.59961 -12.1992 -11.4004 -12.1992 -26.0996c0 -6.90039 0.599609 -39.7002 3.69922 -62.4004c11.6006 9.90039 22.2002 25.7998 24.6006 43.7002zM305.7 410.3
+c-17.7998 -5.7002 -31.6006 -23.0996 -37.7002 -32.2002c1.59961 -0.699219 3.09961 -1.39941 4.7002 -2.19922c2.59961 -1.2002 4.89941 -2.40039 7.09961 -3.7002c2.7002 5.5 8.40039 13.7002 20.7002 22.3994c8.2002 5.80078 18.2002 8.90039 28.7002 8.90039
+c3.59961 0 6.7998 -0.400391 9.2002 -0.799805c3.2998 2.09961 6.59961 3.89941 9.69922 5.2998c-4.7998 2 -13.6992 5 -24.6992 5c-6.10059 0 -12.1006 -0.900391 -17.7002 -2.7002zM326.7 392.1c-7.40039 -0.299805 -14 -2.69922 -19.6006 -7
+c-8 -6.39941 -12.0996 -17.6992 -13.5 -22.5c4.90039 -4.19922 8.2002 -8.09961 10.5 -11.1992c3.40039 1 7.30078 1.89941 11.5 2.69922c3.30078 4.5 3.90039 10.6006 4.40039 17c0.5 6.2002 1.09961 12.6006 4.40039 17.8008c0.699219 1.09961 1.5 2.19922 2.2998 3.19922
+zM45.5996 402.7c2.40039 0.399414 5.60059 0.799805 9 0.899414c10.6006 0 20.5 -3.09961 28.8008 -8.89941c12.3994 -8.7002 18.0996 -17 20.6992 -22.4004c2.2002 1.2002 4.60059 2.5 7.10059 3.7002c1.59961 0.799805 3.2002 1.5 4.7998 2.2002
+c-6.09961 8.89941 -19.9004 26.2998 -37.7002 32.0996c-5.7002 1.7998 -11.5996 2.7002 -17.7002 2.7002c-11 0 -19.8994 -3 -24.6992 -5c3.09961 -1.2998 6.39941 -3.09961 9.69922 -5.2998zM90.2998 362.6c-1.39941 4.80078 -5.5 16.1006 -13.5 22.4004
+c-5.5 4.40039 -12.0996 6.7002 -19.5 7c0.799805 -1 1.60059 -2.09961 2.2998 -3.2002c3.30078 -5.2002 3.90039 -11.5996 4.40039 -17.7998c0.5 -6.40039 1 -12.5 4.2998 -16.9004c4.2002 -0.799805 8.10059 -1.7998 11.5 -2.69922c2.2002 3.19922 5.60059 7 10.5 11.1992z
+M58.0996 188.1c8.7002 -5 18.1006 -16.7998 19 -34.1992c0.900391 -14.7002 -0.899414 -49.9004 -3.39941 -75.9004c12.5 -4.7998 26.7002 -6.40039 39.7002 -6.7998c2 4.09961 3.89941 8.5 5.5 13.0996c0.699219 1.90039 19.5996 51 26.3994 62.2002
+c-5.39941 -39 -17.5 -73.7002 -23.5 -89.5996c3.40039 0.399414 7.2998 0.699219 11.7002 0.699219h117c4.40039 0 8.2002 -0.199219 11.7002 -0.699219c-6 15.8994 -18 50.5996 -23.5 89.5996c6.7998 -11.0996 25.7002 -60.2002 26.3994 -62.2002
+c1.60059 -4.59961 3.5 -9 5.5 -13.0996c13 0.399414 27.3008 2 39.7002 6.7998c-2.5 26 -4.2998 61.2998 -3.39941 75.9004c1.09961 17.5 10.3994 29.1992 19.0996 34.1992c2.7002 1.5 5.5 3.10059 8.40039 4.60059c14.7998 8 30.1992 16.2998 30.1992 30.5
+c0 11.0996 -4.2998 14.5 -8.89941 18.2002l-0.5 0.399414c-0.700195 0.600586 -1.5 1.2002 -2.2002 1.7998c0.900391 -7.19922 1.90039 -13.2998 2.7002 -14.8994c0 0 -12.1006 15 -15.7002 44.2998c-1.40039 11.5 1.09961 34.2002 5.09961 43
+c-0.199219 -4.90039 0 -9.7998 0.300781 -14.4004c0.399414 0.900391 0.799805 1.60059 1.2998 2.2002c3.2998 4 11.8994 17.5 9.39941 26.6006c-1 3.39941 -3.19922 6 -6.69922 7.7998c-3.80078 1.89941 -8.80078 2.89941 -15.1006 2.89941
+c-12.2998 0 -25.8994 -3.7998 -32.8994 -6c-25.1006 -7.89941 -55.4004 -30.8994 -64.1006 -37.6992c-0.200195 -0.200195 -0.399414 -0.300781 -0.399414 -0.300781l-5.60059 -3.89941l3.5 5.7998c0.200195 0.299805 19.1006 31.4004 53.1006 46.5
+c-2 2.90039 -7.40039 8.2002 -21.6006 15.0996c-21.3994 10.5 -46.3994 15.8008 -74.2998 15.8008c-27.7998 0 -52.9004 -5.30078 -74.2998 -15.8008c-14.2002 -7 -19.6006 -12.1992 -21.6006 -15.0996c34.1006 -15.0996 53 -46.2002 53.2002 -46.5l3.5 -5.7998
+l-5.59961 3.89941s-0.200195 0.100586 -0.400391 0.300781c-8.7002 6.7998 -39 29.6992 -64.0996 37.6992c-7 2.30078 -20.6006 6 -32.9004 6c-6.2998 0 -11.2998 -1 -15.0996 -2.89941c-3.60059 -1.7998 -5.7998 -4.2998 -6.7002 -7.7998
+c-2.40039 -9.10059 6.2002 -22.6006 9.40039 -26.6006c0.5 -0.599609 0.899414 -1.39941 1.2998 -2.2002c0.299805 4.60059 0.5 9.5 0.299805 14.4004c4 -8.7002 6.5 -31.5 5.09961 -43c-3.59961 -29.2998 -15.6992 -44.2998 -15.6992 -44.2998
+c0.799805 1.59961 1.7998 7.7002 2.69922 14.8994c-0.799805 -0.599609 -1.5 -1.19922 -2.19922 -1.7998l-0.5 -0.399414c-4.60059 -3.60059 -8.90039 -7.10059 -8.90039 -18.2002c0 -14.2002 15.2998 -22.5 30.2002 -30.5c2.7998 -1.5 5.7002 -3 8.39941 -4.60059z
+M34.7998 43.4004c11.9004 -19.7002 35.5 -29.4004 58.2002 -29.5c-4.5 13.2998 -3.09961 24 4.09961 31.7998l1.40039 1.39941c1.7998 2.40039 4.2998 5.80078 7 10c-27.2002 1.10059 -63.5 11 -74.4004 45.4004c-5 -5 -8.39941 -39.0996 3.7002 -59.0996zM80.5 -0.0996094
+c6.5 -9.5 16.5 -19.6006 30.9004 -25.5c-4.90039 7.19922 -8.80078 15.0996 -12.3008 23.0996c-6.39941 0.5 -12.5996 1.2998 -18.5996 2.40039zM192 -50.2002c60.5996 0.100586 78.2998 45.9004 84.9004 64.7002c3.59961 10.5 3.2998 18.2998 -0.900391 23.0996
+c-2.7998 3.30078 -9.5 7.2002 -24.5996 7.2002h-118.801c-15.0996 0 -21.6992 -3.89941 -24.5996 -7.2002c-4.2998 -4.89941 -4.59961 -12.5996 -0.900391 -23.0996c6.60059 -18.9004 24.3008 -64.5996 84.9004 -64.7002zM272.6 -25.5996
+c14.4004 5.89941 24.4004 16 30.9004 25.5c-6 -1.10059 -12.2002 -1.90039 -18.5996 -2.40039c-3.5 -8 -7.40039 -15.9004 -12.3008 -23.0996zM349.2 43.4004c12.2002 19.8994 8.7998 54 3.7998 59c-10.9004 -34.4004 -47.2002 -44.2002 -74.4004 -45.4004
+c2.7002 -4.2002 5.2002 -7.59961 7 -10c0.5 -0.5 1 -1 1.40039 -1.5c7.2002 -7.7002 8.59961 -18.5 4.09961 -31.7998c22.5 0.399414 46.1006 10 58.1006 29.7002zM191.9 260.3c-12.7002 0.200195 -27.2002 17.7998 -27.2002 17.7998
+c9.89941 -6 18.7998 -8.09961 27.2998 -8.2998c8.5 0.200195 17.4004 2.2998 27.2998 8.2998c0 0 -14.5 -17.6992 -27.2002 -17.7998h-0.199219zM253.6 29.5996c5.40039 -0.0996094 8.10059 -1.69922 9.40039 -3c1.90039 -1.89941 2.2002 -4.59961 0.900391 -7.89941
+c-3.5 -8.90039 -11.4004 -16.1006 -13.7002 -18.1006c-3.10059 -2.59961 -7.40039 -4.19922 -11.7998 -4.19922c-4.40039 0 -8.30078 1.59961 -11 4.5c-7.5 8 -12 16.6992 -13 19.2998c-0.600586 1.5 -1.30078 4.39941 0.899414 6.7002
+c1.7002 1.7998 4.7002 2.69922 8.90039 2.69922h29.3994z" />
+    <glyph glyph-name="gulp" unicode="&#xf3ae;" horiz-adv-x="256" 
+d="M209.8 56.9004l-14.0996 -24.6006l-4.60059 -80.2002c0 -8.89941 -28.2998 -16.0996 -63.0996 -16.0996s-63.0996 7.2002 -63.0996 16.0996l-5.80078 79.4004l-14.8994 25.4004c41.2002 -17.3008 126 -16.7002 165.6 0zM13.7998 310.2
+c30.7002 -17 197.8 -16.9004 228.3 0.200195l-14.7998 -136.801c-4.7998 -4.19922 -11.5996 -10.1992 -16.5996 -14.0996c-1.60059 -1.2002 -6 -4.7002 -8 -4.7002c-1.2998 0 -2.2002 0.5 -2.2002 1.7998c0.0996094 1 3.40039 4.5 5 6.40039
+c4.90039 5.7002 13.7998 16 13.7998 23.4004c0 7 -10.7002 14.0996 -25.7002 0.199219c-1.59961 -1.5 -3.09961 -3 -4.5 -4.5c0.400391 1.10059 1.10059 5.10059 1.10059 6.2002c0 2.7998 -1.40039 4 -4.2002 4c-1 0 -1.90039 -0.599609 -2.7002 -1.59961
+c-2.59961 -3.10059 -3.89941 -7.5 -5.2998 -11.2998c-0.5 -1.80078 -1.09961 -3.60059 -1.7002 -5.5c-0.399414 -0.200195 -0.700195 -0.300781 -0.899414 -0.600586c-3.80078 -3.89941 -17.7002 -17 -23.1006 -17c-2.2998 0 -1.59961 3.60059 -1 5.7998
+c1 3.40039 6.7998 17.7002 8.7002 22.3008c4.59961 11.0996 8 19.7998 13.2002 31.8994c3.89941 9.2002 3.7998 8.60059 4.5 10.5c0.700195 2.10059 0.700195 4.90039 -1 6.2002c-1 0.700195 -2 1.09961 -3.2002 1.09961c-2.40039 0 -4.7998 -1.39941 -6.09961 -4.69922
+c-25.5 -64.4004 -25.2002 -63.3008 -26.4004 -68.2002c-2 -1.7002 -4.40039 -3.40039 -6.7998 -4.5c-3.10059 -1.40039 -6.7998 -2.2002 -6.7998 1.2002c0 3.69922 1.39941 8.19922 2.69922 11.6992c2.2002 6.10059 4.90039 11.1006 6.90039 16.7002
+c0.900391 2.40039 1.2998 4.7002 -0.400391 6.90039c-0.799805 1 -1.89941 1.5 -3.19922 1.5c-2.60059 0 -4.10059 -2.60059 -5.2002 -5.10059c-0.700195 -1.5 -1.2998 -3.09961 -1.7998 -4.7998c-1.2002 -4 -3.60059 -8.7002 -5.60059 -12.2998
+c-2.7998 -5 -6.5 -10.0996 -11.0996 -13.5c-2.2002 -1.59961 -4.5 -2.40039 -6.90039 -2.40039c-3.5 0 -2.39941 5.7002 -1.5 9c2.2002 7.80078 5.5 13.3008 9.2998 20.8008c1.30078 2.69922 2.30078 5.39941 -0.299805 7.19922c-0.5 0.300781 -1 0.5 -1.59961 0.700195
+c-3.40039 0.900391 -6 -1.09961 -7.60059 -4.5c-3.09961 -6.2998 -5.39941 -11.7002 -7.09961 -16.2002c-3.2998 -8.89941 -6.90039 -18.2998 -4.59961 -23.7998c1.5 -3.7002 4.5 -5.09961 8.59961 -5.09961c9.7998 0 17.7998 6.7002 22.4004 14.8994
+c-4.30078 -19.7998 8.19922 -17.2998 20 -8.09961c0.0996094 -0.400391 0.0996094 -0.799805 0.199219 -1.2002c1.5 -6.7002 8.7002 -6.7002 14.5 -4.09961c3.5 1.59961 8.2002 4.5 14.4004 10.5c0.200195 0.299805 0.799805 1.39941 -0.799805 -2.2998
+c-7.2002 -16.2002 -13.5 -28.2002 -15 -34.3008c-0.200195 -0.899414 -0.299805 -1.7998 -0.299805 -2.69922c0 -1.80078 0.399414 -3.10059 1.2998 -3.7002c1.59961 -1.2002 4.2002 -1.2998 6.09961 -0.299805c1.7998 1 3.10059 2.59961 4 4.5
+c1 2.19922 0.200195 0.699219 5.2002 14c5 13.3994 2.90039 7.7998 9.09961 22c1.90039 4.2998 4.2002 9.5 8.5 15.5c2.5 3.39941 5.5 7 8.7002 9.69922c5.7002 4.7002 11.7002 5.40039 11.7002 2.5c0 -2.19922 -3.2998 -6.39941 -4.7002 -8.09961
+c-5.2998 -6.7002 -14.3994 -16.2998 -14.3994 -21.5c0 -9.5 12 -8 17.3994 -5.7002c7.2998 3.2002 13.9004 9.60059 19.6006 14.7998l-10.9004 -94.5996c-1.90039 -4.90039 -39.0996 -17.0996 -88.2002 -17.0996c-49 0 -86.2002 12.0996 -88.2002 17.0996l-7.59961 79.5996
+c2.09961 -1.5 4.2998 -2.39941 7.7002 -2.39941c7.39941 0 16.0996 6.7002 21.5 11.7998c2.2998 2.2002 4.39941 4.40039 6.39941 6.59961c-1 -3 -7.09961 -22 -7.2998 -25.1992c-0.0996094 -1 -0.200195 -4.90039 0.799805 -6.30078
+c0.5 -0.799805 1.40039 -1.19922 2.60059 -1.19922c2.89941 0 5.59961 4.69922 6.2998 7.5c0 0 1.7998 6.2998 7.59961 25.7998c6.30078 21.0996 10 24.5 10 34.7002c0 5.59961 -7.2998 6.7998 -9.89941 0l-5.2002 -15.5c-2.2002 -4.5 -8 -11.5 -12.5 -16
+c-3.5 -3.5 -10.7998 -10.1006 -15.7998 -10.1006c-2.40039 0 -3.90039 1.40039 -4.90039 3.60059c-2.2998 5.2998 -0.899414 14.2998 0.600586 19.8994c2.59961 9.7002 6.89941 19.4004 12 28.2002c4.19922 7.2998 10.1992 15.7002 17.0996 20.7002
+c6.59961 4.7998 12.7998 4.5 16.9004 -2.7998c1.5 -2.7002 3.7998 -7.30078 6.7998 -7.30078c2.5 0 5.7002 2.60059 4.5 9.10059c-0.5 2.5 -4.90039 8.7998 -10.1006 11.7998c-6 3.59961 -12.3994 3.59961 -18.6992 0.900391
+c-19.2002 -8.2002 -34.1006 -35.2002 -40 -55.2002zM243.5 318.7c0 -21 -231.2 -21 -231.2 0c0 8.7998 51.7998 15.8994 115.601 15.8994c9 0 17.7998 -0.0996094 26.2998 -0.399414l12.5996 48.7002l61.2998 64.5c1.40039 1.39941 5.80078 0.199219 9.90039 -3.5
+c4.09961 -3.7002 6.59961 -7.90039 5.2998 -9.30078l-0.0996094 -0.0996094l-57.2998 -60.5l-10 -40.7002c39.8994 -2.59961 67.5996 -8.09961 67.5996 -14.5996zM174.1 314.1c0 0.800781 -0.899414 1.5 -2.5 2.10059l-0.199219 -0.799805
+c0 -1.30078 -5 -2.40039 -11.1006 -2.40039c-6.09961 0 -11.0996 1.09961 -11.0996 2.40039c0 0.0996094 0 0.199219 0.0996094 0.299805l0.200195 0.700195c-1.7998 -0.600586 -3 -1.40039 -3 -2.30078c0 -2.09961 6.2002 -3.69922 13.7002 -3.69922
+c7.7002 -0.100586 13.8994 1.59961 13.8994 3.69922z" />
+    <glyph glyph-name="hacker-news-square" unicode="&#xf3af;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM21.2002 218.8h-0.200195c0.0996094 0.100586 0.200195 0.299805 0.299805 0.400391c0 -0.100586 0 -0.299805 -0.0996094 -0.400391z
+M239.2 164.9l80.7998 155.1h-34.7998c-54.7998 -101.2 -48.2998 -98.5996 -60.6006 -125.6c-10.0996 24.3994 -6.7998 27.2998 -59.2998 125.6h-37.2998l79.7998 -153.3v-102.7h31.4004v100.9z" />
+    <glyph glyph-name="hire-a-helper" unicode="&#xf3b0;" horiz-adv-x="512" 
+d="M443.1 448c3.90039 -36.4004 32.5 -65.7998 68.9004 -71.7002v-370.5c-35.4004 -4 -64.9004 -33.3994 -67.9004 -69.7998h-372.199c-5.90039 36.4004 -34.5 63.9004 -71.9004 68.7998v371.5c37.4004 3.90039 67.9004 34.4004 71.9004 71.7002h371.199zM406.1 43.0996
+c7.80078 0 5.80078 10.8008 0 10.8008c-10.2998 3.39941 -13.5 3.59961 -21.6992 13.7998c-7.80078 12.8994 -7.90039 44.3994 -7.90039 127.8v101.2c0 22.0996 12.2002 28.2998 28.5996 32.3994c8.90039 2.2002 3.90039 11.8008 -1 11.8008
+c-36.5 0 -20.5996 -2 -57.0996 -2c-32.7002 0 -16.5 2 -49.2002 2c-3.2998 0 -8.5 -8.30078 -1 -10.8008c4.90039 -1.59961 27.6006 -3.69922 27.6006 -39.2998c0 -45.5996 0.199219 -55.7998 -1 -68.7998c0 -1.2998 -2.30078 -12.7998 -12.8008 -12.7998h-109.199
+c-10.5 0 -12.8008 11.5 -12.8008 12.7998c-1.19922 13 -1 23.2002 -1 68.7998c0 35.6006 22.7002 37.7002 27.6006 39.2998c7.5 2.5 2.2998 10.8008 -1 10.8008c-32.7002 0 -16.5 -2 -49.2002 -2c-36.5 0 -20.5996 2 -57.0996 2c-5 0 -9.80078 -9.60059 -1 -11.8008
+c16.3994 -4.09961 28.5996 -10.1992 28.5996 -32.3994v-101.2c0 -83.4004 -0.200195 -114.9 -7.90039 -127.8c-8.19922 -10.2998 -11.5 -10.4004 -21.6992 -13.7998c-5.80078 0 -7.90039 -10.8008 0 -10.8008c36.2998 0 18.7998 2 55.0996 2c35.7998 0 21 -2 56.0996 -2
+c6 0 4.90039 8.2002 0 9.80078c-22.7998 7.59961 -22.8994 10.2998 -24.5996 12.7998c-10.4004 15.5996 -5.90039 83 -5.90039 113c0 5.2998 6.40039 12.7998 13.8008 12.7998h111.199c7.40039 0 13.8008 -7.5 13.8008 -12.7998c0 -30 4.5 -97.4004 -5.90039 -113
+c-1.7002 -2.60059 -1.7998 -5.2002 -24.5996 -12.7998c-4.90039 -1.60059 -5.90039 -9.80078 0 -9.80078c35.0996 0 20.2998 2 56.0996 2c36.2998 0 18.7998 -2 55.0996 -2z" />
+    <glyph glyph-name="hotjar" unicode="&#xf3b1;" 
+d="M414.9 286.5c30 -53 41.7998 -121.6 26.2998 -180.9c-14.7002 -56.6992 -68.2998 -120.3 -148.8 -145.6c54.5 76.9004 43.8994 200.1 -27.1006 215.5c54.2002 -93.9004 -53.7002 -180.3 -110.8 -93.9004c-2.5 -7.19922 -25.0996 -74.5 4.09961 -129.6
+c-61.0996 9.09961 -117.8 33.5 -144.6 93.4004c-35 78.1992 -2.7002 149.8 79 204.899c129.2 87.2998 28.0996 197.7 28.0996 197.7s219.101 -29 293.801 -161.5z" />
+    <glyph glyph-name="hubspot" unicode="&#xf3b2;" horiz-adv-x="512" 
+d="M267.4 236.4l-163.2 114.699c-7.90039 -4.69922 -17 -7.59961 -26.7998 -7.59961c-28.8008 0 -52.2002 23.4004 -52.2002 52.2998c0 28.7998 23.3994 52.2002 52.2002 52.2002c28.8994 0 52.3994 -23.4004 52.3994 -52.2002c0 -4.7998 -0.799805 -9.39941 -2 -13.7998
+c51.4004 -39.0996 141.3 -103.9 168.9 -124.8c13.0996 6.89941 27.5 11.5 42.7002 13.5996v61.2002c-17.5 7.40039 -28.2002 23.7998 -28.2002 42.9004c0 26.0996 20.5996 47.8994 46.7002 47.8994c26.0996 0 47 -21.7998 47 -47.8994
+c0 -19.1006 -10.7002 -35.5 -28.2002 -42.9004v-61.5996c62.5 -9.5 110.2 -63.5 110.2 -128.7c0 -71.9004 -58.1006 -130.2 -130 -130.2c-29.9004 0 -57.3008 10 -79.3008 26.9004l-50 -50.2002c1.30078 -3.90039 1.90039 -7.90039 1.90039 -12.1006
+c0 -10.6992 -4.2002 -20.8994 -11.7998 -28.5c-7.7002 -7.69922 -17.7998 -11.5996 -28.6006 -11.5996c-10.6992 0 -20.8994 4 -28.5 11.5996c-7.59961 7.60059 -11.7998 17.7002 -11.7998 28.5c0 10.8008 4.2002 21 11.7998 28.6006
+c7.60059 7.59961 17.7002 11.7998 28.5 11.7998c4.90039 0 9.60059 -0.900391 14 -2.5l49.5 49.7998c-16.2998 21.7002 -26 48.7002 -26 78c0 37.2998 15.7002 70.9004 40.8008 94.6006zM356.9 72.7998c38.0996 0 69 30.9004 69 69c0 38.1006 -30.9004 69 -69 69
+c-38.1006 0 -69 -30.8994 -69 -69c0 -38.0996 30.8994 -69 69 -69z" />
+    <glyph glyph-name="itunes" unicode="&#xf3b4;" 
+d="M223.6 367.7c94.5 0 171.2 -76.7002 171.2 -171.3c0 -94.5 -76.5996 -171.2 -171.2 -171.2c-94.5996 0 -171.1 76.7998 -171.1 171.3s76.5 171.2 171.1 171.2zM303 127.7c1.40039 6.2002 0.900391 -3 1 167.6c0 5.7002 -3.2998 9.10059 -9 8.7002
+c-1.7998 0 -14.0996 -2.40039 -115.1 -21.4004c-0.900391 0 -4.60059 -1 -6.7002 -2.69922c-2 -1.60059 -3.10059 -3.80078 -3.5 -6.40039c-1.7002 -6.7002 2.39941 -128 -2.60059 -133.7c-2.09961 -2.5 -4.69922 -3.2002 -7.69922 -3.7002
+c-17.7002 -3.19922 -29.6006 -4.7998 -38 -12.7998c-14.5 -14.2002 -7 -38.8994 14.3994 -42.8994c8 -1.40039 23.1006 0.599609 31.4004 5.19922c7.2998 3.80078 12.7998 10.6006 14.8994 19.6006c1.7002 7.7002 1.2002 2.39941 1.2002 118.5
+c0 5.7002 1.7002 7.2002 6.7002 8.2998c0 0 87.9004 16.4004 91.9004 17.0996c5.69922 1 8.39941 -0.5 8.39941 -6.09961c0 -78.7998 1 -77.2002 -2.2002 -80.7998c-2.09961 -2.5 -4.69922 -3.2002 -7.69922 -3.7002c-17.7002 -3.2002 -29.6006 -4.7998 -38 -12.7998
+c-10.6006 -10.4004 -10.4004 -26.7998 1.39941 -36.7998c9.7002 -7.80078 19.7998 -7.2002 31.9004 -5c13.7998 2.59961 24.0996 10.1992 27.2998 23.7998zM345.2 416c56.8994 0 102.8 -45.9004 102.8 -102.8v-242.4c0 -56.8994 -45.7998 -102.8 -102.8 -102.8h-242.4
+c-56.8994 0 -102.8 45.9004 -102.8 102.8v242.4c0 56.8994 45.9004 102.8 102.8 102.8h242.4zM223.6 4c106.301 0 192.5 86.2002 192.5 192.5s-86.1992 192.5 -192.5 192.5c-106.3 0 -192.5 -86.2002 -192.5 -192.5s86.2002 -192.5 192.5 -192.5z" />
+    <glyph glyph-name="itunes-note" unicode="&#xf3b5;" horiz-adv-x="384" 
+d="M381.9 59.7998c-6.40039 -27.3994 -27.2002 -42.7998 -55.1006 -48c-24.5 -4.5 -44.8994 -5.59961 -64.5 10.2002c-23.8994 20.0996 -24.2002 53.4004 -2.7002 74.4004c17 16.1992 40.9004 19.5 76.8008 25.7998c6 1.09961 11.1992 2.5 15.5996 7.39941
+c6.40039 7.2002 4.40039 4.10059 4.40039 163.2c0 11.2002 -5.5 14.2998 -17 12.2998c-8.2002 -1.39941 -185.7 -34.5996 -185.7 -34.5996c-10.2002 -2.2002 -13.4004 -5.2002 -13.4004 -16.7002c0 -234.7 1.10059 -223.899 -2.5 -239.5
+c-4.2002 -18.2002 -15.3994 -31.8994 -30.2002 -39.5c-16.7998 -9.2998 -47.1992 -13.3994 -63.3994 -10.3994c-43.2002 8.09961 -58.4004 58 -29.1006 86.5996c17 16.2002 40.9004 19.5 76.8008 25.7998c6 1.10059 11.1992 2.5 15.5996 7.40039
+c10.0996 11.5 1.7998 256.6 5.2002 270.2c0.799805 5.19922 3 9.59961 7.09961 12.8994c4.2002 3.5 11.7998 5.5 13.4004 5.5c204 38.2002 228.899 43.1006 232.399 43.1006c11.5 0.799805 18.1006 -6 18.1006 -17.6006c0.200195 -344.5 1.09961 -326 -1.7998 -338.5z" />
+    <glyph glyph-name="jenkins" unicode="&#xf3b6;" horiz-adv-x="512" 
+d="M487.1 23c1.5 -11.9004 -5.2998 -28.2998 -8.69922 -39.7002c-4.90039 -16.2998 -9.7002 -31.8994 -14.6006 -47.2002h-422c-0.700195 1.90039 -1.39941 4 -2.09961 6c-4.60059 14.2002 -12.6006 31.7002 -14.7002 45.8008
+c-3.09961 20.8994 16.5996 22.0996 29.2002 31.0996c19.5 14 34.7998 21.7998 55.8994 34.2998c6.30078 3.7998 25.1006 13.2002 27.3008 17.6006c4.2998 8.69922 -7.30078 20.8994 -10.4004 27.6992c-4.90039 10.7002 -7.5 19.8008 -8.2002 30.4004
+c-17.7002 2.7998 -31.0996 13.2998 -39.2002 25.2002c-13.3994 19.7002 -22.6992 56 -11.0996 83.7002c0.900391 2.19922 5.40039 6.5 6.09961 9.7998c1.40039 6.59961 -2.5 15.3994 -2.69922 22.3994c-1.2002 36 6.09961 67 30.2998 77.8008
+c9.7998 39.0996 45 52.1992 78.0996 71.5996c12.2998 7.2998 26 11.9004 40.1006 17.0996c50.5 18.7002 128.1 15.1006 170.1 -16.5996c17.7998 -13.5 46.2002 -41.9004 56.4004 -62.5c26.8994 -54.2998 25 -145.1 6.19922 -211.2
+c-2.5 -8.89941 -6.19922 -21.8994 -11.2998 -32.5996c-3.59961 -7.40039 -14.7002 -22.2998 -13.2998 -28.9004c1.40039 -6.7998 25.2998 -24.8994 30.4004 -29.8994c9.19922 -8.80078 26.7998 -20.7002 28.1992 -31.9004zM205.9 414.3
+c-33.2002 -9.39941 -75.7002 -33.5 -89.3008 -63.3994c10.6006 1.5 17.9004 6.7998 28.3008 7.5c3.89941 0.299805 9.09961 -1.60059 13.5996 -0.5c9 2.2998 16.5996 22.5 23.4004 30c6.59961 7.39941 14.5996 10.5 20 17.1992c3.5 1.7002 8.69922 1.60059 8.89941 6.80078
+c-1.5 1.69922 -3.09961 2.89941 -4.89941 2.39941zM101.1 320.7c-14.6992 -16.1006 -11.5996 -46.2998 -9.7998 -67.7998c26.5 16.6992 61.6006 -1.30078 61.2998 -29.6006c12.6006 0.299805 4.7002 15.7998 2.40039 25.7002c-7.5 32.5996 12.5996 67.9004 0.900391 97.5996
+c-22.7002 -1.7998 -41.3008 -11 -54.8008 -25.8994zM137.8 120.5c4.90039 -20 15.7002 -46 26.2998 -61.4004c13.6006 -19.3994 40.1006 -22.2998 68.7002 -24.1992c5.10059 11 23.9004 10.0996 36.2002 7.19922c-14.7002 5.80078 -28.4004 19.9004 -39.7002 32.4004
+c-13 14.2998 -26.0996 29.7002 -26.7998 48.4004c24.5 -34 44.7998 -63.8008 89.5 -78.8008c33.7998 -11.2998 73.2002 5.2002 99.2002 23.4004c10.7998 7.59961 17.2002 19.5996 24.8994 30.5996c28.7002 41.2002 42 100.101 39.1006 157.101
+c-1.2002 23.5 -1.10059 47 -9 62.7998c-8.2998 16.5996 -36.2002 31.2998 -52.5 16.4004c-3 16.0996 13.5996 26.0996 33.0996 20.2998c-13.8994 18 -28.5996 39.5996 -48.2998 50.7002c-34.4004 19.5 -92.7002 34.0996 -129.3 15.7998
+c-29.6006 -14.7002 -69.5 -39.1006 -83.1006 -70c12.7002 -29.7998 -3.7998 -57.1006 -4.7998 -87.4004c-0.599609 -16.0996 7.60059 -30.2002 8.2002 -47.7002c-4.40039 -7.19922 -17.7002 -8.09961 -26.9004 -7.59961c-3.09961 15.5 -8.5 32.9004 -24.5 34.7002
+c-22.5 2.39941 -39.0996 -16.2998 -40.0996 -35.7998c-1.2002 -23 17.7002 -61 44.4004 -58.4004c10.2998 1.09961 12.7998 11.4004 24.0996 11.2998c6.09961 -12.2002 -9.40039 -16 -11 -24.7002c-0.400391 -2.19922 1.2998 -11 2.2998 -15.0996zM359.8 -3.59961
+c-1.59961 -4.40039 0.299805 -10.4004 -0.599609 -16.5c14.8994 -4.2002 31.8994 -6.40039 50.7002 -7c3.69922 4.7998 4.89941 13.7998 4.5 22.7998c-0.600586 10.7998 -3.40039 33.0996 -10.1006 37c-14.0996 8.2002 -39 -16.5 -49.5996 -20.2998
+c1.2002 -3.40039 3.09961 -6 3.2002 -10.2002c6.2998 1.5 13.8994 0.5 19.2998 -2.2002c-6.2998 -0.700195 -13.2998 -0.599609 -17.4004 -3.59961zM342.6 16.4004c7.60059 5.5 14.3008 12 22.2002 17.0996c-18.2002 -1.59961 -41 -12.9004 -59 -4.90039
+c-0.0996094 -0.899414 -1.2998 -0.599609 -1.5 -1.39941c12.2998 -9.60059 21.5 -11.6006 38.2998 -10.7998zM330.5 -16.7998c26.9004 -8.40039 22.2002 36.7998 -2.7998 20.2002c-0.700195 -8.2002 1.2002 -10.8008 2.7998 -20.2002zM226 9.40039
+c0 6.19922 3.59961 12 2.7998 16.3994c-13.7998 2.40039 -31.8994 0.799805 -41.2998 7.2998c-9.59961 -9.69922 26.9004 -23 38.5 -23.6992zM57.7002 -49.0996v-0.100586h180.7c-0.800781 2.5 -1.5 4.90039 -2.2002 7.2002c-4.7998 15.2998 -7.5 26.7002 -8.7002 35.5
+c-19.2002 9.2002 -39.7002 18.5 -56.2002 30.2002c-3 2.2002 -23.3994 28.7002 -26.2002 27.5996c-36.8994 -14.5996 -71.3994 -39.7002 -102.199 -63.5c5.59961 -11.7998 10.5 -24.2002 14.7998 -36.8994zM298.3 -54.7998h-0.799805
+c0.299805 0.200195 0.5 0.399414 0.799805 0.5v-0.5zM305.8 -49.0996h9.60059c-1 1.5 -2.10059 2.89941 -3.2002 4.2998c-2.10059 -1.5 -4.2998 -2.90039 -6.40039 -4.2998zM320.9 -24.4004c0.0996094 3.60059 0.299805 7.2002 0.399414 10.6006
+c-6.5 3.2002 -14 5.5 -23.5 5.89941c6.5 3.30078 15.9004 3.2002 21.7998 7.10059c0.100586 1.5 0.100586 2.89941 0.200195 4.2998c-10.7998 0.900391 -14.7998 5.59961 -21.8994 9.5c-11.6006 6.40039 -29 13.2002 -43.9004 16.0996
+c-18.5 3.60059 -16.7998 -25.1992 -16 -42.3994c0.700195 -13.6006 7.7002 -28 10.7998 -37c1.5 -4.2002 1.7998 -8.7002 5.40039 -9.5c6.39941 -1.5 27.3994 6.89941 33.3994 10.2002c12.7002 6.89941 22.5 17.8994 33.3008 25.1992zM374.3 -49.0996l0.600586 12.5996
+c-11.2002 -0.700195 -17.5 10.2002 -25.4004 11c-6.90039 0.700195 -12.7002 -7.90039 -21.7002 -4.2002c-2 -2.2002 -3.89941 -4.7002 -6 -6.89941c3.2002 -3.90039 6.10059 -8.10059 8.90039 -12.5h17.3994c0.200195 3.19922 2.80078 5.7998 6.10059 5.7998
+s6 -2.60059 6.09961 -5.7998h14zM383 -49.0996h36.2998c-6.7002 10.1992 -20.0996 18.7998 -35.7002 11.5c-0.199219 -3.7002 -0.399414 -7.5 -0.599609 -11.5zM466.4 -12.0996c1.19922 6.19922 4.59961 19.5996 3.7998 25.0996
+c-1.40039 9.7998 -14.6006 17.0996 -21.4004 23.0996c-12.3994 11.1006 -20.2002 21 -33.2002 31.4004c-5.19922 -7.7998 -16.5 -13 -20.7998 -19.2998c30.7002 14.8994 36.2998 -55.7998 24.2002 -78.5c1.90039 -6.7998 8.2998 -9.40039 10.9004 -15.5
+c-0.700195 -1.10059 -1.30078 -2.2002 -1.90039 -3.2998h27.9004c0.199219 0 0.399414 0 0.599609 -0.100586c4.09961 13.1006 7.59961 25.9004 9.90039 37.1006zM222.2 317.5c5.39941 14.9004 27.2002 34.7002 45 32c7.7002 -1.2002 18 -8.2002 12.2002 -17.7002
+c-30.2002 7 -45.2002 -12.5996 -54.4004 -33.0996c-8.09961 2 -4.90039 13.0996 -2.7998 18.7998zM406.3 254.4c8.2002 3.59961 22.4004 0.699219 29.6006 5.2998c-4.2002 11.5 -10.3008 21.3994 -9.30078 37.7002c0.5 0 1 0 1.40039 -0.100586
+c6.7998 -14.2002 12.7002 -29.2002 21.4004 -41.7002c-5.7002 -13.5 -43.6006 -25.3994 -43.1006 -1.19922zM309.5 251.7c-6.7998 10.8994 -19 32.5 -14.5 45.2998c6.5 -11.9004 8.59961 -24.4004 17.7998 -33.2998c4.10059 -4 12.2002 -9 8.2002 -20.2002
+c-0.900391 -2.7002 -7.7998 -8.59961 -11.7002 -9.7002c-14.3994 -4.2998 -47.8994 -0.899414 -36.5996 17.1006c11.8994 -0.700195 27.8994 -7.80078 36.7998 0.799805zM336.8 181.7c3.7998 -6.60059 1.40039 -18.7002 12.1006 -20.6006
+c20.1992 -3.39941 43.5996 12.3008 58.0996 17.8008c9 15.1992 -0.799805 20.6992 -8.90039 30.5c-16.5996 20 -38.7998 44.7998 -38 74.6992c6.7002 4.90039 7.30078 -7.39941 8.2002 -9.69922c8.7002 -20.3008 30.4004 -46.2002 46.2998 -63.5
+c3.90039 -4.30078 10.3008 -8.40039 11 -11.2002c2.10059 -8.2002 -5.39941 -18 -4.5 -23.5c-21.6992 -13.9004 -45.7998 -29.1006 -81.3994 -25.6006c-7.40039 6.7002 -10.2998 21.4004 -2.90039 31.1006zM135.5 190.9c-6.7998 3.89941 -8.40039 21 -16.4004 21.3994
+c-11.3994 0.700195 -9.2998 -22.2002 -9.2998 -35.5c-7.7998 7.10059 -9.2002 29.1006 -3.5 40.2998c-6.59961 3.2002 -9.5 -3.59961 -13.0996 -5.89941c4.7002 34.0996 49.7998 15.7998 42.2998 -20.2998zM435.1 162.1c-10.0996 -19.1992 -24.3994 -40.3994 -54 -41
+c-0.599609 6.2002 -1.09961 15.6006 0 19.4004c22.7002 2.2002 36.6006 13.7002 54 21.5996zM293.2 149.7c18.8994 -9.90039 53.5996 -11 79.2998 -10.2002c1.40039 -5.59961 1.2998 -12.5996 1.40039 -19.4004c-33 -1.7998 -72 6.40039 -80.7002 29.6006zM385.4 103
+c-1.7002 -4.2998 -5.30078 -9.2998 -9.80078 -11.0996c-12.0996 -4.90039 -45.5996 -8.7002 -62.3994 0.299805c-10.7002 5.7002 -17.5 18.5 -23.4004 26c-2.7998 3.59961 -16.8994 12.8994 -0.200195 12.8994c13.1006 -32.6992 58 -29 95.8008 -28.0996z" />
+    <glyph glyph-name="joget" unicode="&#xf3b7;" horiz-adv-x="496" 
+d="M378.1 403c116.601 -71.7998 152.9 -224.6 81 -341.2c-71.8994 -116.5 -224.6 -152.8 -341.199 -80.8994c-116.601 71.8994 -152.9 224.6 -81 341.199c46.8994 76 128.1 117.9 211.3 117.9c44.3994 0 89.3994 -11.9004 129.899 -37zM429.9 79.7998
+c5.2998 8.7002 9.89941 17.6006 13.8994 26.6006c-32.0996 -1.10059 -157.1 1.5 -208.8 -17.6006c-58.4004 -21.5 -36.9004 -53.3994 -31.2002 -67.0996c3.7998 -9.10059 14.7002 -28.7998 23.7002 -42.4004c6.7998 -0.599609 13.5996 -1 20.4004 -1
+c71.5996 0 141.6 36 182 101.5zM229.1 166.1c51 -1.2998 205.4 -4.39941 230.301 -4.89941c11.8994 81.7998 -24.5 166.6 -99.3008 212.7c-100.5 61.8994 -232.1 30.6992 -294 -69.8008c-28.5996 -46.3994 -37.2998 -99.3994 -28.5 -149.1
+c11 40.9004 49.7002 131.5 178.301 140.2c50.8994 4 41.5 -19.2002 23.5996 -29.7002c-17.7998 -10.5 -45.7002 -23.7998 -68.9004 -51.2002c-23.1992 -27.3994 3 -46.7998 58.5 -48.2002zM412.9 220.9c22.6992 -6 19.0996 -15.5 19.0996 -15.5l-46.5 -23.4004
+l-169.5 -1.59961s33.7998 10.7998 65.2998 31.2998c26 16.8994 49.7002 35.5996 67.5 35.5996c3.7002 0 7.2002 -0.899414 10.4004 -2.7002c18.5 -10.5996 -2.90039 -18.1992 -13.4004 -24.5996s-50.7002 -34.5 -50.7002 -34.5s1.40039 -7.59961 31.1006 8.2002
+c29.7002 15.8994 64 33.2002 86.7002 27.2002z" />
+    <glyph glyph-name="js" unicode="&#xf3b8;" 
+d="M0 416h448v-448h-448v448zM243.8 66.5996v143.7h-42.0996v-143.1c0 -21.1006 -8.7998 -26.5 -22.6006 -26.5c-14.5 0 -20.5 9.89941 -27.0996 21.5996l-34.2998 -20.7002c10 -21.0996 29.5 -38.5 63.2002 -38.5c37.2998 0 62.8994 19.9004 62.8994 63.5zM343.4 3.09961
+c39.8994 0 69.6992 20.8008 69.6992 58.6006c0 35.2002 -20.0996 50.8994 -55.8994 66.2002l-10.5 4.5c-18.1006 7.89941 -25.9004 13 -25.9004 25.5996c0 10.2002 7.7998 18 20.1006 18c12.0996 0 19.8994 -5.09961 27.0996 -18l32.7998 21
+c-13.7998 24.4004 -33 33.7002 -59.7998 33.7002c-37.5 0 -61.5996 -24 -61.5996 -55.6006c0 -34.2998 20.0996 -50.5996 50.5 -63.5l10.5 -4.5c19.2998 -8.5 30.6992 -13.5996 30.6992 -28c0 -12.0996 -11.1992 -20.7998 -28.5996 -20.7998
+c-20.7002 0 -32.5 10.9004 -41.5 25.6006l-34.2998 -19.8008c12.2998 -24.3994 37.5996 -43 76.7002 -43z" />
+    <glyph glyph-name="js-square" unicode="&#xf3b9;" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM243.8 66.5996v143.7h-42.0996v-143.1c0 -21.1006 -8.7998 -26.5 -22.6006 -26.5c-14.5 0 -20.5 9.89941 -27.0996 21.5996
+l-34.2998 -20.7002c10 -21.0996 29.5 -38.5 63.2002 -38.5c37.2998 0 62.8994 19.9004 62.8994 63.5zM343.4 3.09961c39.8994 0 69.6992 20.8008 69.6992 58.6006c0 35.2002 -20.0996 50.8994 -55.8994 66.2002l-10.5 4.5c-18.1006 7.89941 -25.9004 13 -25.9004 25.5996
+c0 10.2002 7.7998 18 20.1006 18c12.0996 0 19.8994 -5.09961 27.0996 -18l32.7998 21c-13.7998 24.4004 -33 33.7002 -59.7998 33.7002c-37.5 0 -61.5996 -24 -61.5996 -55.6006c0 -34.2998 20.0996 -50.5996 50.5 -63.5l10.5 -4.5
+c19.2998 -8.5 30.6992 -13.5996 30.6992 -28c0 -12.0996 -11.1992 -20.7998 -28.5996 -20.7998c-20.7002 0 -32.5 10.9004 -41.5 25.6006l-34.2998 -19.8008c12.2998 -24.3994 37.5996 -43 76.7002 -43z" />
+    <glyph glyph-name="keycdn" unicode="&#xf3ba;" horiz-adv-x="512" 
+d="M63.7998 38.7002l60.5 59c32.1006 -42.7998 71.1006 -66 126.601 -67.4004c30.5 -0.700195 60.2998 7 86.3994 22.4004c5.10059 -5.2998 18.5 -19.5 20.9004 -22c-32.2002 -20.7002 -69.6006 -31.1006 -108.101 -30.2002
+c-43.2998 1.09961 -84.5996 16.7002 -117.699 44.4004c0.299805 0.599609 -38.2002 -37.5 -38.6006 -37.9004c9.5 -29.7998 -13.0996 -62.4004 -46.2998 -62.4004c-26.7998 0.100586 -47.5 21.7002 -47.5 48.5c0 34.3008 33.0996 56.6006 63.7998 45.6006zM418.7 291.1
+c19.0996 -31.2998 29.5996 -67.3994 28.7002 -104c-1.10059 -44.7998 -19 -87.5 -48.6006 -121c0.299805 -0.299805 23.7998 -25.1992 24.1006 -25.5c9.59961 1.30078 19.1992 -2 25.8994 -9.09961c11.2998 -12 10.9004 -30.9004 -1.09961 -42.4004
+c-12 -11.2998 -30.9004 -10.8994 -42.4004 1.10059c-6.7002 7 -9.39941 16.7998 -7.59961 26.2998c-24.9004 26.5996 -44.4004 47.2002 -44.4004 47.2002c42.7002 34.0996 63.2998 79.5996 64.4004 124.2c0.700195 28.8994 -7.2002 57.1992 -21.1006 82.1992zM104 394.9
+c6.7002 -7 9.40039 -16.8008 7.59961 -26.3008l45.9004 -48.0996c-4.7002 -3.7998 -13.2998 -10.4004 -22.7998 -21.2998c-25.4004 -28.5 -39.6006 -64.7998 -40.7002 -102.9c-0.700195 -28.8994 6.09961 -57.2002 20 -82.3994l-22 -21.5
+c-19.2998 31.5996 -28.9004 67.6992 -27.7998 104.699c1 44.6006 18.2998 87.6006 47.5 121.101l-25.2998 26.3994c-9.60059 -1.2998 -19.2002 2 -25.9004 9.10059c-11.2998 12 -10.9004 30.8994 1.09961 42.3994c11.9004 11.2002 30.6006 10.9004 42.4004 -1.19922z
+M464.9 440c26 0 47.0996 -22.4004 47.0996 -48.2998c0 -25.9004 -21.0996 -47.7002 -47.0996 -47.7002c-6.30078 -0.0996094 -14 1.09961 -15.9004 1.7998l-62.9004 -59.7002c-32.6992 43.6006 -76.6992 65.9004 -126.899 67.2002
+c-30.5 0.700195 -60.2998 -6.7998 -86.2002 -22.3994l-21.0996 22c32.1992 20.7998 69.5996 31.0996 108.1 30.1992c43.2998 -1.09961 84.5996 -16.6992 117.7 -44.5996l41.0996 38.5996c-1.5 4.7002 -2.2002 9.60059 -2.2002 14.5
+c-0.0996094 26.7002 22.3008 48.4004 48.3008 48.4004zM256.7 334.6c5.5 0 10.8994 -0.399414 16.3994 -1.09961c78.1006 -9.7998 133.4 -81.0996 123.801 -159.1c-9.80078 -78.1006 -81.1006 -133.4 -159.101 -123.801c-78.0996 9.80078 -133.399 81.1006 -123.8 159.2
+c9.2998 72.4004 70.0996 124.601 142.7 124.8zM197.7 215.2c0.599609 -22.7002 12.2002 -41.7998 32.3994 -52.2002l-11 -51.7002h73.7002l-11 51.7002c20.1006 10.9004 32.1006 29 32.4004 52.2002c-0.400391 32.7998 -25.7998 57.5 -58.2998 58.2998
+c-32.1006 -0.799805 -57.3008 -24.7998 -58.2002 -58.2998zM256 288z" />
+    <glyph glyph-name="kickstarter" unicode="&#xf3bb;" 
+d="M400 -32h-352c-26.4004 0 -48 21.5996 -48 48v352c0 26.4004 21.5996 48 48 48h352c26.4004 0 48 -21.5996 48 -48v-352c0 -26.4004 -21.5996 -48 -48 -48zM199.6 269.5c0 30.7002 -17.5996 45.0996 -39.6992 45.0996c-25.8008 0 -40 -19.7998 -40 -44.5v-154.8
+c0 -25.7998 13.6992 -45.5996 40.5 -45.5996c21.5 0 39.1992 14 39.1992 45.5996v41.7998l60.6006 -75.6992c12.2998 -14.9004 39 -16.8008 55.7998 0c14.5996 15.0996 14.7998 36.7998 4 50.3994l-49.0996 62.7998l40.5 58.7002c9.39941 13.5 9.5 34.5 -5.60059 49.1006
+c-16.3994 15.8994 -44.5996 17.2998 -61.3994 -7l-44.8008 -64.7002v38.7998z" />
+    <glyph glyph-name="kickstarter-k" unicode="&#xf3bc;" horiz-adv-x="384" 
+d="M147.3 333.6v-70.5996l82.7998 118.2c31.2002 44.3994 83.3008 41.7998 113.601 12.7998c27.8994 -26.7002 27.7998 -65.0996 10.3994 -89.7998l-74.8994 -107.4l90.7998 -114.8c19.9004 -24.7998 19.5996 -64.5996 -7.40039 -92.2002
+c-31.0996 -30.7002 -80.5 -27.2002 -103.199 0l-112.101 138.3v-76.5c0 -57.7998 -32.5996 -83.3994 -72.3994 -83.3994c-49.6006 0 -74.9004 36.0996 -74.9004 83.3994v283c0 45.2002 26.2002 81.4004 73.9004 81.4004c40.8994 0 73.3994 -26.2002 73.3994 -82.4004z" />
+    <glyph glyph-name="laravel" unicode="&#xf3bd;" horiz-adv-x="512" 
+d="M504.4 332.17c0.15625 -0.650391 0.240234 -1.32324 0.240234 -2.02051c0 -0.0234375 0 -0.046875 -0.000976562 -0.0693359v-109.85c0.000976562 -0.0244141 0.00878906 -0.0429688 0.00878906 -0.0673828c0 -2.96191 -1.61328 -5.5498 -4.00879 -6.93262
+l-92.2393 -53.1104v-105.26c0 -0.0078125 0.0078125 -0.00976562 0.0078125 -0.0166016c0 -2.96289 -1.61328 -5.55078 -4.00781 -6.93359l-192.561 -110.84c-0.442383 -0.231445 -0.916016 -0.428711 -1.39941 -0.580078
+c-0.180664 -0.0605469 -0.350586 -0.169922 -0.550781 -0.220703c-0.654297 -0.174805 -1.33789 -0.268555 -2.04688 -0.268555c-0.709961 0 -1.39844 0.09375 -2.05273 0.268555c-0.219727 0.0605469 -0.419922 0.180664 -0.629883 0.260742
+c-0.458008 0.143555 -0.908203 0.327148 -1.33008 0.540039l-192.5 110.84c-2.39551 1.38281 -4 3.96582 -4 6.92773v0.0224609v329.699c0.00195312 0.727539 0.0996094 1.42969 0.280273 2.10059c0.0839844 0.228516 0.181641 0.454102 0.290039 0.669922
+c0.133789 0.427734 0.307617 0.84668 0.509766 1.24023c0.149414 0.259766 0.370117 0.469727 0.549805 0.719727c0.21582 0.329102 0.450195 0.636719 0.709961 0.929688c0.250977 0.217773 0.512695 0.416016 0.790039 0.600586
+c0.274414 0.254883 0.56543 0.483398 0.879883 0.689453v0l96.2705 55.4199c1.1748 0.678711 2.55469 1.06738 4.00781 1.06738s2.81641 -0.388672 3.99219 -1.06738l96.29 -55.4199v0c0.307617 -0.210938 0.598633 -0.435547 0.879883 -0.679688
+c0.271484 -0.1875 0.529297 -0.385742 0.779297 -0.599609c0.260742 -0.298828 0.499023 -0.610352 0.720703 -0.94043c0.169922 -0.25 0.399414 -0.459961 0.540039 -0.719727c0.203125 -0.393555 0.379883 -0.813477 0.519531 -1.24023
+c0.0800781 -0.230469 0.219727 -0.44043 0.280273 -0.679688c0.181641 -0.661133 0.280273 -1.35352 0.280273 -2.07129v-0.0195312v-205.93l80.2197 46.1904v105.239c0.00292969 0.720703 0.100586 1.41602 0.280273 2.08008
+c0.0693359 0.240234 0.199219 0.450195 0.279297 0.680664c0.144531 0.427734 0.320312 0.850586 0.520508 1.25c0.149414 0.259766 0.370117 0.469727 0.540039 0.709961c0.21875 0.329102 0.457031 0.636719 0.719727 0.929688
+c0.248047 0.216797 0.505859 0.416016 0.780273 0.599609c0.277344 0.250977 0.568359 0.479492 0.879883 0.69043v0l96.2803 55.4502c1.1748 0.677734 2.55469 1.06641 4.00781 1.06641s2.81641 -0.388672 3.99219 -1.06641l96.2598 -55.4199
+c0.316406 -0.208984 0.613281 -0.433594 0.899414 -0.680664c0.25 -0.199219 0.540039 -0.379883 0.770508 -0.599609c0.260742 -0.298828 0.499023 -0.609375 0.719727 -0.94043c0.198242 -0.223633 0.376953 -0.458008 0.540039 -0.709961
+c0.207031 -0.396484 0.386719 -0.819336 0.530273 -1.25c0.106445 -0.217773 0.201172 -0.447266 0.280273 -0.679688zM111.6 430.72l-80.1895 -46.1602l80.1797 -46.1699l80.2002 46.1807l-80.1904 46.1494v0zM199.85 370.72l-33.6895 -19.4297l-46.5303 -26.79v-201.29
+l33.6904 19.4004l46.5293 26.79v201.319zM199.85 -42.0596l-0.109375 92.3594l-92.1904 52.1807v0v0c-0.301758 0.203125 -0.585938 0.421875 -0.859375 0.65918c-0.25 0.200195 -0.540039 0.360352 -0.770508 0.580078v0
+c-0.240234 0.265625 -0.458008 0.542969 -0.660156 0.839844c-0.21582 0.25 -0.414062 0.507812 -0.599609 0.780273v0c-0.166016 0.316406 -0.308594 0.655273 -0.419922 1c-0.149414 0.285156 -0.27832 0.589844 -0.379883 0.900391v0
+c-0.0820312 0.383789 -0.135742 0.77832 -0.160156 1.17969c-0.0595703 0.293945 -0.0996094 0.594727 -0.120117 0.900391v215.18l-46.5205 26.7998l-33.6895 19.3799v-311.18zM207.85 64.1104l117.62 67.1494l58.7998 33.5605l-80.1299 46.1299l-92.2598 -53.1104
+l-84.0898 -48.4102zM392.37 59.54v91.4102l-45.7705 -26.1504l-130.72 -74.5996v-92.3105zM392.37 178.67v91.3301l-46.5303 26.8096l-33.6895 19.4004v-91.4199l46.5293 -26.79zM400.37 283.95l80.1797 46.1797l-80.1797 46.1504l-80.2002 -46.1602zM408.37 178.67
+l80.3096 46.1504v0v91.3896l-33.6797 -19.4004l-46.6299 -26.8096v-91.3301z" />
+    <glyph glyph-name="line" unicode="&#xf3c0;" 
+d="M272.1 243.8v-71.0996c0 -1.7998 -1.39941 -3.2002 -3.19922 -3.2002h-11.4004c-1.09961 0 -2.09961 0.599609 -2.59961 1.2998l-32.6006 44v-42.2002c0 -1.7998 -1.39941 -3.19922 -3.2002 -3.19922h-11.3994c-1.7998 0 -3.2002 1.39941 -3.2002 3.19922v71.1006
+c0 1.7998 1.40039 3.2002 3.2002 3.2002h11.2998c1 0 2.09961 -0.5 2.59961 -1.40039l32.6006 -44v42.2002c0 1.7998 1.39941 3.2002 3.2002 3.2002h11.3994c1.7998 0.0996094 3.2998 -1.40039 3.2998 -3.10059zM190.1 247c1.80078 0 3.2002 -1.5 3.2002 -3.2002v-71.0996
+c0 -1.7998 -1.39941 -3.2002 -3.2002 -3.2002h-11.3994c-1.7998 0 -3.2002 1.40039 -3.2002 3.2002v71.0996c0 1.7998 1.40039 3.2002 3.2002 3.2002h11.3994zM162.6 187.4c1.7002 0 3.10059 -1.5 3.10059 -3.2002v-11.4004c0 -1.7998 -1.40039 -3.2002 -3.2002 -3.2002
+h-45.7002c-0.899414 0 -1.59961 0.400391 -2.2002 0.900391c-0.599609 0.599609 -0.899414 1.2998 -0.899414 2.2002v71.0996c0 1.7998 1.39941 3.2002 3.2002 3.2002h11.3994c1.7998 0 3.2002 -1.40039 3.2002 -3.2002v-56.3994h31.0996zM332.1 247
+c1.7002 0 3.10059 -1.5 3.2002 -3.2002v-11.3994c0 -1.80078 -1.39941 -3.2002 -3.2002 -3.2002h-31.0996v-12h31.0996c1.80078 0 3.2002 -1.40039 3.2002 -3.2002v-11.5c0 -1.7998 -1.39941 -3.2002 -3.2002 -3.2002h-31.0996v-12h31.0996
+c1.80078 0 3.2002 -1.39941 3.2002 -3.2002v-11.3994c0 -1.7998 -1.39941 -3.2002 -3.2002 -3.2002h-45.6992c-1.80078 0 -3.2002 1.5 -3.2002 3.2002v71.0996c0 1.7998 1.5 3.2002 3.2002 3.2002h45.6992zM448 334.3v-285.3
+c-0.0996094 -44.7998 -36.7998 -81.0996 -81.7002 -81h-285.3c-44.7998 0.0996094 -81.0996 36.9004 -81 81.7002v285.3c0.0996094 44.7998 36.9004 81.0996 81.7002 81h285.3c44.7998 -0.0996094 81.0996 -36.7998 81 -81.7002zM386.4 211.7
+c0 73 -73.2002 132.399 -163.101 132.399c-89.8994 0 -163.1 -59.3994 -163.1 -132.399c0 -65.4004 58 -120.2 136.399 -130.601c19.1006 -4.09961 16.9004 -11.0996 12.6006 -36.7998c-0.700195 -4.09961 -3.2998 -16.0996 14.0996 -8.7998
+c17.4004 7.2998 93.9004 55.2998 128.2 94.7002c23.5996 26 34.9004 52.2998 34.9004 81.5z" />
+    <glyph glyph-name="lyft" unicode="&#xf3c3;" horiz-adv-x="512" 
+d="M0 366.9h77.7998v-208.7c0 -33.1006 15 -52.7998 27.2002 -61c-12.7002 -11.1006 -51.2002 -20.9004 -80.2002 2.7998c-17 14 -24.7998 37.2998 -24.7998 59v207.9zM485.9 193.4c0 -14.2002 11.5996 -25.9004 26.0996 -25.9004v-76.5
+c-56.7002 0 -102.7 46.0996 -102.7 102.7v77.0996c0 34.6006 -52.2002 34.6006 -52.2002 0v-23.2998h38.8008v-76.7998h-38.8008v-6.7002c0 -21.7998 -7.69922 -45 -24.7998 -59c-16.2998 -13.7002 -35.7002 -16.2998 -51.7002 -14v179.2
+c0 56.7002 46.1006 102.7 102.7 102.7c49.1006 0 90.2002 -34.4004 100.3 -80.7002h26.1006v-76.7998h-23.7998v-22zM191.6 292.4v0.5h77.1006v-178.2c0 -52.4004 -29.7002 -91.7002 -76.7998 -100.8c-26.1006 -5.10059 -52.5 -2.80078 -77.6006 4.69922v70.3008
+c9.7998 -4.2002 29.5 -9.40039 45 -7.80078c20.4004 2 32.7998 11.9004 34.9004 25.3008c0 0 -21.2002 -20.4004 -58.2002 -10.6006c-37 9.90039 -45 40.1006 -45 63.9004v132.7h76.7998v-113c0 -15.4004 23.7998 -15.4004 23.7998 0v113z" />
+    <glyph glyph-name="magento" unicode="&#xf3c4;" 
+d="M445.7 320.1v-256.1l-63.4004 -36.5v255.8l-158.5 91.6006l-158.6 -91.6006l0.399414 -255.899l-63.2998 36.5996v255.9l221.9 128.1zM255.6 27.5v255.9l63.4004 -36.6006v-256l-95.0996 -54.8994l-94.9004 54.8994l-0.0996094 255.9l63.2998 36.5996v-256
+l31.7998 -18.2002z" />
+    <glyph glyph-name="medapps" unicode="&#xf3c6;" horiz-adv-x="320" 
+d="M118.3 209.6c3.5 12.5 6.90039 33.6006 13.2002 33.6006c8.2998 -1.7998 9.59961 -23.4004 18.5996 -36.6006c4.60059 23.5 5.30078 85.1006 14.1006 86.7002c9 0.700195 19.7002 -66.5 22 -77.5c9.89941 -4.09961 48.8994 -6.59961 48.8994 -6.59961
+c1.90039 -7.2998 -24 -7.60059 -40 -7.7998c-4.59961 -14.8008 -5.39941 -27.7002 -11.3994 -28c-4.7002 -0.200195 -8.2002 28.7998 -17.5 49.5996l-9.40039 -65.5c-4.39941 -13 -15.5 22.5 -21.8994 39.2998c-3.30078 0.100586 -62.4004 1.60059 -47.6006 7.7998zM228 0
+h-136c-21.2002 0 -21.2002 32 0 32h136c21.2002 0 21.2002 -32 0 -32zM204 -64h-88c-21.2002 0 -21.2002 32 0 32h88c21.2002 0 21.2002 -32 0 -32zM238.2 77.5c-3.60059 -21.2998 -36 -15.5 -32.6006 5.09961c3.60059 21.2002 5.60059 40.6006 15.3008 58.6006
+c32.5996 60.2998 66.0996 95.5 66.0996 151.6c0 67.9004 -57 123.2 -127 123.2s-127 -55.2998 -127 -123.2c0 -56.0996 33.5 -91.2998 66.0996 -151.7c9.7002 -17.8994 11.7002 -36.8994 15.3008 -58.5996c3.5 -20.7998 -29.1006 -26.0996 -32.6006 -5.09961
+c-3.2002 19.0996 -5.2002 36.3994 -11.8994 48.8994c-8 14.7002 -16.1006 28.1006 -24 41c-24.6006 40.4004 -45.9004 75.2998 -45.9004 125.5c0 85.6006 71.7998 155.2 160 155.2s160 -69.5996 160 -155.2c0 -50.2998 -21.2998 -85.0996 -45.9004 -125.5
+c-7.89941 -12.8994 -16.0996 -26.2998 -24 -41c-6.69922 -12.3994 -8.69922 -29.8994 -11.8994 -48.7998z" />
+    <glyph glyph-name="medium-m" unicode="&#xf3c7;" horiz-adv-x="512" 
+d="M71.5 305.7c0.599609 5.89941 -1.7002 11.7998 -6.09961 15.7998l-45.1006 54.4004v8.09961h140.2l108.4 -237.7l95.2998 237.7h133.7v-8.09961l-38.6006 -37c-3.2998 -2.5 -5 -6.7002 -4.2998 -10.8008v-272c-0.700195 -4.09961 1 -8.2998 4.2998 -10.7998l37.7002 -37
+v-8.09961h-189.7v8.09961l39.1006 37.9004c3.7998 3.7998 3.7998 5 3.7998 10.7998v219.8l-108.7 -275.899h-14.7002l-126.399 275.899v-184.899c-1.10059 -7.80078 1.5 -15.6006 7 -21.2002l50.7998 -61.6006v-8.09961h-144v8l50.7998 61.7002
+c5.40039 5.59961 7.90039 13.5 6.5 21.2002v213.8z" />
+    <glyph glyph-name="medrt" unicode="&#xf3c8;" horiz-adv-x="544" 
+d="M113.7 192c0 -121.8 83.8994 -222.8 193.5 -241.1c-18.7002 -4.5 -38.2002 -6.90039 -58.2002 -6.90039c-137.6 0 -249 111 -249 248s111.4 248 248.9 248c20.0996 0 39.5996 -2.40039 58.1992 -6.90039c-109.6 -18.2998 -193.399 -119.3 -193.399 -241.1zM411.1 91.7002
+c77.7002 55.3994 104.4 155.1 67 233.899c11.2002 -9.89941 21.5 -21.2998 30.5 -34.1992c61.6006 -88.3008 40.8008 -210.301 -46.5 -272.601c-87.2998 -62.2998 -208.1 -41.2002 -269.699 47c-9 12.7998 -16.2002 26.4004 -21.7002 40.5
+c60.7998 -62.0996 162.7 -70 240.399 -14.5996zM192.3 335.7c72.5 54.5996 171.601 45.7002 221.601 -19.7998c45.2998 -59.7002 34.3994 -145.601 -22.3008 -201.801c18.5 51.4004 11.3008 111 -24.3994 158c-43 56.5 -114.601 78.3008 -178.9 60.5
+c1.2998 1 2.60059 2.10059 4 3.10059zM296 224h40c4.40039 0 8 -3.59961 8 -8v-48c0 -4.40039 -3.59961 -8 -8 -8h-40c-4.40039 0 -8 -3.59961 -8 -8v-40c0 -4.40039 -3.59961 -8 -8 -8h-48c-4.40039 0 -8 3.59961 -8 8v40c0 4.40039 -3.59961 8 -8 8h-40
+c-4.40039 0 -8 3.59961 -8 8v48c0 4.40039 3.59961 8 8 8h40c4.40039 0 8 3.59961 8 8v40c0 4.40039 3.59961 8 8 8h48c4.40039 0 8 -3.59961 8 -8v-40c0 -4.40039 3.59961 -8 8 -8z" />
+    <glyph glyph-name="microsoft" unicode="&#xf3ca;" 
+d="M0 416h214.6v-214.6h-214.6v214.6zM233.4 416h214.6v-214.6h-214.6v214.6zM0 182.6h214.6v-214.6h-214.6v214.6zM233.4 182.6h214.6v-214.6h-214.6v214.6z" />
+    <glyph glyph-name="mix" unicode="&#xf3cb;" 
+d="M0 384h448v-204.1c0 -56.6006 -88 -59.9004 -88 0v23.7998c0 56.7998 -82.7002 59 -88 4.2998v-116.1c0 -58 -96 -57.9004 -96 0v175.3c0 56.8994 -80.0996 59.3994 -88 6.5v-238.601c0 -58.0996 -88 -56.1992 -88 0v348.9z" />
+    <glyph glyph-name="mizuni" unicode="&#xf3cc;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111.1 248 -248c0 -137 -111 -248 -248 -248s-248 111 -248 248c0 136.9 111 248 248 248zM168 88.0996v223.9c0 22.0996 -17.9004 40 -40 40s-40 -17.9004 -40 -40v-272.1c21.2002 20.8994 48.5996 37.5996 80 48.1992zM288 98v214
+c0 22.0996 -17.9004 40 -40 40s-40 -17.9004 -40 -40v-214c13 2 26.4004 3.09961 40.2002 3.09961c13.5996 0 26.8994 -1.09961 39.7998 -3.09961zM408 40.2998v271.7c0 22.0996 -17.9004 40 -40 40s-40 -17.9004 -40 -40v-223.7c31.4004 -10.5996 58.7998 -27.2002 80 -48z
+" />
+    <glyph glyph-name="monero" unicode="&#xf3d0;" horiz-adv-x="496" 
+d="M352 64h108.4c-43.4004 -71.9004 -122.301 -120 -212.4 -120s-169 48.0996 -212.4 120h108.4v127.8l104 -104.8l104 105v-128zM88 112h-74.7998c-8.60059 25.0996 -13.2002 52 -13.2002 80c0 137 111 248 248 248s248 -111 248 -248c0 -28 -4.7002 -54.9004 -13.2002 -80
+h-74.7998v208l-160.6 -159.4l-159.4 159.4v-208z" />
+    <glyph glyph-name="napster" unicode="&#xf3d2;" horiz-adv-x="496" 
+d="M298.3 74.4004c-14.2002 -13.6006 -31.2998 -24.1006 -50.3994 -30.5c-19 6.39941 -36.2002 16.8994 -50.3008 30.5h100.7zM342.3 274c-56.3994 39.7998 -132.1 39.9004 -188.899 -0.0996094c-19.9004 16.7998 -43.6006 29.5 -69.5 36.3994v-161.6
+c0 -217.3 328 -219.101 328 0.299805v161.2c-26 -7 -49.6006 -19.2998 -69.6006 -36.2002zM133.5 332.5c6.5 -3.2002 14.0996 -7.40039 20.4004 -11.4004c58.6992 30.5 129.199 30.6006 187.899 0.100586c6.7002 4.2002 13.5 8 20.6006 11.5
+c-64.6006 59.8994 -164.5 59.7998 -228.9 -0.200195zM43.7998 354.8c17.5 -0.5 34.2998 -3.09961 50.6006 -7.5c82 91.6006 225.5 91.6006 307.5 0.100586c16.0996 4.39941 32.7998 6.89941 50.0996 7.39941v-69.2002c58.7002 -36.5 58.5 -121.899 -0.200195 -158.199
+l-0.299805 -1.7002c-25.9004 -238.8 -381.2 -243.601 -407.6 1.5c-58.5 37.2002 -58.5 121.8 -0.100586 158.3v69.2998zM259.2 96c13.0996 59.2998 33.5 56 113 55.4004c-0.799805 -8.2002 0.0996094 -32.3008 -26.2002 -47.4004c-4.40039 -2.5 -15.2998 -6 -25.5 -6.5
+c-25.2998 -1.2002 -61.2998 -1.5 -61.2998 -1.5zM123.7 151.3c79.2998 0.700195 99.7998 4 113 -55.3994c0 0 -36 0.399414 -61.2998 1.5c-10.3008 0.5 -21.1006 4 -25.5 6.5c-26.3008 15.0996 -25.4004 39.1992 -26.2002 47.3994zM292.8 27.9004
+c3 -4.90039 3.2002 -8.80078 3.2998 -8.90039c-29.0996 -17.5996 -67.0996 -17.5996 -96.1992 0c0 0 0.899414 5.5 3.69922 9.59961c3.5 5.10059 6.40039 6.60059 6.40039 6.60059c23.7002 -6.90039 51.0996 -7.2998 75.9004 0c0 0 3.69922 -2 6.89941 -7.2998z" />
+    <glyph glyph-name="node-js" unicode="&#xf3d3;" 
+d="M224 -60c-6.7002 0 -13.5 1.7998 -19.4004 5.2002l-61.6992 36.5c-9.2002 5.2002 -4.7002 7 -1.7002 8c12.2998 4.2998 14.7998 5.2002 27.8994 12.7002c1.40039 0.799805 3.2002 0.5 4.60059 -0.400391l47.3994 -28.0996c1.7002 -1 4.10059 -1 5.7002 0l184.7 106.6
+c1.7002 1 2.7998 3 2.7998 5v213.2c0 2.09961 -1.09961 4 -2.89941 5.09961l-184.601 106.5c-1.7002 1 -4 1 -5.7002 0l-184.5 -106.6c-1.7998 -1 -2.89941 -3 -2.89941 -5.10059v-213.1c0 -2 1.09961 -4 2.89941 -4.90039l50.6006 -29.1992
+c27.5 -13.7002 44.2998 2.39941 44.2998 18.6992v210.4c0 3 2.40039 5.2998 5.40039 5.2998h23.3994c2.90039 0 5.40039 -2.2998 5.40039 -5.2998v-210.5c0 -36.5996 -20 -57.5996 -54.7002 -57.5996c-10.7002 0 -19.0996 0 -42.5 11.5996l-48.4004 27.9004
+c-12 6.89941 -19.3994 19.7998 -19.3994 33.6992v213.101c0 13.7998 7.39941 26.7998 19.3994 33.7002l184.5 106.6c11.7002 6.59961 27.2002 6.59961 38.8008 0l184.699 -106.7c12 -6.89941 19.4004 -19.7998 19.4004 -33.7002v-213.1
+c0 -13.7998 -7.40039 -26.7002 -19.4004 -33.7002l-184.699 -106.6c-5.90039 -3.40039 -12.6006 -5.2002 -19.4004 -5.2002zM373.1 150.1c0 -40.1992 -33.5996 -63.2998 -92 -63.3994c-80.8994 0 -97.7998 37.0996 -97.7998 68.2002c0 2.89941 2.2998 5.2998 5.2998 5.2998
+h23.9004c2.7002 0 4.90039 -1.90039 5.2998 -4.5c3.60059 -24.2998 14.2998 -36.6006 63.2002 -36.6006c38.9004 0 55.5 8.80078 55.5 29.4004c0 11.9004 -4.7002 20.7998 -65.2002 26.7002c-50.5 5 -81.7998 16.2002 -81.7998 56.5996c0 37.2998 31.4004 59.5 84.0996 59.5
+c59.2002 0 88.5 -20.5 92.2002 -64.5996c0.100586 -1.5 -0.399414 -3 -1.39941 -4.10059c-1 -1.09961 -2.40039 -1.69922 -3.90039 -1.69922h-24c-2.5 0 -4.7002 1.7998 -5.2002 4.19922c-5.7998 25.6006 -19.7998 33.8008 -57.7002 33.8008
+c-42.5 0 -47.3994 -14.8008 -47.3994 -25.9004c0 -13.4004 5.7998 -17.2998 63.2002 -24.9004c56.6992 -7.5 83.6992 -18.0996 83.6992 -58z" />
+    <glyph glyph-name="npm" unicode="&#xf3d4;" horiz-adv-x="576" 
+d="M288 160h-32v64h32v-64zM576 288v-192h-288v-32h-128v32h-160v192h576zM160 256h-128v-128h64v96h32v-96h32v128zM320 256h-128v-160h64v32h64v128zM544 256h-192v-128h64v96h32v-96h32v96h32v-96h32v128z" />
+    <glyph glyph-name="ns8" unicode="&#xf3d5;" horiz-adv-x="640" 
+d="M104.324 178.828v26.1777h26.0664v-26.1777h-26.0664zM156.79 205.006h-26.3428v26.1777c-0.124023 7.05762 -5.8916 12.748 -12.9785 12.748c-7.08594 0 -12.8535 -5.69043 -12.9775 -12.748v-0.166016h-26.4004v0.166016
+c-0.000976562 0.119141 -0.000976562 0.220703 -0.000976562 0.339844c0 21.7041 17.6211 39.3242 39.3242 39.3242c21.5039 0 38.999 -17.2959 39.3213 -38.7227v-0.941406zM209.146 179.16v26.0117h26.3438v-26.0117
+c0 -0.0371094 -0.000976562 -0.0722656 -0.000976562 -0.109375c0 -64.7373 -52.5439 -117.3 -117.274 -117.331h-0.774414c-0.0380859 0 -0.0732422 0.000976562 -0.110352 0.000976562c-64.7373 0 -117.299 52.543 -117.33 117.273v0.166016h26.3369
+c0 -50.2793 40.8203 -91.1006 91.0996 -91.1006h0.609375c50.2793 0 91.1006 40.8213 91.1006 91.1006zM51.9131 179.16v25.96h-26.291v25.3994c0 50.6445 41.1162 91.7617 91.7607 91.7617s91.7607 -41.1172 91.7607 -91.7617v-25.293h-26.3438v25.293v0.200195
+c0 36.1055 -29.3135 65.4199 -65.4199 65.4199c-35.7656 0 -64.8672 -28.7646 -65.4121 -64.4023v-26.6201h26.2891v-25.957c0.356445 -21.2305 17.7031 -38.3564 39.0176 -38.3564s38.6611 17.126 39.0176 38.3564h26.3438
+c-0.140625 -35.9551 -29.374 -65.1016 -65.3613 -65.1016s-65.2207 29.1465 -65.3613 65.1016zM470.313 250.333c-11.3467 0 -20.8633 -4.75977 -24.2402 -12.1172v-8.41211c2.21875 -4.53809 6.30859 -7.69238 12.6191 -9.62988
+c4.75879 -1.37891 9.76562 -2.3623 14.832 -2.87793c6.36426 -0.827148 13.0068 -1.71484 20.6992 -4.42676c13.7256 -4.59375 24.0742 -13.2275 28.9443 -24.2412l0.166016 -0.664062l-0.166016 -25.8994c-7.69238 -17.0479 -28.668 -28.4473 -52.2998 -28.4473
+c-25.6797 0 -47.374 12.6182 -55.2891 32.0439l-0.552734 1.43848l23.0205 11.5078l0.719727 -1.49414c5.97754 -12.1211 17.5996 -19.0391 31.9336 -19.0391c12.0098 0 22.083 4.81445 25.791 12.3418v9.85059c-2.37988 4.59473 -6.47656 7.75098 -12.8398 9.85156
+c-5.20312 1.71582 -10.3506 2.37988 -15.8291 3.09961c-6.78809 0.675781 -13.4814 2.04199 -19.8135 3.98438c-14.1123 4.87109 -23.9678 13.2275 -28.668 24.2412c-0.158203 0.949219 -0.123047 -2.02637 0 24.8496c7.36133 17.0469 27.8379 28.4473 50.9727 28.4473
+c24.9062 0 45.3818 -12.0098 53.4062 -31.2705l0.609375 -1.43848l-23.2451 -11.5117l-0.71875 1.5498c-5.47949 11.6221 -16.3818 18.2637 -30.0518 18.2637zM287.568 136.656v68.3994h26.0664v-68.3994h-26.0664zM639.834 189.956l0.166016 -0.722656l-0.166016 -28.8906
+c-7.52734 -15.9941 -27.8916 -26.7305 -50.584 -26.7305s-43.0029 10.7363 -50.585 26.7305l-0.166016 0.720703l0.166016 28.8887c2.93262 6.25391 8.24121 12.0137 15.4414 16.7139c-5.57422 3.90332 -10.0391 9.14453 -13.0068 15.3311l-0.166016 0.664062
+l0.166016 25.3467c7.36133 15.9922 26.7334 26.7324 48.1504 26.7324s40.7881 -10.7402 48.1504 -26.7295l0.166016 -0.664062l-0.166016 -25.3467c-2.90137 -6.22852 -7.38379 -11.4873 -13.0078 -15.3301c7.1416 -4.7041 12.5088 -10.46 15.4414 -16.7139z
+M566.614 240.762v-13.7246c3.48535 -6.19922 12.5068 -10.3486 22.5801 -10.3486c10.0723 0 19.0938 4.14844 22.6357 10.3486v13.7246c-3.59766 6.31055 -12.6191 10.5166 -22.6357 10.5166c-10.0176 0 -18.9805 -4.20605 -22.5801 -10.5166zM613.933 168.593v16.1572
+c-3.76367 6.36523 -13.3379 10.5146 -24.6826 10.5146c-11.1836 0 -20.9756 -4.20605 -24.6836 -10.5146v-16.1572c3.70801 -6.52734 13.5586 -10.8994 24.6836 -10.8994c11.3447 0 20.9189 4.25879 24.6826 10.8994zM376.4 182.038v89.7129h25.8994v-135.095h-25.6777
+l-62.5391 94.085v0.386719h-26.5098v40.623h29z" />
+    <glyph glyph-name="nutritionix" unicode="&#xf3d6;" horiz-adv-x="400" 
+d="M88 439.9c0 0 133.4 8.19922 121 -104.4c0 0 19.0996 74.9004 103 40.5996c0 0 -17.7002 -74 -88 -56c0 0 14.5996 54.6006 66.0996 56.6006c0 0 -39.8994 10.2998 -82.0996 -48.7998c0 0 -19.7998 94.5 -93.5996 99.6992c0 0 75.1992 -19.3994 77.5996 -107.5
+c0 -0.0996094 -106.4 -7 -104 119.801zM400 124.3c0 -48.5 -9.7002 -95.2998 -32 -132.3c-42.2002 -30.9004 -105 -48 -168 -48c-62.9004 0 -125.8 17.0996 -168 48c-22.2998 37 -32 83.7998 -32 132.3c0 48.4004 17.7002 94.7002 40 131.7
+c42.2002 30.9004 97.0996 48.5996 160 48.5996c63 0 117.8 -17.5996 160 -48.5996c22.2998 -37 40 -83.2998 40 -131.7zM120 20c0 15.5 -12.5 28 -28 28s-28 -12.5 -28 -28s12.5 -28 28 -28s28 12.5 28 28zM120 86.2002c0 15.5 -12.5 28 -28 28s-28 -12.5 -28 -28
+s12.5 -28 28 -28s28 12.5 28 28zM120 152.4c0 15.5 -12.5 28 -28 28s-28 -12.5 -28 -28s12.5 -28 28 -28s28 12.5 28 28zM192 20c0 15.5 -12.5 28 -28 28s-28 -12.5 -28 -28s12.5 -28 28 -28s28 12.5 28 28zM192 86.2002c0 15.5 -12.5 28 -28 28s-28 -12.5 -28 -28
+s12.5 -28 28 -28s28 12.5 28 28zM192 152.4c0 15.5 -12.5 28 -28 28s-28 -12.5 -28 -28s12.5 -28 28 -28s28 12.5 28 28zM264 20c0 15.5 -12.5 28 -28 28s-28 -12.5 -28 -28s12.5 -28 28 -28s28 12.5 28 28zM264 86.2002c0 15.5 -12.5 28 -28 28s-28 -12.5 -28 -28
+s12.5 -28 28 -28s28 12.5 28 28zM264 152.4c0 15.5 -12.5 28 -28 28s-28 -12.5 -28 -28s12.5 -28 28 -28s28 12.5 28 28zM336 20c0 15.5 -12.5 28 -28 28s-28 -12.5 -28 -28s12.5 -28 28 -28s28 12.5 28 28zM336 86.2002c0 15.5 -12.5 28 -28 28s-28 -12.5 -28 -28
+s12.5 -28 28 -28s28 12.5 28 28zM336 152.4c0 15.5 -12.5 28 -28 28s-28 -12.5 -28 -28s12.5 -28 28 -28s28 12.5 28 28zM360 192c-4.7998 22.2998 -7.40039 36.9004 -16 56c-38.7998 19.9004 -90.5 32 -144 32s-105.2 -12.0996 -144 -32
+c-8.7998 -19.5 -11.2002 -33.9004 -16 -56c42.2002 7.90039 98.7002 14.7998 160 14.7998s117.8 -6.89941 160 -14.7998z" />
+    <glyph glyph-name="page4" unicode="&#xf3d7;" horiz-adv-x="496" 
+d="M248 -56c-137 0 -248 111 -248 248s111 248 248 248c20.9004 0 41.2998 -2.59961 60.7002 -7.5l-266.4 -376.5h205.7v-112zM248 87.5996h-149.4l149.4 213.601v-213.601zM344 56h111.4c-26.9004 -41 -65.7002 -73.5 -111.4 -92.7002v92.7002zM401.4 194.2v-16.7002
+l-21.2002 8.2998zM381.1 139.7c5.90039 0 8.2002 -4.7002 8.2002 -10.6006v-10h-16.2002v7.7002c0 6.60059 1.30078 12.9004 8 12.9004zM496 192c0 -37.2998 -8.2002 -72.7002 -23 -104.4h-129v333.101c89.2998 -37.5 152 -125.8 152 -228.7zM360.4 304.4h68.1992v47.5996
+h-13.8994v-32.5996h-13.9004v29.5996h-13.8994v-29.5996h-12.7002v32.5996h-13.9004v-47.5996h0.100586zM428.5 119.1h-26.5v11c0 15.4004 -5.59961 25.2002 -20.9004 25.2002c-15.3994 0 -20.6992 -10.5996 -20.6992 -25.8994v-25.3008h68.1992v15h-0.0996094zM428.5 222.1
+l-68.2002 -29.6992v-12.4004l68.2002 -29.5v16.5996l-14.4004 5.7002v26.5l14.4004 5.90039v16.8994zM423.7 290.6h-35.6006v-26.5996h13.9004v12.2002h11c8.59961 -15.7998 1.2998 -35.2998 -18.5996 -35.2998c-22.5 0 -28.3008 25.2998 -15.5 37.6992l-11.6006 10.6006
+c-16.2002 -17.5 -12.2002 -63.9004 27.1006 -63.9004c34 0 44.6992 35.9004 29.2998 65.2998z" />
+    <glyph glyph-name="palfed" unicode="&#xf3d8;" horiz-adv-x="576" 
+d="M384.9 254.1c0.0996094 -53.3994 -46.5 -96.1992 -83.3008 -96.1992c-12.5 0 -14.3994 3.39941 -15.0996 6.19922c0.5 39.1006 1.7002 80.4004 3 119.801c40.2002 14.3994 95.4004 17.5996 95.4004 -29.8008zM190.4 181.9
+c-0.200195 0.599609 -0.400391 2.09961 -0.600586 4.59961c0 25.5996 37 60.9004 58.5 75.9004c-1.2002 -36.4004 -5.5 -198.101 -1.39941 -242.5c3 -32.3008 26.7998 -32.9004 36.3994 -22.3008c5.90039 6.60059 5.5 15.7002 5.2998 19.1006v0.200195
+c-1.7998 25.5996 -2.7998 60.5996 -2.69922 100c60.7998 -14.4004 140.1 60.2998 140.1 138.199c0 71 -63 94.2002 -135.2 72c-2.89941 14.6006 -18.2998 20.1006 -29.5 11.1006c-7.5 -6.2002 -9.5 -15.7998 -10.5 -28.2002c-57.7998 -30.9004 -100.7 -84.5 -100.7 -126.5
+c0 -24.9004 15.6006 -43 37.1006 -43c35.0996 0 41 44.0996 14.3994 44.0996c-4.69922 0 -11 -2.69922 -11.1992 -2.69922zM8 266.9c0 38.5996 38.4004 37.3994 38.4004 37.3994h29c15.5 70.1006 120.5 74.2998 120.5 74.2998h28.0996v19.1006
+c0 18.3994 21.0996 18.3994 21.0996 18.3994h85.8008c18.3994 0 21.0996 -18.3994 21.0996 -18.3994v-19.1006h28c89.2002 0 112.1 -48.6992 119.4 -74.2998h30.0996c38.5 0 38.4004 -37.3994 38.4004 -37.3994c0 -38.6006 -38.4004 -37.4004 -38.4004 -37.4004h-30
+l-22.4004 -217.2c0 -43.8994 -44.6992 -44.2998 -44.6992 -44.2998h-288.9c-44.7002 0 -44.7002 44.2998 -44.7002 44.2998l-22.3994 217.2h-30c-38.5 0 -38.4004 37.4004 -38.4004 37.4004z" />
+    <glyph glyph-name="patreon" unicode="&#xf3d9;" horiz-adv-x="512" 
+d="M512 253.2c0 -101.3 -82.4004 -183.8 -183.8 -183.8c-101.7 0 -184.4 82.3994 -184.4 183.8c0 101.6 82.7002 184.3 184.4 184.3c101.399 0 183.8 -82.7002 183.8 -184.3zM0 -53.5v491h90v-491h-90z" />
+    <glyph glyph-name="periscope" unicode="&#xf3da;" 
+d="M370 384.4c38.4004 -40.7002 59.5 -94.3008 59.5 -150.801c0 -74.2998 -57.4004 -159.5 -82 -192.6c-8 -10.7998 -79.2998 -105 -120.9 -105c-34 0 -88.7998 56.5 -125.399 104.9c-24.9004 32.8994 -82.7002 117.6 -82.7002 192.699c0 118.2 93.4004 214.4 208.1 214.4
+c53.9004 0 104.801 -22.5996 143.4 -63.5996zM226.6 -45.9004c37.3008 0 184.801 167.301 184.7 279.4c0 107.3 -83.8994 196.3 -184.7 196.3c-106.1 0 -190 -88.8994 -190 -196.3c0 -112.1 147.5 -279.4 190 -279.4zM338 241.2c0 -59.1006 -51.0996 -109.7 -110.8 -109.7
+c-100.601 0 -150.7 108.2 -92.9004 181.8v-0.399414c0 -24.5 20.1006 -44.4004 44.7998 -44.4004c24.7002 0 44.8008 19.9004 44.8008 44.4004c0 18.1992 -11.1006 33.7998 -26.9004 40.6992c76.5996 19.2002 141 -39.2998 141 -112.399z" />
+    <glyph glyph-name="phabricator" unicode="&#xf3db;" horiz-adv-x="496" 
+d="M323 185.9c0 0 21.5996 -19.6006 20.9004 -20.7002l-8.10059 -19.7998c-0.5 -1.40039 -29.7002 -0.5 -29.7002 -0.5l-9.09961 -9.10059s1.59961 -31.5 0.200195 -32.0996l-20 -7.5c-1.2998 -0.5 -21.7998 23.2998 -21.7998 23.2998l-13.1006 0.200195
+s-19.2998 -24.1006 -20.7002 -23.5l-20.0996 8.2998c-1.40039 0.5 -1.2002 32.2998 -1.2002 32.2998l-9.39941 9.2998s-28.9004 -0.899414 -29.5 0.5l-9.5 20c-0.600586 1.40039 21.0996 21.2002 21.0996 21.2002l-0.0996094 12.9004s-21.6006 19.5996 -21 21
+l8.09961 19.7998c0.5 1.2998 29.7002 0.400391 29.7002 0.400391l9.09961 9.09961s-1.59961 28.4004 -0.200195 28.9004l20 8.2998c1.40039 0.599609 21.9004 -20.7998 21.9004 -20.7998l13.0996 -0.200195s19.3008 21.5996 20.7002 21l20.1006 -9.2002
+c1.39941 -0.599609 1.19922 -29.0996 1.19922 -29.0996l9.40039 -9.30078s28.9004 0.900391 29.5 -0.5l9.5 -20c0.599609 -1.39941 -21.0996 -21.1992 -21.0996 -21.1992zM278.1 194.6c-0.699219 17 -15.5 30.3008 -32.7998 29.5
+c-17.2998 -0.699219 -30.7998 -15.1992 -30.0996 -32.2998c0.700195 -17.0996 15.5 -30.3994 32.7998 -29.5996s30.7998 15.2998 30.0996 32.3994zM479.3 232.5c22.2998 -22.2998 22.2998 -58.7002 0 -81c-67.3994 -67.4004 -44.2998 -44.4004 -95.2998 -95.2998
+c-74.4004 -74.5 -194.7 -74.9004 -269.8 -1.60059l-0.100586 -0.0996094c-51 51 -27.5 27.5996 -97.3994 97c-22.2998 22.2998 -22.2998 58.7002 0 81c67.8994 67.4004 44.7998 44.2998 95.7002 95.2998c74.3994 74.4004 194.699 74.9004 269.8 1.60059l0.0996094 0.0996094
+zM140.4 84.2002c59.5996 -59.5 156 -59.6006 215.6 -0.100586c59.5996 59.6006 59.5 156.101 0 215.601c-59.5996 59.5 -156.1 59.5996 -215.6 0c-59.6006 -59.5 -59.6006 -156 0 -215.5z" />
+    <glyph glyph-name="phoenix-framework" unicode="&#xf3dc;" horiz-adv-x="640" 
+d="M212.9 103.7c-36.7002 -1.2002 -108.7 29.2998 -127.7 106.399c-8.7002 35.3008 -2.7002 51.8008 -8 86.1006c-8.2002 53.3994 -32.1006 72.2002 -55.9004 76.5c-6.2002 1.09961 -12.3994 1.2998 -18.7002 0.299805
+c-0.799805 -0.0996094 -1.59961 -0.200195 -2.39941 -0.200195c-0.100586 0.200195 -0.100586 0.299805 -0.200195 0.5c0.700195 0.600586 1.40039 1.2002 2.2002 1.7998c36.8994 26.9004 92 38.4004 136.3 35c123.6 -9.5 141.3 -156.6 252.5 -173.1
+c6.09961 -0.900391 12.2998 -1.09961 18.5 -1.7002c0.700195 -0.0996094 1.40039 -0.0996094 2.5 -0.200195c-2.09961 -2.19922 -21.5996 -11.7998 -36.5 -14.5c-18.4004 -3.39941 -35.7002 -0.0996094 -51.2998 10.3008c-14.5 9.7998 -24.5 23.5 -38.9004 27.3994
+c-13 3.60059 -34.0996 1.7002 -35.8994 -19.5996c-1.30078 -15.9004 14.1992 -51.7998 51.7998 -74.6006c40.3994 -24.5 101.399 -26.8994 134.7 -14.7998c0.299805 0.100586 0.699219 0.200195 1.09961 0.299805c0.200195 0.100586 0.400391 0 1 -0.0996094
+c-23.5996 -28.4004 -71.2002 -49.9004 -108.2 -45.4004c-50.3994 6.2002 -77.7002 75.9004 -113.7 97.5c-19.0996 11.5 -49.0996 7 -52 -18.5c-1.09961 -10 2.10059 -19 6.40039 -27.5996c24.4004 -48.5996 65.5996 -47 68 -49.5996
+c-2.7998 -0.800781 -21.7998 -2.10059 -25.5996 -2.2002zM75.2998 383.1c13.1006 -14.5 34.2002 -7.89941 35.2998 6.80078c-12.3994 -0.700195 -24.5 -2.2002 -36.5996 -4.80078c0.400391 -0.799805 0.400391 -1 1.2998 -2zM272.2 32.5996
+c-42.7998 -1.19922 -92 26.7002 -123.5 61.4004c-4.60059 5 -16.7998 20.2002 -18.6006 23.4004l0.400391 0.399414c6.59961 -4.09961 25.7002 -18.5996 54.7998 -27c24.2002 -7 48.1006 -6.2998 71.6006 3.2998c22.6992 9.30078 41 0.5 43.0996 -2.89941
+c-18.5 -3.7998 -20.0996 -4.40039 -24 -7.90039c-5.09961 -4.39941 -4.59961 -11.7002 7 -17.2002c26.2002 -12.3994 63 2.80078 97.2002 -25.3994c2.39941 -2 8.09961 -7.7998 10.0996 -10.7002c-0.0996094 -0.200195 -0.299805 -0.299805 -0.399414 -0.5
+c-4.80078 1.5 -16.4004 7.5 -40.2002 9.2998c-24.7002 2 -46.2998 -5.2998 -77.5 -6.2002zM447 284.6c16.4004 5.2002 41.2998 13.4004 66.5 3.30078c16.0996 -6.5 26.2002 -18.7002 32.0996 -34.6006c3.5 -9.39941 5.10059 -19.7002 5.10059 -28.7002
+c-0.200195 0 -0.400391 0 -0.600586 -0.0996094c-0.199219 0.400391 -0.399414 0.900391 -0.5 1.2998c-5 22 -29.8994 43.7998 -67.5996 29.9004c-50.2002 -18.6006 -130.4 -9.7002 -176.9 48c-0.699219 0.899414 -2.39941 1.7002 -1.2998 3.2002
+c0.100586 0.199219 2.10059 -0.600586 3 -1.30078c18.1006 -13.3994 38.2998 -21.8994 60.2998 -26.1992c30.5 -6.10059 54.6006 -2.90039 79.9004 5.19922zM549.7 167.1c-32.4004 -0.199219 -33.7998 -50.0996 -103.601 -64.3994
+c-18.1992 -3.7002 -38.6992 -4.60059 -44.8994 -4.2002v0.400391c2.7998 1.5 14.7002 2.59961 29.7002 16.5996c7.89941 7.2998 15.2998 15.0996 22.7998 22.9004c19.5 20.1992 41.3994 42.1992 81.8994 39c23.1006 -1.80078 29.3008 -8.2002 36.1006 -12.7002
+c0.299805 -0.200195 0.399414 -0.5 0.700195 -0.900391c-0.5 0 -0.700195 -0.0996094 -0.900391 0c-7 2.7002 -14.2998 3.2998 -21.7998 3.2998zM537.4 191.2c-0.100586 -0.200195 -0.100586 -0.400391 -0.200195 -0.600586c-28.9004 4.40039 -48 7.90039 -68.5 -4
+c-17 -9.89941 -31.4004 -20.5 -62 -24.3994c-27.1006 -3.40039 -45.1006 -2.40039 -66.1006 8c-0.299805 0.200195 -0.599609 0.399414 -1 0.599609c0 0.200195 0.100586 0.299805 0.100586 0.5c24.8994 -3.7998 36.3994 -5.09961 55.5 5.7998
+c22.2998 12.9004 40.0996 26.6006 71.2998 31c29.5996 4.10059 51.2998 -2.5 70.9004 -16.8994zM268.6 350.7c-0.599609 0.599609 -1.09961 1.2002 -2.09961 2.2998c7.59961 0 29.7002 1.2002 53.4004 -8.40039c19.6992 -8 32.1992 -21 50.1992 -32.8994
+c11.1006 -7.2998 23.4004 -9.2998 36.4004 -8.10059c4.2998 0.400391 8.5 1.2002 12.7998 1.7002c0.400391 0.100586 0.900391 0 1.5 -0.299805c-0.599609 -0.400391 -1.2002 -0.900391 -1.7998 -1.2002c-8.09961 -4 -16.7002 -6.2998 -25.5996 -7.09961
+c-26.1006 -2.60059 -50.3008 3.7002 -73.4004 15.3994c-19.2998 9.90039 -36.4004 22.9004 -51.4004 38.6006zM640 112.3c-3.5 -3.09961 -22.7002 -11.5996 -42.7002 -5.2998c-12.2998 3.90039 -19.5 14.9004 -31.5996 24.0996
+c-10 7.60059 -20.9004 7.90039 -28.1006 8.40039c0.600586 0.799805 0.900391 1.2002 1.2002 1.40039c14.7998 9.19922 30.5 12.1992 47.2998 6.5c12.5 -4.2002 19.2002 -13.5 30.4004 -24.2002c10.7998 -10.4004 21 -9.90039 23.0996 -10.5
+c0.100586 0.0996094 0.200195 0 0.400391 -0.400391zM427.5 -24.7002c2.2002 -1.2002 1.59961 -1.5 1.5 -2c-18.5 1.40039 -33.9004 7.60059 -46.7998 22.2002c-21.7998 24.7002 -41.7002 27.9004 -48.6006 29.7002c0.5 0.200195 0.800781 0.399414 1.10059 0.399414
+c13.0996 -0.0996094 26.0996 -0.699219 38.8994 -3.89941c25.3008 -6.40039 35 -25.4004 41.6006 -35.2998c3.2002 -4.80078 7.2998 -8.30078 12.2998 -11.1006z" />
+    <glyph glyph-name="playstation" unicode="&#xf3df;" horiz-adv-x="576" 
+d="M570.9 75.7002c-11.3008 -14.2002 -38.8008 -24.2998 -38.8008 -24.2998l-205.1 -73.6006v54.2998l150.9 53.8008c17.0996 6.09961 19.7998 14.7998 5.7998 19.3994c-13.9004 4.60059 -39.1006 3.2998 -56.2002 -2.89941l-100.5 -35.5v56.3994
+c23.2002 7.7998 47.0996 13.6006 75.7002 16.7998c40.8994 4.5 90.8994 -0.599609 130.2 -15.5c44.1992 -14 49.1992 -34.6992 38 -48.8994zM346.5 168.2v139c0 16.2998 -3 31.2998 -18.2998 35.5996c-11.7002 3.7998 -19 -7.09961 -19 -23.3994v-347.9l-93.7998 29.7998
+v414.7c39.8994 -7.40039 98 -24.9004 129.199 -35.4004c79.5 -27.2998 106.4 -61.2998 106.4 -137.8c0 -74.5 -46 -102.8 -104.5 -74.5996zM43.2002 37.7998c-45.4004 12.7998 -53 39.5 -32.2998 54.7998c19.0996 14.2002 51.6992 24.9004 51.6992 24.9004l134.5 47.7998
+v-54.5l-96.7998 -34.5996c-17.0996 -6.10059 -19.7002 -14.7998 -5.7998 -19.4004c13.9004 -4.59961 39.0996 -3.2998 56.2002 2.90039l46.3994 16.8994v-48.7998c-51.5996 -9.2998 -101.399 -7.2998 -153.899 10z" />
+    <glyph glyph-name="pushed" unicode="&#xf3e1;" horiz-adv-x="432" 
+d="M407 336.1c21.7002 -1.89941 33.7998 -28 17.4004 -44.7998l-235.2 -231.3l-35.2998 -80.7998c-11 -17.2002 -41.2002 -14.2998 -47.7002 7l-105.101 348.3c-4.59961 18.2998 6.30078 33.9004 21.4004 36.5996l271.3 44.4004c17.9004 3.40039 39.1006 -13.5 28.7002 -37
+l-14 -33.4004zM297.6 394.4l-189 -31l177.4 -16.3008l16.7998 39.9004c2.2998 4.90039 -0.0996094 8.09961 -5.2002 7.40039zM22.7002 340.1l157.899 -244.3l96.9004 230.7l-248.7 22.7002c-5.09961 0.899414 -9.2002 -4 -6.09961 -9.10059zM136 -8.40039
+c0 0 28.2002 64.1006 35.2002 79.1006l-127.7 197.6l83.0996 -275.5c1.5 -4.2998 6.80078 -5.2002 9.40039 -1.2002zM408.8 306.1c3.10059 3.30078 1.40039 7.5 -2.59961 8.60059l-106.4 9.7002l-89.7002 -213.7z" />
+    <glyph glyph-name="python" unicode="&#xf3e2;" 
+d="M439.8 247.5c10.7002 -42.9004 11.2002 -75.0996 0 -108.6c-10.7998 -32.5 -22.2998 -54.2002 -53.3994 -54.2002h-160.2v-13.6006h106.7v-40.6992c0 -30.8008 -26.5 -46.5 -53.4004 -54.3008c-40.5 -11.6992 -73 -9.89941 -106.8 0
+c-28.2002 8.30078 -53.4004 25.3008 -53.4004 54.3008v101.8c0 29.2998 24.2002 54.2998 53.4004 54.2998h106.8c35.5996 0 66.7998 31 66.7998 67.7998v47.4004h40.1006c31.0996 0 45.6992 -23.2998 53.3994 -54.2002zM286.2 44c-11 0 -20 -9 -20.1006 -20.2998
+c0 -11.2002 9.10059 -20.4004 20.1006 -20.4004c11.0996 0 20.0996 9.10059 20.0996 20.4004c0 11.2002 -9 20.2998 -20.0996 20.2998zM167.8 199.9c-36.2998 0 -66.7998 -31.1006 -66.7998 -66.4004v-48.7998h-36.7002c-31.0996 0 -49.2002 22.5996 -56.7998 54.2002
+c-10.2002 42.5 -9.7998 67.8994 0 108.6c8.5 35.5 35.7002 54.2002 66.7998 54.2002h147v13.5996h-106.899v40.7002c0 30.9004 8.19922 47.5996 53.3994 55.5996c32.1006 5.7002 71 6 106.8 0.100586c29 -4.90039 53.4004 -26.6006 53.4004 -55.6006v-101.899
+c0 -29.7998 -23.7002 -54.2998 -53.4004 -54.2998h-106.8zM161.1 342.5c11.1006 0 20.1006 9.09961 20.1006 20.2998s-9.10059 20.4004 -20.1006 20.4004c-11.0996 0 -20 -9.10059 -20.0996 -20.4004c0 -11.2002 9 -20.2998 20.0996 -20.2998z" />
+    <glyph glyph-name="red-river" unicode="&#xf3e3;" 
+d="M353.2 416c52.3994 0 94.7998 -42.4004 94.7998 -94.7998v-258.4c0 -52.3994 -42.4004 -94.7998 -94.7998 -94.7998h-258.4c-52.3994 0 -94.7998 42.4004 -94.7998 94.7998v258.4c0 52.3994 42.4004 94.7998 94.7998 94.7998h258.4zM144.9 247.1
+c-0.600586 12.4004 11.6992 24.6006 24 24h56.2998c27 0 48.8994 21.9004 48.8994 48.9004h-154.199c-13.2002 0 -23.9004 -10.7002 -23.9004 -23.9004v-154.199c27 0 48.9004 21.8994 48.9004 48.8994v56.2998zM321.2 175.1c27 0 48.8994 21.9004 48.8994 48.9004h-154.199
+c-13.2002 0 -23.9004 -10.7002 -23.9004 -23.9004v-154.199c27 0 48.9004 21.8994 48.9004 48.8994v56.2998c-0.600586 12.4004 11.6992 24.6006 24 24h56.2998z" />
+    <glyph glyph-name="wpressr" unicode="&#xf3e4;" horiz-adv-x="496" 
+d="M248 440c136.97 0 248 -111.03 248 -248s-111.03 -248 -248 -248s-248 111.03 -248 248s111.03 248 248 248zM419.33 281.4c2.41016 5.47949 0.459961 8.2793 -5.62012 8.26953c-104.8 0.00976562 -107.69 -0.0302734 -130.78 0.0302734
+c-4.31934 0.00976562 -7.10938 -1.82031 -8.83984 -5.78027c-5.70996 -13.0996 -11.5195 -26.1504 -17.2998 -39.21c-2.57031 -5.7998 -1 -8.26953 5.26953 -8.26953c25.2607 0 50.5205 -0.0107422 75.7803 0.0195312
+c10.0303 0.00976562 8.54004 -13.6602 -3.89941 -13.6396c-26.4307 0.0498047 -52.8604 0 -79.29 0.0498047c-4.91016 0.00976562 -8.33008 -1.88965 -10.3506 -6.5c-4.2998 -9.83008 -32.1494 -73.0801 -32.1895 -73.1602
+c-3.2002 -7.16016 -16.2607 -6.09961 -11.2803 5.33008c8.26953 18.9902 16.6504 37.9297 24.9795 56.8896c2.25 5.11035 -0.0996094 8.74023 -5.65918 8.75c-15.21 0.0205078 -30.4307 -0.0400391 -45.6406 0.0400391
+c-3.35938 0.0107422 -5.41016 -1.29004 -6.76953 -4.38965c-31.4307 -71.8701 -29.7803 -67.3203 -30.0098 -67.6904c-3.87012 -6.37012 -14.8604 -3.34961 -10.9502 5.60059c5.66992 13.0098 11.3701 26.0098 17.0898 39c13.5703 30.7793 27.1396 61.5596 40.7402 92.3301
+c2.54004 5.75 -0.419922 10.5801 -6.66016 10.5898c-14.2402 0.0302734 -28.4805 -0.0498047 -42.7197 0.0498047c-4.26074 0.0302734 -6.84082 -1.76953 -8.54004 -5.65039c-12.8604 -29.3896 -25.8203 -58.7295 -38.75 -88.0791
+c-8.62012 -19.5605 -17.2305 -39.1201 -25.8906 -58.6602c-1.58008 -3.55078 -1.47949 -6.78027 1.20996 -9.73047c11.2207 -12.3096 22.4707 -24.6094 33.6807 -36.9395c2.08984 -2.30078 4.58984 -3.4502 7.71973 -3.4502c45.9395 0.0195312 91.8701 0.00976562 137.81 0
+c3.86035 0 6.37988 1.78027 7.91992 5.29004c10.3203 23.5 20.7607 46.9395 30.9502 70.5c2.08984 4.83008 5.21973 6.75 10.3398 6.71973c23.0205 -0.110352 46.0303 -0.0400391 69.0508 -0.0498047c6.0791 0 10.5293 2.72949 12.9697 8.24023
+c15.2598 34.4795 30.4502 68.9893 45.6299 103.5z" />
+    <glyph glyph-name="replyd" unicode="&#xf3e6;" 
+d="M320 -32h-192c-70.4004 0 -128 57.5996 -128 128v192c0 70.4004 57.5996 128 128 128h192c70.4004 0 128 -57.5996 128 -128v-192c0 -70.4004 -57.5996 -128 -128 -128zM193.4 174.8c-6.10059 2 -11.6006 3.10059 -16.4004 3.10059
+c-7.2002 0 -13.5 -1.90039 -18.9004 -5.60059c-5.39941 -3.7002 -9.59961 -9 -12.7998 -15.7998h-1.09961l-4.2002 18.2998h-28v-138.899h36.0996v89.6992c1.5 5.40039 4.40039 9.80078 8.7002 13.2002c4.2998 3.40039 9.7998 5.10059 16.2002 5.10059
+c4.59961 0 9.7998 -1 15.5996 -3.10059zM308.6 71.4004c-3.19922 -2.40039 -7.69922 -4.80078 -13.6992 -7.10059s-12.8008 -3.5 -20.4004 -3.5c-12.2002 0 -21.0996 3 -26.5 8.90039c-5.5 5.89941 -8.5 14.7002 -9 26.3994h83.2998
+c0.900391 4.80078 1.60059 9.40039 2.10059 13.9004c0.5 4.40039 0.699219 8.59961 0.699219 12.5c0 10.7002 -1.59961 19.7002 -4.69922 26.9004c-3.2002 7.19922 -7.30078 13 -12.5 17.1992c-5.2002 4.30078 -11.1006 7.30078 -17.8008 9.2002
+c-6.69922 1.7998 -13.5 2.7998 -20.5996 2.7998c-21.0996 0 -37.5 -6.09961 -49.2002 -18.2998s-17.5 -30.5 -17.5 -55c0 -22.7998 5.2002 -40.7002 15.6006 -53.7002c10.3994 -13.0996 26.7998 -19.5996 49.1992 -19.5996c10.7002 0 20.9004 1.5 30.4004 4.59961
+c9.5 3.10059 17.0996 6.80078 22.5996 11.2002zM286.8 141.7c3.7998 -5.40039 5.2998 -13.1006 4.60059 -23.1006h-51.7002c0.899414 9.40039 3.7002 17 8.2002 22.6006c4.5 5.59961 11.5 8.5 21 8.5c8.19922 0.0996094 14.0996 -2.60059 17.8994 -8zM366.7 139.2
+c4.09961 -3.90039 9.39941 -5.7998 16.0996 -5.7998c7 0 12.6006 1.89941 16.7002 5.7998c4.09961 3.89941 6.09961 9.09961 6.09961 15.5996s-2 11.6006 -6.09961 15.4004s-9.59961 5.7002 -16.7002 5.7002c-6.7002 0 -12 -1.90039 -16.0996 -5.7002
+c-4.10059 -3.7998 -6.10059 -8.90039 -6.10059 -15.4004s2 -11.7002 6.10059 -15.5996zM366.7 38.7002c4.09961 -3.90039 9.39941 -5.7998 16.0996 -5.7998c7 0 12.6006 1.89941 16.7002 5.7998c4.09961 3.89941 6.09961 9.09961 6.09961 15.5996
+s-2 11.6006 -6.09961 15.4004s-9.59961 5.7002 -16.7002 5.7002c-6.7002 0 -12 -1.90039 -16.0996 -5.7002c-4.10059 -3.7998 -6.10059 -8.90039 -6.10059 -15.4004c0 -6.59961 2 -11.7002 6.10059 -15.5996z" />
+    <glyph glyph-name="resolving" unicode="&#xf3e7;" horiz-adv-x="496" 
+d="M281.2 169.8l-197.9 -57.2002l-28.5996 98.6006l188.2 54.0996c52.6992 15.2998 65 8.10059 71.0996 -12.7998l11.2002 -39.2998c5.59961 -19.9004 2 -30.1006 -44 -43.4004zM248.5 440c137 0 248.5 -111.4 247.5 -247.7c0 -136.899 -111.5 -248.3 -248.5 -248.3
+c-46 0 -89.5 12.7002 -126.3 34.7002l-23 80.2002l286.8 -37.3008l48.0996 13.3008l-9.69922 34.1992l-220.4 27.1006l92.5996 26.5996c30.2002 8.7002 42 15.7998 61.4004 33.2002c24.5 23 31.7002 45.5 23.5 73.5996l-10.7002 37.8008
+c-8.7002 30.1992 -25.0996 49.0996 -61.3994 55.1992c-25.1006 3.5 -44.5 2 -79.3008 -8.19922l-221.899 -63.9004c26 108.8 124.2 189.5 241.3 189.5zM38.2998 59.4004c-24 38.3994 -38.2998 83.2998 -38.2998 131.8z" />
+    <glyph glyph-name="rocketchat" unicode="&#xf3e8;" horiz-adv-x="576" 
+d="M284.046 223.2c0.0341797 0 0.0664062 -0.00195312 0.100586 -0.00195312c18.8496 0 34.1592 -15.2754 34.2168 -34.1113c0 -18.8281 -15.2822 -34.1143 -34.1104 -34.1143s-34.1143 15.2861 -34.1143 34.1143c0 18.7588 15.1748 34.002 33.9072 34.1133zM173.596 223.2
+c0.0332031 0 0.0673828 -0.00195312 0.100586 -0.00195312c18.8496 0 34.1592 -15.2754 34.2168 -34.1113c0 -18.8281 -15.2822 -34.1143 -34.1104 -34.1143s-34.1143 15.2861 -34.1143 34.1143c0 18.7588 15.1748 34.002 33.9072 34.1133zM394.519 223.2
+c0.0351562 0 0.0683594 -0.00195312 0.102539 -0.00195312c18.8496 0 34.1592 -15.2754 34.2148 -34.1113c0 -18.8281 -15.2822 -34.1143 -34.1104 -34.1143s-34.1133 15.2861 -34.1133 34.1143c0 18.7588 15.1738 34.002 33.9062 34.1133zM548.326 278.519
+c17.3076 -26.9443 26.0674 -55.9189 26.0898 -86.9395c0 -30.209 -8.76074 -59.2021 -26.0703 -86.125c-15.5342 -24.1934 -37.3076 -45.5703 -64.6787 -63.6191c-52.8672 -34.8164 -122.354 -53.9746 -195.667 -53.9746
+c-0.150391 -0.000976562 0.0664062 -0.00585938 -0.0830078 -0.00585938c-24.5488 0 -48.5908 2.18359 -71.9443 6.36621c-14.8564 -14.2842 -31.3604 -26.5059 -49.5098 -36.5889c-66.7744 -33.3467 -125.6 -20.9092 -155.324 -10.2002
+c-5.54492 1.96289 -9.51758 7.25488 -9.51758 13.4697c0 3.82715 1.50879 7.30469 3.96289 9.87109c20.9619 21.6748 55.6416 64.5342 47.1162 103.49c-33.1426 33.9004 -51.1123 74.7764 -51.1123 118.148c0 42.5605 17.9697 83.4365 51.1123 117.337
+c8.52148 38.9521 -26.1582 81.7939 -47.1201 103.47c-2.45996 2.56738 -3.97656 6.0498 -3.97656 9.88281c0 6.21973 3.98047 11.5156 9.53125 13.4785c29.7246 10.71 88.5488 23.1211 155.302 -10.2109c18.1504 -10.0811 34.6553 -22.3027 49.5107 -36.5879
+c23.3457 4.18066 47.0137 6.35742 71.5547 6.35742c0.15918 0 0.318359 -0.000976562 0.476562 -0.000976562c73.293 0 142.78 -19.1826 195.666 -54c27.3711 -18.0479 49.1465 -39.4453 64.6816 -63.6182zM284.987 38.0996c128.612 0 232.866 67.376 232.866 150.487
+c0 83.0957 -104.274 150.469 -232.866 150.469c-128.593 0 -232.847 -67.3691 -232.847 -150.469c0 -36.2002 19.7861 -69.4375 52.7783 -95.4004c9.28809 -29.5986 3.84668 -62.958 -16.3252 -100.078c-0.960938 -1.79297 -1.8584 -3.58496 -2.8418 -5.35645
+c18.6367 1.63574 36.5557 6.875 52.5225 14.8701c13.5889 7.65625 25.9609 16.8633 37.1377 27.585l20.1289 19.3926c28.2617 -7.47852 57.8037 -11.501 88.4033 -11.501c0.347656 0 0.695312 0 1.04297 0.000976562z" />
+    <glyph glyph-name="rockrms" unicode="&#xf3e9;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM405.4 20.5l-101.5 118.9s73.5996 0.199219 74.1992 0.199219c29.6006 -1.09961 46.6006 33.3008 27.6006 56.1006l-157.7 185.1c-13.2002 17.2998 -40.0996 18.4004 -54.5 0
+l-147.1 -172.5h90l84.2998 98.9004l84.5996 -99.2998h-75.2998c-30.5 0 -44.5 -35.7002 -26.5996 -56.1006l112 -131.3h90z" />
+    <glyph glyph-name="schlix" unicode="&#xf3ea;" 
+d="M350.5 290.3l-54.2002 46.1006l73.4004 39l78.2998 -44.2002zM192 325.9l45.7002 28.1992l34.7002 -34.5996l-55.4004 -29zM126.9 319.3l31.8994 22.1006l17.2002 -28.4004l-36.7002 -22.5zM103.6 231.1l-8.7998 34.8008l29.6006 18.2998l13.0996 -35.2998z
+M82.4004 314.8l23.8994 18.1006l8.90039 -24l-26.7002 -18.3008zM59 241.5l-3.59961 28.4004l22.2998 15.5l6.09961 -28.7002zM28.4004 224.9l20.7998 12.7998l3.2998 -33.4004l-22.9004 -12zM1.40039 180l19.1992 10.2002l0.400391 -38.2002l-21 -8.7998zM60.5 120.7
+l-28.2998 -8.2998l-1.60059 46.7998l25.1006 10.7002zM99 184.8l-31.0996 -13l-5.2002 40.7998l27.3994 14.4004zM123.2 71l-41.6006 -5.90039l-8.09961 63.5l35.2002 10.8008zM151.7 210.9l21.2002 -57.1006l-46.2002 -13.5996l-13.7002 54.0996zM237.4 -19.5996
+l-70.9004 3.2998l-24.2998 95.7998l55.2002 8.59961zM152.5 260.1l42.2002 22.4004l28 -45.9004l-50.7998 -21.2998zM193.5 165.2l61.2998 18.7002l52.7998 -86.6006l-79.7998 -11.2998zM244.9 250.8l67.2998 28.7998l65.5 -65.3994l-88.6006 -26.2002z" />
+    <glyph glyph-name="searchengin" unicode="&#xf3eb;" horiz-adv-x="460" 
+d="M220.6 317.7l-67.1992 -209.3v130.3l-54.7002 -24.2002l54.7002 190.3v-115.3zM137.4 414.4l-1.30078 -4.7002l-15.1992 -52.9004c-40.3008 -15.5 -68.9004 -54.5996 -68.9004 -100.3c0 -52.2998 34.2998 -95.9004 83.4004 -105.5v-53.5996
+c-77.9004 10.5 -135.4 78.1992 -135.4 159c0 80.5 59.7998 147.199 137.4 158zM448.8 -32.7998c-11.2002 -11.2002 -23.0996 -12.2998 -28.5996 -10.5c-5.40039 1.7998 -27.1006 19.8994 -60.4004 44.3994c-33.2998 24.6006 -33.5996 35.7002 -43 56.7002
+c-9.39941 20.9004 -30.3994 42.6006 -57.5 52.4004l-9.7002 14.7002c-24.6992 -16.9004 -53 -26.9004 -81.2998 -28.7002l2.10059 6.59961l15.8994 49.5c46.5 11.9004 80.9004 54 80.9004 104.2c0 54.5 -38.4004 102.1 -96 107.1v52.1006
+c83.2002 -5.10059 148.8 -74.5 148.8 -159.3c0 -33.6006 -11.2002 -64.7002 -29 -90.4004l14.5996 -9.59961c9.80078 -27.1006 31.5 -48 52.4004 -57.4004s32.2002 -9.7002 56.7998 -43c24.6006 -33.2002 42.7002 -54.9004 44.5 -60.2998
+c1.7998 -5.40039 0.700195 -17.2998 -10.5 -28.5zM438.9 -14.9004c0 4.40039 -3.60059 8 -8 8c-4.40039 0 -8 -3.59961 -8 -8c0 -4.39941 3.59961 -8 8 -8c4.39941 0 8 3.60059 8 8z" />
+    <glyph glyph-name="servicestack" unicode="&#xf3ec;" horiz-adv-x="496" 
+d="M88 232c81.7002 -10.2002 273.7 -102.3 304 -232h-392c99.5 8.09961 184.5 137 88 232zM120 384c102.8 -15.5 335.3 -167.9 376 -384h-96c-26.2998 126.7 -150.7 216.7 -233.6 250.4c1.2998 49.6992 -14.1006 98 -46.4004 133.6z" />
+    <glyph glyph-name="sistrix" unicode="&#xf3ee;" 
+d="M448 -1l-30.5 -31l-146 148.1c-28.7002 -23.6992 -65.2002 -37.8994 -105 -37.8994c-91.7998 0 -166.5 75.7998 -166.5 168.899c0 93.1006 74.7002 168.9 166.6 168.801c91.8008 0 166.5 -75.8008 166.5 -168.9c0 -37 -11.8994 -71.2998 -31.8994 -99.2002zM166.5 117.2
+c70.7002 0 128.1 58.2998 128.1 129.899c0 71.6006 -57.5 129.9 -128.1 129.9s-128.1 -58.2998 -128.1 -129.9c0 -71.5996 57.5 -129.899 128.1 -129.899z" />
+    <glyph glyph-name="slack-hash" unicode="&#xf3ef;" 
+d="M446.2 177.6c6.2002 -19 -3.90039 -39.6992 -22.9004 -45.6992l-45.3994 -15.1006l15.6992 -47c6.10059 -19.0996 -3.89941 -39.7002 -23 -45.8994c-21.2998 -6.10059 -40.0996 6 -46 22.8994l-15.6992 47l-93.6006 -31.2998l15.7002 -47
+c6.09961 -19.0996 -3.90039 -39.7002 -23 -45.9004c-21.2998 -6.09961 -40.0996 6 -46 22.9004l-15.7002 47c-45.7002 -15.2002 -50.8994 -17.7998 -57.7002 -16.7998c-14.5 0.599609 -28.5996 10.0996 -33.5996 24.5996c-6.09961 19 4 39.7002 23 45.9004l45.4004 15.0996
+l-30.3008 90c-45.6992 -15.2002 -50.8994 -17.7998 -57.6992 -16.7998c-14.5 0.599609 -28.6006 10.0996 -33.6006 24.5996c-6.09961 19.1006 3.90039 39.7002 23 45.9004l45.2998 15l-15.6992 47c-6.10059 19.0996 3.89941 39.7002 23 45.9004
+c19.0996 6.19922 39.7998 -3.90039 46 -22.9004l15.6992 -47l93.4004 31.2002l-15.7002 47c-6.09961 19.0996 3.90039 39.7002 23 45.8994c19.1006 6.2002 39.7998 -3.89941 46 -22.8994l15.7002 -47l45.4004 15.0996c19.0996 6.2002 39.7998 -3.89941 46 -22.8994
+c6.09961 -19.1006 -3.90039 -39.7002 -23 -45.9004l-45.4004 -15.0996l30.2998 -90l45.4004 15.0996c19.0996 6.2002 39.7998 -3.90039 46 -22.9004zM192.1 130.4l93.5 31.2998l-30.2998 90.2002l-93.5 -31.3008z" />
+    <glyph glyph-name="speakap" unicode="&#xf3f3;" 
+d="M64 56.2197c-79.4102 88.1904 -72 224.36 16.6396 304.141c88.6406 79.7793 224.801 73 304.21 -15.2402c79.4102 -88.2402 72 -224.36 -16.6396 -304.14c-18.7402 -16.8701 64 -43.0908 42 -52.2607c-82.0596 -34.21 -253.91 -35 -346.229 67.5h0.0195312z
+M277.31 267.82l38.5 40.8594c-9.60938 8.89062 -32 26.8301 -76.1699 27.6006c-52.3301 0.910156 -95.8594 -28.2998 -96.7695 -80c-0.200195 -11.3301 0.290039 -36.7207 29.4199 -54.8301c34.46 -21.4199 86.5195 -21.5098 86 -52.2598
+c-0.370117 -21.2803 -26.4199 -25.8105 -38.5898 -25.6006c-3 0.0498047 -30.2305 0.459961 -47.6104 24.6201l-40 -42.6104c28.1602 -27 59 -32.6191 83.4902 -33.0498c10.2295 -0.179688 96.4199 -0.330078 97.8398 81
+c0.280273 15.8105 -2.07031 39.7197 -28.8604 56.5898c-34.3594 21.6406 -85 19.4502 -84.4297 49.75c0.410156 23.25 31 25.3701 37.5303 25.2607c0.429688 0 26.6201 -0.260742 39.6201 -17.3701z" />
+    <glyph glyph-name="staylinked" unicode="&#xf3f5;" horiz-adv-x="440" 
+d="M382.7 155.5l44.2998 -41.2998c3.7002 -3.5 3.2998 -9 -0.700195 -12.2002l-198 -163.9c-9.89941 -7.59961 -17.2998 -0.799805 -17.2998 -0.799805l-208.7 196.101c-3.5 3.5 -3 9 1.2002 12.1992l45.7998 34.9004c4.2002 3.2002 10.4004 3 13.9004 -0.5l151.899 -147.5
+c3.7002 -3.5 10 -3.7002 14.2002 -0.400391l93.2002 74c4.09961 3.2002 4.5 8.7002 0.900391 12.2002l-84 81.2998c-3.60059 3.5 -9.90039 3.7002 -14 0.5l-0.100586 -0.0996094c-4.09961 -3.2002 -10.3994 -3 -14 0.5l-68.0996 64.2998
+c-3.5 3.5 -3.10059 9 1.09961 12.2002l57.2998 43.5996c4.10059 3.2002 10.3008 3 13.8008 -0.5l170 -167.3zM437.2 238.9c3.7002 -3.5 3.39941 -9 -0.700195 -12.2002l-45.7998 -35.7998c-4.10059 -3.2002 -10.4004 -3 -14.1006 0.5l-160.399 159
+c-3.60059 3.5 -9.7998 3.69922 -13.9004 0.5l-92.2002 -71.5c-4.19922 -3.30078 -4.69922 -8.7002 -1.09961 -12.2002l94.5996 -91.7998c3.7002 -3.5 10 -3.60059 14.2002 -0.400391l0.100586 0.0996094c4.19922 3.2002 10.5996 3 14.1992 -0.5l57.1006 -54.3994
+c3.7002 -3.5 3.2998 -9 -0.900391 -12.2002l-7.7002 -6l0.300781 -0.299805l-50.2002 -38.7998c-4.2002 -3.30078 -10.6006 -3.10059 -14.2998 0.399414l-171.7 165.101l-42.2998 41.6992c-3.60059 3.5 -3 9 1.19922 12.2002l206.801 162.101
+c8.2998 6.59961 14.7998 2.2998 16.2998 1.09961z" />
+    <glyph glyph-name="steam-symbol" unicode="&#xf3f6;" 
+d="M395.5 270.5c0 -33.7998 -27.5 -61 -61 -61c-33.7998 0 -61 27.2998 -61 61s27.2998 61 61 61c33.5 0 61 -27.2002 61 -61zM448 270.3c0 -63 -51 -113.8 -113.7 -113.8l-109.3 -79.7998c-4 -43 -40.5 -76.7998 -84.5 -76.7998c-40.5 0 -74.7002 28.7998 -83 67
+l-57.5 23.0996v107.3l97.2002 -39.2998c15.0996 9.2002 32.2002 13.2998 52 11.5l71 101.7c0.5 62.2998 51.5 112.8 114 112.8c62.7998 0 113.8 -51 113.8 -113.7zM203 85c0 34.7002 -27.7998 62.5 -62.5 62.5c-4.5 0 -9 -0.5 -13.5 -1.5l26 -10.5
+c25.5 -10.2002 38 -39 27.7002 -64.5c-10.2002 -25.5 -39.2002 -38 -64.7002 -27.5c-10.2002 4 -20.5 8.2998 -30.7002 12.2002c10.5 -19.7002 31.2002 -33.2002 55.2002 -33.2002c34.7002 0 62.5 27.7998 62.5 62.5zM410.5 270.3c0 42 -34.2998 76.2002 -76.2002 76.2002
+c-42.2998 0 -76.5 -34.2002 -76.5 -76.2002c0 -42.2002 34.2998 -76.2002 76.5 -76.2002c41.9004 -0.0996094 76.2002 33.9004 76.2002 76.2002z" />
+    <glyph glyph-name="sticker-mule" unicode="&#xf3f7;" horiz-adv-x="576" 
+d="M561.7 248.4c-1.2998 -0.300781 0.299805 0 0 0zM555.5 325.8c20.2002 -50.0996 20.5996 -45.2002 20.5996 -52.8994c0 -7.5 -4.09961 -11 -7.19922 -16.5c-1.5 -3 -4.60059 -7.5 -7.2002 -8c-0.400391 0 -3 -0.5 -13.4004 -2.5c-7.2002 -1 -13.3994 4.5 -14.8994 9.5
+c-1.60059 4.69922 2.7998 10.0996 -11.8008 22.8994c-10.2998 10 -21.0996 11.2998 -31.8994 17c-9.7998 5.7002 -11.9004 -1 -18 -8c-18 -22.8994 -34 -46.8994 -52 -69.7998c-11.7998 -15 -24.2002 -30.4004 -33.5 -47.4004
+c-3.90039 -6.7998 -9.5 -28.0996 -10.2998 -29.8994c-6.2002 -17.7002 -5.5 -25.7998 -16.5 -68.2998c-3.10059 -10 -5.7002 -21.4004 -8.7002 -32.4004c-2.2002 -6.7998 -7.40039 -49.2998 -0.5 -59.4004c2.09961 -3.5 8.7002 -4.5 11.2998 -8
+c0.0996094 -0.0996094 9.59961 -18.1992 9.2998 -20c0 -6.09961 -9.39941 -5.59961 -11.2998 -6.5c-4.7998 -2.89941 -3.7998 -5.89941 -6.40039 -7.39941c-5.89941 -2.90039 -32.0996 -3.2002 -36.5 0.5c-4.09961 3 -2.19922 11.8994 -1.5 15
+c2.2002 15 -2.5 7.89941 -9.7998 11.5c-3.09961 1.5 -4.09961 5.5 -4.59961 10c-0.5 1.5 -1 2.5 -1.5 3.5c-1.7002 10.7002 6.7998 33.5996 8.2002 43.3994c4.89941 23.7002 -0.700195 37.2002 1.5 46.9004c3.69922 16.2002 4.09961 3.5 4.09961 29.9004
+c-1.40039 25.8994 3.2998 36.8994 0.5 38.8994c-14.7998 0 -64.2998 -10.7002 -112.2 -2c-46.0996 8.90039 -59.3994 29 -65.3994 30.9004c-10.3008 4.5 -23.2002 -0.5 -27.3008 -7c-0.0996094 -0.100586 -35 -70.6006 -39.5996 -87.7998
+c-6.2002 -20.5 -0.5 -47.4004 4.09961 -66.8008c0 -0.0996094 4.5 -14.5996 10.3008 -19.5c2.09961 -1.5 5.09961 -2.5 7.19922 -4.5c2.80078 -2.69922 9.40039 -15.1992 9.80078 -16c2.59961 -4.5 3.59961 -8 -1.5 -10.5c-3.60059 -2 -9.30078 -2.5 -14.4004 -2.5
+c-2.59961 -0.5 -1.5 -3.5 -3.09961 -5c-2.90039 -2.7998 -20.7002 -6.09961 -29.9004 -2.5c-2.59961 1 -5.7002 3 -6.2002 5c-1.5 4 2.10059 9 -1 12.5c-4.5 2.90039 -13.0996 2 -17 12c-2.2002 5.40039 -2.59961 7.60059 -2.59961 49.4004
+c0 9.7002 -5.90039 38.7002 -8.2002 46.9004c-1.5 5.5 -1.5 11.5 0 16c0.299805 0.899414 4.09961 4.59961 4.09961 13c-1 1.5 -4.59961 0.5 -5.09961 1.5c-10.4004 80.5996 -5.90039 79 -7.7002 98.2998c-1.5 16 -10.8994 43.8994 -6.7002 64.2998
+c0.5 2.40039 3.40039 21 24.2002 38.9004c31 26.6992 48.4004 38.2998 159 11.5c1.10059 -0.400391 66.2998 -21.1006 110.7 9c15.5 11.2998 28.7998 11.2998 35.5 16c0.0996094 0.0996094 61.7002 52.0996 87 65.2998c47.2002 29.3994 69.9004 16.7002 75.0996 18
+c4.7002 1 13.4004 25.7998 17 25.7998c5.5 0 1.60059 -20.2002 3.60059 -25.9004c0.5 -2 3.59961 -5 6.2002 -5c2.2998 0 1.69922 0.800781 10.2998 5c8.39941 5.40039 14.8994 17.6006 20.5996 17c11.7002 -1.59961 -19 -41.5996 -19 -46.8994
+c0 -2 0.200195 -0.799805 4.60059 -9.5c2.59961 -5.5 4.59961 -13.5 6.19922 -20c8.30078 -29.7002 5.7002 -14.6006 13.4004 -36.9004z" />
+    <glyph glyph-name="studiovinari" unicode="&#xf3f8;" horiz-adv-x="512" 
+d="M480.3 260.3l4.2002 -28v-28l-25.0996 -44.0996l-39.8008 -78.4004l-56.0996 -67.5l-79.0996 -37.7998l-17.7002 -24.5l-7.7002 -12l-9.59961 -4s17.2998 63.5996 19.3994 63.5996c2.10059 0 20.2998 -0.699219 20.2998 -0.699219l66.7002 38.5996l-92.5 -26.0996
+l-55.8994 -36.8008l-22.8008 -28l-6.59961 -1.39941l20.7998 73.5996l6.90039 5.5l20.7002 -12.8994l88.2998 45.1992l56.7998 51.5l14.7998 68.4004l-125.399 -23.2998l15.1992 18.2002l-173.399 53.2998l81.8994 10.5l-166 122.899l114.9 -18.0996l-101.3 108
+l252.899 -126.6l-31.5 38l124.4 -74.4004l-143.3 99l18.7002 -38.4004l-49.6006 18.1006l-45.5 84.2998l194.601 -122l-42.9004 55.7998l108 -96.3994l12 8.89941l-21 16.4004l4.2002 37.7998l37.7998 10.4004l29.2002 -24.7002l11.5 -4.2002l-7 -6.2002l8.5 -12
+l-13.1006 -7.39941l-10.2998 -20.2002z" />
+    <glyph glyph-name="supple" unicode="&#xf3f9;" horiz-adv-x="640" 
+d="M640 185.5c0 -64.0996 -109 -116.1 -243.5 -116.1c-24.7998 0 -48.5996 1.7998 -71.0996 5c7.69922 -0.400391 15.5 -0.600586 23.3994 -0.600586c134.5 0 243.5 56.9004 243.5 127.101c0 29.3994 -19.0996 56.3994 -51.2002 78
+c60 -21.1006 98.9004 -55.1006 98.9004 -93.4004zM47.7002 220.1c0.0996094 -29.3994 19.2998 -56.5 51.5996 -78c-60.2002 21 -99.2002 55 -99.2998 93.3008c-0.0996094 64.0996 108.8 116.3 243.3 116.699c24.7002 0 48.5 -1.69922 71 -4.89941
+c-7.7002 0.299805 -15.3994 0.5 -23.2998 0.5c-134.5 -0.299805 -243.4 -57.4004 -243.3 -127.601zM107.9 180.2l8.7998 10.8994s8.7998 -10.0996 20.7002 -10.0996c6.5 0 12.2998 3.5 12.2998 10.0996c0 14.5 -40.2002 13.3008 -40.2002 39.9004
+c0 13.9004 12 24.0996 28.5 24.0996c10 0 25.4004 -4.69922 25.4004 -16.7998v-7.89941h-14.2002v3.89941c0 4 -5.60059 6.60059 -11.2998 6.60059c-7.2002 0 -12.5 -3.7002 -12.5 -9.10059c0 -14.5996 40.1992 -11.7002 40.1992 -39.7002
+c0 -13.5996 -10.5 -25.0996 -28.3994 -25.0996c-18.7998 0 -29.2998 13.2002 -29.2998 13.2002zM228.7 253.8h15.7002v-55c0 -18.8994 -13.3008 -31.8994 -33.4004 -31.8994c-20.2998 0 -33.7002 13 -33.7002 31.8994v55h15.7998v-54.5
+c0 -11.2002 7.10059 -17.7002 17.8008 -17.7002c10.6992 0 17.7998 6.5 17.7998 17.8008v54.3994zM263.1 168.4v72h-7.7998v13.3994h39.1006c16 0 27.1992 -11.2002 27.1992 -27.7998s-11.1992 -28.0996 -27.1992 -28.0996h-15.5v-29.5h-15.8008zM278.9 211.4h12.5996
+c8.90039 0 14 5.7998 14 14.6992c0 8.7002 -5 14.4004 -13.7002 14.4004h-12.8994v-29.0996zM335.9 168.4v72h-7.80078v13.3994h39.1006c16 0 27.2002 -11.2002 27.2002 -27.7998s-11.2002 -28.0996 -27.2002 -28.0996h-15.5v-29.5h-15.7998zM351.6 211.4h12.6006
+c9 0 14 5.7998 14 14.6992c0 8.7002 -5 14.4004 -13.7002 14.4004h-12.9004v-29.0996zM408.7 176.6h0.0996094v61.2002c0 1.60059 -0.899414 2.60059 -2.59961 2.60059h-5.2002v13.3994h15.4004c5.7998 0 8.19922 -2.5 8.19922 -8.2002v-61.1992
+c0 -1.60059 0.900391 -2.60059 2.60059 -2.60059h18.5996c1.60059 0 2.60059 0.900391 2.60059 2.60059v5.19922h14.2998v-13c0 -5.7998 -2.40039 -8.19922 -8.2002 -8.19922h-37.5996c-5.80078 0 -8.2002 2.39941 -8.2002 8.19922zM472.1 176.6h-0.0996094v63.9004h-7.7998
+v13.4004h51.5996c5.7002 0 8.2002 -2.5 8.2002 -8.2002v-13h-14.2002v5.2002c0 1.59961 -0.899414 2.59961 -2.59961 2.59961h-19.2002v-22.4004h27.7002v-13.3994h-27.7002v-20.2998c0 -1.60059 0.900391 -2.60059 2.59961 -2.60059h19.7002
+c1.60059 0 2.60059 0.900391 2.60059 2.60059v5.19922h14.2998v-13c0 -5.7998 -2.5 -8.19922 -8.2002 -8.19922h-38.7002c-5.7998 0 -8.2002 2.39941 -8.2002 8.19922zM531 252.6h-2.7002v1.2002h7v-1.2002h-2.7002v-5.89941h-1.59961v5.89941zM536.7 253.8h2.39941
+l2.10059 -5.09961l2.09961 5.09961h2.2998v-7.09961h-1.5v5.7002l-2.2998 -5.7002h-1.2998l-2.2998 5.7002v-5.7002h-1.5v7.09961z" />
+    <glyph glyph-name="telegram-plane" unicode="&#xf3fe;" 
+d="M446.7 349.4l-67.6006 -318.801c-5.09961 -22.5 -18.3994 -28.0996 -37.2998 -17.5l-103 75.9004l-49.7002 -47.7998c-5.5 -5.5 -10.0996 -10.1006 -20.6992 -10.1006l7.39941 104.9l190.9 172.5c8.2998 7.40039 -1.7998 11.5 -12.9004 4.09961l-236 -148.6
+l-101.6 31.7998c-22.1006 6.90039 -22.5 22.1006 4.59961 32.7002l397.4 153.1c18.3994 6.90039 34.5 -4.09961 28.5 -32.1992z" />
+    <glyph glyph-name="uber" unicode="&#xf402;" 
+d="M414.1 416c18.7002 0 33.9004 -15.2002 33.8008 -33.9004v-380.199c0 -18.7002 -15.2002 -33.9004 -33.9004 -33.9004h-380.1c-18.7002 0 -33.9004 15.2002 -33.9004 34v380.1c0 18.7002 15.2002 33.9004 33.9004 33.9004h380.199zM237.6 56.9004
+c74.6006 7.5 129 74.0996 121.5 148.6c-7 69.4004 -65.3994 122.2 -135.1 122.2s-128.1 -52.7998 -135.1 -122.2h94.3994v20.4004c0 3.7998 3.10059 6.7998 6.7998 6.7998h67.9004c3.7998 0 6.7998 -3.10059 6.7998 -6.7998v-67.9004
+c0 -3.7998 -3.09961 -6.7998 -6.7998 -6.7998h-67.9004c-3.7998 0 -6.7998 3.09961 -6.7998 6.7998v20.4004h-94.3994c7.5 -74.6006 74.0996 -129 148.699 -121.5z" />
+    <glyph glyph-name="uikit" unicode="&#xf403;" 
+d="M443.9 320v-256l-225.9 -128l-218 128v214.3l87.5996 -45.0996v-117l133.5 -75.5l135.801 75.5v151l-101.101 57.5996l87.6006 53.1006zM308.6 398.9l-87.3994 -53l-86 47.2998l88.5996 54.7998z" />
+    <glyph glyph-name="uniregistry" unicode="&#xf404;" horiz-adv-x="384" 
+d="M192 -32c-39.5 0 -76.2002 11.7998 -106.7 32.2002h213.5c-30.5996 -20.4004 -67.2998 -32.2002 -106.8 -32.2002zM102.9 161.1c0 -2.5 0.0996094 -5 0.299805 -7.39941h-103.101c-0.0996094 2.39941 -0.0996094 4.89941 -0.0996094 7.39941v12.4004h102.9v-12.4004z
+M123.4 104.1c8.89941 -10.5996 20.0996 -19.0996 33 -24.7998h-138.301c-3.7998 8 -7 16.2998 -9.59961 24.7998h114.9zM105.7 138.8c2 -7.89941 5.2002 -15.3994 9.2002 -22.2998h-109.7c-1.7002 7.2998 -3 14.7002 -3.90039 22.2998h104.4zM102.9 208.1v-17.2998h-102.9
+v17.2998h102.9zM102.9 381.3v-4.89941h-102.9v4.89941h102.9zM102.9 416v-2.5h-102.9v2.5h102.9zM102.9 346.7v-7.40039h-102.9v7.40039h102.9zM102.9 242.7v-14.7998h-102.9v14.7998h102.9zM102.9 312v-9.90039h-102.9v9.90039h102.9zM102.9 277.4v-12.4004h-102.9v12.4004
+h102.9zM269.1 116.5c4 6.90039 7.10059 14.4004 9.2002 22.2998h104.4c-0.799805 -7.59961 -2.10059 -15 -3.90039 -22.2998h-109.7zM281.1 302.2v9.7998h102.9v-9.7998h-102.9zM281.1 265v12.4004h102.9v-12.4004h-102.9zM281.1 339.3v7.40039h102.9v-7.40039h-102.9z
+M281.1 416h102.9v-2.5h-102.9v2.5zM78.0996 5.09961c-11.7998 8.7002 -23.5996 18.7002 -33.1992 29.7002h293.1c-9.5 -11.0996 -20.4004 -21 -32.2002 -29.7002h-227.7zM281.1 376.4v4.89941h102.9v-4.89941h-102.9zM281.1 227.9v14.7998h102.9v-14.7998h-102.9z
+M38.7998 42.2998c-6.59961 8.5 -10.5996 17.6006 -15.7998 27.2002h338.9c-5.2002 -9.59961 -11.1006 -18.7002 -17.8008 -27.2002h-305.3zM227.6 79.4004c12.8008 5.59961 24.1006 14.0996 32.9004 24.7998h115c-2.7002 -8.60059 -4.7998 -16.7998 -8.5 -24.7998h-139.4z
+M281.1 161.1v12.4004h102.9v-12.4004c0 -2.5 -0.0996094 -4.89941 -0.200195 -7.39941h-103.1c0.299805 2.39941 0.399414 4.89941 0.399414 7.39941zM281.1 190.8v17.2998h102.9v-17.2998h-102.9z" />
+    <glyph glyph-name="untappd" unicode="&#xf405;" horiz-adv-x="640" 
+d="M401.3 398.1c-79.7998 -160.1 -84.5996 -152.5 -87.8994 -173.199l-5.2002 -32.8008c-1.90039 -12 -6.60059 -23.5 -13.7002 -33.3994l-148.9 -207.8c-7.59961 -10.6006 -20.3994 -16.2002 -33.3994 -14.6006c-40.2998 5 -77.7998 32.2002 -95.2998 68.5
+c-5.7002 11.7998 -4.5 25.7998 3.09961 36.4004l148.9 207.899c7.09961 9.90039 16.3994 18 27.1992 23.7002l29.3008 15.5c18.5 9.7998 9.69922 11.9004 135.6 138.9c1 4.7998 1 7.2998 3.59961 8c3 0.700195 6.60059 1 6.30078 4.59961l-0.400391 4.60059
+c-0.200195 1.89941 1.2998 3.59961 3.2002 3.59961c4.5 0.0996094 13.2002 -1.2002 25.5996 -10c12.2998 -8.90039 16.4004 -16.7998 17.7002 -21.0996c0.599609 -1.80078 -0.599609 -3.7002 -2.40039 -4.2002l-4.5 -1.10059
+c-3.39941 -0.899414 -2.5 -4.39941 -2.2998 -7.39941c0.100586 -2.7998 -2.2998 -3.60059 -6.5 -6.10059zM230.1 411.6c-3.19922 0.800781 -8.19922 1.2002 -6.7998 5.40039c1.2998 4.2998 5.40039 12.2002 17.7002 21.0996c12.4004 8.90039 21.0996 10.1006 25.5996 10
+c4.2002 -0.0996094 3.10059 -4.89941 2.80078 -8.19922c-0.300781 -3.60059 3.2998 -3.80078 6.2998 -4.60059c2.59961 -0.700195 2.59961 -3.2998 3.59961 -8c9.10059 -9.2002 17.6006 -17.8994 25.6006 -26.0996c1.2998 -1.40039 1.19922 -3.5 -0.100586 -4.90039
+c-15.8994 -16.3994 -29.2998 -30.5996 -40.5 -42.5996c-1 -1 -2.59961 -0.799805 -3.2998 0.5c-6.90039 13.5 -14.2998 28.0996 -22.2002 44c-4.2998 2.5 -6.59961 3.2998 -6.39941 6c0.199219 3 1.09961 6.5 -2.30078 7.39941zM620 41.2998
+c7.7002 -10.7002 8.7998 -24.7002 3.40039 -36.5996c-17.7002 -36.6006 -55.4004 -63.7002 -95.7002 -68.6006c-12.9004 -1.5 -25.5 4.10059 -33.1006 14.7002l-148.899 207.9c-7.10059 9.89941 -11.7998 21.3994 -13.7002 33.3994
+c-1.59961 9.80078 -2 19.1006 -0.299805 29.8008c1.89941 12 2.7002 6 49 94.7998c0.700195 1.39941 2.59961 1.59961 3.59961 0.5c16.2998 -18 19.2998 -23 30.5 -28.9004c29.7998 -15.7002 43.2002 -20.5996 56.4004 -39.0996z" />
+    <glyph glyph-name="ussunnah" unicode="&#xf407;" horiz-adv-x="512" 
+d="M156.8 162.9l5.7002 -14.4004h-8.2002c-1.2998 3.2002 -3.09961 7.7002 -3.7998 9.5c-2.5 6.2998 -1.09961 8.40039 0 10c1.90039 2.7002 3.2002 4.40039 3.59961 5.2002c0 -2.2002 0.800781 -5.7002 2.7002 -10.2998zM454.1 144.1
+c-2.09961 -13.7998 -5.69922 -27.0996 -10.5 -39.6992l43 -23.4004l-44.7998 18.7998c-5.2998 -13.2002 -12 -25.5996 -19.8994 -37.2002l34.1992 -30.1992l-36.7998 26.3994c-8.39941 -11.7998 -18 -22.5996 -28.7002 -32.2998l24.9004 -34.7002l-28.0996 31.7998
+c-11 -9.59961 -23.1006 -18 -36.1006 -25.0996l15.7002 -37.2002l-19.2998 35.2998c-13.1006 -6.7998 -27 -12.0996 -41.6006 -15.8994l6.7002 -38.4004l-10.5 37.4004c-14.2998 -3.40039 -29.2002 -5.2998 -44.5 -5.40039l-1.7998 -38.2998l-1.90039 38.4004
+c-15.2998 0.0996094 -30.1992 2 -44.5 5.2998l-10.5996 -37.2998l6.7002 38.1992c-14.6006 3.7002 -28.6006 9.10059 -41.7002 15.8008l-19.2002 -35.1006l15.6006 37c-13 7 -25.2002 15.4004 -36.2002 25.1006l-27.9004 -31.6006l24.7002 34.4004
+c-10.7002 9.7002 -20.4004 20.5 -28.7998 32.2998l-36.5 -26.2002l33.8994 29.9004c-7.89941 11.5996 -14.5996 24.0996 -20 37.2998l-44.3994 -18.7002l42.5996 23.2002c-4.7998 12.7002 -8.39941 26.0996 -10.5 39.9004l-51 -9l50.2998 14.1992
+c-1.09961 8.5 -1.69922 17.1006 -1.69922 25.9004c0 4.7002 0.199219 9.40039 0.5 14.0996l-55.4004 2.90039l56 2.7998c1.2998 13.1006 3.7998 25.7998 7.5 38.1006l-57.0996 16.0996l58.8994 -10.4004c4 12 9.10059 23.5 15.2002 34.4004l-55.0996 30l58.2998 -24.5996
+c6.2998 10.5996 13.5 20.3994 21.5996 29.5996l-49.5 43.5996l53.9004 -38.6992c8.09961 8.59961 17 16.5 26.5996 23.5996l-40 55.5996l45.6006 -51.5996c9.5 6.59961 19.6992 12.2998 30.2998 17.2002l-27.2998 64.8994l33.7998 -62.0996
+c10.5 4.40039 21.3994 7.90039 32.7002 10.4004l-12.4004 70.6992l19.5 -69.1992c11 2.09961 22.2998 3.19922 33.7998 3.39941l3.7002 72.2002l3.59961 -72.2002c11.5 -0.200195 22.8008 -1.39941 33.8008 -3.5l19.5996 69.2998l-12.4004 -70.6992
+c11.3008 -2.60059 22.2002 -6.10059 32.6006 -10.5l33.8994 62.1992l-27.3994 -65.0996c10.5996 -4.90039 20.7002 -10.7002 30.2002 -17.2002l45.7998 51.7998l-40.1006 -55.8994c9.5 -7.10059 18.4004 -15 26.5 -23.6006l54.2002 38.9004l-49.7002 -43.9004
+c8 -9.09961 15.2002 -18.8994 21.5 -29.3994l58.7002 24.7002l-55.5 -30.2002c6.10059 -10.9004 11.1006 -22.2998 15.1006 -34.2998l59.2998 10.3994l-57.5 -16.2002c3.7002 -12.1992 6.2002 -24.8994 7.5 -37.8994l56.2998 -2.7002l-56 -2.7998
+c0.299805 -4.60059 0.5 -9.2998 0.5 -14.1006c0 -8.69922 -0.599609 -17.2998 -1.59961 -25.7998l50.6992 -14.2998zM432.3 175.1c0 97.5 -79 176.5 -176.5 176.5s-176.5 -79 -176.5 -176.5s79 -176.5 176.5 -176.5s176.5 79 176.5 176.5zM408.3 175.1
+c0 -84.2998 -68.2998 -152.6 -152.6 -152.6s-152.601 68.2998 -152.601 152.6c0 84.3008 68.3008 152.601 152.601 152.601s152.6 -68.2998 152.6 -152.601zM195 207c0 -2.09961 1.2998 -3.7998 3.59961 -5.09961c3.30078 -1.90039 6.2002 -4.60059 8.2002 -8.2002
+c2.7998 5.7002 4.2998 9.5 4.2998 11.2002c0 2.19922 -1.09961 4.39941 -3.19922 7c-2.10059 2.5 -3.2002 5.19922 -3.30078 7.69922c-6.5 -6.7998 -9.59961 -10.8994 -9.59961 -12.5996zM154.3 226c0 -2.09961 1.2998 -3.7998 3.60059 -5.09961
+c3.5 -1.90039 6.19922 -4.60059 8.19922 -8.2002c2.80078 5.7002 4.30078 9.5 4.30078 11.2002c0 2.19922 -1.10059 4.39941 -3.2002 7c-2.10059 2.5 -3.2002 5.19922 -3.2998 7.69922c-6.5 -6.7998 -9.60059 -10.8994 -9.60059 -12.5996zM135.3 226
+c0 -2.09961 1.2998 -3.7998 3.60059 -5.09961c3.2998 -1.90039 6.19922 -4.60059 8.19922 -8.2002c2.80078 5.7002 4.30078 9.5 4.30078 11.2002c0 2.19922 -1.10059 4.39941 -3.2002 7c-2.10059 2.5 -3.2002 5.19922 -3.2998 7.69922
+c-6.40039 -6.7998 -9.60059 -10.8994 -9.60059 -12.5996zM340.2 138.1c-8.40039 3 -8.7002 6.80078 -8.7002 15.6006v112.3c-8.2002 -12.5 -14.2002 -18.5996 -18 -18.5996c6.2998 -14.4004 9.5 -23.9004 9.5 -28.3008v-64.2998c0 -2.2002 -2.2002 -6.5 -4.7002 -6.5h-18
+c-2.7998 7.5 -10.2002 26.9004 -15.2998 40.2998c-2 -2.5 -7.2002 -9.19922 -10.7002 -13.6992c2.40039 -1.60059 4.10059 -3.60059 5.2002 -6.30078c2.59961 -6.69922 6.40039 -16.5 7.90039 -20.1992h-9.2002c-3.90039 10.3994 -9.60059 25.3994 -11.7998 31.0996
+c-2 -2.5 -7.2002 -9.2002 -10.7002 -13.7002c2.39941 -1.59961 4.09961 -3.59961 5.2002 -6.2998c0.799805 -2 2.7998 -7.2998 4.2998 -10.9004h-9.2002c-1.5 4.10059 -5.59961 14.6006 -8.40039 22c-2 -2.5 -7.19922 -9.19922 -10.6992 -13.6992
+c2.5 -1.60059 4.2998 -3.60059 5.19922 -6.30078c0.200195 -0.599609 0.5 -1.39941 0.600586 -1.69922h-17.7002c-4.59961 13.8994 -11.4004 27.6992 -11.4004 34.0996c0 2.2002 0.300781 5.09961 1.10059 8.2002c-8.7998 -10.7998 -14 -15.9004 -14 -25
+c0 -7.5 10.3994 -28.2998 10.3994 -33.2998c0 -1.7002 -0.5 -3.30078 -1.39941 -4.90039c-9.60059 12.7002 -15.5 20.7002 -18.7998 20.7002h-12l-11.2002 28c-3.7998 9.59961 -5.7002 16 -5.7002 18.7998c0 3.7998 0.5 7.7002 1.7002 12.2002
+c-1 -1.2998 -3.7002 -4.7002 -5.5 -7.10059c-0.799805 2.10059 -3.10059 7.7002 -4.60059 11.5c-2.09961 -2.5 -7.5 -9.09961 -11.1992 -13.5996c0.899414 -2.2998 3.2998 -8.09961 4.89941 -12.2002c-2.5 -3.2998 -9.09961 -11.7998 -13.5996 -17.7002
+c-4 -5.2998 -5.7998 -13.2998 -2.7002 -21.7998c2.5 -6.7002 2 -7.89941 -1.7002 -14.0996h61.7002c5.5 0 14.2998 -14 15.5 -22c13.2002 16 15.4004 19.5996 16.7998 21.5996h107c3.90039 0 7.2002 1.90039 9.90039 5.7998zM360.3 164.7v101.6
+c-9 -12.5 -15.8994 -18.5996 -20.7002 -18.5996c7.10059 -14.4004 10.7002 -23.9004 10.7002 -28.2998v-66.3008c0 -17.5 8.60059 -20.3994 24 -20.3994c8.10059 0 12.5 0.799805 13.7002 2.7002c-4.2998 1.59961 -7.59961 2.5 -9.90039 3.2998
+c-8.09961 3.2002 -17.7998 7.39941 -17.7998 26z" />
+    <glyph glyph-name="vaadin" unicode="&#xf408;" 
+d="M224.5 307.3c1.5 17.6006 4.90039 52.7002 49.7998 52.7002h98.6006c20.6992 0 32.0996 7.7998 32.0996 21.5996v12.3008c0 12.1992 9.2998 22.0996 21.5 22.0996s21.5 -9.90039 21.5 -22.0996v-36.5c0 -42.9004 -21.5 -62 -66.7998 -62h-100.5
+c-30.1006 0 -33 -14.7002 -33 -27.1006c0 -1.2998 -0.100586 -2.5 -0.200195 -3.7002c-0.700195 -12.2998 -10.9004 -22.1992 -23.4004 -22.1992s-22.6992 9.7998 -23.3994 22.1992c-0.100586 1.2002 -0.200195 2.40039 -0.200195 3.7002c0 12.2998 -3 27.1006 -33 27.1006
+h-100.7c-45.2998 0 -66.7998 19.0996 -66.7998 62v36.5c0 12.1992 9.40039 22.0996 21.5996 22.0996c12.2002 0 21.5 -9.90039 21.5 -22.0996v-12.3008c0 -13.7998 11.4004 -21.5996 32.1006 -21.5996h98.5996c44.7998 0 48.2998 -35.0996 49.7998 -52.7002h0.900391z
+M224 -8c-11.5 0 -21.4004 7 -25.7002 16.2998c-1.09961 1.7998 -97.0996 169.5 -98.2002 171.4c-11.8994 19.7002 3.2002 44.2998 27.2002 44.2998c13.9004 0 23.4004 -6.40039 29.7998 -20.2998l66.9004 -117.7l66.9004 117.7c6.5 13.8994 15.8994 20.2998 29.7998 20.2998
+c24 0 39.0996 -24.7002 27.2002 -44.2998c-1.10059 -1.7998 -97.1006 -169.601 -98.2002 -171.4c-4.2998 -9.2998 -14.2002 -16.2998 -25.7002 -16.2998z" />
+    <glyph glyph-name="viber" unicode="&#xf409;" horiz-adv-x="512" 
+d="M444 398.1c42.2002 -36.6992 65.5996 -117.899 49.7998 -246.5c-15.2002 -124.6 -109.1 -136.6 -125.7 -142c-7.19922 -2.2998 -70.2998 -18.0996 -152.5 -11.1992c-9.09961 -10.5 -21.0996 -24.3008 -29.7998 -33.7002
+c-15.8994 -17.1006 -25.7002 -33 -42.2998 -27.7998c-13.7998 4.19922 -13 25.0996 -13 25.0996l0.0996094 51.5996h-0.0996094c-120.1 33.8008 -118.4 158.4 -117 224.9s14.2998 120.2 50.9004 156.8c65.7998 60.4004 200.899 52.2998 200.899 52.2998
+c114.601 -0.5 166 -37.7998 178.7 -49.5zM457.9 161c13.2998 107.3 -4.90039 180.5 -40.6006 211.1c-10.7998 9.80078 -57.2002 39 -154.1 39.4004c0 0 -114.7 7.5 -170.4 -43c-31 -30.5996 -41.5 -76.0996 -42.5996 -131.6
+c-1.10059 -55.5 -7.10059 -161.601 94.7002 -189.801c-0.100586 0 -0.100586 0 0 0c0 0 -0.400391 -78.7998 -0.400391 -85.6992c-0.0996094 -10.5 5.7002 -11 11 -5.7002c16.2002 16.2998 68.2002 79 68.2002 79c69.7002 -4.5 125.2 9.2998 131.2 11.2002
+c14 4.5 90.0996 11.0996 103 115.1zM318.9 241.8c0.399414 -8.59961 -12.5 -9.2002 -12.9004 -0.599609c-1.09961 22 -11.4004 32.7002 -32.5996 33.8994c-8.60059 0.5 -7.80078 13.4004 0.699219 12.9004c27.9004 -1.5 43.4004 -17.5 44.8008 -46.2002zM339.2 230.5
+c1 42.4004 -25.5 75.5996 -75.7998 79.2998c-8.5 0.600586 -7.60059 13.5 0.899414 12.9004c58 -4.2002 88.9004 -44.1006 87.7998 -92.5c-0.0996094 -8.60059 -13.0996 -8.2002 -12.8994 0.299805zM386.2 217.1c0.0996094 -8.59961 -12.9004 -8.69922 -12.9004 -0.0996094
+c-0.599609 81.5 -54.8994 125.9 -120.8 126.4c-8.5 0.0996094 -8.5 12.8994 0 12.8994c73.7002 -0.5 133 -51.3994 133.7 -139.2zM374.9 119v-0.200195c-10.8008 -19 -31 -40 -51.8008 -33.2998l-0.199219 0.299805c-21.1006 5.90039 -70.8008 31.5 -102.2 56.5
+c-16.2002 12.7998 -31 27.9004 -42.4004 42.4004c-10.2998 12.8994 -20.7002 28.2002 -30.7998 46.5996c-21.2998 38.5 -26 55.7002 -26 55.7002c-6.7002 20.7998 14.2002 41 33.2998 51.7998h0.200195c9.2002 4.7998 18 3.2002 23.9004 -3.89941
+c0 0 12.3994 -14.8008 17.6992 -22.1006c5 -6.7998 11.7002 -17.7002 15.2002 -23.7998c6.10059 -10.9004 2.2998 -22 -3.7002 -26.5996l-12 -9.60059c-6.09961 -4.89941 -5.2998 -14 -5.2998 -14s17.7998 -67.2998 84.2998 -84.2998c0 0 9.10059 -0.799805 14 5.2998
+l9.60059 12c4.59961 6 15.7002 9.7998 26.5996 3.7002c14.7002 -8.2998 33.4004 -21.2002 45.7998 -32.9004c7 -5.69922 8.60059 -14.3994 3.80078 -23.5996z" />
+    <glyph glyph-name="vimeo" unicode="&#xf40a;" 
+d="M403.2 416c24.7002 0 44.7998 -20.0996 44.7998 -44.7998v-358.4c0 -24.7002 -20.0996 -44.7998 -44.7998 -44.7998h-358.4c-24.7002 0 -44.7998 20.0996 -44.7998 44.7998v358.4c0 24.7002 20.0996 44.7998 44.7998 44.7998h358.4zM377 267.2
+c1.90039 42.2002 -13.7998 63.7998 -47.0996 64.7002c-44.9004 1.39941 -75.3008 -23.9004 -91.2002 -76c19.8994 8.5 49.2998 10.7998 45.7998 -22.4004c-1 -11.2002 -8.2998 -27.5 -21.7998 -48.9004c-37.7002 -59.3994 -46.9004 -39.5996 -67.6006 91.6006
+c-5.7998 36.8994 -21.2998 54.0996 -46.5 51.7002c-22.2998 -2 -57.8994 -38.4004 -95.1992 -71.2002l15.1992 -19.6006c14.5 10.1006 23 15.2002 25.4004 15.2002c21 0 31.9004 -54.7002 57.4004 -148c13.0996 -34.8994 29 -52.2998 47.8994 -52.2998
+c30.4004 0 67.7002 28.5996 111.7 85.7998c42.5996 54.7002 64.5996 97.9004 66 129.4z" />
+    <glyph glyph-name="vnv" unicode="&#xf40b;" horiz-adv-x="640" 
+d="M104.9 96c-34.1006 0 -46.4004 30.4004 -46.4004 30.4004l-55.9004 111.5s-10.3994 18.0996 10.4004 18.0996h32.7998c10.4004 0 13.2002 -8.7002 18.7998 -18.0996l36.7002 -74.5s5.2002 -13.1006 21.1006 -13.1006c15.8994 0 21.0996 13.1006 21.0996 13.1006
+l36.7002 74.5c5.59961 9.5 8.39941 18.0996 18.7998 18.0996h32.7998c20.7998 0 10.4004 -18.0996 10.4004 -18.0996l-55.7998 -111.5s-12.2002 -30.4004 -46.4004 -30.4004h-35.0996zM499.9 96c-34.1006 0 -46.4004 30.4004 -46.4004 30.4004l-55.9004 111.5
+s-10.3994 18.0996 10.4004 18.0996h32.7998c10.4004 0 13.2002 -8.7002 18.7998 -18.0996l36.7002 -74.5s5.2002 -13.1006 21.1006 -13.1006c15.8994 0 21.0996 13.1006 21.0996 13.1006l36.7998 74.5c5.60059 9.5 8.40039 18.0996 18.7998 18.0996h32.9004
+c20.7998 0 10.4004 -18.0996 10.4004 -18.0996l-55.9004 -111.5s-12.2002 -30.4004 -46.4004 -30.4004h-35.1992zM337.6 256c34.1006 0 46.4004 -30.4004 46.4004 -30.4004l55.9004 -111.5s10.3994 -18.0996 -10.4004 -18.0996h-32.7998
+c-10.4004 0 -13.2002 8.7002 -18.7998 18.0996l-36.7002 74.5s-5.2002 13.1006 -21.1006 13.1006c-15.8994 0 -21.0996 -13.1006 -21.0996 -13.1006l-36.7002 -74.5c-5.59961 -9.39941 -8.39941 -18.0996 -18.7998 -18.0996h-32.9004
+c-20.7998 0 -10.3994 18.0996 -10.3994 18.0996l55.8994 111.5s12.2002 30.4004 46.4004 30.4004h35.0996z" />
+    <glyph glyph-name="whatsapp-square" unicode="&#xf40c;" 
+d="M224 325.2c35.2002 0 68.2002 -13.7002 93.2002 -38.7002c24.8994 -24.9004 40.0996 -58 40.0996 -93.2002c0 -72.7002 -60.7002 -131.8 -133.3 -131.8h-0.0996094c-23.7002 0 -46.9004 6.40039 -67.1006 18.4004l-4.7998 2.89941l-49.9004 -13.0996l13.3008 48.5996
+l-3.10059 5c-13.2002 20.9004 -20.2002 45.2002 -20.2002 70.1006c0.100586 72.6992 59.2002 131.8 131.9 131.8zM301.5 136.8c3.2998 9.2002 3.2998 17.2002 2.40039 19.1006c-1 1.59961 -3.60059 2.59961 -7.60059 4.59961s-23.5 11.5996 -27.0996 12.9004
+c-3.60059 1.2998 -6.2998 2 -8.90039 -2c-2.59961 -3.90039 -10.2002 -12.9004 -12.5 -15.5c-2.2998 -2.7002 -4.59961 -3 -8.59961 -1c-23.2998 11.6992 -38.6006 20.7998 -53.9004 47.0996c-4.09961 7 4 6.40039 11.6006 21.5996
+c1.39941 2.60059 0.699219 4.90039 -0.300781 6.90039s-8.89941 21.5 -12.1992 29.4004c-3.2002 7.69922 -6.5 6.69922 -8.90039 6.7998c-2.2998 0.0996094 -5 0.0996094 -7.59961 0.0996094c-2.7002 0 -7 -1 -10.6006 -5c-3.7002 -4 -13.8994 -13.5996 -13.8994 -33.0996
+s14.1992 -38.4004 16.1992 -41c2 -2.60059 28 -42.6006 67.7002 -59.7998c25.1006 -10.8008 34.9004 -11.8008 47.5 -9.90039c7.60059 1.09961 23.4004 9.5 26.7002 18.7998zM400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48
+v352c0 26.5 21.5 48 48 48h352zM223.9 34.7998c87.3994 0 160.1 71.1006 160.1 158.5c0 42.4004 -18 82.2002 -47.9004 112.2c-30 30 -69.7998 46.5 -112.199 46.5c-87.4004 0 -158.5 -71.0996 -158.601 -158.5c0 -28 7.2998 -55.2998 21.2002 -79.2998l-22.5 -82.2002
+l84.0996 22.0996c23.1006 -12.5996 49.2002 -19.2998 75.8008 -19.2998z" />
+    <glyph glyph-name="whmcs" unicode="&#xf40d;" 
+d="M448 287l-29.0996 -7l-2.2002 -12.0996l20.8994 -18.8008l-10.2998 -20.0996l-28.7998 8.7998l-7.7998 -8.09961l8.7998 -28l-20.4004 -12.1006l-20.6992 21.6006l-11.6006 -3.5l-6.7002 -28.7998l-22.5996 0.299805l-6.7002 28.5l-11.5996 2.89941l-19.4004 -20.3994
+l-19.8994 11.5996l8.09961 26.9004l-7.2002 8.59961l-29.5996 -7.5l-10.4004 18.5l20.1006 19.9004l-2.40039 12.0996l-28.7998 7.5l0.299805 21.7002l28.5 7.7998l2.90039 10.4004l-20.7002 21l11 19.0996l28.5 -7.5l8.09961 8.40039l-8.09961 27.7002l19.3994 11
+l19.7002 -21l12.1006 3.19922l6.19922 26.4004h22.6006l7 -26.4004l10.7002 -3.19922l21.2998 21l19.0996 -11.6006l-7.5 -28.2002l7.2002 -7.5l29 7.5l10.4004 -19.3994l-20.1006 -20.7002l2.2002 -10.4004l28.5 -8.7998v-21.2998zM328.8 241.8
+c31.4004 0 56.7998 25.2998 56.7998 56.7998c0 31.4004 -25.3994 56.8008 -56.7998 56.8008c-31.3994 0 -56.7998 -25.4004 -56.7998 -56.8008c0 -31.3994 25.5 -56.7998 56.7998 -56.7998zM401.1 225.4l46.9004 -14.5v-39.9004l-55.0996 -13.4004l-4.10059 -22.6992
+l38.9004 -35.3008l-19.2002 -37.8994l-54 16.7002l-14.5996 -15.2002l16.6992 -52.5l-38.2998 -22.7002l-38.8994 40.5l-21.7002 -6.59961l-12.6006 -54l-42.3994 0.5l-12.6006 53.5996l-21.6992 5.59961l-36.4004 -38.3994l-37.4004 21.7002l15.2002 50.5l-13.7002 16.0996
+l-55.5 -14.0996l-19.6992 34.7998l37.8994 37.3994l-4.7998 22.8008l-54 14.0996l0.5 40.9004l53.5 14.6992l5.7002 19.7002l-38.9004 39.4004l20.7002 35.7998l53.5996 -14.0996l15.2002 15.6992l-15.2002 52l36.4004 20.7002l36.7998 -39.3994l22.7002 6.09961l11.5996 52
+h42.4004l11.5996 -45.9004l-22.5996 5.90039l-6.2998 1.7002l-3.2998 -5.7002l-11 -19.0996l-3.30078 -5.60059l4.60059 -4.59961l17.2002 -17.4004l-0.300781 -1l-23.7998 -6.5l-6.2002 -1.7002l-0.0996094 -6.39941l-0.200195 -12.9004
+c-47.5 -10.3994 -83.2998 -52.7998 -83.2998 -103.5c0 -58.2998 47.2998 -105.7 105.7 -105.7c50.5 0 92.7002 35.4004 103.2 82.8008l13.1992 -0.200195l6.90039 -0.100586l1.59961 6.7002l5.60059 24l1.89941 0.600586l17.1006 -17.8008l4.7002 -4.89941l5.7998 3.39941
+l20.3994 12.1006l5.80078 3.5l-2 6.5z" />
+    <glyph glyph-name="wordpress-simple" unicode="&#xf411;" horiz-adv-x="512" 
+d="M256 440c136.7 0 248 -111.2 248 -248c0 -136.7 -111.3 -248 -248 -248s-248 111.3 -248 248c0 136.8 111.3 248 248 248zM33 192c0 -88.2002 51.2998 -164.5 125.7 -200.7l-106.4 291.4c-12.3994 -27.7002 -19.2998 -58.4004 -19.2998 -90.7002zM256 -31
+c26 0 50.9004 4.5 74 12.5996c-0.599609 1 -1.09961 2 -1.59961 3.10059l-68.5 187.8l-66.9004 -194.4c20 -5.89941 41.0996 -9.09961 63 -9.09961zM286.7 296.5l80.7002 -239.6l22.1992 74.2998c9.7002 30.8994 17 53 17 72.0996c0 27.6006 -9.89941 46.7002 -18.3994 61.5
+c-11.2998 18.4004 -21.9004 33.9004 -21.9004 52.2998c0 20.5 15.5 39.6006 37.4004 39.6006c1 0 1.89941 -0.100586 2.89941 -0.200195c-39.6992 36.2998 -92.5996 58.5 -150.6 58.5c-77.9004 0 -146.4 -40 -186.3 -100.5
+c5.2998 -0.200195 10.2002 -0.299805 14.3994 -0.299805c23.3008 0 59.4004 2.7998 59.4004 2.7998c12 0.700195 13.4004 -17 1.40039 -18.4004c0 0 -12.1006 -1.39941 -25.5 -2.09961l81.1992 -241.5l48.8008 146.3l-34.7002 95.2002
+c-12 0.700195 -23.4004 2.09961 -23.4004 2.09961c-12 0.700195 -10.5996 19.1006 1.40039 18.4004c0 0 36.7998 -2.7998 58.7002 -2.7998c23.2998 0 59.3994 2.7998 59.3994 2.7998c12 0.700195 13.4004 -17 1.40039 -18.4004c0 0 -12.1006 -1.39941 -25.5 -2.09961z
+M368.1 -0.700195c66.3008 38.6006 110.9 110.4 110.9 192.7c0 38.7998 -9.90039 75.2002 -27.2998 107c1 -7.09961 1.5 -14.7002 1.5 -22.9004c0 -22.6992 -4.2998 -48.0996 -17 -79.8994z" />
+    <glyph glyph-name="xbox" unicode="&#xf412;" horiz-adv-x="512" 
+d="M369.9 129.8c44.2998 -54.2998 64.6992 -98.7998 54.3994 -118.7c-7.89941 -15.0996 -56.7002 -44.5996 -92.5996 -55.8994c-29.6006 -9.2998 -68.4004 -13.2998 -100.4 -10.2002c-38.2002 3.7002 -76.8994 17.4004 -110.1 39
+c-27.9004 18.2002 -34.2002 25.7002 -34.2002 40.5996c0 29.9004 32.9004 82.3008 89.2002 142.101c32 33.8994 76.5 73.7002 81.3994 72.5996c9.40039 -2.09961 84.3008 -75.0996 112.301 -109.5zM188.6 304.2c-66.3994 -81.5 -106 -155.4 -120.3 -194.4
+c-9.7998 -26.5 -13.7002 -53 -9.5 -64c2.7998 -7.39941 0.200195 -4.7002 -9.2998 9.90039c-23.2002 35.5 -34.9004 70.3994 -40.5 120.899c-1.90039 16.7002 -1.2002 26.3008 4.2002 60.5c6.7998 42.7002 31.0996 92 60.2998 122.4
+c12.4004 12.9004 13.5 13.2002 28.7002 8.09961c28.2998 -9.5 56.7002 -36.5 86.3994 -63.3994zM500.2 240.7c4.7002 -22.6006 5.09961 -70.9004 0.799805 -93.4004c-3.59961 -18.5 -11.2002 -42.5 -18.5996 -58.7002c-5.5 -12.1992 -19.3008 -35.7998 -25.4004 -43.5
+c-3.09961 -3.89941 -3.09961 -3.89941 -1.40039 4.60059c2.30078 11.2002 -0.599609 31.5996 -7.39941 52.2998c-20.7002 62.9004 -80.5 149 -122.9 202.3c23.2998 21.4004 41 38.2998 64.2998 52.7998c11.8008 7.40039 28.7002 13.9004 36 13.9004
+c7.10059 0 57.7002 -50.2998 74.6006 -130.3zM141.3 405c-14.5996 -0.700195 -14 0.0996094 9.40039 11.2002c81.2002 38.2998 170 27.5996 233.899 -11.7002c-13.3994 0.599609 -43.5 5.90039 -107.399 -25.2002c-11.2002 -5.5 -20.9004 -9.7998 -21.6006 -9.7002
+c-4.59961 0.900391 -66.5996 37.9004 -114.3 35.4004z" />
+    <glyph glyph-name="yandex" unicode="&#xf413;" horiz-adv-x="256" 
+d="M153.1 132.2l-87.3994 -196.2h-63.7002l96 209.8c-45.0996 22.9004 -75.2002 64.4004 -75.2002 141.101c-0.0996094 107.399 68 161.1 148.9 161.1h82.2998v-512h-55.0996v196.2h-45.8008zM198.9 401.5h-29.4004c-44.4004 0 -87.4004 -29.4004 -87.4004 -114.6
+c0 -82.3008 39.4004 -108.801 87.4004 -108.801h29.4004v223.4z" />
+    <glyph glyph-name="yandex-international" unicode="&#xf414;" horiz-adv-x="320" 
+d="M129.5 -64v166.1l-111 297.9h55.7998l81.7998 -229.7l94.1006 277.7h51.2998l-120.7 -347.8v-164.2h-51.2998z" />
+    <glyph glyph-name="apple-pay" unicode="&#xf415;" horiz-adv-x="640" 
+d="M116.9 289.5c-7.5 -8.90039 -19.5 -15.9004 -31.5 -14.9004c-1.5 12 4.39941 24.8008 11.2998 32.6006c7.5 9.09961 20.5996 15.5996 31.2998 16.0996c1.2002 -12.3994 -3.7002 -24.7002 -11.0996 -33.7998zM127.8 272.3c6.7998 -0.5 26.2998 -2.5 38.7998 -21.0996
+c-1 -0.799805 -23.1992 -13.5 -22.8994 -40.2998c0.299805 -32 28 -42.6006 28.2998 -42.9004c-0.200195 -0.799805 -4.40039 -15.0996 -14.5 -29.9004c-8.90039 -13 -18 -25.6992 -32.5 -26c-14 -0.199219 -18.7002 8.40039 -34.7998 8.40039
+c-16 0 -21.2002 -8.09961 -34.5 -8.59961c-14 -0.5 -24.6006 13.7998 -33.5 26.7998c-18.2002 26.2998 -32.1006 74 -13.2998 106.3c9.09961 16.0996 25.6992 26.2002 43.5996 26.5c13.7998 0.299805 26.4004 -9.09961 34.7998 -9.09961
+c8.2002 0 23.1006 10.8994 40.5 9.89941zM228.2 308.5h73.2002c37.6992 0 64.0996 -26 64.0996 -64s-26.7998 -64.2998 -65.0996 -64.2998h-41.9004v-66.6006h-30.2998v194.9zM258.5 283v-77.4004h34.7998c26.4004 0 41.4004 14.2002 41.4004 38.8008
+c0 24.5996 -15 38.5996 -41.2998 38.5996h-34.9004zM420.7 112.1c-28.1006 0 -47.7002 16.8008 -47.7998 42c0 25 19 39.4004 54.0996 41.5l37.7998 2.30078v10.7998c0 15.8994 -10.3994 24.5 -28.8994 24.5c-15.2002 0 -26.3008 -7.90039 -28.6006 -19.9004h-27.2998
+c0.900391 25.2002 24.7002 43.6006 56.7998 43.6006c34.6006 0 57.1006 -18.2002 57.1006 -46.3008v-97h-28v23.4004h-0.600586c-8 -15.2998 -25.5996 -24.9004 -44.5996 -24.9004zM428.9 135.2c20.5 0 36 13 36 31.2002v11l-33.6006 -2.10059
+c-18.8994 -1.09961 -28.7998 -8.2002 -28.7998 -20.5c0 -11.7998 10.2998 -19.5996 26.4004 -19.5996zM531.4 60.5996c-2.30078 0 -9.80078 0.300781 -11.6006 0.700195v23.4004c1.90039 -0.200195 6.5 -0.5 8.90039 -0.5c13.3994 0 20.8994 5.7002 25.5 20.2998
+l2.7998 8.59961l-51.2002 141.9h31.6006l35.5996 -115.1h0.599609l35.6006 115.1h30.7998l-53.0996 -149c-12.1006 -34.0996 -26 -45.4004 -55.5 -45.4004z" />
+    <glyph glyph-name="cc-apple-pay" unicode="&#xf416;" horiz-adv-x="576" 
+d="M302.2 229.6c0 -17.1992 -10.5 -27.0996 -29 -27.0996h-24.2998v54.2002h24.3994c18.4004 0 28.9004 -9.7998 28.9004 -27.1006zM349.7 167c0 8.59961 6.89941 13.5 20.2002 14.4004l23.5 1.5v-7.7002c0 -12.7998 -10.8008 -21.9004 -25.2002 -21.9004
+c-11.2998 0 -18.5 5.40039 -18.5 13.7002zM576 369v-352c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h480c26.5 0 48 -21.5 48 -48zM127.8 250.8c8.40039 -0.700195 16.7998 4.2002 22.1006 10.4004
+c5.19922 6.39941 8.59961 15 7.69922 23.7002c-7.39941 -0.300781 -16.5996 -4.90039 -21.8994 -11.3008c-4.7998 -5.5 -8.90039 -14.3994 -7.90039 -22.7998zM188.4 176.3c-0.200195 0.200195 -19.6006 7.60059 -19.8008 30c-0.199219 18.7002 15.3008 27.7002 16 28.2002
+c-8.7998 13 -22.3994 14.4004 -27.0996 14.7002c-12.2002 0.700195 -22.5996 -6.90039 -28.4004 -6.90039c-5.89941 0 -14.6992 6.60059 -24.2998 6.40039c-12.5 -0.200195 -24.2002 -7.2998 -30.5 -18.6006c-13.0996 -22.5996 -3.39941 -56 9.2998 -74.3994
+c6.2002 -9.10059 13.7002 -19.1006 23.5 -18.7002c9.30078 0.400391 13 6 24.2002 6c11.2998 0 14.5 -6 24.2998 -5.90039c10.2002 0.200195 16.5 9.10059 22.8008 18.2002c6.89941 10.4004 9.7998 20.4004 10 21zM323.8 229.7c0 26.5996 -18.5 44.7998 -44.8994 44.7998
+h-51.2002v-136.4h21.2002v46.6006h29.2998c26.7998 0 45.5996 18.3994 45.5996 45zM413.8 206c0 19.7002 -15.7998 32.4004 -40 32.4004c-22.5 0 -39.0996 -12.9004 -39.7002 -30.5h19.1006c1.59961 8.39941 9.39941 13.8994 20 13.8994c13 0 20.2002 -6 20.2002 -17.2002
+v-7.5l-26.4004 -1.59961c-24.5996 -1.5 -37.9004 -11.5996 -37.9004 -29.0996c0 -17.7002 13.7002 -29.4004 33.4004 -29.4004c13.2998 0 25.5996 6.7002 31.2002 17.4004h0.399414v-16.4004h19.6006v68h0.0996094zM516 237.1h-21.5l-24.9004 -80.5996h-0.399414
+l-24.9004 80.5996h-22.2998l35.9004 -99.2998l-1.90039 -6c-3.2002 -10.2002 -8.5 -14.2002 -17.9004 -14.2002c-1.69922 0 -4.89941 0.200195 -6.19922 0.300781v-16.4004c1.19922 -0.400391 6.5 -0.5 8.09961 -0.5c20.7002 0 30.4004 7.90039 38.9004 31.7998z" />
+    <glyph glyph-name="fly" unicode="&#xf417;" horiz-adv-x="384" 
+d="M197.8 20.2002c12.9004 -11.7002 33.7002 -33.2998 33.2002 -50.7002c0 -0.799805 -0.0996094 -1.59961 -0.0996094 -2.5c-1.80078 -19.7998 -18.8008 -31.0996 -39.1006 -31c-25 0.0996094 -39.8994 16.7998 -38.7002 35.7998c1 16.2002 20.5 36.7002 32.4004 47.6006
+c2.2998 2.09961 2.7002 2.69922 5.59961 3.59961c3.40039 0 3.90039 -0.299805 6.7002 -2.7998zM331.9 380.7c23.8994 -40 27.7998 -73.2998 20.7998 -112.5c-15.2002 -69.9004 -103.601 -166.5 -155.9 -215.7c-1.7002 -1.59961 -1.39941 -1.40039 -3.5 -2.09961
+l-3.2998 0.0996094c-1.7002 0.599609 -4.5 3.5 -6.2002 5.09961c-58.7998 57.8008 -148.7 151.601 -155.8 233.801c-1.5 71.3994 29.2998 113.399 82.9004 141.3c9.89941 4.09961 37 17.2998 81.0996 17.2998c22 0.200195 51.0996 -4.5 76.5996 -15.2002
+c24.7002 -11.5 47 -26.3994 63.3008 -52.0996zM186.8 96.0996v325.7c-57.8994 -5.5 -72.7002 -89.2002 -69.2998 -136.7c4.09961 -58.2998 41.2998 -137.899 69.2998 -189zM328.7 268c15.7998 54.9004 -10.9004 134.7 -99.7002 153
+c38.2002 -25.5996 49.5996 -85.5 48 -131.4c-2 -58.5996 -39.4004 -140 -67.2002 -191.899c41.6006 42.2998 102.5 113.5 118.9 170.3z" />
+    <glyph glyph-name="node" unicode="&#xf419;" horiz-adv-x="640" 
+d="M316.3 -4c-2.09961 0 -4.2002 0.599609 -6.09961 1.59961l-19.2002 11.4004c-2.90039 1.59961 -1.5 2.2002 -0.5 2.5c3.7998 1.2998 4.59961 1.59961 8.7002 4c0.399414 0.200195 1 0.0996094 1.39941 -0.0996094l14.8008 -8.80078
+c0.5 -0.299805 1.2998 -0.299805 1.7998 0l57.7998 33.4004c0.5 0.299805 0.900391 0.900391 0.900391 1.59961v66.7002c0 0.700195 -0.300781 1.2998 -0.900391 1.60059l-57.7998 33.2998c-0.5 0.299805 -1.2002 0.299805 -1.7998 0l-57.8008 -33.2998
+c-0.599609 -0.300781 -0.899414 -1 -0.899414 -1.60059v-66.7002c0 -0.599609 0.399414 -1.19922 0.899414 -1.5l15.8008 -9.09961c8.59961 -4.2998 13.8994 0.799805 13.8994 5.7998v65.9004c0 0.899414 0.700195 1.7002 1.7002 1.7002h7.2998
+c0.900391 0 1.7002 -0.700195 1.7002 -1.7002v-65.9004c0 -11.5 -6.2002 -18 -17.0996 -18c-3.30078 0 -6 0 -13.3008 3.60059l-15.1992 8.69922c-3.7002 2.2002 -6.10059 6.2002 -6.10059 10.5v66.7002c0 4.2998 2.2998 8.40039 6.10059 10.5l57.7998 33.4004
+c3.7002 2.09961 8.5 2.09961 12.0996 0l57.7998 -33.4004c3.7002 -2.2002 6.10059 -6.2002 6.10059 -10.5v-66.7002c0 -4.2998 -2.2998 -8.39941 -6.10059 -10.5l-57.7998 -33.3994c-1.7002 -1.10059 -3.7998 -1.7002 -6 -1.7002zM363 61.7998
+c0 -12.5996 -10.5 -19.7998 -29 -19.7998c-25.2998 0 -30.5996 11.5996 -30.5996 21.2998c0 1 0.799805 1.7002 1.69922 1.7002h7.5c0.900391 0 1.60059 -0.599609 1.7002 -1.40039c1.10059 -7.59961 4.5 -11.3994 19.7998 -11.3994
+c12.2002 0 17.4004 2.7002 17.4004 9.2002c0 3.69922 -1.5 6.39941 -20.4004 8.2998c-15.7998 1.59961 -25.5996 5 -25.5996 17.7002c0 11.5996 9.7998 18.5996 26.2998 18.5996c18.5 0 27.6006 -6.40039 28.7998 -20.2002
+c0.100586 -0.5 -0.0996094 -0.899414 -0.399414 -1.2998c-0.299805 -0.299805 -0.700195 -0.5 -1.2002 -0.5h-7.5c-0.799805 0 -1.40039 0.5 -1.59961 1.2998c-1.80078 8 -6.2002 10.6006 -18.1006 10.6006c-13.2998 0 -14.7998 -4.60059 -14.7998 -8.10059
+c0 -4.2002 1.7998 -5.39941 19.7998 -7.7998c17.7998 -2.40039 26.2002 -5.7002 26.2002 -18.2002zM417.5 111.9c0 -6.10059 -5 -11.1006 -11.0996 -11.1006c-6.10059 0 -11.1006 5 -11.1006 11.1006c0 6.2998 5.2002 11.0996 11.1006 11.0996
+c6 0.0996094 11.0996 -4.7998 11.0996 -11.0996zM415.7 111.9c0 5.19922 -4.2002 9.2998 -9.40039 9.2998c-5.09961 0 -9.2998 -4.10059 -9.2998 -9.2998c0 -5.2002 4.2002 -9.40039 9.2998 -9.40039c5.2002 0.0996094 9.40039 4.2998 9.40039 9.40039zM411.2 105.7
+h-2.60059c-0.0996094 0.599609 -0.5 3.7998 -0.5 3.89941c-0.199219 0.700195 -0.399414 1.10059 -1.2998 1.10059h-2.2002v-5h-2.39941v12.5h4.2998c1.5 0 4.40039 0 4.40039 -3.2998c0 -2.30078 -1.5 -2.80078 -2.40039 -3.10059
+c1.7002 -0.0996094 1.7998 -1.2002 2.09961 -2.7998c0.100586 -1 0.300781 -2.7002 0.600586 -3.2998zM408.4 114.5c0 1.7002 -1.2002 1.7002 -1.80078 1.7002h-2v-3.5h1.90039c1.59961 0 1.90039 1.09961 1.90039 1.7998zM137.3 257l-0.200195 -95
+c0 -1.2998 -0.699219 -2.59961 -1.7998 -3.2002c-1.09961 -0.700195 -2.59961 -0.700195 -3.7002 0l-36.3994 20.9004c-2.2998 1.2998 -3.7002 3.7998 -3.7002 6.39941v44.4004c0 2.59961 -1.40039 5.09961 -3.7002 6.40039l-15.5 8.89941
+c-1.09961 0.700195 -2.39941 1 -3.7002 1c-1.2998 0 -2.5 -0.299805 -3.69922 -1l-15.5 -8.89941c-2.30078 -1.30078 -3.7002 -3.80078 -3.7002 -6.40039v-44.4004c0 -2.59961 -1.40039 -5 -3.7002 -6.39941l-36.4004 -20.9004
+c-1.19922 -0.700195 -2.59961 -0.700195 -3.69922 0c-1.10059 0.700195 -1.80078 1.90039 -1.80078 3.2002l-0.0996094 95c0 2.59961 1.40039 5.09961 3.7002 6.40039l61.2002 35.2998c1.09961 0.599609 2.19922 1 3.39941 1h0.600586
+c1.19922 -0.100586 2.39941 -0.400391 3.39941 -1l61.2998 -35.2998c2.30078 -1.30078 3.7002 -3.7002 3.7002 -6.40039zM472.5 360.7v-176.4c0 -2.59961 -1.40039 -5.09961 -3.7002 -6.39941l-61.2998 -35.4004c-2.2998 -1.2998 -5.09961 -1.2998 -7.40039 0
+l-61.2998 35.4004c-2.2998 1.2998 -3.7002 3.7998 -3.7002 6.39941v70.7998c0 2.60059 1.40039 5.10059 3.7002 6.40039l61.2998 35.4004c2.30078 1.2998 5.10059 1.2998 7.40039 0l15.2998 -8.80078c1.7002 -1 3.90039 0.300781 3.90039 2.2002v94
+c0 2.7998 3 4.60059 5.5 3.2002l36.5 -20.4004c2.2998 -1.19922 3.7998 -3.69922 3.7998 -6.39941zM426.5 231.8c0 0.700195 -0.400391 1.2998 -0.900391 1.60059l-21 12.1992c-0.599609 0.300781 -1.2998 0.300781 -1.89941 0l-21 -12.1992
+c-0.600586 -0.300781 -0.900391 -0.900391 -0.900391 -1.60059v-24.2998c0 -0.700195 0.400391 -1.2998 0.900391 -1.59961l21 -12.1006c0.599609 -0.299805 1.2998 -0.299805 1.7998 0l21 12.1006c0.599609 0.299805 0.900391 0.899414 0.900391 1.59961v24.2998h0.0996094
+zM636.3 232.5l-36.7002 -21.2998c-2.5 -1.40039 -5.59961 0.399414 -5.59961 3.2002v17.3994c0 1.2998 -0.799805 2.5 -1.90039 3.2002l-19.1992 11.0996c-1.10059 0.700195 -2.60059 0.700195 -3.7002 0l-19.2002 -11.0996
+c-1.2002 -0.700195 -1.90039 -1.90039 -1.90039 -3.2002v-22.2002c0 -1.2998 0.700195 -2.5 1.90039 -3.19922l61.7002 -35.4004c2.5 -1.40039 2.5 -5 0 -6.40039l-36.7998 -20.5c-2.30078 -1.2998 -5.10059 -1.2998 -7.30078 0l-60.8994 34.7002
+c-2.2998 1.2998 -3.7002 3.7002 -3.7002 6.40039v70.7998c0 2.59961 1.40039 5.09961 3.7002 6.40039l61.2998 35.3994c2.2998 1.2998 5.09961 1.2998 7.40039 0l60.8994 -35.3994c2.2998 -1.30078 3.7002 -3.80078 3.7002 -6.40039v-17.0996
+c0 -2.60059 -1.40039 -5.10059 -3.7002 -6.40039zM559 229l11.7998 6.7998c0.400391 0.299805 1 0.299805 1.40039 0l11.7998 -6.7998c0.400391 -0.200195 0.700195 -0.700195 0.700195 -1.2002v-13.5996c0 -0.5 -0.299805 -0.900391 -0.700195 -1.2002l-11.7998 -6.7998
+c-0.400391 -0.299805 -1 -0.299805 -1.40039 0l-11.7998 6.7998c-0.400391 0.200195 -0.700195 0.700195 -0.700195 1.2002v13.5996c0 0.5 0.299805 0.900391 0.700195 1.2002zM304.8 185.5c0 -0.599609 -0.0996094 -1.2002 -0.200195 -1.7002
+c-0.5 -2 -1.7998 -3.7002 -3.59961 -4.7002l-61 -35.1992c-2.2002 -1.30078 -5 -1.40039 -7.40039 0l-61.1992 35.1992c-2.10059 1.2002 -4 3.60059 -4 6.40039v70.4004c0 2.69922 1.59961 5.09961 3.89941 6.39941l61.1006 35.2002
+c2.39941 1.40039 5.2998 1.2002 7.39941 0l61.1006 -35.2002c2.2998 -1.2998 3.89941 -3.7998 3.89941 -6.39941v-70.4004zM230.5 310.4l-0.799805 -0.5h1.09961zM306.7 180.2l-0.400391 0.700195v-0.900391z" />
+    <glyph glyph-name="osi" unicode="&#xf41a;" horiz-adv-x="512" 
+d="M8 181.56c2.2998 135.801 97.3994 232.441 213.799 248.102c138.8 18.5996 255.601 -75.7998 278 -201.101c21.2998 -118.8 -44 -230 -151.6 -274c-9.2998 -3.7998 -14.4004 -1.69922 -18 7.7002c-17.7998 46.2998 -35.5996 92.6328 -53.3994 138.999
+c-3.09961 8.10059 -1 13.2002 7 16.7998c24.2002 11 39.2998 29.4004 43.2998 55.8008c0.561523 3.60547 0.852539 7.2998 0.852539 11.0615c0 37.3613 -28.7998 67.9971 -65.3525 71.1377c-39 3.40039 -71.7998 -23.6992 -77.5 -59.6992
+c-5.19922 -33 11.1006 -63.7002 41.9004 -77.7002c9.59961 -4.40039 11.5 -8.60059 7.7998 -18.4004c-17.8994 -46.5996 -35.7998 -93.2324 -53.7002 -139.899c-2.59961 -6.90039 -8.2998 -9.30078 -15.5 -6.5c-52.5996 20.2998 -101.399 61 -130.8 119
+c-24.8994 49.1992 -25.2002 87.6992 -26.7998 108.699zM28.8994 183.461c0.399414 -6.59961 0.599609 -14.3008 1.2998 -22.1006c6.2998 -71.9004 49.5996 -143.5 131 -183.101c3.2002 -1.5 4.39941 -0.799805 5.59961 2.2998c14.9004 39.1006 29.9004 78.2012 45 117.302
+c1.2998 3.2998 0.600586 4.7998 -2.39941 6.69922c-31.6006 19.9004 -47.3008 48.5 -45.6006 86c1 21.6006 9.2998 40.5 23.7998 56.3008c30 32.6992 77 39.7998 115.5 17.5996c27.4619 -15.834 45.9629 -45.4971 45.9629 -79.4463
+c0 -3.75879 -0.321289 -7.3125 -0.762695 -10.9541c-3.59961 -30.5996 -19.2998 -53.8994 -45.7002 -69.7998c-2.69922 -1.59961 -3.5 -2.89941 -2.2998 -6c15.2002 -39.2002 30.2666 -78.4336 45.2002 -117.7c1.2002 -3.09961 2.40039 -3.7998 5.59961 -2.2998
+c35.5 16.6006 65.2002 40.2998 88.1006 72c34.7998 48.2002 49.0996 101.9 42.2998 161c-13.7002 117.5 -119.4 214.8 -255.5 198c-106.1 -13 -195.3 -102.5 -197.1 -225.8z" />
+    <glyph glyph-name="react" unicode="&#xf41b;" horiz-adv-x="512" 
+d="M418.2 270.8c54.3994 -18.7002 93.7998 -48.0996 93.7998 -78.3994c0 -31.7002 -41.7998 -62.6006 -99.5 -81.7002c-3.09961 -1 -6.2002 -2 -9.40039 -2.90039c1.10059 -4.59961 2.10059 -9.09961 3 -13.5c11.4004 -57.5996 2.60059 -104.899 -24.3994 -120.5
+c-26.1006 -15.0996 -68.4004 -0.200195 -111.2 36.6006c-4.59961 4 -9.2002 8.09961 -13.5996 12.3994c-3.5 -3.39941 -7 -6.59961 -10.5 -9.7002c-44.2002 -38.6992 -89.6006 -54.6992 -116.601 -39.0996c-26.2002 15.0996 -34.3994 59.0996 -23.8994 114.6
+c1.19922 6.10059 2.5 12 4 18c-4.60059 1.30078 -9.10059 2.80078 -13.6006 4.30078c-55.5 19 -96.2998 50.2998 -96.2998 81.5c0 30.1992 38.2998 59.3994 91.7002 77.8994c5.89941 2.10059 12.2002 4.10059 18.5996 5.90039
+c-1.39941 5.59961 -2.59961 11.0996 -3.7002 16.7002c-11 56.3994 -3.19922 101.5 23 116.699c27.3008 15.9004 72.9004 -1.09961 118.4 -41.5c2.7998 -2.5 5.59961 -5.09961 8.2998 -7.69922c4 3.89941 8.2002 7.7998 12.5 11.5
+c43.4004 37.7998 86.2998 53.5 112.601 38.3994c27.2998 -15.7998 35.3994 -63.7002 23.0996 -123.3c-0.799805 -3.7002 -1.59961 -7.40039 -2.5 -11.0996c5.40039 -1.60059 10.7998 -3.30078 16.2002 -5.10059zM282.9 355.7c-4 -3.5 -7.80078 -7 -11.7002 -10.7002
+c15.3994 -16.7002 29.5996 -34.5 42.5996 -53.0996c22.6006 -2 45.1006 -5.60059 67.2998 -10.6006c0.900391 3.2998 1.60059 6.60059 2.30078 10c10.5996 51.5 4.09961 90.7002 -12.8008 100.4c-15.7998 9.09961 -50.5 -3.60059 -87.6992 -36zM167.2 140.5
+c-5 8.59961 -9.7002 17.2998 -14.2998 26.0996c-6.40039 -15.1992 -11.9004 -30.0996 -16.3008 -44.5c15.3008 -3.2998 30.8008 -5.7998 46.4004 -7.5c-5.5 8.5 -10.7002 17.2002 -15.7998 25.9004zM136.9 260.8c4.39941 -14.0996 9.69922 -28.7002 16 -43.5996
+c4.5 8.7998 9.2998 17.5 14.1992 26c4.90039 8.59961 10.1006 17.0996 15.4004 25.3994c-15.9004 -2 -31.2002 -4.59961 -45.5996 -7.7998zM164.3 191.9c6.7002 -13.8008 13.7998 -27.3008 21.5 -40.6006s15.9004 -26.2998 24.6006 -39
+c14.6992 -0.899414 29.8994 -1.39941 45.5996 -1.39941s31.2002 0.5 46.0996 1.59961c8.5 12.7998 16.6006 25.7002 24.2002 39c7.7002 13.4004 14.9004 27 21.6006 40.7998c-6.80078 13.7002 -14 27.2002 -21.7002 40.4004s-15.7998 26.0996 -24.2998 38.7002
+c-14.9004 1.09961 -30.3008 1.69922 -45.9004 1.69922s-30.9004 -0.599609 -45.9004 -1.69922c-8.59961 -12.7002 -16.7998 -25.6006 -24.3994 -38.9004c-7.60059 -13.2998 -14.7998 -26.7998 -21.4004 -40.5996zM344.9 140.7c-5 -8.60059 -10.1006 -17.2002 -15.5 -25.6006
+c15.7998 1.80078 31.5 4.5 47 8c-4.90039 15.1006 -10.5 29.8008 -16.9004 44.3008c-4.7002 -9 -9.5 -17.9004 -14.5996 -26.7002zM359.3 217.2c6.10059 14.2002 11.5 28.5996 16.1006 43.3994c-14.4004 3.30078 -29.8008 6 -45.9004 8
+c5.2998 -8.2998 10.4004 -16.6992 15.2998 -25.1992c5 -8.60059 9.7998 -17.4004 14.5 -26.2002zM256.2 329.7c-10 -10.9004 -20.1006 -22.9004 -29.9004 -35.7998c19.7998 0.899414 39.7002 0.899414 59.5 0c-9.2002 12.3994 -19.0996 24.3994 -29.5996 35.7998zM140.2 391
+c-15.7998 -9.09961 -22 -45.5996 -12.6006 -94c1.10059 -5.2002 2.2002 -10.4004 3.5 -15.5c22.2002 4.90039 44.6006 8.40039 67.2002 10.4004c13.1006 18.5996 27.4004 36.3994 42.9004 53.0996c-2.60059 2.40039 -5.10059 4.7998 -7.60059 7
+c-39.2998 34.7998 -76.5996 48.7998 -93.3994 39zM115.7 127.4c6.89941 22 15.2002 43.5996 24.7998 64.5c-9.5 20.5996 -17.7002 41.8994 -24.5 63.5996c-5.7998 -1.7002 -11.5996 -3.5 -17.2998 -5.5c-45.6006 -15.9004 -77.2002 -39.2998 -77.2002 -57.5996
+c1.90039 -12.1006 8.7002 -22.9004 18.7998 -29.9004c17.5 -13.9004 41.7002 -24.5 63 -31.2002c4.10059 -1.39941 8.2002 -2.7002 12.4004 -3.89941zM232.3 29.4004c3.2002 2.7998 6.40039 5.7998 9.60059 8.89941c-15.5 16.7998 -30 34.7002 -43.2002 53.4004
+c-22.9004 1.7002 -45.5 5 -67.9004 9.7998c-1.39941 -5.5 -2.59961 -11.0996 -3.7002 -16.7002c-9 -47.5 -2.39941 -82.7998 13.5 -92c11.4004 -4.5 24.2002 -4 35.3008 1.2998c20.7998 8.2002 39.8994 20.2002 56.3994 35.3008zM256.8 53.7002
+c10.5 11.5996 20.4004 23.7002 29.6006 36.3994c-10 -0.5 -20.1006 -0.699219 -30.4004 -0.699219c-10 0 -19.9004 0.199219 -29.5 0.599609c9.90039 -13.0996 20.0996 -25.2998 30.2998 -36.2998zM387.5 23.7002c3.2002 22.2002 2.40039 44.7002 -2.5 66.2998
+c-0.799805 4 -1.7002 8.09961 -2.7002 12.2002c-22.5 -5.10059 -45.2998 -8.60059 -68.2002 -10.5c-12.7998 -18.7998 -26.8994 -36.7002 -42.1992 -53.6006c4.2998 -4 8.5 -7.89941 12.6992 -11.5c36.6006 -31.3994 70.5 -43.3994 86.4004 -34.1992
+c9.59961 7.69922 15.5996 19.0996 16.5 31.2998zM405.7 131.2c49.8994 16.5 84.7998 41.7998 84.7998 61.3994c0 18.2002 -32.7002 42 -79.2998 58c-4.7998 1.60059 -9.7998 3.2002 -15 4.7002c-6.7998 -21.5 -14.9004 -42.5 -24.5 -62.8994
+c9.89941 -20.7002 18.5 -42 25.5 -63.8008c2.89941 0.800781 5.7002 1.7002 8.5 2.60059zM256 146.2c-25.2998 0 -45.7998 20.5 -45.7998 45.7998s20.5 45.7998 45.7998 45.7998s45.7998 -20.5 45.7998 -45.7998s-20.5 -45.7998 -45.7998 -45.7998z" />
+    <glyph glyph-name="autoprefixer" unicode="&#xf41c;" horiz-adv-x="640" 
+d="M318.4 432l164.1 -480h-77.5l-25.2002 81.4004h-119.5l-25.3994 -81.4004h-77.5zM278.1 90.0996h83.6006l-40.9004 130.4h-1.5zM640 43l-158.5 -9.5l-19.4004 56.5l167.9 -15.5996zM177.9 90l-19.4004 -56.4004l-158.5 9.40039l10 31.2998z" />
+    <glyph glyph-name="less" unicode="&#xf41d;" horiz-adv-x="640" 
+d="M612.7 229c0 -11 6.7998 -22.5996 27.2998 -23.2998v-27.2998c-20.5 -1 -27.2998 -12.6006 -27.2998 -23.6006c0 -20.3994 3.2002 -32 3.2002 -54.5996c0 -34.2002 -12.7002 -45.2002 -40.5 -45.2002h-20.5v25.2002h6.2998v0.5c13.5996 0 17.2998 4.7002 17.2998 22.5996
+c0 17.2998 -1.59961 32.6006 -1.59961 51.5c0 24.2002 7.7998 33.6006 23.5996 37.2998v1.60059c-15.7002 3.7002 -23.5996 13.0996 -23.5996 37.2998c0 18.9004 1.59961 35.2002 1.59961 51.5c0 17.4004 -3.09961 22.0996 -17.2998 22.0996h-6.2998v24.2002h20.5
+c27.8994 0 40.5 -11 40.5 -45.2002c0 -22 -3.2002 -34.0996 -3.2002 -54.5996zM507.1 197c20.5 -6.7998 43 -18.9004 43 -47.7998c0 -28.9004 -22.5996 -51 -64.5996 -51c-20 0 -44.0996 9 -59.9004 22.0996l21 30.5c14.2002 -11 27.4004 -16.2998 40.5 -16.2998
+c14.2002 0 20.5 5.2002 20.5 13.0996c0 10.5 -15.7998 15.8008 -32.0996 22.1006c-18.9004 7.2998 -41.5 20.5 -41.5 46.2002c0 28.8994 24.2002 49.3994 59.9004 49.3994c24.1992 0 42.0996 -10.5 55.1992 -20.5l-21 -27.7998c-11.5 8.40039 -22 13.0996 -33.5996 13.0996
+s-17.9004 -4.69922 -17.9004 -12.5996c0 -10.5 14.7002 -14.2002 30.5 -20.5zM148.2 137.6c1.59961 0 3.09961 0 6.2002 0.800781l5.2998 -34.2002c-5.7002 -2.10059 -13.6006 -3.7002 -23.6006 -3.7002c-32.0996 0 -43.0996 21 -43.0996 53.0996v150.801h-14.0996
+c-13.6006 0 -17.3008 -4.80078 -17.3008 -22.1006s1.60059 -32.5996 1.60059 -51.5c0 -24.2002 -7.7998 -33.5996 -23.6006 -37.2998v-1.59961c15.7002 -3.7002 23.6006 -13.1006 23.6006 -37.3008c0 -19.3994 -1.60059 -34.1992 -1.60059 -51.5
+c0 -17.2998 4.2002 -22.5996 17.3008 -22.5996h6.2998v-24.2002h-20.5c-27.9004 0 -40.5 11 -40.5 45.2002c0 22.5996 3.2002 34.2002 3.2002 53.5996c0 11 -6.80078 22.6006 -27.3008 23.1006v27.2998c20.5 1 27.3008 12.5996 27.3008 23.5996
+c0 19.4004 -3.2002 32 -3.2002 54.6006c0 34.2002 12.5996 45.2002 41 45.2002h74.5996v-178.2c0 -9.90039 4.7002 -13.1006 8.40039 -13.1006zM379.9 197c20.5 -6.7998 43.0996 -18.9004 43 -47.7998c0 -28.9004 -22.6006 -51 -64.6006 -51
+c-20 0 -44.0996 9 -59.8994 22.0996l20.5 30.5c14.1992 -11 27.3994 -16.2998 40.5 -16.2998c14.1992 0 20.5 5.2002 20.5 13.0996c0 10.5 -15.8008 15.8008 -32.1006 22.1006c-18.8994 7.2998 -41.5 20.5 -41.5 46.2002c0 28.8994 24.2002 49.3994 59.9004 49.3994
+c24.2002 0 42.0996 -10.5 55.2002 -20.5l-21 -27.7998c-11.5 8.40039 -22 13.0996 -33.6006 13.0996c-11.5996 0 -17.8994 -4.69922 -17.8994 -12.5996c0 -10.5 14.6992 -14.2002 31 -20.5zM224.9 265.8c44.0996 0 67.2998 -33.0996 66.6992 -75.7002
+c0 -8.39941 -1.09961 -15.6992 -1.59961 -19.3994h-95.2002c4.2002 -24.2002 20.5 -34.2002 41.5 -34.2002c11.6006 0 22.6006 3.2002 34.2002 10l15.7998 -27.7998c-16.2998 -11.1006 -37.2998 -17.9004 -56.2002 -17.9004c-45.0996 0 -79.2998 30.5 -79.2998 82.5
+c-1 50.4004 35.7002 82.5 74.1006 82.5zM194.9 199.6h56.7998c0 17.9004 -7.40039 31 -26.2998 31c-14.7002 0 -27.3008 -10 -30.5 -31z" />
+    <glyph glyph-name="sass" unicode="&#xf41e;" horiz-adv-x="640" 
+d="M301.84 69.0801c-0.299805 -0.599609 -0.599609 -1.08008 0 0zM550.97 156.08c57.9092 0.300781 90.5703 -37.0801 88.9707 -71.0801c-1.10059 -26.9004 -25.6904 -37.9004 -30.29 -38.7002c-3.30078 -0.599609 -5.10059 -0.700195 -5.60059 1.90039
+c-0.299805 1.7998 0.900391 2.7002 4.7998 5.09961c3.90039 2.40039 15.6006 10.5 17.7002 25c2.10059 14.5 -8.7998 49.2998 -64.4795 55.7998c-26 3 -46.3906 -0.599609 -62.0898 -7.19922c2.89941 -7.60059 5.09961 -15.5 5.39941 -23.4004
+c0.799805 -17.5 -11.29 -30.4004 -23.79 -39.5996c-6.50391 -4.72559 -13.8096 -8.50879 -21.5898 -11.1006c-5.2002 -2.2002 -12.2002 -4.5 -17.0996 -3.5c-10.9004 2.2002 -16.7002 11.7998 -9.30078 33.1006c4 11.5 15.5 29 34.0908 44.0996
+c-4.30078 8.7002 -8.99023 17.5996 -11.3906 25.7002c-2.58984 8.31934 -4.7002 17.0566 -6.2002 25.7998c0 0 -15.2998 -31.7197 -35.0898 -60.6201c-1.09961 -1.7002 -2.2998 -3.39941 -3.39941 -5c3.7998 -9 6.89941 -18.5996 7.2998 -28.2002
+c0.700195 -17.3994 -6.90039 -30.5996 -19.4004 -39.7998c-6.1377 -4.40625 -12.9531 -8.00488 -20.1895 -10.5996c-3.90039 -1.7998 -12 -4.60059 -23.5 -5.40039c-6.29004 -0.5 -12.29 -0.0996094 -15.6904 2.5c-4.59961 3.40039 -5.2002 7.7998 -2.7998 13.7002
+c2 5 17.21 22.4004 30 37.5996c3.5 4.2002 6.90039 8.5 9.90039 12.5c-0.0556641 0.0507812 -0.0927734 0.121094 -0.100586 0.200195c0 0 2.2998 3 6.10059 8.2002c-4.7002 10.0996 -10.6006 20.5 -13.4004 30c-2.58984 8.32031 -4.7002 17.0576 -6.2002 25.7998
+c0 0 -15.4902 -39.7002 -31.6895 -71.5c-12.4902 -24.5996 -20.79 -39.5 -24.5908 -46v-0.299805s-0.5 -0.900391 -1.5 -2.40039c-0.5 -0.799805 -0.699219 -1.19922 -0.699219 -1.19922v0.0996094c-4.20996 -6.2002 -13.6104 -18.2998 -23 -18.2998
+c-25.7002 0 -16.3008 52.2002 -16.3008 52.2002s-7.5 -19.3008 -16 -35.9004c-6.88965 -13.5996 -13.0898 -25 -26.8896 -25c-3.90039 0 -10.1904 0.0996094 -15.3896 5c-11.8008 11.2002 -20.9004 39.7002 -19.1006 61.7002c1.5 18.7998 4.40039 31.7998 8.40039 42.5996
+c-7.10059 -3.89941 -15.2002 -8.39941 -23.4902 -13.2998c-4.2998 -2.5 -8.59961 -5 -12.7998 -7.5c0.0996094 -0.299805 0.299805 -0.5 0.400391 -0.799805c10.5996 -20.4004 13.3896 -65.2002 -9.60059 -99.5s-65.7803 -55.2002 -107.57 -43.6006
+c-13.3896 3.80078 -33.79 31.6006 -16.29 70.4004c15.4902 34.2002 77.3809 66.5996 93.6709 74.7002c1.39941 0.799805 2.89941 1.59961 4.5 2.5c-32.4902 28.3994 -113.671 66.7998 -125.061 125.7c-3.2002 16.5996 4.58984 56.2998 53.2803 101.899
+c40.9902 38.2998 97.9697 67.7002 150.66 86.4004c88.4297 31.3994 181.949 12.8994 196.31 -43.5c14.1006 -55.5 -33.9902 -121.8 -95.7695 -145.601c-54.9902 -21.2998 -100.471 -17.8994 -119.17 -11.7998c-21.29 7 -33.79 21 -36.79 28.9004
+c-1.2002 3.09961 -3.30078 8.2998 0 10.0996c2 1.10059 2.7998 0.799805 8.09961 -5.09961c5.09961 -5.60059 25.4902 -20.6006 64.2803 -16.2998c101.77 11.3994 163.06 90.5 143.66 133c-13.4902 29.7998 -91.8408 43.1992 -189.841 -5.60059
+c-119.569 -59.5996 -126.069 -108.7 -127.069 -127.399c-2.7998 -51.3008 63.2793 -78.3008 99.0693 -116.5c0.5 -0.5 0.900391 -1 1.40039 -1.5c6.7002 3.69922 13.7998 7.59961 20.7002 11.3994c18 9.90039 35.0996 19.2002 43 23.5
+c12.5801 18.2998 38.1797 38.5 56.5801 38.5c29.4893 0 19.3896 -42.3994 19.3896 -42.3994s0.599609 2 1.40039 2c0.799805 0 4.09961 5.5 13.1992 2.19922c9.40039 -3.5 7.2002 -10 7.30078 -10.6992c0.0996094 -1.30078 -11 -38.9004 -15.7002 -63.1006
+c-2.2002 -11.5 -0.900391 -19.8994 -0.299805 -19.8994c0.899414 0 2.7998 2.89941 4.5 6.09961v0.0996094s1.2998 2.40039 3.5 6.7002c0 0.200195 -0.200195 -0.299805 -0.5 -0.799805c0.199219 0.400391 0.5 0.900391 0.899414 1.7002
+c2.60059 5 6.2002 12.3994 10.4004 21.5996c8.18945 18.1006 39.4795 87.7002 42.0801 95.4004c2.59961 7.7002 4 15.7002 5.2998 19.0996c1.2998 3.40039 12.4102 6 25.2998 5.90039c12.8906 -0.100586 14.1904 -5.60059 14.29 -6.7002
+c0.100586 -1.09961 -6.2002 -16.4004 -7.59961 -27.2002c-1.40039 -10.7998 -0.100586 -16.2002 1.09961 -25.2998c0.799805 -6 4.5 -13.5 8.90039 -22c13.2998 21.7998 36.79 63.5996 39.0898 75.2998c1.25195 6.51465 3.06152 12.9941 5.2998 19.1006
+c1.29004 3.39941 12.3896 6 25.29 5.89941c12.9004 -0.0996094 14.2002 -5.59961 14.2998 -6.7002c0.100586 -1.09961 -6.2002 -16.3994 -7.59961 -27.1992c-1.40039 -10.8008 -0.100586 -16.2002 1.09961 -25.3008c1 -7.7998 7.10059 -18.1992 13 -30.0996
+c17.4492 8.59473 37.2061 13.5 57.957 13.5h0.0429688zM121.79 11.3799c19.4004 21.0996 27.3896 47.9199 19.0996 78.3203c-1 -0.600586 -2 -1.10059 -2.89941 -1.7002c0 0 -0.400391 -0.200195 -1.2002 -0.700195c-4.7998 -2.89941 -8.7002 -5.2998 -11.4004 -6.89941
+c-11.7998 -7.40039 -29.5898 -19.4004 -43.3896 -32.4004c-22.6904 -21.4199 -27.3896 -51 -15.4902 -57.9199c11.0898 -6.40039 36.8906 1.2002 55.2803 21.2998zM256.15 102.78c4 9.7998 19.6992 53.2998 16.1992 59.2002c-2.59961 4.5 -13.6992 0.899414 -23.79 -10.4004
+c-6.2998 -7 -16.8994 -25 -21.8994 -40.0996c-9.90039 -30 -5.60059 -60.5 1.39941 -62.3008c8.2002 -2.09961 21.6904 37.9004 28.0908 53.6006zM367.15 49.7803c7.7998 4.7998 24.96 16.8994 25.0898 34.7998c0 0.599609 -0.100586 1.09961 -0.100586 1.59961
+c-3.98926 -5.19922 -7.68945 -9.89941 -10.8896 -13.8994c-5.5 -6.7998 -19.4004 -21.7002 -19.4004 -21.7002s-2 -1.90039 -1.09961 -2.40039c1.2002 -0.699219 3.7002 0.200195 6.40039 1.60059zM452.73 69.2803c9.68945 3.5 25.7998 11.8994 25.8994 34.3994
+c-0.0830078 3.7627 -0.750977 7.4043 -1.89941 10.8008c-10.4102 -9.2002 -16.4004 -18.8008 -19 -24.5c-6.7002 -14.6006 -7 -19.3008 -5 -20.7002z" />
+    <glyph glyph-name="vuejs" unicode="&#xf41f;" 
+d="M356.9 383.7h91.0996l-224 -383.7l-224 383.7h176l48 -88.6006l56 88.6006h76.9004zM55.7002 351.7l168.3 -288.2l168.2 288.2h-53.7998l-114.4 -198.2l-114.5 198.2h-53.7998z" />
+    <glyph glyph-name="angular" unicode="&#xf420;" 
+d="M185.7 179.9l38.0996 91.5996l38.1006 -91.5996h-76.2002zM223.8 416l207.8 -74.4004l-31.7998 -275.699l-176 -97.9004l-176 97.9004l-31.7998 275.699zM354 74.2002l-130.2 292.3l-130.1 -292.3h48.7002l26.1992 65.3994h110.601l26.2002 -65.3994h48.5996z" />
+    <glyph glyph-name="aviato" unicode="&#xf421;" horiz-adv-x="640" 
+d="M107.2 164.5l-19 41.7998h-52.1006l-19 -41.7998h-17.0996l62.2002 131.4l62.2002 -131.4h-17.2002zM62.2002 262.6l-19.6006 -42.5h39.2002zM174.9 160.2l-62.2002 131.399h17.0996l45.1006 -96l45.0996 96h17zM255.5 164.5v127.1h15.5v-127.1h-15.5zM464.6 280.1
+v-115.6h-17.2998v115.6h-41.2002v11.5h99.6006v-11.5h-41.1006zM640 229.2c0 -9.2002 -1.7002 -17.7998 -5.09961 -25.7998c-3.40039 -8 -8.2002 -15.1006 -14.2002 -21.1006s-13.1006 -10.7998 -21.1006 -14.2002c-8 -3.39941 -16.5996 -5.09961 -25.7998 -5.09961
+s-17.7998 1.7002 -25.7998 5.09961c-8 3.40039 -15.0996 8.2002 -21.0996 14.2002s-10.8008 13 -14.2002 21.1006c-3.40039 8 -5.10059 16.5996 -5.10059 25.7998s1.7002 17.7998 5.10059 25.7998c3.39941 8 8.2002 15.0996 14.2002 21.0996s13 8.40039 21.0996 11.9004
+c8 3.40039 16.5996 5.09961 25.7998 5.09961s17.7998 -1.69922 25.7998 -5.09961s15.1006 -5.7998 21.1006 -11.9004c6 -6 10.7002 -13.0996 14.2002 -21.0996c3.39941 -8 5.09961 -16.5996 5.09961 -25.7998zM624.5 229.2c0 7.2998 -1.2998 14 -3.90039 20.2998
+c-2.59961 6.2998 -6.19922 11.7002 -10.7998 16.2998c-4.59961 4.60059 -10 8.2002 -16.2002 10.9004c-6.19922 2.7002 -12.7998 4 -19.7998 4s-13.5996 -1.2998 -19.7998 -4s-11.5996 -6.2998 -16.2002 -10.9004c-4.59961 -4.59961 -8.2002 -10 -10.7998 -16.2998
+s-3.90039 -13.0996 -3.90039 -20.2998c0 -7.2998 1.30078 -14 3.90039 -20.2998c2.59961 -6.30078 6.2002 -11.7002 10.7998 -16.3008c4.60059 -4.59961 10 -8.19922 16.2002 -10.8994s12.7998 -4 19.7998 -4s13.6006 1.2998 19.7998 4
+c6.2002 2.7002 11.6006 6.2998 16.2002 10.8994c4.60059 4.60059 8.2002 10 10.7998 16.3008c2.60059 6.2998 3.90039 13.0996 3.90039 20.2998zM529.7 132.5c6 -0.900391 10.5 -6 10.7002 -12.2998c0 -6.7998 -5.60059 -12.4004 -12.4004 -12.4004
+s-12.4004 5.60059 -12.4004 12.4004c0 6.2002 4.60059 11.2998 10.5 12.2002v5.7998l-80.2998 -9v-5.40039c5.60059 -1.09961 9.90039 -6.09961 9.90039 -12.0996c0 -6.7998 -5.60059 -10.2002 -12.4004 -10.2002s-12.3994 3.40039 -12.3994 10.2002
+c0 5.89941 4.19922 11 9.89941 12.0996v4.90039l-28.3994 -3.2002v-23.7002h5.89941v-13.7998h-5.89941v6.59961h-5v-6.59961h-5.90039v13.7998h5.90039v23.2002l-38.3008 -4.2998c-8.09961 -11.5 -19 -13.6006 -19 -13.6006l0.100586 -6.69922l5.09961 -0.200195
+l0.100586 -12.1006h-4.10059l-0.0996094 5h-5.2002l-0.0996094 -5h-4.10059l0.100586 12.1006l5.09961 0.200195l0.0996094 6.69922s-10.8994 2.2002 -19 13.6006l-38.2998 4.2998v-23.2002h5.90039v-13.7998h-5.90039v6.59961h-5v-6.59961h-5.89941v13.9004h5.89941
+v23.6992l-28.3994 3.2002v-4.89941c5.59961 -1.10059 9.89941 -6.10059 9.89941 -12.1006c0 -6.7998 -5.59961 -10.2002 -12.3994 -10.2002c-6.80078 0 -12.4004 3.40039 -12.4004 10.2002c0 5.90039 4.2002 11 9.90039 12.1006v5.39941l-80.3008 9v-5.7998
+c5.90039 -0.900391 10.5 -6 10.5 -12.2002c0 -6.7998 -5.59961 -12.3994 -12.3994 -12.3994s-12.4004 5.59961 -12.4004 12.3994c0 6.2002 4.60059 11.2998 10.5 12.2002v6.2998l-88.8994 10l242.899 -13.5c-0.599609 2.2002 -1.09961 4.60059 -1.39941 7.2002
+c-0.300781 2.09961 -0.5 4.2002 -0.600586 6.5l-64.7998 8.09961l64.9004 -1.89941c0 0.399414 0 0.799805 0.0996094 1.09961c2.7998 17.2002 25.5 23.7002 25.5 23.7002l1.09961 26.4004h-23.5996l-19 -41.8008h-17.0996l62.1992 131.4l62.2002 -131.4h-17.0996
+l-19 41.8008h-23.7998l1.09961 -26.3008s22.7002 -6.5 25.5 -23.6992c0 -0.400391 0.0996094 -0.700195 0.0996094 -1.10059l64.9004 1.90039l-64.7998 -8.10059c-0.100586 -2.2998 -0.299805 -4.5 -0.600586 -6.5c-0.299805 -2.59961 -0.799805 -5 -1.39941 -7.19922
+l242.899 13.3994l-88.8994 -10v-6.2998zM328.9 220.1h17.8994l1.7002 40.3008l1.7002 -40.3008h17.8994l-19.5996 42.5z" />
+    <glyph glyph-name="ember" unicode="&#xf423;" horiz-adv-x="640" 
+d="M639.9 193.4c1.09961 -10.8008 -5.30078 -14.3008 -5.30078 -14.3008s-26.5996 -19.5996 -47 -13.6992c-20.3994 5.89941 -21.5 43.1992 -21.5 43.1992h-1.89941l-20.7002 -57.1992s-8.2998 -27.9004 -20.7002 -22.8008
+c-12.3994 5.10059 -12.0996 18.6006 -12.0996 18.6006s-19.2998 -21.2998 -54.7998 -18.6006c-31.1006 2.30078 -41.1006 26.7002 -41.1006 26.7002s-20.7998 -14.3994 -79.0996 -25.8994c-26.1006 -2.90039 -44.6006 12.8994 -44.6006 12.8994
+c-2.39941 -2.39941 -18 -10.2002 -18 -10.2002s-22.2998 -10.2998 -30.8994 5.30078c-8.60059 15.5996 -3 63.6992 -3 63.6992h-1.60059s-12.8994 -26.2998 -19.5996 -49.8994c-6.7002 -23.6006 -15 -21.2002 -15 -21.2002s-15.2998 -1.40039 -18.7998 11.4004
+c-3.5 12.8994 5.59961 59.6992 5.59961 59.6992l-1.2998 -0.299805s-0.799805 1.40039 -12.5996 -23.5996c-20.1006 -48.9004 -24.9004 -50 -36.5 -47.9004c-11.6006 2.10059 -12.1006 16.7002 -12.1006 16.7002l-15.8994 -8.7998s-38.6006 -16.6006 -58.8008 -1.2998
+c-13.3994 10.1992 -18 22.1992 -19.5996 29.6992c0 0 -17 1.80078 -28.0996 6.10059c-11.1006 4.2998 0.0996094 18.2998 0.0996094 18.2998s3.5 5.2998 10 0s18.7998 -2.90039 18.7998 -2.90039c1 8.5 2.5 19.7002 7.7998 31.5c11 24.7002 27.6006 33 41.3008 33.3008
+c13.6992 0.199219 23.3994 -3.5 31.6992 -15.3008c18.6006 -45.8994 -49.3994 -69.1992 -49.3994 -69.1992s-1.7998 -12.1006 16.7002 -11.8008c18.5996 0.200195 46.7998 20.4004 46.7998 20.4004c1.2998 15.4004 12.0996 63.5 15 70.7002
+c2.89941 7.2002 14.2002 5.89941 14.2002 5.89941s8.89941 1.90039 10.5 -7.5c1.69922 -9.39941 -6.40039 -47.5996 -6.40039 -47.5996l1.2998 -1.59961c0.799805 3.69922 20.4004 36.5 20.4004 36.5s11.2998 19.5996 28.5 18.7998s-0.799805 -53.5 -0.799805 -53.5
+l1.2998 -1.60059l1.2998 2.40039c2.2002 5.90039 27.7002 44.5996 27.7002 44.5996s9.59961 11.3008 18.5 8.60059c8.7998 -2.60059 9.39941 -6.7002 9.89941 -14.2002s-7 -52.0996 -7 -52.0996s-4.2998 -29.2002 5.40039 -28.7002s20.2002 10.7002 20.2002 10.7002
+s7.5 57.5996 12.5996 105.1c5.10059 47.5 27.1006 79.5 27.1006 79.5s6.5 10 23.5 16.7002c11.1992 4 23.3994 1.2998 29.1992 -23.1006c9.5 -41 -23.2998 -87.8994 -36.8994 -105.199c5.89941 5.7998 15.7998 12.0996 27.2002 5.2998
+c40.2998 -25.2998 7.2998 -80.9004 7.2998 -80.9004c11.7998 3.7998 33 18 33 18s0.5 6.10059 0.700195 7.5c7.19922 41.2998 32 56.2002 36.5996 59.7002c4.7998 3.59961 47.0996 19.7998 49 -24s-52.9004 -59.0996 -52.9004 -59.0996s4.80078 -12.6006 25 -9.40039
+c20.2002 3.2002 43.3008 22.7998 43.3008 22.7998c0.799805 18 12.5996 61 15 67.2002c2.39941 6.2002 17.1992 6.5 18.7998 3c2.2002 -7 0.299805 -37.5996 0.299805 -37.5996l1.59961 0.5c5.90039 17.5 18.3008 31.1992 18.3008 31.1992s9.89941 9.7002 18 7.30078
+c8.09961 -2.30078 5.09961 -30.4004 5.09961 -30.4004s-4.2998 -30.7002 9.40039 -32c13.6992 -1.40039 29.2998 10.7002 29.2998 10.7002s9.59961 3.89941 10.7002 -6.7998zM61.9004 188.1c0 0 6.19922 -1.89941 19.8994 7.60059
+c13.7002 9.39941 16.4004 24.3994 9.10059 31.3994c-7.2002 6.90039 -28.2002 -7 -29 -39zM334.7 311.9c0 0 -15.9004 -54.5 -16.4004 -70.7002c0 0 44.5 72 40 96.2002c-4.5 24.1992 -23.5996 -25.5 -23.5996 -25.5zM357.5 173.5
+c12.5996 33.0996 -3.59961 45.5 -3.59961 45.5s-23.4004 12.9004 -33.3008 -20.2002c-9.89941 -33.0996 -6.39941 -44.8994 -6.39941 -44.8994s30.7002 -13.4004 43.2998 19.5996zM442.1 188.1c0 0 15.7002 -1.09961 26.4004 14.2002s1.2998 25.5 1.2998 25.5
+s-8.59961 11.1006 -19.5996 -9.09961c-11.1006 -20.1006 -8.10059 -30.6006 -8.10059 -30.6006z" />
+    <glyph glyph-name="font-awesome-flag" unicode="&#xf425;" 
+d="M444.373 88.5762c0 -7.16797 -6.14453 -10.2402 -13.3125 -13.3125c-28.6719 -12.2881 -59.3916 -23.5518 -92.1592 -23.5518c-46.0801 0 -67.584 28.6719 -122.88 28.6719c-39.9365 0 -81.9209 -14.3359 -115.713 -29.6953
+c-2.04785 -1.02441 -4.0957 -1.02441 -6.14355 -2.04883v-77.8232c0 -21.4053 -16.1221 -34.8164 -33.792 -34.8164c-19.4561 0 -34.8164 15.3604 -34.8164 34.8164v374.783c-13.3115 10.2402 -22.5273 26.624 -22.5273 45.0566c0 31.7441 25.5996 57.3438 57.3438 57.3438
+s57.3438 -25.5996 57.3438 -57.3438c0 -18.4326 -8.19141 -34.8164 -22.5273 -45.0566v-31.7432c4.12402 1.37402 58.7676 28.6719 114.688 28.6719c65.2705 0 97.6758 -27.6484 126.976 -27.6484c38.9121 0 81.9209 27.6484 92.1602 27.6484
+c8.19238 0 15.3604 -6.14453 15.3604 -13.3125v-240.64z" />
+    <glyph glyph-name="gitter" unicode="&#xf426;" horiz-adv-x="384" 
+d="M66.4004 125.5h-50.4004v322.5h50.4004v-322.5zM166.9 371.9v-435.9h-50.4004v435.9h50.4004zM267.5 371.9v-435.9h-50.4004v435.9h50.4004zM368 372v-247h-50.4004v247h50.4004z" />
+    <glyph glyph-name="hooli" unicode="&#xf427;" horiz-adv-x="640" 
+d="M144.5 96v16c12.2998 -6.59961 25.0996 -12.2002 38.2998 -16.7998zM202.2 101.3c29.5 -10.7002 55.3994 -13.5 75.2998 -13.2998c-24.7998 -7 -58.2002 -5.2998 -94.7002 7.2002l19.4004 0.799805v5.2998zM611.1 216.5c-16 0 -28.8994 13 -28.8994 28.9004
+c0 15.8994 13 24.5 28.8994 24.5c16 0 28.9004 -8.5 28.9004 -24.5s-13 -28.9004 -28.9004 -28.9004zM582.1 96v110.5h57.9004v-110.5h-57.9004zM508.4 96v168l57.8994 27.2998v-195.3h-57.8994zM477.4 215.4c18.0996 -18.1006 16.6992 -33.8008 16.7998 -52.6006
+c0 -18.7002 1.39941 -34.2998 -16.7998 -52.5c-18.1006 -18.2002 -50.4004 -17.0996 -50.4004 -17.0996s-32.2002 -1.10059 -50.4004 17.0996c-18.1992 18.2002 -16.7998 33.7998 -16.7998 52.5s-1.39941 34.4004 16.7998 52.6006
+c18.1006 18.1992 50.4004 17.0996 50.4004 17.0996s32.2002 1.09961 50.4004 -17.0996zM437.6 143.5v40.4004c0 8.7998 -7.2998 10.8994 -10.6992 10.8994c-3.40039 0 -10.7002 -2.2002 -10.7002 -10.8994v-40.4004c0 -3.59961 1.7998 -12.5 10.7002 -12.5
+c8.89941 0 10.6992 8.90039 10.6992 12.5zM331.4 215.4c18.1992 -18.1006 16.6992 -33.8008 16.6992 -52.3008c0 -18.6992 1.5 -34.2998 -16.6992 -52.5c-18.1006 -18.1992 -50.4004 -17.0996 -50.4004 -17.0996s-32.2002 -1.09961 -50.4004 17.0996
+c-18.1992 18.2002 -16.7998 33.8008 -16.7998 52.5c0 15.6006 -0.899414 29.1006 9.2998 43.7002c-16 11.7998 -58 37.4004 -99.8994 58.2998v-54.2998c8 13.7002 22.7002 22 38.5 21.9004c27.2002 0 40.5996 -18.7002 40.5996 -37.4004v-93.8994
+c-20.3994 7.5 -39.7002 17.3994 -57.7002 29.5996v48.7002c0 8.09961 -1.5 15 -10.5996 15s-10.7998 -11.2998 -10.7998 -18.2002v-29.7998l-4.5 3.59961c-22.9004 18.9004 -40.2998 35.6006 -53.4004 50.2998v-31c11 -9.7998 23.6006 -20.1992 38.4004 -31.3994
+c6.39941 -4.90039 12.8994 -9.40039 19.3994 -13.6006v-28.5996h-57.8994v73.7002c-86.7002 78 -61.7998 110.8 -61.7998 110.8c8.2998 18.2998 42.8994 22.2002 97.2998 0.0996094l22.5 10.6006v-20.7002c29.5996 -14.5996 63.8994 -31.5 102.1 -61.0996
+c1.60059 2.09961 3.40039 4.09961 5.2998 6c18.2002 18.1992 50.4004 17.0996 50.4004 17.0996s32.2002 1.09961 50.4004 -17.0996zM65.2002 264l29.2002 13.7002c-26.9004 10.0996 -50.9004 13.5 -64.4004 2.09961c-3.7002 -3.09961 -13.5 -24.5996 35.2002 -79.0996
+v63.2998zM291.7 143.5v40.4004c0 8.7998 -7.2998 10.8994 -10.7002 10.8994s-10.7002 -2.2002 -10.7002 -10.8994v-40.4004c0 -3.59961 1.7998 -12.5 10.7002 -12.5s10.7002 8.90039 10.7002 12.5z" />
+    <glyph glyph-name="strava" unicode="&#xf428;" horiz-adv-x="384" 
+d="M158.4 448l150.199 -292h-88.5l-61.6992 116.1l-62.2002 -116.1h-89.2002zM308.6 156h67.6006l-111.5 -220l-112.2 220h67.5996l44.6006 -88.2002z" />
+    <glyph glyph-name="stripe" unicode="&#xf429;" horiz-adv-x="640" 
+d="M165 303.3l0.0996094 -38.5h33.7002v-37.7998h-33.7002v-63.2002c0 -26.2002 28 -18 33.7002 -15.7002v-33.7998c-5.89941 -3.2002 -16.5996 -5.89941 -31.2002 -5.89941c-26.2998 0 -46.0996 17 -46.0996 43.2998l0.200195 142.399zM254.1 251.7
+c10.4004 19.0996 31.1006 15.2002 37.1006 13.0996v-40.7998c-5.7002 1.7998 -23.4004 4.5 -33.9004 -9.2998v-103.101h-44.2998v153.2h38.4004zM346.4 324v-36.2002l-44.6006 -9.5v36.2002zM44.9004 219.7c0 -20 67.8994 -10.5 67.8994 -63.4004
+c0 -32 -25.3994 -47.7998 -62.2998 -47.7998c-15.2998 0 -32 3 -48.5 10.0996v40c14.9004 -8.09961 33.9004 -14.1992 48.5996 -14.1992c9.90039 0 17 2.69922 17 10.8994c0 21.2002 -67.5 13.2002 -67.5 62.4004c0 31.3994 24 50.2002 60 50.2002
+c14.7002 0 29.4004 -2.30078 44.1006 -8.10059v-41.7998c-13.5 7.2998 -30.7002 11.4004 -44.2002 11.4004c-9.2998 -0.100586 -15.0996 -2.80078 -15.0996 -9.7002zM640 186.4c0 -4.30078 -0.400391 -13.6006 -0.599609 -15.9004h-86.9004
+c2 -20.7998 17.2002 -26.9004 34.5 -26.9004c17.5996 0 31.5 3.7002 43.5996 9.80078v-33.4004c-12.0996 -6.7002 -28 -11.5 -49.1992 -11.5c-43.2002 0 -73.5 24.7002 -73.5 78.2002c0 45.2002 25.6992 81.0996 67.8994 81.0996s64.2002 -35.8994 64.2002 -81.3994z
+M552.1 203.2h45.9004c0 20 -11.5996 28.3994 -22.5 28.3994c-11.0996 0 -23.4004 -8.39941 -23.4004 -28.3994zM439.2 267.8c31.2002 0 60.5996 -28.0996 60.5 -79.7002c0 -56.3994 -29 -79.5996 -60.7998 -79.5996c-15.5 0 -25 6.5 -31.4004 11.2002l-0.0996094 -50.2002
+l-44.4004 -9.40039v204.801h39.0996l2.30078 -11c6.19922 5.69922 17.3994 13.8994 34.7998 13.8994zM428.6 145.3c16.5 0 27.5 17.9004 27.4004 41.7998c0 23.2002 -11.2002 41.4004 -27.4004 41.4004c-10.1992 0 -16.5996 -3.7002 -21.1992 -8.7998l0.299805 -66
+c4.2998 -4.60059 10.5 -8.40039 20.8994 -8.40039zM301.9 111.6v153.2h44.5996v-153.2h-44.5996z" />
+    <glyph glyph-name="stripe-s" unicode="&#xf42a;" horiz-adv-x="384" 
+d="M155.3 293.4c0 -64.2002 218 -33.7002 218 -203.9c0 -102.6 -81.7002 -153.6 -200.3 -153.6c-55.2773 0.125 -108.22 11.7861 -156 32.3994v128.5c47.9004 -26 108.9 -45.5 156.1 -45.5c31.8008 0 54.7002 8.5 54.7002 34.9004c0 68.0996 -216.8 42.5 -216.8 200.399
+c0 101 77.0996 161.4 192.8 161.4c47.2998 0 94.5 -7.2002 141.8 -26.0996v-134.301c-43.3994 23.4004 -98.5 36.7002 -141.899 36.7002c-29.7998 0 -48.4004 -8.59961 -48.4004 -30.8994z" />
+    <glyph glyph-name="typo3" unicode="&#xf42b;" 
+d="M178.7 369.6c0 -66.3994 83.3994 -264.899 140.6 -264.899c6.90039 0 11.5 0 18.5 2.2998c-49.3994 -79.5 -110.399 -139 -146.7 -139c-77.2998 0 -184.1 234 -184.1 337.5c0 16.2998 3.90039 29.4004 9.2998 37.0996c27 32.4004 106.8 57.9004 176.3 66.4004
+c-8.5 -7 -13.8994 -14.7002 -13.8994 -39.4004zM301.5 416c71.7998 0 138.8 -11.5996 138.8 -52.5c0 -82.5996 -52.5 -182.3 -78.7998 -182.3c-47.9004 0 -101.7 132.1 -101.7 198.5c0 30.8994 11.6006 36.2998 41.7002 36.2998z" />
+    <glyph glyph-name="amazon-pay" unicode="&#xf42c;" horiz-adv-x="640" 
+d="M14 122.7c2.2998 4.2002 5.2002 4.89941 9.7002 2.5c10.3994 -5.60059 20.5996 -11.4004 31.2002 -16.7002c39.8447 -19.8691 83.1084 -35.7148 127.399 -46.2998c20.5771 -4.96484 41.8789 -8.95996 63.2002 -11.7998
+c26.4932 -3.56152 53.5293 -5.40039 80.9922 -5.40039c4.97266 0 9.06348 0.0800781 14.0078 0.200195c17.4004 0.399414 34.7998 1.7998 52.0996 3.7998c56.8682 6.62891 112.369 21.4697 163.301 42.7998c2.89941 1.2002 5.89941 2 9.09961 1.2002
+c6.7002 -1.7998 9 -9 4.09961 -13.9004c-2.98828 -2.74707 -6.16797 -5.2002 -9.59961 -7.39941c-30.7002 -21.1006 -64.2002 -36.4004 -99.5996 -47.9004c-24.0801 -7.76074 -49.5137 -13.7686 -75.1006 -17.5996c-17.4854 -2.67871 -35.0918 -4.29395 -53.2002 -4.7998
+c-0.847656 -0.0517578 -1.68066 -0.152344 -2.5 -0.300781h-21.0996c-0.818359 0.148438 -1.65234 0.249023 -2.5 0.300781c-3.59961 0.199219 -7.2002 0.299805 -10.7002 0.399414c-17.1182 0.776367 -33.8633 2.55957 -50.3994 5.2998
+c-27.5244 4.48633 -54.7959 11.6387 -80.4004 20.9004c-54.1943 19.5449 -103.535 49.2734 -145.6 87c-1.80078 1.59961 -3 3.7998 -4.40039 5.7002v2zM172 382.9c2.7998 0 5.5 0 8.2998 -0.100586c3.2998 -0.5 6.60059 -0.799805 9.7998 -1.5
+c21.3008 -4.39941 35.4004 -17.2998 43.9004 -36.8994c6.90039 -15.9004 8.59961 -32.7002 8.09961 -49.8008c-0.399414 -15.3994 -3.2998 -30.1992 -10.2998 -44.0996c-9.2002 -18.4004 -23.3994 -30.9004 -43.7998 -34.9004c-22.5 -4.39941 -43.0996 0.5 -61 15.4004
+c-0.5 0.5 -1.09961 1 -2.2002 1.90039v-72.4004c0 -1 0 -2 -0.0996094 -3c-0.299805 -3 -2.10059 -5 -5 -5c-7 -0.0996094 -14.1006 -0.0996094 -21.1006 0c-2.89941 0.0996094 -4.69922 2 -4.89941 5c-0.100586 1 -0.100586 2 -0.100586 3v209.3
+c0 6.90039 1.30078 8.2002 8.2002 8.2002h11.5c4.60059 0 6.90039 -2 7.60059 -6.59961c0.5 -2.7002 0.899414 -5.5 1.2998 -8.2002c0.0537109 -0.494141 0.193359 -0.970703 0.399414 -1.40039c2.5 1.90039 4.7002 3.7002 7.10059 5.40039
+c10.8691 7.98535 23.957 13.3662 38 15.0996zM124.6 341c0.100586 -14.0996 0 -28 0 -42.0996c0 -14.1006 0.100586 -28.1006 0 -42.2002c-0.00585938 -0.0849609 -0.0126953 -0.165039 -0.0126953 -0.250977c0 -1.29102 0.686523 -2.42188 1.71289 -3.04883
+c11.2002 -7.90039 23.4004 -13.3008 37.4004 -13.9004c20.2002 -0.900391 35.7998 7.2002 42.5996 28.5c3.2002 10 4 20.2002 4 30.5996c0 11.2002 -1 22.3008 -4.89941 33c-6.40039 17.5 -18.6006 24.8008 -33.5 25.9004
+c-16.8008 1.2998 -31.9004 -3.7002 -45.6006 -13.2002c-1.02734 -0.605469 -1.71289 -1.7168 -1.71289 -2.99414c0 -0.103516 0.00390625 -0.205078 0.0126953 -0.305664zM330.3 382.9c4 0 8 0 11.9004 0.0996094c3.59961 -0.5 7.2002 -0.799805 10.7998 -1.2998
+c7.7002 -1.10059 15.0996 -3.10059 21.7998 -7.10059c11.6006 -6.89941 17.1006 -17.5 19 -30.3994c0.597656 -3.93945 0.905273 -7.87793 0.905273 -11.9834c0 -0.305664 -0.00195312 -0.611328 -0.00488281 -0.916992v-106
+c0.00292969 -0.157227 0.00488281 -0.282227 0.00488281 -0.44043c0 -0.794922 -0.0351562 -1.58203 -0.105469 -2.35938c-0.0742188 -2.59277 -2.19336 -4.67969 -4.7998 -4.7002c-5.39941 -0.0996094 -10.8994 -0.0996094 -16.2998 0
+c-2.90039 0.100586 -4.7998 2.10059 -5.40039 5.2002c-0.699219 3.59961 -1.19922 7.2002 -1.7998 11c-0.583984 -0.296875 -1.11816 -0.665039 -1.59961 -1.09961c-11.7998 -9.7002 -25.2002 -16.1006 -40.2998 -18.4004c-13.1006 -2 -26 -1.2002 -37.9004 5.40039
+c-12.4004 6.89941 -19.4004 17.6992 -21.4004 31.6992c-1.5 10.5 -0.799805 20.9004 3.90039 30.7002c6.09961 12.6006 16.5 20.4004 29.4004 24.9004c10.7998 3.7998 22 4.5 33.2998 3.89941c10.9355 -0.680664 21.6748 -2.35449 32 -4.89941
+c0.399414 -0.100586 0.799805 0 1.2998 -0.100586c0.107422 0.453125 0.174805 0.921875 0.200195 1.40039c-0.100586 8.2998 0 16.5996 -0.299805 24.9004c-0.200195 5.89941 -1.60059 11.5996 -5.30078 16.3994c-4.19922 5.5 -10.2998 7.40039 -16.7998 8.40039
+c-12.5 1.89941 -24.8994 0.899414 -37.2002 -1.40039c-7.89941 -1.5 -15.6992 -3.7002 -23.5 -5.7002c-4.69922 -1.19922 -6.69922 0.100586 -6.7998 4.90039c-0.0996094 3.2998 0.100586 6.59961 0 9.90039c-0.0996094 3.89941 1.7002 6.5 5.2998 7.69922
+c5.90039 2 11.8008 4.2002 17.9004 5.80078c9.3125 2.27539 18.9932 3.68164 28.9004 4.09961c0.899414 0.0996094 1.89941 0.299805 2.89941 0.400391zM365.3 255.2c-0.0996094 4.7002 0.100586 9.2998 0.100586 14.0996s-0.100586 9.5 0 14.2998
+c0 1.60059 -0.5 2.40039 -2.10059 2.60059c-8.39941 1.09961 -16.5996 2.7002 -25 3.39941c-2.34766 0.273438 -4.66895 0.400391 -7.08984 0.400391c-6.15625 0 -12.1016 -0.90918 -17.71 -2.59961c-8 -2.60059 -13.9004 -7.30078 -16.4004 -15.6006
+c-0.914062 -3.01953 -1.40527 -6.22168 -1.40527 -9.53906c0 -3.43457 0.527344 -6.74707 1.50586 -9.86035c1.77637 -6.16602 6.41895 -11.1133 12.3994 -13.3008c5.40039 -2.19922 11.1006 -2.39941 16.8008 -1.7998c13.8994 1.40039 26.1992 6.7998 37.3994 14.9004
+c0.90918 0.594727 1.50684 1.61719 1.50684 2.7832c0 0.0732422 -0.00195312 0.145508 -0.00683594 0.216797zM625.2 125.8v-17.2998c-0.700195 -3.59961 -1.2998 -7.2998 -2.10059 -10.9004c-4.39941 -20.2998 -11.8994 -39.1992 -24.6992 -55.5996
+c-3.97559 -4.76562 -8.1582 -9.17773 -12.7002 -13.4004c-1.33008 -1.21289 -2.98242 -2.09082 -4.7998 -2.5c-2.90039 -0.699219 -4.60059 1.2002 -4.10059 4.10059c0.243164 1.03027 0.584961 2.04785 1 3c5.7998 14.7998 11.7002 29.7002 15.7998 45.0996
+c2.10059 7.60059 3.90039 15.2998 3.5 23.2998c-0.199219 5.2002 -2.5 9 -7.59961 10.4004c-4.60352 1.3623 -9.46191 2.29004 -14.4004 2.7002c-11.3994 0.899414 -22.8994 0.200195 -34.2998 -0.900391c-7.7998 -0.799805 -15.5 -1.7002 -23.2998 -2.5
+c-0.607422 -0.0693359 -1.20215 -0.104492 -1.82715 -0.104492c-0.125 0 -0.249023 0.00195312 -0.373047 0.00488281c-1.5 -0.100586 -3.2002 0.299805 -3.59961 1.7998c-0.129883 0.450195 -0.197266 0.930664 -0.197266 1.42285
+c0 0.939453 0.253906 1.82031 0.697266 2.57715c1.00879 1.39258 2.25 2.56836 3.7002 3.5c12.0996 8.2998 25.6992 12.9004 40 15.5996c8.68945 1.59961 17.376 2.43945 26.5254 2.43945c4.26953 0 8.49707 -0.182617 12.6738 -0.539062
+c7.24512 -0.454102 14.3311 -1.80273 21 -3.90039c4.30078 -1.39941 8.10059 -3.2998 9.10059 -8.2998zM493.1 249c0.300781 -0.700195 0.501953 -1.2998 0.902344 -2.40039c2.59961 7.7002 5.2002 15 7.7002 22.2002l34.7998 100
+c0.5 1.40039 1.09961 2.7002 1.59961 4.10059c0.980469 3.02734 3.81543 5.21777 7.16699 5.21777c0.179688 0 0.357422 -0.00585938 0.533203 -0.0185547c6.60059 0 13.2998 0.100586 19.9004 0c2.7998 0 4.09961 -1.59961 3.7002 -4.39941
+c-0.335938 -1.89648 -0.884766 -3.76465 -1.60059 -5.5c-23.3662 -59.9336 -46.8994 -119.801 -70.5996 -179.601c-2.58691 -6.37598 -5.6875 -12.5654 -9.2002 -18.3994c-8.7998 -14.9004 -22.4004 -21.7998 -39.5 -21.4004c-5.7666 0.225586 -11.3984 0.905273 -16.9004 2
+c-5.39941 0.900391 -7.2998 3.40039 -7.39941 8.90039c-0.100586 3.2666 -0.100586 6.56641 0 9.89941c0.0996094 3.5 1.7998 5 5.2002 4.80078c2.5 -0.200195 5 -0.800781 7.5 -1c1.57227 -0.178711 3.11328 -0.264648 4.7334 -0.264648
+c3.68457 0 7.25879 0.473633 10.666 1.36426c7.2002 1.90039 12.2002 6.7998 15.2002 13.2998c3.40039 7.2998 6 15 9.2998 22.2998c1.90039 4.2002 1.5 7.7002 -0.200195 11.8008c-19.7998 48.5 -39.5 97 -59.1006 145.5
+c-0.770508 1.95117 -1.41797 4.02051 -1.90039 6.09961c-0.5 2.5 0.700195 4.5 3.2002 4.5c7.7002 0.0996094 15.2998 0 22.9004 -0.0996094c3.2002 0 5.2998 -1.90039 6.39941 -4.80078c2.10059 -5.59961 4.30078 -11.1992 6.30078 -16.8994
+c12.8994 -35.7666 25.7988 -71.5 38.6982 -107.2z" />
+    <glyph glyph-name="cc-amazon-pay" unicode="&#xf42d;" horiz-adv-x="576" 
+d="M124.7 246.2c0.0996094 11.7998 0 23.5 0 35.2998v35.2998c0 1.2998 0.399414 2 1.39941 2.7002c11.5 8 24.1006 12.0996 38.2002 11.0996c12.5 -0.899414 22.7002 -7 28.1006 -21.6992c3.2998 -8.90039 4.09961 -18.2002 4.09961 -27.7002
+c0 -8.7002 -0.700195 -17.2998 -3.40039 -25.6006c-5.69922 -17.7998 -18.6992 -24.6992 -35.6992 -23.8994c-11.7002 0.5 -21.9004 5 -31.4004 11.7002c-0.900391 0.799805 -1.40039 1.59961 -1.2998 2.7998zM279.6 231.6c-5.19922 2 -8.7998 5.7002 -10.3994 11.2002
+c-1.7002 5.40039 -1.7002 10.7998 -0.100586 16.2002c2 6.90039 7 10.9004 13.7002 13.0996c6.7998 2.2002 13.7998 2.5 20.7998 1.90039c7 -0.700195 13.9004 -2 20.9004 -2.90039c1.40039 -0.199219 1.7998 -0.799805 1.7998 -2.19922c-0.0996094 -4 0 -8 0 -12
+c0 -3.90039 -0.0996094 -7.90039 0 -11.8008c0 -1.19922 -0.399414 -1.89941 -1.2998 -2.5c-9.40039 -6.7998 -19.7002 -11.2998 -31.2998 -12.5c-4.7998 -0.5 -9.5 -0.299805 -14.1006 1.5zM576 368v-352c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48v352
+c0 26.5 21.5 48 48 48h480c26.5 0 48 -21.5 48 -48zM368.5 344.1c0.400391 -1.69922 0.900391 -3.39941 1.59961 -5.09961c16.5 -40.5996 32.9004 -81.2998 49.5 -121.9c1.40039 -3.5 1.7002 -6.39941 0.200195 -9.89941
+c-2.7998 -6.2002 -4.89941 -12.6006 -7.7998 -18.7002c-2.59961 -5.5 -6.7002 -9.5 -12.7002 -11.2002c-4.2002 -1.09961 -8.5 -1.2998 -12.8994 -0.899414c-2.10059 0.199219 -4.2002 0.699219 -6.30078 0.799805c-2.7998 0.200195 -4.19922 -1.10059 -4.2998 -4
+c-0.0996094 -2.7998 -0.0996094 -5.60059 0 -8.2998c0.100586 -4.60059 1.60059 -6.7002 6.2002 -7.5c4.7002 -0.800781 9.40039 -1.60059 14.2002 -1.7002c14.2998 -0.299805 25.7002 5.39941 33.0996 17.8994c2.90039 4.90039 5.60059 10.1006 7.7002 15.4004
+c19.7998 50.0996 39.5 100.3 59.2002 150.5c0.599609 1.5 1.09961 3 1.2998 4.59961c0.400391 2.40039 -0.700195 3.60059 -3.09961 3.7002c-5.60059 0.100586 -11.1006 0 -16.7002 0c-3.10059 0 -5.2998 -1.39941 -6.40039 -4.2998
+c-0.399414 -1.09961 -0.899414 -2.2998 -1.2998 -3.40039l-29.0996 -83.6992c-2.10059 -6.10059 -4.2002 -12.1006 -6.5 -18.6006c-0.400391 0.900391 -0.600586 1.40039 -0.800781 1.90039c-10.7998 29.8994 -21.5996 59.8994 -32.3994 89.7998
+c-1.7002 4.7002 -3.5 9.5 -5.2998 14.2002c-0.900391 2.5 -2.7002 4 -5.40039 4c-6.40039 0.0996094 -12.7998 0.200195 -19.2002 0.0996094c-2.2002 0 -3.2998 -1.59961 -2.7998 -3.7002zM242.4 242c1.69922 -11.7002 7.59961 -20.7998 18 -26.5996
+c9.89941 -5.5 20.6992 -6.2002 31.6992 -4.60059c12.7002 1.90039 23.9004 7.2998 33.8008 15.5c0.399414 0.299805 0.799805 0.600586 1.39941 1c0.5 -3.2002 0.900391 -6.2002 1.5 -9.2002c0.5 -2.59961 2.10059 -4.2998 4.5 -4.39941
+c4.60059 -0.100586 9.10059 -0.100586 13.7002 0c2.2998 0.0996094 3.7998 1.59961 4 3.89941c0.0996094 0.800781 0.0996094 1.60059 0.0996094 2.30078v88.7998c0 3.59961 -0.199219 7.2002 -0.699219 10.7998c-1.60059 10.7998 -6.2002 19.7002 -15.9004 25.4004
+c-5.59961 3.2998 -11.7998 5 -18.2002 5.89941c-3 0.400391 -6 0.700195 -9.09961 1.10059h-10c-0.799805 -0.100586 -1.60059 -0.300781 -2.5 -0.300781c-8.2002 -0.399414 -16.2998 -1.39941 -24.2002 -3.5c-5.09961 -1.2998 -10 -3.19922 -15 -4.89941
+c-3 -1 -4.5 -3.2002 -4.40039 -6.5c0.100586 -2.7998 -0.0996094 -5.60059 0 -8.2998c0.100586 -4.10059 1.80078 -5.2002 5.7002 -4.10059c6.5 1.7002 13.1006 3.5 19.7002 4.7998c10.2998 1.90039 20.7002 2.7002 31.0996 1.2002
+c5.40039 -0.799805 10.5 -2.39941 14.1006 -7c3.09961 -4 4.2002 -8.7998 4.39941 -13.7002c0.300781 -6.89941 0.200195 -13.8994 0.300781 -20.7998c0 -0.399414 -0.100586 -0.700195 -0.200195 -1.2002c-0.400391 0 -0.799805 0 -1.10059 0.100586
+c-8.7998 2.09961 -17.6992 3.59961 -26.7998 4.09961c-9.5 0.5 -18.8994 -0.0996094 -27.8994 -3.2002c-10.8008 -3.7998 -19.5 -10.2998 -24.6006 -20.7998c-4.09961 -8.2998 -4.59961 -17 -3.39941 -25.7998zM98.7002 341.1v-175.3c0 -0.799805 0 -1.7002 0.0996094 -2.5
+c0.200195 -2.5 1.7002 -4.09961 4.10059 -4.2002c5.89941 -0.0996094 11.7998 -0.0996094 17.6992 0c2.5 0 4 1.7002 4.10059 4.10059c0.0996094 0.799805 0.0996094 1.7002 0.0996094 2.5v60.7002c0.900391 -0.700195 1.40039 -1.2002 1.90039 -1.60059
+c15 -12.5 32.2002 -16.5996 51.0996 -12.8994c17.1006 3.39941 28.9004 13.8994 36.7002 29.1992c5.7998 11.6006 8.2998 24.1006 8.7002 37c0.5 14.3008 -1 28.4004 -6.7998 41.7002c-7.10059 16.4004 -18.9004 27.2998 -36.7002 30.9004
+c-2.7002 0.599609 -5.5 0.799805 -8.2002 1.2002h-7c-1.2002 -0.200195 -2.40039 -0.300781 -3.59961 -0.5c-11.7002 -1.40039 -22.3008 -5.80078 -31.8008 -12.7002c-2 -1.40039 -3.89941 -3 -5.89941 -4.5c-0.100586 0.5 -0.299805 0.799805 -0.400391 1.2002
+c-0.399414 2.2998 -0.700195 4.59961 -1.09961 6.89941c-0.600586 3.90039 -2.5 5.5 -6.40039 5.60059h-9.7002c-5.89941 0.0996094 -6.89941 -1 -6.89941 -6.80078zM493.6 109c-2.69922 0.700195 -5.09961 0 -7.59961 -1c-43.9004 -18.4004 -89.5 -30.2002 -136.8 -35.7998
+c-14.5 -1.7002 -29.1006 -2.7998 -43.7002 -3.2002c-26.5996 -0.700195 -53.2002 0.799805 -79.5996 4.2998c-17.8008 2.40039 -35.5 5.7002 -53 9.90039c-37 8.89941 -72.7002 21.7002 -106.7 38.7998c-8.7998 4.40039 -17.4004 9.2998 -26.1006 14
+c-3.7998 2.09961 -6.19922 1.5 -8.19922 -2.09961v-1.7002c1.19922 -1.60059 2.19922 -3.40039 3.69922 -4.7998c36 -32.2002 76.6006 -56.5 122 -72.9004c21.9004 -7.90039 44.4004 -13.7002 67.3008 -17.5c14 -2.2998 28 -3.7998 42.1992 -4.5
+c3 -0.0996094 6 -0.200195 9 -0.400391c0.700195 0 1.40039 -0.199219 2.10059 -0.299805h17.7002c0.699219 0.100586 1.39941 0.299805 2.09961 0.299805c14.9004 0.400391 29.7998 1.80078 44.5996 4c21.4004 3.2002 42.4004 8.10059 62.9004 14.7002
+c29.5996 9.60059 57.7002 22.4004 83.4004 40.1006c2.7998 1.89941 5.69922 3.7998 8 6.19922c4.2998 4.40039 2.2998 10.4004 -3.30078 11.9004zM544 136.7c-0.799805 4.2002 -4 5.7998 -7.59961 7c-5.7002 1.89941 -11.6006 2.7998 -17.6006 3.2998
+c-11 0.900391 -22 0.400391 -32.7998 -1.59961c-12 -2.2002 -23.4004 -6.10059 -33.5 -13.1006c-1.2002 -0.799805 -2.40039 -1.7998 -3.09961 -3c-0.600586 -0.899414 -0.700195 -2.2998 -0.5 -3.39941c0.299805 -1.30078 1.69922 -1.60059 3 -1.5
+c0.599609 0 1.19922 0 1.7998 0.0996094l19.5 2.09961c9.59961 0.900391 19.2002 1.5 28.7998 0.800781c4.09961 -0.300781 8.09961 -1.2002 12 -2.2002c4.2998 -1.10059 6.2002 -4.40039 6.40039 -8.7002c0.299805 -6.7002 -1.2002 -13.0996 -2.90039 -19.5
+c-3.5 -12.9004 -8.2998 -25.4004 -13.2998 -37.7998c-0.299805 -0.799805 -0.700195 -1.7002 -0.799805 -2.5c-0.400391 -2.5 1 -4 3.39941 -3.5c1.40039 0.299805 3 1.09961 4 2.09961c3.7002 3.60059 7.5 7.2002 10.6006 11.2002
+c10.6992 13.7998 17 29.5996 20.6992 46.5996c0.700195 3 1.2002 6.10059 1.7002 9.10059c0.200195 4.7002 0.200195 9.59961 0.200195 14.5z" />
+    <glyph glyph-name="ethereum" unicode="&#xf42e;" horiz-adv-x="320" 
+d="M311.9 187.2l-151.9 -92.7998l-152 92.7998l152 260.8zM160 64.5996l152 92.8008l-152 -221.4l-152 221.4z" />
+    <glyph glyph-name="korvue" unicode="&#xf42f;" horiz-adv-x="446" 
+d="M386.5 414c32.7002 0 59.5 -26.7998 59.5996 -59.5v-327c0 -32.7002 -26.5 -59.5 -59.5 -59.5h-327.1c-32.7002 0 -59.5 26.7998 -59.5 59.4004v327.1c0 32.7002 26.7998 59.5 59.5 59.5h327zM87.0996 327.2v-132h187.5l81.2002 132h-110.899l-61.8008 -116v116h-96z
+M248.9 55.0996h118.399l-88.5996 130.801h-191.5v-130.801h96v113.601z" />
+    <glyph glyph-name="elementor" unicode="&#xf430;" 
+d="M425.6 416c12.4004 0 22.4004 -10 22.4004 -22.4004v-403.199c0 -12.4004 -10 -22.4004 -22.4004 -22.4004h-403.199c-12.4004 0 -22.4004 10 -22.4004 22.4004v403.199c0 12.4004 10 22.4004 22.4004 22.4004h403.199zM164.3 92.5v199h-39.7998v-199h39.7998z
+M323.6 92.5v39.7998h-119.5v-39.7998h119.5zM323.6 172.1v39.8008h-119.5v-39.8008h119.5zM323.6 251.8v39.7998h-119.5v-39.7998h119.5z" />
+    <glyph glyph-name="youtube-square" unicode="&#xf431;" 
+d="M186.8 245.9l95.2002 -54.1006l-95.2002 -54.0996v108.2zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48zM406 191.7c0 0 0 59.5996 -7.59961 88.2002
+c-4.2002 15.7998 -16.5 28.1992 -32.2002 32.3994c-28.2998 7.7002 -142.2 7.7002 -142.2 7.7002s-113.9 0 -142.2 -7.7002c-15.7002 -4.2002 -28 -16.5996 -32.2002 -32.3994c-7.59961 -28.5 -7.59961 -88.2002 -7.59961 -88.2002s0 -59.6006 7.59961 -88.2002
+c4.2002 -15.7998 16.5 -27.7002 32.2002 -31.9004c28.2998 -7.59961 142.2 -7.59961 142.2 -7.59961s113.9 0 142.2 7.7002c15.7002 4.2002 28 16.0996 32.2002 31.8994c7.59961 28.5 7.59961 88.1006 7.59961 88.1006z" />
+    <glyph glyph-name="flipboard" unicode="&#xf44d;" 
+d="M0 416h448v-448h-448v448zM358.4 236.8v89.6006h-268.801v-268.801h89.6006v89.6006h89.5996v89.5996h89.6006z" />
+    <glyph glyph-name="hips" unicode="&#xf452;" horiz-adv-x="640" 
+d="M251.6 290.4v-201.801c0 -1.89941 -0.899414 -2.7998 -2.7998 -2.7998h-40.8994c-1.60059 0 -2.7002 1.40039 -2.7002 2.7998v201.801c0 1.39941 1.09961 2.7998 2.7002 2.7998h40.8994c1.90039 0 2.7998 -0.900391 2.7998 -2.7998zM156.5 280
+c18.7002 -13.5 28 -31.9004 28 -55.2998v-136.101c0 -1.89941 -0.900391 -2.7998 -2.7002 -2.7998h-27.2998c-9.09961 0 -16.4004 7.2998 -16.4004 16.2998v122.601c0 0.899414 2.7002 27 -45.7998 27c-48.5996 0 -45.7998 -26.2002 -45.7998 -27v-136.101
+c0 -1.89941 -0.900391 -2.7998 -2.7998 -2.7998h-41c-1.7998 0 -2.7002 0.900391 -2.7002 2.7998v279.2c0 1.7998 0.900391 2.7002 2.7002 2.7002h40.8994c1.90039 0 2.80078 -0.900391 2.80078 -2.7002v-81.2002c15.1992 7.7002 31.6992 11.5 49.7998 11.4004
+c24 -0.0996094 44.2002 -6.2002 60.2998 -18zM634.9 169.9c5.5 -12.6006 6.59961 -25.6006 3.09961 -39.1006c-9.59961 -36.8994 -44.9004 -45.5 -45.5996 -45.7998c-10.5 -3.09961 -23.6006 -4.2998 -36.3008 -4.2998c-16.5996 0 -32.5996 2.7002 -48.1992 8.2002
+c-9.7002 3.39941 -14.6006 10.2998 -14.6006 20.6992v34.4004c0 2.09961 2.2998 3.7002 4.40039 2.2998c13.7002 -10.2002 34.0996 -19.0996 58.3994 -19.0996c23.3008 0 32.8008 4.5 36.5 13.5996c3 7.90039 -0.599609 16.1006 -12.1992 21.2002l-53.6006 23.5
+c-21.3994 9.40039 -33.7998 24 -37.2002 43.5996c-5.69922 33.7002 22.2002 53.3008 22.7002 53.7002c13.2002 9.60059 32 15.4004 58.5 15.4004c19 0 37.4004 -3.2998 55.1006 -9.90039c1.2998 -0.5 1.89941 -1.2998 1.89941 -2.59961v-44.7002
+c0 -2.09961 -2.2998 -3.40039 -4 -2.40039c-39.7002 20.7002 -76.5996 12.3008 -84 6.80078c-6.59961 -4.90039 -6 -12.5 2.60059 -16.1006l57.5996 -25.2998c16.5 -7.09961 28.0996 -18.4004 34.9004 -34.0996zM376.2 298.2c60.3994 0 108.7 -48.2998 108.6 -108.601
+c0 -60.1992 -48.2002 -108.699 -108.7 -108.699c-21.8994 0 -41.1992 6.39941 -57.6992 19.0996v-88.7998c0 -1.7998 -0.900391 -2.7002 -2.80078 -2.7002h-40.8994c-2.10059 0 -2.7002 1.90039 -2.7002 2.7002v183.5c0 83.3994 72.5 103.5 104.2 103.5zM376.2 127.3
+c34.8994 0 62.2998 27.9004 62.2002 62.2002c0 34.5996 -27.7002 62.2002 -62.2002 62.2002c-34.6006 0 -62.2002 -27.7002 -62.2002 -62.2002c0 -17.2002 6 -31.7998 18.2002 -44c12.0996 -12.0996 26.7998 -18.2002 44 -18.2002zM228.3 375.5
+c15.9004 0 28.9004 -12.7002 28.9004 -28.9004c0 -15.7998 -12.7002 -28.8994 -28.9004 -28.8994s-28.8994 13.2998 -28.8994 28.8994c0.0996094 16 13 28.9004 28.8994 28.9004z" />
+    <glyph glyph-name="php" unicode="&#xf457;" horiz-adv-x="640" 
+d="M320 343.5c-171.3 0 -303.2 -72.2002 -303.2 -151.5s131.8 -151.5 303.2 -151.5c171.3 0 303.2 72.2002 303.2 151.5s-131.8 151.5 -303.2 151.5zM320 360.3c176.7 0 320 -75.2998 320 -168.3s-143.3 -168.3 -320 -168.3s-320 75.2998 -320 168.3s143.3 168.3 320 168.3z
+M218.2 205.5c7.39941 38.4004 -18.4004 34.2998 -56.4004 34.2998l-13.7002 -70.5996c34.3008 0 62.2002 -4.2002 70.1006 36.2998zM97.4004 97.7002l32.6992 168.7h70.7002c21.2002 0 36.7998 -5.5 46.5 -16.7002c18.6006 -21.4004 11.7998 -64.1006 -14.2998 -88.1006
+c-23.5996 -22.0996 -49.0996 -19.0996 -90.2002 -19.0996l-8.7002 -44.7998h-36.6992zM283.1 311.3h36.5l-8.69922 -44.7998c31.5 0 60.6992 2.2998 74.7998 -10.7002c14.7998 -13.5996 7.7002 -31 -8.2998 -113.1h-37c15.3994 79.3994 18.2998 86 12.6992 92
+c-5.39941 5.7998 -17.6992 4.59961 -47.3994 4.59961l-18.7998 -96.5996h-36.5zM505 205.5c7.40039 38.4004 -18.2002 34.2998 -56.4004 34.2998l-13.6992 -70.5996c33.3994 0 62.0996 -4.7998 70.0996 36.2998zM384.2 97.7002l32.7998 168.7h70.7002
+c21.2002 0 36.7998 -5.5 46.5 -16.7002c18.5996 -21.4004 11.7998 -64.1006 -14.2998 -88.1006c-23.1006 -21.5996 -47 -19.0996 -90.2002 -19.0996l-8.7002 -44.7998h-36.7998z" />
+    <glyph glyph-name="quinscape" unicode="&#xf459;" horiz-adv-x="512" 
+d="M313.6 -26.5996c4.40039 -4.40039 8.10059 -9 13.3008 -12.5c-21.7051 -6.54492 -44.666 -10.1084 -68.4922 -10.1084c-0.636719 0 -1.27246 0.00292969 -1.9082 0.0078125c-135 0 -244.5 109.5 -244.5 244.601c0 135.1 109.4 244.6 244.5 244.6
+s244.6 -109.5 244.6 -244.6c0 -35.3008 -6.89941 -67.4004 -20.2998 -97.7002c-3 5.7002 -7.2002 10.2002 -11.2002 15.2998c11.2002 93.5 -62.0996 176.6 -157 176.6c-87.2578 0 -158.1 -70.8418 -158.1 -158.1s70.8418 -158.1 158.1 -158.1h1zM313.5 -26.5
+l0.400391 -0.0996094zM391.9 142.4c54.7393 0 99.1992 -44.4414 99.1992 -99.1797v-0.0205078c0 -54.75 -44.4492 -99.2002 -99.1992 -99.2002s-99.2002 44.4502 -99.2002 99.2002s44.4502 99.2002 99.2002 99.2002z" />
+    <glyph glyph-name="readme" unicode="&#xf4d5;" horiz-adv-x="576" 
+d="M528.3 401.5c26.4004 -0.200195 47.7002 -21.7002 47.7002 -48.0996v-245.7c0 -26.5 -21.5 -48 -48 -48h-89.7002c-102.1 0 -132.6 -24.4004 -147.3 -75c-0.799805 -2.7998 -5.2998 -2.7998 -6 0c-14.5996 50.5996 -45.0996 75 -147.3 75h-89.7002
+c-26.5 0 -48 21.5 -48 48v245.8c0 26.5 21.5 48 48 48h139.7c48.0996 0 89.7998 -33.2998 100.399 -80.2998c10.5 47 52.3008 80.2998 100.4 80.2998h139.8zM242 136.1h0.0996094v22.9004c0 2 -1.59961 3.5 -3.5 3.5h-160.399c-2 0 -3.5 -1.59961 -3.5 -3.5v-22.9004
+c0 -2 1.59961 -3.5 3.5 -3.5h160.3c2 0 3.5 1.60059 3.5 3.5zM242 197h0.0996094v22.9004c0 2 -1.59961 3.5 -3.5 3.5h-160.399c-2 0 -3.5 -1.60059 -3.5 -3.5v-22.9004c0 -2 1.59961 -3.5 3.5 -3.5h160.3c2 0 3.5 1.59961 3.5 3.5zM242 257.9h0.0996094v22.8994
+c0 2 -1.59961 3.5 -3.5 3.5h-160.399c-2 0 -3.5 -1.59961 -3.5 -3.5v-22.8994c0 -2 1.59961 -3.5 3.5 -3.5h160.3c2 0 3.5 1.59961 3.5 3.5zM501.3 136.2h0.100586v22.8994c0 2 -1.60059 3.5 -3.5 3.5h-160.4c-2 0 -3.5 -1.59961 -3.5 -3.5v-22.8994
+c0 -2 1.59961 -3.5 3.5 -3.5h160.3c2 0 3.5 1.59961 3.5 3.5zM501.3 197.1h0.100586v22.9004c0 2 -1.60059 3.5 -3.5 3.5h-160.4c-2 0 -3.5 -1.59961 -3.5 -3.5v-22.9004c0 -2 1.59961 -3.5 3.5 -3.5h160.3c2 0 3.5 1.60059 3.5 3.5zM501.3 258h0.100586v22.7998
+c0 2 -1.60059 3.5 -3.5 3.5h-160.4c-2 0 -3.5 -1.59961 -3.5 -3.5v-22.7998c0 -2 1.59961 -3.5 3.5 -3.5h160.3c2 0 3.5 1.59961 3.5 3.5z" />
+    <glyph glyph-name="java" unicode="&#xf4e4;" horiz-adv-x="384" 
+d="M277.74 135.1c-94.5 -24.8994 -277 -13.2998 -224.5 12.1006c44.5 21.3994 80.5996 19 80.5996 19s-93.0996 -22.1006 -33 -30.1006c25.4004 -3.39941 76 -2.59961 123.101 1.30078c38.5 3.19922 77.1992 10.1992 77.1992 10.1992s-13.5996 -5.7998 -23.3994 -12.5z
+M192.34 167.2c-48.5 43.7998 -84.0996 82.2998 -60.2002 118.2c35.1006 52.5 132.2 78.0996 110.7 162.6c0 0 53.1602 -53.2002 -50.5 -135c-83.0996 -65.5996 -19 -103.1 0 -145.8zM306.94 343.4c-111.601 -64.7002 -91 -83.5 -64.1006 -121.301
+c28.7998 -40.5 -33.8994 -72.8994 -33.8994 -72.8994s31.1992 25.5996 6.5 54c-83.7002 96.3994 91.5996 140.2 91.5 140.2zM300.84 72.9004c96.1006 49.8994 51.6006 97.8994 20.6006 91.3994c-3.75195 -0.703125 -7.4834 -1.72656 -11 -3
+c2.01367 2.86523 4.85742 5.07227 8.19922 6.2998c61.3008 21.6006 108.5 -63.5996 -19.7998 -97.2998c0.78125 0.773438 1.44922 1.63965 2 2.60059zM348 10.5996c53 -23.8994 -115.16 -72 -319.4 -38.7998c-74.8994 12.1006 36.1006 54.5 56.4004 40.2002
+c0 0 -6.5 0.400391 -17.7002 -2c-10.7998 -2.2998 -45.0996 -13.4004 -26.7998 -21.2998c50.7998 -22.1006 233.7 -16.7998 291.6 0.700195c30.4004 9.2998 15.9004 21.1992 15.9004 21.1992zM124.44 52c0 0 -19.6006 -11.4004 13.8994 -15.2002
+c40.6006 -4.59961 61.2998 -4 106 4.5c8.91016 -5.33594 18.4062 -9.99512 28.2002 -13.7998c-100.2 -42.9004 -226.8 2.5 -148.1 24.5zM304.24 -45.2002c69.7998 13.2002 76.2002 29.7002 76.2002 29.7002c-3.30078 -43.5996 -144.9 -52.7998 -237.101 -46.9004
+c-60.5996 3.90039 -72.3994 13.7002 -72.3994 13.6006c57.5 -9.5 154.6 -11.2002 233.3 3.59961zM260.64 95c6.01562 -5.61719 13.1807 -10.0039 21.1006 -12.7998c-121.3 -35.5 -256.3 -2.90039 -169.5 25.8994c0 0 -21.9004 -16.1992 11.5996 -19.6992
+c43.2998 -4.5 77.6006 -4.80078 136.8 6.59961z" />
+    <glyph glyph-name="pied-piper-hat" unicode="&#xf4e5;" horiz-adv-x="640" 
+d="M640 423.1c-80.7998 -53.5996 -89.4004 -92.5 -96.4004 -104.399c-6.69922 -12.2002 -11.6992 -60.2998 -23.2998 -83.6006c-11.7002 -23.5996 -54.2002 -42.1992 -66.0996 -50c-11.7002 -7.7998 -28.2998 -38.0996 -41.9004 -64.1992
+c-108.1 4.39941 -167.399 -38.8008 -259.2 -93.6006c29.4004 9.7002 43.3008 16.7002 43.3008 16.7002c94.1992 36 139.3 68.2998 281.1 49.2002c1.09961 0 1.90039 -0.600586 2.7998 -0.799805c3.90039 -2.2002 5.2998 -6.90039 3.10059 -10.8008l-53.9004 -95.7998
+c-2.5 -4.7002 -7.7998 -7.2002 -13.0996 -6.09961c-126.801 23.7998 -226.9 -17.2998 -318.9 -18.6006c-73.4004 -1.09961 -97.5 33.5 -97.5 35.1006c0 1.09961 0.599609 1.7002 1.7002 1.7002c0 0 38.2998 0 103.1 15.2998c73.6006 140.3 139.2 189.399 210.601 189.399
+c0 0 71.6992 0 90.5996 -61.8994c22.7998 39.7002 28.2998 49.2002 28.2998 49.2002c5.2998 9.39941 35 77.1992 86.4004 141.399c51.5 64 90.3994 79.9004 119.3 91.7998z" />
+    <glyph glyph-name="creative-commons-by" unicode="&#xf4e7;" horiz-adv-x="496" 
+d="M314.9 253.6v-101.399h-28.3008v-120.5h-77.0996v120.399h-28.2998v101.5c0 4.40039 1.59961 8.2002 4.59961 11.3008c3.10059 3.09961 6.90039 4.69922 11.2998 4.69922h101.9c4.09961 0 7.7998 -1.59961 11.0996 -4.69922
+c3.10059 -3.2002 4.80078 -6.90039 4.80078 -11.3008zM213.4 317.3c0 23.2998 11.5 35 34.5 35s34.5 -11.7002 34.5 -35c0 -23 -11.5 -34.5 -34.5 -34.5s-34.5 11.5 -34.5 34.5zM247.6 440c141.801 0 248.4 -110.1 248.4 -248c0 -147.1 -118.5 -248 -248.4 -248
+c-134 0 -247.6 109.5 -247.6 248c0 132.9 104.7 248 247.6 248zM248.4 395.3c-118.2 0 -203.7 -97.8994 -203.7 -203.3c0 -109.8 91.2002 -202.8 203.7 -202.8c103.199 0 202.8 81.0996 202.8 202.8c0.0996094 113.8 -90.2002 203.3 -202.8 203.3z" />
+    <glyph glyph-name="creative-commons-nc" unicode="&#xf4e8;" horiz-adv-x="496" 
+d="M247.6 440c139.801 0 248.4 -107.9 248.4 -248c0 -147.2 -118.5 -248 -248.4 -248c-134.5 0 -247.6 110.8 -247.6 248c0 132.9 104.7 248 247.6 248zM55.7998 258.9c-7.39941 -20.4004 -11.0996 -42.7002 -11.0996 -66.9004c0 -110.9 92.0996 -202.4 203.7 -202.4
+c122.399 0 177.199 101.801 178.5 104.101l-93.4004 41.5996c-7.7002 -37.0996 -41.2002 -53 -68.2002 -55.3994v-38.1006h-28.7998v38.2002c-27.5 0.299805 -52.5996 10.2002 -75.2998 29.7002l34.0996 34.5c31.7002 -29.4004 86.4004 -31.7998 86.4004 2.2002
+c0 6.19922 -2.2002 11.1992 -6.60059 15.0996c-14.1992 6 -1.7998 0.0996094 -219.3 97.4004zM248.4 395.7c-38.4004 0 -112.4 -8.7002 -170.5 -93l94.7998 -42.5c10 31.2998 40.3994 42.8994 63.7998 44.2998v38.0996h28.7998v-38.0996
+c22.7002 -1.2002 43.4004 -8.90039 62 -23l-32.2998 -33.2002c-42.7002 29.9004 -83.5 8 -70 -11.0996c53.4004 -24.1006 43.7998 -19.7998 93 -41.6006l127.1 -56.6992c4.10059 17.3994 6.2002 35.0996 6.2002 53.0996c0 57 -19.7998 105 -59.2998 143.9
+c-39.2998 39.8994 -87.2002 59.7998 -143.6 59.7998z" />
+    <glyph glyph-name="creative-commons-nc-eu" unicode="&#xf4e9;" horiz-adv-x="496" 
+d="M247.7 440c140.7 0 248.3 -109 248.3 -248c0 -147.1 -118.1 -248 -248.3 -248c-136 0 -247.7 111.7 -247.7 248c0 131.2 103.6 248 247.7 248zM248.3 -10.7002c122.601 0 177.3 102.2 178.8 104.3l-128.3 56.8008h-90.2998
+c9.2002 -39.3008 39.0996 -50.2002 67.2998 -50.2002c19.1006 0 38.6006 6.2002 47.2998 10.7998l10 -46.0996c-14.1992 -7.90039 -38.1992 -15.8008 -64.7998 -15.8008c-57.3994 0 -113.2 34.3008 -124.6 101.301h-27v29.5h22.7998
+c0 16.2998 0.400391 13.2998 0.400391 19.5h-23.3008v29.5h4.7002l-65.7002 29.0996c-7.19922 -20.7998 -10.8994 -42.7998 -10.8994 -66c0 -110.2 91.5996 -202.7 203.6 -202.7zM231.6 179.9l-0.5 0.399414l0.900391 -0.399414h-0.400391zM308.8 199.4l136.101 -60.5
+c4.19922 16.5996 6.2998 34.1992 6.2998 52.8994c0 113.2 -90 203.4 -203 203.4c-13 0 -106.101 3.2002 -170.7 -93.6006l81.5996 -36.0996c4.10059 7.2002 8.60059 14 13.9004 20.0996c23.7002 26.5 56.9004 42.3008 95.9004 42.3008
+c25.2998 0 47.2998 -5.80078 62.2998 -12.4004l-11.6006 -47.2998c-10.7998 4.59961 -27.7998 10 -46.0996 10c-20 0 -38.2002 -6.60059 -51.0996 -22.4004c-3.40039 -3.7998 -6.30078 -8.7998 -8.80078 -14.2998l28.6006 -12.5996h70.2998v-29.5h-3.7002z" />
+    <glyph glyph-name="creative-commons-nc-jp" unicode="&#xf4ea;" horiz-adv-x="496" 
+d="M247.7 440c140.8 0 248.3 -109.2 248.3 -248c0 -147.2 -118.1 -248 -248.3 -248c-135.9 0 -247.7 111.6 -247.7 248c0 131.2 103.6 248 247.7 248zM248.3 -10.7002c118.101 0 173.7 96.1006 175.2 98.2998l-81 36.1006v-35.7002h-64.2002v-56h-61.7002v56h-63.7998
+v38.7002h63.7998v18.7002l-5.69922 11.7998h-58.1006v38.5996h27.9004l-127 56.5c-6 -19.0996 -9 -39.2002 -9 -60.2998c0 -110.2 91.5996 -202.7 203.6 -202.7zM335.9 126.6l-54.7002 24.3008l-2.90039 -5.60059v-18.7002h57.6006zM342.4 178l101 -45.0996
+c5.19922 18.3994 7.89941 38 7.89941 59c0 113.399 -90.2002 203.399 -203 203.399c-91.0996 0 -145.899 -54 -173.7 -98.0996l81.9004 -36.5l-27.2998 51h65.7998l39.5996 -85.7002l23 -10.2002l43.4004 96h65.7998l-63 -116h38.6006v-17.7998z" />
+    <glyph glyph-name="creative-commons-nd" unicode="&#xf4eb;" horiz-adv-x="496" 
+d="M247.6 440c141.801 0 248.4 -110.1 248.4 -248c0 -147.1 -118.5 -248 -248.4 -248c-134 0 -247.6 109.5 -247.6 248c0 132.9 104.7 248 247.6 248zM248.4 395.3c-118.2 0 -203.7 -97.8994 -203.7 -203.3c0 -109.8 91.2002 -202.8 203.7 -202.8
+c103.199 0 202.8 81.0996 202.8 202.8c0.0996094 113.8 -90.2002 203.3 -202.8 203.3zM342.4 251v-42.5h-180.301v42.5h180.301zM342.4 171.2v-42.5h-180.301v42.5h180.301z" />
+    <glyph glyph-name="creative-commons-pd" unicode="&#xf4ec;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111.1 248 -248c0 -137 -111 -248 -248 -248s-248 111 -248 248c0 136.9 111 248 248 248zM248 -9.5c76.0996 0 142.4 42.4004 176.7 104.8c-1.40039 0.299805 12.5 -5.7998 -217.9 96.7998c0.200195 -32 16.1006 -71.8994 53.9004 -71.8994
+c18.7002 0 30.7998 10.3994 36.2998 16.7002l36.0996 -43.9004c-25.8994 -22.7998 -56.5 -29.5 -79.3994 -29.5c-46.5 0 -120.4 27.9004 -120.4 126.9c0 11.3994 1.2002 22.3994 3.2998 32.8994l-78.7998 35.1006c-45.5996 -129.9 51 -267.9 190.2 -267.9zM442.2 140.5
+c0.200195 -0.200195 0.299805 -0.299805 0.599609 -0.400391c4.40039 16.6006 6.7998 34 6.7998 52c0 111.101 -90.3994 201.5 -201.5 201.5c-70.3994 0 -132.399 -36.2998 -168.5 -91.1992l74.9004 -33.4004c19.7998 31.0996 53.2998 51.5996 100.7 51.5996
+c20.0996 0 51 -4.19922 78.0996 -27.5l-40.3994 -41.5996c-19.8008 19.7002 -55.9004 23 -74.7002 -11z" />
+    <glyph glyph-name="creative-commons-pd-alt" unicode="&#xf4ed;" horiz-adv-x="496" 
+d="M247.6 440c141.801 0 248.4 -110.1 248.4 -248c0 -147.1 -118.5 -248 -248.4 -248c-134 0 -247.6 109.5 -247.6 248c0 132.9 104.7 248 247.6 248zM248.4 -10.7998c103.199 0 202.8 81.0996 202.8 202.8c0.0996094 113.8 -90.2002 203.3 -202.8 203.3
+c-118.2 0 -203.7 -97.8994 -203.7 -203.3c0 -109.8 91.2002 -202.8 203.7 -202.8zM316.7 262c21.3994 0 70 -5.2002 70 -68.5996c0 -63.5 -48.6006 -68.6006 -70 -68.6006h-53.2002v137.2h53.2002zM317.5 153.5c24 0 34.5 15.2998 34.5 39.9004
+c0 42 -31.2002 39.8994 -35 39.8994l-19.4004 -0.0996094v-79.7002h19.9004zM203.7 262c33.7002 0 50.5 -15.5 50.5 -46.5c0 -9 -3 -46.5 -57.1006 -46.5h-27v-44.2998h-34.5996v137.3h68.2002zM198.8 194.7c27.9004 0 30 41.5996 -0.899414 41.5996h-28.3008v-41.5996
+h29.2002z" />
+    <glyph glyph-name="creative-commons-remix" unicode="&#xf4ee;" horiz-adv-x="496" 
+d="M247.6 440c141.801 0 248.4 -110.1 248.4 -248c0 -147.1 -118.5 -248 -248.4 -248c-134 0 -247.6 109.5 -247.6 248c0 132.9 104.7 248 247.6 248zM248.4 395.3c-118.2 0 -203.7 -97.8994 -203.7 -203.3c0 -109.8 91.2002 -202.8 203.7 -202.8
+c103.199 0 202.8 81.0996 202.8 202.8c0.0996094 113.8 -90.2002 203.3 -202.8 203.3zM410.1 187.6l4.90039 -2.19922v-70c-7.2002 -3.60059 -63.4004 -27.5 -67.2998 -28.8008c-6.5 1.80078 -113.7 46.8008 -137.3 56.2002l-64.2002 -26.5996l-63.2998 27.5v63.7998
+l59.2998 24.7998c-0.700195 0.700195 -0.400391 -5 -0.400391 70.4004l67.2998 29.7002l151.9 -62.9004v-61.5996zM339.7 106.1v43.8008h-0.400391v1.7998l-113.8 46.5v-45.2002l113.8 -46.9004v0.400391zM347.2 163.7l39.8994 16.3994l-36.7998 15.5l-39 -16.3994z
+M399.5 125.6v43l-44.2998 -18.5996v-43.4004z" />
+    <glyph glyph-name="creative-commons-sa" unicode="&#xf4ef;" horiz-adv-x="496" 
+d="M247.6 440c141.801 0 248.4 -110.1 248.4 -248c0 -147.1 -118.5 -248 -248.4 -248c-134 0 -247.6 109.5 -247.6 248c0 132.9 104.7 248 247.6 248zM248.4 395.3c-118.2 0 -203.7 -97.8994 -203.7 -203.3c0 -109.8 91.2002 -202.8 203.7 -202.8
+c103.199 0 202.8 81.0996 202.8 202.8c0.0996094 113.8 -90.2002 203.3 -202.8 203.3zM137.7 227c13 83.9004 80.5 95.7002 108.899 95.7002c99.8008 0 127.5 -82.5 127.5 -134.2c0 -63.5996 -41 -132.9 -128.899 -132.9c-38.9004 0 -99.1006 20 -109.4 97h62.5
+c1.5 -30.0996 19.6006 -45.1992 54.5 -45.1992c23.2998 0 58 18.1992 58 82.7998c0 82.5 -49.0996 80.5996 -56.7002 80.5996c-33.0996 0 -51.6992 -14.5996 -55.7998 -43.7998h18.2002l-49.2002 -49.2002l-49 49.2002h19.4004z" />
+    <glyph glyph-name="creative-commons-sampling" unicode="&#xf4f0;" horiz-adv-x="496" 
+d="M247.6 440c141.801 0 248.4 -110.1 248.4 -248c0 -147.1 -118.5 -248 -248.4 -248c-134 0 -247.6 109.5 -247.6 248c0 132.9 104.7 248 247.6 248zM248.4 395.3c-118.2 0 -203.7 -97.8994 -203.7 -203.3c0 -109.8 91.2002 -202.8 203.7 -202.8
+c103.199 0 202.8 81.0996 202.8 202.8c0.0996094 113.8 -90.2002 203.3 -202.8 203.3zM252 342.1c2.7998 0.300781 11.5 -1 11.5 -11.5l6.59961 -107.199l4.90039 59.2998c0 6 4.7002 10.5996 10.5996 10.5996c5.90039 0 10.6006 -4.7002 10.6006 -10.5996
+c0 -2.5 -0.5 5.7002 5.7002 -81.5l5.7998 64.2002c0.299805 2.89941 2.89941 9.2998 10.2002 9.2998c3.7998 0 9.89941 -2.2998 10.5996 -8.90039l11.5 -96.5l5.2998 12.7998c1.7998 4.40039 5.2002 6.60059 10.2002 6.60059h58v-21.2998h-50.9004l-18.1992 -44.3008
+c-3.90039 -9.89941 -19.5 -9.09961 -20.8008 3.10059l-4 31.8994l-7.5 -92.5996c-0.299805 -3 -3 -9.2998 -10.1992 -9.2998c-3 0 -9.80078 2.09961 -10.6006 9.2998c0 1.90039 0.600586 -5.7998 -6.2002 77.9004l-5.2998 -72.2002
+c-1.09961 -4.7998 -4.7998 -9.2998 -10.5996 -9.2998c-2.90039 0 -9.7998 2 -10.6006 9.2998c0 1.89941 0.5 -6.7002 -5.7998 87.7002l-5.7998 -94.8008c0 -6.2998 -3.59961 -12.3994 -10.5996 -12.3994c-5.2002 0 -10.6006 4.09961 -10.6006 12l-5.7998 87.7002
+c-5.7998 -92.5 -5.2998 -84 -5.2998 -85.9004c-1.10059 -4.7998 -4.7998 -9.2998 -10.6006 -9.2998c-3 0 -9.7998 2.09961 -10.5996 9.2998c0 0.700195 -0.400391 1.09961 -0.400391 2.59961l-6.19922 88.6006l-4.90039 -56.7002
+c-0.700195 -6.5 -6.7002 -9.2998 -10.5996 -9.2998c-5.80078 0 -9.60059 4.09961 -10.6006 8.89941l-11.0996 76.4004c-2 -4 -3.5 -8.40039 -11.1006 -8.40039h-51.3994v21.3008h44.7998l13.7002 27.8994c4.39941 9.90039 18.2002 7.2002 19.8994 -2.7002l3.10059 -20.3994
+l8.39941 97.8994c0 6 4.80078 10.6006 10.6006 10.6006c0.5 0 10.5996 0.200195 10.5996 -12.4004l4.90039 -69.0996l6.59961 92.5996c0 10.1006 9.5 10.6006 10.2002 10.6006c0.599609 0 10.5996 -0.700195 10.5996 -10.6006l5.30078 -80.5996l6.19922 97.8994
+c0.100586 1.10059 -0.599609 10.3008 9.90039 11.5z" />
+    <glyph glyph-name="creative-commons-sampling-plus" unicode="&#xf4f1;" horiz-adv-x="496" 
+d="M247.6 440c141.801 0 248.4 -110.1 248.4 -248c0 -147.1 -118.5 -248 -248.4 -248c-134 0 -247.6 109.5 -247.6 248c0 132.9 104.7 248 247.6 248zM248.4 395.3c-118.2 0 -203.7 -97.8994 -203.7 -203.3c0 -109.8 91.2002 -202.8 203.7 -202.8
+c103.199 0 202.8 81.0996 202.8 202.8c0.0996094 113.8 -90.2002 203.3 -202.8 203.3zM355.4 189.7l58.3994 0.299805v-23.2002h-50.5l-18 -43.3994c-4.59961 -11 -20.8994 -8.7002 -22.2998 3.09961l-2.7002 22.2998l-6.7998 -83
+c-1.09961 -14.0996 -22 -14.2002 -23.0996 0.100586l-4.90039 64.3994l-4.59961 -58.5996c-1.10059 -14.2998 -22.3008 -14.1006 -23.2002 0.200195l-4.5 71.7998l-4.90039 -80.5c-0.899414 -14.5 -22.2998 -14.5 -23.2002 -0.100586l-4.7998 73.3008l-4.59961 -70.4004
+c-0.900391 -14.2998 -22.1006 -14.5 -23.2002 -0.0996094l-5.7002 78.2998l-3.7998 -43.6006c-1.2002 -13.6992 -21.0996 -14.1992 -23.0996 -0.699219l-10.7002 73.0996c-2 -3.90039 -6 -6.40039 -10.4004 -6.40039h-51.2998v23.2002h43.9004l13.1992 27.7002
+c4.90039 10.2998 20.3008 8.09961 22 -3.2998l1.80078 -12.2002l7.69922 89.7998c1.2002 14.1006 22.1006 14.1006 23.2002 -0.200195l4.10059 -57l5.2998 80.2002c1 14.4004 22.2998 14.4004 23.2002 0l4.2998 -66.2998l5.09961 83.7002
+c0.900391 14.3994 22.2998 14.5 23.2002 0l5.90039 -94.2998l3.5 44.8994c1.09961 14.2002 22.0996 14.2998 23.1992 0l5.2002 -68.7998l4.2998 51.4004c1.10059 13.7998 21.4004 14.2998 23.1006 0.399414l11 -92.7998l4 9.5c1.7002 4.40039 6 7.2002 10.7002 7.2002z
+M277.4 184.5c4.09961 0 7.5 3.40039 7.5 7.5c0 4.2002 -3.40039 7.5 -7.5 7.5h-21.9004v21.9004c0 4.19922 -3.40039 7.5 -7.5 7.5s-7.5 -3.40039 -7.5 -7.5v-21.9004h-21.9004c-4.09961 0 -7.5 -3.40039 -7.5 -7.5c0 -4.2002 3.40039 -7.5 7.5 -7.5h21.9004v-21.9004
+c0 -4.19922 3.40039 -7.5 7.5 -7.5c4.2002 0 7.5 3.40039 7.5 7.5v21.9004h21.9004z" />
+    <glyph glyph-name="creative-commons-share" unicode="&#xf4f2;" horiz-adv-x="496" 
+d="M247.6 440c141.801 0 248.4 -110.1 248.4 -248c0 -147.1 -118.5 -248 -248.4 -248c-134 0 -247.6 109.5 -247.6 248c0 132.9 104.7 248 247.6 248zM248.4 395.3c-118.2 0 -203.7 -97.8994 -203.7 -203.3c0 -109.8 91.2002 -202.8 203.7 -202.8
+c103.199 0 202.8 81.0996 202.8 202.8c0.0996094 113.8 -90.2002 203.3 -202.8 203.3zM349.4 262.9c7.7998 0 13.6992 -6.10059 13.6992 -13.7002v-182.5c0 -7.7002 -6.09961 -13.7002 -13.6992 -13.7002h-135.101c-7.7002 0 -13.7002 6 -13.7002 13.7002v54h-54
+c-7.7998 0 -13.6992 6 -13.6992 13.7002v182.5c0 8.19922 6.59961 12.6992 12.3994 13.6992h136.4c7.7002 0 13.7002 -6 13.7002 -13.6992v-54h54zM159.9 147.7h40.6992v101.399c0 7.40039 5.80078 12.6006 12 13.7002h55.8008v40.2998h-108.5v-155.399zM336.1 235.8h-108.5
+v-155.399h108.5v155.399z" />
+    <glyph glyph-name="creative-commons-zero" unicode="&#xf4f3;" horiz-adv-x="496" 
+d="M247.6 440c141.801 0 248.4 -110.1 248.4 -248c0 -147.1 -118.5 -248 -248.4 -248c-134 0 -247.6 109.5 -247.6 248c0 132.9 104.7 248 247.6 248zM248.4 395.3c-118.2 0 -203.7 -97.8994 -203.7 -203.3c0 -109.8 91.2002 -202.8 203.7 -202.8
+c103.199 0 202.8 81.0996 202.8 202.8c0.0996094 113.8 -90.2002 203.3 -202.8 203.3zM248 334.8c81.9004 0 102.5 -77.2998 102.5 -142.8s-20.5996 -142.8 -102.5 -142.8s-102.5 77.2998 -102.5 142.8s20.5996 142.8 102.5 142.8zM248 280.9
+c-42.0996 0 -44.0996 -60.1006 -44.0996 -88.9004c0 -9.2998 0.199219 -21.7002 1.89941 -34.4004l54.5 100.2c5.7002 9.7998 2.7998 16.7998 -3.09961 21.9004c-2.7998 0.700195 -5.90039 1.2002 -9.2002 1.2002zM288.8 234.7l-60.8994 -105.2
+c-12.5 -18.7002 6.59961 -26.4004 20.0996 -26.4004c42.0996 0 44.0996 60 44.0996 88.9004c0 11.2998 -0.399414 27.2998 -3.2998 42.7002z" />
+    <glyph glyph-name="ebay" unicode="&#xf4f4;" horiz-adv-x="640" 
+d="M606 258.5h34l-99.2002 -194.8h-35.8994l28.5 54.0996l-61.5 116.101c3.09961 -6.60059 4.7998 -14.5 4.7998 -23.8008v-65.5996c0 -9.2998 0.299805 -18.5996 1 -26.7998h-29.7998c-0.800781 6.89941 -1.10059 13.5996 -1.10059 20.2002
+c-16.0996 -19.8008 -35.2998 -25.5 -61.8994 -25.5c-39.5 0 -60.6006 20.8994 -60.6006 45c0 3.19922 0.200195 6.19922 0.700195 9c-8.40039 -32.3008 -36.4004 -54.2002 -73.2998 -54.2002c-23.2998 0 -45.1006 8.2998 -58.7002 24.8994
+c0 -6.59961 -0.400391 -13.1992 -1.09961 -19.5h-31.5c0.5 10.2002 1.09961 22.8008 1.09961 33.1006v169.5h32.0996v-80.6006c15.7002 18.7002 37.4004 24.2002 58.7002 24.2002c35.7002 0 75.4004 -24.0996 75.4004 -76.2002c0 -5.59961 -0.5 -11 -1.5 -16.1992
+c7.09961 24.3994 34.2998 33.5 76.7002 34.3994c13.6992 0.299805 29 0.400391 41.6992 0.400391v3.39941c0 23.4004 -15 33 -41 33c-19.2998 0 -33.5996 -8 -35 -21.7998h-33.6992c3.59961 34.4004 39.6992 43.1006 71.5 43.1006c27.3994 0 51.7998 -7 63.2998 -26
+l-10.9004 20.5996h37.5l54.9004 -109.9zM243.7 134.2c29.7998 0 50.2002 21.5 50.2002 53.7998c0 32.4004 -20.4004 53.7998 -50.2002 53.7998c-29.6006 0 -50.2002 -21.3994 -50.2002 -53.7998c0 -32.2998 20.5996 -53.7998 50.2002 -53.7998zM444.6 181.5v3.2998
+c-11.7998 0 -26.2998 -0.0996094 -39.3994 -0.599609c-29.1006 -0.900391 -47.2002 -6.2002 -47.2002 -25.2998c0 -12.4004 9.90039 -25.8008 35 -25.8008c33.7002 0 51.5996 18.4004 51.5996 48.4004zM32.7002 179.9c3.5 -58.3008 79.2002 -57.4004 91.2002 -21.6006
+h33.0996c-6.40039 -34.3994 -43 -46.0996 -74.4004 -46.0996c-57.1992 0 -82.5 31.5 -82.5 74c0 46.7998 26.2002 77.5996 83 77.5996c45.3008 0 78.4004 -23.7002 78.4004 -75.3994v-8.5h-128.8zM127.7 201.3c-2.2998 54.7002 -87.5 56.6006 -94.4004 0h94.4004z" />
+    <glyph glyph-name="keybase" unicode="&#xf4f5;" 
+d="M286.17 29c9.93457 0 18 -8.06543 18 -18s-8.06543 -18 -18 -18s-18 8.06543 -18 18s8.06543 18 18 18zM398.09 176.6c22.9102 -33.46 35.9102 -72.3398 35.9102 -110.92c0 -31.6797 -5 -60.6797 -14.5996 -86.2295
+c-3.04004 -8.0498 -10.9502 -12.7197 -18.3701 -11.1504c-6.83984 1.24023 -11.1201 9.28027 -8.60059 15.7402c11.1904 28.71 14.8799 58.3398 14.8799 81.6396c-0.0634766 9.75 -1.02246 19.1807 -2.7998 28.4307c-0.649414 -1.06055 -1.12988 -2.2207 -1.84961 -3.2207
+c-17.29 -24.5293 -50.54 -33.8896 -84.7402 -23.8398c-78.8701 23.1699 -178.02 3.81055 -236.25 -38.5898l24.6602 74.1104l-46.8203 -59.8301c2.4834 -18.6582 7.96191 -36.7539 15.7598 -53.1299c6.25 -13.1904 0.460938 -18.2402 -3.75 -20.1104
+c-4.76953 -2.12012 -13.8594 -2.7998 -19.6396 7.33008c-6.41504 11.584 -11.4131 24.3486 -14.5596 37.5596l-23.3203 -29.7998v33.6406c0 55.7695 0 125.109 62.6504 188.409c13.7461 13.917 29.1787 25.7891 46.29 35.54l-8.93066 0.540039
+c-27.8799 1.64062 -49.2402 24.8506 -47.6299 51.8506l2.36035 36.6797c0 -6.24023 0.139648 45.8799 50.75 45.8799c2.05957 0 -0.470703 0.120117 41.0596 -2.33008c2.82715 -0.19043 5.60742 -0.616211 8.29004 -1.25c7.41992 11.3398 15.6504 22.8301 24.3398 34.8906
+l5.48047 7.55957l22.8994 -13.5195c-11.29 -24 -10 -33 -9.39941 -35c9.08008 0.229492 20 -1.6709 32.4102 -5.77051c31.2002 -10.3584 53.6846 -39.8262 53.6846 -74.4844c0 -10.4883 -2.0625 -20.498 -5.80469 -29.6455
+c6.18652 -2.13965 12.3135 -4.56348 18.3799 -7.27051c47.8896 -21.2598 77.7598 -59.0898 87.2598 -73.71zM142.37 319.42c1.87695 6.54492 4.25684 13.041 7 19.1699l-29.1104 1.73047c0.610352 -0.0507812 -12.2598 0.849609 -13.2598 -11.3203l-2.41016 -36.6602
+c-0.00683594 -0.174805 -0.00292969 -0.34375 -0.00292969 -0.520508c0 -6.60449 5.22461 -11.998 11.7627 -12.2695l22.3809 -1.33984c-0.457031 3.73438 -0.692383 7.34863 -0.692383 11.2061c0 2.81836 0.125977 5.6084 0.37207 8.36426l-13.1299 0.779297l1.38965 21.79
+zM290.79 147.24c2.27441 1.75195 3.72949 4.50586 3.72949 7.59668c0 2.19922 -0.742188 4.22559 -1.98926 5.84277l-81.0898 96.3203c-1.9043 2.21094 -4.72949 3.60156 -7.87305 3.60156c-2.42578 0 -4.65918 -0.833984 -6.42773 -2.23145
+c-2.27344 -1.74805 -3.72754 -4.49902 -3.72754 -7.58594c0 -2.19531 0.741211 -4.21973 1.98828 -5.83398c0.0898438 -0.140625 18.5996 -22.1406 18.5996 -22.1406l-16.9102 -13.29c-1.75879 -1.34863 -2.88477 -3.47461 -2.88477 -5.86133
+c0 -1.68359 0.564453 -3.23633 1.51465 -4.47852c0.0800781 -0.109375 2.37988 -2.91113 3.7998 -4.5293c1.4209 -1.61914 3.50977 -2.63477 5.83105 -2.63477c1.79395 0 3.44531 0.610352 4.75977 1.63477l17.0898 13.4492l14.1396 -16.7393l-34.5703 -27.1807
+c-1.74805 -1.34961 -2.86621 -3.46875 -2.86621 -5.84668c0 -1.69043 0.569336 -3.24805 1.52637 -4.49316l15.7803 -18.6396c1.48438 -1.72363 3.68555 -2.80762 6.13574 -2.80762c1.88379 0 3.61816 0.645508 4.99414 1.72754l34.4199 27l9.68066 -11.4902
+c1.92676 -2.2041 4.76465 -3.58789 7.91992 -3.58789c2.4209 0 4.65234 0.820312 6.42969 2.19824zM187.44 29c9.93359 0 18 -8.06543 18 -18s-8.06641 -18 -18 -18c-9.93457 0 -18 8.06543 -18 18s8.06543 18 18 18z" />
+    <glyph glyph-name="mastodon" unicode="&#xf4f6;" 
+d="M433 268.89c0 0 0.799805 -71.6992 -9 -121.5c-6.23047 -31.5996 -55.1104 -66.1992 -111.23 -72.8994c-20.0996 -2.40039 -93.1191 -14.2002 -178.75 6.7002c0 -0.116211 -0.00390625 -0.119141 -0.00390625 -0.235352c0 -4.63281 0.307617 -9.19434 0.904297 -13.665
+c6.62988 -49.5996 49.2197 -52.5996 89.6299 -54c40.8105 -1.2998 77.1201 10.0996 77.1201 10.0996l1.7002 -36.8994s-28.5098 -15.2998 -79.3203 -18.1006c-28.0098 -1.59961 -62.8193 0.700195 -103.33 11.4004c-112.229 29.7002 -105.63 173.4 -105.63 289.1
+c0 97.2002 63.7197 125.7 63.7197 125.7c61.9209 28.4004 227.96 28.7002 290.48 0c0 0 63.71 -28.5 63.71 -125.7zM357.88 143.69c0 122 5.29004 147.71 -18.4199 175.01c-25.71 28.7002 -79.7197 31 -103.83 -6.10059l-11.5996 -19.5l-11.6006 19.5
+c-24.0098 36.9004 -77.9297 35 -103.83 6.10059c-23.6094 -27.1006 -18.4092 -52.9004 -18.4092 -175h46.7295v114.2c0 49.6992 64 51.5996 64 -6.90039v-62.5098h46.3301v62.5c0 58.5 64 56.5996 64 6.89941v-114.199h46.6299z" />
+    <glyph glyph-name="r-project" unicode="&#xf4f7;" horiz-adv-x="581" 
+d="M581 221.4c0 -54.8008 -33.9004 -104.301 -88.4004 -139.7l67.4004 -113.7h-112l-40.0996 75.4004c-21.8008 -6.5 -45.1006 -11.2002 -69.4004 -13.9004v-61.5h-99.0996v61.9004c-136.101 16.0996 -239.4 95.6992 -239.4 191.5c0 107.5 130.1 194.6 290.5 194.6
+s290.5 -87.0996 290.5 -194.6zM114.2 206.9c0 -52.8008 51.0996 -98.4004 125.2 -119.9v208.3h199s90.5996 -1.59961 90.5996 -87.8994c0 -86.3008 -86.5996 -92.7002 -86.5996 -92.7002s17.5996 -5.2998 27.7998 -10.5c1.7002 -0.799805 4 -2.10059 6.39941 -3.7002
+c43.8008 21.4004 70.3008 56.2998 70.3008 106.4c0 92.2998 -90 133 -211.9 133s-220.8 -59.5 -220.8 -133zM339.3 168.6c49.6006 0 87.7998 -8.19922 87.7998 28.3008c0 34.0996 -30 27.2998 -87.7998 27.2998v-55.6006zM338.4 96.0996v-22.0996
+c17.5996 0.0996094 34.5 1 50.5996 2.90039c-5.09961 7.5 -13.2002 19.1992 -24 19.1992h-26.5996z" />
+    <glyph glyph-name="researchgate" unicode="&#xf4f8;" 
+d="M0 416h448v-448h-448v448zM262.2 81.5996v7.30078c-10 0 -20 6.89941 -27.2002 14.6992c-12.2002 13.3008 -28.5996 34.7002 -42.2002 58.9004c22.5 5.2998 39.2002 26.4004 39.2002 47.5c0 31.2002 -24.2002 45.5996 -55.9004 45.5996
+c-17.7998 0 -45.0996 -1.59961 -70.8994 -0.599609v-8.09961c15.5996 -2.90039 22 -1.30078 22 -23.9004v-109.4c0 -22.5996 -6.5 -21 -22 -23.8994v-8.10059c7.5 0.200195 20.5 0.800781 33.5996 0.800781c12.5 0 28.7002 -0.5 35.6006 -0.800781v8.10059
+c-19.8008 2.7002 -25.8008 0.399414 -25.8008 23.8994v46.4004c6.7002 -0.599609 12.5 -0.599609 21.4004 -0.599609c16.9004 -30.3008 33 -53 42.2002 -63.6006c16.7998 -20.2002 43.3994 -17.2002 50 -14.2002zM285.1 216.6c38.7002 0 34 29.4004 34 49.9004h-30.3994
+v-10.7002h17.8994c0 -15.8994 -7.39941 -26.7998 -21.5 -26.7998c-11.2998 0 -17.8994 9.90039 -17.8994 23.2998v26.7998c0 12.4004 11.7998 19.7002 19.7002 19.7002c14.1992 0 19.6992 -12.5 19.6992 -12.5l10.7002 7.2002s-5.2002 17.9004 -30.3994 17.9004
+c-25.2002 0 -34 -18.2002 -34 -30.4004v-32.2002c0 -16.5 8.89941 -32.2002 32.1992 -32.2002zM168.6 171.9c-9.39941 0 -13.5996 0.299805 -20 0.799805v69.7002c6.40039 0.599609 15 0.599609 22.5 0.599609c23.3008 0 37.2002 -12.2002 37.2002 -34.5
+c0 -21.9004 -15 -36.5996 -39.7002 -36.5996z" />
+    <glyph glyph-name="teamspeak" unicode="&#xf4f9;" horiz-adv-x="512" 
+d="M244.2 101.21c-2.40039 -12.5 -10.6006 -20 -22.5 -24.2998c-9.2002 -3.2002 -50.1006 -1.60059 -61.7002 -1c-18 1.2998 -33.2002 8.5 -43.4004 24c-14.5 22.5 -19.5 47.7002 -14.5 73.8994c4.60059 24.5 24.6006 34.7002 46.3008 22.7002
+c15.1992 -7.5 42.5 -27.3994 63.3994 -46.5996c20.4004 -18.7002 34.7998 -36.4004 32.4004 -48.7002zM449.2 80.4102c6.7002 -5.41016 11.2002 -22 11.5996 -32.1006c1 -50.3994 -23.8994 -68 -46.5996 -85.3994c-65.1006 -50 -295.101 -16.9004 -145.4 -6.40039
+c127.4 9 164.101 96.1006 172.101 121.5c0.679688 2.0918 2.64941 3.60352 4.9668 3.60352c1.2666 0 2.42871 -0.452148 3.33301 -1.20312zM511.2 202.81c0 -17.1992 1.89941 -34.5996 -1 -51.6992c-4 -24.7002 -29.1006 -41.7002 -53.2002 -36.7002
+c-7.2002 1.7002 -9.40039 7.2002 -9.40039 14.2002c0 28.0996 0.800781 56.3994 0 84.5996c-1.89941 75.79 -36.1992 132.79 -102.3 169.4c-111 60.3896 -253.2 -7 -277.8 -131.5c-6.09961 -30.4004 -1.7002 -48.3008 -3.7002 -125.801
+c-0.299805 -7.19922 -4.2998 -11.1992 -12 -11.5c-30.7998 -1.39941 -51.7998 18.2002 -51.7998 49v20.9004l0.799805 26.4902c2.40039 15.5 10.7002 27 24.9004 34c3.5 1.7998 5.7002 3.5 6.39941 7.7998c6.10059 33.4102 19.5 64 39.3008 91.71
+c2.2998 3.09961 4 5.2998 1 9.2998c-3.7002 5.40039 -1 10.2002 3 14.5c28.0996 31.7998 61.8994 55.1006 102 67.4004c96 29.4668 180.1 9.29688 252.3 -60.5098c6.7002 -6.40039 15.5 -12.9004 7 -24.4004c-1.2998 -1.7998 1.09961 -3.5 2.2002 -5
+c20.0586 -27.0264 34.2529 -59.1357 40.3994 -93.5898c0.900391 -3.7002 3 -5.10059 5.90039 -6.40039c17.3994 -8.7998 25.7002 -23.2998 26 -42.2002zM351.6 71.3096l-51.5996 7.7002c-22.7998 5.90039 -51 32.7002 22.2002 60.7998
+c21.5996 8.5 85.7002 37.2002 87.7998 -8c0.900391 -32 -21.9004 -63.2998 -58.4004 -60.5z" />
+    <glyph glyph-name="first-order-alt" unicode="&#xf50a;" horiz-adv-x="496" 
+d="M248 440c136.97 0 248 -111.03 248 -248s-111.03 -248 -248 -248s-248 111.03 -248 248s111.03 248 248 248zM248 -48.21c132.66 0 240.21 107.55 240.21 240.21s-107.55 240.21 -240.21 240.21s-240.21 -107.55 -240.21 -240.21s107.55 -240.21 240.21 -240.21z
+M248 411.71c121.34 0 219.71 -98.3701 219.71 -219.71s-98.3701 -219.71 -219.71 -219.71s-219.71 98.3701 -219.71 219.71s98.3701 219.71 219.71 219.71zM248 -19.5098c116.81 0 211.51 94.7002 211.51 211.51s-94.7002 211.51 -211.51 211.51
+s-211.51 -94.6895 -211.51 -211.51s94.7002 -211.51 211.51 -211.51zM434.23 143.47c-4.46582 -17.1914 -11.3633 -33.7256 -20.1309 -48.6895l-74.1299 35.8799l61.4805 -54.8203c-10.709 -14.1553 -23.0713 -26.5469 -37.2002 -37.29l-54.7998 61.5703l35.8799 -74.2705
+c-14.9385 -8.80469 -31.4502 -15.7354 -48.6299 -20.2295l-27.29 78.4697l4.79004 -82.9297c-8.61035 -1.17969 -17.4004 -1.7998 -26.3301 -1.7998s-17.7197 0.620117 -26.3301 1.7998l4.75977 82.46l-27.1494 -78.0303
+c-17.1836 4.48828 -33.7021 11.4092 -48.6504 20.2002l35.9297 74.3398l-54.8701 -61.6396c-14.1318 10.7412 -26.5 23.1299 -37.2197 37.2793l61.5898 54.9004l-74.2598 -35.9297c-8.77051 14.9639 -15.6709 31.4971 -20.1396 48.6895l77.8398 27.1104l-82.2305 -4.75977
+c-1.15918 8.56934 -1.7793 17.3193 -1.7793 26.21c0 9 0.629883 17.8398 1.81934 26.5098l82.3799 -4.76953l-77.9395 27.1592c4.5 17.1895 11.4307 33.7148 20.2295 48.6699l74.2207 -35.9199l-61.5205 54.8604c10.7412 14.1328 23.1299 26.501 37.2803 37.2197
+l54.7598 -61.5293l-35.8301 74.1699c14.9521 8.76465 31.4717 15.6621 48.6504 20.1299l26.8701 -77.25l-4.70996 81.6094c8.60938 1.18066 17.3896 1.80078 26.3193 1.80078c8.93066 0 17.71 -0.620117 26.3203 -1.80078l-4.74023 -82.1592l27.0498 77.7598
+c17.2705 -4.5 33.6006 -11.3506 48.6309 -20.1699l-35.8203 -74.1201l54.7197 61.4697c14.1426 -10.7178 26.5186 -23.0908 37.2402 -37.2295l-61.4502 -54.7705l74.1201 35.8604c8.78906 -14.9492 15.71 -31.4678 20.2002 -48.6504l-77.8105 -27.0996l82.2402 4.75
+c1.19043 -8.66016 1.82031 -17.5 1.82031 -26.4902c0 -8.87988 -0.610352 -17.6299 -1.78027 -26.1904l-82.1201 4.75z" />
+    <glyph glyph-name="fulcrum" unicode="&#xf50b;" horiz-adv-x="320" 
+d="M95.75 283.86l-35.3799 -43.5508l-35.3701 43.5508l35.3799 43.5498zM144.23 448v-211.11l-41.0801 -44.8896l41.0801 -44.8896v-211.11l-20.5107 198.18l-51 57.8203l50.9707 57.8203zM223.9 283.86l35.3799 43.5498l35.3799 -43.5498l-35.3799 -43.5508zM175.42 236.86
+v211.14l20.5801 -198.18l51 -57.8203l-51 -57.8203l-20.5801 -198.18v211.11l41.0801 44.8896z" />
+    <glyph glyph-name="galactic-republic" unicode="&#xf50c;" horiz-adv-x="496" 
+d="M248 -56c-136.75 0 -248 111.25 -248 248s111.25 248 248 248s248 -111.25 248 -248s-111.25 -248 -248 -248zM248 423.47c-127.63 0 -231.47 -103.84 -231.47 -231.47s103.84 -231.47 231.47 -231.47s231.47 103.84 231.47 231.47s-103.84 231.47 -231.47 231.47z
+M275.62 401.66c37.6602 -4.91016 72.21 -19.7402 100.96 -41.7998l-17.3896 -17.3604c-23.9795 17.7627 -52.7207 29.9941 -83.5703 34.54v24.6201zM220.25 401.59v-24.54c-30.9697 -4.60938 -59.4502 -16.8301 -83.5195 -34.6699h-0.0800781l-17.2803 17.3604
+c28.7197 22.0498 63.2402 36.9102 100.88 41.8496zM232.5 351.42h31v-82.8604c10.0498 -2.0293 19.3701 -6.00977 27.6201 -11.5l58.6699 58.6709l21.9297 -21.9307l-58.6699 -58.6699c5.46973 -8.24023 9.48047 -17.5996 11.5 -27.6201h82.8701v-31h-82.8701
+c-2.03027 -10.0195 -6.04004 -19.3096 -11.5 -27.54l58.6699 -58.6895l-21.9297 -21.9307l-58.6699 58.6904c-8.25 -5.49023 -17.5703 -9.52051 -27.6201 -11.5498v-82.9004h-31v82.9004c-10.0039 2.02148 -19.4531 6.00977 -27.6699 11.4697l-58.6201 -58.6201
+l-21.9297 21.9297l58.6699 58.6904c-5.45996 8.23047 -9.4502 17.5205 -11.4697 27.54h-82.9004v31h82.9004c2.01953 10.0303 6 19.3896 11.4697 27.6201l-58.6699 58.6699l21.9297 21.9297l58.6201 -58.5898c8.25 5.48047 17.6299 9.38965 27.6699 11.4199v82.8701z
+M415.74 320.7c22.0996 -28.7402 36.9795 -63.3398 41.9297 -101.03h-24.6201c-4.58496 30.8906 -16.8604 59.665 -34.6699 83.6699zM80.1904 320.57l17.3896 -17.3906c-17.8301 -24.0693 -29.9902 -52.5596 -34.5898 -83.5195h-24.6504
+c4.94043 37.6494 19.79 72.1895 41.8506 100.91zM38.3398 164.33l24.6504 0.00976562c4.58984 -30.9502 16.7002 -59.4502 34.5098 -83.5195l-17.3604 -17.3906c-22.0498 28.7207 -36.8799 63.2607 -41.7998 100.9zM433.04 164.33h24.6201
+c-4.9502 -37.6699 -19.8506 -72.2197 -41.9297 -100.96l-17.3604 17.3604c17.8701 24.0996 30.0596 52.6094 34.6699 83.5996zM136.66 41.6201c24.0703 -17.8604 52.6094 -30.0205 83.5996 -34.6504v-24.6396c-37.6602 4.9502 -72.2295 19.8398 -100.96 41.9297z
+M359.19 41.5703h0.0791016l17.3105 -17.3906c-28.75 -22.0596 -63.29 -36.9297 -100.96 -41.8496v24.5703c30.9902 4.58984 59.4795 16.8301 83.5703 34.6699z" />
+    <glyph glyph-name="galactic-senate" unicode="&#xf50d;" horiz-adv-x="512" 
+d="M249.86 414.52h12.2793v-26.0693c13.5801 -20.6201 23.8604 -108.59 24.4902 -215.351c-11.7402 15.6201 -19.1299 33.3301 -19.1299 48.2402v16.8799c0.0302734 5.32031 -0.75 10.5303 -2.19043 15.6504c-0.649414 2.13965 -1.38965 4.07031 -2.61914 5.82031
+c-1.23047 1.73926 -3.44043 3.79004 -6.68066 3.79004c-3.25 0 -5.4502 -2.04004 -6.67969 -3.79004c-1.23047 -1.74023 -1.96973 -3.68066 -2.62012 -5.82031c-1.44043 -5.12012 -2.21973 -10.3301 -2.19043 -15.6504v-16.8799
+c0 -14.9102 -7.38965 -32.6201 -19.1299 -48.2402c0.610352 106.761 10.8906 194.73 24.4707 215.351v26.0693zM223.52 266.75c-1.59961 -22.4004 -2.75 -46.5195 -3.47949 -72.0703c-23.2998 -11.2793 -40.7705 -33.1602 -46.3203 -59.5098
+c-7.71973 -2.25977 -22.71 -3.91992 -40.4893 -4.21973c-7.51074 3.66016 -16.5 5.85938 -26.1807 6.04004c1.90039 14.9102 5.87012 29.1699 11.6504 42.4199c15.4395 -8.10059 30.9297 -8.66016 35.4697 -0.959961c4.57031 7.74023 -3.58984 21.04 -18.3203 30.6602
+c8.68066 11.7695 18.9805 22.2998 30.5605 31.0898c9.50977 -15.5898 23.3594 -24.4404 31.3594 -19.8203c8.05078 4.65039 7.19043 21.1699 -1.70996 37.29c8.76074 3.88965 17.9404 6.92969 27.46 9.08008zM288.48 266.75
+c9.45508 -2.12695 18.7754 -5.23145 27.4492 -9.08008c-8.89941 -16.1299 -9.75977 -32.6396 -1.70996 -37.29c8 -4.62012 21.8506 4.23047 31.3604 19.8203c11.5801 -8.79004 21.8799 -19.3203 30.5596 -31.0898c-14.7197 -9.61035 -22.8896 -22.9199 -18.3193 -30.6602
+c4.54004 -7.7002 20.0293 -7.14062 35.4697 0.959961c5.79004 -13.25 9.75 -27.5098 11.6504 -42.4199c-9.68066 -0.19043 -18.6709 -2.37988 -26.1807 -6.04004c-17.7793 0.299805 -32.7695 1.95996 -40.4902 4.21973c-5.5498 26.3496 -23.0293 48.2305 -46.3193 59.5098
+c-0.719727 25.5508 -1.87988 49.6699 -3.46973 72.0703zM256 258.15c3.23047 0 5.86035 -8.81055 6.08984 -19.9307h0.0498047v-16.8799c0 -41.4199 49.0107 -95.04 93.4902 -95.04c52 0 122.76 1.4502 156.37 -29.1699v-2.50977
+c-9.41992 -17.1104 -20.5801 -33.1699 -33.1797 -47.9697c-12.5303 21.0898 -51.5898 40.96 -108.021 41.3496c-45.6797 -1.01953 -79.0195 -20.3301 -90.7598 -40.8701c-0.00976562 -0.00976562 0.00976562 -0.0400391 0 -0.0498047
+c-7.66992 -2.13965 -15.8496 -3.23047 -24.04 -3.20996c-8.19043 -0.0205078 -16.3701 1.07031 -24.04 3.20996c-0.00976562 0.00976562 0.00976562 0.0400391 0 0.0498047c-11.7295 20.54 -45.0801 39.8506 -90.7598 40.8701
+c-56.4307 -0.400391 -95.5 -20.2598 -108.021 -41.3496c-12.5996 14.7998 -23.7598 30.8496 -33.1797 47.9697v2.50977c33.6201 30.6201 104.37 29.1699 156.37 29.1699c44.4795 0 93.4902 53.6201 93.4902 95.04v16.8799h0.0498047
+c0.229492 11.1201 2.85938 19.9307 6.08984 19.9307zM256 161.56c-22.4199 0 -40.5996 -18.1797 -40.5996 -40.5996s18.1797 -40.6504 40.5996 -40.6504s40.5996 18.2305 40.5996 40.6504s-18.1797 40.5996 -40.5996 40.5996zM256 153.92
+c18.1904 0 32.96 -14.7695 32.96 -32.96s-14.7695 -32.96 -32.96 -32.96s-32.96 14.7695 -32.96 32.96s14.7695 32.96 32.96 32.96zM256 147.78c-14.8096 0 -26.8203 -12.0107 -26.8203 -26.8203s12.0107 -26.8203 26.8203 -26.8203s26.8203 12.0107 26.8203 26.8203
+s-12.0107 26.8203 -26.8203 26.8203zM141.2 81.1104c18.75 -0.419922 35.1895 -4.18066 48.6094 -9.66992c12.5508 -16.0303 29.1602 -30.04 49.5801 -33.0703c0.100586 -0.00976562 0.169922 -0.0302734 0.270508 -0.0498047
+c0.0498047 -0.0107422 0.109375 -0.0400391 0.160156 -0.0507812c5.23926 -1.06934 10.6396 -1.59961 16.1895 -1.59961c5.56055 0 10.9502 0.530273 16.1904 1.59961c0.0498047 0.0107422 0.109375 0.0400391 0.160156 0.0507812
+c0.0996094 0.00976562 0.179688 0.0292969 0.269531 0.0498047c20.4199 3.04004 37.04 17.04 49.5801 33.0703c13.4199 5.5 29.8496 9.25 48.6104 9.66992c10.1797 -0.0800781 21.5996 -0.360352 30.5 -1.66016c-0.430664 -4.41992 -1.51074 -18.6299 -7.11035 -29.7598
+c-9.11035 2.55957 -18.3604 3.89941 -27.6201 3.89941c-41.2803 -0.939453 -71.4795 -34.3496 -78.2598 -74.4697l-0.110352 -4.7002c-10.3994 -1.91992 -21.1797 -2.93945 -32.21 -2.93945c-11.0195 0 -21.8096 1.0293 -32.21 2.93945l-0.109375 4.7002
+c-6.78027 40.1201 -36.9805 73.5303 -78.2607 74.4697c-9.25977 0 -18.5098 -1.33984 -27.6201 -3.89941c-5.59961 11.1299 -6.67969 25.3398 -7.10938 29.7598c8.89941 1.2998 20.3096 1.58984 30.5 1.66016z" />
+    <glyph glyph-name="jedi-order" unicode="&#xf50e;" 
+d="M398.5 74.4004c0 0 26.2998 16.1992 49.9004 77.6992c0 0 -17 -183.3 -222 -185.699h-4.10059c-205.1 2.39941 -222 185.699 -222 185.699c23.2002 -61.5996 49.4004 -77.6992 49.4004 -77.6992c-95.9004 122.1 -17.2002 233.1 -17.2002 233.1
+c-45.4004 -85.7002 41.4004 -170.5 41.4004 -170.5c-105 171.6 60.5 271.5 60.5 271.5c-96.9004 -72.5996 10.0996 -190.7 10.0996 -190.7c-85.7998 -158.399 68.5996 -230.1 68.5996 -230.1s0.400391 16.8994 2.2002 85.7002l-34.5 -36.2002l24.2002 47.3994
+l-62.5996 9.10059l62.5996 9.09961l-20.2002 55.5l31.4004 -45.8994c2.2998 87.8994 7.89941 305.899 7.89941 306.899v2.40039v-1v1v-2.40039c0.100586 -1.7998 5.7002 -219.2 7.90039 -306.899l31.4004 45.8994l-20.2002 -55.5l62.5996 -9.09961l-62.5996 -9.10059
+l24.2002 -47.3994s-30.2002 31.7002 -34.5 36.2002c1.7998 -68.8008 2.19922 -85.7002 2.19922 -85.7002s154.4 71.7002 68.6006 230.1c0 0 107 118 10.0996 190.7c0 0 165.5 -100 60.5 -271.5c0 0 86.7998 84.7002 41.4004 170.5c0 0 78.7002 -111 -17.2002 -233.1z" />
+    <glyph glyph-name="mandalorian" unicode="&#xf50f;" 
+d="M232.27 -63.8896c-1 3.25977 -1.68945 15.8301 -1.38965 24.5801c0.549805 15.8896 1 24.7197 1.40039 28.7598c0.639648 6.2002 2.87012 20.7197 3.2793 21.3799c0.600586 1 0.400391 27.8701 -0.239258 33.1299c-0.310547 2.58008 -0.629883 11.9004 -0.69043 20.7305
+c-0.129883 16.4697 -0.530273 20.1191 -2.72949 24.7598c-1.10059 2.31934 -1.23047 3.83984 -1 11.4297c0.0546875 1.30957 0.0830078 2.62695 0.0830078 3.9502c0 3.00586 -0.142578 5.82715 -0.423828 8.75977c-2 13 -3.45996 27.7002 -3.25 33.9004
+s0.430664 7.14941 2.06055 9.66992c3.0498 4.70996 6.50977 14 8.62012 23.2695c2.25977 9.86035 3.87988 17.1807 4.58984 20.7402c1.1123 5.11914 2.61816 10.2246 4.41992 15.0498c2.26953 6.25 2.49023 15.3906 0.370117 15.3906
+c-0.299805 0 -1.37988 -1.2207 -2.41016 -2.70996c-1.03027 -1.49023 -4.75977 -4.80078 -8.29004 -7.36035c-8.37012 -6.08008 -11.7002 -9.38965 -12.6602 -12.5801s-1 -7.22949 -0.160156 -7.75977c0.34082 -0.209961 1.29004 -2.40039 2.11035 -4.87988
+c0.926758 -2.82617 1.42773 -5.84375 1.42773 -8.97754c0 -2.19824 -0.241211 -4.3252 -0.708008 -6.38281c-0.389648 -1.76953 -1 -5.46973 -1.45996 -8.22949c-0.459961 -2.76074 -1 -6.46094 -1.25 -8.2207c-0.181641 -1.55176 -0.731445 -3.01367 -1.5498 -4.25977
+c-1 -1 -1.13965 -0.910156 -2.0498 0.530273c-0.724609 1.4541 -1.22656 3.07324 -1.44043 4.75c-0.25 1.73926 -1.62988 7.10938 -3.08008 11.9297c-3.2793 10.9004 -3.51953 16.1504 -1 21c0.800781 1.39648 1.38086 2.96875 1.66992 4.61035
+c0 2.38965 -2.19922 5.31934 -7.40918 9.88965c-7 6.17969 -8.62988 7.91992 -10.2305 11.2998c-1.70996 3.60059 -3.05957 4.06055 -4.54004 1.54004c-1.78027 -3 -2.59961 -9.10938 -3 -22l-0.339844 -12.1895l2 -2.25c3.20996 -3.7002 12.0703 -16.4502 13.7803 -19.8301
+c3.41016 -6.74023 4.33984 -11.6904 4.41016 -23.5605c0.0693359 -11.8701 0.949219 -22.75 2 -24.71c0.359375 -0.660156 0.509766 -1.34961 0.339844 -1.51953s0.410156 -2.08984 1.29004 -4.27051c1.02539 -2.84082 1.73633 -5.8916 2.05957 -9
+c0.37207 -3.50684 0.950195 -6.99219 1.70996 -10.3701c2.23047 -9.55957 2.77051 -14.0801 2.39062 -20.1396c-0.200195 -3.26953 -0.530273 -11.0703 -0.730469 -17.3203c-1.30957 -41.7598 -1.84961 -58 -2 -61.21c-0.120117 -2 -0.389648 -11.5098 -0.599609 -21.0693
+c-0.360352 -16.3008 -1.30078 -27.3701 -2.41992 -28.6504c-0.640625 -0.729492 -8.07031 4.91016 -12.5205 9.49023c-3.75 3.87012 -4 4.79004 -2.83008 9.9502c0.700195 3 2.25977 18.29 3.33008 32.6191c0.360352 4.78027 0.80957 10.5 1 12.7109
+c0.830078 9.36914 1.66016 20.3496 2.61035 34.7793c0.55957 8.45996 1.33008 16.4404 1.71973 17.7305s0.889648 9.88965 1.12988 19.1094l0.429688 16.7705l-2.25977 4.2998c-1.71973 3.28027 -4.87012 6.94043 -13.2197 15.3398
+c-6 6.07031 -11.8398 12.2998 -12.9102 13.8506l-1.9502 2.80957l0.75 10.9004c1.08984 15.71 1.10059 48.5693 0 59.0596l-0.889648 8.7002l-3.28027 4.51953c-5.85938 8.08008 -5.7998 7.75 -6.21973 33.2705c-0.100586 6.07031 -0.379883 11.5 -0.629883 12.0596
+c-0.830078 1.87012 -3.0498 2.66016 -8.54004 3.05078c-8.86035 0.619141 -11 1.89941 -23.8506 14.5498c-6.14941 6 -12.3398 12 -13.75 13.1895c-2.80957 2.41992 -2.79004 2 -0.55957 9.62988l1.34961 4.65039l-1.68945 3
+c-0.764648 1.42578 -1.62793 2.78223 -2.58984 4.07031c-1.33008 1.50977 -5.5 10.8896 -6 13.4893c-0.100586 0.362305 -0.154297 0.743164 -0.154297 1.13672c0 1.05469 0.385742 2.02148 1.02441 2.76367c2.22949 2.86035 3.39941 5.67969 4.44922 10.7305
+c2.33008 11.1895 7.74023 26.0898 10.6006 29.2197c3.17969 3.46973 7.7002 1 9.41016 -5c1.33984 -4.79004 1.36914 -9.79004 0.0996094 -18.5498c-0.53418 -3.65918 -0.869141 -7.33594 -1 -11.1104c0 -4 0.19043 -4.69043 2.25 -7.38965
+c3.33008 -4.37012 7.72949 -7.41016 15.2002 -10.5205c1.71777 -0.71582 3.30566 -1.67969 4.71973 -2.84961c11.1699 -10.7207 18.6201 -16.1807 22.9502 -16.8506c5.17969 -0.799805 8 -4.54004 10 -13.3896c1.30957 -5.65039 4 -11.1396 5.45996 -11.1396
+c1.2041 0.246094 2.3418 0.729492 3.33008 1.38965c2 1.21973 2.25 1.73047 2.25 4.17969c-0.267578 6.07031 -0.943359 12.0078 -2 17.8398c-0.370117 1.66016 -0.780273 4.06055 -0.930664 5.35059c-0.149414 1.29004 -0.609375 3.84961 -1 5.68945
+c-2.5498 11.1602 -3.64941 15.46 -4.09961 16c-1.5498 2 -4.08008 10.2002 -4.92969 15.9209c-1.64062 11.1094 -4 14.2295 -12.9102 17.3896c-4.92969 1.81641 -9.44238 4.50195 -13.3398 7.87988c-1.15039 1 -4 3.21973 -6.35059 5.05957
+c-2.34961 1.84082 -4.40918 3.53027 -4.59961 3.76074c-0.848633 0.733398 -1.73926 1.39648 -2.69043 2c-6.23926 4.21973 -8.83984 7 -11.2598 12l-2.43945 5l-0.220703 13l-0.219727 13l6.91016 6.5498c3.9502 3.75 8.47949 7.34961 10.5898 8.42969
+c3.30957 1.69043 4.4502 1.89062 11.3701 2c8.53027 0.19043 10.1201 0 11.6602 -1.55957c1.54004 -1.56055 1.35938 -6.40039 -0.290039 -8.5c-0.592773 -0.666992 -1.05273 -1.45508 -1.33984 -2.32031c0 -0.580078 -2.61035 -4.91016 -5.41992 -9
+c-1.03906 -2.12988 -1.85156 -4.44727 -2.37012 -6.82031c20.4395 -13.3896 21.5498 -3.76953 14.0693 -29l11.3604 -2.51953c3.11035 8.66016 6.46973 17.2598 8.61035 26.2197c0.290039 7.62988 -12 4.19043 -15.4004 8.68066
+c-2.33008 5.92969 3.12988 14.1797 6.05957 19.1992c1.60059 2.33984 6.62012 4.7002 8.82031 4.15039c0.879883 -0.219727 4.16016 0.349609 7.37012 1.28027c2.41992 0.759766 4.97461 1.33398 7.5498 1.67969c2.05957 0.222656 4.08984 0.666016 6 1.29004
+c3.65039 1.11035 4.5 1.16992 6.35059 0.400391c1.85156 -0.636719 3.82324 -1.10352 5.81934 -1.36035c2.12598 -0.287109 4.17285 -0.953125 6 -1.91016c1.55078 -0.908203 3.24414 -1.64746 5 -2.16992c2.51074 -0.679688 3 -0.570312 7.05078 1.66992l4.34961 2.40039
+l10.7402 0.389648c10.4395 0.400391 10.8096 0.469727 15.2598 2.67969l4.58008 2.32031l2.45996 -1.42969c1.75977 -1 3.13965 -2.73047 4.84961 -6c2.36035 -4.51074 2.37988 -4.58008 1.37012 -7.37012c-0.879883 -2.44043 -0.889648 -3.2998 -0.0996094 -6.39062
+c0.526367 -2.03027 1.24219 -4.03516 2.09961 -5.90918c0.62793 -1.22852 1.08203 -2.5918 1.31055 -4c0.30957 -4.33008 0 -5.30078 -2.41016 -6.91992c-2.16992 -1.4707 -7 -7.91016 -7 -9.34082c-0.249023 -1.03906 -0.614258 -2.05762 -1.07031 -3
+c-5 -11.5098 -6.75977 -13.5596 -14.2598 -17c-9.2002 -4.19922 -12.2998 -5.18945 -16.21 -5.18945c-3.10059 0 -4 -0.25 -4.54004 -1.25977c-1.17383 -1.44238 -2.53613 -2.67969 -4.08984 -3.70996c-1.82715 -1.21973 -3.32031 -2.84668 -4.37988 -4.78027
+c-0.486328 -1.22852 -1.36426 -2.24707 -2.49023 -2.91016c-0.941406 -0.387695 -1.77246 -0.97168 -2.4502 -1.70996c-2.22168 -1.9502 -4.53613 -3.73047 -7 -5.37988c-3.33008 -2.33984 -6.87012 -5 -7.87012 -6c-0.666992 -0.71875 -1.47168 -1.29688 -2.37988 -1.7002
+c-0.837891 -0.376953 -1.5625 -0.941406 -2.12988 -1.65039c-1.31055 -1.38965 -1.49023 -2.10938 -1.13965 -4.59961c0.310547 -2.00488 0.795898 -3.99707 1.41992 -5.87988c1.31934 -3.7998 1.30957 -7.86035 0 -10.5703
+c-1.31055 -2.70996 -0.890625 -6.64941 1.34961 -9.58984c2 -2.62988 2.16016 -4.55957 0.709961 -8.83984c-0.692383 -2.67969 -1.06152 -5.48926 -1.06152 -8.38379c0 -0.183594 -0.000976562 -0.34375 0.00195312 -0.526367
+c0 -4.87988 0.219727 -6.28027 1.45996 -8.37988c1.23926 -2.09961 1.81934 -2.48047 3.23926 -2.32031c2 0.230469 2.30078 1.0498 4.70996 12.1201c2.18066 10 3.70996 11.9199 13.7607 17.0801c2.93945 1.50977 7.45996 4 10 5.44043
+c2.54004 1.43945 6.79004 3.68945 9.37012 4.90918c5.99512 2.625 11.1807 6.62598 15.2197 11.6709c7.10938 8.78906 10 16.2197 12.8496 33.2998c0.362305 2.81152 1.37402 5.46387 2.86035 7.72949c1.39648 2.17676 2.40332 4.6748 2.88965 7.31055
+c1 5.2998 2.85059 9.08008 5.58008 11.5098c4.7002 4.17969 6 1.08984 4.58984 -10.8701c-0.459961 -3.86035 -1.09961 -10.3301 -1.43945 -14.3799l-0.610352 -7.36035l4.4502 -4.08984l4.4502 -4.08984l0.109375 -8.41992
+c0.0605469 -4.62988 0.470703 -9.53027 0.919922 -10.8896l0.820312 -2.4707l-6.42969 -6.2793c-8.54004 -8.33008 -12.8799 -13.9307 -16.7598 -21.6104c-1.77051 -3.49023 -3.74023 -7.11035 -4.38086 -8c-2.17969 -3.11035 -6.45996 -13 -8.75977 -20.2598
+l-2.29004 -7.2207l-7 -6.48926c-3.83008 -3.57031 -8 -7.25 -9.16992 -8.16992c-3.0498 -2.32031 -4.25977 -5.15039 -4.25977 -10c-0.00878906 -0.204102 -0.0126953 -0.40918 -0.0126953 -0.614258c0 -2.39062 0.583984 -4.65332 1.60254 -6.64648
+c0.789062 -1.54785 1.49512 -3.17871 2.08984 -4.83008c0.350586 -1.05859 0.887695 -2.03809 1.57031 -2.88965c1.40039 -1.58984 1.91992 -16.1201 0.830078 -23.2197c-0.679688 -4.48047 -3.62988 -12 -4.7002 -12c-1.79004 0 -4.05957 -9.27051 -5.07031 -20.7402
+c-0.179688 -2 -0.620117 -5.94043 -1 -8.7002s-1 -10 -1.34961 -16.0498c-0.770508 -12.2197 -0.19043 -18.7705 2 -23.1504c3.41016 -6.68945 0.519531 -12.6895 -11 -22.8398l-4 -3.49023l0.0703125 -5.18945c0.0546875 -3.05273 0.448242 -6.01562 1.13965 -8.87012
+c4.61035 -16 4.73047 -16.9199 4.37988 -37.1299c-0.459961 -26.4004 -0.259766 -40.2705 0.629883 -44.1504c0.489258 -2.28223 0.853516 -4.63086 1.08008 -7c0.169922 -2 0.660156 -5.33008 1.08008 -7.35938c0.469727 -2.26074 0.780273 -11 0.790039 -22.7402v-19.0605
+l-1.80957 -2.62988c-2.70996 -3.91016 -15.1104 -13.54 -15.4902 -12.29zM261.8 -18.7803c-0.179688 0.299805 -0.330078 6.87012 -0.330078 14.5898c0 14.0605 -0.889648 27.54 -2.25977 34.4502c-0.400391 2 -0.80957 9.7002 -0.900391 17.0605
+c-0.149414 11.9297 -1.39941 24.3701 -2.63965 26.3799c-0.660156 1.06934 -3 17.6602 -3 21.2998c0 4.23047 1 6 5.28027 9.12988s4.85938 3.13965 5.47949 0.719727c0.280273 -1.09961 1.4502 -5.61914 2.60059 -10c3.92969 -15.1191 4.13965 -16.2695 4.0498 -21.7393
+c-0.0996094 -5.78027 -0.129883 -6.12988 -1.74023 -17.7305c-1 -7.07031 -1.16992 -12.3896 -1 -28.4297c0.169922 -19.4004 -0.639648 -35.7305 -2 -41.2705c-0.709961 -2.7793 -2.7998 -5.47949 -3.42969 -4.42969zM190.8 18.7998
+c-0.761719 3.52051 -1.3457 7.14453 -1.72949 10.79c-0.382812 3.64648 -0.967773 7.27051 -1.73047 10.79c-0.513672 2.0957 -0.854492 4.27344 -1 6.49023c-0.30957 3.18945 -0.910156 7.45996 -1.33008 9.47949c-1 4.79004 -3.34961 19.3506 -3.41992 21.0703
+c0 0.740234 -0.339844 4.0498 -0.700195 7.36035c-0.669922 6.20996 -0.839844 27.6699 -0.219727 28.29c1 1 6.62988 -2.76074 11.3301 -7.43066l5.28027 -5.25l-0.450195 -6.46973c-0.25 -3.55957 -0.599609 -10.2295 -0.780273 -14.8301
+c-0.179688 -4.59961 -0.490234 -9.87012 -0.669922 -11.71s-0.610352 -9.36035 -0.939453 -16.7197c-0.790039 -17.4102 -1.94043 -31.29 -2.65039 -32c-0.113281 -0.119141 -0.273438 -0.194336 -0.450195 -0.194336c-0.239258 0 -0.446289 0.135742 -0.549805 0.333984
+h0.00976562zM103.62 285.39c21.0703 -12.79 17.8398 -14.1494 28.4902 -17.6592c13 -4.29004 18.8701 -7.13086 23.1494 -16.8701c-43.6602 -36.1406 -69.0098 -57.8604 -76.71 -70.8604c-31 -52 -6 -101.59 62.75 -87.21c-14.1797 -29.2305 -78 -28.6299 -98.6797 4.90039
+c-24.6797 39.9492 -22.0898 118.3 61 187.659v0.0400391zM314.41 106.39c56.6602 -6.87988 82.3203 37.7402 46.54 89.2305c0 0 -26.8701 29.3398 -64.2803 68c3 15.4502 9.49023 32.1201 30.5703 53.8203c89.2002 -63.5107 92 -141.61 92.46 -149.36
+c4.2998 -70.6396 -78.7002 -91.1797 -105.29 -61.71v0.0195312z" />
+    <glyph glyph-name="old-republic" unicode="&#xf510;" horiz-adv-x="496" 
+d="M235.76 437.77c7.5 0.310547 15 0.280273 22.5 0.0908203c3.61035 -0.140625 7.2002 -0.400391 10.79 -0.730469c4.91992 -0.269531 9.79004 -1.03027 14.6699 -1.62012c2.93066 -0.429688 5.83008 -0.979492 8.75 -1.45996
+c7.90039 -1.33008 15.6699 -3.28027 23.3906 -5.39941c12.2393 -3.4707 24.1895 -7.91992 35.7598 -13.21c26.5596 -12.2402 50.9395 -29.21 71.6299 -49.8809c20.0303 -20.0898 36.7197 -43.5498 48.8896 -69.1895c1.12988 -2.58984 2.44043 -5.10059 3.4707 -7.74023
+c2.80957 -6.42969 5.38965 -12.9697 7.58008 -19.6299c4.13965 -12.3301 7.33984 -24.9902 9.41992 -37.8301c0.569336 -3.13965 1.04004 -6.2998 1.39941 -9.46973c0.549805 -3.83008 0.94043 -7.69043 1.18066 -11.5605
+c0.829102 -8.33984 0.839844 -16.7295 0.769531 -25.0996c-0.0703125 -4.96973 -0.259766 -9.94043 -0.75 -14.8896c-0.240234 -3.38086 -0.509766 -6.76074 -0.979492 -10.1201c-0.390625 -2.7207 -0.630859 -5.45996 -1.11035 -8.16992
+c-0.900391 -5.15039 -1.7002 -10.3105 -2.87012 -15.4102c-4.09961 -18.5 -10.2998 -36.5498 -18.5098 -53.6299c-15.7705 -32.8301 -38.8301 -62.1699 -67.1201 -85.1201c-17.2012 -14.0635 -36.3066 -25.8115 -56.9102 -34.8604
+c-6.20996 -2.67969 -12.46 -5.25 -18.8701 -7.41016c-3.50977 -1.16016 -7.00977 -2.37988 -10.5703 -3.38965c-6.61914 -1.87988 -13.2891 -3.63965 -20.0391 -5c-4.66016 -0.910156 -9.34082 -1.73047 -14.0303 -2.48047c-5.25 -0.65918 -10.5 -1.43945 -15.79 -1.73926
+c-6.69043 -0.660156 -13.4102 -0.839844 -20.1201 -0.810547c-6.82031 -0.0292969 -13.6504 0.120117 -20.4502 0.790039c-3.29004 0.230469 -6.57031 0.5 -9.83008 0.950195c-2.71973 0.389648 -5.45996 0.629883 -8.16992 1.11035
+c-4.12012 0.719727 -8.25 1.37012 -12.3496 2.21973c-4.25 0.939453 -8.49023 1.88965 -12.6904 3.01953c-8.62988 2.16992 -17.0801 5.01074 -25.4102 8.13086c-10.4893 4.11914 -20.79 8.75 -30.6396 14.25c-2.13965 1.14941 -4.28027 2.28906 -6.34961 3.56934
+c-11.2207 6.58008 -21.8604 14.1006 -31.9199 22.3398c-34.6807 28.4102 -61.4102 66.4307 -76.3506 108.7c-3.08984 8.74023 -5.70996 17.6504 -7.7998 26.6797c-1.48047 6.16016 -2.52051 12.4209 -3.58008 18.6602
+c-0.400391 2.35059 -0.610352 4.73047 -0.950195 7.08984c-0.599609 3.96094 -0.75 7.96094 -1.16992 11.9404c-0.799805 9.46973 -0.709961 18.9902 -0.509766 28.4902c0.139648 3.50977 0.339844 7.00977 0.700195 10.5098
+c0.30957 3.16992 0.459961 6.37012 0.919922 9.52051c0.410156 2.80957 0.649414 5.64941 1.16016 8.43945c0.699219 3.94043 1.2998 7.90039 2.11914 11.8203c3.43066 16.5195 8.4707 32.7295 15.2607 48.1797c1.14941 2.91992 2.58984 5.71973 3.85938 8.58984
+c8.05078 16.71 17.9004 32.5605 29.4902 47.0605c20 25.3799 45.1006 46.6797 73.2705 62.4697c7.5 4.15039 15.1592 8.0498 23.0693 11.3701c15.8203 6.87988 32.4102 11.9502 49.3105 15.3799c3.50977 0.669922 7.04004 1.24023 10.5596 1.84961
+c2.62012 0.470703 5.28027 0.700195 7.91016 1.08008c3.53027 0.530273 7.09961 0.680664 10.6504 1.04004c2.45996 0.240234 4.90918 0.360352 7.35938 0.509766zM244.4 413.36c-9.23047 -0.100586 -18.4307 -0.990234 -27.5703 -2.23047
+c-7.2998 -1.08008 -14.5303 -2.59961 -21.71 -4.2998c-13.9102 -3.5 -27.4805 -8.33984 -40.46 -14.4199c-10.46 -4.99023 -20.5898 -10.7002 -30.1797 -17.2197c-4.18066 -2.9209 -8.40039 -5.80078 -12.3408 -9.03027
+c-5.08008 -3.96973 -9.97949 -8.16992 -14.6797 -12.5898c-2.50977 -2.24023 -4.80957 -4.7002 -7.21973 -7.06055c-28.2207 -28.79 -48.4404 -65.3896 -57.5 -104.689c-2.04004 -8.44043 -3.54004 -17.0205 -4.44043 -25.6504
+c-1.09961 -8.88965 -1.43945 -17.8496 -1.41016 -26.7998c0.110352 -7.13965 0.379883 -14.2803 1.2207 -21.3701c0.620117 -7.12012 1.87012 -14.1602 3.19922 -21.1797c1.07031 -4.65039 2.03027 -9.32031 3.33008 -13.9102
+c6.29004 -23.3799 16.5 -45.7002 30.0703 -65.75c8.63965 -12.9805 18.7803 -24.9297 29.9805 -35.7705c16.2793 -15.8193 35.0498 -29.04 55.3398 -39.2197c7.2793 -3.51953 14.6602 -6.87012 22.2695 -9.62988c5.04004 -1.75977 10.0605 -3.57031 15.2197 -4.98047
+c11.2607 -3.22949 22.7705 -5.59961 34.3906 -7.05957c2.91016 -0.290039 5.80957 -0.610352 8.71973 -0.900391c13.8203 -1.08008 27.7402 -1 41.54 0.430664c4.4502 0.599609 8.91992 0.989258 13.3496 1.7793c3.63086 0.670898 7.28027 1.25 10.8701 2.10059
+c4.12988 0.979492 8.28027 1.91016 12.3604 3.07031c26.5 7.33984 51.5801 19.71 73.5801 36.1992c15.7803 11.8203 29.96 25.7607 42.1201 41.2803c3.25977 4.02051 6.16992 8.30957 9.12988 12.5498c3.38965 5.06055 6.58008 10.25 9.59961 15.54
+c2.40039 4.44043 4.74023 8.91016 6.9502 13.4502c5.69043 12.0498 10.2803 24.6201 13.75 37.4902c2.58984 10.0098 4.75 20.1602 5.90039 30.4502c1.76953 13.4697 1.93945 27.0996 1.29004 40.6494c-0.290039 3.89062 -0.669922 7.77051 -1 11.6602
+c-2.23047 19.0801 -6.79004 37.9102 -13.8203 55.7998c-5.9502 15.1299 -13.5303 29.6299 -22.6104 43.1299c-12.6895 18.8008 -28.2393 35.6807 -45.9697 49.8301c-25.0498 20 -54.4697 34.5498 -85.6504 42.0801c-7.7793 1.92969 -15.6895 3.33984 -23.6299 4.4502
+c-3.90918 0.589844 -7.84961 0.820312 -11.7695 1.24023c-7.38965 0.569336 -14.8105 0.719727 -22.2197 0.580078zM139.26 364.47c13.2998 8.89062 28.0801 15.3799 43.2998 20.1807c-3.16992 -1.77051 -6.43945 -3.38086 -9.5293 -5.29004
+c-11.21 -6.68066 -21.5205 -14.9004 -30.3799 -24.4902c-6.80078 -7.42969 -12.7607 -15.7305 -17.0107 -24.8896c-3.29004 -6.86035 -5.63965 -14.1904 -6.85938 -21.7109c-0.930664 -4.84961 -1.2998 -9.80957 -1.16992 -14.75
+c0.129883 -13.6592 4.43945 -27.0791 11.29 -38.8193c5.91992 -10.2197 13.6299 -19.3301 22.3594 -27.2598c4.85059 -4.36035 10.2402 -8.09082 14.9502 -12.6006c2.25977 -2.18945 4.49023 -4.41992 6.42969 -6.91016c2.62012 -3.30957 4.89062 -6.98926 5.99023 -11.0996
+c0.900391 -3.02051 0.660156 -6.2002 0.69043 -9.31055c0.0195312 -4.09961 -0.0400391 -8.19922 0.0292969 -12.2998c0.140625 -3.54004 -0.0195312 -7.08984 0.110352 -10.6299c0.0800781 -2.37988 0.0205078 -4.75977 0.0498047 -7.13965
+c0.160156 -5.77051 0.0605469 -11.5303 0.150391 -17.2998c0.109375 -2.91016 0.0195312 -5.82031 0.129883 -8.74023c0.0302734 -1.62988 0.129883 -3.28027 -0.0302734 -4.91016c-0.910156 -0.120117 -1.81934 -0.179688 -2.72949 -0.160156
+c-10.9902 0 -21.8799 2.62988 -31.9502 6.92969c-6 2.7002 -11.8105 5.89062 -17.0898 9.83008c-5.75 4.19043 -11.0898 8.95996 -15.79 14.3105c-6.53027 7.24023 -11.9805 15.3896 -16.6201 23.9502c-1.07031 2.0293 -2.24023 4.01953 -3.17969 6.12012
+c-1.16016 2.63965 -2.62012 5.13965 -3.66992 7.81934c-4.05078 9.68066 -6.57031 19.9404 -8.08008 30.3105c-0.490234 4.43945 -1.09082 8.87988 -1.2002 13.3496c-0.700195 15.7305 0.839844 31.5498 4.66992 46.8203c2.12012 8.14941 4.76953 16.1797 8.30957 23.8301
+c6.32031 14.1992 15.3398 27.1797 26.3008 38.1895c6.2793 6.2002 13.1299 11.8398 20.5293 16.6699zM314.63 384.59c2.74023 -0.740234 5.41016 -1.74023 8.08984 -2.67969c6.36035 -2.33008 12.6807 -4.83984 18.71 -7.95996
+c13.1104 -6.44043 25.3105 -14.8105 35.8203 -24.9697c10.2002 -9.9502 18.7402 -21.6006 25.1396 -34.3408c1.28027 -2.75 2.64062 -5.45996 3.81055 -8.25977c6.30957 -15.0996 10 -31.2598 11.2295 -47.5703c0.410156 -4.54004 0.44043 -9.08984 0.450195 -13.6396
+c0.0703125 -11.6396 -1.49023 -23.25 -4.2998 -34.5303c-1.96973 -7.26953 -4.34961 -14.4893 -7.86035 -21.1797c-3.17969 -6.63965 -6.67969 -13.1602 -10.8398 -19.2402c-6.93945 -10.4697 -15.5996 -19.8701 -25.8203 -27.2197
+c-10.4795 -7.63965 -22.6396 -13.0195 -35.3994 -15.3799c-3.50977 -0.69043 -7.08008 -1.08008 -10.6602 -1.20996c-1.84961 -0.0605469 -3.71973 -0.160156 -5.55957 0.0996094c-0.280273 2.15039 0 4.31055 -0.0107422 6.45996
+c-0.0292969 3.73047 0.140625 7.4502 0.100586 11.1699c0.189453 7.02051 0.0195312 14.0508 0.209961 21.0703c0.0292969 2.37988 -0.0302734 4.75977 0.0292969 7.13965c0.170898 5.07031 -0.0390625 10.1406 0.140625 15.21
+c0.0996094 2.99023 -0.240234 6.04004 0.509766 8.95996c0.660156 2.5 1.78027 4.86035 3.08984 7.08008c4.45996 7.31055 11.0605 12.96 17.6807 18.2607c5.37988 4.17969 10.4697 8.76953 15.0195 13.8398c7.67969 8.37012 14.1699 17.8799 18.7803 28.2695
+c2.5 5.93066 4.51953 12.1006 5.5498 18.46c0.860352 4.37012 1.05957 8.83008 1.00977 13.2705c-0.0195312 7.84961 -1.39941 15.6494 -3.63965 23.1699c-1.75 5.72949 -4.27051 11.1797 -7.08984 16.4502c-3.87012 6.92969 -8.65039 13.3096 -13.96 19.1992
+c-9.94043 10.8506 -21.75 19.9404 -34.6006 27.1006c-1.84961 1.01953 -3.83984 1.82031 -5.62988 2.96973zM213.83 326.14c0.979492 1.18066 1.99023 2.33008 3.12012 3.37988c-0.610352 -0.929688 -1.27051 -1.80957 -1.9502 -2.67969
+c-3.09961 -3.87988 -5.54004 -8.30957 -7.03027 -13.0596c-0.870117 -3.27051 -1.67969 -6.60059 -1.72949 -10c-0.0703125 -2.52051 -0.0800781 -5.07031 0.319336 -7.57031c1.13086 -7.62988 4.33008 -14.8496 8.77051 -21.1201c2 -2.7002 4.25 -5.26953 6.91992 -7.33008
+c1.62012 -1.26953 3.53027 -2.08984 5.33984 -3.0498c3.11035 -1.67969 6.32031 -3.22949 9.07031 -5.47949c2.66992 -2.09082 4.5498 -5.33008 4.39941 -8.79004c-0.00976562 -73.6709 0 -147.341 -0.00976562 -221.021c0 -1.34961 -0.0800781 -2.7002 0.0400391 -4.04004
+c0.129883 -1.47949 0.820312 -2.83008 1.46973 -4.14941c0.860352 -1.66016 1.78027 -3.34082 3.18066 -4.62012c0.849609 -0.770508 1.96973 -1.40039 3.14941 -1.24023c1.5 0.200195 2.66016 1.34961 3.4502 2.57031c0.959961 1.50977 1.67969 3.15918 2.28027 4.84961
+c0.759766 2.12988 0.439453 4.41992 0.540039 6.62988c0.139648 4.03027 -0.0205078 8.06055 0.139648 12.0898c0.0302734 5.89062 0.0302734 11.7705 0.0605469 17.6602c0.139648 3.62012 0.0292969 7.24023 0.109375 10.8604
+c0.150391 4.0293 -0.0195312 8.05957 0.140625 12.0898c0.0292969 5.99023 0.0292969 11.9795 0.0693359 17.9697c0.140625 3.62012 0.0205078 7.24023 0.110352 10.8604c0.139648 3.92969 -0.0205078 7.85938 0.139648 11.7803
+c0.0302734 5.98926 0.0302734 11.9795 0.0605469 17.9697c0.160156 3.93945 -0.00976562 7.87988 0.189453 11.8193c0.290039 -1.43945 0.129883 -2.91992 0.220703 -4.37988c0.189453 -3.60938 0.419922 -7.22949 0.759766 -10.8398
+c0.320312 -3.43945 0.439453 -6.88965 0.859375 -10.3193c0.370117 -3.10059 0.510742 -6.2207 0.950195 -9.31055c0.570312 -4.08984 0.870117 -8.20996 1.54004 -12.29c1.45996 -9.04004 2.83008 -18.1104 5.08984 -26.9902c1.13086 -4.81934 2.40039 -9.60938 4 -14.2998
+c2.54004 -7.89941 5.7207 -15.6699 10.3105 -22.6201c1.72949 -2.63965 3.87012 -4.97949 6.09961 -7.20996c0.270508 -0.25 0.549805 -0.509766 0.879883 -0.709961c0.600586 -0.25 1.31055 0.0703125 1.7002 0.570312c0.709961 0.879883 1.16992 1.93945 1.7002 2.92969
+c4.0498 7.7998 8.17969 15.5605 12.3398 23.3105c0.700195 1.30957 1.44043 2.62012 2.56055 3.60938c1.75 1.57031 3.83984 2.69043 5.97949 3.62988c2.87988 1.2207 5.90039 2.19043 9.03027 2.41992c6.58008 0.620117 13.1094 -0.75 19.5596 -1.84961
+c3.69043 -0.580078 7.40039 -1.16992 11.1299 -1.41016c3.74023 -0.0996094 7.48047 -0.0498047 11.21 0.280273c8.55078 0.919922 16.9902 2.95996 24.9404 6.25c5.2998 2.24023 10.46 4.83008 15.3096 7.92969c11.46 7.20996 21.46 16.5703 30.04 27.0107
+c1.16992 1.41992 2.25 2.89941 3.45996 4.2793c-1.19922 -3.24023 -2.66992 -6.37012 -4.15918 -9.47949c-1.25 -2.90039 -2.84082 -5.61035 -4.27051 -8.41992c-5.16016 -9.62988 -11.0195 -18.9102 -17.75 -27.5205
+c-4.03027 -5.20996 -8.53027 -10.0498 -13.3301 -14.5703c-6.63965 -6.0498 -14.0703 -11.3691 -22.4297 -14.7598c-8.20996 -3.37012 -17.3105 -4.62988 -26.0898 -3.29004c-3.56055 0.580078 -7.01074 1.69043 -10.4102 2.87988
+c-2.79004 0.970703 -5.39062 2.38086 -8.03027 3.69043c-3.42969 1.70996 -6.63965 3.80957 -9.70996 6.08008c2.70996 -3.06055 5.69043 -5.86035 8.7002 -8.61035c4.26953 -3.75977 8.74023 -7.30957 13.6299 -10.2295c3.98047 -2.4502 8.29004 -4.40039 12.8398 -5.51074
+c1.45996 -0.369141 2.95996 -0.459961 4.4502 -0.599609c-1.25 -1.09961 -2.62988 -2.04004 -3.99023 -2.97949c-9.60938 -6.54004 -20.0098 -11.8604 -30.6895 -16.4307c-20.8604 -8.7002 -43.1699 -13.9697 -65.7402 -15.3398
+c-4.66016 -0.240234 -9.32031 -0.360352 -13.9805 -0.360352c-4.97949 0.110352 -9.96973 0.130859 -14.9199 0.650391c-11.2002 0.759766 -22.29 2.73047 -33.1699 5.42969c-10.3496 2.70996 -20.5498 6.12012 -30.2998 10.5508
+c-8.70996 3.85938 -17.1201 8.41992 -24.9902 13.79c-1.83008 1.30957 -3.74023 2.5293 -5.37012 4.0791c6.60059 1.19043 13.0303 3.39062 18.9902 6.48047c5.74023 2.86035 10.9902 6.66016 15.6299 11.0703c2.24023 2.18945 4.29004 4.58984 6.19043 7.08984
+c-3.43066 -2.12988 -6.93066 -4.15039 -10.6201 -5.78027c-4.41016 -2.16016 -9.07031 -3.76953 -13.8105 -5.01953c-5.72949 -1.52051 -11.7393 -1.73047 -17.6094 -1.14062c-8.12988 0.950195 -15.8604 4.27051 -22.5098 8.98047
+c-4.32031 2.93945 -8.2207 6.42969 -11.96 10.0596c-9.93066 10.1602 -18.2002 21.8105 -25.6602 33.8604c-3.94043 6.26953 -7.53027 12.75 -11.1201 19.2197c-1.0498 2.04004 -2.15039 4.0498 -3.17969 6.10059c2.84961 -2.9209 5.56934 -5.9707 8.42969 -8.88086
+c8.99023 -8.96973 18.5596 -17.4395 29.1602 -24.4795c7.5498 -4.90039 15.6699 -9.23047 24.5596 -11.0303c3.11035 -0.729492 6.32031 -0.469727 9.46973 -0.80957c2.77051 -0.280273 5.56055 -0.200195 8.34082 -0.299805
+c5.0498 -0.0605469 10.1094 -0.0400391 15.1592 0.15918c3.65039 0.160156 7.27051 0.660156 10.8906 1.09082c2.06934 0.25 4.10938 0.709961 6.13965 1.19922c3.87988 0.950195 8.11035 0.959961 11.8301 -0.609375c4.75977 -1.85059 8.44043 -5.64062 11.3799 -9.70996
+c2.16016 -3.02051 4.06055 -6.2207 5.66016 -9.58008c1.16016 -2.43066 2.45996 -4.79004 3.5498 -7.26074c1 -2.23926 2.15039 -4.41992 3.41992 -6.51953c0.669922 -1.01953 1.40039 -2.15039 2.62012 -2.5498c1.06055 0.75 1.70996 1.91016 2.28027 3.03027
+c2.09961 4.15918 3.41992 8.64941 4.88965 13.0498c2.02051 6.58984 3.78027 13.2695 5.19043 20.0195c2.20996 9.25 3.25 18.7197 4.54004 28.1299c0.55957 3.98047 0.830078 7.99023 1.30957 11.9707c0.870117 10.6396 1.90039 21.2695 2.24023 31.9395
+c0.0800781 1.86035 0.240234 3.70996 0.25 5.57031c0.00976562 4.34961 0.25 8.68945 0.219727 13.0303c-0.00976562 2.37988 -0.00976562 4.75977 0 7.12988c0.0498047 5.06934 -0.200195 10.1396 -0.219727 15.21c-0.200195 6.60938 -0.709961 13.2002 -1.29004 19.7793
+c-0.730469 5.88086 -1.5498 11.7803 -3.12012 17.5107c-2.0498 7.75 -5.58984 15.0293 -9.7998 21.8193c-3.16016 5.07031 -6.79004 9.87988 -11.0898 14.0303c-3.87988 3.86035 -8.58008 7.08008 -13.9404 8.4502c-1.5 0.410156 -3.05957 0.450195 -4.58984 0.639648
+c0.0703125 2.99023 0.700195 5.93066 1.25977 8.85059c1.58984 7.70996 3.7998 15.2998 6.76074 22.5996c1.51953 4.03027 3.40918 7.90039 5.38965 11.7197c3.4502 6.56055 7.62012 12.79 12.46 18.46zM245.1 324.44
+c0.350586 0.0595703 0.709961 0.119141 1.07031 0.189453c0.19043 -1.79004 0.0898438 -3.58008 0.0996094 -5.37012v-38.1299c-0.00976562 -1.74023 0.130859 -3.49023 -0.149414 -5.21973c-0.360352 0.0302734 -0.709961 0.0498047 -1.06055 0.0498047
+c-0.949219 3.75 -1.71973 7.5498 -2.61914 11.3096c-0.380859 1.53027 -0.580078 3.09082 -1.07031 4.59082c-1.7002 0.239258 -3.42969 0.169922 -5.15039 0.199219c-5.05957 0.0107422 -10.1299 0 -15.1895 0.0107422
+c-1.66016 0.00976562 -3.32031 -0.0898438 -4.98047 0.0292969c-0.0302734 0.390625 -0.259766 0.910156 0.160156 1.18066c1.28027 0.649414 2.71973 0.879883 4.05957 1.34961c3.43066 1.13965 6.88086 2.16016 10.3105 3.31055
+c1.38965 0.479492 2.90039 0.719727 4.16016 1.54004c0.0400391 0.55957 0.0195312 1.12988 -0.0498047 1.67969c-1.23047 0.549805 -2.53027 0.870117 -3.81055 1.28027c-3.12988 1.0293 -6.29004 1.95996 -9.41016 3.01953c-1.79004 0.620117 -3.66992 1 -5.41016 1.79004
+c-0.0292969 0.370117 -0.0693359 0.730469 -0.109375 1.08984c5.08984 0.19043 10.2002 -0.0595703 15.2998 0.120117c3.36035 0.129883 6.73047 -0.0800781 10.0898 0.0703125c0.120117 0.389648 0.259766 0.769531 0.370117 1.16016
+c1.08008 4.93945 2.33008 9.8291 3.38965 14.75zM251.07 324.64c0.359375 -0.0498047 0.719727 -0.120117 1.08008 -0.199219c0.979492 -3.85059 1.72949 -7.76074 2.70996 -11.6104c0.359375 -1.41992 0.55957 -2.87988 1.0293 -4.27051
+c2.53027 -0.179688 5.07031 0.0107422 7.61035 -0.0498047c5.16016 -0.120117 10.3301 -0.120117 15.4902 -0.0693359c0.759766 0.00976562 1.51953 -0.0302734 2.2793 -0.0800781c-0.0390625 -0.360352 -0.0693359 -0.720703 -0.0996094 -1.08008
+c-1.82031 -0.830078 -3.78027 -1.25 -5.66992 -1.89062c-3.73047 -1.22949 -7.48047 -2.38965 -11.2197 -3.56934c-0.570312 -0.169922 -1.12012 -0.419922 -1.66992 -0.640625c-0.150391 -0.549805 -0.180664 -1.12012 -0.120117 -1.68945
+c0.870117 -0.480469 1.81934 -0.810547 2.76953 -1.08984c4.87988 -1.52051 9.73047 -3.14062 14.6299 -4.60059c0.379883 -0.129883 0.780273 -0.269531 1.12988 -0.490234c0.400391 -0.269531 0.230469 -0.790039 0.150391 -1.17969
+c-1.66016 -0.129883 -3.30957 -0.0302734 -4.96973 -0.0400391c-5.16992 -0.00976562 -10.3301 0.00976562 -15.5 -0.00976562c-1.61035 -0.0302734 -3.21973 0.0195312 -4.82031 -0.209961c-0.519531 -1.66992 -0.719727 -3.41992 -1.16992 -5.11035
+c-0.94043 -3.56934 -1.51953 -7.24023 -2.54004 -10.7793c-0.360352 -0.0107422 -0.709961 -0.0205078 -1.05957 -0.0605469c-0.290039 1.73047 -0.150391 3.48047 -0.150391 5.21973v38.1299c0.0205078 1.78027 -0.0800781 3.58008 0.110352 5.37012zM65.0498 279.67
+c1.12012 2.15039 2.08008 4.40039 3.37012 6.45996c-1.82031 -7.55957 -2.91016 -15.2695 -3.62012 -23c-0.799805 -7.70996 -0.849609 -15.4902 -0.540039 -23.2295c1.0498 -19.9404 5.54004 -39.8301 14.2305 -57.8809c2.99023 -5.98926 6.34961 -11.8291 10.5 -17.1094
+c6.12012 -7.46973 12.5293 -14.7598 19.8398 -21.0898c4.7998 -4.10059 9.99023 -7.78027 15.54 -10.8008c3.26953 -1.64941 6.50977 -3.38965 9.93945 -4.67969c5.01074 -2.03027 10.1904 -3.60938 15.4209 -4.93945c3.8291 -0.959961 7.7793 -1.41016 11.5195 -2.70996
+c5 -1.57031 9.46973 -4.61035 13.0303 -8.43066c4.92969 -5.22949 8.08984 -11.8701 10.2002 -18.6699c0.989258 -2.89941 1.58984 -5.91016 2.16992 -8.91992c0.149414 -0.75 0.219727 -1.51953 0.15918 -2.29004c-6.5 -2.78027 -13.2598 -5.05957 -20.2598 -6.17969
+c-4.10938 -0.780273 -8.29004 -0.990234 -12.46 -1.08008c-10.25 -0.240234 -20.4697 1.75977 -30.1201 5.12012c-3.73926 1.41992 -7.48926 2.84961 -11.0293 4.71973c-8.06055 3.83984 -15.6406 8.7002 -22.46 14.46c-2.9209 2.5498 -5.83008 5.12988 -8.40039 8.03027
+c-9.16016 9.83008 -16.2998 21.4102 -21.79 33.6494c-2.38965 5.55078 -4.61035 11.1807 -6.37012 16.96c-1.16992 3.94043 -2.36035 7.89062 -3.25977 11.9102c-0.75 2.94043 -1.21973 5.9502 -1.87012 8.91992c-0.459961 2.14062 -0.69043 4.32031 -1.03027 6.48047
+c-0.849609 5.42969 -1.2793 10.9297 -1.33008 16.4297c0.110352 6.18066 0.25 12.3701 1.07031 18.5c0.400391 2.86035 0.669922 5.74023 1.15039 8.60059c0.979492 5.69922 2.13965 11.3691 3.70996 16.9297c3.08984 11.6504 7.47949 22.9502 12.6895 33.8398z
+M428.78 286.11c1.09961 -1.66016 1.91016 -3.48047 2.7793 -5.26074c2.10059 -4.44922 4.24023 -8.89941 6.02051 -13.4893c7.61035 -18.7607 12.2998 -38.79 13.04 -59.0508c0.0195312 -1.75977 0.0703125 -3.51953 0.110352 -5.29004
+c0.129883 -9.56934 -1.27051 -19.0898 -3.18066 -28.4492c-0.729492 -3.58984 -1.54004 -7.16992 -2.58008 -10.6904c-4.04004 -14.7197 -10 -29 -18.4102 -41.7803c-8.20996 -12.5693 -19.0098 -23.5498 -31.8398 -31.4092
+c-5.72949 -3.59082 -11.79 -6.64062 -18.0498 -9.19043c-5.78027 -2.19043 -11.71 -4.03027 -17.7998 -5.11035c-6.40039 -1.0498 -12.9102 -1.51953 -19.4004 -1.22949c-7.91992 0.479492 -15.7793 2.07031 -23.21 4.84961
+c-1.93945 0.799805 -3.93945 1.45996 -5.83984 2.33008c-0.209961 1.50977 0.25 2.99023 0.530273 4.45996c1.16016 5.74023 3.03027 11.3604 5.7002 16.5801c2.36914 4.50977 5.51953 8.65039 9.45996 11.9004c2.42969 2.0498 5.23926 3.60938 8.15918 4.83008
+c3.58008 1.5 7.4707 1.96973 11.2402 2.83008c7.23047 1.70996 14.3701 3.92969 21.1504 7c10.3496 4.64941 19.71 11.3799 27.6494 19.46c1.59082 1.60938 3.23047 3.17969 4.74023 4.86914c3.37012 3.76074 6.70996 7.57031 9.85059 11.5303
+c7.47949 10.0703 12.8193 21.5898 16.71 33.4805c1.58008 5.2998 3.20996 10.5996 4.20996 16.0498c0.629883 2.87012 1.04004 5.78027 1.51953 8.67969c0.870117 6.08984 1.58984 12.2207 1.67969 18.3799c0.120117 6.65039 0.140625 13.3203 -0.529297 19.9404
+c-0.730469 7.99023 -1.87012 15.96 -3.70996 23.7803z" />
+    <glyph glyph-name="phoenix-squadron" unicode="&#xf511;" horiz-adv-x="512" 
+d="M96 384.62c46.4902 36.1299 105.55 56.0703 164.51 54.5703c29.5801 0.379883 59.1104 -5.37012 86.9102 -15.3301c-24.1299 4.62988 -49 6.33984 -73.3799 2.44922c-42.8701 -5.30957 -83.04 -27.1494 -111.83 -59.1797c5.66992 1 10.7803 3.66992 16 5.86035
+c18.1396 7.87012 37.4902 13.2598 57.2305 14.8301c19.7393 2.12988 39.6396 0.429688 59.2793 -1.91992c-14.4199 -2.79004 -29.1201 -4.57031 -43 -9.59082c-34.4297 -11.0693 -65.2695 -33.1592 -86.2998 -62.6299c-13.7998 -19.71 -23.6299 -42.8594 -24.6699 -67.1299
+c-0.349609 -16.4902 5.21973 -34.8096 19.8301 -44c8.0293 -4.85254 17.4395 -7.64648 27.498 -7.64648c3.4209 0 6.7793 0.289062 10.0215 0.90625c15.4502 2.45996 30.0703 8.64062 43.6006 16.3301c11.5195 6.82031 22.6699 14.5508 32 24.25
+c3.79004 3.2207 2.53027 8.4502 2.62012 12.79c-2.12012 0.339844 -4.37988 1.11035 -6.30078 -0.299805c-11.2676 -6.17773 -23.3838 -11.3975 -35.8193 -15.3701c-20 -6.16992 -42.1602 -8.45996 -62.1006 -0.779297c12.79 -1.73047 26.0605 -0.310547 37.7402 5.43945
+c20.2305 9.71973 36.8105 25.2002 54.4404 38.7705c27.625 21.2686 57.3311 39.7881 88.8994 55.3096c25.71 12 52.9404 22.7803 81.5703 24.1201c-15.6299 -13.7197 -32.1504 -26.5205 -46.7803 -41.3799c-14.5098 -14 -27.46 -29.5 -40.1094 -45.1807
+c-3.52051 -4.59961 -8.9502 -6.93945 -13.5801 -10.1592c-22.333 -15.0176 -40.1992 -35.627 -51.8906 -60.1006c-9.33008 -19.6797 -14.5 -41.8496 -11.7695 -63.6494c1.93945 -13.6904 8.70996 -27.5908 20.8994 -34.9102c12.9004 -8 29.0508 -8.07031 43.4805 -5.10059
+c32.7998 7.4502 61.4297 28.8906 81 55.8408c20.4404 27.5195 30.5195 62.1992 29.1602 96.3496c-0.520508 7.5 -1.57031 15 -1.66016 22.4902c8 -19.4805 14.8203 -39.71 16.6504 -60.8301c2 -14.2803 0.75 -28.7598 -1.62012 -42.9004
+c-1.91016 -11 -5.66992 -21.5098 -7.78027 -32.4297c19.9287 22.3428 33.9023 50.3545 39.3398 81.0703c1.48438 9.39258 2.25488 19.0225 2.25488 28.8301c0 27.0342 -5.95508 52.6875 -16.4648 75.8096c20.7803 -32 32.3398 -69.5801 35.71 -107.48
+c0.490234 -12.7295 0.490234 -25.5098 0 -38.2295c-2.89453 -35.0469 -13.3936 -68.4854 -29.5898 -97.75c-26.1201 -47.3398 -68 -85.6299 -117.19 -108c-78.29 -36.2305 -174.68 -31.3203 -248 14.6797c-39.0088 23.8643 -70.5215 57.7861 -91.4492 98.6602
+c-14.2646 28.0879 -23.2725 59.8086 -25.3604 92.9199v31.3398c3.92969 69.7402 40.8701 135.92 96 178.36zM318 304.29c5.50781 0.932617 10.9404 2.46973 16 4.47949c5 1.77051 9.24023 5.94043 10.3203 11.2207c-8.95996 -4.99023 -17.9805 -9.91992 -26.3203 -15.7002z
+" />
+    <glyph glyph-name="sith" unicode="&#xf512;" 
+d="M0 416l118.75 -69.71l-11.5195 58.9004l91.0596 -69.8701c8.5 1.50977 17.0996 2.29004 25.71 2.29004s17.21 -0.770508 25.71 -2.29004l91.0596 69.8701l-11.5195 -58.9004l118.75 69.71l-69.71 -118.75l58.8604 11.5195l-69.8408 -91.0293
+c3.04004 -17.0098 3.03027 -34.4404 0 -51.4502l69.8408 -91.0303l-58.8604 11.5205l69.71 -118.78l-118.75 69.71l11.5195 -58.8604l-91.0293 69.8408c-17.0098 -3.04004 -34.46 -3.04004 -51.4805 0l-91.0293 -69.8408l11.5195 58.8604l-118.75 -69.71l69.71 118.78
+l-58.8604 -11.5205l69.8408 91.0303c-1.49512 8.39453 -2.27539 16.7734 -2.27539 25.5947s0.780273 17.4609 2.27539 25.8555l-69.8408 91.0293l58.8604 -11.5195zM224 316.22c-31.7998 0 -63.6104 -12.0898 -87.8496 -36.3398c-48.4902 -48.4902 -48.5 -127.2 0 -175.7
+c48.5 -48.4893 127.21 -48.5195 175.699 -0.0292969c48.4902 48.4893 48.5 127.199 0 175.699c-24.25 24.25 -56.0498 36.3701 -87.8496 36.3701zM224 279.56c22.4199 0 44.8301 -8.51953 61.9199 -25.6094c34.1904 -34.1904 34.1797 -89.6904 0 -123.87
+c-34.1895 -34.1797 -89.6504 -34.1904 -123.84 0c-34.1904 34.1895 -34.1797 89.6895 0 123.87c17.0898 17.0898 39.5 25.6094 61.9199 25.6094z" />
+    <glyph glyph-name="trade-federation" unicode="&#xf513;" horiz-adv-x="496" 
+d="M248 439.2c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -43.5996c129.7 0 234.8 105.1 234.8 234.8s-105.1 234.8 -234.8 234.8s-234.8 -105.1 -234.8 -234.8s105.1 -234.8 234.8 -234.8zM403.1 284.9v-0.100586h-145.699
+v-34.7998h83.2998v-47h-83.2998v-195.8h-48.8008v196.8h-117.699l-36.7002 46h155.1v81.7002h193.8v-46.7998zM329.8 239.8h-82.8994v56.2002h145v24.4004h-171.801v-80.6006h-143.899l20.0996 -23.8994h123.8v-197.4h26.8008v197.4h82.8994v23.8994zM168.5 308.8l22 9.2998
+l-15.7998 -18.0996l15.7002 -18.0996l-22.2002 9.5l-12.2998 -20.5l2.09961 24l-23.2998 5.39941l23.5 5.40039l-2.10059 23.7998zM138.9 328.5l9.5 -10.2002l-13.8008 5.2998l-6.7998 -12.1992l0.799805 14.6992l-13.6992 2.7002l14.2998 3.7998l-1.7002 13.9004
+l8 -12.4004l12.7002 5.90039zM304.3 183.3l-9.2998 -10.7998l9.40039 -10.7002l-13.1006 5.5l-7.2998 -12.2002l1.2002 14.2002l-13.9004 3.2002l13.9004 3.2002l-1.2998 14.2002l7.2998 -12.2002zM411.2 260.5l-15 -17.5996l15.0996 -17l-21.2002 8.7998l-11.5 -19.6006
+l1.80078 22.9004l-22.2002 4.90039l22.2998 5.39941l-2.2002 22.7002l12 -19.5996zM248 418.1c125.3 0 226.9 -101.6 226.9 -226.899s-101.601 -226.9 -226.9 -226.9s-226.9 101.601 -226.9 226.9s101.601 226.899 226.9 226.899zM342.6 252h-83.1992v30.9004h145.699
+v50.6992h-197.8v-81.5996h-157.399l40 -49.9004h116.699v-196.8h52.7002v195.7h83.2998v51zM248 404.8c-94.5996 0 -174.9 -61.5996 -202.9 -146.8h157.4v81.5996h199.1c-38.7998 40.2002 -93.2998 65.2002 -153.6 65.2002zM248 -22.2998c117.9 0 213.5 95.5996 213.4 213.5
+c0 51.8994 -18.5 99.5 -49.3008 136.5v-50.7998h-145.6v-19.2002h83.2002v-62.7002h-83.2998v-195.8h-64.6006v196.8h-114.7l-43.7998 56.2998c-5.7998 -19.2998 -8.89941 -39.8994 -8.89941 -61.0996c0 -117.9 95.6992 -213.5 213.6 -213.5zM178.8 173l22.7002 9.2998
+l-16.9004 -17.0996l15.8008 -18.7998l-21.5 10.7998l-13 -20.9004l3.69922 23.7998l-23.7998 5.90039l23.7002 3.90039l-1.7002 24.5z" />
+    <glyph glyph-name="wolf-pack-battalion" unicode="&#xf514;" horiz-adv-x="512" 
+d="M267.73 -23.5303l-11.4404 -21.1396l-11.4404 21.1104l-10.5596 -15.8408l-5.28027 12.3203l-5.2793 -7v-29.8301c-21.0605 7.91992 -21.1104 66.8604 -25.5107 97.21c-4.62012 31.8799 0.879883 92.8105 -81.3701 149.11c8.88086 23.5996 12 49.4297 2.64062 80.0498
+c-27.8701 -3.33008 -53.9404 -10.5801 -63.3398 -54.0996l30.3496 -8.36035c-11.2002 -23.04 -17.0195 -46.7598 -13.2002 -72.1396l27.2705 7l6.16016 -33.4307l18.4697 7l8.7998 -33.4297l19.3496 7l-26.4297 -21.0596l-8.7998 28.1494l-24.6299 -5.28027l-7 35.6309
+l-26.3906 -14.5205c-0.25 20.0205 -6.95996 58.0605 8.80078 84.4502l-26.3906 -5.28027c-3.99023 22.0703 2.37988 39.21 7.91992 56.7402l-22.4297 -9.67969c0.44043 25.0693 29.9404 56.79 61.5898 58.5098c20.2197 1.08984 56.7305 25.1602 54.1006 51.8994
+c-1.95996 19.8701 -17.4502 42.6201 -43.1104 49.7002c43.9795 -36.5098 9.71973 -67.2998 -5.28027 -73.46c-4.39941 11.4404 -17.54 69.0801 0 130.2c40.4697 -22.8701 89.7002 -65.0996 93.21 -147.86l58.0605 -38.71l3.51953 -93.25l-107.33 59.8203l-7 -7
+l17.5801 -3.50977l44 -38.71l15.8398 5.2793l28.1504 -49.2598l3.51953 -119.64l-21.1094 -15.8398l32.5498 -15.8398l32.5498 15.8398l-21.1094 15.8398l3.51953 119.64l28.0996 49.25l15.8408 -5.28027l44 38.7109l17.5898 3.51953l-7 7l-107.3 -59.7695l3.51953 93.25
+l58 38.71c3.5498 82.6895 52.8096 124.92 93.2002 147.79c17.54 -61.1201 4.39941 -118.761 0 -130.2c-14.96 6.16016 -49.2803 36.9502 -5.28027 73.46c-25.6602 -7.08008 -41.1104 -29.8301 -43.1104 -49.7002c-2.63965 -26.7305 33.8809 -50.8096 54.1006 -51.9004
+c31.6396 -1.70996 61.1396 -33.4297 61.5801 -58.5l-22.4307 9.68066c5.54004 -17.5303 11.9209 -34.6699 7.9209 -56.7402l-26.3906 5.28027c15.7998 -26.3906 9.0498 -64.4502 8.7998 -84.4502l-26.3896 14.5195l-7 -35.6299l-24.5898 5.24023l-8.7998 -28.1504
+l-26.3906 21.1104l19.3506 -7l8.7998 33.3896l18.4697 -7l6.16016 33.4307l27.2803 -7.05078c3.7998 25.3809 -2.0498 49.1406 -13.2002 72.1406l30.3496 8.35938c-9.42969 43.5205 -35.4297 50.7305 -63.3398 54.1006
+c-9.35938 -30.6201 -6.24023 -56.4404 2.64062 -80.0498c-82.25 -56.3008 -76.75 -117.221 -81.3701 -149.11c-4.40039 -30.3496 -4.4502 -89.29 -25.5107 -97.21v29.9502l-5.2793 7l-5.28027 -12.3203zM346.9 71.4697l-15.8408 10.5303
+c7.4707 4.36035 13.7607 8.41992 19.3506 12.3203c-0.600586 -7.2207 -0.270508 -13.8398 -3.50977 -22.8398v-0.0107422zM375.05 120.73c-0.399414 -10.9404 -0.899414 -21.6602 -1.75977 -31.6709c-7.84961 1.86035 -15.5703 3.80078 -21.1104 7
+c8.24023 7.94043 15.5508 16.3203 22.8701 24.6807v-0.00976562zM399.68 115.45l-23.75 6.16016c6.78906 8.64844 12.9297 17.708 18.4707 27.2695c3.22949 -9.21973 5.2793 -20 5.2793 -33.4297zM403.2 196.39c19.4395 -12.8096 27.7998 -33.6592 29.9102 -56.2998
+c-12.3203 4.53027 -24.6299 9.31055 -36.9502 10.5605c5.05957 12 6.64941 28.1396 7 45.7393h0.0400391zM401.44 242.13c18.5596 -2.62988 35.1494 -9.18945 45.7598 -28.1494c-14.2197 -4.36035 -24.7803 -5.9707 -44 -14.0801
+c0.0800781 13.4092 -0.950195 27.9297 -1.75977 42.2295zM165.68 71.4805c-3.23926 9 -2.91016 15.5791 -3.50977 22.8398c5.58984 -3.90039 11.8799 -7.95996 19.3496 -12.3203zM137.53 120.74c7.31934 -8.36035 14.6299 -16.7402 22.8701 -24.6699
+c-5.54004 -3.2002 -13.2607 -5.14062 -21.1104 -7c-0.860352 10.0098 -1.36035 20.7295 -1.75977 31.6699zM112.89 115.46c0 13.4297 2 24.21 5.28027 33.4297c5.54102 -9.56152 11.6816 -18.6211 18.4697 -27.2695zM109.37 196.4h0.0898438
+c0.349609 -17.6006 2 -33.7402 7 -45.7402c-12.3701 -1.25 -24.6797 -6.03027 -37 -10.5605c2.11035 22.6406 10.4697 43.4902 29.9102 56.3008zM111.13 242.14c-0.80957 -14.2998 -1.83984 -28.8193 -1.75977 -42.2295c-19.2197 8.10938 -29.7803 9.71973 -44 14.0801
+c10.6299 18.9502 27.2295 25.5195 45.7598 28.1494z" />
+    <glyph glyph-name="hornbill" unicode="&#xf592;" horiz-adv-x="512" 
+d="M76.3799 77.7002c0.219727 -1.64648 0.333008 -3.32617 0.333008 -5.03125c0 -20.8623 -16.9375 -37.7998 -37.8008 -37.7998c-20.8623 0 -37.7998 16.9375 -37.7998 37.7998s16.9375 37.7998 37.7998 37.7998c1.84668 0 3.62207 -0.0927734 5.39746 -0.348633
+c-78.2793 111.35 52 190.53 52 190.53c-5.85938 -43 -8.23926 -91.1602 -8.23926 -91.1602c-67.3105 -41.4902 0.929688 -64.0605 39.8096 -72.8701c19.7207 -53.6396 71.2256 -91.8984 131.66 -91.9404c1.91992 0 3.76953 0.209961 5.66992 0.280273l0.110352 -18.8604
+c-99.2207 -1.38965 -158.7 29.1406 -188.94 51.6006zM184.38 405.4c109.75 73.9395 187.601 -54.0605 187.601 -54.0605c-43.04 5.86035 -91.1807 8.24023 -91.1807 8.24023c-43.0996 70.0098 -65.7998 -6.58008 -73.7998 -44.29
+c-51.5254 -20.7842 -87.8506 -71.208 -87.8896 -130.13c0 -0.910156 0.139648 -1.78027 0.139648 -2.67969l-21.8398 -0.150391c-1.41016 100.43 29.8701 160.09 52.4199 190c-1.02051 -0.0820312 -2.03711 -0.0888672 -3.07812 -0.0888672
+c-20.9453 0 -37.9492 17.0049 -37.9492 37.9502s17.0039 37.9502 37.9492 37.9502c15.0898 0 28.1338 -8.8252 34.248 -21.5918c2.35742 -4.91211 3.70117 -10.4102 3.70117 -16.2188c0 -1.67188 -0.109375 -3.31738 -0.321289 -4.93066zM488.57 271.23
+c-4.87012 -2.31934 -10.2754 -3.63965 -16.0244 -3.63965c-1.09375 0 -2.17578 0.046875 -3.24609 0.139648c84.4502 -113.45 -49 -194.61 -49 -194.61c5.87012 43.0303 8.20996 91.1602 8.20996 91.1602c66.6006 40.96 0.640625 63.54 -38.46 72.54
+c-20.5566 51.9932 -71.2275 88.7393 -130.49 88.7598c-2.75 0 -5.43945 -0.259766 -8.13965 -0.410156l-0.139648 22.5c93.6094 1.33008 151.72 -25.7998 183.45 -47.7402c-0.270508 1.82617 -0.375 3.67676 -0.375 5.57715c0 20.9395 17 37.9395 37.9395 37.9395
+c20.9404 0 37.9404 -17 37.9404 -37.9395c0 -15.1162 -8.85938 -28.1797 -21.665 -34.2764zM374.06 11.7598v-0.0595703c0.112305 0.000976562 0.239258 -0.0332031 0.351562 -0.0332031c20.9336 0 37.9297 -16.9961 37.9297 -37.9297
+c0 -20.9346 -16.9961 -37.9307 -37.9297 -37.9307c-15.0908 0 -28.1348 8.83203 -34.2412 21.6035c-2.0498 4.26074 -3.33984 9.0332 -3.63965 14c-111.98 -80.3398 -191.9 51 -191.9 51c43.0703 -5.87988 91.1904 -8.21973 91.1904 -8.21973
+c41.3301 -67.1709 63.9199 0.540039 72.7695 39.4893c53.3574 19.8584 91.3574 71.2188 91.3906 131.45c0 2.08008 -0.220703 4.08984 -0.300781 6.15039l19.5205 0.139648c1.28027 -89.9697 -23.71 -147.2 -45.1406 -179.66z" />
+    <glyph glyph-name="mailchimp" unicode="&#xf59e;" 
+d="M330.61 204.48c-2.50977 3.17969 -4.70996 8.31934 -5.9707 14.3193c-2.22949 10.6807 -1.98926 18.4102 4.24023 19.4199c6.23047 1.01074 9.25 -5.45996 11.4805 -16.1299c1.5 -7.17969 1.20996 -13.7803 -0.450195 -17.6094
+c-1.53418 0.198242 -3.02441 0.300781 -4.61328 0.300781c-1.58789 0 -3.15234 -0.102539 -4.68652 -0.300781zM277.05 196c-4.45996 1.95996 -10.2598 4.13965 -17.2598 3.7002c-12.5996 -0.770508 -21.75 -7.21973 -22.5996 -3.48047
+c-0.400391 1.83984 2.40918 4.87988 5.40918 7.06055c5.20117 3.80859 11.6621 6.06055 18.5967 6.06055c4.25391 0 8.31152 -0.84668 12.0137 -2.38086c8.63965 -3.7002 14.0098 -11.1504 12.1201 -13.0898c-1.08008 -1.12988 -3.81055 0.129883 -8.28027 2.12988z
+M268.05 190.87c9.68066 1.14941 16.8604 -4.62988 15.4004 -6.85059c-0.629883 -1.00977 -2.02051 -0.829102 -4.94043 -0.489258c-1.85449 0.286133 -3.73438 0.420898 -5.66895 0.420898c-4.59277 0 -8.99121 -0.838867 -13.0508 -2.37109
+c-4.04004 -1.62012 -4.30957 -1.15039 -5.20996 -0.810547c-1.53027 3.57031 4.40039 8.68066 13.4697 10.1006zM322.22 173.77c-3.40039 -6.91016 -17.7002 0.0703125 -14.2998 7c3.40039 6.93066 17.6797 -0.129883 14.2998 -7zM337.88 194.24
+c7.69922 -0.149414 7.42969 -16.0605 -0.259766 -15.9307c-7.69043 0.130859 -7.40039 16.0605 0.259766 15.9307zM119.09 115.34c4.0293 0.910156 3.40039 -1.25 3.37012 -0.359375c0.291016 -0.358398 0.464844 -0.818359 0.464844 -1.31445
+c0 -0.369141 -0.0966797 -0.71582 -0.264648 -1.01562c-3.16016 -7.37012 -20.1904 -7.68066 -21.5801 9c-0.910156 10.8594 9.30957 21.0293 -2.28027 28.6191c-2.02734 1.34277 -4.46289 2.14648 -7.0752 2.14648c-4.51465 0 -8.4873 -2.33691 -10.7744 -5.86621
+c-3.2998 -5.16016 -3.11035 -12.2002 -7.37988 -11.6299c-3.7207 0.540039 -3.70996 14.4805 5 24.0801c7.22949 8 25.9492 11.9297 35.0498 -5.54004c8.11035 -15.3896 -8.2002 -27.7695 -3 -35.7695c2.46973 -3.80078 7.14941 -2.66016 8.46973 -2.35059zM418.81 132.41
+c6.44043 0 16.5605 -7.5 16.5605 -25.2705c0 -17.7695 -7.37012 -37.9092 -9.11035 -42.3799c-54.3896 -130.279 -264.56 -130.06 -322.29 3c-31.5293 -0.0400391 -64.1699 26.9805 -67.5293 60.3799c-0.308594 2.71191 -0.438477 5.42383 -0.438477 8.2168
+c0 8.89062 1.60352 17.4102 4.53809 25.2832l-14.7598 12.5107c-67.5498 57.04 143.72 291.85 211.27 232.93c0.339844 -0.299805 22.9902 -22.5205 23.0498 -22.5703l12.5508 5.33008c59.2695 24.5303 107.359 12.6904 107.42 -26.4697
+c0.0292969 -20.3604 -12.9404 -44.1006 -33.7305 -65.6504c26.1699 -24.2998 20.0205 -71.6094 21.5205 -83c7.19922 -2 30.6992 -7.62012 41.0996 -18.54c18.3604 -19.25 5.52051 -39.5801 3.07031 -43.25c4.20996 -11.2998 3.42969 -8.79004 6.7793 -20.5195z
+M102.81 84.25c29.4502 -0.680664 38.6309 28.2002 34.0908 57.8398c-9.74023 62.9404 -90.1699 48.9805 -84 -12.3301c2.44922 -24.3594 27.0898 -44.8994 49.9092 -45.5098zM84.2998 198.45c19.3105 51.8096 51.54 99.5498 94.2002 132.399
+c31.6504 26.4102 65.7998 45.3506 65.7998 45.3506s-18.3896 21.3193 -23.9395 22.8896c-34.1699 9.23047 -107.94 -41.6494 -155.051 -108.88c-19.0596 -27.21 -46.3096 -75.3604 -33.2998 -100.21c1.58984 -3 10.71 -10.9297 15.5898 -15
+c8.18066 11.9102 21.54 20.5 36.7002 23.4502zM323.18 97.2998c2.58984 0.259766 0.560547 -2.53027 0.560547 -2.53027s-27.4004 -12.75 -71 0.740234c1.20996 -10.2295 11.1699 -14.8193 15.9395 -16.6699c31.4004 -12.21 86.6904 -2.58008 128.46 26
+c0.850586 0.589844 1.41992 0 0.730469 -1c-28.9697 -41.3496 -128.73 -54.7598 -151.37 -21.3496c-12.0801 17.8301 -0.599609 43.8594 19.5498 41.1494c6.7998 -0.769531 53.7705 -8 100.48 13.6807c27.4893 12.7598 37.8701 26.79 36.3096 38.1602
+c-0.537109 3.60742 -2.25 6.85156 -4.74023 9.28906c-5 4.83008 -12.79 8.60059 -26 12.3105c-4.35938 1.22949 -7.31934 2.00977 -10.5098 3.05957c-5.67969 1.83008 -8.47949 3.33008 -9.10938 14c-0.280273 4.62988 -1.09082 20.9102 -1.38086 27.6299
+c-0.519531 11.7607 -1.91992 27.8506 -11.9199 34.4902c-2.71094 1.73535 -5.94238 2.75098 -9.39746 2.75098c-1.44824 0 -2.85645 -0.177734 -4.20215 -0.510742c-5.69043 -0.969727 -9.06055 -4.00977 -13.2598 -7.50977
+c-12.4404 -10.3701 -22.9502 -12.0605 -34.6406 -11.5605c-6.98926 0.290039 -14.3994 1.37988 -22.8799 1.87988l-5 0.290039c-19.5801 1 -40.5693 -15.9092 -44.0693 -39.9092c-4.86035 -33.4307 19.3291 -50.7002 26.3291 -60.8301
+c1.04785 -1.25391 1.74121 -2.82812 1.9209 -4.54004c0 -1.94043 -1.25 -3.48047 -2.48047 -4.79004c-19.9805 -20.54 -26.3701 -53.1699 -18.8398 -80.3701c0.927734 -3.33594 2.13574 -6.6377 3.5498 -9.74023c17.7002 -41.2598 72.4902 -60.4795 126 -43
+c7.01562 2.29199 13.8936 5.20215 20.3398 8.58008c11.8203 5.84668 22.2969 13.7168 31.1504 23.3096c14.2002 14.8408 22.6396 30.9707 25.9297 50.8408c2.81055 18.6191 -7.78027 18.7598 -11.4395 18.0996c-1.37598 8.42188 -3.82812 16.6758 -7.12012 24.2803
+c-15.6299 -12.3506 -35.71 -20.9707 -51 -25.3506c-69.4004 -19.9102 -90.1904 6.35059 -96.4004 -13.8096c33.7705 -12.3701 69.5098 -7.07031 69.5098 -7.07031zM171.31 290.5l0.0605469 0.00976562c-0.107422 -0.130859 -0.170898 -0.297852 -0.170898 -0.480469
+c0 -0.419922 0.34082 -0.759766 0.759766 -0.759766c0.151367 0 0.292969 0.0439453 0.411133 0.120117c11.4199 8.30078 64.9502 42.7705 134.5 26.8301c0.860352 -0.189453 1.39941 1.29004 0.639648 1.7207c-11.3398 6.33984 -28.6895 10.6494 -41 10.7393
+c-0.405273 0.00976562 -0.732422 0.342773 -0.732422 0.750977c0 0.164062 0.0527344 0.31543 0.142578 0.439453c2.23535 2.92383 4.79492 5.49414 7.70996 7.74023c0.18457 0.140625 0.303711 0.362305 0.303711 0.611328
+c0 0.424805 -0.345703 0.770508 -0.770508 0.770508c-0.0175781 0 -0.0351562 -0.000976562 -0.0527344 -0.00195312c-17.5205 -1.08008 -37.5107 -9.4707 -49 -17.2998c-0.12207 -0.0859375 -0.271484 -0.136719 -0.431641 -0.136719
+c-0.414062 0 -0.75 0.335938 -0.75 0.75c0 0.0605469 0.0078125 0.120117 0.0214844 0.176758c0.899414 4.30957 3.72949 9.98926 5.18945 12.6494c0.0644531 0.108398 0.101562 0.236328 0.101562 0.371094c0 0.40332 -0.327148 0.730469 -0.730469 0.730469
+c-0.134766 0 -0.261719 -0.0371094 -0.371094 -0.101562c-18.4697 -9.4502 -39.0898 -26.2803 -55.8301 -45.6299z" />
+    <glyph glyph-name="megaport" unicode="&#xf5a3;" horiz-adv-x="496" 
+d="M214.5 238.4l33.4004 33.3994l33.3994 -33.3994v-66.4004l-33.2998 -33.2998l-33.5 33.5v66.2002zM248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM393.1 25.5996h0.100586v87.1006l-59.7002 59.7002v87.5996l-59.5 59.5
+v75.5996l-26.0996 19.2002l-26.1006 -19.2002v-75.5996l-59.5 -59.5v-87.9004l-59.5 -59.5v-87l26.1006 -19.1992l26.0996 19.1992v65.5l33.5 33.4004l33.4004 -33.4004v-65.5l26.0996 -19.1992l26.2002 19.1992v65.5l33.3994 33.4004l33.4004 -33.4004v-65.5l26 -19.1992z
+" />
+    <glyph glyph-name="nimblr" unicode="&#xf5a8;" horiz-adv-x="384" 
+d="M246.6 148.71c15.5703 0 27.1504 -11.46 27.1504 -27s-11.6201 -27 -27.1504 -27c-15.6992 0 -27.1494 11.5703 -27.1494 27s11.5498 27 27.1494 27zM113 121.75c0 15.6104 11.6797 27 27.1504 27c15.4697 0 27.1494 -11.46 27.1494 -27s-11.4697 -27 -27.1494 -27
+c-15.4404 0 -27.1504 11.3096 -27.1504 27zM191.76 289c98.3701 0 177.76 -78.9102 177.76 -176.48c0 -97.5693 -79.6094 -176.52 -177.76 -176.52c-98.1494 0 -177.76 78.8701 -177.76 176.52v335.48l45.25 -227c30.2002 48.2305 97.75 68 132.51 68zM191.76 -19.1201
+c73.2402 0 132.51 58.96 132.51 131.64c0 72.6807 -59.2393 131.54 -132.51 131.54c-73.2695 0 -132.51 -58.8994 -132.51 -131.59c0 -72.6895 59.2402 -131.59 132.51 -131.59z" />
+    <glyph glyph-name="rev" unicode="&#xf5b2;" 
+d="M289.67 173.11c0 -36.1895 -29.3809 -65.5703 -65.5703 -65.5703c-36.1885 0 -65.5693 29.3809 -65.5693 65.5703c0 36.1885 29.3906 65.5596 65.5801 65.5596c36.1631 -0.0439453 65.5156 -29.3965 65.5596 -65.5596zM429.22 178.16v-210.16h-210.16v0.110352
+c-110.939 2.70996 -200.06 93.4092 -200.06 205c0 108.569 84.2998 197.319 191 204.569v38.3203l108.77 -62.7803l-108.77 -62.79v39.1201c-80 -7.16016 -143 -74.5498 -143 -156.43c0 -86.6201 70.4902 -157.12 157.11 -157.12s157.09 70.5 157.09 157.12
+c-0.0263672 55.3057 -28.5371 103.871 -71.8105 131.84l45.3799 26.2002c44.3125 -36.582 72.8613 -91.4561 74.3203 -153h0.129883z" />
+    <glyph glyph-name="shopware" unicode="&#xf5b5;" horiz-adv-x="512" 
+d="M403.5 -7.41016c-40.9688 -30.4482 -91.7109 -48.4707 -146.63 -48.4707c-0.223633 0 -0.646484 -0.120117 -0.870117 -0.119141c-137.19 0 -248 111 -248 248c0 137.19 111 248 248 248h0.21582c63.5576 0 121.648 -24.0508 165.484 -63.5
+c0.716797 -0.65332 1.16699 -1.59375 1.16699 -2.63965c0 -1.9707 -1.59961 -3.57031 -3.57031 -3.57031c-0.155273 0 -0.306641 0.0107422 -0.457031 0.0302734c-18.2656 2.43848 -36.9023 3.69727 -55.8301 3.69727c-0.445312 0 -0.43457 -0.0166016 -0.879883 -0.0175781
+c-129.36 0 -222.399 -53.4697 -222.399 -155.35c0 -109 92.1299 -145.881 176.829 -178.73c33.6406 -13 65.4004 -25.3604 87 -41.5898c0.868164 -0.65332 1.42969 -1.69238 1.42969 -2.86133c0 -1.16992 -0.561523 -2.20508 -1.42969 -2.8584zM503 214.91
+c0.698242 -7.59375 0.950195 -15.1699 0.950195 -22.9443c0 -31.8691 -5.99902 -62.3467 -16.9307 -90.3662c-0.526367 -1.31445 -1.81543 -2.24023 -3.31738 -2.24023c-0.608398 0 -1.18066 0.152344 -1.68262 0.420898
+c-29.4893 16.3594 -61.6094 28.3398 -92.6797 39.9297c-60.2803 22.4902 -112.34 41.8896 -112.34 84.4902c0 1.45996 -3.87988 53.6299 80.25 53.6299c50.8604 0 92.7197 -17.4805 144.48 -60.4805c0.706055 -0.598633 1.17871 -1.46484 1.26953 -2.43945z" />
+    <glyph glyph-name="squarespace" unicode="&#xf5be;" horiz-adv-x="512" 
+d="M186.12 104.66l157.22 157.2c38.5703 38.5898 101.13 38.5898 139.72 0c38.5908 -38.5801 38.5908 -101.13 0 -139.721l-119.25 -119.239l-0.0400391 -0.0400391c-19.2891 -19.2705 -50.5498 -19.25 -69.8193 0.0400391l154.149 154.14
+c19.29 19.29 19.29 50.5703 0 69.8604s-50.5693 19.29 -69.8594 0l-157.181 -157.181c-9.64941 -9.64941 -25.29 -9.64941 -34.9395 0c-9.65039 9.65039 -9.65039 25.29 0 34.9404zM430.65 209.46c9.63965 -9.63965 9.63965 -25.2803 -0.0107422 -34.9297l-157.199 -157.2
+c-38.5801 -38.5703 -101.141 -38.5703 -139.721 0l-0.0195312 0.0195312c-9.64062 9.65039 -9.62988 25.29 0.0195312 34.9307l0.0107422 0.00976562c9.64941 9.63965 25.2793 9.62988 34.9199 -0.00976562l0.0498047 -0.0498047
+c19.29 -19.2607 50.5498 -19.2402 69.8193 0.0498047l157.2 157.18c9.64062 9.65039 25.2803 9.65039 34.9307 0zM168.66 122.13c-38.6006 -38.5801 -101.13 -38.5801 -139.73 0.00976562c-38.5801 38.5801 -38.5801 101.13 0 139.721l119.23 119.25l0.0195312 0.0195312
+c19.3008 19.2803 50.5703 19.2705 69.8506 -0.0195312l-154.17 -154.17l-0.0302734 -0.0302734c-19.2803 -19.2998 -19.2598 -50.5605 0.0302734 -69.8398l0.00976562 -0.0107422c19.29 -19.29 50.5703 -19.2793 69.8496 0.0107422l157.21 157.18
+c9.64062 9.63965 25.2705 9.63965 34.9102 0c9.64062 -9.65039 9.64062 -25.29 0 -34.9404zM81.3301 174.53c-9.64062 9.64941 -9.65039 25.29 0 34.9297l157.189 157.19c38.5908 38.5898 101.131 38.5898 139.721 0c9.64941 -9.64062 9.64941 -25.2803 0 -34.9307
+c-9.64062 -9.64941 -25.2803 -9.64941 -34.9307 0l-0.0195312 0.0205078c-19.29 19.2793 -50.5596 19.2695 -69.8398 -0.0205078l-157.21 -157.189c-9.64062 -9.64062 -25.2705 -9.64062 -34.9102 0z" />
+    <glyph glyph-name="themeco" unicode="&#xf5c6;" 
+d="M202.9 439.57c9.89941 5.72949 26 5.81934 35.9492 0.209961l191.15 -107.63c10 -5.60059 18 -19.4404 18 -30.8604v-217.29c0 -11.4404 -8.05957 -25.29 -18 -31l-191.19 -108.74c-9.92969 -5.66016 -26 -5.56934 -35.8496 0.209961l-185.1 108.41
+c-9.86035 5.78027 -17.8604 19.7402 -17.8604 31.1201v217.29c0 11.4404 8 25.3604 17.9102 31.0801zM125.5 239.74c-15.9404 0 -31.8896 -0.140625 -47.8301 -0.140625v-101.449h19.1299v29.8496h28.7002c49.71 0 49.5596 71.7402 0 71.7402zM265.64 139.45
+l-30.7295 34.6396c37 7.50977 34.7998 65.2305 -10.8701 65.5098c-16.0898 0 -32.1699 0.140625 -48.2598 0.140625v-101.59h19.1299v33.9092h18.4102l29.5596 -33.9092h22.7598v1.2998zM224.05 221.77c23.3398 0 23.2598 -32.46 0 -32.46h-29.1299v32.46h29.1299z
+M128.49 223.37c21.1797 0 21.1094 -38.8506 0 -38.8506h-32.3105v38.8408zM321.14 241.62c-68.46 0 -71 -105.8 0 -105.8c69.4805 0.00976562 69.4102 105.8 0 105.8zM321.14 224.23c44.1201 0 44.8008 -70.8604 0 -70.8604c-44.7998 0 -44.4297 70.8604 0 70.8604z" />
+    <glyph glyph-name="weebly" unicode="&#xf5cc;" horiz-adv-x="512" 
+d="M425.09 382.17c50.9102 0 87.5498 -35.1504 86.9199 -83.4697c0 -21.6201 -0.950195 -18.5498 -77.5 -227.2c-22.3799 -60.5703 -67.7695 -69.6699 -92.7402 -69.6699c-39.2393 0 -70.0391 19.46 -85.9297 54.29c-15.8896 -34.5205 -46.7002 -53.9805 -85.9297 -53.9805
+c-24.9697 0 -70.3701 8.78027 -92.7402 69.3506c-72.9902 200.21 -77.1699 204.52 -77.1699 233.479c0 43.3105 38.5898 77.2002 87.54 77.2002c40.21 0 73.2803 -25.7295 83.6602 -64.3301c18.4795 58.0498 65.5 64.3301 85.2803 64.3301
+c19.4492 0 66.7891 -6.26953 84.9492 -64.3301c10.3799 38.6006 43.7803 64.3301 83.6602 64.3301zM451.43 267.36c3.49023 11.1992 7.29004 19.3701 7.61035 27.2393c0 22.3906 -16.1602 35.71 -38.3301 35.71c-18.6904 0 -31.9902 -11.7998 -36.1104 -29.0498
+l-44.0293 -139.819h-0.950195l-44.6602 136.79c-6.01953 19.9697 -16.4697 32.0791 -38.96 32.0791s-32.9404 -12.4092 -38.96 -32.0791l-44.6602 -136.79h-0.950195l-44.0293 139.819c-4.12012 17.25 -17.4199 29.0498 -36.1104 29.0498
+c-22.4902 0 -38.3301 -13.0195 -38.3301 -29.3594c0 -10.5898 2.54004 -19.6699 7.91992 -34.5l64.9404 -175.23c7.91016 -21.4795 21.2197 -37.2197 46.2393 -37.2197c23.1201 0 37.0605 12.0996 44.0205 33.5996l39.2803 117.42h0.949219l39.2803 -117.42
+c6.65039 -21.4893 20.5898 -33.8994 44.0303 -33.8994c25.0195 0 38.3203 15.7295 46.2402 37.2197z" />
+    <glyph glyph-name="wix" unicode="&#xf5cf;" horiz-adv-x="640" 
+d="M393.38 316.31c0 -13.0293 2.08008 -32.6895 -28.6797 -43.8291c-9.52051 -3.4502 -15.9502 -9.66016 -15.9502 -9.66016c0 31 4.71973 42.2197 17.4004 48.8594c9.75 5.11035 27.2295 4.62988 27.2295 4.62988zM277.58 280.77
+c5.47949 26.3408 30.8799 38.3408 55.2998 35.2705l-65.5703 -247.93s-21.6396 -1.56055 -32.46 3.95996c-14.2197 7.25 -20.9893 12.8398 -29.5898 46.5693c-7.66992 30.0703 -29.1494 118.4 -31.1201 124.7c-4.30957 13.8105 -10.6396 14.9404 -15.3994 0
+c-2.00977 -6.29004 -23.4502 -94.6299 -31.1201 -124.7c-8.61035 -33.7295 -15.3701 -39.3193 -29.5898 -46.5693c-10.8301 -5.52051 -32.46 -3.95996 -32.46 -3.95996l-65.5703 247.93c23.8604 3 49.7305 -8.5498 55.2803 -35.2705l34.2393 -132.659l28.4805 108.569
+c7.76953 32.3506 21.0596 48.5303 48.4297 48.5303c27.6201 0 40.7402 -16.54 48.4307 -48.5303l28.4795 -108.569zM393.36 275.56v-8.97949l0.0195312 0.00976562v-150.27c-0.129883 -30.8301 -3.33008 -37.6807 -17.2598 -44.7803
+c-10.8203 -5.52051 -27.3701 -3.42969 -27.3701 -3.42969v152.069c0 21.25 -1.95996 27.9404 13.1797 35.2002c6.19043 2.96973 11.96 5.25 17.9707 8.61035c9.35938 5.22949 13.46 11.5693 13.46 11.5693zM556.8 191.48l82.9902 -123.36s-35.9297 -4.62012 -53.3203 11.21
+c-13.9102 12.6602 -23.7393 28.3398 -53.1396 70.7197c-0.5 0.770508 -6.25977 10.5205 -13.0703 0c-34.9297 -50.3496 -41.0195 -60.2598 -52.5098 -70.7197c-17.3799 -15.8301 -53.9502 -11.21 -53.9502 -11.21l82.9697 123.36l-83.1992 123.739
+s35.1094 5.98047 52.5 -9.84961c13.3799 -12.1797 24.8896 -30.2402 54.1797 -72.4697c6.82031 -10.54 12.5996 -0.730469 13.0703 0c29.7695 42.9199 40.8799 60.3691 54.1797 72.4697c17.3896 15.8301 52.5 9.84961 52.5 9.84961z" />
+    <glyph glyph-name="ello" unicode="&#xf5f1;" horiz-adv-x="496" 
+d="M248 440c136.97 0 248 -111.03 248 -248s-111.03 -248 -248 -248s-248 111.03 -248 248s111.03 248 248 248zM391.84 154.8c2.48047 7.44043 -2.47949 15.71 -9.91992 17.3604c-7.43945 2.47949 -15.71 -2.48047 -17.3604 -9.91992
+c-14.0498 -52.9102 -62 -90.1104 -116.56 -90.1104s-102.51 37.2002 -116.56 90.1104c-1.65039 7.43945 -9.9209 11.5693 -17.3604 9.91992c-7.44043 -1.65039 -11.5703 -9.91992 -9.91992 -17.3604c16.5303 -65.3096 76.0498 -111.6 143.84 -111.6
+s127.31 46.29 143.84 111.6z" />
+    <glyph glyph-name="hackerrank" unicode="&#xf5f7;" horiz-adv-x="512" 
+d="M477.5 320c14.5 -25 14.4805 -230.92 -0.00976562 -256s-192.391 -128 -221.33 -128c-28.9404 0 -206.83 102.8 -221.32 128s-14.4102 230.79 0 256s192.351 128 221.32 128s206.84 -103.05 221.34 -128zM316.13 33.7803c3.95996 0 40.4404 35.7793 37.5605 38.6895
+c-0.870117 0.839844 -8.82031 1.49023 -17.6904 1.83984c0 32.4004 -3 19.0508 0.679688 210.341c0.0703125 3.65918 -1.04004 5.37988 -4.5 5.37988c-11.0801 0.0693359 -22.1602 0.0195312 -33.2295 -0.0605469c-3.25977 -0.0292969 -4.31055 -1.80957 -4.20996 -5.2002
+c1.58984 -48.8994 1.2002 -79.0898 1.2002 -83.6396h-80.2607c0.629883 25.7998 0.209961 79.6396 2.62988 105.39v3.16016c8.87012 0.350586 15.9004 0.970703 16.7705 1.83984c2.90039 2.91016 -34.3203 38.6904 -38.2705 38.6904
+c-3.94922 0 -41.4092 -35.7695 -38.4893 -38.6904c0.879883 -0.839844 7.58984 -1.48926 17.2598 -1.83984v-3.16992c3.15039 -128.67 1.07031 -179.229 0.150391 -212.67c-0.130859 -4.58008 1.63965 -6.10938 5.73926 -6.10938
+c10.1406 0.0292969 20.2803 -0.0800781 30.4102 -0.0800781c4.16016 -0.0605469 5.96973 1.39941 5.74023 5.93945c-1.83008 36.6797 -1.37012 65.7803 -1.37012 72.8799h79.9297c0 -2.41992 0.44043 -3.84961 0.44043 -5.84961
+c-0.350586 -17.7305 -0.94043 -60.0898 -0.94043 -86.3203c-11.29 -0.349609 -16.6797 -0.959961 -17.5498 -1.83008c-2.91016 -2.91992 34 -38.6895 38 -38.6895z" />
+    <glyph glyph-name="kaggle" unicode="&#xf5fa;" horiz-adv-x="320" 
+d="M304.2 -53.5l1.39941 -7.59961c-0.5 -2 -2.5 -3 -6 -3h-66.8994c-4 0 -7.5 1.7998 -10.5 5.2998l-110.5 140.6l-30.7998 -29.2998v-109c0 -5 -2.5 -7.5 -7.5 -7.5h-51.9004c-5 0 -7.5 2.5 -7.5 7.5v497c0 5 2.5 7.5 7.5 7.5h51.9004c5 0 7.5 -2.5 7.5 -7.5v-306
+l132.3 133.7c3.5 3.5 7 5.2998 10.5 5.2998h69.2002c7 0 7.89941 -7.7998 5.2998 -10.5l-139.8 -135.3z" />
+    <glyph glyph-name="markdown" unicode="&#xf60f;" horiz-adv-x="640" 
+d="M593.8 388.9c25.5 0 46.2002 -20.7002 46.2002 -46.1006v-301.6c0.0996094 -25.4004 -20.5996 -46.1006 -46.0996 -46.1006h-547.7c-25.5 0 -46.2002 20.7002 -46.2002 46.2002v301.5c0 25.4004 20.7002 46.1006 46.2002 46.1006h547.6zM338.5 87.4004h-0.200195v209.199
+h-61.5l-61.5 -76.8994l-61.5 76.8994h-61.5v-209.199h61.7002v120l61.5 -76.9004l61.5 76.9004v-120h61.5zM473.8 84.2998l92.2002 107.7h-61.5v104.6h-61.5v-104.6h-61.5z" />
+    <glyph glyph-name="neos" unicode="&#xf612;" horiz-adv-x="512" 
+d="M415.44 -64h-95.1104l-108.21 154.54v-91.0996l-86.4297 -63.4404h-97.6904v482.18l40.4697 29.8203h108.05l123.74 -176.13v112.68l86.4307 63.4502h97.6895v-461.5zM38.7695 412.73v-460.73l72 52.8799v249.12l215.5 -307.64h84.79l52.3506 38.1699h-78.2705
+l-316.14 450.47zM121.31 -53.8799l80 58.7803v101l-79.7598 114.399v-220.939l-72.5498 -53.25h72.3398zM80.6299 437.23l310.601 -442.57h82.3691v442.57h-79.75v-317.561l-222.939 317.561h-90.2803zM311 256.35l72 -102.81v278.53l-72 -53v-122.721z" />
+    <glyph glyph-name="zhihu" unicode="&#xf63f;" horiz-adv-x="640" 
+d="M170.54 299.87h122.68v-217.55h-49.5293l-42.0107 -26.3701l-7.70996 26.3701l-23.4297 0.00976562v217.54zM268.29 105.94v170.31h-72.8203v-170.31l11.9004 -0.0400391l5.08008 -17.4707l27.8994 17.5107h27.9404zM149.83 200.33
+c7.5 0 7.58984 -23.6104 7.58984 -23.6104h-61.6504c-0.879883 -13.1201 -3.50977 -26.6895 -7.86914 -40.6699l14.6191 11.6201c8.73047 -8.75 29.2109 -32.8896 36.79 -41.8096c9.15039 -13.1006 1.24023 -39.9902 1.24023 -39.9902l-53.96 64.9395
+c-12.6094 -48.3496 -35.5898 -69.25 -35.5898 -69.25c-10.0898 -8.96973 -30.5098 -15.75 -51 -9.89941c42.8301 33.2197 66.4502 75.2402 70.8496 125.1h-65.5801s3.82031 23.6201 15.5605 23.6201h52.2695c0.480469 6.56055 1.68066 62.9404 1.68066 73.4404h-28.8701
+c-2.62988 -7.87012 -3.03027 -8.64062 -5.14062 -14.5303c-11.4697 -21.0303 -30.9492 -21.5703 -36.8398 -22.21c17.4902 34.9795 27.3105 69.2197 30.7002 78.1201c8.2002 21.5693 32.2705 21.5693 32.2705 21.5693c-5.25 -14.0098 -9.63086 -27.5498 -13.1201 -40.6699
+h88.5c10.5498 0.25 8.58008 -22.3096 8.58008 -22.3096h-51.1602c0 -21.8701 -0.459961 -46.3604 -2.2002 -73.46h52.3301zM561.85 201.93l-19.2295 14.4307s30.8301 40.0498 36.8301 48.1992c8.72949 10.7402 27.3799 -4.05957 27.3799 -4.05957
+s-24.1504 -32.9297 -44.9805 -58.5703zM411.76 261.02l0.00976562 0.0107422c8.99023 -8.25 34.6602 -45.8604 34.6602 -45.8604l-19.46 -13.7295c-1.59961 2.40918 -41.1201 57.4492 -41.1201 57.4492s16.9004 10.3799 25.9102 2.12988zM640 189.65
+c0 0 0.950195 -23.79 -8.73047 -23.79h-122.359v-73.3203c0.780273 -28.0303 -15.3301 -45.3096 -44.8906 -45.3096c-9.84961 0 -16.1396 1.75977 -26.0195 6.56934c-12.9805 7.4502 -17.3203 17.8701 -19.3096 21.8398c15.6094 -0.65918 27.6094 -1.91992 41.6895 -1.80957
+c13.29 -0.870117 24.4805 7.15039 24.4805 21.1201v70.9199h-107.94c-22.6895 0.540039 -25.5098 22.8496 -25.5098 22.8496h133.47v99.8105c-12.8301 0 -31.6797 -0.830078 -56.5098 -2.43066c-26.46 -0.80957 -35.8398 -2.58984 -49.1504 0.890625
+c-8.16016 2.46973 -14.1797 10.7295 -15.7793 19.5498c67.1396 1.55957 232.359 18.0498 232.359 18.0498s20.1006 5.75977 23.1699 4.58008c12.8105 -6.25 0.589844 -33.4395 0.589844 -33.4395c-17.6396 -0.810547 -46.8896 -2.40039 -87.7695 -4.81055
+c-10.4297 -0.799805 -18.04 -1.2002 -22.8496 -1.2002v-101c0.149414 0 111.279 0.930664 131.06 0.930664z" />
+    <glyph glyph-name="alipay" unicode="&#xf642;" 
+d="M377.74 416c38.6895 0 70.0898 -31.5703 69.9297 -70.2598v-234.41c-48.6104 16.7002 -99.6895 36.04 -148.62 52.7402c23.1406 44.2998 38.3506 90.9199 38.3506 90.9199h-88.7705v31.2402h109.45v19.0098h-109.44v50.4199h-50.9199v-50.4199h-109.439v-19.0098h109.439
+v-31.2402h-92.0801v-16.7002h178.2s-9.91992 -30.25 -26.4502 -60.3398c-47.7793 14.71 -91.75 24.96 -127.13 24.96c-84.6396 0 -103.49 -42.4902 -99.5195 -81.5c3.30957 -31.0703 26.4502 -76.3701 97.04 -76.3701c64.4795 0 116.55 37.0303 148.62 81
+c61.0098 -28.0996 125.64 -62.8203 171.6 -88.4404c-0.5 -38.5195 -31.7402 -69.5996 -70.2598 -69.5996h-307.48c-38.8496 0 -70.2598 31.4102 -70.2598 70.2598v307.48c0 38.8496 31.4102 70.2598 70.2598 70.2598h307.48zM47.2803 125.05
+c-0.990234 17.5205 10.9102 50.5801 78.3594 50.5801c24.96 0 64.8105 -12.7295 109.44 -31.4102c-25.29 -33.2197 -65.7998 -72.8994 -117.87 -72.8994c-59.6797 0 -68.9404 33.5596 -69.9297 53.7295z" />
+    <glyph glyph-name="the-red-yeti" unicode="&#xf69d;" horiz-adv-x="512" 
+d="M488.23 206.3c2.95508 -3.9668 5.25098 -8.47559 6.76953 -13.2998c3.99121 -10.8701 7.04004 -22.4727 8.90039 -34.2002l-2.5 -0.5l-13 14.2998c-17.9004 -28.0996 -9.90039 -15.3994 -16.7002 -25.0996c0 -124.2 -101.3 -211.5 -223 -211.5
+c-61.5 0 -113.9 20.2002 -157.5 60.2002c-64.5 60.8994 -64.9004 125 -64.9004 150.5c-0.5 1.7998 -0.700195 3.5 -1.2002 5.2002l-20.1992 -22.4004c-6.80078 43 25.6992 74.2998 33 80.7002c0.5 1 0.699219 2.2002 1.19922 3.2002l-28.7998 1l-3 3.39941
+c8.5 3.5 25.2998 13.2998 40.2998 14.2998c7.63672 14.623 16.9365 28.0742 27.8008 40.3008c1.2998 6.39941 3.2998 14.1992 6.59961 25.7998l-7.59961 -4.7002l-1.7002 1.7002l1.7002 8.39941c10.6934 25.7754 26.6318 48.6221 46.6992 67.4004l-33 14.2998h3.7002
+c20.9004 4.90039 33.2002 3.2998 49.2002 0c-2.5 4.10059 -5.40039 10.5 -8.40039 18.9004c-1.36035 3.74219 -2.09961 7.81445 -2.09961 12.0244c0 4.69629 0.923828 9.17871 2.59961 13.2754c8.90039 -7.40039 14.3008 -24.5996 15.2002 -27
+c0.700195 3.59961 2.10059 21.2998 33.7002 45.5l1.83008 -0.5l-12 -44.2002c30 17.7002 63 21.9004 97.9004 11.7998c-12.7002 -12.1992 -24.3008 -28.8994 -42.5 -33c7.39941 -2.2998 28.6992 -9.69922 34.1992 -15.1992l-24.7998 7.09961
+c6.5 -6 19.6006 -16.4004 25.1006 -25.0996c23.7891 -1.09473 46.9111 -5.74414 68.3994 -13.3008l-0.5 0.5c29.4004 14.7002 37.7002 27.3008 74.7998 3c0 -30.1992 -2.2998 -23.3994 3 -29.7998c7.69336 6.50391 16.1553 12.0381 25.3008 16.5
+c13 6.40039 23.0996 4.7002 30.6992 -5.89941c11.8008 0 17.8008 -15.7002 18.4004 -27c14.7998 -2.90039 2.7002 -30.7002 2.5 -30.7002l-7.09961 -18.2002c7.7998 -7.7998 22.0996 -20.9004 31.6992 -44.7998zM398 336.8c-13.0996 8.90039 -22.7002 11.9004 -28.2998 8.5
+c8.09961 -7.2002 13 -14.2998 13.5 -20.7002c1.2002 -7.59961 -2.2002 -14.7998 -10.6006 -21.8994l-4.19922 -3.40039c4.2002 -6.89355 7.1416 -14.793 8.39941 -23.0996h2.5c-2.09961 13.8994 -2.5 11 0.700195 14.7998c11 -6.40039 14.9004 -14.5 16 -19.9004
+c21.7998 10.1006 29.5 12.7002 54.7998 20.9004l-18.2002 -16c11.4004 0 25.6006 0.299805 46.5 -8.40039c7 24.3008 7.10059 20.7002 2.5 20.7002l-4.69922 -11.2998c-1.7002 10.5 -2.90039 18.9004 -3.40039 25.2998c-0.5 6.7002 -3.90039 9.60059 -9.2998 10.1006
+c-0.0117188 -0.470703 -0.0126953 -0.894531 -0.0126953 -1.36816c0 -4.77148 0.594727 -9.40527 1.71289 -13.832l-1.7002 -5.90039c-2.90039 10.6006 -5.90039 20.2002 -9.2998 27.7998c-9.7002 17.7002 -30.2002 -9.19922 -43 -11.2998
+c4.53027 -0.25293 8.71777 -0.380859 13.3115 -0.380859c4.59277 0 9.15723 0.12793 13.6885 0.380859l-22.4004 -5.39941l3.40039 -4.7002c-5.5 0 -16.9004 -0.900391 -22.4004 17.2002zM358.4 346.9l-20.3008 -11.8008
+c11.3008 -7.59961 20.2002 -18.1992 27.8008 -31.1992c6.39941 2.89941 10.0996 5.09961 11.7998 7.59961c2.5 2.7998 2.5 4.7002 3 7.09961c0.599609 1.30078 0.799805 2.7002 -3.40039 11.1006c-7.5 11.7998 -16.2002 15.2998 -18.8994 17.2002zM91 304.9
+c-7.7998 -24.1006 -11.7002 -49.4004 -13.2002 -74.6006l13.2002 -5l1.2002 27c9.5 -16.3994 11.2002 -23.2998 12.2998 -28.7998c2.7998 2.09961 7.7002 7 22.5996 11.2998l1.2002 -1.7002l-7.59961 -10.5996c10.0996 3.5 19.5 3.5 28.2998 0.5l-10.5996 -8.40039
+c22.7998 -8.39941 26.5996 -7.59961 38.3994 -26.0996l-11.7998 1.2002c34.9297 -20.5 66 -47.9004 141.2 -63.2002c15.5996 24.0996 14 21.0996 14 22.9004l0.200195 0.199219l-0.200195 0.200195c-0.700195 1.90039 -14.1006 16.6006 -18.2002 20.7002
+c7.2998 -1.7998 6 -0.900391 10.7998 -3.7002c1.7002 -0.899414 -5.39941 5.40039 -21.8994 20.2002c16.5 -6.7002 27.5996 -15.5 33 -27.7998l1.69922 30.7002l-22.3994 17.6992l6.39941 5.90039c-7.2998 0 -31 3.7002 -49.1992 -16l-2.5 0.5
+c6.9668 14.3867 12.4512 30.0156 16 46c1.9209 9.16797 2.95508 18.5742 3 28.2998c0 19.5 -4.7002 38.4004 -13.5 56.6006c-6.40039 13.5 -16.5 25.2998 -30 35.3994c-6.5957 4.94238 -13.4805 9.43652 -20.7002 13.5c3 0.700195 1 1.2002 -5.40039 1.2002
+c-6.39941 0.200195 -13 0.700195 -19.3994 1.2002v-3c-10.2949 -1.63086 -19.2871 -7.22266 -25.3008 -15.2002h-1.19922l-5.40039 -3.40039c-1.2002 2.90039 0 6.30078 4.2002 9.30078l10.5996 11.2998l-3.39941 -0.5l2 3.39941
+c-2.30078 0.200195 -4.2002 0.5 -6.2002 0.700195l-0.5 1.2002l2.5 1.7002c2.2002 -0.200195 4.59961 -0.5 7.09961 -0.700195c2.9043 1.54785 6.22559 2.4375 9.74414 2.4375c1.45898 0 2.88184 -0.150391 4.25586 -0.4375l2.5 -1.2002l0.200195 -0.5
+c7.93457 0.514648 15.7422 1.49121 23.4004 2.90039c20.6992 2.89941 36.6992 11.2998 48.5 24.7998l-21.1006 0.5c-25.7998 0.5 -49.3994 -5.40039 -71.2998 -18.9004l-2.5 2.5l0.5 4.7002l1.7002 7.10059c1.66211 8.54199 3.83691 17.1143 6.39941 25.2998
+c-1.69922 -0.700195 -4.59961 -4.90039 -9.2998 -11.2998c-4.7002 -6.40039 -8.39941 -13 -10.0996 -19.4004c-1.0957 -5.14258 -3.14062 -10.0195 -5.90039 -14.2998l-13.5 29l8.40039 -35.7998l-0.5 -1.7002c-0.00585938 0 -0.0146484 0.0117188 -0.0195312 0.0117188
+c-5.57227 0 -10.9424 0.87207 -15.9805 2.48828c-3.40039 0.700195 -10.6006 1.2002 -20.9004 1.2002c0.5 0 -0.700195 0 -3.2002 -0.5c5.40039 -1.30078 13.5 -4.2002 24.8008 -8.40039l6.39941 1.2002c-4.2002 -3.40039 -10.8994 -10.1006 -20.2002 -19.4004
+c-9.39941 -8.89941 -20.1992 -26.0996 -32.5 -50.2002l4.2002 1.2002l10.1006 9.2998l-5.40039 -4.69922l13 12.2998l-2.5 -3.40039c-5.09961 -7.59961 -8.09961 -12.2998 -9.2998 -15.2002zM367.5 -25.0996c8.2998 40.2998 3.59961 55.1992 -0.700195 89.5
+c-35.5 -11.8008 -20.2998 -6 -32 -10.8008l10.5 -14.1992l-1.2002 -1.2002c-20.1992 6 -23.1992 10.7998 -27.7998 15c6 -22.2002 13.9004 -26.4004 29.5 -31.7002c-9.5 -9.59961 -25.3994 4 -34.3994 13l2.5 -23.5996l-4.2002 -3c-5 22.0996 -22 39.0996 -25.2998 39.0996
+c-44 -13 -79.1006 -5.7998 -113.9 10.5996c-1.59961 -0.399414 -70.5996 -18 -120.5 37.1006c13.7002 -35 32.2998 -63.7002 71.2998 -82.6006c-4.98047 10.3184 -12.0117 19.3135 -20.7002 26.6006c0 0 0.700195 3.7002 1.2002 10.0996
+c19.4004 -19.3994 50.7002 -39.5 93.2002 -60.2002c-59.5996 24.5 -59.9004 24.8008 -69.0996 29l16 -20.6992c-3 -1.30078 -6.7002 -0.5 -10.1006 1.19922c-12.5371 7.32422 -24.2949 15.5693 -35.3994 24.8008c1.89941 -2.2002 80.0996 -98.5 200.899 -74.3008
+c-43.0996 21.8008 -52.3994 52.4004 -66.5996 73.5l17.7002 -7.59961l-11.8008 23.0996c20.1006 -27.7998 28.6006 -35 38.4004 -44.2998l-30 16.5c12.5996 -27.0996 33.7002 -47 63.5 -58.7998c2.90039 1.5 9.09961 -1.09961 59 23.9004zM482.8 189.3l8.93066 -12.7998
+l-12.3008 32.5c10.9004 0 10 -0.0996094 21.2002 -3.40039c-8.16406 11.4756 -17.0879 22.0469 -27 32l-26.5996 23.1006l1.2002 3l23.5996 2.5c-10.6865 2.35742 -21.708 3.79199 -33 4.2002l-17.7002 -0.5l-0.5 2.89941l14.7998 13l-41.7998 -20.2002l-12.2998 18.9004
+l3.40039 -16l-2.5 -1.2002l-5.90039 4.2002h-10.0996l5.39941 -4.2002v-2l-13.5 -27.7998c-10.0996 -31.2002 -21.8994 -67.9004 -35.3994 -109.7l1.19922 16l-1.19922 -3v-0.5c-6.40039 -16 -13.6006 -29.5 -21.2002 -39.5996l9.2998 21.8994l-46.7002 -20.1992
+c11.7998 13.5 23.6006 19.3994 34.9004 18.8994c-71.2002 11.4004 -106.2 41 -110.4 46c3.60059 -6.2002 13.2002 -17.7998 16 -40.0996l-1.7002 -1.2002c-4.2998 15.5996 -16.3994 46.5996 -55.7998 69.5996l23.6006 -2.5c-10.5 12.6006 -36.3008 17.8008 -40.8008 16
+l-2.5 2.5l8.40039 8.40039l-22.2998 -5.7998l5.39941 13.5c-8.09961 -4.40039 -4.2998 -2.40039 -17 -8.90039l-1.69922 0.5c0.599609 0.600586 0.899414 -0.700195 -3 9.2998c-0.600586 -11 -0.400391 -8.59961 -1 -11.7998
+c-1.29785 -0.430664 -2.54785 -1.00781 -3.7002 -1.7002c-40 20.6006 -57.2002 11 -73 5.2002c36.7998 -6 29.2998 -4 38.3994 -9.2998c-25.7998 -12.2002 -31.8994 -12.5996 -51.3994 -70.0996l22.2695 22.2998l2.5 -16.4004c13.4004 -58 68.7002 -92.5 126.4 -83.3994
+l-26.1006 22.3994l44.8008 -22.3994l-1.2002 -3c4.59961 -1.7002 9.2998 -3 13.5 -4.2002c19.3359 -5.72266 39.5713 -8.83887 60.752 -8.83887c11.0293 0 21.8643 0.832031 32.4482 2.43848l-32.5 21.2002c35.7998 -7 50.6992 -31.4004 56.7998 -39.5996l-7.60059 29
+l1.2002 2.5l19 -27.9004l-9.2998 26.5996l21.9004 -13.5h1.19922l-3.39941 4.2002l7.09961 -4.7002l-14.2998 16l1.2002 3l7.59961 -7.09961c4.2998 1.2002 41.4004 10.5 80.9004 40.2998c47.8994 35.4004 68.0996 73.7998 71.5996 79.7002l-3 9.2998zM476.7 260.6
+l-18.2002 -1.19922l14.2998 -11.8008zM221.9 253.5c2.69922 -5.09961 5.69922 -12.4004 18.3994 -18.7998c-7.5 -10.9004 -8.2998 -10.5 -20.2002 -16c-7.59961 -7.7002 -13.5 -13.1006 -17.6992 -14.7998l7.09961 13c-5.38281 -1.97266 -11.167 -3.06836 -17.2295 -3.06836
+c-2.57324 0 -5.10156 0.194336 -7.57031 0.568359l-0.5 1.19922c19 2.10059 37.2002 9.40039 46.5 16c-4.10059 4.2002 -7.10059 11.3008 -8.7998 21.9004zM225.6 355.8c5.87793 -3.32715 10.7842 -8.04688 14.3008 -13.7998
+c14.6992 -24.0996 19.1992 -40.0996 11.2998 -47.7002c-7.90039 -7.59961 -16.7998 -7.09961 -26.1006 3c-9.2998 10.1006 -13.5 23.7002 -11.7998 39.6006c1.7002 15.8994 5.90039 22.2998 12.2998 18.8994zM220.9 309.5
+c7.09961 -21.2998 33.3994 -23.0996 26.8994 4.90039c-3.89941 16.5 -8.7998 27.0996 -15.2002 32.5c-6.59961 5.39941 -10.0996 6.69922 -11.2998 4.19922c-2.5 -2.89941 -3.5 -11.2998 -3 -24.7998c7.5 12.7998 11.6006 5.90039 12.5 4.7002l-0.5 -0.5
+c-0.799805 -1.7002 -2.59961 -3.09961 1.7002 -6.2002l1.2002 0.5v-4.7002c-1.7998 -12.5 -6.90039 -12.7998 -12.2998 -10.5996zM175.9 315c-2.41016 0.448242 -4.38965 2.04102 -5.40039 4.2002c-3.5 8.5 0 21.2002 8.09961 21.2002
+c2 -0.5 3.7002 -1.7002 5.40039 -4.7002c-1.5 -0.400391 -4.7002 -4.7998 0.700195 -5.90039h0.5c0 -13.7002 -7.7002 -15.0996 -9.2998 -14.7998zM216 365.1l-3.7002 2.40039l-0.5 2.5c18.2998 0 25.7998 -8.7998 28.2998 -14.2998
+c-6.94727 3.78809 -14.9268 5.97363 -23.3916 5.97363c-0.90918 0 -1.81152 -0.0244141 -2.70801 -0.0742188l-0.5 3zM144.2 315.7c1.59961 -1.60059 0.599609 -0.299805 4.89941 -6.60059c-25.3994 -4.69922 -23.1992 -12.2998 -30 -12.2998
+c0.300781 0.600586 7.10059 16 23.6006 16l-7.10059 7.60059c9.40039 0.5 15.2002 2.09961 19.9004 -5.90039c0.0214844 8.14648 1.03027 16.0225 2.90039 23.5996c2 7.60059 3.69922 11.8008 5.39941 13.5c1 1.5 16.2998 15.7002 29 22.4004
+c2.33496 1.68262 5.22168 2.67676 8.31641 2.67676c1.8291 0 3.57715 -0.34668 5.18359 -0.976562c0.321289 -0.390625 0.515625 -0.889648 0.515625 -1.43457c0 -0.0898438 -0.00488281 -0.178711 -0.015625 -0.265625l-13 -7.59961
+c7.60059 -11.8008 10.5 -25.3008 8.7998 -41.3008c-1.11328 -11.292 -6.61426 -21.3291 -14.7998 -28.2998l2.90039 -4.7002c-30 2.2002 -24.7998 6.80078 -46.5 23.6006zM162.9 334.4c-1.80078 -7.2002 -2.30078 -16 -3.10059 -26l5.40039 -6.40039l7.09961 -3.40039
+c2.39648 -0.458008 4.79688 -0.699219 7.3252 -0.699219c1.3418 0 2.66797 0.0673828 3.97461 0.199219c1 1.7002 3.5 4.2002 6.40039 7.60059c5 5.89941 7.90039 13.7998 8.40039 23.0996c0.0849609 1.43848 0.113281 2.82617 0.113281 4.28613
+c0 7.30859 -1.08887 14.3643 -3.11328 21.0137c-3 8.10059 -5.90039 11 -10.1006 9.30078c-5.39941 -1.7002 -10.5996 -5.40039 -16 -11.8008c-3 -4.19922 -5.2002 -9.59961 -6.39941 -17.1992zM204.9 278.3l-3.10059 -6.5c7.10059 4.2002 13.5 7.2002 19.4004 8.40039
+l7.09961 0.5l11.7998 -7.60059h-2.5c-8.7998 3.7002 -19.3994 1.2002 -30.6992 -7.59961c-0.5 -4.7002 1.69922 -14.7002 5.89941 -29.5l9.2002 0.5c-21.9004 -6.59961 -37.5996 -8.40039 -48.9004 -5.40039c-24.8994 6.7002 -27.3994 23.6006 -27.5 24.1006
+c-1.74121 6.70996 -2.67871 13.6348 -2.67871 20.8867c0 4.35645 0.333984 8.63574 0.979492 12.8135c-6.40039 -0.5 -11 -4.2002 -15.2002 -10.6006c-2.90039 5.90039 -5.40039 8.7998 -5.90039 9.2998c1.5 0.700195 12.2998 7.5 32.5 4.90039l0.5 -2.5l-5.89941 -1.2002
+c-0.100586 -0.399414 -1.90039 -29.5 18.8994 -24.7998c1.40039 0.299805 1.2998 -0.0996094 36.1006 14.2998z" />
+    <glyph glyph-name="acquisitions-incorporated" unicode="&#xf6af;" horiz-adv-x="384" 
+d="M357.45 -20.2002c2.2002 -14.2998 4.09961 -28.7002 6.59961 -43.7002c-367.8 0 -153.899 -0.599609 -337.1 0c-4 0 -6.10059 0.700195 -5.2998 5.7002c2.09961 12.9004 3.5 25.9004 5 38.7998c0.5 4.80078 2.2998 6.80078 7.59961 6.80078
+c118.1 -1 114.9 -0.300781 121.4 2.39941c9.39941 4 14.8994 12.9004 14.8994 23.1006c-0.0996094 42.8994 -0.299805 85.8994 -0.200195 128.8c0 3.7998 -1.19922 5.89941 -4.59961 6.7998c-15.7002 3.90039 -31.2998 7.7002 -47.5996 11.7002
+c-5.30078 -12.2998 -10.4004 -24.4004 -15.7002 -36.7002c1.7998 -3.2998 28.3994 -2.90039 35.2998 -2.90039v-27.5996h-114.3c1 8.59961 1.7002 16.7998 3.2002 24.9004c0.299805 1.39941 3.59961 3.09961 5.5 3.19922
+c8.39941 0.400391 16.8994 0.300781 25.3994 0.100586c4 0 5.90039 1.09961 7.60059 5.2002c16.5996 40.6992 13.5 31.1992 67.2998 161c31.5 76.0996 33 76 32.5996 87.3994c-0.700195 18.6006 -25.3994 22.2998 -37.7002 22.1006c-30 -0.400391 -38.3994 0.5 -101.8 0.5
+c-7.2002 44.5 -4.2002 32.0996 -6.39941 45.2998c-0.700195 4.2002 1 5.2998 4.59961 5.2998l339.1 -0.200195c-0.799805 -5.39941 -1.59961 -10.7998 -2.39941 -16.0996c-1.2998 -9.7002 -2.7998 -19.4004 -4 -29.2002c-0.299805 -2.90039 -1.2002 -4.2998 -4.2998 -4.2998
+c-20.6006 -0.100586 -41.2002 -0.100586 -61.8008 -0.5c-18.6992 -0.400391 -37.5996 -0.299805 -56.1992 -2c-13.4004 -1.2002 -23.3008 -12.6006 -18.9004 -26.6006c8.59961 -27.0996 27.7002 -69.0996 36.5 -89.1992c65.7002 -154.2 61.4004 -157 84 -158.601
+c6.59961 -0.5 13.4004 -0.0996094 20.4004 -0.0996094c1.2998 -9.40039 2.59961 -18 4 -27.5h-116v27c10.3994 0 20.3994 0.0996094 30.3994 -0.100586c3.5 0 5 0.700195 3.40039 4.40039c-4.40039 10.2998 -8.7002 20.5996 -13.2002 30.9004
+c-1.59961 3.69922 -4.09961 4.7998 -8.40039 3.5c-12.3994 -3.60059 -24.7998 -6.7002 -37.2998 -9.7002c-4.2998 -1.10059 -6 -2.7998 -5.89941 -7.5c0.799805 -57.5 0.899414 -127.5 1 -129.101c0.399414 -12.5996 8.69922 -21.3994 21 -23.0996
+c0.899414 -0.200195 12.8994 -2.7998 112.699 -2.59961c8.30078 0 8.40039 0.0996094 9.60059 -7.60059zM182.55 185.5c2.87695 -1.01465 5.98633 -1.56641 9.20801 -1.56641s6.31543 0.551758 9.19238 1.56641c13 4.2002 26.2998 7.7998 39.3994 11.7002
+c1.34473 0.620117 2.65234 1.32422 3.90039 2.09961c-6.7002 17.4004 -13.0996 34.2002 -19.7002 50.9004c-8.89941 22.7002 -17.7002 60.2998 -27 82.7998c-1.5 0.799805 -1.89941 -2.40039 -9.39941 0c-17.1006 -44 -34.1006 -87.7998 -51.3008 -132.1
+c1.8457 -1.09766 3.7959 -2.07422 5.80078 -2.90039c13.2998 -4.2998 26.5996 -8.2998 39.8994 -12.5z" />
+    <glyph glyph-name="critical-role" unicode="&#xf6c9;" 
+d="M225.82 448c0.259766 -0.150391 216.569 -124.51 217.12 -124.72c3 -1.18066 3.69922 -3.45996 3.69922 -6.56055c-0.0732422 -83.4463 -0.0732422 -166.899 0 -250.359c0.0117188 -0.150391 0.0175781 -0.302734 0.0175781 -0.456055
+c0 -2.36035 -1.38867 -4.38867 -3.39746 -5.32422c-21.3701 -12 -207.859 -118.29 -218.93 -124.58h-3c-79.3301 45.6602 -218.25 125.44 -218.4 125.52c-1.11816 0.526367 -1.89355 1.66309 -1.89355 2.97949c0 0.0898438 0.00683594 0.173828 0.0136719 0.260742
+c0 0.870117 0 225.94 -0.0498047 253.101c-0.00976562 0.124023 -0.0136719 0.25 -0.0136719 0.376953c0 2.02832 1.20605 3.76855 2.94336 4.55273c23.2607 13.0996 209.271 119.21 220.141 125.21h1.75zM215.4 427.58l-0.219727 0.158203
+c-64.7471 -36.8604 -129.474 -73.7305 -194.18 -110.61c0 -0.120117 0.0800781 -0.229492 0.129883 -0.349609l30.8604 -11.6406c-7.70996 -6 -8.32031 -6 -10.6504 -5.12988c-0.0996094 0 -24.1699 9.28027 -26.7998 10v-230.43
+c0.879883 1.41016 64.0703 110.91 64.1299 111c1.62012 2.82031 3 1.91992 9.12012 1.51953c1.40039 -0.0898438 1.47949 -0.219727 0.780273 -1.41992c-41.1904 -71.3301 -36.4004 -63 -67.4805 -116.939c-0.80957 -1.40039 -0.609375 -1.12988 1.25 -1.12988h186.5
+c1.44043 0 1.69043 0.229492 1.7002 1.63965v8.87988c0 1.33984 2.36035 0.810547 -18.3701 1c-7.45996 0.0703125 -14.1396 3.21973 -21.3799 12.7002c-7.37988 9.66016 -14.6201 19.4297 -21.8496 29.21c-2.28027 3.08008 -3.4502 2.37988 -16.7607 2.37988
+c-1.75 0 -1.7793 0 -1.75977 -1.82031c0.290039 -26.21 0.150391 -25.2695 1 -32.6592c0.520508 -4.37012 2.16016 -4.2002 9.69043 -4.81055c3.13965 -0.259766 3.87988 -4.08008 0.519531 -4.91992c-1.57031 -0.389648 -31.5996 -0.509766 -33.6699 0.0996094
+c-1.02539 0.28125 -1.7793 1.2207 -1.7793 2.33496c0 1.21973 0.905273 2.22949 2.0791 2.39551c3.29004 0.759766 6.16016 -0.80957 6.66016 4.44043c1.2998 13.6592 1.16992 9 1.09961 79.4199c0 10.8193 -0.349609 12.5801 -5.35938 13.5498
+c-1.21973 0.240234 -3.54004 0.160156 -4.69043 0.549805c-2.87988 1 -2 4.83984 1.77051 4.84961c33.6699 0 46.0801 1.07031 56.0596 -4.85938c7.74023 -4.61035 12 -11.4805 12.5098 -20.4004c0.880859 -14.5898 -6.50977 -22.3496 -15 -32.5898
+c-0.313477 -0.267578 -0.511719 -0.666016 -0.511719 -1.11035s0.198242 -0.841797 0.511719 -1.10938c2.60059 -3.25 5 -6.62988 7.70996 -9.83008c27.5605 -33.2305 24.1104 -30.54 41.2803 -33.0605c0.890625 -0.129883 1 0.419922 1 1.15039v11
+c0 1 0.320312 1.42969 1.41016 1.25977c3.57227 -0.542969 7.23047 -0.825195 10.9531 -0.825195c4.35449 0 8.4834 0.386719 12.627 1.125c1.08008 0.150391 1.5 -0.199219 1.47949 -1.33008c0 -0.109375 0.880859 -26.6895 0.870117 -26.7998
+c-0.0498047 -1.51953 0.669922 -1.62012 1.89062 -1.62012h186.71c-27.1533 47.0342 -54.2334 93.9746 -81.2402 140.821c2.25977 0.660156 -0.400391 0 6.69043 1.38965c2 0.390625 2.0498 0.410156 3.10938 -1.43945c7.31055 -12.6396 77.3105 -134 77.3701 -134.061
+v230.44c-1.71973 -0.5 -103.3 -38.7197 -105.76 -39.6797c-1.08008 -0.419922 -1.5498 -0.200195 -1.91016 0.879883c-0.629883 1.89941 -1.33984 3.75977 -2.08984 5.62012c-0.320312 0.790039 -0.0898438 1.12988 0.649414 1.38965
+c0.100586 0 95.5303 35.8496 103 38.7705c-65.4199 37.5693 -130.56 75 -196 112.6l86.8203 -150.39l-0.280273 -0.330078c-9.56934 0.899414 -10.46 1.59961 -11.7998 3.93945c-1 1.69043 -73.5 127.71 -82 142.16c-9.09961 -14.6699 -83.5596 -146.21 -85.3701 -146.32
+c-2.92969 -0.169922 -5.87988 -0.0800781 -9.25 -0.0800781c28.833 49.8271 57.5596 99.4941 86.1797 149.001zM267.331 297.658c1.88379 0.146484 3.74316 0.435547 5.54004 0.849609c1.68945 0.299805 2.53027 -0.200195 2.59961 -1.91992
+c0 -0.109375 0.0703125 -19.0596 -0.859375 -20.4502c-0.930664 -1.38965 -1.87988 -1.21973 -2.60059 0.19043c-5 9.68945 6.2207 9.66016 -39.1201 12c-0.699219 0 -1 -0.230469 -1 -0.929688c0 -0.130859 3.7207 -122 3.73047 -122.11
+c0 -0.889648 0.519531 -1.2002 1.20996 -1.50977c2.97363 -1.18262 5.9043 -2.54883 8.7002 -4.0498c7.30957 -4.33008 11.3799 -10.8408 12.4102 -19.3105c1.43945 -11.7998 -2.77051 -35.7695 -32.21 -37.1396c-2.75 -0.129883 -28.2607 -1.08008 -34.1406 23.25
+c-4.66016 19.2598 8.25977 32.7002 19.8906 36.3994c1.14258 0.208008 2.00977 1.20898 2.00977 2.41113c0 0.0849609 -0.00195312 0.166016 -0.00976562 0.249023c0.0996094 5.62988 3 107.101 3.70996 121.351c0.0498047 1.0791 -0.620117 1.15918 -1.35059 1.14941
+c-32.3496 -0.519531 -36.75 0.339844 -40.2197 -8.51953c-2.41992 -6.18066 -4.13965 -1.32031 -3.9502 -0.230469c1.05957 6 2.16309 12 3.31055 18c0.399414 2.11035 1.42969 2.61035 3.42969 1.86035c5.58984 -2.11035 6.71973 -1.7002 37.25 -1.91992
+c1.72949 0 1.78027 0.0800781 1.82031 1.84961c0.679688 27.4902 0.579102 22.5898 1 29.5498c0.0117188 0.106445 0.0185547 0.213867 0.0185547 0.322266c0 1.11719 -0.679688 2.07129 -1.64941 2.47852c-5.59961 2.90918 -8.75 7.5498 -8.89941 13.8691
+c-0.350586 14.8105 17.7197 21.6699 27.3799 11.5107c6.83984 -7.19043 5.7998 -18.9102 -2.4502 -24.1504c-1.34473 -0.740234 -2.25684 -2.1709 -2.25684 -3.81348c0 -0.180664 0.015625 -0.351562 0.0371094 -0.526367c0 -0.589844 -0.110352 4.30957 1 -30.0498
+c0 -0.900391 0.429688 -1.12012 1.24023 -1.11035c0.0996094 0 23 0.0898438 34.4697 0.370117zM68.2705 306.298c19.8408 4.50977 32.6807 0.560547 52.4902 -1.68945c2.75977 -0.310547 3.74023 -1.2207 3.62012 -4c-0.209961 -5 -1.16016 -22.3301 -1.24023 -23.1504
+c-0.0419922 -1.05566 -0.702148 -1.9541 -1.62988 -2.33984c-4.05957 -1.7002 -3.60938 4.4502 -4 7.29004c-3.12988 22.4297 -73.8701 32.7002 -74.6299 -25.4004c-0.30957 -23.9199 17 -53.6299 54.0801 -50.8799c27.2402 2 19 20.1904 24.8398 20.4697
+c0.120117 0.0166016 0.241211 0.0244141 0.365234 0.0244141c1.50098 0 2.71973 -1.21875 2.71973 -2.71973c0 -0.229492 -0.03125 -0.451172 -0.0849609 -0.664062c-1.83008 -10.8506 -3.41992 -18.9502 -3.4502 -19.1504
+c-1.54004 -9.16992 -86.6992 -22.0898 -93.3496 42.0605c-2.70996 25.8496 10.4404 53.3691 40.2695 60.1494zM148.271 218.628h-19.4893c-0.0703125 -0.00585938 -0.140625 -0.00878906 -0.210938 -0.00878906c-1.15039 0 -2.12109 0.756836 -2.44922 1.79883
+c2.37988 3.75 5.88965 -0.919922 5.86035 6.13965c-0.0800781 25.75 0.209961 38 0.229492 40.1006c0 3.41992 -0.530273 4.64941 -3.32031 4.93945c-7 0.720703 -3.10938 3.37012 -1.10938 3.38086c11.8398 0.0996094 22.6201 0.179688 30.0498 -0.720703
+c8.76953 -1.06934 16.71 -12.6299 7.92969 -22.6201c-2 -2.25 -4 -4.41992 -6.13965 -6.72949c0.950195 -1.15039 6.89941 -8.82031 17.2803 -19.6797c2.65918 -2.78027 6.14941 -3.51074 9.87988 -3.13086h0.0214844c1.18945 0 2.16016 0.943359 2.20801 2.12012
+c0.299805 3.41992 0.259766 -4.72949 0.450195 40.5801c0 5.65039 -0.339844 6.58008 -3.22949 6.83008c-3.9502 0.350586 -4 2.25977 -0.69043 3.37012l19.0898 0.0898438c0.320312 0 4.49023 -0.530273 1 -3.37988c0 -0.0498047 -0.160156 0 -0.240234 0
+c-3.60938 -0.259766 -3.93945 -1 -4 -4.62012c-0.269531 -43.9297 0.0703125 -40.2295 0.410156 -42.8203c0.110352 -0.839844 0.270508 -2.22949 5.10059 -2.13965c2.48926 0 3.85938 -3.37012 0 -3.39941c-10.3701 -0.0800781 -20.7402 0 -31.1104 -0.0703125
+c-10.6699 0 -13.4697 6.2002 -24.21 20.8203c-1.59961 2.17969 -8.31055 2.35938 -8.2002 0.369141c0.879883 -16.4697 0 -17.7793 4 -17.6699c4.75 0.100586 4.73047 -3.56934 0.830078 -3.5498h0.0595703zM423.271 228.778
+c-1.20996 -7.12988 0.170898 -10.3799 -5.2998 -10.3398c-61.5498 0.419922 -47.8193 0.219727 -50.7197 0.30957c-1.24414 0.12207 -2.4707 0.37207 -3.62988 0.730469c-2.53027 0.599609 1.47949 1.22949 -0.379883 5.59961
+c-1.43066 3.37012 -2.78027 6.78027 -4.11035 10.1895c-0.219727 0.831055 -0.976562 1.44336 -1.87598 1.44336c-0.0419922 0 -0.0820312 0 -0.124023 -0.00292969c-2.22852 0.107422 -4.4707 0.161133 -6.72559 0.161133
+c-2.70605 0 -5.18652 -0.0771484 -7.85449 -0.231445c-0.6875 -0.0898438 -1.27734 -0.491211 -1.62012 -1.05957c-1.58008 -3.62012 -3.06934 -7.29004 -4.50977 -11c-1.26953 -3.23047 7.86035 -1.32031 12.1904 -2.16016c3 -0.570312 4.5293 -3.71973 0.65918 -3.72949
+h-26.3691c-2.91992 0 -3.09082 3.14941 -0.740234 3.20996c0.0966797 -0.00488281 0.194336 -0.00683594 0.291992 -0.00683594c2.46484 0 4.59277 1.41211 5.62793 3.47656c1.5 3 2.7998 6 4.11035 9.08984c18.1797 42.1396 17.0596 40.1699 18.4199 41.6104
+c0.330078 0.473633 0.879883 0.783203 1.50098 0.783203s1.16797 -0.30957 1.49902 -0.783203c2.92969 -3.33984 18.3994 -44.71 23.6201 -51.9199c2 -2.7002 5.73926 -2 6.35938 -2c3.61035 -0.130859 4 1.10938 4.12988 4.29004
+c0.0898438 1.86914 0.0800781 -1.1709 0.0703125 41.2393c0 4.45996 -2.36035 3.74023 -5.5498 4.27051c-0.259766 0 -2.56055 0.629883 -0.0800781 3.05957c0.209961 0.200195 -0.890625 0.240234 21.7002 0.150391c2.31934 0 5.31934 -2.75 -1.20996 -3.4502
+c-0.0390625 0.00195312 -0.078125 0.00292969 -0.116211 0.00292969c-1.41309 0 -2.56055 -1.14746 -2.56055 -2.56055c0 -0.0927734 0.00683594 -0.181641 0.0166016 -0.272461c-0.0703125 -1.62988 -0.19043 -38.8896 0.290039 -41.21
+c0.288086 -1.39062 1.52051 -2.43652 2.99609 -2.43652c0.0791016 0 0.155273 0.000976562 0.233398 0.00683594c13.25 -0.430664 14.9199 -0.44043 16 3.41016c1.66992 5.7793 4.12988 2.51953 3.73047 0.189453zM318.551 164.408
+c-4.24023 0 -4.41992 3.38965 -0.609375 3.41016c35.9092 0.160156 28.1094 -0.379883 37.1895 0.649414c1.67969 0.19043 2.37988 -0.239258 2.25 -1.88965c-0.259766 -3.38965 -0.639648 -6.78027 -1 -10.1602c-0.25 -2.16016 -3.2002 -2.61035 -3.39941 0.150391
+c-0.380859 5.30957 -2.15039 4.44922 -15.6309 5.08008c-1.58008 0.0693359 -1.63965 0 -1.63965 -1.52051v-16.1299c0 -1.65039 0 -1.59961 1.62012 -1.46973c3.12012 0.25 10.3096 -0.339844 15.6895 1.51953c0.470703 0.160156 3.30078 1.79004 3.07031 -1.75977
+c0 -0.209961 -0.759766 -10.3496 -1.17969 -11.3896c-0.530273 -1.29004 -1.87988 -1.51074 -2.58008 -0.320312c-1.16992 2 0 5.08008 -3.70996 5.2998c-15.4199 0.900391 -12.9102 2.5498 -12.9102 -6c0 -12.25 -0.759766 -16.1104 3.88965 -16.2402
+c16.6406 -0.479492 14.4004 0 16.4307 5.70996c0.839844 2.37012 3.5 1.77051 3.17969 -0.580078c-0.44043 -3.20996 -0.849609 -6.42969 -1.22949 -9.63965c0 -0.360352 -0.160156 -2.39941 -4.66016 -2.38965c-37.1602 0.0800781 -34.54 0.189453 -35.21 0.30957
+c-2.7207 0.509766 -2.2002 3 0.219727 3.4502c1.09961 0.19043 4 -0.540039 4.16016 2.55957c2.43945 56.2207 -0.0703125 51.3408 -3.91016 51.3301zM318.141 273.928c2.45996 -0.609375 3.12988 -1.75977 2.9502 -4.64941
+c-0.330078 -5.2998 -0.339844 -9 -0.549805 -9.69043c-0.660156 -2.22949 -3.15039 -2.12012 -3.33984 0.270508c-0.379883 4.80957 -3.0498 7.81934 -7.57031 9.14941c-26.2803 7.73047 -32.8096 -15.46 -27.1699 -30.2197c5.87988 -15.4102 22 -15.9199 28.8604 -13.7803
+c5.91992 1.85059 5.87988 6.5 6.91016 7.58008c1.22949 1.2998 2.25 1.83984 3.11914 -1.09961c0 -0.100586 0.570312 -11.8906 -6 -12.75c-1.59961 -0.209961 -19.3799 -3.69043 -32.6797 3.38965c-21 11.1904 -16.7402 35.4697 -6.87988 45.3301
+c14 14.0596 39.9102 7.05957 42.3203 6.46973h0.0292969zM289.801 167.858c3.28027 0 3.66016 -3 0.160156 -3.43066c-2.61035 -0.319336 -5 0.419922 -5 -5.45996c0 -2 -0.19043 -29.0498 0.400391 -41.4502c0.109375 -2.28906 1.14941 -3.51953 3.43945 -3.64941
+c22 -1.20996 14.9502 1.64941 18.79 6.33984c1.83008 2.24023 2.75977 -0.839844 2.75977 -1.08008c0.350586 -13.6201 -4 -12.3896 -5.18945 -12.3994l-38.1602 0.189453c-1.92969 0.230469 -2.05957 3 -0.419922 3.37988c2 0.480469 4.93945 -0.399414 5.12988 2.7998
+c1 15.8701 0.570312 44.6504 0.339844 47.8105c-0.269531 3.76953 -2.7998 3.26953 -5.67969 3.70996c-2.46973 0.379883 -2 3.21973 0.339844 3.21973c1.4502 0.0205078 17.9697 0.0302734 23.0898 0.0205078zM258.171 225.648
+c0.0703125 -4.08008 2.86035 -3.45996 6 -3.58008c2.61035 -0.100586 2.53027 -3.41016 -0.0703125 -3.43066c-6.47949 0 -13.6992 0 -21.6094 0.0605469c-3.83984 0 -3.37988 3.34961 0 3.37012c4.49023 0 3.24023 -1.61035 3.41016 45.54
+c0 5.08008 -3.27051 3.54004 -4.7207 4.22949c-2.58008 1.23047 -1.35938 3.08984 0.410156 3.15039c1.29004 0 20.1904 0.410156 21.1699 -0.209961c0.980469 -0.620117 1.87012 -1.65039 -0.419922 -2.86035c-1 -0.519531 -3.85938 0.280273 -4.14941 -2.46973
+c0 -0.209961 -0.820312 -1.62988 -0.0703125 -43.7998h0.0498047zM221.261 -48.6221c0.46582 -0.311523 1.02539 -0.493164 1.62695 -0.493164c0.602539 0 1.16797 0.181641 1.63281 0.493164c17 9.79004 182 103.57 197.421 112.51
+c-0.140625 0.430664 11.2598 0.180664 -181.521 0.270508c-1.21973 0 -1.57031 -0.370117 -1.53027 -1.56055c0 -0.0996094 1.25 -44.5098 1.2207 -50.3799c-0.0966797 -2.67383 -0.571289 -5.27344 -1.36035 -7.70996c-0.549805 -1.83008 0.379883 0.5 -13.5 -32.2295
+c-0.730469 -1.7207 -1 -2.20996 -2 0.0800781c-4.19043 10.3398 -8.28027 20.7197 -12.5703 31c-1.29785 2.92285 -2.01953 6.15723 -2.01953 9.55957c0 0.412109 -0.000976562 0.823242 0.0195312 1.23047c0.160156 2.45996 0.800781 16.1191 1.51074 48
+c0 1.94922 0 2 -2 2h-183c2.5791 -1.63086 178.319 -102.57 196 -112.761zM130.361 140.128c0 -2.39941 0.359375 -2.79004 2.75977 -3c11.54 -1.16992 21 -3.74023 25.6396 7.32031c6 14.46 2.66016 34.4102 -12.4795 38.8398c-2 0.589844 -16 2.75977 -15.9404 -1.50977
+c0.0498047 -8.04004 0.00976562 -11.6104 0.0205078 -41.6504zM236.111 155.178c0 -2.12988 1.06934 -38.6797 1.08984 -39.1299c0.339844 -9.93945 -25.5801 -5.76953 -25.2305 2.58984c0.0800781 2 1.37012 37.4199 1.10059 39.4307
+c-14.1006 -7.44043 -14.4199 -40.21 6.43945 -48.8008c2.18066 -0.946289 4.58594 -1.4707 7.11328 -1.4707c6.46094 0 12.1299 3.40332 15.2773 8.54102c4.90918 7.75977 6.83984 29.4697 -5.43066 39c-0.114258 -0.0478516 -0.237305 -0.0888672 -0.359375 -0.120117
+v-0.0400391zM223.831 353.178c-9.83008 0 -9.73047 -14.75 -0.0703125 -14.8701c9.66016 -0.119141 10.1006 14.8809 0.0703125 14.9102v-0.0400391zM143.681 249.348c0 -1.7998 0.410156 -2.39941 2.16992 -2.58008c13.6201 -1.38965 12.5107 11 12.1602 13.3604
+c-1.68945 11.2197 -14.3799 10.2002 -14.3496 7.81055c0.0498047 -4.5 -0.0302734 -13.6807 0.0195312 -18.5908zM356.001 242.948l-6.09961 15.8398c-2.16016 -5.48047 -4.16016 -10.5703 -6.23047 -15.8398h12.3301z" />
+    <glyph glyph-name="d-and-d-beyond" unicode="&#xf6ca;" horiz-adv-x="640" 
+d="M313.8 206.5c-9.89941 0 -16 7 -15.7002 7.09961c-4.2998 5.7002 -3 -0.299805 -2.39941 -1.89941c-10.9004 10.2998 -5.2998 25.3994 -5.10059 26c0.700195 1.89941 0 2.2002 -0.599609 1.89941c-1 -0.299805 -2.09961 -1.89941 -2.09961 -1.89941
+c0.799805 9.09961 9.2998 14.7002 9.2998 14.7002l0.200195 -0.200195c1 -1.5 -0.400391 -3.2002 -0.600586 -9c1.60059 2.2998 7.90039 6.59961 11.4004 7.89941c-1.10059 -1.5 -2.10059 -3.59961 -2.10059 -6.59961c3.7002 4.2002 7.5 2.59961 8 2.40039
+c-12.1992 -11.9004 -7 -26.6006 3.2002 -26.6006c5.7002 0 11.5 6.40039 13.9004 10.7002c2.39941 -2.40039 6.39941 -5.5 7.39941 -6.59961c-3.7998 -7.80078 -11 -17.9004 -24.7998 -17.9004zM366.2 227.6c0 -2.89941 -2.90039 -4.09961 -5.40039 -4.5
+c0.700195 1.5 1.7998 5.10059 -0.200195 9c0.700195 -0.0996094 5.60059 -0.5 5.60059 -4.5zM376.5 222.4c-0.400391 -6.5 -6.90039 -11.6006 -14.5996 -10.6006c2 -1.7002 6.59961 -3 9 -1.89941c-3.90039 -6.90039 -23.1006 -7.5 -23.1006 6.39941
+c-2.89941 -2.89941 -2.09961 -7.39941 0 -9.2998c-2.2002 0.700195 -5.7998 3.09961 -6.39941 7.40039c-1.30078 10.0996 4.39941 6.5 -10.4004 18.0996c-4.7998 3.7002 -3 6.59961 -4 8.5c-1.09961 2.2002 -7 4.09961 -4.5 8.5
+c-0.0996094 -1.59961 1 -2.90039 2.59961 -3.5c1.80078 -0.700195 3.2002 -0.200195 4.80078 -1c1.69922 -1.2002 0.899414 -3.90039 2.19922 -5c1.10059 -0.799805 4.2002 0.299805 6.60059 -1.7998c2.59961 -2 8.2002 -6.7002 10.5996 -8.60059
+c4.40039 -3.59961 8.7998 0.400391 7.40039 4.60059c4.5 -2.60059 5 -9.90039 1.2998 -12.5c10.5996 -2.40039 13 10.0996 5 11.3994c7.2998 0.700195 13.5 -4.2998 13.5 -10.6992zM337.1 240.8c4.30078 6.10059 13.3008 15.2998 23.8008 15.7998
+c-5.90039 0.800781 -15.1006 -3.19922 -19.7002 -9c0.899414 3.90039 5.09961 10.1006 10.2002 13c0 0 -2.5 -3.19922 -1.40039 -3.69922c1.59961 -0.800781 5.7998 5.69922 11.2002 5.89941c0 0 -4 -2 -3.2002 -3.39941c0.599609 -0.900391 3.2998 1.2998 8 1.2998
+c5.7998 0 10.9004 -3.5 13.2998 -6.2002c-4 1.09961 -11.5996 -0.799805 -13.7998 -2.7002c-0.299805 0.200195 -11.7998 9 -22 -15.5c-4.7998 3.7998 -4.40039 3.7002 -6.40039 4.5zM579.6 188.9c37.2002 0 60.4004 -19.6006 60.4004 -48.9004
+c0 -28.2002 -17 -48.9004 -59.0996 -48.9004c-20.7002 0 -41.2002 1.30078 -51.6006 2.10059l7.40039 8.2002v77.1992l-7.40039 8.2002c10.2998 0.799805 29.6006 2.10059 50.2998 2.10059zM564.5 113.3c25.4004 -3.2002 46.7998 1.40039 46.7998 27
+c0 22.5 -16.7002 29.6006 -46.7998 26.2998v-53.2998zM301.6 267c0.100586 -0.299805 -2.7998 2.2998 -3.2998 7.5c-0.200195 2.2998 0 19.7998 20 18.9004c11.2002 -0.600586 16.7002 -8.30078 16.7002 -16.5c0 -4.30078 -2.2998 -10.1006 -5.5 -13.8008
+c-2.2002 2.2002 -5.59961 4.60059 -7.7002 7.80078c3.7998 5.59961 2.2002 14.3994 -4.7002 14.3994c-4.2998 0 -7.7998 -4.5 -6.39941 -9.89941c-0.700195 -2.40039 -1 -5.60059 -0.5 -8c-4.90039 2.59961 -6.5 6 -7.5 9c-1.2998 -2.5 -2.10059 -6 -1.10059 -9.40039z
+M301.2 261c0.299805 1.7002 -3.10059 4.59961 -4.7998 5.2002c4.7998 0.200195 7 -0.600586 7 -0.600586c-1.30078 1.7002 -1.60059 4.5 -1 6.7002c2.5 -6.09961 11.6992 -7.09961 13.8994 -12.2002c-0.299805 2.30078 -2.39941 4.7002 -4.7998 6.10059
+c-1.2998 3.2002 -0.299805 9.39941 1.2998 11c-0.5 -8.7998 12 -13.7998 14.6006 -20.2002c-1.40039 5.5 -7.40039 9 -10.1006 12.2002c-1 2.09961 -0.200195 5.7998 0.799805 7.09961c-0.5 -9.7002 15.8008 -14.2998 14.1006 -23.8994
+c0.899414 -0.400391 2.09961 -1.2002 1.89941 -2.60059c1.30078 0.299805 2.60059 1.7002 2.90039 2.7002c0.700195 -4.5 -1.90039 -9 -4.7998 -10.4004c1.59961 4 -2.7002 5.60059 -6.7002 5.10059c0 0 1.59961 2.2998 1 3.39941
+c-0.799805 1.5 -8 0.800781 -11.2002 -0.299805c1.10059 0.100586 3.60059 -0.200195 4.60059 -0.5c-2.10059 -2.89941 -1 -7.09961 1.2998 -4.2002c0 0 -1.10059 -3.5 -0.299805 -4.2998c0.799805 -0.799805 2.59961 -0.200195 2.59961 -0.200195
+c-1.2002 -2.69922 -5.2998 -4.59961 -8.2002 -4.59961c1.10059 0.400391 2.7002 2.2998 3 3.40039c-0.799805 -0.5 -2.7002 -0.700195 -3.5 -0.5c6.10059 3 0 13.1992 -7 8.19922c1 2.7002 3.7002 5.30078 5.7998 6.10059c-1.2998 0.5 -2.69922 0.799805 -4.2998 1.09961
+c1.7998 1.5 6.2998 2.7998 8.5 2.60059c-3.5 0.799805 -9.89941 -0.300781 -12.7998 -3.7002c0.900391 0 3.2998 -0.5 4.2998 -0.799805c-4 -0.700195 -9.39941 -4.40039 -11 -6.2002c0.299805 2.2002 1 4.2002 0.5 5.59961c-0.799805 2 -3 2.7998 -7.7998 1.7998
+c3.2002 3.2002 9.7002 5.10059 10.2002 6.90039zM327.1 253.6c0 0 -0.899414 3 -4.19922 4.30078c0.699219 -2.2002 1.5 -4.30078 4.19922 -4.30078zM366 249.9l0.700195 0.699219c0.5 0.400391 1.59961 0.900391 2.7002 1.40039v-18.4004
+c-1.7002 0.800781 -3.5 1.10059 -5.60059 1.10059c-2.39941 0 -5 -0.5 -5 -0.5c-0.5 0.5 -3.59961 2.89941 -5.09961 3.2002c4.09961 -4.30078 0.5 -9.80078 -3 -7.2002v15.7002c0.700195 0.799805 1.2998 1.7998 2.09961 2.59961
+c1.7002 2.09961 4.60059 3.40039 7.5 3.40039c1.7998 0 3.60059 -0.400391 4.7002 -1.40039zM79.9004 142.1c22 -6.39941 19.3994 -20.0996 19.3994 -25.1992c0 -7.80078 -3.2002 -13.6006 -9.89941 -17.6006c-12.6006 -7.39941 -24.7002 -5.89941 -86.4004 -5.89941
+l8.40039 8.59961v32.2998l-11.4004 14.6006h11.2998v29.5l-8.2998 8.59961h56.0996c12.9004 0 37 -4.40039 37 -25c0 -1.90039 1 -15.2998 -16.1992 -19.9004zM38.5996 169.6v-20.8994c10.6006 0 29.6006 -3.2998 29.6006 8.7998v3
+c0 9.90039 -9.60059 9.09961 -29.6006 9.09961zM38.5996 110.4c20.4004 0 32.9004 -1.90039 32.9004 9.2998h-0.200195v4.5c0 11.0996 -20.5 8.7998 -32.7002 8.7998v-22.5996zM139.8 129.7v-15.4004l60.1006 0.200195l-14.1006 -21.2002h-81.2002l7.40039 8.2002v77.0996
+l-7.40039 8.2002l73.5 0.200195v-0.200195l14.1006 -21h-52.4004v-14.8994h37.2002l-14.0996 -21.2002v-0.200195zM354.5 189.8c73.7998 0 77.5996 -99.2998 -0.299805 -99.2998c-77.2002 0 -73.6006 99.2998 0.299805 99.2998zM354.2 112.3
+c39 0 37 55.2002 0.200195 55.2998c-37.1006 0 -37.6006 -55.2998 -0.200195 -55.2998zM262.9 120.6l0.199219 -19l7.2002 -8.19922h-42.5996l7.7002 8.19922l-0.200195 19.4004l-44.1006 65.7998h44.9004l-6.40039 -7.2002l21 -37.1992h0.300781l20.5 37.1992
+l-6.10059 7.2002h41.7002zM234.5 271.9c-9.09961 6.69922 -9.5 14.0996 -9.59961 14.8994c7.2998 -4.2998 9 -4 39.8994 -4c-5.7998 0 24 3.10059 32.2002 -22.8994c-0.400391 0 -8.40039 -4.80078 -10.4004 -7.90039c5.30078 1.90039 8.90039 1.09961 9 1.09961
+c-8 -5.09961 -9.59961 -14.7998 -9.59961 -20.5c0.900391 2.10059 2.7002 3.7002 2.7002 3.5c-0.600586 -2.5 -1.40039 -7 -0.799805 -12c-8.60059 -7.09961 -16 -8.59961 -26 -8.59961h-35.1006c0.400391 0.0996094 7.7998 4.5 7.90039 4.59961
+c1.89941 1.10059 2.7002 2.2002 2.7002 6.40039v38.7998c0 4.2002 -1.30078 5.2998 -2.90039 6.60059zM256 266.4v-34.6006c4.7002 0 23.0996 -3.39941 23.0996 17.2998c0 20.6006 -18.5 17.3008 -23.0996 17.3008zM484.9 186.8l39.1992 -0.0996094l-7.39941 -8.2998
+v-85.2002h-21.2998c-4 12.7002 -44.8008 45 -48.5 55.5996h-0.300781v-47.3994l7.40039 -8.2002h-39l7.2002 8.2998v76.9004l-7.40039 8.5h31.6006c2.89941 -9.40039 39.7998 -36.5 45.1992 -50.9004h0.300781v42.5zM378.2 282.9
+c32.7002 -1.60059 33.7998 -29.8008 33.7998 -33.6006c0 -6.7002 -3.2998 -34 -36.7002 -34h-0.299805c3.59961 4.2998 3.5 11.9004 -2.2002 16.2998c1.2002 0 19.7002 -3.19922 19.7002 17.3008c0 20.6992 -18.4004 17.2998 -23.0996 17.2998v-4.2998
+c-5.40039 0.799805 -7.40039 -0.300781 -7.5 -0.300781c2.09961 1.80078 4.5 2.60059 6.09961 2.90039c-7.09961 1.59961 -13.5996 -2.40039 -14.5996 -3.5c0.799805 1.7998 2.39941 3.40039 3.5 4.5c-2.30078 -0.799805 -4.30078 -1.90039 -6.10059 -3
+c0 5.2002 0.200195 7.5 -2.89941 9.5c-9.10059 6.59961 -9.5 14.2002 -9.60059 14.9004c7.10059 -4.2002 7.7002 -4 39.9004 -4z" />
+    <glyph glyph-name="dev" unicode="&#xf6cc;" 
+d="M120.12 239.71c3.87012 -2.90039 5.82031 -7.25977 5.83008 -13.0596v-69.6504c0 -5.80957 -1.94043 -10.1602 -5.82031 -13.0596c-3.87988 -2.90039 -7.76953 -4.35059 -11.6494 -4.35059h-17.4502v104.47h17.4395c3.87988 0 7.77051 -1.44922 11.6504 -4.34961z
+M404.1 416c24.2002 0 43.8408 -19.5898 43.9004 -43.7998v-360.4c-0.0595703 -24.21 -19.6904 -43.7998 -43.9004 -43.7998h-360.199c-24.2002 0 -43.8408 19.5898 -43.9004 43.7998v360.4c0.0595703 24.21 19.7002 43.7998 43.9004 43.7998h360.199zM154.2 156.81
+l-0.00976562 70.9307c-0.0107422 18.8193 -11.9307 47.2793 -47.3701 47.2793h-47.3799v-165.46h46.3994c36.75 -0.0595703 48.3604 28.4404 48.3604 47.25zM254.88 245.47l0.00976562 29.5205h-63.1895c-11.1504 -0.280273 -19.9805 -9.54004 -19.71 -20.6904v-125.109
+c0.279297 -11.1602 9.55957 -19.9805 20.7197 -19.6904h62.1797v29.5703h-53.29v38.4102h32.5703v29.5693h-32.5703v38.4199h53.2803zM358.52 130.18l38.4609 144.801h-32.5801l-29.5703 -113.721l-29.71 113.721h-32.5703l38.5303 -144.801
+c10.5898 -24.6299 34.2402 -30.75 47.4395 0z" />
+    <glyph glyph-name="fantasy-flight-games" unicode="&#xf6dc;" horiz-adv-x="512" 
+d="M256 415.14l223.14 -223.14l-223.14 -223.14l-223.14 223.14zM88.3398 192.17c13.8027 -13.6836 27.3086 -27.0547 41.1299 -40.7197c20.1602 19.8799 40.46 39.8994 61.8506 60.9902c12.0596 -12.5801 24.5195 -25.5703 36.54 -38.1104
+c12.0293 11.6895 23.7393 23.0596 35.6895 34.6602c-6.99023 7.4502 -32.1494 32.8301 -35.0898 35.7793c-1.91016 1.9209 -2.29004 3.2207 -0.120117 5.35059c15.5801 15.2295 39.21 17.79 56.9805 5.09961c7.98926 -5.70996 14.2998 -11.6396 48.5098 -43.9502
+c10.8203 11.1504 22.2295 22.8506 33.5 34.6904c0.490234 0.520508 0.0996094 2.63965 -0.580078 3.37988c-0.0898438 0.100586 -37.5195 40.6006 -62.1504 59c-33.5801 25.0801 -78.3193 23.0605 -119.77 -18.6895c-84.5703 -85.1807 -94.5303 -95.4805 -96.4902 -97.4805z
+M323.16 90.5703c18.8203 18.79 80.3301 80.6396 100.5 101.5c-13.7305 13.4492 -27.1797 26.6299 -40.8604 40.0293c-20.0098 -19.7393 -40.2402 -39.6895 -61.25 -60.4199c-12.3301 12.8301 -24.8799 25.8799 -37.25 38.75
+c-1.25977 -0.689453 -1.64941 -0.80957 -1.91016 -1.06934c-10.7295 -10.7705 -21.4199 -21.5801 -32.21 -32.29c-2.22949 -2.20996 -0.519531 -3.35059 0.800781 -4.69043c10.5791 -10.7402 21.1797 -21.4502 31.7695 -32.1797
+c3.5498 -3.60059 3.54004 -3.85059 -0.139648 -7.24023c-16.8008 -15.4697 -40.8408 -16.54 -59.3203 -1.7998c-7.62012 6.08008 -11.6602 10.1797 -44.6797 42.0898c-11.5801 -11.8896 -23.3203 -23.9404 -35.3701 -36.3096
+c33.5498 -34.7607 50.8496 -53.3408 72.9297 -66.8408c28.9004 -17.6699 71.5 -14.96 106.99 20.4707zM256 448l256 -256l-256 -256l-256 256zM16 192l240 -240l240 240l-240 240z" />
+    <glyph glyph-name="penny-arcade" unicode="&#xf704;" horiz-adv-x="640" 
+d="M421.91 283.73c7.33984 -16.2705 2.29004 -5.07031 24.6299 -54.6807l-39.7305 -10.6094c13.7002 59.2295 10.6104 45.8398 15.1006 65.29zM215.82 232.62c32.5 8.99023 41.9492 -37.6396 -0.350586 -47.4297c-14.2002 -3.77051 -6.64941 -1.75 -34.8193 -9.34082
+l-4.45996 46.1904c28.3193 7.5498 19.4395 5.17969 39.6299 10.5801zM541.98 258.81c75.7998 -37.9092 98 -76.3193 97.9893 -104.47c2.10059 -78.8496 -183.3 -130.33 -399.89 -84.8301c0.540039 -13 -8.00977 -24.6494 -20.5801 -28.0195
+c-125.54 -33.54 -117.35 -31.75 -122.53 -31.7598c-14.3701 -0.0107422 -26.4102 10.8896 -27.7998 25.1992l-4.2998 44.4805c-0.0830078 0.875 -0.138672 1.72461 -0.138672 2.62109c0 11.877 7.43945 22.0293 17.9082 26.0488l-1.73926 17.8799
+c-50.2305 28.2598 -80.9004 61.8701 -80.9004 95.3701c0 72.9199 144.26 113.4 309.41 98.3701c3.02734 8.49316 10.0977 15.0625 18.8896 17.4102c96.8701 25.9092 65.3203 17.4795 135.59 36.2295c13.1602 3.50977 26.9307 -2.95996 32.6201 -15.3301zM255.14 149.7
+c20.7529 4.80176 38.666 16.9805 50.75 33.7197c21.6006 32.5898 14.1104 105.561 -42.5498 104.43c-16.04 -0.229492 -8.07031 0.890625 -186.22 -46.6494l4.34961 -44.5l20.1201 5.38965l11.1104 -114.64l-20.0205 -5.35059l4.30078 -44.5195l115.31 30.7803
+l-4.50977 44.5098l-20.5303 -5.50977l-2.45996 23.5498l48.4404 12.9102zM454.32 133.08l108.55 28.96l-4.2998 44.4795l-20.79 -5.55957l-66.6699 145.47c-70.5801 -18.8301 -42.2305 -11.25 -135.591 -36.2393l4.2002 -44.4805l17.1504 4.55957l-33.0801 -126.47
+l-20.9902 -5.58984l4.45996 -44.4297l112.851 30.0693l-4.05078 39.54l-19.1992 -5.12012l4.09961 17.54l57.7598 15.4209l6.61035 -14.6807l-14.9004 -3.97949z" />
+    <glyph glyph-name="wizards-of-the-coast" unicode="&#xf730;" horiz-adv-x="640" 
+d="M219.19 102.31c7.44922 5.80078 16.2598 0.680664 21.7295 -7.0791c7.08984 -10.1201 6.24023 -18.1602 -0.259766 -23.04c-7.62012 -6.24023 -17.0898 0.129883 -21.7305 6.5498c-10.8096 15.1299 -1.63965 22.1895 0.260742 23.5693zM555.94 26.3701
+c1.30957 4.4502 3.92969 10.21 3.93945 20.1699c0 34.04 -41.6299 64.4102 -100.03 68.0801c-53.1592 3.39941 -120.46 -15.4502 -184.35 -73.8506l-0.790039 0.260742c1.58008 10.4697 -0.780273 16.2295 -3.40039 21.21l0.260742 1.56934
+c64.4199 51.3203 134.069 66.5107 188.8 60.4902c61.0098 -6.54004 104.479 -39.54 101.34 -78.0303c-0.790039 -9.68945 -2.88965 -15.71 -4.97949 -19.8994c-1.34082 -1.66992 -1.13086 -1.7002 -0.790039 0zM392.28 207.58
+c-0.530273 7.07031 3.13965 11.7803 6.7998 15.46c3.66992 3.91992 14.9297 10.4697 14.9297 10.4697s-1.2998 -26.4502 -2.08984 -29.8496c-1.04004 -3.92969 -4.96973 -6.81055 -10.4697 -6.5498c-4.98047 0.259766 -8.37988 3.39941 -9.16992 10.4697zM342.26 358.68
+c147.17 0 275.48 -86.6797 291.21 -196.939c0 0 -3.66992 -1.31055 -9.68945 -4.4502c0 -0.259766 1.0498 -10.7402 0.259766 -16.5c-0.259766 -1.83008 -1.0498 -1.0498 -1.0498 0c-0.270508 5.24023 -1.57031 11.5303 -2.36035 14.9297
+c-4.70996 -2.60938 -10.21 -6.54004 -15.9697 -11.7793c0 0 4.70996 -10.21 4.70996 -25.9209c0 -21.21 -8.37988 -32.9893 -16.5 -37.9697l-0.259766 0.520508c9.16992 9.16992 12.5693 21.4795 12.5693 31.9492c0 13.8701 -6.80957 33.25 -14.3994 41.3701
+c0 0 4.4502 -8.12012 6.80957 -17.8096c0 0 -21.21 -21.4697 -26.9697 -62.3203c0 0 -3.66992 9.16992 -10.7402 16.2402c0 0 12.0498 -15.4502 12.0498 -38.2305c0 -19.3799 -12.8398 -37.4395 -27.5 -48.1797c-0.989258 0 -0.790039 -0.169922 -0.790039 0.790039
+c15.71 12.8301 22.2607 28.0205 22.2607 46.3506c0 38.2295 -49.2305 80.3896 -130.15 80.3896c-96.1104 0 -181.74 -58.1299 -236.99 -128.05l-1.0498 0.259766c-40.3203 120.979 -135.64 185.66 -196.13 202.16c-2.09961 0.519531 -1.83984 0.790039 -0.790039 1.30957
+c12.3096 14.4004 136.96 151.88 341.47 151.88zM243.02 69.0596c16.8408 14.5908 4.99023 30.7705 4.71094 31.1602c-4.08008 5.99023 -16.3105 16.8506 -31.1602 5.5c-10.9502 -8.37988 -11.6406 -22.8896 -4.19043 -32.4697
+c6.44043 -8.26953 19.5801 -13.1797 30.6396 -4.19043zM245.11 205.49l1.83008 -8.11035l-3.6709 4.4502l-14.1396 -26.71l24.6201 -28.7998l12.5703 6.01953l-11.7803 70.96zM263.7 87.9102c3.41016 2.35938 7.33984 4.97949 9.67969 6.57031l-0.259766 0.259766
+c-1.56055 -0.780273 -3.11035 -1.0498 -12.5703 15.9697v0.259766c6.87012 5.16016 8.45996 4.89062 11.5205 5.5l0.259766 0.260742c-1.31055 3.66992 -1.31055 3.66992 -1.83008 5.5h-0.259766c-3.95996 -3.31055 -1.4707 -1.58008 -11.5205 -7.86035h-0.259766
+c-1.83008 3.13965 -4.19043 7.33008 -5.75977 9.68945v1.31055c4.4502 3.91992 10.2197 6.7998 12.3096 7.58984c2.87988 1.0498 4.19043 0.520508 5.24023 0.259766l0.259766 0.520508c-1.30957 1.83008 -2.08984 2.87988 -3.39941 4.70996l-0.520508 0.259766
+c-9.9502 -5.5 -17.54 -9.9502 -25.3994 -15.71l0.259766 -0.519531c1.30957 0.259766 3.13965 -0.260742 4.4502 -2.62012c15.04 -25.0801 19.5898 -27.5908 17.54 -31.6904zM318.96 120.38v0.25c-1.99023 0 -2.34961 -1.37012 -14.6602 30.6396v0.260742
+c4.95996 1.85938 8.78027 4.37988 12.3105 2.62012l0.259766 0.519531l-3.13965 4.98047l-0.520508 0.259766c-2.22949 -0.929688 -20.4697 -8.00977 -27.7598 -12.5703l-0.259766 -0.519531l1.0498 -5.76074h0.519531c1.0498 3.68066 9.7998 7.33008 9.9502 7.33008
+l0.259766 -0.259766c12.9404 -29.7598 13.0703 -29.8799 11.7803 -32.4697l0.259766 -0.259766c3.93066 2.09961 6.81055 3.40918 9.9502 4.97949zM363.73 136.88c-0.780273 0.520508 -2.09082 1.31055 -2.63086 3.92969c-1.56934 6.02051 -4.70996 20.1709 -6.2793 26.4502
+c-0.530273 1.57031 -0.530273 3.14062 0.519531 4.4502l-0.259766 0.259766c-3.41016 -0.529297 -6.29004 -1.30957 -10.7402 -2.35938v-0.260742c1.57031 -0.529297 2.10059 -2.09961 2.62012 -3.92969l2.62012 -9.42969l-0.259766 -0.259766
+c-3.40039 -1.05078 -8.90039 -2.62012 -12.8301 -3.93066h-0.259766c-0.780273 2.10059 -1.83008 5.75977 -3.14062 9.69043l0.259766 4.70996l-0.259766 0.259766c-4.71973 -1.30957 -7.59961 -2.34961 -10.7402 -3.40039v-0.519531
+c1.05078 0 2.10059 -1.30957 2.62012 -3.13965c1.0498 -3.40039 8.12012 -24.0908 9.16992 -27.2305c0.790039 -2.09961 0.790039 -3.66992 -0.259766 -4.97949l0.259766 -0.260742c3.14062 1.31055 6.54004 2.87988 10.21 3.93066v0.519531
+c-1.0498 0.259766 -2.08984 0.780273 -2.87988 3.13965c-1.0498 3.93066 -3.39941 11.2607 -4.18945 13.8809l0.259766 0.259766c3.92969 1.30957 9.42969 3.13965 12.8301 3.92969l0.259766 -0.259766c0.530273 -2.09961 2.62012 -10.2197 3.66992 -13.6201
+l-0.519531 -4.4502l0.259766 -0.259766c4.4502 1.57031 5.5 1.83008 9.69043 2.87988zM395.94 143.69c0.529297 1.8291 1.0498 3.65918 1.5791 6.04004h-0.259766c-2.0293 -4.06055 -15.0898 -5.09082 -16.2402 -4.71094l-0.259766 0.260742
+c-0.519531 3.13965 -1.83008 10.4795 -2.08984 12.5693l0.259766 0.260742c8.06055 0.899414 5.40039 1.0293 10.21 0h0.260742c0 3.40918 0.259766 3.66992 0.259766 5.23926h-0.259766c-5.98047 -2.2998 -1.2207 -0.679688 -10.7402 -2.35938l-0.259766 0.259766
+c-0.520508 3.40039 -1.31055 8.37988 -1.57031 9.9502l0.259766 0.259766c12.9004 2.41016 15.1006 0.349609 16.2402 -0.790039l0.259766 0.259766c-0.780273 2.36035 -1.0498 3.14062 -1.57031 5.5l-0.259766 0.260742
+c-4.71973 -0.260742 -15.71 -1.05078 -24.8799 -2.62012l-0.790039 -0.520508c1.83008 -0.790039 2.36035 -1.83984 2.62012 -3.66992c1.58008 -7.59961 3.41016 -18.3301 4.98047 -26.1895l-0.790039 -4.19043l0.259766 -0.259766
+c8.37988 1.83008 17.8096 3.66992 22.5195 4.18945zM406.68 188.2c3.14062 1.56934 7.33008 5.5 7.33008 5.50977c1.95996 -4.58008 0.970703 -2.70996 4.19043 -7.86035c10.1494 -0.459961 8.60938 0.0205078 20.4297 -1.0498l0.790039 4.70996
+s-4.18945 0 -5.75977 1.83008c-1.0498 1.31055 -1.31055 3.14062 -1.57031 5.5c0 2.36035 0.270508 16.5 0.790039 20.6904c0.259766 4.18945 2.08984 20.4199 2.08984 23.04c0.260742 2.62012 1.0498 8.91016 0.260742 12.0498
+c-4.82031 19.2803 -24.4307 17.8096 -50.0205 16.2402l-5.24023 -16.2402l2.62012 -2.87988c16.5498 16.5498 37.6201 4.56934 29.5898 -5.75977c-5.18945 -6.9209 -19.7393 -8.90039 -28.54 -17.0205c-6.47949 -6.49023 -12.2393 -20.9004 -5.5 -31.6904
+c6.12988 -11.0391 17.29 -9.96973 17.54 -9.94922c2.87988 0 6.55078 0.519531 11 2.87988zM443.86 166.99c0 1.83984 0.269531 4.18945 0.269531 5.25l-0.259766 0.519531c-14.3604 8.98047 -26.8604 0.919922 -28.7998 -9.9502
+c-2.83984 -16.0898 15.3594 -25.46 25.6602 -18.5898l0.519531 0.520508c0 0.259766 1.30957 4.4502 1.83008 6.2793l-0.259766 0.260742c-6.39062 -9.58008 -23.3203 -6.87012 -20.6904 10.21c1.91016 12.6602 15.3799 16.0801 21.7305 5.5zM449.63 254.72
+c0 0 4.96973 -0.790039 4.99023 -3.66016c0 -2.08984 -4.98047 -55.25 -4.98047 -55.25c-0.109375 -1.48926 -0.339844 -6.80957 -7.58984 -6.80957l-0.790039 -4.70996c18.3906 -2.83008 19.3701 -3.04004 36.9199 -7.33008l0.520508 4.70996
+c-13.0498 3.91992 -9.74023 7.37012 -4.4502 46.0898c1.09961 0.870117 8.62012 7.14062 20.6904 0.790039l11.2598 11.2598s-9.69043 8.90039 -14.9307 7.33008c-5.23926 -1.30957 -15.4492 -10.7393 -15.4492 -10.7393l1.56934 17.54
+c-8.10938 4.0498 -27.0693 7.3291 -27.7598 7.3291v-6.5498zM460.62 140.28c9.42969 -2.35059 16.2402 2.62012 18.8496 11.5195c2.08984 7.60059 -1.56934 16.7598 -10.7393 19.3799c-6.54004 2.10059 -15.7109 -0.779297 -18.8506 -10.21
+c-3.39941 -9.68945 2.62012 -18.5996 10.7402 -20.6895zM502.78 130.59c-0.780273 1.31055 -1.04004 2.10059 -0.799805 3.91016c1.22949 27.0098 1.5293 24.6602 1.0498 25.1396c-2.08984 0.790039 -5.5 2.09082 -7.58984 2.87988l-0.520508 -0.259766v-2.08984
+c-3.92969 -6.01953 -10.4795 -15.4502 -13.8799 -20.1602l-2.62012 -1.83008v-0.259766c2.08984 -0.259766 4.70996 -1.30957 6.02051 -1.57031v0.260742l0.790039 3.39941c0.789062 1.0498 2.35938 3.66992 3.66992 5.5c0.40918 0 2.25 -0.549805 7.06934 -2.35938
+c0.330078 -0.320312 0.330078 0.649414 -0.259766 -7.59082l-1.57031 -1.8291v-0.260742c1.57031 -0.519531 6.28027 -2.35938 8.64062 -2.87988zM498.07 220.41c-13.2207 -21.1504 -9.39062 -51.6006 9.66992 -52.9004c5.75977 -0.259766 9.42969 3.93066 9.68945 3.66992
+l-2.08984 -6.80957c8.91016 -4.21973 11.4404 -5.29004 17.8105 -8.63965l1.83008 4.44922c-6.14062 3.51074 -1.29004 11.25 24.6191 84.3203c-6.13965 6.45996 -10.2998 10.0596 -22.5195 20.4297l-1.83008 -3.66992c1.62988 -1.35938 6.79004 -5.00977 4.4502 -11.2598
+l-7.58984 -26.1904c-3.28027 12.79 -22.79 14.8701 -34.04 -3.39941zM527.4 141.07l2.35938 3.39941v0.520508c-3.41016 6.83008 -11.9395 7.41992 -14.6602 2.35938c-1.83984 -3.40918 0.260742 -7.06934 1.83008 -9.68945
+c1.57031 -2.87988 3.14062 -6.29004 2.08984 -8.37988c-2.31934 -4.62988 -8.94922 -0.680664 -8.37988 4.97949l-0.790039 -0.259766c-2.09961 -4.7998 -1.83008 -4.00977 -1.83008 -4.70996c3.05078 -6.09961 12.8105 -7.12988 15.4502 -0.790039
+c1.57031 3.15039 0.520508 6.80957 -1.0498 9.42969c-1.83008 3.40039 -4.18945 6.29004 -2.87988 8.37988c1.51953 2.65039 7.86035 0.470703 7.86035 -5.23926zM548.61 127.71l1.30957 3.91016l-0.259766 0.259766c-2.36035 2.08984 -8.64062 6.54004 -12.3105 8.90039
+h-0.259766l-3.13965 -3.40039v-0.259766c4.7998 -0.320312 3.37988 0.149414 6.01953 -1.83008v-0.259766c-2.62012 -4.9707 -6.0293 -11.2607 -9.16992 -17.0205l-2.08984 -1.30957l-0.259766 -0.259766l5.75977 -4.4502l0.259766 0.259766
+c-0.259766 0.530273 -0.519531 1.57031 0.790039 3.92969c2.87988 5.77051 6.28027 12.0508 8.64062 16.2402h0.259766c3.54004 -2.57031 2.49023 -1.43945 4.4502 -4.70996zM575.84 171.97l7.85059 10.46s-9.4209 18.8604 -23.04 16.5
+c-20.8408 -4.0293 -3.15039 -34.21 -2.09082 -38.2295c4.33008 -15.1299 -16.3193 -12.5605 -13.3496 5.24023l-2.87988 2.08984l-4.98047 -14.4004s11.7803 -11.2598 20.1602 -10.4697c8.12012 0.790039 13.8799 6.29004 13.8799 16.5
+c0 8.37988 -7.85938 22.7803 -7.85938 27.7598c0 6.86035 12.2695 4.75977 11.5195 -4.97949c-0.259766 -2.61035 -1.2998 -5.23047 -2.08984 -7.59082zM611.46 182.18c0.780273 -2.35938 1.57031 -1.83008 0.790039 0.270508
+c-32.4697 98.9795 -132.76 138.78 -199.8 139.83c-50.54 0.779297 -89.5605 -11.79 -131.98 -35.8799l20.6904 61.0098l-33.7803 -65.7305l-8.89941 20.9502c3.13965 1.04004 6.2793 2.08984 6.2793 2.08984l-2.62012 8.64062s-3.13965 -0.780273 -7.33008 -2.09082
+l-12.0498 28.2803l13.6201 -61.0098c-5.12012 2.55957 -19.0996 6.83008 -6.5498 19.3799l-2.62012 11c-6.97949 -2.21973 -13.2295 -3.62012 -32.21 -9.68945l-23.0801 11.5l59.1797 -42.6807l-4.70996 -2.08984l-17.2793 13.8799
+c2.23926 -5.13965 3.2998 -12.1699 4.70996 -19.6396l-28.54 -13.0898l-30.1104 36.1396l-17.2803 -9.16992l13.6201 -42.4199l-11.2598 -4.98047l94.2695 29.3301l-3.66992 -10.4697l-0.519531 3.13965l-13.0898 -3.39941l4.97949 -24.6201l-4.4502 -12.3105
+l-25.6592 30.6406l-39.8008 -10.21l18.8506 -58.9199c-60.1299 62.3994 -67.7002 66.3994 -61.7998 75.6797c2.09961 2.87988 7.85938 7.07031 7.85938 7.07031l-4.18945 7.06934c-26.7803 -18.3496 -27.8398 -19.1494 -58.4004 -42.6797l4.98047 -6.01953
+s8.12012 5.75977 13.6201 5.5c7.81934 -0.350586 1.76953 2.93945 113.659 -98.7305l11.7803 8.37988l-27.7598 93.4805l35.8799 -42.1602l-4.70996 -13.8799l41.9004 88.5098c34.6699 -80.5098 29.1494 -66.9502 32.9893 -78.8203l-33.5195 67.2998l-2.36035 -4.44922
+c1.2998 -1.30078 -0.919922 3.05957 22.7803 -59.4404c3.22949 -8.88965 -1.10059 -9.88965 -5.5 -12.8301l2.36035 -4.70996c15.3594 6.79004 22.9395 9.54004 39.0195 14.4004l-1.0498 4.97949c-8.89062 -1.33008 -10.1006 0.169922 -12.0498 4.4502
+c-1.05078 2.09961 -14.1504 40.0703 -20.4307 58.6602l-10.21 4.97949l-2.35938 8.12012l61.54 -36.6602l-13.0908 -43.21c12.1904 3.26074 27.0303 6.74023 49.4902 9.9502l-0.259766 26.71l-4.98047 -1.0498c-0.669922 -13.7998 -6.0293 -22.0801 -19.6396 -22.7803
+l22.2598 80.3906c-27.6201 -0.450195 -59.2695 -7.19043 -66.7695 -8.90039l3.92969 -16.5l-25.1396 19.6396l91.3896 20.6904l-85.6299 -9.16992c38.4902 22.5195 79.3398 39.0195 132.76 37.9697c131.46 -2.08984 180.95 -99.2402 191.95 -129.62zM203.48 295.57
+l2.35938 -8.64062c7.82031 2.61035 10.8604 2.36035 11.2598 2.36035l-9.42969 7.58984c-2.36035 -0.790039 -4.18945 -1.30957 -4.18945 -1.30957zM347.24 257.07l-11.5303 -37.71l-21.7295 17.0195c6.7998 25.5 31.6895 21.29 33.2598 20.6904zM318.43 380.93
+c224.94 0 321.83 -143.76 321.57 -227.55c0 -11 -0.269531 -17.5498 -0.790039 -19.6396c-0.259766 -2.10059 -1.0498 -0.790039 -1.0498 0.519531v9.9502c0 106.58 -121.51 223.37 -301.67 223.37c-61.2705 0 -103.69 -12.0498 -110.24 -13.8799l-1.57031 0.259766
+c-6.80957 7.58984 -12.8301 9.69043 -21.21 11.7803v0.790039c8.91016 2.34961 56.5605 14.3994 114.96 14.3994zM529.49 211.25c-8.61035 -34.4502 -13.6504 -35.3496 -18.3301 -35.3604c-7.33008 0 -6.81055 9.43066 -6.02051 14.9307
+c0.879883 9.72949 7.40039 34.6494 17.0205 33.5195c7.33008 -0.780273 8.63965 -7.33008 7.33008 -13.0898zM467.96 168.3c3.40039 -0.780273 7.84961 -4.4502 5.23047 -14.3896c-2.88086 -11.2598 -8.11035 -11.79 -11.7803 -10.7402
+c-5.5 1.31055 -7.85059 7.84961 -6.02051 14.6602c3.14062 11.2598 9.9502 11.2598 12.5703 10.4697zM491 147.35v0.270508c1.0498 1.83008 5.5 8.63965 6.5498 9.9502c-0.269531 -3.66992 -0.790039 -10.2207 -0.790039 -12.0508
+c-2.62012 0.780273 -3.92969 1.31055 -5.75977 1.83008z" />
+    <glyph glyph-name="think-peaks" unicode="&#xf731;" horiz-adv-x="576" 
+d="M465.4 38.5996l-206.2 353.801l-204.2 -352.101l-32 0.299805l236.2 407.4l206.2 -353.9l55.0996 95l32 -0.299805zM110.1 82.7002l149.601 257.899l235.8 -404.6l-32.5 0.0996094l-203.4 349.101l-117.399 -202.5h-32.1006z" />
+    <glyph glyph-name="reacteurope" unicode="&#xf75d;" horiz-adv-x="576" 
+d="M250.6 236.26l2 6.7998l-5.69922 4.30078l7.19922 0.0996094l2.30078 6.7998l2.2998 -6.7998l7.09961 -0.0996094l-5.7002 -4.30078l2.10059 -6.7998l-5.7998 4.10059zM314.3 236.26l1.90039 6.7998l-5.7002 4.30078l7.2002 0.0996094l2.2998 6.7998l2.2998 -6.7998
+l7.2002 -0.0996094l-5.7002 -4.30078l2.10059 -6.7998l-5.80078 4.10059zM223 185.76c4.90039 0 3.7998 -3.89941 3.7998 -13.7598c0 -10.2998 -6.7002 -14.0996 -16.7998 -14.0996h-0.200195c-10.0996 0 -16.7998 3.69922 -16.7998 14.0996v40.0596
+c0 9.90039 6.7002 14.1006 16.7998 14.1006h0.200195c10.0996 0 16.7998 -4.2002 16.7998 -14.1006c0 -8.39941 0.900391 -12.1992 -3.7998 -12.2998h-3.40039c-4.5 0 -3.7998 3.2998 -3.7998 10.5c0 4.7002 -2.2998 6.10059 -5.7998 6.10059
+s-5.7998 -1.40039 -5.7998 -6.10059v-36.5996c0 -4.7002 2.2998 -6.10059 5.7998 -6.10059s5.7998 1.40039 5.7998 6.10059c0 8.09961 -1 12.0996 3.7998 12.0996h3.40039zM142.3 168.36c2.5 0 3.7998 -1.30078 3.7998 -3.80078v-2.09961
+c0 -2.5 -1.2998 -3.7998 -3.7998 -3.7998h-21.8994c-2.5 0 -3.80078 1.2998 -3.80078 3.7998v59.0996c0 2.5 1.30078 3.90039 3.7002 3.80078h21.7002c2.5 0 3.7998 -1.30078 3.7998 -3.80078v-2.09961c0 -2.5 -1.2998 -3.7998 -3.7998 -3.7998h-14.4004v-18.2998h11.4004
+c2.5 0 3.7998 -1.30078 3.7998 -3.80078v-2.09961c0 -2.5 -1.2998 -3.7998 -3.7998 -3.7998h-11.4004v-19.2998h14.7002zM100.3 186.86l8.10059 -23.9004c0.799805 -2.59961 -0.400391 -4.40039 -3.2002 -4.40039h-3.2998
+c-0.0996094 -0.00683594 -0.196289 -0.0078125 -0.297852 -0.0078125c-1.95703 0 -3.59473 1.37402 -4.00293 3.20801l-7.39941 23.5h-5.60059v-22.8994c0 -2.5 -1.2998 -3.80078 -3.7998 -3.80078h-3.39941c-2.5 0 -3.80078 1.30078 -3.80078 3.80078v59.0996
+c0 2.5 1.30078 3.7998 3.80078 3.7998h13.3994c10.1006 0 16.7998 -4 16.7998 -14.0996v-11.9004c0 -6.39941 -2.69922 -10.3994 -7.2998 -12.3994zM96.5 200.86v8.69922c0 4.80078 -2.5 6.10059 -6.09961 6.10059h-5.80078v-20.9004h5.80078
+c3.59961 0 6.09961 1.2998 6.09961 6.10059zM176 222l11.2002 -59.2002c0.5 -2.7002 -0.799805 -4.09961 -3.40039 -4.09961h-3.5c-0.12207 -0.0117188 -0.241211 -0.015625 -0.366211 -0.015625c-1.98926 0 -3.61719 1.55566 -3.7334 3.51562l-1.7998 11.2998h-12.2002
+l-1.7998 -11.2998c-0.117188 -1.95996 -1.74121 -3.51855 -3.73047 -3.51855c-0.125 0 -0.248047 0.00683594 -0.370117 0.0185547h-3c-2.5 0 -3.89941 1.39941 -3.39941 4.09961l11 59.2002c0.137695 1.90625 1.72559 3.41504 3.66602 3.41504
+c0.112305 0 0.223633 -0.00488281 0.333984 -0.0146484h6.89941c0.132812 0.0136719 0.264648 0.0166016 0.401367 0.0166016c1.97168 0 3.59766 -1.49805 3.79883 -3.41699zM163.7 182.7h9.39941l-4.69922 29.7002zM253 162.5c0 -2.45996 -1.2998 -3.83984 -3.7998 -3.7998
+h-3.40039c-2.5 0 -3.7998 1.2998 -3.7998 3.7998v53.2002h-7.2998c-2.5 0 -3.7998 1.2998 -3.7998 3.7998v2.09961c0 2.5 1.2998 3.80078 3.7998 3.80078h25.7998c2.5 0 3.7998 -1.30078 3.7998 -3.80078v-2.09961c0 -2.5 -1.2998 -3.7998 -3.7998 -3.7998h-7.5v-53.2002z
+M501 163.3c0.0546875 0.00488281 0.108398 -0.03125 0.164062 -0.03125c1.01562 0 1.84082 -0.824219 1.84082 -1.83984c0 -0.0429688 -0.00195312 -0.0859375 -0.00488281 -0.128906v-0.799805c0.00195312 -0.0332031 0.00488281 -0.0664062 0.00488281 -0.100586
+c0 -0.999023 -0.811523 -1.80957 -1.81055 -1.80957c-0.0654297 0 -0.130859 0.00292969 -0.194336 0.00976562h-22.5c-0.0634766 -0.00683594 -0.126953 -0.0117188 -0.192383 -0.0117188c-0.999023 0 -1.81055 0.811523 -1.81055 1.81055
+c0 0.0341797 0.000976562 0.0683594 0.00292969 0.101562v63c-0.0107422 0.0751953 -0.0166016 0.150391 -0.0166016 0.229492c0 0.893555 0.725586 1.61914 1.61914 1.61914c0.137695 0 0.270508 -0.0166016 0.397461 -0.0488281h22.2002
+c0.0771484 0.0107422 0.155273 0.0175781 0.236328 0.0175781c0.976562 0 1.76953 -0.792969 1.76953 -1.76953c0 -0.0498047 -0.00195312 -0.0996094 -0.00585938 -0.147461v-0.800781c0.00195312 -0.0380859 0.00488281 -0.0742188 0.00488281 -0.113281
+c0 -1.04297 -0.84668 -1.88965 -1.88965 -1.88965c-0.0390625 0 -0.0771484 0.000976562 -0.115234 0.00292969h-19.1006v-25.7998h16.1006c0.0380859 0.00292969 0.0742188 0.00488281 0.113281 0.00488281c1.04297 0 1.88965 -0.84668 1.88965 -1.88965
+c0 -0.0390625 -0.000976562 -0.0771484 -0.00292969 -0.115234v-0.799805c0.00195312 -0.0380859 0.00488281 -0.0751953 0.00488281 -0.113281c0 -1.04297 -0.84668 -1.89062 -1.88965 -1.89062c-0.0390625 0 -0.0771484 0.00195312 -0.115234 0.00390625h-16.1006
+v-26.7002h19.4004zM407.9 226.2c10.0996 0 15.2998 -4.74023 15.2998 -14.1006v-40.0996c0 -9.2998 -5.2002 -14.0996 -15.2998 -14.0996h-0.800781c-10.0996 0 -15.2998 4.7998 -15.2998 14.0996v40.0996c0 9.40039 5.2002 14.1006 15.2998 14.1006h0.800781zM418.1 173.8
+v36.6006c0 7.89941 -3 11.0996 -10.5 11.0996s-10.5 -3.2002 -10.5 -11.0996v-36.6006c0 -8 3 -11.0996 10.5 -11.0996s10.4004 3.09961 10.5 11.0996zM371.6 188.3l10.6006 -27.2998c0.5 -1.2998 -0.100586 -2.2998 -1.5 -2.2998h-1.5
+c-0.0429688 -0.00292969 -0.0839844 -0.00488281 -0.12793 -0.00488281c-0.993164 0 -1.8418 0.625977 -2.17188 1.50488l-10.4004 27.2002h-11.5996v-26.9004c0.00488281 -0.0556641 0.00976562 -0.111328 0.00976562 -0.167969
+c0 -0.960938 -0.780273 -1.74023 -1.74023 -1.74023c-0.0576172 0 -0.114258 0.00292969 -0.169922 0.0078125h-1.2002c-0.0634766 -0.00683594 -0.126953 -0.0117188 -0.192383 -0.0117188c-0.999023 0 -1.81055 0.811523 -1.81055 1.81055
+c0 0.0341797 0.000976562 0.0683594 0.00292969 0.101562v63c-0.00195312 0.0332031 -0.00488281 0.0664062 -0.00488281 0.100586c0 0.999023 0.811523 1.80957 1.81055 1.80957c0.0654297 0 0.130859 -0.00292969 0.194336 -0.00976562h13.7002
+c10.0996 0 15.2998 -4.7002 15.2998 -14.1006v-9.7002c0 -7.19922 -3.09961 -11.6992 -9.2002 -13.2998zM365.2 192.2c7.5 0 10.5 3.16016 10.5 11v6.39941c0 8 -3 11.1006 -10.5 11.1006h-10.2002v-28.5h10.2002zM451.1 225.3c10.1006 0 15.3008 -4.7002 15.3008 -14.0996
+v-10.5c0 -9.2998 -5.2002 -14.1006 -15.3008 -14.1006h-10.5996v-26.0996c0.00585938 -0.0556641 0.00976562 -0.111328 0.00976562 -0.167969c0 -0.960938 -0.779297 -1.74023 -1.74023 -1.74023c-0.0566406 0 -0.113281 0.00292969 -0.169922 0.0078125h-1.19922
+c-0.0644531 -0.00683594 -0.12793 -0.0117188 -0.193359 -0.0117188c-0.999023 0 -1.80957 0.811523 -1.80957 1.81055c0 0.0341797 0.000976562 0.0683594 0.00292969 0.101562v63c-0.0107422 0.0751953 -0.0175781 0.150391 -0.0175781 0.229492
+c0 0.893555 0.726562 1.61914 1.62012 1.61914c0.136719 0 0.270508 -0.0166016 0.397461 -0.0488281h13.6992zM461.3 202.5v7.09961c0 7.90039 -3 11.1006 -10.5 11h-10.2002v-29.1992h10.2002c7.5 0 10.5 3.19922 10.5 11.0996zM259.5 140l7.09961 -0.0996094
+l-5.69922 -4.30078l2.09961 -6.7998l-5.7998 4.10059l-5.7998 -4.10059l2.09961 6.7998l-5.7002 4.30078l7.10059 0.0996094l2.2998 6.7998zM487.1 276.1c122.301 -46.0996 118.401 -132.54 -33.8984 -176.34c13.3994 -49.7002 18.0996 -101.899 0.0996094 -133.8
+c-3.7998 -6.7002 -16.7998 -27.7002 -47.5996 -27.7002c-41.5 0 -110.2 41.6006 -182.101 142c-42.7998 3.5 -72.1992 10.1006 -84.5996 13c-20.5 -82.2998 -6.7998 -125.3 15.5 -137.899c1.2002 -0.700195 38.4004 -27.2002 120.9 52.7998
+c3.39941 -3.5 6.79883 -6.90039 10.1982 -10.2002c-63.0996 -61.2002 -110.199 -71 -138.199 -55.2002c-32.4004 18.2998 -42.8008 72 -22.3008 153.9c-18.8994 5 -121.6 33.2002 -122.1 92.7998c-0.400391 40.9004 49.7998 74.7002 120.3 95
+c-13.3994 49.5996 -18.2002 101.8 -0.0996094 133.8c3.7998 6.74023 16.7998 27.7402 47.5996 27.7402c41.6006 0 110.3 -41.6396 182.2 -142.14c28.7607 -2.29492 57.1504 -6.70801 84.5996 -13c20.5 82 6.90039 125.1 -15.5 137.8
+c-1.2998 0.700195 -38.3994 27.2002 -120.899 -52.7998c-3.40039 3.5 -6.80078 6.89941 -10.2002 10.1992c52.2998 50.9404 103.7 74.6006 138.2 55.2402c33.8994 -19.2002 41.8994 -75.8994 22.2998 -153.899c12.0234 -3.14844 24.0938 -6.9873 35.5996 -11.3008z
+M135.901 411.16c-23.1006 -40.7998 1 -121.562 1.19922 -122.961c27.2979 6.86914 55.7041 11.835 84.4004 14.5996c15.5215 22.6875 32.2832 43.9033 50.7002 64.2002c3.39941 -3.33301 6.7998 -6.74609 10.2002 -10.2393
+c-15.1953 -16.6592 -29.1309 -33.958 -42.2002 -52.3994c17.9678 1.35645 34.9062 2.04102 53.2197 2.04102c13.6523 0 27.2158 -0.383789 40.6797 -1.1416c-64.5 86.6006 -126.5 126.2 -163.3 126.2c-23 0 -32 -15.2002 -34.8994 -20.2998zM440.701 -27.1406
+c3.2998 6 21.5 38.5996 -1.2002 123c-4.09961 -1.10059 -37.0996 -9.90039 -84.4004 -14.6006c-15.4961 -22.7061 -32.2598 -43.9238 -50.6992 -64.2002c-3.40039 3.2998 -6.80078 6.7002 -10.2002 10.2002c15.1943 16.6602 29.1299 33.958 42.2002 52.4004
+c-17.9014 -1.38379 -34.792 -2.08301 -53.0459 -2.08301c-13.7139 0 -27.3359 0.398438 -40.8545 1.18262c64.5996 -86.7998 126.6 -126.2 163.3 -126.2c23.1006 0 32 15.2002 34.9004 20.3008zM449.801 111.459c25.6006 7.2998 85.9004 27.4004 105.7 62.5
+c1.40039 2.5 33.5 50.5 -72.5996 90.4004c-11.1553 4.18555 -22.8525 7.92188 -34.5 11c-3.60059 -12.9004 -7.90039 -26.1006 -12.8008 -39.5c-3.71387 -0.506836 -6.9248 -2.60645 -8.89941 -5.60059l-0.100586 0.100586c-1.94824 1.84863 -4.25 3.31445 -6.7998 4.2998
+c5.7002 15 10.6006 29.7998 14.6006 44.2002c-7.2002 1.69922 -31.8008 7.59961 -72.2002 11.6992c16.7002 -24.5 27.8994 -44.0996 34.2998 -55.5c-4.18457 -1.36719 -7.79199 -3.96777 -10.4004 -7.39941c-13.5996 16.3994 -11 19.8994 -42.5 64.5
+c-16.6885 1.17285 -32.207 1.77344 -49.1914 1.77344c-21.2998 0 -42.3818 -0.9375 -63.208 -2.77344c-16.9004 -25 -28.2998 -45.2002 -34.7998 -56.9004c-4.16797 -1.77637 -7.68652 -4.69238 -10.2002 -8.39941c-1.07422 3.39844 -3.37402 6.23633 -6.40039 8
+c6.10059 11.3994 16.9004 31 32.7998 55.2998c-39.5996 -4.60059 -65 -11.2002 -72 -13c4.30078 -14.1006 9.40039 -28.6006 15.2002 -43.2998c-0.866211 -0.632812 -1.63086 -1.36328 -2.2998 -2.2002c-1.5 1.89941 -4 5.2998 -14.4004 5.2998
+c-4.69922 12.2998 -8.7998 24.5 -12.3994 36.4004c-138.8 -40.3604 -158.4 -121.36 1.5 -164c3.59961 12.8994 7.7998 26 12.7002 39.3994c0.328125 -0.0185547 0.651367 -0.0214844 0.984375 -0.0214844c2.0752 0 4.06641 0.360352 5.91504 1.02148
+c3 -1.2002 5.2002 -1 8.40039 -1c-5.5 -14.5996 -10.2002 -28.8994 -14.1006 -42.8994c23.4512 -5.42578 47.71 -9.39258 72.2002 -11.7002c-16.2998 23.8994 -27.5 43.3994 -33.7998 54.5996c8.7002 0 10.7002 1.60059 12.5996 3.2002
+c0.950195 -0.574219 1.95996 -1.08008 3 -1.5c15.3008 -26.7002 28.9004 -46.5996 36.8008 -57.7998c16.6875 -1.17285 32.2051 -1.77344 49.1895 -1.77344c21.2998 0 42.3838 0.9375 63.21 2.77344c16.5 24.2998 27.7002 44 33.9004 55.2002
+c7.2998 0 9.7998 3 10.8994 4.19922c1.82324 -1.3252 3.84766 -2.41113 6 -3.19922c-15 -28 -28.6992 -48.9004 -32.1992 -54.2002c24.4219 2.70312 48.6768 7.11816 72 13c-4.10059 13.7998 -9 27.8994 -14.7002 42.2002c2.00391 0.898438 3.81934 2.11523 5.39941 3.59961
+l0.100586 0.0996094c2.2666 -3.44043 6.1543 -5.7002 10.5781 -5.7002c0.0410156 0 0.0810547 0 0.12207 0.000976562c4.69922 -12.3008 8.7998 -24.5 12.3994 -36.4004zM335.401 225.459c0.0664062 0.00683594 0.132812 0.00878906 0.201172 0.00878906
+c1.07422 0 1.95117 -0.84668 1.99805 -1.90918v-51.5c0 -9.5 -5 -14.0996 -15.0996 -14.0996h-0.400391c-10.0996 0 -15.0996 4.5 -15.0996 14.0996v51.5c-0.00195312 0.0341797 -0.00488281 0.0664062 -0.00488281 0.100586c0 0.999023 0.811523 1.81055 1.81055 1.81055
+c0.0654297 0 0.130859 -0.00390625 0.194336 -0.0107422h1.2002c0.0742188 0.00976562 0.148438 0.0166016 0.224609 0.0166016c0.932617 0 1.69043 -0.756836 1.69043 -1.68945c0 -0.0771484 -0.00488281 -0.15332 -0.015625 -0.227539v-49.7998
+c0 -8 2.60059 -11.0996 10.1006 -11.0996s10.0996 3.2002 10.0996 11.0996v49.7998c-0.00488281 0.0566406 -0.00976562 0.111328 -0.00976562 0.168945c0 0.959961 0.779297 1.73926 1.74023 1.73926c0.0576172 0 0.114258 -0.00195312 0.169922 -0.0078125h1.2002z
+M321.701 139.999l7.09961 -0.0996094l-5.7002 -4.30078l2.10059 -6.7998l-5.7998 4.10059l-5.80078 -4.10059l2.10059 6.7998l-5.7002 4.30078l7.09961 0.0996094l2.30078 6.7998zM290.601 132.599l7.10059 -0.0996094l-5.7002 -4.2998l2.09961 -6.7998l-5.7998 4.09961
+l-5.7998 -4.09961l2.09961 6.7998l-5.69922 4.2998l7.09961 0.0996094l2.2998 6.80078zM295.701 163.399c0.0615234 0.00585938 0.12207 -0.0292969 0.185547 -0.0292969c1.00977 0 1.83008 -0.819336 1.83008 -1.83008
+c0 -0.0810547 -0.00585938 -0.162109 -0.015625 -0.241211v-0.799805c0.00390625 -0.0488281 0.0078125 -0.0966797 0.0078125 -0.145508c0 -0.977539 -0.792969 -1.77051 -1.77051 -1.77051c-0.0800781 0 -0.160156 0.00585938 -0.237305 0.015625h-22.5
+c-0.0644531 -0.00683594 -0.126953 -0.0117188 -0.193359 -0.0117188c-0.999023 0 -1.80957 0.811523 -1.80957 1.81055c0 0.0341797 0.000976562 0.0683594 0.00292969 0.101562v63c-0.00195312 0.0332031 -0.00488281 0.0664062 -0.00488281 0.100586
+c0 0.999023 0.811523 1.80957 1.80957 1.80957c0.0664062 0 0.130859 -0.00292969 0.195312 -0.00976562h22.2002c0.0771484 0.00976562 0.155273 0.0175781 0.235352 0.0175781c0.977539 0 1.77051 -0.793945 1.77051 -1.77051
+c0 -0.0498047 -0.00195312 -0.0986328 -0.00585938 -0.147461v-0.799805c0.00195312 -0.0380859 0.00488281 -0.0751953 0.00488281 -0.113281c0 -1.04395 -0.847656 -1.89062 -1.89062 -1.89062c-0.0380859 0 -0.0761719 0.000976562 -0.114258 0.00390625h-19.1006
+v-25.7998h16.1006c0.0380859 0.00195312 0.0742188 0.00488281 0.113281 0.00488281c1.04297 0 1.88965 -0.847656 1.88965 -1.89062c0 -0.0380859 -0.000976562 -0.0761719 -0.00292969 -0.114258v-0.800781
+c0.00195312 -0.0380859 0.00488281 -0.0742188 0.00488281 -0.113281c0 -1.04297 -0.847656 -1.88965 -1.89062 -1.88965c-0.0380859 0 -0.0761719 0.000976562 -0.114258 0.00292969h-16.1006v-26.6992h19.4004zM288.301 262.799l2.2998 -6.7998l7.10059 -0.0996094
+l-5.7002 -4.30078l2.09961 -6.7998l-5.7998 4.10059l-5.7998 -4.10059l2.09961 6.7998l-5.69922 4.30078l7.09961 0.0996094z" />
+    <glyph glyph-name="artstation" unicode="&#xf77a;" horiz-adv-x="512" 
+d="M2 70.5996h315.1l59.2002 -102.6h-285.399c-0.00488281 0 0.0205078 -0.0498047 0.015625 -0.0498047c-20.0742 0 -37.4736 11.5439 -45.916 28.3496zM501.8 98c19 -29.4004 -0.0996094 -55.9004 -2 -59.0996l-40.7002 -70.5l-257.3 447.6h88.4004
+c0.00390625 0 -0.0234375 0.0527344 -0.0195312 0.0527344c19.6797 0 36.79 -11.0879 45.4189 -27.3525zM275 143.5h-231l115.5 200z" />
+    <glyph glyph-name="atlassian" unicode="&#xf77b;" horiz-adv-x="512" 
+d="M152.2 211.6c66.2998 -70.7998 89.0996 -189.3 51.2002 -267.1c-2.40039 -5.2002 -7.60059 -8.5 -13.4004 -8.40039h-175c-11 0 -18.4004 11.7002 -13.4004 21.7002l125.801 251c5.09961 10.5 17.0996 11 24.7998 2.7998zM244.4 439.9
+c6.7998 10.8994 20.2998 10.6992 25.5996 0.0996094c5.90039 -11.7002 240.4 -482.3 240.4 -482.3c5 -9.90039 -2.2002 -21.7002 -13.4004 -21.7002h-174.2c-5.7002 0 -10.8994 3.2998 -13.3994 8.40039c-73.5 146.899 -187.301 302.1 -65 495.5z" />
+    <glyph glyph-name="canadian-maple-leaf" unicode="&#xf785;" horiz-adv-x="512" 
+d="M383.8 96.2998c-5 -5 -10 -7.5 -5 -22.5s10 -35.0996 10 -35.0996s-95.2002 20.0996 -105.2 22.5996c-8.89941 0.900391 -18.3994 -2.39941 -18.3994 -12.5c0 -10.0996 5.7998 -112.8 5.7998 -112.8h-30s5.7998 102.8 5.7998 112.8s-9.59961 13.4004 -18.2998 12.5
+c-10.0996 -2.5 -105.3 -22.5996 -105.3 -22.5996s5 20.0996 10.0996 35.0996c4.90039 15 0 17.5 -5.09961 22.5c-2.60059 2.5 -105.2 92.4004 -105.2 92.4004l17.5 7.59961c10 4.90039 7.40039 11.4004 5 17.4004c-2.5 7.59961 -20.0996 67.2998 -20.0996 67.2998
+s47.5996 -10 57.6992 -12.5c7.5 -2.40039 10 2.5 12.5 7.5s15 32.2998 15 32.2998s52.6006 -59.7998 55.1006 -62.2998c10.0996 -7.5 20.0996 0 17.5996 10c0 10 -27.5996 129.6 -27.5996 129.6s30.0996 -17.3994 40.0996 -22.3994c7.60059 -5 12.6006 -5 17.6006 5
+c5 7.5 42.5 79.7998 42.5 79.7998s37.5996 -72.2998 42.6992 -79.7998c5 -10 10.1006 -10 17.6006 -5c10 5 40.0996 22.3994 40.0996 22.3994s-27.5996 -119.6 -27.5996 -129.6c-2.5 -10 7.59961 -17.5 17.5996 -10c2.5 2.40039 55.1006 62.2998 55.1006 62.2998
+s12.5 -27.3994 15 -32.3994s5 -9.90039 12.5 -7.5c10 2.5 57.6992 12.5 57.6992 12.5s-17.6992 -59.7002 -20.0996 -67.3008c-2.40039 -5.89941 -5 -12.5 5 -17.3994l17.5 -7.5s-102.7 -89.9004 -105.2 -92.4004z" />
+    <glyph glyph-name="centos" unicode="&#xf789;" 
+d="M289.6 350.5l31.6006 -31.7002l-76.2998 -76.5v108.2h44.6992zM127.2 318.8l31.5996 31.7002h44.7002v-108.2zM168.7 360.4l55.5 55.5996l55.5 -55.5996h-44.7002v-127.9l-10.7998 -10.7998l-10.7998 10.7998v127.9h-44.7002zM194.9 192.3l-10.8008 -10.7998h-128.6
+v-44.7998l-55.5 55.5996l55.5 55.6006v-44.8008h128.6zM274.2 213l76.2998 76.5l31.5996 -31.7002v-44.7998h-107.899zM447.5 192.3l-55.5 -55.5996v44.7998h-127.7l-10.7998 10.7998l10.7998 10.7998h127.7v44.8008zM65.4004 271.8v78.7002h79.3994l-31.5996 -31.7002
+l90.2998 -90.5v-15.2998h-15.2998l-90.2998 90.5zM382.1 350.5v-78.7002l-31.5996 31.7002l-90.2998 -90.5h-15.2998v15.2998l90.2998 90.5l-31.6006 31.7002h78.5zM203.5 34.0996v-0.0996094h-44.7002l-31.5996 31.7002l76.2998 76.5v-108.101zM65.4004 213v44.7998
+l32.5 31.7002l76.2998 -76.5h-108.8zM382.1 112.8v-78.7002h-78.5l31.6006 31.7002l-90.2998 90.5v15.2998h15.2998l90.2998 -90.5zM382.1 171.6v-44.7998l-31.5996 -31.7002l-76.2998 76.5h107.899zM321.2 65.7998l-31.6006 -31.5996h-44.6992v108.1zM97.9004 95.0996
+l-32.5 31.7002v44.7998h108.8zM279.7 24.2002l-55.5 -55.6006l-55.5 55.6006h44.7002v127.899l10.7998 10.8008l10.7998 -10.8008v-127.899h44.7002zM113.2 65.7998l31.5996 -31.7002h-79.3994v78.7002l32.5 -31.7002l90.2998 90.5h15.2998v-15.2998z" />
+    <glyph glyph-name="confluence" unicode="&#xf78d;" horiz-adv-x="512" 
+d="M2.2998 35.7998c42.2998 66.9004 125.2 233.2 373.101 112.601c39.6992 -19.1006 83.6992 -39.9004 105.899 -50.3008c8 -3.69922 11.7002 -13.1992 8.10059 -21.2998l-50.4004 -114.1c-0.0996094 -0.100586 -0.0996094 -0.299805 -0.200195 -0.400391
+c-3.89941 -8.09961 -13.5996 -11.5996 -21.7002 -7.7002c-200.399 95.2002 -213.8 111.5 -280.899 -0.699219c0 0 -0.100586 -0.100586 -0.100586 -0.200195c-4.69922 -7.7002 -14.6992 -10 -22.3994 -5.2998l-105.9 65.1992c-7.59961 4.7002 -10 14.6006 -5.5 22.2002z
+M509.7 347.9c-42.6006 -67.5 -125.4 -232.9 -373.4 -112.9c-39.7002 19.2002 -83.7998 40 -106 50.4004c-8 3.69922 -11.7002 13.1992 -8.09961 21.2998l50.5 114.1c0.0996094 0.100586 0.0996094 0.299805 0.200195 0.400391
+c3.89941 8.09961 13.5996 11.5996 21.6992 7.7002c199.5 -94.7002 213.301 -111.7 280.601 0.899414c0.200195 0.400391 0.399414 0.700195 0.599609 1c5 7.5 15.1006 9.40039 22.6006 4.40039l105.8 -65.1006c7.59961 -4.69922 10 -14.5996 5.5 -22.1992z" />
+    <glyph glyph-name="dhl" unicode="&#xf790;" horiz-adv-x="640" 
+d="M238 146.8l22.2998 30.2002h58.7002l-22.2998 -30.2002h-58.7002zM0 165.1h86.5l-4.7002 -6.39941h-81.7998v6.39941zM172.9 177h68.1992c-5.69922 -7.7998 -24.0996 -30.2998 -57.1992 -30.2998h-100.101l41.1006 55.7998h51c5.59961 0 5.59961 -2.2002 2.7998 -5.90039
+c-2.7998 -3.69922 -7.60059 -10.2998 -10.4004 -14.0996c-1.39941 -1.90039 -4.09961 -5.5 4.60059 -5.5zM490.4 183.9h-62.2002l39.2998 53.3994h62.2002zM95.2998 177l-4.7002 -6.40039h-90.5996v6.40039h95.2998zM206.3 203.6
+c2.7998 3.7002 2.90039 5.90039 -2.7002 5.90039h-111.399l20.3994 27.7998h117.9c29.9004 0 37.5996 -23.5996 29.2002 -35c-6.2002 -8.39941 -13.5 -18.3994 -13.5 -18.3994h-45.6006c-8.69922 0 -6 3.5 -4.59961 5.5c2.7998 3.7998 7.5 10.3994 10.2998 14.1992zM0 146.8
+v6.40039h77.7998l-4.7002 -6.40039h-73.0996zM323 146.8c0 0 22.2002 30.2002 22.2998 30.2002h58.7002l-22.2998 -30.2002h-58.7002zM545 146.7l4.7002 6.39941h90.2998v-6.39941h-95zM567.3 177h72.7002v-6.40039h-77.4004zM553.8 158.7l4.7002 6.39941h81.5v-6.39941
+h-86.2002zM389.6 237.3h58.7002l-39.2998 -53.3994h-143.6l39.2998 53.3994h58.7002l-22.5 -30.5996h26.1992zM423.1 177h133.4l-22.2998 -30.2998h-94.2998c-24.1006 0 -30.6006 11.5996 -23.2002 21.5996c2.09961 2.7998 6.39941 8.7002 6.39941 8.7002z" />
+    <glyph glyph-name="diaspora" unicode="&#xf791;" horiz-adv-x="512" 
+d="M251.64 93.4502c-1.39941 0 -88 -119.9 -88.6992 -119.9c-0.700195 0 -86.6006 60.4502 -86.9404 61.2002s86.5996 125.7 86.5996 127.4c0 2.19922 -129.6 44 -137.6 47.0996c-1.2998 0.5 31.4004 101.8 31.7002 102.1c0.599609 0.700195 144.399 -47 145.5 -47
+c0.399414 0 0.899414 0.600586 1 1.30078c0.399414 2 1 148.6 1.7002 149.6c0.799805 1.2002 104.5 0.700195 105.1 0.299805c1.5 -1 3.5 -156.1 6.09961 -156.1c1.40039 0 138.7 47 139.301 46.2998c0.799805 -0.900391 31.8994 -102.2 31.5 -102.6
+c-0.900391 -0.900391 -140.2 -47.1006 -140.601 -48.8008c-0.299805 -1.39941 82.7998 -122.1 82.5 -122.899s-85.5 -63.5 -86.2998 -63.5c-1 0.200195 -89 125.5 -90.9004 125.5h0.0400391z" />
+    <glyph glyph-name="fedex" unicode="&#xf797;" horiz-adv-x="640" 
+d="M586 163.5l54 -60.5h-64.4004l-22.2998 25l-22.0996 -25h-212.2v11.9004h-0.5c-7.90039 -11.7002 -20.7998 -18.6006 -34.9004 -18.6006c-32.6992 0 -56.3994 26.4004 -60.0996 56.9004h-85.5c0 -23.5 31.0996 -35.5 45.7998 -14.6006h42
+c-27.5996 -67.6992 -130.2 -49.3994 -130.2 23.7002c0 6.40039 0.800781 12.5 2.30078 18.2002h-48.9004v-77.5h-49v184.4h109v-41.1006h-60v-26.2002h54.7998v-24.1992c24.5 43.5996 103.9 45.3994 121.9 -14c7.5 25.5 28.8994 44.8994 57.2998 44.8994
+c13.9004 0 25.7998 -3.7998 35.4004 -14.7998h0.5v75.5h151.199v-48.0996h-56.0996v-16h118.7l22.5 -24.8008l21.7002 24.8008h62.3994zM139.3 180.1h46.5c-4.7998 25.6006 -40.3994 26.3008 -46.5 0zM292.7 131.2c34.5 0 32.5996 62.7998 0 62.7998
+c-34 0 -34.6006 -62.7998 0 -62.7998zM460.5 112.1v29.6006h-56.0996v44.7002h56.0996v28.0996h-55.5v33.9004h56.0996v30.1992h-95v-166.5h94.4004zM414.6 151.9h56.1006v-45.6006l50.7002 57l-50.7002 57v-44h-56.1006v-24.3994zM553.2 141.6l26.2998 -29.5h40.5
+l-46 51.4004l45.4004 51h-38.5l-25.6006 -29.2998l-26.5996 29.2998h-39.7002l45.5996 -51.2002l-45.5996 -51.2002h38.0996z" />
+    <glyph glyph-name="fedora" unicode="&#xf798;" 
+d="M225 416c123.7 -0.299805 223.7 -100.9 223.4 -224.6c-0.300781 -123.7 -100.9 -223.7 -224.601 -223.4l-170.2 0.400391c-29.582 0 -53.6006 24.0117 -53.6006 53.5938c0 0.102539 0 0.204102 0.000976562 0.305664l0.400391 170.3
+c0.399414 123.7 100.899 223.7 224.6 223.4zM394.8 258.8c-0.0947266 7.71387 -1.06445 15.1934 -2.7998 22.4004l-55.2002 56.0996v-1.59961c0 -5.10059 -1.5 -9.60059 -3.7998 -14.2998zM331 353.7c1.94141 -2.71777 3.39453 -5.85449 4.2002 -9.2002l54.2998 -54.5996
+c-9.56543 28.6953 -30.9629 51.8848 -58.5 63.7998zM118.1 200.8c-5.54395 -0.450195 -11.0029 -1.44336 -16.1992 -2.89941l8.5 -8.5c2.04004 4.16895 4.62598 7.98535 7.69922 11.3994zM97 196.6c-4.72363 -1.31543 -9.36719 -3.08691 -13.7002 -5.19922l27 -27.2002
+c-1.51855 3.87012 -2.37598 8.09961 -2.39941 12.5l0.899414 8zM78.7998 189.2c-3.89551 -2.1748 -7.62207 -4.57227 -11.2002 -7.2002l35.3008 -35.9004c4.36133 2.17188 9.16016 3.79395 14.0996 4.7002zM63.5996 179.4
+c-3.7207 -2.78223 -7.0625 -5.89355 -10.0996 -9.40039l34.9004 -34.5996c3.2168 3.18945 6.69531 6.00781 10.5 8.5zM50.2998 167.1c-2.89941 -3.2998 -5.7998 -6.69922 -8.59961 -10.5l35.7998 -35.8994c2.11035 4.12598 4.6875 7.93262 7.7002 11.3994zM39.2998 152.8
+c-2.49414 -3.82227 -4.73926 -7.83984 -6.7002 -12l39.5 -39.7998c0.374023 5.3252 1.63574 10.4883 3.60059 15.2002zM30.5 136.5c-1.7998 -4.90039 -3.2998 -9.59961 -4.7002 -14.5l52.7002 -53.5c-3.96484 7.90234 -6.36621 16.8438 -6.7002 26.2002zM22.5996 93.5
+c0.046875 -7.56934 1.05859 -14.8945 2.90039 -21.9004l55.4004 -55.6992v1.09961c0.0429688 5.14551 1.35156 10.0322 3.59961 14.2998zM27.9004 62.7998c9.59375 -28.6787 30.9805 -51.8564 58.5 -63.7998c-1.90527 2.74219 -3.35254 5.87402 -4.2002 9.2002z
+M22.5996 99.7998l64.4004 -64.2002c2.76953 3.4707 6.08594 6.38965 9.90039 8.7002l-72.2002 72.5c-1.2793 -5.48047 -2.00293 -11.1543 -2.10059 -17zM275.9 151.6c32.5996 -0.0996094 32.6992 49.2002 0.199219 49.4004l-33.5996 0.0996094
+c-4.91504 0.0224609 -8.90039 4.01855 -8.90039 8.93945v0.0605469l0.100586 47c0.0996094 40.5 38.5996 60.8008 66 54.9004c15.3994 -3.90039 30.2998 8.40039 30.2998 23.9004c0 12.0996 -8.7002 22.1992 -19.9004 24c-6.37305 1.50098 -12.9639 2.30078 -19.793 2.30078
+c-0.135742 0 -0.271484 -0.000976562 -0.40625 -0.000976562c-0.143555 0 -0.277344 -0.00292969 -0.420898 -0.00292969c-57.9893 0 -105.081 -47.0303 -105.18 -104.997l-0.0996094 -56l-42.6006 0.0996094c-32.5996 0.100586 -32.6992 -49.2002 -0.0996094 -49.2998
+l33.5996 -0.0996094c4.40039 0 8.90039 -4.5 8.90039 -9l-0.0996094 -47c-0.00585938 -30.8535 -25.0527 -55.9004 -55.9062 -55.9004h-0.194336c-9.39941 0 -9.39941 1.59961 -15.7002 1.59961c-13.458 -0.209961 -24.3447 -11.1289 -24.5 -24.5996
+c0 -15.5 14.2002 -24.2002 19.9004 -24.2002c61.2998 -12.8994 125.5 33.6006 125.7 102.9l0.0996094 56zM299.4 151.9c5.48145 0.538086 10.9062 1.52637 16.0996 2.89941l-8.5 8.5c-1.78711 -4.29492 -4.37207 -8.14844 -7.59961 -11.3994zM320.4 156.1
+c4.74121 1.31738 9.38574 3.12305 13.6992 5.30078l-27 27.1992c1.51855 -3.86914 2.37598 -8.09961 2.40039 -12.5l-0.900391 -8.09961zM338.4 163.5c4 2.2002 8.09961 4.7002 11.8994 7.2002l-36.2002 35.8994c-4.09961 -2.2998 -8.7998 -3.59961 -13.6992 -4.69922z
+M353.9 173.3c3.55273 2.83594 6.87891 5.7998 10.0996 9l-34.9004 35c-3.18457 -3.22266 -6.66797 -6.04492 -10.5 -8.5zM367.1 185.6c3.0625 3.36523 5.89941 6.82812 8.60059 10.5l-35.7998 35.9004c-2.1582 -4.0957 -4.73145 -7.89746 -7.7002 -11.4004zM378.1 199.9
+c2.53027 3.79688 4.77832 7.81738 6.7002 12l-39.5 39.7998c-0.374023 -5.3252 -1.63574 -10.4893 -3.59961 -15.2002zM391.6 230.8l-53.0996 53.4004c4.25977 -7.79688 6.82422 -16.7627 7.09961 -26.2002l41.3008 -41.5c1.7959 4.61523 3.39258 9.46387 4.69922 14.2998z
+M392.6 236.4c1.25586 5.3623 2.04199 10.9189 2.30078 16.5996l-64.3008 64.7002c-2.61426 -3.74805 -5.95898 -6.85938 -9.89941 -9.2002z" />
+    <glyph glyph-name="figma" unicode="&#xf799;" horiz-adv-x="384" 
+d="M277 277.3h-85.4004v-256c-0.0273438 -47.082 -38.2617 -85.2998 -85.3506 -85.2998c-47.1055 0 -85.3496 38.2441 -85.3496 85.3496c0 47.1064 38.2441 85.3506 85.3496 85.3506h0.0507812c-47.1055 0 -85.3496 38.2441 -85.3496 85.3496
+c0 47.1064 38.2441 85.3506 85.3496 85.3506c-47.0781 0 -85.2998 38.2217 -85.2998 85.2998s38.2217 85.2998 85.2998 85.2998h170.7c47.1055 0 85.3496 -38.2441 85.3496 -85.3496c0 -47.1064 -38.2441 -85.3506 -85.3496 -85.3506zM277 277.3
+c47.0762 -0.00488281 85.2949 -38.2236 85.2998 -85.2998c0 -47.0781 -38.2217 -85.2998 -85.2998 -85.2998s-85.2998 38.2217 -85.2998 85.2998s38.2217 85.2998 85.2998 85.2998z" />
+    <glyph glyph-name="intercom" unicode="&#xf7af;" 
+d="M392 416c30.9004 0 56 -25.0996 56 -56v-336c0 -30.9004 -25.0996 -56 -56 -56h-336c-30.9004 0 -56 25.0996 -56 56v336c0 30.9004 25.0996 56 56 56h336zM283.7 333.9v-199.5c0 -19.8008 29.8994 -19.8008 29.8994 0v199.5c0 19.7998 -29.8994 19.7998 -29.8994 0z
+M209.1 341.4v-216.5c0 -19.8008 29.9004 -19.8008 29.9004 0v216.5c0 19.7998 -29.9004 19.7998 -29.9004 0zM134.4 333.9v-199.5c0 -19.8008 29.8994 -19.8008 29.8994 0v199.5c0 19.7998 -29.8994 19.7998 -29.8994 0zM59.7002 304v-134.3
+c0 -19.7998 29.8994 -19.7998 29.8994 0v134.3c0 19.7998 -29.8994 19.7998 -29.8994 0zM383.1 76.2002c14.9004 12.8994 -4.5 35.5996 -19.3994 22.7002c-63.2002 -53.9004 -213.4 -55.3008 -279.3 0c-15 12.7998 -34.4004 -9.90039 -19.4004 -22.7002
+c76.4004 -65.4004 245.3 -63 318.1 0zM388.3 169.7v134.3c0 19.7998 -29.8994 19.7998 -29.8994 0v-134.3c0 -19.7998 29.8994 -19.7998 29.8994 0z" />
+    <glyph glyph-name="invision" unicode="&#xf7b0;" 
+d="M407.4 416c22.3994 0 40.5996 -18.2002 40.5996 -40.5996v-366.801c0 -22.3994 -18.2002 -40.5996 -40.5996 -40.5996h-366.801c-22.3994 0 -40.5996 18.2002 -40.5996 40.5996v366.801c0 22.3994 18.2002 40.5996 40.5996 40.5996h366.801zM176.1 302.4
+c-0.599609 35.0996 -53.5996 34.7998 -53.6992 -0.400391c0 -15 12.1992 -27 27.0996 -27c4.2002 0.0996094 27 4 26.5996 27.4004zM332.8 71c23.7998 0 42.7002 15.2998 53.2002 52l-17.9004 6.7002c-14.2998 -39.5 -31.7998 -32.4004 -31.7998 -16.9004
+c0.299805 8.10059 0.700195 7.7002 14.9004 58.7998c26.0996 85.8008 -61.2998 113.5 -101.8 38l8.89941 40.5h-68.7998l-9.7002 -35.5996h32.2998l-19.7998 -79.4004c-16.5 -36.6992 -57.3994 -44.0996 -57.3994 -23.1992c0.299805 11.2998 -0.700195 4.5 32.8994 138.199
+h-76.3994l-9.7002 -35.5996h31.7998c-22.0996 -90.0996 -22.9004 -89.7998 -23 -104.1c0 -48.7002 63.0996 -56.1006 94.5996 -4.30078l-8.09961 -32.5h45.0996l25.8008 103.301c14.6992 59.6992 74 47.0996 59.8994 0.699219c-9.09961 -32.5996 -40.5996 -106.6 25 -106.6z
+" />
+    <glyph glyph-name="jira" unicode="&#xf7b1;" horiz-adv-x="496" 
+d="M490 206.3c8 -7.89941 8 -20.7002 0 -28.5996c-225.8 -225 137.9 136.3 -241.5 -241.7c-180.7 180.1 -109.7 109.3 -242.5 241.6c-7.90039 8 -7.90039 20.8008 0 28.7002c0 0 77 76.7998 242.5 241.7c72.0996 -71.7998 168.6 -169 241.5 -241.7zM248.5 116.3l76 75.7002
+l-76 75.7002l-76 -75.7002z" />
+    <glyph glyph-name="mendeley" unicode="&#xf7b3;" horiz-adv-x="640" 
+d="M624.6 122.8c23.1006 -22.7002 17.8008 -73.5 0 -88.2998c-36.1992 -38.9004 -100 -18.2002 -104.899 35.2002c-1 11.7002 1.09961 23 5.7002 33c47.2998 103.7 -185.9 106.1 -146.5 8.2002c0.0996094 -0.100586 0.199219 -0.200195 0.299805 -0.400391
+c26.5996 -42.5996 -6.7002 -97.2998 -58.7998 -95.2002c-52 -2.2002 -85.6006 52.4004 -58.8008 95.2002c0.100586 0.200195 0.200195 0.299805 0.300781 0.400391c39.3994 97.8994 -193.801 95.5 -146.5 -8.2002c20.3994 -44.9004 -14.1006 -93.7002 -61.2002 -87.7998
+c-61.9004 7.7998 -62.5 82.8994 -42.6006 102.6c16 16 31.8008 24.7998 53 22.5c43.3008 1 49.7002 34.9004 37.5 98.7998c-22.6992 57.5 14.5 131.601 87.4004 130.8c76.9004 -0.699219 82.7998 -82 130.9 -82c49.1992 0 53.5 81.3008 130.899 82
+c72.5 0.700195 110.2 -73.2998 87.4004 -130.8c-12.2002 -63.8994 -5.7998 -97.7998 37.5 -98.7998c18.7002 2 36.0996 -4.7998 48.3994 -17.2002zM320.7 141.9c43.5996 0 62.7998 37.7998 62.7998 62.7998c0 34.7002 -28.0996 62.7998 -62.7998 62.7998h-0.600586
+c-34.5996 0 -62.7998 -28.0996 -62.7998 -62.7998c0 -25.2998 19.4004 -62.7998 62.7998 -62.7998h0.600586z" />
+    <glyph glyph-name="raspberry-pi" unicode="&#xf7bb;" horiz-adv-x="407" 
+d="M372 215.5c28.7002 -17.2002 54.5996 -72.5996 14 -117.7c-2.59961 -14.0996 -7.09961 -24.2002 -11 -35.3994c-5.90039 -45.2002 -44.4004 -66.3008 -54.5996 -68.8008c-14.9004 -11.1992 -30.7002 -21.7998 -52.2002 -29.1992
+c-20.2002 -20.6006 -42.1006 -28.4004 -64.2002 -28.4004h-1c-22 0 -44 7.7998 -64.2998 28.4004c-21.4004 7.39941 -37.2998 18 -52.2002 29.1992c-10.0996 2.5 -48.7002 23.6006 -54.5996 68.8008c-3.90039 11.1992 -8.40039 21.2998 -11 35.3994
+c-40.5 45 -14.6006 100.5 14.1992 117.7l3.7002 6.5c-0.0996094 46.4004 21.4004 65.2998 46.5 79.7002c-7.59961 2 -15.3994 3.7002 -17.5996 13.2002c-13.1006 3.39941 -15.7998 9.39941 -17.1006 15.7998c-3.39941 2.2998 -14.7998 8.7002 -13.5996 19.7002
+c-6.2998 4.39941 -9.90039 10.0996 -8.09961 18.0996c-6.90039 7.5 -8.7002 13.7002 -5.80078 19.4004c-8.2998 10.1992 -4.59961 15.5 -1.09961 20.8994c-6.2002 11.2002 -0.799805 23.2002 16.5 21.2002c6.90039 10.0996 21.9004 7.7998 24.2002 7.7998
+c2.5 3.2998 6 6 16.5 4.7002c6.7998 6.09961 14.3994 5.09961 22.2998 2.09961c3.2002 2.5 6.09961 3.40039 8.7002 3.5c5 0.100586 9.2998 -2.89941 13.8994 -4.2998c11.3008 3.60059 13.8008 -1.39941 19.4004 -3.39941c12.2998 2.59961 16.0996 -3 22 -8.90039
+l6.90039 0.0996094c18.5996 -10.7998 27.7998 -32.7998 31.0996 -44.0996c3.2998 11.2998 12.5 33.2998 31.0996 44.0996l6.90039 -0.0996094c5.90039 5.90039 9.7002 11.5 22 8.90039c5.5 2.09961 8.09961 7 19.4004 3.39941
+c7.09961 2.2002 13.2998 8.10059 22.5996 0.799805c7.90039 2.90039 15.5 4 22.2998 -2.09961c10.5 1.2998 13.9004 -1.5 16.5 -4.7002c2.2998 0 17.2998 2.2998 24.2002 -7.7998c17.2998 2 22.7998 -10 16.5996 -21.2002c3.5 -5.2998 7.2002 -10.5996 -1.09961 -20.8994
+c2.90039 -5.7002 1.09961 -11.9004 -5.7998 -19.4004c1.89941 -8 -1.7002 -13.7002 -8.10059 -18.0996c1.2002 -11 -10.1992 -17.4004 -13.5996 -19.7002c-1.2998 -6.40039 -4 -12.5 -17.0996 -15.7998c-2.2002 -9.60059 -10 -11.2002 -17.6006 -13.2002
+c25.1006 -14.4004 46.6006 -33.2998 46.5 -79.7002zM349.8 223.5c1.5 48.7002 -36.3994 75.4004 -82.0996 67.9004c-16.7998 -2.80078 80.5996 -86.6006 82.0996 -67.9004zM306.8 130.4c24.5 15.7998 28.9004 51.5996 9.90039 80
+c-19 28.3994 -54.2998 38.5996 -78.7998 22.7998s-28.9004 -51.6006 -9.90039 -80c19 -28.4004 54.2998 -38.6006 78.7998 -22.7998zM238.9 418.7c-16.6006 -15.9004 -40.1006 -55.9004 -5.80078 -71.7998c29 23.5 63.6006 40.6992 102 53.5
+c-49.2998 -25.1006 -78 -45.3008 -93.6992 -62.6006c8.09961 -31.7002 50 -33.2002 65.3994 -32.2998c-3.09961 1.40039 -5.7998 3.09961 -6.7002 5.7998c3.80078 2.7002 17.5 0.299805 27 5.60059c-3.69922 0.699219 -5.39941 1.39941 -7.09961 4.09961
+c9 2.90039 18.7002 5.2998 24.4004 10c-3.10059 0 -6 -0.599609 -10 2.09961c8.09961 4.30078 16.6992 7.7002 23.3994 14.2002c-4.2002 0.100586 -8.7002 0.100586 -10 1.60059c7.40039 4.5 13.6006 9.5 18.7998 15c-5.7998 -0.700195 -8.2998 -0.100586 -9.69922 0.899414
+c5.59961 5.60059 12.5996 10.4004 16 17.2998c-4.40039 -1.5 -8.30078 -2.09961 -11.2002 0.100586c1.89941 4.2998 10 6.7002 14.7002 16.5996c-4.60059 -0.399414 -9.40039 -1 -10.4004 0c2.09961 8.5 5.7002 13.2002 9.2998 18.2002
+c-9.7998 0.200195 -24.5996 0 -23.8994 0.799805l6 6.10059c-9.5 2.5 -19.3008 -0.400391 -26.4004 -2.60059c-3.2002 2.5 0 5.60059 3.90039 8.7998c-8.10059 -1 -15.5 -2.89941 -22.1006 -5.39941c-3.59961 3.09961 2.2998 6.2998 5.10059 9.39941
+c-12.5 -2.2998 -17.8008 -5.59961 -23.1006 -8.89941c-3.7998 3.59961 -0.200195 6.7002 2.40039 9.7998c-9.40039 -3.5 -14.2998 -7.90039 -19.4004 -12.2998c-1.7998 2.2998 -4.39941 4 -1.2002 9.59961c-6.69922 -3.7998 -11.7998 -8.2998 -15.5 -13.2998
+c-4.19922 2.59961 -2.5 6.09961 -2.5 9.40039c-7 -5.60059 -11.3994 -11.5 -16.7998 -17.3008c-1.09961 0.800781 -2.09961 3.40039 -2.89941 7.60059zM204.5 304.1c-27.2002 0.700195 -53.4004 -19.8994 -53.4004 -31.7998
+c-0.0996094 -14.5996 21.5 -29.3994 53.6006 -29.7998c32.7998 -0.200195 53.7002 11.9004 53.7998 26.9004c0.0996094 16.8994 -29.7998 35 -54 34.6992zM81.5 316.9c9.59961 -5.2002 23.2002 -2.80078 27.2002 -5.60059
+c-0.900391 -2.59961 -3.60059 -4.39941 -6.7002 -5.7998c15.4004 -0.900391 57.4004 0.5 65.4004 32.2998c-15.7002 17.2998 -44.4004 37.6006 -93.7002 62.6006c38.3994 -12.8008 73 -30 102 -53.5c34.0996 15.8994 10.5996 55.8994 -6 71.7998
+c-0.900391 -4.2002 -1.7998 -6.7998 -2.90039 -7.60059c-5.39941 5.80078 -9.7998 11.7002 -16.7998 17.3008c0 -3.2002 1.59961 -6.80078 -2.5 -9.40039c-3.7002 5 -8.7998 9.5 -15.5 13.2998c3.2002 -5.59961 0.5 -7.2998 -1.2002 -9.59961
+c-5.09961 4.39941 -10 8.89941 -19.3994 12.2998c2.59961 -3.09961 6.19922 -6.2002 2.39941 -9.7998c-5.2998 3.2998 -10.5996 6.59961 -23.0996 8.89941c2.7998 -3.09961 8.59961 -6.2998 5.09961 -9.39941c-6.7002 2.5 -14 4.2998 -22.0996 5.39941
+c3.7998 -3.19922 7.09961 -6.2998 3.89941 -8.7998c-7.09961 2.2002 -16.8994 5.10059 -26.3994 2.60059l6 -6.10059c0.700195 -0.799805 -14.1006 -0.700195 -23.9004 -0.799805c3.5 -4.90039 7.2002 -9.7002 9.2998 -18.2002c-1 -1 -5.7998 -0.399414 -10.3994 0
+c4.7002 -9.89941 12.7998 -12.3994 14.7002 -16.5996c-2.90039 -2.10059 -6.90039 -1.60059 -11.2002 -0.100586c3.2998 -6.89941 10.3994 -11.6992 16 -17.2998c-1.40039 -1 -3.90039 -1.59961 -9.7002 -0.899414c5.2002 -5.5 11.4004 -10.5 18.7998 -15
+c-1.2998 -1.60059 -5.7998 -1.5 -10 -1.60059c6.7002 -6.5 15.2998 -9.89941 23.4004 -14.2002c-4 -2.7998 -6.90039 -2.09961 -10 -2.09961c5.7002 -4.7002 15.3994 -7.2002 24.3994 -10c-1.69922 -2.59961 -3.39941 -3.40039 -7.09961 -4.09961zM141.6 292.8
+c-45.5996 7.60059 -83.5996 -19.2002 -82.0996 -67.8994c1.5 -18.6006 98.9004 65.0996 82.0996 67.8994zM38.2002 106c21.5996 -9.5 39.0996 105.3 12.5996 98.2998c-43.8994 -24.5996 -36.2998 -79.5 -12.5996 -98.2998zM129.2 7.7998
+c14.0996 10.4004 6.39941 45.7002 -10.5 65.7002c-19.4004 22.2002 -44.6006 35.4004 -60.9004 25.5996c-10.8994 -8.19922 -12.8994 -36 2.60059 -63.3994c23 -32.6006 55.5 -35.7998 68.7998 -27.9004zM102.8 127.5c24.4004 -15.7998 59.7002 -5.59961 78.7998 22.7998
+c19 28.4004 14.6006 64.2002 -9.89941 80s-59.7998 5.60059 -78.7998 -22.7998s-14.6006 -64.2002 9.89941 -80zM205 -48c28.4004 -0.5 57.7002 24.4004 57.2002 35.4004c-0.100586 11.3994 -32 19.8994 -55.7002 18.8994c-23.5 0.600586 -59.7002 -9.2998 -59.2998 -22
+c-0.400391 -8.59961 28.3994 -33.5 57.7998 -32.2998zM263.9 76.9004v0.599609c-0.200195 29.5996 -26.8008 53.5996 -59.4004 53.4004c-32.5996 -0.200195 -59 -24.3008 -58.7998 -54v-0.600586c0.200195 -29.5996 26.7998 -53.5996 59.3994 -53.3994
+c32.6006 0.199219 59 24.2998 58.8008 54zM346.1 34.2002c18.4004 23.2002 12.2002 62 1.7002 72.2998c-15.5996 11.9004 -38 -3.2998 -58.8994 -26.5996c-18.3008 -21.1006 -28.4004 -59.6006 -15.1006 -72c12.7002 -9.60059 47 -8.30078 72.2998 26.2998zM369 107.4
+c23.7002 18.6992 31.2998 73.5996 -12.5996 98.2998c-26.4004 7 -8.90039 -107.7 12.5996 -98.2998z" />
+    <glyph glyph-name="redhat" unicode="&#xf7bc;" horiz-adv-x="512" 
+d="M341.52 162.59v-0.149414c33.6504 0 82.3408 6.93945 82.3408 47c0.219727 6.73926 0.859375 1.81934 -20.8799 96.2393c-4.62012 19.1504 -8.68066 27.8398 -42.3105 44.6504c-26.0898 13.3398 -82.9199 35.3701 -99.7295 35.3701
+c-15.6602 0 -20.2002 -20.1699 -38.8701 -20.1699c-18 0 -31.3105 15.0596 -48.1201 15.0596c-16.1406 0 -26.6602 -11 -34.7803 -33.6201c-27.5 -77.5498 -26.2803 -74.2695 -26.1201 -78.2695c0 -24.7998 97.6406 -106.11 228.47 -106.11zM429.07 193.19
+l-0.0703125 -0.0302734c4.65039 -22 4.65039 -24.3506 4.65039 -27.25c0 -37.6602 -42.3301 -58.5605 -98 -58.5605c-125.74 -0.0800781 -235.91 73.6504 -235.91 122.33v0.078125c0 6.96289 1.46289 13.6279 4.05957 19.6426
+c-45.2402 -2.26074 -103.8 -10.3301 -103.8 -62.0303c0 -84.6699 200.63 -189 359.49 -189c121.79 0 152.51 55.0801 152.51 98.5801c0 34.21 -29.5898 73.0498 -82.9297 96.2402z" />
+    <glyph glyph-name="sketch" unicode="&#xf7c6;" horiz-adv-x="512" 
+d="M27.5 285.8l78.9004 105.8l-6.90039 -130.699h-90.5zM396.3 402.3l7.10059 -133.5l-135.7 147.2zM112.2 229.7l122.6 -239.7l-224.899 261.7h91.0996zM114.2 260.9l142.1 154.1l60.4004 -65.5996l81.5 -88.5h-284zM411.5 251.8v-0.0996094h90.9004l-224.801 -261.7z
+M415.4 379l87.8994 -118.1h-90.2998l-6.09961 113.399l-0.900391 17.2998zM113.5 354.5l2.59961 47.7998l128.601 13.7002l-135.8 -147.1zM401.2 251.8l-144.9 -283.8l-102.7 200.9l-42.3994 82.8994h290z" />
+    <glyph glyph-name="sourcetree" unicode="&#xf7d3;" 
+d="M427.2 245c-0.104492 -90.2461 -59.1543 -166.747 -140.7 -193.1v-101.601c0 -7.89258 -6.40723 -14.2998 -14.2998 -14.2998h-96.4004c-7.89258 0 -14.2998 6.40723 -14.2998 14.2998v101.7c-81.501 26.3281 -140.5 102.814 -140.5 193.03v0.370117
+c0.200195 112 91.0996 202.8 203.2 202.6c112.1 0 203 -90.9004 203 -203zM155.6 245c0 -91 137.2 -89.9004 137.301 0c0 90.7998 -137.301 90.7998 -137.301 0z" />
+    <glyph glyph-name="suse" unicode="&#xf7d6;" horiz-adv-x="640" 
+d="M471.08 345.34c0 1 1.01953 0.759766 0.919922 0.660156c4.2002 -0.599609 92.2002 -13.7002 129.2 -35.2998c12.0996 -6.90039 20.7002 -21.5 34.5 -69.6006c0.700195 -2.7998 -2.7998 -5.09961 -3.60059 -5.69922
+c-26.8994 -18.8008 -56.7998 -36.6006 -145.199 21.6992c11.0996 -26.6992 10.6992 -25.0996 11 -25.5c5.39941 -2.7998 56.2998 -28.6992 81.5996 -28.1992c20.4004 0.399414 42.2002 10.3994 50.9004 15.5996c0 0 4.5 2.7002 3.19922 -2.40039
+c-0.5 -1.89941 -3.2998 -14.5996 -7 -17.6992c-1 -1 -36.5996 -28.4004 -103.1 -28c-42.7002 1 -76.7998 16.3994 -82.4004 -17.4004c-2.7998 -17.0996 6.10059 -37.5 18.9004 -55.7998h-48.5996c-15.9004 28.3994 -23.1006 68.2998 -79.8008 68.2998
+c-51.5996 0 -48.3994 -50.7002 -42.6992 -68.2998h-45.9004c-18.7998 68.7998 -69.2002 98.5996 -102.4 104.3c-74.2998 12.7998 -113 -49.2002 -87 -98.4004c23.1006 -43.5996 81.4004 -44.0996 99.7002 -20.3994c19.2002 25 3.7998 62.8994 -28.5 65.7002
+c-12.2998 1.09961 -25.2998 -4.60059 -25.5 -16.9004v-0.0595703c0 -10.9004 10 -13.8008 12 -14c7.2998 0.399414 8.90039 1.89941 11.7998 2.39941c5.2002 0.900391 16.8008 -1.7998 16.8008 -13.8994c0 -8.40039 -6.80078 -13.1006 -13.3008 -14.9004
+c-4.94922 -1.71484 -10.2754 -2.67285 -15.7998 -2.7002c-17.2002 0 -41.2002 14.7998 -41.5 42.6006c-0.200195 15.6992 7.7002 30 21.6006 39.1992c15.8994 10.5 43.5996 14.1006 69.1992 -1.59961c31.5 -19.2998 39.7002 -57.0996 31.5 -82.9004
+c-11.8994 -37.2998 -45.5996 -57.1992 -90 -53.2998c-31.5 2.7998 -60.6992 19.4004 -78.0996 44.4004c-7.45117 10.6377 -13.1357 22.7852 -16.5 35.7002c-7.12012 28.0596 0 58.0596 5.48047 71.3994c25.6992 63.6006 80.1992 97.2998 99.5996 109.7
+c100.2 61.5996 171.1 59.0996 223 57.2998c61.2998 -2.2002 126.6 -23.2998 135.7 -26.2998c0 2 0.299805 20.2998 0.299805 20.2998zM531.48 272.54c-1.10059 -33.5 39.0996 -51.5996 63.2998 -28.9004c24.3994 22.9004 9 64 -24.4004 65.2002
+c-0.464844 0.0175781 -0.910156 0.00585938 -1.37988 0.00585938c-20.3057 0 -36.8682 -16.1572 -37.5195 -36.3057zM570.08 297.84c14.0928 -0.414062 25.4199 -11.9697 25.4199 -26.1631c0 -0.34668 -0.00683594 -0.692383 -0.0195312 -1.03711
+c-0.505859 -14.0547 -12.0898 -25.3252 -26.2676 -25.3252c-14.499 0 -26.2695 11.7705 -26.2695 26.2695s11.7705 26.2705 26.2695 26.2705c0.290039 0 0.579102 -0.00488281 0.867188 -0.0146484zM574.38 269.04c15.4004 0 15.4004 15.5996 0 15.5996
+c-15.3994 0 -15.3994 -15.5996 0 -15.5996z" />
+    <glyph glyph-name="ubuntu" unicode="&#xf7df;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM300.7 347c-8.7998 -15.2002 -3.60059 -34.7002 11.7002 -43.5996c15.1992 -8.80078 34.6992 -3.5 43.5 11.6992c8.7998 15.3008 3.59961 34.8008 -11.7002 43.6006
+c-15.2002 8.7998 -34.7002 3.5 -43.5 -11.7002zM87.4004 160.1c17.5996 0 31.8994 14.3008 31.8994 31.9004s-14.2998 31.9004 -31.8994 31.9004c-17.6006 0 -31.9004 -14.3008 -31.9004 -31.9004s14.2998 -31.9004 31.9004 -31.9004zM115.5 157
+c8.7002 -32.7002 29.0996 -60.7002 56.5 -79l23.7002 39.5996c-51.5 36.3008 -51.5 112.5 0 148.801l-23.7002 39.5996c-27.4004 -18.4004 -47.9004 -46.2998 -56.5 -79.0996c22.4004 -18 22.2998 -52 0 -69.9004zM344.2 25.2998
+c15.2998 8.7998 20.5 28.2998 11.7002 43.6006c-8.80078 15.2998 -28.3008 20.5 -43.5 11.6992c-15.3008 -8.7998 -20.5 -28.2998 -11.7002 -43.5996s28.2002 -20.5 43.5 -11.7002zM344.5 94.7998c23 22.9004 38 53.9004 40.2998 88.4004l-46.0996 0.700195
+c-5.5 -62.7002 -71.9004 -100.9 -128.9 -74.4004l-22.5 -40.2998c47.7998 -23.7002 91.5 -10.7998 96.7002 -9.40039c4.40039 28.4004 33.7998 45.2998 60.5 35zM338.6 200.1l46 0.600586c-2.19922 34.5996 -17.0996 65.5996 -40.1992 88.5
+c-26.7002 -10.2998 -56.1006 6.7002 -60.5 35c-5.2002 1.39941 -48.8008 14.2998 -96.7002 -9.40039l22.5 -40.2998c57.5996 26.7998 123.5 -12.4004 128.899 -74.4004z" />
+    <glyph glyph-name="ups" unicode="&#xf7e0;" horiz-adv-x="384" 
+d="M103.2 145v123h32.5996v-141.6c-17.7002 -12.1006 -97.8994 -35.9004 -97.8994 39v102.6h32.6992v-104c0 -32.0996 27.4004 -22.5996 32.6006 -19zM4 373.18c93.5996 49.6006 259.1 61.6006 375.4 0v-220.899c0 -103.9 -75.3008 -135.2 -187.7 -184.101
+c-112.8 48.9004 -187.7 80.4004 -187.7 184.101v220.899zM362.1 152.28v216.2c-109.3 10.1992 -238.6 4 -340.899 -89.8008v-126.399c0 -86.6006 53 -113.5 170.5 -165.3c117.2 51.6992 170.399 78.6992 170.399 165.3zM152.5 259.68
+c23.7002 15.3203 104.4 31.8008 104.4 -65.5996c0 -75.9004 -47.3008 -85.7998 -71.7002 -78.5v-68.7002h-32.7002v212.8zM185.2 142.38c2 -0.799805 38.3994 -16.8994 38.3994 51c0 62 -30 53.5 -38.3994 49.2998v-100.3zM264.3 228.78
+c-0.200195 41.0996 51.2002 53.8994 79.7002 31.8994v-28.3994c-17.9004 18.2998 -47.9004 18.0996 -48.5 -2.2002c-0.700195 -26.5996 55.0996 -21.7002 53.4004 -73.2002c-1.30078 -41.5996 -47 -55 -83.2002 -33.5v30.1006
+c20.3994 -18.1006 51.3994 -18.6006 50.7998 4.89941c-0.599609 27.9004 -52.0996 23.1006 -52.2002 70.4004z" />
+    <glyph glyph-name="usps" unicode="&#xf7e1;" horiz-adv-x="576" 
+d="M460.3 206.3c-1.39941 -2.2002 -4.2998 -4.39941 -3.7998 0.100586c2.90039 11.5996 13.9004 30.5 4.40039 32c-17.8008 3.09961 -88.1006 -4.5 -88.1006 0c0 2.39941 26.7002 3.09961 37.9004 8.69922c9.39941 9.40039 10.7998 8 10.8994 8h27
+c26.9004 0 37.5 -7.5 11.7002 -48.7998zM348.2 183.7c-62.2998 -21.2002 -124.8 -54.2002 -321.2 -151.5l52.4004 245.5c185 0 335.199 5.59961 337.899 -22.6006h-196.6l30.7002 -93.2998c35 16.7998 120.899 51.7002 172.6 53.9004
+c21.7998 0.799805 30.5996 -2.90039 26.2002 -5.7998c-4.7002 -2.30078 -38 -4.90039 -102 -26.2002zM94.7002 352h454.3l-67.7002 -319.7h-423.1s402 157.3 406.399 160.2c0 0 35.7002 48 14.6006 67.7002c-6.5 6.59961 -16 6.59961 -52.4004 6.59961
+c-2.09961 19.5 -78.7998 31.5 -332.1 85.2002z" />
+    <glyph glyph-name="yarn" unicode="&#xf7e3;" horiz-adv-x="496" 
+d="M393.9 102.8c-39 -9.2998 -48.4004 -32.0996 -104 -47.3994c0 0 -2.7002 -4 -10.4004 -5.80078c-13.4004 -3.2998 -63.9004 -6 -68.5 -6.09961c-12.4004 -0.0996094 -19.9004 3.2002 -22 8.2002c-6.40039 15.2998 9.2002 22 9.2002 22
+c-8.10059 5 -9 9.89941 -9.7998 8.09961c-2.40039 -5.7998 -3.60059 -20.0996 -10.1006 -26.5c-8.7998 -8.89941 -25.5 -5.89941 -35.2998 -0.799805c-10.7998 5.7002 0.799805 19.2002 0.799805 19.2002s-5.7998 -3.40039 -10.5 3.59961
+c-6 9.2998 -17.0996 37.2998 11.5 62c-1.2998 10.1006 -4.59961 53.7002 40.6006 85.6006c0 0 -20.6006 22.7998 -12.9004 43.2998c5 13.3994 7 13.2998 8.59961 13.8994c5.7002 2.2002 11.3008 4.60059 15.4004 9.10059c20.5996 22.2002 46.7998 18 46.7998 18
+s12.4004 37.7998 23.9004 30.3994c3.5 -2.2998 16.2998 -30.5996 16.2998 -30.5996s13.5996 7.90039 15.0996 5c8.2002 -16 9.2002 -46.5 5.60059 -65.0996c-6.10059 -30.6006 -21.4004 -47.1006 -27.6006 -57.5c-1.39941 -2.40039 16.5 -10 27.8008 -41.3008
+c10.3994 -28.5996 1.09961 -52.6992 2.7998 -55.2998c0.799805 -1.39941 13.7002 -0.799805 36.3994 13.2002c12.8008 7.90039 28.1006 16.9004 45.4004 17c16.7002 0.5 17.5996 -19.2002 4.90039 -22.2002zM496 192c0 -136.9 -111.1 -248 -248 -248s-248 111.1 -248 248
+s111.1 248 248 248s248 -111.1 248 -248zM416.7 116.8c-1.7002 13.6006 -13.2002 23 -28 22.7998c-22 -0.299805 -40.5 -11.6992 -52.7998 -19.1992c-4.80078 -3 -8.90039 -5.2002 -12.4004 -6.80078c3.09961 44.5 -22.5 73.1006 -28.7002 79.4004
+c7.7998 11.2998 18.4004 27.7998 23.4004 53.2002c4.2998 21.7002 3 55.5 -6.90039 74.5c-1.59961 3.09961 -7.39941 11.2002 -21 7.39941c-9.7002 20 -13 22.1006 -15.5996 23.8008c-1.10059 0.699219 -23.6006 16.3994 -41.4004 -28
+c-12.2002 -0.900391 -31.2998 -5.30078 -47.5 -22.8008c-2 -2.19922 -5.89941 -3.7998 -10.0996 -5.39941h0.0996094c-8.39941 -3 -12.2998 -9.90039 -16.8994 -22.2998c-6.5 -17.4004 0.199219 -34.6006 6.7998 -45.7002c-17.7998 -15.9004 -37 -39.7998 -35.7002 -82.5
+c-34 -36 -11.7998 -73 -5.59961 -79.6006c-1.60059 -11.0996 3.69922 -19.3994 12 -23.7998c12.5996 -6.7002 30.2998 -9.59961 43.8994 -2.7998c4.90039 -5.2002 13.7998 -10.0996 30 -10.0996c6.7998 0 58 2.89941 72.6006 6.5c6.7998 1.59961 11.5 4.5 14.5996 7.09961
+c9.7998 3.09961 36.7998 12.2998 62.2002 28.7002c18 11.7002 24.2002 14.2002 37.5996 17.3994c12.9004 3.2002 21 15.1006 19.4004 28.2002z" />
+    <glyph glyph-name="airbnb" unicode="&#xf834;" 
+d="M224 74.8799h0.0595703c24.71 31.1797 39.5508 58.9297 45 83.1797c22.5508 88 -112.609 88 -90.0596 0c4.91992 -23.75 19.7598 -51.5098 45 -83.1797zM362.15 1.65039c35.6396 15.3496 50.1797 53.5693 37.0098 86.6396
+c-25.4902 61.6104 -78.8398 168.47 -114.84 239.09c-16.9707 33.9297 -28.0303 59.8701 -60.3701 59.8701c-33.8203 0 -43.6299 -27.3301 -59.3799 -57.4004c-4.15039 -10.3799 -100.771 -202.399 -115.87 -241.56c-17.8105 -50.0303 21.2998 -98.5205 71.2998 -91.0898
+c24.5996 2.22949 52.6201 18.8701 85.1504 54.9199c-29.2002 37.1104 -47.5 70.3096 -54.4307 99.5c-11.8799 53.9902 18.3604 100.5 73.2803 100.5c64.96 0 122.75 -69.9297 18.8496 -200c35.6309 -39.5898 77.2402 -68.7803 119.301 -50.4697zM409.15 137.77
+c0 -0.679688 16.8496 -35.6895 16.8301 -39.5791c25.2393 -69.3301 -26.7207 -130.24 -89.6104 -130.19c-11.1104 0 -53.6904 -1.37988 -112.37 62.4004c-51.7598 -56.3408 -90.6602 -62.4004 -112.37 -62.4004c-62.8896 0 -114.85 60.8604 -89.6299 130.19
+c0.889648 2.61914 11.1797 32.71 117.34 245.02c19.79 41.1201 39.1406 72.79 84.6602 72.79c49.1299 0 56.2695 -3.92969 185.15 -278.23z" />
+    <glyph glyph-name="battle-net" unicode="&#xf835;" horiz-adv-x="512" 
+d="M448.61 222.38c60.75 -36.25 71.9893 -73.8096 57.3193 -93.6895c-4.70996 -6.88086 -25.1797 -36.2402 -148 -31.6406c-21.8193 -30.3994 -45.25 -53.2695 -67.4697 -69.2695c28.54 -53.7803 54.2998 -85.0303 62.54 -91.7803c0 0 -3.44043 0.160156 -8.58008 3.37012
+c-3.2627 1.95117 -6.17871 4.31836 -8.75 7.08984c-15.6299 16.1797 -35.5195 41.9404 -55.7002 74.1201c-43.9502 -28.1104 -81.1299 -29.0996 -88.4395 -9.4502c-4.83984 10.8301 1.5293 26.5 9.05957 39.3398c-31.3203 -17.5098 -61.7002 -26.8496 -86.7002 -21.1396
+c-6.79004 1.54004 -17.6299 5.50977 -23.1992 18.2598c-4.52051 9.53027 -6.02051 24.2598 -0.150391 47.1406c9.07031 35.3398 37.5801 82.2998 47.3096 97.6992c3.75 -8.62988 -20.7793 40.1904 -26 93.1904c-89.1592 0 -110.56 -8.83984 -111.56 -9.21973
+c1.54004 2.44922 7.86035 7.26953 17.7598 9.71973c22 5.47949 54.6406 9.84961 93 11.2295c-2.38965 52.0703 15.3398 84.7705 36 81.29h0.180664c11.3291 -1.2998 21.2598 -13.5801 28.5 -25.9297c0.669922 35.2002 7.7998 65.54 25 84.0703
+c4.72949 5.14941 13.5693 12.5498 27.3994 11h0.0498047c10.5205 -0.850586 24 -6.91992 40.8398 -23.4707c25.6006 -25.0693 51.54 -71.9893 60.4805 -88.9297c37.25 -3.7002 68.7695 -12.5801 93.7695 -23.7998c32.3506 51.5898 46.4805 89.5303 48.2002 100.05
+c0.640625 -1.25 2.93066 -8.41992 -0.450195 -20.25c-6.22949 -21.6201 -18.5791 -51.7197 -36.3398 -85.2998c45.79 -23.7305 65.3203 -55.0098 52.8506 -71.3301c-3.35059 -4.94043 -12.0498 -12.5498 -38.9199 -12.3701zM370.76 116.16
+c70.4102 4.37988 79.6504 20.5703 78.5098 33.5c-1.87988 21.25 -21.1992 41.2598 -49.0596 58.8301c0.889648 -24.5605 -5.63965 -54.6201 -29.4502 -92.3301zM216.9 60.3096c-19.04 -30.46 9.19922 -39.5596 49.7998 -17.6992
+c-7 12.0898 -13.9199 24.8594 -20.6006 38.1895c-9.66992 -7.37012 -19.4395 -14.2598 -29.1992 -20.4902zM431.9 231.66c36.2598 -1.23047 29.4199 27.8496 -9.64062 51.9502c-7.22559 -12.5537 -14.7959 -24.8359 -22.7402 -36.9004
+c11.2207 -4.70996 22.0908 -9.70996 32.3809 -15.0498zM279.18 50c28.3799 18.2002 60.1689 48.1201 84.7695 85.4297c18.46 27.96 26.1494 56.0205 25.4102 79.5703c-30.5801 17.3203 -89.3604 42.7197 -167.23 57.21c0.350586 18.4805 2.08984 19.8799 2.16016 20.3301
+c13.2168 -1.61523 26.4307 -3.64844 39.3896 -6.0498c39.375 -7.36328 78.5059 -18.1924 115.34 -31.71c-15.6191 33.1494 -41.4092 47.2197 -41.5195 47.2197c1.59961 0.160156 28.1299 -6 48.8604 -43.7197c8.42676 11.2061 16.2031 22.0293 23.3301 32.4697
+c-29.96 15.46 -71.75 28.04 -116.32 30.71c-33.4502 1.99023 -61.6299 -5.38965 -81.6299 -17.8096c0.240234 -35.2607 7.66992 -98.96 34 -173.431c-16.8301 -9.12988 -17.7402 -7.87012 -18.6699 -8.25c-20.2715 48.0654 -35.623 99.999 -44.6699 152.84
+c-21.0908 -30.3994 -20.1406 -59.5 -20.1406 -59.5693c-0.919922 1.22949 -8.81934 27.4297 13.4707 64.2295c-13.5801 1.70996 -26.5508 2.9707 -38.8506 3.87988c1.57031 -33.6797 11.5703 -76.1494 31.5703 -116.069c14.8701 -29.71 35.1201 -50.3105 55.71 -61.4902
+c30.4102 17.9199 81.0498 55.6504 132.75 115.92c14.9697 -9 16.1494 -11.71 16.5098 -12c-7.91309 -10.5332 -16.2227 -20.9033 -24.9287 -31.1104c-26.1514 -30.5225 -54.2061 -58.2285 -85.0605 -84c37.5303 -3.38965 62.5303 12.1807 62.5303 12.25
+c-0.860352 -1.67969 -20.0303 -21.6797 -63.2803 -20.4092c5.5 -12.9404 10.9902 -25.0908 16.5 -36.4404zM306.579 337c-1.58008 2.4502 -39.5801 58.8496 -56.4805 54.6104c-16.8994 1.09961 -36.21 -22.9805 -38.21 -75.2803
+c21.1104 13.2402 50.1299 22.3301 94.6904 20.6699zM175.929 333.9c-3.7998 6.68945 -8.66992 12.4795 -14.4297 13.5693h-0.0898438c-24.79 1.41016 -24.75 -52.8301 -24.6699 -49.5898c13.6602 -0.00976562 27.8496 -0.410156 42.3994 -1.25977
+c-1.62012 12.6602 -2.72949 25.1699 -3.20996 37.2803zM147.869 171.9c-30.7998 -61.5098 -19.8701 -76.6104 -19.6699 -76.8203c7.38965 -15.4902 38.1299 -20.25 84.9199 4.50977c-21.9502 11.7402 -44.4902 32.6104 -65.25 72.3105zM357.929 97.0996z" />
+    <glyph glyph-name="bootstrap" unicode="&#xf836;" 
+d="M292.3 136.07c0 -42.4102 -39.7197 -41.4307 -43.9199 -41.4307h-80.8896v81.6904h80.8896c42.5605 0 43.9199 -31.9004 43.9199 -40.2598zM242.15 209.2h-74.6602v72.1797h74.6602c34.9297 0 38.4395 -20.3496 38.4395 -35.8701
+c0 -37.3096 -37.7695 -36.3096 -38.4395 -36.3096zM448 341.33v-298.66c-0.121094 -41.1553 -33.5146 -74.5488 -74.6699 -74.6699h-298.66c-41.1553 0.121094 -74.5488 33.5146 -74.6699 74.6699v298.66c0.121094 41.1553 33.5146 74.5488 74.6699 74.6699h298.66
+c41.1553 -0.121094 74.5488 -33.5146 74.6699 -74.6699zM338.05 130.14c0 21.5703 -6.64941 58.29 -49.0498 67.3506v0.729492c22.9102 9.78027 37.3398 28.25 37.3398 55.6406c0 7 2 64.7793 -77.5996 64.7793h-127v-261.33c128.229 0 139.87 -1.67969 163.6 5.70996
+c14.21 4.4209 52.71 17.9805 52.71 67.1201z" />
+    <glyph glyph-name="buffer" unicode="&#xf837;" 
+d="M427.84 67.3301l-196.5 -97.8203c-2.24707 -0.963867 -4.72266 -1.49805 -7.32129 -1.49805s-5.10156 0.53418 -7.34863 1.49805l-196.51 97.8203c-4 2 -4 5.28027 0 7.29004l47.0596 23.3799c2.25098 0.964844 4.72949 1.49805 7.33203 1.49805
+c2.60156 0 5.10742 -0.533203 7.3584 -1.49805l134.76 -67c2.24609 -0.969727 4.72168 -1.50684 7.32129 -1.50684s5.10254 0.537109 7.34863 1.50684l134.76 67c2.24902 0.964844 4.72656 1.49902 7.32715 1.49902s5.10449 -0.53418 7.35352 -1.49902l47.0596 -23.4297
+c4.0498 -1.95996 4.0498 -5.24023 0 -7.24023zM427.84 203.86c4.0498 -2.01074 4.0498 -5.29004 0 -7.31055l-196.5 -97.7998c-2.24707 -0.964844 -4.74902 -1.49902 -7.34863 -1.49902c-2.59863 0 -5.07422 0.53418 -7.32129 1.49902l-196.51 97.7998
+c-4 2.02051 -4 5.31055 0 7.31055l47.0596 23.4297c2.25098 0.964844 4.75684 1.49805 7.3584 1.49805c2.60254 0 5.08105 -0.533203 7.33203 -1.49805l134.76 -67.0801c2.24902 -0.959961 4.75 -1.49121 7.34863 -1.49121c2.59766 0 5.07227 0.53125 7.32129 1.49121
+l134.76 67.0801c2.24902 0.964844 4.75293 1.49902 7.35352 1.49902s5.07812 -0.53418 7.32715 -1.49902zM20.1602 317.58c-4.0498 1.86035 -4.0498 4.88965 0 6.74023l196.5 90.2793c2.2666 0.900391 4.76074 1.39551 7.3457 1.39551
+c2.58594 0 5.05762 -0.495117 7.32422 -1.39551l196.51 -90.2793c4 -1.85059 4 -4.87988 0 -6.74023l-196.51 -90.29c-2.26953 -0.890625 -4.76172 -1.37988 -7.3457 -1.37988s-5.05469 0.489258 -7.32422 1.37988z" />
+    <glyph glyph-name="chromecast" unicode="&#xf838;" horiz-adv-x="512" 
+d="M447.8 384c23.6006 0 42.9004 -19.0996 42.9004 -42.7002v-298.6c0 -23.6006 -19.1006 -42.7002 -42.7002 -42.7002h-149.4v42.7002h149.2v298.6h-383.8v-63.8994h-42.7002v63.8994c0 23.6006 19.1006 42.7002 42.7002 42.7002h383.8zM21.2998 64.4004
+c35.2998 0 63.9004 -28.6006 63.9004 -63.9004h-63.9004v63.9004v0zM21.2998 149.4c82.4004 -0.100586 149.4 -67 149.3 -149.4h-42.6992c0 58.9004 -47.7002 107 -106.601 107v42.4004zM213.4 0c-0.100586 106 -86.1006 192.4 -192.101 192.2v42.3994
+c129.5 -0.299805 234.3 -105.1 234.8 -234.6h-42.6992z" />
+    <glyph glyph-name="evernote" unicode="&#xf839;" horiz-adv-x="384" 
+d="M120.82 315.79c1.59961 -22.3096 -17.5508 -21.5898 -21.6104 -21.5898c-68.9297 0 -73.6396 1 -83.5801 -3.33984c-0.55957 -0.220703 -0.740234 0 -0.370117 0.370117l108.53 110.319c0.379883 0.370117 0.599609 0.219727 0.379883 -0.370117
+c-4.34961 -9.98926 -3.34961 -15.0898 -3.34961 -85.3896zM199.82 7.79004c-14.6807 37.0801 13 76.9297 52.5195 76.6201c17.4902 0 22.6006 -23.21 7.9502 -31.4199c-6.19043 -3.2998 -24.9502 -1.74023 -25.1396 -19.2002
+c-0.0507812 -17.0898 19.6699 -25 31.1992 -24.8896h0.0107422c25.1895 0 45.6396 20.4502 45.6396 45.6396v0.00976562v0.0800781c0 11.6299 -7.79004 47.2197 -47.54 55.3398c-7.71973 1.54004 -65 6.35059 -68.3496 50.5205
+c-3.74023 -16.9307 -17.4004 -63.4902 -43.1104 -69.0898c-8.74023 -1.94043 -69.6797 -7.64062 -112.92 36.7695c0 0 -18.5703 15.2305 -28.2305 57.9502c-3.37988 15.75 -9.2793 39.7002 -11.1396 62c0 18 11.1396 30.4502 25.0703 32.2002c81 0 90 -2.32031 101 7.7998
+c9.81934 9.24023 7.7998 15.5 7.7998 102.78c1 8.2998 7.79004 30.8096 53.4102 24.1396c6 -0.860352 31.9102 -4.17969 37.4795 -30.6396l64.2607 -11.1504c20.4297 -3.70996 70.9395 -7 80.5996 -57.9404c22.6602 -121.09 8.91016 -238.46 7.7998 -238.46
+c-15.9795 -114.38 -111.07 -108.85 -111.07 -108.85c-18.9492 0.230469 -54.25 9.40039 -67.2695 39.8301zM280.76 212.63c-1 -1.91992 -2.2002 -6 0.850586 -7c14.0898 -4.92969 39.75 -6.83984 45.8799 -5.53027c3.10938 0.25 3.0498 4.43066 2.47949 6.65039
+c-3.5293 21.8496 -40.8301 26.5 -49.2393 5.91992z" />
+    <glyph glyph-name="itch-io" unicode="&#xf83a;" horiz-adv-x="512" 
+d="M71.9199 413.23c19.2197 1.66992 114.32 2.76953 184.08 2.76953s116.56 -0.400391 184 -2.73047c21.7197 -12.9297 64.5195 -62.0996 64.9199 -75v-21.3398c0 -27.0596 -25.25 -50.8398 -48.25 -50.8398c-27.54 0 -50.54 22.8799 -50.54 50
+c0 -27.1494 -22.2295 -50 -49.7598 -50s-49 22.8799 -49 50c0 -27.1494 -23.5898 -50 -51.1602 -50h-0.5c-27.5703 0 -51.1602 22.8799 -51.1602 50c0 -27.1494 -21.4199 -50 -49 -50s-49.7598 22.8799 -49.7598 50c0 -27.1494 -22.9697 -50 -50.54 -50
+c-22.96 0 -48.25 23.7803 -48.25 50.8398v21.3398c0.400391 12.8906 43.2002 62.0605 64.9199 74.9609zM204.24 278.84c9.91797 -17.3369 28.5586 -28.9785 49.9453 -28.9785c0.614258 0 1.22559 0.00976562 1.83398 0.0283203c28.7109 0 44.6602 16.4502 51.7607 28.9404
+c22 -38.3398 77.8496 -38.7598 99.8496 -0.240234c13.1201 -23.0596 43.0801 -32.0996 56 -27.6602c3.57031 -37.1494 13.9004 -236.88 -17.75 -269.149c-77.6797 -18.1201 -299.76 -18.6699 -379.76 0c-31.4004 32.0195 -21.6006 229 -17.7305 269.149
+c12.8301 -4.41016 42.8301 4.52051 56 27.6602c21.9502 -38.46 77.8506 -38.1494 99.8506 0.25zM162.66 225.07l-0.0205078 -0.0703125c-52.3193 0 -65.21 -77.4502 -83.8799 -144.45c-17.2598 -62.1494 5.52051 -63.6699 33.9404 -63.7295
+c42.1494 1.56934 65.4902 32.1797 65.4902 62.79c53.6191 -8.79004 116.3 -6.43066 155.55 0c0 -30.6104 23.3398 -61.2207 65.4902 -62.79c28.4297 0.0595703 51.21 1.58008 33.9492 63.7295c-18.6494 66.9199 -31.54 144.45 -83.8701 144.45
+c-16.46 0 -31.0898 0 -49.25 -19.71c-14.6436 1.48535 -28.6113 2.24609 -43.6445 2.24609c-15.0342 0 -29.8906 -0.760742 -44.5352 -2.24609c-18.1299 19.7803 -32.75 19.7803 -49.2197 19.7803zM256 177.21l-0.0595703 -0.00976562s44.3496 -40.7598 52.3496 -55.2402
+l-29 1.16992v-25.2803c0 -1.15918 -11.6602 -0.699219 -23.3096 -0.15918c-1.99023 0 -23.3301 -1.39062 -23.3301 0.15918v25.3203l-29 -1.16992c7.96973 14.4404 52.3496 55.21 52.3496 55.21z" />
+    <glyph glyph-name="salesforce" unicode="&#xf83b;" horiz-adv-x="640" 
+d="M248.89 202.36h-26.3496c0.69043 5.15918 3.32031 14.1201 13.6396 14.1201c6.75 0 11.9707 -3.82031 12.71 -14.1201zM385.55 216.24c0.450195 0 14.1104 1.75977 14.1104 -20c0 -6.45996 -1.11035 -20 -14.1104 -20c-0.479492 0 -14.1094 -1.77051 -14.1094 20
+c0 21.7695 13.6396 20 14.1094 20zM142.33 192.48c4.2002 3.60938 15.6104 2.71973 20.9297 1.64941v-16.9395c-5.85938 -1.1709 -16.2295 -2.75 -20.9297 0.949219c-1.20996 1 -3.29004 2.27051 -3.29004 7.05078
+c-0.00976562 0.166992 -0.0205078 0.325195 -0.0205078 0.495117c0 2.75684 1.29492 5.21387 3.31055 6.79492zM640 216c0 -87.5801 -80 -154.39 -165.36 -136.43c-18.3701 -33 -70.7295 -70.75 -132.199 -41.6299c-41.1602 -96.0508 -177.891 -92.1807 -213.811 5.16992
+c-119.72 -23.8906 -178.82 138.37 -75.2695 199.279c-34.75 79.4307 22.6396 173.61 114.31 173.61c40.1748 -0.0253906 75.8613 -19.0605 98.5605 -48.7002c20.6992 21.4004 49.3994 34.8105 81.1494 34.8105c42.3398 0 79 -23.5205 98.7998 -58.5703
+c92.8203 40.6797 193.82 -28.2305 193.82 -127.54zM120.45 184.2c0 11.7598 -11.6904 15.1699 -17.8701 17.1699c-5.27051 2.11035 -13.4102 3.50977 -13.4102 8.93945c0 9.45996 17 6.66016 25.1699 2.12012c0 0 1.16992 -0.709961 1.64062 0.470703
+c0.239258 0.699219 2.35938 6.58008 2.58984 7.29004c0.0341797 0.108398 0.0527344 0.223633 0.0527344 0.34375c0 0.492188 -0.313477 0.911133 -0.75293 1.06543c-12.3301 7.63086 -40.7002 8.51074 -40.7002 -12.6992c0 -12.46 11.4902 -15.4404 17.8799 -17.1699
+c4.71973 -1.58008 13.1699 -3 13.1699 -8.7002c0 -4 -3.5293 -7.06055 -9.16992 -7.06055c-7.11328 0.0126953 -13.709 2.38281 -19 6.35059c-0.469727 0.229492 -1.41992 0.709961 -1.64941 -0.709961l-2.40039 -7.4707
+c-0.469727 -0.939453 0.230469 -1.17969 0.230469 -1.40918c1.75 -1.40039 10.2998 -6.59082 22.8193 -6.59082c13.1699 0 21.4004 7.06055 21.4004 18.1104v-0.0498047zM152.45 226.78c-10.1299 0 -18.6602 -3.16992 -21.4004 -5.18066
+c-0.260742 -0.179688 -0.431641 -0.481445 -0.431641 -0.822266c0 -0.219727 0.0722656 -0.422852 0.191406 -0.586914l2.59082 -7.06055c0.119141 -0.417969 0.504883 -0.723633 0.960938 -0.723633c0.0751953 0 0.148438 0.0078125 0.21875 0.0234375
+c0.650391 0 6.7998 4 16.9297 4c4 0 7.06055 -0.709961 9.18066 -2.35938c3.59961 -2.80078 3.05957 -8.29004 3.05957 -10.5801c-4.79004 0.299805 -19.1104 3.43945 -29.4102 -3.75977c-4.44727 -3.05078 -7.36621 -8.16895 -7.36621 -13.9639
+c0 -0.199219 0.0195312 -0.378906 0.0263672 -0.576172c0 -5.90039 1.50977 -10.4004 6.58984 -14.3506c12.2402 -8.16016 36.2803 -2 38.1006 -1.41016c1.5791 0.320312 3.5293 0.660156 3.5293 1.87988v33.8809c0.0400391 4.60938 0.320312 21.6396 -22.7793 21.6396z
+M199 247.76c0.00195312 0.0244141 0.00195312 0.0488281 0.00195312 0.0732422c0 0.613281 -0.49707 1.11035 -1.10938 1.11035c-0.0244141 0 -0.0488281 -0.00195312 -0.0722656 -0.00292969h-9.82031
+c-0.0205078 0.000976562 -0.0419922 0.000976562 -0.0634766 0.000976562c-0.612305 0 -1.10938 -0.49707 -1.10938 -1.10938c0 -0.0244141 0.000976562 -0.0478516 0.00292969 -0.0722656v-79c-0.00195312 -0.0234375 -0.00195312 -0.0478516 -0.00195312 -0.0722656
+c0 -0.613281 0.49707 -1.11035 1.10938 -1.11035c0.0214844 0 0.0419922 0.00195312 0.0625 0.00292969h9.87988c0.0244141 -0.00195312 0.0488281 -0.00292969 0.0732422 -0.00292969c0.613281 0 1.11035 0.498047 1.11035 1.11035
+c0 0.0244141 -0.00195312 0.0478516 -0.00390625 0.0722656zM254.75 218.83c-2.09961 2.30957 -6.79004 7.53027 -17.6504 7.53027c-3.50977 0 -14.1592 -0.230469 -20.6992 -8.94043c-6.35059 -7.62988 -6.58008 -18.1104 -6.58008 -21.4102
+c0 -3.12012 0.149414 -14.2598 7.05957 -21.1699c2.63965 -2.91016 9.06055 -8.22949 22.8105 -8.22949c10.8193 0 16.4697 2.34961 18.5791 3.75977c0.470703 0.240234 0.710938 0.709961 0.240234 1.87988l-2.34961 6.83008
+c-0.200195 0.430664 -0.637695 0.729492 -1.14355 0.729492c-0.0917969 0 -0.179688 -0.0107422 -0.266602 -0.0292969c-2.58984 -0.94043 -6.34961 -2.82031 -15.29 -2.82031c-17.4199 0 -16.8496 14.7402 -16.9404 16.7002h37.1709
+c0.567383 0.0117188 1.04102 0.40918 1.16992 0.939453c-0.290039 0 2.06934 14.7002 -6.09082 24.2305h-0.0195312zM291.44 166.14c13.1699 0 21.4092 7.06055 21.4092 18.1104c0 11.7598 -11.6992 15.1699 -17.8799 17.1699
+c-4.13965 1.66016 -13.4102 3.37988 -13.4102 8.94043c0 3.75977 3.29004 6.34961 8.4707 6.34961c5.98828 -0.120117 11.6924 -1.64844 16.7002 -4.22949c5.00684 -2.58203 1.17969 -0.710938 1.64941 0.469727c0.230469 0.700195 2.35059 6.58008 2.58008 7.29004
+c0.0351562 0.108398 0.0537109 0.223633 0.0537109 0.34375c0 0.492188 -0.314453 0.911133 -0.753906 1.06641c-7.91016 4.89941 -16.7402 4.93945 -20.2295 4.93945c-12 0 -20.46 -7.29004 -20.46 -17.6396c0 -12.46 11.4795 -15.4404 17.8701 -17.1699
+c6.10938 -2 13.1699 -3.26074 13.1699 -8.7002c0 -4 -3.52051 -7.06055 -9.16992 -7.06055c-7.1123 0.015625 -13.708 2.38574 -19 6.35059c-0.175781 0.150391 -0.402344 0.241211 -0.651367 0.241211c-0.535156 0 -0.973633 -0.422852 -0.999023 -0.951172
+l-2.34961 -7.52051c-0.470703 -0.939453 0.229492 -1.17969 0.229492 -1.40918c1.71973 -1.40039 10.3301 -6.59082 22.79 -6.59082h-0.0195312zM357.09 224c0 0.709961 -0.240234 1.17969 -1.17969 1.17969h-11.7598c0 0.140625 0.939453 8.94043 4.46973 12.4707
+c4.16016 4.14941 11.7598 1.63965 12 1.63965c1.16992 -0.469727 1.41016 0 1.63965 0.469727l2.83008 7.77051c0.700195 0.939453 0 1.16992 -0.240234 1.41016c-5.08984 2 -17.3496 2.86914 -24.46 -4.24023c-5.47949 -5.48047 -7 -13.9199 -8 -19.5205h-8.46973
+c-0.624023 -0.0517578 -1.12305 -0.553711 -1.16992 -1.17969l-1.41992 -7.75977c0 -0.700195 0.240234 -1.16992 1.17969 -1.16992h8.23047c-8.50977 -47.9004 -8.75 -50.21 -10.3506 -55.5205c-1.08008 -3.62012 -3.29004 -6.89941 -5.87988 -7.75977
+c-0.0898438 0 -3.87988 -1.67969 -9.63965 0.240234c0 0 -0.94043 0.469727 -1.41016 -0.709961c-0.240234 -0.709961 -2.58984 -6.82031 -2.83008 -7.53027s0 -1.41016 0.469727 -1.41016c5.11035 -2 13 -1.76953 17.8809 0
+c6.2793 2.28027 9.71973 7.88965 11.5293 12.9404c2.75 7.70996 2.81055 9.79004 11.7598 59.7393h12.2305c0.626953 0.0517578 1.12891 0.553711 1.17969 1.18066zM410.48 208c-0.560547 1.67969 -5.10059 18.1104 -25.1709 18.1104c-15.25 0 -23 -10 -25.1592 -18.1104
+c-1 -3 -3.18066 -14 0 -23.5195c0.0898438 -0.300781 4.40918 -18.1201 25.1592 -18.1201c14.9502 0 22.9004 9.60938 25.1709 18.1201c3.20996 9.60938 1.00977 20.5195 0 23.5195zM455.88 224.7c-5 1.64941 -16.6201 1.89941 -22.1104 -5.41016v4.46973
+c0.00195312 0.0214844 0.00195312 0.0419922 0.00195312 0.0634766c0 0.612305 -0.49707 1.11035 -1.10938 1.11035c-0.0244141 0 -0.0478516 -0.00195312 -0.0722656 -0.00390625h-9.39941c-0.0244141 0.00195312 -0.0488281 0.00292969 -0.0732422 0.00292969
+c-0.612305 0 -1.11035 -0.498047 -1.11035 -1.11035c0 -0.0214844 0.00195312 -0.0410156 0.00292969 -0.0625v-55.2793c-0.000976562 -0.0214844 -0.00195312 -0.0419922 -0.00195312 -0.0634766c0 -0.618164 0.501953 -1.11914 1.12012 -1.11914
+c0.0214844 0 0.0410156 0.000976562 0.0625 0.00195312h9.63965c0.0205078 -0.000976562 0.0410156 -0.00195312 0.0625 -0.00195312c0.618164 0 1.12012 0.501953 1.12012 1.12012c0 0.0214844 -0.00195312 0.0410156 -0.00292969 0.0625v27.7695
+c0 2.91016 0.0498047 11.3701 4.45996 15.0498c4.90039 4.90039 12 3.36035 13.4102 3.06055c0.630859 0.0107422 1.1709 0.393555 1.41016 0.939453c1.15918 2.57324 2.19629 5.28125 3.05957 8c0.0517578 0.130859 0.0800781 0.273438 0.0800781 0.422852
+c0 0.416992 -0.21875 0.783203 -0.549805 0.987305v-0.00976562zM502.69 170.6l-2.12012 7.29004c-0.470703 1.18066 -1.41016 0.709961 -1.41016 0.709961c-4.23047 -1.81934 -10.1504 -1.88965 -11.29 -1.88965c-4.63965 0 -17.1699 1.12988 -17.1699 19.7598
+c0 6.23047 1.84961 19.7607 16.4697 19.7607c0.299805 0.00683594 0.601562 0.0107422 0.90332 0.0107422c3.70605 0 7.26562 -0.587891 10.6172 -1.66113c3.35059 -1.07324 0.939453 -0.469727 1.17969 0.709961c0.939453 2.58984 1.63965 4.46973 2.58984 7.53027
+c0.230469 0.939453 -0.469727 1.16992 -0.709961 1.16992c-11.5898 3.87012 -22.3398 2.5293 -27.7598 0c-1.58984 -0.740234 -16.2305 -6.49023 -16.2305 -27.5205c0 -2.89941 -0.580078 -30.1094 28.9404 -30.1094c5.45117 0.0107422 10.6943 1.02051 15.5195 2.83008
+c0.319336 0.236328 0.527344 0.616211 0.527344 1.04395c0 0.130859 -0.0214844 0.256836 -0.0566406 0.375977v-0.0107422zM556.56 210.12c-0.799805 3 -5.36914 16.2295 -22.3496 16.2295c-16 0 -23.5195 -10.1094 -25.6396 -18.5898
+c-1.07129 -3.53906 -1.64746 -7.29199 -1.64746 -11.1787c0 -0.198242 -0.00585938 -0.383789 -0.00292969 -0.581055c0 -25.8701 18.8398 -29.4004 29.8799 -29.4004c10.8203 0 16.46 2.35059 18.5801 3.76074c0.469727 0.239258 0.709961 0.709961 0.240234 1.87988
+l-2.36035 6.83008c-0.200195 0.430664 -0.636719 0.729492 -1.14258 0.729492c-0.0927734 0 -0.180664 -0.0107422 -0.267578 -0.0302734c-2.58984 -0.939453 -6.34961 -2.81934 -15.29 -2.81934c-17.4199 0 -16.8496 14.7402 -16.9297 16.7002h37.1602
+c0.569336 0.0136719 1.04395 0.40918 1.17969 0.939453c-0.239258 0.00976562 0.94043 7.07031 -1.41016 15.54v-0.00976562zM533.27 216.47c5.11035 0 11.8506 -2.2002 12.7305 -14.1201h-26.3701c0.639648 5.12012 3.31055 14.1201 13.6396 14.1201z" />
+    <glyph glyph-name="speaker-deck" unicode="&#xf83c;" horiz-adv-x="512" 
+d="M213.86 152h-113.86c-55.1914 0 -100 44.8086 -100 100s44.8086 100 100 100h132.84c22.0771 0 40 -17.9238 40 -40s-17.9229 -40 -40 -40h-134.84c-26.4697 0 -26.4502 -40 0 -40h113.82c55.1914 0 100 -44.8086 100 -100s-44.8086 -100 -100 -100h-171.82
+c-22.0762 0 -40 17.9238 -40 40s17.9238 40 40 40h173.86c26.4795 0 26.46 40 0 40zM298 32c26.7314 18.1455 45.667 46.8174 51.1104 80h64.5498c10.8652 0.0927734 19.6572 8.94238 19.6572 19.8291c0 0.0585938 0.00292969 0.113281 0.00292969 0.170898v120v0.173828
+c0 10.8867 -8.79492 19.7334 -19.6602 19.8262h-117.24c9.34473 10.6875 15.0088 24.6729 15.0088 39.9697c0 15.2979 -5.66406 29.3428 -15.0088 40.0303h136.93c43.4404 0 78.6504 -35.8203 78.6504 -80v-160c0 -44.1797 -35.21 -80 -78.6504 -80h-135.35z" />
+    <glyph glyph-name="symfony" unicode="&#xf83d;" horiz-adv-x="512" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM389.74 296.46c15.3496 0.540039 19.7695 15.4404 19.5195 23.1299c-0.639648 18.0605 -19.6699 29.46 -44.8301 28.6504
+c-1.89941 -0.0703125 -65.2598 3.46973 -102.43 -105.53c-10.0596 8.29004 -57.7695 65.1602 -110.58 25.8096c-18.9502 -14.1797 -31.4199 -47.9199 -2.9502 -79.6699c16.9502 -18.1396 26.7207 -25.3301 22.25 -39.8496c-9.14941 -29.79 -55.5596 -16.1602 -51 -1.38965
+c1.36035 4.38965 3.49023 4.46973 6.28027 13.0693c7.74023 25.3203 -27.1104 37.75 -34.6201 13.6006c-4.32031 -14.0605 2.37988 -39.5107 38.3799 -50.6201c42.1602 -12.96 77.8203 10.0098 82.8799 39.9395c3.2002 18.75 -5.29004 32.6904 -20.7998 50.6201l-12.6299 14
+c-7.66016 7.7002 -10.29 20.7002 -2.37012 30.7002c6.69043 8.45996 16.2002 12.0605 31.8105 7.83008c22.7695 -6.16992 32.9199 -21.9697 49.8496 -34.7197c-1.23047 -4 -10.04 -32.3398 -18.2305 -82c-12.1094 -63.4902 -21.3496 -98.3506 -45.3496 -118.351
+c-4.83984 -3.48926 -11.7598 -8.63965 -22.1797 -9c-1.94043 -0.0595703 -14.1406 2.83984 -2.0498 12.5508c15.2393 8.3291 7.00977 34.75 -14.8809 34c-9.85938 -0.330078 -24.8691 -9.59082 -24.3096 -26.5908c0.580078 -17.5293 16.9297 -30.6895 41.5801 -29.8398
+c13.1797 0.44043 42.5801 5.7998 71.5801 40.2598c39.8496 46.7207 47.4395 102.2 58.2002 161.721c51.6797 -6.11035 77.2393 17.8398 77.5996 35.7002c0.549805 24.2998 -28 23.46 -32 5.2998c-1.91992 -8.83984 13.4199 -16.8105 1.41992 -24.5605
+c-8.49023 -5.5 -23.71 -9.37012 -45.1396 -6.21973c10.2998 56.8496 19.1094 112.56 58.8896 113.85c2.70996 0.150391 12.6396 -0.119141 12.8701 -6.66992c0.150391 -5.41016 -6.7998 -9.66992 -6.53027 -18.8496c0.370117 -10.4199 8.2998 -17.2803 19.7705 -16.8701z
+" />
+    <glyph glyph-name="waze" unicode="&#xf83f;" horiz-adv-x="512" 
+d="M502.17 246.33c14.5205 -85.8604 -30.9395 -167.92 -113.17 -208.13c13 -34.1006 -12.4004 -70.2002 -48.3203 -70.2002c-27.5918 0.0214844 -50.1543 21.752 -51.5693 49c-6.44043 -0.19043 -64.2002 0 -76.3301 0.639648
+c-1.11328 -27.5479 -23.8281 -49.5713 -51.6475 -49.5713c-0.725586 0 -1.41504 -0.0175781 -2.13281 0.0117188c-33.8604 1.36035 -57.9502 34.8398 -47 67.9199c-37.21 13.1104 -72.54 34.8701 -99.6201 70.7998c-13 17.2803 -0.479492 41.7998 20.8398 41.7998
+c46.3105 0 32.2207 54.1699 43.1504 110.261c18.4297 93.9395 116.75 157.14 211.72 157.14c102.48 0 197.15 -70.6699 214.08 -169.67zM373.51 59.7197c42 19.1807 81.3301 56.71 96.29 102.141c40.4805 123.09 -64.1494 228 -181.71 228
+c-83.4502 0 -170.32 -55.4199 -186.07 -136c-9.5293 -48.9102 5 -131.351 -68.75 -131.351c24.9404 -33.1094 58.3301 -52.6201 93.7305 -64.0498c24.6602 21.7998 63.8701 15.4697 79.8301 -14.3398c14.2197 -1 79.1895 -1.17969 87.9004 -0.820312
+c8.5625 16.7266 25.9746 28.1865 46.041 28.1865c12.418 0 23.8223 -4.45703 32.7383 -11.7666zM205.12 260.87c0 34.7402 50.8398 34.75 50.8398 0s-50.8398 -34.7402 -50.8398 0zM321.69 260.87c0 34.7402 50.8594 34.75 50.8594 0s-50.8594 -34.75 -50.8594 0z
+M199.08 190.18c-3.44043 16.9404 22.1797 22.1807 25.6201 5.20996l0.0595703 -0.279297c4.14062 -21.4199 29.8506 -44 64.1201 -43.0703c35.6797 0.94043 59.25 22.21 64.1104 42.7695c4.45996 16.0508 28.5996 10.3604 25.4697 -6
+c-5.22949 -22.1797 -31.21 -62 -91.46 -62.8994c-42.5498 0 -80.8799 27.8398 -87.9004 64.25z" />
+    <glyph glyph-name="yammer" unicode="&#xf840;" horiz-adv-x="512" 
+d="M421.78 295.83c-48.1602 -26.3896 -118.561 -58.1504 -130.2 -50s91.4395 80.3701 106.689 88.7695c0.920898 0.5 1.80078 0.970703 2.63086 1.40039c2.07227 0.612305 4.28125 0.954102 6.55176 0.954102c12.7275 0 23.0605 -10.332 23.0605 -23.0596
+c0 -7.31445 -3.41309 -13.8389 -8.73242 -18.0645zM421.78 78.6602c5.27539 -4.22949 8.64258 -10.7148 8.64258 -17.9961c0 -12.7334 -10.3369 -23.0703 -23.0693 -23.0703c-2.24023 0 -4.40527 0.320312 -6.45312 0.916016
+c-0.830078 0.410156 -1.70996 0.900391 -2.63086 1.41016c-15.2695 8.38965 -118.25 80.6396 -106.689 88.7402c11.5596 8.09961 82.04 -23.6201 130.2 -50zM464.21 211c10.4287 -2.18359 18.2344 -11.4395 18.2344 -22.5127
+c0 -11.4219 -8.34375 -20.9102 -19.2646 -22.6973c-54.9102 0.0195312 -131.93 6.00977 -138.21 18.7598c-6.2793 12.75 118.84 26.5098 136.24 26.5098c1.0498 0 2.0498 -0.0595703 3 -0.0595703zM31 351.35c-0.817383 2.46387 -1.26074 5.09766 -1.26074 7.83496
+c0 13.7314 11.1484 24.8799 24.8799 24.8799c9.96582 0 18.5498 -5.8457 22.5205 -14.3145l81 -205.06h1.20996l77 203.529c3.42188 8.7627 11.9502 14.9775 21.9189 14.9775c12.9805 0 23.5195 -10.5391 23.5195 -23.5195
+c0 -2.33398 -0.353516 -4.59863 -0.988281 -6.72754l-109.6 -273.391c-18.5498 -47.2197 -37.1201 -79.5596 -93.29 -79.5596c-0.185547 -0.000976562 -0.371094 -0.000976562 -0.556641 -0.000976562c-7.9707 0 -15.6465 0.666016 -23.2539 1.95117
+c-8.90723 2.55371 -15.4336 10.7646 -15.4336 20.4883c0 11.7607 9.54883 21.3096 21.3105 21.3096c0.349609 0 0.677734 -0.0117188 1.02344 -0.0283203c0.660156 -0.0595703 10.9102 -0.660156 13.8604 -0.660156c30.4697 0 43.7393 18.9404 58.0693 59.4102z" />
+    <glyph glyph-name="git-alt" unicode="&#xf841;" 
+d="M439.55 211.95c5.22266 -5.22363 8.45508 -12.4463 8.45508 -20.4092s-3.23242 -15.1768 -8.45508 -20.4014l-194.689 -194.689c-5.22363 -5.21973 -12.4443 -8.4502 -20.4043 -8.4502c-7.96094 0 -15.1729 3.23047 -20.3965 8.4502l-195.609 195.6
+c-5.22266 5.22363 -8.45508 12.4463 -8.45508 20.4092s3.23242 15.1768 8.45508 20.4014l134.12 134.14l50.79 -50.8496c-5.95996 -14.2607 -2.16016 -36.4902 18.6396 -45v-123c-22.3203 -9.09082 -28.8203 -38.4004 -11.25 -56
+c6.21582 -6.21191 14.8066 -10.0557 24.2803 -10.0557c9.47266 0 18.0547 3.84375 24.2695 10.0557c13.1807 13.1494 16.2197 42.46 -9.08008 55v121.85l46.3506 -46.29c-14.21 -34.4697 29.5098 -63.8301 56 -37.3398c25.71 25.6895 -1.24023 68.4902 -35.4707 56.6895
+l-49.6592 49.6602c9.29004 26.9102 -16.3301 52.8203 -43.3906 43.6807l-51.5195 51.5195l40.6602 40.6299c5.22461 5.2207 12.4463 8.45117 20.4082 8.45117c7.96289 0 15.1768 -3.23047 20.4014 -8.45117z" />
+    <glyph glyph-name="stackpath" unicode="&#xf842;" 
+d="M244.6 215.6c0 -8.5 -4.25977 -20.4893 -21.3398 -20.4893h-19.6094v41.4697h19.6094c17.1299 0 21.3398 -12.3604 21.3398 -20.9805zM448 416v-448h-448v448h448zM151.3 160.16c0 21.2402 -12.1201 34.54 -46.7197 44.8496c-20.5703 7.41016 -26 10.9102 -26 18.6299
+c0 7.7207 7 14.6104 20.4102 14.6104c14.0898 0 20.79 -8.4502 20.79 -18.3496h30.7002l0.189453 0.569336c0.5 19.5703 -15.0596 41.6504 -51.1201 41.6504c-23.3701 0 -52.5498 -10.75 -52.5498 -38.29c0 -19.4004 9.25 -31.29 50.7402 -44.3701
+c17.2598 -6.15039 21.9102 -10.4004 21.9102 -19.4795c0 -15.2002 -19.1309 -14.2305 -19.4707 -14.2305c-20.3994 0 -25.6494 9.09961 -25.6494 21.9004h-30.7998l-0.180664 -0.560547c-0.679688 -31.3203 28.3799 -45.2197 56.6299 -45.2197
+c29.9805 0 51.1201 13.5498 51.1201 38.29zM276.68 215.79c0 25.2998 -18.4297 45.46 -53.4199 45.46h-51.7793v-138.18h32.1699v47.3594h19.6094c30.25 0 53.4199 15.9502 53.4199 45.3604zM297.94 123l49.0596 138.22h-31.0898l-47.9102 -138.22h29.9404zM404.46 261.22
+h-31.0898l-47.9102 -138.22h29.9404z" />
+    <glyph glyph-name="cotton-bureau" unicode="&#xf89e;" horiz-adv-x="512" 
+d="M474.31 117.59h25.1807c-25.7998 -109.78 -111.4 -173.59 -239.67 -173.59c-154.63 -0.339844 -247.82 92.8604 -247.82 248.18c0 154.63 93 247.82 247.82 247.82c128.399 0 214.06 -63.5098 240.18 -173.61h-25.2598
+c-24.8506 95.6104 -99.9199 148.811 -214.69 148.811c-141.85 0 -223.2 -81.3799 -223.2 -223.2c0 -137.93 76.6699 -218 211.101 -223v49.2002c0 48.1602 -26.5498 74.3896 -74.5498 74.3896c-62.1309 0 -99.4004 37.2803 -99.4004 99.4102
+c0 61.3701 36.5195 98.2803 97.3799 99.0596c30.7402 64.6504 144.24 69.3203 177.24 0c60.8496 -0.779297 97.3799 -37.6895 97.3799 -99.0596c0 -62.0098 -37.2002 -99.21 -99.2002 -99.21c-47.9795 0 -74.3896 -26.3896 -74.3896 -74.3896v-49.1602
+c107.67 3.75977 178.24 56.5 201.899 148.35zM357 265.67c3.7998 -21.0801 11.2695 -104.2 -71.79 -120.75c12.2598 -17.7402 32.9805 -27.3301 61.5898 -27.3301c47.9697 0 74.4004 26.4102 74.4004 74.4102c0 44.6699 -22.8301 70.2197 -64.2002 73.6699zM275.32 168.31
+c72.7803 9.89062 58.5 86.9102 56.2295 97c-72.5596 -10 -58.6895 -86.6592 -56.2295 -97zM260 316l-0.179688 -0.259766c-28.3008 0 -49.1602 -9.66016 -61.5703 -27.3506c28.3701 -5.44922 49.3701 -20.5898 61.5996 -43.4492
+c12.2305 22.8594 33.2305 37.9697 61.5908 43.4492c-12.4404 17.9404 -32.8301 27.6104 -61.4404 27.6104zM188.48 265.28h0.239258c-2.75 -10.0498 -16.1602 -87.1602 56.25 -97c2.41992 10.1895 16.6807 86.4297 -56.4893 97zM173.2 117.59l0.330078 0.0302734
+c28.2998 0 49 9.66992 61.1396 27.2998c-73.0303 14.2197 -78.4004 83.5498 -71.6504 120.75c-41.3594 -3.66992 -64.2197 -29.3096 -64.2197 -73.6699c0 -48.0098 26.4004 -74.4102 74.4004 -74.4102zM226.41 105.2h0.269531
+c14.4902 -7.60059 25.5605 -19.3301 33.5605 -33.8301c7.52734 14.4502 19.1924 26.1982 33.5801 33.8301c-14.4902 8.00977 -26.0508 19.0596 -33.8203 33.5498c-7.60156 -14.3262 -19.2539 -25.9658 -33.5898 -33.5498z" />
+    <glyph glyph-name="buy-n-large" unicode="&#xf8a6;" horiz-adv-x="576" 
+d="M288 416c154.73 0 280.21 -100.32 280.21 -224s-125.479 -224 -280.21 -224s-280.21 100.32 -280.21 224s125.479 224 280.21 224zM202.61 58.8096c61.5498 0.600586 99.4697 24.3604 117.71 61.5205c-35.79 6.4502 -62.9307 37.3096 -62.9307 74.4502
+c0 41.7695 34.3408 75.6494 76.6904 75.6494c0.0117188 0 -0.0234375 -0.00292969 -0.0117188 -0.00292969c5.91797 0 11.6826 -0.666016 17.2217 -1.92676c0.623047 2.21875 1.13281 4.53516 1.5 6.84961c6.92969 44.1904 -14.8496 72.8408 -78 72.8408h-133.44
+l-77.25 -290.74zM358 240.89l-9.4502 -36.75l-15 36.75h-31.3398l-26.6299 -90.3096h37.8301l7.83008 35.6299l11.1895 -35.6299h35.4102l22.1602 90.3096h-32zM503.86 58.8096l21.1992 84.0605h-103.869l53.0498 205.36h-92.5l-21.3301 -82.3506
+c29.3799 -10.5996 50.3799 -38.4102 50.3799 -71.0596c0 -41.7803 -34.3496 -75.6504 -76.6904 -75.6504c-0.0205078 0 0.0380859 -0.00292969 0.0166016 -0.00292969c-3.90137 0 -7.73633 0.28418 -11.4863 0.833008l-15.8398 -61.1904h197.07zM211.7 178.61
+c16.1494 0 29.7002 -7.51074 24.1396 -29.8203c-5.83008 -23.4697 -21.7998 -26.6504 -37.9395 -26.6504h-24.7002l13.7998 56.4707h24.7002zM233 278c18.0703 0 32.2305 1.29004 27.5801 -17.5703c-3.83008 -15.5 -21.21 -30.1396 -39.21 -30.1396h-21.3701l11.6602 47.71
+h21.3398z" />
+    <glyph glyph-name="mdb" unicode="&#xf8ca;" horiz-adv-x="576" 
+d="M17.3701 287.59h46.2998l42.3301 -117.33l40.7002 117.33h45.5098l12.79 -191.59h-45.5303l-4.79004 77.4297l-25.54 -77.4297h-44.71l-27.9297 79.8301l-5.58984 -79.8301h-43.9102zM298.37 287.59c0 0 93.4199 -1.58984 94.2002 -95.7998
+c0.799805 -96.5898 -94.2002 -95.79 -94.2002 -95.79h-47.9004v191.59h47.9004zM297.17 141.13c0 0 47.5996 5.21973 46.7998 51.5205c-0.799805 46.2998 -46.7998 50.5693 -46.7998 50.5693v-102.09zM535.46 215.37c0 0 33.54 -11.96 33.54 -55.1006
+c0 -68.6396 -87 -63.8496 -87 -63.8496h-45.5195v191.58h51.8994s49.7402 1.44043 55.0801 -34.3203c0.416992 -2.75586 0.595703 -5.58203 0.595703 -8.45312c0 -10.9678 -3.15039 -21.2061 -8.5957 -29.8564zM483.56 247.31v-21.5898h12s5.43066 5.33984 4 12
+c-2.42969 11.1807 -16 9.58984 -16 9.58984zM483.46 137.85c0 0 41.04 -4.92969 41.3701 20.7207c0.389648 27.1602 -41.1904 22.4297 -41.1904 22.4297h-0.0800781v-18.2305z" />
+    <glyph glyph-name="orcid" unicode="&#xf8d2;" horiz-adv-x="512" 
+d="M294.75 259.81c58.1299 0 84.6699 -35.2598 84.6699 -76.8994c0 -25.5703 -15.5 -76.9102 -83.1201 -76.9102h-47.4697v153.81h45.9199zM256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM175.21 79.2402v207.5h-29.8398v-207.5
+h29.8398zM160.29 310.38c10.7832 0.0380859 19.5312 8.78711 19.5703 19.5703c0 10.8008 -8.76953 19.5693 -19.5703 19.5693s-19.5703 -8.76855 -19.5703 -19.5693s8.76953 -19.5703 19.5703 -19.5703zM300 79c68.3799 0 110 50.6104 110.04 103.89
+c0 49.0205 -33.71 103.851 -110.44 103.851h-80.5996v-207.74h81z" />
+    <glyph glyph-name="swift" unicode="&#xf8e1;" 
+d="M448 291.91c0 -5.35059 -0.000976562 -10.7002 0.00878906 -16.0498v-183.771c-0.0292969 -4.50977 -0.0800781 -9.00977 -0.200195 -13.5098c-0.119141 -10.0547 -0.998047 -19.7852 -2.58984 -29.4199c-1.67969 -9.83789 -4.86914 -19.373 -9.21973 -28
+c-9.04004 -17.748 -23.3896 -32.1074 -41.1299 -41.1602c-8.62891 -4.34375 -18.1641 -7.5293 -28 -9.20996c-9.64355 -1.58594 -19.3809 -2.46387 -29.4404 -2.58984c-4.51953 -0.120117 -9.00977 -0.200195 -13.5195 -0.200195h-199.79
+c-4.52051 0.0302734 -9.02051 0.0800781 -13.5205 0.200195c-10.0576 0.120117 -19.792 0.999023 -29.4297 2.58984c-9.83691 1.67871 -19.3711 4.86523 -28 9.20996c-17.7354 9.05566 -32.083 23.4102 -41.1299 41.1504c-4.35059 8.62598 -7.54004 18.1611 -9.21973 28
+c-1.58398 9.63574 -2.45898 19.3662 -2.58008 29.4199c-0.129883 4.50977 -0.209961 9 -0.209961 13.5098v199.83c0.0292969 4.51953 0.0800781 9.00977 0.209961 13.5195c0.109375 10.0479 0.97168 19.7676 2.54004 29.4004c1.68164 9.83691 4.87109 19.3721 9.21973 28
+c4.52637 8.88477 10.3564 16.875 17.3496 23.8496c1.74023 1.7207 3.55078 3.39062 5.43066 5c5.61426 4.80176 11.7549 8.92383 18.3896 12.3203c2.2334 1.11328 4.50391 2.15332 6.81152 3.12012c6.69531 2.73145 13.8994 4.82422 21.21 6.09961
+c7.22656 1.23633 14.5557 2.01855 22.0596 2.32031c2.45996 0.120117 4.91992 0.200195 7.37012 0.269531c4.51953 0.120117 9.00977 0.200195 13.5195 0.200195h199.75c4.52051 -0.0292969 9.01074 -0.0800781 13.5205 -0.200195
+c10.0576 -0.120117 19.792 -0.998047 29.4297 -2.58984c9.83887 -1.67773 19.374 -4.86719 28 -9.21973c17.7559 -9.03711 32.1191 -23.3965 41.1602 -41.1504c4.34668 -8.62891 7.53516 -18.1631 9.21973 -28c1.58301 -9.63672 2.45801 -19.3662 2.58008 -29.4199
+c0.120117 -4.51953 0.200195 -9.00977 0.200195 -13.5195zM378.119 50.9102c4.91016 -9.58008 15.3604 41.1797 -23.1602 88.5801c0.490234 1.68945 1 3.35938 1.44043 5.08984c18.5996 74.0801 -26.79 161.67 -103.58 207.75
+c33.6494 -45.6201 48.5293 -100.87 35.3096 -149.2c-1.16797 -4.21484 -2.58105 -8.44238 -4.16016 -12.4697c-1.72949 1.14941 -3.84961 2.41992 -6.72949 4c0 0 -76.3906 47.1699 -159.181 130.59c-2.16992 2.2002 44.1504 -66.25 96.7207 -121.74
+c-24.7803 13.9004 -93.7803 64.1201 -137.48 104.12c5.58301 -9.18652 11.8184 -17.7773 18.7803 -25.8994c36.4902 -46.2207 84.0898 -103.37 141.09 -147.221c-40 -24.4902 -96.6396 -26.3994 -153 0c-13.8662 6.50977 -26.9756 14.3477 -39.1699 23.3701
+c25.1133 -39.9365 61.6025 -71.4268 105.29 -90.3701c53.3203 -22.9199 106.35 -21.3799 145.85 -0.379883l0.419922 0.25c1.77051 1 3.53027 2 5.25 3c19.0801 9.7998 56.3105 19.46 76.3105 -19.4697z" />
+    <glyph glyph-name="umbraco" unicode="&#xf8e8;" horiz-adv-x="510" 
+d="M255.35 440c136.99 -0.169922 247.83 -111.31 247.65 -248.28c-0.179688 -136.97 -111.15 -247.67 -248 -247.67c-137 0.0703125 -248.07 111.271 -248 248.271c0.139648 136.96 111.36 247.85 248.35 247.68zM400.35 174
+c0.360352 5.24023 0.524414 10.1309 0.524414 15.4619c0 5.12988 -0.169922 10.2197 -0.503906 15.2656c-0.43457 14.9102 -1.64258 29.4004 -3.61035 43.8799c-1.87012 13.2197 -3.56934 22.3799 -5.38965 32c-1.02051 4.87988 -1.28027 6.39941 -1.83008 8.44922
+c-0.506836 2.22461 -2.49805 3.89062 -4.875 3.89062h-0.0253906h-0.819336l-32 -5c-2.37793 -0.385742 -4.20117 -2.44922 -4.20117 -4.93457c0 -0.0224609 0.000976562 -0.0439453 0.000976562 -0.0654297
+c-0.00976562 -0.128906 -0.0146484 -0.249023 -0.0146484 -0.380859c0 -0.130859 0.00488281 -0.260742 0.0146484 -0.389648l1.68945 -8.7793c1.60645 -8.86719 3.23633 -20.0938 4.88965 -33.6807c1.62695 -13.9551 2.49707 -27.7852 2.59961 -42.1494
+c0.266602 -26.9072 -2.44336 -46.834 -8.12988 -59.7803c-5.62891 -12.7627 -17.1777 -22.3076 -31.1504 -25.2305c-16.2686 -3.44336 -32.8506 -5.2627 -50.1387 -5.2627c-2.38477 0 -4.76172 0.0341797 -7.13086 0.103516h-10.25
+c-2.40625 -0.0712891 -4.53223 -0.0996094 -6.95605 -0.0996094c-17.2725 0 -34.127 1.80566 -50.3838 5.23926c-14.0283 2.86719 -25.6377 12.4033 -31.3105 25.1797c-5.60645 12.9336 -8.31641 32.877 -8.12988 59.8301
+c0.101562 14.3672 0.986328 28.2021 2.64062 42.1504c1.62012 13.6201 3.2334 24.8467 4.83984 33.6797l1.7002 8.78027c0.00976562 0.128906 0.0146484 0.249023 0.0146484 0.379883c0 0.131836 -0.00488281 0.261719 -0.0146484 0.389648
+c0 0.00488281 -0.00488281 0.00878906 -0.00488281 0.0126953c0 2.48633 -1.79297 4.55664 -4.15527 4.9873l-32 5h-0.69043c-2.37402 -0.0214844 -4.3623 -1.6748 -4.89941 -3.88965c-0.540039 -2.03027 -0.820312 -3.57031 -1.82031 -8.4502
+c-1.83008 -9.41992 -3.52051 -18.6094 -5.40039 -32c-1.95898 -14.4814 -3.16406 -28.9697 -3.59961 -43.8799c-0.351562 -5.13867 -0.530273 -9.93066 -0.530273 -15.1582s0.178711 -10.4131 0.530273 -15.5518c0.766602 -27.0928 5.43359 -48.7598 14 -65
+c8.57324 -16.2061 23.0801 -27.873 43.5195 -35c20.4404 -7.12695 48.9209 -10.6172 85.4414 -10.4697h4.59961c36.5605 -0.15332 65.0439 3.33691 85.4502 10.4707c20.4336 7.12012 34.9365 18.7871 43.5098 35.001s13.2402 37.8809 14 65.001z" />
+  </font>
+</defs></svg>
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-brands-400.ttf b/scaladoc/resources/dotty_res/webfonts/fa-brands-400.ttf
new file mode 100644
index 000000000000..fc567cd2f11d
Binary files /dev/null and b/scaladoc/resources/dotty_res/webfonts/fa-brands-400.ttf differ
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-brands-400.woff b/scaladoc/resources/dotty_res/webfonts/fa-brands-400.woff
new file mode 100644
index 000000000000..db70e73e473f
Binary files /dev/null and b/scaladoc/resources/dotty_res/webfonts/fa-brands-400.woff differ
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-brands-400.woff2 b/scaladoc/resources/dotty_res/webfonts/fa-brands-400.woff2
new file mode 100644
index 000000000000..b8a8f656e160
Binary files /dev/null and b/scaladoc/resources/dotty_res/webfonts/fa-brands-400.woff2 differ
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-regular-400.eot b/scaladoc/resources/dotty_res/webfonts/fa-regular-400.eot
new file mode 100644
index 000000000000..fae180dacc52
Binary files /dev/null and b/scaladoc/resources/dotty_res/webfonts/fa-regular-400.eot differ
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-regular-400.svg b/scaladoc/resources/dotty_res/webfonts/fa-regular-400.svg
new file mode 100644
index 000000000000..9dba8c340bf8
--- /dev/null
+++ b/scaladoc/resources/dotty_res/webfonts/fa-regular-400.svg
@@ -0,0 +1,801 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+<metadata>
+Created by FontForge 20201107 at Tue Mar 16 10:15:04 2021
+ By Robert Madole
+Copyright (c) Font Awesome
+</metadata>
+<!-- Font Awesome Free 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><defs>
+<font id="FontAwesome5Free-Regular" horiz-adv-x="512" >
+  <font-face 
+    font-family="Font Awesome 5 Free Regular"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="512"
+    panose-1="2 0 5 3 0 0 0 0 0 0"
+    ascent="448"
+    descent="-64"
+    bbox="-0.0663408 -64.0662 640.004 448.1"
+    underline-thickness="25"
+    underline-position="-50"
+    unicode-range="U+0020-F5C8"
+  />
+    <missing-glyph />
+    <glyph glyph-name="heart" unicode="&#xf004;" 
+d="M458.4 383.7c75.2998 -63.4004 64.0996 -166.601 10.5996 -221.3l-175.4 -178.7c-10 -10.2002 -23.2998 -15.7998 -37.5996 -15.7998c-14.2002 0 -27.5996 5.69922 -37.5996 15.8994l-175.4 178.7c-53.5996 54.7002 -64.5996 157.9 10.5996 221.2
+c57.8008 48.7002 147.101 41.2998 202.4 -15c55.2998 56.2998 144.6 63.5996 202.4 15zM434.8 196.2c36.2002 36.8994 43.7998 107.7 -7.2998 150.8c-38.7002 32.5996 -98.7002 27.9004 -136.5 -10.5996l-35 -35.7002l-35 35.7002
+c-37.5996 38.2998 -97.5996 43.1992 -136.5 10.5c-51.2002 -43.1006 -43.7998 -113.5 -7.2998 -150.7l175.399 -178.7c2.40039 -2.40039 4.40039 -2.40039 6.80078 0z" />
+    <glyph glyph-name="star" unicode="&#xf005;" horiz-adv-x="576" 
+d="M528.1 276.5c26.2002 -3.7998 36.7002 -36.0996 17.7002 -54.5996l-105.7 -103l25 -145.5c4.5 -26.3008 -23.1992 -45.9004 -46.3994 -33.7002l-130.7 68.7002l-130.7 -68.7002c-23.2002 -12.2998 -50.8994 7.39941 -46.3994 33.7002l25 145.5l-105.7 103
+c-19 18.5 -8.5 50.7998 17.7002 54.5996l146.1 21.2998l65.2998 132.4c11.7998 23.8994 45.7002 23.5996 57.4004 0l65.2998 -132.4zM388.6 135.7l100.601 98l-139 20.2002l-62.2002 126l-62.2002 -126l-139 -20.2002l100.601 -98l-23.7002 -138.4l124.3 65.2998
+l124.3 -65.2998z" />
+    <glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="448" 
+d="M313.6 144c74.2002 0 134.4 -60.2002 134.4 -134.4v-25.5996c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v25.5996c0 74.2002 60.2002 134.4 134.4 134.4c28.7998 0 42.5 -16 89.5996 -16s60.9004 16 89.5996 16zM400 -16v25.5996
+c0 47.6006 -38.7998 86.4004 -86.4004 86.4004c-14.6992 0 -37.8994 -16 -89.5996 -16c-51.2998 0 -75 16 -89.5996 16c-47.6006 0 -86.4004 -38.7998 -86.4004 -86.4004v-25.5996h352zM224 160c-79.5 0 -144 64.5 -144 144s64.5 144 144 144s144 -64.5 144 -144
+s-64.5 -144 -144 -144zM224 400c-52.9004 0 -96 -43.0996 -96 -96s43.0996 -96 96 -96s96 43.0996 96 96s-43.0996 96 -96 96z" />
+    <glyph glyph-name="clock" unicode="&#xf017;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM256 -8c110.5 0 200 89.5 200 200s-89.5 200 -200 200s-200 -89.5 -200 -200s89.5 -200 200 -200zM317.8 96.4004l-84.8994 61.6992
+c-3.10059 2.30078 -4.90039 5.90039 -4.90039 9.7002v164.2c0 6.59961 5.40039 12 12 12h32c6.59961 0 12 -5.40039 12 -12v-141.7l66.7998 -48.5996c5.40039 -3.90039 6.5 -11.4004 2.60059 -16.7998l-18.8008 -25.9004c-3.89941 -5.2998 -11.3994 -6.5 -16.7998 -2.59961z
+" />
+    <glyph glyph-name="list-alt" unicode="&#xf022;" 
+d="M464 416c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48h-416c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h416zM458 16c3.31152 0 6 2.68848 6 6v340c0 3.31152 -2.68848 6 -6 6h-404c-3.31152 0 -6 -2.68848 -6 -6v-340
+c0 -3.31152 2.68848 -6 6 -6h404zM416 108v-24c0 -6.62695 -5.37305 -12 -12 -12h-200c-6.62695 0 -12 5.37305 -12 12v24c0 6.62695 5.37305 12 12 12h200c6.62695 0 12 -5.37305 12 -12zM416 204v-24c0 -6.62695 -5.37305 -12 -12 -12h-200c-6.62695 0 -12 5.37305 -12 12
+v24c0 6.62695 5.37305 12 12 12h200c6.62695 0 12 -5.37305 12 -12zM416 300v-24c0 -6.62695 -5.37305 -12 -12 -12h-200c-6.62695 0 -12 5.37305 -12 12v24c0 6.62695 5.37305 12 12 12h200c6.62695 0 12 -5.37305 12 -12zM164 288c0 -19.8818 -16.1182 -36 -36 -36
+s-36 16.1182 -36 36s16.1182 36 36 36s36 -16.1182 36 -36zM164 192c0 -19.8818 -16.1182 -36 -36 -36s-36 16.1182 -36 36s16.1182 36 36 36s36 -16.1182 36 -36zM164 96c0 -19.8818 -16.1182 -36 -36 -36s-36 16.1182 -36 36s16.1182 36 36 36s36 -16.1182 36 -36z" />
+    <glyph glyph-name="flag" unicode="&#xf024;" 
+d="M336.174 368c35.4668 0 73.0195 12.6914 108.922 28.1797c31.6406 13.6514 66.9043 -9.65723 66.9043 -44.1162v-239.919c0 -16.1953 -8.1543 -31.3057 -21.7129 -40.1631c-26.5762 -17.3643 -70.0693 -39.9814 -128.548 -39.9814c-68.6084 0 -112.781 32 -161.913 32
+c-56.5674 0 -89.957 -11.2803 -127.826 -28.5566v-83.4434c0 -8.83691 -7.16309 -16 -16 -16h-16c-8.83691 0 -16 7.16309 -16 16v406.438c-14.3428 8.2998 -24 23.7979 -24 41.5615c0 27.5693 23.2422 49.71 51.2012 47.8965
+c22.9658 -1.49023 41.8662 -19.4717 44.4805 -42.3379c0.213867 -1.83398 0.308594 -3.65918 0.308594 -5.5498c0 -5.30273 -0.860352 -10.4053 -2.4502 -15.1768c22.418 8.68555 49.4199 15.168 80.7207 15.168c68.6084 0 112.781 -32 161.913 -32zM464 112v240
+c-31.5059 -14.6338 -84.5547 -32 -127.826 -32c-59.9111 0 -101.968 32 -161.913 32c-41.4365 0 -80.4766 -16.5879 -102.261 -32v-232c31.4473 14.5967 84.4648 24 127.826 24c59.9111 0 101.968 -32 161.913 -32c41.4365 0 80.4775 16.5879 102.261 32z" />
+    <glyph glyph-name="bookmark" unicode="&#xf02e;" horiz-adv-x="384" 
+d="M336 448c26.5098 0 48 -21.4902 48 -48v-464l-192 112l-192 -112v464c0 26.5098 21.4902 48 48 48h288zM336 19.5703v374.434c0 3.31348 -2.68555 5.99609 -6 5.99609h-276c-3.31152 0 -6 -2.68848 -6 -6v-374.43l144 84z" />
+    <glyph glyph-name="image" unicode="&#xf03e;" 
+d="M464 384c26.5098 0 48 -21.4902 48 -48v-288c0 -26.5098 -21.4902 -48 -48 -48h-416c-26.5098 0 -48 21.4902 -48 48v288c0 26.5098 21.4902 48 48 48h416zM458 48c3.31152 0 6 2.68848 6 6v276c0 3.31152 -2.68848 6 -6 6h-404c-3.31152 0 -6 -2.68848 -6 -6v-276
+c0 -3.31152 2.68848 -6 6 -6h404zM128 296c22.0908 0 40 -17.9092 40 -40s-17.9092 -40 -40 -40s-40 17.9092 -40 40s17.9092 40 40 40zM96 96v48l39.5137 39.5146c4.6875 4.68652 12.2852 4.68652 16.9717 0l39.5146 -39.5146l119.514 119.515
+c4.6875 4.68652 12.2852 4.68652 16.9717 0l87.5146 -87.5146v-80h-320z" />
+    <glyph glyph-name="edit" unicode="&#xf044;" horiz-adv-x="576" 
+d="M402.3 103.1l32 32c5 5 13.7002 1.5 13.7002 -5.69922v-145.4c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h273.5c7.09961 0 10.7002 -8.59961 5.7002 -13.7002l-32 -32c-1.5 -1.5 -3.5 -2.2998 -5.7002 -2.2998h-241.5v-352h352
+v113.5c0 2.09961 0.799805 4.09961 2.2998 5.59961zM558.9 304.9l-262.601 -262.601l-90.3994 -10c-26.2002 -2.89941 -48.5 19.2002 -45.6006 45.6006l10 90.3994l262.601 262.601c22.8994 22.8994 59.8994 22.8994 82.6992 0l43.2002 -43.2002
+c22.9004 -22.9004 22.9004 -60 0.100586 -82.7998zM460.1 274l-58.0996 58.0996l-185.8 -185.899l-7.2998 -65.2998l65.2998 7.2998zM524.9 353.7l-43.2002 43.2002c-4.10059 4.09961 -10.7998 4.09961 -14.7998 0l-30.9004 -30.9004l58.0996 -58.0996l30.9004 30.8994
+c4 4.2002 4 10.7998 -0.0996094 14.9004z" />
+    <glyph glyph-name="times-circle" unicode="&#xf057;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM256 -8c110.5 0 200 89.5 200 200s-89.5 200 -200 200s-200 -89.5 -200 -200s89.5 -200 200 -200zM357.8 254.2l-62.2002 -62.2002l62.2002 -62.2002
+c4.7002 -4.7002 4.7002 -12.2998 0 -17l-22.5996 -22.5996c-4.7002 -4.7002 -12.2998 -4.7002 -17 0l-62.2002 62.2002l-62.2002 -62.2002c-4.7002 -4.7002 -12.2998 -4.7002 -17 0l-22.5996 22.5996c-4.7002 4.7002 -4.7002 12.2998 0 17l62.2002 62.2002l-62.2002 62.2002
+c-4.7002 4.7002 -4.7002 12.2998 0 17l22.5996 22.5996c4.7002 4.7002 12.2998 4.7002 17 0l62.2002 -62.2002l62.2002 62.2002c4.7002 4.7002 12.2998 4.7002 17 0l22.5996 -22.5996c4.7002 -4.7002 4.7002 -12.2998 0 -17z" />
+    <glyph glyph-name="check-circle" unicode="&#xf058;" 
+d="M256 440c136.967 0 248 -111.033 248 -248s-111.033 -248 -248 -248s-248 111.033 -248 248s111.033 248 248 248zM256 392c-110.549 0 -200 -89.4678 -200 -200c0 -110.549 89.4678 -200 200 -200c110.549 0 200 89.4678 200 200c0 110.549 -89.4678 200 -200 200z
+M396.204 261.733c4.66699 -4.70508 4.63672 -12.3037 -0.0673828 -16.9717l-172.589 -171.204c-4.70508 -4.66797 -12.3027 -4.63672 -16.9697 0.0683594l-90.7812 91.5156c-4.66797 4.70605 -4.63672 12.3047 0.0683594 16.9717l22.7188 22.5361
+c4.70508 4.66699 12.3027 4.63574 16.9697 -0.0693359l59.792 -60.2773l141.353 140.216c4.70508 4.66797 12.3027 4.6377 16.9697 -0.0673828z" />
+    <glyph glyph-name="question-circle" unicode="&#xf059;" 
+d="M256 440c136.957 0 248 -111.083 248 -248c0 -136.997 -111.043 -248 -248 -248s-248 111.003 -248 248c0 136.917 111.043 248 248 248zM256 -8c110.569 0 200 89.4697 200 200c0 110.529 -89.5088 200 -200 200c-110.528 0 -200 -89.5049 -200 -200
+c0 -110.569 89.4678 -200 200 -200zM363.244 247.2c0 -67.0518 -72.4209 -68.084 -72.4209 -92.8633v-6.33691c0 -6.62695 -5.37305 -12 -12 -12h-45.6475c-6.62695 0 -12 5.37305 -12 12v8.65918c0 35.7451 27.1006 50.0342 47.5791 61.5156
+c17.5615 9.84473 28.3242 16.541 28.3242 29.5791c0 17.2461 -21.999 28.6934 -39.7842 28.6934c-23.1885 0 -33.8936 -10.9775 -48.9424 -29.9697c-4.05664 -5.11914 -11.46 -6.07031 -16.666 -2.12402l-27.8232 21.0986
+c-5.10742 3.87207 -6.25098 11.0654 -2.64453 16.3633c23.627 34.6934 53.7217 54.1846 100.575 54.1846c49.0713 0 101.45 -38.3037 101.45 -88.7998zM298 80c0 -23.1592 -18.8408 -42 -42 -42s-42 18.8408 -42 42s18.8408 42 42 42s42 -18.8408 42 -42z" />
+    <glyph glyph-name="eye" unicode="&#xf06e;" horiz-adv-x="576" 
+d="M288 304c0.114258 0 0.240234 -0.0175781 0.354492 -0.0175781c61.6543 0 111.71 -50.0557 111.71 -111.71s-50.0557 -111.71 -111.71 -111.71s-111.71 50.0557 -111.71 111.71c0 10.7422 1.51953 21.1328 4.35547 30.9678
+c7.95898 -4.52637 17.2129 -7.17188 27 -7.24023c30.9072 0 56 25.0928 56 56c-0.0683594 9.78711 -2.71387 19.041 -7.24023 27c9.88379 3.07617 20.3896 4.83008 31.2402 5zM572.52 206.6c2.21387 -4.37793 3.46094 -9.38965 3.46094 -14.626
+c0 -5.2373 -1.24707 -10.1855 -3.46094 -14.5635c-54.1992 -105.771 -161.59 -177.41 -284.52 -177.41s-230.29 71.5898 -284.52 177.4c-2.21387 4.37793 -3.46094 9.38965 -3.46094 14.626c0 5.2373 1.24707 10.1855 3.46094 14.5635
+c54.1992 105.771 161.59 177.41 284.52 177.41s230.29 -71.5898 284.52 -177.4zM288 48c98.6602 0 189.1 55 237.93 144c-48.8398 89 -139.27 144 -237.93 144s-189.09 -55 -237.93 -144c48.8398 -89 139.279 -144 237.93 -144z" />
+    <glyph glyph-name="eye-slash" unicode="&#xf070;" horiz-adv-x="640" 
+d="M634 -23c3.66895 -2.93262 6.00391 -7.45117 6.00391 -12.5088c0 -3.7832 -1.31543 -7.26074 -3.51367 -10.001l-10 -12.4902c-2.93359 -3.66309 -7.44824 -5.99414 -12.502 -5.99414c-3.77637 0 -7.25 1.31152 -9.98828 3.50391l-598 467.49
+c-3.66895 2.93262 -6.00391 7.45117 -6.00391 12.5088c0 3.7832 1.31543 7.26074 3.51367 10.001l10 12.4902c2.93359 3.66309 7.44824 5.99414 12.502 5.99414c3.77637 0 7.25 -1.31152 9.98828 -3.50391zM296.79 301.53c7.51172 1.60254 15.2266 2.45508 23.21 2.46973
+c60.4805 0 109.36 -47.9102 111.58 -107.85zM343.21 82.46c-7.51367 -1.59375 -15.2285 -2.44336 -23.21 -2.45996c-60.4697 0 -109.35 47.9102 -111.58 107.84zM320 336c-19.8799 0 -39.2803 -2.7998 -58.2197 -7.09961l-46.4102 36.29
+c32.9199 11.8096 67.9297 18.8096 104.63 18.8096c122.93 0 230.29 -71.5898 284.57 -177.4c2.21289 -4.37793 3.45996 -9.38965 3.45996 -14.626c0 -5.2373 -1.24707 -10.1855 -3.45996 -14.5635c-14.1924 -27.5625 -31.9229 -52.6689 -52.9004 -75.1104l-37.7402 29.5
+c17.2305 18.0527 31.9385 38.1318 44 60.2002c-48.8398 89 -139.279 144 -237.93 144zM320 48c19.8896 0 39.2803 2.7998 58.2197 7.08984l46.4102 -36.2803c-32.9199 -11.7598 -67.9297 -18.8096 -104.63 -18.8096c-122.92 0 -230.28 71.5898 -284.51 177.4
+c-2.21387 4.37793 -3.46094 9.38965 -3.46094 14.626c0 5.2373 1.24707 10.1855 3.46094 14.5635c14.1885 27.5586 31.916 52.6621 52.8896 75.1006l37.7402 -29.5c-17.249 -18.0469 -31.9727 -38.1221 -44.0498 -60.1904c48.8496 -89 139.279 -144 237.93 -144z" />
+    <glyph glyph-name="calendar-alt" unicode="&#xf073;" horiz-adv-x="448" 
+d="M148 160h-40c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12zM256 172c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h40
+c6.59961 0 12 -5.40039 12 -12v-40zM352 172c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-40zM256 76c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v40
+c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-40zM160 76c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-40zM352 76c0 -6.59961 -5.40039 -12 -12 -12h-40
+c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-40zM448 336v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h48v52c0 6.59961 5.40039 12 12 12h40
+c6.59961 0 12 -5.40039 12 -12v-52h128v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h48c26.5 0 48 -21.5 48 -48zM400 -10v298h-352v-298c0 -3.2998 2.7002 -6 6 -6h340c3.2998 0 6 2.7002 6 6z" />
+    <glyph glyph-name="comment" unicode="&#xf075;" 
+d="M256 416c141.4 0 256 -93.0996 256 -208s-114.6 -208 -256 -208c-32.7998 0 -64 5.2002 -92.9004 14.2998c-29.0996 -20.5996 -77.5996 -46.2998 -139.1 -46.2998c-9.59961 0 -18.2998 5.7002 -22.0996 14.5c-3.80078 8.7998 -2 19 4.59961 26
+c0.5 0.400391 31.5 33.7998 46.4004 73.2002c-33 35.0996 -52.9004 78.7002 -52.9004 126.3c0 114.9 114.6 208 256 208zM256 48c114.7 0 208 71.7998 208 160s-93.2998 160 -208 160s-208 -71.7998 -208 -160c0 -42.2002 21.7002 -74.0996 39.7998 -93.4004
+l20.6006 -21.7998l-10.6006 -28.0996c-5.5 -14.5 -12.5996 -28.1006 -19.8994 -40.2002c23.5996 7.59961 43.1992 18.9004 57.5 29l19.5 13.7998l22.6992 -7.2002c25.3008 -8 51.7002 -12.0996 78.4004 -12.0996z" />
+    <glyph glyph-name="folder" unicode="&#xf07b;" 
+d="M464 320c26.5098 0 48 -21.4902 48 -48v-224c0 -26.5098 -21.4902 -48 -48 -48h-416c-26.5098 0 -48 21.4902 -48 48v288c0 26.5098 21.4902 48 48 48h146.74c8.49023 0 16.6299 -3.37012 22.6299 -9.37012l54.6299 -54.6299h192zM464 48v224h-198.62
+c-8.49023 0 -16.6299 3.37012 -22.6299 9.37012l-54.6299 54.6299h-140.12v-288h416z" />
+    <glyph glyph-name="folder-open" unicode="&#xf07c;" horiz-adv-x="576" 
+d="M527.9 224c37.6992 0 60.6992 -41.5 40.6992 -73.4004l-79.8994 -128c-8.7998 -14.0996 -24.2002 -22.5996 -40.7002 -22.5996h-400c-26.5 0 -48 21.5 -48 48v288c0 26.5 21.5 48 48 48h160l64 -64h160c26.5 0 48 -21.5 48 -48v-48h47.9004zM48 330v-233.4l62.9004 104.2
+c8.69922 14.4004 24.2998 23.2002 41.0996 23.2002h280v42c0 3.2998 -2.7002 6 -6 6h-173.9l-64 64h-134.1c-3.2998 0 -6 -2.7002 -6 -6zM448 48l80 128h-378.8l-77.2002 -128h376z" />
+    <glyph glyph-name="chart-bar" unicode="&#xf080;" 
+d="M396.8 96c-6.39941 0 -12.7998 6.40039 -12.7998 12.7998v230.4c0 6.39941 6.40039 12.7998 12.7998 12.7998h22.4004c6.39941 0 12.7998 -6.40039 12.7998 -12.7998v-230.4c0 -6.39941 -6.40039 -12.7998 -12.7998 -12.7998h-22.4004zM204.8 96
+c-6.39941 0 -12.7998 6.40039 -12.7998 12.7998v198.4c0 6.39941 6.40039 12.7998 12.7998 12.7998h22.4004c6.39941 0 12.7998 -6.40039 12.7998 -12.7998v-198.4c0 -6.39941 -6.40039 -12.7998 -12.7998 -12.7998h-22.4004zM300.8 96
+c-6.39941 0 -12.7998 6.40039 -12.7998 12.7998v134.4c0 6.39941 6.40039 12.7998 12.7998 12.7998h22.4004c6.39941 0 12.7998 -6.40039 12.7998 -12.7998v-134.4c0 -6.39941 -6.40039 -12.7998 -12.7998 -12.7998h-22.4004zM496 48c8.83984 0 16 -7.16016 16 -16v-16
+c0 -8.83984 -7.16016 -16 -16 -16h-464c-17.6699 0 -32 14.3301 -32 32v336c0 8.83984 7.16016 16 16 16h16c8.83984 0 16 -7.16016 16 -16v-320h448zM108.8 96c-6.39941 0 -12.7998 6.40039 -12.7998 12.7998v70.4004c0 6.39941 6.40039 12.7998 12.7998 12.7998h22.4004
+c6.39941 0 12.7998 -6.40039 12.7998 -12.7998v-70.4004c0 -6.39941 -6.40039 -12.7998 -12.7998 -12.7998h-22.4004z" />
+    <glyph glyph-name="comments" unicode="&#xf086;" horiz-adv-x="576" 
+d="M532 61.7998c15.2998 -30.7002 37.4004 -54.5 37.7998 -54.7998c6.2998 -6.7002 8 -16.5 4.40039 -25c-3.7002 -8.5 -12 -14 -21.2002 -14c-53.5996 0 -96.7002 20.2998 -125.2 38.7998c-19 -4.39941 -39 -6.7998 -59.7998 -6.7998
+c-86.2002 0 -159.9 40.4004 -191.3 97.7998c-9.7002 1.2002 -19.2002 2.7998 -28.4004 4.90039c-28.5 -18.6006 -71.7002 -38.7998 -125.2 -38.7998c-9.19922 0 -17.5996 5.5 -21.1992 14c-3.7002 8.5 -1.90039 18.2998 4.39941 25
+c0.400391 0.399414 22.4004 24.1992 37.7002 54.8994c-27.5 27.2002 -44 61.2002 -44 98.2002c0 88.4004 93.0996 160 208 160c86.2998 0 160.3 -40.5 191.8 -98.0996c99.7002 -11.8008 176.2 -77.9004 176.2 -157.9c0 -37.0996 -16.5 -71.0996 -44 -98.2002zM139.2 154.1
+l19.7998 -4.5c16 -3.69922 32.5 -5.59961 49 -5.59961c86.7002 0 160 51.2998 160 112s-73.2998 112 -160 112s-160 -51.2998 -160 -112c0 -28.7002 16.2002 -50.5996 29.7002 -64l24.7998 -24.5l-15.5 -31.0996c-2.59961 -5.10059 -5.2998 -10.1006 -8 -14.8008
+c14.5996 5.10059 29 12.3008 43.0996 21.4004zM498.3 96c13.5 13.4004 29.7002 35.2998 29.7002 64c0 49.2002 -48.2998 91.5 -112.7 106c0.299805 -3.2998 0.700195 -6.59961 0.700195 -10c0 -80.9004 -78 -147.5 -179.3 -158.3
+c29.0996 -29.6006 77.2998 -49.7002 131.3 -49.7002c16.5 0 33 1.90039 49 5.59961l19.9004 4.60059l17.0996 -11.1006c14.0996 -9.09961 28.5 -16.2998 43.0996 -21.3994c-2.69922 4.7002 -5.39941 9.7002 -8 14.7998l-15.5 31.0996z" />
+    <glyph glyph-name="star-half" unicode="&#xf089;" horiz-adv-x="576" 
+d="M288 62.7002v-54.2998l-130.7 -68.6006c-23.3994 -12.2998 -50.8994 7.60059 -46.3994 33.7002l25 145.5l-105.7 103c-19 18.5 -8.5 50.7998 17.7002 54.5996l146.1 21.2002l65.2998 132.4c5.90039 11.8994 17.2998 17.7998 28.7002 17.7998v-68.0996l-62.2002 -126
+l-139 -20.2002l100.601 -98l-23.7002 -138.4z" />
+    <glyph glyph-name="lemon" unicode="&#xf094;" 
+d="M484.112 420.111c28.1221 -28.123 35.9434 -68.0039 19.0215 -97.0547c-23.0576 -39.584 50.1436 -163.384 -82.3311 -295.86c-132.301 -132.298 -256.435 -59.3594 -295.857 -82.3291c-29.0459 -16.917 -68.9219 -9.11426 -97.0576 19.0205
+c-28.1221 28.1221 -35.9434 68.0029 -19.0215 97.0547c23.0566 39.5859 -50.1436 163.386 82.3301 295.86c132.308 132.309 256.407 59.3496 295.862 82.332c29.0498 16.9219 68.9307 9.09863 97.0537 -19.0234zM461.707 347.217
+c13.5166 23.2031 -27.7578 63.7314 -50.4883 50.4912c-66.6025 -38.7939 -165.646 45.5898 -286.081 -74.8457c-120.444 -120.445 -36.0449 -219.472 -74.8447 -286.08c-13.542 -23.2471 27.8145 -63.6953 50.4932 -50.4883
+c66.6006 38.7949 165.636 -45.5996 286.076 74.8428c120.444 120.445 36.0449 219.472 74.8447 286.08zM291.846 338.481c1.37012 -10.96 -6.40332 -20.957 -17.3643 -22.3271c-54.8467 -6.85547 -135.779 -87.7871 -142.636 -142.636
+c-1.37305 -10.9883 -11.3984 -18.7334 -22.3262 -17.3643c-10.9609 1.37012 -18.7344 11.3652 -17.3643 22.3262c9.16211 73.2852 104.167 168.215 177.364 177.364c10.9531 1.36816 20.9561 -6.40234 22.3262 -17.3633z" />
+    <glyph glyph-name="credit-card" unicode="&#xf09d;" horiz-adv-x="576" 
+d="M527.9 416c26.5996 0 48.0996 -21.5 48.0996 -48v-352c0 -26.5 -21.5 -48 -48.0996 -48h-479.801c-26.5996 0 -48.0996 21.5 -48.0996 48v352c0 26.5 21.5 48 48.0996 48h479.801zM54.0996 368c-3.2998 0 -6 -2.7002 -6 -6v-42h479.801v42c0 3.2998 -2.7002 6 -6 6
+h-467.801zM521.9 16c3.2998 0 6 2.7002 6 6v170h-479.801v-170c0 -3.2998 2.7002 -6 6 -6h467.801zM192 116v-40c0 -6.59961 -5.40039 -12 -12 -12h-72c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h72c6.59961 0 12 -5.40039 12 -12zM384 116v-40
+c0 -6.59961 -5.40039 -12 -12 -12h-136c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h136c6.59961 0 12 -5.40039 12 -12z" />
+    <glyph glyph-name="hdd" unicode="&#xf0a0;" horiz-adv-x="576" 
+d="M567.403 212.358c5.59668 -8.04688 8.59668 -17.6113 8.59668 -27.4121v-136.946c0 -26.5098 -21.4902 -48 -48 -48h-480c-26.5098 0 -48 21.4902 -48 48v136.946c0 10.167 3.19531 19.6465 8.59668 27.4121l105.08 151.053
+c8.67383 12.4678 23.0791 20.5889 39.4043 20.5889h269.838c16.3252 0 30.7305 -8.12109 39.4043 -20.5889zM153.081 336l-77.9131 -112h425.664l-77.9131 112h-269.838zM528 48v128h-480v-128h480zM496 112c0 -17.6729 -14.3271 -32 -32 -32s-32 14.3271 -32 32
+s14.3271 32 32 32s32 -14.3271 32 -32zM400 112c0 -17.6729 -14.3271 -32 -32 -32s-32 14.3271 -32 32s14.3271 32 32 32s32 -14.3271 32 -32z" />
+    <glyph glyph-name="hand-point-right" unicode="&#xf0a4;" 
+d="M428.8 310.4c45.0996 0 83.2002 -38.1016 83.2002 -83.2002c0 -45.6162 -37.7646 -83.2002 -83.2002 -83.2002h-35.6475c-1.71387 -7.70605 -4.43555 -15.2051 -7.92969 -22.0645c2.50586 -22.0059 -3.50293 -44.9775 -15.9844 -62.791
+c-1.14062 -52.4863 -37.3984 -91.1445 -99.9404 -91.1445h-21.2988c-60.0635 0 -98.5117 40 -127.2 40h-2.67871c-5.74707 -4.95215 -13.5361 -8 -22.1201 -8h-64c-17.6729 0 -32 12.8936 -32 28.7998v230.4c0 15.9062 14.3271 28.7998 32 28.7998h64.001
+c8.58398 0 16.373 -3.04785 22.1201 -8h2.67871c6.96387 0 14.8623 6.19336 30.1816 23.6689l0.128906 0.148438l0.130859 0.145508c8.85645 9.93652 18.1162 20.8398 25.8506 33.2529c18.7051 30.2471 30.3936 78.7842 75.707 78.7842c56.9277 0 92 -35.2861 92 -83.2002
+c0 -0.0283203 0 0.0361328 0 0.0078125c0 -7.66602 -0.748047 -15.1582 -2.17578 -22.4072h86.1768zM428.8 192c18.9756 0 35.2002 16.2246 35.2002 35.2002c0 18.7002 -16.7754 35.2002 -35.2002 35.2002h-158.399c0 17.3242 26.3994 35.1992 26.3994 70.3994
+c0 26.4004 -20.625 35.2002 -44 35.2002c-8.79395 0 -20.4443 -32.7119 -34.9258 -56.0996c-9.07422 -14.5752 -19.5244 -27.2256 -30.7988 -39.875c-16.1094 -18.374 -33.8359 -36.6328 -59.0752 -39.5967v-176.753c42.79 -3.7627 74.5088 -39.6758 120 -39.6758h21.2988
+c40.5244 0 57.124 22.1973 50.6006 61.3252c14.6113 8.00098 24.1514 33.9785 12.9248 53.625c19.3652 18.2246 17.7871 46.3809 4.9502 61.0498h91.0254zM88 64c0 13.2549 -10.7451 24 -24 24s-24 -10.7451 -24 -24s10.7451 -24 24 -24s24 10.7451 24 24z" />
+    <glyph glyph-name="hand-point-left" unicode="&#xf0a5;" 
+d="M0 227.2c0 45.0986 38.1006 83.2002 83.2002 83.2002h86.1758c-1.3623 6.91016 -2.17578 14.374 -2.17578 22.3994c0 47.9141 35.0723 83.2002 92 83.2002c45.3135 0 57.002 -48.5371 75.7061 -78.7852c7.73438 -12.4121 16.9951 -23.3154 25.8506 -33.2529
+l0.130859 -0.145508l0.128906 -0.148438c15.3213 -17.4746 23.2197 -23.668 30.1836 -23.668h2.67871c5.74707 4.95215 13.5361 8 22.1201 8h64c17.6729 0 32 -12.8936 32 -28.7998v-230.4c0 -15.9062 -14.3271 -28.7998 -32 -28.7998h-64
+c-8.58398 0 -16.373 3.04785 -22.1201 8h-2.67871c-28.6885 0 -67.1367 -40 -127.2 -40h-21.2988c-62.542 0 -98.8008 38.6582 -99.9404 91.1445c-12.4814 17.8135 -18.4922 40.7852 -15.9844 62.791c-3.49414 6.85938 -6.21582 14.3584 -7.92969 22.0645h-35.6465
+c-45.4355 0 -83.2002 37.584 -83.2002 83.2002zM48 227.2c0 -18.9756 16.2246 -35.2002 35.2002 -35.2002h91.0244c-12.8369 -14.6689 -14.415 -42.8252 4.9502 -61.0498c-11.2256 -19.6465 -1.68652 -45.624 12.9248 -53.625
+c-6.52246 -39.1279 10.0771 -61.3252 50.6016 -61.3252h21.2988c45.4912 0 77.21 35.9131 120 39.6768v176.752c-25.2393 2.96289 -42.9658 21.2227 -59.0752 39.5967c-11.2744 12.6494 -21.7246 25.2998 -30.7988 39.875
+c-14.4814 23.3877 -26.1318 56.0996 -34.9258 56.0996c-23.375 0 -44 -8.7998 -44 -35.2002c0 -35.2002 26.3994 -53.0752 26.3994 -70.3994h-158.399c-18.4248 0 -35.2002 -16.5 -35.2002 -35.2002zM448 88c-13.2549 0 -24 -10.7451 -24 -24s10.7451 -24 24 -24
+s24 10.7451 24 24s-10.7451 24 -24 24z" />
+    <glyph glyph-name="hand-point-up" unicode="&#xf0a6;" horiz-adv-x="448" 
+d="M105.6 364.8c0 45.0996 38.1016 83.2002 83.2002 83.2002c45.6162 0 83.2002 -37.7646 83.2002 -83.2002v-35.6465c7.70605 -1.71387 15.2051 -4.43555 22.0645 -7.92969c22.0059 2.50684 44.9775 -3.50293 62.791 -15.9844
+c52.4863 -1.14062 91.1445 -37.3984 91.1445 -99.9404v-21.2988c0 -60.0635 -40 -98.5117 -40 -127.2v-2.67871c4.95215 -5.74707 8 -13.5361 8 -22.1201v-64c0 -17.6729 -12.8936 -32 -28.7998 -32h-230.4c-15.9062 0 -28.7998 14.3271 -28.7998 32v64
+c0 8.58398 3.04785 16.373 8 22.1201v2.67871c0 6.96387 -6.19336 14.8623 -23.6689 30.1816l-0.148438 0.128906l-0.145508 0.130859c-9.93652 8.85645 -20.8398 18.1162 -33.2529 25.8506c-30.2471 18.7051 -78.7842 30.3936 -78.7842 75.707
+c0 56.9277 35.2861 92 83.2002 92c0.0283203 0 -0.0361328 0 -0.0078125 0c7.66602 0 15.1582 -0.748047 22.4072 -2.17578v86.1768zM224 364.8c0 18.9756 -16.2246 35.2002 -35.2002 35.2002c-18.7002 0 -35.2002 -16.7754 -35.2002 -35.2002v-158.399
+c-17.3242 0 -35.1992 26.3994 -70.3994 26.3994c-26.4004 0 -35.2002 -20.625 -35.2002 -44c0 -8.79395 32.7119 -20.4443 56.0996 -34.9258c14.5752 -9.07422 27.2256 -19.5244 39.875 -30.7988c18.374 -16.1094 36.6328 -33.8359 39.5967 -59.0752h176.753
+c3.7627 42.79 39.6758 74.5088 39.6758 120v21.2988c0 40.5244 -22.1973 57.124 -61.3252 50.6006c-8.00098 14.6113 -33.9785 24.1514 -53.625 12.9248c-18.2246 19.3652 -46.3809 17.7871 -61.0498 4.9502v91.0254zM352 24c-13.2549 0 -24 -10.7451 -24 -24
+s10.7451 -24 24 -24s24 10.7451 24 24s-10.7451 24 -24 24z" />
+    <glyph glyph-name="hand-point-down" unicode="&#xf0a7;" horiz-adv-x="448" 
+d="M188.8 -64c-45.0986 0 -83.2002 38.1006 -83.2002 83.2002v86.1758c-6.91016 -1.3623 -14.374 -2.17578 -22.3994 -2.17578c-47.9141 0 -83.2002 35.0723 -83.2002 92c0 45.3135 48.5371 57.002 78.7852 75.707c12.4121 7.73438 23.3154 16.9951 33.2529 25.8506
+l0.145508 0.130859l0.148438 0.128906c17.4746 15.3213 23.668 23.2197 23.668 30.1836v2.67871c-4.95215 5.74707 -8 13.5361 -8 22.1201v64c0 17.6729 12.8936 32 28.7998 32h230.4c15.9062 0 28.7998 -14.3271 28.7998 -32v-64.001
+c0 -8.58398 -3.04785 -16.373 -8 -22.1201v-2.67871c0 -28.6885 40 -67.1367 40 -127.2v-21.2988c0 -62.542 -38.6582 -98.8008 -91.1445 -99.9404c-17.8135 -12.4814 -40.7852 -18.4922 -62.791 -15.9844c-6.85938 -3.49414 -14.3584 -6.21582 -22.0645 -7.92969v-35.6465
+c0 -45.4355 -37.584 -83.2002 -83.2002 -83.2002zM188.8 -16c18.9756 0 35.2002 16.2246 35.2002 35.2002v91.0244c14.6689 -12.8369 42.8252 -14.415 61.0498 4.9502c19.6465 -11.2256 45.624 -1.68652 53.625 12.9248c39.1279 -6.52246 61.3252 10.0771 61.3252 50.6016
+v21.2988c0 45.4912 -35.9131 77.21 -39.6768 120h-176.752c-2.96289 -25.2393 -21.2227 -42.9658 -39.5967 -59.0752c-12.6494 -11.2744 -25.2998 -21.7246 -39.875 -30.7988c-23.3877 -14.4814 -56.0996 -26.1318 -56.0996 -34.9258c0 -23.375 8.7998 -44 35.2002 -44
+c35.2002 0 53.0752 26.3994 70.3994 26.3994v-158.399c0 -18.4248 16.5 -35.2002 35.2002 -35.2002zM328 384c0 -13.2549 10.7451 -24 24 -24s24 10.7451 24 24s-10.7451 24 -24 24s-24 -10.7451 -24 -24z" />
+    <glyph glyph-name="copy" unicode="&#xf0c5;" horiz-adv-x="448" 
+d="M433.941 382.059c8.68848 -8.68848 14.0586 -20.6943 14.0586 -33.9404v-268.118c0 -26.5098 -21.4902 -48 -48 -48h-80v-48c0 -26.5098 -21.4902 -48 -48 -48h-224c-26.5098 0 -48 21.4902 -48 48v320c0 26.5098 21.4902 48 48 48h80v48c0 26.5098 21.4902 48 48 48
+h172.118c13.2461 0 25.252 -5.37012 33.9404 -14.0586zM266 -16c3.31152 0 6 2.68848 6 6v42h-96c-26.5098 0 -48 21.4902 -48 48v224h-74c-3.31152 0 -6 -2.68848 -6 -6v-308c0 -3.31152 2.68848 -6 6 -6h212zM394 80c3.31152 0 6 2.68848 6 6v202h-88
+c-13.2549 0 -24 10.7451 -24 24v88h-106c-3.31152 0 -6 -2.68848 -6 -6v-308c0 -3.31152 2.68848 -6 6 -6h212zM400 336v9.63184c0 1.65527 -0.670898 3.15723 -1.75684 4.24316l-48.3682 48.3682c-1.12598 1.125 -2.65234 1.75684 -4.24316 1.75684h-9.63184v-64h64z" />
+    <glyph glyph-name="save" unicode="&#xf0c7;" horiz-adv-x="448" 
+d="M433.941 318.059c8.68848 -8.68848 14.0586 -20.6943 14.0586 -33.9404v-268.118c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h268.118c13.2461 0 25.252 -5.37012 33.9404 -14.0586zM272 368h-128v-80h128v80z
+M394 16c3.31152 0 6 2.68848 6 6v259.632c0 1.65527 -0.670898 3.15723 -1.75684 4.24316l-78.2432 78.2432v-100.118c0 -13.2549 -10.7451 -24 -24 -24h-176c-13.2549 0 -24 10.7451 -24 24v104h-42c-3.31152 0 -6 -2.68848 -6 -6v-340c0 -3.31152 2.68848 -6 6 -6h340z
+M224 216c48.5234 0 88 -39.4766 88 -88s-39.4766 -88 -88 -88s-88 39.4766 -88 88s39.4766 88 88 88zM224 88c22.0557 0 40 17.9443 40 40s-17.9443 40 -40 40s-40 -17.9443 -40 -40s17.9443 -40 40 -40z" />
+    <glyph glyph-name="square" unicode="&#xf0c8;" horiz-adv-x="448" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM394 16c3.2998 0 6 2.7002 6 6v340c0 3.2998 -2.7002 6 -6 6h-340c-3.2998 0 -6 -2.7002 -6 -6v-340c0 -3.2998 2.7002 -6 6 -6h340z" />
+    <glyph glyph-name="envelope" unicode="&#xf0e0;" 
+d="M464 384c26.5098 0 48 -21.4902 48 -48v-288c0 -26.5098 -21.4902 -48 -48 -48h-416c-26.5098 0 -48 21.4902 -48 48v288c0 26.5098 21.4902 48 48 48h416zM464 336h-416v-40.8047c22.4248 -18.2627 58.1797 -46.6602 134.587 -106.49
+c16.834 -13.2422 50.2051 -45.0762 73.4131 -44.7012c23.2119 -0.371094 56.5723 31.4541 73.4131 44.7012c76.4189 59.8389 112.165 88.2305 134.587 106.49v40.8047zM48 48h416v185.601c-22.915 -18.252 -55.4189 -43.8691 -104.947 -82.6523
+c-22.5439 -17.748 -60.3359 -55.1787 -103.053 -54.9473c-42.9277 -0.231445 -81.2051 37.75 -103.062 54.9551c-49.5293 38.7842 -82.0244 64.3945 -104.938 82.6455v-185.602z" />
+    <glyph glyph-name="lightbulb" unicode="&#xf0eb;" horiz-adv-x="352" 
+d="M176 368c8.83984 0 16 -7.16016 16 -16s-7.16016 -16 -16 -16c-35.2803 0 -64 -28.7002 -64 -64c0 -8.83984 -7.16016 -16 -16 -16s-16 7.16016 -16 16c0 52.9404 43.0596 96 96 96zM96.0596 -11.1699l-0.0400391 43.1797h159.961l-0.0507812 -43.1797
+c-0.00976562 -3.13965 -0.939453 -6.21973 -2.67969 -8.83984l-24.5098 -36.8398c-2.95996 -4.45996 -7.95996 -7.14062 -13.3203 -7.14062h-78.8496c-5.35059 0 -10.3506 2.68066 -13.3203 7.14062l-24.5098 36.8398c-1.75 2.62012 -2.68066 5.68945 -2.68066 8.83984z
+M176 448c97.2002 0 176 -78.7998 176 -176c0 -44.3701 -16.4502 -84.8496 -43.5498 -115.79c-16.6406 -18.9795 -42.7402 -58.79 -52.4199 -92.1602v-0.0498047h-48v0.0996094c0.00488281 4.98145 0.790039 9.78809 2.21973 14.3008
+c5.67969 17.9893 22.9902 64.8496 62.0996 109.46c20.4102 23.29 31.6504 53.1699 31.6504 84.1396c0 70.5801 -57.4199 128 -128 128c-68.2803 0 -128.15 -54.3604 -127.95 -128c0.0898438 -30.9902 11.0703 -60.71 31.6104 -84.1396
+c39.3496 -44.9004 56.5801 -91.8604 62.1699 -109.67c1.42969 -4.56055 2.13965 -9.30078 2.15039 -14.0703v-0.120117h-48v0.0595703c-9.68066 33.3604 -35.7803 73.1709 -52.4209 92.1602c-27.1094 30.9307 -43.5596 71.4102 -43.5596 115.78
+c0 93.0303 73.7197 176 176 176z" />
+    <glyph glyph-name="bell" unicode="&#xf0f3;" horiz-adv-x="448" 
+d="M439.39 85.71c6 -6.44043 8.66016 -14.1602 8.61035 -21.71c-0.0996094 -16.4004 -12.9805 -32 -32.0996 -32h-383.801c-19.1191 0 -31.9893 15.5996 -32.0996 32c-0.0498047 7.5498 2.61035 15.2598 8.61035 21.71c19.3193 20.7598 55.4697 51.9902 55.4697 154.29
+c0 77.7002 54.4795 139.9 127.939 155.16v20.8398c0 17.6699 14.3203 32 31.9805 32s31.9805 -14.3301 31.9805 -32v-20.8398c73.46 -15.2598 127.939 -77.46 127.939 -155.16c0 -102.3 36.1504 -133.53 55.4697 -154.29zM67.5303 80h312.939
+c-21.2197 27.96 -44.4199 74.3203 -44.5293 159.42c0 0.200195 0.0595703 0.379883 0.0595703 0.580078c0 61.8604 -50.1396 112 -112 112s-112 -50.1396 -112 -112c0 -0.200195 0.0595703 -0.379883 0.0595703 -0.580078
+c-0.109375 -85.0898 -23.3096 -131.45 -44.5293 -159.42zM224 -64c-35.3203 0 -63.9697 28.6504 -63.9697 64h127.939c0 -35.3496 -28.6494 -64 -63.9697 -64z" />
+    <glyph glyph-name="hospital" unicode="&#xf0f8;" horiz-adv-x="448" 
+d="M128 204v40c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12zM268 192c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40
+c0 -6.62695 -5.37305 -12 -12 -12h-40zM192 108c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40zM268 96c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40
+c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-40zM448 -28v-36h-448v36c0 6.62695 5.37305 12 12 12h19.5v378.965c0 11.6172 10.7451 21.0352 24 21.0352h88.5v40c0 13.2549 10.7451 24 24 24h112c13.2549 0 24 -10.7451 24 -24v-40h88.5
+c13.2549 0 24 -9.41797 24 -21.0352v-378.965h19.5c6.62695 0 12 -5.37305 12 -12zM79.5 -15h112.5v67c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-67h112.5v351h-64.5v-24c0 -13.2549 -10.7451 -24 -24 -24h-112c-13.2549 0 -24 10.7451 -24 24v24
+h-64.5v-351zM266 384h-26v26c0 3.31152 -2.68848 6 -6 6h-20c-3.31152 0 -6 -2.68848 -6 -6v-26h-26c-3.31152 0 -6 -2.68848 -6 -6v-20c0 -3.31152 2.68848 -6 6 -6h26v-26c0 -3.31152 2.68848 -6 6 -6h20c3.31152 0 6 2.68848 6 6v26h26c3.31152 0 6 2.68848 6 6v20
+c0 3.31152 -2.68848 6 -6 6z" />
+    <glyph glyph-name="plus-square" unicode="&#xf0fe;" horiz-adv-x="448" 
+d="M352 208v-32c0 -6.59961 -5.40039 -12 -12 -12h-88v-88c0 -6.59961 -5.40039 -12 -12 -12h-32c-6.59961 0 -12 5.40039 -12 12v88h-88c-6.59961 0 -12 5.40039 -12 12v32c0 6.59961 5.40039 12 12 12h88v88c0 6.59961 5.40039 12 12 12h32c6.59961 0 12 -5.40039 12 -12
+v-88h88c6.59961 0 12 -5.40039 12 -12zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48zM400 22v340c0 3.2998 -2.7002 6 -6 6h-340c-3.2998 0 -6 -2.7002 -6 -6v-340
+c0 -3.2998 2.7002 -6 6 -6h340c3.2998 0 6 2.7002 6 6z" />
+    <glyph glyph-name="circle" unicode="&#xf111;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM256 -8c110.5 0 200 89.5 200 200s-89.5 200 -200 200s-200 -89.5 -200 -200s89.5 -200 200 -200z" />
+    <glyph glyph-name="smile" unicode="&#xf118;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM168 208c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32
+s32 -14.2998 32 -32s-14.2998 -32 -32 -32zM328 208c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32s32 -14.2998 32 -32s-14.2998 -32 -32 -32zM332 135.4c8.5 10.1992 23.7002 11.5 33.7998 3.09961c10.2002 -8.5 11.6006 -23.5996 3.10059 -33.7998
+c-30 -36 -74.1006 -56.6006 -120.9 -56.6006s-90.9004 20.6006 -120.9 56.6006c-8.39941 10.2002 -7.09961 25.2998 3.10059 33.7998c10.0996 8.40039 25.2998 7.09961 33.7998 -3.09961c20.7998 -25.1006 51.5 -39.4004 84 -39.4004s63.2002 14.4004 84 39.4004z" />
+    <glyph glyph-name="frown" unicode="&#xf119;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM168 208c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32
+s32 -14.2998 32 -32s-14.2998 -32 -32 -32zM328 272c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32zM248 144c40.2002 0 78 -17.7002 103.8 -48.5996c8.40039 -10.2002 7.10059 -25.3008 -3.09961 -33.8008
+c-10.7002 -8.7998 -25.7002 -6.59961 -33.7998 3.10059c-16.6006 20 -41 31.3994 -66.9004 31.3994s-50.2998 -11.5 -66.9004 -31.3994c-8.5 -10.2002 -23.5996 -11.5 -33.7998 -3.10059c-10.2002 8.5 -11.5996 23.6006 -3.09961 33.8008
+c25.7998 30.8994 63.5996 48.5996 103.8 48.5996z" />
+    <glyph glyph-name="meh" unicode="&#xf11a;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM168 208c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32
+s32 -14.2998 32 -32s-14.2998 -32 -32 -32zM328 272c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32zM336 128c13.2002 0 24 -10.7998 24 -24s-10.7998 -24 -24 -24h-176c-13.2002 0 -24 10.7998 -24 24s10.7998 24 24 24h176z
+" />
+    <glyph glyph-name="keyboard" unicode="&#xf11c;" horiz-adv-x="576" 
+d="M528 384c26.5098 0 48 -21.4902 48 -48v-288c0 -26.5098 -21.4902 -48 -48 -48h-480c-26.5098 0 -48 21.4902 -48 48v288c0 26.5098 21.4902 48 48 48h480zM536 48v288c0 4.41113 -3.58887 8 -8 8h-480c-4.41113 0 -8 -3.58887 -8 -8v-288c0 -4.41113 3.58887 -8 8 -8
+h480c4.41113 0 8 3.58887 8 8zM170 178c0 -6.62695 -5.37305 -12 -12 -12h-28c-6.62695 0 -12 5.37305 -12 12v28c0 6.62695 5.37305 12 12 12h28c6.62695 0 12 -5.37305 12 -12v-28zM266 178c0 -6.62695 -5.37305 -12 -12 -12h-28c-6.62695 0 -12 5.37305 -12 12v28
+c0 6.62695 5.37305 12 12 12h28c6.62695 0 12 -5.37305 12 -12v-28zM362 178c0 -6.62695 -5.37305 -12 -12 -12h-28c-6.62695 0 -12 5.37305 -12 12v28c0 6.62695 5.37305 12 12 12h28c6.62695 0 12 -5.37305 12 -12v-28zM458 178c0 -6.62695 -5.37305 -12 -12 -12h-28
+c-6.62695 0 -12 5.37305 -12 12v28c0 6.62695 5.37305 12 12 12h28c6.62695 0 12 -5.37305 12 -12v-28zM122 96c0 -6.62695 -5.37305 -12 -12 -12h-28c-6.62695 0 -12 5.37305 -12 12v28c0 6.62695 5.37305 12 12 12h28c6.62695 0 12 -5.37305 12 -12v-28zM506 96
+c0 -6.62695 -5.37305 -12 -12 -12h-28c-6.62695 0 -12 5.37305 -12 12v28c0 6.62695 5.37305 12 12 12h28c6.62695 0 12 -5.37305 12 -12v-28zM122 260c0 -6.62695 -5.37305 -12 -12 -12h-28c-6.62695 0 -12 5.37305 -12 12v28c0 6.62695 5.37305 12 12 12h28
+c6.62695 0 12 -5.37305 12 -12v-28zM218 260c0 -6.62695 -5.37305 -12 -12 -12h-28c-6.62695 0 -12 5.37305 -12 12v28c0 6.62695 5.37305 12 12 12h28c6.62695 0 12 -5.37305 12 -12v-28zM314 260c0 -6.62695 -5.37305 -12 -12 -12h-28c-6.62695 0 -12 5.37305 -12 12v28
+c0 6.62695 5.37305 12 12 12h28c6.62695 0 12 -5.37305 12 -12v-28zM410 260c0 -6.62695 -5.37305 -12 -12 -12h-28c-6.62695 0 -12 5.37305 -12 12v28c0 6.62695 5.37305 12 12 12h28c6.62695 0 12 -5.37305 12 -12v-28zM506 260c0 -6.62695 -5.37305 -12 -12 -12h-28
+c-6.62695 0 -12 5.37305 -12 12v28c0 6.62695 5.37305 12 12 12h28c6.62695 0 12 -5.37305 12 -12v-28zM408 102c0 -6.62695 -5.37305 -12 -12 -12h-216c-6.62695 0 -12 5.37305 -12 12v16c0 6.62695 5.37305 12 12 12h216c6.62695 0 12 -5.37305 12 -12v-16z" />
+    <glyph glyph-name="calendar" unicode="&#xf133;" horiz-adv-x="448" 
+d="M400 384c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h48v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h128v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12
+v-52h48zM394 -16c3.2998 0 6 2.7002 6 6v298h-352v-298c0 -3.2998 2.7002 -6 6 -6h340z" />
+    <glyph glyph-name="play-circle" unicode="&#xf144;" 
+d="M371.7 210c16.3994 -9.2002 16.3994 -32.9004 0 -42l-176 -101c-15.9004 -8.7998 -35.7002 2.59961 -35.7002 21v208c0 18.5 19.9004 29.7998 35.7002 21zM504 192c0 -137 -111 -248 -248 -248s-248 111 -248 248s111 248 248 248s248 -111 248 -248zM56 192
+c0 -110.5 89.5 -200 200 -200s200 89.5 200 200s-89.5 200 -200 200s-200 -89.5 -200 -200z" />
+    <glyph glyph-name="minus-square" unicode="&#xf146;" horiz-adv-x="448" 
+d="M108 164c-6.59961 0 -12 5.40039 -12 12v32c0 6.59961 5.40039 12 12 12h232c6.59961 0 12 -5.40039 12 -12v-32c0 -6.59961 -5.40039 -12 -12 -12h-232zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352
+c26.5 0 48 -21.5 48 -48zM400 22v340c0 3.2998 -2.7002 6 -6 6h-340c-3.2998 0 -6 -2.7002 -6 -6v-340c0 -3.2998 2.7002 -6 6 -6h340c3.2998 0 6 2.7002 6 6z" />
+    <glyph glyph-name="check-square" unicode="&#xf14a;" horiz-adv-x="448" 
+d="M400 416c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h352zM400 16v352h-352v-352h352zM364.136 257.724l-172.589 -171.204
+c-4.70508 -4.66699 -12.3027 -4.63672 -16.9697 0.0683594l-90.7812 91.5156c-4.66699 4.70508 -4.63672 12.3037 0.0693359 16.9717l22.7188 22.5361c4.70508 4.66699 12.3027 4.63672 16.9697 -0.0693359l59.792 -60.2773l141.353 140.217
+c4.70508 4.66699 12.3027 4.63672 16.9697 -0.0683594l22.5361 -22.7178c4.66699 -4.70605 4.63672 -12.3047 -0.0683594 -16.9717z" />
+    <glyph glyph-name="share-square" unicode="&#xf14d;" horiz-adv-x="576" 
+d="M561.938 289.94c18.75 -18.7402 18.75 -49.1406 0 -67.8809l-143.998 -144c-29.9727 -29.9727 -81.9404 -9.05273 -81.9404 33.9404v53.7998c-101.266 -7.83691 -99.625 -31.6406 -84.1104 -78.7598c14.2285 -43.0889 -33.4736 -79.248 -71.0195 -55.7402
+c-51.6924 32.3057 -84.8701 83.0635 -84.8701 144.76c0 39.3408 12.2197 72.7402 36.3301 99.3008c19.8398 21.8398 47.7402 38.4697 82.9102 49.4199c36.7295 11.4395 78.3096 16.1094 120.76 17.9893v57.1982c0 42.9355 51.9258 63.9541 81.9404 33.9404zM384 112l144 144
+l-144 144v-104.09c-110.86 -0.90332 -240 -10.5166 -240 -119.851c0 -52.1396 32.79 -85.6094 62.3096 -104.06c-39.8174 120.65 48.999 141.918 177.69 143.84v-103.84zM408.74 27.5068c7.4375 2.125 14.5508 5.30566 20.9736 9.30273
+c7.97656 4.95215 18.2861 -0.825195 18.2861 -10.2139v-42.5957c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h132c6.62695 0 12 -5.37305 12 -12v-4.48633c0 -4.91699 -2.9873 -9.36914 -7.56934 -11.1514
+c-13.7021 -5.33105 -26.3955 -11.5371 -38.0498 -18.585c-1.82715 -1.11523 -3.98633 -1.76953 -6.28027 -1.77734h-86.1006c-3.31152 0 -6 -2.68848 -6 -6v-340c0 -3.31152 2.68848 -6 6 -6h340c3.31152 0 6 2.68848 6 6v25.9658c0 5.37012 3.5791 10.0596 8.74023 11.541z
+" />
+    <glyph glyph-name="compass" unicode="&#xf14e;" horiz-adv-x="496" 
+d="M347.94 318.14c16.6592 7.61035 33.8096 -9.54004 26.1992 -26.1992l-65.9697 -144.341c-3.19238 -6.9834 -8.78613 -12.5771 -15.7695 -15.7695l-144.341 -65.9697c-16.6592 -7.61035 -33.8096 9.5498 -26.1992 26.1992l65.9697 144.341
+c3.19238 6.9834 8.78613 12.5771 15.7695 15.7695zM270.58 169.42c12.4697 12.4697 12.4697 32.6904 0 45.1602s-32.6904 12.4697 -45.1602 0s-12.4697 -32.6904 0 -45.1602s32.6904 -12.4697 45.1602 0zM248 440c136.97 0 248 -111.03 248 -248s-111.03 -248 -248 -248
+s-248 111.03 -248 248s111.03 248 248 248zM248 -8c110.28 0 200 89.7197 200 200s-89.7197 200 -200 200s-200 -89.7197 -200 -200s89.7197 -200 200 -200z" />
+    <glyph glyph-name="caret-square-down" unicode="&#xf150;" horiz-adv-x="448" 
+d="M125.1 240h197.801c10.6992 0 16.0996 -13 8.5 -20.5l-98.9004 -98.2998c-4.7002 -4.7002 -12.2002 -4.7002 -16.9004 0l-98.8994 98.2998c-7.7002 7.5 -2.2998 20.5 8.39941 20.5zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352
+c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48zM400 22v340c0 3.2998 -2.7002 6 -6 6h-340c-3.2998 0 -6 -2.7002 -6 -6v-340c0 -3.2998 2.7002 -6 6 -6h340c3.2998 0 6 2.7002 6 6z" />
+    <glyph glyph-name="caret-square-up" unicode="&#xf151;" horiz-adv-x="448" 
+d="M322.9 144h-197.801c-10.6992 0 -16.0996 13 -8.5 20.5l98.9004 98.2998c4.7002 4.7002 12.2002 4.7002 16.9004 0l98.8994 -98.2998c7.7002 -7.5 2.2998 -20.5 -8.39941 -20.5zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352
+c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48zM400 22v340c0 3.2998 -2.7002 6 -6 6h-340c-3.2998 0 -6 -2.7002 -6 -6v-340c0 -3.2998 2.7002 -6 6 -6h340c3.2998 0 6 2.7002 6 6z" />
+    <glyph glyph-name="caret-square-right" unicode="&#xf152;" horiz-adv-x="448" 
+d="M176 93.0996v197.801c0 10.6992 13 16.0996 20.5 8.5l98.2998 -98.9004c4.7002 -4.7002 4.7002 -12.2002 0 -16.9004l-98.2998 -98.8994c-7.5 -7.7002 -20.5 -2.2998 -20.5 8.39941zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352
+c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48zM400 22v340c0 3.2998 -2.7002 6 -6 6h-340c-3.2998 0 -6 -2.7002 -6 -6v-340c0 -3.2998 2.7002 -6 6 -6h340c3.2998 0 6 2.7002 6 6z" />
+    <glyph glyph-name="file" unicode="&#xf15b;" horiz-adv-x="384" 
+d="M369.9 350.1c9 -9 14.0996 -21.2998 14.0996 -34v-332.1c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48.0996h204.1c12.7002 0 24.9004 -5.09961 33.9004 -14.0996zM332.1 320l-76.0996 76.0996v-76.0996h76.0996zM48 -16h288v288
+h-104c-13.2998 0 -24 10.7002 -24 24v104h-160v-416z" />
+    <glyph glyph-name="file-alt" unicode="&#xf15c;" horiz-adv-x="384" 
+d="M288 200v-28c0 -6.59961 -5.40039 -12 -12 -12h-168c-6.59961 0 -12 5.40039 -12 12v28c0 6.59961 5.40039 12 12 12h168c6.59961 0 12 -5.40039 12 -12zM276 128c6.59961 0 12 -5.40039 12 -12v-28c0 -6.59961 -5.40039 -12 -12 -12h-168c-6.59961 0 -12 5.40039 -12 12
+v28c0 6.59961 5.40039 12 12 12h168zM384 316.1v-332.1c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48h204.1c12.7002 0 24.9004 -5.09961 33.9004 -14.0996l83.9004 -83.9004c9 -8.90039 14.0996 -21.2002 14.0996 -33.9004z
+M256 396.1v-76.0996h76.0996zM336 -16v288h-104c-13.2998 0 -24 10.7002 -24 24v104h-160v-416h288z" />
+    <glyph glyph-name="thumbs-up" unicode="&#xf164;" 
+d="M466.27 161.31c4.6748 -22.6465 0.864258 -44.5371 -8.98926 -62.9893c2.95898 -23.8682 -4.02148 -48.5654 -17.3398 -66.9902c-0.954102 -55.9072 -35.8232 -95.3301 -112.94 -95.3301c-7 0 -15 0.00976562 -22.2197 0.00976562
+c-102.742 0 -133.293 38.9395 -177.803 39.9404c-3.56934 -13.7764 -16.085 -23.9502 -30.9775 -23.9502h-64c-17.6729 0 -32 14.3271 -32 32v240c0 17.6729 14.3271 32 32 32h98.7598c19.1455 16.9531 46.0137 60.6533 68.7598 83.4004
+c13.667 13.667 10.1533 108.6 71.7607 108.6c57.5801 0 95.2695 -31.9355 95.2695 -104.73c0 -18.4092 -3.92969 -33.7295 -8.84961 -46.5391h36.4795c48.6025 0 85.8203 -41.5654 85.8203 -85.5801c0 -19.1504 -4.95996 -34.9902 -13.7305 -49.8408zM404.52 107.48
+c21.5811 20.3838 18.6992 51.0645 5.21094 65.6191c9.44922 0 22.3594 18.9102 22.2695 37.8105c-0.0898438 18.9102 -16.71 37.8203 -37.8203 37.8203h-103.989c0 37.8193 28.3594 55.3691 28.3594 94.5391c0 23.75 0 56.7305 -47.2695 56.7305
+c-18.9102 -18.9102 -9.45996 -66.1797 -37.8203 -94.54c-26.5596 -26.5703 -66.1797 -97.46 -94.54 -97.46h-10.9199v-186.17c53.6113 0 100.001 -37.8203 171.64 -37.8203h37.8203c35.5117 0 60.8203 17.1201 53.1201 65.9004
+c15.2002 8.16016 26.5 36.4395 13.9395 57.5703zM88 16c0 13.2549 -10.7451 24 -24 24s-24 -10.7451 -24 -24s10.7451 -24 24 -24s24 10.7451 24 24z" />
+    <glyph glyph-name="thumbs-down" unicode="&#xf165;" 
+d="M466.27 222.69c8.77051 -14.8506 13.7305 -30.6904 13.7305 -49.8408c0 -44.0146 -37.2178 -85.5801 -85.8203 -85.5801h-36.4795c4.91992 -12.8096 8.84961 -28.1299 8.84961 -46.5391c0 -72.7949 -37.6895 -104.73 -95.2695 -104.73
+c-61.6074 0 -58.0938 94.9326 -71.7607 108.6c-22.7461 22.7471 -49.6133 66.4473 -68.7598 83.4004h-7.05176c-5.5332 -9.56152 -15.8662 -16 -27.708 -16h-64c-17.6729 0 -32 14.3271 -32 32v240c0 17.6729 14.3271 32 32 32h64c8.11328 0 15.5146 -3.02539 21.1553 -8
+h10.8447c40.9971 0 73.1953 39.9902 176.78 39.9902c7.21973 0 15.2197 0.00976562 22.2197 0.00976562c77.1172 0 111.986 -39.4229 112.94 -95.3301c13.3184 -18.4248 20.2979 -43.1221 17.3398 -66.9902c9.85352 -18.4521 13.6641 -40.3428 8.98926 -62.9893zM64 152
+c13.2549 0 24 10.7451 24 24s-10.7451 24 -24 24s-24 -10.7451 -24 -24s10.7451 -24 24 -24zM394.18 135.27c21.1104 0 37.7305 18.9102 37.8203 37.8203c0.0898438 18.9004 -12.8203 37.8105 -22.2695 37.8105c13.4883 14.5547 16.3701 45.2354 -5.21094 65.6191
+c12.5605 21.1309 1.26074 49.4102 -13.9395 57.5703c7.7002 48.7803 -17.6084 65.9004 -53.1201 65.9004h-37.8203c-71.6387 0 -118.028 -37.8203 -171.64 -37.8203v-186.17h10.9199c28.3604 0 67.9805 -70.8896 94.54 -97.46
+c28.3604 -28.3604 18.9102 -75.6299 37.8203 -94.54c47.2695 0 47.2695 32.9805 47.2695 56.7305c0 39.1699 -28.3594 56.7197 -28.3594 94.5391h103.989z" />
+    <glyph glyph-name="sun" unicode="&#xf185;" 
+d="M494.2 226.1c11.2002 -7.59961 17.7998 -20.0996 17.8994 -33.6992c0 -13.4004 -6.69922 -26 -17.7998 -33.5l-59.7998 -40.5l13.7002 -71c2.5 -13.2002 -1.60059 -26.8008 -11.1006 -36.3008s-22.8994 -13.7998 -36.2998 -11.0996l-70.8994 13.7002l-40.4004 -59.9004
+c-7.5 -11.0996 -20.0996 -17.7998 -33.5 -17.7998s-26 6.7002 -33.5 17.9004l-40.4004 59.8994l-70.7998 -13.7002c-13.3994 -2.59961 -26.7998 1.60059 -36.2998 11.1006s-13.7002 23.0996 -11.0996 36.2998l13.6992 71l-59.7998 40.5
+c-11.0996 7.5 -17.7998 20 -17.7998 33.5s6.59961 26 17.7998 33.5996l59.7998 40.5l-13.6992 71c-2.60059 13.2002 1.59961 26.7002 11.0996 36.3008c9.5 9.59961 23 13.6992 36.2998 11.1992l70.7998 -13.6992l40.4004 59.8994c15.0996 22.2998 51.9004 22.2998 67 0
+l40.4004 -59.8994l70.8994 13.6992c13 2.60059 26.6006 -1.59961 36.2002 -11.0996c9.5 -9.59961 13.7002 -23.2002 11.0996 -36.4004l-13.6992 -71zM381.3 140.5l76.7998 52.0996l-76.7998 52l17.6006 91.1006l-91 -17.6006l-51.9004 76.9004l-51.7998 -76.7998
+l-91 17.5996l17.5996 -91.2002l-76.7998 -52l76.7998 -52l-17.5996 -91.1992l90.8994 17.5996l51.9004 -77l51.9004 76.9004l91 -17.6006zM256 296c57.2998 0 104 -46.7002 104 -104s-46.7002 -104 -104 -104s-104 46.7002 -104 104s46.7002 104 104 104zM256 136
+c30.9004 0 56 25.0996 56 56s-25.0996 56 -56 56s-56 -25.0996 -56 -56s25.0996 -56 56 -56z" />
+    <glyph glyph-name="moon" unicode="&#xf186;" 
+d="M279.135 -64c-141.424 0 -256 114.64 -256 256c0 141.425 114.641 256 256 256c16.0342 -0.00292969 31.5078 -1.46875 46.7354 -4.27734c44.0205 -8.13086 53.7666 -66.8691 15.0215 -88.9189c-41.374 -23.5439 -67.4336 -67.4121 -67.4336 -115.836
+c0 -83.5234 75.9238 -146.475 158.272 -130.792c43.6904 8.32129 74.5186 -42.5693 46.248 -77.4004c-47.8613 -58.9717 -120.088 -94.7754 -198.844 -94.7754zM279.135 400c-114.875 0 -208 -93.125 -208 -208s93.125 -208 208 -208
+c65.2314 0 123.439 30.0361 161.575 77.0244c-111.611 -21.2568 -215.252 64.0957 -215.252 177.943c0 67.5127 36.9326 126.392 91.6934 157.555c-12.3271 2.27637 -25.0312 3.47754 -38.0166 3.47754z" />
+    <glyph glyph-name="caret-square-left" unicode="&#xf191;" horiz-adv-x="448" 
+d="M272 290.9v-197.801c0 -10.6992 -13 -16.0996 -20.5 -8.5l-98.2998 98.9004c-4.7002 4.7002 -4.7002 12.2002 0 16.9004l98.2998 98.8994c7.5 7.7002 20.5 2.2998 20.5 -8.39941zM448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352
+c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48zM400 22v340c0 3.2998 -2.7002 6 -6 6h-340c-3.2998 0 -6 -2.7002 -6 -6v-340c0 -3.2998 2.7002 -6 6 -6h340c3.2998 0 6 2.7002 6 6z" />
+    <glyph glyph-name="dot-circle" unicode="&#xf192;" 
+d="M256 392c-110.549 0 -200 -89.4678 -200 -200c0 -110.549 89.4678 -200 200 -200c110.549 0 200 89.4678 200 200c0 110.549 -89.4678 200 -200 200zM256 440c136.967 0 248 -111.033 248 -248s-111.033 -248 -248 -248s-248 111.033 -248 248s111.033 248 248 248z
+M256 272c44.1826 0 80 -35.8174 80 -80s-35.8174 -80 -80 -80s-80 35.8174 -80 80s35.8174 80 80 80z" />
+    <glyph glyph-name="building" unicode="&#xf1ad;" horiz-adv-x="448" 
+d="M128 300v40c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12zM268 288c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-40
+c0 -6.59961 -5.40039 -12 -12 -12h-40zM140 192c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-40zM268 192c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h40
+c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-40zM192 108c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-40zM268 96c-6.59961 0 -12 5.40039 -12 12v40
+c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-40zM448 -28v-36h-448v36c0 6.59961 5.40039 12 12 12h19.5v440c0 13.2998 10.7002 24 24 24h337c13.2998 0 24 -10.7002 24 -24v-440h19.5
+c6.59961 0 12 -5.40039 12 -12zM79.5 -15h112.5v67c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-67h112.5v414l-288.5 1z" />
+    <glyph glyph-name="file-pdf" unicode="&#xf1c1;" horiz-adv-x="384" 
+d="M369.9 350.1c9 -9 14.0996 -21.2998 14.0996 -34v-332.1c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48.0996h204.1c12.7002 0 24.9004 -5.09961 33.9004 -14.0996zM332.1 320l-76.0996 76.0996v-76.0996h76.0996zM48 -16h288v288
+h-104c-13.2998 0 -24 10.7002 -24 24v104h-160v-416zM298.2 127.7c10.5 -10.5 8 -38.7002 -17.5 -38.7002c-14.7998 0 -36.9004 6.7998 -55.7998 17c-21.6006 -3.59961 -46 -12.7002 -68.4004 -20.0996c-50.0996 -86.4004 -79.4004 -47 -76.0996 -31.2002
+c4 20 31 35.8994 51 46.2002c10.5 18.3994 25.3994 50.5 35.3994 74.3994c-7.39941 28.6006 -11.3994 51 -7 67.1006c4.7998 17.6992 38.4004 20.2998 42.6006 -5.90039c4.69922 -15.4004 -1.5 -39.9004 -5.40039 -56c8.09961 -21.2998 19.5996 -35.7998 36.7998 -46.2998
+c17.4004 2.2002 52.2002 5.5 64.4004 -6.5zM100.1 49.9004c0 -0.700195 11.4004 4.69922 30.4004 35c-5.90039 -5.5 -25.2998 -21.3008 -30.4004 -35zM181.7 240.5c-2.5 0 -2.60059 -26.9004 1.7998 -40.7998c4.90039 8.7002 5.59961 40.7998 -1.7998 40.7998zM157.3 103.9
+c15.9004 6.09961 34 14.8994 54.7998 19.1992c-11.1992 8.30078 -21.7998 20.4004 -30.0996 35.5c-6.7002 -17.6992 -15 -37.7998 -24.7002 -54.6992zM288.9 108.9c3.59961 2.39941 -2.2002 10.3994 -37.3008 7.7998c32.3008 -13.7998 37.3008 -7.7998 37.3008 -7.7998z" />
+    <glyph glyph-name="file-word" unicode="&#xf1c2;" horiz-adv-x="384" 
+d="M369.9 350.1c9 -9 14.0996 -21.2998 14.0996 -34v-332.1c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48.0996h204.1c12.7002 0 24.9004 -5.09961 33.9004 -14.0996zM332.1 320l-76.0996 76.0996v-76.0996h76.0996zM48 -16h288v288
+h-104c-13.2998 0 -24 10.7002 -24 24v104h-160v-416zM268.1 192v0.200195h15.8008c7.7998 0 13.5 -7.2998 11.5996 -14.9004c-4.2998 -17 -13.7002 -54.0996 -34.5 -136c-1.2998 -5.39941 -6.09961 -9.09961 -11.5996 -9.09961h-24.7002
+c-5.5 0 -10.2998 3.7998 -11.6006 9.09961c-5.2998 20.9004 -17.7998 71 -17.8994 71.4004l-2.90039 17.2998c-0.5 -5.2998 -1.5 -11.0996 -3 -17.2998l-17.8994 -71.4004c-1.30078 -5.39941 -6.10059 -9.09961 -11.6006 -9.09961h-25.2002
+c-5.59961 0 -10.3994 3.7002 -11.6992 9.09961c-6.5 26.5 -25.2002 103.4 -33.2002 136c-1.7998 7.5 3.89941 14.7998 11.7002 14.7998h16.7998c5.7998 0 10.7002 -4.09961 11.7998 -9.69922c5 -25.7002 18.4004 -93.8008 19.0996 -99
+c0.300781 -1.7002 0.400391 -3.10059 0.5 -4.2002c0.800781 7.5 0.400391 4.7002 24.8008 103.7c1.39941 5.2998 6.19922 9.09961 11.6992 9.09961h13.3008c5.59961 0 10.3994 -3.7998 11.6992 -9.2002c23.9004 -99.7002 22.8008 -94.3994 23.6006 -99.5
+c0.299805 -1.7002 0.5 -3.09961 0.700195 -4.2998c0.599609 8.09961 0.399414 5.7998 21 103.5c1.09961 5.5 6 9.5 11.6992 9.5z" />
+    <glyph glyph-name="file-excel" unicode="&#xf1c3;" horiz-adv-x="384" 
+d="M369.9 350.1c9 -9 14.0996 -21.2998 14.0996 -34v-332.1c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48.0996h204.1c12.7002 0 24.9004 -5.09961 33.9004 -14.0996zM332.1 320l-76.0996 76.0996v-76.0996h76.0996zM48 -16h288v288
+h-104c-13.2998 0 -24 10.7002 -24 24v104h-160v-416zM260 224c9.2002 0 15 -10 10.2998 -18c-16 -27.5 -45.5996 -76.9004 -46.2998 -78l46.4004 -78c4.59961 -8 -1.10059 -18 -10.4004 -18h-28.7998c-4.40039 0 -8.5 2.40039 -10.6006 6.2998
+c-22.6992 41.7998 -13.6992 27.5 -28.5996 57.7002c-5.59961 -12.7002 -6.90039 -17.7002 -28.5996 -57.7002c-2.10059 -3.89941 -6.10059 -6.2998 -10.5 -6.2998h-28.9004c-9.2998 0 -15.0996 10 -10.4004 18l46.3008 78l-46.3008 78c-4.59961 8 1.10059 18 10.4004 18
+h28.9004c4.39941 0 8.5 -2.40039 10.5996 -6.2998c21.7002 -40.4004 14.7002 -28.6006 28.5996 -57.7002c6.40039 15.2998 10.6006 24.5996 28.6006 57.7002c2.09961 3.89941 6.09961 6.2998 10.5 6.2998h28.7998z" />
+    <glyph glyph-name="file-powerpoint" unicode="&#xf1c4;" horiz-adv-x="384" 
+d="M369.9 350.1c9 -9 14.0996 -21.2998 14.0996 -34v-332.1c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48.0996h204.1c12.7002 0 24.9004 -5.09961 33.9004 -14.0996zM332.1 320l-76.0996 76.0996v-76.0996h76.0996zM48 -16h288v288
+h-104c-13.2998 0 -24 10.7002 -24 24v104h-160v-416zM120 44v168c0 6.59961 5.40039 12 12 12h69.2002c36.7002 0 62.7998 -27 62.7998 -66.2998c0 -74.2998 -68.7002 -66.5 -95.5 -66.5v-47.2002c0 -6.59961 -5.40039 -12 -12 -12h-24.5c-6.59961 0 -12 5.40039 -12 12z
+M168.5 131.4h23c7.90039 0 13.9004 2.39941 18.0996 7.19922c8.5 9.80078 8.40039 28.5 0.100586 37.8008c-4.10059 4.59961 -9.90039 7 -17.4004 7h-23.8994v-52h0.0996094z" />
+    <glyph glyph-name="file-image" unicode="&#xf1c5;" horiz-adv-x="384" 
+d="M369.9 350.1c9 -9 14.0996 -21.2998 14.0996 -34v-332.1c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48.0996h204.1c12.7002 0 24.9004 -5.09961 33.9004 -14.0996zM332.1 320l-76.0996 76.0996v-76.0996h76.0996zM48 -16h288v288
+h-104c-13.2998 0 -24 10.7002 -24 24v104h-160v-416zM80 32v64l39.5 39.5c4.7002 4.7002 12.2998 4.7002 17 0l39.5 -39.5l87.5 87.5c4.7002 4.7002 12.2998 4.7002 17 0l23.5 -23.5v-128h-224zM128 272c26.5 0 48 -21.5 48 -48s-21.5 -48 -48 -48s-48 21.5 -48 48
+s21.5 48 48 48z" />
+    <glyph glyph-name="file-archive" unicode="&#xf1c6;" horiz-adv-x="384" 
+d="M128.3 288h32v-32h-32v32zM192.3 384v-32h-32v32h32zM128.3 352h32v-32h-32v32zM192.3 320v-32h-32v32h32zM369.9 350.1c9 -9 14.0996 -21.2998 14.0996 -34v-332.1c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48.0996h204.1
+c12.7002 0 24.9004 -5.09961 33.9004 -14.0996zM256 396.1v-76.0996h76.0996zM336 -16v288h-104c-13.2998 0 -24 10.7002 -24 24v104h-48.2998v-16h-32v16h-79.7002v-416h288zM194.2 182.3l17.2998 -87.7002c6.40039 -32.3994 -18.4004 -62.5996 -51.5 -62.5996
+c-33.2002 0 -58 30.4004 -51.4004 62.9004l19.7002 97.0996v32h32v-32h22.1006c5.7998 0 10.6992 -4.09961 11.7998 -9.7002zM160.3 57.9004c17.9004 0 32.4004 12.0996 32.4004 27c0 14.8994 -14.5 27 -32.4004 27c-17.8994 0 -32.3994 -12.1006 -32.3994 -27
+c0 -14.9004 14.5 -27 32.3994 -27zM192.3 256v-32h-32v32h32z" />
+    <glyph glyph-name="file-audio" unicode="&#xf1c7;" horiz-adv-x="384" 
+d="M369.941 350.059c8.68848 -8.68848 14.0586 -20.6943 14.0586 -33.9404v-332.118c0 -26.5098 -21.4902 -48 -48 -48h-288c-26.5098 0 -48 21.4902 -48 48v416c0 26.5098 21.4902 48 48 48h204.118c13.2461 0 25.252 -5.37012 33.9404 -14.0586zM332.118 320
+l-76.1182 76.1182v-76.1182h76.1182zM48 -16h288v288h-104c-13.2549 0 -24 10.7451 -24 24v104h-160v-416zM192 60.0244c0 -10.6914 -12.9258 -16.0459 -20.4854 -8.48535l-35.5146 35.9746h-28c-6.62695 0 -12 5.37305 -12 12v56c0 6.62695 5.37305 12 12 12h28
+l35.5146 36.9473c7.56055 7.56055 20.4854 2.20605 20.4854 -8.48535v-135.951zM233.201 107.154c9.05078 9.29688 9.05957 24.1328 0.000976562 33.4385c-22.1494 22.752 12.2344 56.2461 34.3945 33.4814c27.1982 -27.9404 27.2119 -72.4443 0.000976562 -100.401
+c-21.793 -22.3857 -56.9463 10.3154 -34.3965 33.4814z" />
+    <glyph glyph-name="file-video" unicode="&#xf1c8;" horiz-adv-x="384" 
+d="M369.941 350.059c8.68848 -8.68848 14.0586 -20.6943 14.0586 -33.9404v-332.118c0 -26.5098 -21.4902 -48 -48 -48h-288c-26.5098 0 -48 21.4902 -48 48v416c0 26.5098 21.4902 48 48 48h204.118c13.2461 0 25.252 -5.37012 33.9404 -14.0586zM332.118 320
+l-76.1182 76.1182v-76.1182h76.1182zM48 -16h288v288h-104c-13.2549 0 -24 10.7451 -24 24v104h-160v-416zM276.687 195.303c10.0049 10.0049 27.3135 2.99707 27.3135 -11.3135v-111.976c0 -14.2939 -17.2959 -21.332 -27.3135 -11.3135l-52.6865 52.6738v-37.374
+c0 -11.0459 -8.9541 -20 -20 -20h-104c-11.0459 0 -20 8.9541 -20 20v104c0 11.0459 8.9541 20 20 20h104c11.0459 0 20 -8.9541 20 -20v-37.374z" />
+    <glyph glyph-name="file-code" unicode="&#xf1c9;" horiz-adv-x="384" 
+d="M149.9 98.9004c3.5 -3.30078 3.69922 -8.90039 0.399414 -12.4004l-17.3994 -18.5996c-1.60059 -1.80078 -4 -2.80078 -6.40039 -2.80078c-2.2002 0 -4.40039 0.900391 -6 2.40039l-57.7002 54.0996c-3.7002 3.40039 -3.7002 9.30078 0 12.8008l57.7002 54.0996
+c3.40039 3.2998 9 3.2002 12.4004 -0.400391l17.3994 -18.5996l0.200195 -0.200195c3.2002 -3.59961 2.7998 -9.2002 -0.799805 -12.3994l-32.7998 -28.9004l32.7998 -28.9004zM369.9 350.1c9 -9 14.0996 -21.2998 14.0996 -34v-332.1c0 -26.5 -21.5 -48 -48 -48h-288
+c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48.0996h204.1c12.7002 0 24.9004 -5.09961 33.9004 -14.0996zM256 396.1v-76.0996h76.0996zM336 -16v288h-104c-13.2998 0 -24 10.7002 -24 24v104h-160v-416h288zM209.6 234l24.4004 -7
+c4.7002 -1.2998 7.40039 -6.2002 6 -10.9004l-54.7002 -188.199c-1.2998 -4.60059 -6.2002 -7.40039 -10.8994 -6l-24.4004 7.09961c-4.7002 1.2998 -7.40039 6.2002 -6 10.9004l54.7002 188.1c1.39941 4.7002 6.2002 7.40039 10.8994 6zM234.1 157.1
+c-3.5 3.30078 -3.69922 8.90039 -0.399414 12.4004l17.3994 18.5996c3.30078 3.60059 8.90039 3.7002 12.4004 0.400391l57.7002 -54.0996c3.7002 -3.40039 3.7002 -9.30078 0 -12.8008l-57.7002 -54.0996c-3.5 -3.2998 -9.09961 -3.09961 -12.4004 0.400391
+l-17.3994 18.5996l-0.200195 0.200195c-3.2002 3.59961 -2.7998 9.2002 0.799805 12.3994l32.7998 28.9004l-32.7998 28.9004z" />
+    <glyph glyph-name="life-ring" unicode="&#xf1cd;" 
+d="M256 -56c-136.967 0 -248 111.033 -248 248s111.033 248 248 248s248 -111.033 248 -248s-111.033 -248 -248 -248zM152.602 20.7197c63.2178 -38.3184 143.579 -38.3184 206.797 0l-53.4111 53.4111c-31.8467 -13.5215 -68.168 -13.5059 -99.9746 0zM336 192
+c0 44.1123 -35.8877 80 -80 80s-80 -35.8877 -80 -80s35.8877 -80 80 -80s80 35.8877 80 80zM427.28 88.6016c38.3184 63.2178 38.3184 143.579 0 206.797l-53.4111 -53.4111c13.5215 -31.8467 13.5049 -68.168 0 -99.9746zM359.397 363.28
+c-63.2168 38.3184 -143.578 38.3184 -206.796 0l53.4111 -53.4111c31.8457 13.5215 68.167 13.5049 99.9736 0zM84.7197 295.398c-38.3184 -63.2178 -38.3184 -143.579 0 -206.797l53.4111 53.4111c-13.5215 31.8467 -13.5059 68.168 0 99.9746z" />
+    <glyph glyph-name="paper-plane" unicode="&#xf1d8;" 
+d="M440 441.5c34.5996 19.9004 77.5996 -8.7998 71.5 -48.9004l-59.4004 -387.199c-2.2998 -14.5 -11.0996 -27.3008 -23.8994 -34.5c-7.2998 -4.10059 -15.4004 -6.2002 -23.6006 -6.2002c-6.19922 0 -12.3994 1.2002 -18.2998 3.59961l-111.899 46.2002l-43.8008 -59.0996
+c-27.3994 -36.9004 -86.5996 -17.8008 -86.5996 28.5996v84.4004l-114.3 47.2998c-36.7998 15.0996 -40.1006 66 -5.7002 85.8994zM192 -16l36.5996 49.5l-36.5996 15.0996v-64.5996zM404.6 12.7002l59.4004 387.3l-416 -240l107.8 -44.5996l211.5 184.3
+c14.2002 12.2998 34.4004 -5.7002 23.7002 -21.2002l-140.2 -202.3z" />
+    <glyph glyph-name="futbol" unicode="&#xf1e3;" horiz-adv-x="496" 
+d="M483.8 268.6c42.2998 -130.199 -29 -270.1 -159.2 -312.399c-25.5 -8.2998 -51.2998 -12.2002 -76.6992 -12.2002c-104.5 0 -201.7 66.5996 -235.7 171.4c-42.2998 130.199 29 270.1 159.2 312.399c25.5 8.2998 51.2998 12.2002 76.6992 12.2002
+c104.5 0 201.7 -66.5996 235.7 -171.4zM409.3 74.9004c6.10059 8.39941 12.1006 16.8994 16.7998 26.1992c14.3008 28.1006 21.5 58.5 21.7002 89.2002l-38.8994 36.4004l-71.1006 -22.1006l-24.3994 -75.1992l43.6992 -60.9004zM409.3 310.3
+c-24.5 33.4004 -58.7002 58.4004 -97.8994 71.4004l-47.4004 -26.2002v-73.7998l64.2002 -46.5l70.7002 22zM184.9 381.6c-39.9004 -13.2998 -73.5 -38.5 -97.8008 -71.8994l10.1006 -52.5l70.5996 -22l64.2002 46.5v73.7998zM139 68.5l43.5 61.7002l-24.2998 74.2998
+l-71.1006 22.2002l-39 -36.4004c0.5 -55.7002 23.4004 -95.2002 37.8008 -115.3zM187.2 1.5c64.0996 -20.4004 115.5 -1.7998 121.7 0l22.3994 48.0996l-44.2998 61.7002h-78.5996l-43.6006 -61.7002z" />
+    <glyph glyph-name="newspaper" unicode="&#xf1ea;" horiz-adv-x="576" 
+d="M552 384c13.2549 0 24 -10.7451 24 -24v-336c0 -13.2549 -10.7451 -24 -24 -24h-496c-30.9277 0 -56 25.0723 -56 56v272c0 13.2549 10.7451 24 24 24h42.752c6.60547 18.623 24.3896 32 45.248 32h440zM48 56c0 -4.41113 3.58887 -8 8 -8s8 3.58887 8 8v248h-16v-248z
+M528 48v288h-416v-280c0 -2.7168 -0.204102 -5.38574 -0.578125 -8h416.578zM172 168c-6.62695 0 -12 5.37305 -12 12v96c0 6.62695 5.37305 12 12 12h136c6.62695 0 12 -5.37305 12 -12v-96c0 -6.62695 -5.37305 -12 -12 -12h-136zM200 248v-40h80v40h-80zM160 108v24
+c0 6.62695 5.37305 12 12 12h136c6.62695 0 12 -5.37305 12 -12v-24c0 -6.62695 -5.37305 -12 -12 -12h-136c-6.62695 0 -12 5.37305 -12 12zM352 108v24c0 6.62695 5.37305 12 12 12h104c6.62695 0 12 -5.37305 12 -12v-24c0 -6.62695 -5.37305 -12 -12 -12h-104
+c-6.62695 0 -12 5.37305 -12 12zM352 252v24c0 6.62695 5.37305 12 12 12h104c6.62695 0 12 -5.37305 12 -12v-24c0 -6.62695 -5.37305 -12 -12 -12h-104c-6.62695 0 -12 5.37305 -12 12zM352 180v24c0 6.62695 5.37305 12 12 12h104c6.62695 0 12 -5.37305 12 -12v-24
+c0 -6.62695 -5.37305 -12 -12 -12h-104c-6.62695 0 -12 5.37305 -12 12z" />
+    <glyph glyph-name="bell-slash" unicode="&#xf1f6;" horiz-adv-x="640" 
+d="M633.99 -23.0195c6.91016 -5.52051 8.01953 -15.5908 2.5 -22.4902l-10 -12.4902c-5.53027 -6.88965 -15.5898 -8.00977 -22.4902 -2.49023l-598 467.51c-6.90039 5.52051 -8.01953 15.5908 -2.49023 22.4902l10 12.4902
+c5.52051 6.90039 15.5898 8.00977 22.4902 2.49023zM163.53 80h182.84l61.3994 -48h-279.659c-19.1201 0 -31.9902 15.5996 -32.1006 32c-0.0498047 7.5498 2.61035 15.2598 8.61035 21.71c18.3701 19.7402 51.5703 49.6904 54.8398 140.42l45.4697 -35.5498
+c-6.91992 -54.7803 -24.6895 -88.5498 -41.3994 -110.58zM320 352c-23.3496 0 -45 -7.17969 -62.9404 -19.4004l-38.1699 29.8408c19.6807 15.7793 43.1104 27.3096 69.1299 32.7197v20.8398c0 17.6699 14.3203 32 31.9805 32s31.9805 -14.3301 31.9805 -32v-20.8398
+c73.46 -15.2598 127.939 -77.46 127.939 -155.16c0 -41.3604 6.03027 -70.7197 14.3398 -92.8496l-59.5293 46.54c-1.63086 13.96 -2.77051 28.8896 -2.79004 45.7295c0 0.200195 0.0595703 0.379883 0.0595703 0.580078c0 61.8604 -50.1396 112 -112 112zM320 -64
+c-35.3203 0 -63.9697 28.6504 -63.9697 64h127.939c0 -35.3496 -28.6494 -64 -63.9697 -64z" />
+    <glyph glyph-name="copyright" unicode="&#xf1f9;" 
+d="M256 440c136.967 0 248 -111.033 248 -248s-111.033 -248 -248 -248s-248 111.033 -248 248s111.033 248 248 248zM256 -8c110.549 0 200 89.4678 200 200c0 110.549 -89.4678 200 -200 200c-110.549 0 -200 -89.4688 -200 -200c0 -110.549 89.4678 -200 200 -200z
+M363.351 93.0645c-9.61328 -9.71289 -45.5293 -41.3965 -104.064 -41.3965c-82.4297 0 -140.484 61.4248 -140.484 141.567c0 79.1514 60.2754 139.4 139.763 139.4c55.5303 0 88.7373 -26.6201 97.5928 -34.7783c2.37793 -2.1875 3.86914 -5.3252 3.86914 -8.80762
+c0 -2.39746 -0.717773 -4.64258 -1.93359 -6.51465l-18.1543 -28.1133c-3.8418 -5.9502 -11.9668 -7.28223 -17.499 -2.9209c-8.5957 6.77637 -31.8145 22.5381 -61.708 22.5381c-48.3037 0 -77.916 -35.3301 -77.916 -80.082c0 -41.5889 26.8877 -83.6924 78.2764 -83.6924
+c32.6572 0 56.8428 19.0391 65.7266 27.2256c5.26953 4.85645 13.5957 4.03906 17.8193 -1.73828l19.8652 -27.1699c1.45996 -1.98145 2.32422 -4.42969 2.32422 -7.07715c0 -3.28809 -1.32422 -6.2793 -3.47656 -8.44043z" />
+    <glyph glyph-name="closed-captioning" unicode="&#xf20a;" 
+d="M464 384c26.5 0 48 -21.5 48 -48v-288c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v288c0 26.5 21.5 48 48 48h416zM458 48c3.2998 0 6 2.7002 6 6v276c0 3.2998 -2.7002 6 -6 6h-404c-3.2998 0 -6 -2.7002 -6 -6v-276c0 -3.2998 2.7002 -6 6 -6h404z
+M246.9 133.7c1.69922 -2.40039 1.5 -5.60059 -0.5 -7.7002c-53.6006 -56.7998 -172.801 -32.0996 -172.801 67.9004c0 97.2998 121.7 119.5 172.5 70.0996c2.10059 -2 2.5 -3.2002 1 -5.7002l-17.5 -30.5c-1.89941 -3.09961 -6.19922 -4 -9.09961 -1.7002
+c-40.7998 32 -94.5996 14.9004 -94.5996 -31.1992c0 -48 51 -70.5 92.1992 -32.6006c2.80078 2.5 7.10059 2.10059 9.2002 -0.899414zM437.3 133.7c1.7002 -2.40039 1.5 -5.60059 -0.5 -7.7002c-53.5996 -56.9004 -172.8 -32.0996 -172.8 67.9004
+c0 97.2998 121.7 119.5 172.5 70.0996c2.09961 -2 2.5 -3.2002 1 -5.7002l-17.5 -30.5c-1.90039 -3.09961 -6.2002 -4 -9.09961 -1.7002c-40.8008 32 -94.6006 14.9004 -94.6006 -31.1992c0 -48 51 -70.5 92.2002 -32.6006c2.7998 2.5 7.09961 2.10059 9.2002 -0.899414z
+" />
+    <glyph glyph-name="object-group" unicode="&#xf247;" 
+d="M500 320h-12v-256h12c6.62695 0 12 -5.37305 12 -12v-72c0 -6.62695 -5.37305 -12 -12 -12h-72c-6.62695 0 -12 5.37305 -12 12v12h-320v-12c0 -6.62695 -5.37305 -12 -12 -12h-72c-6.62695 0 -12 5.37305 -12 12v72c0 6.62695 5.37305 12 12 12h12v256h-12
+c-6.62695 0 -12 5.37305 -12 12v72c0 6.62695 5.37305 12 12 12h72c6.62695 0 12 -5.37305 12 -12v-12h320v12c0 6.62695 5.37305 12 12 12h72c6.62695 0 12 -5.37305 12 -12v-72c0 -6.62695 -5.37305 -12 -12 -12zM448 384v-32h32v32h-32zM32 384v-32h32v32h-32zM64 0v32
+h-32v-32h32zM480 0v32h-32v-32h32zM440 64v256h-12c-6.62695 0 -12 5.37305 -12 12v12h-320v-12c0 -6.62695 -5.37305 -12 -12 -12h-12v-256h12c6.62695 0 12 -5.37305 12 -12v-12h320v12c0 6.62695 5.37305 12 12 12h12zM404 256c6.62695 0 12 -5.37207 12 -12v-168
+c0 -6.62793 -5.37305 -12 -12 -12h-200c-6.62695 0 -12 5.37207 -12 12v52h-84c-6.62695 0 -12 5.37207 -12 12v168c0 6.62793 5.37305 12 12 12h200c6.62695 0 12 -5.37207 12 -12v-52h84zM136 280v-112h144v112h-144zM376 104v112h-56v-76
+c0 -6.62793 -5.37305 -12 -12 -12h-76v-24h144z" />
+    <glyph glyph-name="object-ungroup" unicode="&#xf248;" horiz-adv-x="576" 
+d="M564 224h-12v-160h12c6.62695 0 12 -5.37305 12 -12v-72c0 -6.62695 -5.37305 -12 -12 -12h-72c-6.62695 0 -12 5.37305 -12 12v12h-224v-12c0 -6.62695 -5.37305 -12 -12 -12h-72c-6.62695 0 -12 5.37305 -12 12v72c0 6.62695 5.37305 12 12 12h12v24h-88v-12
+c0 -6.62695 -5.37305 -12 -12 -12h-72c-6.62695 0 -12 5.37305 -12 12v72c0 6.62695 5.37305 12 12 12h12v160h-12c-6.62695 0 -12 5.37305 -12 12v72c0 6.62695 5.37305 12 12 12h72c6.62695 0 12 -5.37305 12 -12v-12h224v12c0 6.62695 5.37305 12 12 12h72
+c6.62695 0 12 -5.37305 12 -12v-72c0 -6.62695 -5.37305 -12 -12 -12h-12v-24h88v12c0 6.62695 5.37305 12 12 12h72c6.62695 0 12 -5.37305 12 -12v-72c0 -6.62695 -5.37305 -12 -12 -12zM352 384v-32h32v32h-32zM352 128v-32h32v32h-32zM64 96v32h-32v-32h32zM64 352v32
+h-32v-32h32zM96 136h224v12c0 6.62695 5.37305 12 12 12h12v160h-12c-6.62695 0 -12 5.37305 -12 12v12h-224v-12c0 -6.62695 -5.37305 -12 -12 -12h-12v-160h12c6.62695 0 12 -5.37305 12 -12v-12zM224 0v32h-32v-32h32zM504 64v160h-12c-6.62695 0 -12 5.37305 -12 12v12
+h-88v-88h12c6.62695 0 12 -5.37305 12 -12v-72c0 -6.62695 -5.37305 -12 -12 -12h-72c-6.62695 0 -12 5.37305 -12 12v12h-88v-24h12c6.62695 0 12 -5.37305 12 -12v-12h224v12c0 6.62695 5.37305 12 12 12h12zM544 0v32h-32v-32h32zM544 256v32h-32v-32h32z" />
+    <glyph glyph-name="sticky-note" unicode="&#xf249;" horiz-adv-x="448" 
+d="M448 99.8936c0 -13.2451 -5.37012 -25.252 -14.0586 -33.9404l-83.8828 -83.8818c-8.68848 -8.68848 -20.6943 -14.0596 -33.9404 -14.0596h-268.118c-26.5098 0 -48 21.4902 -48 48v351.988c0 26.5098 21.4902 48 48 48h352c26.5098 0 48 -21.4902 48 -48v-268.106z
+M320 19.8936l76.1182 76.1182h-76.1182v-76.1182zM400 368h-352v-351.988h224v104c0 13.2549 10.7451 24 24 24h104v223.988z" />
+    <glyph glyph-name="clone" unicode="&#xf24d;" 
+d="M464 448c26.5098 0 48 -21.4902 48 -48v-320c0 -26.5098 -21.4902 -48 -48 -48h-48v-48c0 -26.5098 -21.4902 -48 -48 -48h-320c-26.5098 0 -48 21.4902 -48 48v320c0 26.5098 21.4902 48 48 48h48v48c0 26.5098 21.4902 48 48 48h320zM362 -16c3.31152 0 6 2.68848 6 6
+v42h-224c-26.5098 0 -48 21.4902 -48 48v224h-42c-3.31152 0 -6 -2.68848 -6 -6v-308c0 -3.31152 2.68848 -6 6 -6h308zM458 80c3.31152 0 6 2.68848 6 6v308c0 3.31152 -2.68848 6 -6 6h-308c-3.31152 0 -6 -2.68848 -6 -6v-308c0 -3.31152 2.68848 -6 6 -6h308z" />
+    <glyph glyph-name="hourglass" unicode="&#xf254;" horiz-adv-x="384" 
+d="M368 400c0 -80.0996 -31.8984 -165.619 -97.1797 -208c64.9912 -42.1934 97.1797 -127.436 97.1797 -208h4c6.62695 0 12 -5.37305 12 -12v-24c0 -6.62695 -5.37305 -12 -12 -12h-360c-6.62695 0 -12 5.37305 -12 12v24c0 6.62695 5.37305 12 12 12h4
+c0 80.0996 31.8994 165.619 97.1797 208c-64.9912 42.1934 -97.1797 127.436 -97.1797 208h-4c-6.62695 0 -12 5.37305 -12 12v24c0 6.62695 5.37305 12 12 12h360c6.62695 0 12 -5.37305 12 -12v-24c0 -6.62695 -5.37305 -12 -12 -12h-4zM64 400
+c0 -101.621 57.3066 -184 128 -184s128 82.3799 128 184h-256zM320 -16c0 101.62 -57.3076 184 -128 184s-128 -82.3799 -128 -184h256z" />
+    <glyph glyph-name="hand-rock" unicode="&#xf255;" 
+d="M408.864 368.948c48.8213 20.751 103.136 -15.0723 103.136 -67.9111v-114.443c0 -15.3955 -3.08887 -30.3906 -9.18262 -44.5674l-42.835 -99.6562c-4.99707 -11.625 -3.98242 -18.8574 -3.98242 -42.3701c0 -17.6729 -14.3271 -32 -32 -32h-252
+c-17.6729 0 -32 14.3271 -32 32c0 27.3301 1.1416 29.2012 -3.11035 32.9033l-97.71 85.0811c-24.8994 21.6797 -39.1797 52.8926 -39.1797 85.6338v56.9531c0 47.4277 44.8457 82.0215 91.0459 71.1807c1.96094 55.751 63.5107 87.8262 110.671 60.8057
+c29.1895 31.0713 78.8604 31.4473 108.334 -0.0214844c32.7051 18.6846 76.4121 10.3096 98.8135 -23.5879zM464 186.594v114.445c0 34.29 -52 33.8232 -52 0.676758c0 -8.83594 -7.16309 -16 -16 -16h-7c-8.83691 0 -16 7.16406 -16 16v26.751
+c0 34.457 -52 33.707 -52 0.676758v-27.4287c0 -8.83594 -7.16309 -16 -16 -16h-7c-8.83691 0 -16 7.16406 -16 16v40.4658c0 34.3525 -52 33.8115 -52 0.677734v-41.1436c0 -8.83594 -7.16406 -16 -16 -16h-7c-8.83594 0 -16 7.16406 -16 16v26.751
+c0 34.4023 -52 33.7744 -52 0.676758v-116.571c0 -8.83105 -7.17773 -15.9961 -16.0078 -15.9961c-4.0166 0 -7.68848 1.48242 -10.499 3.92969l-7 6.09473c-3.37012 2.93457 -5.49316 7.25293 -5.49316 12.0674v41.2275c0 34.2148 -52 33.8857 -52 0.677734v-56.9531
+c0 -18.8555 8.27441 -36.874 22.7002 -49.4365l97.71 -85.0801c12.4502 -10.8398 19.5898 -26.4463 19.5898 -42.8164v-10.2861h220v7.07617c0 13.21 2.65332 26.0791 7.88281 38.25l42.835 99.6553c3.37891 7.82715 5.28223 16.501 5.28223 25.5625v0.0498047z" />
+    <glyph glyph-name="hand-paper" unicode="&#xf256;" horiz-adv-x="448" 
+d="M372.57 335.359c39.9062 5.63281 75.4297 -25.7393 75.4297 -66.3594v-131.564c-0.00292969 -15.7393 -1.80566 -30.9482 -5.19531 -45.666l-30.1836 -130.958c-3.34668 -14.5234 -16.2783 -24.8125 -31.1816 -24.8125h-222.897
+c-10.7539 0 -20.2588 5.28613 -26.0615 13.4316l-119.97 168.415c-21.2441 29.8203 -14.8047 71.3574 14.5498 93.1533c18.7754 13.9395 42.1309 16.2979 62.083 8.87109v126.13c0 44.0547 41.125 75.5439 82.4053 64.9834c23.8926 48.1963 92.3535 50.2471 117.982 0.74707
+c42.5186 11.1445 83.0391 -21.9346 83.0391 -65.5469v-10.8242zM399.997 137.437l-0.00195312 131.563c0 24.9492 -36.5703 25.5508 -36.5703 -0.691406v-76.3086c0 -8.83691 -7.16309 -16 -16 -16h-6.85645c-8.83691 0 -16 7.16309 -16 16v154.184
+c0 25.501 -36.5703 26.3633 -36.5703 0.691406v-154.875c0 -8.83691 -7.16309 -16 -16 -16h-6.85645c-8.83691 0 -16 7.16309 -16 16v188.309c0 25.501 -36.5703 26.3545 -36.5703 0.691406v-189c0 -8.83691 -7.16309 -16 -16 -16h-6.85645c-8.83691 0 -16 7.16309 -16 16
+v153.309c0 25.501 -36.5713 26.3359 -36.5713 0.691406v-206.494c0 -15.5703 -20.0352 -21.9092 -29.0303 -9.2832l-27.1279 38.0791c-14.3711 20.1709 -43.833 -2.33496 -29.3945 -22.6045l115.196 -161.697h201.92l27.3252 118.551
+c2.63086 11.417 3.96484 23.1553 3.96484 34.8857z" />
+    <glyph glyph-name="hand-scissors" unicode="&#xf257;" 
+d="M256 -32c-44.9561 0 -77.3428 43.2627 -64.0244 85.8535c-21.6484 13.71 -34.0156 38.7617 -30.3408 65.0068h-87.6348c-40.8037 0 -74 32.8105 -74 73.1406c0 40.3291 33.1963 73.1396 74 73.1396l94 -9.14062l-78.8496 18.6787
+c-38.3076 14.7422 -57.04 57.4707 -41.9424 95.1123c15.0303 37.4736 57.7549 55.7803 95.6416 41.2012l144.929 -55.7568c24.9551 30.5566 57.8086 43.9932 92.2178 24.7324l97.999 -54.8525c20.9746 -11.7393 34.0049 -33.8457 34.0049 -57.6904v-205.702
+c0 -30.7422 -21.4404 -57.5576 -51.7979 -64.5537l-118.999 -27.4268c-4.97168 -1.14648 -10.0889 -1.72949 -15.2031 -1.72949zM256 16.0127l70 -0.000976562c1.52441 0 2.99707 0.174805 4.42285 0.501953l119.001 27.4277
+c8.58203 1.97754 14.5762 9.29102 14.5762 17.7812v205.701c0 6.4873 -3.62109 12.542 -9.44922 15.8047l-98 54.8545c-8.13965 4.55566 -18.668 2.61914 -24.4873 -4.50781l-21.7646 -26.6475c-2.93457 -3.59375 -7.40332 -5.87305 -12.4004 -5.87305
+c-2.02246 0 -3.95703 0.375977 -5.73828 1.06152l-166.549 64.0908c-32.6543 12.5664 -50.7744 -34.5771 -19.2227 -46.7168l155.357 -59.7852c6 -2.30859 10.2539 -8.12402 10.2539 -14.9326v-11.6328c0 -8.83691 -7.16309 -16 -16 -16h-182
+c-34.375 0 -34.4297 -50.2803 0 -50.2803h182c8.83691 0 16 -7.16309 16 -16v-6.85645c0 -8.83691 -7.16309 -16 -16 -16h-28c-25.1221 0 -25.1592 -36.5674 0 -36.5674h28c8.83691 0 16 -7.16211 16 -16v-6.85547c0 -8.83691 -7.16309 -16 -16 -16
+c-25.1201 0 -25.1602 -36.5674 0 -36.5674z" />
+    <glyph glyph-name="hand-lizard" unicode="&#xf258;" horiz-adv-x="576" 
+d="M556.686 157.458c12.6357 -19.4863 19.3145 -42.0615 19.3145 -65.2871v-124.171h-224v71.582l-99.751 38.7871c-2.7832 1.08203 -5.70996 1.63086 -8.69727 1.63086h-131.552c-30.8789 0 -56 25.1211 -56 56c0 48.5234 39.4766 88 88 88h113.709l18.333 48h-196.042
+c-44.1123 0 -80 35.8877 -80 80v8c0 30.8779 25.1211 56 56 56h293.917c24.5 0 47.084 -12.2725 60.4111 -32.8291zM528 16v76.1709c0 0.0166016 -0.0439453 0.106445 -0.0439453 0.12207c0 14.3945 -4.24219 27.8057 -11.5439 39.0498l-146.358 225.715
+c-4.44336 6.85254 -11.9707 10.9424 -20.1367 10.9424h-293.917c-4.41113 0 -8 -3.58887 -8 -8v-8c0 -17.6445 14.3555 -32 32 -32h213.471c25.2021 0 42.626 -25.293 33.6299 -48.8457l-24.5518 -64.2812c-7.05371 -18.4658 -25.0732 -30.873 -44.8398 -30.873h-113.709
+c-22.0557 0 -40 -17.9443 -40 -40c0 -4.41113 3.58887 -8 8 -8h131.552c0.0175781 0 0.0712891 -0.0273438 0.0888672 -0.0273438c9.16992 0 17.9404 -1.72461 26.0039 -4.86621l99.752 -38.7881c18.5898 -7.22852 30.6035 -24.7881 30.6035 -44.7363v-23.582h128z" />
+    <glyph glyph-name="hand-spock" unicode="&#xf259;" 
+d="M501.03 331.824c6.92773 -11.1826 10.9697 -24.4053 10.9697 -38.5146c0 -5.92676 -0.706055 -11.6885 -2.03809 -17.208l-57.623 -241.963c-13.2236 -56.1904 -63.707 -98.1387 -123.908 -98.1387h-0.352539h-107.455
+c-0.0761719 0 -0.193359 0.00195312 -0.270508 0.00195312c-40.9248 0 -78.1475 15.9814 -105.761 42.0391l-91.3652 85.9766c-14.3076 13.4434 -23.2246 32.5547 -23.2246 53.7168c0 19.5254 7.61035 37.2861 20.0254 50.4766
+c5.31836 5.66406 29.875 29.3926 68.1152 21.8477l-24.3594 82.1973c-1.97363 6.64844 -2.97656 13.6836 -2.97656 20.9688c0 38.6953 29.8926 70.4639 67.8262 73.4531c-0.246094 2.45117 -0.34082 4.85547 -0.34082 7.37207c0 34.4199 23.585 63.376 55.4619 71.5752
+c43.248 10.9785 80.5645 -17.7012 89.6602 -53.0723l13.6836 -53.207l4.64648 22.6602c6.99023 33.5186 36.6826 58.8037 72.2373 58.916c8.73438 0 56.625 -3.26953 70.7383 -54.0801c15.0664 0.710938 46.9199 -3.50977 66.3105 -35.0176zM463.271 287.219
+c7.86914 32.9844 -42.1211 45.2695 -50.0859 11.9219l-24.8008 -104.146c-4.38867 -18.4141 -31.7783 -11.8926 -28.0557 6.2168l28.5479 139.166c7.39844 36.0703 -43.3076 45.0703 -50.1182 11.9629l-31.791 -154.971
+c-3.54883 -17.3086 -28.2832 -18.0469 -32.7109 -0.804688l-47.3262 184.035c-8.43359 32.8105 -58.3691 20.2676 -49.8652 -12.8359l42.4414 -165.039c4.81641 -18.7207 -23.3711 -26.9121 -28.9648 -8.00781l-31.3438 105.779
+c-9.6875 32.6465 -59.1191 18.2578 -49.3867 -14.625l36.0137 -121.539c6.59375 -22.2441 10.1777 -45.7803 10.1777 -70.1523c0 -6.54297 -8.05664 -10.9355 -13.4824 -5.82617l-51.123 48.1074c-24.7852 23.4082 -60.0527 -14.1875 -35.2793 -37.4902l91.3691 -85.9805
+c19.0469 -17.9736 44.75 -28.998 72.9795 -28.998h0.157227h107.455c0.0732422 0 0.138672 0.0429688 0.212891 0.0429688c37.5791 0 69.1016 26.1416 77.3564 61.2168z" />
+    <glyph glyph-name="hand-pointer" unicode="&#xf25a;" horiz-adv-x="448" 
+d="M358.182 268.639c43.1934 16.6348 89.8184 -15.7949 89.8184 -62.6387v-84c-0.000976562 -5.24023 -0.600586 -10.3037 -1.72754 -15.2041l-27.4297 -118.999c-6.98242 -30.2969 -33.7549 -51.7969 -64.5566 -51.7969h-178.286
+c-21.2588 0 -41.3682 10.4102 -53.791 27.8457l-109.699 154.001c-21.2432 29.8193 -14.8047 71.3574 14.5498 93.1523c18.8115 13.9658 42.1748 16.2822 62.083 8.87207v161.129c0 36.9443 29.7363 67 66.2861 67s66.2861 -30.0557 66.2861 -67v-73.6338
+c20.4131 2.85742 41.4678 -3.94238 56.5947 -19.6289c27.1934 12.8467 60.3799 5.66992 79.8721 -19.0986zM80.9854 168.303c-14.4004 20.2119 -43.8008 -2.38281 -29.3945 -22.6055l109.712 -154c3.43457 -4.81934 8.92871 -7.69727 14.6973 -7.69727h178.285
+c8.49219 0 15.8037 5.99414 17.7822 14.5762l27.4297 119.001c0.333008 1.44629 0.501953 2.93457 0.501953 4.42285v84c0 25.1602 -36.5713 25.1211 -36.5713 0c0 -8.83594 -7.16309 -16 -16 -16h-6.85645c-8.83691 0 -16 7.16406 -16 16v21
+c0 25.1602 -36.5713 25.1201 -36.5713 0v-21c0 -8.83594 -7.16309 -16 -16 -16h-6.85938c-8.83691 0 -16 7.16406 -16 16v35c0 25.1602 -36.5703 25.1201 -36.5703 0v-35c0 -8.83594 -7.16309 -16 -16 -16h-6.85742c-8.83691 0 -16 7.16406 -16 16v175
+c0 25.1602 -36.5713 25.1201 -36.5713 0v-241.493c0 -15.5703 -20.0352 -21.9092 -29.0303 -9.2832zM176.143 48v96c0 8.83691 6.26855 16 14 16h6c7.73242 0 14 -7.16309 14 -16v-96c0 -8.83691 -6.26758 -16 -14 -16h-6c-7.73242 0 -14 7.16309 -14 16zM251.571 48v96
+c0 8.83691 6.26758 16 14 16h6c7.73145 0 14 -7.16309 14 -16v-96c0 -8.83691 -6.26855 -16 -14 -16h-6c-7.73242 0 -14 7.16309 -14 16zM327 48v96c0 8.83691 6.26758 16 14 16h6c7.73242 0 14 -7.16309 14 -16v-96c0 -8.83691 -6.26758 -16 -14 -16h-6
+c-7.73242 0 -14 7.16309 -14 16z" />
+    <glyph glyph-name="hand-peace" unicode="&#xf25b;" horiz-adv-x="448" 
+d="M362.146 256.024c42.5908 13.3184 85.8535 -19.0684 85.8535 -64.0244l-0.0117188 -70.001c-0.000976562 -5.24023 -0.600586 -10.3027 -1.72949 -15.2031l-27.4268 -118.999c-6.99707 -30.3564 -33.8105 -51.7969 -64.5547 -51.7969h-205.702
+c-23.8447 0 -45.9502 13.0303 -57.6904 34.0059l-54.8525 97.999c-19.2607 34.4092 -5.82422 67.2617 24.7324 92.2178l-55.7568 144.928c-14.5791 37.8867 3.72754 80.6113 41.2012 95.6416c37.6406 15.0977 80.3691 -3.63477 95.1123 -41.9424l18.6787 -78.8496
+l-9.14062 94c0 40.8037 32.8096 74 73.1396 74s73.1406 -33.1963 73.1406 -74v-87.6348c26.2451 3.6748 51.2959 -8.69238 65.0068 -30.3408zM399.987 122l-0.000976562 70c0 25.1602 -36.5674 25.1201 -36.5674 0c0 -8.83691 -7.16309 -16 -16 -16h-6.85547
+c-8.83789 0 -16 7.16309 -16 16v28c0 25.1592 -36.5674 25.1221 -36.5674 0v-28c0 -8.83691 -7.16309 -16 -16 -16h-6.85645c-8.83691 0 -16 7.16309 -16 16v182c0 34.4297 -50.2803 34.375 -50.2803 0v-182c0 -8.83691 -7.16309 -16 -16 -16h-11.6328
+c-6.80859 0 -12.624 4.25391 -14.9326 10.2539l-59.7842 155.357c-12.1396 31.5518 -59.2842 13.4326 -46.7168 -19.2227l64.0898 -166.549c0.685547 -1.78125 1.07812 -3.71875 1.07812 -5.74121c0 -4.99707 -2.2959 -9.46289 -5.88965 -12.3975l-26.6475 -21.7646
+c-7.12695 -5.81934 -9.06445 -16.3467 -4.50781 -24.4873l54.8535 -98c3.26367 -5.82812 9.31934 -9.44922 15.8057 -9.44922h205.701c8.49121 0 15.8037 5.99414 17.7812 14.5762l27.4277 119.001c0.333008 1.44629 0.501953 2.93457 0.501953 4.42285z" />
+    <glyph glyph-name="registered" unicode="&#xf25d;" 
+d="M256 440c136.967 0 248 -111.033 248 -248s-111.033 -248 -248 -248s-248 111.033 -248 248s111.033 248 248 248zM256 -8c110.549 0 200 89.4678 200 200c0 110.549 -89.4678 200 -200 200c-110.549 0 -200 -89.4688 -200 -200c0 -110.549 89.4678 -200 200 -200z
+M366.442 73.791c4.40332 -7.99219 -1.37012 -17.791 -10.5107 -17.791h-42.8096c-0.00488281 0 -0.000976562 -0.0126953 -0.00585938 -0.0126953c-4.58594 0 -8.57422 2.58301 -10.5869 6.37305l-47.5156 89.3027h-31.958v-83.6631c0 -6.61719 -5.38281 -12 -12 -12
+h-38.5674c-6.61719 0 -12 5.38281 -12 12v248.304c0 6.61719 5.38281 12 12 12h78.667c71.251 0 101.498 -32.749 101.498 -85.252c0 -31.6123 -15.2148 -59.2969 -39.4824 -73.1758c3.02148 -4.61719 0.225586 0.199219 53.2715 -96.085zM256.933 208.094
+c20.9131 0 32.4307 11.5186 32.4316 32.4316c0 19.5752 -6.5127 31.709 -38.9297 31.709h-27.377v-64.1406h33.875z" />
+    <glyph glyph-name="calendar-plus" unicode="&#xf271;" horiz-adv-x="448" 
+d="M336 156v-24c0 -6.59961 -5.40039 -12 -12 -12h-76v-76c0 -6.59961 -5.40039 -12 -12 -12h-24c-6.59961 0 -12 5.40039 -12 12v76h-76c-6.59961 0 -12 5.40039 -12 12v24c0 6.59961 5.40039 12 12 12h76v76c0 6.59961 5.40039 12 12 12h24c6.59961 0 12 -5.40039 12 -12
+v-76h76c6.59961 0 12 -5.40039 12 -12zM448 336v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h48v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h128v52c0 6.59961 5.40039 12 12 12h40
+c6.59961 0 12 -5.40039 12 -12v-52h48c26.5 0 48 -21.5 48 -48zM400 -10v298h-352v-298c0 -3.2998 2.7002 -6 6 -6h340c3.2998 0 6 2.7002 6 6z" />
+    <glyph glyph-name="calendar-minus" unicode="&#xf272;" horiz-adv-x="448" 
+d="M124 120c-6.59961 0 -12 5.40039 -12 12v24c0 6.59961 5.40039 12 12 12h200c6.59961 0 12 -5.40039 12 -12v-24c0 -6.59961 -5.40039 -12 -12 -12h-200zM448 336v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h48v52
+c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h128v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h48c26.5 0 48 -21.5 48 -48zM400 -10v298h-352v-298c0 -3.2998 2.7002 -6 6 -6h340c3.2998 0 6 2.7002 6 6z" />
+    <glyph glyph-name="calendar-times" unicode="&#xf273;" horiz-adv-x="448" 
+d="M311.7 73.2998l-17 -17c-4.7002 -4.7002 -12.2998 -4.7002 -17 0l-53.7002 53.7998l-53.7002 -53.6992c-4.7002 -4.7002 -12.2998 -4.7002 -17 0l-17 17c-4.7002 4.69922 -4.7002 12.2998 0 17l53.7002 53.6992l-53.7002 53.7002c-4.7002 4.7002 -4.7002 12.2998 0 17
+l17 17c4.7002 4.7002 12.2998 4.7002 17 0l53.7002 -53.7002l53.7002 53.7002c4.7002 4.7002 12.2998 4.7002 17 0l17 -17c4.7002 -4.7002 4.7002 -12.2998 0 -17l-53.7998 -53.7998l53.6992 -53.7002c4.80078 -4.7002 4.80078 -12.2998 0.100586 -17zM448 336v-352
+c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h48v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h128v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h48c26.5 0 48 -21.5 48 -48zM400 -10
+v298h-352v-298c0 -3.2998 2.7002 -6 6 -6h340c3.2998 0 6 2.7002 6 6z" />
+    <glyph glyph-name="calendar-check" unicode="&#xf274;" horiz-adv-x="448" 
+d="M400 384c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h48v52c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-52h128v52c0 6.62695 5.37305 12 12 12h40
+c6.62695 0 12 -5.37305 12 -12v-52h48zM394 -16c3.31152 0 6 2.68848 6 6v298h-352v-298c0 -3.31152 2.68848 -6 6 -6h340zM341.151 184.65l-142.31 -141.169c-4.70508 -4.66699 -12.3027 -4.6377 -16.9707 0.0673828l-75.0908 75.6992
+c-4.66699 4.70508 -4.6377 12.3027 0.0673828 16.9707l22.7197 22.5361c4.70508 4.66699 12.3027 4.63672 16.9697 -0.0693359l44.1035 -44.4609l111.072 110.182c4.70508 4.66699 12.3027 4.63672 16.9707 -0.0683594l22.5361 -22.7178
+c4.66699 -4.70508 4.63672 -12.3027 -0.0683594 -16.9697z" />
+    <glyph glyph-name="map" unicode="&#xf279;" horiz-adv-x="576" 
+d="M560.02 416c8.4502 0 15.9805 -6.83008 15.9805 -16.0195v-346.32c0 -13.4707 -8.32422 -24.9951 -20.1201 -29.71l-151.83 -52.8105c-6.23242 -2.02832 -12.9023 -3.12305 -19.8076 -3.12305c-7.07324 0 -13.8799 1.15039 -20.2422 3.27344l-172 60.71l-170.05 -62.8398
+c-1.99023 -0.790039 -4 -1.16016 -5.95996 -1.16016c-8.45996 0 -15.9902 6.83008 -15.9902 16.0195v346.32c0.00292969 13.4697 8.32617 24.9932 20.1201 29.71l151.83 52.8105c6.43945 2.08984 13.1201 3.13965 19.8096 3.13965
+c7.06641 -0.00292969 13.8789 -1.16602 20.2402 -3.28027l172 -60.7197h0.00976562l170.05 62.8398c1.98047 0.790039 4 1.16016 5.95996 1.16016zM224 357.58v-285.97l128 -45.1904v285.97zM48 29.9502l127.36 47.0801l0.639648 0.229492v286.2l-128 -44.5303v-288.979z
+M528 65.0801v288.97l-127.36 -47.0693l-0.639648 -0.240234v-286.19z" />
+    <glyph glyph-name="comment-alt" unicode="&#xf27a;" 
+d="M448 448c35.2998 0 64 -28.7002 64 -64v-288c0 -35.2998 -28.7002 -64 -64 -64h-144l-124.9 -93.5996c-2.19922 -1.7002 -4.69922 -2.40039 -7.09961 -2.40039c-6.2002 0 -12 4.90039 -12 12v84h-96c-35.2998 0 -64 28.7002 -64 64v288c0 35.2998 28.7002 64 64 64h384z
+M464 96v288c0 8.7998 -7.2002 16 -16 16h-384c-8.7998 0 -16 -7.2002 -16 -16v-288c0 -8.7998 7.2002 -16 16 -16h144v-60l67.2002 50.4004l12.7998 9.59961h160c8.7998 0 16 7.2002 16 16z" />
+    <glyph glyph-name="pause-circle" unicode="&#xf28b;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM256 -8c110.5 0 200 89.5 200 200s-89.5 200 -200 200s-200 -89.5 -200 -200s89.5 -200 200 -200zM352 272v-160c0 -8.7998 -7.2002 -16 -16 -16h-48
+c-8.7998 0 -16 7.2002 -16 16v160c0 8.7998 7.2002 16 16 16h48c8.7998 0 16 -7.2002 16 -16zM240 272v-160c0 -8.7998 -7.2002 -16 -16 -16h-48c-8.7998 0 -16 7.2002 -16 16v160c0 8.7998 7.2002 16 16 16h48c8.7998 0 16 -7.2002 16 -16z" />
+    <glyph glyph-name="stop-circle" unicode="&#xf28d;" 
+d="M504 192c0 -137 -111 -248 -248 -248s-248 111 -248 248s111 248 248 248s248 -111 248 -248zM56 192c0 -110.5 89.5 -200 200 -200s200 89.5 200 200s-89.5 200 -200 200s-200 -89.5 -200 -200zM352 272v-160c0 -8.7998 -7.2002 -16 -16 -16h-160
+c-8.7998 0 -16 7.2002 -16 16v160c0 8.7998 7.2002 16 16 16h160c8.7998 0 16 -7.2002 16 -16z" />
+    <glyph glyph-name="handshake" unicode="&#xf2b5;" horiz-adv-x="640" 
+d="M519.2 320.1h120.8v-255.699h-64c-17.5 0 -31.7998 14.1992 -31.9004 31.6992h-57.8994c-1.7998 -8.19922 -5.2998 -16.0996 -10.9004 -23l-26.2002 -32.2998c-15.7998 -19.3994 -41.8994 -25.5 -64 -16.7998c-13.5 -16.5996 -30.5996 -24 -48.7998 -24
+c-15.0996 0 -28.5996 5.09961 -41.0996 15.9004c-31.7998 -21.9004 -74.7002 -21.3008 -105.601 3.7998l-84.5996 76.3994h-9.09961c-0.100586 -17.5 -14.3008 -31.6992 -31.9004 -31.6992h-64v255.699h118l47.5996 47.6006c10.5 10.3994 24.8008 16.2998 39.6006 16.2998
+h226.8c15.4326 0 29.4326 -6.22168 39.5996 -16.2998zM48 96.4004c8.7998 0 16 7.09961 16 16c0 8.7998 -7.2002 16 -16 16s-16 -7.2002 -16 -16c0 -8.80078 7.2002 -16 16 -16zM438 103.3c2.7002 3.40039 2.2002 8.5 -1.2002 11.2998l-108.2 87.8008l-8.19922 -7.5
+c-40.3008 -36.8008 -86.7002 -11.8008 -101.5 4.39941c-26.7002 29 -25 74.4004 4.39941 101.3l38.7002 35.5h-56.7002c-2 -0.799805 -3.7002 -1.5 -5.7002 -2.2998l-61.6992 -61.5996h-41.9004v-128.101h27.7002l97.2998 -88
+c16.0996 -13.0996 41.4004 -10.5 55.2998 6.60059l15.6006 19.2002l36.7998 -31.5c3 -2.40039 12 -4.90039 18 2.39941l30 36.5l23.8994 -19.3994c3.5 -2.80078 8.5 -2.2002 11.3008 1.19922zM544 144.1v128h-44.7002l-61.7002 61.6006
+c-1.39941 1.5 -3.39941 2.2998 -5.5 2.2998l-83.6992 -0.200195c-10 0 -19.6006 -3.7002 -27 -10.5l-65.6006 -60.0996c-9.7002 -8.7998 -10.5 -24 -1.2002 -33.9004c8.90039 -9.39941 25.1006 -8.7002 34.6006 0l55.2002 50.6006c6.5 5.89941 16.5996 5.5 22.5996 -1
+l10.9004 -11.7002c6 -6.5 5.5 -16.6006 -1 -22.6006l-12.5 -11.3994l102.699 -83.4004c2.80078 -2.2998 5.40039 -4.89941 7.7002 -7.7002h69.2002zM592 96.4004c8.7998 0 16 7.09961 16 16c0 8.7998 -7.2002 16 -16 16s-16 -7.2002 -16 -16c0 -8.80078 7.2002 -16 16 -16z
+" />
+    <glyph glyph-name="envelope-open" unicode="&#xf2b6;" 
+d="M494.586 283.484c10.6523 -8.80762 17.4141 -22.1064 17.4141 -36.9932v-262.491c0 -26.5098 -21.4902 -48 -48 -48h-416c-26.5098 0 -48 21.4902 -48 48v262.515c0 14.9355 6.80469 28.2705 17.5146 37.0771c4.08008 3.35449 110.688 89.0996 135.15 108.549
+c22.6992 18.1426 60.1299 55.8594 103.335 55.8594c43.4365 0 81.2314 -38.1914 103.335 -55.8594c23.5283 -18.707 130.554 -104.773 135.251 -108.656zM464 -10v253.632c0 0.00195312 0.00390625 0.000976562 0.00390625 0.00292969
+c0 1.88184 -0.869141 3.56152 -2.22754 4.66016c-15.8633 12.8232 -108.793 87.5752 -132.366 106.316c-17.5527 14.0195 -49.7168 45.3887 -73.4102 45.3887c-23.6016 0 -55.2451 -30.8799 -73.4102 -45.3887c-23.5713 -18.7393 -116.494 -93.4795 -132.364 -106.293
+c-1.40918 -1.13965 -2.22559 -2.85254 -2.22559 -4.66504v-253.653c0 -3.31152 2.68848 -6 6 -6h404c3.31152 0 6 2.68848 6 6zM432.009 177.704c4.24902 -5.15918 3.46484 -12.7949 -1.74512 -16.9814c-28.9746 -23.2822 -59.2734 -47.5967 -70.9287 -56.8623
+c-22.6992 -18.1436 -60.1299 -55.8604 -103.335 -55.8604c-43.4521 0 -81.2871 38.2373 -103.335 55.8604c-11.2793 8.9668 -41.7441 33.4131 -70.9268 56.8643c-5.20996 4.1875 -5.99316 11.8223 -1.74512 16.9814l15.2578 18.5283
+c4.17773 5.07227 11.6572 5.84277 16.7793 1.72559c28.6182 -23.001 58.5654 -47.0352 70.5596 -56.5713c17.5527 -14.0195 49.7168 -45.3887 73.4102 -45.3887c23.6016 0 55.2461 30.8799 73.4102 45.3887c11.9941 9.53516 41.9434 33.5703 70.5625 56.5684
+c5.12207 4.11621 12.6016 3.3457 16.7783 -1.72656z" />
+    <glyph glyph-name="address-book" unicode="&#xf2b9;" horiz-adv-x="448" 
+d="M436 288h-20v-64h20c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-20v-64h20c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-20v-48c0 -26.5 -21.5 -48 -48 -48h-320c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48
+h320c26.5 0 48 -21.5 48 -48v-48h20c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12zM368 -16v416h-320v-416h320zM208 192c-35.2998 0 -64 28.7002 -64 64s28.7002 64 64 64s64 -28.7002 64 -64s-28.7002 -64 -64 -64zM118.4 64
+c-12.4004 0 -22.4004 8.59961 -22.4004 19.2002v19.2002c0 31.7998 30.0996 57.5996 67.2002 57.5996c11.3994 0 17.8994 -8 44.7998 -8c26.0996 0 34 8 44.7998 8c37.1006 0 67.2002 -25.7998 67.2002 -57.5996v-19.2002c0 -10.6006 -10 -19.2002 -22.4004 -19.2002
+h-179.199z" />
+    <glyph glyph-name="address-card" unicode="&#xf2bb;" horiz-adv-x="576" 
+d="M528 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h480zM528 16v352h-480v-352h480zM208 192c-35.2998 0 -64 28.7002 -64 64s28.7002 64 64 64s64 -28.7002 64 -64s-28.7002 -64 -64 -64z
+M118.4 64c-12.4004 0 -22.4004 8.59961 -22.4004 19.2002v19.2002c0 31.7998 30.0996 57.5996 67.2002 57.5996c11.3994 0 17.8994 -8 44.7998 -8c26.0996 0 34 8 44.7998 8c37.1006 0 67.2002 -25.7998 67.2002 -57.5996v-19.2002
+c0 -10.6006 -10 -19.2002 -22.4004 -19.2002h-179.199zM360 128c-4.40039 0 -8 3.59961 -8 8v16c0 4.40039 3.59961 8 8 8h112c4.40039 0 8 -3.59961 8 -8v-16c0 -4.40039 -3.59961 -8 -8 -8h-112zM360 192c-4.40039 0 -8 3.59961 -8 8v16c0 4.40039 3.59961 8 8 8h112
+c4.40039 0 8 -3.59961 8 -8v-16c0 -4.40039 -3.59961 -8 -8 -8h-112zM360 256c-4.40039 0 -8 3.59961 -8 8v16c0 4.40039 3.59961 8 8 8h112c4.40039 0 8 -3.59961 8 -8v-16c0 -4.40039 -3.59961 -8 -8 -8h-112z" />
+    <glyph glyph-name="user-circle" unicode="&#xf2bd;" horiz-adv-x="496" 
+d="M248 344c53 0 96 -43 96 -96s-43 -96 -96 -96s-96 43 -96 96s43 96 96 96zM248 200c26.5 0 48 21.5 48 48s-21.5 48 -48 48s-48 -21.5 -48 -48s21.5 -48 48 -48zM248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8
+c49.7002 0 95.0996 18.2998 130.1 48.4004c-14.8994 23 -40.3994 38.5 -69.5996 39.5c-20.7998 -6.5 -40.5996 -9.60059 -60.5 -9.60059s-39.7002 3.2002 -60.5 9.60059c-29.2002 -0.900391 -54.7002 -16.5 -69.5996 -39.5c35 -30.1006 80.3994 -48.4004 130.1 -48.4004z
+M410.7 76.0996c23.3994 32.7002 37.2998 72.7002 37.2998 115.9c0 110.3 -89.7002 200 -200 200s-200 -89.7002 -200 -200c0 -43.2002 13.9004 -83.2002 37.2998 -115.9c24.5 31.4004 62.2002 51.9004 105.101 51.9004c10.1992 0 26.0996 -9.59961 57.5996 -9.59961
+c31.5996 0 47.4004 9.59961 57.5996 9.59961c43 0 80.7002 -20.5 105.101 -51.9004z" />
+    <glyph glyph-name="id-badge" unicode="&#xf2c1;" horiz-adv-x="384" 
+d="M336 448c26.5 0 48 -21.5 48 -48v-416c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48h288zM336 -16v416h-288v-416h288zM144 336c-8.7998 0 -16 7.2002 -16 16s7.2002 16 16 16h96c8.7998 0 16 -7.2002 16 -16s-7.2002 -16 -16 -16
+h-96zM192 160c-35.2998 0 -64 28.7002 -64 64s28.7002 64 64 64s64 -28.7002 64 -64s-28.7002 -64 -64 -64zM102.4 32c-12.4004 0 -22.4004 8.59961 -22.4004 19.2002v19.2002c0 31.7998 30.0996 57.5996 67.2002 57.5996c11.3994 0 17.8994 -8 44.7998 -8
+c26.0996 0 34 8 44.7998 8c37.1006 0 67.2002 -25.7998 67.2002 -57.5996v-19.2002c0 -10.6006 -10 -19.2002 -22.4004 -19.2002h-179.199z" />
+    <glyph glyph-name="id-card" unicode="&#xf2c2;" horiz-adv-x="576" 
+d="M528 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h480zM528 16v288h-480v-288h32.7998c-1 4.5 -0.799805 -3.59961 -0.799805 22.4004c0 31.7998 30.0996 57.5996 67.2002 57.5996
+c11.3994 0 17.8994 -8 44.7998 -8c26.0996 0 34 8 44.7998 8c37.1006 0 67.2002 -25.7998 67.2002 -57.5996c0 -26 0.0996094 -17.9004 -0.799805 -22.4004h224.8zM360 96c-4.40039 0 -8 3.59961 -8 8v16c0 4.40039 3.59961 8 8 8h112c4.40039 0 8 -3.59961 8 -8v-16
+c0 -4.40039 -3.59961 -8 -8 -8h-112zM360 160c-4.40039 0 -8 3.59961 -8 8v16c0 4.40039 3.59961 8 8 8h112c4.40039 0 8 -3.59961 8 -8v-16c0 -4.40039 -3.59961 -8 -8 -8h-112zM360 224c-4.40039 0 -8 3.59961 -8 8v16c0 4.40039 3.59961 8 8 8h112
+c4.40039 0 8 -3.59961 8 -8v-16c0 -4.40039 -3.59961 -8 -8 -8h-112zM192 128c-35.2998 0 -64 28.7002 -64 64s28.7002 64 64 64s64 -28.7002 64 -64s-28.7002 -64 -64 -64z" />
+    <glyph glyph-name="window-maximize" unicode="&#xf2d0;" 
+d="M464 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h416zM464 22v234h-416v-234c0 -3.2998 2.7002 -6 6 -6h404c3.2998 0 6 2.7002 6 6z" />
+    <glyph glyph-name="window-minimize" unicode="&#xf2d1;" 
+d="M480 -32h-448c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32h448c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32z" />
+    <glyph glyph-name="window-restore" unicode="&#xf2d2;" 
+d="M464 448c26.5 0 48 -21.5 48 -48v-320c0 -26.5 -21.5 -48 -48 -48h-48v-48c0 -26.5 -21.5 -48 -48 -48h-320c-26.5 0 -48 21.5 -48 48v320c0 26.5 21.5 48 48 48h48v48c0 26.5 21.5 48 48 48h320zM368 -16v208h-320v-208h320zM464 80v320h-320v-48h224
+c26.5 0 48 -21.5 48 -48v-224h48z" />
+    <glyph glyph-name="snowflake" unicode="&#xf2dc;" horiz-adv-x="448" 
+d="M440.1 92.7998c7.60059 -4.39941 10.1006 -14.2002 5.5 -21.7002l-7.89941 -13.8994c-4.40039 -7.7002 -14 -10.2998 -21.5 -5.90039l-39.2002 23l9.09961 -34.7002c2.30078 -8.5 -2.69922 -17.2998 -11.0996 -19.5996l-15.2002 -4.09961
+c-8.39941 -2.30078 -17.0996 2.7998 -19.2998 11.2998l-21.2998 81l-71.9004 42.2002v-84.5l58.2998 -59.3008c6.10059 -6.19922 6.10059 -16.3994 0 -22.5996l-11.0996 -11.2998c-6.09961 -6.2002 -16.0996 -6.2002 -22.2002 0l-24.8994 25.3994v-46.0996
+c0 -8.7998 -7 -16 -15.7002 -16h-15.7002c-8.7002 0 -15.7002 7.2002 -15.7002 16v45.9004l-24.8994 -25.4004c-6.10059 -6.2002 -16.1006 -6.2002 -22.2002 0l-11.1006 11.2998c-6.09961 6.2002 -6.09961 16.4004 0 22.6006l58.3008 59.2998v84.5l-71.9004 -42.2002
+l-21.2998 -81c-2.2998 -8.5 -10.9004 -13.5996 -19.2998 -11.2998l-15.2002 4.09961c-8.40039 2.2998 -13.2998 11.1006 -11.1006 19.6006l9.10059 34.6992l-39.2002 -23c-7.5 -4.39941 -17.2002 -1.7998 -21.5 5.90039l-7.90039 13.9004
+c-4.2998 7.69922 -1.69922 17.5 5.80078 21.8994l39.1992 23l-34.0996 9.2998c-8.40039 2.30078 -13.2998 11.1006 -11.0996 19.6006l4.09961 15.5c2.2998 8.5 10.9004 13.5996 19.2998 11.2998l79.7002 -21.7002l71.9004 42.2002l-71.9004 42.2002l-79.7002 -21.7002
+c-8.39941 -2.2998 -17.0996 2.7998 -19.2998 11.2998l-4.09961 15.5c-2.30078 8.5 2.69922 17.2998 11.0996 19.6006l34.0996 9.09961l-39.1992 23c-7.60059 4.5 -10.1006 14.2002 -5.80078 21.9004l7.90039 13.8994c4.40039 7.7002 14 10.2998 21.5 5.90039l39.2002 -23
+l-9.10059 34.7002c-2.2998 8.5 2.7002 17.2998 11.1006 19.5996l15.2002 4.09961c8.39941 2.30078 17.0996 -2.7998 19.2998 -11.2998l21.2998 -81l71.9004 -42.2002v84.5l-58.3008 59.3008c-6.09961 6.19922 -6.09961 16.3994 0 22.5996l11.5 11.2998
+c6.10059 6.2002 16.1006 6.2002 22.2002 0l24.9004 -25.3994v46.0996c0 8.7998 7 16 15.7002 16h15.6992c8.7002 0 15.7002 -7.2002 15.7002 -16v-45.9004l24.9004 25.4004c6.09961 6.2002 16.0996 6.2002 22.2002 0l11.0996 -11.2998
+c6.09961 -6.2002 6.09961 -16.4004 0 -22.6006l-58.2998 -59.2998v-84.5l71.8994 42.2002l21.3008 81c2.2998 8.5 10.8994 13.5996 19.2998 11.2998l15.2002 -4.09961c8.39941 -2.2998 13.2998 -11.1006 11.0996 -19.6006l-9.09961 -34.6992l39.1992 23
+c7.5 4.39941 17.2002 1.7998 21.5 -5.90039l7.90039 -13.9004c4.2998 -7.69922 1.7002 -17.5 -5.7998 -21.8994l-39.2002 -23l34.0996 -9.2998c8.40039 -2.30078 13.3008 -11.1006 11.1006 -19.6006l-4.10059 -15.5c-2.2998 -8.5 -10.8994 -13.5996 -19.2998 -11.2998
+l-79.7002 21.7002l-71.8994 -42.2002l71.7998 -42.2002l79.7002 21.7002c8.39941 2.2998 17.0996 -2.7998 19.2998 -11.2998l4.09961 -15.5c2.30078 -8.5 -2.69922 -17.2998 -11.0996 -19.6006l-34.0996 -9.2998z" />
+    <glyph glyph-name="trash-alt" unicode="&#xf2ed;" horiz-adv-x="448" 
+d="M268 32c-6.62305 0 -12 5.37695 -12 12v216c0 6.62305 5.37695 12 12 12h24c6.62305 0 12 -5.37695 12 -12v-216c0 -6.62305 -5.37695 -12 -12 -12h-24zM432 368c8.83105 0 16 -7.16895 16 -16v-16c0 -8.83105 -7.16895 -16 -16 -16h-16v-336
+c0 -26.4922 -21.5078 -48 -48 -48h-288c-26.4922 0 -48 21.5078 -48 48v336h-16c-8.83105 0 -16 7.16895 -16 16v16c0 8.83105 7.16895 16 16 16h82.4102l34.0195 56.7002c8.39258 13.9844 23.6777 23.2998 41.1602 23.2998h100.82
+c0.0078125 0 -0.015625 0.0517578 -0.0078125 0.0517578c17.4824 0 32.7949 -9.36719 41.1875 -23.3516l34 -56.7002h82.4102zM171.84 397.09l-17.4502 -29.0898h139.221l-17.46 29.0898c-1.0498 1.74707 -2.95898 2.91016 -5.14355 2.91016h-0.00683594h-94
+c-0.00585938 0 -0.00683594 0.00683594 -0.0126953 0.00683594c-2.18457 0 -4.09766 -1.16992 -5.14746 -2.91699zM368 -16v336h-288v-336h288zM156 32c-6.62305 0 -12 5.37695 -12 12v216c0 6.62305 5.37695 12 12 12h24c6.62305 0 12 -5.37695 12 -12v-216
+c0 -6.62305 -5.37695 -12 -12 -12h-24z" />
+    <glyph glyph-name="images" unicode="&#xf302;" horiz-adv-x="576" 
+d="M480 32v-16c0 -26.5098 -21.4902 -48 -48 -48h-384c-26.5098 0 -48 21.4902 -48 48v256c0 26.5098 21.4902 48 48 48h16v-48h-10c-3.31152 0 -6 -2.68848 -6 -6v-244c0 -3.31152 2.68848 -6 6 -6h372c3.31152 0 6 2.68848 6 6v10h48zM522 368h-372
+c-3.31152 0 -6 -2.68848 -6 -6v-244c0 -3.31152 2.68848 -6 6 -6h372c3.31152 0 6 2.68848 6 6v244c0 3.31152 -2.68848 6 -6 6zM528 416c26.5098 0 48 -21.4902 48 -48v-256c0 -26.5098 -21.4902 -48 -48 -48h-384c-26.5098 0 -48 21.4902 -48 48v256
+c0 26.5098 21.4902 48 48 48h384zM264 304c0 -22.0908 -17.9092 -40 -40 -40s-40 17.9092 -40 40s17.9092 40 40 40s40 -17.9092 40 -40zM192 208l39.5146 39.5146c4.68652 4.68652 12.2842 4.68652 16.9717 0l39.5137 -39.5146l103.515 103.515
+c4.68652 4.68652 12.2842 4.68652 16.9717 0l71.5137 -71.5146v-80h-288v48z" />
+    <glyph glyph-name="clipboard" unicode="&#xf328;" horiz-adv-x="384" 
+d="M336 384c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h80c0 35.2998 28.7002 64 64 64s64 -28.7002 64 -64h80zM192 408c-13.2998 0 -24 -10.7002 -24 -24s10.7002 -24 24 -24s24 10.7002 24 24
+s-10.7002 24 -24 24zM336 -10v340c0 3.2998 -2.7002 6 -6 6h-42v-36c0 -6.59961 -5.40039 -12 -12 -12h-168c-6.59961 0 -12 5.40039 -12 12v36h-42c-3.2998 0 -6 -2.7002 -6 -6v-340c0 -3.2998 2.7002 -6 6 -6h276c3.2998 0 6 2.7002 6 6z" />
+    <glyph glyph-name="arrow-alt-circle-down" unicode="&#xf358;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM256 -8c110.5 0 200 89.5 200 200s-89.5 200 -200 200s-200 -89.5 -200 -200s89.5 -200 200 -200zM224 308c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-116
+h67c10.7002 0 16.0996 -12.9004 8.5 -20.5l-99 -99c-4.7002 -4.7002 -12.2998 -4.7002 -17 0l-99 99c-7.5 7.59961 -2.2002 20.5 8.5 20.5h67v116z" />
+    <glyph glyph-name="arrow-alt-circle-left" unicode="&#xf359;" 
+d="M8 192c0 137 111 248 248 248s248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248zM456 192c0 110.5 -89.5 200 -200 200s-200 -89.5 -200 -200s89.5 -200 200 -200s200 89.5 200 200zM384 212v-40c0 -6.59961 -5.40039 -12 -12 -12h-116v-67
+c0 -10.7002 -12.9004 -16 -20.5 -8.5l-99 99c-4.7002 4.7002 -4.7002 12.2998 0 17l99 99c7.59961 7.59961 20.5 2.2002 20.5 -8.5v-67h116c6.59961 0 12 -5.40039 12 -12z" />
+    <glyph glyph-name="arrow-alt-circle-right" unicode="&#xf35a;" 
+d="M504 192c0 -137 -111 -248 -248 -248s-248 111 -248 248s111 248 248 248s248 -111 248 -248zM56 192c0 -110.5 89.5 -200 200 -200s200 89.5 200 200s-89.5 200 -200 200s-200 -89.5 -200 -200zM128 172v40c0 6.59961 5.40039 12 12 12h116v67
+c0 10.7002 12.9004 16 20.5 8.5l99 -99c4.7002 -4.7002 4.7002 -12.2998 0 -17l-99 -99c-7.59961 -7.59961 -20.5 -2.2002 -20.5 8.5v67h-116c-6.59961 0 -12 5.40039 -12 12z" />
+    <glyph glyph-name="arrow-alt-circle-up" unicode="&#xf35b;" 
+d="M256 -56c-137 0 -248 111 -248 248s111 248 248 248s248 -111 248 -248s-111 -248 -248 -248zM256 392c-110.5 0 -200 -89.5 -200 -200s89.5 -200 200 -200s200 89.5 200 200s-89.5 200 -200 200zM276 64h-40c-6.59961 0 -12 5.40039 -12 12v116h-67
+c-10.7002 0 -16 12.9004 -8.5 20.5l99 99c4.7002 4.7002 12.2998 4.7002 17 0l99 -99c7.59961 -7.59961 2.2002 -20.5 -8.5 -20.5h-67v-116c0 -6.59961 -5.40039 -12 -12 -12z" />
+    <glyph glyph-name="gem" unicode="&#xf3a5;" horiz-adv-x="576" 
+d="M464 448c4.09961 0 7.7998 -2 10.0996 -5.40039l99.9004 -147.199c2.90039 -4.40039 2.59961 -10.1006 -0.700195 -14.2002l-276 -340.8c-4.7998 -5.90039 -13.7998 -5.90039 -18.5996 0l-276 340.8c-3.2998 4 -3.60059 9.7998 -0.700195 14.2002l100 147.199
+c2.2002 3.40039 6 5.40039 10 5.40039h352zM444.7 400h-56.7998l51.6992 -96h68.4004zM242.6 400l-51.5996 -96h194l-51.7002 96h-90.7002zM131.3 400l-63.2998 -96h68.4004l51.6992 96h-56.7998zM88.2998 256l119.7 -160l-68.2998 160h-51.4004zM191.2 256l96.7998 -243.3
+l96.7998 243.3h-193.6zM368 96l119.6 160h-51.3994z" />
+    <glyph glyph-name="money-bill-alt" unicode="&#xf3d1;" horiz-adv-x="640" 
+d="M320 304c53.0195 0 96 -50.1396 96 -112c0 -61.8701 -43 -112 -96 -112c-53.0195 0 -96 50.1504 -96 112c0 61.8604 42.9805 112 96 112zM360 136v16c0 4.41992 -3.58008 8 -8 8h-16v88c0 4.41992 -3.58008 8 -8 8h-13.5801
+c-4.91113 0 -9.50586 -1.49316 -13.3096 -4.03027l-15.3301 -10.2197c-2.15332 -1.43262 -3.55957 -3.88379 -3.55957 -6.66113c0 -1.6377 0.493164 -3.16113 1.33887 -4.42871l8.88086 -13.3105c1.43164 -2.15234 3.88379 -3.55957 6.66113 -3.55957
+c1.6377 0 3.16016 0.494141 4.42871 1.33984l0.469727 0.310547v-55.4404h-16c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h64c4.41992 0 8 3.58008 8 8zM608 384c17.6699 0 32 -14.3301 32 -32v-320c0 -17.6699 -14.3301 -32 -32 -32h-576
+c-17.6699 0 -32 14.3301 -32 32v320c0 17.6699 14.3301 32 32 32h576zM592 112v160c-35.3496 0 -64 28.6504 -64 64h-416c0 -35.3496 -28.6504 -64 -64 -64v-160c35.3496 0 64 -28.6504 64 -64h416c0 35.3496 28.6504 64 64 64z" />
+    <glyph glyph-name="window-close" unicode="&#xf410;" 
+d="M464 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h416zM464 22v340c0 3.2998 -2.7002 6 -6 6h-404c-3.2998 0 -6 -2.7002 -6 -6v-340c0 -3.2998 2.7002 -6 6 -6h404c3.2998 0 6 2.7002 6 6z
+M356.5 253.4l-61.4004 -61.4004l61.4004 -61.4004c4.59961 -4.59961 4.59961 -12.0996 0 -16.7998l-22.2998 -22.2998c-4.60059 -4.59961 -12.1006 -4.59961 -16.7998 0l-61.4004 61.4004l-61.4004 -61.4004c-4.59961 -4.59961 -12.0996 -4.59961 -16.7998 0
+l-22.2998 22.2998c-4.59961 4.60059 -4.59961 12.1006 0 16.7998l61.4004 61.4004l-61.4004 61.4004c-4.59961 4.59961 -4.59961 12.0996 0 16.7998l22.2998 22.2998c4.60059 4.59961 12.1006 4.59961 16.7998 0l61.4004 -61.4004l61.4004 61.4004
+c4.59961 4.59961 12.0996 4.59961 16.7998 0l22.2998 -22.2998c4.7002 -4.60059 4.7002 -12.1006 0 -16.7998z" />
+    <glyph glyph-name="comment-dots" unicode="&#xf4ad;" 
+d="M144 240c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32zM256 240c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32zM368 240c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32
+s-32 14.2998 -32 32s14.2998 32 32 32zM256 416c141.4 0 256 -93.0996 256 -208s-114.6 -208 -256 -208c-32.7998 0 -64 5.2002 -92.9004 14.2998c-29.0996 -20.5996 -77.5996 -46.2998 -139.1 -46.2998c-9.59961 0 -18.2998 5.7002 -22.0996 14.5
+c-3.80078 8.7998 -2 19 4.59961 26c0.5 0.400391 31.5 33.7998 46.4004 73.2002c-33 35.0996 -52.9004 78.7002 -52.9004 126.3c0 114.9 114.6 208 256 208zM256 48c114.7 0 208 71.7998 208 160s-93.2998 160 -208 160s-208 -71.7998 -208 -160
+c0 -42.2002 21.7002 -74.0996 39.7998 -93.4004l20.6006 -21.7998l-10.6006 -28.0996c-5.5 -14.5 -12.5996 -28.1006 -19.8994 -40.2002c23.5996 7.59961 43.1992 18.9004 57.5 29l19.5 13.7998l22.6992 -7.2002c25.3008 -8 51.7002 -12.0996 78.4004 -12.0996z" />
+    <glyph glyph-name="smile-wink" unicode="&#xf4da;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM365.8 138.4c10.2002 -8.5 11.6006 -23.6006 3.10059 -33.8008
+c-30 -36 -74.1006 -56.5996 -120.9 -56.5996s-90.9004 20.5996 -120.9 56.5996c-8.39941 10.2002 -7.09961 25.3008 3.10059 33.8008c10.0996 8.39941 25.2998 7.09961 33.7998 -3.10059c20.7998 -25.0996 51.5 -39.3994 84 -39.3994s63.2002 14.3994 84 39.3994
+c8.5 10.2002 23.5996 11.6006 33.7998 3.10059zM168 208c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32s32 -14.2998 32 -32s-14.2998 -32 -32 -32zM328 268c25.7002 0 55.9004 -16.9004 59.7002 -42.0996c1.7998 -11.1006 -11.2998 -18.2002 -19.7998 -10.8008l-9.5 8.5
+c-14.8008 13.2002 -46.2002 13.2002 -61 0l-9.5 -8.5c-8.30078 -7.39941 -21.5 -0.399414 -19.8008 10.8008c4 25.1992 34.2002 42.0996 59.9004 42.0996z" />
+    <glyph glyph-name="angry" unicode="&#xf556;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM248 136c33.5996 0 65.2002 -14.7998 86.7998 -40.5996
+c8.40039 -10.2002 7.10059 -25.3008 -3.09961 -33.8008c-10.6006 -8.89941 -25.7002 -6.69922 -33.7998 3c-24.8008 29.7002 -75 29.7002 -99.8008 0c-8.5 -10.1992 -23.5996 -11.5 -33.7998 -3s-11.5996 23.6006 -3.09961 33.8008
+c21.5996 25.7998 53.2002 40.5996 86.7998 40.5996zM200 208c0 -17.7002 -14.2998 -32.0996 -32 -32.0996s-32 14.2998 -32 32c0 6.19922 2.2002 11.6992 5.2998 16.5996l-28.2002 8.5c-12.6992 3.7998 -19.8994 17.2002 -16.0996 29.9004
+c3.7998 12.6992 17.0996 20 29.9004 16.0996l80 -24c12.6992 -3.7998 19.8994 -17.2002 16.0996 -29.9004c-3.09961 -10.3994 -12.7002 -17.0996 -23 -17.0996zM399 262.9c3.7998 -12.7002 -3.40039 -26.1006 -16.0996 -29.8008l-28.2002 -8.5
+c3.09961 -4.89941 5.2998 -10.3994 5.2998 -16.5996c0 -17.7002 -14.2998 -32 -32 -32s-32 14.2998 -32 32c-10.2998 0 -19.9004 6.7002 -23 17.0996c-3.7998 12.7002 3.40039 26.1006 16.0996 29.9004l80 24c12.8008 3.7998 26.1006 -3.40039 29.9004 -16.0996z" />
+    <glyph glyph-name="dizzy" unicode="&#xf567;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM214.2 209.9
+c-7.90039 -7.90039 -20.5 -7.90039 -28.4004 -0.200195l-17.7998 17.7998l-17.7998 -17.7998c-7.7998 -7.7998 -20.5 -7.7998 -28.2998 0c-7.80078 7.7998 -7.80078 20.5 0 28.2998l17.8994 17.9004l-17.8994 17.8994c-7.80078 7.7998 -7.80078 20.5 0 28.2998
+c7.7998 7.80078 20.5 7.80078 28.2998 0l17.7998 -17.7998l17.9004 17.9004c7.7998 7.7998 20.5 7.7998 28.2998 0s7.7998 -20.5 0 -28.2998l-17.9004 -17.9004l17.9004 -17.7998c7.7998 -7.7998 7.7998 -20.5 0 -28.2998zM374.2 302.1
+c7.7002 -7.7998 7.7002 -20.3994 0 -28.1992l-17.9004 -17.9004l17.7998 -18c7.80078 -7.7998 7.80078 -20.5 0 -28.2998c-7.7998 -7.7998 -20.5 -7.7998 -28.2998 0l-17.7998 17.7998l-17.7998 -17.7998c-7.7998 -7.7998 -20.5 -7.7998 -28.2998 0
+c-7.80078 7.7998 -7.80078 20.5 0 28.2998l17.8994 17.9004l-17.8994 17.8994c-7.80078 7.7998 -7.80078 20.5 0 28.2998c7.7998 7.80078 20.5 7.80078 28.2998 0l17.7998 -17.7998l17.9004 17.7998c7.7998 7.80078 20.5 7.80078 28.2998 0zM248 176
+c35.2998 0 64 -28.7002 64 -64s-28.7002 -64 -64 -64s-64 28.7002 -64 64s28.7002 64 64 64z" />
+    <glyph glyph-name="flushed" unicode="&#xf579;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM344 304c44.2002 0 80 -35.7998 80 -80s-35.7998 -80 -80 -80
+s-80 35.7998 -80 80s35.7998 80 80 80zM344 176c26.5 0 48 21.5 48 48s-21.5 48 -48 48s-48 -21.5 -48 -48s21.5 -48 48 -48zM344 248c13.2998 0 24 -10.7002 24 -24s-10.7002 -24 -24 -24s-24 10.7002 -24 24s10.7002 24 24 24zM232 224c0 -44.2002 -35.7998 -80 -80 -80
+s-80 35.7998 -80 80s35.7998 80 80 80s80 -35.7998 80 -80zM152 176c26.5 0 48 21.5 48 48s-21.5 48 -48 48s-48 -21.5 -48 -48s21.5 -48 48 -48zM152 248c13.2998 0 24 -10.7002 24 -24s-10.7002 -24 -24 -24s-24 10.7002 -24 24s10.7002 24 24 24zM312 104
+c13.2002 0 24 -10.7998 24 -24s-10.7998 -24 -24 -24h-128c-13.2002 0 -24 10.7998 -24 24s10.7998 24 24 24h128z" />
+    <glyph glyph-name="frown-open" unicode="&#xf57a;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM200 240c0 -17.7002 -14.2998 -32 -32 -32s-32 14.2998 -32 32
+s14.2998 32 32 32s32 -14.2998 32 -32zM328 272c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32zM248 160c35.5996 0 88.7998 -21.2998 95.7998 -61.2002c2 -11.7998 -9.09961 -21.5996 -20.5 -18.0996
+c-31.2002 9.59961 -59.3994 15.2998 -75.2998 15.2998s-44.0996 -5.7002 -75.2998 -15.2998c-11.5 -3.40039 -22.5 6.2998 -20.5 18.0996c7 39.9004 60.2002 61.2002 95.7998 61.2002z" />
+    <glyph glyph-name="grimace" unicode="&#xf57f;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM168 208c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32
+s32 -14.2998 32 -32s-14.2998 -32 -32 -32zM328 208c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32s32 -14.2998 32 -32s-14.2998 -32 -32 -32zM344 192c26.5 0 48 -21.5 48 -48v-32c0 -26.5 -21.5 -48 -48 -48h-192c-26.5 0 -48 21.5 -48 48v32c0 26.5 21.5 48 48 48
+h192zM176 96v24h-40v-8c0 -8.7998 7.2002 -16 16 -16h24zM176 136v24h-24c-8.7998 0 -16 -7.2002 -16 -16v-8h40zM240 96v24h-48v-24h48zM240 136v24h-48v-24h48zM304 96v24h-48v-24h48zM304 136v24h-48v-24h48zM360 112v8h-40v-24h24c8.7998 0 16 7.2002 16 16zM360 136v8
+c0 8.7998 -7.2002 16 -16 16h-24v-24h40z" />
+    <glyph glyph-name="grin" unicode="&#xf580;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM353.6 143.4c10 3.09961 19.3008 -5.5 17.7002 -15.3008
+c-8 -47.0996 -71.2998 -80 -123.3 -80s-115.4 32.9004 -123.3 80c-1.7002 9.90039 7.7998 18.4004 17.7002 15.3008c26 -8.30078 64.3994 -13.1006 105.6 -13.1006s79.7002 4.7998 105.6 13.1006zM168 208c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32
+s32 -14.2998 32 -32s-14.2998 -32 -32 -32zM328 208c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32s32 -14.2998 32 -32s-14.2998 -32 -32 -32z" />
+    <glyph glyph-name="grin-alt" unicode="&#xf581;" horiz-adv-x="496" 
+d="M200.3 200c-7.5 -11.4004 -24.5996 -12 -32.7002 0c-12.3994 18.7002 -15.1992 37.2998 -15.6992 56c0.599609 18.7002 3.2998 37.2998 15.6992 56c7.60059 11.4004 24.7002 12 32.7002 0c12.4004 -18.7002 15.2002 -37.2998 15.7002 -56
+c-0.599609 -18.7002 -3.2998 -37.2998 -15.7002 -56zM328.3 200c-7.5 -11.4004 -24.5996 -12 -32.7002 0c-12.3994 18.7002 -15.1992 37.2998 -15.6992 56c0.599609 18.7002 3.2998 37.2998 15.6992 56c7.60059 11.4004 24.7002 12 32.7002 0
+c12.4004 -18.7002 15.2002 -37.2998 15.7002 -56c-0.599609 -18.7002 -3.2998 -37.2998 -15.7002 -56zM248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200
+s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM353.6 143.4c10 3.09961 19.3008 -5.5 17.7002 -15.3008c-8 -47.0996 -71.2998 -80 -123.3 -80s-115.4 32.8008 -123.3 80c-1.7002 10 7.7998 18.4004 17.7002 15.3008c26 -8.30078 64.3994 -13.1006 105.6 -13.1006
+s79.7002 4.7998 105.6 13.1006z" />
+    <glyph glyph-name="grin-beam" unicode="&#xf582;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM353.6 143.4c10 3.09961 19.3008 -5.5 17.7002 -15.3008
+c-8 -47.0996 -71.2998 -80 -123.3 -80s-115.4 32.9004 -123.3 80c-1.7002 10 7.89941 18.4004 17.7002 15.3008c26 -8.30078 64.3994 -13.1006 105.6 -13.1006s79.7002 4.7998 105.6 13.1006zM117.7 216.3c-3.60059 1.10059 -6 4.60059 -5.7002 8.2998
+c3.2998 42.1006 32.2002 71.4004 56 71.4004s52.7002 -29.2998 56 -71.4004c0.299805 -3.7998 -2.09961 -7.19922 -5.7002 -8.2998c-3.09961 -1 -7.2002 0 -9.2998 3.7002l-9.5 17c-7.7002 13.7002 -19.2002 21.5996 -31.5 21.5996s-23.7998 -7.89941 -31.5 -21.5996
+l-9.5 -17c-1.90039 -3.2002 -5.7998 -4.7998 -9.2998 -3.7002zM277.7 216.3c-3.60059 1.10059 -6 4.60059 -5.7002 8.2998c3.2998 42.1006 32.2002 71.4004 56 71.4004s52.7002 -29.2998 56 -71.4004c0.299805 -3.7998 -2.09961 -7.19922 -5.7002 -8.2998
+c-3.09961 -1 -7.2002 0 -9.2998 3.7002l-9.5 17c-7.7002 13.7002 -19.2002 21.5996 -31.5 21.5996s-23.7998 -7.89941 -31.5 -21.5996l-9.5 -17c-1.90039 -3.2002 -5.7998 -4.7998 -9.2998 -3.7002z" />
+    <glyph glyph-name="grin-beam-sweat" unicode="&#xf583;" horiz-adv-x="496" 
+d="M440 288c-29.5 0 -53.2998 26.2998 -53.2998 58.7002c0 25 31.7002 75.5 46.2002 97.2998c3.5 5.2998 10.5996 5.2998 14.1992 0c14.5 -21.7998 46.2002 -72.2998 46.2002 -97.2998c0 -32.4004 -23.7998 -58.7002 -53.2998 -58.7002zM248 48
+c-51.9004 0 -115.3 32.9004 -123.3 80c-1.7002 10 7.89941 18.4004 17.7002 15.2998c26 -8.2998 64.3994 -13.0996 105.6 -13.0996s79.7002 4.7998 105.6 13.0996c10 3.2002 19.4004 -5.39941 17.7002 -15.2998c-8 -47.0996 -71.3994 -80 -123.3 -80zM378.3 216.3
+c-3.09961 -0.899414 -7.2002 0.100586 -9.2998 3.7002l-9.5 17c-7.7002 13.7002 -19.2002 21.5996 -31.5 21.5996s-23.7998 -7.89941 -31.5 -21.5996l-9.5 -17c-1.90039 -3.2002 -5.7998 -4.7998 -9.2998 -3.7002c-3.60059 1.10059 -6 4.60059 -5.7002 8.2998
+c3.2998 42.1006 32.2002 71.4004 56 71.4004s52.7002 -29.2998 56 -71.4004c0.299805 -3.7998 -2.09961 -7.19922 -5.7002 -8.2998zM483.6 269.2c8 -24.2998 12.4004 -50.2002 12.4004 -77.2002c0 -137 -111 -248 -248 -248s-248 111 -248 248s111 248 248 248
+c45.7002 0 88.4004 -12.5996 125.2 -34.2002c-10.9004 -21.5996 -15.5 -36.2002 -17.2002 -45.7002c-31.2002 20.1006 -68.2002 31.9004 -108 31.9004c-110.3 0 -200 -89.7002 -200 -200s89.7002 -200 200 -200s200 89.7002 200 200
+c0 22.5 -3.90039 44.0996 -10.7998 64.2998c0.399414 0 21.7998 -2.7998 46.3994 12.9004zM168 258.6c-12.2998 0 -23.7998 -7.7998 -31.5 -21.5996l-9.5 -17c-1.90039 -3.2002 -5.7998 -4.7998 -9.2998 -3.7002c-3.60059 1.10059 -6 4.60059 -5.7002 8.2998
+c3.2998 42.1006 32.2002 71.4004 56 71.4004s52.7002 -29.2998 56 -71.4004c0.299805 -3.7998 -2.09961 -7.19922 -5.7002 -8.2998c-3.09961 -1 -7.2002 0 -9.2998 3.7002l-9.5 17c-7.7002 13.7002 -19.2002 21.5996 -31.5 21.5996z" />
+    <glyph glyph-name="grin-hearts" unicode="&#xf584;" horiz-adv-x="496" 
+d="M353.6 143.4c10 3.09961 19.3008 -5.5 17.7002 -15.3008c-8 -47.0996 -71.2998 -80 -123.3 -80s-115.4 32.8008 -123.3 80c-1.7002 10 7.89941 18.4004 17.7002 15.3008c26 -8.30078 64.3994 -13.1006 105.6 -13.1006s79.7002 4.7998 105.6 13.1006zM200.8 192.3
+l-70.2002 18.1006c-20.3994 5.2998 -31.8994 27 -24.1992 47.1992c6.69922 17.7002 26.6992 26.7002 44.8994 22l7.10059 -1.89941l2 7.09961c5.09961 18.1006 22.8994 30.9004 41.5 27.9004c21.3994 -3.40039 34.3994 -24.2002 28.7998 -44.5l-19.4004 -69.9004
+c-1.2998 -4.5 -6 -7.2002 -10.5 -6zM389.6 257.6c7.7002 -20.1992 -3.7998 -41.7998 -24.1992 -47.0996l-70.2002 -18.2002c-4.60059 -1.2002 -9.2998 1.5 -10.5 6l-19.4004 69.9004c-5.59961 20.2998 7.40039 41.0996 28.7998 44.5c18.7002 3 36.5 -9.7998 41.5 -27.9004
+l2 -7.09961l7.10059 1.89941c18.2002 4.7002 38.2002 -4.39941 44.8994 -22zM248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200
+s89.7002 -200 200 -200z" />
+    <glyph glyph-name="grin-squint" unicode="&#xf585;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM353.6 143.4c10 3.09961 19.3008 -5.5 17.7002 -15.3008
+c-8 -47.0996 -71.2998 -80 -123.3 -80s-115.4 32.9004 -123.3 80c-1.7002 9.90039 7.7998 18.4004 17.7002 15.3008c26 -8.30078 64.3994 -13.1006 105.6 -13.1006s79.7002 4.7998 105.6 13.1006zM118.9 184.2c-3.80078 4.39941 -3.90039 11 -0.100586 15.5l33.6006 40.2998
+l-33.6006 40.2998c-3.7002 4.5 -3.7002 11 0.100586 15.5c3.89941 4.40039 10.1992 5.5 15.2998 2.5l80 -48c3.59961 -2.2002 5.7998 -6.09961 5.7998 -10.2998s-2.2002 -8.09961 -5.7998 -10.2998l-80 -48c-5.40039 -3.2002 -11.7002 -1.7002 -15.2998 2.5zM361.8 181.7
+l-80 48c-3.59961 2.2002 -5.7998 6.09961 -5.7998 10.2998s2.2002 8.09961 5.7998 10.2998l80 48c5.10059 2.90039 11.5 1.90039 15.2998 -2.5c3.80078 -4.5 3.90039 -11 0.100586 -15.5l-33.6006 -40.2998l33.6006 -40.2998c3.7002 -4.5 3.7002 -11 -0.100586 -15.5
+c-3.59961 -4.2002 -9.89941 -5.7002 -15.2998 -2.5z" />
+    <glyph glyph-name="grin-squint-tears" unicode="&#xf586;" 
+d="M117.1 63.9004c6.30078 0.899414 11.7002 -4.5 10.9004 -10.9004c-3.7002 -25.7998 -13.7002 -84 -30.5996 -100.9c-22 -21.8994 -57.9004 -21.5 -80.3008 0.900391c-22.3994 22.4004 -22.7998 58.4004 -0.899414 80.2998
+c16.8994 16.9004 75.0996 26.9004 100.899 30.6006zM75.9004 105.6c-19.6006 -3.89941 -35.1006 -8.09961 -47.3008 -12.1992c-39.2998 90.5996 -22.0996 199.899 52 274c48.5 48.3994 111.9 72.5996 175.4 72.5996c38.9004 0 77.7998 -9.2002 113.2 -27.4004
+c-4 -12.1992 -8.2002 -28 -12 -48.2998c-30.4004 17.9004 -65 27.7002 -101.2 27.7002c-53.4004 0 -103.6 -20.7998 -141.4 -58.5996c-61.5996 -61.5 -74.2998 -153.4 -38.6992 -227.801zM428.2 293.2c20.2998 3.89941 36.2002 8 48.5 12
+c47.8994 -93.2002 32.8994 -210.5 -45.2002 -288.601c-48.5 -48.3994 -111.9 -72.5996 -175.4 -72.5996c-33.6992 0 -67.2998 7 -98.6992 20.5996c4.19922 12.2002 8.2998 27.7002 12.1992 47.2002c26.6006 -12.7998 55.9004 -19.7998 86.4004 -19.7998
+c53.4004 0 103.6 20.7998 141.4 58.5996c65.6992 65.7002 75.7998 166 30.7998 242.601zM394.9 320.1c-6.30078 -0.899414 -11.7002 4.5 -10.9004 10.9004c3.7002 25.7998 13.7002 84 30.5996 100.9c22 21.8994 57.9004 21.5 80.3008 -0.900391
+c22.3994 -22.4004 22.7998 -58.4004 0.899414 -80.2998c-16.8994 -16.9004 -75.0996 -26.9004 -100.899 -30.6006zM207.9 211.8c3 -3 4.19922 -7.2998 3.19922 -11.5l-22.5996 -90.5c-1.40039 -5.39941 -6.2002 -9.09961 -11.7002 -9.09961h-0.899414
+c-5.80078 0.5 -10.5 5.09961 -11 10.8994l-4.80078 52.3008l-52.2998 4.7998c-5.7998 0.5 -10.3994 5.2002 -10.8994 11c-0.400391 5.89941 3.39941 11.2002 9.09961 12.5996l90.5 22.7002c4.2002 1 8.40039 -0.200195 11.4004 -3.2002zM247.6 236.9
+c-0.0996094 0 -6.39941 -1.80078 -11.3994 3.19922c-3 3 -4.2002 7.30078 -3.2002 11.4004l22.5996 90.5c1.40039 5.7002 7 9.2002 12.6006 9.09961c5.7998 -0.5 10.5 -5.09961 11 -10.8994l4.7998 -52.2998l52.2998 -4.80078c5.7998 -0.5 10.4004 -5.19922 10.9004 -11
+c0.399414 -5.89941 -3.40039 -11.1992 -9.10059 -12.5996zM299.6 148.4c29.1006 29.0996 53 59.5996 65.3008 83.7998c4.89941 9.2998 17.5996 9.89941 23.3994 1.7002c27.7002 -38.9004 6.10059 -106.9 -30.5996 -143.7s-104.8 -58.2998 -143.7 -30.6006
+c-8.2998 5.90039 -7.5 18.6006 1.7002 23.4004c24.2002 12.5 54.7998 36.2998 83.8994 65.4004z" />
+    <glyph glyph-name="grin-stars" unicode="&#xf587;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM353.6 143.4c10 3.09961 19.3008 -5.5 17.7002 -15.3008
+c-8 -47.0996 -71.2998 -80 -123.3 -80s-115.4 32.8008 -123.3 80c-1.7002 10 7.89941 18.4004 17.7002 15.3008c26 -8.30078 64.3994 -13.1006 105.6 -13.1006s79.7002 4.7998 105.6 13.1006zM125.7 200.9l6.09961 34.8994l-25.3994 24.6006
+c-4.60059 4.59961 -1.90039 12.2998 4.2998 13.1992l34.8994 5l15.5 31.6006c2.90039 5.7998 11 5.7998 13.9004 0l15.5 -31.6006l34.9004 -5c6.19922 -1 8.7998 -8.69922 4.2998 -13.1992l-25.4004 -24.6006l6 -34.8994c1 -6.2002 -5.39941 -11 -11 -7.90039
+l-31.2998 16.2998l-31.2998 -16.2998c-5.60059 -3.09961 -12 1.7002 -11 7.90039zM385.4 273.6c6.19922 -1 8.89941 -8.59961 4.39941 -13.1992l-25.3994 -24.6006l6 -34.8994c1 -6.2002 -5.40039 -11 -11 -7.90039l-31.3008 16.2998l-31.2998 -16.2998
+c-5.59961 -3.09961 -12 1.7002 -11 7.90039l6 34.8994l-25.3994 24.6006c-4.60059 4.59961 -1.90039 12.2998 4.2998 13.1992l34.8994 5l15.5 31.6006c2.90039 5.7998 11 5.7998 13.9004 0l15.5 -31.6006z" />
+    <glyph glyph-name="grin-tears" unicode="&#xf588;" horiz-adv-x="640" 
+d="M117.1 191.9c6.30078 0.899414 11.7002 -4.5 10.9004 -10.9004c-3.7002 -25.7998 -13.7002 -84 -30.5996 -100.9c-22 -21.8994 -57.9004 -21.5 -80.3008 0.900391c-22.3994 22.4004 -22.7998 58.4004 -0.899414 80.2998c16.8994 16.9004 75.0996 26.9004 100.899 30.6006
+zM623.8 161.3c21.9004 -21.8994 21.5 -57.8994 -0.799805 -80.2002c-22.4004 -22.3994 -58.4004 -22.7998 -80.2998 -0.899414c-16.9004 16.8994 -26.9004 75.0996 -30.6006 100.899c-0.899414 6.30078 4.5 11.7002 10.8008 10.8008
+c25.7998 -3.7002 84 -13.7002 100.899 -30.6006zM497.2 99.5996c12.3994 -37.2998 25.0996 -43.7998 28.2998 -46.5c-44.5996 -65.7998 -120 -109.1 -205.5 -109.1s-160.9 43.2998 -205.5 109.1c3.09961 2.60059 15.7998 9.10059 28.2998 46.5
+c33.4004 -63.8994 100.3 -107.6 177.2 -107.6s143.8 43.7002 177.2 107.6zM122.7 223.5c-2.40039 0.299805 -5 2.5 -49.5 -6.90039c12.3994 125.4 118.1 223.4 246.8 223.4s234.4 -98 246.8 -223.5c-44.2998 9.40039 -47.3994 7.2002 -49.5 7
+c-15.2002 95.2998 -97.7998 168.5 -197.3 168.5s-182.1 -73.2002 -197.3 -168.5zM320 48c-51.9004 0 -115.3 32.9004 -123.3 80c-1.7002 10 7.89941 18.4004 17.7002 15.2998c26 -8.2998 64.3994 -13.0996 105.6 -13.0996s79.7002 4.7998 105.6 13.0996
+c10 3.2002 19.4004 -5.39941 17.7002 -15.2998c-8 -47.0996 -71.3994 -80 -123.3 -80zM450.3 216.3c-3.09961 -0.899414 -7.2002 0.100586 -9.2998 3.7002l-9.5 17c-7.7002 13.7002 -19.2002 21.5996 -31.5 21.5996s-23.7998 -7.89941 -31.5 -21.5996l-9.5 -17
+c-1.90039 -3.2002 -5.7998 -4.7998 -9.2998 -3.7002c-3.60059 1.10059 -6 4.60059 -5.7002 8.2998c3.2998 42.1006 32.2002 71.4004 56 71.4004s52.7002 -29.2998 56 -71.4004c0.299805 -3.7998 -2.09961 -7.19922 -5.7002 -8.2998zM240 258.6
+c-12.2998 0 -23.7998 -7.7998 -31.5 -21.5996l-9.5 -17c-1.90039 -3.2002 -5.7998 -4.7998 -9.2998 -3.7002c-3.60059 1.10059 -6 4.60059 -5.7002 8.2998c3.2998 42.1006 32.2002 71.4004 56 71.4004s52.7002 -29.2998 56 -71.4004
+c0.299805 -3.7998 -2.09961 -7.19922 -5.7002 -8.2998c-3.09961 -1 -7.2002 0 -9.2998 3.7002l-9.5 17c-7.7002 13.7002 -19.2002 21.5996 -31.5 21.5996z" />
+    <glyph glyph-name="grin-tongue" unicode="&#xf589;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM312 40h0.0996094v43.7998l-17.6992 8.7998c-15.1006 7.60059 -31.5 -1.69922 -34.9004 -16.5l-2.7998 -12.0996c-2.10059 -9.2002 -15.2002 -9.2002 -17.2998 0
+l-2.80078 12.0996c-3.39941 14.8008 -19.8994 24 -34.8994 16.5l-17.7002 -8.7998v-42.7998c0 -35.2002 28 -64.5 63.0996 -65c35.8008 -0.5 64.9004 28.4004 64.9004 64zM340.2 14.7002c64 33.3994 107.8 100.3 107.8 177.3c0 110.3 -89.7002 200 -200 200
+s-200 -89.7002 -200 -200c0 -77 43.7998 -143.9 107.8 -177.3c-2.2002 8.09961 -3.7998 16.5 -3.7998 25.2998v43.5c-14.2002 12.4004 -24.4004 27.5 -27.2998 44.5c-1.7002 10 7.7998 18.4004 17.7002 15.2998c26 -8.2998 64.3994 -13.0996 105.6 -13.0996
+s79.7002 4.7998 105.6 13.0996c10 3.2002 19.4004 -5.39941 17.7002 -15.2998c-2.89941 -17 -13.0996 -32.0996 -27.2998 -44.5v-43.5c0 -8.7998 -1.59961 -17.2002 -3.7998 -25.2998zM168 272c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32
+s14.2998 32 32 32zM328 272c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32z" />
+    <glyph glyph-name="grin-tongue-squint" unicode="&#xf58a;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM312 40h0.0996094v43.7998l-17.6992 8.7998c-15.1006 7.60059 -31.5 -1.69922 -34.9004 -16.5l-2.7998 -12.0996c-2.10059 -9.2002 -15.2002 -9.2002 -17.2998 0
+l-2.80078 12.0996c-3.39941 14.8008 -19.8994 24 -34.8994 16.5l-17.7002 -8.7998v-42.7998c0 -35.2002 28 -64.5 63.0996 -65c35.8008 -0.5 64.9004 28.4004 64.9004 64zM340.2 14.7002c64 33.3994 107.8 100.3 107.8 177.3c0 110.3 -89.7002 200 -200 200
+s-200 -89.7002 -200 -200c0 -77 43.7998 -143.9 107.8 -177.3c-2.2002 8.09961 -3.7998 16.5 -3.7998 25.2998v43.5c-14.2002 12.4004 -24.4004 27.5 -27.2998 44.5c-1.7002 10 7.7998 18.4004 17.7002 15.2998c26 -8.2998 64.3994 -13.0996 105.6 -13.0996
+s79.7002 4.7998 105.6 13.0996c10 3.2002 19.4004 -5.39941 17.7002 -15.2998c-2.89941 -17 -13.0996 -32.0996 -27.2998 -44.5v-43.5c0 -8.7998 -1.59961 -17.2002 -3.7998 -25.2998zM377.1 295.8c3.80078 -4.39941 3.90039 -11 0.100586 -15.5l-33.6006 -40.2998
+l33.6006 -40.2998c3.7002 -4.5 3.7002 -11 -0.100586 -15.5c-3.59961 -4.2002 -9.89941 -5.7002 -15.2998 -2.5l-80 48c-3.59961 2.2002 -5.7998 6.09961 -5.7998 10.2998s2.2002 8.09961 5.7998 10.2998l80 48c5 3 11.5 1.90039 15.2998 -2.5zM214.2 250.3
+c3.59961 -2.2002 5.7998 -6.09961 5.7998 -10.2998s-2.2002 -8.09961 -5.7998 -10.2998l-80 -48c-5.40039 -3.2002 -11.7002 -1.7002 -15.2998 2.5c-3.80078 4.5 -3.90039 11 -0.100586 15.5l33.6006 40.2998l-33.6006 40.2998c-3.7002 4.5 -3.7002 11 0.100586 15.5
+c3.89941 4.5 10.2998 5.5 15.2998 2.5z" />
+    <glyph glyph-name="grin-tongue-wink" unicode="&#xf58b;" horiz-adv-x="496" 
+d="M152 268c25.7002 0 55.9004 -16.9004 59.7998 -42.0996c0.799805 -5 -1.7002 -10 -6.09961 -12.4004c-5.7002 -3.09961 -11.2002 -0.599609 -13.7002 1.59961l-9.5 8.5c-14.7998 13.2002 -46.2002 13.2002 -61 0l-9.5 -8.5
+c-3.7998 -3.39941 -9.2998 -4 -13.7002 -1.59961c-4.39941 2.40039 -6.89941 7.40039 -6.09961 12.4004c3.89941 25.1992 34.0996 42.0996 59.7998 42.0996zM328 320c44.2002 0 80 -35.7998 80 -80s-35.7998 -80 -80 -80s-80 35.7998 -80 80s35.7998 80 80 80zM328 192
+c26.5 0 48 21.5 48 48s-21.5 48 -48 48s-48 -21.5 -48 -48s21.5 -48 48 -48zM328 264c13.2998 0 24 -10.7002 24 -24s-10.7002 -24 -24 -24s-24 10.7002 -24 24s10.7002 24 24 24zM248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248z
+M312 40h0.0996094v43.7998l-17.6992 8.7998c-15.1006 7.60059 -31.5 -1.69922 -34.9004 -16.5l-2.7998 -12.0996c-2.10059 -9.2002 -15.2002 -9.2002 -17.2998 0l-2.80078 12.0996c-3.39941 14.8008 -19.8994 24 -34.8994 16.5l-17.7002 -8.7998v-42.7998
+c0 -35.2002 28 -64.5 63.0996 -65c35.8008 -0.5 64.9004 28.4004 64.9004 64zM340.2 14.7002c64 33.3994 107.8 100.3 107.8 177.3c0 110.3 -89.7002 200 -200 200s-200 -89.7002 -200 -200c0 -77 43.7998 -143.9 107.8 -177.3
+c-2.2002 8.09961 -3.7998 16.5 -3.7998 25.2998v43.5c-14.2002 12.4004 -24.4004 27.5 -27.2998 44.5c-1.7002 10 7.7998 18.4004 17.7002 15.2998c26 -8.2998 64.3994 -13.0996 105.6 -13.0996s79.7002 4.7998 105.6 13.0996c10 3.2002 19.4004 -5.39941 17.7002 -15.2998
+c-2.89941 -17 -13.0996 -32.0996 -27.2998 -44.5v-43.5c0 -8.7998 -1.59961 -17.2002 -3.7998 -25.2998z" />
+    <glyph glyph-name="grin-wink" unicode="&#xf58c;" horiz-adv-x="496" 
+d="M328 268c25.6904 0 55.8799 -16.9199 59.8701 -42.1201c1.72949 -11.0898 -11.3506 -18.2695 -19.8301 -10.8398l-9.5498 8.47949c-14.8105 13.1904 -46.1602 13.1904 -60.9707 0l-9.5498 -8.47949c-8.33008 -7.40039 -21.5801 -0.379883 -19.8301 10.8398
+c3.98047 25.2002 34.1699 42.1201 59.8604 42.1201zM168 208c-17.6699 0 -32 14.3301 -32 32s14.3301 32 32 32s32 -14.3301 32 -32s-14.3301 -32 -32 -32zM353.55 143.36c10.04 3.13965 19.3906 -5.4502 17.71 -15.3408
+c-7.92969 -47.1494 -71.3193 -80.0195 -123.26 -80.0195s-115.33 32.8701 -123.26 80.0195c-1.69043 9.9707 7.76953 18.4707 17.71 15.3408c25.9297 -8.31055 64.3994 -13.0605 105.55 -13.0605s79.6201 4.75977 105.55 13.0605zM248 440c136.97 0 248 -111.03 248 -248
+s-111.03 -248 -248 -248s-248 111.03 -248 248s111.03 248 248 248zM248 -8c110.28 0 200 89.7197 200 200s-89.7197 200 -200 200s-200 -89.7197 -200 -200s89.7197 -200 200 -200z" />
+    <glyph glyph-name="kiss" unicode="&#xf596;" horiz-adv-x="496" 
+d="M168 272c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32zM304 140c0 -13 -13.4004 -27.2998 -35.0996 -36.4004c21.7998 -8.69922 35.1992 -23 35.1992 -36c0 -19.1992 -28.6992 -41.5 -71.5 -44h-0.5
+c-3.69922 0 -7 2.60059 -7.7998 6.2002c-0.899414 3.7998 1.10059 7.7002 4.7002 9.2002l17 7.2002c12.9004 5.5 20.7002 13.5 20.7002 21.5s-7.7998 16 -20.7998 21.5l-16.9004 7.2002c-6 2.59961 -5.7002 12.3994 0 14.7998l17 7.2002
+c12.9004 5.5 20.7002 13.5 20.7002 21.5s-7.7998 16 -20.7998 21.5l-16.9004 7.19922c-3.59961 1.5 -5.59961 5.40039 -4.7002 9.2002c0.799805 3.7998 4.40039 6.60059 8.2002 6.2002c42.7002 -2.5 71.5 -24.7998 71.5 -44zM248 440c137 0 248 -111 248 -248
+s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM328 272c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32z
+" />
+    <glyph glyph-name="kiss-beam" unicode="&#xf597;" horiz-adv-x="496" 
+d="M168 296c23.7998 0 52.7002 -29.2998 55.7998 -71.4004c0.299805 -3.7998 -2 -7.19922 -5.59961 -8.2998c-3.10059 -1 -7.2002 0 -9.2998 3.7002l-9.5 17c-7.7002 13.7002 -19.2002 21.5996 -31.5 21.5996c-12.3008 0 -23.8008 -7.89941 -31.5 -21.5996l-9.5 -17
+c-1.80078 -3.2002 -5.80078 -4.7002 -9.30078 -3.7002c-3.59961 1.10059 -5.89941 4.60059 -5.59961 8.2998c3.2998 42.1006 32.2002 71.4004 56 71.4004zM248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8
+c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM304 140c0 -13 -13.4004 -27.2998 -35.0996 -36.4004c21.7998 -8.69922 35.1992 -23 35.1992 -36c0 -19.1992 -28.6992 -41.5 -71.5 -44h-0.5
+c-3.69922 0 -7 2.60059 -7.7998 6.2002c-0.899414 3.7998 1.10059 7.7002 4.7002 9.2002l17 7.2002c12.9004 5.5 20.7002 13.5 20.7002 21.5s-7.7998 16 -20.7998 21.5l-16.9004 7.2002c-6 2.59961 -5.7002 12.3994 0 14.7998l17 7.2002
+c12.9004 5.5 20.7002 13.5 20.7002 21.5s-7.7998 16 -20.7998 21.5l-16.9004 7.19922c-3.59961 1.5 -5.59961 5.40039 -4.7002 9.2002c0.799805 3.7998 4.40039 6.60059 8.2002 6.2002c42.7002 -2.5 71.5 -24.7998 71.5 -44zM328 296
+c23.7998 0 52.7002 -29.2998 55.7998 -71.4004c0.299805 -3.7998 -2 -7.19922 -5.59961 -8.2998c-3.10059 -1 -7.2002 0 -9.2998 3.7002l-9.5 17c-7.7002 13.7002 -19.2002 21.5996 -31.5 21.5996c-12.3008 0 -23.8008 -7.89941 -31.5 -21.5996l-9.5 -17
+c-1.80078 -3.2002 -5.80078 -4.7002 -9.30078 -3.7002c-3.59961 1.10059 -5.89941 4.60059 -5.59961 8.2998c3.2998 42.1006 32.2002 71.4004 56 71.4004z" />
+    <glyph glyph-name="kiss-wink-heart" unicode="&#xf598;" horiz-adv-x="504" 
+d="M304 139.5c0 -13 -13.4004 -27.2998 -35.0996 -36.4004c21.7998 -8.69922 35.1992 -23 35.1992 -36c0 -19.1992 -28.6992 -41.5 -71.5 -44h-0.5c-3.69922 0 -7 2.60059 -7.7998 6.2002c-0.899414 3.7998 1.10059 7.7002 4.7002 9.2002l17 7.2002
+c12.9004 5.5 20.7002 13.5 20.7002 21.5s-7.7998 16 -20.7998 21.5l-16.9004 7.2002c-6 2.59961 -5.7002 12.3994 0 14.7998l17 7.2002c12.9004 5.5 20.7002 13.5 20.7002 21.5s-7.7998 16 -20.7998 21.5l-16.9004 7.19922c-3.59961 1.5 -5.59961 5.40039 -4.7002 9.2002
+c0.799805 3.7998 4.40039 6.60059 8.2002 6.2002c42.7002 -2.5 71.5 -24.7998 71.5 -44zM374.5 223c-14.7998 13.2002 -46.2002 13.2002 -61 0l-9.5 -8.5c-2.5 -2.2998 -7.90039 -4.7002 -13.7002 -1.59961c-4.39941 2.39941 -6.89941 7.39941 -6.09961 12.3994
+c3.89941 25.2002 34.2002 42.1006 59.7998 42.1006s55.7998 -16.9004 59.7998 -42.1006c0.799805 -5 -1.7002 -10 -6.09961 -12.3994c-4.40039 -2.40039 -9.90039 -1.7002 -13.7002 1.59961zM136 239.5c0 17.7002 14.2998 32 32 32s32 -14.2998 32 -32s-14.2998 -32 -32 -32
+s-32 14.2998 -32 32zM501.1 45.5c9.2002 -23.9004 -4.39941 -49.4004 -28.5 -55.7002l-83 -21.5c-5.39941 -1.39941 -10.8994 1.7998 -12.3994 7.10059l-22.9004 82.5996c-6.59961 24 8.7998 48.5996 34 52.5996c22 3.5 43.1006 -11.5996 49 -33l2.2998 -8.39941
+l8.40039 2.2002c21.5996 5.59961 45.0996 -5.10059 53.0996 -25.9004zM334 11.7002c17.7002 -64 10.9004 -39.5 13.4004 -46.7998c-30.5 -13.4004 -64 -20.9004 -99.4004 -20.9004c-137 0 -248 111 -248 248s111 248 248 248s248 -111 247.9 -248
+c0 -31.7998 -6.2002 -62.0996 -17.1006 -90c-6 1.5 -12.2002 2.7998 -18.5996 2.90039c-5.60059 9.69922 -13.6006 17.5 -22.6006 23.8994c6.7002 19.9004 10.4004 41.1006 10.4004 63.2002c0 110.3 -89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200
+c30.7998 0 59.9004 7.2002 86 19.7002z" />
+    <glyph glyph-name="laugh" unicode="&#xf599;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM389.4 50.5996c37.7998 37.8008 58.5996 88 58.5996 141.4s-20.7998 103.6 -58.5996 141.4c-37.8008 37.7998 -88 58.5996 -141.4 58.5996s-103.6 -20.7998 -141.4 -58.5996
+c-37.7998 -37.8008 -58.5996 -88 -58.5996 -141.4s20.7998 -103.6 58.5996 -141.4c37.8008 -37.7998 88 -58.5996 141.4 -58.5996s103.6 20.7998 141.4 58.5996zM328 224c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32s32 -14.2998 32 -32s-14.2998 -32 -32 -32zM168 224
+c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32s32 -14.2998 32 -32s-14.2998 -32 -32 -32zM362.4 160c8.19922 0 14.5 -7 13.5 -15c-7.5 -59.2002 -58.9004 -105 -121.101 -105h-13.5996c-62.2002 0 -113.601 45.7998 -121.101 105c-1 8 5.30078 15 13.5 15h228.801z" />
+    <glyph glyph-name="laugh-beam" unicode="&#xf59a;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM389.4 50.5996c37.7998 37.8008 58.5996 88 58.5996 141.4s-20.7998 103.6 -58.5996 141.4c-37.8008 37.7998 -88 58.5996 -141.4 58.5996s-103.6 -20.7998 -141.4 -58.5996
+c-37.7998 -37.8008 -58.5996 -88 -58.5996 -141.4s20.7998 -103.6 58.5996 -141.4c37.8008 -37.7998 88 -58.5996 141.4 -58.5996s103.6 20.7998 141.4 58.5996zM328 296c23.7998 0 52.7002 -29.2998 55.7998 -71.4004c0.700195 -8.5 -10.7998 -11.8994 -14.8994 -4.5
+l-9.5 17c-7.7002 13.7002 -19.2002 21.6006 -31.5 21.6006c-12.3008 0 -23.8008 -7.90039 -31.5 -21.6006l-9.5 -17c-4.10059 -7.39941 -15.6006 -4.09961 -14.9004 4.5c3.2998 42.1006 32.2002 71.4004 56 71.4004zM127 220.1c-4.2002 -7.39941 -15.7002 -4 -15.0996 4.5
+c3.2998 42.1006 32.1992 71.4004 56 71.4004c23.7998 0 52.6992 -29.2998 56 -71.4004c0.699219 -8.5 -10.8008 -11.8994 -14.9004 -4.5l-9.5 17c-7.7002 13.7002 -19.2002 21.6006 -31.5 21.6006s-23.7998 -7.90039 -31.5 -21.6006zM362.4 160c8.19922 0 14.5 -7 13.5 -15
+c-7.5 -59.2002 -58.9004 -105 -121.101 -105h-13.5996c-62.2002 0 -113.601 45.7998 -121.101 105c-1 8 5.30078 15 13.5 15h228.801z" />
+    <glyph glyph-name="laugh-squint" unicode="&#xf59b;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM389.4 50.5996c37.7998 37.8008 58.5996 88 58.5996 141.4s-20.7998 103.6 -58.5996 141.4c-37.8008 37.7998 -88 58.5996 -141.4 58.5996s-103.6 -20.7998 -141.4 -58.5996
+c-37.7998 -37.8008 -58.5996 -88 -58.5996 -141.4s20.7998 -103.6 58.5996 -141.4c37.8008 -37.7998 88 -58.5996 141.4 -58.5996s103.6 20.7998 141.4 58.5996zM343.6 252l33.6006 -40.2998c8.59961 -10.4004 -3.90039 -24.7998 -15.4004 -18l-80 48
+c-7.7998 4.7002 -7.7998 15.8994 0 20.5996l80 48c11.6006 6.7998 24 -7.7002 15.4004 -18zM134.2 193.7c-11.6006 -6.7998 -24.1006 7.59961 -15.4004 18l33.6006 40.2998l-33.6006 40.2998c-8.59961 10.2998 3.7998 24.9004 15.4004 18l80 -48
+c7.7998 -4.7002 7.7998 -15.8994 0 -20.5996zM362.4 160c8.19922 0 14.5 -7 13.5 -15c-7.5 -59.2002 -58.9004 -105 -121.101 -105h-13.5996c-62.2002 0 -113.601 45.7998 -121.101 105c-1 8 5.30078 15 13.5 15h228.801z" />
+    <glyph glyph-name="laugh-wink" unicode="&#xf59c;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM389.4 50.5996c37.7998 37.8008 58.5996 88 58.5996 141.4s-20.7998 103.6 -58.5996 141.4c-37.8008 37.7998 -88 58.5996 -141.4 58.5996s-103.6 -20.7998 -141.4 -58.5996
+c-37.7998 -37.8008 -58.5996 -88 -58.5996 -141.4s20.7998 -103.6 58.5996 -141.4c37.8008 -37.7998 88 -58.5996 141.4 -58.5996s103.6 20.7998 141.4 58.5996zM328 284c25.7002 0 55.9004 -16.9004 59.7002 -42.0996c1.7998 -11.1006 -11.2998 -18.2002 -19.7998 -10.8008
+l-9.5 8.5c-14.8008 13.2002 -46.2002 13.2002 -61 0l-9.5 -8.5c-8.30078 -7.39941 -21.5 -0.399414 -19.8008 10.8008c4 25.1992 34.2002 42.0996 59.9004 42.0996zM168 224c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32s32 -14.2998 32 -32s-14.2998 -32 -32 -32z
+M362.4 160c8.19922 0 14.5 -7 13.5 -15c-7.5 -59.2002 -58.9004 -105 -121.101 -105h-13.5996c-62.2002 0 -113.601 45.7998 -121.101 105c-1 8 5.30078 15 13.5 15h228.801z" />
+    <glyph glyph-name="meh-blank" unicode="&#xf5a4;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM168 272c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32
+s-32 14.2998 -32 32s14.2998 32 32 32zM328 272c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32z" />
+    <glyph glyph-name="meh-rolling-eyes" unicode="&#xf5a5;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM336 296c39.7998 0 72 -32.2002 72 -72s-32.2002 -72 -72 -72
+s-72 32.2002 -72 72s32.2002 72 72 72zM336 184c22.0996 0 40 17.9004 40 40c0 13.5996 -7.2998 25.0996 -17.7002 32.2998c1 -2.59961 1.7002 -5.39941 1.7002 -8.2998c0 -13.2998 -10.7002 -24 -24 -24s-24 10.7002 -24 24c0 3 0.700195 5.7002 1.7002 8.2998
+c-10.4004 -7.2002 -17.7002 -18.7002 -17.7002 -32.2998c0 -22.0996 17.9004 -40 40 -40zM232 224c0 -39.7998 -32.2002 -72 -72 -72s-72 32.2002 -72 72s32.2002 72 72 72s72 -32.2002 72 -72zM120 224c0 -22.0996 17.9004 -40 40 -40s40 17.9004 40 40
+c0 13.5996 -7.2998 25.0996 -17.7002 32.2998c1 -2.59961 1.7002 -5.39941 1.7002 -8.2998c0 -13.2998 -10.7002 -24 -24 -24s-24 10.7002 -24 24c0 3 0.700195 5.7002 1.7002 8.2998c-10.4004 -7.2002 -17.7002 -18.7002 -17.7002 -32.2998zM312 96
+c13.2002 0 24 -10.7998 24 -24s-10.7998 -24 -24 -24h-128c-13.2002 0 -24 10.7998 -24 24s10.7998 24 24 24h128z" />
+    <glyph glyph-name="sad-cry" unicode="&#xf5b3;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM392 53.5996c34.5996 35.9004 56 84.7002 56 138.4c0 110.3 -89.7002 200 -200 200s-200 -89.7002 -200 -200c0 -53.7002 21.4004 -102.4 56 -138.4v114.4
+c0 13.2002 10.7998 24 24 24s24 -10.7998 24 -24v-151.4c28.5 -15.5996 61.2002 -24.5996 96 -24.5996s67.5 9 96 24.5996v151.4c0 13.2002 10.7998 24 24 24s24 -10.7998 24 -24v-114.4zM205.8 213.5c-5.7998 -3.2002 -11.2002 -0.700195 -13.7002 1.59961l-9.5 8.5
+c-14.7998 13.2002 -46.1992 13.2002 -61 0l-9.5 -8.5c-3.7998 -3.39941 -9.2998 -4 -13.6992 -1.59961c-4.40039 2.40039 -6.90039 7.40039 -6.10059 12.4004c3.90039 25.1992 34.2002 42.0996 59.7998 42.0996c25.6006 0 55.8008 -16.9004 59.8008 -42.0996
+c0.799805 -5 -1.7002 -10 -6.10059 -12.4004zM344 268c25.7002 0 55.9004 -16.9004 59.7998 -42.0996c0.799805 -5 -1.7002 -10 -6.09961 -12.4004c-5.7002 -3.09961 -11.2002 -0.599609 -13.7002 1.59961l-9.5 8.5c-14.7998 13.2002 -46.2002 13.2002 -61 0l-9.5 -8.5
+c-3.7998 -3.39941 -9.2002 -4 -13.7002 -1.59961c-4.39941 2.40039 -6.89941 7.40039 -6.09961 12.4004c3.89941 25.1992 34.0996 42.0996 59.7998 42.0996zM248 176c30.9004 0 56 -28.7002 56 -64s-25.0996 -64 -56 -64s-56 28.7002 -56 64s25.0996 64 56 64z" />
+    <glyph glyph-name="sad-tear" unicode="&#xf5b4;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM256 144c38.0996 0 74 -16.7998 98.5 -46.0996
+c8.5 -10.2002 7.09961 -25.3008 -3.09961 -33.8008c-10.6006 -8.7998 -25.7002 -6.69922 -33.8008 3.10059c-15.2998 18.2998 -37.7998 28.7998 -61.5996 28.7998c-13.2002 0 -24 10.7998 -24 24s10.7998 24 24 24zM168 208c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32
+s32 -14.2998 32 -32s-14.2998 -32 -32 -32zM328 272c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32zM162.4 173.2c2.7998 3.7002 8.39941 3.7002 11.1992 0c11.4004 -15.2998 36.4004 -50.6006 36.4004 -68.1006
+c0 -22.6992 -18.7998 -41.0996 -42 -41.0996s-42 18.4004 -42 41.0996c0 17.5 25 52.8008 36.4004 68.1006z" />
+    <glyph glyph-name="smile-beam" unicode="&#xf5b8;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM332 135.4c8.5 10.1992 23.5996 11.5 33.7998 3.09961
+c10.2002 -8.5 11.6006 -23.5996 3.10059 -33.7998c-30 -36 -74.1006 -56.6006 -120.9 -56.6006s-90.9004 20.6006 -120.9 56.6006c-8.39941 10.2002 -7.09961 25.2998 3.10059 33.7998c10.2002 8.40039 25.2998 7.09961 33.7998 -3.09961
+c20.7998 -25.1006 51.5 -39.4004 84 -39.4004s63.2002 14.4004 84 39.4004zM136.5 237l-9.5 -17c-1.90039 -3.2002 -5.90039 -4.7998 -9.2998 -3.7002c-3.60059 1.10059 -6 4.60059 -5.7002 8.2998c3.2998 42.1006 32.2002 71.4004 56 71.4004s52.7002 -29.2998 56 -71.4004
+c0.299805 -3.7998 -2.09961 -7.19922 -5.7002 -8.2998c-3.09961 -1 -7.2002 0 -9.2998 3.7002l-9.5 17c-7.7002 13.7002 -19.2002 21.5996 -31.5 21.5996s-23.7998 -7.89941 -31.5 -21.5996zM328 296c23.7998 0 52.7002 -29.2998 56 -71.4004
+c0.299805 -3.7998 -2.09961 -7.19922 -5.7002 -8.2998c-3.09961 -1 -7.2002 0 -9.2998 3.7002l-9.5 17c-7.7002 13.7002 -19.2002 21.5996 -31.5 21.5996s-23.7998 -7.89941 -31.5 -21.5996l-9.5 -17c-1.90039 -3.2002 -5.7998 -4.7998 -9.2998 -3.7002
+c-3.60059 1.10059 -6 4.60059 -5.7002 8.2998c3.2998 42.1006 32.2002 71.4004 56 71.4004z" />
+    <glyph glyph-name="surprise" unicode="&#xf5c2;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM248 168c35.2998 0 64 -28.7002 64 -64s-28.7002 -64 -64 -64
+s-64 28.7002 -64 64s28.7002 64 64 64zM200 240c0 -17.7002 -14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32s32 -14.2998 32 -32zM328 272c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32z" />
+    <glyph glyph-name="tired" unicode="&#xf5c8;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 -8c110.3 0 200 89.7002 200 200s-89.7002 200 -200 200s-200 -89.7002 -200 -200s89.7002 -200 200 -200zM377.1 295.8c3.80078 -4.39941 3.90039 -11 0.100586 -15.5
+l-33.6006 -40.2998l33.6006 -40.2998c3.7998 -4.5 3.7002 -11 -0.100586 -15.5c-3.5 -4.10059 -9.89941 -5.7002 -15.2998 -2.5l-80 48c-3.59961 2.2002 -5.7998 6.09961 -5.7998 10.2998s2.2002 8.09961 5.7998 10.2998l80 48c5 2.90039 11.5 1.90039 15.2998 -2.5z
+M220 240c0 -4.2002 -2.2002 -8.09961 -5.7998 -10.2998l-80 -48c-5.40039 -3.2002 -11.7998 -1.60059 -15.2998 2.5c-3.80078 4.5 -3.90039 11 -0.100586 15.5l33.6006 40.2998l-33.6006 40.2998c-3.7998 4.5 -3.7002 11 0.100586 15.5
+c3.7998 4.40039 10.2998 5.5 15.2998 2.5l80 -48c3.59961 -2.2002 5.7998 -6.09961 5.7998 -10.2998zM248 176c45.4004 0 100.9 -38.2998 107.8 -93.2998c1.5 -11.9004 -7 -21.6006 -15.5 -17.9004c-22.7002 9.7002 -56.2998 15.2002 -92.2998 15.2002
+s-69.5996 -5.5 -92.2998 -15.2002c-8.60059 -3.7002 -17 6.10059 -15.5 17.9004c6.89941 55 62.3994 93.2998 107.8 93.2998z" />
+  </font>
+</defs></svg>
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-regular-400.ttf b/scaladoc/resources/dotty_res/webfonts/fa-regular-400.ttf
new file mode 100644
index 000000000000..d1ac9ba1169e
Binary files /dev/null and b/scaladoc/resources/dotty_res/webfonts/fa-regular-400.ttf differ
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-regular-400.woff b/scaladoc/resources/dotty_res/webfonts/fa-regular-400.woff
new file mode 100644
index 000000000000..e9f54b13d5e9
Binary files /dev/null and b/scaladoc/resources/dotty_res/webfonts/fa-regular-400.woff differ
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-regular-400.woff2 b/scaladoc/resources/dotty_res/webfonts/fa-regular-400.woff2
new file mode 100644
index 000000000000..9df490e8cfdd
Binary files /dev/null and b/scaladoc/resources/dotty_res/webfonts/fa-regular-400.woff2 differ
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-solid-900.eot b/scaladoc/resources/dotty_res/webfonts/fa-solid-900.eot
new file mode 100644
index 000000000000..afe315244f6d
Binary files /dev/null and b/scaladoc/resources/dotty_res/webfonts/fa-solid-900.eot differ
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-solid-900.svg b/scaladoc/resources/dotty_res/webfonts/fa-solid-900.svg
new file mode 100644
index 000000000000..dce459d0e5a8
--- /dev/null
+++ b/scaladoc/resources/dotty_res/webfonts/fa-solid-900.svg
@@ -0,0 +1,5034 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+<metadata>
+Created by FontForge 20201107 at Tue Mar 16 10:15:04 2021
+ By Robert Madole
+Copyright (c) Font Awesome
+</metadata>
+<!-- Font Awesome Free 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><defs>
+<font id="FontAwesome5Free-Solid" horiz-adv-x="512" >
+  <font-face 
+    font-family="Font Awesome 5 Free Solid"
+    font-weight="900"
+    font-stretch="normal"
+    units-per-em="512"
+    panose-1="2 0 5 3 0 0 0 0 0 0"
+    ascent="448"
+    descent="-64"
+    bbox="-1.00195 -64.9795 640.104 448.576"
+    underline-thickness="25"
+    underline-position="-50"
+    unicode-range="U+0020-F8FF"
+  />
+    <missing-glyph />
+    <glyph glyph-name="faucet" unicode="&#xe005;" 
+d="M352 192c88.3066 0 160 -71.6934 160 -160c0 -17.6611 -14.3389 -32 -32 -32h-64c-17.6611 0 -32 14.3389 -32 32s-14.3389 32 -32 32h-12.79c-20.5898 -37.7305 -64.21 -64 -115.21 -64s-94.6201 26.2695 -115.21 64h-92.79c-8.83105 0 -16 7.16895 -16 16v96
+c0 8.83105 7.16895 16 16 16h118.61c15.71 13.4004 35.46 23 57.3896 28v47.5596l32 3.38086l32 -3.38086v-47.5596c21.9297 -4.92969 41.6797 -14.5596 57.3896 -28h38.6104zM81.5898 288.09c-9.41992 -1 -17.5898 6.81055 -17.5898 16.7998v30.2207
+c0 9.98926 8.16992 17.7998 17.5898 16.8096l110.41 -11.6602v27.7402c0 8.83105 7.16895 16 16 16h32c8.83105 0 16 -7.16895 16 -16v-27.7402l110.41 11.6602c9.41992 0.990234 17.5898 -6.80957 17.5898 -16.8096v-30.2207
+c0 -9.98926 -8.16992 -17.7998 -17.5898 -16.7998l-142.41 15z" />
+    <glyph glyph-name="trailer" unicode="&#xe041;" horiz-adv-x="640" 
+d="M624 128c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-337.61c-7.83008 54.21 -54 96 -110.39 96s-102.56 -41.79 -110.39 -96h-49.6104c-8.83105 0 -16 7.16895 -16 16v288c0 8.83105 7.16895 16 16 16h512c8.83105 0 16 -7.16895 16 -16v-240
+h80zM96 204.32v107.68c0 4.41504 -3.58496 8 -8 8h-16c-4.41504 0 -8 -3.58496 -8 -8v-128.39c9.85938 8.0166 20.5459 14.9482 32 20.71zM192 222.86v89.1396c0 4.41504 -3.58496 8 -8 8h-16c-4.41504 0 -8 -3.58496 -8 -8v-89.1396
+c5.30957 0.489258 10.5703 1.13965 16 1.13965s10.6904 -0.650391 16 -1.13965zM288 183.61v128.39c0 4.41504 -3.58496 8 -8 8h-16c-4.41504 0 -8 -3.58496 -8 -8v-107.68c11.4541 -5.76172 22.1406 -12.6934 32 -20.71zM384 128v184c0 4.41504 -3.58496 8 -8 8h-16
+c-4.41504 0 -8 -3.58496 -8 -8v-184h32zM480 128v184c0 4.41504 -3.58496 8 -8 8h-16c-4.41504 0 -8 -3.58496 -8 -8v-184h32zM176 128c44.1533 0 80 -35.8467 80 -80s-35.8467 -80 -80 -80s-80 35.8467 -80 80s35.8467 80 80 80zM176 16c17.6611 0 32 14.3389 32 32
+s-14.3389 32 -32 32s-32 -14.3389 -32 -32s14.3389 -32 32 -32z" />
+    <glyph glyph-name="bacteria" unicode="&#xe059;" horiz-adv-x="640" 
+d="M272.35 221.6c-2.19727 -0.946289 -4.63184 -1.47949 -7.17578 -1.47949h-0.0341797c-0.00292969 0 0.00195312 -0.0146484 -0.00195312 -0.0146484c-7.27051 0 -13.5322 4.35449 -16.3174 10.5947l-3.91992 8.84961
+c-1.15039 -0.729492 -2.35059 -1.37988 -3.4707 -2.14941c-3.47168 -2.44629 -6.75293 -5.02832 -9.93945 -7.82031c-4.16406 -3.56152 -8.00098 -7.31543 -11.6504 -11.4004c-2.79688 -3.0166 -5.3916 -6.11719 -7.87012 -9.41016
+c-0.700195 -0.969727 -1.22949 -2.0498 -1.89941 -3.0498l8.7998 -4.10938c6.0166 -2.84082 10.1523 -8.94531 10.1523 -16.0361c0 -9.79199 -7.9502 -17.7432 -17.7432 -17.7432c-2.70312 0 -5.26562 0.606445 -7.55957 1.68848l-9 4.2207
+c-1.61035 -5.00293 -2.92773 -10.2646 -3.87012 -15.5303c-1.9248 -11.2178 -6.14648 -21.8359 -12.0801 -31.0498l9.14062 -9.37012c3.09082 -3.19824 4.99121 -7.55957 4.99121 -12.3545c0 -9.80859 -7.96387 -17.7715 -17.7725 -17.7715
+c-5.01465 0 -9.54688 2.08105 -12.7793 5.42578l-8.58984 8.7998c-13.0752 -8.66602 -28.8223 -13.7949 -45.6494 -13.8799c-1.03027 0 -2.10059 0.259766 -3.10059 0.259766l-2.87012 -11c-2.08008 -7.52637 -8.97949 -13.0732 -17.165 -13.0732
+c-9.8291 0 -17.8096 7.98047 -17.8096 17.8105c0 1.44043 0.171875 2.84082 0.495117 4.18359l2.87988 11.0596c-15.5566 7.7666 -28.2236 20.1123 -36.3896 35.4297l-11.2705 -3.33008c-1.60547 -0.477539 -3.30273 -0.741211 -5.06348 -0.741211
+c-9.79004 0 -17.7383 7.94824 -17.7383 17.7383c0 8.03027 5.34668 14.8213 12.6719 17.0029l11.5801 3.43066c-0.142578 1.98535 -0.214844 3.83594 -0.214844 5.85742c0 4.47168 0.353516 8.86133 1.03516 13.1426c1.72949 10.3799 4.72949 20.2197 7.51953 30.2197
+l-10.3496 3.54004c-6.94824 2.40234 -11.9346 8.99512 -11.9346 16.7549c0 9.78711 7.94629 17.7334 17.7334 17.7334c2.02734 0 3.97559 -0.34082 5.79102 -0.96875l10.4795 -3.58984c6.40332 15.3193 14.1484 30.0723 23 43.9102l-8.87988 6.46973
+c-4.4375 3.20996 -7.30176 8.43652 -7.30176 14.3262c0 3.90625 1.27148 7.51855 3.42188 10.4443c3.24805 4.4248 8.49316 7.27441 14.3975 7.27441c3.9209 0 7.54688 -1.26758 10.4922 -3.41406l8.82031 -6.4209c10.6797 12.8564 22.2119 24.5146 34.9502 35.3301
+l-6.4502 8.61035c-2.22168 2.95703 -3.5625 6.6377 -3.5625 10.6182c0 5.82617 2.82227 10.998 7.17285 14.2217c2.97461 2.20312 6.66211 3.53027 10.6445 3.53027c5.83789 0 11.0273 -2.80078 14.2949 -7.12988l6.32031 -8.43066
+c13.8359 9.05371 28.5869 16.9834 43.9404 23.5703l-3.49023 9.7998c-0.658203 1.8584 -1.02734 3.86816 -1.02734 5.95117c0 9.8252 7.97656 17.8018 17.8018 17.8018c7.74316 0 14.3379 -4.9541 16.7852 -11.8623l3.37988 -9.45996
+c10.9004 3.16992 21.7305 6.38965 33.1104 8.21973c4.51367 0.758789 9.02637 1.15234 13.7539 1.15234c1 0 1.99512 -0.0175781 2.98633 -0.0527344l2.81934 10.7803c1.98633 7.66504 8.95117 13.3457 17.2334 13.3457c9.82617 0 17.8047 -7.97754 17.8047 -17.8037
+c0 -1.54395 -0.197266 -3.04297 -0.567383 -4.47168l-2.83984 -10.8506c15.5527 -7.83105 28.2119 -20.2178 36.3799 -35.5693l11.3398 3.35938c1.6084 0.480469 3.30957 0.745117 5.07324 0.745117c9.79199 0 17.7412 -7.9502 17.7412 -17.7412
+c0 -8.02832 -5.34375 -14.8184 -12.665 -17.0039l-11.8496 -3.50977c0.120117 -1.82227 0.125977 -3.67969 0.125977 -5.53223c0 -15.5859 -4.2998 -30.1758 -11.7764 -42.6475l9.7207 -8.76074c3.56934 -3.25 5.79688 -7.92969 5.79688 -13.1328
+c0 -9.80469 -7.95996 -17.7646 -17.7637 -17.7646c-4.60156 0 -8.79688 1.75391 -11.9531 4.62793l-10 9c-9.85547 -6.88477 -21.4219 -11.7422 -33.75 -13.8398c-4.16895 -0.80957 -8.35547 -1.85547 -12.3604 -3.08008l4 -9.08008
+c0.96875 -2.18848 1.5293 -4.61426 1.5293 -7.16016c0 -7.26172 -4.37988 -13.5078 -10.6396 -16.2402zM128 192c17.6611 0 32 14.3389 32 32s-14.3389 32 -32 32s-32 -14.3389 -32 -32s14.3389 -32 32 -32zM208 288c8.83105 0 16 7.16895 16 16s-7.16895 16 -16 16
+s-16 -7.16895 -16 -16s7.16895 -16 16 -16zM639.26 242.7c0.470703 -1.59277 0.724609 -3.27344 0.724609 -5.01758c0 -8.04492 -5.37891 -14.8438 -12.7344 -16.9922l-11.5801 -3.43066c0.143555 -1.99512 0.216797 -3.85547 0.216797 -5.88672
+c0 -4.47852 -0.354492 -8.875 -1.03711 -13.1631c-1.72949 -10.3701 -4.72949 -20.21 -7.51953 -30.21l10.3398 -3.53027c6.94824 -2.40234 11.9346 -8.99414 11.9346 -16.7549c0 -9.78711 -7.94629 -17.7334 -17.7344 -17.7334
+c-2.02637 0 -3.97559 0.34082 -5.79004 0.96875l-10.4805 3.58984c-6.40527 -15.3213 -14.1494 -30.0781 -23 -43.9199l8.88086 -6.45996c4.6377 -3.20605 7.64746 -8.54297 7.64746 -14.6025c0 -9.80176 -7.95801 -17.7598 -17.7598 -17.7598
+c-4.10156 0 -7.87988 1.39355 -10.8877 3.73242l-8.82031 6.41992c-10.6826 -12.8574 -22.2148 -24.5176 -34.9502 -35.3398l6.4502 -8.61035c2.23926 -2.96094 3.5918 -6.6543 3.5918 -10.6494c0 -5.84082 -2.83984 -11.0225 -7.21191 -14.2402
+c-2.97363 -2.20508 -6.66016 -3.53418 -10.6426 -3.53418c-5.83594 0 -11.0234 2.80273 -14.2871 7.13379l-6.32031 8.42969c-13.8379 -9.05273 -28.5889 -16.9854 -43.9404 -23.5801l3.49023 -9.79004c0.658203 -1.85742 1.02734 -3.86816 1.02734 -5.9502
+c0 -9.8252 -7.97656 -17.8018 -17.8018 -17.8018c-7.74316 0 -14.3379 4.9541 -16.7852 11.8623l-3.37988 9.45996c-10.8604 -3.16992 -21.7305 -6.34961 -33.1006 -8.24023c-4.51465 -0.757812 -9.02832 -1.15234 -13.7568 -1.15234
+c-0.999023 0 -1.99316 0.0175781 -2.9834 0.0527344l-2.81934 -10.7803c-1.98633 -7.66504 -8.95117 -13.3457 -17.2334 -13.3457c-9.82617 0 -17.8037 7.97754 -17.8037 17.8047c0 1.54395 0.196289 3.04199 0.566406 4.47168l2.84082 10.8496
+c-15.5664 7.8291 -28.2363 20.2207 -36.4102 35.5801l-11.3398 -3.36035c-1.61035 -0.480469 -3.31348 -0.746094 -5.0791 -0.746094c-9.79199 0 -17.7422 7.9502 -17.7422 17.7432c0 8.02734 5.3418 14.8164 12.6611 17.0029l11.8594 3.51074
+c-0.119141 1.82227 -0.125 3.67871 -0.125 5.53125c0 15.5869 4.29883 30.1768 11.7754 42.6484l-9.71973 8.75c-3.68848 3.25684 -6.00293 8.0166 -6.00293 13.3193c0 9.80762 7.96289 17.7705 17.7705 17.7705c4.69824 0 8.97363 -1.82812 12.1523 -4.80957l10 -9
+c9.85645 6.9082 21.4297 11.7861 33.7695 13.8994c4.1709 0.804688 8.35742 1.85156 12.3604 3.08008l-4 9.08008c-0.962891 2.18262 -1.51953 4.60156 -1.51953 7.13867c0 7.25391 4.37012 13.4951 10.6191 16.2314c2.19824 0.954102 4.63477 1.49414 7.18066 1.5
+c0.00390625 0 -0.00195312 0.0146484 0.00195312 0.0146484c7.27051 0 13.5322 -4.35449 16.3174 -10.5947l3.91992 -8.84961c1.15039 0.729492 2.35059 1.37988 3.4707 2.14941c3.49023 2.4502 6.79199 5.03613 10 7.83008c4.13867 3.53516 7.94922 7.2666 11.5693 11.3301
+c2.82617 3.03223 5.44336 6.15332 7.94043 9.46973c0.69043 0.970703 1.21973 2.0498 1.88965 3.0498l-8.7998 4.11035c-6.0166 2.84082 -10.1523 8.94531 -10.1523 16.0352c0 9.79297 7.9502 17.7432 17.7432 17.7432c2.70312 0 5.26562 -0.605469 7.55957 -1.68848
+l9 -4.21973c1.60938 4.99902 2.92676 10.2578 3.87012 15.5195c1.91992 11.2236 6.14258 21.8457 12.0801 31.0605l-9.14062 9.37012c-3.09082 3.19824 -4.99121 7.55957 -4.99121 12.3535c0 9.80957 7.96387 17.7725 17.7725 17.7725
+c5.01465 0 9.54688 -2.08105 12.7793 -5.42578l8.58984 -8.81055c13.0723 8.67285 28.8203 13.8066 45.6494 13.8906c1.03027 0 2.10059 -0.260742 3.10059 -0.260742l2.87012 11c2.10059 7.49609 8.98438 13.0137 17.1475 13.0137
+c9.83008 0 17.8105 -7.98047 17.8105 -17.8096c0 -1.41602 -0.166016 -2.79297 -0.478516 -4.11426l-2.87988 -11.0596c15.5527 -7.77246 28.2188 -20.1162 36.3896 -35.4297l11.2705 3.33008c1.59766 0.478516 3.28906 0.739258 5.04199 0.739258h0.0380859
+c0.00585938 0 0.0078125 -0.000976562 0.0136719 -0.000976562c8.0459 0 14.8506 -5.35254 17.0459 -12.6885zM416 32c17.6611 0 32 14.3389 32 32s-14.3389 32 -32 32s-32 -14.3389 -32 -32s14.3389 -32 32 -32z" />
+    <glyph glyph-name="bacterium" unicode="&#xe05a;" 
+d="M511 345.07c0.634766 -2.13379 0.976562 -4.3877 0.976562 -6.72656c0 -10.7275 -7.1709 -19.7949 -16.9766 -22.6641l-15.79 -4.67969c0.15625 -2.4082 0.163086 -4.86133 0.163086 -7.30859c0 -20.8174 -5.75195 -40.3027 -15.7529 -56.9512l12.9395 -11.6699
+c5.1709 -4.34766 8.44043 -10.8584 8.44043 -18.1357c0 -13.0742 -10.6152 -23.6895 -23.6895 -23.6895c-6.47754 0 -12.3525 2.60547 -16.6309 6.8252l-13.3301 12c-13.1318 -9.21387 -28.5537 -15.7207 -45 -18.54c-5.5625 -1.07129 -11.1484 -2.46484 -16.4893 -4.10059
+l5.35938 -12.1094c1.2793 -2.91602 2.0127 -6.17285 2.0127 -9.55859c0 -13.1035 -10.6377 -23.7412 -23.7412 -23.7412c-9.7168 0 -18.0791 5.85156 -21.751 14.2197l-5.23047 11.7998c-1.5293 -0.980469 -3.12988 -1.87012 -4.62988 -2.87012
+c-4.61719 -3.25684 -8.98438 -6.69043 -13.2295 -10.4004c-5.58008 -4.76562 -10.7148 -9.79785 -15.5908 -15.2793c-3.71875 -4.00195 -7.16699 -8.11914 -10.46 -12.4902c-0.929688 -1.29004 -1.62988 -2.74023 -2.51953 -4.05957l11.7197 -5.49023
+c8.20801 -3.71484 13.8818 -11.9531 13.8818 -21.542c0 -13.0576 -10.6016 -23.6592 -23.6602 -23.6592c-3.73535 0 -7.26855 0.867188 -10.4111 2.41113l-12 5.63965c-2.14844 -6.6709 -3.90527 -13.6875 -5.16016 -20.71
+c-2.5625 -14.959 -8.19336 -29.1182 -16.1104 -41.3994l12.1904 -12.5c3.92383 -4.22949 6.32129 -9.90332 6.32129 -16.1221c0 -13.0801 -10.6201 -23.7002 -23.7002 -23.7002c-6.5127 0 -12.416 2.63379 -16.7012 6.8916l-11.4502 11.7402
+c-17.4336 -11.5586 -38.4326 -18.4014 -60.8701 -18.5195c-1.36035 0 -2.75977 0.299805 -4.12988 0.349609l-3.80957 -14.6299c-2.67383 -10.1768 -11.9395 -17.7002 -22.9502 -17.7002h-0.0498047c-2.07324 0.00292969 -4.07715 0.264648 -6 0.75
+c-10.1992 2.62988 -17.751 11.8857 -17.751 22.9014c0 2.04688 0.260742 4.03418 0.750977 5.92871l3.84961 14.75c-20.7412 10.3623 -37.6318 26.8203 -48.5303 47.2402l-15 -4.44043c-2.14062 -0.638672 -4.40527 -0.989258 -6.75293 -0.989258
+c-13.0479 0 -23.6406 10.5928 -23.6406 23.6406c0 10.6992 7.12402 19.749 16.8838 22.6592l15.4404 4.55957c-0.199219 2.7207 -0.300781 5.25781 -0.300781 8.0293c0 5.89355 0.458008 11.6826 1.34082 17.3311c2.37012 13.6738 5.52832 27.3877 9.2998 40.5293
+l-13 4.48047c-9.47656 3.08398 -16.3213 11.9814 -16.3213 22.4805c0 13.0527 10.5967 23.6504 23.6494 23.6504c2.86035 0 5.60254 -0.508789 8.1416 -1.44141l12.9297 -4.42969c8.61523 20.5029 19.0254 40.2393 30.9199 58.75l-11.0898 8.06055
+c-6.20508 4.27051 -10.2344 11.3994 -10.2344 19.4951c0 13.0693 10.6104 23.6797 23.6797 23.6797c5.48535 0 10.5381 -1.86914 14.5547 -5.00488l11 -8c14.2725 17.249 29.6816 32.9014 46.7002 47.4395l-8 10.6299c-2.9541 3.9375 -4.7373 8.83691 -4.7373 14.1338
+c0 7.7666 3.76465 14.6611 9.56738 18.9561c3.96484 2.93848 8.87988 4.70801 14.1885 4.70801c7.78125 0 14.6973 -3.73438 19.0518 -9.50781l8 -10.6299c18.4736 12.2129 38.1689 22.917 58.6895 31.8301l-4.2998 12.0498
+c-0.799805 2.37695 -1.24805 4.93555 -1.24805 7.58105c0 13.1025 10.6377 23.7402 23.7402 23.7402c10.1953 0 18.8975 -6.44043 22.2578 -15.4707l4.2998 -12c14.3408 4.27246 29.3477 7.81055 44.3301 10.4102c6.0459 1.01172 12.0889 1.53711 18.4199 1.53711
+c1.30859 0 2.6123 -0.0224609 3.91016 -0.0673828l3.75977 14.3701c2.64941 10.2295 11.9443 17.8125 22.998 17.8125c13.1123 0 23.7588 -10.6465 23.7588 -23.7588c0 -2.05957 -0.262695 -4.05762 -0.756836 -5.96387l-3.79004 -14.4697
+c20.7402 -10.4336 37.6182 -26.9492 48.5 -47.4209l15.1201 4.48047c2.14844 0.639648 4.41797 0.985352 6.77246 0.985352c10.7344 0 19.8164 -7.13379 22.7578 -16.915zM160 80c26.4922 0 48 21.5078 48 48s-21.5078 48 -48 48s-48 -21.5078 -48 -48s21.5078 -48 48 -48z
+M240 216c13.2461 0 24 10.7539 24 24s-10.7539 24 -24 24s-24 -10.7539 -24 -24s10.7539 -24 24 -24z" />
+    <glyph glyph-name="box-tissue" unicode="&#xe05b;" 
+d="M383.88 160.18h-256l-64 288h141.4c30.9912 -0.00195312 57.3018 -20.1162 66.5996 -48c9.29492 -27.8818 35.6016 -47.9961 66.5898 -48h109.41zM-0.120117 -31.8203v64h512v-64c0 -17.6611 -14.3389 -32 -32 -32h-448c-17.6611 0 -32 14.3389 -32 32zM479.88 224.18
+c17.6562 -0.00488281 31.9902 -14.3418 31.9902 -32v-128h-512v128c0 17.6611 14.3389 32 32 32h49l14.2197 -64h-15.21c-8.83008 0 -16 -7.16895 -16 -16c0 -8.83008 7.16992 -16 16 -16h352c8.83105 0 16 7.16992 16 16c0 8.83105 -7.16895 16 -16 16h-14.2695l21.3301 64
+h40.9395z" />
+    <glyph glyph-name="hand-holding-medical" unicode="&#xe05c;" horiz-adv-x="576" 
+d="M159.88 272.18c-8.83008 0 -16 7.16992 -16 16v64c0 8.83105 7.16992 16 16 16h64v64c0 8.83105 7.16992 16 16 16h64c8.83105 0 16 -7.16895 16 -16v-64h64c8.83105 0 16 -7.16895 16 -16v-64c0 -8.83008 -7.16895 -16 -16 -16h-64v-64c0 -8.83008 -7.16895 -16 -16 -16
+h-64c-8.83008 0 -16 7.16992 -16 16v64h-64zM568.07 111.87c4.87109 -6.62695 7.80469 -14.8232 7.80469 -23.6709c0 -13.1982 -6.40527 -24.9121 -16.2754 -32.1992l-135.029 -99.5703c-17.2783 -12.6621 -38.6699 -20.2148 -61.7002 -20.2695h-347
+c-8.80273 0.0595703 -15.9404 7.19727 -16 16v96c0.0595703 8.80273 7.19727 15.9395 16 16h55.3604l46.5 37.7402c20.2246 16.3867 46.0615 26.25 74.0947 26.25h0.0244141h160c17.6943 0 32.0654 -14.3359 32.0654 -32.0303
+c0 -1.82324 -0.152344 -3.61035 -0.445312 -5.35059c-2.62012 -15.7393 -17.3701 -26.6094 -33.3701 -26.6094h-78.2393c-8.83105 0 -16 -7.16992 -16 -16c0 -8.83105 7.16895 -16 16 -16h120.609l119.67 88.1797c6.63281 4.91016 14.8516 7.87012 23.7295 7.87012
+c13.2129 0 24.9355 -6.43555 32.2012 -16.3398z" />
+    <glyph glyph-name="hand-sparkles" unicode="&#xe05d;" horiz-adv-x="640" 
+d="M106.66 277.36l-20.7402 -49.6201c-1.08691 -2.19531 -3.34277 -3.70703 -5.95605 -3.70703s-4.87695 1.51172 -5.96387 3.70703l-20.6602 49.6602h-0.0703125l-49.5898 20.5996c-2.10938 1.20508 -3.55469 3.42969 -3.67969 6v0
+c0.124023 2.57617 1.5791 4.80371 3.7002 6l49.6299 20.6904h0.0498047l20.7002 49.6299c1.0918 2.18848 3.3457 3.69434 5.95605 3.69434s4.87207 -1.50586 5.96387 -3.69434l20.6602 -49.6406h0.0703125l49.5693 -20.6699c2.11328 -1.2002 3.56055 -3.42676 3.68066 -6v0
+c-0.125977 -2.57031 -1.57129 -4.79492 -3.68066 -6l-49.5498 -20.6494h-0.0898438zM471.38 -19.4102l37.4902 -15.6299l0.0703125 -0.169922c-7.59082 -17.0596 -24 -28.79 -43.2402 -28.79h-197.61c-15.9482 0.0273438 -30.0625 7.79492 -38.79 19.79l-125.6 172.61
+c-4.80469 6.60156 -7.68066 14.7979 -7.68066 23.5801c0 22.085 17.9297 40.0156 40.0146 40.0156c13.3027 0 25.0986 -6.50586 32.376 -16.5059l23.5898 -32.4902v241c0 17.6611 14.3389 32 32 32s32 -14.3389 32 -32v-152c0 -4.41504 3.58496 -8 8 -8h16
+c4.41504 0 8 3.58496 8 8v184c0 17.6611 14.3389 32 32 32s32 -14.3389 32 -32v-184c0 -4.41504 3.58496 -8 8 -8h16c4.41504 0 8 3.58496 8 8v152c0 17.6611 14.3389 32 32 32s32 -14.3389 32 -32v-152c0 -4.41504 3.58496 -8 8 -8h16c4.41504 0 8 3.58496 8 8v72
+c0 17.6611 14.3389 32 32 32s32 -14.3389 32 -32v-176.03c-0.0195312 -1.30957 -0.269531 -2.66992 -0.269531 -4c-7.77051 -3.70996 -14.5 -9.59961 -18.3506 -17.3398l-0.469727 -0.950195l-0.410156 -1l-15.6299 -37.4795l-37.4902 -15.6299l-1 -0.430664l-1 -0.489258
+c-12.6719 -6.35254 -21.3789 -19.4189 -21.3789 -34.5479s8.70703 -28.2402 21.3789 -34.5928l1 -0.5zM349.79 108.48c1.31543 0.655273 2.21973 2.00879 2.21973 3.57715s-0.904297 2.92676 -2.21973 3.58203l-29.79 12.4199l-12.4297 29.7803
+c-0.657227 1.30957 -2.00879 2.20996 -3.57324 2.20996c-1.56348 0 -2.91992 -0.900391 -3.57715 -2.20996l-12.4199 -29.7803l-29.79 -12.4199c-1.31543 -0.655273 -2.21973 -2.00879 -2.21973 -3.57715s0.904297 -2.92676 2.21973 -3.58203l29.79 -12.4102
+l12.4297 -29.7803c0.657227 -1.30957 2.00879 -2.20996 3.57324 -2.20996c1.56348 0 2.91992 0.900391 3.57715 2.20996l12.4199 29.7803zM640 16.0898l-0.0703125 -0.0703125v0c-0.135742 -2.55078 -1.58008 -4.75684 -3.67969 -5.94922l-49.5498 -20.6602h-0.0898438v0
+l-20.6904 -49.6201c-1.08691 -2.19531 -3.34277 -3.70703 -5.95605 -3.70703s-4.87695 1.51172 -5.96387 3.70703l-20.6602 49.5898h-0.0703125l-49.5693 20.6699c-2.10059 1.19238 -3.54395 3.39844 -3.68066 5.9502v0c0.118164 2.57324 1.56641 4.80078 3.68066 6
+l49.6299 20.7402h0.0498047l20.7002 49.6299c1.0918 2.18848 3.3457 3.69434 5.95605 3.69434s4.87207 -1.50586 5.96387 -3.69434l20.6797 -49.6104h0.0703125l49.5703 -20.6699c2.11328 -1.19922 3.5625 -3.42676 3.67969 -6z" />
+    <glyph glyph-name="hands-wash" unicode="&#xe05e;" horiz-adv-x="576" 
+d="M496 224c-26.4922 0 -48 21.5078 -48 48s21.5078 48 48 48s48 -21.5078 48 -48s-21.5078 -48 -48 -48zM311.47 269.55l-16.0801 -4.96973l20.9004 66.1699c3.5 11.0703 14.1797 18.8604 25.71 17.5098c12.0508 -1.27246 21.4727 -11.4824 21.4727 -23.8682
+c0 -2.53418 -0.393555 -4.97754 -1.12305 -7.27148l-15.3496 -48.6104c-5.91699 2.19336 -12.3369 3.43457 -19 3.49023c-0.0107422 0 -0.0185547 -0.0107422 -0.0302734 -0.0107422c-5.7373 0 -11.2773 -0.853516 -16.5 -2.43945zM93.6504 61.6699
+c-36.4326 21.1162 -60.9873 60.2432 -61.6504 105.19v112.729c0.179688 13.3203 11.6699 23.9102 24.9004 23.8604c13.1807 -0.0771484 23.8604 -10.7988 23.8604 -23.9971c0 -0.0507812 0 -0.102539 -0.000976562 -0.15332l2.06055 -50.0498l60 189.85
+c3.5 11.0703 14.1797 18.9004 25.71 17.46c12.0371 -1.28613 21.4443 -11.4883 21.4443 -23.8652c0 -2.52441 -0.390625 -4.95801 -1.11426 -7.24414l-38.5605 -122c-0.240234 -0.760742 -0.373047 -1.57129 -0.373047 -2.41016
+c0 -4.41699 3.58496 -8.00195 8.00195 -8.00195c3.57617 0 6.60742 2.35156 7.63086 5.5918l47.9307 151.71c3.50977 11.0605 14.1797 18.8506 25.71 17.5098c12.0371 -1.28613 21.4443 -11.4883 21.4443 -23.8652c0 -2.52441 -0.390625 -4.95801 -1.11426 -7.24414
+l-43.3701 -137.79c-0.241211 -0.762695 -0.375 -1.57422 -0.375 -2.41602c0 -4.41699 3.58594 -8.00293 8.00293 -8.00293c3.57617 0 6.60645 2.35059 7.63184 5.58887l33.4502 106.42c3.5 11.0703 14.1895 18.8604 25.7197 17.5195
+c12.0371 -1.28613 21.4443 -11.4883 21.4443 -23.8652c0 -2.52441 -0.390625 -4.95801 -1.11426 -7.24414l-34.1602 -108.12l-73.7002 -22.7598c-62.1299 -20.5283 -107.005 -79.04 -107.06 -148v-25.6904c-0.80957 -0.169922 -1.5498 -0.519531 -2.34961 -0.709961z
+M519.1 112c11.6104 0 22.25 -7.83984 24.4404 -19.2402c0.3125 -1.54395 0.477539 -3.12402 0.477539 -4.75977c0 -13.2461 -10.7549 -24 -24 -24h-0.0175781h-160c-4.41504 0 -8 -3.58496 -8 -8s3.58496 -8 8 -8h127.1c11.6104 0 22.25 -7.83984 24.4404 -19.2402
+c0.3125 -1.54395 0.477539 -3.12402 0.477539 -4.75977c0 -13.2461 -10.7549 -24 -24 -24h-0.0175781h-128c-4.41504 0 -8 -3.58496 -8 -8s3.58496 -8 8 -8h95.0996c11.6104 0 22.25 -7.83984 24.4404 -19.2402c0.3125 -1.54395 0.477539 -3.12402 0.477539 -4.75977
+c0 -13.2461 -10.7549 -24 -24 -24h-0.0175781h-208c-22.6738 0.0859375 -43.9951 6.60645 -62 17.7197c3.8623 9.36328 5.9668 19.6699 5.9668 30.4199c0 38.6191 -27.499 70.8652 -63.9668 78.21v25.6504c0 54.8691 35.7324 101.431 85.1904 117.69l107.72 33.25
+c2.24121 0.692383 4.62207 1.0752 7.08984 1.0752c13.252 0 24.0107 -10.7588 24.0107 -24.0107c0 -10.7842 -7.125 -19.917 -16.9209 -22.9453l-47.0898 -17.0596h199.1c11.6104 0 22.25 -7.83984 24.4404 -19.2402c0.3125 -1.54395 0.477539 -3.12402 0.477539 -4.75977
+c0 -13.2461 -10.7549 -24 -24 -24h-0.0175781h-128c-4.41504 0 -8 -3.58496 -8 -8s3.58496 -8 8 -8h159.1zM416 384c-17.6611 0 -32 14.3389 -32 32s14.3389 32 32 32s32 -14.3389 32 -32s-14.3389 -32 -32 -32zM112 32c26.4922 0 48 -21.5078 48 -48s-21.5078 -48 -48 -48
+s-48 21.5078 -48 48s21.5078 48 48 48z" />
+    <glyph glyph-name="handshake-alt-slash" unicode="&#xe05f;" horiz-adv-x="640" 
+d="M358.59 252.4l26.1104 23.8896c3.19727 2.92676 5.19238 7.13086 5.19238 11.8037c0 8.83203 -7.1709 16.0029 -16.0039 16.0029c-4.16016 0 -7.95117 -1.59082 -10.7988 -4.19629l-27 -24.7002l-32.6895 -29.9199l330.43 -255.38
+c3.76562 -2.92871 6.1709 -7.50781 6.1709 -12.6426c0 -3.69434 -1.25488 -7.09863 -3.36133 -9.80762l-19.6396 -25.2705c-2.92871 -3.76855 -7.50879 -6.17578 -12.6465 -6.17578c-3.69727 0 -7.10254 1.25684 -9.81348 3.36621l-588.35 454.72
+c-3.76562 2.92871 -6.17188 7.50781 -6.17188 12.6426c0 3.69434 1.25488 7.09766 3.36133 9.80762l19.6201 25.2695c2.92773 3.77148 7.51074 6.18164 12.6504 6.18164c3.69922 0 7.1084 -1.25879 9.81934 -3.37109l116.891 -90.3301l20.3398 20.2998
+c5.78027 5.7998 13.7764 9.39258 22.5996 9.41016h83.79l-75.5996 -69.2402l25.6895 -19.8496l88.1201 80.6797c5.69238 5.21777 13.2881 8.40723 21.6104 8.41016h85.8896c8.82812 -0.0146484 16.8271 -3.60742 22.6104 -9.41016l54.5898 -54.5898h112
+c8.7998 0 15.9502 -7.12109 16 -15.9102v-191.8c-0.0273438 -8.81836 -7.18164 -15.9727 -16 -16h-97.5898c-2.7002 15.1729 -10.7646 28.5215 -22.21 37.9102zM16 320h7.55957l382.44 -295.59l-8.7998 -10.8203c-6.81543 -8.38672 -17.2246 -13.7119 -28.8633 -13.7119
+c-8.87793 0 -17.0322 3.12012 -23.4268 8.32227l-17.9102 15.5l-0.200195 -0.200195c-11.7383 -14.4346 -29.6592 -23.5977 -49.6963 -23.5977c-15.2695 0 -29.2969 5.35938 -40.3037 14.2979l-90.5 81.8896h-130.3c-8.83105 0 -16 7.16992 -16 16v191.91
+c0.0273438 8.81836 7.18164 15.9727 16 16z" />
+    <glyph glyph-name="handshake-slash" unicode="&#xe060;" horiz-adv-x="640" 
+d="M0 319.79h23.8301l72.1699 -55.79v-168c0 -17.6611 -14.3389 -32 -32 -32h-64v255.79zM48 127.9c-8.83105 0 -16 -7.16992 -16 -16c0 -8.83105 7.16895 -16 16 -16s16 7.16895 16 16c0 8.83008 -7.16895 16 -16 16zM128 96.0898v143.19l278 -214.87l-8.7998 -10.8203
+c-6.81543 -8.38672 -17.2246 -13.7119 -28.8633 -13.7119c-8.87793 0 -17.0322 3.12012 -23.4268 8.32227l-17.9102 15.5l-0.200195 -0.200195c-11.7383 -14.4346 -29.6592 -23.5977 -49.6963 -23.5977c-15.2695 0 -29.2969 5.35938 -40.3037 14.2979l-90.5 81.8896
+h-18.2998zM544 319.79h96v-255.89h-64c-17.6611 0 -32 14.3379 -32 32v223.89zM592 95.9004c8.83105 0 16 7.16895 16 16c0 8.83008 -7.16895 16 -16 16s-16 -7.16992 -16 -16c0 -8.83105 7.16895 -16 16 -16zM303.33 245.33l330.5 -255.43
+c3.76953 -2.92871 6.17676 -7.50977 6.17676 -12.6475c0 -3.69238 -1.25293 -7.09375 -3.35645 -9.80273l-19.6504 -25.2705c-2.92773 -3.77051 -7.51074 -6.18066 -12.6504 -6.18066c-3.69922 0 -7.1084 1.25879 -9.81934 3.37109l-588.34 454.72
+c-3.76562 2.92871 -6.17188 7.50781 -6.17188 12.6426c0 3.69434 1.25488 7.09766 3.36133 9.80762l19.6201 25.2695c2.92773 3.77148 7.51074 6.18164 12.6504 6.18164c3.69922 0 7.1084 -1.25879 9.81934 -3.37109l116.891 -90.3398l20.3398 20.3096
+c5.78027 5.7998 13.7764 9.39258 22.5996 9.41016h83.79l-75.5996 -69.2402l25.6396 -19.8096l88.0703 80.6396c5.68457 5.21973 13.2764 8.41016 21.5947 8.41016h0.00488281h85.9004c0.0117188 0 0.0263672 0.00488281 0.0380859 0.00488281
+c8.82031 0 16.8047 -3.60254 22.5615 -9.41504l54.6104 -54.5898v-193.5c-2.45605 2.78125 -5.0625 5.31934 -7.91016 7.7002l-145.59 118.2l26.0898 23.8896c3.05762 2.91504 4.95215 7.02441 4.95215 11.5781c0 8.83105 -7.16895 16 -16 16
+c-4.03613 0 -7.72559 -1.49805 -10.542 -3.96777z" />
+    <glyph glyph-name="head-side-cough" unicode="&#xe061;" horiz-adv-x="640" 
+d="M616 144c-13.2461 0 -24 10.7539 -24 24s10.7539 24 24 24s24 -10.7539 24 -24s-10.7539 -24 -24 -24zM552 32c13.2461 0 24 -10.7539 24 -24s-10.7539 -24 -24 -24s-24 10.7539 -24 24s10.7539 24 24 24zM488 88c13.2461 0 24 -10.7539 24 -24s-10.7539 -24 -24 -24
+s-24 10.7539 -24 24s10.7539 24 24 24zM616 -16c13.2461 0 24 -10.7539 24 -24s-10.7539 -24 -24 -24s-24 10.7539 -24 24s10.7539 24 24 24zM616 88c13.2461 0 24 -10.7539 24 -24s-10.7539 -24 -24 -24s-24 10.7539 -24 24s10.7539 24 24 24zM552 128
+c13.2461 0 24 -10.7539 24 -24s-10.7539 -24 -24 -24s-24 10.7539 -24 24s10.7539 24 24 24zM477.22 173c1.76367 -3.9668 2.75977 -8.38281 2.75977 -13c0 -17.6543 -14.3281 -31.9883 -31.9795 -32h-32v-32h-96c-17.6611 0 -32 -14.3389 -32 -32s14.3389 -32 32 -32h96
+c0 -35.3223 -28.6777 -64 -64 -64h-64v-32h-224v177.12c-39.25 35.2598 -64 86.1299 -64 142.88c0 106 86 192 192 192h42.0996c70.2783 -0.046875 132.342 -34.8047 170 -88.25c24.6201 -35 52.1201 -139.63 73.1201 -186.75zM288 224
+c17.6436 0.0380859 31.9619 14.3564 32 32c0 17.6611 -14.3389 32 -32 32s-32 -14.3389 -32 -32s14.3389 -32 32 -32z" />
+    <glyph glyph-name="head-side-cough-slash" unicode="&#xe062;" horiz-adv-x="640" 
+d="M454.11 128.79l179.72 -138.89c3.76562 -2.92871 6.1709 -7.50781 6.1709 -12.6426c0 -3.69434 -1.25488 -7.09863 -3.36133 -9.80762l-19.6396 -25.2705c-2.92773 -3.77051 -7.51074 -6.18066 -12.6504 -6.18066c-3.69922 0 -7.1084 1.25879 -9.81934 3.37109
+l-588.351 454.72c-3.76562 2.92871 -6.1709 7.50781 -6.1709 12.6426c0 3.69434 1.25488 7.09766 3.36133 9.80762l19.6299 25.2695c2.92871 3.76855 7.50879 6.17676 12.6465 6.17676c3.69727 0 7.10254 -1.25684 9.81348 -3.36621l38.7197 -29.9199
+c30.6045 20.9385 67.7969 33.2998 107.644 33.2998h0.176758h42.0996c70.2783 -0.046875 132.342 -34.8047 170 -88.25c24.6201 -35 52.1201 -139.63 73.1201 -186.75c8.51074 -19.21 -3.5498 -40.4004 -23.1094 -44.21zM313.39 237.55
+c3.85059 5.28027 6.61035 11.4502 6.58008 18.4502c-0.0332031 17.6455 -14.3535 31.9668 -32 32c-9.92969 0 -18.4795 -4.86035 -24.3594 -12zM616 144c-13.2461 0 -24 10.7539 -24 24s10.7539 24 24 24s24 -10.7539 24 -24s-10.7539 -24 -24 -24zM552 80
+c-13.2461 0 -24 10.7539 -24 24s10.7539 24 24 24s24 -10.7539 24 -24s-10.7539 -24 -24 -24zM288 64c0 -17.6611 14.3389 -32 32 -32h96c0 -35.3223 -28.6777 -64 -64 -64h-64v-32h-224v177.12c-39.25 35.2598 -64 86.1299 -64 142.88
+c0.015625 31.0195 7.56055 60.5098 20.7305 86.4102l318.81 -246.41h-19.54c-17.6611 0 -32 -14.3389 -32 -32zM616 88c13.2461 0 24 -10.7539 24 -24s-10.7539 -24 -24 -24s-24 10.7539 -24 24s10.7539 24 24 24z" />
+    <glyph glyph-name="head-side-mask" unicode="&#xe063;" 
+d="M0.150391 263.58c0.445312 9.60547 1.64062 19.0078 3.51953 28.1699l220.33 -160.26v-195.49h-160v177.12c-41 36.8203 -66.1699 90.6699 -63.8496 150.46zM509.22 173c1.62891 -3.79102 2.54688 -7.97949 2.54688 -12.3652
+c0 -0.211914 -0.00195312 -0.423828 -0.00683594 -0.634766h-272.55l-225.96 164.35c29.2305 73.0801 103.75 123.65 186.75 123.65h66.1104c70.2744 -0.046875 132.336 -34.8047 169.989 -88.25c24.6201 -35 52.1201 -139.63 73.1201 -186.75zM320 224
+c17.6436 0.0380859 31.9619 14.3564 32 32c0 17.6611 -14.3389 32 -32 32s-32 -14.3389 -32 -32s14.3389 -32 32 -32zM336 80c-8.83105 0 -16 -7.16895 -16 -16s7.16895 -16 16 -16h149.34l-10.6699 -32h-138.67c-8.83105 0 -16 -7.16895 -16 -16s7.16895 -16 16 -16h128
+l-1.41016 -4.24023c-8.47363 -25.4199 -32.458 -43.7578 -60.71 -43.7598h-145.88v192h256l-16 -48h-160z" />
+    <glyph glyph-name="head-side-virus" unicode="&#xe064;" 
+d="M272 208c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM208 272c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM509.2 173c1.76367 -3.9668 2.75879 -8.38281 2.75879 -13
+c0 -17.6475 -14.3164 -31.9775 -31.959 -32h-32v-64c0 -35.3223 -28.6777 -64 -64 -64h-64v-64h-256v177.19c-39.3125 35.0342 -64 86.0137 -64 142.763v0.046875c0 106 86 192 192 192h74.0898c70.3008 0 132.405 -34.7725 170.04 -88.25
+c24.6396 -35.0195 52.1396 -139.63 73.0703 -186.75zM368 208c8.83105 0 16 7.16895 16 16s-7.16895 16 -16 16h-12.1201c-28.5098 0 -42.79 34.4697 -22.6299 54.6299l8.58008 8.57031c2.89648 2.89648 4.68457 6.90137 4.68457 11.3174
+c0 8.83105 -7.16992 16.002 -16.002 16.002c-4.41602 0 -8.41602 -1.79297 -11.3125 -4.68945l-8.57031 -8.58008c-20.1602 -20.1602 -54.6299 -5.87988 -54.6299 22.6299v12.1201c0 8.83105 -7.16895 16 -16 16s-16 -7.16895 -16 -16v-12.1201
+c0 -28.5098 -34.4697 -42.79 -54.6299 -22.6299l-8.57031 8.58008c-2.89648 2.89648 -6.90137 4.68457 -11.3174 4.68457c-8.83105 0 -16.002 -7.16992 -16.002 -16.002c0 -4.41602 1.79297 -8.41602 4.68945 -11.3125l8.58008 -8.57031
+c20.1602 -20.1602 5.87988 -54.6299 -22.6299 -54.6299h-12.1201c-8.83105 0 -16 -7.16895 -16 -16s7.16895 -16 16 -16h12.1201c28.5098 0 42.79 -34.4697 22.6299 -54.6299l-8.58008 -8.57031c-2.89648 -2.89648 -4.68457 -6.90137 -4.68457 -11.3174
+c0 -8.83105 7.16992 -16.002 16.002 -16.002c4.41602 0 8.41602 1.79297 11.3125 4.68945l8.57031 8.58008c20.1602 20.1602 54.6299 5.87988 54.6299 -22.6299v-12.1201c0 -8.83105 7.16895 -16 16 -16s16 7.16895 16 16v12.1201c0 28.5098 34.4697 42.79 54.6299 22.6299
+l8.57031 -8.58008c2.89648 -2.89648 6.90137 -4.68457 11.3174 -4.68457c8.83105 0 16.002 7.16992 16.002 16.002c0 4.41602 -1.79297 8.41602 -4.68945 11.3125l-8.58008 8.57031c-20.1602 20.1602 -5.87988 54.6299 22.6299 54.6299h12.1201z" />
+    <glyph glyph-name="house-user" unicode="&#xe065;" horiz-adv-x="576" 
+d="M570.69 211.73c2.9082 -3.21777 4.83887 -7.36914 5.30957 -11.9209c-0.388672 -3.95801 -1.85742 -7.64648 -4.08984 -10.6895l-21.4102 -23.8105c-3.20117 -2.90527 -7.33496 -4.83594 -11.8701 -5.30957c-3.9668 0.40625 -7.66406 1.88379 -10.7197 4.12012
+l-15.9102 14v-210.12c0 -17.6611 -14.3389 -32 -32 -32h-383.91c-17.6611 0 -32 14.3389 -32 32v210.11l-15.8994 -14c-3.04297 -2.23926 -6.73047 -3.71484 -10.6904 -4.11035c-4.57715 0.460938 -8.75586 2.38867 -12 5.2998l-21.4102 23.79
+c-2.37695 2.95605 -3.87891 6.67773 -4.08984 10.71c0.241211 4.62402 2.20312 8.8125 5.25977 11.9004l256 226c6.28027 5.68945 18.21 10.2998 26.7402 10.2998s20.5 -4.61035 26.7803 -10.2998l101.22 -89.3701v51.6699c0 8.83105 7.16895 16 16 16h64
+c8.83105 0 16 -7.16895 16 -16v-136.44zM288 272c-35.3223 0 -64 -28.6777 -64 -64s28.6777 -64 64 -64s64 28.6777 64 64s-28.6777 64 -64 64zM400 0c8.83105 0 16 7.16895 16 16c0 52.9834 -43.0166 96 -96 96h-64c-52.9834 0 -96 -43.0166 -96 -96
+c0 -8.83105 7.16895 -16 16 -16h224z" />
+    <glyph glyph-name="laptop-house" unicode="&#xe066;" horiz-adv-x="640" 
+d="M272 160v-128h-176c-17.6611 0 -32 14.3389 -32 32v164.12l-21.6602 -19.1201c-2.5957 -2.02832 -5.83691 -3.30469 -9.33984 -3.48047c-4.15527 0.22168 -7.91113 2.00684 -10.6602 4.78027l-18.79 21.3105c-2.06836 2.59668 -3.37207 5.8584 -3.5498 9.38965
+c0.234375 4.12598 2.01758 7.85352 4.78027 10.5801l211.8 187.5c5.54004 4.91992 16.0703 8.91992 23.4697 8.91992c7.40039 0 17.9502 -4 23.4502 -8.91992l88.5 -78.3799v39.2998c0 8.83105 7.16895 16 16 16h32c8.83105 0 16 -7.16895 16 -16v-96l59.25 -52.3896
+c2.74609 -2.74707 4.5166 -6.48145 4.75 -10.6104c-0.186523 -3.56445 -1.51172 -6.85449 -3.61035 -9.46973l-6.64941 -7.53027h-136.94c-17.7998 0 -33.6895 -8.24023 -44.7998 -21.1201v37.1201c0 8.83105 -7.16895 16 -16 16h-64c-8.83105 0 -16 -7.16895 -16 -16v-64
+c0 -8.83105 7.16895 -16 16 -16h64zM629.33 0c5.88867 0 10.6699 -4.78125 10.6699 -10.6699v-10.6602c-0.0820312 -23.4883 -19.1201 -42.5498 -42.5996 -42.6699h-298.801c-23.4795 0.120117 -42.5176 19.1816 -42.5996 42.6699v10.6602
+c0 5.88867 4.78125 10.6699 10.6699 10.6699h37.3301v160c0 17.6699 12.8896 32 28.7998 32h230.4c15.9102 0 28.7998 -14.3301 28.7998 -32v-160h37.3301zM544 0v144h-192v-144h192z" />
+    <glyph glyph-name="lungs-virus" unicode="&#xe067;" horiz-adv-x="640" 
+d="M344 297.32c-6.99512 4.2207 -15.291 6.65039 -24.0498 6.65039s-16.9551 -2.42969 -23.9502 -6.65039v134.68c0 8.83105 7.16895 16 16 16h16c8.83105 0 16 -7.16895 16 -16v-134.68zM195.54 3.54004c8.44824 -8.67969 20.2178 -14.0645 33.2754 -14.0645
+c2.87988 0 5.69922 0.261719 8.43457 0.764648c-13.043 -16.7764 -31.3789 -29.1445 -52.5 -34.75l-59.5 -15.8701c-62.75 -16.8799 -125.25 27.3799 -125.25 88.6299c0 0.0820312 0.0126953 0.125 0.0126953 0.207031c0 10.1719 1.3457 20.0322 3.86719 29.4131
+c22.0361 82.46 57.0371 160.927 102 231c22.1201 34.6299 36.1201 63.1299 80.1201 63.1299c38.6201 0 70 -29.3799 70 -65.75v-27.6797c-7.62012 5.0918 -16.832 8.08496 -26.6768 8.08496c-26.4922 0 -48 -21.5088 -48 -48c0 -13.3232 5.43945 -25.3848 14.2168 -34.085
+l8.58008 -8.57031h-12.1201c-26.4922 0 -48 -21.5078 -48 -48s21.5078 -48 48 -48h12.1201l-8.58008 -8.58008c-8.67383 -8.69531 -14.0391 -20.707 -14.0391 -33.9473s5.36523 -25.2363 14.0391 -33.9326zM421.83 26.1699
+c-2.89648 -2.89648 -6.90137 -4.68945 -11.3174 -4.68945s-8.41602 1.79297 -11.3125 4.68945l-8.57031 8.57031c-20.1602 20.1602 -54.6299 5.87988 -54.6299 -22.6201v-12.1201c0 -8.83105 -7.16895 -16 -16 -16s-16 7.16895 -16 16v12.1201
+c0 28.5 -34.4697 42.7803 -54.6299 22.6201l-8.57031 -8.57031c-2.9082 -2.99609 -6.98242 -4.85449 -11.4834 -4.85449c-8.83105 0 -16 7.16992 -16 16c0 4.49902 1.86035 8.56641 4.85352 11.4746l8.58008 8.58008c20.1602 20.1602 5.87988 54.6299 -22.6299 54.6299
+h-12.1201c-8.83105 0 -16 7.16895 -16 16s7.16895 16 16 16h12.1201c28.5098 0 42.79 34.4697 22.6299 54.6201l-8.58008 8.58008c-2.89648 2.89648 -4.68457 6.90137 -4.68457 11.3174c0 8.83105 7.16992 16.002 16.002 16.002
+c4.41602 0 8.41602 -1.79297 11.3125 -4.68945l8.57031 -8.58008c20.1602 -20.1602 54.6299 -5.87988 54.6299 22.6299v12.1201c0 8.83105 7.16895 16 16 16s16 -7.16895 16 -16v-12.1201c0 -28.5098 34.4697 -42.79 54.6299 -22.6299l8.57031 8.58008
+c2.89648 2.89648 6.90137 4.68457 11.3174 4.68457c8.83105 0 16.002 -7.16992 16.002 -16.002c0 -4.41602 -1.79297 -8.41602 -4.68945 -11.3125l-8.58008 -8.58008c-20.1602 -20.1504 -5.87988 -54.6201 22.6299 -54.6201h12.1201c8.83105 0 16 -7.16895 16 -16
+s-7.16895 -16 -16 -16h-12.1201c-28.5098 0 -42.79 -34.4697 -22.6299 -54.6299l8.58008 -8.58008c2.89355 -2.89551 4.68457 -6.89844 4.68457 -11.3125c0 -4.41309 -1.79102 -8.41211 -4.68457 -11.3076zM288 144c8.83105 0 16 7.16895 16 16s-7.16895 16 -16 16
+s-16 -7.16895 -16 -16s7.16895 -16 16 -16zM352 80c8.83105 0 16 7.16895 16 16s-7.16895 16 -16 16s-16 -7.16895 -16 -16s7.16895 -16 16 -16zM636.12 57.8701c2.52148 -9.38086 3.87988 -19.2021 3.87988 -29.374v-0.246094c0 -61.25 -62.5 -105.51 -125.25 -88.6299
+l-59.5 15.8701c-21.1211 5.60547 -39.457 17.9736 -52.5 34.75c2.77246 -0.50293 5.59766 -0.761719 8.51465 -0.761719c26.3262 0 47.7002 21.374 47.7002 47.7002c0 13.4287 -5.56152 25.5693 -14.5049 34.2412l-8.58008 8.58008h12.1201c26.4922 0 48 21.5078 48 48
+s-21.5078 48 -48 48h-12.1201l8.58008 8.53027c8.77734 8.7002 14.1602 20.7393 14.1602 34.0615c0 26.4922 -21.5078 48 -48 48c-9.84375 0 -19 -2.96973 -26.6201 -8.06152v27.7197c0 36.3701 31.3799 65.75 70 65.75c44 0 58 -28.5 80.1201 -63.1299
+c44.9629 -70.0732 79.9639 -148.54 102 -231z" />
+    <glyph glyph-name="people-arrows" unicode="&#xe068;" horiz-adv-x="576" 
+d="M96 320c-35.3223 0 -64 28.6777 -64 64s28.6777 64 64 64s64 -28.6777 64 -64s-28.6777 -64 -64 -64zM96 143.92c0 -0.0400391 -0.0117188 -0.078125 -0.0117188 -0.119141c0 -12.5332 5.24219 -23.8516 13.6514 -31.8809l50.3604 -47.5303v-96.3896
+c0 -17.6611 -14.3389 -32 -32 -32h-64c-17.6611 0 -32 14.3389 -32 32v128c-17.6611 0 -32 14.3389 -32 32v96c0 35.3223 28.6777 64 64 64h64c26.9717 -0.0253906 50.0303 -16.7598 59.3799 -40.4297c-1.83984 -1.26074 -3.95996 -2.02051 -5.61035 -3.57031
+l-72.1299 -68.0801c-8.40918 -8.03418 -13.6396 -19.3555 -13.6396 -31.8926v-0.107422zM480 320c-35.3223 0 -64 28.6777 -64 64s28.6777 64 64 64s64 -28.6777 64 -64s-28.6777 -64 -64 -64zM512 288c35.3223 0 64 -28.6777 64 -64v-96c0 -17.6611 -14.3389 -32 -32 -32
+v-128c0 -17.6611 -14.3389 -32 -32 -32h-64c-17.6611 0 -32 14.3389 -32 32v96.3799l50.3604 47.5498c8.4082 8.07617 13.6445 19.4336 13.6445 32.002c0 12.5674 -5.23633 23.9219 -13.6445 31.998l-72.1201 68.0605c-1.62012 1.58984 -3.78027 2.31934 -5.62012 3.58984
+c9.35352 23.666 32.4102 40.3965 59.3799 40.4199h64zM444.4 152.66c2.22461 -2.24219 3.59961 -5.33203 3.59961 -8.7373c0 -3.4043 -1.375 -6.49121 -3.59961 -8.73242l-72.1201 -68.0703c-2.1543 -2.05371 -5.07227 -3.31543 -8.28027 -3.31543
+c-6.62305 0 -12 5.37695 -12 12v0.0556641v36.1396h-128v-36.1396c0 -0.0185547 -0.00292969 -0.0361328 -0.00292969 -0.0546875c0 -6.62305 -5.37695 -12 -12 -12c-3.20801 0 -6.12305 1.26074 -8.27734 3.31445l-72.1201 68.0703
+c-2.22461 2.24121 -3.59961 5.33203 -3.59961 8.73633c0 3.40527 1.375 6.49121 3.59961 8.7334l72.1201 68.0703c2.1543 2.05273 5.07227 3.31445 8.28027 3.31445c6.62305 0 12 -5.37695 12 -12v-0.0449219v-36h128v36
+c0 0.0117188 0.00292969 0.0224609 0.00292969 0.0341797c0 6.62305 5.37695 12 12 12c3.20801 0 6.12305 -1.26074 8.27734 -3.31445z" />
+    <glyph glyph-name="plane-slash" unicode="&#xe069;" horiz-adv-x="640" 
+d="M32.4805 300.12c-0.258789 1.12109 -0.386719 2.2959 -0.386719 3.49512c0 2.94531 0.825195 5.7002 2.25586 8.04492l324.841 -251.061l-66.6006 -116.54c-2.75684 -4.82227 -7.94141 -8.05957 -13.8896 -8.05957h-65.5
+c-8.81641 0.0166016 -15.9678 7.17676 -15.9678 15.9971c0 1.53027 0.21582 3.01074 0.617188 4.41309l49 171.59h-102.85l-43.2002 -57.5898c-2.91797 -3.89648 -7.5625 -6.40723 -12.7998 -6.41016h-40c-8.82812 0.00292969 -15.9941 7.16406 -15.9941 15.9932
+c0 1.33691 0.165039 2.63574 0.474609 3.87695l31.5195 108.13zM633.82 -10.0898c3.77148 -2.92871 6.18164 -7.51074 6.18164 -12.6514c0 -3.69531 -1.25488 -7.09863 -3.3623 -9.80859l-19.6396 -25.2598c-2.92773 -3.77246 -7.51074 -6.18262 -12.6514 -6.18262
+c-3.69434 0 -7.09863 1.25488 -9.80859 3.3623l-588.36 454.72c-3.76855 2.92871 -6.17578 7.50879 -6.17578 12.6465c0 3.69727 1.25684 7.10352 3.36621 9.81348l19.6299 25.2598c2.92871 3.76855 7.50879 6.17676 12.6465 6.17676
+c3.69727 0 7.10254 -1.25684 9.81348 -3.36621l189.3 -146.3l-36.9395 129.29c-0.398438 1.39551 -0.614258 2.86621 -0.614258 4.38965c0 8.8291 7.16602 15.9971 15.9941 16h65.5098c5.12988 0 11.3496 -3.61035 13.9004 -8.05957l105.09 -183.94h114.3
+c35.3398 0 96 -28.6602 96 -64s-60.6602 -64 -96 -64h-56.8604z" />
+    <glyph glyph-name="pump-medical" unicode="&#xe06a;" horiz-adv-x="384" 
+d="M235.51 288.18c33.3369 -0.00195312 60.7559 -25.6123 63.7305 -58.1797l20.3701 -224c0.175781 -1.93066 0.262695 -3.82324 0.262695 -5.7998c0 -35.3203 -28.6738 -63.9961 -63.9932 -64h-192c-35.3223 0 -64.0059 28.6143 -64.0059 63.9365
+c0 1.97656 0.0898438 3.93262 0.265625 5.86328l20.3701 224c2.97461 32.5674 30.3936 58.1777 63.7305 58.1797h151.27zM239.88 114.85v26.6602c0 7.3623 -5.97754 13.3398 -13.3398 13.3398h-40v40c0 7.35742 -5.97266 13.3301 -13.3301 13.3301h-26.6699
+c-7.35742 0 -13.3301 -5.97266 -13.3301 -13.3301v-40h-40c-7.35742 0 -13.3301 -5.97266 -13.3301 -13.3291v-0.0107422v-26.6602c0 -7.3584 5.97266 -13.334 13.3301 -13.3398h40v-40c0 -7.35645 5.97266 -13.3301 13.3301 -13.3301h26.6699
+c7.35742 0 13.3301 5.97363 13.3301 13.3301v40h40c7.36035 0.00585938 13.334 5.98047 13.3398 13.3398zM379.19 354.12c2.89648 -2.89648 4.68945 -6.90137 4.68945 -11.3174s-1.79297 -8.41602 -4.68945 -11.3125l-22.6201 -22.6201
+c-2.89648 -2.89746 -6.90137 -4.68945 -11.3174 -4.68945s-8.41699 1.79199 -11.3125 4.68945l-43.3105 43.3096h-66.75v-32h-128v96c0 17.6611 14.3389 32 32 32h64c17.6611 0 32 -14.3389 32 -32h66.75c17.6553 -0.00195312 33.6582 -7.16016 45.2402 -18.7393z" />
+    <glyph glyph-name="pump-soap" unicode="&#xe06b;" horiz-adv-x="384" 
+d="M235.63 288c0.00390625 0 0.0107422 -0.0634766 0.0146484 -0.0634766c33.3496 0 60.7754 -25.5625 63.7354 -58.1465l20.3604 -224c0.174805 -1.92773 0.259766 -3.81738 0.259766 -5.79004c0 -35.3223 -28.6777 -64 -64 -64h-192
+c-35.3193 0.00390625 -63.9941 28.6172 -63.9941 63.9365c0 1.97363 0.0888672 3.92578 0.263672 5.85352l20.3604 224c2.95996 32.584 30.3906 58.21 63.7402 58.21h151.26zM160 32c33.1201 0 60 26.3301 60 58.7305c0 25 -35.6699 75.4697 -52 97.2695
+c-1.82422 2.43848 -4.72559 4.01855 -8.00293 4.01855c-3.26758 0 -6.17188 -1.57129 -7.99707 -3.99902c-16.2998 -21.7998 -52 -72.2695 -52 -97.2695c0 -32.4199 26.8799 -58.75 60 -58.75zM379.31 353.94c2.89746 -2.89648 4.69043 -6.90137 4.69043 -11.3174
+s-1.79297 -8.41699 -4.69043 -11.3135l-22.6191 -22.6191c-2.89648 -2.89746 -6.90137 -4.69043 -11.3174 -4.69043s-8.41699 1.79297 -11.3135 4.69043l-43.3096 43.3096h-66.75v-32h-128v96c0 17.6611 14.3389 32 32 32h64c17.6611 0 32 -14.3389 32 -32h66.75
+c17.6582 0 33.666 -7.1582 45.25 -18.7402z" />
+    <glyph glyph-name="shield-virus" unicode="&#xe06c;" 
+d="M224 256c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM466.5 364.32c17.3359 -7.24121 29.5 -24.3428 29.5 -44.291v-0.0292969c0 -221.3 -135.91 -344.61 -221.59 -380.32
+c-5.67578 -2.3584 -11.9619 -3.66016 -18.4873 -3.66016c-6.52441 0 -12.7471 1.30176 -18.4229 3.66016c-107 44.6006 -221.5 181.82 -221.5 380.32c0 0.0166016 -0.03125 0.0107422 -0.03125 0.0263672c0 19.9707 12.2402 37.1055 29.6211 44.3037l192 80
+c5.75293 2.17188 12 3.46582 18.46 3.66992c6.45605 -0.208008 12.7012 -1.50586 18.4502 -3.67969zM384 192c8.83105 0 16 7.16895 16 16s-7.16895 16 -16 16h-12.1201c-28.5098 0 -42.79 34.4697 -22.6299 54.6299l8.58008 8.57031
+c2.89648 2.89648 4.68457 6.90137 4.68457 11.3174c0 8.83105 -7.16992 16.002 -16.002 16.002c-4.41602 0 -8.41602 -1.79297 -11.3125 -4.68945l-8.57031 -8.58008c-20.1602 -20.1602 -54.6299 -5.87988 -54.6299 22.6299v12.1201c0 8.83105 -7.16895 16 -16 16
+s-16 -7.16895 -16 -16v-12.1201c0 -28.5098 -34.4697 -42.79 -54.6299 -22.6299l-8.57031 8.58008c-2.89648 2.89648 -6.90137 4.68457 -11.3174 4.68457c-8.83105 0 -16.002 -7.16992 -16.002 -16.002c0 -4.41602 1.79297 -8.41602 4.68945 -11.3125l8.58008 -8.57031
+c20.1602 -20.1602 5.87988 -54.6299 -22.6299 -54.6299h-12.1201c-8.83105 0 -16 -7.16895 -16 -16s7.16895 -16 16 -16h12.1201c28.5098 0 42.79 -34.4697 22.6299 -54.6299l-8.58008 -8.57031c-2.89648 -2.89648 -4.68457 -6.90137 -4.68457 -11.3174
+c0 -8.83105 7.16992 -16.002 16.002 -16.002c4.41602 0 8.41602 1.79297 11.3125 4.68945l8.57031 8.58008c20.1602 20.1602 54.6299 5.87988 54.6299 -22.6299v-12.1201c0 -8.83105 7.16895 -16 16 -16s16 7.16895 16 16v12.1201c0 28.5098 34.4697 42.79 54.6299 22.6299
+l8.57031 -8.58008c2.89648 -2.89648 6.90137 -4.68457 11.3174 -4.68457c8.83105 0 16.002 7.16992 16.002 16.002c0 4.41602 -1.79297 8.41602 -4.68945 11.3125l-8.58008 8.57031c-20.1602 20.1602 -5.87988 54.6299 22.6299 54.6299h12.1201zM288 192
+c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16z" />
+    <glyph glyph-name="sink" unicode="&#xe06d;" 
+d="M32 32v32h448v-32c0 -52.9834 -43.0166 -96 -96 -96h-256c-52.9834 0 -96 43.0166 -96 96zM496 160c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-480c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h96v32h-64
+c-8.83105 0 -16 7.16895 -16 16v16c0 8.83105 7.16895 16 16 16h80c17.6611 0 32 -14.3389 32 -32v-48h64v188.21c0 46.4297 31.29 89.0801 76.8701 97.9297c6.15625 1.23926 12.4512 1.8877 18.9697 1.8877c53.0283 0 96.0879 -43.0166 96.1602 -96.0273v-16
+c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v16c0 17.6611 -14.3389 32 -32 32s-32 -14.3389 -32 -32v-192h64v48c0 17.6611 14.3389 32 32 32h80c8.83105 0 16 -7.16895 16 -16v-16c0 -8.83105 -7.16895 -16 -16 -16h-64v-32h96z" />
+    <glyph glyph-name="soap" unicode="&#xe06e;" 
+d="M416 256c52.9834 0 96 -43.0166 96 -96v-128c0 -52.9834 -43.0166 -96 -96 -96h-320c-52.9834 0 -96 43.0166 -96 96v128c0 52.9834 43.0166 96 96 96h128c0.0634766 -24.6279 9.49707 -47.1133 24.9102 -64h-88.9102c-52.9834 0 -96 -43.0166 -96 -96
+s43.0166 -96 96 -96h192c0.0703125 0 0.171875 -0.0322266 0.242188 -0.0322266c52.873 0 95.7998 42.9268 95.7998 95.7998c0 41.3477 -26.251 76.6123 -62.9824 90.0225c19.0049 17.4219 30.9033 42.4307 30.9404 70.21zM320 192c-35.3223 0 -64 28.6777 -64 64
+s28.6777 64 64 64s64 -28.6777 64 -64s-28.6777 -64 -64 -64zM208 352c-26.4922 0 -48 21.5078 -48 48s21.5078 48 48 48s48 -21.5078 48 -48s-21.5078 -48 -48 -48zM384 384c-17.6611 0 -32 14.3389 -32 32s14.3389 32 32 32s32 -14.3389 32 -32s-14.3389 -32 -32 -32z
+M160 160h192c35.3223 0 64 -28.6777 64 -64s-28.6777 -64 -64 -64h-192c-35.3223 0 -64 28.6777 -64 64s28.6777 64 64 64z" />
+    <glyph glyph-name="stopwatch-20" unicode="&#xe06f;" horiz-adv-x="448" 
+d="M398.5 257.09c21.1045 -32.3291 33.501 -71.1426 33.501 -112.596c0 -0.165039 -0.000976562 -0.329102 -0.000976562 -0.494141c0 -116 -94.8701 -209.77 -211.28 -208c-113.96 1.78027 -208.08 100.5 -204.63 214.43c3.10156 100.915 78.4639 183.935 175.91 199.07
+v34.5h-32c-8.81836 0.0273438 -15.9727 7.18164 -16 16v32c0.0273438 8.81836 7.18164 15.9727 16 16h128c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32v-34.5c37.3506 -5.76855 71.749 -21.625 99.6904 -44.5898l24.6797 24.6797
+c2.89648 2.89746 6.90137 4.69043 11.3174 4.69043s8.41602 -1.79297 11.3125 -4.69043l22.6797 -22.6797c2.89746 -2.89648 4.69043 -6.90137 4.69043 -11.3174s-1.79297 -8.41602 -4.69043 -11.3125l-26.5898 -26.5801zM204.37 70.4502l-49.1299 0.0400391
+c1.7998 15.6299 14.8496 36.2002 26.4102 51.2002c21.9092 30.0996 34.3496 45.7295 34.3496 81.3096c0 35.1504 -12.5703 61 -55.5703 61c-47.9492 0 -56.4297 -32.9404 -56.4297 -60.2402v-4.06934c0.0703125 -4.46582 3.71484 -8.07129 8.19629 -8.07129
+c0.0449219 0 0.0888672 0 0.133789 0.000976562h24.9004c0.0439453 -0.000976562 0.0859375 0.000976562 0.130859 0.000976562c4.48145 0 8.12891 3.60352 8.19824 8.06934v5.22949c0 15.2803 3.30078 22.6797 12.6904 22.6797c10.4199 0 12.21 -7.34961 12.21 -24.2695
+c0 -25.0205 -6.67969 -33.1504 -27.0996 -62.3398c-23.7803 -33.96 -35.6699 -56.1504 -38.4502 -91.3701c-0.0273438 -0.388672 -0.0449219 -0.765625 -0.0449219 -1.16113c0 -9.08496 7.37598 -16.46 16.46 -16.46c0.0654297 0 0.129883 0 0.194336 0.000976562h82.8506
+c0.0410156 -0.000976562 0.0800781 0.000976562 0.121094 0.000976562c4.48145 0 8.12891 3.60352 8.19922 8.06934v22.3096c-0.0703125 4.46484 -3.71582 8.07129 -8.19727 8.07129c-0.0410156 0 -0.0820312 -0.000976562 -0.123047 -0.000976562zM344 95.6797v107.021
+c0 38.6602 -19 61.2998 -55.7998 61.2998c-36.6201 0 -56.2002 -22.4902 -56.2002 -63.2197v-105.33c0 -33.9307 11.1904 -63.4502 54.7695 -63.4502c44.9307 0 57.2305 28.5195 57.2305 63.6797zM287.87 226.27c10.0098 0 13.0195 -8.05957 13 -19.3291v-115.94
+c0 -13.2695 -3.36035 -21.2695 -13 -21.2695s-13.2305 7.47949 -13.2305 20.5898v115.949c0 12.5 3.82031 20 13.2305 20z" />
+    <glyph glyph-name="store-alt-slash" unicode="&#xe070;" horiz-adv-x="640" 
+d="M17.8896 324.38l88.4707 -68.3799h-74.2607c-25.5898 0 -40.79 28.5 -26.5898 49.7998zM576 34.5801l57.8301 -44.6797c3.76562 -2.92871 6.1709 -7.50781 6.1709 -12.6426c0 -3.69434 -1.25488 -7.09863 -3.36133 -9.80762l-19.6396 -25.2598
+c-2.92773 -3.77539 -7.5127 -6.1875 -12.6553 -6.1875c-3.69727 0 -7.10352 1.25684 -9.81445 3.36719l-588.351 454.72c-3.76562 2.92871 -6.1709 7.50781 -6.1709 12.6426c0 3.69434 1.25488 7.09766 3.36133 9.80762l19.6299 25.2695
+c2.92871 3.76855 7.50879 6.17676 12.6465 6.17676c3.69727 0 7.10254 -1.25684 9.81348 -3.36621l34.6904 -26.8203l10.6592 16c5.71387 8.57715 15.4521 14.2002 26.5215 14.2002h0.0888672h405.18c0.00390625 0 -0.0107422 0.0322266 -0.00683594 0.0322266
+c11.1172 0 20.9248 -5.64941 26.707 -14.2324l85.29 -128c14.1104 -21.2998 -1.08984 -49.7998 -26.5898 -49.7998h-318.48l41.4004 -32h53.0801v-41l128 -99v140h64v-189.42zM320 64v26.8799l64 -49.4697v-73.4102c0 -17.6611 -14.3389 -32 -32 -32h-256
+c-17.6611 0 -32 14.3389 -32 32v256h64v-160h192z" />
+    <glyph glyph-name="store-slash" unicode="&#xe071;" horiz-adv-x="640" 
+d="M121.51 64h226.91l157.33 -128h-414.52c-16.8105 0 -30.4004 14.2998 -30.4004 32v196.8c5.02051 -1.53516 10.2939 -2.76074 15.5801 -3.59961c5.62891 -0.791016 11.2549 -1.19727 17.0996 -1.2002c9.65723 0.157227 19.0283 1.47559 28 3.7998v-99.7998z
+M93.5098 192.09c-0.0644531 0 -0.0566406 -0.00390625 -0.121094 -0.00390625c-4.37402 0 -8.67969 0.294922 -12.8984 0.864258c-58.9404 8.46973 -87.0098 81.6094 -56.4902 135l133.51 -108.62c-16.71 -16.5205 -38.8994 -27.2402 -64 -27.2402zM602.13 -10.0898
+c3.59863 -3.04297 5.86719 -7.59961 5.86719 -12.6758c0 -3.6582 -1.1875 -7.04102 -3.19727 -9.78418l-18.6602 -25.2598c-2.66211 -3.74902 -7.04102 -6.17871 -11.9854 -6.17871c-3.54785 0 -6.80469 1.26074 -9.34473 3.3584l-558.939 454.72
+c-3.59863 3.04297 -5.86719 7.59961 -5.86719 12.6758c0 3.6582 1.1875 7.04102 3.19727 9.78418l18.6602 25.2598c2.66016 3.74805 7.03711 6.17676 11.9785 6.17676c3.55176 0 6.81055 -1.26367 9.35156 -3.36621l33.6895 -27.4004l9.38965 15.7803
+c5.16309 8.89941 14.7383 14.8848 25.7305 15h383.81c10.998 -0.109375 20.5781 -6.09668 25.7402 -15l61.6602 -103.6c31.9404 -53.6006 3.59961 -127.99 -56.0596 -136.4c-4.28027 -0.598633 -8.55762 -0.90625 -13 -0.910156c-28.0303 0 -52.9199 13 -70.1104 33.1104
+c-17.1104 -20.1104 -42 -33.1104 -70.1104 -33.1104c-8.83496 0.130859 -17.3857 1.58594 -25.4102 4.14062l137.82 -112.11v79.6797c8.95801 -2.36523 18.3291 -3.6875 28 -3.7998c5.9082 0.00683594 11.5957 0.412109 17.29 1.2002
+c5.31152 0.757812 10.584 1.9873 15.5703 3.59961v-130.21z" />
+    <glyph glyph-name="toilet-paper-slash" unicode="&#xe072;" horiz-adv-x="640" 
+d="M64 256c0 10.8096 0.530273 21.3398 1.41992 31.6699l316 -244.25c-4.17969 -32.2002 -12.8701 -57.7197 -22.1797 -85.5498c-4.19727 -12.7002 -16.1592 -21.8701 -30.2588 -21.8701h-0.121094h-280.86c-8.79395 0.0429688 -15.917 7.19824 -15.917 16.002
+c0 1.74512 0.279297 3.4248 0.796875 4.99805c21.3701 64.1201 31.1201 85.75 31.1201 126.87v172.13zM633.82 -10.0898c3.77148 -2.92871 6.18164 -7.51074 6.18164 -12.6514c0 -3.69531 -1.25488 -7.09863 -3.3623 -9.80859l-19.6396 -25.2598
+c-2.92773 -3.77246 -7.51074 -6.18262 -12.6514 -6.18262c-3.69434 0 -7.09863 1.25488 -9.80859 3.3623l-588.36 454.72c-3.76855 2.92871 -6.17578 7.50879 -6.17578 12.6465c0 3.69727 1.25684 7.10352 3.36621 9.81348l19.6299 25.2598
+c2.92871 3.76855 7.50879 6.17676 12.6465 6.17676c3.69727 0 7.10254 -1.25684 9.81348 -3.36621l53.2803 -41.1504c16.6299 27.7002 37.9297 44.5303 61.2598 44.5303h284.5c-36.8701 -38.5 -60.5 -108.38 -60.5 -192v-73l50.4297 -39
+c-11.4297 31.5996 -18.4297 70 -18.4297 112c0 106 43 192 96 192s96 -86 96 -192c0 -92.3203 -32.7197 -168.91 -76.1797 -187.28zM512 192c17.6201 0 32 28.6299 32 64s-14.3701 64 -32 64s-32 -28.6201 -32 -64s14.3701 -64 32 -64z" />
+    <glyph glyph-name="users-slash" unicode="&#xe073;" horiz-adv-x="640" 
+d="M132.65 235.68c-10.3945 -7.33496 -23.1328 -11.6836 -36.8105 -11.6836c-35.2344 0 -63.8398 28.6055 -63.8398 63.8398v0.164062c0.0615234 7.80859 1.5625 15.3242 4.20996 22.2197zM173.09 173.4c-40.2002 -21.9072 -68.8896 -62.1416 -75.1797 -109.4h-65.9102
+c-17.6611 0 -32 14.3389 -32 32v32c0.0332031 35.3076 28.6924 63.9668 64 64h64c0.0224609 0 0.0537109 0.0078125 0.0771484 0.0078125c17.5605 0 33.4727 -7.11035 45.0127 -18.6074zM544 224c-35.3076 0.0332031 -63.9668 28.6924 -64 64c0 35.3223 28.6777 64 64 64
+s64 -28.6777 64 -64s-28.6777 -64 -64 -64zM500.56 92.8896l133.271 -102.989c3.76562 -2.92871 6.1709 -7.50781 6.1709 -12.6426c0 -3.69434 -1.25488 -7.09863 -3.36133 -9.80762l-19.6396 -25.2705c-2.92773 -3.77051 -7.51074 -6.18066 -12.6504 -6.18066
+c-3.69922 0 -7.1084 1.25879 -9.81934 3.37109l-588.351 454.72c-3.76562 2.92871 -6.1709 7.50781 -6.1709 12.6426c0 3.69434 1.25488 7.09766 3.36133 9.80762l19.6299 25.2695c2.92871 3.76855 7.50879 6.17676 12.6465 6.17676
+c3.69727 0 7.10254 -1.25684 9.81348 -3.36621l163.94 -126.7c6.90918 55.25 53.46 98.0801 110.6 98.0801c0.0234375 0 0.0458984 0.000976562 0.0703125 0.000976562c61.7754 0 111.93 -50.1533 111.93 -111.93v-0.0712891c0 -47.3096 -29.54 -86.9297 -71 -103.23
+l55.0898 -42.5996c37.6797 -6.53711 69.0986 -31.4668 84.4697 -65.2803zM128 44.79c0 59.79 45.7402 108.38 104 114.08l244.57 -189c-3.99707 -1.1582 -8.21582 -1.81152 -12.5703 -1.87012h-288c-26.4922 0 -48 21.5078 -48 48v28.79zM576 192
+c35.3076 -0.0332031 63.9668 -28.6924 64 -64v-32c0 -17.6611 -14.3389 -32 -32 -32h-66c-6.21875 47.2666 -34.8916 87.5146 -75.0898 109.4c11.54 11.4971 27.4609 18.5996 45.0215 18.5996h0.0683594h64z" />
+    <glyph glyph-name="virus" unicode="&#xe074;" 
+d="M483.55 220.45c0.180664 0.00292969 0.332031 0.00488281 0.512695 0.00488281c15.7021 0 28.4502 -12.748 28.4502 -28.4502s-12.748 -28.4502 -28.4502 -28.4502c-0.180664 0 -0.362305 0.00195312 -0.542969 0.00488281h-21.5391
+c-50.6807 0 -76.0703 -61.2793 -40.2305 -97.1191l15.25 -15.2402c4.66602 -5.06836 7.50879 -11.8418 7.50879 -19.2666c0 -15.7021 -12.748 -28.4502 -28.4502 -28.4502c-7.42578 0 -14.1904 2.85059 -19.2588 7.5166l-15.2402 15.2305
+c-35.8398 35.8398 -97.1094 10.4492 -97.1094 -40.2305v-21.5195c0 -15.7021 -12.748 -28.4502 -28.4502 -28.4502s-28.4502 12.748 -28.4502 28.4502v21.5391c0 50.6807 -61.2695 76.0703 -97.1094 40.2305l-15.2402 -15.25
+c-5.06836 -4.66602 -11.8418 -7.50879 -19.2666 -7.50879c-15.7021 0 -28.4502 12.748 -28.4502 28.4502c0 7.42578 2.85059 14.1904 7.5166 19.2588l15.2305 15.2402c35.8398 35.8398 10.4492 97.1191 -40.2305 97.1191h-21.5498
+c-0.180664 -0.00292969 -0.361328 -0.00488281 -0.542969 -0.00488281c-15.7021 0 -28.4502 12.748 -28.4502 28.4502s12.748 28.4502 28.4502 28.4502c0.181641 0 0.362305 -0.00195312 0.542969 -0.00488281h21.5693c50.6807 0 76.0703 61.2695 40.2305 97.1094
+l-15.25 15.25c-4.73047 5.08008 -7.61816 11.8994 -7.61816 19.3818c0 15.6963 12.7432 28.4404 28.4395 28.4404c7.48535 0 14.2988 -2.89844 19.3789 -7.63184l15.2402 -15.2305c35.8398 -35.8291 97.1094 -10.4492 97.1094 40.2305v21.5596
+c0 15.7021 12.748 28.4502 28.4502 28.4502s28.4502 -12.748 28.4502 -28.4502v-21.5498c0 -50.6797 61.2695 -76.0596 97.1094 -40.2295l15.2402 15.2197c5.08008 4.7334 11.9023 7.62305 19.3867 7.62305c15.6963 0 28.4404 -12.7432 28.4404 -28.4395
+c0 -7.48242 -2.89648 -14.2939 -7.62695 -19.374l-15.2305 -15.25c-35.8398 -35.8398 -10.4492 -97.1094 40.2305 -97.1094h21.5498zM224 176c26.4922 0 48 21.5078 48 48s-21.5078 48 -48 48s-48 -21.5078 -48 -48s21.5078 -48 48 -48zM304 120c13.2461 0 24 10.7539 24 24
+s-10.7539 24 -24 24s-24 -10.7539 -24 -24s10.7539 -24 24 -24z" />
+    <glyph glyph-name="virus-slash" unicode="&#xe075;" horiz-adv-x="640" 
+d="M114 220.4c9.90039 0.0996094 19.7002 2.89941 28.0996 8l244.5 -189c-21.1992 -7.5 -38.1992 -26.8008 -38.1992 -53.4004v-21.5c0 -15.7002 -12.7002 -28.4004 -28.4004 -28.4004s-28.5 12.7002 -28.5 28.4004v21.5c0 50.7002 -61.2998 76 -97.0996 40.2002
+l-15.2002 -15.2002c-0.5 -0.599609 -1.10059 -1.09961 -1.60059 -1.59961c-11.5 -10.6006 -29.5996 -9.90039 -40.1992 1.59961c-10.6006 11.5 -9.90039 29.5 1.59961 40.2002l15.2002 15.2998c35.8994 35.7998 10.5 97.0996 -40.2002 97.0996h-21.5996
+c-15.7002 0 -28.4004 12.7002 -28.4004 28.4004s12.7002 28.4004 28.4004 28.4004h21.5996zM617 -57.7998c-5.40039 -7 -15.5 -8.2998 -22.4004 -2.90039l-588.399 454.7c-7 5.5 -8.2002 15.5 -2.7998 22.5l19.5996 25.2998c5.5 7 15.5 8.2002 22.5 2.7998l93.2002 -72.0996
+c11.0996 11.0996 29.3994 11.5996 40.5 0.5l15.2998 -15.2002c35.7998 -35.8994 97.0996 -10.5 97.0996 40.2002v21.5996c0 15.7002 12.7002 28.4004 28.4004 28.4004s28.4004 -12.7002 28.5 -28.5v-21.5996c0 -50.7002 61.2998 -76 97.0996 -40.2002l15.2002 15.2002
+c10.9004 10.0996 27.7002 10.0996 38.6006 0c11.5996 -10.7002 12.2998 -28.7002 1.59961 -40.2002l-15.2002 -15.2998c-35.8994 -35.8008 -10.5 -97.1006 40.2002 -97.1006h21.5c15.7002 0 28.4004 -12.7002 28.4004 -28.3994
+c0 -15.7002 -12.7002 -28.4004 -28.4004 -28.4004h-21.5c-30.5 0 -51.2002 -22.0996 -55.4004 -47.5l163.2 -126c7 -5.5 8.2002 -15.5 2.7998 -22.5zM335.4 220.5c0.0996094 1.2002 0.599609 2.2998 0.5 3.5c0 26.5 -21.5 48 -48 48
+c-5.2002 -0.0996094 -10.5 -1.09961 -15.4004 -2.90039z" />
+    <glyph glyph-name="viruses" unicode="&#xe076;" horiz-adv-x="640" 
+d="M624 96c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16h-12.1201c-28.5098 0 -42.79 -34.4697 -22.6299 -54.6299l8.58008 -8.57031c2.89648 -2.89648 4.68457 -6.90137 4.68457 -11.3174c0 -8.83105 -7.16992 -16.002 -16.002 -16.002
+c-4.41602 0 -8.41602 1.79297 -11.3125 4.68945l-8.57031 8.58008c-20.1602 20.1602 -54.6299 5.87988 -54.6299 -22.6299v-12.1201c0 -8.83105 -7.16895 -16 -16 -16s-16 7.16895 -16 16v12.1201c0 28.5098 -34.4697 42.79 -54.6299 22.6299l-8.57031 -8.58008
+c-2.89648 -2.89648 -6.90137 -4.68457 -11.3174 -4.68457c-8.83105 0 -16.002 7.16992 -16.002 16.002c0 4.41602 1.79297 8.41602 4.68945 11.3125l8.58008 8.57031c20.1602 20.1602 5.87988 54.6299 -22.6299 54.6299h-12.1201c-8.83105 0 -16 7.16895 -16 16
+s7.16895 16 16 16h12.1201c28.5098 0 42.79 34.4697 22.6299 54.6299l-8.58008 8.57031c-2.89648 2.89648 -4.68457 6.90137 -4.68457 11.3174c0 8.83105 7.16992 16.002 16.002 16.002c4.41602 0 8.41602 -1.79297 11.3125 -4.68945l8.57031 -8.58008
+c20.1602 -20.1602 54.6299 -5.87988 54.6299 22.6299v12.1201c0 8.83105 7.16895 16 16 16s16 -7.16895 16 -16v-12.1201c0 -28.5098 34.4697 -42.79 54.6299 -22.6299l8.57031 8.58008c2.89648 2.89648 6.90137 4.68457 11.3174 4.68457
+c8.83105 0 16.002 -7.16992 16.002 -16.002c0 -4.41602 -1.79297 -8.41602 -4.68945 -11.3125l-8.58008 -8.57031c-20.1602 -20.1602 -5.87988 -54.6299 22.6299 -54.6299h12.1201zM480 64c17.6611 0 32 14.3389 32 32s-14.3389 32 -32 32s-32 -14.3389 -32 -32
+s14.3389 -32 32 -32zM346.51 234.67c-38.0195 0 -57.0498 -45.96 -30.1699 -72.8398l11.4297 -11.4297c3.8623 -3.8623 6.24609 -9.20117 6.24609 -15.0879c0 -11.7744 -9.55957 -21.334 -21.334 -21.334c-5.88672 0 -11.2197 2.38965 -15.082 6.25195l-11.4297 11.4297
+c-26.8398 26.8799 -72.8398 7.83008 -72.8398 -30.1699v-16.1602c0 -11.7725 -9.55762 -21.3301 -21.3301 -21.3301s-21.3301 9.55762 -21.3301 21.3301v16.1602c0 38.0195 -45.96 57.0498 -72.8398 30.1699l-11.4297 -11.4297
+c-3.8623 -3.8623 -9.20117 -6.24609 -15.0879 -6.24609c-11.7744 0 -21.334 9.55957 -21.334 21.334c0 5.88672 2.38965 11.2197 6.25195 15.082l11.4297 11.4297c26.8799 26.8398 7.83008 72.8398 -30.1699 72.8398h-16.1602c-11.7725 0 -21.3301 9.55762 -21.3301 21.3301
+s9.55762 21.3301 21.3301 21.3301h16.1602c38.0195 0 57.0498 45.96 30.1699 72.8398l-11.4297 11.4404c-3.83008 3.85645 -6.19043 9.17188 -6.19043 15.0312c0 11.7725 9.55762 21.3301 21.3301 21.3301c5.86035 0 11.1729 -2.36914 15.0303 -6.20215l11.4297 -11.4297
+c26.8398 -26.8799 72.8398 -7.83008 72.8398 30.1699v16.1602c0 11.7725 9.55762 21.3301 21.3301 21.3301s21.3301 -9.55762 21.3301 -21.3301v-16.1602c0 -38.0195 45.96 -57.0498 72.8398 -30.1699l11.4297 11.4297c3.85742 3.83301 9.17578 6.19531 15.0361 6.19531
+c11.7725 0 21.3301 -9.55762 21.3301 -21.3291c0 -5.85938 -2.36621 -11.1689 -6.19629 -15.0254l-11.4297 -11.4404c-26.8799 -26.8398 -7.83008 -72.8398 30.1699 -72.8398h16.1602c11.7725 0 21.3301 -9.55762 21.3301 -21.3301s-9.55762 -21.3301 -21.3301 -21.3301
+h-16.1602zM160 256c17.6611 0 32 14.3389 32 32s-14.3389 32 -32 32s-32 -14.3389 -32 -32s14.3389 -32 32 -32zM240 224c8.83105 0 16 7.16895 16 16s-7.16895 16 -16 16s-16 -7.16895 -16 -16s7.16895 -16 16 -16z" />
+    <glyph glyph-name="vest" unicode="&#xe085;" horiz-adv-x="448" 
+d="M437.252 208.123c6.76562 -10.1484 10.748 -22.3994 10.748 -35.5v-204.623c0 -17.6611 -14.3389 -32 -32 -32h-192v224l73.8115 221.438c-21.7695 -12.3281 -47.0635 -19.5205 -73.8115 -19.6729c-26.748 0.150391 -52.042 7.34277 -73.8115 19.6699l56.9463 -170.836
+l-13.4922 -40.4805c-1.05957 -3.17969 -1.64258 -6.58496 -1.64258 -10.1191v-224h-160c-17.6611 0 -32 14.3389 -32 32v204.623c0 13.1006 3.98242 25.3516 10.748 35.5l53.252 79.877v128c0 17.6611 14.3389 32 32 32h32
+c4.91211 -0.00195312 9.50586 -1.49512 13.3115 -4.03125l25 -16.6719c16.4814 -11.0186 36.4971 -17.4463 57.793 -17.4463s41.1025 6.42773 57.584 17.4463l25 16.6719c3.80566 2.53613 8.39941 4.0293 13.3115 4.03125h32c17.6611 0 32 -14.3389 32 -32v-128z
+M131.312 76.6885c2.78125 2.87891 4.48828 6.80078 4.48828 11.1152c0 8.83105 -7.16992 16 -16 16c-4.31445 0 -8.23242 -1.71094 -11.1113 -4.49219l-48 -48c-2.78125 -2.87891 -4.48828 -6.80078 -4.48828 -11.1152c0 -8.83105 7.16992 -16 16 -16
+c4.31445 0 8.23242 1.71094 11.1113 4.49219zM387.312 28.6885c2.89746 2.89453 4.69043 6.89844 4.69043 11.3135s-1.79297 8.41504 -4.69043 11.3096l-48 48c-2.87891 2.78125 -6.80078 4.48828 -11.1152 4.48828c-8.83105 0 -16 -7.16992 -16 -16
+c0 -4.31445 1.71094 -8.23242 4.49219 -11.1113l48 -48c2.89453 -2.89746 6.89844 -4.69043 11.3135 -4.69043s8.41504 1.79297 11.3096 4.69043z" />
+    <glyph glyph-name="vest-patches" unicode="&#xe086;" horiz-adv-x="448" 
+d="M437.252 208.123c6.76562 -10.1484 10.748 -22.3994 10.748 -35.5v-204.623c0 -17.6611 -14.3389 -32 -32 -32h-192v224l73.8105 221.434c-21.7705 -12.3252 -47.0635 -19.5156 -73.8105 -19.668c-26.7471 0.154297 -52.041 7.34668 -73.8115 19.6738l56.9463 -170.84
+l-13.4922 -40.4805c-1.05957 -3.17969 -1.64258 -6.58496 -1.64258 -10.1191v-224h-160c-17.6611 0 -32 14.3389 -32 32v204.623c0 13.1006 3.98242 25.3516 10.748 35.5l53.252 79.877v128c0 17.6611 14.3389 32 32 32h32l0.0283203 -0.0146484
+c4.91113 0 9.47949 -1.47949 13.2832 -4.0166l25 -16.6719c16.4814 -11.0186 36.4971 -17.4463 57.793 -17.4463s41.1025 6.42773 57.584 17.4463l25 16.6719c3.80371 2.53711 8.39551 4.03125 13.3066 4.03125h0.00488281h32c17.6611 0 32 -14.3389 32 -32v-128z
+M63.5 175.516l15.5156 -15.5156l-15.5156 -15.5156c-2.12402 -2.16699 -3.43066 -5.1377 -3.43066 -8.4082c0 -6.62891 5.38086 -12.0107 12.0098 -12.0107c3.2793 0 6.25293 1.31738 8.4209 3.4502l15.5 15.5l15.5 -15.5
+c2.16797 -2.13281 5.14551 -3.44629 8.42383 -3.44629c6.62891 0 12.0107 5.38184 12.0107 12.0098c0 3.27051 -1.31055 6.23828 -3.43457 8.40527l-15.5156 15.5156l15.5156 15.5156c2.12402 2.16699 3.43066 5.1377 3.43066 8.4082
+c0 6.62891 -5.38086 12.0107 -12.0098 12.0107c-3.2793 0 -6.25293 -1.31738 -8.4209 -3.4502l-15.5 -15.5l-15.5 15.5c-2.16797 2.13281 -5.14551 3.44629 -8.42383 3.44629c-6.62891 0 -12.0107 -5.38184 -12.0107 -12.0098c0 -3.27051 1.31055 -6.23828 3.43457 -8.40527
+zM96 -8c22.0762 0 40 17.9238 40 40s-17.9238 40 -40 40s-40 -17.9238 -40 -40s17.9238 -40 40 -40zM359.227 112.215c13.6875 0.0966797 24.7734 11.2139 24.7734 24.9229c0 0.757812 -0.0341797 1.50684 -0.0996094 2.24707
+c-1.16406 12.8008 -12.5742 22.1113 -25.4004 22.0762l-5.05078 -0.0371094l0.0371094 5.05762c0.0722656 12.7998 -9.26758 24.2568 -22.0566 25.4189c-0.742188 0.0664062 -1.46973 0.0947266 -2.22949 0.0947266c-13.7012 0 -24.8418 -11.0527 -24.9854 -24.7207
+l-0.214844 -48.5742c0 -0.00976562 -0.000976562 -0.0195312 -0.000976562 -0.0292969c0 -3.68164 2.98926 -6.6709 6.6709 -6.6709h0.0302734z" />
+    <glyph glyph-name="glass-martini" unicode="&#xf000;" 
+d="M502.05 390.4l-214.05 -214.04v-192.36h56c22.0898 0 40 -17.9102 40 -40c0 -4.41992 -3.58008 -8 -8 -8h-240c-4.41992 0 -8 3.58008 -8 8c0 22.0898 17.9102 40 40 40h56v192.36l-214.05 214.04c-21.25 21.2598 -6.2002 57.5996 23.8496 57.5996h444.4
+c30.0498 0 45.0996 -36.3398 23.8496 -57.5996z" />
+    <glyph glyph-name="music" unicode="&#xf001;" 
+d="M470.38 446.49c3.03613 0.957031 6.26953 1.47949 9.62012 1.47949c17.6514 0 31.9834 -14.3223 32 -31.9697v-352c0 -35.3496 -43 -64 -96 -64s-96 28.6602 -96 64s43 64 96 64c11.0361 -0.0605469 21.7158 -1.4248 32 -3.92969v184.609l-256 -75v-233.68
+c0 -35.3398 -43 -64 -96 -64s-96 28.6602 -96 64s43 64 96 64c11.0352 -0.0625 21.7139 -1.42285 32 -3.91992v261.41c0.00878906 14.3125 9.43359 26.4336 22.4102 30.5098z" />
+    <glyph glyph-name="search" unicode="&#xf002;" 
+d="M505 5.2998c9.2998 -9.39941 9.2998 -24.5996 -0.0996094 -34l-28.3008 -28.2998c-9.2998 -9.40039 -24.5 -9.40039 -33.8994 0l-99.7002 99.7002c-4.5 4.5 -7 10.5996 -7 17v16.2998c-35.2998 -27.5996 -79.7002 -44 -128 -44c-114.9 0 -208 93.0996 -208 208
+s93.0996 208 208 208s208 -93.0996 208 -208c0 -48.2998 -16.4004 -92.7002 -44 -128h16.2998c6.40039 0 12.5 -2.5 17 -7zM208 112c70.7998 0 128 57.2998 128 128c0 70.7998 -57.2998 128 -128 128c-70.7998 0 -128 -57.2998 -128 -128c0 -70.7998 57.2998 -128 128 -128z
+" />
+    <glyph glyph-name="heart" unicode="&#xf004;" 
+d="M462.3 385.4c62.7998 -53.6006 66.1006 -149.801 9.7998 -207.9l-193.5 -199.8c-12.5 -12.9004 -32.7998 -12.9004 -45.2998 0l-193.5 199.8c-56.2002 58.0996 -52.8994 154.3 9.90039 207.9c54.7998 46.6992 136.399 38.2998 186.6 -13.6006l19.7002 -20.2998
+l19.7002 20.2998c50.2998 51.9004 131.8 60.2998 186.6 13.6006z" />
+    <glyph glyph-name="star" unicode="&#xf005;" horiz-adv-x="576" 
+d="M259.3 430.2c11.7998 23.8994 45.7002 23.5996 57.4004 0l65.2998 -132.4l146.1 -21.2998c26.2002 -3.7998 36.7002 -36.0996 17.7002 -54.5996l-105.7 -103l25 -145.5c4.5 -26.3008 -23.1992 -45.9004 -46.3994 -33.7002l-130.7 68.7002l-130.7 -68.7002
+c-23.2002 -12.2998 -50.8994 7.39941 -46.3994 33.7002l25 145.5l-105.7 103c-19 18.5 -8.5 50.7998 17.7002 54.5996l146.1 21.2998z" />
+    <glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="448" 
+d="M224 192c-70.7002 0 -128 57.2998 -128 128s57.2998 128 128 128s128 -57.2998 128 -128s-57.2998 -128 -128 -128zM313.6 160c74.2002 0 134.4 -60.2002 134.4 -134.4v-41.5996c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v41.5996
+c0 74.2002 60.2002 134.4 134.4 134.4h16.6992c22.3008 -10.2002 46.9004 -16 72.9004 -16s50.7002 5.7998 72.9004 16h16.6992z" />
+    <glyph glyph-name="film" unicode="&#xf008;" 
+d="M488 384c13.2998 0 24 -10.7002 24 -24v-336c0 -13.2998 -10.7002 -24 -24 -24h-8v20c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12v-20h-320v20c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12v-20h-8
+c-13.2998 0 -24 10.7002 -24 24v336c0 13.2998 10.7002 24 24 24h8v-20c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12v20h320v-20c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12v20h8zM96 76v40c0 6.59961 -5.40039 12 -12 12h-40
+c-6.59961 0 -12 -5.40039 -12 -12v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12zM96 172v40c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12zM96 268v40
+c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12zM368 60v96c0 6.59961 -5.40039 12 -12 12h-200c-6.59961 0 -12 -5.40039 -12 -12v-96c0 -6.59961 5.40039 -12 12 -12h200
+c6.59961 0 12 5.40039 12 12zM368 228v96c0 6.59961 -5.40039 12 -12 12h-200c-6.59961 0 -12 -5.40039 -12 -12v-96c0 -6.59961 5.40039 -12 12 -12h200c6.59961 0 12 5.40039 12 12zM480 76v40c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12v-40
+c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12zM480 172v40c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12zM480 268v40c0 6.59961 -5.40039 12 -12 12h-40
+c-6.59961 0 -12 -5.40039 -12 -12v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12z" />
+    <glyph glyph-name="th-large" unicode="&#xf009;" 
+d="M296 416h192c13.2549 0 24 -10.7451 24 -24v-160c0 -13.2549 -10.7451 -24 -24 -24h-192c-13.2549 0 -24 10.7451 -24 24v160c0 13.2549 10.7451 24 24 24zM216 416c13.2549 0 24 -10.7451 24 -24v-160c0 -13.2549 -10.7451 -24 -24 -24h-192
+c-13.2549 0 -24 10.7451 -24 24v160c0 13.2549 10.7451 24 24 24h192zM0 152c0 13.2549 10.7451 24 24 24h192c13.2549 0 24 -10.7451 24 -24v-160c0 -13.2549 -10.7451 -24 -24 -24h-192c-13.2549 0 -24 10.7451 -24 24v160zM296 -32c-13.2549 0 -24 10.7451 -24 24v160
+c0 13.2549 10.7451 24 24 24h192c13.2549 0 24 -10.7451 24 -24v-160c0 -13.2549 -10.7451 -24 -24 -24h-192z" />
+    <glyph glyph-name="th" unicode="&#xf00a;" 
+d="M149.333 392v-80c0 -13.2549 -10.7451 -24 -24 -24h-101.333c-13.2549 0 -24 10.7451 -24 24v80c0 13.2549 10.7451 24 24 24h101.333c13.2549 0 24 -10.7451 24 -24zM330.667 152c0 -13.2549 -10.7451 -24 -24.001 -24h-101.333c-13.2549 0 -24 10.7451 -24 24v80
+c0 13.2549 10.7451 24 24 24h101.334c13.2549 0 24 -10.7451 24 -24v-80zM362.667 392c0 13.2549 10.7451 24 24 24h101.333c13.2549 0 24 -10.7451 24 -24v-80c0 -13.2549 -10.7451 -24 -24 -24h-101.333c-13.2549 0 -24 10.7451 -24 24v80zM330.667 312
+c0 -13.2549 -10.7451 -24 -24.001 -24h-101.333c-13.2549 0 -24 10.7451 -24 24v80c0 13.2549 10.7451 24 24 24h101.334c13.2549 0 24 -10.7451 24 -24v-80zM125.333 256c13.2549 0 24 -10.7451 24 -24v-80c0 -13.2549 -10.7451 -24 -24 -24h-101.333
+c-13.2549 0 -24 10.7451 -24 24v80c0 13.2549 10.7451 24 24 24h101.333zM0 72c0 13.2549 10.7451 24 24 24h101.333c13.2549 0 24 -10.7451 24 -24v-80c0 -13.2549 -10.7451 -24 -24 -24h-101.333c-13.2549 0 -24 10.7451 -24 24v80zM386.667 128
+c-13.2549 0 -24 10.7451 -24 24v80c0 13.2549 10.7451 24 24 24h101.333c13.2549 0 24 -10.7451 24 -24v-80c0 -13.2549 -10.7451 -24 -24 -24h-101.333zM386.667 -32c-13.2549 0 -24 10.7451 -24 24v80c0 13.2549 10.7451 24 24 24h101.333c13.2549 0 24 -10.7451 24 -24
+v-80c0 -13.2549 -10.7451 -24 -24 -24h-101.333zM181.333 72c0 13.2549 10.7451 24 24 24h101.333c13.2549 0 24 -10.7451 24 -24v-80c0 -13.2549 -10.7451 -24 -24 -24h-101.333c-13.2549 0 -24 10.7451 -24 24v80z" />
+    <glyph glyph-name="th-list" unicode="&#xf00b;" 
+d="M149.333 232v-80c0 -13.2549 -10.7451 -24 -24 -24h-101.333c-13.2549 0 -24 10.7451 -24 24v80c0 13.2549 10.7451 24 24 24h101.333c13.2549 0 24 -10.7451 24 -24zM0 72c0 13.2549 10.7451 24 24 24h101.333c13.2549 0 24 -10.7451 24 -24v-80
+c0 -13.2549 -10.7451 -24 -24 -24h-101.333c-13.2549 0 -24 10.7451 -24 24v80zM125.333 416c13.2549 0 24 -10.7451 24 -24v-80c0 -13.2549 -10.7451 -24 -24 -24h-101.333c-13.2549 0 -24 10.7451 -24 24v80c0 13.2549 10.7451 24 24 24h101.333zM205.333 -32
+c-13.2549 0 -24 10.7451 -24 24v80c0 13.2549 10.7451 24 24 24h282.667c13.2549 0 24 -10.7451 24 -24v-80c0 -13.2549 -10.7451 -24 -24 -24h-282.667zM181.333 392c0 13.2549 10.7451 24 24 24h282.667c13.2549 0 24 -10.7451 24 -24v-80
+c0 -13.2549 -10.7451 -24 -24 -24h-282.667c-13.2549 0 -24 10.7451 -24 24v80zM205.333 128c-13.2549 0 -24 10.7451 -24 24v80c0 13.2549 10.7451 24 24 24h282.667c13.2549 0 24 -10.7451 24 -24v-80c0 -13.2549 -10.7451 -24 -24 -24h-282.667z" />
+    <glyph glyph-name="check" unicode="&#xf00c;" 
+d="M173.898 8.5957l-166.4 166.4c-9.99707 9.99707 -9.99707 26.2061 0 36.2041l36.2031 36.2041c9.99707 9.99805 26.207 9.99805 36.2041 0l112.095 -112.095l240.095 240.095c9.99707 9.99707 26.207 9.99707 36.2041 0l36.2031 -36.2041
+c9.99707 -9.99707 9.99707 -26.2061 0 -36.2041l-294.4 -294.401c-9.99805 -9.99707 -26.207 -9.99707 -36.2031 0.000976562z" />
+    <glyph glyph-name="times" unicode="&#xf00d;" horiz-adv-x="352" 
+d="M242.72 192l100.07 -100.07c12.2803 -12.29 12.2803 -32.1992 0 -44.4795l-22.2402 -22.2402c-12.2803 -12.2803 -32.2002 -12.2803 -44.4795 0l-100.07 100.07l-100.07 -100.07c-12.2793 -12.2803 -32.1992 -12.2803 -44.4795 0l-22.2402 22.2402
+c-12.2803 12.29 -12.2803 32.2002 0 44.4795l100.07 100.07l-100.07 100.07c-12.2803 12.29 -12.2803 32.1992 0 44.4795l22.2402 22.2402c12.29 12.2803 32.2002 12.2803 44.4795 0l100.07 -100.07l100.07 100.07c12.29 12.2803 32.1992 12.2803 44.4795 0
+l22.2402 -22.2402c12.2803 -12.29 12.2803 -32.2002 0 -44.4795z" />
+    <glyph glyph-name="search-plus" unicode="&#xf00e;" 
+d="M304 256v-32c0 -6.59961 -5.40039 -12 -12 -12h-56v-56c0 -6.59961 -5.40039 -12 -12 -12h-32c-6.59961 0 -12 5.40039 -12 12v56h-56c-6.59961 0 -12 5.40039 -12 12v32c0 6.59961 5.40039 12 12 12h56v56c0 6.59961 5.40039 12 12 12h32c6.59961 0 12 -5.40039 12 -12
+v-56h56c6.59961 0 12 -5.40039 12 -12zM505 -28.7002l-28.2998 -28.2998c-9.40039 -9.40039 -24.6006 -9.40039 -33.9004 0l-99.7998 99.7002c-4.5 4.5 -7 10.5996 -7 17v16.2998c-35.2998 -27.5996 -79.7002 -44 -128 -44c-114.9 0 -208 93.0996 -208 208
+s93.0996 208 208 208s208 -93.0996 208 -208c0 -48.2998 -16.4004 -92.7002 -44 -128h16.2998c6.40039 0 12.5 -2.5 17 -7l99.7002 -99.7002c9.2998 -9.39941 9.2998 -24.5996 0 -34zM344 240c0 75.2002 -60.7998 136 -136 136s-136 -60.7998 -136 -136
+s60.7998 -136 136 -136s136 60.7998 136 136z" />
+    <glyph glyph-name="search-minus" unicode="&#xf010;" 
+d="M304 256v-32c0 -6.59961 -5.40039 -12 -12 -12h-168c-6.59961 0 -12 5.40039 -12 12v32c0 6.59961 5.40039 12 12 12h168c6.59961 0 12 -5.40039 12 -12zM505 -28.7002l-28.2998 -28.2998c-9.40039 -9.40039 -24.6006 -9.40039 -33.9004 0l-99.7998 99.7002
+c-4.5 4.5 -7 10.5996 -7 17v16.2998c-35.2998 -27.5996 -79.7002 -44 -128 -44c-114.9 0 -208 93.0996 -208 208s93.0996 208 208 208s208 -93.0996 208 -208c0 -48.2998 -16.4004 -92.7002 -44 -128h16.2998c6.40039 0 12.5 -2.5 17 -7l99.7002 -99.7002
+c9.2998 -9.39941 9.2998 -24.5996 0 -34zM344 240c0 75.2002 -60.7998 136 -136 136s-136 -60.7998 -136 -136s60.7998 -136 136 -136s136 60.7998 136 136z" />
+    <glyph glyph-name="power-off" unicode="&#xf011;" 
+d="M400 393.9c63 -45 104 -118.601 104 -201.9c0 -136.8 -110.8 -247.7 -247.5 -248c-136.5 -0.299805 -248.3 111 -248.5 247.6c-0.0996094 83.3008 40.9004 157.101 103.8 202.2c11.7002 8.2998 28 4.7998 35 -7.7002l15.7998 -28.0996
+c5.90039 -10.5 3.10059 -23.7998 -6.59961 -31c-41.5 -30.7998 -68 -79.5996 -68 -134.9c-0.0996094 -92.2998 74.5 -168.1 168 -168.1c91.5996 0 168.6 74.2002 168 169.1c-0.299805 51.8008 -24.7002 101.801 -68.0996 134c-9.7002 7.2002 -12.4004 20.5 -6.5 30.9004
+l15.7998 28.0996c7 12.4004 23.2002 16.1006 34.7998 7.80078zM296 184c0 -13.2998 -10.7002 -24 -24 -24h-32c-13.2998 0 -24 10.7002 -24 24v240c0 13.2998 10.7002 24 24 24h32c13.2998 0 24 -10.7002 24 -24v-240z" />
+    <glyph glyph-name="signal" unicode="&#xf012;" horiz-adv-x="640" 
+d="M216 160c8.83984 0 16 -7.16016 16 -16v-192c0 -8.83984 -7.16016 -16 -16 -16h-48c-8.83984 0 -16 7.16016 -16 16v192c0 8.83984 7.16016 16 16 16h48zM88 64c8.83984 0 16 -7.16016 16 -16v-96c0 -8.83984 -7.16016 -16 -16 -16h-48c-8.83984 0 -16 7.16016 -16 16v96
+c0 8.83984 7.16016 16 16 16h48zM344 256c8.83984 0 16 -7.16016 16 -16v-288c0 -8.83984 -7.16016 -16 -16 -16h-48c-8.83984 0 -16 7.16016 -16 16v288c0 8.83984 7.16016 16 16 16h48zM472 352c8.83984 0 16 -7.16016 16 -16v-384c0 -8.83984 -7.16016 -16 -16 -16h-48
+c-8.83984 0 -16 7.16016 -16 16v384c0 8.83984 7.16016 16 16 16h48zM600 448c8.83984 0 16 -7.16016 16 -16v-480c0 -8.83984 -7.16016 -16 -16 -16h-48c-8.83984 0 -16 7.16016 -16 16v480c0 8.83984 7.16016 16 16 16h48z" />
+    <glyph glyph-name="cog" unicode="&#xf013;" 
+d="M487.4 132.3c4.89941 -2.7998 7.09961 -8.59961 5.59961 -14.0996c-11.0996 -35.7002 -30 -67.9004 -54.7002 -94.6006c-3.7998 -4.19922 -9.89941 -5.09961 -14.7998 -2.2998l-42.5996 24.6006c-18 -15.3008 -38.6006 -27.2002 -60.8008 -35.1006v-49.2002
+c0 -5.59961 -3.89941 -10.5 -9.39941 -11.6992c-34.9004 -7.80078 -72.5 -8.2002 -109.2 0c-5.5 1.19922 -9.40039 6.09961 -9.40039 11.6992v49.2002c-22.2998 7.7998 -42.8994 19.7002 -60.7998 35.1006l-42.5996 -24.6006c-4.7998 -2.7998 -11 -1.7998 -14.7998 2.2998
+c-24.7002 26.8008 -43.6006 59 -54.7002 94.6006c-1.60059 5.39941 0.599609 11.2002 5.5 14l42.5996 24.5996c-4.2998 23.2002 -4.2998 47 0 70.2002l-42.5996 24.5996c-4.90039 2.80078 -7.2002 8.60059 -5.5 14c11.0996 35.7002 30 67.9004 54.7002 94.6006
+c3.7998 4.2002 9.89941 5.09961 14.7998 2.2998l42.5 -24.5996c18 15.2998 38.5996 27.1992 60.7998 35.0996v49.2002c0 5.59961 3.90039 10.5 9.40039 11.7002c34.8994 7.7998 72.5 8.19922 109.199 0c5.5 -1.2002 9.40039 -6.10059 9.40039 -11.7002v-49.1006
+c22.2998 -7.7998 42.9004 -19.6992 60.7998 -35.0996l42.6006 24.5996c4.7998 2.80078 11 1.80078 14.7998 -2.2998c24.7002 -26.7998 43.5996 -59 54.7002 -94.5996c1.59961 -5.40039 -0.600586 -11.2002 -5.5 -14l-42.6006 -24.6006
+c4.2998 -23.1992 4.2998 -47 0 -70.1992zM256 112c44.0996 0 80 35.9004 80 80s-35.9004 80 -80 80s-80 -35.9004 -80 -80s35.9004 -80 80 -80z" />
+    <glyph glyph-name="home" unicode="&#xf015;" horiz-adv-x="576" 
+d="M280.37 299.74c2.09082 1.68555 4.76562 2.69434 7.6582 2.69434s5.55078 -1.00879 7.6416 -2.69434l184.33 -151.74v-164c0 -8.83105 -7.16895 -16 -16 -16l-112.02 0.30957c-8.83105 0 -16.001 7.16895 -16.001 15.999c0 0.0175781 0 0.0341797 0.000976562 0.0517578
+v95.6396c0 8.83105 -7.16992 16 -16 16h-64c-8.83105 0 -16 -7.16895 -16 -16v-95.71c0 -8.80371 -7.12695 -15.9561 -15.9209 -16l-112.06 -0.290039c-8.83105 0 -16 7.16895 -16 16v163.89zM571.6 196.53c2.70703 -2.20117 4.42578 -5.56152 4.42578 -9.31836
+c0 -2.88867 -1.02246 -5.54004 -2.72559 -7.6123l-25.5 -31c-2.20117 -2.66309 -5.53418 -4.35059 -9.25684 -4.35059c-2.90332 0 -5.56641 1.0332 -7.64258 2.75098l-235.23 193.74c-2.09082 1.68555 -4.7666 2.69434 -7.6582 2.69434
+c-2.89258 0 -5.55078 -1.00879 -7.6416 -2.69434l-235.22 -193.74c-2.0752 -1.71387 -4.73926 -2.75586 -7.63867 -2.75586c-3.73242 0 -7.07031 1.70898 -9.27148 4.38574l-25.5 31c-1.71875 2.07617 -2.7627 4.74414 -2.7627 7.64648
+c0 3.72266 1.69824 7.05176 4.3623 9.25391l253.13 208.47c8.29102 6.82227 18.9668 10.9209 30.5312 10.9209s22.1787 -4.09863 30.4688 -10.9209l89.5303 -73.6602v72.6104c0 6.62305 5.37695 12 12 12h56c6.62305 0 12 -5.37695 12 -12v-138.51z" />
+    <glyph glyph-name="clock" unicode="&#xf017;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM348.49 127c2.19531 2.73926 3.52637 6.21973 3.52637 10c0 5.05566 -2.35059 9.56738 -6.0166 12.5l-58 42.5v144c0 8.83105 -7.16895 16 -16 16h-32
+c-8.83105 0 -16 -7.16895 -16 -16v-155.55c0 -12.6338 5.8418 -23.8975 15 -31.2305l67 -49.7197v0c2.7373 -2.19043 6.21387 -3.51758 9.98926 -3.51758c5.05566 0 9.56738 2.35059 12.501 6.01758l20 25v0z" />
+    <glyph glyph-name="road" unicode="&#xf018;" horiz-adv-x="576" 
+d="M573.19 45.3301c9.25977 -21.1904 -5.5 -45.3301 -27.7305 -45.3301h-196.84l-10.3105 97.6797c-0.859375 8.14062 -7.71973 14.3203 -15.9092 14.3203h-68.8008c-8.18945 0 -15.0498 -6.17969 -15.9092 -14.3203l-10.3105 -97.6797h-196.84
+c-22.2305 0 -36.9902 24.1396 -27.7402 45.3301l139.79 320c4.96973 11.3799 15.7998 18.6699 27.7305 18.6699h97.5898l-2.4502 -23.1602c-0.5 -4.71973 3.20996 -8.83984 7.95996 -8.83984h29.1602c4.75 0 8.45996 4.12012 7.95996 8.83984l-2.4502 23.1602h97.5898
+c11.9199 0 22.75 -7.29004 27.7207 -18.6699zM260.4 312.84l-4.59082 -43.5801c-0.75 -7.08984 4.80078 -13.2598 11.9307 -13.2598h40.54c7.12012 0 12.6797 6.16992 11.9297 13.2598l-4.59961 43.5801c-0.430664 4.07031 -3.87012 7.16016 -7.95996 7.16016h-39.29
+c-0.00195312 0 -0.00390625 -0.0078125 -0.00488281 -0.0078125c-4.12891 0 -7.53125 -3.13477 -7.95508 -7.15234zM315.64 144c9.5 0 16.9102 8.23047 15.9102 17.6797l-5.06934 48c-0.860352 8.14062 -7.7207 14.3203 -15.9102 14.3203h-45.1504
+c-8.18945 0 -15.0498 -6.17969 -15.9102 -14.3203l-5.06934 -48c-1 -9.44922 6.40918 -17.6797 15.9092 -17.6797h55.29z" />
+    <glyph glyph-name="download" unicode="&#xf019;" 
+d="M216 448h80c13.2998 0 24 -10.7002 24 -24v-168h87.7002c17.7998 0 26.7002 -21.5 14.0996 -34.0996l-152.1 -152.2c-7.5 -7.5 -19.7998 -7.5 -27.2998 0l-152.301 152.2c-12.5996 12.5996 -3.69922 34.0996 14.1006 34.0996h87.7998v168c0 13.2998 10.7002 24 24 24z
+M512 72v-112c0 -13.2998 -10.7002 -24 -24 -24h-464c-13.2998 0 -24 10.7002 -24 24v112c0 13.2998 10.7002 24 24 24h146.7l49 -49c20.0996 -20.0996 52.5 -20.0996 72.5996 0l49 49h146.7c13.2998 0 24 -10.7002 24 -24zM388 -16c0 11 -9 20 -20 20s-20 -9 -20 -20
+s9 -20 20 -20s20 9 20 20zM452 -16c0 11 -9 20 -20 20s-20 -9 -20 -20s9 -20 20 -20s20 9 20 20z" />
+    <glyph glyph-name="inbox" unicode="&#xf01c;" horiz-adv-x="576" 
+d="M567.938 204.092c5.07422 -7.61035 8.06152 -16.7998 8.06152 -26.625v-129.467c0 -26.5098 -21.4902 -48 -48 -48h-480c-26.5098 0 -48 21.4902 -48 48v129.467c0 9.8252 2.9873 19.0146 8.06152 26.625l105.689 158.534c8.60742 12.9102 23.2725 21.374 39.9385 21.374
+h268.621c16.667 0 31.332 -8.46387 39.9395 -21.374zM162.252 320l-85.334 -128h123.082l32 -64h112l32 64h123.082l-85.333 128h-251.497z" />
+    <glyph glyph-name="redo" unicode="&#xf01e;" 
+d="M500.33 448c6.62305 0 12 -5.37695 12 -12v-200.34c0 -6.62305 -5.37695 -12 -12 -12h-200.33c-6.62305 0 -12 5.37695 -12 12v47.4102c0 0.00390625 -0.00878906 0.00878906 -0.00878906 0.0136719c0 6.62305 5.37695 12 12 12
+c0.194336 0 0.386719 -0.00488281 0.579102 -0.0136719l101.529 -4.87012c-31.6084 47.0322 -85.1172 77.8594 -145.992 77.8594c-97.1367 0 -176 -78.8633 -176 -176s78.8633 -176 176 -176c44.502 0 85.168 16.5518 116.173 43.8301
+c2.10938 1.84375 4.87793 2.96582 7.89746 2.96582c3.31055 0 6.31055 -1.34375 8.48242 -3.51562l34 -34c2.17383 -2.17188 3.52246 -5.17285 3.52246 -8.48633c0 -3.55176 -1.54688 -6.74512 -4.00293 -8.94336c-43.8477 -39.6924 -102.079 -63.9102 -165.824 -63.9102
+h-0.355469c-136.9 0 -247.9 110.93 -248 247.81c-0.0996094 136.66 111.34 248.19 248 248.19c0.0927734 0 0.116211 0.140625 0.208984 0.140625c75.5918 0 143.312 -33.9727 188.711 -87.4707l-4 82.7598c-0.00878906 0.192383 -0.0136719 0.375977 -0.0136719 0.570312
+c0 6.62305 5.37695 12 12 12h0.0136719h47.4102z" />
+    <glyph glyph-name="sync" unicode="&#xf021;" 
+d="M440.65 435.43c-0.00976562 0.192383 -0.0136719 0.375977 -0.0136719 0.570312c0 6.62109 5.37305 11.9961 11.9932 12h47.3701c6.62305 0 12 -5.37695 12 -12v-200.35c0 -6.62305 -5.37695 -12 -12 -12h-200.22c-6.62305 0 -12 5.37695 -12 12v47.4092
+c0 0.00488281 -0.00878906 0.00976562 -0.00878906 0.0136719c0 6.62305 5.37695 12 12 12c0.194336 0 0.386719 -0.00390625 0.578125 -0.0136719l101.46 -4.85938c-31.5938 46.9941 -85.1406 77.6738 -145.973 77.6738c-82.8662 0 -152.428 -57.4229 -171.027 -134.614
+c-1.24219 -5.29688 -5.99707 -9.25391 -11.6699 -9.25977h-49.0498c-6.62305 0 -12 5.36719 -12 11.9893c0 0.748047 0.0693359 1.48047 0.200195 2.19043c21.6201 114.9 122.44 201.82 243.54 201.82c0.0966797 0 0.123047 0.141602 0.219727 0.141602
+c75.5615 0 143.248 -33.9814 188.601 -87.4814zM255.83 16c0.015625 0 0.0185547 0.0898438 0.0332031 0.0898438c82.8701 0 152.43 57.4434 170.997 134.65c1.24219 5.29688 5.99707 9.25391 11.6699 9.25977h49.0498c6.62305 0 12 -5.36719 12 -11.9893
+c0 -0.748047 -0.0693359 -1.48047 -0.200195 -2.19043c-21.6201 -114.9 -122.439 -201.82 -243.55 -201.82c-0.0800781 0 -0.0908203 -0.140625 -0.170898 -0.140625c-75.4814 0 -143.106 33.9082 -188.459 87.3105l4.14941 -82.5703
+c0.0107422 -0.201172 0.015625 -0.395508 0.015625 -0.599609c0 -6.62305 -5.37695 -12 -12 -12h-0.015625h-47.3496c-6.62305 0 -12 5.37695 -12 12v200.33c0 6.62305 5.37695 12 12 12h200.2c6.62305 0 12 -5.37695 12 -12v-47.4004
+c0 -0.00390625 0.0078125 -0.00878906 0.0078125 -0.0136719c0 -6.62305 -5.37695 -12 -12 -12c-0.193359 0 -0.386719 0.00488281 -0.578125 0.0136719l-101.8 4.87012c31.5254 -47.0088 85.0449 -77.7998 145.847 -77.7998h0.15332z" />
+    <glyph glyph-name="list-alt" unicode="&#xf022;" 
+d="M464 -32h-416c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h416c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48zM128 328c-22.0908 0 -40 -17.9092 -40 -40s17.9092 -40 40 -40s40 17.9092 40 40s-17.9092 40 -40 40zM128 232
+c-22.0908 0 -40 -17.9092 -40 -40s17.9092 -40 40 -40s40 17.9092 40 40s-17.9092 40 -40 40zM128 136c-22.0908 0 -40 -17.9092 -40 -40s17.9092 -40 40 -40s40 17.9092 40 40s-17.9092 40 -40 40zM416 272v32c0 6.62695 -5.37305 12 -12 12h-200
+c-6.62695 0 -12 -5.37305 -12 -12v-32c0 -6.62695 5.37305 -12 12 -12h200c6.62695 0 12 5.37305 12 12zM416 176v32c0 6.62695 -5.37305 12 -12 12h-200c-6.62695 0 -12 -5.37305 -12 -12v-32c0 -6.62695 5.37305 -12 12 -12h200c6.62695 0 12 5.37305 12 12zM416 80v32
+c0 6.62695 -5.37305 12 -12 12h-200c-6.62695 0 -12 -5.37305 -12 -12v-32c0 -6.62695 5.37305 -12 12 -12h200c6.62695 0 12 5.37305 12 12z" />
+    <glyph glyph-name="lock" unicode="&#xf023;" horiz-adv-x="448" 
+d="M400 224c26.5 0 48 -21.5 48 -48v-192c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v192c0 26.5 21.5 48 48 48h24v72c0 83.7998 68.2002 152 152 152s152 -68.2002 152 -152v-72h24zM296 224v72c0 39.7002 -32.2998 72 -72 72s-72 -32.2998 -72 -72v-72h144
+z" />
+    <glyph glyph-name="flag" unicode="&#xf024;" 
+d="M349.565 349.217c40.4951 0 82.6113 15.9062 116.949 31.8545c21.2168 9.85352 45.4854 -5.62305 45.4854 -29.0166v-243.1c0 -10.5264 -5.16016 -20.4072 -13.8428 -26.3584c-35.8379 -24.5635 -74.3359 -40.8574 -122.505 -40.8574
+c-67.373 0 -111.629 34.7832 -165.218 34.7832c-50.8525 0 -86.124 -10.0586 -114.435 -22.1221v-94.4004c0 -13.2549 -10.7451 -24 -24 -24h-16c-13.2549 0 -24 10.7451 -24 24v386.055c-14.5029 10.1201 -24 26.9189 -24 45.9453
+c0 31.7041 26.3447 57.2539 58.3379 55.9521c28.4678 -1.1582 51.7793 -23.9668 53.5508 -52.4033c0.0761719 -1.19141 0.0927734 -2.37305 0.0927734 -3.58301c0 -7.03711 -1.30176 -13.7734 -3.67871 -19.9785c20.7363 7.62891 43.0898 12.0127 68.0449 12.0127
+c67.373 0 111.63 -34.7832 165.218 -34.7832z" />
+    <glyph glyph-name="headphones" unicode="&#xf025;" 
+d="M256 416c141.504 0 256 -114.521 256 -256v-48c0 -12.5312 -7.1875 -23.3711 -17.6904 -28.6221l-14.3818 -7.19141c-2.01074 -60.0889 -51.3486 -108.187 -111.928 -108.187h-24c-13.2549 0 -24 10.7451 -24 24v176c0 13.2549 10.7451 24 24 24h24
+c31.3418 0 59.6709 -12.8789 80 -33.627v1.62695c0 105.869 -86.1309 192 -192 192s-192 -86.1309 -192 -192v-1.62695c20.3291 20.748 48.6582 33.627 80 33.627h24c13.2549 0 24 -10.7451 24 -24v-176c0 -13.2549 -10.7451 -24 -24 -24h-24
+c-60.5791 0 -109.917 48.0967 -111.928 108.187l-14.3828 7.19141c-10.502 5.25098 -17.6895 16.0908 -17.6895 28.6221v48c0 141.504 114.52 256 256 256z" />
+    <glyph glyph-name="volume-off" unicode="&#xf026;" horiz-adv-x="256" 
+d="M215 377c15 15 41 4.46973 41 -17v-336c0 -21.4697 -26 -32 -41 -17l-88.9404 89h-102.06c-13.2461 0 -24 10.7539 -24 24v144c0 13.2461 10.7539 24 24 24h102z" />
+    <glyph glyph-name="volume-down" unicode="&#xf027;" horiz-adv-x="384" 
+d="M215.03 375.96c15.0098 15 40.9697 4.49023 40.9697 -16.9795v-335.961c0 -21.4395 -25.9404 -32 -40.9697 -16.9697l-88.9707 88.9502h-102.06c-13.2598 0 -24 10.75 -24 24v144c0 13.2598 10.7402 24 24 24h102.06zM338.23 267.88
+c28.2393 -15.5498 45.7793 -44.9902 45.7793 -76.8701s-17.54 -61.3301 -45.7695 -76.8799c-11.5605 -6.34961 -26.1807 -2.20996 -32.6104 9.4502c-6.38965 11.6104 -2.16016 26.2002 9.4502 32.6104c12.9004 7.08984 20.9199 20.4297 20.9199 34.8096
+s-8.01953 27.7197 -20.9297 34.8203c-11.6104 6.41016 -15.8398 21 -9.4502 32.6094c6.41992 11.6104 21.0303 15.7803 32.6104 9.4502z" />
+    <glyph glyph-name="volume-up" unicode="&#xf028;" horiz-adv-x="576" 
+d="M215.03 376.95c15.0098 15.0098 40.9697 4.49023 40.9697 -16.9697v-335.961c0 -21.4395 -25.9404 -32 -40.9697 -16.9697l-88.9707 88.9502h-102.06c-13.2598 0 -24 10.75 -24 24v144c0 13.2598 10.7402 24 24 24h102.06zM448.35 428.03
+c79.9199 -52.46 127.65 -140.7 127.65 -236.03s-47.7305 -183.58 -127.65 -236.04c-11.5801 -7.61035 -26.4697 -3.75977 -33.5098 6.9502c-7.33984 11.1602 -4.21973 26.1797 6.9502 33.5c66.2695 43.4902 105.82 116.6 105.82 195.58
+c0 78.9795 -39.5508 152.09 -105.82 195.58c-11.1699 7.33008 -14.29 22.3398 -6.9502 33.5098c7.33008 11.1895 22.3398 14.2803 33.5098 6.9502zM480 192c0 -63.54 -32.0596 -121.94 -85.7695 -156.24c-12 -7.67969 -26.6104 -2.89941 -33.1201 7.45996
+c-7.09082 11.29 -3.78027 26.2207 7.40918 33.3604c39.75 25.3896 63.4805 68.5303 63.4805 115.42s-23.7305 90.0303 -63.4805 115.42c-11.1895 7.15039 -14.5 22.0801 -7.40918 33.3604c7.08984 11.2793 21.9297 14.5996 33.1201 7.45996
+c53.71 -34.2998 85.7695 -92.71 85.7695 -156.24zM338.23 268.87c28.2393 -15.54 45.7793 -44.9805 45.7793 -76.8604s-17.54 -61.3301 -45.7695 -76.8799c-11.5605 -6.34961 -26.1807 -2.20996 -32.6104 9.4502c-6.38965 11.6104 -2.16016 26.2002 9.4502 32.6104
+c12.9004 7.08984 20.9199 20.4297 20.9199 34.8096c0 14.3701 -8.01953 27.7197 -20.9297 34.8096c-11.6104 6.41016 -15.8398 21 -9.4502 32.6104c6.41992 11.6104 21.0303 15.7803 32.6104 9.4502z" />
+    <glyph glyph-name="qrcode" unicode="&#xf029;" horiz-adv-x="448" 
+d="M0 224v192h192v-192h-192zM64 352v-64h64v64h-64zM256 416h192v-192h-192v192zM384 288v64h-64v-64h64zM0 -32v192h192v-192h-192zM64 96v-64h64v64h-64zM416 160h32v-128h-96v32h-32v-96h-64v192h96v-32h64v32zM416 0h32v-32h-32v32zM352 0h32v-32h-32v32z" />
+    <glyph glyph-name="barcode" unicode="&#xf02a;" 
+d="M0 0v384h18v-384h-18zM26.8574 0.273438v383.727h9.14258v-383.727h-9.14258zM54 0.273438v383.727h8.85742v-383.727h-8.85742zM98.8574 0.273438v383.727h8.85645v-383.727h-8.85645zM134.857 0.273438v383.727h17.7139v-383.727h-17.7139zM179.714 0.273438v383.727
+h8.85742v-383.727h-8.85742zM197.714 0.273438v383.727h8.85742v-383.727h-8.85742zM215.714 0.273438v383.727h8.85742v-383.727h-8.85742zM251.429 0.273438v383.727h18v-383.727h-18zM296.286 0.273438v383.727h18v-383.727h-18zM332.285 0.273438v383.727h18.001
+v-383.727h-18.001zM368.286 0.273438v383.727h18.001v-383.727h-18.001zM395.143 0.273438v383.727h18v-383.727h-18zM440.286 0.273438v383.727h26.8564v-383.727h-26.8564zM476 0.273438v383.727h9.14258v-383.727h-9.14258zM494 0v384h18v-384h-18z" />
+    <glyph glyph-name="tag" unicode="&#xf02b;" 
+d="M0 195.882v204.118c0 26.5098 21.4902 48 48 48h204.118c13.2461 0 25.252 -5.37012 33.9404 -14.0586l211.883 -211.883c18.7441 -18.7441 18.7441 -49.1367 0 -67.8818l-204.118 -204.118c-18.7451 -18.7441 -49.1377 -18.7441 -67.8818 0l-211.883 211.883
+c-8.68848 8.68848 -14.0586 20.6943 -14.0586 33.9404zM112 384c-26.5098 0 -48 -21.4902 -48 -48s21.4902 -48 48 -48s48 21.4902 48 48s-21.4902 48 -48 48z" />
+    <glyph glyph-name="tags" unicode="&#xf02c;" horiz-adv-x="640" 
+d="M497.941 222.059c18.7441 -18.7441 18.7441 -49.1367 0 -67.8818l-204.118 -204.118c-18.7461 -18.7451 -49.1387 -18.7441 -67.8818 0l-211.883 211.883c-8.68848 8.68848 -14.0586 20.6943 -14.0586 33.9404v204.118c0 26.5098 21.4902 48 48 48h204.118
+c13.2461 0 25.252 -5.37012 33.9404 -14.0586zM112 288c26.5098 0 48 21.4902 48 48s-21.4902 48 -48 48s-48 -21.4902 -48 -48s21.4902 -48 48 -48zM625.941 154.177l-204.118 -204.118c-18.7451 -18.7441 -49.1377 -18.7441 -67.8818 0l-0.360352 0.360352
+l174.059 174.059c16.999 16.999 26.3604 39.6006 26.3604 63.6406s-9.3623 46.6406 -26.3604 63.6396l-196.242 196.242h48.7207c13.2461 0 25.252 -5.37012 33.9404 -14.0586l211.883 -211.883c18.7441 -18.7441 18.7441 -49.1367 0 -67.8818z" />
+    <glyph glyph-name="book" unicode="&#xf02d;" horiz-adv-x="448" 
+d="M448 88c0 -7.5 -3.5 -14.2998 -8.90039 -18.5996c-4.19922 -15.4004 -4.19922 -59.3008 0 -74.7002c5.40039 -4.40039 8.90039 -11.2002 8.90039 -18.7002v-16c0 -13.2998 -10.7002 -24 -24 -24h-328c-53 0 -96 43 -96 96v320c0 53 43 96 96 96h328
+c13.2998 0 24 -10.7002 24 -24v-336zM128 314v-20c0 -3.2998 2.7002 -6 6 -6h212c3.2998 0 6 2.7002 6 6v20c0 3.2998 -2.7002 6 -6 6h-212c-3.2998 0 -6 -2.7002 -6 -6zM128 250v-20c0 -3.2998 2.7002 -6 6 -6h212c3.2998 0 6 2.7002 6 6v20c0 3.2998 -2.7002 6 -6 6h-212
+c-3.2998 0 -6 -2.7002 -6 -6zM381.4 0c-1.90039 17.0996 -1.90039 46.9004 0 64h-285.4c-17.5996 0 -32 -14.4004 -32 -32c0 -17.7002 14.2998 -32 32 -32h285.4z" />
+    <glyph glyph-name="bookmark" unicode="&#xf02e;" horiz-adv-x="384" 
+d="M0 -64v464c0 26.5098 21.4902 48 48 48h288c26.5098 0 48 -21.4902 48 -48v-464l-192 112z" />
+    <glyph glyph-name="print" unicode="&#xf02f;" 
+d="M448 256c35.3496 0 64 -28.6504 64 -64v-112c0 -8.83984 -7.16016 -16 -16 -16h-48v-96c0 -17.6699 -14.3301 -32 -32 -32h-320c-17.6699 0 -32 14.3301 -32 32v96h-48c-8.83984 0 -16 7.16016 -16 16v112c0 35.3496 28.6504 64 64 64v160c0 17.6699 14.3301 32 32 32
+h274.74c8.49023 0 16.6299 -3.37012 22.6299 -9.37012l45.2598 -45.25c6 -6.00977 9.37012 -14.1396 9.37012 -22.6299v-114.75zM384 0v96h-256v-96h256zM384 224v96h-48c-8.83984 0 -16 7.16016 -16 16v48h-192v-160h256zM432 152c13.25 0 24 10.75 24 24
+c0 13.2598 -10.75 24 -24 24s-24 -10.7402 -24 -24c0 -13.25 10.75 -24 24 -24z" />
+    <glyph glyph-name="camera" unicode="&#xf030;" 
+d="M512 304v-288c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v288c0 26.5 21.5 48 48 48h88l12.2998 32.9004c7 18.6992 24.9004 31.0996 44.9004 31.0996h125.5c20 0 37.8994 -12.4004 44.8994 -31.0996l12.4004 -32.9004h88c26.5 0 48 -21.5 48 -48zM376 160
+c0 66.2002 -53.7998 120 -120 120s-120 -53.7998 -120 -120s53.7998 -120 120 -120s120 53.7998 120 120zM344 160c0 -48.5 -39.5 -88 -88 -88s-88 39.5 -88 88s39.5 88 88 88s88 -39.5 88 -88z" />
+    <glyph glyph-name="font" unicode="&#xf031;" horiz-adv-x="448" 
+d="M432 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-128c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h19.5801l-23.2998 64h-152.561l-23.2998 -64h19.5801c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-128c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h23.4102l130.71 362.31c4.29297 12.6133 16.2363 21.6904 30.293 21.6904h0.00683594h47.1602l-0.00292969 0.00683594c14.0576 0 26.0098 -9.08398 30.3027 -21.6973
+l130.71 -362.31h23.4102zM176.85 176h94.3008l-47.1504 129.49z" />
+    <glyph glyph-name="bold" unicode="&#xf032;" horiz-adv-x="384" 
+d="M333.49 210c34.4395 -27.54 55.5693 -71.1504 50.8301 -119.6c-6.86035 -70.6504 -70.2002 -122.4 -141 -122.4h-209.32c-8.83105 0 -16 7.16895 -16 16v48c0 8.83105 7.16895 16 16 16h31.8701v288h-31.8701c-8.83105 0 -16 7.16895 -16 16v48
+c0 8.83105 7.16895 16 16 16h199.42c74.5801 0 134.45 -64.4902 127.07 -140.79c-2.43945 -24.5273 -12.1992 -47.1309 -27 -65.21zM145.66 336v-96h87.7598c26.4922 0 48 21.5078 48 48s-21.5078 48 -48 48h-87.7598zM233.42 48c30.9072 0 56 25.0928 56 56
+s-25.0928 56 -56 56h-87.7598v-112h87.7598z" />
+    <glyph glyph-name="italic" unicode="&#xf033;" horiz-adv-x="320" 
+d="M320 400v-32c0 -8.83105 -7.16895 -16 -16 -16h-62.7598l-80 -320h46.7598c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-192c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h62.7598l80 320h-46.7598
+c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h192c8.83105 0 16 -7.16895 16 -16z" />
+    <glyph glyph-name="text-height" unicode="&#xf034;" horiz-adv-x="576" 
+d="M304 416c8.83105 0 16 -7.16895 16 -16v-96c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32h-56v-304h40c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-160c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h40v304h-56v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v96c0 8.83105 7.16895 16 16 16h288zM560 80c15.6396 0 20.6396 -18 11.3096 -27.3096l-80 -80c-2.89551 -2.89453 -6.89844 -4.68555 -11.3115 -4.68555
+c-4.41406 0 -8.41211 1.79102 -11.3076 4.68555l-80 80c-10.0107 10 -3 27.3096 11.3096 27.3096h48v224h-48c-15.6396 0 -20.6396 18 -11.3096 27.3096l80 80c2.89551 2.89453 6.89844 4.68555 11.3115 4.68555c4.41406 0 8.41211 -1.79102 11.3076 -4.68555l80 -80
+c10.0205 -10 3 -27.3096 -11.3096 -27.3096h-48v-224h48z" />
+    <glyph glyph-name="text-width" unicode="&#xf035;" horiz-adv-x="448" 
+d="M432 416c8.83105 0 16 -7.16895 16 -16v-80c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v16h-120v-112h24c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-128c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h24v112h-120v-16c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v80c0 8.83105 7.16895 16 16 16h416zM363.31 155.31l80 -80c2.89453 -2.89551 4.68555 -6.89844 4.68555 -11.3115
+c0 -4.41406 -1.79102 -8.41211 -4.68555 -11.3076l-80 -80c-10 -10.0205 -27.3096 -3 -27.3096 11.3096v48h-224v-48c0 -15.6396 -18 -20.6396 -27.3096 -11.3096l-80 80c-2.89453 2.89551 -4.68555 6.89844 -4.68555 11.3115c0 4.41406 1.79102 8.41211 4.68555 11.3076
+l80 80c10 10.0107 27.3096 3 27.3096 -11.3096v-48h224v48c0 15.6396 18 20.6396 27.3096 11.3096z" />
+    <glyph glyph-name="align-left" unicode="&#xf036;" horiz-adv-x="448" 
+d="M12.8301 96c-7.07617 0 -12.8301 5.74414 -12.8301 12.8193v0.0107422v38.3398v0.00976562c0 7.07617 5.74414 12.8203 12.8193 12.8203h0.0107422h262.34h0.00976562c7.07617 0 12.8203 -5.74414 12.8203 -12.8193v-0.0107422v-38.3398v-0.00976562
+c0 -7.07617 -5.74414 -12.8203 -12.8193 -12.8203h-0.0107422h-262.34zM12.8301 352c-7.07617 0 -12.8301 5.74414 -12.8301 12.8193v0.0107422v38.3398v0.00976562c0 7.07617 5.74414 12.8203 12.8193 12.8203h0.0107422h262.34h0.00976562
+c7.07617 0 12.8203 -5.74414 12.8203 -12.8193v-0.0107422v-38.3398v-0.00976562c0 -7.07617 -5.74414 -12.8203 -12.8193 -12.8203h-0.0107422h-262.34zM432 288c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h416zM432 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h416z" />
+    <glyph glyph-name="align-center" unicode="&#xf037;" horiz-adv-x="448" 
+d="M432 288c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h416zM432 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16
+v32c0 8.83105 7.16895 16 16 16h416zM108.1 352c-6.67773 0 -12.0996 5.42188 -12.0996 12.0996v39.8105c0 6.67285 5.41699 12.0898 12.0898 12.0898h0.00976562h231.811c6.67285 0 12.0898 -5.41699 12.0898 -12.0898v-39.8105v-0.00976562
+c0 -6.67285 -5.41699 -12.0898 -12.0898 -12.0898h-231.811zM339.91 96h-231.811c-6.67773 0 -12.0996 5.42188 -12.0996 12.0996v39.8105c0 6.67285 5.41699 12.0898 12.0898 12.0898h0.00976562h231.811c6.67285 0 12.0898 -5.41699 12.0898 -12.0898v-39.8105
+v-0.00976562c0 -6.67285 -5.41699 -12.0898 -12.0898 -12.0898z" />
+    <glyph glyph-name="align-right" unicode="&#xf038;" horiz-adv-x="448" 
+d="M16 224c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h416c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416zM432 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16
+v32c0 8.83105 7.16895 16 16 16h416zM435.17 416c7.07617 0 12.8301 -5.74414 12.8301 -12.8193v-0.0107422v-38.3398v-0.00976562c0 -7.07617 -5.74414 -12.8203 -12.8193 -12.8203h-0.0107422h-262.34h-0.00976562c-7.07617 0 -12.8203 5.74414 -12.8203 12.8193
+v0.0107422v38.3398v0.00976562c0 7.07617 5.74414 12.8203 12.8193 12.8203h0.0107422h262.34zM435.17 160c7.07617 0 12.8301 -5.74414 12.8301 -12.8193v-0.0107422v-38.3398v-0.00976562c0 -7.07617 -5.74414 -12.8203 -12.8193 -12.8203h-0.0107422h-262.34h-0.00976562
+c-7.07617 0 -12.8203 5.74414 -12.8203 12.8193v0.0107422v38.3398v0.00976562c0 7.07617 5.74414 12.8203 12.8193 12.8203h0.0107422h262.34z" />
+    <glyph glyph-name="align-justify" unicode="&#xf039;" horiz-adv-x="448" 
+d="M432 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h416zM432 160c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16
+v32c0 8.83105 7.16895 16 16 16h416zM432 288c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h416zM432 416c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16
+h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h416z" />
+    <glyph glyph-name="list" unicode="&#xf03a;" 
+d="M80 80c8.83105 0 16 -7.16895 16 -16v-64c0 -8.83105 -7.16895 -16 -16 -16h-64c-8.83105 0 -16 7.16895 -16 16v64c0 8.83105 7.16895 16 16 16h64zM80 400c8.83105 0 16 -7.16895 16 -16v-64c0 -8.83105 -7.16895 -16 -16 -16h-64c-8.83105 0 -16 7.16895 -16 16v64
+c0 8.83105 7.16895 16 16 16h64zM80 240c8.83105 0 16 -7.16895 16 -16v-64c0 -8.83105 -7.16895 -16 -16 -16h-64c-8.83105 0 -16 7.16895 -16 16v64c0 8.83105 7.16895 16 16 16h64zM496 64c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-320
+c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h320zM496 384c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-320c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h320zM496 224c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-320c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h320z" />
+    <glyph glyph-name="outdent" unicode="&#xf03b;" horiz-adv-x="448" 
+d="M100.69 84.71l-96 95.9805c-2.89453 2.89551 -4.68555 6.89844 -4.68555 11.3115c0 4.41406 1.79102 8.41211 4.68555 11.3076l96 96c9.97949 10 27.3096 3.01074 27.3096 -11.3096v-191.98c0 -14.2393 -17.3096 -21.3096 -27.3096 -11.3096zM432 32
+c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h416zM435.17 160c7.07617 0 12.8301 -5.74414 12.8301 -12.8193v-0.0107422v-38.3398v-0.00976562
+c0 -7.07617 -5.74414 -12.8203 -12.8193 -12.8203h-0.0107422h-230.34h-0.00976562c-7.07617 0 -12.8203 5.74414 -12.8203 12.8193v0.0107422v38.3398v0.00976562c0 7.07617 5.74414 12.8203 12.8193 12.8203h0.0107422h230.34zM435.17 288
+c7.07617 0 12.8301 -5.74414 12.8301 -12.8193v-0.0107422v-38.3398v-0.00976562c0 -7.07617 -5.74414 -12.8203 -12.8193 -12.8203h-0.0107422h-230.34h-0.00976562c-7.07617 0 -12.8203 5.74414 -12.8203 12.8193v0.0107422v38.3398v0.00976562
+c0 7.07617 5.74414 12.8203 12.8193 12.8203h0.0107422h230.34zM432 416c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h416z" />
+    <glyph glyph-name="indent" unicode="&#xf03c;" horiz-adv-x="448" 
+d="M27.3096 84.7002c-9.97949 -10 -27.3096 -3.00977 -27.3096 11.2998v192c0 14.2197 17.2695 21.3398 27.3096 11.3203l96 -96c2.89453 -2.89648 4.68555 -6.89941 4.68555 -11.3125s-1.79102 -8.41211 -4.68555 -11.3076zM432 32c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h416zM435.17 160c7.07617 0 12.8301 -5.74414 12.8301 -12.8193v-0.0107422v-38.3398v-0.00976562c0 -7.07617 -5.74414 -12.8203 -12.8193 -12.8203h-0.0107422
+h-230.34h-0.00976562c-7.07617 0 -12.8203 5.74414 -12.8203 12.8193v0.0107422v38.3398v0.00976562c0 7.07617 5.74414 12.8203 12.8193 12.8203h0.0107422h230.34zM435.17 288c7.07617 0 12.8301 -5.74414 12.8301 -12.8193v-0.0107422v-38.3398v-0.00976562
+c0 -7.07617 -5.74414 -12.8203 -12.8193 -12.8203h-0.0107422h-230.34h-0.00976562c-7.07617 0 -12.8203 5.74414 -12.8203 12.8193v0.0107422v38.3398v0.00976562c0 7.07617 5.74414 12.8203 12.8193 12.8203h0.0107422h230.34zM432 416c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h416z" />
+    <glyph glyph-name="video" unicode="&#xf03d;" horiz-adv-x="576" 
+d="M336.2 384c26.3994 0 47.7998 -21.4004 47.7998 -47.7998v-288.4c0 -26.3994 -21.4004 -47.7998 -47.7998 -47.7998h-288.4c-26.3994 0 -47.7998 21.4004 -47.7998 47.7998v288.4c0 26.3994 21.4004 47.7998 47.7998 47.7998h288.4zM525.6 346.3
+c21.3008 14.6006 50.4004 -0.399414 50.4004 -25.7998v-256.9c0 -25.5 -29.2002 -40.3994 -50.4004 -25.7998l-109.6 75.5v157.4z" />
+    <glyph glyph-name="image" unicode="&#xf03e;" 
+d="M464 0h-416c-26.5098 0 -48 21.4902 -48 48v288c0 26.5098 21.4902 48 48 48h416c26.5098 0 48 -21.4902 48 -48v-288c0 -26.5098 -21.4902 -48 -48 -48zM112 328c-30.9277 0 -56 -25.0723 -56 -56s25.0723 -56 56 -56s56 25.0723 56 56s-25.0723 56 -56 56zM64 64h384
+v112l-87.5146 87.5146c-4.68652 4.68652 -12.2842 4.68652 -16.9717 0l-135.514 -135.515l-55.5146 55.5146c-4.68652 4.68652 -12.2842 4.68652 -16.9717 0l-71.5137 -71.5146v-48z" />
+    <glyph glyph-name="map-marker" unicode="&#xf041;" horiz-adv-x="384" 
+d="M172.268 -53.6699c-145.298 210.639 -172.268 232.257 -172.268 309.67c0 106.039 85.9609 192 192 192s192 -85.9609 192 -192c0 -77.4131 -26.9697 -99.0312 -172.268 -309.67c-9.53516 -13.7744 -29.9307 -13.7734 -39.4648 0z" />
+    <glyph glyph-name="adjust" unicode="&#xf042;" 
+d="M8 192c0 136.967 111.034 248 248 248s248 -111.034 248 -248s-111.033 -248 -248 -248s-248 111.034 -248 248zM256 8c101.689 0 184 82.2949 184 184c0 101.689 -82.2949 184 -184 184v-368z" />
+    <glyph glyph-name="tint" unicode="&#xf043;" horiz-adv-x="352" 
+d="M205.22 425.91c46.9902 -158.48 146.78 -200.07 146.78 -311.82c0 -98.4395 -78.7197 -178.09 -176 -178.09s-176 79.6504 -176 178.09c0 111.19 100.01 154.061 146.78 311.82c9 30.1201 50.5 28.7803 58.4395 0zM176 0c8.83984 0 16 7.16016 16 16s-7.16016 16 -16 16
+c-44.1104 0 -80 35.8896 -80 80c0 8.83984 -7.16016 16 -16 16s-16 -7.16016 -16 -16c0 -61.75 50.25 -112 112 -112z" />
+    <glyph glyph-name="edit" unicode="&#xf044;" horiz-adv-x="576" 
+d="M402.6 364.8l90.2002 -90.2002c3.7998 -3.7998 3.7998 -10 0 -13.7998l-218.399 -218.399l-92.8008 -10.3008c-12.3994 -1.39941 -22.8994 9.10059 -21.5 21.5l10.3008 92.8008l218.399 218.399c3.7998 3.7998 10 3.7998 13.7998 0zM564.6 387.7
+c15.2002 -15.2002 15.2002 -39.9004 0 -55.2002l-35.3994 -35.4004c-3.7998 -3.7998 -10 -3.7998 -13.7998 0l-90.2002 90.2002c-3.7998 3.7998 -3.7998 10 0 13.7998l35.3994 35.4004c15.3008 15.2002 40 15.2002 55.2002 0zM384 101.8c0 3.2002 1.2998 6.2002 3.5 8.5
+l40 40c7.59961 7.5 20.5 2.2002 20.5 -8.5v-157.8c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h285.8c10.7002 0 16.1006 -12.9004 8.5 -20.5l-40 -40c-2.2998 -2.2002 -5.2998 -3.5 -8.5 -3.5h-229.8v-320h320v101.8z" />
+    <glyph glyph-name="step-backward" unicode="&#xf048;" horiz-adv-x="448" 
+d="M64 -20v424c0 6.59961 5.40039 12 12 12h48c6.59961 0 12 -5.40039 12 -12v-176.4l195.5 181c20.5996 17.1006 52.5 2.80078 52.5 -24.5996v-384c0 -27.4004 -31.9004 -41.7002 -52.5 -24.5996l-195.5 179.899v-175.3c0 -6.59961 -5.40039 -12 -12 -12h-48
+c-6.59961 0 -12 5.40039 -12 12z" />
+    <glyph glyph-name="fast-backward" unicode="&#xf049;" 
+d="M0 12v360c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-151.9l171.5 156.5c20.5996 17.1006 52.5 2.80078 52.5 -24.5996v-131.9l171.5 156.5c20.5996 17.1006 52.5 2.80078 52.5 -24.5996v-320c0 -27.4004 -31.9004 -41.7002 -52.5 -24.5996
+l-171.5 155.3v-130.7c0 -27.4004 -31.9004 -41.7002 -52.5 -24.5996l-171.5 155.3v-150.7c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12z" />
+    <glyph glyph-name="backward" unicode="&#xf04a;" 
+d="M11.5 167.4c-15.2998 12.7998 -15.2998 36.3994 0 49.1992l192 160c20.5996 17.2002 52.5 2.80078 52.5 -24.5996v-320c0 -27.4004 -31.9004 -41.7998 -52.5 -24.5996zM267.5 167.4c-15.2998 12.7998 -15.2998 36.3994 0 49.1992l192 160
+c20.5996 17.2002 52.5 2.80078 52.5 -24.5996v-320c0 -27.4004 -31.9004 -41.7998 -52.5 -24.5996z" />
+    <glyph glyph-name="play" unicode="&#xf04b;" horiz-adv-x="448" 
+d="M424.4 233.3c31.5 -18.5 31.3994 -64.0996 0 -82.5996l-352 -208c-31.7002 -18.7998 -72.4004 3.7998 -72.4004 41.2998v416.1c0 41.8008 43.7998 58.2002 72.4004 41.3008z" />
+    <glyph glyph-name="pause" unicode="&#xf04c;" horiz-adv-x="448" 
+d="M144 -31h-96c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h96c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48zM448 17c0 -26.5 -21.5 -48 -48 -48h-96c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h96c26.5 0 48 -21.5 48 -48v-352z" />
+    <glyph glyph-name="stop" unicode="&#xf04d;" horiz-adv-x="448" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352z" />
+    <glyph glyph-name="forward" unicode="&#xf04e;" 
+d="M500.5 216.6c15.2998 -12.7998 15.2998 -36.3994 0 -49.1992l-192 -160c-20.5996 -17.2002 -52.5 -2.80078 -52.5 24.5996v320c0 27.4004 31.9004 41.7002 52.5 24.5996zM244.5 216.6c15.2998 -12.7998 15.2998 -36.3994 0 -49.1992l-192 -160
+c-20.5996 -17.2002 -52.5 -2.80078 -52.5 24.5996v320c0 27.4004 31.9004 41.7002 52.5 24.5996z" />
+    <glyph glyph-name="fast-forward" unicode="&#xf050;" 
+d="M512 372v-360c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v151.9l-171.5 -156.5c-20.5996 -17.2002 -52.5 -2.80078 -52.5 24.5996v131.9l-171.5 -156.5c-20.5996 -17.2002 -52.5 -2.80078 -52.5 24.5996v320
+c0 27.4004 31.9004 41.7002 52.5 24.5996l171.5 -155.399v130.8c0 27.4004 31.9004 41.7002 52.5 24.5996l171.5 -155.399v150.8c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12z" />
+    <glyph glyph-name="step-forward" unicode="&#xf051;" horiz-adv-x="448" 
+d="M384 404v-424c0 -6.59961 -5.40039 -12 -12 -12h-48c-6.59961 0 -12 5.40039 -12 12v176.4l-195.5 -181c-20.5996 -17.1006 -52.5 -2.80078 -52.5 24.5996v384c0 27.4004 31.9004 41.7002 52.5 24.5996l195.5 -179.899v175.3c0 6.59961 5.40039 12 12 12h48
+c6.59961 0 12 -5.40039 12 -12z" />
+    <glyph glyph-name="eject" unicode="&#xf052;" horiz-adv-x="448" 
+d="M448 64v-64c0 -17.6729 -14.3271 -32 -32 -32h-384c-17.6729 0 -32 14.3271 -32 32v64c0 17.6729 14.3271 32 32 32h384c17.6729 0 32 -14.3271 32 -32zM48.0527 128c-41.7285 0 -63.5273 49.7324 -35.3828 80.4346l175.946 192.008
+c19.0156 20.7432 51.7529 20.7422 70.7666 0l175.939 -192.008c28.1973 -30.7607 6.26758 -80.4346 -35.3828 -80.4346h-351.887z" />
+    <glyph glyph-name="chevron-left" unicode="&#xf053;" horiz-adv-x="320" 
+d="M34.5195 208.97l194.351 194.34c9.37012 9.37012 24.5703 9.37012 33.9395 0l22.6709 -22.6699c9.35938 -9.35938 9.36914 -24.5195 0.0390625 -33.8994l-154.029 -154.74l154.02 -154.75c9.33984 -9.37988 9.32031 -24.54 -0.0400391 -33.9004l-22.6699 -22.6699
+c-9.37012 -9.37012 -24.5693 -9.37012 -33.9395 0l-194.341 194.351c-9.36914 9.37012 -9.36914 24.5693 0 33.9395z" />
+    <glyph glyph-name="chevron-right" unicode="&#xf054;" horiz-adv-x="320" 
+d="M285.476 175.029l-194.344 -194.344c-9.37305 -9.37207 -24.5684 -9.37207 -33.9404 0l-22.667 22.667c-9.35742 9.35742 -9.375 24.5225 -0.0400391 33.9014l154.021 154.746l-154.021 154.745c-9.33496 9.37891 -9.31738 24.5439 0.0400391 33.9014l22.667 22.667
+c9.37305 9.37207 24.5684 9.37207 33.9404 0l194.343 -194.344c9.37305 -9.37207 9.37305 -24.5674 0.000976562 -33.9404z" />
+    <glyph glyph-name="plus-circle" unicode="&#xf055;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM400 164v56c0 6.59961 -5.40039 12 -12 12h-92v92c0 6.59961 -5.40039 12 -12 12h-56c-6.59961 0 -12 -5.40039 -12 -12v-92h-92c-6.59961 0 -12 -5.40039 -12 -12v-56
+c0 -6.59961 5.40039 -12 12 -12h92v-92c0 -6.59961 5.40039 -12 12 -12h56c6.59961 0 12 5.40039 12 12v92h92c6.59961 0 12 5.40039 12 12z" />
+    <glyph glyph-name="minus-circle" unicode="&#xf056;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM124 152h264c6.59961 0 12 5.40039 12 12v56c0 6.59961 -5.40039 12 -12 12h-264c-6.59961 0 -12 -5.40039 -12 -12v-56c0 -6.59961 5.40039 -12 12 -12z" />
+    <glyph glyph-name="times-circle" unicode="&#xf057;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM377.6 126.9l-65.5996 65.0996l65.7002 65c4.7002 4.7002 4.7002 12.2998 0 17l-39.6006 39.5996c-4.69922 4.7002 -12.2998 4.7002 -17 0l-65.0996 -65.5996l-65 65.7002
+c-4.7002 4.7002 -12.2998 4.7002 -17 0l-39.5996 -39.6006c-4.7002 -4.69922 -4.7002 -12.2998 0 -17l65.5996 -65.0996l-65.5996 -65c-4.7002 -4.7002 -4.7002 -12.2998 0 -17l39.5 -39.5996c4.69922 -4.7002 12.2998 -4.7002 17 0l65.0996 65.5996l65 -65.5996
+c4.7002 -4.7002 12.2998 -4.7002 17 0l39.5996 39.5c4.7002 4.69922 4.7002 12.2998 0 17z" />
+    <glyph glyph-name="check-circle" unicode="&#xf058;" 
+d="M504 192c0 -136.967 -111.033 -248 -248 -248s-248 111.033 -248 248s111.033 248 248 248s248 -111.033 248 -248zM227.314 60.6855l184 184c6.24707 6.24805 6.24707 16.3799 0 22.6279l-22.6279 22.627c-6.24707 6.24902 -16.3789 6.24902 -22.6279 0
+l-150.059 -150.059l-70.0586 70.0596c-6.24805 6.24805 -16.3799 6.24805 -22.6279 0l-22.6279 -22.627c-6.24707 -6.24805 -6.24707 -16.3799 0 -22.6279l104 -104c6.24902 -6.24805 16.3799 -6.24805 22.6289 -0.000976562z" />
+    <glyph glyph-name="question-circle" unicode="&#xf059;" 
+d="M504 192c0 -136.997 -111.043 -248 -248 -248s-248 111.003 -248 248c0 136.917 111.043 248 248 248s248 -111.083 248 -248zM262.655 358c-54.4971 0 -89.2549 -22.957 -116.549 -63.7578c-3.53613 -5.28613 -2.35352 -12.415 2.71484 -16.2578l34.6982 -26.3105
+c5.20508 -3.94727 12.6211 -3.00781 16.665 2.12207c17.8643 22.6582 30.1133 35.7969 57.3037 35.7969c20.4287 0 45.6973 -13.1475 45.6973 -32.958c0 -14.9756 -12.3623 -22.667 -32.5332 -33.9756c-23.5244 -13.1875 -54.6523 -29.6006 -54.6523 -70.6592v-4
+c0 -6.62695 5.37305 -12 12 -12h56c6.62695 0 12 5.37305 12 12v1.33301c0 28.4619 83.1855 29.6475 83.1855 106.667c0 58.002 -60.1641 102 -116.53 102zM256 110c-25.3652 0 -46 -20.6348 -46 -46c0 -25.3643 20.6348 -46 46 -46s46 20.6357 46 46
+c0 25.3652 -20.6348 46 -46 46z" />
+    <glyph glyph-name="info-circle" unicode="&#xf05a;" 
+d="M256 440c136.957 0 248 -111.083 248 -248c0 -136.997 -111.043 -248 -248 -248s-248 111.003 -248 248c0 136.917 111.043 248 248 248zM256 330c-23.1963 0 -42 -18.8037 -42 -42s18.8037 -42 42 -42s42 18.8037 42 42s-18.8037 42 -42 42zM312 76v24
+c0 6.62695 -5.37305 12 -12 12h-12v100c0 6.62695 -5.37305 12 -12 12h-64c-6.62695 0 -12 -5.37305 -12 -12v-24c0 -6.62695 5.37305 -12 12 -12h12v-64h-12c-6.62695 0 -12 -5.37305 -12 -12v-24c0 -6.62695 5.37305 -12 12 -12h88c6.62695 0 12 5.37305 12 12z" />
+    <glyph glyph-name="crosshairs" unicode="&#xf05b;" 
+d="M500 224c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-30.3643c-13.9121 -93.6748 -87.9609 -167.724 -181.636 -181.636v-30.3643c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v30.3643
+c-93.6748 13.9121 -167.724 87.9609 -181.636 181.636h-30.3643c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h30.3643c13.9121 93.6748 87.9609 167.724 181.636 181.636v30.3643c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-30.3643
+c93.6748 -13.9121 167.724 -87.9609 181.636 -181.636h30.3643zM288 43.3662c58.2432 12.417 104.232 58.46 116.634 116.634h-40.6338c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40.6338c-12.417 58.2432 -58.46 104.232 -116.634 116.634v-40.6338
+c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v40.6338c-58.2432 -12.417 -104.232 -58.46 -116.634 -116.634h40.6338c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-40.6338
+c12.417 -58.2432 58.46 -104.232 116.634 -116.634v40.6338c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40.6338zM288 192c0 -17.6729 -14.3271 -32 -32 -32s-32 14.3271 -32 32s14.3271 32 32 32s32 -14.3271 32 -32z" />
+    <glyph glyph-name="ban" unicode="&#xf05e;" 
+d="M256 440c136.967 0 248 -111.034 248 -248s-111.034 -248 -248 -248s-248 111.033 -248 248s111.034 248 248 248zM386.108 322.108c-65.4121 65.4102 -165.435 70.0312 -235.639 20.6758l256.315 -256.313c49.3232 70.1562 44.7705 170.189 -20.6768 235.638z
+M125.892 61.8916c65.4121 -65.4111 165.436 -70.0312 235.639 -20.6758l-256.315 256.313c-49.3232 -70.1562 -44.7705 -170.189 20.6768 -235.638z" />
+    <glyph glyph-name="arrow-left" unicode="&#xf060;" horiz-adv-x="448" 
+d="M257.5 2.90039l-22.2002 -22.2002c-9.39941 -9.40039 -24.5996 -9.40039 -33.8994 0l-194.4 194.3c-9.40039 9.40039 -9.40039 24.5996 0 33.9004l194.4 194.399c9.39941 9.40039 24.5996 9.40039 33.8994 0l22.2002 -22.2002c9.5 -9.5 9.2998 -25 -0.400391 -34.2998
+l-120.5 -114.8h287.4c13.2998 0 24 -10.7002 24 -24v-32c0 -13.2998 -10.7002 -24 -24 -24h-287.4l120.5 -114.8c9.80078 -9.2998 10 -24.7998 0.400391 -34.2998z" />
+    <glyph glyph-name="arrow-right" unicode="&#xf061;" horiz-adv-x="448" 
+d="M190.5 381.1l22.2002 22.2002c9.39941 9.40039 24.5996 9.40039 33.8994 0l194.4 -194.3c9.40039 -9.40039 9.40039 -24.5996 0 -33.9004l-194.4 -194.399c-9.39941 -9.40039 -24.5996 -9.40039 -33.8994 0l-22.2002 22.2002c-9.5 9.5 -9.2998 25 0.400391 34.2998
+l120.5 114.8h-287.4c-13.2998 0 -24 10.7002 -24 24v32c0 13.2998 10.7002 24 24 24h287.4l-120.5 114.8c-9.80078 9.2998 -10 24.7998 -0.400391 34.2998z" />
+    <glyph glyph-name="arrow-up" unicode="&#xf062;" horiz-adv-x="448" 
+d="M34.9004 158.5l-22.2002 22.2002c-9.40039 9.39941 -9.40039 24.5996 0 33.8994l194.3 194.4c9.40039 9.40039 24.5996 9.40039 33.9004 0l194.3 -194.3c9.39941 -9.40039 9.39941 -24.6006 0 -33.9004l-22.2002 -22.2002c-9.5 -9.5 -25 -9.2998 -34.2998 0.400391
+l-114.7 120.4v-287.4c0 -13.2998 -10.7002 -24 -24 -24h-32c-13.2998 0 -24 10.7002 -24 24v287.4l-114.8 -120.5c-9.2998 -9.80078 -24.7998 -10 -34.2998 -0.400391z" />
+    <glyph glyph-name="arrow-down" unicode="&#xf063;" horiz-adv-x="448" 
+d="M413.1 225.5l22.2002 -22.2002c9.40039 -9.39941 9.40039 -24.5996 0 -33.8994l-194.3 -194.4c-9.40039 -9.40039 -24.5996 -9.40039 -33.9004 0l-194.399 194.4c-9.40039 9.39941 -9.40039 24.5996 0 33.8994l22.2002 22.2002c9.5 9.5 25 9.2998 34.2998 -0.400391
+l114.8 -120.5v287.4c0 13.2998 10.7002 24 24 24h32c13.2998 0 24 -10.7002 24 -24v-287.4l114.8 120.5c9.2998 9.80078 24.7998 10 34.2998 0.400391z" />
+    <glyph glyph-name="share" unicode="&#xf064;" 
+d="M503.691 258.164c11.0859 -9.5752 11.0703 -26.7656 0 -36.3281l-176.005 -152c-15.3867 -13.2891 -39.6865 -2.53613 -39.6865 18.1641v87.915c-155.083 -2.23145 -221.934 -40.7295 -176.59 -185.742c5.03418 -16.0977 -14.4238 -28.5615 -28.0771 -18.6309
+c-43.752 31.8232 -83.333 92.6914 -83.333 154.132c0 152.227 127.371 184.419 288 186.258v80.0537c0 20.668 24.2812 31.4688 39.6865 18.1641z" />
+    <glyph glyph-name="expand" unicode="&#xf065;" horiz-adv-x="448" 
+d="M0 268v124c0 13.2998 10.7002 24 24 24h124c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-84v-84c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12zM288 404c0 6.59961 5.40039 12 12 12h124c13.2998 0 24 -10.7002 24 -24
+v-124c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v84h-84c-6.59961 0 -12 5.40039 -12 12v40zM436 128c6.59961 0 12 -5.40039 12 -12v-124c0 -13.2998 -10.7002 -24 -24 -24h-124c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h84
+v84c0 6.59961 5.40039 12 12 12h40zM160 -20c0 -6.59961 -5.40039 -12 -12 -12h-124c-13.2998 0 -24 10.7002 -24 24v124c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-84h84c6.59961 0 12 -5.40039 12 -12v-40z" />
+    <glyph glyph-name="compress" unicode="&#xf066;" horiz-adv-x="448" 
+d="M436 256h-124c-13.2998 0 -24 10.7002 -24 24v124c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-84h84c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12zM160 280c0 -13.2998 -10.7002 -24 -24 -24h-124
+c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h84v84c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-124zM160 -20c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v84h-84c-6.59961 0 -12 5.40039 -12 12v40
+c0 6.59961 5.40039 12 12 12h124c13.2998 0 24 -10.7002 24 -24v-124zM352 -20c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v124c0 13.2998 10.7002 24 24 24h124c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-84v-84z" />
+    <glyph glyph-name="plus" unicode="&#xf067;" horiz-adv-x="448" 
+d="M416 240c17.6699 0 32 -14.3301 32 -32v-32c0 -17.6699 -14.3301 -32 -32 -32h-144v-144c0 -17.6699 -14.3301 -32 -32 -32h-32c-17.6699 0 -32 14.3301 -32 32v144h-144c-17.6699 0 -32 14.3301 -32 32v32c0 17.6699 14.3301 32 32 32h144v144
+c0 17.6699 14.3301 32 32 32h32c17.6699 0 32 -14.3301 32 -32v-144h144z" />
+    <glyph glyph-name="minus" unicode="&#xf068;" horiz-adv-x="448" 
+d="M416 240c17.6699 0 32 -14.3301 32 -32v-32c0 -17.6699 -14.3301 -32 -32 -32h-384c-17.6699 0 -32 14.3301 -32 32v32c0 17.6699 14.3301 32 32 32h384z" />
+    <glyph glyph-name="asterisk" unicode="&#xf069;" 
+d="M478.21 113.907c11.7949 -6.47754 15.96 -21.3828 9.23242 -33.0361l-19.4805 -33.7412c-6.72754 -11.6533 -21.7207 -15.499 -33.2266 -8.52246l-138.735 84.1104l3.47559 -162.204c0.288086 -13.4531 -10.5391 -24.5137 -23.9941 -24.5137h-38.9619
+c-13.4551 0 -24.2822 11.0605 -23.9941 24.5137l3.47461 162.204l-138.735 -84.1113c-11.5059 -6.97656 -26.499 -3.13086 -33.2266 8.52246l-19.4805 33.7412c-6.72852 11.6533 -2.5625 26.5596 9.23242 33.0371l142.21 78.0928l-142.209 78.0918
+c-11.7949 6.47754 -15.9609 21.3838 -9.2334 33.0371l19.4805 33.7412c6.72754 11.6533 21.7207 15.499 33.2266 8.52246l138.735 -84.1104l-3.47363 162.204c-0.289062 13.4531 10.5381 24.5137 23.9932 24.5137h38.9609c13.4561 0 24.2822 -11.0605 23.9941 -24.5137
+l-3.47461 -162.204l138.735 84.1113c11.5068 6.97656 26.499 3.13086 33.2266 -8.52246l19.4805 -33.7412c6.72852 -11.6533 2.5625 -26.5596 -9.23242 -33.0371l-142.21 -78.0928z" />
+    <glyph glyph-name="exclamation-circle" unicode="&#xf06a;" 
+d="M504 192c0 -136.997 -111.043 -248 -248 -248s-248 111.003 -248 248c0 136.917 111.043 248 248 248s248 -111.083 248 -248zM256 142c-25.4053 0 -46 -20.5947 -46 -46s20.5947 -46 46 -46s46 20.5947 46 46s-20.5947 46 -46 46zM212.327 307.346l7.41797 -136
+c0.34668 -6.36328 5.6084 -11.3457 11.9814 -11.3457h48.5469c6.37305 0 11.6348 4.98242 11.9814 11.3457l7.41797 136c0.375 6.87402 -5.09766 12.6543 -11.9814 12.6543h-63.3838c-6.88379 0 -12.3555 -5.78027 -11.9805 -12.6543z" />
+    <glyph glyph-name="gift" unicode="&#xf06b;" 
+d="M32 0v128h192v-160h-160c-17.7002 0 -32 14.2998 -32 32zM288 -32v160h192v-128c0 -17.7002 -14.2998 -32 -32 -32h-160zM480 288c17.7002 0 32 -14.2998 32 -32v-80c0 -8.7998 -7.2002 -16 -16 -16h-480c-8.7998 0 -16 7.2002 -16 16v80c0 17.7002 14.2998 32 32 32
+h44.0996c-6.2998 12.0996 -10.0996 25.5 -10.0996 40c0 48.5 39.5 88 88 88c41.5996 0 68.5 -21.2998 103 -68.2998c34.5 47 61.4004 68.2998 103 68.2998c48.5 0 88 -39.5 88 -88c0 -14.5 -3.90039 -27.9004 -10.0996 -40h42.0996zM153.9 288h86.0996
+c-51.5 76.7002 -66.2002 80 -86.0996 80c-22.1006 0 -40 -17.9004 -40 -40s17.8994 -40 40 -40zM360 288c22.0996 0 40 17.9004 40 40s-17.9004 40 -40 40c-20.4004 0 -34.7002 -3.5 -86.0996 -80h86.0996z" />
+    <glyph glyph-name="leaf" unicode="&#xf06c;" horiz-adv-x="576" 
+d="M546.2 438.3c19 -42.3994 29.7998 -94.3994 29.7998 -144.6c0 -172.4 -110.5 -313.2 -267.5 -324.601c-80.9004 -8.59961 -142.5 33.3008 -174.9 77.2002c-51 -42.7002 -70.3994 -87 -71.8994 -90.5996c-6.7998 -16.2002 -25.4004 -24.1006 -41.7998 -17.2998
+c-16.3008 6.69922 -24.1006 25.2998 -17.5 41.5996c23.5996 57.9004 130.199 212 381.6 212c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16c-130.6 0 -222.7 -38.7998 -286.5 -84.5c-0.700195 6.7998 -1.5 13.5 -1.5 20.5c0 106 86 192 192 192h80
+c63.4004 0 118.9 33.5996 149.9 87.5c6.69922 11.7998 22.6992 11.2998 28.2998 -1.2002z" />
+    <glyph glyph-name="fire" unicode="&#xf06d;" horiz-adv-x="384" 
+d="M216 424.14c0 -103.14 168 -125.85 168 -296.14c0 -105.87 -86.1299 -192 -192 -192s-192 86.1299 -192 192c0 58.6699 27.7998 106.84 54.5703 134.96c14.96 15.7305 41.4297 5.2002 41.4297 -16.5v-85.5098c0 -35.1699 27.9805 -64.4902 63.1504 -64.9404
+c35.7393 -0.469727 64.8496 28.3604 64.8496 63.9902c0 88 -176 96.1504 -52.1504 277.18c13.5 19.7305 44.1504 10.7607 44.1504 -13.04z" />
+    <glyph glyph-name="eye" unicode="&#xf06e;" horiz-adv-x="576" 
+d="M572.52 206.6c2.21387 -4.37793 3.46094 -9.38965 3.46094 -14.626c0 -5.2373 -1.24707 -10.1855 -3.46094 -14.5635c-54.1992 -105.771 -161.59 -177.41 -284.52 -177.41s-230.29 71.5898 -284.52 177.4c-2.21387 4.37793 -3.46094 9.38965 -3.46094 14.626
+c0 5.2373 1.24707 10.1855 3.46094 14.5635c54.1992 105.771 161.59 177.41 284.52 177.41s230.29 -71.5898 284.52 -177.4zM288 48c0.0234375 0 0.0458984 -0.000976562 0.0703125 -0.000976562c79.4365 0 143.93 64.4922 143.93 143.93v0.0712891
+c0 79.4756 -64.5244 144 -144 144s-144 -64.5244 -144 -144s64.5244 -144 144 -144zM288 288c0.0761719 0 0.160156 -0.0273438 0.237305 -0.0273438c52.8623 0 95.7803 -42.917 95.7803 -95.7793s-42.918 -95.7803 -95.7803 -95.7803s-95.7803 42.918 -95.7803 95.7803
+c0 8.68945 1.16016 17.1104 3.33301 25.1162c7.93164 -5.83594 17.7432 -9.26758 28.3359 -9.26758c26.4092 0 47.8496 21.4404 47.8496 47.8496c0 10.5938 -3.44922 20.3867 -9.28516 28.3184c8.0459 2.34277 16.541 3.66797 25.3096 3.79004z" />
+    <glyph glyph-name="eye-slash" unicode="&#xf070;" horiz-adv-x="640" 
+d="M320 48c8.91309 0.0830078 17.542 0.976562 26 2.61035l51.8896 -40.1504c-25.0195 -6.45996 -50.9795 -10.46 -77.8896 -10.46c-122.93 0 -230.29 71.5898 -284.52 177.4c-2.21387 4.37793 -3.46094 9.38965 -3.46094 14.626c0 5.2373 1.24707 10.1855 3.46094 14.5635
+c10.2393 20 22.9297 38.29 36.7197 55.5898l104.899 -81.0693c5.65039 -74.4004 67.0508 -133.11 142.9 -133.11zM633.82 -10.0996c3.76855 -2.92871 6.17676 -7.50977 6.17676 -12.6475c0 -3.69238 -1.25293 -7.09375 -3.35742 -9.80273l-19.6396 -25.2705
+c-2.92871 -3.76855 -7.50879 -6.17578 -12.6465 -6.17578c-3.69727 0 -7.10254 1.25684 -9.81348 3.36621l-588.36 454.729c-3.76562 2.92871 -6.1709 7.50781 -6.1709 12.6426c0 3.69434 1.25488 7.09863 3.36133 9.80762l19.6299 25.2705
+c2.92871 3.76855 7.50879 6.17578 12.6465 6.17578c3.69727 0 7.10254 -1.25684 9.81348 -3.36621l127.22 -98.3301c43.6846 23.8564 94.0967 37.6357 147.32 37.7002c122.93 0 230.29 -71.5898 284.52 -177.4c2.21387 -4.37793 3.46094 -9.38965 3.46094 -14.626
+c0 -5.2373 -1.24707 -10.1855 -3.46094 -14.5635c-20.2109 -39.3887 -47.6904 -73.7881 -81.25 -102.07zM450.1 131.9c8.61035 18.3203 13.9004 38.4697 13.9004 60.0996c0 0.0273438 0.00195312 0.0527344 0.00195312 0.0800781c0 79.4316 -64.4883 143.92 -143.92 143.92
+h-0.0820312c-34.6328 -0.0253906 -66.4756 -12.4902 -91.1504 -33.1104l73.6104 -56.8896c0.857422 3.20508 1.38867 6.5625 1.54004 10c-0.0185547 10.5391 -3.49023 20.3242 -9.30957 28.21c8.43164 2.46191 17.3359 3.82031 26.5576 3.82031
+c52.2998 0 94.7607 -42.46 94.7607 -94.7598c0 -0.423828 -0.00292969 -0.847656 -0.00878906 -1.27051c-0.138672 -10.377 -1.97559 -20.4014 -5.2002 -29.7197z" />
+    <glyph glyph-name="exclamation-triangle" unicode="&#xf071;" horiz-adv-x="576" 
+d="M569.517 7.9873c18.458 -31.9941 -4.71094 -71.9873 -41.5762 -71.9873h-479.887c-36.9365 0 -59.999 40.0547 -41.5771 71.9873l239.946 416.027c18.4668 32.0098 64.7197 31.9512 83.1543 0zM288 94c-25.4053 0 -46 -20.5947 -46 -46s20.5947 -46 46 -46
+s46 20.5947 46 46s-20.5947 46 -46 46zM244.327 259.346l7.41797 -136c0.34668 -6.36328 5.6084 -11.3457 11.9814 -11.3457h48.5469c6.37305 0 11.6348 4.98242 11.9814 11.3457l7.41797 136c0.375 6.87402 -5.09766 12.6543 -11.9814 12.6543h-63.3838
+c-6.88379 0 -12.3555 -5.78027 -11.9805 -12.6543z" />
+    <glyph glyph-name="plane" unicode="&#xf072;" horiz-adv-x="576" 
+d="M480 256c35.3496 0 96 -28.6504 96 -64s-60.6504 -64 -96 -64h-114.29l-105.11 -183.94c-2.84961 -4.97949 -8.14941 -8.05957 -13.8896 -8.05957h-65.5c-10.6299 0 -18.2998 10.1797 -15.3799 20.4004l49.0303 171.6h-102.86l-43.2002 -57.5996
+c-3.01953 -4.03027 -7.75977 -6.40039 -12.7998 -6.40039h-39.9902c-10.4102 0 -18.0498 9.78027 -15.5195 19.8799l31.5098 108.12l-31.5098 108.12c-2.53027 10.0996 5.10938 19.8799 15.5195 19.8799h39.9902c5.03027 0 9.78027 -2.37012 12.7998 -6.40039
+l43.2002 -57.5996h102.86l-49.0303 171.61c-2.91992 10.2197 4.75 20.3896 15.3799 20.3896h65.5c5.95117 0 11.1396 -3.23633 13.9004 -8.05957l105.1 -183.94h114.29z" />
+    <glyph glyph-name="calendar-alt" unicode="&#xf073;" horiz-adv-x="448" 
+d="M0 -16v272h448v-272c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48zM320 180v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12v40c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12zM320 52v-40
+c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12v40c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12zM192 180v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12v40c0 6.59961 -5.40039 12 -12 12h-40
+c-6.59961 0 -12 -5.40039 -12 -12zM192 52v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12v40c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12zM64 180v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12v40
+c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12zM64 52v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12v40c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12zM400 384c26.5 0 48 -21.5 48 -48v-48h-448v48
+c0 26.5 21.5 48 48 48h48v48c0 8.7998 7.2002 16 16 16h32c8.7998 0 16 -7.2002 16 -16v-48h128v48c0 8.7998 7.2002 16 16 16h32c8.7998 0 16 -7.2002 16 -16v-48h48z" />
+    <glyph glyph-name="random" unicode="&#xf074;" 
+d="M504.971 88.9707c9.37305 -9.37305 9.37305 -24.5684 0 -33.9404l-80 -79.9844c-15.0098 -15.0098 -40.9707 -4.49023 -40.9707 16.9707v39.9834h-58.7852c-3.46094 0 -6.58105 1.46484 -8.77246 3.81152l-70.5566 75.5967l53.333 57.1426l52.7812 -56.5508h32v39.9814
+c0 21.4375 25.9434 31.9971 40.9707 16.9707zM12 272c-6.62695 0 -12 5.37305 -12 12v56c0 6.62695 5.37305 12 12 12h110.785c3.46094 0 6.58203 -1.46484 8.77246 -3.81152l70.5566 -75.5967l-53.333 -57.1426l-52.7812 56.5508h-84zM384 272h-32l-220.442 -236.188
+c-2.26953 -2.43066 -5.44629 -3.81152 -8.77246 -3.81152h-110.785c-6.62695 0 -12 5.37305 -12 12v56c0 6.62695 5.37305 12 12 12h84l220.442 236.188c2.19141 2.34668 5.31152 3.81152 8.77246 3.81152h58.7852v39.9814c0 21.4365 25.9434 31.9971 40.9707 16.9697
+l80 -79.9814c9.37305 -9.37207 9.37305 -24.5674 0 -33.9404l-80 -79.9844c-15.0098 -15.0088 -40.9707 -4.48926 -40.9707 16.9707v39.9844z" />
+    <glyph glyph-name="comment" unicode="&#xf075;" 
+d="M256 416c141.4 0 256 -93.0996 256 -208s-114.6 -208 -256 -208c-38.4004 0 -74.7002 7.09961 -107.4 19.4004c-24.5996 -19.6006 -74.2998 -51.4004 -140.6 -51.4004c-3.2002 0 -6 1.7998 -7.2998 4.7998s-0.700195 6.40039 1.5 8.7002
+c0.5 0.5 42.2998 45.4004 54.7998 95.7998c-35.5996 35.7002 -57 81.1006 -57 130.7c0 114.9 114.6 208 256 208z" />
+    <glyph glyph-name="magnet" unicode="&#xf076;" 
+d="M164.07 299.9h-152.07c-6.62305 0 -12 5.37695 -12 12v80c0 19.8682 16.1309 36 36 36h104c19.8691 0 36 -16.1318 36 -36v-80c0 -0.0380859 0.000976562 -0.0751953 0.000976562 -0.112305c0 -6.5625 -5.32812 -11.8906 -11.8906 -11.8906
+c-0.0136719 0 -0.0263672 0.00292969 -0.0400391 0.00292969zM512 311.9c0 -0.00390625 0.00195312 -0.0078125 0.00195312 -0.0107422c0 -6.5625 -5.32715 -11.8906 -11.8896 -11.8906c-0.0380859 0 -0.0751953 0.000976562 -0.112305 0.000976562h-152
+c-6.62305 0 -12 5.37695 -12 12v80c0 19.8691 16.1309 36 36 36h104c19.8691 0 36 -16.1309 36 -36v-80.0996zM348 267.9h151.85c6.62305 0 12.001 -5.37598 12.001 -11.998c0 -0.0341797 0 -0.0683594 -0.000976562 -0.102539
+c-0.199219 -20.2002 -0.599609 -40.3994 0 -53.2002c0 -150.699 -134.42 -246.699 -255 -246.699s-256.75 96 -256.75 246.6c0.600586 13 0.100586 31.9004 0 53.2998v0.100586c0 6.62305 5.37695 12 12 12h151.9c6.62305 0 12 -5.37695 12 -12v-52
+c0 -127.9 160 -128.101 160 0v52c0 6.62305 5.37695 12 12 12z" />
+    <glyph glyph-name="chevron-up" unicode="&#xf077;" horiz-adv-x="448" 
+d="M240.971 317.476l194.344 -194.343c9.37207 -9.37305 9.37207 -24.5684 0 -33.9404l-22.667 -22.667c-9.35742 -9.35742 -24.5225 -9.375 -33.9014 -0.0400391l-154.746 154.02l-154.745 -154.021c-9.37891 -9.33496 -24.5439 -9.31738 -33.9014 0.0400391
+l-22.667 22.667c-9.37207 9.37305 -9.37207 24.5684 0 33.9404l194.344 194.343c9.37207 9.37305 24.5674 9.37305 33.9404 0.000976562z" />
+    <glyph glyph-name="chevron-down" unicode="&#xf078;" horiz-adv-x="448" 
+d="M207.029 66.5244l-194.344 194.344c-9.37207 9.37305 -9.37207 24.5684 0 33.9404l22.667 22.667c9.35742 9.35742 24.5225 9.375 33.9014 0.0400391l154.746 -154.021l154.745 154.021c9.37891 9.33496 24.5439 9.31738 33.9014 -0.0400391l22.667 -22.667
+c9.37207 -9.37305 9.37207 -24.5684 0 -33.9404l-194.343 -194.344c-9.37305 -9.37207 -24.5684 -9.37207 -33.9414 0z" />
+    <glyph glyph-name="retweet" unicode="&#xf079;" horiz-adv-x="640" 
+d="M629.657 104.402l-100.687 -100.687c-9.37305 -9.37207 -24.5674 -9.37207 -33.9404 0l-100.688 100.687c-9.37305 9.37305 -9.37305 24.5684 0 33.9404l10.8232 10.8232c9.56152 9.56152 25.1328 9.33984 34.4189 -0.492188l40.415 -42.792v182.118h-187.549
+c-6.62305 0 -12.626 2.68555 -16.9707 7.0293l-16 16c-15.1191 15.1201 -4.41113 40.9707 16.9707 40.9707h243.549c13.2549 0 24 -10.7451 24 -24v-222.118l40.416 42.792c9.28516 9.83105 24.8564 10.0537 34.4189 0.492188l10.8232 -10.8232
+c9.37207 -9.37207 9.37207 -24.5684 -0.000976562 -33.9404zM364.519 88.9707l16.001 -16c15.1191 -15.1201 4.41113 -40.9707 -16.9707 -40.9707h-243.549c-13.2549 0 -24 10.7451 -24 24v222.119l-40.416 -42.793c-9.28613 -9.83105 -24.8574 -10.0527 -34.4189 -0.491211
+l-10.8223 10.8223c-9.37305 9.37207 -9.37305 24.5674 0 33.9404l100.688 100.687c9.37207 9.37305 24.5674 9.37305 33.9404 0l100.687 -100.686c9.37305 -9.37207 9.37305 -24.5674 0 -33.9404l-10.8223 -10.8223c-9.5625 -9.5625 -25.1328 -9.33984 -34.4189 0.491211
+l-40.416 42.792v-182.119h187.548c6.62305 0 12.627 -2.68457 16.9707 -7.0293z" />
+    <glyph glyph-name="shopping-cart" unicode="&#xf07a;" horiz-adv-x="576" 
+d="M528.12 146.681c-2.4834 -10.9268 -12.1973 -18.6807 -23.4033 -18.6807h-293.145l6.54492 -32h268.418c15.4004 0 26.8154 -14.3008 23.4033 -29.3193l-5.51758 -24.2754c18.6914 -9.07324 31.5791 -28.2334 31.5791 -50.4053c0 -30.9277 -25.0723 -56 -56 -56
+s-56 25.0723 -56 56c0 15.6738 6.44727 29.835 16.8232 40h-209.647c10.377 -10.165 16.8242 -24.3262 16.8242 -40c0 -30.9277 -25.0723 -56 -56 -56s-56 25.0723 -56 56c0 20.7783 11.3252 38.9004 28.1309 48.5654l-70.248 343.435h-69.8828
+c-13.2549 0 -24 10.7451 -24 24v16c0 13.2549 10.7451 24 24 24h102.529c11.4004 0 21.2285 -8.02148 23.5127 -19.1904l9.16602 -44.8096h392.782c15.4004 0 26.8154 -14.3008 23.4023 -29.3193z" />
+    <glyph glyph-name="folder" unicode="&#xf07b;" 
+d="M464 320c26.5098 0 48 -21.4902 48 -48v-224c0 -26.5098 -21.4902 -48 -48 -48h-416c-26.5098 0 -48 21.4902 -48 48v288c0 26.5098 21.4902 48 48 48h160l64 -64h192z" />
+    <glyph glyph-name="folder-open" unicode="&#xf07c;" horiz-adv-x="576" 
+d="M572.694 155.907l-72.4248 -124.155c-11.0967 -19.0244 -31.6865 -31.752 -55.2803 -31.752h-399.964c-18.5234 0 -30.0645 20.0928 -20.7314 36.0928l72.4238 124.155c11.0986 19.0244 31.6875 31.752 55.2822 31.752h399.964
+c18.5234 0 30.0645 -20.0928 20.7305 -36.0928zM152 224c-34.0107 0 -65.7861 -18.25 -82.9229 -47.6279l-69.0771 -118.418v278.046c0 26.5098 21.4902 48 48 48h160l64 -64h160c26.5098 0 48 -21.4902 48 -48v-48h-328z" />
+    <glyph glyph-name="chart-bar" unicode="&#xf080;" 
+d="M332.8 128c-6.39941 0 -12.7998 6.40039 -12.7998 12.7998v134.4c0 6.39941 6.40039 12.7998 12.7998 12.7998h38.4004c6.39941 0 12.7998 -6.40039 12.7998 -12.7998v-134.4c0 -6.39941 -6.40039 -12.7998 -12.7998 -12.7998h-38.4004zM428.8 128
+c-6.39941 0 -12.7998 6.40039 -12.7998 12.7998v230.4c0 6.39941 6.40039 12.7998 12.7998 12.7998h38.4004c6.39941 0 12.7998 -6.40039 12.7998 -12.7998v-230.4c0 -6.39941 -6.40039 -12.7998 -12.7998 -12.7998h-38.4004zM140.8 128
+c-6.39941 0 -12.7998 6.40039 -12.7998 12.7998v70.4004c0 6.39941 6.40039 12.7998 12.7998 12.7998h38.4004c6.39941 0 12.7998 -6.40039 12.7998 -12.7998v-70.4004c0 -6.39941 -6.40039 -12.7998 -12.7998 -12.7998h-38.4004zM236.8 128
+c-6.39941 0 -12.7998 6.40039 -12.7998 12.7998v198.4c0 6.39941 6.40039 12.7998 12.7998 12.7998h38.4004c6.39941 0 12.7998 -6.40039 12.7998 -12.7998v-198.4c0 -6.39941 -6.40039 -12.7998 -12.7998 -12.7998h-38.4004zM496 64c8.83984 0 16 -7.16016 16 -16v-32
+c0 -8.83984 -7.16016 -16 -16 -16h-464c-17.6699 0 -32 14.3301 -32 32v336c0 8.83984 7.16016 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-304h432z" />
+    <glyph glyph-name="camera-retro" unicode="&#xf083;" 
+d="M48 416h416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48zM48 384c-8.7998 0 -16 -7.2002 -16 -16v-10c0 -3.2998 2.7002 -6 6 -6h116c3.2998 0 6 2.7002 6 6v20c0 3.2998 -2.7002 6 -6 6h-106z
+M474 288c3.2998 0 6 2.7002 6 6v74c0 8.7998 -7.2002 16 -16 16h-252.8c-2 0 -3.90039 -1 -5 -2.7002l-30.2002 -45.2998h-138c-3.2998 0 -6 -2.7002 -6 -6v-36c0 -3.2998 2.7002 -6 6 -6h436zM256 24c66.2002 0 120 53.7998 120 120s-53.7998 120 -120 120
+s-120 -53.7998 -120 -120s53.7998 -120 120 -120zM256 232c48.5 0 88 -39.5 88 -88s-39.5 -88 -88 -88s-88 39.5 -88 88s39.5 88 88 88zM208 128c8.7998 0 16 7.2002 16 16c0 17.5996 14.4004 32 32 32c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16
+c-35.2998 0 -64 -28.7002 -64 -64c0 -8.7998 7.2002 -16 16 -16z" />
+    <glyph glyph-name="key" unicode="&#xf084;" 
+d="M512 271.999c0 -97.2021 -78.7979 -175.999 -176 -175.999c-11.2197 0 -22.1904 1.06152 -32.8271 3.06934l-24.0117 -27.0146c-4.39746 -4.94727 -10.8047 -8.05469 -17.9385 -8.05469h-37.2227v-40c0 -13.2549 -10.7451 -24 -24 -24h-40v-40
+c0 -13.2549 -10.7451 -24 -24 -24h-112c-13.2549 0 -24 10.7451 -24 24v78.0586c0 6.36523 2.5293 12.4707 7.0293 16.9717l161.802 161.802c-5.72266 17.3535 -8.83105 35.8965 -8.83105 55.168c0 97.2021 78.7969 175.999 175.999 176
+c97.4893 0.000976562 176.001 -78.5107 176.001 -176.001zM336 320c0 -26.5098 21.4902 -48 48 -48s48 21.4902 48 48s-21.4902 48 -48 48s-48 -21.4902 -48 -48z" />
+    <glyph glyph-name="cogs" unicode="&#xf085;" horiz-adv-x="640" 
+d="M512.1 257l-8.19922 -14.2998c-3 -5.2998 -9.40039 -7.5 -15.1006 -5.40039c-11.7998 4.40039 -22.5996 10.7002 -32.0996 18.6006c-4.60059 3.7998 -5.7998 10.5 -2.7998 15.6992l8.19922 14.3008c-6.89941 8 -12.2998 17.2998 -15.8994 27.3994h-16.5
+c-6 0 -11.2002 4.2998 -12.2002 10.2998c-2 12 -2.09961 24.6006 0 37.1006c1 6 6.2002 10.3994 12.2002 10.3994h16.5c3.59961 10.1006 9 19.4004 15.8994 27.4004l-8.19922 14.2998c-3 5.2002 -1.90039 11.9004 2.7998 15.7002
+c9.5 7.90039 20.3994 14.2002 32.0996 18.5996c5.7002 2.10059 12.1006 -0.0996094 15.1006 -5.39941l8.19922 -14.2998c10.5 1.89941 21.2002 1.89941 31.7002 0l8.2002 14.2998c3 5.2998 9.40039 7.5 15.0996 5.39941c11.8008 -4.39941 22.6006 -10.6992 32.1006 -18.5996
+c4.59961 -3.7998 5.7998 -10.5 2.7998 -15.7002l-8.2002 -14.2998c6.90039 -8 12.2998 -17.2998 15.9004 -27.4004h16.5c6 0 11.2002 -4.2998 12.2002 -10.2998c2 -12 2.09961 -24.5996 0 -37.0996c-1 -6 -6.2002 -10.4004 -12.2002 -10.4004h-16.5
+c-3.60059 -10.0996 -9 -19.3994 -15.9004 -27.3994l8.2002 -14.3008c3 -5.19922 1.90039 -11.8994 -2.7998 -15.6992c-9.5 -7.90039 -20.4004 -14.2002 -32.1006 -18.6006c-5.69922 -2.09961 -12.0996 0.100586 -15.0996 5.40039l-8.2002 14.2998
+c-10.3994 -1.90039 -21.2002 -1.90039 -31.7002 0zM501.6 315.8c38.5 -29.5996 82.4004 14.2998 52.8008 52.7998c-38.5 29.7002 -82.4004 -14.2998 -52.8008 -52.7998zM386.3 161.9l33.7002 -16.8008c10.0996 -5.7998 14.5 -18.0996 10.5 -29.0996
+c-8.90039 -24.2002 -26.4004 -46.4004 -42.5996 -65.7998c-7.40039 -8.90039 -20.2002 -11.1006 -30.3008 -5.2998l-29.0996 16.7998c-16 -13.7002 -34.5996 -24.6006 -54.9004 -31.7002v-33.5996c0 -11.6006 -8.2998 -21.6006 -19.6992 -23.6006
+c-24.6006 -4.2002 -50.4004 -4.39941 -75.9004 0c-11.5 2 -20 11.9004 -20 23.6006v33.5996c-20.2998 7.2002 -38.9004 18 -54.9004 31.7002l-29.0996 -16.7002c-10 -5.7998 -22.9004 -3.59961 -30.2998 5.2998c-16.2002 19.4004 -33.2998 41.6006 -42.2002 65.7002
+c-4 10.9004 0.400391 23.2002 10.5 29.0996l33.2998 16.8008c-3.89941 20.8994 -3.89941 42.3994 0 63.3994l-33.2998 16.9004c-10.0996 5.7998 -14.5996 18.0996 -10.5 29c8.90039 24.2002 26 46.3994 42.2002 65.7998c7.39941 8.90039 20.2002 11.0996 30.2998 5.2998
+l29.0996 -16.7998c16 13.7002 34.6006 24.5996 54.9004 31.7002v33.7002c0 11.5 8.2002 21.5 19.5996 23.5c24.6006 4.19922 50.5 4.39941 76 0.0996094c11.5 -2 20 -11.9004 20 -23.5996v-33.6006c20.3008 -7.2002 38.9004 -18 54.9004 -31.7002l29.0996 16.8008
+c10 5.7998 22.9004 3.59961 30.3008 -5.30078c16.1992 -19.3994 33.1992 -41.5996 42.0996 -65.7998c4 -10.8994 0.0996094 -23.2002 -10 -29.0996l-33.7002 -16.7998c3.90039 -21 3.90039 -42.5 0 -63.5zM268.7 140.8c59.2002 77 -28.7002 164.9 -105.7 105.7
+c-59.2002 -77 28.7002 -164.9 105.7 -105.7zM512.1 -41.9004l-8.19922 -14.2998c-3 -5.2998 -9.40039 -7.5 -15.1006 -5.39941c-11.7998 4.39941 -22.5996 10.6992 -32.0996 18.5996c-4.60059 3.7998 -5.7998 10.5 -2.7998 15.7002l8.19922 14.2998
+c-6.89941 8 -12.2998 17.2998 -15.8994 27.4004h-16.5c-6 0 -11.2002 4.2998 -12.2002 10.2998c-2 12 -2.09961 24.5996 0 37.0996c1 6 6.2002 10.4004 12.2002 10.4004h16.5c3.59961 10.0996 9 19.3994 15.8994 27.3994l-8.19922 14.3008
+c-3 5.19922 -1.90039 11.8994 2.7998 15.6992c9.5 7.90039 20.3994 14.2002 32.0996 18.6006c5.7002 2.09961 12.1006 -0.100586 15.1006 -5.40039l8.19922 -14.2998c10.5 1.90039 21.2002 1.90039 31.7002 0l8.2002 14.2998c3 5.2998 9.40039 7.5 15.0996 5.40039
+c11.8008 -4.40039 22.6006 -10.7002 32.1006 -18.6006c4.59961 -3.7998 5.7998 -10.5 2.7998 -15.6992l-8.2002 -14.3008c6.90039 -8 12.2998 -17.2998 15.9004 -27.3994h16.5c6 0 11.2002 -4.2998 12.2002 -10.2998c2 -12 2.09961 -24.6006 0 -37.1006
+c-1 -6 -6.2002 -10.3994 -12.2002 -10.3994h-16.5c-3.60059 -10.1006 -9 -19.4004 -15.9004 -27.4004l8.2002 -14.2998c3 -5.2002 1.90039 -11.9004 -2.7998 -15.7002c-9.5 -7.90039 -20.4004 -14.2002 -32.1006 -18.5996
+c-5.69922 -2.10059 -12.0996 0.0996094 -15.0996 5.39941l-8.2002 14.2998c-10.3994 -1.89941 -21.2002 -1.89941 -31.7002 0zM501.6 17c38.5 -29.5996 82.4004 14.2998 52.8008 52.7998c-38.5 29.6006 -82.4004 -14.2998 -52.8008 -52.7998z" />
+    <glyph glyph-name="comments" unicode="&#xf086;" horiz-adv-x="576" 
+d="M416 256c0 -88.4004 -93.0996 -160 -208 -160c-41 0 -79.0996 9.2998 -111.3 25c-21.7998 -12.7002 -52.1006 -25 -88.7002 -25c-3.2002 0 -6 1.7998 -7.2998 4.7998s-0.700195 6.40039 1.5 8.7002c0.299805 0.299805 22.3994 24.2998 35.7998 54.5
+c-23.9004 26.0996 -38 57.7002 -38 92c0 88.4004 93.0996 160 208 160s208 -71.5996 208 -160zM538 36c13.4004 -30.2998 35.5 -54.2002 35.7998 -54.5c2.2002 -2.40039 2.7998 -5.7998 1.5 -8.7002c-1.2002 -2.89941 -4.09961 -4.7998 -7.2998 -4.7998
+c-36.5996 0 -66.9004 12.2998 -88.7002 25c-32.2002 -15.7998 -70.2998 -25 -111.3 -25c-86.2002 0 -160.2 40.4004 -191.7 97.9004c10.4004 -1.10059 20.9004 -1.90039 31.7002 -1.90039c132.3 0 240 86.0996 240 192c0 6.7998 -0.400391 13.5 -1.2998 20.0996
+c75.7998 -23.8994 129.3 -81.1992 129.3 -148.1c0 -34.2998 -14.0996 -66 -38 -92z" />
+    <glyph glyph-name="star-half" unicode="&#xf089;" horiz-adv-x="576" 
+d="M288 448v-439.6l-130.7 -68.6006c-23.3994 -12.2998 -50.8994 7.60059 -46.3994 33.7002l25 145.5l-105.7 103c-19 18.5 -8.5 50.7998 17.7002 54.5996l146.1 21.2002l65.2998 132.4c5.90039 11.8994 17.2998 17.7998 28.7002 17.7998z" />
+    <glyph glyph-name="thumbtack" unicode="&#xf08d;" horiz-adv-x="384" 
+d="M298.028 233.733c47.9893 -22.3135 85.9717 -62.5508 85.9727 -113.733c0 -13.2549 -10.7451 -24 -24 -24h-136v-104.007c0 -1.2832 -0.307617 -2.50293 -0.844727 -3.57812l-24 -48c-2.94727 -5.89258 -11.3701 -5.88184 -14.3115 0l-24 48
+c-0.555664 1.11133 -0.844727 2.33594 -0.844727 3.57812v104.007h-136c-13.2549 0 -24 10.7451 -24 24c0 50.7393 37.4648 91.1797 85.9717 113.733l12.2354 118.267h-42.207c-13.2549 0 -24 10.7451 -24 24v48c0 13.2549 10.7451 24 24 24h272
+c13.2549 0 24 -10.7451 24 -24v-48c0 -13.2549 -10.7451 -24 -24 -24h-42.207z" />
+    <glyph glyph-name="trophy" unicode="&#xf091;" horiz-adv-x="576" 
+d="M552 384c13.2998 0 24 -10.7002 24 -24v-56c0 -35.7002 -22.5996 -72.4004 -61.9004 -100.7c-31.3994 -22.7002 -69.6992 -37.0996 -110 -41.7002c-31.3994 -52.0996 -68.0996 -73.5996 -68.0996 -73.5996v-72h48c35.2998 0 64 -20.7002 64 -56v-12
+c0 -6.59961 -5.40039 -12 -12 -12h-296c-6.59961 0 -12 5.40039 -12 12v12c0 35.2998 28.7002 56 64 56h48v72s-36.7002 21.5 -68.0996 73.5996c-40.2002 4.60059 -78.5 19 -110 41.7002c-39.4004 28.2998 -61.9004 65 -61.9004 100.7v56c0 13.2998 10.7002 24 24 24h104v40
+c0 13.2998 10.7002 24 24 24h272c13.2998 0 24 -10.7002 24 -24v-40h104zM99.2998 255.2c12.5 -9 26.6006 -16.2002 41.7002 -21.4004c-7 25 -11.7998 53.6006 -12.7998 86.2002h-64.2002v-16c0 -11.5996 10.9004 -31.2002 35.2998 -48.7998zM512 304v16h-64.2998
+c-1 -32.5996 -5.7998 -61.2002 -12.7998 -86.2002c15.0996 5.2002 29.2998 12.4004 41.7998 21.4004c17.5996 12.7002 35.2998 32.7002 35.2998 48.7998z" />
+    <glyph glyph-name="upload" unicode="&#xf093;" 
+d="M296 64h-80c-13.2998 0 -24 10.7002 -24 24v168h-87.7002c-17.7998 0 -26.7002 21.5 -14.0996 34.0996l152.1 152.2c7.5 7.5 19.7998 7.5 27.2998 0l152.2 -152.2c12.6006 -12.5996 3.7002 -34.0996 -14.0996 -34.0996h-87.7002v-168c0 -13.2998 -10.7002 -24 -24 -24z
+M512 72v-112c0 -13.2998 -10.7002 -24 -24 -24h-464c-13.2998 0 -24 10.7002 -24 24v112c0 13.2998 10.7002 24 24 24h136v-8c0 -30.9004 25.0996 -56 56 -56h80c30.9004 0 56 25.0996 56 56v8h136c13.2998 0 24 -10.7002 24 -24zM388 -16c0 11 -9 20 -20 20s-20 -9 -20 -20
+s9 -20 20 -20s20 9 20 20zM452 -16c0 11 -9 20 -20 20s-20 -9 -20 -20s9 -20 20 -20s20 9 20 20z" />
+    <glyph glyph-name="lemon" unicode="&#xf094;" 
+d="M489.038 425.037c23.0938 -23.0938 28.8916 -54.3906 16.833 -75.0928c-34.3115 -58.9043 53.0762 -181.249 -86.7461 -321.071s-262.167 -52.4326 -321.068 -86.7432c-20.7031 -12.0586 -52 -6.2627 -75.0947 16.832c-23.0928 23.0938 -28.8916 54.3906 -16.833 75.0928
+c34.3125 58.9043 -53.0781 181.247 86.7451 321.07s262.167 52.4336 321.073 86.7461c20.7012 12.0586 51.9971 6.25879 75.0908 -16.834zM243.881 352.478c8.57227 2.14355 13.7832 10.8291 11.6416 19.4023c-2.14258 8.57324 -10.8281 13.7852 -19.4033 11.6426
+c-69.8027 -17.4521 -154.218 -101.949 -171.643 -171.643c-2.1416 -8.57324 3.07031 -17.2588 11.6426 -19.4033c1.30273 -0.324219 2.6084 -0.480469 3.89258 -0.480469c7.16895 0 13.6943 4.85352 15.5117 12.124c14.5498 58.2031 90.1689 133.811 148.357 148.357z" />
+    <glyph glyph-name="phone" unicode="&#xf095;" 
+d="M493.4 423.4c10.8994 -2.5 18.5996 -12.2002 18.5996 -23.4004c0 -256.5 -207.9 -464 -464 -464c-11.2998 0 -20.9004 7.7998 -23.4004 18.5996l-24 104c-2.59961 11.3008 3.30078 22.9004 14 27.6006l112 48c9.80078 4.2002 21.2002 1.39941 28 -6.90039
+l49.6006 -60.5996c78.2998 36.7002 141.2 100.5 177.2 177.2l-60.6006 49.5996c-8.2998 6.7002 -11.0996 18.2002 -6.89941 28l48 112c4.59961 10.5996 16.1992 16.5 27.5 13.9004z" />
+    <glyph glyph-name="phone-square" unicode="&#xf098;" horiz-adv-x="448" 
+d="M400 416c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h352zM94 32c160.055 0 290 129.708 290 290c0 7.11621 -4.97559 13.0801 -11.6279 14.6143l-65 14.998
+c-1.08691 0.250977 -2.20312 0.394531 -3.36621 0.394531c-6.18457 0 -11.501 -3.75195 -13.7939 -9.10156l-30 -69.998c-0.775391 -1.81055 -1.22266 -3.81055 -1.22266 -5.90332c0 -4.68066 2.14844 -8.86328 5.51172 -11.6152l37.8857 -30.9971
+c-22.4834 -47.9219 -61.8369 -87.8164 -110.78 -110.779l-30.9971 37.8848c-2.75195 3.36328 -6.94043 5.49414 -11.6211 5.49414c-2.09277 0 -4.08691 -0.429688 -5.89746 -1.20508l-69.998 -29.999c-5.34961 -2.29297 -9.08984 -7.59375 -9.08984 -13.7783
+c0 -1.16309 0.131836 -2.29492 0.382812 -3.38184l14.998 -65c1.55957 -6.75391 7.58301 -11.627 14.6162 -11.627z" />
+    <glyph glyph-name="unlock" unicode="&#xf09c;" horiz-adv-x="448" 
+d="M400 192c26.5 0 48 -21.5 48 -48v-160c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v160c0 26.5 21.5 48 48 48h24v102.5c0 84 67.5 153.2 151.5 153.5s152.5 -68 152.5 -152v-16c0 -13.2998 -10.7002 -24 -24 -24h-32c-13.2998 0 -24 10.7002 -24 24v16
+c0 39.9004 -32.7002 72.4004 -72.7002 72c-39.5996 -0.400391 -71.2998 -33.2998 -71.2998 -72.9004v-103.1h248z" />
+    <glyph glyph-name="credit-card" unicode="&#xf09d;" horiz-adv-x="576" 
+d="M0 16v176h576v-176c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48zM192 84v-40c0 -6.59961 5.40039 -12 12 -12h136c6.59961 0 12 5.40039 12 12v40c0 6.59961 -5.40039 12 -12 12h-136c-6.59961 0 -12 -5.40039 -12 -12zM64 84v-40
+c0 -6.59961 5.40039 -12 12 -12h72c6.59961 0 12 5.40039 12 12v40c0 6.59961 -5.40039 12 -12 12h-72c-6.59961 0 -12 -5.40039 -12 -12zM576 368v-48h-576v48c0 26.5 21.5 48 48 48h480c26.5 0 48 -21.5 48 -48z" />
+    <glyph glyph-name="rss" unicode="&#xf09e;" horiz-adv-x="448" 
+d="M128.081 32.041c0 -35.3691 -28.6719 -64.041 -64.041 -64.041s-64.04 28.6719 -64.04 64.041s28.6719 64.041 64.041 64.041s64.04 -28.6729 64.04 -64.041zM303.741 -15.209c0.494141 -9.13477 -6.84668 -16.791 -15.9951 -16.79h-48.0693
+c-8.41406 0 -15.4707 6.49023 -16.0176 14.8867c-7.29883 112.07 -96.9404 201.488 -208.772 208.772c-8.39648 0.545898 -14.8867 7.60254 -14.8867 16.0176v48.0693c0 9.14746 7.65625 16.4883 16.791 15.9941c154.765 -8.36328 278.596 -132.351 286.95 -286.95z
+M447.99 -15.4971c0.324219 -9.03027 -6.97168 -16.5029 -16.0049 -16.5039h-48.0684c-8.62598 0 -15.6455 6.83496 -15.999 15.4531c-7.83789 191.148 -161.286 344.626 -352.465 352.465c-8.61816 0.354492 -15.4531 7.37402 -15.4531 15.999v48.0684
+c0 9.03418 7.47266 16.3301 16.5029 16.0059c234.962 -8.43555 423.093 -197.667 431.487 -431.487z" />
+    <glyph glyph-name="hdd" unicode="&#xf0a0;" horiz-adv-x="576" 
+d="M576 144v-96c0 -26.5098 -21.4902 -48 -48 -48h-480c-26.5098 0 -48 21.4902 -48 48v96c0 26.5098 21.4902 48 48 48h480c26.5098 0 48 -21.4902 48 -48zM528 224h-480c-0.0234375 0 -0.0996094 -0.0361328 -0.124023 -0.0361328
+c-10.8613 0 -21.2168 -2.18066 -30.6533 -6.12891l96.5283 144.791c8.60742 12.9102 23.2725 21.374 39.9385 21.374h268.621c16.667 0 31.332 -8.46387 39.9395 -21.374l96.5273 -144.791c-9.43652 3.94824 -19.8447 6.16504 -30.7061 6.16504h-0.0712891zM480 128
+c-17.6729 0 -32 -14.3271 -32 -32s14.3271 -32 32 -32s32 14.3271 32 32s-14.3271 32 -32 32zM384 128c-17.6729 0 -32 -14.3271 -32 -32s14.3271 -32 32 -32s32 14.3271 32 32s-14.3271 32 -32 32z" />
+    <glyph glyph-name="bullhorn" unicode="&#xf0a1;" horiz-adv-x="576" 
+d="M576 208c0 -23.6299 -12.9502 -44.04 -32.0098 -55.1299v-152.87c0 -9.21973 -7.08008 -32 -32 -32c-7.5459 0.00683594 -14.5078 2.64062 -19.9805 7.01953l-85.0293 68.0303c-42.7002 34.1406 -96.3203 52.9502 -150.98 52.9502h-28.0801
+c-2.79004 -10.21 -4.41016 -20.8896 -4.41016 -32c0 -29.0801 9.75 -55.9199 26.1504 -77.4404c15.79 -20.7197 0.149414 -50.5596 -25.9004 -50.5596h-74.2793c-11.8809 0 -23.2109 6.37012 -28.4004 17.0596c-16.2998 33.5908 -25.5605 71.1709 -25.5605 110.94
+c0 10.8604 0.790039 21.5195 2.18066 32h-33.7002c-35.3496 0 -64 28.6504 -64 64v96c0 35.3496 28.6504 64 64 64h192c54.6602 0 108.28 18.8096 150.99 52.9502l85.0293 68.0303c5.79004 4.63965 12.8604 7.01953 19.9805 7.01953c25.0195 0 32 -23.2598 32 -32.0098
+v-152.87c19.0498 -11.0801 32 -31.4902 32 -55.1201zM480 66.5801v282.84l-33.0498 -26.4395c-54 -43.2002 -121.83 -66.9805 -190.95 -66.9805v-96c69.1201 0 136.95 -23.7803 190.95 -66.9805z" />
+    <glyph glyph-name="certificate" unicode="&#xf0a3;" 
+d="M458.622 192.08l45.9844 -45.0039c13.7012 -12.9727 7.32227 -36.0371 -10.6641 -40.3389l-62.6504 -15.9902l17.6611 -62.0146c4.99023 -17.834 -11.8252 -34.665 -29.6611 -29.6719l-61.9941 17.667l-15.9834 -62.6709
+c-4.33887 -18.1533 -27.8252 -24.1553 -40.3252 -10.668l-44.9893 46.001l-44.9912 -46.001c-12.6289 -13.3496 -35.8857 -7.90625 -40.3252 10.668l-15.9834 62.6709l-61.9941 -17.667c-17.832 -4.99121 -34.6523 11.833 -29.6611 29.6719l17.6611 62.0146
+l-62.6504 15.9902c-17.9795 4.2998 -24.3721 27.3613 -10.6641 40.3389l45.9854 45.0039l-45.9854 45.0049c-13.7012 12.9707 -7.32227 36.0371 10.665 40.3379l62.6504 15.9902l-17.6611 62.0146c-4.99023 17.834 11.8242 34.665 29.6611 29.6709l61.9951 -17.667
+l15.9834 62.6709c4.27832 17.9023 27.6953 24.0195 40.3252 10.6689l44.9893 -46.3418l44.9902 46.3428c12.7744 13.5039 36.0947 7.03027 40.3252 -10.6689l15.9834 -62.6709l61.9941 17.667c17.832 4.99219 34.6523 -11.833 29.6611 -29.6709l-17.6611 -62.0146
+l62.6504 -15.9902c17.9795 -4.2998 24.3721 -27.3623 10.6641 -40.3389z" />
+    <glyph glyph-name="hand-point-right" unicode="&#xf0a4;" 
+d="M512 248.348c0 -23.625 -20.6504 -43.8252 -44.7998 -43.8252h-99.8516c16.3408 -17.0488 18.3467 -49.7666 -6.29883 -70.9443c14.2881 -22.8291 2.14746 -53.0176 -16.4502 -62.3154c8.97461 -49.1406 -21.9453 -71.2627 -72.5996 -71.2627
+c-2.74609 0 -13.2764 0.203125 -16 0.195312c-61.9707 -0.167969 -76.8936 31.0645 -123.731 38.3145c-11.6729 1.80762 -20.2686 11.8916 -20.2686 23.7041v171.525l0.00195312 0.000976562c0.0107422 18.3662 10.6074 35.8887 28.4639 43.8447
+c28.8857 12.9941 95.4131 49.0381 107.534 77.3232c7.79688 18.1934 21.3838 29.084 40 29.0918c34.2217 0.0136719 57.752 -35.0977 44.1191 -66.9082c-3.58301 -8.3584 -8.3125 -16.6699 -14.1533 -24.918h149.234c23.4502 0 44.7998 -20.543 44.7998 -43.8262zM96 248
+v-192c0 -13.2549 -10.7451 -24 -24 -24h-48c-13.2549 0 -24 10.7451 -24 24v192c0 13.2549 10.7451 24 24 24h48c13.2549 0 24 -10.7451 24 -24zM68 80c0 11.0459 -8.9541 20 -20 20s-20 -8.9541 -20 -20s8.9541 -20 20 -20s20 8.9541 20 20z" />
+    <glyph glyph-name="hand-point-left" unicode="&#xf0a5;" 
+d="M44.7998 292.174h149.234c-5.84082 8.24805 -10.5703 16.5586 -14.1533 24.918c-13.6328 31.8105 9.89746 66.9219 44.1191 66.9082c18.6162 -0.0078125 32.2031 -10.8975 40 -29.0918c12.1221 -28.2861 78.6484 -64.3291 107.534 -77.3232
+c17.8564 -7.95605 28.4531 -25.4785 28.4639 -43.8447l0.00195312 -0.000976562v-171.526c0 -11.8115 -8.5957 -21.8965 -20.2686 -23.7031c-46.8379 -7.25 -61.7607 -38.4824 -123.731 -38.3145c-2.72363 0.00683594 -13.2539 -0.195312 -16 -0.195312
+c-50.6543 0 -81.5742 22.1221 -72.5996 71.2627c-18.5977 9.29688 -30.7383 39.4863 -16.4502 62.3154c-24.6455 21.1768 -22.6396 53.8955 -6.29883 70.9443h-99.8516c-24.1494 0 -44.7998 20.2002 -44.7998 43.8252c0 23.2832 21.3496 43.8262 44.7998 43.8262zM440 272
+h48c13.2549 0 24 -10.7451 24 -24v-192c0 -13.2549 -10.7451 -24 -24 -24h-48c-13.2549 0 -24 10.7451 -24 24v192c0 13.2549 10.7451 24 24 24zM464 60c11.0459 0 20 8.9541 20 20s-8.9541 20 -20 20s-20 -8.9541 -20 -20s8.9541 -20 20 -20z" />
+    <glyph glyph-name="hand-point-up" unicode="&#xf0a6;" horiz-adv-x="384" 
+d="M135.652 448c23.625 0 43.8252 -20.6504 43.8252 -44.7998v-99.8516c17.0488 16.3408 49.7666 18.3467 70.9443 -6.29883c22.8291 14.2881 53.0176 2.14746 62.3154 -16.4502c49.1406 8.97461 71.2627 -21.9453 71.2627 -72.5996
+c0 -2.74609 -0.203125 -13.2764 -0.195312 -16c0.167969 -61.9707 -31.0645 -76.8936 -38.3145 -123.731c-1.80762 -11.6729 -11.8916 -20.2686 -23.7041 -20.2686h-171.525l-0.000976562 0.00195312c-18.3662 0.0107422 -35.8887 10.6074 -43.8447 28.4639
+c-12.9941 28.8857 -49.0381 95.4121 -77.3232 107.534c-18.1943 7.79688 -29.084 21.3838 -29.0918 40c-0.0136719 34.2217 35.0977 57.752 66.9082 44.1191c8.3584 -3.58301 16.6699 -8.3125 24.918 -14.1533v149.234c0 23.4502 20.543 44.7998 43.8262 44.7998zM136 32
+h192c13.2549 0 24 -10.7451 24 -24v-48c0 -13.2549 -10.7451 -24 -24 -24h-192c-13.2549 0 -24 10.7451 -24 24v48c0 13.2549 10.7451 24 24 24zM304 4c-11.0459 0 -20 -8.9541 -20 -20s8.9541 -20 20 -20s20 8.9541 20 20s-8.9541 20 -20 20z" />
+    <glyph glyph-name="hand-point-down" unicode="&#xf0a7;" horiz-adv-x="384" 
+d="M91.8262 -19.2002v149.234c-8.24805 -5.84082 -16.5586 -10.5703 -24.918 -14.1533c-31.8105 -13.6328 -66.9219 9.89746 -66.9082 44.1191c0.0078125 18.6162 10.8975 32.2031 29.0918 40c28.2861 12.1221 64.3291 78.6484 77.3232 107.534
+c7.95605 17.8564 25.4785 28.4531 43.8447 28.4639l0.000976562 0.00195312h171.526c11.8115 0 21.8965 -8.5957 23.7031 -20.2686c7.25 -46.8379 38.4824 -61.7607 38.3145 -123.731c-0.00683594 -2.72363 0.195312 -13.2539 0.195312 -16
+c0 -50.6543 -22.1221 -81.5742 -71.2627 -72.5996c-9.29688 -18.5977 -39.4863 -30.7383 -62.3154 -16.4502c-21.1768 -24.6455 -53.8955 -22.6396 -70.9443 -6.29883v-99.8516c0 -24.1494 -20.2002 -44.7998 -43.8252 -44.7998
+c-23.2832 0 -43.8262 21.3496 -43.8262 44.7998zM112 376v48c0 13.2549 10.7451 24 24 24h192c13.2549 0 24 -10.7451 24 -24v-48c0 -13.2549 -10.7451 -24 -24 -24h-192c-13.2549 0 -24 10.7451 -24 24zM324 400c0 11.0459 -8.9541 20 -20 20s-20 -8.9541 -20 -20
+s8.9541 -20 20 -20s20 8.9541 20 20z" />
+    <glyph glyph-name="arrow-circle-left" unicode="&#xf0a8;" 
+d="M256 -56c-137 0 -248 111 -248 248s111 248 248 248s248 -111 248 -248s-111 -248 -248 -248zM284.9 87.5996l-75.5 72.4004h182.6c13.2998 0 24 10.7002 24 24v16c0 13.2998 -10.7002 24 -24 24h-182.6l75.5 72.4004c9.69922 9.2998 9.89941 24.7998 0.399414 34.2998
+l-11 10.8994c-9.39941 9.40039 -24.5996 9.40039 -33.8994 0l-132.7 -132.6c-9.40039 -9.40039 -9.40039 -24.5996 0 -33.9004l132.7 -132.699c9.39941 -9.40039 24.5996 -9.40039 33.8994 0l11 10.8994c9.5 9.5 9.2998 25 -0.399414 34.2998z" />
+    <glyph glyph-name="arrow-circle-right" unicode="&#xf0a9;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM227.1 296.4l75.5 -72.4004h-182.6c-13.2998 0 -24 -10.7002 -24 -24v-16c0 -13.2998 10.7002 -24 24 -24h182.6l-75.5 -72.4004
+c-9.69922 -9.2998 -9.89941 -24.7998 -0.399414 -34.2998l11 -10.8994c9.39941 -9.40039 24.5996 -9.40039 33.8994 0l132.7 132.6c9.40039 9.40039 9.40039 24.5996 0 33.9004l-132.7 132.8c-9.39941 9.39941 -24.5996 9.39941 -33.8994 0l-11 -10.9004
+c-9.5 -9.59961 -9.2998 -25.0996 0.399414 -34.3994z" />
+    <glyph glyph-name="arrow-circle-up" unicode="&#xf0aa;" 
+d="M8 192c0 137 111 248 248 248s248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248zM151.6 163.1l72.4004 75.5v-182.6c0 -13.2998 10.7002 -24 24 -24h16c13.2998 0 24 10.7002 24 24v182.6l72.4004 -75.5c9.2998 -9.69922 24.7998 -9.89941 34.2998 -0.399414
+l10.8994 11c9.40039 9.39941 9.40039 24.5996 0 33.8994l-132.6 132.7c-9.40039 9.40039 -24.5996 9.40039 -33.9004 0l-132.8 -132.7c-9.39941 -9.39941 -9.39941 -24.5996 0 -33.8994l10.9004 -11c9.59961 -9.5 25.0996 -9.2998 34.3994 0.399414z" />
+    <glyph glyph-name="arrow-circle-down" unicode="&#xf0ab;" 
+d="M504 192c0 -137 -111 -248 -248 -248s-248 111 -248 248s111 248 248 248s248 -111 248 -248zM360.4 220.9l-72.4004 -75.5v182.6c0 13.2998 -10.7002 24 -24 24h-16c-13.2998 0 -24 -10.7002 -24 -24v-182.6l-72.4004 75.5
+c-9.2998 9.69922 -24.7998 9.89941 -34.2998 0.399414l-10.8994 -11c-9.40039 -9.39941 -9.40039 -24.5996 0 -33.8994l132.6 -132.7c9.40039 -9.40039 24.5996 -9.40039 33.9004 0l132.699 132.7c9.40039 9.39941 9.40039 24.5996 0 33.8994l-10.8994 11
+c-9.5 9.5 -25 9.2998 -34.2998 -0.399414z" />
+    <glyph glyph-name="globe" unicode="&#xf0ac;" horiz-adv-x="496" 
+d="M336.5 288h-177c14.5 89.2998 48.7002 152 88.5 152s74 -62.7002 88.5 -152zM152 192c0 22.2002 1.2002 43.5 3.2998 64h185.3c2.10059 -20.5 3.30078 -41.7998 3.30078 -64s-1.2002 -43.5 -3.30078 -64h-185.3c-2.09961 20.5 -3.2998 41.7998 -3.2998 64zM476.7 288
+h-108c-8.7998 56.9004 -25.6006 107.8 -50 141.6c71.5 -21.1992 129.399 -73.6992 158 -141.6zM177.2 429.6c-24.4004 -33.7998 -41.2002 -84.6992 -49.9004 -141.6h-108c28.5 67.9004 86.5 120.4 157.9 141.6zM487.4 256c5.39941 -20.5 8.5 -41.7998 8.5 -64
+s-3.10059 -43.5 -8.60059 -64h-114.6c2.09961 21 3.2998 42.5 3.2998 64s-1.2002 43 -3.2998 64h114.7zM120 192c0 -21.5 1.2002 -43 3.2002 -64h-114.601c-5.39941 20.5 -8.59961 41.7998 -8.59961 64s3.2002 43.5 8.59961 64h114.7
+c-2.09961 -21 -3.2998 -42.5 -3.2998 -64zM159.5 96h177c-14.5 -89.2998 -48.7002 -152 -88.5 -152s-74 62.7002 -88.5 152zM318.8 -45.5996c24.4004 33.7998 41.2002 84.6992 50 141.6h108c-28.5996 -67.9004 -86.5996 -120.4 -158 -141.6zM19.2998 96h108
+c8.7998 -56.9004 25.6006 -107.8 50 -141.6c-71.5 21.1992 -129.399 73.6992 -158 141.6z" />
+    <glyph glyph-name="wrench" unicode="&#xf0ad;" 
+d="M507.73 338.9c11.7891 -47.4102 -0.84082 -99.6602 -37.9102 -136.73c-39.9004 -39.9004 -97.25 -50.9297 -147.37 -34.2197l-213.21 -213.21c-24.9902 -24.9902 -65.5098 -24.9902 -90.5 0s-24.9902 65.5098 0 90.5l213.39 213.39
+c-16.5 50.1006 -5.58984 107.561 34.0498 147.2c37.0303 37.0195 89.2002 49.6699 136.58 37.9297c9.08984 -2.25977 12.2803 -13.54 5.66016 -20.1602l-74.3604 -74.3594l11.3105 -67.8799l67.8799 -11.3105l74.3604 74.3604
+c6.58008 6.58008 17.8799 3.51953 20.1201 -5.50977zM64 -24c13.25 0 24 10.75 24 24c0 13.2598 -10.75 24 -24 24s-24 -10.7402 -24 -24c0 -13.25 10.75 -24 24 -24z" />
+    <glyph glyph-name="tasks" unicode="&#xf0ae;" 
+d="M139.61 412.5l17 -16.5c2.13281 -2.18066 3.44922 -5.16797 3.44922 -8.45605c0 -3.33496 -1.35352 -6.35547 -3.54004 -8.54395l-72.1992 -72.1904l-15.5898 -15.6191c-2.29297 -2.17969 -5.39941 -3.51758 -8.80859 -3.51758
+c-3.41016 0 -6.50977 1.33789 -8.80176 3.51758l-47.5898 47.3994c-2.18066 2.17383 -3.53125 5.18262 -3.53125 8.50195c0 3.31836 1.35059 6.3252 3.53125 8.49805l15.7002 15.7197c2.17285 2.18164 5.18164 3.53125 8.50098 3.53125s6.3252 -1.34961 8.49902 -3.53125
+l22.6992 -22.1191l63.6807 63.3096c2.17285 2.18066 5.18262 3.53125 8.50098 3.53125c3.31934 0 6.3252 -1.35059 8.49902 -3.53125zM139.61 253.31l16.9795 -17c2.125 -2.16504 3.43652 -5.13574 3.43652 -8.40625c0 -3.31641 -1.34863 -6.32031 -3.52637 -8.49316
+l-72.2002 -72.2197l-15.7002 -15.6904c-2.29004 -2.17871 -5.39551 -3.5166 -8.80273 -3.5166c-3.4082 0 -6.50586 1.33789 -8.79688 3.5166l-47.4697 47.5c-2.18066 2.17285 -3.53125 5.18262 -3.53125 8.50195c0 3.31836 1.35059 6.3252 3.53125 8.49805l15.7002 15.6904
+c2.17285 2.18066 5.18164 3.53125 8.50098 3.53125s6.3252 -1.35059 8.49902 -3.53125l22.6992 -22.1006l63.6807 63.7197c2.17285 2.18164 5.18262 3.53125 8.50098 3.53125c3.31934 0 6.3252 -1.34961 8.49902 -3.53125zM64 80c26.4922 0 48 -21.5078 48 -48
+s-21.5078 -48 -48 -48c-26.4697 0 -48.5898 21.5 -48.5898 48s22.0996 48 48.5898 48zM496 64c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-288c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h288zM496 384
+c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-288c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h288zM496 224c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-288c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h288z" />
+    <glyph glyph-name="filter" unicode="&#xf0b0;" 
+d="M487.976 448c21.3623 0 32.0459 -25.8965 16.9717 -40.9707l-184.947 -184.971v-262.039c0 -19.5127 -21.9805 -30.71 -37.7627 -19.6611l-80 55.9795c-6.41602 4.49219 -10.2373 11.8311 -10.2373 19.6621v206.059l-184.942 184.971
+c-15.1045 15.1045 -4.34766 40.9707 16.9707 40.9707h463.947z" />
+    <glyph glyph-name="briefcase" unicode="&#xf0b1;" 
+d="M320 112v48h192v-144c0 -25.5996 -22.4004 -48 -48 -48h-416c-25.5996 0 -48 22.4004 -48 48v144h192v-48c0 -8.83984 7.16016 -16 16 -16h96c8.83984 0 16 7.16016 16 16zM464 320c25.5996 0 48 -22.4004 48 -48v-80h-512v80c0 25.5996 22.4004 48 48 48h80v48
+c0 25.5996 22.4004 48 48 48h160c25.5996 0 48 -22.4004 48 -48v-48h80zM320 320v32h-128v-32h128z" />
+    <glyph glyph-name="arrows-alt" unicode="&#xf0b2;" 
+d="M352.201 22.2246l-79.1963 -79.1953c-9.37305 -9.37305 -24.5684 -9.37305 -33.9404 0l-79.1963 79.1953c-15.1191 15.1191 -4.41113 40.9717 16.9707 40.9707h51.1621l-0.000976562 100.805h-100.804v-51.1621c0 -21.3818 -25.8516 -32.0898 -40.9717 -16.9707
+l-79.1953 79.1963c-9.37305 9.37207 -9.37305 24.5684 0 33.9404l79.1953 79.1963c15.1191 15.1191 40.9717 4.41113 40.9717 -16.9717v-51.2285h100.804v100.804h-51.2305c-21.3818 0 -32.0898 25.8516 -16.9707 40.9717l79.1963 79.1953
+c9.37305 9.37305 24.5684 9.37305 33.9404 0l79.1963 -79.1953c15.1191 -15.1191 4.41113 -40.9717 -16.9707 -40.9717h-51.1621v-100.804h100.804v51.1621c0 21.3818 25.8516 32.0898 40.9707 16.9707l79.1953 -79.1963c9.37305 -9.37207 9.37305 -24.5684 0 -33.9404
+l-79.1953 -79.1963c-15.1191 -15.1191 -40.9717 -4.41113 -40.9707 16.9717v51.2285h-100.803v-100.804h51.2305c21.3818 0 32.0898 -25.8516 16.9707 -40.9717z" />
+    <glyph glyph-name="users" unicode="&#xf0c0;" horiz-adv-x="640" 
+d="M96 224c-35.2998 0 -64 28.7002 -64 64s28.7002 64 64 64s64 -28.7002 64 -64s-28.7002 -64 -64 -64zM544 224c-35.2998 0 -64 28.7002 -64 64s28.7002 64 64 64s64 -28.7002 64 -64s-28.7002 -64 -64 -64zM576 192c35.2998 0 64 -28.7002 64 -64v-32
+c0 -17.7002 -14.2998 -32 -32 -32h-66c-6.2002 47.4004 -34.7998 87.2998 -75.0996 109.4c11.5996 11.5 27.5 18.5996 45.0996 18.5996h64zM320 192c-61.9004 0 -112 50.0996 -112 112s50.0996 112 112 112s112 -50.0996 112 -112s-50.0996 -112 -112 -112zM396.8 160
+c63.6006 0 115.2 -51.5996 115.2 -115.2v-28.7998c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v28.7998c0 63.6006 51.5996 115.2 115.2 115.2h8.2998c20.9004 -10 43.9004 -16 68.5 -16s47.7002 6 68.5 16h8.2998zM173.1 173.4
+c-40.2998 -22.1006 -68.8994 -62 -75.1992 -109.4h-65.9004c-17.7002 0 -32 14.2998 -32 32v32c0 35.2998 28.7002 64 64 64h64c17.5996 0 33.5 -7.09961 45.0996 -18.5996z" />
+    <glyph glyph-name="link" unicode="&#xf0c1;" 
+d="M326.612 262.609c59.7471 -59.8096 58.9268 -155.698 0.359375 -214.591c-0.109375 -0.119141 -0.239258 -0.25 -0.359375 -0.369141l-67.2002 -67.2002c-59.2705 -59.2705 -155.699 -59.2627 -214.96 0c-59.2705 59.2598 -59.2705 155.7 0 214.96l37.1055 37.1055
+c9.84082 9.84082 26.7861 3.30078 27.2939 -10.6055c0.648438 -17.7227 3.82617 -35.5273 9.69043 -52.7207c1.98633 -5.82227 0.567383 -12.2627 -3.7832 -16.6123l-13.0869 -13.0869c-28.0254 -28.0264 -28.9053 -73.6602 -1.15527 -101.96
+c28.0244 -28.5791 74.0859 -28.749 102.325 -0.510742l67.2002 67.1904c28.1914 28.1914 28.0732 73.7568 0 101.83c-3.70117 3.69434 -7.42871 6.56348 -10.3408 8.56934c-4.05078 2.78125 -6.74707 7.37402 -6.94727 12.6055
+c-0.395508 10.5674 3.34766 21.4561 11.6982 29.8057l21.0537 21.0557c5.52148 5.52051 14.1826 6.19922 20.584 1.73047c7.38574 -5.15723 14.1709 -10.8447 20.5225 -17.1963zM467.547 403.551c59.2705 -59.2598 59.2705 -155.7 -0.000976562 -214.959l-37.1055 -37.1055
+c-9.84082 -9.83984 -26.7852 -3.30078 -27.2939 10.6055c-0.648438 17.7227 -3.82617 35.5273 -9.69043 52.7217c-1.98633 5.82129 -0.567383 12.2617 3.7832 16.6113l13.0869 13.0869c28.0264 28.0264 28.9053 73.6602 1.15527 101.96
+c-28.0254 28.5791 -74.0869 28.749 -102.325 0.510742l-67.2002 -67.1904c-28.1914 -28.1914 -28.0732 -73.7568 0 -101.83c3.70117 -3.69434 7.42871 -6.56348 10.3408 -8.56934c4.05078 -2.78125 6.74707 -7.37402 6.94727 -12.6055
+c0.395508 -10.5674 -3.34766 -21.4561 -11.6982 -29.8057l-21.0537 -21.0557c-5.52051 -5.51953 -14.1826 -6.19922 -20.584 -1.73047c-7.38574 5.15625 -14.1699 10.8447 -20.5215 17.1953c-59.7471 59.8096 -58.9258 155.698 -0.359375 214.591
+c0.109375 0.119141 0.239258 0.25 0.359375 0.369141l67.2002 67.2002c59.2705 59.2705 155.699 59.2627 214.96 0z" />
+    <glyph glyph-name="cloud" unicode="&#xf0c2;" horiz-adv-x="640" 
+d="M537.6 221.4c58.4004 -11.8008 102.4 -63.5 102.4 -125.4c0 -70.7002 -57.2998 -128 -128 -128h-368c-79.5 0 -144 64.5 -144 144c0 62.7998 40.2002 116.2 96.2002 135.9c-0.100586 2.69922 -0.200195 5.39941 -0.200195 8.09961c0 88.4004 71.5996 160 160 160
+c59.2998 0 111 -32.2002 138.7 -80.2002c15.2002 10.2002 33.5996 16.2002 53.2998 16.2002c53 0 96 -43 96 -96c0 -12.2002 -2.2998 -23.9004 -6.40039 -34.5996z" />
+    <glyph glyph-name="flask" unicode="&#xf0c3;" horiz-adv-x="448" 
+d="M437.2 44.5c29.2998 -47 -4.40039 -108.5 -60.1006 -108.5h-306.199c-55.6006 0 -89.4004 61.4004 -60.1006 108.5l117.2 188.5v151h-8c-13.2998 0 -24 10.7002 -24 24v16c0 13.2998 10.7002 24 24 24h208c13.2998 0 24 -10.7002 24 -24v-16
+c0 -13.2998 -10.7002 -24 -24 -24h-8v-151zM137.9 128h172l-48.2002 77.5996c-3.60059 5.2002 -5.7998 11.5 -5.7998 18.4004v160h-64v-160c0 -6.7998 -2.10059 -13.2002 -5.80078 -18.4004z" />
+    <glyph glyph-name="cut" unicode="&#xf0c4;" horiz-adv-x="448" 
+d="M278.06 192l166.421 -166.43c4.68945 -4.69043 4.68945 -12.29 0 -16.9707c-32.8008 -32.7998 -85.9902 -32.7998 -118.79 0l-115.511 115.521l-24.8594 -24.8604c4.30957 -10.9199 6.67969 -22.8096 6.67969 -35.2598c0 -53.0195 -42.9805 -96 -96 -96
+s-96 42.9805 -96 96s42.9805 96 96 96c4.53027 0 8.99023 -0.320312 13.3604 -0.929688l32.9297 32.9297l-32.9297 32.9297c-4.37012 -0.609375 -8.82031 -0.929688 -13.3604 -0.929688c-53.0195 0 -96 42.9805 -96 96s42.9805 96 96 96s96 -42.9805 96 -96
+c0 -12.4502 -2.37012 -24.3398 -6.67969 -35.2598l24.8594 -24.8604l115.511 115.521c32.7998 32.7998 85.9893 32.7998 118.79 0c4.68945 -4.68066 4.68945 -12.2803 0 -16.9707zM96 288c17.6396 0 32 14.3604 32 32s-14.3604 32 -32 32s-32 -14.3604 -32 -32
+s14.3604 -32 32 -32zM96 32c17.6396 0 32 14.3604 32 32s-14.3604 32 -32 32s-32 -14.3604 -32 -32s14.3604 -32 32 -32z" />
+    <glyph glyph-name="copy" unicode="&#xf0c5;" horiz-adv-x="448" 
+d="M320 0v-40c0 -13.2549 -10.7451 -24 -24 -24h-272c-13.2549 0 -24 10.7451 -24 24v368c0 13.2549 10.7451 24 24 24h72v-296c0 -30.8789 25.1211 -56 56 -56h168zM320 344c0 -13.2002 10.7998 -24 24 -24h104v-264c0 -13.2549 -10.7451 -24 -24 -24h-272
+c-13.2549 0 -24 10.7451 -24 24v368c0 13.2549 10.7451 24 24 24h168v-104zM440.971 375.029c4.34473 -4.34473 7.0293 -10.3477 7.0293 -16.9707v-6.05859h-96v96h6.05859c6.62305 0 12.626 -2.68457 16.9707 -7.0293z" />
+    <glyph glyph-name="paperclip" unicode="&#xf0c6;" horiz-adv-x="448" 
+d="M43.2461 -18.1416c-58.4297 60.2891 -57.3408 157.511 1.38574 217.581l209.76 214.561c44.3164 45.332 116.352 45.3359 160.672 0c43.8896 -44.8936 43.9424 -117.329 0 -162.276l-182.85 -186.852c-29.8545 -30.5371 -78.6328 -30.1113 -107.981 0.998047
+c-28.2754 29.9697 -27.3682 77.4727 1.45117 106.953l143.743 146.835c6.18262 6.31348 16.3125 6.42188 22.626 0.241211l22.8613 -22.3799c6.31445 -6.18164 6.42188 -16.3115 0.241211 -22.626l-143.729 -146.82c-4.93164 -5.04492 -5.23535 -13.4287 -0.647461 -18.292
+c4.37207 -4.63379 11.2451 -4.71094 15.6875 -0.165039l182.85 186.851c19.6123 20.0625 19.6123 52.7256 -0.0117188 72.7979c-19.1885 19.627 -49.957 19.6377 -69.1533 0l-209.762 -214.56c-34.7627 -35.5605 -35.2988 -93.1201 -1.19043 -128.313
+c34.0098 -35.0928 88.9844 -35.1367 123.058 -0.285156l172.061 175.999c6.17676 6.31836 16.3066 6.43262 22.626 0.255859l22.877 -22.3643c6.31836 -6.17676 6.43359 -16.3066 0.255859 -22.626l-172.061 -175.998c-59.5752 -60.9385 -155.942 -60.2158 -214.77 0.485352
+z" />
+    <glyph glyph-name="save" unicode="&#xf0c7;" horiz-adv-x="448" 
+d="M433.941 318.059c8.68848 -8.68848 14.0586 -20.6943 14.0586 -33.9404v-268.118c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h268.118c13.2461 0 25.252 -5.37012 33.9404 -14.0586zM224 32
+c35.3457 0 64 28.6543 64 64s-28.6543 64 -64 64s-64 -28.6543 -64 -64s28.6543 -64 64 -64zM320 336.52c0 3.31152 -1.34277 6.31348 -3.51465 8.48535l-3.48047 3.48047c-2.25 2.25098 -5.30176 3.51465 -8.48535 3.51465h-228.52c-6.62695 0 -12 -5.37305 -12 -12v-104
+c0 -6.62695 5.37305 -12 12 -12h232c6.62695 0 12 5.37305 12 12v100.52z" />
+    <glyph glyph-name="square" unicode="&#xf0c8;" horiz-adv-x="448" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352z" />
+    <glyph glyph-name="bars" unicode="&#xf0c9;" horiz-adv-x="448" 
+d="M16 316c-8.83691 0 -16 7.16309 -16 16v40c0 8.83691 7.16309 16 16 16h416c8.83691 0 16 -7.16309 16 -16v-40c0 -8.83691 -7.16309 -16 -16 -16h-416zM16 156c-8.83691 0 -16 7.16309 -16 16v40c0 8.83691 7.16309 16 16 16h416c8.83691 0 16 -7.16309 16 -16v-40
+c0 -8.83691 -7.16309 -16 -16 -16h-416zM16 -4c-8.83691 0 -16 7.16309 -16 16v40c0 8.83691 7.16309 16 16 16h416c8.83691 0 16 -7.16309 16 -16v-40c0 -8.83691 -7.16309 -16 -16 -16h-416z" />
+    <glyph glyph-name="list-ul" unicode="&#xf0ca;" 
+d="M48 400c26.4922 0 48 -21.5078 48 -48s-21.5078 -48 -48 -48s-48 21.5078 -48 48s21.5078 48 48 48zM48 240c26.4922 0 48 -21.5078 48 -48s-21.5078 -48 -48 -48s-48 21.5078 -48 48s21.5078 48 48 48zM48 80c26.4922 0 48 -21.5078 48 -48s-21.5078 -48 -48 -48
+s-48 21.5078 -48 48s21.5078 48 48 48zM496 64c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-320c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h320zM496 384c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16
+h-320c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h320zM496 224c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-320c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h320z" />
+    <glyph glyph-name="list-ol" unicode="&#xf0cb;" 
+d="M61.7695 47c19.6104 -5.12012 28.7002 -20.5 28.7305 -34.8799c0 -21.3701 -14.3398 -44.1201 -48.5 -44.1201c-16.6201 0 -29.29 4.75 -37 9.44043c-5.82031 4.21973 -6.34961 9.80957 -2.62988 15.9395l5.58984 9.31055c3.86035 6.61914 9.11035 7 15.5996 3.11914
+c4.76758 -1.95996 10.0107 -3.07617 15.4707 -3.11914c10.1602 0 14.3594 3.5 14.3594 8.21973c0 6.64941 -5.60938 9.08984 -15.9395 9.08984h-4.73047c-5.95996 0 -9.25 2.12012 -12.25 7.87988l-1.0498 1.92969c-2.4502 4.75 -1.2002 9.81055 2.7998 14.8809l5.61035 7
+c3.47461 4.32422 7.0957 8.37695 11 12.3096h-22.8301c-4.41504 0 -8 3.58496 -8 8v16c0 4.41504 3.58496 8 8 8h57c7.5 0 11.3398 -4 11.3398 -11.3496v-3.31055c0.0136719 -0.299805 0.0175781 -0.595703 0.0175781 -0.899414
+c0 -5.10449 -1.9248 -9.76367 -5.08789 -13.29zM496 224c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-320c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h320zM496 384c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-320c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h320zM496 64c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-320c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h320zM16 288
+c-4.41504 0 -8 3.58496 -8 8v16c0 4.41504 3.58496 8 8 8h16v64h-8c-4.4082 0.0078125 -7.98145 3.59766 -7.98145 8.00781c0 1.2832 0.303711 2.49707 0.841797 3.57227l8 16c1.31055 2.62012 4.01367 4.41406 7.13965 4.41992h24c4.41504 0 8 -3.58496 8 -8v-88h16
+c4.41504 0 8 -3.58496 8 -8v-16c0 -4.41504 -3.58496 -8 -8 -8h-64zM12.0898 128c-7.00977 0 -12.0898 4 -12.0898 11.4102v4c0 47.2803 51 56.3994 50.9697 69.1201c0 7.18945 -5.9502 8.75 -9.2793 8.75c-0.0185547 0 -0.0380859 0.000976562 -0.0566406 0.000976562
+c-3.65918 0 -6.97949 -1.46582 -9.40332 -3.84082c-5.12012 -4.91016 -10.5107 -7 -16.1201 -2.44043l-8.58008 6.87988c-5.7998 4.53027 -7.16992 9.78027 -2.7998 15.3701c6.65918 8.75 19.0996 18.75 40.46 18.75c19.4697 0 44.4697 -10.5 44.4697 -39.5596
+c0 -37.7607 -45.0498 -46.1504 -48.3398 -56.4404h38.6797c4.41504 0 8 -3.58496 8 -8v-16c0 -4.41504 -3.58496 -8 -8 -8h-67.9102z" />
+    <glyph glyph-name="strikethrough" unicode="&#xf0cc;" 
+d="M496 224c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-480c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h102.29c-11.6797 16.5303 -19.7803 35.4697 -21.7803 56.3604c-0.385742 3.97559 -0.577148 7.88281 -0.577148 11.96
+c0 68.2266 55.3633 123.624 123.577 123.68h68c50.1416 0 93.5244 -28.7686 114.521 -70.7998l0.529297 -1c1.07324 -2.14844 1.70215 -4.57715 1.70215 -7.13965c0 -6.26562 -3.61035 -11.6953 -8.86133 -14.3203l-42.9404 -21.4707
+c-2.14941 -1.07324 -4.5791 -1.70312 -7.14355 -1.70312c-6.2627 0 -11.6895 3.60645 -14.3164 8.85352c-8.18652 16.374 -25.0859 27.5801 -44.623 27.5801h-0.0371094h-66.79c-24.0352 -0.000976562 -43.5479 -19.5059 -43.5479 -43.541
+c0 -19.5742 12.9414 -36.1494 30.7285 -41.6289l87.1699 -26.8301h202.1zM315.76 128h94.3906c2.6084 -7.7373 4.44434 -15.9834 5.33984 -24.3604c0.385742 -3.97559 0.577148 -7.88281 0.577148 -11.96c0 -68.2266 -55.3633 -123.624 -123.577 -123.68h-68
+c-50.1416 0 -93.5244 28.7686 -114.521 70.7998l-0.529297 1c-1.07324 2.14844 -1.70215 4.57715 -1.70215 7.13965c0 6.26562 3.61035 11.6953 8.86133 14.3203l42.9404 21.4707c2.14941 1.07324 4.5791 1.70312 7.14355 1.70312
+c6.2627 0 11.6895 -3.60645 14.3164 -8.85352c8.18652 -16.374 25.0859 -27.5801 44.623 -27.5801h0.0371094h66.79c24.0254 0.0224609 43.5273 19.5244 43.5498 43.5498c-0.0117188 15.3828 -8.07227 28.8594 -20.2402 36.4502z" />
+    <glyph glyph-name="underline" unicode="&#xf0cd;" horiz-adv-x="448" 
+d="M32 384c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h144c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32v-160c0 -44.1533 35.8467 -80 80 -80s80 35.8467 80 80v160h-32c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h144c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32v-160c0 -88.2197 -71.7803 -160 -160 -160s-160 71.7803 -160 160v160h-32zM432 0c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416
+c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h416z" />
+    <glyph glyph-name="table" unicode="&#xf0ce;" 
+d="M464 416c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48h-416c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h416zM224 32v96h-160v-96h160zM224 192v96h-160v-96h160zM448 32v96h-160v-96h160zM448 192v96h-160v-96h160z" />
+    <glyph glyph-name="magic" unicode="&#xf0d0;" 
+d="M224 352l-16 32l-32 16l32 16l16 32l16 -32l32 -16l-32 -16zM80 288l-26.6602 53.3301l-53.3398 26.6699l53.3398 26.6699l26.6602 53.3301l26.6602 -53.3301l53.3398 -26.6699l-53.3398 -26.6699zM432 160l26.6602 -53.3301l53.3398 -26.6699l-53.3398 -26.6699
+l-26.6602 -53.3301l-26.6602 53.3301l-53.3398 26.6699l53.3398 26.6699zM502.62 353.77c12.5 -12.4893 12.5 -32.7598 0 -45.2393l-363.14 -363.15c-6.25 -6.25 -14.4404 -9.37012 -22.6309 -9.37012c-8.17969 0 -16.3691 3.12012 -22.6191 9.37012l-84.8506 84.8506
+c-12.5 12.4893 -12.5 32.75 0 45.25l363.14 363.14c6.25 6.25977 14.4404 9.37988 22.6309 9.37988c8.18945 0 16.3799 -3.12012 22.6191 -9.37988zM359.45 244.54l86.5996 86.5996l-50.9102 50.9102l-86.5996 -86.5996z" />
+    <glyph glyph-name="truck" unicode="&#xf0d1;" horiz-adv-x="640" 
+d="M624 96c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-48c0 -53 -43 -96 -96 -96s-96 43 -96 96h-128c0 -53 -43 -96 -96 -96s-96 43 -96 96h-16c-26.5 0 -48 21.5 -48 48v320c0 26.5 21.5 48 48 48h320c26.5 0 48 -21.5 48 -48v-48h44.0996
+c12.7002 0 24.9004 -5.09961 33.9004 -14.0996l99.9004 -99.9004c9 -9 14.0996 -21.2002 14.0996 -33.9004v-108.1h16zM160 -16c26.5 0 48 21.5 48 48s-21.5 48 -48 48s-48 -21.5 -48 -48s21.5 -48 48 -48zM480 -16c26.5 0 48 21.5 48 48s-21.5 48 -48 48s-48 -21.5 -48 -48
+s21.5 -48 48 -48zM560 192v12.0996l-99.9004 99.9004h-44.0996v-112h144z" />
+    <glyph glyph-name="money-bill" unicode="&#xf0d6;" horiz-adv-x="640" 
+d="M608 384c17.6699 0 32 -14.3301 32 -32v-320c0 -17.6699 -14.3301 -32 -32 -32h-576c-17.6699 0 -32 14.3301 -32 32v320c0 17.6699 14.3301 32 32 32h576zM48 48h64c0 35.3496 -28.6504 64 -64 64v-64zM48 272c35.3496 0 64 28.6504 64 64h-64v-64zM320 96
+c44.1699 0 80 42.9697 80 96c0 53.0195 -35.8203 96 -80 96s-80 -42.9805 -80 -96c0 -53.0098 35.8096 -96 80 -96zM592 48v64c-35.3496 0 -64 -28.6504 -64 -64h64zM592 272v64h-64c0 -35.3496 28.6504 -64 64 -64z" />
+    <glyph glyph-name="caret-down" unicode="&#xf0d7;" horiz-adv-x="320" 
+d="M31.2998 256h257.3c17.8008 0 26.7002 -21.5 14.1006 -34.0996l-128.601 -128.7c-7.7998 -7.7998 -20.5 -7.7998 -28.2998 0l-128.6 128.7c-12.6006 12.5996 -3.7002 34.0996 14.0996 34.0996z" />
+    <glyph glyph-name="caret-up" unicode="&#xf0d8;" horiz-adv-x="320" 
+d="M288.662 96h-257.324c-17.8184 0 -26.7412 21.543 -14.1416 34.1416l128.662 128.662c7.80957 7.81055 20.4736 7.81055 28.2832 0l128.662 -128.662c12.6006 -12.5986 3.67676 -34.1416 -14.1416 -34.1416z" />
+    <glyph glyph-name="caret-left" unicode="&#xf0d9;" horiz-adv-x="192" 
+d="M192 320.662v-257.324c0 -17.8184 -21.543 -26.7412 -34.1416 -14.1416l-128.662 128.662c-7.81055 7.80957 -7.81055 20.4736 0 28.2832l128.662 128.662c12.5986 12.6006 34.1416 3.67676 34.1416 -14.1416z" />
+    <glyph glyph-name="caret-right" unicode="&#xf0da;" horiz-adv-x="192" 
+d="M0 63.3379v257.324c0 17.8184 21.543 26.7412 34.1416 14.1416l128.662 -128.662c7.81055 -7.80957 7.81055 -20.4736 0 -28.2832l-128.662 -128.662c-12.5986 -12.6006 -34.1416 -3.67676 -34.1416 14.1416z" />
+    <glyph glyph-name="columns" unicode="&#xf0db;" 
+d="M464 416c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48h-416c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h416zM224 32v256h-160v-256h160zM448 32v256h-160v-256h160z" />
+    <glyph glyph-name="sort" unicode="&#xf0dc;" horiz-adv-x="320" 
+d="M41 160h238c21.4004 0 32.0996 -25.9004 17 -41l-119 -119c-9.40039 -9.40039 -24.5996 -9.40039 -33.9004 0l-119.1 119c-15.0996 15.0996 -4.40039 41 17 41zM296 265c15.0996 -15.0996 4.40039 -41 -17 -41h-238c-21.4004 0 -32.0996 25.9004 -17 41l119.1 119
+c9.30078 9.40039 24.5 9.40039 33.9004 0z" />
+    <glyph glyph-name="sort-down" unicode="&#xf0dd;" horiz-adv-x="320" 
+d="M41 160h238c21.4004 0 32.0996 -25.9004 17 -41l-119 -119c-9.40039 -9.40039 -24.5996 -9.40039 -33.9004 0l-119.1 119c-15.0996 15.0996 -4.40039 41 17 41z" />
+    <glyph glyph-name="sort-up" unicode="&#xf0de;" horiz-adv-x="320" 
+d="M279 224h-238c-21.4004 0 -32.0996 25.9004 -17 41l119 119c9.40039 9.40039 24.5996 9.40039 33.9004 0l119 -119c15.1992 -15.0996 4.5 -41 -16.9004 -41z" />
+    <glyph glyph-name="envelope" unicode="&#xf0e0;" 
+d="M502.3 257.2c3.90039 3.09961 9.7002 0.200195 9.7002 -4.7002v-204.5c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v204.4c0 5 5.7002 7.7998 9.7002 4.69922c22.3994 -17.3994 52.0996 -39.5 154.1 -113.6
+c21.1006 -15.4004 56.7002 -47.7998 92.2002 -47.5996c35.7002 -0.300781 72 32.7998 92.2998 47.5996c102 74.0996 131.601 96.2998 154 113.7zM256 128c-23.2002 -0.400391 -56.5996 29.2002 -73.4004 41.4004c-132.699 96.2998 -142.8 104.8 -173.399 128.699
+c-5.7998 4.60059 -9.2002 11.5 -9.2002 18.9004v19c0 26.5 21.5 48 48 48h416c26.5 0 48 -21.5 48 -48v-19c0 -7.40039 -3.40039 -14.4004 -9.2002 -18.9004c-30.5996 -24 -40.7002 -32.3994 -173.399 -128.699c-16.8008 -12.2002 -50.2002 -41.8008 -73.4004 -41.4004z" />
+    <glyph glyph-name="undo" unicode="&#xf0e2;" 
+d="M212.333 223.667h-200.333c-6.62695 0 -12 5.37305 -12 12v200.333c0 6.62695 5.37305 12 12 12h48c6.62695 0 12 -5.37305 12 -12v-78.1123c45.7734 50.833 112.26 82.6426 186.175 82.1055c136.906 -0.994141 246.448 -111.623 246.157 -248.532
+c-0.291016 -136.719 -111.212 -247.461 -247.999 -247.461c-64.0889 0 -122.496 24.3135 -166.51 64.2148c-5.09961 4.62207 -5.33398 12.5537 -0.466797 17.4199l33.9668 33.9668c4.47363 4.47461 11.6621 4.71777 16.4004 0.525391
+c31.0361 -27.4629 71.8564 -44.127 116.609 -44.127c97.2676 0 176 78.7158 176 176c0 97.2666 -78.7158 176 -176 176c-58.4961 0 -110.28 -28.4756 -142.274 -72.333h98.2744c6.62695 0 12 -5.37305 12 -12v-48c0 -6.62695 -5.37305 -12 -12 -12z" />
+    <glyph glyph-name="gavel" unicode="&#xf0e3;" 
+d="M504.971 248.638c9.37207 -9.37305 9.37207 -24.5684 0 -33.9404l-124.451 -124.451c-9.37109 -9.37305 -24.5674 -9.37305 -33.9404 0l-22.627 22.627c-9.37305 9.37207 -9.37305 24.5684 0 33.9414l5.65723 5.65625l-39.5986 39.5986l-81.04 -81.04l5.65723 -5.65723
+c12.4971 -12.4971 12.4971 -32.7578 0 -45.2549l-114.745 -114.745c-12.4971 -12.4971 -32.7578 -12.4971 -45.2549 0l-45.2549 45.2549c-12.4971 12.4971 -12.4971 32.7578 0 45.2549l114.744 114.746c12.4971 12.4971 32.7578 12.4971 45.2549 0l5.65723 -5.65723
+l81.04 81.04l-39.5986 39.5986l-5.65625 -5.65723c-9.37207 -9.37305 -24.5684 -9.37305 -33.9414 0l-22.627 22.627c-9.37305 9.37207 -9.37305 24.5684 0 33.9404l124.451 124.451c9.37207 9.37305 24.5674 9.37305 33.9404 0l22.627 -22.6279
+c9.37305 -9.37207 9.37305 -24.5674 0 -33.9404l-5.65625 -5.65723l113.138 -113.137l5.65723 5.65625c9.37207 9.37305 24.5674 9.37305 33.9404 0z" />
+    <glyph glyph-name="bolt" unicode="&#xf0e7;" horiz-adv-x="320" 
+d="M296 288c18.5 0 30 -20.0996 20.7002 -36l-176 -304c-4.40039 -7.59961 -12.4004 -12 -20.7998 -12c-15.3008 0 -26.9004 14.2998 -23.3008 29.5l46.1006 194.5h-118.7c-14.5 0 -25.7002 12.7998 -23.7998 27.2002l32 240
+c1.59961 11.8994 11.7998 20.7998 23.7998 20.7998h144c15.7002 0 27.2002 -15 23.2002 -30.2002l-42.6006 -129.8h115.4z" />
+    <glyph glyph-name="sitemap" unicode="&#xf0e8;" horiz-adv-x="640" 
+d="M128 96c17.6699 0 32 -14.3301 32 -32v-96c0 -17.6699 -14.3301 -32 -32 -32h-96c-17.6699 0 -32 14.3301 -32 32v96c0 17.6699 14.3301 32 32 32h96zM104 176v-48h-48v57.5898c0 21.1797 17.2305 38.4102 38.4102 38.4102h201.59v64h-40c-17.6699 0 -32 14.3301 -32 32
+v96c0 17.6699 14.3301 32 32 32h128c17.6699 0 32 -14.3301 32 -32v-96c0 -17.6699 -14.3301 -32 -32 -32h-40v-64h201.59c21.1797 0 38.4102 -17.2402 38.4102 -38.4102v-57.5898h-48v48h-192v-48h-48v48h-192zM368 96c17.6699 0 32 -14.3301 32 -32v-96
+c0 -17.6699 -14.3301 -32 -32 -32h-96c-17.6699 0 -32 14.3301 -32 32v96c0 17.6699 14.3301 32 32 32h96zM608 96c17.6699 0 32 -14.3301 32 -32v-96c0 -17.6699 -14.3301 -32 -32 -32h-96c-17.6699 0 -32 14.3301 -32 32v96c0 17.6699 14.3301 32 32 32h96z" />
+    <glyph glyph-name="umbrella" unicode="&#xf0e9;" horiz-adv-x="576" 
+d="M575.7 167.2c2.2002 -10.1006 -8.40039 -21.4004 -18.7002 -11.4004c-51.5 54.4004 -107.6 52.5 -158.6 -37c-5.30078 -9.5 -14.9004 -8.59961 -19.7002 0c-2.5 4.40039 -32.2002 73.2002 -90.7002 73.2002c-45.7998 0 -70.5 -37.7998 -90.7002 -73.2002
+c-4.7998 -8.59961 -14.3994 -9.5 -19.7002 0c-50.8994 89.4004 -106.6 92 -158.6 37c-10.2002 -9.89941 -20.9004 1.2998 -18.7002 11.4004c29.2002 136.3 138 218.2 255.7 230.899v17.9004c0 17.7002 14.2998 32 32 32s32 -14.2998 32 -32v-17.9004
+c117.3 -12.6992 227.1 -94.5996 255.7 -230.899zM256 146.3c9.59961 8.90039 19.7002 13.6006 32 13.7002c12.2002 0 22.9004 -5.7002 32 -13.5996v-130.301c0 -44.0996 -35.9004 -80 -80 -80c-33.7998 0 -64.2002 21.4004 -75.4004 53.3008
+c-5.89941 16.5996 2.80078 34.8994 19.5 40.7998c16.7002 5.89941 34.9004 -2.7998 40.8008 -19.5c1.89941 -5.40039 7.2998 -10.7002 15.0996 -10.7002c8.7998 0 16 7.2002 16 16v130.3z" />
+    <glyph glyph-name="paste" unicode="&#xf0ea;" horiz-adv-x="448" 
+d="M128 264v-232h-104c-13.2549 0 -24 10.7451 -24 24v336c0 13.2549 10.7451 24 24 24h80.6104c11.084 19.1104 31.7529 32 55.3896 32s44.3057 -12.8896 55.3896 -32h80.6104c13.2549 0 24 -10.7451 24 -24v-72h-136c-30.8779 0 -56 -25.1211 -56 -56zM160 408
+c-13.2549 0 -24 -10.7451 -24 -24s10.7451 -24 24 -24s24 10.7451 24 24s-10.7451 24 -24 24zM344 160h104v-200c0 -13.2549 -10.7451 -24 -24 -24h-240c-13.2549 0 -24 10.7451 -24 24v304c0 13.2549 10.7451 24 24 24h136v-104c0 -13.2002 10.7998 -24 24 -24z
+M448 198.059v-6.05859h-96v96h6.05859c6.62305 0 12.626 -2.68457 16.9707 -7.0293l65.9404 -65.9404c4.34473 -4.34473 7.03027 -10.3477 7.03027 -16.9717z" />
+    <glyph glyph-name="lightbulb" unicode="&#xf0eb;" horiz-adv-x="352" 
+d="M96.0596 -6.34961l-0.0498047 38.3496h159.98l-0.0400391 -38.3496c-0.0078125 -6.52637 -1.99219 -12.6309 -5.36035 -17.6904l-17.0898 -25.6904c-5.73242 -8.62305 -15.5176 -14.2793 -26.6396 -14.2793h-61.71c-11.123 0 -20.9072 5.65625 -26.6406 14.2793
+l-17.0898 25.6904c-3.49023 5.24023 -5.34961 11.4004 -5.36035 17.6904zM0 272c0 93.0303 73.4404 175.69 175.45 176c97.46 0.299805 176.55 -78.6104 176.55 -176c0 -44.3701 -16.4502 -84.8496 -43.5596 -115.78c-16.5205 -18.8496 -42.3604 -58.2295 -52.21 -91.4502
+c-0.0400391 -0.269531 -0.0703125 -0.519531 -0.110352 -0.779297h-160.24c-0.0400391 0.259766 -0.0703125 0.519531 -0.110352 0.779297c-9.84961 33.2207 -35.6895 72.6006 -52.21 91.4502c-27.1094 30.9307 -43.5596 71.4102 -43.5596 115.78zM176 352
+c8.83984 0 16 7.16016 16 16s-7.16016 16 -16 16c-61.7598 0 -112 -50.2402 -112 -112c0 -8.83984 7.16016 -16 16 -16s16 7.16016 16 16c0 44.1104 35.8896 80 80 80z" />
+    <glyph glyph-name="user-md" unicode="&#xf0f0;" horiz-adv-x="448" 
+d="M224 192c-70.7002 0 -128 57.2998 -128 128s57.2998 128 128 128s128 -57.2998 128 -128s-57.2998 -128 -128 -128zM104 24c0 13.2998 10.7002 24 24 24s24 -10.7002 24 -24s-10.7002 -24 -24 -24s-24 10.7002 -24 24zM320 159.4c71.2002 -3.5 128 -61.8008 128 -133.801
+v-44.7998c0 -24.7002 -20.0996 -44.7998 -44.7998 -44.7998h-358.4c-24.7002 0 -44.7998 20.0996 -44.7998 44.7998v44.7998c0 66.6006 48.5 121.4 112.1 132.101v-80.4004c-23.0996 -6.89941 -40 -28.0996 -40 -53.3994c0 -30.9004 25.1006 -56 56 -56
+c30.9004 0 56 25.0996 56 56c0 25.2998 -16.8994 46.5 -40 53.3994v81.6006c7.7002 -1 15.2002 -2.60059 22.6006 -5.2002c18 -6.2998 37.2998 -9.7998 57.3994 -9.7998c20.1006 0 39.4004 3.5 57.4004 9.7998c2.2002 0.799805 4.40039 1.2002 6.59961 1.89941v-45.1992
+c-36.5 -7.5 -64 -39.8008 -64 -78.4004v-43.7998c0 -8.10059 5.90039 -14.7998 13.8008 -15.9004l31.1992 -4.2002c4.30078 -0.799805 8.5 2 9.40039 6.30078l3.09961 15.6992c0.800781 4.30078 -2 8.5 -6.2998 9.40039l-19.2998 3.90039v26.6992
+c0 67 96 64.7002 96 1.90039v-28.5l-19.2998 -3.90039c-4.40039 -0.799805 -7.2002 -5.09961 -6.2998 -9.39941l3.09961 -15.7002c0.900391 -4.40039 5.09961 -7.2002 9.40039 -6.2998l32.1992 6.39941c7.5 1.5 12.9004 8.10059 12.9004 15.7002v41.7002
+c0 38.5996 -27.5 71 -64 78.4004v49z" />
+    <glyph glyph-name="stethoscope" unicode="&#xf0f1;" 
+d="M447.1 336c35.7002 0.5 64.9004 -28.2998 64.9004 -64c0 -23.7002 -12.9004 -44.2998 -32 -55.4004v-112.6c0 -92.5996 -79 -168 -176 -168c-95.4004 0 -173.3 72.7998 -175.9 163.2c-73 14.7998 -128.1 79.5 -128.1 156.8v155.4c0 11.5 8.09961 21.2998 19.2998 23.5996
+l62.7998 12.4004c13 2.59961 25.6006 -5.80078 28.2002 -18.8008l3.10059 -15.6992c2.59961 -13 -5.80078 -25.6006 -18.8008 -28.2002l-30.6992 -6.10059v-122.5c0 -53.2998 43.5 -96.5 96.8994 -96c52.9004 0.5 95.1006 44.3008 95.1006 97.2002v121.4l-30.7002 6.09961
+c-13 2.60059 -21.4004 15.2002 -18.7998 28.2002l3.19922 15.7002c2.60059 13 15.2002 21.3994 28.2002 18.7998l62.9004 -12.5996c11.2002 -2.2002 19.2998 -12.1006 19.2998 -23.5v-155.4c0 -77.2002 -55 -141.8 -127.8 -156.8
+c2.7002 -55.1006 51.8994 -99.2002 111.899 -99.2002c61.8008 0 112 46.7002 112 104v112.6c-19.5 11.2002 -32.5 32.5 -32 56.8008c0.700195 34.1992 28.8008 62.0996 63 62.5996zM448 256c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16
+s7.2002 -16 16 -16z" />
+    <glyph glyph-name="suitcase" unicode="&#xf0f2;" 
+d="M128 -32v400c0 26.5 21.5 48 48 48h160c26.5 0 48 -21.5 48 -48v-400h-256zM192 352v-32h128v32h-128zM512 272v-256c0 -26.5 -21.5 -48 -48 -48h-48v352h48c26.5 0 48 -21.5 48 -48zM96 -32h-48c-26.5 0 -48 21.5 -48 48v256c0 26.5 21.5 48 48 48h48v-352z" />
+    <glyph glyph-name="bell" unicode="&#xf0f3;" horiz-adv-x="448" 
+d="M224 -64c-35.3203 0 -63.9697 28.6504 -63.9697 64h127.939c0 -35.3496 -28.6494 -64 -63.9697 -64zM439.39 85.71c6 -6.44043 8.66016 -14.1602 8.61035 -21.71c-0.0996094 -16.4004 -12.9805 -32 -32.0996 -32h-383.801c-19.1191 0 -31.9893 15.5996 -32.0996 32
+c-0.0498047 7.5498 2.61035 15.2598 8.61035 21.71c19.3193 20.7598 55.4697 51.9902 55.4697 154.29c0 77.7002 54.4795 139.9 127.939 155.16v20.8398c0 17.6699 14.3203 32 31.9805 32s31.9805 -14.3301 31.9805 -32v-20.8398
+c73.46 -15.2598 127.939 -77.46 127.939 -155.16c0 -102.3 36.1504 -133.53 55.4697 -154.29z" />
+    <glyph glyph-name="coffee" unicode="&#xf0f4;" horiz-adv-x="640" 
+d="M192 64c-53 0 -96 43 -96 96v232c0 13.2998 10.7002 24 24 24h392c70.5996 0 128 -57.4004 128 -128s-57.4004 -128 -128 -128h-32c0 -53 -43 -96 -96 -96h-192zM512 352h-32v-128h32c35.2998 0 64 28.7002 64 64s-28.7002 64 -64 64zM559.7 -32h-511.4
+c-47.5996 0 -61 64 -36 64h583.3c25 0 11.8008 -64 -35.8994 -64z" />
+    <glyph glyph-name="hospital" unicode="&#xf0f8;" horiz-adv-x="448" 
+d="M448 -44v-20h-448v20c0 6.62695 5.37305 12 12 12h20v360c0 13.2549 10.7451 24 24 24h88v72c0 13.2549 10.7451 24 24 24h112c13.2549 0 24 -10.7451 24 -24v-72h88c13.2549 0 24 -10.7451 24 -24v-360h20c6.62695 0 12 -5.37305 12 -12zM308 256h-40
+c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12v40c0 6.62695 -5.37305 12 -12 12zM140 192h40c6.62695 0 12 5.37305 12 12v40c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40
+c0 -6.62695 5.37305 -12 12 -12zM244 64h-40c-6.62695 0 -12 -5.37305 -12 -12v-84h64v84c0 6.62695 -5.37305 12 -12 12zM308 160h-40c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12v40c0 6.62695 -5.37305 12 -12 12
+zM192 148c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12v40zM182 352h26v-26c0 -3.31152 2.68848 -6 6 -6h20c3.31152 0 6 2.68848 6 6v26h26c3.31152 0 6 2.68848 6 6v20
+c0 3.31152 -2.68848 6 -6 6h-26v26c0 3.31152 -2.68848 6 -6 6h-20c-3.31152 0 -6 -2.68848 -6 -6v-26h-26c-3.31152 0 -6 -2.68848 -6 -6v-20c0 -3.31152 2.68848 -6 6 -6z" />
+    <glyph glyph-name="ambulance" unicode="&#xf0f9;" horiz-adv-x="640" 
+d="M624 96c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-48c0 -53 -43 -96 -96 -96s-96 43 -96 96h-128c0 -53 -43 -96 -96 -96s-96 43 -96 96h-16c-26.5 0 -48 21.5 -48 48v320c0 26.5 21.5 48 48 48h320c26.5 0 48 -21.5 48 -48v-48h44.0996
+c12.7002 0 24.9004 -5.09961 33.9004 -14.0996l99.9004 -99.9004c9 -9 14.0996 -21.2002 14.0996 -33.9004v-108.1h16zM160 -16c26.5 0 48 21.5 48 48s-21.5 48 -48 48s-48 -21.5 -48 -48s21.5 -48 48 -48zM304 232v48c0 4.40039 -3.59961 8 -8 8h-56v56
+c0 4.40039 -3.59961 8 -8 8h-48c-4.40039 0 -8 -3.59961 -8 -8v-56h-56c-4.40039 0 -8 -3.59961 -8 -8v-48c0 -4.40039 3.59961 -8 8 -8h56v-56c0 -4.40039 3.59961 -8 8 -8h48c4.40039 0 8 3.59961 8 8v56h56c4.40039 0 8 3.59961 8 8zM480 -16c26.5 0 48 21.5 48 48
+s-21.5 48 -48 48s-48 -21.5 -48 -48s21.5 -48 48 -48zM560 192v12.0996l-99.9004 99.9004h-44.0996v-112h144z" />
+    <glyph glyph-name="medkit" unicode="&#xf0fa;" 
+d="M96 -32v352h32v48c0 26.5098 21.4902 48 48 48h160c26.5098 0 48 -21.4902 48 -48v-48h32v-352h-320zM192 352v-32h128v32h-128zM512 272v-256c0 -26.5098 -21.4902 -48 -48 -48h-16v352h16c26.5098 0 48 -21.4902 48 -48zM64 -32h-16c-26.5098 0 -48 21.4902 -48 48v256
+c0 26.5098 21.4902 48 48 48h16v-352zM352 176c0 8.83691 -7.16309 16 -16 16h-48v48c0 8.83691 -7.16309 16 -16 16h-32c-8.83691 0 -16 -7.16309 -16 -16v-48h-48c-8.83691 0 -16 -7.16309 -16 -16v-32c0 -8.83691 7.16309 -16 16 -16h48v-48
+c0 -8.83691 7.16309 -16 16 -16h32c8.83691 0 16 7.16309 16 16v48h48c8.83691 0 16 7.16309 16 16v32z" />
+    <glyph glyph-name="fighter-jet" unicode="&#xf0fb;" horiz-adv-x="640" 
+d="M544 224c96 -21.333 96 -26.583 96 -32s0 -10.667 -96 -32l-128 -16l-48 -16h-24l-116.842 -148h39.5088c11.666 0 21.333 -2.625 21.333 -6s-9.66602 -6 -21.333 -6h-114.667v12h16v164h-48l-66.666 -80h-34.667l-10.667 10.667v69.333h8v16h48v2.66699l-64 8v42.667
+l64 8v2.66602h-48v16h-8v69.333l10.667 10.667h34.666l66.667 -80h48v164h-16v12h114.667c11.666 0 21.333 -2.625 21.333 -6s-9.66699 -6 -21.333 -6h-39.5088l116.842 -148h24l48 -16z" />
+    <glyph glyph-name="beer" unicode="&#xf0fc;" horiz-adv-x="448" 
+d="M368 352c44.1123 0 80 -35.8877 80 -80v-128.86c0 -31.5273 -18.6035 -60.2031 -47.3936 -73.0527l-80.6064 -35.9766v-42.1104c0 -13.2549 -10.7451 -24 -24 -24h-272c-13.2549 0 -24 10.7451 -24 24v400c0 13.2549 10.7451 24 24 24h272c13.2549 0 24 -10.7451 24 -24
+v-40h48zM384 143.14v128.86c0 8.82227 -7.17773 16 -16 16h-48v-183.805l54.5215 24.334c5.58789 2.49902 9.47363 8.09863 9.47852 14.6104zM208 64c8.83594 0 16 7.16406 16 16v224c0 8.83594 -7.16406 16 -16 16s-16 -7.16406 -16 -16v-224
+c0 -8.83594 7.16406 -16 16 -16zM112 64c8.83594 0 16 7.16406 16 16v224c0 8.83594 -7.16406 16 -16 16s-16 -7.16406 -16 -16v-224c0 -8.83594 7.16406 -16 16 -16z" />
+    <glyph glyph-name="h-square" unicode="&#xf0fd;" horiz-adv-x="448" 
+d="M448 368v-352c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h352c26.5098 0 48 -21.4902 48 -48zM336 320h-32c-8.83691 0 -16 -7.16309 -16 -16v-80h-128v80c0 8.83691 -7.16309 16 -16 16h-32
+c-8.83691 0 -16 -7.16309 -16 -16v-224c0 -8.83691 7.16309 -16 16 -16h32c8.83691 0 16 7.16309 16 16v80h128v-80c0 -8.83691 7.16309 -16 16 -16h32c8.83691 0 16 7.16309 16 16v224c0 8.83691 -7.16309 16 -16 16z" />
+    <glyph glyph-name="plus-square" unicode="&#xf0fe;" horiz-adv-x="448" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM368 164v56c0 6.59961 -5.40039 12 -12 12h-92v92c0 6.59961 -5.40039 12 -12 12h-56c-6.59961 0 -12 -5.40039 -12 -12v-92h-92
+c-6.59961 0 -12 -5.40039 -12 -12v-56c0 -6.59961 5.40039 -12 12 -12h92v-92c0 -6.59961 5.40039 -12 12 -12h56c6.59961 0 12 5.40039 12 12v92h92c6.59961 0 12 5.40039 12 12z" />
+    <glyph glyph-name="angle-double-left" unicode="&#xf100;" horiz-adv-x="448" 
+d="M223.7 209l136 136c9.39941 9.40039 24.5996 9.40039 33.8994 0l22.6006 -22.5996c9.39941 -9.40039 9.39941 -24.6006 0 -33.9004l-96.2998 -96.5l96.3994 -96.4004c9.40039 -9.39941 9.40039 -24.5996 0 -33.8994l-22.5996 -22.7002
+c-9.40039 -9.40039 -24.6006 -9.40039 -33.9004 0l-136 136c-9.5 9.40039 -9.5 24.5996 -0.0996094 34zM31.7002 175c-9.40039 9.40039 -9.40039 24.5996 0.0996094 34l136 136c9.2998 9.40039 24.5 9.40039 33.9004 0l22.5996 -22.7002
+c9.40039 -9.2998 9.40039 -24.5 0 -33.8994l-96.3994 -96.4004l96.2998 -96.5c9.39941 -9.2998 9.39941 -24.5 0 -33.9004l-22.6006 -22.5996c-9.2998 -9.40039 -24.5 -9.40039 -33.8994 0z" />
+    <glyph glyph-name="angle-double-right" unicode="&#xf101;" horiz-adv-x="448" 
+d="M224.3 175l-136 -136c-9.39941 -9.40039 -24.5996 -9.40039 -33.8994 0l-22.6006 22.5996c-9.39941 9.40039 -9.39941 24.6006 0 33.9004l96.4004 96.4004l-96.4004 96.3994c-9.39941 9.40039 -9.39941 24.6006 0 33.9004l22.5 22.7998
+c9.40039 9.40039 24.6006 9.40039 33.9004 0l136 -136c9.5 -9.40039 9.5 -24.5996 0.0996094 -34zM416.3 209c9.40039 -9.40039 9.40039 -24.5996 0 -33.7998l-136 -136c-9.2998 -9.40039 -24.5 -9.40039 -33.8994 0l-22.6006 22.5996
+c-9.39941 9.2998 -9.39941 24.5 0 33.9004l96.4004 96.3994l-96.4004 96.4004c-9.39941 9.2998 -9.39941 24.5 0 33.9004l22.6006 22.5996c9.2998 9.40039 24.5 9.40039 33.8994 0z" />
+    <glyph glyph-name="angle-double-up" unicode="&#xf102;" horiz-adv-x="320" 
+d="M177 192.3l136 -136c9.40039 -9.39941 9.40039 -24.5996 0 -33.8994l-22.5996 -22.6006c-9.40039 -9.39941 -24.6006 -9.39941 -33.9004 0l-96.5 96.2998l-96.4004 -96.3994c-9.39941 -9.40039 -24.5996 -9.40039 -33.8994 0l-22.7002 22.5996
+c-9.40039 9.40039 -9.40039 24.6006 0 33.9004l136 136c9.40039 9.5 24.5996 9.5 34 0.0996094zM143 384.3c9.40039 9.40039 24.5996 9.40039 33.7998 0l136 -136c9.40039 -9.2998 9.40039 -24.5 0 -33.8994l-22.5996 -22.6006c-9.2998 -9.39941 -24.5 -9.39941 -33.9004 0
+l-96.3994 96.4004l-96.4004 -96.4004c-9.2998 -9.39941 -24.5 -9.39941 -33.9004 0l-22.5996 22.6006c-9.40039 9.2998 -9.40039 24.5 0 33.8994z" />
+    <glyph glyph-name="angle-double-down" unicode="&#xf103;" horiz-adv-x="320" 
+d="M143 191.7l-136 136c-9.40039 9.39941 -9.40039 24.5996 0 33.8994l22.5996 22.6006c9.40039 9.39941 24.6006 9.39941 33.9004 0l96.4004 -96.4004l96.3994 96.4004c9.40039 9.39941 24.6006 9.39941 33.9004 0l22.7998 -22.5
+c9.40039 -9.40039 9.40039 -24.6006 0 -33.9004l-136 -136c-9.40039 -9.5 -24.5996 -9.5 -34 -0.0996094zM177 -0.299805c-9.40039 -9.40039 -24.5996 -9.40039 -34 0.0996094l-136 136c-9.40039 9.2998 -9.40039 24.5 0 33.9004l22.7002 22.5996
+c9.2998 9.40039 24.5 9.40039 33.8994 0l96.4004 -96.3994l96.5 96.2998c9.2998 9.39941 24.5 9.39941 33.9004 0l22.5996 -22.6006c9.40039 -9.2998 9.40039 -24.5 0 -33.8994z" />
+    <glyph glyph-name="angle-left" unicode="&#xf104;" horiz-adv-x="256" 
+d="M31.7002 209l136 136c9.39941 9.40039 24.5996 9.40039 33.8994 0l22.6006 -22.5996c9.39941 -9.40039 9.39941 -24.6006 0 -33.9004l-96.2998 -96.5l96.3994 -96.4004c9.40039 -9.39941 9.40039 -24.5996 0 -33.8994l-22.5996 -22.7002
+c-9.40039 -9.40039 -24.6006 -9.40039 -33.9004 0l-136 136c-9.5 9.40039 -9.5 24.5996 -0.0996094 34z" />
+    <glyph glyph-name="angle-right" unicode="&#xf105;" horiz-adv-x="256" 
+d="M224.3 175l-136 -136c-9.39941 -9.40039 -24.5996 -9.40039 -33.8994 0l-22.6006 22.5996c-9.39941 9.40039 -9.39941 24.6006 0 33.9004l96.4004 96.4004l-96.4004 96.3994c-9.39941 9.40039 -9.39941 24.6006 0 33.9004l22.5 22.7998
+c9.40039 9.40039 24.6006 9.40039 33.9004 0l136 -136c9.5 -9.40039 9.5 -24.5996 0.0996094 -34z" />
+    <glyph glyph-name="angle-up" unicode="&#xf106;" horiz-adv-x="320" 
+d="M177 288.3l136 -136c9.40039 -9.39941 9.40039 -24.5996 0 -33.8994l-22.5996 -22.6006c-9.40039 -9.39941 -24.6006 -9.39941 -33.9004 0l-96.5 96.2998l-96.4004 -96.3994c-9.39941 -9.40039 -24.5996 -9.40039 -33.8994 0l-22.7002 22.5996
+c-9.40039 9.40039 -9.40039 24.6006 0 33.9004l136 136c9.40039 9.5 24.5996 9.5 34 0.0996094z" />
+    <glyph glyph-name="angle-down" unicode="&#xf107;" horiz-adv-x="320" 
+d="M143 95.7002l-136 136c-9.40039 9.39941 -9.40039 24.5996 0 33.8994l22.5996 22.6006c9.40039 9.39941 24.6006 9.39941 33.9004 0l96.4004 -96.4004l96.3994 96.4004c9.40039 9.39941 24.6006 9.39941 33.9004 0l22.5996 -22.6006
+c9.40039 -9.39941 9.40039 -24.5996 0 -33.8994l-136 -136c-9.2002 -9.40039 -24.3994 -9.40039 -33.7998 0z" />
+    <glyph glyph-name="desktop" unicode="&#xf108;" horiz-adv-x="576" 
+d="M528 448c26.5 0 48 -21.5 48 -48v-320c0 -26.5 -21.5 -48 -48 -48h-192l16 -48h72c13.2998 0 24 -10.7002 24 -24s-10.7002 -24 -24 -24h-272c-13.2998 0 -24 10.7002 -24 24s10.7002 24 24 24h72l16 48h-192c-26.5 0 -48 21.5 -48 48v320c0 26.5 21.5 48 48 48h480z
+M512 96v288h-448v-288h448z" />
+    <glyph glyph-name="laptop" unicode="&#xf109;" horiz-adv-x="640" 
+d="M624 32c8.7998 0 16 -7.2002 16 -16v-16c0 -35.2002 -28.7998 -64 -64 -64h-512c-35.2002 0 -64 28.7998 -64 64v16c0 8.7998 7.2002 16 16 16h239.23c-0.25 -14.5303 14.0791 -32 32.7695 -32h60.7998c18.0303 0 32 12.1904 32.7402 32h242.46zM576 400v-336h-512v336
+c0 26.4004 21.5996 48 48 48h416c26.4004 0 48 -21.5996 48 -48zM512 128v256h-384v-256h384z" />
+    <glyph glyph-name="tablet" unicode="&#xf10a;" horiz-adv-x="448" 
+d="M400 448c26.5 0 48 -21.5 48 -48v-416c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48h352zM224 -32c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32z" />
+    <glyph glyph-name="mobile" unicode="&#xf10b;" horiz-adv-x="320" 
+d="M272 448c26.5 0 48 -21.5 48 -48v-416c0 -26.5 -21.5 -48 -48 -48h-224c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48h224zM160 -32c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32z" />
+    <glyph glyph-name="quote-left" unicode="&#xf10d;" 
+d="M464 192c26.5 0 48 -21.5 48 -48v-128c0 -26.5 -21.5 -48 -48 -48h-128c-26.5 0 -48 21.5 -48 48v240c0 88.4004 71.5996 160 160 160h8c13.2998 0 24 -10.7002 24 -24v-48c0 -13.2998 -10.7002 -24 -24 -24h-8c-35.2998 0 -64 -28.7002 -64 -64v-64h80zM176 192
+c26.5 0 48 -21.5 48 -48v-128c0 -26.5 -21.5 -48 -48 -48h-128c-26.5 0 -48 21.5 -48 48v240c0 88.4004 71.5996 160 160 160h8c13.2998 0 24 -10.7002 24 -24v-48c0 -13.2998 -10.7002 -24 -24 -24h-8c-35.2998 0 -64 -28.7002 -64 -64v-64h80z" />
+    <glyph glyph-name="quote-right" unicode="&#xf10e;" 
+d="M464 416c26.5 0 48 -21.5 48 -48v-240c0 -88.4004 -71.5996 -160 -160 -160h-8c-13.2998 0 -24 10.7002 -24 24v48c0 13.2998 10.7002 24 24 24h8c35.2998 0 64 28.7002 64 64v64h-80c-26.5 0 -48 21.5 -48 48v128c0 26.5 21.5 48 48 48h128zM176 416
+c26.5 0 48 -21.5 48 -48v-240c0 -88.4004 -71.5996 -160 -160 -160h-8c-13.2998 0 -24 10.7002 -24 24v48c0 13.2998 10.7002 24 24 24h8c35.2998 0 64 28.7002 64 64v64h-80c-26.5 0 -48 21.5 -48 48v128c0 26.5 21.5 48 48 48h128z" />
+    <glyph glyph-name="spinner" unicode="&#xf110;" 
+d="M304 400c0 -26.5098 -21.4902 -48 -48 -48s-48 21.4902 -48 48s21.4902 48 48 48s48 -21.4902 48 -48zM256 32c26.5098 0 48 -21.4902 48 -48s-21.4902 -48 -48 -48s-48 21.4902 -48 48s21.4902 48 48 48zM464 240c26.5098 0 48 -21.4902 48 -48s-21.4902 -48 -48 -48
+s-48 21.4902 -48 48s21.4902 48 48 48zM96 192c0 -26.5098 -21.4902 -48 -48 -48s-48 21.4902 -48 48s21.4902 48 48 48s48 -21.4902 48 -48zM108.922 92.9219c26.5088 0 48 -21.4912 48 -48c0 -26.5098 -21.4902 -48 -48 -48s-48 21.4902 -48 48s21.4902 48 48 48z
+M403.078 92.9219c26.5098 0 48 -21.4912 48 -48c0 -26.5098 -21.4902 -48 -48 -48s-48 21.4902 -48 48s21.4902 48 48 48zM108.922 387.078c26.5088 0 48 -21.4902 48 -48s-21.4902 -48 -48 -48s-48 21.4902 -48 48s21.4902 48 48 48z" />
+    <glyph glyph-name="circle" unicode="&#xf111;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248z" />
+    <glyph glyph-name="smile" unicode="&#xf118;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM328 272c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32s32 14.2998 32 32s-14.2998 32 -32 32zM168 272c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32
+s32 14.2998 32 32s-14.2998 32 -32 32zM362.8 101.8c13.5 16.2998 -11.2002 36.7002 -24.5996 20.5c-22.4004 -26.7998 -55.2002 -42.2002 -90.2002 -42.2002s-67.7998 15.3008 -90.2002 42.2002c-13.5996 16.2002 -38.2002 -4.2002 -24.5996 -20.5
+c28.5 -34.2002 70.2998 -53.7998 114.8 -53.7998s86.2998 19.5996 114.8 53.7998z" />
+    <glyph glyph-name="frown" unicode="&#xf119;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM328 272c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32s32 14.2998 32 32s-14.2998 32 -32 32zM168 272c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32
+s32 14.2998 32 32s-14.2998 32 -32 32zM338.2 53.7998c13.5 -16.2998 38.0996 4.2002 24.5 20.4004c-28.4004 34.2002 -70.2998 53.7998 -114.7 53.7998s-86.2998 -19.5996 -114.8 -53.7002c-13.5 -16.2998 11.0996 -36.7998 24.5996 -20.5
+c22.4004 26.7998 55.2998 42.2002 90.2002 42.2002s67.7998 -15.4004 90.2002 -42.2002z" />
+    <glyph glyph-name="meh" unicode="&#xf11a;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM168 272c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32s32 14.2998 32 32s-14.2998 32 -32 32zM344 80c21.2002 0 21.2002 32 0 32h-192c-21.2002 0 -21.2002 -32 0 -32
+h192zM328 208c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32z" />
+    <glyph glyph-name="gamepad" unicode="&#xf11b;" horiz-adv-x="640" 
+d="M480.07 352c88.2842 -0.0263672 159.938 -71.7402 159.938 -160.03c0 -88.3066 -71.6934 -160 -160 -160c-44.7324 0 -85.2021 18.3965 -114.249 48.0303h-91.5195c-29.0469 -29.6338 -69.5078 -48 -114.24 -48c-88.3066 0 -160 71.6934 -160 160s71.6934 160 160 160
+h320.07zM248 180v24c0 6.62305 -5.37695 12 -12 12h-52v52c0 6.62305 -5.37695 12 -12 12h-24c-6.62305 0 -12 -5.37695 -12 -12v-52h-52c-6.62305 0 -12 -5.37695 -12 -12v-24c0 -6.62305 5.37695 -12 12 -12h52v-52c0 -6.62305 5.37695 -12 12 -12h24
+c6.62305 0 12 5.37695 12 12v52h52c6.62305 0 12 5.37695 12 12zM464 104c22.0762 0 40 17.9238 40 40s-17.9238 40 -40 40s-40 -17.9238 -40 -40s17.9238 -40 40 -40zM528 200c22.0762 0 40 17.9238 40 40s-17.9238 40 -40 40s-40 -17.9238 -40 -40s17.9238 -40 40 -40z
+" />
+    <glyph glyph-name="keyboard" unicode="&#xf11c;" horiz-adv-x="576" 
+d="M528 0h-480c-26.5098 0 -48 21.4902 -48 48v288c0 26.5098 21.4902 48 48 48h480c26.5098 0 48 -21.4902 48 -48v-288c0 -26.5098 -21.4902 -48 -48 -48zM128 268v40c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40
+c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12zM224 268v40c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12zM320 268v40c0 6.62695 -5.37305 12 -12 12h-40
+c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12zM416 268v40c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12zM512 268v40
+c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12zM176 172v40c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40
+c6.62695 0 12 5.37305 12 12zM272 172v40c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12zM368 172v40c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40
+c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12zM464 172v40c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12zM128 76v40c0 6.62695 -5.37305 12 -12 12h-40
+c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12zM416 76v40c0 6.62695 -5.37305 12 -12 12h-232c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h232c6.62695 0 12 5.37305 12 12zM512 76v40
+c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12z" />
+    <glyph glyph-name="flag-checkered" unicode="&#xf11e;" 
+d="M243.2 258.1c24.2002 -6.69922 47.5996 -16.3994 73.5996 -22.1992v-68.2002c-24.2998 6.7002 -47.5 16.3994 -73.5996 22.2998v68.0996zM466.5 381.1c21.2002 9.80078 45.5 -5.69922 45.4004 -29v-243.1c0 -10.5996 -5.10059 -20.4004 -13.8008 -26.4004
+c-35.7998 -24.5996 -74.2998 -40.8994 -122.5 -40.8994c-67.3994 0 -111.6 34.7998 -165.199 34.7998c-50.8008 0 -86.1006 -10 -114.4 -22.0996v-94.4004c0 -13.2998 -10.7002 -24 -24 -24h-16c-13.2998 0 -24 10.7002 -24 24v386.1c-14.5 10.1006 -24 26.9004 -24 45.9004
+c0 31.7002 26.2998 57.2998 58.2998 56c28.5 -1.2002 51.7998 -24 53.6006 -52.4004c0.5 -8.39941 -0.800781 -16.2998 -3.60059 -23.5996c20.7002 7.59961 43 12 68 12c67.4004 0 111.7 -34.7998 165.2 -34.7998c40.5 0 82.7002 16 117 31.8994zM169.6 122.5v71.2998
+c-26.0996 -2.39941 -47.3994 -8.09961 -73.5996 -17.3994v-70.5c23.5996 8.39941 47.7998 13.8994 73.5996 16.5996zM464 257v70.5c-21.2998 -8.90039 -46.5996 -17.7002 -73.5996 -22.5v-71.9004c-26 -4.19922 -49.9004 -2.59961 -73.6006 2.7002v68.4004
+c-26.3994 4.59961 -49.8994 13.8994 -73.5996 21.2998v-67.4004c-25.2002 7 -46.6006 9.40039 -73.6006 5.7002v71.6006c-23.5 -2.2002 -40.3994 -9.80078 -73.5996 -22v-70.5c29 10.6992 51.2002 17.7998 73.5996 20.8994v-70c32.8008 3 53.9004 0.600586 73.6006 -3.7998
+v-68.5c26.2998 -4.59961 49.7002 -13.9004 73.5996 -21.2998v67.3994c25.7002 -7.09961 46.6006 -9.2998 73.6006 -5.59961v-71.5996c25.0996 2.39941 48.5 11 73.5996 27.0996v70.5c-22.2002 -14.2002 -48.7998 -22.5996 -73.5996 -26v71.0996
+c27.2998 4.40039 50 14.1006 73.5996 23.9004z" />
+    <glyph glyph-name="terminal" unicode="&#xf120;" horiz-adv-x="640" 
+d="M257.981 175.029l-194.344 -194.344c-9.37305 -9.37207 -24.5684 -9.37207 -33.9404 0l-22.668 22.667c-9.35742 9.35742 -9.375 24.5225 -0.0400391 33.9014l154.021 154.746l-154.021 154.745c-9.33496 9.37891 -9.31738 24.5439 0.0400391 33.9014l22.667 22.667
+c9.37305 9.37207 24.5684 9.37207 33.9404 0l194.344 -194.344c9.37207 -9.37207 9.37207 -24.5674 0 -33.9404zM640 -8c0 -13.2549 -10.7451 -24 -24 -24h-304c-13.2549 0 -24 10.7451 -24 24v32c0 13.2549 10.7451 24 24 24h304c13.2549 0 24 -10.7451 24 -24v-32z" />
+    <glyph glyph-name="code" unicode="&#xf121;" horiz-adv-x="640" 
+d="M278.9 -63.5l-61 17.7002c-6.40039 1.7998 -10 8.5 -8.2002 14.8994l136.5 470.2c1.7998 6.40039 8.5 10 14.8994 8.2002l61 -17.7002c6.40039 -1.7998 10 -8.5 8.2002 -14.8994l-136.5 -470.2c-1.89941 -6.40039 -8.5 -10.1006 -14.8994 -8.2002zM164.9 48.7002
+c-4.5 -4.90039 -12.1006 -5.10059 -17 -0.5l-144.101 135.1c-5.09961 4.7002 -5.09961 12.7998 0 17.5l144.101 135c4.89941 4.60059 12.5 4.2998 17 -0.5l43.5 -46.3994c4.69922 -4.90039 4.2998 -12.7002 -0.800781 -17.2002l-90.5996 -79.7002l90.5996 -79.7002
+c5.10059 -4.5 5.40039 -12.2998 0.800781 -17.2002zM492.1 48.0996c-4.89941 -4.5 -12.5 -4.2998 -17 0.600586l-43.5 46.3994c-4.69922 4.90039 -4.2998 12.7002 0.800781 17.2002l90.5996 79.7002l-90.5996 79.7998c-5.10059 4.5 -5.40039 12.2998 -0.800781 17.2002
+l43.5 46.4004c4.60059 4.7998 12.2002 5 17 0.5l144.101 -135.2c5.09961 -4.7002 5.09961 -12.7998 0 -17.5z" />
+    <glyph glyph-name="reply-all" unicode="&#xf122;" horiz-adv-x="576" 
+d="M136.309 258.164l176.005 151.985c15.4062 13.3047 39.6865 2.50293 39.6865 -18.1641v-82.7637c129.182 -10.2305 224 -52.2119 224 -183.548c0 -61.4404 -39.582 -122.309 -83.333 -154.132c-13.6533 -9.93066 -33.1113 2.5332 -28.0771 18.6309
+c38.5117 123.162 -3.92188 169.482 -112.59 182.016v-84.1758c0 -20.7012 -24.2998 -31.4531 -39.6865 -18.1641l-176.005 151.987c-11.0703 9.56152 -11.0859 26.7529 0 36.3281zM8.30859 221.836c-11.0703 9.56152 -11.0859 26.7529 0 36.3281l176.005 151.985
+c15.4062 13.3047 39.6865 2.50293 39.6865 -18.1641v-15.8174l-108.607 -93.7861c-11.8906 -10.2637 -19.3926 -25.4307 -19.3926 -42.3564v-0.0234375c0 -0.0078125 -0.0292969 -0.00292969 -0.0292969 -0.0117188c0 -16.9268 7.53125 -32.1084 19.4229 -42.373
+l108.606 -93.7852v-15.8184c0 -20.7002 -24.2998 -31.4531 -39.6865 -18.1641z" />
+    <glyph glyph-name="location-arrow" unicode="&#xf124;" 
+d="M444.52 444.48c38.3809 16 79.9609 -25.5801 63.9707 -63.9707l-191.9 -415.779c-22.3896 -47.9805 -92.75 -31.9805 -92.75 19.1895v175.91h-175.91c-51.1699 0 -67.1602 70.3604 -19.1895 92.75z" />
+    <glyph glyph-name="crop" unicode="&#xf125;" 
+d="M488 96c13.25 0 24 -10.7402 24 -24v-48c0 -13.25 -10.75 -24 -24 -24h-40v-40c0 -13.25 -10.75 -24 -24 -24h-48c-13.25 0 -24 10.75 -24 24v282.75l-146.75 -146.75h114.75v-96h-232c-13.25 0 -24 10.75 -24 24v264h-40c-13.25 0 -24 10.75 -24 24v48
+c0 13.2598 10.75 24 24 24h40v40c0 13.2598 10.75 24 24 24h48c13.25 0 24 -10.7402 24 -24v-282.75l146.75 146.75h-114.75v96h210.75l59.3096 59.3096c6.25 6.25 16.3809 6.25 22.6309 0l22.6191 -22.6191c6.25 -6.25 6.25 -16.3809 0 -22.6309l-59.3096 -59.3096v-242.75
+h40z" />
+    <glyph glyph-name="code-branch" unicode="&#xf126;" horiz-adv-x="384" 
+d="M384 304c0 -35.2002 -22.7998 -65.0996 -54.4004 -75.9004c-0.5 -28.0996 -7.59961 -50.5 -21.5996 -67.8994c-28.2002 -35 -76 -39.5 -118.2 -43.4004c-25.7002 -2.39941 -49.8994 -4.59961 -66.0996 -12.7998c-7.10059 -3.59961 -11.7998 -8.2002 -14.9004 -13.4004
+c30 -11.5 51.2002 -40.5996 51.2002 -74.5996c0 -44.2002 -35.7998 -80 -80 -80s-80 35.7998 -80 80c0 35.7998 23.5 66.0996 56 76.4004v199.3c-32.5 10.2002 -56 40.5 -56 76.2998c0 44.2002 35.7998 80 80 80s80 -35.7998 80 -80c0 -35.7998 -23.5 -66.0996 -56 -76.2998
+v-144c23.9004 11.5 53.0996 14.2998 81.2998 16.8994c35.9004 3.30078 69.7998 6.5 85.2002 25.7002c6.7998 8.40039 10.4004 20.7998 11 36.9004c-33.2002 9.7002 -57.5 40.3994 -57.5 76.7998c0 44.2002 35.7998 80 80 80s80 -35.7998 80 -80zM80 384
+c-8.7998 0 -16 -7.2002 -16 -16s7.2002 -16 16 -16s16 7.2002 16 16s-7.2002 16 -16 16zM80 0c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16zM304 320c-8.7998 0 -16 -7.2002 -16 -16s7.2002 -16 16 -16s16 7.2002 16 16
+s-7.2002 16 -16 16z" />
+    <glyph glyph-name="unlink" unicode="&#xf127;" 
+d="M304.083 42.0928c4.68555 -4.68555 4.68555 -12.2842 0 -16.9707l-44.6738 -44.6738c-59.2627 -59.2627 -155.693 -59.2666 -214.961 0c-59.2646 59.2646 -59.2646 155.695 0 214.96l44.6748 44.6748c4.68555 4.68555 12.2842 4.68555 16.9707 0l39.5986 -39.5977
+c4.68555 -4.68652 4.68555 -12.2842 0 -16.9717l-44.6758 -44.6738c-28.0713 -28.0732 -28.0713 -73.75 0 -101.823c28.0723 -28.0713 73.75 -28.0723 101.824 0l44.6738 44.6748c4.68652 4.68555 12.2842 4.68555 16.9717 0zM247.515 302.309l-39.5967 39.5986
+c-4.68555 4.68652 -4.68555 12.2852 0 16.9707l44.6738 44.6738c59.2666 59.2646 155.695 59.2646 214.961 0s59.2656 -155.694 0 -214.96l-44.6748 -44.6748c-4.68652 -4.68555 -12.2852 -4.68555 -16.9707 0l-39.5986 39.5977c-4.68555 4.6875 -4.68555 12.2852 0 16.9717
+l44.6758 44.6738c28.0713 28.0732 28.0713 73.75 0 101.823c-28.0742 28.0723 -73.752 28.0742 -101.824 0l-44.6738 -44.6748c-4.6875 -4.68555 -12.2852 -4.68555 -16.9717 0zM482.343 -56.9707c-9.37207 -9.37207 -24.5674 -9.37207 -33.9404 0l-441.373 441.373
+c-9.37305 9.37207 -9.37305 24.5674 0 33.9404l22.6279 22.6279c9.37207 9.37305 24.5674 9.37305 33.9404 0l441.372 -441.374c9.37305 -9.37207 9.37305 -24.5674 0 -33.9404z" />
+    <glyph glyph-name="question" unicode="&#xf128;" horiz-adv-x="384" 
+d="M202.021 448c84.8809 0 175.482 -66.2559 175.481 -153.6c0 -115.982 -125.268 -117.768 -125.268 -160.627v-5.77344c0 -13.2549 -10.7451 -24 -24 -24h-72.4717c-13.2549 0 -24 10.7451 -24 24v9.78809c0 61.8291 46.876 86.5449 82.2998 106.405
+c30.376 17.0293 48.9922 28.6113 48.9922 51.1641c0 29.832 -38.0518 49.6309 -68.8154 49.6309c-39.127 0 -57.708 -18.0684 -82.7568 -49.4492c-8.12109 -10.1738 -22.8809 -12.0127 -33.2529 -4.14844l-43.1387 32.709c-10.2705 7.78809 -12.541 22.2939 -5.17773 32.874
+c40.5889 58.3232 92.2881 91.0264 172.107 91.0264zM192 74.541c38.1963 0 69.2715 -31.0742 69.2715 -69.2695c0 -38.1963 -31.0752 -69.2715 -69.2715 -69.2715s-69.2715 31.0752 -69.2715 69.2695c0 38.1963 31.0752 69.2715 69.2715 69.2715z" />
+    <glyph glyph-name="info" unicode="&#xf129;" horiz-adv-x="192" 
+d="M20 23.7715h20v144.457h-20c-11.0459 0 -20 8.9541 -20 20v47.7715c0 11.0459 8.9541 20 20 20h112c11.0459 0 20 -8.9541 20 -20v-212.229h20c11.0459 0 20 -8.9541 20 -20v-47.7715c0 -11.0459 -8.9541 -20 -20 -20h-152c-11.0459 0 -20 8.9541 -20 20v47.7715
+c0 11.0459 8.9541 20 20 20zM96 448c39.7637 0 72 -32.2354 72 -72s-32.2354 -72 -72 -72s-72 32.2354 -72 72s32.2354 72 72 72z" />
+    <glyph glyph-name="exclamation" unicode="&#xf12a;" horiz-adv-x="192" 
+d="M176 16c0 -44.1123 -35.8877 -80 -80 -80s-80 35.8877 -80 80s35.8877 80 80 80s80 -35.8877 80 -80zM25.2598 422.801c-0.68457 13.709 10.2441 25.1992 23.9707 25.1992h93.5391c13.7266 0 24.6553 -11.4902 23.9707 -25.1992l-13.6006 -272
+c-0.638672 -12.7725 -11.1807 -22.8008 -23.9697 -22.8008h-66.3398c-12.7891 0 -23.3311 10.0283 -23.9697 22.8008z" />
+    <glyph glyph-name="superscript" unicode="&#xf12b;" 
+d="M496 288c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-96c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h16v96h-16c-8.82422 0.0078125 -15.9775 7.18945 -15.9775 16.0156c0 2.57129 0.608398 5.00098 1.6875 7.1543l16 32
+c2.62598 5.23926 8.03613 8.8252 14.29 8.83008h48c8.83105 0 16 -7.16895 16 -16v-144h16zM336 384c8.83105 0 16 -7.16895 16 -16v-48c0 -8.83105 -7.16895 -16 -16 -16h-33.4805l-77.8096 -112l77.8096 -112h33.4805c8.83105 0 16 -7.16895 16 -16v-48
+c0 -8.83105 -7.16895 -16 -16 -16h-67c-5.41113 0.0273438 -10.1836 2.73047 -13.0596 6.87012l-79.9004 115l-79.9004 -115c-2.89062 -4.16016 -7.69531 -6.87012 -13.1396 -6.87012h-67c-8.83105 0 -16 7.16895 -16 16v48c0 8.83105 7.16895 16 16 16h33.4805l77.8096 112
+l-77.8096 112h-33.4805c-8.83105 0 -16 7.16895 -16 16v48c0 8.83105 7.16895 16 16 16h67c5.41113 -0.0273438 10.1836 -2.73047 13.0596 -6.87012l79.9004 -115l79.9004 115c2.89062 4.16016 7.69531 6.87012 13.1396 6.87012h67z" />
+    <glyph glyph-name="subscript" unicode="&#xf12c;" 
+d="M496 0c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-96c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h16v96h-16c-8.82422 0.0078125 -15.9775 7.18945 -15.9775 16.0156c0 2.57129 0.608398 5.00098 1.6875 7.1543l16 32
+c2.62598 5.23926 8.03613 8.8252 14.29 8.83008h48c8.83105 0 16 -7.16895 16 -16v-144h16zM336 384c8.83105 0 16 -7.16895 16 -16v-48c0 -8.83105 -7.16895 -16 -16 -16h-33.4805l-77.8096 -112l77.8096 -112h33.4805c8.83105 0 16 -7.16895 16 -16v-48
+c0 -8.83105 -7.16895 -16 -16 -16h-67c-5.41113 0.0273438 -10.1836 2.73047 -13.0596 6.87012l-79.9004 115l-79.9004 -115c-2.89062 -4.16016 -7.69531 -6.87012 -13.1396 -6.87012h-67c-8.83105 0 -16 7.16895 -16 16v48c0 8.83105 7.16895 16 16 16h33.4805l77.8096 112
+l-77.8096 112h-33.4805c-8.83105 0 -16 7.16895 -16 16v48c0 8.83105 7.16895 16 16 16h67c5.41113 -0.0273438 10.1836 -2.73047 13.0596 -6.87012l79.9004 -115l79.9004 115c2.89062 4.16016 7.69531 6.87012 13.1396 6.87012h67z" />
+    <glyph glyph-name="eraser" unicode="&#xf12d;" 
+d="M497.941 174.059l-142.059 -142.059h144.117c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-356c-13.2461 0 -25.2529 5.37012 -33.9424 14.0586l-96 96c-18.7441 18.7451 -18.7441 49.1377 0 67.8828l256 256
+c18.7471 18.7451 49.1387 18.7441 67.8838 0l160 -160c18.7441 -18.7451 18.7441 -49.1377 0 -67.8828zM195.314 236.686l-124.687 -124.686l80 -80h114.745l67.3135 67.3135z" />
+    <glyph glyph-name="puzzle-piece" unicode="&#xf12e;" horiz-adv-x="576" 
+d="M519.442 159.349c37.5957 0 56.5576 -31.5928 56.5576 -65.792c0 -33.5469 -19.2881 -61.5566 -54.9229 -61.5557c-39.8848 0 -50.3457 36.1523 -86.3086 36.1523c-60.5518 0 -25.8262 -120.102 -25.8262 -120.102c-51.5557 0 -181.23 -35.0732 -181.23 25.7305
+c0 35.8271 36.2881 46.25 36.2881 85.9844c0 35.501 -28.1152 54.7178 -61.7881 54.7178c-34.3271 0 -63.5771 -18.8906 -63.5771 -56.3467c0 -41.3633 40 -58.998 40 -81.4707c0 -69.709 -178.635 -28.6621 -178.635 -28.6621v333.237s175.885 -40.9609 175.884 28.6621
+c0 22.4727 -31.7109 40.3857 -31.7109 81.75c0 37.4551 31.7119 56.3457 66.3662 56.3457c33.3457 0 61.4609 -19.2158 61.4609 -54.7178c0 -39.7354 -36.2881 -50.1582 -36.2881 -85.9854c0 -83.2969 196.288 -3.29688 196.288 -3.29688
+s-54.5908 -176.244 5.38379 -176.244c22.5586 0 40.5391 31.5928 82.0586 31.5928z" />
+    <glyph glyph-name="microphone" unicode="&#xf130;" horiz-adv-x="352" 
+d="M176 96c-53.0195 0 -96 42.9805 -96 96v160c0 53.0195 42.9805 96 96 96s96 -42.9805 96 -96v-160c0 -53.0195 -42.9805 -96 -96 -96zM336 256c8.83984 0 16 -7.16016 16 -16v-48c0 -88.9004 -66.29 -162.47 -152 -174.23v-33.7695h56c8.83984 0 16 -7.16016 16 -16v-16
+c0 -8.83984 -7.16016 -16 -16 -16h-160c-8.83984 0 -16 7.16016 -16 16v16c0 8.83984 7.16016 16 16 16h56v34.1504c-88.0303 12.1396 -152 92.0498 -152 181.689v40.1602c0 8.83984 7.16016 16 16 16h16c8.83984 0 16 -7.16016 16 -16v-42.2998
+c0 -66.8105 48.71 -126.59 115.21 -133.08c76.2998 -7.44043 140.79 52.5801 140.79 127.38v48c0 8.83984 7.16016 16 16 16h16z" />
+    <glyph glyph-name="microphone-slash" unicode="&#xf131;" horiz-adv-x="640" 
+d="M633.82 -10.0996c6.97949 -5.43066 8.22949 -15.4805 2.81934 -22.4502l-19.6396 -25.2705c-5.42969 -6.97949 -15.4805 -8.23926 -22.46 -2.80957l-588.36 454.729c-6.97949 5.43066 -8.22949 15.4805 -2.80957 22.4502l19.6396 25.2705
+c5.41992 6.97949 15.4805 8.22949 22.46 2.80957l178.54 -137.99v45.3604c0 53.0195 42.9805 96 96 96c53.0205 0 96 -42.9805 96 -96v-160.01c0 -10.4502 -2.17969 -20.2705 -5.2793 -29.6699l26.5498 -20.5205c6.75977 15.4004 10.7197 32.2803 10.7197 50.2002v48
+c0 8.83984 7.16016 16 16 16h16c8.83984 0 16 -7.16016 16 -16v-48c0 -29.0098 -7.38965 -56.1299 -19.9805 -80.1396zM400 -16c8.83984 0 16 -7.16016 16 -16v-16c0 -8.83984 -7.16016 -16 -16 -16h-160c-8.83984 0 -16 7.16016 -16 16v16c0 8.83984 7.16016 16 16 16h56
+v34.1504c-88.0303 12.1396 -152 92.0498 -152 181.689v6.85059l52.0303 -40.2305c12.4395 -53.2197 55.3301 -96.4004 111.18 -101.85c6.94043 -0.669922 13.6396 -0.200195 20.3496 0.199219l50.1104 -38.7295c-10.8203 -3.77051 -22.0098 -6.70996 -33.6699 -8.31055
+v-33.7695h56z" />
+    <glyph glyph-name="calendar" unicode="&#xf133;" horiz-adv-x="448" 
+d="M12 256h424c6.59961 0 12 -5.40039 12 -12v-260c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v260c0 6.59961 5.40039 12 12 12zM448 300c0 -6.59961 -5.40039 -12 -12 -12h-424c-6.59961 0 -12 5.40039 -12 12v36c0 26.5 21.5 48 48 48h48v52
+c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h128v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h48c26.5 0 48 -21.5 48 -48v-36z" />
+    <glyph glyph-name="fire-extinguisher" unicode="&#xf134;" horiz-adv-x="448" 
+d="M434.027 421.671c7.31445 1.21875 13.9727 -4.4209 13.9727 -11.8369v-115.668c0 -7.41602 -6.6582 -13.0557 -13.9727 -11.8369l-168 28c-11.7305 1.95508 -10.0273 14.6973 -10.0273 17.6709h-40v-27.0303c41.4043 -10.6582 72 -48.2383 72 -92.9697v-248
+c0 -13.2549 -10.7451 -24 -24 -24h-144c-13.2549 0 -24 10.7451 -24 24v246.795c0 44.8945 30.457 83.2666 72 94.1289v27.0762c-61.0361 0 -92.9424 7.00977 -121.711 -64.9141c-4.91699 -12.2949 -18.8789 -18.2959 -31.1963 -13.3701
+c-12.3066 4.92285 -18.293 18.8906 -13.3701 31.1973c14.668 36.6709 38.0107 77.833 90.0498 90.8838c-14.1406 36.5273 12.793 76.2031 52.2275 76.2031c37.4463 0 64.3525 -36.1084 53.668 -72h58.332c0 4.2002 -1.30664 15.7822 10.0273 17.6709zM144 376
+c8.82227 0 16 7.17773 16 16s-7.17773 16 -16 16s-16 -7.17773 -16 -16s7.17773 -16 16 -16z" />
+    <glyph glyph-name="rocket" unicode="&#xf135;" 
+d="M505.12 428.906c6.95508 -32.2031 6.95508 -57.4062 6.86133 -82.6094c0 -102.688 -55.4375 -164.781 -128.035 -211.094v-104.438c0 -16.3594 -11.8789 -35.5625 -26.5078 -42.8594l-98.7275 -49.3906c-3.27441 -1.48047 -6.91699 -2.375 -10.707 -2.51562
+c-13.2471 0.00195312 -24.002 10.7539 -24.0059 24v103.844l-22.4746 -22.4688c-13.1211 -13.1562 -34.1211 -11.1875 -45.2773 0l-50.9043 50.9062c-12.9961 12.9922 -11.3652 33.8887 0 45.25l22.4746 22.4688h-103.811c-13.2461 0.00195312 -24.001 10.7539 -24.0059 24
+c0.136719 3.79004 1.03223 7.43164 2.51562 10.7031l49.4355 98.8125c7.33008 14.6094 26.5391 26.4688 42.8867 26.4844h104.215c46.2168 72.7969 108.122 128 211.354 128c25.0996 0 50.3086 0 82.5059 -6.90625c5.54883 -1.1875 11.0176 -6.65625 12.207 -12.1875z
+M384.04 280c22.0752 0.0078125 39.9971 17.9258 40.0098 40c0 22.0762 -17.9229 40 -40 40c-22.0762 0 -40 -17.9238 -40 -40c0 -22.0732 17.918 -39.9951 39.9902 -40z" />
+    <glyph glyph-name="chevron-circle-left" unicode="&#xf137;" 
+d="M256 -56c-137 0 -248 111 -248 248s111 248 248 248s248 -111 248 -248s-111 -248 -248 -248zM142.1 175l135.5 -135.5c9.40039 -9.40039 24.6006 -9.40039 33.9004 0l17 17c9.40039 9.40039 9.40039 24.5996 0 33.9004l-101.6 101.6l101.6 101.6
+c9.40039 9.40039 9.40039 24.6006 0 33.9004l-17 17c-9.40039 9.40039 -24.5996 9.40039 -33.9004 0l-135.5 -135.5c-9.39941 -9.40039 -9.39941 -24.5996 0 -34z" />
+    <glyph glyph-name="chevron-circle-right" unicode="&#xf138;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM369.9 209l-135.5 135.5c-9.40039 9.40039 -24.6006 9.40039 -33.9004 0l-17 -17c-9.40039 -9.40039 -9.40039 -24.5996 0 -33.9004l101.6 -101.6l-101.6 -101.6
+c-9.40039 -9.40039 -9.40039 -24.6006 0 -33.9004l17 -17c9.40039 -9.40039 24.5996 -9.40039 33.9004 0l135.5 135.5c9.39941 9.40039 9.39941 24.5996 0 34z" />
+    <glyph glyph-name="chevron-circle-up" unicode="&#xf139;" 
+d="M8 192c0 137 111 248 248 248s248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248zM239 305.9l-135.5 -135.5c-9.40039 -9.40039 -9.40039 -24.6006 0 -33.9004l17 -17c9.40039 -9.40039 24.5996 -9.40039 33.9004 0l101.6 101.6l101.6 -101.6
+c9.40039 -9.40039 24.6006 -9.40039 33.9004 0l17 17c9.40039 9.40039 9.40039 24.5996 0 33.9004l-135.5 135.5c-9.40039 9.39941 -24.5996 9.39941 -34 0z" />
+    <glyph glyph-name="chevron-circle-down" unicode="&#xf13a;" 
+d="M504 192c0 -137 -111 -248 -248 -248s-248 111 -248 248s111 248 248 248s248 -111 248 -248zM273 78.0996l135.5 135.5c9.40039 9.40039 9.40039 24.6006 0 33.9004l-17 17c-9.40039 9.40039 -24.5996 9.40039 -33.9004 0l-101.6 -101.6l-101.6 101.6
+c-9.40039 9.40039 -24.6006 9.40039 -33.9004 0l-17 -17c-9.40039 -9.40039 -9.40039 -24.5996 0 -33.9004l135.5 -135.5c9.40039 -9.39941 24.5996 -9.39941 34 0z" />
+    <glyph glyph-name="anchor" unicode="&#xf13d;" horiz-adv-x="576" 
+d="M12.9707 96c-10.6904 0 -16.0449 12.9258 -8.48535 20.4854l67.0283 67.0283c4.6875 4.68652 12.2852 4.68652 16.9717 0l67.0283 -67.0283c7.56055 -7.55957 2.20605 -20.4854 -8.48438 -20.4854h-35.1465c20.2969 -54.3359 85.1816 -86.6162 144.117 -94.0146v190.015
+h-52c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h52v5.46973c-37.2842 13.1807 -64 48.7324 -64 90.5303c0 53.4746 43.7227 96.7393 97.3701 95.9902c52.2354 -0.728516 94.6348 -43.7627 94.6289 -96.002
+c-0.00488281 -41.793 -26.7188 -77.3398 -64 -90.5186v-5.46973h52c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-52v-190.015c59.1543 7.42676 123.827 39.6973 144.117 94.0146h-35.1465c-10.6904 0 -16.0449 12.9248 -8.48438 20.4854
+l67.0283 67.0283c4.6875 4.68652 12.2852 4.68652 16.9717 0l67.0283 -67.0283c7.56055 -7.55957 2.20605 -20.4854 -8.48438 -20.4854h-32.3945c-21.7822 -102.62 -136.406 -160 -242.635 -160c-106.056 0 -220.828 57.2646 -242.635 160h-32.3945zM288 384
+c-17.6445 0 -32 -14.3555 -32 -32s14.3555 -32 32 -32s32 14.3555 32 32s-14.3555 32 -32 32z" />
+    <glyph glyph-name="unlock-alt" unicode="&#xf13e;" horiz-adv-x="448" 
+d="M400 192c26.5 0 48 -21.5 48 -48v-160c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v160c0 26.5 21.5 48 48 48h24v102.5c0 84 67.5 153.2 151.5 153.5s152.5 -68 152.5 -152v-16c0 -13.2998 -10.7002 -24 -24 -24h-32c-13.2998 0 -24 10.7002 -24 24v16
+c0 39.9004 -32.7002 72.4004 -72.7002 72c-39.5996 -0.400391 -71.2998 -33.2998 -71.2998 -72.9004v-103.1h248zM264 40v48c0 22.0996 -17.9004 40 -40 40s-40 -17.9004 -40 -40v-48c0 -22.0996 17.9004 -40 40 -40s40 17.9004 40 40z" />
+    <glyph glyph-name="bullseye" unicode="&#xf140;" horiz-adv-x="496" 
+d="M248 440c136.97 0 248 -111.03 248 -248s-111.03 -248 -248 -248s-248 111.03 -248 248s111.03 248 248 248zM248 8c101.71 0 184 82.3096 184 184c0 101.71 -82.3096 184 -184 184c-101.71 0 -184 -82.3096 -184 -184c0 -101.71 82.3096 -184 184 -184zM248 320
+c70.6904 0 128 -57.3096 128 -128s-57.3096 -128 -128 -128s-128 57.3096 -128 128s57.3096 128 128 128zM248 128c35.29 0 64 28.71 64 64s-28.71 64 -64 64s-64 -28.71 -64 -64s28.71 -64 64 -64z" />
+    <glyph glyph-name="ellipsis-h" unicode="&#xf141;" 
+d="M328 192c0 -39.7998 -32.2002 -72 -72 -72s-72 32.2002 -72 72s32.2002 72 72 72s72 -32.2002 72 -72zM432 264c39.7998 0 72 -32.2002 72 -72s-32.2002 -72 -72 -72s-72 32.2002 -72 72s32.2002 72 72 72zM80 264c39.7998 0 72 -32.2002 72 -72s-32.2002 -72 -72 -72
+s-72 32.2002 -72 72s32.2002 72 72 72z" />
+    <glyph glyph-name="ellipsis-v" unicode="&#xf142;" horiz-adv-x="192" 
+d="M96 264c39.7998 0 72 -32.2002 72 -72s-32.2002 -72 -72 -72s-72 32.2002 -72 72s32.2002 72 72 72zM24 368c0 39.7998 32.2002 72 72 72s72 -32.2002 72 -72s-32.2002 -72 -72 -72s-72 32.2002 -72 72zM24 16c0 39.7998 32.2002 72 72 72s72 -32.2002 72 -72
+s-32.2002 -72 -72 -72s-72 32.2002 -72 72z" />
+    <glyph glyph-name="rss-square" unicode="&#xf143;" horiz-adv-x="448" 
+d="M400 416c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h352zM112 32c26.5098 0 48 21.4902 48 48s-21.4902 48 -48 48s-48 -21.4902 -48 -48s21.4902 -48 48 -48zM269.533 32
+c6.53516 0 11.7764 5.46777 11.4248 11.9941c-5.9668 110.428 -94.418 198.99 -204.964 204.964c-6.52637 0.351562 -11.9941 -4.88965 -11.9941 -11.4248v-34.335c0 -6.00977 4.63574 -11.0508 10.6328 -11.4414c79.8799 -5.20312 143.909 -69.0732 149.123 -149.123
+c0.391602 -5.99805 5.43066 -10.6338 11.4424 -10.6338h34.335zM372.56 32c6.4541 0 11.6641 5.33789 11.4326 11.7871c-5.99512 167.014 -140.375 302.18 -308.205 308.205c-6.44922 0.231445 -11.7871 -4.97852 -11.7871 -11.4326v-34.334
+c0 -6.16016 4.88184 -11.1748 11.0391 -11.4277c136.556 -5.59863 246.162 -115.225 251.76 -251.76c0.251953 -6.15625 5.2666 -11.0381 11.4268 -11.0381h34.334z" />
+    <glyph glyph-name="play-circle" unicode="&#xf144;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM371.7 168c16.3994 9.09961 16.3994 32.7998 0 42l-176 107c-15.9004 8.7998 -35.7002 -2.59961 -35.7002 -21v-208c0 -18.5 19.9004 -29.7998 35.7002 -21z" />
+    <glyph glyph-name="minus-square" unicode="&#xf146;" horiz-adv-x="448" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM92 152h264c6.59961 0 12 5.40039 12 12v56c0 6.59961 -5.40039 12 -12 12h-264c-6.59961 0 -12 -5.40039 -12 -12v-56
+c0 -6.59961 5.40039 -12 12 -12z" />
+    <glyph glyph-name="check-square" unicode="&#xf14a;" horiz-adv-x="448" 
+d="M400 -32h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h352c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48zM195.314 66.0586l184 184c6.24707 6.24805 6.24707 16.3799 0 22.627l-22.6279 22.6279
+c-6.24707 6.24707 -16.3789 6.24805 -22.6279 0l-150.059 -150.059l-70.0586 70.0596c-6.24805 6.24707 -16.3799 6.24707 -22.6279 0l-22.6279 -22.6279c-6.24707 -6.24707 -6.24707 -16.3789 0 -22.627l104 -104c6.24902 -6.25 16.3799 -6.25 22.6289 -0.000976562z" />
+    <glyph glyph-name="pen-square" unicode="&#xf14b;" horiz-adv-x="448" 
+d="M400 -32h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48zM238.1 270.1l-135.699 -135.699l-6.30078 -57.1006c-0.799805 -7.59961 5.60059 -14.0996 13.3008 -13.2998l57.0996 6.2998l135.7 135.7
+c2.2998 2.2998 2.2998 6.09961 0 8.5l-55.5 55.5c-2.5 2.40039 -6.2998 2.40039 -8.60059 0.0996094zM345 282.9l-30.0996 30.0996c-9.40039 9.40039 -24.6006 9.40039 -33.9004 0l-23.0996 -23.0996c-2.30078 -2.30078 -2.30078 -6.10059 0 -8.5l55.5 -55.5
+c2.2998 -2.30078 6.09961 -2.30078 8.5 0l23.0996 23.0996c9.2998 9.2998 9.2998 24.5 0 33.9004z" />
+    <glyph glyph-name="share-square" unicode="&#xf14d;" horiz-adv-x="576" 
+d="M568.482 270.552l-144.004 -135.984c-15.1787 -14.335 -40.4785 -3.70703 -40.4785 17.4473v71.9629c-144.575 -0.969727 -205.566 -35.1123 -164.775 -171.353c4.4834 -14.9727 -12.8457 -26.5674 -25.0059 -17.3301
+c-38.9668 29.5996 -74.2188 86.2168 -74.2188 143.366c0 143.937 117.599 172.5 264 173.312v72.0156c0 21.1738 25.3174 31.7676 40.4785 17.4473l144.004 -135.987c10.0195 -9.46289 10.0273 -25.4248 0 -34.8965zM384 68.8721c0 7.34473 6.53027 12.9053 13.7998 11.8594
+c3.36816 -0.485352 6.75977 -0.711914 10.2607 -0.711914c8.3877 0 16.4424 1.44043 23.9287 4.08887c7.81348 2.76367 16.0107 -3.01465 16.0107 -11.3027v-88.8057c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48
+h121.033c12.5508 0 16.6748 -16.8301 5.54492 -22.6309c-18.7773 -9.78613 -36.0615 -22.1084 -51.0137 -37.6758c-2.18164 -2.27637 -5.25098 -3.69141 -8.64844 -3.69336h-50.916v-320h320v68.8721z" />
+    <glyph glyph-name="compass" unicode="&#xf14e;" horiz-adv-x="496" 
+d="M225.38 214.63c12.4902 12.4902 32.75 12.4902 45.25 0s12.5 -32.75 0 -45.25c-12.4902 -12.5 -32.7598 -12.5 -45.25 0c-12.5 12.4902 -12.5 32.75 0 45.25zM248 440c136.97 0 248 -111.03 248 -248s-111.03 -248 -248 -248s-248 111.03 -248 248s111.03 248 248 248z
+M374.14 291.95c7.61035 16.6494 -9.54004 33.7998 -26.1895 26.2002l-144.34 -65.9707c-6.98438 -3.19238 -12.5781 -8.78516 -15.7705 -15.7695l-65.9795 -144.351c-7.61035 -16.6494 9.5498 -33.8096 26.1992 -26.1992l144.341 65.9697
+c6.9834 3.19238 12.5771 8.78613 15.7695 15.7695z" />
+    <glyph glyph-name="caret-square-down" unicode="&#xf150;" horiz-adv-x="448" 
+d="M448 368v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48zM92.5 227.5l123 -123c4.7002 -4.7002 12.2998 -4.7002 17 0l123 123c7.59961 7.59961 2.2002 20.5 -8.5 20.5h-246
+c-10.7002 0 -16.0996 -12.9004 -8.5 -20.5z" />
+    <glyph glyph-name="caret-square-up" unicode="&#xf151;" horiz-adv-x="448" 
+d="M0 16v352c0 26.5098 21.4902 48 48 48h352c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48zM355.515 156.485l-123.029 123.029c-4.68652 4.68652 -12.2842 4.68652 -16.9717 0l-123.028 -123.029
+c-7.56055 -7.56055 -2.20605 -20.4854 8.48438 -20.4854h246.06c10.6904 0 16.0449 12.9258 8.48535 20.4854z" />
+    <glyph glyph-name="caret-square-right" unicode="&#xf152;" horiz-adv-x="448" 
+d="M48 416h352c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48zM188.485 60.4854l123.028 123.028c4.68652 4.68652 4.68652 12.2842 0 16.9717l-123.028 123.029
+c-7.56055 7.56055 -20.4854 2.20605 -20.4854 -8.48438v-246.06c0 -10.6904 12.9258 -16.0449 20.4854 -8.48535z" />
+    <glyph glyph-name="euro-sign" unicode="&#xf153;" horiz-adv-x="320" 
+d="M310.706 34.2354l8.81836 -44.4902c1.23828 -6.24902 -2.62109 -12.3623 -8.78809 -13.957c-12.5391 -3.24414 -34.8008 -7.78809 -61.1016 -7.78809c-104.371 0 -182.496 65.3076 -207.521 155.64h-30.1143c-6.62695 0 -12 5.37305 -12 12v28.3604
+c0 6.62695 5.37305 12 12 12h21.3877c-1 12.958 -0.828125 28.6377 0.181641 42.2451h-21.5693c-6.62695 0 -12 5.37305 -12 12v29.7549c0 6.62695 5.37305 12 12 12h33.0752c28.9551 83.748 107.376 144 204.56 144c21.0752 0 40.582 -2.91211 52.6865 -5.20703
+c6.86035 -1.30078 11.1475 -8.17578 9.32617 -14.917l-11.9912 -44.3682c-1.65527 -6.125 -7.78613 -9.89062 -14.002 -8.62305c-9.28711 1.89551 -23.3652 4.14551 -37.8516 4.14551c-54.9287 0 -96.9854 -30.0391 -117.619 -75.0303h138.278
+c7.66211 0 13.3613 -7.08203 11.7227 -14.5664l-6.51172 -29.7549c-1.17969 -5.3877 -5.9834 -9.43359 -11.7227 -9.43359h-146.593c-1.55176 -13.958 -1.34766 -27.917 -0.137695 -42.2451h134.237c7.68945 0 13.3936 -7.12891 11.708 -14.6309l-6.37305 -28.3604
+c-1.20312 -5.35547 -5.99121 -9.36914 -11.708 -9.36914h-113.689c19.5322 -50.6582 64.6982 -85.4482 121.462 -85.4482c18.0039 0 34.7334 2.97363 45.4258 5.41211c6.58887 1.50391 13.1094 -2.73828 14.4238 -9.36816z" />
+    <glyph glyph-name="pound-sign" unicode="&#xf154;" horiz-adv-x="320" 
+d="M308 96c6.62695 0 12 -5.37305 12 -12v-104c0 -6.62695 -5.37305 -12 -12 -12h-296c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h36v128h-28c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h28v66.0391
+c0 73.2188 58.0264 125.961 139.931 125.961c48.6455 0 85.1934 -22.5596 101.575 -34.9277c5.39844 -4.07617 6.35254 -11.8057 2.11914 -17.0811l-28.4932 -35.5137c-3.7998 -4.73535 -10.5371 -5.89746 -15.6875 -2.68457
+c-11.7744 7.34375 -33.9941 18.8486 -57.6523 18.8486c-37.2305 0 -61.792 -24.8193 -61.792 -57.0859v-63.5557h84c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-84v-126.848h122.505v50.8477c0 6.62695 5.37305 12 12 12h45.4951z" />
+    <glyph glyph-name="dollar-sign" unicode="&#xf155;" horiz-adv-x="288" 
+d="M209.2 214.6c57.8994 -16.8994 94 -80.0996 72.5 -141.699c-15.4004 -44.1006 -59.1006 -71.8008 -105.7 -72.7002v-48.2002c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v48c-31.4004 0.0996094 -62 10.7998 -86.5 30
+c-7.90039 6.09961 -8.90039 17.5996 -1.7998 24.5l34.7998 34c5.2002 5.09961 13.4004 6.09961 19.5 2c10 -6.7998 22 -10.5 34.2002 -10.5h66.2998c16.2998 0 29.5 13.2002 29.5 29.5c0 13 -8.7002 24.5996 -21.2002 28.2998l-102.5 30
+c-44.3994 13 -79.5996 50.5 -83.7998 96.6006c-5.90039 64.8994 45.2998 119.6 109 119.6h2.5v48c0 8.7998 7.2002 16 16 16h32c8.7998 0 16 -7.2002 16 -16v-48c31.4004 -0.0996094 62 -10.7998 86.5 -30c7.90039 -6.09961 8.90039 -17.5996 1.7998 -24.5l-34.7998 -34
+c-5.2002 -5.09961 -13.4004 -6.09961 -19.5 -2c-10 6.7998 -22 10.5 -34.2002 10.5h-66.2998c-16.2998 0 -29.5 -13.2002 -29.5 -29.5c0 -13 8.7002 -24.7002 21.2002 -28.2998z" />
+    <glyph glyph-name="rupee-sign" unicode="&#xf156;" horiz-adv-x="320" 
+d="M308 352h-72.9424c5.97266 -9.75391 10.7666 -20.459 14.252 -32h58.6904c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-52.8105c-7.1748 -74.5107 -61.8193 -125.566 -138.318 -127.906l150.882 -139.275
+c8.02734 -7.41016 2.78516 -20.8184 -8.13867 -20.8184h-82.5625c-3.1377 0 -6 1.20801 -8.13867 3.18164l-165.052 152.356c-2.46094 2.27148 -3.86133 5.46875 -3.86133 8.81836v53.0117c0 6.62695 5.37305 12 12 12h84c41.7959 0 68.54 22.5459 74.7568 58.6318h-158.757
+c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h146.25c-12.709 17.2939 -33.6621 27.252 -60.9697 27.252h-85.2803c-6.62695 0 -12 5.37305 -12 12v44.748c0 6.62695 5.37305 12 12 12h296c6.62695 0 12 -5.37305 12 -12v-40
+c0 -6.62695 -5.37305 -12 -12 -12z" />
+    <glyph glyph-name="yen-sign" unicode="&#xf157;" horiz-adv-x="384" 
+d="M351.2 416c9.09961 0 14.8994 -9.7002 10.5996 -17.5996l-80.0996 -150.4h58.2998c6.59961 0 12 -5.40039 12 -12v-32c0 -6.59961 -5.40039 -12 -12 -12h-88.2002l-19.7998 -37.2002v-26.7998h108c6.59961 0 12 -5.40039 12 -12v-32c0 -6.59961 -5.40039 -12 -12 -12
+h-108v-92c0 -6.59961 -5.40039 -12 -12 -12h-56c-6.59961 0 -12 5.40039 -12 12v92h-108c-6.59961 0 -12 5.40039 -12 12v32c0 6.59961 5.40039 12 12 12h108v26.7998l-19.7998 37.2002h-88.2002c-6.59961 0 -12 5.40039 -12 12v32c0 6.59961 5.40039 12 12 12h58.2998
+l-80.0996 150.4c-4.2002 7.89941 1.5 17.5996 10.5996 17.5996h65.2002c4.59961 0 8.7998 -2.59961 10.7998 -6.7002l55.4004 -113.2c14.5 -34.6992 27.0996 -71.8994 27.0996 -71.8994h1.2998s12.6006 37.2002 27.1006 71.8994l55.3994 113.2
+c2 4.10059 6.2002 6.7002 10.8008 6.7002h65.2998z" />
+    <glyph glyph-name="ruble-sign" unicode="&#xf158;" horiz-adv-x="384" 
+d="M239.36 128h-92.8008v-32h161.44c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-161.44v-52c0 -6.62695 -5.37305 -12 -12 -12h-58.5596c-6.62695 0 -12 5.37305 -12 12v52h-52c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h52
+v32h-52c-6.62695 0 -12 5.37305 -12 12v45.3682c0 6.62695 5.37305 12 12 12h52v206.632c0 6.62695 5.37305 12 12 12h163.36c85.1201 0 144.64 -57.5996 144.64 -143.071c0 -85.4707 -59.5195 -144.929 -144.64 -144.929zM146.56 347.252v-149.884h77.4404
+c48 0 76.1602 29.7285 76.1602 75.5605c0 45.2129 -28.1602 74.3232 -74.8799 74.3232h-78.7207z" />
+    <glyph glyph-name="won-sign" unicode="&#xf159;" horiz-adv-x="576" 
+d="M564 256h-62.7002l-7.39941 -32h70.0996c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-84.9004l-42.0996 -182.7c-1.2998 -5.39941 -6.09961 -9.2998 -11.7002 -9.2998h-56.7998c-5.59961 0 -10.4004 3.90039 -11.7002 9.2998l-42.3994 182.7
+h-55.1006l-42.2998 -182.7c-1.2998 -5.39941 -6.09961 -9.2998 -11.7002 -9.2998h-56.7998c-5.59961 0 -10.5 3.90039 -11.7002 9.40039l-40.8994 182.6h-83.9004c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h69.5l-7.2002 32h-62.2998
+c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h48l-18.0996 80.7002c-1.7002 7.5 4 14.5996 11.6992 14.5996h42.1006c5.7002 0 10.7002 -4 11.7998 -9.59961l17.5 -85.7002h108.7l20 86c1.2998 5.5 6.09961 9.2998 11.7002 9.2998h44
+c5.59961 0 10.3994 -3.7998 11.6992 -9.2998l19.7002 -86h109.9l14.3994 85.7998c1.10059 5.5 6 9.5 11.7002 9.5h46.1006c7.69922 0 13.3994 -7.2002 11.6992 -14.7002l-18.5996 -80.5996h48c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12zM183.8 106
+l12.6006 54h-38.8008l11 -54c5.10059 -25.2002 6.80078 -47.2002 6.80078 -47.2002h1.09961c0.5 0 1.09961 21.4004 7.2998 47.2002zM211.3 224l7.5 32h-80.7998l6.5 -32h66.7998zM274.2 224h25.3994l-2 8.59961c-1.89941 8 -3.5 16 -4.7998 23.4004h-11.7998
+c-1.2998 -7.40039 -2.90039 -15.4004 -4.7998 -23.4004zM405.1 106l11.5 54h-39.0996l12.4004 -54c6.19922 -25.7998 6.69922 -47.2002 7.2998 -47.2002h1.09961s1.7002 22 6.7998 47.2002zM430.3 224l6.90039 32h-81.6006l7.30078 -32h67.3994z" />
+    <glyph glyph-name="file" unicode="&#xf15b;" horiz-adv-x="384" 
+d="M224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136zM384 326.1v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7l97.9004 -98
+c4.5 -4.5 7 -10.5996 7 -16.9004z" />
+    <glyph glyph-name="file-alt" unicode="&#xf15c;" horiz-adv-x="384" 
+d="M224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136zM288 76v8c0 6.59961 -5.40039 12 -12 12h-168c-6.59961 0 -12 -5.40039 -12 -12v-8
+c0 -6.59961 5.40039 -12 12 -12h168c6.59961 0 12 5.40039 12 12zM288 140v8c0 6.59961 -5.40039 12 -12 12h-168c-6.59961 0 -12 -5.40039 -12 -12v-8c0 -6.59961 5.40039 -12 12 -12h168c6.59961 0 12 5.40039 12 12zM288 212c0 6.59961 -5.40039 12 -12 12h-168
+c-6.59961 0 -12 -5.40039 -12 -12v-8c0 -6.59961 5.40039 -12 12 -12h168c6.59961 0 12 5.40039 12 12v8zM384 326.1v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7l97.9004 -98c4.5 -4.5 7 -10.5996 7 -16.9004z" />
+    <glyph glyph-name="sort-alpha-down" unicode="&#xf15d;" horiz-adv-x="448" 
+d="M176 96c14.2197 0 21.3496 -17.2598 11.3301 -27.3096l-80 -96c-2.89551 -2.89453 -6.89844 -4.68555 -11.3125 -4.68555c-4.41309 0 -8.41211 1.79102 -11.3076 4.68555l-80 96c-10.0703 10.0693 -2.90039 27.3096 11.29 27.3096h48v304c0 8.83105 7.16895 16 16 16h32
+c8.83105 0 16 -7.16895 16 -16v-304h48zM416 160c8.83105 0 16 -7.16895 16 -16v-17.6299c0 -9.51074 -4.14355 -18.0566 -10.7402 -23.9199l-61.2598 -70.4502h56c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-128c-8.83105 0 -16 7.16895 -16 16
+v17.6299c0 9.51074 4.14355 18.0566 10.7402 23.9199l61.2598 70.4502h-56c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h128zM447.06 245.38c0.600586 -1.67969 0.931641 -3.49512 0.931641 -5.37988c0 -8.82812 -7.16406 -15.9951 -15.9912 -16h-24.8398
+c-0.015625 0 -0.0263672 -0.00195312 -0.0419922 -0.00195312c-7.11426 0 -13.1514 4.6543 -15.2285 11.082l-4.40918 12.9199h-71l-4.4209 -12.9199c-2.07617 -6.42773 -8.10938 -11.0801 -15.2246 -11.0801h-0.00488281h-24.8301
+c-8.82715 0.00488281 -15.9863 7.17773 -15.9863 16.0049c0 1.88574 0.326172 3.69531 0.926758 5.375l59.2695 160c2.20996 6.19043 8.125 10.6201 15.0703 10.6201h41.4395c6.94531 0 12.8604 -4.42969 15.0703 -10.6201zM335.61 304h32.7793l-16.3896 48z" />
+    <glyph glyph-name="sort-alpha-up" unicode="&#xf15e;" horiz-adv-x="448" 
+d="M16 288c-14.2197 0 -21.3496 17.2598 -11.3096 27.3096l80 96c2.89551 2.89453 6.89844 4.68555 11.3115 4.68555c4.41406 0 8.41211 -1.79102 11.3076 -4.68555l80 -96c10.0703 -10.0693 2.90039 -27.3096 -11.3096 -27.3096h-48v-304c0 -8.83105 -7.16895 -16 -16 -16
+h-32c-8.83105 0 -16 7.16895 -16 16v304h-48zM416 160c8.83105 0 16 -7.16895 16 -16v-17.6299c0 -9.51074 -4.14355 -18.0566 -10.7402 -23.9199l-61.2598 -70.4502h56c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-128
+c-8.83105 0 -16 7.16895 -16 16v17.6299c0 9.51074 4.14355 18.0566 10.7402 23.9199l61.2598 70.4502h-56c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h128zM447.06 245.38c0.600586 -1.67969 0.931641 -3.49512 0.931641 -5.37988
+c0 -8.82812 -7.16406 -15.9951 -15.9912 -16h-24.8398c-0.015625 0 -0.0263672 -0.00195312 -0.0419922 -0.00195312c-7.11426 0 -13.1514 4.6543 -15.2285 11.082l-4.40918 12.9199h-71l-4.4209 -12.9199c-2.07617 -6.42773 -8.10938 -11.0801 -15.2246 -11.0801
+h-0.00488281h-24.8301c-8.82715 0.00488281 -15.9863 7.17773 -15.9863 16.0049c0 1.88574 0.326172 3.69531 0.926758 5.375l59.2695 160c2.20996 6.19043 8.125 10.6201 15.0703 10.6201h41.4395c6.94531 0 12.8604 -4.42969 15.0703 -10.6201zM335.61 304h32.7793
+l-16.3896 48z" />
+    <glyph glyph-name="sort-amount-down" unicode="&#xf160;" 
+d="M304 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-64c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h64zM176 96c14.2197 0 21.3496 -17.2598 11.3301 -27.3096l-80 -96
+c-2.89551 -2.89453 -6.89844 -4.68555 -11.3125 -4.68555c-4.41309 0 -8.41211 1.79102 -11.3076 4.68555l-80 96c-10.0801 10.0693 -2.90039 27.3096 11.29 27.3096h48v304c0 8.83105 7.16895 16 16 16h32c8.83105 0 16 -7.16895 16 -16v-304h48zM432 288
+c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-192c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h192zM368 160c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-128c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h128zM496 416c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-256c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h256z" />
+    <glyph glyph-name="sort-amount-up" unicode="&#xf161;" 
+d="M304 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-64c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h64zM16 288c-14.2305 0 -21.3496 17.2598 -11.3096 27.3096l80 96c2.89551 2.89453 6.89844 4.68555 11.3115 4.68555
+c4.41406 0 8.41211 -1.79102 11.3076 -4.68555l80 -96c10.0703 -10.0693 2.90039 -27.3096 -11.3096 -27.3096h-48v-304c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v304h-48zM432 288c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-192c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h192zM368 160c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-128c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h128zM496 416
+c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-256c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h256z" />
+    <glyph glyph-name="sort-numeric-down" unicode="&#xf162;" horiz-adv-x="448" 
+d="M304 352c-8.82422 0.0078125 -15.9775 7.18945 -15.9775 16.0156c0 2.57129 0.608398 5.00098 1.6875 7.1543l16 32c2.62598 5.23926 8.03613 8.8252 14.29 8.83008h48c8.83105 0 16 -7.16895 16 -16v-112h16c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-96c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h16v64h-16zM330.15 189.09c53.4502 14.25 101.85 -25.8799 101.869 -77.0898v-10.7695c0 -70.3906 -28.25 -107.24 -86.25 -132
+c-8.36914 -3.58008 -18.0293 1.2793 -20.8994 9.90918l-9.90039 20c-2.62012 7.87012 0.610352 16.9404 8.18066 20.3408c7.59961 3.28516 14.6064 7.64258 20.8496 12.9092c-47.6396 4.76074 -83.0996 51.4805 -68.8496 102.53c7.62793 26.2793 28.5596 46.9287 55 54.1699
+zM352 92c11.0381 0 20 8.96191 20 20s-8.96191 20 -20 20s-20 -8.96191 -20 -20s8.96191 -20 20 -20zM176 96c14.2197 0 21.3496 -17.2598 11.3301 -27.3096l-80 -96c-2.89551 -2.89453 -6.89844 -4.68555 -11.3125 -4.68555c-4.41309 0 -8.41211 1.79102 -11.3076 4.68555
+l-80 96c-10.0703 10.0693 -2.90039 27.3096 11.29 27.3096h48v304c0 8.83105 7.16895 16 16 16h32c8.83105 0 16 -7.16895 16 -16v-304h48z" />
+    <glyph glyph-name="sort-numeric-up" unicode="&#xf163;" horiz-adv-x="448" 
+d="M330.17 189.09c53.4502 14.25 101.83 -25.8799 101.85 -77.0898v-10.7695c0 -70.3906 -28.25 -107.24 -86.25 -132c-8.36914 -3.58008 -18.0293 1.2793 -20.8994 9.90918l-9.90039 20c-2.62012 7.87012 0.610352 16.9404 8.18066 20.3408
+c7.59961 3.28516 14.6064 7.64258 20.8496 12.9092c-47.6396 4.76074 -83.0996 51.4805 -68.8301 102.53c7.62891 26.2793 28.5596 46.9287 55 54.1699zM352 92c11.0381 0 20 8.96191 20 20s-8.96191 20 -20 20s-20 -8.96191 -20 -20s8.96191 -20 20 -20zM304 352
+c-8.82422 0.0078125 -15.9775 7.18945 -15.9775 16.0156c0 2.57129 0.608398 5.00098 1.6875 7.1543l16 32c2.62598 5.23926 8.03613 8.8252 14.29 8.83008h48c8.83105 0 16 -7.16895 16 -16v-112h16c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-96
+c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h16v64h-16zM107.31 411.31l80 -96c10.0703 -10.0693 2.90039 -27.3096 -11.3096 -27.3096h-48v-304c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v304h-48
+c-14.2197 0 -21.3496 17.2598 -11.3096 27.3096l80 96c2.89551 2.89453 6.89844 4.68555 11.3115 4.68555c4.41406 0 8.41211 -1.79102 11.3076 -4.68555z" />
+    <glyph glyph-name="thumbs-up" unicode="&#xf164;" 
+d="M104 224c13.2549 0 24 -10.7451 24 -24v-240c0 -13.2549 -10.7451 -24 -24 -24h-80c-13.2549 0 -24 10.7451 -24 24v240c0 13.2549 10.7451 24 24 24h80zM64 -24c13.2549 0 24 10.7451 24 24s-10.7451 24 -24 24s-24 -10.7451 -24 -24s10.7451 -24 24 -24zM384 366.548
+c0 -42.416 -25.9697 -66.208 -33.2773 -94.5479h101.724c33.3965 0 59.3965 -27.7461 59.5527 -58.0977c0.0839844 -17.9385 -7.5459 -37.249 -19.4395 -49.1973l-0.109375 -0.110352c9.83594 -23.3369 8.23633 -56.0371 -9.30859 -79.4688
+c8.68164 -25.8945 -0.0683594 -57.7041 -16.3818 -74.7568c4.29785 -17.5977 2.24414 -32.5752 -6.14746 -44.6318c-20.4102 -29.3242 -70.9961 -29.7373 -113.773 -29.7373l-2.84473 0.000976562c-48.2871 0.0166016 -87.8057 17.5977 -119.561 31.7246
+c-15.957 7.09961 -36.8203 15.8877 -52.6504 16.1787c-6.54004 0.120117 -11.7832 5.45703 -11.7832 11.998v213.77c0 3.2002 1.28223 6.27148 3.55762 8.52148c39.6143 39.1436 56.6484 80.5869 89.1172 113.11c14.8037 14.832 20.1885 37.2363 25.3936 58.9023
+c4.44629 18.501 13.749 57.7939 33.9316 57.7939c24 0 72 -8 72 -81.4521z" />
+    <glyph glyph-name="thumbs-down" unicode="&#xf165;" 
+d="M0 392c0 13.2549 10.7451 24 24 24h80c13.2549 0 24 -10.7451 24 -24v-240c0 -13.2549 -10.7451 -24 -24 -24h-80c-13.2549 0 -24 10.7451 -24 24v240zM40 192c0 -13.2549 10.7451 -24 24 -24s24 10.7451 24 24s-10.7451 24 -24 24s-24 -10.7451 -24 -24zM312 -64
+c-20.1826 0 -29.4854 39.293 -33.9307 57.7949c-5.20605 21.666 -10.5889 44.0703 -25.3936 58.9023c-32.4688 32.5234 -49.5029 73.9668 -89.1172 113.11c-2.19727 2.17285 -3.55762 5.19043 -3.55762 8.52148v213.77c0 6.54102 5.24316 11.8779 11.7832 11.998
+c15.8311 0.290039 36.6934 9.0791 52.6504 16.1787c31.7549 14.127 71.2744 31.708 119.561 31.7246h2.84375c42.7773 0 93.3633 -0.413086 113.774 -29.7373c8.3916 -12.0566 10.4453 -27.0342 6.14746 -44.6318c16.3125 -17.0527 25.0635 -48.8633 16.3818 -74.7568
+c17.5439 -23.4316 19.1436 -56.1318 9.30859 -79.4688l0.109375 -0.110352c11.8936 -11.9492 19.5234 -31.2588 19.4395 -49.1973c-0.15625 -30.3516 -26.1572 -58.0977 -59.5527 -58.0977h-101.725c7.30762 -28.3398 33.2773 -52.1318 33.2773 -94.5479
+c0 -73.4521 -48 -81.4521 -72 -81.4521z" />
+    <glyph glyph-name="female" unicode="&#xf182;" horiz-adv-x="256" 
+d="M128 448c35.3457 0 64 -28.6543 64 -64s-28.6543 -64 -64 -64s-64 28.6543 -64 64s28.6543 64 64 64zM247.283 93.8213c3.78809 -15.1504 -7.69238 -29.8213 -23.2832 -29.8213h-56v-104c0 -13.2549 -10.7451 -24 -24 -24h-32c-13.2549 0 -24 10.7451 -24 24v104h-56
+c-15.6172 0 -27.0654 14.6953 -23.2832 29.8213l48 192c2.6084 10.4316 12.0488 18.1787 23.2832 18.1787h11.3604c23.6895 -10.8936 50.5684 -10.4434 73.2793 0h11.3604c11.2344 0 20.6748 -7.74707 23.2832 -18.1787z" />
+    <glyph glyph-name="male" unicode="&#xf183;" horiz-adv-x="192" 
+d="M96 448c35.3457 0 64 -28.6543 64 -64s-28.6543 -64 -64 -64s-64 28.6543 -64 64s28.6543 64 64 64zM144 304c26.5098 0 48 -21.4902 48 -48v-136c0 -13.2549 -10.7451 -24 -24 -24h-16v-136c0 -13.2549 -10.7451 -24 -24 -24h-64c-13.2549 0 -24 10.7451 -24 24v136h-16
+c-13.2549 0 -24 10.7451 -24 24v136c0 26.5098 21.4902 48 48 48h11.3604c23.6895 -10.8936 50.5684 -10.4434 73.2793 0h11.3604z" />
+    <glyph glyph-name="sun" unicode="&#xf185;" 
+d="M256 288c52.9004 0 96 -43.0996 96 -96s-43.0996 -96 -96 -96s-96 43.0996 -96 96s43.0996 96 96 96zM502.4 207.5c12.7998 -6.40039 12.7998 -24.5996 -0.200195 -31.0996l-94.7002 -47.3008l33.5 -100.399c4.59961 -13.5 -8.2998 -26.4004 -21.9004 -21.9004
+l-100.399 33.5l-47.2998 -94.7002c-6.40039 -12.7998 -24.6006 -12.7998 -31 0l-47.3008 94.7002l-100.399 -33.5c-13.5 -4.59961 -26.4004 8.2998 -21.9004 21.9004l33.5 100.5l-94.7002 47.2998c-12.7998 6.40039 -12.7998 24.5996 0 31l94.7002 47.4004l-33.5 100.399
+c-4.59961 13.5 8.2998 26.4004 21.9004 21.9004l100.5 -33.5l47.2998 94.7002c6.40039 12.7998 24.5996 12.7998 31 0l47.4004 -94.8008l100.399 33.5c13.5 4.60059 26.4004 -8.2998 21.9004 -21.8994l-33.5 -100.4zM346.5 101.5c49.9004 49.9004 49.9004 131.1 0 181
+s-131.1 49.9004 -181 0s-49.9004 -131.1 0 -181s131.1 -49.9004 181 0z" />
+    <glyph glyph-name="moon" unicode="&#xf186;" 
+d="M283.211 -64c-141.489 0 -256 114.691 -256 256c0 141.489 114.691 256 256 256c16.0479 -0.00195312 31.5352 -1.46973 46.7754 -4.28027c11.0059 -2.0332 13.4414 -16.7178 3.75586 -22.2295c-62.8359 -35.7588 -101.498 -102.172 -101.498 -174.395
+c0 -125.378 114.059 -220.607 238.262 -196.954c10.9229 2.08008 18.6299 -10.6416 11.5625 -19.3496c-47.7783 -58.8672 -119.896 -94.792 -198.857 -94.792z" />
+    <glyph glyph-name="archive" unicode="&#xf187;" 
+d="M32 0v288h448v-288c0 -17.7002 -14.2998 -32 -32 -32h-384c-17.7002 0 -32 14.2998 -32 32zM192 212v-8c0 -6.59961 5.40039 -12 12 -12h104c6.59961 0 12 5.40039 12 12v8c0 6.59961 -5.40039 12 -12 12h-104c-6.59961 0 -12 -5.40039 -12 -12zM480 416
+c17.7002 0 32 -14.2998 32 -32v-48c0 -8.7998 -7.2002 -16 -16 -16h-480c-8.7998 0 -16 7.2002 -16 16v48c0 17.7002 14.2998 32 32 32h448z" />
+    <glyph glyph-name="bug" unicode="&#xf188;" 
+d="M511.988 159.1c-0.478516 -17.4297 -15.2168 -31.0996 -32.6533 -31.0996h-55.335v-16c0 -21.8643 -4.88184 -42.584 -13.5996 -61.1445l60.2275 -60.2285c12.4961 -12.4971 12.4961 -32.7578 0 -45.2549c-12.498 -12.4971 -32.7588 -12.4961 -45.2559 0
+l-54.7363 54.7363c-24.75 -20.0732 -56.2852 -32.1084 -90.6357 -32.1084v244c0 6.62695 -5.37305 12 -12 12h-24c-6.62695 0 -12 -5.37305 -12 -12v-244c-34.3506 0 -65.8857 12.0352 -90.6357 32.1084l-54.7363 -54.7363c-12.498 -12.4971 -32.7588 -12.4961 -45.2559 0
+c-12.4961 12.4971 -12.4961 32.7578 0 45.2549l60.2275 60.2285c-8.71777 18.5605 -13.5996 39.2803 -13.5996 61.1445v16h-55.334c-17.4355 0 -32.1748 13.6699 -32.6533 31.0996c-0.49707 18.084 14.0156 32.9004 31.9873 32.9004h56v58.7451l-46.6279 46.6279
+c-12.4961 12.4971 -12.4961 32.7578 0 45.2549c12.498 12.4971 32.7578 12.4971 45.2559 0l54.627 -54.6279h229.489l54.627 54.627c12.498 12.4971 32.7578 12.4971 45.2559 0c12.4961 -12.4971 12.4961 -32.7578 0 -45.2549l-46.627 -46.627v-58.7451h56
+c17.9717 0 32.4844 -14.8164 31.9883 -32.9004zM257 448c61.8564 0 112 -50.1436 112 -112h-224c0 61.8564 50.1436 112 112 112z" />
+    <glyph glyph-name="caret-square-left" unicode="&#xf191;" horiz-adv-x="448" 
+d="M400 -32h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h352c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48zM259.515 323.515l-123.029 -123.029c-4.68652 -4.68652 -4.68652 -12.2842 0 -16.9717l123.028 -123.028
+c7.56055 -7.56055 20.4854 -2.20605 20.4854 8.48438v246.06c0.000976562 10.6904 -12.9248 16.0449 -20.4844 8.48535z" />
+    <glyph glyph-name="dot-circle" unicode="&#xf192;" 
+d="M256 440c136.967 0 248 -111.033 248 -248s-111.033 -248 -248 -248s-248 111.033 -248 248s111.033 248 248 248zM336 192c0 44.1123 -35.8877 80 -80 80s-80 -35.8877 -80 -80s35.8877 -80 80 -80s80 35.8877 80 80z" />
+    <glyph glyph-name="wheelchair" unicode="&#xf193;" 
+d="M496.101 62.3311l14.2275 -28.6631c3.92871 -7.91504 0.697266 -17.5156 -7.21777 -21.4453l-65.4658 -32.8857c-16.0488 -7.9668 -35.5557 -1.19434 -43.1885 15.0547l-62.7773 133.608h-139.679c-15.9248 0 -29.4258 11.71 -31.6787 27.4746
+c-33.8887 237.218 -31.9414 222.481 -32.3213 228.525c0 36.3584 30.3184 65.6348 67.0518 63.9287c33.2715 -1.54492 60.0479 -28.9043 60.9248 -62.2012c0.868164 -32.9326 -23.1514 -60.4229 -54.6074 -65.0381l4.66992 -32.6904h129.961c8.83691 0 16 -7.16309 16 -16
+v-32c0 -8.83691 -7.16309 -16 -16 -16h-120.818l4.57227 -32h132.246c12.8076 0 23.8506 -7.5127 28.9619 -18.3916l57.5146 -122.407l36.1787 18.3486c7.91504 3.92871 17.5166 0.697266 21.4453 -7.21777zM311.358 96l25.752 -54.8076
+c-27.3047 -61.8848 -89.2402 -105.192 -161.11 -105.192c-97.0469 0 -176 78.9531 -176 176c0 74.0371 45.9561 137.536 110.836 163.489c2.64453 -18.4736 5.77637 -40.3682 9.48828 -66.333c-33.6299 -19.3477 -56.3242 -55.6514 -56.3242 -97.1562
+c0 -61.7568 50.2432 -112 112 -112c56.3242 0 103.064 41.7959 110.852 96h24.5068z" />
+    <glyph glyph-name="lira-sign" unicode="&#xf195;" horiz-adv-x="384" 
+d="M371.994 192c6.78613 0 12.2578 -5.62598 11.9971 -12.4082c-5.15332 -133.758 -94.3174 -211.592 -228.408 -211.592h-79.583c-6.62695 0 -12 5.37305 -12 12v193.442l-49.3975 -10.9775c-7.49316 -1.66602 -14.6025 4.03711 -14.6025 11.7139v40.9766
+c0 5.72656 4.02734 10.5205 9.39746 11.7139l54.6025 12.1338v30.4395l-49.3975 -10.9775c-7.49316 -1.66602 -14.6025 4.03711 -14.6025 11.7139v40.9766c0 5.72656 4.02734 10.5205 9.39746 11.7139l54.6025 12.1338v68.9971c0 6.62695 5.37305 12 12 12h56
+c6.62695 0 12 -5.37305 12 -12v-51.2188l129.397 28.7539c7.49316 1.66602 14.6025 -4.03711 14.6025 -11.7139v-40.9756c0 -5.72656 -4.02734 -10.5205 -9.39746 -11.7139l-134.603 -29.9121v-30.4385l129.397 28.7539c7.49316 1.66602 14.6025 -4.03711 14.6025 -11.7139
+v-40.9766c0 -5.72656 -4.02734 -10.5205 -9.39746 -11.7139l-134.603 -29.9121v-159.219c86.1787 0 168 48 168 148.754c0 6.33398 5.63965 11.2461 11.9746 11.2461h48.0195z" />
+    <glyph glyph-name="space-shuttle" unicode="&#xf197;" horiz-adv-x="640" 
+d="M592.604 239.756c29.6787 -13.9111 47.3965 -31.7637 47.3965 -47.7559s-17.7178 -33.8447 -47.3965 -47.7559c-32.8682 -15.4082 -76.8262 -24.2441 -120.604 -24.2441h-285.674c-4.95215 -6.55469 -10.585 -11.9775 -16.7197 -16h206.394
+c-146.843 -30.2529 -156.597 -136 -279.997 -136h-0.00292969v128h-16v-128c-26.5098 0 -48 28.6543 -48 64v64c-23.1807 0 -32 10.0166 -32 24v40c0 13.9678 8.80273 24 32 24v16c-23.1807 0 -32 10.0166 -32 24v40c0 13.9678 8.80273 24 32 24v64
+c0 35.3457 21.4902 64 48 64v-128h16v128h0.00292969c123.4 0 133.154 -105.747 279.997 -136h-206.393c6.13477 -4.02246 11.7676 -9.44531 16.7197 -16h285.673c43.7773 0 87.7354 -8.83594 120.604 -24.2441zM488 152c31.9424 0 31.9092 80 0 80
+c-4.41504 0 -8 -3.58496 -8 -8v-64c0 -4.41504 3.58496 -8 8 -8z" />
+    <glyph glyph-name="envelope-square" unicode="&#xf199;" horiz-adv-x="448" 
+d="M400 416c26.5098 0 48 -21.4902 48 -48v-352c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h352zM178.117 185.896c10.5156 -7.66895 31.3799 -26.1133 45.8828 -25.8955
+c14.4912 -0.225586 35.3828 18.2393 45.8828 25.8936c90.6836 65.8145 89.7461 65.9697 114.117 84.9385v25.167c0 13.2549 -10.7451 24 -24 24h-272c-13.2549 0 -24 -10.7451 -24 -24v-25.167c24.3525 -18.9541 23.4287 -19.1201 114.117 -84.9365zM384 230.225
+c-13.958 -10.793 -33.3252 -25.2334 -95.2832 -70.1982c-13.6826 -9.98438 -37.833 -32.1592 -64.7197 -32.0254c-26.7188 -0.134766 -50.5322 21.6689 -64.6943 32.0098c-61.9736 44.9785 -81.3447 59.4199 -95.3027 70.2139v-142.225c0 -13.2549 10.7451 -24 24 -24h272
+c13.2549 0 24 10.7451 24 24v142.225z" />
+    <glyph glyph-name="university" unicode="&#xf19c;" 
+d="M496 320v-16c0 -4.41504 -3.58496 -8 -8 -8h-24v-12c0 -6.62695 -5.37305 -12 -12 -12h-392c-6.62695 0 -12 5.37305 -12 12v12h-24c-4.41504 0 -8 3.58496 -8 8v16c0 3.33398 2.03906 6.19141 4.94141 7.3916l232 88
+c0.94043 0.389648 1.97168 0.605469 3.05371 0.605469c1.08105 0 2.12305 -0.21582 3.06348 -0.605469l232 -88c2.90234 -1.2002 4.94141 -4.05762 4.94141 -7.3916zM472 16c13.2549 0 24 -10.7451 24 -24v-16c0 -4.41504 -3.58496 -8 -8 -8h-464
+c-4.41504 0 -8 3.58496 -8 8v16c0 13.2549 10.7451 24 24 24h432zM96 256h64v-192h64v192h64v-192h64v192h64v-192h36c6.62695 0 12 -5.37305 12 -12v-20h-416v20c0 6.62695 5.37305 12 12 12h36v192z" />
+    <glyph glyph-name="graduation-cap" unicode="&#xf19d;" horiz-adv-x="640" 
+d="M622.34 294.8c23.5498 -7.24023 23.5498 -38.3594 0 -45.5996l-278.95 -85.7002c-20.3496 -6.25 -37.7295 -2.78027 -46.79 0l-195.569 60.0898c-12.25 -8.41992 -19.9307 -21.7002 -20.6904 -36.7197c9.19043 -5.62012 15.6602 -15.2998 15.6602 -26.8701
+c0 -10.7803 -5.67969 -19.8496 -13.8604 -25.6504l25.5303 -114.88c2.21973 -9.98926 -5.37988 -19.4697 -15.6201 -19.4697h-56.1094c-10.2305 0 -17.8301 9.48047 -15.6104 19.4697l25.5303 114.88c-8.18066 5.80078 -13.8604 14.8701 -13.8604 25.6504
+c0 11.8896 6.78027 21.8496 16.4102 27.3701c0.649414 17.6201 7.20996 33.71 17.8799 46.8994l-48.6299 14.9404c-23.54 7.23047 -23.54 38.3604 0 45.5898l278.95 85.7002c15.1895 4.66992 31.5898 4.66992 46.79 0zM352.79 132.91l145.03 44.5596l14.1797 -113.47
+c0 -35.3496 -85.96 -64 -192 -64s-192 28.6504 -192 64l14.1797 113.46l145.021 -44.5498c12.75 -3.91992 37.0596 -8.75977 65.5898 0z" />
+    <glyph glyph-name="language" unicode="&#xf1ab;" horiz-adv-x="640" 
+d="M152.1 211.8l10.9004 -37.5h-38.0996l11.0996 37.5c3.5 12.1006 7.7998 33.2002 7.7998 33.2002h0.5s4.2998 -21.0996 7.7998 -33.2002zM616 352c13.2998 0 24 -10.7002 24 -24v-272c0 -13.2998 -10.7002 -24 -24 -24h-280v320h280zM592 232v16
+c0 6.59961 -5.40039 12 -12 12h-64v16c0 6.59961 -5.40039 12 -12 12h-16c-6.59961 0 -12 -5.40039 -12 -12v-16h-64c-6.59961 0 -12 -5.40039 -12 -12v-16c0 -6.59961 5.40039 -12 12 -12h114.3c-6.2002 -14.2998 -16.5 -29 -30 -43.2002
+c-6.59961 6.90039 -12.3994 13.9004 -17.3994 20.9004c-3.60059 5.09961 -10.6006 6.59961 -16 3.39941l-7.30078 -4.2998l-6.5 -3.89941c-5.89941 -3.5 -7.69922 -11.4004 -3.69922 -17.1006c6.09961 -8.7002 13.0996 -17.2998 21 -25.7002
+c-8.10059 -6.2998 -16.8008 -12.2998 -26.1006 -18c-5.59961 -3.39941 -7.39941 -10.5996 -4.2002 -16.1992l7.90039 -13.9004c3.40039 -5.90039 10.9004 -7.7998 16.7002 -4.2998c12.7002 7.7998 24.5 16.2002 35.3994 24.8994
+c10.9004 -8.7998 22.8008 -17.0996 35.4004 -24.8994c5.7998 -3.5 13.2998 -1.60059 16.7002 4.2998l7.89941 13.9004c3.2002 5.69922 1.40039 12.7998 -4.09961 16.1992c-9 5.5 -17.7002 11.6006 -26.0996 18c21 22.5 35.7998 46.3008 42.6992 69.9004h11.4004
+c6.59961 0 12 5.40039 12 12zM0 328c0 13.2998 10.7002 24 24 24h280v-320h-280c-13.2998 0 -24 10.7002 -24 24v272zM58.9004 111.9c-2.60059 -7.80078 3.19922 -15.9004 11.3994 -15.9004h22.9004c5.2998 0 10 3.59961 11.5 8.7002l9.09961 31.7998h60.2002
+l9.40039 -31.9004c1.4668 -4.96582 6.06152 -8.5957 11.5 -8.59961h22.8994c8.2998 0 14 8.09961 11.4004 15.9004l-57.5 169.1c-1.7002 4.7998 -6.2998 8.09961 -11.4004 8.09961h-32.5c-5.2002 0 -9.7002 -3.19922 -11.3994 -8.09961z" />
+    <glyph glyph-name="fax" unicode="&#xf1ac;" 
+d="M480 288c17.6611 0 32 -14.3389 32 -32v-288c0 -17.6611 -14.3389 -32 -32 -32h-320c-17.6611 0 -32 14.3389 -32 32v448c0 17.6611 14.3389 32 32 32h242.75c8.82715 -0.000976562 16.8291 -3.58008 22.6201 -9.37012l45.25 -45.25
+c5.7959 -5.79199 9.37891 -13.7979 9.37988 -22.6299v-82.75zM288 16v32c0 8.83105 -7.16895 16 -16 16h-32c-8.83105 0 -16 -7.16895 -16 -16v-32c0 -8.83105 7.16895 -16 16 -16h32c8.83105 0 16 7.16895 16 16zM288 144v32c0 8.83105 -7.16895 16 -16 16h-32
+c-8.83105 0 -16 -7.16895 -16 -16v-32c0 -8.83105 7.16895 -16 16 -16h32c8.83105 0 16 7.16895 16 16zM416 16v32c0 8.83105 -7.16895 16 -16 16h-32c-8.83105 0 -16 -7.16895 -16 -16v-32c0 -8.83105 7.16895 -16 16 -16h32c8.83105 0 16 7.16895 16 16zM416 144v32
+c0 8.83105 -7.16895 16 -16 16h-32c-8.83105 0 -16 -7.16895 -16 -16v-32c0 -8.83105 7.16895 -16 16 -16h32c8.83105 0 16 7.16895 16 16zM416 256v64h-48c-8.83105 0 -16 7.16895 -16 16v48h-160v-128h224zM64 320c17.6611 0 32 -14.3389 32 -32v-320
+c0 -17.6611 -14.3389 -32 -32 -32h-32c-17.6611 0 -32 14.3389 -32 32v320c0 17.6611 14.3389 32 32 32h32z" />
+    <glyph glyph-name="building" unicode="&#xf1ad;" horiz-adv-x="448" 
+d="M436 -32c6.62695 0 12 -5.37305 12 -12v-20h-448v20c0 6.62695 5.37305 12 12 12h20v456c0 13.2549 10.7451 24 24 24h336c13.2549 0 24 -10.7451 24 -24v-456h20zM128 372v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12v40
+c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12zM128 276v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12v40c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12zM180 128c6.62695 0 12 5.37305 12 12v40
+c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40zM256 -32v84c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-84h64zM320 140v40c0 6.62695 -5.37305 12 -12 12h-40
+c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12zM320 236v40c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12zM320 332v40
+c0 6.62695 -5.37305 12 -12 12h-40c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h40c6.62695 0 12 5.37305 12 12z" />
+    <glyph glyph-name="child" unicode="&#xf1ae;" horiz-adv-x="384" 
+d="M120 376c0 39.7646 32.2354 72 72 72s72 -32.2354 72 -72c0 -39.7637 -32.2354 -72 -72 -72s-72 32.2363 -72 72zM374.627 374.627c12.4971 -12.4971 12.4971 -32.7568 0 -45.2539l-94.627 -94.627v-266.746c0 -17.6729 -14.3271 -32 -32 -32h-16
+c-17.6729 0 -32 14.3271 -32 32v112h-16v-112c0 -17.6729 -14.3271 -32 -32 -32h-16c-17.6729 0 -32 14.3271 -32 32v266.746l-94.627 94.626c-12.4971 12.4971 -12.4971 32.7578 0 45.2549c12.4961 12.4971 32.7578 12.4971 45.2539 0l86.627 -86.627h101.491
+l86.6279 86.627c12.4961 12.4971 32.7578 12.4971 45.2539 0z" />
+    <glyph glyph-name="paw" unicode="&#xf1b0;" 
+d="M256 224c79.4102 0 192 -122.76 192 -200.25c0 -34.9004 -26.8096 -55.75 -71.7402 -55.75c-48.4102 0 -80.75 25.0801 -120.26 25.0801c-39.1699 0 -71.4199 -25.0801 -120.26 -25.0801c-44.9307 0 -71.7402 20.8496 -71.7402 55.75c0 77.4902 112.59 200.25 192 200.25
+zM108.72 236.61c10.4004 -34.6504 -4.76953 -68.3799 -33.8896 -75.3408c-29.1201 -6.95996 -61.1602 15.4805 -71.5605 50.1309c-10.3994 34.6494 4.77051 68.3799 33.8906 75.3398s61.1602 -15.4805 71.5596 -50.1299zM193.44 257.39
+c-30.9307 -8.14941 -65.6201 20.4502 -77.46 63.8701c-11.8408 43.4199 3.63965 85.2207 34.5791 93.3604c30.9404 8.13965 65.6201 -20.4502 77.46 -63.8701c11.8408 -43.4199 -3.63965 -85.2197 -34.5791 -93.3604zM474.83 286.73
+c29.1201 -6.96094 44.29 -40.6904 33.8896 -75.3408c-10.4102 -34.6494 -42.4395 -57.0898 -71.5596 -50.1299s-44.29 40.6904 -33.8906 75.3398c10.4102 34.6504 42.4404 57.0908 71.5605 50.1309zM318.56 257.39c-30.9395 8.14062 -46.4199 49.9404 -34.5791 93.3604
+c11.8398 43.4199 46.5195 72.0195 77.46 63.8701c30.9395 -8.15039 46.4199 -49.9404 34.5791 -93.3604c-11.8398 -43.4199 -46.5195 -72.0098 -77.46 -63.8701z" />
+    <glyph glyph-name="cube" unicode="&#xf1b2;" 
+d="M239.1 441.7c10.9004 4.09961 22.9004 4.09961 33.7002 -0.100586l208 -78c18.7002 -7 31.1006 -24.8994 31.1006 -44.8994v-225.101c0 -18.0996 -10.2002 -34.7998 -26.5 -42.8994l-208 -104c-13.5 -6.7998 -29.4004 -6.7998 -42.9004 0l-208 104
+c-16.2002 8.09961 -26.5 24.7002 -26.5 42.8994v225.101c0 20 12.4004 38 31.0996 45zM256 379.6l-192 -72v-1.09961l192 -78l192 78v1.09961zM288 23.5996l160 80v133.9l-160 -65v-148.9z" />
+    <glyph glyph-name="cubes" unicode="&#xf1b3;" 
+d="M488.6 197.8c14.1006 -5.2998 23.4004 -18.7002 23.4004 -33.7002v-110.1c0 -13.5996 -7.7002 -26.0996 -19.9004 -32.2002l-100 -50c-10.0996 -5.09961 -22.0996 -5.09961 -32.1992 0l-103.9 52l-103.9 -52c-10.0996 -5.09961 -22.0996 -5.09961 -32.1992 0l-100 50
+c-12.2002 6.10059 -19.9004 18.6006 -19.9004 32.2002v110.1c0 15 9.2998 28.4004 23.2998 33.7002l96.6006 36.2002v108.5c0 15 9.2998 28.4004 23.3994 33.7002l100 37.5c8.2002 3.09961 17.2002 3.09961 25.2998 0l100 -37.5
+c14.1006 -5.2998 23.4004 -18.7002 23.4004 -33.7002v-108.5zM358 233.2v73.2998l-85 -37v-68.2002zM154 343.9v-0.600586l102 -41.3994l102 41.3994v0.600586l-102 38.1992zM238 52.7998v75.4004l-85 -38.7998v-79.1006zM238 164.8v0.600586l-102 38.1992l-102 -38.1992
+v-0.600586l102 -41.3994zM478 52.7998v75.4004l-85 -38.7998v-79.1006zM478 164.8v0.600586l-102 38.1992l-102 -38.1992v-0.600586l102 -41.3994z" />
+    <glyph glyph-name="recycle" unicode="&#xf1b8;" 
+d="M184.561 186.097c3.23242 -13.9971 -12.1221 -24.6348 -24.0674 -17.168l-40.7363 25.4551l-50.8672 -81.4014c-13.2832 -21.2559 2.07031 -48.9824 27.1221 -48.9824h51.9883c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-51.8848
+c-75.334 0 -121.302 83.0479 -81.4082 146.88l50.8223 81.3877l-40.7256 25.4482c-12.0811 7.54688 -8.96582 25.9609 4.87891 29.1582l110.237 25.4502c8.61133 1.9873 17.2012 -3.38086 19.1895 -11.9902zM283.122 369.012
+c-12.2842 19.6543 -41.5449 20.3193 -54.2568 -0.0214844l-17.9609 -28.7432c-3.5127 -5.62012 -10.916 -7.3291 -16.5361 -3.81738l-33.9189 21.1953c-5.62012 3.51172 -7.33008 10.9131 -3.82031 16.5332l17.9629 28.7656c37.6074 60.1709 125.295 60.0332 162.816 0
+l41.2627 -66.082l40.6875 25.4238c12.0771 7.55176 27.2646 -3.32324 24.0674 -17.168l-25.4502 -110.236c-1.97363 -8.55273 -10.5166 -13.9893 -19.1885 -11.9902l-110.237 25.4502c-13.8789 3.20508 -16.9297 21.6299 -4.87891 29.1572l40.7402 25.457zM497.288 146.88
+c39.9268 -63.8828 -6.13379 -146.88 -81.4082 -146.88h-95.8799v-47.9893c0 -14.3105 -17.3105 -21.3184 -27.3135 -11.3145l-80 79.9883c-6.24805 6.24805 -6.24805 16.3799 0 22.627l80 79.9814c10.0713 10.0703 27.3135 2.90039 27.3135 -11.3125v-47.9814h95.9844
+c25.0791 0 40.3926 27.749 27.1357 48.96l-27.5645 44.1123c-3.51172 5.62109 -1.80176 13.0234 3.81836 16.5361l33.8613 21.1582c5.62207 3.51367 13.0264 1.80273 16.5381 -3.82031z" />
+    <glyph glyph-name="car" unicode="&#xf1b9;" 
+d="M499.99 272c7.80957 0 13.54 -7.33984 11.6494 -14.9102l-6 -24c-1.33008 -5.33984 -6.12988 -9.08984 -11.6396 -9.08984h-20.0703c13.4199 -11.7305 22.0703 -28.7803 22.0703 -48v-48c0 -16.1299 -6.16016 -30.6797 -16 -41.9297v-54.0703
+c0 -17.6699 -14.3301 -32 -32 -32h-32c-17.6699 0 -32 14.3301 -32 32v32h-256v-32c0 -17.6699 -14.3301 -32 -32 -32h-32c-17.6699 0 -32 14.3301 -32 32v54.0703c-9.83984 11.2598 -16 25.8096 -16 41.9297v48c0 19.2197 8.65039 36.2695 22.0801 48h-20.0703
+c-5.50977 0 -10.3096 3.75 -11.6396 9.08984l-6 24c-1.90039 7.57031 3.83008 14.9102 11.6396 14.9102h59.8604l16.6396 41.5996c17.1104 42.7705 57.9307 70.4004 103.99 70.4004h127c46.0703 0 86.8799 -27.6299 103.98 -70.4004l16.6396 -41.5996h59.8701z
+M147.93 289.83l-19.9297 -49.8301h256l-19.9297 49.8301c-7.29004 18.2197 -24.9404 30.1699 -44.5703 30.1699h-127c-19.6299 0 -37.2803 -11.9502 -44.5703 -30.1699zM96 128.2c19.2002 0 48 -3.19043 48 15.9502c0 19.1396 -28.7998 47.8496 -48 47.8496
+s-32 -12.7598 -32 -31.9004c0 -19.1396 12.7998 -31.8994 32 -31.8994zM416 128.2c19.2002 0 32 12.7598 32 31.8994c0 19.1406 -12.7998 31.9004 -32 31.9004s-48 -28.71 -48 -47.8496c0 -19.1406 28.7998 -15.9502 48 -15.9502z" />
+    <glyph glyph-name="taxi" unicode="&#xf1ba;" 
+d="M462 206.36c28.5898 -6.40039 50 -31.8301 50 -62.3604v-48c0 -23.6201 -12.9502 -44.0303 -32 -55.1201v-40.8799c0 -17.6699 -14.3301 -32 -32 -32h-32c-17.6699 0 -32 14.3301 -32 32v32h-256v-32c0 -17.6699 -14.3301 -32 -32 -32h-32c-17.6699 0 -32 14.3301 -32 32
+v40.8799c-19.0498 11.0801 -32 31.4902 -32 55.1201v48c0 30.5303 21.4102 55.96 50 62.3604l22 84.8398c9.59961 35.2002 41.5996 60.7998 76.7998 60.7998h11.2002v32c0 17.6699 14.3301 32 32 32h128c17.6699 0 32 -14.3301 32 -32v-32h11.2002
+c35.2002 0 67.2002 -25.5996 76.7998 -60.7998zM96 96c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM116.55 208h278.9l-17.3906 67.1396c-2.01953 7.37988 -9.37988 12.8604 -14.8496 12.8604h-214.4
+c-5.46973 0 -12.8291 -5.48047 -15.0596 -13.6396zM416 96c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="tree" unicode="&#xf1bb;" horiz-adv-x="384" 
+d="M378.31 69.5098c6 -6.79004 7.36035 -16.0898 3.56055 -24.2598c-3.75 -8.0498 -12 -13.25 -21.0098 -13.25h-136.86v-24.4502l30.29 -48.3994c5.32031 -10.6406 -2.41992 -23.1602 -14.3096 -23.1602h-95.9609c-11.8896 0 -19.6299 12.5195 -14.3096 23.1602
+l30.29 48.3994v24.4502h-136.86c-9.00977 0 -17.2598 5.2002 -21.0098 13.25c-3.7998 8.16992 -2.43945 17.4697 3.56055 24.2598l79.8896 90.4902h-30.6299c-9.02051 0 -16.9805 5 -20.7803 13.0498c-3.79004 8.0498 -2.54004 17.2598 3.27051 24.04l78.1396 90.9102
+h-28.8896c-9.10059 0 -17.3105 5.34961 -20.8701 13.6104c-3.51074 8.12988 -1.86035 17.5898 4.23926 24.0801l110.28 117.479c6.04004 6.4502 17.29 6.4502 23.3203 0l110.27 -117.479c6.10059 -6.49023 7.76074 -15.9502 4.24023 -24.0801
+c-3.55957 -8.26074 -11.7598 -13.6104 -20.8604 -13.6104h-28.8896l78.1299 -90.8896c5.83008 -6.79004 7.08008 -16.0107 3.28027 -24.0508c-3.7998 -8.05957 -11.7705 -13.0596 -20.7803 -13.0596h-30.6299z" />
+    <glyph glyph-name="database" unicode="&#xf1c0;" horiz-adv-x="448" 
+d="M448 374.857v-45.7148c0 -40.2852 -100.333 -73.1426 -224 -73.1426s-224 32.8574 -224 73.1426v45.7148c0 40.2852 100.333 73.1426 224 73.1426s224 -32.8574 224 -73.1426zM448 272v-102.857c0 -40.2852 -100.333 -73.1426 -224 -73.1426s-224 32.8574 -224 73.1426
+v102.857c48.125 -33.1426 136.208 -48.5723 224 -48.5723s175.874 15.4297 224 48.5723zM448 112v-102.857c0 -40.2852 -100.333 -73.1426 -224 -73.1426s-224 32.8574 -224 73.1426v102.857c48.125 -33.1426 136.208 -48.5723 224 -48.5723s175.874 15.4297 224 48.5723z
+" />
+    <glyph glyph-name="file-pdf" unicode="&#xf1c1;" horiz-adv-x="384" 
+d="M181.9 191.9c-5 16 -4.90039 46.8994 -2 46.8994c8.39941 0 7.59961 -36.8994 2 -46.8994zM180.2 144.7c9.59961 -17.4004 21.7998 -31.2002 34.5 -40.7998c-23.9004 -4.7002 -44.6006 -14.9004 -62.9004 -21.9004c11.1006 19.4004 20.7002 42.5 28.4004 62.7002z
+M86.0996 19.9004c5.80078 15.6992 28.2002 33.8994 34.9004 40.1992c-21.7002 -34.7998 -34.9004 -41 -34.9004 -40.1992zM248 288h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136
+c0 -13.2002 10.7998 -24 24 -24zM240 116.2c-20 12.2002 -33.2998 29 -42.7002 53.7998c4.5 18.5 11.6006 46.5996 6.2002 64.2002c-4.7002 29.3994 -42.4004 26.5 -47.7998 6.7998c-5 -18.2998 -0.400391 -44.0996 8.09961 -77
+c-11.5996 -27.5996 -28.7002 -64.5996 -40.7998 -85.7998c-0.0996094 0 -0.0996094 -0.100586 -0.200195 -0.100586c-27.0996 -13.8994 -73.5996 -44.5 -54.5 -68c5.60059 -6.89941 16 -10 21.5 -10c17.9004 0 35.7002 18 61.1006 61.8008
+c25.7998 8.5 54.0996 19.0996 79 23.1992c21.6992 -11.7998 47.0996 -19.5 64 -19.5c29.1992 0 31.1992 32 19.6992 43.4004c-13.8994 13.5996 -54.2998 9.7002 -73.5996 7.2002zM377 343c4.5 -4.5 7 -10.5996 7 -16.9004v-6.09961h-128v128h6c6.40039 0 12.5 -2.5 17 -7z
+M302.9 87.7002c0 0 -5.7002 -6.7998 -42.8008 9c40.3008 2.89941 46.9004 -6.2998 42.8008 -9z" />
+    <glyph glyph-name="file-word" unicode="&#xf1c2;" horiz-adv-x="384" 
+d="M224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136zM281.1 192c-5.59961 0 -10.5 -3.90039 -11.5 -9.5c-24.1992 -111.4 -21.7998 -118 -21.5996 -129.2
+c-0.799805 5.40039 -5.59961 29 -29.5996 129.4c-1.30078 5.39941 -6.10059 9.2002 -11.7002 9.2002h-29.1006c-5.59961 0 -10.3994 -3.7002 -11.6992 -9.10059c-22.1006 -90 -27.8008 -112.5 -29.4004 -122.7c-0.900391 12.7002 -5.40039 44.2002 -21 122.2
+c-1.09961 5.7002 -6.09961 9.7002 -11.7998 9.7002h-24.5c-7.7002 0 -13.4004 -7.09961 -11.7002 -14.5996l37.7998 -168c1.2002 -5.5 6.10059 -9.40039 11.7002 -9.40039h37.0996c5.5 0 10.3008 3.7998 11.6006 9.09961c23.2002 93.1006 24.5 96.2002 25.5996 110.5h0.5
+c4.7998 -29.2998 -0.200195 -7 25.6006 -110.5c1.2998 -5.2998 6.09961 -9.09961 11.5996 -9.09961h38c5.59961 0 10.5 3.7998 11.7002 9.2998l38 168c1.7002 7.60059 -4 14.7002 -11.7002 14.7002h-23.9004zM384 326.1v-6.09961h-128v128h6.09961
+c6.40039 0 12.5 -2.5 17 -7l97.9004 -98c4.5 -4.5 7 -10.5996 7 -16.9004z" />
+    <glyph glyph-name="file-excel" unicode="&#xf1c3;" horiz-adv-x="384" 
+d="M224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136zM284.1 205.5c5.10059 8 -0.599609 18.5 -10.0996 18.4004h-34.7998
+c-4.40039 0 -8.5 -2.40039 -10.6006 -6.30078c-30.5 -56.7998 -36.5996 -68.5 -36.5996 -68.5c-16.5996 34.9004 -10.5 19.7002 -36.5996 68.5c-2.10059 3.90039 -6.2002 6.30078 -10.6006 6.30078h-34.7998c-9.5 0 -15.2998 -10.5 -10.0996 -18.5l60.2998 -93.5
+l-60.2998 -93.5c-5.10059 -8 0.599609 -18.5 10.0996 -18.5h34.9004c4.39941 0 8.39941 2.39941 10.5 6.2998c26.5996 48.7998 30.1992 54 36.5996 68.7998c0 0 16.9004 -32.5 36.5 -68.7002c2.09961 -3.89941 6.2002 -6.2998 10.5996 -6.2998h34.9004
+c9.5 0 15.2002 10.5 10.0996 18.5l-60.0996 93.5zM384 326.1v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7l97.9004 -98c4.5 -4.5 7 -10.5996 7 -16.9004z" />
+    <glyph glyph-name="file-powerpoint" unicode="&#xf1c4;" horiz-adv-x="384" 
+d="M193.7 176.8c8.7998 0 15.5 -2.7002 20.2998 -8.09961c9.59961 -10.9004 9.7998 -32.7002 -0.200195 -44.1006c-4.89941 -5.59961 -11.8994 -8.5 -21.0996 -8.5h-26.9004v60.7002h27.9004zM377 343c4.5 -4.5 7 -10.5996 7 -16.9004v-6.09961h-128v128h6
+c6.40039 0 12.5 -2.5 17 -7zM224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136zM277 146.8c0 44.2002 -28.4004 77 -72.9004 77h-81
+c-6.59961 0 -12 -5.39941 -12 -12v-199.8c0 -6.59961 5.40039 -12 12 -12h30.8008c6.59961 0 12 5.40039 12 12v57.2002c22.2998 0 111.1 -12.7002 111.1 77.5996z" />
+    <glyph glyph-name="file-image" unicode="&#xf1c5;" horiz-adv-x="384" 
+d="M384 326.059v-6.05859h-128v128h6.05859c6.62305 0 12.626 -2.68457 16.9707 -7.0293l97.9404 -97.9404c4.34473 -4.34473 7.03027 -10.3477 7.03027 -16.9717zM248 288h136v-328c0 -13.2549 -10.7451 -24 -24 -24h-336c-13.2549 0 -24 10.7451 -24 24v464
+c0 13.2549 10.7451 24 24 24h200v-136c0 -13.2002 10.7998 -24 24 -24zM112.545 272c-26.5088 0 -48 -21.4902 -48 -48s21.4902 -48 48 -48s48 21.4902 48 48s-21.4902 48 -48 48zM320.545 32v112l-39.5137 39.5146c-4.6875 4.68652 -12.2852 4.68652 -16.9717 0
+l-103.515 -103.515l-39.5146 39.5146c-4.68652 4.68652 -11.7988 5.1709 -16.4854 0.485352l-39.5146 -39.5146l-0.485352 -48.4854h256z" />
+    <glyph glyph-name="file-archive" unicode="&#xf1c6;" horiz-adv-x="384" 
+d="M377 343c4.5 -4.5 7 -10.5996 7 -16.9004v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7zM128.4 112c17.8994 0 32.5 -12.0996 32.5 -27s-14.5 -27 -32.4004 -27s-32.5 12 -32.5 27c0 14.9004 14.5 27 32.4004 27zM224 312c0 -13.2002 10.7998 -24 24 -24h136
+v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h104.4v-32h32v32h63.5996v-136zM95.9004 416v-32h32v32h-32zM128.2 32c33 0 57.7998 30.2002 51.3994 62.5996l-17.2998 87.7002
+c-1.09961 5.60059 -6.09961 9.7002 -11.7998 9.7002h-22.0996v32h32v32h-32v32h32v32h-32v32h32v32h-32v-32h-32v-32h32v-32h-32v-32h32v-32h-32v-32l-19.6006 -97.0996c-6.59961 -32.5 18.2002 -62.9004 51.4004 -62.9004z" />
+    <glyph glyph-name="file-audio" unicode="&#xf1c7;" horiz-adv-x="384" 
+d="M224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136zM160 44v136c0 10.7002 -12.9004 16.0996 -20.5 8.5l-35.5 -36.5h-28c-6.59961 0 -12 -5.40039 -12 -12
+v-56c0 -6.59961 5.40039 -12 12 -12h28l35.5 -36.5c7.59961 -7.5 20.5 -2.2002 20.5 8.5zM193.2 91.5996c-22.5 -23.0996 12.5996 -55.7998 34.3994 -33.5c27.2002 28 27.2002 72.5 0 100.4c-22.1992 22.7002 -56.5 -10.7002 -34.3994 -33.5
+c9.09961 -9.2998 9.09961 -24.0996 0 -33.4004zM279.2 208.7c-22.1006 22.7998 -56.5 -10.7002 -34.4004 -33.5c36.2998 -37.2998 36.2002 -96.6006 0 -133.8c-22.5996 -23.2002 12.6006 -55.9004 34.4004 -33.5c54.3994 56 54.3994 144.899 0 200.8zM384 326.1v-6.09961
+h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7l97.9004 -98c4.5 -4.5 7 -10.5996 7 -16.9004z" />
+    <glyph glyph-name="file-video" unicode="&#xf1c8;" horiz-adv-x="384" 
+d="M384 326.059v-6.05859h-128v128h6.05859c6.36523 0 12.4707 -2.5293 16.9717 -7.0293l97.9404 -97.9404c4.34375 -4.34473 7.0293 -10.3486 7.0293 -16.9717zM224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2549 -10.7451 -24 -24 -24h-336
+c-13.2549 0 -24 10.7451 -24 24v464c0 13.2549 10.7451 24 24 24h200v-136zM320 167.984c0 21.4609 -25.96 31.9795 -40.9707 16.9697l-55.0293 -55.0127v38.0586c0 13.2549 -10.7451 24 -24 24h-112c-13.2549 0 -24 -10.7451 -24 -24v-112c0 -13.2549 10.7451 -24 24 -24
+h112c13.2549 0 24 10.7451 24 24v38.0586l55.0293 -55.0088c15.0273 -15.0264 40.9707 -4.47363 40.9707 16.9717v111.963z" />
+    <glyph glyph-name="file-code" unicode="&#xf1c9;" horiz-adv-x="384" 
+d="M384 326.059v-6.05859h-128v128h6.05859c6.36523 0 12.4707 -2.5293 16.9717 -7.0293l97.9404 -97.9404c4.34375 -4.34473 7.0293 -10.3486 7.0293 -16.9717zM248 288h136v-328c0 -13.2549 -10.7451 -24 -24 -24h-336c-13.2549 0 -24 10.7451 -24 24v464
+c0 13.2549 10.7451 24 24 24h200v-136c0 -13.2002 10.7998 -24 24 -24zM123.206 47.4951l19.5791 20.8838c0.905273 0.96582 1.46289 2.26562 1.46289 3.69238c0 1.61426 -0.709961 3.06445 -1.83496 4.05469l-40.7627 35.874l40.7627 35.874
+c1.125 0.990234 1.83203 2.44043 1.83203 4.05566c0 1.42676 -0.554688 2.72559 -1.45996 3.69141l-19.5791 20.8848c-0.985352 1.05176 -2.3877 1.70703 -3.94141 1.70703c-1.42676 0 -2.72559 -0.555664 -3.69141 -1.46094l-64.8662 -60.8115
+c-1.05078 -0.986328 -1.70801 -2.38672 -1.70801 -3.93945c0 -1.55371 0.657227 -2.9541 1.70801 -3.94043l64.8662 -60.8115c0.96582 -0.905273 2.26562 -1.46289 3.69336 -1.46289c1.55273 0 2.9541 0.657227 3.93945 1.70898zM174.501 -2.98438
+c0.478516 -0.138672 0.982422 -0.212891 1.50488 -0.212891c2.45801 0 4.53418 1.64551 5.18555 3.89453l61.4395 211.626c0.138672 0.478516 0.213867 0.982422 0.213867 1.50488c0 2.45801 -1.64551 4.53418 -3.89355 5.18652l-27.4521 7.9707
+c-0.477539 0.138672 -0.981445 0.212891 -1.50391 0.212891c-2.45801 0 -4.53516 -1.64551 -5.18848 -3.89453l-61.4395 -211.626c-0.138672 -0.477539 -0.212891 -0.981445 -0.212891 -1.50293c0 -2.45898 1.64551 -4.53516 3.89355 -5.18848zM335.293 108.061
+c1.05176 0.986328 1.70898 2.38672 1.70898 3.94043c0 1.55273 -0.657227 2.95312 -1.70801 3.93945l-64.8662 60.8115c-0.96582 0.905273 -2.26562 1.46289 -3.69336 1.46289c-1.55273 0 -2.9541 -0.657227 -3.93945 -1.70898l-19.5801 -20.8848
+c-0.905273 -0.96582 -1.46289 -2.26562 -1.46289 -3.69238c0 -1.61426 0.709961 -3.06445 1.83496 -4.05469l40.7627 -35.874l-40.7637 -35.873c-1.125 -0.990234 -1.83203 -2.44043 -1.83203 -4.05566c0 -1.42676 0.554688 -2.72559 1.45996 -3.69141l19.5801 -20.8848
+c0.985352 -1.05176 2.3877 -1.70703 3.94141 -1.70703c1.42676 0 2.72559 0.555664 3.69141 1.46094z" />
+    <glyph glyph-name="life-ring" unicode="&#xf1cd;" 
+d="M256 440c136.967 0 248 -111.033 248 -248s-111.033 -248 -248 -248s-248 111.033 -248 248s111.033 248 248 248zM429.696 320.441c-12.8584 17.3291 -27.9258 32.3965 -45.2549 45.2549l-63.3994 -63.3994c18.585 -11.0029 34.2676 -26.6963 45.2549 -45.2549zM256 96
+c53.0186 0 96 42.9814 96 96s-42.9814 96 -96 96s-96 -42.9814 -96 -96s42.9814 -96 96 -96zM127.559 365.696c-17.3291 -12.8584 -32.3965 -27.9258 -45.2549 -45.2549l63.3994 -63.3994c11.0029 18.585 26.6963 34.2676 45.2549 45.2549zM82.3037 63.5586
+c12.8584 -17.3291 27.9258 -32.3965 45.2549 -45.2549l63.3994 63.3994c-18.585 11.0029 -34.2676 26.6963 -45.2549 45.2549zM384.441 18.3037c17.3291 12.8584 32.3965 27.9258 45.2549 45.2549l-63.3994 63.3994c-11.0029 -18.585 -26.6963 -34.2676 -45.2549 -45.2549z
+" />
+    <glyph glyph-name="circle-notch" unicode="&#xf1ce;" 
+d="M288 408.944c0 15.5996 14.6777 27.167 29.7891 23.292c107.071 -27.457 186.211 -124.604 186.211 -240.236c0 -136.788 -110.745 -247.711 -247.466 -247.999c-137.054 -0.289062 -247.812 109.615 -248.531 246.667c-0.609375 116.126 78.5996 213.85 185.951 241.502
+c15.2119 3.91895 30.0459 -7.52539 30.0459 -23.2344v-16.6475c0 -10.8047 -7.28125 -20.1621 -17.6885 -23.0693c-77.5254 -21.6543 -134.312 -92.749 -134.312 -177.219c0 -101.705 82.3105 -184 184 -184c101.705 0 184 82.3105 184 184
+c0 84.4824 -56.7959 155.566 -134.314 177.219c-10.4043 2.90723 -17.6855 12.2627 -17.6855 23.0664v16.6592z" />
+    <glyph glyph-name="paper-plane" unicode="&#xf1d8;" 
+d="M476 444.8c17.2998 10 39 -4.59961 35.5996 -24.7998l-72 -432c-2.59961 -15.2998 -18.7998 -24.2002 -33 -18.2002l-124.6 52.2002l-63.5 -77.2998c-14 -17.1006 -42.5 -7.7998 -42.5 15.7998v80.5l240.9 293.5c4.69922 5.7002 -3.10059 13.2002 -8.60059 8.2998
+l-287.3 -253.2l-106.3 44.6006c-18 7.59961 -20.2998 32.7998 -2.2002 43.2002z" />
+    <glyph glyph-name="history" unicode="&#xf1da;" 
+d="M504 192.469c0.25293 -136.64 -111.18 -248.372 -247.82 -248.468c-59.0146 -0.0419922 -113.223 20.5303 -155.821 54.9111c-11.0771 8.93945 -11.9053 25.541 -1.83984 35.6064l11.2676 11.2676c8.6084 8.6084 22.3525 9.55078 31.8906 1.9834
+c31.3848 -24.9043 71.1045 -39.7695 114.323 -39.7695c101.705 0 184 82.3105 184 184c0 101.705 -82.3105 184 -184 184c-48.8145 0 -93.1494 -18.9688 -126.068 -49.9316l50.7539 -50.7539c10.0801 -10.0801 2.94141 -27.3145 -11.3125 -27.3145h-145.373
+c-8.83691 0 -16 7.16309 -16 16v145.373c0 14.2539 17.2344 21.3926 27.3145 11.3135l49.3711 -49.3711c44.5234 42.5488 104.866 68.6846 171.314 68.6846c136.81 0 247.747 -110.78 248 -247.531zM323.088 113.685c-8.1377 -10.4629 -23.2158 -12.3467 -33.6787 -4.20996
+l-65.4092 50.874v135.651c0 13.2549 10.7451 24 24 24h16c13.2549 0 24 -10.7451 24 -24v-104.349l40.7012 -31.6572c10.4629 -8.13672 12.3477 -23.2158 4.20996 -33.6787z" />
+    <glyph glyph-name="heading" unicode="&#xf1dc;" 
+d="M448 352v-320h32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-160c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32v128h-192v-128h32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-160
+c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32v320h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h160c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32v-128h192v128h-32c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h160c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32z" />
+    <glyph glyph-name="paragraph" unicode="&#xf1dd;" horiz-adv-x="448" 
+d="M448 400v-32c0 -8.83105 -7.16895 -16 -16 -16h-48v-368c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v368h-32v-368c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v112h-32c-88.3066 0 -160 71.6934 -160 160
+s71.6934 160 160 160h240c8.83105 0 16 -7.16895 16 -16z" />
+    <glyph glyph-name="sliders-h" unicode="&#xf1de;" 
+d="M496 64c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-336v-16c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v16h-80c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h80v16c0 8.7998 7.2002 16 16 16h32
+c8.7998 0 16 -7.2002 16 -16v-16h336zM496 224c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-80v-16c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v16h-336c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h336v16
+c0 8.7998 7.2002 16 16 16h32c8.7998 0 16 -7.2002 16 -16v-16h80zM496 384c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-208v-16c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v16h-208c-8.7998 0 -16 7.2002 -16 16v32
+c0 8.7998 7.2002 16 16 16h208v16c0 8.7998 7.2002 16 16 16h32c8.7998 0 16 -7.2002 16 -16v-16h208z" />
+    <glyph glyph-name="share-alt" unicode="&#xf1e0;" horiz-adv-x="448" 
+d="M352 128c53.0186 0 96 -42.9814 96 -96s-42.9814 -96 -96 -96s-96 42.9814 -96 96c0 0.00976562 0.00292969 -0.0429688 0.00292969 -0.0332031c0 7.16699 0.785156 14.1523 2.27344 20.874l-102.486 64.0537c-16.4033 -13.0752 -37.1816 -20.8945 -59.79 -20.8945
+c-53.0186 0 -96 42.9814 -96 96s42.9814 96 96 96c22.6084 0 43.3867 -7.81934 59.79 -20.8945l102.486 64.0537c-1.48633 6.71094 -2.27637 13.6826 -2.27637 20.8408c0 53.0186 42.9814 96 96 96s96 -42.9814 96 -96s-42.9814 -96 -96 -96
+c-22.6084 0 -43.3867 7.81934 -59.79 20.8965l-102.486 -64.0547c1.48828 -6.73145 2.27344 -13.6025 2.27344 -20.7793s-0.785156 -14.1719 -2.27344 -20.9033l102.486 -64.0537c16.4033 13.0752 37.1816 20.8945 59.79 20.8945z" />
+    <glyph glyph-name="share-alt-square" unicode="&#xf1e1;" horiz-adv-x="448" 
+d="M448 368v-352c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h352c26.5098 0 48 -21.4902 48 -48zM304 152c-14.5615 0 -27.8232 -5.56055 -37.7832 -14.6709l-67.958 40.7744
+c1.13379 4.45312 1.73633 9.11719 1.73633 13.9199c0 4.80371 -0.602539 9.4209 -1.73633 13.874l67.958 40.7744c9.95996 -9.11133 23.2217 -14.6719 37.7832 -14.6719c30.9277 0 56 25.0723 56 56s-25.0723 56 -56 56s-56 -25.0723 -56 -56
+c0 -4.79688 0.605469 -9.45312 1.74023 -13.8975l-67.958 -40.7744c-9.95898 9.11133 -23.2207 14.6719 -37.7822 14.6719c-30.9277 0 -56 -25.0723 -56 -56s25.0723 -56 56 -56c14.5615 0 27.8232 5.56055 37.7832 14.6709l67.958 -40.7744
+c-1.13281 -4.44141 -1.73535 -9.09375 -1.73535 -13.8857c0 -0.0117188 -0.00488281 0 -0.00488281 -0.0117188c0 -30.9277 25.0723 -56 56 -56s56 25.0723 56 56c-0.000976562 30.9287 -25.0732 56.001 -56.001 56.001z" />
+    <glyph glyph-name="bomb" unicode="&#xf1e2;" 
+d="M440.5 359.5l-52 -52l26.5 -26.5c9.40039 -9.40039 9.40039 -24.5996 0 -33.9004l-17.4004 -17.3994c11.8008 -26.1006 18.4004 -55.1006 18.4004 -85.6006c0 -114.899 -93.0996 -208 -208 -208s-208 93 -208 207.9s93.0996 208 208 208
+c30.5 0 59.5 -6.59961 85.5996 -18.4004l17.4004 17.4004c9.40039 9.40039 24.5996 9.40039 33.9004 0l26.5 -26.5l52 52zM500 388c6.59961 0 12 -5.40039 12 -12s-5.40039 -12 -12 -12h-24c-6.59961 0 -12 5.40039 -12 12s5.40039 12 12 12h24zM440 448
+c6.59961 0 12 -5.40039 12 -12v-24c0 -6.59961 -5.40039 -12 -12 -12s-12 5.40039 -12 12v24c0 6.59961 5.40039 12 12 12zM473.9 393c-4.60059 -4.7002 -12.2002 -4.7002 -17 0c-4.7002 4.7002 -4.7002 12.2998 0 17l17 17c4.69922 4.7002 12.2998 4.7002 17 0
+c4.69922 -4.7002 4.69922 -12.2998 0 -17zM406.1 393l-17 17c-4.69922 4.7002 -4.69922 12.2998 0 17c4.7002 4.7002 12.3008 4.7002 17 0l17 -17c4.7002 -4.7002 4.7002 -12.2998 0 -17c-4.69922 -4.7002 -12.2998 -4.7002 -17 0zM473.9 359l17 -17
+c4.69922 -4.7002 4.69922 -12.2998 0 -17c-4.7002 -4.7002 -12.3008 -4.7002 -17 0l-17 17c-4.7002 4.7002 -4.7002 12.2998 0 17c4.69922 4.7002 12.2998 4.7002 17 0zM112 176c0 35.2998 28.7002 64 64 64c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16
+c-52.9004 0 -96 -43.0996 -96 -96c0 -8.7998 7.2002 -16 16 -16s16 7.2002 16 16z" />
+    <glyph glyph-name="futbol" unicode="&#xf1e3;" 
+d="M504 192c0 -136.967 -111.033 -248 -248 -248s-248 111.033 -248 248s111.033 248 248 248s248 -111.033 248 -248zM456 192l-0.00292969 0.282227l-26.0645 -22.7412l-62.6787 58.5l16.4541 84.3555l34.3027 -3.07227
+c-24.8887 34.2158 -60.0039 60.0889 -100.709 73.1406l13.6514 -31.9385l-74.9531 -41.5264l-74.9531 41.5254l13.6514 31.9385c-40.6309 -13.0283 -75.7803 -38.8701 -100.709 -73.1406l34.5645 3.07324l16.1924 -84.3555l-62.6777 -58.5l-26.0645 22.7412
+l-0.00292969 -0.282227c0 -43.0146 13.4971 -83.9521 38.4717 -117.991l7.7041 33.8975l85.1387 -10.4473l36.3008 -77.8262l-29.9023 -17.7861c40.2021 -13.1221 84.29 -13.1475 124.572 0l-29.9023 17.7861l36.3008 77.8262l85.1387 10.4473l7.7041 -33.8975
+c24.9756 34.0391 38.4727 74.9766 38.4727 117.991zM207.898 122.429l-29.8945 91.3125l77.9961 56.5264l77.9961 -56.5264l-29.6221 -91.3125h-96.4756z" />
+    <glyph glyph-name="tty" unicode="&#xf1e4;" 
+d="M5.37012 344.178c138.532 138.532 362.936 138.326 501.262 0c6.07812 -6.07812 7.07422 -15.4961 2.58301 -22.6807l-43.2139 -69.1377c-3.24023 -5.18457 -8.99902 -8.63672 -15.5576 -8.63672c-2.40137 0 -4.69531 0.490234 -6.79883 1.33105l-86.4219 34.5693
+c-6.75684 2.70312 -11.5352 9.31348 -11.5352 17.0312c0 0.621094 0.0410156 1.20898 0.101562 1.81445l5.95215 59.5312c-62.1455 22.4541 -130.636 21.9863 -191.483 0l5.95312 -59.5322c0.0605469 -0.606445 0.0917969 -1.22168 0.0917969 -1.84375
+c0 -7.7168 -4.76855 -14.2998 -11.5254 -17.002l-86.4238 -34.5684c-2.10254 -0.84082 -4.39648 -1.30371 -6.79785 -1.30371c-6.55859 0 -12.3174 3.4248 -15.5576 8.60938l-43.2109 69.1387c-1.75879 2.81348 -2.77539 6.1377 -2.77539 9.69727
+c0 5.05859 2.04004 9.66406 5.3584 12.9824zM96 140c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40zM192 140c0 -6.62695 -5.37305 -12 -12 -12h-40
+c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40zM288 140c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40zM384 140
+c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40zM480 140c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40
+c6.62695 0 12 -5.37305 12 -12v-40zM144 44c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40zM240 44c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v40
+c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40zM336 44c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40zM432 44c0 -6.62695 -5.37305 -12 -12 -12h-40
+c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40zM96 -52c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40zM384 -52
+c0 -6.62695 -5.37305 -12 -12 -12h-232c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h232c6.62695 0 12 -5.37305 12 -12v-40zM480 -52c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40
+c6.62695 0 12 -5.37305 12 -12v-40z" />
+    <glyph glyph-name="binoculars" unicode="&#xf1e5;" 
+d="M416 400v-48h-96v48c0 8.83984 7.16016 16 16 16h64c8.83984 0 16 -7.16016 16 -16zM63.9102 288.01c0.479492 17.6201 14.2998 31.9902 31.9297 31.9902h96.1602v-160h-32v-160c0 -17.6699 -14.3301 -32 -32 -32h-96c-17.6699 0 -32 14.3301 -32 32v44
+c3.45996 129.78 61.4004 150.16 63.9102 244.01zM448.09 288.01c2.50977 -93.8496 60.4502 -114.229 63.9102 -244.01v-44c0 -17.6699 -14.3301 -32 -32 -32h-96c-17.6699 0 -32 14.3301 -32 32v160h-32v160h96.1602c17.6299 0 31.4502 -14.3701 31.9297 -31.9902zM176 416
+c8.83984 0 16 -7.16016 16 -16v-48h-96v48c0 8.83984 7.16016 16 16 16h64zM224 160v160h64v-160h-64z" />
+    <glyph glyph-name="plug" unicode="&#xf1e6;" horiz-adv-x="384" 
+d="M320 416v-96h-64v96c0 17.6611 14.3389 32 32 32s32 -14.3389 32 -32zM368 288c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-16v-32c-0.0117188 -77.3096 -55.0684 -141.886 -128 -156.8v-99.2002h-64v99.2002
+c-72.9316 14.9141 -127.988 79.4902 -128 156.8v32h-16c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h352zM128 416v-96h-64v96c0 17.6611 14.3389 32 32 32s32 -14.3389 32 -32z" />
+    <glyph glyph-name="newspaper" unicode="&#xf1ea;" horiz-adv-x="576" 
+d="M552 384c13.2549 0 24 -10.7451 24 -24v-312c0 -26.5098 -21.4902 -48 -48 -48h-472c-30.9277 0 -56 25.0723 -56 56v272c0 13.2549 10.7451 24 24 24h40v8c0 13.2549 10.7451 24 24 24h464zM56 48c4.41504 0 8 3.58496 8 8v248h-16v-248c0 -4.41504 3.58496 -8 8 -8z
+M292 64c6.62695 0 12 5.37305 12 12v8c0 6.62695 -5.37305 12 -12 12h-152c-6.62695 0 -12 -5.37305 -12 -12v-8c0 -6.62695 5.37305 -12 12 -12h152zM500 64c6.62695 0 12 5.37305 12 12v8c0 6.62695 -5.37305 12 -12 12h-152c-6.62695 0 -12 -5.37305 -12 -12v-8
+c0 -6.62695 5.37305 -12 12 -12h152zM292 160c6.62695 0 12 5.37305 12 12v8c0 6.62695 -5.37305 12 -12 12h-152c-6.62695 0 -12 -5.37305 -12 -12v-8c0 -6.62695 5.37305 -12 12 -12h152zM500 160c6.62695 0 12 5.37305 12 12v8c0 6.62695 -5.37305 12 -12 12h-152
+c-6.62695 0 -12 -5.37305 -12 -12v-8c0 -6.62695 5.37305 -12 12 -12h152zM500 256c6.62695 0 12 5.37305 12 12v40c0 6.62695 -5.37305 12 -12 12h-360c-6.62695 0 -12 -5.37305 -12 -12v-40c0 -6.62695 5.37305 -12 12 -12h360z" />
+    <glyph glyph-name="wifi" unicode="&#xf1eb;" horiz-adv-x="640" 
+d="M634.91 293.12c6.66016 -6.16016 6.79004 -16.5898 0.359375 -22.9805l-34.2393 -33.9697c-6.14062 -6.08984 -16.0205 -6.22949 -22.4004 -0.379883c-145.95 133.71 -371.33 133.68 -517.25 0c-6.37988 -5.84961 -16.2598 -5.71973 -22.3994 0.379883l-34.2402 33.9697
+c-6.44043 6.39062 -6.31055 16.8203 0.349609 22.9805c177.101 163.81 452.65 163.87 629.82 0zM320 96c35.3496 0 64 -28.6504 64 -64s-28.6504 -64 -64 -64s-64 28.6504 -64 64s28.6504 64 64 64zM522.67 179.59c6.88965 -6.08984 7.12012 -16.6895 0.560547 -23.1494
+l-34.4404 -33.9902c-6 -5.93066 -15.6602 -6.32031 -22.0498 -0.799805c-83.75 72.4092 -209.54 72.5693 -293.49 0c-6.38965 -5.52051 -16.0498 -5.12012 -22.0498 0.799805l-34.4404 33.9902c-6.5498 6.45996 -6.33008 17.0498 0.570312 23.1494
+c115.13 101.82 290.08 101.93 405.34 0z" />
+    <glyph glyph-name="calculator" unicode="&#xf1ec;" horiz-adv-x="448" 
+d="M400 448c25.5996 0 48 -22.4004 48 -48v-416c0 -25.5996 -22.4004 -48 -48 -48h-352c-25.5996 0 -48 22.4004 -48 48v416c0 25.5996 22.4004 48 48 48h352zM128 12.7998v38.4004c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-38.4004
+c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998v-38.4004c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h38.4004c6.39941 0 12.7998 6.40039 12.7998 12.7998zM128 140.8v38.4004c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-38.4004
+c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998v-38.4004c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h38.4004c6.39941 0 12.7998 6.40039 12.7998 12.7998zM256 12.7998v38.4004c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-38.4004
+c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998v-38.4004c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h38.4004c6.39941 0 12.7998 6.40039 12.7998 12.7998zM256 140.8v38.4004c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-38.4004
+c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998v-38.4004c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h38.4004c6.39941 0 12.7998 6.40039 12.7998 12.7998zM384 12.7998v166.4c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-38.4004
+c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998v-166.4c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h38.4004c6.39941 0 12.7998 6.40039 12.7998 12.7998zM384 268.8v102.4c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-294.4
+c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998v-102.4c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h294.4c6.39941 0 12.7998 6.40039 12.7998 12.7998z" />
+    <glyph glyph-name="bell-slash" unicode="&#xf1f6;" horiz-adv-x="640" 
+d="M633.82 -10.0996c6.97949 -5.43066 8.22949 -15.4805 2.80957 -22.4502l-19.6396 -25.2705c-5.43066 -6.97949 -15.4805 -8.23926 -22.46 -2.80957l-588.351 454.729c-6.97949 5.43066 -8.22949 15.4805 -2.80957 22.4502l19.6396 25.2705
+c5.41992 6.97949 15.4805 8.22949 22.46 2.80957l144.96 -112.04c22.9307 31.5 57.2607 54.1904 97.5898 62.5703v20.8398c0 17.6699 14.3203 32 31.9805 32s31.9805 -14.3301 31.9805 -32v-20.8301c73.46 -15.2598 127.939 -77.46 127.939 -155.16
+c0 -102.3 36.1504 -133.529 55.4697 -154.29c6 -6.43945 8.66016 -14.1602 8.61035 -21.71c0 -1.39941 -0.610352 -2.67969 -0.799805 -4.05957zM157.23 196.46l212.789 -164.46h-241.92c-19.1191 0 -31.9893 15.5996 -32.0996 32
+c-0.0498047 7.5498 2.61035 15.2598 8.61035 21.71c16.21 17.4199 44.0098 42.79 52.6201 110.75zM320 -64c-35.3203 0 -63.9697 28.6504 -63.9697 64h127.939c0 -35.3496 -28.6494 -64 -63.9697 -64z" />
+    <glyph glyph-name="trash" unicode="&#xf1f8;" horiz-adv-x="448" 
+d="M432 416c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h120l9.40039 18.7002c3.85547 7.88574 11.9434 13.2998 21.3066 13.2998h0.0927734h114.3
+c0.00585938 0 -0.00195312 0.0234375 0.00390625 0.0234375c9.41113 0 17.5645 -5.42871 21.4961 -13.3232l9.40039 -18.7002h120zM53.2002 -19l-21.2002 339h384l-21.2002 -339c-1.57031 -25.0762 -22.4316 -44.9971 -47.8994 -45h-245.801
+c-25.4678 0.00292969 -46.3291 19.9238 -47.8994 45z" />
+    <glyph glyph-name="copyright" unicode="&#xf1f9;" 
+d="M256 440c136.967 0 248 -111.033 248 -248s-111.033 -248 -248 -248s-248 111.033 -248 248s111.033 248 248 248zM373.134 93.2471c1.78516 2.09473 2.86035 4.82812 2.86035 7.79395c0 2.64355 -0.856445 5.08789 -2.30762 7.07227l-24.5469 33.5713
+c-4.44824 6.08691 -13.376 6.61816 -18.5078 1.05371c-0.263672 -0.287109 -26.8467 -28.625 -65.5439 -28.625c-48.7627 0 -74.2773 40.0898 -74.2773 79.6914c0 42.5068 27.8008 76.082 73.916 76.082c35.3516 0 61.6475 -23.666 61.8809 -23.8799
+c5.45996 -5.05566 14.1846 -3.97168 18.2334 2.29492l22.3799 34.6553c1.20996 1.87305 1.91895 4.12109 1.91895 6.51465c0 3.125 -1.19727 5.97168 -3.15625 8.1084c-1.45703 1.58887 -36.4658 38.9043 -103.423 38.9043c-81.7578 0 -143.762 -62.0986 -143.762 -143.401
+c0 -82.3066 59.792 -145.567 144.484 -145.567c70.0752 0 108.259 43.8643 109.851 45.7314z" />
+    <glyph glyph-name="at" unicode="&#xf1fa;" 
+d="M256 440c138.023 0 248 -87.6533 248 -224c0 -75.7979 -41.3906 -147.41 -150.299 -147.41c-30.0977 0 -61.1885 -0.000976562 -70.71 34.1035c-17.6221 -22.6963 -48.0068 -38.333 -74.9912 -38.333c-59.2148 0 -96 40.5664 -96 105.87
+c0 89.2256 63.251 151.46 137.831 151.46c19.5225 0 45.2744 -3.87402 59.9707 -21.7754l0.00976562 0.0917969c0.765625 6.7373 6.49219 11.9932 13.4326 11.9932h44.9805c15.083 0 26.4287 -13.75 23.5625 -28.5586l-23.4336 -121.11
+c-3.43359 -17.167 -3.87207 -29.5703 13.4766 -30.0244c37.0771 3.95117 58.1699 44.9072 58.1699 83.6934c0 102.381 -83.8613 160 -184 160c-101.458 0 -184 -82.542 -184 -184s82.542 -184 184 -184c35.3145 0 69.9199 10.2432 99.4102 29.1572
+c10.1934 6.53809 23.7021 4.24219 31.373 -5.12891l10.1768 -12.4336c9.07324 -11.084 6.45312 -27.5566 -5.55176 -35.3721c-40.0664 -26.083 -87.2539 -40.2227 -135.408 -40.2227c-137.081 0 -248 110.941 -248 248c0 137.081 110.941 248 248 248zM234.32 135.57
+c24.2861 0 58.1611 27.6689 58.1611 72.7295c0 25.5293 -13.3096 40.7705 -35.6016 40.7705c-27.8506 0 -58.6299 -27.7363 -58.6299 -72.7295c0 -25.1475 13.8213 -40.7705 36.0703 -40.7705z" />
+    <glyph glyph-name="eye-dropper" unicode="&#xf1fb;" 
+d="M50.75 114.75l126.63 126.61l128 -128l-126.64 -126.62c-12 -12 -28.2803 -18.7402 -45.25 -18.7402h-45.4902l-56 -32l-32 32l32 56v45.4902c0 16.9795 6.75 33.2598 18.75 45.2598zM483.88 419.88c37.5 -37.4902 37.5 -98.2695 -0.00976562 -135.75l-77.0898 -77.0898
+l13.0996 -13.0996c9.37012 -9.37012 9.37012 -24.5703 0 -33.9404l-40.9697 -40.96c-9.29004 -9.30957 -24.5 -9.44043 -33.9404 0l-161.939 161.94c-9.37012 9.36914 -9.37012 24.5693 0 33.9395l40.9697 40.9697c9.29004 9.31055 24.5 9.44043 33.9404 0l13.0996 -13.0996
+l77.0898 77.0898c37.4697 37.5 98.2803 37.5 135.75 0z" />
+    <glyph glyph-name="paint-brush" unicode="&#xf1fc;" 
+d="M167.02 138.66l88.0107 -73.3398c0.319336 -3.05078 0.969727 -6.02051 0.969727 -9.12988c0 -76.4209 -52.1396 -120.19 -128 -120.19c-90.0703 0 -128 72.3799 -128.01 154.73c9.79004 -6.68066 44.1396 -34.3506 55.25 -34.3506
+c6.58984 0 12.2402 3.77051 14.5898 9.98047c20.6602 54.4395 57.0703 69.7197 97.1895 72.2998zM457.89 448c28.1104 0 54.1104 -20.6396 54.1104 -49.5498c0 -16.1406 -6.51953 -31.6406 -13.9004 -45.9902c-113.05 -210.99 -149.05 -256.46 -211.159 -256.46
+c-7.75 0 -15.1807 1.23047 -22.3906 3.03027l-63.8193 53.1797c-5.48047 11.9404 -8.73047 25 -8.73047 38.7002c0 53.75 21.2695 58.04 225.68 240.64c10.8398 9.74023 25.0508 16.4502 40.21 16.4502z" />
+    <glyph glyph-name="birthday-cake" unicode="&#xf1fd;" horiz-adv-x="448" 
+d="M448 64c-28.0195 0 -31.2598 32 -74.5 32c-43.4297 0 -46.8252 -32 -74.75 -32c-27.6953 0 -31.4541 32 -74.75 32c-42.8418 0 -47.2178 -32 -74.5 -32c-28.1484 0 -31.2021 32 -74.75 32c-43.5469 0 -46.6533 -32 -74.75 -32v80c0 26.5 21.5 48 48 48h16v144h64v-144h64
+v144h64v-144h64v144h64v-144h16c26.5 0 48 -21.5 48 -48v-80zM448 -64h-448v96c43.3564 0 46.7666 32 74.75 32c27.9512 0 31.2529 -32 74.75 -32c42.8428 0 47.2168 32 74.5 32c28.1484 0 31.2012 -32 74.75 -32c43.3574 0 46.7666 32 74.75 32
+c27.4883 0 31.252 -32 74.5 -32v-96zM96 352c-17.75 0 -32 14.25 -32 32c0 31 32 23 32 64c12 0 32 -29.5 32 -56s-14.25 -40 -32 -40zM224 352c-17.75 0 -32 14.25 -32 32c0 31 32 23 32 64c12 0 32 -29.5 32 -56s-14.25 -40 -32 -40zM352 352c-17.75 0 -32 14.25 -32 32
+c0 31 32 23 32 64c12 0 32 -29.5 32 -56s-14.25 -40 -32 -40z" />
+    <glyph glyph-name="chart-area" unicode="&#xf1fe;" 
+d="M500 64c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-488c-6.59961 0 -12 5.40039 -12 12v360c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-308h436zM372.7 288.5c6 4 14.2002 1.7998 17.3994 -4.7002l89.9004 -187.8h-384v104
+l86.7998 144.7c4.40039 7.2998 14.7998 7.7998 19.9004 1l85.2998 -113.7z" />
+    <glyph glyph-name="chart-pie" unicode="&#xf200;" horiz-adv-x="544" 
+d="M527.79 160c9.5498 0 17.4004 -8.38965 16.0596 -17.8496c-7.80957 -55.25 -34.4297 -104.4 -73.1299 -140.86c-6.20996 -5.84961 -16.1494 -5.36035 -22.1895 0.679688l-158.03 158.03h237.29zM511.96 224.8c0.629883 -9.12012 -7.0498 -16.7998 -16.1904 -16.7998
+h-223.77v223.76c0 9.14062 7.67969 16.8301 16.7998 16.2002c119.46 -8.24023 214.92 -103.7 223.16 -223.16zM224 160l155.86 -155.87c6.84961 -6.84961 6.33008 -18.4795 -1.57031 -24.0801c-38.29 -27.1602 -84.8604 -43.3994 -135.26 -44.0303
+c-128.2 -1.60938 -238.53 103.471 -242.891 231.61c-4.23926 124.771 86.8506 228.88 206.021 245.72c9.4502 1.34082 17.8398 -6.50977 17.8398 -16.0596v-237.29z" />
+    <glyph glyph-name="chart-line" unicode="&#xf201;" 
+d="M496 64c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-464c-17.6699 0 -32 14.3301 -32 32v336c0 8.83984 7.16016 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-304h432zM464 352c8.83984 0 16 -7.16016 15.9902 -16v-118.05
+c0 -21.3799 -25.8506 -32.0898 -40.9707 -16.9697l-32.3994 32.3994l-96 -96c-12.4902 -12.5 -32.75 -12.5 -45.25 0l-73.3701 73.3701l-46.0596 -46.0703c-6.25 -6.25 -16.3809 -6.25 -22.6309 0l-22.6191 22.6201c-6.25 6.25 -6.25 16.3799 0 22.6299l68.6895 68.6904
+c12.4902 12.5 32.75 12.5 45.25 0l73.3701 -73.3701l73.3701 73.3799l-32.4004 32.4004c-15.1201 15.1201 -4.41016 40.9697 16.9707 40.9697h118.06z" />
+    <glyph glyph-name="toggle-off" unicode="&#xf204;" horiz-adv-x="576" 
+d="M384 384c106.039 0 192 -85.9609 192 -192s-85.9609 -192 -192 -192h-192c-106.039 0 -192 85.9609 -192 192s85.9609 192 192 192h192zM64 192c0 -70.751 57.2588 -128 128 -128c70.751 0 128 57.2588 128 128c0 70.751 -57.2588 128 -128 128
+c-70.751 0 -128 -57.2588 -128 -128zM384 64c70.751 0 128 57.2598 128 128c0 70.751 -57.2588 128 -128 128h-48.9053c65.2363 -72.8799 65.2168 -183.142 0 -256h48.9053z" />
+    <glyph glyph-name="toggle-on" unicode="&#xf205;" horiz-adv-x="576" 
+d="M384 384c106 0 192 -86 192 -192s-86 -192 -192 -192h-192c-106 0 -192 86 -192 192s86 192 192 192h192zM384 64c70.7002 0 128 57.2002 128 128c0 70.7002 -57.2002 128 -128 128c-70.7002 0 -128 -57.2002 -128 -128c0 -70.7002 57.2002 -128 128 -128z" />
+    <glyph glyph-name="bicycle" unicode="&#xf206;" horiz-adv-x="640" 
+d="M512.509 255.999c70.9502 -0.276367 128.562 -59.0547 127.477 -129.996c-1.07422 -70.1934 -58.6494 -126.681 -129.255 -125.996c-68.8301 0.667969 -126.584 58.8857 -126.729 127.719c-0.078125 37.3564 15.8516 70.9893 41.3066 94.4375l-14.9375 24.0674
+l-85.9619 -138.863c-4.23145 -6.83496 -11.7832 -11.3672 -20.4062 -11.3672h-52.0332c-14.209 -55.207 -64.3252 -96 -123.967 -96c-70.9473 0 -128.415 57.7207 -128 128.764c0.410156 70.2246 58.0918 127.406 128.317 127.236
+c15.0879 -0.0371094 29.5586 -2.69043 42.9912 -7.51953l29.417 47.5195h-48.7256c-13.1191 0 -23.7627 10.5186 -23.9951 23.5635c-0.241211 13.4375 11.0947 24.4365 24.5361 24.4365h87.459c8.83691 0 16 -7.16309 16 -16v-16h113.544l-14.8955 24h-50.6494
+c-8.83691 0 -16 7.16309 -16 16v16c0 8.83691 7.16309 16 16 16h64c8.6123 0 16.1572 -4.52148 20.3916 -11.3428l77.6807 -125.153c14.4053 5.54004 30.0625 8.55957 46.4355 8.49512zM186.75 182.228l-23.6641 -38.2275h43.3057
+c-2.96875 14.5674 -9.91504 27.6992 -19.6416 38.2275zM128.002 48c32.7383 0 60.9297 19.7754 73.2998 48h-81.2998c-18.7891 0 -30.2871 20.6729 -20.4062 36.6318l45.5049 73.5088c-5.5127 1.20605 -11.2295 1.85938 -17.0986 1.85938c-44.1123 0 -80 -35.8877 -80 -80
+s35.8877 -80 80 -80zM290.632 144l74.2861 120h-127.547l-24.7461 -39.9736c22.8271 -20.1328 38.4229 -48.2705 42.3828 -80.0264h35.624zM507.689 48.1143c46.0605 -2.43164 84.3115 34.3447 84.3125 79.8848c0 44.1123 -35.8877 80 -80 80
+c-0.0136719 0 0.00585938 -0.0078125 -0.00683594 -0.0078125c-6.85156 0 -13.5029 -0.864258 -19.8516 -2.48926l44.4688 -71.6426c4.66113 -7.50879 2.35156 -17.3721 -5.15625 -22.0322l-13.5938 -8.4375c-7.50879 -4.65918 -17.3721 -2.35156 -22.0322 5.15625
+l-44.4326 71.5859c-12.7021 -14.7451 -20.1475 -34.1416 -19.3359 -55.2627c1.57812 -41.0635 34.5918 -74.5898 75.6279 -76.7549z" />
+    <glyph glyph-name="bus" unicode="&#xf207;" 
+d="M488 320c13.25 0 24 -10.7402 24 -24v-80c0 -13.25 -10.75 -24 -24 -24h-8v-166.4c0 -12.7998 -9.59961 -25.5996 -25.5996 -25.5996h-6.40039v-32c0 -17.6699 -14.3301 -32 -32 -32h-32c-17.6699 0 -32 14.3301 -32 32v32h-192v-32c0 -17.6699 -14.3301 -32 -32 -32h-32
+c-17.6699 0 -32 14.3301 -32 32v32c-17.6699 0 -32 14.3301 -32 32v160h-8c-13.25 0 -24 10.75 -24 24v80c0 13.2598 10.75 24 24 24h8v48c0 44.7998 99.2002 80 224 80s224 -35.2002 224 -80v-48h8zM112 48c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32
+s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM128 160h256c17.6699 0 32 14.3301 32 32v128c0 17.6699 -14.3301 32 -32 32h-256c-17.6699 0 -32 -14.3301 -32 -32v-128c0 -17.6699 14.3301 -32 32 -32zM400 48c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32
+s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="closed-captioning" unicode="&#xf20a;" 
+d="M464 384c26.5 0 48 -21.5 48 -48v-288c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v288c0 26.5 21.5 48 48 48h416zM218.1 160.3c-41.1992 -37.8994 -92.1992 -15.3994 -92.2998 32.6006c0 46.0996 53.7998 63.1992 94.6006 31.1992
+c2.89941 -2.2998 7.19922 -1.39941 9.09961 1.7002l17.5 30.5c1.5 2.5 1.09961 3.7002 -1 5.7002c-50.7998 49.4004 -172.5 27.2002 -172.5 -70.0996c0 -100 119.2 -124.7 172.8 -67.9004c2 2.09961 2.2002 5.2998 0.5 7.7002l-19.5 27.7002
+c-2.09961 3 -6.39941 3.39941 -9.2002 0.899414zM408.5 160.3c-41.2002 -37.8994 -92.2002 -15.3994 -92.2002 32.6006c0 46.0996 53.7998 63.1992 94.6006 31.1992c2.89941 -2.2998 7.19922 -1.39941 9.09961 1.7002l17.5 30.5c1.5 2.5 1.09961 3.7002 -1 5.7002
+c-50.7998 49.4004 -172.5 27.2002 -172.5 -70.0996c0 -100 119.2 -124.801 172.7 -67.9004c2 2.09961 2.2002 5.2998 0.5 7.7002l-19.5 27.7002c-2.10059 3 -6.40039 3.39941 -9.2002 0.899414z" />
+    <glyph glyph-name="shekel-sign" unicode="&#xf20b;" horiz-adv-x="448" 
+d="M248 280c0 30.9297 -25.0703 56 -56 56h-112v-352c0 -8.83984 -7.16016 -16 -16 -16h-48c-8.83984 0 -16 7.16016 -16 16v408c0 13.2598 10.75 24 24 24h168c75.1104 0 136 -60.8896 136 -136v-168c0 -8.83984 -7.16016 -16 -16 -16h-48c-8.83984 0 -16 7.16016 -16 16
+v168zM432 416c8.83984 0 16 -7.16016 16 -16v-296c0 -75.1104 -60.8896 -136 -136 -136h-168c-13.25 0 -24 10.75 -24 24v280c0 8.83984 7.16016 16 16 16h48c8.83984 0 16 -7.16016 16 -16v-224h112c30.9297 0 56 25.0703 56 56v296c0 8.83984 7.16016 16 16 16h48z" />
+    <glyph glyph-name="cart-plus" unicode="&#xf217;" horiz-adv-x="576" 
+d="M504.717 128h-293.145l6.54492 -32h268.418c15.4004 0 26.8154 -14.3008 23.4033 -29.3193l-5.51758 -24.2754c18.6914 -9.07324 31.5791 -28.2334 31.5791 -50.4053c0 -31.2021 -25.5186 -56.4443 -56.8242 -55.9941
+c-29.8232 0.428711 -54.3496 24.6309 -55.1543 54.4473c-0.44043 16.2871 6.08496 31.0488 16.8027 41.5479h-209.648c10.377 -10.166 16.8242 -24.3271 16.8242 -40.001c0 -31.8135 -26.5283 -57.4307 -58.6699 -55.9385c-28.54 1.3252 -51.751 24.3857 -53.251 52.917
+c-1.1582 22.0342 10.4355 41.4551 28.0508 51.5869l-70.2471 343.435h-69.8828c-13.2549 0 -24 10.7451 -24 24v16c0 13.2549 10.7451 24 24 24h102.529c11.4004 0 21.2275 -8.02148 23.5127 -19.1904l9.16602 -44.8096h392.782
+c15.4004 0 26.8154 -14.3008 23.4023 -29.3193l-47.2725 -208c-2.4834 -10.9268 -12.1973 -18.6807 -23.4033 -18.6807zM408 280h-48v40c0 8.83691 -7.16309 16 -16 16h-16c-8.83691 0 -16 -7.16309 -16 -16v-40h-48c-8.83691 0 -16 -7.16309 -16 -16v-16
+c0 -8.83691 7.16309 -16 16 -16h48v-40c0 -8.83691 7.16309 -16 16 -16h16c8.83691 0 16 7.16309 16 16v40h48c8.83691 0 16 7.16309 16 16v16c0 8.83691 -7.16309 16 -16 16z" />
+    <glyph glyph-name="cart-arrow-down" unicode="&#xf218;" horiz-adv-x="576" 
+d="M504.717 128h-293.145l6.54492 -32h268.418c15.4004 0 26.8154 -14.3008 23.4033 -29.3193l-5.51758 -24.2754c18.6914 -9.07324 31.5791 -28.2334 31.5791 -50.4053c0 -31.2021 -25.5186 -56.4443 -56.8242 -55.9941
+c-29.8232 0.428711 -54.3496 24.6309 -55.1543 54.4473c-0.44043 16.2871 6.08496 31.0488 16.8027 41.5479h-209.648c10.377 -10.166 16.8242 -24.3271 16.8242 -40.001c0 -31.8135 -26.5283 -57.4307 -58.6699 -55.9385c-28.54 1.3252 -51.751 24.3857 -53.251 52.917
+c-1.1582 22.0342 10.4355 41.4551 28.0508 51.5869l-70.2471 343.435h-69.8828c-13.2549 0 -24 10.7451 -24 24v16c0 13.2549 10.7451 24 24 24h102.529c11.4004 0 21.2275 -8.02148 23.5127 -19.1904l9.16602 -44.8096h392.782
+c15.4004 0 26.8154 -14.3008 23.4023 -29.3193l-47.2725 -208c-2.4834 -10.9268 -12.1973 -18.6807 -23.4033 -18.6807zM403.029 256h-43.0293v60c0 6.62695 -5.37305 12 -12 12h-24c-6.62695 0 -12 -5.37305 -12 -12v-60h-43.0293
+c-10.6904 0 -16.0449 -12.9258 -8.48438 -20.4854l67.0283 -67.0283c4.68652 -4.68652 12.2842 -4.68652 16.9717 0l67.0283 67.0283c7.55957 7.55957 2.20508 20.4854 -8.48535 20.4854z" />
+    <glyph glyph-name="ship" unicode="&#xf21a;" horiz-adv-x="640" 
+d="M496.616 75.3613c17.8418 -44.3604 58.5664 -75.3613 119.384 -75.3613c13.2549 0 24 -10.7451 24 -24v-16c0 -13.2549 -10.7451 -24 -24 -24c-61.0322 0 -107.505 20.6162 -143.258 59.3965c-14.4189 -34.8281 -48.7637 -59.3965 -88.7422 -59.3965h-128
+c-39.9785 0 -74.3232 24.5684 -88.7422 59.3965c-35.7588 -38.7861 -82.2344 -59.3965 -143.258 -59.3965c-13.2549 0 -24 10.7451 -24 24v16c0 13.2549 10.7451 24 24 24c61.5869 0 101.828 31.7129 119.384 75.3613l-70.0117 70.0117
+c-16.918 16.9189 -9.91699 45.7793 12.8359 53.0918l41.792 13.4336v140.102c0 17.6729 14.3271 32 32 32h64v40c0 13.2549 10.7451 24 24 24h144c13.2549 0 24 -10.7451 24 -24v-40h64c17.6729 0 32 -14.3271 32 -32v-140.102l41.792 -13.4336
+c22.7783 -7.32129 29.7354 -36.1914 12.8359 -53.0918zM192 320v-87.5312l118.208 37.9951c3.08594 0.992188 6.38086 1.52832 9.79492 1.52832c3.41309 0 6.70312 -0.536133 9.78906 -1.52832l118.208 -37.9951v87.5312h-256z" />
+    <glyph glyph-name="user-secret" unicode="&#xf21b;" horiz-adv-x="448" 
+d="M383.9 139.7c38.2998 -23.7002 64.0996 -65.7002 64.0996 -114.101v-44.7998c0 -24.7002 -20.0996 -44.7998 -44.7998 -44.7998h-358.4c-24.7002 0 -44.7998 20.0996 -44.7998 44.7998v44.7998c0 49.7002 27.2998 92.6006 67.4004 115.9l-25.8008 60.2002
+c-4.5 10.5996 3.2002 22.2998 14.7002 22.2998h57.5c-11 18.9004 -17.7998 40.5996 -17.7998 64v0.299805c-39.2002 7.7998 -64 19.1006 -64 31.7002c0 13.2998 27.2998 25.0996 70 33c9.2002 32.7998 27.0996 65.7998 40.5996 82.7998
+c9.5 11.9004 25.9004 15.6006 39.5 8.7998l27.6006 -13.7998c9 -4.5 19.5996 -4.5 28.5996 0l27.6006 13.7998c13.5996 6.80078 30 3.10059 39.5 -8.7998c13.5996 -17 31.3994 -50 40.5996 -82.7998c42.7998 -7.90039 70.0996 -19.7002 70.0996 -33
+c0 -12.5996 -24.7998 -23.9004 -64 -31.7002v-0.299805c0 -23.4004 -6.7998 -45.0996 -17.7998 -64h58.5c11.2998 0 19 -11.2002 15 -21.7002zM176 -32l32 120l-24 40l-49.5996 32zM272 -32l41.5996 192l-49.5996 -32l-24 -40zM313.7 266.5
+c0.799805 2.59961 6.2998 5.7002 6.39941 5.7998v10.7998c-28.2998 -3.69922 -61 -5.7998 -96 -5.7998s-67.6992 2.2002 -96 5.7998v-10.7998c0 -0.0996094 5.5 -3.2998 6.30078 -5.7998c3.7998 -11.9004 7 -24.5996 16.5 -33.4004c8 -7.39941 47 -25.1992 64 25
+c2.89941 8.40039 15.5 8.40039 18.2998 0c16 -47.3994 53.8994 -34.2998 64 -25c9.5 8.80078 12.5996 21.5 16.5 33.4004z" />
+    <glyph glyph-name="motorcycle" unicode="&#xf21c;" horiz-adv-x="640" 
+d="M512.9 256c69.5996 -0.5 126.5 -57.2998 127.199 -126.9c0.600586 -71.5996 -57.5996 -129.8 -129.199 -129.1c-69.6006 0.599609 -126.301 57.5 -126.801 127.1c-0.299805 39.3008 17.2002 74.5 44.8008 98.2002l-12.5 20.7998
+c-38.7002 -31.2998 -58.3008 -77.8994 -56.2002 -125c0.599609 -13.6992 -10.2998 -25.0996 -24 -25.0996h-84.2002c-14.2998 -55.2002 -64.4004 -96 -124 -96c-71.7002 0 -129.6 58.9004 -128 131c1.59961 67.4004 55.9004 122.5 123.2 124.9
+c14.3994 0.5 28.2998 -1.30078 41.2998 -5.2002l11.2998 20.5c-9.09961 13.8994 -23.2998 24.7998 -47.7998 24.7998h-56c-13.0996 0 -23.7998 10.5 -24 23.5c-0.299805 13.5 11 24.5 24.5 24.5h55.5c55 0 82.2002 -16.9004 99.9004 -40h153.699l-19.1992 32h-66.4004
+c-8.7998 0 -16 7.2002 -16 16v16c0 8.7998 7.2002 16 16 16h80c8.40039 0 16.2002 -4.40039 20.5996 -11.5996l22.8008 -38l37.5 41.6992c4.5 5 11 7.90039 17.7998 7.90039h45.2998c13.2998 0 24 -10.7002 24 -24v-32c0 -13.2998 -10.7002 -24 -24 -24h-82.4004
+l32.9004 -54.9004c13.2998 4.60059 27.5 7 42.4004 6.90039zM128 48c32.7002 0 60.9004 19.7998 73.2998 48h-81.2998c-18.2002 0 -29.7998 19.5996 -21 35.5996l41.5 75.4004c-4.09961 0.700195 -8.2998 1 -12.5 1c-44.0996 0 -80 -35.9004 -80 -80s35.9004 -80 80 -80z
+M591.9 123.6c2.39941 46.1006 -34.3008 84.4004 -79.9004 84.3008c-5.40039 0 -10.7002 -0.5 -15.9004 -1.60059l48.6006 -80.8994c4.5 -7.60059 2.09961 -17.5 -5.5 -22l-13.7002 -8.2002c-7.59961 -4.5 -17.5 -2.10059 -22 5.5l-49.4004 82.3994
+c-13.6992 -14.2998 -22.0996 -33.6992 -22.0996 -55.0996c0 -45.5996 38.2998 -82.4004 84.4004 -79.9004c40.5 2.10059 73.2998 34.9004 75.5 75.5z" />
+    <glyph glyph-name="street-view" unicode="&#xf21d;" 
+d="M367.9 118.24c85.2295 -15.5801 144.1 -48.29 144.1 -86.2402c0 -53.0195 -114.62 -96 -256 -96s-256 42.9805 -256 96c0 37.9502 58.8701 70.6602 144.1 86.2402c4.62012 -5.2998 9.78027 -10.1006 15.9004 -13.6504v-22.9395
+c-66.5195 -9.35059 -112 -28.0508 -112 -49.6504c0 -30.9297 93.1201 -56 208 -56s208 25.0703 208 56c0 21.5996 -45.4805 40.3096 -112 49.6504v22.9395c6.12012 3.5498 11.2803 8.35059 15.9004 13.6504zM256 320c-35.3496 0 -64 28.6504 -64 64s28.6504 64 64 64
+s64 -28.6504 64 -64s-28.6504 -64 -64 -64zM192 128c-17.6699 0 -32 14.3301 -32 32v96c0 26.5098 21.4902 48 48 48h11.7998c11.0703 -5.03027 23.2598 -8 36.2002 -8s25.1299 2.96973 36.2002 8h11.7998c26.5098 0 48 -21.4902 48 -48v-96
+c0 -17.6699 -14.3301 -32 -32 -32v-96c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v96z" />
+    <glyph glyph-name="heartbeat" unicode="&#xf21e;" 
+d="M320.2 204.2l22.0996 -44.2002h109.101l-182.601 -186.5c-7.09961 -7.2998 -18.5996 -7.2998 -25.7002 0l-182.5 186.5h94.1006l30 71.7002l56.8994 -126.3c5.5 -12.3008 22.9004 -12.7002 28.9004 -0.600586zM473.7 374.1
+c48.7002 -49.7998 50.7998 -129.1 7.2998 -182.1h-118.9l-27.5996 55.2002c-5.90039 11.7998 -22.7002 11.7998 -28.5996 0l-49 -97.9004l-58.2002 129.3c-5.7998 12.8008 -24 12.5 -29.4004 -0.399414l-35.8994 -86.2002h-102.4c-43.5 53 -41.4004 132.3 7.2998 182.1
+l2.40039 2.40039c51.5 52.7002 135.899 52.7002 187.399 0l27.9004 -28.5l27.9004 28.5996c51.5996 52.6006 135.899 52.6006 187.399 0z" />
+    <glyph glyph-name="venus" unicode="&#xf221;" horiz-adv-x="288" 
+d="M288 272c0 -68.5 -47.9004 -125.9 -112 -140.4v-51.5996h36c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-36v-36c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v36h-36c-6.59961 0 -12 5.40039 -12 12v40
+c0 6.59961 5.40039 12 12 12h36v51.5996c-64.0996 14.5 -112 71.9004 -112 140.4c0 79.5 64.5 144 144 144s144 -64.5 144 -144zM64 272c0 -44.0996 35.9004 -80 80 -80s80 35.9004 80 80s-35.9004 80 -80 80s-80 -35.9004 -80 -80z" />
+    <glyph glyph-name="mars" unicode="&#xf222;" horiz-adv-x="384" 
+d="M372 384c6.59961 0 12 -5.40039 12 -12v-79c0 -10.7002 -12.9004 -16.0996 -20.5 -8.5l-16.9004 16.9004l-80.6992 -80.7002c14 -22.2002 22.0996 -48.5 22.0996 -76.7002c0 -79.5 -64.5 -144 -144 -144s-144 64.5 -144 144s64.5 144 144 144
+c28.2002 0 54.5 -8.09961 76.7002 -22.0996l80.7002 80.6992l-16.9004 16.9004c-7.5 7.59961 -2.2002 20.5 8.5 20.5h79zM144 64c44.0996 0 80 35.9004 80 80s-35.9004 80 -80 80s-80 -35.9004 -80 -80s35.9004 -80 80 -80z" />
+    <glyph glyph-name="mercury" unicode="&#xf223;" horiz-adv-x="288" 
+d="M288 240c0 -68.5 -47.9004 -125.9 -112 -140.4v-51.5996h36c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-36v-36c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v36h-36c-6.59961 0 -12 5.40039 -12 12v40
+c0 6.59961 5.40039 12 12 12h36v51.5996c-64.0996 14.5 -112 71.9004 -112 140.4c0 44.2002 19.9004 83.7002 51.2002 110c-2.5 1.90039 -4.90039 3.7998 -7.2002 5.7998c-24.7998 21.2002 -39.7998 48.7998 -43.2002 78.9004
+c-0.899414 7.09961 4.7002 13.2998 11.9004 13.2998h40.5c5.7002 0 10.5996 -4.09961 11.7002 -9.7998c2.5 -12.5 9.59961 -24.2998 20.6992 -33.7998c15.4004 -13.2002 36.1006 -20.4004 58.4004 -20.4004s43 7.2002 58.2998 20.4004
+c11.1006 9.5 18.2998 21.2998 20.7002 33.7998c1.09961 5.7002 6 9.7998 11.7998 9.7998h40.5c7.2002 0 12.7998 -6.2002 11.9004 -13.2998c-3.40039 -30 -18.5 -57.6006 -43.2002 -78.7998c-2.2998 -2 -4.7002 -4 -7.2002 -5.80078
+c31.2998 -26.3994 51.2002 -65.8994 51.2002 -110.1zM64 240c0 -44.0996 35.9004 -80 80 -80s80 35.9004 80 80s-35.9004 80 -80 80s-80 -35.9004 -80 -80z" />
+    <glyph glyph-name="transgender" unicode="&#xf224;" horiz-adv-x="384" 
+d="M372 448c6.59961 0 12 -5.40039 12 -12v-79c0 -10.7002 -12.9004 -16.0996 -20.5 -8.5l-16.9004 16.9004l-80.6992 -80.7002c14 -22.2002 22.0996 -48.5 22.0996 -76.7002c0 -68.5 -47.9004 -125.8 -112 -140.4v-27.5996h36c6.59961 0 12 -5.40039 12 -12v-40
+c0 -6.59961 -5.40039 -12 -12 -12h-36v-28c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v28h-36c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h36v27.5996c-64.0996 14.5 -112 71.9004 -112 140.4c0 79.5 64.5 144 144 144
+c28.2002 0 54.5 -8.09961 76.7002 -22.0996l80.7002 80.6992l-16.9004 16.9004c-7.5 7.59961 -2.2002 20.5 8.5 20.5h79zM144 128c44.0996 0 80 35.9004 80 80s-35.9004 80 -80 80s-80 -35.9004 -80 -80s35.9004 -80 80 -80z" />
+    <glyph glyph-name="transgender-alt" unicode="&#xf225;" horiz-adv-x="480" 
+d="M468 448c6.59961 0 12 -5.40039 12 -12v-79c0 -10.7002 -12.9004 -16.0996 -20.5 -8.5l-16.9004 16.9004l-80.6992 -80.7002c14 -22.2002 22.0996 -48.5 22.0996 -76.7002c0 -68.5 -47.9004 -125.8 -112 -140.4v-27.5996h36c6.59961 0 12 -5.40039 12 -12v-40
+c0 -6.59961 -5.40039 -12 -12 -12h-36v-28c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v28h-36c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h36v27.5996c-64.0996 14.5 -112 71.9004 -112 140.4
+c0 28.2002 8.09961 54.5 22.2002 76.5996l-16.5 16.5l-19.7998 -19.7998c-4.7002 -4.7002 -12.3008 -4.7002 -17 0l-28.3008 28.2998c-4.69922 4.7002 -4.69922 12.3008 0 17l19.8008 19.8008l-19 19l-16.9004 -16.9004c-7.59961 -7.5 -20.5 -2.2002 -20.5 8.5v79
+c0 6.59961 5.40039 12 12 12h79c10.7002 0 16.0996 -12.9004 8.40039 -20.4004l-16.9004 -16.8994l19 -19l19.7998 19.7998c4.7002 4.7002 12.2998 4.7002 17 0l28.2998 -28.2998c4.7002 -4.7002 4.7002 -12.2998 0 -17l-19.7998 -19.7998l16.5 -16.5
+c22.2002 14 48.5 22.0996 76.7002 22.0996s54.5 -8.09961 76.7002 -22.0996l80.7002 80.6992l-16.9004 16.9004c-7.5 7.59961 -2.2002 20.5 8.5 20.5h79zM240 128c44.0996 0 80 35.9004 80 80s-35.9004 80 -80 80s-80 -35.9004 -80 -80s35.9004 -80 80 -80z" />
+    <glyph glyph-name="venus-double" unicode="&#xf226;" 
+d="M288 272c0 -68.5 -47.9004 -125.9 -112 -140.4v-51.5996h36c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-36v-36c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v36h-36c-6.59961 0 -12 5.40039 -12 12v40
+c0 6.59961 5.40039 12 12 12h36v51.5996c-64.0996 14.5 -112 71.9004 -112 140.4c0 79.5 64.5 144 144 144s144 -64.5 144 -144zM64 272c0 -44.0996 35.9004 -80 80 -80s80 35.9004 80 80s-35.9004 80 -80 80s-80 -35.9004 -80 -80zM400 131.6v-51.5996h36
+c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-36v-36c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v36h-36c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h36v51.5996
+c-21.2002 4.80078 -40.5996 14.3008 -57.2002 27.3008c14 16.6992 25 36 32.1006 57.0996c14.5 -14.7998 34.6992 -24 57.0996 -24c44.0996 0 80 35.9004 80 80s-35.9004 80 -80 80c-22.2998 0 -42.5996 -9.2002 -57.0996 -24
+c-7.10059 21.0996 -18 40.4004 -32.1006 57.0996c24.6006 19.3008 55.5 30.9004 89.2002 30.9004c79.5 0 144 -64.5 144 -144c0 -68.5 -47.9004 -125.9 -112 -140.4z" />
+    <glyph glyph-name="mars-double" unicode="&#xf227;" 
+d="M340 448c6.59961 0 12 -5.40039 12 -12v-79c0 -7.2002 -5.90039 -12 -12.0996 -12c-2.90039 0 -6 1.09961 -8.40039 3.5l-16.9004 16.9004l-48.6992 -48.7002c14 -22.2002 22.0996 -48.5 22.0996 -76.7002c0 -79.5 -64.5 -144 -144 -144s-144 64.5 -144 144
+s64.5 144 144 144c28.2002 0 54.5 -8.09961 76.7002 -22.0996l48.7002 48.6992l-16.9004 16.9004c-7.5 7.59961 -2.2002 20.5 8.5 20.5h79zM144 160c44.0996 0 80 35.9004 80 80s-35.9004 80 -80 80s-80 -35.9004 -80 -80s35.9004 -80 80 -80zM500 288.1
+c6.59961 0 12 -5.39941 12 -12.0996v-79c0 -7.2002 -5.90039 -12 -12.0996 -12c-3 0 -6 1.09961 -8.40039 3.5l-16.9004 16.9004l-48.6992 -48.7002c14 -22.2002 22.0996 -48.5 22.0996 -76.7002c0 -79.5 -64.5 -144 -144 -144c-74.4004 0 -135.6 56.4004 -143.2 128.9
+c21.7998 2 43.2998 8.19922 63.2998 18.3994c-0.0996094 -1 -0.0996094 -2.09961 -0.0996094 -3.2002c0 -44.0996 35.9004 -80 80 -80s80 35.9004 80 80c0 44.1006 -35.9004 80 -80 80c-1 0 -2.09961 -0.0996094 -3.2002 -0.0996094
+c10.2002 20 16.2998 41.5 18.4004 63.2998c22.5 -2.39941 43.2998 -9.89941 61.5 -21.2998l48.7002 48.7002l-16.9004 16.8994c-7.5 7.60059 -2.2002 20.5 8.5 20.5h79z" />
+    <glyph glyph-name="venus-mars" unicode="&#xf228;" horiz-adv-x="576" 
+d="M564 448c6.59961 0 12 -5.40039 12 -12v-79c0 -7.2002 -5.90039 -12 -12.0996 -12c-3 0 -6 1.09961 -8.40039 3.5l-16.9004 16.9004l-48.6992 -48.7002c14 -22.2002 22.0996 -48.5 22.0996 -76.7002c0 -79.5 -64.5 -144 -144 -144
+c-33.7002 0 -64.7002 11.5 -89.2002 30.9004c14.1006 16.6992 25 36 32.1006 57.0996c14.5 -14.7998 34.7998 -24 57.0996 -24c44.0996 0 80 35.9004 80 80s-35.9004 80 -80 80c-22.4004 0 -42.5996 -9.2002 -57.0996 -24
+c-7.10059 21.0996 -18.1006 40.4004 -32.1006 57.0996c24.6006 19.3008 55.5 30.9004 89.2002 30.9004c28.2002 0 54.5 -8.09961 76.7002 -22.0996l48.7002 48.6992l-16.9004 16.9004c-7.5 7.59961 -2.2002 20.5 8.5 20.5h79zM144 384c79.5 0 144 -64.5 144 -144
+c0 -68.5 -47.9004 -125.8 -112 -140.4v-51.5996h36c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-36v-36c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v36h-36c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12
+h36v51.5996c-64.0996 14.5 -112 71.9004 -112 140.4c0 79.5 64.5 144 144 144zM144 160c44.0996 0 80 35.9004 80 80s-35.9004 80 -80 80s-80 -35.9004 -80 -80s35.9004 -80 80 -80z" />
+    <glyph glyph-name="mars-stroke" unicode="&#xf229;" horiz-adv-x="384" 
+d="M372 384c6.59961 0 12 -5.40039 12.0996 -12v-78.9004c0 -10.6992 -12.8994 -16.0996 -20.5 -8.5l-16.8994 16.9004l-17.5 -17.5l14.0996 -14.0996c4.7002 -4.7002 4.7002 -12.3008 0 -17l-28.2998 -28.3008c-4.7002 -4.69922 -12.2998 -4.69922 -17 0l-14.0996 14.1006
+l-18 -18c14 -22.2002 22.0996 -48.5 22.0996 -76.7002c0 -79.5 -64.5 -144 -144 -144s-144 64.5 -144 144s64.5 144 143.9 144c28.1992 0 54.5 -8.09961 76.6992 -22.0996l18 18l-14.0996 14.0996c-4.7002 4.7002 -4.7002 12.2998 0 17l28.2998 28.2002
+c4.7002 4.7002 12.2998 4.7002 17 0l14.1006 -14.1006l17.5 17.5l-16.9004 16.9004c-7.5 7.59961 -2.2002 20.5 8.5 20.5h79zM144 64c44.0996 0 80 35.9004 80 80s-35.9004 80 -80 80s-80 -35.9004 -80 -80s35.9004 -80 80 -80z" />
+    <glyph glyph-name="mars-stroke-v" unicode="&#xf22a;" horiz-adv-x="288" 
+d="M245.8 213.8c56.2998 -56.2002 56.2998 -147.399 0 -203.6c-56.2002 -56.2002 -147.399 -56.2002 -203.6 0s-56.2002 147.399 0 203.6c19.8994 19.9004 44.2002 32.7998 69.7998 38.6006v25.3994h-20c-6.59961 0 -12 5.40039 -12 12v40c0 6.60059 5.40039 12 12 12h20
+v24.7002h-23.9004c-10.6992 0 -16.0996 12.9004 -8.5 20.5l55.9004 55.9004c4.7002 4.69922 12.2998 4.69922 17 0l55.9004 -55.8008c7.5 -7.59961 2.19922 -20.5 -8.5 -20.5h-23.9004v-24.7998h20c6.59961 0 12 -5.39941 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-20
+v-25.3994c25.5996 -5.80078 49.9004 -18.7002 69.7998 -38.6006zM200.6 55.4004c31.2002 31.1992 31.2002 82 0 113.1c-31.1992 31.2002 -81.8994 31.2002 -113.1 0s-31.2002 -81.9004 0 -113.1c31.2002 -31.2002 81.9004 -31.2002 113.1 0z" />
+    <glyph glyph-name="mars-stroke-h" unicode="&#xf22b;" horiz-adv-x="480" 
+d="M476.2 200.5c4.7002 -4.7002 4.7002 -12.2998 0.0996094 -17l-55.8994 -55.9004c-7.60059 -7.5 -20.5 -2.19922 -20.5 8.5v23.9004h-23.9004v-20c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v20h-27.5996
+c-5.80078 -25.5996 -18.7002 -49.9004 -38.6006 -69.7998c-56.2002 -56.2002 -147.399 -56.2002 -203.6 0s-56.2002 147.399 0 203.6s147.399 56.2002 203.6 0c19.9004 -19.8994 32.7998 -44.2002 38.6006 -69.7998h27.5996v20c0 6.59961 5.40039 12 12 12h40
+c6.59961 0 12 -5.40039 12 -12v-20h23.7998v23.9004c0 10.6992 12.9004 16.0996 20.5 8.5zM200.6 135.4c31.2002 31.1992 31.2002 82 0 113.1c-31.1992 31.2002 -81.8994 31.2002 -113.1 0s-31.2002 -81.9004 0 -113.1c31.2002 -31.2002 81.9004 -31.2002 113.1 0z" />
+    <glyph glyph-name="neuter" unicode="&#xf22c;" horiz-adv-x="288" 
+d="M288 272c0 -68.5 -47.9004 -125.9 -112 -140.4v-151.6c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v151.6c-64.0996 14.5 -112 71.9004 -112 140.4c0 79.5 64.5 144 144 144s144 -64.5 144 -144zM144 192c44.0996 0 80 35.9004 80 80
+s-35.9004 80 -80 80s-80 -35.9004 -80 -80s35.9004 -80 80 -80z" />
+    <glyph glyph-name="genderless" unicode="&#xf22d;" horiz-adv-x="288" 
+d="M144 272c-44.0996 0 -80 -35.9004 -80 -80s35.9004 -80 80 -80s80 35.9004 80 80s-35.9004 80 -80 80zM144 336c79.5 0 144 -64.5 144 -144s-64.5 -144 -144 -144s-144 64.5 -144 144s64.5 144 144 144z" />
+    <glyph glyph-name="server" unicode="&#xf233;" 
+d="M480 288h-448c-17.6729 0 -32 14.3271 -32 32v64c0 17.6729 14.3271 32 32 32h448c17.6729 0 32 -14.3271 32 -32v-64c0 -17.6729 -14.3271 -32 -32 -32zM432 376c-13.2549 0 -24 -10.7451 -24 -24s10.7451 -24 24 -24s24 10.7451 24 24s-10.7451 24 -24 24zM368 376
+c-13.2549 0 -24 -10.7451 -24 -24s10.7451 -24 24 -24s24 10.7451 24 24s-10.7451 24 -24 24zM480 128h-448c-17.6729 0 -32 14.3271 -32 32v64c0 17.6729 14.3271 32 32 32h448c17.6729 0 32 -14.3271 32 -32v-64c0 -17.6729 -14.3271 -32 -32 -32zM432 216
+c-13.2549 0 -24 -10.7451 -24 -24s10.7451 -24 24 -24s24 10.7451 24 24s-10.7451 24 -24 24zM368 216c-13.2549 0 -24 -10.7451 -24 -24s10.7451 -24 24 -24s24 10.7451 24 24s-10.7451 24 -24 24zM480 -32h-448c-17.6729 0 -32 14.3271 -32 32v64
+c0 17.6729 14.3271 32 32 32h448c17.6729 0 32 -14.3271 32 -32v-64c0 -17.6729 -14.3271 -32 -32 -32zM432 56c-13.2549 0 -24 -10.7451 -24 -24s10.7451 -24 24 -24s24 10.7451 24 24s-10.7451 24 -24 24zM368 56c-13.2549 0 -24 -10.7451 -24 -24s10.7451 -24 24 -24
+s24 10.7451 24 24s-10.7451 24 -24 24z" />
+    <glyph glyph-name="user-plus" unicode="&#xf234;" horiz-adv-x="640" 
+d="M624 240c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-64v-64c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v64h-64c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h64v64c0 8.7998 7.2002 16 16 16h32
+c8.7998 0 16 -7.2002 16 -16v-64h64zM224 192c-70.7002 0 -128 57.2998 -128 128s57.2998 128 128 128s128 -57.2998 128 -128s-57.2998 -128 -128 -128zM313.6 160c74.2002 0 134.4 -60.2002 134.4 -134.4v-41.5996c0 -26.5 -21.5 -48 -48 -48h-352
+c-26.5 0 -48 21.5 -48 48v41.5996c0 74.2002 60.2002 134.4 134.4 134.4h16.6992c22.3008 -10.2002 46.9004 -16 72.9004 -16s50.7002 5.7998 72.9004 16h16.6992z" />
+    <glyph glyph-name="user-times" unicode="&#xf235;" horiz-adv-x="640" 
+d="M589.6 208l45.6006 -45.5996c6.2998 -6.30078 6.2998 -16.5 0 -22.8008l-22.7998 -22.7998c-6.30078 -6.2998 -16.5 -6.2998 -22.8008 0l-45.5996 45.6006l-45.5996 -45.6006c-6.30078 -6.2998 -16.5 -6.2998 -22.8008 0l-22.7998 22.7998
+c-6.2998 6.30078 -6.2998 16.5 0 22.8008l45.6006 45.5996l-45.6006 45.5996c-6.2998 6.30078 -6.2998 16.5 0 22.8008l22.7998 22.7998c6.30078 6.2998 16.5 6.2998 22.8008 0l45.5996 -45.6006l45.5996 45.6006c6.30078 6.2998 16.5 6.2998 22.8008 0l22.7998 -22.7998
+c6.2998 -6.30078 6.2998 -16.5 0 -22.8008zM224 192c-70.7002 0 -128 57.2998 -128 128s57.2998 128 128 128s128 -57.2998 128 -128s-57.2998 -128 -128 -128zM313.6 160c74.2002 0 134.4 -60.2002 134.4 -134.4v-41.5996c0 -26.5 -21.5 -48 -48 -48h-352
+c-26.5 0 -48 21.5 -48 48v41.5996c0 74.2002 60.2002 134.4 134.4 134.4h16.6992c22.3008 -10.2002 46.9004 -16 72.9004 -16s50.7002 5.7998 72.9004 16h16.6992z" />
+    <glyph glyph-name="bed" unicode="&#xf236;" horiz-adv-x="640" 
+d="M176 192c-44.1104 0 -80 35.8896 -80 80s35.8896 80 80 80s80 -35.8896 80 -80s-35.8896 -80 -80 -80zM528 320c61.8604 0 112 -50.1396 112 -112v-192c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v48h-512v-48c0 -8.83984 -7.16016 -16 -16 -16
+h-32c-8.83984 0 -16 7.16016 -16 16v352c0 8.83984 7.16016 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-208h224v144c0 8.83984 7.16016 16 16 16h224z" />
+    <glyph glyph-name="train" unicode="&#xf238;" horiz-adv-x="448" 
+d="M448 352v-256c0 -51.8154 -61.624 -96 -130.022 -96l62.9805 -49.7207c5.94727 -4.69629 2.60352 -14.2793 -4.95801 -14.2793h-304c-7.57812 0 -10.8916 9.59375 -4.95703 14.2793l62.9795 49.7207c-68.2021 0 -130.022 44.0459 -130.022 96v256c0 53.0186 64 96 128 96
+h192c65 0 128 -42.9814 128 -96zM400 216v112c0 13.2549 -10.7451 24 -24 24h-304c-13.2549 0 -24 -10.7451 -24 -24v-112c0 -13.2549 10.7451 -24 24 -24h304c13.2549 0 24 10.7451 24 24zM224 152c-30.9277 0 -56 -25.0723 -56 -56s25.0723 -56 56 -56s56 25.0723 56 56
+s-25.0723 56 -56 56z" />
+    <glyph glyph-name="subway" unicode="&#xf239;" horiz-adv-x="448" 
+d="M448 352v-256c0 -51.8154 -61.624 -96 -130.022 -96l62.9805 -49.7207c5.94727 -4.69629 2.60352 -14.2793 -4.95801 -14.2793h-304c-7.57812 0 -10.8916 9.59375 -4.95703 14.2793l62.9795 49.7207c-68.2021 0 -130.022 44.0459 -130.022 96v256c0 53.0186 64 96 128 96
+h192c65 0 128 -42.9814 128 -96zM200 216v112c0 13.2549 -10.7451 24 -24 24h-104c-13.2549 0 -24 -10.7451 -24 -24v-112c0 -13.2549 10.7451 -24 24 -24h104c13.2549 0 24 10.7451 24 24zM400 216v112c0 13.2549 -10.7451 24 -24 24h-104c-13.2549 0 -24 -10.7451 -24 -24
+v-112c0 -13.2549 10.7451 -24 24 -24h104c13.2549 0 24 10.7451 24 24zM352 160c-26.5098 0 -48 -21.4902 -48 -48s21.4902 -48 48 -48s48 21.4902 48 48s-21.4902 48 -48 48zM96 160c-26.5098 0 -48 -21.4902 -48 -48s21.4902 -48 48 -48s48 21.4902 48 48
+s-21.4902 48 -48 48z" />
+    <glyph glyph-name="battery-full" unicode="&#xf240;" horiz-adv-x="640" 
+d="M544 288h-480v-192h480v64h32v64h-32v64zM560 352c26.5098 0 48 -21.4902 48 -48v-16h8c13.2549 0 24 -10.7451 24 -24v-144c0 -13.2549 -10.7451 -24 -24 -24h-8v-16c0 -26.5098 -21.4902 -48 -48 -48h-512c-26.5098 0 -48 21.4902 -48 48v224
+c0 26.5098 21.4902 48 48 48h512zM512 256v-128h-416v128h416z" />
+    <glyph glyph-name="battery-three-quarters" unicode="&#xf241;" horiz-adv-x="640" 
+d="M544 288h-480v-192h480v64h32v64h-32v64zM560 352c26.5098 0 48 -21.4902 48 -48v-16h8c13.2549 0 24 -10.7451 24 -24v-144c0 -13.2549 -10.7451 -24 -24 -24h-8v-16c0 -26.5098 -21.4902 -48 -48 -48h-512c-26.5098 0 -48 21.4902 -48 48v224
+c0 26.5098 21.4902 48 48 48h512zM416 256v-128h-320v128h320z" />
+    <glyph glyph-name="battery-half" unicode="&#xf242;" horiz-adv-x="640" 
+d="M544 288h-480v-192h480v64h32v64h-32v64zM560 352c26.5098 0 48 -21.4902 48 -48v-16h8c13.2549 0 24 -10.7451 24 -24v-144c0 -13.2549 -10.7451 -24 -24 -24h-8v-16c0 -26.5098 -21.4902 -48 -48 -48h-512c-26.5098 0 -48 21.4902 -48 48v224
+c0 26.5098 21.4902 48 48 48h512zM320 256v-128h-224v128h224z" />
+    <glyph glyph-name="battery-quarter" unicode="&#xf243;" horiz-adv-x="640" 
+d="M544 288h-480v-192h480v64h32v64h-32v64zM560 352c26.5098 0 48 -21.4902 48 -48v-16h8c13.2549 0 24 -10.7451 24 -24v-144c0 -13.2549 -10.7451 -24 -24 -24h-8v-16c0 -26.5098 -21.4902 -48 -48 -48h-512c-26.5098 0 -48 21.4902 -48 48v224
+c0 26.5098 21.4902 48 48 48h512zM224 256v-128h-128v128h128z" />
+    <glyph glyph-name="battery-empty" unicode="&#xf244;" horiz-adv-x="640" 
+d="M544 288h-480v-192h480v64h32v64h-32v64zM560 352c26.5098 0 48 -21.4902 48 -48v-16h8c13.2549 0 24 -10.7451 24 -24v-144c0 -13.2549 -10.7451 -24 -24 -24h-8v-16c0 -26.5098 -21.4902 -48 -48 -48h-512c-26.5098 0 -48 21.4902 -48 48v224
+c0 26.5098 21.4902 48 48 48h512z" />
+    <glyph glyph-name="mouse-pointer" unicode="&#xf245;" horiz-adv-x="320" 
+d="M302.189 118.874h-106.084l55.8301 -135.993c3.88965 -9.42773 -0.554688 -19.999 -9.44336 -23.999l-49.165 -21.4268c-9.16504 -4 -19.4434 0.571289 -23.332 9.71387l-53.0527 129.136l-86.6641 -89.1377c-11.5498 -11.877 -30.2783 -2.7207 -30.2783 12.8564v429.678
+c0 16.3994 19.9209 24.3945 30.2773 12.8555l284.412 -292.542c11.4717 -11.1787 3.00684 -31.1406 -12.5 -31.1406z" />
+    <glyph glyph-name="i-cursor" unicode="&#xf246;" horiz-adv-x="256" 
+d="M256 395.952c0 -6.64648 -5.4043 -12.0098 -12.0498 -11.9922c-27.875 0.0712891 -83.9502 -3.20996 -83.9502 -48.1416v-111.818h36c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-36v-112c0 -44.9395 57.8887 -48.5527 83.8555 -48.2422
+c6.68652 0.0800781 12.1445 -5.31055 12.1445 -11.998v-39.6445c0 -6.5957 -5.31836 -11.957 -11.9131 -12c-35.0654 -0.228516 -78.3525 0.62207 -116.087 37.8447c-38.4688 -37.9482 -83.6211 -38.3027 -116.158 -37.8936
+c-6.56738 0.0820312 -11.8418 5.42969 -11.8418 11.999v39.9824c0 6.64648 5.4043 12.0098 12.0498 11.9932c27.875 -0.0722656 83.9502 3.02734 83.9502 47.959v112h-36c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h36v111.818
+c0 44.9385 -57.8887 48.7344 -83.8555 48.4248c-6.68652 -0.0800781 -12.1445 5.31055 -12.1445 11.998v39.6445c0 6.5957 5.31836 11.957 11.9131 12c35.0654 0.228516 78.3525 -0.62207 116.087 -37.8447c38.4688 37.9482 83.6211 38.3027 116.158 37.8926
+c6.56738 -0.0820312 11.8418 -5.42969 11.8418 -11.999v-39.9824z" />
+    <glyph glyph-name="object-group" unicode="&#xf247;" 
+d="M480 320v-288h20c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v20h-384v-20c0 -6.62695 -5.37305 -12 -12 -12h-40c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h20v320h-20
+c-6.62695 0 -12 5.37305 -12 12v40c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-20h384v20c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-40c0 -6.62695 -5.37305 -12 -12 -12h-20v-32zM96 172c0 -6.62695 5.37305 -12 12 -12h168
+c6.62695 0 12 5.37305 12 12v136c0 6.62695 -5.37305 12 -12 12h-168c-6.62695 0 -12 -5.37305 -12 -12v-136zM416 76v136c0 6.62695 -5.37305 12 -12 12h-84v-72c0 -13.2549 -10.7451 -24 -24 -24h-72v-52c0 -6.62695 5.37305 -12 12 -12h168c6.62695 0 12 5.37305 12 12z
+" />
+    <glyph glyph-name="object-ungroup" unicode="&#xf248;" horiz-adv-x="576" 
+d="M64 128v-26c0 -3.31152 -2.68848 -6 -6 -6h-52c-3.31152 0 -6 2.68848 -6 6v52c0 3.31152 2.68848 6 6 6h26v192h-26c-3.31152 0 -6 2.68848 -6 6v52c0 3.31152 2.68848 6 6 6h52c3.31152 0 6 -2.68848 6 -6v-26h288v26c0 3.31152 2.68848 6 6 6h52
+c3.31152 0 6 -2.68848 6 -6v-52c0 -3.31152 -2.68848 -6 -6 -6h-26v-192h26c3.31152 0 6 -2.68848 6 -6v-52c0 -3.31152 -2.68848 -6 -6 -6h-52c-3.31152 0 -6 2.68848 -6 6v26h-288zM544 192v-160h26c3.31152 0 6 -2.68848 6 -6v-52c0 -3.31152 -2.68848 -6 -6 -6h-52
+c-3.31152 0 -6 2.68848 -6 6v26h-288v-26c0 -3.31152 -2.68848 -6 -6 -6h-52c-3.31152 0 -6 2.68848 -6 6v52c0 3.31152 2.68848 6 6 6h26v72h136v-8c0 -13.2549 10.7451 -24 24 -24h64c13.2549 0 24 10.7451 24 24v64c0 13.2549 -10.7451 24 -24 24h-8v72h104v26
+c0 3.31152 2.68848 6 6 6h52c3.31152 0 6 -2.68848 6 -6v-52c0 -3.31152 -2.68848 -6 -6 -6h-26v-32z" />
+    <glyph glyph-name="sticky-note" unicode="&#xf249;" horiz-adv-x="448" 
+d="M312 128c-13.2002 0 -24 -10.7998 -24 -24v-136h-264c-13.2998 0 -24 10.7002 -24 24v400c0 13.2998 10.7002 24 24 24h400c13.2998 0 24 -10.7002 24 -24v-264h-136zM441 73l-98 -98c-4.5 -4.5 -10.5996 -7 -17 -7h-6v128h128v-6.09961
+c0 -6.30078 -2.5 -12.4004 -7 -16.9004z" />
+    <glyph glyph-name="clone" unicode="&#xf24d;" 
+d="M464 448c26.5098 0 48 -21.4902 48 -48v-288c0 -26.5098 -21.4902 -48 -48 -48h-288c-26.5098 0 -48 21.4902 -48 48v288c0 26.5098 21.4902 48 48 48h288zM176 32h208v-48c0 -26.5098 -21.4902 -48 -48 -48h-288c-26.5098 0 -48 21.4902 -48 48v288
+c0 26.5098 21.4902 48 48 48h48v-208c0 -44.1123 35.8877 -80 80 -80z" />
+    <glyph glyph-name="balance-scale" unicode="&#xf24e;" horiz-adv-x="640" 
+d="M256 112c0 -44.1797 -57.3096 -80 -128 -80s-128 35.8203 -128 80h0.0195312c0 15.6699 -2.0791 7.25 85.04 181.51c17.6807 35.3604 68.2207 35.29 85.8701 0c86.3906 -172.779 85.0508 -165.33 85.0508 -181.51h0.0195312zM128 272l-72 -144h144zM639.98 112
+c0 -44.1797 -57.29 -80 -127.98 -80s-128 35.8203 -128 80h0.0195312c0 15.6699 -2.0791 7.25 85.04 181.51c17.6807 35.3604 68.2207 35.29 85.8701 0c86.3906 -172.779 85.0508 -165.33 85.0508 -181.51zM440 128h144l-72 144zM528 0c8.83984 0 16 -7.16016 16 -16v-32
+c0 -8.83984 -7.16016 -16 -16 -16h-416c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h176v294.75c-23.5195 10.29 -41.1602 31.4902 -46.3896 57.25h-129.61c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h144.36
+c14.5996 19.3203 37.5498 32 63.6396 32s49.04 -12.6797 63.6396 -32h144.36c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-129.61c-5.22949 -25.7695 -22.8799 -46.96 -46.3896 -57.25v-294.75h176z" />
+    <glyph glyph-name="hourglass-start" unicode="&#xf251;" horiz-adv-x="384" 
+d="M360 448c13.2549 0 24 -10.7451 24 -24v-16c0 -13.2549 -10.7451 -24 -24 -24c0 -90.9648 -51.0156 -167.734 -120.842 -192c69.8262 -24.2656 120.842 -101.035 120.842 -192c13.2549 0 24 -10.7451 24 -24v-16c0 -13.2549 -10.7451 -24 -24 -24h-336
+c-13.2549 0 -24 10.7451 -24 24v16c0 13.2549 10.7451 24 24 24c0 90.9648 51.0156 167.734 120.842 192c-69.8262 24.2656 -120.842 101.035 -120.842 192c-13.2549 0 -24 10.7451 -24 24v16c0 13.2549 10.7451 24 24 24h336zM296 0c0 77.4834 -46.2139 144 -104 144
+c-57.7959 0 -104 -66.542 -104 -144h208z" />
+    <glyph glyph-name="hourglass-half" unicode="&#xf252;" horiz-adv-x="384" 
+d="M360 448c13.2549 0 24 -10.7451 24 -24v-16c0 -13.2549 -10.7451 -24 -24 -24c0 -90.9648 -51.0156 -167.734 -120.842 -192c69.8262 -24.2656 120.842 -101.035 120.842 -192c13.2549 0 24 -10.7451 24 -24v-16c0 -13.2549 -10.7451 -24 -24 -24h-336
+c-13.2549 0 -24 10.7451 -24 24v16c0 13.2549 10.7451 24 24 24c0 90.9648 51.0156 167.734 120.842 192c-69.8262 24.2656 -120.842 101.035 -120.842 192c-13.2549 0 -24 10.7451 -24 24v16c0 13.2549 10.7451 24 24 24h336zM284.922 64
+c-17.0596 46.8037 -52.1006 80 -92.9219 80c-40.8242 0 -75.8613 -33.2031 -92.9199 -80h185.842zM284.941 320c7.07129 19.4131 11.0586 41.1953 11.0586 64h-208c0 -22.748 3.98828 -44.5479 11.0781 -64h185.863z" />
+    <glyph glyph-name="hourglass-end" unicode="&#xf253;" horiz-adv-x="384" 
+d="M360 384c0 -90.9648 -51.0156 -167.734 -120.842 -192c69.8262 -24.2656 120.842 -101.035 120.842 -192c13.2549 0 24 -10.7451 24 -24v-16c0 -13.2549 -10.7451 -24 -24 -24h-336c-13.2549 0 -24 10.7451 -24 24v16c0 13.2549 10.7451 24 24 24
+c0 90.9648 51.0156 167.734 120.842 192c-69.8262 24.2656 -120.842 101.035 -120.842 192c-13.2549 0 -24 10.7451 -24 24v16c0 13.2549 10.7451 24 24 24h336c13.2549 0 24 -10.7451 24 -24v-16c0 -13.2549 -10.7451 -24 -24 -24zM192 240c57.4902 0 104 66.0547 104 144
+h-208c0 -77.4824 46.2129 -144 104 -144z" />
+    <glyph glyph-name="hourglass" unicode="&#xf254;" horiz-adv-x="384" 
+d="M360 384c0 -90.9648 -51.0156 -167.734 -120.842 -192c69.8262 -24.2656 120.842 -101.035 120.842 -192c13.2549 0 24 -10.7451 24 -24v-16c0 -13.2549 -10.7451 -24 -24 -24h-336c-13.2549 0 -24 10.7451 -24 24v16c0 13.2549 10.7451 24 24 24
+c0 90.9648 51.0156 167.734 120.842 192c-69.8262 24.2656 -120.842 101.035 -120.842 192c-13.2549 0 -24 10.7451 -24 24v16c0 13.2549 10.7451 24 24 24h336c13.2549 0 24 -10.7451 24 -24v-16c0 -13.2549 -10.7451 -24 -24 -24z" />
+    <glyph glyph-name="hand-rock" unicode="&#xf255;" 
+d="M464.8 368c26.2998 -0.400391 47.2002 -22.5 47.2002 -48.7998v-133.5c0 -12.7998 -2.5 -25.5 -7.5 -37.2998l-49 -116.301c-4.90039 -11.7998 -7.5 -24.5 -7.5 -37.2998v-2.89941c0 -13.3008 -10.7002 -24 -24 -24h-240c-13.2998 0 -24 10.6992 -24 24v6.69922
+c0 13.7002 -5.90039 26.8008 -16.0996 35.9004l-111.7 99.2998c-20.5 18.2998 -32.2002 44.4004 -32.2002 71.7998v66.4004c0 26.7998 21.9004 48.4004 48.7998 48c26.2998 -0.5 47.2002 -22.5 47.2002 -48.7998v-48.1006l8 -7.09961v136
+c0 26.7998 21.9004 48.4004 48.7998 48c26.2998 -0.5 47.2002 -22.5 47.2002 -48.7998v-31.2002h8v48c0 26.7998 21.9004 48.4004 48.7998 48c26.2998 -0.5 47.2002 -22.5 47.2002 -48.7998v-47.2002h8v32c0 26.7998 21.9004 48.4004 48.7998 48
+c26.2998 -0.5 47.2002 -22.5 47.2002 -48.7998v-31.2002h8c0 26.7998 21.9004 48.4004 48.7998 48z" />
+    <glyph glyph-name="hand-paper" unicode="&#xf256;" horiz-adv-x="448" 
+d="M408.781 319.993c21.7305 -0.416016 39.2188 -18.1621 39.2178 -39.9932v-150.359c0 -15.166 -1.77344 -29.8193 -5.10449 -43.9746l-26.5078 -112.66c-5.10156 -21.6816 -24.4502 -37.0059 -46.7236 -37.0059h-197.59c-15.9629 0 -30.0908 7.76562 -38.8193 19.7676
+l-125.601 172.705c-12.9932 17.8672 -9.04297 42.8838 8.82129 55.877c17.8682 12.9941 42.8848 9.04297 55.877 -8.82227l31.6484 -43.5195v235.992c0 21.8311 17.4883 39.5771 39.2188 39.9932c22.4248 0.428711 40.7812 -18.3535 40.7812 -40.7832v-175.21h8v216
+c0 21.8311 17.4883 39.5771 39.2188 39.9932c22.4248 0.428711 40.7812 -18.3535 40.7812 -40.7832v-215.21h8v177c0 21.8311 17.4883 39.5771 39.2188 39.9932c22.4248 0.428711 40.7812 -18.3535 40.7812 -40.7832v-176.21h8v87.21
+c0 22.4297 18.3564 41.2119 40.7812 40.7832z" />
+    <glyph glyph-name="hand-scissors" unicode="&#xf257;" 
+d="M216 8c0 22.0918 17.9092 40 40 40v8h-32c-22.0908 0 -40 17.9082 -40 40s17.9092 40 40 40h32v8h-208c-26.5098 0 -48 21.4902 -48 48s21.4902 48 48 48h208v13.5723l-177.551 69.7393c-24.6738 9.69434 -36.8184 37.5557 -27.125 62.2285
+c9.69238 24.6738 37.5537 36.8174 62.2275 27.124l190.342 -74.7646l24.8721 31.0898c12.3066 15.3809 33.9785 19.5146 51.0811 9.74121l112 -64c12.0605 -6.89355 20.1533 -19.8564 20.1533 -34.7305v-240c0 -18.5615 -12.7695 -34.6855 -30.8379 -38.9365l-136 -32
+c-2.94824 -0.694336 -6.00391 -1.06348 -9.16211 -1.06348h-80c-22.0908 0 -40 17.9082 -40 40z" />
+    <glyph glyph-name="hand-lizard" unicode="&#xf258;" horiz-adv-x="576" 
+d="M384 -32v61.4609c0 8.5332 -4.4375 16.0166 -11.1543 20.2734l-111.748 70.8105c-7.41895 4.70215 -16.2656 7.45508 -25.6914 7.45508h-147.406c-13.2549 0 -24 10.7451 -24 24v8c0 35.3457 28.6543 64 64 64h123.648c13.3086 0 24.7158 8.12109 29.5371 19.6924
+l21.4102 51.3848c4.94141 11.8555 -3.77051 24.9229 -16.6143 24.9229h-229.981c-30.9277 0 -56 25.0723 -56 56v16c0 13.2549 10.7451 24 24 24h333.544c17.0908 0 32.0781 -8.90137 40.583 -22.3682l163.04 -258.146c9.35645 -14.8145 14.833 -32.4619 14.833 -51.2637
+v-116.222h-192z" />
+    <glyph glyph-name="hand-spock" unicode="&#xf259;" 
+d="M510.9 302.729l-68.2969 -286.823c-10.8975 -45.7705 -52.0801 -79.9062 -101.166 -79.9062h-127.363c-36.0293 0 -68.8447 14.0459 -93.1855 36.9531l-108.298 101.92c-7.72754 7.29297 -12.5537 17.6299 -12.5537 29.084c0 22.0723 17.9199 39.9922 39.9922 39.9922
+c10.5742 0 20.2188 -4.11426 27.374 -10.8262l60.5928 -57.0254v0c0 27.958 -4.1084 54.9473 -11.6699 80.4668l-42.6885 144.075c-1.06738 3.60254 -1.63965 7.41699 -1.63965 11.3633c0 22.0801 17.9258 40.0059 40.0049 40.0059
+c18.1338 0 33.4512 -12.0977 38.3525 -28.6504l37.1543 -125.395c1.02148 -3.44629 4.21387 -5.96387 7.99023 -5.96387c4.59766 0 8.33105 3.7334 8.33105 8.33105c0 0.717773 -0.09375 1.41016 -0.264648 2.07422l-50.3047 195.641
+c-0.821289 3.19238 -1.25879 6.53711 -1.25879 9.98438c0 22.0742 17.9219 39.9961 39.9971 39.9961c18.6279 0 34.291 -12.793 38.7305 -30.043l56.0947 -218.158c1.15527 -4.49512 5.23926 -7.82129 10.0928 -7.82129c5.03125 0 9.23438 3.57715 10.207 8.32227
+l37.6826 183.704c3.76074 18.2139 19.9043 31.9248 39.2256 31.9248c4.20703 0 8.26562 -0.629883 12.0771 -1.83496c19.8604 -6.2998 30.8623 -27.6738 26.6758 -48.085l-33.8389 -164.967c-0.101562 -0.492188 -0.154297 -1.00098 -0.154297 -1.52344
+c0 -4.16797 3.38379 -7.55176 7.55176 -7.55176c3.56445 0 6.55566 2.48535 7.34668 5.80859l29.3975 123.459c4.19141 17.6016 20.0312 30.708 38.9082 30.708c22.0732 0 39.9941 -17.9209 39.9941 -39.9941c0 -3.19727 -0.380859 -6.26465 -1.09082 -9.24512v0z" />
+    <glyph glyph-name="hand-pointer" unicode="&#xf25a;" horiz-adv-x="448" 
+d="M448 208v-96c0 -3.08398 -0.356445 -6.15918 -1.06348 -9.16211l-32 -136c-4.25098 -18.0684 -20.375 -30.8379 -38.9365 -30.8379h-208c-13.3018 0 -25.0752 6.47168 -32.3496 16.4727l-127.997 176c-12.9932 17.8662 -9.04297 42.8838 8.82129 55.876
+c17.8672 12.9941 42.8848 9.04297 55.877 -8.82227l31.6484 -43.5186v275.992c0 22.0908 17.9082 40 40 40s40 -17.9092 40 -40v-200h8v40c0 22.0908 17.9082 40 40 40s40 -17.9092 40 -40v-40h8v24c0 22.0908 17.9082 40 40 40s40 -17.9092 40 -40v-24h8
+c0 22.0908 17.9082 40 40 40s40 -17.9092 40 -40zM192 128h-8v-96h8v96zM280 128h-8v-96h8v96zM368 128h-8v-96h8v96z" />
+    <glyph glyph-name="hand-peace" unicode="&#xf25b;" horiz-adv-x="448" 
+d="M408 232c22.0918 0 40 -17.9092 40 -40v-80c0 -3.1582 -0.369141 -6.21484 -1.06348 -9.16211l-32 -136c-4.25098 -18.0684 -20.375 -30.8379 -38.9365 -30.8379h-240c-14.874 0 -27.8379 8.09375 -34.7285 20.1543l-64 112
+c-9.77441 17.1025 -5.64062 38.7744 9.74023 51.0811l31.0898 24.8721l-74.7646 190.342c-9.69336 24.6738 2.4502 52.5342 27.124 62.2266c24.6729 9.69434 52.5332 -2.4502 62.2275 -27.125l69.7393 -177.551h13.5723v208c0 26.5098 21.4902 48 48 48s48 -21.4902 48 -48
+v-208h8v32c0 22.0908 17.9082 40 40 40s40 -17.9092 40 -40v-32h8c0 22.0908 17.9082 40 40 40z" />
+    <glyph glyph-name="trademark" unicode="&#xf25c;" horiz-adv-x="640" 
+d="M260.6 352c6.60059 0 12 -5.40039 11.9004 -12v-43.0996c0 -6.60059 -5.40039 -12 -12 -12h-85.0996v-240.9c0 -6.59961 -5.40039 -12 -12 -12h-54.3008c-6.59961 0 -12 5.40039 -12 12v240.9h-85.0996c-6.59961 0 -12 5.39941 -12 12v43.0996
+c0 6.59961 5.40039 12 12 12h248.6zM640 45c0.5 -7 -5 -13 -12 -13h-53.9004c-6.2998 0 -11.5996 4.90039 -12 11.2002l-9.09961 132.899c-1.7998 24.2002 0 53.7002 0 53.7002h-0.900391s-10.6992 -33.5996 -17.8994 -53.7002l-30.7002 -84.6992
+c-1.7002 -4.7002 -6.2002 -7.90039 -11.2998 -7.90039h-50.2998c-5.10059 0 -9.60059 3.2002 -11.3008 7.90039l-30.6992 84.6992c-7.2002 20.1006 -17.9004 53.7002 -17.9004 53.7002h-0.900391s1.80078 -29.5 0 -53.7002l-9.09961 -132.899
+c-0.5 -6.2998 -5.7002 -11.2002 -12 -11.2002h-54.5c-7.09961 0 -12.5996 6 -12 13l24.4004 296c0.599609 6.2002 5.7998 11 12 11h65.3994c5.10059 0 9.60059 -3.2998 11.2998 -8.09961l43.8008 -127.101c7.19922 -20.5996 16.0996 -52.7998 16.0996 -52.7998h0.900391
+s8.89941 32.2002 16.0996 52.7998l43.7998 127.101c1.60059 4.7998 6.2002 8.09961 11.2998 8.09961h65.4004c6.2998 0 11.5 -4.7998 12 -11z" />
+    <glyph glyph-name="registered" unicode="&#xf25d;" 
+d="M285.363 240.525c0 -18.6006 -9.83105 -28.4316 -28.4316 -28.4316h-29.876v56.1406h23.3779c28.668 0 34.9297 -8.77344 34.9297 -27.709zM504 192c0 -136.967 -111.033 -248 -248 -248s-248 111.033 -248 248s111.033 248 248 248s248 -111.033 248 -248z
+M363.411 87.5859c-46.7295 84.8252 -43.2988 78.6357 -44.7021 80.9805c23.4316 15.1719 37.9453 42.9785 37.9453 74.4854c0 54.2441 -31.5 89.252 -105.498 89.252h-70.667c-13.2549 0 -24 -10.7451 -24 -24v-232.304c0 -13.2549 10.7451 -24 24 -24h22.5664
+c13.2549 0 24 10.7451 24 24v71.6631h25.5566l44.1289 -82.9375c4.03516 -7.58301 12.0049 -12.7266 21.1875 -12.7266h24.4639c18.2617 0.000976562 29.8291 19.5908 21.0186 35.5869z" />
+    <glyph glyph-name="tv" unicode="&#xf26c;" horiz-adv-x="640" 
+d="M592 448c26.4922 0 48 -21.5078 48 -48v-320c0 -26.4922 -21.5078 -48 -48 -48h-240v-32h176c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h176v32h-240
+c-26.4922 0 -48 21.5078 -48 48v320c0 26.4922 21.5078 48 48 48h544zM576 96v288h-512v-288h512z" />
+    <glyph glyph-name="calendar-plus" unicode="&#xf271;" horiz-adv-x="448" 
+d="M436 288h-424c-6.59961 0 -12 5.40039 -12 12v36c0 26.5 21.5 48 48 48h48v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h128v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h48c26.5 0 48 -21.5 48 -48v-36
+c0 -6.59961 -5.40039 -12 -12 -12zM12 256h424c6.59961 0 12 -5.40039 12 -12v-260c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v260c0 6.59961 5.40039 12 12 12zM328 116c0 6.59961 -5.40039 12 -12 12h-60v60c0 6.59961 -5.40039 12 -12 12h-40
+c-6.59961 0 -12 -5.40039 -12 -12v-60h-60c-6.59961 0 -12 -5.40039 -12 -12v-40c0 -6.59961 5.40039 -12 12 -12h60v-60c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12v60h60c6.59961 0 12 5.40039 12 12v40z" />
+    <glyph glyph-name="calendar-minus" unicode="&#xf272;" horiz-adv-x="448" 
+d="M436 288h-424c-6.59961 0 -12 5.40039 -12 12v36c0 26.5 21.5 48 48 48h48v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h128v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h48c26.5 0 48 -21.5 48 -48v-36
+c0 -6.59961 -5.40039 -12 -12 -12zM12 256h424c6.59961 0 12 -5.40039 12 -12v-260c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v260c0 6.59961 5.40039 12 12 12zM316 64c6.59961 0 12 5.40039 12 12v40c0 6.59961 -5.40039 12 -12 12h-184
+c-6.59961 0 -12 -5.40039 -12 -12v-40c0 -6.59961 5.40039 -12 12 -12h184z" />
+    <glyph glyph-name="calendar-times" unicode="&#xf273;" horiz-adv-x="448" 
+d="M436 288h-424c-6.59961 0 -12 5.40039 -12 12v36c0 26.5 21.5 48 48 48h48v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h128v52c0 6.59961 5.40039 12 12 12h40c6.59961 0 12 -5.40039 12 -12v-52h48c26.5 0 48 -21.5 48 -48v-36
+c0 -6.59961 -5.40039 -12 -12 -12zM12 256h424c6.59961 0 12 -5.40039 12 -12v-260c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v260c0 6.59961 5.40039 12 12 12zM269.3 96l48.1006 48.0996c4.69922 4.7002 4.69922 12.3008 0 17l-28.3008 28.3008
+c-4.69922 4.69922 -12.2998 4.69922 -17 0l-48.0996 -48.1006l-48.0996 48.1006c-4.7002 4.69922 -12.3008 4.69922 -17 0l-28.3008 -28.3008c-4.69922 -4.69922 -4.69922 -12.2998 0 -17l48.1006 -48.0996l-48.1006 -48.0996c-4.69922 -4.7002 -4.69922 -12.3008 0 -17
+l28.3008 -28.3008c4.69922 -4.69922 12.2998 -4.69922 17 0l48.0996 48.1006l48.0996 -48.1006c4.7002 -4.69922 12.3008 -4.69922 17 0l28.3008 28.3008c4.69922 4.69922 4.69922 12.2998 0 17z" />
+    <glyph glyph-name="calendar-check" unicode="&#xf274;" horiz-adv-x="448" 
+d="M436 288h-424c-6.62695 0 -12 5.37305 -12 12v36c0 26.5098 21.4902 48 48 48h48v52c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-52h128v52c0 6.62695 5.37305 12 12 12h40c6.62695 0 12 -5.37305 12 -12v-52h48c26.5098 0 48 -21.4902 48 -48v-36
+c0 -6.62695 -5.37305 -12 -12 -12zM12 256h424c6.62695 0 12 -5.37305 12 -12v-260c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v260c0 6.62695 5.37305 12 12 12zM345.296 160.053l-28.1689 28.3984
+c-4.66699 4.70508 -12.2646 4.73535 -16.9697 0.0673828l-106.037 -105.184l-45.9805 46.3516c-4.66699 4.70508 -12.2656 4.73633 -16.9707 0.0683594l-28.3965 -28.1699c-4.70508 -4.66699 -4.73633 -12.2646 -0.0683594 -16.9697l82.6006 -83.2695
+c4.66699 -4.70508 12.2656 -4.73535 16.9707 -0.0673828l142.952 141.805c4.70508 4.66699 4.73633 12.2646 0.0683594 16.9697z" />
+    <glyph glyph-name="industry" unicode="&#xf275;" 
+d="M475.115 284.219c15.9541 10.1514 36.8848 -1.33105 36.8848 -20.248v-271.971c0 -13.2549 -10.7451 -24 -24 -24h-464c-13.2549 0 -24 10.7451 -24 24v400c0 13.2549 10.7451 24 24 24h112c13.2549 0 24 -10.7451 24 -24v-196.309l139.115 88.5273
+c15.9541 10.1514 36.8848 -1.33203 36.8848 -20.248v-68.2793z" />
+    <glyph glyph-name="map-pin" unicode="&#xf276;" horiz-adv-x="288" 
+d="M112 131.06c10.3896 -1.91992 21.0596 -3.05957 32 -3.05957s21.6104 1.13965 32 3.05957v-156.689l-22.0098 -33.0205c-4.75 -7.11914 -15.2207 -7.11914 -19.9707 0l-22.0195 33.0205v156.689zM144 448c79.5303 0 144 -64.4697 144 -144s-64.4697 -144 -144 -144
+s-144 64.4697 -144 144s64.4697 144 144 144zM144 372c6.62012 0 12 5.37988 12 12s-5.37988 12 -12 12c-50.7197 0 -92 -41.2695 -92 -92c0 -6.62012 5.37988 -12 12 -12s12 5.37988 12 12c0 37.5 30.5 68 68 68z" />
+    <glyph glyph-name="map-signs" unicode="&#xf277;" 
+d="M507.31 363.31c6.25 -6.25 6.25 -16.3691 0 -22.6299l-43.3096 -43.3096c-6.00977 -6 -14.1396 -9.37012 -22.6299 -9.37012h-385.37c-13.25 0 -24 10.75 -24 24v80c0 13.25 10.75 24 24 24h168v16c0 8.83984 7.16016 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-16
+h153.37c8.49023 0 16.6299 -3.37012 22.6299 -9.37012zM224 -48v112h64v-112c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16zM456 224c13.25 0 24 -10.75 24 -24v-80c0 -13.25 -10.75 -24 -24 -24h-385.37
+c-8.49023 0 -16.6299 3.37012 -22.6299 9.37012l-43.3096 43.3096c-6.25 6.25 -6.25 16.3799 0 22.6299l43.3096 43.3203c6.00977 6 14.1396 9.37012 22.6299 9.37012h153.37v32h64v-32h168z" />
+    <glyph glyph-name="map" unicode="&#xf279;" horiz-adv-x="576" 
+d="M0 330.34c0.00292969 13.4697 8.32617 24.9932 20.1201 29.71l139.88 55.9502v-384l-138.06 -62.8398c-10.5107 -4.2002 -21.9404 3.54004 -21.9404 14.8594v346.32zM192 32v384l192 -64v-384zM554.06 414.84c10.5107 4.2002 21.9404 -3.54004 21.9404 -14.8594v-346.32
+c0 -13.4707 -8.32422 -24.9951 -20.1201 -29.71l-139.88 -55.9502v384z" />
+    <glyph glyph-name="comment-alt" unicode="&#xf27a;" 
+d="M448 448c35.2998 0 64 -28.7002 64 -64v-288c0 -35.2998 -28.7002 -64 -64 -64h-144l-124.9 -93.7002c-7.89941 -5.7998 -19.0996 -0.0996094 -19.0996 9.7002v84h-96c-35.2998 0 -64 28.7002 -64 64v288c0 35.2998 28.7002 64 64 64h384z" />
+    <glyph glyph-name="pause-circle" unicode="&#xf28b;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM240 112v160c0 8.7998 -7.2002 16 -16 16h-48c-8.7998 0 -16 -7.2002 -16 -16v-160c0 -8.7998 7.2002 -16 16 -16h48c8.7998 0 16 7.2002 16 16zM352 112v160
+c0 8.7998 -7.2002 16 -16 16h-48c-8.7998 0 -16 -7.2002 -16 -16v-160c0 -8.7998 7.2002 -16 16 -16h48c8.7998 0 16 7.2002 16 16z" />
+    <glyph glyph-name="stop-circle" unicode="&#xf28d;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM352 112v160c0 8.7998 -7.2002 16 -16 16h-160c-8.7998 0 -16 -7.2002 -16 -16v-160c0 -8.7998 7.2002 -16 16 -16h160c8.7998 0 16 7.2002 16 16z" />
+    <glyph glyph-name="shopping-bag" unicode="&#xf290;" horiz-adv-x="448" 
+d="M352 288h96v-272c0 -44.1826 -35.8174 -80 -80 -80h-288c-44.1826 0 -80 35.8174 -80 80v272h96v32c0 70.5801 57.4199 128 128 128c70.5791 0 128 -57.4199 128 -128v-32zM160 320v-32h128v32c0 35.29 -28.71 64 -64 64s-64 -28.71 -64 -64zM320 200
+c13.2549 0 24 10.7451 24 24s-10.7451 24 -24 24s-24 -10.7451 -24 -24s10.7451 -24 24 -24zM128 200c13.2549 0 24 10.7451 24 24s-10.7451 24 -24 24s-24 -10.7451 -24 -24s10.7451 -24 24 -24z" />
+    <glyph glyph-name="shopping-basket" unicode="&#xf291;" horiz-adv-x="576" 
+d="M576 232v-16c0 -13.2549 -10.7451 -24 -24 -24h-8l-26.1133 -182.788c-3.37793 -23.6465 -23.6299 -41.2119 -47.5166 -41.2119h-364.74c-23.8867 0 -44.1387 17.5654 -47.5176 41.2119l-26.1123 182.788h-8c-13.2549 0 -24 10.7451 -24 24v16
+c0 13.2549 10.7451 24 24 24h67.3408l106.78 146.821c10.3945 14.292 30.4072 17.4531 44.7012 7.05762c14.293 -10.3945 17.4531 -30.4082 7.05762 -44.7012l-79.4033 -109.178h235.047l-79.4033 109.179c-10.3955 14.292 -7.23438 34.3066 7.05859 44.7012
+c14.291 10.3955 34.3066 7.23535 44.7012 -7.05762l106.779 -146.822h67.3408c13.2549 0 24 -10.7451 24 -24zM312 56v112c0 13.2549 -10.7451 24 -24 24s-24 -10.7451 -24 -24v-112c0 -13.2549 10.7451 -24 24 -24s24 10.7451 24 24zM424 56v112
+c0 13.2549 -10.7451 24 -24 24s-24 -10.7451 -24 -24v-112c0 -13.2549 10.7451 -24 24 -24s24 10.7451 24 24zM200 56v112c0 13.2549 -10.7451 24 -24 24s-24 -10.7451 -24 -24v-112c0 -13.2549 10.7451 -24 24 -24s24 10.7451 24 24z" />
+    <glyph glyph-name="hashtag" unicode="&#xf292;" horiz-adv-x="448" 
+d="M440.667 265.891c-1.00195 -5.61328 -5.91309 -9.89062 -11.8135 -9.89062h-79.0957l-22.8564 -128h74.8096c7.4707 0 13.126 -6.75391 11.8135 -14.1094l-7.14355 -40c-1.00195 -5.61328 -5.91309 -9.89062 -11.8125 -9.89062h-79.0967l-15.377 -86.1094
+c-1.00195 -5.61328 -5.91309 -9.89062 -11.8125 -9.89062h-40.6318c-7.47266 0 -13.127 6.75391 -11.8135 14.1094l14.623 81.8906h-98.6338l-15.3779 -86.1094c-1.00195 -5.61328 -5.91309 -9.89062 -11.8135 -9.89062h-40.6318
+c-7.4707 0 -13.126 6.75391 -11.8125 14.1094l14.623 81.8906h-74.8105c-7.4707 0 -13.126 6.75391 -11.8125 14.1094l7.14258 40c1.00195 5.61328 5.91309 9.89062 11.8135 9.89062h79.0957l22.8564 128h-74.8096c-7.4707 0 -13.126 6.75391 -11.8135 14.1094l7.14355 40
+c1.00195 5.61328 5.91309 9.89062 11.8125 9.89062h79.0967l15.377 86.1094c1.00195 5.61328 5.91309 9.89062 11.8125 9.89062h40.6318c7.47266 0 13.127 -6.75391 11.8135 -14.1094l-14.623 -81.8906h98.6348l15.377 86.1094
+c1.00195 5.61328 5.91309 9.89062 11.8135 9.89062h40.6318c7.4707 0 13.126 -6.75391 11.8125 -14.1094l-14.623 -81.8906h74.8105c7.4707 0 13.126 -6.75391 11.8125 -14.1094zM261.889 128l22.8574 128h-98.6338l-22.8574 -128h98.6338z" />
+    <glyph glyph-name="percent" unicode="&#xf295;" horiz-adv-x="448" 
+d="M112 224c-61.9004 0 -112 50.0996 -112 112s50.0996 112 112 112s112 -50.0996 112 -112s-50.0996 -112 -112 -112zM112 384c-26.5 0 -48 -21.5 -48 -48s21.5 -48 48 -48s48 21.5 48 48s-21.5 48 -48 48zM336 160c61.9004 0 112 -50.0996 112 -112
+s-50.0996 -112 -112 -112s-112 50.0996 -112 112s50.0996 112 112 112zM336 0c26.5 0 48 21.5 48 48s-21.5 48 -48 48s-48 -21.5 -48 -48s21.5 -48 48 -48zM392.3 447.8l31.6006 0.100586c19.3994 0.0996094 30.8994 -21.8008 19.6992 -37.8008l-366.199 -463.699
+c-4.33203 -6.17773 -11.4912 -10.1973 -19.6006 -10.2002l-33.3994 -0.100586c-19.5 0 -30.9004 21.9004 -19.7002 37.8008l368 463.699c4.5 6.40039 11.7998 10.2002 19.5996 10.2002z" />
+    <glyph glyph-name="universal-access" unicode="&#xf29a;" 
+d="M256 400c-114.971 0 -208 -93.0469 -208 -208c0 -114.971 93.0469 -208 208 -208c114.971 0 208 93.0469 208 208c0 114.971 -93.0469 208 -208 208zM256 440c136.967 0 248 -111.033 248 -248s-111.033 -248 -248 -248s-248 111.033 -248 248s111.033 248 248 248z
+M256 384c106.039 0 192 -85.9609 192 -192s-85.9609 -192 -192 -192s-192 85.9609 -192 192s85.9609 192 192 192zM256 340c-19.8818 0 -36 -16.1182 -36 -36s16.1182 -36 36 -36s36 16.1182 36 36s-16.1182 36 -36 36zM373.741 241.977
+c8.59961 2.03027 13.9258 10.6484 11.8965 19.249c-2.03027 8.60156 -10.6494 13.9258 -19.249 11.8955c-96.4912 -22.7832 -124.089 -22.8291 -220.774 0c-8.60254 2.03125 -17.2178 -3.29395 -19.249 -11.8955c-2.03125 -8.60059 3.29492 -17.2178 11.8945 -19.249
+c28.7129 -6.7793 55.5127 -12.749 82.1416 -15.8066c-0.852539 -101.08 -12.3242 -123.08 -25.0371 -155.621c-3.61719 -9.25879 0.957031 -19.6982 10.2168 -23.3145c9.26465 -3.61914 19.7002 0.961914 23.3154 10.2168c8.72754 22.3408 17.0947 40.6982 22.2617 78.5488
+h9.68555c5.1748 -37.9131 13.5566 -56.2412 22.2617 -78.5488c3.61621 -9.25977 14.0547 -13.834 23.3154 -10.2168c9.25977 3.61621 13.834 14.0547 10.2168 23.3145c-12.7305 32.5693 -24.1855 54.5986 -25.0371 155.621c26.6299 3.05859 53.4287 9.02832 82.1406 15.8066
+z" />
+    <glyph glyph-name="blind" unicode="&#xf29d;" horiz-adv-x="384" 
+d="M380.15 -62.8369c-1.20898 -0.733398 -2.62695 -1.15625 -4.14258 -1.15625c-2.89941 0 -5.44336 1.53223 -6.84668 3.84277l-125.33 206.428c5.10547 2.02539 9.53809 5.2959 12.958 9.48438l126.048 -207.607c0.734375 -1.20898 1.15723 -2.62793 1.15723 -4.14355
+c0 -2.89941 -1.53223 -5.44434 -3.84375 -6.84766zM142.803 133.662l62.8145 -153.537c6.69141 -16.3584 -1.14453 -35.042 -17.501 -41.7344c-16.3564 -6.69043 -35.04 1.1416 -41.7334 17.501l-36.1201 88.2852zM96 360c-24.3008 0 -44 19.6992 -44 44s19.6992 44 44 44
+s44 -19.6992 44 -44s-19.6992 -44 -44 -44zM250.837 190.872c8.19336 -10.374 6.44434 -25.4922 -3.96582 -33.708c-9.33984 -7.37402 -24.5635 -7.61914 -33.708 3.96484l-102.3 129.217c-0.733398 0.924805 -1.86328 1.5127 -3.13281 1.5127
+c-2.20801 0 -4.00098 -1.79297 -4.00098 -4.00098c0 -0.9375 0.323242 -1.7998 0.864258 -2.48242l31.4062 -39.8164v-107.196l-65.9258 -181.288c-6.04102 -16.6143 -24.4072 -25.1768 -41.0088 -19.1387c-16.6104 6.04004 -25.1787 24.4004 -19.1387 41.0098
+l54.0732 148.693v140.698l-16 -20.5713v-79.7656c0 -13.0996 -10.4951 -23.748 -23.5361 -23.9961c-13.4531 -0.254883 -24.4639 11.0811 -24.4639 24.5361v95.6943l61.0557 78.5c4.72754 6.0791 11.7979 9.23633 18.9443 9.23926v0.0263672h32v-0.015625
+c7.08691 -0.00390625 14.1035 -3.11719 18.8369 -9.1123z" />
+    <glyph glyph-name="audio-description" unicode="&#xf29e;" 
+d="M162.925 209.291l8.82227 -30.6553h-25.6064l9.04102 30.6523c1.27734 4.4209 2.65137 9.99414 3.87207 15.2451c1.2207 -5.25098 2.59473 -10.8232 3.87109 -15.2422zM329.399 241.39c28.6846 0 46.1748 -16.7656 46.1748 -49.0049
+c0 -32.0977 -16.3994 -49.7754 -46.1748 -49.7754h-14.5234v98.7803h14.5234zM512 336v-288c0 -26.5098 -21.4902 -48 -48 -48h-416c-26.5098 0 -48 21.4902 -48 48v288c0 26.5098 21.4902 48 48 48h416c26.5098 0 48 -21.4902 48 -48zM245.459 111.861l-57.0967 168
+c-1.6084 4.73242 -6.08887 8.13867 -11.3623 8.13867h-35.8936c-5.27344 0 -9.75391 -3.40625 -11.3623 -8.13867l-57.0967 -168c-2.64453 -7.7832 3.1416 -15.8613 11.3613 -15.8613h29.1328c5.47559 0 10.0977 3.67676 11.5352 8.69336l8.57422 29.9053h51.3672
+l8.79297 -29.9766c1.46094 -4.97949 6.06543 -8.62207 11.5146 -8.62207h29.1719c8.2207 0 14.0059 8.07812 11.3613 15.8613zM430.16 192.386c0 58.9775 -37.9189 95.6143 -98.96 95.6143h-57.3662c-6.62695 0 -12 -5.37305 -12 -12v-168c0 -6.62695 5.37305 -12 12 -12
+h57.3662c61.041 0 98.96 36.9326 98.96 96.3857z" />
+    <glyph glyph-name="phone-volume" unicode="&#xf2a0;" horiz-adv-x="384" 
+d="M97.333 -58.9658c-129.874 129.874 -129.681 340.252 0 469.933c5.69824 5.69824 14.5273 6.63184 21.2627 2.42188l64.8174 -40.5127c4.86035 -3.03711 8.09668 -8.43652 8.09668 -14.5859c0 -2.25098 -0.458984 -4.40137 -1.24805 -6.37207l-32.4082 -81.0205
+c-2.5332 -6.33496 -8.73047 -10.8145 -15.9648 -10.8145c-0.583008 0 -1.13574 0.0380859 -1.7041 0.0947266l-55.8096 5.58008c-21.0508 -58.2607 -20.6123 -122.471 0 -179.515l55.8105 5.58105c0.568359 0.0566406 1.14551 0.0859375 1.72852 0.0859375
+c7.23438 0 13.4072 -4.4707 15.9414 -10.8047l32.4072 -81.0225c0.789062 -1.9707 1.22266 -4.12207 1.22266 -6.37305c0 -6.14844 -3.21094 -11.5469 -8.07129 -14.585l-64.8174 -40.5127c-2.6377 -1.64844 -5.75391 -2.60156 -9.09082 -2.60156
+c-4.74316 0 -9.06152 1.91211 -12.1729 5.02344zM247.126 352.527c11.832 -20.0469 11.832 -45.0088 0 -65.0557c-3.9502 -6.69238 -13.1084 -7.95898 -18.7178 -2.58105l-5.97559 5.72656c-3.91016 3.74805 -4.79297 9.62207 -2.26074 14.4102
+c2.35645 4.46191 3.69141 9.5459 3.69141 14.9395c0 5.39258 -1.33496 10.543 -3.69141 15.0049c-2.5332 4.78809 -1.64941 10.6621 2.26074 14.4102l5.97559 5.72656c5.60938 5.37793 14.7676 4.11133 18.7178 -2.58105zM338.913 443.714
+c60.1396 -71.6035 60.0918 -175.882 0 -247.428c-4.47363 -5.32715 -12.5303 -5.74609 -17.5518 -0.933594l-5.79785 5.55762c-4.56055 4.37109 -4.97754 11.5293 -0.930664 16.3789c49.6875 59.5381 49.6465 145.933 0 205.422
+c-4.04688 4.84961 -3.63086 12.0078 0.930664 16.3789l5.79785 5.55762c5.02148 4.8125 13.0781 4.39355 17.5518 -0.933594zM292.941 398.773c36.0498 -46.3223 36.1074 -111.149 0 -157.547c-4.39062 -5.64062 -12.6973 -6.25098 -17.8564 -1.30371l-5.81836 5.5791
+c-4.39941 4.21875 -4.99805 11.0947 -1.28418 15.9307c26.5352 34.5645 26.5332 82.5723 0 117.135c-3.71387 4.83594 -3.11523 11.7109 1.28418 15.9307l5.81836 5.5791c5.15918 4.94727 13.4658 4.33691 17.8564 -1.30371z" />
+    <glyph glyph-name="braille" unicode="&#xf2a1;" horiz-adv-x="640" 
+d="M128 192c0 -35.3457 -28.6543 -64 -64 -64s-64 28.6543 -64 64s28.6543 64 64 64s64 -28.6543 64 -64zM64 64c17.6729 0 32 -14.3271 32 -32s-14.3271 -32 -32 -32s-32 14.3271 -32 32s14.3271 32 32 32zM64 416c35.3457 0 64 -28.6543 64 -64s-28.6543 -64 -64 -64
+s-64 28.6543 -64 64s28.6543 64 64 64zM224 224c17.6729 0 32 -14.3271 32 -32s-14.3271 -32 -32 -32s-32 14.3271 -32 32s14.3271 32 32 32zM224 64c17.6729 0 32 -14.3271 32 -32s-14.3271 -32 -32 -32s-32 14.3271 -32 32s14.3271 32 32 32zM224 416
+c35.3457 0 64 -28.6543 64 -64s-28.6543 -64 -64 -64s-64 28.6543 -64 64s28.6543 64 64 64zM448 224c17.6729 0 32 -14.3271 32 -32s-14.3271 -32 -32 -32s-32 14.3271 -32 32s14.3271 32 32 32zM448 64c17.6729 0 32 -14.3271 32 -32s-14.3271 -32 -32 -32
+s-32 14.3271 -32 32s14.3271 32 32 32zM448 416c35.3457 0 64 -28.6543 64 -64s-28.6543 -64 -64 -64s-64 28.6543 -64 64s28.6543 64 64 64zM608 224c17.6729 0 32 -14.3271 32 -32s-14.3271 -32 -32 -32s-32 14.3271 -32 32s14.3271 32 32 32zM608 64
+c17.6729 0 32 -14.3271 32 -32s-14.3271 -32 -32 -32s-32 14.3271 -32 32s14.3271 32 32 32zM608 384c17.6729 0 32 -14.3271 32 -32s-14.3271 -32 -32 -32s-32 14.3271 -32 32s14.3271 32 32 32z" />
+    <glyph glyph-name="assistive-listening-systems" unicode="&#xf2a2;" 
+d="M216 188c0 -15.4639 -12.5361 -28 -28 -28s-28 12.5361 -28 28c0 44.1123 35.8877 80 80 80s80 -35.8877 80 -80c0 -15.4639 -12.5361 -28 -28 -28s-28 12.5361 -28 28c0 13.2344 -10.7666 24 -24 24s-24 -10.7656 -24 -24zM240 364c97.0469 0 176 -78.9531 176 -176
+c0 -95.9863 -71.4053 -109.798 -72 -144.226c-0.124023 -59.4463 -48.5254 -107.774 -108 -107.774c-15.4639 0 -28 12.5361 -28 28s12.5361 28 28 28c28.6729 0 52 23.3271 52 52l0.00292969 0.37793c0.988281 73.3115 71.9971 68.458 71.9971 143.622
+c0 66.168 -53.832 120 -120 120s-120 -53.832 -120 -120c0 -15.4639 -12.5361 -28 -28 -28s-28 12.5361 -28 28c0 97.0469 78.9531 176 176 176zM160 128c17.6729 0 32 -14.3271 32 -32s-14.3271 -32 -32 -32s-32 14.3271 -32 32s14.3271 32 32 32zM32 0
+c17.6729 0 32 -14.3271 32 -32s-14.3271 -32 -32 -32s-32 14.3271 -32 32s14.3271 32 32 32zM512 187.993c0 -15.4639 -12.5371 -28 -28.001 -28s-28 12.5361 -28 28c0 1.12695 -0.00683594 2.24512 -0.0332031 3.36328l-0.00292969 0.1875
+c-1.4668 91.4404 -60.1709 172.599 -146.077 201.953c-14.6318 5.00098 -22.4414 20.917 -17.4414 35.5498c5.00098 14.6328 20.917 22.4404 35.5498 17.4424c108.163 -36.959 182.082 -139.015 183.961 -253.965c0.0332031 -1.50684 0.0449219 -3.01367 0.0449219 -4.53125
+zM152.971 8.9707l-33.9404 -33.9404l-80 80l33.9404 33.9404z" />
+    <glyph glyph-name="american-sign-language-interpreting" unicode="&#xf2a3;" horiz-adv-x="640" 
+d="M290.547 258.961c-20.2949 10.1494 -44.1465 11.1992 -64.7393 3.88965c42.6064 0 71.208 -20.4746 85.5781 -50.5752c8.57617 -17.8994 -5.14746 -38.0713 -23.6172 -38.0713c18.4297 0 32.2119 -20.1357 23.6172 -38.0713
+c-14.7246 -30.8457 -46.123 -50.8535 -80.2979 -50.8535c-0.556641 0 -94.4707 8.61426 -94.4707 8.61426l-66.4062 -33.3467c-9.38379 -4.69336 -19.8145 -0.378906 -23.8945 7.78125l-44.4561 88.9248c-4.16699 8.61523 -1.11133 18.8975 6.94531 23.6211l58.0723 33.0693
+l41.1221 74.1953c6.38965 57.2451 34.7314 109.768 79.7432 146.727c11.3906 9.44824 28.3408 7.78125 37.5098 -3.61328c9.44629 -11.3936 7.78027 -28.0674 -3.6123 -37.5156c-12.5029 -10.5596 -23.6172 -22.5098 -32.5088 -35.5703
+c21.6719 14.7285 46.6787 24.7324 74.1865 28.0674c14.7246 1.94434 28.0625 -8.33594 29.7295 -23.0654c1.94531 -14.7275 -8.33594 -28.0674 -23.0615 -29.7344c-16.1162 -1.94434 -31.1201 -7.50293 -44.1787 -15.2832c26.1143 5.71289 58.7119 3.1377 88.0791 -11.1152
+c13.3359 -6.66895 18.8936 -22.5088 12.2246 -35.8486c-6.38965 -13.0596 -22.5039 -18.6162 -35.5645 -12.2256zM263.318 189.489c-6.1123 12.5049 -18.3379 20.2861 -32.2314 20.2861h-0.107422c-19.5703 0 -35.46 -15.8896 -35.46 -35.46
+c0 -0.0380859 0.00195312 -0.0732422 0.00292969 -0.110352c0 -21.4277 17.8076 -35.5703 35.5645 -35.5703c13.8936 0 26.1191 7.78125 32.2314 20.2861c4.44531 9.44922 13.6133 15.0059 23.3389 15.2842c-9.72559 0.277344 -18.8936 5.83496 -23.3389 15.2842z
+M638.139 226.726c4.16797 -8.61426 1.11133 -18.8965 -6.94531 -23.6201l-58.0713 -33.0693l-41.1221 -74.1963c-6.38965 -57.2451 -34.7314 -109.767 -79.7432 -146.726c-10.9316 -9.1123 -27.7988 -8.14453 -37.5098 3.6123
+c-9.44629 11.3945 -7.78027 28.0674 3.61328 37.5166c12.5029 10.5586 23.6162 22.5088 32.5078 35.5703c-21.6719 -14.7295 -46.6787 -24.7324 -74.1865 -28.0674c-10.0205 -2.50586 -27.5518 5.64258 -29.7295 23.0645c-1.94531 14.7285 8.33594 28.0674 23.0615 29.7344
+c16.1162 1.94629 31.1201 7.50293 44.1787 15.2842c-26.1143 -5.71289 -58.7119 -3.1377 -88.0791 11.1152c-13.3359 6.66895 -18.8936 22.5088 -12.2246 35.8477c6.38965 13.0605 22.5049 18.6191 35.5654 12.2266c20.2949 -10.1484 44.1465 -11.1982 64.7393 -3.88965
+c-42.6064 0 -71.208 20.4746 -85.5781 50.5762c-8.57617 17.8984 5.14746 38.0713 23.6172 38.0713c-18.4297 0 -32.2109 20.1357 -23.6172 38.0703c14.0332 29.3965 44.0391 50.8877 81.9658 50.8545l92.8027 -8.61523l66.4062 33.3467
+c9.4082 4.7041 19.8281 0.354492 23.8936 -7.78027zM408.912 245.344c-13.8936 0 -26.1191 -7.78027 -32.2314 -20.2861c-4.44531 -9.44824 -13.6133 -15.0059 -23.3389 -15.2832c9.72559 -0.27832 18.8936 -5.83594 23.3389 -15.2842
+c6.1123 -12.5049 18.3379 -20.2861 32.2314 -20.2861h0.107422c19.5703 0 35.46 15.8887 35.46 35.46c0 0.0371094 -0.00195312 0.0722656 -0.00292969 0.110352c0 21.4287 -17.8076 35.5693 -35.5645 35.5693z" />
+    <glyph glyph-name="deaf" unicode="&#xf2a4;" 
+d="M216 188c0 -15.4639 -12.5361 -28 -28 -28s-28 12.5361 -28 28c0 44.1123 35.8877 80 80 80s80 -35.8877 80 -80c0 -15.4639 -12.5361 -28 -28 -28s-28 12.5361 -28 28c0 13.2344 -10.7666 24 -24 24s-24 -10.7656 -24 -24zM240 364c97.0469 0 176 -78.9531 176 -176
+c0 -95.9863 -71.4053 -109.798 -72 -144.226c-0.124023 -59.4463 -48.5254 -107.774 -108 -107.774c-15.4639 0 -28 12.5361 -28 28s12.5361 28 28 28c28.6729 0 52 23.3271 52 52l0.00292969 0.37793c0.988281 73.3115 71.9971 68.458 71.9971 143.622
+c0 66.168 -53.832 120 -120 120s-120 -53.832 -120 -120c0 -15.4639 -12.5361 -28 -28 -28s-28 12.5361 -28 28c0 97.0469 78.9531 176 176 176zM508.485 416.201c4.68652 -4.68652 4.68652 -12.2842 0 -16.9727l-87.0303 -87.0283
+c-4.68652 -4.68652 -12.2842 -4.68652 -16.9697 0l-28.2852 28.2852c-4.68652 4.68652 -4.68652 12.2842 0 16.9707l87.0283 87.0293c4.6875 4.68555 12.2842 4.68555 16.9717 0zM168.97 133.255l28.2861 -28.2842c4.68652 -4.68652 4.68652 -12.2852 0 -16.9707
+l-148.484 -148.485c-4.6875 -4.68555 -12.2842 -4.68555 -16.9717 0l-28.2852 28.2842c-4.68555 4.6875 -4.68555 12.2852 0 16.9707l148.485 148.485c4.68555 4.68652 12.2842 4.68652 16.9697 0z" />
+    <glyph glyph-name="sign-language" unicode="&#xf2a7;" horiz-adv-x="448" 
+d="M91.4336 -35.9873c-0.306641 16.0186 13.1094 29.1289 29.1309 29.1289h62.293v5.71484h-125.864c-16.0215 0 -29.4375 13.1104 -29.1299 29.1289c0.296875 15.5234 12.9717 28.0146 28.5645 28.0146h126.43v5.71387h-153.722
+c-16.0205 0 -29.4365 13.1113 -29.1299 29.1289c0.296875 15.5225 12.9727 28.0137 28.5664 28.0137h154.286v5.71387h-125.151c-16.0215 0 -29.4375 13.1104 -29.1299 29.1289c0.296875 15.5215 12.9727 28.0127 28.5654 28.0127h168.566l-31.085 22.6064
+c-12.7617 9.28027 -15.583 27.1484 -6.30176 39.9121c9.28027 12.7607 27.1494 15.5811 39.9121 6.30176l123.36 -89.7148c8.57324 -6.23535 14.1201 -16.3271 14.1201 -27.7285v-141.136c0 -15.9102 -10.9463 -29.7305 -26.4326 -33.374l-80.4717 -18.9346
+c-10.1113 -2.37891 -20.5771 -3.64551 -31.4102 -3.64551h-107.4c-15.5928 0.000976562 -28.2686 12.4922 -28.5664 28.0137zM164.683 189.714l-36.3711 46.71c-9.5791 12.3027 -7.51172 29.9795 4.55371 39.75c12.4502 10.083 31.0371 7.55273 40.8799 -5.08789
+l13.0039 -16.7002c-17.1426 -15.6484 -15.4092 -43.0244 3.16992 -56.5361l11.1875 -8.13574h-36.4238zM447.981 191.817c0.0117188 -0.379883 0.0439453 -0.729492 0.0439453 -1.1123c0 -10.9961 -5.1875 -20.7891 -13.2461 -27.0654l-61.0645 -47.5488v16.999
+c0 13.4834 -6.51074 26.2686 -17.415 34.1982l-123.359 89.7139c-12.6357 9.18945 -29.1934 9.16113 -41.6904 0.904297l-52.0527 66.8486c-9.84375 12.6416 -7.74121 31.2822 5.08594 40.8809c12.4297 9.30273 30.0732 6.97559 39.6523 -5.32812l77.6758 -99.7539
+l4.50879 3.51172l-94.4434 121.287c-9.84277 12.6416 -7.74121 31.2822 5.08594 40.8818c12.4307 9.30176 30.0732 6.97461 39.6533 -5.32812l94.79 -121.734l4.50879 3.51074l-76.8887 98.7451c-9.84277 12.6416 -7.74121 31.2822 5.08594 40.8809
+c12.4297 9.30273 30.0732 6.97559 39.6533 -5.32715l103.562 -133.001l-1.26172 38.4141c-0.518555 15.7715 11.8457 28.9756 27.6191 29.4932c15.7705 0.517578 28.9746 -11.8477 29.4922 -27.6191z" />
+    <glyph glyph-name="low-vision" unicode="&#xf2a8;" horiz-adv-x="576" 
+d="M569.344 216.369c4.20996 -7.13086 6.62598 -15.5469 6.62598 -24.4199c0 -8.87402 -2.41699 -17.1875 -6.62695 -24.3193c-31.9746 -54.2607 -79.6484 -98.3232 -136.81 -126.301l0.00683594 -0.00878906l43.1201 -58.377
+c7.60156 -10.8594 4.95996 -25.8252 -5.90039 -33.4268l-13.1133 -9.17773c-10.8594 -7.59863 -25.8223 -4.95801 -33.4238 5.90039l-251.836 356.544c-13.5234 -6.16211 -26.5166 -13.3994 -38.7764 -21.5635l189.979 -271.399
+c-11.4863 -1.21191 -22.4707 -1.83301 -34.2754 -1.83301c-15.1465 0 -30.0566 1.02344 -44.6641 3.00293l-40.6309 58.04h-0.00976562l-119.399 170.58c-10.457 -11.1943 -19.8271 -23.0791 -28.2939 -35.9121l124.19 -177.417
+c-73.1172 25.4863 -134.358 76.0166 -172.858 141.349c-8.96484 15.2109 -8.76562 33.8643 0 48.7393c0.0107422 0.0166016 0.0234375 0.0332031 0.0332031 0.0498047c33.5459 56.8984 82.7676 99.8506 136.79 126.242l-43.1309 58.3945
+c-7.60156 10.8604 -4.95996 25.8252 5.90039 33.4268l13.1143 9.17773c10.8584 7.59961 25.8213 4.95801 33.4229 -5.90039l52.7705 -72.1689c26.3496 6.79004 53.9834 10.4092 82.4512 10.4092c119.81 0 224.96 -63.9492 281.344 -159.631zM390.026 102.06
+c21.1406 23.9658 33.9736 55.4365 33.9736 89.9404c0 75.1738 -60.8379 136 -136 136c-17.5117 0 -34.2422 -3.30566 -49.6084 -9.32324l19.0684 -27.2363c25.9883 7.96289 54.7598 5.56836 79.5098 -7.68066h-0.0292969c-23.6504 0 -42.8203 -19.1699 -42.8203 -42.8193
+c0 -23.4717 18.9922 -42.8203 42.8203 -42.8203c23.6494 0 42.8193 19.1699 42.8193 42.8203v0.0292969c18.9111 -35.3271 15.8818 -79.1123 -8.7998 -111.68z" />
+    <glyph glyph-name="handshake" unicode="&#xf2b5;" horiz-adv-x="640" 
+d="M434.7 384c8.5 0 16.7002 -3.40039 22.5996 -9.40039l54.6006 -54.5996v-193.5c-2.40039 2.7002 -5 5.2998 -7.90039 7.7002l-145.6 118.2l26.0996 23.8994c6.5 6 7 16.1006 1 22.6006c-5.90039 6.5 -16.0996 6.89941 -22.5996 1l-79.9004 -73.2002
+c-0.0996094 -0.100586 -0.299805 -0.100586 -0.400391 -0.200195c-16.6992 -14.9004 -43.3994 -11.2002 -56.0996 2.7002c-14.2002 15.5 -14.5 40.3994 2.09961 56c0.100586 0.0996094 0.200195 0.299805 0.300781 0.399414l98.2998 90
+c5.89941 5.40039 13.5996 8.40039 21.5996 8.40039h85.9004zM544 319.8h96v-255.899h-64c-17.7002 0 -32 14.2998 -32 32v223.899zM592 95.9004c8.7998 0 16 7.19922 16 16c0 8.7998 -7.2002 16 -16 16s-16 -7.2002 -16 -16c0 -8.80078 7.2002 -16 16 -16zM0 64v255.8h96
+v-223.8c0 -17.7002 -14.2998 -32 -32 -32h-64zM48 127.9c-8.7998 0 -16 -7.10059 -16 -16c0 -8.80078 7.2002 -16 16 -16s16 7.19922 16 16c0 8.7998 -7.2002 16 -16 16zM483.9 109.3c13.6992 -11.2002 15.7998 -31.2998 4.59961 -45.0996l-9.5 -11.7002
+c-11.0996 -13.7998 -31.2998 -15.7998 -45 -4.7002l-5.40039 4.40039l-31.3994 -38.6006c-12.9004 -15.8994 -36.4004 -18.3994 -52.2998 -5.39941l-17.9004 15.5l-0.200195 -0.200195c-22.2998 -27.4004 -62.5996 -31.5996 -90 -9.2998l-90.5 81.8994h-18.2998v223.9
+l54.7002 54.5996c6 6 14.0996 9.40039 22.5996 9.40039h83.7998l-81.7998 -74.9004c-29.2002 -26.7998 -31.2998 -72.2998 -4.39941 -101.699c26.5 -28.9004 72 -31.5 101.699 -4.40039l30 27.5z" />
+    <glyph glyph-name="envelope-open" unicode="&#xf2b6;" 
+d="M512 -16c0 -26.5098 -21.4902 -48 -48 -48h-416c-26.5098 0 -48 21.4902 -48 48v263.276c0 15.3379 7.17383 28.9863 18.3867 37.7754c24.9131 19.5293 45.501 35.3652 164.2 121.512c16.8252 12.2666 50.21 41.7832 73.4131 41.4336
+c23.1982 0.353516 56.5957 -29.1719 73.4131 -41.4326c118.687 -86.1377 139.303 -101.995 164.2 -121.513c11.2129 -8.78906 18.3867 -22.4375 18.3867 -37.7754v-263.276zM446.334 180.605c-2.5625 3.72754 -7.7002 4.59473 -11.3389 1.90625
+c-22.8447 -16.873 -55.4619 -40.7051 -105.582 -77.0791c-16.8252 -12.2656 -50.21 -41.7803 -73.4131 -41.4297c-23.2109 -0.34375 -56.5586 29.1436 -73.4131 41.4297c-50.1143 36.3701 -82.7344 60.2041 -105.582 77.0791
+c-3.63867 2.68848 -8.77637 1.82129 -11.3389 -1.90625l-9.07227 -13.1963c-0.884766 -1.28711 -1.40332 -2.8457 -1.40332 -4.52539c0 -2.63867 1.26953 -4.98438 3.24219 -6.44141c22.8877 -16.8994 55.4541 -40.6904 105.304 -76.8682
+c20.2734 -14.7812 56.5234 -47.8135 92.2637 -47.5732c35.7236 -0.242188 71.9609 32.7715 92.2627 47.5732c49.8506 36.1787 82.418 59.9697 105.304 76.8682c1.97266 1.45703 3.25391 3.79883 3.25391 6.4375c0 1.67969 -0.530273 3.24219 -1.41504 4.5293z" />
+    <glyph glyph-name="address-book" unicode="&#xf2b9;" horiz-adv-x="448" 
+d="M436 288h-20v-64h20c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-20v-64h20c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-20v-48c0 -26.5 -21.5 -48 -48 -48h-320c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48
+h320c26.5 0 48 -21.5 48 -48v-48h20c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12zM208 320c-35.2998 0 -64 -28.7002 -64 -64s28.7002 -64 64 -64s64 28.7002 64 64s-28.7002 64 -64 64zM320 83.2002v19.2002
+c0 31.7998 -30.0996 57.5996 -67.2002 57.5996h-5c-12.2002 -5.09961 -25.7002 -8 -39.7998 -8s-27.5 2.90039 -39.7998 8h-5c-37.1006 0 -67.2002 -25.7998 -67.2002 -57.5996v-19.2002c0 -10.6006 10 -19.2002 22.4004 -19.2002h179.199
+c12.4004 0 22.4004 8.59961 22.4004 19.2002z" />
+    <glyph glyph-name="address-card" unicode="&#xf2bb;" horiz-adv-x="576" 
+d="M528 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h480zM176 320c-35.2998 0 -64 -28.7002 -64 -64s28.7002 -64 64 -64s64 28.7002 64 64s-28.7002 64 -64 64zM288 83.2002v19.2002
+c0 31.7998 -30.0996 57.5996 -67.2002 57.5996h-5c-12.2002 -5.09961 -25.7002 -8 -39.7998 -8s-27.5 2.90039 -39.7998 8h-5c-37.1006 0 -67.2002 -25.7998 -67.2002 -57.5996v-19.2002c0 -10.6006 10 -19.2002 22.4004 -19.2002h179.199
+c12.4004 0 22.4004 8.59961 22.4004 19.2002zM512 136v16c0 4.40039 -3.59961 8 -8 8h-144c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h144c4.40039 0 8 3.59961 8 8zM512 200v16c0 4.40039 -3.59961 8 -8 8h-144c-4.40039 0 -8 -3.59961 -8 -8v-16
+c0 -4.40039 3.59961 -8 8 -8h144c4.40039 0 8 3.59961 8 8zM512 264v16c0 4.40039 -3.59961 8 -8 8h-144c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h144c4.40039 0 8 3.59961 8 8z" />
+    <glyph glyph-name="user-circle" unicode="&#xf2bd;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM248 344c-48.5996 0 -88 -39.4004 -88 -88s39.4004 -88 88 -88s88 39.4004 88 88s-39.4004 88 -88 88zM248 0c58.7002 0 111.3 26.5996 146.5 68.2002
+c-18.7998 35.3994 -55.5996 59.7998 -98.5 59.7998c-2.40039 0 -4.7998 -0.400391 -7.09961 -1.09961c-12.9004 -4.2002 -26.6006 -6.90039 -40.9004 -6.90039s-27.9004 2.7002 -40.9004 6.90039c-2.2998 0.699219 -4.69922 1.09961 -7.09961 1.09961
+c-42.9004 0 -79.7002 -24.4004 -98.5 -59.7998c35.2002 -41.6006 87.7998 -68.2002 146.5 -68.2002z" />
+    <glyph glyph-name="id-badge" unicode="&#xf2c1;" horiz-adv-x="384" 
+d="M336 448c26.5 0 48 -21.5 48 -48v-416c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48h288zM144 416c-8.7998 0 -16 -7.2002 -16 -16s7.2002 -16 16 -16h96c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16h-96zM192 288
+c-35.2998 0 -64 -28.7002 -64 -64s28.7002 -64 64 -64s64 28.7002 64 64s-28.7002 64 -64 64zM304 51.2002v19.2002c0 31.7998 -30.0996 57.5996 -67.2002 57.5996h-5c-12.2002 -5.09961 -25.7002 -8 -39.7998 -8s-27.5 2.90039 -39.7998 8h-5
+c-37.1006 0 -67.2002 -25.7998 -67.2002 -57.5996v-19.2002c0 -10.6006 10 -19.2002 22.4004 -19.2002h179.199c12.4004 0 22.4004 8.59961 22.4004 19.2002z" />
+    <glyph glyph-name="id-card" unicode="&#xf2c2;" horiz-adv-x="576" 
+d="M528 416c26.5 0 48 -21.5 48 -48v-16h-576v16c0 26.5 21.5 48 48 48h480zM0 16v304h576v-304c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48zM352 248v-16c0 -4.40039 3.59961 -8 8 -8h144c4.40039 0 8 3.59961 8 8v16c0 4.40039 -3.59961 8 -8 8h-144
+c-4.40039 0 -8 -3.59961 -8 -8zM352 184v-16c0 -4.40039 3.59961 -8 8 -8h144c4.40039 0 8 3.59961 8 8v16c0 4.40039 -3.59961 8 -8 8h-144c-4.40039 0 -8 -3.59961 -8 -8zM352 120v-16c0 -4.40039 3.59961 -8 8 -8h144c4.40039 0 8 3.59961 8 8v16
+c0 4.40039 -3.59961 8 -8 8h-144c-4.40039 0 -8 -3.59961 -8 -8zM176 256c-35.2998 0 -64 -28.7002 -64 -64s28.7002 -64 64 -64s64 28.7002 64 64s-28.7002 64 -64 64zM67.0996 51.7998c-3.19922 -9.7998 5.2002 -19.7998 15.6006 -19.7998h186.6
+c10.4004 0 18.7998 9.90039 15.6006 19.7998c-8.40039 25.7002 -32.5 44.2002 -60.9004 44.2002h-8.2002c-12.2002 -5.09961 -25.7002 -8 -39.7998 -8s-27.5 2.90039 -39.7998 8h-8.2002c-28.4004 0 -52.5 -18.5 -60.9004 -44.2002z" />
+    <glyph glyph-name="thermometer-full" unicode="&#xf2c7;" horiz-adv-x="256" 
+d="M224 352v-203.347c19.9121 -22.5635 32 -52.1943 32 -84.6533c0 -70.6963 -57.3018 -128 -128 -128c-0.298828 0 -0.610352 0.000976562 -0.90918 0.00292969c-70.3018 0.488281 -127.448 58.3613 -127.089 128.664c0.164062 32.1973 12.2227 61.5771 31.998 83.9863
+v203.347c0 53.0186 42.9814 96 96 96s96 -42.9814 96 -96zM128 -16c44.1123 0 80 35.8877 80 80c0 34.3379 -19.3701 52.1904 -32 66.502v221.498c0 26.4668 -21.5332 48 -48 48s-48 -21.5332 -48 -48v-221.498c-12.7334 -14.4277 -31.8262 -32.0996 -31.999 -66.0801
+c-0.223633 -43.876 35.5635 -80.1162 79.4229 -80.4199zM192 64c0 -35.3457 -28.6543 -64 -64 -64s-64 28.6543 -64 64c0 23.6846 12.876 44.3486 32 55.417v232.583c0 17.6729 14.3271 32 32 32s32 -14.3271 32 -32v-232.583c19.124 -11.0684 32 -31.7324 32 -55.417z" />
+    <glyph glyph-name="thermometer-three-quarters" unicode="&#xf2c8;" horiz-adv-x="256" 
+d="M192 64c0 -35.3457 -28.6543 -64 -64 -64s-64 28.6543 -64 64c0 23.6846 12.876 44.3486 32 55.417v168.583c0 17.6729 14.3271 32 32 32s32 -14.3271 32 -32v-168.583c19.124 -11.0684 32 -31.7324 32 -55.417zM224 148.653c19.9121 -22.5635 32 -52.1943 32 -84.6533
+c0 -70.6963 -57.3027 -128 -128 -128c-0.298828 0 -0.609375 0.000976562 -0.90918 0.00292969c-70.3018 0.488281 -127.448 58.3613 -127.089 128.664c0.164062 32.1982 12.2227 61.5781 31.998 83.9863v203.347c0 53.0186 42.9814 96 96 96s96 -42.9814 96 -96v-203.347z
+M208 64c0 34.3389 -19.3701 52.1904 -32 66.502v221.498c0 26.4668 -21.5332 48 -48 48s-48 -21.5332 -48 -48v-221.498c-12.7324 -14.4277 -31.8252 -32.0996 -31.999 -66.0801c-0.223633 -43.876 35.5635 -80.1162 79.4229 -80.4199l0.576172 -0.00195312
+c44.1123 0 80 35.8877 80 80z" />
+    <glyph glyph-name="thermometer-half" unicode="&#xf2c9;" horiz-adv-x="256" 
+d="M192 64c0 -35.3457 -28.6543 -64 -64 -64s-64 28.6543 -64 64c0 23.6846 12.876 44.3486 32 55.417v104.583c0 17.6729 14.3271 32 32 32s32 -14.3271 32 -32v-104.583c19.124 -11.0684 32 -31.7324 32 -55.417zM224 148.653c19.9121 -22.5635 32 -52.1943 32 -84.6533
+c0 -70.6963 -57.3027 -128 -128 -128c-0.298828 0 -0.609375 0.000976562 -0.90918 0.00292969c-70.3018 0.488281 -127.448 58.3613 -127.089 128.664c0.164062 32.1982 12.2227 61.5781 31.998 83.9863v203.347c0 53.0186 42.9814 96 96 96s96 -42.9814 96 -96v-203.347z
+M208 64c0 34.3389 -19.3701 52.1904 -32 66.502v221.498c0 26.4668 -21.5332 48 -48 48s-48 -21.5332 -48 -48v-221.498c-12.7324 -14.4277 -31.8252 -32.0996 -31.999 -66.0801c-0.223633 -43.876 35.5635 -80.1162 79.4229 -80.4199l0.576172 -0.00195312
+c44.1123 0 80 35.8877 80 80z" />
+    <glyph glyph-name="thermometer-quarter" unicode="&#xf2ca;" horiz-adv-x="256" 
+d="M192 64c0 -35.3457 -28.6543 -64 -64 -64s-64 28.6543 -64 64c0 23.6846 12.876 44.3486 32 55.417v40.583c0 17.6729 14.3271 32 32 32s32 -14.3271 32 -32v-40.583c19.124 -11.0684 32 -31.7324 32 -55.417zM224 148.653c19.9121 -22.5635 32 -52.1943 32 -84.6533
+c0 -70.6963 -57.3027 -128 -128 -128c-0.298828 0 -0.609375 0.000976562 -0.90918 0.00292969c-70.3018 0.488281 -127.448 58.3613 -127.089 128.664c0.164062 32.1982 12.2227 61.5781 31.998 83.9863v203.347c0 53.0186 42.9814 96 96 96s96 -42.9814 96 -96v-203.347z
+M208 64c0 34.3389 -19.3701 52.1904 -32 66.502v221.498c0 26.4668 -21.5332 48 -48 48s-48 -21.5332 -48 -48v-221.498c-12.7324 -14.4277 -31.8252 -32.0996 -31.999 -66.0801c-0.223633 -43.876 35.5635 -80.1162 79.4229 -80.4199l0.576172 -0.00195312
+c44.1123 0 80 35.8877 80 80z" />
+    <glyph glyph-name="thermometer-empty" unicode="&#xf2cb;" horiz-adv-x="256" 
+d="M192 64c0 -35.3457 -28.6543 -64 -64 -64s-64 28.6543 -64 64s28.6543 64 64 64s64 -28.6543 64 -64zM224 148.653c19.9121 -22.5635 32 -52.1943 32 -84.6533c0 -70.6963 -57.3027 -128 -128 -128c-0.298828 0 -0.609375 0.000976562 -0.90918 0.00292969
+c-70.3018 0.488281 -127.448 58.3613 -127.089 128.664c0.164062 32.1982 12.2227 61.5781 31.998 83.9863v203.347c0 53.0186 42.9814 96 96 96s96 -42.9814 96 -96v-203.347zM208 64c0 34.3389 -19.3701 52.1904 -32 66.502v221.498c0 26.4668 -21.5332 48 -48 48
+s-48 -21.5332 -48 -48v-221.498c-12.7324 -14.4277 -31.8252 -32.0996 -31.999 -66.0801c-0.223633 -43.876 35.5635 -80.1162 79.4229 -80.4199l0.576172 -0.00195312c44.1123 0 80 35.8877 80 80z" />
+    <glyph glyph-name="shower" unicode="&#xf2cc;" 
+d="M304 128c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM336 224c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM368 160c-8.83105 0 -16 7.16895 -16 16s7.16895 16 16 16
+s16 -7.16895 16 -16s-7.16895 -16 -16 -16zM336 128c-8.83105 0 -16 7.16895 -16 16s7.16895 16 16 16s16 -7.16895 16 -16s-7.16895 -16 -16 -16zM304 192c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM432 224
+c-8.83105 0 -16 7.16895 -16 16s7.16895 16 16 16s16 -7.16895 16 -16s-7.16895 -16 -16 -16zM384 208c0 8.83105 7.16895 16 16 16s16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16zM368 256c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16
+s-16 7.16895 -16 16s7.16895 16 16 16zM464 224c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM496 256c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM432 192
+c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM400 160c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM336 96c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16
+s-16 7.16895 -16 16s7.16895 16 16 16zM304 64c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM368 128c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM389.65 346.35
+c2.89648 -2.89551 4.68945 -6.90039 4.68945 -11.3164s-1.79297 -8.41699 -4.68945 -11.3135l-169.381 -169.37c-2.89551 -2.89648 -6.90039 -4.68945 -11.3164 -4.68945s-8.41699 1.79297 -11.3135 4.68945l-11.2998 11.3105
+c-2.89355 2.89551 -4.68457 6.89844 -4.68457 11.3125c0 4.41309 1.79102 8.41113 4.68457 11.3076l5.66016 5.66992c-19.7871 20.0811 -31.9951 47.6602 -32 78.0498c0 19.2402 5.2998 37.0801 13.9297 52.8604l-10 10c-10.5723 10.6055 -25.1416 17.167 -41.2861 17.167
+c-2.58984 0 -5.1416 -0.169922 -7.64355 -0.49707c-30 -3.73047 -51 -31.7803 -51 -61.9307v-305.6c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v303.15c0 67.9395 55.4902 129.35 123.44 128.85
+c33.4453 -0.166992 63.7471 -13.835 85.6592 -35.8496l10 -10c15.8203 8.5498 33.6602 13.8496 52.9004 13.8496c30.3916 -0.000976562 57.9707 -12.21 78.0498 -32l5.66992 5.66016c2.89648 2.89648 6.90137 4.68945 11.3174 4.68945s8.41699 -1.79297 11.3125 -4.68945z
+" />
+    <glyph glyph-name="bath" unicode="&#xf2cd;" 
+d="M32 64v48h448v-48c-0.0576172 -28.2656 -12.3916 -53.6514 -32 -71.0898v-40.9102c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v16h-256v-16c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v40.9102
+c-19.6084 17.4385 -31.9424 42.8242 -32 71.0898zM496 192c8.83105 0 16 -7.16895 16 -16v-16c0 -8.83105 -7.16895 -16 -16 -16h-480c-8.83105 0 -16 7.16895 -16 16v16c0 8.83105 7.16895 16 16 16h16v186.75c0 38.2197 31.0391 69.2656 69.2598 69.2656
+c19.1113 0 36.4248 -7.75879 48.96 -20.2959l19.2607 -19.2695c29.8994 13.1299 59.1094 7.60938 79.7295 -8.62012l0.169922 0.169922c2.89551 2.89355 6.89941 4.68457 11.3125 4.68457s8.41211 -1.79102 11.3076 -4.68457l11.3096 -11.3096
+c2.89746 -2.89648 4.69043 -6.90137 4.69043 -11.3174s-1.79297 -8.41699 -4.69043 -11.3135l-105.369 -105.369c-2.89648 -2.89746 -6.90137 -4.69043 -11.3174 -4.69043s-8.41699 1.79297 -11.3135 4.69043l-11.3096 11.3096
+c-2.88477 2.89453 -4.66992 6.8916 -4.66992 11.2969c0 4.40625 1.78516 8.39844 4.66992 11.293l0.169922 0.169922c-16.2295 20.6201 -21.75 49.8506 -8.62012 79.7305l-19.2695 19.2598c-3.84766 3.84082 -9.16016 6.21289 -15.0205 6.21289
+c-11.7178 0 -21.2344 -9.50098 -21.2598 -21.2129v-186.75h416z" />
+    <glyph glyph-name="podcast" unicode="&#xf2ce;" horiz-adv-x="448" 
+d="M267.429 -40.5635c-5.14258 -19.0098 -24.5703 -23.4365 -43.4287 -23.4365c-18.8574 0 -38.2861 4.42676 -43.4277 23.4365c-7.64551 28.4297 -20.5723 99.665 -20.5723 132.813c0 35.1562 31.1416 43.75 64 43.75s64 -8.59375 64 -43.75
+c0 -32.9492 -12.8711 -104.179 -20.5713 -132.813zM156.867 159.446c2.6748 -2.61914 2.39941 -6.98535 -0.628906 -9.18555c-9.3125 -6.76465 -16.4609 -15.3418 -21.2354 -25.3623c-1.74219 -3.65723 -6.5 -4.6582 -9.45312 -1.8877
+c-28.0176 26.2891 -45.5498 63.6279 -45.5498 104.989c0 80.7852 66.8691 146.247 148.163 143.941c76.1982 -2.16113 137.938 -64.1631 139.793 -140.369c1.04199 -42.7822 -16.6846 -81.5225 -45.5107 -108.565c-2.95215 -2.76855 -7.70801 -1.7627 -9.44922 1.8916
+c-4.77441 10.0195 -11.9219 18.5977 -21.2344 25.3623c-3.02832 2.20117 -3.30273 6.56738 -0.62793 9.1875c17.8018 17.4355 28.8662 41.7246 28.8662 68.5518c0 54.1934 -45.1377 98.042 -99.793 95.9258c-49.7295 -1.9248 -90.0703 -42.1572 -92.124 -91.8809
+c-1.17383 -28.4258 10.0908 -54.291 28.7842 -72.5986zM224 448c123.815 0 224 -100.205 224 -224c0 -90.1865 -52.7734 -165.727 -125.739 -201.407c-4.33203 -2.11914 -9.2666 1.54297 -8.53516 6.31055c2.55566 16.6416 4.625 33.1924 5.62402 47.2295
+c48.4922 31.377 80.6504 85.9355 80.6504 147.867c0 97.2031 -79.207 176.253 -176.468 175.999c-96.2393 -0.250977 -174.938 -78.6621 -175.529 -174.899c-0.376953 -61.3311 30.7871 -115.541 78.1875 -147.347c1.52832 -1.02637 2.53125 -2.67578 2.67773 -4.51172
+c1.06348 -13.3936 3.02344 -28.8271 5.40625 -44.3389c0.731445 -4.7666 -4.20215 -8.42871 -8.53516 -6.31055c-73.1377 35.7607 -125.739 111.416 -125.739 201.408c0 123.815 100.204 224 224 224zM224 288c35.3457 0 64 -28.6543 64 -64s-28.6543 -64 -64 -64
+s-64 28.6543 -64 64s28.6543 64 64 64z" />
+    <glyph glyph-name="window-maximize" unicode="&#xf2d0;" 
+d="M464 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h416zM448 256v84c0 6.59961 -5.40039 12 -12 12h-360c-6.59961 0 -12 -5.40039 -12 -12v-84h384z" />
+    <glyph glyph-name="window-minimize" unicode="&#xf2d1;" 
+d="M464 96c26.5 0 48 -21.5 48 -48v-32c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v32c0 26.5 21.5 48 48 48h416z" />
+    <glyph glyph-name="window-restore" unicode="&#xf2d2;" 
+d="M512 400v-288c0 -26.5 -21.5 -48 -48 -48h-48v208c0 44.0996 -35.9004 80 -80 80h-208v48c0 26.5 21.5 48 48 48h288c26.5 0 48 -21.5 48 -48zM384 272v-288c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v288c0 26.5 21.5 48 48 48h288
+c26.5 0 48 -21.5 48 -48zM316 244c0 6.59961 -5.40039 12 -12 12h-228c-6.59961 0 -12 -5.40039 -12 -12v-52h252v52z" />
+    <glyph glyph-name="microchip" unicode="&#xf2db;" 
+d="M416 400v-416c0 -26.5098 -21.4902 -48 -48 -48h-224c-26.5098 0 -48 21.4902 -48 48v416c0 26.5098 21.4902 48 48 48h224c26.5098 0 48 -21.4902 48 -48zM512 342v-12c0 -3.31152 -2.68848 -6 -6 -6h-18v-6c0 -3.31152 -2.68848 -6 -6 -6h-42v48h42
+c3.31152 0 6 -2.68848 6 -6v-6h18c3.31152 0 6 -2.68848 6 -6zM512 246v-12c0 -3.31152 -2.68848 -6 -6 -6h-18v-6c0 -3.31152 -2.68848 -6 -6 -6h-42v48h42c3.31152 0 6 -2.68848 6 -6v-6h18c3.31152 0 6 -2.68848 6 -6zM512 150v-12c0 -3.31152 -2.68848 -6 -6 -6h-18v-6
+c0 -3.31152 -2.68848 -6 -6 -6h-42v48h42c3.31152 0 6 -2.68848 6 -6v-6h18c3.31152 0 6 -2.68848 6 -6zM512 54v-12c0 -3.31152 -2.68848 -6 -6 -6h-18v-6c0 -3.31152 -2.68848 -6 -6 -6h-42v48h42c3.31152 0 6 -2.68848 6 -6v-6h18c3.31152 0 6 -2.68848 6 -6zM30 72h42
+v-48h-42c-3.31152 0 -6 2.68848 -6 6v6h-18c-3.31152 0 -6 2.68848 -6 6v12c0 3.31152 2.68848 6 6 6h18v6c0 3.31152 2.68848 6 6 6zM30 168h42v-48h-42c-3.31152 0 -6 2.68848 -6 6v6h-18c-3.31152 0 -6 2.68848 -6 6v12c0 3.31152 2.68848 6 6 6h18v6
+c0 3.31152 2.68848 6 6 6zM30 264h42v-48h-42c-3.31152 0 -6 2.68848 -6 6v6h-18c-3.31152 0 -6 2.68848 -6 6v12c0 3.31152 2.68848 6 6 6h18v6c0 3.31152 2.68848 6 6 6zM30 360h42v-48h-42c-3.31152 0 -6 2.68848 -6 6v6h-18c-3.31152 0 -6 2.68848 -6 6v12
+c0 3.31152 2.68848 6 6 6h18v6c0 3.31152 2.68848 6 6 6z" />
+    <glyph glyph-name="snowflake" unicode="&#xf2dc;" horiz-adv-x="448" 
+d="M440.3 102.8c7.40039 -4.2002 9.90039 -13.7002 5.60059 -21l-15.5 -26.7998c-4.30078 -7.40039 -13.7002 -10 -21.1006 -5.7002l-33.7998 19.5l7 -26c2.2002 -8.2002 -2.7002 -16.7002 -10.9004 -18.8994l-14.8994 -4
+c-8.2002 -2.2002 -16.7002 2.69922 -18.9004 10.8994l-19 70.7998l-62.7998 36.2002v-77.5l53.4004 -53.7002c6.19922 -6.19922 6.19922 -16.3994 0 -22.5996l-11.3008 -11.2998c-6.19922 -6.2002 -16.3994 -6.2002 -22.5996 0l-19.7002 19.7002v-40.4004
+c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v40.2998l-19.7002 -19.7002c-6.19922 -6.19922 -16.3994 -6.19922 -22.5996 0l-11.2998 11.3008c-6.2998 6.19922 -6.2998 16.3994 0 22.5996l53.7002 53.7002v77.5l-62.8008 -36.2002l-19 -70.7998
+c-2.19922 -8.2002 -10.6992 -13.1006 -18.8994 -10.9004l-14.9004 4c-8.2002 2.2002 -13.0996 10.7002 -10.8994 18.9004l7 26l-33.8008 -19.5c-7.39941 -4.2002 -16.7998 -1.7002 -21.0996 5.7002l-15.5 26.7998c-4.2002 7.39941 -1.7002 16.7998 5.7002 21.0996
+l33.7998 19.6006l-26 7c-8.2002 2.19922 -13.0996 10.6992 -10.9004 18.8994l4 14.9004c2.2002 8.2002 10.7002 13.0996 18.9004 10.8994l70.7998 -19l63.7998 36.9004l-63.7998 36.9004l-70.7998 -19c-8.2002 -2.2002 -16.7002 2.69922 -18.9004 10.8994l-4 14.9004
+c-2.19922 8.2998 2.7002 16.7998 11 19l26 7l-33.7998 19.5c-7.39941 4.2998 -10 13.7002 -5.7002 21.0996l15.5 26.7002c4.30078 7.40039 13.7002 10 21.1006 5.7002l33.7998 -19.5l-7 26c-2.2002 8.2002 2.7002 16.7002 10.9004 18.8994l14.8994 4
+c8.2002 2.2002 16.7002 -2.69922 18.9004 -10.8994l19 -70.7998l62.7998 -36.2002v77.5l-53.7002 53.7002c-6.2998 6.19922 -6.2998 16.3994 0 22.5996l11.4004 11.2998c6.2002 6.2002 16.3994 6.2002 22.5996 0l19.7002 -19.7002v40.4004c0 8.7998 7.2002 16 16 16h32
+c8.7998 0 16 -7.2002 16 -16v-40.4004l19.7998 19.7002c6.2002 6.2002 16.4004 6.2002 22.6006 0l11.2998 -11.2998c6.2002 -6.2002 6.2002 -16.4004 0 -22.5996l-53.7002 -53.7002v-77.5l62.7998 36.2002l19 70.7998c2.2002 8.2002 10.7002 13.0996 18.9004 10.8994
+l14.8994 -4c8.2002 -2.19922 13.1006 -10.6992 10.9004 -18.8994l-7 -26l33.7998 19.5c7.40039 4.2002 16.7998 1.7002 21.1006 -5.7002l15.5 -26.7998c4.19922 -7.40039 1.69922 -16.7998 -5.7002 -21.1006l-33.7998 -19.5l26 -7
+c8.19922 -2.19922 13.0996 -10.6992 10.8994 -18.8994l-4 -14.9004c-2.2002 -8.2002 -10.7002 -13.0996 -18.8994 -10.8994l-70.8008 19l-63.7998 -36.9004l63.9004 -37l70.7998 19c8.2002 2.2002 16.7002 -2.7002 18.9004 -10.9004l4 -14.8994
+c2.19922 -8.2002 -2.7002 -16.7002 -10.9004 -18.9004l-26 -7z" />
+    <glyph glyph-name="utensil-spoon" unicode="&#xf2e5;" 
+d="M480.1 416.1c55.1006 -55 34.5 -164.899 -28.5 -227.8c-49.2998 -49.2998 -110 -55.0996 -160.399 -28.7998l-192.4 -214.4c-10.3994 -11.5996 -28.5 -12.0996 -39.5 -1.09961l-51.2998 51.2998c-11.0996 11 -10.5996 29 1 39.5l214.5 192.4
+c-26.2998 50.3994 -20.5 111.1 28.7998 160.399c62.9004 63 172.8 83.6006 227.8 28.5z" />
+    <glyph glyph-name="utensils" unicode="&#xf2e7;" horiz-adv-x="416" 
+d="M207.9 432.8c0.799805 -4.7002 16.0996 -94.5 16.0996 -128.8c0 -52.2998 -27.7998 -89.5996 -68.9004 -104.6l12.9004 -238.101c0.700195 -13.7002 -10.2002 -25.2998 -24 -25.2998h-64c-13.7002 0 -24.7002 11.5 -24 25.2998l12.9004 238.101
+c-41.2002 15 -68.9004 52.3994 -68.9004 104.6c0 34.4004 15.2998 124.1 16.0996 128.8c3.2002 20.2998 45.3008 20.6006 47.9004 -1.09961v-141.2c1.2998 -3.40039 15.0996 -3.2002 16 0c1.40039 25.2998 7.90039 139.2 8 141.8c3.2998 20.7998 44.7002 20.7998 47.9004 0
+c0.199219 -2.7002 6.59961 -116.5 8 -141.8c0.899414 -3.2002 14.7998 -3.40039 16 0v141.2c2.59961 21.5996 44.7998 21.3994 48 1.09961zM327.1 147.1c-156.5 122.4 -17.5996 300.9 64.9004 300.9c13.2998 0 24 -10.7998 24 -24v-464c0 -13.2998 -10.7002 -24 -24 -24h-56
+c-14 0 -25.0996 12 -23.9004 26z" />
+    <glyph glyph-name="undo-alt" unicode="&#xf2ea;" 
+d="M255.545 440c136.809 0.245117 248.456 -111.193 248.455 -248.002c-0.000976562 -136.965 -111.034 -247.998 -248 -247.998c-63.9258 0 -122.202 24.1865 -166.178 63.9082c-5.11328 4.61816 -5.35449 12.5605 -0.482422 17.4326l39.6621 39.6621
+c4.46191 4.46094 11.625 4.71387 16.3682 0.552734c30.6328 -26.8779 69.5029 -41.5557 110.63 -41.5557c93.8164 0 167.236 75.9912 167.994 166.552c0.798828 95.4648 -77.0859 170.24 -169.484 169.442c-42.4287 -0.366211 -82.3662 -16.374 -113.229 -45.2734
+l41.75 -41.75c15.1191 -15.1201 4.41113 -40.9707 -16.9717 -40.9707h-134.059c-13.2549 0 -24 10.7451 -24 24v134.059c0 21.3828 25.8506 32.0908 40.9707 16.9707l35.7139 -35.7139c44.4229 42.4512 104.592 68.5654 170.86 68.6846z" />
+    <glyph glyph-name="trash-alt" unicode="&#xf2ed;" horiz-adv-x="448" 
+d="M32 -16v336h384v-336c0 -26.4922 -21.5078 -48 -48 -48h-288c-26.4922 0 -48 21.5078 -48 48zM304 240v-224c0 -8.83105 7.16895 -16 16 -16s16 7.16895 16 16v224c0 8.83105 -7.16895 16 -16 16s-16 -7.16895 -16 -16zM208 240v-224c0 -8.83105 7.16895 -16 16 -16
+s16 7.16895 16 16v224c0 8.83105 -7.16895 16 -16 16s-16 -7.16895 -16 -16zM112 240v-224c0 -8.83105 7.16895 -16 16 -16s16 7.16895 16 16v224c0 8.83105 -7.16895 16 -16 16s-16 -7.16895 -16 -16zM432 416c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h120l9.40039 18.7002c3.85547 7.88574 11.9434 13.2998 21.3066 13.2998h0.0927734h114.3c0.00585938 0 -0.00195312 0.0234375 0.00390625 0.0234375
+c9.41113 0 17.5645 -5.42871 21.4961 -13.3232l9.40039 -18.7002h120z" />
+    <glyph glyph-name="sync-alt" unicode="&#xf2f1;" 
+d="M370.72 314.72c-31.2617 29.2725 -71.832 45.3184 -114.872 45.2803c-77.458 -0.0683594 -144.328 -53.1777 -162.791 -126.85c-1.34375 -5.36328 -6.12207 -9.15039 -11.6504 -9.15039h-57.3037c-7.49707 0 -13.1934 6.80664 -11.8066 14.1758
+c21.6367 114.9 122.518 201.824 243.704 201.824c66.4482 0 126.791 -26.1357 171.315 -68.6846l35.7148 35.7148c15.1191 15.1191 40.9697 4.41113 40.9697 -16.9717v-134.059c0 -13.2549 -10.7451 -24 -24 -24h-134.059c-21.3828 0 -32.0908 25.8506 -16.9717 40.9707z
+M32 152h134.059c21.3828 0 32.0908 -25.8506 16.9717 -40.9707l-41.75 -41.75c31.2617 -29.2734 71.835 -45.3193 114.876 -45.2803c77.418 0.0703125 144.314 53.1436 162.787 126.849c1.34375 5.36328 6.12207 9.15039 11.6504 9.15039h57.3047
+c7.49805 0 13.1934 -6.80664 11.8066 -14.1758c-21.6377 -114.898 -122.519 -201.822 -243.705 -201.822c-66.4482 0 -126.791 26.1357 -171.315 68.6846l-35.7148 -35.7148c-15.1191 -15.1191 -40.9697 -4.41113 -40.9697 16.9717v134.059c0 13.2549 10.7451 24 24 24z" />
+    <glyph glyph-name="stopwatch" unicode="&#xf2f2;" horiz-adv-x="448" 
+d="M432 144c0 -114.9 -93.0996 -208 -208 -208s-208 93.0996 -208 208c0 104 76.2998 190.2 176 205.5v34.5h-28c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h120c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-28v-34.5
+c37.5 -5.7998 71.7002 -21.5996 99.7002 -44.5996l27.5 27.5c4.7002 4.69922 12.2998 4.69922 17 0l28.2998 -28.3008c4.7002 -4.69922 4.7002 -12.2998 0 -17l-29.4004 -29.3994l-0.599609 -0.600586c21.2002 -32.3994 33.5 -71.2998 33.5 -113.1zM256 108v151.5
+c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12v-151.5c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12z" />
+    <glyph glyph-name="sign-out-alt" unicode="&#xf2f5;" 
+d="M497 175l-168 -168c-15 -15 -41 -4.5 -41 17v96h-136c-13.2998 0 -24 10.7002 -24 24v96c0 13.2998 10.7002 24 24 24h136v96c0 21.4004 25.9004 32 41 17l168 -168c9.2998 -9.40039 9.2998 -24.5996 0 -34zM192 12c0 -6.59961 -5.40039 -12 -12 -12h-84
+c-53 0 -96 43 -96 96v192c0 53 43 96 96 96h84c6.59961 0 12 -5.40039 12 -12v-40c0 -6.59961 -5.40039 -12 -12 -12h-84c-17.7002 0 -32 -14.2998 -32 -32v-192c0 -17.7002 14.2998 -32 32 -32h84c6.59961 0 12 -5.40039 12 -12v-40z" />
+    <glyph glyph-name="sign-in-alt" unicode="&#xf2f6;" 
+d="M416 0h-84c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h84c17.7002 0 32 14.2998 32 32v192c0 17.7002 -14.2998 32 -32 32h-84c-6.59961 0 -12 5.40039 -12 12v40c0 6.59961 5.40039 12 12 12h84c53 0 96 -43 96 -96v-192c0 -53 -43 -96 -96 -96z
+M369 201c9.2998 -9.40039 9.2998 -24.5996 0 -34l-168 -168c-15 -15 -41 -4.5 -41 17v96h-136c-13.2998 0 -24 10.7002 -24 24v96c0 13.2998 10.7002 24 24 24h136v96c0 21.5 26 32 41 17z" />
+    <glyph glyph-name="redo-alt" unicode="&#xf2f9;" 
+d="M256.455 440c66.2686 -0.119141 126.437 -26.2334 170.859 -68.6846l35.7148 35.7148c15.1201 15.1191 40.9707 4.41113 40.9707 -16.9717v-134.059c0 -13.2549 -10.7451 -24 -24 -24h-134.059c-21.3828 0 -32.0908 25.8506 -16.9717 40.9707l41.75 41.75
+c-30.8633 28.8994 -70.8008 44.9072 -113.229 45.2734c-92.3984 0.797852 -170.283 -73.9775 -169.484 -169.442c0.757812 -90.5605 74.1777 -166.552 167.994 -166.552c41.127 0 79.9971 14.6777 110.629 41.5557c4.74316 4.16113 11.9062 3.9082 16.3682 -0.552734
+l39.6621 -39.6621c4.87207 -4.87207 4.63086 -12.8145 -0.482422 -17.4326c-43.9746 -39.7217 -102.251 -63.9082 -166.177 -63.9082c-136.966 0 -247.999 111.033 -248 247.998c-0.000976562 136.809 111.646 248.247 248.455 248.002z" />
+    <glyph glyph-name="poo" unicode="&#xf2fe;" 
+d="M451.4 78.9004c34.2998 -5.5 60.5996 -35 60.5996 -70.9004c0 -39.7998 -32.2002 -72 -72 -72h-368c-39.7998 0 -72 32.2002 -72 72c0 35.9004 26.2998 65.4004 60.5996 70.9004c-17.2998 13.0996 -28.5996 33.6992 -28.5996 57.0996c0 39.7998 32.2002 72 72 72h14.0996
+c-13.3994 11.7002 -22.0996 28.7998 -22.0996 48c0 35.2998 28.7002 64 64 64h16c44.2002 0 80 35.7998 80 80c0 17.4004 -5.7002 33.4004 -15.0996 46.5c4.89941 0.799805 9.89941 1.5 15.0996 1.5c53 0 96 -43 96 -96c0 -11.2998 -2.2998 -21.9004 -5.90039 -32h5.90039
+c35.2998 0 64 -28.7002 64 -64c0 -19.2002 -8.7002 -36.2998 -22.0996 -48h14.0996c39.7998 0 72 -32.2002 72 -72c0 -23.4004 -11.2998 -44 -28.5996 -57.0996zM192 192c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32s32 14.2998 32 32s-14.2998 32 -32 32z
+M351.5 53c2 5.2998 -2 11 -7.7998 11h-175.4c-5.7998 0 -9.7998 -5.7002 -7.7998 -11c10.5 -27.9004 58.5 -53 95.5 -53s85 25.0996 95.5 53zM320 128c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32z" />
+    <glyph glyph-name="images" unicode="&#xf302;" horiz-adv-x="576" 
+d="M480 32v-16c0 -26.5098 -21.4902 -48 -48 -48h-384c-26.5098 0 -48 21.4902 -48 48v256c0 26.5098 21.4902 48 48 48h16v-208c0 -44.1123 35.8877 -80 80 -80h336zM576 112c0 -26.5098 -21.4902 -48 -48 -48h-384c-26.5098 0 -48 21.4902 -48 48v256
+c0 26.5098 21.4902 48 48 48h384c26.5098 0 48 -21.4902 48 -48v-256zM256 320c0 26.5098 -21.4902 48 -48 48s-48 -21.4902 -48 -48s21.4902 -48 48 -48s48 21.4902 48 48zM160 176v-48h352v112l-87.5137 87.5146c-4.6875 4.68652 -12.2852 4.68652 -16.9717 0
+l-135.515 -135.515l-39.5137 39.5146c-4.6875 4.68652 -12.2852 4.68652 -16.9717 0z" />
+    <glyph glyph-name="pencil-alt" unicode="&#xf303;" 
+d="M497.9 305.9l-46.1006 -46.1006c-4.7002 -4.7002 -12.2998 -4.7002 -17 0l-111 111c-4.7002 4.7002 -4.7002 12.2998 0 17l46.1006 46.1006c18.6992 18.6992 49.0996 18.6992 67.8994 0l60.1006 -60.1006c18.7998 -18.7002 18.7998 -49.0996 0 -67.8994zM284.2 348.2
+c4.7002 4.7002 12.2998 4.7002 17.0996 0l111 -111c4.7002 -4.7002 4.7002 -12.2998 0 -17l-262.6 -262.601l-121.5 -21.2998c-16.4004 -2.7998 -30.7002 11.4004 -27.7998 27.7998l21.1992 121.5zM124.1 108.1c5.5 -5.5 14.3008 -5.5 19.8008 0l154 154
+c5.5 5.5 5.5 14.3008 0 19.8008s-14.3008 5.5 -19.8008 0l-154 -154c-5.5 -5.5 -5.5 -14.3008 0 -19.8008zM88 24v48h-36.2998l-11.2998 -64.5l31.0996 -31.0996l64.5 11.2998v36.2998h-48z" />
+    <glyph glyph-name="pen" unicode="&#xf304;" 
+d="M290.74 354.76l128.02 -128.02l-277.99 -277.99l-114.14 -12.5996c-15.2803 -1.69043 -28.1895 11.2295 -26.4902 26.5098l12.7002 114.22zM497.94 373.82c18.75 -18.75 18.75 -49.1504 0 -67.9102l-56.5508 -56.5498l-128.02 128.02l56.5498 56.5498
+c18.75 18.75 49.1602 18.75 67.9102 0z" />
+    <glyph glyph-name="pen-alt" unicode="&#xf305;" 
+d="M497.94 373.83c18.75 -18.7598 18.75 -49.1602 0 -67.9102l-56.5508 -56.5498l-128.02 128.02l56.5498 56.5508c18.75 18.75 49.1602 18.75 67.9102 0zM251.14 394.36l84.8506 -84.8506l82.7695 -82.7695l-196.79 -196.79
+c-51.1611 -51.1592 -119.559 -85.4326 -195.34 -93.7998c-15.2803 -1.69043 -28.1895 11.2295 -26.4902 26.5098l0.0302734 0.229492c8.42188 75.6777 42.6777 143.978 93.7803 195.08l151.56 151.55l-22.6299 22.6201l-101.82 -101.819
+c-6.25 -6.25 -16.3799 -6.25 -22.6299 0l-22.6299 22.6299c-6.25 6.24023 -6.25 16.3701 0 22.6201l118.78 118.79c15.6201 15.6201 40.9395 15.6201 56.5596 0z" />
+    <glyph glyph-name="long-arrow-alt-down" unicode="&#xf309;" horiz-adv-x="256" 
+d="M168 102.059h46.0576c21.3828 0 32.0908 -25.8516 16.9717 -40.9707l-86.0596 -86.0586c-9.37207 -9.37305 -24.5674 -9.37305 -33.9404 0l-86.0596 86.0586c-15.1191 15.1201 -4.41113 40.9707 16.9717 40.9707h46.0586v301.941c0 6.62695 5.37305 12 12 12h56
+c6.62695 0 12 -5.37305 12 -12v-301.941z" />
+    <glyph glyph-name="long-arrow-alt-left" unicode="&#xf30a;" horiz-adv-x="448" 
+d="M134.059 152v-46.0576c0 -21.3828 -25.8516 -32.0908 -40.9707 -16.9717l-86.0586 86.0596c-9.37305 9.37207 -9.37305 24.5674 0 33.9404l86.0586 86.0596c15.1201 15.1191 40.9707 4.41113 40.9707 -16.9717v-46.0586h301.941c6.62695 0 12 -5.37305 12 -12v-56
+c0 -6.62695 -5.37305 -12 -12 -12h-301.941z" />
+    <glyph glyph-name="long-arrow-alt-right" unicode="&#xf30b;" horiz-adv-x="448" 
+d="M313.941 232v46.0576c0 21.3828 25.8516 32.0908 40.9707 16.9717l86.0586 -86.0596c9.37305 -9.37207 9.37305 -24.5674 0 -33.9404l-86.0586 -86.0596c-15.1201 -15.1191 -40.9707 -4.41113 -40.9707 16.9717v46.0586h-301.941c-6.62695 0 -12 5.37305 -12 12v56
+c0 6.62695 5.37305 12 12 12h301.941z" />
+    <glyph glyph-name="long-arrow-alt-up" unicode="&#xf30c;" horiz-adv-x="256" 
+d="M88 281.941h-46.0576c-21.3828 0 -32.0908 25.8516 -16.9717 40.9707l86.0596 86.0586c9.37207 9.37305 24.5674 9.37305 33.9404 0l86.0596 -86.0586c15.1191 -15.1201 4.41113 -40.9707 -16.9717 -40.9707h-46.0586v-301.941c0 -6.62695 -5.37305 -12 -12 -12h-56
+c-6.62695 0 -12 5.37305 -12 12v301.941z" />
+    <glyph glyph-name="expand-arrows-alt" unicode="&#xf31e;" horiz-adv-x="448" 
+d="M448 104v-112v-0.0615234c0 -13.2129 -10.7275 -23.9395 -23.9395 -23.9395c-0.0205078 0 -0.0400391 0.000976562 -0.0605469 0.000976562h-112c-21.3896 0 -32.0898 25.9004 -17 41l36.2002 36.2002l-107.2 107.2l-107.23 -107.301l36.2305 -36.0996
+c15.0898 -15.0996 4.38965 -41 -17 -41h-112h-0.0615234c-13.2129 0 -23.9395 10.7275 -23.9395 23.9395c0 0.0205078 0.000976562 0.0400391 0.000976562 0.0605469v112c0 21.4004 25.8896 32.0996 41 17l36.1904 -36.2002l107.27 107.2l-107.28 107.3l-36.1797 -36.2998
+c-15.0996 -15.0996 -41 -4.40039 -41 17v112v0.0615234c0 13.2129 10.7275 23.9395 23.9395 23.9395c0.0205078 0 0.0400391 -0.000976562 0.0605469 -0.000976562h112c21.3896 0 32.0898 -25.9004 17 -41l-36.2002 -36.2002l107.2 -107.2l107.23 107.301l-36.2305 36.0996
+c-15.0898 15.0996 -4.38965 41 17 41h112h0.0615234c13.2129 0 23.9395 -10.7275 23.9395 -23.9395c0 -0.0205078 -0.000976562 -0.0400391 -0.000976562 -0.0605469v-112c0 -21.4004 -25.8896 -32.0996 -41 -17l-36.1904 36.2002l-107.27 -107.2l107.28 -107.3
+l36.1797 36.2002c15.0996 15.1992 41 4.5 41 -16.9004z" />
+    <glyph glyph-name="clipboard" unicode="&#xf328;" horiz-adv-x="384" 
+d="M384 336v-352c0 -26.5098 -21.4902 -48 -48 -48h-288c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h80c0 35.29 28.71 64 64 64s64 -28.71 64 -64h80c26.5098 0 48 -21.4902 48 -48zM192 408c-13.2549 0 -24 -10.7451 -24 -24s10.7451 -24 24 -24
+s24 10.7451 24 24s-10.7451 24 -24 24zM288 294v20c0 3.31152 -2.68848 6 -6 6h-180c-3.31152 0 -6 -2.68848 -6 -6v-20c0 -3.31152 2.68848 -6 6 -6h180c3.31152 0 6 2.68848 6 6z" />
+    <glyph glyph-name="arrows-alt-h" unicode="&#xf337;" 
+d="M377.941 278.059c0 21.3828 25.8516 32.0908 40.9707 16.9707l86.0586 -86.0596c9.37305 -9.37305 9.37305 -24.5674 0 -33.9404l-86.0586 -86.0596c-15.1201 -15.1191 -40.9707 -4.41113 -40.9707 16.9717v46.0586h-243.883v-46.0576
+c0 -21.3828 -25.8516 -32.0908 -40.9707 -16.9717l-86.0586 86.0596c-9.37305 9.37305 -9.37305 24.5674 0 33.9404l86.0586 86.0596c15.1201 15.1191 40.9707 4.41113 40.9707 -16.9717v-46.0586h243.883v46.0586z" />
+    <glyph glyph-name="arrows-alt-v" unicode="&#xf338;" horiz-adv-x="256" 
+d="M214.059 70.0586c21.3828 0 32.0908 -25.8516 16.9707 -40.9707l-86.0596 -86.0586c-9.37305 -9.37305 -24.5674 -9.37305 -33.9404 0l-86.0596 86.0586c-15.1191 15.1201 -4.41113 40.9707 16.9717 40.9707h46.0586v243.883h-46.0576
+c-21.3828 0 -32.0908 25.8516 -16.9717 40.9707l86.0596 86.0586c9.37305 9.37305 24.5674 9.37305 33.9404 0l86.0596 -86.0586c15.1191 -15.1201 4.41113 -40.9707 -16.9717 -40.9707h-46.0586v-243.883h46.0586z" />
+    <glyph glyph-name="arrow-alt-circle-down" unicode="&#xf358;" 
+d="M504 192c0 -137 -111 -248 -248 -248s-248 111 -248 248s111 248 248 248s248 -111 248 -248zM212 308v-116h-70.9004c-10.6992 0 -16.0996 -13 -8.5 -20.5l114.9 -114.3c4.7002 -4.7002 12.2002 -4.7002 16.9004 0l114.899 114.3c7.60059 7.59961 2.2002 20.5 -8.5 20.5
+h-70.7998v116c0 6.59961 -5.40039 12 -12 12h-64c-6.59961 0 -12 -5.40039 -12 -12z" />
+    <glyph glyph-name="arrow-alt-circle-left" unicode="&#xf359;" 
+d="M256 -56c-137 0 -248 111 -248 248s111 248 248 248s248 -111 248 -248s-111 -248 -248 -248zM372 236h-116v70.9004c0 10.6992 -13 16.0996 -20.5 8.5l-114.3 -114.9c-4.7002 -4.7002 -4.7002 -12.2002 0 -16.9004l114.3 -114.899
+c7.59961 -7.60059 20.5 -2.2002 20.5 8.5v70.7998h116c6.59961 0 12 5.40039 12 12v64c0 6.59961 -5.40039 12 -12 12z" />
+    <glyph glyph-name="arrow-alt-circle-right" unicode="&#xf35a;" 
+d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM140 148h116v-70.9004c0 -10.6992 13 -16.0996 20.5 -8.5l114.3 114.9c4.7002 4.7002 4.7002 12.2002 0 16.9004l-114.3 115c-7.59961 7.59961 -20.5 2.19922 -20.5 -8.5
+v-70.9004h-116c-6.59961 0 -12 -5.40039 -12 -12v-64c0 -6.59961 5.40039 -12 12 -12z" />
+    <glyph glyph-name="arrow-alt-circle-up" unicode="&#xf35b;" 
+d="M8 192c0 137 111 248 248 248s248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248zM300 76v116h70.9004c10.6992 0 16.0996 13 8.5 20.5l-114.9 114.3c-4.7002 4.7002 -12.2002 4.7002 -16.9004 0l-115 -114.3c-7.59961 -7.59961 -2.19922 -20.5 8.5 -20.5
+h70.9004v-116c0 -6.59961 5.40039 -12 12 -12h64c6.59961 0 12 5.40039 12 12z" />
+    <glyph glyph-name="external-link-alt" unicode="&#xf35d;" 
+d="M432 128c8.83105 0 16 -7.16895 16 -16v-128c0 -26.4922 -21.5078 -48 -48 -48h-352c-26.4922 0 -48 21.5078 -48 48v352c0 26.4922 21.5078 48 48 48h160c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-144v-320h320v112
+c0 8.83105 7.16895 16 16 16h32zM488 448c13.2461 0 24 -10.7539 24 -24v-128c0 -21.5 -26 -32 -41 -17l-35.7197 35.6797l-243.61 -243.68c-4.34668 -4.36133 -10.3652 -7.0625 -17.0029 -7.0625s-12.6504 2.70117 -16.9971 7.0625l-22.6699 22.6299
+c-4.36133 4.34668 -7.0625 10.3652 -7.0625 17.0029c0 6.63867 2.70117 12.6504 7.0625 16.9971l243.73 243.64l-35.7305 35.7305c-15.0498 15.0898 -4.37012 41 17 41h128z" />
+    <glyph glyph-name="external-link-square-alt" unicode="&#xf360;" horiz-adv-x="448" 
+d="M448 368v-352c0 -26.5098 -21.4902 -48 -48 -48h-352c-26.5098 0 -48 21.4902 -48 48v352c0 26.5098 21.4902 48 48 48h352c26.5098 0 48 -21.4902 48 -48zM360 352h-111.971c-21.3135 0 -32.0801 -25.8613 -16.9717 -40.9707l31.9844 -31.9873l-195.527 -195.527
+c-4.68555 -4.68555 -4.68555 -12.2832 0 -16.9707l31.0293 -31.0293c4.6875 -4.68555 12.2852 -4.68555 16.9707 0l195.526 195.526l31.9883 -31.9912c15.0283 -15.0264 40.9707 -4.47461 40.9707 16.9717v111.979c0 13.2549 -10.7451 24 -24 24z" />
+    <glyph glyph-name="exchange-alt" unicode="&#xf362;" 
+d="M0 280v16c0 13.2549 10.7451 24 24 24h360v48c0 21.3672 25.8994 32.042 40.9707 16.9707l80 -80c9.37207 -9.37305 9.37207 -24.5684 0 -33.9404l-80 -80c-15.0146 -15.0127 -40.9707 -4.48633 -40.9707 16.9697v48h-360c-13.2549 0 -24 10.7451 -24 24zM488 128
+c13.2549 0 24 -10.7451 24 -24v-16c0 -13.2549 -10.7451 -24 -24 -24h-360v-48c0 -21.4365 -25.9434 -31.9971 -40.9707 -16.9697l-80 80c-9.37207 9.37207 -9.37207 24.5674 0 33.9404l80 80c15.1084 15.1094 40.9707 4.34375 40.9707 -16.9707v-48h360z" />
+    <glyph glyph-name="cloud-download-alt" unicode="&#xf381;" horiz-adv-x="640" 
+d="M537.6 221.4c58.4004 -11.8008 102.4 -63.5 102.4 -125.4c0 -70.7002 -57.2998 -128 -128 -128h-368c-79.5 0 -144 64.5 -144 144c0 62.7998 40.2002 116.2 96.2002 135.9c-0.100586 2.69922 -0.200195 5.39941 -0.200195 8.09961c0 88.4004 71.5996 160 160 160
+c59.2998 0 111 -32.2002 138.7 -80.2002c15.2002 10.2002 33.5996 16.2002 53.2998 16.2002c53 0 96 -43 96 -96c0 -12.2002 -2.2998 -23.9004 -6.40039 -34.5996zM404.7 132.7c10.0996 10.0996 2.89941 27.2998 -11.2998 27.2998h-65.4004v112c0 8.7998 -7.2002 16 -16 16
+h-48c-8.7998 0 -16 -7.2002 -16 -16v-112h-65.4004c-14.1992 0 -21.3994 -17.2002 -11.2998 -27.2998l105.4 -105.4c6.2002 -6.2002 16.3994 -6.2002 22.5996 0z" />
+    <glyph glyph-name="cloud-upload-alt" unicode="&#xf382;" horiz-adv-x="640" 
+d="M537.6 221.4c58.4004 -11.8008 102.4 -63.5 102.4 -125.4c0 -70.7002 -57.2998 -128 -128 -128h-368c-79.5 0 -144 64.5 -144 144c0 62.7998 40.2002 116.2 96.2002 135.9c-0.100586 2.69922 -0.200195 5.39941 -0.200195 8.09961c0 88.4004 71.5996 160 160 160
+c59.2998 0 111 -32.2002 138.7 -80.2002c15.2002 10.2002 33.5996 16.2002 53.2998 16.2002c53 0 96 -43 96 -96c0 -12.2002 -2.2998 -23.9004 -6.40039 -34.5996zM393.4 160c14.1992 0 21.3994 17.2002 11.2998 27.2998l-105.4 105.4
+c-6.2002 6.2002 -16.3994 6.2002 -22.5996 0l-105.4 -105.4c-10.0996 -10.0996 -3 -27.2998 11.2998 -27.2998h65.4004v-112c0 -8.7998 7.2002 -16 16 -16h48c8.7998 0 16 7.2002 16 16v112h65.4004z" />
+    <glyph glyph-name="gem" unicode="&#xf3a5;" horiz-adv-x="576" 
+d="M485.5 448l90.5 -160h-101.1l-69.2002 160h79.7998zM357.5 448l69.2002 -160h-277.4l69.2002 160h139zM90.5 448h79.7998l-69.2002 -160h-101.1zM0 256h100.7l123 -251.7c1.5 -3.09961 -2.7002 -5.89941 -5 -3.2998zM148.2 256h279.6l-137 -318.2
+c-1 -2.39941 -4.5 -2.39941 -5.5 0zM352.3 4.2998l123 251.7h100.7l-218.7 -254.9c-2.2998 -2.69922 -6.5 0.100586 -5 3.2002z" />
+    <glyph glyph-name="level-down-alt" unicode="&#xf3be;" horiz-adv-x="320" 
+d="M313.553 55.6689l-103.966 -112.003c-9.48535 -10.2139 -25.6758 -10.2295 -35.1738 0l-103.975 112.003c-14.2061 15.2998 -3.37695 40.3311 17.5869 40.3311h63.9746v272h-83.9756c-3.31152 0 -6.31348 1.34277 -8.48535 3.51465l-56 56
+c-7.56055 7.55957 -2.20605 20.4854 8.48535 20.4854h195.976c13.2549 0 24 -10.7451 24 -24v-328h63.9658c20.8779 0 31.8516 -24.9688 17.5869 -40.3311z" />
+    <glyph glyph-name="level-up-alt" unicode="&#xf3bf;" horiz-adv-x="320" 
+d="M313.553 328.331c14.2646 -15.3623 3.29102 -40.3311 -17.5869 -40.3311h-63.9658v-328c0 -13.2549 -10.7451 -24 -24 -24h-195.976c-10.6914 0 -16.0459 12.9258 -8.48535 20.4854l56 56c2.17188 2.17188 5.17383 3.51465 8.48535 3.51465h83.9756v272h-63.9746
+c-20.9639 0 -31.793 25.0312 -17.5869 40.3311l103.975 112.003c9.49805 10.2295 25.6885 10.2139 35.1738 0z" />
+    <glyph glyph-name="lock-open" unicode="&#xf3c1;" horiz-adv-x="576" 
+d="M423.5 448c84 0.299805 152.5 -68 152.5 -152v-80c0 -13.2998 -10.7002 -24 -24 -24h-32c-13.2998 0 -24 10.7002 -24 24v80c0 39.9004 -32.7002 72.4004 -72.7002 72c-39.5996 -0.400391 -71.2998 -33.2998 -71.2998 -72.9004v-71.0996h48c26.5 0 48 -21.5 48 -48v-192
+c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v192c0 26.5 21.5 48 48 48h224v70.5c0 84 67.5 153.2 151.5 153.5z" />
+    <glyph glyph-name="map-marker-alt" unicode="&#xf3c5;" horiz-adv-x="384" 
+d="M172.268 -53.6699c-145.298 210.639 -172.268 232.257 -172.268 309.67c0 106.039 85.9609 192 192 192s192 -85.9609 192 -192c0 -77.4131 -26.9697 -99.0312 -172.268 -309.67c-9.53516 -13.7744 -29.9307 -13.7734 -39.4648 0zM192 176c44.1826 0 80 35.8174 80 80
+s-35.8174 80 -80 80s-80 -35.8174 -80 -80s35.8174 -80 80 -80z" />
+    <glyph glyph-name="microphone-alt" unicode="&#xf3c9;" horiz-adv-x="352" 
+d="M336 256c8.83984 0 16 -7.16016 16 -16v-48c0 -88.9004 -66.29 -162.47 -152 -174.23v-33.7695h56c8.83984 0 16 -7.16016 16 -16v-16c0 -8.83984 -7.16016 -16 -16 -16h-160c-8.83984 0 -16 7.16016 -16 16v16c0 8.83984 7.16016 16 16 16h56v34.1504
+c-88.0303 12.1396 -152 92.0498 -152 181.689v40.1602c0 8.83984 7.16016 16 16 16h16c8.83984 0 16 -7.16016 16 -16v-42.2998c0 -66.8105 48.71 -126.59 115.21 -133.08c76.2998 -7.44043 140.79 52.5801 140.79 127.38v48c0 8.83984 7.16016 16 16 16h16zM176 96
+c-53.0195 0 -96 42.9805 -96 96v160c0 53.0195 42.9805 96 96 96s96 -42.9805 96 -96h-85.3301c-5.88965 0 -10.6699 -3.58008 -10.6699 -8v-16c0 -4.41992 4.78027 -8 10.6699 -8h85.3301v-32h-85.3301c-5.88965 0 -10.6699 -3.58008 -10.6699 -8v-16
+c0 -4.41992 4.78027 -8 10.6699 -8h85.3301v-32h-85.3301c-5.88965 0 -10.6699 -3.58008 -10.6699 -8v-16c0 -4.41992 4.78027 -8 10.6699 -8h85.3301c0 -53.0195 -42.9805 -96 -96 -96z" />
+    <glyph glyph-name="mobile-alt" unicode="&#xf3cd;" horiz-adv-x="320" 
+d="M272 448c26.5 0 48 -21.5 48 -48v-416c0 -26.5 -21.5 -48 -48 -48h-224c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48h224zM160 -32c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM272 76v312
+c0 6.59961 -5.40039 12 -12 12h-200c-6.59961 0 -12 -5.40039 -12 -12v-312c0 -6.59961 5.40039 -12 12 -12h200c6.59961 0 12 5.40039 12 12z" />
+    <glyph glyph-name="money-bill-alt" unicode="&#xf3d1;" horiz-adv-x="640" 
+d="M352 160c4.41992 0 8 -3.58008 8 -8v-16c0 -4.41992 -3.58008 -8 -8 -8h-64c-4.41992 0 -8 3.58008 -8 8v16c0 4.41992 3.58008 8 8 8h16v55.4404l-0.469727 -0.310547c-1.26855 -0.845703 -2.79395 -1.35156 -4.43164 -1.35156
+c-2.77734 0 -5.22559 1.41895 -6.6582 3.57129l-8.88086 13.3105c-0.845703 1.26758 -1.35156 2.79395 -1.35156 4.43066c0 2.77734 1.41992 5.22656 3.57227 6.65918l15.3301 10.2197c3.93945 2.62988 8.56934 4.03027 13.3096 4.03027h13.5801c4.41992 0 8 -3.58008 8 -8
+v-88h16zM608 384c17.6699 0 32 -14.3301 32 -32v-320c0 -17.6699 -14.3301 -32 -32 -32h-576c-17.6699 0 -32 14.3301 -32 32v320c0 17.6699 14.3301 32 32 32h576zM48 48h64c0 35.3496 -28.6504 64 -64 64v-64zM48 272c35.3496 0 64 28.6504 64 64h-64v-64zM320 80
+c53 0 96 50.1299 96 112c0 61.8604 -42.9805 112 -96 112s-96 -50.1396 -96 -112c0 -61.8496 42.9805 -112 96 -112zM592 48v64c-35.3496 0 -64 -28.6504 -64 -64h64zM592 272v64h-64c0 -35.3496 28.6504 -64 64 -64z" />
+    <glyph glyph-name="phone-slash" unicode="&#xf3dd;" horiz-adv-x="640" 
+d="M268.2 66.5996c11.5 5.40039 22.7002 11.6006 33.5996 18.1006l80 -61.7998c-76 -54.5 -169 -86.9004 -269.7 -86.9004c-11.2998 0 -20.8994 7.7998 -23.3994 18.5996l-24 104c-2.60059 11.4004 3.2002 22.9004 13.8994 27.5l112 48
+c9.80078 4.2002 21.2002 1.40039 28 -6.89941zM633.8 -10.0996c7 -5.40039 8.2998 -15.5 2.90039 -22.3008l-19.6006 -25.2998c-5.5 -7 -15.5 -8.2002 -22.5 -2.7998l-588.399 454.7c-7 5.39941 -8.2002 15.3994 -2.7998 22.3994l19.5996 25.2002
+c5.5 7 15.5 8.2002 22.5 2.7998l353.9 -273.5c18.0996 22.5 33.7998 46.7002 46 72.8008l-60.6006 49.5996c-8.2998 6.7002 -11.0996 18.2002 -6.89941 28l48 112c4.59961 10.5996 16.1992 16.5 27.5 13.9004l104 -24c10.8994 -2.5 18.5996 -12.2002 18.5996 -23.4004
+c0 -108.9 -38.0996 -208.4 -100.9 -287.5z" />
+    <glyph glyph-name="portrait" unicode="&#xf3e0;" horiz-adv-x="384" 
+d="M336 448c26.5 0 48 -21.5 48 -48v-416c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48h288zM192 320c-35.2998 0 -64 -28.7002 -64 -64s28.7002 -64 64 -64s64 28.7002 64 64s-28.7002 64 -64 64zM304 83.2002v19.2002
+c0 31.7998 -30.0996 57.5996 -67.2002 57.5996h-5c-12.2002 -5.09961 -25.7002 -8 -39.7998 -8s-27.5 2.90039 -39.7998 8h-5c-37.1006 0 -67.2002 -25.7998 -67.2002 -57.5996v-19.2002c0 -10.6006 10 -19.2002 22.4004 -19.2002h179.199
+c12.4004 0 22.4004 8.59961 22.4004 19.2002z" />
+    <glyph glyph-name="reply" unicode="&#xf3e5;" 
+d="M8.30859 258.164l176.005 151.985c15.4053 13.3047 39.6865 2.50391 39.6865 -18.1641v-80.0537c160.629 -1.83887 288 -34.0312 288 -186.258c0 -61.4404 -39.5811 -122.309 -83.333 -154.132c-13.6533 -9.93066 -33.1113 2.5332 -28.0771 18.6309
+c45.3438 145.012 -21.5068 183.51 -176.59 185.742v-87.915c0 -20.7002 -24.2998 -31.4531 -39.6865 -18.1641l-176.005 152c-11.0703 9.5625 -11.0859 26.7529 0 36.3281z" />
+    <glyph glyph-name="shield-alt" unicode="&#xf3ed;" 
+d="M466.5 364.3c17.7998 -7.39941 29.5 -24.8994 29.5 -44.2998c0 -221.3 -135.9 -344.6 -221.6 -380.3c-11.8008 -4.90039 -25.1006 -4.90039 -36.9004 0c-107 44.5996 -221.5 181.8 -221.5 380.3c0 19.4004 11.7002 36.9004 29.5996 44.2998l192 80
+c5.67578 2.35449 11.96 3.6543 18.4824 3.6543c6.52148 0 12.7432 -1.2998 18.418 -3.6543zM256.1 1.7002c93.7002 46.5996 172.5 156.3 175.801 307.7l-175.9 73.2998z" />
+    <glyph glyph-name="tablet-alt" unicode="&#xf3fa;" horiz-adv-x="448" 
+d="M400 448c26.5 0 48 -21.5 48 -48v-416c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v416c0 26.5 21.5 48 48 48h352zM224 -32c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM400 76v312
+c0 6.59961 -5.40039 12 -12 12h-328c-6.59961 0 -12 -5.40039 -12 -12v-312c0 -6.59961 5.40039 -12 12 -12h328c6.59961 0 12 5.40039 12 12z" />
+    <glyph glyph-name="tachometer-alt" unicode="&#xf3fd;" horiz-adv-x="576" 
+d="M288 416c159.06 0 288 -128.94 288 -288c0 -52.7998 -14.25 -102.26 -39.0596 -144.8c-5.61035 -9.62012 -16.3008 -15.2002 -27.4404 -15.2002h-443c-11.1396 0 -21.8301 5.58008 -27.4404 15.2002c-24.8096 42.54 -39.0596 92 -39.0596 144.8
+c0 159.06 128.94 288 288 288zM288 352c-17.6699 0 -31.9902 -14.3301 -31.9902 -32s14.3301 -32 32 -32c6.66992 0 12.5098 2.51953 17.6406 6.00977l9.21973 27.6699c0.80957 2.44043 2.33984 4.41016 3.4502 6.66992c-3.74023 13.5205 -15.6104 23.6504 -30.3203 23.6504
+zM96 64c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM144 224c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM390.77 296.41c4.18066 12.5703 -2.59961 26.1699 -15.1699 30.3594
+c-12.6299 4.28027 -26.1895 -2.60938 -30.3594 -15.1699l-61.3398 -184.01c-33.4004 -2.16016 -59.9004 -29.6494 -59.9004 -63.5898c0 -11.7197 3.37988 -22.5498 8.87988 -32h110.24c5.5 9.4502 8.87988 20.2803 8.87988 32c0 19.46 -8.87012 36.6699 -22.5596 48.4102z
+M405.43 239.21c5.68066 -8.94043 15.1904 -15.21 26.5703 -15.2197c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32c-3.91992 0 -7.58008 -0.94043 -11.0498 -2.23047zM480 64c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z
+" />
+    <glyph glyph-name="ticket-alt" unicode="&#xf3ff;" horiz-adv-x="576" 
+d="M128 288h320v-192h-320v192zM528 192c0 -26.5098 21.4902 -48 48 -48v-96c0 -26.5098 -21.4902 -48 -48 -48h-480c-26.5098 0 -48 21.4902 -48 48v96c26.5098 0 48 21.4902 48 48s-21.4902 48 -48 48v96c0 26.5098 21.4902 48 48 48h480c26.5098 0 48 -21.4902 48 -48
+v-96c-26.5098 0 -48 -21.4902 -48 -48zM480 296c0 13.2549 -10.7451 24 -24 24h-336c-13.2549 0 -24 -10.7451 -24 -24v-208c0 -13.2549 10.7451 -24 24 -24h336c13.2549 0 24 10.7451 24 24v208z" />
+    <glyph glyph-name="user-alt" unicode="&#xf406;" 
+d="M256 160c-79.5 0 -144 64.5 -144 144s64.5 144 144 144s144 -64.5 144 -144s-64.5 -144 -144 -144zM384 128c70.7002 0 128 -57.2998 128 -128v-16c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v16c0 70.7002 57.2998 128 128 128h55.0996
+c22.3008 -10.2002 46.9004 -16 72.9004 -16s50.7002 5.7998 72.9004 16h55.0996z" />
+    <glyph glyph-name="window-close" unicode="&#xf410;" 
+d="M464 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h416zM380.4 125.5l-67.1006 66.5l67.1006 66.5c4.7998 4.7998 4.7998 12.5996 0 17.4004l-40.5 40.5
+c-4.80078 4.7998 -12.6006 4.7998 -17.4004 0l-66.5 -67.1006l-66.5 67.1006c-4.7998 4.7998 -12.5996 4.7998 -17.4004 0l-40.5 -40.5c-4.7998 -4.80078 -4.7998 -12.6006 0 -17.4004l67.1006 -66.5l-67.1006 -66.5c-4.7998 -4.7998 -4.7998 -12.5996 0 -17.4004
+l40.5 -40.5c4.80078 -4.7998 12.6006 -4.7998 17.4004 0l66.5 67.1006l66.5 -67.1006c4.7998 -4.7998 12.5996 -4.7998 17.4004 0l40.5 40.5c4.7998 4.80078 4.7998 12.6006 0 17.4004z" />
+    <glyph glyph-name="compress-alt" unicode="&#xf422;" horiz-adv-x="448" 
+d="M4.68555 20.6855l99.3145 99.3145l-32.9219 31.0293c-15.1201 15.1201 -4.41211 40.9707 16.9697 40.9707h112c13.2549 0 23.9521 -10.7451 23.9521 -24v-112c0 -21.3818 -25.8027 -32.0898 -40.9219 -16.9707l-31.0781 32.9707l-99.3145 -99.3145
+c-6.24707 -6.24707 -16.3789 -6.24707 -22.627 0l-25.373 25.373c-6.24707 6.24805 -6.24707 16.3799 0 22.627zM443.314 363.314l-99.3145 -99.3145l32.9219 -31.0293c15.1201 -15.1201 4.41211 -40.9707 -16.9697 -40.9707h-112c-13.2549 0 -23.9521 10.7451 -23.9521 24
+v112c0 21.3818 25.8027 32.0898 40.9219 16.9707l31.0781 -32.9707l99.3145 99.3145c6.24707 6.24707 16.3789 6.24707 22.627 0l25.373 -25.373c6.24707 -6.24805 6.24707 -16.3799 0 -22.627z" />
+    <glyph glyph-name="expand-alt" unicode="&#xf424;" horiz-adv-x="448" 
+d="M212.686 132.686l-92.6855 -92.6855l32.9219 -31.0293c15.1201 -15.1201 4.41211 -40.9707 -16.9697 -40.9707h-112c-13.2549 0 -23.9521 10.7451 -23.9521 24v112c0 21.3818 25.8027 32.0898 40.9219 16.9707l31.0781 -32.9707l92.6855 92.6855
+c6.24805 6.24805 16.3799 6.24805 22.6279 0l25.3721 -25.3721c6.24902 -6.24805 6.24902 -16.3789 0 -22.6279zM235.314 251.314l92.6855 92.6855l-32.9219 31.0293c-15.1201 15.1201 -4.41211 40.9707 16.9697 40.9707h112c13.2549 0 23.9521 -10.7451 23.9521 -24v-112
+c0 -21.3818 -25.8027 -32.0898 -40.9219 -16.9707l-31.0781 32.9707l-92.6855 -92.6855c-6.24805 -6.24805 -16.3799 -6.24805 -22.6279 0l-25.3721 25.3721c-6.24902 6.24805 -6.24902 16.3789 0 22.6279z" />
+    <glyph glyph-name="baseball-ball" unicode="&#xf433;" horiz-adv-x="496" 
+d="M368.5 84.0996c12.9004 -26.6992 30.2998 -50.1992 51.4004 -70.5996c-44.6006 -43 -105.101 -69.5 -171.9 -69.5c-66.9004 0 -127.5 26.5996 -172 69.7002c21.2002 20.3994 38.5996 44 51.5 70.7002l-28.7998 13.8994c-11.1006 -23 -26.1006 -43.2998 -44.2998 -61
+c-34 42.4004 -54.4004 96.1006 -54.4004 154.7s20.4004 112.3 54.4004 154.8c17.7998 -17.2998 32.5 -37.0996 43.5 -59.3994l28.6992 14.0996c-12.7998 25.9004 -30 48.9004 -50.6992 68.7998c44.5996 43.1006 105.199 69.7002 172.1 69.7002
+c67 0 127.6 -26.7002 172.2 -69.7998c-20.7998 -20 -38 -43 -50.7998 -69l28.6992 -14.1006c11 22.4004 25.8008 42.2002 43.6006 59.5c33.7998 -42.3994 54.2002 -96.0996 54.2002 -154.6c0 -58.5996 -20.5 -112.4 -54.5 -154.9c-18.1006 17.7002 -33 38 -44.1006 60.9004z
+M140.2 116.1c17.2998 53.9004 14.2998 108.2 -0.700195 153.801l-30.4004 -10c13.3008 -40.2002 15.5 -87.6006 0.600586 -134zM356.5 269.5c-15 -45.5 -18 -99.7998 -0.700195 -153.8l30.5 9.7998c-14.8994 46.5 -12.5996 93.9004 0.600586 134z" />
+    <glyph glyph-name="basketball-ball" unicode="&#xf434;" horiz-adv-x="496" 
+d="M212.3 437.7c-1.5 -50 -17 -95.4004 -44.7998 -131.2l-77.4004 77.4004c36 29.6992 78.4004 47.5 122.2 53.7998zM248 226l-46.2998 46.2998c37.2002 45.4004 57.5 103.8 58.7002 167.7c51.8994 -2.59961 103.1 -21.0996 145.5 -56.0996zM56.0996 349.9l77.4004 -77.4004
+c-35.7002 -27.7998 -81.2002 -43.2998 -131.2 -44.7998c6.2998 43.7998 24.1006 86.2002 53.7998 122.2zM328.3 145.7l-46.2998 46.2998l157.9 157.9c35 -42.4004 53.5 -93.6006 56.0996 -145.5c-64 -1.30078 -122.4 -21.6006 -167.7 -58.7002zM248 158l46.2998 -46.2998
+c-37.0996 -45.2998 -57.3994 -103.7 -58.7002 -167.7c-51.8994 2.59961 -103.1 21.2002 -145.5 56.0996zM439.9 34.0996l-77.4004 77.4004c35.7002 27.7002 81.0996 43.2002 131.2 44.7998c-6.2998 -43.7998 -24.1006 -86.2002 -53.7998 -122.2zM167.7 238.3
+l46.2998 -46.2998l-157.9 -157.9c-35 42.4004 -53.5 93.6006 -56.0996 145.5c63.9004 1.10059 122.3 21.5 167.7 58.7002zM283.7 -53.7002c1.59961 50 17.0996 95.5 44.7998 131.2l77.4004 -77.4004c-36 -29.6992 -78.4004 -47.5 -122.2 -53.7998z" />
+    <glyph glyph-name="bowling-ball" unicode="&#xf436;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM120 256c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM184 352c0 -17.7002 14.2998 -32 32 -32s32 14.2998 32 32
+s-14.2998 32 -32 32s-32 -14.2998 -32 -32zM232 208c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32z" />
+    <glyph glyph-name="chess" unicode="&#xf439;" 
+d="M74 240l-33.9102 90.3799c-0.655273 1.74707 -1.01953 3.64551 -1.01953 5.62012c0 8.83105 7.16895 16 16 16h0.0195312h56.9102v32h-24c-4.41504 0 -8 3.58496 -8 8v16c0 4.41504 3.58496 8 8 8h24v24c0 4.41504 3.58496 8 8 8h16c4.41504 0 8 -3.58496 8 -8v-24h24
+c4.41504 0 8 -3.58496 8 -8v-16c0 -4.41504 -3.58496 -8 -8 -8h-24v-32h56.8896c0.00683594 0 0.0078125 -0.00683594 0.0146484 -0.00683594c8.83008 0 16 -7.16992 16 -16c0 -1.97461 -0.359375 -3.86621 -1.01465 -5.61328l-33.8896 -90.3799h10
+c8.83105 0 16 -7.16895 16 -16v-16c0 -8.83105 -7.16895 -16 -16 -16h-15.9404c0.142578 -44.1934 5.69141 -86.9287 15.9404 -128h-128c10.249 41.0713 15.7979 83.8066 15.9404 128h-15.9404c-8.83105 0 -16 7.16895 -16 16v16c0 8.83105 7.16895 16 16 16h10z
+M247.16 -11.5801c5.24805 -2.62598 8.83984 -8.0459 8.83984 -14.3096v-22.1104c0 -8.83105 -7.16895 -16 -16 -16h-224c-8.83105 0 -16 7.16895 -16 16v22.1104c0.000976562 6.26562 3.59668 11.6855 8.84961 14.3096l23.1504 11.5801v16c0 8.83105 7.16895 16 16 16h160
+c8.83105 0 16 -7.16895 16 -16v-16zM339.93 146.2l-24.5693 20.7998c-6.94434 5.86133 -11.3438 14.6143 -11.3604 24.4004v58.5996c0 3.31152 2.68848 6 6 6h26.3896c3.31152 0 6 -2.68848 6 -6v-26h24.71v26c0 3.31152 2.68848 6 6 6h53.8105c3.31152 0 6 -2.68848 6 -6
+v-26h24.71v26c0 3.31152 2.68848 6 6 6h26.3799c3.31152 0 6 -2.68848 6 -6v-58.54c0 -0.0107422 0.0185547 -0.0126953 0.0185547 -0.0234375c0 -9.79297 -4.40918 -18.5645 -11.3486 -24.4365l-24.5996 -20.79l3.29004 -82.21h-126.721zM384 144v-32h32v32
+c0 8.83105 -7.16895 16 -16 16s-16 -7.16895 -16 -16zM503.16 -11.5801c5.24805 -2.62598 8.83984 -8.0459 8.83984 -14.3096v-22.1104c0 -8.83105 -7.16895 -16 -16 -16h-192c-8.83105 0 -16 7.16895 -16 16v22.1104c0.000976562 6.26562 3.59668 11.6855 8.84961 14.3096
+l23.1504 11.5801v16c0 8.83105 7.16895 16 16 16h128c8.83105 0 16 -7.16895 16 -16v-16z" />
+    <glyph glyph-name="chess-bishop" unicode="&#xf43a;" horiz-adv-x="320" 
+d="M8 160.12c0 73.3799 59.8096 181.08 112.6 225.37c-14 3.41992 -24.5996 15.5098 -24.5996 30.5098c0 17.6611 14.3389 32 32 32h64c17.6611 0 32 -14.3389 32 -32c0 -15.0498 -10.5996 -27.0898 -24.5996 -30.5098c24.3994 -20.4902 50.0693 -54.6807 70.8691 -92.5898
+l-107.89 -107.931c-1.44727 -1.44727 -2.3418 -3.44922 -2.3418 -5.65625c0 -2.20605 0.894531 -4.20508 2.3418 -5.65332l11.3105 -11.3105c1.44727 -1.44629 3.44922 -2.3418 5.65527 -2.3418c2.20703 0 4.20605 0.895508 5.6543 2.3418l100.31 100.33
+c15.96 -35.46 26.6904 -71.9492 26.6904 -102.56c0 -51.6006 -22.1396 -73.8301 -56 -84.6006v-43.5195h-192v43.5195c-33.8604 10.7705 -56 32.9609 -56 84.6006zM304 0c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-288
+c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h288z" />
+    <glyph glyph-name="chess-board" unicode="&#xf43c;" 
+d="M255.9 447.8v-64h-64v64h64zM0 383.83h64v-64h-64v64zM128 447.8v-64h-64v64h64zM192 191.9h64v-64h-64v64zM0 255.88h64v-64h-64v64zM383.85 447.8v-64h-64v64h64zM511.85 447.8v-64h-64v64h64zM128 191.9v-64h-64v64h64zM511.8 0h-64v64h64v-64zM511.8 128h-64v64h64
+v-64zM383.85 -64v64h64v-64h-64zM511.85 255.88h-64v64h64v-64zM128 -64v64h64v-64h-64zM0 -64v64h64v-64h-64zM255.9 -64v64h64v-64h-64zM0 127.93h64v-64h-64v64zM319.88 319.85h-64v64h64v-64zM255.88 191.85v64h64v-64h-64zM191.88 63.8496h64v-64h-64v64z
+M319.88 127.85v64h64v-64h-64zM319.88 255.8v64h64v-64h-64zM319.88 63.8701h64v-64h-64v64zM64 63.9502h64v-64h-64v64zM192 319.85h-64v64h64v-64zM383.92 63.9502v64h64v-64h-64zM255.92 255.88h-64v64h64v-64zM383.92 383.83h64v-64h-64v64zM255.92 127.93h64v-64h-64
+v64zM191.92 255.88l0.0800781 -64h-64v64h63.9199zM383.84 191.88v64h64v-64h-64zM128 319.85v-64h-64v64h64zM128 127.93h64v-64h-64v64z" />
+    <glyph glyph-name="chess-king" unicode="&#xf43f;" horiz-adv-x="448" 
+d="M400 0c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-352c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h352zM416 288c17.6494 -0.0136719 31.9688 -14.3477 31.9688 -32.001c0 -3.32129 -0.507812 -6.52539 -1.44922 -9.53906
+l-73.0791 -214.46h-298.881l-73.0791 214.46c-0.941406 3.01367 -1.45508 6.21875 -1.45508 9.54004c0 17.6533 14.3252 31.9863 31.9746 32h160v48h-40c-4.41504 0 -8 3.58496 -8 8v48c0 4.41504 3.58496 8 8 8h40v40c0 4.41504 3.58496 8 8 8h48
+c4.41504 0 8 -3.58496 8 -8v-40h40c4.41504 0 8 -3.58496 8 -8v-48c0 -4.41504 -3.58496 -8 -8 -8h-40v-48h160z" />
+    <glyph glyph-name="chess-knight" unicode="&#xf441;" horiz-adv-x="384" 
+d="M19 175.53c-11.2041 4.98145 -19 16.1963 -19 29.2393v0.0205078v137.21c0 0.0195312 -0.00292969 0.0419922 -0.00292969 0.0625c0 6.60742 2.67578 12.5957 7.00293 16.9375l9 9l-14.21 28.4199c-1.13867 2.27344 -1.79004 4.85547 -1.79004 7.56934v0.0107422
+c0 6.62305 5.37695 12 12 12h147.94c106 0 191.92 -86 191.92 -192v-192h-319.86v14.5195c0 0.0078125 -0.078125 -0.03125 -0.078125 -0.0244141c0 31.3145 18.0312 58.4512 44.2686 71.585l57.2197 28.6504c15.751 7.87695 26.5303 24.1348 26.5303 42.9297v0.00976562
+v50.3301l-22.1201 -11.0801c-6.19238 -3.09668 -10.8369 -8.78906 -12.5508 -15.6504l-9.21973 -30.6494c-2.81152 -9.35645 -9.77051 -16.9043 -18.7598 -20.5l-12.7803 -5.12012c-3.66895 -1.46777 -7.7168 -2.27246 -11.9082 -2.27246
+c-4.61621 0 -9.00586 0.979492 -12.9717 2.74219zM52 320c-11.0381 0 -20 -8.96191 -20 -20s8.96191 -20 20 -20s20 8.96191 20 20s-8.96191 20 -20 20zM368 0c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-352c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h352z" />
+    <glyph glyph-name="chess-pawn" unicode="&#xf443;" horiz-adv-x="320" 
+d="M105.1 224c-29.3896 18.3799 -49.0996 50.7803 -49.0996 88c0 57.3994 46.6006 104 104 104s104 -46.6006 104 -104c0 -37.2197 -19.71 -69.6201 -49.0996 -88h25.0996c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-16v-5.49023
+c0 -44 4.11035 -86.5996 24 -122.51h-176c19.8604 35.9102 24 78.5098 24 122.51v5.49023h-16c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h25.0996zM304 0c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-288
+c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h288z" />
+    <glyph glyph-name="chess-queen" unicode="&#xf445;" 
+d="M256 336c-30.9072 0 -56 25.0928 -56 56s25.0928 56 56 56s56 -25.0928 56 -56s-25.0928 -56 -56 -56zM432 0c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-352c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h352zM504.87 263.84
+c4.30566 -2.86816 7.11914 -7.77344 7.11914 -13.3311c0 -2.56445 -0.604492 -4.98926 -1.67969 -7.13867l-102.55 -211.37h-303.52l-102.55 211.33c-1.0752 2.14941 -1.70508 4.58008 -1.70508 7.14453c0 5.55762 2.83887 10.457 7.14453 13.3252l28.5703 16
+c7.35938 4.91016 16.8096 2.5498 22.0898 -4.54004c8.6543 -11.709 22.4922 -19.2686 38.1572 -19.2686c1.13672 0 2.26562 0.0400391 3.38281 0.119141c25.6699 1.73926 44.6699 24.7998 44.6699 50.4893c0 7.39648 6.00391 13.4004 13.4004 13.4004h38.7695
+c6.04004 0 11.6104 -3.99023 12.8604 -9.91016c4.57715 -21.7363 23.8789 -38.0752 46.9688 -38.0752s42.3936 16.3389 46.9707 38.0752c1.25 5.91016 6.86035 9.91016 12.8604 9.91016h38.7695c7.39648 0 13.4004 -6.00391 13.4004 -13.4004
+c0 -23.5293 15.7002 -45.46 38.8398 -49.75c2.95898 -0.576172 5.9541 -0.918945 9.08105 -0.918945c15.6064 0 29.4688 7.5293 38.1494 19.1494c5.37988 7.13965 14.8496 9.67969 22.29 4.67969z" />
+    <glyph glyph-name="chess-rook" unicode="&#xf447;" horiz-adv-x="384" 
+d="M368 416c8.83105 0 16 -7.16895 16 -16v-176l-64 -32c0 -47.7197 1.54004 -95 13.21 -160h-282.42c11.6699 65 13.21 111.67 13.21 160l-64 32v176c0 8.83105 7.16895 16 16 16h56.0996c8.83105 0 16 -7.16895 16 -16v-48h47.9004v48c0 8.83105 7.16895 16 16 16h80
+c8.83105 0 16 -7.16895 16 -16v-48h48v48c0 8.83105 7.16895 16 16 16h56zM224 128v64c0 17.6611 -14.3389 32 -32 32s-32 -14.3389 -32 -32v-64h64zM368 0c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-352c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h352z" />
+    <glyph glyph-name="dumbbell" unicode="&#xf44b;" horiz-adv-x="640" 
+d="M104 352c13.2998 0 24 -10.7002 24 -24v-272c0 -13.2998 -10.7002 -24 -24 -24h-48c-13.2998 0 -24 10.7002 -24 24v104h-24c-4.40039 0 -8 3.59961 -8 8v48c0 4.40039 3.59961 8 8 8h24v104c0 13.2998 10.7002 24 24 24h48zM632 224c4.40039 0 8 -3.59961 8 -8v-48
+c0 -4.40039 -3.59961 -8 -8 -8h-24v-104c0 -13.2998 -10.7002 -24 -24 -24h-48c-13.2998 0 -24 10.7002 -24 24v272c0 13.2998 10.7002 24 24 24h48c13.2998 0 24 -10.7002 24 -24v-104h24zM456 416c13.2998 0 24 -10.7002 24 -24v-400c0 -13.2998 -10.7002 -24 -24 -24h-48
+c-13.2998 0 -24 10.7002 -24 24v168h-128v-168c0 -13.2998 -10.7002 -24 -24 -24h-48c-13.2998 0 -24 10.7002 -24 24v400c0 13.2998 10.7002 24 24 24h48c13.2998 0 24 -10.7002 24 -24v-168h128v168c0 13.2998 10.7002 24 24 24h48z" />
+    <glyph glyph-name="football-ball" unicode="&#xf44e;" horiz-adv-x="496" 
+d="M481.5 387.7c6.2998 -23.9004 13.7002 -61 14.5 -104.5l-156.6 156.8c43.5996 -0.900391 80.8994 -8.5 104.8 -14.9004c18.2002 -4.89941 32.5 -19.1992 37.2998 -37.3994zM14.5 -3.7002c-6.2998 23.9004 -13.7002 61 -14.5 104.5l156.6 -156.8
+c-43.5996 0.900391 -80.8994 8.5 -104.8 14.9004c-18.2002 4.89941 -32.5 19.1992 -37.2998 37.3994zM4.2002 164.6c22.5996 152.7 138.899 252 271.399 271.4l216.301 -216.6c-22.7002 -152.7 -139 -252 -271.5 -271.4zM321.5 288.2l-28.2998 -28.5l-28.2998 28.2998
+c-3.10059 3.09961 -8.2002 3.09961 -11.3008 0l-11.2998 -11.2998c-3.09961 -3.10059 -3.09961 -8.2002 0 -11.2998l28.2998 -28.3008l-22.5996 -22.5996l-28.2998 28.2998c-3.10059 3.10059 -8.2002 3.10059 -11.2998 0l-11.3008 -11.2998
+c-3.09961 -3.09961 -3.09961 -8.2002 0 -11.2998l28.3008 -28.2998l-22.6006 -22.6006l-28.2998 28.2998c-3.09961 3.10059 -8.2002 3.10059 -11.2998 0l-11.2998 -11.2998c-3.10059 -3.09961 -3.10059 -8.2002 0 -11.2998l28.2998 -28.2002l-28.2998 -28.2998
+c-3.10059 -3.09961 -3.10059 -8.2002 0 -11.2998l11.2998 -11.2998c3.09961 -3.10059 8.2002 -3.10059 11.2998 0l28.2998 28.2998l28.2998 -28.2998c3.10059 -3.10059 8.2002 -3.10059 11.3008 0l11.2998 11.2998c3.09961 3.09961 3.09961 8.2002 0 11.2998
+l-28.2998 28.2998l22.5996 22.6006l28.2998 -28.3008c3.10059 -3.09961 8.2002 -3.09961 11.2998 0l11.3008 11.3008c3.09961 3.09961 3.09961 8.19922 0 11.2998l-28.3008 28.2998l22.6006 22.7002l28.2998 -28.2998c3.09961 -3.10059 8.2002 -3.10059 11.2998 0
+l11.2998 11.2998c3.10059 3.09961 3.10059 8.2002 0 11.2998l-28.2998 28.2998l28.2998 28.2998c3.10059 3.10059 3.10059 8.2002 0 11.3008l-11.2998 11.2998c-3.09961 3.09961 -8.2002 3.09961 -11.2998 0z" />
+    <glyph glyph-name="golf-ball" unicode="&#xf450;" horiz-adv-x="416" 
+d="M96 32h224c0 -17.7002 -14.2998 -32 -32 -32h-16c-17.7002 0 -32 -14.2998 -32 -32v-20c0 -6.59961 -5.40039 -12 -12 -12h-40c-6.59961 0 -12 5.40039 -12 12v20c0 17.7002 -14.2998 32 -32 32h-16c-17.7002 0 -32 14.2998 -32 32zM416 240
+c0 -74.2002 -39 -139.2 -97.5 -176h-221c-58.5 36.7998 -97.5 101.8 -97.5 176c0 114.9 93.0996 208 208 208s208 -93.0996 208 -208zM235.9 196.1c18.2998 0 33.0996 14.8008 33.0996 33.1006c0 14.3994 -9.2998 26.2998 -22.0996 30.8994
+c9.59961 -26.7998 -15.6006 -51.2998 -41.9004 -41.8994c4.59961 -12.7998 16.5 -22.1006 30.9004 -22.1006zM285 149.2c0 14.3994 -9.2998 26.2998 -22.0996 30.8994c9.59961 -26.7998 -15.6006 -51.2998 -41.9004 -41.8994
+c4.59961 -12.7998 16.5 -22.1006 30.9004 -22.1006c18.2998 0 33.0996 14.9004 33.0996 33.1006zM349 213.2c0 14.3994 -9.2998 26.2998 -22.0996 30.8994c9.59961 -26.7998 -15.6006 -51.2998 -41.9004 -41.8994c4.59961 -12.7998 16.5 -22.1006 30.9004 -22.1006
+c18.2998 0 33.0996 14.9004 33.0996 33.1006z" />
+    <glyph glyph-name="hockey-puck" unicode="&#xf453;" 
+d="M0 288c0 53 114.6 96 256 96s256 -43 256 -96s-114.6 -96 -256 -96s-256 43 -256 96zM0 205.8c113.5 -82.3994 398.6 -82.2998 512 0v-109.8c0 -53 -114.6 -96 -256 -96s-256 43 -256 96v109.8z" />
+    <glyph glyph-name="quidditch" unicode="&#xf458;" horiz-adv-x="640" 
+d="M256.5 231.2l86.7002 -109.2s-16.6006 -102.4 -76.6006 -150.1c-59.8994 -47.7002 -266.6 -34.1006 -266.6 -34.1006s3.7998 23.1006 11 55.4004l94.5996 112.2c4 4.69922 -0.899414 11.5996 -6.59961 9.5l-60.4004 -22.1006c14.4004 41.7002 32.7002 80 54.6006 97.5
+c59.8994 47.7998 163.3 40.9004 163.3 40.9004zM494.5 96.2002c44 0 79.7998 -35.7002 79.7998 -79.9004c0 -44.0996 -35.7002 -79.8994 -79.7998 -79.8994s-79.7998 35.7998 -79.7998 79.8994c0 44.1006 35.7998 79.9004 79.7998 79.9004zM636.5 417
+c5.5 -6.90039 4.40039 -17 -2.5 -22.5l-232.5 -177.9l34.0996 -42.8994c5.10059 -6.40039 1.7002 -15.9004 -6.2998 -17.6006l-58.7998 -12.3994l-86.7002 109.2l25.2998 54.5996c3.5 7.40039 13.5 8.59961 18.6006 2.2002l34.0996 -43l232.5 177.899
+c6.90039 5.40039 16.9004 4.30078 22.4004 -2.59961z" />
+    <glyph glyph-name="square-full" unicode="&#xf45c;" 
+d="M512 -64h-512v512h512v-512z" />
+    <glyph glyph-name="table-tennis" unicode="&#xf45d;" 
+d="M496.2 151.5c-64.1006 43.2002 -149.5 27.9004 -195.601 -34.2002l-211.5 211.5l56 56.1006c83.9004 84.0996 220 84.0996 303.9 0c63 -63.1006 78.7002 -155.601 47.2002 -233.4zM278.3 71.7998c-3.7002 -12.7002 -6.2998 -25.8994 -6.2002 -39.7002
+c0 -19.5 3.90039 -38.0996 11 -55.0996c-25.6992 2.7998 -50.5996 13.5996 -70.2998 33.2998l-35.7002 35.7002l-89.2998 -103.3c-7.5 -8.60059 -20.7002 -9.10059 -28.7002 -1l-53.3994 53.5c-8.10059 8.09961 -7.60059 21.2998 1 28.7998l103 89.4004l-34.5 34.5996
+c-39 39.0996 -44.6006 98.7998 -17.2998 144.1zM416 128c53 0 96 -43 96 -96s-43 -96 -96 -96s-96 43 -96 96s43 96 96 96z" />
+    <glyph glyph-name="volleyball-ball" unicode="&#xf45f;" 
+d="M231.39 204.52c-70.1855 -43.1172 -122.835 -111.301 -146.1 -192.199c-24.0918 22.8398 -43.4365 50.252 -56.9004 81.0996c22.8008 94.4004 89.5 174.4 180.301 216.8c13.8145 -32.4951 21.9121 -68.375 22.6992 -105.7zM194.49 338.92
+c-84 -39.5 -149 -108.4 -182.4 -191.5c-19.7998 109.3 34 212.4 125 262.2c22.8408 -20.3574 42.0732 -43.9951 57.4004 -70.7002zM382.09 173.82c-36.7021 4.46582 -71.8574 16.1094 -102.899 33.1797c-2.36035 86.3154 -37.5332 164.725 -93.5 222.72
+c47.2998 14 84.1992 10.2002 98.8994 8.5c70.2002 -66.8994 106.101 -164.6 97.5 -264.399zM257.39 164.32c49.7002 -26.8008 104 -40.8008 158.601 -40.9004c27.9346 0.173828 54.9697 3.79297 80.8994 10.4004c-7.93359 -32.9053 -22.5615 -63.5879 -42.1992 -89.9004
+c-93 -27.2998 -195.5 -9.5 -277.5 47.7998c21.9443 29.166 48.8877 53.5898 80.1992 72.6006zM159.09 64.6201c53.6006 -37.2998 144 -78.2002 256.9 -62.1006c-43.0684 -36.5068 -99.1953 -58.4424 -160.021 -58.4424c-47.2529 0 -91.4258 13.2939 -128.979 36.3428
+c6.39941 29.7998 16.8994 58.2002 32.0996 84.2002zM339.39 425.22c95.9004 -34.2998 164.601 -125.6 164.601 -233.399c0 -2 -0.299805 -4 -0.299805 -6c-28.0381 -9.1709 -57.998 -14.2012 -89.083 -14.2012c-0.206055 0 -0.412109 0 -0.617188 0.000976562
+c7.89941 92.3994 -19.2998 183.2 -74.6006 253.6z" />
+    <glyph glyph-name="allergies" unicode="&#xf461;" horiz-adv-x="448" 
+d="M416 336c17.5996 0 32 -14.4004 32 -32v-176.1c-0.200195 -14 -1.90039 -28.6006 -5.09961 -42.3008l-26.5 -112.699c-5.10059 -21.7002 -24.4004 -37 -46.7002 -37h-197.601c-15.2998 0 -29.7998 7.39941 -38.7998 19.7998l-125.6 172.7
+c-13 17.8994 -9.10059 42.8994 8.7998 55.8994s42.9004 9.10059 55.9004 -8.7998l23.5996 -32.5v241c0 17.5996 14.4004 32 32 32s32 -14.4004 32 -32v-152c0 -4.40039 3.59961 -8 8 -8h16c4.40039 0 8 3.59961 8 8v184c0 17.5996 14.4004 32 32 32s32 -14.4004 32 -32v-184
+c0 -4.40039 3.59961 -8 8 -8h16c4.40039 0 8 3.59961 8 8v152c0 17.5996 14.4004 32 32 32s32 -14.4004 32 -32v-152c0 -4.40039 3.59961 -8 8 -8h16c4.40039 0 8 3.59961 8 8v72c0 17.5996 14.4004 32 32 32zM176 32c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16
+s-16 -7.2002 -16 -16s7.2002 -16 16 -16zM176 128c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16zM240 0c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16zM240 96c8.7998 0 16 7.2002 16 16
+s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16zM304 64c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16zM336 0c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16zM368 128
+c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16z" />
+    <glyph glyph-name="band-aid" unicode="&#xf462;" horiz-adv-x="640" 
+d="M0 288c0 35.2998 28.7002 64 64 64h96v-320h-96c-35.2998 0 -64 28.7002 -64 64v192zM576 352c35.2998 0 64 -28.7002 64 -64v-192c0 -35.2998 -28.7002 -64 -64 -64h-96v320h96zM192 32v320h256v-320h-256zM368 264c-13.2998 0 -24 -10.7002 -24 -24s10.7002 -24 24 -24
+s24 10.7002 24 24s-10.7002 24 -24 24zM368 168c-13.2998 0 -24 -10.7002 -24 -24s10.7002 -24 24 -24s24 10.7002 24 24s-10.7002 24 -24 24zM272 264c-13.2998 0 -24 -10.7002 -24 -24s10.7002 -24 24 -24s24 10.7002 24 24s-10.7002 24 -24 24zM272 168
+c-13.2998 0 -24 -10.7002 -24 -24s10.7002 -24 24 -24s24 10.7002 24 24s-10.7002 24 -24 24z" />
+    <glyph glyph-name="box" unicode="&#xf466;" 
+d="M509.5 263.4c0.799805 -2.40039 0.799805 -4.90039 1.2002 -7.40039h-238.7v192h141.4c20.6992 0 39 -13.2002 45.5 -32.7998zM240 448v-192h-238.7c0.400391 2.5 0.400391 5 1.2002 7.40039l50.5996 151.8c6.5 19.5996 24.8008 32.7998 45.5 32.7998h141.4zM0 224h512
+v-240c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v240z" />
+    <glyph glyph-name="boxes" unicode="&#xf468;" horiz-adv-x="576" 
+d="M560 160c8.7998 0 16 -7.2002 16 -16v-192c0 -8.7998 -7.2002 -16 -16 -16h-224c-8.7998 0 -16 7.2002 -16 16v192c0 8.7998 7.2002 16 16 16h80v-96l32 21.2998l32 -21.2998v96h80zM176 224c-8.7998 0 -16 7.2002 -16 16v192c0 8.7998 7.2002 16 16 16h80v-96
+l32 21.2998l32 -21.2998v96h80c8.7998 0 16 -7.2002 16 -16v-192c0 -8.7998 -7.2002 -16 -16 -16h-224zM240 160c8.7998 0 16 -7.2002 16 -16v-192c0 -8.7998 -7.2002 -16 -16 -16h-224c-8.7998 0 -16 7.2002 -16 16v192c0 8.7998 7.2002 16 16 16h80v-96l32 21.2998
+l32 -21.2998v96h80z" />
+    <glyph glyph-name="briefcase-medical" unicode="&#xf469;" 
+d="M464 320c26.5 0 48 -21.5 48 -48v-288c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v288c0 26.5 21.5 48 48 48h80v48c0 26.5 21.5 48 48 48h160c26.5 0 48 -21.5 48 -48v-48h80zM192 352v-32h128v32h-128zM352 104v48c0 4.40039 -3.59961 8 -8 8h-56v56
+c0 4.40039 -3.59961 8 -8 8h-48c-4.40039 0 -8 -3.59961 -8 -8v-56h-56c-4.40039 0 -8 -3.59961 -8 -8v-48c0 -4.40039 3.59961 -8 8 -8h56v-56c0 -4.40039 3.59961 -8 8 -8h48c4.40039 0 8 3.59961 8 8v56h56c4.40039 0 8 3.59961 8 8z" />
+    <glyph glyph-name="burn" unicode="&#xf46a;" horiz-adv-x="384" 
+d="M192 448c111.8 -100.9 192 -220.6 192 -300.5c0 -124.5 -79 -211.5 -192 -211.5s-192 87 -192 211.5c0 79.5996 79.7002 199.2 192 300.5zM192 0c56.5 0 96 39 96 94.7998c0 13.5 -4.59961 61.5 -96 161.2c-91.4004 -99.7002 -96 -147.7 -96 -161.2
+c0 -55.7998 39.5 -94.7998 96 -94.7998z" />
+    <glyph glyph-name="capsules" unicode="&#xf46b;" horiz-adv-x="576" 
+d="M555.3 147.9c36.2002 -51.7002 23.7002 -123 -28 -159.2c-20 -14 -42.7998 -20.7002 -65.5 -20.7002c-36.0996 0 -71.5996 17 -93.7998 48.7998l-131.2 187.3c-5.5 7.90039 -9.5 16.4004 -12.7998 25v-149.1c0 -61.9004 -50.0996 -112 -112 -112s-112 50.0996 -112 112
+v224c0 61.9004 50.0996 112 112 112c60 0 108.5 -47.2002 111.4 -106.5c7.7998 21 21.7998 40 41.5 53.7998c20 14 42.8994 20.7002 65.5 20.7002c36 0 71.5 -17 93.7998 -48.7998zM160 192v112c0 26.5 -21.5 48 -48 48s-48 -21.5 -48 -48v-112h96zM354.8 147.1
+l82.5 57.7002l-65.5996 93.7002c-9.40039 13.5 -24.7998 21.5 -41.2998 21.5c-10.3008 0 -20.3008 -3.09961 -28.8008 -9.09961c-11 -7.7002 -18.3994 -19.3008 -20.6992 -32.5c-2.40039 -13.2002 0.599609 -26.6006 8.2998 -37.6006z" />
+    <glyph glyph-name="clipboard-check" unicode="&#xf46c;" horiz-adv-x="384" 
+d="M336 384c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h80c0 35.2998 28.7002 64 64 64s64 -28.7002 64 -64h80zM192 408c-13.2998 0 -24 -10.7002 -24 -24s10.7002 -24 24 -24s24 10.7002 24 24
+s-10.7002 24 -24 24zM313.2 176.2c4.7002 4.7002 4.7998 12.2002 0.0996094 17l-28.2002 28.3994c-4.69922 4.7002 -12.2998 4.80078 -17 0.100586l-106 -105.2l-46 46.4004c-4.69922 4.69922 -12.2998 4.7998 -17 0.0996094l-28.3994 -28.2002
+c-4.7002 -4.7002 -4.7998 -12.2998 -0.100586 -17l82.6006 -83.2998c4.7002 -4.7002 12.2998 -4.7998 17 -0.0996094z" />
+    <glyph glyph-name="clipboard-list" unicode="&#xf46d;" horiz-adv-x="384" 
+d="M336 384c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h80c0 35.2998 28.7002 64 64 64s64 -28.7002 64 -64h80zM96 24c13.2998 0 24 10.7002 24 24s-10.7002 24 -24 24s-24 -10.7002 -24 -24
+s10.7002 -24 24 -24zM96 120c13.2998 0 24 10.7002 24 24s-10.7002 24 -24 24s-24 -10.7002 -24 -24s10.7002 -24 24 -24zM96 216c13.2998 0 24 10.7002 24 24s-10.7002 24 -24 24s-24 -10.7002 -24 -24s10.7002 -24 24 -24zM192 408c-13.2998 0 -24 -10.7002 -24 -24
+s10.7002 -24 24 -24s24 10.7002 24 24s-10.7002 24 -24 24zM320 40v16c0 4.40039 -3.59961 8 -8 8h-144c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h144c4.40039 0 8 3.59961 8 8zM320 136v16c0 4.40039 -3.59961 8 -8 8h-144
+c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h144c4.40039 0 8 3.59961 8 8zM320 232v16c0 4.40039 -3.59961 8 -8 8h-144c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h144c4.40039 0 8 3.59961 8 8z" />
+    <glyph glyph-name="diagnoses" unicode="&#xf470;" horiz-adv-x="640" 
+d="M496 192c-8.7998 0 -16 7.2002 -16 16s7.2002 16 16 16s16 -7.2002 16 -16s-7.2002 -16 -16 -16zM320 272c-48.5 0 -88 39.5 -88 88s39.5 88 88 88s88 -39.5 88 -88s-39.5 -88 -88 -88zM59.7998 84l-17.7002 26.7002c-8.7998 13.2998 -7.59961 34.5996 10 45.0996
+c7.40039 4.40039 17.5 10 28.7002 16c31.6006 -27.2998 79 -4.2002 79.2002 36c47.0996 17.7002 103 32.2002 160 32.2002c45.0996 0 89.2998 -9.2002 129.2 -21.7998c-11.7002 -52.9004 59.5996 -81.2002 87.7002 -35.1006
+c21.3994 -10.3994 39.1992 -20.2998 51.0996 -27.3994c17.5996 -10.5 18.7998 -31.9004 10 -45.1006l-17.7998 -26.6992c-10.2002 -15.1006 -29.2998 -17.8008 -42.9004 -9.80078c-16.2002 9.60059 -56.2002 31.8008 -105.3 48.6006v-90.7002h-224v90.7998
+c-49.0996 -16.8994 -89.0996 -39 -105.3 -48.5996c-13.6006 -8 -32.7002 -5.5 -42.9004 9.7998zM368 104c-13.2998 0 -24 -10.7002 -24 -24s10.7002 -24 24 -24s24 10.7002 24 24s-10.7002 24 -24 24zM272 200c-13.2998 0 -24 -10.7002 -24 -24s10.7002 -24 24 -24
+s24 10.7002 24 24s-10.7002 24 -24 24zM112 192c-8.7998 0 -16 7.2002 -16 16s7.2002 16 16 16s16 -7.2002 16 -16s-7.2002 -16 -16 -16zM624 0c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-608c-8.7998 0 -16 7.2002 -16 16v32
+c0 8.7998 7.2002 16 16 16h608z" />
+    <glyph glyph-name="dna" unicode="&#xf471;" horiz-adv-x="448" 
+d="M0.0996094 -46.0996c5.2002 42.8994 31.4004 153.899 159.9 238.1c-128.6 84.2002 -154.7 195.2 -159.9 238.1c-1.09961 9.5 6.40039 17.8008 16 17.8008l32.3008 0.0996094c8.09961 0.0996094 14.8994 -5.90039 16 -13.9004
+c0.699219 -5 1.7998 -11.0996 3.39941 -18.0996h312.4c1.59961 7 2.7002 13.2002 3.39941 18.0996c1.10059 8 7.90039 13.9004 16 13.9004l32.4004 -0.0996094c9.59961 0 17 -8.30078 15.9004 -17.8008c-5.80078 -47.8994 -37.4004 -181.199 -209.5 -266.699
+c-31.7002 -15.8008 -57.4004 -33.3008 -78.7002 -51.4004h127.6c-5.59961 4.7998 -10.7998 9.59961 -17 14.2002c21.4004 11.2002 40.9004 23 58.5 35.3994c93.2998 -78.6992 114.3 -169.8 118.9 -207.699c1.2002 -9.5 -6.2998 -17.8008 -15.9004 -17.8008
+l-32.2998 -0.0996094c-8.09961 -0.0996094 -14.9004 5.90039 -16 13.9004c-0.599609 4.89941 -1.90039 11.1992 -3.5 18.0996h-312.3c-1.60059 -7 -2.7002 -13.2002 -3.40039 -18.0996c-1.09961 -8 -7.89941 -13.9004 -16 -13.9004l-32.2998 0.0996094
+c-9.59961 0 -17 8.30078 -15.9004 17.8008zM224 228.4c25.0996 13.5996 46.4004 28.3994 64.2002 43.5996h-128.5c17.8994 -15.2002 39.2002 -29.9004 64.2998 -43.5996zM355.1 352h-262.1c5.7002 -10.4004 12.7002 -21.0996 21 -32h220.1
+c8.2002 10.9004 15.2002 21.5996 21 32zM92.9004 32h261.6c-5.7998 10.4004 -12.9004 21.0996 -21.2002 32h-219.399c-8.2002 -10.9004 -15.2002 -21.5996 -21 -32z" />
+    <glyph glyph-name="dolly" unicode="&#xf472;" horiz-adv-x="576" 
+d="M294.2 170.3l-53 159.4c-2.7998 8.2998 1.7002 17.3994 10.0996 20.2002l61.6006 20.5l33.0996 -99.4004l60.7002 20.0996l-33.1006 99.4004l61.1006 20.4004c8.2998 2.7998 17.3994 -1.7002 20.2002 -10.1006l60.3994 -181.2
+c2.7998 -8.2998 -1.7002 -17.3994 -10.0996 -20.1992l-161.5 -53.8008c-14.7998 11.3008 -31.5 19.7002 -49.5 24.7002zM575.2 121.6c2.7998 -8.39941 -1.7998 -17.3994 -10.1006 -20.1992l-213.3 -71.2002c-1.09961 -57.7998 -53.2002 -103.3 -113.399 -92.6006
+c-39.4004 6.90039 -71.2002 39.8008 -77.3008 79.2002c-5.69922 36.9004 9.90039 70.1006 36 90.5l-92.1992 276.7h-88.9004c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h112c13.7998 0 26 -8.7998 30.4004 -21.9004l99.3994 -298.199
+c29.9004 -0.600586 56.2998 -15 73.5 -37l213.5 71.1992c8.2998 2.80078 17.4004 -1.69922 20.2002 -10.0996zM256 -16c26.5 0 48 21.5 48 48s-21.5 48 -48 48s-48 -21.5 -48 -48s21.5 -48 48 -48z" />
+    <glyph glyph-name="dolly-flatbed" unicode="&#xf474;" horiz-adv-x="640" 
+d="M208 128c-8.7998 0 -16 7.2002 -16 16v256c0 8.7998 7.2002 16 16 16h144v-128l48 32l48 -32v128h144c8.7998 0 16 -7.2002 16 -16v-256c0 -8.7998 -7.2002 -16 -16 -16h-384zM624 64c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-82.7998
+c1.7002 -5 2.89941 -10.4004 2.89941 -16c0 -26.5 -21.5 -48 -48 -48s-48 21.5 -48 48c0 5.59961 1.10059 11 2.90039 16h-197.9c1.7002 -5 2.90039 -10.4004 2.90039 -16c0 -26.5 -21.5 -48 -48 -48s-48 21.5 -48 48c0 5.59961 1.09961 11 2.90039 16h-82.9004
+c-8.7998 0 -16 7.2002 -16 16v368h-48c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h96c8.7998 0 16 -7.2002 16 -16v-368h496z" />
+    <glyph glyph-name="file-medical" unicode="&#xf477;" horiz-adv-x="384" 
+d="M377 343c4.5 -4.5 7 -10.5996 7 -16.9004v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7zM224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136z
+M288 152c0 4.40039 -3.59961 8 -8 8h-56v56c0 4.40039 -3.59961 8 -8 8h-48c-4.40039 0 -8 -3.59961 -8 -8v-56h-56c-4.40039 0 -8 -3.59961 -8 -8v-48c0 -4.40039 3.59961 -8 8 -8h56v-56c0 -4.40039 3.59961 -8 8 -8h48c4.40039 0 8 3.59961 8 8v56h56
+c4.40039 0 8 3.59961 8 8v48z" />
+    <glyph glyph-name="file-medical-alt" unicode="&#xf478;" horiz-adv-x="448" 
+d="M288 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v168h70.0996l34.8008 -69.5c2.89941 -5.90039 11.3994 -5.90039 14.2998 0l56.7998 113.7l22.0996 -44.2002h89.9004c8.7998 0 16 7.2002 16 16
+s-7.2002 16 -16 16h-70.2002l-34.7002 69.5c-2.89941 5.90039 -11.3994 5.90039 -14.2998 0l-56.7998 -113.7l-19.9004 39.7998c-1.39941 2.7002 -4.19922 4.40039 -7.19922 4.40039h-140.9c-4.40039 0 -8 3.59961 -8 8v16c0 4.40039 3.59961 8 8 8h56v232
+c0 13.2998 10.7002 24 24 24h200v-136zM441 343c4.5 -4.5 7 -10.5996 7 -16.9004v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7z" />
+    <glyph glyph-name="first-aid" unicode="&#xf479;" horiz-adv-x="576" 
+d="M0 368c0 26.5 21.5 48 48 48h48v-448h-48c-26.5 0 -48 21.5 -48 48v352zM128 -32v448h320v-448h-320zM192 216v-48c0 -4.40039 3.59961 -8 8 -8h56v-56c0 -4.40039 3.59961 -8 8 -8h48c4.40039 0 8 3.59961 8 8v56h56c4.40039 0 8 3.59961 8 8v48
+c0 4.40039 -3.59961 8 -8 8h-56v56c0 4.40039 -3.59961 8 -8 8h-48c-4.40039 0 -8 -3.59961 -8 -8v-56h-56c-4.40039 0 -8 -3.59961 -8 -8zM528 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-48v448h48z" />
+    <glyph glyph-name="hospital-alt" unicode="&#xf47d;" horiz-adv-x="576" 
+d="M544 352c17.7002 0 32 -14.2998 32 -32v-368c0 -8.7998 -7.2002 -16 -16 -16h-544c-8.7998 0 -16 7.2002 -16 16v368c0 17.7002 14.2998 32 32 32h128v64c0 17.7002 14.2998 32 32 32h192c17.7002 0 32 -14.2998 32 -32v-64h128zM160 12v40c0 6.59961 -5.40039 12 -12 12
+h-40c-6.59961 0 -12 -5.40039 -12 -12v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12zM160 140v40c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12zM320 12v40
+c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12zM320 140v40c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12v-40c0 -6.59961 5.40039 -12 12 -12h40
+c6.59961 0 12 5.40039 12 12zM336 310v20c0 3.2998 -2.7002 6 -6 6h-26v26c0 3.2998 -2.7002 6 -6 6h-20c-3.2998 0 -6 -2.7002 -6 -6v-26h-26c-3.2998 0 -6 -2.7002 -6 -6v-20c0 -3.2998 2.7002 -6 6 -6h26v-26c0 -3.2998 2.7002 -6 6 -6h20c3.2998 0 6 2.7002 6 6v26h26
+c3.2998 0 6 2.7002 6 6zM480 12v40c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12v-40c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12zM480 140v40c0 6.59961 -5.40039 12 -12 12h-40c-6.59961 0 -12 -5.40039 -12 -12v-40
+c0 -6.59961 5.40039 -12 12 -12h40c6.59961 0 12 5.40039 12 12z" />
+    <glyph glyph-name="hospital-symbol" unicode="&#xf47e;" 
+d="M256 448c141.4 0 256 -114.6 256 -256s-114.6 -256 -256 -256s-256 114.6 -256 256s114.6 256 256 256zM368 72v240c0 4.40039 -3.59961 8 -8 8h-48c-4.40039 0 -8 -3.59961 -8 -8v-88h-96v88c0 4.40039 -3.59961 8 -8 8h-48c-4.40039 0 -8 -3.59961 -8 -8v-240
+c0 -4.40039 3.59961 -8 8 -8h48c4.40039 0 8 3.59961 8 8v88h96v-88c0 -4.40039 3.59961 -8 8 -8h48c4.40039 0 8 3.59961 8 8z" />
+    <glyph glyph-name="id-card-alt" unicode="&#xf47f;" horiz-adv-x="576" 
+d="M528 384c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-480c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h144v-96h192v96h144zM288 224c-35.2998 0 -64 -28.7002 -64 -64s28.7002 -64 64 -64s64 28.7002 64 64s-28.7002 64 -64 64zM381.3 0
+c10.4004 0 18.7998 10 15.6006 19.7998c-8.40039 25.7002 -32.5 44.2002 -60.9004 44.2002h-8.2002c-12.2002 -5.09961 -25.7002 -8 -39.7998 -8s-27.5 2.90039 -39.7998 8h-8.2002c-28.5 0 -52.5996 -18.5996 -60.9004 -44.2002
+c-3.19922 -9.7998 5.2002 -19.7998 15.6006 -19.7998h186.6zM352 416v-96h-128v96c0 17.7002 14.2998 32 32 32h64c17.7002 0 32 -14.2998 32 -32z" />
+    <glyph glyph-name="notes-medical" unicode="&#xf481;" horiz-adv-x="384" 
+d="M336 384c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h80c0 35.2998 28.7002 64 64 64s64 -28.7002 64 -64h80zM192 408c-13.2998 0 -24 -10.7002 -24 -24s10.7002 -24 24 -24s24 10.7002 24 24
+s-10.7002 24 -24 24zM288 104v48c0 4.40039 -3.59961 8 -8 8h-56v56c0 4.40039 -3.59961 8 -8 8h-48c-4.40039 0 -8 -3.59961 -8 -8v-56h-56c-4.40039 0 -8 -3.59961 -8 -8v-48c0 -4.40039 3.59961 -8 8 -8h56v-56c0 -4.40039 3.59961 -8 8 -8h48c4.40039 0 8 3.59961 8 8
+v56h56c4.40039 0 8 3.59961 8 8zM288 296v16c0 4.40039 -3.59961 8 -8 8h-176c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h176c4.40039 0 8 3.59961 8 8z" />
+    <glyph glyph-name="pallet" unicode="&#xf482;" horiz-adv-x="640" 
+d="M144 192c-8.7998 0 -16 7.2002 -16 16v224c0 8.7998 7.2002 16 16 16h112v-128l64 32l64 -32v128h112c8.7998 0 16 -7.2002 16 -16v-224c0 -8.7998 -7.2002 -16 -16 -16h-352zM624 64h-48v-64h48c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-608
+c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h48v64h-48c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h608c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16zM288 0v64h-160v-64h160zM512 0v64h-160v-64h160z" />
+    <glyph glyph-name="pills" unicode="&#xf484;" horiz-adv-x="576" 
+d="M112 416c61.9004 0 112 -50.0996 112 -112v-224c0 -61.9004 -50.0996 -112 -112 -112s-112 50.0996 -112 112v224c0 61.9004 50.0996 112 112 112zM160 192v112c0 26.5 -21.5 48 -48 48s-48 -21.5 -48 -48v-112h96zM299.7 221.7l210.8 -210.8
+c3.5 -3.5 3.2002 -9.40039 -0.799805 -12.3008c-62.5 -45.2998 -150.101 -40.3994 -206.4 15.9004s-61.2002 143.9 -15.8994 206.4c2.89941 3.89941 8.7998 4.2998 12.2998 0.799805zM529.5 240.7c56.4004 -56.2998 61.2002 -143.8 15.9004 -206.4
+c-2.90039 -3.89941 -8.80078 -4.2998 -12.3008 -0.799805l-210.8 210.8c-3.5 3.5 -3.2002 9.40039 0.799805 12.2998c62.5 45.3008 150.101 40.4004 206.4 -15.8994z" />
+    <glyph glyph-name="prescription-bottle" unicode="&#xf485;" horiz-adv-x="384" 
+d="M32 256v64h320v-352c0 -17.5996 -14.4004 -32 -32 -32h-256c-17.5996 0 -32 14.4004 -32 32v64h120c4.40039 0 8 3.59961 8 8v16c0 4.40039 -3.59961 8 -8 8h-120v64h120c4.40039 0 8 3.59961 8 8v16c0 4.40039 -3.59961 8 -8 8h-120v64h120c4.40039 0 8 3.59961 8 8v16
+c0 4.40039 -3.59961 8 -8 8h-120zM360 448c13.2002 0 24 -10.7998 24 -24v-48c0 -13.2002 -10.7998 -24 -24 -24h-336c-13.2002 0 -24 10.7998 -24 24v48c0 13.2002 10.7998 24 24 24h336z" />
+    <glyph glyph-name="prescription-bottle-alt" unicode="&#xf486;" horiz-adv-x="384" 
+d="M360 448c13.2002 0 24 -10.7998 24 -24v-48c0 -13.2002 -10.7998 -24 -24 -24h-336c-13.2002 0 -24 10.7998 -24 24v48c0 13.2002 10.7998 24 24 24h336zM32 -32v352h320v-352c0 -17.5996 -14.4004 -32 -32 -32h-256c-17.5996 0 -32 14.4004 -32 32zM96 152v-48
+c0 -4.40039 3.59961 -8 8 -8h56v-56c0 -4.40039 3.59961 -8 8 -8h48c4.40039 0 8 3.59961 8 8v56h56c4.40039 0 8 3.59961 8 8v48c0 4.40039 -3.59961 8 -8 8h-56v56c0 4.40039 -3.59961 8 -8 8h-48c-4.40039 0 -8 -3.59961 -8 -8v-56h-56c-4.40039 0 -8 -3.59961 -8 -8z
+" />
+    <glyph glyph-name="procedures" unicode="&#xf487;" horiz-adv-x="640" 
+d="M528 224c61.9004 0 112 -50.0996 112 -112v-160c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v48h-512v-48c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v352c0 8.7998 7.2002 16 16 16h32c8.7998 0 16 -7.2002 16 -16v-240h192
+v144c0 8.7998 7.2002 16 16 16h256zM136 352c-4.40039 0 -8 3.59961 -8 8v16c0 4.40039 3.59961 8 8 8h140.9c3.09961 0 5.7998 -1.7002 7.19922 -4.40039l19.9004 -39.7998l49.7002 99.4004c5.89941 11.7998 22.7002 11.7998 28.5996 0l27.6006 -55.2002h102.1
+c8.7998 0 16 -7.2002 16 -16s-7.2002 -16 -16 -16h-121.9l-22.0996 44.2002l-49.7002 -99.4004c-5.89941 -11.7998 -22.7002 -11.7998 -28.5996 0l-27.6006 55.2002h-126.1zM160 96c-35.2998 0 -64 28.7002 -64 64s28.7002 64 64 64s64 -28.7002 64 -64
+s-28.7002 -64 -64 -64z" />
+    <glyph glyph-name="shipping-fast" unicode="&#xf48b;" horiz-adv-x="640" 
+d="M624 96c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-48c0 -53 -43 -96 -96 -96s-96 43 -96 96h-128c0 -53 -43 -96 -96 -96s-96 43 -96 96v128h152c4.40039 0 8 3.59961 8 8v16c0 4.40039 -3.59961 8 -8 8h-208c-4.40039 0 -8 3.59961 -8 8v16
+c0 4.40039 3.59961 8 8 8h240c4.40039 0 8 3.59961 8 8v16c0 4.40039 -3.59961 8 -8 8h-208c-4.40039 0 -8 3.59961 -8 8v16c0 4.40039 3.59961 8 8 8h240c4.40039 0 8 3.59961 8 8v16c0 4.40039 -3.59961 8 -8 8h-272c-4.40039 0 -8 3.59961 -8 8v16
+c0 4.40039 3.59961 8 8 8h56v48c0 26.5 21.5 48 48 48h256c26.5 0 48 -21.5 48 -48v-48h44.0996c12.7002 0 24.9004 -5.09961 33.9004 -14.0996l99.9004 -99.9004c9 -9 14.0996 -21.2002 14.0996 -33.9004v-108.1h16zM160 -16c26.5 0 48 21.5 48 48s-21.5 48 -48 48
+s-48 -21.5 -48 -48s21.5 -48 48 -48zM480 -16c26.5 0 48 21.5 48 48s-21.5 48 -48 48s-48 -21.5 -48 -48s21.5 -48 48 -48zM560 192v12.0996l-99.9004 99.9004h-44.0996v-112h144z" />
+    <glyph glyph-name="smoking" unicode="&#xf48d;" horiz-adv-x="640" 
+d="M632 96c4.40039 0 8 -3.59961 8 -8v-144c0 -4.40039 -3.59961 -8 -8 -8h-48c-4.40039 0 -8 3.59961 -8 8v144c0 4.40039 3.59961 8 8 8h48zM553.3 360.9c54.2998 -36.4004 86.7002 -97.1006 86.7002 -162.601v-30.2998c0 -4.40039 -3.59961 -8 -8 -8h-48
+c-4.40039 0 -8 3.59961 -8 8v30.2998c0 50.2002 -25.2002 96.7002 -67.4004 124c-18.3994 12 -28.5996 33.4004 -28.5996 55.4004v62.2998c0 4.40039 3.59961 8 8 8h48c4.40039 0 8 -3.59961 8 -8v-62.2998c0 -6.7998 3.59961 -13 9.2998 -16.7998zM432 96
+c8.7998 0 16 -7.2002 16 -16v-128c0 -8.7998 -7.2002 -16 -16 -16h-384c-26.5 0 -48 21.5 -48 48v64c0 26.5 21.5 48 48 48h384zM400 -16v64h-176v-64h176zM487.7 306.4c35.2998 -24.7002 56.2998 -64.8008 56.2998 -108.101v-30.2998c0 -4.40039 -3.59961 -8 -8 -8h-48
+c-4.40039 0 -8 3.59961 -8 8v30.2998c0 27.4004 -13.2998 52.9004 -35.7002 68.6006c-35.7002 25.0996 -60.2998 63 -60.2998 106.699v66.4004c0 4.40039 3.59961 8 8 8h48c4.40039 0 8 -3.59961 8 -8v-62.2998c0 -29 15.7998 -54.7002 39.7002 -71.2998zM536 96
+c4.40039 0 8 -3.59961 8 -8v-144c0 -4.40039 -3.59961 -8 -8 -8h-48c-4.40039 0 -8 3.59961 -8 8v144c0 4.40039 3.59961 8 8 8h48z" />
+    <glyph glyph-name="syringe" unicode="&#xf48e;" 
+d="M201.5 273.2l64.9004 65l135.699 -135.7l-181.899 -181.9c-17.5 -17.5996 -41.5 -25.5996 -65.4004 -23l-63.5996 7.10059l-66.2998 -66.2998c-3.10059 -3.10059 -8.2002 -3.10059 -11.3008 0l-11.2998 11.2998c-3.09961 3.09961 -3.09961 8.2002 0 11.2998
+l66.4004 66.4004l-7.10059 63.5996c-2.59961 24.2998 5.7002 48.0996 23 65.4004l26.4004 26.3994l55.7998 -55.8994c3.10059 -3.10059 8.2002 -3.10059 11.2998 0l11.3008 11.2998c3.09961 3.09961 3.09961 8.2002 0 11.2998l-55.8008 55.7998l45.3008 45.2998
+l55.6992 -55.7998c3.10059 -3.09961 8.2002 -3.09961 11.3008 0l11.2998 11.2998c3.09961 3.10059 3.09961 8.2002 0 11.3008zM509.7 366.5c3.09961 -3.2002 3.09961 -8.2002 0 -11.4004l-11.2998 -11.2998c-3.10059 -3.09961 -8.2002 -3.09961 -11.3008 0l-28.2998 28.2998
+l-45.2998 -45.2998l73.5 -73.5c3.09961 -3.09961 3.09961 -8.2002 0 -11.2998l-33.9004 -34c-3.09961 -3.09961 -8.19922 -3.09961 -11.2998 0l-17 17l-135.7 135.9l-17 17c-3.09961 3.09961 -3.09961 8.19922 0 11.2998l33.9004 33.8994
+c3.09961 3.10059 8.2002 3.10059 11.2998 0l17 -17l56.6006 -56.5996l45.2998 45.2998l-28.2998 28.2998c-3.10059 3.10059 -3.10059 8.2002 0 11.3008l11.2998 11.2998c3.09961 3.09961 8.2002 3.09961 11.2998 0z" />
+    <glyph glyph-name="tablets" unicode="&#xf490;" horiz-adv-x="640" 
+d="M160 256c81.0996 0 147.5 -58.5 160 -134.7c0.799805 -4.7998 -3.2998 -9.2998 -8.2998 -9.2998h-303.3c-5 0 -9.10059 4.5 -8.30078 9.2998c12.4004 76.2002 78.8008 134.7 159.9 134.7zM311.6 80c5 0 9.10059 -4.5 8.30078 -9.2998
+c-12.4004 -76.2002 -78.8008 -134.7 -159.9 -134.7s-147.5 58.5 -159.9 134.7c-0.799805 4.7998 3.30078 9.2998 8.30078 9.2998h303.199zM593.4 401.4c56.5 -56.5 61.3994 -144.2 15.8994 -206.9c-2.7998 -4 -8.7998 -4.2998 -12.2998 -0.799805l-211.3 211.399
+c-3.5 3.40039 -3.2002 9.40039 0.799805 12.3008c62.7002 45.3994 150.4 40.5 206.9 -16zM363 382.3l211.3 -211.3c3.5 -3.40039 3.2002 -9.40039 -0.799805 -12.2998c-62.7002 -45.5 -150.4 -40.6006 -206.9 15.8994c-56.3994 56.5 -61.2998 144.2 -15.8994 206.9
+c2.7998 4 8.7998 4.2998 12.2998 0.799805z" />
+    <glyph glyph-name="thermometer" unicode="&#xf491;" 
+d="M476.8 427.6c49.4004 -40.6992 42.1006 -107.3 7.2002 -142.199l-254.2 -253.301h-99.8994l-89 -89c-9.30078 -9.39941 -24.5 -9.39941 -33.9004 0c-9.40039 9.30078 -9.40039 24.5 0 33.9004l89 89v100.9l45.2998 45.6992l50.1006 -50.1992
+c3.09961 -3.10059 8.19922 -3.10059 11.2998 0l11.2998 11.2998c3.09961 3.09961 3.09961 8.2002 0 11.2998l-50.0996 50.2002l45.0996 45.3994l50.2998 -50.1992c3.10059 -3.10059 8.2002 -3.10059 11.2998 0l11.3008 11.2998c3.09961 3.09961 3.09961 8.2002 0 11.2998
+l-50.3008 50.4004l45.1006 45.3994l50.3994 -50.5c3.10059 -3.09961 8.2002 -3.09961 11.3008 0l11.2998 11.2998c3.09961 3.10059 3.09961 8.2002 0 11.3008l-50.5 50.5l45.7002 46c36.3994 36.5 94.3994 40.8994 131.899 10.1992z" />
+    <glyph glyph-name="vial" unicode="&#xf492;" horiz-adv-x="480" 
+d="M477.7 261.9c3.09961 -3.10059 3.09961 -8.2002 0 -11.2002l-34 -33.9004c-3.10059 -3.09961 -8.2002 -3.09961 -11.2998 0l-11.2002 11.1006l-246.3 -245.7c-20.1006 -20.1006 -46.5 -30.1006 -72.9004 -30.1006c-28.9004 -0.0996094 -57.7998 11.9004 -78.4004 35.9004
+c-35.6992 41.5 -29.3994 104.8 9.40039 143.5l242.4 241.9l-11.2002 11.0996c-3.10059 3.09961 -3.10059 8.2002 0 11.2998l34 33.9004c3.09961 3.09961 8.2002 3.09961 11.2998 0zM318 192l69.5 69.4004l-78.5 78.2998l-148 -147.7h157z" />
+    <glyph glyph-name="vials" unicode="&#xf493;" horiz-adv-x="640" 
+d="M72 384c-4.40039 0 -8 3.59961 -8 8v48c0 4.40039 3.59961 8 8 8h208c4.40039 0 8 -3.59961 8 -8v-48c0 -4.40039 -3.59961 -8 -8 -8h-24v-240c0 -44.0996 -35.9004 -80 -80 -80s-80 35.9004 -80 80v240h-24zM144 384v-96h64v96h-64zM624 0c8.7998 0 16 -7.2002 16 -16
+v-32c0 -8.7998 -7.2002 -16 -16 -16h-608c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h608zM360 384c-4.40039 0 -8 3.59961 -8 8v48c0 4.40039 3.59961 8 8 8h208c4.40039 0 8 -3.59961 8 -8v-48c0 -4.40039 -3.59961 -8 -8 -8h-24v-240
+c0 -44.0996 -35.9004 -80 -80 -80s-80 35.9004 -80 80v240h-24zM432 384v-96h64v96h-64z" />
+    <glyph glyph-name="warehouse" unicode="&#xf494;" horiz-adv-x="640" 
+d="M504 96c4.40039 0 8 -3.59961 8 -8v-48c0 -4.40039 -3.59961 -8 -8 -8h-367.7c-4.39941 0 -8 3.59961 -8 8l0.100586 48c0 4.40039 3.59961 8 8 8h367.6zM504 0c4.40039 0 8 -3.59961 8 -8v-48c0 -4.40039 -3.59961 -8 -8 -8h-368c-4.40039 0 -8 3.59961 -8 8
+l0.0996094 48c0 4.40039 3.60059 8 8 8h367.9zM504 192c4.40039 0 8 -3.59961 8 -8v-48c0 -4.40039 -3.59961 -8 -8 -8h-367.5c-4.40039 0 -8 3.59961 -8 8l0.0996094 48c0 4.40039 3.60059 8 8 8h367.4zM610.5 331c17.7998 -7.5 29.5 -24.9004 29.5 -44.2998v-342.7
+c0 -4.40039 -3.59961 -8 -8 -8h-80c-4.40039 0 -8 3.59961 -8 8v248c0 17.5996 -14.5996 32 -32.5996 32h-382.801c-18 0 -32.5996 -14.4004 -32.5996 -32v-248c0 -4.40039 -3.59961 -8 -8 -8h-80c-4.40039 0 -8 3.59961 -8 8v342.7c0 19.3994 11.7002 36.7998 29.5 44.2998
+l272 113.3c5.6748 2.35449 11.959 3.6543 18.4814 3.6543s12.7432 -1.2998 18.4189 -3.6543z" />
+    <glyph glyph-name="weight" unicode="&#xf496;" 
+d="M448 384c35.29 0 64 -28.71 64 -64v-320c0 -35.29 -28.71 -64 -64 -64h-384c-35.29 0 -64 28.71 -64 64v320c0 35.29 28.71 64 64 64h25.9805c-16.4209 -28.2803 -25.9805 -61.0098 -25.9805 -96c0 -105.87 86.1299 -192 192 -192s192 86.1299 192 192
+c0 34.9902 -9.55957 67.7197 -25.9805 96h25.9805zM256 128c-88.3701 0 -160 71.6299 -160 160s71.6299 160 160 160s160 -71.6299 160 -160s-71.6299 -160 -160 -160zM255.7 279.94c-21.9404 -0.170898 -39.7002 -17.96 -39.7002 -39.9404c0 -22.0898 17.9102 -40 40 -40
+s40 17.9102 40 40c0 10.5498 -4.26953 20 -10.9502 27.1602l33.6699 78.5498c3.4707 8.11035 -0.290039 17.5205 -8.41016 21c-8.08984 3.50977 -17.5293 -0.240234 -21.0293 -8.41016z" />
+    <glyph glyph-name="x-ray" unicode="&#xf497;" horiz-adv-x="640" 
+d="M240 64c8.7998 0 16 -7.2002 16 -16s-7.2002 -16 -16 -16s-16 7.2002 -16 16s7.2002 16 16 16zM400 32c-8.7998 0 -16 7.2002 -16 16s7.2002 16 16 16s16 -7.2002 16 -16s-7.2002 -16 -16 -16zM624 448c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16
+h-608c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h608zM624 0c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-608c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h48v352h512v-352h48zM480 200v16c0 4.40039 -3.59961 8 -8 8
+h-136v32h104c4.40039 0 8 3.59961 8 8v16c0 4.40039 -3.59961 8 -8 8h-104v24c0 4.40039 -3.59961 8 -8 8h-16c-4.40039 0 -8 -3.59961 -8 -8v-24h-104c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h104v-32h-136c-4.40039 0 -8 -3.59961 -8 -8v-16
+c0 -4.40039 3.59961 -8 8 -8h136v-32h-104c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h104v-32h-64c-26.5 0 -48 -21.5 -48 -48s21.5 -48 48 -48s48 21.5 48 48v16h64v-16c0 -26.5 21.5 -48 48 -48s48 21.5 48 48s-21.5 48 -48 48h-64v32h104
+c4.40039 0 8 3.59961 8 8v16c0 4.40039 -3.59961 8 -8 8h-104v32h136c4.40039 0 8 3.59961 8 8z" />
+    <glyph glyph-name="box-open" unicode="&#xf49e;" horiz-adv-x="640" 
+d="M425.7 192c4.5 0 9 0.599609 13.2998 1.90039l137 39.0996v-178c0 -14.5996 -10 -27.4004 -24.2002 -31l-216.399 -54.0996c-10.1006 -2.5 -20.8008 -2.5 -31 0l-216.2 54.0996c-14.2002 3.5 -24.2002 16.2998 -24.2002 31v178l137 -39.2002
+c4.2998 -1.2998 8.7998 -1.89941 13.2998 -1.89941c16.9004 0 32.7998 9 41.5 23.5l64.2002 106.6l64.2998 -106.6c8.60059 -14.4004 24.5 -23.4004 41.4004 -23.4004zM638.3 304.2c4.5 -9.2002 -0.299805 -20.2002 -10.2002 -23.1006l-197.899 -56.5
+c-7.10059 -2 -14.7002 1 -18.5 7.30078l-91.7002 152.1l250.1 31.9004c6.90039 0.899414 13.6006 -2.7002 16.7002 -8.90039zM53.2002 407c3.09961 6.2002 9.7002 9.7002 16.5996 8.90039l250.2 -31.9004l-91.7998 -152c-3.7998 -6.2998 -11.4004 -9.2998 -18.5 -7.2998
+l-197.9 56.5c-9.7998 2.7998 -14.7002 13.7998 -10.0996 23z" />
+    <glyph glyph-name="comment-dots" unicode="&#xf4ad;" 
+d="M256 416c141.4 0 256 -93.0996 256 -208s-114.6 -208 -256 -208c-38.4004 0 -74.7002 7.09961 -107.4 19.4004c-24.5996 -19.6006 -74.2998 -51.4004 -140.6 -51.4004c-3.2002 0 -6 1.7998 -7.2998 4.7998s-0.700195 6.40039 1.5 8.7002
+c0.5 0.5 42.2998 45.4004 54.7998 95.7998c-35.5996 35.7002 -57 81.1006 -57 130.7c0 114.9 114.6 208 256 208zM128 176c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM256 176c17.7002 0 32 14.2998 32 32
+s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM384 176c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32z" />
+    <glyph glyph-name="comment-slash" unicode="&#xf4b3;" horiz-adv-x="640" 
+d="M64 208c0 18.5996 3.2998 36.5 8.90039 53.5996l325.5 -251.6c-24.7002 -6.40039 -51 -10 -78.4004 -10c-38.4004 0 -74.7002 7.09961 -107.4 19.4004c-24.5996 -19.6006 -74.2998 -51.4004 -140.6 -51.4004c-3.2002 0 -6 1.90039 -7.2998 4.7998
+c-1.2998 3 -0.700195 6.40039 1.5 8.7002c0.5 0.599609 42.2002 45.5 54.7998 95.7998c-35.5996 35.7002 -57 81.1006 -57 130.7zM633.8 -10.0996c7 -5.40039 8.2998 -15.5 2.90039 -22.3008l-19.6006 -25.2998c-5.5 -7 -15.5 -8.2002 -22.5 -2.7998l-588.399 454.7
+c-7 5.39941 -8.2002 15.3994 -2.7998 22.3994l19.5996 25.2002c5.5 7 15.5 8.2002 22.5 2.7998l105.1 -81.2998c45.2002 32.6006 104.301 52.7002 169.4 52.7002c141.4 0 256 -93.0996 256 -208c0 -49.2002 -21.4004 -94.0996 -56.5996 -129.7z" />
+    <glyph glyph-name="couch" unicode="&#xf4b8;" horiz-adv-x="640" 
+d="M160 224c0 35.2998 -28.7002 64 -64 64h-32c0 53 43 96 96 96h320c53 0 96 -43 96 -96h-32c-35.2998 0 -64 -28.7002 -64 -64v-64h-320v64zM576 256c35.2998 0 64 -28.7002 64 -64c0 -23.5996 -13 -44 -32 -55.0996v-120.9c0 -8.7998 -7.2002 -16 -16 -16h-64
+c-8.7998 0 -16 7.2002 -16 16v16h-384v-16c0 -8.7998 -7.2002 -16 -16 -16h-64c-8.7998 0 -16 7.2002 -16 16v120.9c-19 11.0996 -32 31.5 -32 55.0996c0 35.2998 28.7002 64 64 64h32c17.7002 0 32 -14.2998 32 -32v-96h384v96c0 17.7002 14.2998 32 32 32h32z" />
+    <glyph glyph-name="donate" unicode="&#xf4b9;" 
+d="M256 32c-114.9 0 -208 93.0996 -208 208s93.0996 208 208 208s208 -93.0996 208 -208s-93.0996 -208 -208 -208zM233.8 350.6c-32.7002 -0.899414 -59 -28.3994 -59.0996 -62.3994c0 -27.7002 18 -52.4004 43.7002 -60.1006l62.2998 -18.6992
+c7.09961 -2.10059 12.0996 -9.40039 12.0996 -17.6006c0 -10.0996 -7.2998 -18.2998 -16.2998 -18.2998h-38.9004c-6.39941 0 -12.3994 1.7002 -17.7998 5.09961c-4.5 2.80078 -10.2002 2.7002 -14 -1l-16.2998 -15.5c-5 -4.7998 -4.40039 -13 1.2002 -17.0996
+c12.5 -9.2998 27.5 -14.5996 43 -15.4004v-17c0 -9.19922 7.39941 -16.5996 16.5996 -16.5996h11.1006c9.19922 0 16.5996 7.40039 16.5996 16.5996v16.8008c32.7002 0.899414 59.0996 28.3994 59.0996 62.3994c0 27.7002 -18 52.4004 -43.6992 60.1006l-62.3008 18.6992
+c-7.09961 2.10059 -12.0996 9.40039 -12.0996 17.6006c0 10.0996 7.2998 18.2998 16.2998 18.2998h38.9004c6.39941 0 12.3994 -1.7002 17.7998 -5.09961c4.5 -2.80078 10.2002 -2.7002 14 1l16.2998 15.5c5 4.7998 4.40039 13 -1.2002 17.0996
+c-12.5 9.2998 -27.5 14.5996 -43 15.4004v17c0 9.19922 -7.39941 16.5996 -16.5996 16.5996h-11.0996c-9.2002 0 -16.6006 -7.40039 -16.6006 -16.5996v-16.8008zM480 96c17.7002 0 32 -14.2998 32 -32v-96c0 -17.7002 -14.2998 -32 -32 -32h-448
+c-17.7002 0 -32 14.2998 -32 32v96c0 17.7002 14.2998 32 32 32h32.4004c19.6992 -26 44.5996 -47.7002 73 -64h-63.8008c-5.2998 0 -9.59961 -3.59961 -9.59961 -8v-16c0 -4.40039 4.2998 -8 9.59961 -8h364.7c5.2998 0 9.60059 3.59961 9.60059 8v16
+c0 4.40039 -4.30078 8 -9.60059 8h-63.7998c28.4004 16.2998 53.4004 38 73 64h32.5z" />
+    <glyph glyph-name="dove" unicode="&#xf4ba;" 
+d="M288 280.8c-50.7998 10.5 -96.5996 36.7998 -130.8 75.1006c11.2002 32.3994 27.7998 61.5996 48.8994 86.5c8.80078 10.5 25.7002 5.19922 27.8008 -8.30078c7 -45.8994 25.8994 -88.8994 54.0996 -125.199v-28.1006zM400 384h112l-32 -64v-160.1
+c0 -88.4004 -71.5996 -159.9 -160 -159.9h-76.9004l-65.1992 -56.0996c-6.10059 -5.30078 -14.1006 -8.2002 -22.1006 -7.90039c-92.7998 3.7998 -135.8 49.4004 -153.2 76.2998c-6 9.2998 -1.19922 21.7002 9.5 24.4004l143.9 36
+c-12.7998 9.59961 -25.7002 20.0996 -38.9004 32.7998c-51 49 -85.0996 115.1 -85.0996 185.9c0 41.3994 9.40039 80.5996 26 115.699c5.7998 12.3008 23.5 11.6006 29 -0.899414c40 -91.2002 128.6 -155.5 233 -161.7v59.4004c0 44.1992 35.7998 80.0996 80 80.0996z
+M400 287.9c8.7998 0 16 7.19922 16 16c0 8.7998 -7.2002 16 -16 16s-16 -7.2002 -16 -16c0 -8.80078 7.2002 -16 16 -16z" />
+    <glyph glyph-name="hand-holding" unicode="&#xf4bd;" horiz-adv-x="576" 
+d="M565.3 119.9c15.1006 -13.6006 13.9004 -36.8008 -1.2998 -48.9004l-151.2 -121c-11.3994 -9.09961 -25.5 -14 -40 -14h-356.8c-8.7998 0 -16 7.2002 -16 16v96c0 8.7998 7.2002 16 16 16h55.4004l46.5 37.7002c21 17 47.0996 26.2998 74.0996 26.2998h160
+c19.5 0 34.9004 -17.4004 31.5996 -37.4004c-2.59961 -15.6992 -17.3994 -26.5996 -33.2998 -26.5996h-78.2998c-8.7998 0 -16 -7.2002 -16 -16s7.2002 -16 16 -16h118.3c14.6006 0 28.7002 4.90039 40 14l92.4004 73.9004c12.3994 10 30.7998 10.6992 42.5996 0z" />
+    <glyph glyph-name="hand-holding-heart" unicode="&#xf4be;" horiz-adv-x="576" 
+d="M275.3 197.5l-108.899 114.2c-31.6006 33.2002 -29.7002 88.2002 5.59961 118.8c30.7998 26.7002 76.7002 21.9004 104.9 -7.7998l11.0996 -11.6006l11.2002 11.7002c28.2002 29.6006 74.0996 34.4004 104.899 7.7002c35.4004 -30.5996 37.2002 -85.5996 5.60059 -118.8
+l-108.9 -114.2c-7.09961 -7.40039 -18.5 -7.40039 -25.5 0zM565.3 119.9c15.1006 -13.6006 13.9004 -36.8008 -1.2998 -48.9004l-151.2 -121c-11.3994 -9.09961 -25.5 -14 -40 -14h-356.8c-8.7998 0 -16 7.2002 -16 16v96c0 8.7998 7.2002 16 16 16h55.4004l46.5 37.7002
+c21 17 47.0996 26.2998 74.0996 26.2998h160c19.5 0 34.9004 -17.4004 31.5996 -37.4004c-2.59961 -15.6992 -17.3994 -26.5996 -33.2998 -26.5996h-78.2998c-8.7998 0 -16 -7.2002 -16 -16s7.2002 -16 16 -16h118.3c14.6006 0 28.7002 4.90039 40 14l92.4004 73.9004
+c12.3994 10 30.7998 10.6992 42.5996 0z" />
+    <glyph glyph-name="hand-holding-usd" unicode="&#xf4c0;" horiz-adv-x="576" 
+d="M271.06 303.7c-24.0596 6.39941 -43.4297 24.7002 -46.5693 47.7002c-4.33984 32 20.6201 59.3994 53.5098 63v17.5996c0 8.7998 7.82031 16 17.3701 16h17.3701c9.5498 0 17.3701 -7.2002 17.3701 -16v-17.7197c12.457 -1.28516 24.2842 -5.35938 34.5195 -11.5
+c3.32227 -2.00098 5.52734 -5.64746 5.52734 -9.80469c0 -2.18945 -0.617188 -4.23633 -1.6875 -5.97559c-0.592773 -0.978516 -1.31836 -1.8457 -2.16992 -2.59961l-19 -17.5c-4.01953 -3.7002 -10.0693 -4.2002 -15.2998 -2
+c-3.46289 1.4043 -7.2666 2.19336 -11.2305 2.19922h-35.5996c-5.03027 0 -9.12012 -3.7998 -9.12012 -8.39941c0.12207 -3.94727 2.91699 -7.23145 6.62988 -8.10059l54.2705 -14.2998c24.0996 -6.39941 43.4102 -24.7002 46.5596 -47.7002
+c4.33984 -32 -20.5693 -59.3994 -53.5 -63v-17.5996c0 -8.7998 -7.83008 -16 -17.3799 -16h-17.3701c-9.54004 0 -17.3701 7.2002 -17.3701 16v17.7002c-12.4541 1.28516 -24.2773 5.35938 -34.5098 11.5c-3.33008 1.99609 -5.54199 5.64551 -5.54199 9.80762
+c0 2.17188 0.607422 4.20312 1.66211 5.93262c0.617188 1.00098 1.36914 1.88867 2.25 2.65918l19 17.5c4.01953 3.7002 10.0596 4.2002 15.2998 2c3.45117 -1.39941 7.24121 -2.18848 11.1904 -2.19922h35.5996c5.03027 0 9.12012 3.7998 9.12012 8.39941
+c-0.121094 3.94727 -2.91602 7.23145 -6.62988 8.10059zM565.27 119.9c6.5918 -5.86328 10.7656 -14.3916 10.7656 -23.8984c0 -10.1123 -4.70117 -19.1357 -12.0352 -25.002l-151.23 -121c-10.9443 -8.74512 -24.8633 -14 -39.9482 -14h-0.0517578h-356.77
+c-8.83105 0 -16 7.16895 -16 16v96c0 8.83105 7.16895 16 16 16h55.4004l46.5 37.71c20.2197 16.4053 46.0596 26.2822 74.0996 26.29h160c17.6406 0 31.9668 -14.3066 32 -31.9404c0 -0.0410156 0.000976562 -0.0507812 0.000976562 -0.0917969
+c0 -1.83008 -0.158203 -3.62402 -0.460938 -5.36816c-2.54004 -15.6992 -17.3496 -26.5996 -33.25 -26.5996h-78.29c-8.83105 0 -16 -7.16895 -16 -16s7.16895 -16 16 -16h118.27c0.0605469 0 0.161133 0.0234375 0.22168 0.0234375
+c15.0459 0 28.8799 5.23242 39.7783 13.9766l92.4004 73.9004c12.4004 10 30.7998 10.6992 42.5996 0z" />
+    <glyph glyph-name="hand-holding-water" unicode="&#xf4c1;" horiz-adv-x="576" 
+d="M288 192c-53 0 -96 42.0996 -96 94c0 40 57.0996 120.7 83.2002 155.6c6.39941 8.5 19.2002 8.5 25.5996 0c26.1006 -34.8994 83.2002 -115.6 83.2002 -155.6c0 -51.9004 -43 -94 -96 -94zM565.3 119.9c15.1006 -13.6006 13.9004 -36.8008 -1.2998 -48.9004l-151.2 -121
+c-11.3994 -9.09961 -25.5 -14 -40 -14h-356.8c-8.7998 0 -16 7.2002 -16 16v96c0 8.7998 7.2002 16 16 16h55.4004l46.5 37.7002c21 17 47.0996 26.2998 74.0996 26.2998h160c19.5 0 34.9004 -17.4004 31.5996 -37.4004
+c-2.59961 -15.6992 -17.3994 -26.5996 -33.2998 -26.5996h-78.2998c-8.7998 0 -16 -7.2002 -16 -16s7.2002 -16 16 -16h118.3c14.6006 0 28.7002 4.90039 40 14l92.4004 73.9004c12.3994 10 30.7998 10.6992 42.5996 0z" />
+    <glyph glyph-name="hands" unicode="&#xf4c2;" horiz-adv-x="640" 
+d="M204.8 217.6l57.6006 -76.7998c16.5996 -22.2002 25.5996 -49.0996 25.5996 -76.7998v-112c0 -8.7998 -7.2002 -16 -16 -16h-131.7c-7.2002 0 -13.5 4.7002 -15.2998 11.5996c-2 7.80078 -5.40039 15.2002 -10.4004 21.7002l-104.1 134.3
+c-6.7998 8.5 -10.5 19.1006 -10.5 30v218.4c0 17.7002 14.2998 32 32 32s32 -14.2998 32 -32v-148.4l89.7998 -107.8c6 -7.2998 16.9004 -7.7998 23.6006 -1.09961l12.7998 12.7998c5.59961 5.59961 6.2998 14.5 1.5 20.9004l-38.1006 50.7998
+c-10.5996 14.0996 -7.69922 34.2002 6.40039 44.7998s34.2002 7.7002 44.7998 -6.40039zM608 384c17.7002 0 32 -14.2998 32 -32v-218.4c0 -10.8994 -3.7002 -21.5 -10.5 -30l-104.1 -134.3c-5 -6.5 -8.40039 -13.8994 -10.4004 -21.7002
+c-1.7998 -6.89941 -8.2002 -11.5996 -15.2998 -11.5996h-131.7c-8.7998 0 -16 7.2002 -16 16v112c0 27.7002 9 54.5996 25.5996 76.7998l57.6006 76.7998c10.5996 14.1006 30.7002 17 44.7998 6.40039s17 -30.7002 6.40039 -44.7998l-38.1006 -50.7998
+c-4.7998 -6.40039 -4.09961 -15.3008 1.5 -20.9004l12.7998 -12.7998c6.60059 -6.60059 17.6006 -6.10059 23.6006 1.09961l89.7998 107.8v148.4c0 17.7002 14.2998 32 32 32z" />
+    <glyph glyph-name="hands-helping" unicode="&#xf4c4;" horiz-adv-x="640" 
+d="M488 256c13.2998 0 24 -10.7002 24 -24v-48c0 -13.2998 -10.7002 -24 -24 -24h-8v-64c0 -17.7002 -14.2998 -32 -32 -32h-16c0 -35.2998 -28.7002 -64 -64 -64h-136.6l-103.4 -59.7002c-15.2998 -8.7998 -34.9004 -3.59961 -43.7002 11.7002l-80 138.6
+c-8.89941 15.3008 -3.59961 34.9004 11.7002 43.7002l80 46.2002v47.2998c0 22.4004 11.7998 43.2998 31.0996 54.7998l64.9004 39v-121.6c0 -39.7002 32.2998 -72 72 -72s72 32.2998 72 72v56h152zM635.7 293.4c8.7998 -15.3008 3.59961 -34.8008 -11.7002 -43.7002
+l-80 -46.2002v28.5c0 30.9004 -25.0996 56 -56 56h-184v-88c0 -22.0996 -17.9004 -40 -40 -40s-40 17.9004 -40 40v126.3c0 11 5.59961 21.2998 15 27.1006l33.5 20.8994c10.2002 6.2998 21.9004 9.7002 33.9004 9.7002h102.199l103.4 59.7002
+c15.2998 8.7998 34.9004 3.59961 43.7002 -11.7002z" />
+    <glyph glyph-name="parachute-box" unicode="&#xf4cd;" 
+d="M511.9 273c1.09961 -9.2002 -6.80078 -17 -16.1006 -17h-8.7002l-136.8 -151.9c0.700195 -2.69922 1.60059 -5.19922 1.60059 -8.09961v-128c0 -17.7002 -14.3008 -32 -32 -32h-128c-17.7002 0 -32 14.2998 -32 32v128c0 2.90039 0.899414 5.5 1.59961 8.09961
+l-136.7 151.9h-8.7002c-9.19922 0 -17.0996 7.90039 -16 17c9.10059 75.5 78.4004 132.3 158.301 158.7c-36.4004 -39.4004 -62.4004 -100.601 -62.4004 -175.7h-28.0996l116.6 -129.5c2.5 0.599609 4.7998 1.5 7.5 1.5h48v128h-112c0 115.2 68.9004 192 128 192
+s128 -76.7998 128 -192h-112v-128h48c2.7002 0 5 -0.900391 7.5 -1.5l116.6 129.5h-28.0996c0 75.0996 -26 136.3 -62.4004 175.7c79.9004 -26.2998 149.2 -83.1006 158.301 -158.7z" />
+    <glyph glyph-name="people-carry" unicode="&#xf4ce;" horiz-adv-x="640" 
+d="M128 352c-26.5 0 -48 21.5 -48 48s21.5 48 48 48s48 -21.5 48 -48s-21.5 -48 -48 -48zM512 352c-26.5 0 -48 21.5 -48 48s21.5 48 48 48s48 -21.5 48 -48s-21.5 -48 -48 -48zM637.7 -20.0996c6.59961 -16.4004 -1.40039 -35 -17.7998 -41.6006
+c-3.90039 -1.59961 -7.90039 -2.2998 -11.9004 -2.2998c-12.7002 0 -24.7002 7.59961 -29.7002 20.0996l-27.7002 69.2002l2 18.2002l41.1006 46.4004zM603.5 189.7c4.59961 -20 -0.799805 -41.2002 -14.4004 -56.7002l-67.1992 -75.9004l-10.1006 -92.5996
+c-1.7998 -16.4004 -15.7002 -28.5 -31.7998 -28.5c-1.2002 0 -2.2998 0.0996094 -3.5 0.200195c-17.5 1.89941 -30.2002 17.7002 -28.2998 35.2998l10.0996 92.7998c1.5 13 6.90039 25.1006 15.6006 35l43.2998 49l-17.6006 70.2998l-6.7998 -20.3994
+c-4.09961 -12.6006 -11.8994 -23.4004 -24.5 -32.6006l-51.0996 -32.5c-4.60059 -2.89941 -12.1006 -4.59961 -17.2002 -5h-160c-5.09961 0.400391 -12.5996 2.10059 -17.2002 5l-51.0996 32.5c-12.6006 9.2002 -20.4004 20.1006 -24.5 32.6006l-6.7998 20.3994
+l-17.6006 -70.2998l43.2998 -49c8.7002 -9.89941 14.1006 -22 15.6006 -35l10.0996 -92.7998c1.90039 -17.5996 -10.7002 -33.4004 -28.2998 -35.2998c-1.2002 -0.100586 -2.2998 -0.200195 -3.5 -0.200195c-16.2002 0 -30 12.2002 -31.7998 28.5l-10.1006 92.5996
+l-67.1992 75.9004c-13.7002 15.5 -19 36.7002 -14.4004 56.7002l18.4004 80.2002c4.59961 20 18.5996 36.7998 37.5 44.8994c18.5 8 38.8994 6.7002 56.0996 -3.2998c22.7002 -13.4004 39.7998 -34.4004 48.0996 -59.4004l11.3008 -33.8994l16.0996 -10.2002v96
+c0 8.7998 7.2002 16 16 16h160c8.7998 0 16 -7.2002 16 -16v-96l16 10.2002l11.2998 33.8994c8.40039 24.9004 25.4004 46 48.1006 59.4004c17.0996 10 37.5996 11.2998 56.0996 3.2998c18.9004 -8.09961 32.9004 -24.8994 37.5 -44.8994zM46.2998 89.9004l41.1006 -46.4004
+l2 -18.2002l-27.7002 -69.2002c-6.5 -16.0996 -24.7998 -24.3994 -41.6006 -17.7998c-16.3994 6.60059 -24.3994 25.2002 -17.7998 41.6006z" />
+    <glyph glyph-name="piggy-bank" unicode="&#xf4d3;" horiz-adv-x="576" 
+d="M560 224c8.7998 0 16 -7.2002 16 -16v-128c0 -8.7998 -7.2002 -16 -16 -16h-48.7002c-9 -11.9004 -19.5 -22.4004 -31.2998 -31.2998v-80.7002c0 -8.7998 -7.2002 -16 -16 -16h-64c-8.7998 0 -16 7.2002 -16 16v48h-128v-48c0 -8.7998 -7.2002 -16 -16 -16h-64
+c-8.7998 0 -16 7.2002 -16 16v80.7002c-38.5996 29.2002 -64 75.0996 -64 127.3h-40c-33.2998 0 -59.9004 29.2002 -55.5 63.4004c3.59961 28.1992 29 48.5996 57.5 48.5996c3.2998 0 6 -2.7002 6 -6v-20c0 -3.2998 -2.7002 -6 -6 -6h-1
+c-11.5996 0 -22.2998 -7.7998 -24.5 -19.2002c-3 -15.2998 8.7002 -28.7998 23.5 -28.7998h43.2002c14.8994 73 79.3994 128 156.8 128h128c7.90039 0 15.4004 -1.2002 23 -2.2998c17.5996 20.7998 43.5996 34.2998 73 34.2998h32l-18.9004 -75.5
+c15.8008 -14.7998 28.6006 -32.5 37.4004 -52.5h29.5zM432 160c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16zM256 352c-16.4004 0 -32.2002 -2.2998 -47.4004 -6.2002c-0.0996094 2.10059 -0.599609 4.10059 -0.599609 6.2002
+c0 53 43 96 96 96s96 -43 96 -96c0 -0.299805 -0.0996094 -0.5 -0.0996094 -0.799805c-5.2002 0.399414 -10.5 0.799805 -15.9004 0.799805h-128z" />
+    <glyph glyph-name="ribbon" unicode="&#xf4d6;" horiz-adv-x="448" 
+d="M6.09961 3.7002l117.2 130l79.2002 -87.9004l-91.7998 -101.899c-8 -8.80078 -21.4004 -10.5 -31.2998 -3.80078l-68.8008 27.9004c-12 8.09961 -14.0996 24.9004 -4.5 35.7002zM441.9 3.7002c9.69922 -10.7998 7.59961 -27.6006 -4.30078 -35.6006l-68.7998 -27.8994
+c-9.89941 -6.7002 -23.2998 -5.10059 -31.2998 3.7998l-248.1 275.3c-48.6006 53.7998 -13 113.5 -11.5 116l43.5996 73.2002c4.2998 7.2002 9.90039 13.2998 16.7998 18c44 29.7002 130.7 27.5996 171.4 0c6.89941 -4.7002 12.5 -10.7998 16.7998 -18l43.7002 -73.5
+c21.8994 -36.9004 17.2998 -83.5996 -11.4004 -115.5l-34.2002 -38l-79.0996 87.7002s52.7002 59 56 64.5996c-15.4004 8.40039 -40.2002 17.9004 -77.5 17.9004s-62.0996 -9.5 -77.5 -17.9004c3.40039 -5.5 295.4 -330.1 295.4 -330.1z" />
+    <glyph glyph-name="route" unicode="&#xf4d7;" 
+d="M416 128c52.9004 0 96 -43.0996 96 -96s-43.0996 -96 -96 -96h-277.8c13.5 16.2998 31.2998 39.2002 47.2998 64h230.5c17.5996 0 32 14.4004 32 32s-14.4004 32 -32 32h-96c-52.9004 0 -96 43.0996 -96 96s43.0996 96 96 96h45.2998
+c-23.0996 32.5996 -45.2998 70.5 -45.2998 96c0 53 43 96 96 96s96 -43 96 -96s-96 -160 -96 -160h-96c-17.5996 0 -32 -14.4004 -32 -32s14.4004 -32 32 -32h96zM416 384c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32s32 14.2998 32 32s-14.2998 32 -32 32zM96 192
+c53 0 96 -43 96 -96s-96 -160 -96 -160s-96 107 -96 160s43 96 96 96zM96 64c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32z" />
+    <glyph glyph-name="seedling" unicode="&#xf4d8;" 
+d="M64 352c123.7 0 224 -100.3 224 -224v-144c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v144c-123.7 0 -224 100.3 -224 224h64zM448 416h64c0 -115.9 -88 -211.1 -200.7 -222.8c-10.7998 40.7002 -31.2998 77.3994 -59 107.6
+c38.2998 68.7002 111.5 115.2 195.7 115.2z" />
+    <glyph glyph-name="sign" unicode="&#xf4d9;" 
+d="M496 384c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-368v-368c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v368h-48c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h48v48c0 8.7998 7.2002 16 16 16h32
+c8.7998 0 16 -7.2002 16 -16v-48h368zM160 64v224h320v-224h-320z" />
+    <glyph glyph-name="smile-wink" unicode="&#xf4da;" horiz-adv-x="496" 
+d="M0 192c0 137 111 248 248 248s248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248zM200 240c0 17.7002 -14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32s32 14.2998 32 32zM358.5 223.5l9.7002 -8.5c8.39941 -7.5 21.5 -0.299805 19.7998 10.7998
+c-4 25.2002 -34.2002 42.1006 -59.9004 42.1006c-25.6992 0 -55.8994 -16.9004 -59.8994 -42.1006c-1.7998 -11.2002 11.5 -18.2002 19.7998 -10.7998l9.5 8.5c14.7998 13.2002 46.2002 13.2002 61 0zM157.8 122.2c-13.3994 16.2998 -38.0996 -4.10059 -24.5996 -20.4004
+c28.5 -34.2002 70.2998 -53.7998 114.8 -53.7998s86.2998 19.5996 114.8 53.7002c13.5 16.2998 -11 36.7002 -24.5996 20.5c-22.4004 -26.7998 -55.2002 -42.2002 -90.2002 -42.2002s-67.7998 15.2998 -90.2002 42.2002z" />
+    <glyph glyph-name="tape" unicode="&#xf4db;" horiz-adv-x="640" 
+d="M224 256c35.2998 0 64 -28.7002 64 -64s-28.7002 -64 -64 -64s-64 28.7002 -64 64s28.7002 64 64 64zM624 32c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-400c-123.7 0 -224 100.3 -224 224s100.3 224 224 224s224 -100.3 224 -224
+c0 -62.7002 -25.9004 -119.3 -67.4004 -160h243.4zM224 96c53 0 96 43 96 96s-43 96 -96 96s-96 -43 -96 -96s43 -96 96 -96z" />
+    <glyph glyph-name="truck-loading" unicode="&#xf4de;" horiz-adv-x="640" 
+d="M50.2002 72.4004l-49.6006 185.5c-2.2998 8.5 2.80078 17.2998 11.3008 19.5996l77.2998 20.7002l24.7998 -92.7002l61.7998 16.5l-24.7998 92.7002l77.2002 20.7998c8.5 2.2998 17.2998 -2.7998 19.5996 -11.2998l49.7002 -185.5
+c2.2998 -8.5 -2.7998 -17.2998 -11.2998 -19.6006l-216.4 -58c-8.5 -2.2998 -17.2998 2.80078 -19.5996 11.3008zM384 448h256v-400c0 -61.9004 -50.0996 -112 -112 -112c-60.4004 0 -109.2 47.9004 -111.6 107.7l-393.7 -107.4
+c-4.2002 -1.2002 -8.60059 1.2998 -9.7998 5.60059l-12.6006 46.2998c-1.2002 4.2002 1.2998 8.59961 5.60059 9.7998l346.1 94.4004v323.6c0 17.7002 14.2998 32 32 32zM528 0c26.5 0 48 21.5 48 48s-21.5 48 -48 48s-48 -21.5 -48 -48s21.5 -48 48 -48z" />
+    <glyph glyph-name="truck-moving" unicode="&#xf4df;" horiz-adv-x="640" 
+d="M621.3 210.7c12 -12 18.7002 -28.2002 18.7002 -45.2002v-85.5c0 -8.7998 -7.2002 -16 -16 -16h-17.5996c1 -5.2002 1.59961 -10.5 1.59961 -16c0 -44.2002 -35.7998 -80 -80 -80s-80 35.7998 -80 80c0 5.5 0.5 10.7998 1.59961 16h-163.199
+c1 -5.2002 1.59961 -10.5 1.59961 -16c0 -44.2002 -35.7998 -80 -80 -80c-26.2998 0 -49.4004 12.7998 -64 32.4004c-14.5996 -19.5 -37.7002 -32.4004 -64 -32.4004c-44.2002 0 -80 35.7998 -80 80v336c0 17.7002 14.2998 32 32 32h416c17.7002 0 32 -14.2998 32 -32
+v-96.0996h37.5c17 0 33.2998 -6.7002 45.2998 -18.7002zM80 16c17.5996 0 32 14.4004 32 32s-14.4004 32 -32 32s-32 -14.4004 -32 -32s14.4004 -32 32 -32zM208 16c17.5996 0 32 14.4004 32 32s-14.4004 32 -32 32s-32 -14.4004 -32 -32s14.4004 -32 32 -32zM480 240v-48
+h92.0996l-43.2998 43.2998c-3 3 -7 4.7002 -11.2998 4.7002h-37.5zM528 16c17.5996 0 32 14.4004 32 32s-14.4004 32 -32 32s-32 -14.4004 -32 -32s14.4004 -32 32 -32z" />
+    <glyph glyph-name="video-slash" unicode="&#xf4e2;" horiz-adv-x="640" 
+d="M633.8 -10.0996c7 -5.40039 8.2998 -15.5 2.7998 -22.4004l-19.5996 -25.2998c-5.5 -7 -15.5 -8.2002 -22.5 -2.7998l-178.5 138l-373.3 288.6l-36.5 28.2002c-7 5.39941 -8.2002 15.3994 -2.7998 22.3994l19.5996 25.2002c5.5 7 15.5 8.2002 22.5 2.7998
+l78.4004 -60.5996h244.3c26.3994 0 47.7998 -21.4004 47.7998 -47.7998v-178l32 -24.7002v137.2l109.6 75.5996c21.3008 14.6006 50.4004 -0.299805 50.4004 -25.7998v-257c0 -17.4004 -13.7998 -29.7002 -29.2002 -31.0996zM32 47.7998v245.5l365.8 -282.8
+c-8.2002 -6.5 -18.3994 -10.5 -29.5996 -10.5h-288.4c-26.3994 0 -47.7998 21.4004 -47.7998 47.7998z" />
+    <glyph glyph-name="wine-glass" unicode="&#xf4e3;" horiz-adv-x="288" 
+d="M216 -16c22.0898 0 40 -17.9102 40 -40c0 -4.41992 -3.58008 -8 -8 -8h-208c-4.41992 0 -8 3.58008 -8 8c0 22.0898 17.9102 40 40 40h40v117.18c-68.4697 15.8906 -118.05 79.9102 -111.4 154.16l15.96 178.11c0.730469 8.24023 7.55078 14.5498 15.7002 14.5498h223.48
+c8.16016 0 14.9697 -6.30957 15.71 -14.5498l15.9502 -178.101c6.64941 -74.25 -42.9307 -138.27 -111.4 -154.159v-117.19h40z" />
+    <glyph glyph-name="user-alt-slash" unicode="&#xf4fa;" horiz-adv-x="640" 
+d="M633.8 -10.0996c7 -5.40039 8.2998 -15.5 2.90039 -22.3008l-19.6006 -25.2998c-5.5 -7 -15.5 -8.2002 -22.5 -2.7998l-588.399 454.7c-7 5.39941 -8.2002 15.3994 -2.7998 22.3994l19.5996 25.2002c5.5 7 15.5 8.2002 22.5 2.7998l135.5 -104.8
+c16 62.1006 71.9004 108.2 139 108.2c79.5 0 144 -64.5 144 -144c0 -54.0996 -30.2002 -100.7 -74.4004 -125.3zM198.4 128h47.3994l248.4 -192h-382.2c-26.5 0 -48 21.5 -48 48v9.59961c0 74.2002 60.2002 134.4 134.4 134.4z" />
+    <glyph glyph-name="user-astronaut" unicode="&#xf4fb;" horiz-adv-x="448" 
+d="M64 224c-8.7998 0 -16 7.2002 -16 16v96c0 8.7998 7.2002 16 16 16h13.5c24.7002 56.5 80.9004 96 146.5 96s121.8 -39.5 146.5 -96h13.5c8.7998 0 16 -7.2002 16 -16v-96c0 -8.7998 -7.2002 -16 -16 -16h-13.5c-24.7002 -56.5 -80.9004 -96 -146.5 -96
+s-121.8 39.5 -146.5 96h-13.5zM104 312v-24c0 -53 43 -96 96 -96h48c53 0 96 43 96 96v24c0 22.0996 -21.5 40 -48 40h-144c-26.5 0 -48 -17.9004 -48 -40zM176 240l-12 36l-36 12l36 12l12 36l12 -36l36 -12l-36 -12zM327.6 126.6c67.5 -7.09961 120.4 -63.5996 120.4 -133
+v-9.59961c0 -26.5 -21.5 -48 -48 -48h-80v64c0 17.7002 -14.2998 32 -32 32h-128c-17.7002 0 -32 -14.2998 -32 -32v-64h-80c-26.5 0 -48 21.5 -48 48v9.59961c0 69.4004 52.9004 125.9 120.4 133c29.8994 -19.2998 65.3994 -30.5996 103.6 -30.5996
+s73.7002 11.2998 103.6 30.5996zM272 0c8.7998 0 16 -7.2002 16 -16s-7.2002 -16 -16 -16s-16 7.2002 -16 16s7.2002 16 16 16zM176 0c8.7998 0 16 -7.2002 16 -16v-48h-32v48c0 8.7998 7.2002 16 16 16z" />
+    <glyph glyph-name="user-check" unicode="&#xf4fc;" horiz-adv-x="640" 
+d="M224 192c-70.7002 0 -128 57.2998 -128 128s57.2998 128 128 128s128 -57.2998 128 -128s-57.2998 -128 -128 -128zM313.6 160c74.2002 0 134.4 -60.2002 134.4 -134.4v-41.5996c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v41.5996
+c0 74.2002 60.2002 134.4 134.4 134.4h16.6992c22.3008 -10.2002 46.9004 -16 72.9004 -16s50.7002 5.7998 72.9004 16h16.6992zM636.6 288.4c4.60059 -4.60059 4.5 -12.1006 -0.0996094 -16.8008l-141.3 -140.199c-4.7002 -4.60059 -12.2002 -4.60059 -16.7998 0.0996094
+l-81.7002 82.2998c-4.60059 4.7002 -4.60059 12.2002 0.0996094 16.7998l28.1006 27.9004c4.69922 4.59961 12.1992 4.59961 16.7998 -0.0996094l45.5 -45.8008l104.8 104c4.7002 4.60059 12.2002 4.60059 16.7998 -0.0996094z" />
+    <glyph glyph-name="user-clock" unicode="&#xf4fd;" horiz-adv-x="640" 
+d="M496 224c79.5996 0 144 -64.4004 144 -144s-64.4004 -144 -144 -144s-144 64.4004 -144 144s64.4004 144 144 144zM560 73.7002v12.5996c0 5.2998 -4.40039 9.7002 -9.7002 9.7002h-38.2998v54.2998c0 5.2998 -4.40039 9.7002 -9.7002 9.7002h-12.5996
+c-5.2998 0 -9.7002 -4.40039 -9.7002 -9.7002v-76.5996c0 -5.2998 4.40039 -9.7002 9.7002 -9.7002h60.5996c5.2998 0 9.7002 4.40039 9.7002 9.7002zM320 80c0 -59.5 29.7998 -112.1 75.0996 -144h-347.1c-26.5 0 -48 21.5 -48 48v41.5996
+c0 74.2002 60.2002 134.4 134.4 134.4h16.6992c22.3008 -10.2002 46.9004 -16 72.9004 -16s50.7002 5.7998 72.9004 16h16.6992c8.40039 0 16.6006 -1 24.6006 -2.5c-11.5 -23.4004 -18.2002 -49.7002 -18.2002 -77.5zM224 192c-70.7002 0 -128 57.2998 -128 128
+s57.2998 128 128 128s128 -57.2998 128 -128s-57.2998 -128 -128 -128z" />
+    <glyph glyph-name="user-cog" unicode="&#xf4fe;" horiz-adv-x="640" 
+d="M610.5 74.7002l25.7998 -14.9004c2.90039 -1.7002 4.2998 -5.2002 3.2998 -8.5c-6.69922 -21.5996 -18.1992 -41.2002 -33.1992 -57.3994c-2.30078 -2.5 -6.10059 -3.10059 -9 -1.40039l-25.8008 14.9004c-10.8994 -9.30078 -23.3994 -16.5 -36.8994 -21.3008v-29.7998
+c0 -3.39941 -2.40039 -6.39941 -5.7002 -7.09961c-21.2002 -4.7998 -43.9004 -5 -66.2002 0c-3.2998 0.700195 -5.7002 3.7002 -5.7002 7.09961v29.7998c-13.5 4.80078 -26 12 -36.8994 21.3008l-25.7998 -14.9004c-3 -1.7002 -6.7002 -1.09961 -9 1.40039
+c-15 16.2998 -26.5 35.7998 -33.2002 57.3994c-1 3.2998 0.299805 6.7998 3.2998 8.5l25.7998 14.9004c-2.59961 14.0996 -2.59961 28.5 0 42.5996l-25.7998 14.9004c-2.90039 1.7002 -4.2998 5.2002 -3.2998 8.5c6.7002 21.5996 18.2002 41.2002 33.2002 57.3994
+c2.2998 2.5 6.09961 3.10059 9 1.40039l25.7998 -14.9004c10.8994 9.30078 23.3994 16.5 36.8994 21.3008v29.7998c0 3.39941 2.40039 6.39941 5.7002 7.09961c21.2002 4.7998 43.9004 5 66.2002 0c3.2998 -0.700195 5.7002 -3.7002 5.7002 -7.09961v-29.7998
+c13.5 -4.80078 26 -12 36.8994 -21.3008l25.8008 14.9004c3 1.7002 6.69922 1.09961 9 -1.40039c15 -16.1992 26.5 -35.7998 33.1992 -57.3994c1 -3.2998 -0.299805 -6.7998 -3.2998 -8.5l-25.7998 -14.9004c2.59961 -14.0996 2.59961 -28.5 0 -42.5996zM496 47.5
+c26.7998 0 48.5 21.7998 48.5 48.5s-21.7998 48.5 -48.5 48.5s-48.5 -21.7998 -48.5 -48.5s21.7002 -48.5 48.5 -48.5zM224 192c-70.7002 0 -128 57.2998 -128 128s57.2998 128 128 128s128 -57.2998 128 -128s-57.2998 -128 -128 -128zM425.2 -34.5v-9.2002
+c0 -4.09961 0.799805 -8 2 -11.7998c-7.7002 -5.2998 -17.1006 -8.5 -27.2002 -8.5h-352c-26.5 0 -48 21.5 -48 48v41.5996c0 74.2002 60.2002 134.4 134.4 134.4h16.6992c22.3008 -10.2002 46.9004 -16 72.9004 -16s50.7002 5.7998 72.9004 16h16.6992
+c3.90039 0 7.60059 -0.900391 11.4004 -1.2002c-1 -2.89941 -2.2998 -5.7998 -3.2002 -8.7002c-5.5 -17.6992 1.90039 -36.5 17.9004 -45.6992l7.89941 -4.60059c-0.0996094 -2.59961 -0.0996094 -5.2002 0 -7.7998l-7.89941 -4.59961
+c-16 -9.30078 -23.4004 -28 -17.9004 -45.7002c7.90039 -25.7002 21.9004 -49.7998 40.2002 -69.6006c7.5 -8 18 -12.5996 28.9004 -12.5996c6.7998 0 13.5996 1.90039 19.5996 5.2998l7.90039 4.60059c2.19922 -1.30078 4.5 -2.7002 6.7998 -3.90039z" />
+    <glyph glyph-name="user-edit" unicode="&#xf4ff;" horiz-adv-x="640" 
+d="M224 192c-70.7002 0 -128 57.2998 -128 128s57.2998 128 128 128s128 -57.2998 128 -128s-57.2998 -128 -128 -128zM313.6 160c39.9004 0 75.4004 -17.7998 99.9004 -45.5l-77.2998 -77.2998l-7.90039 -7.90039l-1.2002 -11.0996l-6.7998 -60.9004
+c-0.799805 -7.2998 0.200195 -14.5 2.60059 -21.2998h-274.9c-26.5 0 -48 21.5 -48 48v41.5996c0 74.2002 60.2002 134.4 134.4 134.4h16.6992c22.3008 -10.2002 46.9004 -16 72.9004 -16s50.7002 5.7998 72.9004 16h16.6992zM358.9 14.7002l137.899 137.8l71.7002 -71.7002
+l-137.9 -137.899l-60.8994 -6.80078c-10.1006 -1.19922 -18.7002 7.40039 -17.6006 17.6006zM633 179.1c9.2998 -9.39941 9.2998 -24.5 0 -33.8994l-41.7998 -41.7998l-71.7998 71.6992l4.09961 4.10059l37.7998 37.7998c9.2998 9.2998 24.5 9.2998 33.7998 0z" />
+    <glyph glyph-name="user-friends" unicode="&#xf500;" horiz-adv-x="640" 
+d="M192 192c-61.9004 0 -112 50.0996 -112 112s50.0996 112 112 112s112 -50.0996 112 -112s-50.0996 -112 -112 -112zM268.8 160c63.6006 0 115.2 -51.5996 115.2 -115.2v-28.7998c0 -26.5 -21.5 -48 -48 -48h-288c-26.5 0 -48 21.5 -48 48v28.7998
+c0 63.6006 51.5996 115.2 115.2 115.2h8.2998c20.9004 -10 43.9004 -16 68.5 -16s47.7002 6 68.5 16h8.2998zM480 192c-53 0 -96 43 -96 96s43 96 96 96s96 -43 96 -96s-43 -96 -96 -96zM528 160c61.9004 0 112 -50.0996 112 -112c0 -26.5 -21.5 -48 -48 -48h-176.6
+c0.0996094 2.09961 0.599609 4.2002 0.599609 6.40039v38.3994c0 38.6006 -15.2998 73.5 -39.7002 99.7998c16.5 9.5 35.2998 15.4004 55.7002 15.4004h3.7998c13.9004 -4.7998 28.6006 -8 44.2002 -8s30.2998 3.2002 44.2002 8h3.7998z" />
+    <glyph glyph-name="user-graduate" unicode="&#xf501;" horiz-adv-x="448" 
+d="M319.4 127.4c71.5 -3.10059 128.6 -61.6006 128.6 -133.801v-9.59961c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v9.59961c0 72.2002 57.0996 130.7 128.6 133.801l95.4004 -95.4004zM13.5996 368.2c-18.0996 4.39941 -18.0996 27.2002 0 31.5996
+l190.601 45.9004c13 3.09961 26.7002 3.09961 39.7002 0l190.399 -46c18.2002 -4.40039 18.2002 -27.1006 0 -31.5l-96.2998 -23.2002c8.7002 -17.2002 14 -36.4004 14 -57c0 -70.7002 -57.2998 -128 -128 -128s-128 57.2998 -128 128c0 20.5996 5.40039 39.7998 14 57
+l-66 15.9004v-52.6006c7 -4.2002 12 -11.5 12 -20.2998c0 -8.40039 -4.59961 -15.4004 -11.0996 -19.7002l15.5996 -62.2998c1.7002 -6.90039 -2.09961 -14 -7.59961 -14h-41.8008c-5.5 0 -9.2998 7.09961 -7.59961 14l15.5996 62.2998
+c-6.5 4.2998 -11.0996 11.2998 -11.0996 19.7002c0 8.7998 5 16.0996 12 20.2998v58.4004z" />
+    <glyph glyph-name="user-lock" unicode="&#xf502;" horiz-adv-x="640" 
+d="M224 192c-70.6455 0 -128 57.3545 -128 128s57.3545 128 128 128s128 -57.3545 128 -128s-57.3545 -128 -128 -128zM320 128v-160c0.0791016 -11.6504 3.3418 -22.6367 8.90039 -32h-280.9c-26.4922 0 -48 21.5078 -48 48v41.5996
+c0.0166016 74.1699 60.2305 134.384 134.4 134.4h16.6992c22.1426 -10.2109 47.085 -15.9072 73.0498 -15.9072c25.9639 0 50.6084 5.69629 72.751 15.9072h16.6992c5 0 9.7002 -1 14.5 -1.5c-5.06641 -9.00684 -8.02539 -19.4561 -8.09961 -30.5zM608 160
+c17.6611 0 32 -14.3389 32 -32v-160c0 -17.6611 -14.3389 -32 -32 -32h-224c-17.6611 0 -32 14.3389 -32 32v160c0 17.6611 14.3389 32 32 32h32v80c0 44.1533 35.8467 80 80 80s80 -35.8467 80 -80v-80h32zM496 16c17.6611 0 32 14.3389 32 32s-14.3389 32 -32 32
+s-32 -14.3389 -32 -32s14.3389 -32 32 -32zM528 160v80c0 17.6611 -14.3389 32 -32 32s-32 -14.3389 -32 -32v-80h64z" />
+    <glyph glyph-name="user-minus" unicode="&#xf503;" horiz-adv-x="640" 
+d="M624 240c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-192c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h192zM224 192c-70.7002 0 -128 57.2998 -128 128s57.2998 128 128 128s128 -57.2998 128 -128s-57.2998 -128 -128 -128z
+M313.6 160c74.2002 0 134.4 -60.2002 134.4 -134.4v-41.5996c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v41.5996c0 74.2002 60.2002 134.4 134.4 134.4h16.6992c22.3008 -10.2002 46.9004 -16 72.9004 -16s50.7002 5.7998 72.9004 16h16.6992z" />
+    <glyph glyph-name="user-ninja" unicode="&#xf504;" horiz-adv-x="448" 
+d="M325.4 158.8c68.5996 -6.09961 122.6 -63 122.6 -133.2v-41.5996c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v41.5996c0 70.2002 54 127.101 122.6 133.2l101.4 -101.399zM32 256c0 33.4004 17.0996 62.7998 43.0996 80
+c-26 17.2002 -43.0996 46.5996 -43.0996 80c32 0 60.0996 -15.7998 77.5 -39.7998c20.9004 42.3994 64.0996 71.7998 114.5 71.7998c70.7002 0 128 -57.2998 128 -128s-57.2998 -128 -128 -128c-58.7998 0 -107.7 39.7998 -122.8 93.7002
+c-17.4004 -18.2002 -41.9004 -29.7002 -69.2002 -29.7002zM176 352c-17.7002 0 -32 -14.2998 -32 -32h160c0 17.7002 -14.2998 32 -32 32h-96z" />
+    <glyph glyph-name="user-shield" unicode="&#xf505;" horiz-adv-x="640" 
+d="M622.3 176.9c10.7002 -4.2002 17.7002 -14 17.7002 -24.9004c0 -124.5 -81.5996 -193.9 -132.9 -213.9c-4.19922 -1.59961 -12.5996 -3.69922 -22.1992 0c-64.2002 25.1006 -132.9 102.301 -132.9 213.9c0 10.9004 7 20.7002 17.7002 24.9004l115.2 45
+c9.59961 3.69922 18.0996 1.59961 22.1992 0zM496 -14.4004c34.5996 16.4004 89.9004 64.7002 95.5 151.801l-95.5 37.2998v-189.101zM224 192c-70.7002 0 -128 57.2998 -128 128s57.2998 128 128 128s128 -57.2998 128 -128s-57.2998 -128 -128 -128zM320 152
+c0 -95.2998 45.2002 -169.1 99.2002 -212c-5.90039 -2.5 -12.4004 -4 -19.2002 -4h-352c-26.5 0 -48 21.5 -48 48v41.5996c0 74.2002 60.2002 134.4 134.4 134.4h16.6992c22.3008 -10.2002 46.9004 -16 72.9004 -16s50.7002 5.7998 72.9004 16h16.6992
+c2.60059 0 5 -0.700195 7.5 -0.799805c-0.299805 -2.40039 -1.09961 -4.7002 -1.09961 -7.2002z" />
+    <glyph glyph-name="user-slash" unicode="&#xf506;" horiz-adv-x="640" 
+d="M633.8 -10.0996c7 -5.40039 8.2998 -15.5 2.90039 -22.3008l-19.6006 -25.2998c-5.5 -7 -15.5 -8.2002 -22.5 -2.7998l-588.399 454.7c-7 5.39941 -8.2002 15.3994 -2.7998 22.3994l19.5996 25.2002c5.5 7 15.5 8.2002 22.5 2.7998l147.6 -114
+c5.40039 65.6006 59.8008 117.4 126.9 117.4c70.7002 0 128 -57.2998 128 -128c0 -55.7998 -35.9004 -102.7 -85.7002 -120.3zM96 25.5996c0 66.4004 48.2002 121.101 111.4 132.101l286.8 -221.7h-350.2c-26.5 0 -48 21.5 -48 48v41.5996z" />
+    <glyph glyph-name="user-tag" unicode="&#xf507;" horiz-adv-x="640" 
+d="M630.6 83.0996c12.5 -12.5 12.5 -32.6992 -0.0996094 -45.1992l-92.5 -92.5c-12.5 -12.5 -32.7998 -12.5 -45.2998 0l-90.2998 90.1992c-12 12 -18.7002 28.2002 -18.7002 45.2002v79.2002c0 17.7002 14.2998 32 32 32h79.2998c17 0 33.2998 -6.7002 45.2998 -18.7002z
+M447.8 104.1c13.2998 0 24 10.8008 24 24c0 13.3008 -10.7002 24 -24 24s-24 -10.6992 -24 -24c0 -13.2998 10.7002 -24 24 -24zM224 192.1c-70.7002 0 -128 57.3008 -128 127.9c0 70.7002 57.2998 128 128 128s128 -57.2998 128 -127.9c0 -70.6992 -57.2998 -128 -128 -128
+zM351.8 80.9004c0 -25.7002 10 -49.8008 28.1006 -67.9004l58 -58c-8.80078 -11.4004 -22.4004 -18.9004 -37.9004 -18.9004h-352c-26.5 0 -48 21.5 -48 48v41.6006c0 74.2002 60.2002 134.399 134.4 134.5h16.6992c22.3008 -10.2002 46.9004 -16 72.9004 -16
+s50.7002 5.7998 72.9004 16h16.6992c13.3008 0 26 -2.60059 38.2002 -6.2002v-73.0996z" />
+    <glyph glyph-name="user-tie" unicode="&#xf508;" horiz-adv-x="448" 
+d="M224 192c-70.7002 0 -128 57.2998 -128 128s57.2998 128 128 128s128 -57.2998 128 -128s-57.2998 -128 -128 -128zM319.8 159.4c71.2998 -3.40039 128.2 -61.7002 128.2 -133.801v-41.5996c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v41.5996
+c0 72.1006 56.9004 130.4 128.2 133.801l47.7998 -191.4l32 136l-32 56h96l-32 -56l32 -136z" />
+    <glyph glyph-name="users-cog" unicode="&#xf509;" horiz-adv-x="640" 
+d="M610.5 106.7l25.7998 -14.9004c2.90039 -1.7002 4.2998 -5.2002 3.2998 -8.5c-6.69922 -21.5996 -18.1992 -41.2002 -33.1992 -57.3994c-2.30078 -2.5 -6.10059 -3.10059 -9 -1.40039l-25.8008 14.9004c-10.8994 -9.30078 -23.3994 -16.5 -36.8994 -21.3008v-29.7998
+c0 -3.39941 -2.40039 -6.39941 -5.7002 -7.09961c-21.2002 -4.7998 -43.9004 -5 -66.2002 0c-3.2998 0.700195 -5.7002 3.7002 -5.7002 7.09961v29.7998c-13.5 4.80078 -26 12 -36.8994 21.3008l-25.7998 -14.9004c-3 -1.7002 -6.7002 -1.09961 -9 1.40039
+c-15 16.2998 -26.5 35.7998 -33.2002 57.3994c-1 3.2998 0.299805 6.7998 3.2998 8.5l25.7998 14.9004c-2.59961 14.0996 -2.59961 28.5 0 42.5996l-25.7998 14.9004c-2.90039 1.7002 -4.2998 5.2002 -3.2998 8.5c6.7002 21.5996 18.2002 41.2002 33.2002 57.3994
+c2.2998 2.5 6.09961 3.10059 9 1.40039l25.7998 -14.9004c10.8994 9.30078 23.3994 16.5 36.8994 21.3008v29.7998c0 3.39941 2.40039 6.39941 5.7002 7.09961c21.2002 4.7998 43.9004 5 66.2002 0c3.2998 -0.700195 5.7002 -3.7002 5.7002 -7.09961v-29.7998
+c13.5 -4.80078 26 -12 36.8994 -21.3008l25.8008 14.9004c3 1.7002 6.69922 1.09961 9 -1.40039c15 -16.1992 26.5 -35.7998 33.1992 -57.3994c1 -3.2998 -0.299805 -6.7998 -3.2998 -8.5l-25.7998 -14.9004c2.59961 -14.0996 2.59961 -28.5 0 -42.5996zM496 79.5
+c26.7998 0 48.5 21.7998 48.5 48.5s-21.7998 48.5 -48.5 48.5s-48.5 -21.7998 -48.5 -48.5s21.7002 -48.5 48.5 -48.5zM96 224c-35.2998 0 -64 28.7002 -64 64s28.7002 64 64 64s64 -28.7002 64 -64s-28.7002 -64 -64 -64zM320 192c-61.9004 0 -112 50.0996 -112 112
+s50 111.9 111.9 111.9c61.8994 0 112 -50.1006 112 -112c0 -17.2002 -4.2002 -33.4004 -11.2002 -48c-0.799805 -0.5 -1.60059 -0.900391 -2.40039 -1.40039l-7.89941 4.59961c-5.90039 3.5 -12.7002 5.30078 -19.6006 5.30078c-11 0 -21.5 -4.60059 -28.8994 -12.6006
+c-15.8008 -17.0996 -28 -37.5 -36.3008 -59.2002c-1.89941 -0.0996094 -3.69922 -0.599609 -5.59961 -0.599609zM425.2 -2.5v-9.2002c0 -7.5 2.5 -14.2998 6.2002 -20.2998h-255.4c-26.5 0 -48 21.5 -48 48v28.7998c0 63.6006 51.5996 115.2 115.3 115.2h8.2998
+c20.9004 -10 43.9004 -16 68.5 -16c3.30078 0 6.5 0.400391 9.80078 0.599609c2.7998 -3.09961 6 -5.89941 9.7998 -8.09961l7.89941 -4.59961c-0.0996094 -2.60059 -0.0996094 -5.2002 0 -7.80078c-0.899414 -0.599609 -36.5 -15.7998 -25.7998 -50.2998
+c7.90039 -25.7002 21.9004 -49.7998 40.2002 -69.5996c7.5 -8 18 -12.6006 28.9004 -12.6006c12.1992 0 19.2998 5 27.5 9.80078c2.19922 -1.30078 4.5 -2.7002 6.7998 -3.90039zM173.1 173.4c-40.2998 -22.1006 -68.8994 -62 -75.1992 -109.4h-65.9004
+c-17.7002 0 -32 14.2998 -32 32v32c0 35.2998 28.7002 64 64 64h64c17.5996 0 33.5 -7.09961 45.0996 -18.5996z" />
+    <glyph glyph-name="balance-scale-left" unicode="&#xf515;" horiz-adv-x="640" 
+d="M528 0c8.83984 0 16 -7.16016 16.0098 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-224c-8.83984 0 -16 7.16016 -16 16v342.75c-4.55957 2 -8.91992 4.34961 -12.9902 7.12012l-142.05 -47.6299c-8.37988 -2.81055 -17.4502 1.7002 -20.2598 10.0801l-10.1699 30.3398
+c-2.80957 8.37988 1.7002 17.4502 10.0801 20.2598l128.39 43.0498c-0.419922 3.32031 -1.00977 6.60059 -1.00977 10.0303c0 44.1797 35.8203 80 80 80c29.6904 0 55.2998 -16.3604 69.1104 -40.3701l117.92 39.5303c8.37988 2.80957 17.4502 -1.7002 20.2598 -10.0801
+l10.1699 -30.3398c2.80957 -8.37988 -1.7002 -17.4502 -10.0801 -20.2598l-132 -44.2607c-7.28027 -21.25 -22.96 -38.5293 -43.3799 -47.4697v-294.75h176zM639.98 144c0 -44.1797 -57.29 -80 -127.98 -80s-128 35.8203 -128 80h0.0195312
+c0 15.6699 -2.0791 7.25 85.04 181.51c17.6807 35.3604 68.2207 35.29 85.8701 0c86.3906 -172.779 85.0508 -165.33 85.0508 -181.51zM440 160h144l-72 144zM170.93 197.51c86.3906 -172.779 85.0508 -165.33 85.0508 -181.51h0.0195312c0 -44.1797 -57.3096 -80 -128 -80
+s-128 35.8203 -128 80h0.0195312c0 15.6699 -2.0791 7.25 85.04 181.51c17.6807 35.3604 68.2207 35.29 85.8701 0zM56 32h144l-72 144z" />
+    <glyph glyph-name="balance-scale-right" unicode="&#xf516;" horiz-adv-x="640" 
+d="M96 -16c0 8.83984 7.16016 16 16 16h175.99v294.76c-20.4199 8.93066 -36.1006 26.2207 -43.3799 47.4707l-132 44.2598c-8.37012 2.80957 -12.8906 11.8799 -10.0801 20.2598l10.1699 30.3398c2.80957 8.37012 11.8799 12.8906 20.2598 10.0801l117.93 -39.54
+c13.8105 24.0098 39.4199 40.3701 69.1104 40.3701c44.1797 0 80 -35.8203 80 -80c0 -3.42969 -0.589844 -6.70996 -1.00977 -10.0303l128.399 -43.0498c8.37012 -2.80957 12.8906 -11.8799 10.0801 -20.2598l-10.1699 -30.3398
+c-2.80957 -8.37012 -11.8799 -12.8906 -20.2598 -10.0801l-142.05 47.6299c-4.07031 -2.77051 -8.43066 -5.12012 -12.9902 -7.12012v-342.75c0 -8.83984 -7.16016 -16 -16 -16h-224c-8.83984 0 -16 7.16016 -16 16v32zM0 144c0 16.1797 -1.32031 8.73047 85.0596 181.51
+c17.6504 35.29 68.1904 35.3604 85.8701 0c87.1299 -174.26 85.0508 -165.84 85.0508 -181.51h0.0195312c0 -44.1797 -57.3096 -80 -128 -80s-128 35.8203 -128 80zM56 160h144l-72 144zM384.02 16c0 16.1797 -1.33984 8.73047 85.04 181.51
+c17.6504 35.29 68.1904 35.3604 85.8701 0c87.1299 -174.26 85.0508 -165.84 85.0508 -181.51h0.0195312c0 -44.1797 -57.3096 -80 -128 -80s-128 35.8203 -128 80h0.0195312zM440 32h144l-72 144z" />
+    <glyph glyph-name="blender" unicode="&#xf517;" 
+d="M416 64c35.3496 0 64 -28.6504 64 -64v-32c0 -17.6699 -14.3301 -32 -32 -32h-320c-17.6699 0 -32 14.3301 -32 32v32c0 35.3496 28.6504 64 64 64h256zM288 -32c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM328 384
+c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h157.82l-17.46 -64h-140.36c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h131.64l-17.46 -64h-114.18c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h105.46l-17.46 -64
+h-256l-8.73047 96h-103.27c-26.5098 0 -48 21.4902 -48 48v160c0 26.5098 21.4902 48 48 48h464l-17.46 -64h-166.54zM64 256h81.46l-11.6396 128h-69.8203v-128z" />
+    <glyph glyph-name="book-open" unicode="&#xf518;" horiz-adv-x="576" 
+d="M542.22 415.95c18.4199 1.04004 33.7803 -12.9902 33.7705 -30.7002v-337.84c0 -16.2305 -13.1299 -29.7705 -30.0205 -30.6602c-49.4697 -2.59961 -149.52 -12.0996 -218.7 -46.9199c-10.6494 -5.36035 -23.2793 1.93945 -23.2793 13.4902v363.87
+c0 5.2793 2.62988 10.3291 7.26953 13.1699c67.2402 41.1592 176.16 52.4795 230.96 55.5898zM264.73 360.36c4.64941 -2.85059 7.26953 -7.7002 7.26953 -12.9902v-364.12c0 -11.5195 -12.5898 -18.8096 -23.21 -13.46c-69.1797 34.8398 -169.28 44.3496 -218.771 46.9502
+c-16.8896 0.879883 -30.0195 14.4199 -30.0195 30.6602v337.85c0 17.71 15.3604 31.7402 33.7803 30.7002c54.7998 -3.12012 163.72 -14.4307 230.95 -55.5898z" />
+    <glyph glyph-name="broadcast-tower" unicode="&#xf519;" horiz-adv-x="640" 
+d="M150.94 256c-7.01074 0 -13.46 4.5 -15.4004 11.2402c-4.90039 16.9697 -7.54004 34.6396 -7.54004 52.7598s2.63965 35.79 7.53027 52.7695c1.9502 6.74023 8.39941 11.2305 15.4102 11.2305h33.7295c11.0098 0 18.6201 -10.8301 14.8604 -21.1797
+c-4.93066 -13.5801 -7.5498 -27.9805 -7.5498 -42.8203s2.61914 -29.2402 7.5498 -42.8203c3.75 -10.3496 -3.85059 -21.1797 -14.8604 -21.1797h-33.7295zM89.9199 424.66c-16.54 -31.1406 -49.6104 -115.97 0.169922 -209.29
+c5.66016 -10.6299 -1.92969 -23.3701 -13.9502 -23.3701h-34.8398c-6.18945 0 -11.9902 3.50977 -14.6094 9.13965c-23.5703 50.5303 -26.6904 94.1104 -26.6904 118.86c0 42.3496 9.40039 82.46 25.8896 118.69c2.60059 5.71973 8.4707 9.30957 14.7402 9.30957h35.3301
+c12.0098 0 19.5996 -12.7197 13.96 -23.3398zM614.06 438.71c16.5205 -36.2295 25.9404 -76.3496 25.9404 -118.71s-9.42969 -82.4805 -25.96 -118.71c-2.59961 -5.70996 -8.45996 -9.29004 -14.7305 -9.29004h-35.2295c-12.1104 0 -19.6299 12.8398 -13.9102 23.5195
+c48.1396 89.8105 17.9902 174.94 -0.280273 209.23c-5.63965 10.5898 2.04004 23.25 14.0205 23.25h35.4199c6.26953 0 12.1299 -3.58008 14.7295 -9.29004zM489.06 384c7.01074 0 13.46 -4.49023 15.4004 -11.2402c4.90039 -16.9697 7.54004 -34.6396 7.54004 -52.7598
+s-2.62988 -35.79 -7.53027 -52.7598c-1.9502 -6.75 -8.38965 -11.2402 -15.4102 -11.2402h-33.7295c-11.0098 0 -18.6201 10.8301 -14.8604 21.1797c4.93066 13.5801 7.5498 27.9805 7.5498 42.8203s-2.61914 29.2402 -7.5498 42.8203
+c-3.75 10.3496 3.85059 21.1797 14.8604 21.1797h33.7295zM372.76 283.88l130.5 -313.41c3.39062 -8.14941 -0.459961 -17.5195 -8.60938 -20.9199l-29.5107 -12.3096c-8.14941 -3.40039 -17.5098 0.450195 -20.9092 8.60938l-49.2002 118.15h-150.07l-49.1904 -118.15
+c-3.38965 -8.14941 -12.7598 -12.0098 -20.9092 -8.60938l-29.5107 12.3096c-8.14941 3.40039 -12.0098 12.7705 -8.60938 20.9199l130.5 313.41c-7.0498 10.29 -11.2002 22.71 -11.2002 36.1201c0 35.3496 28.6396 64 63.96 64c35.3301 0 63.96 -28.6504 63.96 -64
+c0 -13.4102 -4.15039 -25.8301 -11.2002 -36.1201zM271.62 128h96.7598l-48.3799 116.19z" />
+    <glyph glyph-name="broom" unicode="&#xf51a;" horiz-adv-x="640" 
+d="M256.47 231.23l86.7305 -109.181s-16.6006 -102.359 -76.5703 -150.12c-59.9697 -47.7793 -266.63 -34.1201 -266.63 -34.1201s3.7998 23.1406 11 55.4307l94.6201 112.17c3.96973 4.7002 -0.870117 11.6201 -6.65039 9.5l-60.3994 -22.0898
+c14.4395 41.6602 32.7197 80.04 54.5996 97.4697c59.9697 47.7598 163.3 40.9404 163.3 40.9404zM636.53 416.97c5.48926 -6.91016 4.33984 -16.96 -2.5498 -22.4395l-232.48 -177.8l34.0898 -42.9209c5.08008 -6.39941 1.66016 -15.9092 -6.33984 -17.5996
+l-58.7998 -12.4502l-86.7305 109.181l25.3301 54.5498c3.4502 7.41992 13.5 8.62012 18.5898 2.20996l34.1406 -42.9697l232.479 177.8c6.89062 5.48926 16.9199 4.33984 22.4102 -2.56055z" />
+    <glyph glyph-name="chalkboard" unicode="&#xf51b;" horiz-adv-x="640" 
+d="M96 384v-352h-64v376c0 22.0596 17.9404 40 40 40h496c22.0596 0 40 -17.9404 40 -40v-376h-64v352h-448zM624 0c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-608c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h272v64h192v-64
+h144z" />
+    <glyph glyph-name="chalkboard-teacher" unicode="&#xf51c;" horiz-adv-x="640" 
+d="M208 96c62.0596 0 112.33 -50.4805 112 -112.62c-0.139648 -26.2598 -21.7305 -47.3799 -48 -47.3799h-224c-26.2695 0 -47.8604 21.1201 -48 47.3799c-0.330078 62.1396 49.9404 112.62 112 112.62c2.38965 0 4.76953 -0.349609 7.0498 -1.08984
+c12.9697 -4.20996 26.6006 -6.91016 40.9502 -6.91016s27.9805 2.7002 40.9404 6.91016c2.2793 0.740234 4.66992 1.08984 7.05957 1.08984zM160 128c-53.0195 0 -96 42.9805 -96 96s42.9805 96 96 96s96 -42.9805 96 -96s-42.9805 -96 -96 -96zM592 448
+c26.4697 0 48 -22.25 48 -49.5898v-316.82c0 -27.3398 -21.5303 -49.5898 -48 -49.5898h-244.55c-6.57031 25.2695 -20.5898 47.3096 -39.6904 64h76.2402v64h128v-64h64v288h-352v-49.7998c-18.9004 11.0195 -40.5801 17.7998 -64 17.7998v46.4102
+c0 27.3398 21.5303 49.5898 48 49.5898h384z" />
+    <glyph glyph-name="church" unicode="&#xf51d;" horiz-adv-x="640" 
+d="M464.46 201.32c9.63965 -5.78027 15.54 -16.2002 15.54 -27.4404v-237.88h-96v96c0 35.3496 -28.6504 64 -64 64s-64 -28.6504 -64 -64v-96h-96v237.88c0 11.6572 6.21387 21.8467 15.54 27.4404l112.46 67.4795v51.2002h-48c-8.83984 0 -16 7.16016 -16 16v32
+c0 8.83984 7.16016 16 16 16h48v48c0 8.83984 7.16016 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-48h48c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-48v-51.2002zM0 52.04c0.00292969 13.1953 7.97949 24.5215 19.3896 29.4199l108.61 46.54
+v-192h-112c-8.83984 0 -16 7.16016 -16 16v100.04zM620.61 81.46c11.7598 -5.0498 19.3896 -16.6201 19.3896 -29.4199v-100.04c0 -8.83984 -7.16016 -16 -16 -16h-112v192z" />
+    <glyph glyph-name="coins" unicode="&#xf51e;" 
+d="M0 42.7002c41.2998 -29.1006 116.8 -42.7002 192 -42.7002s150.7 13.5996 192 42.7002v-42.7002c0 -35.2998 -86 -64 -192 -64s-192 28.7002 -192 64v42.7002zM320 320c-106 0 -192 28.7002 -192 64s86 64 192 64s192 -28.7002 192 -64s-86 -64 -192 -64zM0 147.6
+c41.2998 -34 116.9 -51.5996 192 -51.5996s150.7 17.5996 192 51.5996v-51.5996c0 -35.2998 -86 -64 -192 -64s-192 28.7002 -192 64v51.5996zM416 136.6v63.6006c38.7002 6.89941 72.7998 18.0996 96 34.5v-42.7002c0 -23.7002 -38.7002 -44.2998 -96 -55.4004zM192 288
+c106 0 192 -35.7998 192 -80s-86 -80 -192 -80s-192 35.7998 -192 80s86 80 192 80zM411.3 231.7c-8.7998 23.7002 -30.5 42.8994 -60 57.2002c64.2002 3.19922 125.2 16.6992 160.7 41.7998v-42.7002c0 -24.2998 -40.7002 -45.5 -100.7 -56.2998z" />
+    <glyph glyph-name="compact-disc" unicode="&#xf51f;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM88 192c0 88.2002 71.7998 160 160 160v32c-105.9 0 -192 -86.0996 -192 -192h32zM248 96c53 0 96 43 96 96s-43 96 -96 96s-96 -43 -96 -96s43 -96 96 -96zM248 224
+c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32s-32 14.2998 -32 32s14.2998 32 32 32z" />
+    <glyph glyph-name="crow" unicode="&#xf520;" horiz-adv-x="640" 
+d="M544 416c53.0195 0 96 -28.6504 96 -64l-96 -16v-80c0 -87.2598 -58.2598 -160.8 -137.97 -184.14l41.2393 -111.53c2.27051 -6.23047 -0.939453 -13.1104 -7.16992 -15.3799l-22.5498 -8.20996c-6.22949 -2.27051 -13.1094 0.939453 -15.3799 7.16992l-44.5098 120.38
+c-1.90039 -0.0595703 -3.75 -0.290039 -5.66016 -0.290039h-39.0596l38.3291 -103.68c2.27051 -6.23047 -0.939453 -13.1104 -7.16992 -15.3799l-22.5498 -8.20996c-6.22949 -2.27051 -13.1094 0.939453 -15.3799 7.16992l-44.4102 120.1h-96.4902l-121.539 -60.7695
+c-20.0908 -10.04 -43.7305 4.56934 -43.7305 27.0293c0.00195312 9.8877 4.7373 18.6572 12.0898 24.1699l371.91 292.59v20.9805c0 44.1797 35.8203 80 80 80c26.0898 0 49.04 -12.6797 63.6396 -32h16.3604zM464 344c13.25 0 24 10.75 24 24c0 13.2598 -10.75 24 -24 24
+s-24 -10.7402 -24 -24c0 -13.25 10.75 -24 24 -24z" />
+    <glyph glyph-name="crown" unicode="&#xf521;" horiz-adv-x="640" 
+d="M528 0c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-416c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h416zM592 320c26.5 0 48 -21.5 48 -48s-21.5 -48 -48 -48c-2.59961 0 -5.2002 0.400391 -7.7002 0.799805l-72.2998 -192.8h-384
+l-72.2998 192.8c-2.5 -0.399414 -5.10059 -0.799805 -7.7002 -0.799805c-26.5 0 -48 21.5 -48 48s21.5996 48 48.0996 48s48 -21.5 48 -48c0 -7.09961 -1.69922 -13.7998 -4.39941 -19.7998l72.2998 -43.4004c15.2998 -9.2002 35.2998 -4 44.2002 11.6006l81.5 142.6
+c-10.7002 8.7998 -17.7002 22 -17.7002 37c0 26.5 21.5 48 48 48s48 -21.5 48 -48c0 -15 -7 -28.2002 -17.7002 -37l81.5 -142.6c8.90039 -15.6006 28.7998 -20.8008 44.2002 -11.6006l72.4004 43.4004c-2.80078 6.09961 -4.40039 12.7002 -4.40039 19.7998
+c0 26.5 21.5 48 48 48z" />
+    <glyph glyph-name="dice" unicode="&#xf522;" horiz-adv-x="640" 
+d="M592 256c26.5098 0 48 -21.4902 48 -48v-224c0 -26.5098 -21.4902 -48 -48 -48h-224c-26.5098 0 -48 21.4902 -48 48v46.4199l136.26 136.26c24.1201 24.1201 29.6904 59.7305 17 89.3203h118.74zM480 72c13.25 0 24 10.75 24 24c0 13.2598 -10.75 24 -24 24
+s-24 -10.7402 -24 -24c0 -13.25 10.75 -24 24 -24zM433.63 258.7c19.1602 -19.1602 19.1602 -50.2305 0 -69.4004l-174.939 -174.93c-19.1602 -19.1602 -50.2305 -19.1602 -69.3906 0l-174.93 174.939c-19.1602 19.1602 -19.1602 50.2305 0 69.3906l174.939 174.93
+c19.1602 19.1602 50.2305 19.1602 69.3906 0zM96 200c13.25 0 24 10.75 24 24c0 13.2598 -10.75 24 -24 24s-24 -10.7402 -24 -24c0 -13.25 10.75 -24 24 -24zM224 72c13.25 0 24 10.75 24 24c0 13.2598 -10.75 24 -24 24s-24 -10.7402 -24 -24c0 -13.25 10.75 -24 24 -24z
+M224 200c13.25 0 24 10.75 24 24c0 13.2598 -10.75 24 -24 24s-24 -10.7402 -24 -24c0 -13.25 10.75 -24 24 -24zM224 328c13.25 0 24 10.75 24 24c0 13.2598 -10.75 24 -24 24s-24 -10.7402 -24 -24c0 -13.25 10.75 -24 24 -24zM352 200c13.25 0 24 10.75 24 24
+c0 13.2598 -10.75 24 -24 24s-24 -10.7402 -24 -24c0 -13.25 10.75 -24 24 -24z" />
+    <glyph glyph-name="dice-five" unicode="&#xf523;" horiz-adv-x="448" 
+d="M384 416c35.3496 0 64 -28.6504 64 -64v-320c0 -35.3496 -28.6504 -64 -64 -64h-320c-35.3496 0 -64 28.6504 -64 64v320c0 35.3496 28.6504 64 64 64h320zM128 64c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM128 256
+c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM224 160c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM320 64c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32
+s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM320 256c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="dice-four" unicode="&#xf524;" horiz-adv-x="448" 
+d="M384 416c35.3496 0 64 -28.6504 64 -64v-320c0 -35.3496 -28.6504 -64 -64 -64h-320c-35.3496 0 -64 28.6504 -64 64v320c0 35.3496 28.6504 64 64 64h320zM128 64c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM128 256
+c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM320 64c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM320 256c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32
+s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="dice-one" unicode="&#xf525;" horiz-adv-x="448" 
+d="M384 416c35.3496 0 64 -28.6504 64 -64v-320c0 -35.3496 -28.6504 -64 -64 -64h-320c-35.3496 0 -64 28.6504 -64 64v320c0 35.3496 28.6504 64 64 64h320zM224 160c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="dice-six" unicode="&#xf526;" horiz-adv-x="448" 
+d="M384 416c35.3496 0 64 -28.6504 64 -64v-320c0 -35.3496 -28.6504 -64 -64 -64h-320c-35.3496 0 -64 28.6504 -64 64v320c0 35.3496 28.6504 64 64 64h320zM128 64c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM128 160
+c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM128 256c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM320 64c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32
+s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM320 160c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM320 256c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="dice-three" unicode="&#xf527;" horiz-adv-x="448" 
+d="M384 416c35.3496 0 64 -28.6504 64 -64v-320c0 -35.3496 -28.6504 -64 -64 -64h-320c-35.3496 0 -64 28.6504 -64 64v320c0 35.3496 28.6504 64 64 64h320zM128 256c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM224 160
+c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM320 64c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="dice-two" unicode="&#xf528;" horiz-adv-x="448" 
+d="M384 416c35.3496 0 64 -28.6504 64 -64v-320c0 -35.3496 -28.6504 -64 -64 -64h-320c-35.3496 0 -64 28.6504 -64 64v320c0 35.3496 28.6504 64 64 64h320zM128 256c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM320 64
+c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="divide" unicode="&#xf529;" horiz-adv-x="448" 
+d="M224 96c35.3496 0 64 -28.6504 64 -64s-28.6504 -64 -64 -64s-64 28.6504 -64 64s28.6504 64 64 64zM224 288c-35.3496 0 -64 28.6504 -64 64s28.6504 64 64 64s64 -28.6504 64 -64s-28.6504 -64 -64 -64zM416 240c17.6699 0 32 -14.3301 32 -32v-32
+c0 -17.6699 -14.3301 -32 -32 -32h-384c-17.6699 0 -32 14.3301 -32 32v32c0 17.6699 14.3301 32 32 32h384z" />
+    <glyph glyph-name="door-closed" unicode="&#xf52a;" horiz-adv-x="640" 
+d="M624 0c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-608c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h111.99v397.2c0 28.0195 21.5293 50.7998 48 50.7998h288.01c26.4697 0 48 -22.7803 48 -50.7998v-397.2h112zM415.99 160
+c17.6797 0 32.0098 14.3301 32 32c0 17.6699 -14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="door-open" unicode="&#xf52b;" horiz-adv-x="640" 
+d="M624 0c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-144v384h-96v64h112c26.4697 0 48 -22.1904 48 -49.4502v-334.55h80zM312.24 446.99c20.2002 5.24023 39.7598 -10.5898 39.7598 -32.1699v-478.82h-336c-8.83984 0 -16 7.16016 -16 16v32
+c0 8.83984 7.16016 16 16 16h80v365.08c0 15.2197 9.99023 28.4795 24.2402 32.1699zM264 160c13.25 0 24 14.3301 24 32s-10.75 32 -24 32s-24 -14.3301 -24 -32s10.75 -32 24 -32z" />
+    <glyph glyph-name="equals" unicode="&#xf52c;" horiz-adv-x="448" 
+d="M416 144c17.6699 0 32 -14.3301 32 -32v-32c0 -17.6699 -14.3301 -32 -32 -32h-384c-17.6699 0 -32 14.3301 -32 32v32c0 17.6699 14.3301 32 32 32h384zM416 336c17.6699 0 32 -14.3301 32 -32v-32c0 -17.6699 -14.3301 -32 -32 -32h-384c-17.6699 0 -32 14.3301 -32 32
+v32c0 17.6699 14.3301 32 32 32h384z" />
+    <glyph glyph-name="feather" unicode="&#xf52d;" 
+d="M467.14 403.16c50.5703 -50.5205 61.7002 -124.9 16.2607 -199.36l-131.54 -43.7998h97.7793c-9.92969 -10.6797 3.68066 3.07031 -46.3096 -46.8604l-147.57 -49.1396h98.1904c-74.9502 -73.1104 -194.53 -70.6504 -246.83 -54.9404l-66.1006 -66.0293
+c-9.37988 -9.37012 -24.5996 -9.37012 -33.9795 0s-9.37988 24.5693 0 33.9395l259.52 259.25c6.25 6.25 6.25 16.3799 0 22.6299s-16.3896 6.25 -22.6494 0l-178.44 -178.25c-6.75 60.3408 3.18066 150.78 63.6406 211.17c24.7695 24.7402 7.13965 7.14062 85.75 85.6602
+c90.6094 90.5107 189.729 88.21 252.279 25.7305z" />
+    <glyph glyph-name="frog" unicode="&#xf52e;" horiz-adv-x="576" 
+d="M446.53 350.57c0 0 58.4297 -19.0605 98.9893 -41.2803c18.7607 -10.2803 30.4805 -29.8301 30.4805 -51.2305c0 -21.793 -11.9512 -40.7695 -29.71 -50.7295l-154.44 -86.6504l98.5205 -104.68h53.6299c17.6699 0 32 -14.3301 32 -32c0 -8.83984 -7.16016 -16 -16 -16
+h-90.3799l-118.53 125.94c5.07031 54.1494 -29.9297 85.0596 -40.7998 93.21c-36.8496 27.6191 -88.29 27.6592 -125.13 0l-34.7803 -26.0908c-7.07031 -5.2998 -8.49023 -15.3291 -3.18945 -22.4092c5.31934 -7.10059 15.3496 -8.5 22.4092 -3.19043l32.7607 24.5898
+c20.6895 15.5303 48.3496 20.8105 72.2393 10.8799c44.0605 -18.3193 57.8506 -70.3701 33.71 -106.6l-35.7998 -48.3301h79.4902c17.6699 0 32 -14.3301 32 -32c0 -8.83984 -7.16016 -16 -16 -16h-304c-34.9199 0 -63.8896 28.0996 -64 63.0195
+c-0.5 166.86 126.75 304.021 289.46 319.44c6.82031 37.25 39.3096 65.54 78.54 65.54c39.1904 0 71.6699 -28.2305 78.5303 -65.4297zM368 312c13.25 0 24 10.75 24 24c0 13.2598 -10.75 24 -24 24c-13.2598 0 -24 -10.7402 -24 -24c0 -13.25 10.7402 -24 24 -24z" />
+    <glyph glyph-name="gas-pump" unicode="&#xf52f;" 
+d="M336 0c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-320c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h320zM493.2 340.7c12 -12 18.7998 -28.2998 18.7998 -45.2998v-223.4c0 -42.2002 -36.5 -76 -79.5 -71.7002
+c-37.5 3.90039 -64.5 38.2002 -64.5 75.9004v27.7998c0 22.0996 -17.9004 40 -40 40h-8v-112h-288v352c0 35.2998 28.7002 64 64 64h160c35.2998 0 64 -28.7002 64 -64v-192h8c48.5996 0 88 -39.4004 88 -88v-32c0 -13.2002 10.7998 -24 24 -24s24 10.7998 24 24v160.8
+c-27.0996 3.90039 -48 27.1006 -48 55.2002v62.0996l-37.7002 37.7002c-6.2002 6.2002 -6.2002 16.4004 0 22.6006l11.2998 11.2998c6.2002 6.2002 16.4004 6.2002 22.6006 0zM256 256v128h-160v-128h160z" />
+    <glyph glyph-name="glasses" unicode="&#xf530;" horiz-adv-x="576" 
+d="M574.1 167.63c1.26074 -5.07031 1.90039 -10.2695 1.90039 -15.5v-70.25c0 -62.8896 -51.5801 -113.88 -115.2 -113.88h-37.1201c-60.2793 0 -110.37 45.9404 -114.87 105.37l-2.92969 38.6299h-35.75l-2.92969 -38.6299
+c-4.50977 -59.4297 -54.6006 -105.37 -114.88 -105.37h-37.1201c-63.6201 0 -115.2 50.9902 -115.2 113.89v70.25c0.000976562 5.35059 0.663086 10.5205 1.90039 15.4902l45.3398 181.73c5.91016 23.6895 21.5898 44.0293 43 55.7998
+c21.4395 11.7402 46.9697 14.1094 70.1895 6.33008l15.25 -5.08008c8.39062 -2.79004 12.9199 -11.8604 10.1201 -20.2402l-5.05957 -15.1797c-2.79004 -8.37988 -11.8506 -12.9102 -20.2305 -10.1201l-13.1699 4.38965
+c-10.8701 3.62012 -22.9902 3.57031 -33.1494 -1.72949c-10.29 -5.36035 -17.5908 -14.5605 -20.3809 -25.8105l-38.46 -153.83c22.1904 6.81055 49.79 12.46 81.21 12.46c34.7803 0 73.9902 -7.00977 114.86 -26.75h73.1797
+c40.8701 19.7207 80.0801 26.7402 114.851 26.7402c31.4102 0 59.0098 -5.64941 81.2002 -12.46l-38.46 153.82c-2.80078 11.2598 -10.0801 20.4502 -20.3701 25.8193c-10.1602 5.30078 -22.29 5.35059 -33.1602 1.73047l-13.1797 -4.38965
+c-8.38086 -2.79004 -17.4404 1.73926 -20.2305 10.1201l-5.05957 15.1797c-2.80078 8.37988 1.72949 17.4502 10.1191 20.2402l15.25 5.08008c23.2207 7.7793 48.75 5.39941 70.1904 -6.33008c21.4102 -11.7607 37.0898 -32.1104 43 -55.8105zM203.38 78.21l3.12988 41.2197
+c-22.6699 8.58984 -46.0693 12.9199 -69.9297 12.9199c-29.1602 0 -54.46 -6.42969 -72.5801 -12.9199v-37.54c0 -27.5098 22.9697 -49.8896 51.2002 -49.8896h37.1201c26.6602 0 49.0898 20.2998 51.0596 46.21zM512 81.8799l-0.00976562 37.54
+c-18.1201 6.49023 -43.4307 12.9297 -72.5498 12.9297c-23.8701 0 -47.2803 -4.33008 -69.9502 -12.9199l3.12988 -41.2197c1.95996 -25.9102 24.3896 -46.21 51.0596 -46.21h37.1201c28.2305 0 51.2002 22.3701 51.2002 49.8799z" />
+    <glyph glyph-name="greater-than" unicode="&#xf531;" horiz-adv-x="384" 
+d="M365.52 238.15c11.2803 -5.25 18.4805 -16.5605 18.4902 -29.0107v-34.2295c-0.00195312 -12.8398 -7.55469 -23.9062 -18.4795 -29l-306.471 -142.91c-16.0195 -7.46973 -35.0596 -0.540039 -42.5293 15.4805l-13.5205 29
+c-7.46973 16.0195 -0.540039 35.0596 15.4805 42.5293l218.47 101.891l-218.43 101.85c-16.0605 7.49023 -23.0107 26.5801 -15.5205 42.6396l13.5703 29.0801c7.49023 16.0605 26.5801 23.0107 42.6396 15.5205z" />
+    <glyph glyph-name="greater-than-equal" unicode="&#xf532;" horiz-adv-x="448" 
+d="M55.2197 340.31c-18.29 6 -27.7393 24.2607 -21.0996 40.79l12.0303 29.9199c6.63965 16.5303 26.8594 25.0605 45.1494 19.0605l301.72 -119.98c13.7705 -4.51953 22.9805 -16.6094 22.9805 -30.1699v-15.96c0 -13.5596 -9.20996 -25.6494 -22.9805 -30.1699
+l-301.409 -119.859c-18.3906 -6.04004 -38.7002 2.54004 -45.3799 19.1494l-12.0908 30.0801c-6.67969 16.6104 2.81055 34.9697 21.2002 41l175.44 68.0498zM424 48c13.25 0 24 -10.7402 24 -24v-48c0 -13.25 -10.75 -24 -24 -24h-400c-13.25 0 -24 10.75 -24 24v48
+c0 13.2598 10.75 24 24 24h400z" />
+    <glyph glyph-name="helicopter" unicode="&#xf533;" horiz-adv-x="640" 
+d="M304 64c-10.4707 0 -19.7627 5.01465 -25.5996 12.7998l-86.4004 115.2l-160 64l-31.5098 108.12c-2.53027 10.0996 5.10938 19.8799 15.5195 19.8799h39.9902c5.03027 0 9.78027 -2.37012 12.7998 -6.40039l43.2002 -57.5996h208v64h-176c-8.83984 0 -16 7.16016 -16 16
+v32c0 8.83984 7.16016 16 16 16h416c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-176v-64c123.71 0 224 -100.29 224 -224c0 -17.6699 -14.3301 -32 -32 -32h-272zM416 252.49v-124.49h124.79c-12.7598 62.5596 -62.2402 111.7 -124.79 124.49z
+M635.37 -10.8096c6.58984 -6.61035 6.04004 -17.5205 -0.980469 -23.6602c-33.1494 -29.0498 -53.5693 -29.5205 -68.4492 -29.5205h-325.94c-8.83984 0 -16 7.18066 -16 16.0303v32.0596c0 8.85059 7.16016 16.0303 16 16.0303h325.94
+c10.7998 0 17.5498 4.48047 24.6396 11.25c6.40039 6.11035 16.3896 6.27051 22.6396 0.00976562z" />
+    <glyph glyph-name="infinity" unicode="&#xf534;" horiz-adv-x="640" 
+d="M471.1 352c93.1006 0 168.9 -71.7998 168.9 -160s-75.7998 -160 -168.9 -160c-66.0996 0 -117.8 41.2998 -151.1 78.5996c-33.2998 -37.2998 -85 -78.5996 -151.1 -78.5996c-93.1006 0 -168.9 71.7998 -168.9 160s75.7998 160 168.9 160
+c66.0996 0 117.8 -41.2998 151.1 -78.5996c33.2998 37.2998 85 78.5996 151.1 78.5996zM168.9 128c38.0996 0 73.5996 36.4004 94 64c-20.6006 27.9004 -55.8008 64 -94 64c-40.2002 0 -72.9004 -28.7002 -72.9004 -64s32.7002 -64 72.9004 -64zM471.1 128
+c40.2002 0 72.9004 28.7002 72.9004 64s-32.7002 64 -72.9004 64c-38.0996 0 -73.5996 -36.4004 -94 -64c20.6006 -27.9004 55.8008 -64 94 -64z" />
+    <glyph glyph-name="kiwi-bird" unicode="&#xf535;" horiz-adv-x="576" 
+d="M575.81 230.02c0.300781 -5.7793 0.160156 -246.02 0.160156 -246.02c0 -7.30957 -4.95996 -13.7002 -12.0498 -15.5c-1.30957 -0.339844 -2.63965 -0.5 -3.9502 -0.5c-5.75 0 -11.1895 3.11035 -14.0498 8.33984l-74.4102 136.44
+c-7.04004 -0.470703 2.43066 -0.780273 -23.0498 -0.780273c-54.5996 0 -106.39 -19.25 -152.13 -49.0596c-12.46 -8.12012 -26.0996 -14.4502 -40.3398 -19.5107v-59.4297c0 -8.83984 -7.16016 -16 -16 -16h-16c-8.83984 0 -16 7.16016 -16 16v49.1797
+c-5.32031 -0.449219 -10.5605 -1.17969 -16 -1.17969c-16.6006 0 -32.6406 2.2998 -48 6.25977v-54.2598c0 -8.83984 -7.16016 -16 -16 -16h-16c-8.83984 0 -16 7.16016 -16 16v73.9902c-57.3105 33.21 -95.9502 95.0596 -95.9902 166.01
+c-0.0800781 145.76 129.3 182.88 147.31 186.94c57.1709 12.9199 111.221 0.259766 153.21 -28.7002c43.4902 -29.9902 94.9209 -46.2402 147.74 -46.2402h9.37012c60.6504 0 115.01 -45.4102 118.18 -105.98zM463.97 200c13.25 0 24 10.75 24 24
+c0 13.2598 -10.75 24 -24 24s-24 -10.7402 -24 -24c0 -13.25 10.75 -24 24 -24zM543.97 46.75v99.0596c-11.1299 -11.3799 -24.7393 -20.1494 -39.8594 -25.9795z" />
+    <glyph glyph-name="less-than" unicode="&#xf536;" horiz-adv-x="384" 
+d="M365.46 90.2598c16.0703 -7.49023 23.0205 -26.5801 15.5303 -42.6396l-13.5605 -29.0801c-7.48926 -16.0596 -26.5801 -23.0098 -42.6396 -15.5205l-306.31 142.83c-11.2705 5.25 -18.4805 16.5605 -18.4805 29v34.2402c0.00488281 12.8389 7.55664 23.9043 18.4805 29
+l306.46 142.91c16.0195 7.46973 35.0596 0.540039 42.5293 -15.4805l13.5205 -29c7.46973 -16.0195 0.540039 -35.0596 -15.4805 -42.5293l-218.47 -101.88z" />
+    <glyph glyph-name="less-than-equal" unicode="&#xf537;" horiz-adv-x="448" 
+d="M54.9805 233.8c-13.7705 4.52051 -22.9805 16.6104 -22.9805 30.1699v15.96c0 13.5703 9.20996 25.6602 22.9805 30.1807l301.71 119.96c18.29 6 38.5098 -2.53027 45.1494 -19.0605l12.0303 -29.9199c6.63965 -16.5195 -2.81055 -34.79 -21.1006 -40.79
+l-175.56 -68.0898l175.44 -68.0498c18.3896 -6.03027 27.8896 -24.3906 21.21 -41l-12.0908 -30.0801c-6.66992 -16.6104 -26.9893 -25.1797 -45.3799 -19.1504zM424 48c13.25 0 24 -10.7402 24 -24v-48c0 -13.25 -10.75 -24 -24 -24h-400c-13.25 0 -24 10.75 -24 24v48
+c0 13.2598 10.75 24 24 24h400z" />
+    <glyph glyph-name="memory" unicode="&#xf538;" horiz-adv-x="640" 
+d="M640 317.06c-18.5996 -6.60938 -32 -24.1895 -32 -45.0596s13.4004 -38.4502 32 -45.0596v-98.9404h-640v98.9404c18.5996 6.60938 32 24.1895 32 45.0596s-13.4004 38.4502 -32 45.0596v34.9404c0 17.6699 14.3301 32 32 32h576c17.6699 0 32 -14.3301 32 -32v-34.9404z
+M224 192v128h-64v-128h64zM352 192v128h-64v-128h64zM480 192v128h-64v-128h64zM0 0v96h640v-96h-64v26.6699c0 8.83984 -7.16016 16 -16 16s-16 -7.16016 -16 -16v-26.6699h-128v26.6699c0 8.83984 -7.16016 16 -16 16s-16 -7.16016 -16 -16v-26.6699h-128v26.6699
+c0 8.83984 -7.16016 16 -16 16s-16 -7.16016 -16 -16v-26.6699h-128v26.6699c0 8.83984 -7.16016 16 -16 16s-16 -7.16016 -16 -16v-26.6699h-64z" />
+    <glyph glyph-name="microphone-alt-slash" unicode="&#xf539;" horiz-adv-x="640" 
+d="M633.82 -10.0996c6.97949 -5.43066 8.22949 -15.4805 2.81934 -22.4502l-19.6396 -25.2705c-5.42969 -6.97949 -15.4805 -8.23926 -22.46 -2.80957l-588.36 454.729c-6.97949 5.43066 -8.22949 15.4805 -2.80957 22.4502l19.6396 25.2705
+c5.41992 6.97949 15.4805 8.22949 22.46 2.80957l178.53 -138v45.3604c0 53.0195 42.9805 96 96 96s96 -42.9805 96 -96h-85.3301c-5.88965 0 -10.6699 -3.58008 -10.6699 -8v-16c0 -4.41992 4.78027 -8 10.6699 -8h85.3301v-32h-85.3301
+c-5.88965 0 -10.6699 -3.58008 -10.6699 -8v-16c0 -4.41992 4.78027 -8 10.6699 -8h85.3301v-32h-85.0596l41.3994 -32h43.6699c0 -10.4502 -2.17969 -20.2705 -5.2793 -29.6699l26.5498 -20.5205c6.75977 15.4004 10.7197 32.2803 10.7197 50.2002v48
+c0 8.83984 7.16016 16 16 16h16c8.83984 0 16 -7.16016 16 -16v-48c0 -28.9805 -7.25977 -56.21 -19.7402 -80.3301zM400 -16c8.83984 0 16 -7.16016 16 -16v-16c0 -8.83984 -7.16016 -16 -16 -16h-160c-8.83984 0 -16 7.16016 -16 16v16c0 8.83984 7.16016 16 16 16h56
+v34.1504c-88.0303 12.1396 -152 92.0498 -152 181.689v6.85059l52.0303 -40.2207c12.4395 -53.2197 55.3301 -96.3994 111.18 -101.85c6.94043 -0.669922 13.6396 -0.200195 20.3496 0.200195l50.4004 -38.96c-10.8604 -3.80078 -22.25 -6.45996 -33.96 -8.08008v-33.7803
+h56z" />
+    <glyph glyph-name="money-bill-wave" unicode="&#xf53a;" horiz-adv-x="640" 
+d="M621.16 393.54c11.6094 -4.87012 18.8398 -16.8301 18.8496 -29.4697v-317.25c0 -18.4902 -15.04 -31.8105 -32.25 -31.8105c-3.39941 0 -6.87988 0.520508 -10.3496 1.62012c-30.8906 9.7998 -61.7598 13.7197 -92.6504 13.7197
+c-123.17 0 -246.34 -62.3496 -369.51 -62.3496c-38.7998 0 -77.6201 6.19043 -116.41 22.4697c-11.6094 4.86035 -18.8398 16.8301 -18.8398 29.46v317.261c0 18.4893 15.04 31.8096 32.25 31.8096c3.40039 0 6.87988 -0.519531 10.3496 -1.62012
+c30.8906 -9.7998 61.7607 -13.7197 92.6504 -13.7197c123.17 0 246.33 62.3496 369.5 62.3398c38.7998 0 77.6201 -6.19043 116.41 -22.46zM48 315.78v-60.4707c31 0 56.8398 22.1504 62.7197 51.54c-21.5996 1.36035 -42.5996 3.89062 -62.7197 8.93066zM48 30.7803
+c20.1201 -7.31055 41.1797 -11.8105 63.71 -13.6201c-1.53027 34.1299 -29.3398 61.3994 -63.71 61.3994v-47.7793zM320 96c44.1699 0 80 42.9697 80 96c0 53.0195 -35.8203 96 -80 96s-80 -42.9805 -80 -96c0 -53.0098 35.8096 -96 80 -96zM592 68.2197v57.7207
+c-26.8203 -3.40039 -48.4502 -23.2002 -54.3203 -49.2803c18.6104 -1.58984 36.8008 -4.0498 54.3203 -8.44043zM592 304.33v48.8896c-17.7197 6.43066 -36.2695 10.4902 -55.8096 12.6602c0.949219 -31.8496 24.9199 -57.6396 55.8096 -61.5498z" />
+    <glyph glyph-name="money-bill-wave-alt" unicode="&#xf53b;" horiz-adv-x="640" 
+d="M621.16 393.54c11.6094 -4.87012 18.8398 -16.8301 18.8496 -29.4697v-317.25c0 -18.4902 -15.04 -31.8105 -32.25 -31.8105c-3.39941 0 -6.87988 0.520508 -10.3496 1.62012c-30.8906 9.7998 -61.7598 13.7197 -92.6504 13.7197
+c-123.17 0 -246.34 -62.3496 -369.51 -62.3496c-38.7998 0 -77.6201 6.19043 -116.41 22.4697c-11.6094 4.86035 -18.8398 16.8301 -18.8398 29.46v317.261c0 18.4893 15.04 31.8096 32.25 31.8096c3.40039 0 6.87988 -0.519531 10.3496 -1.62012
+c30.8906 -9.7998 61.7607 -13.7197 92.6504 -13.7197c123.17 0 246.33 62.3496 369.5 62.3398c38.7998 0 77.6201 -6.19043 116.41 -22.46zM320 96c44.1699 0 80 42.9697 80 96c0 53.0195 -35.8203 96 -80 96s-80 -42.9805 -80 -96c0 -53.0098 35.8096 -96 80 -96z" />
+    <glyph glyph-name="money-check" unicode="&#xf53c;" horiz-adv-x="640" 
+d="M0 0v320h640v-320c0 -17.6699 -14.3301 -32 -32 -32h-576c-17.6699 0 -32 14.3301 -32 32zM448 208v-32c0 -8.83984 7.16016 -16 16 -16h96c8.83984 0 16 7.16016 16 16v32c0 8.83984 -7.16016 16 -16 16h-96c-8.83984 0 -16 -7.16016 -16 -16zM448 88v-16
+c0 -4.41992 3.58008 -8 8 -8h112c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8h-112c-4.41992 0 -8 -3.58008 -8 -8zM64 184v-16c0 -4.41992 3.58008 -8 8 -8h304c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8h-304c-4.41992 0 -8 -3.58008 -8 -8z
+M64 88v-16c0 -4.41992 3.58008 -8 8 -8h176c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8h-176c-4.41992 0 -8 -3.58008 -8 -8zM624 416c8.83984 0 16 -7.16016 16 -16v-48h-640v48c0 8.83984 7.16016 16 16 16h608z" />
+    <glyph glyph-name="money-check-alt" unicode="&#xf53d;" horiz-adv-x="640" 
+d="M608 416c17.6699 0 32 -14.3301 32 -32v-384c0 -17.6699 -14.3301 -32 -32 -32h-576c-17.6699 0 -32 14.3301 -32 32v384c0 17.6699 14.3301 32 32 32h576zM176 120.12c23.6201 0.629883 42.6699 20.54 42.6699 45.0703c0 19.9697 -12.9902 37.8096 -31.5801 43.3896
+l-45 13.5c-5.16016 1.54004 -8.76953 6.78027 -8.76953 12.7295c0 7.27051 5.2998 13.1904 11.7998 13.1904h28.1104c4.55957 0 8.94922 -1.29004 12.8193 -3.71973c3.24023 -2.03027 7.36035 -1.91016 10.1299 0.729492l11.75 11.21
+c3.53027 3.37012 3.33008 9.20996 -0.569336 12.1406c-9.10059 6.83984 -20.0801 10.7695 -31.3701 11.3496v16.29c0 4.41992 -3.58008 8 -8 8h-16c-4.41992 0 -8 -3.58008 -8 -8v-16.1201c-23.6201 -0.629883 -42.6699 -20.5498 -42.6699 -45.0703
+c0 -19.9697 12.9893 -37.8096 31.5801 -43.3896l45 -13.5c5.15918 -1.54004 8.76953 -6.78027 8.76953 -12.7295c0 -7.27051 -5.2998 -13.1904 -11.7998 -13.1904h-28.1104c-4.55957 0 -8.9502 1.2998 -12.8193 3.71973
+c-3.24023 2.03027 -7.36035 1.91016 -10.1309 -0.729492l-11.75 -11.21c-3.5293 -3.37012 -3.3291 -9.20996 0.570312 -12.1406c9.10059 -6.83008 20.0801 -10.7695 31.3701 -11.3496v-16.29c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8v16.1201zM416 136v16
+c0 4.41992 -3.58008 8 -8 8h-112c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h112c4.41992 0 8 3.58008 8 8zM576 136v16c0 4.41992 -3.58008 8 -8 8h-80c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h80c4.41992 0 8 3.58008 8 8z
+M576 232v16c0 4.41992 -3.58008 8 -8 8h-272c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h272c4.41992 0 8 3.58008 8 8z" />
+    <glyph glyph-name="not-equal" unicode="&#xf53e;" horiz-adv-x="448" 
+d="M416 240h-98.4199l-74.5303 -96h172.95c17.6699 0 32 -14.3301 32 -32v-32c0 -17.6699 -14.3301 -32 -32 -32h-247.48l-82.0898 -105.73c-5.37012 -7.00977 -15.4102 -8.34961 -22.4297 -2.96973l-25.4102 19.46c-7.00977 5.37988 -8.33984 15.4199 -2.96973 22.4307
+l51.8701 66.8096h-55.4902c-17.6699 0 -32 14.3301 -32 32v32c0 17.6699 14.3301 32 32 32h130.03l74.5293 96h-204.56c-17.6699 0 -32 14.3301 -32 32v32c0 17.6699 14.3301 32 32 32h279.09l82.0801 105.73c5.37988 7.00977 15.4199 8.34961 22.4404 2.96973
+l25.4092 -19.46c7.01074 -5.37012 8.34082 -15.4102 2.9707 -22.4307l-51.8701 -66.8096h23.8799c17.6699 0 32 -14.3301 32 -32v-32c0 -17.6699 -14.3301 -32 -32 -32z" />
+    <glyph glyph-name="palette" unicode="&#xf53f;" 
+d="M204.3 443c163.8 31.9004 307.2 -92.0996 307.7 -249.7c-0.0996094 -35.7002 -29.0996 -65.2998 -64.9004 -65.2998h-79.6992c-51 0 -84 -53 -60.9004 -98.4004c18.9004 -37.0996 -1.2998 -85.2998 -42.5 -91.6992c-127.1 -19.7002 -295.8 119.699 -258.8 306.699
+c19.5996 99.1006 99.7002 179 199.1 198.4zM96 128c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM128 256c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM256 320
+c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM384 256c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32z" />
+    <glyph glyph-name="parking" unicode="&#xf540;" horiz-adv-x="448" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM240 128c52.9004 0 96 43.0996 96 96s-43.0996 96 -96 96h-96c-8.7998 0 -16 -7.2002 -16 -16v-224c0 -8.7998 7.2002 -16 16 -16h32
+c8.7998 0 16 7.2002 16 16v48h48zM240 256c17.5996 0 32 -14.4004 32 -32s-14.4004 -32 -32 -32h-48v64h48z" />
+    <glyph glyph-name="percentage" unicode="&#xf541;" horiz-adv-x="384" 
+d="M109.25 274.75c-24.9902 -25 -65.5098 -25 -90.5098 0c-24.9902 24.9902 -24.9902 65.5195 0 90.5098s65.5195 24.9902 90.5098 0s24.9902 -65.5195 0 -90.5098zM365.25 109.26c25 -25 25 -65.5195 0 -90.5098c-24.9902 -24.9902 -65.5195 -24.9902 -90.5098 0
+s-24.9902 65.5195 0 90.5098s65.5195 24.9902 90.5098 0zM363.31 340.69c12.5 -12.5 12.5 -32.7607 0 -45.25l-274.75 -274.75c-12.4893 -12.5 -32.75 -12.5 -45.25 0l-22.6191 22.6191c-12.5 12.4902 -12.5 32.75 0 45.25l274.75 274.75c12.4893 12.5 32.75 12.5 45.25 0z
+" />
+    <glyph glyph-name="project-diagram" unicode="&#xf542;" horiz-adv-x="640" 
+d="M384 128c17.6699 0 32 -14.3301 32 -32v-128c0 -17.6699 -14.3301 -32 -32 -32h-128c-17.6699 0 -32 14.3301 -32 32v128c0 17.6699 14.3301 32 32 32h128zM192 416v-32h224v-64h-224v-47.5098l64.2803 -112.49h-0.280273c-23.5996 0 -44.0195 -12.9805 -55.1201 -32.04
+l-73.1602 128.04h-95.7197c-17.6699 0 -32 14.3301 -32 32v128c0 17.6699 14.3301 32 32 32h128c17.6699 0 32 -14.3301 32 -32zM608 448c17.6699 0 32 -14.3301 32 -32v-128c0 -17.6699 -14.3301 -32 -32 -32h-128c-17.6699 0 -32 14.3301 -32 32v128
+c0 17.6699 14.3301 32 32 32h128z" />
+    <glyph glyph-name="receipt" unicode="&#xf543;" horiz-adv-x="384" 
+d="M358.4 444.8c10.5996 7.90039 25.5996 0.400391 25.5996 -12.7998v-480c0 -13.2002 -15.0996 -20.7002 -25.5996 -12.7998l-38.4004 44.7998l-54.4004 -44.7998c-2.66602 -2.01953 -6.01367 -3.21777 -9.6123 -3.21777c-3.59961 0 -6.9209 1.19824 -9.58691 3.21777
+l-54.4004 44.7998l-54.4004 -44.7998c-2.66602 -2.01953 -6.01367 -3.21777 -9.6123 -3.21777c-3.59961 0 -6.9209 1.19824 -9.58691 3.21777l-54.4004 44.7998l-38.4004 -44.7998c-10.5996 -7.90039 -25.5996 -0.400391 -25.5996 12.7998v480
+c0 13.2002 15 20.7002 25.5996 12.7998l38.4004 -44.7998l54.4004 44.7998c2.66602 2.01953 6.01367 3.21777 9.6123 3.21777c3.59961 0 6.9209 -1.19824 9.58691 -3.21777l54.4004 -44.7998l54.4004 44.7998c2.66602 2.01953 6.01367 3.21777 9.6123 3.21777
+c3.59961 0 6.9209 -1.19824 9.58691 -3.21777l54.4004 -44.7998zM320 88v16c0 4.40039 -3.59961 8 -8 8h-240c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h240c4.40039 0 8 3.59961 8 8zM320 184v16c0 4.40039 -3.59961 8 -8 8h-240
+c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h240c4.40039 0 8 3.59961 8 8zM320 280v16c0 4.40039 -3.59961 8 -8 8h-240c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h240c4.40039 0 8 3.59961 8 8z" />
+    <glyph glyph-name="robot" unicode="&#xf544;" horiz-adv-x="640" 
+d="M32 224h32v-192h-32h-0.0390625c-17.6406 0 -31.9619 14.3213 -31.9619 31.9619c0 0.0126953 0.000976562 0.0253906 0.000976562 0.0380859v128v0.0390625c0 17.6406 14.3213 31.9619 31.9619 31.9619c0.0126953 0 0.0253906 -0.000976562 0.0380859 -0.000976562z
+M544 272v-272c-0.0351562 -35.3066 -28.6934 -63.9648 -64 -64h-320c-35.3066 0.0351562 -63.9648 28.6934 -64 64v272v0.0263672c0 44.1387 35.835 79.9746 79.9736 79.9746c0.00878906 0 0.0175781 -0.000976562 0.0263672 -0.000976562h112v64
+c0 17.6611 14.3389 32 32 32s32 -14.3389 32 -32v-64h112h0.0263672c44.1387 0 79.9746 -35.835 79.9746 -79.9736c0 -0.00878906 -0.000976562 -0.0175781 -0.000976562 -0.0263672zM264 192c0 22.0762 -17.9238 40 -40 40s-40 -17.9238 -40 -40s17.9238 -40 40 -40
+c22.0752 0 40 17.9248 40 40zM256 64h-64v-32h64v32zM352 64h-64v-32h64v32zM456 192c0 22.0762 -17.9238 40 -40 40s-40 -17.9238 -40 -40s17.9238 -40 40 -40c22.0752 0 40 17.9248 40 40zM448 64h-64v-32h64v32zM640 192v-128v-0.0390625
+c0 -17.6406 -14.3213 -31.9619 -31.9619 -31.9619c-0.0126953 0 -0.0253906 0.000976562 -0.0380859 0.000976562h-32v192h32h0.0390625c17.6406 0 31.9619 -14.3213 31.9619 -31.9619c0 -0.0126953 -0.000976562 -0.0253906 -0.000976562 -0.0380859z" />
+    <glyph glyph-name="ruler" unicode="&#xf545;" horiz-adv-x="640" 
+d="M635.7 280.8c8.7998 -15 3.59961 -34.2002 -11.6006 -42.7998l-496.8 -281.9c-15.2002 -8.59961 -34.7002 -3.5 -43.5 11.5l-79.5996 135.601c-8.7998 15 -3.5 34.0996 11.7002 42.7998l69 39.0996l59.6992 -101.399c2.2002 -3.7998 7.10059 -5.10059 10.9004 -2.90039
+l13.7998 7.7998c3.7998 2.2002 5.10059 7 2.90039 10.7002l-59.7002 101.7l55.2002 31.2998l27.8994 -47.5c2.2002 -3.7998 7.10059 -5.09961 10.9004 -2.89941l13.7998 7.7998c3.7998 2.2002 5.10059 6.89941 2.90039 10.7002l-27.9004 47.3994l55.2002 31.2998
+l59.7002 -101.699c2.2002 -3.80078 7.09961 -5.10059 10.8994 -2.90039l13.8008 7.7998c3.7998 2.2002 5.09961 7 2.89941 10.7002l-59.7998 101.7l55.2002 31.2998l27.8994 -47.2998c2.2002 -3.7998 7.10059 -5.10059 10.9004 -2.90039l13.7998 7.7998
+c3.7998 2.2002 5.10059 6.90039 2.90039 10.7002l-27.9004 47.4004l55.2002 31.2998l59.7002 -101.6c2.2002 -3.80078 7.09961 -5.10059 10.8994 -2.90039l13.8008 7.7998c3.7998 2.2002 5.09961 6.90039 2.89941 10.7002l-59.7002 101.7l69 39.0996
+c15.2002 8.60059 34.7002 3.5 43.5 -11.5z" />
+    <glyph glyph-name="ruler-combined" unicode="&#xf546;" 
+d="M160 160v-41.3799l-158.43 -158.42c-0.660156 2.55957 -1.57031 5.03027 -1.57031 7.7998v448c0 17.6699 14.3301 32 32 32h96c17.6699 0 32 -14.3301 32 -32v-32h-56c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h56v-64h-56
+c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h56v-64h-56c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h56zM480 96c17.6699 0 32 -14.3301 32 -32v-96c0 -17.6699 -14.3301 -32 -32 -32h-448
+c-2.75977 0 -5.24023 0.910156 -7.7998 1.57031l158.43 158.43h41.3701v-56c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8v56h64v-56c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8v56h64v-56c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8
+v56h32z" />
+    <glyph glyph-name="ruler-horizontal" unicode="&#xf547;" horiz-adv-x="576" 
+d="M544 320c17.6699 0 32 -14.3301 32 -32v-192c0 -17.6699 -14.3301 -32 -32 -32h-512c-17.6699 0 -32 14.3301 -32 32v192c0 17.6699 14.3301 32 32 32h48v-88c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8v88h64v-88c0 -4.41992 3.58008 -8 8 -8h16
+c4.41992 0 8 3.58008 8 8v88h64v-88c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8v88h64v-88c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8v88h64v-88c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8v88h48z" />
+    <glyph glyph-name="ruler-vertical" unicode="&#xf548;" horiz-adv-x="256" 
+d="M168 32h88v-64c0 -17.6699 -14.3301 -32 -32 -32h-192c-17.6699 0 -32 14.3301 -32 32v448c0 17.6699 14.3301 32 32 32h192c17.6699 0 32 -14.3301 32 -32v-64h-88c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h88v-64h-88
+c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h88v-64h-88c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h88v-64h-88c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8z" />
+    <glyph glyph-name="school" unicode="&#xf549;" horiz-adv-x="640" 
+d="M0 224c0 17.6699 14.3301 32 32 32h64v-320h-80c-8.83984 0 -16 7.16016 -16 16v272zM360 272c4.41992 0 8 -3.58008 8 -8v-16c0 -4.41992 -3.58008 -8 -8 -8h-48c-4.41992 0 -8 3.58008 -8 8v64c0 4.41992 3.58008 8 8 8h16c4.41992 0 8 -3.58008 8 -8v-40h24z
+M497.75 335.96c8.90039 -5.92969 14.25 -15.9297 14.25 -26.6299v-373.33h-128v144c0 8.83984 -7.16016 16 -16 16h-96c-8.83984 0 -16 -7.16016 -16 -16v-144h-128v373.34c0.00195312 11.1084 5.64453 20.8828 14.25 26.6201l160 106.67
+c5.0752 3.38086 11.2324 5.35156 17.7822 5.35156s12.6426 -1.9707 17.7178 -5.35156zM320 192c44.1797 0 80 35.8203 80 80s-35.8203 80 -80 80s-80 -35.8203 -80 -80s35.8203 -80 80 -80zM608 256c17.6699 0 32 -14.3301 32 -32v-272c0 -8.83984 -7.16016 -16 -16 -16h-80
+v320h64z" />
+    <glyph glyph-name="screwdriver" unicode="&#xf54a;" 
+d="M448 448l64 -64l-96 -128h-62.0596l-83.0303 -83.0303c-4.25 6.79004 -9.07031 13.2705 -14.8701 19.0703c-5.7998 5.80957 -12.2803 10.6201 -19.0703 14.8701l83.0303 83.0303v62.0596zM128 169.41c29.1104 29.1094 76.2998 29.1094 105.41 0
+c29.1094 -29.1104 29.1094 -76.2998 0 -105.41l-117.08 -117.08c-14.5605 -14.5596 -38.1504 -14.5596 -52.71 0l-52.7002 52.7002c-14.5498 14.5596 -14.5498 38.1602 0 52.71z" />
+    <glyph glyph-name="shoe-prints" unicode="&#xf54b;" horiz-adv-x="640" 
+d="M192 288c-35.3496 0 -64 28.6504 -64 64s28.6504 64 64 64h32v-128h-32zM0 32c0 35.3496 28.6504 64 64 64h32v-128h-32c-35.3496 0 -64 28.6504 -64 64zM337.46 160c90.3604 0 174.54 -32 174.54 -96c0 -45.2197 -39.0996 -97.2998 -148.58 -120.82
+c-31.9795 -6.87012 -64.8896 -8.50977 -97.5801 -6.19922c-27.2998 1.92969 -54.0996 7.76953 -80.3096 15.0498l-57.5303 15.9697v128c60.21 0 79.9404 15.6201 104.73 32c28.5693 18.8799 69.8193 32 104.729 32zM491.42 440.81
+c109.48 -23.5098 148.58 -75.5898 148.58 -120.81c0 -64 -84.1797 -96 -174.54 -96c-34.9102 0 -76.1602 13.1201 -104.729 32c-24.79 16.3799 -44.5303 32 -104.73 32v128l57.5303 15.9697c26.21 7.27051 53.0098 13.1104 80.3096 15.04
+c32.6904 2.32031 65.6006 0.669922 97.5801 -6.2002z" />
+    <glyph glyph-name="skull" unicode="&#xf54c;" 
+d="M256 448c141.4 0 256 -100.3 256 -224c0 -70.0996 -36.9004 -132.6 -94.5 -173.7c-9.7002 -6.89941 -15.2002 -18.2002 -13.5 -29.8994l9.40039 -66.2002c1.39941 -9.60059 -6 -18.2002 -15.7002 -18.2002h-77.7002v56c0 4.40039 -3.59961 8 -8 8h-16
+c-4.40039 0 -8 -3.59961 -8 -8v-56h-64v56c0 4.40039 -3.59961 8 -8 8h-16c-4.40039 0 -8 -3.59961 -8 -8v-56h-77.7002c-9.7002 0 -17.0996 8.59961 -15.7002 18.2002l9.40039 66.2002c1.7002 11.7998 -3.90039 23 -13.5 29.8994
+c-57.5996 41.1006 -94.5 103.601 -94.5 173.7c0 123.7 114.6 224 256 224zM160 128c35.2998 0 64 28.7002 64 64s-28.7002 64 -64 64s-64 -28.7002 -64 -64s28.7002 -64 64 -64zM352 128c35.2998 0 64 28.7002 64 64s-28.7002 64 -64 64s-64 -28.7002 -64 -64
+s28.7002 -64 64 -64z" />
+    <glyph glyph-name="smoking-ban" unicode="&#xf54d;" 
+d="M96 144v64c0 8.7998 7.2002 16 16 16h21.5l96 -96h-117.5c-8.7998 0 -16 7.2002 -16 16zM256 448c141.4 0 256 -114.6 256 -256s-114.6 -256 -256 -256s-256 114.6 -256 256s114.6 256 256 256zM256 0c41.4004 0 79.7002 13.2998 111.1 35.7002l-267.399 267.399
+c-22.4004 -31.3994 -35.7002 -69.6992 -35.7002 -111.1c0 -105.9 86.0996 -192 192 -192zM301.2 192l32 -32h50.7998v32h-82.7998zM412.3 80.9004c22.4004 31.3994 35.7002 69.6992 35.7002 111.1c0 105.9 -86.0996 192 -192 192
+c-41.4004 0 -79.7002 -13.2998 -111.1 -35.7002l124.3 -124.3h130.8c8.7998 0 16 -7.2002 16 -16v-64c0 -8.7998 -7.2002 -16 -16 -16h-34.7998zM320.6 320c32.1006 0 58.7002 -23.7002 63.3008 -54.5996c0.699219 -4.90039 -3 -9.40039 -8 -9.40039h-16.2002
+c-3.7002 0 -7 2.5 -7.7002 6.09961c-2.7998 14.7002 -15.7998 25.9004 -31.4004 25.9004c-32.0996 0 -58.6992 23.7002 -63.2998 54.5996c-0.700195 4.90039 3 9.40039 8 9.40039h16.2002c3.7002 0 7 -2.5 7.7002 -6.09961
+c2.7998 -14.7002 15.7998 -25.9004 31.3994 -25.9004z" />
+    <glyph glyph-name="store" unicode="&#xf54e;" horiz-adv-x="616" 
+d="M602 329.4c33.5996 -53.6006 3.7998 -128 -59 -136.4c-4.5 -0.599609 -9 -0.900391 -13.7002 -0.900391c-29.5 0 -55.7002 13 -73.7998 33.1006c-18 -20.1006 -44.2002 -33.1006 -73.7998 -33.1006c-29.5 0 -55.7998 13 -73.7998 33.1006
+c-18 -20.1006 -44.2002 -33.1006 -73.8008 -33.1006c-29.5 0 -55.7998 13 -73.7998 33.1006c-18 -20.1006 -44.2002 -33.1006 -73.7998 -33.1006c-4.59961 0 -9.2002 0.300781 -13.7002 0.900391c-62.5996 8.5 -92.2998 82.9004 -58.7998 136.4l64.9004 103.6
+c5.7998 9.2998 16.0996 15 27.0996 15h404c11 0 21.2998 -5.7002 27.0996 -15zM529.5 160c6.09961 0 12.0996 0.400391 18.2002 1.2002c5.59961 0.700195 11 2 16.3994 3.59961v-196.8c0 -17.7002 -14.2998 -32 -32 -32h-448c-17.6992 0 -32 14.2998 -32 32v196.8
+c5.30078 -1.5 10.8008 -2.7998 16.4004 -3.59961c5.90039 -0.799805 12 -1.2002 18 -1.2002c10 0 19.9004 1.59961 29.5 3.7998v-99.7998h384v99.7998c9.59961 -2.2998 19.5 -3.7998 29.5 -3.7998z" />
+    <glyph glyph-name="store-alt" unicode="&#xf54f;" horiz-adv-x="640" 
+d="M320 64v160h64v-256c0 -17.7002 -14.2998 -32 -32 -32h-256c-17.7002 0 -32 14.2998 -32 32v256h64v-160h192zM634.6 305.8c14.1006 -21.2998 -1.09961 -49.7998 -26.5996 -49.7998h-575.9c-25.5996 0 -40.7998 28.5 -26.5996 49.7998l85.2998 128
+c5.90039 8.90039 15.9004 14.2002 26.6006 14.2002h405.199c10.7002 0 20.7002 -5.2998 26.7002 -14.2002zM512 -48v272h64v-272c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16z" />
+    <glyph glyph-name="stream" unicode="&#xf550;" 
+d="M16 320c-8.83984 0 -16 7.16016 -16 16v64c0 8.83984 7.16016 16 16 16h416c8.83984 0 16 -7.16016 16 -16v-64c0 -8.83984 -7.16016 -16 -16 -16h-416zM496 240c8.83984 0 16 -7.16016 16 -16v-64c0 -8.83984 -7.16016 -16 -16 -16h-416c-8.83984 0 -16 7.16016 -16 16
+v64c0 8.83984 7.16016 16 16 16h416zM432 64c8.83984 0 16 -7.16016 16 -16v-64c0 -8.83984 -7.16016 -16 -16 -16h-416c-8.83984 0 -16 7.16016 -16 16v64c0 8.83984 7.16016 16 16 16h416z" />
+    <glyph glyph-name="stroopwafel" unicode="&#xf551;" 
+d="M188.12 237.26l45.25 -45.2598l-45.2598 -45.25l-45.25 45.25zM301.25 259.88l-45.25 -45.25l-45.25 45.2598l45.25 45.25zM210.75 124.12l45.25 45.25l45.2598 -45.25l-45.2598 -45.2598zM256 448c141.38 0 256 -114.62 256 -256s-114.62 -256 -256 -256
+s-256 114.62 -256 256s114.62 256 256 256zM442.68 152.4c1.44629 1.4502 2.3418 3.45312 2.3418 5.66113s-0.895508 4.20801 -2.3418 5.6582l-28.29 28.2803l28.2705 28.3096c3.12012 3.12012 3.12012 8.19043 0 11.3105l-11.3105 11.3096
+c-3.11914 3.12012 -8.18945 3.12012 -11.3096 0l-28.29 -28.29l-45.25 45.2607l33.9404 33.9395l16.9697 -16.9697c3.12012 -3.12012 8.18945 -3.12012 11.3096 0l11.3105 11.3096c3.12012 3.12012 3.12012 8.19043 0 11.3105l-16.9707 16.9697l16.9707 16.9697
+c3.12012 3.12012 3.12012 8.19043 0 11.3105l-11.3105 11.3096c-3.12012 3.12012 -8.18945 3.12012 -11.3096 0l-16.9697 -16.9697l-16.9707 16.9697c-3.12012 3.12012 -8.18945 3.12012 -11.3096 0l-11.3105 -11.3096c-3.11914 -3.12012 -3.11914 -8.19043 0 -11.3105
+l16.9707 -16.9697l-33.9404 -33.9404l-45.2598 45.25l28.29 28.29c3.12012 3.12012 3.12012 8.19043 0 11.3105l-11.3105 11.3096c-3.11914 3.12012 -8.18945 3.12012 -11.3096 0l-28.29 -28.29l-28.3096 28.2705c-3.12012 3.12012 -8.19043 3.12012 -11.3105 0
+l-11.3096 -11.3105c-3.12012 -3.11914 -3.12012 -8.18945 0 -11.3096l28.29 -28.29l-45.2607 -45.25l-33.9395 33.9404l16.9697 16.9697c3.12012 3.12012 3.12012 8.18945 0 11.3096l-11.3096 11.3105c-3.12012 3.12012 -8.19043 3.12012 -11.3105 0l-16.9697 -16.9707
+l-16.9697 16.9707c-3.12012 3.12012 -8.19043 3.12012 -11.3105 0l-11.3096 -11.3105c-3.12012 -3.12012 -3.12012 -8.18945 0 -11.3096l16.9697 -16.9697l-16.9697 -16.9707c-3.12012 -3.12012 -3.12012 -8.18945 0 -11.3096l11.3096 -11.3105
+c3.12012 -3.11914 8.19043 -3.11914 11.3105 0l16.9697 16.9707l33.9404 -33.9404l-45.25 -45.2598l-28.29 28.29c-3.12012 3.12012 -8.19043 3.12012 -11.3105 0l-11.3096 -11.3105c-3.12012 -3.11914 -3.12012 -8.18945 0 -11.3096l28.29 -28.29l-28.29 -28.29
+c-3.12012 -3.12012 -3.12012 -8.19043 0 -11.3096l11.3398 -11.3301c3.12012 -3.12012 8.18945 -3.12012 11.3096 0l28.29 28.29l45.25 -45.25l-33.9395 -33.9404l-16.9707 16.9697c-3.11914 3.12012 -8.18945 3.12012 -11.3096 0l-11.3096 -11.3096
+c-3.12012 -3.12012 -3.12012 -8.19043 0 -11.3105l16.9697 -16.9697l-16.9697 -16.9697c-3.12012 -3.12012 -3.12012 -8.19043 0 -11.3105l11.3096 -11.3096c3.12012 -3.12012 8.19043 -3.12012 11.3096 0l16.9707 16.9697l16.9697 -16.9697
+c3.12012 -3.12012 8.19043 -3.12012 11.3096 0l11.3105 11.3096c3.12012 3.12012 3.12012 8.19043 0 11.3105l-16.9697 16.9697l33.9395 33.9404l45.25 -45.2598l-28.29 -28.29c-3.12012 -3.12012 -3.12012 -8.19043 0 -11.3105l11.3105 -11.3096
+c3.11914 -3.12012 8.18945 -3.12012 11.3096 0l28.29 28.29l28.3096 -28.2705c3.12012 -3.12012 8.19043 -3.12012 11.3105 0l11.3096 11.3105c3.12012 3.11914 3.12012 8.18945 0 11.3096l-28.29 28.29l45.2607 45.2598l33.9395 -33.9395l-16.9697 -16.9707
+c-3.12012 -3.11914 -3.12012 -8.18945 0 -11.3096l11.3096 -11.3096c3.12012 -3.12012 8.19043 -3.12012 11.3105 0l16.9697 16.9697l16.9697 -16.9697c3.12012 -3.12012 8.19043 -3.12012 11.3105 0l11.3096 11.3096c3.12012 3.12012 3.12012 8.19043 0 11.3096
+l-16.9697 16.9707l16.9697 16.9697c3.12012 3.12012 3.12012 8.19043 0 11.3096l-11.3096 11.3105c-3.12012 3.12012 -8.19043 3.12012 -11.3105 0l-16.9697 -16.9697l-33.9404 33.9395l45.25 45.25l28.29 -28.29c3.12012 -3.12012 8.19043 -3.12012 11.3105 0zM278.63 192
+l45.2598 45.2598l45.25 -45.2598l-45.25 -45.25z" />
+    <glyph glyph-name="toolbox" unicode="&#xf552;" 
+d="M502.63 233.37c6 -6 9.37012 -14.1396 9.37012 -22.6201v-82.75h-128v16c0 8.83984 -7.16016 16 -16 16h-32c-8.83984 0 -16 -7.16016 -16 -16v-16h-128v16c0 8.83984 -7.16016 16 -16 16h-32c-8.83984 0 -16 -7.16016 -16 -16v-16h-128v82.7402
+c0 8.49023 3.37012 16.6299 9.37012 22.6299l45.25 45.2598c6.00977 6 14.1396 9.37012 22.6299 9.37012h50.75v80c0 26.5098 21.4902 48 48 48h160c26.5098 0 48 -21.4902 48 -48v-80.0098h50.75c8.49023 0 16.6299 -3.37012 22.6299 -9.37012zM320 288v64h-128v-64h128z
+M384 80v16h128v-96c0 -17.6699 -14.3301 -32 -32 -32h-448c-17.6699 0 -32 14.3301 -32 32v96h128v-16c0 -8.83984 7.16016 -16 16 -16h32c8.83984 0 16 7.16016 16 16v16h128v-16c0 -8.83984 7.16016 -16 16 -16h32c8.83984 0 16 7.16016 16 16z" />
+    <glyph glyph-name="tshirt" unicode="&#xf553;" horiz-adv-x="640" 
+d="M631.2 351.5c7.89941 -3.90039 11.0996 -13.5996 7.09961 -21.5l-57.2998 -114.4c-4 -8 -13.5996 -11.1992 -21.5 -7.19922l-56.5996 27.6992c-10.6006 5.2002 -23 -2.59961 -23 -14.3994v-253.7c0 -17.7002 -14.3008 -32 -32 -32h-256c-17.7002 0 -32 14.2998 -32 32
+v253.6c0 11.9004 -12.4004 19.6006 -23 14.4004l-56.6006 -27.7002c-7.89941 -3.89941 -17.5 -0.700195 -21.5 7.2002l-57.2002 114.5c-3.89941 7.90039 -0.699219 17.5 7.2002 21.5l194.7 96.5c20.0996 -27.7998 64.5996 -47.2002 116.5 -47.2002
+s96.4004 19.4004 116.5 47.2002z" />
+    <glyph glyph-name="walking" unicode="&#xf554;" horiz-adv-x="320" 
+d="M208 352c-26.5 0 -48 21.5 -48 48s21.5 48 48 48s48 -21.5 48 -48s-21.5 -48 -48 -48zM302.5 202.9c15.7002 -7.90039 22 -27.3008 14.2998 -43c-7.89941 -15.8008 -26.8994 -22.2002 -42.5 -14.3008l-23.2998 11.8008c-15 7.59961 -26.4004 20.8994 -31.7002 37
+l-5.5 16.5l-17.2002 -68.7002l45.5 -49.7002c7.2002 -7.7998 12.3008 -17.4004 14.9004 -27.7002l22.2002 -89c4.2998 -17.0996 -6.2002 -34.5 -23.2998 -38.7998c-17.1006 -4.2998 -34.5 6.2002 -38.8008 23.2998l-18.2998 73.2998
+c-2.59961 10.3008 -7.7002 19.8008 -14.8994 27.7002l-59.9004 65.4004c-14.5 15.8994 -20.0996 38 -14.9004 58.7998l15.2002 60.7002l-26.7998 -10.7998c-7.2002 -2.90039 -13 -8.40039 -16.5 -15.4004l-6.7002 -13.5996
+c-7.89941 -15.8008 -26.8994 -22.2002 -42.5 -14.3008c-15.7002 7.90039 -22 27.1006 -14.2002 42.9004l6.7002 13.5996c10.4004 21 28.1006 37.5 49.7002 46.2002c37.4004 15.1006 57.2998 25.2998 93.2998 25.2002c46.5 -0.0996094 87.5 -31.2998 102.2 -75.9004
+l9.7002 -29.3994zM73.5996 62.2002l20.7002 51.5c8.7002 -11.9004 -7.89941 6.59961 47.4004 -53.7002l-13.5 -33.7998c-3.2998 -8.10059 -8.10059 -15.4004 -14.2002 -21.5l-59.4004 -59.4004c-12.5 -12.5 -32.6992 -12.5 -45.1992 0s-12.5 32.7998 0 45.2998l50 50.1006
+c6.19922 6.09961 11 13.3994 14.1992 21.5z" />
+    <glyph glyph-name="wallet" unicode="&#xf555;" 
+d="M461.2 320c28.0195 0 50.7998 -21.5303 50.7998 -48v-256c0 -26.4697 -22.7803 -48 -50.7998 -48h-397.2c-35.3496 0 -64 28.6504 -64 64v320c0 35.3496 28.6504 64 64 64h368c26.5098 0 48 -21.4902 48 -48c0 -8.83984 -7.16016 -16 -16 -16h-384
+c-8.83984 0 -16 -7.16016 -16 -16s7.16016 -16 16 -16h381.2zM416 112c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="angry" unicode="&#xf556;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM136 208c0 -17.7002 14.4004 -32 32.0996 -32c17.7002 0 32 14.2998 32 32c0 2.90039 -1 5.5 -1.69922 8.2002c0.599609 0 1.19922 -0.200195 1.69922 -0.200195
+c6.90039 0 13.2002 4.5 15.3008 11.4004c2.59961 8.39941 -2.2002 17.3994 -10.7002 19.8994l-80 24c-8.5 2.5 -17.4004 -2.2002 -19.9004 -10.7002c-2.59961 -8.39941 2.2002 -17.3994 10.7002 -19.8994l31 -9.2998c-6.40039 -5.90039 -10.5 -14.1006 -10.5 -23.4004z
+M304 53.7998c13.4004 -16.0996 38.2998 4 24.5 20.5c-20 24 -49.4004 37.7998 -80.5996 37.7998c-31.2002 0 -60.6006 -13.7998 -80.6006 -37.7998c-13.5996 -16.2998 11.1006 -36.7998 24.6006 -20.5c27.8994 33.4004 84.2998 33.4004 112.1 0zM380.6 240.7
+c8.5 2.5 13.3008 11.3994 10.8008 19.8994c-2.5 8.40039 -11.5 13.2002 -19.9004 10.7002l-80 -24c-8.40039 -2.5 -13.2002 -11.3994 -10.7002 -19.8994c2.10059 -6.90039 8.40039 -11.4004 15.2998 -11.4004c0.600586 0 1.10059 0.0996094 1.7002 0.200195
+c-0.799805 -2.60059 -1.7002 -5.2998 -1.7002 -8.2002c0 -17.7002 14.3008 -32 32 -32c17.7002 0 32 14.2998 32 32c0 9.2998 -4.19922 17.5996 -10.5 23.4004z" />
+    <glyph glyph-name="archway" unicode="&#xf557;" horiz-adv-x="576" 
+d="M560 0c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-159.98c-8.83984 0 -16 7.16016 -16 16v16l-0.0195312 160c0 53.0195 -42.9805 96 -96 96s-96 -42.9805 -96 -96v-176c0 -8.83984 -7.16016 -16 -16 -16h-159.98
+c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h15.9805v352h512v-352h16zM560 448c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-544c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h544z" />
+    <glyph glyph-name="atlas" unicode="&#xf558;" horiz-adv-x="448" 
+d="M318.38 240c-5.28027 -31.2197 -25.5898 -57.1699 -53.2998 -70.4102c7.66992 19.0605 12.7197 43.3799 14.21 70.4102h39.0898zM318.38 272h-39.0898c-1.49023 27.0303 -6.53027 51.3496 -14.21 70.4102c27.71 -13.2402 48.0098 -39.1904 53.2998 -70.4102zM224 350.69
+c7.69043 -7.4502 20.7695 -34.4307 23.4404 -78.6904h-46.8701c2.66016 44.2695 15.7393 71.2402 23.4297 78.6904zM182.92 342.41c-7.67969 -19.0605 -12.7197 -43.3799 -14.21 -70.4102h-39.0898c5.28027 31.2197 25.5898 57.1699 53.2998 70.4102zM182.92 169.59
+c-27.71 13.2402 -48.0195 39.1904 -53.2998 70.4102h39.0898c1.49023 -27.0303 6.53027 -51.3496 14.21 -70.4102zM247.43 240c-2.66016 -44.2598 -15.7393 -71.2402 -23.4395 -78.6904c-7.69043 7.4502 -20.7705 34.4307 -23.4307 78.6904h46.8701zM448 89.5996
+c0 -9.59961 -3.2002 -16 -9.59961 -19.1992c-3.2002 -12.8008 -3.2002 -57.6006 0 -73.6006c6.39941 -6.39941 9.59961 -12.7998 9.59961 -19.2002v-16c0 -16 -12.7998 -25.5996 -25.5996 -25.5996h-326.4c-54.4004 0 -96 41.5996 -96 96v320c0 54.4004 41.5996 96 96 96
+h326.4c16 0 25.5996 -9.59961 25.5996 -25.5996v-332.801zM224 384c-70.6904 0 -128 -57.3096 -128 -128s57.3096 -128 128 -128s128 57.3096 128 128s-57.3096 128 -128 128zM384 0v64h-288c-16 0 -32 -12.7998 -32 -32s12.7998 -32 32 -32h288z" />
+    <glyph glyph-name="award" unicode="&#xf559;" horiz-adv-x="384" 
+d="M97.1201 85.3701c13.79 -13.7803 32.1104 -21.3701 51.6104 -21.3701c12.4395 0 24.4697 3.54004 35.3096 9.58008l-52.0498 -127.62c-4.39062 -10.7695 -18.4307 -13.4004 -26.4307 -4.95996l-36.2393 38.2803l-52.6904 -2.01074
+c-11.6201 -0.439453 -19.8203 11.2607 -15.4297 22.0303l45.3701 111.24c7.55957 -5.87012 15.9199 -10.7705 25.4297 -13.3203c20.96 -5.60938 16.4297 -3.16016 25.1201 -11.8496zM382.8 -0.700195c4.39062 -10.7598 -3.80957 -22.4697 -15.4297 -22.0303
+l-52.6904 2.01074l-36.25 -38.2803c-7.98926 -8.44043 -22.04 -5.80957 -26.4297 4.95996l-52.0498 127.62c10.8398 -6.03027 22.8701 -9.58008 35.3096 -9.58008c19.5 0 37.8301 7.58984 51.6201 21.3701c8.66992 8.66992 4.0498 6.20996 25.1201 11.8496
+c9.50977 2.5498 17.8701 7.44043 25.4297 13.3203zM263 108c-13.2305 -13.4697 -33.8398 -15.8799 -49.7305 -5.82031c-6.13867 3.89746 -13.5029 6.15527 -21.3066 6.15527s-15.084 -2.25781 -21.2227 -6.15527c-15.9004 -10.0596 -36.5098 -7.64941 -49.7402 5.82031
+c-14.7305 15 -16.4004 14.04 -38.7803 20.1396c-13.8896 3.79004 -24.75 14.8408 -28.4697 28.9805c-7.48047 28.3994 -5.54004 24.9697 -25.9502 45.75c-10.1699 10.3604 -14.1396 25.4502 -10.4199 39.5898c7.48047 28.4199 7.46973 24.46 0 52.8203
+c-3.72949 14.1396 0.25 29.2295 10.4199 39.5801c20.4102 20.7793 18.4805 17.3594 25.9502 45.75c3.71973 14.1396 14.5801 25.1895 28.4697 28.9795c27.8906 7.61035 24.5303 5.62988 44.9404 26.4102c10.1699 10.3604 25 14.4004 38.8896 10.6104
+c27.9199 -7.61035 24.0303 -7.60059 51.9004 0c13.8896 3.79004 28.7197 -0.260742 38.8896 -10.6104c20.4297 -20.79 17.0703 -18.7998 44.9502 -26.4102c13.8896 -3.79004 24.75 -14.8398 28.4697 -28.9795c7.48047 -28.3906 5.54004 -24.9707 25.9502 -45.75
+c10.1699 -10.3506 14.1396 -25.4404 10.4199 -39.5801c-7.47949 -28.4102 -7.46973 -24.4502 0 -52.8301c3.71973 -14.1406 -0.25 -29.2305 -10.4199 -39.5801c-20.4102 -20.7803 -18.4697 -17.3506 -25.9502 -45.75c-3.71973 -14.1396 -14.5801 -25.1904 -28.4697 -28.9805
+c-21.7598 -5.92969 -23.5098 -4.58984 -38.79 -20.1396zM97.6602 272.04c0 -53.0303 42.2402 -96.0205 94.3398 -96.0205s94.3398 42.9902 94.3398 96.0205s-42.2402 96.0195 -94.3398 96.0195s-94.3398 -42.9893 -94.3398 -96.0195z" />
+    <glyph glyph-name="backspace" unicode="&#xf55a;" horiz-adv-x="640" 
+d="M576 384c35.3496 0 64 -28.6504 64 -64v-256c0 -35.3496 -28.6504 -64 -64 -64h-370.75c-16.9697 0 -33.25 6.75 -45.25 18.75l-150.63 150.63c-12.5 12.4902 -12.5 32.75 0 45.25l150.63 150.62c11.5801 11.5869 27.5869 18.75 45.2471 18.75h0.0126953h370.74z
+M491.31 129.94l-62.0596 62.0596l62.0596 62.0596c6.25 6.25 6.25 16.3809 0 22.6309l-22.6191 22.6191c-6.25 6.25 -16.3809 6.25 -22.6309 0l-62.0596 -62.0596l-62.0596 62.0596c-6.25 6.25 -16.3809 6.25 -22.6309 0l-22.6191 -22.6191
+c-6.25 -6.25 -6.25 -16.3809 0 -22.6309l62.0596 -62.0596l-62.0596 -62.0596c-6.25 -6.25 -6.25 -16.3809 0 -22.6309l22.6191 -22.6191c6.25 -6.25 16.3809 -6.25 22.6309 0l62.0596 62.0596l62.0596 -62.0596c6.25 -6.25 16.3809 -6.25 22.6309 0l22.6191 22.6191
+c6.25 6.25 6.25 16.3809 0 22.6309z" />
+    <glyph glyph-name="bezier-curve" unicode="&#xf55b;" horiz-adv-x="640" 
+d="M368 416c17.6699 0 32 -14.3301 32 -32v-96c0 -17.6699 -14.3301 -32 -32 -32h-96c-17.6699 0 -32 14.3301 -32 32v96c0 17.6699 14.3301 32 32 32h96zM208 360v-72c0 -9.4502 2.17969 -18.3604 5.87988 -26.4404c-34.2695 -24.3496 -59.7402 -59.9492 -71.04 -101.56
+h-49.3994c13.6797 64.6797 54.1699 119.48 109.54 152h-79.7305c-9.5 -23.4404 -32.4102 -40 -59.25 -40c-35.3398 0 -64 28.6504 -64 64s28.6602 64 64 64c26.8398 0 49.75 -16.5596 59.25 -40h84.75zM160 128c17.6699 0 32 -14.3301 32 -32v-96
+c0 -17.6699 -14.3301 -32 -32 -32h-96c-17.6699 0 -32 14.3301 -32 32v96c0 17.6699 14.3301 32 32 32h96zM576 400c35.3398 0 64 -28.6504 64 -64s-28.6602 -64 -64 -64c-26.8398 0 -49.75 16.5596 -59.25 40h-79.7305c55.3701 -32.5195 95.8604 -87.3203 109.54 -152
+h-49.3994c-11.2998 41.6104 -36.7705 77.21 -71.04 101.56c3.68945 8.08008 5.87988 16.9902 5.87988 26.4404v72h84.75c9.5 23.4404 32.4102 40 59.25 40zM576 128c17.6699 0 32 -14.3301 32 -32v-96c0 -17.6699 -14.3301 -32 -32 -32h-96c-17.6699 0 -32 14.3301 -32 32
+v96c0 17.6699 14.3301 32 32 32h96z" />
+    <glyph glyph-name="bong" unicode="&#xf55c;" horiz-adv-x="448" 
+d="M302.5 -64h-221c-23.1699 0 -44.4199 12.5801 -56 32.6602c-16.1904 28.0703 -25.5 60.5898 -25.5 95.3398c0 71.0303 38.6699 132.9 96 166.11v153.93l-15.9697 -0.0205078c-8.85059 -0.00976562 -16.0303 7.16016 -16.0205 16.0107l0.0400391 31.7295
+c0.00976562 8.82031 7.16016 15.9707 15.9805 15.9805l223.939 0.259766c8.85059 0.00976562 16.0303 -7.16992 16.0205 -16.0195l-0.0400391 -31.7207c-0.00976562 -8.81934 -7.16016 -15.9697 -15.9805 -15.9795l-15.9697 -0.0205078v-154.16
+c14.1201 -8.17969 27.0898 -18.1396 38.6504 -29.5098l39.4092 39.4102l-9.37988 9.37988c-6.25 6.25 -6.25 16.3799 0 22.6299l11.3105 11.3105c6.25 6.25 16.3799 6.25 22.6299 0l52.6895 -52.6904c6.25 -6.25 6.25 -16.3799 0 -22.6299l-11.2998 -11.3203
+c-6.25 -6.25 -16.3799 -6.25 -22.6299 0l-9.37988 9.37988l-43.4404 -43.4395c17.3604 -28.8105 27.4404 -62.5 27.4404 -98.6201c0 -34.75 -9.30957 -67.2598 -25.5 -95.3398c-11.5703 -20.0801 -32.8203 -32.6602 -56 -32.6602zM120.06 188.57
+c-24.8096 -14.3701 -44.1094 -35.7305 -56.5596 -60.5703h257c-12.4404 24.8398 -31.75 46.2002 -56.5596 60.5703l-23.9404 13.8701v181.76l-96 -0.110352v-181.649z" />
+    <glyph glyph-name="brush" unicode="&#xf55d;" horiz-adv-x="384" 
+d="M352 448c17.6699 0 32 -14.3301 32 -32v-224h-384v224c0 17.6699 14.3301 32 32 32h320zM0 128v32h384v-32c0 -35.3496 -28.6602 -64 -64 -64h-64v-64c0 -35.3496 -28.6602 -64 -64 -64s-64 28.6504 -64 64v64h-64c-35.3398 0 -64 28.6504 -64 64zM192 24
+c-13.25 0 -24 -10.7402 -24 -24c0 -13.25 10.75 -24 24 -24s24 10.75 24 24c0 13.2598 -10.75 24 -24 24z" />
+    <glyph glyph-name="bus-alt" unicode="&#xf55e;" 
+d="M488 320c13.25 0 24 -10.7402 24 -24v-80c0 -13.25 -10.75 -24 -24 -24h-8v-166.4c0 -12.7998 -9.59961 -25.5996 -25.5996 -25.5996h-6.40039v-32c0 -17.6699 -14.3301 -32 -32 -32h-32c-17.6699 0 -32 14.3301 -32 32v32h-192v-32c0 -17.6699 -14.3301 -32 -32 -32h-32
+c-17.6699 0 -32 14.3301 -32 32v32c-17.6699 0 -32 14.3301 -32 32v160h-8c-13.25 0 -24 10.75 -24 24v80c0 13.2598 10.75 24 24 24h8v48c0 44.7998 99.2002 80 224 80s224 -35.2002 224 -80v-48h8zM160 376v-16c0 -4.41992 3.58008 -8 8 -8h176c4.41992 0 8 3.58008 8 8
+v16c0 4.41992 -3.58008 8 -8 8h-176c-4.41992 0 -8 -3.58008 -8 -8zM112 48c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM240 160v160h-112c-17.6699 0 -32 -14.3301 -32 -32v-96c0 -17.6699 14.3301 -32 32 -32h112zM272 160
+h112c17.6699 0 32 14.3301 32 32v96c0 17.6699 -14.3301 32 -32 32h-112v-160zM400 48c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="cannabis" unicode="&#xf55f;" 
+d="M503.47 87.75c5.24023 -2.75977 8.52051 -8.20996 8.53027 -14.1504c0.00976562 -5.92969 -3.26953 -11.3691 -8.50977 -14.1494c-2.4502 -1.29004 -60.7705 -31.7197 -133.49 -31.7197c-6.12988 0 -11.96 0.0996094 -17.5 0.30957
+c11.3604 -22.2305 16.5195 -38.3096 16.8096 -39.2197c1.80078 -5.68066 0.290039 -11.8906 -3.90918 -16.1104c-2.90137 -2.91113 -6.91699 -4.70801 -11.3477 -4.70801c-1.6543 0 -3.25098 0.250977 -4.75293 0.717773c-1.83008 0.580078 -37.7197 11.9902 -77.2998 39.29
+v-64.0098c0 -4.41992 -3.58008 -8 -8 -8h-16c-4.41992 0 -8 3.58008 -8 8v64.0195c-39.5801 -27.2998 -75.4697 -38.7197 -77.2998 -39.2891c-1.50195 -0.466797 -3.10059 -0.724609 -4.75586 -0.724609c-4.43066 0 -8.44336 1.80273 -11.3447 4.71387
+c-4.19922 4.2207 -5.70996 10.4307 -3.90918 16.1104c0.290039 0.910156 5.43945 16.9902 16.8096 39.2197c-5.54004 -0.209961 -11.3604 -0.30957 -17.5 -0.30957c-72.7305 0 -131.04 30.4297 -133.49 31.7197c-5.06836 2.68652 -8.52441 7.99805 -8.52441 14.1299
+c0 6.13965 3.46484 11.4766 8.54492 14.1602c1.56934 0.820312 32.3896 16.8896 76.7793 25.8096c-64.25 75.1201 -84.0498 161.671 -84.9297 165.641c-0.25 1.12207 -0.384766 2.28125 -0.384766 3.47754c0 4.40723 1.78711 8.39941 4.6748 11.292
+c3.03027 3.04004 7.12012 4.7002 11.3203 4.7002c1.14941 0 2.2998 -0.129883 3.43945 -0.379883c3.89062 -0.860352 86.5508 -19.5996 160.58 -79.7598c0 1.45996 -0.00976562 2.92969 -0.00976562 4.39941c0 118.79 59.9805 213.721 62.5303 217.7
+c2.93945 4.58984 8.01953 7.37012 13.4697 7.37012c5.65625 0 10.6211 -2.92969 13.46 -7.37012c2.5498 -3.97949 62.5303 -98.9102 62.5303 -217.7c0 -1.46973 0 -2.93945 -0.00976562 -4.39941c74.0391 60.1699 156.699 78.9102 160.579 79.7598
+c1.15039 0.259766 2.30078 0.379883 3.44043 0.379883c4.2002 0 8.29004 -1.66016 11.3203 -4.7002c3.85938 -3.87012 5.47949 -9.43945 4.2998 -14.7695c-0.879883 -3.96973 -20.6797 -90.5205 -84.9297 -165.641c44.3896 -8.91992 75.2197 -24.9893 76.7793 -25.8096z" />
+    <glyph glyph-name="check-double" unicode="&#xf560;" 
+d="M505 273.2c9.2998 -9.2998 9.2998 -24.5 -0.0996094 -34l-296 -296.2c-9.30078 -9.40039 -24.5 -9.40039 -33.9004 0l-168 168.1c-9.40039 9.40039 -9.40039 24.6006 0 34l39.7002 39.7002c9.2998 9.40039 24.5 9.40039 33.8994 0l111.4 -111.5l239.5 239.5
+c9.2998 9.40039 24.5 9.40039 33.9004 0zM180.7 167.2l-112 112.2c-6.2002 6.19922 -6.2002 16.2998 0 22.5996l45.2998 45.2998c6.2002 6.2998 16.4004 6.2998 22.5996 0l55.4004 -55.5l151.5 151.5c6.2002 6.2998 16.4004 6.2998 22.5996 0l45.2002 -45.2998
+c6.2002 -6.2002 6.2002 -16.2998 0 -22.5996l-208 -208.2c-6.2002 -6.2998 -16.3994 -6.2998 -22.5996 0z" />
+    <glyph glyph-name="cocktail" unicode="&#xf561;" horiz-adv-x="576" 
+d="M296 -16c22.0898 0 40 -17.9102 40 -40c0 -4.41992 -3.58008 -8 -8 -8h-240c-4.41992 0 -8 3.58008 -8 8c0 22.0898 17.9102 40 40 40h56v125.22l-168.74 168.73c-15.5195 15.5195 -4.5293 42.0498 17.4199 42.0498h366.641c21.9492 0 32.9395 -26.5303 17.4199 -42.0498
+l-168.74 -168.73v-125.22h56zM432 448c79.5303 0 144 -64.4697 144 -144s-64.4697 -144 -144 -144c-27.4102 0 -52.7695 8.08008 -74.5801 21.3799l35.2598 35.2598c12.0303 -5.43945 25.2803 -8.63965 39.3203 -8.63965c52.9297 0 96 43.0596 96 96s-43.0703 96 -96 96
+c-35.3701 0 -65.9902 -19.4502 -82.6396 -48h-52.54c19.8301 55.7998 72.5693 96 135.18 96z" />
+    <glyph glyph-name="concierge-bell" unicode="&#xf562;" 
+d="M288 317.46c108.51 -15.5703 192 -108.64 192 -221.46h-448c0 112.82 83.4902 205.89 192 221.46v18.54h-16c-8.83984 0 -16 7.16016 -16 16v16c0 8.83984 7.16016 16 16 16h96c8.83984 0 16 -7.16016 16 -16v-16c0 -8.83984 -7.16016 -16 -16 -16h-16v-18.54zM496 64
+c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-480c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h480z" />
+    <glyph glyph-name="cookie" unicode="&#xf563;" 
+d="M510.37 193.21c4.37988 -27.6602 -0.110352 -56 -12.8203 -80.96l-35.0996 -68.8701c-12.7021 -24.9268 -32.8652 -45.0938 -57.79 -57.7998l-69.1201 -35.21c-24.8301 -12.6396 -53.0098 -17.1104 -80.5205 -12.75l-76.6992 12.1396
+c-28.1211 4.45801 -53.4463 17.7891 -72.71 37.0498l-54.7607 54.75c-19.3213 19.3281 -32.6924 44.7373 -37.1592 72.9502l-12.0801 76.2705c-1.07715 6.79883 -1.55371 13.7725 -1.55371 20.8721c0 21.6162 5.18359 42.0303 14.373 60.0674l35.1006 68.8799
+c12.6992 24.9297 32.8633 45.0967 57.79 57.8008l69.1201 35.21c24.8291 12.6494 53.0098 17.1201 80.5195 12.7598l76.7002 -12.1504c27.5303 -4.34961 52.9795 -17.3301 72.71 -37.0498l54.7598 -54.75c19.3213 -19.3281 32.6924 -44.7363 37.1602 -72.9502zM176 80
+c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM208 240c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM368 112c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32
+s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="cookie-bite" unicode="&#xf564;" 
+d="M510.52 192.18c4.10059 -27.3301 -0.349609 -55.2695 -12.9092 -79.9102l-35.1006 -68.8799c-12.6992 -24.9316 -32.8623 -45.1025 -57.79 -57.8096l-69.1299 -35.21c-24.8301 -12.6504 -53.0195 -17.1201 -80.5303 -12.7598l-76.71 12.1494
+c-28.123 4.45801 -53.4482 17.793 -72.71 37.0605l-54.7695 54.7598c-19.3223 19.332 -32.6934 44.7441 -37.1602 72.96l-12.0801 76.2695c-1.07617 6.7998 -1.55273 13.7734 -1.55273 20.874c0 21.6182 5.18262 42.0361 14.373 60.0762l35.0996 68.8799
+c12.6963 24.9346 32.8613 45.1055 57.79 57.8105l69.1299 35.2197c24.5898 12.5205 52.46 16.96 79.7207 12.8203c0.859375 -69.96 57.6895 -126.45 127.859 -126.45c0 -70.1699 56.5 -127.01 126.47 -127.86zM176 80c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32
+s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM208 240c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM368 112c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="crop-alt" unicode="&#xf565;" 
+d="M488 96c13.25 0 24 -10.7402 24 -24v-48c0 -13.25 -10.75 -24 -24 -24h-40v-40c0 -13.25 -10.75 -24 -24 -24h-48c-13.25 0 -24 10.75 -24 24v328h-160v96h224c17.6699 0 32 -14.3301 32 -32v-256h40zM160 424v-328h160v-96h-224c-17.6699 0 -32 14.3301 -32 32v256h-40
+c-13.25 0 -24 10.75 -24 24v48c0 13.2598 10.75 24 24 24h40v40c0 13.2598 10.75 24 24 24h48c13.25 0 24 -10.7402 24 -24z" />
+    <glyph glyph-name="digital-tachograph" unicode="&#xf566;" horiz-adv-x="640" 
+d="M608 352c17.6699 0 32 -14.3301 32 -32v-256c0 -17.6699 -14.3301 -32 -32 -32h-576c-17.6699 0 -32 14.3301 -32 32v256c0 17.6699 14.3301 32 32 32h576zM304 96v8c0 4.41992 -3.58008 8 -8 8h-224c-4.41992 0 -8 -3.58008 -8 -8v-8c0 -4.41992 3.58008 -8 8 -8h224
+c4.41992 0 8 3.58008 8 8zM72 160c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8h-16c-4.41992 0 -8 -3.58008 -8 -8v-16zM136 160c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8h-16
+c-4.41992 0 -8 -3.58008 -8 -8v-16zM200 160c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8h-16c-4.41992 0 -8 -3.58008 -8 -8v-16zM264 160c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8
+h-16c-4.41992 0 -8 -3.58008 -8 -8v-16zM304 224v48c0 8.83984 -7.16016 16 -16 16h-208c-8.83984 0 -16 -7.16016 -16 -16v-48c0 -8.83984 7.16016 -16 16 -16h208c8.83984 0 16 7.16016 16 16zM576 96v8c0 4.41992 -3.58008 8 -8 8h-224c-4.41992 0 -8 -3.58008 -8 -8v-8
+c0 -4.41992 3.58008 -8 8 -8h224c4.41992 0 8 3.58008 8 8z" />
+    <glyph glyph-name="dizzy" unicode="&#xf567;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM152 233.4l28.7002 -28.7002c14.7002 -14.7998 37.7998 7.39941 22.5996 22.5996l-28.7002 28.7002l28.7002 28.7002c15 14.8994 -7.59961 37.5996 -22.5996 22.5996
+l-28.7002 -28.7002l-28.7002 28.7002c-14.8994 15 -37.5996 -7.59961 -22.5996 -22.5996l28.7002 -28.7002l-28.7002 -28.7002c-15.2002 -15.0996 7.7998 -37.3994 22.5996 -22.5996zM248 32c35.2998 0 64 28.7002 64 64s-28.7002 64 -64 64s-64 -28.7002 -64 -64
+s28.7002 -64 64 -64zM395.3 227.3l-28.7002 28.7002l28.7002 28.7002c15 14.8994 -7.59961 37.5996 -22.5996 22.5996l-28.7002 -28.7002l-28.7002 28.7002c-14.8994 15 -37.5996 -7.59961 -22.5996 -22.5996l28.7002 -28.7002l-28.7002 -28.7002
+c-15.2002 -15.0996 7.7998 -37.3994 22.5996 -22.5996l28.7002 28.7002l28.7002 -28.7002c14.7002 -14.7998 37.7998 7.39941 22.5996 22.5996z" />
+    <glyph glyph-name="drafting-compass" unicode="&#xf568;" 
+d="M457.01 103.58l54.9805 -95.2305l-7.02051 -58.25c-1.2793 -10.5898 -12.3594 -16.9893 -22.1699 -12.7998l-53.9502 23.04l-54.3799 94.1904c29.9102 11.8701 57.4902 28.7197 82.54 49.0498zM499.5 198.14c-52.6201 -83.1299 -144.45 -134.14 -243.5 -134.14
+c-35.3799 0 -69.8701 6.71973 -102.06 18.96l-70.8008 -122.63l-53.9492 -23.04c-9.81055 -4.19043 -20.8906 2.20996 -22.1709 12.7998l-7.01953 58.25l71.2803 123.46c-21.29 17.8105 -40.4102 38.3799 -55.9805 62.0205
+c-4.99023 7.56934 -2.20996 17.9297 5.64062 22.4697l27.75 16.0703c7.40918 4.29004 16.5898 1.76953 21.3799 -5.33008c9.71973 -14.4102 21.1299 -27.3906 33.6797 -39l68.2998 118.31c-7.43945 13.6299 -12.0498 29.0303 -12.0498 45.6602c0 53.0195 42.9805 96 96 96
+s96 -42.9805 96 -96c0 -16.6299 -4.61035 -32.0303 -12.0596 -45.6602l51.79 -89.71c-23.0508 -23.1699 -51.3809 -39.96 -82.6104 -48.9199l-51.0898 88.5c-0.69043 -0.0195312 -1.33984 -0.209961 -2.04004 -0.209961s-1.33984 0.19043 -2.04004 0.209961
+l-67.3604 -116.68c22.1797 -7.28027 45.4805 -11.5303 69.4102 -11.5303c76.25 0 147.01 38.8496 188.12 102.38c4.64941 7.17969 13.7803 9.87012 21.2598 5.71973l28.0703 -15.5693c7.93945 -4.40039 10.9102 -14.7207 6.0498 -22.3906zM256 384
+c-17.6699 0 -32 -14.3301 -32 -32s14.3301 -32 32 -32s32 14.3301 32 32s-14.3301 32 -32 32z" />
+    <glyph glyph-name="drum" unicode="&#xf569;" 
+d="M431.34 325.95c44.9004 -16.3398 80.6602 -42.7803 80.6602 -86.1006v-160.229c0 -30.2705 -27.5 -57.6797 -72 -77.8604v101.9c0 13.2461 -10.7539 24 -24 24s-24 -10.7539 -24 -24v-118.93c-33.0498 -9.11035 -71.0703 -15.0605 -112 -16.7305v103.61
+c0 13.2461 -10.7539 24 -24 24s-24 -10.7539 -24 -24v-103.61c-40.9297 1.66992 -78.9502 7.62012 -112 16.7305v118.93c0 13.2461 -10.7539 24 -24 24s-24 -10.7539 -24 -24v-101.9c-44.5 20.1807 -72 47.5898 -72 77.8604v160.229c0 107.601 219.55 112.15 256 112.15
+c15.2197 0 62.4297 -0.910156 112.19 -9.69043l110.06 71c2.53711 1.69238 5.59082 2.7041 8.86621 2.7041c5.55664 0 10.4551 -2.83887 13.3242 -7.14355l8.86914 -13.3105c1.69238 -2.53711 2.7041 -5.58984 2.7041 -8.86523
+c0 -5.55664 -2.83887 -10.4561 -7.14355 -13.3242zM256 175.76c114.87 0 208 28.6904 208 64.0898c0 21.3105 -33.9102 40.1504 -85.8604 51.75l-118.64 -76.5195c-2.53711 -1.69141 -5.59082 -2.7041 -8.86621 -2.7041c-5.55664 0 -10.4551 2.83887 -13.3242 7.14355
+l-8.86914 13.3105c-1.69434 2.53809 -2.70703 5.59277 -2.70703 8.87012c0 5.55371 2.83594 10.4502 7.13672 13.3193l72.8096 47c-15.9492 1.2002 -32.5293 1.91016 -49.6797 1.91016c-114.88 0 -208 -28.6797 -208 -64.0801c0 -35.3994 93.1201 -64.0898 208 -64.0898z
+" />
+    <glyph glyph-name="drum-steelpan" unicode="&#xf56a;" horiz-adv-x="576" 
+d="M288 416c159.06 0 288 -57.3096 288 -128v-192c0 -70.6904 -128.94 -128 -288 -128s-288 57.3096 -288 128v192c0 70.6904 128.94 128 288 128zM205.01 257.64c5.11035 19.0605 2.49023 38.96 -7.37012 56.0508l-25.5996 44.3398
+c-73.9297 -13.6406 -124.04 -39.8701 -124.04 -70.0303c0 -30.7803 52.2305 -57.46 128.7 -70.8398c13.7695 9.91016 23.8594 23.8701 28.3096 40.4795zM288 208c21.0801 0 41.4102 1 60.8896 2.7002c-8.05957 26.1299 -32.1494 45.2998 -60.8896 45.2998
+s-52.8301 -19.1699 -60.8896 -45.2998c19.4795 -1.7002 39.8096 -2.7002 60.8896 -2.7002zM352 352v13.04c-20.4004 1.87988 -41.7998 2.95996 -64 2.95996s-43.5996 -1.08008 -64 -2.95996v-13.04c0 -35.29 28.71 -64 64 -64s64 28.71 64 64zM398.93 217.1
+c76.6699 13.3604 129.07 40.0703 129.07 70.9004c0 30.21 -50.2803 56.5 -124.44 70.0996l-25.6494 -44.4199c-9.87012 -17.0801 -12.4902 -36.9795 -7.37988 -56.04c4.45996 -16.6396 14.5898 -30.6299 28.3994 -40.54z" />
+    <glyph glyph-name="feather-alt" unicode="&#xf56b;" 
+d="M512 448c-1.80957 -26.2598 -11.71 -132.86 -53.6201 -234.79l-106.54 -53.21h81.1406c-9.08008 -16.4102 -19.2002 -32.2305 -30.4502 -47.1201l-146.79 -48.8799h100.95c-35.5605 -30.0703 -79.1006 -51.0996 -132.58 -56.54
+c-41.8105 -4.83008 -83.8701 -7.21973 -125.96 -7.36035l-57.1309 -57.0693c-9.38965 -9.37012 -24.5996 -9.37012 -33.9795 0s-9.37988 24.5693 0 33.9395l259.5 259.24c6.25 6.25 6.25 16.3799 0 22.6299s-16.4004 6.25 -22.6504 0l-178.87 -178.689
+c1.15039 26.7998 2.90039 53.5801 5.99023 80.2393c25.4307 249.41 389.21 284.051 440.99 287.61z" />
+    <glyph glyph-name="file-contract" unicode="&#xf56c;" horiz-adv-x="384" 
+d="M224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136zM64 376v-16c0 -4.41992 3.58008 -8 8 -8h80c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8
+h-80c-4.41992 0 -8 -3.58008 -8 -8zM64 312v-16c0 -4.41992 3.58008 -8 8 -8h80c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8h-80c-4.41992 0 -8 -3.58008 -8 -8zM256.81 64c-4.19922 0 -8.13965 2.44043 -10.1592 6.5
+c-11.9502 23.8604 -46.2305 30.3496 -66 14.1602l-13.8809 41.6396c-3.28906 9.82031 -12.4297 16.4102 -22.7695 16.4102s-19.4805 -6.59961 -22.7803 -16.4102l-18.1895 -54.6396c-1.53027 -4.58008 -5.81055 -7.66016 -10.6406 -7.66016h-12.3896
+c-8.83984 0 -16 -7.16016 -16 -16s7.16016 -16 16 -16h12.3896c18.6201 0 35.1104 11.8701 41 29.5303l10.6104 31.8799l16.8301 -50.46c2.03027 -6.14062 7.58008 -10.4404 14.0303 -10.8906c0.389648 -0.0292969 0.759766 -0.0498047 1.13965 -0.0498047
+c0.00390625 0 -0.00292969 -0.015625 0.000976562 -0.015625c6.26074 0 11.6865 3.60742 14.3086 8.85547l7.6709 15.3408c2.7998 5.59961 7.93945 6.18945 10.0195 6.18945s7.21973 -0.599609 10.1699 -6.51953c7.37012 -14.7207 22.1904 -23.8604 38.6396 -23.8604
+h47.1904c8.83984 0 16 7.16016 16 16s-7.16016 16 -16 16h-47.1904zM377 343c4.5 -4.5 7 -10.5996 7 -16.9004v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7z" />
+    <glyph glyph-name="file-download" unicode="&#xf56d;" horiz-adv-x="384" 
+d="M224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136zM300.45 100.64c10.1299 10.0703 3.00977 27.3604 -11.2705 27.3604h-65.1797v80
+c0 8.83984 -7.16016 16 -16 16h-32c-8.83984 0 -16 -7.16016 -16 -16v-80h-65.1797c-14.2803 0 -21.4004 -17.29 -11.25 -27.3604l96.4199 -95.6992c6.64941 -6.61035 17.3896 -6.61035 24.04 0zM377 343c4.5 -4.5 7 -10.5996 7 -16.9004v-6.09961h-128v128h6.09961
+c6.40039 0 12.5 -2.5 17 -7z" />
+    <glyph glyph-name="file-export" unicode="&#xf56e;" horiz-adv-x="576" 
+d="M384 326.1v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7l97.9004 -98c4.5 -4.5 7 -10.5996 7 -16.9004zM571 140c6.59961 -6.59961 6.59961 -17.4004 0 -24l-95.7002 -96.5c-10.0996 -10.0996 -27.3994 -3 -27.3994 11.2998v65.2002h-64v64h64v65.0996
+c0 14.3008 17.2998 21.4004 27.3994 11.3008zM192 112c0 -8.7998 7.2002 -16 16 -16h176v-136c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136c0 -13.2002 10.7998 -24 24 -24h136v-128h-176
+c-8.7998 0 -16 -7.2002 -16 -16v-32z" />
+    <glyph glyph-name="file-import" unicode="&#xf56f;" 
+d="M16 160h112v-64h-112c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16zM505 343c4.5 -4.5 7 -10.5996 7 -16.9004v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7zM352 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24
+h-336c-13.2998 0 -24 10.7002 -24 24v136h127.9v-65.0996c0 -14.3008 17.2998 -21.4004 27.3994 -11.3008l95.7002 96.4004c6.59961 6.59961 6.59961 17.2998 0 24l-95.5996 96.5c-10.1006 10.0996 -27.4004 3 -27.4004 -11.2998v-65.2002h-128v264
+c0 13.2998 10.7002 24 24 24h200v-136z" />
+    <glyph glyph-name="file-invoice" unicode="&#xf570;" horiz-adv-x="384" 
+d="M288 192v-64h-192v64h192zM377 343c4.5 -4.5 7 -10.5996 7 -16.9004v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7zM224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464
+c0 13.2998 10.7002 24 24 24h200v-136zM64 376v-16c0 -4.41992 3.58008 -8 8 -8h80c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8h-80c-4.41992 0 -8 -3.58008 -8 -8zM64 312v-16c0 -4.41992 3.58008 -8 8 -8h80c4.41992 0 8 3.58008 8 8v16
+c0 4.41992 -3.58008 8 -8 8h-80c-4.41992 0 -8 -3.58008 -8 -8zM320 8v16c0 4.41992 -3.58008 8 -8 8h-80c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h80c4.41992 0 8 3.58008 8 8zM320 208c0 8.83984 -7.16016 16 -16 16h-224
+c-8.83984 0 -16 -7.16016 -16 -16v-96c0 -8.83984 7.16016 -16 16 -16h224c8.83984 0 16 7.16016 16 16v96z" />
+    <glyph glyph-name="file-invoice-dollar" unicode="&#xf571;" horiz-adv-x="384" 
+d="M377 343c4.5 -4.5 7 -10.5996 7 -16.9004v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7zM224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136z
+M64 376v-16c0 -4.41992 3.58008 -8 8 -8h80c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8h-80c-4.41992 0 -8 -3.58008 -8 -8zM64 296c0 -4.41992 3.58008 -8 8 -8h80c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8h-80c-4.41992 0 -8 -3.58008 -8 -8
+v-16zM208 32.1201c23.6201 0.629883 42.6699 20.54 42.6699 45.0703c0 19.9697 -12.9902 37.8096 -31.5801 43.3896l-45 13.5c-5.16016 1.54004 -8.76953 6.78027 -8.76953 12.7295c0 7.27051 5.2998 13.1904 11.7998 13.1904h28.1104
+c4.55957 0 8.94922 -1.29004 12.8193 -3.71973c3.24023 -2.03027 7.36035 -1.91016 10.1299 0.729492l11.75 11.21c3.53027 3.37012 3.33008 9.20996 -0.569336 12.1406c-9.10059 6.83984 -20.0801 10.7695 -31.3701 11.3496v24.29c0 4.41992 -3.58008 8 -8 8h-16
+c-4.41992 0 -8 -3.58008 -8 -8v-24.1201c-23.6201 -0.629883 -42.6699 -20.5498 -42.6699 -45.0703c0 -19.9697 12.9893 -37.8096 31.5801 -43.3896l45 -13.5c5.15918 -1.54004 8.76953 -6.78027 8.76953 -12.7295c0 -7.27051 -5.2998 -13.1904 -11.7998 -13.1904h-28.1104
+c-4.55957 0 -8.9502 1.2998 -12.8193 3.71973c-3.24023 2.03027 -7.36035 1.91016 -10.1309 -0.729492l-11.75 -11.21c-3.5293 -3.37012 -3.3291 -9.20996 0.570312 -12.1406c9.10059 -6.83008 20.0801 -10.7695 31.3701 -11.3496v-24.29c0 -4.41992 3.58008 -8 8 -8h16
+c4.41992 0 8 3.58008 8 8v24.1201z" />
+    <glyph glyph-name="file-prescription" unicode="&#xf572;" horiz-adv-x="384" 
+d="M224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136zM292.53 132.52c-6.25 6.25 -16.3799 6.25 -22.6299 0l-29.9004 -29.8994l-33.46 33.46
+c19.8398 10.8701 33.46 31.7002 33.46 55.9199c0 35.3496 -28.6504 64 -64 64h-80c-8.83984 0 -16 -7.16016 -16 -16v-160c0 -8.83984 7.16016 -16 16 -16h16c8.83984 0 16 7.16016 16 16v48h18.7402l59.3193 -59.3096l-30.0596 -30.0605
+c-6.25 -6.25 -6.25 -16.3799 0 -22.6299l11.3096 -11.3096c6.25 -6.25 16.3809 -6.25 22.6309 0l30.0596 30.0596l30.0596 -30.0703c6.25 -6.25 16.3809 -6.25 22.6309 0l11.3096 11.3105c6.25 6.25 6.25 16.3799 0 22.6299l-30.0596 30.0596l29.8994 29.9004
+c6.25 6.25 6.25 16.3799 0 22.6299zM176 176h-48v32h48c8.82031 0 16 -7.17969 16 -16s-7.17969 -16 -16 -16zM384 326.1v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7l97.9004 -98c4.5 -4.5 7 -10.5996 7 -16.9004z" />
+    <glyph glyph-name="file-signature" unicode="&#xf573;" horiz-adv-x="576" 
+d="M218.17 23.8604c7.25 -14.4707 21.71 -23.4404 37.8301 -23.75l128 -0.110352v-40c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136c0 -13.2002 10.7998 -24 24 -24h136.01v-46.5498l-128 -127.09
+v-82.1201c-3.87012 0.30957 -7.46973 2.47949 -9.35938 6.25977c-11.9404 23.8604 -46.25 30.3496 -66 14.1602l-13.8809 41.6396c-3.28906 9.82031 -12.4297 16.4102 -22.7695 16.4102s-19.4805 -6.59961 -22.7803 -16.4102l-18.1895 -54.6396
+c-1.53027 -4.58008 -5.81055 -7.66016 -10.6406 -7.66016h-12.3896c-8.83984 0 -16 -7.16016 -16 -16s7.16016 -16 16 -16h12.3896c18.6201 0 35.1104 11.8701 41 29.5303l10.6104 31.8799l16.8301 -50.4697c4.4502 -13.46 23.1104 -14.8701 29.4795 -2.09082
+l7.6709 15.3408c2.7998 5.59961 7.93945 6.18945 10.0195 6.18945s7.21973 -0.599609 10.1699 -6.51953zM384 326.1v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7l97.9004 -98c4.5 -4.5 7 -10.5996 7 -16.9004zM288 101.04l162.79 161.62l67.8799 -67.8799
+l-161.68 -162.78h-68.9902v69.04zM568.54 280.67c9.9502 -9.93945 9.9502 -26.0703 0 -36.0098l-27.25 -27.25l-67.8799 67.8799l27.25 27.25c9.93945 9.94043 26.0703 9.94043 36.0098 0z" />
+    <glyph glyph-name="file-upload" unicode="&#xf574;" horiz-adv-x="384" 
+d="M224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136zM289.18 95.9902c14.2803 0 21.4004 17.29 11.25 27.3594l-96.4199 95.7002
+c-6.64941 6.61035 -17.3896 6.61035 -24.04 0l-96.4199 -95.7002c-10.1396 -10.0693 -3.00977 -27.3594 11.2705 -27.3594h65.1797v-80c0 -8.83984 7.16016 -16 16 -16h32c8.83984 0 16 7.16016 16 16v80h65.1797zM377 343c4.5 -4.5 7 -10.5996 7 -16.9004v-6.09961h-128
+v128h6.09961c6.40039 0 12.5 -2.5 17 -7z" />
+    <glyph glyph-name="fill" unicode="&#xf575;" 
+d="M502.63 230.94c12.4902 -12.5 12.4902 -32.7607 0 -45.2607l-221.57 -221.569c-18.75 -18.75 -43.3096 -28.1201 -67.8799 -28.1201c-24.5596 0 -49.1201 9.37988 -67.8701 28.1201l-117.189 117.189c-37.4902 37.4902 -37.4902 98.2598 0 135.75l94.7598 94.7598
+l-86.1895 86.1807c-6.24023 6.25 -6.24023 16.3799 0 22.6299l22.6191 22.6104c6.24023 6.25 16.3809 6.25 22.6201 0l86.1807 -86.1807l81.5801 81.5801c6.23926 6.25 14.4297 9.37012 22.6191 9.37012c8.19043 0 16.3809 -3.12012 22.6309 -9.37012zM386.41 159.97
+l48.3496 48.3398l-162.45 162.44l-58.9492 -58.9502l58.6094 -58.5996c12.4902 -12.4902 12.4902 -32.75 0 -45.2402c-12.4893 -12.4902 -32.75 -12.4902 -45.2393 0l-58.6104 58.5996l-81.6104 -81.6094l-13.1494 -13.1504
+c-3.86035 -3.84961 -6.07031 -7.99023 -7.43066 -11.8301h320.48z" />
+    <glyph glyph-name="fill-drip" unicode="&#xf576;" horiz-adv-x="576" 
+d="M512 128c0 0 64 -92.6504 64 -128s-28.6602 -64 -64 -64s-64 28.6504 -64 64s64 128 64 128zM502.63 230.94c12.4902 -12.5 12.4902 -32.75 -0.00976562 -45.25l-221.57 -221.57c-18.7402 -18.75 -43.2998 -28.1201 -67.8701 -28.1201
+c-24.5596 0 -49.1299 9.37988 -67.8701 28.1201l-117.189 117.189c-37.4902 37.4902 -37.4902 98.2705 0 135.75l94.7598 94.7607l-86.1895 86.1797c-6.24023 6.24023 -6.24023 16.3701 0 22.6201l22.6191 22.6201c6.24023 6.25 16.3701 6.25 22.6201 0l86.1807 -86.1904
+l81.5801 81.5801c6.23926 6.25 14.4297 9.37012 22.6191 9.37012c8.19043 0 16.3809 -3.12012 22.6309 -9.37012zM386.41 159.97l48.3398 48.3398l-162.44 162.44l-58.9492 -58.9502l58.5996 -58.5996c12.4902 -12.4902 12.4902 -32.75 0 -45.2402
+s-32.75 -12.4902 -45.2402 0l-58.5996 58.5996l-81.6104 -81.6094l-13.1494 -13.1504c-3.86035 -3.84961 -6.07031 -7.99023 -7.43066 -11.8301h320.48z" />
+    <glyph glyph-name="fingerprint" unicode="&#xf577;" 
+d="M256.12 202.04c13.2598 0 24 -10.75 23.9902 -24c1.55957 -99.1104 -15.9502 -176.61 -29.4805 -224.521c-2.97949 -10.5996 -12.6104 -17.5195 -23.0898 -17.5195c-20.9697 0 -25.8496 20.7695 -23.1201 30.4902c19.5605 69.6494 28.8398 139.3 27.7002 211.55
+c0 13.2598 10.75 24 24 24zM255.26 283.77c56.9707 -0.839844 104.03 -46.9199 104.91 -102.72c0.790039 -50.8994 -2.99023 -102.08 -11.2695 -152.109c-0.770508 -4.6709 -7.61035 -23.1006 -27.5801 -19.7705c-13.0703 2.16016 -21.9307 14.5205 -19.7607 27.5801
+c7.80078 47.2197 11.3809 95.5 10.6104 143.55c-0.469727 30.1299 -26.3096 55 -57.6201 55.4697c-34.5303 0.150391 -54.8594 -26.3896 -54.4502 -52.3398c0.800781 -51.4395 -4.0293 -102.93 -14.3691 -153.02c-2.69043 -12.9805 -15.3105 -21.3105 -28.3604 -18.6406
+c-12.9697 2.6709 -21.3301 15.3809 -18.6396 28.3604c9.61914 46.6396 14.1191 94.6104 13.3691 142.55c-0.849609 54.0205 41.9004 101.16 103.16 101.09zM144.57 303.55c10.2793 -8.37012 11.8398 -23.4795 3.48926 -33.7598
+c-18.7998 -23.0898 -28.4697 -51.0898 -28 -80.9697c0.640625 -40.6699 -2.66992 -81.4902 -9.85938 -121.33c-0.820312 -4.5498 -7.78027 -22.8604 -27.8906 -19.3604c-13.0498 2.36035 -21.6992 14.8398 -19.3594 27.8896c6.63965 36.7803 9.7002 74.4707 9.10938 112.051
+c-0.639648 40.7197 13.1309 80.5 38.75 112c8.39062 10.2793 23.46 11.8193 33.7607 3.47949zM254.04 365.88c101.09 -1.5 184.6 -83.0801 186.16 -181.83c0.0751953 -4.88281 0.147461 -8.55371 0.147461 -13.4551c0 -35.9766 -2.0498 -71.4785 -6.03809 -106.395
+c-1.06934 -9.23047 -9.85938 -23.0605 -26.5791 -21.1104c-13.1602 1.5 -22.6104 13.4102 -21.1104 26.5801c4.2998 37.5205 6.16992 75.75 5.58008 113.63c-1.15039 73.0801 -63.4502 133.45 -138.88 134.58c-11.5303 0.0800781 -22.9502 -1.08008 -34 -3.68945
+c-12.8906 -3 -25.8301 4.93945 -28.8906 17.8291c-3.04004 12.9102 4.94043 25.8301 17.8301 28.8906c14.9102 3.53027 30.3701 5.37988 45.7803 4.96973zM506.11 244.43c6.22949 -28.2295 6.00977 -50.1602 5.83008 -72.3398
+c-0.110352 -13.1895 -10.8301 -23.7998 -24 -23.7998h-0.200195c-13.25 0.110352 -23.9102 10.9297 -23.7998 24.2002c0.209961 24.1895 0.00976562 40.1895 -4.7002 61.5996c-2.86035 12.9502 5.31934 25.75 18.2598 28.6104
+c13.0996 2.92969 25.75 -5.35059 28.6104 -18.2705zM465.99 335.15c7.62012 -10.8408 5 -25.8105 -5.83984 -33.4307c-10.8604 -7.58984 -25.8105 -5 -33.4199 5.86035c-39.8906 56.8301 -105.171 91.3604 -174.62 92.3896
+c-56.3408 0.810547 -108.92 -20.0596 -147.681 -58.8594c-37.1201 -37.1406 -57.1094 -86.5 -56.2793 -139l-0.160156 -23.6406c-0.379883 -13 -11.0498 -23.2998 -23.9707 -23.2998c-0.239258 0 -0.489258 0 -0.719727 0.0205078
+c-13.25 0.379883 -23.6699 11.4395 -23.2803 24.6895l0.120117 21.4697c-1.04004 65.6104 23.9502 127.28 70.3203 173.71c48.0098 48.0303 112.56 73.7607 182.35 72.9209c84.79 -1.27051 164.48 -43.4404 213.181 -112.83z" />
+    <glyph glyph-name="fish" unicode="&#xf578;" horiz-adv-x="576" 
+d="M327.1 352c137.46 0 248.9 -128 248.9 -160s-111.44 -160 -248.9 -160c-89.9697 0 -168.55 54.7695 -212.279 101.62l-87.3301 -66.0498c-12.1299 -9.16992 -30.2402 0.599609 -27.1406 14.6602l24.1904 109.77l-24.1797 109.76
+c-3.10059 14.0605 15.0098 23.8398 27.1396 14.6602l87.3301 -66.0498c43.7295 46.8604 122.3 101.63 212.27 101.63zM414.53 168c13.25 0 24 10.75 24 24c0 13.2598 -10.7402 24 -24 24c-13.25 0 -24 -10.7402 -24 -24c0 -13.25 10.75 -24 24 -24z" />
+    <glyph glyph-name="flushed" unicode="&#xf579;" horiz-adv-x="496" 
+d="M344 248c13.2998 0 24 -10.7002 24 -24s-10.7002 -24 -24 -24s-24 10.7002 -24 24s10.7002 24 24 24zM152 248c13.2998 0 24 -10.7002 24 -24s-10.7002 -24 -24 -24s-24 10.7002 -24 24s10.7002 24 24 24zM248 440c137 0 248 -111 248 -248s-111 -248 -248 -248
+s-248 111 -248 248s111 248 248 248zM80 224c0 -39.7998 32.2002 -72 72 -72s72 32.2002 72 72s-32.2002 72 -72 72s-72 -32.2002 -72 -72zM312 48c21.2002 0 21.2002 32 0 32h-128c-21.2002 0 -21.2002 -32 0 -32h128zM344 152c39.7998 0 72 32.2002 72 72
+s-32.2002 72 -72 72s-72 -32.2002 -72 -72s32.2002 -72 72 -72z" />
+    <glyph glyph-name="frown-open" unicode="&#xf57a;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM136 240c0 -17.7002 14.2998 -32 32 -32s32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32zM323.3 56.7002c11.4004 -3.5 22.5 6.2002 20.5 18.0996
+c-7 39.9004 -60.0996 61.2002 -95.7998 61.2002s-88.7998 -21.2002 -95.7998 -61.2002c-2 -11.7998 9 -21.5996 20.5 -18.0996c31.2002 9.59961 59.3994 15.2998 75.2998 15.2998s44.0996 -5.7002 75.2998 -15.2998zM328 208c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32
+s-32 -14.2998 -32 -32s14.2998 -32 32 -32z" />
+    <glyph glyph-name="glass-martini-alt" unicode="&#xf57b;" 
+d="M502.05 390.4l-214.05 -214.04v-192.36h56c22.0898 0 40 -17.9102 40 -40c0 -4.41992 -3.58008 -8 -8 -8h-240c-4.41992 0 -8 3.58008 -8 8c0 22.0898 17.9102 40 40 40h56v192.36l-214.05 214.04c-21.25 21.2598 -6.2002 57.5996 23.8496 57.5996h444.4
+c30.0498 0 45.0996 -36.3398 23.8496 -57.5996zM443.77 400h-375.529l48 -48h279.529z" />
+    <glyph glyph-name="globe-africa" unicode="&#xf57c;" horiz-adv-x="496" 
+d="M248 440c136.97 0 248 -111.03 248 -248s-111.03 -248 -248 -248s-248 111.03 -248 248s111.03 248 248 248zM408 224.5c0 8.55957 6.94043 15.5 15.5 15.5h18.4297c-19.0693 76.9805 -82.6992 136.37 -161.92 149.21v-21.7002c0 -8.55957 -6.93945 -15.5 -15.5 -15.5
+h-24.21c-5.17969 0 -10.0195 -2.58984 -12.8896 -6.89941l-8.08008 -12.1104c-2.13965 -3.20996 -5.40039 -5.5 -9.13965 -6.44043l-14.4502 -3.60938c-6.90039 -1.73047 -11.7402 -7.93066 -11.7402 -15.04v-4.40039c0 -8.55957 6.94043 -15.5 15.5 -15.5h90.0498
+l0.00488281 0.00195312c4.27637 0 8.15039 -1.73633 10.9551 -4.54199l6.91992 -6.91992c2.91016 -2.91016 6.85059 -4.54004 10.96 -4.54004h10.0908c8.55957 0 15.5 -6.93945 15.5 -15.5c0 -6.66992 -4.27051 -12.5898 -10.6006 -14.7002l-47.3096 -15.7695
+c-3.90039 -1.2998 -8.15039 -1 -11.8301 0.839844l-14.7207 7.36035c-7.5791 3.7998 -15.9492 5.76953 -24.4297 5.76953h-0.889648c-12.2734 -0.00292969 -23.6533 -4.08594 -32.7803 -10.9297l-27.5801 -20.6904c-13.75 -10.3193 -21.8496 -26.5098 -21.8496 -43.6992
+v-14.0605c0.00292969 -15.0742 6.11328 -28.7393 16 -38.6299c10.25 -10.2402 24.1396 -16 38.6299 -16h25.8799c8.55957 0 15.5 -6.94043 15.5 -15.5v-29.8896c0 -12.6504 3.0293 -24.6885 8.33008 -35.29c4.7002 -9.40039 14.3096 -15.3398 24.8203 -15.3398
+c9.63477 0.000976562 18.1133 4.89551 23.0898 12.3594l13.0293 19.5498c7.18359 10.7715 15.4854 20.4473 25 29.1602c2.4707 2.27051 4.14062 5.27051 4.76074 8.56055l4.2998 22.8301c0.439453 2.3291 1.41016 4.5293 2.83008 6.42969l18.7402 24.9795
+c2.00977 2.68066 3.09961 5.9502 3.09961 9.30078v11.3398c0 8.55957 -6.94043 15.5 -15.5 15.5h-8.20996c-5.17969 0 -10.0205 2.58984 -12.8896 6.89941l-13.2402 19.8604c-5.66992 8.50977 -1.70996 20.0703 7.99023 23.2998l2.64941 0.879883
+c1.53906 0.511719 3.20312 0.78418 4.91309 0.78418c3.17383 0 6.12695 -0.955078 8.58691 -2.59375l18.21 -12.1396c2.45801 -1.6416 5.44043 -2.59863 8.61523 -2.59863c2.48438 0 4.83301 0.585938 6.91504 1.62793l15.3896 7.7002
+c5.25 2.62012 8.57031 7.99023 8.57031 13.8604v6.92969z" />
+    <glyph glyph-name="globe-americas" unicode="&#xf57d;" horiz-adv-x="496" 
+d="M248 440c136.97 0 248 -111.03 248 -248s-111.03 -248 -248 -248s-248 111.03 -248 248s111.03 248 248 248zM330.29 82.4004c8.47363 8.42676 13.7158 20.0977 13.7197 32.9795l0.00488281 0.00976562c0 8.41504 -3.41602 16.0391 -8.93457 21.5605l-13.6904 13.6895
+c-6.00977 6 -14.1396 9.37012 -22.6299 9.37012h-66.75c-9.41016 4.70996 -21.4795 32 -32 32c-10.5195 0 -20.8994 2.4502 -30.3096 7.16016l-11.0801 5.54004c-4.0498 2.03027 -6.61035 6.16016 -6.61035 10.6904h-0.00195312c0 5.27539 3.42578 9.75684 8.17188 11.3398
+l31.1699 10.3896c1.58887 0.52832 3.29785 0.81543 5.0625 0.81543c4.00977 0 7.67676 -1.47656 10.4883 -3.91504l9.2793 -8.06055c1.4502 -1.25977 3.31055 -1.95996 5.24023 -1.95996h5.63965c5.94043 0 9.81055 6.25977 7.15039 11.5801l-15.5898 31.1904
+c-0.535156 1.07324 -0.842773 2.29297 -0.842773 3.57324c0 2.24805 0.928711 4.28125 2.42285 5.73633l9.91992 9.65039c1.5 1.45996 3.5 2.26953 5.58008 2.26953h8.99023l0.00390625 -0.000976562c2.20703 0 4.20703 0.894531 5.65527 2.34082l8 8
+c3.12012 3.12012 3.12012 8.19043 0 11.3105l-4.68945 4.68945c-3.12012 3.12012 -3.12012 8.19043 0 11.3105l10.3398 10.3398l4.69043 4.67969c6.25 6.25 6.25 16.3799 0 22.6299l-28.3008 28.3008c-8.26953 -0.310547 -16.3994 -1.12988 -24.3896 -2.41992v-11.3008
+c0 -11.8994 -12.5195 -19.6299 -23.1602 -14.3096l-24.0098 12.0098c-45.8398 -19.8496 -82.7305 -56.3896 -103.2 -101.89c9.92969 -14.7197 25.21 -37.3701 34.5898 -51.1406c5.20605 -7.66895 11.2012 -14.5479 18.0605 -20.7393l0.799805 -0.720703
+c9.5498 -8.60938 20.1699 -15.9697 31.6504 -21.75c14 -7.0498 34.4395 -18.1592 48.8096 -26.1094c10.1904 -5.62988 16.46 -16.3301 16.46 -27.9707v-32.0098c0 -8.49023 3.37012 -16.6299 9.37012 -22.6299c14.9902 -14.9902 24.3203 -38.6299 22.6299 -51.25v-27.3799
+c14.6504 0 28.8896 1.69043 42.6504 4.69043l17.3896 46.8496c2.04004 5.49023 3.25977 11.21 4.76953 16.8701c1.07031 4.00977 3.18066 7.70996 6.1709 10.71c3.31934 3.33008 7.40918 7.39941 11.3096 11.2803zM417 173.75l29.1797 -7.29004
+c1.08008 8.37988 1.82031 16.8701 1.82031 25.54c0 32.1299 -7.7998 62.4102 -21.3203 89.3301l-12.9795 -6.49023c-3.74023 -1.85938 -6.91992 -4.67969 -9.24023 -8.14941l-19.5898 -29.3809c-2.54004 -3.80371 -4.02051 -8.4209 -4.02051 -13.334
+c0 -4.91211 1.48047 -9.48145 4.02051 -13.2852l17.9795 -26.9707c3.31055 -4.96973 8.36035 -8.51953 14.1504 -9.96973z" />
+    <glyph glyph-name="globe-asia" unicode="&#xf57e;" horiz-adv-x="496" 
+d="M248 440c136.97 0 248 -111.03 248 -248s-111.03 -248 -248 -248s-248 111.03 -248 248s111.03 248 248 248zM236.66 199.77l17.3701 28.9502c1.7998 2.99023 6.2002 2.82031 7.75977 -0.299805c1.34961 -2.70996 4.12012 -4.41992 7.15039 -4.41992h3.05957
+c4.41992 0 8 3.58008 8 8v78.1201c0 6.05957 -3.41992 11.5996 -8.83984 14.3096l-10.8301 5.41016c-5.49023 2.75 -5.96973 10.4004 -0.860352 13.8105l50.1602 38.5293c-19.4297 6.31055 -40.1201 9.82031 -61.6299 9.82031c-110.28 0 -200 -89.7197 -200 -200
+c0 -10.9199 1.12012 -21.5498 2.80957 -31.9902h62.5703c4.24023 0 8.31055 1.69043 11.3105 4.69043l19.4697 19.46c3.85938 3.85938 10.3701 2.7998 12.8096 -2.08008l22.6201 -45.2305c2.70996 -5.42969 8.25 -8.84961 14.3105 -8.84961h6.10938
+c8.83984 0 16 7.16016 16 16v9.37012c0 4.24023 -1.68945 8.30957 -4.68945 11.3096l-5.66016 5.66016c-3.12012 3.12012 -3.12012 8.19043 0 11.3105l5.66016 5.65918c3 3 7.06934 4.69043 11.3096 4.69043h0.310547c5.61914 0 10.8291 2.9502 13.7197 7.76953z
+M408 89.5703l-0.00976562 24.5996c0 4.24023 -1.69043 8.31055 -4.69043 11.3105l-11.9102 11.9092c-1.5 1.5 -2.33984 3.54004 -2.33984 5.66016v12.9307c0 2.20996 -1.79004 4 -4 4h-6.05957c-1.78027 0 -3.33984 -1.1709 -3.83984 -2.88086l-4.2002 -14.4697
+c-0.490234 -1.7002 -2.06055 -2.87988 -3.83984 -2.87988h-3.80078c-1.66211 0.000976562 -3.08691 1.01465 -3.68945 2.45996l-5.35059 12.8496c-1.23926 2.99023 -4.15918 4.93066 -7.38965 4.93066h-12.0898
+c-0.00390625 0 -0.0146484 -0.00488281 -0.0185547 -0.00488281c-1.72168 0 -3.31738 -0.545898 -4.62109 -1.47559l-23.71 -16.8896c-1.73047 -1.23047 -3.61035 -2.25977 -5.59082 -3.0498l-39.3398 -15.7402c-3.04004 -1.21973 -5.0293 -4.16016 -5.0293 -7.42969
+v-10.2002l-0.00195312 -0.00390625c0 -2.20703 0.895508 -4.20703 2.3418 -5.65625l11.9102 -11.9102c3 -3 7.06934 -4.68945 11.3096 -4.68945h10.3398c1.31055 0 2.61035 0.15918 3.87988 0.479492l21.2705 5.32031c2.08203 0.520508 4.25391 0.802734 6.49707 0.802734
+c7.38574 0 14.0771 -2.99805 18.9229 -7.84277l13.0098 -13.0098c3 -3 7.07031 -4.69043 11.3096 -4.69043h15.1602c4.24023 0 8.31055 1.69043 11.3105 4.69043l9.56934 9.56934c3 3 4.69043 7.07031 4.69043 11.3105z" />
+    <glyph glyph-name="grimace" unicode="&#xf57f;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM144 48v40h-40v-8c0 -17.7002 14.2998 -32 32 -32h8zM144 104v40h-8c-17.7002 0 -32 -14.2998 -32 -32v-8h40zM136 240c0 -17.7002 14.2998 -32 32 -32s32 14.2998 32 32
+s-14.2998 32 -32 32s-32 -14.2998 -32 -32zM208 48v40h-48v-40h48zM208 104v40h-48v-40h48zM272 48v40h-48v-40h48zM272 104v40h-48v-40h48zM336 48v40h-48v-40h48zM336 104v40h-48v-40h48zM328 208c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32
+s14.2998 -32 32 -32zM392 80v8h-40v-40h8c17.7002 0 32 14.2998 32 32zM392 104v8c0 17.7002 -14.2998 32 -32 32h-8v-40h40z" />
+    <glyph glyph-name="grin" unicode="&#xf580;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM328 272c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32s32 14.2998 32 32s-14.2998 32 -32 32zM168 272c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32
+s32 14.2998 32 32s-14.2998 32 -32 32zM248 16c60.5996 0 134.5 38.2998 143.8 93.2998c1.90039 11.7998 -9.39941 21.6006 -20.7002 17.9004c-30.1992 -9.7002 -75.0996 -15.2002 -123.1 -15.2002s-92.9004 5.5 -123.1 15.2002
+c-11.4004 3.7002 -22.7002 -6.10059 -20.7002 -17.9004c9.2998 -55 83.2002 -93.2998 143.8 -93.2998z" />
+    <glyph glyph-name="grin-alt" unicode="&#xf581;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM311.7 311.3c-12.4004 -18.3994 -15.2002 -36.8994 -15.7002 -55.2998c0.599609 -18.4004 3.2998 -36.9004 15.7002 -55.2998c8 -11.7002 25.0996 -11.4004 32.7002 0
+c12.3994 18.3994 15.1992 36.8994 15.6992 55.2998c-0.599609 18.4004 -3.2998 36.9004 -15.6992 55.2998c-8 11.7002 -25.1006 11.4004 -32.7002 0zM151.7 311.3c-12.4004 -18.3994 -15.2002 -36.8994 -15.7002 -55.2998
+c0.599609 -18.4004 3.2998 -36.9004 15.7002 -55.2998c8 -11.7002 25.0996 -11.4004 32.7002 0c12.3994 18.3994 15.1992 36.8994 15.6992 55.2998c-0.599609 18.4004 -3.2998 36.9004 -15.6992 55.2998c-8 11.7002 -25.1006 11.4004 -32.7002 0zM248 16
+c60.5996 0 134.5 38.2998 143.8 93.2998c1.90039 11.7998 -9.2998 21.6006 -20.7002 17.9004c-30.1992 -9.7002 -75.0996 -15.2002 -123.1 -15.2002s-92.9004 5.5 -123.1 15.2002c-11.4004 3.7002 -22.7002 -6.10059 -20.7002 -17.9004
+c9.2998 -55 83.2002 -93.2998 143.8 -93.2998z" />
+    <glyph glyph-name="grin-beam" unicode="&#xf582;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM328 296c-23.7998 0 -52.7002 -29.2998 -55.7998 -71.4004c-0.700195 -8.5 10.7998 -11.7998 14.8994 -4.5l9.5 17c7.7002 13.7002 19.2002 21.6006 31.5 21.6006
+c12.3008 0 23.8008 -7.90039 31.5 -21.6006l9.5 -17c4.10059 -7.39941 15.6006 -4.09961 14.9004 4.5c-3.2998 42.1006 -32.2002 71.4004 -56 71.4004zM168 296c-23.7998 0 -52.7002 -29.2998 -55.7998 -71.4004c-0.700195 -8.5 10.7002 -11.8994 14.8994 -4.5l9.5 17
+c7.7002 13.7002 19.2002 21.6006 31.5 21.6006c12.3008 0 23.8008 -7.90039 31.5 -21.6006l9.5 -17c4.10059 -7.39941 15.6006 -4.09961 14.9004 4.5c-3.2998 42.1006 -32.2002 71.4004 -56 71.4004zM248 16c60.5996 0 134.5 38.2998 143.8 93.2998
+c1.90039 11.7998 -9.2998 21.6006 -20.7002 17.9004c-30.1992 -9.7002 -75.0996 -15.2002 -123.1 -15.2002s-92.9004 5.5 -123.1 15.2002c-11.3008 3.7002 -22.7002 -6 -20.7002 -17.9004c9.2998 -55 83.2002 -93.2998 143.8 -93.2998z" />
+    <glyph glyph-name="grin-beam-sweat" unicode="&#xf583;" horiz-adv-x="504" 
+d="M456 320c-26.5 0 -48 21 -48 47c0 20 28.5 60.4004 41.5996 77.7998c3.2002 4.2998 9.60059 4.2998 12.8008 0c13.0996 -17.3994 41.5996 -57.7998 41.5996 -77.7998c0 -26 -21.5 -47 -48 -47zM456 288c6.7998 0 13.2002 1.09961 19.5 2.59961
+c13.0996 -30.1992 20.5 -63.5 20.5 -98.5996c0 -137 -111 -248 -248 -248s-248 111 -248 248s111 248 248 248c50.2998 0 97 -15.0996 136.1 -40.7998c-7.7998 -18 -8.09961 -27.7998 -8.09961 -32.2002c0 -43.5996 35.9004 -79 80 -79zM328 296
+c-23.7998 0 -52.7002 -29.2998 -55.7998 -71.4004c-0.700195 -8.5 10.7998 -11.8994 14.8994 -4.5l9.5 17c7.7002 13.7002 19.2002 21.6006 31.5 21.6006c12.3008 0 23.8008 -7.90039 31.5 -21.6006l9.5 -17c4.10059 -7.5 15.6006 -4.09961 14.9004 4.5
+c-3.2998 42.1006 -32.2002 71.4004 -56 71.4004zM168 296c-23.7998 0 -52.7002 -29.2998 -55.7998 -71.4004c-0.700195 -8.5 10.7002 -11.8994 14.8994 -4.5l9.5 17c7.7002 13.7002 19.2002 21.6006 31.5 21.6006c12.3008 0 23.8008 -7.90039 31.5 -21.6006l9.5 -17
+c4.10059 -7.5 15.6006 -4.09961 14.9004 4.5c-3.2998 42.1006 -32.2002 71.4004 -56 71.4004zM248 16c60.5996 0 134.5 38.2998 143.8 93.2998c1.90039 11.7002 -9.2002 21.6006 -20.7002 17.9004c-30.1992 -9.7002 -75.0996 -15.2002 -123.1 -15.2002
+s-92.9004 5.5 -123.1 15.2002c-11.4004 3.7002 -22.7002 -6.10059 -20.7002 -17.9004c9.2998 -55 83.2002 -93.2998 143.8 -93.2998z" />
+    <glyph glyph-name="grin-hearts" unicode="&#xf584;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM90.4004 264.4c-7.7002 -20.2002 3.7998 -41.8008 24.1992 -47.2002l70.2002 -18.2002c4.60059 -1.2002 9.2998 1.5 10.5 6l19.4004 69.9004
+c5.59961 20.2998 -7.40039 41.0996 -28.7998 44.5c-18.7002 3 -36.5 -9.80078 -41.5 -27.9004l-2 -7.09961l-7.10059 1.89941c-18.2002 4.7998 -38.2002 -4.2998 -44.8994 -21.8994zM248 16c60.5996 0 134.5 38.2998 143.8 93.2998
+c1.90039 11.7998 -9.2998 21.5 -20.7002 17.9004c-30.1992 -9.7002 -75.0996 -15.2002 -123.1 -15.2002s-92.9004 5.5 -123.1 15.2002c-11.5 3.59961 -22.7002 -6.10059 -20.7002 -17.9004c9.2998 -55 83.2002 -93.2998 143.8 -93.2998zM381.4 217.3
+c20.3994 5.2998 31.8994 26.9004 24.1992 47.2002c-6.69922 17.5996 -26.6992 26.5996 -44.8994 21.9004l-7.10059 -1.90039l-2 7.09961c-5.09961 18.1006 -22.8994 30.9004 -41.5 27.9004c-21.3994 -3.40039 -34.3994 -24.2002 -28.7998 -44.5l19.4004 -69.9004
+c1.2998 -4.5 6 -7.19922 10.5 -6z" />
+    <glyph glyph-name="grin-squint" unicode="&#xf585;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM281.8 250.3c-7.7002 -4.7002 -7.7002 -15.8994 0 -20.5996l80 -48c11.5 -6.7998 24.1006 7.59961 15.4004 18l-33.6006 40.2998l33.6006 40.2998
+c8.59961 10.2998 -3.7998 24.9004 -15.4004 18zM118.8 280.3l33.6006 -40.2998l-33.6006 -40.2998c-8.59961 -10.4004 3.90039 -24.7998 15.4004 -18l80 48c7.7998 4.7002 7.7998 15.8994 0 20.5996l-80 48c-11.6006 6.90039 -24 -7.7002 -15.4004 -18zM248 16
+c60.5996 0 134.5 38.2998 143.8 93.2998c1.90039 11.7002 -9.2002 21.6006 -20.7002 17.9004c-30.1992 -9.7002 -75.0996 -15.2002 -123.1 -15.2002s-92.9004 5.5 -123.1 15.2002c-11.3008 3.7002 -22.7002 -6 -20.7002 -17.9004
+c9.2998 -55 83.2002 -93.2998 143.8 -93.2998z" />
+    <glyph glyph-name="grin-squint-tears" unicode="&#xf586;" 
+d="M409.6 336.1c-5.59961 -0.799805 -10.2998 3.90039 -9.5 9.40039c3.30078 22.5996 12 73.5 26.8008 88.2998c19.0996 19.2002 50.6992 18.9004 70.2998 -0.700195c19.5996 -19.5996 19.8994 -51 0.700195 -70.1992
+c-14.8008 -14.8008 -65.7002 -23.6006 -88.3008 -26.8008zM102.4 47.9004c5.59961 0.799805 10.2998 -3.90039 9.5 -9.40039c-3.30078 -22.5996 -12 -73.5 -26.8008 -88.2998c-19.1992 -19.2002 -50.5996 -18.9004 -70.1992 0.700195
+c-19.6006 19.5996 -19.9004 51.0996 -0.800781 70.1992c14.8008 14.8008 65.7002 23.6006 88.3008 26.8008zM414.1 304.4c24 3.5 42.1006 7.39941 56.5 11.5c54.8008 -94.9004 42 -218.2 -39.1992 -299.301c-81.2002 -81.0996 -204.5 -94 -299.301 -39.1992
+c4.10059 14.3994 8.10059 32.5 11.5 56.5c2.90039 20.5 -12.5 49.5996 -45.6992 45.6992c-24.1006 -3.5 -42.1006 -7.39941 -56.5 -11.5c-54.8008 94.9004 -41.9004 218.2 39.1992 299.301c81.2002 81.0996 204.5 94 299.301 39.1992
+c-4.10059 -14.3994 -8.10059 -32.5 -11.5 -56.5c-2.90039 -20.5996 12.6992 -49.5996 45.6992 -45.6992zM255.7 342l-22.5 -90.5996c-2.2002 -8.60059 5.59961 -16.7002 14.5 -14.5l90.5 22.5996c13.0996 3.2998 11.5996 22.4004 -1.7998 23.5996l-52.3008 4.80078
+l-4.7998 52.2998c-1.2002 13.2998 -20.2998 15 -23.5996 1.7998zM164.8 111.7c1.2998 -13.4004 20.4004 -14.9004 23.5 -1.7002l22.6006 90.5c2.19922 8.7002 -5.7002 16.7002 -14.5 14.5l-90.5 -22.5996c-13.1006 -3.30078 -11.6006 -22.4004 1.7998 -23.6006
+l52.2998 -4.7998zM380.5 67.5c42.7998 42.9004 68 122.3 35.7002 167.6c-7.10059 9.90039 -21.9004 8.5 -27.2998 -2c-14.6006 -28.1992 -42.4004 -63.8994 -76.3008 -97.7998c-33.8994 -33.8994 -69.5 -61.7002 -97.7998 -76.2998
+c-10.7002 -5.40039 -11.7998 -20.2998 -2 -27.2002c14.4004 -10.2002 32.1006 -14.7002 51 -14.7002c41 0 87.4004 21.1006 116.7 50.4004z" />
+    <glyph glyph-name="grin-stars" unicode="&#xf587;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM94.5996 279.1c-6.19922 -1 -8.89941 -8.59961 -4.2998 -13.2998l25.4004 -24.5996l-6 -34.9004c-1 -6.2002 5.2998 -11 11 -7.89941l31.2998 16.2998l31.2002 -16.2002
+c5.7002 -3.09961 12 1.7002 11 7.90039l-6 34.8994l25.3994 24.6006c4.60059 4.59961 1.90039 12.1992 -4.2998 13.1992l-34.8994 5l-15.5 31.6006c-2.90039 5.7998 -11 5.7998 -13.9004 0l-15.5 -31.6006zM248 16c60.5996 0 134.5 38.2998 143.8 93.2998
+c1.90039 11.7998 -9.2002 21.6006 -20.7002 17.9004c-30.1992 -9.7002 -75.0996 -15.2002 -123.1 -15.2002s-92.9004 5.5 -123.1 15.2002c-11.4004 3.59961 -22.7002 -6.10059 -20.7002 -17.9004c9.2998 -55 83.2002 -93.2998 143.8 -93.2998zM405.7 265.9
+c4.59961 4.59961 1.89941 12.1992 -4.40039 13.0996l-34.8994 5l-15.5 31.5996c-2.90039 5.80078 -11 5.80078 -13.9004 0l-15.5 -31.5996l-34.9004 -5c-6.19922 -1 -8.7998 -8.59961 -4.2998 -13.2002l25.4004 -24.5996l-6 -34.9004c-1 -6.2002 5.2998 -11 11 -7.89941
+l31.2998 16.2998l31.2998 -16.2002c5.7002 -3.09961 12 1.7002 11 7.90039l-6 34.8994z" />
+    <glyph glyph-name="grin-tears" unicode="&#xf588;" horiz-adv-x="640" 
+d="M102.4 191.9c5.59961 0.799805 10.2998 -3.90039 9.5 -9.40039c-3.30078 -22.5996 -12 -73.5 -26.8008 -88.2998c-19.1992 -19.2002 -50.5996 -18.9004 -70.1992 0.700195c-19.6006 19.5996 -19.9004 51.0996 -0.800781 70.1992
+c14.8008 14.8008 65.7002 23.6006 88.3008 26.8008zM625.8 165.1c19.2002 -19.0996 18.7998 -50.6992 -0.799805 -70.2998c-19.5996 -19.5996 -51 -19.8994 -70.2002 -0.700195c-14.7998 14.8008 -23.5996 65.7002 -26.7998 88.3008c-0.799805 5.59961 4 10.2998 9.5 9.5
+c22.5996 -3.30078 73.5 -12 88.2998 -26.8008zM496.4 177.9c11.7998 -82.3008 29.8994 -100.4 35.7998 -106.301c0.899414 -1 2 -1.59961 3 -2.5c-42.7002 -74.6992 -123 -125.1 -215.2 -125.1s-172.5 50.4004 -215.2 125c1 0.900391 2.10059 1.59961 3 2.5
+c5.90039 6 24 24.0996 35.7998 106.4c2.90039 20.3994 -12.5 49.5996 -45.6992 45.6992c-8.90039 -1.2998 -16.8008 -2.69922 -24.3008 -4.09961c13.7002 124 118.7 220.5 246.4 220.5s232.7 -96.5 246.4 -220.5c-7.5 1.40039 -15.4004 2.7998 -24.3008 4.09961
+c-26.5996 3.80078 -49.5 -19.0996 -45.6992 -45.6992zM400 296c-23.7998 0 -52.7002 -29.2998 -55.7998 -71.4004c-0.700195 -8.5 10.7002 -11.8994 14.8994 -4.5l9.5 17c7.7002 13.7002 19.2002 21.6006 31.5 21.6006c12.3008 0 23.8008 -7.90039 31.5 -21.6006l9.5 -17
+c4.10059 -7.5 15.6006 -4.09961 14.9004 4.5c-3.2998 42.1006 -32.2002 71.4004 -56 71.4004zM240 296c-23.7998 0 -52.7002 -29.2998 -55.7998 -71.4004c-0.700195 -8.5 10.7002 -11.8994 14.8994 -4.5l9.5 17c7.7002 13.7002 19.2002 21.6006 31.5 21.6006
+c12.3008 0 23.8008 -7.90039 31.5 -21.6006l9.5 -17c4.10059 -7.5 15.6006 -4.09961 14.9004 4.5c-3.2998 42.1006 -32.2002 71.4004 -56 71.4004zM320 16c60.5996 0 134.5 38.2998 143.8 93.2998c1.90039 11.7998 -9.2998 21.6006 -20.7002 17.9004
+c-30.1992 -9.7002 -75.0996 -15.2002 -123.1 -15.2002s-92.9004 5.5 -123.1 15.2002c-11.5 3.7002 -22.7002 -6.2002 -20.7002 -17.9004c9.2998 -55 83.2002 -93.2998 143.8 -93.2998z" />
+    <glyph glyph-name="grin-tongue" unicode="&#xf589;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248c0 -106.3 -67 -196.7 -161 -232c5.59961 12.2002 9 25.7002 9 40v45.5c24.7002 16.2002 43.5 38.0996 47.7998 63.7998c1.90039 11.7998 -9.2998 21.5 -20.7002 17.9004c-30.1992 -9.7002 -75.0996 -15.2002 -123.1 -15.2002
+s-92.9004 5.5 -123.1 15.2002c-11.4004 3.59961 -22.7002 -6.10059 -20.7002 -17.9004c4.2998 -25.7002 23.0996 -47.5996 47.7998 -63.7998v-45.5c0 -14.2998 3.40039 -27.7998 9 -40c-94 35.2998 -161 125.7 -161 232c0 137 111 248 248 248zM168 208
+c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM328 208c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM293.1 73.4004c0.800781 -0.400391 -0.5 0.299805 19 -9.30078v-64
+c0 -35.5996 -29.1992 -64.5 -64.8994 -64c-35.1006 0.400391 -63.1006 29.7002 -63.1006 64.9004v63c19.2002 9.59961 18 9 18.9004 9.40039c14.4004 6.5 31.0996 -2.2002 34.5996 -17.6006l1.80078 -7.7998c2.09961 -9.2002 15.1992 -9.2002 17.2998 0l1.7998 7.7998
+c3.5 15.4004 20.2002 24.1006 34.5996 17.6006z" />
+    <glyph glyph-name="grin-tongue-squint" unicode="&#xf58a;" horiz-adv-x="496" 
+d="M293.1 73.4004c0.800781 -0.400391 -0.5 0.299805 19 -9.30078v-64c0 -35.5996 -29.1992 -64.5 -64.8994 -64c-35.1006 0.400391 -63.1006 29.7002 -63.1006 64.9004v63c19.2002 9.59961 18 9 18.9004 9.40039c14.4004 6.5 31.0996 -2.2002 34.5996 -17.6006
+l1.80078 -7.7998c2.09961 -9.2002 15.1992 -9.2002 17.2998 0l1.7998 7.7998c3.5 15.4004 20.2002 24.1006 34.5996 17.6006zM248 440c137 0 248 -111 248 -248c0 -106.3 -67 -196.7 -161 -232c5.59961 12.2002 9 25.7002 9 40v45.5
+c24.7002 16.2002 43.5 38.0996 47.7998 63.7998c1.90039 11.7998 -9.2998 21.6006 -20.7002 17.9004c-30.1992 -9.7002 -75.0996 -15.2002 -123.1 -15.2002s-92.9004 5.5 -123.1 15.2002c-11.5 3.59961 -22.7002 -6.10059 -20.7002 -17.9004
+c4.2998 -25.7002 23.0996 -47.5996 47.7998 -63.7998v-45.5c0 -14.2998 3.40039 -27.7998 9 -40c-94 35.2998 -161 125.7 -161 232c0 137 111 248 248 248zM214.2 229.7c7.7002 4.7002 7.7002 15.8994 0 20.5996l-80 48c-11.6006 6.90039 -24 -7.7002 -15.4004 -18
+l33.6006 -40.2998l-33.6006 -40.2998c-8.59961 -10.4004 3.90039 -24.7998 15.4004 -18zM377.2 199.7l-33.6006 40.2998l33.6006 40.2998c8.5 10.2998 -3.7002 24.9004 -15.4004 18l-80 -48c-7.7998 -4.7002 -7.7998 -15.8994 0 -20.5996l80 -48
+c11.5 -6.7998 24.1006 7.59961 15.4004 18z" />
+    <glyph glyph-name="grin-tongue-wink" unicode="&#xf58b;" horiz-adv-x="496" 
+d="M344 264c13.2998 0 24 -10.7002 24 -24s-10.7002 -24 -24 -24s-24 10.7002 -24 24s10.7002 24 24 24zM248 440c137 0 248 -111 248 -248c0 -106.3 -67 -196.7 -161 -232c5.59961 12.2002 9 25.7002 9 40v45.5c24.7002 16.2002 43.5 38.0996 47.7998 63.7998
+c1.90039 11.7998 -9.2002 21.6006 -20.7002 17.9004c-30.1992 -9.7002 -75.0996 -15.2002 -123.1 -15.2002s-92.9004 5.5 -123.1 15.2002c-11.4004 3.59961 -22.7002 -6.10059 -20.7002 -17.9004c4.2998 -25.7002 23.0996 -47.5996 47.7998 -63.7998v-45.5
+c0 -14.2998 3.40039 -27.7998 9 -40c-94 35.2998 -161 125.7 -161 232c0 137 111 248 248 248zM192 215c8.40039 -7.40039 21.5996 -0.299805 20 10.7998c-4 25.2002 -34.2002 42.1006 -59.9004 42.1006c-25.6992 0 -55.8994 -16.9004 -59.8994 -42.1006
+c-1.7998 -11.0996 11.2998 -18.2002 19.7998 -10.7998l9.5 8.5c14.7998 13.2002 46.2002 13.2002 61 0zM344 176c35.2998 0 64 28.7002 64 64s-28.7002 64 -64 64s-64 -28.7002 -64 -64s28.7002 -64 64 -64zM293.1 73.4004c0.800781 -0.400391 -0.5 0.299805 19 -9.30078
+v-64c0 -35.5996 -29.1992 -64.5 -64.8994 -64c-35.1006 0.400391 -63.1006 29.7002 -63.1006 64.9004v63c19.2002 9.59961 18 9 18.9004 9.40039c14.4004 6.5 31.0996 -2.2002 34.5996 -17.6006l1.80078 -7.7998c2.09961 -9.2002 15.1992 -9.2002 17.2998 0l1.7998 7.7998
+c3.5 15.4004 20.2002 24.1006 34.5996 17.6006z" />
+    <glyph glyph-name="grin-wink" unicode="&#xf58c;" horiz-adv-x="496" 
+d="M0 192c0 137 111 248 248 248s248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248zM200 240c0 17.7002 -14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32s32 14.2998 32 32zM368 215c8.5 -7.40039 21.5996 -0.200195 20 10.7998
+c-4 25.2002 -34.2002 42.1006 -59.9004 42.1006c-25.6992 0 -55.8994 -16.9004 -59.8994 -42.1006c-1.7998 -11.2002 11.5 -18.2002 19.7998 -10.7998l9.5 8.5c14.7998 13.2002 46.2002 13.2002 61 0zM124.9 127.2c-11.4004 3.7002 -22.7002 -6 -20.7002 -17.9004
+c9.2998 -55 83.2002 -93.2998 143.8 -93.2998s134.6 38.2998 143.8 93.2998c1.90039 11.9004 -9.39941 21.6006 -20.7002 17.9004c-30.1992 -9.7002 -75.0996 -15.2002 -123.1 -15.2002s-92.9004 5.5 -123.1 15.2002z" />
+    <glyph glyph-name="grip-horizontal" unicode="&#xf58d;" horiz-adv-x="448" 
+d="M96 160c17.6699 0 32 -14.3301 32 -32v-64c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v64c0 17.6699 14.3301 32 32 32h64zM256 160c17.6699 0 32 -14.3301 32 -32v-64c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v64
+c0 17.6699 14.3301 32 32 32h64zM416 160c17.6699 0 32 -14.3301 32 -32v-64c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v64c0 17.6699 14.3301 32 32 32h64zM96 352c17.6699 0 32 -14.3301 32 -32v-64c0 -17.6699 -14.3301 -32 -32 -32h-64
+c-17.6699 0 -32 14.3301 -32 32v64c0 17.6699 14.3301 32 32 32h64zM256 352c17.6699 0 32 -14.3301 32 -32v-64c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v64c0 17.6699 14.3301 32 32 32h64zM416 352c17.6699 0 32 -14.3301 32 -32v-64
+c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v64c0 17.6699 14.3301 32 32 32h64z" />
+    <glyph glyph-name="grip-vertical" unicode="&#xf58e;" horiz-adv-x="320" 
+d="M96 416c17.6699 0 32 -14.3301 32 -32v-64c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v64c0 17.6699 14.3301 32 32 32h64zM96 256c17.6699 0 32 -14.3301 32 -32v-64c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v64
+c0 17.6699 14.3301 32 32 32h64zM96 96c17.6699 0 32 -14.3301 32 -32v-64c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v64c0 17.6699 14.3301 32 32 32h64zM288 416c17.6699 0 32 -14.3301 32 -32v-64c0 -17.6699 -14.3301 -32 -32 -32h-64
+c-17.6699 0 -32 14.3301 -32 32v64c0 17.6699 14.3301 32 32 32h64zM288 256c17.6699 0 32 -14.3301 32 -32v-64c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v64c0 17.6699 14.3301 32 32 32h64zM288 96c17.6699 0 32 -14.3301 32 -32v-64
+c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v64c0 17.6699 14.3301 32 32 32h64z" />
+    <glyph glyph-name="headphones-alt" unicode="&#xf58f;" 
+d="M160 160c17.6699 0 32 -14.3496 32 -32.0596v-127.881c0 -17.6992 -14.3301 -32.0596 -32 -32.0596h-16c-35.3496 0 -64 28.71 -64 64.1201v63.7598c0 35.4199 28.6504 64.1201 64 64.1201h16zM368 160c35.3496 0 64 -28.71 64 -64.1201v-63.7598
+c0 -35.4102 -28.6504 -64.1201 -64 -64.1201h-16c-17.6699 0 -32 14.3604 -32 32.0596v127.881c0 17.71 14.3301 32.0596 32 32.0596h16zM256 416c143.09 0 251.43 -119.13 256 -256v-112c0 -8.83984 -7.16016 -16 -16 -16h-16c-8.83984 0 -16 7.16016 -16 16v112
+c0 114.67 -93.3301 207.8 -208 207.82c-114.67 -0.0205078 -208 -93.1504 -208 -207.82v-112c0 -8.83984 -7.16016 -16 -16 -16h-16c-8.83984 0 -16 7.16016 -16 16v112c4.57031 136.87 112.91 256 256 256z" />
+    <glyph glyph-name="headset" unicode="&#xf590;" 
+d="M192 240v-112c0 -17.6699 -14.3301 -32 -32 -32h-16c-35.3496 0 -64 28.6504 -64 64v48c0 35.3496 28.6504 64 64 64h16c17.6699 0 32 -14.3301 32 -32zM368 96h-16c-17.6699 0 -32 14.3301 -32 32v112c0 17.6699 14.3301 32 32 32h16c35.3496 0 64 -28.6504 64 -64v-48
+c0 -35.3496 -28.6504 -64 -64 -64zM256 448c142.82 0 251.42 -118.83 256 -256v-165.72c0 -49.8604 -40.4199 -90.2803 -90.2803 -90.2803h-181.72c-26.5098 0 -48 21.4902 -48 48s21.4902 48 48 48h32c26.5098 0 48 -21.4902 48 -48h101.72
+c23.3506 0 42.2803 18.9297 42.2803 42.2803c0 0 -0.0400391 163.29 -0.120117 165.72h0.120117c0 114.69 -93.3096 208 -208 208s-208 -93.3096 -208 -208v-16c0 -8.83984 -7.16016 -16 -16 -16h-16c-8.83984 0 -16 7.16016 -16 16v16c4.58008 137.17 113.18 256 256 256z
+" />
+    <glyph glyph-name="highlighter" unicode="&#xf591;" horiz-adv-x="544" 
+d="M0 -31.9805l68.3301 70.4707l67.04 -67.04l-35.4502 -35.4502zM124.61 208.03l41.5195 35.4395l173.34 -173.34l-35.5498 -41.6396c-9.5 -10.7705 -24.4199 -14.9805 -38.1504 -10.7803l-42.7393 13.0801l-50.8604 -50.8604l-96.2295 96.2305l50.9297 50.9395
+l-13.0498 42.8301c-1.02832 3.37598 -1.60645 6.94922 -1.60645 10.6592c0 10.9229 4.79688 20.7344 12.3965 27.4414zM527.92 368.73c20.5 -20.5 21.5303 -53.3906 2.34961 -75.1309l-169.949 -199.06l-169.771 169.78l199.05 169.96
+c21.7402 19.1699 54.6309 18.1396 75.1201 -2.35059z" />
+    <glyph glyph-name="hot-tub" unicode="&#xf593;" 
+d="M414.21 270.35c-3.15039 25.3906 -14.6104 47.9707 -31.9697 62.1406c-27.7305 22.6299 -45.79 58.0498 -50.1299 97.1602c-1.09082 9.7793 6.48926 18.3496 16 18.3496h16.1201c7.98926 0 14.7295 -6.13965 15.7393 -14.3398
+c3.16016 -25.4004 14.6104 -47.9805 31.9805 -62.1504c27.7295 -22.6299 45.79 -58.0498 50.1299 -97.1602c1.08008 -9.7793 -6.49023 -18.3496 -16 -18.3496h-16.1201c-8 0 -14.7295 6.13965 -15.75 14.3496zM306.21 270.35
+c-3.15039 25.3906 -14.6104 47.9707 -31.9697 62.1406c-27.7305 22.6299 -45.79 58.0498 -50.1299 97.1602c-1.09082 9.7793 6.48926 18.3496 16 18.3496h16.1201c7.98926 0 14.7295 -6.13965 15.7393 -14.3398c3.16016 -25.4004 14.6104 -47.9805 31.9805 -62.1504
+c27.7295 -22.6299 45.79 -58.0498 50.1299 -97.1602c1.08008 -9.7793 -6.49023 -18.3496 -16 -18.3496h-16.1201c-8 0 -14.7295 6.13965 -15.75 14.3496zM480 192c17.6699 0 32 -14.3301 32 -32v-160c0 -35.3496 -28.6504 -64 -64 -64h-384c-35.3496 0 -64 28.6504 -64 64
+v224c0 35.3496 28.6504 64 64 64h42.6699c14.3779 0 27.7109 -4.78223 38.4004 -12.7998l110.93 -83.2002h224zM128 8v112c0 4.41992 -3.58008 8 -8 8h-16c-4.41992 0 -8 -3.58008 -8 -8v-112c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8zM224 8v112
+c0 4.41992 -3.58008 8 -8 8h-16c-4.41992 0 -8 -3.58008 -8 -8v-112c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8zM320 8v112c0 4.41992 -3.58008 8 -8 8h-16c-4.41992 0 -8 -3.58008 -8 -8v-112c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8zM416 8
+v112c0 4.41992 -3.58008 8 -8 8h-16c-4.41992 0 -8 -3.58008 -8 -8v-112c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8zM64 320c-35.3496 0 -64 28.6504 -64 64s28.6504 64 64 64s64 -28.6504 64 -64s-28.6504 -64 -64 -64z" />
+    <glyph glyph-name="hotel" unicode="&#xf594;" horiz-adv-x="576" 
+d="M560 384h-16v-384h16c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-240v80c0 8.7998 -7.2002 16 -16 16h-32c-8.7998 0 -16 -7.2002 -16 -16v-80h-240c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h15.9805v384h-15.9805
+c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h544c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16zM256 339.2v-38.4004c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h38.4004c6.39941 0 12.7998 6.40039 12.7998 12.7998v38.4004
+c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-38.4004c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998zM256 243.2v-38.4004c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h38.4004c6.39941 0 12.7998 6.40039 12.7998 12.7998v38.4004
+c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-38.4004c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998zM128 339.2v-38.4004c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h38.4004c6.39941 0 12.7998 6.40039 12.7998 12.7998v38.4004
+c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-38.4004c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998zM179.2 192c6.39941 0 12.7998 6.40039 12.7998 12.7998v38.4004c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-38.4004
+c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998v-38.4004c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h38.4004zM192 64h192c0 53.0195 -42.9805 96 -96 96s-96 -42.9805 -96 -96zM448 204.8v38.4004c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-38.4004
+c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998v-38.4004c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h38.4004c6.39941 0 12.7998 6.40039 12.7998 12.7998zM448 300.8v38.4004c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-38.4004
+c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998v-38.4004c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h38.4004c6.39941 0 12.7998 6.40039 12.7998 12.7998z" />
+    <glyph glyph-name="joint" unicode="&#xf595;" horiz-adv-x="640" 
+d="M444.34 266.9c-35.7803 25.0693 -60.3398 63.0098 -60.3398 106.699v66.4004c0 4.41992 3.58008 8 8 8h48c4.41992 0 8 -3.58008 8 -8v-62.3096c0 -29.0303 15.8496 -54.71 39.6602 -71.3203c35.3301 -24.6504 56.3398 -64.8203 56.3398 -108.061v-30.3096
+c0 -4.41992 -3.58008 -8 -8 -8h-48c-4.41992 0 -8 3.58008 -8 8v30.3096c0 27.4307 -13.2803 52.9102 -35.6602 68.5908zM194.97 89.0195c22.3701 3.60059 45.0801 -4.30957 59.8203 -21.5098l112.72 -131.51h-88.5693c-98.6406 0 -195.29 27.7197 -278.94 80
+c59.6904 37.3096 126.03 61.9297 194.97 73.0195zM553.28 360.91c54.3096 -36.4102 86.7197 -97.1602 86.7197 -162.601v-30.3096c0 -4.41992 -3.58008 -8 -8 -8h-48c-4.41992 0 -8 3.58008 -8 8v30.3096c0 50.1504 -25.21 96.6504 -67.3604 123.99
+c-18.4697 11.9805 -28.6396 33.3701 -28.6396 55.3906v62.3096c0 4.41992 3.58008 8 8 8h48c4.41992 0 8 -3.58008 8 -8v-62.3096c0 -6.82031 3.61035 -12.9805 9.28027 -16.7803zM360.89 95.9502c0.0371094 0 0.0556641 0.0351562 0.0927734 0.0351562
+c19.4336 0 36.8535 -8.68652 48.5879 -22.3857l117.949 -137.6h-88.4492c-19.4385 0 -36.8506 8.65137 -48.5898 22.3496l-117.801 137.431c1.40039 0.0195312 53.8105 0.109375 88.21 0.169922zM616 96c13.25 0 24 -10.7402 24 -24v-112c0 -13.25 -10.75 -24 -24 -24
+h-17.4199c-19.4375 0 -36.8506 8.65137 -48.5898 22.3496l-117.99 137.65h184z" />
+    <glyph glyph-name="kiss" unicode="&#xf596;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM168 208c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM304 52c0 13 -13.4004 27.2998 -35.2002 36.4004
+c21.7998 8.69922 35.2002 23 35.2002 36c0 19.1992 -28.7002 41.5 -71.5 44c-8.40039 1.09961 -12.2002 -11.8008 -3.59961 -15.4004l17 -7.2002c13 -5.5 20.7998 -13.5 20.7998 -21.5s-7.7998 -16 -20.7998 -21.5l-17 -7.2002c-6.10059 -2.59961 -6 -12.2998 0 -14.7998
+l17 -7.2002c13 -5.5 20.7998 -13.5 20.7998 -21.5s-7.7998 -16 -20.7998 -21.5l-17 -7.19922c-8.5 -3.60059 -4.90039 -16.2002 3.59961 -15.4004c42.7998 2.5 71.5 24.7998 71.5 44zM328 208c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32
+s14.2998 -32 32 -32z" />
+    <glyph glyph-name="kiss-beam" unicode="&#xf597;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM209 220.1c4.2002 -7.5 15.5996 -4 15.0996 4.5c-3.2998 42.1006 -32.1992 71.4004 -56 71.4004c-23.7998 0 -52.6992 -29.2998 -56 -71.4004
+c-0.699219 -8.5 10.7002 -11.8994 14.9004 -4.5l9.5 17c7.7002 13.7002 19.2002 21.6006 31.5 21.6006s23.7998 -7.90039 31.5 -21.6006zM304 52c0 13 -13.4004 27.2998 -35.2002 36.4004c21.7998 8.69922 35.2002 23 35.2002 36c0 19.1992 -28.7002 41.5 -71.5 44
+c-8.40039 1.09961 -12.2002 -11.8008 -3.59961 -15.4004l17 -7.2002c13 -5.5 20.7998 -13.5 20.7998 -21.5s-7.7998 -16 -20.7998 -21.5l-17 -7.2002c-6.10059 -2.59961 -6 -12.2998 0 -14.7998l17 -7.2002c13 -5.5 20.7998 -13.5 20.7998 -21.5s-7.7998 -16 -20.7998 -21.5
+l-17 -7.19922c-8.5 -3.60059 -4.90039 -16.2002 3.59961 -15.4004c42.7998 2.5 71.5 24.7998 71.5 44zM369 220.1c4.2002 -7.5 15.5996 -4 15.0996 4.5c-3.2998 42.1006 -32.1992 71.4004 -56 71.4004c-23.7998 0 -52.6992 -29.2998 -56 -71.4004
+c-0.699219 -8.5 10.8008 -11.7998 14.9004 -4.5l9.5 17c7.7002 13.7002 19.2002 21.6006 31.5 21.6006s23.7998 -7.90039 31.5 -21.6006z" />
+    <glyph glyph-name="kiss-wink-heart" unicode="&#xf598;" horiz-adv-x="504" 
+d="M501.1 45.5c9.2002 -23.9004 -4.39941 -49.4004 -28.5 -55.7002l-83 -21.5c-5.39941 -1.39941 -10.8994 1.7998 -12.3994 7.10059l-22.9004 82.5996c-6.59961 24 8.7998 48.5996 34 52.5996c22 3.5 43.1006 -11.5996 49 -33l2.2998 -8.39941l8.40039 2.2002
+c21.5996 5.59961 45.0996 -5.10059 53.0996 -25.9004zM323.5 49.5c0 0 23.5996 -83.9004 23.9004 -84.5996c-30.5 -13.4004 -64 -20.9004 -99.4004 -20.9004c-137 0 -248 111 -248 248s111 248 248 248s248 -111 248 -248c0 -31.7998 -6.2002 -62.0996 -17.0996 -90
+c-6 1.5 -12.2002 2.7998 -18.6006 2.90039c-29.0996 49.7998 -98.0996 50.5996 -127.8 4.2998c-11.2998 -17.7002 -14.5996 -39.4004 -9 -59.7002zM168 208c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM288 52
+c0 13 -13.4004 27.2998 -35.2002 36.4004c21.7998 8.69922 35.2002 23 35.2002 36c0 19.1992 -28.7002 41.5 -71.5 44c-8.2002 1.19922 -12.4004 -11.7002 -3.59961 -15.4004l17 -7.2002c13 -5.5 20.7998 -13.5 20.7998 -21.5s-7.7998 -16 -20.7998 -21.5l-17 -7.2002
+c-5.7002 -2.5 -6 -12.2998 0 -14.7998l17 -7.2002c13 -5.5 20.7998 -13.5 20.7998 -21.5s-7.7998 -16 -20.7998 -21.5l-17 -7.19922c-8.5 -3.60059 -4.90039 -16.2002 3.59961 -15.4004c42.7998 2.5 71.5 24.7998 71.5 44zM304 231l9.7002 8.5
+c14.7998 13.2002 46.2002 13.2002 61 0l9.5 -8.5c8.5 -7.5 21.5 -0.299805 19.7998 10.7998c-4 25.2002 -34.2002 42.1006 -59.9004 42.1006c-25.6992 0 -55.8994 -16.9004 -59.8994 -42.1006c-1.7998 -11.2002 11.5 -18.2002 19.7998 -10.7998z" />
+    <glyph glyph-name="laugh" unicode="&#xf599;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM328 288c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32s32 14.2998 32 32s-14.2998 32 -32 32zM168 288c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32
+s32 14.2998 32 32s-14.2998 32 -32 32zM256 16c73.4004 0 134 55 142.9 126c1.19922 9.59961 -6.30078 18 -15.9004 18h-270c-9.59961 0 -17.0996 -8.5 -15.9004 -18c8.90039 -71 69.5 -126 142.9 -126h16z" />
+    <glyph glyph-name="laugh-beam" unicode="&#xf59a;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM272 240.6c-0.700195 -8.59961 10.9004 -11.8994 15.0996 -4.5l9.5 17c7.7002 13.7002 19.2002 21.6006 31.5 21.6006c12.3008 0 23.8008 -7.90039 31.5 -21.6006l9.5 -17
+c4.10059 -7.39941 15.6006 -4.09961 14.9004 4.5c-3.2998 42.1006 -32.2002 71.4004 -56 71.4004s-52.7002 -29.2998 -56 -71.4004zM112 240.6c-0.700195 -8.5 10.7998 -11.8994 15.0996 -4.5l9.5 17c7.7002 13.7002 19.2002 21.6006 31.5 21.6006
+c12.3008 0 23.8008 -7.90039 31.5 -21.6006l9.5 -17c4.10059 -7.39941 15.6006 -4.09961 14.9004 4.5c-3.2998 42.1006 -32.2002 71.4004 -56 71.4004s-52.7002 -29.2998 -56 -71.4004zM398.9 142c1.19922 9.59961 -6.30078 18 -15.9004 18h-270
+c-9.59961 0 -17.0996 -8.5 -15.9004 -18c8.90039 -71 69.5 -126 142.9 -126h16c73.4004 0 134 55 142.9 126z" />
+    <glyph glyph-name="laugh-squint" unicode="&#xf59b;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM281.8 278.3c-7.7002 -4.7002 -7.7002 -15.8994 0 -20.5996l80 -48c11.5 -6.7998 24.1006 7.59961 15.4004 18l-33.6006 40.2998l33.6006 40.2998
+c8.59961 10.2998 -3.7998 24.9004 -15.4004 18zM118.8 308.3l33.6006 -40.2998l-33.6006 -40.2998c-8.59961 -10.4004 3.90039 -24.7998 15.4004 -18l80 48c7.7998 4.7002 7.7998 15.8994 0 20.5996l-80 48c-11.6006 6.90039 -24 -7.7002 -15.4004 -18zM398.9 142
+c1.19922 9.59961 -6.30078 18 -15.9004 18h-270c-9.59961 0 -17.0996 -8.5 -15.9004 -18c8.90039 -71 69.5 -126 142.9 -126h16c73.4004 0 134 55 142.9 126z" />
+    <glyph glyph-name="laugh-wink" unicode="&#xf59c;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM268.1 241.9c-1.69922 -11.2002 11.5 -18.3008 19.9004 -10.9004l9.59961 8.59961c14.8008 13.2002 46.2002 13.2002 61 0l9.5 -8.5
+c8.40039 -7.5 21.5 -0.299805 19.8008 10.8008c-4 25.1992 -34.2002 42.0996 -59.9004 42.0996s-55.9004 -16.9004 -59.9004 -42.0996zM168 288c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32s32 14.2998 32 32s-14.2998 32 -32 32zM398.9 142
+c1.19922 9.59961 -6.30078 18 -15.9004 18h-270c-9.59961 0 -17.0996 -8.5 -15.9004 -18c8.90039 -71 69.5 -126 142.9 -126h16c73.4004 0 134 55 142.9 126z" />
+    <glyph glyph-name="luggage-cart" unicode="&#xf59d;" horiz-adv-x="640" 
+d="M224 128c-17.6699 0 -32 14.3301 -32 32v160c0 17.6699 14.3301 32 32 32h32v-224h-32zM576 160c0 -17.6699 -14.3301 -32 -32 -32h-32v224h32c17.6699 0 32 -14.3301 32 -32v-160zM624 64c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-82.9404
+c1.79004 -5.03027 2.94043 -10.3604 2.94043 -16c0 -26.5098 -21.4902 -48 -48 -48s-48 21.4902 -48 48c0 5.63965 1.15039 10.9697 2.94043 16h-197.881c1.79004 -5.03027 2.94043 -10.3604 2.94043 -16c0 -26.5098 -21.4902 -48 -48 -48s-48 21.4902 -48 48
+c0 5.63965 1.15039 10.9697 2.94043 16h-82.9404c-8.83984 0 -16 7.16016 -16 16v368h-48c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h96c8.83984 0 16 -7.16016 16 -16v-368h496zM480 352v-224h-192v272c0 26.5098 21.4902 48 48 48h96
+c26.5098 0 48 -21.4902 48 -48v-48zM432 352v48h-96v-48h96z" />
+    <glyph glyph-name="map-marked" unicode="&#xf59f;" horiz-adv-x="576" 
+d="M288 448c69.5898 0 126 -56.4102 126 -126c0 -56.2598 -82.3496 -158.8 -113.9 -196.02c-6.37988 -7.54004 -17.8096 -7.54004 -24.1992 0c-31.5508 37.2197 -113.9 139.76 -113.9 196.02c0 69.5898 56.4102 126 126 126zM20.1201 232.05l118.63 47.4502
+c5.17969 -14.8799 12.4102 -30.4404 21.25 -46.4199v-233.08l-138.06 -62.8398c-10.5107 -4.2002 -21.9404 3.54004 -21.9404 14.8594v250.32c0.00292969 13.4697 8.32617 24.9932 20.1201 29.71zM288 88.3301c14.0703 0 27.3799 6.17969 36.5098 16.9502
+c19.6699 23.2002 40.5703 49.6299 59.4902 76.7197v-245.99l-192 64v182c18.9199 -27.0996 39.8301 -53.5195 59.4902 -76.7197c9.12988 -10.7803 22.4395 -16.96 36.5098 -16.96zM554.06 286.84c10.5107 4.2002 21.9404 -3.54004 21.9404 -14.8594v-250.32
+c0 -13.4707 -8.32422 -24.9951 -20.1201 -29.71l-139.88 -55.9502v288z" />
+    <glyph glyph-name="map-marked-alt" unicode="&#xf5a0;" horiz-adv-x="576" 
+d="M288 448c69.5898 0 126 -56.4102 126 -126c0 -56.2598 -82.3496 -158.8 -113.9 -196.02c-6.37988 -7.54004 -17.8096 -7.54004 -24.1992 0c-31.5508 37.2197 -113.9 139.76 -113.9 196.02c0 69.5898 56.4102 126 126 126zM288 280c23.2002 0 42 18.7998 42 42
+s-18.7998 42 -42 42s-42 -18.7998 -42 -42s18.7998 -42 42 -42zM20.1201 232.05l118.63 47.4502c5.17969 -14.8799 12.4102 -30.4404 21.25 -46.4199v-233.08l-138.06 -62.8398c-10.5107 -4.2002 -21.9404 3.54004 -21.9404 14.8594v250.32
+c0.00292969 13.4697 8.32617 24.9932 20.1201 29.71zM288 88.3301c14.0703 0 27.3799 6.17969 36.5098 16.9502c19.6699 23.2002 40.5703 49.6299 59.4902 76.7197v-245.99l-192 64v182c18.9199 -27.0996 39.8301 -53.5195 59.4902 -76.7197
+c9.12988 -10.7803 22.4395 -16.96 36.5098 -16.96zM554.06 286.84c10.5107 4.2002 21.9404 -3.54004 21.9404 -14.8594v-250.32c0 -13.4707 -8.32422 -24.9951 -20.1201 -29.71l-139.88 -55.9502v288z" />
+    <glyph glyph-name="marker" unicode="&#xf5a1;" 
+d="M93.9502 157.97l75.3994 75.4004l128.021 -128.021l-75.4004 -75.3994c-51.1611 -51.1592 -119.559 -85.4326 -195.34 -93.7998c-15.2803 -1.69043 -28.1895 11.2295 -26.4902 26.5098l0.0302734 0.229492c8.42188 75.6777 42.6777 143.978 93.7803 195.08z
+M485.49 421.49c35.3496 -35.3604 35.3496 -92.6699 0 -128.021l-165.49 -165.489l-128.02 128.02l98.4795 98.4697l-19.5898 19.5898l-87.1504 -87.1494c-6.25 -6.25 -16.3799 -6.25 -22.6299 0l-22.6201 22.6201c-6.25 6.25 -6.25 16.3799 0 22.6299l104.12 104.12
+c15.6104 15.6201 40.9404 15.6201 56.5605 0l36.5596 -36.5498l21.7598 21.7598c35.3506 35.3496 92.6699 35.3496 128.021 0z" />
+    <glyph glyph-name="medal" unicode="&#xf5a2;" 
+d="M223.75 317.25c-42.04 -6.55957 -79.8398 -25.6201 -109.56 -53.3896l-111.271 158.96c-7.41992 10.6094 0.160156 25.1797 13.1104 25.1797h111.149c11.6572 0 21.8467 -6.21387 27.4404 -15.54zM495.97 448c12.9502 0 20.5303 -14.5703 13.1104 -25.1797
+l-111.271 -158.95c-29.7197 27.7598 -67.5195 46.8203 -109.56 53.3799l69.1299 115.21c5.78027 9.63965 16.2002 15.54 27.4404 15.54h111.149zM256 288c97.2002 0 176 -78.7998 176 -176s-78.7998 -176 -176 -176s-176 78.7998 -176 176s78.7998 176 176 176z
+M348.52 130.74c6.82031 6.63965 3.05078 18.2295 -6.34961 19.5898l-52.4297 7.63965l-23.4307 47.5205c-2.10938 4.25 -6.21973 6.38965 -10.3291 6.38965c-4.09082 0 -8.1709 -2.11035 -10.2803 -6.38965l-23.4307 -47.5205l-52.4297 -7.63965
+c-9.39941 -1.36035 -13.1699 -12.9502 -6.34961 -19.5898l37.9297 -36.96l-8.96973 -52.2207c-1.60059 -9.34961 8.25 -16.54 16.6494 -12.0898l46.9004 24.6504l46.9102 -24.6504c8.38965 -4.41992 18.25 2.73047 16.6494 12.0898l-8.96973 52.2207z" />
+    <glyph glyph-name="meh-blank" unicode="&#xf5a4;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM168 208c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM328 208c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32
+s-32 -14.2998 -32 -32s14.2998 -32 32 -32z" />
+    <glyph glyph-name="meh-rolling-eyes" unicode="&#xf5a5;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM88 224c0 -35.2998 28.7002 -64 64 -64s64 28.7002 64 64c0 24.2998 -13.7002 45.2002 -33.5996 56c0.699219 -2.59961 1.59961 -5.2002 1.59961 -8
+c0 -17.7002 -14.2998 -32 -32 -32s-32 14.2998 -32 32c0 2.7998 0.900391 5.40039 1.59961 8c-19.8994 -10.7998 -33.5996 -31.7002 -33.5996 -56zM312 48c21.2002 0 21.2002 32 0 32h-128c-21.2002 0 -21.2002 -32 0 -32h128zM344 160c35.2998 0 64 28.7002 64 64
+c0 24.2998 -13.7002 45.2002 -33.5996 56c0.699219 -2.59961 1.59961 -5.2002 1.59961 -8c0 -17.7002 -14.2998 -32 -32 -32s-32 14.2998 -32 32c0 2.7998 0.900391 5.40039 1.59961 8c-19.8994 -10.7998 -33.5996 -31.7002 -33.5996 -56c0 -35.2998 28.7002 -64 64 -64z
+" />
+    <glyph glyph-name="monument" unicode="&#xf5a6;" horiz-adv-x="384" 
+d="M368 0c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-352c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h352zM289.14 347.26l30.8604 -315.26h-256l30.8701 315.26c0.751953 7.54688 4.12988 14.3613 9.20996 19.4404
+l76.5996 76.6094c6.25 6.25 16.3799 6.25 22.6299 0l76.6201 -76.6094c5.08008 -5.0791 8.45801 -11.8936 9.20996 -19.4404zM240 140.8v38.4004c0 6.39941 -6.40039 12.7998 -12.7998 12.7998h-70.4004c-6.39941 0 -12.7998 -6.40039 -12.7998 -12.7998v-38.4004
+c0 -6.39941 6.40039 -12.7998 12.7998 -12.7998h70.4004c6.39941 0 12.7998 6.40039 12.7998 12.7998z" />
+    <glyph glyph-name="mortar-pestle" unicode="&#xf5a7;" 
+d="M501.54 387.09l-99.0801 -99.0898h-151.37l203.811 152.86c5.96094 4.46875 13.4297 7.11426 21.4473 7.11426c5.71973 0 11.1279 -1.34863 15.9219 -3.74414c21.7803 -10.8906 26.4902 -39.9209 9.27051 -57.1406zM496 256c8.83984 0 16 -7.16016 16 -16v-32
+c0 -8.83984 -7.16016 -16 -16 -16h-16c0 -80.9805 -50.2002 -150.11 -121.13 -178.32c12.7695 -16.8701 21.7295 -36.7998 24.9502 -58.6895c1.45996 -9.91992 -6.04004 -18.9805 -16.0703 -18.9805h-223.5c-10.0303 0 -17.5303 9.06055 -16.0703 18.9805
+c3.23047 21.8896 12.1904 41.8193 24.9502 58.6895c-70.9297 28.21 -121.13 97.3398 -121.13 178.32h-16c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h480z" />
+    <glyph glyph-name="paint-roller" unicode="&#xf5aa;" 
+d="M416 320c0 -17.6699 -14.3301 -32 -32 -32h-352c-17.6699 0 -32 14.3301 -32 32v96c0 17.6699 14.3301 32 32 32h352c17.6699 0 32 -14.3301 32 -32v-96zM448 384c35.3496 0 64 -28.6504 64 -64v-64c0 -53.0195 -42.9805 -96 -96 -96h-160v-32
+c17.6699 0 32 -14.3301 32 -32v-128c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v128c0 17.6699 14.3301 32 32 32v32c0 35.3496 28.6504 64 64 64h160c17.6699 0 32 14.3301 32 32v128z" />
+    <glyph glyph-name="passport" unicode="&#xf5ab;" horiz-adv-x="448" 
+d="M129.62 272c5.28027 31.2197 25.5898 57.1699 53.2998 70.4102c-7.66992 -19.0605 -12.7197 -43.3799 -14.21 -70.4102h-39.0898zM129.62 240h39.0898c1.49023 -27.0303 6.53027 -51.3496 14.21 -70.4102c-27.71 13.2402 -48.0098 39.1904 -53.2998 70.4102zM224 161.31
+c-7.69043 7.4502 -20.7695 34.4307 -23.4404 78.6904h46.8701c-2.66016 -44.2695 -15.7393 -71.2402 -23.4297 -78.6904zM200.57 272c2.66016 44.2598 15.7393 71.2402 23.4395 78.6904c7.69043 -7.4502 20.7705 -34.4307 23.4307 -78.6904h-46.8701zM265.08 169.59
+c7.67969 19.0605 12.7197 43.3799 14.21 70.4102h39.0898c-5.28027 -31.2197 -25.5898 -57.1699 -53.2998 -70.4102zM416 448c17.6699 0 32 -14.3301 32 -32v-448c0 -17.6699 -14.3301 -32 -32 -32h-352c-35.3496 0 -64 28.6504 -64 64v384c0 35.3496 28.6504 64 64 64h352z
+M336 32c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16h-224c-8.7998 0 -16 -7.2002 -16 -16s7.2002 -16 16 -16h224zM224 128c70.6904 0 128 57.3096 128 128s-57.3096 128 -128 128s-128 -57.3096 -128 -128s57.3096 -128 128 -128zM265.08 342.41
+c27.71 -13.2402 48.0195 -39.1904 53.2998 -70.4102h-39.0898c-1.49023 27.0303 -6.53027 51.3496 -14.21 70.4102z" />
+    <glyph glyph-name="pen-fancy" unicode="&#xf5ac;" 
+d="M79.1797 165.06l84.0703 33.0703l98.8799 -98.8799l-33.0703 -84.0703c-3.1748 -9.5332 -10.7061 -17.0645 -20.2393 -20.2393l-176.82 -58.9404l-4.67969 4.67969l92.8896 92.8906c2.55957 -0.660156 5.03027 -1.57031 7.7998 -1.57031c17.6699 0 32 14.3301 32 32
+s-14.3301 32 -32 32s-32 -14.3301 -32 -32c0 -2.76953 0.910156 -5.24023 1.57031 -7.7998l-92.8896 -92.8906l-4.69043 4.69043l58.9404 176.82c3.17773 9.53223 10.707 17.0615 20.2393 20.2393zM369.25 419.68c74.4805 84.2607 199.15 -39.1602 114.23 -114.229
+l-199.49 -183.11l-97.8506 97.8506z" />
+    <glyph glyph-name="pen-nib" unicode="&#xf5ad;" 
+d="M136.6 309.21l151.4 42.79l128 -128l-42.79 -151.4c-5.76172 -20.3838 -21.3594 -36.6455 -41.3496 -43.3096l-279.86 -93.29l-14.6904 14.6904l150.11 150.109c6.25977 -2.99023 13.1797 -4.7998 20.5801 -4.7998c26.5098 0 48 21.4902 48 48s-21.4902 48 -48 48
+s-48 -21.4902 -48 -48c0 -7.40039 1.80957 -14.3203 4.7998 -20.5801l-150.109 -150.11l-14.6904 14.6904l93.29 279.86c6.66406 19.9902 22.9258 35.5879 43.3096 41.3496zM497.94 373.83c18.75 -18.7598 18.75 -49.1602 0 -67.9102l-56.5508 -56.5498l-128.02 128.02
+l56.5498 56.5508c18.75 18.75 49.1602 18.75 67.9102 0z" />
+    <glyph glyph-name="pencil-ruler" unicode="&#xf5ae;" 
+d="M109.46 203.96l-100.17 100.18c-12.3896 12.3906 -12.3799 32.4707 0 44.8604l89.71 89.71c12.3896 12.3896 32.4697 12.3896 44.8604 0l33.6396 -33.6504l-61.6797 -61.6797c-3.10059 -3.08984 -3.10059 -8.11035 0 -11.21l11.21 -11.21
+c1.43359 -1.43652 3.41797 -2.32617 5.60547 -2.32617c2.18848 0 4.16992 0.889648 5.60449 2.32617l61.6797 61.6797l44.1201 -44.1201zM497.93 320.76l-46.0195 -46.0293l-113.2 113.199l46.0205 46.0107c18.7695 18.7598 49.1895 18.7598 67.9492 0l45.25 -45.25
+c18.75 -18.7607 18.7607 -49.1709 0 -67.9307zM316.08 365.29l113.2 -113.19l-296.92 -296.93l-107.45 -18.8398c-14.5 -2.5498 -27.1201 10.0703 -24.5898 24.5596l18.7598 107.44zM502.71 79.8604c12.3896 -12.3906 12.3896 -32.4707 0 -44.8604l-89.71 -89.7002
+c-12.3896 -12.3896 -32.4697 -12.3896 -44.8604 0l-100.21 100.2l134.58 134.56l44.1406 -44.1396l-61.6807 -61.6797c-3.08984 -3.08984 -3.08984 -8.11035 0 -11.21l11.21 -11.21c3.08984 -3.10059 8.11035 -3.10059 11.21 0l61.6807 61.6797z" />
+    <glyph glyph-name="plane-arrival" unicode="&#xf5af;" horiz-adv-x="640" 
+d="M624 0c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-608c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h608zM44.8096 242.34c-6.5498 5.91016 -12.3896 14.3398 -12.5791 23.25l-0.230469 101.78
+c0.19043 10.8799 10.3799 18.7002 20.7197 15.8799l39.7305 -10.8301c5.00977 -1.36035 9.08984 -5.04004 11.0195 -9.92969l27.5898 -67.8799l102.2 -27.8408l-47.9199 164.211c-0.189453 11.1191 10.1504 19.3193 20.71 16.4395l65.0898 -17.7295
+c5.70996 -1.56055 10.1504 -6.10059 11.6602 -11.9102l100.36 -191.851l97.5098 -26.5596c26.4805 -7.20996 51.5498 -20.1797 70.8301 -40c21.6396 -22.25 27.2002 -40.46 23.3701 -54.96c-3.81055 -14.5 -17.5801 -27.4404 -47.25 -35.71
+c-26.4404 -7.36035 -54.5205 -5.85059 -81 1.35938l-287.601 78.3506c-9.58496 2.61621 -18.2998 7.45605 -25.4697 13.9297z" />
+    <glyph glyph-name="plane-departure" unicode="&#xf5b0;" horiz-adv-x="640" 
+d="M624 0c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-608c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h608zM80.5498 106.73l-76.21 82.9697c-7.62012 8.95996 -4.87012 22.7803 5.57031 28.0801l40.1299 20.3701
+c2.41504 1.22461 5.18066 1.91504 8.07227 1.91504c2.875 0 5.59277 -0.682617 7.99805 -1.89551l72.3496 -36.4697l103.21 52.3799l-156.22 98.0996c-8.08008 8.87988 -5.5 23.1201 5.16992 28.5303l65.75 33.3701c2.41504 1.22559 5.18164 1.91699 8.07324 1.91699
+c3.67383 0 7.08984 -1.11621 9.92676 -3.02734l218.7 -82.0596l98.5098 49.9902c26.7402 13.5596 56.4297 21.4199 86.2803 19.4795c33.5098 -2.17969 51.04 -12.8799 58.25 -27.4502c7.22949 -14.5596 5.23926 -35.1699 -13.0703 -63.6494
+c-16.3096 -25.3701 -40.2803 -44.7402 -67.0205 -58.3105l-290.96 -147.649c-8.88574 -4.51562 -19.001 -7.10645 -29.6396 -7.12012l-130.54 -0.180664c-9.22949 -0.00976562 -18.0498 3.87012 -24.3301 10.7109z" />
+    <glyph glyph-name="prescription" unicode="&#xf5b1;" horiz-adv-x="384" 
+d="M301.26 96l78.0605 -78.0498c6.25 -6.25 6.25 -16.3799 0 -22.6299l-22.6299 -22.6299c-6.25 -6.25 -16.3809 -6.25 -22.6309 0l-78.0596 78.0596l-78.0498 -78.0703c-6.25 -6.25 -16.3799 -6.25 -22.6299 0l-22.6299 22.6299c-6.25 6.25 -6.25 16.3809 0 22.6309
+l78.0596 78.0596l-128 128h-18.75v-80c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v256c0 8.83984 7.16016 16 16 16h144c53.0195 0 96 -42.9805 96 -96c0 -48.8896 -36.6904 -88.7998 -83.96 -94.7803l83.96 -83.96l78.0596 78.0605
+c6.25 6.25 16.3809 6.25 22.6309 0l22.6299 -22.6299c6.25 -6.25 6.25 -16.3809 0 -22.6309zM64 352v-64h96c17.6396 0 32 14.3604 32 32s-14.3604 32 -32 32h-96z" />
+    <glyph glyph-name="sad-cry" unicode="&#xf5b3;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248c0 -90 -48.2002 -168.7 -120 -212.1v180.1c0 8.7998 -7.2002 16 -16 16s-16 -7.2002 -16 -16v-196.7c-29.5 -12.3994 -62 -19.2998 -96 -19.2998s-66.5 6.90039 -96 19.2998v196.7c0 8.7998 -7.2002 16 -16 16s-16 -7.2002 -16 -16
+v-180.1c-71.7998 43.3994 -120 122 -120 212.1c0 137 111 248 248 248zM182.5 223.5l9.7002 -8.5c2.5 -2.2998 7.89941 -4.7002 13.7002 -1.59961c4.39941 2.39941 6.89941 7.39941 6.09961 12.3994c-4 25.2002 -34.2002 42.1006 -59.9004 42.1006
+c-25.6992 0 -55.8994 -16.9004 -59.8994 -42.1006c-0.799805 -5 1.7002 -10 6.09961 -12.3994c4.40039 -2.40039 9.90039 -1.7002 13.7002 1.59961l9.5 8.5c14.7998 13.2002 46.2002 13.2002 61 0zM248 32c26.5 0 48 28.7002 48 64s-21.5 64 -48 64s-48 -28.7002 -48 -64
+s21.5 -64 48 -64zM397.8 213.5c4.40039 2.40039 6.7998 7.40039 6.2002 12.2998c-4 25.2002 -34.2002 42.1006 -59.9004 42.1006c-25.6992 0 -55.8994 -16.9004 -59.8994 -42.1006c-0.799805 -5 1.7002 -10 6.09961 -12.3994
+c4.40039 -2.40039 9.90039 -1.7002 13.7002 1.59961l9.59961 8.59961c14.8008 13.2002 46.2002 13.2002 61 0l9.5 -8.5c2.5 -2.2998 7.90039 -4.69922 13.7002 -1.59961z" />
+    <glyph glyph-name="sad-tear" unicode="&#xf5b4;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM328 272c-17.7002 0 -32 -14.2998 -32 -32s14.2998 -32 32 -32s32 14.2998 32 32s-14.2998 32 -32 32zM152 32c26.5 0 48 21 48 47c0 20 -28.5 60.4004 -41.5996 77.7998
+c-3.2002 4.2998 -9.60059 4.2998 -12.8008 0c-13.0996 -17.3994 -41.5996 -57.7998 -41.5996 -77.7998c0 -26 21.5 -47 48 -47zM168 208c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM338.2 53.7998
+c13.2998 -16.0996 38.2998 4 24.5 20.4004c-28.4004 34.2002 -70.2998 53.7998 -114.7 53.7998c-21.2002 0 -21.2002 -32 0 -32c34.9004 0 67.7998 -15.4004 90.2002 -42.2002z" />
+    <glyph glyph-name="shuttle-van" unicode="&#xf5b6;" horiz-adv-x="640" 
+d="M628.88 237.35c7.17969 -8.62988 11.1201 -19.5 11.1201 -30.7295v-110.62c0 -17.6699 -14.3301 -32 -32 -32h-32c0 -53.0195 -42.9805 -96 -96 -96s-96 42.9805 -96 96h-128c0 -53.0195 -42.9805 -96 -96 -96s-96 42.9805 -96 96h-32c-17.6699 0 -32 14.3301 -32 32v288
+c0 17.6699 14.3301 32 32 32h425.52c14.8184 -0.00292969 28.0625 -6.70312 36.8701 -17.2695zM64 256h96v96h-96v-96zM160 16c26.5098 0 48 21.4902 48 48s-21.4902 48 -48 48s-48 -21.4902 -48 -48s21.4902 -48 48 -48zM320 256v96h-96v-96h96zM480 16
+c26.5098 0 48 21.4902 48 48s-21.4902 48 -48 48s-48 -21.4902 -48 -48s21.4902 -48 48 -48zM384 256h146.02l-80 96h-66.0195v-96z" />
+    <glyph glyph-name="signature" unicode="&#xf5b7;" horiz-adv-x="640" 
+d="M623.2 256c9.09961 0.599609 16.7998 -7.09961 16.5996 -16.2002v-32.0996c0 -8.5 -6.7002 -15.1006 -15.2002 -15.7998c-39.3994 -3.2002 -105.399 -51 -138.399 -65.8008c-34.2998 -15.3994 -66.7002 -30 -102.3 -30c-28.2002 0 -50.2002 8.5 -65.5 25.3008
+c-22.7002 24.8994 -22.8008 55.2998 -20.6006 83.7998c-56.5 -45.1006 -169 -153.601 -211.2 -195.8c-6.09961 -6.2002 -14.2998 -9.40039 -22.5996 -9.40039c-27 0 -36.5 27 -29.7002 43.9004l98.2002 245.6c8 19.9004 -14.2998 38.7998 -32.7002 27.0996l-58 -38.8994
+c-7.5 -4.7998 -17.3994 -2.60059 -22.0996 4.89941l-17.2002 27c-4.7002 7.5 -2.5 17.4004 4.90039 22.1006l54.8994 36.8994c76.5 48.7002 160.101 -26.8994 129.7 -102.8l-41.5 -103.7c105.2 101.2 144.4 124.5 169.5 126
+c54.4004 3.10059 43.7998 -68.0996 42.7002 -76.0996c-4.7002 -35.7002 -1.2998 -51.9004 21.2998 -51.9004c21.9004 0 47 11.3008 76.0996 24.4004c37.4004 16.7998 111.301 68 163.101 71.5z" />
+    <glyph glyph-name="smile-beam" unicode="&#xf5b8;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM112 224.6c-0.700195 -8.5 10.7998 -11.8994 15.0996 -4.5l9.5 17c7.7002 13.7002 19.2002 21.6006 31.5 21.6006c12.3008 0 23.8008 -7.90039 31.5 -21.6006l9.5 -17
+c4.10059 -7.39941 15.6006 -4.09961 14.9004 4.5c-3.2998 42.1006 -32.2002 71.4004 -56 71.4004s-52.7002 -29.2998 -56 -71.4004zM362.8 101.8c13.5 16.2002 -11 36.7002 -24.5996 20.5c-22.4004 -26.7998 -55.2002 -42.2002 -90.2002 -42.2002
+s-67.7998 15.3008 -90.2002 42.2002c-13.5996 16.2002 -38.0996 -4.2002 -24.5996 -20.5c28.5 -34.2002 70.2998 -53.7998 114.8 -53.7998s86.2998 19.5996 114.8 53.7998zM369 220.1c4.09961 -7.39941 15.7002 -4.09961 15.0996 4.5
+c-3.2998 42.1006 -32.1992 71.4004 -56 71.4004c-23.7998 0 -52.6992 -29.2998 -56 -71.4004c-0.699219 -8.5 10.8008 -11.7998 14.9004 -4.5l9.5 17c7.7002 13.7002 19.2002 21.6006 31.5 21.6006s23.7998 -7.90039 31.5 -21.6006z" />
+    <glyph glyph-name="solar-panel" unicode="&#xf5ba;" horiz-adv-x="640" 
+d="M431.98 -0.00976562c8.84961 0.00976562 16.0293 -7.16992 16.0195 -16.0205l-0.0400391 -31.7295c-0.00976562 -8.82031 -7.16016 -15.9707 -15.9795 -15.9805l-223.961 -0.259766c-8.84961 -0.00976562 -16.0293 7.16992 -16.0195 16.0195l0.0498047 31.7305
+c0.00976562 8.83008 7.16016 15.9805 15.9805 15.9902l47.9795 0.0498047v32.21h128v-32.0596zM585.2 421.26c58.1094 -342.42 54.7803 -321.39 54.7598 -325.47c-0.0800781 -17.2305 -14.3604 -31.79 -32.5898 -31.79h-574.74c-18.3096 0 -32.6299 14.6797 -32.5996 32
+c0.00976562 3.91992 -3.35059 -17.1602 54.7598 325.26c2.62012 15.4307 16.21 26.7402 32.1396 26.7402h466.13c15.9307 0 29.5205 -11.3096 32.1406 -26.7402zM259.83 384l-9.77051 -96h139.87l-9.76953 96h-120.33zM184.66 128l11.4102 112h-105.971l-19.0098 -112
+h113.57zM200.95 288l9.76953 96h-96.1895l-16.29 -96h102.71zM233.77 128h172.45l-11.3994 112h-149.65zM429.27 384l9.77051 -96h102.71l-16.29 96h-96.1904zM455.33 128h113.58l-19.0098 112h-105.971z" />
+    <glyph glyph-name="spa" unicode="&#xf5bb;" horiz-adv-x="576" 
+d="M568.25 256c4.41016 0.0195312 7.79004 -3.40039 7.75 -7.82031c-0.230469 -27.9199 -7.12988 -126.13 -88.7695 -199.3c-84.04 -81.8301 -167.23 -80.8799 -199.23 -80.8799s-115.21 -0.94043 -199.23 80.8799c-81.6299 73.1602 -88.5391 171.38 -88.7695 199.3
+c-0.0400391 4.41992 3.33984 7.83984 7.75 7.82031c29.04 -0.129883 135.01 -6.16016 213.84 -83c33.1201 -29.6299 53.3604 -63.2998 66.4102 -94.8604c13.0498 31.5605 33.29 65.2305 66.4102 94.8604c78.8301 76.8398 184.8 82.8701 213.84 83zM287.98 145.4
+c-12.9727 19.0527 -27.9248 36.124 -45.04 51.46c-18.7207 18.25 -38.8506 32.6895 -59.2207 44.3896c16.4707 70.4404 51.75 132.93 96.7402 172.07c4.12012 3.58008 11.0303 3.58008 15.1396 0c45.0107 -39.1699 80.29 -101.721 96.7305 -172.221
+c-20.6797 -11.8799 -41.1699 -26.5693 -60.2598 -45.1797c-16.4902 -14.7402 -31.2705 -31.6699 -44.0898 -50.5195z" />
+    <glyph glyph-name="splotch" unicode="&#xf5bc;" 
+d="M472.29 252.11c48.54 -16.6201 53.8301 -73.8301 8.9502 -96.79l-62 -31.7402c-17.8301 -9.12988 -29.2803 -25.2002 -30.6299 -42.9902l-4.7002 -61.8594c-3.41016 -44.79 -65.1299 -66.7803 -104.45 -37.2207l-54.3203 40.8301
+c-15.6201 11.7305 -36.96 16.1201 -57.0693 11.7305l-69.96 -15.2803c-50.6504 -11.0596 -94.0801 32.5596 -73.4902 73.8096l28.4297 56.9805c8.18066 16.3799 6.44043 35.1699 -4.63965 50.2402l-38.54 52.4199c-27.9004 37.9502 6.97949 86.8994 59.0303 82.8301
+l71.8799 -5.62012c20.6602 -1.62012 40.9395 5.59961 54.2002 19.3096l46.1396 47.6699c33.4102 34.5107 98.3994 21.1504 109.979 -22.6201l15.9902 -60.4492c4.60059 -17.3799 18.8604 -31.7002 38.1406 -38.3008z" />
+    <glyph glyph-name="spray-can" unicode="&#xf5bd;" 
+d="M224 416v-96h-128v96c0 17.6699 14.3301 32 32 32h64c17.6699 0 32 -14.3301 32 -32zM480 320c17.6699 0 32 -14.3301 32 -32s-14.3301 -32 -32 -32s-32 14.3301 -32 32s14.3301 32 32 32zM224 288c53.0195 0 96 -42.9805 96 -96v-224c0 -17.6699 -14.3301 -32 -32 -32
+h-256c-17.6699 0 -32 14.3301 -32 32v224c0 53.0195 42.9805 96 96 96h128zM160 32c44.1797 0 80 35.8203 80 80s-35.8203 80 -80 80s-80 -35.8203 -80 -80s35.8203 -80 80 -80zM480 352c-17.6699 0 -32 14.3301 -32 32s14.3301 32 32 32s32 -14.3301 32 -32
+s-14.3301 -32 -32 -32zM384 320c17.6699 0 32 -14.3301 32 -32s-14.3301 -32 -32 -32s-32 14.3301 -32 32s14.3301 32 32 32zM288 416c17.6699 0 32 -14.3301 32 -32s-14.3301 -32 -32 -32s-32 14.3301 -32 32s14.3301 32 32 32zM384 416c17.6699 0 32 -14.3301 32 -32
+s-14.3301 -32 -32 -32s-32 14.3301 -32 32s14.3301 32 32 32zM480 224c17.6699 0 32 -14.3301 32 -32s-14.3301 -32 -32 -32s-32 14.3301 -32 32s14.3301 32 32 32z" />
+    <glyph glyph-name="stamp" unicode="&#xf5bf;" 
+d="M32 -64v64h448v-64h-448zM416 192c53.0195 0 96 -42.9805 96 -96v-32c0 -17.6699 -14.3301 -32 -32 -32h-448c-17.6699 0 -32 14.3301 -32 32v32c0 53.0195 42.9805 96 96 96h66.5596c16.2607 0 29.4404 13.1797 29.4404 29.4404v0.0693359
+c0 31.79 -9.98047 62.0605 -23.3096 90.9102c-5.57031 12.04 -8.69043 25.4199 -8.69043 39.5801c0 58.6699 52.6201 105.04 113.25 94.4902c38.79 -6.75 70.4902 -38.6699 77.2598 -77.4502c3.85059 -22.0303 0.0605469 -42.8096 -9.0498 -60.4199
+c-12.5801 -24.3105 -21.46 -50.3506 -21.46 -77.7197v-9.45996c0 -16.2607 13.1797 -29.4404 29.4404 -29.4404h66.5596z" />
+    <glyph glyph-name="star-half-alt" unicode="&#xf5c0;" horiz-adv-x="536" 
+d="M508.55 276.49c26.25 -3.7998 36.7705 -36.1006 17.7305 -54.6006l-105.91 -102.979l25.0303 -145.49c3.55957 -20.79 -13.0605 -37.4004 -31.6602 -37.4004c-4.91016 0 -9.9707 1.16016 -14.8301 3.71094l-130.94 68.6992l-130.95 -68.6797
+c-4.86914 -2.58008 -9.93945 -3.75 -14.8691 -3.75c-18.5801 0 -35.1699 16.6699 -31.6104 37.4502l25.0596 145.479l-105.89 103c-19.0303 18.5 -8.50977 50.79 17.7402 54.5898l146.38 21.29l65.4297 132.381c5.90039 11.9092 17.29 17.8096 28.6904 17.8096
+c11.4697 0 22.9395 -5.98047 28.8193 -17.8096l65.4102 -132.391zM386.81 153.29l82.6504 80.3799l-114.229 16.6299l-25.0107 3.64062l-11.1797 22.6299l-51.0303 103.29l-0.0292969 -317.19l22.3799 -11.7402l102.13 -53.5898l-19.5205 113.45l-4.2793 24.8799z" />
+    <glyph glyph-name="suitcase-rolling" unicode="&#xf5c1;" horiz-adv-x="384" 
+d="M336 288c26.5098 0 48 -21.4902 48 -48v-224c0 -26.5098 -21.4902 -48 -48 -48h-16v-16c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v16h-128v-16c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v16h-16
+c-26.5098 0 -48 21.4902 -48 48v224c0 26.5098 21.4902 48 48 48h288zM320 72v16c0 4.41992 -3.58008 8 -8 8h-240c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h240c4.41992 0 8 3.58008 8 8zM320 168v16c0 4.41992 -3.58008 8 -8 8h-240
+c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h240c4.41992 0 8 3.58008 8 8zM144 400v-80h-48v80c0 26.5098 21.4902 48 48 48h96c26.5098 0 48 -21.4902 48 -48v-80h-48v80h-96z" />
+    <glyph glyph-name="surprise" unicode="&#xf5c2;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM136 240c0 -17.7002 14.2998 -32 32 -32s32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32zM248 32c35.2998 0 64 28.7002 64 64s-28.7002 64 -64 64
+s-64 -28.7002 -64 -64s28.7002 -64 64 -64zM328 208c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32z" />
+    <glyph glyph-name="swatchbook" unicode="&#xf5c3;" 
+d="M434.66 280.29c5.77344 -5.79004 9.34473 -13.7861 9.34473 -22.5996c0 -8.81445 -3.57129 -16.8008 -9.34473 -22.5908l-210.66 -211.1v271.12l75.4297 75.5195l0.0703125 0.0703125v0c5.75781 5.73633 13.707 9.28516 22.4688 9.28516
+c8.79883 0 16.7676 -3.57715 22.5312 -9.35547l90.1602 -90.3496v0zM480 128c17.6611 0 32 -14.3389 32 -32v-128c0 -17.6611 -14.3389 -32 -32 -32h-300c2.17969 1.91016 4.62012 3.41992 6.67969 5.49023l186.41 186.51h106.91zM192 416v-384
+c0 -52.9834 -43.0166 -96 -96 -96s-96 43.0166 -96 96v384c0 17.6611 14.3389 32 32 32h128c17.6611 0 32 -14.3389 32 -32zM96 8c13.2461 0 24 10.7539 24 24s-10.7539 24 -24 24s-24 -10.7539 -24 -24s10.7539 -24 24 -24zM128 192v64h-64v-64h64zM128 320v64h-64v-64h64z
+" />
+    <glyph glyph-name="swimmer" unicode="&#xf5c4;" horiz-adv-x="640" 
+d="M189.61 137.42c-5.04004 4.65039 -10.3906 8.34961 -15.8604 11.5801l68.6299 98.04c7.36035 10.5 16.3398 19.5498 26.7197 26.9404l80.0205 57.1699c25.54 18.2598 57.8301 24.96 88.5596 18.3799l100.351 -21.5303c25.9297 -5.55957 42.4297 -31.0801 36.8799 -57
+c-5.56055 -25.9102 -31.0898 -42.4102 -57 -36.8799l-100.351 21.5303c-4.33984 0.90918 -8.97949 -0.0302734 -12.6191 -2.61035l-18 -12.8604l112.84 -80.5996c-17.5107 -1.04004 -34.5303 -8.4502 -49.3906 -22.1602
+c-3.5293 -3.25977 -15.2695 -9.41992 -34.3896 -9.41992s-30.8496 6.16016 -34.3896 9.41992c-16.0107 14.7705 -34.5 22.5801 -53.46 22.5801h-16.3008c-18.96 0 -37.4395 -7.80957 -53.46 -22.5801c-3.5293 -3.25977 -15.2695 -9.41992 -34.3896 -9.41992
+s-30.8496 6.16016 -34.3896 9.41992zM624 96c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-16c-38.6201 0 -72.7197 12.1797 -96 31.8398c-23.2803 -19.6494 -57.3799 -31.8398 -96 -31.8398s-72.7197 12.1797 -96 31.8398
+c-23.2803 -19.6494 -57.3799 -31.8398 -96 -31.8398s-72.7197 12.1797 -96 31.8398c-23.2803 -19.6494 -57.3799 -31.8398 -96 -31.8398h-16c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h16c26.04 0 45.7998 8.41992 56.0703 17.9004
+c8.89941 8.20996 19.6602 14.0996 31.7695 14.0996h16.2998c12.1104 0 22.8701 -5.88965 31.7705 -14.0996c10.29 -9.48047 30.0498 -17.9004 56.0898 -17.9004s45.7998 8.41992 56.0703 17.9004c8.89941 8.20996 19.6602 14.0996 31.7695 14.0996h16.2998
+c12.1104 0 22.8701 -5.88965 31.7705 -14.0996c10.29 -9.48047 30.0498 -17.9004 56.0898 -17.9004s45.7998 8.41992 56.0703 17.9004c8.89941 8.20996 19.6602 14.0996 31.7695 14.0996h16.2998c12.1104 0 22.8701 -5.88965 31.7705 -14.0996
+c10.29 -9.48047 30.0498 -17.9004 56.0898 -17.9004h16zM112 192c-44.1797 0 -80 35.8203 -80 80s35.8203 80 80 80s80 -35.8203 80 -80s-35.8203 -80 -80 -80z" />
+    <glyph glyph-name="swimming-pool" unicode="&#xf5c5;" horiz-adv-x="640" 
+d="M624 32c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-16c-38.6201 0 -72.7197 12.1797 -96 31.8398c-23.2803 -19.6494 -57.3799 -31.8398 -96 -31.8398s-72.7197 12.1797 -96 31.8398c-23.2803 -19.6494 -57.3799 -31.8398 -96 -31.8398
+s-72.7197 12.1797 -96 31.8398c-23.2803 -19.6494 -57.3799 -31.8398 -96 -31.8398h-16c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h16c26.04 0 45.7998 8.41992 56.0703 17.9004c8.89941 8.20996 19.6602 14.0996 31.7695 14.0996h16.2998
+c12.1104 0 22.8701 -5.88965 31.7705 -14.0996c10.29 -9.48047 30.0498 -17.9004 56.0898 -17.9004s45.7998 8.41992 56.0703 17.9004c8.89941 8.20996 19.6602 14.0996 31.7695 14.0996h16.2998c12.1104 0 22.8701 -5.88965 31.7705 -14.0996
+c10.29 -9.48047 30.0498 -17.9004 56.0898 -17.9004s45.7998 8.41992 56.0703 17.9004c8.89941 8.20996 19.6602 14.0996 31.7695 14.0996h16.2998c12.1104 0 22.8701 -5.88965 31.7705 -14.0996c10.29 -9.48047 30.0498 -17.9004 56.0898 -17.9004h16zM224 64
+c-19.1201 0 -30.8604 6.16016 -34.3896 9.42969c-9.16992 8.4502 -19.2002 14.3398 -29.6104 18.0703v228.5c0 52.9404 43.0596 96 96 96s96 -43.0596 96 -96v-16c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v16c0 17.6396 -14.3604 32 -32 32
+s-32 -14.3604 -32 -32v-96h192v96c0 52.9404 43.0596 96 96 96s96 -43.0596 96 -96v-16c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v16c0 17.6396 -14.3604 32 -32 32s-32 -14.3604 -32 -32v-228.51
+c-10.4102 -3.73047 -20.4404 -9.61035 -29.6104 -18.0703c-3.5293 -3.25977 -15.2695 -9.41992 -34.3896 -9.41992v96h-192v-96z" />
+    <glyph glyph-name="tint-slash" unicode="&#xf5c7;" horiz-adv-x="640" 
+d="M633.82 -10.0996c6.97949 -5.43066 8.22949 -15.4805 2.81934 -22.4502l-19.6396 -25.2705c-5.42969 -6.97949 -15.4805 -8.23926 -22.46 -2.80957l-588.36 454.729c-6.97949 5.43066 -8.22949 15.4805 -2.80957 22.4502l19.6396 25.2705
+c5.41992 6.97949 15.4805 8.22949 22.46 2.80957l186.82 -144.399c21.6201 33.7197 42.9697 73.3398 58.4902 125.68c9 30.1201 50.5 28.7803 58.4395 0c46.9902 -158.48 146.78 -200.061 146.78 -311.82c0 -5.70996 -0.509766 -11.2998 -1.03027 -16.8701zM144 114.09
+c0 29.7803 7.30957 54.6299 18.7197 78.1299l273.681 -211.52c-31.0303 -27.7402 -71.6904 -44.7002 -116.4 -44.7002c-97.2803 0 -176 79.6504 -176 178.09z" />
+    <glyph glyph-name="tired" unicode="&#xf5c8;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM281.8 250.3c-7.7002 -4.7002 -7.7002 -15.8994 0 -20.5996l80 -48c11.5 -6.7998 24.1006 7.59961 15.4004 18l-33.6006 40.2998l33.6006 40.2998
+c8.59961 10.2998 -3.7998 24.9004 -15.4004 18zM118.8 280.3l33.6006 -40.2998l-33.6006 -40.2998c-8.59961 -10.4004 3.90039 -24.7998 15.4004 -18l80 48c7.7998 4.7002 7.7998 15.8994 0 20.5996l-80 48c-11.6006 6.90039 -24 -7.7002 -15.4004 -18zM248 160
+c-51.9004 0 -115.3 -43.7998 -123.2 -106.7c-1.7002 -13.3994 7.90039 -24.5996 17.7002 -20.3994c25.9004 11.0996 64.4004 17.3994 105.5 17.3994s79.5996 -6.2998 105.5 -17.3994c9.7002 -4.2002 19.4004 6.7998 17.7002 20.3994
+c-7.90039 62.9004 -71.2998 106.7 -123.2 106.7z" />
+    <glyph glyph-name="tooth" unicode="&#xf5c9;" horiz-adv-x="448" 
+d="M443.98 351.75c10.1299 -41.6299 0.419922 -80.8203 -21.5303 -110.43c-23.3604 -31.5703 -32.6807 -68.6504 -36.29 -107.351c-4.41016 -47.1602 -10.3301 -94.1699 -20.9404 -140.319l-7.7998 -33.9502c-3.18945 -13.8701 -15.4902 -23.7002 -29.6699 -23.7002
+c-13.9697 0 -26.1504 9.5498 -29.54 23.1602l-34.4697 138.42c-4.56055 18.3096 -20.96 31.1602 -39.7598 31.1602c-18.8008 0 -35.2002 -12.8398 -39.7607 -31.1602l-34.4697 -138.42c-3.38965 -13.6104 -15.5703 -23.1602 -29.54 -23.1602
+c-14.1797 0 -26.4795 9.83008 -29.6699 23.7002l-7.7998 33.9502c-10.6104 46.1592 -16.54 93.1592 -20.9404 140.319c-3.60938 38.6904 -12.9297 75.7803 -36.29 107.351c-21.9199 29.6201 -31.6299 68.8096 -21.5 110.43c11.0098 45.2197 47.1104 82.0498 92.0098 93.7197
+c23.4307 6.08984 46.1104 0.540039 66.8105 -10.3096l100.51 -64.6201c7.83984 -5.05957 17.6504 -2.15039 22.1104 4.7998c4.78027 7.44043 2.62012 17.3398 -4.7998 22.1104l-28.3203 18.21c3.54004 1.75 7.25 3.08984 10.5 5.47949
+c26.1396 19.2305 56.9502 32.6904 89.1396 24.3301c44.9004 -11.6602 81 -48.5 92.0107 -93.7197z" />
+    <glyph glyph-name="umbrella-beach" unicode="&#xf5ca;" horiz-adv-x="640" 
+d="M115.38 311.1c-10.0801 3.66992 -14.1104 16.3203 -7.41992 24.7207c59.75 74.8398 152.65 116.689 248.53 111.8c-52.79 -29.4102 -103.811 -92.1602 -139 -173.7zM247.63 262.94c44.4902 101.979 114.74 171.14 172.76 171.149c7.95996 0 15.6904 -1.2998 23.0908 -4
+c61.3291 -22.3203 78.3896 -132.6 42.6299 -253.979zM521.48 387.5c76.5293 -57.9199 120.76 -149.67 118.439 -245.36c-0.259766 -10.7393 -11.4795 -17.8398 -21.5703 -14.1699l-102.619 37.3604c17.5293 58.75 24.6895 117.09 18.9492 166.979
+c-2.37012 20.5908 -6.97949 38.8906 -13.1992 55.1904zM560 0.0195312c8.83984 0 16 -7.15918 16 -16v-32.0098c0 -8.83984 -7.16016 -16.0098 -16 -16.0098h-544c-8.83984 0 -16 7.16992 -16 16.0098v32.0098c0 8.85059 7.16016 16.0107 16 16.0107h236.96l72.9004 200.37
+l60.1396 -21.9004l-64.9404 -178.48h238.94z" />
+    <glyph glyph-name="vector-square" unicode="&#xf5cb;" 
+d="M512 320c0 -17.6699 -14.3301 -32 -32 -32v-192c17.6699 0 32 -14.3301 32 -32v-96c0 -17.6699 -14.3301 -32 -32 -32h-96c-17.6699 0 -32 14.3301 -32 32h-192c0 -17.6699 -14.3301 -32 -32 -32h-96c-17.6699 0 -32 14.3301 -32 32v96c0 17.6699 14.3301 32 32 32v192
+c-17.6699 0 -32 14.3301 -32 32v96c0 17.6699 14.3301 32 32 32h96c17.6699 0 32 -14.3301 32 -32h192c0 17.6699 14.3301 32 32 32h96c17.6699 0 32 -14.3301 32 -32v-96zM416 384v-32h32v32h-32zM64 384v-32h32v32h-32zM96 0v32h-32v-32h32zM448 0v32h-32v-32h32zM416 96
+v192h-32c-17.6699 0 -32 14.3301 -32 32v32h-192v-32c0 -17.6699 -14.3301 -32 -32 -32h-32v-192h32c17.6699 0 32 -14.3301 32 -32v-32h192v32c0 17.6699 14.3301 32 32 32h32z" />
+    <glyph glyph-name="weight-hanging" unicode="&#xf5cd;" 
+d="M510.28 2.13965c8.33008 -33.3096 -14.6602 -66.1396 -46.2998 -66.1396h-415.95c-31.6504 0 -54.6406 32.8301 -46.3105 66.1396l73.0498 292.13c3.79004 15.1807 16.4404 25.7207 30.8701 25.7207h60.25c-3.58008 10.0498 -5.87988 20.7197 -5.87988 32
+c0 53.0195 42.9805 96 96 96c53.0205 0 96 -42.9805 96 -96c0 -11.2803 -2.30957 -21.9502 -5.87988 -32h60.25c14.4297 0 27.0703 -10.5303 30.8701 -25.7207zM256 320c17.6396 0 32 14.3604 32 32s-14.3604 32 -32 32s-32 -14.3604 -32 -32s14.3604 -32 32 -32z" />
+    <glyph glyph-name="wine-glass-alt" unicode="&#xf5ce;" horiz-adv-x="288" 
+d="M216 -16c22.0898 0 40 -17.9102 40 -40c0 -4.41992 -3.58008 -8 -8 -8h-208c-4.41992 0 -8 3.58008 -8 8c0 22.0898 17.9102 40 40 40h40v117.18c-68.4697 15.8906 -118.05 79.9102 -111.4 154.16l15.96 178.11c0.730469 8.24023 7.55078 14.5498 15.7002 14.5498h223.48
+c8.16016 0 14.9697 -6.30957 15.71 -14.5498l15.9502 -178.101c6.64941 -74.25 -42.9307 -138.27 -111.4 -154.159v-117.19h40zM61.75 400l-7.16992 -80h178.84l-7.16992 80h-164.5z" />
+    <glyph glyph-name="air-freshener" unicode="&#xf5d0;" 
+d="M224 288c53 0 96 -43 96 -96v-224c0 -17.625 -14.375 -32 -32 -32h-256c-17.625 0 -32 14.375 -32 32v224c0 53 43 96 96 96h128zM160 32c44.125 0 80 35.875 80 80s-35.875 80 -80 80s-80 -35.875 -80 -80s35.875 -80 80 -80zM224 416v-96h-128v96
+c0 17.625 14.375 32 32 32h64c17.625 0 32 -14.375 32 -32zM381.781 396.422l-29.7812 -12.4219l-12.4385 -29.7812c-0.592773 -1.21875 -2.18652 -2.21875 -3.56152 -2.21875s-2.96875 1 -3.59375 2.21875l-12.4062 29.7812l-29.7812 12.4219
+c-1.21875 0.609375 -2.21875 2.21875 -2.21875 3.57812c0 1.375 1 2.96875 2.21875 3.57812l29.7812 12.4219l12.4062 29.7812c0.625 1.21875 2.21875 2.21875 3.59375 2.21875s2.96875 -1 3.56152 -2.21875l12.4385 -29.7812l29.7812 -12.4219
+c1.21875 -0.609375 2.21875 -2.20312 2.21875 -3.57812c0 -1.35938 -1 -2.96875 -2.21875 -3.57812zM448 384l-29.7812 12.4219c-1.21875 0.609375 -2.21875 2.21875 -2.21875 3.57812c0 1.375 1 2.96875 2.21875 3.57812l29.7812 12.4219l12.4062 29.7812
+c0.625 1.21875 2.21875 2.21875 3.59375 2.21875s2.96875 -1 3.56152 -2.21875l12.4385 -29.7812l29.7812 -12.4219c1.21875 -0.609375 2.21875 -2.20312 2.21875 -3.57812c0 -1.35938 -1 -2.96875 -2.21875 -3.57812l-29.7812 -12.4219l-12.4385 -29.7812
+c-0.592773 -1.21875 -2.18652 -2.21875 -3.56152 -2.21875s-2.96875 1 -3.59375 2.21875zM480 224l29.7812 -12.4219c1.21875 -0.609375 2.21875 -2.20312 2.21875 -3.57812c0 -1.35938 -1 -2.96875 -2.21875 -3.57812l-29.7812 -12.4219l-12.4385 -29.7812
+c-0.592773 -1.21875 -2.18652 -2.21875 -3.56152 -2.21875s-2.96875 1 -3.59375 2.21875l-12.4062 29.7812l-29.7812 12.4219c-1.21875 0.609375 -2.21875 2.21875 -2.21875 3.57812c0 1.375 1 2.96875 2.21875 3.57812l29.7812 12.4219l12.4062 29.7812
+c0.625 1.21875 2.21875 2.21875 3.59375 2.21875s2.96875 -1 3.56152 -2.21875zM445.781 300.422l-29.7812 -12.4219l-12.4385 -29.7812c-0.592773 -1.21875 -2.18652 -2.21875 -3.56152 -2.21875s-2.96875 1 -3.59375 2.21875l-12.4062 29.7812l-29.7812 12.4219
+c-1.21875 0.609375 -2.21875 2.21875 -2.21875 3.57812c0 1.375 1 2.96875 2.21875 3.57812l29.7812 12.4219l12.4062 29.7812c0.625 1.21875 2.21875 2.21875 3.59375 2.21875s2.96875 -1 3.56152 -2.21875l12.4385 -29.7812l29.7812 -12.4219
+c1.21875 -0.609375 2.21875 -2.20312 2.21875 -3.57812c0 -1.35938 -1 -2.96875 -2.21875 -3.57812z" />
+    <glyph glyph-name="apple-alt" unicode="&#xf5d1;" horiz-adv-x="448" 
+d="M350.85 319c25.9707 -4.66992 47.2705 -18.6699 63.9199 -42c14.6504 -20.6699 24.6406 -46.6699 29.9609 -78c4.66992 -28.6699 4.31934 -57.3301 -1 -86c-7.99023 -47.3301 -23.9707 -87 -47.9404 -119c-28.6396 -38.6699 -64.5898 -58 -107.87 -58
+c-10.6602 0 -22.2998 3.33008 -34.96 10c-8.66016 5.33008 -18.3096 8 -28.9697 8s-20.2998 -2.66992 -28.9707 -8c-12.6592 -6.66992 -24.2998 -10 -34.96 -10c-43.2793 0 -79.2295 19.3301 -107.869 58c-23.9707 32 -39.9502 71.6699 -47.9404 119
+c-5.32031 28.6699 -5.66992 57.3301 -1 86c5.32031 31.3301 15.3096 57.3301 29.96 78c16.6504 23.3301 37.9502 37.3301 63.9199 42c15.9805 2.66992 37.9502 0.330078 65.9199 -7c23.9697 -6.66992 44.2803 -14.6699 60.9307 -24
+c16.6494 9.33008 36.96 17.3301 60.9297 24c27.9795 7.33008 49.96 9.66992 65.9395 7zM295.91 360c-9.32031 -8.66992 -21.6504 -15 -36.96 -19c-10.6602 -3.33008 -22.2998 -5 -34.96 -5l-14.9805 1c-1.33008 9.33008 -1.33008 20 0 32
+c2.66992 24 10.3203 42.3301 22.9707 55c9.31934 8.66992 21.6494 15 36.96 19c10.6592 3.33008 22.2998 5 34.96 5l14.9795 -1l1 -15c0 -12.6699 -1.66992 -24.3301 -4.99023 -35c-3.98926 -15.3301 -10.3096 -27.6699 -18.9795 -37z" />
+    <glyph glyph-name="atom" unicode="&#xf5d2;" horiz-adv-x="448" 
+d="M223.999 224c17.6484 -0.03125 31.9727 -14.3525 32.0078 -32c0 -17.6611 -14.3389 -32 -32 -32s-32 14.3389 -32 32c0 17.6582 14.335 31.9961 31.9922 32zM438.171 320c16.3789 -29.375 15.0039 -73.125 -25.1309 -128c40.1348 -54.875 41.5098 -98.625 25.1309 -128
+c-29.1309 -52.375 -101.646 -43.625 -116.275 -41.875c-21.5039 -51.25 -54.2617 -86.125 -97.8965 -86.125s-76.3906 34.875 -97.8965 86.125c-14.627 -1.75 -87.1426 -10.5 -116.273 41.875c-16.3789 29.375 -15.0039 73.125 25.1289 128
+c-40.1328 54.875 -41.5078 98.625 -25.1289 128c10.877 19.5 40.5078 50.625 116.273 41.875c21.5059 51.25 54.2617 86.125 97.8965 86.125s76.3926 -34.875 97.8965 -86.125c75.7656 8.875 105.398 -22.375 116.275 -41.875zM63.3389 96
+c3.75195 -6.625 19.0059 -11.875 43.6348 -11c-2.75 13 -5.125 26.375 -6.75 40.125c-7.75195 6.25 -15.0039 12.625 -21.8809 19.125c-15.1289 -23.5 -19.0039 -41 -15.0039 -48.25zM100.224 258.875c1.625 13.5 3.875 26.875 6.75 40.25c-1.875 0 -4 0.375 -5.75 0.375
+c-21.5059 0 -34.5078 -5.375 -37.8848 -11.5c-4 -7.25 -0.125 -24.75 15.0039 -48.25c6.87695 6.5 14.1289 12.875 21.8809 19.125zM223.999 384c-9.50195 0 -22.2539 -13.5 -33.8828 -37.25c11.2539 -3.75 22.5059 -8 33.8828 -12.875
+c11.3789 4.875 22.6309 9.125 33.8828 12.875c-11.627 23.75 -24.3809 37.25 -33.8828 37.25zM223.999 0c9.50195 0 22.2559 13.5 33.8828 37.25c-11.252 3.75 -22.5039 8 -33.8828 12.875c-11.377 -4.875 -22.6289 -9.125 -33.8828 -12.875
+c11.6289 -23.75 24.3809 -37.25 33.8828 -37.25zM223.999 112c44.1533 0 80 35.8467 80 80s-35.8467 80 -80 80s-80 -35.8467 -80 -80s35.8467 -80 80 -80zM384.659 96c4 7.25 0.125 24.75 -15.0039 48.25c-6.875 -6.5 -14.127 -12.875 -21.8789 -19.125
+c-1.625 -13.75 -4 -27.125 -6.75195 -40.125c24.6309 -0.875 40.0098 4.375 43.6348 11zM369.655 239.75c15.1289 23.5 19.0039 41 15.0039 48.25c-3.375 6.125 -16.3789 11.5 -37.8828 11.5c-1.75 0 -3.87695 -0.375 -5.75195 -0.375
+c2.87695 -13.375 5.12695 -26.75 6.75195 -40.25c7.75195 -6.25 15.0039 -12.625 21.8789 -19.125z" />
+    <glyph glyph-name="bone" unicode="&#xf5d7;" horiz-adv-x="640" 
+d="M598.88 203.44c-9.42969 -4.70996 -9.42969 -18.1709 -0.00976562 -22.8809c25.2002 -12.5996 41.1201 -38.3496 41.1201 -66.5293v-7.64062c0 -41.0898 -33.2998 -74.3896 -74.3799 -74.3896c-32.0107 0 -60.4404 20.4902 -70.5703 50.8604
+c-6.53027 19.5996 -10.7305 45.1396 -38.1104 45.1396h-273.87c-26.5098 0 -30.4297 -22.1104 -38.1094 -45.1396c-10.1299 -30.3701 -38.5498 -50.8604 -70.5703 -50.8604c-41.0801 0 -74.3799 33.2998 -74.3799 74.3896v7.64062
+c0 28.1699 15.9199 53.9297 41.1201 66.5293c9.42969 4.70996 9.42969 18.1709 0 22.8809c-25.2002 12.5996 -41.1201 38.3594 -41.1201 66.5293v7.64062c0 41.0898 33.2998 74.3896 74.3896 74.3896c32.0107 0 60.4404 -20.4902 70.5605 -50.8604
+c6.53027 -19.5996 10.7295 -45.1396 38.1094 -45.1396h273.87c26.5107 0 30.4307 22.1104 38.1104 45.1396c10.1299 30.3701 38.5498 50.8604 70.5703 50.8604c41.0898 0 74.3896 -33.2998 74.3896 -74.3896v-7.64062c0 -28.1699 -15.9199 -53.9297 -41.1201 -66.5293z" />
+    <glyph glyph-name="book-reader" unicode="&#xf5da;" 
+d="M352 352c0 -53.0195 -42.9805 -96 -96 -96s-96 42.9805 -96 96s42.9805 96 96 96s96 -42.9805 96 -96zM233.59 206.9c4.10059 -2.51074 6.41016 -6.79004 6.41992 -11.46v-245.99c0 -10.1602 -11.1094 -16.5898 -20.4795 -11.8701
+c-61.0498 30.75 -149.38 39.1396 -193.04 41.4297c-14.9004 0.770508 -26.4902 12.7207 -26.4902 27.0498v222.801c0 15.6299 13.5498 28.0098 29.7998 27.0898c48.3604 -2.75 144.46 -12.7305 203.79 -49.0498zM482.2 255.95
+c16.25 0.919922 29.7998 -11.46 29.8096 -27.0898v-222.82c0 -14.3301 -11.5898 -26.2803 -26.4902 -27.0596c-43.6494 -2.29004 -131.93 -10.6807 -192.97 -41.4004c-9.39941 -4.73047 -20.54 1.70996 -20.54 11.9004v245.789c0 4.6709 2.31055 9.12012 6.41016 11.6309
+c59.3203 36.3193 155.43 46.3096 203.78 49.0498z" />
+    <glyph glyph-name="brain" unicode="&#xf5dc;" horiz-adv-x="576" 
+d="M208 448c35.2998 0 64 -28.7002 64 -64v-376c0 -39.7998 -32.2002 -72 -72 -72c-31.7998 0 -58.4004 20.7002 -68 49.2002c-3.90039 -0.700195 -7.90039 -1.2002 -12 -1.2002c-39.7998 0 -72 32.2002 -72 72c0 4.7998 0.5 9.5 1.40039 14.0996
+c-29 12 -49.4004 40.6006 -49.4004 73.9004c0 29.7002 16.2998 55.2998 40.2998 69.0996c-5.09961 10.6006 -8.2998 22.3008 -8.2998 34.9004c0 33.4004 20.5 62 49.7002 74c-1.10059 4.5 -1.7002 9.2002 -1.7002 14c0 35.2998 28.7002 64 64 64
+c0.799805 0 1.40039 -0.200195 2.2002 -0.200195c7.09961 27.7002 31.8994 48.2002 61.7998 48.2002zM576 144c0 -33.2998 -20.4004 -61.9004 -49.4004 -73.9004c0.900391 -4.59961 1.40039 -9.2998 1.40039 -14.0996c0 -39.7998 -32.2002 -72 -72 -72
+c-4.09961 0 -8.09961 0.5 -12 1.2002c-9.59961 -28.5 -36.2002 -49.2002 -68 -49.2002c-39.7998 0 -72 32.2002 -72 72v376c0 35.4004 28.7002 64 64 64c29.9004 0 54.7002 -20.5 61.7998 -48.2002c0.700195 0 1.40039 0.200195 2.2002 0.200195
+c35.2998 0 64 -28.7002 64 -64c0 -4.7998 -0.700195 -9.5 -1.7002 -14c29.2002 -12 49.7002 -40.5996 49.7002 -74c0 -12.5996 -3.09961 -24.2998 -8.2998 -34.9004c24 -13.7998 40.2998 -39.3994 40.2998 -69.0996z" />
+    <glyph glyph-name="car-alt" unicode="&#xf5de;" horiz-adv-x="480" 
+d="M438.66 235.67c24.1201 -9.16992 41.3398 -32.3301 41.3398 -59.6699v-48c0 -16.1299 -6.16016 -30.6797 -16 -41.9297v-54.0703c0 -17.6699 -14.3301 -32 -32 -32h-32c-17.6699 0 -32 14.3301 -32 32v32h-256v-32c0 -17.6699 -14.3301 -32 -32 -32h-32
+c-17.6699 0 -32 14.3301 -32 32v54.0703c-9.83984 11.2598 -16 25.8096 -16 41.9297v48c0 27.3398 17.2197 50.5 41.3398 59.6699l11.2402 28.0996l19.9297 49.8301c17.1104 42.7705 57.9307 70.4004 103.99 70.4004h127c46.0703 0 86.8799 -27.6299 103.99 -70.4004
+l19.9297 -49.8301zM131.93 289.83l-19.9297 -49.8301h256l-19.9297 49.8301c-7.29004 18.2197 -24.9404 30.1699 -44.5703 30.1699h-127c-19.6299 0 -37.2803 -11.9502 -44.5703 -30.1699zM80 128.2c19.2002 0 48 -3.19043 48 15.9502
+c0 19.1396 -28.7998 47.8496 -48 47.8496s-32 -12.7598 -32 -31.9004c0 -19.1396 12.7998 -31.8994 32 -31.8994zM400 128.2c19.2002 0 32 12.7598 32 31.8994c0 19.1406 -12.7998 31.9004 -32 31.9004s-48 -28.71 -48 -47.8496c0 -19.1406 28.7998 -15.9502 48 -15.9502z
+" />
+    <glyph glyph-name="car-battery" unicode="&#xf5df;" 
+d="M480 320c17.6699 0 32 -14.3301 32 -32v-256c0 -17.6699 -14.3301 -32 -32 -32h-448c-17.6699 0 -32 14.3301 -32 32v256c0 17.6699 14.3301 32 32 32h32v48c0 8.83984 7.16016 16 16 16h96c8.83984 0 16 -7.16016 16 -16v-48h128v48c0 8.83984 7.16016 16 16 16h96
+c8.83984 0 16 -7.16016 16 -16v-48h32zM192 184v16c0 4.41992 -3.58008 8 -8 8h-112c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h112c4.41992 0 8 3.58008 8 8zM448 184v16c0 4.41992 -3.58008 8 -8 8h-40v40c0 4.41992 -3.58008 8 -8 8h-16
+c-4.41992 0 -8 -3.58008 -8 -8v-40h-40c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h40v-40c0 -4.41992 3.58008 -8 8 -8h16c4.41992 0 8 3.58008 8 8v40h40c4.41992 0 8 3.58008 8 8z" />
+    <glyph glyph-name="car-crash" unicode="&#xf5e1;" horiz-adv-x="640" 
+d="M143.25 227.19l-12.4199 -46.3701c-3.00977 -11.25 -3.62988 -22.8906 -2.41016 -34.3906l-35.2002 -28.9795c-6.56934 -5.41016 -16.3096 0.429688 -14.6201 8.76953l15.4404 76.6807c1.05957 5.25977 -2.66016 10.2793 -8 10.79l-77.8604 7.5498
+c-8.46973 0.819336 -11.2295 11.8301 -4.13965 16.54l65.1504 43.2998c4.45996 2.96973 5.37988 9.15039 1.97949 13.29l-49.71 60.4102c-5.41016 6.56934 0.429688 16.2998 8.78027 14.6201l76.6797 -15.4404c5.25977 -1.05957 10.2803 2.66016 10.7998 8l7.5498 77.8604
+c0.820312 8.47949 11.8301 11.2295 16.5508 4.13965l43.2998 -65.1396c2.96973 -4.45996 9.14941 -5.37988 13.29 -1.98047l60.3994 49.71c6.57031 5.41016 16.3008 -0.429688 14.6201 -8.76953l-11.3301 -56.1602c-2.70996 -3.0498 -5.42969 -6.08984 -7.90918 -9.40039
+l-32.1504 -42.9697l-10.71 -14.3203c-32.7305 -8.75977 -59.1797 -34.5293 -68.0801 -67.7393zM637.82 94.6797l-12.4199 -46.3594c-3.13086 -11.6807 -9.38086 -21.6104 -17.5508 -29.3604c-2.72852 -2.58398 -5.62695 -4.90137 -8.75977 -7l-13.9902 -52.2295
+c-1.13965 -4.27051 -3.09961 -8.10059 -5.64941 -11.3809c-7.66992 -9.83984 -20.7402 -14.6797 -33.54 -11.25l-30.9102 8.28027c-17.0703 4.57031 -27.2002 22.1201 -22.6299 39.1904l8.28027 30.9102l-247.28 66.2598l-8.28027 -30.9102
+c-4.57031 -17.0703 -22.1201 -27.2002 -39.1895 -22.6299l-30.9102 8.28027c-12.7998 3.42969 -21.7002 14.1592 -23.4199 26.5098c-0.570312 4.12012 -0.350586 8.41992 0.790039 12.6797l13.9893 52.2305c-1.63086 3.31445 -3.02148 6.85352 -4.08984 10.4492
+c-3.2002 10.79 -3.64941 22.5205 -0.519531 34.2002l12.4199 46.3701c5.30957 19.7998 19.3594 34.8301 36.8896 42.21c5.75 2.42285 12.0352 4.06543 18.4902 4.71973l18.1299 24.2305l32.1504 42.9697c3.44922 4.61035 7.18945 8.90039 11.1992 12.8398
+c8 7.89062 17.0303 14.4404 26.7402 19.5107c4.86035 2.54004 9.89062 4.70996 15.0498 6.48926c10.3301 3.58008 21.1904 5.62988 32.2402 6.04004s22.3105 -0.819336 33.4307 -3.7998l122.68 -32.8701c11.1201 -2.97949 21.4795 -7.54004 30.8496 -13.4297
+c14.0459 -8.81934 25.7959 -20.5068 34.6904 -34.5c8.81934 -13.8799 14.6396 -29.8398 16.6797 -46.9902l6.36035 -53.29l3.58984 -30.0498c10.3115 -7.44531 18.2578 -17.8018 22.7402 -29.9297c4.38965 -11.8799 5.29004 -25.1904 1.75 -38.3906zM255.58 213.66
+c-18.5498 4.96973 -34.21 -4.04004 -39.1699 -22.5303s4.10938 -34.1201 22.6494 -39.0898c18.5508 -4.96973 45.54 -15.5098 50.4902 2.97949c4.95996 18.4902 -15.4297 53.6709 -33.9697 58.6406zM546.19 185.49l-6.36035 53.29
+c-0.580078 4.87012 -1.88965 9.5293 -3.82031 13.8594c-5.7998 12.9902 -17.2002 23.0107 -31.4199 26.8203l-122.68 32.8701c-3.96777 1.0625 -8.13672 1.62891 -12.4375 1.62891c-15.7295 0 -29.6641 -7.53418 -38.4229 -19.2393l-32.1494 -42.9697l172 -46.0801z
+M564.68 130.84c-18.5498 4.96973 -53.7998 -15.3096 -58.75 -33.79c-4.94922 -18.4902 23.6904 -22.8594 42.2402 -27.8301c18.5498 -4.96973 34.21 4.04004 39.1699 22.5303c4.9502 18.4805 -4.10938 34.1201 -22.6602 39.0898z" />
+    <glyph glyph-name="car-side" unicode="&#xf5e4;" horiz-adv-x="640" 
+d="M544 256c53.0195 0 96 -42.9805 96 -96v-80c0 -8.83984 -7.16016 -16 -16 -16h-48c0 -53.0195 -42.9805 -96 -96 -96s-96 42.9805 -96 96h-128c0 -53.0195 -42.9805 -96 -96 -96s-96 42.9805 -96 96h-48c-8.83984 0 -16 7.16016 -16 16v112
+c0 29.79 20.4404 54.5996 48 61.7402l47.9102 122.029c9.71973 24.3008 33.25 40.2305 59.4199 40.2305h213.91c20.2227 -0.00292969 38.2441 -9.35645 49.9795 -24.0195l108.78 -135.98h16zM160 16c26.4697 0 48 21.5303 48 48s-21.5303 48 -48 48s-48 -21.5303 -48 -48
+s21.5303 -48 48 -48zM232 256v96h-76.6699l-38.4004 -96h115.07zM280 256h166.04l-76.7998 96h-89.2402v-96zM480 16c26.4697 0 48 21.5303 48 48s-21.5303 48 -48 48s-48 -21.5303 -48 -48s21.5303 -48 48 -48z" />
+    <glyph glyph-name="charging-station" unicode="&#xf5e7;" horiz-adv-x="576" 
+d="M336 0c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-320c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h320zM544 320h16c8.83984 0 16 -7.16016 16 -16v-32c0 -35.7598 -23.6201 -65.6904 -56 -75.9297v-120.07
+c0 -44.4102 -38.29 -80.0498 -83.5898 -75.6201c-39.4902 3.85059 -68.4102 39.3398 -68.4102 79.0098v24.6104c0 22.0898 -17.9102 40 -40 40h-8v-112h-288v352c0 35.3496 28.6504 64 64 64h160c35.3496 0 64 -28.6504 64 -64v-192h8c48.5996 0 88 -39.4004 88 -88v-28
+c0 -16.9902 15.2197 -30.5 32.7402 -27.6104c13.7598 2.27051 23.2598 15.2402 23.2598 29.1904v118.49c-32.3799 10.2393 -56 40.1699 -56 75.9297v32c0 8.83984 7.16016 16 16 16h16v48c0 8.83984 7.16016 16 16 16s16 -7.16016 16 -16v-48h32v48
+c0 8.83984 7.16016 16 16 16s16 -7.16016 16 -16v-48zM260.09 272.24c4.62012 6.97949 -1.14941 15.7598 -10.3896 15.7598h-57.7002l11.5996 50.79c2.02051 6.66992 -3.71973 13.21 -11.5996 13.21h-68c-6.01953 0 -11.0996 -3.90039 -11.8896 -9.11035l-16 -107
+c-0.959961 -6.2998 4.63965 -11.8896 11.8896 -11.8896h59.3496l-23.0195 -83.0801c-1.7998 -6.63965 4 -12.9199 11.6699 -12.9199c4.17969 0 8.19043 1.91016 10.3896 5.24023z" />
+    <glyph glyph-name="directions" unicode="&#xf5eb;" 
+d="M502.61 214.68c12.5195 -12.5293 12.5195 -32.8301 0 -45.3594l-223.931 -223.931c-12.5293 -12.5293 -32.8398 -12.5293 -45.3594 0l-223.931 223.931c-12.5195 12.5293 -12.5195 32.8301 0 45.3594l223.931 223.931c12.5293 12.5195 32.8398 12.5195 45.3594 0z
+M401.63 202.12c3.42969 3.16992 3.42969 8.58984 0 11.7598l-84.21 77.7305c-5.12988 4.72949 -13.4297 1.08984 -13.4297 -5.87988v-53.7305h-112c-17.6699 0 -32 -14.3301 -32 -32v-80c0 -4.41992 3.58008 -8 8 -8h32c4.41992 0 8 3.58008 8 8v64h96v-53.7305
+c0 -6.97949 8.30957 -10.6094 13.4297 -5.87988z" />
+    <glyph glyph-name="draw-polygon" unicode="&#xf5ee;" horiz-adv-x="448" 
+d="M384 96c35.3496 0 64 -28.6504 63.9902 -64c0 -35.3496 -28.6504 -64 -64 -64c-23.6299 0 -44.0303 12.9502 -55.1201 32h-209.75c-11.0801 -19.0498 -31.4902 -32 -55.1201 -32c-35.3496 0 -64 28.6504 -64 64c0 23.6299 12.9502 44.04 32 55.1299v209.75
+c-19.0498 11.0801 -32 31.4902 -32 55.1201c0 35.3496 28.6504 64 64 64c23.6299 0 44.04 -12.9502 55.1201 -32h209.76c11.0801 19.0498 31.4902 32 55.1201 32c35.3496 0 64 -28.6504 64 -64s-28.6504 -64 -64 -64c-0.349609 0 -0.669922 0.0898438 -1.01953 0.0996094
+l-39.2002 -65.3193c5.08008 -9.16992 8.21973 -19.5605 8.21973 -30.7803s-3.15039 -21.6104 -8.21973 -30.7803l39.2002 -65.3193c0.349609 0 0.669922 0.0996094 1.01953 0.0996094zM96 87.1201c9.61816 -5.58398 17.5361 -13.502 23.1201 -23.1201h208.36
+l-38.4609 64.0996c-0.349609 0 -0.669922 -0.0996094 -1.01953 -0.0996094c-35.3496 0 -64 28.6504 -64 64s28.6504 64 64 64c0.349609 0 0.669922 -0.0898438 1.01953 -0.0996094l38.4609 64.0996h-208.36c-5.58691 -9.61523 -13.5049 -17.5332 -23.1201 -23.1201v-209.76z
+M272 192c0 -8.82031 7.17969 -16 16 -16s16 7.17969 16 16s-7.17969 16 -16 16s-16 -7.17969 -16 -16zM400 352c0 8.82031 -7.17969 16 -16 16s-16 -7.17969 -16 -16s7.17969 -16 16 -16s16 7.17969 16 16zM64 368c-8.82031 0 -16 -7.17969 -16 -16s7.17969 -16 16 -16
+s16 7.17969 16 16s-7.17969 16 -16 16zM48 32c0 -8.82031 7.17969 -16 16 -16s16 7.17969 16 16s-7.17969 16 -16 16s-16 -7.17969 -16 -16zM384 16c8.82031 0 16 7.17969 16 16s-7.17969 16 -16 16s-16 -7.17969 -16 -16s7.17969 -16 16 -16z" />
+    <glyph glyph-name="laptop-code" unicode="&#xf5fc;" horiz-adv-x="640" 
+d="M255.03 186.35l-58.3506 58.3408c-6.25 6.25 -6.25 16.3799 0 22.6299l58.3398 58.3398c6.25 6.25 16.3809 6.25 22.6309 0l11.3096 -11.3105c6.25 -6.25 6.25 -16.3799 0 -22.6299l-35.71 -35.7197l35.7197 -35.71c6.25 -6.25 6.25 -16.3799 0 -22.6299
+l-11.3096 -11.3105c-6.25 -6.25 -16.3799 -6.25 -22.6299 0zM351.04 197.65c-6.25 6.25 -6.25 16.3799 0 22.6299l35.71 35.7197l-35.71 35.71c-6.25 6.25 -6.25 16.3799 0 22.6299l11.3096 11.3105c6.25 6.25 16.3809 6.25 22.6309 0l58.3398 -58.3408
+c6.25 -6.25 6.25 -16.3799 0 -22.6299l-58.3398 -58.3398c-6.25 -6.25 -16.3809 -6.25 -22.6309 0zM624 32c8.7998 0 16 -7.2002 16 -16v-16c0 -35.2002 -28.7998 -64 -64 -64h-512c-35.2002 0 -64 28.7998 -64 64v16c0 8.7998 7.2002 16 16 16h239.23
+c-0.25 -14.5303 14.0791 -32 32.7695 -32h60.7998c18.0303 0 32 12.1904 32.7402 32h242.46zM576 400v-336h-512v336c0 26.4004 21.5996 48 48 48h416c26.4004 0 48 -21.5996 48 -48zM512 128v256h-384v-256h384z" />
+    <glyph glyph-name="layer-group" unicode="&#xf5fd;" 
+d="M12.4102 299.98c-16.5498 7.50977 -16.5498 32.5293 0 40.0391l232.95 105.671c3.23633 1.47949 6.87695 2.30371 10.666 2.30371s7.38672 -0.824219 10.624 -2.30371l232.93 -105.681c16.5498 -7.50977 16.5498 -32.5195 0 -40.0293l-232.94 -105.671
+c-6.7998 -3.08984 -14.4893 -3.08984 -21.29 0zM499.59 211.7c16.5498 -7.5 16.5498 -32.5 0 -40l-232.95 -105.59c-6.7998 -3.08008 -14.4893 -3.08008 -21.29 0l-232.939 105.59c-16.5498 7.5 -16.5498 32.5 0 40l58.0996 26.3301l161.63 -73.2705
+c7.57031 -3.42969 15.5908 -5.16992 23.8604 -5.16992s16.2998 1.74023 23.8604 5.16992l161.64 73.2705zM499.59 83.9004c16.5498 -7.5 16.5498 -32.5 0 -40l-232.95 -105.591c-6.7998 -3.0791 -14.4893 -3.0791 -21.29 0l-232.939 105.591
+c-16.5498 7.5 -16.5498 32.5 0 40l57.8799 26.2295l161.85 -73.3701c7.57031 -3.42969 15.5908 -5.16992 23.8604 -5.16992s16.2998 1.74023 23.8604 5.16992l161.859 73.3701z" />
+    <glyph glyph-name="lungs" unicode="&#xf604;" horiz-adv-x="640" 
+d="M636.11 57.8496c2.58984 -9.68945 3.88965 -19.6396 3.88965 -29.6299c0 -61.2295 -62.4805 -105.439 -125.24 -88.6201l-59.5 15.9502c-42.1797 11.3105 -71.2598 47.4697 -71.2598 88.6201v87.4902l85.8398 -57.2305
+c1.26855 -0.845703 2.79395 -1.35156 4.43164 -1.35156c2.77734 0 5.22559 1.41992 6.6582 3.57227l8.87988 13.3096c0.845703 1.26758 1.35254 2.79395 1.35254 4.43164c0 2.77734 -1.41992 5.22559 -3.57227 6.6582l-167.59 111.72l-167.59 -111.72
+c-2.15332 -1.43262 -3.55957 -3.88379 -3.55957 -6.66113c0 -1.6377 0.493164 -3.16113 1.33984 -4.42871l8.87988 -13.3096c1.43262 -2.15332 3.88379 -3.56055 6.66113 -3.56055c1.6377 0 3.16016 0.494141 4.42871 1.33984l85.8398 57.2305v-87.4902
+c0 -41.1504 -29.0801 -77.3203 -71.2598 -88.6201l-59.5 -15.9502c-62.7598 -16.8193 -125.24 27.3906 -125.24 88.6201c0 9.99023 1.2998 19.9404 3.88965 29.6299c21.6699 81.3008 56.04 159.15 102.011 231.021c22.1191 34.5703 36.0693 63.1299 80.0498 63.1299
+c38.6895 0 70.0498 -29.4199 70.0498 -65.71v-60.1104l32.8799 21.9199c4.4502 2.9707 7.12012 7.95996 7.12012 13.3105v170.59c0 8.83984 7.16016 16 16 16h16c8.83984 0 16 -7.16016 16 -16v-170.59c0 -5.55273 2.81934 -10.4414 7.12012 -13.3105l32.8799 -21.9199
+v60.1104c0 36.29 31.3604 65.71 70.0498 65.71c43.9805 0 57.9307 -28.5596 80.0498 -63.1299c45.9707 -71.8701 80.3408 -149.72 102.011 -231.021z" />
+    <glyph glyph-name="microscope" unicode="&#xf610;" 
+d="M160 128c-17.6699 0 -32 14.3301 -32 32v224c0 17.6699 14.3301 32 32 32v16c0 8.83984 7.16016 16 16 16h64c8.83984 0 16 -7.16016 16 -16v-16c17.6699 0 32 -14.3301 32 -32v-224c0 -17.6699 -14.3301 -32 -32 -32h-12v-16c0 -8.83984 -7.16016 -16 -16 -16h-40
+c-8.83984 0 -16 7.16016 -16 16v16h-12zM464 0c26.5098 0 48 -21.4902 48 -48c0 -8.83984 -7.16016 -16 -16 -16h-480c-8.83984 0 -16 7.16016 -16 16c0 26.5098 21.4902 48 48 48h272c70.5801 0 128 57.4199 128 128s-57.4199 128 -128 128v64
+c105.88 0 192 -86.1201 192 -192c0 -49.2002 -18.7598 -93.9902 -49.29 -128h1.29004zM104 32c-4.41992 0 -8 3.58008 -8 8v16c0 4.41992 3.58008 8 8 8h208c4.41992 0 8 -3.58008 8 -8v-16c0 -4.41992 -3.58008 -8 -8 -8h-208z" />
+    <glyph glyph-name="oil-can" unicode="&#xf613;" horiz-adv-x="640" 
+d="M629.8 287.69c5.11035 1.45996 10.2002 -2.38086 10.1904 -7.69043v-18.0801c0 -2.12012 -0.839844 -4.16016 -2.33984 -5.66016l-212.261 -214.75c-6.00977 -6.08984 -14.21 -9.50977 -22.7598 -9.50977h-274.63c-17.6699 0 -32 14.3301 -32 32v46.54l-69.7197 12.6904
+c-15.2207 2.75977 -26.2803 16.0195 -26.2803 31.4795v94.9502c0 17.9795 14.6699 32.0098 31.9297 32.0098c1.9873 0 3.9043 -0.181641 5.79004 -0.530273l138.28 -25.1396h56v48h-56c-8.83984 0 -16 7.16016 -16 16v16c0 8.83984 7.16016 16 16 16h160
+c8.83984 0 16 -7.16016 16 -16v-16c0 -8.83984 -7.16016 -16 -16 -16h-56v-48h56.8896c10.2598 -0.00390625 20.0205 -2.46191 28.6201 -6.75977l50.4902 -25.2402zM96 159.33v62.4297l-48 8.73047v-62.4307zM549.33 74.6699c0 23.5605 42.6699 85.3301 42.6699 85.3301
+s42.6699 -61.7598 42.6699 -85.3301s-19.0996 -42.6699 -42.6699 -42.6699s-42.6699 19.1104 -42.6699 42.6699z" />
+    <glyph glyph-name="poop" unicode="&#xf619;" 
+d="M451.36 78.8604c34.3301 -5.48047 60.6396 -34.9805 60.6396 -70.8604c0 -39.7598 -32.2402 -72 -72 -72h-368c-39.7598 0 -72 32.2402 -72 72c0 35.8799 26.3096 65.3799 60.6396 70.8604c-17.2998 13.1494 -28.6396 33.7295 -28.6396 57.1396
+c0 39.7695 32.2402 72 72 72h14.0703c-13.4199 11.7305 -22.0703 28.7803 -22.0703 48c0 35.3496 28.6504 64 64 64h16c44.1797 0 80 35.8203 80 80c0 17.3799 -5.69043 33.3604 -15.1104 46.4805c4.95996 0.779297 9.94043 1.51953 15.1104 1.51953
+c53.0195 0 96 -42.9805 96 -96c0 -11.2803 -2.30957 -21.9502 -5.87988 -32h5.87988c35.3496 0 64 -28.6504 64 -64c0 -19.2197 -8.65039 -36.2695 -22.0703 -48h14.0703c39.7598 0 72 -32.2305 72 -72c0 -23.4102 -11.3398 -43.9902 -28.6396 -57.1396z" />
+    <glyph glyph-name="shapes" unicode="&#xf61f;" 
+d="M128 192c70.6455 0 128 -57.3545 128 -128s-57.3545 -128 -128 -128s-128 57.3545 -128 128s57.3545 128 128 128zM507 246.86c14.2402 -24.3799 -3.58008 -54.8604 -32.0898 -54.8604h-213.82c-28.5098 0 -46.3301 30.4805 -32.0898 54.8604l106.93 182.85
+c6.48828 10.9688 18.3906 18.3311 32.0469 18.3311c13.6553 0 25.6055 -7.3623 32.0938 -18.3311zM480 160c17.6611 0 32 -14.3389 32 -32v-160c0 -17.6611 -14.3389 -32 -32 -32h-160c-17.6611 0 -32 14.3389 -32 32v160c0 17.6611 14.3389 32 32 32h160z" />
+    <glyph glyph-name="star-of-life" unicode="&#xf621;" horiz-adv-x="480" 
+d="M471.99 113.57c7.66016 -4.41992 10.2793 -14.2002 5.85938 -21.8506l-32.0195 -55.4297c-4.41992 -7.66016 -14.21 -10.2803 -21.8701 -5.86035l-135.93 78.4307v-156.86c0 -8.83984 -7.16992 -16 -16.0107 -16h-64.0391c-8.84082 0 -16.0107 7.16016 -16.0107 16
+v156.85l-135.93 -78.4297c-7.66016 -4.41016 -17.4502 -1.79004 -21.8701 5.86035l-32.0195 55.4297c-4.41992 7.65039 -1.80078 17.4404 5.85938 21.8604l135.931 78.4297l-135.931 78.4297c-7.66016 4.41992 -10.2793 14.21 -5.85938 21.8604l32.0195 55.4199
+c4.41992 7.65039 14.21 10.2803 21.8701 5.86035l135.93 -78.4307v156.86c0 8.83984 7.16992 16 16.0107 16h64.0391c8.84082 0 16.0107 -7.16016 16.0107 -16v-156.85l135.93 78.4297c7.66016 4.41992 17.4502 1.79004 21.8701 -5.86035l32.0195 -55.4297
+c4.41992 -7.66016 1.80078 -17.4404 -5.85938 -21.8604l-135.931 -78.4297z" />
+    <glyph glyph-name="teeth" unicode="&#xf62e;" horiz-adv-x="640" 
+d="M544 448c53.0195 0 96 -42.9805 96 -96v-320c0 -53.0195 -42.9805 -96 -96 -96h-448c-53.0195 0 -96 42.9805 -96 96v320c0 53.0195 42.9805 96 96 96h448zM160 80v64c0 8.83984 -7.16016 16 -16 16h-64c-8.83984 0 -16 -7.16016 -16 -16v-64
+c0 -26.5098 21.4902 -48 48 -48s48 21.4902 48 48zM160 208v64c0 26.5098 -21.4902 48 -48 48s-48 -21.4902 -48 -48v-64c0 -8.83984 7.16016 -16 16 -16h64c8.83984 0 16 7.16016 16 16zM304 88v56c0 8.83984 -7.16016 16 -16 16h-80c-8.83984 0 -16 -7.16016 -16 -16v-56
+c0 -30.9297 25.0703 -56 56 -56s56 25.0703 56 56zM304 208v88c0 30.9297 -25.0703 56 -56 56s-56 -25.0703 -56 -56v-88c0 -8.83984 7.16016 -16 16 -16h80c8.83984 0 16 7.16016 16 16zM448 88v56c0 8.83984 -7.16016 16 -16 16h-80c-8.83984 0 -16 -7.16016 -16 -16v-56
+c0 -30.9297 25.0703 -56 56 -56s56 25.0703 56 56zM448 208v88c0 30.9297 -25.0703 56 -56 56s-56 -25.0703 -56 -56v-88c0 -8.83984 7.16016 -16 16 -16h80c8.83984 0 16 7.16016 16 16zM576 80v64c0 8.83984 -7.16016 16 -16 16h-64c-8.83984 0 -16 -7.16016 -16 -16v-64
+c0 -26.5098 21.4902 -48 48 -48s48 21.4902 48 48zM576 208v64c0 26.5098 -21.4902 48 -48 48s-48 -21.4902 -48 -48v-64c0 -8.83984 7.16016 -16 16 -16h64c8.83984 0 16 7.16016 16 16z" />
+    <glyph glyph-name="teeth-open" unicode="&#xf62f;" horiz-adv-x="640" 
+d="M544 448c53.0195 0 96 -42.9805 96 -96v-64c0 -35.3496 -28.6602 -64 -64 -64h-512c-35.3398 0 -64 28.6504 -64 64v64c0 53.0195 42.9805 96 96 96h448zM160 272v32c0 26.5098 -21.4902 48 -48 48s-48 -21.4902 -48 -48v-32c0 -8.83984 7.16016 -16 16 -16h64
+c8.83984 0 16 7.16016 16 16zM304 272v56c0 30.9297 -25.0703 56 -56 56s-56 -25.0703 -56 -56v-56c0 -8.83984 7.16016 -16 16 -16h80c8.83984 0 16 7.16016 16 16zM448 272v56c0 30.9297 -25.0703 56 -56 56s-56 -25.0703 -56 -56v-56c0 -8.83984 7.16016 -16 16 -16h80
+c8.83984 0 16 7.16016 16 16zM576 272v32c0 26.5098 -21.4902 48 -48 48s-48 -21.4902 -48 -48v-32c0 -8.83984 7.16016 -16 16 -16h64c8.83984 0 16 7.16016 16 16zM576 128c35.3398 0 64 -28.6504 64 -64v-32c0 -53.0195 -42.9805 -96 -96 -96h-448
+c-53.0195 0 -96 42.9805 -96 96v32c0 35.3496 28.6602 64 64 64h512zM160 48v32c0 8.83984 -7.16016 16 -16 16h-64c-8.83984 0 -16 -7.16016 -16 -16v-32c0 -26.5098 21.4902 -48 48 -48s48 21.4902 48 48zM304 56v24c0 8.83984 -7.16016 16 -16 16h-80
+c-8.83984 0 -16 -7.16016 -16 -16v-24c0 -30.9297 25.0703 -56 56 -56s56 25.0703 56 56zM448 56v24c0 8.83984 -7.16016 16 -16 16h-80c-8.83984 0 -16 -7.16016 -16 -16v-24c0 -30.9297 25.0703 -56 56 -56s56 25.0703 56 56zM576 48v32c0 8.83984 -7.16016 16 -16 16h-64
+c-8.83984 0 -16 -7.16016 -16 -16v-32c0 -26.5098 21.4902 -48 48 -48s48 21.4902 48 48z" />
+    <glyph glyph-name="theater-masks" unicode="&#xf630;" horiz-adv-x="640" 
+d="M206.86 202.85l-7.62988 -43.1797c-21.0908 -7.21973 -38.5 -18.2002 -49.9004 -30.9199c-2.41992 32.9004 21.6504 63.6504 57.5303 74.0996zM95.8096 153c5.87012 -33.1699 64.3203 -71.8096 111.931 -84.79c10.5596 -27.0996 25.9795 -50.5 39.5 -67.5801
+c-3.25977 -0.339844 -6.41992 -0.799805 -10.0098 -0.799805c-68.1201 0 -190.221 61.5596 -204.45 142.08l-31.7305 179.51c-4.96973 28.0996 7.98047 56.0996 32.1504 69.5205c67.8193 37.6396 143.46 57.0596 220.12 57.0596c23.9199 0 47.9492 -1.88965 71.8594 -5.7002
+c17.29 -2.76953 31.7803 -13.0498 41.7705 -27c-19.1299 -0.769531 -38.29 -2.2998 -57.1807 -5.31934c-19.8594 -3.1709 -37.6396 -12.5303 -51.5898 -26c-1.62012 0.0195312 -3.23926 0.189453 -4.84961 0.189453c-65.8896 0 -131.25 -16.9502 -189.01 -49.0098
+c0.0400391 -0.0302734 -0.530273 -1.03027 -0.240234 -2.65039zM193.36 290.46c3.83984 -21.7002 -10.6904 -42.4004 -32.4404 -46.2197c-21.7598 -3.82031 -42.5 10.6699 -46.3398 32.3701c-0.730469 4.12012 -0.610352 8.15918 -0.0898438 12.0996
+c10.8096 -5.57031 24.8301 -7.75 39.4795 -5.16992c14.6504 2.57031 27.0703 9.41016 35.3203 18.3203c1.83984 -3.53027 3.33984 -7.28027 4.07031 -11.4004zM606.8 327.1c24.1699 -13.4092 37.1201 -41.4092 32.1504 -69.5195l-31.7305 -179.51
+c-15.3896 -87.0508 -156.83 -151.931 -219.859 -140.84c-63.0303 11.0791 -173.7 120.3 -158.311 207.35l31.7305 179.51c4.95996 28.1006 26.7295 50 54.04 54.3604c100.55 16.0596 203 -1.96973 291.979 -51.3506zM333.56 230.3
+c-0.729492 -4.12012 -0.609375 -8.16016 -0.0791016 -12.1094c10.8096 5.56934 24.8291 7.75 39.4795 5.16992c14.6504 -2.57031 27.0703 -9.41016 35.3203 -18.3203c1.83984 3.53027 3.33984 7.28027 4.06934 11.4004c3.83008 21.6992 -10.6895 42.3896 -32.4492 46.2197
+c-21.7607 3.83008 -42.5 -10.6602 -46.3408 -32.3604zM404.03 31.54c55.6699 -9.79004 108.2 23.7803 122.38 75.7197c-28.1104 -16.9697 -68.6504 -24.21 -111.93 -16.5996c-43.2803 7.60938 -78.8906 28.2402 -99.4902 53.7803
+c-4.48047 -53.6309 33.3594 -103.11 89.04 -112.9zM534.33 182.88c1.83984 3.52051 3.33984 7.27051 4.07031 11.4004c3.83008 21.7002 -10.7002 42.3896 -32.4502 46.2197c-21.7598 3.82031 -42.5 -10.6699 -46.3398 -32.3701
+c-0.730469 -4.12012 -0.610352 -8.16016 -0.0908203 -12.0996c10.8105 5.56934 24.8301 7.75 39.4805 5.16992c14.6504 -2.57031 27.0801 -9.41016 35.3301 -18.3203z" />
+    <glyph glyph-name="traffic-light" unicode="&#xf637;" horiz-adv-x="384" 
+d="M384 256c0 -41.7402 -26.7998 -76.9004 -64 -90.1201v-37.8799h64c0 -42.8398 -28.25 -78.6904 -66.9902 -91.0498c-12.4297 -57.6699 -63.6094 -100.95 -125.01 -100.95s-112.58 43.2803 -125.01 100.95c-38.7402 12.3594 -66.9902 48.21 -66.9902 91.0498h64v37.8799
+c-37.2002 13.2197 -64 48.3799 -64 90.1201h64v37.8799c-37.2002 13.2197 -64 48.3799 -64 90.1201h64v32c0 17.6699 14.3301 32 32 32h192c17.6699 0 32 -14.3301 32 -32v-32h64c0 -41.7402 -26.7998 -76.9004 -64 -90.1201v-37.8799h64zM192 32
+c26.5098 0 48 21.4902 48 48s-21.4902 48 -48 48s-48 -21.4902 -48 -48s21.4902 -48 48 -48zM192 160c26.5098 0 48 21.4902 48 48s-21.4902 48 -48 48s-48 -21.4902 -48 -48s21.4902 -48 48 -48zM192 288c26.5098 0 48 21.4902 48 48s-21.4902 48 -48 48
+s-48 -21.4902 -48 -48s21.4902 -48 48 -48z" />
+    <glyph glyph-name="truck-monster" unicode="&#xf63b;" horiz-adv-x="640" 
+d="M624 224c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-16.71c-29.21 38.6504 -75.0996 64 -127.28 64c-52.1797 0 -98.0693 -25.3496 -127.279 -64h-65.4502c-29.21 38.6504 -75.1006 64 -127.28 64s-98.0703 -25.3496 -127.28 -64h-16.7197
+c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h16v80c0 8.83984 7.16016 16 16 16h176v96c0 17.6699 14.3301 32 32 32h113.24c20.2227 -0.00292969 38.2441 -9.35645 49.9795 -24.0195l83.1807 -103.98h73.5996c17.6699 0 32 -14.3301 32 -32v-64h16z
+M288 320h132.44l-51.2002 64h-81.2402v-64zM592 96c8.83984 0 16 -7.16016 16.0195 -16v-32c0 -8.83984 -7.15918 -16 -16 -16h-5.19922c-2.1709 -7.26172 -5.11426 -14.3359 -8.65039 -20.8896l3.66992 -3.66992c6.25 -6.25 6.25 -16.3809 0 -22.6309l-22.6299 -22.6299
+c-6.25 -6.25 -16.3799 -6.25 -22.6299 0l-3.66992 3.66992c-6.62012 -3.58008 -13.5703 -6.44922 -20.9004 -8.64941v-5.2002c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v5.2002c-7.33008 2.2002 -14.29 5.08008 -20.8994 8.64941
+l-3.66992 -3.66992c-6.25 -6.25 -16.3809 -6.25 -22.6309 0l-22.6299 22.6299c-6.25 6.25 -6.25 16.3809 0 22.6309l3.66992 3.66992c-3.58008 6.60938 -6.44922 13.5596 -8.64941 20.8896h-5.2002c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h5.2002
+c2.16992 7.26172 5.11426 14.3359 8.64941 20.8896l-3.66992 3.66992c-6.25 6.25 -6.25 16.3809 0 22.6309l22.6299 22.6299c6.25 6.25 16.3809 6.25 22.6309 0l3.66992 -3.66992c6.60938 3.58008 13.5596 6.44922 20.8896 8.64941v5.2002c0 8.83984 7.16016 16 16 16h32
+c8.83984 0 16 -7.16016 16 -16v-5.2002c7.26172 -2.16992 14.3359 -5.11426 20.8896 -8.64941l3.66992 3.66992c6.25 6.25 16.3809 6.25 22.6309 0l22.6299 -22.6299c6.25 -6.25 6.25 -16.3809 0 -22.6309l-3.66992 -3.66992
+c3.58008 -6.60938 6.44922 -13.5596 8.64941 -20.8896h5.2002zM480 16c26.5098 0 48 21.4902 48 48s-21.4902 48 -48 48s-48 -21.4902 -48 -48s21.4902 -48 48 -48zM272 96c8.83984 0 16 -7.16016 16.0195 -15.9902v-32c0 -8.83984 -7.15918 -16 -16 -16h-5.19922
+c-2.1709 -7.26074 -5.11426 -14.3359 -8.65039 -20.8896l3.66992 -3.66992c6.25 -6.25 6.25 -16.3799 0 -22.6299l-22.6299 -22.6299c-6.25 -6.25 -16.3799 -6.25 -22.6299 0l-3.66992 3.66992c-6.62012 -3.58008 -13.5703 -6.4502 -20.9004 -8.65039v-5.2002
+c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v5.2002c-7.33008 2.2002 -14.29 5.08008 -20.8994 8.65039l-3.66992 -3.66992c-6.25 -6.25 -16.3809 -6.25 -22.6309 0l-22.6299 22.6299c-6.25 6.25 -6.25 16.3799 0 22.6299l3.66992 3.66992
+c-3.58008 6.61035 -6.44922 13.5596 -8.64941 20.8896h-5.2002c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h5.2002c2.16992 7.26172 5.11426 14.3359 8.64941 20.8906l-3.66992 3.66992c-6.25 6.25 -6.25 16.3799 0 22.6299l22.6299 22.6201
+c6.25 6.25 16.3809 6.25 22.6309 0l3.66992 -3.66992c6.60938 3.58008 13.5596 6.44922 20.8896 8.64941v5.2002c0 8.83984 7.16016 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-5.2002c7.26172 -2.16992 14.3359 -5.11426 20.8896 -8.64941l3.66992 3.66992
+c6.25 6.25 16.3809 6.25 22.6309 0l22.6299 -22.6299c6.25 -6.25 6.25 -16.3809 0 -22.6309l-3.66992 -3.66992c3.58008 -6.60938 6.44922 -13.5596 8.64941 -20.8896h5.2002zM160 16c26.5098 0 48 21.4902 48 48s-21.4902 48 -48 48s-48 -21.4902 -48 -48
+s21.4902 -48 48 -48z" />
+    <glyph glyph-name="truck-pickup" unicode="&#xf63c;" horiz-adv-x="640" 
+d="M624 160c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-49.5996c0.759766 -5.26953 1.60938 -10.5195 1.60938 -16c0 -61.8604 -50.1396 -112 -112 -112c-61.8594 0 -112 50.1396 -112 112c0 5.48047 0.850586 10.7305 1.61035 16h-67.2305
+c0.760742 -5.26953 1.61035 -10.5195 1.61035 -16c0 -61.8604 -50.1396 -112 -112 -112s-112 50.1396 -112 112c0 5.48047 0.849609 10.7305 1.61035 16h-49.6104c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h16v64c0 17.6699 14.3301 32 32 32h160v128
+c0 17.6699 14.3301 32 32 32h113.24c20.2227 -0.00292969 38.2441 -9.35645 49.9795 -24.0195l108.78 -135.98h48c17.6699 0 32 -14.3301 32 -32v-64h16zM288 352v-96h158.04l-76.7998 96h-81.2402zM176 32c26.4697 0 48 21.5303 48 48s-21.5303 48 -48 48
+s-48 -21.5303 -48 -48s21.5303 -48 48 -48zM464 32c26.4697 0 48 21.5303 48 48s-21.5303 48 -48 48s-48 -21.5303 -48 -48s21.5303 -48 48 -48z" />
+    <glyph glyph-name="ad" unicode="&#xf641;" 
+d="M157.52 176l18.4805 53.2197l18.4805 -53.2197h-36.9609zM352 192c13.2305 0 24 -10.7695 24 -24s-10.7695 -24 -24 -24s-24 10.7695 -24 24s10.7695 24 24 24zM464 384c26.5 0 48 -21.5 48 -48v-288c0 -26.5 -21.5 -48 -48 -48h-416c-26.5 0 -48 21.5 -48 48v288
+c0 26.5 21.5 48 48 48h416zM250.58 96c11 0 18.7197 10.8496 15.1104 21.25l-53.6904 154.62c-3.25586 9.3877 -12.1758 16.1299 -22.666 16.1299h-0.00390625h-26.6602l0.00292969 0.00585938c-10.4873 0 -19.4131 -6.74219 -22.6729 -16.126l-53.7002 -154.63
+c-3.60938 -10.4004 4.11035 -21.25 15.1201 -21.25h16.9404c0.00195312 0 -0.000976562 -0.00390625 0.000976562 -0.00390625c6.99316 0 12.9453 4.49609 15.1191 10.7539l7.37988 21.25h70.29l7.36914 -21.25c2.24023 -6.42969 8.31055 -10.75 15.1201 -10.75h16.9404z
+M424 112v160c0 8.83984 -7.16016 16 -16 16h-16c-8.83984 0 -16 -7.16016 -16 -16v-36.4199c-7.54004 2.68945 -15.54 4.41992 -24 4.41992c-39.7002 0 -72 -32.2998 -72 -72s32.2998 -72 72 -72c9.92969 0 19.4004 2.01953 28.0195 5.67969
+c2.94043 -3.41016 7.13086 -5.67969 11.9805 -5.67969h16c8.83984 0 16 7.16016 16 16z" />
+    <glyph glyph-name="ankh" unicode="&#xf644;" horiz-adv-x="320" 
+d="M296 192c13.25 0 24 -10.7402 24 -24v-32c0 -13.25 -10.75 -24 -24 -24h-96v-152c0 -13.25 -10.75 -24 -24 -24h-32c-13.25 0 -24 10.75 -24 24v152h-96c-13.25 0 -24 10.75 -24 24v32c0 13.2598 10.75 24 24 24h44.6201c-21.0801 33.9902 -36.6201 74.3496 -36.6201 112
+c0 88.3701 57.3096 144 128 144s128 -55.6299 128 -144c0 -37.6504 -15.54 -78.0098 -36.6201 -112h44.6201zM160 368c-29.6104 0 -48 -24.5195 -48 -64c0 -34.6602 27.1396 -78.1504 48 -100.87c20.8604 22.7305 48 66.21 48 100.87c0 39.4805 -18.3896 64 -48 64z" />
+    <glyph glyph-name="bible" unicode="&#xf647;" horiz-adv-x="448" 
+d="M448 89.5996c0 -9.59961 -3.2002 -16 -9.59961 -19.1992c-3.2002 -12.8008 -3.2002 -57.6006 0 -73.6006c6.39941 -6.39941 9.59961 -12.7998 9.59961 -19.2002v-16c0 -16 -12.7998 -25.5996 -25.5996 -25.5996h-326.4c-54.4004 0 -96 41.5996 -96 96v320
+c0 54.4004 41.5996 96 96 96h326.4c16 0 25.5996 -9.59961 25.5996 -25.5996v-332.801zM144 304v-32c0 -8.83984 7.16016 -16 16 -16h48v-112c0 -8.83984 7.16016 -16 16 -16h32c8.83984 0 16 7.16016 16 16v112h48c8.83984 0 16 7.16016 16 16v32
+c0 8.83984 -7.16016 16 -16 16h-48v48c0 8.83984 -7.16016 16 -16 16h-32c-8.83984 0 -16 -7.16016 -16 -16v-48h-48c-8.83984 0 -16 -7.16016 -16 -16zM380.8 0v64h-284.8c-16 0 -32 -12.7998 -32 -32s12.7998 -32 32 -32h284.8z" />
+    <glyph glyph-name="business-time" unicode="&#xf64a;" horiz-adv-x="640" 
+d="M496 224c79.5898 0 144 -64.4102 144 -144s-64.4102 -144 -144 -144s-144 64.4102 -144 144s64.4102 144 144 144zM560 73.71v12.5801c0 5.33984 -4.37012 9.70996 -9.70996 9.70996h-38.29v54.2803c0 5.33984 -4.37012 9.70996 -9.70996 9.70996h-12.5703
+c-5.33984 0 -9.70996 -4.37012 -9.70996 -9.70996v-76.5703c0 -5.33984 4.37012 -9.70996 9.70996 -9.70996h60.5703c5.33984 0 9.70996 4.37012 9.70996 9.70996zM496 256c-37.5303 0 -72.2803 -11.9102 -100.88 -32h-395.12v80c0 25.5996 22.4004 48 48 48h80v48
+c0 25.5996 22.4004 48 48 48h160c25.5996 0 48 -22.4004 48 -48v-48h80c25.5996 0 48 -22.4004 48 -48v-48.8096c-5.28027 0.479492 -10.5996 0.80957 -16 0.80957zM320 352v32h-128v-32h128zM326.82 128c-4.33984 -15.2803 -6.82031 -31.3398 -6.82031 -48
+c0 -28.8203 7.09961 -55.96 19.4297 -80h-291.43c-25.5996 0 -48 22.4004 -48 48v144h192v-48c0 -8.83984 7.16016 -16 16 -16h118.82z" />
+    <glyph glyph-name="city" unicode="&#xf64f;" horiz-adv-x="640" 
+d="M616 256c13.25 0 24 -10.7402 24 -24v-264c0 -17.6699 -14.3301 -32 -32 -32h-576c-17.6699 0 -32 14.3301 -32 32v360c0 13.2598 10.7402 24 24 24h40v80c0 8.83984 7.16016 16 16 16h16c8.83984 0 16 -7.16016 16 -16v-80h64v80c0 8.83984 7.16016 16 16 16h16
+c8.83984 0 16 -7.16016 16 -16v-80h64v72c0 13.2598 10.7402 24 24 24h144c13.2598 0 24 -10.7402 24 -24v-168h136zM128 44v40c0 6.62988 -5.37012 12 -12 12h-40c-6.62988 0 -12 -5.37012 -12 -12v-40c0 -6.62988 5.37012 -12 12 -12h40c6.62988 0 12 5.37012 12 12z
+M128 140v40c0 6.62988 -5.37012 12 -12 12h-40c-6.62988 0 -12 -5.37012 -12 -12v-40c0 -6.62988 5.37012 -12 12 -12h40c6.62988 0 12 5.37012 12 12zM128 236v40c0 6.62988 -5.37012 12 -12 12h-40c-6.62988 0 -12 -5.37012 -12 -12v-40c0 -6.62988 5.37012 -12 12 -12h40
+c6.62988 0 12 5.37012 12 12zM256 44v40c0 6.62988 -5.37012 12 -12 12h-40c-6.62988 0 -12 -5.37012 -12 -12v-40c0 -6.62988 5.37012 -12 12 -12h40c6.62988 0 12 5.37012 12 12zM256 140v40c0 6.62988 -5.37012 12 -12 12h-40c-6.62988 0 -12 -5.37012 -12 -12v-40
+c0 -6.62988 5.37012 -12 12 -12h40c6.62988 0 12 5.37012 12 12zM256 236v40c0 6.62988 -5.37012 12 -12 12h-40c-6.62988 0 -12 -5.37012 -12 -12v-40c0 -6.62988 5.37012 -12 12 -12h40c6.62988 0 12 5.37012 12 12zM416 140v40c0 6.62988 -5.37012 12 -12 12h-40
+c-6.62988 0 -12 -5.37012 -12 -12v-40c0 -6.62988 5.37012 -12 12 -12h40c6.62988 0 12 5.37012 12 12zM416 236v40c0 6.62988 -5.37012 12 -12 12h-40c-6.62988 0 -12 -5.37012 -12 -12v-40c0 -6.62988 5.37012 -12 12 -12h40c6.62988 0 12 5.37012 12 12zM416 332v40
+c0 6.62988 -5.37012 12 -12 12h-40c-6.62988 0 -12 -5.37012 -12 -12v-40c0 -6.62988 5.37012 -12 12 -12h40c6.62988 0 12 5.37012 12 12zM576 44v40c0 6.62988 -5.37012 12 -12 12h-40c-6.62988 0 -12 -5.37012 -12 -12v-40c0 -6.62988 5.37012 -12 12 -12h40
+c6.62988 0 12 5.37012 12 12zM576 140v40c0 6.62988 -5.37012 12 -12 12h-40c-6.62988 0 -12 -5.37012 -12 -12v-40c0 -6.62988 5.37012 -12 12 -12h40c6.62988 0 12 5.37012 12 12z" />
+    <glyph glyph-name="comment-dollar" unicode="&#xf651;" 
+d="M256 416c141.38 0 256 -93.1201 256 -208s-114.62 -208 -256 -208c-38.4102 0 -74.71 7.07031 -107.4 19.3799c-24.6094 -19.6299 -74.3398 -51.3799 -140.6 -51.3799l-0.00195312 0.00195312c-4.41309 0 -7.99512 3.58301 -7.99512 7.99512
+c0 2.13184 0.835938 4.06934 2.19727 5.50293c0.5 0.530273 42.2598 45.4502 54.8193 95.7598c-35.6094 35.7305 -57.0195 81.1807 -57.0195 130.74c0 114.88 114.62 208 256 208zM280 113.56c30.29 3.62012 53.3701 30.9805 49.3203 63.04
+c-2.90039 22.96 -20.6602 41.3105 -42.9102 47.6699l-50.0703 14.3008c-3.59961 1.0293 -6.12012 4.35938 -6.12012 8.10938c0 4.64062 3.78027 8.41992 8.44043 8.41992h32.7803c0.0214844 0 0.0634766 -0.0126953 0.0859375 -0.0126953
+c3.62891 0 7.07422 -0.790039 10.1738 -2.20703c4.7998 -2.20996 10.3701 -1.70996 14.1094 2.03027l17.5205 17.5195c5.26953 5.27051 4.66992 14.2705 -1.5498 18.3799c-9.5 6.27051 -20.3604 10.1104 -31.7803 11.46v17.7305c0 8.83984 -7.16016 16 -16 16h-16
+c-8.83984 0 -16 -7.16016 -16 -16v-17.5498c-30.29 -3.62012 -53.3701 -30.9805 -49.3203 -63.0498c2.90039 -22.96 20.6602 -41.3203 42.9102 -47.6699l50.0703 -14.3008c3.59961 -1.0293 6.12012 -4.35938 6.12012 -8.10938
+c0 -4.64062 -3.78027 -8.41992 -8.44043 -8.41992h-32.7803c-3.59961 0 -7.0791 0.759766 -10.2598 2.21973c-4.7998 2.20996 -10.3701 1.70996 -14.1094 -2.03027l-17.5205 -17.5195c-5.26953 -5.27051 -4.66992 -14.2705 1.5498 -18.3799
+c9.5 -6.27051 20.3604 -10.1104 31.7803 -11.46v-17.7305c0 -8.83984 7.16016 -16 16 -16h16c8.83984 0 16 7.16016 16 16v17.5596z" />
+    <glyph glyph-name="comments-dollar" unicode="&#xf653;" horiz-adv-x="576" 
+d="M416 256c0 -88.3701 -93.1201 -160 -208 -160c-40.9805 0 -79.0703 9.24023 -111.27 24.9805c-21.8008 -12.7305 -52.1504 -24.9805 -88.7305 -24.9805l-0.00195312 0.00195312c-4.41309 0 -7.99512 3.58301 -7.99512 7.99512
+c0 2.13184 0.835938 4.06934 2.19727 5.50293c0.319336 0.339844 22.4102 24.2803 35.7695 54.5195c-23.8398 26.0303 -37.9697 57.7109 -37.9697 91.9805c0 88.3701 93.1201 160 208 160s208 -71.6299 208 -160zM192 160c0 -4.41992 3.58008 -8 8 -8h16
+c4.41992 0 8 3.58008 8 8v16.1201c23.6201 0.629883 42.6699 20.54 42.6699 45.0703c0 19.9697 -12.9902 37.8096 -31.5801 43.3896l-45 13.5c-5.16016 1.54004 -8.76953 6.78027 -8.76953 12.7295c0 7.27051 5.2998 13.1904 11.7998 13.1904h28.1104
+c4.55957 0 8.94922 -1.29004 12.8193 -3.71973c3.24023 -2.03027 7.36035 -1.91016 10.1299 0.729492l11.75 11.21c3.53027 3.37012 3.33008 9.20996 -0.569336 12.1406c-9.10059 6.83984 -20.0801 10.7695 -31.3701 11.3496v16.29c0 4.41992 -3.58008 8 -8 8h-16
+c-4.41992 0 -8 -3.58008 -8 -8v-16.1201c-23.6201 -0.629883 -42.6699 -20.5498 -42.6699 -45.0703c0 -19.9697 12.9893 -37.8096 31.5801 -43.3896l45 -13.5c5.15918 -1.54004 8.76953 -6.78027 8.76953 -12.7295c0 -7.27051 -5.2998 -13.1904 -11.7998 -13.1904h-28.1104
+c-4.55957 0 -8.9502 1.2998 -12.8193 3.71973c-3.24023 2.03027 -7.36035 1.91016 -10.1309 -0.729492l-11.75 -11.21c-3.5293 -3.37012 -3.3291 -9.20996 0.570312 -12.1406c9.10059 -6.83008 20.0801 -10.7695 31.3701 -11.3496v-16.29zM538.01 36.0098
+c13.3604 -30.2598 35.4707 -54.1699 35.7803 -54.5c2.20996 -2.33008 2.82031 -5.72949 1.5498 -8.66992c-1.25 -2.92969 -4.13965 -4.83984 -7.33984 -4.83984c-36.5801 0 -66.9297 12.25 -88.7305 24.9805c-32.1992 -15.7402 -70.2891 -24.9805 -111.27 -24.9805
+c-86.2305 0 -160.2 40.3701 -191.73 97.8799c10.4102 -1.11035 20.9502 -1.87988 31.7305 -1.87988c132.34 0 240 86.1299 240 192c0 6.78027 -0.469727 13.4697 -1.33008 20.0703c75.8398 -23.8701 129.33 -81.1299 129.33 -148.07
+c0 -34.2695 -14.1299 -65.96 -37.9902 -91.9902z" />
+    <glyph glyph-name="cross" unicode="&#xf654;" horiz-adv-x="384" 
+d="M352 320c17.6699 0 32 -14.3301 32 -32v-64c0 -17.6699 -14.3301 -32 -32 -32h-96v-224c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32v224h-96c-17.6699 0 -32 14.3301 -32 32v64c0 17.6699 14.3301 32 32 32h96v96c0 17.6699 14.3301 32 32 32
+h64c17.6699 0 32 -14.3301 32 -32v-96h96z" />
+    <glyph glyph-name="dharmachakra" unicode="&#xf655;" 
+d="M495 222.94c9.20996 0.569336 17 -6.74023 17.0098 -15.9707v-29.9395c0 -9.23047 -7.79004 -16.5498 -17 -15.9707l-17.2197 1.08008c-5.28027 -39.4795 -20.7998 -75.6299 -43.8604 -105.83l12.9502 -11.4297c6.91992 -6.09961 7.25977 -16.7803 0.730469 -23.3096
+l-21.1699 -21.1699c-6.52051 -6.52051 -17.2002 -6.19043 -23.3105 0.729492l-11.4297 12.9502c-30.2002 -23.0703 -66.3506 -38.5898 -105.84 -43.8604l1.08008 -17.2197c0.569336 -9.20996 -6.74023 -17 -15.9707 -17h-29.9395c-9.23047 0 -16.5498 7.79004 -15.9707 17
+l1.09082 17.2197c-39.4902 5.28027 -75.6406 20.7998 -105.841 43.8604l-11.4297 -12.9502c-6.09961 -6.91992 -16.7803 -7.25977 -23.3096 -0.729492l-21.1699 21.1699c-6.52051 6.51953 -6.19043 17.1992 0.729492 23.3096l12.9502 11.4297
+c-23.0703 30.1904 -38.5898 66.3408 -43.8604 105.83l-17.2197 -1.08008c-9.20996 -0.569336 -17 6.74023 -17 15.9707v29.9395c0 9.23047 7.79004 16.5498 17 15.9707l17.2197 -1.08008c5.28027 39.4893 20.7998 75.6396 43.8604 105.84l-12.9502 11.4297
+c-6.91992 6.10059 -7.25977 16.7803 -0.729492 23.3105l21.1699 21.1592c6.51953 6.52051 17.1992 6.19043 23.3096 -0.729492l11.4297 -12.9502c30.1904 23.0703 66.3408 38.5898 105.83 43.8604l-1.08008 17.2197c-0.569336 9.20996 6.74023 17 15.9707 17h29.9395
+c9.23047 0 16.5498 -7.79004 15.9707 -17l-1.07031 -17.21c39.4795 -5.28027 75.6299 -20.7998 105.83 -43.8604l11.4297 12.9404c6.10059 6.91992 16.7803 7.25977 23.3105 0.729492l21.1592 -21.1592c6.52051 -6.52051 6.19043 -17.2002 -0.729492 -23.3105
+l-12.9502 -11.4297c23.0703 -30.2002 38.5898 -66.3506 43.8604 -105.84zM281.84 349.39l-4.00977 -64.1201c10.2998 -2.40918 19.8896 -6.50977 28.6201 -11.9492l42.6201 48.29c-19.6006 14.1201 -42.4199 23.71 -67.2305 27.7793zM230.16 349.39
+c-24.8105 -4.06934 -47.6299 -13.6592 -67.2305 -27.7793l42.6201 -48.29c8.73047 5.42969 18.3301 9.54004 28.6201 11.9492zM126.39 285.06c-14.1201 -19.5996 -23.71 -42.4092 -27.7793 -67.2197l64.1201 -4.00977c2.41992 10.29 6.51953 19.8896 11.96 28.6201z
+M98.6104 166.16c4.06934 -24.8105 13.6592 -47.6299 27.7793 -67.2305l48.29 42.6201c-5.42969 8.73047 -9.54004 18.3301 -11.9492 28.6201zM230.16 34.6104l4 64.1201c-10.29 2.41992 -19.8906 6.51953 -28.6201 11.96l-42.6104 -48.3008
+c19.6006 -14.1201 42.4199 -23.71 67.2305 -27.7793zM256 160c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM281.84 34.6104c24.8105 4.06934 47.6201 13.6592 67.2197 27.7793l-42.6094 48.3008
+c-8.73047 -5.44043 -18.3301 -9.55078 -28.6201 -11.96zM385.61 98.9404c14.1201 19.5898 23.71 42.4092 27.7793 67.2295l-64.1201 4.00977c-2.40918 -10.2998 -6.50977 -19.8896 -11.9492 -28.6201zM349.27 213.83l64.1201 4
+c-4.06934 24.8096 -13.6592 47.6299 -27.7793 67.2295l-48.3008 -42.6094c5.44043 -8.73047 9.55078 -18.3301 11.96 -28.6201z" />
+    <glyph glyph-name="envelope-open-text" unicode="&#xf658;" 
+d="M176 232c-8.83984 0 -16 7.16016 -16 16v16c0 8.83984 7.16016 16 16 16h160c8.83984 0 16 -7.16016 16 -16v-16c0 -8.83984 -7.16016 -16 -16 -16h-160zM160 152v16c0 8.83984 7.16016 16 16 16h160c8.83984 0 16 -7.16016 16 -16v-16c0 -8.83984 -7.16016 -16 -16 -16
+h-160c-8.83984 0 -16 7.16016 -16 16zM256 30.8701c16.4199 0 32.8398 5.07031 46.8604 15.1895l209.14 151.08v-213.14c0 -26.5098 -21.4902 -48 -48 -48h-416c-26.5098 0 -48 21.4902 -48 48v213.14l209.14 -151.08c14.0205 -10.1299 30.4404 -15.1895 46.8604 -15.1895z
+M493.61 285.05c11.6094 -9.09961 18.3896 -23.0303 18.3896 -37.7695v-10.6504l-96 -69.3496v184.72h-320v-184.72l-96 69.3496v10.6504c0.00195312 15.3359 7.17676 28.9824 18.3896 37.7695c8.85059 6.94043 17.2402 13.4805 29.6104 22.8105v44.1396
+c0 26.5098 21.4902 48 48 48h77.5498c3.04004 2.2002 5.87012 4.25977 9.04004 6.55957c16.8203 12.2705 50.21 41.79 73.4102 41.4404c23.2002 0.349609 56.5996 -29.1699 73.4102 -41.4404c3.16992 -2.2998 6 -4.35938 9.04004 -6.55957h77.5498
+c26.5098 0 48 -21.4902 48 -48v-44.1396c12.3701 -9.34082 20.7598 -15.8701 29.6104 -22.8105z" />
+    <glyph glyph-name="folder-minus" unicode="&#xf65d;" 
+d="M464 320c26.5098 0 48 -21.4902 48 -48v-224c0 -26.5098 -21.4902 -48 -48 -48h-416c-26.5098 0 -48 21.4902 -48 48v288c0 26.5098 21.4902 48 48 48h160l64 -64h192zM368 152v16c0 8.83984 -7.16016 16 -16 16h-192c-8.83984 0 -16 -7.16016 -16 -16v-16
+c0 -8.83984 7.16016 -16 16 -16h192c8.83984 0 16 7.16016 16 16z" />
+    <glyph glyph-name="folder-plus" unicode="&#xf65e;" 
+d="M464 320c26.4922 0 48 -21.5078 48 -48v-224c0 -26.4922 -21.5078 -48 -48 -48h-416c-26.4922 0 -48 21.5078 -48 48v288c0 26.4922 21.5078 48 48 48h160l64 -64h192zM359.5 152v16c0 8.83105 -7.16895 16 -16 16h-64v64c0 8.83105 -7.16895 16 -16 16h-16
+c-8.83105 0 -16 -7.16895 -16 -16v-64h-64c-8.83105 0 -16 -7.16895 -16 -16v-16c0 -8.83105 7.16895 -16 16 -16h64v-64c0 -8.83105 7.16895 -16 16 -16h16c8.83105 0 16 7.16895 16 16v64h64c8.83105 0 16 7.16895 16 16z" />
+    <glyph glyph-name="funnel-dollar" unicode="&#xf662;" horiz-adv-x="640" 
+d="M433.46 282.06c-83.4102 -20.8896 -145.46 -96.2695 -145.46 -186.06c0 -54.3496 22.7998 -103.38 59.21 -138.35c-10.75 -20.54 -38.3604 -29.21 -59.2197 -13.5703l-79.9902 60c-10.0703 7.55957 -16 19.4102 -16 32v155.92l-182.66 201.93
+c-19.9502 19.9502 -5.82031 54.0703 22.4004 54.0703h480.52c28.2207 0 42.3506 -34.1201 22.4004 -54.0703zM480 256c88.3701 0 160 -71.6299 160 -160s-71.6299 -160 -160 -160s-160 71.6299 -160 160s71.6299 160 160 160zM496 16.1201
+c23.6299 0.629883 42.6699 20.54 42.6699 45.0703c0 19.9697 -12.9902 37.8096 -31.5801 43.3896l-45 13.5c-5.16016 1.54004 -8.76953 6.78027 -8.76953 12.7295c0 7.27051 5.2998 13.1904 11.7998 13.1904h28.1104c4.55957 0 8.94922 -1.29004 12.8193 -3.71973
+c3.24023 -2.03027 7.36035 -1.91016 10.1299 0.729492l11.75 11.21c3.53027 3.37012 3.33008 9.20996 -0.569336 12.1406c-9.10059 6.83984 -20.0801 10.7695 -31.3701 11.3496v16.29c0 4.41992 -3.58008 8 -8 8h-16c-4.41992 0 -8 -3.58008 -8 -8v-16.1201
+c-23.6201 -0.629883 -42.6699 -20.5498 -42.6699 -45.0703c0 -19.9697 12.9893 -37.8096 31.5801 -43.3896l45 -13.5c5.15918 -1.54004 8.76953 -6.78027 8.76953 -12.7295c0 -7.27051 -5.2998 -13.1904 -11.7998 -13.1904h-28.1104
+c-4.55957 0 -8.9502 1.2998 -12.8193 3.71973c-3.24023 2.03027 -7.36035 1.91016 -10.1309 -0.729492l-11.75 -11.21c-3.5293 -3.37012 -3.3291 -9.20996 0.570312 -12.1406c9.10059 -6.83008 20.0801 -10.7695 31.3701 -11.3496v-16.29c0 -4.41992 3.58008 -8 8 -8h16
+c4.41992 0 8 3.58008 8 8v16.1201z" />
+    <glyph glyph-name="gopuram" unicode="&#xf664;" 
+d="M496 96c8.7998 0 16 -7.2002 16 -16v-128c0 -8.7998 -7.2002 -16 -16 -16h-80v160h-32v128h-32v96h-32v-96h32v-128h32v-160h-80v80c0 8.7998 -7.2002 16 -16 16h-64c-8.7998 0 -16 -7.2002 -16 -16v-80h-80v160h32v128h32v96h-32v-96h-32v-128h-32v-160h-80
+c-8.7998 0 -16 7.2002 -16 16v128c0 8.7998 7.2002 16 16 16h16v112c0 8.7998 7.2002 16 16 16h16v80c0 8.7998 7.2002 16 16 16h16v112c0 8.7998 7.2002 16 16 16s16 -7.2002 16 -16v-16h64v16c0 8.7998 7.2002 16 16 16s16 -7.2002 16 -16v-16h64v16
+c0 8.7998 7.2002 16 16 16s16 -7.2002 16 -16v-16h64v16c0 8.7998 7.2002 16 16 16s16 -7.2002 16 -16v-112h16c8.7998 0 16 -7.2002 16 -16v-80h16c8.7998 0 16 -7.2002 16 -16v-112h16zM232 272v-48h48v48c0 8.7998 -7.2002 16 -16 16h-16c-8.7998 0 -16 -7.2002 -16 -16z
+M288 96v64c0 8.7998 -7.2002 16 -16 16h-32c-8.7998 0 -16 -7.2002 -16 -16v-64h64z" />
+    <glyph glyph-name="hamsa" unicode="&#xf665;" 
+d="M509.34 140.75c1.70117 -3.9043 2.65918 -8.24805 2.65918 -12.7764c0 -8.42383 -3.26562 -16.0908 -8.59863 -21.8037l-102.681 -110.03c-35.6895 -38.2197 -88.4102 -60.1396 -144.72 -60.1396s-109.03 21.9199 -144.71 60.1396l-102.69 110.03
+c-5.33301 5.71289 -8.58398 13.4141 -8.58398 21.8379c0 4.52832 0.943359 8.83789 2.64453 12.7422c5.05957 11.6904 16.5898 19.25 29.3398 19.25h64v208c0 22 18 40 40 40s40 -18 40 -40v-134c0 -5.51953 4.48047 -10 10 -10h20c5.51953 0 10 4.48047 10 10v174
+c0 22 18 40 40 40s40 -18 40 -40v-174c0 -5.51953 4.48047 -10 10 -10h20c5.51953 0 10 4.48047 10 10v134c0 22 18 40 40 40s40 -18 40 -40v-208h64c12.75 0 24.2803 -7.55957 29.3398 -19.25zM256 32c53.0195 0 96 64 96 64s-42.9805 64 -96 64s-96 -64 -96 -64
+s42.9805 -64 96 -64zM256 128c17.6699 0 32 -14.3301 32 -32s-14.3301 -32 -32 -32s-32 14.3301 -32 32s14.3301 32 32 32z" />
+    <glyph glyph-name="bahai" unicode="&#xf666;" 
+d="M496.25 245.48c17.54 -2.46094 21.6797 -26.2705 6.04004 -34.6602l-98.1602 -52.6602l74.4805 -83.54c11.8594 -13.29 0.00976562 -34.25 -17.3506 -30.4902l-108.569 23.6504l4.10938 -112.55c0.430664 -11.6504 -8.87012 -19.2207 -18.4102 -19.2207
+c-5.15918 0 -10.3896 2.20996 -14.1992 7.18066l-68.1807 88.8994l-68.1797 -88.8994c-3.81055 -4.9707 -9.0498 -7.18066 -14.2002 -7.18066c-9.54004 0 -18.8398 7.57031 -18.4102 19.2207l4.11035 112.55l-108.57 -23.6504
+c-1.39941 -0.30957 -2.75977 -0.450195 -4.06934 -0.450195c-15.0107 0 -24.21 18.6807 -13.29 30.9307l74.4795 83.54l-98.1602 52.6592c-15.6494 8.40039 -11.5098 32.21 6.03027 34.6709l110 15.4297l-41.8203 104.34c-6.66016 16.6396 11.6006 32.1797 26.5898 22.6299
+l94.04 -59.8896l34.0908 107.189c2.70996 8.55078 10.0293 12.8203 17.3496 12.8203s14.6396 -4.26953 17.3496 -12.8203l34.0908 -107.18l94.04 59.8896c14.9893 9.55078 33.2598 -5.98926 26.5898 -22.6299l-41.8203 -104.34zM338.51 136.32l-35.6094 39.9297
+l46.9199 25.1699l-52.5703 7.37988l19.9902 49.8701l-44.9502 -28.6201l-16.29 51.2305l-16.3096 -51.2305l-44.9502 28.6201l19.9902 -49.8701l-52.5703 -7.37988l46.9199 -25.1699l-35.5996 -39.9297l51.8896 11.2998l-1.95996 -53.79l32.5898 42.4902l32.5898 -42.4902
+l-1.96973 53.79z" />
+    <glyph glyph-name="jedi" unicode="&#xf669;" horiz-adv-x="576" 
+d="M535.953 96c-42.6406 -94.1719 -137.641 -160 -247.984 -160c-4.26562 0 -8.54688 0.0986328 -12.8447 0.296875c-103.969 4.76562 -193.859 69.4688 -235.109 159.703h39.9219l-58.6094 58.5938c-2.65332 12.8242 -4.38672 25.9951 -5.10938 39.4219
+c-0.133789 3.5166 -0.202148 7.05078 -0.202148 10.5996c0 6.65527 0.234375 12.8477 0.702148 19.3848h47.2188l-41.3906 41.375c14.7842 66.6123 53.959 124.015 107.969 162.078c2.61426 1.87109 5.82812 2.98535 9.28125 3
+c5.62793 -0.03125 10.5791 -2.89355 13.5 -7.25c1.76367 -2.57422 2.7959 -5.68848 2.7959 -9.04199c0 -2.13086 -0.414062 -4.19141 -1.1709 -6.05176c-6.31445 -15.834 -9.84375 -33.1904 -9.84375 -51.2656c0 -45.1094 21.0469 -86.5781 57.7188 -113.734
+c4.07324 -2.96484 6.72266 -7.76855 6.72266 -13.1865c0 -4.86133 -2.13965 -9.2168 -5.51953 -12.2041c-26.5469 -23.9844 -41.1719 -56.5 -41.1719 -91.5781c0 -60.0312 42.9531 -110.281 99.8906 -121.922l2.5 65.2656l-27.1562 -18.4844
+c-1.29688 -0.832031 -2.83887 -1.31445 -4.49219 -1.31445c-2.10352 0 -4.04004 0.777344 -5.50781 2.06445c-1.55078 1.46387 -2.51953 3.53809 -2.51953 5.83691c0 1.49414 0.416992 2.90234 1.12891 4.10059l20.125 33.7656l-42.0625 8.73438
+c-3.64062 0.744141 -6.38379 3.96777 -6.38379 7.82812s2.74316 7.08398 6.38379 7.82812l42.0625 8.71875l-20.1094 33.7344c-0.724609 1.20312 -1.1416 2.61133 -1.1416 4.11719c0 4.41016 3.58105 7.99121 7.99121 7.99121c1.67188 0 3.22656 -0.510742 4.50977 -1.38965
+l30.3906 -20.6562l11.5166 287.969c0.15918 4.25879 3.66797 7.66699 7.96484 7.66699c0.0117188 0 0.0234375 0.00488281 0.0351562 0.00488281h0.046875c4.29004 -0.0332031 7.78418 -3.44629 7.95312 -7.70312l11.5312 -287.922l30.3906 20.6719
+c1.28223 0.855469 2.82227 1.35449 4.47852 1.35449c2.12793 0 4.07715 -0.820312 5.52148 -2.16699c1.54785 -1.45898 2.51465 -3.52832 2.51465 -5.82129c0 -1.48828 -0.415039 -2.89062 -1.12402 -4.08496l-20.1406 -33.7656l42.0781 -8.73438
+c3.63379 -0.750977 6.36914 -3.97266 6.36914 -7.82812s-2.73535 -7.07715 -6.36914 -7.82812l-42.0781 -8.71875l20.1094 -33.7344c0.730469 -1.20508 1.15039 -2.61719 1.15039 -4.12793c0 -2.27637 -0.947266 -4.33984 -2.47852 -5.79395
+c-1.46484 -1.32227 -3.4043 -2.12793 -5.53125 -2.12793c-1.6543 0 -3.20801 0.492188 -4.5 1.33105l-27.1719 18.4688l2.5 -65.3438c48.4844 9.40625 87.5781 48.1562 97.3125 96.5c1.68066 8.11816 2.56445 16.5254 2.56445 25.1387
+c0 36.5547 -15.8574 69.3145 -41.127 91.9395c-3.38867 2.98926 -5.52734 7.3623 -5.52734 12.2314c0 5.42578 2.64844 10.2256 6.73047 13.1904c36.6562 27.1719 57.6875 68.6094 57.6875 113.734v0.0859375c0 18.0664 -3.53613 35.4062 -9.85938 51.2266
+c-0.763672 1.86523 -1.18555 3.90625 -1.18555 6.0459c0 3.34668 1.0332 6.47949 2.79492 9.04785c2.9248 4.35059 7.875 7.20605 13.5 7.23438c3.44043 -0.0136719 6.64355 -1.12305 9.25 -2.98438c53.9287 -38.2227 93.0518 -95.6611 107.906 -162.281l-41.25 -41.2344
+h46.9531c0.359375 -5.76562 1.04688 -11.4531 1.04688 -17.2656c-0.0332031 -17.8086 -1.7959 -35.0137 -5.125 -51.8594l-58.8906 -58.875h39.9688z" />
+    <glyph glyph-name="journal-whills" unicode="&#xf66a;" horiz-adv-x="448" 
+d="M438.406 70.4062c-3.20312 -12.8125 -3.20312 -57.6094 0 -73.6094c6.39062 -6.39062 9.58887 -12.792 9.59375 -19.2031v-16c0 -16 -12.7969 -25.5938 -25.5938 -25.5938h-326.406c-54.4062 0 -96 41.5938 -96 96v320c0 54.4062 41.5938 96 96 96h326.406
+c16 0 25.5938 -9.59375 25.5938 -25.5938v-332.812c0 -9.59375 -3.19824 -15.9893 -9.59375 -19.1875zM380.797 64h-284.797c-16 0 -32 -12.7969 -32 -32s12.7969 -32 32 -32h284.797v64zM128.016 271.984c0 -0.515625 0.140625 -0.984375 0.140625 -1.5l37.1094 -32.4688
+c1.67383 -1.4668 2.73047 -3.62012 2.73047 -6.01758c0 -4.41309 -3.58398 -7.99414 -7.99609 -7.99805h-0.015625c-1.97363 0.0996094 -3.79785 0.828125 -5.25 1.98438l-23.5938 20.6406c11.5469 -49.5781 55.7656 -86.625 108.859 -86.625
+s97.3125 37.0469 108.875 86.625l-23.5938 -20.6406c-1.40918 -1.22461 -3.25391 -1.96875 -5.26562 -1.96875h-0.015625c-2.34766 0.129883 -4.46777 1.14551 -6.01562 2.71875c-1.1543 1.45996 -1.88184 3.28809 -1.98438 5.26562
+c0.128906 2.35059 1.15137 4.47266 2.73438 6.01562l37.1094 32.4688c0.015625 0.53125 0.15625 1 0.15625 1.51562c0 11.0469 -2.09375 21.5156 -5.0625 31.5938l-21.2656 -21.25c-1.44922 -1.4502 -3.45117 -2.34863 -5.66211 -2.34863
+c-4.41797 0 -8.00488 3.58691 -8.00488 8.00488c0 2.20605 0.892578 4.20801 2.33887 5.65625l26.4219 26.4062c-10.0342 20.8945 -26.1904 38.0244 -46.3594 49.2656c6.05371 -9.67676 9.55469 -21.1123 9.55469 -33.3584c0 -19.916 -9.17383 -37.7295 -23.6172 -49.2822
+c9.69336 -10.0459 15.6592 -23.7119 15.6592 -38.7598c0 -26.875 -19.0703 -49.3535 -44.3779 -54.6621l-1.42188 34.2812l12.6719 -8.625c0.635742 -0.432617 1.40234 -0.685547 2.22852 -0.685547c0.00585938 0 0.015625 -0.00195312 0.0214844 -0.00195312h0.0263672
+c2.19727 0 3.98047 1.7832 3.98047 3.98047c0 0.748047 -0.209961 1.45215 -0.569336 2.05078l-8.53125 14.3125l17.9062 3.71875c1.81738 0.379883 3.18457 1.99219 3.18457 3.92188s-1.36719 3.54199 -3.18457 3.92188l-17.9062 3.71875l8.53125 14.3125
+c0.359375 0.598633 0.566406 1.29883 0.566406 2.04688c0 2.19629 -1.7832 3.98047 -3.98047 3.98047c-0.00878906 0 -0.0146484 0.00390625 -0.0234375 0.00390625c-0.817383 -0.0322266 -1.58984 -0.275391 -2.25 -0.671875l-14.1875 -9.65625l-4.6875 112.297
+c-0.09375 2.12695 -1.84961 3.8252 -4 3.8252s-3.90625 -1.69824 -4 -3.8252l-4.625 -110.812l-12 8.15625c-0.639648 0.43457 -1.41211 0.688477 -2.24316 0.688477c-2.20996 0 -4.00293 -1.79395 -4.00293 -4.00391c0 -0.745117 0.203125 -1.44629 0.558594 -2.04395
+l8.53125 -14.3125l-17.9062 -3.71875c-1.81738 -0.375977 -3.18457 -1.98633 -3.18457 -3.91406s1.36719 -3.53809 3.18457 -3.91406l17.9062 -3.73438l-8.53125 -14.2969c-0.330078 -0.611328 -0.532227 -1.31152 -0.5625 -2.04688
+c0.0615234 -1.12109 0.525391 -2.14062 1.25 -2.90625c0.717773 -0.677734 1.68652 -1.09277 2.75 -1.09375c0.830078 0.00390625 1.60645 0.257812 2.25 0.6875l10.3594 7.04688l-1.35938 -32.7188c-25.3086 5.31836 -44.335 27.79 -44.335 54.6709
+c0 15.0518 5.92285 28.7324 15.6162 38.7822c-14.4434 11.5508 -23.7012 29.3193 -23.7012 49.2334c0 12.2559 3.59082 23.7412 9.6543 33.4229c-20.1709 -11.2451 -36.3311 -28.374 -46.375 -49.2656l26.4219 -26.4219c1.43945 -1.44727 2.33008 -3.44043 2.33008 -5.64062
+c0 -4.41504 -3.58496 -8 -7.99902 -8c-2.2002 0 -4.19629 0.888672 -5.64355 2.32812l-21.2656 21.2656c-2.98438 -10.0938 -5.07812 -20.5625 -5.0625 -31.625z" />
+    <glyph glyph-name="kaaba" unicode="&#xf66b;" horiz-adv-x="576" 
+d="M554.12 364.49c13.0703 -4.36035 21.8799 -16.5898 21.8799 -30.3604v-49.0098l-265 79.5098c-15.0596 4.5 -30.9502 4.5 -45.9805 0l-265.02 -79.5098v49.0098c0.000976562 14.1279 9.16992 26.1211 21.8799 30.3604l235.771 78.5801
+c9.53711 3.17969 19.7705 4.90234 30.3711 4.90234c10.5996 0 20.8008 -1.72266 30.3389 -4.90234zM274.22 333.97c9 2.7207 18.5498 2.7207 27.5898 0l274.2 -82.2598v-228.39c0 -15 -10.4199 -27.9902 -25.0596 -31.2402l-242.12 -53.7998
+c-6.72461 -1.49512 -13.5928 -2.28418 -20.7646 -2.28418s-14.1611 0.789062 -20.8857 2.28418l-242.12 53.7998c-14.6396 3.25977 -25.0596 16.2402 -25.0596 31.2402v228.38zM128 217.89v16.5801c0 5.28027 -5.01953 9.11035 -10.1104 7.7207l-80 -21.8203
+c-3.47949 -0.950195 -5.88965 -4.11035 -5.88965 -7.71973v-16.5801c0 -5.27051 5.01953 -9.10059 10.1104 -7.7207l80 21.8203c3.47949 0.950195 5.88965 4.11035 5.88965 7.71973zM272 257.17v16.5801c0 5.28027 -5.01953 9.11035 -10.1104 7.71973l-96 -26.1797
+c-3.47949 -0.950195 -5.88965 -4.11035 -5.88965 -7.71973v-16.5801c0 -5.28027 5.01953 -9.11035 10.1104 -7.7207l96 26.1807c3.47949 0.950195 5.88965 4.10938 5.88965 7.71973zM448 234.47v-16.5801c0 -0.00195312 0.00195312 -0.00195312 0.00195312 -0.00390625
+c0 -3.68359 2.49609 -6.78906 5.8877 -7.71582l80 -21.8203c5.09082 -1.38965 10.1104 2.44043 10.1104 7.7207v16.5801c0 3.60938 -2.41016 6.76953 -5.88965 7.71973l-80 21.8203c-5.09082 1.38965 -10.1104 -2.44043 -10.1104 -7.7207zM304 273.74v-16.5801
+c0 -0.00195312 0.00195312 -0.00292969 0.00195312 -0.00488281c0 -3.68359 2.49609 -6.78906 5.8877 -7.71484l96 -26.1807c5.09082 -1.38965 10.1104 2.44043 10.1104 7.7207v16.5791c0 3.61035 -2.41016 6.77051 -5.88965 7.7207l-96 26.1797
+c-5.09082 1.38965 -10.1104 -2.44043 -10.1104 -7.71973z" />
+    <glyph glyph-name="khanda" unicode="&#xf66d;" 
+d="M415.81 382c73.71 -40.2402 111.78 -123.85 90.1602 -207.51c-7.25 -28.0898 -22.3799 -53.5703 -41.25 -75.5898l-52.5098 -61.3105c-4.87012 -5.67969 -13.04 -7.22949 -19.6504 -3.70996l-79.3496 42.2305l-29.21 -20.3408l47.0801 -32.7793
+c1.66992 0.370117 3.22949 1.00977 5.00977 1.00977c13.25 0 23.9902 -10.7402 23.9902 -24c0 -13.25 -10.7402 -24 -23.9902 -24c-12.0898 0 -21.6797 9.11035 -23.3301 20.7598l-40.9102 28.4805v-30.1504c9.38086 -5.58008 15.9902 -15.3896 15.9902 -27.0996
+c0 -17.6699 -14.3203 -32 -31.9795 -32c-17.6602 0 -31.9805 14.3301 -31.9805 32c0 11.7197 6.60059 21.5293 15.9902 27.0996v29.9502l-40.6299 -28.2803c-1.64062 -11.6494 -11.2305 -20.7598 -23.3301 -20.7598c-13.25 0 -23.9902 10.75 -23.9902 24
+c0 13.2598 10.7402 24 23.9902 24c1.78027 0 3.33984 -0.639648 5.00977 -1.00977l47.0801 32.7793l-29.21 20.3301l-79.3496 -42.2295c-6.61035 -3.52051 -14.7803 -1.96973 -19.6504 3.71973l-55.9697 65.3604c-12.5703 14.6797 -23.3906 31.0693 -30.46 49.0596
+c-35.6602 90.6904 2.95996 186.391 81.4893 229.24c6.34082 3.5 15.0205 2.63965 20.0205 -2.7002c4.99023 -5.30957 6.45996 -12.9199 2.58984 -19.0801c-16.4902 -26.1602 -25.2002 -56.3896 -25.2002 -87.4697c0.180664 -53.1904 26.7598 -102.62 71.0303 -132.18
+l76.5898 -53.3301v19.8994l-44.0498 36.0908c-3.91016 4.20996 -5 10.0996 -2.81055 15.2793l7.85059 17.2402c-33.8506 19.2598 -56.9404 55.2402 -56.9404 96.9902c0 40.79 22.0205 76.1396 54.5898 95.7197l-5.21973 11.4404
+c-2.33008 5.5293 -0.929688 11.8301 3.57031 16.04l58.9902 52.8096l58.9893 -52.8203c4.5 -4.20996 5.91016 -10.5098 3.57031 -16.04l-5.21973 -11.4395c32.5693 -19.5801 54.5898 -54.9199 54.5898 -95.71c0 -41.7402 -23.0996 -77.7305 -56.9404 -96.9902
+l7.85059 -17.2402c2.18945 -5.18945 1.10938 -11.0801 -2.81055 -15.2793l-44.0498 -36.0908v-20.0996l76.6299 53.3496c44.5 29.7207 71.0801 79.1602 71.2705 132.41c0 31.0205 -8.70996 61.25 -25.2002 87.4102c-1.55762 2.46582 -2.46973 5.40723 -2.46973 8.53613
+c0 4.25293 1.66602 8.12012 4.37988 10.9844c4.99023 5.34961 12.9902 6.51953 19.3594 3.01953zM319.82 272c0 21.3203 -10.5801 40.1201 -26.6504 51.7695l-7.83008 -17.1797c-8.75 -24.5195 -8.75 -51.04 0 -75.5596l5.65039 -12.4102
+c17.3398 11.46 28.8301 31.0801 28.8301 53.3799zM191.89 272c0 -22.2998 11.5 -41.9297 28.8408 -53.3896l5.64941 12.4092c8.75 24.5303 8.75 51.04 0 75.5605l-7.83008 17.1797c-16.0801 -11.6396 -26.6602 -30.4395 -26.6602 -51.7598z" />
+    <glyph glyph-name="landmark" unicode="&#xf66f;" 
+d="M501.62 355.89c6.24023 -2.33984 10.3799 -8.30957 10.3799 -14.9795v-36.9102c0 -8.83984 -7.16016 -16 -16 -16h-480c-8.83984 0 -16 7.16016 -16 16v36.9102c0.000976562 6.85547 4.31445 12.7041 10.3799 14.9795l234.39 90.0703
+c3.49219 1.31152 7.30176 2.02832 11.25 2.02832c3.94727 0 7.72852 -0.716797 11.2207 -2.02832zM64 256h64v-160h96v160h64v-160h96v160h64v-160h16c8.83984 0 16 -7.16016 16 -16v-48h-448v48c0 8.83984 7.16016 16 16 16h16v160zM496 0c8.83984 0 16 -7.16016 16 -16
+v-32c0 -8.83984 -7.16016 -16 -16 -16h-480c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h480z" />
+    <glyph glyph-name="mail-bulk" unicode="&#xf674;" horiz-adv-x="576" 
+d="M160 0c25.5996 0 51.2002 22.4004 64 32c64 44.7998 83.2002 60.7998 96 70.4004v-134.4c0 -17.6699 -14.3301 -32 -32 -32h-256c-17.6699 0 -32 14.3301 -32 32v134.4c12.7998 -9.60059 32 -25.6006 96 -70.4004c12.7998 -9.59961 38.4004 -32 64 -32zM288 192
+c17.6699 0 32 -14.3301 32 -32v-19.2002c-25.5996 -19.2002 -22.4004 -19.2002 -115.2 -86.3994c-9.59961 -3.2002 -28.7998 -22.4004 -44.7998 -22.4004s-35.2002 19.2002 -44.7998 25.5996c-92.7998 67.2002 -89.6006 67.2002 -115.2 86.4004v16
+c0 17.6699 14.3301 32 32 32h256zM544 288c17.6699 0 32 -14.3301 32 -32v-192c0 -17.6699 -14.3301 -32 -32 -32h-192v134.4l-0.290039 -0.220703c-3.12012 32.4004 -30.5 57.8203 -63.71 57.8203h-96v32c0 17.6699 14.3301 32 32 32h320zM512 160v64h-64v-64h64zM160 256
+v-32h-96v192c0 17.6699 14.3301 32 32 32h320c17.6699 0 32 -14.3301 32 -32v-96h-224c-35.29 0 -64 -28.71 -64 -64z" />
+    <glyph glyph-name="menorah" unicode="&#xf676;" horiz-adv-x="640" 
+d="M144 320c8.83984 0 16 -7.16016 16 -16v-144h-64v144c0 8.83984 7.16016 16 16 16h32zM240 320c8.83984 0 16 -7.16016 16 -16v-144h-64v144c0 8.83984 7.16016 16 16 16h32zM432 320c8.83984 0 16 -7.16016 16 -16v-144h-64v144c0 8.83984 7.16016 16 16 16h32zM528 320
+c8.83984 0 16 -7.16016 16 -16v-144h-64v144c0 8.83984 7.16016 16 16 16h32zM608 352c-17.6699 0 -32 14.3301 -32 32s32 64 32 64s32 -46.3301 32 -64s-14.3301 -32 -32 -32zM512 352c-17.6699 0 -32 14.3301 -32 32s32 64 32 64s32 -46.3301 32 -64s-14.3301 -32 -32 -32
+zM416 352c-17.6699 0 -32 14.3301 -32 32s32 64 32 64s32 -46.3301 32 -64s-14.3301 -32 -32 -32zM320 352c-17.6699 0 -32 14.3301 -32 32s32 64 32 64s32 -46.3301 32 -64s-14.3301 -32 -32 -32zM224 352c-17.6699 0 -32 14.3301 -32 32s32 64 32 64s32 -46.3301 32 -64
+s-14.3301 -32 -32 -32zM128 352c-17.6699 0 -32 14.3301 -32 32s32 64 32 64s32 -46.3301 32 -64s-14.3301 -32 -32 -32zM32 352c-17.6699 0 -32 14.3301 -32 32s32 64 32 64s32 -46.3301 32 -64s-14.3301 -32 -32 -32zM576 160v144c0 8.83984 7.16016 16 16 16h32
+c8.83984 0 16 -7.16016 16 -16v-144c0 -53.0195 -42.9805 -96 -96 -96h-192v-64h176c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-416c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h176v64h-192c-53.0195 0 -96 42.9805 -96 96
+v144c0 8.83984 7.16016 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-144c0 -17.6699 14.3301 -32 32 -32h192v176c0 8.83984 7.16016 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-176h192c17.6699 0 32 14.3301 32 32z" />
+    <glyph glyph-name="mosque" unicode="&#xf678;" horiz-adv-x="640" 
+d="M0 -32v320h128v-320c0 -17.6699 -14.3301 -32 -32 -32h-64c-17.6699 0 -32 14.3301 -32 32zM579.16 160h-358.32c-17.8594 17.3896 -28.8398 37.3398 -28.8398 58.9102c0 52.8594 41.79 93.79 87.9199 122.899c41.9502 26.46 80.6299 57.7705 111.96 96.2207
+l8.12012 9.96973l8.12012 -9.96973c31.3301 -38.4502 70.0195 -69.75 111.96 -96.2207c46.1299 -29.1094 87.9199 -70.04 87.9199 -122.899c0 -21.5703 -10.9805 -41.5205 -28.8398 -58.9102zM608 128c17.6699 0 32 -14.3301 32 -32v-128c0 -17.6699 -14.3301 -32 -32 -32
+h-32v64c0 17.6699 -14.3301 32 -32 32s-32 -14.3301 -32 -32v-64h-64v72c0 48 -48 72 -48 72s-48 -24 -48 -72v-72h-64v64c0 17.6699 -14.3301 32 -32 32s-32 -14.3301 -32 -32v-64h-32c-17.6699 0 -32 14.3301 -32 32v128c0 17.6699 14.3301 32 32 32h416zM64 448
+c0 0 64 -32 64 -96v-32h-128v32c0 64 64 96 64 96z" />
+    <glyph glyph-name="om" unicode="&#xf679;" 
+d="M360.6 387.06l-21.5801 21.5605c-1.89062 1.88867 -3.06055 4.50098 -3.06055 7.38086c0 2.88086 1.16992 5.49023 3.06055 7.37891l21.5703 21.5605c4.08008 4.06934 10.6797 4.06934 14.7598 0l21.5801 -21.5605c1.8916 -1.88867 3.06152 -4.50098 3.06152 -7.38086
+c0 -2.88086 -1.16992 -5.49023 -3.06152 -7.37891l-21.5693 -21.5605c-1.88867 -1.89062 -4.50098 -3.06055 -7.38184 -3.06055s-5.49023 1.16992 -7.37891 3.06055zM412.11 256c55.0898 0 99.8896 -44.7998 99.8896 -99.8799v-100.12c0 -48.5303 -47.4805 -88 -96.0195 -88
+c-96.0205 0 -96.0205 64 -96.0205 64v37.8701c0 7.55957 9.42969 10.8896 14.2002 5.01953c15.1494 -18.6494 42.4199 -42.8896 81.8203 -42.8896c13.2393 0 32.0098 10.7695 32.0098 24v100.12c0 19.79 -16.1006 35.8799 -35.8799 35.8799
+c-9.60059 0 -18.6006 -3.73047 -25.3799 -10.5l-24.25 -24.25c-18.8701 -18.8604 -43.9502 -29.25 -70.6406 -29.25h-21.6895c11.0293 -18.9004 17.8096 -40.5801 17.8096 -64c0 -70.5801 -57.4297 -128 -128.02 -128c-118.811 0 -160.03 96 -159.94 150.81
+c0.0195312 8.80078 10.2598 12.7705 14.79 5.2207c22.7998 -38.0107 49.1299 -92.0303 145.15 -92.0303c35.2998 0 64.0098 28.7002 64.0098 64s-28.71 64 -64.0098 64h-33.0303c-5.57031 0.450195 -10.6406 3.49023 -13.1699 8.5498l-16.0898 32.1699
+c-5.35059 10.7002 2.42969 23.2803 14.3896 23.2803h31.9004c26.4697 0 48.0098 21.5303 48.0098 48s-21.54 48 -48.0098 48c-11.25 0 -21.8203 -3.80957 -30.2705 -10.71c-5.54004 -4.53027 -13.4795 -4.50977 -19.2002 -0.209961l-26.1494 19.6299
+c-8.08984 6.08008 -8.48047 17.9697 -1.12012 24.9297c25.1094 23.7402 59.8594 34.71 96.0098 28.7803c43.1602 -7.08008 79.4199 -40.6396 89.5205 -83.1895c6.43945 -27.1201 2.80957 -53.1309 -7.73047 -75.2305h46.8398c9.60059 0 18.6006 3.73047 25.3799 10.5
+l24.25 24.25c18.8701 18.8604 43.9502 29.25 70.6406 29.25zM454.29 380.73c10.5596 7.95996 25.7002 0.489258 25.7002 -12.7305v-35.5195c0 -2.36035 -0.509766 -4.71094 -1.53027 -6.83008c-2.96973 -6.30078 -21.8301 -37.6602 -101.75 -37.6602
+c-78.4297 0 -117.19 69.3896 -118.8 72.3398c-3.61035 6.62988 -2.08008 14.8799 3.66016 19.7998c5.69922 4.92969 14.1201 5.16992 20.1396 0.549805c3.53027 -2.69922 87.0303 -65.0693 172.58 0.0507812z" />
+    <glyph glyph-name="pastafarianism" unicode="&#xf67b;" horiz-adv-x="640" 
+d="M624.54 100.33c12.4004 -4.71973 18.5996 -18.5801 13.8896 -30.9805c-4.69922 -12.4092 -18.5801 -18.6299 -30.9697 -13.8799c-8.11035 3.08984 -14.3398 0.19043 -31.3896 -11.3594c-13.5508 -9.15039 -30.8301 -20.8408 -52.4199 -20.8408
+c-7.16992 0 -14.8301 1.28027 -22.9707 4.39062c-32.6602 12.4395 -39.9893 41.3301 -45.3301 62.4395c-2.20996 8.7207 -3.98926 14.4902 -5.94922 18.8701c-16.6201 -13.5996 -36.9307 -25.8701 -61.6201 -34.1602c10.0098 -37 32.2793 -90.8096 60.2197 -90.8096
+c13.25 0 24 -10.75 24 -24s-10.75 -24 -24 -24c-66.7402 0 -97.0498 88.6299 -107.42 129.14c-6.69043 -0.599609 -13.4199 -1.13965 -20.5801 -1.13965s-13.8896 0.540039 -20.5801 1.13965c-10.3701 -40.5098 -40.6797 -129.14 -107.42 -129.14c-13.25 0 -24 10.75 -24 24
+s10.75 24 24 24c28.0801 0 50.2998 53.7998 60.2598 90.7998c-24.6895 8.29004 -45.0195 20.5605 -61.6396 34.1699c-1.95996 -4.37988 -3.74023 -10.1494 -5.9502 -18.8701c-5.34961 -21.1094 -12.6699 -50 -45.3301 -62.4395
+c-8.13965 -3.11035 -15.7998 -4.39062 -22.9697 -4.39062c-21.5898 -0.0195312 -38.8701 11.6807 -52.4199 20.8408c-17.0498 11.5498 -23.2305 14.4492 -31.3906 11.3594c-12.3594 -4.72949 -26.25 1.4707 -30.9697 13.8799
+c-4.71973 12.3906 1.48047 26.25 13.8701 30.9707c32.6504 12.4697 57.3398 -4.25 75.3701 -16.4502c17.0801 -11.5303 23.2998 -14.4199 31.4102 -11.3604c8.12012 3.10059 10.8301 9.37988 15.8896 29.3799c3.33008 13.1504 7.44043 29.3203 17.9502 42.6504
+c-2.24023 2.91016 -4.42969 5.78027 -6.37988 8.57031c-10.1699 -9.56055 -23.4102 -17.1104 -41.7002 -17.1104c-33.9502 0 -50.8701 25.7803 -62.0596 42.8301c-10.6006 16.1396 -15 21.1699 -21.9404 21.1699c-13.25 0 -24 10.75 -24 24s10.75 24 24 24
+c33.96 0 50.8799 -25.7803 62.0596 -42.8301c10.6006 -16.1396 15 -21.1699 21.9404 -21.1699c17.1504 0 37.6797 61.5596 97.2695 101.9l-17.25 34.5c-33.46 2.09961 -60.0195 29.6191 -60.0195 63.5996c0 35.3496 28.6504 64 64 64s64 -28.6504 64 -64
+c0 -13.0195 -3.94043 -25.0996 -10.5996 -35.21l18.1494 -36.2998c16.9697 4.59961 35.6006 7.50977 56.46 7.50977c20.8604 0 39.4805 -2.91016 56.46 -7.50977l18.1504 36.2998c-6.67969 10.1104 -10.6201 22.1904 -10.6201 35.21c0 35.3496 28.6504 64 64 64
+s64 -28.6504 64 -64c0 -33.9805 -26.5703 -61.5 -60.0098 -63.5898l-17.25 -34.5c59.7793 -40.4805 79.9502 -101.91 97.2598 -101.91c6.94043 0 11.3398 5.03027 21.9404 21.1699c11.1895 17.0498 28.1094 42.8301 62.0596 42.8301c13.25 0 24 -10.75 24 -24
+s-10.75 -24 -24 -24c-6.94043 0 -11.3496 -5.03027 -21.9404 -21.1699c-11.1895 -17.0498 -28.1094 -42.8301 -62.0596 -42.8301c-18.29 0 -31.5303 7.5498 -41.7002 17.1201c-1.9502 -2.78027 -4.13965 -5.66016 -6.37988 -8.57031
+c10.5098 -13.3301 14.6201 -29.5 17.9502 -42.6494c5.05957 -20 7.76953 -26.29 15.8896 -29.3809c8.16016 -3.05957 14.3506 -0.169922 31.4102 11.3604c18.0098 12.2002 42.6699 28.9697 75.3701 16.4502zM448 400c-8.82031 0 -16 -7.17969 -16 -16s7.17969 -16 16 -16
+s16 7.17969 16 16s-7.17969 16 -16 16zM192 400c-8.82031 0 -16 -7.17969 -16 -16s7.17969 -16 16 -16s16 7.17969 16 16s-7.17969 16 -16 16z" />
+    <glyph glyph-name="peace" unicode="&#xf67c;" horiz-adv-x="496" 
+d="M248 440c136.97 0 248 -111.03 248 -248s-111.03 -248 -248 -248s-248 111.03 -248 248s111.03 248 248 248zM432 192c0 90.5303 -65.7695 165.82 -152 181.03v-165.66l129.43 -103.54c14.3701 26.2002 22.5703 56.2402 22.5703 88.1699zM216 10.9697v114.46
+l-89.29 -71.4395c24.7998 -21.8203 55.4297 -37.0498 89.29 -43.0205zM280 125.43v-114.449c33.8604 5.96973 64.4902 21.1992 89.29 43.0195zM216 373.03c-86.2305 -15.21 -152 -90.5 -152 -181.03c0 -31.9297 8.2002 -61.9697 22.5703 -88.1699l129.43 103.54v165.66z" />
+    <glyph glyph-name="place-of-worship" unicode="&#xf67f;" horiz-adv-x="640" 
+d="M620.61 81.4502c11.4111 -4.89258 19.3896 -16.2168 19.3896 -29.4102v-100.04c0 -8.83984 -7.16016 -16 -16 -16h-112v192zM0 52.04c0 13.1934 7.97852 24.5176 19.3896 29.4102l108.61 46.5498v-192h-112c-8.83984 0 -16 7.16016 -16 16v100.04zM464.46 201.32
+c9.63965 -5.78027 15.54 -16.2002 15.54 -27.4404v-237.88h-96v96c0 35.3496 -28.6602 64 -64 64s-64 -28.6504 -64 -64v-96h-96v237.88c0 11.6572 6.21387 21.8467 15.54 27.4404l48.46 29.0801v114.97c0 8.49023 3.37988 16.6299 9.37988 22.6299l75.3105 75.3096
+c6.23926 6.25 16.3691 6.25 22.6191 0l75.3105 -75.3096c6.00977 -6.00977 9.37988 -14.1396 9.37988 -22.6299v-114.97z" />
+    <glyph glyph-name="poll" unicode="&#xf681;" horiz-adv-x="448" 
+d="M400 416c26.5 0 48 -21.5 48 -48v-352c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352zM160 80v128c0 8.83984 -7.16016 16 -16 16h-32c-8.83984 0 -16 -7.16016 -16 -16v-128c0 -8.83984 7.16016 -16 16 -16h32
+c8.83984 0 16 7.16016 16 16zM256 80v224c0 8.83984 -7.16016 16 -16 16h-32c-8.83984 0 -16 -7.16016 -16 -16v-224c0 -8.83984 7.16016 -16 16 -16h32c8.83984 0 16 7.16016 16 16zM352 80v64c0 8.83984 -7.16016 16 -16 16h-32c-8.83984 0 -16 -7.16016 -16 -16v-64
+c0 -8.83984 7.16016 -16 16 -16h32c8.83984 0 16 7.16016 16 16z" />
+    <glyph glyph-name="poll-h" unicode="&#xf682;" horiz-adv-x="448" 
+d="M448 16c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48v352c0 26.5 21.5 48 48 48h352c26.5 0 48 -21.5 48 -48v-352zM112 256h128c8.83984 0 16 7.16016 16 16v32c0 8.83984 -7.16016 16 -16 16h-128c-8.83984 0 -16 -7.16016 -16 -16v-32
+c0 -8.83984 7.16016 -16 16 -16zM112 160h224c8.83984 0 16 7.16016 16 16v32c0 8.83984 -7.16016 16 -16 16h-224c-8.83984 0 -16 -7.16016 -16 -16v-32c0 -8.83984 7.16016 -16 16 -16zM112 64h64c8.83984 0 16 7.16016 16 16v32c0 8.83984 -7.16016 16 -16 16h-64
+c-8.83984 0 -16 -7.16016 -16 -16v-32c0 -8.83984 7.16016 -16 16 -16z" />
+    <glyph glyph-name="pray" unicode="&#xf683;" horiz-adv-x="384" 
+d="M256 320c-35.3496 0 -64 28.6504 -64 64s28.6504 64 64 64s64 -28.6504 64 -64s-28.6504 -64 -64 -64zM225.37 150.25l-24.1504 28.7598l-34.7998 -64.8701l109.86 -109.859c25.4893 -25.4902 5.7998 -68.2803 -28.2803 -68.2803h-208c-22.0898 0 -40 17.9102 -40 40
+s17.9102 40 40 40h91.5596l-44.8096 34.8896c-42.8799 27.3799 -57.5898 80.1104 -34.1904 123.75l49.3701 92.0303c11.1201 20.6504 32.1807 34.4404 56.3701 36.9199c24.7803 2.58984 48.5605 -6.93945 64 -25.3301l38.9102 -46.3096l57.4404 47
+c17.1191 13.9697 42.3398 11.4902 56.3096 -5.62012c13.9697 -17.0898 11.4697 -42.2998 -5.62012 -56.2803l-88 -72.0195c-16.9697 -13.8701 -41.9102 -11.5 -55.9697 5.21973z" />
+    <glyph glyph-name="praying-hands" unicode="&#xf684;" horiz-adv-x="640" 
+d="M272 256.09c17.5996 0 32 -14.3994 32 -32v-128c0 -51.8896 -34.8398 -98.0801 -84.75 -112.35l-179.19 -46.6201c-2.64941 -0.69043 -5.36914 -1.03027 -8.05957 -1.03027c-23.4805 0 -32 21.1797 -32 32v96
+c0 0.00390625 -0.00488281 -0.000976562 -0.00488281 0.00292969c0 14.1221 9.1748 26.1182 21.8848 30.3477l90.1201 30.04v80.2295c0 18.9805 5.55957 37.3896 16.1201 53.2305l117.26 175.899c0.169922 0.270508 0.589844 0.25 0.790039 0.480469
+c9.58008 13.5098 27.8496 17.8799 42.2998 9.20996c15.1602 -9.10059 20.0605 -28.75 10.9707 -43.9102l-77.75 -129.59c-8.9707 -14.9199 -13.6904 -32 -13.6904 -49.3906v-76.5498c0 -8.83984 7.16016 -16 16 -16s16 7.16016 16 16v80c0 17.6006 14.4004 32 32 32z
+M618.12 94.3604c13.0703 -4.36035 21.8799 -16.5801 21.8799 -30.3506v-96c0 -10.8193 -8.51953 -32 -32 -32c-2.67969 0 -5.40039 0.339844 -8.05957 1.03027l-179.19 46.6201c-49.9102 14.2598 -84.75 60.4502 -84.75 112.34v128c0 17.5996 14.4004 32 32 32
+s32 -14.4004 32 -32v-80c0 -8.83984 7.16016 -16 16 -16s16 7.16016 16 16v76.5498c0 17.3906 -4.71973 34.4697 -13.6904 49.3906l-77.75 129.59c-9.08984 15.1602 -4.18945 34.8193 10.9707 43.9102c14.4502 8.66992 32.7197 4.2998 42.2998 -9.20996
+c0.200195 -0.240234 0.610352 -0.210938 0.790039 -0.480469l117.26 -175.89c10.5605 -15.8408 16.1201 -34.25 16.1201 -53.2305v-80.2295z" />
+    <glyph glyph-name="quran" unicode="&#xf687;" horiz-adv-x="448" 
+d="M448 89.5996c0 -9.59961 -3.2002 -16 -9.59961 -19.1992c-3.2002 -12.8008 -3.2002 -57.6006 0 -73.6006c6.39941 -6.39941 9.59961 -12.7998 9.59961 -19.2002v-16c0 -16 -12.7998 -25.5996 -25.5996 -25.5996h-326.4c-54.4004 0 -96 41.5996 -96 96v320
+c0 54.4004 41.5996 96 96 96h326.4c16 0 25.5996 -9.59961 25.5996 -25.5996v-332.801zM301.08 302.18l-11.1904 -22.6494l-24.9893 -3.62988c-2.68066 -0.390625 -3.75 -3.66992 -1.81055 -5.56055l18.0898 -17.6299l-4.26953 -24.8896
+c-0.360352 -2.11035 1.30957 -3.82031 3.20996 -3.82031c0.5 0 1.01953 0.120117 1.51953 0.379883l22.3604 11.75l22.3604 -11.75c0.5 -0.259766 1.01953 -0.379883 1.51953 -0.379883c1.90039 0 3.57031 1.70996 3.20996 3.82031l-4.26953 24.8896l18.0898 17.6299
+c1.92969 1.89062 0.859375 5.16992 -1.81055 5.56055l-25 3.62988l-11.1797 22.6494c-0.599609 1.20996 -1.75977 1.82031 -2.91992 1.82031s-2.32031 -0.610352 -2.91992 -1.82031zM243.19 371.19c-63.5205 0 -115.19 -51.6709 -115.19 -115.19
+c0 -63.5098 51.6699 -115.19 115.18 -115.18c13.6006 0 27.1201 2.46973 40.1904 7.33984c2.67969 0.910156 4.62012 3.43945 4.62012 6.41992c0 3.63965 -2.87012 6.78027 -6.7998 6.78027c-0.650391 0 -3.10059 -0.209961 -4.13086 -0.209961
+c-52.3096 0 -94.8594 42.5596 -94.8594 94.8594c0 52.3105 42.5498 94.8604 94.8594 94.8604c1.04004 0 3.45996 -0.209961 4.13086 -0.209961c0.738281 -0.276367 1.54004 -0.429688 2.375 -0.429688c3.73926 0 6.77441 3.03516 6.77441 6.77441
+c0 3.7373 -3.0332 6.77246 -6.76953 6.77539c-13.1201 4.91992 -26.71 7.41016 -40.3799 7.41016zM380.8 0v64h-284.8c-16 0 -32 -12.7998 -32 -32s12.7998 -32 32 -32h284.8z" />
+    <glyph glyph-name="search-dollar" unicode="&#xf688;" 
+d="M505.04 5.33984c9.2998 -9.39941 9.2998 -24.5898 -0.0996094 -33.9902l-28.3008 -28.2998c-9.2998 -9.39941 -24.5 -9.39941 -33.8994 0l-99.71 99.6904c-4.5 4.5 -7 10.5996 -7 17v16.2998c-35.2998 -27.5996 -79.71 -44 -128.011 -44
+c-114.909 0 -208.02 93.0898 -208.02 207.979c0 114.891 93.1201 207.98 208.02 207.98c114.9 0 208.011 -93.0898 208.011 -207.98c0 -48.2998 -16.4004 -92.6895 -44 -127.989h16.2998c6.40039 0 12.5 -2.5 17 -7zM208.02 96.04c79.6504 0 144 64.4502 144 143.979
+c0 79.6406 -64.46 143.98 -144 143.98c-79.6494 0 -144 -64.4502 -144 -143.98c0 -79.6396 64.4609 -143.979 144 -143.979zM235.13 248.58c18.6006 -5.58008 31.5898 -23.4199 31.5898 -43.3896c0 -24.5303 -19.0498 -44.4404 -42.6797 -45.0703v-16.1201
+c0 -4.41992 -3.58008 -8 -8 -8h-16c-4.41992 0 -8 3.58008 -8 8v16.29c-11.29 0.580078 -22.2705 4.51953 -31.3701 11.3496c-3.90039 2.93066 -4.09961 8.77051 -0.570312 12.1406l11.75 11.21c2.77051 2.63965 6.89062 2.75977 10.1309 0.729492
+c3.85938 -2.42969 8.25977 -3.71973 12.8193 -3.71973h28.1006c6.5 0 11.7998 5.91992 11.7998 13.1904c0 5.94922 -3.61035 11.1797 -8.77051 12.7295l-45.0098 13.5c-18.5898 5.58008 -31.5801 23.4199 -31.5801 43.3896c0 24.5205 19.0498 44.4404 42.6797 45.0703
+v16.1201c0 4.41992 3.58008 8 8 8h16c4.4209 0 8 -3.58008 8 -8v-16.29c11.29 -0.580078 22.2705 -4.51953 31.3701 -11.3496c3.90039 -2.93066 4.10059 -8.77051 0.570312 -12.1406l-11.75 -11.21c-2.76953 -2.63965 -6.88965 -2.75977 -10.1299 -0.729492
+c-3.86035 2.42969 -8.25977 3.71973 -12.8203 3.71973h-28.1094c-6.5 0 -11.8008 -5.91992 -11.8008 -13.1904c0 -5.94922 3.61035 -11.1797 8.77051 -12.7295z" />
+    <glyph glyph-name="search-location" unicode="&#xf689;" 
+d="M505.04 5.33984c9.2998 -9.39941 9.2998 -24.5898 -0.0996094 -33.9902l-28.3008 -28.2998c-9.2998 -9.39941 -24.5 -9.39941 -33.8994 0l-99.71 99.6904c-4.5 4.5 -7 10.5996 -7 17v16.2998c-35.2998 -27.5996 -79.71 -44 -128.011 -44
+c-114.909 0 -208.02 93.0898 -208.02 207.979c0 114.891 93.1201 207.98 208.02 207.98c114.9 0 208.011 -93.0898 208.011 -207.98c0 -48.2998 -16.4004 -92.6895 -44 -127.989h16.2998c6.40039 0 12.5 -2.5 17 -7zM208.02 96.04c79.6504 0 144 64.4502 144 143.979
+c0 79.6406 -64.46 143.98 -144 143.98c-79.6494 0 -144 -64.4502 -144 -143.98c0 -79.6396 64.4609 -143.979 144 -143.979zM208.04 336c40.7803 0 73.8398 -33.0498 73.8398 -73.8301c0 -32.9697 -48.2598 -93.0498 -66.75 -114.86
+c-1.69531 -2.02832 -4.23926 -3.32031 -7.08691 -3.32031c-2.84863 0 -5.39746 1.29199 -7.09277 3.32031c-18.4902 21.8105 -66.75 81.9004 -66.75 114.86c0 40.7803 33.0596 73.8301 73.8398 73.8301zM208.04 240c13.25 0 24 10.75 24 24c0 13.2598 -10.75 24 -24 24
+s-24 -10.7402 -24 -24c0 -13.25 10.7402 -24 24 -24z" />
+    <glyph glyph-name="socks" unicode="&#xf696;" 
+d="M214.66 136.99c-52.7402 -39.5605 -69.0498 -110.021 -39.2002 -165.4l-21.8604 -16.3896c-17.2695 -12.9502 -37.4893 -19.2002 -57.5195 -19.2002c-32.8105 0 -65.6904 16.75 -83.9404 48.3301c-24.6494 42.6396 -10.1895 97.5 29.21 127.06l86.6504 64.6104v176h160
+v-160zM288 416v-32h-160v32c0 17.6699 14.3301 32 32 32h128c2.84961 0 5.40039 -0.919922 8.01953 -1.62012c-4.94922 -9.08008 -8.01953 -19.3301 -8.01953 -30.3799zM480 448c17.6699 0 32 -14.3301 32 -32v-32h-192v32c0 17.6699 14.3301 32 32 32h128zM320 176v176h192
+v-208c0 -41.8877 -20.0566 -79.043 -51.2002 -102.4l-115.2 -86.3994c-17.2695 -12.9502 -37.4893 -19.2002 -57.5195 -19.2002c-32.8105 0 -65.1699 16.75 -83.4199 48.3301c-24.6504 42.6396 -10.1904 97.5 29.21 127.06z" />
+    <glyph glyph-name="square-root-alt" unicode="&#xf698;" horiz-adv-x="576" 
+d="M571.31 196.69c6.25 -6.25 6.25 -16.3809 0 -22.6309l-46.0596 -46.0596l46.0596 -46.0596c6.25 -6.25 6.25 -16.3809 0 -22.6309l-22.6191 -22.6191c-6.25 -6.25 -16.3809 -6.25 -22.6309 0l-46.0596 46.0596l-46.0596 -46.0596c-6.25 -6.25 -16.3809 -6.25 -22.6309 0
+l-22.6191 22.6191c-6.25 6.25 -6.25 16.3809 0 22.6309l46.0596 46.0596l-46.0596 46.0596c-6.25 6.25 -6.25 16.3809 0 22.6309l22.6191 22.6191c6.25 6.25 16.3809 6.25 22.6309 0l46.0596 -46.0596l46.0596 46.0596c6.25 6.25 16.3809 6.25 22.6309 0zM552 448
+c13.25 0 24 -10.7402 24 -24v-48c0 -13.25 -10.75 -24 -24 -24h-194.97l-97.8105 -374.52c-9.83984 -32.4805 -37.0098 -41.4805 -54.2793 -41.4805c-18.6406 0 -35.9502 8.5 -48.4404 28.2695l-88.8799 163.73h-43.6201c-13.25 0 -24 10.75 -24 24v48
+c0 13.2598 10.75 24 24 24h81.4697c12.0801 -0.00292969 22.584 -6.67871 28.0303 -16.5703l58.4102 -106.1l84.79 322.8c3.68945 14.0703 16.4102 23.8701 30.9502 23.8701h244.35z" />
+    <glyph glyph-name="star-and-crescent" unicode="&#xf699;" 
+d="M340.47 -18.3604c8.74023 0 15.1299 -6.96973 15.1299 -15.0596c0 -6.62012 -4.31934 -12.2402 -10.2793 -14.2598c-29.04 -10.8301 -59.0898 -16.3203 -89.3203 -16.3203c-141.16 0 -256 114.84 -256 256s114.84 256 256 256c30.3896 0 60.5801 -5.54004 89.75 -16.4805
+c6.91992 -2.59961 10.9297 -9.83984 9.46973 -17.0898c-1.41992 -7.04004 -7.62012 -12.0693 -14.75 -12.0693c-1.47949 0 -6.85938 0.459961 -9.17969 0.459961c-116.25 0 -210.82 -94.5703 -210.82 -210.82s94.5703 -210.82 210.82 -210.82
+c2.29004 0 7.72949 0.459961 9.17969 0.459961zM503.46 234.14c8.16992 -1.17969 11.4297 -11.2197 5.52051 -16.9893l-55.2705 -53.8701l13.0498 -76.0703c1.11035 -6.42969 -4.00977 -11.6602 -9.80957 -11.6602c-1.53027 0 -3.11035 0.370117 -4.64062 1.16992
+l-68.3096 35.9102l-68.3301 -35.9102c-1.53027 -0.80957 -3.11035 -1.16992 -4.63965 -1.16992c-5.7998 0 -10.9199 5.21973 -9.81055 11.6602l13.0498 76.0703l-55.2695 53.8701c-5.91016 5.76953 -2.65039 15.8096 5.51953 16.9893l76.3809 11.1006l34.1592 69.21
+c1.83008 3.7002 5.38086 5.5498 8.93066 5.5498s7.09961 -1.84961 8.92969 -5.5498l34.1602 -69.21z" />
+    <glyph glyph-name="star-of-david" unicode="&#xf69a;" horiz-adv-x="464" 
+d="M405.68 192l53.2207 -89.3896c14.4092 -24.21 -3.41016 -54.6104 -32.0107 -54.6104h-106.93l-55.9502 -93.9805c-7.14941 -12.0098 -19.5801 -18.0195 -32.0098 -18.0195s-24.8604 6.00977 -32.0098 18.0195l-55.9502 93.9805h-106.93
+c-28.6006 0 -46.4199 30.4004 -32.0107 54.6104l53.2207 89.3896l-53.2207 89.3896c-14.4092 24.21 3.41016 54.6104 32.0107 54.6104h106.93l55.9502 93.9805c7.14941 12.0098 19.5801 18.0195 32.0098 18.0195s24.8604 -6.00977 32.0098 -18.0195l55.9502 -93.9805h106.92
+c28.6006 0 46.4199 -30.4004 32.0098 -54.6104zM392.9 280h-39.6006l19.7998 -33.2598zM340.51 192l-52.3896 88h-112.25l-52.3799 -88l52.3896 -88h112.24zM232 374.28l-22.7803 -38.2803h45.5703zM71.0996 280l19.8008 -33.2598l19.7998 33.2598h-39.6006zM71.0996 104
+h39.6006l-19.7998 33.2598zM232 9.71973l22.7803 38.2803h-45.5703zM353.29 104h39.6104l-19.8105 33.2598z" />
+    <glyph glyph-name="synagogue" unicode="&#xf69b;" horiz-adv-x="640" 
+d="M70 251.49c5.30957 6.00977 14.6904 6.00977 20 0l38 -43.0703v-272.42h-128v226.07l0.00488281 0.0185547c0 6.75391 2.51758 12.9229 6.66504 17.6211zM633.33 179.71c4.2998 -4.87012 6.66992 -11.1396 6.66992 -17.6396v-226.07h-128v272.42l38 43.0703
+c5.30957 6.01953 14.6904 6.01953 20 0zM339.99 440.99l128 -102.4c7.58984 -6.07031 12.0098 -15.2695 12.0098 -24.9902v-377.6h-96v96c0 38.8701 -34.6602 69.6504 -74.75 63.1201c-31.4697 -5.12012 -53.25 -34.6699 -53.25 -66.5498v-92.5703h-96v377.6
+c0 10.1123 4.67773 19.123 12.0098 24.9902l128 102.4c11.6904 9.34961 28.29 9.34961 39.9805 0zM392.06 225.44l-19.1895 30.5596l19.2002 30.5703c1.97949 3.14941 -0.290039 7.23926 -4 7.23926h-38.9502l-25.1201 39.9805c-1.84961 2.9502 -6.15039 2.9502 -8 0
+l-25.1201 -40h-38.9395c-3.70996 0 -5.98047 -4.08984 -4 -7.24023l19.1992 -30.5596l-19.1992 -30.5605c-1.98047 -3.14941 0.279297 -7.23926 4 -7.23926h38.9395l25.1201 -39.9805c1.84961 -2.9502 6.15039 -2.9502 8 0l25.1201 39.9902h38.9395
+c3.70996 0 5.98047 4.08984 4 7.24023z" />
+    <glyph glyph-name="torah" unicode="&#xf6a0;" horiz-adv-x="640" 
+d="M320.05 81.5195l-17.7402 29.6406h35.46zM419.26 247.52l-18.3994 -30.8193l-18.46 30.8193h36.8594zM48 448c26.5098 0 48 -14.3301 48 -32v-448c0 -17.6699 -21.4902 -32 -48 -32s-48 14.3301 -48 32v448c0 17.6699 21.4902 32 48 32zM220.74 136.5l18.3896 30.8203
+l18.46 -30.8203h-36.8496zM382.45 136.5l18.4102 30.7998l18.4492 -30.7998h-36.8594zM128 -16v416h384v-416h-384zM194.77 262.13c-1.7627 -3.04492 -2.77148 -6.62402 -2.77148 -10.3936c0 -3.92969 1.09668 -7.60547 3.00195 -10.7363l29.3604 -49l-29.21 -48.8398
+c-1.91211 -3.17578 -3.02637 -6.91699 -3.02637 -10.8906c0 -11.6504 9.45898 -21.1094 21.1104 -21.1094h0.015625h59.5l29.25 -48.8799c3.61816 -6.12793 10.2754 -10.2207 17.9004 -10.2207h0.0996094c7.7373 0.0166016 14.4912 4.17676 18.1602 10.4004l29.1299 48.7002
+h59.4697c0.0078125 0 0.00195312 -0.0224609 0.00878906 -0.0224609c7.90723 0 14.8115 4.32812 18.4717 10.7422c1.75879 3.04199 2.76562 6.61621 2.76562 10.3799c0 3.93164 -1.09863 7.6084 -3.00586 10.7402l-29.3701 49l29.2402 48.8496
+c1.90723 3.17383 3.01758 6.91113 3.01758 10.8809c0 11.6553 -9.46191 21.1182 -21.1182 21.1191h-59.5195l-29.25 48.8604c-3.6123 6.12207 -10.2617 10.21 -17.8779 10.21h-0.0722656c-0.0117188 0 -0.00976562 0.0224609 -0.0214844 0.0224609
+c-7.74316 0 -14.5186 -4.17383 -18.1982 -10.3926l-29.1299 -48.71h-59.4502c-0.015625 0 -0.0166016 0.0224609 -0.0322266 0.0224609c-7.89844 0 -14.7939 -4.32422 -18.4482 -10.7324zM592 448c26.5098 0 48 -14.3301 48 -32v-448c0 -17.6699 -21.4902 -32 -48 -32
+s-48 14.3301 -48 32v448c0 17.6699 21.4902 32 48 32zM320 302.47l17.6797 -29.6201h-35.46zM257.55 247.47l-18.3701 -30.7998l-18.4395 30.7998h36.8096zM287.13 136.47l-33.2295 55.5303l33.1699 55.5195h65.79l33.2295 -55.5195l-33.1699 -55.5303h-65.79z" />
+    <glyph glyph-name="torii-gate" unicode="&#xf6a1;" 
+d="M376.45 416c48.5918 0.00292969 94.8242 11.6396 135.55 32v-96c0 -17.6699 -14.3301 -32 -32 -32h-32v-64h48c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-48v-240c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v240
+h-256v-240c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v240h-48c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h48v64h-32c-17.6699 0 -32 14.3301 -32 32v96c40.7256 -20.3604 86.958 -31.9971 135.55 -32h240.9zM128 320v-64h96
+v64h-96zM384 256v64h-96v-64h96z" />
+    <glyph glyph-name="vihara" unicode="&#xf6a7;" horiz-adv-x="640" 
+d="M632.88 47.29c5.41992 -3.61035 7.7002 -9.62012 6.99023 -15.29c-0.620117 -5.00977 -3.56055 -9.75 -8.71973 -12.3301l-55.1504 -19.6699v-48c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v48h-160v-48c0 -8.83984 -7.16016 -16 -16 -16h-32
+c-8.83984 0 -16 7.16016 -16 16v48h-160v-48c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v48l-55.1602 19.6699c-5.14941 2.58008 -8.09961 7.32031 -8.71973 12.3301c-0.700195 5.66016 1.58008 11.6699 7 15.29l88.8799 48.71v64
+l-55.1602 17.6904c-11.79 5.89941 -11.79 22.7197 0 28.6191l119.16 49.6904v64l-27.3096 16.3096c-7.7207 7.7207 -5.61035 20.7402 4.15918 25.6201l183.15 86.0703l183.15 -86.0801c9.76953 -4.87988 11.8799 -17.9004 4.15918 -25.6201l-27.3096 -16.2998v-64
+l119.16 -49.6904c11.79 -5.89941 11.79 -22.7197 0 -28.6191l-55.1602 -17.6904v-64zM224 320v-64h192v64h-192zM160 96h320v64h-320v-64z" />
+    <glyph glyph-name="volume-mute" unicode="&#xf6a9;" 
+d="M215.03 376.95c15.0098 15.0098 40.9697 4.49023 40.9697 -16.9697v-335.961c0 -21.4395 -25.9404 -32 -40.9697 -16.9697l-88.9707 88.9502h-102.06c-13.2598 0 -24 10.75 -24 24v144c0 13.2598 10.7402 24 24 24h102.06zM461.64 192l45.6406 -45.6396
+c6.2998 -6.30078 6.2998 -16.5205 0 -22.8203l-22.8203 -22.8203c-6.2998 -6.2998 -16.5195 -6.2998 -22.8203 0l-45.6396 45.6406l-45.6299 -45.6299c-6.2998 -6.30078 -16.5205 -6.30078 -22.8203 0l-22.8193 22.8193c-6.30078 6.2998 -6.30078 16.5205 0 22.8203
+l45.6299 45.6299l-45.6406 45.6396c-6.2998 6.30078 -6.2998 16.5205 0 22.8203l22.8203 22.8203c6.2998 6.2998 16.5195 6.2998 22.8203 0l45.6396 -45.6406l45.6396 45.6406c6.30078 6.2998 16.5205 6.2998 22.8203 0l22.8203 -22.8203
+c6.2998 -6.2998 6.2998 -16.5195 0 -22.8203z" />
+    <glyph glyph-name="yin-yang" unicode="&#xf6ad;" horiz-adv-x="496" 
+d="M248 440c136.97 0 248 -111.03 248 -248s-111.03 -248 -248 -248s-248 111.03 -248 248s111.03 248 248 248zM248 64c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM248 192c53.0195 0 96 42.9805 96 96s-42.9805 96 -96 96
+c-106.04 0 -192 -85.96 -192 -192s85.96 -192 192 -192c-53.0195 0 -96 42.9805 -96 96s42.9805 96 96 96zM248 320c17.6699 0 32 -14.3301 32 -32s-14.3301 -32 -32 -32s-32 14.3301 -32 32s14.3301 32 32 32z" />
+    <glyph glyph-name="blender-phone" unicode="&#xf6b6;" horiz-adv-x="576" 
+d="M392 384c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h157.82l-17.46 -64h-140.36c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h131.64l-17.46 -64h-114.18c-4.41992 0 -8 -3.58008 -8 -8v-16c0 -4.41992 3.58008 -8 8 -8h105.46
+l-17.46 -64h-288v352h384l-17.46 -64h-166.54zM158.8 112.99c3.00977 -7.40039 0.200195 -15.8506 -6.68945 -20.0703l-39.4102 -24.1797c-12.5303 -7.68066 -31.7803 -6 -41.6504 4.7998c-94.0996 102.94 -94.6699 258.89 -2.09961 362.49
+c11.1396 12.4697 29.5596 15.8398 43.8896 7.0498l39.2803 -24.0996c6.87988 -4.2207 9.7002 -12.6807 6.67969 -20.0703l-25.7803 -63.2598c-2.7793 -6.80078 -9.80957 -10.9902 -17.2393 -10.2607l-45.0303 4.41992c-17.6504 -47.9395 -17.2803 -100.779 0 -147.72
+l45.0303 4.41992c7.43945 0.730469 14.46 -3.4502 17.2393 -10.2598zM480 64c35.3496 0 64 -28.6504 64 -64v-32c0 -17.6699 -14.3301 -32 -32 -32h-352c-17.6699 0 -32 14.3301 -32 32v32c0 35.3496 28.6504 64 64 64h288zM336 -32c17.6699 0 32 14.3301 32 32
+s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="book-dead" unicode="&#xf6b7;" horiz-adv-x="448" 
+d="M272 312c-8.7998 0 -16 7.2002 -16 16s7.2002 16 16 16s16 -7.2002 16 -16s-7.2002 -16 -16 -16zM448 89.5996c0 -9.59961 -3.2002 -16 -9.59961 -19.1992c-3.2002 -12.8008 -3.2002 -57.6006 0 -73.6006c6.39941 -6.39941 9.59961 -12.7998 9.59961 -19.2002v-16
+c0 -16 -12.7998 -25.5996 -25.5996 -25.5996h-326.4c-54.4004 0 -96 41.5996 -96 96v320c0 54.4004 41.5996 96 96 96h326.4c16 0 25.5996 -9.59961 25.5996 -25.5996v-332.801zM240 392c-44.2002 0 -80 -28.7002 -80 -64c0 -20.9004 12.7002 -39.2002 32 -50.9004v-13.0996
+c0 -8.7998 7.2002 -16 16 -16h64c8.7998 0 16 7.2002 16 16v13.0996c19.2998 11.7002 32 30 32 50.9004c0 35.2998 -35.7998 64 -80 64zM124.8 224.7c-1.7002 -4.10059 0.100586 -8.7998 4.2002 -10.5l70.5 -30.2998l-70.4004 -30.1006
+c-4.09961 -1.7002 -5.89941 -6.39941 -4.19922 -10.5l6.2998 -14.7002c1.7002 -4.09961 6.39941 -5.89941 10.5 -4.19922l98.2998 42.1992l98.2998 -42.0996c4.10059 -1.7002 8.7998 0.0996094 10.5 4.2002l6.2998 14.7002c1.7002 4.09961 -0.0996094 8.7998 -4.19922 10.5
+l-70.3008 30.0996l70.3008 30.2002c4.09961 1.7002 5.89941 6.39941 4.19922 10.5l-6.2998 14.7002c-1.7002 4.09961 -6.39941 5.89941 -10.5 4.19922l-98.3994 -42.0996l-98.3008 42.0996c-4.09961 1.7002 -8.7998 -0.0996094 -10.5 -4.19922zM380.8 0v64h-284.8
+c-16 0 -32 -12.7998 -32 -32s12.7998 -32 32 -32h284.8zM208 312c-8.7998 0 -16 7.2002 -16 16s7.2002 16 16 16s16 -7.2002 16 -16s-7.2002 -16 -16 -16z" />
+    <glyph glyph-name="campground" unicode="&#xf6bb;" horiz-adv-x="640" 
+d="M624 0c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-608c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h24.6797l239.79 330.25l-53.4102 73.5498c-5.19922 7.15039 -3.60938 17.1602 3.54004 22.3506l25.8809 18.7998
+c7.14941 5.18945 17.1592 3.59961 22.3496 -3.5498l41.1699 -56.7002l41.1602 56.6895c5.2002 7.16016 15.2002 8.74023 22.3496 3.55078l25.9004 -18.79c7.14941 -5.19043 8.72949 -15.2002 3.54004 -22.3506l-53.4102 -73.5498l239.78 -330.25h24.6797zM320 160
+l-116.36 -160h232.721z" />
+    <glyph glyph-name="cat" unicode="&#xf6be;" 
+d="M290.59 256c11.8906 -58.3496 63.6006 -102.4 125.41 -102.4c11.1104 0 21.71 1.87012 32 4.54004v-206.14c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v144l-128 -96h32c17.6699 0 32 -14.3301 32 -32v-16c0 -8.83984 -7.16016 -16 -16 -16
+h-176c-35.2998 0 -64 28.7002 -64 64v256c0 17.6396 -14.3604 32 -32 32c-17.6699 0 -32 14.3301 -32 32s14.3301 32 32 32c52.9404 0 96 -43.0596 96 -96v-85.9502c55.7695 83.9697 142.41 85.9502 162.59 85.9502zM448 352l64 64v-134.4c0 -53.0195 -42.9805 -96 -96 -96
+s-96 42.9805 -96 96v134.4l64 -64h64zM376 272c8.83984 0 16 7.16016 16 16s-7.16016 16 -16 16s-16 -7.16016 -16 -16s7.16016 -16 16 -16zM456 272c8.83984 0 16 7.16016 16 16s-7.16016 16 -16 16s-16 -7.16016 -16 -16s7.16016 -16 16 -16z" />
+    <glyph glyph-name="chair" unicode="&#xf6c0;" horiz-adv-x="448" 
+d="M112 320v-128h-48v128c0 70.7002 57.2998 128 128 128h64c70.7002 0 128 -57.2998 128 -128v-128h-48v128c0 29.5 -16.2002 55 -40 68.9004v-196.9h-48v208h-48v-208h-48v196.9c-23.7998 -13.9004 -40 -39.4004 -40 -68.9004zM446.3 106.1
+c6.90039 -20.6992 -8.5 -42.0996 -30.2998 -42.0996v-112c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v112h-256v-112c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v112c-21.7998 0 -37.2002 21.4004 -30.4004 42.0996l10.7002 32
+c4.40039 13.1006 16.6006 21.9004 30.4004 21.9004h362.5c13.7998 0 26 -8.7998 30.3994 -21.9004z" />
+    <glyph glyph-name="cloud-moon" unicode="&#xf6c3;" horiz-adv-x="576" 
+d="M342.8 95.2998c40.9004 -3.5 73.2002 -37.3994 73.2002 -79.2998c0 -44.2002 -35.7998 -80 -80 -80h-240c-53 0 -96 43 -96 96c0 41.9004 27.0996 77.2002 64.5996 90.2998c-0.0996094 1.90039 -0.599609 3.7002 -0.599609 5.7002c0 53 43 96 96 96
+c36.2002 0 67.4004 -20.2998 83.7002 -49.9004c11.5 11 27.0996 17.9004 44.2998 17.9004c35.2998 0 64 -28.7002 64 -64c0 -12 -3.5 -23.0996 -9.2002 -32.7002zM565.3 149.6c8.2002 1.60059 14 -8 8.7002 -14.5c-33.4004 -41.0996 -82.7002 -67 -137.1 -70.3994
+c-11.1006 23.0996 -29.9004 41.7998 -53.5 52.5996c0.399414 3.5 0.599609 7.10059 0.599609 10.7002c0 52.9004 -43.0996 96 -96 96c-12.7002 0 -25 -2.5 -36.4004 -7.2002c-5.09961 5.2998 -10.7998 9.90039 -16.6992 14.2002c-1.10059 8.2002 -1.80078 16.5 -1.80078 25
+c0 106.1 86 192 191.9 192c11.7002 0 23.4004 -1.09961 35.0996 -3.2002c8.2002 -1.59961 10.1006 -12.5996 2.80078 -16.7002c-47.1006 -26.7998 -76.1006 -76.5996 -76.1006 -130.8c0 -94 85.4004 -165.399 178.5 -147.7z" />
+    <glyph glyph-name="cloud-sun" unicode="&#xf6c4;" horiz-adv-x="640" 
+d="M575.2 122.3c37.5996 -13 64.7998 -48.2998 64.7998 -90.3994c0 -53 -43 -96 -96 -96h-272c-53 0 -96 43 -96 96c0 50.5996 39.2998 91.5996 88.9004 95.2998c-0.200195 2.89941 -0.900391 5.7002 -0.900391 8.7002c0 61.8994 50.2002 112 112 112
+c45.4004 0 84.2998 -27.2002 101.9 -66c9.89941 6.19922 21.5 10 34.0996 10c35.2998 0 64 -28.7002 64 -64c0 -1.90039 -0.599609 -3.7002 -0.799805 -5.60059zM144.8 144.9c10.6006 -10.6006 22.9004 -18.6006 36 -24c-9.59961 -9.80078 -17.5 -21.1006 -23.5996 -33.5
+l-76.1006 -25.3008c-11.8994 -3.89941 -23.1992 7.30078 -19.1992 19.2002l29.2998 87.7998l-82.7998 41.4004c-11.2002 5.59961 -11.2002 21.5 0 27.0996l82.7998 41.5l-29.2998 87.8008c-3.90039 11.7998 7.39941 23.0996 19.1992 19.1992l87.9004 -29.2998
+l41.4004 82.7998c5.59961 11.2002 21.5996 11.2002 27.0996 0l41.5 -82.7998l87.7998 29.2998c11.9004 3.90039 23.2002 -7.2998 19.2002 -19.1992l-29.7998 -88.9004c-10.6006 -1.5 -20.9004 -3.7998 -30.7002 -7.5c-5.40039 11.7998 -12.5996 23 -22.2998 32.7002
+c-43.7002 43.7002 -114.7 43.7002 -158.4 0c-43.7002 -43.6006 -43.7002 -114.601 0 -158.3zM140 224.1c0 46.3008 37.7002 83.9004 84 83.9004c34 0 63.2998 -20.4004 76.5 -49.5c-36.4004 -22.5 -62 -60.7002 -67.4004 -105
+c-8.89941 -2.90039 -17.1992 -7 -25.1992 -11.7002c-38.6006 7.5 -67.9004 41.5 -67.9004 82.2998z" />
+    <glyph glyph-name="dice-d20" unicode="&#xf6cf;" horiz-adv-x="480" 
+d="M106.75 232.94l108.64 -190.101l-208.26 22.0703c-5.83008 0.639648 -9.00977 7.13965 -5.92969 12.1396zM7.41016 132.57c-2.12012 -3.44043 -7.41016 -1.94043 -7.41016 2.08984v162.81c0 3.11035 3.38965 5.03027 6.05957 3.43066l76.6406 -45.9805zM18.25 24.4004
+c-4.03027 1.97949 -2.25 8.06934 2.2002 7.56934l203.55 -22.2998v-65.6699c0 -5.83008 -6.0498 -9.70996 -11.3496 -7.25977zM99.4697 282.18l-81.5293 48.6904c-2.52051 1.51953 -2.60059 5.16016 -0.130859 6.78027l150.811 98.6094
+c7.18945 4.11035 15.1201 -4.08008 10.7803 -11.1396zM240 272h-109.21l95.5801 168.38c3.12988 5.08008 8.37988 7.62012 13.6299 7.62012s10.5 -2.54004 13.6299 -7.62012l95.5801 -168.38h-109.21zM473.94 300.9c2.66992 1.59961 6.05957 -0.320312 6.05957 -3.43066
+v-162.81c0 -4.04004 -5.2998 -5.54004 -7.41016 -2.10059l-75.29 122.351zM380.53 282.18l-79.9307 142.94c-4.33984 7.05957 3.59082 15.25 10.7803 11.1396l150.811 -98.5996c2.46973 -1.62012 2.39941 -5.25977 -0.130859 -6.78027zM459.55 31.9697
+c4.4502 0.5 6.23047 -5.58984 2.2002 -7.55957l-194.4 -87.6602c-5.2998 -2.4502 -11.3496 1.41992 -11.3496 7.25977v65.6699zM373.25 232.94l105.56 -155.891c3.08008 -5 -0.0996094 -11.4902 -5.92969 -12.1396l-208.26 -22.0703zM240 240h100.43l-100.43 -175.75
+l-100.43 175.75h100.43z" />
+    <glyph glyph-name="dice-d6" unicode="&#xf6d1;" horiz-adv-x="448" 
+d="M422.19 338.05c5.3291 -3.24023 5.2998 -11.2695 -0.0507812 -14.46l-198.14 -118.14l-198.13 118.14c-5.35059 3.19043 -5.37988 11.2305 -0.0605469 14.46l165.971 100.88c19.9102 12.1006 44.5195 12.1006 64.4297 0zM436.03 293.42
+c5.33008 3.17969 11.9697 -0.839844 11.9697 -7.25v-197.7c0 -23.7598 -12.1104 -45.7393 -31.79 -57.7002l-152.16 -92.4795c-10.6602 -6.48047 -24.0498 1.5498 -24.0498 14.4297v223.82zM0 286.17c0 6.41016 6.63965 10.4297 11.9697 7.25l196.03 -116.88v-223.81
+c0 -12.8906 -13.3799 -20.9102 -24.0498 -14.4307l-152.16 92.4697c-19.6797 11.9609 -31.79 33.9307 -31.79 57.7002v197.7z" />
+    <glyph glyph-name="dog" unicode="&#xf6d3;" horiz-adv-x="576" 
+d="M298.06 224l149.94 -53.5498v-218.45c0 -8.83105 -7.16895 -16 -16 -16h-64c-8.83105 0 -16 7.16895 -16 16v112h-160v-112c0 -8.83105 -7.16895 -16 -16 -16h-64c-8.83105 0 -16 7.16895 -16 16v213.91c-37.1602 13.25 -64 48.4297 -64 90.0898
+c0 17.6611 14.3389 32 32 32s32 -14.3389 32 -32c0.0332031 -17.6455 14.3545 -31.9668 32 -32h170.06zM544 336v-32c0 -35.3223 -28.6777 -64 -64 -64h-32v-35.5801l-128 45.71v149.87c0 14.25 17.2197 21.3896 27.3096 11.3096l27.2803 -27.3096h53.6299
+c10.9102 0 23.75 -7.91992 28.6201 -17.6904l7.16016 -14.3096h64c8.83105 0 16 -7.16895 16 -16zM432 336c0 8.83105 -7.16895 16 -16 16s-16 -7.16895 -16 -16s7.16895 -16 16 -16s16 7.16895 16 16z" />
+    <glyph glyph-name="dragon" unicode="&#xf6d5;" horiz-adv-x="640" 
+d="M18.3203 192.22c-15.96 -2.2793 -24.8906 17.8105 -12.5107 28.1406l117.4 116.34c21.7705 18.5996 53.2402 20.4697 77.0596 4.58984l119.73 -87.5996v-42.2705c0 -28.9102 5.29004 -56.9795 14.7305 -83.3799h-222.7c-14.25 0 -21.3906 17.2295 -11.3105 27.3096
+l91.2803 68.6904zM575.19 158.12c41.9092 -20.96 67.1592 -64.0801 64.6396 -111.36c-3.37988 -63.2002 -59.7002 -110.77 -122.99 -110.76h-499.08c-9.80957 0 -17.7598 8 -17.7598 17.7998c0 8.32031 5.78027 15.5303 13.9004 17.3301
+c89.54 19.9004 238.51 54.1006 434.1 60.9102c-59.9697 39.9902 -96 107.3 -96 179.38v108.62l-59.5801 24.8496c-5.90039 2.9502 -5.90039 11.3604 0 14.3105l59.5801 24.8398l-61.6396 50.3496c-5.04004 5.04004 -1.4707 13.6104 5.65918 13.6104h237.45
+c10.0703 0 19.5498 -4.7002 25.6006 -12.7598l74.5293 -99.3799c4.00781 -5.3457 6.37988 -12.042 6.37988 -19.2305c0 -5.12988 -1.20996 -9.98047 -3.35938 -14.2803l-14.3105 -28.6191c-5.25 -10.502 -16.0889 -17.6895 -28.6191 -17.6904h-30.9707
+c-8.48926 0 -16.6299 3.37012 -22.6299 9.37012l-28.0898 22.6299h-64v-36.6904c0.00195312 -18.791 10.7812 -35.0459 26.5303 -42.9199zM489.18 381.75c-4.33008 -17.1396 8.56055 -28.96 21.5205 -29.6699c11.6602 -0.629883 21.3799 7.34961 24.1299 18.2598z" />
+    <glyph glyph-name="drumstick-bite" unicode="&#xf6d7;" 
+d="M462.8 398.43c34.3203 -34.2793 50.4307 -79.5996 49.1299 -124.56c-41.9795 22.6602 -94.3594 17.5596 -128.739 -16.7998c-40.8809 -40.8398 -40.6904 -107.181 -1.05078 -151.07c-18.9736 -6.45312 -39.3203 -10.0049 -60.4648 -10.0049
+c-0.475586 0 -0.950195 0.000976562 -1.4248 0.00488281h-85.8896l-40.6104 -40.5596c-9.71973 -9.75 -11.0898 -24.0205 -6 -36.75c2.77051 -6.92383 4.3125 -14.5234 4.3125 -22.4316c0 -33.3086 -27.042 -60.3506 -60.3496 -60.3506
+c-16.7041 0 -31.8311 6.80078 -42.7627 17.7822c-15.2803 15.2695 -19.6006 36.5 -15.1006 56.0996c-19.6094 -4.49023 -40.8496 -0.179688 -56.1191 15.0703c-10.9395 10.9229 -17.668 26.002 -17.668 42.666c0 33.2979 27.0332 60.3301 60.3301 60.3301
+c7.88965 0 15.4277 -1.51758 22.3379 -4.27637c12.7793 -5.07031 27.0791 -3.69043 36.7793 6l40.6201 40.5898v85.8301c0 64 27.6904 107 63.1699 142.43c30.666 30.6338 73.0479 49.5889 119.774 49.5889s89.0605 -18.9551 119.726 -49.5889z" />
+    <glyph glyph-name="dungeon" unicode="&#xf6d9;" 
+d="M128.73 252.68c6.58984 -4.12012 8.89941 -12.2393 6.33984 -19.5801c-3 -8.60938 -5.15039 -17.6094 -6.24023 -26.9395c-0.929688 -7.91016 -7.0498 -14.1602 -15.0098 -14.1602h-97.1299c-9.10059 0 -16.7402 7.62988 -16.1504 16.7197
+c2.0293 31.5166 9.95215 61.9062 22.4502 89.2705c3.93945 8.62012 14.8896 11.4697 22.9297 6.4502zM319.03 440c9.16992 -2.36035 13.9102 -12.5996 10.3896 -21.3896l-37.4697 -104.03c-2.28027 -6.34961 -8.2998 -10.5801 -15.0498 -10.5801h-41.8008
+c-6.92773 0.00292969 -12.8281 4.41211 -15.0498 10.5801l-37.4697 104.03c-3.52051 8.79004 1.21973 19.04 10.3896 21.3896c20.1699 5.17969 41.2607 8 63.0303 8s42.8604 -2.82031 63.0303 -8zM112 160c8.83984 0 16 -7.16016 16 -16v-64
+c0 -8.83984 -7.16016 -16 -16 -16h-96c-8.83984 0 -16 7.16016 -16 16v64c0 8.83984 7.16016 16 16 16h96zM112 32c8.83984 0 16 -7.16016 16 -16v-64c0 -8.83984 -7.16016 -16 -16 -16h-96c-8.83984 0 -16 7.16016 -16 16v64c0 8.83984 7.16016 16 16 16h96zM189.31 315.67
+c2.85059 -7.12012 -0.0195312 -14.8799 -6.2998 -19.29c-6 -4.2002 -11.6094 -8.89941 -16.79 -14.0498c-5.4502 -5.41016 -13.5996 -6.86035 -20.1094 -2.79004l-82.9307 51.8301c-8.06934 5.04004 -10.2793 16.2002 -4.21973 23.5195
+c20.0459 24.1963 44.0801 44.3428 71.6104 59.8906c8.29004 4.67969 18.8896 0.519531 22.4199 -8.31055zM398.18 192c-7.95996 0 -14.0801 6.25 -15.0098 14.1602c-1.08984 9.32031 -3.22949 18.3301 -6.24023 26.9395c-2.55957 7.34082 -0.25 15.46 6.33984 19.5801
+l82.8105 51.7607c8.04004 5.01953 18.9902 2.16992 22.9297 -6.4502c12.499 -27.3633 20.4219 -57.7529 22.4502 -89.2705c0.589844 -9.08984 -7.0498 -16.7197 -16.1504 -16.7197h-97.1299zM453.03 354.89c6.06934 -7.31934 3.84961 -18.4795 -4.2207 -23.5098
+l-82.9297 -51.8301c-6.50977 -4.06934 -14.6699 -2.62012 -20.1104 2.79004c-5.17969 5.15039 -10.7891 9.85059 -16.7891 14.0498c-6.28027 4.40039 -9.15039 12.1602 -6.30078 19.2803l36.3203 90.7998c3.54004 8.83008 14.1396 12.9902 22.4199 8.31055
+c27.5303 -15.5479 51.5645 -35.6943 71.6104 -59.8906zM496 160c8.83984 0 16 -7.16016 16 -16v-64c0 -8.83984 -7.16016 -16 -16 -16h-96c-8.83984 0 -16 7.16016 -16 16v64c0 8.83984 7.16016 16 16 16h96zM496 32c8.83984 0 16 -7.16016 16 -16v-64
+c0 -8.83984 -7.16016 -16 -16 -16h-96c-8.83984 0 -16 7.16016 -16 16v64c0 8.83984 7.16016 16 16 16h96zM240 270.38c5.23047 0.889648 10.5195 1.62012 16 1.62012s10.7695 -0.730469 16 -1.62012v-294.38c0 -4.41992 -3.58008 -8 -8 -8h-16c-4.41992 0 -8 3.58008 -8 8
+v294.38zM176 228.87c8.16016 12.2998 19.2197 22.3203 32 29.7695v-282.64c0 -4.41992 -3.58008 -8 -8 -8h-16c-4.41992 0 -8 3.58008 -8 8v252.87zM304 258.64c12.7803 -7.44922 23.8398 -17.4697 32 -29.7695v-252.87c0 -4.41992 -3.58008 -8 -8 -8h-16
+c-4.41992 0 -8 3.58008 -8 8v282.64z" />
+    <glyph glyph-name="file-csv" unicode="&#xf6dd;" horiz-adv-x="384" 
+d="M224 312c0 -13.2002 10.7998 -24 24 -24h136v-328c0 -13.2998 -10.7002 -24 -24 -24h-336c-13.2998 0 -24 10.7002 -24 24v464c0 13.2998 10.7002 24 24 24h200v-136zM128 168v16c0 4.41992 -3.58008 8 -8 8h-8c-26.5098 0 -48 -21.4902 -48 -48v-32
+c0 -26.5098 21.4902 -48 48 -48h8c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8h-8c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h8c4.41992 0 8 3.58008 8 8zM172.27 64c23.3906 0 42.4004 17.3301 42.3906 38.6201
+c0 10.6602 -4.86035 20.9199 -13.3301 28.1396l-21.8896 18.7705c-1.37012 1.17969 -2.12012 2.54004 -2.12012 3.83984c0 3.12012 4.45996 6.62012 10.4102 6.62012h12.2695c4.41992 0 8 3.58008 8 8v16c0 4.41992 -3.58008 8 -8 8h-12.25
+c-23.3896 0 -42.4102 -17.3203 -42.4102 -38.6201c0 -10.6602 4.86035 -20.9199 13.3301 -28.1396l21.8896 -18.7705c1.37012 -1.17969 2.12012 -2.54004 2.12012 -3.83984c0 -3.12012 -4.45996 -6.62012 -10.4102 -6.62012h-12.2695c-4.41992 0 -8 -3.58008 -8 -8v-16
+c0 -4.41992 3.58008 -8 8 -8h12.2695zM256 184c0 4.41992 -3.58008 8 -8 8h-16c-4.41992 0 -8 -3.58008 -8 -8v-20.7998c0 -35.4805 12.8799 -68.8906 36.2803 -94.0898c3.01953 -3.25 7.26953 -5.11035 11.7197 -5.11035s8.7002 1.86035 11.7197 5.11035
+c23.4004 25.1992 36.2803 58.6094 36.2803 94.0898v20.7998c0 4.41992 -3.58008 8 -8 8h-16c-4.41992 0 -8 -3.58008 -8 -8v-20.7998c0 -20.2705 -5.7002 -40.1807 -16 -56.8799c-10.2998 16.71 -16 36.6094 -16 56.8799v20.7998zM377 343c4.5 -4.5 7 -10.5996 7 -16.9004
+v-6.09961h-128v128h6.09961c6.40039 0 12.5 -2.5 17 -7z" />
+    <glyph glyph-name="fist-raised" unicode="&#xf6de;" horiz-adv-x="384" 
+d="M255.98 288h-48.0303c-5.62988 0 -10.9502 -1.15039 -15.9697 -2.92969v146.93c0 8.83984 7.15918 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-144zM383.98 192.01l0.0195312 -88.2197c0 -26.4971 -10.7412 -50.5273 -28.1201 -67.9102l-35.9102 -35.9199v-63.96
+h-255.979v64l-26.5 26.5098c-24.0098 24.0098 -37.4902 56.5605 -37.4902 90.5098v77.9307c5.03027 -1.7998 10.3604 -2.9502 16 -2.9502h32c12.3301 0 23.4805 4.80957 32 12.4902c8.50977 -7.66992 19.6602 -12.4805 32 -12.4805h32
+c7.91016 0 15.2803 2.11035 21.8701 5.52051c7.46973 -16.3301 21.5996 -28.9404 38.8701 -34.4502c-17.1104 -14.8203 -31.5801 -34.4805 -47.3105 -58.0801l-6.30957 -9.46973c-0.845703 -1.26855 -1.35156 -2.79395 -1.35156 -4.43164
+c0 -2.77734 1.41895 -5.22559 3.57129 -6.6582l13.3105 -8.88086c1.26758 -0.845703 2.79395 -1.35156 4.43066 -1.35156c2.77734 0 5.22559 1.41992 6.65918 3.57227l6.30957 9.46973c31.8906 47.8398 51.5303 70.2695 96.0498 72.5498
+c4.29004 0.219727 7.88086 3.70996 7.88086 8v16.2002c0 4.41992 -3.52051 8 -13.2002 8h-35.2607c-26.2695 0 -47.5693 21.3203 -47.5693 47.5898v0.560547c0 8.7793 7.12012 15.8496 15.8994 15.8496h112.141c35.3301 0 63.9795 -28.6504 63.9902 -63.9902zM351.97 282.1
+c-10.0596 3.59082 -20.7197 5.90039 -32 5.90039h-32v112c0 8.83984 7.16016 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-117.9zM16 224c-8.83984 0 -16 7.16016 -16 16v128c0 8.83984 7.16016 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-128
+c0 -8.83984 -7.16016 -16 -16 -16h-32zM111.99 224c-8.83984 0 -16 7.16016 -16 16v160c0 8.83984 7.16016 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-160c0 -8.83984 -7.16016 -16 -16 -16h-32z" />
+    <glyph glyph-name="ghost" unicode="&#xf6e2;" horiz-adv-x="384" 
+d="M186.1 447.91c108.73 3.25977 197.9 -83.9102 197.9 -191.91v-271.97c0 -14.25 -17.2305 -21.3906 -27.3096 -11.3105l-24.9209 18.5303c-6.65918 4.95996 -16 3.99023 -21.5098 -2.20996l-42.9502 -48.3496c-6.25 -6.25 -16.3799 -6.25 -22.6299 0l-40.7197 45.8496
+c-6.36035 7.16992 -17.5498 7.16992 -23.9199 0l-40.7197 -45.8496c-6.25 -6.25 -16.3799 -6.25 -22.6299 0l-42.9502 48.3496c-5.50977 6.2002 -14.8506 7.16016 -21.5098 2.20996l-24.9209 -18.5303c-10.0791 -10.0801 -27.3096 -2.9502 -27.3096 11.3105v263.92
+c0 105.13 81.0098 196.81 186.1 199.96zM128 224c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32zM256 224c17.6699 0 32 14.3301 32 32s-14.3301 32 -32 32s-32 -14.3301 -32 -32s14.3301 -32 32 -32z" />
+    <glyph glyph-name="hammer" unicode="&#xf6e3;" horiz-adv-x="576" 
+d="M571.31 254.06c6.25 -6.25 6.25 -16.3799 0.0205078 -22.6191l-90.5098 -90.5107c-6.25 -6.25 -16.3799 -6.25 -22.6299 0l-22.6309 22.6299c-6.25 6.25 -6.25 16.3809 0 22.6309l11.3105 11.3096l-28.9004 28.9004
+c-21.3096 -5.63086 -44.8994 -0.360352 -61.6094 16.3496l-49.1406 49.1396c-12.0098 12 -18.75 28.2803 -18.75 45.25v18.75l-90.5098 45.25c62.4902 62.4805 163.8 62.4805 226.28 0l45.25 -45.25c16.71 -16.71 21.9795 -40.2998 16.3496 -61.6094l28.9004 -28.9004
+l11.3096 11.3105c6.25 6.25 16.3799 6.25 22.6299 0zM284.59 269.26l49.1406 -49.1396c3.53906 -3.54004 7.47949 -6.5 11.4395 -9.41016l-238.13 -255.07c-23.8799 -25.5801 -64.2002 -26.2695 -88.9297 -1.5293c-24.7305 24.7393 -24.04 65.0498 1.5293 88.9297
+l255.101 238.17c3.00977 -4.16016 6.14941 -8.25 9.84961 -11.9502z" />
+    <glyph glyph-name="hanukiah" unicode="&#xf6e6;" horiz-adv-x="640" 
+d="M232 288h16c4.41992 0 8 -3.58008 8 -8v-120h-32v120c0 4.41992 3.58008 8 8 8zM168 288h16c4.41992 0 8 -3.58008 8 -8v-120h-32v120c0 4.41992 3.58008 8 8 8zM392 288h16c4.41992 0 8 -3.58008 8 -8v-120h-32v120c0 4.41992 3.58008 8 8 8zM456 288h16
+c4.41992 0 8 -3.58008 8 -8v-120h-32v120c0 4.41992 3.58008 8 8 8zM544 280v-120h-32v120c0 4.41992 3.58008 8 8 8h16c4.41992 0 8 -3.58008 8 -8zM104 288h16c4.41992 0 8 -3.58008 8 -8v-120h-32v120c0 4.41992 3.58008 8 8 8zM624 288c8.83984 0 16 -7.16016 16 -16
+v-112c0 -53.0195 -42.9805 -96 -96 -96h-192v-64h176c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-416c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h176v64h-192c-53.0195 0 -96 42.9805 -96 96v112c0 8.83984 7.16016 16 16 16
+h32c8.83984 0 16 -7.16016 16 -16v-112c0 -17.6699 14.3301 -32 32 -32h192v192c0 8.83984 7.16016 16 16 16h32c8.83984 0 16 -7.16016 16 -16v-192h192c17.6699 0 32 14.3301 32 32v112c0 8.83984 7.16016 16 16 16h32zM608 320c-13.25 0 -24 11.9502 -24 26.6699
+s24 53.3301 24 53.3301s24 -38.5996 24 -53.3301c0 -14.7295 -10.75 -26.6699 -24 -26.6699zM32 320c-13.25 0 -24 11.9502 -24 26.6699s24 53.3301 24 53.3301s24 -38.5996 24 -53.3301c0 -14.7295 -10.75 -26.6699 -24 -26.6699zM320 368
+c-13.25 0 -24 11.9502 -24 26.6699s24 53.3301 24 53.3301s24 -38.5996 24 -53.3301c0 -14.7295 -10.75 -26.6699 -24 -26.6699zM112 320c-13.25 0 -24 11.9502 -24 26.6699s24 53.3301 24 53.3301s24 -38.5996 24 -53.3301c0 -14.7295 -10.75 -26.6699 -24 -26.6699z
+M176 320c-13.25 0 -24 11.9502 -24 26.6699s24 53.3301 24 53.3301s24 -38.5996 24 -53.3301c0 -14.7295 -10.75 -26.6699 -24 -26.6699zM240 320c-13.25 0 -24 11.9502 -24 26.6699s24 53.3301 24 53.3301s24 -38.5996 24 -53.3301
+c0 -14.7295 -10.75 -26.6699 -24 -26.6699zM400 320c-13.25 0 -24 11.9502 -24 26.6699s24 53.3301 24 53.3301s24 -38.5996 24 -53.3301c0 -14.7295 -10.75 -26.6699 -24 -26.6699zM464 320c-13.25 0 -24 11.9502 -24 26.6699s24 53.3301 24 53.3301
+s24 -38.5996 24 -53.3301c0 -14.7295 -10.75 -26.6699 -24 -26.6699zM528 320c-13.25 0 -24 11.9502 -24 26.6699s24 53.3301 24 53.3301s24 -38.5996 24 -53.3301c0 -14.7295 -10.75 -26.6699 -24 -26.6699z" />
+    <glyph glyph-name="hat-wizard" unicode="&#xf6e8;" 
+d="M496 0c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-480c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h480zM192 64l16 -32h-144l110.96 249.66c11.1211 25.0264 29.8379 45.6514 53.46 59.1494l187.58 107.19l-56.2998 -168.92
+c-2.12207 -6.35938 -3.25781 -13.2188 -3.25781 -20.2881c0 -8.93164 1.83496 -17.4375 5.14746 -25.1621l86.4102 -201.63h-208l16 32l64 32l-64 32l-32 64l-32 -64l-64 -32zM256 288l-32 -16l32 -16l16 -32l16 32l32 16l-32 16l-16 32z" />
+    <glyph glyph-name="hiking" unicode="&#xf6ec;" horiz-adv-x="384" 
+d="M80.9502 -24.2305l34.5596 138.221l52.7803 -52.7803l-25.2402 -100.97c-3.64941 -14.5303 -16.6895 -24.2305 -31.0195 -24.2305c-2.58008 0 -5.19043 0.290039 -7.7998 0.950195c-17.1406 4.28027 -27.5605 21.6504 -23.2803 38.8096zM95.8398 171.89
+c-2.18945 -8.41992 -11.0801 -13.54 -19.8701 -11.4395l-63.5596 15.25c-8.78027 2.10938 -14.1104 10.6396 -11.9199 19.0596l25.2695 98.1299c10.9707 42.1006 55.4404 67.6904 99.3203 57.1699c8.78027 -2.10938 14.1104 -10.6396 11.9199 -19.0596zM368 288
+c8.83984 0 16 -7.16016 15.9902 -16v-320.01c0 -8.83984 -7.16016 -16 -16 -16h-16c-8.83984 0 -16 7.16016 -16 16v240h-48c-8.48047 0 -16.6201 3.37988 -22.6201 9.37988l-22.4297 22.4297l-19.8906 -79.5693
+c-0.129883 -0.520508 -0.469727 -0.910156 -0.620117 -1.41016l46.8203 -46.8203c12.0898 -12.0898 18.75 -28.1602 18.75 -45.25v-82.75c0 -17.6699 -14.3301 -32 -32 -32s-32 14.3301 -32 32v82.75l-86.6201 86.6201c-5.79297 5.79395 -9.37109 13.7861 -9.37109 22.6191
+c0 2.67969 0.330078 5.28223 0.951172 7.77051l26.9199 107.721c6.56055 26.2197 30.0098 44.5195 57.0303 44.5195c15.7002 0 30.4697 -6.11035 41.5596 -17.2197l46.7803 -46.7803h34.75v16c0 8.83984 7.16016 16 16 16h16zM240 352c-26.5098 0 -48 21.4902 -48 48
+s21.4902 48 48 48s48 -21.4902 48 -48s-21.4902 -48 -48 -48z" />
+    <glyph glyph-name="hippo" unicode="&#xf6ed;" horiz-adv-x="640" 
+d="M581.12 351.8c34.0898 -0.189453 58.8799 -33.6895 58.8799 -67.7803v-92.0195c0 -17.6699 -14.3301 -32 -32 -32v-32c0 -8.83984 -7.16016 -16 -16 -16h-32c-8.83984 0 -16 7.16016 -16 16v32h-128v-176c0 -8.83984 -7.16016 -16 -16 -16h-64
+c-8.83984 0 -16 7.16016 -16 16v70.79c-32.3496 -14.3604 -70.7197 -22.79 -112 -22.79s-79.6504 8.42969 -112 22.79v-70.79c0 -8.83984 -7.16016 -16 -16 -16h-64c-8.83984 0 -16 7.16016 -16 16v240c0 88.3604 85.96 160 192 160
+c49.2402 0 94.0098 -15.5801 128 -40.9805v48.9805c0 13.2598 10.75 24 24 24h16c13.25 0 24 -10.7402 24 -24v-13.8799c10.0498 3.58008 20.7197 5.87988 32 5.87988c39.8301 0 73.9805 -24.2695 88.5195 -58.8203c24.1006 9.04004 48.9307 26.7705 76.6006 26.6201z
+M448 272c8.83984 0 16 7.16016 16 16s-7.16016 16 -16 16s-16 -7.16016 -16 -16s7.16016 -16 16 -16z" />
+    <glyph glyph-name="horse" unicode="&#xf6f0;" horiz-adv-x="576" 
+d="M575.92 371.4l0.0605469 -77.71c0 -0.0107422 0.0185547 -0.00683594 0.0185547 -0.0166016c0 -13.4707 -8.34277 -25.0088 -20.1387 -29.7236l-32.5508 -13.0205c-15.4395 -6.17969 -33.04 0.5 -40.4893 15.3701l-18.9004 37.7002l-16 7.11035v-102.471
+c0.00976562 -0.219727 0.0800781 -0.419922 0.0800781 -0.639648c0 -30.4697 -12.2598 -58.0303 -32 -78.2197v-177.78c0 -8.83984 -7.16016 -16 -16 -16h-64c-8.83984 0 -16 7.16016 -16 16v150.4l-133.97 22.3301l-23.8398 -63.5908l26.3096 -105.26
+c2.53027 -10.0996 -5.11035 -19.8799 -15.5195 -19.8799h-65.9609c-7.48633 0 -13.7783 5.16602 -15.5098 12.1201l-24.8496 99.4102c-1.24707 4.98047 -1.8916 10.1924 -1.8916 15.5576c0 7.8916 1.43262 15.4502 4.05176 22.4316l25.7197 68.6006
+c-18.7002 17.5195 -30.54 42.2402 -30.54 69.8799c0 2.62988 0.570312 5.09961 0.780273 7.67969c-9.91016 -7.29004 -16.7803 -18.46 -16.7803 -31.6797v-56c0 -8.83984 -7.16016 -16 -16 -16h-16c-8.83984 0 -16 7.16016 -16 16v56c0 48.5303 39.4697 88 88 88v-1.11035
+c17.5996 20.1299 43.1602 33.1104 72 33.1104h159.92c0 70.6904 57.3105 128 128 128h119.98c5.05957 0 8.94922 -4.67969 7.92969 -9.63965c-2.67969 -13.1699 -11.1201 -23.8203 -22.1797 -30.6602c5.10938 -5.37988 9.90918 -10.4697 13.6895 -14.5
+c5.56055 -5.93066 8.57031 -13.6699 8.58008 -21.7998zM511.92 352c8.83984 0 16 7.16016 16 16s-7.16016 16 -16 16s-16 -7.16016 -16 -16s7.16016 -16 16 -16z" />
+    <glyph glyph-name="house-damage" unicode="&#xf6f1;" horiz-adv-x="576" 
+d="M288 333.04l218.74 -192.94c1.54004 -1.37988 3.55957 -2.04004 5.25977 -3.19922v-184.9c0 -8.83984 -7.16016 -16 -16 -16h-176.19l-39.9199 55.25l104.11 64l-148.05 136.78l60.1602 -119.221l-104.11 -64l37.2305 -72.8096h-149.23c-8.83984 0 -16 7.16016 -16 16
+v184.94c1.78027 1.20996 3.84961 1.88965 5.46973 3.34961zM570.69 211.72c6.5791 -5.89941 7.11914 -16.0195 1.21973 -22.5898l-21.4004 -23.8203c-5.91016 -6.56934 -16.0293 -7.10938 -22.5996 -1.20996l-229.32 202.271c-6.0498 5.33008 -15.1201 5.33008 -21.1699 0
+l-229.32 -202.28c-6.58008 -5.91016 -16.6992 -5.35938 -22.5996 1.20996l-21.4004 23.8203c-5.90918 6.58008 -5.35938 16.6895 1.20996 22.5996l255.99 226.011c7.60059 6.85938 17.1406 10.2793 26.7002 10.2695s19.1201 -3.4502 26.75 -10.3096l101.25 -89.3809v51.6904
+c0 8.83984 7.16016 16 16 16h64c8.83984 0 16 -7.16016 16 -16v-136.45z" />
+    <glyph glyph-name="hryvnia" unicode="&#xf6f2;" horiz-adv-x="384" 
+d="M368 208h-99.7002l-34.6699 -32h134.37c8.83984 0 16 -7.16016 16 -16v-32c0 -8.83984 -7.16016 -16 -16 -16h-203.7l-29.4902 -27.2197c-4.3291 -4 -6.80957 -9.66992 -6.80957 -15.5801c0 -11.6807 9.50977 -21.2002 21.2002 -21.2002h83.6299
+c5.83301 0 11.1992 2.09375 15.3604 5.55957l11.75 9.80078c10.1895 8.48926 25.3193 7.12012 33.8096 -3.07031l20.4902 -24.5898c8.49023 -10.1807 7.10938 -25.3105 -3.07031 -33.7998l-11.7695 -9.81055c-18.6807 -15.5596 -42.2207 -24.0898 -66.54 -24.0898h-78.8203
+c-37.1396 0 -73.3799 17.8496 -92.0498 49.9502c-17.8701 30.7197 -17.54 65.4199 -4.12988 94.0498h-41.8604c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16h99.7002l34.6699 32h-134.37c-8.83984 0 -16 7.16016 -16 16v32c0 8.83984 7.16016 16 16 16
+h203.7l29.4902 27.21c4.3291 4 6.80957 9.66992 6.80957 15.5801c0 11.6797 -9.50977 21.2002 -21.2002 21.2002h-83.6201c-5.62012 0 -11.0693 -1.9707 -15.3896 -5.57031l-11.7305 -9.78027c-10.1895 -8.48926 -25.3193 -7.12012 -33.8096 3.07031l-20.4902 24.5898
+c-8.49023 10.1807 -7.10938 25.3105 3.07031 33.7998l11.7695 9.81055c18.6807 15.5596 42.2207 24.0898 66.54 24.0898h78.8203c37.1396 0 73.3799 -17.8398 92.0498 -49.9502c17.8701 -30.7197 17.54 -65.4199 4.12988 -94.0498h41.8604c8.83984 0 16 -7.16016 16 -16v-32
+c0 -8.83984 -7.16016 -16 -16 -16z" />
+    <glyph glyph-name="mask" unicode="&#xf6fa;" horiz-adv-x="640" 
+d="M320.67 384c449.09 0 348.32 -384 158.46 -384c-39.8994 0 -77.4697 20.6904 -101.41 55.8604l-25.7295 37.79c-15.6602 22.9893 -46.9707 22.9893 -62.6299 0l-25.7305 -37.79c-23.9502 -35.1699 -61.5195 -55.8604 -101.42 -55.8604c-199.11 0 -284.14 384 158.46 384z
+M184 139.64c41.0596 0 67.7598 25.6504 80.0801 41.0508c5.22949 6.54004 5.22949 16.0996 0 22.6299c-12.3203 15.3896 -39.0098 41.0498 -80.0801 41.0498s-67.7598 -25.6504 -80.0801 -41.0498c-5.22949 -6.54004 -5.22949 -16.1006 0 -22.6299
+c12.3203 -15.3906 39.0205 -41.0508 80.0801 -41.0508zM456 139.64c41.0596 0 67.7598 25.6504 80.0801 41.0508c5.22949 6.54004 5.22949 16.0996 0 22.6299c-12.3203 15.3896 -39.0098 41.0498 -80.0801 41.0498s-67.7598 -25.6504 -80.0801 -41.0498
+c-5.22949 -6.54004 -5.22949 -16.1006 0 -22.6299c12.3203 -15.3906 39.0205 -41.0508 80.0801 -41.0508z" />
+    <glyph glyph-name="mountain" unicode="&#xf6fc;" horiz-adv-x="640" 
+d="M634.92 -14.7002c3.2041 -4.98145 5.06348 -10.9756 5.06348 -17.334c0 -5.53906 -1.41113 -10.751 -3.89355 -15.2959c-5.60938 -10.2803 -16.3799 -16.6699 -28.0898 -16.6699h-576c-12.1191 0 -22.6582 6.7168 -28.0898 16.6602
+c-2.48242 4.5459 -3.89355 9.82715 -3.89355 15.3672c0 6.36035 1.85938 12.2891 5.06348 17.2725l288 448c5.88965 9.16016 16.0303 14.7002 26.9199 14.7002s21.0303 -5.54004 26.9199 -14.7002zM320 356.82l-102.06 -158.761l38.0596 -38.0596l64 64h85.3896z" />
+    <glyph glyph-name="network-wired" unicode="&#xf6ff;" horiz-adv-x="640" 
+d="M640 184c0 -8.83984 -7.16016 -16 -16 -16h-104v-40h56c17.6699 0 32 -14.3301 32 -32v-128c0 -17.6699 -14.3301 -32 -32 -32h-160c-17.6699 0 -32 14.3301 -32 32v128c0 17.6699 14.3301 32 32 32h56v40h-304v-40h56c17.6699 0 32 -14.3301 32 -32v-128
+c0 -17.6699 -14.3301 -32 -32 -32h-160c-17.6699 0 -32 14.3301 -32 32v128c0 17.6699 14.3301 32 32 32h56v40h-104c-8.83984 0 -16 7.16016 -16 16v16c0 8.83984 7.16016 16 16 16h280v40h-72c-17.6699 0 -32 14.3301 -32 32v128c0 17.6699 14.3301 32 32 32h192
+c17.6699 0 32 -14.3301 32 -32v-128c0 -17.6699 -14.3301 -32 -32 -32h-72v-40h280c8.83984 0 16 -7.16016 16 -16v-16zM256 320h128v64h-128v-64zM192 0v64h-96v-64h96zM544 0v64h-96v-64h96z" />
+    <glyph glyph-name="otter" unicode="&#xf700;" horiz-adv-x="640" 
+d="M608 416c17.6699 0 32 -14.3301 32 -32v-32c0 -53.0195 -42.9805 -96 -96 -96h-22.8604l-92.4697 -49.79l55.1104 -110.21h28.2197c17.6699 0 32 -14.3301 32 -32v-16c0 -8.83984 -7.16016 -16 -16 -16h-80l-74.5098 144.5l-149.49 -80.5h64
+c17.6699 0 32 -14.3301 32 -32v-16c0 -8.83984 -7.16016 -16 -16 -16h-224c-8.83008 0 -16 -7.16992 -16 -16s7.16992 -16 16 -16h112c17.6699 0 32 -14.3301 32 -32s-14.3301 -32 -32 -32h-108.47c-39.3799 0 -75.5205 26.9004 -82.2803 65.7002
+c-4.91016 28.1201 5 54.2197 23.1904 71.7998c23.5596 22.75 39.5596 52.1396 39.5596 84.8896v1.61035c0 106.04 85.96 192 192 192h56l153.25 87.5703c9.66992 5.51953 20.6104 8.42969 31.75 8.42969h20.4902c0.00390625 0 0.0166016 0.00878906 0.0214844 0.00878906
+c17.6602 0 33.6582 -7.17188 45.2383 -18.7588l13.25 -13.25h32zM512 400c-8.83984 0 -16 -7.16016 -16 -16s7.16016 -16 16 -16s16 7.16016 16 16s-7.16016 16 -16 16zM544 304c20.8301 0 38.4297 13.4199 45.0498 32h-77.0498l-118.57 -59.29l13.7705 -27.5498
+l101.84 54.8398h34.96z" />
+    <glyph glyph-name="ring" unicode="&#xf70b;" 
+d="M256 384c145.94 0 256 -61.9102 256 -144v-98.1299c0 -78.3506 -114.62 -141.87 -256 -141.87s-256 63.5195 -256 141.87v98.1299c0 82.0898 110.06 144 256 144zM256 320c-106.04 0 -192 -35.8203 -192 -80c0 -9.25977 3.96973 -18.1201 10.9102 -26.3896
+c44.9395 26.1797 108.859 42.3896 181.09 42.3896s136.15 -16.21 181.09 -42.3896c6.94043 8.26953 10.9102 17.1299 10.9102 26.3896c0 44.1797 -85.96 80 -192 80zM120.43 183.36c34.7305 -14.4307 82.6406 -23.3604 135.57 -23.3604s100.84 8.92969 135.57 23.3604
+c-34.6104 14.71 -81.21 24.6396 -135.57 24.6396s-100.96 -9.92969 -135.57 -24.6396z" />
+    <glyph glyph-name="running" unicode="&#xf70c;" horiz-adv-x="416" 
+d="M272 352c-26.5098 0 -48 21.4902 -48 48s21.4902 48 48 48s48 -21.4902 48 -48s-21.4902 -48 -48 -48zM113.69 130.53c7.92969 -17.2402 20.6699 -32.3799 37.9893 -42.6104l10.6699 -6.2998l-8.79004 -20.5205c-7.5293 -17.6494 -24.8594 -29.0898 -44.1094 -29.0898
+h-77.4502c-17.6699 0 -32 14.3301 -32 32s14.3301 32 32 32h66.8896zM384 224.01c17.6699 0 32 -14.3193 32 -31.9902c0 -17.6699 -14.3301 -32 -32 -32h-53.9902c-18.1895 0 -35.1094 10.5508 -43.1094 26.8906l-20.2705 41.4297l-31.3096 -78.2803l61.2393 -36.1396
+c18.75 -11.3096 27.5508 -33.6201 21.6406 -54.3896l-31.6406 -101.061c-4.29004 -13.6797 -16.9092 -22.4502 -30.5195 -22.4502c-3.16992 0 -6.38965 0.480469 -9.58008 1.48047c-16.8604 5.28027 -26.25 23.2305 -20.9697 40.0898l27.4697 87.7305l-84.9795 50.1699
+c-27.6104 16.2998 -38.9209 50.8301 -26.3008 80.3096l37.46 87.3906l-14.6992 4.36914c-7.83008 1.86035 -17.6006 -0.25 -25.2705 -6.13965l-39.6895 -30.4102c-14.0205 -10.7402 -34.0908 -8.10938 -44.8604 5.91992c-10.7705 14.0303 -8.11035 34.1104 5.91992 44.8604
+l39.6699 30.4102c23.0703 17.6895 52.54 23.9395 80.8398 17.1396l71.0801 -21.1396c26.3301 -6.70996 49.2803 -25.3906 61.7803 -50.9404l26.0596 -53.25h44.0303z" />
+    <glyph glyph-name="scroll" unicode="&#xf70e;" horiz-adv-x="640" 
+d="M48 448c26.4697 0 48 -21.5303 48 -48v-80h-80c-8.83984 0 -16 7.16016 -16 16v64c0 26.4697 21.5303 48 48 48zM256 35.4297c0 -31.8896 -21.7803 -61.4297 -53.25 -66.5498c-40.0996 -6.53027 -74.75 24.25 -74.75 63.1201v368c0 18.0801 -6.25977 34.5898 -16.4102 48
+h336.41c52.9404 0 96 -43.0596 96 -96v-256h-288v-60.5703zM288 64h336c8.83984 0 16 -7.16016 16 -16c0 -61.8604 -50.1396 -112 -112 -112h-336c52.9404 0 96 43.0703 96 96v32z" />
+    <glyph glyph-name="skull-crossbones" unicode="&#xf714;" horiz-adv-x="448" 
+d="M439.15 -5.05957c7.89941 -3.9502 11.1094 -13.5605 7.15918 -21.4707l-14.3096 -28.6299c-3.95996 -7.89941 -13.5703 -11.0996 -21.4697 -7.14941l-186.53 90.7197l-186.52 -90.7197c-7.91016 -3.95996 -17.5205 -0.75 -21.4707 7.14941l-14.3096 28.6299
+c-3.95996 7.91016 -0.75 17.5205 7.14941 21.4707l141.98 69.0596l-141.99 69.0596c-7.89941 3.9502 -11.0996 13.5605 -7.14941 21.46l14.3096 28.6309c3.95996 7.90918 13.5703 11.1094 21.4697 7.15918l186.53 -90.7197l186.53 90.7197
+c7.91016 3.9502 17.5195 0.740234 21.4697 -7.15918l14.3096 -28.6309c3.95996 -7.89941 0.75 -17.5098 -7.14941 -21.46l-141.99 -69.0596zM150 210.72c-41.7803 22.4102 -70 62.75 -70 109.28c0 70.6904 64.4697 128 144 128s144 -57.3096 144 -128
+c0 -46.5303 -28.2197 -86.8701 -70 -109.28l5.5 -25.8701c2.66992 -12.6191 -5.41992 -24.8496 -16.4502 -24.8496h-126.08c-11.0293 0 -19.1201 12.2305 -16.4502 24.8496zM280 336c-17.6504 0 -32 -14.3496 -32 -32s14.3496 -32 32 -32s32 14.3496 32 32
+s-14.3496 32 -32 32zM168 336c-17.6504 0 -32 -14.3496 -32 -32s14.3496 -32 32 -32s32 14.3496 32 32s-14.3496 32 -32 32z" />
+    <glyph glyph-name="slash" unicode="&#xf715;" horiz-adv-x="640" 
+d="M594.53 -60.6299l-588.351 454.729c-6.96973 5.41992 -8.22949 15.4707 -2.80957 22.4502l19.6396 25.2705c5.41992 6.97949 15.4805 8.23926 22.46 2.80957l588.351 -454.729c6.96973 -5.41992 8.22949 -15.4707 2.80957 -22.4502l-19.6396 -25.2705
+c-5.41992 -6.97949 -15.4805 -8.22949 -22.46 -2.80957z" />
+    <glyph glyph-name="spider" unicode="&#xf717;" horiz-adv-x="576" 
+d="M151.17 280.65l-27.1504 54.2998c-2.14551 4.29883 -3.3623 9.18359 -3.3623 14.3115c0 3.53516 0.573242 6.9375 1.63281 10.1182l25.8896 77.6797c2.79004 8.39062 11.8604 12.9209 20.2402 10.1201l15.1699 -5.05957
+c8.39062 -2.7998 12.9102 -11.8604 10.1201 -20.2402l-23.7998 -71.3896l20.29 -40.5801c-1.41016 -4.20996 -2.49023 -8.20996 -3.20996 -11.79l-5.2207 -26.1201h-4.66992zM573.31 98.6201c4.90039 -7.35059 2.9209 -17.2803 -4.43945 -22.1797l-13.3105 -8.88086
+c-7.34961 -4.89941 -17.29 -2.90918 -22.1895 4.44043l-48 72h-47.0605l60.8301 -97.3301c3.16992 -5.08008 4.86035 -10.96 4.86035 -16.96v-77.71c0 -8.83984 -7.16016 -16 -16 -16h-16c-8.83984 0 -16 7.16016 -16 16v73.1104l-74.0801 118.529
+c1 -14.0498 2.08008 -28.1094 2.08008 -42.21c0 -53.0693 -40.7598 -101.43 -96 -101.43s-96 48.3604 -96 101.43c0 14.1006 1.07031 28.1602 2.08008 42.21l-74.0801 -118.529v-73.1104c0 -8.83984 -7.16016 -16 -16 -16h-16c-8.83984 0 -16 7.16016 -16 16v77.7002
+c0 0.00292969 0.0205078 0.0400391 0.0205078 0.0439453c0 6.20898 1.77246 12.0078 4.83984 16.916l60.8301 97.3301h-47.0605l-48 -72c-4.89941 -7.35059 -14.8398 -9.33984 -22.1895 -4.44043l-13.3105 8.87988c-7.36035 4.90039 -9.33984 14.8398 -4.43945 22.1904
+l52.7393 79.1299c5.74121 8.60547 15.5186 14.248 26.6299 14.25h77.9404l-68.9902 24.3496c-6.81738 2.27441 -12.5947 6.74023 -16.5098 12.6104l-53.5996 80.4102c-4.90039 7.36035 -2.91016 17.29 4.43945 22.1895l13.3105 8.88086
+c7.35938 4.89941 17.29 2.90918 22.1895 -4.44043l50.5703 -75.8301l60.4902 -20.1699h36.0996l10.3701 51.8496c2.18945 10.9707 17.3701 60.1504 69.6299 60.1504s67.4404 -49.1797 69.6299 -60.1504l10.3701 -51.8496h36.0996l60.5 20.1699l50.5605 75.8301
+c4.89941 7.34961 14.8398 9.33984 22.1895 4.44043l13.3105 -8.88086c7.34961 -4.89941 9.33984 -14.8398 4.43945 -22.1895l-53.5996 -80.4102c-3.91504 -5.87012 -9.69238 -10.3359 -16.5098 -12.6104l-68.9902 -24.3594h77.9404
+c11.1084 -0.00292969 20.8828 -5.64453 26.6191 -14.25zM406.09 350.49l-23.7998 71.3896c-2.79004 8.37988 1.74023 17.4404 10.1201 20.2402l15.1699 5.05957c8.37988 2.80078 17.4502 -1.73926 20.2402 -10.1201l25.8896 -77.6797
+c1.06152 -3.18164 1.62598 -6.62109 1.62598 -10.1582c0 -5.12695 -1.20801 -9.97461 -3.35547 -14.2715l-27.1504 -54.2998l-25.9297 -8.65039h-4.66992l-5.2207 26.1201c-0.719727 3.58008 -1.7998 7.58008 -3.20996 11.79z" />
+    <glyph glyph-name="toilet-paper" unicode="&#xf71e;" horiz-adv-x="576" 
+d="M128 448h284.44c-36.7705 -38.4805 -60.4404 -108.4 -60.4404 -192v-172.07c0 -53.6494 -11.8799 -87.5693 -24.71 -126.05c-4.36035 -13.0703 -16.5898 -21.8799 -30.3604 -21.8799h-280.92c-10.9199 0 -18.6299 10.7002 -15.1797 21.0596
+c21.3701 64.1006 31.1699 85.75 31.1699 126.87v172.07c0 106.04 42.9805 192 96 192zM96 224c8.83984 0 16 7.16016 16 16s-7.16016 16 -16 16s-16 -7.16016 -16 -16s7.16016 -16 16 -16zM160 224c8.83984 0 16 7.16016 16 16s-7.16016 16 -16 16s-16 -7.16016 -16 -16
+s7.16016 -16 16 -16zM224 224c8.83984 0 16 7.16016 16 16s-7.16016 16 -16 16s-16 -7.16016 -16 -16s7.16016 -16 16 -16zM288 224c8.83984 0 16 7.16016 16 16s-7.16016 16 -16 16s-16 -7.16016 -16 -16s7.16016 -16 16 -16zM480 448c53.0195 0 96 -85.96 96 -192
+s-42.9805 -192 -96 -192s-96 85.96 -96 192s42.9805 192 96 192zM480 192c17.6699 0 32 28.6504 32 64s-14.3301 64 -32 64s-32 -28.6504 -32 -64s14.3301 -64 32 -64z" />
+    <glyph glyph-name="tractor" unicode="&#xf722;" horiz-adv-x="640" 
+d="M528 112c48.5996 0 88 -39.4004 88 -88s-39.4004 -88 -88 -88s-88 39.4004 -88 88s39.4004 88 88 88zM528 0c13.2305 0 24 10.7695 24 24s-10.7695 24 -24 24s-24 -10.7695 -24 -24s10.7695 -24 24 -24zM608 288c17.6699 0 32 -14.3301 31.9902 -32v-50.7598
+c0 -8.49023 -3.37012 -16.6299 -9.37012 -22.6299l-50.8203 -50.8203c-15.7295 7.58984 -33.1602 12.2002 -51.7998 12.2002c-39.1396 0 -73.5498 -19.0098 -95.46 -48h-80.54v-6c0 -12.1504 -9.84961 -22 -22 -22h-7.16016
+c-2.9502 -9.90039 -6.91992 -19.46 -11.9102 -28.7207l5.06055 -5.05957c8.58984 -8.58984 8.58984 -22.5195 0 -31.1104l-31.1104 -31.1094c-8.58984 -8.58984 -22.5195 -8.58984 -31.1104 0l-5.05957 5.05957c-9.25977 -4.99023 -18.8203 -8.95996 -28.7197 -11.9102
+v-7.13965c0 -12.1504 -9.85059 -22 -22 -22h-44c-12.1504 0 -22 9.84961 -22 22v7.15039c-9.90039 2.94922 -19.46 6.91992 -28.7207 11.9092l-5.05957 -5.05957c-8.58984 -8.58984 -22.5195 -8.58984 -31.1104 0l-31.1094 31.1104
+c-8.58984 8.58984 -8.58984 22.5195 0 31.1094l5.05957 5.06055c-4.99023 9.26953 -8.9502 18.8193 -11.9102 28.7295h-7.13965c-12.1504 0 -22 9.85059 -22 22v44c0 12.1504 9.84961 22 22 22h7.15039c2.94922 9.90039 6.91992 19.46 11.9092 28.7207l-5.05957 5.05957
+c-8.58984 8.58984 -8.58984 22.5195 0 31.1104l31.1104 31.1094c7.92969 7.93066 20.2598 8.2002 28.8896 1.4707v146.52c0 26.4697 21.5303 48 48 48h133.45c0.015625 0 0.00878906 0.0341797 0.0244141 0.0341797c19.7969 0 36.8047 -12.0312 44.1055 -29.1738
+l56.0898 -130.86h102.33v40.2002c0 29.9902 10.5801 58.8994 29.5 81.7197c6.37988 7.7002 18.04 8.23047 24.7002 0.780273l21.6299 -24.1699c4.87012 -5.43066 5.74023 -13.6904 1.32031 -19.4902c-8.4502 -11.0801 -13.1504 -24.7197 -13.1504 -38.8398v-40.2002h64z
+M176 32c44.1797 0 80 35.8203 80 80s-35.8203 80 -80 80s-80 -35.8203 -80 -80s35.8203 -80 80 -80zM198 288h110.04l-41.1504 96h-106.89v-96h38z" />
+    <glyph glyph-name="user-injured" unicode="&#xf728;" horiz-adv-x="448" 
+d="M277.37 436.02l-90.6904 -68.0195h-81.1895c19.0098 46.8701 64.8193 80 118.51 80c19.1104 0 37.0801 -4.46973 53.3701 -11.9805zM342.51 368h-102.52l66.0293 49.5195c15.8203 -13.3193 28.5908 -30.0498 36.4902 -49.5195zM224 192c-70.6904 0 -128 57.3096 -128 128
+c0 5.48047 0.94043 10.7002 1.61035 16h252.779c0.660156 -5.2998 1.61035 -10.5195 1.61035 -16c0 -70.6904 -57.3096 -128 -128 -128zM80 148.3c9.34668 4.14844 19.4795 7.31641 29.8096 9.21973l98.4502 -221.52h-128.26v212.3zM0 -16v41.5996
+c0 41.1406 18.8799 77.5107 48 102.16v-191.76c-26.5098 0 -48 21.4902 -48 48zM256 32c26.4697 0 48 -21.5303 48 -48s-21.5303 -48 -48 -48h-12.71l-42.6699 96h55.3799zM313.6 160c74.2305 0 134.4 -60.1699 134.4 -134.4v-41.5996c0 -26.5098 -21.4902 -48 -48 -48
+h-80.4102c10.1504 13.4102 16.4102 29.9199 16.4102 48c0 44.1104 -35.8896 80 -80 80h-69.5898l-42.6699 96h7.37012c22.2393 -10.1797 46.8799 -16 72.8896 -16s50.6504 5.82031 72.8896 16h16.71z" />
+    <glyph glyph-name="vr-cardboard" unicode="&#xf729;" horiz-adv-x="640" 
+d="M608 384c17.6699 0 32 -14.3301 32 -32v-320c0 -17.6699 -14.3301 -32 -32 -32h-160.22c-25.1807 0 -48.0303 14.7695 -58.3604 37.7402l-27.7402 61.6396c-7.88965 17.54 -24.0293 28.6201 -41.6797 28.6201s-33.79 -11.0801 -41.6797 -28.6201l-27.7402 -61.6396
+c-10.3301 -22.9707 -33.1699 -37.7402 -58.3604 -37.7402h-160.22c-17.6699 0 -32 14.3301 -32 32v320c0 17.6699 14.3301 32 32 32h576zM160 144c35.3496 0 64 28.6504 64 64s-28.6504 64 -64 64s-64 -28.6504 -64 -64s28.6504 -64 64 -64zM480 144
+c35.3496 0 64 28.6504 64 64s-28.6504 64 -64 64s-64 -28.6504 -64 -64s28.6504 -64 64 -64z" />
+    <glyph glyph-name="wind" unicode="&#xf72e;" 
+d="M156.7 192c48.7002 0 92.2998 -35 98.3994 -83.4004c7.5 -58.5 -38.0996 -108.6 -95.1992 -108.6c-46.6006 0 -85.6006 33.5 -94.2002 77.5996c-1.7998 9.60059 6.09961 18.4004 15.8994 18.4004h32.8008c6.59961 0 13.0996 -3.7998 15.1992 -10.0996
+c4.30078 -12.7002 16.3008 -21.9004 30.4004 -21.9004c19.5 0 34.9004 17.4004 31.5996 37.4004c-2.59961 15.6992 -17.5 26.5996 -33.3994 26.5996h-142.2c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h140.7zM16 224c-8.7998 0 -16 7.2002 -16 16v32
+c0 8.7998 7.2002 16 16 16h334.2c16 0 30.7998 10.9004 33.3994 26.5996c3.30078 20 -12.1992 37.4004 -31.5996 37.4004c-14.0996 0 -26.0996 -9.2002 -30.4004 -21.9004c-2.09961 -6.2998 -8.5 -10.0996 -15.1992 -10.0996h-32.8008
+c-9.69922 0 -17.6992 8.7002 -15.7998 18.2998c9.7998 50.6006 59.5 87.1006 114.9 75.5c36.2002 -7.59961 65.5 -36.8994 73.0996 -73.0996c13 -61.9004 -34.0996 -116.7 -93.7998 -116.7h-336zM400 192c70.5 0 126 -65.5 108.9 -138.7
+c-9.60059 -41.0996 -43.5 -74 -84.7002 -82.7002c-58.9004 -12.5 -111.601 21.7002 -129.4 72.3008c-3.7002 10.2998 4.40039 21.0996 15.2998 21.0996h33.8008c5.7998 0 11.5996 -2.59961 14.5 -7.59961c8.2998 -14.5 23.6992 -24.4004 41.5996 -24.4004
+c26.5 0 48 21.5 48 48s-21.5 48 -48 48h-116.5c-6.59961 25.2002 -20.5 47.4004 -39.7998 64h156.3z" />
+    <glyph glyph-name="wine-bottle" unicode="&#xf72f;" 
+d="M507.31 375.43c6.25 -6.25 6.25 -16.3799 0.0107422 -22.6201l-22.6299 -22.6299c-6.25 -6.25 -16.3809 -6.25 -22.6309 0l-76.6699 -76.6699c19.7002 -46.5801 10.7305 -102.41 -27.2295 -140.37l-158.391 -158.39c-24.9893 -24.9902 -65.5195 -24.9902 -90.5098 0
+l-90.5098 90.5098c-24.9902 24.9902 -24.9902 65.5205 0 90.5098l158.38 158.381c37.9697 37.96 93.79 46.9297 140.37 27.2295l76.6699 76.6699c-6.25 6.25 -6.25 16.3799 0 22.6299l22.6299 22.6299c6.25 6.25 16.3799 6.25 22.6299 0zM179.22 24.71l122.04 122.04
+l-90.5098 90.5098l-122.04 -122.04z" />
+    <glyph glyph-name="cloud-meatball" unicode="&#xf73b;" 
+d="M48 96c26.5 0 48 -21.5 48 -48s-21.5 -48 -48 -48s-48 21.5 -48 48s21.5 48 48 48zM464 96c26.5 0 48 -21.5 48 -48s-21.5 -48 -48 -48s-48 21.5 -48 48s21.5 48 48 48zM345 84.9004c13.5 -7 23 -20.7002 23 -36.9004s-9.5 -29.9004 -23 -36.9004
+c4.59961 -14.5 1.7002 -30.7998 -9.7998 -42.2998c-8.2002 -8.2002 -18.9004 -12.2998 -29.7002 -12.2998c-4.2998 0 -8.5 1.2002 -12.5996 2.5c-7 -13.5 -20.7002 -23 -36.9004 -23s-29.9004 9.5 -36.9004 23c-4.09961 -1.40039 -8.2998 -2.5 -12.5996 -2.5
+c-10.7998 0 -21.5 4.09961 -29.7002 12.2998c-11.5 11.5 -14.5 27.7998 -9.89941 42.2998c-13.5 7 -23 20.7002 -23 36.9004s9.5 29.9004 23 36.9004c-4.5 14.5 -1.60059 30.7998 9.89941 42.2998s27.7998 14.5 42.2998 9.89941c7 13.5 20.7002 23 36.9004 23
+s29.9004 -9.5 36.9004 -23c14.5 4.5 30.7998 1.60059 42.2998 -9.89941c11.3994 -11.5 14.3994 -27.7998 9.7998 -42.2998zM512 224c0 -53 -43 -96 -96 -96h-43.4004c-3.5 8 -8.39941 15.4004 -14.7998 21.7998c-13.5 13.5 -31.5 21.1006 -50.7998 21.2998
+c-13.5 13.2002 -31.7002 20.9004 -51 20.9004s-37.5 -7.7002 -51 -20.9004c-19.2998 -0.199219 -37.2998 -7.7998 -50.7998 -21.2998c-6.40039 -6.39941 -11.2002 -13.7998 -14.7998 -21.7998h-43.4004c-53 0 -96 43 -96 96c0 42.5 27.7998 78.2002 66.0996 90.7998
+c-1.2998 6.90039 -2.09961 13.9004 -2.09961 21.2002c0 61.9004 50.0996 112 112 112c43.2998 0 80.4004 -24.7998 99 -60.7998c14.7002 17.5 36.4004 28.7998 61 28.7998c44.2002 0 80 -35.7998 80 -80c0 -5.59961 -0.5 -11 -1.59961 -16.2002
+c0.5 0 1 0.200195 1.59961 0.200195c53 0 96 -43 96 -96z" />
+    <glyph glyph-name="cloud-moon-rain" unicode="&#xf73c;" horiz-adv-x="576" 
+d="M350.5 222.5c37.2998 -6.7998 65.5 -39.2998 65.5 -78.5c0 -44.2002 -35.7998 -80 -80 -80h-256c-44.2002 0 -80 35.7998 -80 80c0 38.7998 27.5996 71.0996 64.2002 78.4004c0 0.5 -0.200195 1.09961 -0.200195 1.59961c0 53 43 96 96 96
+c32.0996 0 60.2998 -15.9004 77.7002 -40c10.3994 5 22 8 34.2998 8c39.2002 0 71.5996 -28.2998 78.5 -65.5zM567.9 224.2c6.19922 1.2002 10.5996 -6 6.39941 -10.7998c-27 -33.1006 -67.8994 -53.3008 -112.6 -53.3008c-5.2002 0 -10.1006 1 -15.2002 1.5
+c-6.2002 39.4004 -33.0996 72.5 -70.2002 86.8008c-10.7002 27.8994 -32.2002 49.7998 -58.8994 61.6992c3.2998 76.7002 66.5 137.9 144.399 137.9c8.90039 0 17.7998 -0.799805 26.5 -2.40039c6.2002 -1.09961 7.60059 -9.39941 2.10059 -12.5
+c-35.6006 -20.0996 -57.5 -57.5 -57.5 -98.0996c0 -70.5 64.5996 -124.1 135 -110.8zM364.5 29.9004c7.7002 -4.40039 10.2998 -14.1006 6 -21.8008l-36.5996 -64c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961
+c-7.69922 4.40039 -10.3994 14.1006 -6 21.8008l36.6006 64c4.39941 7.7998 14.2002 10.2998 21.7998 6zM268.5 29.9004c7.7002 -4.40039 10.2998 -14.1006 6 -21.8008l-36.5996 -64c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961
+c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961c-7.69922 4.40039 -10.3994 14.1006 -6 21.8008l36.6006 64c4.39941 7.7998 14.2002 10.2998 21.7998 6zM172.5 29.9004c7.7002 -4.40039 10.2998 -14.1006 6 -21.8008l-36.5996 -64
+c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961c-7.69922 4.40039 -10.3994 14.1006 -6 21.8008l36.6006 64c4.39941 7.7998 14.2002 10.2998 21.7998 6zM76.5 29.9004c7.7002 -4.40039 10.2998 -14.1006 6 -21.8008
+l-36.5996 -64c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961c-7.69922 4.40039 -10.3994 14.1006 -6 21.8008l36.6006 64c4.39941 7.7998 14.2002 10.2998 21.7998 6z" />
+    <glyph glyph-name="cloud-rain" unicode="&#xf73d;" 
+d="M416 320c53 0 96 -43 96 -96s-43 -96 -96 -96h-320c-53 0 -96 43 -96 96c0 42.5 27.7998 78.2002 66.0996 90.7998c-1.2998 6.90039 -2.09961 13.9004 -2.09961 21.2002c0 61.9004 50.0996 112 112 112c43.2998 0 80.4004 -24.7998 99 -60.7998
+c14.7002 17.5 36.4004 28.7998 61 28.7998c44.2002 0 80 -35.7998 80 -80c0 -5.59961 -0.5 -11 -1.59961 -16.2002c0.5 0 1 0.200195 1.59961 0.200195zM88 73.7998c2.5 8.5 13.7998 8.10059 16 0c12.7998 -44.5996 40 -56.2998 40 -87.7002
+c0 -27.6992 -21.5 -50.0996 -48 -50.0996s-48 22.4004 -48 50.0996c0 31.3008 27.2002 43.3008 40 87.7002zM248 73.7998c2.5 8.5 13.7998 8.10059 16 0c12.7998 -44.5996 40 -56.2998 40 -87.7002c0 -27.6992 -21.5 -50.0996 -48 -50.0996s-48 22.4004 -48 50.0996
+c0 31.3008 27.2002 43.3008 40 87.7002zM408 73.7998c2.5 8.5 13.7998 8.10059 16 0c12.7998 -44.5996 40 -56.2998 40 -87.7002c0 -27.6992 -21.5 -50.0996 -48 -50.0996s-48 22.4004 -48 50.0996c0 31.3008 27.2002 43.3008 40 87.7002z" />
+    <glyph glyph-name="cloud-showers-heavy" unicode="&#xf740;" 
+d="M183.9 77.9004c7.69922 -4.40039 10.3994 -14.2002 6 -21.8008l-64 -112c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961c-7.69922 4.30078 -10.3994 14.1006 -6 21.8008l64 112
+c4.40039 7.7998 14.2002 10.3994 21.8008 6zM279.9 77.9004c7.69922 -4.40039 10.3994 -14.2002 6 -21.8008l-64 -112c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961c-7.69922 4.30078 -10.3994 14.1006 -6 21.8008
+l64 112c4.40039 7.7998 14.2002 10.3994 21.8008 6zM87.9004 77.9004c7.69922 -4.40039 10.3994 -14.2002 6 -21.8008l-64 -112c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961
+c-7.69922 4.30078 -10.3994 14.1006 -6 21.8008l64 112c4.40039 7.7998 14.2002 10.3994 21.8008 6zM471.9 77.9004c7.69922 -4.40039 10.3994 -14.2002 6 -21.8008l-64 -112c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961
+c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961c-7.69922 4.30078 -10.3994 14.1006 -6 21.8008l64 112c4.40039 7.7998 14.2002 10.3994 21.8008 6zM375.9 77.9004c7.69922 -4.40039 10.3994 -14.2002 6 -21.8008l-64 -112
+c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961c-7.69922 4.30078 -10.3994 14.1006 -6 21.8008l64 112c4.40039 7.7998 14.2002 10.3994 21.8008 6zM416 320c53 0 96 -43 96 -96s-43 -96 -96 -96h-320
+c-53 0 -96 43 -96 96c0 42.5 27.7998 78.2002 66.0996 90.7998c-1.2998 6.90039 -2.09961 13.9004 -2.09961 21.2002c0 61.9004 50.2002 112 112 112c43.2998 0 80.4004 -24.7998 99 -60.7998c14.7002 17.5 36.4004 28.7998 61 28.7998c44.2002 0 80 -35.7998 80 -80
+c0 -5.59961 -0.5 -11 -1.59961 -16.2002c0.5 0 1 0.200195 1.59961 0.200195z" />
+    <glyph glyph-name="cloud-sun-rain" unicode="&#xf743;" horiz-adv-x="576" 
+d="M510.5 222.5c37.2998 -6.7998 65.5 -39.2998 65.5 -78.5c0 -44.2002 -35.7998 -80 -80 -80h-256c-44.2002 0 -80 35.7998 -80 80c0 38.7998 27.5996 71 64.2002 78.4004c0 0.5 -0.200195 1.09961 -0.200195 1.59961c0 53 43 96 96 96
+c32.0996 0 60.2998 -15.9004 77.7002 -40c10.3994 5 22 8 34.2998 8c39.2002 0 71.5996 -28.2998 78.5 -65.5zM124.1 188.1c3.10059 -3.09961 6.60059 -5.59961 10.2002 -8.2998c-3.89941 -11.3994 -6.2002 -23.3994 -6.2002 -35.8994c0 -2.5 0.5 -4.80078 0.700195 -7.2002
+l-59.2002 -19.7002c-10.1992 -3.2998 -19.8994 6.2998 -16.5 16.5l25.1006 75.2998l-71 35.5c-9.60059 4.7998 -9.60059 18.5 0 23.2998l71 35.5l-25.1006 75.3008c-3.39941 10.1992 6.2002 19.8994 16.4004 16.5l75.2998 -25.1006l35.5 71
+c4.7998 9.60059 18.5 9.60059 23.2998 0l35.5 -71l75.3008 25.1006c10.1992 3.39941 19.8994 -6.2002 16.5 -16.4004l-8.90039 -26.7002c-0.700195 0 -1.2998 0.200195 -2 0.200195c-25.5996 0 -49.2002 -7.7998 -69.2002 -20.7002
+c-37.5996 29.4004 -92.0996 27.2002 -126.7 -7.39941c-37.3994 -37.5 -37.3994 -98.4004 0 -135.801zM193.9 246.1c-18.2002 -8.2998 -33.5 -21.2998 -44.8008 -37.1992c-12.8994 11.6992 -21.0996 28.3994 -21.0996 47.0996c0 35.2998 28.7002 64 64 64
+c12.4004 0 24 -3.7002 33.7998 -9.90039c-16.0996 -17.5996 -27.5996 -39.5 -31.8994 -64zM524.5 29.9004c7.7002 -4.40039 10.2998 -14.1006 6 -21.8008l-36.5996 -64c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961
+c-7.69922 4.40039 -10.3994 14.1006 -6 21.8008l36.6006 64c4.39941 7.7998 14.2002 10.2998 21.7998 6zM428.5 29.9004c7.7002 -4.40039 10.2998 -14.1006 6 -21.8008l-36.5996 -64c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961
+c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961c-7.69922 4.40039 -10.3994 14.1006 -6 21.8008l36.6006 64c4.39941 7.7998 14.2002 10.2998 21.7998 6zM332.5 29.9004c7.7002 -4.40039 10.2998 -14.1006 6 -21.8008l-36.5996 -64
+c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961c-7.69922 4.40039 -10.3994 14.1006 -6 21.8008l36.6006 64c4.39941 7.7998 14.2002 10.2998 21.7998 6zM236.5 29.9004c7.7002 -4.40039 10.2998 -14.1006 6 -21.8008
+l-36.5996 -64c-3 -5.19922 -8.40039 -8.09961 -13.9004 -8.09961c-2.7002 0 -5.40039 0.700195 -7.90039 2.09961c-7.69922 4.40039 -10.3994 14.1006 -6 21.8008l36.6006 64c4.39941 7.7998 14.2002 10.2998 21.7998 6z" />
+    <glyph glyph-name="democrat" unicode="&#xf747;" horiz-adv-x="640" 
+d="M637.3 191.1c4.90039 -7.39941 2.90039 -17.2998 -4.39941 -22.2998l-26.6006 -17.7002c-7.39941 -4.89941 -17.2998 -3 -22.2002 4.40039c-21.7998 32.7002 -23.8994 38.0996 -40.0996 50.2998v-77.7998h-352l-54 108l-38.0996 -34.5996
+c-6 -6 -14.1006 -9.40039 -22.6006 -9.40039h-31c-12.0996 0 -23.2002 6.90039 -28.5996 17.7002l-14.2998 28.5996c-5.40039 10.7998 -4.30078 23.7998 3 33.5l74.5996 99.2998c1.7002 2.30078 4.2002 3.7002 6.40039 5.40039c-4 2.2002 -8 4.2002 -11.3008 7.5
+c-16.3994 16.4004 -18.3994 41.7998 -6.09961 60.4004c2.7998 4.19922 8.7998 4.7998 12.4004 1.19922l42.8994 -42.7998l41.7998 41.7998c4.40039 4.40039 11.8008 3.7002 15.2002 -1.5c15.1006 -22.7998 12.6006 -53.7998 -7.5 -73.8994l81.2002 -81.2002h235.6
+c50.8008 0 97.9004 -25.2002 126.101 -67.5zM296.2 204.7c3 2.89941 1.39941 7.89941 -2.60059 8.5l-22.7998 3.2998l-10.2002 20.7002c-1.89941 3.7002 -7.19922 3.7002 -9 0l-10.1992 -20.7002l-22.8008 -3.2998c-4.09961 -0.600586 -5.7998 -5.60059 -2.7998 -8.5
+l16.5 -16.1006l-3.89941 -22.6992c-0.700195 -4.10059 3.59961 -7.2002 7.19922 -5.30078l20.4004 10.7002l20.4004 -10.7002c3.59961 -1.89941 7.89941 1.2002 7.19922 5.30078l-3.89941 22.6992zM408.2 204.7c3 2.89941 1.39941 7.89941 -2.60059 8.5l-22.7998 3.2998
+l-10.2002 20.7002c-1.89941 3.7002 -7.19922 3.7002 -9 0l-10.1992 -20.7002l-22.8008 -3.2998c-4.09961 -0.600586 -5.7998 -5.60059 -2.7998 -8.5l16.5 -16.1006l-3.89941 -22.6992c-0.700195 -4.10059 3.59961 -7.2002 7.19922 -5.30078l20.4004 10.7002
+l20.4004 -10.7002c3.59961 -1.89941 7.89941 1.2002 7.19922 5.30078l-3.89941 22.6992zM520.2 204.7c3 2.89941 1.39941 7.89941 -2.60059 8.5l-22.7998 3.2998l-10.2002 20.7002c-1.89941 3.7002 -7.19922 3.7002 -9 0l-10.1992 -20.7002l-22.8008 -3.2998
+c-4.09961 -0.600586 -5.7998 -5.60059 -2.7998 -8.5l16.5 -16.1006l-3.89941 -22.6992c-0.700195 -4.10059 3.59961 -7.2002 7.19922 -5.30078l20.4004 10.7002l20.4004 -10.7002c3.59961 -1.89941 7.89941 1.2002 7.19922 5.30078l-3.89941 22.6992zM192 -48v144h352v-144
+c0 -8.7998 -7.2002 -16 -16 -16h-64c-8.7998 0 -16 7.2002 -16 16v80h-160v-80c0 -8.7998 -7.2002 -16 -16 -16h-64c-8.7998 0 -16 7.2002 -16 16z" />
+    <glyph glyph-name="flag-usa" unicode="&#xf74d;" 
+d="M32 448c17.7002 0 32 -14.2998 32 -32v-464c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v464c0 17.7002 14.2998 32 32 32zM299.9 144.4c31.0996 -8.2002 62.5996 -16.5 100 -16.6006c31.8994 0 68.5 6.7998 112.1 24.1006v-36
+c0 -12.3008 -7.09961 -23.8008 -18.5 -28.8008c-175.8 -76.3994 -211.8 69.1006 -397.5 -23.0996v69.2998c92.2002 39.9004 146.7 26.2002 203.9 11.1006zM299.9 240.4c31.0996 -8.2002 62.5996 -16.5 100 -16.5c31.8994 0 68.5 6.7998 112.1 24.0996v-61.5
+c-92.2002 -39.9004 -146.7 -26.2002 -203.9 -11.0996c-57.5 15.0996 -117.3 30 -212.1 -7.60059v61.5c92.2002 39.9004 146.7 26.2002 203.9 11.1006zM309.4 366.3c-7 2.10059 -14.1006 4.2002 -21.3008 6.2002v-33.2002c4 -1.09961 8.10059 -2.2998 12.1006 -3.5
+c26.7002 -8.09961 52.8994 -15.8994 85.7002 -15.8994c32.7998 0 72.5 7.89941 126.1 31.3994v-68.8994c-92.2002 -39.8008 -146.7 -26.1006 -203.9 -11.1006c-57.5 15.1006 -117.3 29.9004 -212.1 -7.59961v151.899c209.4 94.6006 195.3 -59.0996 366.6 28.2002
+c22.6006 11.5 49.4004 -1.5 49.4004 -26.5996v-30.7998c-105.2 -49.1006 -150.8 -35.7002 -202.6 -20.1006zM160 319.9c8.7998 0 16 7.09961 16 16c0 8.89941 -7.2002 16 -16 16s-16 -7.2002 -16 -16c0 -8.90039 7.2002 -16 16 -16zM160 375.7c8.7998 0 16 7.2002 16 16
+c0 8.89941 -7.2002 16 -16 16s-16 -7.2002 -16 -16c0 -8.90039 7.2002 -16 16 -16zM224 327.8c8.7998 0 16 7.2002 16 16c0 8.90039 -7.2002 16 -16 16s-16 -7.2002 -16 -16c0 -8.89941 7.2002 -16 16 -16zM224 383.7c8.7998 0 16 7.2002 16 16c0 8.89941 -7.2002 16 -16 16
+s-16 -7.2002 -16 -16c0 -8.90039 7.2002 -16 16 -16z" />
+    <glyph glyph-name="meteor" unicode="&#xf753;" 
+d="M511.328 427.197c-11.6074 -38.7021 -34.3076 -111.702 -61.3037 -187.701c6.99902 -2.09375 13.4043 -4 18.6074 -5.59277c6.58301 -2.00684 11.3779 -8.13184 11.3779 -15.3672c0 -2.71875 -0.685547 -5.29395 -1.87988 -7.53906
+c-22.1055 -42.2969 -82.6904 -152.795 -142.479 -214.403c-0.999023 -1.09375 -1.99902 -2.5 -2.99902 -3.5c-35.2676 -35.2773 -83.9824 -57.1094 -137.757 -57.1094c-107.53 0 -194.83 87.2998 -194.83 194.83c0 53.7559 21.7637 102.511 57.0195 137.775
+c1 1 2.40625 2 3.49902 3c61.6006 59.9053 171.975 120.405 214.374 142.498c2.24512 1.19434 4.80664 1.87109 7.52441 1.87109c7.23535 0 13.374 -4.78711 15.3779 -11.3711c1.59375 -5.09375 3.5 -11.5928 5.59277 -18.5928
+c75.8955 26.999 148.978 49.7021 187.675 61.2959c1.4834 0.448242 3.05664 0.689453 4.68652 0.689453c8.93164 0 16.1826 -7.25098 16.1826 -16.1826c0 -1.59961 -0.236328 -3.14062 -0.668945 -4.60059zM319.951 127.998
+c-0.00976562 70.626 -57.3525 127.962 -127.98 127.962c-70.6348 0 -127.98 -57.3457 -127.98 -127.98c0 -70.6338 57.3457 -127.979 127.98 -127.979c70.6318 0 127.976 57.3438 127.976 127.976c0 0.0078125 0.00488281 0.0146484 0.00488281 0.0224609zM191.971 159.997
+c-0.00292969 -17.6562 -14.3379 -31.9902 -31.9951 -31.9902c-17.6582 0 -31.9951 14.3369 -31.9951 31.9951c0 17.6592 14.3369 31.9951 31.9951 31.9951h0.0371094c17.6387 0 31.959 -14.3203 31.959 -31.959
+c0 -0.0136719 -0.000976562 -0.0263672 -0.000976562 -0.0410156v0zM223.966 79.998c-0.000976562 -8.82812 -7.16895 -15.9951 -15.998 -15.9951s-15.9971 7.16895 -15.9971 15.998s7.16797 15.9971 15.9971 15.9971c8.81738 -0.0283203 15.9707 -7.18262 15.998 -16v0z
+" />
+    <glyph glyph-name="person-booth" unicode="&#xf756;" horiz-adv-x="576" 
+d="M192 -48v176h64v-176c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16zM224 224c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32h-57.5c-12.7998 0 -24.7998 5 -33.9004 14.0996l-20.8994 20.9004v-80.5996l41.2002 -61.3008
+c4.39941 -8.7998 6.69922 -18.6992 6.69922 -28.5996v-56.5c0 -17.7002 -14.2998 -32 -32 -32c-17.6992 0 -32 14.2998 -32 32v56l-29.0996 43c-0.900391 0.400391 -1.59961 1.2002 -2.5 1.7002l-0.0996094 -100.7c0 -17.7002 -14.4004 -32 -32 -32
+c-17.6006 0 -31.9004 14.2998 -31.9004 32l0.200195 160l-0.200195 95.9004c0 17.0996 6.7002 33.1992 18.7002 45.2998c12.0996 12.0996 28.2002 18.7998 45.2998 18.7998h18.7002c17 0 33.0996 -6.59961 45.2002 -18.7002l45.1992 -45.2998h50.9004zM64 320
+c-26.5 0 -48 21.5 -48 48s21.5 48 48 48s48 -21.5 48 -48s-21.5 -48 -48 -48zM288 416v32h192v-416c0 -17.7002 -14.2998 -32 -32 -32s-32 14.2998 -32 32c0 -17.7002 -14.2998 -32 -32 -32c-17.0996 0 -30.7998 13.5 -31.7002 30.4004
+c-4.2998 -21.3008 -17.0996 -30.4004 -32.2998 -30.4004c-18.4004 0 -35.7002 16.7002 -31.4004 38.2998l30.9004 154.601zM192 416c0 17.7002 14.2998 32 32 32h32v-192h-64v160zM544 448c17.7002 0 32 -14.2998 32 -32v-464c0 -8.7998 -7.2002 -16 -16 -16h-32
+c-8.7998 0 -16 7.2002 -16 16v496h32z" />
+    <glyph glyph-name="poo-storm" unicode="&#xf75a;" horiz-adv-x="448" 
+d="M308 112c9.2002 0 15 -10 10.4004 -18l-88 -152c-2.2002 -3.7998 -6.2002 -6 -10.4004 -6c-7.7002 0 -13.5 7.2002 -11.7002 14.7998l23 97.2002h-59.2998c-7.2998 0 -12.9004 6.40039 -11.9004 13.5996l16 120c0.800781 5.90039 5.90039 10.4004 11.9004 10.4004h68
+c7.90039 0 13.5996 -7.5 11.5996 -15.0996l-17.2998 -64.9004h57.7002zM374.4 223.3c41 -3.2998 73.5996 -37.5 73.5 -79.2998c0 -44 -36 -80 -80 -80h-30l8.09961 14c7.7998 13.5 7.7998 30.4004 0 44s-22.4004 22 -38.0996 22h-16l6.59961 24.7002
+c3.59961 13.2998 0.799805 27.2002 -7.59961 38.0996c-8.40039 10.9004 -21.1006 17.2002 -34.9004 17.2002h-68c-22 0 -40.7002 -16.4004 -43.7002 -38.2002l-16 -120c0 -0.599609 0.100586 -1.2002 0 -1.7998h-48.2998c-44 0 -80 36 -80 80
+c0 41.7998 32.5996 76 73.5996 79.2998c-5.89941 9.60059 -9.59961 20.6006 -9.59961 32.7002c0 35.2998 28.7002 64 64 64h16c44.2002 0 80 35.7998 80 80c0 17.4004 -5.7002 33.4004 -15.0996 46.5c4.89941 0.799805 9.89941 1.5 15.0996 1.5c53 0 96 -43 96 -96
+c0 -11.2998 -2.2998 -21.9004 -5.90039 -32h5.90039c35.2998 0 64 -28.7002 64 -64c0 -12.0996 -3.7002 -23.0996 -9.59961 -32.7002z" />
+    <glyph glyph-name="rainbow" unicode="&#xf75b;" horiz-adv-x="576" 
+d="M268.3 415.3c167.7 11.2998 307.7 -122 307.7 -287.3v-144c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v136.2c0 113.8 -81.5996 215.399 -194.5 229.899c-136.6 17.6006 -253.5 -88.8994 -253.5 -222.1v-144c0 -8.7998 -7.2002 -16 -16 -16h-32
+c-8.7998 0 -16 7.2002 -16 16v133.8c0 153.3 115.4 287.3 268.3 297.5zM262.7 318.4c117.1 15 217.3 -76.2002 217.3 -190.4v-144c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v138.3c0 66.9004 -48.7002 126.601 -115.2 133.101
+c-76.2998 7.39941 -140.8 -52.6006 -140.8 -127.4v-144c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v137.3c0 97.6006 70 184.7 166.7 197.101zM268.9 222.1c61.2998 11.9004 115.1 -34.8994 115.1 -94.0996v-144c0 -8.7998 -7.2002 -16 -16 -16h-32
+c-8.7998 0 -16 7.2002 -16 16v144c0 17.5996 -14.2998 32 -32 32s-32 -14.4004 -32 -32v-144c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v140.2c0 46.3994 31.2998 89 76.9004 97.8994z" />
+    <glyph glyph-name="republican" unicode="&#xf75e;" horiz-adv-x="640" 
+d="M544 256v-64h-544v64c0 88.4004 71.5996 160 160 160h224c88.4004 0 160 -71.5996 160 -160zM176.3 277.6c3.5 3.5 1.60059 9.5 -3.39941 10.2002l-27.4004 4l-12.2002 24.7998c-2.09961 4.40039 -8.5 4.5 -10.7002 0l-12.1992 -24.7998l-27.4004 -4
+c-4.90039 -0.700195 -6.90039 -6.7002 -3.2998 -10.2002l19.7998 -19.2998l-4.7002 -27.2998c-0.799805 -4.90039 4.40039 -8.59961 8.7002 -6.2998l24.5 12.8994l24.5 -12.8994c4.40039 -2.2998 9.5 1.39941 8.7002 6.2998l-4.7002 27.2998zM320.3 277.6
+c3.5 3.5 1.60059 9.5 -3.39941 10.2002l-27.4004 4l-12.2002 24.7998c-2.09961 4.40039 -8.5 4.5 -10.7002 0l-12.1992 -24.7998l-27.4004 -4c-4.90039 -0.700195 -6.90039 -6.7002 -3.2998 -10.2002l19.7998 -19.2998l-4.7002 -27.2998
+c-0.799805 -4.90039 4.40039 -8.59961 8.7002 -6.2998l24.5 12.8994l24.5 -12.8994c4.40039 -2.2998 9.5 1.39941 8.7002 6.2998l-4.7002 27.2998zM464.3 277.6c3.5 3.5 1.60059 9.5 -3.39941 10.2002l-27.4004 4l-12.2002 24.7998c-2.09961 4.40039 -8.5 4.5 -10.7002 0
+l-12.1992 -24.7998l-27.4004 -4c-4.90039 -0.700195 -6.90039 -6.7002 -3.2998 -10.2002l19.7998 -19.2998l-4.7002 -27.2998c-0.799805 -4.90039 4.40039 -8.59961 8.7002 -6.2998l24.5 12.8994l24.5 -12.8994c4.40039 -2.2998 9.5 1.39941 8.7002 6.2998l-4.7002 27.2998z
+M624 128c8.7998 0 16 -7.2002 16 -16v-64c0 -46.9004 -40.5996 -84.5 -88.4004 -79.5996c-41.5996 4.19922 -71.5996 42.5 -71.5996 84.2998v43.2998h-32v-112c0 -8.7998 -7.2002 -16 -16 -16h-96c-8.7998 0 -16 7.2002 -16 16v80h-192v-80c0 -8.7998 -7.2002 -16 -16 -16
+h-96c-8.7998 0 -16 7.2002 -16 16v176h544v-112c0 -8.7998 7.2002 -16 16 -16s16 7.2002 16 16v64c0 8.7998 7.2002 16 16 16h32z" />
+    <glyph glyph-name="smog" unicode="&#xf75f;" horiz-adv-x="640" 
+d="M624 80c8.7998 0 16 -7.2002 16 -16v-16c0 -8.7998 -7.2002 -16 -16 -16h-544c-8.7998 0 -16 7.2002 -16 16v16c0 8.7998 7.2002 16 16 16h544zM144 -16c8.7998 0 16 -7.2002 16 -16v-16c0 -8.7998 -7.2002 -16 -16 -16h-128c-8.7998 0 -16 7.2002 -16 16v16
+c0 8.7998 7.2002 16 16 16h128zM560 -16c8.7998 0 16 -7.2002 16 -16v-16c0 -8.7998 -7.2002 -16 -16 -16h-336c-8.7998 0 -16 7.2002 -16 16v16c0 8.7998 7.2002 16 16 16h336zM144 160c-79.5 0 -144 64.5 -144 144s64.5 144 144 144c41 0 77.7998 -17.2998 104 -44.7998
+c26.2002 27.5 63 44.7998 104 44.7998c54.7998 0 102 -31 126.3 -76.0996c15 7.5 31.7002 12.0996 49.7002 12.0996c61.9004 0 112 -50.0996 112 -112s-50.0996 -112 -112 -112h-60.0996c-22.6006 -19.7002 -51.6006 -32 -83.9004 -32s-61.4004 12.2998 -83.9004 32h-156.1z
+" />
+    <glyph glyph-name="temperature-high" unicode="&#xf769;" 
+d="M416 448c52.9004 0 96 -43.0996 96 -96s-43.0996 -96 -96 -96s-96 43.0996 -96 96s43.0996 96 96 96zM416 320c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM256 336v-166.5c19.7002 -24.5996 32 -55.5 32 -89.5
+c0 -79.5 -64.5 -144 -144 -144s-144 64.5 -144 144c0 34 12.2998 64.7998 32 89.5v166.5c0 61.9004 50.0996 112 112 112s112 -50.0996 112 -112zM144 0c44.0996 0 80 35.9004 80 80c0 25.5 -12.2002 49 -32 63.7998v192.2c0 26.5 -21.5 48 -48 48s-48 -21.5 -48 -48v-192.2
+c-19.7998 -14.8994 -32 -38.2998 -32 -63.7998c0 -44.0996 35.9004 -80 80 -80zM160 125.1c18.5996 -6.59961 32 -24.1992 32 -45.0996c0 -26.5 -21.5 -48 -48 -48s-48 21.5 -48 48c0 20.9004 13.4004 38.5 32 45.0996v210.9c0 8.7998 7.2002 16 16 16s16 -7.2002 16 -16
+v-210.9z" />
+    <glyph glyph-name="temperature-low" unicode="&#xf76b;" 
+d="M416 448c52.9004 0 96 -43.0996 96 -96s-43.0996 -96 -96 -96s-96 43.0996 -96 96s43.0996 96 96 96zM416 320c17.7002 0 32 14.2998 32 32s-14.2998 32 -32 32s-32 -14.2998 -32 -32s14.2998 -32 32 -32zM256 336v-166.5c19.7002 -24.5996 32 -55.5 32 -89.5
+c0 -79.5 -64.5 -144 -144 -144s-144 64.5 -144 144c0 34 12.2998 64.7998 32 89.5v166.5c0 61.9004 50.0996 112 112 112s112 -50.0996 112 -112zM144 0c44.0996 0 80 35.9004 80 80c0 25.5 -12.2002 49 -32 63.7998v192.2c0 26.5 -21.5 48 -48 48s-48 -21.5 -48 -48v-192.2
+c-19.7998 -14.8994 -32 -38.2998 -32 -63.7998c0 -44.0996 35.9004 -80 80 -80zM160 125.1c18.5996 -6.59961 32 -24.1992 32 -45.0996c0 -26.5 -21.5 -48 -48 -48s-48 21.5 -48 48c0 20.9004 13.4004 38.5 32 45.0996v18.9004c0 8.7998 7.2002 16 16 16s16 -7.2002 16 -16
+v-18.9004z" />
+    <glyph glyph-name="vote-yea" unicode="&#xf772;" horiz-adv-x="640" 
+d="M608 128c17.7002 0 32 -14.2998 32 -32v-96c0 -17.7002 -14.2998 -32 -32 -32h-576c-17.7002 0 -32 14.2998 -32 32v96c0 17.7002 14.2998 32 32 32h64v-64h-22.4004c-5.2998 0 -9.59961 -3.59961 -9.59961 -8v-16c0 -4.40039 4.2998 -8 9.59961 -8h492.801
+c5.2998 0 9.59961 3.59961 9.59961 8v16c0 4.40039 -4.2998 8 -9.59961 8h-22.4004v64h64zM512 64h-384v319.7c0 17.7998 14.5 32.2998 32.4004 32.2998h319.3c17.7998 0 32.2998 -14.4004 32.2998 -32.2998v-319.7zM211.2 246c-4.2002 -4.2002 -4.2998 -11 0 -15.2002
+l74.0996 -74.7002c4.2002 -4.2998 11 -4.2998 15.2002 -0.0996094l128.3 127.2c4.2998 4.2002 4.2998 11 0.100586 15.2002l-25.3008 25.5c-4.19922 4.2998 -11 4.2998 -15.1992 0.0996094l-95.2002 -94.4004l-41.2998 41.6006
+c-4.2002 4.2998 -11 4.2998 -15.2002 0.0996094z" />
+    <glyph glyph-name="water" unicode="&#xf773;" horiz-adv-x="576" 
+d="M562.1 64.0996c8.10059 -0.899414 13.9004 -8.2998 13.8008 -16.2998v-31.5996c0 -9.10059 -7.60059 -16.7998 -16.7002 -16c-28.2002 2.5 -55.7998 11.5996 -79.1006 25.7998c-55 -34.0996 -135.5 -34.5996 -192 0c-55 -34.0996 -135.5 -34.5996 -192 0
+c-23.2998 -14.5 -50.5996 -23.4004 -79.3994 -25.9004c-9.10059 -0.799805 -16.7002 6.90039 -16.7002 16v32.2002c0 7.90039 5.7002 14.9004 13.5996 15.7002c21.7002 2.2998 42.2002 10.2002 57.7002 22.4004c13.7998 10.8994 33.6006 13.1992 47.1006 2
+c38.2998 -31.7002 107.199 -31.8008 145.199 -1.7002c13.7002 10.8994 33.2002 13 46.7002 1.7998c38.5 -31.9004 107.8 -31.9004 145.7 -1.5c14 11.2998 34.0996 11.0996 48.2002 0c15.7998 -12.4004 36.3994 -20.5 57.8994 -22.9004zM562.1 208.1
+c8.10059 -0.899414 13.9004 -8.2998 13.8008 -16.2998v-31.5996c0 -9.10059 -7.60059 -16.7998 -16.7002 -16c-28.2002 2.5 -55.7998 11.5996 -79.1006 25.7998c-55 -34.0996 -135.5 -34.5996 -192 0c-55 -34.0996 -135.5 -34.5996 -192 0
+c-23.2998 -14.5 -50.5996 -23.4004 -79.3994 -25.9004c-9.10059 -0.799805 -16.7002 6.90039 -16.7002 16v32.2002c0 7.90039 5.7002 14.9004 13.5996 15.7002c21.7002 2.2998 42.2002 10.2002 57.7002 22.4004c13.7998 10.8994 33.6006 13.1992 47.1006 2
+c38.2998 -31.7002 107.199 -31.8008 145.199 -1.7002c13.7002 10.8994 33.2002 13 46.7002 1.7998c38.5 -31.9004 107.8 -31.9004 145.7 -1.5c14 11.2998 34.0996 11.0996 48.2002 0c15.7998 -12.4004 36.3994 -20.5 57.8994 -22.9004zM562.1 352.1
+c8.10059 -0.899414 13.9004 -8.2998 13.8008 -16.2998v-31.5996c0 -9.10059 -7.60059 -16.7998 -16.7002 -16c-28.2002 2.5 -55.7998 11.5996 -79.1006 25.7998c-55 -34.0996 -135.5 -34.5996 -192 0c-55 -34.0996 -135.5 -34.5996 -192 0
+c-23.2998 -14.5 -50.5996 -23.4004 -79.3994 -25.9004c-9.10059 -0.799805 -16.7002 6.90039 -16.7002 16v32.2002c0 7.90039 5.7002 14.9004 13.5996 15.7002c21.7002 2.2998 42.2002 10.2002 57.7002 22.4004c13.7998 10.8994 33.6006 13.1992 47.1006 2
+c38.2998 -31.7002 107.199 -31.8008 145.199 -1.7002c13.7002 10.8994 33.2002 13 46.7002 1.7998c38.5 -31.9004 107.8 -31.9004 145.7 -1.5c14 11.2998 34.0996 11.0996 48.2002 0c15.7998 -12.4004 36.3994 -20.4004 57.8994 -22.9004z" />
+    <glyph glyph-name="baby" unicode="&#xf77c;" horiz-adv-x="384" 
+d="M192 288c-44.2002 0 -80 35.7998 -80 80s35.7998 80 80 80s80 -35.7998 80 -80s-35.7998 -80 -80 -80zM138.6 39.2002l29.4004 -39.2002c13.2002 -17.7002 9.7002 -42.7998 -8 -56c-7.2002 -5.40039 -15.7002 -8 -24 -8c-12.0996 0 -24.0996 5.5 -32 16l-48 64
+c-10.9004 14.5996 -10.5996 34.7998 0.799805 49l45.9004 57.4004l61.5 -51.2002zM281.3 122.4l45.9004 -57.4004c11.3994 -14.2002 11.7002 -34.4004 0.799805 -49l-48 -64c-7.7998 -10.5 -19.7998 -16 -32 -16c-8.40039 0 -16.7998 2.59961 -24 8
+c-17.7002 13.2002 -21.2002 38.2998 -8 56l29.4004 39.2002l-25.6006 32zM376.7 303c12.7002 -18.0996 8.39941 -43 -9.7002 -55.7998l-40.5996 -28.5c-17 -11.9004 -35.4004 -20.9004 -54.4004 -27.9004v-30.7998h-160v30.9004c-19 7 -37.4004 16 -54.4004 27.8994
+l-40.5996 28.5c-18 12.7002 -22.4004 37.6006 -9.7002 55.7002c12.7002 18 37.6006 22.4004 55.7002 9.7002l40.5996 -28.4004c52.6006 -37 124.101 -37 176.801 0l40.5996 28.5c18.0996 12.6006 43 8.2998 55.7002 -9.7998z" />
+    <glyph glyph-name="baby-carriage" unicode="&#xf77d;" 
+d="M144.8 431l111.2 -175h-256c0 74 35.2998 140.1 90.7998 184.4c16.7998 13.3994 42.7002 8.39941 54 -9.40039zM496 352c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-48v-64c0 -50.5996 -23 -96.4004 -60.2998 -130.7
+c34.5996 -8.89941 60.2998 -40 60.2998 -77.2998c0 -44.2002 -35.7998 -80 -80 -80s-80 35.7998 -80 80c0 8.90039 1.7002 17.2002 4.40039 25.2002c-21.5 -5.90039 -44.6006 -9.2002 -68.4004 -9.2002s-46.7998 3.2998 -68.4004 9.2002
+c2.60059 -8 4.40039 -16.2998 4.40039 -25.2002c0 -44.2002 -35.7998 -80 -80 -80s-80 35.7998 -80 80c0 37.2998 25.7002 68.4004 60.2998 77.2998c-37.2998 34.2998 -60.2998 80.1006 -60.2998 130.7h384v64c0 35.2998 28.7002 64 64 64h48zM80 -16
+c17.5996 0 32 14.4004 32 32s-14.4004 32 -32 32s-32 -14.4004 -32 -32s14.4004 -32 32 -32zM400 16c0 17.5996 -14.4004 32 -32 32s-32 -14.4004 -32 -32s14.4004 -32 32 -32s32 14.4004 32 32z" />
+    <glyph glyph-name="biohazard" unicode="&#xf780;" horiz-adv-x="576" 
+d="M287.9 336c-18.5 0 -36 -3.7998 -52.5 -9.5c-13.3008 10.2998 -23.6006 24.2998 -29.5 40.7002c25.1992 10.8994 53 16.8994 82.0996 16.8994c29.2002 0 57 -6.09961 82.2002 -17c-5.90039 -16.3994 -16.2002 -30.3994 -29.5 -40.6992
+c-16.6006 5.7998 -34.2002 9.59961 -52.7998 9.59961zM163.6 9.2998c-47.5 35.5 -79.1992 90.7002 -83.2998 153.5c7.2998 2.10059 14.9004 3.10059 22.5 3.10059c9.2002 0 17.9004 -1.80078 26.4004 -4.60059c4.09961 -44.2998 26 -83.2002 58.8994 -109.6
+c-4.09961 -16 -12.5 -30.6006 -24.5 -42.4004zM387.8 51.9004c32.7002 26.3994 54.6006 65.0996 58.7002 109.3c8.59961 2.7998 17.4004 4.7002 26.5996 4.7002c7.5 0 15 -1 22.2002 -3c-3.89941 -62.8008 -35.5996 -118 -83 -153.5c-12 11.7998 -20.3994 26.5 -24.5 42.5z
+M501.3 256.9c34.6006 -20.4004 61 -53.3008 74.1006 -92.4004c1.2998 -3.7002 -0.200195 -7.7998 -3.5 -9.7998c-3.30078 -2 -7.5 -1.2998 -10 1.59961c-9.40039 10.7998 -19 19 -29.2002 25.1006c-57.2998 33.8994 -130.8 13.6992 -163.9 -45
+c-33.0996 -58.7002 -13.3994 -134 43.9004 -167.9c10.2002 -6.09961 21.8994 -10.5 35.7998 -13.4004c3.7998 -0.799805 6.40039 -4.19922 6.40039 -8.09961c-0.100586 -4 -2.7002 -7.2998 -6.5 -8c-39.7002 -7.7998 -80.6006 -0.799805 -115.2 19.7002
+c-18 10.5996 -32.9004 24.5 -45.2998 40.0996c-12.4004 -15.5996 -27.3008 -29.5 -45.3008 -40.0996c-34.5996 -20.5 -75.5 -27.5 -115.199 -19.7002c-3.80078 0.700195 -6.40039 4 -6.5 8c0 3.90039 2.69922 7.2998 6.39941 8.09961
+c13.7998 3 25.6006 7.30078 35.7998 13.4004c57.3008 33.9004 77 109.2 43.9004 167.9c-33.0996 58.6992 -106.6 78.8994 -163.9 45c-10.1992 -6 -19.7998 -14.3008 -29.1992 -25.1006c-2.5 -2.89941 -6.7002 -3.59961 -10 -1.59961
+c-3.30078 2.09961 -4.80078 6.09961 -3.5 9.7998c13.2998 39.0996 39.6992 71.9004 74.2998 92.4004c17.5996 10.3994 36.3994 16.5996 55.2998 19.8994c-6.09961 17.7002 -10 36.4004 -10 56.2002c0 41 14.5996 80.7998 41 112.2c2.5 3 6.59961 3.7002 10 1.7998
+c3.2998 -1.90039 4.7998 -6 3.59961 -9.7002c-4.39941 -13.7998 -6.59961 -26.3994 -6.59961 -38.5c0 -67.7998 53.7998 -122.899 120 -122.899s120 55.0996 120 122.899c0 12.2002 -2.09961 24.7002 -6.59961 38.5c-1.2002 3.7002 0.299805 7.7998 3.59961 9.7002
+c3.40039 1.90039 7.5 1.2002 10 -1.7998c26.5 -31.4004 41 -71.2002 41 -112.2c0 -19.7998 -4 -38.5 -10 -56.2002c19 -3.2998 37.7002 -9.5 55.2998 -19.8994zM287.9 127.9c26.5 0 48 21.5 48 48s-21.5 48 -48 48s-48 -21.5 -48 -48s21.5 -48 48 -48z" />
+    <glyph glyph-name="blog" unicode="&#xf781;" 
+d="M172.2 221.2c75.5 -15 129.899 -89.2998 112.5 -172.2c-11.4004 -54.2998 -55.2998 -98.2998 -109.7 -109.7c-92.9004 -19.5 -175 51.2002 -175 140.7v248c0 13.2998 10.7002 24 24 24h48c13.2998 0 24 -10.7002 24 -24v-248c0 -26.5 21.5 -48 48 -48s48 21.5 48 48
+c0 20.5996 -13.0996 38.2002 -31.2998 45c-9.60059 3.59961 -16.7002 11.7998 -16.7002 22v50.4004c0 14.8994 13.5996 26.6992 28.2002 23.7998zM209 448c163.2 -8.59961 294.4 -139.8 302.9 -303c0.5 -9.2002 -6.80078 -17 -16 -17h-32.1006
+c-8.39941 0 -15.3994 6.59961 -15.8994 15c-7.5 129.5 -111.5 234.5 -240.9 241.5c-8.40039 0.400391 -15 7.40039 -15 15.9004v31.5996c0 9.2002 7.7998 16.5 17 16zM209.3 352c110.101 -8.5 198.2 -96.5996 206.601 -206.7
+c0.699219 -9.2998 -6.80078 -17.2998 -16.1006 -17.2998h-32.2002c-8.2998 0 -15.0996 6.40039 -15.8994 14.7002c-6.90039 77 -68.1006 138.899 -144.9 145.2c-8.2998 0.599609 -14.7998 7.5 -14.7998 15.8994v32.1006c0 9.39941 8 16.7998 17.2998 16.0996z" />
+    <glyph glyph-name="calendar-day" unicode="&#xf783;" horiz-adv-x="448" 
+d="M0 -16v272h448v-272c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48zM64 176v-96c0 -8.7998 7.2002 -16 16 -16h96c8.7998 0 16 7.2002 16 16v96c0 8.7998 -7.2002 16 -16 16h-96c-8.7998 0 -16 -7.2002 -16 -16zM400 384c26.5 0 48 -21.5 48 -48v-48h-448v48
+c0 26.5 21.5 48 48 48h48v48c0 8.7998 7.2002 16 16 16h32c8.7998 0 16 -7.2002 16 -16v-48h128v48c0 8.7998 7.2002 16 16 16h32c8.7998 0 16 -7.2002 16 -16v-48h48z" />
+    <glyph glyph-name="calendar-week" unicode="&#xf784;" horiz-adv-x="448" 
+d="M0 -16v272h448v-272c0 -26.5 -21.5 -48 -48 -48h-352c-26.5 0 -48 21.5 -48 48zM64 176v-64c0 -8.7998 7.2002 -16 16 -16h288c8.7998 0 16 7.2002 16 16v64c0 8.7998 -7.2002 16 -16 16h-288c-8.7998 0 -16 -7.2002 -16 -16zM400 384c26.5 0 48 -21.5 48 -48v-48h-448
+v48c0 26.5 21.5 48 48 48h48v48c0 8.7998 7.2002 16 16 16h32c8.7998 0 16 -7.2002 16 -16v-48h128v48c0 8.7998 7.2002 16 16 16h32c8.7998 0 16 -7.2002 16 -16v-48h48z" />
+    <glyph glyph-name="candy-cane" unicode="&#xf786;" 
+d="M497.5 356c35.7002 -75.5 2.7998 -166.1 -68.9004 -209l-347.3 -206.5c-5.2002 -3 -10.7998 -4.5 -16.3994 -4.5c-10.9004 0 -21.5 5.59961 -27.5 15.5996l-32.8008 54.9004c-9.09961 15.2002 -4.19922 34.7998 11 43.9004l353.601 210.1
+c15.0996 9.09961 20.0996 28.7998 11 43.9004c-6 10 -16.6006 15.5996 -27.5 15.5996c-5.60059 0 -11.2998 -1.40039 -16.4004 -4.5l-27.5 -16.4004c-5.2002 -3 -10.7998 -4.5 -16.3994 -4.5c-10.9004 0 -21.5 5.60059 -27.5 15.6006l-32.8008 54.8994
+c-9.09961 15.2002 -4.19922 34.8008 11 43.9004l27.5 16.4004c25.6006 15.2998 53.9004 22.5996 81.8008 22.5996c59.3994 0 117.199 -33.0996 145.1 -92zM319.8 343c8.5 5.09961 18.1006 7.59961 27.9004 8.40039l-20.6006 61.7998
+c-10.5 -2.10059 -20.5996 -5.5 -30.2998 -10.2002l20.5 -61.5zM145.9 16.2002l30.7998 18.2998l-60.5 38.5l-30.7998 -18.2998zM253.4 80.0996l30.7998 18.3008l-60.5 38.5l-30.7998 -18.3008zM364.3 146l30.7998 18.2998l-60.5 38.5l-30.7998 -18.2998zM384.7 343.3
+c9.2002 -5.39941 17.2002 -13 22.8994 -22.2998l45.7002 45.7002c-6.59961 8.5 -14.2002 16.0996 -22.5996 22.5996zM466.8 235.5c4.60059 9.7998 8 20 10.1006 30.4004l-60.4004 20.0996c-0.0996094 -4.5 -0.700195 -9.09961 -1.7998 -13.5996
+c-1.60059 -6.2002 -4.2002 -11.8008 -7.40039 -17.1006z" />
+    <glyph glyph-name="carrot" unicode="&#xf787;" 
+d="M298.2 291.4c61.7002 -30.1006 87.2998 -104.5 57.2002 -166.2c-12.6006 -25.7998 -33.1006 -45.4004 -57.1006 -57.1006l-102 -49.7998l-57 57c-6.2002 6.2002 -16.2998 6.2002 -22.5996 0s-6.2998 -16.3994 0 -22.5996l49.2002 -49.2002l-133.601 -65.2002
+c-11.0996 -5.39941 -24.5996 -0.799805 -30 10.2998c-3.09961 6.40039 -2.89941 13.7002 0 19.7002l128.101 262.7l50.1992 -50.2002c3.10059 -3.09961 7.2002 -4.7002 11.3008 -4.7002c4.09961 0 8.19922 1.60059 11.2998 4.7002c6.2998 6.2002 6.2998 16.2998 0 22.6006
+l-55.2002 55.1992c35.7002 43.3008 97.5 58.5 150.2 32.8008zM390.3 326.3c40.7002 19.5 88.7998 9.40039 121.7 -30.2998c-41.5996 -50.2998 -107.5 -52.5 -151.9 -7.90039l-8 8c-44.5996 44.4004 -42.3994 110.2 7.90039 151.9
+c39.7002 -32.9004 49.7998 -81 30.2998 -121.7z" />
+    <glyph glyph-name="cash-register" unicode="&#xf788;" 
+d="M511.1 69.2002c0.600586 -3.5 0.900391 -7 0.800781 -10.5v-90.7002c0 -17.7002 -14.3008 -32 -32 -32h-448c-17.7002 0 -32 14.2998 -32 32v90.7998c0 3.5 0.299805 7 0.899414 10.5l26.7002 160c2.59961 15.4004 16 26.7002 31.5996 26.7002h84.9004v64h-96
+c-8.7998 0 -16 7.2002 -16 16v96c0 8.7998 7.2002 16 16 16h256c8.7998 0 16 -7.2002 16 -16v-96.0996c0 -8.80078 -7.2002 -16 -16 -16h-96v-64h244.8c15.7002 0 29 -11.3008 31.6006 -26.7002zM280 200v-16c0 -8.7998 7.2002 -16 16 -16h16c8.7998 0 16 7.2002 16 16v16
+c0 8.7998 -7.2002 16 -16 16h-16c-8.7998 0 -16 -7.2002 -16 -16zM248 136c-8.7998 0 -16 -7.2002 -16 -16v-16c0 -8.7998 7.2002 -16 16 -16h16c8.7998 0 16 7.2002 16 16v16c0 8.7998 -7.2002 16 -16 16h-16zM216 216h-16c-8.7998 0 -16 -7.2002 -16 -16v-16
+c0 -8.7998 7.2002 -16 16 -16h16c8.7998 0 16 7.2002 16 16v16c0 8.7998 -7.2002 16 -16 16zM80 368h192v32h-192v-32zM120 168c8.7998 0 16 7.2002 16 16v16c0 8.7998 -7.2002 16 -16 16h-16c-8.7998 0 -16 -7.2002 -16 -16v-16c0 -8.7998 7.2002 -16 16 -16h16zM136 104
+c0 -8.7998 7.2002 -16 16 -16h16c8.7998 0 16 7.2002 16 16v16c0 8.7998 -7.2002 16 -16 16h-16c-8.7998 0 -16 -7.2002 -16 -16v-16zM352 -8v16c0 4.40039 -3.59961 8 -8 8h-176c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h176c4.40039 0 8 3.59961 8 8
+zM376 104v16c0 8.7998 -7.2002 16 -16 16h-16c-8.7998 0 -16 -7.2002 -16 -16v-16c0 -8.7998 7.2002 -16 16 -16h16c8.7998 0 16 7.2002 16 16zM424 184v16c0 8.7998 -7.2002 16 -16 16h-16c-8.7998 0 -16 -7.2002 -16 -16v-16c0 -8.7998 7.2002 -16 16 -16h16
+c8.7998 0 16 7.2002 16 16z" />
+    <glyph glyph-name="compress-arrows-alt" unicode="&#xf78c;" 
+d="M200 160c13.2998 0 24 -10.7002 24 -24v-112c0 -21.4004 -25.7998 -32.0996 -40.9004 -17l-31.0996 33l-99.2998 -99.2998c-6.2002 -6.2002 -16.4004 -6.2002 -22.6006 0l-25.3994 25.3994c-6.2002 6.2002 -6.2002 16.4004 0 22.6006l99.2002 99.2998l-32.9004 31
+c-15.0996 15.2002 -4.40039 41 17 41h112zM312 224c-13.2998 0 -24 10.7002 -24 24v112c0 21.4004 25.7998 32.0996 40.9004 17l31.0996 -33l99.2998 99.2998c6.2002 6.2002 16.4004 6.2002 22.6006 0l25.3994 -25.3994c6.2002 -6.2002 6.2002 -16.4004 0 -22.6006
+l-99.2998 -99.2998l33 -31c15.0996 -15.0996 4.40039 -41 -17 -41h-112zM408 88l99.2998 -99.4004c6.2002 -6.19922 6.2002 -16.3994 0 -22.5996l-25.3994 -25.4004c-6.2002 -6.19922 -16.4004 -6.19922 -22.6006 0l-99.2998 99.3008l-31 -32.9004
+c-15.0996 -15.0996 -41 -4.40039 -41 17v112c0 13.2998 10.7002 24 24 24h112c21.4004 0 32.0996 -25.7998 17 -40.9004zM183 376.9c15.0996 15.0996 41 4.39941 41 -16.9004v-112c0 -13.2998 -10.7002 -24 -24 -24h-112c-21.4004 0 -32.0996 25.7998 -17 40.9004
+l33 31.0996l-99.2998 99.2998c-6.2002 6.2002 -6.2002 16.4004 0 22.6006l25.3994 25.3994c6.2002 6.2002 16.4004 6.2002 22.6006 0l99.2998 -99.2998z" />
+    <glyph glyph-name="dumpster" unicode="&#xf793;" horiz-adv-x="576" 
+d="M560 288h-97.2998l-25.6006 128h98.9004c7.2998 0 13.7002 -5 15.5 -12.0996l24 -96c2.5 -10.1006 -5.09961 -19.9004 -15.5 -19.9004zM272 416v-128h-126.1l25.5996 128h100.5zM404.5 416l25.5996 -128h-126.1v128h100.5zM16 288c-10.4004 0 -18 9.7998 -15.5 19.9004
+l24 96c1.7998 7.09961 8.2002 12.0996 15.5 12.0996h98.9004l-25.6006 -128h-97.2998zM560 224c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-28l-20 -160v-16c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v16h-320v-16
+c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v16l-20 160h-28c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h20l-4 32h512l-4 -32h20z" />
+    <glyph glyph-name="dumpster-fire" unicode="&#xf794;" horiz-adv-x="640" 
+d="M418.7 343.9c-19.7002 -17.6006 -37.7002 -36.5 -53.9004 -55.8008h-60.7998v128h100.5l14.4004 -72zM272 416v-128h-126.1l25.5996 128h100.5zM461.3 343.9l-11.8994 10.5996l-12.3008 61.5h98.9004c7.2998 0 13.7002 -5 15.4004 -12.0996l24 -96
+c0.199219 -0.800781 -0.100586 -1.5 0 -2.30078c-1 1 -2 2.2002 -3.10059 3.10059l-21.2998 19l-21.2998 -19c-5.90039 -5.2002 -11.6006 -10.7002 -17.2998 -16.2998c-15.6006 17.7998 -32.9004 35.1992 -51.1006 51.5zM16 288c-10.4004 0 -18 9.7998 -15.5 19.9004l24 96
+c1.7998 7.09961 8.2002 12.0996 15.5 12.0996h98.9004l-25.6006 -128h-97.2998zM340.6 256c-32.6992 -46.7002 -52.5996 -93.7002 -52.5996 -129.6c0 -48.5 18.5996 -92.7002 48.7998 -126.4h-208.8v-16c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v16
+l-20 160h-28c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h20l-4 32h308.6zM551.1 284.8c51.8008 -46.2002 88.9004 -121.8 88.8008 -158.399c0 -87.5 -71.6006 -158.4 -160 -158.4c-88.4004 0 -160 70.9004 -160 158.4c0 49.2998 49.7998 130.899 120 193.6
+c27.3994 -24.4004 51.5 -50.5996 71 -76.4004c11.8994 14 25.2998 27.9004 40.1992 41.2002zM532.5 55.4004c33.4004 24.1992 41.2002 71.0996 22.5996 107.8c-2.2998 4.5 -4.89941 9.2002 -7.69922 14l-39.8008 -47s-62.3994 82.5 -67.0996 88.0996
+c-32.9004 -40.8994 -49.4004 -64.7998 -49.4004 -91.8994c0 -54.5 39.9004 -88 88.9004 -88c19.5996 0 37.7998 6.2998 52.5 17z" />
+    <glyph glyph-name="ethernet" unicode="&#xf796;" 
+d="M496 256c8.7998 0 16 -7.2002 16 -16v-224c0 -8.7998 -7.2002 -16 -16 -16h-80v128h-32v-128h-64v128h-32v-128h-64v128h-32v-128h-64v128h-32v-128h-80c-8.7998 0 -16 7.2002 -16 16v224c0 8.7998 7.2002 16 16 16h48v48c0 8.7998 7.2002 16 16 16h48v48
+c0 8.7998 7.2002 16 16 16h224c8.7998 0 16 -7.2002 16 -16v-48h48c8.7998 0 16 -7.2002 16 -16v-48h48z" />
+    <glyph glyph-name="gifts" unicode="&#xf79c;" horiz-adv-x="640" 
+d="M240.6 253.9c-27.7998 -6.90039 -48.5996 -32 -48.5996 -61.9004v-224c0 -11.7002 3.40039 -22.5 8.90039 -32h-168.9c-17.7002 0 -32 14.2998 -32 32v352c0 17.7002 14.2998 32 32 32h29.4004l-30.7002 22c-7.2002 5.09961 -8.7998 15.0996 -3.7002 22.2998l9.2998 13
+c5.10059 7.2002 15.1006 8.7998 22.2998 3.7002l32.1006 -22.7998l-11.5 30.5996c-3.2002 8.2002 1 17.5 9.2998 20.6006l15 5.59961c8.2998 3.09961 17.5 -1.09961 20.5996 -9.40039l19.9004 -53.0996l19.9004 53c3.09961 8.2998 12.2998 12.5 20.5996 9.40039l15 -5.60059
+c8.2998 -3.09961 12.5 -12.2998 9.40039 -20.5996l-11.5 -30.6006l32 22.9004c7.19922 5.2002 17.1992 3.5 22.2998 -3.7002l9.2998 -13c5.2002 -7.2002 3.5 -17.2002 -3.7002 -22.2998l-30.7002 -22h29.4004c12.7002 0 23.4004 -7.5 28.5996 -18.2998
+c-26.6992 -18.6006 -42.0996 -49 -44 -79.7998zM224 -32v96h192v-128h-160c-17.7002 0 -32 14.2998 -32 32zM448 -64v128h192v-96c0 -17.7002 -14.2998 -32 -32 -32h-160zM608 224c17.7002 0 32 -14.2998 32 -32v-96h-192v128h-15.2998l-0.700195 0.200195
+l-0.700195 -0.200195h-15.2998v-128h-192v96c0 17.7002 14.2998 32 32 32h20.4004c-2.7002 7.59961 -4.40039 15.5 -4.40039 23.7998c0 35.5 27 72.2002 72.0996 72.2002c48 0 75.8008 -47.7002 87.9004 -75.2998c12 27.5996 39.7998 75.2998 87.9004 75.2998
+c45.0996 0 72.0996 -36.7002 72.0996 -72.2002c0 -8.2998 -1.7998 -16.2002 -4.40039 -23.7998h20.4004zM336 224h52.5996c-8.89941 20.5996 -25.7998 48 -44.5 48c-17.6992 0 -24.0996 -14.5 -24.0996 -24.2002c0 -5.2002 1.5 -12.5996 8.7998 -19
+c2.10059 -1.7998 4.5 -3.39941 7.2002 -4.7998zM535.2 228.8c7.2998 6.40039 8.7998 13.7998 8.7998 19c0 9.7002 -6.40039 24.2002 -24.0996 24.2002c-18.7002 0 -35.7002 -27.7002 -44.5 -48h52.5996c2.7002 1.40039 5.09961 3 7.2002 4.7998z" />
+    <glyph glyph-name="glass-cheers" unicode="&#xf79f;" horiz-adv-x="640" 
+d="M639.4 14.4004c1.69922 -4.10059 -0.300781 -8.7002 -4.30078 -10.4004l-162.399 -67.4004c-4 -1.69922 -8.7002 0.200195 -10.4004 4.30078c-8.5 20.3994 1.2002 43.7998 21.6006 52.2998l22.0996 9.2002l-39.2998 103.6
+c-4.40039 -0.5 -8.7998 -1.2998 -13.1006 -1.2998c-51.6992 0 -99.3994 33.0996 -113.399 85.2998l-20.2002 75.4004l-20.2002 -75.4004c-14 -52.2002 -61.7002 -85.2998 -113.399 -85.2998c-4.30078 0 -8.7002 0.799805 -13.1006 1.2998l-39.3994 -103.6l22.0996 -9.2002
+c20.4004 -8.5 30 -31.9004 21.5996 -52.2998c-1.69922 -4.10059 -6.2998 -6 -10.3994 -4.30078l-162.3 67.4004c-4.10059 1.7002 -6 6.40039 -4.30078 10.5c8.5 20.4004 31.8008 30.0996 52.2002 21.5996l22.1006 -9.19922l38.6992 101.899
+c-47.8994 34.9004 -64.6992 100.2 -34.5 152.7l86.6006 150.5c8 13.9004 25.0996 19.7998 40 13.5996l114.3 -47.3994l114.3 47.3994c14.9004 6.10059 32 0.300781 40 -13.5996l86.6006 -150.5c30.2998 -52.5 13.3994 -117.8 -34.5 -152.8l38.6992 -101.9l22.1006 9.2002
+c20.3994 8.5 43.7998 -1.2002 52.2002 -21.5996zM275.9 285.9l18.8994 70.6992l-94.5 39.2002l-36.5 -63.3994zM364.1 285.9l112.101 46.5l-36.5 63.3994l-94.5 -39.2002z" />
+    <glyph glyph-name="glass-whiskey" unicode="&#xf7a0;" 
+d="M480 416c19.5 0 34.4004 -17.2002 31.7002 -36.5l-55.6006 -356.5c-4.5 -31.5 -31.5996 -54.9004 -63.3994 -54.9004h-273c-31.9004 0 -58.9004 23.4004 -63.4004 54.9004l-56 356.5c-2.7002 19.2998 12.2002 36.5 31.7002 36.5h448zM442.6 352h-373.199l30.1992 -192
+h313z" />
+    <glyph glyph-name="globe-europe" unicode="&#xf7a2;" horiz-adv-x="496" 
+d="M248 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM448 192c0 110.3 -89.7002 200 -200.2 200c-1.89941 0 -3.7998 -0.200195 -5.7002 -0.299805l-28.8994 -21.7002c-2 -1.5 -3.2002 -3.90039 -3.2002 -6.40039v-20
+c0 -4.39941 3.59961 -8 8 -8h16c4.40039 0 8 3.60059 8 8v8l16 16h20.7002c6.2002 0 11.2998 -5.09961 11.2998 -11.2998c0 -3 -1.2002 -5.89941 -3.2998 -8l-26.7998 -26.7998c-1.2002 -1.2002 -2.7002 -2.09961 -4.40039 -2.7002l-40 -13.2998
+c-3.2998 -1.09961 -5.5 -4.2002 -5.5 -7.59961c0 -6.60059 -2.59961 -12.9004 -7.2002 -17.5l-20.0996 -20.1006c-3 -3 -4.7002 -7.09961 -4.7002 -11.2998v-25.2998c0 -8.7998 7.2002 -16 16 -16h22.0996c6.10059 0 11.6006 3.39941 14.3008 8.7998l9.39941 18.7002
+c1.40039 2.7002 4.2002 4.39941 7.2002 4.39941h3.09961c4.40039 0 8 -3.59961 8 -8c0 -4.39941 3.60059 -8 8 -8h16c4.40039 0 8 3.60059 8 8v2.2002c0 3.5 2.2002 6.5 5.5 7.60059l31.6006 10.5c6.5 2.19922 10.8994 8.2998 10.8994 15.1992v4.5
+c0 8.80078 7.2002 16 16 16h36.7002c6.2002 0 11.2998 -5.09961 11.2998 -11.2998v-9.39941c0 -6.2002 -5.09961 -11.3008 -11.2998 -11.3008h-32c-3 0 -5.89941 -1.19922 -8 -3.2998l-9.39941 -9.39941c-2.10059 -2.10059 -3.30078 -5 -3.30078 -8
+c0 -6.2002 5.10059 -11.3008 11.3008 -11.3008h16c3 0 5.89941 -1.19922 8 -3.2998l9.39941 -9.39941c2.10059 -2.10059 3.2998 -5 3.2998 -8v-8.7002l-12.5 -12.5c-4.59961 -4.60059 -4.59961 -12.1006 -0.0996094 -16.7002l32 -32.5996
+c3 -3.10059 7.09961 -4.80078 11.4004 -4.80078h20.2998c6.89941 20.2002 10.7998 41.9004 10.7998 64.4004zM130.1 298.9c0 -6.2002 5.10059 -11.3008 11.3008 -11.3008h16c3 0 5.89941 1.2002 8 3.30078l9.39941 9.39941c2.10059 2.10059 3.2998 5 3.2998 8v16
+c0 6.2002 -5.09961 11.2998 -11.2998 11.2998c-3 0 -5.89941 -1.19922 -8 -3.2998l-25.3994 -25.3994c-2.10059 -2.10059 -3.30078 -5 -3.30078 -8zM258.1 -7.5c71.1006 3.59961 132.5 44.2002 164.9 103.1h-13.4004c-4.7998 0 -9.5 1.90039 -12.8994 5.30078
+l-17.2998 17.2998c-6 6 -14.1006 9.39941 -22.6006 9.39941h-18.2998l-43.2002 37.1006c-8.2002 7 -18.7002 10.8994 -29.5996 10.8994h-31.2002c-8.2002 0 -16.2998 -2.2998 -23.4004 -6.5l-42.8994 -25.6992c-13.7002 -8.2002 -22.1006 -23 -22.1006 -39v-23.9004
+c0 -14.2998 6.7002 -27.7998 18.2002 -36.4004l22.2002 -16.6992c8.7002 -6.5 24.5996 -11.8008 35.4004 -11.8008h20.1992c8.80078 0 16 -7.19922 16 -16v-7.09961z" />
+    <glyph glyph-name="grip-lines" unicode="&#xf7a4;" 
+d="M496 160c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-480c-8.7998 0 -16 7.2002 -16 16v32c0 8.7998 7.2002 16 16 16h480zM496 288c8.7998 0 16 -7.2002 16 -16v-32c0 -8.7998 -7.2002 -16 -16 -16h-480c-8.7998 0 -16 7.2002 -16 16v32
+c0 8.7998 7.2002 16 16 16h480z" />
+    <glyph glyph-name="grip-lines-vertical" unicode="&#xf7a5;" horiz-adv-x="256" 
+d="M96 -48c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v480c0 8.7998 7.2002 16 16 16h32c8.7998 0 16 -7.2002 16 -16v-480zM224 -48c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v480c0 8.7998 7.2002 16 16 16h32
+c8.7998 0 16 -7.2002 16 -16v-480z" />
+    <glyph glyph-name="guitar" unicode="&#xf7a6;" 
+d="M502.63 409c5.77344 -5.79004 9.34473 -13.7852 9.34473 -22.5996c0 -8.8291 -3.58398 -16.8281 -9.375 -22.6201l-46.3301 -46.3203c-3.82617 -3.83691 -8.53223 -6.78125 -13.7891 -8.53027l-36.4805 -12.1602l-76.2402 -76.2393
+c8.79004 -12.2002 15.7705 -25.5605 19.1602 -40.2002c7.74023 -33.3896 0.870117 -66.8701 -22 -89.75c-9.26367 -9.2207 -20.71 -16.2314 -33.4795 -20.25c-18.54 -6.00977 -32.6709 -23.29 -34.4307 -42.1396c-2.29004 -23.8105 -11.4502 -45.8301 -28.4502 -62.71
+c-45.5596 -45.4805 -127.5 -37.3809 -182.979 18.0693c-55.4805 55.4502 -63.6904 137.45 -18.0498 182.96c16.8799 16.9902 38.9102 26.1699 62.6094 28.4404c18.9404 1.76953 36.1504 15.8994 42.1504 34.46c4.01172 12.7686 11.0195 24.2119 20.2402 33.4697
+c22.8799 22.8799 56.4297 29.7803 89.8799 22c14.5996 -3.39941 27.9395 -10.3799 40.0996 -19.1396l76.2598 76.2598l12.1602 36.5098c1.74902 5.25781 4.69336 9.96387 8.53027 13.79l46.2803 46.3301c5.79199 5.79395 13.8018 9.37988 22.6338 9.37988
+s16.833 -3.58594 22.626 -9.37988zM208 96c26.4922 0 48 21.5078 48 48s-21.5078 48 -48 48s-48 -21.5078 -48 -48s21.5078 -48 48 -48z" />
+    <glyph glyph-name="heart-broken" unicode="&#xf7a9;" 
+d="M473.7 374.2c48.7002 -49.7998 50.7998 -129.101 7.2998 -182.101l-212.2 -218.699c-7.09961 -7.30078 -18.5996 -7.30078 -25.7002 0l-212.1 218.6c-43.5 53.0996 -41.4004 132.4 7.2998 182.2l2.40039 2.39941c46.2998 47.4004 119 51.8008 170.7 14l28.5996 -86.5
+l-96 -64l144 -144l-48 128l96 64l-34.2998 103.4c51.5996 36.9004 123.6 32.2002 169.6 -14.7998z" />
+    <glyph glyph-name="holly-berry" unicode="&#xf7aa;" horiz-adv-x="448" 
+d="M144 256c-26.5 0 -48 21.5 -48 48s21.5 48 48 48s48 -21.5 48 -48s-21.5 -48 -48 -48zM256 304c0 26.5 21.5 48 48 48s48 -21.5 48 -48s-21.5 -48 -48 -48s-48 21.5 -48 48zM224 352c-26.5 0 -48 21.5 -48 48s21.5 48 48 48s48 -21.5 48 -48s-21.5 -48 -48 -48z
+M207.8 212.9c-0.399414 -39.8008 7.40039 -78.1006 22.9004 -112.301c4 -8.89941 -2 -19.1992 -11.7002 -20.1992c-15.2002 -1.5 -30.4004 -4.60059 -45.2998 -9.10059c-14.9004 -4.5 -23.7998 -19.8994 -20.2002 -35.0996s8.5 -29.9004 14.7002 -43.7998
+c4 -8.90039 -1.90039 -19.3008 -11.6006 -20.2002c-35.8994 -3.40039 -71.5996 -14.9004 -104.8 -33.9004c-12.3994 -7.09961 -27.5 1.60059 -27.5996 16c-0.100586 38.2002 -8 74.9004 -23 107.7c-4 8.90039 2 19.2002 11.7002 20.2002
+c15.1992 1.5 30.3994 4.59961 45.2998 9.09961c14.8994 4.5 23.7998 19.9004 20.2002 35.1006c-3.60059 15.1992 -8.5 29.8994 -14.7002 43.7998c-4 8.89941 1.89941 19.2998 11.5996 20.2002c37.2998 3.5 74.4004 15.8994 108.7 36.1992
+c10.7002 6.40039 23.9004 -1.2998 23.7998 -13.6992zM435 82.4004c9.7002 -1 15.7998 -11.4004 11.5 -20.1006c-15 -32.7002 -22.7998 -69.5 -23 -107.7c0 -14.3994 -15.0996 -23.0996 -27.5996 -16c-33.2002 19 -68.9004 30.5 -104.801 33.9004
+c-9.69922 0.900391 -15.5996 11.2998 -11.5996 20.2002c6.2002 14 11.0996 28.5996 14.7002 43.7998c3.59961 15.2002 -5.2998 30.5996 -20.2002 35.0996c-4.90039 1.5 -9.90039 2.5 -14.7998 3.7002c5.7998 12.2998 6.2998 26.5 0.599609 38.9004
+c-12.8994 28.2998 -19.7002 60.7002 -19.8994 94c0 1.7002 0.199219 3.2998 0.199219 4.89941c-0.0996094 12.3008 13.1006 20 23.8008 13.7002c34.2998 -20.2998 71.3994 -32.7002 108.699 -36.2002c9.7002 -0.899414 15.6006 -11.2998 11.6006 -20.1992
+c-6.2002 -14 -11.1006 -28.6006 -14.7002 -43.8008c-3.59961 -15.1992 5.2998 -30.5996 20.2002 -35.0996c15 -4.40039 30.0996 -7.5 45.2998 -9.09961z" />
+    <glyph glyph-name="horse-head" unicode="&#xf7ab;" 
+d="M509.8 115.5c4.60059 -11.7998 1.7998 -25.2998 -7.09961 -34.4004l-45.2998 -39.7998c-6 -6 -14.1006 -9.39941 -22.6006 -9.39941h-50.2998c-10.2998 0 -20 4.89941 -26 13.2998l-46 63.8994c-13.7998 -8.09961 -29.5996 -13.1992 -46.7998 -13.1992
+c-39.2002 0 -72.6006 23.6992 -87.4004 57.3994c-2.2998 5.10059 -9 6.2998 -12.8994 2.40039l-12.1006 -12.1006c-2.5 -2.39941 -3.2002 -6.19922 -1.59961 -9.2998c19.7002 -38.8994 58.7002 -66.0996 104.3 -69.5996v-0.700195l40.7998 -81.7002
+c10.7002 -21.2998 -4.7998 -46.2998 -28.5996 -46.2998h-236.2c-17.7002 0 -32 14.2998 -32 32v81.2002c0 159.899 35.9004 275.399 166.9 322.5l202.199 75.7002c4.90039 1.7998 10.7002 -1.10059 12 -6.10059c12.1006 -46.3994 -16.1992 -71.7002 -34.1992 -82.2998
+c42.5996 -8.2002 78.0996 -38 93 -79.2002zM328 224c13.2998 0 24 10.7002 24 24s-10.7002 24 -24 24s-24 -10.7002 -24 -24s10.7002 -24 24 -24z" />
+    <glyph glyph-name="icicles" unicode="&#xf7ad;" 
+d="M511.4 410.1l-87.5 -467.699c-1.7002 -8.60059 -14 -8.60059 -15.7002 0l-66.7002 363.8l-45.7998 -172.5c-2.2998 -7.60059 -13 -7.60059 -15.2998 0l-34.1006 133.399l-46.5 -196.899c-1.89941 -8.2998 -13.7002 -8.2998 -15.5996 0l-44.2002 187.3l-36.4004 -124.1
+c-2.39941 -7.2002 -12.5996 -7.2002 -15.0996 0l-87.0996 273.399c-6.2002 20.5 9.19922 41.2002 30.5996 41.2002h448c20 0 35.0996 -18.2002 31.4004 -37.9004z" />
+    <glyph glyph-name="igloo" unicode="&#xf7ae;" horiz-adv-x="576" 
+d="M320 414.1v-126.1h-271.4c51.6006 77.2002 139.601 128 239.4 128c10.7998 0 21.5 -0.700195 32 -1.90039zM96 256v-128h-96c0 46 11.0996 89.4004 30.2998 128h65.7002zM352 408.6c72.7998 -16.5 135.2 -60.5 175.4 -120.6h-175.4v120.6zM480 128v128h65.7002
+c19.2002 -38.5996 30.2998 -82 30.2998 -128h-96zM416 64c0 11.0996 -1.90039 21.7002 -4.5 32h164.5v-96c0 -17.7002 -14.2998 -32 -32 -32h-128v96zM448 256v-128h-49.7998c-22.2002 38.0996 -63 64 -110.2 64s-88 -25.9004 -110.2 -64h-49.7998v128h320zM0 0v96h164.5
+c-2.59961 -10.2998 -4.5 -20.9004 -4.5 -32v-96h-128c-17.7002 0 -32 14.2998 -32 32zM288 160c53 0 96 -43 96 -96v-96h-192v96c0 53 43 96 96 96z" />
+    <glyph glyph-name="mitten" unicode="&#xf7b5;" horiz-adv-x="448" 
+d="M368 32c8.7998 0 16 -7.2002 16 -16v-64c0 -8.7998 -7.2002 -16 -16 -16h-320c-8.7998 0 -16 7.2002 -16 16v64c0 8.7998 7.2002 16 16 16h320zM425 241.1c27.0996 -22.5996 30.7998 -62.8994 8.09961 -90.0996l-72.5 -87h-309l-47.8994 207.6
+c-17.9004 77.5 30.5 154.801 107.899 172.7c77.4004 17.9004 154.801 -30.5 172.801 -108l29.5996 -128.399l20.9004 25c22.5996 27.1992 62.8994 30.7998 90.0996 8.19922z" />
+    <glyph glyph-name="mug-hot" unicode="&#xf7b6;" 
+d="M127.1 301.5c-2.69922 16.5996 -10.3994 31.9004 -22.3994 44.0996c-22.6006 23.1006 -36.7002 52.5 -40.6006 84.4004c-1.09961 9.5 6.5 18 16.3008 18h16.3994c8.2002 0 15 -5.90039 16.1006 -13.7998c2.7998 -20.2002 12 -38.7998 26.3994 -53.5
+c20.2002 -20.5 32.7998 -46.5 36.6006 -74.7002c1.2998 -9.5 -6.5 -18 -16.3008 -18h-16.5c-8 0 -14.6992 5.7998 -16 13.5zM239.1 301.5c-2.69922 16.5996 -10.3994 31.9004 -22.3994 44.0996c-22.6006 23.1006 -36.7002 52.5 -40.6006 84.4004
+c-1.19922 9.5 6.5 18 16.3008 18h16.3994c8.2002 0 15 -5.90039 16.1006 -13.7998c2.7998 -20.2002 12 -38.7998 26.3994 -53.5c20.2002 -20.5 32.7998 -46.5 36.6006 -74.7002c1.2998 -9.5 -6.5 -18 -16.3008 -18h-16.5c-8 0 -14.6992 5.7998 -16 13.5zM400 256
+c61.7998 0 112 -50.2002 112 -112s-50.2002 -112 -112 -112h-16c0 -53 -43 -96 -96 -96h-192c-53 0 -96 43 -96 96v192c0 17.7002 14.2998 32 32 32h368zM400 96c26.5 0 48 21.5 48 48s-21.5 48 -48 48h-16v-96h16z" />
+    <glyph glyph-name="radiation" unicode="&#xf7b9;" horiz-adv-x="496" 
+d="M328.2 192.2c0 28.5996 -15.2002 53.5 -37.7998 67.7998l80.3994 128.4c4.7998 7.69922 15.2998 10.0996 22.7002 4.7998c58.0996 -42 97.4004 -108.4 102.5 -184.2c0.599609 -9.09961 -7.09961 -16.7998 -16.2002 -16.7998h-151.6zM290.4 124.5l80.3994 -128.5
+c4.7998 -7.59961 2.40039 -18.0996 -5.59961 -22.4004c-34.9004 -18.7998 -74.7998 -29.5996 -117.2 -29.5996s-82.2998 10.7998 -117.2 29.5996c-8 4.30078 -10.3994 14.7002 -5.59961 22.4004l80.3994 128.5c12.4004 -7.7002 26.8008 -12.4004 42.4004 -12.4004
+s30.0996 4.7002 42.4004 12.4004zM248 144.2c-26.5 0 -48 21.5 -48 48s21.5 48 48 48s48 -21.5 48 -48s-21.5 -48 -48 -48zM16.2002 192.2c-9.10059 0 -16.7998 7.7002 -16.2002 16.7002c5.09961 75.7998 44.4004 142.199 102.5 184.199
+c7.40039 5.40039 17.9004 2.90039 22.7002 -4.7998l80.3994 -128.399c-22.5996 -14.2002 -37.7998 -39.1006 -37.7998 -67.7002h-151.6z" />
+    <glyph glyph-name="radiation-alt" unicode="&#xf7ba;" horiz-adv-x="496" 
+d="M312 192c0 22.7998 -12.0996 42.7998 -30.0996 54l41.6992 66.7998c5.2002 8.2998 16.4004 9.90039 24 3.7998c32.5 -26 54.9004 -64.1992 59.5 -107.8c0.900391 -9.09961 -6.7998 -16.7998 -16 -16.7998h-79.0996zM214.2 137.9
+c9.7998 -6.2002 21.5 -9.90039 33.8994 -9.90039c12.4004 0 24 3.7002 33.8008 9.90039l41.7998 -66.9004c4.7998 -7.7998 2.39941 -18.4004 -5.7998 -22.5c-21.2002 -10.4004 -44.8008 -16.5 -69.9004 -16.5s-48.7002 6.09961 -69.7998 16.5
+c-8.2002 4.09961 -10.7002 14.7002 -5.7998 22.5zM104.9 192c-9.2002 0 -17 7.7002 -15.9004 16.9004c4.59961 43.5996 26.9004 81.7998 59.5 107.8c7.59961 6.09961 18.7998 4.5 24 -3.7998l41.7002 -66.8008c-18.1006 -11.2998 -30.2002 -31.2998 -30.2002 -54.0996
+h-79.0996zM248 -56c-137 0 -248 111 -248 248s111 248 248 248s248 -111 248 -248s-111 -248 -248 -248zM248 376c-101.5 0 -184 -82.5 -184 -184s82.5 -184 184 -184s184 82.5 184 184s-82.5 184 -184 184zM248 160c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32
+s32 -14.2998 32 -32s-14.2998 -32 -32 -32z" />
+    <glyph glyph-name="restroom" unicode="&#xf7bd;" horiz-adv-x="640" 
+d="M128 320c-35.2998 0 -64 28.7002 -64 64s28.7002 64 64 64s64 -28.7002 64 -64s-28.7002 -64 -64 -64zM512 320c-35.2998 0 -64 28.7002 -64 64s28.7002 64 64 64s64 -28.7002 64 -64s-28.7002 -64 -64 -64zM639.3 93.5c3.7002 -15.0996 -8.2998 -29.5 -24.5 -29.5
+h-54.7998v-104c0 -13.2998 -10.7002 -24 -24 -24h-48c-13.2998 0 -24 10.7002 -24 24v104h-54.7998c-16.2002 0 -28.2002 14.4004 -24.7002 29.5l45.5996 185.8c3.30078 13.5 15.5 23 29.8008 24.2002c15 -9.7002 32.7998 -15.5 52 -15.5c19.1992 0 37 5.7998 52 15.5
+c14.2998 -1.2002 26.5 -10.7002 29.7998 -24.2002zM336 448c8.7998 0 16 -7.2002 16 -16v-480c0 -8.7998 -7.2002 -16 -16 -16h-32c-8.7998 0 -16 7.2002 -16 16v480c0 8.7998 7.2002 16 16 16h32zM180.1 303.6c24.6006 -2.09961 43.9004 -22.5 43.9004 -47.5996v-136
+c0 -13.2998 -10.7002 -24 -24 -24h-8v-136c0 -13.2998 -10.7002 -24 -24 -24h-80c-13.2998 0 -24 10.7002 -24 24v136h-8c-13.2998 0 -24 10.7002 -24 24v136c0 25.0996 19.2998 45.5 43.9004 47.5996c15 -9.7998 32.8994 -15.5996 52.0996 -15.5996
+s37.0996 5.7998 52.0996 15.5996z" />
+    <glyph glyph-name="satellite" unicode="&#xf7bf;" 
+d="M502.609 137.958l-96.7041 -96.7168c-5.76758 -5.74707 -13.7207 -9.30176 -22.499 -9.30176c-8.77734 0 -16.7402 3.55469 -22.5078 9.30176l-80.3262 80.418l-9.89258 -9.9082c10.8848 -23.9746 16.9482 -50.5957 16.9482 -78.6221
+c0 -32.3584 -8.10156 -63.1982 -22.3555 -89.9004c-4.50098 -8.50098 -16.3936 -9.59473 -23.207 -2.79785l-107.519 107.515l-17.7998 -17.7988c0.703125 -2.60938 1.60938 -5.00098 1.60938 -7.79785c0 -17.6641 -14.3408 -32.0059 -32.0049 -32.0059
+s-32.0059 14.3418 -32.0059 32.0059s14.3418 32.0039 32.0059 32.0039c2.79688 0 5.18848 -0.90625 7.79785 -1.60938l17.7998 17.7998l-107.518 107.515c-6.79883 6.8125 -5.7041 18.6113 2.79688 23.2061c26.7031 14.2539 57.1895 22.3359 89.5479 22.3359
+c28.0273 0 55.0049 -6.04395 78.9805 -16.9297l9.79883 9.79883l-80.3105 80.417c-5.74609 5.78613 -9.29785 13.7539 -9.29785 22.5449s3.55176 16.7686 9.29785 22.5547l96.7197 96.7168c5.72754 5.74512 13.6484 9.30273 22.3945 9.30273
+c0.0351562 0 0.0732422 -0.00488281 0.109375 -0.00488281h0.0458984c8.79199 0 16.7656 -3.5498 22.5518 -9.29785l80.3262 -80.3076l47.8047 47.8965c6.08301 6.07715 14.4805 9.83789 23.749 9.83789c9.26953 0 17.6768 -3.76074 23.7588 -9.83789l47.5088 -47.5059
+c6.07031 -6.08594 9.82617 -14.4824 9.82617 -23.749s-3.75586 -17.6719 -9.82617 -23.7578l-47.8057 -47.8975l80.3105 -80.417c5.73633 -5.75195 9.28516 -13.6865 9.28516 -22.4434c0 -8.81348 -3.59277 -16.8018 -9.39453 -22.5625zM219.562 250.567l73.8252 73.8223
+l-68.918 68.8994l-73.8096 -73.8066zM457.305 160.461l-68.9023 68.916l-73.8242 -73.8232l68.918 -68.8994z" />
+    <glyph glyph-name="satellite-dish" unicode="&#xf7c0;" 
+d="M305.449 -14.5898c7.3916 -7.29785 6.18848 -20.0967 -3 -25.0039c-77.7129 -41.8027 -176.726 -29.9102 -242.344 35.708c-65.6016 65.6035 -77.5098 164.523 -35.6914 242.332c4.89062 9.09473 17.6895 10.2979 25.0029 3l116.812 -116.813l27.3945 27.3945
+c-0.6875 2.60938 -1.59375 5.00098 -1.59375 7.81348c0 17.6631 14.3398 32.0039 32.0039 32.0039c17.6631 0 32.0039 -14.3408 32.0039 -32.0039c0 -17.6641 -14.3408 -32.0039 -32.0039 -32.0039c-2.79785 0 -5.2041 0.890625 -7.79785 1.59375l-27.4102 -27.4102z
+M511.976 144.933c0.0175781 -0.301758 0.0253906 -0.605469 0.0253906 -0.912109c0 -8.86133 -7.1748 -16.0488 -16.0273 -16.0898h-32.1133c-8.46289 0.0244141 -15.3867 6.65918 -15.8926 15.002c-7.50098 129.519 -111.515 234.533 -240.937 241.534
+c-8.34863 0.444336 -14.9902 7.36426 -14.9902 15.8223c0 0.0292969 -0.0126953 0.0566406 -0.0117188 0.0859375v31.5986c0.0361328 8.85156 7.2334 16.0264 16.0938 16.0264c0.308594 0 0.603516 -0.00683594 0.908203 -0.0244141
+c163.224 -8.59473 294.443 -139.816 302.944 -303.043zM415.964 145.229c0.0244141 -0.364258 0.0371094 -0.732422 0.0371094 -1.10254c0 -8.92578 -7.23145 -16.1621 -16.1484 -16.1963h-32.208c-8.34961 0.0605469 -15.1953 6.51953 -15.8926 14.7051
+c-6.90625 77.0107 -68.1172 138.91 -144.924 145.224c-8.25781 0.592773 -14.7959 7.48633 -14.7988 15.8926v32.1143v0.00390625c0 8.9043 7.22949 16.1338 16.1338 16.1338c0.396484 0 0.775391 -0.0136719 1.16504 -0.0419922
+c110.123 -8.50098 198.229 -96.6074 206.636 -206.732z" />
+    <glyph glyph-name="sd-card" unicode="&#xf7c2;" horiz-adv-x="384" 
+d="M320 448c35.2998 0 64 -28.7002 64 -64v-384c0 -35.2998 -28.7002 -64 -64 -64h-256c-35.2998 0 -64 28.7002 -64 64v320l128 128h192zM160 288v96h-48v-96h48zM240 288v96h-48v-96h48zM320 288v96h-48v-96h48z" />
+    <glyph glyph-name="sim-card" unicode="&#xf7c4;" horiz-adv-x="384" 
+d="M0 384c0 35.2998 28.7002 64 64 64h192l128 -128v-320c0 -35.2998 -28.7002 -64 -64 -64h-256c-35.2998 0 -64 28.7002 -64 64v384zM224 192v64h-64v-64h64zM320 192v32c0 17.7002 -14.2998 32 -32 32h-32v-64h64zM256 64v-64h32c17.7002 0 32 14.2998 32 32v32h-64z
+M160 64v-64h64v64h-64zM64 64v-32c0 -17.7002 14.2998 -32 32 -32h32v64h-64zM64 160v-64h256v64h-256zM64 224v-32h64v64h-32c-17.7002 0 -32 -14.2998 -32 -32z" />
+    <glyph glyph-name="skating" unicode="&#xf7c5;" horiz-adv-x="448" 
+d="M400 448c26.5 0 48 -21.5 48 -48s-21.5 -48 -48 -48s-48 21.5 -48 48s21.5 48 48 48zM400 0c8.7998 0 16 -7.2002 16 -16c0 -26.5 -21.5 -48 -48 -48h-96c-8.7998 0 -16 7.2002 -16 16s7.2002 16 16 16h96c8.7998 0 16 7.2002 16 16s7.2002 16 16 16zM117.8 -8.59961
+c6.2998 6.2998 16.5 6.19922 22.7002 0c6.2002 -6.2002 6.2002 -16.4004 0 -22.6006c-9.2998 -9.2998 -21.5996 -14 -33.9004 -14c-12.2998 0 -24.5996 4.60059 -34 14l-67.8994 67.9004c-6.2002 6.2002 -6.2002 16.3994 0 22.5996s16.3994 6.2002 22.5996 0
+l67.9004 -67.8994c6.2002 -6.30078 16.3994 -6.2002 22.5996 0zM173.9 171.2c3.7998 -6.10059 8.19922 -11.7998 13.1992 -16.7998l30.2002 -30.2002l-91.8994 -91.9004c-6.2002 -6.2998 -14.4004 -9.39941 -22.6006 -9.39941s-16.3994 3.19922 -22.5996 9.39941
+c-12.5 12.4004 -12.5 32.7002 0 45.2002zM128 288c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32h204.6c16.3008 0 30.8008 -9.7002 37 -24.7002c6.2002 -15 2.80078 -32.0996 -8.69922 -43.5996l-82.3008 -82.2998c-0.5 -0.5 -1.19922 -0.700195 -1.69922 -1.10059
+l61 -61c9 -8.89941 14.0996 -21.2998 14.0996 -33.8994v-89.4004c0 -17.7002 -14.2998 -32 -32 -32s-32 14.2998 -32 32v82.7998l-78.2002 78.2002c-12.5996 12.5 -19.3994 29.9004 -18.7002 47.7002c0.700195 17.7002 8.80078 34.5996 22.3008 46.0996l20.0996 17.2002
+h-105.5z" />
+    <glyph glyph-name="skiing" unicode="&#xf7c9;" 
+d="M432 352c-26.5 0 -48 21.5 -48 48s21.5 48 48 48s48 -21.5 48 -48s-21.5 -48 -48 -48zM505 -4.09961c9.2998 -9.30078 9.2998 -24.5 0 -33.8008c-17 -17 -39.7998 -26 -63 -26c-12.5996 0 -25.2002 2.60059 -37.0996 8.10059l-391.9 202.5
+c-11.7998 6 -16.4004 20.5 -10.2998 32.2998c6.09961 11.7998 20.5996 16.2998 32.2998 10.2998l197.9 -102.3l45.8994 68.7998l-75.0996 75.2002c-14.2998 14.4004 -20.6006 34.5 -17.7002 54.4004l107 -53.1006l40.4004 -40.5
+c16.1992 -16.0996 18.6992 -41.5996 6 -60.5996l-49.2002 -73.7998l135.8 -70.2002c14.5996 -6.7002 33 -3.40039 45.0996 8.7002c9.30078 9.39941 24.5 9.39941 33.9004 0zM120 356.4l-26.2002 23c-2.2002 1.89941 -2.39941 5.19922 -0.5 7.39941
+c1.2998 1.5 3.2002 2.10059 5 1.7002l34.4004 -7h0.200195l11.0996 21.7002c13.7002 -7 21.2002 -21.1006 20.9004 -35.6006l62.5 -31l81.1992 32.5c43.6006 17.4004 76.4004 -15 84.5 -39.1992l17.1006 -51.2002l52.0996 -26.1006
+c15.7998 -7.89941 22.2002 -27.0996 14.2998 -42.8994c-7.89941 -15.7998 -27 -22.2002 -42.8994 -14.2998l-58.1006 29c-11.3994 5.69922 -20 15.5996 -24 27.6992l-6.39941 19.1006l-32.4004 -13l-114.5 56.7998c0.100586 0.0996094 0.100586 0.200195 0.200195 0.299805
+l-47.2002 23.4004c-11.5996 -9.7002 -28.3994 -12.1006 -42.7998 -4.7998z" />
+    <glyph glyph-name="skiing-nordic" unicode="&#xf7ca;" horiz-adv-x="576" 
+d="M336 352c-26.5 0 -48 21.5 -48 48s21.5 48 48 48s48 -21.5 48 -48s-21.5 -48 -48 -48zM552 32c13.2002 0 24 -10.7998 24 -24c0 -39.7002 -32.2998 -72 -72 -72h-480c-13.2002 0 -24 10.7002 -24 24s10.7998 24 24 24h42.9004l54.0996 270.8
+c-0.700195 0.799805 -1.7002 1.2002 -2.40039 2.10059c-10.7998 14.0996 -8.09961 34.1992 5.90039 44.8994l39.7002 30.4004c23 17.5996 52.5 23.8994 80.7998 17.0996l71.2002 -21.2002c26.2998 -6.69922 49.2998 -25.3994 61.7998 -50.8994l26.0996 -53.2002h44
+c17.7002 0 32 -14.2998 32 -32c0 -13.4004 -8.39941 -24.9004 -20.0996 -29.5996l-25.5 -178.4h69.5c13.2002 0 24 10.7998 24 24c0 13.2998 10.7998 24 24 24zM291.5 -16l25.5 81.2002l-85 50.2002c-27.5996 16.2998 -38.9004 50.7998 -26.2998 80.2998l37.5 87.3994
+l-14.7002 4.40039c-7.90039 1.90039 -17.5996 -0.200195 -25.2998 -6.09961l-39.7002 -30.4004c-3.59961 -2.7002 -7.59961 -4.59961 -11.7002 -5.59961l-52.2998 -261.4h24.2002l62.5 131.8c7.59961 -10.8994 17.3994 -20.5996 29.5 -27.7998l22 -13l-43.1006 -91h96.9004z
+M402.1 -16l25.2002 176h-33.2998c-18.2002 0 -35.0996 10.5996 -43.0996 26.9004l-20.3008 41.3994l-31.2998 -78.2998l61.2002 -36.0996c18.7002 -11.3008 27.5 -33.6006 21.5996 -54.4004l-23.5996 -75.5h43.5996z" />
+    <glyph glyph-name="sleigh" unicode="&#xf7cc;" horiz-adv-x="640" 
+d="M612.7 97.2998c18.5 -14.7002 28.5996 -37.2002 27.2002 -61c-2.2002 -39 -36.9004 -68.2998 -75.9004 -68.2998h-516c-8.7998 0 -16 7.2002 -16 16v16c0 8.7998 7.2002 16 16 16h519.3c13.6006 0 24.6006 11 24.6006 24.5996c0 7.5 -3.30078 14.5 -9.2002 19.2002
+l-9.2998 7.40039c-6.90039 5.5 -8 15.5996 -2.5 22.5l10 12.5c5.5 6.89941 15.5996 8 22.5 2.5zM32 224v128c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32h20.7002c65.7002 0 125.899 -37.2002 155.3 -96s89.5 -96 155.3 -96h20.7002c35.2998 0 64 28.7002 64 64v64h96
+c17.7002 0 32 -14.2998 32 -32s-14.2998 -32 -32 -32v-96c0 -53 -43 -96 -96 -96v-48h-64v48h-192v-48h-64v52.5c-55.0996 14.2998 -96 63.9004 -96 123.5z" />
+    <glyph glyph-name="sms" unicode="&#xf7cd;" 
+d="M256 416c141.4 0 256 -93.0996 256 -208s-114.6 -208 -256 -208c-38.4004 0 -74.7002 7.09961 -107.4 19.4004c-24.5996 -19.6006 -74.2998 -51.4004 -140.6 -51.4004c-3.2002 0 -6 1.7998 -7.2998 4.7998s-0.700195 6.40039 1.5 8.7002
+c0.5 0.5 42.2998 45.4004 54.7998 95.7998c-35.5996 35.7002 -57 81.1006 -57 130.7c0 114.9 114.6 208 256 208zM128.2 144c23.3994 0 42.5 17.2998 42.3994 38.5996c0 10.6006 -4.7998 20.9004 -13.2998 28.1006l-21.8994 18.7998
+c-1.30078 1.09961 -2.10059 2.5 -2.10059 3.7998c0 3.10059 4.40039 6.60059 10.4004 6.60059h12.2998c4.40039 0 8 3.59961 8 8v16c0 4.39941 -3.59961 8 -8 8h-12.2002c-23.3994 0 -42.3994 -17.3008 -42.3994 -38.6006c0 -10.5996 4.7998 -20.8994 13.2998 -28.0996
+l21.8994 -18.7998c1.30078 -1.10059 2.10059 -2.5 2.10059 -3.80078c0 -3.09961 -4.40039 -6.59961 -10.4004 -6.59961h-12.2998c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h12.2002zM320 152v104c0 8.7998 -7.2002 16 -16 16h-16
+c-6 0 -11.5996 -3.40039 -14.2998 -8.7998l-17.7002 -35.4004l-17.7002 35.4004c-2.7002 5.39941 -8.2002 8.7998 -14.2998 8.7998h-16c-8.7998 0 -16 -7.2002 -16 -16v-104c0 -4.40039 3.59961 -8 8 -8h16c4.40039 0 8 3.59961 8 8v68.2002l24.9004 -55.7998
+c2.89941 -5.90039 11.3994 -5.90039 14.2998 0l24.7998 55.7998v-68.2002c0 -4.40039 3.59961 -8 8 -8h16c4.40039 0 8 3.59961 8 8zM368.3 144c23.4004 0 42.4004 17.2998 42.2998 38.5996c0 10.6006 -4.7998 20.9004 -13.2998 28.1006l-21.8994 18.7998
+c-1.30078 1.09961 -2.10059 2.5 -2.10059 3.7998c0 3.10059 4.40039 6.60059 10.4004 6.60059h12.2998c4.40039 0 8 3.59961 8 8v16c0 4.39941 -3.59961 8 -8 8h-12.2002c-23.3994 0 -42.3994 -17.3008 -42.3994 -38.6006c0 -10.5996 4.7998 -20.8994 13.2998 -28.0996
+l21.8994 -18.7998c1.30078 -1.10059 2.10059 -2.5 2.10059 -3.80078c0 -3.09961 -4.40039 -6.59961 -10.4004 -6.59961h-12.2998c-4.40039 0 -8 -3.59961 -8 -8v-16c0 -4.40039 3.59961 -8 8 -8h12.2998z" />
+    <glyph glyph-name="snowboarding" unicode="&#xf7ce;" 
+d="M432 352c-26.5 0 -48 21.5 -48 48s21.5 48 48 48s48 -21.5 48 -48s-21.5 -48 -48 -48zM460.8 198.4l-83.5 62.8994l-66 -30.5l52 -39c14.9004 -11.2002 22 -30.2002 18.1006 -48.3994l-21.9004 -102c-2.2002 -10.1006 -9.09961 -17.8008 -17.7998 -21.9004
+l90.7998 -33.0996c9.7002 -3.5 20.2002 -3.10059 29.5 1.2998c12 5.59961 26.2998 0.399414 31.9004 -11.6006c5.59961 -12 0.399414 -26.2998 -11.6006 -31.8994c-11.5996 -5.5 -24 -8.2002 -36.5 -8.2002c-10 0 -20 1.7998 -29.7002 5.2998l-364.8 132.7
+c-21.7998 7.90039 -39.0996 23.7998 -48.8994 44.7998c-5.60059 12 -0.400391 26.2998 11.5996 31.9004c12 5.59961 26.2998 0.399414 31.9004 -11.6006c4.39941 -9.39941 12.0996 -16.5 21.7998 -20l38.7002 -14.0996c-3.80078 3.5 -7 7.7002 -8.7002 12.9004
+c-5.60059 16.7998 3.39941 34.8994 20.2002 40.5l74.0996 24.6992v53.1006c0 24.3994 13.5996 46.2998 35.4004 57.2002l41.1992 20.5996l-16.3994 5.5c-12.1006 4.09961 -22 12.5996 -27.7002 24l-29.0996 58.0996c-7.90039 15.8008 -1.5 35 14.2998 42.9004
+s35 1.5 42.8994 -14.2998l26.1006 -52.1006l63.7002 -21.1992c16.2998 -5.40039 31.5996 -13.5 45.3994 -23.8008l111.4 -83.5c14.2002 -10.5996 17 -30.6992 6.39941 -44.7998c-6.2998 -8.39941 -15.8994 -12.7998 -25.5996 -12.7998
+c-6.7002 0 -13.4004 2.09961 -19.2002 6.40039zM316.4 146.7l-60.5 45.2998v-20.5c0 -20.7002 -13.2002 -39 -32.8008 -45.5l-85 -28.4004c-2.59961 -0.899414 -5.2998 -1.09961 -8 -1.2998l169.4 -61.5996c-2.90039 6.09961 -4.2998 12.8994 -2.7998 20z" />
+    <glyph glyph-name="snowman" unicode="&#xf7d0;" 
+d="M510.9 295.7c3.19922 -8.10059 -0.800781 -17.2002 -8.90039 -20.2998l-135.2 -55.2002c0.400391 -4.10059 1.2002 -8 1.2002 -12.2002c0 -10 -1.7002 -19.5 -4.2002 -28.7002c21.1006 -21.3994 36.1006 -48.7998 41.6006 -79
+c11.5 -63.2002 -16.4004 -120.3 -62.9004 -152.6c-10.9004 -7.60059 -23.9004 -11.7002 -37.2002 -11.7002h-99.2002c-11 0 -22 2.2998 -31.2998 8.2002c-42.3994 26.8994 -70.7998 73.7998 -70.7998 127.8c0 41.7998 16.9004 79.5996 44.2998 107.1
+c-2.5 9.30078 -4.2002 18.8008 -4.2002 28.9004c0 4.2002 0.800781 8.2002 1.2002 12.2002l-135.2 55.2002c-8.19922 3.19922 -12.1992 12.2998 -8.89941 20.2998l5.89941 14.5c3.30078 8 12.6006 11.8994 20.8008 8.7002l28.0996 -11.5v29
+c0 8.59961 7.2002 15.5996 16 15.5996h16c8.7998 0 16 -7 15.7998 -15.5996v-46.9004c0 -0.5 -0.200195 -1 -0.299805 -1.5l56.4004 -23c6 10 13.2998 18.9004 22 26.5996c-13.5 16.6006 -22 37.4004 -22 60.5c0 53 43 96 96 96s96 -43 96 -96
+c0 -23.0996 -8.40039 -43.8994 -22 -60.5c8.69922 -7.69922 16.0996 -16.5996 22 -26.5996l56.3994 23c0 0.5 -0.299805 1 -0.299805 1.5v46.9004c0 8.59961 7.2002 15.5996 16 15.5996h16c8.7998 0 16 -7 16 -15.5996v-29l28.2002 11.5
+c8.2002 3.19922 17.5 -0.700195 20.7998 -8.7002zM224 352c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16zM256 80c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16zM256 144
+c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16zM256 208c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16zM256 296c0 0 16 23.2002 16 32s-7.2002 16 -16 16s-16 -7.2002 -16 -16s16 -32 16 -32z
+M288 352c8.7998 0 16 7.2002 16 16s-7.2002 16 -16 16s-16 -7.2002 -16 -16s7.2002 -16 16 -16z" />
+    <glyph glyph-name="snowplow" unicode="&#xf7d2;" horiz-adv-x="640" 
+d="M120 72c13.2998 0 24 -10.7002 24 -24s-10.7002 -24 -24 -24s-24 10.7002 -24 24s10.7002 24 24 24zM200 72c13.2998 0 24 -10.7002 24 -24s-10.7002 -24 -24 -24s-24 10.7002 -24 24s10.7002 24 24 24zM280 72c13.2998 0 24 -10.7002 24 -24s-10.7002 -24 -24 -24
+s-24 10.7002 -24 24s10.7002 24 24 24zM360 72c13.2998 0 24 -10.7002 24 -24s-10.7002 -24 -24 -24s-24 10.7002 -24 24s10.7002 24 24 24zM598.6 22.5996l36.7002 -36.6992c6.2002 -6.2002 6.2002 -16.4004 0 -22.6006l-22.5996 -22.5996
+c-6.2002 -6.2002 -16.4004 -6.2002 -22.6006 0l-36.6992 36.7002c-26.5 26.5 -41.4004 62.3994 -41.4004 99.8994v18.7002h-43.2002c7 -14.5996 11.2002 -30.7002 11.2002 -48c0 -61.9004 -50.0996 -112 -112 -112h-256c-61.9004 0 -112 50.0996 -112 112
+c0 44.5996 26.2998 82.7998 64 100.8v91.2002c0 26.5 21.5 48 48 48h16v112c0 26.5 21.5 48 48 48h144.3c19.2998 0 36.6006 -11.4004 44.2002 -29.0996l78.2998 -182.801c3.40039 -8 5.2002 -16.5 5.2002 -25.1992v-50.9004h64v18.7002
+c0 37.5 14.9004 73.3994 41.4004 99.8994l36.6992 36.7002c6.2002 6.2002 16.4004 6.2002 22.6006 0l22.5996 -22.5996c6.2002 -6.2002 6.2002 -16.4004 0 -22.6006l-36.7002 -36.6992c-14.5 -14.5 -22.5996 -34.1006 -22.5996 -54.6006v-101.6
+c0 -20.5 8.09961 -40.1006 22.5996 -54.6006zM192 384v-96l64 -64h122.4l-68.6006 160h-117.8zM368 0c26.5 0 48 21.5 48 48s-21.5 48 -48 48h-256c-26.5 0 -48 -21.5 -48 -48s21.5 -48 48 -48h256z" />
+    <glyph glyph-name="tenge" unicode="&#xf7d7;" horiz-adv-x="384" 
+d="M372 288c6.59961 0 12 -5.40039 12 -12v-56c0 -6.59961 -5.40039 -12 -12 -12h-140v-228c0 -6.59961 -5.40039 -12 -12 -12h-56c-6.59961 0 -12 5.40039 -12 12v228h-140c-6.59961 0 -12 5.40039 -12 12v56c0 6.59961 5.40039 12 12 12h360zM372 416
+c6.59961 0 12 -5.40039 12 -12v-56c0 -6.59961 -5.40039 -12 -12 -12h-360c-6.59961 0 -12 5.40039 -12 12v56c0 6.59961 5.40039 12 12 12h360z" />
+    <glyph glyph-name="toilet" unicode="&#xf7d8;" horiz-adv-x="384" 
+d="M368 400h-16v-156.7c20.2002 -10.0996 32 -22.2002 32 -35.2998c0 -67.2002 -34.5996 -126.2 -86.7998 -160.5l21.3994 -70.2002c6.30078 -20.5 -9.09961 -41.2998 -30.5996 -41.2998h-192c-21.5 0 -36.9004 20.7998 -30.5996 41.2998l21.3994 70.2002
+c-52.2002 34.2998 -86.7998 93.2998 -86.7998 160.5c0 13.0996 11.7998 25.2002 32 35.2998v156.7h-16c-8.7998 0 -16 7.2002 -16 16v16c0 8.7998 7.2002 16 16 16h352c8.7998 0 16 -7.2002 16 -16v-16c0 -8.7998 -7.2002 -16 -16 -16zM80 376v-16
+c0 -4.40039 3.59961 -8 8 -8h48c4.40039 0 8 3.59961 8 8v16c0 4.40039 -3.59961 8 -8 8h-48c-4.40039 0 -8 -3.59961 -8 -8zM192 176c77.0996 0 139.6 14.2998 139.6 32s-62.5 32 -139.6 32s-139.6 -14.2998 -139.6 -32s62.5 -32 139.6 -32z" />
+    <glyph glyph-name="tools" unicode="&#xf7d9;" 
+d="M501.1 52.2998c14.5 -14.5 14.5 -38.0996 0 -52.7002l-52.6992 -52.6992c-14.5 -14.6006 -38.1006 -14.6006 -52.7002 0l-117.101 117.1c-23.0996 23.0996 -27.5 57.5996 -13.8994 85.4004l-106.601 106.6h-62.0996l-96 128l64 64l128 -96v-62.0996l106.6 -106.601
+c27.8008 13.7002 62.3008 9.2002 85.4004 -13.8994zM331.7 223c-8.2002 0 -16.6006 -1 -24.7002 -2.90039l-82.0996 82.1006c-0.700195 37.5 12.6992 75.0996 41.1992 103.6c37 37 89.2002 49.6006 136.601 37.9004c9.09961 -2.2998 12.2998 -13.6006 5.7002 -20.2002
+l-74.4004 -74.4004l11.2998 -67.8994l67.9004 -11.2998l74.3994 74.3994c6.60059 6.60059 17.9004 3.5 20.1006 -5.5c11.7998 -47.3994 -0.799805 -99.5996 -37.9004 -136.7c-13 -13 -28 -22.5996 -43.7998 -29.5l-19.4004 19.4004c-20 20 -46.5996 31 -74.8994 31z
+M227.8 141c-4.89941 -21.0996 -2.59961 -42.7998 5 -62.7002l-123.6 -123.6c-25 -25 -65.5 -25 -90.5 0s-25 65.5 0 90.5l152.399 152.5zM64 -24c13.2998 0 24 10.7998 24 24c0 13.2998 -10.7002 24 -24 24s-24 -10.7002 -24 -24c0 -13.2002 10.7998 -24 24 -24z" />
+    <glyph glyph-name="tram" unicode="&#xf7da;" 
+d="M288 384c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32s32 -14.2998 32 -32s-14.2998 -32 -32 -32zM511.5 396.1c2.2002 -8.5 -2.7998 -17.2998 -11.4004 -19.5996l-228.1 -60.7998v-91.7002h176c17.7002 0 32 -14.2998 32 -32v-224c0 -17.7002 -14.2998 -32 -32 -32
+h-384c-17.7002 0 -32 14.2998 -32 32v224c0 17.7002 14.2998 32 32 32h176v83.2002l-219.9 -58.7002c-1.2998 -0.299805 -2.69922 -0.5 -4.09961 -0.5c-7.09961 0 -13.5 4.7002 -15.4004 11.7998c-2.2998 8.60059 2.80078 17.2998 11.3008 19.6006l480 128
+c8.59961 2.2998 17.2998 -2.7002 19.5996 -11.3008zM176 64v96h-96v-96h96zM336 160v-96h96v96h-96zM304 160h-96v-96h96v96zM192 352c-17.7002 0 -32 14.2998 -32 32s14.2998 32 32 32s32 -14.2998 32 -32s-14.2998 -32 -32 -32z" />
+    <glyph glyph-name="fire-alt" unicode="&#xf7e4;" horiz-adv-x="448" 
+d="M323.56 396.8c72.46 -67.2598 124.44 -177.13 124.44 -230.399c0 -127.25 -100.29 -230.4 -224 -230.4s-224 103.15 -224 230.4c0 71.6396 69.7402 190.43 168 281.6c38.2803 -35.5303 72.0801 -73.6201 99.3398 -111.17
+c16.6406 20.3799 35.4199 40.6699 56.2197 59.9697zM304.09 56.1504c49.2402 34.4492 60.7803 101.229 33.4297 153.42c-3.35938 6.41992 -7.12988 13.1201 -11.2695 19.9697l-58.6299 -66.8799s-91.9004 117.359 -98.8301 125.34
+c-48.4805 -58.1201 -72.79 -92.1396 -72.79 -130.75c0 -77.5098 58.71 -125.25 130.86 -125.25c28.8594 0 55.5693 8.99023 77.2295 24.1504z" />
+    <glyph glyph-name="bacon" unicode="&#xf7e5;" horiz-adv-x="576" 
+d="M218.92 111.61c-34.8604 -34.8799 -59.6504 -44.1602 -85.9199 -54c-26 -9.76074 -53 -20.1299 -88.1699 -52.7305l-35.7598 35.5098c-12.7002 12.6104 -12.0703 33.6104 1.79004 45.0605c36.3398 29.9795 66.21 41.0996 91.0693 50.3594
+c9.16992 3.41016 68.9707 19.2607 98.7207 98.0908c8.60938 22.8096 46.3496 134.58 188.979 187.72c15.8506 5.91016 27.3604 10.2002 41 20.2998c5.14941 3.80859 11.5498 6.08008 18.4404 6.08008c8.46484 0 16.1426 -3.40137 21.7393 -8.91016l37.6709 -37.3896
+c-30.1504 -27.6904 -52.9102 -36.3701 -76.79 -45.3701c-28.3008 -10.6104 -57.5703 -21.5801 -97.3506 -61.3799s-50.7598 -69.0498 -61.3701 -97.3398c-9.84961 -26.3008 -19.1602 -51.1104 -54.0498 -86zM566.92 343.61
+c12.7002 -12.5996 12.0801 -33.6602 -1.80957 -45.0605c-36.3701 -30.0098 -66.2402 -41.1396 -91.1104 -50.4102c-9.2002 -3.43945 -69 -19.3193 -98.7305 -98.1094c-8.93945 -23.5898 -46.7393 -134.69 -188.939 -187.69
+c-15.8496 -5.89941 -27.3398 -10.1797 -40.9404 -20.2402c-5.14941 -3.81055 -11.5527 -6.08301 -18.4453 -6.08301c-8.46289 0 -16.1377 3.39844 -21.7344 8.90332l-37.6797 37.4297c30.1094 27.6699 52.8594 36.3301 76.7197 45.3301
+c28.2998 10.5898 57.5098 21.54 97.2998 61.3203s50.7803 69 61.4199 97.3301c9.81055 26.3096 19.1104 51.1602 54 86c34.8906 34.8398 59.6904 44.1504 85.9502 54c26.0703 9.79004 53.0605 20.1602 88.25 52.79z" />
+    <glyph glyph-name="book-medical" unicode="&#xf7e6;" horiz-adv-x="448" 
+d="M448 89.5996c0 -9.59961 -3.2002 -15.999 -9.59961 -19.1992c-3.2002 -12.8008 -3.2002 -57.6006 0 -73.6006c6.39941 -6.39941 9.59961 -12.7998 9.59961 -19.2002v-16c0 -16 -12.7998 -25.5996 -25.5996 -25.5996h-326.4c-54.4004 0 -96 41.5996 -96 96v320
+c0 54.4004 41.5996 96 96 96h326.4c16 0 25.5996 -9.59961 25.5996 -25.5996v-332.801zM144 280v-48c0 -4.41504 3.58496 -8 8 -8h56v-56c0 -4.41504 3.58496 -8 8 -8h48c4.41504 0 8 3.58496 8 8v56h56c4.41504 0 8 3.58496 8 8v48c0 4.41504 -3.58496 8 -8 8h-56v56
+c0 4.41504 -3.58496 8 -8 8h-48c-4.41504 0 -8 -3.58496 -8 -8v-56h-56c-4.41504 0 -8 -3.58496 -8 -8zM380.8 0v64h-284.8c-16 0 -32 -12.7998 -32 -32s12.7998 -32 32 -32h284.8z" />
+    <glyph glyph-name="bread-slice" unicode="&#xf7ec;" horiz-adv-x="576" 
+d="M288 448c180 0 288 -93.4004 288 -169.14c0 -30.3008 -24.2402 -54.8604 -64 -54.8604v-256c0 -17.6699 -16.1201 -32 -36 -32h-376c-19.8799 0 -36 14.3301 -36 32v256c-39.7598 0 -64 24.5596 -64 54.8604c0 75.7393 108 169.14 288 169.14z" />
+    <glyph glyph-name="cheese" unicode="&#xf7ef;" 
+d="M0 160h512v-160c0 -17.6611 -14.3389 -32 -32 -32h-448c-17.6611 0 -32 14.3389 -32 32v160zM299.83 416c118.17 -6.2002 212.17 -104.11 212.17 -224h-512l278.7 217c5.47656 4.38477 12.4277 7.02051 19.9814 7.02051
+c0.384766 0 0.767578 -0.00683594 1.14844 -0.0205078z" />
+    <glyph glyph-name="clinic-medical" unicode="&#xf7f2;" horiz-adv-x="576" 
+d="M288 333l218.74 -192.9c1.54004 -1.37988 3.55957 -2.04004 5.25977 -3.19922v-184.9c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v184.94c1.78027 1.20996 3.84961 1.88965 5.46973 3.34961zM384 72v48c0 4.41504 -3.58496 8 -8 8h-56v56
+c0 4.41504 -3.58496 8 -8 8h-48c-4.41504 0 -8 -3.58496 -8 -8v-56h-56c-4.41504 0 -8 -3.58496 -8 -8v-48c0 -4.41504 3.58496 -8 8 -8h56v-56c0 -4.41504 3.58496 -8 8 -8h48c4.41504 0 8 3.58496 8 8v56h56c4.41504 0 8 3.58496 8 8zM570.69 211.72
+c3.2627 -2.92969 5.30762 -7.18555 5.30762 -11.9121c0 -4.10156 -1.54688 -7.84473 -4.08789 -10.6777l-21.4004 -23.8203c-2.92969 -3.2627 -7.18457 -5.30762 -11.9111 -5.30762c-4.10742 0 -7.85449 1.55078 -10.6885 4.09766l-229.32 202.271
+c-2.82031 2.48828 -6.53906 3.99902 -10.5928 3.99902c-4.05273 0 -7.75684 -1.51074 -10.5771 -3.99902l-229.32 -202.28c-2.83398 -2.54688 -6.58594 -4.10645 -10.6924 -4.10645c-4.72656 0 -8.97754 2.05371 -11.9072 5.31641l-21.4102 23.8203
+c-2.54688 2.83398 -4.10645 6.58594 -4.10645 10.6934c0 4.72559 2.05371 8.97656 5.31641 11.9062l256 226c7.06934 6.3916 16.4707 10.2852 26.7412 10.2852c10.2715 0 19.6396 -3.89355 26.709 -10.2852z" />
+    <glyph glyph-name="comment-medical" unicode="&#xf7f5;" 
+d="M256 416c141.39 0 256 -93.1201 256 -208s-114.61 -208 -256 -208c-0.161133 0 -0.446289 0.107422 -0.606445 0.107422c-37.5674 0 -73.5547 6.81445 -106.794 19.2725c-24.5996 -19.6299 -74.3398 -51.3799 -140.6 -51.3799
+c-4.41113 0.00488281 -7.99023 3.58984 -7.99023 8.00195c0 2.12891 0.833008 4.06445 2.19043 5.49805c0.5 0.5 42.2598 45.4502 54.7998 95.7598c-35.5898 35.7402 -57 81.1807 -57 130.74c0 114.88 114.62 208 256 208zM352 184v48c0 4.41504 -3.58496 8 -8 8h-56v56
+c0 4.41504 -3.58496 8 -8 8h-48c-4.41504 0 -8 -3.58496 -8 -8v-56h-56c-4.41504 0 -8 -3.58496 -8 -8v-48c0 -4.41504 3.58496 -8 8 -8h56v-56c0 -4.41504 3.58496 -8 8 -8h48c4.41504 0 8 3.58496 8 8v56h56c4.41504 0 8 3.58496 8 8z" />
+    <glyph glyph-name="crutch" unicode="&#xf7f7;" 
+d="M507.31 262.29c2.87109 -2.89258 4.64551 -6.87891 4.64551 -11.2725c0 -4.42285 -1.79883 -8.42969 -4.70508 -11.3271l-22.6201 -22.6309c-2.89648 -2.89648 -6.90137 -4.68945 -11.3174 -4.68945s-8.41602 1.79297 -11.3125 4.68945l-181 181
+c-2.89648 2.89648 -4.68945 6.90137 -4.68945 11.3174s1.79297 8.41699 4.68945 11.3135l22.6904 22.5996c2.89551 2.89355 6.89844 4.68457 11.3115 4.68457c4.41406 0 8.41211 -1.79102 11.3076 -4.68457zM327.77 195.88l55.1006 55.1201l45.25 -45.2695l-109.68 -109.681
+c-12.4922 -12.4961 -28.4805 -21.5479 -46.29 -25.6494l-120.25 -27.75l-102 -102c-2.89648 -2.89746 -6.90137 -4.69043 -11.3174 -4.69043s-8.41699 1.79297 -11.3135 4.69043l-22.6191 22.6191c-2.89746 2.89648 -4.69043 6.90137 -4.69043 11.3174
+s1.79297 8.41699 4.69043 11.3135l102 102l27.7393 120.26c4.11816 17.8066 13.1738 33.7939 25.6699 46.29l109.671 109.67l45.25 -45.25l-55.1006 -55.1006zM273.2 141.31l9.30957 9.31055l-67.8896 67.8896l-9.31055 -9.30957
+c-4.16113 -4.17676 -7.17969 -9.51074 -8.55957 -15.4502l-18.2998 -79.2998l79.2998 18.3193c5.94238 1.36328 11.2783 4.37695 15.4502 8.54004z" />
+    <glyph glyph-name="disease" unicode="&#xf7fa;" 
+d="M472.29 252.1c48.54 -16.6191 53.8301 -73.8301 8.99023 -96.79l-62 -31.7393c-17.8301 -9.12988 -29.2803 -25.2002 -30.6299 -43l-4.7002 -61.8604c-3.4502 -44.79 -65.1299 -66.7803 -104.45 -37.2197l-54.3203 40.8301
+c-15.6201 11.7295 -36.96 16.1201 -57.0693 11.7295l-70 -15.2803c-50.6504 -11.0596 -94.1104 32.5605 -73.46 73.8008l28.4297 57c8.17969 16.3799 6.43945 35.1699 -4.63965 50.2393l-38.54 52.4209c-27.9307 37.9492 7 86.9092 59 82.8398l71.8994 -5.62012
+c20.6602 -1.62012 40.9404 5.59961 54.2002 19.3096l46.0898 47.7207c33.4297 34.5098 98.4199 21.1494 110 -22.6201l16 -60.4502c4.60059 -17.3906 18.8604 -31.71 38.1406 -38.3105zM160 192c17.6611 0 32 14.3389 32 32s-14.3389 32 -32 32s-32 -14.3389 -32 -32
+s14.3389 -32 32 -32zM288 96c17.6611 0 32 14.3389 32 32s-14.3389 32 -32 32s-32 -14.3389 -32 -32s14.3389 -32 32 -32zM304 224c8.83105 0 16 7.16895 16 16s-7.16895 16 -16 16s-16 -7.16895 -16 -16s7.16895 -16 16 -16z" />
+    <glyph glyph-name="egg" unicode="&#xf7fb;" horiz-adv-x="384" 
+d="M192 448c106 0 192 -214 192 -320s-86 -192 -192 -192s-192 86 -192 192s86 320 192 320z" />
+    <glyph glyph-name="hamburger" unicode="&#xf805;" 
+d="M464 192c26.4922 0 48 -21.5078 48 -48s-21.5078 -48 -48 -48h-416c-26.4922 0 -48 21.5078 -48 48s21.5078 48 48 48h416zM480 64c8.83105 0 16 -7.16895 16 -16v-16c0 -35.3223 -28.6777 -64 -64 -64h-352c-35.3223 0 -64 28.6777 -64 64v16
+c0 8.83105 7.16895 16 16 16h448zM58.6396 224c-34.5693 0 -54.6396 43.9102 -34.8193 75.8896c40.1797 64.9102 128.64 116.011 232.18 116.11c103.55 -0.0996094 192 -51.2002 232.18 -116.12c19.8008 -31.9795 -0.25 -75.8799 -34.8193 -75.8799h-394.721zM384 336
+c-8.83105 0 -16 -7.16895 -16 -16s7.16895 -16 16 -16s16 7.16895 16 16s-7.16895 16 -16 16zM256 368c-8.83105 0 -16 -7.16895 -16 -16s7.16895 -16 16 -16s16 7.16895 16 16s-7.16895 16 -16 16zM128 336c-8.83105 0 -16 -7.16895 -16 -16s7.16895 -16 16 -16
+s16 7.16895 16 16s-7.16895 16 -16 16z" />
+    <glyph glyph-name="hand-middle-finger" unicode="&#xf806;" 
+d="M479.93 130.88l0.0703125 -82.8799c0 -61.7979 -50.1592 -111.973 -111.95 -112h-215c-30.9053 0.00292969 -58.9189 12.5361 -79.1895 32.8096l-30.9307 30.9307c-6.75488 6.75391 -10.9297 16.0928 -10.9297 26.3896v73.4697
+c0 14.6221 8.38574 27.2734 20.6396 33.4004l27.3604 15v-76c0 -4.41504 3.58496 -8 8 -8s8 3.58496 8 8v147.04c0 15.2598 12.8701 28.3799 30.8701 31.3799l30.6797 5.12012c17.8203 2.96973 34.4502 -8.38965 34.4502 -23.54v-32c0 -4.41504 3.58496 -8 8 -8
+s8 3.58496 8 8v200c0 0.0078125 -0.0244141 0.015625 -0.0244141 0.0234375c0 26.4912 21.5078 48 48 48c0.50293 0 1.00488 -0.0078125 1.50488 -0.0234375c26.2695 -0.799805 46.5195 -23.7197 46.5195 -50v-198c0 -4.41504 3.58496 -8 8 -8s8 3.58496 8 8v32
+c0 15.1396 16.6299 26.5 34.4502 23.5303l38.3994 -6.40039c13.46 -2.25 23.1504 -12.0996 23.1504 -23.54v-49.5898l35.6504 -8.92969c16.2188 -4.05371 28.2676 -18.7256 28.2793 -36.1904z" />
+    <glyph glyph-name="hard-hat" unicode="&#xf807;" 
+d="M480 160v-64h-448v64c0 80.25 49.2803 148.92 119.19 177.62l40.8096 -81.6201v112c0 8.83105 7.16895 16 16 16h96c8.83105 0 16 -7.16895 16 -16v-112l40.8096 81.6201c69.9102 -28.7002 119.19 -97.3701 119.19 -177.62zM496 64c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-480c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h480z" />
+    <glyph glyph-name="hospital-user" unicode="&#xf80d;" horiz-adv-x="640" 
+d="M480 128c-52.9834 0 -96 43.0166 -96 96s43.0166 96 96 96s96 -43.0166 96 -96s-43.0166 -96 -96 -96zM528 96c61.8145 0 112.002 -50.1738 112.002 -111.988c0 -0.210938 -0.000976562 -0.420898 -0.00195312 -0.631836
+c-0.139648 -26.2598 -21.7305 -47.3799 -48 -47.3799h-224c-26.2695 0 -47.8604 21.1201 -48 47.3799c-0.000976562 0.210938 0 0.40918 0 0.620117c0 61.8145 50.1855 112 112 112c0.0273438 0 0.0556641 -0.00488281 0.0830078 -0.00488281
+c2.42871 0 4.77051 -0.380859 6.9668 -1.08496c12.8193 -4.4541 26.6504 -6.87402 40.9775 -6.87402s28.0938 2.41992 40.9131 6.87402c2.19922 0.704102 4.54395 1.08984 6.97656 1.08984h0.0830078zM329.91 85.5498c-25.9033 -25.8965 -41.915 -61.665 -41.915 -101.15
+c0 -0.396484 0.00195312 -0.792969 0.00488281 -1.18945c0.166016 -17.7246 6.24512 -34.1309 16.3096 -47.21h-288.31c-8.83105 0 -16 7.16895 -16 16v368c0 17.6611 14.3389 32 32 32h32v64c0 17.6611 14.3389 32 32 32h160c17.6611 0 32 -14.3389 32 -32v-64h32
+c17.6611 0 32 -14.3389 32 -32v-216.62c-7.98633 -5.24609 -15.3037 -11.1562 -22.0898 -17.8301zM144 44v40c0 6.62305 -5.37695 12 -12 12h-40c-6.62305 0 -12 -5.37695 -12 -12v-40c0 -6.62305 5.37695 -12 12 -12h40c6.62305 0 12 5.37695 12 12zM144 172v40
+c0 6.62305 -5.37695 12 -12 12h-40c-6.62305 0 -12 -5.37695 -12 -12v-40c0 -6.62305 5.37695 -12 12 -12h40c6.62305 0 12 5.37695 12 12zM192 294v26h26c3.31152 0 6 2.68848 6 6v20c0 3.31152 -2.68848 6 -6 6h-26v26c0 3.31152 -2.68848 6 -6 6h-20
+c-3.31152 0 -6 -2.68848 -6 -6v-26h-26c-3.31152 0 -6 -2.68848 -6 -6v-20c0 -3.31152 2.68848 -6 6 -6h26v-26c0 -3.31152 2.68848 -6 6 -6h20c3.31152 0 6 2.68848 6 6zM272 44v40c0 6.62305 -5.37695 12 -12 12h-40c-6.62305 0 -12 -5.37695 -12 -12v-40
+c0 -6.62305 5.37695 -12 12 -12h40c6.62305 0 12 5.37695 12 12zM272 172v40c0 6.62305 -5.37695 12 -12 12h-40c-6.62305 0 -12 -5.37695 -12 -12v-40c0 -6.62305 5.37695 -12 12 -12h40c6.62305 0 12 5.37695 12 12z" />
+    <glyph glyph-name="hotdog" unicode="&#xf80f;" 
+d="M488.56 424.56c14.4766 -14.4795 23.4346 -34.498 23.4346 -56.5703s-8.95801 -42.0693 -23.4346 -56.5488l-352 -352c-14.5518 -15.0674 -34.9814 -24.4199 -57.5615 -24.4199c-44.1523 0 -80 35.8467 -80 80c0 22.5801 9.375 42.9873 24.4424 57.5391l352 352
+c14.4795 14.4766 34.498 23.4346 56.5703 23.4346s42.0693 -8.95801 56.5488 -23.4346zM438.63 329.37c2.89648 2.89648 4.68457 6.90137 4.68457 11.3174c0 8.83105 -7.16992 16.002 -16.002 16.002c-4.41602 0 -8.41602 -1.79297 -11.3125 -4.68945
+c-12.4102 -12.4102 -21.7598 -14 -34.71 -16.2305c-14.4004 -2.46973 -32.3203 -5.55957 -51.9199 -25.1494c-19.6006 -19.5898 -22.6699 -37.5205 -25.1396 -51.9199c-2.24023 -12.9502 -3.84082 -22.3105 -16.2402 -34.71
+c-12.4004 -12.4004 -21.7002 -14.0098 -34.7002 -16.2305c-14.4004 -2.46973 -32.3203 -5.5498 -51.9199 -25.1396c-19.6006 -19.5898 -22.6699 -37.5205 -25.1504 -51.9199c-2.21973 -12.9502 -3.80957 -22.29 -16.2197 -34.7002s-21.71 -14.0098 -34.71 -16.2305
+c-14.4004 -2.46973 -32.3203 -5.5498 -51.9199 -25.1396c-2.89648 -2.89648 -4.68457 -6.90137 -4.68457 -11.3174c0 -8.83105 7.16992 -16.002 16.002 -16.002c4.41602 0 8.41602 1.79297 11.3125 4.68945c12.4004 12.4004 21.7598 14 34.7002 16.2305
+c14.3994 2.46973 32.3301 5.55957 51.9297 25.1494c19.6006 19.5898 22.6699 37.5205 25.1396 51.9199c2.23047 12.9502 3.83008 22.2998 16.2305 34.7002s21.75 14 34.7002 16.2197c14.3994 2.48047 32.3193 5.56055 51.9199 25.1504
+c19.5996 19.5898 22.6699 37.5195 25.1494 51.9199c2.23047 12.9502 3.83008 22.3096 16.2305 34.71s21.7598 14 34.7002 16.2305c14.4102 2.46973 32.3301 5.5498 51.9297 25.1396zM31.4404 125.82l-11.5508 11.5498c-24.9893 24.9902 -26.6592 63.8398 -3.71973 86.7803
+l207.68 207.68c22.9404 22.9395 61.79 21.2803 86.79 -3.71973l11.54 -11.5508zM480.56 258.18l11.5508 -11.54c24.9893 -25 26.6592 -63.8496 3.71973 -86.79l-207.68 -207.68c-22.9404 -22.9395 -61.79 -21.2803 -86.79 3.71973l-11.54 11.5508z" />
+    <glyph glyph-name="ice-cream" unicode="&#xf810;" horiz-adv-x="448" 
+d="M368 288c26.4922 0 48 -21.5078 48 -48s-21.5078 -48 -48 -48h-288c-26.4922 0 -48 21.5078 -48 48s21.5078 48 48 48h0.94043c-0.625 5.43945 -0.93457 10.9707 -0.93457 16.5762c0 79.4756 64.5234 144 144 144c79.4756 0 144 -64.5244 144 -144
+c0 -5.60547 -0.321289 -11.1367 -0.946289 -16.5762h0.94043zM195.38 -45.6904l-99.3799 205.69h256l-99.3799 -205.69c-4.99414 -10.8223 -15.9111 -18.3398 -28.6035 -18.3398s-23.6426 7.51758 -28.6367 18.3398z" />
+    <glyph glyph-name="laptop-medical" unicode="&#xf812;" horiz-adv-x="640" 
+d="M232 224c-4.41504 0 -8 3.58496 -8 8v48c0 4.41504 3.58496 8 8 8h56v56c0 4.41504 3.58496 8 8 8h48c4.41504 0 8 -3.58496 8 -8v-56h56c4.41504 0 8 -3.58496 8 -8v-48c0 -4.41504 -3.58496 -8 -8 -8h-56v-56c0 -4.41504 -3.58496 -8 -8 -8h-48
+c-4.41504 0 -8 3.58496 -8 8v56h-56zM576 400v-336h-512v336c0.0771484 26.4561 21.5439 47.9229 48 48h416c26.4561 -0.0771484 47.9229 -21.5439 48 -48zM512 128v256h-384v-256h384zM624 32c8.83105 0 16 -7.16895 16 -16v-16
+c-0.104492 -35.2744 -28.7256 -63.8955 -64 -64h-512c-35.2744 0.104492 -63.8955 28.7256 -64 64v16c0 8.83105 7.16895 16 16 16h239.23c-0.230469 -14.5303 14.0791 -32 32.7695 -32h60.7998c18.0303 0 32 12.1904 32.7402 32h242.46z" />
+    <glyph glyph-name="pager" unicode="&#xf815;" 
+d="M448 384c35.3223 0 64 -28.6777 64 -64v-256c0 -35.3223 -28.6777 -64 -64 -64h-384c-35.3223 0 -64 28.6777 -64 64v256c0 35.3223 28.6777 64 64 64h384zM160 80v48h-80c-8.83105 0 -16 -7.16895 -16 -16v-16c0 -8.83105 7.16895 -16 16 -16h80zM288 96v16
+c0 8.83105 -7.16895 16 -16 16h-80v-48h80c8.83105 0 16 7.16895 16 16zM448 224v64c0 17.6611 -14.3389 32 -32 32h-320c-17.6611 0 -32 -14.3389 -32 -32v-64c0 -17.6611 14.3389 -32 32 -32h320c17.6611 0 32 14.3389 32 32z" />
+    <glyph glyph-name="pepper-hot" unicode="&#xf816;" 
+d="M330.67 184.88h107.46l37.0498 -38.54c-48.5293 -87.4697 -206.54 -210.34 -419.18 -210.34c-30.9072 0 -56 25.0928 -56 56s25.0928 56 56 56c141.58 0 163.44 181.24 221.92 250.82l52.75 -24.2207v-89.7197zM461.76 313.25
+c30.8984 -28.1729 50.2402 -68.7275 50.2402 -113.795v-0.145508c0 -13.6797 -2.2998 -26.6895 -5.55957 -39.3096l-54.6807 56.8799h-89.0898v78.2402l-74.6699 34.29c22.3398 14.0498 48.3398 22.5898 76.3398 22.5898
+c20.2783 -0.0078125 39.6836 -4.32031 57.1602 -11.96c18.4502 37.2197 8.25977 61.96 1.40039 72.3203c-0.896484 1.29883 -1.42676 2.88184 -1.42676 4.57715c0 2.20117 0.884766 4.19727 2.31641 5.65234l22.9004 23c1.45117 1.47559 3.46777 2.39453 5.69922 2.39453
+c2.5166 0 4.76367 -1.16504 6.23047 -2.98438c18.5596 -23.4805 35.2998 -71.9102 3.13965 -131.75z" />
+    <glyph glyph-name="pizza-slice" unicode="&#xf818;" 
+d="M158.87 447.85c181.91 -17.1699 332.02 -164.93 352.899 -345.71c1.87012 -16.2197 -7.89941 -31.54 -23.6191 -35.8994l-56.9404 -15.7803c-7.94043 186.39 -134.86 311.51 -322.479 317l14.8096 56.2705c4.12988 15.6992 19.1699 25.6396 35.3301 24.1191z
+M100.4 335.85c176.069 -1.95996 294.88 -119.25 299.149 -294.14l-379 -105.1c-1.37793 -0.381836 -2.82324 -0.59375 -4.32227 -0.59375c-8.94629 0 -16.21 7.26367 -16.21 16.21c0 1.42871 0.18457 2.81348 0.532227 4.13379zM128 32c17.6611 0 32 14.3389 32 32
+s-14.3389 32 -32 32s-32 -14.3389 -32 -32s14.3389 -32 32 -32zM176 184c17.6611 0 32 14.3389 32 32s-14.3389 32 -32 32s-32 -14.3389 -32 -32s14.3389 -32 32 -32zM280 80c17.6611 0 32 14.3389 32 32s-14.3389 32 -32 32s-32 -14.3389 -32 -32s14.3389 -32 32 -32z" />
+    <glyph glyph-name="trash-restore" unicode="&#xf829;" horiz-adv-x="448" 
+d="M53.2002 -19l-21.2002 339h384l-21.2002 -339c-1.57031 -25.0762 -22.4316 -44.9971 -47.8994 -45h-245.801c-25.4678 0.00292969 -46.3291 19.9238 -47.8994 45zM123.31 156.8c-10.0791 -10.6201 -2.93945 -28.7998 11.3203 -28.7998h57.3701v-112
+c0 -8.83105 7.16895 -16 16 -16h32c8.83105 0 16 7.16895 16 16v112h57.3701c14.2598 0 21.3994 18.1797 11.3203 28.7998l-89.3809 94.2598c-2.81543 3.04297 -6.83984 4.94922 -11.3086 4.94922s-8.49512 -1.90625 -11.3105 -4.94922zM432 416
+c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h120l9.40039 18.7002c3.85547 7.88574 11.9434 13.2998 21.3066 13.2998h0.0927734h114.3
+c0.00585938 0 -0.00195312 0.0234375 0.00390625 0.0234375c9.41113 0 17.5645 -5.42871 21.4961 -13.3232l9.40039 -18.7002h120z" />
+    <glyph glyph-name="trash-restore-alt" unicode="&#xf82a;" horiz-adv-x="448" 
+d="M32 -16v336h384v-336c0 -26.4922 -21.5078 -48 -48 -48h-288c-26.4922 0 -48 21.5078 -48 48zM123.31 156.8c-10.0791 -10.6201 -2.93945 -28.7998 11.3203 -28.7998h57.3701v-112c0 -8.83105 7.16895 -16 16 -16h32c8.83105 0 16 7.16895 16 16v112h57.3701
+c14.2598 0 21.3994 18.1797 11.3203 28.7998l-89.3809 94.2598c-2.81543 3.04297 -6.83984 4.94922 -11.3086 4.94922s-8.49512 -1.90625 -11.3105 -4.94922zM432 416c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-416
+c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h120l9.40039 18.7002c3.85547 7.88574 11.9434 13.2998 21.3066 13.2998h0.0927734h114.3c0.00585938 0 -0.00195312 0.0234375 0.00390625 0.0234375c9.41113 0 17.5645 -5.42871 21.4961 -13.3232
+l9.40039 -18.7002h120z" />
+    <glyph glyph-name="user-nurse" unicode="&#xf82f;" horiz-adv-x="448" 
+d="M319.41 128c71.4902 -3.09961 128.59 -61.5996 128.59 -133.79c0 -32.127 -26.083 -58.21 -58.21 -58.21h-331.58c-32.127 0 -58.21 26.083 -58.21 58.21c0 72.1904 57.0996 130.69 128.59 133.79l95.4102 -95.3896zM224 144c-70.6455 0 -128 57.3545 -128 128v110.18
+c0 13.7119 8.62988 25.4092 20.7598 29.96l84.7705 31.79c6.98438 2.61914 14.6035 4.05176 22.498 4.05176s15.457 -1.43262 22.4414 -4.05176l84.7705 -31.75c12.1309 -4.55078 20.7598 -16.248 20.7598 -29.96v-0.0400391v-110.18c0 -70.6455 -57.3545 -128 -128 -128z
+M184 376.33v-16.6602c0 -2.75977 2.24023 -5 5 -5h21.6699v-21.6699c0 -2.75977 2.24023 -5 5 -5h16.6602c2.75977 0 5 2.24023 5 5v21.6699h21.6699c2.75977 0 5 2.24023 5 5v16.6602c0 2.75977 -2.24023 5 -5 5h-21.6699v21.6699c0 2.75977 -2.24023 5 -5 5h-16.6602
+c-2.75977 0 -5 -2.24023 -5 -5v-21.6699h-21.6699c-2.75977 0 -5 -2.24023 -5 -5zM144 288v-16c0 -44.1533 35.8467 -80 80 -80s80 35.8467 80 80v16h-160z" />
+    <glyph glyph-name="wave-square" unicode="&#xf83e;" horiz-adv-x="640" 
+d="M476 -32h-152c-19.8691 0 -36 16.1309 -36 36v348h-96v-156c0 -19.8691 -16.1309 -36 -36 -36h-140c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h112v156c0 19.8691 16.1309 36 36 36h152c19.8691 0 36 -16.1309 36 -36v-348h96v156
+c0 19.8691 16.1309 36 36 36h140c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-112v-156c0 -19.8691 -16.1309 -36 -36 -36z" />
+    <glyph glyph-name="biking" unicode="&#xf84a;" horiz-adv-x="640" 
+d="M400 352c-26.4922 0 -48 21.5078 -48 48s21.5078 48 48 48s48 -21.5078 48 -48s-21.5078 -48 -48 -48zM396 231l-41.3604 33.1104l-58.25 -49.9199l41.3604 -27.5703c8.60547 -5.7373 14.248 -15.5117 14.25 -26.6201v-128c0 -17.6611 -14.3389 -32 -32 -32
+s-32 14.3389 -32 32v110.88l-81.7305 54.5205c-8.60742 5.7373 -14.2686 15.5068 -14.2686 26.6191c0 9.71777 4.3418 18.4297 11.1895 24.3008l112 96c5.58887 4.80176 12.8965 7.70117 20.8359 7.70117c7.55566 0 14.502 -2.62891 19.9736 -7.02148l71.2197 -57h52.7803
+c17.6611 0 32 -14.3389 32 -32s-14.3389 -32 -32 -32h-64c-0.0205078 0 -0.0625 0.0117188 -0.0830078 0.0117188c-7.53125 0 -14.457 2.61621 -19.917 6.98828zM512 192c70.6455 0 128 -57.3545 128 -128s-57.3545 -128 -128 -128s-128 57.3545 -128 128
+s57.3545 128 128 128zM512 0c35.3223 0 64 28.6777 64 64s-28.6777 64 -64 64s-64 -28.6777 -64 -64s28.6777 -64 64 -64zM128 192c70.6455 0 128 -57.3545 128 -128s-57.3545 -128 -128 -128s-128 57.3545 -128 128s57.3545 128 128 128zM128 0c35.3223 0 64 28.6777 64 64
+s-28.6777 64 -64 64s-64 -28.6777 -64 -64s28.6777 -64 64 -64z" />
+    <glyph glyph-name="border-all" unicode="&#xf84c;" horiz-adv-x="448" 
+d="M416 416c17.6611 0 32 -14.3389 32 -32v-384c0 -17.6611 -14.3389 -32 -32 -32h-384c-17.6611 0 -32 14.3389 -32 32v384c0 17.6611 14.3389 32 32 32h384zM384 352h-128v-128h128v128zM192 352h-128v-128h128v128zM64 32h128v128h-128v-128zM256 32h128v128h-128v-128z
+" />
+    <glyph glyph-name="border-none" unicode="&#xf850;" horiz-adv-x="448" 
+d="M240 224c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM336 224c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h32zM432 224c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM144 224c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32
+c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM240 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM336 32c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM432 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM432 128
+c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM432 320c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h32zM240 128c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM240 320c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32
+c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM144 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM240 416c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM336 416c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM432 416
+c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM48 224c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h32zM48 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM48 128c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32
+c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM48 320c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM48 416c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM144 416c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32z" />
+    <glyph glyph-name="border-style" unicode="&#xf853;" horiz-adv-x="448" 
+d="M240 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM144 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32
+c0 8.83105 7.16895 16 16 16h32zM336 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM432 224c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32
+c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM432 128c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM432 32c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM432 320c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32zM432 416
+c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-368v-368c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v400c0 17.6611 14.3389 32 32 32h400z" />
+    <glyph glyph-name="fan" unicode="&#xf863;" 
+d="M352.57 320c81.79 0 149.3 -61.6299 159.3 -141.33c1.30957 -10.4795 -7.17969 -19.6396 -17.6201 -18.5898l-123.11 12.4102c8.34082 -22.9707 12.8604 -48.9707 12.8604 -77.0605c0 -81.79 -61.6299 -149.3 -141.33 -159.3
+c-10.4795 -1.30957 -19.6396 7.19043 -18.5898 17.6201l12.4102 123.11c-22.9707 -8.34082 -48.9707 -12.8604 -77.0605 -12.8604c-81.79 0 -149.3 61.6299 -159.3 141.33c-1.30957 10.4795 7.17969 19.6699 17.6201 18.5898l123.11 -12.4102
+c-8.34082 22.9707 -12.8604 48.9707 -12.8604 77.0605c0 81.79 61.6299 149.3 141.33 159.3c10.4795 1.30957 19.6699 -7.17969 18.5898 -17.6201l-12.4102 -123.11c22.9707 8.34082 48.9707 12.8604 77.0605 12.8604zM256 160c17.6611 0 32 14.3389 32 32
+s-14.3389 32 -32 32s-32 -14.3389 -32 -32s14.3389 -32 32 -32z" />
+    <glyph glyph-name="icons" unicode="&#xf86d;" 
+d="M116.65 228.65l-96.79 99.8301c-28 29.0293 -26.4102 77.0996 5 103.88c27.3896 23.3398 68.1895 19.1396 93.29 -6.80078l9.84961 -10.1396l9.86035 10.1396c25.1396 25.9404 65.8896 30.1406 93.2793 6.80078c31.4102 -26.7803 33.0605 -74.8799 4.91016 -103.88
+l-96.75 -99.8301c-2.85449 -2.98242 -6.875 -4.83984 -11.3252 -4.83984s-8.46973 1.85742 -11.3242 4.83984zM260.57 128.16c15.1406 -0.0107422 27.4297 -12.3066 27.4297 -27.4502v-0.00976562v-137.25c0 -15.1436 -12.2891 -27.4395 -27.4297 -27.4502h-233.141
+c-15.1396 0.00585938 -27.4297 12.2988 -27.4297 27.4395v0.0107422v137.25v0.00976562c0 15.1504 12.2998 27.4502 27.4502 27.4502h0.00976562h48l7 14.2402c3.89258 10.3887 13.9082 17.7793 25.6484 17.7793h0.0117188h71.71
+c0.00390625 0 -0.00195312 0.0126953 0.000976562 0.0126953c11.7412 0 21.7666 -7.40332 25.6592 -17.792l7.08008 -14.2402h48zM144 -20c28.6992 0 52 23.3008 52 52s-23.3008 52 -52 52s-52 -23.3008 -52 -52s23.3008 -52 52 -52zM499.4 95.9004
+c9.70996 0 15.75 -8.79004 10.8691 -15.7002l-92.3994 -138.91c-2.42188 -3.19824 -6.24805 -5.25488 -10.5654 -5.25488c-0.118164 0 -0.236328 0.00195312 -0.354492 0.00488281c-8.03027 0 -14.1201 6.25 -12.2305 12.9004l24.2002 83h-62.3096
+c-7.62012 0 -13.5 5.58984 -12.5 11.8896l16.7998 106.93c0.839844 5.2002 6.2002 9.10059 12.5 9.10059h75.5898c8.25 0 14.2803 -6.56055 12.1797 -13.21l-22.3594 -50.75h60.5801zM478.08 447.67c17.9199 2.75 33.9199 -12.1895 33.9199 -31.6699v-144.26
+c-0.269531 -26.3398 -28.7998 -47.6602 -64 -47.6602c-35.3496 0 -64 21.4795 -64 48c0 26.5195 28.6504 48 64 48c5.49219 -0.0498047 10.8096 -0.633789 16 -1.7002v47.1797l-112 -17.2197v-108.58c-0.269531 -26.3398 -28.7998 -47.6602 -64 -47.6602
+c-35.3496 0 -64 21.4805 -64 48c0 26.5205 28.6504 48 64 48c5.49219 -0.0498047 10.8096 -0.632812 16 -1.69922v106.77c0 15.9102 10.8701 29.4102 25.5098 31.6602z" />
+    <glyph glyph-name="phone-alt" unicode="&#xf879;" 
+d="M497.39 86.2002c8.60059 -3.74121 14.6006 -12.2891 14.6006 -22.2588c0 -1.83496 -0.204102 -3.62305 -0.589844 -5.3418l-24 -104c-2.45801 -10.6416 -12 -18.5996 -23.3848 -18.5996h-0.015625c-256.1 0 -464 207.5 -464 464l0.0136719 0.00390625
+c0 11.3848 7.94434 20.9287 18.5859 23.3857l104 24c1.72754 0.392578 3.49805 0.619141 5.34375 0.619141c9.9082 0 18.4307 -5.97656 22.1562 -14.5186l48 -112c1.23828 -2.88965 1.95117 -6.0791 1.95117 -9.41895c0 -7.49512 -3.45215 -14.1904 -8.85059 -18.5811
+l-60.6006 -49.6006c36.7334 -77.9072 99.2822 -140.457 177.19 -177.189l49.5996 60.5996c4.40332 5.39258 11.1113 8.81055 18.6084 8.81055c3.33203 0 6.50684 -0.680664 9.3916 -1.91016z" />
+    <glyph glyph-name="phone-square-alt" unicode="&#xf87b;" horiz-adv-x="448" 
+d="M400 416c26.4922 0 48 -21.5078 48 -48v-352c0 -26.4922 -21.5078 -48 -48 -48h-352c-26.4922 0 -48 21.5078 -48 48v352c0 26.4922 21.5078 48 48 48h352zM383.61 108.63c0.235352 1.09082 0.369141 2.21387 0.389648 3.37012
+c-0.301758 6.06445 -3.91992 11.2607 -9.08984 13.79l-70 30c-1.83594 0.71582 -3.83789 1.14355 -5.91016 1.20996c-4.58496 -0.251953 -8.69922 -2.31836 -11.6104 -5.5l-31 -37.8896c-48.7002 22.9775 -87.8018 62.0791 -110.779 110.779l37.8896 31
+c3.18164 2.91113 5.24805 7.02539 5.5 11.6104c-0.0673828 2.07129 -0.495117 4.07324 -1.20996 5.91016l-30 70c-2.53223 5.16797 -7.72754 8.78418 -13.79 9.08984c-1.15527 -0.0253906 -2.27734 -0.15918 -3.37012 -0.389648l-65 -15
+c-6.52246 -1.74707 -11.3818 -7.59961 -11.6299 -14.6104c0 -160.29 130 -290 290 -290c7.11426 0.00292969 13.0762 4.97852 14.6104 11.6299z" />
+    <glyph glyph-name="photo-video" unicode="&#xf87c;" horiz-adv-x="640" 
+d="M608 448c17.6611 0 32 -14.3389 32 -32v-320c0 -17.6611 -14.3389 -32 -32 -32h-128v320h-192v-64h-160v96c0 17.6611 14.3389 32 32 32h448zM232 345v30c0 4.9668 -4.0332 9 -9 9h-30c-4.9668 0 -9 -4.0332 -9 -9v-30c0 -4.9668 4.0332 -9 9 -9h30
+c4.9668 0 9 4.0332 9 9zM584 137v30c0 4.9668 -4.0332 9 -9 9h-30c-4.9668 0 -9 -4.0332 -9 -9v-30c0 -4.9668 4.0332 -9 9 -9h30c4.9668 0 9 4.0332 9 9zM584 241v30c0 4.9668 -4.0332 9 -9 9h-30c-4.9668 0 -9 -4.0332 -9 -9v-30c0 -4.9668 4.0332 -9 9 -9h30
+c4.9668 0 9 4.0332 9 9zM584 345v30c0 4.9668 -4.0332 9 -9 9h-30c-4.9668 0 -9 -4.0332 -9 -9v-30c0 -4.9668 4.0332 -9 9 -9h30c4.9668 0 9 4.0332 9 9zM416 288c17.6611 0 32 -14.3389 32 -32v-288c0 -17.6611 -14.3389 -32 -32 -32h-384c-17.6611 0 -32 14.3389 -32 32
+v288c0 17.6611 14.3389 32 32 32h384zM96 224c-17.6611 0 -32 -14.3389 -32 -32s14.3389 -32 32 -32s32 14.3389 32 32s-14.3389 32 -32 32zM384 0v96l-96 96l-128 -128l-32 32l-64 -64v-32h320z" />
+    <glyph glyph-name="remove-format" unicode="&#xf87d;" horiz-adv-x="640" 
+d="M336 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-128c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h32.4902l26.5098 79.5996l67.0898 -51.8301l-9.25977 -27.7695h11.1699zM633.82 -10.0996
+c3.76855 -2.92871 6.17676 -7.50977 6.17676 -12.6475c0 -3.69238 -1.25293 -7.09375 -3.35742 -9.80273l-19.6396 -25.2705c-2.92871 -3.76855 -7.50879 -6.17578 -12.6465 -6.17578c-3.69727 0 -7.10254 1.25684 -9.81348 3.36621l-588.36 454.72
+c-3.76562 2.92871 -6.1709 7.50781 -6.1709 12.6426c0 3.69434 1.25488 7.09766 3.36133 9.80762l19.6299 25.2695c2.92871 3.76855 7.50879 6.17676 12.6465 6.17676c3.69727 0 7.10254 -1.25684 9.81348 -3.36621l114.54 -88.5205v43.9004c0 8.83105 7.16895 16 16 16h416
+c8.83105 0 16 -7.16895 16 -16v-96c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v32h-117.83l-49.1699 -147.59zM309.91 240.24l31.9199 95.7598h-117.83v-29.3604z" />
+    <glyph glyph-name="sort-alpha-down-alt" unicode="&#xf881;" horiz-adv-x="448" 
+d="M176 96c14.2197 0 21.3496 -17.2598 11.3301 -27.3096l-80 -96c-2.89551 -2.89453 -6.89844 -4.68555 -11.3125 -4.68555c-4.41309 0 -8.41211 1.79102 -11.3076 4.68555l-80 96c-10.0703 10.0693 -2.90039 27.3096 11.29 27.3096h48v304c0 8.83105 7.16895 16 16 16h32
+c8.83105 0 16 -7.16895 16 -16v-304h48zM288 224c-8.83105 0 -16 7.16895 -16 16v17.6299c0 9.51074 4.14355 18.0566 10.7402 23.9199l61.2598 70.4502h-56c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h128c8.83105 0 16 -7.16895 16 -16v-17.6299
+c0 -9.51074 -4.14355 -18.0566 -10.7402 -23.9199l-61.2598 -70.4502h56c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-128zM447.06 -10.6201c0.600586 -1.67969 0.931641 -3.49512 0.931641 -5.37988c0 -8.82812 -7.16406 -15.9951 -15.9912 -16
+h-24.8398c-0.015625 0 -0.0263672 -0.00195312 -0.0419922 -0.00195312c-7.11426 0 -13.1514 4.6543 -15.2285 11.082l-4.40918 12.9199h-71l-4.4209 -12.9199c-2.07617 -6.42773 -8.10938 -11.0801 -15.2246 -11.0801h-0.00488281h-24.8301
+c-8.82715 0.00488281 -15.9863 7.17773 -15.9863 16.0049c0 1.88574 0.326172 3.69531 0.926758 5.375l59.2695 160c2.20996 6.19043 8.125 10.6201 15.0703 10.6201h41.4395c6.94531 0 12.8604 -4.42969 15.0703 -10.6201zM335.61 48h32.7793l-16.3896 48z" />
+    <glyph glyph-name="sort-alpha-up-alt" unicode="&#xf882;" horiz-adv-x="448" 
+d="M16 288c-14.2197 0 -21.3496 17.2598 -11.3096 27.3096l80 96c2.89551 2.89453 6.89844 4.68555 11.3115 4.68555c4.41406 0 8.41211 -1.79102 11.3076 -4.68555l80 -96c10.0703 -10.0693 2.90039 -27.3096 -11.3096 -27.3096h-48v-304c0 -8.83105 -7.16895 -16 -16 -16
+h-32c-8.83105 0 -16 7.16895 -16 16v304h-48zM288 224c-8.83105 0 -16 7.16895 -16 16v17.6299c0 9.51074 4.14355 18.0566 10.7402 23.9199l61.2598 70.4502h-56c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h128c8.83105 0 16 -7.16895 16 -16v-17.6299
+c0 -9.51074 -4.14355 -18.0566 -10.7402 -23.9199l-61.2598 -70.4502h56c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-128zM447.06 -10.6201c0.600586 -1.67969 0.931641 -3.49512 0.931641 -5.37988c0 -8.82812 -7.16406 -15.9951 -15.9912 -16
+h-24.8398c-0.015625 0 -0.0263672 -0.00195312 -0.0419922 -0.00195312c-7.11426 0 -13.1514 4.6543 -15.2285 11.082l-4.40918 12.9199h-71l-4.4209 -12.9199c-2.07617 -6.42773 -8.10938 -11.0801 -15.2246 -11.0801h-0.00488281h-24.8301
+c-8.82715 0.00488281 -15.9863 7.17773 -15.9863 16.0049c0 1.88574 0.326172 3.69531 0.926758 5.375l59.2695 160c2.20996 6.19043 8.125 10.6201 15.0703 10.6201h41.4395c6.94531 0 12.8604 -4.42969 15.0703 -10.6201zM335.61 48h32.7793l-16.3896 48z" />
+    <glyph glyph-name="sort-amount-down-alt" unicode="&#xf884;" 
+d="M240 352c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h64c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-64zM240 224c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h128c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-128zM496 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-256c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h256zM240 96c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h192
+c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-192zM176 96c14.2197 0 21.3496 -17.2598 11.3301 -27.3096l-80 -96c-2.89551 -2.89453 -6.89844 -4.68555 -11.3125 -4.68555c-4.41309 0 -8.41211 1.79102 -11.3076 4.68555l-80 96
+c-10.0801 10.0693 -2.90039 27.3096 11.29 27.3096h48v304c0 8.83105 7.16895 16 16 16h32c8.83105 0 16 -7.16895 16 -16v-304h48z" />
+    <glyph glyph-name="sort-amount-up-alt" unicode="&#xf885;" 
+d="M240 352c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h64c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-64zM240 224c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h128c8.83105 0 16 -7.16895 16 -16v-32
+c0 -8.83105 -7.16895 -16 -16 -16h-128zM496 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-256c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h256zM240 96c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h192
+c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-192zM16 288c-14.2197 0 -21.3496 17.2598 -11.3096 27.3096l80 96c2.89551 2.89453 6.89844 4.68555 11.3115 4.68555c4.41406 0 8.41211 -1.79102 11.3076 -4.68555l80 -96
+c10.0801 -10.0693 2.90039 -27.3096 -11.3096 -27.3096h-48v-304c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v304h-48z" />
+    <glyph glyph-name="sort-numeric-down-alt" unicode="&#xf886;" horiz-adv-x="448" 
+d="M176 96c14.2197 0 21.3496 -17.2598 11.3301 -27.3096l-80 -96c-2.89551 -2.89453 -6.89844 -4.68555 -11.3125 -4.68555c-4.41309 0 -8.41211 1.79102 -11.3076 4.68555l-80 96c-10.0703 10.0693 -2.90039 27.3096 11.29 27.3096h48v304c0 8.83105 7.16895 16 16 16h32
+c8.83105 0 16 -7.16895 16 -16v-304h48zM400 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-96c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h16v64h-16c-8.82422 0.0078125 -15.9775 7.18945 -15.9775 16.0156
+c0 2.57129 0.608398 5.00098 1.6875 7.1543l16 32c2.62598 5.23926 8.03613 8.8252 14.29 8.83008h48c8.83105 0 16 -7.16895 16 -16v-112h16zM330.17 413.09c53.4502 14.25 101.83 -25.8799 101.85 -77.0898v-10.7695c0 -70.3906 -28.25 -107.23 -86.25 -132
+c-8.36914 -3.58008 -18.0293 1.2793 -20.8994 9.90918l-9.90039 20c-2.62012 7.87012 0.610352 16.9404 8.18066 20.3408c7.59961 3.28516 14.6064 7.64258 20.8496 12.9092c-47.6396 4.76074 -83.0996 51.4805 -68.8301 102.53c7.62891 26.2793 28.5596 46.9287 55 54.1699
+zM352 316c11.0381 0 20 8.96191 20 20s-8.96191 20 -20 20s-20 -8.96191 -20 -20s8.96191 -20 20 -20z" />
+    <glyph glyph-name="sort-numeric-up-alt" unicode="&#xf887;" horiz-adv-x="448" 
+d="M107.31 411.31l80 -96c10.0703 -10.0693 2.90039 -27.3096 -11.3096 -27.3096h-48v-304c0 -8.83105 -7.16895 -16 -16 -16h-32c-8.83105 0 -16 7.16895 -16 16v304h-48c-14.2197 0 -21.3496 17.2598 -11.3096 27.3096l80 96
+c2.89551 2.89453 6.89844 4.68555 11.3115 4.68555c4.41406 0 8.41211 -1.79102 11.3076 -4.68555zM400 32c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-96c-8.83105 0 -16 7.16895 -16 16v32c0 8.83105 7.16895 16 16 16h16v64h-16
+c-8.82422 0.0078125 -15.9775 7.18945 -15.9775 16.0156c0 2.57129 0.608398 5.00098 1.6875 7.1543l16 32c2.62598 5.23926 8.03613 8.8252 14.29 8.83008h48c8.83105 0 16 -7.16895 16 -16v-112h16zM330.17 413.09c53.4502 14.25 101.83 -25.8799 101.85 -77.0898
+v-10.7695c0 -70.3906 -28.25 -107.23 -86.25 -132c-8.36914 -3.58008 -18.0293 1.2793 -20.8994 9.90918l-9.90039 20c-2.62012 7.87012 0.610352 16.9404 8.18066 20.3408c7.59961 3.28516 14.6064 7.64258 20.8496 12.9092
+c-47.6396 4.76074 -83.0996 51.4805 -68.8301 102.53c7.62891 26.2793 28.5596 46.9287 55 54.1699zM352 316c11.0381 0 20 8.96191 20 20s-8.96191 20 -20 20s-20 -8.96191 -20 -20s8.96191 -20 20 -20z" />
+    <glyph glyph-name="spell-check" unicode="&#xf891;" horiz-adv-x="576" 
+d="M272 192c-8.83105 0 -16 7.16895 -16 16v224c0 8.83105 7.16895 16 16 16h75c42.2998 0 80.9004 -30.5703 84.6699 -72.6797c0.225586 -2.44238 0.289062 -4.91895 0.289062 -7.41895c0 -13.5479 -3.38281 -26.3115 -9.34863 -37.4912
+c15.6377 -14.5762 25.3984 -35.2832 25.3984 -58.3262c0 -1.59277 -0.046875 -3.1748 -0.138672 -4.74414c-2.50977 -43.1396 -41.3105 -75.3398 -84.5098 -75.3398h-91.3604zM312 392v-48h40c13.2461 0 24 10.7539 24 24s-10.7539 24 -24 24h-40zM312 296v-48h56
+c13.2461 0 24 10.7539 24 24s-10.7539 24 -24 24h-56zM155.12 425.75l68.2998 -213.48c0.376953 -1.36035 0.580078 -2.79004 0.580078 -4.26953c0 -8.83105 -7.16895 -16 -16 -16h-24.9297c-7.35059 0 -13.5488 4.97168 -15.4199 11.7305l-11.9404 36.2695h-87.4199
+l-11.9404 -36.2695c-1.87109 -6.75879 -8.06934 -11.7305 -15.4199 -11.7305h-24.9297c-8.82617 0.00488281 -15.9883 7.16895 -15.9883 15.9961c0 1.47949 0.201172 2.91309 0.578125 4.27344l68.29 213.48c4.12695 12.9004 16.2168 22.25 30.4805 22.25h25.2793
+c14.2637 0 26.3535 -9.34961 30.4805 -22.25zM89.3701 304h45.2598l-22.6299 68.7002zM571.37 171.52c2.8916 -2.89453 4.65918 -6.89648 4.65918 -11.3066c0 -4.40137 -1.78027 -8.38867 -4.65918 -11.2832l-208 -208.21
+c-2.88086 -2.91406 -6.88379 -4.7207 -11.3018 -4.7207s-8.41699 1.80664 -11.2988 4.7207l-112 112.21c-2.88477 2.89453 -4.66895 6.8916 -4.66895 11.2979c0 4.40527 1.78418 8.39746 4.66895 11.292l45.3008 45.3008c2.87891 2.91309 6.87988 4.71973 11.2969 4.71973
+c4.41602 0 8.41309 -1.80664 11.293 -4.71973l55.4102 -55.5l151.5 151.5c2.87891 2.91309 6.87988 4.71973 11.2969 4.71973c4.41602 0 8.41309 -1.80664 11.293 -4.71973z" />
+    <glyph glyph-name="voicemail" unicode="&#xf897;" horiz-adv-x="640" 
+d="M496 320c79.4756 0 144 -64.5244 144 -144s-64.5244 -144 -144 -144h-352c-79.4727 0.00390625 -144.079 64.3818 -144.079 143.854c0 79.4766 64.5244 144 144 144c79.4766 0 144 -64.5234 144 -144c0 -29.5293 -8.90723 -56.9961 -24.1807 -79.8545h112.52
+c-15.2734 22.8584 -24.2598 50.4697 -24.2598 80c0 79.4756 64.5244 144 144 144zM64 176c0 -44.1533 35.8467 -80 80 -80s80 35.8467 80 80s-35.8467 80 -80 80s-80 -35.8467 -80 -80zM496 96c44.1533 0 80 35.8467 80 80s-35.8467 80 -80 80s-80 -35.8467 -80 -80
+s35.8467 -80 80 -80z" />
+    <glyph glyph-name="hat-cowboy" unicode="&#xf8c0;" horiz-adv-x="640" 
+d="M490 151.1c-38.7695 -12.5898 -93.7305 -23.0996 -170 -23.0996s-131.19 10.5303 -169.99 23.1201c9.50977 57.4102 39.5098 232.88 97.71 232.88c14 0 26.4902 -6 37 -14c9.78516 -7.45996 22.0947 -11.8906 35.3369 -11.8906c13.2432 0 25.458 4.43066 35.2432 11.8906
+c10.5098 8.07031 23 14 37 14c58.21 0 88.21 -175.51 97.7002 -232.9zM632.9 188.28c4.27637 -2.87402 7.08008 -7.75195 7.08008 -13.2871c0 -1.94043 -0.34668 -3.80078 -0.980469 -5.52344c-0.730469 -2.01953 -77.3203 -201.47 -319 -201.47s-318.27 199.45 -319 201.47
+c-0.625977 1.71289 -0.966797 3.56543 -0.966797 5.49316c0 8.83105 7.16992 16 16 16c4.12012 0 7.87891 -1.56055 10.7168 -4.12305c1.01953 -0.899414 102.42 -90.8398 293.24 -90.8398c191.89 0 292.16 89.8799 293.16 90.7803
+c2.84863 2.61816 6.6709 4.20996 10.8428 4.20996c3.2959 0 6.36035 -0.999023 8.90723 -2.70996z" />
+    <glyph glyph-name="hat-cowboy-side" unicode="&#xf8c1;" horiz-adv-x="640" 
+d="M260.8 156.94l98.0098 -84.4805c78.1904 -67.3896 129.98 -104.46 233.19 -104.46h-546.12c-14.0498 0 -27.1299 7.53027 -35.8799 20.6396c-9 13.4707 -12.1201 30.7002 -8.57031 47.3008c20.04 93.3398 85.5703 156.06 162.971 156.06
+c34.3994 0 67.7695 -12.1201 96.3994 -35.0596zM495.45 175.23c114.95 -7.90039 144.55 -101.841 144.55 -127.23c0 -26.4922 -21.5078 -48 -48 -48c-97.0996 0 -141.24 35.46 -212.31 96.7002l-98 84.4795c-35.29 28.2705 -75.5 42.8203 -117.29 42.8203
+c-7.09082 0 -13.8906 -1.16992 -20.79 -2l6.88965 65.21c2.96094 27.6465 23.6035 50.1143 50.3496 55.79l191.15 40.5898c4.31055 0.916992 8.73828 1.34277 13.3203 1.34277c31.6191 0 57.9131 -22.9785 63.0801 -53.1328z" />
+    <glyph glyph-name="mouse" unicode="&#xf8cc;" horiz-adv-x="384" 
+d="M0 96v128h384v-128c0 -88.3066 -71.6934 -160 -160 -160h-64c-88.3066 0 -160 71.6934 -160 160zM176 448v-192h-176v32c0 88.3066 71.6934 160 160 160h16zM224 448c88.3066 0 160 -71.6934 160 -160v-32h-176v192h16z" />
+    <glyph glyph-name="record-vinyl" unicode="&#xf8d9;" 
+d="M256 296c57.3994 0 104 -46.6006 104 -104s-46.6006 -104 -104 -104s-104 46.6006 -104 104s46.6006 104 104 104zM256 168c13.2461 0 24 10.7539 24 24s-10.7539 24 -24 24s-24 -10.7539 -24 -24s10.7539 -24 24 -24zM256 440c137 0 248 -111 248 -248
+s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM256 64c70.6455 0 128 57.3545 128 128s-57.3545 128 -128 128s-128 -57.3545 -128 -128s57.3545 -128 128 -128z" />
+    <glyph glyph-name="caravan" unicode="&#xf8ff;" horiz-adv-x="640" 
+d="M416 240c8.83105 0 16 -7.16895 16 -16s-7.16895 -16 -16 -16s-16 7.16895 -16 16s7.16895 16 16 16zM624 128c8.83105 0 16 -7.16895 16 -16v-32c0 -8.83105 -7.16895 -16 -16 -16h-336c0 -52.9834 -43.0166 -96 -96 -96s-96 43.0166 -96 96h-32
+c-35.3223 0 -64 28.6777 -64 64v256c0 35.3223 28.6777 64 64 64h352c88.3066 0 160 -71.6934 160 -160v-160h48zM192 16c26.4795 0.0273438 47.9727 21.5205 48 48c0 26.4922 -21.5078 48 -48 48s-48 -21.5078 -48 -48s21.5078 -48 48 -48zM256 256v64
+c0 17.6611 -14.3389 32 -32 32h-128c-17.6611 0 -32 -14.3389 -32 -32v-64c0 -17.6611 14.3389 -32 32 -32h128c17.6611 0 32 14.3389 32 32zM448 128v192c0 17.6611 -14.3389 32 -32 32h-64c-17.6611 0 -32 -14.3389 -32 -32v-192h128z" />
+  </font>
+</defs></svg>
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-solid-900.ttf b/scaladoc/resources/dotty_res/webfonts/fa-solid-900.ttf
new file mode 100644
index 000000000000..f33e8162997a
Binary files /dev/null and b/scaladoc/resources/dotty_res/webfonts/fa-solid-900.ttf differ
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-solid-900.woff b/scaladoc/resources/dotty_res/webfonts/fa-solid-900.woff
new file mode 100644
index 000000000000..73c1a4d5d156
Binary files /dev/null and b/scaladoc/resources/dotty_res/webfonts/fa-solid-900.woff differ
diff --git a/scaladoc/resources/dotty_res/webfonts/fa-solid-900.woff2 b/scaladoc/resources/dotty_res/webfonts/fa-solid-900.woff2
new file mode 100644
index 000000000000..dc52d954d8d7
Binary files /dev/null and b/scaladoc/resources/dotty_res/webfonts/fa-solid-900.woff2 differ
diff --git a/scaladoc/src/dotty/tools/scaladoc/DocContext.scala b/scaladoc/src/dotty/tools/scaladoc/DocContext.scala
index c63fbf6f315f..a10be62644f3 100644
--- a/scaladoc/src/dotty/tools/scaladoc/DocContext.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/DocContext.scala
@@ -66,14 +66,25 @@ extension (r: report.type)
   def warn(m: String, e: Throwable)(using CompilerContext): Unit =
     r.warning(s"$m: ${throwableToString(e)}")
 
+  def echo(m: String)(using CompilerContext): Unit =
+    r.echo(m)
+
 case class NavigationNode(name: String, dri: DRI, nested: Seq[NavigationNode])
 
 case class DocContext(args: Scaladoc.Args, compilerContext: CompilerContext):
   lazy val sourceLinks = SourceLinks.load(args.sourceLinks, args.revision)(using compilerContext)
+
+  lazy val snippetCompilerArgs = snippets.SnippetCompilerArgs.load(args.snippetCompiler)(using compilerContext)
+
+  lazy val snippetChecker = snippets.SnippetChecker(args)(using compilerContext)
+
   lazy val staticSiteContext = args.docsRoot.map(path => StaticSiteContext(
       File(path).getAbsoluteFile(),
       args,
-      sourceLinks
+      sourceLinks,
+      snippetCompilerArgs,
+      snippetChecker
     )(using compilerContext))
 
+
   val externalDocumentationLinks = args.externalMappings
diff --git a/scaladoc/src/dotty/tools/scaladoc/ExternalDocLink.scala b/scaladoc/src/dotty/tools/scaladoc/ExternalDocLink.scala
index 7d4bdaeaa8df..6a7b84aec0e9 100644
--- a/scaladoc/src/dotty/tools/scaladoc/ExternalDocLink.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/ExternalDocLink.scala
@@ -18,31 +18,44 @@ enum DocumentationKind:
   case Scaladoc3 extends DocumentationKind
 
 object ExternalDocLink:
-  def parse(mapping: String): Either[String, ExternalDocLink] =
-    def fail(msg: String) = Left(s"Unable to process external mapping $mapping. $msg")
+  private def fail(mapping: String, msg: String) = Left(s"Unable to process external mapping $mapping. $msg")
+
+  private def tryParse[T](mapping: String, descr: String)(op: => T): Either[String, T] = Try(op) match {
+    case Success(v) => Right(v)
+    case Failure(e) => fail(mapping, s"Unable to parse $descr. Exception $e occured")
+  }
 
-    def tryParse[T](descr: String)(op: => T): Either[String, T] = Try(op) match {
-      case Success(v) => Right(v)
-      case Failure(e) => fail(s"Unable to parse $descr. Exception $e occured")
-    }
+  def parseLegacy(mapping: String): Either[String, ExternalDocLink] =
+    mapping.split("#").toList match
+      case path :: apiUrl :: Nil => for {
+        url <- tryParse(mapping, "url")(URL(apiUrl))
+      } yield ExternalDocLink(
+        List(s"$path.*".r),
+        url,
+        DocumentationKind.Scaladoc2,
+        None
+      )
+      case _ => fail(mapping, "Wrong format of legacy external mapping. path#apiUrl format is accepted.")
+
+  def parse(mapping: String): Either[String, ExternalDocLink] =
 
     def parsePackageList(elements: List[String]) = elements match
-     case List(urlStr) => tryParse("packageList")(Some(URL(urlStr)))
+     case List(urlStr) => tryParse(mapping, "packageList")(Some(URL(urlStr)))
      case Nil => Right(None)
-     case other => fail(s"Provided multiple package lists: $other")
+     case other => fail(mapping, s"Provided multiple package lists: $other")
 
     def doctoolByName(name: String) = name match
       case "javadoc" => Right(DocumentationKind.Javadoc)
       case "scaladoc2" => Right(DocumentationKind.Scaladoc2)
       case "scaladoc3" => Right(DocumentationKind.Scaladoc3)
-      case other => fail(s"Unknown doctool: $other")
+      case other => fail(mapping, s"Unknown doctool: $other")
 
 
     mapping.split("::").toList match
       case regexStr :: docToolStr :: urlStr :: rest =>
         for {
-          regex <- tryParse("regex")(regexStr.r)
-          url <- tryParse("url")(URL(urlStr))
+          regex <- tryParse(mapping, "regex")(regexStr.r)
+          url <- tryParse(mapping, "url")(URL(urlStr))
           doctool <- doctoolByName(docToolStr)
           packageList <- parsePackageList(rest)
         } yield ExternalDocLink(
@@ -52,4 +65,4 @@ object ExternalDocLink:
             packageList
           )
       case _ =>
-        fail("Accepted format: `regexStr::docToolStr::urlStr[::rest]`")
\ No newline at end of file
+        fail(mapping, "Accepted format: `regexStr::docToolStr::urlStr[::rest]`")
\ No newline at end of file
diff --git a/scaladoc/src/dotty/tools/scaladoc/Inkuire.scala b/scaladoc/src/dotty/tools/scaladoc/Inkuire.scala
new file mode 100644
index 000000000000..f1b9414c9835
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/Inkuire.scala
@@ -0,0 +1,377 @@
+package dotty.tools.scaladoc
+
+import dotty.tools.scaladoc.util._
+
+object Inkuire {
+
+  var db = InkuireDb(Seq.empty, Map.empty, Seq.empty, Map.empty)
+  var implicitConversions: Seq[(Option[TypeLike], Type)] = Seq.empty
+
+  def beforeSave(): Unit = {
+    db = db.copy(
+      functions = functions.sortBy(_.hashCode),
+      types = db.types.toSeq.sortBy(_._1.uuid).toMap,
+      implicitConversions = implicitConversions.collect {
+        case (Some(from), to) => from -> to
+      }.sortBy(_._1.hashCode)
+    )
+  }
+
+  def generateInkuireConfig(externalMappings: Seq[String]): String = {
+    val paths =
+      List("../inkuire-db.json").map(jsonString)
+        // TODO: #13243
+        // ++ externalMappings.map(_ + "../inkuire-db.json")).map(jsonString)
+    jsonObject(("inkuirePaths", jsonList(paths))).toString
+  }
+
+  def curry(e: Signature): Signature = {
+    e.result.typ match
+      case t: Type if t.name.name == s"Function${t.params.size-1}" =>
+        curry(
+          e.copy(
+            arguments = e.arguments ++ t.params.init.map(_.typ).map(Contravariance(_)),
+            result = Covariance(t.params.last.typ)
+          )
+        )
+      case _ => e
+  }
+
+  def functions: Seq[ExternalSignature] = Inkuire.db.functions.flatMap { func =>
+    val fromConversions = Inkuire.implicitConversions.filter { ic =>
+      func.signature.receiver.nonEmpty && matchingICTypes(ic._2, func.signature.receiver.get.typ)
+    }.map {
+      case (Some(from), to) =>
+        func.copy(
+          signature = func.signature.copy(
+            receiver = func.signature.receiver.map { rcvr =>
+              Contravariance(
+                newReceiver(rcvr.typ, to, from)
+              )
+            }
+          )
+        )
+      case (None, to) =>
+        func.copy(
+          signature = func.signature.copy(
+            receiver = None
+          )
+        )
+    }
+    Seq(func) ++ fromConversions
+  }
+  .distinct
+
+  def matchingICTypes(a: TypeLike, b: TypeLike): Boolean = (a, b) match {
+    case (a: Type, b: Type) if a.params.size == 0 && b.params.size == 0 && a.itid == b.itid => true
+    case (a: Type, b: Type) if a.params.size == 1 && b.params.size == 1 && a.itid == b.itid =>
+      a.params.head.typ.isInstanceOf[Type] && a.params.head.typ.asInstanceOf[Type].isVariable &&
+        b.params.head.typ.isInstanceOf[Type] && b.params.head.typ.asInstanceOf[Type].isVariable
+    case _ => false
+  }
+
+  def newReceiver(old: TypeLike, to: TypeLike, from: TypeLike): TypeLike = (old, to) match {
+    case (a: Type, b: Type) if a.params.size == 0 && b.params.size == 0 && a.itid == b.itid => from
+    case (a: Type, b: Type) if a.params.size == 1 && b.params.size == 1 && a.itid == b.itid
+      && a.params.head.typ.isInstanceOf[Type] && a.params.head.typ.asInstanceOf[Type].isVariable &&
+        b.params.head.typ.isInstanceOf[Type] && b.params.head.typ.asInstanceOf[Type].isVariable =>
+      if from.isInstanceOf[Type] && from.asInstanceOf[Type].params.size == 1 && from.asInstanceOf[Type].params.head.typ.isInstanceOf[Type] && from.asInstanceOf[Type].params.head.typ.asInstanceOf[Type].isVariable then
+        from.asInstanceOf[Type].copy(
+          params = Seq(Contravariance(a.params.head.typ.asInstanceOf[Type]))
+        )
+      else if from.isInstanceOf[Type] && from.asInstanceOf[Type].isVariable then
+        a.params.head.typ.asInstanceOf[Type]
+      else
+        from
+    case _ => old
+  }
+
+  case class InkuireDb(
+    functions:           Seq[ExternalSignature],
+    types:               Map[ITID, (Type, Seq[Type])],
+    implicitConversions: Seq[(TypeLike, Type)],
+    typeAliases:         Map[ITID, TypeLike]
+  )
+
+  case class ITID(uuid: String, isParsed: Boolean)
+
+  case class Signature(
+    receiver:  Option[Contravariance],
+    arguments: Seq[Contravariance],
+    result:    Covariance,
+    context:   SignatureContext
+  ) {
+    def typesWithVariances: Seq[Variance] = receiver.toSeq ++ arguments ++ Seq(result)
+  }
+
+  object Signature {
+    def apply(receiver: Option[TypeLike], arguments: Seq[TypeLike], result: TypeLike, context: SignatureContext): Signature =
+      Signature(receiver.map(Contravariance(_)), arguments.map(Contravariance(_)), Covariance(result), context)
+  }
+
+  case class ExternalSignature(
+    signature:    Signature,
+    name:         String,
+    packageName:  String,
+    uri:          String,
+    entryType:    String
+  )
+
+  sealed trait TypeLike
+
+  case class Type(
+    name:             TypeName,
+    params:           Seq[Variance] = Seq.empty,
+    nullable:         Boolean = false,
+    itid:             Option[ITID] = None,
+    isVariable:       Boolean = false,
+    isStarProjection: Boolean = false,
+    isUnresolved:     Boolean = false
+  ) extends TypeLike
+
+  case class AndType(left: TypeLike, right: TypeLike) extends TypeLike
+  case class OrType(left: TypeLike, right: TypeLike) extends TypeLike
+
+  case class TypeLambda(args: Seq[Type], result: TypeLike) extends TypeLike
+
+  object TypeLambda {
+    def argument(name: String): Type =
+      val uuid = s"external-type-lambda-arg-$name"
+      Inkuire.Type(
+        name = Inkuire.TypeName(name),
+        itid = Some(Inkuire.ITID(uuid, isParsed = false)),
+        isVariable = true
+      )
+  }
+
+  object Type {
+    def unresolved: Type =
+      Type(
+        name = TypeName("<unresolved>"),
+        itid = Some(
+          ITID(
+            uuid = "<unresolved>",
+            isParsed = false
+          )
+        )
+      )
+
+    def StarProjection: Type =
+      Type(
+        name = TypeName("_"),
+        itid = Some(ITID("_", isParsed = false)),
+        isStarProjection = true
+      )
+  }
+
+  case class TypeName(name: String) {
+    override def hashCode: Int = name.toLowerCase.hashCode
+
+    override def equals(obj: Any): Boolean = {
+      obj match {
+        case o: TypeName => this.name.toLowerCase == o.name.toLowerCase
+        case _ => false
+      }
+    }
+
+    override def toString: String = name
+  }
+
+  case class SignatureContext(
+    vars:        Set[String],
+    constraints: Map[String, Seq[TypeLike]]
+  ) {
+    override def hashCode: Int = vars.size.hashCode
+
+    override def equals(obj: Any): Boolean =
+      obj match {
+        case other: SignatureContext if this.vars.size == other.vars.size => true
+        case _ => false
+      }
+  }
+
+  object SignatureContext {
+    def empty: SignatureContext = SignatureContext(Set.empty, Map.empty)
+  }
+
+  sealed abstract class Variance {
+    val typ: TypeLike
+  }
+
+  case class Covariance(typ: TypeLike) extends Variance
+
+  case class Contravariance(typ: TypeLike) extends Variance
+
+  case class Invariance(typ: TypeLike) extends Variance
+
+  case class UnresolvedVariance(typ: TypeLike) extends Variance
+
+  object EngineModelSerializers {
+    def serialize(db: InkuireDb): JSON = {
+      jsonObject(
+        ("types", serialize(db.types)),
+        ("functions", jsonList(db.functions.map(serialize))),
+        ("implicitConversions", jsonList(db.implicitConversions.map(serializeConversion))),
+        ("typeAliases", serializeTypeAliases(db.typeAliases))
+      )
+    }
+
+    private def serializeConversion(conversion: (TypeLike, Type)): JSON = {
+      jsonList(
+        Seq(
+          serialize(conversion._1),
+          serialize(conversion._2)
+        )
+      )
+    }
+
+    private def serialize(types: Map[ITID, (Type, Seq[Type])]): JSON = {
+      jsonObject((
+        types.toList.map {
+          case (itid, v) =>
+            (serializeAsKey(itid), serialize(v))
+        }
+      )*)
+    }
+
+    private def serializeTypeAliases(types: Map[ITID, TypeLike]): JSON = {
+      jsonObject((
+        types.toList.map {
+          case (itid, v) =>
+            (serializeAsKey(itid), serialize(v))
+        }
+      )*)
+    }
+
+    private def serializeAsKey(itid: ITID): String = {
+      s"""${itid.isParsed}=${itid.uuid}"""
+    }
+
+    private def serialize(v: (Type, Seq[Type])): JSON = {
+      jsonList(
+        Seq(
+          serialize(v._1),
+          jsonList(v._2.map(serialize))
+        )
+      )
+    }
+
+    private def serialize(t: TypeLike): JSON = t match {
+      case t: Type =>
+        jsonObject(
+          ("name", serialize(t.name)),
+          ("params", jsonList(t.params.map(serialize))),
+          ("nullable", serialize(t.nullable)),
+          ("itid", serialize(t.itid.get)),
+          ("isVariable", serialize(t.isVariable)),
+          ("isStarProjection", serialize(t.isStarProjection)),
+          ("isUnresolved", serialize(t.isUnresolved)),
+          ("typelikekind", serialize("type"))
+        )
+      case t: OrType =>
+        jsonObject(
+          ("left", serialize(t.left)),
+          ("right", serialize(t.right)),
+          ("typelikekind", serialize("ortype"))
+        )
+      case t: AndType =>
+        jsonObject(
+          ("left", serialize(t.left)),
+          ("right", serialize(t.right)),
+          ("typelikekind", serialize("andtype"))
+        )
+      case t: TypeLambda =>
+        jsonObject(
+          ("args", jsonList(t.args.map(serialize))),
+          ("result", serialize(t.result)),
+          ("typelikekind", serialize("typelambda"))
+        )
+    }
+
+    private def serialize(b: Boolean): JSON = {
+      if b then rawJSON("true") else rawJSON("false")
+    }
+
+    private def serialize(itid: ITID): JSON = {
+      jsonObject(
+        ("uuid", serialize(itid.uuid)),
+        ("isParsed", serialize(itid.isParsed))
+      )
+    }
+
+    private def serialize(s: TypeName): JSON = {
+      jsonObject(
+        ("name", serialize(s.name))
+      )
+    }
+
+    private def serialize(v: Variance): JSON = v match {
+      case _: Invariance =>
+        jsonObject(
+          ("typ", serialize(v.typ)),
+          ("variancekind", serialize("invariance"))
+        )
+      case _: Covariance =>
+        jsonObject(
+          ("typ", serialize(v.typ)),
+          ("variancekind", serialize("covariance"))
+        )
+      case _: Contravariance =>
+        jsonObject(
+          ("typ", serialize(v.typ)),
+          ("variancekind", serialize("contravariance"))
+        )
+      case _: UnresolvedVariance =>
+        jsonObject(
+          ("typ", serialize(v.typ)),
+          ("variancekind", serialize("unresolved"))
+        )
+    }
+
+    private def serialize(e: ExternalSignature): JSON = {
+      jsonObject(
+        ("signature", serialize(e.signature)),
+        ("name", serialize(e.name)),
+        ("packageName", serialize(e.packageName)),
+        ("uri", serialize(e.uri)),
+        ("entryType", serialize(e.entryType))
+      )
+    }
+
+    private def serialize(s: String): JSON = {
+      jsonString(s)
+    }
+
+    private def serialize(s: Signature): JSON = {
+      jsonObject(
+        ("receiver", serialize(s.receiver)),
+        ("arguments", jsonList(s.arguments.map(serialize))),
+        ("result", serialize(s.result)),
+        ("context", serialize(s.context))
+      )
+    }
+
+    private def serialize(o: Option[Contravariance]): JSON = {
+      o.fold(rawJSON("null")) { v =>
+        serialize(v)
+      }
+    }
+
+    private def serialize(c: SignatureContext): JSON = {
+      jsonObject(
+        ("vars", jsonList(c.vars.toSeq.map(serialize))),
+        ("constraints", serializeConstraints(c.constraints))
+      )
+    }
+
+    private def serializeConstraints(constraints: Map[String, Seq[TypeLike]]): JSON = {
+      jsonObject((
+        constraints.toList.map {
+          case (name, vs) =>
+            (name, jsonList(vs.map(serialize)))
+        }
+      )*)
+    }
+  }
+
+}
diff --git a/scaladoc/src/dotty/tools/scaladoc/PathBased.scala b/scaladoc/src/dotty/tools/scaladoc/PathBased.scala
index d2f72d09bfad..231fe8989c26 100644
--- a/scaladoc/src/dotty/tools/scaladoc/PathBased.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/PathBased.scala
@@ -7,7 +7,7 @@ case class PathBased[T](entries: List[PathBased.Entry[T]], projectRoot: Path):
     if path.isAbsolute then
       if path.startsWith(projectRoot) then get(projectRoot.relativize(path))
       else None
-    else entries.find(_.path.forall(p => path.startsWith(p))).map(entry =>
+    else entries.filter(_.path.forall(p => path.startsWith(p))).maxByOption(_.path.map(_.toString.length)).map(entry =>
       PathBased.Result(entry.path.fold(path)(_.relativize(path)), entry.elem)
     )
 
@@ -36,4 +36,4 @@ object PathBased:
     }.toList
 
     ParsingResult(errors, PathBased(entries, projectRoot))
-  }
\ No newline at end of file
+  }
diff --git a/scaladoc/src/dotty/tools/scaladoc/ScalaModuleCreator.scala b/scaladoc/src/dotty/tools/scaladoc/ScalaModuleProvider.scala
similarity index 100%
rename from scaladoc/src/dotty/tools/scaladoc/ScalaModuleCreator.scala
rename to scaladoc/src/dotty/tools/scaladoc/ScalaModuleProvider.scala
diff --git a/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala b/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala
index 4365e7b06198..154209b5e1e5 100644
--- a/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala
@@ -2,17 +2,21 @@ package dotty.tools.scaladoc
 
 import java.util.ServiceLoader
 import java.io.File
+import java.io.FileWriter
 import java.util.jar._
 import collection.JavaConverters._
 import collection.immutable.ArraySeq
 
-import java.nio.file.Files
+import java.nio.file.{ Files, Paths }
 
 import dotty.tools.dotc.config.Settings._
-import dotty.tools.dotc.config.CommonScalaSettings
+import dotty.tools.dotc.config.{ CommonScalaSettings, AllScalaSettings }
 import dotty.tools.dotc.reporting.Reporter
 import dotty.tools.dotc.core.Contexts._
 
+import dotty.tools.scaladoc.Inkuire
+import dotty.tools.scaladoc.Inkuire._
+
 object Scaladoc:
   enum CommentSyntax:
     case Wiki
@@ -31,6 +35,7 @@ object Scaladoc:
     tastyDirs: Seq[File] = Nil,
     tastyFiles: Seq[File] = Nil,
     classpath: String = "",
+    bootclasspath: String = "",
     output: File,
     docsRoot: Option[String] = None,
     projectVersion: Option[String] = None,
@@ -49,6 +54,13 @@ object Scaladoc:
     includePrivateAPI: Boolean = false,
     docCanonicalBaseUrl: String = "",
     documentSyntheticTypes: Boolean = false,
+    snippetCompiler: List[String] = Nil,
+    noLinkWarnings: Boolean = false,
+    versionsDictionaryUrl: Option[String] = None,
+    generateInkuire : Boolean = false,
+    apiSubdirectory : Boolean = false,
+    scastieConfiguration: String = "",
+    defaultTemplate: Option[String] = None,
   )
 
   def run(args: Array[String], rootContext: CompilerContext): Reporter =
@@ -65,7 +77,7 @@ object Scaladoc:
       val tastyFiles = parsedArgs.tastyFiles ++ parsedArgs.tastyDirs.flatMap(listTastyFiles)
 
       if !ctx.reporter.hasErrors then
-        val updatedArgs = parsedArgs.copy(tastyDirs = Nil, tastyFiles = tastyFiles)
+        val updatedArgs = parsedArgs.copy(tastyDirs = parsedArgs.tastyDirs, tastyFiles = tastyFiles)
 
         if (parsedArgs.output.exists()) util.IO.delete(parsedArgs.output)
 
@@ -73,9 +85,27 @@ object Scaladoc:
         report.inform("Done")
       else report.error("Failure")
 
+      if parsedArgs.generateInkuire then dumpInkuireDB(parsedArgs.output.getAbsolutePath, parsedArgs)
     }
+
     ctx.reporter
 
+  def dumpInkuireDB(output: String, parsedArgs: Args) = {
+    val dbPath = Paths.get(output, "inkuire-db.json")
+    val dbFile = dbPath.toFile()
+    dbFile.createNewFile()
+    val dbWriter = new FileWriter(dbFile, false)
+    Inkuire.beforeSave()
+    dbWriter.write(s"${EngineModelSerializers.serialize(Inkuire.db)}")
+    dbWriter.close()
+
+    val configPath = Paths.get(output, "scripts/inkuire-config.json")
+    val configFile = configPath.toFile()
+    configFile.createNewFile()
+    val configWriter = new FileWriter(configFile, false)
+    configWriter.write(Inkuire.generateInkuireConfig(parsedArgs.externalMappings.map(_.documentationUrl.toString)))
+    configWriter.close()
+  }
 
   def extract(args: Array[String], rootCtx: CompilerContext): (Option[Scaladoc.Args], CompilerContext) =
     val newContext = rootCtx.fresh
@@ -100,7 +130,15 @@ object Scaladoc:
       }
 
     val commonScalaSettings = (new SettingGroup with CommonScalaSettings).allSettings
-    allSettings.filter(commonScalaSettings.contains).foreach(setInGlobal)
+    val allScalaSettings = (new SettingGroup with AllScalaSettings).allSettings
+
+    val (shared, other) = allSettings
+      .filter(s => !s.isDefaultIn(summary.sstate))
+      .filter(allScalaSettings.contains)
+      .partition(commonScalaSettings.contains)
+    shared.foreach(setInGlobal)
+
+    if !other.isEmpty then report.echo(s"Skipping unused scalacOptions: ${other.map(_.name).mkString(", ")}")
 
     def parseTastyRoots(roots: String) =
       roots.split(File.pathSeparatorChar).toList.map(new File(_))
@@ -132,6 +170,8 @@ object Scaladoc:
           CommentSyntax.default
         }
       }
+      val legacySourceLinkList = if legacySourceLink.get.nonEmpty then List(legacySourceLink.get) else Nil
+
       val externalMappings =
         externalDocumentationMappings.get.flatMap( s =>
             ExternalDocLink.parse(s).fold(left => {
@@ -141,6 +181,15 @@ object Scaladoc:
           )
         )
 
+      val legacyExternalMappings =
+        legacyExternalDocumentationMappings.get.flatMap { s =>
+          ExternalDocLink.parseLegacy(s).fold(left => {
+              report.warning(left)
+              None
+            }, right => Some(right)
+          )
+        }
+
       val socialLinksParsed =
         socialLinks.get.flatMap { s =>
           SocialLinks.parse(s).fold(left => {
@@ -155,7 +204,7 @@ object Scaladoc:
       val destFile = outputDir.nonDefault.fold(defaultDest())(_.file)
       val printableProjectName = projectName.nonDefault.fold("")("for " + _ )
       report.inform(
-        s"Generating documenation $printableProjectName in $destFile")
+        s"Generating documentation $printableProjectName in $destFile")
 
       if deprecatedSkipPackages.get.nonEmpty then report.warning(deprecatedSkipPackages.description)
 
@@ -164,15 +213,16 @@ object Scaladoc:
         dirs,
         validFiles,
         classpath.get,
+        bootclasspath.get,
         destFile,
         siteRoot.nonDefault,
         projectVersion.nonDefault,
         projectLogo.nonDefault,
         projectFooter.nonDefault,
         parseSyntax,
-        sourceLinks.get,
+        sourceLinks.get ++ legacySourceLinkList,
         revision.nonDefault,
-        externalMappings,
+        externalMappings ++ legacyExternalMappings,
         socialLinksParsed,
         skipById.get ++ deprecatedSkipPackages.get,
         skipByRegex.get,
@@ -181,7 +231,14 @@ object Scaladoc:
         groups.get,
         visibilityPrivate.get,
         docCanonicalBaseUrl.get,
-        YdocumentSyntheticTypes.get
+        YdocumentSyntheticTypes.get,
+        snippetCompiler.get,
+        noLinkWarnings.get,
+        versionsDictionaryUrl.nonDefault,
+        generateInkuire.get,
+        apiSubdirectory.get,
+        scastieConfiguration.get,
+        defaultTemplate.nonDefault
       )
       (Some(docArgs), newContext)
     }
@@ -189,7 +246,6 @@ object Scaladoc:
   private [scaladoc] def run(args: Args)(using ctx: CompilerContext): DocContext =
     given docContext: DocContext = new DocContext(args, ctx)
     val module = ScalaModuleProvider.mkModule()
-
     new dotty.tools.scaladoc.renderers.HtmlRenderer(module.rootPackage, module.members).render()
     report.inform("generation completed successfully")
     docContext
diff --git a/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala b/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala
index 119305a68ad2..0d6bc60f281a 100644
--- a/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala
@@ -9,23 +9,20 @@ import collection.immutable.ArraySeq
 import java.nio.file.Files
 
 import dotty.tools.dotc.config.Settings._
-import dotty.tools.dotc.config.CommonScalaSettings
+import dotty.tools.dotc.config.AllScalaSettings
 import dotty.tools.scaladoc.Scaladoc._
 import dotty.tools.dotc.config.Settings.Setting.value
 import dotty.tools.dotc.config.Properties._
 import dotty.tools.dotc.config.CliCommand
 import dotty.tools.dotc.core.Contexts._
 
-class ScaladocSettings extends SettingGroup with CommonScalaSettings:
+class ScaladocSettings extends SettingGroup with AllScalaSettings:
   val unsupportedSettings = Seq(
-    // Options that we like to support
-    bootclasspath, extdirs, javabootclasspath, encoding, usejavacp,
     // Needed for plugin architecture
-    plugin,disable,require, pluginsDir, pluginOptions,
-    // we need support for sourcepath and sourceroot
-    sourcepath, sourceroot
+    plugin, disable, require, pluginsDir, pluginOptions,
   )
 
+
   val projectName: Setting[String] =
     StringSetting("-project", "project title", "The name of the project.", "", aliases = List("-doc-title"))
 
@@ -33,13 +30,16 @@ class ScaladocSettings extends SettingGroup with CommonScalaSettings:
     StringSetting("-project-version", "project version", "The current version of your project.", "", aliases = List("-doc-version"))
 
   val projectLogo: Setting[String] =
-    StringSetting("-project-logo", "project logo filename", "The file that contains the project's logo (in /images).", "", aliases = List("-doc-logo"))
+    StringSetting("-project-logo", "project logo filename", "Path to the file that contains the project's logo. Provided path can be absolute or relative to the project root directory.", "", aliases = List("-doc-logo"))
 
   val projectFooter: Setting[String] = StringSetting("-project-footer", "project footer", "A footer on every Scaladoc page.", "", aliases = List("-doc-footer"))
 
   val sourceLinks: Setting[List[String]] =
     MultiStringSetting("-source-links", "sources", SourceLinks.usage)
 
+  val legacySourceLink: Setting[String] =
+    StringSetting("-doc-source-url", "sources", "Legacy option from Scala 2. Use -source-links instead.", "")
+
   val syntax: Setting[String] =
     StringSetting("-comment-syntax", "syntax", "Syntax of the comment used", "")
 
@@ -51,6 +51,9 @@ class ScaladocSettings extends SettingGroup with CommonScalaSettings:
       "Mapping between regexes matching classpath entries and external documentation. " +
         "'regex::[scaladoc|scaladoc|javadoc]::path' syntax is used")
 
+  val legacyExternalDocumentationMappings: Setting[List[String]] =
+    MultiStringSetting("-doc-external-doc", "legacy-external-mappings", "Legacy option from Scala 2. Mapping betweeen path and external documentation. Use -external-mappings instead.")
+
   val socialLinks: Setting[List[String]] =
     MultiStringSetting("-social-links", "social-links",
       "Links to social sites. '[github|twitter|gitter|discord]::link' syntax is used. " +
@@ -92,5 +95,45 @@ class ScaladocSettings extends SettingGroup with CommonScalaSettings:
     "./docs"
   )
 
+  val noLinkWarnings: Setting[Boolean] = BooleanSetting(
+    "-no-link-warnings",
+    "Avoid warnings for ambiguous and incorrect links in members look up. Doesn't affect warnings for incorrect links of assets etc.",
+    false
+  )
+
+  val versionsDictionaryUrl: Setting[String] = StringSetting(
+    "-versions-dictionary-url",
+    "versions dictionary url",
+    "A URL pointing to a JSON document containing a dictionary `version label -> documentation location`. " +
+      "The JSON file has single property \"versions\" that holds dictionary of labels of specific docs and URL pointing to their index.html top-level file. " +
+      "Useful for libraries that maintain different versions of their documentation.",
+    ""
+  )
+
   val YdocumentSyntheticTypes: Setting[Boolean] =
-    BooleanSetting("-Ydocument-synthetic-types", "Documents intrinsic types e. g. Any, Nothing. Setting is useful only for stdlib", false)
+    BooleanSetting("-Ydocument-synthetic-types", "Attach pages with documentation of the intrinsic types e. g. Any, Nothing to the docs. Setting is useful only for stdlib.", false)
+
+  val snippetCompiler: Setting[List[String]] =
+    MultiStringSetting("-snippet-compiler", "snippet-compiler", snippets.SnippetCompilerArgs.usage)
+
+  val generateInkuire: Setting[Boolean] =
+    BooleanSetting("-Ygenerate-inkuire", "Generates InkuireDB and enables Hoogle-like searches", false)
+
+  val apiSubdirectory: Setting[Boolean] =
+    BooleanSetting("-Yapi-subdirectory", "Put the API documentation pages inside a directory `api/`", false)
+
+  val scastieConfiguration: Setting[String] =
+    StringSetting("-scastie-configuration", "Scastie configuration", "Additional configuration passed to Scastie in code snippets", "")
+
+  val defaultTemplate: Setting[String] =
+    StringSetting(
+      "-default-template",
+      "default template used by static site",
+      "The static site is generating empty files for indexes that haven't been provided explicitly in a sidebar/missing index.html in directory. " +
+        "User can specify what default template should be used for such indexes. It can be useful for providing generic templates that interpolate some common settings, like title, or can have some custom html embedded.",
+      ""
+    )
+
+
+  def scaladocSpecificSettings: Set[Setting[_]] =
+    Set(sourceLinks, legacySourceLink, syntax, revision, externalDocumentationMappings, socialLinks, skipById, skipByRegex, deprecatedSkipPackages, docRootContent, snippetCompiler, generateInkuire, scastieConfiguration)
diff --git a/scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala b/scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala
index 64000c00d872..a9e300040fb8 100644
--- a/scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala
@@ -12,37 +12,43 @@ def pathToString(p: Path) =
 
 trait SourceLink:
   val path: Option[Path] = None
-  def render(memberName: String, path: Path, operation: String, line: Option[Int]): String
+  def render(memberName: String, path: Path, operation: String, line: Option[Int], optionalRevision: Option[String]): String
+  def repoSummary: RepoSummary
 
 case class TemplateSourceLink(val urlTemplate: String) extends SourceLink:
   override val path: Option[Path] = None
-  override def render(memberName: String, path: Path, operation: String, line: Option[Int]): String =
+  override def render(memberName: String, path: Path, operation: String, line: Option[Int], optionalRevision: Option[String]): String =
     val pathString = "/" + pathToString(path)
     val mapping = Map(
       "\\{\\{ path \\}\\}".r -> pathString,
       "\\{\\{ line \\}\\}".r -> line.fold("")(_.toString),
       "\\{\\{ ext \\}\\}".r -> Some(
-        pathString).filter(_.lastIndexOf(".") == -1).fold("")(p => p.substring(p.lastIndexOf("."))
+        pathString).filter(_.lastIndexOf(".") != -1).fold("")(p => p.substring(p.lastIndexOf("."))
       ),
       "\\{\\{ path_no_ext \\}\\}".r -> Some(
-        pathString).filter(_.lastIndexOf(".") == -1).fold(pathString)(p => p.substring(0, p.lastIndexOf("."))
+        pathString).filter(_.lastIndexOf(".") != -1).fold(pathString)(p => p.substring(0, p.lastIndexOf("."))
       ),
       "\\{\\{ name \\}\\}".r -> memberName
     )
     mapping.foldLeft(urlTemplate) {
       case (sourceLink, (regex, value)) => regex.replaceAllIn(sourceLink, Regex.quoteReplacement(value))
     }
+  override def repoSummary = UnknownRepoSummary
 
+sealed class RepoSummary
+case class DefinedRepoSummary(origin: String, org: String, repo: String) extends RepoSummary
+case object UnknownRepoSummary extends RepoSummary // we cannot easily get that information from template source links
 
-case class WebBasedSourceLink(prefix: String, revision: String, subPath: String) extends SourceLink:
+case class WebBasedSourceLink(repoSummary: RepoSummary, prefix: String, revision: String, subPath: String) extends SourceLink:
   override val path: Option[Path] = None
-  override def render(memberName: String, path: Path, operation: String, line: Option[Int]): String =
+  override def render(memberName: String, path: Path, operation: String, line: Option[Int], optionalRevision: Option[String] = None): String =
     val action = if operation == "view" then "blob" else operation
+    val finalRevision = optionalRevision.getOrElse(revision)
     val linePart = line.fold("")(l => s"#L$l")
-    s"$prefix/$action/$revision$subPath/${pathToString(path)}$linePart"
+    s"$prefix/$action/$finalRevision$subPath/${pathToString(path)}$linePart"
 
 class SourceLinkParser(revision: Option[String]) extends ArgParser[SourceLink]:
-  val KnownProvider = raw"(\w+):\/\/([^\/#]+)\/([^\/#]+)(\/[^\/#]+)?(#.+)?".r
+  val KnownProvider = raw"(\w+):\/\/([^\/#]+)\/([^\/#]+)(\/[^#]+)?(#.+)?".r
   val BrokenKnownProvider = raw"(\w+):\/\/.+".r
   val ScalaDocPatten = raw"€\{(TPL_NAME|TPL_OWNER|FILE_PATH|FILE_EXT|FILE_LINE|FILE_PATH_EXT)\}".r
   val SupportedScalaDocPatternReplacements = Map(
@@ -62,6 +68,12 @@ class SourceLinkParser(revision: Option[String]) extends ArgParser[SourceLink]:
 
   def parse(string: String): Either[String, SourceLink] =
     val res = string match
+      case scaladocSetting if ScalaDocPatten.findFirstIn(scaladocSetting).nonEmpty =>
+        val all = ScalaDocPatten.findAllIn(scaladocSetting)
+        val (supported, unsupported) = all.partition(SupportedScalaDocPatternReplacements.contains)
+        if unsupported.nonEmpty then Left(s"Unsupported patterns from scaladoc format are used: ${unsupported.mkString(" ")}")
+        else Right(TemplateSourceLink(supported.foldLeft(string)((template, pattern) =>
+          template.replace(pattern, SupportedScalaDocPatternReplacements(pattern)))))
       case KnownProvider(name, organization, repo, rawRevision, rawSubPath) =>
         val subPath = Option(rawSubPath).fold("")("/" + _.drop(1))
         val pathRev = Option(rawRevision).map(_.drop(1)).orElse(revision)
@@ -72,20 +84,14 @@ class SourceLinkParser(revision: Option[String]) extends ArgParser[SourceLink]:
         name match
           case "github" =>
             withRevision(rev =>
-              WebBasedSourceLink(githubPrefix(organization, repo), rev, subPath))
+              WebBasedSourceLink(DefinedRepoSummary("github", organization, repo), githubPrefix(organization, repo), rev, subPath))
           case "gitlab" =>
             withRevision(rev =>
-              WebBasedSourceLink(gitlabPrefix(organization, repo), rev, subPath))
+              WebBasedSourceLink(DefinedRepoSummary("gitlab", organization, repo), gitlabPrefix(organization, repo), rev, subPath))
           case other =>
             Left(s"'$other' is not a known provider, please provide full source path template.")
       case BrokenKnownProvider("gitlab" | "github") =>
         Left(s"Does not match known provider syntax: `<name>://organization/repository`")
-      case scaladocSetting if ScalaDocPatten.findFirstIn(scaladocSetting).nonEmpty =>
-        val all = ScalaDocPatten.findAllIn(scaladocSetting)
-        val (supported, unsupported) = all.partition(SupportedScalaDocPatternReplacements.contains)
-        if unsupported.nonEmpty then Left(s"Unsupported patterns from scaladoc format are used: ${unsupported.mkString(" ")}")
-        else Right(TemplateSourceLink(supported.foldLeft(string)((template, pattern) =>
-          template.replace(pattern, SupportedScalaDocPatternReplacements(pattern)))))
       case other =>
         Left("Does not match any implemented source link syntax")
     res match {
@@ -96,13 +102,22 @@ class SourceLinkParser(revision: Option[String]) extends ArgParser[SourceLink]:
 
 type Operation = "view" | "edit"
 
-class SourceLinks(val sourceLinks: PathBased[SourceLink]):
-  def pathTo(rawPath: Path, memberName: String = "", line: Option[Int] = None, operation: Operation = "view"): Option[String] =
-    sourceLinks.get(rawPath).map(res => res.elem.render(memberName, res.path, operation, line))
+class SourceLinks(private val sourceLinks: PathBased[SourceLink]):
+  def pathTo(rawPath: Path, memberName: String = "", line: Option[Int] = None, operation: Operation = "view", optionalRevision: Option[String] = None): Option[String] =
+    sourceLinks.get(rawPath).map(res => res.elem.render(memberName, res.path, operation, line, optionalRevision))
 
   def pathTo(member: Member): Option[String] =
     member.sources.flatMap(s => pathTo(s.path, member.name, Option(s.lineNumber).map(_ + 1)))
 
+  def repoSummary(path: Path): Option[RepoSummary] =
+    sourceLinks.get(path).map(_.elem.repoSummary)
+
+  def fullPath(path: Path): Option[Path] =
+    sourceLinks.get(path).map { case PathBased.Result(path, elem) => elem match
+      case e: WebBasedSourceLink => Paths.get(e.subPath, path.toString)
+      case _ => path
+    }
+
 object SourceLinks:
   val usage =
     """Source links provide a mapping between file in documentation and code repository.
@@ -125,7 +140,7 @@ object SourceLinks:
       | €{FILE_PATH}, and €{FILE_LINE} patterns
       |
       |
-      |Template can defined only by subset of sources defined by path prefix represented by `<sub-path>`.
+      |Template can be defined only by subset of sources defined by path prefix represented by `<sub-path>`.
       |In such case paths used in templates will be relativized against `<sub-path>`""".stripMargin
 
   def load(config: Seq[String], revision: Option[String], projectRoot: Path = Paths.get("").toAbsolutePath)(using CompilerContext): SourceLinks =
@@ -140,4 +155,3 @@ object SourceLinks:
         )
         SourceLinks(sourceLinks)
     }
-
diff --git a/scaladoc/src/dotty/tools/scaladoc/api.scala b/scaladoc/src/dotty/tools/scaladoc/api.scala
index cc1ac9a9bc7f..314dcc3c7261 100644
--- a/scaladoc/src/dotty/tools/scaladoc/api.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/api.scala
@@ -40,13 +40,15 @@ enum Modifier(val name: String, val prefix: Boolean):
   case Erased extends Modifier("erased", true)
   case Opaque extends Modifier("opaque", true)
   case Open extends Modifier("open", true)
+  case Transparent extends Modifier("transparent", true)
+  case Infix extends Modifier("infix", true)
 
-case class ExtensionTarget(name: String, signature: Signature, dri: DRI, position: Long)
+case class ExtensionTarget(name: String, typeParams: Seq[TypeParameter], argsLists: Seq[ParametersList], signature: Signature, dri: DRI, position: Long)
 case class ImplicitConversion(from: DRI, to: DRI)
 trait ImplicitConversionProvider { def conversion: Option[ImplicitConversion] }
 trait Classlike
 
-enum Kind(val name: String){
+enum Kind(val name: String):
   case RootPackage extends Kind("")
   case Package extends Kind("package")
   case Class(typeParams: Seq[TypeParameter], argsLists: Seq[ParametersList])
@@ -55,31 +57,30 @@ enum Kind(val name: String){
   case Trait(typeParams: Seq[TypeParameter], argsLists: Seq[ParametersList])
     extends Kind("trait") with Classlike
   case Enum(typeParams: Seq[TypeParameter], argsLists: Seq[ParametersList]) extends Kind("enum") with Classlike
-  case EnumCase(kind: Object.type | Type | Val.type | Class) extends Kind("case")
+  case EnumCase(kind: Object.type | Kind.Type | Val.type | Class) extends Kind("case")
   case Def(typeParams: Seq[TypeParameter], argsLists: Seq[ParametersList])
     extends Kind("def")
   case Extension(on: ExtensionTarget, m: Kind.Def) extends Kind("def")
   case Constructor(base: Kind.Def) extends Kind("def")
   case Var extends Kind("var")
   case Val extends Kind("val")
-  case Exported(m: Kind.Def) extends Kind("export")
+  case Exported(base: Kind) extends Kind("export")
   case Type(concreate: Boolean, opaque: Boolean, typeParams: Seq[TypeParameter])
     extends Kind("type") // should we handle opaque as modifier?
-  case Given(kind: Def | Class, as: Option[Signature], conversion: Option[ImplicitConversion])
+  case Given(kind: Def | Class | Val.type, as: Option[Signature], conversion: Option[ImplicitConversion])
     extends Kind("given") with ImplicitConversionProvider
   case Implicit(kind: Kind.Def | Kind.Val.type, conversion: Option[ImplicitConversion])
     extends Kind(kind.name)  with ImplicitConversionProvider
   case Unknown extends Kind("Unknown")
-}
 
 enum Origin:
   case ImplicitlyAddedBy(name: String, dri: DRI)
   case ExtensionFrom(name: String, dri: DRI)
-  case ExportedFrom(name: String, dri: Option[DRI])
-  case Overrides(overridenMembers: Seq[Overriden])
+  case ExportedFrom(link: Option[Link])
+  case Overrides(overriddenMembers: Seq[Overridden])
   case RegularlyDefined
 
-case class Overriden(name: String, dri: DRI)
+case class Overridden(name: String, dri: DRI)
 
 case class InheritedFrom(name: String, dri: DRI)
 
@@ -116,15 +117,20 @@ case class TypeParameter(
   signature: Signature
 )
 
-// TODO (longterm) properly represent signatures
 case class Link(name: String, dri: DRI)
-type Signature = Seq[String | Link]
 
-object Signature:
-  def apply(names: (String | Link)*): Signature = names // TO batter dotty shortcommings in union types
+sealed trait SignaturePart:
+  val name: String
 
-extension (s: Signature)
-  def join(a: Signature): Signature = s ++ a
+// TODO (longterm) properly represent signatures
+case class Type(override val name: String, dri: Option[DRI]) extends SignaturePart
+case class Keyword(override val name: String) extends SignaturePart
+case class Plain(override val name: String) extends SignaturePart
+
+type Signature = List[SignaturePart]
+
+object Signature:
+  def apply(names: (SignaturePart)*): Signature = names.toList
 
 case class LinkToType(signature: Signature, dri: DRI, kind: Kind)
 
@@ -155,6 +161,7 @@ case class Member(
   members : Seq[Member] = Nil,
   directParents: Seq[LinkToType] = Nil,
   parents: Seq[LinkToType] = Nil,
+  selfType: Option[LinkToType] = None,
   knownChildren: Seq[LinkToType] = Nil,
   companion: Option[DRI] = None,
   deprecated: Option[Annotation] = None,
@@ -179,8 +186,12 @@ extension[T] (member: Member)
   def asLink: LinkToType = LinkToType(member.signature, member.dri, member.kind)
   def membersBy(op: Member => Boolean): Seq[Member] = member.members.filter(op)
 
+  def withDRI(dri: DRI): Member = member.copy(dri = dri)
+
   def withMembers(newMembers: Seq[Member]): Member = member.copy(members = newMembers)
 
+  def withName(name: String): Member = member.copy(name = name)
+
   def updateRecusivly(op: Member => Member): Member =
     val newMembers = member.members.map(_.updateRecusivly(op))
     op(member).withMembers(newMembers)
@@ -189,6 +200,8 @@ extension[T] (member: Member)
 
   def withKind(kind: Kind): Member = member.copy(kind = kind)
 
+  def withDocs(docs: Option[Comment]) = member.copy(docs = docs)
+
   def withNewMembers(newMembers: Seq[Member]): Member =
     member.copy(members = member.members ++ newMembers)
 
@@ -228,8 +241,20 @@ extension (m: Module)
 extension (s: Signature)
   def getName: String =
     s.map {
-      case s: String => s
-      case l: Link => l.name
+      case Plain(s) => s
+      case Type(s, _) => s
+      case Keyword(s) => s
     }.mkString
 
-case class TastyMemberSource(val path: java.nio.file.Path, val lineNumber: Int)
+case class TastyMemberSource(path: java.nio.file.Path, lineNumber: Int)
+
+object SnippetCompilerData:
+  case class Position(line: Int, column: Int)
+  case class ClassInfo(tpe: Option[String], names: Seq[String], generics: Option[String])
+
+case class SnippetCompilerData(
+  packageName: String,
+  classInfos: Seq[SnippetCompilerData.ClassInfo],
+  imports: List[String],
+  position: SnippetCompilerData.Position
+)
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala
new file mode 100644
index 000000000000..a2c653208a83
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala
@@ -0,0 +1,96 @@
+package dotty.tools.scaladoc
+package renderers
+
+import dotty.tools.scaladoc.tasty.comments.wiki._
+import util.HTML._
+import com.vladsch.flexmark.util.ast.{Node => MdNode}
+import dotty.tools.scaladoc.tasty.comments.wiki.WikiDocElement
+import dotty.tools.scaladoc.tasty.comments.markdown.DocFlexmarkRenderer
+
+class DocRender(signatureRenderer: SignatureRenderer)(using DocContext):
+
+  def renderDocPart(doc: DocPart): AppliedTag = doc match
+    case md: MdNode => renderMarkdown(md)
+    case Nil => raw("")
+    case Seq(elem: WikiDocElement) => renderElement(elem)
+    case list: Seq[WikiDocElement @unchecked] => div(list.map(renderElement))
+
+  private def renderMarkdown(el: MdNode): AppliedTag =
+    raw(DocFlexmarkRenderer.render(el)( (link,name) =>
+      renderLink(link, default => text(if name.isEmpty then default else name)).toString
+    ))
+
+  private def listItems(items: Seq[WikiDocElement]): Seq[AppliedTag] = items match
+    case Nil => Nil
+    case (x :: (y: (UnorderedList | OrderedList)) :: tail) =>
+      li(
+        renderElement(x),
+        renderElement(y)
+      ) +: listItems(tail)
+    case (x :: tail) =>
+      li(renderElement(x)) +: listItems(tail)
+  private def notSupported(name: String, content: AppliedTag): AppliedTag =
+    report.warning(s"Wiki syntax does not support $name in ${signatureRenderer.currentDri.location}")
+    content
+
+  private def renderLink(target: DocLink, linkBody: String => TagArg): AppliedTag =
+    target match
+      case DocLink.ToDRI(dri: DRI, name: String) =>
+        signatureRenderer.renderLinkContent(linkBody(name), dri)
+      case DocLink.ToURL(url) => a(href := url)(linkBody(url))
+      case DocLink.UnresolvedDRI(query, msg) =>
+        val tooltip = s"Problem linking $query: $msg"
+        signatureRenderer.unresolvedLink(linkBody(query), titleAttr :=  tooltip)
+
+  private def renderHeader(header: Row): AppliedTag =
+    tr(
+      header.cells.map(c => th(c.blocks.map(renderElement)))
+    )
+
+  private def renderRow(row: Row): AppliedTag =
+    tr(
+      row.cells.map(c => td(c.blocks.map(renderElement)))
+    )
+
+  private def renderElement(e: WikiDocElement): AppliedTag = e match
+    case Title(text, level) =>
+      val content = renderElement(text)
+      level match
+          case 1 => h1(content)
+          case 2 => h2(content)
+          case 3 => h3(content)
+          case 4 => h4(content)
+          case 5 => h5(content)
+          case 6 => h6(content)
+    case Paragraph(text) => p(renderElement(text))
+    case Code(data: String) => pre(code(raw(data.escapeReservedTokens))) // TODO add classes
+    case HorizontalRule => hr
+    case Table(header, columns, rows) =>
+      table(
+        thead(
+          renderHeader(header)
+        ),
+        tbody(
+          rows.map(renderRow)
+        )
+      )
+
+    case UnorderedList(items) => ul(listItems(items))
+    case OrderedList(items, style) => ol(listItems(items)) // TODO use style
+    case Chain(items: Seq[Inline]) => span(items.map(renderElement))
+    case Italic(text) => span(cls:="italic")(renderElement(text))
+    case Underline(text) => span(cls:="underline")(renderElement(text))
+    case Bold(text) => span(cls:="bold")(renderElement(text))
+    case Monospace(text) => code(renderElement(text))
+    case Superscript(text) => span(cls:="superscript")(renderElement(text))  // TODO implement style
+    case Subscript(text) => span(cls:="subscript")(renderElement(text))  // TODO implement style
+    case Link(target, body) =>
+      renderLink(target, default => body.fold[TagArg](default)(renderElement))
+    case Text(text) => raw(text.escapeReservedTokens)
+    case Summary(text) => renderElement(text)
+    case HtmlTag(content) => raw(content)
+
+    case DefinitionList(items) => notSupported("DefinitionList", raw(""))
+
+    case link: RepresentationLink =>
+      notSupported("Subscript", renderElement(link.title))
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/DotDiagramBuilder.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/DotDiagramBuilder.scala
index 5af97d7dc9fb..57df26611b12 100644
--- a/scaladoc/src/dotty/tools/scaladoc/renderers/DotDiagramBuilder.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/renderers/DotDiagramBuilder.scala
@@ -15,7 +15,7 @@ object DotDiagramBuilder:
 
     val vWithId = diagram.verteciesWithId
     val sealedNodes = diagram.sealedNodes
-    val vertecies = vWithId.map { (vertex, id) =>
+    val vertecies = vWithId.toList.sortBy((_, id) => id).map { (vertex, id) =>
       s"""node${id} [id=node${id}, label="${getHtmlLabel(vertex, renderer, sealedNodes)}", style="${getStyle(vertex.kind)}"];\n"""
     }.mkString
 
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala
index 8d79133a5e39..b61db9248a6d 100644
--- a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala
@@ -13,116 +13,49 @@ import java.nio.file.Path
 import java.nio.file.Files
 import java.nio.file.FileVisitOption
 import java.io.File
+import dotty.tools.scaladoc.staticFileSymbolUUID
 
-case class Page(link: Link, content: Member | ResolvedTemplate | String, children: Seq[Page]):
-  def withNewChildren(newChildren: Seq[Page]) = copy(children = children ++ newChildren)
+class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: DocContext)
+  extends Renderer(rootPackage, members, extension = "html"):
 
-  def withTitle(newTitle: String) = copy(link = link.copy(name = newTitle))
-
-  def hasFrame = content match
-    case t: ResolvedTemplate => t.hasFrame
-    case _ => true
-
-class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx: DocContext)
-  extends SiteRenderer, Resources, Locations, Writer:
-  private val args = summon[DocContext].args
-  val staticSite = summon[DocContext].staticSiteContext
-
-  val effectiveMembers = members
-
-  private def memberPage(member: Member): Page =
-    val childrenPages = member.members.filter(_.needsOwnPage)
-    Page(Link(member.name, member.dri), member, childrenPages.map(memberPage))
-
-  val navigablePage: Page =
-    val rootPckPage = memberPage(rootPackage)
-    staticSite match
-      case None => rootPckPage.withTitle(args.name)
-      case Some(siteContext) =>
-        val (indexes, templates) = siteContext.templates.partition(f =>
-          f.templateFile.isIndexPage() && f.file.toPath.getParent() == siteContext.docsPath)
-        if (indexes.size > 1)
-          val msg = s"ERROR: Multiple index pages for doc found ${indexes.map(_.file)}"
-          report.error(msg)
-
-        val templatePages =
-          (templates ++ siteContext.indexTemplate()).map(templateToPage(_, siteContext))
-        indexes.headOption match
-          case None if templatePages.isEmpty=>
-            rootPckPage.withTitle(args.name)
-          case None =>
-            Page(Link(args.name, docsRootDRI),"", templatePages :+ rootPckPage.withTitle("API"))
-          case Some(indexPage) =>
-            val newChildren = templatePages :+ rootPckPage.withTitle("API")
-            templateToPage(indexPage, siteContext).withNewChildren(newChildren)
-
-  val hiddenPages: Seq[Page] =
-    staticSite match
-      case None =>
-        Seq(navigablePage.copy( // Add index page that is a copy of api/index.html
-          link = navigablePage.link.copy(dri = docsRootDRI),
-          children = Nil
-        ))
-      case Some(site) =>
-        site.orphanedTemplates.map(templateToPage(_, site))
-
-  val allPages = navigablePage +: hiddenPages
-
-  def renderContent(page: Page) = page.content match
-    case m: Member =>
-      val signatureRenderer = new SignatureRenderer:
-        def currentDri: DRI = page.link.dri
-        def link(dri: DRI): Option[String] =
-          Some(pathToPage(currentDri, dri)).filter(_ != UnresolvedLocationLink)
-
-      MemberRenderer(signatureRenderer).fullMember(m)
-    case t: ResolvedTemplate => siteContent(page.link.dri, t)
-    case a: String =>  raw(a)
-
-
-  def renderPage(page: Page, parents: Vector[Link]): Seq[String] =
-    val newParents = parents :+ page.link
-    val content = html(
+  override def pageContent(page: Page, parents: Vector[Link]): AppliedTag =
+    html(
       mkHead(page),
       body(
         if !page.hasFrame then renderContent(page)
-        else mkFrame(page.link, newParents, renderContent(page))
+        else mkFrame(page.link, parents, renderContent(page))
       )
     )
-    write(page.link.dri, content) +: page.children.flatMap(renderPage(_, newParents))
 
-  private def specificResources(page: Page): Set[String] =
-    page.children.toSet.flatMap(specificResources) ++ (page.content match
-      case r: ResolvedTemplate =>
-        r.resolved.resources.toSet
-      case _ => Set.empty
-    )
+  override def render(): Unit =
+    val renderedResources = renderResources()
+    super.render()
 
   private def renderResources(): Seq[String] =
-    def siteRoot = staticSite.get.root.toPath
-    def pathToResource(p: String) = Resource.File(p, siteRoot.resolve(p))
-
-    def harvestResources(path: String) =
-      val siteImgPath = siteRoot.resolve(path)
-      if !Files.exists(siteImgPath) then Nil
-      else
-        val allPaths = Files.walk(siteImgPath, FileVisitOption.FOLLOW_LINKS)
-        val files = allPaths.filter(Files.isRegularFile(_)).iterator().asScala
-        files.map(p => siteRoot.relativize(p).toString).toList
-
-    val staticResources = staticSite.toSeq.flatMap { _ =>
-      harvestResources("images") ++ harvestResources("resources")
-    }
-
-    val siteResourcesPaths = allPages.toSet.flatMap(specificResources) ++ staticResources
-
-    val resources = siteResourcesPaths.toSeq.map(pathToResource) ++ allResources(allPages)
+    import scala.util.Using
+    import scala.jdk.CollectionConverters._
+    // All static site resources need to be in _assets folder
+    val staticSiteResources = staticSite
+      .map(_.root.toPath.resolve("_assets").toFile)
+      .filter(f => f.exists && f.isDirectory)
+      .toSeq
+      .flatMap { resourceFile =>
+        resourceFile.listFiles.toSeq.map(_.toPath).flatMap { file =>
+          Using(Files.walk(file)) { stream =>
+            stream.iterator().asScala.toSeq
+              .map(from => Resource.File(resourceFile.toPath.relativize(from).toString, from))
+          }.fold (
+            { t =>
+              report.warn(s"Error occured while processing _assets file.", t)
+              Seq.empty
+            },
+            identity
+          )
+        }
+      }
+    val resources = staticSiteResources ++ allResources(allPages) ++ onlyRenderedResources
     resources.flatMap(renderResource)
 
-  def render(): Unit =
-    val renderedResources = renderResources()
-    val sites = allPages.map(renderPage(_, Vector.empty))
-
   def mkHead(page: Page): AppliedTag =
     val resources = page.content match
       case t: ResolvedTemplate =>
@@ -130,6 +63,10 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx
       case _ =>
         memberResourcesPaths
 
+    val earlyResources = page.content match
+      case t: ResolvedTemplate => if t.hasFrame then earlyMemberResourcePaths else Nil
+      case _ => earlyMemberResourcePaths
+
     head(
       meta(charset := "utf-8"),
       meta(util.HTML.name := "viewport", content := "width=device-width, initial-scale=1"),
@@ -140,47 +77,66 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx
         `type` := "image/x-icon",
         href := resolveLink(page.link.dri, "favicon.ico")
       ),
-      linkResources(page.link.dri, resources).toList,
-      script(raw(s"""var pathToRoot = "${pathToRoot(page.link.dri)}";"""))
+      linkResources(page.link.dri, earlyResources, deferJs = false).toList,
+      linkResources(page.link.dri, resources, deferJs = true).toList,
+      script(raw(s"""var pathToRoot = "${pathToRoot(page.link.dri)}";""")),
+      (page.content match
+        case ResolvedTemplate(loadedTemplate, _) =>
+          val path = loadedTemplate.templateFile.file.toPath
+          ctx.sourceLinks.repoSummary(path) match
+            case Some(DefinedRepoSummary("github", org, repo)) =>
+              val tag: TagArg = ctx.sourceLinks.fullPath(relativePath(path)).fold("") { githubContributors =>
+                Seq(
+                  script(raw(s"""var githubContributorsUrl = "https://api.github.com/repos/$org/$repo";""")),
+                  script(raw(s"""var githubContributorsFilename = "$githubContributors";"""))
+                )
+              }
+              tag // for some reason inference fails so had to state the type explicitly
+            case _ => ""
+        case _ => ""),
+      ctx.args.versionsDictionaryUrl match
+        case Some(url) => script(raw(s"""var versionsDictionaryUrl = "$url";"""))
+        case None => ""
     )
 
   private def buildNavigation(pageLink: Link): AppliedTag =
     def navigationIcon(member: Member) = member match {
-      case m if m.needsOwnPage => Seq(span(cls := s"micon ${member.kind.name.head}"))
+      case m if m.needsOwnPage => Seq(span(cls := s"micon ${member.kind.name.take(2)}"))
       case _ => Nil
     }
 
     def renderNested(nav: Page, toplevel: Boolean = false): (Boolean, AppliedTag) =
       val isSelected = nav.link.dri == pageLink.dri
-      def linkHtml(exapnded: Boolean = false) =
-        val attrs = if (isSelected || toplevel) Seq(cls := "selected expanded") else Nil
+
+      def linkHtml(expanded: Boolean = false, withArrow: Boolean = false) =
+        val attrs: Seq[String] = Seq(
+          Option.when(isSelected)("selected"),
+          Option.when(expanded)("expanded")
+        ).flatten
         val icon = nav.content match {
           case m: Member => navigationIcon(m)
           case _ => Nil
         }
-        Seq(a(href := pathToPage(pageLink.dri, nav.link.dri), attrs)(icon, nav.link.name))
+        Seq(
+          span(cls := "nh " + attrs.mkString(" "))(
+            if withArrow then Seq(span(cls := "ar")) else Nil,
+            a(href := pathToPage(pageLink.dri, nav.link.dri))(icon, span(nav.link.name))
+          )
+        )
 
-      nav.children match
-        case Nil => isSelected -> div(linkHtml())
+      nav.children.filterNot(_.hidden) match
+        case Nil => isSelected -> div(cls := s"ni ${if isSelected then "expanded" else ""}")(linkHtml())
         case children =>
           val nested = children.map(renderNested(_))
-          val expanded = nested.exists(_._1) || nav.link == pageLink
+          val expanded = nested.exists(_._1) || isSelected
           val attr =
-            if expanded || isSelected || toplevel then Seq(cls := "expanded") else Nil
+            if expanded || isSelected || toplevel then Seq(cls := "ni expanded") else Seq(cls := "ni")
           (isSelected || expanded) -> div(attr)(
-            linkHtml(expanded),
-            span(cls := "ar"),
+            linkHtml(expanded, true),
             nested.map(_._2)
           )
-    renderNested(navigablePage, toplevel = true)._2
 
-  private def canonicalUrl(l: String): AppliedTag | String =
-    val canon = args.docCanonicalBaseUrl
-    if !canon.isEmpty then
-      val canonicalUrl = if canon.endsWith("/") then canon else canon + "/"
-      link(rel := "canonical", href := canonicalUrl + l)
-    else
-      "" // return empty tag
+    renderNested(navigablePage, toplevel = true)._2
 
   private def hasSocialLinks = !args.socialLinks.isEmpty
 
@@ -204,11 +160,11 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx
           a(href := pathToPage(link.dri, b.dri))(b.name),
           "/"
         )).dropRight(1)
-      div(cls := "breadcrumbs")(innerTags:_*)
+      div(cls := "breadcrumbs container")(innerTags:_*)
 
     def textFooter: String | AppliedTag =
       args.projectFooter.fold("") { f =>
-        div(id := "footer-text")(
+        span(id := "footer-text")(
           raw(f)
         )
       }
@@ -220,8 +176,15 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx
           span(
             div(cls:="projectName")(args.name)
           ),
-          span(
-            args.projectVersion.map(v => div(cls:="projectVersion")(v)).toList
+          div(id := "version")(
+            div(cls := "versions-dropdown")(
+              div(onclick := "dropdownHandler()", id := "dropdown-button", cls := "dropdownbtn dropdownbtnactive")(
+                args.projectVersion.map(v => div(cls:="projectVersion")(v)).getOrElse(""),
+                div(id := "dropdown-content", cls := "dropdown-content")(
+                  input(`type` := "text", placeholder := "Search...", id := "dropdown-input", onkeyup := "filterFunction()"),
+                ),
+              ),
+            )
           ),
           div(cls := "socials")(
             socialLinks()
@@ -237,34 +200,44 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx
           span(cls := "icon-toggler")
         ),
         div(id := "scaladoc-searchBar"),
-        main(
-          div(id := "content")(
-            parentsHtml,
-            div(content),
-          )
+        main(id := "main-content")(
+          parentsHtml,
+          div(id := "content")(content),
         ),
         footer(
-          span(cls := "go-to-top-icon")(
-            a(href := "#container")(
-              span(cls:="icon-vertical_align_top"),
-              raw("&nbsp;Back to top")
-            )
-          ),
-          div(cls := "socials")(
-            if hasSocialLinks then Seq(raw("Social links&nbsp;")) else Nil,
-            socialLinks(whiteIcon = false)
-          ),
           div(id := "generated-by")(
-            raw("Generated by&nbsp;"),
+            span(cls := "footer-text")(raw("Generated by")),
             a(href := "https://github.com/lampepfl/dotty/tree/master/scaladoc")(
               img(
                 src := resolveRoot(link.dri, "images/scaladoc_logo.svg"),
                 alt := "scaladoc",
                 cls := "scaladoc_logo"
+              ),
+              img(
+                src := resolveRoot(link.dri, "images/scaladoc_logo_dark.svg"),
+                alt := "scaladoc",
+                cls := "scaladoc_logo_dark"
               )
             )
           ),
-          textFooter
+          textFooter,
+          div(cls := "socials")(
+            span(cls := "footer-text")(if hasSocialLinks then Seq(raw("Social links")) else Nil),
+            socialLinks(whiteIcon = false)
+          ),
+          div(cls := "mode")(
+            span(cls :="footer-text")(raw("Mode")),
+            label(id := "theme-toggle", cls := "switch")(
+              input(`type` := "checkbox"),
+              span(cls := "slider")
+            )
+          ),
+          span(cls := "go-to-top-icon")(
+            a(href := "#container")(
+              span(cls:="icon-vertical_align_top"),
+              span(cls :="footer-text")(raw("Back to top"))
+            )
+          )
         )
       )
     )
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala
index 04b8e0edb430..43602a23af59 100644
--- a/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala
@@ -13,32 +13,40 @@ import java.nio.file.Path
 import java.nio.file.Files
 import java.io.File
 import scala.util.matching._
+import dotty.tools.scaladoc.util.Escape._
 
 val UnresolvedLocationLink = "#"
 
 trait Locations(using ctx: DocContext):
   def effectiveMembers: Map[DRI, Member]
 
+  // We generate this collection only if there may be a conflict with resources.
+  // Potentially can be quite big.
+  lazy val apiPaths = effectiveMembers.keySet.filterNot(_.isStaticFile).map(absolutePath(_))
+
   var cache = new JHashMap[DRI, Seq[String]]()
 
+  private[renderers] def pathsConflictResoultionMsg =
+    "Using `-Yapi-subdirectory` flag will move all API documentation into `api` subdirectory and will fix this conflict."
+
   // TODO verify if location exisits
   def rawLocation(dri: DRI): Seq[String] =
     cache.get(dri) match
       case null =>
         val path = dri match
-          case `docsDRI` => List("docs", "index")
-          case `docsRootDRI` => List("index")
-          case `apiPageDRI` => List("api", "index")
+          case `apiPageDRI` =>
+            if ctx.args.apiSubdirectory && ctx.staticSiteContext.nonEmpty
+              then List("api", "index")
+              else List("index")
           case dri if dri.isStaticFile =>
             Paths.get(dri.location).iterator.asScala.map(_.toString).toList
           case dri =>
             val loc = dri.location
             val fqn = loc.split(Array('.')).toList match
-              case "<empty>" :: Nil  => "_empty_"   :: Nil
+              case "<empty>" :: Nil  => "_empty_" :: Nil
               case "<empty>" :: tail => "_empty_" :: tail
               case other => other
-
-            Seq("api") ++ fqn
+            if ctx.args.apiSubdirectory then "api" :: fqn else fqn
         cache.put(dri, path)
         path
       case cached => cached
@@ -72,13 +80,14 @@ trait Locations(using ctx: DocContext):
     pathToRaw(from, to.split("/").toList)
 
   def resolveRoot(dri: DRI, path: String): String = resolveRoot(rawLocation(dri), path)
-  def absolutePath(dri: DRI): String = rawLocation(dri).mkString("", "/", ".html")
+  def absolutePath(dri: DRI, extension: String = "html"): String = rawLocation(dri).mkString("", "/", s".$extension")
+  def absolutePathWithAnchor(dri: DRI, extension: String = "html"): String = s"${absolutePath(dri, extension)}#${dri.anchor}"
 
   def resolveLink(dri: DRI, url: String): String =
     if URI(url).isAbsolute then url else resolveRoot(dri, url)
 
   def pathToRoot(dri: DRI): String = rawLocation(dri).drop(1).map(_ => "..") match
     case Nil => ""
-    case seq => seq.mkString("", "/", "/")
+    case seq => seq.mkString("", "/" , "/")
 
   def driExists(dri: DRI) = effectiveMembers.get(dri).isDefined || dri.isStaticFile
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/MarkdownRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/MarkdownRenderer.scala
new file mode 100644
index 000000000000..b49c1e268678
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/renderers/MarkdownRenderer.scala
@@ -0,0 +1,28 @@
+package dotty.tools.scaladoc
+package renderers
+
+import util.HTML._
+import collection.JavaConverters._
+import java.net.URI
+import java.net.URL
+import dotty.tools.scaladoc.site._
+import scala.util.Try
+import org.jsoup.Jsoup
+import java.nio.file.Paths
+import java.nio.file.Path
+import java.nio.file.Files
+import java.nio.file.FileVisitOption
+import java.io.File
+
+class MarkdownRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: DocContext)
+  extends Renderer(rootPackage, members, extension = "md"):
+
+  override def render(): Unit =
+    renderResources()
+    super.render()
+
+  override def pageContent(page: Page, parents: Vector[Link]): AppliedTag =
+    renderContent(page)
+
+  private def renderResources(): Seq[String] =
+    allResources(Nil).flatMap(renderResource)
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala
index a63cf3ad3775..19dd4e4b7403 100644
--- a/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala
@@ -19,7 +19,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
 
   def defintionClasses(m: Member) = m.origin match
     case Origin.Overrides(defs) =>
-      def renderDef(d: Overriden): Seq[TagArg] =
+      def renderDef(d: Overridden): Seq[TagArg] =
         Seq(" -> ", signatureRenderer.renderLink(d.name, d.dri))
       val headNode = m.inheritedFrom.map(form => signatureRenderer.renderLink(form.name, form.dri))
       val tailNodes = defs.flatMap(renderDef)
@@ -29,7 +29,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
     case _ => Nil
 
   def inheritedFrom(m: Member) = m.inheritedFrom match
-    case Some(InheritedFrom(name, dri)) => tableRow("Inherited from", signatureRenderer.renderLink(name, dri))
+    case Some(InheritedFrom(name, dri)) => tableRow("Inherited from:", signatureRenderer.renderLink(name, dri))
     case _ => Nil
 
   def docAttributes(m: Member): Seq[AppliedTag] =
@@ -46,31 +46,31 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
     def opt(name: String, on: Option[DocPart]): Seq[AppliedTag] =
       if on.isEmpty then Nil else tableRow(name, renderDocPart(on.get))
 
-    def authors(authors: List[DocPart]) = if summon[DocContext].args.includeAuthors then list("Authors", authors) else Nil
+    def authors(authors: List[DocPart]) = if summon[DocContext].args.includeAuthors then list("Authors:", authors) else Nil
 
     m.docs.fold(Nil)(d =>
-      nested("Type Params", d.typeParams) ++
-      nested("Value Params", d.valueParams) ++
-      opt("Returns", d.result) ++
-      nested("Throws", d.throws) ++
-      opt("Constructor", d.constructor) ++
+      nested("Type parameters:", d.typeParams) ++
+      nested("Value parameters:", d.valueParams) ++
+      opt("Returns:", d.result) ++
+      nested("Throws:", d.throws) ++
+      opt("Constructor:", d.constructor) ++
       authors(d.authors) ++
-      list("See also", d.see) ++
-      opt("Version", d.version) ++
-      opt("Since", d.since) ++
-      list("Todo", d.todo) ++
-      list("Note", d.note) ++
-      list("Example", d.example)
+      list("See also:", d.see) ++
+      opt("Version:", d.version) ++
+      opt("Since:", d.since) ++
+      list("Todo:", d.todo) ++
+      list("Note:", d.note) ++
+      list("Example:", d.example)
     )
 
   def companion(m: Member): Seq[AppliedTag] = m.companion.fold(Nil){dri =>
     val kindName = if m.kind == Kind.Object then "class" else "object"
-    tableRow("Companion", signatureRenderer.renderLink(kindName, dri))
+    tableRow("Companion:", signatureRenderer.renderLink(kindName, dri))
   }
 
   def source(m: Member): Seq[AppliedTag] =
     summon[DocContext].sourceLinks.pathTo(m).fold(Nil){ link =>
-      tableRow("Source", a(href := link)(m.sources.fold("(source)")(_.path.getFileName().toString())))
+      tableRow("Source:", a(href := link)(m.sources.fold("(source)")(_.path.getFileName().toString())))
     }
 
   def deprecation(m: Member): Seq[AppliedTag] = m.deprecated.fold(Nil){ a =>
@@ -120,10 +120,9 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
       Seq("Implicitly added by ", renderLink(name, dri))
     case Origin.ExtensionFrom(name, dri) =>
       Seq("Extension method from ", renderLink(name, dri))
-    case Origin.ExportedFrom(name, dri) =>
-      val signatureName: TagArg = dri match
-        case Some(dri: DRI) => renderLink(name, dri)
-        case None => name
+    case Origin.ExportedFrom(Some(link)) =>
+      val signatureName: TagArg = link match
+        case Link(name, dri) => renderLink(name, dri)
       Seq("Exported from ", signatureName)
     case _ => Nil
   }
@@ -132,25 +131,23 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
     val depStyle = if member.deprecated.isEmpty then "" else "deprecated"
     val nameClasses = cls := s"documentableName $depStyle"
 
-    val rawBuilder = ScalaSignatureProvider.rawSignature(member, InlineSignatureBuilder())
+    val rawBuilder = ScalaSignatureProvider.rawSignature(member, InlineSignatureBuilder())()
     val inlineBuilder = rawBuilder.asInstanceOf[InlineSignatureBuilder]
-    if inlineBuilder.preName.isEmpty then println(member)
     val kind :: modifiersRevered = inlineBuilder.preName
     val signature = inlineBuilder.names.reverse
     Seq(
-      span(cls := "modifiers")(
-        span(cls := "other-modifiers")(modifiersRevered.reverse.map(renderElement)),
+      div(cls := "signature")(
+        span(cls := "modifiers")(modifiersRevered.reverse.map(renderElement)),
         span(cls := "kind")(renderElement(kind)),
+        renderLink(member.name, member.dri, nameClasses),
+        span(signature.map(renderElement))
       ),
-      renderLink(member.name, member.dri, nameClasses),
-      span(cls := "signature")(signature.map(renderElement)),
     )
 
   def memberIcon(member: Member) = member.kind match {
-    case Kind.Package => Nil
     case _ =>
       val withCompanion = member.companion.fold("")(_ => "-wc")
-      val iconSpan = span(cls := s"micon ${member.kind.name.head}$withCompanion")()
+      val iconSpan = span(cls := s"micon ${member.kind.name.take(2)}$withCompanion")()
       Seq(member.companion.flatMap(link(_)).fold(iconSpan)(link => a(href := link)(iconSpan)))
   }
 
@@ -167,7 +164,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
       ++ filterAttributes.map{ case (n, v) => Attr(s"data-f-$n") := v }
 
     div(topLevelAttr:_*)(
-      a(href := (if member.needsOwnPage then link(member.dri).getOrElse("#") else s"#${member.dri.anchor}"), cls := "documentableAnchor"),
+      if !member.needsOwnPage then a(Attr("link") := link(member.dri).getOrElse("#"), cls := "documentableAnchor") else Nil,
       div(annotations(member)),
       div(cls := "header monospace")(memberSignature(member)),
       div(cls := "docs")(
@@ -281,8 +278,15 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
         case _ => None
       }.collect {
         case (Some(on), members) =>
-          val sig = Signature(s"extension (${on.name}: ") ++ on.signature ++ Signature(")")
-          MGroup(span(sig.map(renderElement)), members.sortBy(_.name).toSeq, on.name)
+          val typeSig = InlineSignatureBuilder()
+            .keyword("extension ")
+            .generics(on.typeParams)
+            .asInstanceOf[InlineSignatureBuilder].names.reverse
+          val argsSig = InlineSignatureBuilder()
+            .functionParameters(on.argsLists)
+            .asInstanceOf[InlineSignatureBuilder].names.reverse
+          val sig = typeSig ++ Signature(Plain(s"(${on.name}: ")) ++ on.signature ++ Signature(Plain(")")) ++ argsSig
+          MGroup(span(cls := "groupHeader")(sig.map(renderElement)), members.sortBy(_.name).toSeq, on.name)
       }.toSeq
 
     div(cls := "membersList")(renderTabs(
@@ -350,14 +354,22 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
           div(link.kind.name," ", link.signature.map(renderElement))
         )))
 
+      def selfTypeList(list: List[LinkToType]): Seq[AppliedTag] =
+        if list.isEmpty then Nil
+        else Seq(div(cls := "symbol monospace") { list.map { link =>
+          div(link.signature.map(renderElement))
+        }})
+
       val supertypes = signatureList(m.parents)
       val subtypes = signatureList(m.knownChildren)
+      val selfType = selfTypeList(m.selfType.toList)
 
       renderTabs(
         singleSelection = true,
         Tab("Graph", "graph", graphHtml, "showGraph"),
         Tab("Supertypes", "supertypes", supertypes),
         Tab("Known subtypes", "subtypes", subtypes),
+        Tab("Self type", "selftype", selfType)
       )
 
   private def buildDocumentableFilter = div(cls := "documentableFilter")(
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala
new file mode 100644
index 000000000000..45a080d4828a
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala
@@ -0,0 +1,156 @@
+package dotty.tools.scaladoc
+package renderers
+
+import util.HTML._
+import collection.JavaConverters._
+import collection.mutable.ListBuffer
+import java.net.URI
+import java.net.URL
+import dotty.tools.scaladoc.site._
+import scala.util.Try
+import org.jsoup.Jsoup
+import java.nio.file.Paths
+import java.nio.file.Path
+import java.nio.file.Files
+import java.nio.file.FileVisitOption
+import java.io.File
+
+case class Page(link: Link, content: Member | ResolvedTemplate | String, children: Seq[Page], hidden: Boolean = false):
+  def withNewChildren(newChildren: Seq[Page]) = copy(children = children ++ newChildren)
+
+  def withTitle(newTitle: String) = copy(link = link.copy(name = newTitle))
+
+  def hasFrame = content match
+    case t: ResolvedTemplate => t.hasFrame
+    case _ => true
+
+abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], protected val extension: String = "html")(using ctx: DocContext)
+  extends SiteRenderer, Resources, Locations, Writer:
+  protected val args = summon[DocContext].args
+  val staticSite = summon[DocContext].staticSiteContext
+
+  val effectiveMembers = members
+
+  protected def memberPage(member: Member): Page =
+    val childrenPages = member.members.filter(_.needsOwnPage)
+    Page(Link(member.name, member.dri), member, childrenPages.map(memberPage))
+
+  val navigablePage: Page =
+    val rootPckPage = memberPage(rootPackage)
+    staticSite match
+      case None => rootPckPage.withTitle(args.name)
+      case Some(siteContext) =>
+        val rootTemplate = siteContext.staticSiteRoot.rootTemplate
+
+        // Below code is for walking in order the tree and modifing its nodes basing on its neighbours
+
+        // We add dummy guards
+        val allTemplates: Seq[Option[LoadedTemplate]] = None +: siteContext.allTemplates.map(Some(_)) :+ None
+
+        // Let's gather the list of maps for each template with its in-order neighbours
+        val newSettings: List[Map[String, Object]] = allTemplates.sliding(size = 3, step = 1).map {
+          case None :: None :: Nil =>
+            Map.empty
+          case prev :: mid :: next :: Nil =>
+            def link(sibling: Option[LoadedTemplate]): Option[String] =
+              def realPath(path: Path) = if Files.isDirectory(path) then Paths.get(path.toString, "index.html") else path
+              sibling.map { n =>
+                val realMidPath = realPath(mid.get.file.toPath)
+                val realSiblingPath = realPath(n.file.toPath)
+                realMidPath.relativize(realSiblingPath).toString.stripPrefix("../")
+              }
+            List(link(prev).map("previous" -> _), link(next).map("next" -> _)).flatten.toMap
+        }.toList
+
+        def updateSettings(templates: Seq[LoadedTemplate], additionalSettings: ListBuffer[Map[String, Object]]): List[LoadedTemplate] =
+          val updatedTemplates = List.newBuilder[LoadedTemplate]
+          for template <- templates do
+            val head: Map[String, Object] = additionalSettings.remove(0)
+            val current: Map[String, Object] = template.templateFile.settings.getOrElse("page", Map.empty).asInstanceOf[Map[String, Object]]
+            val updatedTemplateFile = template.templateFile.copy(settings = template.templateFile.settings.updated("page", head ++ current))
+            updatedTemplates += template.copy(
+              templateFile = updatedTemplateFile,
+              children = updateSettings(template.children, additionalSettings)
+            )
+          updatedTemplates.result()
+
+        val newTemplates = updateSettings(Seq(rootTemplate), newSettings.to(ListBuffer))
+        val templatePages = newTemplates.map(templateToPage(_, siteContext))
+
+        val newRoot = newTemplates.head
+
+        if newRoot.children.isEmpty && newRoot.templateFile.rawCode.isEmpty
+        then rootPckPage.withTitle(args.name)
+        else {
+          val newRootPage = templateToPage(newRoot, siteContext)
+          newRootPage.withNewChildren(Seq(rootPckPage.withTitle("API")))
+        }
+
+  val redirectPages: Seq[Page] = staticSite.fold(Seq.empty)(siteContext => siteContext.redirectTemplates.map {
+    case (template, driFrom, driTo) =>
+      val redirectTo = pathToPage(driFrom, driTo)
+      templateToPage(template.copy(templateFile = template.templateFile.copy(settings = template.templateFile.settings ++ Map("redirectTo" -> redirectTo))), siteContext)
+  })
+
+  /**
+   * Here we have to retrive index pages from hidden pages and replace fake index pages in navigable page tree.
+   */
+  val allPages: Seq[Page] =
+    val all = navigablePage +: redirectPages
+    // We need to check for conflicts only if we have top-level member called docs
+    val hasPotentialConflict =
+      rootPackage.members.exists(m => m.name.startsWith("_docs"))
+
+    if hasPotentialConflict then
+      def walk(page: Page): Unit =
+        if page.link.dri.isStaticFile then
+          val dest = absolutePath(page.link.dri)
+          if apiPaths.contains(dest) then
+            report.error(s"Conflict between static page and API member for $dest. $pathsConflictResoultionMsg")
+          page.children.foreach(walk)
+
+      all.foreach(walk)
+
+    all
+
+  def renderContent(page: Page) = page.content match
+    case m: Member =>
+      val signatureRenderer = new SignatureRenderer:
+        def currentDri: DRI = page.link.dri
+        def link(dri: DRI): Option[String] =
+          Some(pathToPage(currentDri, dri)).filter(_ != UnresolvedLocationLink)
+
+      MemberRenderer(signatureRenderer).fullMember(m)
+    case t: ResolvedTemplate => siteContent(page.link.dri, t)
+    case a: String =>  raw(a)
+
+
+
+  protected def canonicalUrl(l: String): AppliedTag | String =
+    val canon = args.docCanonicalBaseUrl
+    if !canon.isEmpty then
+      val canonicalUrl = if canon.endsWith("/") then canon else canon + "/"
+      link(rel := "canonical", href := canonicalUrl + l)
+    else
+      "" // return empty tag
+
+  /**
+   * Main method rendering all the pages
+   */
+  def render(): Unit =
+    val sites = allPages.map(renderPage(_, Vector.empty))
+
+  /**
+   * Handler to prepare the content to be rendered. It's a good place to organize frame, footers, front-matter, etc.
+   */
+  def pageContent(page: Page, parents: Vector[Link]): AppliedTag
+
+  /**
+   * Method to be overriden by concrete renderer to render single page
+   */
+  def renderPage(page: Page, parents: Vector[Link]): Seq[String] =
+    val newParents = parents :+ page.link
+    val content = pageContent(page, newParents)
+    write(page.link.dri, content, extension) +: page.children.flatMap(renderPage(_, newParents))
+
+
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala
index 06c8108d6875..5a5e60f08879 100644
--- a/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala
@@ -21,6 +21,7 @@ enum Resource(val path: String):
   case Classpath(override val path: String, name: String) extends Resource(path)
   case File(override val path: String, file: Path) extends Resource(path)
   case URL(url: String) extends Resource(url)
+  case URLToCopy(url: String, dest: String) extends Resource(url)
 
 trait Resources(using ctx: DocContext) extends Locations, Writer:
   private def dynamicJsData =
@@ -38,28 +39,61 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
 
   private def dottyRes(path: String) = Resource.Classpath(path, s"dotty_res/$path")
 
-  def linkResources(dri: DRI, resources: Iterable[String]): Iterable[AppliedTag] =
+  def linkResources(dri: DRI, resources: Iterable[String], deferJs: Boolean): Iterable[AppliedTag] =
     def fileExtension(url: String): String =
       val param = url.indexOf('?')
       val end = if param < 0 then url.length else param
       val point = url.lastIndexOf('.', end)
       url.substring(point+1, end)
-
     for res <- resources yield
       fileExtension(res) match
         case "css" => link(rel := "stylesheet", href := resolveLink(dri, res))
-        case "js" => script(`type` := "text/javascript", src := resolveLink(dri, res), defer := "true")
+        case "js" => script(`type` := "text/javascript", src := resolveLink(dri, res), if (deferJs) Seq(defer := "true") else Nil)
         case _ => raw("")
 
+  val onlyRenderedResources: Seq[Resource] =
+    List(
+      "scripts/inkuire.js"
+    ).map(dottyRes) ++
+    List(
+      "scripts/inkuire-worker.js",
+      "webfonts/fa-brands-400.eot",
+      "webfonts/fa-brands-400.svg",
+      "webfonts/fa-brands-400.ttf",
+      "webfonts/fa-brands-400.woff",
+      "webfonts/fa-brands-400.woff2",
+      "webfonts/fa-regular-400.eot",
+      "webfonts/fa-regular-400.svg",
+      "webfonts/fa-regular-400.ttf",
+      "webfonts/fa-regular-400.woff",
+      "webfonts/fa-regular-400.woff2",
+      "webfonts/fa-solid-900.eot",
+      "webfonts/fa-solid-900.svg",
+      "webfonts/fa-solid-900.ttf",
+      "webfonts/fa-solid-900.woff",
+      "webfonts/fa-solid-900.woff2"
+    ).map(dottyRes)
+
+
+  val earlyMemberResources: Seq[Resource] =
+    List(
+      "scripts/theme.js"
+    ).map(dottyRes)
+
   val memberResources: Seq[Resource] =
     val fromResources = List(
       "styles/nord-light.css",
       "styles/scalastyle.css",
+      "styles/colors.css",
       "styles/dotty-icons.css",
       "styles/diagram.css",
       "styles/filter-bar.css",
-      "styles/search-bar.css",
-      "styles/scaladoc-searchbar.css",
+      "styles/code-snippets.css",
+      "styles/searchbar.css",
+      "styles/social-links.css",
+      "styles/ux.css",
+      "styles/versions-dropdown.css",
+      "styles/fontawesome.css",
       "hljs/highlight.pack.js",
       "hljs/LICENSE",
       "scripts/hljs-scala3.js",
@@ -71,7 +105,7 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
       "scripts/components/Input.js",
       "scripts/components/FilterGroup.js",
       "scripts/components/Filter.js",
-      "scripts/searchbar.js"
+      "scripts/scaladoc-scalajs.js"
     ).map(dottyRes)
 
     val urls = List(
@@ -79,36 +113,41 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
       "https://d3js.org/d3.v6.min.js",
       "https://cdn.jsdelivr.net/npm/graphlib-dot@0.6.2/dist/graphlib-dot.min.js",
       "https://cdnjs.cloudflare.com/ajax/libs/dagre-d3/0.6.1/dagre-d3.min.js",
+      "https://scastie.scala-lang.org/embedded.js"
     ).map(Resource.URL.apply)
 
+
     fromResources ++ urls ++ projectLogo ++ Seq(scaladocVersionFile, dynamicJsData)
 
   val searchDataPath = "scripts/searchData.js"
-  val memberResourcesPaths = Seq(searchDataPath) ++ memberResources.map(_.path)
-
+  val scastieConfigurationPath = "scripts/scastieConfiguration.js"
+  val memberResourcesPaths = Seq(searchDataPath) ++ Seq(scastieConfigurationPath) ++ memberResources.map(_.path)
+  val earlyMemberResourcePaths = earlyMemberResources.map(_.path)
 
   def searchData(pages: Seq[Page]) =
     def flattenToText(signature: Signature): String =
       signature.map {
-        case Link(name, dri) => name
-        case s: String => s
+        case Type(name, dri) => name
+        case Plain(s) => s
+        case Keyword(s) => s
       }.mkString
 
-    def mkEntry(dri: DRI, name: String, text: String, descr: String) = jsonObject(
-        "l" -> jsonString(absolutePath(dri)),
+    def mkEntry(dri: DRI, name: String, text: String, descr: String, kind: String) = jsonObject(
+        "l" -> jsonString(absolutePathWithAnchor(dri)),
         "n" -> jsonString(name),
         "t" -> jsonString(text),
-        "d" -> jsonString(descr)
+        "d" -> jsonString(descr),
+        "k" -> jsonString(kind)
       )
 
     def processPage(page: Page): Seq[JSON] =
       val res =  page.content match
-        case m: Member =>
+        case m: Member if m.kind != Kind.RootPackage =>
           val descr = m.dri.asFileLocation
           def processMember(member: Member): Seq[JSON] =
-            val signatureBuilder = ScalaSignatureProvider.rawSignature(member, InlineSignatureBuilder()).asInstanceOf[InlineSignatureBuilder]
-            val sig = Signature(member.kind.name, " ") ++ Seq(Link(member.name, member.dri)) ++ signatureBuilder.names.reverse
-            val entry = mkEntry(member.dri, member.name, flattenToText(sig), descr)
+            val signatureBuilder = ScalaSignatureProvider.rawSignature(member, InlineSignatureBuilder())().asInstanceOf[InlineSignatureBuilder]
+            val sig = Signature(Plain(s"${member.kind.name} "), Plain(member.name)) ++ signatureBuilder.names.reverse
+            val entry = mkEntry(member.dri, member.name, flattenToText(sig), descr, member.kind.name)
             val children = member
                 .membersBy(m => m.kind != Kind.Package && !m.kind.isInstanceOf[Classlike])
                 .filter(m => m.origin == Origin.RegularlyDefined && m.inheritedFrom.isEmpty)
@@ -116,19 +155,25 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
 
           processMember(m)
         case _ =>
-          Seq(mkEntry(page.link.dri, page.link.name, page.link.name, ""))
+          Seq(mkEntry(page.link.dri, page.link.name, page.link.name, "", "static"))
 
       res ++ page.children.flatMap(processPage)
 
     val entries = pages.flatMap(processPage)
     Resource.Text(searchDataPath, s"pages = ${jsonList(entries)};")
 
+  def scastieConfiguration() =
+    Resource.Text(scastieConfigurationPath, s"""scastieConfiguration = "${
+      ctx.args.scastieConfiguration.replace('"'.toString, """\"""")
+    }"""")
+
 
-  def allResources(pages: Seq[Page]): Seq[Resource] = memberResources ++ Seq(
+  def allResources(pages: Seq[Page]): Seq[Resource] = earlyMemberResources ++ memberResources ++ Seq(
     dottyRes("favicon.ico"),
     dottyRes("fonts/dotty-icons.woff"),
     dottyRes("fonts/dotty-icons.ttf"),
     dottyRes("images/scaladoc_logo.svg"),
+    dottyRes("images/scaladoc_logo_dark.svg"),
     dottyRes("images/class.svg"),
     dottyRes("images/class_comp.svg"),
     dottyRes("images/object.svg"),
@@ -138,6 +183,11 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
     dottyRes("images/enum.svg"),
     dottyRes("images/enum_comp.svg"),
     dottyRes("images/given.svg"),
+    dottyRes("images/method.svg"),
+    dottyRes("images/type.svg"),
+    dottyRes("images/val.svg"),
+    dottyRes("images/package.svg"),
+    dottyRes("images/static.svg"),
     dottyRes("images/github-icon-black.png"),
     dottyRes("images/github-icon-white.png"),
     dottyRes("images/discord-icon-black.png"),
@@ -146,21 +196,29 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
     dottyRes("images/twitter-icon-white.png"),
     dottyRes("images/gitter-icon-black.png"),
     dottyRes("images/gitter-icon-white.png"),
-    searchData(pages)
+    searchData(pages),
+    scastieConfiguration(),
   )
 
   def renderResource(resource: Resource): Seq[String] =
-    resource match
-      case Resource.Text(path, content) =>
-        Seq(write(path, content))
-      case Resource.Classpath(path, name) =>
-        getClass.getClassLoader.getResourceAsStream(name) match
-          case null =>
-            report.error(s"Unable to find $name on classpath")
-            Nil
-          case is =>
-            try Seq(copy(is, path)) finally is.close()
-      case Resource.File(path, file) =>
-        Seq(copy(file, path))
-      case Resource.URL(url) =>
-        Nil
+    val normalizedPath = resource.path.replace('\\', '/')
+    if normalizedPath.endsWith(".html") && apiPaths.contains(normalizedPath) then
+      report.error(s"Conflict between resource and API member for $normalizedPath. $pathsConflictResoultionMsg")
+      Nil
+    else
+      resource match
+        case Resource.Text(path, content) =>
+          Seq(write(path, content))
+        case Resource.Classpath(path, name) =>
+          getClass.getClassLoader.getResourceAsStream(name) match
+            case null =>
+              report.error(s"Unable to find $name on classpath")
+              Nil
+            case is =>
+              try Seq(copy(is, path)) finally is.close()
+        case Resource.File(path, file) =>
+          Seq(copy(file, path))
+        case Resource.URL(url) =>
+          Nil
+        case Resource.URLToCopy(url, dest) =>
+          Seq(copy(new URL(url).openStream(), dest))
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/SignatureRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/SignatureRenderer.scala
index 4abc2090954c..59ed3a697813 100644
--- a/scaladoc/src/dotty/tools/scaladoc/renderers/SignatureRenderer.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/renderers/SignatureRenderer.scala
@@ -15,7 +15,7 @@ trait SignatureRenderer:
   def currentDri: DRI
   def link(dri: DRI): Option[String]
 
-  def renderElement(e: String | (String, DRI) | Link) = renderElementWith(e)
+  def renderElement(e: SignaturePart) = renderElementWith(e)
 
   def renderLink(name: String, dri: DRI, modifiers: AppliedAttr*) =
     renderLinkContent(name, dri, modifiers:_*)
@@ -28,7 +28,10 @@ trait SignatureRenderer:
       case Some(link) => a(href := link, modifiers)(content)
       case _ => unresolvedLink(content, modifiers:_*)
 
-  def renderElementWith(e: String | (String, DRI) | Link, modifiers: AppliedAttr*) = e match
-    case (name, dri) => renderLink(name, dri, modifiers:_*)
-    case name: String => raw(name)
-    case Link(name, dri) => renderLink(name, dri, modifiers:_*)
+  def renderElementWith(e: SignaturePart, modifiers: AppliedAttr*) = e match
+    case Type(name, Some(dri)) =>
+      val attrs = Seq(Attr("t") := "t") ++ modifiers
+      renderLink(name, dri, attrs:_*)
+    case Type(name, None) => span(Attr("t") := "t")(name)
+    case Keyword(name) => span(Attr("t") := "k")(name)
+    case Plain(name) => raw(name)
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala
index a2748850ba22..ad97b19fbb24 100644
--- a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala
@@ -22,7 +22,7 @@ trait SiteRenderer(using DocContext) extends Locations:
   def templateToPage(t: LoadedTemplate, staticSiteCtx: StaticSiteContext): Page =
     val dri = staticSiteCtx.driFor(t.file.toPath)
     val content = ResolvedTemplate(t, staticSiteCtx)
-    Page(Link(t.templateFile.title, dri), content, t.children.map(templateToPage(_, staticSiteCtx)))
+    Page(Link(t.templateFile.title.name, dri), content, t.children.map(templateToPage(_, staticSiteCtx)), t.hidden)
 
   private val HashRegex = "([^#]+)(#.+)".r
 
@@ -33,22 +33,32 @@ trait SiteRenderer(using DocContext) extends Locations:
         case HashRegex(path, prefix) => (path, prefix)
         case _ => (str, "")
 
-      val res = ctx.driForLink(content.template.templateFile, path).filter(driExists)
+      val res = ctx.driForLink(content.template.file, path).filter(driExists)
       res.headOption.map(pathToPage(pageDri, _) + prefix)
 
     def processLocalLink(str: String): String =
-      Try(URL(str)).map(_ => str).toOption.orElse {
-        tryAsDri(str)
-      }.orElse {
-        Option.when(
-          Files.exists(Paths.get(content.ctx.root.toPath.toAbsolutePath.toString, str))
-        )(
-          resolveLink(pageDri, str.stripPrefix("/"))
-        )
-      }.getOrElse {
-        report.warn(s"Unable to resolve link '$str'", content.template.file)
-        str
-      }
+      val staticSiteRootPath = content.ctx.root.toPath.toAbsolutePath
+      def asValidURL: Option[String] = Try(URL(str)).toOption.map(_ => str)
+      def asAsset: Option[String] = Option.when(
+        Files.exists(staticSiteRootPath.resolve("_assets").resolve(str.stripPrefix("/")))
+      )(
+        resolveLink(pageDri, str.stripPrefix("/"))
+      )
+      def asStaticSite: Option[String] = tryAsDri(str)
+
+      /* Link resolving checks performs multiple strategies with following priority:
+        1. We check if the link is a valid URL e.g. http://dotty.epfl.ch
+        2. We check if the link leads to other static site
+        3. We check if the link leads to existing asset e.g. images/logo.svg -> <static-site-root>/_assets/images/logo.svg
+      */
+
+      asValidURL
+        .orElse(asStaticSite)
+        .orElse(asAsset)
+        .getOrElse {
+          report.warn(s"Unable to resolve link '$str'", content.template.templateFile.file)
+          str
+        }
 
     def processLocalLinkWithGuard(str: String): String =
       if str.startsWith("#") || str.isEmpty then
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/WikiDocRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/WikiDocRenderer.scala
deleted file mode 100644
index 6f52abb0a61b..000000000000
--- a/scaladoc/src/dotty/tools/scaladoc/renderers/WikiDocRenderer.scala
+++ /dev/null
@@ -1,70 +0,0 @@
-package dotty.tools.scaladoc
-package renderers
-
-import dotty.tools.scaladoc.tasty.comments.wiki._
-import util.HTML._
-import com.vladsch.flexmark.util.ast.{Node => MdNode}
-import dotty.tools.scaladoc.tasty.comments.wiki.WikiDocElement
-import dotty.tools.scaladoc.tasty.comments.markdown.DocFlexmarkRenderer
-
-class DocRender(signatureRenderer: SignatureRenderer)(using DocContext):
-
-  def renderDocPart(doc: DocPart): AppliedTag = doc match
-    case md: MdNode => renderMarkdown(md)
-    case Nil => raw("")
-    case Seq(elem: WikiDocElement) => renderElement(elem)
-    case list: Seq[WikiDocElement @unchecked] => div(list.map(renderElement))
-
-  private def renderMarkdown(el: MdNode): AppliedTag =
-    raw(DocFlexmarkRenderer.render(el)( (link,name) =>
-      renderLink(link, default => text(if name.isEmpty then default else name)).toString
-    ))
-
-  private def listItems(items: Seq[WikiDocElement]) =
-    items.map(i => li(renderElement(i)))
-  private def notSupported(name: String, content: AppliedTag): AppliedTag =
-    report.warning(s"Wiki syntax does not support $name in ${signatureRenderer.currentDri.location}")
-    content
-
-  private def renderLink(target: DocLink, linkBody: String => TagArg): AppliedTag =
-    target match
-      case DocLink.ToDRI(dri: DRI, name: String) =>
-        signatureRenderer.renderLinkContent(linkBody(name), dri)
-      case DocLink.ToURL(url) => a(href := url)(linkBody(url))
-      case DocLink.UnresolvedDRI(query, msg) =>
-        val tooltip = s"Problem linking $query: $msg"
-        signatureRenderer.unresolvedLink(linkBody(query), titleAttr :=  tooltip)
-
-  private def renderElement(e: WikiDocElement): AppliedTag = e match
-    case Title(text, level) =>
-      val content = renderElement(text)
-      level match
-          case 1 => h1(content)
-          case 2 => h2(content)
-          case 3 => h3(content)
-          case 4 => h4(content)
-          case 5 => h5(content)
-          case 6 => h6(content)
-    case Paragraph(text) => p(renderElement(text))
-    case Code(data: String) => pre(code(raw(data))) // TODO add classes
-    case HorizontalRule => hr
-
-    case UnorderedList(items) => ul(listItems(items))
-    case OrderedList(items, style) => ol(listItems(items)) // TODO use style
-    case Chain(items: Seq[Inline]) => span(items.map(renderElement))
-    case Italic(text) => span(cls:="italic")(renderElement(text))
-    case Underline(text) => span(cls:="underline")(renderElement(text))
-    case Bold(text) => span(cls:="bold")(renderElement(text))
-    case Monospace(text) => code(renderElement(text))
-    case Superscript(text) => span(cls:="superscript")(renderElement(text))  // TODO implement style
-    case Subscript(text) => span(cls:="subscript")(renderElement(text))  // TODO implement style
-    case Link(target, body) =>
-      renderLink(target, default => body.fold[TagArg](text(default))(renderElement))
-    case Text(text) => raw(text)
-    case Summary(text) => renderElement(text)
-    case HtmlTag(content) => raw(content)
-
-    case DefinitionList(items) => notSupported("DefinitionList", raw(""))
-
-    case link: RepresentationLink =>
-      notSupported("Subscript", renderElement(link.title))
diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala
index dad7aaa9e650..029da21bdda7 100644
--- a/scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala
@@ -18,8 +18,8 @@ trait Writer(using ctx: DocContext) extends Locations:
     if !Files.exists(absPath.getParent) then Files.createDirectories(absPath.getParent)
     absPath
 
-  def write(dri: DRI, content: AppliedTag): String =
-    val path = absolutePath(dri)
+  def write(dri: DRI, content: AppliedTag, extension: String = "html"): String =
+    val path = absolutePath(dri, extension)
     Files.write(dest(path), content.toString.getBytes)
     path
 
@@ -33,4 +33,4 @@ trait Writer(using ctx: DocContext) extends Locations:
 
   def copy(from: InputStream, to: String): String =
     Files.copy(from, dest(to))
-    to
\ No newline at end of file
+    to
diff --git a/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala
index beda1eb14676..c8388a8112bd 100644
--- a/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala
@@ -16,7 +16,8 @@ case class LazyEntry(getKey: String, value: () => String) extends JMapEntry[Stri
 case class LoadedTemplate(
   templateFile: TemplateFile,
   children: List[LoadedTemplate],
-  file: File):
+  file: File,
+  hidden: Boolean = false):
 
   private def brief(ctx: StaticSiteContext): String =
     try
@@ -32,23 +33,24 @@ case class LoadedTemplate(
     lazy val entrySet: JSet[JMapEntry[String, Object]] =
       val site = templateFile.settings.getOrElse("page", Map.empty).asInstanceOf[Map[String, Object]]
       site.asJava.entrySet() ++ JSet(
-        LazyEntry("url", () => ctx.relativePath(LoadedTemplate.this).toString),
-        LazyEntry("title", () => templateFile.title),
+        LazyEntry("url", () => "/" ++ ctx.pathFromRoot(LoadedTemplate.this).toString),
+        LazyEntry("title", () => templateFile.title.name),
         LazyEntry("excerpt", () => brief(ctx))
       )
 
   def resolveToHtml(ctx: StaticSiteContext): ResolvedPage =
     val posts = children.map(_.lazyTemplateProperties(ctx))
     def getMap(key: String) = templateFile.settings.getOrElse(key, Map.empty).asInstanceOf[Map[String, Object]]
+
     val sourceLinks = if !file.exists() then Nil else
       // TODO (https://github.com/lampepfl/scala3doc/issues/240): configure source root
       // toRealPath is used to turn symlinks into proper paths
       val actualPath = Paths.get("").toAbsolutePath.relativize(file.toPath.toRealPath())
       ctx.sourceLinks.pathTo(actualPath).map("viewSource" -> _ ) ++
-        ctx.sourceLinks.pathTo(actualPath, operation = "edit").map("editSource" -> _ )
+        ctx.sourceLinks.pathTo(actualPath, operation = "edit", optionalRevision = Some("master")).map("editSource" -> _)
 
     val updatedSettings = templateFile.settings ++ ctx.projectWideProperties +
       ("site" -> (getMap("site") + ("posts" -> posts))) + ("urls" -> sourceLinks.toMap) +
-      ("page" -> (getMap("page") + ("title" -> templateFile.title)))
+      ("page" -> (getMap("page") + ("title" -> templateFile.title.name)))
 
-    templateFile.resolveInner(RenderingContext(updatedSettings, ctx.layouts))
+    templateFile.resolveInner(RenderingContext(updatedSettings, ctx.layouts))(using ctx)
diff --git a/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala b/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala
index ff3c2ae2fc9f..9d793c403b2d 100644
--- a/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala
@@ -6,31 +6,77 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.core.`type`.TypeReference;
 import collection.JavaConverters._
 import java.util.Optional
+import scala.beans._
 
 enum Sidebar:
-  val title: String
-  case Category(title: String, nested: List[Sidebar])
-  case Page(title: String, url: String)
+  case Category(
+    title: Option[String],
+    indexPath: Option[String],
+    nested: List[Sidebar],
+    directory: Option[String]
+  )
+  case Page(title: Option[String], pagePath: String, hidden: Boolean)
 
 object Sidebar:
-  case class RawInput(var title: String,var url: String, var subsection: JList[RawInput]):
-    def this() = this("", "", JList())
+  case class RawInput(
+    @BeanProperty var title: String,
+    @BeanProperty var page: String,
+    @BeanProperty var index: String,
+    @BeanProperty var subsection: JList[RawInput],
+    @BeanProperty var directory: String,
+    @BooleanBeanProperty var hidden: Boolean
+  ):
+    def this() = this("", "", "", JList(), "", false)
 
-    def setTitle(t: String) = this.title = t
-    def setUrl(u: String) = this.url = u
-    def setSubsection(l: JList[RawInput]) = this.subsection = l
+  private object RawInputTypeRef extends TypeReference[RawInput]
 
-  type RawInnerTpe = JMap[String, JList[RawInput]]
-  private object RawTypeRef extends TypeReference[RawInnerTpe]
+  private def toSidebar(r: RawInput)(using CompilerContext): Sidebar = r match
+    case RawInput(title, page, index, subsection, dir, hidden) if page.nonEmpty && index.isEmpty && subsection.isEmpty() =>
+      Sidebar.Page(Option.when(title.nonEmpty)(title), page, hidden)
+    case RawInput(title, page, index, subsection, dir, hidden) if page.isEmpty && (!subsection.isEmpty() || !index.isEmpty()) =>
+      Sidebar.Category(Option.when(title.nonEmpty)(title), Option.when(index.nonEmpty)(index), subsection.asScala.map(toSidebar).toList, Option.when(dir.nonEmpty)(dir))
+    case RawInput(title, page, index, subsection, dir, hidden) =>
+      report.error(s"Error parsing YAML configuration file.\n$schemaMessage")
+      Sidebar.Page(None, page, hidden)
 
-  private def toSidebar(r: RawInput): Sidebar = r match
-    case RawInput(title, url, list) if title.nonEmpty && url.nonEmpty && list.isEmpty() =>
-      Sidebar.Page(title, url)
-    case RawInput(title, url, list) if title.nonEmpty && url.isEmpty && !list.isEmpty() =>
-      Sidebar.Category(title, list.asScala.map(toSidebar).toList)
+  private def schemaMessage: String =
+    s"""Static site YAML configuration file should comply with the following description:
+      |The root element of static site needs to be <subsection>
+      |`title` and `directory` properties are ignored in root subsection.
+      |
+      |<subsection>:
+      |  title: <string> # optional - Default value is file name. Title can be also set using front-matter.
+      |  index: <string> # optional - If not provided, default empty index template is generated.
+      |  directory: <string> # optional - By default, directory name is title name in kebab case.
+      |  subsection: # optional - If not provided, pages are loaded from the index directory
+      |    - <subsection> | <page>
+      |  # either index or subsection needs to be present
+      |<page>:
+      |  title: <string> # optional - Default value is file name. Title can be also set using front-matter.
+      |  page: <string>
+      |  hidden: <boolean> # optional - Default value is false.
+      |
+      |For more information visit:
+      |https://docs.scala-lang.org/scala3/guides/scaladoc/static-site.html
+      |""".stripMargin
 
-  def load(content: String): Seq[Sidebar] =
+  def load(content: String | java.io.File)(using CompilerContext): Sidebar.Category =
+    import scala.util.Try
     val mapper = ObjectMapper(YAMLFactory())
-    val raw: RawInnerTpe = mapper.readValue(content, RawTypeRef)
+    def readValue = content match
+      case s: String => mapper.readValue(s, RawInputTypeRef)
+      case f: java.io.File => mapper.readValue(f, RawInputTypeRef)
 
-    raw.get("sidebar").asScala.toList.map(toSidebar)
+    val root: RawInput = Try(readValue)
+      .fold(
+        { e =>
+          report.warn(schemaMessage, e)
+          new RawInput()
+        },
+        identity
+      )
+    toSidebar(root) match
+      case c: Sidebar.Category => c
+      case _ =>
+        report.error(s"Root element is not a subsection.\n$schemaMessage")
+        Sidebar.Category(None, None, List.empty, None)
diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala
index f618492e15f8..9f14442a7dbe 100644
--- a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala
@@ -9,175 +9,99 @@ import java.nio.file.Paths
 
 import scala.util.Try
 import collection.JavaConverters._
+import scala.annotation.static
 
 class StaticSiteContext(
   val root: File,
   val args: Scaladoc.Args,
-  val sourceLinks: SourceLinks)(using val outerCtx: CompilerContext):
+  val sourceLinks: SourceLinks,
+  val snippetCompilerArgs: snippets.SnippetCompilerArgs,
+  val snippetChecker: snippets.SnippetChecker)(using val outerCtx: CompilerContext):
 
   var memberLinkResolver: String => Option[DRI] = _ => None
 
-  def indexTemplate(): Seq[LoadedTemplate] =
-    val files = List(new File(root, "index.html"), new File(root, "index.md")).filter { _.exists() }
+  val docsPath = root.toPath.resolve("_docs")
+  val blogPath = root.toPath.resolve("_blog")
 
-    if files.size > 1 then
-      val msg = s"ERROR: Multiple root index pages found: ${files.map(_.getAbsolutePath)}"
-      report.error(msg)
+  val relativizeFrom = if args.apiSubdirectory then docsPath else root.toPath
 
-    files.flatMap(loadTemplate(_, isBlog = false)).take(1)
+  val siteExtensions = Set(".html", ".md")
 
   lazy val layouts: Map[String, TemplateFile] =
     val layoutRoot = new File(root, "_layouts")
     val dirs: Array[File] = Option(layoutRoot.listFiles()).getOrElse(Array())
-    dirs.map { it => loadTemplateFile(it) }.map { it => it.name -> it }.toMap
-
-  lazy val sideBarConfig =
-    val sidebarFile = root.toPath.resolve("sidebar.yml")
-    if (!Files.exists(sidebarFile)) None
-    else Some(Sidebar.load(Files.readAllLines(sidebarFile).asScala.mkString("\n")))
-
-  lazy val templates: Seq[LoadedTemplate] =
-    sideBarConfig.fold(loadAllFiles().sortBy(_.templateFile.title))(_.map(loadSidebarContent))
-
-  lazy val orphanedTemplates: Seq[LoadedTemplate] = {
-    def doFlatten(t: LoadedTemplate): Seq[Path] =
-      t.file.toPath +: t.children.flatMap(doFlatten)
-    val mainFiles = templates.flatMap(doFlatten)
-
-    val allPaths =
-      if !Files.exists(docsPath) then Nil
-      else Files.walk(docsPath, FileVisitOption.FOLLOW_LINKS).iterator().asScala.toList
-
-    val orphanedFiles = allPaths.filterNot { p =>
-       def name = p.getFileName.toString
-       def isMain = name == "index.html" || name == "index.md"
-       mainFiles.contains(p) || (isMain && mainFiles.contains(p.getParent))
-    }.filter { p =>
-        val name = p.getFileName.toString
-        name.endsWith(".md") || name.endsWith(".html")
+    dirs.map { it => loadTemplateFile(it)(using this) }.map { it => it.name -> it }.toMap
+
+  lazy val staticSiteRoot: StaticSiteRoot = StaticSiteLoader(root, args)(using this, outerCtx).load()
+
+  lazy val allTemplates =
+    def process(l: LoadedTemplate): List[LoadedTemplate] =
+      l +: l.children.flatMap(process)
+    process(staticSiteRoot.rootTemplate)
+  /** Handles redirecting from multiple locations to one page
+   *
+   * For each entry in redirectFrom setting, create a page which contains code that redirects you to the page where the redirectFrom is defined.
+   */
+  lazy val redirectTemplates: Seq[(LoadedTemplate, DRI, DRI)] =
+    allTemplates.flatMap { loadedTemplate =>
+      val redirectFrom = loadedTemplate.templateFile.settings.getOrElse("page", Map.empty).asInstanceOf[Map[String, Object]].get("redirectFrom")
+      def redirectToTemplate(redirectFrom: String) =
+        val fakeFile = new File(docsPath.toFile, redirectFrom)
+        val driFrom = driFor(fakeFile.toPath)
+        val driTo = driFor(loadedTemplate.file.toPath)
+        (LoadedTemplate(layouts("redirect"), List.empty, fakeFile), driFrom, driTo)
+      redirectFrom.map {
+        case redirectFrom: String => Seq(redirectToTemplate(redirectFrom))
+        case redirects: List[?] => redirects.asInstanceOf[List[String]].map(redirectToTemplate)
+      }.getOrElse(Nil)
     }
 
-    orphanedFiles.flatMap(p => loadTemplate(p.toFile, isBlog = false))
-  }
-
-  val docsPath = root.toPath.resolve("docs")
-
-  private def isValidTemplate(file: File): Boolean =
-    (file.isDirectory && !file.getName.startsWith("_")) ||
-      file.getName.endsWith(".md") ||
-      file.getName.endsWith(".html")
-
-
-  private def loadTemplate(from: File, isBlog: Boolean): Option[LoadedTemplate] =
-    if (!isValidTemplate(from)) None else
-      try
-        val topLevelFiles = if isBlog then Seq(from, new File(from, "_posts")) else Seq(from)
-        val allFiles = topLevelFiles.filter(_.isDirectory).flatMap(_.listFiles())
-        val (indexes, children) = allFiles.flatMap(loadTemplate(_, isBlog)).partition(_.templateFile.isIndexPage())
-
-        def loadIndexPage(): TemplateFile =
-          val indexFiles = from.listFiles { file => file.getName == "index.md" || file.getName == "index.html" }
-          indexes match
-            case Nil => emptyTemplate(from, from.getName)
-            case Seq(loadedTemplate) => loadedTemplate.templateFile.copy(file = from)
-            case _ =>
-              // TODO (https://github.com/lampepfl/scaladoc/issues/238): provide proper error handling
-              val msg = s"ERROR: Multiple index pages for $from found in ${indexes.map(_.file)}"
-              throw new java.lang.RuntimeException(msg)
-
-        val templateFile = if (from.isDirectory) loadIndexPage() else loadTemplateFile(from)
-
-        def dateFrom(p: LoadedTemplate, default: String = "1900-01-01"): String =
-          val pageSettings = p.templateFile.settings.get("page").collect{ case m: Map[String @unchecked, _] => m }
-          pageSettings.flatMap(_.get("date").collect{ case s: String => s}).getOrElse(default) // blogs without date are last
-
-        val processedChildren: Seq[LoadedTemplate] = if !isBlog then children.sortBy(_.templateFile.title) else
-          children.sortBy(dateFrom(_)).reverse
-
-        processedChildren.foreach { child =>
-          val regex = raw"(\d*-\d*-\d*)-(.*)".r
-          val setDate = dateFrom(child, "<no date>")
-          child.templateFile.name match
-            case regex(date, name) if date != setDate =>
-              val msg = s"Date $date in blog file: ${child.templateFile.name} doesn't match date from settings: $setDate."
-              report.warn(msg, from)
-            case name =>
-        }
-
-        val processedTemplate = // Set provided name as arg in page for `docs`
-          if from.getParentFile.toPath == docsPath && templateFile.isIndexPage() then
-            if templateFile.title != "index" then
-              report.warn("Property `title` will be overriden by project name", from)
-
-            templateFile.copy(title = args.name)
-          else templateFile
-
-        Some(LoadedTemplate(processedTemplate, processedChildren.toList, from))
-      catch
-          case e: RuntimeException =>
-            // TODO (https://github.com/lampepfl/scaladoc/issues/238): provide proper error handling
-            e.printStackTrace()
-            None
-
-  private def loadSidebarContent(entry: Sidebar): LoadedTemplate = entry match
-    case Sidebar.Page(title, url) =>
-      val isBlog = title == "Blog"
-      val path = if isBlog then "blog" else
-        if Files.exists(root.toPath.resolve(url)) then url
-        else url.stripSuffix(".html") + ".md"
-
-      val file = root.toPath.resolve(path).toFile
-      val LoadedTemplate(template, children, _) = loadTemplate(file, isBlog).get // Add proper logging if file does not exisits
-      LoadedTemplate(template.copy(settings = template.settings + ("title" -> title), file = file), children, file)
-
-    case Sidebar.Category(title, nested) =>
-      // Add support for index.html/index.md files!
-      val fakeFile = new File(new File(root, "docs"), title)
-      LoadedTemplate(emptyTemplate(fakeFile, title), nested.map(loadSidebarContent), fakeFile)
-
-  private def loadAllFiles() =
-    def dir(name: String)= List(new File(root, name)).filter(_.isDirectory)
-    dir("docs").flatMap(_.listFiles()).flatMap(loadTemplate(_, isBlog = false))
-      ++ dir("blog").flatMap(loadTemplate(_, isBlog = true))
-
-  def driForLink(template: TemplateFile, link: String): Seq[DRI] =
-    val pathsDri: Option[Seq[DRI]] = Try {
-      val baseFile =
-        if link.startsWith("/") then root.toPath.resolve(link.drop(1))
-        else template.file.toPath.getParent().resolve(link).normalize()
-
-      baseFile.getFileName.toString.split("\\.").headOption.toSeq.flatMap { baseFileName =>
-        Seq(
-          Some(baseFile.resolveSibling(baseFileName + ".html")),
-          Some(baseFile.resolveSibling(baseFileName + ".md")),
-          Option.when(baseFileName == "index")(baseFile.getParent)
-        ).flatten.filter(Files.exists(_)).map(driFor)
+  def driForLink(loadedTemplateFile: File, link: String): Seq[DRI] =
+    def possibleLinks(link: String): Seq[Path] =
+      // Destination file of template
+      val templateDestLocation = loadedTemplateFile.toPath
+      // Source file of template (may not exist - e.g. redirect templates)
+      val templateSourceLocation = staticSiteRoot.reverseSiteMappings.get(templateDestLocation)
+
+      // Check if link is relative or absolute
+      if link.startsWith("/")
+      then Seq(root.toPath.resolve(link.drop(1)))
+      else Seq(templateDestLocation.getParent.resolve(link).normalize) ++
+        templateSourceLocation.map(_.getParent.resolve(link).normalize)
+
+    // Try to strip site extension and create all possible file paths
+    val fileNames = if siteExtensions.exists(link.endsWith(_))
+      then {
+        val withoutExt = siteExtensions.find(link.endsWith(_)).fold(link)(ext => link.stripSuffix(ext))
+        siteExtensions.map(withoutExt + _).toSeq
       }
-    }.toOption.filter(_.nonEmpty)
-    pathsDri.getOrElse(memberLinkResolver(link).toList)
+      else Seq(link)
+
+    val baseFiles = fileNames.flatMap(possibleLinks)
+
+    // If file exists in source files, map it to destination file. If file exists in destination file, just take it.
+    val links = baseFiles.flatMap(p =>
+      Option.when(staticSiteRoot.sources.contains(p))(p).map(p => staticSiteRoot.siteMappings(p))
+        .orElse(Option.when(staticSiteRoot.dests.contains(p))(p))
+    )
+
+    links match {
+      case link :: rest => Seq(driFor(link))
+      case Nil => memberLinkResolver(link).toSeq
+    }
 
   def driFor(dest: Path): DRI =
-    val rawFilePath = root.toPath.relativize(dest)
+    val rawFilePath = relativizeFrom.relativize(dest)
     val pageName = dest.getFileName.toString
     val dotIndex = pageName.lastIndexOf('.')
 
     val relativePath =
-      if rawFilePath.startsWith(Paths.get("blog","_posts")) then
-        val regex = raw"(\d*)-(\d*)-(\d*)-(.*)\..*".r
-        pageName.toString match
-          case regex(year, month, day, name) =>
-            rawFilePath.getParent.resolveSibling(Paths.get(year, month, day, name))
-          case _ =>
-            val msg = s"Relative path for blog: $rawFilePath doesn't match `yyy-mm-dd-name.md` format."
-            report.warn(msg, dest.toFile)
-            rawFilePath.resolveSibling(pageName.substring(0, dotIndex))
-      else
-        if (dotIndex < 0) rawFilePath.resolve("index")
-        else rawFilePath.resolveSibling(pageName.substring(0, dotIndex))
+      if (dotIndex < 0) rawFilePath.resolve("index")
+      else rawFilePath.resolveSibling(pageName.substring(0, dotIndex))
 
     DRI.forPath(relativePath)
 
-  def relativePath(myTemplate: LoadedTemplate) = root.toPath.relativize(myTemplate.file.toPath)
+  def pathFromRoot(myTemplate: LoadedTemplate) = root.toPath.relativize(myTemplate.file.toPath)
 
   val projectWideProperties =
     Seq("projectName" -> args.name) ++
diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala
new file mode 100644
index 000000000000..c9ace108c9b2
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala
@@ -0,0 +1,208 @@
+package dotty.tools.scaladoc
+package site
+
+import java.io.File
+import java.nio.file.Files
+import java.nio.file.{ Paths, Path }
+import scala.io._
+
+class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSiteContext, CompilerContext):
+  val ctx: StaticSiteContext = summon[StaticSiteContext]
+
+  val possibleYamlFiles: Seq[String] = Seq(
+    "sidebar.yml"
+  )
+
+  def load(): StaticSiteRoot = {
+    // Check whether there's YAML file defining static site structure
+    possibleYamlFiles
+      .map(name => root.toPath.resolve(name))
+      .find(path => Files.exists(path))
+      .fold(loadBasedOnFileSystem()) { path =>
+        val entries = Sidebar.load(path.toFile)
+        loadBasedOnYaml(entries)
+      }
+  }
+
+  /** Method loading static site structure based on YAML configuration file.
+   *
+   * The rendered static site will only contain pages that are present in YAML.
+   * The following rules are applied:
+   *  - Each subsection will be a separate directory.
+   *  - Nested subsections will result in nested directories.
+   *  - If the subsection object contains location of index and doesn't contain any item,
+   *    items are loaded using file system from the directory of the index file.
+   *  - By default, directory name is a subsection title converted to kebab case.
+   *    However, you can override default name by setting "directory" property of the subsection object.
+   *
+   */
+  def loadBasedOnYaml(yamlRoot: Sidebar.Category): StaticSiteRoot = {
+    val rootDest = ctx.docsPath.resolve("index.html").toFile
+    val rootIndex = yamlRoot.indexPath
+      .map(ctx.docsPath.resolve(_).toFile)
+      .filter(_.exists)
+      .fold(emptyTemplate(rootDest, "index")) { f =>
+        val loaded = loadTemplateFile(f)
+        if loaded.title.name != "index"
+        then report.warn("Property `title` will be overridden by project name", f)
+        loaded
+      }.copy(title = TemplateName.FilenameDefined(args.name))
+
+    def loadChild(pathFromRoot: Path): Sidebar => LoadedTemplate = {
+      case Sidebar.Category(optionTitle, optionIndexPath, nested, dir) =>
+        val indexPageOpt = optionIndexPath
+          .map(relativizeIfNeeded)
+          .map(_.toFile)
+          .filter(_.exists)
+          .map(loadTemplateFile(_))
+        val title = (
+          optionTitle.map(TemplateName.SidebarDefined(_)) ++
+          indexPageOpt.map(_.title)
+        ).headOption.getOrElse {
+          report.error(s"Title for subsection needs to be set in YAML config or in index file")
+          TemplateName.FilenameDefined("unnamed_section")
+        }
+        val categoryPath = dir.fold(pathFromRoot.resolve(toKebabCase(title.name)))(pathFromRoot.resolve(_))
+        val indexPage = indexPageOpt.getOrElse(emptyTemplate(categoryPath.resolve("index.html").toFile, title.name))
+
+        val children = optionIndexPath.filter(_ => nested.isEmpty).fold(
+          nested.map(child => loadChild(categoryPath)(child))
+        ) { indexPath =>
+          val indexPathDirectory = Paths.get(indexPath).getParent
+          val filesInDirectory = Option(root.toPath.resolve(indexPathDirectory).toFile.listFiles)
+          filesInDirectory.fold(List.empty) { files =>
+            val mappingFunc: File => File = file => {
+              val relativeFile = root.toPath.resolve(indexPathDirectory).relativize(file.toPath)
+              categoryPath.resolve(relativeFile).toFile
+            }
+            files.toList
+              .filter(_.toPath != indexPage.file.toPath)
+              .flatMap(file => loadRecursively(file, mappingFunc))
+          }
+        }
+
+        LoadedTemplate(indexPage, children, categoryPath.resolve("index.html").toFile)
+      case Sidebar.Page(optionTitle, pagePath, hidden) =>
+        val path = relativizeIfNeeded(pagePath)
+        val file = path.toFile
+        val title = optionTitle.map(TemplateName.SidebarDefined(_))
+        val templateFile = loadTemplateFile(file, title)
+        LoadedTemplate(templateFile, List.empty, pathFromRoot.resolve(file.getName).toFile, hidden)
+    }
+    val rootTemplate = LoadedTemplate(rootIndex, yamlRoot.nested.map(c => loadChild(ctx.docsPath)(c)) ++ loadBlog(), rootDest)
+    val mappings = createMapping(rootTemplate)
+    StaticSiteRoot(rootTemplate, mappings)
+  }
+
+  def loadBasedOnFileSystem(): StaticSiteRoot = {
+    val rootTemplate =
+      loadRecursively(ctx.docsPath.toFile).getOrElse(
+        LoadedTemplate(emptyTemplate(ctx.docsPath.resolve("index.html").toFile, "index"), List.empty, ctx.docsPath.resolve("index.html").toFile)
+      )
+
+    if rootTemplate.templateFile.title.name != "index" then {
+      report.warn("Property `title` will be overridden by project name", rootTemplate.templateFile.file)
+    }
+
+    val withChangedTitle =
+      rootTemplate.copy(templateFile = rootTemplate.templateFile.copy(title = TemplateName.FilenameDefined(args.name)))
+
+    val withBlog = loadBlog().fold(withChangedTitle)(blog => withChangedTitle.copy(children = withChangedTitle.children :+ blog))
+
+    val mappings = createMapping(withBlog)
+    StaticSiteRoot(withBlog, mappings)
+  }
+
+  def loadBlog(): Option[LoadedTemplate] = {
+    type Date = (String, String, String)
+    val rootPath = ctx.blogPath
+    val defaultDirectory = "blog"
+    if (!Files.exists(rootPath)) None
+    else {
+      val indexPageOpt = Seq(
+          rootPath.resolve("index.md"),
+          rootPath.resolve("index.html"),
+      ).filter(p => Files.exists(p)) match {
+          case Nil => None
+          case indexPath :: Nil => Some(indexPath)
+          case list =>
+            report.warning(s"Multiple index pages for $rootPath found in ${list.map(_.toFile)}. Defaulting to first.")
+            list.headOption
+      }
+      val indexTemplateOpt = indexPageOpt.map(p => loadTemplateFile(p.toFile))
+
+      val indexPage = indexTemplateOpt.getOrElse(emptyTemplate(rootPath.resolve("index.html").toFile, "Blog"))
+      val indexDest = ctx.docsPath.resolve(defaultDirectory).resolve("index.html")
+      val regex = raw"(\d*)-(\d*)-(\d*)-(.*)".r
+      def splitDateName(tf: TemplateFile): (Date, String) = tf.file.getName match
+          case regex(year, month, day, name) => ((year, month, day), name)
+          case name =>
+            report.warn("Incorrect file name for blog post. Post file name should be in format <year>-<month>-<day>-<name>", tf.file)
+            (("1900","01","01"), name)
+
+      def dateFrom(tf: TemplateFile, default: String = "1900-01-01"): String =
+        val pageSettings = tf.settings.get("page").collect{ case m: Map[String @unchecked, _] => m }
+        pageSettings.flatMap(_.get("date").collect{ case s: String => s}).getOrElse(default) // blogs without date are last
+
+      val posts = List(rootPath.resolve("_posts"))
+        .filter(Files.exists(_))
+        .flatMap(_.toFile.listFiles)
+        .filterNot(_.isDirectory)
+        .map { postFile =>
+          val templateFile = loadTemplateFile(postFile)
+          val ((year, month, day), name) = splitDateName(templateFile)
+          val destPath = ctx.docsPath.resolve(defaultDirectory).resolve(year).resolve(month).resolve(day).resolve(name)
+          val date = dateFrom(templateFile, s"$year-$month-$day")
+          date -> LoadedTemplate(templateFile, List.empty, destPath.toFile)
+        }.sortBy(_._1).reverse.map(_._2)
+
+      Some(LoadedTemplate(indexPage, posts, indexDest.toFile))
+    }
+  }
+
+  def loadRecursively(currRoot: File, destMappingFunc: File => File = identity): Option[LoadedTemplate] = {
+    val rootPath = currRoot.toPath
+    if currRoot.isDirectory
+    then {
+      val indexPageOpt = Seq(
+        rootPath.resolve("index.md"),
+        rootPath.resolve("index.html"),
+        rootPath.resolve(s"${currRoot.getName}.md"),
+        rootPath.resolve(s"${currRoot.getName}.html")
+      ).filter(p => Files.exists(p)) match {
+        case Nil => None
+        case indexPath :: Nil => Some(indexPath)
+        case list =>
+          report.warning(s"Multiple index pages for $currRoot found in ${list.map(_.toFile)}. Defaulting to first.")
+          list.headOption
+      }
+      val templateFileOpt = indexPageOpt.map(p => loadTemplateFile(p.toFile))
+
+      val indexPage = templateFileOpt.getOrElse(emptyTemplate(rootPath.resolve("index.html").toFile, "index"))
+
+      val children = currRoot.listFiles.toList
+        .filter(_.toPath != indexPageOpt.getOrElse(null))
+      Some(LoadedTemplate(indexPage, children.flatMap(loadRecursively(_, destMappingFunc)).sortBy(_.templateFile.title.name), destMappingFunc(indexPage.file)))
+    }
+    else if (currRoot.exists && ctx.siteExtensions.exists(ext => currRoot.getName.endsWith(ext))) {
+      val templateFile = loadTemplateFile(currRoot)
+      Some(LoadedTemplate(templateFile, List.empty, destMappingFunc(templateFile.file)))
+    }
+    else None
+  }
+
+  def createMapping(root: LoadedTemplate): Map[Path, Path] =
+    Map((root.templateFile.file.toPath, root.file.toPath)) ++ root.children.map(createMapping).fold(Map.empty)(_ ++ _)
+
+  private def toKebabCase(s: String) = s.toLowerCase.replace(' ', '-')
+
+  private def relativizeIfNeeded(link: String): Path =
+    val path = Paths.get(link)
+    if !path.isAbsolute then ctx.docsPath.resolve(link)
+    else path
+
+  extension (p: Path)
+    private def toHtml: Path = p.getParent.resolve(p.getFileName.toString match
+      case f if f.endsWith(".md") => f.stripSuffix(".md") + ".html"
+      case f => f
+    )
\ No newline at end of file
diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteRoot.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteRoot.scala
new file mode 100644
index 000000000000..55c01030d722
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteRoot.scala
@@ -0,0 +1,12 @@
+package dotty.tools.scaladoc
+package site
+
+import java.nio.file.Path
+
+case class StaticSiteRoot(
+  rootTemplate: LoadedTemplate,
+  siteMappings: Map[Path, Path]
+):
+  lazy val reverseSiteMappings = siteMappings.map(_.swap).toMap
+  lazy val sources = siteMappings.keys.toSet
+  lazy val dests = reverseSiteMappings.keys.toSet
\ No newline at end of file
diff --git a/scaladoc/src/dotty/tools/scaladoc/site/common.scala b/scaladoc/src/dotty/tools/scaladoc/site/common.scala
index 8cc576ad82d4..e93a5a62cb63 100644
--- a/scaladoc/src/dotty/tools/scaladoc/site/common.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/site/common.scala
@@ -14,14 +14,14 @@ import com.vladsch.flexmark.ext.yaml.front.matter.{AbstractYamlFrontMatterVisito
 import com.vladsch.flexmark.parser.{Parser, ParserEmulationProfile}
 import com.vladsch.flexmark.util.options.{DataHolder, MutableDataSet}
 import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension
+import com.vladsch.flexmark.formatter.Formatter
 
 import scala.collection.JavaConverters._
 
-val docsRootDRI: DRI = DRI(location = "index.md")
-val docsDRI: DRI = DRI(location = "docs/index.md")
-val apiPageDRI: DRI = DRI(location = "api")
+val docsRootDRI: DRI = DRI(location = "_docs/index", symbolUUID = staticFileSymbolUUID)
+val apiPageDRI: DRI = DRI(location = "api/index")
 
-val defaultMarkdownOptions: DataHolder =
+def defaultMarkdownOptions(using ctx: StaticSiteContext): DataHolder =
   new MutableDataSet()
     .setFrom(ParserEmulationProfile.COMMONMARK.getOptions)
     .set(AnchorLinkExtension.ANCHORLINKS_WRAP_TEXT, false)
@@ -36,7 +36,8 @@ val defaultMarkdownOptions: DataHolder =
       EmojiExtension.create(),
       YamlFrontMatterExtension.create(),
       StrikethroughExtension.create(),
-      WikiLinkExtension.create()
+      WikiLinkExtension.create(),
+      tasty.comments.markdown.SnippetRenderingExtension
     ))
 
 def emptyTemplate(file: File, title: String): TemplateFile = TemplateFile(
@@ -45,18 +46,19 @@ def emptyTemplate(file: File, title: String): TemplateFile = TemplateFile(
   rawCode = "",
   settings = Map.empty,
   name = file.getName.stripSuffix(".html"),
-  title = title,
+  title = TemplateName.FilenameDefined(title),
   hasFrame = true,
   resources = List.empty,
-  layout = None
+  layout = None,
+  configOffset = 0
 )
 
 final val ConfigSeparator = "---"
 final val LineSeparator = "\n"
 
-val yamlParser: Parser = Parser.builder(defaultMarkdownOptions).build()
+def yamlParser(using ctx: StaticSiteContext): Parser = Parser.builder(defaultMarkdownOptions).build()
 
-def loadTemplateFile(file: File): TemplateFile = {
+def loadTemplateFile(file: File, defaultTitle: Option[TemplateName] = None)(using ctx: StaticSiteContext): TemplateFile = {
   val lines = Files.readAllLines(file.toPath).asScala.toList
 
   val (config, content) = if (lines.head == ConfigSeparator) {
@@ -76,7 +78,7 @@ def loadTemplateFile(file: File): TemplateFile = {
   val globalKeys = Set("extraJS", "extraCSS", "layout", "hasFrame", "name", "title")
   val allSettings = yamlCollector.getData.asScala.toMap.transform(getSettingValue)
   val (global, inner) = allSettings.partition((k,_) => globalKeys.contains(k))
-  val settings = Map("page" -> inner)
+  val settings = Map("page" -> inner) ++ global
 
   def stringSetting(settings: Map[String, Object], name: String): Option[String] = settings.get(name).map {
     case List(elem: String) => elem
@@ -103,9 +105,10 @@ def loadTemplateFile(file: File): TemplateFile = {
     rawCode = content.mkString(LineSeparator),
     settings = settings,
     name = name,
-    title = stringSetting(allSettings, "title").getOrElse(name),
+    title = stringSetting(allSettings, "title").map(TemplateName.YamlDefined(_)).orElse(defaultTitle).getOrElse(TemplateName.FilenameDefined(name)),
     hasFrame = !stringSetting(allSettings, "hasFrame").contains("false"),
     resources = (listSetting(allSettings, "extraCSS") ++ listSetting(allSettings, "extraJS")).flatten.toList,
-    layout = stringSetting(allSettings, "layout")
+    layout = stringSetting(allSettings, "layout"),
+    configOffset = config.size
   )
 }
diff --git a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala
index 5ff9fd161746..8d7cc04cfec6 100644
--- a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala
@@ -2,7 +2,7 @@ package dotty.tools.scaladoc
 package site
 
 import java.io.File
-import java.nio.file.Files
+import java.nio.file.{Files, Paths}
 
 import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension
 import com.vladsch.flexmark.ext.autolink.AutolinkExtension
@@ -14,11 +14,25 @@ import com.vladsch.flexmark.ext.yaml.front.matter.{AbstractYamlFrontMatterVisito
 import com.vladsch.flexmark.parser.{Parser, ParserEmulationProfile}
 import com.vladsch.flexmark.util.options.{DataHolder, MutableDataSet}
 import com.vladsch.flexmark.html.HtmlRenderer
+import com.vladsch.flexmark.formatter.Formatter
 import liqp.Template
+import liqp.ParseSettings
+import liqp.parser.Flavor
+import liqp.TemplateContext
+import liqp.tags.Tag
+import liqp.nodes.LNode
 import scala.collection.JavaConverters._
 
 import scala.io.Source
+import dotty.tools.scaladoc.snippets._
 
+/** RenderingContext stores information about defined properties, layouts and sites being resolved
+ *
+ * @param properties  Map containing defined properties
+ * @param layouts     Map containing defined site layouts
+ * @param resolving   Set containing names of sites being resolved in this context. This information is useful for cycle detection
+ * @param resources   List of resources that need to be appended to sites
+ */
 case class RenderingContext(
   properties: Map[String, Object],
   layouts: Map[String, TemplateFile] = Map(),
@@ -34,6 +48,12 @@ case class RenderingContext(
     )
 
 case class ResolvedPage(code: String, resources: List[String] = Nil)
+
+enum TemplateName(val name: String):
+  case YamlDefined(override val name: String) extends TemplateName(name)
+  case SidebarDefined(override val name: String) extends TemplateName(name)
+  case FilenameDefined(override val name: String) extends TemplateName(name)
+
 /**
  * case class for the template files.
  * Template file is a file `.md` or `.html` handling settings.
@@ -48,19 +68,42 @@ case class TemplateFile(
   rawCode: String,
   settings: Map[String, Object],
   name: String,
-  title: String,
+  title: TemplateName,
   hasFrame: Boolean,
   resources: List[String],
   layout: Option[String],
+  configOffset: Int
 ):
   def isIndexPage() = file.isFile && (file.getName == "index.md" || file.getName == "index.html")
 
-  private[site] def resolveInner(ctx: RenderingContext): ResolvedPage =
+  private[site] def resolveInner(ctx: RenderingContext)(using ssctx: StaticSiteContext): ResolvedPage =
+
+    lazy val snippetCheckingFunc: SnippetChecker.SnippetCheckingFunc =
+      val path = Some(Paths.get(file.getAbsolutePath))
+      val pathBasedArg = ssctx.snippetCompilerArgs.get(path)
+      val sourceFile = dotty.tools.dotc.util.SourceFile(dotty.tools.io.AbstractFile.getFile(path.get), scala.io.Codec.UTF8)
+      (str: String, lineOffset: SnippetChecker.LineOffset, argOverride: Option[SCFlags]) => {
+          val arg = argOverride.fold(pathBasedArg)(pathBasedArg.overrideFlag(_))
+          val compilerData = SnippetCompilerData(
+            "staticsitesnippet",
+            Seq(SnippetCompilerData.ClassInfo(None, Nil, None)),
+            Nil,
+            SnippetCompilerData.Position(configOffset - 1, 0)
+          )
+          ssctx.snippetChecker.checkSnippet(str, Some(compilerData), arg, lineOffset, sourceFile).collect {
+              case r: SnippetCompilationResult if !r.isSuccessful =>
+                r.reportMessages()(using ssctx.outerCtx)
+                r
+              case r => r
+          }
+      }
+
     if (ctx.resolving.contains(file.getAbsolutePath))
       throw new RuntimeException(s"Cycle in templates involving $file: ${ctx.resolving}")
 
     val layoutTemplate = layout.map(name =>
-      ctx.layouts.getOrElse(name, throw new RuntimeException(s"No layouts named $name in ${ctx.layouts}")))
+      ctx.layouts.getOrElse(name, throw new RuntimeException(s"No layouts named $name in ${ctx.layouts}"))
+    )
 
     def asJavaElement(o: Object): Object = o match
       case m: Map[_, _] => m.transform {
@@ -71,12 +114,21 @@ case class TemplateFile(
 
     // Library requires mutable maps..
     val mutableProperties = new JHashMap(ctx.properties.transform((_, v) => asJavaElement(v)).asJava)
-    val rendered = Template.parse(this.rawCode).render(mutableProperties)
+
+    val parseSettings = ParseSettings.Builder().withFlavor(Flavor.JEKYLL).build()
+
+    val rendered = Template.parse(this.rawCode, parseSettings).render(mutableProperties)
+
     // We want to render markdown only if next template is html
     val code = if (isHtml || layoutTemplate.exists(!_.isHtml)) rendered else
+      // Snippet compiler currently supports markdown only
       val parser: Parser = Parser.builder(defaultMarkdownOptions).build()
-      HtmlRenderer.builder(defaultMarkdownOptions).build().render(parser.parse(rendered))
-    layoutTemplate match
+      val parsedMd = parser.parse(rendered)
+      val processed = FlexmarkSnippetProcessor.processSnippets(parsedMd, None, snippetCheckingFunc, withContext = false)(using ssctx.outerCtx)
+      HtmlRenderer.builder(defaultMarkdownOptions).build().render(processed)
+
+    // If we have a layout template, we need to embed rendered content in it. Otherwise, we just leave the content as is.
+    layoutTemplate match {
+      case Some(t) => t.resolveInner(ctx.nest(code, file, resources))
       case None => ResolvedPage(code, resources ++ ctx.resources)
-      case Some(layoutTemplate) =>
-        layoutTemplate.resolveInner(ctx.nest(code, file, resources))
+    }
diff --git a/scaladoc/src/dotty/tools/scaladoc/snippets/FlexmarkSnippetProcessor.scala b/scaladoc/src/dotty/tools/scaladoc/snippets/FlexmarkSnippetProcessor.scala
new file mode 100644
index 000000000000..499e1c55a17c
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/snippets/FlexmarkSnippetProcessor.scala
@@ -0,0 +1,100 @@
+package dotty.tools.scaladoc
+package snippets
+
+import com.vladsch.flexmark.util.{ast => mdu, sequence}
+import com.vladsch.flexmark.{ast => mda}
+import com.vladsch.flexmark.formatter.Formatter
+import com.vladsch.flexmark.util.options.MutableDataSet
+import collection.JavaConverters._
+
+import dotty.tools.scaladoc.tasty.comments.markdown.ExtendedFencedCodeBlock
+import dotty.tools.scaladoc.tasty.comments.PreparsedComment
+
+object FlexmarkSnippetProcessor:
+  def processSnippets(root: mdu.Node, preparsed: Option[PreparsedComment], checkingFunc: => SnippetChecker.SnippetCheckingFunc, withContext: Boolean)(using CompilerContext): mdu.Node = {
+    lazy val cf: SnippetChecker.SnippetCheckingFunc = checkingFunc
+
+    val nodes = root.getDescendants().asScala.collect {
+      case fcb: mda.FencedCodeBlock => fcb
+    }.toList
+
+    nodes.foldLeft[Map[String, String]](Map()) { (snippetMap, node) =>
+      val lineOffset = node.getStartLineNumber + preparsed.fold(0)(_.strippedLinesBeforeNo)
+      val info = node.getInfo.toString.split(" ")
+      if info.contains("scala") then {
+        val argOverride = info
+          .find(_.startsWith("sc:"))
+          .map(_.stripPrefix("sc:"))
+          .map(SCFlagsParser.parse)
+          .flatMap(_ match {
+            case Right(flags) => Some(flags)
+            case Left(error) =>
+              report.warning(
+                s"""|Error occured during parsing flags in snippet:
+                    |$error""".stripMargin
+              )
+              None
+          })
+        val id = info
+          .find(_.startsWith("sc-name:"))
+          .map(_.stripPrefix("sc-name:"))
+
+        val snippetImports = info
+          .find(_.startsWith("sc-compile-with:"))
+          .toList
+          .map(_.stripPrefix("sc-compile-with:"))
+          .flatMap(_.split(","))
+          .flatMap { id =>
+            val snippet = snippetMap.get(id)
+            if snippet.isEmpty then
+              report.warning(
+                s"""|Error occured during parsing compile-with in snippet:
+                    |Snippet with id: $id not found.
+                    |Remember that you cannot use forward reference to snippets""".stripMargin
+              )
+            snippet
+          }.mkString("\n")
+
+        val snippet = node.getContentChars.toString
+
+        extension (n: mdu.Node)
+          def setContentString(str: String): Unit =
+            val s = sequence.BasedSequence.EmptyBasedSequence()
+              .append(str)
+              .append(sequence.BasedSequence.EOL)
+            val content = mdu.BlockContent()
+            content.add(s, 0)
+            node.setContent(content)
+
+        val fullSnippet = Seq(snippetImports, snippet).mkString("\n").trim
+        val snippetCompilationResult = cf(fullSnippet, lineOffset, argOverride) match {
+          case Some(result @ SnippetCompilationResult(wrapped, _, _, messages)) if !withContext =>
+            node.setContentString(fullSnippet)
+            val innerLineOffset = wrapped.innerLineOffset
+            Some(result.copy(messages = result.messages.map {
+              case m @ SnippetCompilerMessage(Some(pos), _, _) =>
+                m.copy(position = Some(pos.copy(relativeLine = pos.relativeLine - innerLineOffset)))
+              case m => m
+            }))
+          case result@Some(SnippetCompilationResult(wrapped, _, _, _)) =>
+            node.setContentString(wrapped.snippet)
+            result
+          case result =>
+            node.setContentString(fullSnippet)
+            result
+        }
+
+        node.insertBefore(ExtendedFencedCodeBlock(id, node, snippetCompilationResult, withContext))
+        node.unlink()
+        id.fold(snippetMap)(id =>
+          val snippetAsImport = s"""|//{i:$id
+                                    |$snippet
+                                    |//i}""".stripMargin
+          val entry = (id, Seq(snippetImports, snippetAsImport).mkString("\n"))
+          snippetMap + entry
+        )
+      } else snippetMap
+    }
+
+    root
+  }
\ No newline at end of file
diff --git a/scaladoc/src/dotty/tools/scaladoc/snippets/SelfTypePrinter.scala b/scaladoc/src/dotty/tools/scaladoc/snippets/SelfTypePrinter.scala
new file mode 100644
index 000000000000..9a12a1e93dcc
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/snippets/SelfTypePrinter.scala
@@ -0,0 +1,55 @@
+package dotty.tools.scaladoc
+package snippets
+
+import dotty.tools.dotc.printing.RefinedPrinter
+import dotty.tools.dotc.core._
+import dotty.tools.dotc.printing.Texts._
+import dotty.tools.dotc.core.Types._
+import dotty.tools.dotc.core.Flags._
+import dotty.tools.dotc.core.Names._
+import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.core.NameOps._
+import dotty.tools.dotc.core.TypeErasure.ErasedValueType
+import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Annotations.Annotation
+import dotty.tools.dotc.core.Denotations._
+import dotty.tools.dotc.core.SymDenotations._
+import dotty.tools.dotc.core.StdNames.{nme, tpnme}
+import dotty.tools.dotc.ast.{Trees, untpd}
+import dotty.tools.dotc.typer.{Implicits, Namer, Applications}
+import dotty.tools.dotc.typer.ProtoTypes._
+import dotty.tools.dotc.ast.Trees._
+import dotty.tools.dotc.core.TypeApplications._
+import dotty.tools.dotc.core.Decorators._
+import dotty.tools.dotc.util.Chars.isOperatorPart
+import dotty.tools.dotc.transform.TypeUtils._
+import dotty.tools.dotc.transform.SymUtils._
+
+import language.implicitConversions
+import dotty.tools.dotc.util.{NameTransformer, SourcePosition}
+import dotty.tools.dotc.ast.untpd.{MemberDef, Modifiers, PackageDef, RefTree, Template, TypeDef, ValOrDefDef}
+
+class SelfTypePrinter(using _ctx: Context) extends RefinedPrinter(_ctx):
+
+  private def refinementChain(tp: Type): List[Type] =
+    tp :: (tp match {
+      case tp: RefinedType => refinementChain(tp.parent.stripTypeVar)
+      case _ => Nil
+    })
+
+  override def toText(tp: Type): Text = tp match
+    case tp: RefinedType =>
+      val parent :: (refined: List[RefinedType @unchecked]) =
+        refinementChain(tp).reverse
+      toTextLocal(parent)
+    case tp => super.toText(tp)
+
+  override def toTextSingleton(tp: SingletonType): Text =
+      tp match
+        case ConstantType(value) =>
+          if value.tag == Constants.ByteTag || value.tag == Constants.ShortTag then
+            toText(value) ~ s" /*${value.tpe.show}*/"
+          else
+            toText(value)
+        case _: TermRef => toTextRef(tp) ~ ".type /*" ~ toTextGlobal(tp.underlying) ~ "*/"
+        case _ => "(" ~ toTextRef(tp) ~ ": " ~ toTextGlobal(tp.underlying) ~ ")"
diff --git a/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetChecker.scala b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetChecker.scala
new file mode 100644
index 000000000000..77ab539d34fa
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetChecker.scala
@@ -0,0 +1,63 @@
+package dotty.tools.scaladoc
+package snippets
+
+import dotty.tools.scaladoc.DocContext
+import java.nio.file.Paths
+import java.io.File
+
+import dotty.tools.dotc.util.SourceFile
+import dotty.tools.io.AbstractFile
+import dotty.tools.dotc.fromtasty.TastyFileUtil
+import dotty.tools.dotc.config.Settings._
+import dotty.tools.dotc.config.ScalaSettings
+
+class SnippetChecker(val args: Scaladoc.Args)(using cctx: CompilerContext):
+
+// (val classpath: String, val bootclasspath: String, val tastyFiles: Seq[File], isScalajs: Boolean, useJavaCp: Boolean):
+  private val sep = System.getProperty("path.separator")
+
+  private val fullClasspath = List(
+    args.tastyFiles
+      .map(_.getAbsolutePath())
+      .map(AbstractFile.getFile(_))
+      .flatMap(t => try { TastyFileUtil.getClassPath(t) } catch { case e: AssertionError => Seq() })
+      .distinct.mkString(sep),
+    args.classpath
+  ).mkString(sep)
+
+  private val snippetCompilerSettings: Seq[SnippetCompilerSetting[?]] = cctx.settings.userSetSettings(cctx.settingsState).filter(_ != cctx.settings.classpath)
+  .map[SnippetCompilerSetting[?]]( s =>
+    SnippetCompilerSetting(s, s.valueIn(cctx.settingsState))
+  ) :+ SnippetCompilerSetting(cctx.settings.classpath, fullClasspath)
+
+  private val compiler: SnippetCompiler = SnippetCompiler(snippetCompilerSettings = snippetCompilerSettings)
+
+  // These constants were found empirically to make snippet compiler
+  // report errors in the same position as main compiler.
+  private val constantLineOffset = 2
+  private val constantColumnOffset = 4
+
+  def checkSnippet(
+    snippet: String,
+    data: Option[SnippetCompilerData],
+    arg: SnippetCompilerArg,
+    lineOffset: SnippetChecker.LineOffset,
+    sourceFile: SourceFile
+  ): Option[SnippetCompilationResult] = {
+    if arg.flag != SCFlags.NoCompile then
+      val wrapped = WrappedSnippet(
+        snippet,
+        data.map(_.packageName),
+        data.fold(Nil)(_.classInfos),
+        data.map(_.imports).getOrElse(Nil),
+        lineOffset + data.fold(0)(_.position.line) + constantLineOffset,
+        data.fold(0)(_.position.column) + constantColumnOffset
+      )
+      val res = compiler.compile(wrapped, arg, sourceFile)
+      Some(res)
+    else None
+  }
+
+object SnippetChecker:
+  type LineOffset = Int
+  type SnippetCheckingFunc = (String, LineOffset, Option[SCFlags]) => Option[SnippetCompilationResult]
diff --git a/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilationResult.scala b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilationResult.scala
new file mode 100644
index 000000000000..4df5922c1690
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilationResult.scala
@@ -0,0 +1,33 @@
+package dotty.tools.scaladoc
+package snippets
+
+import dotty.tools.io.{ AbstractFile }
+import dotty.tools.dotc.util.{ SourcePosition, SrcPos }
+
+case class Position(srcPos: SourcePosition, relativeLine: Int)
+
+case class SnippetCompilerMessage(position: Option[Position], message: String, level: MessageLevel)
+
+case class SnippetCompilationResult(
+  wrappedSnippet: WrappedSnippet,
+  isSuccessful: Boolean,
+  result: Option[AbstractFile],
+  messages: Seq[SnippetCompilerMessage]
+):
+  def reportMessages()(using CompilerContext) = messages.foreach {
+    case SnippetCompilerMessage(posOpt, msg, level) =>
+      val pos: SrcPos = posOpt.fold(dotty.tools.dotc.util.NoSourcePosition)(_.srcPos)
+      level match {
+        case MessageLevel.Info => report.log(msg, pos)
+        case MessageLevel.Warning => report.warning(msg, pos)
+        case MessageLevel.Error => report.error(msg, pos)
+        case MessageLevel.Debug => report.log(msg, pos)
+      }
+  }
+
+enum MessageLevel(val text: String):
+  case Info extends MessageLevel("Info")
+  case Warning extends MessageLevel("Warning")
+  case Error extends MessageLevel("Error")
+  case Debug extends MessageLevel("Debug")
+
diff --git a/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompiler.scala b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompiler.scala
new file mode 100644
index 000000000000..1e741f421d1b
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompiler.scala
@@ -0,0 +1,117 @@
+package dotty.tools.scaladoc
+package snippets
+
+import dotty.tools.io.{AbstractFile, VirtualDirectory}
+import dotty.tools.dotc.Driver
+import dotty.tools.dotc.core.Contexts.Context
+import dotty.tools.dotc.core.Mode
+import dotty.tools.dotc.config.Settings.Setting._
+import dotty.tools.dotc.interfaces.{ SourcePosition => ISourcePosition }
+import dotty.tools.dotc.ast.Trees.Tree
+import dotty.tools.dotc.interfaces.{SourceFile => ISourceFile}
+import dotty.tools.dotc.reporting.{ Diagnostic, StoreReporter }
+import dotty.tools.dotc.parsing.Parsers.Parser
+import dotty.tools.dotc.{ Compiler, Run }
+import dotty.tools.io.{AbstractFile, VirtualDirectory}
+import dotty.tools.repl.AbstractFileClassLoader
+import dotty.tools.dotc.util.Spans._
+import dotty.tools.dotc.interfaces.Diagnostic._
+import dotty.tools.dotc.util.{ SourcePosition, NoSourcePosition, SourceFile, NoSource }
+
+import scala.util.{ Try, Success, Failure }
+
+class SnippetCompiler(
+  val snippetCompilerSettings: Seq[SnippetCompilerSetting[_]],
+  target: AbstractFile = new VirtualDirectory("(memory)")
+):
+  object SnippetDriver extends Driver:
+    val currentCtx =
+      val rootCtx = initCtx.fresh.addMode(Mode.ReadPositions).addMode(Mode.Interactive)
+      rootCtx.setSetting(rootCtx.settings.YretainTrees, true)
+      rootCtx.setSetting(rootCtx.settings.YcookComments, true)
+      rootCtx.setSetting(rootCtx.settings.YreadComments, true)
+      rootCtx.setSetting(rootCtx.settings.color, "never")
+      rootCtx.setSetting(rootCtx.settings.XimportSuggestionTimeout, 0)
+
+      val ctx = setup(Array(""), rootCtx) match
+        case Some((_, ctx)) =>
+          ctx
+        case None => rootCtx
+      val res = snippetCompilerSettings.foldLeft(ctx.fresh) { (ctx, setting) =>
+        ctx.setSetting(setting.setting, setting.value)
+      }
+      res.initialize()(using res)
+      res
+
+  private val scala3Compiler = new Compiler
+
+  private def newRun(using ctx: Context): Run = scala3Compiler.newRun
+
+  private def nullableMessage(msgOrNull: String): String =
+    if (msgOrNull == null) "" else msgOrNull
+
+  private def createReportMessage(wrappedSnippet: WrappedSnippet, arg: SnippetCompilerArg, diagnostics: Seq[Diagnostic], sourceFile: SourceFile): Seq[SnippetCompilerMessage] = {
+    val line = wrappedSnippet.outerLineOffset
+    val column = wrappedSnippet.outerColumnOffset
+    val innerLineOffset = wrappedSnippet.innerLineOffset
+    val innerColumnOffset = wrappedSnippet.innerColumnOffset
+    val infos = diagnostics.toSeq.sortBy(_.pos.source.path)
+    val errorMessages = infos.map {
+      case diagnostic if diagnostic.position.isPresent =>
+        val diagPos = diagnostic.position.get match
+          case s: SourcePosition => s
+          case _ => NoSourcePosition
+        val offsetFromLine = sourceFile match
+          case NoSource => 0
+          case sf: SourceFile => sf.lineToOffset(diagPos.line + line - innerLineOffset - 1)
+        val offsetFromColumn = diagPos.column + column - innerColumnOffset
+        val span = Span(offsetFromLine + offsetFromColumn, offsetFromLine + offsetFromColumn)
+        val pos = Some(
+          Position(dotty.tools.dotc.util.SourcePosition(sourceFile, span), diagPos.line)
+        )
+        val dmsg = Try(diagnostic.message) match {
+          case Success(msg) => msg
+          case Failure(ex) => ex.getMessage
+        }
+        val msg = nullableMessage(dmsg)
+        val level = MessageLevel.fromOrdinal(diagnostic.level)
+        SnippetCompilerMessage(pos, msg, level)
+      case d =>
+        val level = MessageLevel.fromOrdinal(d.level)
+        SnippetCompilerMessage(None, nullableMessage(d.message), level)
+    }
+    errorMessages
+  }
+
+  private def additionalMessages(wrappedSnippet: WrappedSnippet, arg: SnippetCompilerArg, sourceFile: SourceFile, context: Context): Seq[SnippetCompilerMessage] = {
+      Option.when(arg.flag == SCFlags.Fail && !context.reporter.hasErrors)(
+        SnippetCompilerMessage(None, "Snippet should not compile but compiled succesfully", MessageLevel.Error)
+      ).toList
+  }
+
+  private def isSuccessful(arg: SnippetCompilerArg, context: Context): Boolean = {
+    if arg.flag == SCFlags.Fail then context.reporter.hasErrors
+    else !context.reporter.hasErrors
+  }
+
+  def compile(
+    wrappedSnippet: WrappedSnippet,
+    arg: SnippetCompilerArg,
+    sourceFile: SourceFile
+  ): SnippetCompilationResult = {
+    val context = SnippetDriver.currentCtx.fresh
+      .setSetting(
+        SnippetDriver.currentCtx.settings.outputDir,
+        target
+      )
+      .setReporter(new StoreReporter)
+    val run = newRun(using context)
+    run.compileFromStrings(List(wrappedSnippet.snippet))
+
+    val messages =
+      createReportMessage(wrappedSnippet, arg, context.reporter.pendingMessages(using context), sourceFile) ++
+      additionalMessages(wrappedSnippet, arg, sourceFile, context)
+
+    val t = Option.when(!context.reporter.hasErrors)(target)
+    SnippetCompilationResult(wrappedSnippet, isSuccessful(arg, context), t, messages)
+  }
diff --git a/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilerArgs.scala b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilerArgs.scala
new file mode 100644
index 000000000000..240c99840032
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilerArgs.scala
@@ -0,0 +1,68 @@
+package dotty.tools.scaladoc
+package snippets
+
+import java.nio.file.Path
+
+case class SnippetCompilerArg(flag: SCFlags):
+  def overrideFlag(f: SCFlags): SnippetCompilerArg = copy(flag = f)
+
+sealed trait SCFlags(val flagName: String)
+
+object SCFlags:
+  case object Compile extends SCFlags("compile")
+  case object NoCompile extends SCFlags("nocompile")
+  case object Fail extends SCFlags("fail")
+
+  def values: Seq[SCFlags] = Seq(Compile, NoCompile, Fail)
+
+case class SnippetCompilerArgs(scFlags: PathBased[SCFlags], defaultFlag: SCFlags):
+  def get(member: Member): SnippetCompilerArg =
+    member.sources
+      .flatMap(s => scFlags.get(s.path).map(_.elem))
+      .fold(SnippetCompilerArg(defaultFlag))(SnippetCompilerArg(_))
+
+  def get(path: Option[Path]): SnippetCompilerArg =
+    path
+      .flatMap(p => scFlags.get(p).map(_.elem))
+      .fold(SnippetCompilerArg(defaultFlag))(SnippetCompilerArg(_))
+
+
+object SnippetCompilerArgs:
+  val usage =
+    """
+    |Snippet compiler arguments provide a way to configure snippet type checking.
+    |
+    |This setting accept list of arguments in format:
+    |args := arg{,arg}
+    |arg := [path=]flag
+    |where `path` is a prefix of the path to source files where snippets are located and `flag` is the mode in which snippets will be type checked.
+    |
+    |If the path is not present, the argument will be used as the default for all unmatched paths..
+    |
+    |Available flags:
+    |compile - Enables snippet checking.
+    |nocompile - Disables snippet checking.
+    |fail - Enables snippet checking, asserts that snippet doesn't compile.
+    |
+    """.stripMargin
+
+  def load(args: List[String], defaultFlag: SCFlags = SCFlags.NoCompile)(using CompilerContext): SnippetCompilerArgs = {
+    PathBased.parse[SCFlags](args)(using SCFlagsParser) match {
+      case PathBased.ParsingResult(errors, res) =>
+        if errors.nonEmpty then report.warning(s"""
+            |Got following errors during snippet compiler args parsing:
+            |$errors
+            |
+            |$usage
+            |""".stripMargin
+        )
+        SnippetCompilerArgs(res, defaultFlag)
+    }
+  }
+
+object SCFlagsParser extends ArgParser[SCFlags]:
+  def parse(s: String): Either[String, SCFlags] = {
+    SCFlags.values
+      .find(_.flagName == s)
+      .fold(Left(s"$s: No such flag found."))(Right(_))
+  }
diff --git a/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilerDataCollector.scala b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilerDataCollector.scala
new file mode 100644
index 000000000000..c1629f8d35cc
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilerDataCollector.scala
@@ -0,0 +1,91 @@
+package dotty.tools.scaladoc
+package snippets
+
+import scala.quoted._
+import dotty.tools.scaladoc.tasty.SymOps._
+import dotty.tools.dotc.core._
+import dotty.tools.dotc.util.{ SourceFile => CSourceFile, NoSource }
+
+class SnippetCompilerDataCollector[Q <: Quotes](val qctx: Q):
+  import qctx.reflect._
+  given qctx.type = qctx
+
+  def getSourceFile(sym: Symbol): CSourceFile =
+    given ctx: Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+    sym match
+      case csym: Symbols.Symbol => csym.source(using ctx)
+      case _ =>
+        report.warning(s"Can't cast symbol $sym to compiler symbol. This is a bug of snippet compiler, please create an issue on dotty repository.")
+        NoSource
+
+  def getSnippetCompilerData(sym: Symbol, originalSym: Symbol): SnippetCompilerData =
+    val packageName = sym.packageName
+    if !sym.isPackageDef then sym.tree match {
+      case c: qctx.reflect.ClassDef =>
+        import dotty.tools.dotc
+        import dotty.tools.dotc.core.Decorators._
+        given dotc.core.Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+        val printer: dotc.printing.Printer = SelfTypePrinter()
+        val classSym = c.symbol.asInstanceOf[Symbols.ClassSymbol]
+
+        def getOwners(sym: Symbols.ClassSymbol): Seq[Symbols.ClassSymbol] = Seq(sym) ++
+          (if sym.owner.isClass && !sym.owner.is(dotc.core.Flags.Package) then getOwners(sym.owner.asInstanceOf[Symbols.ClassSymbol]) else Nil)
+
+        def collectNames(tp: Types.Type): Seq[String] = tp match {
+          case Types.AndType(t1, t2) => collectNames(t1) ++ collectNames(t2)
+          case Types.AppliedType(tpe, _) => collectNames(tpe)
+          case Types.AnnotatedType(tpe, _) => collectNames(tpe)
+          case t: Types.NamedType => if t.symbol.is(dotc.core.Flags.Module) then Seq() else Seq(t.symbol.name.show)
+          case t: Types.ThisType => Seq(t.cls.name.show)
+          case _ => Seq()
+        }
+
+        val allSyms = getOwners(classSym)
+
+        val allProcessed = allSyms.map { cSym =>
+          def createTypeConstructor(tpe: Types.Type, topLevel: Boolean = true): String = tpe match {
+              case t @ Types.TypeBounds(upper, lower) => lower match {
+                case l: Types.HKTypeLambda =>
+                  (if topLevel then "" else "?") + l.paramInfos.map(p => createTypeConstructor(p, false)).mkString("[",", ","]")
+                case _ => (if topLevel then "" else "_")
+              }
+            }
+          val classType =
+            val ct = cSym.classInfo.selfType.toText(printer).show.replace(".this","").replace("\n", " ").stripPrefix(s"$packageName.")
+            Some(ct)
+          val classNames = collectNames(cSym.classInfo.selfType)
+          val classGenerics = Option.when(
+              !cSym.typeParams.isEmpty
+            )(
+              cSym.typeParams.map(_.typeRef).map(t =>
+                t.show +
+                createTypeConstructor(t.asInstanceOf[Types.TypeRef].underlying)
+              ).mkString("[",", ","]")
+            )
+          SnippetCompilerData.ClassInfo(classType, classNames, classGenerics)
+        }
+        val firstProcessed = allProcessed.head
+        SnippetCompilerData(packageName, allProcessed.reverse, Nil, position(hackGetPositionOfDocstring(using qctx)(originalSym)))
+      case _ => getSnippetCompilerData(sym.maybeOwner, originalSym)
+    } else SnippetCompilerData(packageName, Nil, Nil, position(hackGetPositionOfDocstring(using qctx)(originalSym)))
+
+  private def position(p: Option[qctx.reflect.Position]): SnippetCompilerData.Position =
+    p.fold(SnippetCompilerData.Position(0, 0))(p => SnippetCompilerData.Position(p.startLine, p.startColumn))
+
+  private def hackGetPositionOfDocstring(using Quotes)(s: qctx.reflect.Symbol): Option[qctx.reflect.Position] =
+    import dotty.tools.dotc.core.Comments.CommentsContext
+    import dotty.tools.dotc
+    given ctx: Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+    val docCtx = ctx.docCtx.getOrElse {
+      throw new RuntimeException(
+        "DocCtx could not be found and documentations are unavailable. This is a compiler-internal error."
+      )
+    }
+    s.pos.flatMap { pos =>
+      docCtx.docstring(s.asInstanceOf[Symbols.Symbol]).map { docstring =>
+        dotty.tools.dotc.util.SourcePosition(
+          pos.sourceFile.asInstanceOf[dotty.tools.dotc.util.SourceFile],
+          docstring.span
+        ).asInstanceOf[qctx.reflect.Position]
+      }
+    }
\ No newline at end of file
diff --git a/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilerSetting.scala b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilerSetting.scala
new file mode 100644
index 000000000000..8f3ef6498fec
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilerSetting.scala
@@ -0,0 +1,8 @@
+package dotty.tools.scaladoc
+package snippets
+
+import dotty.tools.scaladoc.DocContext
+import dotty.tools.dotc.config.Settings._
+import dotty.tools.dotc.config.ScalaSettings
+
+case class SnippetCompilerSetting[T](setting: Setting[T], value: T)
diff --git a/scaladoc/src/dotty/tools/scaladoc/snippets/WrappedSnippet.scala b/scaladoc/src/dotty/tools/scaladoc/snippets/WrappedSnippet.scala
new file mode 100644
index 000000000000..d3ad8db8f9d3
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/snippets/WrappedSnippet.scala
@@ -0,0 +1,65 @@
+package dotty.tools.scaladoc
+package snippets
+
+import java.io.ByteArrayOutputStream
+import java.io.PrintStream
+
+case class WrappedSnippet(snippet: String, outerLineOffset: Int, outerColumnOffset: Int, innerLineOffset: Int, innerColumnOffset: Int)
+
+object WrappedSnippet:
+
+  val indent: Int = 2
+
+  def apply(str: String): WrappedSnippet =
+    val baos = new ByteArrayOutputStream()
+    val ps = new PrintStream(baos)
+    ps.startHide()
+    ps.println("package snippets")
+    ps.println("object Snippet {")
+    ps.endHide()
+    str.split('\n').foreach(ps.printlnWithIndent(indent, _))
+    ps.startHide()
+    ps.println("}")
+    ps.endHide()
+    WrappedSnippet(baos.toString, 0, 0, indent + 2 /*Hide tokens*/, indent)
+
+  def apply(
+    str: String,
+    packageName: Option[String],
+    classInfos: Seq[SnippetCompilerData.ClassInfo],
+    imports: List[String],
+    outerLineOffset: Int,
+    outerColumnOffset: Int
+  ): WrappedSnippet =
+    val baos = new ByteArrayOutputStream()
+    val ps = new PrintStream(baos)
+    ps.startHide()
+    ps.println(s"package ${packageName.getOrElse("snippets")}")
+    imports.foreach(i => ps.println(s"import $i"))
+    val notEmptyClassInfos = if classInfos.isEmpty then Seq(SnippetCompilerData.ClassInfo(None, Nil, None)) else classInfos
+    notEmptyClassInfos.zipWithIndex.foreach { (info, i) =>
+      ps.printlnWithIndent(indent * i, s"trait Snippet$i${info.generics.getOrElse("")} { ${info.tpe.fold("")(cn => s"self: $cn =>")}")
+      info.names.foreach{ name =>
+        ps.printlnWithIndent(indent * i + indent, s"val $name = self")
+      }
+    }
+    ps.endHide()
+    str.split('\n').foreach(ps.printlnWithIndent(notEmptyClassInfos.size * indent, _))
+    ps.startHide()
+    (0 to notEmptyClassInfos.size -1).reverse.foreach( i => ps.printlnWithIndent(i * indent, "}"))
+    ps.endHide()
+    WrappedSnippet(
+      baos.toString,
+      outerLineOffset,
+      outerColumnOffset,
+      notEmptyClassInfos.size + notEmptyClassInfos.flatMap(_.names).size + packageName.size + 2 /*Hide tokens*/,
+      notEmptyClassInfos.size * indent
+    )
+
+  extension (ps: PrintStream)
+    private def printlnWithIndent(indent: Int, str: String) =
+      ps.println((" " * indent) + str)
+    private def startHide() = ps.println(raw"//{")
+    private def endHide() = ps.println(raw"//}")
+
+
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/BasicSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/BasicSupport.scala
index 43d28a80606f..bbfe50f421ec 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/BasicSupport.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/BasicSupport.scala
@@ -5,13 +5,18 @@ import collection.JavaConverters._
 import dotty.tools.scaladoc._
 import scala.quoted._
 
+import SymOps._
+import ScaladocSupport._
+
 trait BasicSupport:
   self: TastyParser =>
-  import qctx.reflect._
-  object SymOps extends SymOps[qctx.type](qctx)
-  export SymOps._
 
-  def parseAnnotation(annotTerm: Term): Annotation =
+  object SymOpsWithLinkCache extends SymOpsWithLinkCache
+  export SymOpsWithLinkCache._
+
+
+  def parseAnnotation(using Quotes)(annotTerm: reflect.Term): Annotation =
+    import reflect._
     import dotty.tools.dotc.ast.Trees.{SeqLiteral}
     val dri = annotTerm.tpe.typeSymbol.dri
     def inner(t: Term): List[Annotation.AnnotationParameter] = t match {
@@ -24,7 +29,6 @@ trait BasicSupport:
         case other => List(Annotation.UnresolvedParameter(None, other.show))
       }
 
-
     val params = annotTerm match
       case Apply(target, appliedWith) => {
         appliedWith.flatMap(inner)
@@ -32,13 +36,9 @@ trait BasicSupport:
 
     Annotation(dri, params)
 
-  extension (sym: Symbol)
+  extension (using Quotes)(sym: reflect.Symbol)
     def documentation = sym.docstring.map(parseComment(_, sym.tree))
 
-    def source(using Quotes) =
-      val path = sym.pos.map(_.sourceFile.jpath).filter(_ != null).map(_.toAbsolutePath)
-      path.map(TastyMemberSource(_, sym.pos.get.startLine))
-
     def getAnnotations(): List[Annotation] =
       sym.annotations.filterNot(_.symbol.packageName.startsWith("scala.annotation.internal")).map(parseAnnotation).reverse
 
@@ -49,5 +49,4 @@ trait BasicSupport:
       }.map(parseAnnotation)
 
     def isLeftAssoc: Boolean = !sym.name.endsWith(":")
-
-
+  end extension
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala
index 40d6016359e4..31e27e234332 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala
@@ -3,17 +3,28 @@ package dotty.tools.scaladoc.tasty
 import collection.JavaConverters._
 import dotty.tools.scaladoc._
 import dotty.tools.scaladoc.{Signature => DSignature}
+import dotty.tools.scaladoc.Inkuire
+
+import scala.quoted._
+
+import SymOps._
+import NameNormalizer._
+import SyntheticsSupport._
+import dotty.tools.dotc.core.NameKinds
 
 trait ClassLikeSupport:
   self: TastyParser =>
   import qctx.reflect._
 
-  private def bareClasslikeKind(symbol: Symbol): Kind =
-     if symbol.flags.is(Flags.Module) then Kind.Object
-        else if symbol.flags.is(Flags.Trait) then  Kind.Trait(Nil, Nil)
-        else if symbol.flags.is(Flags.Enum) then Kind.Enum(Nil, Nil)
-        else if symbol.flags.is(Flags.Enum) && symbol.flags.is(Flags.Case) then Kind.EnumCase(Kind.Object)
-        else Kind.Class(Nil, Nil)
+  private given qctx.type = qctx
+
+  private def bareClasslikeKind(using Quotes)(symbol: reflect.Symbol): Kind =
+    import reflect._
+    if symbol.flags.is(Flags.Module) then Kind.Object
+    else if symbol.flags.is(Flags.Trait) then  Kind.Trait(Nil, Nil)
+    else if symbol.flags.is(Flags.Enum) then Kind.Enum(Nil, Nil)
+    else if symbol.flags.is(Flags.Enum) && symbol.flags.is(Flags.Case) then Kind.EnumCase(Kind.Object)
+    else Kind.Class(Nil, Nil)
 
   private def kindForClasslike(classDef: ClassDef): Kind =
     def typeArgs = classDef.getTypeParams.map(mkTypeArgument(_))
@@ -34,7 +45,7 @@ trait ClassLikeSupport:
           .filter(s => s.exists && !s.isHiddenByVisibility)
           .map( _.tree.asInstanceOf[DefDef])
       constr.fold(Nil)(
-        _.termParamss.map(pList => ParametersList(pList.params.map(mkParameter(_, parameterModifier)), if isUsingModifier(pList.params) then "using " else ""))
+        _.termParamss.map(pList => ParametersList(pList.params.map(p => mkParameter(p, parameterModifier)), paramListModifier(pList.params)))
         )
 
     if classDef.symbol.flags.is(Flags.Module) then Kind.Object
@@ -59,35 +70,46 @@ trait ClassLikeSupport:
           case tree: ClassDef => tree
       case tt: TypeTree => unpackTreeToClassDef(tt.tpe.typeSymbol.tree)
 
-    def getSupertypesGraph(classDef: Tree, link: LinkToType): Seq[(LinkToType, LinkToType)] =
-      val smbl = classDef.symbol
-      val parents = unpackTreeToClassDef(classDef).parents
-      parents.flatMap { case tree =>
+    def getSupertypesGraph(link: LinkToType, to: Seq[Tree]): Seq[(LinkToType, LinkToType)] =
+      to.flatMap { case tree =>
         val symbol = if tree.symbol.isClassConstructor then tree.symbol.owner else tree.symbol
         val superLink = LinkToType(tree.asSignature, symbol.dri, bareClasslikeKind(symbol))
-        Seq(link -> superLink) ++ getSupertypesGraph(tree, superLink)
+        val nextTo = unpackTreeToClassDef(tree).parents
+        if symbol.isHiddenByVisibility then getSupertypesGraph(link, nextTo)
+        else Seq(link -> superLink) ++ getSupertypesGraph(superLink, nextTo)
       }
 
-    val supertypes = getSupertypes(using qctx)(classDef).map {
-      case (symbol, tpe) =>
-        LinkToType(tpe.asSignature, symbol.dri, bareClasslikeKind(symbol))
+    val supertypes = getSupertypes(using qctx)(classDef)
+      .filterNot((s, t) => s.isHiddenByVisibility)
+      .map {
+        case (symbol, tpe) =>
+          LinkToType(tpe.asSignature, symbol.dri, bareClasslikeKind(symbol))
+      }
+    val selfType = classDef.self.map { (valdef: ValDef) =>
+      val symbol = valdef.symbol
+      val tpe = valdef.tpt.tpe
+      LinkToType(tpe.asSignature, symbol.dri, Kind.Type(false, false, Seq.empty))
     }
-    val selfSiangture: DSignature = typeForClass(classDef).asSignature
+    val selfSignature: DSignature = typeForClass(classDef).asSignature
 
     val graph = HierarchyGraph.withEdges(
-      getSupertypesGraph(classDef, LinkToType(selfSiangture, classDef.symbol.dri, bareClasslikeKind(classDef.symbol)))
+      getSupertypesGraph(LinkToType(selfSignature, classDef.symbol.dri, bareClasslikeKind(classDef.symbol)), unpackTreeToClassDef(classDef).parents)
     )
 
-    val baseMember = mkMember(classDef.symbol, kindForClasslike(classDef), selfSiangture)(
+    val baseMember = mkMember(classDef.symbol, kindForClasslike(classDef), selfSignature)(
       modifiers = modifiers,
       graph = graph,
-      deprecated = classDef.symbol.isDeprecated()
+      deprecated = classDef.symbol.isDeprecated(),
+    ).copy(
+      directParents = classDef.getParentsAsLinkToTypes,
+      parents = supertypes,
     )
 
+    if summon[DocContext].args.generateInkuire then doInkuireStuff(classDef)
+
     if signatureOnly then baseMember else baseMember.copy(
-        members = classDef.extractPatchedMembers,
-        directParents = classDef.getParentsAsLinkToTypes,
-        parents = supertypes,
+        members = classDef.extractPatchedMembers.sortBy(m => (m.name, m.kind.name)),
+        selfType = selfType,
         companion = classDef.getCompanion
     )
 
@@ -104,96 +126,66 @@ trait ClassLikeSupport:
   private def isDocumentableExtension(s: Symbol) =
     !s.isHiddenByVisibility && !s.isSyntheticFunc && s.isExtensionMethod
 
-  private def parseMember(c: ClassDef)(s: Tree): Option[Member] = processTreeOpt(s)(s match
+  private def parseMember(c: ClassDef)(s: Tree): Option[Member] = processTreeOpt(s) { s match
       case dd: DefDef if isDocumentableExtension(dd.symbol) =>
         dd.symbol.extendedSymbol.map { extSym =>
+          val memberInfo = unwrapMemberInfo(c, dd.symbol)
+          val typeParams = dd.symbol.extendedTypeParams.map(mkTypeArgument(_, memberInfo.genericTypes))
+          val termParams = dd.symbol.extendedTermParamLists.zipWithIndex.flatMap { case (paramList, index) =>
+            memberInfo.paramLists(index) match
+              case EvidenceOnlyParameterList => Nil
+              case info: RegularParameterList =>
+                Seq(ParametersList(paramList.params.map(mkParameter(_, memberInfo = info)), paramListModifier(paramList.params)))
+          }
           val target = ExtensionTarget(
             extSym.symbol.normalizedName,
+            typeParams,
+            termParams,
             extSym.tpt.asSignature,
             extSym.tpt.symbol.dri,
             extSym.symbol.pos.get.start
           )
           parseMethod(c, dd.symbol,specificKind = Kind.Extension(target, _))
         }
-      // TODO check given methods?
-      case dd: DefDef if !dd.symbol.isHiddenByVisibility && dd.symbol.isGiven && !dd.symbol.isArtifact =>
-        Some(dd.symbol.owner.memberType(dd.name))
-          .filterNot(_.exists)
-          .map { _ =>
-            parseMethod(c, dd.symbol, specificKind =
-              Kind.Given(_, getGivenInstance(dd), None)
-            )
-          }
 
       case dd: DefDef if !dd.symbol.isHiddenByVisibility && dd.symbol.isExported && !dd.symbol.isArtifact =>
-        val exportedTarget = dd.rhs.collect {
-          case a: Apply => a.fun.asInstanceOf[Select]
-          case s: Select => s
+        dd.rhs.map {
+          case TypeApply(rhs, _) => rhs
+          case Apply(TypeApply(rhs, _), _) => rhs
+          case rhs => rhs
+        }.map(_.tpe.termSymbol).filter(_.exists).map(_.tree).map {
+          case v: ValDef if v.symbol.flags.is(Flags.Module) && !v.symbol.flags.is(Flags.Synthetic) =>
+            v.symbol.owner -> Symbol.newVal(c.symbol, dd.name, v.tpt.tpe, Flags.Final, Symbol.noSymbol).tree
+          case other => other.symbol.owner -> other
+        }.flatMap { (originalOwner, tree) =>
+          parseMember(c)(tree)
+            .map { m => m
+              .withDRI(dd.symbol.dri)
+              .withName(dd.symbol.normalizedName)
+              .withKind(Kind.Exported(m.kind))
+              .withOrigin(Origin.ExportedFrom(Some(Link(originalOwner.normalizedName, originalOwner.dri))))
+            }
         }
-        val functionName = exportedTarget.fold("function")(_.name)
-        val instanceName = exportedTarget.collect {
-          case Select(qualifier: Select, _) => qualifier.name
-          case Select(qualifier: Ident, _) => qualifier.tpe.typeSymbol.normalizedName
-        }.getOrElse("instance")
-        val dri = dd.rhs.collect {
-          case s: Select if s.symbol.isDefDef => s.symbol.dri
-        }.orElse(exportedTarget.map(_.qualifier.tpe.typeSymbol.dri))
-
-        Some(parseMethod(c, dd.symbol, specificKind = Kind.Exported(_))
-          .withOrigin(Origin.ExportedFrom(s"$instanceName.$functionName", dri)))
-
-      case dd: DefDef if !dd.symbol.isHiddenByVisibility && !dd.symbol.isGiven && !dd.symbol.isSyntheticFunc && !dd.symbol.isExtensionMethod && !dd.symbol.isArtifact =>
+
+      case dd: DefDef if !dd.symbol.isHiddenByVisibility && !dd.symbol.isSyntheticFunc && !dd.symbol.isExtensionMethod && !dd.symbol.isArtifact =>
         Some(parseMethod(c, dd.symbol))
 
       case td: TypeDef if !td.symbol.flags.is(Flags.Synthetic) && (!td.symbol.flags.is(Flags.Case) || !td.symbol.flags.is(Flags.Enum)) =>
         Some(parseTypeDef(td))
 
-      case vd: ValDef if !isSyntheticField(vd.symbol)
-        && (!vd.symbol.flags.is(Flags.Case) || !vd.symbol.flags.is(Flags.Enum))
-        && vd.symbol.isGiven =>
-          val classDef = Some(vd.tpt.tpe).flatMap(_.classSymbol.map(_.tree.asInstanceOf[ClassDef]))
-          Some(classDef.filter(_.symbol.flags.is(Flags.Module)).fold[Member](parseValDef(c, vd))(parseGivenClasslike(_)))
-
       case vd: ValDef if !isSyntheticField(vd.symbol) && (!vd.symbol.flags.is(Flags.Case) || !vd.symbol.flags.is(Flags.Enum)) =>
         Some(parseValDef(c, vd))
 
-      case c: ClassDef if c.symbol.owner.memberMethod(c.name).exists(_.flags.is(Flags.Given)) =>
-        Some(parseGivenClasslike(c))
-
-      case c: ClassDef if c.symbol.shouldDocumentClasslike &&  !c.symbol.isGiven =>
+      case c: ClassDef if c.symbol.shouldDocumentClasslike =>
         Some(parseClasslike(c))
 
       case _ => None
-  )
-
-  private def parseGivenClasslike(c: ClassDef): Member = {
-    val parsedClasslike = parseClasslike(c)
-
-    val parentTpe = c.parents(0) match {
-      case t: TypeTree => Some(t.tpe)
-      case t: Term => Some(t.tpe)
-      case _ => None
-    }
-
-    val givenParents = parsedClasslike.directParents.headOption
-    val cls: Kind.Class = parsedClasslike.kind match
-      case Kind.Object => Kind.Class(Nil, Nil)
-      case Kind.Trait(tps, args) => Kind.Class(tps, args)
-      case cls: Kind.Class => cls
-      case other =>
-        report.warning("Unrecoginzed kind for given: $other", c.pos)
-        Kind.Class(Nil, Nil)
-
-    parsedClasslike.withKind(
-      Kind.Given(cls, givenParents.map(_.signature), parentTpe.flatMap(extractImplicitConversion))
-    )
   }
 
   private def parseInheritedMember(c: ClassDef)(s: Tree): Option[Member] =
     def inheritance = Some(InheritedFrom(s.symbol.owner.normalizedName, s.symbol.dri))
     processTreeOpt(s)(s match
-      case c: ClassDef if c.symbol.shouldDocumentClasslike && !c.symbol.isGiven => Some(parseClasslike(c, signatureOnly = true))
-      case c: ClassDef if c.symbol.owner.memberMethod(c.name).exists(_.flags.is(Flags.Given)) => Some(parseGivenClasslike(c))
+      case c: ClassDef if c.symbol.shouldDocumentClasslike => Some(parseClasslike(c, signatureOnly = true))
       case other => {
         val parsed = parseMember(c)(other)
         parsed.map(p =>
@@ -208,7 +200,8 @@ trait ClassLikeSupport:
       }
     ).map(_.copy(inheritedFrom = inheritance))
 
-  extension (c: ClassDef)
+  extension (using Quotes)(c: reflect.ClassDef)
+
     def membersToDocument = c.body.filterNot(_.symbol.isHiddenByVisibility)
 
     def getNonTrivialInheritedMemberTrees =
@@ -216,6 +209,7 @@ trait ClassLikeSupport:
         .filter(s => s.maybeOwner != defn.ObjectClass && s.maybeOwner != defn.AnyClass)
         .map(_.tree)
 
+  extension (c: ClassDef)
     def extractMembers: Seq[Member] = {
       val inherited = c.getNonTrivialInheritedMemberTrees.collect {
         case dd: DefDef if !dd.symbol.isClassConstructor && !(dd.symbol.isSuperBridgeMethod || dd.symbol.isDefaultHelperMethod) => dd
@@ -261,11 +255,14 @@ trait ClassLikeSupport:
     def getParentsAsTreeSymbolTuples: List[(Tree, Symbol)] =
       for
         parentTree <- c.parents if isValidPos(parentTree.pos)  // We assume here that order is correct
-        parentSymbol = if parentTree.symbol.isClassConstructor then parentTree.symbol.owner else parentTree.symbol
-        if parentSymbol != defn.ObjectClass && parentSymbol != defn.AnyClass
+        parentSymbol = parentTree match
+          case t: TypeTree => t.tpe.typeSymbol
+          case tree if tree.symbol.isClassConstructor => tree.symbol.owner
+          case tree => tree.symbol
+        if parentSymbol != defn.ObjectClass && parentSymbol != defn.AnyClass && !parentSymbol.isHiddenByVisibility
       yield (parentTree, parentSymbol)
 
-    def getConstructors: List[Symbol] = membersToDocument.collect {
+    def getConstructors: List[Symbol] = c.membersToDocument.collect {
       case d: DefDef if d.symbol.isClassConstructor && c.constructor.symbol != d.symbol => d.symbol
     }.toList
 
@@ -330,21 +327,20 @@ trait ClassLikeSupport:
       specificKind: (Kind.Def => Kind) = identity
     ): Member =
     val method = methodSymbol.tree.asInstanceOf[DefDef]
-    val paramLists: List[TermParamClause] =
-      if emptyParamsList then Nil
-      else if methodSymbol.isExtensionMethod then
-        val params = method.termParamss
-        if methodSymbol.isLeftAssoc || params.size == 1 then params.tail
-        else params.head :: params.tail.drop(1)
-      else method.termParamss
-    val genericTypes = if (methodSymbol.isClassConstructor) Nil else method.leadingTypeParams
+    val paramLists: List[TermParamClause] = methodSymbol.nonExtensionTermParamLists
+    val genericTypes: List[TypeDef] = if (methodSymbol.isClassConstructor) Nil else methodSymbol.nonExtensionLeadingTypeParams
 
     val memberInfo = unwrapMemberInfo(c, methodSymbol)
 
     val basicKind: Kind.Def = Kind.Def(
-      genericTypes.map(mkTypeArgument(_, memberInfo.genericTypes)),
-      paramLists.zipWithIndex.map { (pList, index) =>
-        ParametersList(pList.params.map(mkParameter(_, paramPrefix, memberInfo = memberInfo.paramLists(index))), if isUsingModifier(pList.params) then "using " else "")
+      genericTypes.map(mkTypeArgument(_, memberInfo.genericTypes, memberInfo.contextBounds)),
+      paramLists.zipWithIndex.flatMap { (pList, index) =>
+        memberInfo.paramLists(index) match
+          case EvidenceOnlyParameterList => Nil
+          case info: RegularParameterList =>
+            Seq(ParametersList(pList.params.map(
+              mkParameter(_, paramPrefix, memberInfo = info)), paramListModifier(pList.params)
+            ))
       }
     )
 
@@ -362,11 +358,12 @@ trait ClassLikeSupport:
           ))
         case _ =>
           Kind.Implicit(basicKind, None)
+      else if methodSymbol.flags.is(Flags.Given) then Kind.Given(basicKind, Some(method.returnTpt.tpe.asSignature), extractImplicitConversion(method.returnTpt.tpe))
       else specificKind(basicKind)
 
-    val origin = if !methodSymbol.isOverriden then Origin.RegularlyDefined else
-      val overridenSyms = methodSymbol.allOverriddenSymbols.map(_.owner)
-      Origin.Overrides(overridenSyms.map(s => Overriden(s.name, s.dri)).toSeq)
+    val origin = if !methodSymbol.isOverridden then Origin.RegularlyDefined else
+      val overriddenSyms = methodSymbol.allOverriddenSymbols.map(_.owner)
+      Origin.Overrides(overriddenSyms.map(s => Overridden(s.name, s.dri)).toSeq)
 
     mkMember(methodSymbol, methodKind, memberInfo.res.asSignature)(origin = origin, deprecated = methodSymbol.isDeprecated())
 
@@ -389,7 +386,11 @@ trait ClassLikeSupport:
         isGrouped
       )
 
-  def mkTypeArgument(argument: TypeDef, memberInfo: Map[String, TypeBounds] = Map.empty): TypeParameter =
+  def mkTypeArgument(
+    argument: TypeDef,
+    memberInfo: Map[String, TypeBounds] = Map.empty,
+    contextBounds: Map[String, DSignature] = Map.empty
+    ): TypeParameter =
     val variancePrefix: "+" | "-" | "" =
       if  argument.symbol.flags.is(Flags.Covariant) then "+"
       else if argument.symbol.flags.is(Flags.Contravariant) then "-"
@@ -397,12 +398,18 @@ trait ClassLikeSupport:
 
     val name = argument.symbol.normalizedName
     val normalizedName = if name.matches("_\\$\\d*") then "_" else name
+    val boundsSignature = memberInfo.get(name).fold(argument.rhs.asSignature)(_.asSignature)
+    val signature = contextBounds.get(name) match
+      case None => boundsSignature
+      case Some(contextBoundsSignature) =>
+        boundsSignature ++ DSignature(Plain(" : ")) ++ contextBoundsSignature
+
     TypeParameter(
       argument.symbol.getAnnotations(),
       variancePrefix,
       normalizedName,
       argument.symbol.dri,
-      memberInfo.get(name).fold(argument.rhs.asSignature)(_.asSignature)
+      signature
     )
 
   def parseTypeDef(typeDef: TypeDef): Member =
@@ -418,15 +425,25 @@ trait ClassLikeSupport:
     val defaultKind = Kind.Type(!isTreeAbstract(typeDef.rhs), typeDef.symbol.isOpaque, generics).asInstanceOf[Kind.Type]
     val kind = if typeDef.symbol.flags.is(Flags.Enum) then Kind.EnumCase(defaultKind)
       else defaultKind
-    mkMember(typeDef.symbol, kind, tpeTree.asSignature)(deprecated = typeDef.symbol.isDeprecated())
+
+    if typeDef.symbol.flags.is(Flags.Exported)
+    then {
+      val origin = Some(tpeTree).flatMap {
+        case TypeBoundsTree(l: TypeTree, h: TypeTree) if l.tpe == h.tpe =>
+          Some(Link(l.tpe.typeSymbol.owner.name, l.tpe.typeSymbol.owner.dri))
+        case _ => None
+      }
+      mkMember(typeDef.symbol, Kind.Exported(kind), tpeTree.asSignature)(deprecated = typeDef.symbol.isDeprecated(), origin = Origin.ExportedFrom(origin))
+    }
+    else mkMember(typeDef.symbol, kind, tpeTree.asSignature)(deprecated = typeDef.symbol.isDeprecated())
 
   def parseValDef(c: ClassDef, valDef: ValDef): Member =
     def defaultKind = if valDef.symbol.flags.is(Flags.Mutable) then Kind.Var else Kind.Val
     val memberInfo = unwrapMemberInfo(c, valDef.symbol)
-    val kind = if valDef.symbol.flags.is(Flags.Implicit) then
-        Kind.Implicit(Kind.Val, extractImplicitConversion(valDef.tpt.tpe))
-        else if valDef.symbol.flags.is(Flags.Enum) then Kind.EnumCase(Kind.Val)
-        else defaultKind
+    val kind = if valDef.symbol.flags.is(Flags.Implicit) then Kind.Implicit(Kind.Val, extractImplicitConversion(valDef.tpt.tpe))
+      else if valDef.symbol.flags.is(Flags.Given) then Kind.Given(Kind.Val, Some(memberInfo.res.asSignature), extractImplicitConversion(valDef.tpt.tpe))
+      else if valDef.symbol.flags.is(Flags.Enum) then Kind.EnumCase(Kind.Val)
+      else defaultKind
 
     mkMember(valDef.symbol, kind, memberInfo.res.asSignature)(deprecated = valDef.symbol.isDeprecated())
 
@@ -437,31 +454,86 @@ trait ClassLikeSupport:
     graph: HierarchyGraph = HierarchyGraph.empty,
     deprecated: Option[Annotation] = None,
   ) = Member(
-      name = symbol.normalizedName,
-      dri = symbol.dri,
-      kind = kind,
-      visibility = symbol.getVisibility(),
-      modifiers = modifiers,
-      annotations = symbol.getAnnotations(),
-      signature = signature,
-      sources = symbol.source(using qctx),
-      origin = origin,
-      inheritedFrom = inheritedFrom,
-      graph = graph,
-      docs = symbol.documentation,
-      deprecated = deprecated
-    )
+    name = symbol.normalizedName,
+    dri = symbol.dri,
+    kind = kind,
+    visibility = symbol.getVisibility(),
+    modifiers = modifiers,
+    annotations = symbol.getAnnotations(),
+    signature = signature,
+    sources = symbol.source,
+    origin = origin,
+    inheritedFrom = inheritedFrom,
+    graph = graph,
+    docs = symbol.documentation,
+    deprecated = deprecated
+  )
+
+  object EvidenceOnlyParameterList
+  type RegularParameterList = Map[String, TypeRepr]
+  type ParameterList = RegularParameterList | EvidenceOnlyParameterList.type
+
+  case class MemberInfo(
+    genericTypes: Map[String, TypeBounds],
+    paramLists: List[ParameterList],
+    res: TypeRepr,
+    contextBounds: Map[String, DSignature] = Map.empty,
+  )
 
-  case class MemberInfo(genericTypes: Map[String, TypeBounds], paramLists: List[Map[String, TypeRepr]], res: TypeRepr)
 
   def unwrapMemberInfo(c: ClassDef, symbol: Symbol): MemberInfo =
     val baseTypeRepr = memberInfo(c, symbol)
 
+    def isSyntheticEvidence(name: String) =
+      if !name.startsWith(NameKinds.EvidenceParamName.separator) then false else
+        // This assumes that every parameter that starts with `evidence$` and is implicit is generated by compiler to desugar context bound.
+        // Howrever, this is just a heuristic, so
+        // `def foo[A](evidence$1: ClassTag[A]) = 1`
+        // will be documented as
+        // `def foo[A: ClassTag] = 1`.
+        // Scala spec states that `$` should not be used in names and behaviour may be undefiend in such case.
+        // Documenting method slightly different then its definition is withing the 'undefiend behaviour'.
+        symbol.paramSymss.flatten.find(_.name == name).exists(_.flags.is(Flags.Implicit))
+
     def handlePolyType(polyType: PolyType): MemberInfo =
       MemberInfo(polyType.paramNames.zip(polyType.paramBounds).toMap, List.empty, polyType.resType)
 
     def handleMethodType(memberInfo: MemberInfo, methodType: MethodType): MemberInfo =
-      MemberInfo(memberInfo.genericTypes, memberInfo.paramLists ++ List(methodType.paramNames.zip(methodType.paramTypes).toMap), methodType.resType)
+      val rawParams = methodType.paramNames.zip(methodType.paramTypes).toMap
+      val (evidences, notEvidences) = rawParams.partition(e => isSyntheticEvidence(e._1))
+
+
+      def findParamRefs(t: TypeRepr): Seq[ParamRef] = t match
+        case paramRef: ParamRef => Seq(paramRef)
+        case AppliedType(_, args) => args.flatMap(findParamRefs)
+        case MatchType(bound, scrutinee,  cases) =>
+            findParamRefs(bound) ++ findParamRefs(scrutinee)
+        case _ => Nil
+
+      def nameForRef(ref: ParamRef): String =
+        val PolyType(names, _, _) = ref.binder
+        names(ref.paramNum)
+
+      val (paramsThatLookLikeContextBounds, contextBounds) =
+        evidences.partitionMap {
+          case (_, AppliedType(tpe, List(typeParam: ParamRef))) =>
+            Right(nameForRef(typeParam) -> tpe.asSignature)
+          case (name, original) =>
+            findParamRefs(original) match
+              case Nil => Left((name, original))
+              case typeParam :: _ =>
+                val name = nameForRef(typeParam)
+                val signature = Seq(Plain("(["), dotty.tools.scaladoc.Type(name, None), Plain("]"), Keyword(" =>> ")) ++ original.asSignature ++ Seq(Plain(")"))
+                Right(name -> signature.toList)
+        }
+
+      val newParams = notEvidences ++ paramsThatLookLikeContextBounds
+
+      val newLists: List[ParameterList] = if newParams.isEmpty   && contextBounds.nonEmpty
+        then memberInfo.paramLists ++  Seq(EvidenceOnlyParameterList)
+        else memberInfo.paramLists ++ Seq(newParams)
+
+      MemberInfo(memberInfo.genericTypes, newLists , methodType.resType, contextBounds.toMap)
 
     def handleByNameType(memberInfo: MemberInfo, byNameType: ByNameType): MemberInfo =
       MemberInfo(memberInfo.genericTypes, memberInfo.paramLists, byNameType.underlying)
@@ -474,5 +546,9 @@ trait ClassLikeSupport:
 
     recursivelyCalculateMemberInfo(MemberInfo(Map.empty, List.empty, baseTypeRepr))
 
-  private def isUsingModifier(parameters: Seq[ValDef]): Boolean =
-    parameters.size > 0 && parameters(0).symbol.flags.is(Flags.Given)
+  private def paramListModifier(parameters: Seq[ValDef]): String =
+    if parameters.size > 0 then
+      if parameters(0).symbol.flags.is(Flags.Given) then "using "
+      else if parameters(0).symbol.flags.is(Flags.Implicit) then "implicit "
+      else ""
+    else ""
\ No newline at end of file
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala
new file mode 100644
index 000000000000..36b29ff05eee
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala
@@ -0,0 +1,370 @@
+package dotty.tools.scaladoc.tasty
+
+import collection.JavaConverters._
+import dotty.tools.scaladoc._
+import dotty.tools.scaladoc.{Signature => DSignature}
+import dotty.tools.scaladoc.Inkuire
+import dotty.tools.scaladoc.renderers.Resources
+
+import scala.util.Random
+import scala.quoted._
+import scala.util.chaining._
+
+import SymOps._
+import NameNormalizer._
+import SyntheticsSupport._
+
+trait InkuireSupport(using DocContext) extends Resources:
+  self: TastyParser =>
+  import qctx.reflect._
+
+  // Unused in InkuireSupport, required for Resources
+  override def effectiveMembers: Map[DRI, Member] = Map.empty
+
+  private given qctx.type = qctx
+
+  def doInkuireStuff(classDef: ClassDef): Unit = {
+    val classType: Inkuire.Type = classDef.asInkuire(Set.empty).asInstanceOf[Inkuire.Type]
+
+    val variableNames: Set[String] = classType.params.map(_.typ)
+      .flatMap(varName(_).toList).toSet
+
+    val parents: Seq[Inkuire.Type] = classDef.parents.map(_.asInkuire(variableNames).asInstanceOf[Inkuire.Type])
+
+    val isModule = classDef.symbol.flags.is(Flags.Module)
+
+    if !isModule then Inkuire.db = Inkuire.db.copy(types = Inkuire.db.types.updated(classType.itid.get, (classType, parents)))
+
+    classDef.symbol.declaredTypes
+      .filter(viableSymbol)
+      .foreach {
+        case typeSymbol: Symbol if typeSymbol.flags.is(Flags.Opaque) =>
+          val typ = typeSymbol.tree.asInkuire(variableNames)
+          if typ.isInstanceOf[Inkuire.Type] then {
+            val t = typ.asInstanceOf[Inkuire.Type]
+            Inkuire.db = Inkuire.db.copy(types = Inkuire.db.types.updated(t.itid.get, (t, Seq.empty)))
+          }
+        case typeSymbol: Symbol if !typeSymbol.isClassDef =>
+          val typeDef = typeSymbol.tree.asInstanceOf[TypeDef]
+          val typ = typeSymbol.tree.asInkuire(variableNames)
+          if typ.isInstanceOf[Inkuire.Type] then {
+            val t = typ.asInstanceOf[Inkuire.Type]
+            val rhsTypeLike = typeDef.rhs.asInkuire(variableNames)
+            val withType = Inkuire.db.copy(
+              types = Inkuire.db.types.updated(t.itid.get, (t, Seq.empty))
+            )
+            typeDef.rhs match {
+              case TypeBoundsTree(_, r) if r.asInkuire(variableNames).isInstanceOf[Inkuire.Type] =>
+                Inkuire.db = Inkuire.db.copy(
+                  types = Inkuire.db.types.updated(t.itid.get, (t, Seq(r.asInkuire(variableNames).asInstanceOf[Inkuire.Type])))
+                )
+              case _ =>
+                Inkuire.db = withType.copy(
+                  types = Inkuire.db.types.updated(t.itid.get, (t, Seq.empty)),
+                  typeAliases = Inkuire.db.typeAliases.updated(t.itid.get, rhsTypeLike)
+                )
+            }
+          }
+          if typeDef.rhs.symbol.flags.is(Flags.JavaDefined) then
+            val typJava = typeDef.rhs.asInkuire(variableNames)
+            if typJava.isInstanceOf[Inkuire.Type] then {
+              val tJava = typJava.asInstanceOf[Inkuire.Type]
+              Inkuire.db = Inkuire.db.copy(types = Inkuire.db.types.updated(tJava.itid.get, (tJava, Seq.empty)))
+            }
+        case _ =>
+    }
+
+    if classDef.symbol.isImplicitClass then // Implicit classes <- synthetic method with the same name
+      classDef.symbol.maybeOwner.declarations
+        .filter { methodSymbol =>
+          methodSymbol.name == classDef.symbol.name && methodSymbol.flags.is(Flags.Implicit) && methodSymbol.flags.is(Flags.Method)
+        }
+        .foreach(handleImplicitConversion(_, variableNames))
+
+    classDef.symbol.declaredMethods
+      .filter(viableSymbol)
+      .tap { _.foreach { // Loop for implicit conversions
+        case implicitConversion: Symbol if implicitConversion.flags.is(Flags.Implicit) || implicitConversion.flags.is(Flags.Given) =>
+          handleImplicitConversion(implicitConversion, variableNames)
+        case _ =>
+      }}
+      .tap { _.foreach { // Loop for functions and vals
+        case methodSymbol: Symbol =>
+          val defdef = methodSymbol.tree.asInstanceOf[DefDef]
+          val methodVars = defdef.paramss.flatMap(_.params).collect {
+            case TypeDef(name, _) => name
+          }
+          val vars = variableNames ++ methodVars
+          val (receiver, preArgs): (Option[Inkuire.TypeLike], Seq[Inkuire.TypeLike]) = Some(classType).filter(_ => !isModule) match {
+            case None => (methodSymbol.extendedSymbol.flatMap(s => partialAsInkuire(vars).lift(s.tpt)), Seq.empty)
+            case rcvr => (rcvr, methodSymbol.extendedSymbol.flatMap(s => partialAsInkuire(vars).lift(s.tpt)).toSeq)
+          }
+          val (name, ownerName) = nameAndOwnerName(classDef, methodSymbol)
+          val sgn = Inkuire.ExternalSignature(
+            signature = Inkuire.Signature(
+              receiver = receiver,
+              arguments = preArgs ++ methodSymbol.nonExtensionTermParamLists.collect {
+                case tpc@TermParamClause(params) if !tpc.isImplicit && !tpc.isGiven => params //TODO [Inkuire] Implicit parameters
+              }.flatten.map(_.tpt.asInkuire(vars)),
+              result = defdef.returnTpt.asInkuire(vars),
+              context = Inkuire.SignatureContext(
+                vars = vars.toSet,
+                constraints = Map.empty //TODO [Inkuire] Type bounds
+              )
+            ),
+            name = name,
+            packageName = ownerName,
+            uri = methodSymbol.dri.externalLink.getOrElse(absolutePathWithAnchor(methodSymbol.dri)),
+            entryType = "def"
+          )
+          val curriedSgn = sgn.copy(signature = Inkuire.curry(sgn.signature))
+          Inkuire.db = Inkuire.db.copy(functions = Inkuire.db.functions :+ curriedSgn)
+    }}
+
+    classDef.symbol.declaredFields
+      .filter(viableSymbol)
+      .foreach {
+        case valSymbol: Symbol =>
+          val valdef = valSymbol.tree.asInstanceOf[ValDef]
+          val receiver: Option[Inkuire.TypeLike] =
+            Some(classType)
+              .filter(_ => !isModule)
+          val (name, ownerName) = nameAndOwnerName(classDef, valSymbol)
+          val sgn = Inkuire.ExternalSignature(
+            signature = Inkuire.Signature(
+              receiver = receiver,
+              arguments = Seq.empty,
+              result = valdef.tpt.asInkuire(variableNames),
+              context = Inkuire.SignatureContext(
+                vars = variableNames.toSet,
+                constraints = Map.empty //TODO [Inkuire] Type bounds
+              )
+            ),
+            name = name,
+            packageName = ownerName,
+            uri = valSymbol.dri.externalLink.getOrElse(absolutePathWithAnchor(valSymbol.dri)),
+            entryType = "val"
+          )
+          val curriedSgn = sgn.copy(signature = Inkuire.curry(sgn.signature))
+          Inkuire.db = Inkuire.db.copy(functions = Inkuire.db.functions :+ curriedSgn)
+      }
+  }
+
+  private def handleImplicitConversion(implicitConversion: Symbol, variableNames: Set[String]) = {
+    val defdef = implicitConversion.tree.asInstanceOf[DefDef]
+    val methodVars = defdef.paramss.flatMap(_.params).collect {
+      case TypeDef(name, _) => name
+    }
+    val vars = variableNames ++ methodVars
+    val to = defdef.returnTpt.asInkuire(vars)
+    val from = defdef.paramss.flatMap(_.params).collectFirst {
+      case v: ValDef => v.tpt.asInkuire(vars)
+    }
+    (from, to) match
+      case (from, to: Inkuire.Type) => Inkuire.implicitConversions = Inkuire.implicitConversions :+ (from -> to)
+      case _ =>
+  }
+
+  private def nameAndOwnerName(classDef: ClassDef, symbol: Symbol): (String, String) =
+    if classDef.symbol.flags.is(Flags.Module) || Seq("apply", "unapply").contains(symbol.name) then
+      symbol.maybeOwner.normalizedName + "." + symbol.name ->
+        ownerNameChain(classDef.symbol.maybeOwner).mkString(".")
+    else
+      symbol.name ->
+        ownerNameChain(classDef.symbol).mkString(".")
+
+  private def ownerNameChain(sym: Symbol): List[String] =
+    if sym.isNoSymbol then List.empty
+    else if sym == defn.EmptyPackageClass then List.empty
+    else if sym == defn.RootPackage then List.empty
+    else if sym == defn.RootClass then List.empty
+    else if sym.normalizedName.contains("$package") then ownerNameChain(sym.owner)
+    else ownerNameChain(sym.owner) :+ sym.normalizedName
+
+  private def viableSymbol(s: Symbol): Boolean =
+      !s.flags.is(Flags.Private) &&
+        !s.flags.is(Flags.Protected) &&
+        !s.flags.is(Flags.Override) &&
+        !s.flags.is(Flags.Synthetic)
+
+  private def varName(t: Inkuire.TypeLike): Option[String] = t match {
+    case tpe: Inkuire.Type      => Some(tpe.name.name)
+    case tl: Inkuire.TypeLambda => varName(tl.result)
+    case _                      => None
+  }
+
+  private def paramsForClass(classDef: ClassDef, vars: Set[String]): Seq[Inkuire.Variance] =
+    classDef.getTypeParams.map(mkTypeArgumentInkuire)
+
+  given TreeSyntaxInkuire: AnyRef with
+    extension (tpeTree: Tree)
+      def asInkuire(vars: Set[String]): Inkuire.TypeLike =
+        partialAsInkuire(vars)(tpeTree)
+
+  private def partialAsInkuire(vars: Set[String]): PartialFunction[Tree, Inkuire.TypeLike] = {
+    case tpeTree: TypeBoundsTree => inner(tpeTree.tpe, vars)
+    case tpeTree: Applied =>
+      inner(tpeTree.tpe, vars)
+    case tpeTree: TypeTree =>
+      inner(tpeTree.tpe, vars)
+    case term:  Term => inner(term.tpe, vars)
+    case classDef: ClassDef => mkTypeFromClassDef(classDef, vars)
+    case typeDef: TypeDef => mkTypeDef(typeDef)
+  }
+
+  private def mkTypeDef(typeDef: TypeDef): Inkuire.Type = typeDef.rhs match {
+    case LambdaTypeTree(paramsDefs, _) =>
+      val name = typeDef.symbol.normalizedName
+      val normalizedName = if name.matches("_\\$\\d*") then "_" else name
+      val params = paramsDefs.map(_.name).map(Inkuire.TypeLambda.argument)
+      Inkuire.Type(
+        name = Inkuire.TypeName(normalizedName),
+        itid = typeDef.symbol.itid,
+        params = params.map(Inkuire.Invariance(_))
+      )
+    case _ =>
+      Inkuire.Type(
+        name = Inkuire.TypeName(typeDef.name),
+        itid = typeDef.symbol.itid
+      )
+  }
+
+  private def mkTypeFromClassDef(classDef: ClassDef, vars: Set[String]): Inkuire.Type = {
+    Inkuire.Type(
+      name = Inkuire.TypeName(classDef.name),
+      itid = classDef.symbol.itid,
+      params = paramsForClass(classDef, vars)
+    )
+  }
+
+  given SymbolSyntaxInkuire: AnyRef with
+    extension (symbol: Symbol)
+      def itid(using dctx: DocContext): Option[Inkuire.ITID] = Some(Inkuire.ITID(symbol.dri.symbolUUID, isParsed = false))
+
+  given TypeSyntaxInkuire: AnyRef with
+    extension (tpe: TypeRepr)
+      def asInkuire(vars: Set[String]): Inkuire.TypeLike = inner(tpe, vars)
+
+  private def genSyntheticTypeArgs(n: Int, resSymbol: Symbol) =
+    1.to(n).map { i =>
+      val uuid = s"synthetic-arg$i${resSymbol.hashCode}"
+      val name = s"X$i"
+      Inkuire.Type(
+        name = Inkuire.TypeName(name),
+        itid = Some(Inkuire.ITID(uuid, isParsed = false)),
+        isVariable = true
+      )
+    }
+
+  private def mkTypeArgumentInkuire(argument: TypeDef): Inkuire.Variance =
+    //TODO [Inkuire] Type bounds (other than just HKTs)
+    val name = argument.symbol.normalizedName
+    val normalizedName = if name.matches("_\\$\\d*") then "_" else name
+    val params = genSyntheticTypeArgs(typeVariableDeclarationParamsNo(argument), argument.symbol)
+    val res = Inkuire.Type(
+      name = Inkuire.TypeName(normalizedName),
+      itid = argument.symbol.itid,
+      isVariable = true,
+      params = params.map(Inkuire.Invariance(_))
+    )
+    val t = params.toList match
+      case Nil => res
+      case _ => Inkuire.TypeLambda(params, res)
+    if argument.symbol.flags.is(Flags.Covariant) then Inkuire.Covariance(t)
+    else if argument.symbol.flags.is(Flags.Contravariant) then Inkuire.Contravariance(t)
+    else Inkuire.Invariance(t)
+
+  private def typeVariableDeclarationParamsNo(argument: TypeDef): Int =
+    argument.rhs match
+      case t: TypeTree => t.tpe match
+        case TypeBounds(_, TypeLambda(names, _, _)) => names.size
+        case _ => 0
+      case _ => 0
+
+  private def isRepeatedAnnotation(term: Term) =
+    term.tpe match
+      case t: TypeRef => t.name == "Repeated" && t.qualifier.match
+        case ThisType(tref: TypeRef) if tref.name == "internal" => true
+        case _ => false
+      case _ => false
+
+  private def isRepeated(typeRepr: TypeRepr) =
+    typeRepr match
+      case t: TypeRef => t.name == "<repeated>" && t.qualifier.match
+        case ThisType(tref: TypeRef) if tref.name == "scala" => true
+        case _ => false
+      case _ => false
+
+  private def inner(tp: TypeRepr, vars: Set[String]): Inkuire.TypeLike =
+    tp match
+      case OrType(left, right) => Inkuire.OrType(inner(left, vars), inner(right, vars))
+      case AndType(left, right) => Inkuire.AndType(inner(left, vars), inner(right, vars))
+      case ByNameType(tpe) => inner(tpe, vars)
+      case ConstantType(constant) =>
+        Inkuire.Type(
+          name = Inkuire.TypeName(constant.toString),
+          params = Seq.empty,
+          itid = Some(Inkuire.ITID(constant.toString, isParsed = false))
+        )
+      case ThisType(tpe) => inner(tpe, vars)
+      case AnnotatedType(AppliedType(_, Seq(tpe)), annotation) if isRepeatedAnnotation(annotation) =>
+        inner(tpe, vars) //TODO [Inkuire] Repeated types
+      case AppliedType(repeatedClass, Seq(tpe)) if isRepeated(repeatedClass) =>
+        inner(tpe, vars) //TODO [Inkuire] Repeated types
+      case AnnotatedType(tpe, _) =>
+        inner(tpe, vars)
+      case tl @ TypeLambda(paramNames, _, resType) =>
+        Inkuire.TypeLambda(paramNames.map(Inkuire.TypeLambda.argument), inner(resType, vars)) //TODO [Inkuire] Type bounds
+      case r: Refinement =>
+        inner(r.info, vars) //TODO [Inkuire] Refinements
+      case t @ AppliedType(tpe, typeList) =>
+        import dotty.tools.dotc.util.Chars._
+        if t.isFunctionType then
+          val name = s"Function${typeList.size-1}"
+          Inkuire.Type(
+            name = Inkuire.TypeName(name),
+            params = typeList.init.map(p => Inkuire.Contravariance(inner(p, vars))) :+ Inkuire.Covariance(inner(typeList.last, vars)),
+            itid = Some(Inkuire.ITID(s"${name}scala.${name}//[]", isParsed = false))
+          )
+        else if t.isTupleN then
+          val name = s"Tuple${typeList.size}"
+          Inkuire.Type(
+            name = Inkuire.TypeName(name),
+            params = typeList.map(p => Inkuire.Covariance(inner(p, vars))),
+            itid = Some(Inkuire.ITID(s"${name}scala.${name}//[]", isParsed = false))
+          )
+        else
+          inner(tpe, vars).asInstanceOf[Inkuire.Type].copy(
+            params = typeList.map(p => Inkuire.Invariance(inner(p, vars)))
+          )
+      case tp: TypeRef =>
+        Inkuire.Type(
+          name = Inkuire.TypeName(tp.name),
+          itid = tp.typeSymbol.itid,
+          params = Seq.empty,
+          isVariable = vars.contains(tp.name)
+        )
+      case tr @ TermRef(qual, typeName) =>
+        inner(qual, vars)
+      case tb@TypeBounds(low, hi) =>
+        if low.typeSymbol != defn.NothingClass || hi.typeSymbol == defn.AnyClass then
+          inner(low, vars) //TODO [Inkuire] Type bounds
+        else
+          inner(hi, vars)
+      case NoPrefix() =>
+        Inkuire.Type.unresolved //TODO [Inkuire] <- should be handled by Singleton case, but didn't work
+      case MatchType(bond, sc, cases) =>
+        inner(sc, vars)
+      case ParamRef(TypeLambda(names, _, _), i) =>
+        Inkuire.TypeLambda.argument(names(i))
+      case ParamRef(m: MethodType, i) =>
+        inner(m.paramTypes(i), vars)
+      case RecursiveType(tp) =>
+        inner(tp, vars)
+      case m@MethodType(_, typeList, resType) =>
+        val name = s"Function${typeList.size-1}"
+        Inkuire.Type(
+          name = Inkuire.TypeName(name),
+          params = typeList.map(p => Inkuire.Contravariance(inner(p, vars))) :+ Inkuire.Covariance(inner(resType, vars)),
+          itid = Some(Inkuire.ITID(s"${name}scala.${name}//[]", isParsed = false))
+        )
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/JavadocAnchorCreator.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/JavadocAnchorCreator.scala
index 5f9751d0d8e3..ea7dc32a7e58 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/JavadocAnchorCreator.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/JavadocAnchorCreator.scala
@@ -5,33 +5,32 @@ import scala.quoted._
 import dotty.tools.scaladoc.util.Escape._
 import scala.util.matching.Regex
 
-trait JavadocAnchorCreator:
-  self: SymOps[_] =>
+object JavadocAnchorCreator:
 
-  import self.q.reflect._
+  private def javadocPrimitives(using Quotes)(sym: reflect.Symbol) =
+    import reflect.*
+    if sym == defn.IntClass then Some("int")
+    else if sym == defn.FloatClass then Some("float")
+    else if sym == defn.DoubleClass then Some("double")
+    else if sym == defn.LongClass then Some("long")
+    else if sym == defn.ByteClass then Some("byte")
+    else if sym == defn.BooleanClass then Some("boolean")
+    else if sym == defn.CharClass then Some("char")
+    else if sym == defn.ShortClass then Some("short")
+    else if sym == defn.ObjectClass then Some("java.lang.Object")
+    else None
 
-  private val javadocPrimitivesMap = Map(
-    defn.IntClass -> "int",
-    defn.FloatClass -> "float",
-    defn.DoubleClass -> "double",
-    defn.LongClass -> "long",
-    defn.ByteClass -> "byte",
-    defn.BooleanClass -> "boolean",
-    defn.CharClass -> "char",
-    defn.ShortClass -> "short",
-    defn.ObjectClass -> "java.lang.Object"
-  )
-
-  private def transformPrimitiveType(tpe: TypeRepr): String = tpe.classSymbol
-    .flatMap(javadocPrimitivesMap.get)
+  private def transformPrimitiveType(using Quotes)(tpe: reflect.TypeRepr): String = tpe.classSymbol
+    .flatMap(javadocPrimitives)
     .filter(_ => !tpe.typeSymbol.isTypeParam)
     .getOrElse(tpe.show)
 
-  private def transformType(tpe: TypeRepr): String = tpe.simplified match {
-    case AppliedType(tpe, typeList) if tpe.classSymbol.fold(false)(_ == defn.ArrayClass) => transformType(typeList.head) + ":A"
-    case AppliedType(tpe, typeList) if tpe.classSymbol.fold(false)(_ == defn.RepeatedParamClass) => transformType(typeList.head) + "..."
-    case AppliedType(tpe, typeList) => transformPrimitiveType(tpe)
-    case other => transformPrimitiveType(other)
-  }
+  private def transformType(using Quotes)(tpe: reflect.TypeRepr): String =
+    import reflect.*
+    tpe.simplified match
+      case AppliedType(tpe, typeList) if tpe.classSymbol.fold(false)(_ == defn.ArrayClass) => transformType(typeList.head) + ":A"
+      case AppliedType(tpe, typeList) if tpe.classSymbol.fold(false)(_ == defn.RepeatedParamClass) => transformType(typeList.head) + "..."
+      case AppliedType(tpe, typeList) => transformPrimitiveType(tpe)
+      case other => transformPrimitiveType(other)
 
-  def getJavadocType(s: TypeRepr) = transformType(s)
+  def getJavadocType(using Quotes)(s: reflect.TypeRepr) = transformType(s)
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/NameNormalizer.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/NameNormalizer.scala
index 24366288557c..687ad6ecbf44 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/NameNormalizer.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/NameNormalizer.scala
@@ -4,23 +4,26 @@ import dotty.tools.scaladoc._
 import dotty.tools.dotc.core.StdNames.nme.keywords
 import dotty.tools.dotc.core.Names.termName
 
-trait NameNormalizer { self: TastyParser =>
-  import qctx.reflect._
-  extension (s: Symbol) def normalizedName: String = {
-    val withoutGivenPrefix = if s.isGiven then s.name.stripPrefix("given_") else s.name
-    val withoutObjectSuffix = if s.flags.is(Flags.Module) then withoutGivenPrefix.stripSuffix("$") else withoutGivenPrefix
-    val constructorNormalizedName = if s.isClassConstructor then "this" else withoutObjectSuffix
-    val escaped = escapedName(constructorNormalizedName)
-    escaped
-  }
+import scala.quoted._
+import SymOps._
+
+object NameNormalizer {
+
+  extension (using Quotes)(s: reflect.Symbol)
+    def normalizedName: String = {
+      import reflect.*
+      val withoutObjectSuffix = if s.flags.is(Flags.Module) then s.name.stripSuffix("$") else s.name
+      val constructorNormalizedName = if s.isClassConstructor then "this" else withoutObjectSuffix
+      val escaped = escapedName(constructorNormalizedName)
+      escaped
+    }
 
   private val ignoredKeywords: Set[String] = Set("this")
 
   private def escapedName(name: String) =
-    val simpleIdentifierRegex = raw"(?:\w+_[^\[\(\s_]+)|\w+|[^\[\(\s\w_]+".r
+    val complexIdentifierRegex = """([([{}]) ]|[^A-Za-z0-9$]_)""".r
     name match
       case n if ignoredKeywords(n) => n
-      case n if keywords(termName(n)) => s"`$n`"
-      case simpleIdentifierRegex() => name
-      case n => s"`$n`"
+      case n if keywords(termName(n)) || complexIdentifierRegex.findFirstIn(n).isDefined => s"`$n`"
+      case _ => name
 }
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/PackageSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/PackageSupport.scala
index 04d4a66ff6cc..77ce9854620d 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/PackageSupport.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/PackageSupport.scala
@@ -3,10 +3,14 @@ package tasty
 
 import collection.JavaConverters._
 
+import SymOps._
+
 trait PackageSupport:
     self: TastyParser =>
     import qctx.reflect._
 
+    private given qctx.type = qctx
+
     def parsePackage(pck: PackageClause): (String, Member) =
       val name = pck.symbol.fullName
       (name, Member(name, pck.symbol.dri, Kind.Package))
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/ScalaDocSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/ScalaDocSupport.scala
index 2a41c3251727..1c634df8c918 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/ScalaDocSupport.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/ScalaDocSupport.scala
@@ -6,10 +6,12 @@ import scala.jdk.CollectionConverters._
 import dotty.tools.scaladoc.Scaladoc.CommentSyntax
 import dotty.tools.scaladoc.tasty.comments.Comment
 
-trait ScaladocSupport { self: TastyParser =>
-  import qctx.reflect._
+import scala.quoted._
 
-  def parseCommentString(comment: String, sym: Symbol, pos: Option[Position]): Comment =
+object ScaladocSupport:
+
+  def parseCommentString(using Quotes, DocContext)(comment: String, sym: reflect.Symbol, pos: Option[reflect.Position]): Comment =
+    import reflect.report
     val preparsed = comments.Preparser.preparse(comments.Cleaner.clean(comment))
 
     val commentSyntax =
@@ -22,22 +24,22 @@ trait ScaladocSupport { self: TastyParser =>
 
             CommentSyntax.default
           }
-        case None => ctx.args.defaultSyntax
+        case None => summon[DocContext].args.defaultSyntax
       }
 
     val parser = commentSyntax match {
       case CommentSyntax.Wiki =>
-        comments.WikiCommentParser(comments.Repr(qctx)(sym))
+        comments.WikiCommentParser(comments.Repr(quotes)(sym))
       case CommentSyntax.Markdown =>
-        comments.MarkdownCommentParser(comments.Repr(qctx)(sym))
+        comments.MarkdownCommentParser(comments.Repr(quotes)(sym))
     }
     parser.parse(preparsed)
 
-  def parseComment(docstring: String,  tree: Tree): Comment =
+  def parseComment(using Quotes, DocContext)(docstring: String,  tree: reflect.Tree): Comment =
     val commentString: String =
       if tree.symbol.isClassDef || tree.symbol.owner.isClassDef then
         import dotty.tools.dotc
-        given ctx: dotc.core.Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+        given ctx: dotc.core.Contexts.Context = quotes.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
 
         val sym = tree.symbol.asInstanceOf[dotc.core.Symbols.Symbol]
 
@@ -47,5 +49,3 @@ trait ScaladocSupport { self: TastyParser =>
         docstring
 
     parseCommentString(commentString, tree.symbol, Some(tree.pos))
-
-}
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/Scaladoc2AnchorCreator.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/Scaladoc2AnchorCreator.scala
index 438fd9ed0153..ba59f77495b1 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/Scaladoc2AnchorCreator.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/Scaladoc2AnchorCreator.scala
@@ -5,17 +5,12 @@ import scala.quoted._
 import dotty.tools.scaladoc.util.Escape._
 import scala.util.matching.Regex
 
-trait Scaladoc2AnchorCreator:
-  self: SymOps[_] =>
+object Scaladoc2AnchorCreator:
 
-  import self.q.reflect._
-
-  implicit private val printer: Printer[Tree] = Printer.TreeShortCode
-
-  def getScaladoc2Type(t: Tree) = {
-    (t match {
-    case d: DefDef => d.show.split("def", 2)(1)
-    case t: TypeDef => t.show.split("type", 2)(1)
-    case v: ValDef => v.show.split("val|var", 2)(1)
-  }).replace(" ","")
-}
\ No newline at end of file
+  def getScaladoc2Type(using Quotes)(t: reflect.Tree) =
+    import reflect.*
+    val regex = t match
+      case d: DefDef =>  "def"
+      case t: TypeDef => "type"
+      case v: ValDef =>  "val|var"
+    t.show(using Printer.TreeShortCode).split(regex, 2)(1).replace(" ","")
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala
index 12738943c1fe..e412475cbf2c 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala
@@ -5,24 +5,29 @@ import scala.quoted._
 import dotty.tools.scaladoc.util.Escape._
 import scala.collection.mutable.{ Map => MMap }
 import dotty.tools.io.AbstractFile
+import Scaladoc2AnchorCreator.getScaladoc2Type
+import JavadocAnchorCreator.getJavadocType
 
-class SymOps[Q <: Quotes](val q: Q) extends JavadocAnchorCreator with Scaladoc2AnchorCreator:
-  import q.reflect._
+object SymOps:
 
-  given Q = q
+  extension (using Quotes)(sym: reflect.Symbol)
 
-  private val externalLinkCache: scala.collection.mutable.Map[AbstractFile, Option[ExternalDocLink]] = MMap()
+    def isImplicitClass: Boolean =
+      import reflect._
+      sym.isClassDef && sym.maybeOwner != Symbol.noSymbol
+        && sym.maybeOwner.declaredMethods.exists { methodSymbol =>
+          methodSymbol.name == sym.name && methodSymbol.flags.is(Flags.Implicit) && methodSymbol.flags.is(Flags.Method)
+        }
 
-  extension (sym: Symbol)
-    def packageName: String = (
+    def packageName: String =
       if (sym.isPackageDef) sym.fullName
       else sym.maybeOwner.packageName
-    )
 
     def packageNameSplitted: Seq[String] =
       sym.packageName.split('.').toList
 
     def className: Option[String] =
+      import reflect._
       if (sym.isClassDef && !sym.flags.is(Flags.Package)) Some(
         Some(sym.maybeOwner).filter(s => s.exists).flatMap(_.className).fold("")(cn => cn + "$") + sym.name
       ).filterNot(_.contains("package$"))
@@ -40,9 +45,16 @@ class SymOps[Q <: Quotes](val q: Q) extends JavadocAnchorCreator with Scaladoc2A
         Some(s"${sym.name}-$hash")
       }
       else None
+
+    def source =
+      val path = sym.pos.flatMap(_.sourceFile.getJPath).map(_.toAbsolutePath)
+      path.map(TastyMemberSource(_, sym.pos.get.startLine))
+
     //TODO: Retrieve string that will match scaladoc anchors
 
+
     def getVisibility(): Visibility =
+      import reflect._
       import VisibilityScope._
 
       def explicitScope(ownerType: TypeRepr): VisibilityScope =
@@ -65,62 +77,142 @@ class SymOps[Q <: Quotes](val q: Q) extends JavadocAnchorCreator with Scaladoc2A
         case (None, None, (false, true, true)) => Visibility.Protected(ThisScope)
         case (None, None, (false, true, false)) => Visibility.Protected(implicitScope(sym.owner))
         case (None, None, (false, false, false)) => Visibility.Unrestricted
+        case (None, None, (true, true, false)) => Visibility.Protected(ThisScope)
         case _ => throw new Exception(s"Visibility for symbol $sym cannot be determined")
 
 
     // Order here determines order in documenation
-    def getExtraModifiers(): Seq[Modifier] = Seq(
+    def getExtraModifiers(): Seq[Modifier] =
+      import reflect._
+      Seq(
         Flags.Final -> Modifier.Final,
         Flags.Sealed -> Modifier.Sealed,
         Flags.Erased -> Modifier.Erased,
         Flags.Abstract -> Modifier.Abstract,
         Flags.Deferred -> Modifier.Deferred,
         Flags.Implicit -> Modifier.Implicit,
+        Flags.Infix -> Modifier.Infix,
+        Flags.Transparent -> Modifier.Transparent,
         Flags.Inline -> Modifier.Inline,
         Flags.Lazy -> Modifier.Lazy,
         Flags.Open -> Modifier.Open,
         Flags.Override -> Modifier.Override,
         Flags.Case -> Modifier.Case,
-        ).collect { case (flag, mod) if sym.flags.is(flag) => mod }
+      ).collect {
+        case (flag, mod) if sym.flags.is(flag) => mod
+      }
 
     def isHiddenByVisibility(using dctx: DocContext): Boolean =
       import VisibilityScope._
 
-      !summon[DocContext].args.includePrivateAPI && getVisibility().match
+      !summon[DocContext].args.includePrivateAPI && sym.getVisibility().match
         case Visibility.Private(_) => true
         case Visibility.Protected(ThisScope | ImplicitModuleScope | _: ExplicitModuleScope) => true
         case _ => false
 
-    def shouldDocumentClasslike(using dctx: DocContext): Boolean = !isHiddenByVisibility
-        && !sym.flags.is(Flags.Synthetic)
-        && (!sym.flags.is(Flags.Case) || !sym.flags.is(Flags.Enum))
-        && !(sym.companionModule.flags.is(Flags.Given))
-
+    def shouldDocumentClasslike(using dctx: DocContext): Boolean =
+      import reflect._
+      !sym.isHiddenByVisibility
+      && !sym.flags.is(Flags.Synthetic)
+      && (!sym.flags.is(Flags.Case) || !sym.flags.is(Flags.Enum))
 
-    def getCompanionSymbol: Option[Symbol] = Some(sym.companionClass).filter(_.exists)
+    def getCompanionSymbol: Option[reflect.Symbol] = Some(sym.companionClass).filter(_.exists)
 
-    def isCompanionObject: Boolean = sym.flags.is(Flags.Module) && sym.companionClass.exists
+    def isCompanionObject: Boolean =
+      import reflect._
+      sym.flags.is(Flags.Module) && sym.companionClass.exists
 
-    def isGiven: Boolean = sym.flags.is(Flags.Given)
+    def isGiven: Boolean =
+      import reflect._
+      sym.flags.is(Flags.Given)
 
-    def isExported: Boolean = sym.flags.is(Flags.Exported)
+    def isExported: Boolean =
+      import reflect._
+      sym.flags.is(Flags.Exported)
 
-    def isOverriden: Boolean = sym.flags.is(Flags.Override)
+    def isOverridden: Boolean =
+      import reflect._
+      sym.flags.is(Flags.Override)
 
-    def isExtensionMethod: Boolean = sym.flags.is(Flags.ExtensionMethod)
+    def isExtensionMethod: Boolean =
+      import reflect._
+      sym.flags.is(Flags.ExtensionMethod)
 
-    def isArtifact: Boolean = sym.flags.is(Flags.Artifact)
+    def isArtifact: Boolean =
+      import reflect._
+      sym.flags.is(Flags.Artifact)
 
-    def isLeftAssoc(d: Symbol): Boolean = !d.name.endsWith(":")
+    def isLeftAssoc: Boolean = !sym.name.endsWith(":")
 
-    def extendedSymbol: Option[ValDef] =
+    def extendedSymbol: Option[reflect.ValDef] =
+      import reflect.*
       Option.when(sym.isExtensionMethod){
         val termParamss = sym.tree.asInstanceOf[DefDef].termParamss
-        if isLeftAssoc(sym) || termParamss.size == 1 then termParamss(0).params(0)
+        if sym.isLeftAssoc || termParamss.size == 1 then termParamss(0).params(0)
         else termParamss(1).params(0)
       }
 
+    def extendedTypeParams: List[reflect.TypeDef] =
+      import reflect.*
+      val method = sym.tree.asInstanceOf[DefDef]
+      method.leadingTypeParams
+
+    def extendedTermParamLists: List[reflect.TermParamClause] =
+      import reflect.*
+      if sym.nonExtensionLeadingTypeParams.nonEmpty then
+        sym.nonExtensionParamLists.takeWhile {
+          case _: TypeParamClause => false
+          case _ => true
+        }.collect {
+          case tpc: TermParamClause => tpc
+        }
+      else
+        List.empty
+
+    def nonExtensionTermParamLists: List[reflect.TermParamClause] =
+      import reflect.*
+      if sym.nonExtensionLeadingTypeParams.nonEmpty then
+        sym.nonExtensionParamLists.dropWhile {
+          case _: TypeParamClause => false
+          case _ => true
+        }.drop(1).collect {
+          case tpc: TermParamClause => tpc
+        }
+      else
+        sym.nonExtensionParamLists.collect {
+          case tpc: TermParamClause => tpc
+        }
+
+    def nonExtensionParamLists: List[reflect.ParamClause] =
+      import reflect.*
+      val method = sym.tree.asInstanceOf[DefDef]
+      if sym.isExtensionMethod then
+        val params = method.paramss
+        val toDrop = if method.leadingTypeParams.nonEmpty then 2 else 1
+        if sym.isLeftAssoc || params.size == 1 then params.drop(toDrop)
+        else params.head :: params.tail.drop(toDrop)
+      else method.paramss
+
+    def nonExtensionLeadingTypeParams: List[reflect.TypeDef] =
+      import reflect.*
+      sym.nonExtensionParamLists.collectFirst {
+        case TypeParamClause(params) => params
+      }.toList.flatten
+
+  end extension
+
+end SymOps
+
+// TODO find a better way to handle this cache and move the methods to SymOps
+class SymOpsWithLinkCache:
+  import SymOps.*
+
+  private val externalLinkCache: scala.collection.mutable.Map[AbstractFile, Option[ExternalDocLink]] = MMap()
+
+  extension (using Quotes)(sym: reflect.Symbol)
+
     private def constructPath(location: Seq[String], anchor: Option[String], link: ExternalDocLink): String =
+      import reflect.*
       val extension = ".html"
       val docURL = link.documentationUrl.toString
       def constructPathForJavadoc: String =
@@ -154,8 +246,8 @@ class SymOps[Q <: Quotes](val q: Q) extends JavadocAnchorCreator with Scaladoc2A
 
     // TODO #22 make sure that DRIs are unique plus probably reuse semantic db code?
     def dri(using dctx: DocContext): DRI =
+      import reflect.*
       if sym == Symbol.noSymbol then topLevelDri
-      else if sym.isValDef && sym.moduleClass.exists then sym.moduleClass.dri
       else
         val method =
           if (sym.isDefDef) Some(sym)
@@ -167,21 +259,24 @@ class SymOps[Q <: Quotes](val q: Q) extends JavadocAnchorCreator with Scaladoc2A
         else
           (sym.className, sym.anchor)
 
-        val location = sym.packageNameSplitted ++ className
+        val location = (sym.packageNameSplitted ++ className).map(escapeFilename(_))
 
         val externalLink = {
-            import q.reflect._
+            import reflect._
             import dotty.tools.dotc
-            given ctx: dotc.core.Contexts.Context = q.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+            given ctx: dotc.core.Contexts.Context = quotes.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
             val csym = sym.asInstanceOf[dotc.core.Symbols.Symbol]
-            val extLink = if externalLinkCache.contains(csym.associatedFile) then externalLinkCache(csym.associatedFile)
-            else {
-              val calculatedLink = Option(csym.associatedFile).map(_.path).flatMap( path =>
-               dctx.externalDocumentationLinks.find(_.originRegexes.exists(r => r.matches(path))))
-              externalLinkCache += (csym.associatedFile -> calculatedLink)
-              calculatedLink
-            }
-            extLink.map(link => constructPath(location, anchor, link))
+            val extLink = if externalLinkCache.contains(csym.associatedFile)
+              then externalLinkCache(csym.associatedFile)
+              else {
+                def calculatePath(file: AbstractFile): String = file.underlyingSource.filter(_ != file).fold("")(f => calculatePath(f) + "/") + file.path
+                val calculatedLink = Option(csym.associatedFile).map(f => calculatePath(f)).flatMap { path =>
+                  dctx.externalDocumentationLinks.find(_.originRegexes.exists(r => r.matches(path)))
+                }
+                externalLinkCache += (csym.associatedFile -> calculatedLink)
+                calculatedLink
+              }
+            extLink.map(link => sym.constructPath(location, anchor, link))
         }
 
         DRI(
@@ -193,7 +288,7 @@ class SymOps[Q <: Quotes](val q: Q) extends JavadocAnchorCreator with Scaladoc2A
           s"${sym.name}${sym.fullName}/${sym.signature.resultSig}/[${sym.signature.paramSigs.mkString("/")}]"
         )
 
-    def driInContextOfInheritingParent(par: Symbol)(using dctx: DocContext): DRI = sym.dri.copy(
+    def driInContextOfInheritingParent(par: reflect.Symbol)(using dctx: DocContext): DRI = sym.dri.copy(
       location = par.dri.location,
       externalLink = None
     )
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/SyntheticSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/SyntheticSupport.scala
index 28440b066fa7..735d9c74d733 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/SyntheticSupport.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/SyntheticSupport.scala
@@ -3,48 +3,46 @@ package tasty
 
 import scala.quoted._
 
-trait SyntheticsSupport:
-  self: TastyParser =>
+object SyntheticsSupport:
 
-  import qctx.reflect._
+  extension (using Quotes)(t: reflect.TypeRepr)
 
-  extension (t: TypeRepr)
-    def isTupleType: Boolean = hackIsTupleType(using qctx)(t)
+    def isCompiletimeAppliedType: Boolean = t.hackIsCompiletimeAppliedType(t)
 
-    def isCompiletimeAppliedType: Boolean = hackIsCompiletimeAppliedType(using qctx)(t)
-
-    def hackIsTupleType(using Quotes)(rtpe: qctx.reflect.TypeRepr): Boolean =
-      import dotty.tools.dotc
-      given ctx: dotc.core.Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
-      val tpe = rtpe.asInstanceOf[dotc.core.Types.Type]
-      ctx.definitions.isTupleType(tpe)
-
-    def hackIsCompiletimeAppliedType(using Quotes)(rtpe: qctx.reflect.TypeRepr): Boolean =
+    private def hackIsCompiletimeAppliedType(rtpe: reflect.TypeRepr): Boolean =
       import dotty.tools.dotc
-      given ctx: dotc.core.Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+      given ctx: dotc.core.Contexts.Context = quotes.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
       val tpe = rtpe.asInstanceOf[dotc.core.Types.Type]
       ctx.definitions.isCompiletimeAppliedType(tpe.typeSymbol)
+  end extension
 
-  extension (s: Symbol)
-    def isSyntheticFunc: Boolean = s.flags.is(Flags.Synthetic) || s.flags.is(Flags.FieldAccessor) || isDefaultHelperMethod
+  extension (using Quotes)(s: reflect.Symbol)
+    def isSyntheticFunc: Boolean =
+      import reflect._
+      s.flags.is(Flags.Synthetic) || s.flags.is(Flags.FieldAccessor) || s.isDefaultHelperMethod
 
     def isSuperBridgeMethod: Boolean = s.name.contains("$super$")
 
     def isDefaultHelperMethod: Boolean = ".*\\$default\\$\\d+$".r.matches(s.name)
 
-    def isOpaque: Boolean = s.flags.is(Flags.Opaque)
+    def isOpaque: Boolean =
+      import reflect._
+      s.flags.is(Flags.Opaque)
+
+    def isInfix: Boolean = hackIsInfix(s)
 
-    def isInfix: Boolean = hackIsInfix(using qctx)(s)
+    def getmembers: List[reflect.Symbol] = hackGetmembers(s)
 
-    def getmembers: List[Symbol] = hackGetmembers(using qctx)(s)
+  end extension
 
-  def isValidPos(pos: Position) =
-    if hackExists(using qctx)(pos) then pos.start != pos.end else false
+  def isValidPos(using Quotes)(pos: reflect.Position) =
+    if hackExists(pos) then pos.start != pos.end else false
 
-  def isSyntheticField(c: Symbol) =
+  def isSyntheticField(using Quotes)(c: reflect.Symbol) =
+    import reflect._
     c.flags.is(Flags.CaseAccessor) || (c.flags.is(Flags.Module) && !c.flags.is(Flags.Given))
 
-  def constructorWithoutParamLists(c: ClassDef): Boolean =
+  def constructorWithoutParamLists(using Quotes)(c: reflect.ClassDef): Boolean =
     !isValidPos(c.constructor.pos)  || {
       val end = c.constructor.pos.end
       val typesEnd =  c.constructor.leadingTypeParams.lastOption.fold(end - 1)(_.pos.end)
@@ -53,10 +51,10 @@ trait SyntheticsSupport:
     }
 
   // TODO: #49 Remove it after TASTY-Reflect release with published flag Extension
-  def hackIsInfix(using Quotes)(rsym: qctx.reflect.Symbol): Boolean = {
-    import qctx.reflect._
+  private def hackIsInfix(using Quotes)(rsym: reflect.Symbol): Boolean = {
+    import reflect._
     import dotty.tools.dotc
-    given ctx: dotc.core.Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+    given ctx: dotc.core.Contexts.Context = quotes.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
     val sym = rsym.asInstanceOf[dotc.core.Symbols.Symbol]
     ctx.definitions.isInfix(sym)
   }
@@ -64,12 +62,12 @@ trait SyntheticsSupport:
   They are valdefs that describe case companion objects and cases from enum.
   TASTY crashed when calling _.tree on them.
   */
-  def hackGetmembers(using Quotes)(rsym: qctx.reflect.Symbol): List[qctx.reflect.Symbol] = {
-    import qctx.reflect._
+  private def hackGetmembers(using Quotes)(rsym: reflect.Symbol): List[reflect.Symbol] = {
+    import reflect._
     import dotty.tools.dotc
-    given ctx: dotc.core.Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+    given ctx: dotc.core.Contexts.Context = quotes.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
     val sym = rsym.asInstanceOf[dotc.core.Symbols.Symbol]
-    sym.typeRef.appliedTo(sym.typeParams.map(_.typeRef)).allMembers.iterator.map(_.symbol)
+    sym.namedType.allMembers.iterator.map(_.symbol)
       .collect {
          case sym if
           (!sym.is(dotc.core.Flags.ModuleVal) || sym.is(dotc.core.Flags.Given)) &&
@@ -78,10 +76,10 @@ trait SyntheticsSupport:
       }.toList
   }
 
-  def hackGetSupertypes(using Quotes)(rdef: qctx.reflect.ClassDef) = {
-    import qctx.reflect._
+  private def hackGetSupertypes(using Quotes)(rdef: reflect.ClassDef) = {
+    import reflect._
     import dotty.tools.dotc
-    given dotc.core.Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+    given dotc.core.Contexts.Context = quotes.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
     val classdef = rdef.asInstanceOf[dotc.ast.tpd.TypeDef]
     val ref = classdef.symbol.info.asInstanceOf[dotc.core.Types.ClassInfo].appliedRef
     val baseTypes: List[(dotc.core.Symbols.Symbol, dotc.core.Types.Type)] =
@@ -89,29 +87,28 @@ trait SyntheticsSupport:
     baseTypes.asInstanceOf[List[(Symbol, TypeRepr)]]
   }
 
-  def hackExists(using Quotes)(rpos: qctx.reflect.Position) = {
-    import qctx.reflect._
+  private def hackExists(using Quotes)(rpos: reflect.Position) = {
+    import reflect._
     import dotty.tools.dotc
     import dotty.tools.dotc.util.Spans._
-    given dotc.core.Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+    given dotc.core.Contexts.Context = quotes.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
     val pos = rpos.asInstanceOf[dotc.util.SourcePosition]
     pos.exists
   }
 
-  def getSupertypes(using Quotes)(c: ClassDef) = hackGetSupertypes(c).tail
+  def getSupertypes(using Quotes)(c: reflect.ClassDef) = hackGetSupertypes(c).tail
 
-  def typeForClass(c: ClassDef): TypeRepr =
-    import qctx.reflect._
+  def typeForClass(using Quotes)(c: reflect.ClassDef): reflect.TypeRepr =
+    import reflect._
     import dotty.tools.dotc
-    given dotc.core.Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+    given dotc.core.Contexts.Context = quotes.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
     val cSym = c.symbol.asInstanceOf[dotc.core.Symbols.Symbol]
     cSym.typeRef.appliedTo(cSym.typeParams.map(_.typeRef)).asInstanceOf[TypeRepr]
 
-  def memberInfo(c: ClassDef, symbol: Symbol): TypeRepr =
-    import qctx.reflect._
+  def memberInfo(using Quotes)(c: reflect.ClassDef, symbol: reflect.Symbol): reflect.TypeRepr =
+    import reflect._
     import dotty.tools.dotc
-    given dotc.core.Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+    given dotc.core.Contexts.Context = quotes.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
     typeForClass(c).asInstanceOf[dotc.core.Types.Type]
       .memberInfo(symbol.asInstanceOf[dotc.core.Symbols.Symbol])
       .asInstanceOf[TypeRepr]
-
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TastyParser.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TastyParser.scala
index 0e5871138926..6d7dade3d8c7 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/TastyParser.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TastyParser.scala
@@ -6,7 +6,7 @@ import java.util.regex.Pattern
 
 import scala.util.{Try, Success, Failure}
 import scala.tasty.inspector.DocTastyInspector
-import scala.quoted.Quotes
+import scala.quoted._
 
 import dotty.tools.dotc
 
@@ -17,6 +17,9 @@ import dotty.tools.scaladoc.tasty.comments.Comment
 import java.nio.file.Paths
 import java.nio.file.Files
 
+import SymOps._
+import ScaladocSupport._
+
 /** Responsible for collectively inspecting all the Tasty files we're interested in.
   *
   * Delegates most of the work to [[TastyParser]] [[dotty.tools.scaladoc.tasty.TastyParser]].
@@ -26,22 +29,22 @@ case class ScaladocTastyInspector()(using ctx: DocContext) extends DocTastyInspe
   private val topLevels = Seq.newBuilder[(String, Member)]
   private var rootDoc: Option[Comment] = None
 
-  def processCompilationUnit(using quotes: Quotes)(root: quotes.reflect.Tree): Unit = ()
+  def processCompilationUnit(using Quotes)(root: reflect.Tree): Unit = ()
 
-  override def postProcess(using q: Quotes): Unit =
+  override def postProcess(using Quotes): Unit =
     // hack into the compiler to get a list of all top-level trees
     // in principle, to do this, one would collect trees in processCompilationUnit
     // however, path-dependent types disallow doing so w/o using casts
-    inline def hackForeachTree(thunk: q.reflect.Tree => Unit): Unit =
-      given dctx: dotc.core.Contexts.Context = q.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+    inline def hackForeachTree(thunk: reflect.Tree => Unit): Unit =
+      given dctx: dotc.core.Contexts.Context = quotes.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
       dctx.run.units.foreach { compilationUnit =>
         // mirrors code from TastyInspector
-        thunk(compilationUnit.tpdTree.asInstanceOf[q.reflect.Tree])
+        thunk(compilationUnit.tpdTree.asInstanceOf[reflect.Tree])
       }
 
-    val symbolsToSkip: Set[q.reflect.Symbol] =
+    val symbolsToSkip: Set[reflect.Symbol] =
       ctx.args.identifiersToSkip.flatMap { ref =>
-        val qrSymbol = q.reflect.Symbol
+        val qrSymbol = reflect.Symbol
         Try(qrSymbol.requiredPackage(ref)).orElse(Try(qrSymbol.requiredClass(ref))) match {
           case Success(sym) => Some(sym)
           case Failure(err) =>
@@ -65,20 +68,20 @@ case class ScaladocTastyInspector()(using ctx: DocContext) extends DocTastyInspe
             None
       }
 
-    def isSkipped(sym: q.reflect.Symbol): Boolean =
-      def isSkippedById(sym: q.reflect.Symbol): Boolean =
+    def isSkipped(sym: reflect.Symbol): Boolean =
+      def isSkippedById(sym: reflect.Symbol): Boolean =
         if !sym.exists then false else
           symbolsToSkip.contains(sym) || isSkipped(sym.owner)
 
-      def isSkippedByRx(sym: q.reflect.Symbol): Boolean =
+      def isSkippedByRx(sym: reflect.Symbol): Boolean =
         val symStr = sym.fullName
         patternsToSkip.exists(p => p.matcher(symStr).matches())
 
       isSkippedById(sym) || isSkippedByRx(sym)
 
-    val parser = new TastyParser(q, this)(isSkipped)
+    val parser = new TastyParser(quotes, this)(isSkipped)
     def driFor(link: String): Option[DRI] =
-      val symOps = new SymOps[q.type](q)
+      val symOps = new SymOpsWithLinkCache
       import symOps._
       Try(QueryParser(link).readQuery()).toOption.flatMap(query =>
         MemberLookup.lookupOpt(query, None).map {
@@ -110,7 +113,7 @@ case class ScaladocTastyInspector()(using ctx: DocContext) extends DocTastyInspe
           import parser.qctx.reflect._
           def root(s: Symbol): Symbol = if s.owner.isNoSymbol then s else root(s.owner)
           val topLevelPck = root(tree.symbol)
-          rootDoc = Some(parser.parseCommentString(content, topLevelPck, None))
+          rootDoc = Some(parseCommentString(using parser.qctx, summon[DocContext])(content, topLevelPck, None))
         }
 
     hackForeachTree { root =>
@@ -140,6 +143,9 @@ case class ScaladocTastyInspector()(using ctx: DocContext) extends DocTastyInspe
         }
       }
       topLevels ++= intrinsicClassDefs
+      val scalaPckg = defn.ScalaPackageVal.asInstanceOf[parser.qctx.reflect.Symbol]
+      given parser.qctx.type = parser.qctx
+      topLevels += "scala" -> Member(scalaPckg.fullName, scalaPckg.dri, Kind.Package)
       topLevels += mergeAnyRefAliasAndObject(parser)
 
   def result(): (List[Member], Option[Comment]) =
@@ -154,7 +160,8 @@ case class ScaladocTastyInspector()(using ctx: DocContext) extends DocTastyInspe
     all.groupBy(_._1).map { case (pckName, members) =>
       val (pcks, rest) = members.map(_._2).partition(_.kind == Kind.Package)
       val basePck = pcks.reduce( (p1, p2) =>
-        p1.withNewMembers(p2.members) // TODO add doc
+        val withNewMembers = p1.withNewMembers(p2.members)
+        if withNewMembers.docs.isEmpty then withNewMembers.withDocs(p2.docs) else withNewMembers
       )
       basePck.withMembers((basePck.members ++ rest).sortBy(_.name))
     }.toList -> rootDoc
@@ -175,9 +182,11 @@ case class TastyParser(
   isSkipped: qctx.reflect.Symbol => Boolean
 )(
   using val ctx: DocContext
-) extends ScaladocSupport with BasicSupport with TypesSupport with ClassLikeSupport with SyntheticsSupport with PackageSupport with NameNormalizer:
+) extends BasicSupport with TypesSupport with ClassLikeSupport with PackageSupport with InkuireSupport:
   import qctx.reflect._
 
+  private given qctx.type = qctx
+
   def processTree[T](tree: Tree)(op: => T): Option[T] = try Option(op) catch
     case e: Exception  =>
       report.warning(throwableToString(e), tree.pos)
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
index af5509768aaa..772f3a9dd02d 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
@@ -3,14 +3,20 @@ package tasty
 
 import collection.JavaConverters._
 
+import scala.quoted._
+
+import NameNormalizer._
+import SyntheticsSupport._
+
 trait TypesSupport:
   self: TastyParser =>
-  import qctx.reflect._
 
-  type DocSignaturePart = String | Link
-  type DocSignature = List[DocSignaturePart]
+  type SSignature = List[SignaturePart]
+
+  def getGivenInstance(method: qctx.reflect.DefDef): Option[SSignature] =
+    import qctx.reflect._
+    given qctx.type = qctx
 
-  def getGivenInstance(method: DefDef): Option[DocSignature] =
     def extractTypeSymbol(t: Tree): Option[Symbol] = t match
       case tpeTree: TypeTree =>
         inner(tpeTree.tpe)
@@ -20,14 +26,8 @@ trait TypesSupport:
       case ThisType(tpe) => inner(tpe)
       case AnnotatedType(tpe, _) => inner(tpe)
       case AppliedType(tpe, _) => inner(tpe)
-      case tp @ TermRef(qual, typeName) =>
-        qual match
-        case _: TypeRepr | _: NoPrefix => Some(tp.termSymbol)
-        case other => None
-      case tp @ TypeRef(qual, typeName) =>
-        qual match
-        case _: TypeRepr | _: NoPrefix => Some(tp.typeSymbol)
-        case other => None
+      case tp @ TermRef(qual, typeName) => Some(tp.termSymbol)
+      case tp @ TypeRef(qual, typeName) => Some(tp.typeSymbol)
 
     val typeSymbol = extractTypeSymbol(method.returnTpt)
 
@@ -37,38 +37,49 @@ trait TypesSupport:
     }.flatten.map(_.asSignature)
 
   given TreeSyntax: AnyRef with
-    extension (tpeTree: Tree)
-      def asSignature: DocSignature =
+    extension (using Quotes)(tpeTree: reflect.Tree)
+      def asSignature: SSignature =
+        import reflect._
         tpeTree match
           case TypeBoundsTree(low, high) => typeBoundsTreeOfHigherKindedType(low.tpe, high.tpe)
           case tpeTree: TypeTree => inner(tpeTree.tpe)
           case term:  Term => inner(term.tpe)
 
   given TypeSyntax: AnyRef with
-    extension (tpe: TypeRepr)
-      def asSignature: DocSignature = inner(tpe)
+    extension (using Quotes)(tpe: reflect.TypeRepr)
+      def asSignature: SSignature = inner(tpe)
+
 
+  private def plain(str: String): SignaturePart = Plain(str)
 
-  private def text(str: String): DocSignaturePart = str
+  private def keyword(str: String): SignaturePart = Keyword(str)
 
-  private def texts(str: String): DocSignature = List(text(str))
+  private def tpe(str: String, dri: DRI): SignaturePart = dotty.tools.scaladoc.Type(str, Some(dri))
 
-  private def link(symbol: Symbol): DocSignature =
-    val suffix = if symbol.isValDef then texts(".type") else Nil
-    Link(symbol.normalizedName, symbol.dri) :: suffix
+  private def tpe(str: String): SignaturePart = dotty.tools.scaladoc.Type(str, None)
 
-  private def commas(lists: List[DocSignature]) = lists match
+  extension (on: SignaturePart) def l: List[SignaturePart] = List(on)
+
+  private def tpe(using Quotes)(symbol: reflect.Symbol): SSignature =
+    import SymOps._
+    val suffix = if symbol.isValDef || symbol.flags.is(reflect.Flags.Module) then plain(".type").l else Nil
+    val dri: Option[DRI] = Option(symbol).filterNot(_.isHiddenByVisibility).map(_.dri)
+    dotty.tools.scaladoc.Type(symbol.normalizedName, dri) :: suffix
+
+  private def commas(lists: List[SSignature]) = lists match
     case List(single) => single
-    case other => other.reduce((r, e) => r ++ texts(", ") ++ e)
+    case other => other.reduce((r, e) => r ++ plain(", ").l ++ e)
 
-  private def isRepeatedAnnotation(term: Term) =
+  private def isRepeatedAnnotation(using Quotes)(term: reflect.Term) =
+    import reflect._
     term.tpe match
       case t: TypeRef => t.name == "Repeated" && t.qualifier.match
         case ThisType(tref: TypeRef) if tref.name == "internal" => true
         case _ => false
       case _ => false
 
-  private def isRepeated(typeRepr: TypeRepr) =
+  private def isRepeated(using Quotes)(typeRepr: reflect.TypeRepr) =
+    import reflect._
     typeRepr match
       case t: TypeRef => t.name == "<repeated>" && t.qualifier.match
         case ThisType(tref: TypeRef) if tref.name == "scala" => true
@@ -76,125 +87,139 @@ trait TypesSupport:
       case _ => false
 
   // TODO #23 add support for all types signatures that makes sense
-  private def inner(tp: TypeRepr): DocSignature =
-    def noSupported(name: String): DocSignature =
+  private def inner(using Quotes)(tp: reflect.TypeRepr)(using indent: Int = 0): SSignature =
+    import reflect._
+    def noSupported(name: String): SSignature =
       println(s"WARN: Unsupported type: $name: ${tp.show}")
-      List(text(s"Unsupported[$name]"))
-
+      plain(s"Unsupported[$name]").l
     tp match
-      case OrType(left, right) => inner(left) ++ texts(" | ") ++ inner(right)
-      case AndType(left, right) => inner(left) ++ texts(" & ") ++ inner(right)
-      case ByNameType(tpe) => text("=> ") :: inner(tpe)
+      case OrType(left, right) => inner(left) ++ keyword(" | ").l ++ inner(right)
+      case AndType(left, right) => inner(left) ++ keyword(" & ").l ++ inner(right)
+      case ByNameType(tpe) => keyword("=> ") :: inner(tpe)
       case ConstantType(constant) =>
-        texts(constant.show)
+        plain(constant.show).l
       case ThisType(tpe) => inner(tpe)
       case AnnotatedType(AppliedType(_, Seq(tpe)), annotation) if isRepeatedAnnotation(annotation) =>
-        inner(tpe) :+ text("*")
+        inner(tpe) :+ plain("*")
       case AppliedType(repeatedClass, Seq(tpe)) if isRepeated(repeatedClass) =>
-        inner(tpe) :+ text("*")
+        inner(tpe) :+ plain("*")
       case AnnotatedType(tpe, _) =>
         inner(tpe)
+      case tl @ TypeLambda(params, paramBounds, AppliedType(tpe, args))
+        if paramBounds.map(inner).forall(_.isEmpty) && params.zip(args.map(inner).flatten.map(_.name)).forall(_ == _) =>
+        inner(tpe)
       case tl @ TypeLambda(params, paramBounds, resType) =>
-        texts("[") ++ commas(params.zip(paramBounds).map { (name, typ) =>
+        plain("[").l ++ commas(params.zip(paramBounds).map { (name, typ) =>
           val normalizedName = if name.matches("_\\$\\d*") then "_" else name
-          texts(normalizedName) ++ inner(typ)
-        }) ++ texts("]")
-        ++ texts(" =>> ")
+          tpe(normalizedName).l ++ inner(typ)
+        }) ++ plain("]").l
+        ++ keyword(" =>> ").l
         ++ inner(resType)
 
-
       case r: Refinement => { //(parent, name, info)
         def getRefinementInformation(t: TypeRepr): List[TypeRepr] = t match {
           case r: Refinement => getRefinementInformation(r.parent) :+ r
           case t => List(t)
         }
 
-        def getParamBounds(t: PolyType): DocSignature = commas(
+        def getParamBounds(t: PolyType): SSignature = commas(
           t.paramNames.zip(t.paramBounds.map(inner(_)))
-            .map(b => texts(b(0)) ++ b(1))
+            .map(b => tpe(b(0)).l ++ b(1))
         )
 
-        def getParamList(m: MethodType): DocSignature =
-          texts("(")
-          ++ m.paramNames.zip(m.paramTypes).map{ case (name, tp) => texts(s"$name: ") ++ inner(tp)}
-            .reduceLeftOption((acc: DocSignature, elem: DocSignature) => acc ++ texts(", ") ++ elem).getOrElse(List())
-          ++ texts(")")
+        def getParamList(m: MethodType): SSignature =
+          plain("(").l
+          ++ m.paramNames.zip(m.paramTypes).map{ case (name, tp) => plain(s"$name: ").l ++ inner(tp)}
+            .reduceLeftOption((acc: SSignature, elem: SSignature) => acc ++ plain(", ").l ++ elem).getOrElse(List())
+          ++ plain(")").l
 
-        def parseRefinedElem(name: String, info: TypeRepr, polyTyped: DocSignature = Nil): DocSignature = ( info match {
+        def parseRefinedElem(name: String, info: TypeRepr, polyTyped: SSignature = Nil): SSignature = ( info match {
           case m: MethodType => {
             val paramList = getParamList(m)
-            texts(s"def $name") ++ polyTyped ++ paramList ++ texts(": ") ++ inner(m.resType)
+            keyword("def ").l ++ plain(name).l ++ polyTyped ++ paramList ++ plain(": ").l ++ inner(m.resType)
           }
           case t: PolyType => {
             val paramBounds = getParamBounds(t)
             val parsedMethod = parseRefinedElem(name, t.resType)
             if (!paramBounds.isEmpty){
-              parseRefinedElem(name, t.resType, texts("[") ++ paramBounds ++ texts("]"))
+              parseRefinedElem(name, t.resType, plain("[").l ++ paramBounds ++ plain("]").l)
             } else parseRefinedElem(name, t.resType)
           }
-          case ByNameType(tp) => texts(s"def $name: ") ++ inner(tp)
-          case t: TypeBounds => texts(s"type $name") ++ inner(t)
-          case t: TypeRef => texts(s"val $name: ") ++ inner(t)
-          case t: TermRef => texts(s"val $name: ") ++ inner(t)
+          case ByNameType(tp) => keyword("def ").l ++ plain(s"$name: ").l ++ inner(tp)
+          case t: TypeBounds => keyword("type ").l ++ plain(name).l ++ inner(t)
+          case t: TypeRef => keyword("val ").l ++ plain(s"$name: ").l ++ inner(t)
+          case t: TermRef => keyword("val ").l ++ plain(s"$name: ").l ++ inner(t)
           case other => noSupported(s"Not supported type in refinement $info")
-        } ) ++ texts("; ")
+        } ) ++ plain("; ").l
 
-        def parsePolyFunction(info: TypeRepr): DocSignature = info match {
+        def parsePolyFunction(info: TypeRepr): SSignature = info match {
           case t: PolyType =>
             val paramBounds = getParamBounds(t)
             val method = t.resType.asInstanceOf[MethodType]
             val paramList = getParamList(method)
             val resType = inner(method.resType)
-            texts("[") ++ paramBounds ++ texts("] => ") ++ paramList ++ texts(" => ") ++ resType
+            plain("[").l ++ paramBounds ++ plain("]").l ++ keyword(" => ").l ++ paramList ++ keyword(" => ").l ++ resType
           case other => noSupported(s"Not supported type in refinement $info")
         }
+
+        def parseDependentFunctionType(info: TypeRepr): SSignature = info match {
+          case m: MethodType =>
+            val paramList = getParamList(m)
+            paramList ++ keyword(" => ").l ++ inner(m.resType)
+          case other => noSupported("Dependent function type without MethodType refinement")
+        }
+
         val refinementInfo = getRefinementInformation(r)
         val refinedType = refinementInfo.head
         val refinedElems = refinementInfo.tail.collect{ case r: Refinement => r }.toList
-        val prefix = if refinedType.typeSymbol != defn.ObjectClass then inner(refinedType) ++ texts(" ") else Nil
+        val prefix = if refinedType.typeSymbol != defn.ObjectClass then inner(refinedType) ++ plain(" ").l else Nil
         if (refinedType.typeSymbol.fullName == "scala.PolyFunction" && refinedElems.size == 1) {
           parsePolyFunction(refinedElems.head.info)
-        } else {
-          prefix ++ texts("{ ") ++ refinedElems.flatMap(e => parseRefinedElem(e.name, e.info)) ++ texts(" }")
+        }
+        else if (r.isDependentFunctionType) {
+          parseDependentFunctionType(r.info)
+        }
+        else {
+          prefix ++ plain("{ ").l ++ refinedElems.flatMap(e => parseRefinedElem(e.name, e.info)) ++ plain(" }").l
         }
       }
       case t @ AppliedType(tpe, typeList) =>
         import dotty.tools.dotc.util.Chars._
         if !t.typeSymbol.name.forall(isIdentifierPart) && typeList.size == 2 then
           inner(typeList.head)
-          ++ texts(" ")
+          ++ plain(" ").l
           ++ inner(tpe)
-          ++ texts(" ")
+          ++ plain(" ").l
           ++ inner(typeList.last)
         else if t.isFunctionType then
+          val arrow = if t.isContextFunctionType then " ?=> " else " => "
           typeList match
             case Nil =>
               Nil
             case Seq(rtpe) =>
-              text("() => ") :: inner(rtpe)
+              plain("()").l ++ keyword(arrow).l ++ inner(rtpe)
             case Seq(arg, rtpe) =>
               val partOfSignature = arg match
-                case byName: ByNameType => texts("(") ++ inner(byName) ++ texts(")")
+                case byName: ByNameType => plain("(").l ++ inner(byName) ++ plain(")").l
                 case _ => inner(arg)
-              partOfSignature ++ texts(" => ") ++ inner(rtpe)
+              partOfSignature ++ keyword(arrow).l ++ inner(rtpe)
             case args =>
-              texts("(") ++ commas(args.init.map(inner)) ++ texts(") => ") ++ inner(args.last)
-        else if t.isTupleType then
+              plain("(").l ++ commas(args.init.map(inner)) ++ plain(")").l ++ keyword(arrow).l ++ inner(args.last)
+        else if t.isTupleN then
           typeList match
             case Nil =>
               Nil
             case args =>
-              texts("(") ++ commas(args.map(inner)) ++ texts(")")
-        else inner(tpe) ++ texts("[") ++ commas(typeList.map { t => t match
-          case _: TypeBounds => texts("_") ++ inner(t)
+              plain("(").l ++ commas(args.map(inner)) ++ plain(")").l
+        else inner(tpe) ++ plain("[").l ++ commas(typeList.map { t => t match
+          case _: TypeBounds => keyword("_").l ++ inner(t)
           case _ => inner(t)
-        }) ++ texts("]")
+        }) ++ plain("]").l
 
       case tp @ TypeRef(qual, typeName) =>
         qual match {
-          case r: RecursiveThis => texts(s"this.$typeName")
-          case _: TypeRepr | _: NoPrefix => link(tp.typeSymbol)
-          case other => noSupported(s"TypeRepr: $tp")
+          case r: RecursiveThis => tpe(s"this.$typeName").l
+          case _: TypeRepr => tpe(tp.typeSymbol)
         }
         // convertTypeOrBoundsToReference(reflect)(qual) match {
         //     case TypeReference(label, link, xs, _) => TypeReference(typeName, link + "/" + label, xs, true)
@@ -226,7 +251,7 @@ trait TypesSupport:
       case tr @ TermRef(qual, typeName) =>
         tr.termSymbol.tree match
           case vd: ValDef => inner(vd.tpt.tpe)
-          case _          => link(tr.termSymbol)
+          case _          => tpe(tr.termSymbol)
 
 
         // convertTypeOrBoundsToReference(reflect)(qual) match {
@@ -241,46 +266,65 @@ trait TypesSupport:
       // }
       // case _ => throw Exception("No match for type in conversion to Reference. This should not happen, please open an issue. " + tp)
       case TypeBounds(low, hi) =>
-        if(low == hi) texts(" = ") ++ inner(low)
+        if(low == hi) keyword(" = ").l ++ inner(low)
         else typeBoundsTreeOfHigherKindedType(low, hi)
 
       case NoPrefix() => Nil
 
       case MatchType(bond, sc, cases) =>
+        val caseSpaces = " " * (indent + 2)
+        val spaces = " " * (indent)
         val casesTexts = cases.flatMap {
           case MatchCase(from, to) =>
-            texts("  case ") ++ inner(from) ++ texts(" => ") ++ inner(to) ++ texts("\n")
+            keyword(caseSpaces + "case ").l ++ inner(from) ++ keyword(" => ").l ++ inner(to)(using indent = indent + 2) ++ plain("\n").l
           case TypeLambda(_, _, MatchCase(from, to)) =>
-            texts("  case ") ++ inner(from) ++ texts(" => ") ++ inner(to) ++ texts("\n")
+            keyword(caseSpaces + "case ").l ++ inner(from) ++ keyword(" => ").l ++ inner(to)(using indent = indent + 2) ++ plain("\n").l
         }
-        inner(sc) ++ texts(" match {\n") ++ casesTexts ++ texts("}")
+        inner(sc) ++ keyword(" match ").l ++ plain("{\n").l ++ casesTexts ++ plain(spaces + "}").l
 
-      case ParamRef(TypeLambda(names, _, _), i) => texts(names.apply(i))
+      case ParamRef(TypeLambda(names, _, _), i) => tpe(names.apply(i)).l
 
-      case ParamRef(m: MethodType, i) => texts(m.paramNames(i))
+      case ParamRef(m: MethodType, i) => tpe(m.paramNames(i)).l ++ plain(".type").l
 
       case RecursiveType(tp) => inner(tp)
 
-  private def typeBound(t: TypeRepr, low: Boolean) =
-    val ignore = if(low) t.typeSymbol == defn.NothingClass  else t.typeSymbol == defn.AnyClass
-    val prefix = text(if low then " >: " else " <: ")
+      case MatchCase(pattern, rhs) =>
+        keyword("case ").l ++ inner(pattern) ++ keyword(" => ").l ++ inner(rhs)
+
+      case t: dotty.tools.dotc.core.Types.LazyRef => try {
+        inner(t.ref(using ctx.compilerContext).asInstanceOf[TypeRepr])
+      } catch {
+        case e: AssertionError => tpe("LazyRef(...)").l
+      }
+
+      case tpe =>
+        val msg = s"Encountered unsupported type. Report this problem to https://github.com/lampepfl/dotty/.\n" +
+          s"${tpe.show(using Printer.TypeReprStructure)}"
+        throw MatchError(msg)
+
+  private def typeBound(using Quotes)(t: reflect.TypeRepr, low: Boolean) =
+    import reflect._
+    val ignore = if (low) t.typeSymbol == defn.NothingClass else t.typeSymbol == defn.AnyClass
+    val prefix = keyword(if low then " >: " else " <: ")
     t match {
-      case l: TypeLambda => prefix :: texts("(") ++ inner(l) ++ texts(")")
+      case l: TypeLambda => prefix :: plain("(").l ++ inner(l) ++ plain(")").l
       case p: ParamRef => prefix :: inner(p)
       case other if !ignore => prefix :: inner(other)
       case _ => Nil
     }
 
-  private def typeBoundsTreeOfHigherKindedType(low: TypeRepr, high: TypeRepr) =
+  private def typeBoundsTreeOfHigherKindedType(using Quotes)(low: reflect.TypeRepr, high: reflect.TypeRepr) =
+    import reflect._
     def regularTypeBounds(low: TypeRepr, high: TypeRepr) =
-      typeBound(low, low = true) ++ typeBound(high, low = false)
+      if low == high then keyword(" = ").l ++ inner(low)
+      else typeBound(low, low = true) ++ typeBound(high, low = false)
     high.match
       case TypeLambda(params, paramBounds, resType) =>
         if resType.typeSymbol == defn.AnyClass then
-          texts("[") ++ commas(params.zip(paramBounds).map { (name, typ) =>
+          plain("[").l ++ commas(params.zip(paramBounds).map { (name, typ) =>
             val normalizedName = if name.matches("_\\$\\d*") then "_" else name
-            texts(normalizedName) ++ inner(typ)
-          }) ++ texts("]")
+            tpe(normalizedName).l ++ inner(typ)
+          }) ++ plain("]").l
         else
           regularTypeBounds(low, high)
       case _ => regularTypeBounds(low, high)
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentExpander.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentExpander.scala
index 5f414133923d..bc727cbaaaef 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentExpander.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentExpander.scala
@@ -79,7 +79,7 @@ class CommentExpander {
       case None =>
         // SI-8210 - The warning would be false negative when this symbol is a setter
         if (ownComment.indexOf("@inheritdoc") != -1 && ! sym.isSetter)
-          println(s"${sym.span}: the comment for ${sym} contains @inheritdoc, but no parent comment is available to inherit from.")
+          report.warning(s"The comment for ${sym} contains @inheritdoc, but no parent comment is available to inherit from.", sym.srcPos)
         ownComment.replace("@inheritdoc", "<invalid inheritdoc annotation>")
       case Some(sc) =>
         if (ownComment == "") sc
@@ -159,7 +159,7 @@ class CommentExpander {
     * @param sym    The child symbol
     * @return       The child comment with the inheritdoc sections expanded
     */
-  def expandInheritdoc(parent: String, child: String, sym: Symbol): String =
+  def expandInheritdoc(parent: String, child: String, sym: Symbol)(using Context): String =
     if (child.indexOf("@inheritdoc") == -1)
       child
     else {
@@ -193,8 +193,8 @@ class CommentExpander {
               val sectionTextBounds = extractSectionText(parent, section)
               cleanupSectionText(parent.substring(sectionTextBounds._1, sectionTextBounds._2))
             case None =>
-              println(s"""${sym.span}: the """" + getSectionHeader + "\" annotation of the " + sym +
-                  " comment contains @inheritdoc, but the corresponding section in the parent is not defined.")
+              report.warning(s"""The """" + getSectionHeader + "\" annotation of the " + sym +
+                  " comment contains @inheritdoc, but the corresponding section in the parent is not defined.", sym.srcPos)
               "<invalid inheritdoc annotation>"
           }
 
@@ -259,8 +259,9 @@ class CommentExpander {
             case vname  =>
               lookupVariable(vname, site) match {
                 case Some(replacement) => replaceWith(replacement)
-                case None              => ;
-                  println(s"Variable $vname undefined in comment for $sym in $site")
+                case None              =>
+                  // TODO add a CLI setting for enabling this message
+                  // println(s"Variable $vname undefined in comment for $sym in $site")
               }
           }
         }
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentRegex.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentRegex.scala
index 6b1cd970453e..3ff022198446 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentRegex.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentRegex.scala
@@ -75,9 +75,9 @@ object Regexes {
 
   /** The start of a Scaladoc code block */
   val CodeBlockStartRegex =
-    new Regex("""(.*?)((?:\{\{\{)|(?:\u000E<pre(?: [^>]*)?>\u000E))(.*)""")
+    new Regex("""(.*?)((?:\{\{\{)|(?:```)|(?:\u000E<pre(?: [^>]*)?>\u000E))(.*)""")
 
   /** The end of a Scaladoc code block */
   val CodeBlockEndRegex =
-    new Regex("""(.*?)((?:\}\}\})|(?:\u000E</pre>\u000E))(.*)""")
+    new Regex("""(.*?)((?:\}\}\})|(?:```)|(?:\u000E</pre>\u000E))(.*)""")
 }
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala
index c60187c1b8b9..261de910d4f6 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala
@@ -4,16 +4,18 @@ package tasty.comments
 import scala.collection.immutable.SortedMap
 import scala.util.Try
 
-import com.vladsch.flexmark.util.{ast => mdu}
+import com.vladsch.flexmark.util.{ast => mdu, sequence}
 import com.vladsch.flexmark.{ast => mda}
 import com.vladsch.flexmark.formatter.Formatter
 import com.vladsch.flexmark.util.options.MutableDataSet
 
 import scala.quoted._
+import dotty.tools.scaladoc.tasty.comments.markdown.ExtendedFencedCodeBlock
 import dotty.tools.scaladoc.tasty.comments.wiki.Paragraph
 import dotty.tools.scaladoc.DocPart
-import dotty.tools.scaladoc.tasty.SymOps
+import dotty.tools.scaladoc.tasty.{ SymOpsWithLinkCache, SymOps }
 import collection.JavaConverters._
+import dotty.tools.scaladoc.snippets._
 
 class Repr(val qctx: Quotes)(val sym: qctx.reflect.Symbol)
 
@@ -65,32 +67,41 @@ case class PreparsedComment(
   hideImplicitConversions: List[String],
   shortDescription:        List[String],
   syntax:                  List[String],
+  strippedLinesBeforeNo:   Int,
 )
 
 case class DokkaCommentBody(summary: Option[DocPart], body: DocPart)
 
-abstract class MarkupConversion[T](val repr: Repr)(using DocContext) {
+abstract class MarkupConversion[T](val repr: Repr)(using dctx: DocContext) {
   protected def stringToMarkup(str: String): T
   protected def markupToDokka(t: T): DocPart
   protected def markupToString(t: T): String
   protected def markupToDokkaCommentBody(t: T): DokkaCommentBody
   protected def filterEmpty(xs: List[String]): List[T]
   protected def filterEmpty(xs: SortedMap[String, String]): SortedMap[String, T]
+  protected def processSnippets(t: T, preparsed: PreparsedComment): T
+
+  lazy val snippetChecker = dctx.snippetChecker
 
   val qctx: repr.qctx.type = if repr == null then null else repr.qctx // TODO why we do need null?
   val owner: qctx.reflect.Symbol =
     if repr == null then null.asInstanceOf[qctx.reflect.Symbol] else repr.sym
+  private given qctx.type = qctx
+
+  lazy val srcPos = if owner == qctx.reflect.defn.RootClass then {
+    val sourceFile = dctx.args.rootDocPath.map(p => dotty.tools.dotc.util.SourceFile(dotty.tools.io.AbstractFile.getFile(p), scala.io.Codec.UTF8))
+    sourceFile.fold(dotty.tools.dotc.util.NoSourcePosition)(sf => dotty.tools.dotc.util.SourcePosition(sf, dotty.tools.dotc.util.Spans.NoSpan))
+  } else owner.pos.get.asInstanceOf[dotty.tools.dotc.util.SrcPos]
 
-  object SymOps extends SymOps[qctx.type](qctx)
-  export SymOps.dri
-  export SymOps.driInContextOfInheritingParent
+  object SymOpsWithLinkCache extends SymOpsWithLinkCache
+  export SymOpsWithLinkCache._
+  import SymOps._
 
   def resolveLink(queryStr: String): DocLink =
     if SchemeUri.matches(queryStr) then DocLink.ToURL(queryStr)
     else QueryParser(queryStr).tryReadQuery() match
       case Left(err) =>
-        // TODO convert owner.pos to get to the comment, add stack trace
-        report.warning(s"Unable to parse query `$queryStr`: ${err.getMessage}")
+        report.warning(s"Unable to parse query `$queryStr`: ${err.getMessage}", srcPos)
         val msg = s"Unable to parse query: ${err.getMessage}"
         DocLink.UnresolvedDRI(queryStr, msg)
       case Right(query) =>
@@ -103,12 +114,11 @@ abstract class MarkupConversion[T](val repr: Repr)(using DocContext) {
           case None =>
             val txt = s"No DRI found for query"
             val msg = s"$txt: $queryStr"
-            // TODO change to the commented-out version when we'll get rid of the warnings in stdlib
-            // report.warning(
-            //   msg,
-            //   owner.pos.get.asInstanceOf[dotty.tools.dotc.util.SrcPos],
-            // )
-            report.inform(msg)
+
+            if (!summon[DocContext].args.noLinkWarnings) then
+
+              report.warning(msg, srcPos)
+
             DocLink.UnresolvedDRI(queryStr, txt)
 
   private val SchemeUri = """[a-z]+:.*""".r
@@ -120,8 +130,24 @@ abstract class MarkupConversion[T](val repr: Repr)(using DocContext) {
       case _ => None
     }
 
+  def snippetCheckingFunc: qctx.reflect.Symbol => SnippetChecker.SnippetCheckingFunc =
+    (s: qctx.reflect.Symbol) => {
+      val path = s.source.map(_.path)
+      val pathBasedArg = dctx.snippetCompilerArgs.get(path)
+      val scDataCollector = SnippetCompilerDataCollector[qctx.type](qctx)
+      val data = scDataCollector.getSnippetCompilerData(s, s)
+      val sourceFile = scDataCollector.getSourceFile(s)
+      (str: String, lineOffset: SnippetChecker.LineOffset, argOverride: Option[SCFlags]) => {
+          val arg = argOverride.fold(pathBasedArg)(pathBasedArg.overrideFlag(_))
+          val res = snippetChecker.checkSnippet(str, Some(data), arg, lineOffset, sourceFile)
+          res.filter(r => !r.isSuccessful).foreach(_.reportMessages()(using compilerContext))
+          res
+      }
+    }
+
   final def parse(preparsed: PreparsedComment): Comment =
-    val body = markupToDokkaCommentBody(stringToMarkup(preparsed.body))
+    val markup = stringToMarkup(preparsed.body)
+    val body = markupToDokkaCommentBody(processSnippets(markup, preparsed))
     Comment(
       body                    = body.body,
       short                   = body.summary,
@@ -146,7 +172,7 @@ abstract class MarkupConversion[T](val repr: Repr)(using DocContext) {
     )
 }
 
-class MarkdownCommentParser(repr: Repr)(using DocContext)
+class MarkdownCommentParser(repr: Repr)(using dctx: DocContext)
     extends MarkupConversion[mdu.Node](repr) {
 
   def stringToMarkup(str: String) =
@@ -172,6 +198,9 @@ class MarkdownCommentParser(repr: Repr)(using DocContext)
     xs.view.mapValues(_.trim)
       .filterNot { case (_, v) => v.isEmpty }
       .mapValues(stringToMarkup).to(SortedMap)
+
+  def processSnippets(root: mdu.Node, preparsed: PreparsedComment): mdu.Node =
+    FlexmarkSnippetProcessor.processSnippets(root, Some(preparsed), snippetCheckingFunc(owner), withContext = true)
 }
 
 class WikiCommentParser(repr: Repr)(using DocContext)
@@ -187,7 +216,7 @@ class WikiCommentParser(repr: Repr)(using DocContext)
   private def flatten(b: wiki.Inline): String = b match
     case wiki.Text(t) => t
     case wiki.Italic(t) => flatten(t)
-    case wiki.Bold(t) =>flatten(t)
+    case wiki.Bold(t) => flatten(t)
     case wiki.Underline(t) => flatten(t)
     case wiki.Superscript(t) => flatten(t)
     case wiki.Subscript(t) => flatten(t)
@@ -206,6 +235,7 @@ class WikiCommentParser(repr: Repr)(using DocContext)
     case wiki.OrderedList(elems, _) => elems.headOption.fold("")(flatten)
     case wiki.DefinitionList(items) => items.headOption.fold("")(e => flatten(e._1))
     case wiki.HorizontalRule => ""
+    case wiki.Table(header, columns, rows) => (header +: rows).flatMap(_.cells).flatMap(_.blocks).map(flatten).mkString
 
   def markupToString(str: wiki.Body) = str.blocks.headOption.fold("")(flatten)
 
@@ -225,3 +255,7 @@ class WikiCommentParser(repr: Repr)(using DocContext)
   def filterEmpty(xs: SortedMap[String,String]) =
     xs.view.mapValues(stringToMarkup).to(SortedMap)
       .filterNot { case (_, v) => v.blocks.isEmpty }
+
+  def processSnippets(root: wiki.Body, preparsed: PreparsedComment): wiki.Body =
+    // Currently not supported
+    root
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/MemberLookup.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/MemberLookup.scala
index 93aafa7cb80a..b2c4e1bdcac4 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/MemberLookup.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/MemberLookup.scala
@@ -1,28 +1,29 @@
 package dotty.tools.scaladoc
-package tasty.comments
+package tasty
+package comments
 
 import scala.quoted._
 
 trait MemberLookup {
 
   def memberLookupResult(using Quotes)(
-    symbol: quotes.reflect.Symbol,
+    symbol: reflect.Symbol,
     label: String,
-    inheritingParent: Option[quotes.reflect.Symbol] = None
-  ): (quotes.reflect.Symbol, String, Option[quotes.reflect.Symbol]) =
+    inheritingParent: Option[reflect.Symbol] = None
+  ): (reflect.Symbol, String, Option[reflect.Symbol]) =
     (symbol, label, inheritingParent)
 
   def lookup(using Quotes, DocContext)(
     query: Query,
-    owner: quotes.reflect.Symbol,
-  ): Option[(quotes.reflect.Symbol, String, Option[quotes.reflect.Symbol])] = lookupOpt(query, Some(owner))
+    owner: reflect.Symbol,
+  ): Option[(reflect.Symbol, String, Option[reflect.Symbol])] = lookupOpt(query, Some(owner))
 
   def lookupOpt(using Quotes, DocContext)(
     query: Query,
-    ownerOpt: Option[quotes.reflect.Symbol],
-  ): Option[(quotes.reflect.Symbol, String, Option[quotes.reflect.Symbol])] =
+    ownerOpt: Option[reflect.Symbol],
+  ): Option[(reflect.Symbol, String, Option[reflect.Symbol])] =
     try
-      import quotes.reflect._
+      import reflect._
 
       def nearestClass(sym: Symbol): Symbol =
         if sym.isClassDef then sym else nearestClass(sym.owner)
@@ -85,13 +86,13 @@ trait MemberLookup {
       res
     catch
       case e: Exception =>
-        // TODO (https://github.com/lampepfl/scala3doc/issues/238): proper reporting
-        val msg = s"Unable to find a link for ${query} ${ownerOpt.fold("")(o => "in " + o.name)}"
-        report.warn(msg, e)
+        if (!summon[DocContext].args.noLinkWarnings) then
+          val msg = s"Unable to find a link for ${query} ${ownerOpt.fold("")(o => "in " + o.name)}"
+          report.warn(msg, e)
         None
 
-  private def hackMembersOf(using Quotes)(rsym: quotes.reflect.Symbol) = {
-    import quotes.reflect._
+  private def hackMembersOf(using Quotes)(rsym: reflect.Symbol) = {
+    import reflect._
     import dotty.tools.dotc
     given dotc.core.Contexts.Context = quotes.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
     val sym = rsym.asInstanceOf[dotc.core.Symbols.Symbol]
@@ -103,19 +104,21 @@ trait MemberLookup {
     members.asInstanceOf[Iterator[Symbol]]
   }
 
-  private def hackIsNotAbsent(using Quotes)(rsym: quotes.reflect.Symbol) = {
+  private def hackIsNotAbsent(using Quotes)(rsym: reflect.Symbol) =
     import dotty.tools.dotc
     given dotc.core.Contexts.Context = quotes.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
     val sym = rsym.asInstanceOf[dotc.core.Symbols.Symbol]
     // note: Predef has .info = NoType for some reason
-    sym.isCompleted && sym.info.exists
-  }
+    val iorc = sym.infoOrCompleter
+    iorc match
+      case _: dotc.core.SymDenotations.ModuleCompleter | dotc.core.SymDenotations.NoCompleter | dotc.core.Types.NoType | _: dotc.core.NoLoader => false
+      case _ => true
 
   private def localLookup(using Quotes)(
     sel: MemberLookup.Selector,
-    owner: quotes.reflect.Symbol
-  ): Iterator[quotes.reflect.Symbol] = {
-    import quotes.reflect._
+    owner: reflect.Symbol
+  ): Iterator[reflect.Symbol] = {
+    import reflect._
 
     def findMatch(syms: Iterator[Symbol]): Iterator[Symbol] = {
       def matches(s: Symbol): Boolean =
@@ -148,10 +151,7 @@ trait MemberLookup {
     }
 
     if owner.isPackageDef then
-      findMatch(hackMembersOf(owner).flatMap {
-        s =>
-          (if s.name.endsWith("package$") then hackMembersOf(s) else Iterator.empty) ++ Iterator(s)
-      })
+      findMatch(hackMembersOf(owner))
     else
       owner.tree match {
         case tree: TypeDef =>
@@ -171,9 +171,9 @@ trait MemberLookup {
   }
 
   private def downwardLookup(using Quotes)(
-    query: List[String], owner: quotes.reflect.Symbol
-  ): Option[(quotes.reflect.Symbol, Option[quotes.reflect.Symbol])] = {
-    import quotes.reflect._
+    query: List[String], owner: reflect.Symbol
+  ): Option[(reflect.Symbol, Option[reflect.Symbol])] = {
+    import reflect._
     query match {
       case Nil => None
       case q :: Nil =>
@@ -191,9 +191,9 @@ trait MemberLookup {
         res match {
           case None => None
           case Some(sym) =>
-            val externalOwner: Option[quotes.reflect.Symbol] =
+            val externalOwner: Option[reflect.Symbol] =
               if owner eq sym.owner then None
-              else if owner.flags.is(Flags.Module) then Some(owner.moduleClass)
+              else if owner.flags.is(Flags.Module) && !owner.flags.is(Flags.Package) then Some(owner.moduleClass)
               else if owner.isClassDef then Some(owner)
               else None
             Some(sym -> externalOwner)
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Preparser.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Preparser.scala
index f62b9983584a..89c538d8d32d 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Preparser.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Preparser.scala
@@ -32,14 +32,16 @@ object Preparser {
       tags: Map[TagKey, List[String]],
       lastTagKey: Option[TagKey],
       remaining: List[String],
-      inCodeBlock: Boolean
-    ): PreparsedComment = remaining match {
+      inCodeBlock: Boolean,
+    )(using strippedLinesBeforeNo: Int = 0): PreparsedComment = remaining match {
       case CodeBlockStartRegex(before, marker, after) :: ls if !inCodeBlock =>
-        if (!before.trim.isEmpty && !after.trim.isEmpty)
+        if (!before.trim.isEmpty && !after.trim.isEmpty && marker == "```")
+          go(docBody, tags, lastTagKey, before :: (marker + after) :: ls, inCodeBlock = false)
+        else if (!before.trim.isEmpty && !after.trim.isEmpty)
           go(docBody, tags, lastTagKey, before :: marker :: after :: ls, inCodeBlock = false)
         else if (!before.trim.isEmpty)
           go(docBody, tags, lastTagKey, before :: marker :: ls, inCodeBlock = false)
-        else if (!after.trim.isEmpty)
+        else if (!after.trim.isEmpty && marker != "```")
           go(docBody, tags, lastTagKey, marker :: after :: ls, inCodeBlock = true)
         else lastTagKey match {
           case Some(key) =>
@@ -50,7 +52,7 @@ object Preparser {
               }
             go(docBody, tags + (key -> value), lastTagKey, ls, inCodeBlock = true)
           case None =>
-            go(docBody append endOfLine append marker, tags, lastTagKey, ls, inCodeBlock = true)
+            go(docBody append endOfLine append (marker + after), tags, lastTagKey, ls, inCodeBlock = true)
         }
 
       case CodeBlockEndRegex(before, marker, after) :: ls =>
@@ -106,7 +108,7 @@ object Preparser {
       case line :: ls =>
         if docBody.length > 0 then docBody.append(endOfLine)
         docBody.append(line)
-        go(docBody, tags, lastTagKey, ls, inCodeBlock)
+        go(docBody, tags, lastTagKey, ls, inCodeBlock)(using strippedLinesBeforeNo + (if line.isEmpty && docBody.length == 0 then 1 else 0))
 
 
       case Nil =>
@@ -138,7 +140,7 @@ object Preparser {
             bodyTags.keys.toSeq flatMap {
               case stk: SymbolTagKey if (stk.name == key.name) => Some(stk)
               case stk: SimpleTagKey if (stk.name == key.name) =>
-                // dottydoc.println(s"$span: tag '@${stk.name}' must be followed by a symbol name")
+                // scaladoc.println(s"$span: tag '@${stk.name}' must be followed by a symbol name")
                 None
               case _ => None
             }
@@ -146,7 +148,7 @@ object Preparser {
             for (key <- keys) yield {
               val bs = (bodyTags remove key).get
               // if (bs.length > 1)
-                // dottydoc.println(s"$span: only one '@${key.name}' tag for symbol ${key.symbol} is allowed")
+                // scaladoc.println(s"$span: only one '@${key.name}' tag for symbol ${key.symbol} is allowed")
               (key.symbol, bs.head)
             }
           SortedMap.empty[String, String] ++ pairs
@@ -175,6 +177,7 @@ object Preparser {
           hideImplicitConversions = allTags(SimpleTagKey("hideImplicitConversion")),
           shortDescription        = allTags(SimpleTagKey("shortDescription")),
           syntax                  = allTags(SimpleTagKey("syntax")),
+          strippedLinesBeforeNo   = strippedLinesBeforeNo
         )
 
         cmt
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/DocFlexmarkExtension.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/DocFlexmarkExtension.scala
index 9cd0e0653898..b849da014780 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/DocFlexmarkExtension.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/DocFlexmarkExtension.scala
@@ -10,13 +10,23 @@ import com.vladsch.flexmark.ext.wikilink.internal.WikiLinkLinkRefProcessor
 import com.vladsch.flexmark.util.ast._
 import com.vladsch.flexmark.util.options._
 import com.vladsch.flexmark.util.sequence.BasedSequence
+import com.vladsch.flexmark._
 
+import dotty.tools.scaladoc.snippets._
+import scala.collection.JavaConverters._
 
 class DocLinkNode(
   val target: DocLink,
   val body: String,
   seq: BasedSequence
-  ) extends WikiNode(seq, false, false, false, false)
+) extends WikiNode(seq, false, false, false, false)
+
+case class ExtendedFencedCodeBlock(
+  name: Option[String],
+  codeBlock: ast.FencedCodeBlock,
+  compilationResult: Option[SnippetCompilationResult],
+  hasContext: Boolean
+) extends BlankLine(codeBlock.getContentChars())
 
 class DocFlexmarkParser(resolveLink: String => DocLink) extends Parser.ParserExtension:
 
@@ -55,7 +65,9 @@ case class DocFlexmarkRenderer(renderLink: (DocLink, String) => String)
 
     object Render extends NodeRenderer:
       override def getNodeRenderingHandlers: JSet[NodeRenderingHandler[_]] =
-        JSet(new NodeRenderingHandler(classOf[DocLinkNode], Handler))
+        JSet(
+          new NodeRenderingHandler(classOf[DocLinkNode], Handler),
+        )
 
     object Factory extends NodeRendererFactory:
       override def create(options: DataHolder): NodeRenderer = Render
@@ -65,5 +77,10 @@ case class DocFlexmarkRenderer(renderLink: (DocLink, String) => String)
 
 object DocFlexmarkRenderer:
   def render(node: Node)(renderLink: (DocLink, String) => String) =
-    val opts = MarkdownParser.mkMarkdownOptions(Seq(DocFlexmarkRenderer(renderLink)))
+    val opts = MarkdownParser.mkMarkdownOptions(
+      Seq(
+        DocFlexmarkRenderer(renderLink),
+        SnippetRenderingExtension
+      )
+    )
     HtmlRenderer.builder(opts).build().render(node)
\ No newline at end of file
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala
new file mode 100644
index 000000000000..9c95ae06d9ee
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala
@@ -0,0 +1,148 @@
+package dotty.tools.scaladoc
+package tasty.comments.markdown
+
+import com.vladsch.flexmark.html._
+import util.HTML._
+
+import dotty.tools.scaladoc.snippets._
+import dotty.tools.scaladoc.util.HTML._
+
+case class SnippetLine(content: String, lineNo: Int, classes: Set[String] = Set.empty, messages: Seq[String] = Seq.empty, attributes: Map[String, String] = Map.empty):
+  def withClass(cls: String) = this.copy(classes = classes + cls)
+  def withAttribute(name: String, value: String) = this.copy(attributes = attributes.updated(name, value))
+  private def attributesToString: String = attributes.updated("id", lineNo).map((key, value) => s"""$key="$value"""").mkString(" ")
+  def toHTML =
+    val label = if messages.nonEmpty then s"""label="${messages.map(_.escapeReservedTokens).mkString("\n")}"""" else ""
+    s"""<span $attributesToString class="${classes.mkString(" ")}"><span class="tooltip-container" $label></span>$content</span>"""
+
+object SnippetRenderer:
+  val hiddenStartSymbol = "//{"
+  val hiddenEndSymbol = "//}"
+
+  val importedStartSymbol = "//{i"
+  val importedEndSymbol = "//i}"
+  val importedRegex = """\/\/\{i:(.*)""".r
+
+  private def compileMessageCSSClass(msg: SnippetCompilerMessage) = msg.level match
+    case MessageLevel.Info => "snippet-info"
+    case MessageLevel.Warning => "snippet-warn"
+    case MessageLevel.Error => "snippet-error"
+    case MessageLevel.Debug => "snippet-debug"
+
+  private def cutBetweenSymbols[A](
+    startSymbol: String,
+    endSymbol: String,
+    snippetLines: Seq[SnippetLine]
+  )(
+    f: (Seq[SnippetLine], Seq[SnippetLine], Seq[SnippetLine]) => A
+  ): Option[A] =
+    for {
+      startIdx <- snippetLines.zipWithIndex.find(_._1.content.contains(startSymbol)).map(_._2)
+      endIdx <- snippetLines.zipWithIndex.find(_._1.content.contains(endSymbol)).map(_._2)
+      (tmp, end) = snippetLines.splitAt(endIdx+1)
+      (begin, mid) = tmp.splitAt(startIdx)
+    } yield f(begin, mid, end)
+
+  private def wrapImportedSection(snippetLines: Seq[SnippetLine]): Seq[SnippetLine] =
+    val mRes = cutBetweenSymbols(importedStartSymbol, importedEndSymbol, snippetLines) {
+      case (begin, mid, end) =>
+        val name = importedRegex.findFirstMatchIn(mid.head.content).fold("")(_.group(1))
+        begin ++ mid.drop(1).dropRight(1).map(_.withClass("hideable").withClass("include").withAttribute("name", name)) ++ wrapImportedSection(end)
+    }
+    mRes.getOrElse(snippetLines)
+
+  private def wrapHiddenSymbols(snippetLines: Seq[SnippetLine]): Seq[SnippetLine] =
+    val mRes = cutBetweenSymbols(hiddenStartSymbol, hiddenEndSymbol, snippetLines) {
+      case (begin, mid, end) =>
+        begin ++ mid.drop(1).dropRight(1).map(_.withClass("hideable")) ++ wrapHiddenSymbols(end)
+    }
+    mRes.getOrElse(snippetLines)
+
+  private def wrapCommonIndent(snippetLines: Seq[SnippetLine]): Seq[SnippetLine] =
+    val nonHiddenSnippetLines = snippetLines.filter(l => !l.classes.contains("hideable"))
+    nonHiddenSnippetLines.headOption.map(_.content.takeWhile(_ == ' ')).map { prefix =>
+      val maxCommonIndent = nonHiddenSnippetLines.foldLeft(prefix) { (currPrefix, elem) =>
+        if elem.content.startsWith(currPrefix) then currPrefix else elem.content.takeWhile(_ == ' ')
+      }
+      snippetLines.map { line =>
+        if line.classes.contains("hideable") || maxCommonIndent.size == 0 then line
+        else line.copy(content = span(cls := "hideable")(maxCommonIndent).toString + line.content.stripPrefix(maxCommonIndent))
+      }
+    }.getOrElse(snippetLines)
+
+  private def wrapLineInBetween(startSymbol: Option[String], endSymbol: Option[String], line: SnippetLine): SnippetLine =
+    val startIdx = startSymbol.map(s => line.content.indexOf(s))
+    val endIdx = endSymbol.map(s => line.content.indexOf(s))
+    (startIdx, endIdx) match
+      case (Some(idx), None) =>
+        val (code, comment) = line.content.splitAt(idx)
+        comment match
+          case _ if code.forall(_.isWhitespace) =>
+            line.withClass("hideable")
+          case _ if comment.last == '\n' =>
+            line.copy(content = code + s"""<span class="hideable">${comment.dropRight(1)}</span>${"\n"}""")
+          case _  =>
+            line.copy(content = code + s"""<span class="hideable">$comment</span>""")
+      case (None, Some(idx)) =>
+        val (comment, code) = line.content.splitAt(idx+endSymbol.get.size)
+        comment match
+          case _ if code.forall(_.isWhitespace) =>
+            line.withClass("hideable")
+          case _ =>
+            line.copy(content = s"""<span class="hideable">$comment</span>""" + code)
+      case (Some(startIdx), Some(endIdx)) =>
+        val (tmp, end) = line.content.splitAt(endIdx+endSymbol.get.size)
+        val (begin, comment) = tmp.splitAt(startIdx)
+        line.copy(content = begin + s"""<span class="hideable">$comment</span>""" + end)
+      case _ => line
+
+  private def wrapCodeLines(codeLines: Seq[String]): Seq[SnippetLine] =
+    val snippetLines = codeLines.zipWithIndex.map {
+      case (content, idx) => SnippetLine(content.escapeReservedTokens, idx)
+    }
+    wrapImportedSection
+      .andThen(wrapHiddenSymbols)
+      .andThen(wrapCommonIndent)
+      .apply(snippetLines)
+
+  private def addCompileMessages(messages: Seq[SnippetCompilerMessage])(codeLines: Seq[SnippetLine]): Seq[SnippetLine] =
+    val messagesDict = messages.filter(_.position.nonEmpty).groupBy(_.position.get.relativeLine).toMap[Int, Seq[SnippetCompilerMessage]]
+    codeLines.map { line =>
+      messagesDict.get(line.lineNo) match
+        case None => line
+        case Some(messages) =>
+          val classes = List(
+            messages.find(_.level == MessageLevel.Error).map(compileMessageCSSClass),
+            messages.find(_.level == MessageLevel.Warning).map(compileMessageCSSClass),
+            messages.find(_.level == MessageLevel.Info).map(compileMessageCSSClass)
+          ).flatten
+          line.copy(classes = line.classes ++ classes.toSet ++ Set("tooltip"), messages = messages.map(_.message))
+    }
+
+  private def messagesHTML(messages: Seq[SnippetCompilerMessage]): String =
+    if messages.isEmpty
+      then ""
+      else
+        val content = messages
+          .map { msg =>
+            s"""<span class="${compileMessageCSSClass(msg)}">${msg.message}</span>"""
+          }
+          .mkString("<br>")
+        s"""<hr>$content"""
+
+  private def snippetLabel(name: String): String = div(cls := "snippet-meta")(
+    div(cls := "snippet-label")(name)
+  ).toString
+
+  def renderSnippetWithMessages(snippetName: Option[String], codeLines: Seq[String], messages: Seq[SnippetCompilerMessage], hasContext: Boolean): String =
+    val transformedLines = wrapCodeLines.andThen(addCompileMessages(messages)).apply(codeLines).map(_.toHTML)
+    val codeHTML = s"""<code class="language-scala">${transformedLines.mkString("")}</code>"""
+    s"""<div class="snippet" scala-snippet ${if hasContext then "hasContext" else ""}><div class="buttons"></div><pre>$codeHTML</pre>${snippetName.fold("")(snippetLabel(_))}</div>"""
+
+  def renderSnippetWithMessages(node: ExtendedFencedCodeBlock): String =
+    renderSnippetWithMessages(
+      node.name,
+      node.codeBlock.getContentChars.toString.split("\n").map(_ + "\n").toSeq,
+      node.compilationResult.toSeq.flatMap(_.messages),
+      node.hasContext
+    )
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala
new file mode 100644
index 000000000000..74d4f461dc7b
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala
@@ -0,0 +1,47 @@
+package dotty.tools.scaladoc
+package tasty.comments.markdown
+
+import dotty.tools.scaladoc.snippets._
+
+import com.vladsch.flexmark.html._
+import com.vladsch.flexmark.html.renderer._
+import com.vladsch.flexmark.parser._
+import com.vladsch.flexmark.ext.wikilink._
+import com.vladsch.flexmark.ext.wikilink.internal.WikiLinkLinkRefProcessor
+import com.vladsch.flexmark.util.ast._
+import com.vladsch.flexmark.util.options._
+import com.vladsch.flexmark.util.sequence.BasedSequence
+import com.vladsch.flexmark._
+import com.vladsch.flexmark.ast.FencedCodeBlock
+
+/**
+ * SnippetRenderingExtension is responsible for running an analysis for scala codeblocks in the static documentation/scaladoc comments.
+ * For each codeblock we run compiler to check whether snippet works in the newest scala version and to produce rich html codeblocks with
+ * compiler warnings/errors for IDE-like live experience.
+ */
+object SnippetRenderingExtension extends HtmlRenderer.HtmlRendererExtension:
+  def rendererOptions(opt: MutableDataHolder): Unit = ()
+  object ExtendedFencedCodeBlockHandler extends CustomNodeRenderer[ExtendedFencedCodeBlock]:
+    override def render(node: ExtendedFencedCodeBlock, c: NodeRendererContext, html: HtmlWriter): Unit =
+      html.raw(
+        SnippetRenderer.renderSnippetWithMessages(node)
+      )
+
+  object FencedCodeBlockHandler extends CustomNodeRenderer[FencedCodeBlock]:
+    override def render(node: FencedCodeBlock, c: NodeRendererContext, html: HtmlWriter): Unit =
+      html.raw("""<div class="snippet">""")
+      c.delegateRender()
+      html.raw("""</div>""")
+
+  object Render extends NodeRenderer:
+    override def getNodeRenderingHandlers: JSet[NodeRenderingHandler[_]] =
+      JSet(
+        new NodeRenderingHandler(classOf[ExtendedFencedCodeBlock], ExtendedFencedCodeBlockHandler),
+        new NodeRenderingHandler(classOf[FencedCodeBlock], FencedCodeBlockHandler)
+      )
+
+  object Factory extends NodeRendererFactory:
+    override def create(options: DataHolder): NodeRenderer = Render
+
+  def extend(htmlRendererBuilder: HtmlRenderer.Builder, tpe: String): Unit =
+    htmlRendererBuilder.nodeRendererFactory(Factory)
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala
index 5cec60977813..f11e8095afe7 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala
@@ -50,6 +50,15 @@ final case class UnorderedList(items: Seq[Block]) extends Block
 final case class OrderedList(items: Seq[Block], style: String) extends Block
 final case class DefinitionList(items: SortedMap[Inline, Block]) extends Block
 object HorizontalRule extends Block
+final case class Table(header: Row, columnOptions: Seq[ColumnOption], rows: Seq[Row]) extends Block
+final case class ColumnOption(option: 'L' | 'C' | 'R')
+object ColumnOption {
+  val ColumnOptionLeft = ColumnOption('L')
+  val ColumnOptionCenter = ColumnOption('C')
+  val ColumnOptionRight = ColumnOption('R')
+}
+final case class Row(cells: Seq[Cell])
+final case class Cell(blocks: Seq[Block])
 
 /** An section of text inside a block, possibly with formatting. */
 sealed abstract class Inline extends WikiDocElement:
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Parser.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Parser.scala
index 2436ca4e5239..a844f3384793 100644
--- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Parser.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Parser.scala
@@ -2,6 +2,7 @@ package dotty.tools.scaladoc
 package tasty.comments.wiki
 
 import scala.collection.mutable
+import scala.annotation.tailrec
 
 import dotty.tools.scaladoc.tasty.comments.Regexes._
 
@@ -35,6 +36,8 @@ final class Parser(
       hrule()
     else if (checkList)
       listBlock()
+    else if (checkTableRow)
+      table()
     else {
       para()
     }
@@ -127,6 +130,282 @@ final class Parser(
     HorizontalRule
   }
 
+
+    /** Starts and end with a cell separator matching the minimal row || and all other possible rows */
+    private val TableRow = """^\|.*\|$""".r
+    private val TableCellStart = "|"
+
+    /* Checks for a well-formed table row */
+    private def checkTableRow = {
+      check(TableCellStart) && {
+        val newlineIdx = buffer.indexOf('\n', offset)
+        newlineIdx != -1 &&
+          TableRow.findFirstIn(buffer.substring(offset, newlineIdx)).isDefined
+      }
+    }
+
+  /** {{{
+    * table         ::= headerRow '\n' delimiterRow '\n' dataRows '\n'
+    * content       ::= inline-content
+    * row           ::= '|' { content '|' }+
+    * headerRow     ::= row
+    * dataRows      ::= row*
+    * align         ::= ':' '-'+ | '-'+ | '-'+ ':' | ':' '-'+ ':'
+    * delimiterRow :: = '|' { align '|' }+
+    * }}}
+    */
+  def table(): Block = {
+    /* Helpers */
+
+    def peek(tag: String): Unit = {
+      val peek: String = buffer.substring(offset)
+      val limit = 60
+      val limitedPeek = peek.substring(0, limit min peek.length)
+      println(s"peek: $tag: '$limitedPeek'")
+    }
+
+    /* Accumulated state */
+
+    var header: Option[Row] = None
+
+    val rows = mutable.ListBuffer.empty[Row]
+
+    val cells = mutable.ListBuffer.empty[Cell]
+
+    def finalizeCells(): Unit = {
+      if (cells.nonEmpty) {
+        rows += Row(cells.toList)
+      }
+      cells.clear()
+    }
+
+    def finalizeHeaderCells(): Unit = {
+      if (cells.nonEmpty) {
+        if (header.isDefined) {
+          reportError("more than one table header")
+        } else {
+          header = Some(Row(cells.toList))
+        }
+      }
+      cells.clear()
+    }
+
+    val escapeChar = "\\"
+
+    /* Poor man's negative lookbehind */
+    def checkInlineEnd =
+      (check(TableCellStart) && !check(escapeChar, -1)) || check("\n")
+
+    def decodeEscapedCellMark(text: String) = text.replace(escapeChar + TableCellStart, TableCellStart)
+
+    def isEndOfText = char == endOfText
+
+    //def isNewline = char == endOfLine
+
+    //def skipNewline() = jump(endOfLine)
+
+    def isStartMarkNewline = check(TableCellStart + endOfLine)
+
+    def skipStartMarkNewline() = jump(TableCellStart + endOfLine)
+
+    def isStartMark = check(TableCellStart)
+
+    def skipStartMark() = jump(TableCellStart)
+
+    def contentNonEmpty(content: Inline) = content != Text("")
+
+      /* Parse cells of a table.
+      * @param cellStartMark The char indicating the start or end of a cell
+      * @param finalizeRow   Function to invoke when the row has been fully parsed
+      */
+    def parseCells(cellStartMark: String, finalizeRow: () => Unit): Unit = {
+      def jumpCellStartMark() = {
+        if (!jump(cellStartMark)) {
+          peek(s"Expected $cellStartMark")
+          sys.error(s"Precondition violated: Expected $cellStartMark.")
+        }
+      }
+
+      val startPos = offset
+
+      jumpCellStartMark()
+
+      val content = Paragraph(getInline(isInlineEnd = checkInlineEnd, textTransform = decodeEscapedCellMark))
+
+      parseCells0(content :: Nil, finalizeRow, startPos, offset)
+    }
+
+    // Continue parsing a table row.
+    //
+    // After reading inline content the following conditions will be encountered,
+    //
+    //    Case : Next Chars
+    //    ..................
+    //      1  : end-of-text
+    //      2  : '|' '\n'
+    //      3  : '|'
+    //      4  : '\n'
+    //
+    // Case 1.
+    // State : End of text
+    // Action: Store the current contents, close the row, report warning, stop parsing.
+    //
+    // Case 2.
+    // State : The cell separator followed by a newline
+    // Action: Store the current contents, skip the cell separator and newline, close the row, stop parsing.
+    //
+    // Case 3.
+    // State : The cell separator not followed by a newline
+    // Action: Store the current contents, skip the cell separator, continue parsing the row.
+    //
+    @tailrec def parseCells0(
+                              contents: List[Block],
+                              finalizeRow: () => Unit,
+                              progressPreParse: Int,
+                              progressPostParse: Int
+                            ): Unit = {
+
+      def storeContents() = cells += Cell(contents.reverse)
+
+      val startPos = offset
+
+      // The ordering of the checks ensures the state checks are correct.
+      if (progressPreParse == progressPostParse) {
+        peek("no-progress-table-row-parsing")
+        sys.error("No progress while parsing table row")
+      } else if (isEndOfText) {
+        // peek("1: end-of-text")
+        // Case 1
+        storeContents()
+        finalizeRow()
+        reportError("unclosed table row")
+      } else if (isStartMarkNewline) {
+        // peek("2: start-mark-new-line/before")
+        // Case 2
+        storeContents()
+        finalizeRow()
+        skipStartMarkNewline()
+        // peek("2: start-mark-new-line/after")
+      } else if (isStartMark) {
+        // peek("3: start-mark")
+        // Case 3
+        storeContents()
+        skipStartMark()
+        val content = getInline(isInlineEnd = checkInlineEnd, textTransform = decodeEscapedCellMark)
+        // TrailingCellsEmpty produces empty content
+        val accContents = if (contentNonEmpty(content)) Paragraph(content) :: Nil else Nil
+        parseCells0(accContents, finalizeRow, startPos, offset)
+      } else {
+        // Case π√ⅈ
+        // When the impossible happens leave some clues.
+        reportError("unexpected table row markdown")
+        peek("parseCell0")
+        storeContents()
+        finalizeRow()
+      }
+    }
+
+    /* Parsing */
+
+    jumpWhitespace()
+
+    parseCells(TableCellStart, () => finalizeHeaderCells())
+
+    while (checkTableRow) {
+      val initialOffset = offset
+
+      parseCells(TableCellStart, () => finalizeCells())
+
+      /* Progress should always be made */
+      if (offset == initialOffset) {
+        peek("no-progress-table-parsing")
+        sys.error("No progress while parsing table")
+      }
+    }
+
+    /* Finalize */
+
+    /* Structural consistency checks and coercion */
+
+    // https://github.github.com/gfm/#tables-extension-
+    // TODO: The header row must match the delimiter row in the number of cells. If not, a table will not be recognized:
+    // TODO: Break at following block level element: The table is broken at the first empty line, or beginning of another block-level structure:
+    // TODO: Do not return a table when: The header row must match the delimiter row in the number of cells. If not, a table will not be recognized
+
+    if (cells.nonEmpty) {
+      reportError(s"Parsed and unused content: $cells")
+    }
+    assert(header.isDefined, "table header was not parsed")
+    val enforcedCellCount = header.get.cells.size
+
+    def applyColumnCountConstraint(row: Row, defaultCell: Cell, rowType: String): Row = {
+      if (row.cells.size == enforcedCellCount)
+        row
+      else if (row.cells.size > enforcedCellCount) {
+        val excess = row.cells.size - enforcedCellCount
+        reportError(s"Dropping $excess excess table $rowType cells from row.")
+        Row(row.cells.take(enforcedCellCount))
+      } else {
+        val missing = enforcedCellCount - row.cells.size
+        Row(row.cells ++ List.fill(missing)(defaultCell))
+      }
+    }
+
+    // TODO: Abandon table parsing when the delimiter is missing instead of fixing and continuing.
+    val delimiterRow :: dataRows = {
+      if (rows.nonEmpty) rows.toList
+      else {
+        reportError("Fixing missing delimiter row")
+        Row(Cell(Paragraph(Text("-")) :: Nil) :: Nil) :: Nil
+      }
+    }
+
+    if (delimiterRow.cells.isEmpty) sys.error("TODO: Handle table with empty delimiter row")
+
+    val constrainedDelimiterRow = applyColumnCountConstraint(delimiterRow, delimiterRow.cells(0), "delimiter")
+
+    val constrainedDataRows = dataRows.map(applyColumnCountConstraint(_, Cell(Nil), "data"))
+
+    /* Convert the row following the header row to column options */
+
+    val leftAlignmentPattern = "^:?-++$".r
+    val centerAlignmentPattern = "^:-++:$".r
+    val rightAlignmentPattern = "^-++:$".r
+
+    import ColumnOption._
+    /* Encourage user to fix by defaulting to least ignorable fix. */
+    val defaultColumnOption = ColumnOptionRight
+    val columnOptions = constrainedDelimiterRow.cells.map {
+      alignmentSpecifier =>
+        alignmentSpecifier.blocks match {
+          // TODO: Parse the second row without parsing inline markdown
+          // TODO: Save pos when delimiter row is parsed and use here in reported errors
+          case Paragraph(Text(as)) :: Nil =>
+            as.trim match {
+              case leftAlignmentPattern(_*) => ColumnOptionLeft
+              case centerAlignmentPattern(_*) => ColumnOptionCenter
+              case rightAlignmentPattern(_*) => ColumnOptionRight
+              case x =>
+                reportError(s"Fixing invalid column alignment: $x")
+                defaultColumnOption
+            }
+          case x =>
+            reportError(s"Fixing invalid column alignment: $x")
+            defaultColumnOption
+        }
+    }
+
+    if (check("\n", -1)) {
+      prevChar()
+    } else {
+      peek("expected-newline-missing")
+      sys.error("table parsing left buffer in unexpected state")
+    }
+
+    blockEnded("table")
+    Table(header.get, columnOptions, constrainedDataRows)
+  }
+
   /** {{{ para ::= inline '\n' }}} */
   def para(): Block = {
     val p =
@@ -185,67 +464,67 @@ final class Parser(
     list mkString
   }
 
-  def getInline(isInlineEnd: => Boolean): Inline = {
+  def getInline(isInlineEnd: => Boolean, textTransform: String => String = identity): Inline = {
 
-    def inline0(): Inline = {
-      if (char == safeTagMarker) {
-        val tag = htmlTag()
-        HtmlTag(tag.data + readHTMLFrom(tag))
-      }
-      else if (check("'''")) bold()
-      else if (check("''")) italic()
-      else if (check("`"))  monospace()
-      else if (check("__")) underline()
-      else if (check("^"))  superscript()
-      else if (check(",,")) subscript()
-      else if (check("[[")) link()
-      else {
-        val str = readUntil {
-          char == safeTagMarker ||
-          check("''")           ||
-          char == '`'           ||
-          check("__")           ||
-          char == '^'           ||
-          check(",,")           ||
-          check("[[")           ||
-          isInlineEnd           ||
-          checkParaEnded()      ||
-          char == endOfLine
+      def inline0(): Inline = {
+        if (char == safeTagMarker) {
+          val tag = htmlTag()
+          HtmlTag(tag.data + readHTMLFrom(tag))
+        }
+        else if (check("'''")) bold()
+        else if (check("''")) italic()
+        else if (check("`"))  monospace()
+        else if (check("__")) underline()
+        else if (check("^"))  superscript()
+        else if (check(",,")) subscript()
+        else if (check("[[")) link()
+        else {
+          val str = readUntil {
+            char == safeTagMarker ||
+              check("''") ||
+              char == '`' ||
+              check("__") ||
+              char == '^' ||
+              check(",,") ||
+              check("[[") ||
+              isInlineEnd ||
+              checkParaEnded() ||
+              char == endOfLine
+          }
+          Text(textTransform(str))
         }
-        Text(str)
       }
-    }
 
-    val inlines: List[Inline] = {
-      val iss = mutable.ListBuffer.empty[Inline]
-      iss += inline0()
-      while (!isInlineEnd && !checkParaEnded()) {
-        val skipEndOfLine = if (char == endOfLine) {
-          nextChar()
-          true
-        } else {
-          false
-        }
+      val inlines: List[Inline] = {
+        val iss = mutable.ListBuffer.empty[Inline]
+        iss += inline0()
+        while (!isInlineEnd && !checkParaEnded()) {
+          val skipEndOfLine = if (char == endOfLine) {
+            nextChar()
+            true
+          } else {
+            false
+          }
 
-        val current = inline0()
-        (iss.last, current) match {
-          case (Text(t1), Text(t2)) if skipEndOfLine =>
-            iss.update(iss.length - 1, Text(t1 + endOfLine + t2))
-          case (i1, i2) if skipEndOfLine =>
-            iss ++= List(Text(endOfLine.toString), i2)
-          case _ => iss += current
+          val current = inline0()
+          (iss.last, current) match {
+            case (Text(t1), Text(t2)) if skipEndOfLine =>
+              iss.update(iss.length - 1, Text(t1 + endOfLine + t2))
+            case (i1, i2) if skipEndOfLine =>
+              iss ++= List(Text(endOfLine.toString), i2)
+            case _ => iss += current
+          }
         }
+        iss.toList
       }
-      iss.toList
-    }
 
-    inlines match {
-      case Nil => Text("")
-      case i :: Nil => i
-      case is => Chain(is)
-    }
+      inlines match {
+        case Nil => Text("")
+        case i :: Nil => i
+        case is => Chain(is)
+      }
 
-  }
+    }
 
   def htmlTag(): HtmlTag = {
     jump(safeTagMarker)
@@ -371,6 +650,7 @@ final class Parser(
         checkSkipInitWhitespace('=') ||
         checkSkipInitWhitespace("{{{") ||
         checkList ||
+        check(TableCellStart) ||
         checkSkipInitWhitespace('\u003D')
       }
       offset = poff
@@ -400,6 +680,10 @@ sealed class CharReader(buffer: String) { reader =>
   final def nextChar() =
     offset += 1
 
+  final def prevChar(): Unit =  {
+    offset -= 1
+  }
+
   final def check(chars: String): Boolean = {
     val poff = offset
     val ok = jump(chars)
@@ -407,6 +691,14 @@ sealed class CharReader(buffer: String) { reader =>
     ok
   }
 
+  final def check(chars: String, checkOffset: Int): Boolean = {
+    val poff = offset
+    offset += checkOffset
+    val ok = jump(chars)
+    offset = poff
+    ok
+  }
+
   def checkSkipInitWhitespace(c: Char): Boolean = {
     val poff = offset
     jumpWhitespace()
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/reflect.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/reflect.scala
new file mode 100644
index 000000000000..b48519e29d28
--- /dev/null
+++ b/scaladoc/src/dotty/tools/scaladoc/tasty/reflect.scala
@@ -0,0 +1,7 @@
+package dotty.tools.scaladoc
+package tasty
+
+import scala.quoted._
+
+/** Shorthand for `quotes.reflect` */
+transparent inline def reflect(using inline q: Quotes): q.reflect.type = q.reflect
diff --git a/scaladoc/src/dotty/tools/scaladoc/transformers/ImplicitMembersExtensionTransformer.scala b/scaladoc/src/dotty/tools/scaladoc/transformers/ImplicitMembersExtensionTransformer.scala
index 9d95f4462b78..0fa6b9c5d3cf 100644
--- a/scaladoc/src/dotty/tools/scaladoc/transformers/ImplicitMembersExtensionTransformer.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/transformers/ImplicitMembersExtensionTransformer.scala
@@ -26,7 +26,7 @@ class ImplicitMembersExtensionTransformer(using DocContext) extends(Module => Mo
 
       val MyDri = c.dri
       def collectApplicableMembers(source: Member): Seq[Member] = source.members.flatMap {
-        case m @ Member(_, _, _, Kind.Extension(ExtensionTarget(_, _, MyDri, _), _), Origin.RegularlyDefined) =>
+        case m @ Member(_, _, _, Kind.Extension(ExtensionTarget(_, _, _, _, MyDri, _), _), Origin.RegularlyDefined) =>
           val kind = m.kind match
             case d: Kind.Def => d
             case _ => Kind.Def(Nil, Nil)
diff --git a/scaladoc/src/dotty/tools/scaladoc/transformers/InheritanceInformationTransformer.scala b/scaladoc/src/dotty/tools/scaladoc/transformers/InheritanceInformationTransformer.scala
index 63774d27c1be..02e224f10cf0 100644
--- a/scaladoc/src/dotty/tools/scaladoc/transformers/InheritanceInformationTransformer.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/transformers/InheritanceInformationTransformer.scala
@@ -3,7 +3,7 @@ package transformers
 
 class InheritanceInformationTransformer(using DocContext) extends (Module => Module):
   override def apply(original: Module): Module =
-    val subtypes = getSupertypes(original.rootPackage).groupBy(_._1).transform((k, v) => v.map(_._2))
+    val subtypes = getSupertypes(original.rootPackage).groupMap(_(0))(_(1))
     original.updateMembers { m =>
       val edges = getEdges(m.asLink.copy(kind = bareClasslikeKind(m.kind)), subtypes)
       val st: Seq[LinkToType] = edges.map(_._1).distinct
diff --git a/scaladoc/src/dotty/tools/scaladoc/translators/FilterAttributes.scala b/scaladoc/src/dotty/tools/scaladoc/translators/FilterAttributes.scala
index 0a1b62dcb4d6..1202e76a548c 100644
--- a/scaladoc/src/dotty/tools/scaladoc/translators/FilterAttributes.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/translators/FilterAttributes.scala
@@ -20,7 +20,7 @@ object FilterAttributes:
   private def origin(m: Member): Map[String, String] = m.origin match
     case Origin.ImplicitlyAddedBy(name, _) => Map("implicitly" -> s"by $name")
     case Origin.ExtensionFrom(name, _) => Map("extension" -> s"from $name")
-    case Origin.ExportedFrom(name, _) => Map("export" -> s"from $name")
+    case Origin.ExportedFrom(Some(link)) => Map("export" -> s"from ${link.name}}")
     case _ => Map.empty
 
 
diff --git a/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala b/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala
index a2ade47bbbb2..0639b5af09bd 100644
--- a/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala
@@ -2,12 +2,12 @@ package dotty.tools.scaladoc
 package translators
 
 object ScalaSignatureProvider:
-  def rawSignature(documentable: Member, builder: SignatureBuilder): SignatureBuilder =
-    documentable.kind match
+  def rawSignature(documentable: Member, builder: SignatureBuilder)(kind: Kind = documentable.kind): SignatureBuilder =
+    kind match
       case Kind.Extension(_, m) =>
         extensionSignature(documentable, m, builder)
       case Kind.Exported(d) =>
-         methodSignature(documentable, d, builder)
+         rawSignature(documentable, builder)(d)
       case d: Kind.Def =>
         methodSignature(documentable, d, builder)
       case Kind.Constructor(d) =>
@@ -22,6 +22,8 @@ object ScalaSignatureProvider:
         givenClassSignature(documentable, cls, builder)
       case Kind.Given(d: Kind.Def, _, _) =>
         givenMethodSignature(documentable, d, builder)
+      case Kind.Given(Kind.Val, _, _) =>
+        givenValSignature(documentable, builder)
       case cls: Kind.Class =>
         classSignature(documentable, cls, builder)
       case enm: Kind.Enum =>
@@ -31,11 +33,11 @@ object ScalaSignatureProvider:
       case trt: Kind.Trait =>
         traitSignature(documentable, trt, builder)
       case Kind.Val | Kind.Var | Kind.Implicit(Kind.Val, _) =>
-        fieldSignature(documentable, documentable.kind.name, builder)
+        fieldSignature(documentable, kind.name, builder)
       case tpe: Kind.Type =>
         typeSignature(tpe, documentable, builder)
       case Kind.Package =>
-        builder.text("package ").name(documentable.name, documentable.dri)
+        builder.keyword("package ").name(documentable.name, documentable.dri)
       case Kind.RootPackage =>
         builder
       case Kind.Unknown =>
@@ -43,7 +45,7 @@ object ScalaSignatureProvider:
 
   private def enumEntrySignature(member: Member, cls: Kind.Class, bdr: SignatureBuilder): SignatureBuilder =
     val withPrefixes: SignatureBuilder = bdr
-      .text("case ")
+      .keyword("case ")
       .name(member.name, member.dri)
       .generics(cls.typeParams)
 
@@ -52,22 +54,22 @@ object ScalaSignatureProvider:
 
   private def enumPropertySignature(entry: Member, builder: SignatureBuilder): SignatureBuilder =
     val modifiedType = entry.signature.map {
-      case " & " => " with "
+      case Keyword(" & ") => Keyword(" with ")
       case o => o
     }
 
     builder
-      .text("case ")
+      .keyword("case ")
       .name(entry.name, entry.dri)
-      .text(" extends ")
+      .keyword(" extends ")
       .signature(modifiedType)
 
   private def parentsSignature(member: Member, builder: SignatureBuilder): SignatureBuilder =
     member.directParents match
       case Nil => builder
       case extendType :: withTypes =>
-        val extendPart = builder.text(" extends ").signature(extendType.signature)
-        withTypes.foldLeft(extendPart)((bdr, tpe) => bdr.text(" with ").signature(tpe.signature))
+        val extendPart = builder.keyword(" extends ").signature(extendType.signature)
+        withTypes.foldLeft(extendPart)((bdr, tpe) => bdr.keyword(" with ").signature(tpe.signature))
 
   private def givenClassSignature(member: Member, cls: Kind.Class, builder: SignatureBuilder): SignatureBuilder =
     val prefixes = builder
@@ -78,7 +80,7 @@ object ScalaSignatureProvider:
 
     member.kind match
       case Kind.Given(_, Some(instance), _) => prefixes
-        .text(": ")
+        .plain(": ")
         .signature(instance)
       case _ => prefixes
 
@@ -123,16 +125,30 @@ object ScalaSignatureProvider:
       .generics(fun.typeParams)
       .functionParameters(fun.argsLists)
 
-      withSignature.text(":").text(" ").signature(extension.signature)
+      withSignature.plain(":").plain(" ").signature(extension.signature)
 
   private def givenMethodSignature(method: Member, body: Kind.Def, builder: SignatureBuilder): SignatureBuilder = method.kind match
     case Kind.Given(_, Some(instance), _) =>
-      builder.text("given ")
+      builder.keyword("given ")
         .name(method.name, method.dri)
-        .text(": ")
+        .generics(body.typeParams)
+        .functionParameters(body.argsLists)
+        .plain(": ")
         .signature(instance)
     case _ =>
-      builder.text("given ").name(method.name, method.dri)
+      builder.keyword("given ")
+        .name(method.name, method.dri)
+        .generics(body.typeParams)
+        .functionParameters(body.argsLists)
+
+  private def givenValSignature(field: Member, builder: SignatureBuilder): SignatureBuilder = field.kind match
+    case Kind.Given(_, Some(instance), _) =>
+      builder.keyword("given ")
+        .name(field.name, field.dri)
+        .plain(": ")
+        .signature(instance)
+    case _ =>
+      builder.keyword("given ").name(field.name, field.dri)
 
   private def methodSignature(method: Member, cls: Kind.Def, builder: SignatureBuilder): SignatureBuilder =
     val bdr = builder
@@ -141,7 +157,7 @@ object ScalaSignatureProvider:
     .generics(cls.typeParams)
     .functionParameters(cls.argsLists)
     if !method.kind.isInstanceOf[Kind.Constructor] then
-      bdr.text(": ").signature(method.signature)
+      bdr.plain(": ").signature(method.signature)
     else bdr
 
   private def typeSignature(tpe: Kind.Type, typeDef: Member, builder: SignatureBuilder): SignatureBuilder =
@@ -150,25 +166,25 @@ object ScalaSignatureProvider:
       .name(typeDef.name, typeDef.dri)
       .generics(tpe.typeParams)
     if(!tpe.opaque){
-      (if tpe.concreate then bdr.text(" = ") else bdr)
+      (if tpe.concreate then bdr.plain(" = ") else bdr)
         .signature(typeDef.signature)
     } else bdr
 
 
   private def givenPropertySignature(property: Member, builder: SignatureBuilder): SignatureBuilder =
     val bdr = builder
-      .text("given ")
+      .keyword("given ")
       .name(property.name, property.dri)
 
     property.kind match
       case Kind.Given(_, Some(instance), _) =>
-         bdr.text(" as ").signature(instance)
+         bdr.keyword(" as ").signature(instance)
       case _ => bdr
 
   private def fieldSignature(member: Member, kind: String, builder: SignatureBuilder): SignatureBuilder =
     builder
       .modifiersAndVisibility(member, kind)
       .name(member.name, member.dri)
-      .text(":")
-      .text(" ")
+      .plain(":")
+      .plain(" ")
       .signature(member.signature)
diff --git a/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureUtils.scala b/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureUtils.scala
index 3817c70eef5a..7a5dc2310c0e 100644
--- a/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureUtils.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureUtils.scala
@@ -2,9 +2,11 @@ package dotty.tools.scaladoc
 package translators
 
 case class InlineSignatureBuilder(names: Signature = Nil, preName: Signature = Nil) extends SignatureBuilder:
-  override def text(str: String): SignatureBuilder = copy(names = str +: names)
+  override def plain(str: String): SignatureBuilder = copy(names = Plain(str) +: names)
   override def name(str: String, dri: DRI): SignatureBuilder = copy(names = Nil, preName = names)
-  override def driLink(text: String, dri: DRI): SignatureBuilder = copy(names = Link(text, dri) +: names)
+  override def tpe(text: String, dri: Option[DRI]): SignatureBuilder = copy(names = Type(text, dri) +: names)
+  override def keyword(str: String): SignatureBuilder = copy(names = Keyword(str) +: names)
+  def tpe(text: String, dri: DRI): SignatureBuilder = copy(names = Type(text, Some(dri)) +: names)
   override def signature(s: Signature): SignatureBuilder = copy(names = s.reverse ++ names)
 
 object InlineSignatureBuilder:
@@ -12,86 +14,90 @@ object InlineSignatureBuilder:
       ScalaSignatureProvider.rawSignature(d, InlineSignatureBuilder()).asInstanceOf[InlineSignatureBuilder].names.reverse
 
 trait SignatureBuilder extends ScalaSignatureUtils {
-  def text(str: String): SignatureBuilder
-  def name(str: String, dri: DRI) = driLink(str, dri)
-  def driLink(text: String, dri: DRI): SignatureBuilder
+  def keyword(str: String): SignatureBuilder
+  def plain(str: String): SignatureBuilder
+  def name (str: String, dri: DRI): SignatureBuilder
+  def tpe(str: String, dri: Option[DRI]): SignatureBuilder
   def signature(s: Signature): SignatureBuilder = s.foldLeft(this){
-    case (bld, s: String) => bld.text(s)
-    case (bld, Link(text: String, dri: DRI)) => bld.driLink(text, dri)
+    case (bld, Type(a, b)) => bld.tpe(a, b)
+    case (bld, Keyword(a)) => bld.keyword(a)
+    case (bld, Plain(a)) => bld.plain(a)
   }
 
   // Support properly once we rewrite signature builder
-  def memberName(name: String, dri: DRI) = text(name)
+  def memberName(name: String, dri: DRI) = plain(name)
 
   def list[E](
-      elements: Seq[E],
-      prefix: String = "",
-      suffix: String = "",
-      separator: String = ", ",
-    )(
-      elemOp: (SignatureBuilder, E) => SignatureBuilder
-    ): SignatureBuilder = elements match {
-      case Nil => this
-      case head :: tail =>
-        tail.foldLeft(elemOp(text(prefix), head))((b, e) => elemOp(b.text(separator), e)).text(suffix)
-    }
+    elements: Seq[E],
+    prefix: Signature = List(Plain("")),
+    suffix: Signature = List(Plain("")),
+    separator: Signature = List(Plain(", ")),
+    forcePrefixAndSuffix: Boolean = false
+  )(
+    elemOp: (SignatureBuilder, E) => SignatureBuilder
+  ): SignatureBuilder = elements match {
+    case Nil => if forcePrefixAndSuffix then signature(prefix).signature(suffix) else this
+    case head :: tail =>
+      tail.foldLeft(elemOp(signature(prefix), head))((b, e) => elemOp(b.signature(separator), e)).signature(suffix)
+  }
 
   def annotationsBlock(d: Member): SignatureBuilder =
-      d.annotations.foldLeft(this){ (bdr, annotation) => bdr.buildAnnotation(annotation)}
-
-    def annotationsInline(d: Parameter): SignatureBuilder =
-        d.annotations.foldLeft(this){ (bdr, annotation) => bdr.buildAnnotation(annotation) }
+    d.annotations.foldLeft(this){ (bdr, annotation) => bdr.buildAnnotation(annotation)}
 
-    def annotationsInline(t: TypeParameter): SignatureBuilder =
-        t.annotations.foldLeft(this){ (bdr, annotation) => bdr.buildAnnotation(annotation) }
+  def annotationsInline(d: Parameter): SignatureBuilder =
+    d.annotations.foldLeft(this){ (bdr, annotation) => bdr.buildAnnotation(annotation) }
 
-    private def buildAnnotation(a: Annotation): SignatureBuilder =
-       text("@").driLink(a.dri.location.split('.').last, a.dri).buildAnnotationParams(a).text(" ")
+  def annotationsInline(t: TypeParameter): SignatureBuilder =
+    t.annotations.foldLeft(this){ (bdr, annotation) => bdr.buildAnnotation(annotation) }
 
-    private def buildAnnotationParams(a: Annotation): SignatureBuilder =
-      if !a.params.isEmpty then
-        val params = a.params.filterNot {
-          case Annotation.LinkParameter(_, _, text) => text == "_"
-          case _ => false
-        }
-        list(params, "(", ")", ", "){ (bdr, param) => bdr.buildAnnotationParameter(param)}
-      else this
+  private def buildAnnotation(a: Annotation): SignatureBuilder =
+    tpe(s"@${a.dri.location.split('.').last}", Some(a.dri)).buildAnnotationParams(a).plain(" ")
 
-    private def addParameterName(txt: Option[String]): SignatureBuilder = txt match {
-        case Some(name) => this.text(s"$name = ")
-        case _ => this
+  private def buildAnnotationParams(a: Annotation): SignatureBuilder =
+    if !a.params.isEmpty then
+      val params = a.params.filterNot {
+        case Annotation.LinkParameter(_, _, text) => text == "_"
+        case _ => false
       }
+      list(params, List(Plain("(")), List(Plain(")")), List(Plain(", "))){ (bdr, param) => bdr.buildAnnotationParameter(param)}
+    else this
 
-    private def buildAnnotationParameter(a: Annotation.AnnotationParameter): SignatureBuilder = a match {
-      case Annotation.PrimitiveParameter(name, value) =>
-        addParameterName(name).text(value)
-      case Annotation.LinkParameter(name, dri, text) =>
-        addParameterName(name).driLink(text, dri)
-      case Annotation.UnresolvedParameter(name, value) =>
-        addParameterName(name).text(value)
-    }
+  private def addParameterName(txt: Option[String]): SignatureBuilder = txt match {
+    case Some(name) => this.plain(s"$name = ")
+    case _ => this
+  }
 
-    def modifiersAndVisibility(t: Member, kind: String) =
-      val (prefixMods, suffixMods) = t.modifiers.partition(_.prefix)
-      val all = prefixMods.map(_.name) ++ Seq(t.visibility.asSignature) ++ suffixMods.map(_.name)
+  private def buildAnnotationParameter(a: Annotation.AnnotationParameter): SignatureBuilder = a match {
+    case Annotation.PrimitiveParameter(name, value) =>
+      addParameterName(name).plain(value)
+    case Annotation.LinkParameter(name, dri, text) =>
+      addParameterName(name).tpe(text, Some(dri))
+    case Annotation.UnresolvedParameter(name, value) =>
+      addParameterName(name).plain(value)
+  }
 
-      text(all.toSignatureString()).text(kind + " ")
+  def modifiersAndVisibility(t: Member, kind: String) =
+    val (prefixMods, suffixMods) = t.modifiers.partition(_.prefix)
+    val all = prefixMods.map(_.name) ++ Seq(t.visibility.asSignature) ++ suffixMods.map(_.name)
+    val filtered = all.filter(_.trim.nonEmpty)
+    val intermediate = if filtered.nonEmpty then keyword(filtered.toSignatureString()) else this
+    intermediate.keyword(kind + " ")
 
-    def generics(on: Seq[TypeParameter]) = list(on.toList, "[", "]"){ (bdr, e) =>
-      bdr.annotationsInline(e).text(e.variance).memberName(e.name, e.dri).signature(e.signature)
-    }
+  def generics(on: Seq[TypeParameter]) = list(on.toList, List(Plain("[")), List(Plain("]"))){ (bdr, e) =>
+    bdr.annotationsInline(e).keyword(e.variance).tpe(e.name, Some(e.dri)).signature(e.signature)
+  }
 
-    def functionParameters(params: Seq[ParametersList]) =
-      if params.isEmpty then this.text("")
-      else if params.size == 1 && params(0).parameters == Nil then this.text("()")
-      else this.list(params, separator = ""){ (bld, pList) =>
-        bld.list(pList.parameters, s"(${pList.modifiers}", ")"){ (bld, p) =>
-            val annotationsAndModifiers = bld.annotationsInline(p)
-              .text(p.modifiers)
-            val name = p.name.fold(annotationsAndModifiers)(annotationsAndModifiers.memberName(_, p.dri).text(": "))
-            name.signature(p.signature)
-        }
+  def functionParameters(params: Seq[ParametersList]) =
+    if params.isEmpty then this.plain("")
+    else if params.size == 1 && params(0).parameters == Nil then this.plain("()")
+    else this.list(params, separator = List(Plain(""))) { (bld, pList) =>
+      bld.list(pList.parameters, prefix = List(Plain("("), Keyword(pList.modifiers)), suffix = List(Plain(")")), forcePrefixAndSuffix = true) { (bld, p) =>
+        val annotationsAndModifiers = bld.annotationsInline(p)
+          .keyword(p.modifiers)
+        val name = p.name.fold(annotationsAndModifiers)(annotationsAndModifiers.memberName(_, p.dri).plain(": "))
+        name.signature(p.signature)
       }
+    }
 }
 
 trait ScalaSignatureUtils:
diff --git a/scaladoc/src/dotty/tools/scaladoc/util/JSON.scala b/scaladoc/src/dotty/tools/scaladoc/util/JSON.scala
index d822bf4cf898..468300db6616 100644
--- a/scaladoc/src/dotty/tools/scaladoc/util/JSON.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/util/JSON.scala
@@ -5,6 +5,8 @@ import scala.annotation.tailrec
 
 opaque type JSON = String
 
+def rawJSON(s: String): JSON = s
+
 def jsonList(elems: Seq[JSON]): JSON = elems.mkString("[", ",\n", "]")
 
 def jsonObject(fields: (String, JSON)*): JSON =
diff --git a/scaladoc/src/dotty/tools/scaladoc/util/escape.scala b/scaladoc/src/dotty/tools/scaladoc/util/escape.scala
index 66035e76ca98..686d384337c1 100644
--- a/scaladoc/src/dotty/tools/scaladoc/util/escape.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/util/escape.scala
@@ -1,4 +1,11 @@
 package dotty.tools.scaladoc.util
 
 object Escape:
-  def escapeUrl(url: String) = url.replace("#","%23")
\ No newline at end of file
+  def escapeUrl(url: String) = url
+    .replace("#","%23")
+
+  def escapeFilename(filename: String) =
+    val escaped = filename
+      .replace("/", "$div")
+      .replace("\\", "$bslash")
+    if escaped != filename then escaped + "$" else escaped
diff --git a/scaladoc/src/dotty/tools/scaladoc/util/html.scala b/scaladoc/src/dotty/tools/scaladoc/util/html.scala
index 3c07222341b6..790891b95d99 100644
--- a/scaladoc/src/dotty/tools/scaladoc/util/html.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/util/html.scala
@@ -11,7 +11,17 @@ object HTML:
   case class Tag(name: String):
     def apply(tags: TagArg*): AppliedTag = apply()(tags:_*)
     def apply(first: AttrArg, rest: AttrArg*): AppliedTag = apply((first +: rest):_*)()
-    def apply(attrs: AttrArg*)(tags: TagArg*): AppliedTag = {
+    def apply(attrs: AttrArg*)(tags: TagArg*): AppliedTag =
+      def unpackTags(tags: TagArg*)(using sb: StringBuilder): StringBuilder =
+        tags.foreach {
+          case t: AppliedTag =>
+            sb.append(t)
+          case s: String =>
+            sb.append(s.escapeReservedTokens)
+          case s: Seq[AppliedTag | String] =>
+            unpackTags(s:_*)
+        }
+        sb
       val sb = StringBuilder()
       sb.append(s"<$name")
       attrs.filter(_ != Nil).foreach{
@@ -21,24 +31,11 @@ object HTML:
           sb.append(" ").append(e)
       }
       sb.append(">")
-      tags.foreach{
-        case t: AppliedTag =>
-          sb.append(t)
-        case s: String =>
-          sb.append(s.escapeReservedTokens)
-        case s: Seq[AppliedTag | String] =>
-          s.foreach{
-            case a: AppliedTag =>
-              sb.append(a)
-            case s: String =>
-              sb.append(s.escapeReservedTokens)
-          }
-      }
+      unpackTags(tags:_*)(using sb)
       sb.append(s"</$name>")
       sb
-    }
 
-  extension (s: String) private def escapeReservedTokens: String =
+  extension (s: String) def escapeReservedTokens: String =
     s.replace("&", "&amp;")
       .replace("<", "&lt;")
       .replace(">", "&gt;")
@@ -68,6 +65,7 @@ object HTML:
   val svg = Tag("svg")
   val button = Tag("button")
   val input = Tag("input")
+  val label = Tag("label")
   val script = Tag("script")
   val link = Tag("link")
   val footer = Tag("footer")
@@ -84,6 +82,12 @@ object HTML:
   val li = Tag("li")
   val code = Tag("code")
   val pre = Tag("pre")
+  val table = Tag("table")
+  val thead = Tag("thead")
+  val tbody = Tag("tbody")
+  val th = Tag("th")
+  val tr = Tag("tr")
+  val td = Tag("td")
 
   val cls = Attr("class")
   val href = Attr("href")
@@ -102,6 +106,7 @@ object HTML:
   val value = Attr("value")
   val onclick=Attr("onclick")
   val titleAttr =Attr("title")
+  val onkeyup = Attr("onkeyup")
 
   def raw(content: String): AppliedTag = new AppliedTag(content)
   def raw(content: StringBuilder): AppliedTag = content
diff --git a/scaladoc/src/scala/tasty/inspector/OldTastyInspector.scala b/scaladoc/src/scala/tasty/inspector/OldTastyInspector.scala
index 91311b1ff9bb..16f9b0fdca1d 100644
--- a/scaladoc/src/scala/tasty/inspector/OldTastyInspector.scala
+++ b/scaladoc/src/scala/tasty/inspector/OldTastyInspector.scala
@@ -110,7 +110,10 @@ trait OldTastyInspector:
 
       override def newRun(implicit ctx: Context): Run =
         reset()
-        new TASTYRun(this, ctx.fresh.addMode(Mode.ReadPositions).addMode(Mode.ReadComments))
+        val ctx2 = ctx.fresh
+            .addMode(Mode.ReadPositions)
+            .setSetting(ctx.settings.YreadComments, true)
+        new TASTYRun(this, ctx2)
 
     new InspectorDriver
 
diff --git a/scaladoc/test-documentations/basic/images/basic.svg b/scaladoc/test-documentations/basic/_assets/images/basic.svg
similarity index 100%
rename from scaladoc/test-documentations/basic/images/basic.svg
rename to scaladoc/test-documentations/basic/_assets/images/basic.svg
diff --git a/scaladoc/test-documentations/basic/docs/Adoc.md b/scaladoc/test-documentations/basic/_docs/Adoc.md
similarity index 100%
rename from scaladoc/test-documentations/basic/docs/Adoc.md
rename to scaladoc/test-documentations/basic/_docs/Adoc.md
diff --git a/scaladoc/test-documentations/basic/docs/dir/index.md b/scaladoc/test-documentations/basic/_docs/dir/index.md
similarity index 100%
rename from scaladoc/test-documentations/basic/docs/dir/index.md
rename to scaladoc/test-documentations/basic/_docs/dir/index.md
diff --git a/scaladoc/test-documentations/basic/docs/dir/nested.md b/scaladoc/test-documentations/basic/_docs/dir/nested.md
similarity index 100%
rename from scaladoc/test-documentations/basic/docs/dir/nested.md
rename to scaladoc/test-documentations/basic/_docs/dir/nested.md
diff --git a/scaladoc/test-documentations/basic/docs/index.md b/scaladoc/test-documentations/basic/_docs/index.md
similarity index 100%
rename from scaladoc/test-documentations/basic/docs/index.md
rename to scaladoc/test-documentations/basic/_docs/index.md
diff --git a/scaladoc/test-documentations/basic/index.md b/scaladoc/test-documentations/basic/index.md
deleted file mode 100644
index 2205e0c12d3e..000000000000
--- a/scaladoc/test-documentations/basic/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Basic test
----
-# Header
-
-[Link to docs](docs/index.html)
-
-And a text!
\ No newline at end of file
diff --git a/scaladoc/test-documentations/conflicts-pages/_docs/tests/Adoc.md b/scaladoc/test-documentations/conflicts-pages/_docs/tests/Adoc.md
new file mode 100644
index 000000000000..a0879c956838
--- /dev/null
+++ b/scaladoc/test-documentations/conflicts-pages/_docs/tests/Adoc.md
@@ -0,0 +1 @@
+# Trying to override a api page!
\ No newline at end of file
diff --git a/scaladoc/test-documentations/conflicts-resources/_assets/resources/tests/Adoc.html b/scaladoc/test-documentations/conflicts-resources/_assets/resources/tests/Adoc.html
new file mode 100644
index 000000000000..482b8942606e
--- /dev/null
+++ b/scaladoc/test-documentations/conflicts-resources/_assets/resources/tests/Adoc.html
@@ -0,0 +1 @@
+<html><body>I am causing conflicts!</body></html>
\ No newline at end of file
diff --git a/scaladoc/test-documentations/noDocsIndex/images/basic.svg b/scaladoc/test-documentations/noDocsIndex/_assets/images/basic.svg
similarity index 100%
rename from scaladoc/test-documentations/noDocsIndex/images/basic.svg
rename to scaladoc/test-documentations/noDocsIndex/_assets/images/basic.svg
diff --git a/scaladoc/test-documentations/noDocsIndex/docs/Adoc.md b/scaladoc/test-documentations/noDocsIndex/_docs/Adoc.md
similarity index 100%
rename from scaladoc/test-documentations/noDocsIndex/docs/Adoc.md
rename to scaladoc/test-documentations/noDocsIndex/_docs/Adoc.md
diff --git a/scaladoc/test-documentations/noDocsIndex/docs/dir/index.md b/scaladoc/test-documentations/noDocsIndex/_docs/dir/index.md
similarity index 100%
rename from scaladoc/test-documentations/noDocsIndex/docs/dir/index.md
rename to scaladoc/test-documentations/noDocsIndex/_docs/dir/index.md
diff --git a/scaladoc/test-documentations/noDocsIndex/docs/dir/nested.md b/scaladoc/test-documentations/noDocsIndex/_docs/dir/nested.md
similarity index 100%
rename from scaladoc/test-documentations/noDocsIndex/docs/dir/nested.md
rename to scaladoc/test-documentations/noDocsIndex/_docs/dir/nested.md
diff --git a/scaladoc/test-documentations/noDocsIndex/docs/index.md b/scaladoc/test-documentations/noDocsIndex/_docs/index.md
similarity index 100%
rename from scaladoc/test-documentations/noDocsIndex/docs/index.md
rename to scaladoc/test-documentations/noDocsIndex/_docs/index.md
diff --git a/scaladoc/test-documentations/noDocsIndex/index.md b/scaladoc/test-documentations/noDocsIndex/index.md
deleted file mode 100644
index 2205e0c12d3e..000000000000
--- a/scaladoc/test-documentations/noDocsIndex/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Basic test
----
-# Header
-
-[Link to docs](docs/index.html)
-
-And a text!
\ No newline at end of file
diff --git a/scaladoc/test-documentations/noGlobalIndex/images/basic.svg b/scaladoc/test-documentations/noGlobalIndex/_assets/images/basic.svg
similarity index 100%
rename from scaladoc/test-documentations/noGlobalIndex/images/basic.svg
rename to scaladoc/test-documentations/noGlobalIndex/_assets/images/basic.svg
diff --git a/scaladoc/test-documentations/noGlobalIndex/docs/Adoc.md b/scaladoc/test-documentations/noGlobalIndex/_docs/Adoc.md
similarity index 100%
rename from scaladoc/test-documentations/noGlobalIndex/docs/Adoc.md
rename to scaladoc/test-documentations/noGlobalIndex/_docs/Adoc.md
diff --git a/scaladoc/test-documentations/noGlobalIndex/docs/dir/index.md b/scaladoc/test-documentations/noGlobalIndex/_docs/dir/index.md
similarity index 100%
rename from scaladoc/test-documentations/noGlobalIndex/docs/dir/index.md
rename to scaladoc/test-documentations/noGlobalIndex/_docs/dir/index.md
diff --git a/scaladoc/test-documentations/noGlobalIndex/docs/dir/nested.md b/scaladoc/test-documentations/noGlobalIndex/_docs/dir/nested.md
similarity index 100%
rename from scaladoc/test-documentations/noGlobalIndex/docs/dir/nested.md
rename to scaladoc/test-documentations/noGlobalIndex/_docs/dir/nested.md
diff --git a/scaladoc/test-documentations/noGlobalIndex/docs/index.md b/scaladoc/test-documentations/noGlobalIndex/_docs/index.md
similarity index 100%
rename from scaladoc/test-documentations/noGlobalIndex/docs/index.md
rename to scaladoc/test-documentations/noGlobalIndex/_docs/index.md
diff --git a/scaladoc/test-documentations/noIndexes/images/basic.svg b/scaladoc/test-documentations/noIndexes/_assets/images/basic.svg
similarity index 100%
rename from scaladoc/test-documentations/noIndexes/images/basic.svg
rename to scaladoc/test-documentations/noIndexes/_assets/images/basic.svg
diff --git a/scaladoc/test-documentations/noIndexes/docs/Adoc.md b/scaladoc/test-documentations/noIndexes/_docs/Adoc.md
similarity index 100%
rename from scaladoc/test-documentations/noIndexes/docs/Adoc.md
rename to scaladoc/test-documentations/noIndexes/_docs/Adoc.md
diff --git a/scaladoc/test-documentations/noIndexes/docs/dir/index.md b/scaladoc/test-documentations/noIndexes/_docs/dir/index.md
similarity index 100%
rename from scaladoc/test-documentations/noIndexes/docs/dir/index.md
rename to scaladoc/test-documentations/noIndexes/_docs/dir/index.md
diff --git a/scaladoc/test-documentations/noIndexes/docs/dir/nested.md b/scaladoc/test-documentations/noIndexes/_docs/dir/nested.md
similarity index 100%
rename from scaladoc/test-documentations/noIndexes/docs/dir/nested.md
rename to scaladoc/test-documentations/noIndexes/_docs/dir/nested.md
diff --git a/scaladoc/test-documentations/static-links/_assets/images/basic.svg b/scaladoc/test-documentations/static-links/_assets/images/basic.svg
new file mode 100644
index 000000000000..1fb642c8bfa0
--- /dev/null
+++ b/scaladoc/test-documentations/static-links/_assets/images/basic.svg
@@ -0,0 +1,30 @@
+<svg width="64px" height="109px" viewBox="0 0 64 109" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="logo-background" transform="translate(0.000000, 16.000000)" fill="#ccc">
+            <path d="M0.5,59.5 C0.5,59.5 63.4,65.8 63.4,76.3 L63.4,51.1 C63.4,51.1 63.4,40.6 0.5,34.3 L0.5,59.5 L0.5,59.5 Z" id="logo-background-bottom"></path>
+            <path d="M0.5,25.9 C0.5,25.9 63.4,32.2 63.4,42.7 L63.4,17.5 C63.4,17.5 63.4,7 0.5,0.7 L0.5,10.5 L0.5,25.9 L0.5,25.9 Z" id="logo-background-top"></path>
+        </g>
+        <g id="logo-foreground" fill="#ffffff">
+            <path d="M0.5,109 L0.5,83.8 C0.5,83.8 63.4,77.5 63.4,67 L63.4,92.2 C63.5,92.3 63.5,102.7 0.5,109" id="Logo_Foreground_Bottom"></path>
+            <path d="M0.5,50.3 C0.5,50.3 63.4,44 63.4,33.5 L63.4,58.7 C63.4,58.7 63.4,69.2 0.5,75.5 L0.5,50.3 L0.5,50.3 Z" id="Logo_Foreground_Middle"></path>
+            <path d="M63.5,0 L63.5,25.2 C63.5,25.2 63.5,35.7 0.6,42 L0.6,16.7 C0.5,16.7 63.5,10.5 63.5,0" id="logo-foreground-top"></path>
+        </g>
+        <g id="dots" transform="translate(4.000000, 10.000000)" fill="#B6B6B6">
+            <g id="bottom" transform="translate(0.000000, 67.500000)">
+                <path d="M1.4471104,12.2885536 C1.45019313,12.2881864 1.45019313,12.2881864 1.45327704,12.2878189 C1.91768952,12.2324787 2.24930811,11.8111359 2.1939679,11.3467234 C2.13862768,10.8823109 1.71728488,10.5506923 1.2528724,10.6060325 C1.24980572,10.606398 1.24980572,10.606398 1.24674021,10.6067632 C0.782326598,10.6620939 0.450699376,11.0834299 0.506030077,11.5478435 C0.561360778,12.0122571 0.982696791,12.3438844 1.4471104,12.2885536 L1.4471104,12.2885536 Z M9.34858965,12.1304907 C9.35409106,12.129756 9.35409106,12.129756 9.35959333,12.129021 C10.1807278,12.019341 10.7574756,11.2647668 10.6477955,10.4436323 C10.5381155,9.62249789 9.78354128,9.04575011 8.96240683,9.15543014 C8.95693539,9.15616095 8.95693539,9.15616095 8.95146479,9.15689157 C8.13032806,9.26655457 7.55356464,10.0211168 7.66322765,10.8422536 C7.77289065,11.6633903 8.52745292,12.2401537 9.34858965,12.1304907 L9.34858965,12.1304907 Z M17.0066591,11.0493128 C17.0121188,11.0484984 17.0121188,11.0484984 17.0175789,11.0476838 C17.8369369,10.9254384 18.4020584,10.1621181 18.279813,9.34276003 C18.1575677,8.52340201 17.3942473,7.95828052 16.5748893,8.08052587 C16.5694641,8.08133528 16.5694641,8.08133528 16.5640392,8.08214454 C15.7446783,8.20437064 15.1795389,8.96767771 15.301765,9.78703861 C15.4239911,10.6063995 16.1872982,11.1715389 17.0066591,11.0493128 L17.0066591,11.0493128 Z M24.8225082,10.4232459 C24.8297684,10.4220275 24.8297684,10.4220275 24.8370287,10.420809 C25.922252,10.2386672 26.6543441,9.21126476 26.4722023,8.12604147 C26.2900605,7.04081818 25.2626581,6.30872601 24.1774348,6.49086783 C24.1702314,6.4920768 24.1702314,6.4920768 24.1630282,6.49328559 C23.0777996,6.67539597 22.3456777,7.70277717 22.5277881,8.78800574 C22.7098984,9.87323431 23.7372796,10.6053563 24.8225082,10.4232459 L24.8225082,10.4232459 Z M32.4725265,9.05261002 C33.5532108,8.84532993 34.2612448,7.80122849 34.0539647,6.72054419 C33.8466846,5.63985989 32.8025831,4.93182589 31.7218988,5.13910599 C31.714724,5.14048211 31.714724,5.14048211 31.7075489,5.14185807 C30.6268567,5.34909665 29.9187826,6.39317088 30.1260211,7.47386314 C30.3332597,8.5545554 31.3773339,9.26262952 32.4580262,9.05539095 C32.4652764,9.05400057 32.4652764,9.05400057 32.4725265,9.05261002 Z M39.8723866,6.89476879 C39.877909,6.8935242 39.877909,6.8935242 39.883431,6.89227947 C40.6915794,6.71010471 41.1990314,5.90728916 41.0168566,5.09914075 C40.8346818,4.29099233 40.0318663,3.78354042 39.2237179,3.96571517 C39.218279,3.96694116 39.218279,3.96694116 39.2128397,3.96816703 C38.404681,4.15029588 37.8971834,4.9530826 38.0793123,5.76124136 C38.2614411,6.56940012 39.0642279,7.07689764 39.8723866,6.89476879 L39.8723866,6.89476879 Z M47.4276119,5.00828445 C47.4329844,5.00678549 47.4329844,5.00678549 47.4383562,5.00528637 C48.2362896,4.78258973 48.7026111,3.95520561 48.4799145,3.15727221 C48.2572179,2.35933881 47.4298337,1.89301728 46.6319003,2.11571391 C46.6266645,2.1171751 46.6266645,2.1171751 46.6214279,2.11863616 C45.8234736,2.34125773 45.3570742,3.16859798 45.5796958,3.96655233 C45.8023173,4.76450667 46.6296576,5.23090603 47.4276119,5.00828445 L47.4276119,5.00828445 Z M54.419759,2.30643871 C54.8556933,2.13695884 55.0716973,1.6461737 54.9022174,1.21023941 C54.7327376,0.774305114 54.2419524,0.558301127 53.8060181,0.727780997 C53.8032127,0.728871549 53.8032127,0.728871549 53.8004064,0.729962021 C53.3644359,0.89934874 53.148327,1.39008772 53.3177137,1.82605822 C53.4871005,2.26202871 53.9778394,2.47813756 54.4138099,2.30875084 C54.4167849,2.30759485 54.4167849,2.30759485 54.419759,2.30643871 Z" id="Shape"></path>
+                <path d="M1.67760355,20.096503 C1.68306395,20.0958524 1.68306395,20.0958524 1.68852642,20.0952015 C2.51113381,19.9971782 3.09852524,19.2508595 3.00050189,18.4282521 C2.90247854,17.6056447 2.15615986,17.0182533 1.33355246,17.1162767 C1.3281205,17.1169239 1.3281205,17.1169239 1.3226906,17.1175709 C0.500081196,17.2155774 -0.0873255124,17.961884 0.0106809923,18.7844934 C0.108687497,19.6071028 0.854994145,20.1945095 1.67760355,20.096503 L1.67760355,20.096503 Z M9.34858965,19.1274206 C9.35409106,19.1266859 9.35409106,19.1266859 9.35959333,19.1259509 C10.1807278,19.0162709 10.7574756,18.2616967 10.6477955,17.4405622 C10.5381155,16.6194278 9.78354128,16.04268 8.96240683,16.15236 C8.95693539,16.1530908 8.95693539,16.1530908 8.95146479,16.1538215 C8.13032806,16.2634845 7.55356464,17.0180467 7.66322765,17.8391835 C7.77289065,18.6603202 8.52745292,19.2370836 9.34858965,19.1274206 L9.34858965,19.1274206 Z M17.1767435,18.6256231 C17.1839958,18.6245412 17.1839958,18.6245412 17.1912486,18.6234592 C18.27963,18.4610765 19.0303002,17.4471319 18.8679175,16.3587506 C18.7055348,15.2703693 17.6915903,14.519699 16.6032089,14.6820817 C16.5960024,14.6831569 16.5960024,14.6831569 16.5887964,14.6842319 C15.5004112,14.846589 14.7497172,15.8605159 14.9120743,16.948901 C15.0744314,18.0372862 16.0883584,18.7879802 17.1767435,18.6256231 L17.1767435,18.6256231 Z M24.8370287,17.4177379 C25.922252,17.2355961 26.6543441,16.2081937 26.4722023,15.1229704 C26.2900605,14.0377471 25.2626581,13.3056549 24.1774348,13.4877968 C24.1702314,13.4890057 24.1702314,13.4890057 24.1630282,13.4902145 C23.0777996,13.6723249 22.3456777,14.6997061 22.5277881,15.7849347 C22.7098984,16.8701632 23.7372796,17.6022852 24.8225082,17.4201748 C24.8297684,17.4189565 24.8297684,17.4189565 24.8370287,17.4177379 Z M32.4725265,16.061085 C33.5532108,15.853199 34.2612448,14.8060455 34.0539647,13.7222022 C33.8466846,12.6383589 32.8025831,11.9282552 31.7218988,12.1361412 C31.714724,12.1375214 31.714724,12.1375214 31.7075489,12.1389013 C30.6268567,12.3467457 29.9187826,13.3938719 30.1260211,14.4777232 C30.3332597,15.5615745 31.3773339,16.2717185 32.4580262,16.0638741 C32.4652764,16.0624797 32.4652764,16.0624797 32.4725265,16.061085 Z M40.0707225,14.4695476 C40.0780573,14.4678946 40.0780573,14.4678946 40.0853916,14.4662413 C41.158768,14.2242783 41.8327617,13.1579849 41.5907986,12.0846085 C41.3488355,11.011232 40.2825422,10.3372384 39.2091657,10.5792015 C39.2019419,10.5808298 39.2019419,10.5808298 39.1947175,10.582458 C38.1213273,10.8243601 37.447273,11.8906152 37.6891752,12.9640053 C37.9310773,14.0373955 38.9973324,14.7114498 40.0707225,14.4695476 L40.0707225,14.4695476 Z M47.4276119,12.0082845 C47.4329844,12.0067855 47.4329844,12.0067855 47.4383562,12.0052864 C48.2362896,11.7825897 48.7026111,10.9552056 48.4799145,10.1572722 C48.2572179,9.35933881 47.4298337,8.89301728 46.6319003,9.11571391 C46.6266645,9.1171751 46.6266645,9.1171751 46.6214279,9.11863616 C45.8234736,9.34125773 45.3570742,10.168598 45.5796958,10.9665523 C45.8023173,11.7645067 46.6296576,12.230906 47.4276119,12.0082845 L47.4276119,12.0082845 Z M54.8999721,9.57562965 C54.9052414,9.57358217 54.9052414,9.57358217 54.9105092,9.57153441 C55.6826371,9.27135123 56.0652239,8.40207131 55.7650408,7.62994336 C55.4648576,6.85781542 54.5955777,6.4752286 53.8234497,6.77541179 C53.8184808,6.77734338 53.8184808,6.77734338 53.8135101,6.77927482 C53.0413181,7.07929302 52.6585455,7.94849117 52.9585637,8.72068323 C53.2585819,9.4928753 54.12778,9.87564785 54.8999721,9.57562965 L54.8999721,9.57562965 Z" id="Shape"></path>
+                <path d="M1.45327704,26.6978168 C1.54647464,26.6867112 1.63432439,26.660866 1.7147722,26.6228911 C2.03520341,26.4716332 2.23820252,26.1279362 2.1939679,25.7567213 C2.13862768,25.2923089 1.71728488,24.9606903 1.2528724,25.0160305 C1.24980572,25.0163959 1.24980572,25.0163959 1.24674021,25.0167611 C0.782326598,25.0720918 0.450699376,25.4934278 0.506030077,25.9578415 C0.561360778,26.4222551 0.982696791,26.7538823 1.4471104,26.6985516 C1.45019313,26.6981843 1.45019313,26.6981843 1.45327704,26.6978168 Z M9.34858965,26.1274206 C9.35409106,26.1266859 9.35409106,26.1266859 9.35959333,26.1259509 C10.1807278,26.0162709 10.7574756,25.2616967 10.6477955,24.4405622 C10.5381155,23.6194278 9.78354128,23.04268 8.96240683,23.15236 C8.95693539,23.1530908 8.95693539,23.1530908 8.95146479,23.1538215 C8.13032806,23.2634845 7.55356464,24.0180467 7.66322765,24.8391835 C7.77289065,25.6603202 8.52745292,26.2370836 9.34858965,26.1274206 L9.34858965,26.1274206 Z M17.0066591,25.0462427 C17.0121188,25.0454283 17.0121188,25.0454283 17.0175789,25.0446136 C17.8369369,24.9223683 18.4020584,24.1590479 18.279813,23.3396899 C18.1575677,22.5203319 17.3942473,21.9552104 16.5748893,22.0774558 C16.5694641,22.0782652 16.5694641,22.0782652 16.5640392,22.0790744 C15.7446783,22.2013005 15.1795389,22.9646076 15.301765,23.7839685 C15.4239911,24.6033294 16.1872982,25.1684688 17.0066591,25.0462427 L17.0066591,25.0462427 Z M24.8225082,24.4201748 C24.8297684,24.4189565 24.8297684,24.4189565 24.8370287,24.4177379 C25.922252,24.2355961 26.6543441,23.2081937 26.4722023,22.1229704 C26.2900605,21.0377471 25.2626581,20.3056549 24.1774348,20.4877968 C24.1702314,20.4890057 24.1702314,20.4890057 24.1630282,20.4902145 C23.0777996,20.6723249 22.3456777,21.6997061 22.5277881,22.7849347 C22.7098984,23.8701632 23.7372796,24.6022852 24.8225082,24.4201748 L24.8225082,24.4201748 Z M32.4725265,23.0495399 C33.5532108,22.8422598 34.2612448,21.7981584 34.0539647,20.7174741 C33.8466846,19.6367898 32.8025831,18.9287558 31.7218988,19.1360359 C31.714724,19.137412 31.714724,19.137412 31.7075489,19.138788 C30.6268567,19.3460265 29.9187826,20.3901008 30.1260211,21.470793 C30.3332597,22.5514853 31.3773339,23.2595594 32.4580262,23.0523208 C32.4652764,23.0509305 32.4652764,23.0509305 32.4725265,23.0495399 Z M39.8723866,20.8947688 C39.877909,20.8935242 39.877909,20.8935242 39.883431,20.8922795 C40.6915794,20.7101047 41.1990314,19.9072892 41.0168566,19.0991407 C40.8346818,18.2909923 40.0318663,17.7835404 39.2237179,17.9657152 C39.218279,17.9669412 39.218279,17.9669412 39.2128397,17.968167 C38.404681,18.1502959 37.8971834,18.9530826 38.0793123,19.7612414 C38.2614411,20.5694001 39.0642279,21.0768976 39.8723866,20.8947688 L39.8723866,20.8947688 Z M47.4276119,19.0082845 C47.4329844,19.0067855 47.4329844,19.0067855 47.4383562,19.0052864 C48.2362896,18.7825897 48.7026111,17.9552056 48.4799145,17.1572722 C48.2572179,16.3593388 47.4298337,15.8930173 46.6319003,16.1157139 C46.6266645,16.1171751 46.6266645,16.1171751 46.6214279,16.1186362 C45.8234736,16.3412577 45.3570742,17.168598 45.5796958,17.9665523 C45.8023173,18.7645067 46.6296576,19.230906 47.4276119,19.0082845 L47.4276119,19.0082845 Z M54.4138099,15.7087505 C54.4167849,15.7075945 54.4167849,15.7075945 54.419759,15.7064383 C54.8556933,15.5369585 55.0716973,15.0461733 54.9022174,14.610239 C54.7327376,14.1743047 54.2419524,13.9583007 53.8060181,14.1277806 C53.8032127,14.1288712 53.8032127,14.1288712 53.8004064,14.1299616 C53.3644359,14.2993484 53.148327,14.7900873 53.3177137,15.2260578 C53.4871005,15.6620283 53.9778394,15.8781372 54.4138099,15.7087505 L54.4138099,15.7087505 Z" id="Shape"></path>
+            </g>
+            <g id="middle" transform="translate(0.000000, 33.900002)">
+                <path d="M1.4471104,12.2885536 C1.45019313,12.2881864 1.45019313,12.2881864 1.45327704,12.2878189 C1.91768952,12.2324787 2.24930811,11.8111359 2.1939679,11.3467234 C2.13862768,10.8823109 1.71728488,10.5506923 1.2528724,10.6060325 C1.24980572,10.606398 1.24980572,10.606398 1.24674021,10.6067632 C0.782326598,10.6620939 0.450699376,11.0834299 0.506030077,11.5478435 C0.561360778,12.0122571 0.982696791,12.3438844 1.4471104,12.2885536 L1.4471104,12.2885536 Z M9.34858965,12.1304907 C9.35409106,12.129756 9.35409106,12.129756 9.35959333,12.129021 C10.1807278,12.019341 10.7574756,11.2647668 10.6477955,10.4436323 C10.5381155,9.62249789 9.78354128,9.04575011 8.96240683,9.15543014 C8.95693539,9.15616095 8.95693539,9.15616095 8.95146479,9.15689157 C8.13032806,9.26655457 7.55356464,10.0211168 7.66322765,10.8422536 C7.77289065,11.6633903 8.52745292,12.2401537 9.34858965,12.1304907 L9.34858965,12.1304907 Z M17.0066591,11.0493128 C17.0121188,11.0484984 17.0121188,11.0484984 17.0175789,11.0476838 C17.8369369,10.9254384 18.4020584,10.1621181 18.279813,9.34276003 C18.1575677,8.52340201 17.3942473,7.95828052 16.5748893,8.08052587 C16.5694641,8.08133528 16.5694641,8.08133528 16.5640392,8.08214454 C15.7446783,8.20437064 15.1795389,8.96767771 15.301765,9.78703861 C15.4239911,10.6063995 16.1872982,11.1715389 17.0066591,11.0493128 L17.0066591,11.0493128 Z M24.8225082,10.4232459 C24.8297684,10.4220275 24.8297684,10.4220275 24.8370287,10.420809 C25.922252,10.2386672 26.6543441,9.21126476 26.4722023,8.12604147 C26.2900605,7.04081818 25.2626581,6.30872601 24.1774348,6.49086783 C24.1702314,6.4920768 24.1702314,6.4920768 24.1630282,6.49328559 C23.0777996,6.67539597 22.3456777,7.70277717 22.5277881,8.78800574 C22.7098984,9.87323431 23.7372796,10.6053563 24.8225082,10.4232459 L24.8225082,10.4232459 Z M32.4725265,9.05261002 C33.5532108,8.84532993 34.2612448,7.80122849 34.0539647,6.72054419 C33.8466846,5.63985989 32.8025831,4.93182589 31.7218988,5.13910599 C31.714724,5.14048211 31.714724,5.14048211 31.7075489,5.14185807 C30.6268567,5.34909665 29.9187826,6.39317088 30.1260211,7.47386314 C30.3332597,8.5545554 31.3773339,9.26262952 32.4580262,9.05539095 C32.4652764,9.05400057 32.4652764,9.05400057 32.4725265,9.05261002 Z M39.8723866,6.89476879 C39.877909,6.8935242 39.877909,6.8935242 39.883431,6.89227947 C40.6915794,6.71010471 41.1990314,5.90728916 41.0168566,5.09914075 C40.8346818,4.29099233 40.0318663,3.78354042 39.2237179,3.96571517 C39.218279,3.96694116 39.218279,3.96694116 39.2128397,3.96816703 C38.404681,4.15029588 37.8971834,4.9530826 38.0793123,5.76124136 C38.2614411,6.56940012 39.0642279,7.07689764 39.8723866,6.89476879 L39.8723866,6.89476879 Z M47.4276119,5.00828445 C47.4329844,5.00678549 47.4329844,5.00678549 47.4383562,5.00528637 C48.2362896,4.78258973 48.7026111,3.95520561 48.4799145,3.15727221 C48.2572179,2.35933881 47.4298337,1.89301728 46.6319003,2.11571391 C46.6266645,2.1171751 46.6266645,2.1171751 46.6214279,2.11863616 C45.8234736,2.34125773 45.3570742,3.16859798 45.5796958,3.96655233 C45.8023173,4.76450667 46.6296576,5.23090603 47.4276119,5.00828445 L47.4276119,5.00828445 Z M54.419759,2.30643871 C54.8556933,2.13695884 55.0716973,1.6461737 54.9022174,1.21023941 C54.7327376,0.774305114 54.2419524,0.558301127 53.8060181,0.727780997 C53.8032127,0.728871549 53.8032127,0.728871549 53.8004064,0.729962021 C53.3644359,0.89934874 53.148327,1.39008772 53.3177137,1.82605822 C53.4871005,2.26202871 53.9778394,2.47813756 54.4138099,2.30875084 C54.4167849,2.30759485 54.4167849,2.30759485 54.419759,2.30643871 Z" id="Shape"></path>
+                <path d="M1.67760355,20.096503 C1.68306395,20.0958524 1.68306395,20.0958524 1.68852642,20.0952015 C2.51113381,19.9971782 3.09852524,19.2508595 3.00050189,18.4282521 C2.90247854,17.6056447 2.15615986,17.0182533 1.33355246,17.1162767 C1.3281205,17.1169239 1.3281205,17.1169239 1.3226906,17.1175709 C0.500081196,17.2155774 -0.0873255124,17.961884 0.0106809923,18.7844934 C0.108687497,19.6071028 0.854994145,20.1945095 1.67760355,20.096503 L1.67760355,20.096503 Z M9.34858965,19.1274206 C9.35409106,19.1266859 9.35409106,19.1266859 9.35959333,19.1259509 C10.1807278,19.0162709 10.7574756,18.2616967 10.6477955,17.4405622 C10.5381155,16.6194278 9.78354128,16.04268 8.96240683,16.15236 C8.95693539,16.1530908 8.95693539,16.1530908 8.95146479,16.1538215 C8.13032806,16.2634845 7.55356464,17.0180467 7.66322765,17.8391835 C7.77289065,18.6603202 8.52745292,19.2370836 9.34858965,19.1274206 L9.34858965,19.1274206 Z M17.1767435,18.6256231 C17.1839958,18.6245412 17.1839958,18.6245412 17.1912486,18.6234592 C18.27963,18.4610765 19.0303002,17.4471319 18.8679175,16.3587506 C18.7055348,15.2703693 17.6915903,14.519699 16.6032089,14.6820817 C16.5960024,14.6831569 16.5960024,14.6831569 16.5887964,14.6842319 C15.5004112,14.846589 14.7497172,15.8605159 14.9120743,16.948901 C15.0744314,18.0372862 16.0883584,18.7879802 17.1767435,18.6256231 L17.1767435,18.6256231 Z M24.8370287,17.4177379 C25.922252,17.2355961 26.6543441,16.2081937 26.4722023,15.1229704 C26.2900605,14.0377471 25.2626581,13.3056549 24.1774348,13.4877968 C24.1702314,13.4890057 24.1702314,13.4890057 24.1630282,13.4902145 C23.0777996,13.6723249 22.3456777,14.6997061 22.5277881,15.7849347 C22.7098984,16.8701632 23.7372796,17.6022852 24.8225082,17.4201748 C24.8297684,17.4189565 24.8297684,17.4189565 24.8370287,17.4177379 Z M32.4725265,16.061085 C33.5532108,15.853199 34.2612448,14.8060455 34.0539647,13.7222022 C33.8466846,12.6383589 32.8025831,11.9282552 31.7218988,12.1361412 C31.714724,12.1375214 31.714724,12.1375214 31.7075489,12.1389013 C30.6268567,12.3467457 29.9187826,13.3938719 30.1260211,14.4777232 C30.3332597,15.5615745 31.3773339,16.2717185 32.4580262,16.0638741 C32.4652764,16.0624797 32.4652764,16.0624797 32.4725265,16.061085 Z M40.0707225,14.4695476 C40.0780573,14.4678946 40.0780573,14.4678946 40.0853916,14.4662413 C41.158768,14.2242783 41.8327617,13.1579849 41.5907986,12.0846085 C41.3488355,11.011232 40.2825422,10.3372384 39.2091657,10.5792015 C39.2019419,10.5808298 39.2019419,10.5808298 39.1947175,10.582458 C38.1213273,10.8243601 37.447273,11.8906152 37.6891752,12.9640053 C37.9310773,14.0373955 38.9973324,14.7114498 40.0707225,14.4695476 L40.0707225,14.4695476 Z M47.4276119,12.0082845 C47.4329844,12.0067855 47.4329844,12.0067855 47.4383562,12.0052864 C48.2362896,11.7825897 48.7026111,10.9552056 48.4799145,10.1572722 C48.2572179,9.35933881 47.4298337,8.89301728 46.6319003,9.11571391 C46.6266645,9.1171751 46.6266645,9.1171751 46.6214279,9.11863616 C45.8234736,9.34125773 45.3570742,10.168598 45.5796958,10.9665523 C45.8023173,11.7645067 46.6296576,12.230906 47.4276119,12.0082845 L47.4276119,12.0082845 Z M54.8999721,9.57562965 C54.9052414,9.57358217 54.9052414,9.57358217 54.9105092,9.57153441 C55.6826371,9.27135123 56.0652239,8.40207131 55.7650408,7.62994336 C55.4648576,6.85781542 54.5955777,6.4752286 53.8234497,6.77541179 C53.8184808,6.77734338 53.8184808,6.77734338 53.8135101,6.77927482 C53.0413181,7.07929302 52.6585455,7.94849117 52.9585637,8.72068323 C53.2585819,9.4928753 54.12778,9.87564785 54.8999721,9.57562965 L54.8999721,9.57562965 Z" id="Shape"></path>
+                <path d="M1.45327704,26.6978168 C1.54647464,26.6867112 1.63432439,26.660866 1.7147722,26.6228911 C2.03520341,26.4716332 2.23820252,26.1279362 2.1939679,25.7567213 C2.13862768,25.2923089 1.71728488,24.9606903 1.2528724,25.0160305 C1.24980572,25.0163959 1.24980572,25.0163959 1.24674021,25.0167611 C0.782326598,25.0720918 0.450699376,25.4934278 0.506030077,25.9578415 C0.561360778,26.4222551 0.982696791,26.7538823 1.4471104,26.6985516 C1.45019313,26.6981843 1.45019313,26.6981843 1.45327704,26.6978168 Z M9.34858965,26.1274206 C9.35409106,26.1266859 9.35409106,26.1266859 9.35959333,26.1259509 C10.1807278,26.0162709 10.7574756,25.2616967 10.6477955,24.4405622 C10.5381155,23.6194278 9.78354128,23.04268 8.96240683,23.15236 C8.95693539,23.1530908 8.95693539,23.1530908 8.95146479,23.1538215 C8.13032806,23.2634845 7.55356464,24.0180467 7.66322765,24.8391835 C7.77289065,25.6603202 8.52745292,26.2370836 9.34858965,26.1274206 L9.34858965,26.1274206 Z M17.0066591,25.0462427 C17.0121188,25.0454283 17.0121188,25.0454283 17.0175789,25.0446136 C17.8369369,24.9223683 18.4020584,24.1590479 18.279813,23.3396899 C18.1575677,22.5203319 17.3942473,21.9552104 16.5748893,22.0774558 C16.5694641,22.0782652 16.5694641,22.0782652 16.5640392,22.0790744 C15.7446783,22.2013005 15.1795389,22.9646076 15.301765,23.7839685 C15.4239911,24.6033294 16.1872982,25.1684688 17.0066591,25.0462427 L17.0066591,25.0462427 Z M24.8225082,24.4201748 C24.8297684,24.4189565 24.8297684,24.4189565 24.8370287,24.4177379 C25.922252,24.2355961 26.6543441,23.2081937 26.4722023,22.1229704 C26.2900605,21.0377471 25.2626581,20.3056549 24.1774348,20.4877968 C24.1702314,20.4890057 24.1702314,20.4890057 24.1630282,20.4902145 C23.0777996,20.6723249 22.3456777,21.6997061 22.5277881,22.7849347 C22.7098984,23.8701632 23.7372796,24.6022852 24.8225082,24.4201748 L24.8225082,24.4201748 Z M32.4725265,23.0495399 C33.5532108,22.8422598 34.2612448,21.7981584 34.0539647,20.7174741 C33.8466846,19.6367898 32.8025831,18.9287558 31.7218988,19.1360359 C31.714724,19.137412 31.714724,19.137412 31.7075489,19.138788 C30.6268567,19.3460265 29.9187826,20.3901008 30.1260211,21.470793 C30.3332597,22.5514853 31.3773339,23.2595594 32.4580262,23.0523208 C32.4652764,23.0509305 32.4652764,23.0509305 32.4725265,23.0495399 Z M39.8723866,20.8947688 C39.877909,20.8935242 39.877909,20.8935242 39.883431,20.8922795 C40.6915794,20.7101047 41.1990314,19.9072892 41.0168566,19.0991407 C40.8346818,18.2909923 40.0318663,17.7835404 39.2237179,17.9657152 C39.218279,17.9669412 39.218279,17.9669412 39.2128397,17.968167 C38.404681,18.1502959 37.8971834,18.9530826 38.0793123,19.7612414 C38.2614411,20.5694001 39.0642279,21.0768976 39.8723866,20.8947688 L39.8723866,20.8947688 Z M47.4276119,19.0082845 C47.4329844,19.0067855 47.4329844,19.0067855 47.4383562,19.0052864 C48.2362896,18.7825897 48.7026111,17.9552056 48.4799145,17.1572722 C48.2572179,16.3593388 47.4298337,15.8930173 46.6319003,16.1157139 C46.6266645,16.1171751 46.6266645,16.1171751 46.6214279,16.1186362 C45.8234736,16.3412577 45.3570742,17.168598 45.5796958,17.9665523 C45.8023173,18.7645067 46.6296576,19.230906 47.4276119,19.0082845 L47.4276119,19.0082845 Z M54.4138099,15.7087505 C54.4167849,15.7075945 54.4167849,15.7075945 54.419759,15.7064383 C54.8556933,15.5369585 55.0716973,15.0461733 54.9022174,14.610239 C54.7327376,14.1743047 54.2419524,13.9583007 53.8060181,14.1277806 C53.8032127,14.1288712 53.8032127,14.1288712 53.8004064,14.1299616 C53.3644359,14.2993484 53.148327,14.7900873 53.3177137,15.2260578 C53.4871005,15.6620283 53.9778394,15.8781372 54.4138099,15.7087505 L54.4138099,15.7087505 Z" id="Shape"></path>
+            </g>
+            <g id="top">
+                <path d="M1.4471104,12.2885536 C1.45019313,12.2881864 1.45019313,12.2881864 1.45327704,12.2878189 C1.91768952,12.2324787 2.24930811,11.8111359 2.1939679,11.3467234 C2.13862768,10.8823109 1.71728488,10.5506923 1.2528724,10.6060325 C1.24980572,10.606398 1.24980572,10.606398 1.24674021,10.6067632 C0.782326598,10.6620939 0.450699376,11.0834299 0.506030077,11.5478435 C0.561360778,12.0122571 0.982696791,12.3438844 1.4471104,12.2885536 L1.4471104,12.2885536 Z M9.34858965,12.1304907 C9.35409106,12.129756 9.35409106,12.129756 9.35959333,12.129021 C10.1807278,12.019341 10.7574756,11.2647668 10.6477955,10.4436323 C10.5381155,9.62249789 9.78354128,9.04575011 8.96240683,9.15543014 C8.95693539,9.15616095 8.95693539,9.15616095 8.95146479,9.15689157 C8.13032806,9.26655457 7.55356464,10.0211168 7.66322765,10.8422536 C7.77289065,11.6633903 8.52745292,12.2401537 9.34858965,12.1304907 L9.34858965,12.1304907 Z M17.0066591,11.0493128 C17.0121188,11.0484984 17.0121188,11.0484984 17.0175789,11.0476838 C17.8369369,10.9254384 18.4020584,10.1621181 18.279813,9.34276003 C18.1575677,8.52340201 17.3942473,7.95828052 16.5748893,8.08052587 C16.5694641,8.08133528 16.5694641,8.08133528 16.5640392,8.08214454 C15.7446783,8.20437064 15.1795389,8.96767771 15.301765,9.78703861 C15.4239911,10.6063995 16.1872982,11.1715389 17.0066591,11.0493128 L17.0066591,11.0493128 Z M24.8225082,10.4232459 C24.8297684,10.4220275 24.8297684,10.4220275 24.8370287,10.420809 C25.922252,10.2386672 26.6543441,9.21126476 26.4722023,8.12604147 C26.2900605,7.04081818 25.2626581,6.30872601 24.1774348,6.49086783 C24.1702314,6.4920768 24.1702314,6.4920768 24.1630282,6.49328559 C23.0777996,6.67539597 22.3456777,7.70277717 22.5277881,8.78800574 C22.7098984,9.87323431 23.7372796,10.6053563 24.8225082,10.4232459 L24.8225082,10.4232459 Z M32.4725265,9.05261002 C33.5532108,8.84532993 34.2612448,7.80122849 34.0539647,6.72054419 C33.8466846,5.63985989 32.8025831,4.93182589 31.7218988,5.13910599 C31.714724,5.14048211 31.714724,5.14048211 31.7075489,5.14185807 C30.6268567,5.34909665 29.9187826,6.39317088 30.1260211,7.47386314 C30.3332597,8.5545554 31.3773339,9.26262952 32.4580262,9.05539095 C32.4652764,9.05400057 32.4652764,9.05400057 32.4725265,9.05261002 Z M39.8723866,6.89476879 C39.877909,6.8935242 39.877909,6.8935242 39.883431,6.89227947 C40.6915794,6.71010471 41.1990314,5.90728916 41.0168566,5.09914075 C40.8346818,4.29099233 40.0318663,3.78354042 39.2237179,3.96571517 C39.218279,3.96694116 39.218279,3.96694116 39.2128397,3.96816703 C38.404681,4.15029588 37.8971834,4.9530826 38.0793123,5.76124136 C38.2614411,6.56940012 39.0642279,7.07689764 39.8723866,6.89476879 L39.8723866,6.89476879 Z M47.4276119,5.00828445 C47.4329844,5.00678549 47.4329844,5.00678549 47.4383562,5.00528637 C48.2362896,4.78258973 48.7026111,3.95520561 48.4799145,3.15727221 C48.2572179,2.35933881 47.4298337,1.89301728 46.6319003,2.11571391 C46.6266645,2.1171751 46.6266645,2.1171751 46.6214279,2.11863616 C45.8234736,2.34125773 45.3570742,3.16859798 45.5796958,3.96655233 C45.8023173,4.76450667 46.6296576,5.23090603 47.4276119,5.00828445 L47.4276119,5.00828445 Z M54.419759,2.30643871 C54.8556933,2.13695884 55.0716973,1.6461737 54.9022174,1.21023941 C54.7327376,0.774305114 54.2419524,0.558301127 53.8060181,0.727780997 C53.8032127,0.728871549 53.8032127,0.728871549 53.8004064,0.729962021 C53.3644359,0.89934874 53.148327,1.39008772 53.3177137,1.82605822 C53.4871005,2.26202871 53.9778394,2.47813756 54.4138099,2.30875084 C54.4167849,2.30759485 54.4167849,2.30759485 54.419759,2.30643871 Z" id="Shape"></path>
+                <path d="M1.67760355,20.096503 C1.68306395,20.0958524 1.68306395,20.0958524 1.68852642,20.0952015 C2.51113381,19.9971782 3.09852524,19.2508595 3.00050189,18.4282521 C2.90247854,17.6056447 2.15615986,17.0182533 1.33355246,17.1162767 C1.3281205,17.1169239 1.3281205,17.1169239 1.3226906,17.1175709 C0.500081196,17.2155774 -0.0873255124,17.961884 0.0106809923,18.7844934 C0.108687497,19.6071028 0.854994145,20.1945095 1.67760355,20.096503 L1.67760355,20.096503 Z M9.34858965,19.1274206 C9.35409106,19.1266859 9.35409106,19.1266859 9.35959333,19.1259509 C10.1807278,19.0162709 10.7574756,18.2616967 10.6477955,17.4405622 C10.5381155,16.6194278 9.78354128,16.04268 8.96240683,16.15236 C8.95693539,16.1530908 8.95693539,16.1530908 8.95146479,16.1538215 C8.13032806,16.2634845 7.55356464,17.0180467 7.66322765,17.8391835 C7.77289065,18.6603202 8.52745292,19.2370836 9.34858965,19.1274206 L9.34858965,19.1274206 Z M17.1767435,18.6256231 C17.1839958,18.6245412 17.1839958,18.6245412 17.1912486,18.6234592 C18.27963,18.4610765 19.0303002,17.4471319 18.8679175,16.3587506 C18.7055348,15.2703693 17.6915903,14.519699 16.6032089,14.6820817 C16.5960024,14.6831569 16.5960024,14.6831569 16.5887964,14.6842319 C15.5004112,14.846589 14.7497172,15.8605159 14.9120743,16.948901 C15.0744314,18.0372862 16.0883584,18.7879802 17.1767435,18.6256231 L17.1767435,18.6256231 Z M24.8370287,17.4177379 C25.922252,17.2355961 26.6543441,16.2081937 26.4722023,15.1229704 C26.2900605,14.0377471 25.2626581,13.3056549 24.1774348,13.4877968 C24.1702314,13.4890057 24.1702314,13.4890057 24.1630282,13.4902145 C23.0777996,13.6723249 22.3456777,14.6997061 22.5277881,15.7849347 C22.7098984,16.8701632 23.7372796,17.6022852 24.8225082,17.4201748 C24.8297684,17.4189565 24.8297684,17.4189565 24.8370287,17.4177379 Z M32.4725265,16.061085 C33.5532108,15.853199 34.2612448,14.8060455 34.0539647,13.7222022 C33.8466846,12.6383589 32.8025831,11.9282552 31.7218988,12.1361412 C31.714724,12.1375214 31.714724,12.1375214 31.7075489,12.1389013 C30.6268567,12.3467457 29.9187826,13.3938719 30.1260211,14.4777232 C30.3332597,15.5615745 31.3773339,16.2717185 32.4580262,16.0638741 C32.4652764,16.0624797 32.4652764,16.0624797 32.4725265,16.061085 Z M40.0707225,14.4695476 C40.0780573,14.4678946 40.0780573,14.4678946 40.0853916,14.4662413 C41.158768,14.2242783 41.8327617,13.1579849 41.5907986,12.0846085 C41.3488355,11.011232 40.2825422,10.3372384 39.2091657,10.5792015 C39.2019419,10.5808298 39.2019419,10.5808298 39.1947175,10.582458 C38.1213273,10.8243601 37.447273,11.8906152 37.6891752,12.9640053 C37.9310773,14.0373955 38.9973324,14.7114498 40.0707225,14.4695476 L40.0707225,14.4695476 Z M47.4276119,12.0082845 C47.4329844,12.0067855 47.4329844,12.0067855 47.4383562,12.0052864 C48.2362896,11.7825897 48.7026111,10.9552056 48.4799145,10.1572722 C48.2572179,9.35933881 47.4298337,8.89301728 46.6319003,9.11571391 C46.6266645,9.1171751 46.6266645,9.1171751 46.6214279,9.11863616 C45.8234736,9.34125773 45.3570742,10.168598 45.5796958,10.9665523 C45.8023173,11.7645067 46.6296576,12.230906 47.4276119,12.0082845 L47.4276119,12.0082845 Z M54.8999721,9.57562965 C54.9052414,9.57358217 54.9052414,9.57358217 54.9105092,9.57153441 C55.6826371,9.27135123 56.0652239,8.40207131 55.7650408,7.62994336 C55.4648576,6.85781542 54.5955777,6.4752286 53.8234497,6.77541179 C53.8184808,6.77734338 53.8184808,6.77734338 53.8135101,6.77927482 C53.0413181,7.07929302 52.6585455,7.94849117 52.9585637,8.72068323 C53.2585819,9.4928753 54.12778,9.87564785 54.8999721,9.57562965 L54.8999721,9.57562965 Z" id="Shape"></path>
+                <path d="M1.45327704,26.6978168 C1.54647464,26.6867112 1.63432439,26.660866 1.7147722,26.6228911 C2.03520341,26.4716332 2.23820252,26.1279362 2.1939679,25.7567213 C2.13862768,25.2923089 1.71728488,24.9606903 1.2528724,25.0160305 C1.24980572,25.0163959 1.24980572,25.0163959 1.24674021,25.0167611 C0.782326598,25.0720918 0.450699376,25.4934278 0.506030077,25.9578415 C0.561360778,26.4222551 0.982696791,26.7538823 1.4471104,26.6985516 C1.45019313,26.6981843 1.45019313,26.6981843 1.45327704,26.6978168 Z M9.34858965,26.1274206 C9.35409106,26.1266859 9.35409106,26.1266859 9.35959333,26.1259509 C10.1807278,26.0162709 10.7574756,25.2616967 10.6477955,24.4405622 C10.5381155,23.6194278 9.78354128,23.04268 8.96240683,23.15236 C8.95693539,23.1530908 8.95693539,23.1530908 8.95146479,23.1538215 C8.13032806,23.2634845 7.55356464,24.0180467 7.66322765,24.8391835 C7.77289065,25.6603202 8.52745292,26.2370836 9.34858965,26.1274206 L9.34858965,26.1274206 Z M17.0066591,25.0462427 C17.0121188,25.0454283 17.0121188,25.0454283 17.0175789,25.0446136 C17.8369369,24.9223683 18.4020584,24.1590479 18.279813,23.3396899 C18.1575677,22.5203319 17.3942473,21.9552104 16.5748893,22.0774558 C16.5694641,22.0782652 16.5694641,22.0782652 16.5640392,22.0790744 C15.7446783,22.2013005 15.1795389,22.9646076 15.301765,23.7839685 C15.4239911,24.6033294 16.1872982,25.1684688 17.0066591,25.0462427 L17.0066591,25.0462427 Z M24.8225082,24.4201748 C24.8297684,24.4189565 24.8297684,24.4189565 24.8370287,24.4177379 C25.922252,24.2355961 26.6543441,23.2081937 26.4722023,22.1229704 C26.2900605,21.0377471 25.2626581,20.3056549 24.1774348,20.4877968 C24.1702314,20.4890057 24.1702314,20.4890057 24.1630282,20.4902145 C23.0777996,20.6723249 22.3456777,21.6997061 22.5277881,22.7849347 C22.7098984,23.8701632 23.7372796,24.6022852 24.8225082,24.4201748 L24.8225082,24.4201748 Z M32.4725265,23.0495399 C33.5532108,22.8422598 34.2612448,21.7981584 34.0539647,20.7174741 C33.8466846,19.6367898 32.8025831,18.9287558 31.7218988,19.1360359 C31.714724,19.137412 31.714724,19.137412 31.7075489,19.138788 C30.6268567,19.3460265 29.9187826,20.3901008 30.1260211,21.470793 C30.3332597,22.5514853 31.3773339,23.2595594 32.4580262,23.0523208 C32.4652764,23.0509305 32.4652764,23.0509305 32.4725265,23.0495399 Z M39.8723866,20.8947688 C39.877909,20.8935242 39.877909,20.8935242 39.883431,20.8922795 C40.6915794,20.7101047 41.1990314,19.9072892 41.0168566,19.0991407 C40.8346818,18.2909923 40.0318663,17.7835404 39.2237179,17.9657152 C39.218279,17.9669412 39.218279,17.9669412 39.2128397,17.968167 C38.404681,18.1502959 37.8971834,18.9530826 38.0793123,19.7612414 C38.2614411,20.5694001 39.0642279,21.0768976 39.8723866,20.8947688 L39.8723866,20.8947688 Z M47.4276119,19.0082845 C47.4329844,19.0067855 47.4329844,19.0067855 47.4383562,19.0052864 C48.2362896,18.7825897 48.7026111,17.9552056 48.4799145,17.1572722 C48.2572179,16.3593388 47.4298337,15.8930173 46.6319003,16.1157139 C46.6266645,16.1171751 46.6266645,16.1171751 46.6214279,16.1186362 C45.8234736,16.3412577 45.3570742,17.168598 45.5796958,17.9665523 C45.8023173,18.7645067 46.6296576,19.230906 47.4276119,19.0082845 L47.4276119,19.0082845 Z M54.4138099,15.7087505 C54.4167849,15.7075945 54.4167849,15.7075945 54.419759,15.7064383 C54.8556933,15.5369585 55.0716973,15.0461733 54.9022174,14.610239 C54.7327376,14.1743047 54.2419524,13.9583007 53.8060181,14.1277806 C53.8032127,14.1288712 53.8032127,14.1288712 53.8004064,14.1299616 C53.3644359,14.2993484 53.148327,14.7900873 53.3177137,15.2260578 C53.4871005,15.6620283 53.9778394,15.8781372 54.4138099,15.7087505 L54.4138099,15.7087505 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/scaladoc/test-documentations/static-links/_docs/Adoc.md b/scaladoc/test-documentations/static-links/_docs/Adoc.md
new file mode 100644
index 000000000000..5e4078525c24
--- /dev/null
+++ b/scaladoc/test-documentations/static-links/_docs/Adoc.md
@@ -0,0 +1,14 @@
+---
+title: Adoc
+---
+# Header in Adoc
+
+[A link to](dir/html.md)
+[A link to](dir/name...with..dots..md)
+[A link to](dir/name.with.md.and.html.md)
+[A link to](dir/nested.md)
+[A link to](dir/nested.svg)
+
+
+
+And a text!
\ No newline at end of file
diff --git a/scaladoc/test-documentations/static-links/_docs/dir/html.md b/scaladoc/test-documentations/static-links/_docs/dir/html.md
new file mode 100644
index 000000000000..050ef4f92f29
--- /dev/null
+++ b/scaladoc/test-documentations/static-links/_docs/dir/html.md
@@ -0,0 +1,5 @@
+---
+title: html named file
+---
+
+And a text!
\ No newline at end of file
diff --git a/scaladoc/test-documentations/static-links/_docs/dir/index.md b/scaladoc/test-documentations/static-links/_docs/dir/index.md
new file mode 100644
index 000000000000..40309d387819
--- /dev/null
+++ b/scaladoc/test-documentations/static-links/_docs/dir/index.md
@@ -0,0 +1,6 @@
+---
+title: A directory
+---
+# {{  page.title }}
+
+And a text!
\ No newline at end of file
diff --git a/scaladoc/test-documentations/static-links/_docs/dir/name...with..dots..md b/scaladoc/test-documentations/static-links/_docs/dir/name...with..dots..md
new file mode 100644
index 000000000000..b62aa2a6e0db
--- /dev/null
+++ b/scaladoc/test-documentations/static-links/_docs/dir/name...with..dots..md
@@ -0,0 +1,5 @@
+---
+title: Strange name multipke dots in nane
+---
+
+And a text!
\ No newline at end of file
diff --git a/scaladoc/test-documentations/static-links/_docs/dir/name.with.md.and.html.md b/scaladoc/test-documentations/static-links/_docs/dir/name.with.md.and.html.md
new file mode 100644
index 000000000000..2d2d183fb9b5
--- /dev/null
+++ b/scaladoc/test-documentations/static-links/_docs/dir/name.with.md.and.html.md
@@ -0,0 +1,5 @@
+---
+title: name.with.md.and.html
+---
+
+And a text!
\ No newline at end of file
diff --git a/scaladoc/test-documentations/static-links/_docs/dir/nested.md b/scaladoc/test-documentations/static-links/_docs/dir/nested.md
new file mode 100644
index 000000000000..3e0ab5922afe
--- /dev/null
+++ b/scaladoc/test-documentations/static-links/_docs/dir/nested.md
@@ -0,0 +1,6 @@
+---
+title: Nested in a directory
+---
+# {{  page.title }}
+
+And a text!
\ No newline at end of file
diff --git a/scaladoc/test-documentations/static-links/_docs/dir/nested.svg b/scaladoc/test-documentations/static-links/_docs/dir/nested.svg
new file mode 100644
index 000000000000..d3431c5dee3a
--- /dev/null
+++ b/scaladoc/test-documentations/static-links/_docs/dir/nested.svg
@@ -0,0 +1,54 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="72px" height="72px" viewBox="0 0 72 72" version="1.1">
+  <defs>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+    <circle id="path-2" cx="32" cy="32" r="32"/>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"/>
+      <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"/>
+      <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"/>
+      <feOffset dx="0" dy="-1" in="SourceAlpha" result="shadowOffsetInner2"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner2" result="shadowBlurInner2"/>
+      <feComposite in="shadowBlurInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowInnerInner2" type="matrix" result="shadowMatrixInner2"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+        <feMergeNode in="shadowMatrixInner1"/>
+        <feMergeNode in="shadowMatrixInner2"/>
+      </feMerge>
+    </filter>
+    <path id="path-5" d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z"/>
+  </defs>
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Artboard-1" transform="translate(-298.000000, -91.000000)">
+      <g id="BG" transform="translate(302.000000, 91.000000)">
+        <g id="Icon">
+          <mask id="mask-3" fill="white">
+            <use xlink:href="#path-2"/>
+          </mask>
+          <use id="Mask" fill="darkgreen" filter="url(#filter-1)" xlink:href="#path-2"/>
+          <mask id="mask-6" fill="white">
+            <use xlink:href="#path-5"/>
+          </mask>
+          <text id="C" mask="url(#mask-6)" font-family="Open Sans, Helvetica Neueu, Sans-serif" font-size="40" font-weight="normal" fill="#FFFFFF">
+            <tspan x="22" y="44">
+              v
+            </tspan>
+          </text>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/scaladoc/test-documentations/static-links/_docs/index.md b/scaladoc/test-documentations/static-links/_docs/index.md
new file mode 100644
index 000000000000..5cdd253040db
--- /dev/null
+++ b/scaladoc/test-documentations/static-links/_docs/index.md
@@ -0,0 +1,3 @@
+# {{ page.title }} in header
+
+And a text!
\ No newline at end of file
diff --git a/scaladoc/test-source-links/dotty/tools/scaladoc/source-links/RemoteLinksTest.scala b/scaladoc/test-source-links/dotty/tools/scaladoc/source-links/RemoteLinksTest.scala
new file mode 100644
index 000000000000..1e8a1227235d
--- /dev/null
+++ b/scaladoc/test-source-links/dotty/tools/scaladoc/source-links/RemoteLinksTest.scala
@@ -0,0 +1,97 @@
+package dotty.tools.scaladoc
+package sourcelinks
+
+import scala.util.Random
+import scala.io.Source
+import scala.jdk.CollectionConverters._
+import scala.util.matching.Regex
+import dotty.tools.scaladoc.test.BuildInfo
+import java.nio.file.Path
+import java.nio.file.Paths
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
+import util.IO
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class RemoteLinksTest:
+
+  class TimeoutException extends Exception
+
+  val randomGenerator = new Random(125L)
+  // Predef has often problems with positions
+  val mtslAll = membersToSourceLinks(using testDocContext()).filter(_._1 != "Predef")
+
+  @Test
+  def scala213XSourceLink =
+    assertTrue(mtslAll.find((k, _) => k == "AbstractMap").isDefined) // source link to Scala2.13.X stdlib class
+
+  @Test
+  def scala3SourceLink =
+    assertTrue(mtslAll.find((k, _) => k == "PolyFunction").isDefined) // source link to Scala3 stdlib class
+
+  @Test
+  def tastySourceLink =
+    assertTrue(mtslAll.find((k, _) => k == "TastyBuffer").isDefined) // source link to Scala3 tasty class
+
+  @Test
+  def runTest =
+    assertTrue(mtslAll.nonEmpty)
+    val mtsl = randomGenerator.shuffle(mtslAll).take(80) // take 80 random entries
+    val pageToMtsl: Map[String, List[(String, Int)]] =
+      mtsl.groupMap(_._2.split("#L").head)(v => (v._1, v._2.split("#L").last.toInt))
+    pageToMtsl.toSeq.sortBy(_._1).foreach { case (link, members) =>
+      try
+        val doc = getDocumentFromUrl(link)
+        println(s"Checking $link")
+        members.foreach { case (member, expectedLine) =>
+          if !member.startsWith("given_") then // TODO: handle synthetic givens, for now we disable them from testing
+            val toLine = expectedLine + 3
+            val memberToMatch = member.replace("`", "")
+            val lineCorrectlyDefined = (expectedLine until toLine).exists{ line =>
+              val loc = doc.select(s"#LC$line").text
+
+              loc.contains(memberToMatch)
+            }
+
+            assertTrue(s"Expected to find $memberToMatch at $link at lines $expectedLine-$toLine", lineCorrectlyDefined)
+        }
+      catch
+        case e: java.lang.IllegalArgumentException =>
+          report.error(s"Could not open link for $link - invalid URL")(using testContext)
+        case e: TimeoutException =>
+          report.error(s"Tried to open link $link 16 times but with no avail")(using testContext)
+        case e: org.jsoup.HttpStatusException => e.getStatusCode match
+          case 404 => throw AssertionError(s"Page $link does not exists")
+          case n   => report.warning(s"Could not open link for $link, return code $n")(using testContext)
+    }
+    assertNoErrors(testContext.reportedDiagnostics)
+
+  private def getDocumentFromUrl(link: String, retries: Int = 16): Document =
+    try
+      if retries == 0 then throw TimeoutException()
+      Jsoup.connect(link).get
+    catch
+      case e: org.jsoup.HttpStatusException => e.getStatusCode match
+          case 429 =>
+            Thread.sleep(10)
+            getDocumentFromUrl(link, retries - 1)
+          case n =>
+            throw e
+
+  private def membersToSourceLinks(using DocContext): List[(String, String)] =
+    val output = Paths.get("scaladoc", "output", "scala3", "api").toAbsolutePath
+    val mtsl = List.newBuilder[(String, String)]
+    def processFile(path: Path): Unit =
+      val document = Jsoup.parse(IO.read(path))
+      if document.select("span.kind").first.text == "package" then
+        document.select(".documentableElement").forEach { dElem =>
+          if dElem.select("span.kind").first.text != "package" then
+            dElem.select("dt").forEach { elem =>
+              val content = elem.text
+              if content == "Source" then
+                mtsl += dElem.select(".documentableName").first.text -> elem.nextSibling.childNode(0).attr("href")
+            }
+        }
+    IO.foreachFileIn(output, processFile)
+    mtsl.result
diff --git a/scaladoc/test/dotty/tools/scaladoc/BaseHtmlTest.scala b/scaladoc/test/dotty/tools/scaladoc/BaseHtmlTest.scala
index 6bb1f1a20010..6de233aba1db 100644
--- a/scaladoc/test/dotty/tools/scaladoc/BaseHtmlTest.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/BaseHtmlTest.scala
@@ -24,34 +24,34 @@ class BaseHtmlTest:
 
   def withGeneratedDoc(
     pcks: Seq[String],
-    docsRoot: Option[String] = None)(
+    docsRoot: Option[String] = None,
+    customArgs: Option[Scaladoc.Args] = None,
+  )(
     op: ProjectContext ?=> Unit,
-    ): Unit =
-      val dest = Files.createTempDirectory("test-doc")
-      try
-        val args = Scaladoc.Args(
-            name = projectName,
-            tastyFiles = pcks.flatMap(tastyFiles(_)),
-            output = dest.toFile,
-            docsRoot = docsRoot,
-            projectVersion = Some(projectVersion),
-          )
-        Scaladoc.run(args)(using testContext)
-        op(using ProjectContext(dest))
-
-      finally IO.delete(dest.toFile)
-
-  val testDocPath = Paths.get(BuildInfo.testDocumentationRoot)
+  ): Unit =
+    val dest = customArgs.fold(Files.createTempDirectory("test-doc").toFile)(_.output)
+    try
+      val args = customArgs.getOrElse(Scaladoc.Args(
+        name = projectName,
+        tastyFiles = pcks.flatMap(tastyFiles(_)),
+        output = dest,
+        docsRoot = docsRoot,
+        projectVersion = Some(projectVersion)
+      ))
+      Scaladoc.run(args)(using testContext)
+      op(using ProjectContext(args.output.toPath))
 
+    finally IO.delete(dest)
+  end withGeneratedDoc
   class DocumentContext(d: Document, path: Path):
     import collection.JavaConverters._
 
     def niceMsg(msg: String) = s"$msg in $path (body):\n ${d.html()}:\n"
 
     def assertTextsIn(selector: String, expected: String*) =
-      assertFalse(niceMsg("Selector not found"), d.select(selector).isEmpty)
+      assertFalse(niceMsg(s"Selector not found for '$selector'"), d.select(selector).isEmpty)
       val found = d.select(selector).eachText.asScala
-      assertEquals(niceMsg(s"Context does not match for '$selector'"), expected.toList, found.toList)
+      assertEquals(niceMsg(s"Content does not match for '$selector'"), expected.toList, found.toList)
 
     def assertAttr(selector: String, attr: String, expected: String*) =
       assertFalse(niceMsg(s"Selector '$selector' not found"), d.select(selector).isEmpty)
@@ -62,6 +62,9 @@ class BaseHtmlTest:
       val msg = niceMsg(s"Selector '$selector' exisits in document")
       assertTrue(msg, d.select(selector).isEmpty)
 
+    def fileExists =
+      assertTrue(path.toFile.exists)
+
   def withHtmlFile(pathStr: String)(op: DocumentContext => Unit)(using ProjectContext) =
     val path = summon[ProjectContext].path.resolve(pathStr)
     assertTrue(s"File at $path does not exisits!", Files.exists(path))
diff --git a/scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala b/scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala
index 9c10a557b9de..4f4f8c972b4e 100644
--- a/scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala
@@ -25,23 +25,45 @@ class JavadocExternalLocationProviderIntegrationTest extends ExternalLocationPro
 
 class Scaladoc2ExternalLocationProviderIntegrationTest extends ExternalLocationProviderIntegrationTest(
   "externalScaladoc2",
-  List(".*scala.*::scaladoc2::https://www.scala-lang.org/api/current/"),
+  List(
+    ".*scala/.*::scaladoc2::https://www.scala-lang.org/api/current/",
+    ".*externalStubs.*::scaladoc2::https://external.stubs/api/"
+  ),
   List(
     "https://www.scala-lang.org/api/current/scala/util/matching/Regex$$Match.html",
     "https://www.scala-lang.org/api/current/scala/Predef$.html#String",
     "https://www.scala-lang.org/api/current/scala/collection/immutable/Map.html",
     "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#addString(b:StringBuilder,start:String,sep:String,end:String):StringBuilder",
-    "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#mkString(start:String,sep:String,end:String):String"
+    "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#mkString(start:String,sep:String,end:String):String",
+    "https://external.stubs/api/tests/externalStubs/$div$bslash$.html",
+    "https://external.stubs/api/tests/externalStubs/$bslash$div$.html"
   )
 )
 
 class Scaladoc3ExternalLocationProviderIntegrationTest extends ExternalLocationProviderIntegrationTest(
   "externalScaladoc3",
-  List(".*scala.*::scaladoc3::https://dotty.epfl.ch/api/"),
+  List(
+    ".*scala/.*::scaladoc3::https://dotty.epfl.ch/api/",
+    ".*externalStubs.*::scaladoc3::https://external.stubs/api/"
+  ),
   List(
     "https://dotty.epfl.ch/api/scala/collection/immutable/Map.html",
     "https://dotty.epfl.ch/api/scala/Predef$.html#String-0",
-    "https://dotty.epfl.ch/api/scala/util/matching/Regex$$Match.html"
+    "https://dotty.epfl.ch/api/scala/util/matching/Regex$$Match.html",
+    "https://external.stubs/api/tests/externalStubs/$div$bslash$.html",
+    "https://external.stubs/api/tests/externalStubs/$bslash$div$.html"
+  )
+)
+
+class Scaladoc2LegacyExternalLocationProviderIntegrationTest extends LegacyExternalLocationProviderIntegrationTest(
+  "externalScaladoc2",
+  List(".*scala.*#https://www.scala-lang.org/api/current/"),
+  List(
+    "https://www.scala-lang.org/api/current/scala/util/matching/Regex$$Match.html",
+    "https://www.scala-lang.org/api/current/scala/Predef$.html#String",
+    "https://www.scala-lang.org/api/current/scala/collection/immutable/Map.html",
+    "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#addString(b:StringBuilder,start:String,sep:String,end:String):StringBuilder",
+    "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#mkString(start:String,sep:String,end:String):String"
   )
 )
 
@@ -60,7 +82,7 @@ abstract class ExternalLocationProviderIntegrationTest(
   )
 
   override def runTest = afterRendering {
-    val output = summon[DocContext].args.output.toPath.resolve("api")
+    val output = summon[DocContext].args.output.toPath
     val linksBuilder = List.newBuilder[String]
 
     def processFile(path: Path): Unit =
@@ -72,7 +94,6 @@ abstract class ExternalLocationProviderIntegrationTest(
         linksBuilder ++= hrefValues
       }
 
-    println(output)
     IO.foreachFileIn(output, processFile)
     val links = linksBuilder.result
     val errors = expectedLinks.flatMap(expect => Option.when(!links.contains(expect))(expect))
@@ -86,3 +107,16 @@ abstract class ExternalLocationProviderIntegrationTest(
     }
   } :: Nil
 
+abstract class LegacyExternalLocationProviderIntegrationTest(
+  name: String,
+  mappings: Seq[String],
+  expectedLinks: Seq[String]
+) extends ExternalLocationProviderIntegrationTest(name, mappings, expectedLinks):
+
+  override def args = super.args.copy(
+      externalMappings = mappings.flatMap( s =>
+        ExternalDocLink.parseLegacy(s).fold(left => None, right => Some(right)
+      )
+    ).toList
+  )
+
diff --git a/scaladoc/test/dotty/tools/scaladoc/PackageDocumentationTest.scala b/scaladoc/test/dotty/tools/scaladoc/PackageDocumentationTest.scala
new file mode 100644
index 000000000000..ca2ed505b09a
--- /dev/null
+++ b/scaladoc/test/dotty/tools/scaladoc/PackageDocumentationTest.scala
@@ -0,0 +1,23 @@
+package dotty.tools.scaladoc
+
+import org.junit.Assert._
+import com.vladsch.flexmark.util.{ast => mdu, sequence}
+import com.vladsch.flexmark.{ast => mda}
+import collection.JavaConverters._
+
+
+class PackageDocumentationTest extends ScaladocTest("packageobjdocs"):
+  override def runTest: Unit = withModule { module =>
+    module.members.values.find {
+      case member if member.kind == Kind.Package => true
+      case _ => false
+    }.flatMap(_.docs).map(_.body).fold(throw AssertionError("No package found or documentation is not present")) {
+      case node: mdu.ContentNode =>
+        val text = node.getDescendants().asScala.toList.map {
+          case node: mdu.ContentNode => node.getContentChars().toString()
+          case _ => ""
+        }.mkString
+        assertTrue("Documentation for package is incorrect", text.contains("It's a test"))
+      case _ => throw AssertionError("No documentation node found in package docs")
+    }
+  }
diff --git a/scaladoc/test/dotty/tools/scaladoc/RaportingTest.scala b/scaladoc/test/dotty/tools/scaladoc/RaportingTest.scala
deleted file mode 100644
index a73f026f7774..000000000000
--- a/scaladoc/test/dotty/tools/scaladoc/RaportingTest.scala
+++ /dev/null
@@ -1,55 +0,0 @@
-package dotty.tools.scaladoc
-
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.Paths
-import org.junit.Test
-import org.junit.Assert
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Document
-import java.nio.charset.Charset
-import util.IO
-
-class ReportingTest:
-  import Scaladoc.Args
-
-  private def checkReportedDiagnostics(
-    newArgs: Args => Args = identity,
-    ctx: CompilerContext = testContext)(
-    op: ReportedDiagnostics => Unit): Unit =
-
-    val dest = Files.createTempDirectory("test-doc")
-    try
-      // We are using random package
-      Scaladoc.run(newArgs(testArgs(tastyFiles("nested"), dest.toFile)))(using ctx)
-      op(ctx.reportedDiagnostics)
-
-    finally IO.delete(dest.toFile)
-
-  @Test
-  def noMessageForMostCases = checkReportedDiagnostics(){ diag =>
-    assertNoWarning(diag)
-    assertNoErrors(diag)
-    assertNoInfos(diag)
-  }
-
-  @Test
-  def errorsInCaseOfIncompletClasspath =
-    val notTasty = Files.createTempFile("broken", ".notTasty")
-    try
-      Files.write(notTasty, "Random file".getBytes)
-      checkReportedDiagnostics(a => a.copy(tastyFiles = notTasty.toFile +: a.tastyFiles)){ diag =>
-        assertMessagesAbout(diag.errorMsgs)("File extension is not `tasty` or `jar`")
-      }
-    finally Files.delete(notTasty)
-
-  @Test
-  def verbosePrintsDokkaMessage =
-    val ctx = testContext
-    ctx.setSetting(ctx.settings.verbose, true)
-    checkReportedDiagnostics(ctx = ctx){ diag =>
-      assertNoWarning(diag)
-      assertNoErrors(diag)
-
-      assertMessagesAbout(diag.infoMsgs)("generation completed successfully")
-    }
diff --git a/scaladoc/test/dotty/tools/scaladoc/ReportingTest.scala b/scaladoc/test/dotty/tools/scaladoc/ReportingTest.scala
new file mode 100644
index 000000000000..e64eac41ac66
--- /dev/null
+++ b/scaladoc/test/dotty/tools/scaladoc/ReportingTest.scala
@@ -0,0 +1,87 @@
+package dotty.tools.scaladoc
+
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+import org.junit.Test
+import org.junit.Assert
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
+import java.nio.charset.Charset
+import util.IO
+
+class ReportingTest:
+  import Scaladoc.Args
+
+  private def checkReportedDiagnostics(
+    newArgs: Args => Args = identity,
+    ctx: CompilerContext = testContext)(
+    op: ReportedDiagnostics => Unit): Unit =
+
+    val dest = Files.createTempDirectory("test-doc")
+    try
+      // We are using random package
+      Scaladoc.run(newArgs(testArgs(tastyFiles("nested"), dest.toFile)))(using ctx)
+      op(ctx.reportedDiagnostics)
+
+    finally IO.delete(dest.toFile)
+
+  @Test
+  def noMessageForMostCases = checkReportedDiagnostics(){ diag =>
+    assertNoWarning(diag)
+    assertNoErrors(diag)
+    assertNoInfos(diag)
+  }
+
+  @Test
+  def errorsInCaseOfIncompletClasspath =
+    val notTasty = Files.createTempFile("broken", ".notTasty")
+    try
+      Files.write(notTasty, "Random file".getBytes)
+      checkReportedDiagnostics(a => a.copy(tastyFiles = notTasty.toFile +: a.tastyFiles)){ diag =>
+        assertMessagesAbout(diag.errorMsgs)("File extension is not `tasty` or `jar`")
+      }
+    finally Files.delete(notTasty)
+
+  @Test
+  def testSuccessfulDocsGeneration =
+    val ctx = testContext
+    ctx.setSetting(ctx.settings.verbose, true)
+    checkReportedDiagnostics(ctx = ctx){ diag =>
+      assertNoWarning(diag)
+      assertNoErrors(diag)
+
+      assertMessagesAbout(diag.infoMsgs)("generation completed successfully")
+    }
+
+  @Test
+  def testErrorInCaseOfAssetShadowing =
+    val ctx = testContext
+    ctx.setSetting(ctx.settings.verbose, true)
+    val docsRoot = testDocPath.resolve("conflicts-resources").toString
+    checkReportedDiagnostics(_.copy(
+      docsRoot = Some(docsRoot),
+      tastyFiles = tastyFiles("tests", rootPck = "resources")
+    )){ diag =>
+      assertNoWarning(diag)
+      val Seq(msg) = diag.errorMsgs.map(_.toLowerCase)
+      Seq("conflict","api", "resource", "resources/tests/adoc.html").foreach(word =>
+        Assert.assertTrue(s"Error message: $msg should contains $word", msg.contains(word)))
+    }
+
+  @Test
+  def testErrorInCaseOfDocsShadowing =
+    val ctx = testContext
+    ctx.setSetting(ctx.settings.verbose, true)
+    val docsRoot = testDocPath.resolve("conflicts-pages").toString
+    checkReportedDiagnostics(_.copy(
+      docsRoot = Some(docsRoot),
+      tastyFiles = tastyFiles("tests", rootPck = "_docs")
+    )){ diag =>
+      assertNoWarning(diag)
+      val Seq(msg) = diag.errorMsgs.map(_.toLowerCase)
+      Seq("conflict","api", "static", "page", "_docs/tests/adoc.html")
+      .foreach( word =>
+          Assert.assertTrue(s"Error message: $msg should contains $word", msg.contains(word))
+        )
+    }
diff --git a/scaladoc/test/dotty/tools/scaladoc/ScaladocTest.scala b/scaladoc/test/dotty/tools/scaladoc/ScaladocTest.scala
index 8d7574adf13d..ad93d773cf4f 100644
--- a/scaladoc/test/dotty/tools/scaladoc/ScaladocTest.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/ScaladocTest.scala
@@ -16,7 +16,7 @@ abstract class ScaladocTest(val name: String):
     given DocContext = testDocContext(tastyFiles(name))
     op(ScalaModuleProvider.mkModule())
 
-  private def getTempDir() : TemporaryFolder =
+  protected def getTempDir() : TemporaryFolder =
     val folder = new TemporaryFolder()
     folder.create()
     folder
@@ -25,7 +25,8 @@ abstract class ScaladocTest(val name: String):
       name = "test",
       tastyFiles = tastyFiles(name),
       output = getTempDir().getRoot,
-      projectVersion = Some("1.0")
+      projectVersion = Some("1.0"),
+      sourceLinks = List("github://lampepfl/dotty/master")
     )
 
   @Test
diff --git a/scaladoc/test/dotty/tools/scaladoc/SourceLinksTests.scala b/scaladoc/test/dotty/tools/scaladoc/SourceLinksTests.scala
deleted file mode 100644
index f5721fe90c03..000000000000
--- a/scaladoc/test/dotty/tools/scaladoc/SourceLinksTests.scala
+++ /dev/null
@@ -1,158 +0,0 @@
-package dotty.tools.scaladoc
-
-import java.nio.file._
-import org.junit.Assert._
-import org.junit.Test
-
-class SourceLinkTest:
-
-  @Test
-  def testBasicFailures() =
-    def testFailure(template: String, messagePart: String) =
-      val res = SourceLinkParser(None).parse(template)
-      assertTrue(s"Expected failure containing $messagePart: $res", res.left.exists(_.contains(messagePart)))
-
-      val resWithVersion = SourceLinkParser(Some("develop")).parse(template)
-      assertEquals(res, resWithVersion)
-
-    testFailure("ala://ma/kota", "known provider")
-    testFailure("ala=ala=ala://ma/kota", "source link syntax")
-    testFailure("ala=ala=ala", "source link syntax")
-    testFailure("""€{TPL_OWNER}""", "scaladoc")
-
-
-  @Test
-  def testProperTemplates() =
-    def test(template: String) =
-      val res = try SourceLinkParser(Some("develop")).parse(template) catch
-        case e: Exception => throw RuntimeException(s"When testing $template", e)
-      assertTrue(s"Bad template: $template", res.isRight)
-
-
-    Seq(
-      "github://lampepfl/dotty",
-      "gitlab://lampepfl/dotty",
-      "https://github.com/scala/scala/blob/2.13.x€{FILE_PATH_EXT}#€{FILE_LINE}"
-    ).foreach{ template =>
-      test(template)
-    }
-
-
-  @Test
-  def testSourceProviderWithoutRevision() =
-    Seq("github", "gitlab").foreach { provider =>
-      val template = s"$provider://ala/ma"
-      val res = SourceLinkParser(None).parse(template)
-      assertTrue(s"Expected failure containing missing revision: $res", res.left.exists(_.contains("revision")))
-
-      Seq(s"$provider://ala/ma/", s"$provider://ala", s"$provider://ala/ma/develop/on/master").foreach { template =>
-        val res = SourceLinkParser(Some("develop")).parse(template)
-        assertTrue(s"Expected failure syntax info: $res", res.left.exists(_.contains("syntax")))
-      }
-
-    }
-
-class SourceLinksTest:
-  // TODO (https://github.com/lampepfl/scaladoc/issues/240): configure source root
-  val projectRoot = Paths.get("").toAbsolutePath()
-
-  val edit: Operation = "edit" // union types need explicit singletons
-
-  type Args = String | (String, Operation) | (String, Int) | (String, Int, Operation)
-
-  private def testLink(config: Seq[String], revision: Option[String])(cases: (Args, String | None.type)*): Unit =
-    val links = SourceLinks.load(config, revision)(using testContext)
-    cases.foreach { case (args, expected) =>
-      val res = args match
-        case path: String => links.pathTo(projectRoot.resolve(path))
-        case (path: String, line: Int) => links.pathTo(projectRoot.resolve(path), line = Some(line))
-        case (path: String, operation: Operation) => links.pathTo(projectRoot.resolve(path), operation = operation)
-        case (path: String, line: Int, operation: Operation) => links.pathTo(projectRoot.resolve(path), operation = operation, line = Some(line))
-
-      val expectedRes = expected match
-        case s: String => Some(s)
-        case None => None
-
-      assertEquals(s"For path $args", expectedRes, res)
-    }
-
-  @Test
-  def testBasicPaths =
-    testLink(Seq("github://lampepfl/dotty"), Some("develop"))(
-      "project/Build.scala" -> "https://github.com/lampepfl/dotty/blob/develop/project/Build.scala",
-      ("project/Build.scala", 54) -> "https://github.com/lampepfl/dotty/blob/develop/project/Build.scala#L54",
-      ("project/Build.scala", edit) -> "https://github.com/lampepfl/dotty/edit/develop/project/Build.scala",
-      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/develop/project/Build.scala#L54",
-    )
-
-    testLink(Seq("github://lampepfl/dotty/dev"), Some("develop"))(
-      "project/Build.scala" -> "https://github.com/lampepfl/dotty/blob/dev/project/Build.scala",
-      ("project/Build.scala", 54) -> "https://github.com/lampepfl/dotty/blob/dev/project/Build.scala#L54",
-      ("project/Build.scala", edit) -> "https://github.com/lampepfl/dotty/edit/dev/project/Build.scala",
-      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/dev/project/Build.scala#L54",
-    )
-
-    testLink(Seq("github://lampepfl/dotty/dev#src/lib"), None)(
-      "project/Build.scala" -> "https://github.com/lampepfl/dotty/blob/dev/src/lib/project/Build.scala",
-      ("project/Build.scala", 54) -> "https://github.com/lampepfl/dotty/blob/dev/src/lib/project/Build.scala#L54",
-      ("project/Build.scala", edit) -> "https://github.com/lampepfl/dotty/edit/dev/src/lib/project/Build.scala",
-      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/dev/src/lib/project/Build.scala#L54",
-    )
-
-    testLink(Seq("github://lampepfl/dotty/dev#src/lib"), Some("develop"))(
-      "project/Build.scala" -> "https://github.com/lampepfl/dotty/blob/dev/src/lib/project/Build.scala",
-      ("project/Build.scala", 54) -> "https://github.com/lampepfl/dotty/blob/dev/src/lib/project/Build.scala#L54",
-      ("project/Build.scala", edit) -> "https://github.com/lampepfl/dotty/edit/dev/src/lib/project/Build.scala",
-      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/dev/src/lib/project/Build.scala#L54",
-    )
-
-    testLink(Seq("github://lampepfl/dotty#src/lib"), Some("develop"))(
-      "project/Build.scala" -> "https://github.com/lampepfl/dotty/blob/develop/src/lib/project/Build.scala",
-      ("project/Build.scala", 54) -> "https://github.com/lampepfl/dotty/blob/develop/src/lib/project/Build.scala#L54",
-      ("project/Build.scala", edit) -> "https://github.com/lampepfl/dotty/edit/develop/src/lib/project/Build.scala",
-      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/develop/src/lib/project/Build.scala#L54",
-    )
-
-    testLink(Seq("gitlab://lampepfl/dotty"), Some("develop"))(
-      "project/Build.scala" -> "https://gitlab.com/lampepfl/dotty/-/blob/develop/project/Build.scala",
-      ("project/Build.scala", 54) -> "https://gitlab.com/lampepfl/dotty/-/blob/develop/project/Build.scala#L54",
-      ("project/Build.scala", edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/project/Build.scala",
-      ("project/Build.scala", 54, edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/project/Build.scala#L54",
-    )
-
-    testLink(Seq("€{FILE_PATH}#€{FILE_LINE}"), Some("develop"))(
-      "project/Build.scala" -> "/project/Build.scala#",
-      ("project/Build.scala", 54) -> "/project/Build.scala#54",
-      ("project/Build.scala", edit) -> "/project/Build.scala#",
-      ("project/Build.scala", 54, edit) -> "/project/Build.scala#54",
-    )
-
-    testLink(Seq("https://github.com/scala/scala/blob/2.13.x€{FILE_PATH_EXT}#L€{FILE_LINE}"), Some("develop"))(
-      "project/Build.scala" -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L",
-      ("project/Build.scala", 54) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L54",
-      ("project/Build.scala", edit) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L",
-      ("project/Build.scala", 54, edit) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L54",
-    )
-
-  @Test
-  def testBasicPrefixedPaths =
-    testLink(Seq("src=gitlab://lampepfl/dotty"), Some("develop"))(
-      "src/lib/core.scala" -> "https://gitlab.com/lampepfl/dotty/-/blob/develop/lib/core.scala",
-      ("src/lib/core.scala", 33, edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/lib/core.scala#L33",
-      ("src/lib/core.scala", 33, edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/lib/core.scala#L33",
-      "build.sbt" -> None
-    )
-
-
-  @Test
-  def prefixedPaths =
-    testLink(Seq(
-     "src/generated=€{FILE_PATH}#€{FILE_LINE}",
-      "src=gitlab://lampepfl/dotty",
-      "github://lampepfl/dotty"
-      ), Some("develop"))(
-      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/develop/project/Build.scala#L54",
-      ("src/lib/core.scala", 33, edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/lib/core.scala#L33",
-      ("src/generated.scala", 33, edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/generated.scala#L33",
-      ("src/generated/template.scala", 1, edit) -> "/template.scala#1"
-    )
\ No newline at end of file
diff --git a/scaladoc/test/dotty/tools/scaladoc/no-link-warnings/LinkWarningTest.scala b/scaladoc/test/dotty/tools/scaladoc/no-link-warnings/LinkWarningTest.scala
new file mode 100644
index 000000000000..1d140315cc10
--- /dev/null
+++ b/scaladoc/test/dotty/tools/scaladoc/no-link-warnings/LinkWarningTest.scala
@@ -0,0 +1,19 @@
+package dotty.tools.scaladoc
+package noLinkWarnings
+
+import org.junit.Assert.assertEquals
+
+class LinkWarningsTest extends ScaladocTest("noLinkWarnings"):
+
+  override def args = Scaladoc.Args(
+    name = "test",
+    tastyFiles = tastyFiles(name),
+    output = getTempDir().getRoot,
+    projectVersion = Some("1.0")
+  )
+
+  override def runTest = afterRendering {
+    val diagnostics = summon[DocContext].compilerContext.reportedDiagnostics
+    assertEquals("There should be exactly one warning", 1, diagnostics.warningMsgs.size)
+    assertNoErrors(diagnostics)
+  }
diff --git a/scaladoc/test/dotty/tools/scaladoc/no-link-warnings/NoLinkWarningsTest.scala b/scaladoc/test/dotty/tools/scaladoc/no-link-warnings/NoLinkWarningsTest.scala
new file mode 100644
index 000000000000..c24842411781
--- /dev/null
+++ b/scaladoc/test/dotty/tools/scaladoc/no-link-warnings/NoLinkWarningsTest.scala
@@ -0,0 +1,18 @@
+package dotty.tools.scaladoc
+package noLinkWarnings
+
+class NoLinkWarningsTest extends ScaladocTest("noLinkWarnings"):
+
+  override def args = Scaladoc.Args(
+    name = "test",
+    tastyFiles = tastyFiles(name),
+    output = getTempDir().getRoot,
+    projectVersion = Some("1.0"),
+    noLinkWarnings = true
+  )
+
+  override def runTest = afterRendering {
+    val diagnostics = summon[DocContext].compilerContext.reportedDiagnostics
+    assertNoWarning(diagnostics)
+    assertNoErrors(diagnostics)
+  }
diff --git a/scaladoc/test/dotty/tools/scaladoc/signatures/AbstractMemberSignaturesTest.scala b/scaladoc/test/dotty/tools/scaladoc/signatures/AbstractMemberSignaturesTest.scala
index 0d47c9ee6560..eb27987f3f6c 100644
--- a/scaladoc/test/dotty/tools/scaladoc/signatures/AbstractMemberSignaturesTest.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/signatures/AbstractMemberSignaturesTest.scala
@@ -26,14 +26,14 @@ class AbstractMembers extends ScaladocTest("abstractmembersignatures"):
   }
 
   private def signaturesFromDocumentation()(using DocContext): Map[String, List[(String, String)]] =
-    val output = summon[DocContext].args.output.toPath.resolve("api")
+    val output = summon[DocContext].args.output.toPath
     val signatures = List.newBuilder[(String, (String, String))]
     def processFile(path: Path): Unit =
       val document = Jsoup.parse(IO.read(path))
       val content = document.select(".documentableList").forEach { elem =>
         val group = elem.select(".groupHeader").eachText.asScala.mkString("")
         elem.select(".documentableElement").forEach { elem =>
-          val modifiers = elem.select(".header .other-modifiers").eachText.asScala.mkString("")
+          val modifiers = elem.select(".header .modifiers").eachText.asScala.mkString("")
           val name = elem.select(".header .documentableName").eachText.asScala.mkString("")
           signatures += group -> (modifiers, name)
         }
diff --git a/scaladoc/test/dotty/tools/scaladoc/signatures/SignatureTest.scala b/scaladoc/test/dotty/tools/scaladoc/signatures/SignatureTest.scala
index 05fa7164508e..4d8a9f46f21e 100644
--- a/scaladoc/test/dotty/tools/scaladoc/signatures/SignatureTest.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/signatures/SignatureTest.scala
@@ -50,6 +50,7 @@ abstract class SignatureTest(
       (s"Not documented signatures:\n${expectedButNotFound.mkString("\n")}")
     val unexpectedReport = Option.when(!unexpected.isEmpty)
       (s"Unexpectedly documented signatures:\n${unexpected.mkString("\n")}")
+
     val reports = missingReport ++ unexpectedReport
 
     if !reports.isEmpty then
@@ -90,21 +91,21 @@ abstract class SignatureTest(
 
   private def signaturesFromSources(source: Source, kinds: Seq[String]): Seq[SignatureRes] =
     source.getLines.map(_.trim)
-        .filterNot(_.isEmpty)
-        .filterNot(_.startWithAnyOfThese("=",":","{","}", "//"))
-        .toSeq
-        .flatMap {
-          case unexpectedRegex(signature) => findName(signature, kinds).map(Unexpected(_))
-          case expectedRegex(signature) => findName(signature, kinds).map(Expected(_, signature))
-          case signature =>
-            findName(signature, kinds).map(
-              Expected(_, commentRegex.replaceAllIn(signature, "")
-                .compactWhitespaces.reverse.dropWhile(List('{', ':').contains(_)).reverse)
-            )
-        }
+      .filterNot(_.isEmpty)
+      .filterNot(_.startWithAnyOfThese("=",":","{","}", "//"))
+      .toSeq
+      .flatMap {
+        case unexpectedRegex(signature) => findName(signature, kinds).map(Unexpected(_))
+        case expectedRegex(signature) => findName(signature, kinds).map(Expected(_, signature))
+        case signature =>
+          findName(signature, kinds).map(
+            Expected(_, commentRegex.replaceAllIn(signature, "")
+              .compactWhitespaces.reverse.dropWhile(List('{', ':').contains(_)).reverse)
+          )
+      }
 
   private def signaturesFromDocumentation()(using DocContext): Seq[String] =
-    val output = summon[DocContext].args.output.toPath.resolve("api")
+    val output = summon[DocContext].args.output.toPath
     val signatures = List.newBuilder[String]
 
     def processFile(path: Path): Unit = if filterFunc(path) then
@@ -118,7 +119,7 @@ abstract class SignatureTest(
         val sigPrefix = elem.select(".header .signature").textNodes match
           case list if list.size > 0 && list.get(0).getWholeText().startsWith(" ") => " "
           case _ => ""
-        val all = s"$annotations$other $kind $name$sigPrefix$signature".trim()
+        val all = s"$annotations$other $sigPrefix$signature".trim()
         signatures += all
       }
 
@@ -128,6 +129,6 @@ abstract class SignatureTest(
 
 object SignatureTest {
   val classlikeKinds = Seq("class",  "object", "trait", "enum") // TODO add docs for packages
-  val members = Seq("type", "def", "val", "var")
+  val members = Seq("type", "def", "val", "var", "given")
   val all = classlikeKinds ++ members
 }
diff --git a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala
index b07e9d010e55..699aff7b6cf6 100644
--- a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala
@@ -84,3 +84,13 @@ class ImplicitConversionsTest3 extends SignatureTest(
 )
 
 class SpecializedSignature extends SignatureTest("specializedSignature", SignatureTest.all)
+
+class ContextBounds extends SignatureTest("contextBounds", SignatureTest.all)
+
+class FBoundedTypeParameters extends SignatureTest("fboundedTypeParameters", SignatureTest.all)
+
+class Exports extends SignatureTest("exports2", SignatureTest.all, sourceFiles = List("exports1", "exports2"))
+
+class ContextFunctions extends SignatureTest("contextfunctions", SignatureTest.all)
+
+class MarkdownCode extends SignatureTest("markdowncode", SignatureTest.all)
diff --git a/scaladoc/test/dotty/tools/scaladoc/site/IndexPagesTest.scala b/scaladoc/test/dotty/tools/scaladoc/site/IndexPagesTest.scala
new file mode 100644
index 000000000000..dc9e85a3974d
--- /dev/null
+++ b/scaladoc/test/dotty/tools/scaladoc/site/IndexPagesTest.scala
@@ -0,0 +1,39 @@
+package dotty.tools.scaladoc
+package site
+
+import org.junit.Test
+import java.nio.file.Files
+
+class IndexPagesTest extends BaseHtmlTest:
+
+
+  private val baseArgs = Scaladoc.Args(
+    name = projectName,
+    tastyFiles = Seq("site").flatMap(tastyFiles(_)),
+    output = Files.createTempDirectory("test-doc").toFile,
+    projectVersion = Some(projectVersion)
+  )
+
+  @Test
+  def staticSiteAndApiSubdirectory = gridTest(baseArgs.copy(docsRoot = Some(testDocPath.resolve("noIndexes").toAbsolutePath.toString), apiSubdirectory = true))
+
+  @Test
+  def staticSiteAndNOApiSubdirectoryAndReadyToGoIndex = gridTest(baseArgs.copy(docsRoot = Some(testDocPath.resolve("basic").toAbsolutePath.toString), apiSubdirectory = false))
+
+  @Test
+  def staticSiteAndApiSubdirectoryAndReadyToGoIndex = gridTest(baseArgs.copy(docsRoot = Some(testDocPath.resolve("basic").toAbsolutePath.toString), apiSubdirectory = true))
+
+  @Test
+  def staticSiteAndNOApiSubdirectory = gridTest(baseArgs.copy(docsRoot = Some(testDocPath.resolve("noIndexes").toAbsolutePath.toString), apiSubdirectory = false))
+
+  @Test
+  def NOstaticSiteAndApSubdirectory = gridTest(baseArgs.copy(docsRoot = None, apiSubdirectory = true))
+
+  @Test
+  def NOstaticSiteAndNOApiSubdirectory = gridTest(baseArgs.copy(docsRoot = None, apiSubdirectory = false))
+
+  private def gridTest(args: Scaladoc.Args) = withGeneratedDoc(Seq.empty, None, customArgs = Some(args)) {
+    withHtmlFile("index.html") { content  =>
+      content.fileExists
+    }
+  }
diff --git a/scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala b/scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala
index adfbb5113ff2..39bd7acf84f6 100644
--- a/scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala
@@ -9,42 +9,40 @@ class NavigationTest extends BaseHtmlTest:
 
   def testNavMenu(page: String, topLevel: NavMenuTestEntry)(using ProjectContext): Unit =
     withHtmlFile(page){ content  =>
-      def flatten(l: NavMenuTestEntry): Seq[NavMenuTestEntry] = l +: l.nested.flatMap(flatten)
 
       def test(query: String, el: Seq[NavMenuTestEntry]) =
         content.assertTextsIn(query, el.map(_.name):_*)
         content.assertAttr(query,"href", el.map(_.link):_*)
 
-      test("#sideMenu2 a", flatten(topLevel))
-      test("#sideMenu2>div>div>a", topLevel.nested)
-      test("#sideMenu2>div>div>div>a", topLevel.nested.flatMap(_.nested))
-      test("#sideMenu2>div>div>div>div>a", topLevel.nested.flatMap(_.nested.flatMap(_.nested)))
+      test("#sideMenu2>div>span>a", topLevel :: Nil)
+      test("#sideMenu2>div>div>span>a", topLevel.nested)
+      test("#sideMenu2>div>div>div>span>a", topLevel.nested.flatMap(_.nested))
+      test("#sideMenu2>div>div>div>div>span>a", topLevel.nested.flatMap(_.nested.flatMap(_.nested)))
     }
 
 
   @Test
-  def testBasicNavigation() = withGeneratedSite(testDocPath.resolve("basic")){
+  def testBasicNavigation() = withGeneratedSite(testDocPath.resolve("basic")) {
     val topLevelNav = NavMenuTestEntry(projectName, "index.html", Seq(
       NavMenuTestEntry("A directory", "dir/index.html", Seq(
         NavMenuTestEntry("Nested in a directory", "dir/nested.html", Nil)
       )),
       NavMenuTestEntry("Adoc", "Adoc.html", Seq()),
-      NavMenuTestEntry("Basic test", "../index.html", Seq()),
-      NavMenuTestEntry("API", "../api/index.html", Seq(
-        NavMenuTestEntry("tests.site", "../api/tests/site.html", Seq(
-          NavMenuTestEntry("BrokenLink", "../api/tests/site/BrokenLink.html", Nil),
-          NavMenuTestEntry("BrokenLinkWiki", "../api/tests/site/BrokenLinkWiki.html", Nil),
-          NavMenuTestEntry("OtherPackageLink", "../api/tests/site/OtherPackageLink.html", Nil),
-          NavMenuTestEntry("OtherPackageLinkWiki", "../api/tests/site/OtherPackageLinkWiki.html", Nil),
-          NavMenuTestEntry("SamePackageLink", "../api/tests/site/SamePackageLink.html", Nil),
-          NavMenuTestEntry("SamePackageLinkWiki", "../api/tests/site/SamePackageLinkWiki.html", Nil),
-          NavMenuTestEntry("SomeClass", "../api/tests/site/SomeClass.html", Nil)
+      NavMenuTestEntry("API", "../index.html", Seq(
+        NavMenuTestEntry("tests.site", "../tests/site.html", Seq(
+          NavMenuTestEntry("BrokenLink", "../tests/site/BrokenLink.html", Nil),
+          NavMenuTestEntry("BrokenLinkWiki", "../tests/site/BrokenLinkWiki.html", Nil),
+          NavMenuTestEntry("OtherPackageLink", "../tests/site/OtherPackageLink.html", Nil),
+          NavMenuTestEntry("OtherPackageLinkWiki", "../tests/site/OtherPackageLinkWiki.html", Nil),
+          NavMenuTestEntry("SamePackageLink", "../tests/site/SamePackageLink.html", Nil),
+          NavMenuTestEntry("SamePackageLinkWiki", "../tests/site/SamePackageLinkWiki.html", Nil),
+          NavMenuTestEntry("SomeClass", "../tests/site/SomeClass.html", Nil)
         )),
-        NavMenuTestEntry("tests.site.some.other", "../api/tests/site/some/other.html", Seq(
-          NavMenuTestEntry("SomeOtherPackage", "../api/tests/site/some/other/SomeOtherPackage.html", Nil),
+        NavMenuTestEntry("tests.site.some.other", "../tests/site/some/other.html", Seq(
+          NavMenuTestEntry("SomeOtherPackage", "../tests/site/some/other/SomeOtherPackage.html", Nil),
         ))
       )),
     ))
 
-    testNavMenu("docs/Adoc.html", topLevelNav)
-  }
\ No newline at end of file
+    testNavMenu("_docs/Adoc.html", topLevelNav)
+  }
diff --git a/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala b/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala
new file mode 100644
index 000000000000..72fc6515fdee
--- /dev/null
+++ b/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala
@@ -0,0 +1,55 @@
+package dotty.tools.scaladoc
+package site
+
+import org.junit.Test
+import org.junit.Assert._
+
+// TODO add negaitve and more details tests
+class SidebarParserTest:
+
+  private val sidebar =
+    """index: index.md
+      |subsection:
+      |  - title: My title
+      |    page: my-page1.md
+      |  - page: my-page2.md
+      |  - page: my-page3/subsection
+      |  - title: Reference
+      |    subsection:
+      |      - page: my-page3.md
+      |        hidden: true
+      |  - index: my-page4/index.md
+      |    subsection:
+      |      - page: my-page4/my-page4.md
+      |  - title: My subsection
+      |    index: my-page5/index.md
+      |    subsection:
+      |      - page: my-page5/my-page5.md
+      |  - subsection:
+      |      - page: my-page7/my-page7.md
+      |  - index: my-page6/index.md
+      |    subsection:
+      |      - index: my-page6/my-page6/index.md
+      |        subsection:
+      |          - page: my-page6/my-page6/my-page6.md
+      """.stripMargin
+
+  @Test
+  def loadSidebar(): Unit = assertEquals(
+    Sidebar.Category(
+      None,
+      Some("index.md"),
+      List(
+        Sidebar.Page(Some("My title"), "my-page1.md", false),
+        Sidebar.Page(None, "my-page2.md", false),
+        Sidebar.Page(None, "my-page3/subsection", false),
+        Sidebar.Category(Some("Reference"), None, List(Sidebar.Page(None, "my-page3.md", true)), None),
+        Sidebar.Category(None, Some("my-page4/index.md"),  List(Sidebar.Page(None, "my-page4/my-page4.md", false)), None),
+        Sidebar.Category(Some("My subsection"), Some("my-page5/index.md"),  List(Sidebar.Page(None, "my-page5/my-page5.md", false)), None),
+        Sidebar.Category(None, None,  List(Sidebar.Page(None, "my-page7/my-page7.md", false)), None),
+        Sidebar.Category(None, Some("my-page6/index.md"),  List(Sidebar.Category(None, Some("my-page6/my-page6/index.md"),  List(Sidebar.Page(None, "my-page6/my-page6/my-page6.md", false)), None)), None),
+      ),
+      None
+    ),
+    Sidebar.load(sidebar)(using testContext)
+  )
diff --git a/scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala b/scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala
index 972f9d782f0d..1b3c53aba3c0 100644
--- a/scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala
@@ -14,7 +14,7 @@ import dotty.tools.scaladoc.test.BuildInfo
 class SiteGeneratationTest extends BaseHtmlTest:
 
   def indexLinks(content: DocumentContext) =
-    content.assertAttr("p a","href", "docs/index.html")
+    content.assertAttr("p a","href", "_docs/index.html")
 
   def checkFile(
     path: String)(
@@ -32,31 +32,29 @@ class SiteGeneratationTest extends BaseHtmlTest:
       }
 
   def testDocPages()(using ProjectContext) =
-    checkFile("docs/Adoc.html")(title = "Adoc", header = "Header in Adoc", parents = Seq(projectName))
-    checkFile("docs/dir/index.html")(title = "A directory", header = "A directory", parents = Seq(projectName))
-    checkFile("docs/dir/nested.html")(
+    checkFile("_docs/Adoc.html")(title = "Adoc", header = "Header in Adoc", parents = Seq(projectName))
+    checkFile("_docs/dir/index.html")(title = "A directory", header = "A directory", parents = Seq(projectName))
+    checkFile("_docs/dir/nested.html")(
       title = "Nested in a directory", header = "Nested in a directory", parents = Seq(projectName, "A directory"))
 
   def testDocIndexPage()(using ProjectContext) =
-    checkFile("docs/index.html")(title = projectName, header = s"$projectName in header")
-
-  def testMainIndexPage()(using ProjectContext) =
-    checkFile("index.html")(title = "Basic test", header = "Header", parents = Seq(projectName), indexLinks)
+    checkFile("_docs/index.html")(title = projectName, header = s"$projectName in header")
 
   def testApiPages(
     mainTitle: String = "API",
-    parents: Seq[String] = Seq(projectName))(using ProjectContext) =
-      checkFile("api/index.html")(
+    parents: Seq[String] = Seq(projectName),
+    hasToplevelIndexIndex: Boolean = false)(using ProjectContext) =
+      checkFile((if hasToplevelIndexIndex then "api/" else "" )+ "index.html")(
         title = mainTitle,
         header = projectName,
         parents = parents
       )
-      checkFile("api/tests/site.html")(
+      checkFile("tests/site.html")(
         title = "tests.site",
         header = "tests.site",
         parents = parents :+ mainTitle
       )
-      checkFile("api/tests/site/SomeClass.html")(
+      checkFile("tests/site/SomeClass.html")(
         title = "SomeClass",
         header = "SomeClass",
         parents = parents ++ Seq(mainTitle, "tests.site")
@@ -66,16 +64,15 @@ class SiteGeneratationTest extends BaseHtmlTest:
   def basicTest() = withGeneratedSite(testDocPath.resolve("basic")){
     testDocPages()
     testDocIndexPage()
-    testMainIndexPage()
     testApiPages()
 
-    withHtmlFile("docs/Adoc.html"){ content  =>
-        content.assertAttr("p a","href", "../api/tests/site/SomeClass.html")
+    withHtmlFile("_docs/Adoc.html"){ content  =>
+        content.assertAttr("p a","href", "../tests/site/SomeClass.html")
     }
 
-    withHtmlFile("api/tests/site/SomeClass.html"){ content  =>
+    withHtmlFile("tests/site/SomeClass.html"){ content  =>
       content.assertAttr(".breadcrumbs a","href",
-        "../../../docs/index.html", "../../index.html", "../site.html", "SomeClass.html"
+        "../../_docs/index.html", "../../index.html", "../site.html", "SomeClass.html"
       )
     }
   }
@@ -84,16 +81,30 @@ class SiteGeneratationTest extends BaseHtmlTest:
   def noGlobalIndexTest() = withGeneratedSite(testDocPath.resolve("noGlobalIndex")){
     testDocPages()
     testDocIndexPage()
-    testApiPages()
+    testApiPages(hasToplevelIndexIndex = false)
   }
 
   @Test
   def noIndexesTest() = withGeneratedSite(testDocPath.resolve("noIndexes")){
     testDocPages()
-    testApiPages()
+    testApiPages(hasToplevelIndexIndex = false)
   }
 
   @Test
   def noExistingDocs() = withGeneratedSite(testDocPath.resolve("noExisting")){
-    testApiPages(mainTitle = projectName, parents = Nil)
-  }
\ No newline at end of file
+    testApiPages(mainTitle = projectName, parents = Nil, hasToplevelIndexIndex = false)
+  }
+
+  @Test
+  def staticLinking() = withGeneratedSite(testDocPath.resolve("static-links")){
+
+    withHtmlFile("_docs/Adoc.html"){ content  =>
+        content.assertAttr("p a","href",
+        "dir/html.html",
+        "dir/name...with..dots..html",
+        "dir/name.with.md.and.html.html",
+        "dir/nested.html",
+        "dir/nested.svg"
+        )
+    }
+  }
diff --git a/scaladoc/test/dotty/tools/scaladoc/site/StaticSiteContextTest.scala b/scaladoc/test/dotty/tools/scaladoc/site/StaticSiteContextTest.scala
deleted file mode 100644
index 126a6b85d04b..000000000000
--- a/scaladoc/test/dotty/tools/scaladoc/site/StaticSiteContextTest.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-package dotty.tools.scaladoc
-package site
-
-import org.junit.Test
-import org.junit.Assert._
-
-// TODO add negaitve and more details tests
-class SidebarParserTest:
-
-  private val sidebar = """sidebar:
-    - title: Blog
-      url: blog/index.html
-    - title: Reference
-      subsection:
-        - title: Overview
-          url: docs/reference/overview.html
-        - title: New Types
-          subsection:
-            - title: Intersection types
-              url: docs/reference/new-types/intersection-types.html
-            - title: Union types
-              url: docs/reference/new-types/union-types.html
- """
-
-  @Test
-  def loadSidebar(): Unit =
-    assertEquals(2, Sidebar.load(sidebar).size)
diff --git a/scaladoc/test/dotty/tools/scaladoc/site/TemplateFileTests.scala b/scaladoc/test/dotty/tools/scaladoc/site/TemplateFileTests.scala
index d7ff5340f46f..cbb942e36476 100644
--- a/scaladoc/test/dotty/tools/scaladoc/site/TemplateFileTests.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/site/TemplateFileTests.scala
@@ -8,6 +8,7 @@ import org.junit.Test
 import java.nio.file.Files
 
 class TemplateFileTests:
+  given staticSiteContext: StaticSiteContext = testDocContext().staticSiteContext.get
   private def testTemplate(code: String, ext: String = "html")(op: TemplateFile => Unit): Unit =
     val tmpFile = Files.createTempFile("headerTests", s".${ext}").toFile()
     try
@@ -42,7 +43,7 @@ class TemplateFileTests:
         |code""".stripMargin
     ) { t =>
       assertEquals(t.rawCode, "code")
-      assertEquals(t.title, "myTitle")
+      assertEquals(t.title.name, "myTitle")
     }
 
 
diff --git a/scaladoc/test/dotty/tools/scaladoc/snippets/SnippetCompilerTest.scala b/scaladoc/test/dotty/tools/scaladoc/snippets/SnippetCompilerTest.scala
new file mode 100644
index 000000000000..dc0bcefbc1cc
--- /dev/null
+++ b/scaladoc/test/dotty/tools/scaladoc/snippets/SnippetCompilerTest.scala
@@ -0,0 +1,68 @@
+package dotty.tools.scaladoc
+package snippets
+
+import org.junit.Test
+import org.junit.Assert._
+import dotty.tools.io.{AbstractFile, VirtualDirectory}
+
+class SnippetCompilerTest {
+  val compiler = SnippetCompiler(
+    Seq(SnippetCompilerSetting(testContext.settings.usejavacp, true))
+  )
+  def wrapFn: String => WrappedSnippet = (str: String) => WrappedSnippet(
+    str,
+    Some("test"),
+    Nil,
+    Nil,
+    0,
+    0
+  )
+
+  def runTest(str: String) = compiler.compile(wrapFn(str), SnippetCompilerArg(SCFlags.Compile), dotty.tools.dotc.util.SourceFile.virtual("test", str))
+
+  private def assertSuccessfulCompilation(res: SnippetCompilationResult): Unit = res match {
+    case r @ SnippetCompilationResult(_, isSuccessful, _, messages) => assert(isSuccessful, r.messages.map(_.message).mkString("\n"))
+  }
+
+  private def assertFailedCompilation(res: SnippetCompilationResult): Unit = res match {
+    case r @ SnippetCompilationResult(_, isSuccessful, _, messages) => assert(!isSuccessful, r.messages.map(_.message).mkString("\n"))
+  }
+
+  def assertSuccessfulCompilation(str: String): Unit = assertSuccessfulCompilation(runTest(str))
+
+  def assertFailedCompilation(str: String): Unit = assertFailedCompilation(runTest(str))
+
+  def assertMessageLevelPresent(str: String, level: MessageLevel): Unit = assertMessageLevelPresent(runTest(str), level)
+
+  def assertMessageLevelPresent(res: SnippetCompilationResult, level: MessageLevel): Unit = res match {
+    case r @ SnippetCompilationResult(_, isSuccessful, _, messages) => assertTrue(
+      s"Expected message with level: ${level.text}. Got result ${r.messages.map(_.message).mkString("\n")}",
+      messages.exists(_.level == level)
+    )
+  }
+
+
+  @Test
+  def snippetCompilerTest: Unit = {
+    val simpleCorrectSnippet = s"""
+      |class A:
+      |  val b: String = "asd"
+      |""".stripMargin
+
+    val simpleIncorrectSnippet = s"""
+      |class A:
+      |  val b: String
+      |""".stripMargin
+    val warningSnippet = s"""
+      |class A:
+      |  val a: Int = try {
+      |    5
+      |  }
+      |""".stripMargin
+    assertSuccessfulCompilation(simpleCorrectSnippet)
+    assertFailedCompilation(simpleIncorrectSnippet)
+    assertMessageLevelPresent(simpleIncorrectSnippet, MessageLevel.Error)
+    assertMessageLevelPresent(warningSnippet, MessageLevel.Warning)
+    //No test for Info
+  }
+}
\ No newline at end of file
diff --git a/scaladoc/test/dotty/tools/scaladoc/snippets/SnippetsE2eTest.scala b/scaladoc/test/dotty/tools/scaladoc/snippets/SnippetsE2eTest.scala
new file mode 100644
index 000000000000..cf0c52ee2a50
--- /dev/null
+++ b/scaladoc/test/dotty/tools/scaladoc/snippets/SnippetsE2eTest.scala
@@ -0,0 +1,166 @@
+package dotty.tools.scaladoc
+package snippets
+
+import scala.io.Source
+
+import org.junit.Test
+import org.junit.Assert._
+import dotty.tools.io.{AbstractFile, VirtualDirectory}
+import dotty.tools.scaladoc.test.BuildInfo
+import scala.util.matching.Regex
+import dotty.tools.dotc.reporting.{ Diagnostic, StoreReporter }
+
+import com.vladsch.flexmark.util.{ast => mdu, sequence}
+import com.vladsch.flexmark.{ast => mda}
+import com.vladsch.flexmark.formatter.Formatter
+import com.vladsch.flexmark.util.options.MutableDataSet
+import collection.JavaConverters._
+
+import dotty.tools.scaladoc.tasty.comments.markdown.ExtendedFencedCodeBlock
+
+abstract class SnippetsE2eTest(testName: String, flag: SCFlags) extends ScaladocTest(testName):
+
+  import SnippetsE2eTest._
+
+  val source = Source.fromFile(s"${BuildInfo.test_testcasesSourceRoot}/tests/$testName.scala")
+
+  val snippetsCount = source.getLines.filter(_.indexOf("```scala") != -1).size
+
+  def report(str: String) = s"""|In test $testName:
+                                |$str""".stripMargin
+
+  override def args = Scaladoc.Args(
+      name = "test",
+      tastyDirs = BuildInfo.test_testcasesOutputDir.map(java.io.File(_)).toSeq,
+      tastyFiles = tastyFiles(testName),
+      output = getTempDir().getRoot,
+      projectVersion = Some("1.0"),
+      snippetCompiler = List(s"${BuildInfo.test_testcasesSourceRoot}/tests=${flag.flagName}")
+    )
+
+  override def withModule(op: DocContext ?=> Module => Unit) =
+    given DocContext = DocContext(args, testContext.fresh.setReporter(new StoreReporter))
+    op(ScalaModuleProvider.mkModule())
+
+  private def checkWrappedSnippet(ws: WrappedSnippet, si: SnippetInfo) = {
+    assertTrue(
+      report(
+        s"Invalid outer line offset: ${ws.outerLineOffset}. " +
+          s"Expected: ${si.outerOffset.line}\n"
+      ),
+      ws.outerLineOffset == si.outerOffset.line
+    )
+    assertTrue(
+      report(
+        s"Invalid outer column offset: ${ws.outerColumnOffset}. " +
+          s"Expected: ${si.outerOffset.column}\n"
+      ),
+      ws.outerColumnOffset == si.outerOffset.column
+    )
+    assertTrue(
+      report(
+        s"Invalid inner line offset: ${ws.innerLineOffset}. " +
+          s"Expected: ${si.innerOffset.line}\n"
+      ),
+      ws.innerLineOffset == si.innerOffset.line
+    )
+    assertTrue(
+      report(
+        s"Invalid inner column offset: ${ws.innerColumnOffset}. " +
+          s"Expected: ${si.innerOffset.column}\n"
+      ),
+      ws.innerColumnOffset == si.innerOffset.column
+    )
+  }
+
+  private def checkMessages(compilationMessages: Seq[SnippetCompilerMessage], messages: Seq[Message], ws: WrappedSnippet) = {
+    val compilationMessagesWithPos = compilationMessages.collect {
+      case m @ SnippetCompilerMessage(Some(_), _, _) => m
+    }.toList
+    def isSamePosition(msg: Message, cmsg: SnippetCompilerMessage): Boolean =
+      cmsg.level == msg.level && (cmsg.position.get.srcPos.line + 1) == msg.offset.line && cmsg.position.get.srcPos.column == msg.offset.column
+
+    def checkRelativeLines(msg: Message, cmsg: SnippetCompilerMessage): Seq[String] =
+      val pos = cmsg.position.get
+      if !(pos.relativeLine == pos.srcPos.line + ws.innerLineOffset - ws.outerLineOffset + 1) then Seq(
+        s"Expected ${msg.level.text} message at relative line: ${pos.srcPos.line + ws.innerLineOffset - ws.outerLineOffset + 1} " +
+          s"but found at ${pos.relativeLine}"
+      ) else Nil
+
+    val mResult = compilationMessagesWithPos.flatMap { cmsg =>
+      messages
+        .find(msg => isSamePosition(msg, cmsg))
+        .fold(Seq(s"Unexpected compilation message: ${cmsg.message} at relative line: ${cmsg.position.fold(-1)(_.relativeLine)}"))(_ => Seq())
+    }
+
+    val result = mResult ++ messages.flatMap { msg =>
+      compilationMessagesWithPos
+        .find(cmsg => isSamePosition(msg, cmsg))
+        .fold(Seq(s"Expected ${msg.level.text} message at ${msg.offset.line}:${msg.offset.column}.")) { resp =>
+          checkRelativeLines(msg, resp)
+        }
+    }
+
+    if !result.isEmpty then {
+      val errors = result.mkString("\n")
+      val foundMessages = compilationMessages.map(m => s"${m.level} at ${m.position.get.srcPos.line}:${m.position.get.srcPos.column}").mkString("\n")
+      throw AssertionError(Seq("Errors:", errors,"Found:", foundMessages).mkString("\n", "\n", "\n"))
+    }
+  }
+
+  def moduleTestingFunc: DocContext ?=> Module => Unit = (m: Module) => {
+    val snippets = m.members.values
+      .flatMap(_.docs)
+      .map(_.body)
+      .collect { case n: mdu.Node => n }
+      .flatMap(_.getDescendants.asScala)
+      .collect { case en: ExtendedFencedCodeBlock => en }
+
+    assertTrue(report(s"Expected $snippetsCount snippets but found ${snippets.size}"), snippets.size == snippetsCount)
+
+    snippets.foreach { snippet =>
+      val configStrs = (snippet.getPrevious() match {
+        case c: mdu.ContentNode =>
+          c.getContentChars.toString.split("\n").map(_.trim)
+        case _ => throw AssertionError(s"Not found info for snippet ${snippet.codeBlock.getContentChars.toString}")
+      }).toList
+      val info = SnippetInfo(configStrs.head)
+      val messages = configStrs.tail.map(Message.apply)
+      val compilationResult = snippet.compilationResult match {
+        case Some(res) => res
+        case None => throw AssertionError(s"Snippet validation failed:\n${snippet.codeBlock.getContentChars.toString}")
+      }
+      val wrappedSnippet = compilationResult.wrappedSnippet
+      checkWrappedSnippet(wrappedSnippet, info)
+      checkMessages(compilationResult.messages, messages, wrappedSnippet)
+    }
+  }
+
+  def runTest = {
+    org.junit.Assume.assumeTrue("Running on Windows", java.io.File.separatorChar == '/')
+    withModule(moduleTestingFunc)
+  }
+
+object SnippetsE2eTest:
+  case class Offset(line: Int, column: Int)
+  case class SnippetInfo(outerOffset: Offset, innerOffset: Offset)
+  case class Message(level: MessageLevel, offset: Offset)
+  object SnippetInfo:
+    def apply(str: String): SnippetInfo = str match {
+      case snippetInfoRegex(ol, oc, il, ic) => SnippetInfo(
+        Offset(ol.toInt, oc.toInt),
+        Offset(il.toInt, ic.toInt)
+      )
+    }
+
+  object Message:
+    def apply(str: String): Message = str match {
+      case errorRegex(ln, cl) => Message(MessageLevel.Error, Offset(ln.toInt, cl.toInt))
+      case warningRegex(ln, cl) => Message(MessageLevel.Warning, Offset(ln.toInt, cl.toInt))
+    }
+  val snippetInfoRegex = (raw"SNIPPET\(" +
+    raw"OUTERLINEOFFSET:(\d+),OUTERCOLUMNOFFSET:(\d+)," +
+    raw"INNERLINEOFFSET:(\d+),INNERCOLUMNOFFSET:(\d+)\)").r
+
+  val warningRegex = raw"WARNING\(LINE:(\d+),COLUMN:(\d+)\)".r
+  val errorRegex = raw"ERROR\(LINE:(\d+),COLUMN:(\d+)\)".r
\ No newline at end of file
diff --git a/scaladoc/test/dotty/tools/scaladoc/snippets/SnippetsE2eTestcases.scala b/scaladoc/test/dotty/tools/scaladoc/snippets/SnippetsE2eTestcases.scala
new file mode 100644
index 000000000000..7ec71600c68a
--- /dev/null
+++ b/scaladoc/test/dotty/tools/scaladoc/snippets/SnippetsE2eTestcases.scala
@@ -0,0 +1,10 @@
+package dotty.tools.scaladoc
+package snippets
+
+class SnippetE2eTestcase1 extends SnippetsE2eTest("snippetTestcase1", SCFlags.Compile)
+
+
+class SnippetE2eTestcase2 extends SnippetsE2eTest("snippetTestcase2", SCFlags.Compile)
+
+
+class SnippetE2eTestcase3 extends SnippetsE2eTest("snippetTestcase3", SCFlags.Compile)
diff --git a/scaladoc/test/dotty/tools/scaladoc/source-links/SourceLinksTest.scala b/scaladoc/test/dotty/tools/scaladoc/source-links/SourceLinksTest.scala
new file mode 100644
index 000000000000..1cc4d9c7a7ab
--- /dev/null
+++ b/scaladoc/test/dotty/tools/scaladoc/source-links/SourceLinksTest.scala
@@ -0,0 +1,168 @@
+package dotty.tools.scaladoc
+package sourcelinks
+
+import java.nio.file._
+import org.junit.Assert._
+import org.junit.Test
+
+class SourceLinkTest:
+
+  @Test
+  def testBasicFailures() =
+    def testFailure(template: String, messagePart: String) =
+      val res = SourceLinkParser(None).parse(template)
+      assertTrue(s"Expected failure containing $messagePart: $res", res.left.exists(_.contains(messagePart)))
+
+      val resWithVersion = SourceLinkParser(Some("develop")).parse(template)
+      assertEquals(res, resWithVersion)
+
+    testFailure("ala://ma/kota", "known provider")
+    testFailure("ala=ala=ala://ma/kota", "source link syntax")
+    testFailure("ala=ala=ala", "source link syntax")
+    testFailure("""€{TPL_OWNER}""", "scaladoc")
+
+
+  @Test
+  def testProperTemplates() =
+    def test(template: String) =
+      val res = try SourceLinkParser(Some("develop")).parse(template) catch
+        case e: Exception => throw RuntimeException(s"When testing $template", e)
+      assertTrue(s"Bad template: $template", res.isRight)
+
+
+    Seq(
+      "github://lampepfl/dotty",
+      "gitlab://lampepfl/dotty",
+      "github://lampepfl/dotty/branch/withslash",
+      "https://github.com/scala/scala/blob/2.13.x€{FILE_PATH_EXT}#€{FILE_LINE}"
+    ).foreach{ template =>
+      test(template)
+    }
+
+
+  @Test
+  def testSourceProviderWithoutRevision() =
+    Seq("github", "gitlab").foreach { provider =>
+      val template = s"$provider://ala/ma"
+      val res = SourceLinkParser(None).parse(template)
+      assertTrue(s"Expected failure containing missing revision: $res", res.left.exists(_.contains("revision")))
+    }
+
+class SourceLinksTest:
+  // TODO (https://github.com/lampepfl/scaladoc/issues/240): configure source root
+  val projectRoot = Paths.get("").toAbsolutePath()
+
+  val edit: Operation = "edit" // union types need explicit singletons
+
+  type Args = String | (String, Operation) | (String, Int) | (String, Int, Operation)
+
+  private def testLink(config: Seq[String], revision: Option[String])(cases: (Args, String | None.type)*): Unit =
+    val links = SourceLinks.load(config, revision)(using testContext)
+    cases.foreach { case (args, expected) =>
+      val res = args match
+        case path: String => links.pathTo(projectRoot.resolve(path))
+        case (path: String, line: Int) => links.pathTo(projectRoot.resolve(path), line = Some(line))
+        case (path: String, operation: Operation) => links.pathTo(projectRoot.resolve(path), operation = operation)
+        case (path: String, line: Int, operation: Operation) => links.pathTo(projectRoot.resolve(path), operation = operation, line = Some(line))
+
+      val expectedRes = expected match
+        case s: String => Some(s)
+        case None => None
+
+      assertEquals(s"For path $args", expectedRes, res)
+    }
+
+  @Test
+  def testBasicPaths =
+    testLink(Seq("github://lampepfl/dotty"), Some("develop"))(
+      "project/Build.scala" -> "https://github.com/lampepfl/dotty/blob/develop/project/Build.scala",
+      ("project/Build.scala", 54) -> "https://github.com/lampepfl/dotty/blob/develop/project/Build.scala#L54",
+      ("project/Build.scala", edit) -> "https://github.com/lampepfl/dotty/edit/develop/project/Build.scala",
+      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/develop/project/Build.scala#L54",
+    )
+
+    testLink(Seq("github://lampepfl/dotty/dev"), Some("develop"))(
+      "project/Build.scala" -> "https://github.com/lampepfl/dotty/blob/dev/project/Build.scala",
+      ("project/Build.scala", 54) -> "https://github.com/lampepfl/dotty/blob/dev/project/Build.scala#L54",
+      ("project/Build.scala", edit) -> "https://github.com/lampepfl/dotty/edit/dev/project/Build.scala",
+      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/dev/project/Build.scala#L54",
+    )
+
+    testLink(Seq("github://lampepfl/dotty/dev#src/lib"), None)(
+      "project/Build.scala" -> "https://github.com/lampepfl/dotty/blob/dev/src/lib/project/Build.scala",
+      ("project/Build.scala", 54) -> "https://github.com/lampepfl/dotty/blob/dev/src/lib/project/Build.scala#L54",
+      ("project/Build.scala", edit) -> "https://github.com/lampepfl/dotty/edit/dev/src/lib/project/Build.scala",
+      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/dev/src/lib/project/Build.scala#L54",
+    )
+
+    testLink(Seq("github://lampepfl/dotty/dev#src/lib"), Some("develop"))(
+      "project/Build.scala" -> "https://github.com/lampepfl/dotty/blob/dev/src/lib/project/Build.scala",
+      ("project/Build.scala", 54) -> "https://github.com/lampepfl/dotty/blob/dev/src/lib/project/Build.scala#L54",
+      ("project/Build.scala", edit) -> "https://github.com/lampepfl/dotty/edit/dev/src/lib/project/Build.scala",
+      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/dev/src/lib/project/Build.scala#L54",
+    )
+
+    testLink(Seq("github://lampepfl/dotty#src/lib"), Some("develop"))(
+      "project/Build.scala" -> "https://github.com/lampepfl/dotty/blob/develop/src/lib/project/Build.scala",
+      ("project/Build.scala", 54) -> "https://github.com/lampepfl/dotty/blob/develop/src/lib/project/Build.scala#L54",
+      ("project/Build.scala", edit) -> "https://github.com/lampepfl/dotty/edit/develop/src/lib/project/Build.scala",
+      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/develop/src/lib/project/Build.scala#L54",
+    )
+
+    testLink(Seq("gitlab://lampepfl/dotty"), Some("develop"))(
+      "project/Build.scala" -> "https://gitlab.com/lampepfl/dotty/-/blob/develop/project/Build.scala",
+      ("project/Build.scala", 54) -> "https://gitlab.com/lampepfl/dotty/-/blob/develop/project/Build.scala#L54",
+      ("project/Build.scala", edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/project/Build.scala",
+      ("project/Build.scala", 54, edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/project/Build.scala#L54",
+    )
+
+    testLink(Seq("€{FILE_PATH}.scala#€{FILE_LINE}"), Some("develop"))(
+      "project/Build.scala" -> "/project/Build.scala#",
+      ("project/Build.scala", 54) -> "/project/Build.scala#54",
+      ("project/Build.scala", edit) -> "/project/Build.scala#",
+      ("project/Build.scala", 54, edit) -> "/project/Build.scala#54",
+    )
+
+    testLink(Seq("https://github.com/scala/scala/blob/2.13.x€{FILE_PATH_EXT}#L€{FILE_LINE}"), Some("develop"))(
+      "project/Build.scala" -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L",
+      ("project/Build.scala", 54) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L54",
+      ("project/Build.scala", edit) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L",
+      ("project/Build.scala", 54, edit) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L54",
+    )
+
+    testLink(Seq("https://github.com/scala/scala/blob/2.13.x€{FILE_PATH}.scala#L€{FILE_LINE}"), Some("develop"))(
+      "project/Build.scala" -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L",
+      ("project/Build.scala", 54) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L54",
+      ("project/Build.scala", edit) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L",
+      ("project/Build.scala", 54, edit) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L54",
+    )
+
+    testLink(Seq("github://lampepfl/dotty/branch/withslash#src/lib"), None)(
+      "project/Build.scala" -> "https://github.com/lampepfl/dotty/blob/branch/withslash/src/lib/project/Build.scala",
+      ("project/Build.scala", 54) -> "https://github.com/lampepfl/dotty/blob/branch/withslash/src/lib/project/Build.scala#L54",
+      ("project/Build.scala", edit) -> "https://github.com/lampepfl/dotty/edit/branch/withslash/src/lib/project/Build.scala",
+      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/branch/withslash/src/lib/project/Build.scala#L54",
+    )
+
+  @Test
+  def testBasicPrefixedPaths =
+    testLink(Seq("src=gitlab://lampepfl/dotty"), Some("develop"))(
+      "src/lib/core.scala" -> "https://gitlab.com/lampepfl/dotty/-/blob/develop/lib/core.scala",
+      ("src/lib/core.scala", 33, edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/lib/core.scala#L33",
+      ("src/lib/core.scala", 33, edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/lib/core.scala#L33",
+      "build.sbt" -> None
+    )
+
+
+  @Test
+  def prefixedPaths =
+    testLink(Seq(
+     "src/generated=€{FILE_PATH_EXT}#€{FILE_LINE}",
+      "src=gitlab://lampepfl/dotty",
+      "github://lampepfl/dotty"
+      ), Some("develop"))(
+      ("project/Build.scala", 54, edit) -> "https://github.com/lampepfl/dotty/edit/develop/project/Build.scala#L54",
+      ("src/lib/core.scala", 33, edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/lib/core.scala#L33",
+      ("src/generated.scala", 33, edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/generated.scala#L33",
+      ("src/generated/template.scala", 1, edit) -> "/template.scala#1"
+    )
diff --git a/scaladoc/test/dotty/tools/scaladoc/tasty/comments/CommentExpanderTests.scala b/scaladoc/test/dotty/tools/scaladoc/tasty/comments/CommentExpanderTests.scala
index 63bb4fb21f03..b27642ae3dc4 100644
--- a/scaladoc/test/dotty/tools/scaladoc/tasty/comments/CommentExpanderTests.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/tasty/comments/CommentExpanderTests.scala
@@ -1,5 +1,6 @@
 package dotty.tools.scaladoc
-package tasty.comments
+package tasty
+package comments
 
 import scala.quoted._
 
@@ -9,25 +10,25 @@ import dotty.tools.scaladoc.tasty.util._
 import dotty.tools.scaladoc.tasty.TastyParser
 
 class CommentExpanderTests {
-  def check(using quoted.Quotes)(): Unit =
+  def check(using Quotes)(): Unit =
     assertCommentEquals(
-      qr.Symbol.requiredClass("tests.B").memberMethod("otherMethod").head,
+      reflect.Symbol.requiredClass("tests.B").methodMember("otherMethod").head,
       "/** This is my foo: Bar, actually. */",
     )
     assertCommentEquals(
-      qr.Symbol.requiredClass("tests.C"),
+      reflect.Symbol.requiredClass("tests.C"),
       "/** This is foo: Foo expanded. */",
     )
     assertCommentEquals(
-      qr.Symbol.requiredModule("tests.O").memberMethod("method").head,
+      reflect.Symbol.requiredModule("tests.O").methodMember("method").head,
       "/** This is foo: O's foo. */",
     )
 
 
   def assertCommentEquals(
-    using quoted.Quotes
+    using Quotes
   )(
-    rsym: quotes.reflect.Symbol,
+    rsym: reflect.Symbol,
     str: String
   ): Unit =
     import dotty.tools.dotc
@@ -41,13 +42,12 @@ class CommentExpanderTests {
     import scala.tasty.inspector.OldTastyInspector
     class Inspector extends OldTastyInspector:
 
-      def processCompilationUnit(using quoted.Quotes)(root: quotes.reflect.Tree): Unit = ()
+      def processCompilationUnit(using Quotes)(root: reflect.Tree): Unit = ()
 
-      override def postProcess(using quoted.Quotes): Unit =
+      override def postProcess(using Quotes): Unit =
         check()
 
     Inspector().inspectTastyFiles(TestUtils.listOurClasses())
   }
 
-  private def qr(using quoted.Quotes): quotes.reflect.type = quotes.reflect
 }
diff --git a/scaladoc/test/dotty/tools/scaladoc/tasty/comments/IntegrationTest.scala b/scaladoc/test/dotty/tools/scaladoc/tasty/comments/IntegrationTest.scala
index 0a5329cf6333..71f4b42f3320 100644
--- a/scaladoc/test/dotty/tools/scaladoc/tasty/comments/IntegrationTest.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/tasty/comments/IntegrationTest.scala
@@ -18,11 +18,11 @@ abstract class BaseIntegrationTest(pck: String) extends BaseHtmlTest:
         "", "" // each represent a link
         )
 
-    withHtmlFile(s"api/tests/$pck/BrokenLinks.html")(checkUnresolved)
+    withHtmlFile(s"tests/$pck/BrokenLinks.html")(checkUnresolved)
     val otherPackagePath = "../commonlinks/SomeOtherPackage.html"
-    withHtmlFile(s"api/tests/$pck/OtherPackageLink.html")(checkDocLinks(otherPackagePath))
+    withHtmlFile(s"tests/$pck/OtherPackageLink.html")(checkDocLinks(otherPackagePath))
     // OtherPackageMembers - does not work, TODO?
-    withHtmlFile(s"api/tests/$pck/SamePackageLink.html")(checkDocLinks("SomeClass.html"))
+    withHtmlFile(s"tests/$pck/SamePackageLink.html")(checkDocLinks("SomeClass.html"))
     // SamePackageMembers - does not work, TODO?
   }
 
diff --git a/scaladoc/test/dotty/tools/scaladoc/tasty/comments/MemberLookupTests.scala b/scaladoc/test/dotty/tools/scaladoc/tasty/comments/MemberLookupTests.scala
index dafd4003fa6f..0b9b88fa5bb8 100644
--- a/scaladoc/test/dotty/tools/scaladoc/tasty/comments/MemberLookupTests.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/tasty/comments/MemberLookupTests.scala
@@ -13,6 +13,8 @@ class LookupTestCases[Q <: Quotes](val q: Quotes) {
 
   def testAll(): Unit = {
     testOwnerlessLookup()
+    testOwnerlessLookupOfInherited()
+    testOwnerlessLookupOfClassWithinPackageWithPackageObject()
     testOwnedLookup()
     testStrictMemberLookup()
   }
@@ -38,12 +40,15 @@ class LookupTestCases[Q <: Quotes](val q: Quotes) {
 
       "java.util.AbstractCollection" -> cls("java.util.AbstractCollection"),
       "java.lang.String" -> cls("java.lang.String"),
+      "java.util.Formatter" -> cls("java.util.Formatter"),
+      "java.io.Flushable" -> cls("java.io.Flushable"),
+      "java.util.List" -> cls("java.util.List"),
 
       "tests.lookupInheritedMembers.pack1.A.x" ->
         cls("tests.lookupInheritedMembers.pack1.A").fun("x"),
 
       "tests.lookupInheritedMembers.pack2.B.x" ->
-        cls("tests.lookupInheritedMembers.pack1.A").fun("x"),
+        cls("tests.lookupInheritedMembers.pack2.B").fun("x"),
     )
 
     cases.foreach { case (query, sym) =>
@@ -59,6 +64,49 @@ class LookupTestCases[Q <: Quotes](val q: Quotes) {
     assertSame(query, target, lookedUp)
   }
 
+  /**
+   * We cannot test for cls().fun() beucase it returns parent fun symbol from tasty. Hence we will look for member (val, def, type) but compare its owner to just cls()
+   */
+  def testOwnerlessLookupOfInherited(): Unit = {
+    val cases = List[(String, Sym)](
+      "tests.lookupInheritedMembers.pack2.B.x" ->
+        cls("tests.lookupInheritedMembers.pack2.B"),
+
+      "tests.lookupInheritedMembers.pack2.B.y" ->
+        cls("tests.lookupInheritedMembers.pack2.B"),
+
+      "tests.lookupInheritedMembers.pack2.B.MyType" ->
+        cls("tests.lookupInheritedMembers.pack2.B"),
+    )
+
+    cases.foreach { case (query, sym) =>
+      val target = sym.symbol
+      val lookupRes = MemberLookup.lookupOpt(parseQuery(query), None)
+      assertTrue(s"Couldn't look up: $query", lookupRes.nonEmpty)
+      val Some((_ , _, Some(owner))) = lookupRes
+      assertSame(query, target, owner)
+    }
+  }
+
+  /**
+   * Classes should not have owner of package object
+   */
+  def testOwnerlessLookupOfClassWithinPackageWithPackageObject(): Unit = {
+    val cases = List[(String, Sym)](
+      "<:<" ->
+        cls("scala.<:<"),
+    )
+
+    cases.foreach { case (query, sym) =>
+      val target = sym.symbol
+      val lookupRes = MemberLookup.lookupOpt(parseQuery(query), Some(cls("scala.=:=").symbol))
+      assertTrue(s"Couldn't look up: $query", lookupRes.nonEmpty)
+      println(lookupRes)
+      val Some((_ , _, owner)) = lookupRes
+      assertSame(query, None, owner)
+    }
+  }
+
   def testOwnedLookup(): Unit = {
     val cases = List[((Sym, String), Sym)](
       cls("tests.A") -> "tests.Methods.simple" -> cls("tests.Methods").fun("simple"),
@@ -138,9 +186,9 @@ class LookupTestCases[Q <: Quotes](val q: Quotes) {
         if s.flags.is(q.reflect.Flags.Module) then s.moduleClass else s
       Sym(hackResolveModule(symbol.declaredField(name)))
     def fun(name: String) =
-      val List(sym) = symbol.memberMethod(name)
+      val List(sym) = symbol.methodMember(name)
       Sym(sym)
-    def tpe(name: String) = Sym(symbol.memberType(name))
+    def tpe(name: String) = Sym(symbol.typeMember(name))
   }
 
   def cls(fqn: String) = Sym(q.reflect.Symbol.classSymbol(fqn))
diff --git a/scaladoc/test/dotty/tools/scaladoc/testUtils.scala b/scaladoc/test/dotty/tools/scaladoc/testUtils.scala
index cfab383c9ba8..21ed7398f74e 100644
--- a/scaladoc/test/dotty/tools/scaladoc/testUtils.scala
+++ b/scaladoc/test/dotty/tools/scaladoc/testUtils.scala
@@ -7,6 +7,7 @@ import dotty.tools.dotc.interfaces.Diagnostic.{ERROR, INFO, WARNING}
 import dotty.tools.scaladoc.test.BuildInfo
 import org.junit.Assert._
 import java.io.File
+import java.nio.file.Paths
 
 
 case class ReportedDiagnostics(errors: List[Diagnostic], warnings: List[Diagnostic], infos: List[Diagnostic]):
@@ -54,13 +55,17 @@ def testArgs(files: Seq[File] = Nil, dest: File = new File("notUsed")) = Scalado
           name = "Test Project Name",
           output = dest,
           tastyFiles = files,
+          docsRoot = Some(""),
         )
 
-def testContext = (new ContextBase).initialCtx.fresh.setReporter(new TestReporter)
+def testContext =
+  val ctx = (new ContextBase).initialCtx.fresh.setReporter(new TestReporter)
+  ctx.setSetting(ctx.settings.usejavacp, true)
+  ctx
 
 def testDocContext(files: Seq[File] = Nil) = DocContext(testArgs(files), testContext)
 
-def tastyFiles(name: String, allowEmpty: Boolean = false) =
+def tastyFiles(name: String, allowEmpty: Boolean = false, rootPck: String = "tests") =
   def listFilesSafe(dir: File) = Option(dir.listFiles).getOrElse {
     throw AssertionError(s"$dir not found. The test name is incorrect or scaladoc-testcases were not recompiled.")
   }
@@ -69,7 +74,9 @@ def tastyFiles(name: String, allowEmpty: Boolean = false) =
       case f if f.getName endsWith ".tasty" => f :: Nil
       case _ => Nil
     }
-  val files = BuildInfo.test_testcasesOutputDir.flatMap(p => collectFiles(File(s"$p/tests/$name")))
+  val outputDir = BuildInfo.test_testcasesOutputDir
+  val files = outputDir.flatMap(p => collectFiles(File(s"$p/$rootPck/$name")))
   assert(files.nonEmpty || allowEmpty)
   files.toSeq
 
+def testDocPath = Paths.get(BuildInfo.testDocumentationRoot)
\ No newline at end of file
diff --git a/semanticdb/project/build.properties b/semanticdb/project/build.properties
index 7c58a83abffb..3161d2146c63 100644
--- a/semanticdb/project/build.properties
+++ b/semanticdb/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.6
+sbt.version=1.6.1
diff --git a/staging/src/scala/quoted/staging/QuoteDriver.scala b/staging/src/scala/quoted/staging/QuoteDriver.scala
index cc3ecfe1ceec..8de0cd218b23 100644
--- a/staging/src/scala/quoted/staging/QuoteDriver.scala
+++ b/staging/src/scala/quoted/staging/QuoteDriver.scala
@@ -4,6 +4,7 @@ package staging
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.Driver
 import dotty.tools.dotc.core.Contexts.{Context, ContextBase, FreshContext}
+import dotty.tools.dotc.quoted.QuotesCache
 import dotty.tools.io.{AbstractFile, Directory, PlainDirectory, VirtualDirectory}
 import dotty.tools.repl.AbstractFileClassLoader
 import dotty.tools.dotc.reporting._
@@ -33,8 +34,11 @@ private class QuoteDriver(appClassloader: ClassLoader) extends Driver:
           new VirtualDirectory("<quote compilation output>")
     end outDir
 
-    val ctx0 = setup(settings.compilerArgs.toArray :+ "dummy.scala", initCtx.fresh).get._2
-    val ctx = setCompilerSettings(ctx0.fresh.setSetting(ctx0.settings.outputDir, outDir), settings)
+    val ctx = {
+      val ctx0 = QuotesCache.init(initCtx.fresh)
+      val ctx1 = setup(settings.compilerArgs.toArray :+ "dummy.scala", ctx0).get._2
+      setCompilerSettings(ctx1.fresh.setSetting(ctx1.settings.outputDir, outDir), settings)
+    }
 
     new QuoteCompiler().newRun(ctx).compileExpr(exprBuilder) match
       case Right(value) =>
diff --git a/stdlib-bootstrapped-tasty-tests/test/BootstrappedStdLibTASYyTest.scala b/stdlib-bootstrapped-tasty-tests/test/BootstrappedStdLibTASYyTest.scala
index 54b89b1f5e3b..100292b1f5a7 100644
--- a/stdlib-bootstrapped-tasty-tests/test/BootstrappedStdLibTASYyTest.scala
+++ b/stdlib-bootstrapped-tasty-tests/test/BootstrappedStdLibTASYyTest.scala
@@ -109,8 +109,8 @@ object BootstrappedStdLibTASYyTest:
         ()
     }
     val tastyFiles = scalaLibTastyPaths.filterNot(blacklisted)
-    val hasErrors = TastyInspector.inspectTastyFiles(tastyFiles.map(x => scalaLibClassesPath.resolve(x).toString))(inspector)
-    assert(!hasErrors, "Errors reported while loading from TASTy")
+    val isSuccess = TastyInspector.inspectTastyFiles(tastyFiles.map(x => scalaLibClassesPath.resolve(x).toString))(inspector)
+    assert(isSuccess, "Errors reported while loading from TASTy")
 
   def compileFromTastyInJar(blacklisted: Set[String]): Unit = {
     val driver = new dotty.tools.dotc.Driver
diff --git a/tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala b/tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala
index f2ea76e30b7b..4c6440530ba2 100644
--- a/tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala
+++ b/tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala
@@ -10,6 +10,7 @@ import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Mode
 import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.fromtasty._
+import dotty.tools.dotc.quoted.QuotesCache
 import dotty.tools.dotc.util.ClasspathFromClassloader
 import dotty.tools.dotc.CompilationUnit
 import dotty.tools.unsupported
@@ -22,6 +23,8 @@ object TastyInspector:
   /** Load and process TASTy files using TASTy reflect
    *
    *  @param tastyFiles List of paths of `.tasty` files
+   *
+   *  @return boolean value indicating whether the process succeeded
    */
   def inspectTastyFiles(tastyFiles: List[String])(inspector: Inspector): Boolean =
     inspectAllTastyFiles(tastyFiles, Nil, Nil)(inspector)
@@ -29,6 +32,8 @@ object TastyInspector:
   /** Load and process TASTy files in a `jar` file using TASTy reflect
    *
    *  @param jars Path of `.jar` file
+   *
+   *  @return boolean value indicating whether the process succeeded
    */
   def inspectTastyFilesInJar(jar: String)(inspector: Inspector): Boolean =
     inspectAllTastyFiles(Nil, List(jar), Nil)(inspector)
@@ -38,6 +43,8 @@ object TastyInspector:
    *  @param tastyFiles List of paths of `.tasty` files
    *  @param jars List of path of `.jar` files
    *  @param dependenciesClasspath Classpath with extra dependencies needed to load class in the `.tasty` files
+   *
+   *  @return boolean value indicating whether the process succeeded
    */
   def inspectAllTastyFiles(tastyFiles: List[String], jars: List[String], dependenciesClasspath: List[String])(inspector: Inspector): Boolean =
     def checkFile(fileName: String, ext: String): Unit =
@@ -49,7 +56,7 @@ object TastyInspector:
     tastyFiles.foreach(checkFile(_, "tasty"))
     jars.foreach(checkFile(_, "jar"))
     val files = tastyFiles ::: jars
-    files.nonEmpty && inspectFiles(dependenciesClasspath, files)(inspector)
+    inspectFiles(dependenciesClasspath, files)(inspector)
 
   private def inspectorDriver(inspector: Inspector) =
     class InspectorDriver extends Driver:
@@ -58,7 +65,11 @@ object TastyInspector:
     class TastyInspectorPhase extends Phase:
       override def phaseName: String = "tastyInspector"
 
-      override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] =
+      override def runOn(units: List[CompilationUnit])(using ctx0: Context): List[CompilationUnit] =
+        val ctx = QuotesCache.init(ctx0.fresh)
+        runOnImpl(units)(using ctx)
+
+      private def runOnImpl(units: List[CompilationUnit])(using Context): List[CompilationUnit] =
         val quotesImpl = QuotesImpl()
         class TastyImpl(val path: String, val ast: quotesImpl.reflect.Tree) extends Tasty[quotesImpl.type] {
           val quotes = quotesImpl
@@ -86,7 +97,10 @@ object TastyInspector:
 
       override def newRun(implicit ctx: Context): Run =
         reset()
-        new TASTYRun(this, ctx.fresh.addMode(Mode.ReadPositions).addMode(Mode.ReadComments))
+        val ctx2 = ctx.fresh
+            .addMode(Mode.ReadPositions)
+            .setSetting(ctx.settings.YreadComments, true)
+        new TASTYRun(this, ctx2)
 
     new InspectorDriver
 
@@ -97,11 +111,11 @@ object TastyInspector:
 
 
   private def inspectFiles(classpath: List[String], classes: List[String])(inspector: Inspector): Boolean =
-    if (classes.isEmpty)
-      throw new IllegalArgumentException("Parameter classes should no be empty")
-
-    val reporter = inspectorDriver(inspector).process(inspectorArgs(classpath, classes))
-    reporter.hasErrors
+    classes match
+      case Nil => true
+      case _ =>
+        val reporter = inspectorDriver(inspector).process(inspectorArgs(classpath, classes))
+        !reporter.hasErrors
 
   end inspectFiles
 
diff --git a/tasty/src/dotty/tools/tasty/TastyFormat.scala b/tasty/src/dotty/tools/tasty/TastyFormat.scala
index f8c077c0aa0b..f4f72a6e7e19 100644
--- a/tasty/src/dotty/tools/tasty/TastyFormat.scala
+++ b/tasty/src/dotty/tools/tasty/TastyFormat.scala
@@ -10,15 +10,16 @@ lower case letter*_ are for explanation of semantic content only, they
 can be dropped without changing the grammar.
 
 Micro-syntax:
-
+```none
   LongInt       = Digit* StopDigit        -- big endian 2's complement, value fits in a Long w/o overflow
   Int           = LongInt                 -- big endian 2's complement, fits in an Int w/o overflow
   Nat           = LongInt                 -- non-negative value, fits in an Int without overflow
   Digit         = 0 | ... | 127
   StopDigit     = 128 | ... | 255         -- value = digit - 128
+```
 
 Macro-format:
-
+```none
   File          = Header majorVersion_Nat minorVersion_Nat experimentalVersion_Nat VersionString UUID
                   nameTable_Length Name* Section*
   Header        = 0x5CA1AB1F
@@ -39,6 +40,7 @@ Macro-format:
                   SUPERACCESSOR     Length underlying_NameRef                               -- super$A
                   INLINEACCESSOR    Length underlying_NameRef                               -- inline$A
                   OBJECTCLASS       Length underlying_NameRef                               -- A$  (name of the module class for module A)
+                  BODYRETAINER      Length underlying_NameRef                               -- A$retainedBody
 
                   SIGNED            Length original_NameRef resultSig_NameRef ParamSig*     -- name + signature
                   TARGETSIGNED      Length original_NameRef target_NameRef resultSig_NameRef ParamSig*
@@ -47,13 +49,14 @@ Macro-format:
                       // If positive, this is a NameRef for the fully qualified name of a term parameter.
 
   NameRef       = Nat                    // ordinal number of name in name table, starting from 1.
+```
 
 Note: Unqualified names in the name table are strings. The context decides whether a name is
 a type-name or a term-name. The same string can represent both.
 
 
 Standard-Section: "ASTs" TopLevelStat*
-
+```none
   TopLevelStat  = PACKAGE        Length Path TopLevelStat*                         -- package path { topLevelStats }
                   Stat
 
@@ -70,7 +73,7 @@ Standard-Section: "ASTs" TopLevelStat*
                   BOUNDED               type_Term                                  -- type bound
 
   TypeParam     = TYPEPARAM      Length NameRef type_Term Modifier*                -- modifiers name bounds
-  TermParam     = PARAM          Length NameRef type_Term rhs_Term? Modifier*      -- modifiers name : type (= rhs_Term)?. `rhsTerm` is present in the case of an aliased class parameter
+  TermParam     = PARAM          Length NameRef type_Term Modifier*                -- modifiers name : type.
                   EMPTYCLAUSE                                                      -- an empty parameter clause ()
                   SPLITCLAUSE                                                      -- splits two non-empty parameter clauses of the same kind
   Param         = TypeParam
@@ -157,7 +160,7 @@ Standard-Section: "ASTs" TopLevelStat*
                   TYPEREFin      Length NameRef qual_Type namespace_Type           -- A reference `qual.name` to a non-local member that's private in `namespace`.
                   RECtype               parent_Type                                -- A wrapper for recursive refined types
                   SUPERtype      Length this_Type underlying_Type                  -- A super type reference to `underlying`
-                  REFINEDtype    Length underlying_Type refinement_NameRef info_Type -- underlying { refinement_name : info }
+                  REFINEDtype    Length refinement_NameRef underlying_Type info_Type -- underlying { refinement_name : info }
                   APPLIEDtype    Length tycon_Type arg_Type*                       -- tycon[args]
                   TYPEBOUNDS     Length lowOrAlias_Type high_Type? Variance*       -- = alias or >: low <: high, possibly with variances of lambda parameters
                   ANNOTATEDtype  Length underlying_Type annotation_Term            -- underlying @ annotation
@@ -176,7 +179,6 @@ Standard-Section: "ASTs" TopLevelStat*
   TypeName      = typeOrBounds_ASTRef paramName_NameRef                            -- (`termName`: `type`)  or  (`typeName` `bounds`)
 
   Modifier      = PRIVATE                                                          -- private
-                  INTERNAL                                                         -- package private (not yet used)
                   PROTECTED                                                        -- protected
                   PRIVATEqualified     qualifier_Type                              -- private[qualifier]    (to be dropped(?)
                   PROTECTEDqualified   qualifier_Type                              -- protecred[qualifier]  (to be dropped(?)
@@ -220,22 +222,23 @@ Standard-Section: "ASTs" TopLevelStat*
                 | CONTRAVARIANT
 
   Annotation    = ANNOTATION     Length tycon_Type fullAnnotation_Term             -- An annotation, given (class) type of constructor, and full application tree
+```
 
 Note: The signature of a SELECTin or TERMREFin node is the signature of the selected symbol,
       not the signature of the reference. The latter undergoes an asSeenFrom but the former
       does not.
 
 Note: Tree tags are grouped into 5 categories that determine what follows, and thus allow to compute the size of the tagged tree in a generic way.
-
+```none
   Category 1 (tags 1-59)   :  tag
   Category 2 (tags 60-89)  :  tag Nat
   Category 3 (tags 90-109) :  tag AST
   Category 4 (tags 110-127):  tag Nat AST
   Category 5 (tags 128-255):  tag Length <payload>
-
+```
 
 Standard-Section: "Positions" LinesSizes Assoc*
-
+```none
   LinesSizes    = Nat Nat*                 // Number of lines followed by the size of each line not counting the trailing `\n`
 
   Assoc         = Header offset_Delta? offset_Delta? point_Delta?
@@ -251,15 +254,17 @@ Standard-Section: "Positions" LinesSizes Assoc*
   SOURCE        = 4                         // Impossible as header, since addr_Delta = 0 implies that we refer to the
                                             // same tree as the previous one, but then hasStartDiff = 1 implies that
                                             // the tree's range starts later than the range of itself.
+```
 
 All elements of a position section are serialized as Ints
 
 
 Standard Section: "Comments" Comment*
-
+```none
   Comment       = Length Bytes LongInt      // Raw comment's bytes encoded as UTF-8, followed by the comment's coordinates.
+```
 
-
+* @syntax markdown
 **************************************************************************************/
 
 object TastyFormat {
@@ -272,68 +277,68 @@ object TastyFormat {
     */
   final val header: Array[Int] = Array(0x5C, 0xA1, 0xAB, 0x1F)
 
-  /**Natural number. Each increment of the `MajorVersion` begins a
-   * new series of backward compatible TASTy versions.
+  /** Natural number. Each increment of the `MajorVersion` begins a
+   *  new series of backward compatible TASTy versions.
    *
-   * A TASTy file in either the preceeding or succeeding series is
-   * incompatible with the current value.
+   *  A TASTy file in either the preceeding or succeeding series is
+   *  incompatible with the current value.
    */
   final val MajorVersion: Int = 28
 
-  /**Natural number. Each increment of the `MinorVersion`, within
-   * a series declared by the `MajorVersion`, breaks forward
-   * compatibility, but remains backwards compatible, with all
-   * preceeding `MinorVersion`.
+  /** Natural number. Each increment of the `MinorVersion`, within
+   *  a series declared by the `MajorVersion`, breaks forward
+   *  compatibility, but remains backwards compatible, with all
+   *  preceeding `MinorVersion`.
    */
-  final val MinorVersion: Int = 0
+  final val MinorVersion: Int = 2
 
-  /**Natural Number. The `ExperimentalVersion` allows for
-   * experimentation with changes to TASTy without committing
-   * to any guarantees of compatibility.
+  /** Natural Number. The `ExperimentalVersion` allows for
+   *  experimentation with changes to TASTy without committing
+   *  to any guarantees of compatibility.
    *
-   * A zero value indicates that the TASTy version is from a
-   * stable, final release.
+   *  A zero value indicates that the TASTy version is from a
+   *  stable, final release.
    *
-   * A strictly positive value indicates that the TASTy
-   * version is experimental. An experimental TASTy file
-   * can only be read by a tool with the same version.
-   * However, tooling with an experimental TASTy version
-   * is able to read final TASTy documents if the file's
-   * `MinorVersion` is strictly less than the current value.
+   *  A strictly positive value indicates that the TASTy
+   *  version is experimental. An experimental TASTy file
+   *  can only be read by a tool with the same version.
+   *  However, tooling with an experimental TASTy version
+   *  is able to read final TASTy documents if the file's
+   *  `MinorVersion` is strictly less than the current value.
    */
-  final val ExperimentalVersion: Int = 3
+  final val ExperimentalVersion: Int = 1
 
   /**This method implements a binary relation (`<:<`) between two TASTy versions.
+   *
    * We label the lhs `file` and rhs `compiler`.
    * if `file <:< compiler` then the TASTy file is valid to be read.
    *
-   * TASTy versions have a partial order,
-   * for example `a <:< b` and `b <:< a` are both false if `a` and `b` have different major versions.
+   * A TASTy version, e.g. `v := 28.0-3` is composed of three fields:
+   *   - v.major == 28
+   *   - v.minor == 0
+   *   - v.experimental == 3
+   *
+   * TASTy versions have a partial order, for example,
+   * `a <:< b` and `b <:< a` are both false if
+   *   - `a` and `b` have different `major` fields.
+   *   - `a` and `b` have the same `major` & `minor` fields,
+   *     but different `experimental` fields, both non-zero.
+   *
+   * A TASTy version with a zero value for its `experimental` field
+   * is considered to be stable. Files with a stable TASTy version
+   * can be read by a compiler with an unstable TASTy version,
+   * (where the compiler's TASTy version has a higher `minor` field).
+   *
+   * A compiler with a stable TASTy version can never read a file
+   * with an unstable TASTy version.
    *
    * We follow the given algorithm:
+   *
    * ```
-   * if file.major != compiler.major then
-   *   return incompatible
-   * if compiler.experimental == 0 then
-   *   if file.experimental != 0 then
-   *     return incompatible
-   *   if file.minor > compiler.minor then
-   *     return incompatible
-   *   else
-   *     return compatible
-   * else invariant[compiler.experimental != 0]
-   *   if file.experimental == compiler.experimental then
-   *     if file.minor == compiler.minor then
-   *       return compatible (all fields equal)
-   *     else
-   *       return incompatible
-   *   else if file.experimental == 0,
-   *     if file.minor < compiler.minor then
-   *       return compatible (an experimental version can read a previous released version)
-   *     else
-   *       return incompatible (an experimental version cannot read its own minor version or any later version)
-   *   else invariant[file.experimental is non-0 and different than compiler.experimental]
-   *     return incompatible
+   * (fileMajor, fileMinor, fileExperimental) match
+   *   case (`compilerMajor`, `compilerMinor`, `compilerExperimental`) => true // full equality
+   *   case (`compilerMajor`, minor, 0) if minor < compilerMinor       => true // stable backwards compatibility
+   *   case _                                                          => false
    * ```
    * @syntax markdown
    */
@@ -345,18 +350,9 @@ object TastyFormat {
     compilerMinor: Int,
     compilerExperimental: Int
   ): Boolean = (
-    fileMajor == compilerMajor && (
-      if (fileExperimental == compilerExperimental) {
-        if (compilerExperimental == 0) {
-          fileMinor <= compilerMinor
-        }
-        else {
-          fileMinor == compilerMinor
-        }
-      }
-      else {
-        fileExperimental == 0 && fileMinor < compilerMinor
-      }
+    fileMajor == compilerMajor &&
+      (  fileMinor == compilerMinor && fileExperimental == compilerExperimental // full equality
+      || fileMinor <  compilerMinor && fileExperimental == 0 // stable backwards compatibility
     )
   )
 
@@ -433,12 +429,13 @@ object TastyFormat {
   // Cat. 1:    tag
 
   final val firstSimpleTreeTag = UNITconst
+  // final val ??? = 1
   final val UNITconst = 2
   final val FALSEconst = 3
   final val TRUEconst = 4
   final val NULLconst = 5
   final val PRIVATE = 6
-  final val INTERNAL = 7
+  // final val ??? = 7
   final val PROTECTED = 8
   final val ABSTRACT = 9
   final val FINAL = 10
@@ -461,6 +458,7 @@ object TastyFormat {
   final val CASEaccessor = 27
   final val COVARIANT = 28
   final val CONTRAVARIANT = 29
+  // final val ??? = 30
   final val HASDEFAULT = 31
   final val STABLE = 32
   final val MACRO = 33
@@ -536,6 +534,7 @@ object TastyFormat {
   final val IMPORT = 132
   final val TYPEPARAM = 133
   final val PARAM = 134
+  // final val ??? = 135
   final val APPLY = 136
   final val TYPEAPPLY = 137
   final val TYPED = 138
@@ -566,7 +565,9 @@ object TastyFormat {
   final val TYPEBOUNDS = 163
   final val TYPEBOUNDStpt = 164
   final val ANDtype = 165
+  // final val ??? = 166
   final val ORtype = 167
+  // final val ??? = 168
   final val POLYtype = 169
   final val TYPELAMBDAtype = 170
   final val LAMBDAtpt = 171
@@ -576,7 +577,8 @@ object TastyFormat {
   final val TYPEREFin = 175
   final val SELECTin = 176
   final val EXPORT = 177
-
+  // final val ??? = 178
+  // final val ??? = 179
   final val METHODtype = 180
 
   final val MATCHtype = 190
@@ -603,7 +605,6 @@ object TastyFormat {
 
   def isModifierTag(tag: Int): Boolean = tag match {
     case PRIVATE
-       | INTERNAL
        | PROTECTED
        | ABSTRACT
        | FINAL
@@ -667,7 +668,6 @@ object TastyFormat {
     case TRUEconst => "TRUEconst"
     case NULLconst => "NULLconst"
     case PRIVATE => "PRIVATE"
-    case INTERNAL => "INTERNAL"
     case PROTECTED => "PROTECTED"
     case ABSTRACT => "ABSTRACT"
     case FINAL => "FINAL"
diff --git a/tasty/test/dotty/tools/tasty/TastyHeaderUnpicklerTest.scala b/tasty/test/dotty/tools/tasty/TastyHeaderUnpicklerTest.scala
index b9f2aff3f564..9f54c4b3061b 100644
--- a/tasty/test/dotty/tools/tasty/TastyHeaderUnpicklerTest.scala
+++ b/tasty/test/dotty/tools/tasty/TastyHeaderUnpicklerTest.scala
@@ -57,8 +57,8 @@ object TastyHeaderUnpicklerTest {
     buf.writeNat(exp)
     buf.writeNat(compilerBytes.length)
     buf.writeBytes(compilerBytes, compilerBytes.length)
-    buf.writeUncompressedLong(237478l)
-    buf.writeUncompressedLong(324789l)
+    buf.writeUncompressedLong(237478L)
+    buf.writeUncompressedLong(324789L)
     buf
   }
 
diff --git a/tasty/test/dotty/tools/tasty/TastyVersionFormatTest.scala b/tasty/test/dotty/tools/tasty/TastyVersionFormatTest.scala
index b5cb58910e36..3e29c9baaf81 100644
--- a/tasty/test/dotty/tools/tasty/TastyVersionFormatTest.scala
+++ b/tasty/test/dotty/tools/tasty/TastyVersionFormatTest.scala
@@ -11,61 +11,69 @@ class TastyVersionFormatTest {
   import TastyVersionFormatTest._
 
   /** aliases `TastyVersion.apply` */
-  def compiler(major: Int, minor: Int, experimental: Int) = TastyVersion(major, minor, experimental)
+  def compiler(major: Int, minor: Int, experimental: Experimental) = TastyVersion(major, minor, experimental)
 
   /** aliases `TastyVersion.apply` */
-  def file(major: Int, minor: Int, experimental: Int) = TastyVersion(major, minor, experimental)
+  def file(major: Int, minor: Int, experimental: Experimental) = TastyVersion(major, minor, experimental)
 
   @Test def accept_ExperimentalReadEQExperimental_EQMinor: Unit = {
-    assert(file(28,1,1) <:< compiler(28,1,1)) // same minor, same experimental
+    assert(file(28,1,Exp(1)) <:< compiler(28,1,Exp(1))) // same minor, same experimental
   }
 
   @Test def accept_ExperimentalReadFinal_LTMinor: Unit = {
-    assert(file(28,0,0) <:< compiler(28,1,1)) // preceding minor
+    assert(file(28,0,Final) <:< compiler(28,1,Exp(1))) // preceding minor
   }
 
   @Test def accept_FinalReadFinal_LTEqualMinor: Unit = {
-    assert(file(28,0,0) <:< compiler(28,1,0)) // preceding minor
-    assert(file(28,0,0) <:< compiler(28,0,0)) // same      minor
+    assert(file(28,0,Final) <:< compiler(28,1,Final)) // preceding minor
+    assert(file(28,0,Final) <:< compiler(28,0,Final)) // same      minor
   }
 
   /** these cases are unrelated because a final compiler can only read final tasty of <= minor version */
   @Test def reject_FinalReadFinal_GTMinor: Unit = {
-    assert(file(28,2,0) unrelatedTo compiler(28,1,0)) // succeeding minor
+    assert(file(28,2,Final) unrelatedTo compiler(28,1,Final)) // succeeding minor
   }
 
   /** these cases are unrelated because a final compiler can not read experimental tasty */
   @Test def reject_FinalReadExperimental: Unit = {
-    assert(file(28,0,1) unrelatedTo compiler(28,1,0)) // preceding  minor
-    assert(file(28,1,1) unrelatedTo compiler(28,1,0)) // same       minor
-    assert(file(28,2,1) unrelatedTo compiler(28,1,0)) // succeeding minor
+    assert(file(28,0,Exp(1)) unrelatedTo compiler(28,1,Final)) // preceding  minor
+    assert(file(28,1,Exp(1)) unrelatedTo compiler(28,1,Final)) // same       minor
+    assert(file(28,2,Exp(1)) unrelatedTo compiler(28,1,Final)) // succeeding minor
   }
 
   /** These cases are unrelated because an experimental compiler can only read final tasty of < minor version */
   @Test def reject_ExperimentalReadFinal_GTEqualMinor: Unit = {
-    assert(file(28,2,0) unrelatedTo compiler(28,1,1)) // succeeding minor
-    assert(file(28,1,0) unrelatedTo compiler(28,1,1)) // equal      minor
+    assert(file(28,2,Final) unrelatedTo compiler(28,1,Exp(1))) // succeeding minor
+    assert(file(28,1,Final) unrelatedTo compiler(28,1,Exp(1))) // equal      minor
   }
 
   /**These cases are unrelated because both compiler and file are experimental,
    * and with unequal experimental part.
    */
   @Test def reject_ExperimentalReadNEExperimental: Unit = {
-    assert(file(28,1,2) unrelatedTo compiler(28,1,1)) // same minor version, succeeding experimental
-    assert(file(28,1,1) unrelatedTo compiler(28,1,2)) // same minor version, preceding  experimental
+    assert(file(28,1,Exp(2)) unrelatedTo compiler(28,1,Exp(1))) // same minor version, succeeding experimental
+    assert(file(28,1,Exp(1)) unrelatedTo compiler(28,1,Exp(2))) // same minor version, preceding  experimental
   }
 
   /** these cases are unrelated because the major version must be identical */
   @Test def reject_NEMajor: Unit = {
-    assert(file(27,0,0) unrelatedTo compiler(28,0,0)) // less    than
-    assert(file(29,0,0) unrelatedTo compiler(28,0,0)) // greater than
+    assert(file(27,0,Final) unrelatedTo compiler(28,0,Final)) // less    than
+    assert(file(29,0,Final) unrelatedTo compiler(28,0,Final)) // greater than
   }
 
 }
 
 object TastyVersionFormatTest {
 
-  case class TastyVersion(major: Int, minor: Int, experimental: Int) { file =>
+  type Experimental = Int
+  val Final: Experimental = 0
+  def Exp(i: Int): Experimental = i.ensuring(_ > 0)
+
+  case class TastyVersion(major: Int, minor: Int, experimental: Experimental) { file =>
+    assert(major >= 0)
+    assert(minor >= 0)
+    assert(experimental >= 0)
+
     def <:<(compiler: TastyVersion): Boolean = TastyFormat.isVersionCompatible(
       fileMajor            = file.major,
       fileMinor            = file.minor,
diff --git a/tests/bench/power-macro/PowerMacro.scala b/tests/bench/power-macro/PowerMacro.scala
index 03a77d927287..f55d9f1926a3 100644
--- a/tests/bench/power-macro/PowerMacro.scala
+++ b/tests/bench/power-macro/PowerMacro.scala
@@ -5,7 +5,7 @@ object PowerMacro {
   inline def power(inline n: Long, x: Double) = ${ powerCode('n, 'x) }
 
   def powerCode(n: Expr[Long], x: Expr[Double])(using Quotes): Expr[Double] =
-    powerCode(n.valueOrError, x)
+    powerCode(n.valueOrAbort, x)
 
   def powerCode(n: Long, x: Expr[Double])(using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/cmdTest-sbt-tests/README.md b/tests/cmdTest-sbt-tests/README.md
new file mode 100644
index 000000000000..3738c0861fb1
--- /dev/null
+++ b/tests/cmdTest-sbt-tests/README.md
@@ -0,0 +1,7 @@
+# Readme
+
+Do not use this directory for testing sbt projects in general, add a test case to `dotty/sbt-test`
+
+This directory is for sbt tests that can not be reproduced with sbt scripted tests.
+
+Adding a test here will reduce the performance of running all tests.
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/build.sbt b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/build.sbt
new file mode 100644
index 000000000000..4bff160ff55a
--- /dev/null
+++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/build.sbt
@@ -0,0 +1,17 @@
+import java.util.Properties
+
+val prepareSources = taskKey[Unit]("Copy changes to the src directory")
+val copyChanges = taskKey[Unit]("Copy changes to the src directory")
+
+val srcDir = settingKey[File]("The directory to copy changes to")
+val changesDir = settingKey[File]("The directory to copy changes from")
+
+srcDir := (ThisBuild / baseDirectory).value / "src" / "main" / "scala"
+changesDir := (ThisBuild / baseDirectory).value / "changes"
+
+prepareSources := IO.copyFile(changesDir.value / "zz.original.scala", srcDir.value / "a" / "zz.scala")
+copyChanges := IO.copyFile(changesDir.value / "zz.new.scala", srcDir.value / "a" / "zz.scala")
+
+(Compile / scalacOptions) ++= Seq(
+  "-sourcepath", (Compile / sourceDirectories).value.map(_.getAbsolutePath).distinct.mkString(java.io.File.pathSeparator),
+)
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.new.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.new.scala
new file mode 100644
index 000000000000..fbf5cf7fb5e0
--- /dev/null
+++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.new.scala
@@ -0,0 +1,7 @@
+package a
+
+object Foo: // note that `Foo` is defined in `zz.scala`
+  class Local
+  inline def foo(using Local): Nothing =
+    ???
+    ???
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.original.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.original.scala
new file mode 100644
index 000000000000..17a7488ccb1a
--- /dev/null
+++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.original.scala
@@ -0,0 +1,6 @@
+package a
+
+object Foo: // note that `Foo` is defined in `zz.scala`
+  class Local
+  inline def foo(using Local): Nothing =
+    ???
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties
new file mode 100644
index 000000000000..3161d2146c63
--- /dev/null
+++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.6.1
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/src/main/scala/a/Bar.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/src/main/scala/a/Bar.scala
new file mode 100644
index 000000000000..4d4b7eebe09e
--- /dev/null
+++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/src/main/scala/a/Bar.scala
@@ -0,0 +1,5 @@
+package a
+
+object Bar:
+  given Foo.Local()
+  inline def bar = Foo.foo // `Bar.bar` is inline, it will hash the body of `Foo.foo`
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/build.sbt b/tests/cmdTest-sbt-tests/sourcepath-with-inline/build.sbt
new file mode 100644
index 000000000000..4bff160ff55a
--- /dev/null
+++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/build.sbt
@@ -0,0 +1,17 @@
+import java.util.Properties
+
+val prepareSources = taskKey[Unit]("Copy changes to the src directory")
+val copyChanges = taskKey[Unit]("Copy changes to the src directory")
+
+val srcDir = settingKey[File]("The directory to copy changes to")
+val changesDir = settingKey[File]("The directory to copy changes from")
+
+srcDir := (ThisBuild / baseDirectory).value / "src" / "main" / "scala"
+changesDir := (ThisBuild / baseDirectory).value / "changes"
+
+prepareSources := IO.copyFile(changesDir.value / "zz.original.scala", srcDir.value / "a" / "zz.scala")
+copyChanges := IO.copyFile(changesDir.value / "zz.new.scala", srcDir.value / "a" / "zz.scala")
+
+(Compile / scalacOptions) ++= Seq(
+  "-sourcepath", (Compile / sourceDirectories).value.map(_.getAbsolutePath).distinct.mkString(java.io.File.pathSeparator),
+)
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.new.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.new.scala
new file mode 100644
index 000000000000..fbf5cf7fb5e0
--- /dev/null
+++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.new.scala
@@ -0,0 +1,7 @@
+package a
+
+object Foo: // note that `Foo` is defined in `zz.scala`
+  class Local
+  inline def foo(using Local): Nothing =
+    ???
+    ???
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.original.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.original.scala
new file mode 100644
index 000000000000..17a7488ccb1a
--- /dev/null
+++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.original.scala
@@ -0,0 +1,6 @@
+package a
+
+object Foo: // note that `Foo` is defined in `zz.scala`
+  class Local
+  inline def foo(using Local): Nothing =
+    ???
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties
new file mode 100644
index 000000000000..3161d2146c63
--- /dev/null
+++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.6.1
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/src/main/scala/a/Bar.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline/src/main/scala/a/Bar.scala
new file mode 100644
index 000000000000..79af4eb2cebd
--- /dev/null
+++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/src/main/scala/a/Bar.scala
@@ -0,0 +1,5 @@
+package a
+
+object Bar:
+  given Foo.Local()
+  def Bar = Foo.foo
diff --git a/tests/disabled/pos-macros/forwardCompat-3.1/Macro_1_r3.1.scala b/tests/disabled/pos-macros/forwardCompat-3.1/Macro_1_r3.1.scala
new file mode 100644
index 000000000000..fb06e93f91c0
--- /dev/null
+++ b/tests/disabled/pos-macros/forwardCompat-3.1/Macro_1_r3.1.scala
@@ -0,0 +1,20 @@
+import scala.quoted.*
+
+object Macros:
+
+  inline def power(x: Double, inline n: Int) = ${ powerCode('x, 'n) }
+
+  private def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] =
+    unrolledPowerCode(x, n.valueOrError)
+
+  private def unrolledPowerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] =
+    if n == 0 then '{ 1.0 } // tests simple quotes without splices
+    else if n % 2 == 1 then '{ $x * ${ unrolledPowerCode(x, n - 1) } } // tests simple splices
+    else '{ val y = $x * $x; ${ unrolledPowerCode('y, n / 2) } } // tests splice with term capture
+
+
+  inline def let[T, U](x: T)(inline body: T => U): U = ${ letCode('x, 'body) }
+
+  private def letCode[T: Type, U: Type](x: Expr[T], body: Expr[T => U])(using Quotes): Expr[U] =
+    // tests use of Type
+    '{ val y: T = $x; $body(y): U }
diff --git a/tests/disabled/pos-macros/forwardCompat-3.1/Test_2_c3.1.0.scala b/tests/disabled/pos-macros/forwardCompat-3.1/Test_2_c3.1.0.scala
new file mode 100644
index 000000000000..8c0a8004b9cf
--- /dev/null
+++ b/tests/disabled/pos-macros/forwardCompat-3.1/Test_2_c3.1.0.scala
@@ -0,0 +1,15 @@
+import Macros.*
+
+def powerTest(x: Double): Unit =
+  power(x, 0)
+  power(x, 1)
+  power(x, 5)
+  power(x, 10)
+
+def letTest: Unit =
+  let(0) { _ + 1 }
+  let(0) { _.toString }
+  let((4, 'a')) { _.swap }
+  let(new Foo) { _.hashCode }
+
+class Foo
diff --git a/tests/disabled/pos-macros/forwardCompat-3.1/why.md b/tests/disabled/pos-macros/forwardCompat-3.1/why.md
new file mode 100644
index 000000000000..f281f9c08662
--- /dev/null
+++ b/tests/disabled/pos-macros/forwardCompat-3.1/why.md
@@ -0,0 +1 @@
+Disabled until https://github.com/lampepfl/dotty/issues/14306 is fixed
diff --git a/tests/run-custom-args/erased/erased-2.check b/tests/disabled/run-custom-args/erased/erased-2.check
similarity index 100%
rename from tests/run-custom-args/erased/erased-2.check
rename to tests/disabled/run-custom-args/erased/erased-2.check
diff --git a/tests/run-custom-args/erased/erased-2.scala b/tests/disabled/run-custom-args/erased/erased-2.scala
similarity index 100%
rename from tests/run-custom-args/erased/erased-2.scala
rename to tests/disabled/run-custom-args/erased/erased-2.scala
diff --git a/tests/explicit-nulls/neg/AnyValOrNullSelect.scala b/tests/explicit-nulls/neg/AnyValOrNullSelect.scala
new file mode 100644
index 000000000000..44e8b4e7edfb
--- /dev/null
+++ b/tests/explicit-nulls/neg/AnyValOrNullSelect.scala
@@ -0,0 +1,13 @@
+case class MyVal(i: Int) extends AnyVal:
+  def printVal: Unit =
+    println(i)
+
+class Test:
+  val v: MyVal | Null = MyVal(1)
+
+  def f1 =
+    v.printVal // error: value printVal is not a member of MyVal | Null
+
+  def f1 =
+    import scala.language.unsafeNulls
+    v.printVal // error: value printVal is not a member of MyVal | Null
diff --git a/tests/explicit-nulls/neg/basic.scala b/tests/explicit-nulls/neg/basic.scala
index cafe4b156d85..66284de4a9f9 100644
--- a/tests/explicit-nulls/neg/basic.scala
+++ b/tests/explicit-nulls/neg/basic.scala
@@ -9,6 +9,9 @@ class Basic {
   val any1: Any  = null
   val any2: Any  = n
 
+  val matchable1: Matchable = null
+  val matchable2: Matchable = n
+
   val s1: String = null // error
   val s2: String = n // error
   val s3: String | Null = null
diff --git a/tests/explicit-nulls/pos/AnyValOrNull.scala b/tests/explicit-nulls/pos/AnyValOrNull.scala
new file mode 100644
index 000000000000..098d3eba973d
--- /dev/null
+++ b/tests/explicit-nulls/pos/AnyValOrNull.scala
@@ -0,0 +1,36 @@
+case class MyVal(i: Boolean) extends AnyVal
+
+class Test1:
+
+  def test1 =
+    val v: AnyVal | Null = null
+    if v == null then
+      println("null")
+
+  def test2 =
+    val v: Int | Null = 1
+    if v != null then
+      println(v)
+
+  def test3 =
+    val v: MyVal | Null = MyVal(false)
+    if v != null then
+      println(v)
+
+class Test2:
+  import scala.language.unsafeNulls
+
+  def test1 =
+    val v: AnyVal | Null = null
+    if v == null then
+      println("null")
+
+  def test2 =
+    val v: Int | Null = 1
+    if v != null then
+      println(v)
+
+  def test3 =
+    val v: MyVal | Null = MyVal(false)
+    if v != null then
+      println(v)
diff --git a/tests/explicit-nulls/pos/flow-match.scala b/tests/explicit-nulls/pos/flow-match.scala
index 9e3806c97363..260068b3ac3f 100644
--- a/tests/explicit-nulls/pos/flow-match.scala
+++ b/tests/explicit-nulls/pos/flow-match.scala
@@ -1,11 +1,15 @@
-// Test flow-typing when NotNullInfos are from non-null cases
+// Test flow-typing when NotNullInfos are from cases
 
 object MatchTest {
-  locally {
-    val s: String|Null = ???
-    s match {
-      case _: String => println(s.length)
-      case _ => println(0)
-    }
+
+  def lengthOfStringOrNull(s: String | Null): Int = s match {
+    case _: String => s.length
+    case _ => 0
+  }
+
+  def stringOrNullToString(s: String | Null): String = s match {
+    case null => "null"
+    // after the null case, s becomes non-nullable
+    case _ => s
   }
 }
diff --git a/tests/explicit-nulls/pos/i11694.scala b/tests/explicit-nulls/pos/i11694.scala
new file mode 100644
index 000000000000..8098775a8430
--- /dev/null
+++ b/tests/explicit-nulls/pos/i11694.scala
@@ -0,0 +1,4 @@
+def test = {
+  val x = new java.util.ArrayList[String]()
+  val y = x.stream().nn.filter(s => s.nn.length > 0)
+}
\ No newline at end of file
diff --git a/tests/explicit-nulls/pos/i13040/Impl.scala b/tests/explicit-nulls/pos/i13040/Impl.scala
new file mode 100644
index 000000000000..d26927db2e94
--- /dev/null
+++ b/tests/explicit-nulls/pos/i13040/Impl.scala
@@ -0,0 +1,5 @@
+class Impl extends Intf:
+  override def test(x: Object | Null*): Unit = ???
+
+class Impl2 extends Intf:
+  override def test(x: Object*): Unit = ???
diff --git a/tests/explicit-nulls/pos/i13040/Intf.java b/tests/explicit-nulls/pos/i13040/Intf.java
new file mode 100644
index 000000000000..816c94485cc4
--- /dev/null
+++ b/tests/explicit-nulls/pos/i13040/Intf.java
@@ -0,0 +1,3 @@
+interface Intf {
+    void test(Object... x);
+}
diff --git a/tests/explicit-nulls/pos/i13197.scala b/tests/explicit-nulls/pos/i13197.scala
new file mode 100644
index 000000000000..85835f9850c5
--- /dev/null
+++ b/tests/explicit-nulls/pos/i13197.scala
@@ -0,0 +1,7 @@
+trait Bar:
+  def b: String | Null
+
+class Foo(a: String = "", b: String)
+
+object Foo:
+  def foo(bar: Bar) = Foo(b = bar.b.nn)
\ No newline at end of file
diff --git a/tests/explicit-nulls/pos/i13486.scala b/tests/explicit-nulls/pos/i13486.scala
new file mode 100644
index 000000000000..d9fafc157d4c
--- /dev/null
+++ b/tests/explicit-nulls/pos/i13486.scala
@@ -0,0 +1,7 @@
+class MyPrintStream extends java.io.PrintStream(??? : java.io.OutputStream):
+  override def printf(format: String | Null, args: Array[? <: Object | Null])
+  : java.io.PrintStream | Null = ???
+
+class MyPrintStream2 extends java.io.PrintStream(??? : java.io.OutputStream):
+  override def printf(format: String, args: Array[? <: Object])
+  : java.io.PrintStream = ???
diff --git a/tests/explicit-nulls/pos/i13608.scala b/tests/explicit-nulls/pos/i13608.scala
new file mode 100644
index 000000000000..29f9f8692086
--- /dev/null
+++ b/tests/explicit-nulls/pos/i13608.scala
@@ -0,0 +1,3 @@
+import scala.util.control.NoStackTrace
+
+case class ParseException(line: Int, character: Int, message: String) extends NoStackTrace
diff --git a/tests/explicit-nulls/pos/matchable.scala b/tests/explicit-nulls/pos/matchable.scala
new file mode 100644
index 000000000000..ef9c5e7eae07
--- /dev/null
+++ b/tests/explicit-nulls/pos/matchable.scala
@@ -0,0 +1 @@
+def foo2[T <: Matchable](t: T) = t match { case null => () }
\ No newline at end of file
diff --git a/tests/explicit-nulls/run/nn.scala b/tests/explicit-nulls/run/nn.scala
index 3ffff69649cf..12c6c2ddb3c8 100644
--- a/tests/explicit-nulls/run/nn.scala
+++ b/tests/explicit-nulls/run/nn.scala
@@ -15,7 +15,7 @@ object Test {
     val y: String|Null = null
     assertThrowsNPE(y.nn)
     assertThrowsNPE(null.nn)
-    assertThrowsNPE(len(null)) 
+    assertThrowsNPE(len(null))
     assertThrowsNPE(load(null))
   }
 }
diff --git a/tests/explicit-nulls/unsafe-common/unsafe-java-call/J.java b/tests/explicit-nulls/unsafe-common/unsafe-java-call/J.java
new file mode 100644
index 000000000000..554b91749889
--- /dev/null
+++ b/tests/explicit-nulls/unsafe-common/unsafe-java-call/J.java
@@ -0,0 +1,17 @@
+public class J {
+  public String f1() {
+    return "";
+  }
+
+  public int f2() {
+    return 0;
+  }
+
+  public <T> T g1() {
+    return null;
+  }
+}
+
+class J2<T> {
+  public T x = null;
+}
\ No newline at end of file
diff --git a/tests/explicit-nulls/unsafe-common/unsafe-java-call/S.scala b/tests/explicit-nulls/unsafe-common/unsafe-java-call/S.scala
new file mode 100644
index 000000000000..3b5108bacfa9
--- /dev/null
+++ b/tests/explicit-nulls/unsafe-common/unsafe-java-call/S.scala
@@ -0,0 +1,37 @@
+// Check Java calls have been cast to non-nullable.
+
+val j: J = new J
+
+val s1: String = j.f1() // error
+
+val s1n: String | Null = j.f1()
+
+val i1: Int = j.f2()
+
+val s2: String = j.g1[String]()  // error
+
+val s2n: String | Null = j.g1[String]()
+
+val s3: String = j.g1[String | Null]()  // error
+
+val s3n: String | Null = j.g1[String | Null]()
+
+val i2: Int = j.g1[Int]()  // error
+
+val a1: Any = j.g1[Any]()
+
+val ar1: AnyRef = j.g1[AnyRef]()  // error
+
+val n1: Null = j.g1[Null]()
+
+val ar2: AnyRef = j.g1[Null]()  // error
+
+def clo1[T]: T = j.g1[T]()  // error
+
+def clo2[T <: AnyRef]: T = j.g1[T | Null]()  // error
+
+def clo3[T >: Null <: AnyRef | Null]: T = j.g1[T]()
+
+def testJ2[T]: T =
+  val j2: J2[T] = new J2
+  j2.x // error
diff --git a/tests/fuzzy/07b22d72e723607d8f0dfef3f4c8fb8076387a7b.scala b/tests/fuzzy/07b22d72e723607d8f0dfef3f4c8fb8076387a7b.scala
new file mode 100644
index 000000000000..ab55d7506fdc
--- /dev/null
+++ b/tests/fuzzy/07b22d72e723607d8f0dfef3f4c8fb8076387a7b.scala
@@ -0,0 +1 @@
+val a = macro ??? // error
diff --git a/tests/generic-java-signatures/aliases.check b/tests/generic-java-signatures/aliases.check
new file mode 100644
index 000000000000..3e2613531871
--- /dev/null
+++ b/tests/generic-java-signatures/aliases.check
@@ -0,0 +1 @@
+scala.collection.immutable.List<java.lang.String>
diff --git a/tests/generic-java-signatures/aliases.scala b/tests/generic-java-signatures/aliases.scala
new file mode 100644
index 000000000000..6c22fa71b2db
--- /dev/null
+++ b/tests/generic-java-signatures/aliases.scala
@@ -0,0 +1,10 @@
+class Foo {
+  type A = List[String]
+  def foo(): A = Nil
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    println(classOf[Foo].getDeclaredMethod("foo").getGenericReturnType)
+  }
+}
diff --git a/tests/generic-java-signatures/derivedNames.scala b/tests/generic-java-signatures/derivedNames.scala
index 23df59ff561d..0cc5bc8a1ab7 100644
--- a/tests/generic-java-signatures/derivedNames.scala
+++ b/tests/generic-java-signatures/derivedNames.scala
@@ -4,12 +4,10 @@ object Test {
   def main(args: Array[String]): Unit = {
     val objectB = classOf[Foo[Any]].getClasses
     val returnType = objectB(1).getDeclaredMethod("m").getGenericReturnType.asInstanceOf[ParameterizedType]
-    val out1 = "Test$Foo.Test$Foo$A<Test.Test$Foo<T1>.B$>" // Windows and OSX
-    val out2 = "Test$Foo$A<Test$Foo<T1>$B$>"               // Linux and sometimes Windows
+    val out1 = "Test$Foo.Test$Foo$A<Test.Test$Foo<T1>.B$>" // Windows
+    val out2 = "Test$Foo$A<Test$Foo<T1>$B$>"               // Linux, OSX and sometimes Windows
     if (scala.util.Properties.isWin)
       assert(returnType.toString == out1 || returnType.toString == out2)
-    else if (scala.util.Properties.isMac)
-      assert(returnType.toString == out1, s"$returnType != $out1")
     else
       assert(returnType.toString == out2)
   }
diff --git a/tests/generic-java-signatures/i10834.check b/tests/generic-java-signatures/i10834.check
new file mode 100644
index 000000000000..24413b10401f
--- /dev/null
+++ b/tests/generic-java-signatures/i10834.check
@@ -0,0 +1,6 @@
+0
+
+public A1(X)
+0
+
+public A2(java.lang.Object)
diff --git a/tests/generic-java-signatures/i10834.scala b/tests/generic-java-signatures/i10834.scala
new file mode 100644
index 000000000000..91fb9d8c6ad1
--- /dev/null
+++ b/tests/generic-java-signatures/i10834.scala
@@ -0,0 +1,16 @@
+class A1[X](val x: X)
+class A2[F[_]](val x: F[String])
+
+object Test {
+  def test(clazz: Class[?]): Unit = {
+    val List(constructor) = clazz.getConstructors().toList
+    println(constructor.getTypeParameters().length)
+    println(constructor.getTypeParameters().mkString(", "))
+    println(constructor.toGenericString())
+  }
+
+  def main(args: Array[String]): Unit = {
+    test(classOf[A1[?]])
+    test(classOf[A2[?]])
+  }
+}
diff --git a/tests/init/crash/i8892.scala b/tests/init/crash/i8892.scala
new file mode 100644
index 000000000000..0a7e7223fe06
--- /dev/null
+++ b/tests/init/crash/i8892.scala
@@ -0,0 +1,28 @@
+trait Reporter:
+  def report(m: String): Unit
+
+class Dummy extends Reporter:
+  def report(m: String) = ()
+
+  object ABug {
+    sealed trait Nat {
+      transparent inline def ++ : Succ[this.type] = Succ(this)
+
+      transparent inline def +(inline that: Nat): Nat =
+        inline this match {
+          case Zero    => that
+          case Succ(p) => p + that.++
+      }
+    }
+
+    case object Zero extends Nat
+    case class Succ[N <: Nat](p: N) extends Nat
+
+    transparent inline def toIntg(inline n: Nat): Int =
+      inline n match {
+        case Zero    => 0
+        case Succ(p) => toIntg(p) + 1
+      }
+
+    val j31 = toIntg(Zero.++.++.++ + Zero.++)
+  }
\ No newline at end of file
diff --git a/tests/init/neg/apply.scala b/tests/init/neg/apply.scala
new file mode 100644
index 000000000000..2847115cc73c
--- /dev/null
+++ b/tests/init/neg/apply.scala
@@ -0,0 +1,47 @@
+case class A(b: B)
+
+object A:
+  def foo(b: B) = new A(b)
+  inline def bar(b: B) = new A(b)
+
+class B:
+  val a = A(this)
+  val a2 = A.foo(this)   // error
+  val a3 = A.bar(this)
+
+// test receiver is ThisRef
+
+object O:
+  case class A(b: B)
+
+  object A:
+    def foo(b: B) = new A(b)
+    inline def bar(b: B) = new A(b)
+
+  class B:
+    val a = A(this)
+    val a2 = A.foo(this)   // error
+    val a3 = A.bar(this)
+
+  val b = new B
+end O
+
+
+// test receiver is Warm
+
+class M(n: N):
+  case class A(b: B)
+
+  object A:
+    def foo(b: B) = new A(b)
+    inline def bar(b: B) = new A(b)
+
+  class B:
+    val a = A(this)
+    val a2 = A.foo(this)   // error
+    val a3 = A.bar(this)
+end M
+
+class N:
+  val m = new M(this)
+  val b = new m.B
diff --git a/tests/init/neg/apply2.scala b/tests/init/neg/apply2.scala
new file mode 100644
index 000000000000..6a42cc9a3acc
--- /dev/null
+++ b/tests/init/neg/apply2.scala
@@ -0,0 +1,10 @@
+object O:
+  case class A(b: B):
+    println(n)
+
+  class B:
+    val a = A(this)
+
+  val b = new B
+  val n = 10         // error
+end O
diff --git a/tests/init/neg/as-instance-of-cold-field-access.scala b/tests/init/neg/as-instance-of-cold-field-access.scala
new file mode 100644
index 000000000000..ec567326b4eb
--- /dev/null
+++ b/tests/init/neg/as-instance-of-cold-field-access.scala
@@ -0,0 +1,7 @@
+final class MyAsInstanceOfClass(o: MyAsInstanceOfClass) {
+  val other: MyAsInstanceOfClass = {
+    if (o.asInstanceOf[MyAsInstanceOfClass].oRef ne null) o // error
+    else new MyAsInstanceOfClass(this)
+  }
+  val oRef = o
+}
diff --git a/tests/init/neg/closureLeak.check b/tests/init/neg/closureLeak.check
new file mode 100644
index 000000000000..3bd3cdd09b9b
--- /dev/null
+++ b/tests/init/neg/closureLeak.check
@@ -0,0 +1,7 @@
+-- Error: tests/init/neg/closureLeak.scala:11:14 -----------------------------------------------------------------------
+11 |    l.foreach(a => a.addX(this)) // error
+   |              ^^^^^^^^^^^^^^^^^
+   |             Cannot prove that the value is fully initialized. Only initialized values may be used as arguments.
+   |
+   |             The unsafe promotion may cause the following problem:
+   |             Cannot prove that the value is fully initialized. Only initialized values may be used as arguments.
diff --git a/tests/init/neg/closureLeak.scala b/tests/init/neg/closureLeak.scala
new file mode 100644
index 000000000000..ae7db5124028
--- /dev/null
+++ b/tests/init/neg/closureLeak.scala
@@ -0,0 +1,13 @@
+class Outer {
+    val x = 10
+    class A(x: Int) {
+        var y: Int = x
+        def addX(o: Outer): Unit = {
+            y = y + o.x
+        }
+    }
+
+    val l: List[A] = List(new A(5), new A(10))
+    l.foreach(a => a.addX(this)) // error
+    val p = 10
+}
diff --git a/tests/init/neg/cycle-structure.check b/tests/init/neg/cycle-structure.check
new file mode 100644
index 000000000000..79e38ee80bb4
--- /dev/null
+++ b/tests/init/neg/cycle-structure.check
@@ -0,0 +1,14 @@
+-- Error: tests/init/neg/cycle-structure.scala:2:15 --------------------------------------------------------------------
+2 |    val x1 = b.x      // error
+  |             ^^^
+  |             Access field A.this.b.x on a value with an unknown initialization status. Calling trace:
+  |              -> val x = A(this)	[ cycle-structure.scala:9 ]
+  |               -> case class A(b: B) {	[ cycle-structure.scala:1 ]
+-- Error: tests/init/neg/cycle-structure.scala:8:15 --------------------------------------------------------------------
+8 |    val x1 = a.x      // error
+  |             ^^^
+  |             Access field B.this.a.x on a value with an unknown initialization status. Calling trace:
+  |              -> val x = A(this)	[ cycle-structure.scala:9 ]
+  |               -> case class A(b: B) {	[ cycle-structure.scala:1 ]
+  |                -> val x = B(this)	[ cycle-structure.scala:3 ]
+  |                 -> case class B(a: A) {	[ cycle-structure.scala:7 ]
diff --git a/tests/init/neg/cycle-structure.scala b/tests/init/neg/cycle-structure.scala
new file mode 100644
index 000000000000..937df774ee14
--- /dev/null
+++ b/tests/init/neg/cycle-structure.scala
@@ -0,0 +1,11 @@
+case class A(b: B) {
+    val x1 = b.x      // error
+    val x = B(this)
+    val y = x.a
+}
+
+case class B(a: A) {
+    val x1 = a.x      // error
+    val x = A(this)
+    val h = x.b
+}
diff --git a/tests/init/neg/cycle.scala b/tests/init/neg/cycle.scala
new file mode 100644
index 000000000000..55b7c28acbef
--- /dev/null
+++ b/tests/init/neg/cycle.scala
@@ -0,0 +1,11 @@
+class A(x: B) {
+  println(x.b) // error
+  val a = new B(this)
+  val d = a.b
+}
+
+class B(x: A) {
+  println(x.a) // error
+  val b = new A(this)
+  val d = b.a
+}
\ No newline at end of file
diff --git a/tests/init/neg/default-this.check b/tests/init/neg/default-this.check
new file mode 100644
index 000000000000..b9a74db0dc95
--- /dev/null
+++ b/tests/init/neg/default-this.check
@@ -0,0 +1,5 @@
+-- Error: tests/init/neg/default-this.scala:9:8 ------------------------------------------------------------------------
+9 |        compare() // error
+  |        ^^^^^^^
+  |Cannot prove that the value is fully initialized. Only initialized values may be used as arguments. Calling trace:
+  | -> val result = updateThenCompare(5)	[ default-this.scala:11 ]
diff --git a/tests/init/neg/default-this.scala b/tests/init/neg/default-this.scala
new file mode 100644
index 000000000000..1b0173fc134f
--- /dev/null
+++ b/tests/init/neg/default-this.scala
@@ -0,0 +1,12 @@
+class A {
+    var x: Int = 10
+    def compare(c: Int = 5, a: A = this): Boolean = if (c == a.x) true else false
+}
+
+class B extends A {
+    def updateThenCompare(c: Int): Boolean = {
+        x = c
+        compare() // error
+    }
+    val result = updateThenCompare(5)
+}
diff --git a/tests/init/neg/early-promote.scala b/tests/init/neg/early-promote.scala
new file mode 100644
index 000000000000..ac1a7c8fe82e
--- /dev/null
+++ b/tests/init/neg/early-promote.scala
@@ -0,0 +1,38 @@
+class Y {
+ class X {
+   class B {
+     def g = f
+     def g2 = n
+   }
+   val f = 42
+   val b = new B  // warm(B, X.this)
+ }
+
+ val n = 10
+ val x = new X
+ List(x.b)      // unsafe promotion
+
+}
+
+class A { // checking A
+  class B {
+    def bf = 42
+    class C {
+      def x = bf // uses outer[C], but never outer[B]
+    }
+    List((new C).x)
+    def c = new C
+  }
+  val b = new B()
+  List(b) // error: the checker simply issue warnings for objects that contain inner classes
+  val af = 42
+}
+
+class RecursiveF {
+  val a = f
+  def f: RecursiveF = f
+  class B(x: Int)
+
+  println(new a.B(5))
+  val n = 10
+}
diff --git a/tests/init/neg/early-promote2.scala b/tests/init/neg/early-promote2.scala
new file mode 100644
index 000000000000..514aed36a8ed
--- /dev/null
+++ b/tests/init/neg/early-promote2.scala
@@ -0,0 +1,6 @@
+class M {
+  println(this)       // error
+  foo()
+  private val a = 5   // error
+  def foo() = a
+}
diff --git a/tests/init/neg/early-promote3.scala b/tests/init/neg/early-promote3.scala
new file mode 100644
index 000000000000..ecb5bbedca69
--- /dev/null
+++ b/tests/init/neg/early-promote3.scala
@@ -0,0 +1,11 @@
+abstract class A {
+  bar()
+  private val a = 5
+  def foo() = a
+  def bar(): Unit
+}
+
+class M extends A {
+  def bar() = promote(this)    // error
+  def promote(m: M) = m.foo()
+}
diff --git a/tests/init/neg/early-promote4.scala b/tests/init/neg/early-promote4.scala
new file mode 100644
index 000000000000..65f917553974
--- /dev/null
+++ b/tests/init/neg/early-promote4.scala
@@ -0,0 +1,20 @@
+abstract class A {
+  bar()
+  def bar(): Unit
+}
+
+class Outer {
+  val a: Int = 5
+  trait B {
+    def bar() = assert(a == 5)
+  }
+}
+
+class M(val o: Outer) extends A with o.B {
+  val n: Int = 10
+}
+
+class Dummy {
+  val m: Int = n + 4
+  val n: Int = 10     // error
+}
\ No newline at end of file
diff --git a/tests/init/neg/early-promote5.scala b/tests/init/neg/early-promote5.scala
new file mode 100644
index 000000000000..be21b5e0133b
--- /dev/null
+++ b/tests/init/neg/early-promote5.scala
@@ -0,0 +1,25 @@
+abstract class A {
+  bar(this) // error
+  def bar(x: A): Unit
+}
+
+class Outer {
+  val a: Int = 4
+  trait B {
+    def bar(x: A) = println(a)
+  }
+}
+
+class M(val o: Outer, c: Container) extends A with o.B
+
+class Container {
+  val o = new Outer
+  val m = new M(o, this)
+  val s = "hello"
+}
+
+class Dummy {
+  val m: Int = n + 4
+  val n: Int = 10     // error
+}
+
diff --git a/tests/init/neg/enum-desugared.check b/tests/init/neg/enum-desugared.check
new file mode 100644
index 000000000000..6417b8c5cea7
--- /dev/null
+++ b/tests/init/neg/enum-desugared.check
@@ -0,0 +1,18 @@
+-- Error: tests/init/neg/enum-desugared.scala:17:15 --------------------------------------------------------------------
+17 |    Array(this.LazyErrorId, this.NoExplanationID) // error // error
+   |          ^^^^^^^^^^^^^^^^
+   |          Cannot prove that the value is fully initialized. May only use initialized value as method arguments.
+   |
+   |          The unsafe promotion may cause the following problem:
+   |          Calling the external method method name may cause initialization errors. Calling trace:
+   |           -> Array(this.LazyErrorId, this.NoExplanationID) // error // error	[ enum-desugared.scala:17 ]
+   |            -> override def productPrefix: String = this.name()	[ enum-desugared.scala:29 ]
+-- Error: tests/init/neg/enum-desugared.scala:17:33 --------------------------------------------------------------------
+17 |    Array(this.LazyErrorId, this.NoExplanationID) // error // error
+   |                            ^^^^^^^^^^^^^^^^^^^^
+   |           Cannot prove that the value is fully initialized. May only use initialized value as method arguments.
+   |
+   |           The unsafe promotion may cause the following problem:
+   |           Calling the external method method ordinal may cause initialization errors. Calling trace:
+   |            -> Array(this.LazyErrorId, this.NoExplanationID) // error // error	[ enum-desugared.scala:17 ]
+   |             -> def errorNumber: Int = this.ordinal() - 2	[ enum-desugared.scala:8 ]
diff --git a/tests/init/neg/enum-desugared.scala b/tests/init/neg/enum-desugared.scala
new file mode 100644
index 000000000000..eb80f112a06c
--- /dev/null
+++ b/tests/init/neg/enum-desugared.scala
@@ -0,0 +1,35 @@
+package example
+
+import language.`3.0-migration`
+
+sealed abstract class ErrorMessageID($name: String, _$ordinal: Int)
+  extends java.lang.Enum[ErrorMessageID]($name, _$ordinal) with scala.reflect.Enum {
+
+  def errorNumber: Int = this.ordinal() - 2
+}
+
+object ErrorMessageID {
+
+  final val LazyErrorId = $new(0, "LazyErrorId")
+  final val NoExplanationID = $new(1, "NoExplanationID")
+
+  private[this] val $values: Array[ErrorMessageID] =
+    Array(this.LazyErrorId, this.NoExplanationID) // error // error
+
+  def values: Array[ErrorMessageID] = $values.clone()
+
+  def valueOf($name: String): ErrorMessageID = $name match {
+    case "LazyErrorId" => this.LazyErrorId
+    case "NoExplanationID" => this.NoExplanationID
+    case _ => throw new IllegalArgumentException("enum case not found: " + $name)
+  }
+
+  private[this] def $new(_$ordinal: Int, $name: String): ErrorMessageID =
+    new ErrorMessageID($name, _$ordinal) with scala.runtime.EnumValue {
+        override def productPrefix: String = this.name()
+    }
+
+  def fromOrdinal(ordinal: Int): ErrorMessageID =
+    try ErrorMessageID.$values.apply(ordinal)
+    catch { case _ => throw new NoSuchElementException(ordinal.toString()) }
+}
\ No newline at end of file
diff --git a/tests/init/neg/enum.check b/tests/init/neg/enum.check
new file mode 100644
index 000000000000..eb48920b47ea
--- /dev/null
+++ b/tests/init/neg/enum.check
@@ -0,0 +1,8 @@
+-- Error: tests/init/neg/enum.scala:4:8 --------------------------------------------------------------------------------
+4 |        NoExplanationID // error
+  |        ^
+  |        Cannot prove that the value is fully initialized. May only use initialized value as method arguments.
+  |
+  |        The unsafe promotion may cause the following problem:
+  |        Calling the external method method name may cause initialization errors. Calling trace:
+  |         -> NoExplanationID // error	[ enum.scala:4 ]
diff --git a/tests/init/neg/enum.scala b/tests/init/neg/enum.scala
new file mode 100644
index 000000000000..925d61b620a4
--- /dev/null
+++ b/tests/init/neg/enum.scala
@@ -0,0 +1,6 @@
+enum ErrorMessageID extends java.lang.Enum[ErrorMessageID] {
+    case
+        LazyErrorId,
+        NoExplanationID // error
+    def errorNumber = ordinal - 2
+}
diff --git a/tests/init/neg/function-loop.scala b/tests/init/neg/function-loop.scala
new file mode 100644
index 000000000000..12048860c3a6
--- /dev/null
+++ b/tests/init/neg/function-loop.scala
@@ -0,0 +1,6 @@
+class Foo {
+  val f: Int => Foo = (x: Int) => if x > 0 then f(x) else this
+  f(10).n
+
+  val n = 10   // error
+}
\ No newline at end of file
diff --git a/tests/init/neg/function1.scala b/tests/init/neg/function1.scala
index e01864ae1f47..15427f3de750 100644
--- a/tests/init/neg/function1.scala
+++ b/tests/init/neg/function1.scala
@@ -4,7 +4,7 @@ class Foo {
   val fun2: Int => Int = n => 1 + n + list.size
   fun2(5)
 
-  List(5, 9).map(n => 2 + n + list.size)
+  List(5, 9).map(n => 2 + n + list.size)         // error
 
   final val list = List(1, 2, 3)                 // error
 
diff --git a/tests/init/neg/hybrid2.scala b/tests/init/neg/hybrid2.scala
index d5c8b037a324..a9f8246fd58d 100644
--- a/tests/init/neg/hybrid2.scala
+++ b/tests/init/neg/hybrid2.scala
@@ -13,7 +13,7 @@ class Y {
   }
 
   val x = new X
-  x.b.g               // error
+  x.b.g
 
-  val n = 10
+  val n = 10     // error
 }
diff --git a/tests/init/neg/i10549b.scala b/tests/init/neg/i10549b.scala
new file mode 100644
index 000000000000..7353844b3927
--- /dev/null
+++ b/tests/init/neg/i10549b.scala
@@ -0,0 +1,9 @@
+class Wrap {
+  def qux[T](e: E[T]) = e.foo
+
+  abstract class E[+T] { def foo: T }
+  object E {
+    final val A: E[Nothing] = new E { def foo = ref }
+    val ref = qux(A)      // error
+  }
+}
diff --git a/tests/init/neg/i12544.scala b/tests/init/neg/i12544.scala
new file mode 100644
index 000000000000..2692c27134e0
--- /dev/null
+++ b/tests/init/neg/i12544.scala
@@ -0,0 +1,19 @@
+enum Enum:
+  case Case
+  case Case2(x: Int)
+
+def g(b: Enum.B): Int = b.foo()
+
+object Enum:
+  object nested:
+    val a: Enum = Case
+
+  val b: Enum = f(nested.a)
+
+  def f(e: Enum): Enum = e
+
+  class B() { def foo() = n + 1 }
+  g(new B())                       // error
+  val n: Int = 10
+
+@main def main(): Unit = println(Enum.b)
diff --git a/tests/init/neg/inherit-non-hot.check b/tests/init/neg/inherit-non-hot.check
new file mode 100644
index 000000000000..af95b2a7284b
--- /dev/null
+++ b/tests/init/neg/inherit-non-hot.check
@@ -0,0 +1,16 @@
+-- Error: tests/init/neg/inherit-non-hot.scala:6:34 --------------------------------------------------------------------
+6 |            if b == null then b = new B(this) // error
+  |                                  ^^^^^^^^^^^
+  |                        Cannot prove that the value is fully initialized. May only assign fully initialized value.
+  |                         Calling trace:
+  |                         -> val c = new C	[ inherit-non-hot.scala:19 ]
+  |                            -> class C extends A {	[ inherit-non-hot.scala:15 ]
+  |                             -> val bAgain = toB.getBAgain	[ inherit-non-hot.scala:16 ]
+  |
+  |                        The unsafe promotion may cause the following problem:
+  |                        Call method Foo.B.this.aCopy.toB on a value with an unknown initialization. Calling trace:
+  |                         -> val c = new C	[ inherit-non-hot.scala:19 ]
+  |                            -> class C extends A {	[ inherit-non-hot.scala:15 ]
+  |                             -> val bAgain = toB.getBAgain	[ inherit-non-hot.scala:16 ]
+  |                              -> if b == null then b = new B(this) // error	[ inherit-non-hot.scala:6 ]
+  |                               -> def getBAgain: B = aCopy.toB	[ inherit-non-hot.scala:12 ]
diff --git a/tests/init/neg/inherit-non-hot.scala b/tests/init/neg/inherit-non-hot.scala
new file mode 100644
index 000000000000..44be67351630
--- /dev/null
+++ b/tests/init/neg/inherit-non-hot.scala
@@ -0,0 +1,21 @@
+// This is a minimized test for the warning in Names.scala:174
+object Foo {
+    abstract class A {
+        var b: B = null
+        def toB: B =
+            if b == null then b = new B(this) // error
+            b
+    }
+
+    class B(a: A) {
+        var aCopy: A = a
+        def getBAgain: B = aCopy.toB
+    }
+
+    class C extends A {
+        val bAgain = toB.getBAgain
+    }
+
+    val c = new C
+    assert(c.b == c.bAgain)
+}
\ No newline at end of file
diff --git a/tests/init/neg/inner-loop.scala b/tests/init/neg/inner-loop.scala
index c56f31a96757..c6d5c615580c 100644
--- a/tests/init/neg/inner-loop.scala
+++ b/tests/init/neg/inner-loop.scala
@@ -1,6 +1,6 @@
 class Outer { outer =>
   class Inner extends Outer {
-    val x = 5 + outer.n       // error
+    val x = 5 + outer.n
   }
   val inner = new Inner
   val n = 6               // error
@@ -13,3 +13,22 @@ class Outer2 { outer =>
   val inner = new Inner
   val n = 6
 }
+
+class Test  {
+  class Outer3 { outer =>
+    class Inner extends Outer3 {
+      val x = 5 + n
+    }
+    val inner = new Inner
+    val n = 6
+  }
+
+  val outer = new Outer3
+  // Warm objects with inner classes not checked.
+  // If we change policy to check more eagerly,
+  // the check has to avoid loop here.
+
+  println(outer)            // error
+
+  val m = 10
+}
\ No newline at end of file
diff --git a/tests/init/neg/inner1.scala b/tests/init/neg/inner1.scala
index bef2fd2d159e..d39c3ba2ac77 100644
--- a/tests/init/neg/inner1.scala
+++ b/tests/init/neg/inner1.scala
@@ -4,7 +4,7 @@ class Foo {
   val list = List(1, 2, 3) // error, as Inner access `this.list`
 
   val inner: Inner = new this.Inner // ok, `list` is instantiated
-  lib.escape(inner) // error
+  lib.escape(inner) // ok, can promote inner early
 
   val name = "good"
 
diff --git a/tests/init/neg/inner17.scala b/tests/init/neg/inner17.scala
index 441ed02767b3..756278cd5130 100644
--- a/tests/init/neg/inner17.scala
+++ b/tests/init/neg/inner17.scala
@@ -5,7 +5,7 @@ class A {
     val a = f
   }
 
-  println(new B)              // error
+  println(new B)              // OK, can promote B early
 }
 
 class C extends A {
diff --git a/tests/init/neg/inner19.scala b/tests/init/neg/inner19.scala
index 2089f777dc52..2e502eddc24c 100644
--- a/tests/init/neg/inner19.scala
+++ b/tests/init/neg/inner19.scala
@@ -14,6 +14,6 @@ class A {
 
 class B extends A {
   println((new O.B).f)
-  O.C(4)                // error
-  override val n = 50   // error
+  O.C(4)
+  override val n = 50   // error because line 16
 }
\ No newline at end of file
diff --git a/tests/init/neg/inner30.scala b/tests/init/neg/inner30.scala
new file mode 100644
index 000000000000..01bb5754d485
--- /dev/null
+++ b/tests/init/neg/inner30.scala
@@ -0,0 +1,21 @@
+object Scanners {
+  enum IndentWidth {
+    case Run(ch: Char, n: Int)
+    case Conc(l: IndentWidth, r: Run)
+  }
+
+  import IndentWidth.*
+
+  class Scanner {
+    def foo() =
+      Conc(Run('a', 3), Run('b', 4))
+      new LookAheadScanner
+
+    class LookAheadScanner() extends Scanner
+
+    foo()
+  }
+
+  val m: Int = n * 2
+  val n = 10   // error
+}
\ No newline at end of file
diff --git a/tests/init/neg/java1.scala b/tests/init/neg/java1.scala
new file mode 100644
index 000000000000..1eff09cb6ff1
--- /dev/null
+++ b/tests/init/neg/java1.scala
@@ -0,0 +1,11 @@
+import java.util.Spliterator
+import java.util.function.Consumer
+
+class A extends Spliterator.OfDouble:
+  def characteristics() = 10
+  def estimateSize() = 10
+  def trySplit() = ???
+  def tryAdvance(x$0: java.util.function.DoubleConsumer): Boolean = false
+
+  val m = n + 1
+  val n = 10     // error
diff --git a/tests/init/neg/leak-warm.check b/tests/init/neg/leak-warm.check
new file mode 100644
index 000000000000..8219283b3c16
--- /dev/null
+++ b/tests/init/neg/leak-warm.check
@@ -0,0 +1,8 @@
+-- Error: tests/init/neg/leak-warm.scala:18:26 -------------------------------------------------------------------------
+18 |    val l: List[A] = List(c, d) // error // error
+   |                          ^
+   |           Cannot prove that the value is fully initialized. May only use initialized value as method arguments.
+-- Error: tests/init/neg/leak-warm.scala:18:29 -------------------------------------------------------------------------
+18 |    val l: List[A] = List(c, d) // error // error
+   |                             ^
+   |           Cannot prove that the value is fully initialized. May only use initialized value as method arguments.
diff --git a/tests/init/neg/leak-warm.scala b/tests/init/neg/leak-warm.scala
new file mode 100644
index 000000000000..f562ab4ec416
--- /dev/null
+++ b/tests/init/neg/leak-warm.scala
@@ -0,0 +1,20 @@
+object leakWarm {
+    abstract class A(tag: Int) {
+        class B(x: Int) {
+            val y = x
+        }
+        def m(): B
+    }
+
+    class C(tag1: Int, tag2: Int) extends A(tag1) {
+        def m() = new B(5)
+    }
+
+    class D(tag1: Int, tag2: Int) extends A(tag1 + tag2) {
+        def m() = new B(tag1)
+    }
+    val c = new C(1, 2)
+    val d = new D(3, 4)
+    val l: List[A] = List(c, d) // error // error
+    val l2 = l.map(_.m())
+}
diff --git a/tests/init/neg/local-warm4.check b/tests/init/neg/local-warm4.check
new file mode 100644
index 000000000000..fda1ee1b928c
--- /dev/null
+++ b/tests/init/neg/local-warm4.check
@@ -0,0 +1,11 @@
+-- Error: tests/init/neg/local-warm4.scala:18:20 -----------------------------------------------------------------------
+18 |                a = newA // error
+   |                    ^^^^
+   |       Cannot prove that the value is fully initialized. May only assign fully initialized value. Calling trace:
+   |        -> val a = new A(5)	[ local-warm4.scala:26 ]
+   |           -> class A(x: Int) extends Foo(x) {	[ local-warm4.scala:6 ]
+   |            -> val b = new B(y)	[ local-warm4.scala:10 ]
+   |               -> class B(x: Int) extends A(x) {	[ local-warm4.scala:13 ]
+   |                 -> class A(x: Int) extends Foo(x) {	[ local-warm4.scala:6 ]
+   |                  -> increment()	[ local-warm4.scala:9 ]
+   |                   -> updateA()	[ local-warm4.scala:21 ]
diff --git a/tests/init/neg/local-warm4.scala b/tests/init/neg/local-warm4.scala
new file mode 100644
index 000000000000..a1b3030ba4de
--- /dev/null
+++ b/tests/init/neg/local-warm4.scala
@@ -0,0 +1,27 @@
+object localWarm {
+    abstract class Foo(x: Int) {
+        def increment(): Unit
+    }
+
+    class A(x: Int) extends Foo(x) {
+        var y = x
+        override def increment(): Unit = y = y + 1
+        increment()
+        val b = new B(y)
+    }
+
+    class B(x: Int) extends A(x) {
+        var a: A = this
+        override def increment(): Unit = {
+            def updateA(): Unit = {
+                val newA = new A(y)
+                a = newA // error
+            }
+            y = y + 1
+            updateA()
+        }
+        if y < 10 then increment()
+        val z = b.y
+    }
+    val a = new A(5)
+}
diff --git a/tests/init/neg/polyfun.scala b/tests/init/neg/polyfun.scala
new file mode 100644
index 000000000000..a3a3ecc76814
--- /dev/null
+++ b/tests/init/neg/polyfun.scala
@@ -0,0 +1,8 @@
+class Test {
+  val m: [T] => (arg: T) => T =
+    [T] => (arg: T) => {
+      println(n)
+      arg
+    }
+  val n = m.apply(arg = 23)   // error
+}
diff --git a/tests/init/neg/promotion-loop.check b/tests/init/neg/promotion-loop.check
new file mode 100644
index 000000000000..b53dd676081f
--- /dev/null
+++ b/tests/init/neg/promotion-loop.check
@@ -0,0 +1,7 @@
+-- Error: tests/init/neg/promotion-loop.scala:16:10 --------------------------------------------------------------------
+16 |  println(b)      // error
+   |          ^
+   |          Cannot prove that the value is fully initialized. Only initialized values may be used as arguments.
+   |
+   |          The unsafe promotion may cause the following problem:
+   |          Cannot prove that the value is fully initialized. Only initialized values may be used as arguments.
diff --git a/tests/init/neg/promotion-loop.scala b/tests/init/neg/promotion-loop.scala
new file mode 100644
index 000000000000..7f6856c34cae
--- /dev/null
+++ b/tests/init/neg/promotion-loop.scala
@@ -0,0 +1,19 @@
+class Test { test =>
+  class A {
+    val self = this
+  }
+
+  val a = new A
+  println(a)
+
+
+  class B {
+    val self = this
+    val outer = test
+  }
+
+  val b = new B
+  println(b)      // error
+
+  val n = 10
+}
\ No newline at end of file
diff --git a/tests/init/neg/scodec.scala b/tests/init/neg/scodec.scala
new file mode 100644
index 000000000000..19c2983b589d
--- /dev/null
+++ b/tests/init/neg/scodec.scala
@@ -0,0 +1,30 @@
+trait Codec[A] { self =>
+  final def withContext(context: String): Codec[A] =
+    class X extends Codec[A] {
+      def decode(bits: String) = 10
+      override def toString = s"$self"
+    }
+    new X
+
+  def decode(bits: String): Int
+
+  def decodeOnly[AA >: A]: Codec[AA] = {
+    val sup = this.decodeOnly[AA]
+    class Y extends Codec[AA] {
+      def decode(bits: String) = sup.decode(bits)
+    }
+    new Y
+  }
+
+}
+
+object codecs {
+  class Z extends Codec[String] {
+    override def decode(bits: String): Int = 0
+  }
+  val codec = new Z
+
+  println(codec)   // error
+
+  val n = 10 // prevent early promotion
+}
diff --git a/tests/init/neg/secondary-ctor.scala b/tests/init/neg/secondary-ctor.scala
new file mode 100644
index 000000000000..22eabcd57438
--- /dev/null
+++ b/tests/init/neg/secondary-ctor.scala
@@ -0,0 +1,19 @@
+class A(b: B, x: Int) {
+  def this(b: B) = {
+    this(b, 5)
+    println(b.n)  // error
+  }
+}
+
+class B(val d: D) {
+  val n: Int = 10
+}
+
+class C(b: B) extends A(b) {
+  def this(b: B, x: Int) = this(b)
+}
+
+class D {
+  val b = new B(this)
+  val c = new C(b, 5)
+}
diff --git a/tests/init/neg/secondary-ctor2.scala b/tests/init/neg/secondary-ctor2.scala
new file mode 100644
index 000000000000..1260cfbd51d1
--- /dev/null
+++ b/tests/init/neg/secondary-ctor2.scala
@@ -0,0 +1,25 @@
+class A(b: B, x: Int) {
+  def this(b: B) = {
+    this(b, 5)
+    class Inner() {
+      def foo() = println(b.n) // error: calling method on cold
+    }
+    Inner().foo()
+
+    val f = () => new A(b, 3)
+    f()
+  }
+}
+
+class B(val d: D) {
+  val n: Int = 10
+}
+
+class C(b: B) extends A(b) {
+  def this(b: B, x: Int) = this(b)
+}
+
+class D {
+  val b = new B(this)
+  val c = new C(b, 5)
+}
diff --git a/tests/init/neg/secondary-ctor3.scala b/tests/init/neg/secondary-ctor3.scala
new file mode 100644
index 000000000000..0001e74fc6b7
--- /dev/null
+++ b/tests/init/neg/secondary-ctor3.scala
@@ -0,0 +1,39 @@
+def foo() =
+  class L1(x: Int) { val n: Int = 5 }
+
+  class A(b: B, x: Int) {
+    class L2(x: Int) { val n: Int = 5 }
+
+    def this(b: B) = {
+      this(b, 5)
+      class Inner() {
+        def foo() = println(b.n) // error
+      }
+      Inner().foo()
+
+      val l1 = new L1(3)
+      println(l1.n)
+
+      val l2 = new L2(3)
+      println(l2.n)
+
+      (() => new A(b, 3))()  // ok
+    }
+  }
+
+  class B(val d: D) {
+    val n: Int = 10
+  }
+
+  trait T {
+    val m: Int = 10
+  }
+
+  class C(b: B) extends A(b) with T {
+    def this(b: B, x: Int) = this(b)
+  }
+
+  class D {
+    val b = new B(this)
+    val c = new C(b, 5)
+  }
diff --git a/tests/init/neg/secondary-ctor4.scala b/tests/init/neg/secondary-ctor4.scala
new file mode 100644
index 000000000000..e43c063541ed
--- /dev/null
+++ b/tests/init/neg/secondary-ctor4.scala
@@ -0,0 +1,61 @@
+trait D {
+  val n: Int = 10
+}
+
+class M(x: Int) {
+
+  def this(d: D) = {
+    this(d.n)
+
+    class L1(x: Int) { val n: Int = 5 }
+
+    class A(b: B, x: Int) {
+      println(d.n)      // error
+
+      class L2(x: Int) { val n: Int = 5 }
+
+      def this(b: B) = {
+        this(b, 5)
+        println(d.n)  // error
+
+        class Inner() {
+          println(d.n)   // error
+          println(b.n)   // error
+          def foo() = println(b.n)  // error
+        }
+        Inner().foo()
+
+        val l1 = new L1(3)
+        println(l1.n)
+
+        val l2 = new L2(3)
+        println(l2.n)
+
+        (() => new A(b, 3))()  // ok
+      }
+    }
+
+    class B(val d: D) {
+      val n: Int = 10
+    }
+
+    new A(new B(new D))
+
+    trait T {
+      val m: Int = 10
+    }
+
+    class C(b: B) extends A(b) with T {
+      def this(b: B, x: Int) = this(b)
+    }
+
+    class D {
+      val b = new B(this)
+      val c = new C(b, 5)
+    }
+  }
+}
+
+class N(d: D) extends M(d) {
+  val msg = "Scala"
+}
diff --git a/tests/init/neg/soundness1.scala b/tests/init/neg/soundness1.scala
index 8e048a8f72d8..ac4cb2721ef5 100644
--- a/tests/init/neg/soundness1.scala
+++ b/tests/init/neg/soundness1.scala
@@ -1,7 +1,29 @@
 class A(b: B) {
-  val b2 = new B(this) // error
+  val b2 = new B(this)
 }
 
 class B(a: A) {
-  val a2 = new A(this) // error
+  val a2 = new A(this)
 }
+
+object Test2:
+  class A(b: B) {
+    val b2 = new B(this)
+    val c = b2.a2
+  }
+
+  class B(a: A) {
+    val a2 = new A(this)
+    val c = a2.b2
+  }
+
+object Test3:
+  class A(b: B) {
+    println(b.a2)           // error
+    val b2 = new B(this)
+  }
+
+  class B(a: A) {
+    println(a.b2)           // error
+    val a2 = new A(this)
+  }
diff --git a/tests/init/neg/soundness2.scala b/tests/init/neg/soundness2.scala
index 9d460849c6b0..34d225e953de 100644
--- a/tests/init/neg/soundness2.scala
+++ b/tests/init/neg/soundness2.scala
@@ -1,3 +1,4 @@
 class C(c: C) {
-  val c2 = new C(this)   // error
+  val d = c.c2          // error
+  val c2 = new C(this)
 }
diff --git a/tests/init/neg/soundness6.scala b/tests/init/neg/soundness6.scala
index 09d55dba292c..a3f80df11d1b 100644
--- a/tests/init/neg/soundness6.scala
+++ b/tests/init/neg/soundness6.scala
@@ -1,5 +1,5 @@
 class C(c: C) {
-  println(c.n)
-  val c2 = new C(this)  // error
+  println(c.n)          // error
+  val c2 = new C(this)
   val n = 10
 }
diff --git a/tests/init/neg/structural.scala b/tests/init/neg/structural.scala
new file mode 100644
index 000000000000..27b37a04bef7
--- /dev/null
+++ b/tests/init/neg/structural.scala
@@ -0,0 +1,12 @@
+import reflect.Selectable.reflectiveSelectable
+
+class Test {
+  trait A
+  val m: A { def apply(x: Int): Int } =
+    new A {
+      def apply(x: Int): Int =
+        n + x
+    }
+
+  val n = m(23)   // error
+}
diff --git a/tests/init/neg/super.scala b/tests/init/neg/super.scala
new file mode 100644
index 000000000000..5a8e72cce65f
--- /dev/null
+++ b/tests/init/neg/super.scala
@@ -0,0 +1,30 @@
+trait A:
+  def foo() = 1
+
+trait B:
+  def foo() = 1
+
+trait C:
+  def foo() = n
+  def n: Int
+
+class Foo extends A, B, C:
+  super[A].foo()
+
+  override def foo() = n
+
+  val n = 10
+
+class Bar extends A, B, C:
+  super[C].foo()
+
+  override def foo() = n * n
+
+  val n = 10  // error
+
+class Qux extends A, B, C:
+  super.foo()
+
+  override def foo() = n * n
+
+  val n = 10 // error
diff --git a/tests/init/neg/t3273.check b/tests/init/neg/t3273.check
index 74c016ef521f..531e8f6f5ad3 100644
--- a/tests/init/neg/t3273.check
+++ b/tests/init/neg/t3273.check
@@ -1,22 +1,16 @@
 -- Error: tests/init/neg/t3273.scala:4:42 ------------------------------------------------------------------------------
 4 |  val num1: LazyList[Int] = 1 #:: num1.map(_ + 1)                        // error
   |                                  ^^^^^^^^^^^^^^^
-  |             Promoting the value to fully-initialized is unsafe.
-  |              Calling trace:
-  |              -> val num1: LazyList[Int] = 1 #:: num1.map(_ + 1)                        // error	[ t3273.scala:4 ]
-  |
-  |             The unsafe promotion may cause the following problem(s):
+  |             Cannot prove that the value is fully initialized. Only initialized values may be used as arguments.
   |
-  |             1. Access non-initialized value num1. Calling trace:
+  |             The unsafe promotion may cause the following problem:
+  |             Access non-initialized value num1. Calling trace:
   |              -> val num1: LazyList[Int] = 1 #:: num1.map(_ + 1)                        // error	[ t3273.scala:4 ]
 -- Error: tests/init/neg/t3273.scala:5:61 ------------------------------------------------------------------------------
 5 |  val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList)  // error
   |                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |             Promoting the value to fully-initialized is unsafe.
-  |              Calling trace:
-  |              -> val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList)  // error	[ t3273.scala:5 ]
-  |
-  |             The unsafe promotion may cause the following problem(s):
+  |             Cannot prove that the value is fully initialized. Only initialized values may be used as arguments.
   |
-  |             1. Access non-initialized value num2. Calling trace:
+  |             The unsafe promotion may cause the following problem:
+  |             Access non-initialized value num2. Calling trace:
   |              -> val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList)  // error	[ t3273.scala:5 ]
diff --git a/tests/init/neg/trait1.scala b/tests/init/neg/trait1.scala
new file mode 100644
index 000000000000..48eae248fee7
--- /dev/null
+++ b/tests/init/neg/trait1.scala
@@ -0,0 +1,10 @@
+abstract class A(x: Int) {
+  def foo(): Unit
+  foo()
+}
+
+trait B(val y: Int)    // error
+
+class C extends A(10) with B(20)  {
+  def foo(): Unit = println(y)
+}
\ No newline at end of file
diff --git a/tests/init/neg/trait2.scala b/tests/init/neg/trait2.scala
new file mode 100644
index 000000000000..6011c259b73f
--- /dev/null
+++ b/tests/init/neg/trait2.scala
@@ -0,0 +1,14 @@
+abstract class A(x: Int) {
+  def foo(): Unit
+  foo()
+}
+
+trait B(val y: Int)   // error
+
+class D {
+  class C extends A(10) with B(20)  {
+    def foo(): Unit = println(y)
+  }
+
+  val c = new C
+}
\ No newline at end of file
diff --git a/tests/init/neg/unsound1.check b/tests/init/neg/unsound1.check
new file mode 100644
index 000000000000..54e24546845c
--- /dev/null
+++ b/tests/init/neg/unsound1.check
@@ -0,0 +1,4 @@
+-- Error: tests/init/neg/unsound1.scala:2:35 ---------------------------------------------------------------------------
+2 |  if (m > 0) println(foo(m - 1).a2.n) // error
+  |                     ^^^^^^^^^^^^^^^
+  |                     Access field A.this.foo(A.this.m.-(1)).a2.n on a value with an unknown initialization status.
diff --git a/tests/init/neg/unsound1.scala b/tests/init/neg/unsound1.scala
new file mode 100644
index 000000000000..3854504c8478
--- /dev/null
+++ b/tests/init/neg/unsound1.scala
@@ -0,0 +1,11 @@
+class A(m: Int) {
+  if (m > 0) println(foo(m - 1).a2.n) // error
+  def foo(n: Int): B =
+    if (n % 2 == 0)
+      new B(new A(n - 1), foo(n - 1).a1)
+    else
+      new B(this, new A(n - 1))
+  var n: Int = 10
+}
+
+class B(val a1: A, val a2: A)
\ No newline at end of file
diff --git a/tests/init/neg/unsound2.check b/tests/init/neg/unsound2.check
new file mode 100644
index 000000000000..346caec4cb1b
--- /dev/null
+++ b/tests/init/neg/unsound2.check
@@ -0,0 +1,6 @@
+-- Error: tests/init/neg/unsound2.scala:5:26 ---------------------------------------------------------------------------
+5 |        def getN: Int = a.n // error
+  |                        ^^^
+  | Access field B.this.a.n on a value with an unknown initialization status. Calling trace:
+  |  -> println(foo(x).getB)	[ unsound2.scala:8 ]
+  |   -> def foo(y: Int): B = if (y > 10) then B(bar(y - 1), foo(y - 1).getN) else B(bar(y), 10)	[ unsound2.scala:2 ]
diff --git a/tests/init/neg/unsound2.scala b/tests/init/neg/unsound2.scala
new file mode 100644
index 000000000000..5ae0c624c32e
--- /dev/null
+++ b/tests/init/neg/unsound2.scala
@@ -0,0 +1,10 @@
+case class A(x: Int) {
+    def foo(y: Int): B = if (y > 10) then B(bar(y - 1), foo(y - 1).getN) else B(bar(y), 10)
+    def bar(y: Int): A = if (y > 10) then A(y - 1) else this
+    class B(a: A, b: Int) {
+        def getN: Int = a.n // error
+        def getB: Int = b
+    }
+    println(foo(x).getB)
+    val n: Int = 10
+}
\ No newline at end of file
diff --git a/tests/init/neg/unsound3.check b/tests/init/neg/unsound3.check
new file mode 100644
index 000000000000..71766cf2d10b
--- /dev/null
+++ b/tests/init/neg/unsound3.check
@@ -0,0 +1,5 @@
+-- Error: tests/init/neg/unsound3.scala:10:38 --------------------------------------------------------------------------
+10 |        if (x < 12) then foo().getC().b else newB // error
+   |                         ^^^^^^^^^^^^^^
+   |             Access field C.this.foo().getC().b on a value with an unknown initialization status. Calling trace:
+   |              -> val b = foo()	[ unsound3.scala:12 ]
diff --git a/tests/init/neg/unsound3.scala b/tests/init/neg/unsound3.scala
new file mode 100644
index 000000000000..9ede5c7f97d0
--- /dev/null
+++ b/tests/init/neg/unsound3.scala
@@ -0,0 +1,13 @@
+class B(c: C) {
+    def getC() = c
+}
+
+class C {
+    var x = 10
+    def foo(): B = {
+        x += 1
+        val newB = new B(this)
+        if (x < 12) then foo().getC().b else newB // error
+    }
+    val b = foo()
+}
\ No newline at end of file
diff --git a/tests/init/neg/unsound4.check b/tests/init/neg/unsound4.check
new file mode 100644
index 000000000000..4ed254444928
--- /dev/null
+++ b/tests/init/neg/unsound4.check
@@ -0,0 +1,6 @@
+-- Error: tests/init/neg/unsound4.scala:3:8 ----------------------------------------------------------------------------
+3 |    val aAgain = foo(5) // error
+  |        ^
+  |        Access non-initialized value aAgain. Calling trace:
+  |         -> val aAgain = foo(5) // error	[ unsound4.scala:3 ]
+  |          -> def foo(x: Int): A = if (x < 5) then this else foo(x - 1).aAgain	[ unsound4.scala:2 ]
diff --git a/tests/init/neg/unsound4.scala b/tests/init/neg/unsound4.scala
new file mode 100644
index 000000000000..8a6e26fe8a6b
--- /dev/null
+++ b/tests/init/neg/unsound4.scala
@@ -0,0 +1,4 @@
+class A {
+    def foo(x: Int): A = if (x < 5) then this else foo(x - 1).aAgain
+    val aAgain = foo(5) // error
+}
\ No newline at end of file
diff --git a/tests/init/pos/Desugar.scala b/tests/init/pos/Desugar.scala
new file mode 100644
index 000000000000..4b8f7ca8b460
--- /dev/null
+++ b/tests/init/pos/Desugar.scala
@@ -0,0 +1,15 @@
+trait A
+
+class Tree[-A >: Int] {
+    val x: Int = 10
+}
+
+case class C[-T >: Int] (lhs: Int, rhs: Tree[T]) extends A {
+    val x = rhs.x
+}
+
+object DesugarError {
+    val f: PartialFunction[A, Int] = {case C(_, rhs) => rhs.x}
+}
+
+
diff --git a/tests/init/pos/InteractiveDriver.scala b/tests/init/pos/InteractiveDriver.scala
new file mode 100644
index 000000000000..a1f3a4d197bc
--- /dev/null
+++ b/tests/init/pos/InteractiveDriver.scala
@@ -0,0 +1,23 @@
+trait InteractiveDriver[A <: AnyVal] {
+    val x: AnyVal
+    def g(x: A): A
+}
+
+class C[A <: AnyVal] extends InteractiveDriver[A] {
+    val x = 0
+    def g(x: A) = x
+}
+
+class D[A <: AnyVal] extends InteractiveDriver[A] {
+    val x = 1.5
+    def g(x: A) = x
+}
+
+object InteractiveDriver {
+    def h(x: InteractiveDriver[?]): C[?] = x match {
+        case c: C[?] => c
+        case _ => new C[Int]
+    }
+    val l: Seq[Any] = Seq(1, 2, new C[Double], new D[Int])
+    val l2: Seq[C[?]] = l.collect{ case x: InteractiveDriver[?] => h(x) }
+}
diff --git a/tests/init/pos/Parsers.scala b/tests/init/pos/Parsers.scala
new file mode 100644
index 000000000000..2fa3f16839ba
--- /dev/null
+++ b/tests/init/pos/Parsers.scala
@@ -0,0 +1,10 @@
+object Parsers {
+  enum Location(val inParens: Boolean, val inPattern: Boolean, val inArgs: Boolean):
+    case InParens      extends Location(true, false, false)
+    case InArgs        extends Location(true, false, true)
+    case InPattern     extends Location(false, true, false)
+    case InGuard       extends Location(false, false, false)
+    case InPatternArgs extends Location(false, true, true) // InParens not true, since it might be an alternative
+    case InBlock       extends Location(false, false, false)
+    case ElseWhere     extends Location(false, false, false)
+}
\ No newline at end of file
diff --git a/tests/init/pos/enums.scala b/tests/init/pos/enums.scala
new file mode 100644
index 000000000000..76722e084ab1
--- /dev/null
+++ b/tests/init/pos/enums.scala
@@ -0,0 +1,6 @@
+enum Color(val x: Int) {
+  case Green  extends Color(3)
+  // case Red    extends Color(2)
+  case Violet extends Color(Green.x + 1)
+  // case RGB(xx: Int) extends Color(xx)
+}
diff --git a/tests/init/pos/eq-ne-always-valid.scala b/tests/init/pos/eq-ne-always-valid.scala
new file mode 100644
index 000000000000..8f1348e69587
--- /dev/null
+++ b/tests/init/pos/eq-ne-always-valid.scala
@@ -0,0 +1,13 @@
+final class MyNeClass(o: MyNeClass) {
+  val other: MyNeClass = {
+    if (o ne null) o // o is cold, but ne is always valid
+    else new MyNeClass(this)
+  }
+}
+
+final class MyEqClass(o: MyEqClass) {
+  val other: MyEqClass = {
+    if (o eq null) new MyEqClass(this) // o is cold, but eq is always valid
+    else o
+  }
+}
diff --git a/tests/init/pos/i10549a.scala b/tests/init/pos/i10549a.scala
new file mode 100644
index 000000000000..23ccbff747f4
--- /dev/null
+++ b/tests/init/pos/i10549a.scala
@@ -0,0 +1,7 @@
+class Wrap {
+  class E
+  object E {
+    final val A = new E {}
+    val $values = Array(A)
+  }
+}
diff --git a/tests/init/pos/i12544.scala b/tests/init/pos/i12544.scala
new file mode 100644
index 000000000000..e5e3c9a2ade2
--- /dev/null
+++ b/tests/init/pos/i12544.scala
@@ -0,0 +1,12 @@
+enum Enum:
+  case Case
+
+object Enum:
+  object nested:
+    val a: Enum = Case
+
+  val b: Enum = f(nested.a)
+
+  def f(e: Enum): Enum = e
+
+@main def main(): Unit = println(Enum.b)
diff --git a/tests/init/pos/instance-of-always-valid.scala b/tests/init/pos/instance-of-always-valid.scala
new file mode 100644
index 000000000000..5f6f71c5335c
--- /dev/null
+++ b/tests/init/pos/instance-of-always-valid.scala
@@ -0,0 +1,22 @@
+final class MyIsInstanceOfClass(o: MyIsInstanceOfClass) {
+  val other: MyIsInstanceOfClass = {
+    if (!o.isInstanceOf[Object]) new MyIsInstanceOfClass(this) // o is cold, but isInstanceOf is always valid
+    else o
+  }
+}
+
+final class MyAsInstanceOfClass(o: MyAsInstanceOfClass) {
+  val other: MyAsInstanceOfClass = {
+    if (o.asInstanceOf[Object] ne null) o // o is cold, but ne and AsInstanceOf is always valid
+    else new MyAsInstanceOfClass(this)
+  }
+}
+
+final class MyAsInstanceOfFieldClass(o: MyAsInstanceOfFieldClass) {
+  val oRef = o
+  val other: MyAsInstanceOfFieldClass = {
+    if (this.asInstanceOf[MyAsInstanceOfFieldClass].oRef ne null) oRef // o is cold, but ne and AsInstanceOf is always valid
+    else new MyAsInstanceOfFieldClass(this)
+  }
+}
+
diff --git a/tests/init/neg/lazylist1.scala b/tests/init/pos/lazylist1.scala
similarity index 92%
rename from tests/init/neg/lazylist1.scala
rename to tests/init/pos/lazylist1.scala
index 75556d73aa74..3ff0f9bc449d 100644
--- a/tests/init/neg/lazylist1.scala
+++ b/tests/init/pos/lazylist1.scala
@@ -2,7 +2,7 @@ class LazyList[A]
 
 object LazyList {
   inline implicit def toDeferred[A](l: LazyList[A]): Deferred[A] =
-    new Deferred(l)  // error
+    new Deferred(l)
 
   final class Deferred[A](l: => LazyList[A]) {
     def #:: [B >: A](elem: => B): LazyList[B] = ???
diff --git a/tests/init/pos/leak-this-inner.scala b/tests/init/pos/leak-this-inner.scala
new file mode 100644
index 000000000000..bdabde0dbf7a
--- /dev/null
+++ b/tests/init/pos/leak-this-inner.scala
@@ -0,0 +1,8 @@
+class A {
+    val x = 10
+    class B(a: A) {
+        val anotherX = A.this.x
+    }
+    val b = B(this) // error
+    val xAgain = b.anotherX
+}
diff --git a/tests/init/pos/leak-this.scala b/tests/init/pos/leak-this.scala
new file mode 100644
index 000000000000..7c6fbeafeb51
--- /dev/null
+++ b/tests/init/pos/leak-this.scala
@@ -0,0 +1,11 @@
+class Parent {
+    val child: Child = new Child(this) // error
+}
+
+class Child(parent: Parent) {
+    val friend = new Friend(this.parent)
+}
+
+class Friend(parent: Parent) {
+    val tag = 10
+}
diff --git a/tests/init/pos/local-warm.scala b/tests/init/pos/local-warm.scala
new file mode 100644
index 000000000000..04dea6b5e3c6
--- /dev/null
+++ b/tests/init/pos/local-warm.scala
@@ -0,0 +1,16 @@
+abstract class A {
+    def m() = 10
+    def m1(): B = new B
+    def m2(): Int = m1().m()
+    class B extends A {
+        def x = 10
+    }
+}
+
+class C extends A {
+    def g() = {
+        val t = m1() // error
+        t.x
+    }
+    val x = g()
+}
diff --git a/tests/init/pos/local-warm2.scala b/tests/init/pos/local-warm2.scala
new file mode 100644
index 000000000000..ebe5c8900c92
--- /dev/null
+++ b/tests/init/pos/local-warm2.scala
@@ -0,0 +1,14 @@
+class A {
+    var v = 5
+    val x = {
+        class B {
+            def doubleAndReturnV(): Int = {
+                v = v * 2
+                v
+            }
+        }
+        val b = new B
+        b.doubleAndReturnV()
+    }
+    val y = v
+}
\ No newline at end of file
diff --git a/tests/init/pos/local-warm3.scala b/tests/init/pos/local-warm3.scala
new file mode 100644
index 000000000000..047dd0d7a9e8
--- /dev/null
+++ b/tests/init/pos/local-warm3.scala
@@ -0,0 +1,10 @@
+class A() {
+    var x = 5
+    def decreaseX(): Unit = {
+        val self = this
+        self.x -= 1
+    }
+    def decreaseXToZero(): Unit = if x > 0 then decreaseX()
+    decreaseXToZero()
+    val y = x
+}
\ No newline at end of file
diff --git a/tests/init/pos/local-warm5.scala b/tests/init/pos/local-warm5.scala
new file mode 100644
index 000000000000..705b92362c3f
--- /dev/null
+++ b/tests/init/pos/local-warm5.scala
@@ -0,0 +1,12 @@
+object leakWarm5 {
+    case class A(x: Int) {
+        def double(): A = {
+            class C {
+                def double(): A = if x < 10 then A(x * 2).double() else A.this
+            }
+            val c = new C
+            c.double()
+        }
+    }
+    val a = A(2).double()
+}
diff --git a/tests/init/pos/methodAtLast.scala b/tests/init/pos/methodAtLast.scala
new file mode 100644
index 000000000000..02fbf1501bd8
--- /dev/null
+++ b/tests/init/pos/methodAtLast.scala
@@ -0,0 +1,11 @@
+class Foo(x: Int) {
+    var y: Int = x
+    case class Bar(z: Int) extends Foo(z)
+    def updateY(n: Int): Unit = {
+        if (y < 20) {
+            val b = new Bar(x + n)
+            y = b.z
+        }
+    }
+    updateY(5)
+}
diff --git a/tests/init/pos/second-ctor-fields.scala b/tests/init/pos/second-ctor-fields.scala
new file mode 100644
index 000000000000..70e7b46791b6
--- /dev/null
+++ b/tests/init/pos/second-ctor-fields.scala
@@ -0,0 +1,17 @@
+
+class A(b: B) {
+  def this(b: B, m: Int) = {
+    this(b)
+    def foo = m // resolved to parameter `m`
+    class C { foo } // resolved to parameter `m`, as hidden field of `A`
+    new C
+  }
+}
+
+class D(b: B) extends A(b, 10) {
+  val n = 10
+}
+
+class B {
+  val a = new D(this)
+}
diff --git a/tests/init/special/i12128/Macro_2.scala b/tests/init/special/i12128/Macro_2.scala
new file mode 100644
index 000000000000..0f5b866e6f1c
--- /dev/null
+++ b/tests/init/special/i12128/Macro_2.scala
@@ -0,0 +1,21 @@
+import scala.quoted._
+import scala.language.experimental.macros
+
+class Location(val line: Int)
+
+object MacroCompat {
+  trait LocationMacro {
+    inline implicit def generate: Location = ${ locationImpl() }
+    implicit def generate: Location = macro MacroCompatScala2.locationImpl
+  }
+
+  def locationImpl()(using Quotes): Expr[Location] = '{ new Location(${Expr(0)}) }
+}
+
+object MacroCompatScala2 {
+  def locationImpl(c: Context): c.Tree = {
+    import c.universe._
+    val line = Literal(Constant(c.enclosingPosition.line))
+    New(c.mirror.staticClass(classOf[Location].getName()), line)
+  }
+}
diff --git a/tests/init/special/i12128/Reflect_1.scala b/tests/init/special/i12128/Reflect_1.scala
new file mode 100644
index 000000000000..2c2e39de73a3
--- /dev/null
+++ b/tests/init/special/i12128/Reflect_1.scala
@@ -0,0 +1,30 @@
+trait Context: // Dummy scala.reflect.macros.Context
+  type Tree = universe.Tree
+  val universe: Universe
+
+  trait Universe {
+    type Tree >: Null <: AnyRef with TreeApi
+    type Literal >: Null <: LiteralApi with TermTree
+    type TermTree >: Null <: TermTreeApi with Tree
+
+    trait TermTreeApi extends TreeApi { this: TermTree => }
+    trait LiteralApi extends TermTreeApi { this: Literal => }
+    trait TreeApi extends Product { this: Tree => }
+
+    type Constant
+
+    type Type
+
+    def Literal(const: Constant): Tree
+    def Constant(i: Int): Constant
+    def New(tpe: Type, arg: Tree): Tree
+  }
+
+  def enclosingPosition: Position
+
+  trait Mirror {
+    def staticClass(name: String): universe.Type
+  }
+  val mirror: Mirror
+
+class Position(val line: Int)
diff --git a/tests/init/special/i12128/Test_3.scala b/tests/init/special/i12128/Test_3.scala
new file mode 100644
index 000000000000..070465a7e950
--- /dev/null
+++ b/tests/init/special/i12128/Test_3.scala
@@ -0,0 +1 @@
+object Test extends MacroCompat.LocationMacro
diff --git a/tests/invalid/neg/typelevel-erased-leak.scala b/tests/invalid/neg/typelevel-erased-leak.scala
index ce44137109f6..4875678dbdcc 100644
--- a/tests/invalid/neg/typelevel-erased-leak.scala
+++ b/tests/invalid/neg/typelevel-erased-leak.scala
@@ -1,6 +1,6 @@
 
 object typelevel {
-  erased def erasedValue[T]: T = ???
+  erased def erasedValue[T]: T = compiletime.erasedValue
 }
 
 object Test {
diff --git a/tests/invalid/run/Tuple.scala b/tests/invalid/run/Tuple.scala
index 9da7e941b098..5d9f013d1f5a 100644
--- a/tests/invalid/run/Tuple.scala
+++ b/tests/invalid/run/Tuple.scala
@@ -2,7 +2,7 @@ import annotation.showAsInfix
 
 // This version of Tuple requires full retyping of untyped trees on inlining
 object typelevel {
-  erased def erasedValue[T]: T = ???
+  erased def erasedValue[T]: T = compiletime.erasedValue
   class Typed[T](val value: T) { type Type = T }
 }
 
diff --git a/tests/neg-custom-args/deprecation/14034b.scala b/tests/neg-custom-args/deprecation/14034b.scala
new file mode 100644
index 000000000000..d22a945fe10d
--- /dev/null
+++ b/tests/neg-custom-args/deprecation/14034b.scala
@@ -0,0 +1,14 @@
+
+@deprecated trait Exp
+@deprecated val exp = 1
+
+def test1 = exp // error
+def test2(a: Exp) = () // error
+
+type Foo0 = Exp // error
+type Foo = Option[Exp] // error
+type Bar = Option[exp.type] // error
+type Baz = Exp | Int // error
+type Quux = [X] =>> X match // error
+  case Exp => Int
+type Quuz[A <: Exp] = Int // error
diff --git a/tests/neg-custom-args/deprecation/i12597.scala b/tests/neg-custom-args/deprecation/i12597.scala
new file mode 100644
index 000000000000..7927dded0cbc
--- /dev/null
+++ b/tests/neg-custom-args/deprecation/i12597.scala
@@ -0,0 +1,5 @@
+@main def Test =
+  val a: IArray[Int] = IArray(2)
+  val b: IArray[Any] = a
+  val c = b.toArray // error: deprecated
+  c(0) = ""
diff --git a/tests/neg-custom-args/deprecation/manifest-summoning.check b/tests/neg-custom-args/deprecation/manifest-summoning.check
new file mode 100644
index 000000000000..aa1462f8baba
--- /dev/null
+++ b/tests/neg-custom-args/deprecation/manifest-summoning.check
@@ -0,0 +1,14 @@
+-- Error: tests/neg-custom-args/deprecation/manifest-summoning.scala:1:34 ----------------------------------------------
+1 |val foo = manifest[List[? <: Int]] // error
+  |                                  ^
+  |                                  Compiler synthesis of Manifest and OptManifest is deprecated, instead
+  |                                  replace with the type `scala.reflect.ClassTag[List[? <: Int]]`.
+  |                                  Alternatively, consider using the new metaprogramming features of Scala 3,
+  |                                  see https://docs.scala-lang.org/scala3/reference/metaprogramming.html
+-- Error: tests/neg-custom-args/deprecation/manifest-summoning.scala:2:41 ----------------------------------------------
+2 |val bar = optManifest[Array[? <: String]] // error
+  |                                         ^
+  |                                        Compiler synthesis of Manifest and OptManifest is deprecated, instead
+  |                                        replace with the type `scala.reflect.ClassTag[Array[? <: String]]`.
+  |                                        Alternatively, consider using the new metaprogramming features of Scala 3,
+  |                                        see https://docs.scala-lang.org/scala3/reference/metaprogramming.html
diff --git a/tests/neg-custom-args/deprecation/manifest-summoning.scala b/tests/neg-custom-args/deprecation/manifest-summoning.scala
new file mode 100644
index 000000000000..7e9d9ee2cc9d
--- /dev/null
+++ b/tests/neg-custom-args/deprecation/manifest-summoning.scala
@@ -0,0 +1,2 @@
+val foo = manifest[List[? <: Int]] // error
+val bar = optManifest[Array[? <: String]] // error
diff --git a/tests/neg-custom-args/deprecation/t3235-minimal.check b/tests/neg-custom-args/deprecation/t3235-minimal.check
new file mode 100644
index 000000000000..665caab69d8d
--- /dev/null
+++ b/tests/neg-custom-args/deprecation/t3235-minimal.check
@@ -0,0 +1,16 @@
+-- Error: tests/neg-custom-args/deprecation/t3235-minimal.scala:3:21 ---------------------------------------------------
+3 |    assert(123456789.round == 123456789) // error
+  |           ^^^^^^^^^^^^^^^
+  |method round in class RichInt is deprecated since 2.11.0: this is an integer type; there is no reason to round it.  Perhaps you meant to call this on a floating-point value?
+-- Error: tests/neg-custom-args/deprecation/t3235-minimal.scala:4:16 ---------------------------------------------------
+4 |    assert(math.round(123456789) == 123456789) // error
+  |           ^^^^^^^^^^
+  |method round in package scala.math is deprecated since 2.11.0: This is an integer type; there is no reason to round it. Perhaps you meant to call this with a floating-point value?
+-- Error: tests/neg-custom-args/deprecation/t3235-minimal.scala:5:32 ---------------------------------------------------
+5 |    assert(1234567890123456789L.round == 1234567890123456789L) // error
+  |           ^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |method round in class RichLong is deprecated since 2.11.0: this is an integer type; there is no reason to round it.  Perhaps you meant to call this on a floating-point value?
+-- Error: tests/neg-custom-args/deprecation/t3235-minimal.scala:6:16 ---------------------------------------------------
+6 |    assert(math.round(1234567890123456789L) == 1234567890123456789L) // error
+  |           ^^^^^^^^^^
+  |method round in package scala.math is deprecated since 2.11.0: This is an integer type; there is no reason to round it. Perhaps you meant to call this with a floating-point value?
diff --git a/tests/neg-custom-args/explicit-nulls/byname-nullables.check b/tests/neg-custom-args/explicit-nulls/byname-nullables.check
index efe94a496c19..ffd0a637563e 100644
--- a/tests/neg-custom-args/explicit-nulls/byname-nullables.check
+++ b/tests/neg-custom-args/explicit-nulls/byname-nullables.check
@@ -3,8 +3,8 @@
    |                        ^
    |                        Found:    (x : String | Null)
    |                        Required: String
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- Error: tests/neg-custom-args/explicit-nulls/byname-nullables.scala:43:32 --------------------------------------------
 43 |    if x != null then f(identity(x), 1)   // error: dropping not null check fails typing
    |                        ^^^^^^^^^^^
diff --git a/tests/neg-custom-args/explicit-nulls/i7883.check b/tests/neg-custom-args/explicit-nulls/i7883.check
index 9a1165a6440e..579ea0b4cd00 100644
--- a/tests/neg-custom-args/explicit-nulls/i7883.check
+++ b/tests/neg-custom-args/explicit-nulls/i7883.check
@@ -10,11 +10,11 @@
 6 |      case r(hd, tl) => Some((hd, tl))  // error // error // error
   |                              ^^
   |                              Not found: hd
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E006] Not Found Error: tests/neg-custom-args/explicit-nulls/i7883.scala:6:34 ---------------------------------------
 6 |      case r(hd, tl) => Some((hd, tl))  // error // error // error
   |                                  ^^
   |                                  Not found: tl
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg-custom-args/fatal-warnings/i11333.check b/tests/neg-custom-args/fatal-warnings/i11333.check
new file mode 100644
index 000000000000..beef37c6460a
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i11333.check
@@ -0,0 +1,30 @@
+-- [E167] Lossy Conversion Error: tests/neg-custom-args/fatal-warnings/i11333.scala:2:19 -------------------------------
+2 |  val f1: Float  = 123456789            // error
+  |                   ^^^^^^^^^
+  |                   Widening conversion from Int to Float loses precision.
+  |                   Write `.toFloat` instead.
+-- [E167] Lossy Conversion Error: tests/neg-custom-args/fatal-warnings/i11333.scala:3:19 -------------------------------
+3 |  val d1: Double = 1234567890123456789L // error
+  |                   ^^^^^^^^^^^^^^^^^^^^
+  |                   Widening conversion from Long to Double loses precision.
+  |                   Write `.toDouble` instead.
+-- [E167] Lossy Conversion Error: tests/neg-custom-args/fatal-warnings/i11333.scala:4:19 -------------------------------
+4 |  val f2: Float  = 123456789L           // error
+  |                   ^^^^^^^^^^
+  |                   Widening conversion from Long to Float loses precision.
+  |                   Write `.toFloat` instead.
+-- [E167] Lossy Conversion Error: tests/neg-custom-args/fatal-warnings/i11333.scala:10:21 ------------------------------
+10 |  val f1_b: Float  = i1 // error
+   |                     ^^
+   |                     Widening conversion from Int to Float loses precision.
+   |                     Write `.toFloat` instead.
+-- [E167] Lossy Conversion Error: tests/neg-custom-args/fatal-warnings/i11333.scala:11:21 ------------------------------
+11 |  val d1_b: Double = l1 // error
+   |                     ^^
+   |                     Widening conversion from Long to Double loses precision.
+   |                     Write `.toDouble` instead.
+-- [E167] Lossy Conversion Error: tests/neg-custom-args/fatal-warnings/i11333.scala:12:21 ------------------------------
+12 |  val f2_b: Float  = l2 // error
+   |                     ^^
+   |                     Widening conversion from Long to Float loses precision.
+   |                     Write `.toFloat` instead.
diff --git a/tests/neg-custom-args/fatal-warnings/i11333.scala b/tests/neg-custom-args/fatal-warnings/i11333.scala
new file mode 100644
index 000000000000..3ba39efeb29e
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i11333.scala
@@ -0,0 +1,12 @@
+class C:
+  val f1: Float  = 123456789            // error
+  val d1: Double = 1234567890123456789L // error
+  val f2: Float  = 123456789L           // error
+
+  inline val i1 = 123456789
+  inline val l1 = 1234567890123456789L
+  inline val l2 = 123456789L
+
+  val f1_b: Float  = i1 // error
+  val d1_b: Double = l1 // error
+  val f2_b: Float  = l2 // error
diff --git a/tests/neg-custom-args/fatal-warnings/i11963a.scala b/tests/neg-custom-args/fatal-warnings/i11963a.scala
new file mode 100644
index 000000000000..58d64d061162
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i11963a.scala
@@ -0,0 +1 @@
+open trait Foo // error
diff --git a/tests/neg-custom-args/fatal-warnings/i11963b.scala b/tests/neg-custom-args/fatal-warnings/i11963b.scala
new file mode 100644
index 000000000000..9fae92747d53
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i11963b.scala
@@ -0,0 +1 @@
+open abstract class Foo // error
diff --git a/tests/neg-custom-args/fatal-warnings/i11963c.scala b/tests/neg-custom-args/fatal-warnings/i11963c.scala
new file mode 100644
index 000000000000..ebd56e1127c8
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i11963c.scala
@@ -0,0 +1,6 @@
+object Test {
+  def foo: Any = {
+    open class Bar // error
+    new Bar
+  }
+}
diff --git a/tests/neg-custom-args/fatal-warnings/i12188/Macro.scala b/tests/neg-custom-args/fatal-warnings/i12188/Macro.scala
new file mode 100644
index 000000000000..9b49f80f9046
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i12188/Macro.scala
@@ -0,0 +1,20 @@
+import scala.quoted.*
+
+object MatchTest {
+  inline def test[T](inline obj: T): Unit = ${testImpl('obj)}
+
+  def testImpl[T](objExpr: Expr[T])(using qctx: Quotes, t: Type[T]): Expr[Unit] = {
+    import qctx.reflect.*
+
+    val obj = objExpr.asTerm
+
+    val cases = obj.tpe.typeSymbol.children.map { child =>
+      val subtype = TypeIdent(child)
+      val bind = Symbol.newBind(Symbol.spliceOwner, "c", Flags.EmptyFlags, subtype.tpe)
+      CaseDef(Bind(bind, Typed(Ref(bind), subtype)), None, '{()}.asTerm)
+    }
+    val result = Match(obj, cases)
+    //println(result.show(using Printer.TreeAnsiCode))
+    result.asExprOf[Unit]
+  }
+}
diff --git a/tests/neg-custom-args/fatal-warnings/i12188/Test.scala b/tests/neg-custom-args/fatal-warnings/i12188/Test.scala
new file mode 100644
index 000000000000..3bea42ac3032
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i12188/Test.scala
@@ -0,0 +1,9 @@
+sealed trait P
+case class PC1(a: String) extends P
+case class PC2(b: Int) extends P
+
+def Test = MatchTest.test(PC2(10): P)
+
+def foo(x: P): Unit =
+  x match           // error
+  case _: PC1 =>
\ No newline at end of file
diff --git a/tests/neg-custom-args/fatal-warnings/i12253.check b/tests/neg-custom-args/fatal-warnings/i12253.check
new file mode 100644
index 000000000000..1cda504511af
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i12253.check
@@ -0,0 +1,8 @@
+-- Error: tests/neg-custom-args/fatal-warnings/i12253.scala:11:10 ------------------------------------------------------
+11 |     case extractors.InlinedLambda(_, Select(_, name)) => Expr(name) // error // error
+   |          ^
+   |          the type test for extractors.q2.reflect.Term cannot be checked at runtime
+-- Error: tests/neg-custom-args/fatal-warnings/i12253.scala:11:38 ------------------------------------------------------
+11 |     case extractors.InlinedLambda(_, Select(_, name)) => Expr(name) // error // error
+   |                                      ^
+   |                                      the type test for q1.reflect.Select cannot be checked at runtime
diff --git a/tests/neg-custom-args/fatal-warnings/i12253.scala b/tests/neg-custom-args/fatal-warnings/i12253.scala
new file mode 100644
index 000000000000..5fdf1c83504d
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i12253.scala
@@ -0,0 +1,28 @@
+import scala.quoted.{given, *}
+import deriving.*,  compiletime.*
+
+object MacroUtils:
+  transparent inline def extractNameFromSelector[To, T](inline code: To => T) = ${extractNameFromSelectorImpl('code)}
+
+  def extractNameFromSelectorImpl[To: Type, T: Type](code: Expr[To => T])(using q1: Quotes): Expr[String] =
+    import quotes.reflect.*
+    val extractors = new Extractors
+    code.asTerm match
+     case extractors.InlinedLambda(_, Select(_, name)) => Expr(name) // error // error
+     case t => report.throwError(s"Illegal argument to extractor: ${code.show}, in tasty: $t")
+
+  class Extractors(using val q2: Quotes):
+    //attempt to strip away consecutive inlines in AST and extract only final lambda
+    import quotes.reflect.*
+
+    object InlinedLambda:
+      def unapply(arg: Term): Option[(List[ValDef], Term)] =
+        arg match
+          case Inlined(_, _, Lambda(vals, term)) => Some((vals, term))
+          case Inlined(_, _, nested) => InlinedLambda.unapply(nested)
+          case t => None
+    end InlinedLambda
+
+  end Extractors
+end MacroUtils
+
diff --git a/tests/neg-custom-args/fatal-warnings/i13011.scala b/tests/neg-custom-args/fatal-warnings/i13011.scala
new file mode 100644
index 000000000000..ae534394bf96
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i13011.scala
@@ -0,0 +1,21 @@
+class i13011 {
+  lazy implicit val simple1: String = simple1 // error
+  def f: Unit = {
+    lazy val simple2: String = simple2 // error
+  }
+
+  lazy val simple3: String = if true then this.simple3 else "a" // error
+
+  def firstDigitIsEven(n: Int): Boolean = if n % 10 == n then n % 2 == 0 else firstDigitIsEven(n / 10)
+
+  lazy val simple4: String = if firstDigitIsEven(22) then this.simple4 else "a" // ok
+
+  lazy val simple5: String = identity(this.simple5) // error
+        
+  lazy val simple6: String = {  // error
+    this.simple6
+    "aa"
+  }
+
+  lazy val simple7: Function0[Any] = () => this.simple7  // Ok
+}
diff --git a/tests/neg-custom-args/fatal-warnings/i13440.check b/tests/neg-custom-args/fatal-warnings/i13440.check
new file mode 100644
index 000000000000..fde8133419b6
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i13440.check
@@ -0,0 +1,12 @@
+-- Error: tests/neg-custom-args/fatal-warnings/i13440.scala:3:4 --------------------------------------------------------
+3 |def given = 42 // error
+  |    ^
+  |    given is now a keyword, write `given` instead of given to keep it as an identifier
+-- Error: tests/neg-custom-args/fatal-warnings/i13440.scala:5:13 -------------------------------------------------------
+5 |case class C(enum: List[Int] = Nil) { // error
+  |             ^
+  |             enum is now a keyword, write `enum` instead of enum to keep it as an identifier
+-- Error: tests/neg-custom-args/fatal-warnings/i13440.scala:6:11 -------------------------------------------------------
+6 |  val s = s"$enum" // error
+  |           ^
+  |           enum is now a keyword, write `enum` instead of enum to keep it as an identifier
diff --git a/tests/neg-custom-args/fatal-warnings/i13440.scala b/tests/neg-custom-args/fatal-warnings/i13440.scala
new file mode 100644
index 000000000000..6cb4956e7434
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i13440.scala
@@ -0,0 +1,7 @@
+import language.`3.0-migration`
+
+def given = 42 // error
+
+case class C(enum: List[Int] = Nil) { // error
+  val s = s"$enum" // error
+}
diff --git a/tests/neg-custom-args/fatal-warnings/i13542.scala b/tests/neg-custom-args/fatal-warnings/i13542.scala
new file mode 100644
index 000000000000..3da18c233583
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i13542.scala
@@ -0,0 +1,50 @@
+import scala.language.implicitConversions
+
+case class Foo(i: Int) extends AnyVal:
+  def toFoo = this
+
+case class Bar(i: Int) extends AnyVal
+
+class BarOps(bar: Bar):
+  def toFoo = Foo(bar.i)
+
+implicit def augmentBar(bar: Bar): BarOps = BarOps(bar)
+
+def lazyIdentity[T](x: => T): T = x
+def repIdentity[T](x: T*): T = x(0)
+
+val x1 =
+  implicit def barToFoo(bar: Bar): Foo = bar.toFoo // error: infinite loop in function body
+  val foo: Foo = Bar(1)
+
+val x2 =
+  implicit def barToFoo2(bar: Bar): Foo =
+    identity(bar.toFoo)  // error
+  val foo: Foo = Bar(1)
+
+val x3 =
+  implicit def barToFoo3(bar: Bar): Foo =
+    lazyIdentity(bar.toFoo)  // OK
+  val foo: Foo = Bar(1)
+
+val x4 =
+  implicit def barToFoo4(bar: Bar): Foo =
+    repIdentity(bar.toFoo)  // error
+  val foo: Foo = Bar(1)
+
+val x5 =
+  implicit def barToFoo4(bar: Bar): Foo =
+    val y = bar.toFoo  // error
+    y
+  val foo: Foo = Bar(1)
+
+val x6 =
+  implicit def barToFoo4(bar: Bar): Foo =
+    lazy val y = bar.toFoo  // error
+    if false then y else ???
+  val foo: Foo = Bar(1)
+
+
+
+
+
diff --git a/tests/neg-custom-args/fatal-warnings/i13820.scala b/tests/neg-custom-args/fatal-warnings/i13820.scala
new file mode 100644
index 000000000000..234c1a55450e
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i13820.scala
@@ -0,0 +1,5 @@
+trait Expr { type T }
+
+def foo[A](e: Expr { type T = A }) = e match
+  case e1: Expr { type T <: Int } => // error: type test cannot be checked at runtime
+    val i: Int = ??? : e1.T
\ No newline at end of file
diff --git a/tests/neg/i8427.scala b/tests/neg-custom-args/fatal-warnings/i8427.scala
similarity index 100%
rename from tests/neg/i8427.scala
rename to tests/neg-custom-args/fatal-warnings/i8427.scala
diff --git a/tests/neg-custom-args/fatal-warnings/i8711.check b/tests/neg-custom-args/fatal-warnings/i8711.check
index 0abda7a77ed6..0035af0755d4 100644
--- a/tests/neg-custom-args/fatal-warnings/i8711.check
+++ b/tests/neg-custom-args/fatal-warnings/i8711.check
@@ -1,8 +1,8 @@
--- Error: tests/neg-custom-args/fatal-warnings/i8711.scala:7:9 ---------------------------------------------------------
+-- [E030] Match case Unreachable Error: tests/neg-custom-args/fatal-warnings/i8711.scala:7:9 ---------------------------
 7 |    case x: B => x // error: this case is unreachable since class A is not a subclass of class B
-  |         ^
-  |         this case is unreachable since type A and class B are unrelated
--- Error: tests/neg-custom-args/fatal-warnings/i8711.scala:12:9 --------------------------------------------------------
+  |         ^^^^
+  |         Unreachable case
+-- [E030] Match case Unreachable Error: tests/neg-custom-args/fatal-warnings/i8711.scala:12:9 --------------------------
 12 |    case x: C => x // error
-   |         ^
-   |         this case is unreachable since type A | B and class C are unrelated
+   |         ^^^^
+   |         Unreachable case
diff --git a/tests/neg-custom-args/fatal-warnings/i9241.scala b/tests/neg-custom-args/fatal-warnings/i9241.scala
new file mode 100644
index 000000000000..d3be9bc9278d
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i9241.scala
@@ -0,0 +1,41 @@
+class Foo {
+  def unary_~() : Foo = this // error
+  def unary_-(using Int)(): Foo = this // error
+  def unary_+()(implicit i: Int): Foo = this // error
+  def unary_![T](): Foo = this // error
+}
+
+class Bar {
+  def unary_~ : Bar = this
+  def unary_-(using Int): Bar = this
+  def unary_+(implicit i: Int): Bar = this
+  def unary_![T]: Bar = this
+}
+
+final class Baz private (val x: Int) extends AnyVal {
+  def unary_- : Baz = ???
+  def unary_+[T] : Baz = ???
+  def unary_!() : Baz = ??? // error
+  def unary_~(using Int) : Baz = ???
+}
+
+extension (x: Int)
+  def unary_- : Int = ???
+  def unary_+[T] : Int = ???
+  def unary_!() : Int = ??? // error
+  def unary_~(using Int) : Int = ???
+end extension
+
+extension [T](x: Short)
+  def unary_- : Int = ???
+  def unary_+[U] : Int = ???
+  def unary_!() : Int = ??? // error
+  def unary_~(using Int) : Int = ???
+end extension
+
+extension (using Int)(x: Byte)
+  def unary_- : Int = ???
+  def unary_+[U] : Int = ???
+  def unary_!() : Int = ??? // error
+  def unary_~(using Int) : Int = ???
+end extension
diff --git a/tests/neg-custom-args/fatal-warnings/i9880.scala b/tests/neg-custom-args/fatal-warnings/i9880.scala
new file mode 100644
index 000000000000..d9d857110543
--- /dev/null
+++ b/tests/neg-custom-args/fatal-warnings/i9880.scala
@@ -0,0 +1,30 @@
+opaque type Bytes = Array[Byte]
+object Bytes:
+  extension (self: Bytes)
+    def size: Int = (self: Array[Byte]).size  // error
+
+//
+
+object Module1:
+  opaque type State[S, +A] = S => (S, A)
+  object State:
+    extension [S, A](self: State[S, A])
+      def map[B](f: A => B): State[S, B] =
+        s => { val (s2, a) = self(s); (s2, f(a)) }
+object Module2:
+  import Module1.State
+  trait RNG
+  opaque type Gen[+A] = State[RNG, A]
+  object Gen:
+    extension [A](self: Gen[A])
+      def map[B](f: A => B): Gen[B] =
+        self.map(f)  // error
+
+//
+
+class Sym(val owner: Sym)
+
+extension (sym: Sym)
+  def isSomething: Boolean = false
+  def isFoo: Boolean       = sym.isSomething && sym.owner.isFoo // was: Infinite loop in function body
+  def isBar: Boolean       = sym.isSomething || sym.owner.isBar // was: Infinite loop in function body
diff --git a/tests/neg-custom-args/hidden-type-errors.check b/tests/neg-custom-args/hidden-type-errors.check
new file mode 100644
index 000000000000..a373e409af2f
--- /dev/null
+++ b/tests/neg-custom-args/hidden-type-errors.check
@@ -0,0 +1,28 @@
+-- [E007] Type Mismatch Error: tests/neg-custom-args/hidden-type-errors/Test.scala:6:24 --------------------------------
+6 |   val x = X.doSomething("XXX") // error
+  |           ^^^^^^^^^^^^^^^^^^^^
+  |           Found:    String
+  |           Required: Int
+  | This location contains code that was inlined from Test.scala:6
+
+Explanation
+===========
+
+Tree: t12717.A.bar("XXX")
+
+I tried to show that
+  String
+conforms to
+  Int
+but the comparison trace ended with `false`:
+          
+  ==> String  <:  Int
+    ==> String  <:  Int (recurring)
+      ==> String  <:  Int (recurring)
+      <== String  <:  Int (recurring) = false
+    <== String  <:  Int (recurring) = false
+  <== String  <:  Int = false
+
+The tests were made under the empty constraint
+
+1 error found
diff --git a/tests/neg-custom-args/hidden-type-errors/Macro.scala b/tests/neg-custom-args/hidden-type-errors/Macro.scala
new file mode 100644
index 000000000000..17b4f3d52ffe
--- /dev/null
+++ b/tests/neg-custom-args/hidden-type-errors/Macro.scala
@@ -0,0 +1,22 @@
+package t12717
+
+import scala.quoted._
+
+object A:
+
+   def foo(x:Int): Int = ???
+
+   def bar(x:String): String = ???
+
+
+object X:
+
+   inline def doSomething[T](inline x:T):Any = ${
+      doSomethingImpl('x)
+   }
+
+   def doSomethingImpl[T:Type](x:Expr[T])(using Quotes):Expr[Any] =
+     import quotes.reflect._
+     val aTerm = '{A}.asTerm
+     val xBar = Apply(Select.unique(aTerm,"bar"),List(x.asTerm))
+     Apply(Select.unique(aTerm,"foo"), List(xBar)).asExpr
diff --git a/tests/neg-custom-args/hidden-type-errors/Test.scala b/tests/neg-custom-args/hidden-type-errors/Test.scala
new file mode 100644
index 000000000000..180aa07cfb50
--- /dev/null
+++ b/tests/neg-custom-args/hidden-type-errors/Test.scala
@@ -0,0 +1,6 @@
+package t12717
+
+
+object Test:
+
+   val x = X.doSomething("XXX") // error
diff --git a/tests/neg-custom-args/i11637.check b/tests/neg-custom-args/i11637.check
index b0479b633efc..0664a05f4f86 100644
--- a/tests/neg-custom-args/i11637.check
+++ b/tests/neg-custom-args/i11637.check
@@ -1,77 +1,56 @@
 -- [E057] Type Mismatch Error: tests/neg-custom-args/i11637.scala:11:33 ------------------------------------------------
 11 |  var h = new HKT3_1[FunctorImpl]();  // error // error
    |                                 ^
-   |                 Type argument test2.FunctorImpl does not conform to upper bound [Generic2[T] <: Set[T]] =>> Any
-
-Explanation
-===========
-
-I tried to show that
-  test2.FunctorImpl
-conforms to
-  [Generic2[T] <: Set[T]] =>> Any
-but the comparison trace ended with `false`:
-          
-  ==> test2.FunctorImpl  <:  [Generic2[T] <: Set[T]] =>> Any
-    ==> test2.FunctorImpl  <:  [Generic2[T] <: Set[T]] =>> Any (recurring)
-      ==> type bounds [[T] <: Set[T]]  <:  type bounds [[T] <: Iterable[T]]
-        ==> type bounds [[T] <: Set[T]]  <:  type bounds [[T] <: Iterable[T]] (recurring)
-          ==> [T <: String] =>> Set[T]  <:  Iterable
-            ==> [T <: String] =>> Set[T]  <:  Iterable (recurring)
-              ==> type bounds []  <:  type bounds [ <: String]
-                ==> type bounds []  <:  type bounds [ <: String] (recurring)
-                  ==> Any  <:  String
-                    ==> Any  <:  String (recurring)
-                      ==> Any  <:  String (recurring)
-                      <== Any  <:  String (recurring) = false
-                    <== Any  <:  String (recurring) = false
-                  <== Any  <:  String = false
-                <== type bounds []  <:  type bounds [ <: String] (recurring) = false
-              <== type bounds []  <:  type bounds [ <: String] = false
-            <== [T <: String] =>> Set[T]  <:  Iterable (recurring) = false
-          <== [T <: String] =>> Set[T]  <:  Iterable = false
-        <== type bounds [[T] <: Set[T]]  <:  type bounds [[T] <: Iterable[T]] (recurring) = false
-      <== type bounds [[T] <: Set[T]]  <:  type bounds [[T] <: Iterable[T]] = false
-    <== test2.FunctorImpl  <:  [Generic2[T] <: Set[T]] =>> Any (recurring) = false
-  <== test2.FunctorImpl  <:  [Generic2[T] <: Set[T]] =>> Any = false
-
-The tests were made under the empty constraint
-
+   |       Type argument test2.FunctorImpl does not conform to upper bound [Generic2[T <: String] <: Set[T]] =>> Any
+   |--------------------------------------------------------------------------------------------------------------------
+   | Explanation (enabled by `-explain`)
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   | I tried to show that
+   |   test2.FunctorImpl
+   | conforms to
+   |   [Generic2[T <: String] <: Set[T]] =>> Any
+   | but the comparison trace ended with `false`:
+   |
+   |   ==> test2.FunctorImpl  <:  [Generic2[T <: String] <: Set[T]] =>> Any
+   |     ==> type bounds [[T <: String] <: Set[T]]  <:  type bounds [[T] <: Iterable[T]]
+   |       ==> [T <: String] =>> Set[T]  <:  Iterable
+   |         ==> type bounds []  <:  type bounds [ <: String]
+   |           ==> Any  <:  String
+   |             ==> Any  <:  String
+   |             <== Any  <:  String = false
+   |           <== Any  <:  String = false
+   |         <== type bounds []  <:  type bounds [ <: String] = false
+   |       <== [T <: String] =>> Set[T]  <:  Iterable = false
+   |     <== type bounds [[T <: String] <: Set[T]]  <:  type bounds [[T] <: Iterable[T]] = false
+   |   <== test2.FunctorImpl  <:  [Generic2[T <: String] <: Set[T]] =>> Any = false
+   |
+   | The tests were made under the empty constraint
+    --------------------------------------------------------------------------------------------------------------------
 -- [E057] Type Mismatch Error: tests/neg-custom-args/i11637.scala:11:21 ------------------------------------------------
 11 |  var h = new HKT3_1[FunctorImpl]();  // error // error
    |                     ^
-   |                 Type argument test2.FunctorImpl does not conform to upper bound [Generic2[T] <: Set[T]] =>> Any
-
-Explanation
-===========
-
-I tried to show that
-  test2.FunctorImpl
-conforms to
-  [Generic2[T] <: Set[T]] =>> Any
-but the comparison trace ended with `false`:
-          
-  ==> test2.FunctorImpl  <:  [Generic2[T] <: Set[T]] =>> Any
-    ==> test2.FunctorImpl  <:  [Generic2[T] <: Set[T]] =>> Any (recurring)
-      ==> type bounds [[T] <: Set[T]]  <:  type bounds [[T] <: Iterable[T]]
-        ==> type bounds [[T] <: Set[T]]  <:  type bounds [[T] <: Iterable[T]] (recurring)
-          ==> [T <: String] =>> Set[T]  <:  Iterable
-            ==> [T <: String] =>> Set[T]  <:  Iterable (recurring)
-              ==> type bounds []  <:  type bounds [ <: String]
-                ==> type bounds []  <:  type bounds [ <: String] (recurring)
-                  ==> Any  <:  String
-                    ==> Any  <:  String (recurring)
-                      ==> Any  <:  String (recurring)
-                      <== Any  <:  String (recurring) = false
-                    <== Any  <:  String (recurring) = false
-                  <== Any  <:  String = false
-                <== type bounds []  <:  type bounds [ <: String] (recurring) = false
-              <== type bounds []  <:  type bounds [ <: String] = false
-            <== [T <: String] =>> Set[T]  <:  Iterable (recurring) = false
-          <== [T <: String] =>> Set[T]  <:  Iterable = false
-        <== type bounds [[T] <: Set[T]]  <:  type bounds [[T] <: Iterable[T]] (recurring) = false
-      <== type bounds [[T] <: Set[T]]  <:  type bounds [[T] <: Iterable[T]] = false
-    <== test2.FunctorImpl  <:  [Generic2[T] <: Set[T]] =>> Any (recurring) = false
-  <== test2.FunctorImpl  <:  [Generic2[T] <: Set[T]] =>> Any = false
-
-The tests were made under the empty constraint
+   |       Type argument test2.FunctorImpl does not conform to upper bound [Generic2[T <: String] <: Set[T]] =>> Any
+   |--------------------------------------------------------------------------------------------------------------------
+   | Explanation (enabled by `-explain`)
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   | I tried to show that
+   |   test2.FunctorImpl
+   | conforms to
+   |   [Generic2[T <: String] <: Set[T]] =>> Any
+   | but the comparison trace ended with `false`:
+   |
+   |   ==> test2.FunctorImpl  <:  [Generic2[T <: String] <: Set[T]] =>> Any
+   |     ==> type bounds [[T <: String] <: Set[T]]  <:  type bounds [[T] <: Iterable[T]]
+   |       ==> [T <: String] =>> Set[T]  <:  Iterable
+   |         ==> type bounds []  <:  type bounds [ <: String]
+   |           ==> Any  <:  String
+   |             ==> Any  <:  String
+   |             <== Any  <:  String = false
+   |           <== Any  <:  String = false
+   |         <== type bounds []  <:  type bounds [ <: String] = false
+   |       <== [T <: String] =>> Set[T]  <:  Iterable = false
+   |     <== type bounds [[T <: String] <: Set[T]]  <:  type bounds [[T] <: Iterable[T]] = false
+   |   <== test2.FunctorImpl  <:  [Generic2[T <: String] <: Set[T]] =>> Any = false
+   |
+   | The tests were made under the empty constraint
+    --------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg-custom-args/i12650.check b/tests/neg-custom-args/i12650.check
new file mode 100644
index 000000000000..62ca140ef6b9
--- /dev/null
+++ b/tests/neg-custom-args/i12650.check
@@ -0,0 +1,4 @@
+-- Error: tests/neg-custom-args/i12650.scala:2:58 ----------------------------------------------------------------------
+2 |  type This <: FooBase { type This <: FooBase.this.This } & FooBase { type This <: FooBase.this.This } // error
+  |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |               cyclic reference involving type This
diff --git a/tests/neg-custom-args/i12650.scala b/tests/neg-custom-args/i12650.scala
new file mode 100644
index 000000000000..f071b040f2ee
--- /dev/null
+++ b/tests/neg-custom-args/i12650.scala
@@ -0,0 +1,3 @@
+trait FooBase {
+  type This <: FooBase { type This <: FooBase.this.This } & FooBase { type This <: FooBase.this.This } // error
+}
\ No newline at end of file
diff --git a/tests/neg-custom-args/i13026.check b/tests/neg-custom-args/i13026.check
new file mode 100644
index 000000000000..e610aa51336c
--- /dev/null
+++ b/tests/neg-custom-args/i13026.check
@@ -0,0 +1,18 @@
+-- [E007] Type Mismatch Error: tests/neg-custom-args/i13026.scala:1:13 -------------------------------------------------
+1 |val x: Int = "not an int" // error
+  |             ^^^^^^^^^^^^
+  |             Found:    ("not an int" : String)
+  |             Required: Int
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg-custom-args/i13026.scala:2:13 -------------------------------------------------
+2 |val y: Int = "not an int" // error
+  |             ^^^^^^^^^^^^
+  |             Found:    ("not an int" : String)
+  |             Required: Int
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E008] Not Found Error: tests/neg-custom-args/i13026.scala:3:20 -----------------------------------------------------
+3 |def foo(x: Any) = x.foo // error
+  |                  ^^^^^
+  |                  value foo is not a member of Any
diff --git a/tests/neg-custom-args/i13026.scala b/tests/neg-custom-args/i13026.scala
new file mode 100644
index 000000000000..9ecf909f7122
--- /dev/null
+++ b/tests/neg-custom-args/i13026.scala
@@ -0,0 +1,3 @@
+val x: Int = "not an int" // error
+val y: Int = "not an int" // error
+def foo(x: Any) = x.foo // error
diff --git a/tests/neg-custom-args/i13838.check b/tests/neg-custom-args/i13838.check
new file mode 100644
index 000000000000..f6866dc6bf2a
--- /dev/null
+++ b/tests/neg-custom-args/i13838.check
@@ -0,0 +1,26 @@
+-- Error: tests/neg-custom-args/i13838.scala:10:5 ----------------------------------------------------------------------
+10 |  foo  // error
+   |     ^
+   |no implicit argument of type Order[X] was found for parameter x$1 of method foo in object FooT
+   |
+   |where:    X is a type variable
+   |.
+   |I found:
+   |
+   |    FooT.OrderFFooA[F, A](FooT.OrderFFooA[F, A](/* missing */summon[Order[F[Foo[A]]]]))
+   |
+   |But given instance OrderFFooA in object FooT produces a diverging implicit search when trying to match type Order[F[Foo[A]]].
+-- [E168] Type Warning: tests/neg-custom-args/i13838.scala:10:5 --------------------------------------------------------
+10 |  foo  // error
+   |     ^
+   |     Implicit search problem too large.
+   |     an implicit search was terminated with failure after trying 1000 expressions.
+   |     The root candidate for the search was:
+   |
+   |       given instance OrderFFooA in object FooT  for  Order[Any]}
+   |
+   |     You can change the behavior by setting the `-Ximplicit-search-limit` value.
+   |     Smaller values cause the search to fail faster.
+   |     Larger values might make a very large search problem succeed.
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg-custom-args/i13838.scala b/tests/neg-custom-args/i13838.scala
new file mode 100644
index 000000000000..c99d3fa1f82d
--- /dev/null
+++ b/tests/neg-custom-args/i13838.scala
@@ -0,0 +1,42 @@
+implicit def catsSyntaxEq[A: Eq](a: A): Foo[A] = ???
+
+class Foo[A]
+object Foo:
+  given [A: Eq]: Eq[Foo[A]] = ???
+
+object FooT:
+
+  def foo[X](using Order[X]): Unit = ???
+  foo  // error
+
+  def map[F[_], A](ffa: F[Foo[A]])(f: A): Nothing = ???
+
+  given OrderFFooA[F[_], A](using Ord: Order[F[Foo[A]]]): Order[F[Foo[A]]] = ???
+
+trait Eq[A]
+trait Order[A] extends Eq[A]
+
+object Eq {
+  given catsKernelOrderForTuple1[A0](using A0: Order[A0]): Order[Tuple1[A0]] = ???
+  given catsKernelOrderForTuple2[A0, A1](using A0: Order[A0], A1: Order[A1]): Order[(A0, A1)] = ???
+  given catsKernelOrderForTuple3[A0, A1, A2](using A0: Order[A0], A1: Order[A1], A2: Order[A2]): Order[(A0, A1, A2)] = ???
+  given catsKernelOrderForTuple4[A0, A1, A2, A3](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3]): Order[(A0, A1, A2, A3)] = ???
+  given catsKernelOrderForTuple5[A0, A1, A2, A3, A4](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4]): Order[(A0, A1, A2, A3, A4)] = ???
+  given catsKernelOrderForTuple6[A0, A1, A2, A3, A4, A5](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5]): Order[(A0, A1, A2, A3, A4, A5)] = ???
+  given catsKernelOrderForTuple7[A0, A1, A2, A3, A4, A5, A6](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6]): Order[(A0, A1, A2, A3, A4, A5, A6)] = ???
+  given catsKernelOrderForTuple8[A0, A1, A2, A3, A4, A5, A6, A7](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7]): Order[(A0, A1, A2, A3, A4, A5, A6, A7)] = ???
+  given catsKernelOrderForTuple9[A0, A1, A2, A3, A4, A5, A6, A7, A8](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8)] = ???
+  given catsKernelOrderForTuple10[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9)] = ???
+  given catsKernelOrderForTuple11[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)] = ???
+  given catsKernelOrderForTuple12[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11)] = ???
+  given catsKernelOrderForTuple13[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12)] = ???
+  given catsKernelOrderForTuple14[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13)] = ???
+  given catsKernelOrderForTuple15[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14)] = ???
+  given catsKernelOrderForTuple16[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15)] = ???
+  given catsKernelOrderForTuple17[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15], A16: Order[A16]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16)] = ???
+  given catsKernelOrderForTuple18[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15], A16: Order[A16], A17: Order[A17]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17)] = ???
+  given catsKernelOrderForTuple19[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15], A16: Order[A16], A17: Order[A17], A18: Order[A18]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18)] = ???
+  given catsKernelOrderForTuple20[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15], A16: Order[A16], A17: Order[A17], A18: Order[A18], A19: Order[A19]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19)] = ???
+  given catsKernelOrderForTuple21[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15], A16: Order[A16], A17: Order[A17], A18: Order[A18], A19: Order[A19], A20: Order[A20]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20)] = ???
+  given catsKernelOrderForTuple22[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15], A16: Order[A16], A17: Order[A17], A18: Order[A18], A19: Order[A19], A20: Order[A20], A21: Order[A21]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21)] = ???
+}
diff --git a/tests/neg-custom-args/i13946/BadPrinter.scala b/tests/neg-custom-args/i13946/BadPrinter.scala
new file mode 100644
index 000000000000..3ab935de9711
--- /dev/null
+++ b/tests/neg-custom-args/i13946/BadPrinter.scala
@@ -0,0 +1,4 @@
+// in BadPrinter.scala
+import language.future
+class BadPrinter extends Printer: // error
+  override def print(s: String): Unit = println("Bad!!!")
\ No newline at end of file
diff --git a/tests/neg-custom-args/i13946/Printer.scala b/tests/neg-custom-args/i13946/Printer.scala
new file mode 100644
index 000000000000..bc9056de932c
--- /dev/null
+++ b/tests/neg-custom-args/i13946/Printer.scala
@@ -0,0 +1,3 @@
+// in Printer.scala
+class Printer:
+  def print(s: String): Unit = println(s)
diff --git a/tests/neg-custom-args/isInstanceOf/enum-approx2.scala b/tests/neg-custom-args/isInstanceOf/enum-approx2.scala
index 8350f9cf4b9c..516b765ec64b 100644
--- a/tests/neg-custom-args/isInstanceOf/enum-approx2.scala
+++ b/tests/neg-custom-args/isInstanceOf/enum-approx2.scala
@@ -5,5 +5,6 @@ class Test {
   def eval(e: Fun[Int, Int]) = e match {
     case Fun(x: Fun[Int, Double]) => ???          // error
     case Fun(x: Exp[Int => String]) => ???        // error
+    case _ =>
   }
 }
\ No newline at end of file
diff --git a/tests/neg-custom-args/jdk-9-app.check b/tests/neg-custom-args/jdk-9-app.check
new file mode 100644
index 000000000000..0eacc7510766
--- /dev/null
+++ b/tests/neg-custom-args/jdk-9-app.check
@@ -0,0 +1,6 @@
+-- [E006] Not Found Error: tests/neg-custom-args/jdk-9-app.scala:4:10 --------------------------------------------------
+4 |  println(ProcessHandle.current().pid()) // error: not found
+  |          ^^^^^^^^^^^^^
+  |          Not found: ProcessHandle
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg-custom-args/jdk-9-app.scala b/tests/neg-custom-args/jdk-9-app.scala
new file mode 100644
index 000000000000..3dfd55332492
--- /dev/null
+++ b/tests/neg-custom-args/jdk-9-app.scala
@@ -0,0 +1,5 @@
+import java.lang.ProcessHandle
+
+object Jdk9App extends App {
+  println(ProcessHandle.current().pid()) // error: not found
+}
diff --git a/tests/neg-custom-args/kind-projector-underscores.check b/tests/neg-custom-args/kind-projector-underscores.check
new file mode 100644
index 000000000000..2a832ae3d7a2
--- /dev/null
+++ b/tests/neg-custom-args/kind-projector-underscores.check
@@ -0,0 +1,28 @@
+-- Error: tests/neg-custom-args/kind-projector-underscores.scala:7:23 --------------------------------------------------
+7 |class Bar3 extends Foo[λ[List[x] => Int]] // error
+  |                       ^^^^^^^^^^^^^^^^^
+  |                       λ requires a single argument of the form X => ... or (X, Y) => ...
+-- [E095] Syntax Error: tests/neg-custom-args/kind-projector-underscores.scala:10:8 ------------------------------------
+10 |  type -_ = Int // error -_ not allowed as a type def name without backticks
+   |        ^
+   |        =, >:, or <: expected, but '_' found
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E095] Syntax Error: tests/neg-custom-args/kind-projector-underscores.scala:11:8 ------------------------------------
+11 |  type +_ = Int // error +_ not allowed as a type def name without backticks
+   |        ^
+   |        =, >:, or <: expected, but '_' found
+   |
+   | longer explanation available when compiling with `-explain`
+-- Error: tests/neg-custom-args/kind-projector-underscores.scala:14:51 -------------------------------------------------
+14 |class BacktickUnderscoreIsNotFine extends Foo[List[`_`]] // error wildcard invalid as backquoted identifier
+   |                                                   ^
+   |                                                   wildcard invalid as backquoted identifier
+-- Error: tests/neg-custom-args/kind-projector-underscores.scala:5:23 --------------------------------------------------
+5 |class Bar1 extends Foo[Either[_, _]] // error
+  |                       ^^^^^^^^^^^^
+  |                       Type argument Either does not have the same kind as its bound [_$1]
+-- Error: tests/neg-custom-args/kind-projector-underscores.scala:6:22 --------------------------------------------------
+6 |class Bar2 extends Foo[_] // error
+  |                      ^
+  |                      Type argument _ does not have the same kind as its bound [_$1]
diff --git a/tests/neg-custom-args/kind-projector-underscores.scala b/tests/neg-custom-args/kind-projector-underscores.scala
new file mode 100644
index 000000000000..64d46b16a7c6
--- /dev/null
+++ b/tests/neg-custom-args/kind-projector-underscores.scala
@@ -0,0 +1,14 @@
+package kind_projector_neg
+
+trait Foo[F[_]]
+
+class Bar1 extends Foo[Either[_, _]] // error
+class Bar2 extends Foo[_] // error
+class Bar3 extends Foo[λ[List[x] => Int]] // error
+
+object Test {
+  type -_ = Int // error -_ not allowed as a type def name without backticks
+  type +_ = Int // error +_ not allowed as a type def name without backticks
+}
+
+class BacktickUnderscoreIsNotFine extends Foo[List[`_`]] // error wildcard invalid as backquoted identifier
diff --git a/tests/neg-custom-args/kind-projector.check b/tests/neg-custom-args/kind-projector.check
index 1375cf22b3f9..f6c258c5c58d 100644
--- a/tests/neg-custom-args/kind-projector.check
+++ b/tests/neg-custom-args/kind-projector.check
@@ -9,4 +9,4 @@
 -- Error: tests/neg-custom-args/kind-projector.scala:6:22 --------------------------------------------------------------
 6 |class Bar2 extends Foo[*] // error
   |                      ^
-  |                      Type argument _$4 does not have the same kind as its bound [_$1]
+  |                      Type argument _ does not have the same kind as its bound [_$1]
diff --git a/tests/neg-custom-args/no-experimental/14034.scala b/tests/neg-custom-args/no-experimental/14034.scala
new file mode 100644
index 000000000000..c0b4cc6899db
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/14034.scala
@@ -0,0 +1,12 @@
+import annotation.experimental
+
+@experimental trait Exp
+@experimental val exp = 1
+
+type Foo0 = Exp // error
+type Foo = Option[Exp] // error
+type Bar = Option[exp.type] // error
+type Baz = Exp | Int // error
+type Quux = [X] =>> X match // error
+  case Exp => Int
+type Quuz[A <: Exp] = Int // error
diff --git a/tests/neg-custom-args/no-experimental/experimental-2.scala b/tests/neg-custom-args/no-experimental/experimental-2.scala
new file mode 100644
index 000000000000..e2a8dcef58b8
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimental-2.scala
@@ -0,0 +1,5 @@
+class Test7 {
+  import scala.language.experimental
+  import experimental.genericNumberLiterals // error: no aliases can be used to refer to a language import
+  val x: BigInt = 13232202002020202020202   // error
+}
diff --git a/tests/neg-custom-args/no-experimental/experimental-erased.scala b/tests/neg-custom-args/no-experimental/experimental-erased.scala
new file mode 100644
index 000000000000..c80c3e0d4b49
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimental-erased.scala
@@ -0,0 +1,9 @@
+import language.experimental.erasedDefinitions
+import annotation.experimental
+
+@experimental
+erased class CanThrow[-E <: Exception]
+
+erased class CanThrow2[-E <: Exception] // error
+
+def other = 1
diff --git a/tests/neg-custom-args/no-experimental/experimental-imports.scala b/tests/neg-custom-args/no-experimental/experimental-imports.scala
new file mode 100644
index 000000000000..63a150978b1c
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimental-imports.scala
@@ -0,0 +1,46 @@
+import annotation.experimental
+
+@experimental
+object Object1:
+  import language.experimental.fewerBraces
+  import language.experimental.namedTypeArguments
+  import language.experimental.genericNumberLiterals
+  import language.experimental.erasedDefinitions
+  erased def f = 1
+
+object Object2:
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions
+  erased def f = 1
+
+@experimental
+object Class1:
+  import language.experimental.fewerBraces
+  import language.experimental.namedTypeArguments
+  import language.experimental.genericNumberLiterals
+  import language.experimental.erasedDefinitions
+  erased def f = 1
+
+object Class2:
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions
+  erased def f = 1
+
+@experimental
+def fun1 =
+  import language.experimental.fewerBraces
+  import language.experimental.namedTypeArguments
+  import language.experimental.genericNumberLiterals
+  import language.experimental.erasedDefinitions
+  erased def f = 1
+
+def fun2 =
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions
+  erased def f = 1
diff --git a/tests/neg-custom-args/no-experimental/experimental-nested-imports-2.scala b/tests/neg-custom-args/no-experimental/experimental-nested-imports-2.scala
new file mode 100644
index 000000000000..85076cca723a
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimental-nested-imports-2.scala
@@ -0,0 +1,33 @@
+import annotation.experimental
+
+class Class1:
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
+  @experimental def f = 1
+  def g = 1
+
+object Object1:
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
+  @experimental def f = 1
+  def g = 1
+
+def fun1 =
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
+  @experimental def f = 1
+  def g = 1
+
+val value1 =
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
+  @experimental def f = 1
+  def g = 1
\ No newline at end of file
diff --git a/tests/neg-custom-args/no-experimental/experimental-nested-imports-3.scala b/tests/neg-custom-args/no-experimental/experimental-nested-imports-3.scala
new file mode 100644
index 000000000000..1af04918b1d9
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimental-nested-imports-3.scala
@@ -0,0 +1,25 @@
+import annotation.experimental
+
+class Class1:
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
+
+object Object1:
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
+
+def fun1 =
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
+
+val value1 =
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
diff --git a/tests/neg-custom-args/no-experimental/experimental-nested-imports.scala b/tests/neg-custom-args/no-experimental/experimental-nested-imports.scala
new file mode 100644
index 000000000000..b9fc38dc4915
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimental-nested-imports.scala
@@ -0,0 +1,29 @@
+import annotation.experimental
+
+class Class1:
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
+  @experimental def f = 1
+
+object Object1:
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
+  @experimental def f = 1
+
+def fun1 =
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
+  @experimental def f = 1
+
+val value1 =
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
+  @experimental def f = 1
diff --git a/tests/neg-custom-args/no-experimental/experimental-package-imports.scala b/tests/neg-custom-args/no-experimental/experimental-package-imports.scala
new file mode 100644
index 000000000000..90ec387b1036
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimental-package-imports.scala
@@ -0,0 +1,24 @@
+import annotation.experimental
+
+package foo {
+  import language.experimental.fewerBraces // error
+  import language.experimental.namedTypeArguments // error
+  import language.experimental.genericNumberLiterals // error
+  import language.experimental.erasedDefinitions // ok: only check at erased definition
+
+  package bar {
+    def foo = 1
+  }
+}
+
+package foo2 {
+  // ok: all definitions are top-level @experimental
+  import language.experimental.fewerBraces
+  import language.experimental.namedTypeArguments
+  import language.experimental.genericNumberLiterals
+  import language.experimental.erasedDefinitions
+
+  package bar {
+    @experimental def foo = 1
+  }
+}
diff --git a/tests/neg-custom-args/no-experimental/experimental.scala b/tests/neg-custom-args/no-experimental/experimental.scala
index 26f9ba3d21c7..42d0d8066c35 100644
--- a/tests/neg-custom-args/no-experimental/experimental.scala
+++ b/tests/neg-custom-args/no-experimental/experimental.scala
@@ -7,7 +7,7 @@ class Test0 {
 }
 
 class Test1 {
-  import scala.language.experimental.erasedDefinitions  // error
+  import scala.language.experimental.erasedDefinitions
   import scala.compiletime.erasedValue
   type UnivEq[A]
   object UnivEq:
@@ -26,9 +26,3 @@ class Test2 {
 class Test6 {
   import scala.language.experimental  // ok
 }
-
-class Test7 {
-  import scala.language.experimental
-  import experimental.genericNumberLiterals // error: no aliases can be used to refer to a language import
-  val x: BigInt = 13232202002020202020202   // error
-}
\ No newline at end of file
diff --git a/tests/neg-custom-args/no-experimental/experimentalAnnot.scala b/tests/neg-custom-args/no-experimental/experimentalAnnot.scala
new file mode 100644
index 000000000000..e6dfbf28f8bb
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalAnnot.scala
@@ -0,0 +1,22 @@
+import scala.annotation.experimental
+
+@experimental class myExperimentalAnnot extends scala.annotation.Annotation
+
+@myExperimentalAnnot // error
+def test1: Unit = ()
+
+@experimental
+@myExperimentalAnnot
+def test2: Unit = ()
+
+@experimental
+class Foo {
+  @myExperimentalAnnot
+  def test3: Unit = ()
+
+  def test4: Unit = {
+    @myExperimentalAnnot
+    val f: Unit = ()
+    f
+  }
+}
diff --git a/tests/neg-custom-args/no-experimental/experimentalCaseClass.scala b/tests/neg-custom-args/no-experimental/experimentalCaseClass.scala
new file mode 100644
index 000000000000..b112c8a1213a
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalCaseClass.scala
@@ -0,0 +1,26 @@
+import scala.annotation.experimental
+
+@experimental
+case class Foo(a: Int)
+
+@experimental
+case class Bar(a: Int)
+
+object Bar:
+  def f(): Unit = ()
+
+def test: Unit =
+  Foo(2) // error
+  val x: Foo = ??? // error
+
+  x match
+    case Foo(a) => // error
+
+
+  Bar(2) // error
+  val y: Bar = ??? // error
+
+  y match
+    case Bar(a) => // error
+
+  Bar.f() // error
diff --git a/tests/neg-custom-args/no-experimental/experimentalDefaultParams.scala b/tests/neg-custom-args/no-experimental/experimentalDefaultParams.scala
new file mode 100644
index 000000000000..4dedb3afa11d
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalDefaultParams.scala
@@ -0,0 +1,27 @@
+import scala.annotation.experimental
+
+@experimental def x = 2
+
+def test1(
+  p6: Any = x // error: def x is marked @experimental and therefore ...
+): Any = ???
+
+@experimental def test2(
+  p6: Any = x
+): Any = ???
+
+class Test1(
+  p6: Any = x // error
+) {}
+
+@experimental class Test2(
+  p6: Any = x
+) {}
+
+trait Test3(
+  p6: Any = x // error
+) {}
+
+@experimental trait Test4(
+  p6: Any = x
+) {}
diff --git a/tests/neg-custom-args/no-experimental/experimentalEnum.scala b/tests/neg-custom-args/no-experimental/experimentalEnum.scala
new file mode 100644
index 000000000000..1cbe78ca5427
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalEnum.scala
@@ -0,0 +1,12 @@
+import scala.annotation.experimental
+
+@experimental
+enum E:
+  case A
+  case B
+
+def test: Unit =
+  E.A // error
+  E.B // error
+  val e: E = ??? // error
+  ()
diff --git a/tests/neg-custom-args/no-experimental/experimentalErased.scala b/tests/neg-custom-args/no-experimental/experimentalErased.scala
new file mode 100644
index 000000000000..6fcb11a3cc2f
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalErased.scala
@@ -0,0 +1,22 @@
+import language.experimental.erasedDefinitions
+import annotation.experimental
+
+@experimental
+erased class Foo
+
+erased class Bar // error
+
+@experimental
+erased def foo = 2
+
+erased def bar = 2 // error
+
+@experimental
+erased val foo2 = 2
+
+erased val bar2 = 2 // error
+
+@experimental
+def foo3(erased a: Int) = 2
+
+def bar3(erased a: Int) = 2 // error
diff --git a/tests/neg-custom-args/no-experimental/experimentalInheritance.scala b/tests/neg-custom-args/no-experimental/experimentalInheritance.scala
new file mode 100644
index 000000000000..f6eab1224310
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalInheritance.scala
@@ -0,0 +1,14 @@
+import scala.annotation.experimental
+
+@experimental def x = 2
+
+@experimental class A1(x: Any)
+class A2(x: Any)
+
+
+@experimental class B1 extends A1(1)
+class B2 // error: extension of experimental class A1 must have @experimental annotation
+extends A1(1) // error: class A1 is marked @experimental ...
+
+@experimental class C1 extends A2(x)
+class C2 extends A2(x) // error def x is marked @experimental and therefore
diff --git a/tests/neg-custom-args/no-experimental/experimentalInline.scala b/tests/neg-custom-args/no-experimental/experimentalInline.scala
new file mode 100644
index 000000000000..8827fd42e36a
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalInline.scala
@@ -0,0 +1,8 @@
+import scala.annotation.experimental
+
+@experimental
+inline def g() = ()
+
+def test: Unit =
+  g() // errors
+  ()
diff --git a/tests/neg-custom-args/no-experimental/experimentalMembers.scala b/tests/neg-custom-args/no-experimental/experimentalMembers.scala
new file mode 100644
index 000000000000..e30f27b069a8
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalMembers.scala
@@ -0,0 +1,39 @@
+import scala.annotation.experimental
+
+@experimental def x = 2
+
+@experimental class A {
+  def f = x // ok because A is experimental
+}
+
+@experimental class B {
+  def f = x // ok because A is experimental
+}
+
+@experimental object C {
+  def f = x // ok because A is experimental
+}
+
+@experimental class D {
+  def f = {
+    object B {
+      x // ok because A is experimental
+    }
+  }
+}
+
+@experimental class E {
+  def f = {
+    def g = {
+      x // ok because A is experimental
+    }
+  }
+}
+
+class F {
+  def f = {
+    def g = {
+      x // error
+    }
+  }
+}
diff --git a/tests/neg-custom-args/no-experimental/experimentalOverride.scala b/tests/neg-custom-args/no-experimental/experimentalOverride.scala
new file mode 100644
index 000000000000..653bd3b23da4
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalOverride.scala
@@ -0,0 +1,39 @@
+import scala.annotation.experimental
+
+@experimental
+class A:
+  def f() = 1
+
+@experimental
+class B extends A:
+  override def f() = 2
+
+class C:
+  @experimental
+  def f() = 1
+
+class D extends C:
+  override def f() = 2
+
+trait A2:
+  @experimental
+  def f(): Int
+
+trait B2:
+  def f(): Int
+
+class C2 extends A2, B2:
+  def f(): Int = 1
+
+def test: Unit =
+  val a: A = ??? // error
+  val b: B = ??? // error
+  val c: C = ???
+  val d: D = ???
+  val c2: C2 = ???
+  a.f() // error
+  b.f() // error
+  c.f() // error
+  d.f() // ok because D.f is a stable API
+  c2.f() // ok because B2.f is a stable API
+  ()
diff --git a/tests/neg-custom-args/no-experimental/experimentalRHS.scala b/tests/neg-custom-args/no-experimental/experimentalRHS.scala
new file mode 100644
index 000000000000..27143c120b96
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalRHS.scala
@@ -0,0 +1,16 @@
+import scala.annotation.experimental
+
+@experimental
+def x = ()
+
+def d1 = x // error: value x is marked @experimental and therefore ...
+@experimental def d2 = x
+
+val v1 = x // error: value x is marked @experimental and therefore ...
+@experimental val v2 = x
+
+var vr1 = x // error: value x is marked @experimental and therefore ...
+@experimental var vr2 = x
+
+lazy val lv1 = x // error: value x is marked @experimental and therefore ...
+@experimental lazy val lv2 = x
diff --git a/tests/neg-custom-args/no-experimental/experimentalSam.scala b/tests/neg-custom-args/no-experimental/experimentalSam.scala
new file mode 100644
index 000000000000..cdc9e61858d9
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalSam.scala
@@ -0,0 +1,11 @@
+import scala.annotation.experimental
+
+@experimental
+trait ExpSAM {
+  def foo(x: Int): Int
+}
+def bar(f: ExpSAM): Unit = {} // error
+
+def test: Unit =
+  bar(x => x) // error
+  ()
diff --git a/tests/neg-custom-args/no-experimental/experimentalSignature.scala b/tests/neg-custom-args/no-experimental/experimentalSignature.scala
new file mode 100644
index 000000000000..9b1d3c5e999f
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalSignature.scala
@@ -0,0 +1,54 @@
+import scala.annotation.experimental
+
+@experimental class A
+@experimental type X
+@experimental type Y = Int
+@experimental opaque type Z = Int
+
+def test1(
+  p1: A, // error: class A is marked @experimental and therefore ...
+  p2: List[A], // error: class A is marked @experimental and therefore ...
+  p3: X, // error: type X is marked @experimental and therefore ...
+  p4: Y, // error: type Y is marked @experimental and therefore ...
+  p5: Z, // error: type Z is marked @experimental and therefore ...
+): A = ??? // error: class A is marked @experimental and therefore ...
+
+@experimental def test2(
+  p1: A,
+  p2: List[A],
+  p3: X,
+  p4: Y,
+  p5: Z,
+): A = ???
+
+class Test1(
+  p1: A, // error
+  p2: List[A], // error
+  p3: X, // error
+  p4: Y, // error
+  p5: Z, // error
+) {}
+
+@experimental class Test2(
+  p1: A,
+  p2: List[A],
+  p3: X,
+  p4: Y,
+  p5: Z,
+) {}
+
+trait Test3(
+  p1: A, // error
+  p2: List[A], // error
+  p3: X, // error
+  p4: Y, // error
+  p5: Z, // error
+) {}
+
+@experimental trait Test4(
+  p1: A,
+  p2: List[A],
+  p3: X,
+  p4: Y,
+  p5: Z,
+) {}
diff --git a/tests/neg-custom-args/no-experimental/experimentalTerms.scala b/tests/neg-custom-args/no-experimental/experimentalTerms.scala
new file mode 100644
index 000000000000..09b69d2da381
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalTerms.scala
@@ -0,0 +1,27 @@
+import scala.annotation.experimental
+
+@experimental
+val x = ()
+
+@experimental
+def f() = ()
+
+@experimental
+object X:
+  def fx() = 1
+
+def test1: Unit =
+  f() // error: def f is marked @experimental and therefore ...
+  x // error: value x is marked @experimental and therefore ...
+  X.fx() // error: object X is marked @experimental and therefore ...
+  import X.fx
+  fx() // error: object X is marked @experimental and therefore ...
+
+@experimental
+def test2: Unit =
+  // references to f, x and X are ok because `test2` is experimental
+  f()
+  x
+  X.fx()
+  import X.fx
+  fx()
diff --git a/tests/neg-custom-args/no-experimental/experimentalTests.scala b/tests/neg-custom-args/no-experimental/experimentalTests.scala
new file mode 100644
index 000000000000..f3fbcf8c587c
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalTests.scala
@@ -0,0 +1,15 @@
+import scala.annotation.experimental
+
+@experimental def x = 2
+
+class MyTests {
+  /*@Test*/ def test1 = x // error
+  @experimental
+  /*@Test*/ def test2 = x
+}
+
+@experimental
+class MyExperimentalTests {
+  /*@Test*/ def test1 = x
+  /*@Test*/ def test2 = x
+}
diff --git a/tests/neg-custom-args/no-experimental/experimentalType.scala b/tests/neg-custom-args/no-experimental/experimentalType.scala
new file mode 100644
index 000000000000..f4013788796a
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalType.scala
@@ -0,0 +1,22 @@
+import scala.annotation.experimental
+
+@experimental
+class A
+
+@experimental
+class B extends A
+
+@experimental
+type X
+
+@experimental
+type Y = Int
+
+@experimental
+opaque type Z = Int
+
+type AA = A // error
+type BB = Z // error
+type XX = Z // error
+type YY = Z // error
+type ZZ = Z // error
diff --git a/tests/neg-custom-args/no-experimental/experimentalTypeRHS.scala b/tests/neg-custom-args/no-experimental/experimentalTypeRHS.scala
new file mode 100644
index 000000000000..3aaeb960bae9
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalTypeRHS.scala
@@ -0,0 +1,6 @@
+import scala.annotation.experimental
+
+@experimental type E
+
+type A = E // error
+@experimental type B = E
diff --git a/tests/neg-custom-args/no-experimental/experimentalTypes2.scala b/tests/neg-custom-args/no-experimental/experimentalTypes2.scala
new file mode 100644
index 000000000000..706fd39fd15c
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalTypes2.scala
@@ -0,0 +1,14 @@
+import scala.annotation.experimental
+
+@experimental class A
+@experimental type X
+@experimental type Y = Int
+@experimental opaque type Z = Int
+
+def test2: Unit =
+  new A // error: class A is marked @experimental and therefore ...
+  val i0: A = ??? // error: class A is marked @experimental and therefore ...
+  val i1: X = ??? // error: type X is marked @experimental and therefore ...
+  val i2: Y = ??? // error: type Y is marked @experimental and therefore ...
+  val i3: Z = ??? // error: type Z is marked @experimental and therefore ...
+  ()
diff --git a/tests/neg-custom-args/no-experimental/experimentalUnapply.scala b/tests/neg-custom-args/no-experimental/experimentalUnapply.scala
new file mode 100644
index 000000000000..0ba338a15a96
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/experimentalUnapply.scala
@@ -0,0 +1,18 @@
+import scala.annotation.experimental
+
+@experimental
+class A
+
+object Extractor1:
+  def unapply(s: Any): Option[A] = ??? // error
+
+object Extractor2:
+  @experimental
+  def unapply(s: Any): Option[Int] = ???
+
+def test: Unit =
+  (??? : Any) match
+    case _: A => // error // error
+    case Extractor1(_) => // error
+    case Extractor2(_) => // error
+  ()
diff --git a/tests/neg-custom-args/no-experimental/i13091.scala b/tests/neg-custom-args/no-experimental/i13091.scala
new file mode 100644
index 000000000000..2b08788ebbc1
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/i13091.scala
@@ -0,0 +1,5 @@
+import annotation.experimental
+
+@experimental class Foo
+
+def test: Unit = new Foo // error: class Foo is marked @experimental ...
diff --git a/tests/neg-custom-args/no-experimental/i13848.scala b/tests/neg-custom-args/no-experimental/i13848.scala
new file mode 100644
index 000000000000..886ab1e85d67
--- /dev/null
+++ b/tests/neg-custom-args/no-experimental/i13848.scala
@@ -0,0 +1,7 @@
+import annotation.experimental
+
+@main
+def run(): Unit = f // error
+
+@experimental
+def f = 2
diff --git a/tests/neg-custom-args/nowarn/nowarn-parser-error.check b/tests/neg-custom-args/nowarn/nowarn-parser-error.check
new file mode 100644
index 000000000000..ce0d9113cf7f
--- /dev/null
+++ b/tests/neg-custom-args/nowarn/nowarn-parser-error.check
@@ -0,0 +1,13 @@
+-- [E040] Syntax Error: tests/neg-custom-args/nowarn/nowarn-parser-error.scala:3:6 -------------------------------------
+3 |  def def // error
+  |      ^^^
+  |      an identifier expected, but 'def' found
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E000] Syntax Warning: tests/neg-custom-args/nowarn/nowarn-parser-error.scala:2:10 ----------------------------------
+2 |  def a = try 1 // warn
+  |          ^^^^^
+  |          A try without catch or finally is equivalent to putting
+  |          its body in a block; no exceptions are handled.
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg-custom-args/nowarn/nowarn-parser-error.scala b/tests/neg-custom-args/nowarn/nowarn-parser-error.scala
new file mode 100644
index 000000000000..2c65d3cf1838
--- /dev/null
+++ b/tests/neg-custom-args/nowarn/nowarn-parser-error.scala
@@ -0,0 +1,4 @@
+class C {
+  def a = try 1 // warn
+  def def // error
+}
diff --git a/tests/neg-custom-args/nowarn/nowarn-typer-error.check b/tests/neg-custom-args/nowarn/nowarn-typer-error.check
new file mode 100644
index 000000000000..a6c915807dca
--- /dev/null
+++ b/tests/neg-custom-args/nowarn/nowarn-typer-error.check
@@ -0,0 +1,6 @@
+-- [E006] Not Found Error: tests/neg-custom-args/nowarn/nowarn-typer-error.scala:4:11 ----------------------------------
+4 |  def t1 = / // error
+  |           ^
+  |           Not found: /
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg-custom-args/nowarn/nowarn-typer-error.scala b/tests/neg-custom-args/nowarn/nowarn-typer-error.scala
new file mode 100644
index 000000000000..8ab871b108f6
--- /dev/null
+++ b/tests/neg-custom-args/nowarn/nowarn-typer-error.scala
@@ -0,0 +1,7 @@
+import annotation.nowarn
+object T {
+  @deprecated def f = 1
+  def t1 = / // error
+  @nowarn    // unused-nowarn is not issued if earlier phase has an error.
+  def t2 = f // no warning, refchecks doesn't run if typer has an error
+}
diff --git a/tests/neg-custom-args/nowarn/nowarn.check b/tests/neg-custom-args/nowarn/nowarn.check
new file mode 100644
index 000000000000..d542643dbbbc
--- /dev/null
+++ b/tests/neg-custom-args/nowarn/nowarn.check
@@ -0,0 +1,108 @@
+-- [E000] Syntax Warning: tests/neg-custom-args/nowarn/nowarn.scala:9:10 -----------------------------------------------
+9 |def t1a = try 1 // warning (parser)
+  |          ^^^^^
+  |          A try without catch or finally is equivalent to putting
+  |          its body in a block; no exceptions are handled.
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E000] Syntax Warning: tests/neg-custom-args/nowarn/nowarn.scala:23:25 ----------------------------------------------
+23 |@nowarn(o.inl) def t2d = try 1   // two warnings (`inl` is not a compile-time constant)
+   |                         ^^^^^
+   |                         A try without catch or finally is equivalent to putting
+   |                         its body in a block; no exceptions are handled.
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E000] Syntax Warning: tests/neg-custom-args/nowarn/nowarn.scala:31:26 ----------------------------------------------
+31 |@nowarn("id=1") def t4d = try 1 // error and warning (unused nowarn, wrong id)
+   |                          ^^^^^
+   |                          A try without catch or finally is equivalent to putting
+   |                          its body in a block; no exceptions are handled.
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E000] Syntax Warning: tests/neg-custom-args/nowarn/nowarn.scala:33:28 ----------------------------------------------
+33 |@nowarn("verbose") def t5 = try 1 // warning with details
+   |                            ^^^^^
+   |                            A try without catch or finally is equivalent to putting
+   |                            its body in a block; no exceptions are handled.
+Matching filters for @nowarn or -Wconf:
+  - id=E0
+  - name=EmptyCatchOrFinallyBlock
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E129] Potential Issue Warning: tests/neg-custom-args/nowarn/nowarn.scala:13:11 -------------------------------------
+13 |def t2 = { 1; 2 } // warning (the invalid nowarn doesn't silence anything)
+   |           ^
+   |           A pure expression does nothing in statement position; you may be omitting necessary parentheses
+   |
+   | longer explanation available when compiling with `-explain`
+-- Warning: tests/neg-custom-args/nowarn/nowarn.scala:12:8 -------------------------------------------------------------
+12 |@nowarn("wat?") // warning (typer, invalid filter)
+   |        ^^^^^^
+   |        Invalid message filter
+   |        unknown filter: wat?
+-- [E129] Potential Issue Warning: tests/neg-custom-args/nowarn/nowarn.scala:16:12 -------------------------------------
+16 |def t2a = { 1; 2 } // warning (invalid nowarn doesn't silence)
+   |            ^
+   |            A pure expression does nothing in statement position; you may be omitting necessary parentheses
+   |
+   | longer explanation available when compiling with `-explain`
+-- Warning: tests/neg-custom-args/nowarn/nowarn.scala:15:8 -------------------------------------------------------------
+15 |@nowarn(t1a.toString) // warning (typer, argument not a compile-time constant)
+   |        ^^^^^^^^^^^^
+   |        filter needs to be a compile-time constant string
+-- Warning: tests/neg-custom-args/nowarn/nowarn.scala:23:10 ------------------------------------------------------------
+23 |@nowarn(o.inl) def t2d = try 1   // two warnings (`inl` is not a compile-time constant)
+   |        ^^^^^
+   |        filter needs to be a compile-time constant string
+-- Deprecation Warning: tests/neg-custom-args/nowarn/nowarn.scala:37:10 ------------------------------------------------
+37 |def t6a = f // warning (refchecks, deprecation)
+   |          ^
+   |          method f is deprecated
+-- Deprecation Warning: tests/neg-custom-args/nowarn/nowarn.scala:40:30 ------------------------------------------------
+40 |@nowarn("msg=fish") def t6d = f // error (unused nowarn), warning (deprecation)
+   |                              ^
+   |                              method f is deprecated
+-- Deprecation Warning: tests/neg-custom-args/nowarn/nowarn.scala:47:10 ------------------------------------------------
+47 |def t7c = f:          // warning (deprecation)
+   |          ^
+   |          method f is deprecated
+-- Unchecked Warning: tests/neg-custom-args/nowarn/nowarn.scala:53:7 ---------------------------------------------------
+53 |  case _: List[Int] => 0 // warning (patmat, unchecked)
+   |       ^
+   |       the type test for List[Int] cannot be checked at runtime
+-- Error: tests/neg-custom-args/nowarn/nowarn.scala:31:1 ---------------------------------------------------------------
+31 |@nowarn("id=1") def t4d = try 1 // error and warning (unused nowarn, wrong id)
+   |^^^^^^^^^^^^^^^
+   |@nowarn annotation does not suppress any warnings
+-- Error: tests/neg-custom-args/nowarn/nowarn.scala:40:1 ---------------------------------------------------------------
+40 |@nowarn("msg=fish") def t6d = f // error (unused nowarn), warning (deprecation)
+   |^^^^^^^^^^^^^^^^^^^
+   |@nowarn annotation does not suppress any warnings
+-- Error: tests/neg-custom-args/nowarn/nowarn.scala:48:3 ---------------------------------------------------------------
+48 |  @nowarn("msg=fish") // error (unused nowarn)
+   |  ^^^^^^^^^^^^^^^^^^^
+   |  @nowarn annotation does not suppress any warnings
+-- Error: tests/neg-custom-args/nowarn/nowarn.scala:60:0 ---------------------------------------------------------------
+60 |@nowarn def t9a = { 1: @nowarn; 2 } // error (outer @nowarn is unused)
+   |^^^^^^^
+   |@nowarn annotation does not suppress any warnings
+-- Error: tests/neg-custom-args/nowarn/nowarn.scala:61:27 --------------------------------------------------------------
+61 |@nowarn def t9b = { 1: Int @nowarn; 2 } // error (inner @nowarn is unused, it covers the type, not the expression)
+   |                           ^^^^^^^
+   |                           @nowarn annotation does not suppress any warnings
+-- Error: tests/neg-custom-args/nowarn/nowarn.scala:66:0 ---------------------------------------------------------------
+66 |@nowarn @ann(f) def t10b = 0  // error (unused nowarn)
+   |^^^^^^^
+   |@nowarn annotation does not suppress any warnings
+-- Error: tests/neg-custom-args/nowarn/nowarn.scala:67:8 ---------------------------------------------------------------
+67 |@ann(f: @nowarn) def t10c = 0 // error (unused nowarn), should be silent
+   |        ^^^^^^^
+   |        @nowarn annotation does not suppress any warnings
+-- Error: tests/neg-custom-args/nowarn/nowarn.scala:70:0 ---------------------------------------------------------------
+70 |@nowarn class I1a { // error (unused nowarn)
+   |^^^^^^^
+   |@nowarn annotation does not suppress any warnings
+-- Error: tests/neg-custom-args/nowarn/nowarn.scala:75:0 ---------------------------------------------------------------
+75 |@nowarn class I1b { // error (unused nowarn)
+   |^^^^^^^
+   |@nowarn annotation does not suppress any warnings
diff --git a/tests/neg-custom-args/nowarn/nowarn.scala b/tests/neg-custom-args/nowarn/nowarn.scala
new file mode 100644
index 000000000000..39ecde91517f
--- /dev/null
+++ b/tests/neg-custom-args/nowarn/nowarn.scala
@@ -0,0 +1,87 @@
+import scala.annotation.{ nowarn, Annotation }
+
+// This test doesn't run with `-Werror`, because once there's an error, later phases are skipped and we would not see
+// their warnings.
+// Instead, this test runs with `-Wunused:nowarn -Wconf:msg=@nowarn annotation does not suppress any warnings:e`.
+// Only "unused nowarn" warnings are reported as errors. Since these warnings are reported at the very end, all other
+// phases of the compiler run normally.
+
+def t1a = try 1 // warning (parser)
+@nowarn("msg=try without catch") def t1b = try 1
+
+@nowarn("wat?") // warning (typer, invalid filter)
+def t2 = { 1; 2 } // warning (the invalid nowarn doesn't silence anything)
+
+@nowarn(t1a.toString) // warning (typer, argument not a compile-time constant)
+def t2a = { 1; 2 } // warning (invalid nowarn doesn't silence)
+
+object o:
+  final val const = "msg=try"
+  inline def inl = "msg=try"
+
+@nowarn(o.const) def t2c = try 1 // no warning
+@nowarn(o.inl) def t2d = try 1   // two warnings (`inl` is not a compile-time constant)
+
+@nowarn("id=E129") def t3a = { 1; 2 }
+@nowarn("name=PureExpressionInStatementPosition") def t3b = { 1; 2 }
+
+@nowarn("id=E000") def t4a = try 1
+@nowarn("id=E0") def t4b = try 1
+@nowarn("id=0") def t4c = try 1
+@nowarn("id=1") def t4d = try 1 // error and warning (unused nowarn, wrong id)
+
+@nowarn("verbose") def t5 = try 1 // warning with details
+
+@deprecated def f = 0
+
+def t6a = f // warning (refchecks, deprecation)
+@nowarn("cat=deprecation") def t6b = f
+@nowarn("msg=deprecated") def t6c = f
+@nowarn("msg=fish") def t6d = f // error (unused nowarn), warning (deprecation)
+@nowarn("") def t6e = f
+@nowarn def t6f = f
+
+def t7a = f: @nowarn("cat=deprecation")
+def t7b = f:
+  @nowarn("msg=deprecated")
+def t7c = f:          // warning (deprecation)
+  @nowarn("msg=fish") // error (unused nowarn)
+def t7d = f: @nowarn("")
+def t7e = f: @nowarn
+
+def t8a(x: Any) = x match
+  case _: List[Int] => 0 // warning (patmat, unchecked)
+  case _ => 1
+
+@nowarn("cat=unchecked") def t8(x: Any) = x match
+  case _: List[Int] => 0
+  case _ => 1
+
+@nowarn def t9a = { 1: @nowarn; 2 } // error (outer @nowarn is unused)
+@nowarn def t9b = { 1: Int @nowarn; 2 } // error (inner @nowarn is unused, it covers the type, not the expression)
+
+class ann(a: Any) extends Annotation
+
+@ann(f) def t10a = 0          // should be a deprecation warning, but currently isn't
+@nowarn @ann(f) def t10b = 0  // error (unused nowarn)
+@ann(f: @nowarn) def t10c = 0 // error (unused nowarn), should be silent
+
+def forceCompletionOfI1a = (new I1a).m
+@nowarn class I1a { // error (unused nowarn)
+  @nowarn def m = { 1; 2 }
+}
+
+// completion during type checking
+@nowarn class I1b { // error (unused nowarn)
+  @nowarn def m = { 1; 2 }
+}
+
+@nowarn class I1c {
+  def m = { 1; 2 }
+}
+
+trait T {
+  @nowarn val t1 = { 0; 1 }
+}
+
+class K extends T
diff --git a/tests/neg-custom-args/typeclass-derivation2.scala b/tests/neg-custom-args/typeclass-derivation2.scala
index 75e549413027..be54d7697994 100644
--- a/tests/neg-custom-args/typeclass-derivation2.scala
+++ b/tests/neg-custom-args/typeclass-derivation2.scala
@@ -117,7 +117,7 @@ object TypeLevel {
   type Subtype[t] = Type[_, t]
   type Supertype[t] = Type[t, _]
   type Exactly[t] = Type[t, t]
-  erased def typeOf[T]: Type[T, T] = ???
+  erased def typeOf[T]: Type[T, T] = compiletime.erasedValue
 }
 
 // An algebraic datatype
diff --git a/tests/neg-macros/beta-reduce-inline-result.check b/tests/neg-macros/beta-reduce-inline-result.check
index 0dd6098fb820..7b615feef308 100644
--- a/tests/neg-macros/beta-reduce-inline-result.check
+++ b/tests/neg-macros/beta-reduce-inline-result.check
@@ -4,5 +4,5 @@
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |                Found:    Int
    |                Required: (4 : Int)
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg-macros/delegate-match-1.check b/tests/neg-macros/delegate-match-1.check
index 6d88d021416f..93b20beba183 100644
--- a/tests/neg-macros/delegate-match-1.check
+++ b/tests/neg-macros/delegate-match-1.check
@@ -4,4 +4,3 @@
   |  ^
   |  AmbiguousImplicits
   |  both value a1 in class Test1 and value a2 in class Test1 match type A
-  | This location contains code that was inlined from Test_2.scala:6
diff --git a/tests/neg-macros/delegate-match-2.check b/tests/neg-macros/delegate-match-2.check
index 112e5ee00474..e26742452b5b 100644
--- a/tests/neg-macros/delegate-match-2.check
+++ b/tests/neg-macros/delegate-match-2.check
@@ -4,4 +4,3 @@
   |  ^
   |  DivergingImplicit
   |  method a1 in class Test produces a diverging implicit search when trying to match type A
-  | This location contains code that was inlined from Test_2.scala:5
diff --git a/tests/neg-macros/delegate-match-3.check b/tests/neg-macros/delegate-match-3.check
index 278aa92a4117..2b6fda278fda 100644
--- a/tests/neg-macros/delegate-match-3.check
+++ b/tests/neg-macros/delegate-match-3.check
@@ -4,4 +4,3 @@
   |  ^
   |  NoMatchingImplicits
   |  no implicit values were found that match type A
-  | This location contains code that was inlined from Test_2.scala:3
diff --git a/tests/neg-macros/i11386.check b/tests/neg-macros/i11386.check
index 0377ca6389db..f74ea5b7ff20 100644
--- a/tests/neg-macros/i11386.check
+++ b/tests/neg-macros/i11386.check
@@ -3,11 +3,21 @@
 6 |    dummy(0) // error
   |          ^
   |          test
-  | This location contains code that was inlined from Test_2.scala:6
-  | This location contains code that was inlined from Macro_1.scala:7
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from Test_2.scala:6
+7 |    notNull(i)
+  |    ^^^^^^^^^^
+   ---------------------------------------------------------------------------------------------------------------------
 -- Error: tests/neg-macros/i11386/Test_2.scala:8:20 --------------------------------------------------------------------
 8 |    dummy(int2String(0)) // error
   |          ^^^^^^^^^^^^^
   |          test
-  | This location contains code that was inlined from Test_2.scala:8
-  | This location contains code that was inlined from Macro_1.scala:7
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from Test_2.scala:8
+7 |    notNull(i)
+  |    ^^^^^^^^^^
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg-macros/i11795.scala b/tests/neg-macros/i11795.scala
new file mode 100644
index 000000000000..2a7f89831e0e
--- /dev/null
+++ b/tests/neg-macros/i11795.scala
@@ -0,0 +1,10 @@
+import scala.quoted._
+import scala.deriving._
+
+def blah[P <: Product]
+    (m: Mirror.ProductOf[P])
+    (using Quotes, Type[m.MirroredElemLabels], Type[m.MirroredElemTypes]) = {
+  type z = Tuple.Zip[m.MirroredElemLabels, m.MirroredElemTypes]
+  Type.of[z] // error
+  ()
+}
diff --git a/tests/neg-macros/i12225.scala b/tests/neg-macros/i12225.scala
new file mode 100644
index 000000000000..66d619aad634
--- /dev/null
+++ b/tests/neg-macros/i12225.scala
@@ -0,0 +1,7 @@
+object TestMacro {
+  inline def test[T](inline t: T): T = ${ identity('{ identity(${ identity('{ identity(${ identity('t) }) }) }) }) } // error
+}
+
+object Test {
+  TestMacro.test("x")
+}
diff --git a/tests/neg-macros/i12471.scala b/tests/neg-macros/i12471.scala
new file mode 100644
index 000000000000..d09e51c5a10a
--- /dev/null
+++ b/tests/neg-macros/i12471.scala
@@ -0,0 +1,7 @@
+import scala.quoted.*
+
+def impl1[A](using t: Type[A])(using q: Quotes) =
+  '{ Type.of[A] ; ??? } // error
+
+def impl2[A](using t: Type[A])(using q: Quotes) =
+  '{ Type.of[A](using q) ; ??? } // error
diff --git a/tests/neg-macros/i12788/Macro.scala b/tests/neg-macros/i12788/Macro.scala
new file mode 100644
index 000000000000..42f1dd527ec9
--- /dev/null
+++ b/tests/neg-macros/i12788/Macro.scala
@@ -0,0 +1,21 @@
+import scala.quoted.*
+
+class InlinedInt[T <: Int]
+
+object DFType:
+  trait Width[T]:
+    type Out <: Int
+  transparent inline given [T]: Width[T] = ${ getWidthMacro[T] }
+  def getWidthMacro[T](using Quotes, Type[T]): Expr[Width[T]] =
+    '{
+      new Width[T] {
+        type Out = 1
+      }
+    }
+
+  trait DFBits[W <: Int]
+  object DFBits extends DFBitsCompanion
+
+trait DFToken[T]
+extension [T](token: DFToken[T])(using w: DFType.Width[T])
+  def width: InlinedInt[w.Out] = ???
\ No newline at end of file
diff --git a/tests/neg-macros/i12788/Test.scala b/tests/neg-macros/i12788/Test.scala
new file mode 100644
index 000000000000..b4ac8a484a12
--- /dev/null
+++ b/tests/neg-macros/i12788/Test.scala
@@ -0,0 +1,4 @@
+// nopos-error
+trait DFBitsCompanion:
+  type Token[W <: Int] = DFToken[DFType.DFBits[W]]
+  extension [LW <: Int](lhs: DFType.DFBits.Token[LW]) def foo: Unit = lhs.width
diff --git a/tests/neg-macros/i13033/Macro_1.scala b/tests/neg-macros/i13033/Macro_1.scala
new file mode 100644
index 000000000000..788d82ad4c9b
--- /dev/null
+++ b/tests/neg-macros/i13033/Macro_1.scala
@@ -0,0 +1,12 @@
+import scala.quoted.*
+
+object Macro:
+  def positiveImpl(using Quotes): Expr[Any] =
+    '{ 0.0 }  match
+      case '{ -0.0 } => '{1}
+  inline def positive: Any = ${positiveImpl}
+
+  def negativeImpl(using Quotes): Expr[Any] =
+    '{ -0.0 }  match
+      case '{ 0.0 } => '{-1}
+  inline def negative: Any = ${negativeImpl}
diff --git a/tests/neg-macros/i13033/Test_2.scala b/tests/neg-macros/i13033/Test_2.scala
new file mode 100644
index 000000000000..a5e2edc39ea3
--- /dev/null
+++ b/tests/neg-macros/i13033/Test_2.scala
@@ -0,0 +1,3 @@
+@main def test(): Unit =
+  println(Macro.positive) // error
+  println(Macro.negative) // error
diff --git a/tests/neg-macros/i13516/Persistance.scala b/tests/neg-macros/i13516/Persistance.scala
new file mode 100644
index 000000000000..dbabf59c7267
--- /dev/null
+++ b/tests/neg-macros/i13516/Persistance.scala
@@ -0,0 +1,5 @@
+import scala.quoted.*
+object Persistance:
+  inline def nameOf(inline e: Any): String = ${ nameOfImpl('e) }
+  private def nameOfImpl(e: Expr[Any])(using Quotes): Expr[String] = Expr("")
+  def foo(p: Versioned): Unit = {}
diff --git a/tests/neg-macros/i13516/Versioned.scala b/tests/neg-macros/i13516/Versioned.scala
new file mode 100644
index 000000000000..a7e10b2c8549
--- /dev/null
+++ b/tests/neg-macros/i13516/Versioned.scala
@@ -0,0 +1,3 @@
+// nopos-error
+class Versioned:
+  def serialize: String = Persistance.nameOf(0)
diff --git a/tests/neg-macros/i13809/Macros_1.scala b/tests/neg-macros/i13809/Macros_1.scala
new file mode 100644
index 000000000000..3c39a40a7c51
--- /dev/null
+++ b/tests/neg-macros/i13809/Macros_1.scala
@@ -0,0 +1,265 @@
+package x
+
+import scala.annotation._
+import scala.quoted._
+
+trait CB[+T]
+
+object CBM:
+  def pure[T](t:T):CB[T] = ???
+  def map[A,B](fa:CB[A])(f: A=>B):CB[B] = ???
+  def flatMap[A,B](fa:CB[A])(f: A=>CB[B]):CB[B] = ???
+  def spawn[A](op: =>CB[A]): CB[A] = ???
+
+
+@compileTimeOnly("await should be inside async block")
+def await[T](f: CB[T]): T = ???
+
+
+trait CpsExpr[T:Type](prev: Seq[Expr[?]]):
+
+   def fLast(using Quotes): Expr[CB[T]]
+   def prependExprs(exprs: Seq[Expr[?]]): CpsExpr[T]
+   def append[A:Type](chunk: CpsExpr[A])(using Quotes): CpsExpr[A]
+   def syncOrigin(using Quotes): Option[Expr[T]]
+   def map[A:Type](f: Expr[T => A])(using Quotes): CpsExpr[A] =
+           MappedCpsExpr[T,A](Seq(),this,f)
+   def flatMap[A:Type](f: Expr[T => CB[A]])(using Quotes): CpsExpr[A] =
+           FlatMappedCpsExpr[T,A](Seq(),this,f)
+
+   def transformed(using Quotes): Expr[CB[T]] =
+      import quotes.reflect._
+      Block(prev.toList.map(_.asTerm), fLast.asTerm).asExprOf[CB[T]]
+
+
+case class GenericSyncCpsExpr[T:Type](prev: Seq[Expr[?]],last: Expr[T]) extends CpsExpr[T](prev):
+
+       override def fLast(using Quotes): Expr[CB[T]] =
+         '{  CBM.pure(${last}:T) }
+
+       override def prependExprs(exprs: Seq[Expr[?]]): CpsExpr[T] =
+         copy(prev = exprs ++: prev)
+
+       override def syncOrigin(using Quotes): Option[Expr[T]] =
+         import quotes.reflect._
+         Some(Block(prev.toList.map(_.asTerm), last.asTerm).asExprOf[T])
+
+       override def append[A:Type](e: CpsExpr[A])(using Quotes) =
+         e.prependExprs(Seq(last)).prependExprs(prev)
+
+       override def map[A:Type](f: Expr[T => A])(using Quotes): CpsExpr[A] =
+         copy(last = '{ $f($last) })
+
+       override def flatMap[A:Type](f: Expr[T => CB[A]])(using Quotes): CpsExpr[A] =
+         GenericAsyncCpsExpr[A](prev, '{ CBM.flatMap(CBM.pure($last))($f) } )
+
+
+abstract class AsyncCpsExpr[T:Type](
+                               prev: Seq[Expr[?]]
+                             ) extends CpsExpr[T](prev):
+
+   override def append[A:Type](e: CpsExpr[A])(using Quotes): CpsExpr[A] =
+            flatMap( '{ (x:T) => ${e.transformed} })
+
+   override def syncOrigin(using Quotes): Option[Expr[T]] = None
+
+
+
+case class GenericAsyncCpsExpr[T:Type](
+                             prev: Seq[Expr[?]],
+                             fLastExpr: Expr[CB[T]]
+                             ) extends AsyncCpsExpr[T](prev):
+
+   override def fLast(using Quotes): Expr[CB[T]] = fLastExpr
+
+   override def prependExprs(exprs: Seq[Expr[?]]): CpsExpr[T] =
+         copy(prev = exprs ++: prev)
+
+   override def map[A:Type](f: Expr[T => A])(using Quotes): CpsExpr[A] =
+            MappedCpsExpr(Seq(),this,f)
+
+   override def flatMap[A:Type](f: Expr[T => CB[A]])(using Quotes): CpsExpr[A] =
+            FlatMappedCpsExpr(Seq(),this,f)
+
+
+
+case class MappedCpsExpr[S:Type, T:Type](
+                               prev: Seq[Expr[?]],
+                               point: CpsExpr[S],
+                               mapping: Expr[S=>T]
+                               ) extends AsyncCpsExpr[T](prev):
+
+   override def fLast(using Quotes): Expr[CB[T]] =
+            '{ CBM.map(${point.transformed})($mapping) }
+
+   override def prependExprs(exprs: Seq[Expr[?]]): CpsExpr[T] =
+           copy(prev = exprs ++: prev)
+
+
+
+case class FlatMappedCpsExpr[S:Type, T:Type](
+                               prev: Seq[Expr[?]],
+                               point: CpsExpr[S],
+                               mapping: Expr[S => CB[T]]
+                              ) extends AsyncCpsExpr[T](prev):
+
+     override def fLast(using Quotes): Expr[CB[T]] =
+                   '{ CBM.flatMap(${point.transformed})($mapping) }
+
+     override def prependExprs(exprs: Seq[Expr[?]]): CpsExpr[T] =
+           copy(prev = exprs ++: prev)
+
+
+class ValRhsFlatMappedCpsExpr[T:Type, V:Type](using thisQuotes: Quotes)
+                                      (
+                                       prev: Seq[Expr[?]],
+                                       oldValDef: quotes.reflect.ValDef,
+                                       cpsRhs: CpsExpr[V],
+                                       next: CpsExpr[T]
+                                      )
+                                     extends AsyncCpsExpr[T](prev) {
+
+      override def fLast(using Quotes):Expr[CB[T]] =
+           import quotes.reflect._
+           next.syncOrigin match
+             case Some(nextOrigin) =>
+               // owner of this block is incorrect
+              '{
+                 CBM.map(${cpsRhs.transformed})((vx:V) =>
+                           ${buildAppendBlockExpr('vx, nextOrigin)})
+               }
+             case  None =>
+              '{
+                CBM.flatMap(${cpsRhs.transformed})((v:V)=>
+                           ${buildAppendBlockExpr('v, next.transformed)})
+              }
+
+
+      override def prependExprs(exprs: Seq[Expr[?]]): CpsExpr[T] =
+           ValRhsFlatMappedCpsExpr(using thisQuotes)(exprs ++: prev,oldValDef,cpsRhs,next)
+
+      override def append[A:quoted.Type](e: CpsExpr[A])(using Quotes) =
+           ValRhsFlatMappedCpsExpr(using thisQuotes)(prev,oldValDef,cpsRhs,next.append(e))
+
+
+      private def buildAppendBlock(using Quotes)(rhs:quotes.reflect.Term,
+                                                     exprTerm:quotes.reflect.Term): quotes.reflect.Term =
+           import quotes.reflect._
+           import scala.quoted.Expr
+
+           val castedOldValDef = oldValDef.asInstanceOf[quotes.reflect.ValDef]
+           val valDef = ValDef(castedOldValDef.symbol, Some(rhs.changeOwner(castedOldValDef.symbol)))
+           exprTerm match
+               case Block(stats,last) =>
+                     Block(valDef::stats, last)
+               case other =>
+                     Block(valDef::Nil,other)
+
+      private def buildAppendBlockExpr[A:Type](using Quotes)(rhs: Expr[V], expr:Expr[A]):Expr[A] =
+           import quotes.reflect._
+           buildAppendBlock(rhs.asTerm,expr.asTerm).asExprOf[A]
+
+}
+
+
+object CpsExpr:
+
+    def sync[T:Type](f: Expr[T]): CpsExpr[T] =
+      GenericSyncCpsExpr[T](Seq(), f)
+
+    def async[T:Type](f: Expr[CB[T]]): CpsExpr[T] =
+      GenericAsyncCpsExpr[T](Seq(), f)
+
+
+object Async:
+
+   transparent inline def transform[T](inline expr: T) =  ${
+      Async.transformImpl[T]('expr)
+   }
+
+   def transformImpl[T:Type](f: Expr[T])(using Quotes): Expr[CB[T]] =
+      import quotes.reflect._
+      // println(s"before transformed: ${f.show}")
+      val cpsExpr = rootTransform[T](f)
+      val r = '{ CBM.spawn(${cpsExpr.transformed}) }
+      // println(s"transformed value: ${r.show}")
+      r
+
+   def rootTransform[T:Type](f: Expr[T])(using Quotes): CpsExpr[T] = {
+      import quotes.reflect._
+      f match
+         case '{ while ($cond) { $repeat }  } =>
+            val cpsRepeat = rootTransform(repeat.asExprOf[Unit])
+            CpsExpr.async('{
+                   def _whilefun():CB[Unit] =
+                      if ($cond) {
+                         ${cpsRepeat.flatMap('{(x:Unit) => _whilefun()}).transformed}
+                      } else {
+                         CBM.pure(())
+                      }
+                   _whilefun()
+            }.asExprOf[CB[T]])
+         case _ =>
+            val fTree = f.asTerm
+            fTree match {
+               case fun@Apply(fun1@TypeApply(obj2,targs2), args1) =>
+                      if (obj2.symbol.name == "await") {
+                         val awaitArg = args1.head
+                         CpsExpr.async(awaitArg.asExprOf[CB[T]])
+                      } else {
+                         ???
+                      }
+               case Assign(left,right) =>
+                       left match
+                         case id@Ident(x) =>
+                            right.tpe.widen.asType match
+                               case '[r] =>
+                                  val cpsRight = rootTransform(right.asExprOf[r])
+                                  CpsExpr.async(
+                                     cpsRight.map[T](
+                                       '{ (x:r) => ${Assign(left,'x.asTerm).asExprOf[T] }
+                                        }).transformed )
+                         case _ => ???
+               case Block(prevs,last) =>
+                      val rPrevs = prevs.map[CpsExpr[?]]{ p =>
+                         p match
+                            case v@ValDef(vName,vtt,optRhs) =>
+                              optRhs.get.tpe.widen.asType match
+                                case '[l] =>
+                                  val cpsRight = rootTransform(optRhs.get.asExprOf[l])
+                                  ValRhsFlatMappedCpsExpr(using quotes)(Seq(), v, cpsRight, CpsExpr.sync('{}))
+                            case t: Term =>
+                             // TODO: rootTransform
+                             t.asExpr match
+                                  case '{ $p: tp } =>
+                                         rootTransform(p)
+                                  case other =>
+                                         printf(other.show)
+                                         throw RuntimeException(s"can't handle term in block: $other")
+                            case other =>
+                              printf(other.show)
+                              throw RuntimeException(s"unknown tree type in block: $other")
+                       }
+                       val rLast = rootTransform(last.asExprOf[T])
+                       val blockResult = rPrevs.foldRight(rLast)((e,s) => e.append(s))
+                       val retval = CpsExpr.async(blockResult.transformed)
+                       retval
+                       //BlockTransform(cpsCtx).run(prevs,last)
+               case id@Ident(name) =>
+                       CpsExpr.sync(id.asExprOf[T])
+               case tid@Typed(Ident(name), tp) =>
+                      CpsExpr.sync(tid.asExprOf[T])
+               case matchTerm@Match(scrutinee, caseDefs) =>
+                      val nCases = caseDefs.map{ old =>
+                         CaseDef.copy(old)(old.pattern, old.guard, rootTransform(old.rhs.asExprOf[T]).transformed.asTerm)
+                      }
+                      CpsExpr.async(Match(scrutinee, nCases).asExprOf[CB[T]])
+               case inlinedTerm@ Inlined(call,List(),body) =>
+                         rootTransform(body.asExprOf[T])
+               case constTerm@Literal(_)=>
+                       CpsExpr.sync(constTerm.asExprOf[T])
+               case _ =>
+                       throw RuntimeException(s"language construction is not supported: ${fTree}")
+            }
+   }
+
diff --git a/tests/neg-macros/i13809/Test_2.scala b/tests/neg-macros/i13809/Test_2.scala
new file mode 100644
index 000000000000..3360de7ab018
--- /dev/null
+++ b/tests/neg-macros/i13809/Test_2.scala
@@ -0,0 +1,19 @@
+package x
+
+object VP1:
+
+   ///*
+   def allocateServiceOperator(optInUsername: Option[String]): CB[Unit] = Async.transform { // error
+      val username = optInUsername match
+         case None =>
+            while(false) {
+               val nextResult = await(op1())
+               val countResult = await(op1())
+            }
+         case Some(inUsername) =>
+            val x = await(op1())
+            inUsername
+   }
+   //*/
+
+   def op1(): CB[String] = ???
diff --git a/tests/neg-macros/i13991.check b/tests/neg-macros/i13991.check
new file mode 100644
index 000000000000..ca9f924a6693
--- /dev/null
+++ b/tests/neg-macros/i13991.check
@@ -0,0 +1,16 @@
+
+-- Error: tests/neg-macros/i13991/Test_2.scala:6:5 ---------------------------------------------------------------------
+6 |     v2  // error
+  |     ^^
+  |     Error
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from Test_2.scala:3
+3 |     inline def v2 = InlineMac.sample("foo")
+  |                                      ^^^^^
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from Test_2.scala:3
+3 |     inline def v2 = InlineMac.sample("foo")
+  |                     ^^^^^^^^^^^^^^^^^^^^^^^
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg-macros/i13991/Macro_1.scala b/tests/neg-macros/i13991/Macro_1.scala
new file mode 100644
index 000000000000..76cfa93cdde5
--- /dev/null
+++ b/tests/neg-macros/i13991/Macro_1.scala
@@ -0,0 +1,10 @@
+import scala.quoted.*
+
+object InlineMac:
+
+  inline def sample(inline expr: String): Int =
+    ${ sampleImpl('expr) }
+
+  def sampleImpl(expr: Expr[String])(using Quotes): Expr[Int] =
+      import quotes.reflect.*
+      report.errorAndAbort("Error", expr)
diff --git a/tests/neg-macros/i13991/Test_2.scala b/tests/neg-macros/i13991/Test_2.scala
new file mode 100644
index 000000000000..572ad324b129
--- /dev/null
+++ b/tests/neg-macros/i13991/Test_2.scala
@@ -0,0 +1,6 @@
+object Main:
+  def main(args: Array[String]): Unit =
+     inline def v2 = InlineMac.sample("foo")
+     inline def v1 = v2
+
+     v2  // error
diff --git a/tests/neg-macros/i14039/Macro_1.scala b/tests/neg-macros/i14039/Macro_1.scala
new file mode 100644
index 000000000000..d91a93a1dded
--- /dev/null
+++ b/tests/neg-macros/i14039/Macro_1.scala
@@ -0,0 +1,7 @@
+import scala.quoted.*
+
+object Macro:
+  inline def apply(): Any = ${Macro.impl}
+
+  def impl(using Quotes): Expr[Any] =
+    quotes.reflect.report.errorAndAbort("my message")
diff --git a/tests/neg-macros/i14039/Test_2.scala b/tests/neg-macros/i14039/Test_2.scala
new file mode 100644
index 000000000000..ff29836b379f
--- /dev/null
+++ b/tests/neg-macros/i14039/Test_2.scala
@@ -0,0 +1,5 @@
+class Dsl {
+  val entries = Seq.newBuilder[Any]
+  inline def get(): Unit = entries += Macro.apply()
+  def test = get() // error
+}
diff --git a/tests/neg-macros/i14137/Macro_1.scala b/tests/neg-macros/i14137/Macro_1.scala
new file mode 100644
index 000000000000..3b3d23fa34ee
--- /dev/null
+++ b/tests/neg-macros/i14137/Macro_1.scala
@@ -0,0 +1,23 @@
+package x
+
+import scala.quoted._
+
+object Macro:
+
+   inline def genOp(inline f:Int): Int = ${
+      genOpImpl('f)
+   }
+
+   def genOpImpl(f: Expr[Int])(using Quotes): Expr[Int] = {
+
+      def firstOp(): Expr[Int] =
+      '{
+        var x=1
+        ${secondOp('x,f)}
+      }
+
+      def secondOp(x:Expr[Int], y:Expr[Int]): Expr[Int] =
+         '{ $x + $y }
+
+      firstOp()
+   }
diff --git a/tests/neg-macros/i14137/Test_2.scala b/tests/neg-macros/i14137/Test_2.scala
new file mode 100644
index 000000000000..917e68dc7583
--- /dev/null
+++ b/tests/neg-macros/i14137/Test_2.scala
@@ -0,0 +1,6 @@
+package x
+
+object Main:
+
+  def main(args: Array[String]):Unit =
+    Macro.genOp(10) // error
diff --git a/tests/neg-macros/i6432.check b/tests/neg-macros/i6432.check
index 0e01f99be404..2ea6f3ba0300 100644
--- a/tests/neg-macros/i6432.check
+++ b/tests/neg-macros/i6432.check
@@ -3,14 +3,11 @@
 4 |  foo"abc${"123"}xyz${"456"}fgh" // error // error // error
   |      ^^^
   |      abc
-  | This location contains code that was inlined from Test_2.scala:4
 -- Error: tests/neg-macros/i6432/Test_2.scala:4:17 ---------------------------------------------------------------------
 4 |  foo"abc${"123"}xyz${"456"}fgh" // error // error // error
   |                 ^^^
   |                 xyz
-  | This location contains code that was inlined from Test_2.scala:4
 -- Error: tests/neg-macros/i6432/Test_2.scala:4:28 ---------------------------------------------------------------------
 4 |  foo"abc${"123"}xyz${"456"}fgh" // error // error // error
   |                            ^^^
   |                            fgh
-  | This location contains code that was inlined from Test_2.scala:4
diff --git a/tests/neg-macros/i6432b.check b/tests/neg-macros/i6432b.check
index 4dd1be84fa3c..395d089c92e9 100644
--- a/tests/neg-macros/i6432b.check
+++ b/tests/neg-macros/i6432b.check
@@ -3,14 +3,11 @@
 4 |  foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error
   |        ^^^
   |        abc
-  | This location contains code that was inlined from Test_2.scala:4
 -- Error: tests/neg-macros/i6432b/Test_2.scala:4:19 --------------------------------------------------------------------
 4 |  foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error
   |                   ^^^
   |                   xyz
-  | This location contains code that was inlined from Test_2.scala:4
 -- Error: tests/neg-macros/i6432b/Test_2.scala:4:30 --------------------------------------------------------------------
 4 |  foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error
   |                              ^^^
   |                              fgh
-  | This location contains code that was inlined from Test_2.scala:4
diff --git a/tests/neg-macros/i6436.check b/tests/neg-macros/i6436.check
index d861ad90717d..0b04bb9ddae2 100644
--- a/tests/neg-macros/i6436.check
+++ b/tests/neg-macros/i6436.check
@@ -6,5 +6,5 @@
 6 |      val ps: Seq[Expr[String]] = parts // error
   |                                  ^^^^^
   |                                  Not found: parts
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg-macros/i6976.check b/tests/neg-macros/i6976.check
index 2057e55550b4..0c30aa856ed1 100644
--- a/tests/neg-macros/i6976.check
+++ b/tests/neg-macros/i6976.check
@@ -6,4 +6,10 @@
   |    scala.MatchError: Inlined(EmptyTree,List(),Literal(Constant(2))) (of class dotty.tools.dotc.ast.Trees$Inlined)
   |    	at playground.macros$.mcrImpl(Macro_1.scala:10)
   |
-  | This location contains code that was inlined from Test_2.scala:5
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from Macro_1.scala:6
+6 |  inline def mcr(x: => Any) = ${mcrImpl('x)}
+  |                              ^^^^^^^^^^^^^^
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg-macros/i7068-c.scala b/tests/neg-macros/i7068-c.scala
index 7c6714d525c0..b5d416b3240d 100644
--- a/tests/neg-macros/i7068-c.scala
+++ b/tests/neg-macros/i7068-c.scala
@@ -2,7 +2,7 @@ def species(using quoted.Quotes) = '{
   case object Bar // error
   case class FooT() // error
   ${
-    case object Baz // ok
+    case object Baz // error
     ???
   }
   FooT()
diff --git a/tests/neg-macros/i7603.scala b/tests/neg-macros/i7603.scala
index c781513fb1ba..49bf1fe62471 100644
--- a/tests/neg-macros/i7603.scala
+++ b/tests/neg-macros/i7603.scala
@@ -2,6 +2,6 @@ import scala.quoted.*
 class Foo {
   def f[T2: Type](e: Expr[T2])(using Quotes) = e match {
     case '{ $x: ${'[List[$t]]} } => // error
-    case '{ $x: ${y @ '[List[$t]]} } => // error // error
+    case '{ $x: ${y @ '[List[$t]]} } => // error
   }
 }
diff --git a/tests/neg-macros/i7839.check b/tests/neg-macros/i7839.check
index 197867ab809b..3e3fc7b2c0f1 100644
--- a/tests/neg-macros/i7839.check
+++ b/tests/neg-macros/i7839.check
@@ -6,3 +6,4 @@
   |                  Parameters may only be:
   |                   * Quoted parameters or fields
   |                   * Literal values of primitive types
+  |                   * References to `inline val`s
diff --git a/tests/neg-macros/i9014.check b/tests/neg-macros/i9014.check
index 509eac067fc8..c0d08a42ef2a 100644
--- a/tests/neg-macros/i9014.check
+++ b/tests/neg-macros/i9014.check
@@ -3,4 +3,3 @@
 1 |val tests = summon[Bar] // error
   |                       ^
   |                       Failed to expand!
-  | This location contains code that was inlined from Test_2.scala:1
diff --git a/tests/neg-macros/i9014/Macros_1.scala b/tests/neg-macros/i9014/Macros_1.scala
index 3bca2bae4dc3..36ae6cafeac2 100644
--- a/tests/neg-macros/i9014/Macros_1.scala
+++ b/tests/neg-macros/i9014/Macros_1.scala
@@ -1,4 +1,4 @@
 import scala.quoted.*
 trait Bar
 inline given Bar = ${ impl }
-def impl(using Quotes): Expr[Bar] = quotes.reflect.report.throwError("Failed to expand!")
+def impl(using Quotes): Expr[Bar] = quotes.reflect.report.errorAndAbort("Failed to expand!")
diff --git a/tests/neg-macros/i9014b/Macros_1.scala b/tests/neg-macros/i9014b/Macros_1.scala
index 0dcb45d513cb..5af84224ff04 100644
--- a/tests/neg-macros/i9014b/Macros_1.scala
+++ b/tests/neg-macros/i9014b/Macros_1.scala
@@ -1,4 +1,4 @@
 import scala.quoted._
 trait Bar
 transparent inline given Bar = ${ impl }
-def impl(using Quotes): Expr[Bar] = quotes.reflect.report.throwError("Failed to expand!")
+def impl(using Quotes): Expr[Bar] = quotes.reflect.report.errorAndAbort("Failed to expand!")
diff --git a/tests/neg-macros/ill-abort.check b/tests/neg-macros/ill-abort.check
new file mode 100644
index 000000000000..2f76c89d88dd
--- /dev/null
+++ b/tests/neg-macros/ill-abort.check
@@ -0,0 +1,12 @@
+
+-- Error: tests/neg-macros/ill-abort/quoted_2.scala:1:15 ---------------------------------------------------------------
+1 |def test = fail() // error
+  |           ^^^^^^
+  |Macro expansion was aborted by the macro without any errors reported. Macros should issue errors to end-users to facilitate debugging when aborting a macro expansion.
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from quoted_1.scala:3
+3 |inline def fail(): Unit = ${ impl }
+  |                          ^^^^^^^^^
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg-macros/ill-abort/quoted_1.scala b/tests/neg-macros/ill-abort/quoted_1.scala
new file mode 100644
index 000000000000..0392ef5ae571
--- /dev/null
+++ b/tests/neg-macros/ill-abort/quoted_1.scala
@@ -0,0 +1,7 @@
+import scala.quoted.*
+
+inline def fail(): Unit = ${ impl }
+
+private def impl(using Quotes) : Expr[Unit] =
+  // should never be done without reporting error before (see docs)
+  throw new scala.quoted.runtime.StopMacroExpansion
diff --git a/tests/neg-macros/ill-abort/quoted_2.scala b/tests/neg-macros/ill-abort/quoted_2.scala
new file mode 100644
index 000000000000..fae7c594b861
--- /dev/null
+++ b/tests/neg-macros/ill-abort/quoted_2.scala
@@ -0,0 +1 @@
+def test = fail() // error
diff --git a/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala b/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala
index 4e56b946207a..f93082afc747 100644
--- a/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala
+++ b/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala
@@ -6,7 +6,7 @@ object E {
 
   inline def eval[T](inline x: E[T]): T = ${ impl('x) }
 
-  def impl[T: Type](x: Expr[E[T]]) (using Quotes): Expr[T] = x.valueOrError.lift
+  def impl[T: Type](x: Expr[E[T]]) (using Quotes): Expr[T] = x.valueOrAbort.lift
 
   implicit def ev1[T: Type]: FromExpr[E[T]] = new FromExpr {
     def unapply(x: Expr[E[T]])(using Quotes) = x match {
diff --git a/tests/neg-macros/inline-option/Macro_1.scala b/tests/neg-macros/inline-option/Macro_1.scala
index f2e3e453fdd2..d436285cd93e 100644
--- a/tests/neg-macros/inline-option/Macro_1.scala
+++ b/tests/neg-macros/inline-option/Macro_1.scala
@@ -2,7 +2,7 @@
 import scala.quoted.*
 
 object Macro {
-  def impl(opt: Expr[Option[Int]]) (using Quotes): Expr[Int] = opt.valueOrError match {
+  def impl(opt: Expr[Option[Int]]) (using Quotes): Expr[Int] = opt.valueOrAbort match {
     case Some(i) => Expr(i)
     case None => '{-1}
   }
diff --git a/tests/neg-macros/inline-tuples-1/Macro_1.scala b/tests/neg-macros/inline-tuples-1/Macro_1.scala
index 031fb01cabe4..e0ce4f20419a 100644
--- a/tests/neg-macros/inline-tuples-1/Macro_1.scala
+++ b/tests/neg-macros/inline-tuples-1/Macro_1.scala
@@ -2,26 +2,26 @@
 import scala.quoted.*
 
 object Macros {
-  def tup1(tup: Expr[Tuple1[Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup2(tup: Expr[Tuple2[Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup3(tup: Expr[Tuple3[Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup4(tup: Expr[Tuple4[Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup5(tup: Expr[Tuple5[Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup6(tup: Expr[Tuple6[Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup7(tup: Expr[Tuple7[Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup8(tup: Expr[Tuple8[Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup9(tup: Expr[Tuple9[Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup10(tup: Expr[Tuple10[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup11(tup: Expr[Tuple11[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup12(tup: Expr[Tuple12[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup13(tup: Expr[Tuple13[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup14(tup: Expr[Tuple14[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup15(tup: Expr[Tuple15[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup16(tup: Expr[Tuple16[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup17(tup: Expr[Tuple17[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup18(tup: Expr[Tuple18[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup19(tup: Expr[Tuple19[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup20(tup: Expr[Tuple20[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup21(tup: Expr[Tuple21[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup22(tup: Expr[Tuple22[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup1(tup: Expr[Tuple1[Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup2(tup: Expr[Tuple2[Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup3(tup: Expr[Tuple3[Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup4(tup: Expr[Tuple4[Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup5(tup: Expr[Tuple5[Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup6(tup: Expr[Tuple6[Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup7(tup: Expr[Tuple7[Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup8(tup: Expr[Tuple8[Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup9(tup: Expr[Tuple9[Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup10(tup: Expr[Tuple10[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup11(tup: Expr[Tuple11[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup12(tup: Expr[Tuple12[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup13(tup: Expr[Tuple13[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup14(tup: Expr[Tuple14[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup15(tup: Expr[Tuple15[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup16(tup: Expr[Tuple16[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup17(tup: Expr[Tuple17[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup18(tup: Expr[Tuple18[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup19(tup: Expr[Tuple19[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup20(tup: Expr[Tuple20[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup21(tup: Expr[Tuple21[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup22(tup: Expr[Tuple22[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
 }
diff --git a/tests/neg-macros/macro-class-not-found-1.check b/tests/neg-macros/macro-class-not-found-1.check
index 445523c6ade2..f16aac4efe3e 100644
--- a/tests/neg-macros/macro-class-not-found-1.check
+++ b/tests/neg-macros/macro-class-not-found-1.check
@@ -5,4 +5,10 @@
   |  java.lang.NoClassDefFoundError
   |  	at Foo$.aMacroImplementation(Foo.scala:8)
   |
-  | This location contains code that was inlined from Bar.scala:4
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from Foo.scala:5
+5 |  inline def myMacro(): Unit = ${ aMacroImplementation }
+  |                               ^^^^^^^^^^^^^^^^^^^^^^^^^
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg-macros/macro-class-not-found-2.check b/tests/neg-macros/macro-class-not-found-2.check
index 3cb7506e6bb2..3665ea1a9431 100644
--- a/tests/neg-macros/macro-class-not-found-2.check
+++ b/tests/neg-macros/macro-class-not-found-2.check
@@ -5,4 +5,10 @@
   |  java.lang.NoClassDefFoundError: this.is.not.a.Class
   |  	at Foo$.aMacroImplementation(Foo.scala:8)
   |
-  | This location contains code that was inlined from Bar.scala:4
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from Foo.scala:5
+5 |  inline def myMacro(): Unit = ${ aMacroImplementation }
+  |                               ^^^^^^^^^^^^^^^^^^^^^^^^^
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg-macros/macros-in-same-project-6.check b/tests/neg-macros/macros-in-same-project-6.check
index 485f5062db92..17f696508259 100644
--- a/tests/neg-macros/macros-in-same-project-6.check
+++ b/tests/neg-macros/macros-in-same-project-6.check
@@ -2,4 +2,3 @@
 4 |  Foo.myMacro() // error
   |  ^^^^^^^^^^^^^
   |  some error
-  | This location contains code that was inlined from Bar.scala:4
diff --git a/tests/neg-macros/quote-error-2/Macro_1.scala b/tests/neg-macros/quote-error-2/Macro_1.scala
index 7a98d7145698..a4c8960f04ab 100644
--- a/tests/neg-macros/quote-error-2/Macro_1.scala
+++ b/tests/neg-macros/quote-error-2/Macro_1.scala
@@ -3,7 +3,7 @@ import quoted.*
 object Macro_1 {
   inline def foo(inline b: Boolean): Unit = ${ fooImpl('b) }
   def fooImpl(b: Expr[Boolean])(using Quotes): Expr[Unit] =
-    '{println(${msg(b.valueOrError)})}
+    '{println(${msg(b.valueOrAbort)})}
 
   def msg(b: Boolean)(using Quotes): Expr[String] =
     if (b) '{"foo(true)"}
diff --git a/tests/neg-macros/quote-error/Macro_1.scala b/tests/neg-macros/quote-error/Macro_1.scala
index 668f2b99c33b..d553eac2b004 100644
--- a/tests/neg-macros/quote-error/Macro_1.scala
+++ b/tests/neg-macros/quote-error/Macro_1.scala
@@ -3,6 +3,6 @@ import quoted.*
 object Macro_1 {
   inline def foo(inline b: Boolean): Unit = ${fooImpl('b)}
   def fooImpl(b: Expr[Boolean])(using Quotes) : Expr[Unit] =
-    if (b.valueOrError) '{println("foo(true)")}
+    if (b.valueOrAbort) '{println("foo(true)")}
     else { quotes.reflect.report.error("foo cannot be called with false"); '{ ??? } }
 }
diff --git a/tests/neg-macros/quote-exception/Macro_1.scala b/tests/neg-macros/quote-exception/Macro_1.scala
index 2fa482a81c56..02b2d049499b 100644
--- a/tests/neg-macros/quote-exception/Macro_1.scala
+++ b/tests/neg-macros/quote-exception/Macro_1.scala
@@ -3,6 +3,6 @@ import quoted.*
 object Macro_1 {
   inline def foo(inline b: Boolean): Unit = ${fooImpl('b)}
   def fooImpl(b: Expr[Boolean]) (using Quotes): Expr[Unit] =
-    if (b.valueOrError) '{println("foo(true)")}
+    if (b.valueOrAbort) '{println("foo(true)")}
     else ???
 }
diff --git a/tests/neg-macros/quote-whitebox/Macro_1.scala b/tests/neg-macros/quote-whitebox/Macro_1.scala
index a18fccbc166e..78b7c36ccce1 100644
--- a/tests/neg-macros/quote-whitebox/Macro_1.scala
+++ b/tests/neg-macros/quote-whitebox/Macro_1.scala
@@ -2,7 +2,7 @@ import scala.quoted.*
 
 object Macros {
   transparent inline def defaultOf(inline str: String): Any = ${ defaultOfImpl('str) }
-  def defaultOfImpl(str: Expr[String]) (using Quotes): Expr[Any] = str.valueOrError match {
+  def defaultOfImpl(str: Expr[String]) (using Quotes): Expr[Any] = str.valueOrAbort match {
     case "int" => '{1}
     case "string" => '{"a"}
   }
diff --git a/tests/neg-macros/reflect-inline/assert_1.scala b/tests/neg-macros/reflect-inline/assert_1.scala
index 2c5b324450c5..4ea6f9871ba3 100644
--- a/tests/neg-macros/reflect-inline/assert_1.scala
+++ b/tests/neg-macros/reflect-inline/assert_1.scala
@@ -5,6 +5,6 @@ object api {
     ${ stripImpl('x) }
 
   private def stripImpl(x: Expr[String])(using Quotes): Expr[String] =
-    Expr(x.valueOrError.stripMargin)
+    Expr(x.valueOrAbort.stripMargin)
 
 }
diff --git a/tests/neg-macros/toexproftuple.scala b/tests/neg-macros/toexproftuple.scala
index f33bfd5f6dfb..20ae2f08ff8d 100644
--- a/tests/neg-macros/toexproftuple.scala
+++ b/tests/neg-macros/toexproftuple.scala
@@ -1,10 +1,63 @@
-import scala.quoted._, scala.deriving.*
+import scala.quoted._, scala.deriving.* // error
+// ^
+// Match type reduction failed since selector  ((2 : Int), quoted.Expr[(3 : Int)])
+// matches none of the cases
+//
+//     case quoted.Expr[x] *: t => x *: scala.Tuple.InverseMap[t, quoted.Expr]
+//     case EmptyTuple => EmptyTuple
+
+inline def mcr: Any = ${mcrImpl} // error
+// ^
+// Match type reduction failed since selector  ((2 : Int), quoted.Expr[(3 : Int)])
+// matches none of the cases
+//
+//     case quoted.Expr[x] *: t => x *: scala.Tuple.InverseMap[t, quoted.Expr]
+//     case EmptyTuple => EmptyTuple
+
+def mcrImpl(using ctx: Quotes): Expr[Any] = { // error // error
+  //^
+  // Match type reduction failed since selector  ((2 : Int), quoted.Expr[(3 : Int)])
+  // matches none of the cases
+  //
+  //     case quoted.Expr[x] *: t => x *: scala.Tuple.InverseMap[t, quoted.Expr]
+  //     case EmptyTuple => EmptyTuple
+
+  //                                        ^
+  // Match type reduction failed since selector  ((2 : Int), quoted.Expr[(3 : Int)])
+  // matches none of the cases
+  //
+  //     case quoted.Expr[x] *: t => x *: scala.Tuple.InverseMap[t, quoted.Expr]
+  //     case EmptyTuple => EmptyTuple
 
-inline def mcr: Any = ${mcrImpl}
-def mcrImpl(using ctx: Quotes): Expr[Any] = {
   val tpl: (Expr[1], Expr[2], Expr[3]) = ('{1}, '{2}, '{3})
   '{val res: (1, 3, 3) = ${Expr.ofTuple(tpl)}; res}  // error
+  //                          ^^^^^^^^^^^^^^^^^
+  // Found:    quoted.Expr[(1 : Int) *: (2 : Int) *: (3 : Int) *: EmptyTuple]
+  // Required: quoted.Expr[((1 : Int), (3 : Int), (3 : Int))]
 
   val tpl2: (Expr[1], 2, Expr[3]) = ('{1}, 2, '{3})
-  '{val res = ${Expr.ofTuple(tpl2)}; res}  // error
+  '{val res = ${Expr.ofTuple(tpl2)}; res}  // error // error // error // error
+  //                                 ^
+  // Cannot prove that (quoted.Expr[(1 : Int)], (2 : Int), quoted.Expr[(3 : Int)]) =:= scala.Tuple.Map[
+  //   scala.Tuple.InverseMap[
+  //     (quoted.Expr[(1 : Int)], (2 : Int), quoted.Expr[(3 : Int)])
+  //   , quoted.Expr]
+  // , quoted.Expr].
+
+  //    ^
+  // Match type reduction failed since selector  ((2 : Int), quoted.Expr[(3 : Int)])
+  // matches none of the cases
+  //
+  //     case quoted.Expr[x] *: t => x *: scala.Tuple.InverseMap[t, quoted.Expr]
+  //     case EmptyTuple => EmptyTuple
+
+  //                                  ^
+  //                                  Cyclic reference involving val res
+
+  // ^
+  // Match type reduction failed since selector  ((2 : Int), quoted.Expr[(3 : Int)])
+  // matches none of the cases
+  //
+  //     case quoted.Expr[x] *: t => x *: scala.Tuple.InverseMap[t, quoted.Expr]
+  //     case EmptyTuple => EmptyTuple
 }
diff --git a/tests/neg-macros/type-splice-in-val-pattern.check b/tests/neg-macros/type-splice-in-val-pattern.check
index 26a457127acb..627aa2d5755d 100644
--- a/tests/neg-macros/type-splice-in-val-pattern.check
+++ b/tests/neg-macros/type-splice-in-val-pattern.check
@@ -2,5 +2,5 @@
 5 |    val '[ *:[$t] ] = ??? // error
   |              ^^
   |              Type splices cannot be used in val patterns. Consider using `match` instead.
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg-scalajs/js-enums.check b/tests/neg-scalajs/js-enums.check
index eb358f16e57a..e54b2a5af2da 100644
--- a/tests/neg-scalajs/js-enums.check
+++ b/tests/neg-scalajs/js-enums.check
@@ -4,9 +4,9 @@
   |MyEnum extends scala.reflect.Enum which does not extend js.Any.
 5 |  case Foo
 -- Error: tests/neg-scalajs/js-enums.scala:9:5 -------------------------------------------------------------------------
-7 |@js.native
-8 |@JSGlobal
-9 |enum MyEnumNative extends js.Object: // error
+ 7 |@js.native
+ 8 |@JSGlobal
+ 9 |enum MyEnumNative extends js.Object: // error
    |^
    |MyEnumNative extends scala.reflect.Enum which does not extend js.Any.
 10 |  case Bar
diff --git a/tests/neg-scalajs/js-native-exports.check b/tests/neg-scalajs/js-native-exports.check
new file mode 100644
index 000000000000..1003580b64ca
--- /dev/null
+++ b/tests/neg-scalajs/js-native-exports.check
@@ -0,0 +1,16 @@
+-- Error: tests/neg-scalajs/js-native-exports.scala:17:11 --------------------------------------------------------------
+17 |    export bag.{str, int, bool, dbl} // error
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |    Native JS traits, classes and objects cannot contain exported definitions.
+-- Error: tests/neg-scalajs/js-native-exports.scala:23:11 --------------------------------------------------------------
+23 |    export bag.{str, int, bool, dbl} // error
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |    Native JS traits, classes and objects cannot contain exported definitions.
+-- Error: tests/neg-scalajs/js-native-exports.scala:30:11 --------------------------------------------------------------
+30 |    export bag.{str, int, bool, dbl} // error
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |    Native JS traits, classes and objects cannot contain exported definitions.
+-- Error: tests/neg-scalajs/js-native-exports.scala:35:11 --------------------------------------------------------------
+35 |    export bag.{str, int, bool, dbl} // error
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |    Non-native JS traits cannot contain exported definitions.
diff --git a/tests/neg-scalajs/js-native-exports.scala b/tests/neg-scalajs/js-native-exports.scala
new file mode 100644
index 000000000000..73c0ffe93573
--- /dev/null
+++ b/tests/neg-scalajs/js-native-exports.scala
@@ -0,0 +1,38 @@
+import scala.scalajs.js
+import scala.scalajs.js.annotation.*
+
+object A {
+
+  @js.native
+  trait Bag extends js.Any {
+    val str: String
+    def int: Int
+    def bool(): Boolean
+    def dbl(dbl: Double): Double
+  }
+
+  @js.native
+  @JSGlobal("BagHolder_GlobalClass")
+  final class BagHolder(val bag: Bag) extends js.Object {
+    export bag.{str, int, bool, dbl} // error
+  }
+
+  @js.native
+  trait BagHolderTrait extends js.Any {
+    val bag: Bag
+    export bag.{str, int, bool, dbl} // error
+  }
+
+  @js.native
+  @JSGlobal("BagHolderModule_GlobalVar")
+  object BagHolderModule extends js.Object {
+    val bag: Bag = js.native
+    export bag.{str, int, bool, dbl} // error
+  }
+
+  trait NonNativeBagHolderTrait extends js.Any {
+    val bag: Bag
+    export bag.{str, int, bool, dbl} // error
+  }
+
+}
diff --git a/tests/neg-scalajs/js-non-native-members-conflicts.check b/tests/neg-scalajs/js-non-native-members-conflicts.check
new file mode 100644
index 000000000000..011b52c93be8
--- /dev/null
+++ b/tests/neg-scalajs/js-non-native-members-conflicts.check
@@ -0,0 +1,12 @@
+-- Error: tests/neg-scalajs/js-non-native-members-conflicts.scala:7:6 --------------------------------------------------
+7 |  def b: Unit = () // error
+  |      ^
+  |      Cannot disambiguate overloads for getter a with types
+  |        (): Unit
+  |        (): Unit
+-- Error: tests/neg-scalajs/js-non-native-members-conflicts.scala:10:2 -------------------------------------------------
+10 |  object B1 // error
+   |  ^
+   |  Cannot disambiguate overloads for getter B1 with types
+   |    (): A.this.B1
+   |    (): Object
diff --git a/tests/neg-scalajs/js-non-native-members-conflicts.scala b/tests/neg-scalajs/js-non-native-members-conflicts.scala
new file mode 100644
index 000000000000..d3c44c489f15
--- /dev/null
+++ b/tests/neg-scalajs/js-non-native-members-conflicts.scala
@@ -0,0 +1,11 @@
+import scala.scalajs.js
+import scala.scalajs.js.annotation.*
+
+class A extends js.Object {
+  def a: Unit = ()
+  @JSName("a")
+  def b: Unit = () // error
+
+  class B1 extends js.Object
+  object B1 // error
+}
diff --git a/tests/neg-scalajs/js-type-bad-parents.check b/tests/neg-scalajs/js-type-bad-parents.check
index 0375f2fd30c0..ae5e23566f8e 100644
--- a/tests/neg-scalajs/js-type-bad-parents.check
+++ b/tests/neg-scalajs/js-type-bad-parents.check
@@ -45,7 +45,7 @@
 -- Error: tests/neg-scalajs/js-type-bad-parents.scala:36:7 -------------------------------------------------------------
 36 |object C3 extends ScalaClass with js.Any // error
    |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |C3$ extends ScalaClass which does not extend js.Any.
+   |C3 extends ScalaClass which does not extend js.Any.
 -- Error: tests/neg-scalajs/js-type-bad-parents.scala:39:6 -------------------------------------------------------------
 38 |@js.native
 39 |trait C4 extends ScalaClass with js.Any // error
@@ -60,7 +60,7 @@
 42 |@js.native @JSGlobal
 43 |object C6 extends ScalaClass with js.Any // error
    |^
-   |C6$ extends ScalaClass which does not extend js.Any.
+   |C6 extends ScalaClass which does not extend js.Any.
 -- Error: tests/neg-scalajs/js-type-bad-parents.scala:45:6 -------------------------------------------------------------
 45 |trait C7 extends js.Object with ScalaTrait // error
    |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -72,7 +72,7 @@
 -- Error: tests/neg-scalajs/js-type-bad-parents.scala:47:7 -------------------------------------------------------------
 47 |object C9 extends js.Object with ScalaTrait // error
    |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |C9$ extends ScalaTrait which does not extend js.Any.
+   |C9 extends ScalaTrait which does not extend js.Any.
 -- Error: tests/neg-scalajs/js-type-bad-parents.scala:50:6 -------------------------------------------------------------
 49 |@js.native
 50 |trait C10 extends js.Object with ScalaTrait // error
@@ -87,4 +87,4 @@
 53 |@js.native @JSGlobal
 54 |object C12 extends js.Object with ScalaTrait // error
    |^
-   |C12$ extends ScalaTrait which does not extend js.Any.
+   |C12 extends ScalaTrait which does not extend js.Any.
diff --git a/tests/neg-scalajs/jsconstructorof-error-in-prepjsinterop.check b/tests/neg-scalajs/jsconstructorof-error-in-prepjsinterop.check
index 123706ae3776..57be080100e9 100644
--- a/tests/neg-scalajs/jsconstructorof-error-in-prepjsinterop.check
+++ b/tests/neg-scalajs/jsconstructorof-error-in-prepjsinterop.check
@@ -13,7 +13,7 @@
 -- Error: tests/neg-scalajs/jsconstructorof-error-in-prepjsinterop.scala:17:27 -----------------------------------------
 17 |  val d = js.constructorOf[NativeJSClass { def bar: Int }] // error
    |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |                           NativeJSClass{bar: => Int} is not a class type
+   |                           NativeJSClass{bar: Int} is not a class type
 -- Error: tests/neg-scalajs/jsconstructorof-error-in-prepjsinterop.scala:19:27 -----------------------------------------
 19 |  val e = js.constructorOf[JSTrait] // error
    |                           ^^^^^^^
@@ -29,7 +29,7 @@
 -- Error: tests/neg-scalajs/jsconstructorof-error-in-prepjsinterop.scala:23:27 -----------------------------------------
 23 |  val h = js.constructorOf[JSClass { def bar: Int }] // error
    |                           ^^^^^^^^^^^^^^^^^^^^^^^^
-   |                           JSClass{bar: => Int} is not a class type
+   |                           JSClass{bar: Int} is not a class type
 -- Error: tests/neg-scalajs/jsconstructorof-error-in-prepjsinterop.scala:25:42 -----------------------------------------
 25 |  def foo[A <: js.Any] = js.constructorOf[A] // error
    |                                          ^
diff --git a/tests/neg-scalajs/jsconstructorof-error-in-typer.check b/tests/neg-scalajs/jsconstructorof-error-in-typer.check
index 391ffa4c6933..c0d25674dec5 100644
--- a/tests/neg-scalajs/jsconstructorof-error-in-typer.check
+++ b/tests/neg-scalajs/jsconstructorof-error-in-typer.check
@@ -2,17 +2,17 @@
 9 |  val a = js.constructorOf[ScalaClass] // error
   |                           ^
   |                           Type argument ScalaClass does not conform to upper bound scala.scalajs.js.Any
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E057] Type Mismatch Error: tests/neg-scalajs/jsconstructorof-error-in-typer.scala:10:27 ----------------------------
 10 |  val b = js.constructorOf[ScalaTrait] // error
    |                           ^
    |                           Type argument ScalaTrait does not conform to upper bound scala.scalajs.js.Any
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E057] Type Mismatch Error: tests/neg-scalajs/jsconstructorof-error-in-typer.scala:11:27 ----------------------------
 11 |  val c = js.constructorOf[ScalaObject.type] // error
    |                           ^
    |                           Type argument ScalaObject.type does not conform to upper bound scala.scalajs.js.Any
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg-scalajs/jsconstructortag-error-in-prepjsinterop.check b/tests/neg-scalajs/jsconstructortag-error-in-prepjsinterop.check
index 6916c33b9cc7..7b4c98a95008 100644
--- a/tests/neg-scalajs/jsconstructortag-error-in-prepjsinterop.check
+++ b/tests/neg-scalajs/jsconstructortag-error-in-prepjsinterop.check
@@ -13,7 +13,7 @@
 -- Error: tests/neg-scalajs/jsconstructortag-error-in-prepjsinterop.scala:17:59 ----------------------------------------
 17 |  val d = js.constructorTag[NativeJSClass { def bar: Int }] // error
    |                                                           ^
-   |                                                           NativeJSClass{bar: => Int} is not a class type
+   |                                                           NativeJSClass{bar: Int} is not a class type
 -- Error: tests/neg-scalajs/jsconstructortag-error-in-prepjsinterop.scala:19:36 ----------------------------------------
 19 |  val e = js.constructorTag[JSTrait] // error
    |                                    ^
@@ -29,7 +29,7 @@
 -- Error: tests/neg-scalajs/jsconstructortag-error-in-prepjsinterop.scala:23:53 ----------------------------------------
 23 |  val h = js.constructorTag[JSClass { def bar: Int }] // error
    |                                                     ^
-   |                                                     JSClass{bar: => Int} is not a class type
+   |                                                     JSClass{bar: Int} is not a class type
 -- Error: tests/neg-scalajs/jsconstructortag-error-in-prepjsinterop.scala:25:45 ----------------------------------------
 25 |  def foo[A <: js.Any] = js.constructorTag[A] // error
    |                                             ^
diff --git a/tests/neg-scalajs/jsconstructortag-error-in-typer.check b/tests/neg-scalajs/jsconstructortag-error-in-typer.check
index a18ed693383e..22212957403f 100644
--- a/tests/neg-scalajs/jsconstructortag-error-in-typer.check
+++ b/tests/neg-scalajs/jsconstructortag-error-in-typer.check
@@ -4,7 +4,7 @@
   |no implicit argument of type scala.scalajs.js.ConstructorTag[ScalaClass] was found for parameter tag of method constructorTag in package scala.scalajs.js.
   |I found:
   |
-  |    scala.scalajs.js.ConstructorTag.materialize[Nothing]
+  |    scala.scalajs.js.ConstructorTag.materialize[T]
   |
   |But method materialize in object ConstructorTag does not match type scala.scalajs.js.ConstructorTag[ScalaClass].
 -- Error: tests/neg-scalajs/jsconstructortag-error-in-typer.scala:10:39 ------------------------------------------------
@@ -13,7 +13,7 @@
    |no implicit argument of type scala.scalajs.js.ConstructorTag[ScalaTrait] was found for parameter tag of method constructorTag in package scala.scalajs.js.
    |I found:
    |
-   |    scala.scalajs.js.ConstructorTag.materialize[Nothing]
+   |    scala.scalajs.js.ConstructorTag.materialize[T]
    |
    |But method materialize in object ConstructorTag does not match type scala.scalajs.js.ConstructorTag[ScalaTrait].
 -- Error: tests/neg-scalajs/jsconstructortag-error-in-typer.scala:11:45 ------------------------------------------------
@@ -22,6 +22,6 @@
    |no implicit argument of type scala.scalajs.js.ConstructorTag[ScalaObject.type] was found for parameter tag of method constructorTag in package scala.scalajs.js.
    |I found:
    |
-   |    scala.scalajs.js.ConstructorTag.materialize[Nothing]
+   |    scala.scalajs.js.ConstructorTag.materialize[T]
    |
    |But method materialize in object ConstructorTag does not match type scala.scalajs.js.ConstructorTag[ScalaObject.type].
diff --git a/tests/neg-scalajs/jsname-argument.check b/tests/neg-scalajs/jsname-argument.check
index c7640631e730..bccdee995b81 100644
--- a/tests/neg-scalajs/jsname-argument.check
+++ b/tests/neg-scalajs/jsname-argument.check
@@ -22,6 +22,10 @@
 42 |  @JSName(new NamesClass().a) // error
    |          ^^^^^^^^^^^^^^^^^^
    |          A js.Symbol argument to JSName must be a static, stable identifier
+-- Warning: tests/neg-scalajs/jsname-argument.scala:49:10 --------------------------------------------------------------
+49 |  @JSName(a) // warning, untested
+   |          ^
+   |This symbol is defined in the same object as the annotation's target. This will cause a stackoverflow at runtime
 -- Error: tests/neg-scalajs/jsname-argument.scala:57:3 -----------------------------------------------------------------
 57 |  @JSName(Names.sym) // error
    |  ^^^^^^^^^^^^^^^^^^
diff --git a/tests/neg-scalajs/type-mismatch.check b/tests/neg-scalajs/type-mismatch.check
index 2ea5f1f23945..73bb52079e3d 100644
--- a/tests/neg-scalajs/type-mismatch.check
+++ b/tests/neg-scalajs/type-mismatch.check
@@ -3,5 +3,5 @@
   |                 ^^^
   |                 Found:    (msg : String)
   |                 Required: Int
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/10349.scala b/tests/neg/10349.scala
new file mode 100644
index 000000000000..4ea683f6a8fb
--- /dev/null
+++ b/tests/neg/10349.scala
@@ -0,0 +1,11 @@
+object Firsts:
+
+  type First[X] = X match
+    case Map[_, v] => First[Option[v]]
+
+  def first[X](x: X): First[X] = x match
+    case x: Map[_, _] => first(x.values.headOption) // error
+
+  @main
+  def runFirsts2(): Unit =
+    assert(first(Map.empty[Int, Int]) == None) // error
diff --git a/tests/neg/10747.scala b/tests/neg/10747.scala
new file mode 100644
index 000000000000..a299f2a6590c
--- /dev/null
+++ b/tests/neg/10747.scala
@@ -0,0 +1,5 @@
+type Foo[A] = A match {
+  case Int => String
+}
+
+type B = Foo[Boolean] // error
diff --git a/tests/neg/12050.scala b/tests/neg/12050.scala
new file mode 100644
index 000000000000..a8e073bb353b
--- /dev/null
+++ b/tests/neg/12050.scala
@@ -0,0 +1,34 @@
+class P[X, Y]
+
+type Swap[X] = X match
+  case P[x, y] => Swap[P[y, x]]
+
+val z: P[String, Int] = ??? : Swap[P[Int, String]] // error
+//                            ^
+// Recursion limit exceeded.
+// Maybe there is an illegal cyclic reference?
+// If that's not the case, you could also try to increase the stacksize using the -Xss JVM option.
+// A recurring operation is (inner to outer):
+//
+//   normalizing P[String, Int] match ...
+//   normalizing P[Int, String] match ...
+//   normalizing P[String, Int] match ...
+//   normalizing P[Int, String] match ...
+//   normalizing P[String, Int] match ...
+//   normalizing P[Int, String] match ...
+//   normalizing P[String, Int] match ...
+//   normalizing P[Int, String] match ...
+//   normalizing P[String, Int] match ...
+//   normalizing P[Int, String] match ...
+//   ...
+//
+//   normalizing P[String, Int] match ...
+//   normalizing P[Int, String] match ...
+//   normalizing P[String, Int] match ...
+//   normalizing P[Int, String] match ...
+//   normalizing P[String, Int] match ...
+//   normalizing P[Int, String] match ...
+//   normalizing P[String, Int] match ...
+//   normalizing P[Int, String] match ...
+//   normalizing P[String, Int] match ...
+//   normalizing P[Int, String] match ...
diff --git a/tests/neg/12249.scala b/tests/neg/12249.scala
new file mode 100644
index 000000000000..81e8ce053584
--- /dev/null
+++ b/tests/neg/12249.scala
@@ -0,0 +1,9 @@
+
+export java.util.UUID
+
+def bar = println(new UUID(1, 2)) // OK
+
+def foo = println(UUID.randomUUID()) // error
+//                ^^^^
+//                Not found: UUID
+
diff --git a/tests/neg/12261.scala b/tests/neg/12261.scala
new file mode 100644
index 000000000000..70120671a05b
--- /dev/null
+++ b/tests/neg/12261.scala
@@ -0,0 +1,15 @@
+type M0[X] = X match {
+  case ? => String // error: Unbound wildcard type
+}
+
+type M1[X] = X match {
+  case Any => _ // error: Unbound wildcard type
+}
+
+type M2[X] = X match {
+  case Any => ? // error: Unbound wildcard type
+}
+
+val a = "" match { case _: _ => () } // error: Unbound wildcard type
+
+val b = try { } catch { case _: _ => () } // error: Unbound wildcard type
diff --git a/tests/neg/12549.scala b/tests/neg/12549.scala
new file mode 100644
index 000000000000..4e2a5531efa0
--- /dev/null
+++ b/tests/neg/12549.scala
@@ -0,0 +1,18 @@
+enum Bool {
+  case True
+  case False
+}
+
+import Bool.*
+
+type Not[B <: Bool] = B match {
+  case True.type => False.type
+  case False.type => True.type
+  case _ => "unreachable"
+}
+
+def foo[B <: Bool & Singleton]: Unit = {
+  implicitly[Not[B] =:= "unreachable"] // error
+
+  ()
+}
diff --git a/tests/neg/12800.scala b/tests/neg/12800.scala
new file mode 100644
index 000000000000..164276396bec
--- /dev/null
+++ b/tests/neg/12800.scala
@@ -0,0 +1,21 @@
+object Test {
+  type FieldType2[K, +V] = V with KeyTag2[K, V]
+  trait KeyTag2[K, +V] extends Any
+
+  type WrapUpper = Tuple
+  type Wrap[A] = Tuple1[A]
+
+  type Extract[A <: WrapUpper] = A match {
+    case Wrap[h] => h
+  }
+
+  summon[Extract[Wrap[FieldType2["foo", Int]]] =:= FieldType2["foo", Int]] // error
+  //                                                                     ^
+  // Cannot prove that Main.Extract[Tuple1[Main.FieldType2[("foo" : String), Int]]] =:= Main.FieldType2[("foo" : String), Int].
+  //
+  // Note: a match type could not be fully reduced:
+  //
+  //   trying to reduce  Main.Extract[Tuple1[Main.FieldType2[("foo" : String), Int]]]
+  //   failed since selector  Tuple1[Main.FieldType2[("foo" : String), Int]]
+  //   is uninhabited.
+}
diff --git a/tests/neg/12974.scala b/tests/neg/12974.scala
new file mode 100644
index 000000000000..90edcc916471
--- /dev/null
+++ b/tests/neg/12974.scala
@@ -0,0 +1,35 @@
+package example
+
+object RecMap {
+
+  object Record {
+    // use this scope to bound who can see inside the opaque type
+    opaque type Rec[A <: Tuple] = Map[String, Any]
+
+    object Rec {
+      type HasKey[A <: Tuple, K] =
+        A match
+          case (K, t) *: _ => t
+          case _ *: t => HasKey[t, K]
+
+      val empty: Rec[EmptyTuple] = Map.empty
+
+      extension [A <: Tuple](toMap: Rec[A])
+        def fetch[K <: String & Singleton](key: K): HasKey[A, K] =
+          toMap(key).asInstanceOf[HasKey[A, K]]
+    }
+  }
+
+  def main(args: Array[String]) =
+    import Record._
+
+    val foo: Any = Rec.empty.fetch("foo") // error
+    //                            ^
+    // Match type reduction failed since selector  EmptyTuple.type
+    // matches none of the cases
+    //
+    //     case (("foo" : String), t) *: _ => t
+    //     case _ *: t => example.RecMap.Record.Rec.HasKey[t, ("foo" : String)]
+
+  end main
+}
diff --git a/tests/neg/3559d.check b/tests/neg/3559d.check
index 128093d8579a..0f0e05f784b2 100644
--- a/tests/neg/3559d.check
+++ b/tests/neg/3559d.check
@@ -2,5 +2,5 @@
 7 |    this(f)           // error
   |         ^
   |         Not found: f
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/6697.check b/tests/neg/6697.check
new file mode 100644
index 000000000000..3249ad7aa4af
--- /dev/null
+++ b/tests/neg/6697.check
@@ -0,0 +1,13 @@
+-- [E057] Type Mismatch Error: tests/neg/6697.scala:6:35 ---------------------------------------------------------------
+6 |  type Copy[O <: Off] = Of[Sup[O], Sub[O]]  // error
+  |                                   ^
+  |                                   Type argument Test.Sub[O] does not conform to upper bound Test.Sup[O]
+  |
+  |                                   Note: a match type could not be fully reduced:
+  |
+  |                                     trying to reduce  Test.Sub[O]
+  |                                     failed since selector  O
+  |                                     does not match  case Test.Of[sup, sub] => sub
+  |                                     and cannot be shown to be disjoint from it either.
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/pos/6697.scala b/tests/neg/6697.scala
similarity index 79%
rename from tests/pos/6697.scala
rename to tests/neg/6697.scala
index 18a59d5b61f4..bd3b30f8079b 100644
--- a/tests/pos/6697.scala
+++ b/tests/neg/6697.scala
@@ -3,5 +3,5 @@ object Test {
   case class Of[sup, sub <: sup]() extends Off
   type Sup[O <: Off] = O match { case Of[sup, sub] => sup }
   type Sub[O <: Off] = O match { case Of[sup, sub] => sub }
-  type Copy[O <: Off] = Of[Sup[O], Sub[O]]
+  type Copy[O <: Off] = Of[Sup[O], Sub[O]]  // error
 }
diff --git a/tests/neg/7380.scala b/tests/neg/7380.scala
new file mode 100644
index 000000000000..20f64db90447
--- /dev/null
+++ b/tests/neg/7380.scala
@@ -0,0 +1,14 @@
+import scala.deriving.Mirror
+
+object Test {
+  summon[Mirror.Of[(Int, String)] {
+    type MirroredElemTypes = (Int, Int, Int)
+  }] // error
+  // MirroredElemTypes missmatch, expected: (Int, String), found: (Int, Int, Int).
+
+  summon[Mirror.Of[(Int, String)] {
+    type MirroredElemLabels = ("_1", "_2", "_3")
+  }]  // error
+  // MirroredElemLabels missmatch, expected: (("_1" : String), ("_2" : String)),
+  // found: (("_1" : String), ("_2" : String), ("_3" : String)).
+}
diff --git a/tests/neg/8702.scala b/tests/neg/8702.scala
new file mode 100644
index 000000000000..ae4fe38ffb50
--- /dev/null
+++ b/tests/neg/8702.scala
@@ -0,0 +1,63 @@
+// All three All type positions in a match type (scrutinee, patterns, bodies)
+// are considered invariant, as showed by the following examples:
+
+trait TA[+Plus] { type M[X] = Plus match { case Int => String } } // error
+//               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+//               covariant type Plus occurs in invariant position in type [X] =
+//                    Plus match {
+//                      case Int => String
+//                    } of type M
+
+trait TB[+Plus] { type M[X] = X match { case Plus => String } } // error
+//               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+//               covariant type Plus occurs in invariant position in type [X] =
+//                 X match {
+//                   case Plus => String
+//                 } of type M
+
+trait TC[+Plus] { type M[X] = X match { case Int => Plus } } // error
+//               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+//               covariant type Plus occurs in invariant position in type [X] =
+//                 X match {
+//                   case Int => Plus
+//                 } of type M
+
+trait TD[-Minus] { type M[X] = Minus match { case Int => String } } // error
+//                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+//                contravariant type Minus occurs in invariant position in type [X] =
+//                  Minus match {
+//                    case Int => String
+//                  } of type M
+
+trait TE[-Minus] { type M[X] = X match { case Minus => String } } // error
+//                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+//                contravariant type Minus occurs in invariant position in type [X] =
+//                  X match {
+//                    case Minus => String
+//                  } of type M
+
+trait TF[-Minus] { type M[X] = X match { case Int => Minus } } // error
+//                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+//                contravariant type Minus occurs in invariant position in type [X] =
+//                  X match {
+//                    case Int => Minus
+//                  } of type M
+
+// Furthermore, both unannotated type parameters and unannotated type bindings
+// in patterns are invariant, as showed by the following examples:
+
+trait Cov[+X]
+trait Contra[-X]
+
+// As usual:
+type Test0[X] = Cov[X]     // OK
+type Test1[X] = Contra[X]  // OK
+type Test2[+X] = Contra[X] // error: covariant type parameter X occurs in
+                           // in contravariant position in Contra[X]
+type Test3[-X] = Cov[X]    // error: contravariant type parameter X occurs in
+                           // covariant position in Cov[X]
+
+type M0[X] = X match { case Int => Cov[X] }
+type M1[X] = X match { case Int => Contra[X] }
+type M2[X] = X match { case Cov[x] => Contra[x] }
+type M3[X] = X match { case Contra[x] => Cov[x] }
diff --git a/tests/neg/9107.scala b/tests/neg/9107.scala
new file mode 100644
index 000000000000..a0cbabd50b4d
--- /dev/null
+++ b/tests/neg/9107.scala
@@ -0,0 +1,14 @@
+trait M[F[_]]
+trait Inv[T]
+
+object Test {
+  def ev[X] = implicitly[
+    (X match { case Inv[t] => Int }) =:=
+    (X match { case Inv[t] => t })
+  ] // error
+
+  def ev2[X] = implicitly[
+    (M[[t] =>> runtime.MatchCase[Inv[t], Int]])  =:=
+    (M[[t] =>> runtime.MatchCase[Inv[t], t]])
+  ] // error
+}
diff --git a/tests/neg/EmptyCaseClassParams.check b/tests/neg/EmptyCaseClassParams.check
index 6cd019571c73..67ecda360cd4 100644
--- a/tests/neg/EmptyCaseClassParams.check
+++ b/tests/neg/EmptyCaseClassParams.check
@@ -2,17 +2,17 @@
 2 |  case class A[T] // error
   |             ^
   |             A case class must have at least one parameter list
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E004] Syntax Error: tests/neg/EmptyCaseClassParams.scala:5:13 ------------------------------------------------------
 5 |  case class B[T] // error
   |             ^
   |             A case class must have at least one parameter list
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E004] Syntax Error: tests/neg/EmptyCaseClassParams.scala:9:9 -------------------------------------------------------
 9 |    case D[T] extends Foo[T] // error
   |         ^
   |         A case class must have at least one parameter list
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/EmptyEnum.check b/tests/neg/EmptyEnum.check
index 91281e6904e7..2ee3b74b4c15 100644
--- a/tests/neg/EmptyEnum.check
+++ b/tests/neg/EmptyEnum.check
@@ -2,5 +2,5 @@
 1 |enum EmptyEnum {} // error
   |     ^^^^^^^^^
   |     Enumerations must contain at least one case
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/OpaqueEscape.scala b/tests/neg/OpaqueEscape.scala
index a6f701fd4e3b..1596003d4244 100644
--- a/tests/neg/OpaqueEscape.scala
+++ b/tests/neg/OpaqueEscape.scala
@@ -7,7 +7,7 @@ def unwrap(i:Wrapped):Int
   def wrap(i:Int):Wrapped
 }
 class Escaper extends EscaperBase{  // error: needs to be abstract
-  override def unwrap(i:Int):Int = i // error overriding method unwrap
+  override def unwrap(i:Int):Int = i // was error overriding method unwrap, now OK
   override def wrap(i:Int):Int = i  // error overriding method wrap
 }
 val e = new Escaper:EscaperBase
diff --git a/tests/neg/SummonFrom.check b/tests/neg/SummonFrom.check
index e8bb4ad521f5..f0a3d4d1dbee 100644
--- a/tests/neg/SummonFrom.check
+++ b/tests/neg/SummonFrom.check
@@ -2,11 +2,11 @@
 4 |  case x => ??? // error
   |       ^
   |       Unexpected pattern for summonFrom. Expected `x: T` or `_`
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E153] Syntax Error: tests/neg/SummonFrom.scala:8:7 -----------------------------------------------------------------
 8 |  case x@String => ??? // error
   |       ^^^^^^^^
   |       Unexpected pattern for summonFrom. Expected `x: T` or `_`
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/abstract-givens.check b/tests/neg/abstract-givens.check
index e51e3bded95f..a74d0097b091 100644
--- a/tests/neg/abstract-givens.check
+++ b/tests/neg/abstract-givens.check
@@ -1,7 +1,7 @@
 -- Error: tests/neg/abstract-givens.scala:11:8 -------------------------------------------------------------------------
 11 |  given s[T](using T): Seq[T] with // error
    |        ^
-   |instance cannot be created, since def iterator: => Iterator[A] in trait IterableOnce in package scala.collection is not defined 
+   |instance cannot be created, since def iterator: Iterator[A] in trait IterableOnce in package scala.collection is not defined 
 -- [E164] Declaration Error: tests/neg/abstract-givens.scala:8:8 -------------------------------------------------------
 8 |  given y(using Int): String = summon[Int].toString * 22 // error
   |        ^
@@ -12,5 +12,5 @@
   |        ^
   |        error overriding given instance z in trait T of type [T](using x$1: T): List[T];
   |          given instance z of type [T](using x$1: T): Seq[T] has incompatible type
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/ambiref.check b/tests/neg/ambiref.check
index d222940e0dbc..95b542c7aae3 100644
--- a/tests/neg/ambiref.check
+++ b/tests/neg/ambiref.check
@@ -4,29 +4,29 @@
   |              Reference to x is ambiguous,
   |              it is both defined in object Test
   |              and inherited subsequently in class D
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E049] Reference Error: tests/neg/ambiref.scala:10:14 ---------------------------------------------------------------
 10 |      println(x)  // error
    |              ^
    |              Reference to x is ambiguous,
    |              it is both defined in object Test
    |              and inherited subsequently in anonymous class test1.C {...}
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E049] Reference Error: tests/neg/ambiref.scala:17:14 ---------------------------------------------------------------
 17 |      println(y)  // error
    |              ^
    |              Reference to y is ambiguous,
    |              it is both defined in method c
    |              and inherited subsequently in anonymous class D {...}
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E049] Reference Error: tests/neg/ambiref.scala:25:16 ---------------------------------------------------------------
 25 |        println(y)  // error
    |                ^
    |                Reference to y is ambiguous,
    |                it is both defined in method c
    |                and inherited subsequently in class E
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/annot-printing.check b/tests/neg/annot-printing.check
new file mode 100644
index 000000000000..c16112fe18b9
--- /dev/null
+++ b/tests/neg/annot-printing.check
@@ -0,0 +1,7 @@
+-- [E007] Type Mismatch Error: tests/neg/annot-printing.scala:5:46 -----------------------------------------------------
+5 |def x: Int @nowarn @main @Foo @Bar("hello") = "abc" // error
+  |                                              ^^^^^
+  |                                              Found:    ("abc" : String)
+  |                                              Required: Int @nowarn() @main @Foo @Bar("hello")
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/annot-printing.scala b/tests/neg/annot-printing.scala
new file mode 100644
index 000000000000..b917422801ac
--- /dev/null
+++ b/tests/neg/annot-printing.scala
@@ -0,0 +1,6 @@
+import scala.annotation.*
+class Foo() extends Annotation
+class Bar(s: String) extends Annotation
+
+def x: Int @nowarn @main @Foo @Bar("hello") = "abc" // error
+
diff --git a/tests/neg/arg-eof.scala b/tests/neg/arg-eof.scala
new file mode 100644
index 000000000000..ba860b5dfae0
--- /dev/null
+++ b/tests/neg/arg-eof.scala
@@ -0,0 +1,3 @@
+object Test:
+  case class Widget(name: String, other: Int = 5)
+  Widget(name = "foo", // error // error
\ No newline at end of file
diff --git a/tests/neg/bad-unapplies.check b/tests/neg/bad-unapplies.check
index a2ee445b7db5..44633ca6950a 100644
--- a/tests/neg/bad-unapplies.check
+++ b/tests/neg/bad-unapplies.check
@@ -5,35 +5,35 @@
    |          (x: B): Option[String]
    |          (x: A): Option[String]
    |         both match arguments (C)
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E127] Syntax Error: tests/neg/bad-unapplies.scala:23:9 -------------------------------------------------------------
 23 |    case B("2") => // error (cannot be used as an extractor)
    |         ^
    |         B cannot be used as an extractor in a pattern because it lacks an unapply or unapplySeq method
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E127] Syntax Error: tests/neg/bad-unapplies.scala:24:9 -------------------------------------------------------------
 24 |    case D("2") => // error (cannot be used as an extractor)
    |         ^
    |         D cannot be used as an extractor in a pattern because it lacks an unapply or unapplySeq method
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E050] Type Error: tests/neg/bad-unapplies.scala:25:9 ---------------------------------------------------------------
 25 |    case E("2") => // error (value unapply in object E does not take parameters)
    |         ^
    |         value unapply in object E does not take parameters
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E107] Syntax Error: tests/neg/bad-unapplies.scala:26:10 ------------------------------------------------------------
 26 |    case F("2") => // error (Wrong number of argument patterns for F; expected: ())
    |         ^^^^^^
    |         Wrong number of argument patterns for F; expected: ()
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E006] Not Found Error: tests/neg/bad-unapplies.scala:27:9 ----------------------------------------------------------
 27 |    case G("2") => // error (Not found: G)
    |         ^
    |         Not found: G
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/cannot-reduce-inline-match.check b/tests/neg/cannot-reduce-inline-match.check
index ceca40a74cbd..10ffaecbd2e8 100644
--- a/tests/neg/cannot-reduce-inline-match.check
+++ b/tests/neg/cannot-reduce-inline-match.check
@@ -4,4 +4,12 @@
   |  cannot reduce inline match with
   |   scrutinee:  "f" : ("f" : String)
   |   patterns :  case _:Int
-  | This location contains code that was inlined from cannot-reduce-inline-match.scala:3
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from cannot-reduce-inline-match.scala:3
+3 |    inline x match {
+  |           ^
+4 |      case _: Int =>
+5 |    }
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/derive-eq.scala b/tests/neg/derive-eq.scala
index fa73cf63a5bf..2a9e35a24a19 100644
--- a/tests/neg/derive-eq.scala
+++ b/tests/neg/derive-eq.scala
@@ -20,10 +20,10 @@ object Test extends App {
   val y: Triple[List[Two], One, Two] = ???
   val z: Triple[One, List[Two], One] = ???
   x == y // OK
+  y == x // OK
   x == x // OK
   y == y // OK
 
-  y == x // error
   x == z // error
   z == y // error
 }
diff --git a/tests/neg/doubleDefinition.check b/tests/neg/doubleDefinition.check
index 7edfcdefcc64..b02e9446cf9b 100644
--- a/tests/neg/doubleDefinition.check
+++ b/tests/neg/doubleDefinition.check
@@ -20,25 +20,25 @@
    |	    ^
    |	    Double definition:
    |	    val foo: Int in class Test4 at line 25 and
-   |	    def foo: => Int in class Test4 at line 26
+   |	    def foo: Int in class Test4 at line 26
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:31:4 ----------------------------------------------------------
 31 |	val foo = 1 // error
    |	    ^
    |	    Double definition:
-   |	    def foo: => Int in class Test4b at line 30 and
+   |	    def foo: Int in class Test4b at line 30 and
    |	    val foo: Int in class Test4b at line 31
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:36:4 ----------------------------------------------------------
 36 |	var foo = 1 // error
    |	    ^
    |	    Double definition:
-   |	    def foo: => Int in class Test4c at line 35 and
+   |	    def foo: Int in class Test4c at line 35 and
    |	    var foo: Int in class Test4c at line 36
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:41:4 ----------------------------------------------------------
 41 |	def foo = 2 // error
    |	    ^
    |	    Double definition:
    |	    var foo: Int in class Test4d at line 40 and
-   |	    def foo: => Int in class Test4d at line 41
+   |	    def foo: Int in class Test4d at line 41
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:55:4 ----------------------------------------------------------
 55 |	def foo(x: List[B]): Function1[B, B] = ??? // error: same jvm signature
    |	    ^
@@ -61,70 +61,70 @@
    |	    ^
    |	    Double definition:
    |	    val foo: Int in class Test8 at line 66 and
-   |	    def foo: => Int in class Test8 at line 67
+   |	    def foo: Int in class Test8 at line 67
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:72:4 ----------------------------------------------------------
 72 |	val foo = 1 // error
    |	    ^
    |	    Double definition:
-   |	    def foo: => Int in class Test8b at line 71 and
+   |	    def foo: Int in class Test8b at line 71 and
    |	    val foo: Int in class Test8b at line 72
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:77:4 ----------------------------------------------------------
 77 |	var foo = 1 // error
    |	    ^
    |	    Double definition:
-   |	    def foo: => Int in class Test8c at line 76 and
+   |	    def foo: Int in class Test8c at line 76 and
    |	    var foo: Int in class Test8c at line 77
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:82:4 ----------------------------------------------------------
 82 |	def foo = 2 // error
    |	    ^
    |	    Double definition:
    |	    var foo: Int in class Test8d at line 81 and
-   |	    def foo: => Int in class Test8d at line 82
+   |	    def foo: Int in class Test8d at line 82
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:88:4 ----------------------------------------------------------
 88 |	def foo: String // error
    |	    ^
    |	    Double definition:
    |	    val foo: Int in class Test9 at line 87 and
-   |	    def foo: => String in class Test9 at line 88
+   |	    def foo: String in class Test9 at line 88
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:92:4 ----------------------------------------------------------
 92 |	def foo: Int // error
    |	    ^
    |	    Double definition:
    |	    val foo: Int in class Test10 at line 91 and
-   |	    def foo: => Int in class Test10 at line 92
+   |	    def foo: Int in class Test10 at line 92
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:96:4 ----------------------------------------------------------
 96 |	def foo: String // error
    |	    ^
    |	    Double definition:
    |	    val foo: Int in class Test11 at line 95 and
-   |	    def foo: => String in class Test11 at line 96
+   |	    def foo: String in class Test11 at line 96
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:100:4 ---------------------------------------------------------
 100 |	def foo: Int // error
     |	    ^
     |	    Double definition:
     |	    val foo: Int in class Test12 at line 99 and
-    |	    def foo: => Int in class Test12 at line 100
+    |	    def foo: Int in class Test12 at line 100
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:104:4 ---------------------------------------------------------
 104 |	def foo: String // error
     |	    ^
     |	    Double definition:
     |	    var foo: Int in class Test13 at line 103 and
-    |	    def foo: => String in class Test13 at line 104
+    |	    def foo: String in class Test13 at line 104
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:108:4 ---------------------------------------------------------
 108 |	def foo: Int // error
     |	    ^
     |	    Double definition:
     |	    var foo: Int in class Test14 at line 107 and
-    |	    def foo: => Int in class Test14 at line 108
+    |	    def foo: Int in class Test14 at line 108
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:112:4 ---------------------------------------------------------
 112 |	def foo: String // error
     |	    ^
     |	    Double definition:
     |	    var foo: Int in class Test15 at line 111 and
-    |	    def foo: => String in class Test15 at line 112
+    |	    def foo: String in class Test15 at line 112
 -- [E120] Naming Error: tests/neg/doubleDefinition.scala:116:4 ---------------------------------------------------------
 116 |	def foo: Int // error
     |	    ^
     |	    Double definition:
     |	    var foo: Int in class Test16 at line 115 and
-    |	    def foo: => Int in class Test16 at line 116
+    |	    def foo: Int in class Test16 at line 116
diff --git a/tests/neg/enumWithType.check b/tests/neg/enumWithType.check
index fcc06d3532a4..76bc966e2955 100644
--- a/tests/neg/enumWithType.check
+++ b/tests/neg/enumWithType.check
@@ -2,5 +2,5 @@
 2 |  case C[U](u: U) // error
   |  ^
   |  explicit extends clause needed because both enum case and enum class have type parameters
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/enumsLabel-singleimpl.scala b/tests/neg/enumsLabel-singleimpl.scala
index 8f72a6cc71f2..a246ac9e5461 100644
--- a/tests/neg/enumsLabel-singleimpl.scala
+++ b/tests/neg/enumsLabel-singleimpl.scala
@@ -1,13 +1,13 @@
 enum Ordinalled {
 
-  case A // error: method ordinal of type => Int needs `override` modifier
+  case A
 
-  def ordinal: Int = -1
+  def ordinal: Int = -1 // error: the ordinal method of enum class Ordinalled can not be defined by the user
 
 }
 
 trait HasOrdinal { def ordinal: Int = 23 }
 
-enum MyEnum extends HasOrdinal {
-  case Foo // error: method ordinal of type => Int needs `override` modifier
+enum MyEnum extends HasOrdinal { // error: enum class MyEnum can not inherit the concrete ordinal method of trait HasOrdinal
+  case Foo
 }
diff --git a/tests/neg/equality1.scala b/tests/neg/equality1.scala
index 77ddb371051a..74bd45b18c12 100644
--- a/tests/neg/equality1.scala
+++ b/tests/neg/equality1.scala
@@ -3,4 +3,133 @@ object equality1 {
   class A
   class B
   new A == new B // error: cannot compare
+
+  case class Foo(n: Int) derives CanEqual
+
+  sealed trait Status derives CanEqual
+  object Status {
+    case class Active(since: Int) extends Status
+    case object Pending extends Status
+    case object Inactive extends Status
+  }
+
+  enum Color derives CanEqual {
+    case Red
+    case Green
+    case Blue
+  }
+
+  val option1a: Option[Int] = Some(1)
+  val option1b: Option[Int] = Some(1)
+  option1a == option1b
+
+  option1a match {
+    case Some(1) =>
+      println("1")
+    case Some(n) =>
+      println("Not 1")
+    case None => // This None case doesn't work without CanEqual.canEqualOption[T]
+      println("None")
+  }
+
+  1 == '1'
+  val option2a: Option[Int] = Some(1)
+  val option2b: Option[Char] = Some('1')
+  option2a == option2b
+
+  val option3a: Option[Foo] = Some(Foo(1))
+  val option3b: Option[Foo] = Some(Foo(1))
+  option3a == option3b
+
+  val option4a: Option[Status] = Some(Status.Active(2020))
+  val option4b: Option[Status] = Some(Status.Pending)
+  val option4c: Option[Status] = Some(Status.Inactive)
+  option4a == option4b
+  option4b == option4c
+
+  val option5a: Option[Color] = Some(Color.Red)
+  val option5b: Option[Color] = Some(Color.Green)
+  val option5c: Option[Color] = Some(Color.Blue)
+  option5a == option5b
+  option5b == option5c
+
+  val optionError1a: Option[Int] = Some(1)
+  val optionError1b: Option[String] = Some("1")
+  optionError1a == optionError1b // error: cannot compare
+
+  val optionError2a: Option[Char] = Some('a')
+  val optionError2b: Option[String] = Some("a")
+  optionError2a == optionError2b // error: cannot compare
+
+  val optionTuple1a: Option[(Int, String)] = Some((1, "OK"))
+  val optionTuple1b: Option[(Int, String)] = Some((1, "OK"))
+  optionTuple1a == optionTuple1b
+
+  'a' == 97
+  val optionTuple2a: Option[(Int, Char)] = Some((1, 'a'))
+  val optionTuple2b: Option[(Int, Int)] = Some((1, 97))
+  optionTuple2a == optionTuple2b
+
+  val optionTupleError1a: Option[(Int, String)] = Some((1, "OK"))
+  val optionTupleError1b: Option[(String, Int)] = Some(("OK", 1))
+  optionTupleError1a == optionTupleError1b // error: cannot compare
+
+  val eitherL1a: Either[String, Int] = Left("Error")
+  val eitherL1b: Either[String, Int] = Left("Error")
+  eitherL1a == eitherL1b
+
+  val eitherR1a: Either[String, Int] = Right(999)
+  val eitherR1b: Either[String, Int] = Right(999)
+  eitherR1a == eitherR1b
+
+  val eitherErrorL1a: Either[String, Int] = Left("Error")
+  val eitherErrorL1b: Either[Char, Int] = Left('E')
+  eitherErrorL1a == eitherErrorL1b // error: cannot compare
+
+  val eitherErrorR1a: Either[String, Int] = Right(999)
+  val eitherErrorR1b: Either[String, String] = Right("999")
+  eitherErrorR1a == eitherErrorR1b // error: cannot compare
+
+
+  val eitherTupleL1a: Either[(String, Long), (Int, Boolean)] = Left(("Error", 123L))
+  val eitherTupleL1b: Either[(String, Long), (Int, Boolean)] = Left(("Error", 123L))
+  eitherTupleL1a == eitherTupleL1b
+
+  val eitherTupleR1a: Either[(String, Long), (Int, Boolean)] = Right((999, true))
+  val eitherTupleR1b: Either[(String, Long), (Int, Boolean)] = Right((999, true))
+  eitherTupleR1a == eitherTupleR1b
+
+  val eitherTupleErrorL1a: Either[(String, Long), (Int, Boolean)] = Left(("Error", 123L))
+  val eitherTupleErrorL1b: Either[(Long, String), (Int, Boolean)] = Left((123L, "Error"))
+  eitherTupleErrorL1a == eitherTupleErrorL1b // error: cannot compare
+
+  val eitherTupleErrorR1a: Either[(String, Long), (Int, Boolean)] = Right((999, true))
+  val eitherTupleErrorR1b: Either[(String, Long), (Boolean, Int)] = Right((true, 999))
+  eitherTupleErrorR1a == eitherTupleErrorR1b // error: cannot compare
+
+  (1, "a") == (1, "a")
+  (1, "a", true) == (1, "a", true)
+  (1, "a", true, 't') == (1, "a", true, 't')
+  (1, "a", true, 't', 10L) == (1, "a", true, 't', 10L)
+
+  (1, "a") == (1, 'a') // error: cannot compare
+  (1, "a") == ("a", 1) // error: cannot compare
+  (1, "a") == (1, "a", true)  // error: cannot compare
+  (1, "a", true, 't', 10L) == (1, "a", 1.5D, 't', 10L) // error: cannot compare
+
+
+  val ns1 = List(1, 2, 3, 4, 5)
+  val ns2 = List(1, 2, 3, 4, 5)
+  ns1 == ns2
+
+  val ss = List("1", "2", "3", "4", "5")
+  ns1 == ss // error: cannot compare
+
+  ns1 match {
+    case n :: ns =>
+      println(s"head: $n, tail: ${ns.mkString("[", ",", "]")}")
+    case Nil =>
+      println("empty")
+  }
+
 }
diff --git a/tests/neg/erased-class.scala b/tests/neg/erased-class.scala
index 29b28d7d5275..96a1c8769bb1 100644
--- a/tests/neg/erased-class.scala
+++ b/tests/neg/erased-class.scala
@@ -1,9 +1,10 @@
 import language.experimental.erasedDefinitions
+import scala.annotation.compileTimeOnly
 erased class AA
 erased class BB extends AA // ok
 
 @main def Test =
-  val f1: Array[AA] = ??? // error
-  def f2(x: Int): Array[AA] = ??? // error
-  def bar: AA = ???  // ok
-  val baz: AA = ??? // ok
+  val f1: Array[AA] = compiletime.erasedValue // error // error
+  def f2(x: Int): Array[AA] = compiletime.erasedValue // error // error
+  def bar: AA = compiletime.erasedValue  // ok
+  val baz: AA = compiletime.erasedValue // ok
diff --git a/tests/neg/experimentalInheritance.scala b/tests/neg/experimentalInheritance.scala
new file mode 100644
index 000000000000..8b6c0b11afa3
--- /dev/null
+++ b/tests/neg/experimentalInheritance.scala
@@ -0,0 +1,44 @@
+import scala.annotation.experimental
+
+@experimental
+class A
+
+@experimental
+trait T
+
+class B extends A // error
+
+@experimental
+class B2 extends A
+
+class C extends T // error
+
+@experimental
+class C2 extends T
+
+@experimental
+class O:
+  class X
+
+  @experimental
+  class Y
+
+  object Z
+
+@experimental
+object O:
+  class A
+
+  @experimental
+  class B
+
+  object C
+
+class OA extends O.A // error
+class OB extends O.B // error
+
+@experimental
+class OA2 extends O.A
+
+@experimental
+class OB2 extends O.B
diff --git a/tests/neg/experimentalInheritance2.scala b/tests/neg/experimentalInheritance2.scala
new file mode 100644
index 000000000000..84668ac5850f
--- /dev/null
+++ b/tests/neg/experimentalInheritance2.scala
@@ -0,0 +1,6 @@
+import scala.annotation.experimental
+
+@experimental class A
+
+class B // // error: extension of experimental class A1 must have @experimental annotation
+  extends A
diff --git a/tests/neg/experimentalOverloads.scala b/tests/neg/experimentalOverloads.scala
new file mode 100644
index 000000000000..7adaf0b78840
--- /dev/null
+++ b/tests/neg/experimentalOverloads.scala
@@ -0,0 +1,11 @@
+import scala.annotation.experimental
+
+trait A:
+  def f: Int
+  def g: Int = 3
+trait B extends A:
+  @experimental
+  def f: Int = 4 // error
+
+  @experimental
+  override def g: Int = 5 // error
diff --git a/tests/neg/exports.check b/tests/neg/exports.check
index 8eeea9f5db8d..577f9e6b47ce 100644
--- a/tests/neg/exports.check
+++ b/tests/neg/exports.check
@@ -11,13 +11,13 @@
 25 |    export printUnit.bitmap         // error: no eligible member
    |                     ^
    |                     non-private given instance bitmap in class Copier refers to private value printUnit
-   |                     in its type signature => Copier.this.printUnit.bitmap$
+   |                     in its type signature => Copier.this.printUnit.bitmap
 -- [E120] Naming Error: tests/neg/exports.scala:23:33 ------------------------------------------------------------------
 23 |    export printUnit.{stat => _, _} // error: double definition
    |                                 ^
    |                                 Double definition:
-   |                                 def status: => List[String] in class Copier at line 28 and
-   |                                 final def status: => List[String] in class Copier at line 23
+   |                                 def status: List[String] in class Copier at line 28 and
+   |                                 final def status: List[String] in class Copier at line 23
    |                                 have the same type after erasure.
    |
    |                                 Consider adding a @targetName annotation to one of the conflicting definitions
@@ -26,8 +26,8 @@
 24 |    export scanUnit._               // error: double definition
    |                    ^
    |                    Double definition:
-   |                    final def status: => List[String] in class Copier at line 23 and
-   |                    final def status: => List[String] in class Copier at line 24
+   |                    final def status: List[String] in class Copier at line 23 and
+   |                    final def status: List[String] in class Copier at line 24
    |                    have the same type after erasure.
    |
    |                    Consider adding a @targetName annotation to one of the conflicting definitions
@@ -36,8 +36,8 @@
 26 |    export printUnit.status         // error: double definition
    |                     ^
    |                     Double definition:
-   |                     final def status: => List[String] in class Copier at line 24 and
-   |                     final def status: => List[String] in class Copier at line 26
+   |                     final def status: List[String] in class Copier at line 24 and
+   |                     final def status: List[String] in class Copier at line 26
    |                     have the same type after erasure.
    |
    |                     Consider adding a @targetName annotation to one of the conflicting definitions
@@ -57,4 +57,4 @@
    |               ^
    |               Double definition:
    |               val bar: Bar in class Baz at line 45 and
-   |               final def bar: => (Baz.this.bar.bar : => (Baz.this.bar.baz.bar : Bar)) in class Baz at line 46
+   |               final def bar: (Baz.this.bar.bar : => (Baz.this.bar.baz.bar : Bar)) in class Baz at line 46
diff --git a/tests/neg/extend-matchable.scala b/tests/neg/extend-matchable.scala
index 18dee7a1fb53..031c12f21d3e 100644
--- a/tests/neg/extend-matchable.scala
+++ b/tests/neg/extend-matchable.scala
@@ -12,9 +12,8 @@ class E1 extends AnyRef, M // OK
 class F1 extends Any, M // error: Any does not have a constructor
 
 class C2 extends M0 // OK inferred base type is AnyRef
-class D2(x: Int) extends AnyVal, M0 // error: illegal trait inheritance
 class E2 extends AnyRef, M0 // OK
-class F2 extends Any, M0 // error: Any does not have a constructor // error: illegal trait inheritance
+class F2 extends Any, M0 // error: Any does not have a constructor
 
 
 
diff --git a/tests/neg/extension-specificity2.scala b/tests/neg/extension-specificity2.scala
new file mode 100644
index 000000000000..0087dbbe7165
--- /dev/null
+++ b/tests/neg/extension-specificity2.scala
@@ -0,0 +1,10 @@
+trait Bla1[A]:
+  extension (x: A) def foo(y: A): Int
+trait Bla2[A]:
+  extension (x: A) def foo(y: A): Int
+
+def test =
+  given bla1[T <: Int]: Bla1[T] = ???
+  given bla2[S <: Int]: Bla2[S] = ???
+
+  1.foo(2) // error: never extension is more specific than the other
diff --git a/tests/neg/f-interpolator-neg.check b/tests/neg/f-interpolator-neg.check
new file mode 100644
index 000000000000..ea8df052589e
--- /dev/null
+++ b/tests/neg/f-interpolator-neg.check
@@ -0,0 +1,200 @@
+-- Error: tests/neg/f-interpolator-neg.scala:4:4 -----------------------------------------------------------------------
+4 |    new StringContext().f() // error
+  |    ^^^^^^^^^^^^^^^^^^^^^
+  |    there are no parts
+-- Error: tests/neg/f-interpolator-neg.scala:5:4 -----------------------------------------------------------------------
+5 |    new StringContext("", " is ", "%2d years old").f(s) // error
+  |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |    too few arguments for interpolated string
+-- Error: tests/neg/f-interpolator-neg.scala:6:4 -----------------------------------------------------------------------
+6 |    new StringContext("", " is ", "%2d years old").f(s, d, d) // error
+  |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |    too many arguments for interpolated string
+-- Error: tests/neg/f-interpolator-neg.scala:7:4 -----------------------------------------------------------------------
+7 |    new StringContext("", "").f() // error
+  |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |    too few arguments for interpolated string
+-- Error: tests/neg/f-interpolator-neg.scala:11:7 ----------------------------------------------------------------------
+11 |    f"$s%b" // error
+   |       ^
+   |       Found: (s : String), Required: Boolean, Null
+-- Error: tests/neg/f-interpolator-neg.scala:12:7 ----------------------------------------------------------------------
+12 |    f"$s%c" // error
+   |       ^
+   |       Found: (s : String), Required: Char, Byte, Short, Int
+-- Error: tests/neg/f-interpolator-neg.scala:13:7 ----------------------------------------------------------------------
+13 |    f"$f%c" // error
+   |       ^
+   |       Found: (f : Double), Required: Char, Byte, Short, Int
+-- Error: tests/neg/f-interpolator-neg.scala:14:7 ----------------------------------------------------------------------
+14 |    f"$s%x" // error
+   |       ^
+   |       Found: (s : String), Required: Int, Long, Byte, Short, BigInt
+-- Error: tests/neg/f-interpolator-neg.scala:15:7 ----------------------------------------------------------------------
+15 |    f"$b%d" // error
+   |       ^
+   |       Found: (b : Boolean), Required: Int, Long, Byte, Short, BigInt
+-- Error: tests/neg/f-interpolator-neg.scala:16:7 ----------------------------------------------------------------------
+16 |    f"$s%d" // error
+   |       ^
+   |       Found: (s : String), Required: Int, Long, Byte, Short, BigInt
+-- Error: tests/neg/f-interpolator-neg.scala:17:7 ----------------------------------------------------------------------
+17 |    f"$f%o" // error
+   |       ^
+   |       Found: (f : Double), Required: Int, Long, Byte, Short, BigInt
+-- Error: tests/neg/f-interpolator-neg.scala:18:7 ----------------------------------------------------------------------
+18 |    f"$s%e" // error
+   |       ^
+   |       Found: (s : String), Required: Double, Float, BigDecimal
+-- Error: tests/neg/f-interpolator-neg.scala:19:7 ----------------------------------------------------------------------
+19 |    f"$b%f" // error
+   |       ^
+   |       Found: (b : Boolean), Required: Double, Float, BigDecimal
+-- Error: tests/neg/f-interpolator-neg.scala:20:9 ----------------------------------------------------------------------
+20 |    f"$s%i" // error
+   |         ^
+   |         illegal conversion character 'i'
+-- Error: tests/neg/f-interpolator-neg.scala:24:9 ----------------------------------------------------------------------
+24 |    f"$s%+ 0,(s" // error
+   |         ^^^^^
+   |         Illegal flag '+'
+-- Error: tests/neg/f-interpolator-neg.scala:25:9 ----------------------------------------------------------------------
+25 |    f"$c%#+ 0,(c" // error
+   |         ^^^^^^
+   |         Only '-' allowed for c conversion
+-- Error: tests/neg/f-interpolator-neg.scala:26:9 ----------------------------------------------------------------------
+26 |    f"$d%#d" // error
+   |         ^
+   |         # not allowed for d conversion
+-- Error: tests/neg/f-interpolator-neg.scala:27:9 ----------------------------------------------------------------------
+27 |    f"$d%,x" // error
+   |         ^
+   |         ',' only allowed for d conversion of integral types
+-- Error: tests/neg/f-interpolator-neg.scala:28:9 ----------------------------------------------------------------------
+28 |    f"$d%+ (x" // error
+   |         ^^^
+   |         only use '+' for BigInt conversions to o, x, X
+-- Error: tests/neg/f-interpolator-neg.scala:29:9 ----------------------------------------------------------------------
+29 |    f"$f%,(a" // error
+   |         ^^
+   |         ',' not allowed for a, A
+-- Error: tests/neg/f-interpolator-neg.scala:30:9 ----------------------------------------------------------------------
+30 |    f"$t%#+ 0,(tT" // error
+   |         ^^^^^^
+   |         Only '-' allowed for date/time conversions
+-- Error: tests/neg/f-interpolator-neg.scala:31:7 ----------------------------------------------------------------------
+31 |    f"%-#+ 0,(n" // error
+   |       ^^^^^^^
+   |       flags not allowed
+-- Error: tests/neg/f-interpolator-neg.scala:32:7 ----------------------------------------------------------------------
+32 |    f"%#+ 0,(%" // error
+   |       ^^^^^^
+   |       Illegal flag '#'
+-- Error: tests/neg/f-interpolator-neg.scala:36:9 ----------------------------------------------------------------------
+36 |    f"$c%.2c" // error
+   |         ^^
+   |         precision not allowed
+-- Error: tests/neg/f-interpolator-neg.scala:37:9 ----------------------------------------------------------------------
+37 |    f"$d%.2d" // error
+   |         ^^
+   |         precision not allowed
+-- Error: tests/neg/f-interpolator-neg.scala:38:7 ----------------------------------------------------------------------
+38 |    f"%.2%" // error
+   |       ^^
+   |       precision not allowed
+-- Error: tests/neg/f-interpolator-neg.scala:39:7 ----------------------------------------------------------------------
+39 |    f"%.2n" // error
+   |       ^^
+   |       precision not allowed
+-- Error: tests/neg/f-interpolator-neg.scala:40:9 ----------------------------------------------------------------------
+40 |    f"$f%.2a" // error
+   |         ^^
+   |         precision not allowed
+-- Error: tests/neg/f-interpolator-neg.scala:41:9 ----------------------------------------------------------------------
+41 |    f"$t%.2tT" // error
+   |         ^^
+   |         precision not allowed
+-- Error: tests/neg/f-interpolator-neg.scala:45:7 ----------------------------------------------------------------------
+45 |    f"%<s" // error
+   |       ^
+   |       No last arg
+-- Error: tests/neg/f-interpolator-neg.scala:46:7 ----------------------------------------------------------------------
+46 |    f"%<c" // error
+   |       ^
+   |       No last arg
+-- Error: tests/neg/f-interpolator-neg.scala:47:7 ----------------------------------------------------------------------
+47 |    f"%<tT" // error
+   |       ^
+   |       No last arg
+-- Error: tests/neg/f-interpolator-neg.scala:48:21 ---------------------------------------------------------------------
+48 |    f"${8}%d ${9}%d %3$$d" // error
+   |                     ^
+   |                     Argument index out of range
+-- Error: tests/neg/f-interpolator-neg.scala:49:20 ---------------------------------------------------------------------
+49 |    f"${8}%d ${9}%d%0$$d" // error
+   |                    ^
+   |                    Argument index out of range
+-- Warning: tests/neg/f-interpolator-neg.scala:54:17 -------------------------------------------------------------------
+54 |    f"$s%s $s%s %1$$<s"
+   |                 ^
+   |                 Argument index ignored if '<' flag is present
+-- Error: tests/neg/f-interpolator-neg.scala:59:7 ----------------------------------------------------------------------
+59 |    f"$s%#s" // error
+   |       ^
+   |       Found: (s : String), Required: java.util.Formattable
+-- Error: tests/neg/f-interpolator-neg.scala:63:10 ---------------------------------------------------------------------
+63 |    f"$t%tG" // error
+   |          ^
+   |          'G' doesn't seem to be a date or time conversion
+-- Error: tests/neg/f-interpolator-neg.scala:64:9 ----------------------------------------------------------------------
+64 |    f"$t%t" // error
+   |         ^
+   |         Date/time conversion must have two characters
+-- Error: tests/neg/f-interpolator-neg.scala:65:8 ----------------------------------------------------------------------
+65 |    f"$s%10.5" // error
+   |        ^^^^^
+   |        Missing conversion operator in '%10.5'; use %% for literal %, %n for newline
+-- Error: tests/neg/f-interpolator-neg.scala:69:29 ---------------------------------------------------------------------
+69 |    f"${d}random-leading-junk%d" // error
+   |                             ^^
+   |                             conversions must follow a splice; use %% for literal %, %n for newline
+-- Error: tests/neg/f-interpolator-neg.scala:71:7 ----------------------------------------------------------------------
+71 |    f"%1$$d" // error
+   |       ^
+   |       Argument index out of range
+-- Error: tests/neg/f-interpolator-neg.scala:72:23 ---------------------------------------------------------------------
+72 |    f"blablablabla %% %.2d" // error
+   |                       ^^
+   |                       precision not allowed
+-- Error: tests/neg/f-interpolator-neg.scala:73:19 ---------------------------------------------------------------------
+73 |    f"blablablabla %.2b %%" // error
+   |                   ^^^^
+   |                   conversions must follow a splice; use %% for literal %, %n for newline
+-- Error: tests/neg/f-interpolator-neg.scala:75:17 ---------------------------------------------------------------------
+75 |    f"ana${3}%.2f%2${true}%bb" // error
+   |                 ^^
+   |                 Missing conversion operator in '%2'; use %% for literal %, %n for newline
+-- Error: tests/neg/f-interpolator-neg.scala:78:7 ----------------------------------------------------------------------
+78 |    f"b%c.%2ii%iin" // error // error // error
+   |       ^^
+   |       conversions must follow a splice; use %% for literal %, %n for newline
+-- Error: tests/neg/f-interpolator-neg.scala:78:12 ---------------------------------------------------------------------
+78 |    f"b%c.%2ii%iin" // error // error // error
+   |            ^
+   |            illegal conversion character 'i'
+-- Error: tests/neg/f-interpolator-neg.scala:78:15 ---------------------------------------------------------------------
+78 |    f"b%c.%2ii%iin" // error // error // error
+   |               ^
+   |               illegal conversion character 'i'
+-- Error: tests/neg/f-interpolator-neg.scala:79:10 ---------------------------------------------------------------------
+79 |    f"b}22%2.c<{%{"  // error // error
+   |          ^^
+   |          Missing conversion operator in '%2'; use %% for literal %, %n for newline
+-- Error: tests/neg/f-interpolator-neg.scala:79:16 ---------------------------------------------------------------------
+79 |    f"b}22%2.c<{%{"  // error // error
+   |                ^
+   |                Missing conversion operator in '%'; use %% for literal %, %n for newline
+-- Error: tests/neg/f-interpolator-neg.scala:80:19 ---------------------------------------------------------------------
+80 |    f"%%bci.2${'i'}%..2c2" // error
+   |                   ^
+   |                   Missing conversion operator in '%'; use %% for literal %, %n for newline
diff --git a/tests/neg/f-interpolator-neg.scala b/tests/neg/f-interpolator-neg.scala
index 176d1fc5edf2..d5c49d5a8111 100644
--- a/tests/neg/f-interpolator-neg.scala
+++ b/tests/neg/f-interpolator-neg.scala
@@ -75,8 +75,8 @@ object Test {
     f"ana${3}%.2f%2${true}%bb" // error
     f"ac{2c{2{c.ca "
 
-    f"b%c.%2ii%iin" // error
-    f"b}22%2.c<{%{"  // error
+    f"b%c.%2ii%iin" // error // error // error
+    f"b}22%2.c<{%{"  // error // error
     f"%%bci.2${'i'}%..2c2" // error
   }
 
diff --git a/tests/neg/f-interpolator-tests.check b/tests/neg/f-interpolator-tests.check
new file mode 100644
index 000000000000..72b63369ce24
--- /dev/null
+++ b/tests/neg/f-interpolator-tests.check
@@ -0,0 +1,8 @@
+-- Error: tests/neg/f-interpolator-tests.scala:4:19 --------------------------------------------------------------------
+4 |  def `um uh` = f"$s%d"  // error
+  |                   ^
+  |                   Found: (T.this.s : String), Required: Int, Long, Byte, Short, BigInt
+-- Error: tests/neg/f-interpolator-tests.scala:10:10 -------------------------------------------------------------------
+10 |    f"x % y = ${x % y}%d" // error: illegal conversion character 'y'
+   |          ^
+   |          illegal conversion character 'y'
diff --git a/tests/neg/f-interpolator-tests.scala b/tests/neg/f-interpolator-tests.scala
new file mode 100644
index 000000000000..ca4b4ad11e39
--- /dev/null
+++ b/tests/neg/f-interpolator-tests.scala
@@ -0,0 +1,11 @@
+
+trait T {
+  val s = "um"
+  def `um uh` = f"$s%d"  // error
+
+  // "% y" looks like a format conversion because ' ' is a legal flag
+  def i11256 =
+    val x = 42
+    val y = 27
+    f"x % y = ${x % y}%d" // error: illegal conversion character 'y'
+}
diff --git a/tests/neg/fEscapes.check b/tests/neg/fEscapes.check
new file mode 100644
index 000000000000..29fe1412e075
--- /dev/null
+++ b/tests/neg/fEscapes.check
@@ -0,0 +1,4 @@
+-- Error: tests/neg/fEscapes.scala:5:18 --------------------------------------------------------------------------------
+5 |  val fEscape = f"\u$octal%04x" // error
+  |                  ^^
+  |                  invalid unicode escape at index 1 of \u
diff --git a/tests/neg/fEscapes.scala b/tests/neg/fEscapes.scala
new file mode 100644
index 000000000000..c4a9a6ffb200
--- /dev/null
+++ b/tests/neg/fEscapes.scala
@@ -0,0 +1,5 @@
+
+// f-interpolator wasn't doing any escape processing
+class C:
+  val octal = 8
+  val fEscape = f"\u$octal%04x" // error
diff --git a/tests/neg/forwardCompat-export/Test_r3.0.scala b/tests/neg/forwardCompat-export/Test_r3.0.scala
new file mode 100644
index 000000000000..92ba88d36d85
--- /dev/null
+++ b/tests/neg/forwardCompat-export/Test_r3.0.scala
@@ -0,0 +1,5 @@
+object A:
+  export CanEqual.canEqualOption // error
+
+object B:
+  export CanEqual.given // error
diff --git a/tests/neg/forwardCompat-illegalReferences/Test_r3.0.scala b/tests/neg/forwardCompat-illegalReferences/Test_r3.0.scala
new file mode 100644
index 000000000000..8dfeeeff3d29
--- /dev/null
+++ b/tests/neg/forwardCompat-illegalReferences/Test_r3.0.scala
@@ -0,0 +1,31 @@
+import scala.quoted.*
+
+def useQuotes(using Quotes) =
+  import quotes.reflect.*
+
+  def useFieldMember(s: Symbol) = s.fieldMember("abc") // error
+  def getWildcard: Wildcard = ??? // error
+  def acceptWildcard(w: Wildcard) = "" // error
+  def boundByWildcard[T <: Wildcard]: T = ??? // error
+
+  val wildcard = getWildcard // error
+
+  type MyWildcard = Wildcard // error
+
+  type Foo[W <: Wildcard] = Any // error
+
+  type Bar[T] = T match { case Wildcard => Any } // error
+
+  type Baz[T] = T match { case String => Wildcard } // error
+
+  trait Wrapped[T]
+  trait WrappedWildcard extends Wrapped[Wildcard] // error
+  trait WrappedLikeWildcard[W <: Wildcard] extends Wrapped[W] // error
+
+  class Box(w: Wildcard) // error
+
+  // The inferred result type also gets reported even though it's not written explicitly
+  def castToWildcard(x: Any) = x.asInstanceOf[Wildcard] // error // error
+
+  // 2 errors reported because at the stage of compilation when this is checked (already after some code transformations) the illegal type is referred to more than once
+  val selectable: Any = new Selectable.WithoutPreciseParameterTypes {} // error // error
diff --git a/tests/neg/forwardCompat-invalidSince.scala b/tests/neg/forwardCompat-invalidSince.scala
new file mode 100644
index 000000000000..dfd128e84061
--- /dev/null
+++ b/tests/neg/forwardCompat-invalidSince.scala
@@ -0,0 +1,21 @@
+package scala.test
+
+import annotation.since
+
+@since("") // error
+val x = 1
+
+@since("1.2.3.4") // error
+val y = "abc"
+
+@since("xyz") // error
+class Foo
+
+@since("-3") // error
+trait Bar
+
+@since("3.0.2") // error
+type Baz = Int
+
+@since("3.0 ") // error
+given String = ""
\ No newline at end of file
diff --git a/tests/neg/forwardCompat-leakingImplicit/Test_r3.0.scala b/tests/neg/forwardCompat-leakingImplicit/Test_r3.0.scala
new file mode 100644
index 000000000000..c9f0835bc053
--- /dev/null
+++ b/tests/neg/forwardCompat-leakingImplicit/Test_r3.0.scala
@@ -0,0 +1 @@
+val canEq = summon[CanEqual[EmptyTuple, EmptyTuple]] // error
diff --git a/tests/neg/forwardCompat-nestedSumMirror/Lib_1_r3.0.scala b/tests/neg/forwardCompat-nestedSumMirror/Lib_1_r3.0.scala
new file mode 100644
index 000000000000..aaac31229228
--- /dev/null
+++ b/tests/neg/forwardCompat-nestedSumMirror/Lib_1_r3.0.scala
@@ -0,0 +1,8 @@
+// Adapted from i11050
+
+sealed trait TreeValue
+
+sealed trait SubLevel extends TreeValue
+
+case class Leaf1(value: String) extends TreeValue
+case class Leaf2(value: Int)    extends SubLevel
diff --git a/tests/neg/forwardCompat-nestedSumMirror/Test_2_c3.0.2.scala b/tests/neg/forwardCompat-nestedSumMirror/Test_2_c3.0.2.scala
new file mode 100644
index 000000000000..9fa2e4003002
--- /dev/null
+++ b/tests/neg/forwardCompat-nestedSumMirror/Test_2_c3.0.2.scala
@@ -0,0 +1,5 @@
+import scala.deriving._
+
+object Test:
+  def main(args: Array[String]): Unit =
+    println(summon[Mirror.Of[TreeValue]]) // error
diff --git a/tests/neg/forwardCompat-rejectNewerTasty/Bar_2_r3.0.scala b/tests/neg/forwardCompat-rejectNewerTasty/Bar_2_r3.0.scala
new file mode 100644
index 000000000000..d78004d6dedf
--- /dev/null
+++ b/tests/neg/forwardCompat-rejectNewerTasty/Bar_2_r3.0.scala
@@ -0,0 +1 @@
+def bar = foo // nopos-error
diff --git a/tests/neg/forwardCompat-rejectNewerTasty/Foo_1_r3.1.scala b/tests/neg/forwardCompat-rejectNewerTasty/Foo_1_r3.1.scala
new file mode 100644
index 000000000000..fe04f0623a1c
--- /dev/null
+++ b/tests/neg/forwardCompat-rejectNewerTasty/Foo_1_r3.1.scala
@@ -0,0 +1 @@
+def foo = 1
diff --git a/tests/neg/gadt-approximation-interaction.scala b/tests/neg/gadt-approximation-interaction.scala
index 683d0668f4a2..5f010e4b784d 100644
--- a/tests/neg/gadt-approximation-interaction.scala
+++ b/tests/neg/gadt-approximation-interaction.scala
@@ -47,7 +47,7 @@ object ImplicitConversion {
 
   def foo[T](t: T, ev: T SUB Int) =
     ev match { case SUB.Refl() =>
-      t ** 2 // error // implementation limitation
+      t ** 2
     }
 
   def bar[T](t: T, ev: T SUB Int) =
@@ -67,7 +67,7 @@ object GivenConversion {
 
   def foo[T](t: T, ev: T SUB Int) =
     ev match { case SUB.Refl() =>
-      t ** 2 // error (implementation limitation)
+      t ** 2
     }
 
   def bar[T](t: T, ev: T SUB Int) =
diff --git a/tests/neg/gadt-contradictory-pattern.scala b/tests/neg/gadt-contradictory-pattern.scala
new file mode 100644
index 000000000000..561c0c23d518
--- /dev/null
+++ b/tests/neg/gadt-contradictory-pattern.scala
@@ -0,0 +1,13 @@
+object Test {
+  sealed abstract class Foo[T]
+  case object Bar1 extends Foo[Int]
+  case object Bar2 extends Foo[String]
+  case object Bar3 extends Foo[AnyRef]
+
+  def fail4[T <: AnyRef](xx: (Foo[T], Foo[T])) = xx match {
+    case (Bar1, Bar1) => () // error // error
+    case (Bar2, Bar3) => ()
+    case (Bar3, _) => ()
+  }
+
+}
diff --git a/tests/neg/gadt-injectivity-alt-2.scala b/tests/neg/gadt-injectivity-alt-2.scala
new file mode 100644
index 000000000000..a48555d557f8
--- /dev/null
+++ b/tests/neg/gadt-injectivity-alt-2.scala
@@ -0,0 +1,35 @@
+/** A modified version of gadt-injectivity-alt.scala. */
+object test {
+
+  enum SUB[-F, +G] {
+    case Refl[S]() extends SUB[S, S]
+  }
+
+  enum KSUB[-F[_], +G[_]] {
+    case Refl[S[_]]() extends KSUB[S, S]
+  }
+
+  def foo[F[_], G[_], A](
+    keq: (F KSUB Option, Option KSUB F),
+    ksub: Option KSUB G,
+    sub: F[Option[A]] SUB G[Option[Int]],
+    a: A
+  ) =
+    keq._1 match { case KSUB.Refl() =>
+      keq._2 match { case KSUB.Refl() =>
+        ksub match { case KSUB.Refl() =>
+          sub match { case SUB.Refl() =>
+            //        F        =  Option
+            // &      G       >: Option
+            // & F[Option[A]] <: G[Option[Int]]
+            // =X=>
+            // A <: Int
+            //
+            // counterexample: G = [T] => Any
+            val i: Int = a // error
+            ()
+          }
+        }
+      }
+    }
+}
diff --git a/tests/neg/genericTupleMembers.scala b/tests/neg/genericTupleMembers.scala
new file mode 100644
index 000000000000..13c70fa73b6f
--- /dev/null
+++ b/tests/neg/genericTupleMembers.scala
@@ -0,0 +1,38 @@
+def Test: Unit =
+  val tup1 = 1 *: EmptyTuple
+  val tup2 = 1 *: 2 *: EmptyTuple
+  val tup3 = 1 *: 2 *: 3 *: EmptyTuple
+  val tup4 = 1 *: 2 *: 3 *: 4 *: EmptyTuple
+  val tup5 = 1 *: 2 *: 3 *: 4 *: 5 *: EmptyTuple
+  val tup22 = 1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: EmptyTuple
+  val tup23 = 1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: 23 *: EmptyTuple
+
+  tup1._2 // error
+
+  tup2._3 // error
+
+  tup22._23 // error
+
+  tup23._1 // error
+  tup23._2 // error
+  tup23._3 // error
+  tup23._4 // error
+  tup23._5 // error
+  tup23._6 // error
+  tup23._7 // error
+  tup23._8 // error
+  tup23._9 // error
+  tup23._10 // error
+  tup23._11 // error
+  tup23._12 // error
+  tup23._13 // error
+  tup23._14 // error
+  tup23._15 // error
+  tup23._16 // error
+  tup23._17 // error
+  tup23._18 // error
+  tup23._19 // error
+  tup23._20 // error
+  tup23._21 // error
+  tup23._22 // error
+  tup23._23 // error
diff --git a/tests/neg/given-pattern.scala b/tests/neg/given-pattern.scala
index 72f5213c9f06..68e322a2201c 100644
--- a/tests/neg/given-pattern.scala
+++ b/tests/neg/given-pattern.scala
@@ -4,11 +4,11 @@ class Test {
   import scala.collection.immutable.{TreeSet, HashSet}
 
   def f2[T](x: Ordering[T]) = {
-    val (given Ordering[T]) = x
-    new TreeSet[T]    // error: no implicit ordering defined for T
+    val (given Ordering[T]) = x // error: given Ordering[T] not allowed here
+    new TreeSet[T] // error: no implicit ordering defined for T
   }
   def f3[T](x: Ordering[T]) = {
-    val given Ordering[T] = x
-    new TreeSet[T]    // error: no implicit ordering defined for T
+    val given Ordering[T] = x // error: given Ordering[T] not allowed here
+    new TreeSet[T] // error: no implicit ordering defined for T
   }
-}
\ No newline at end of file
+}
diff --git a/tests/neg/hidden.check b/tests/neg/hidden.check
new file mode 100644
index 000000000000..759871959340
--- /dev/null
+++ b/tests/neg/hidden.check
@@ -0,0 +1,6 @@
+-- Error: tests/neg/hidden.scala:6:13 ----------------------------------------------------------------------------------
+6 |  summon[Int] // error
+  |             ^
+  |    no implicit argument of type Int was found for parameter x of method summon in object Predef
+  |
+  |    Note: given instance given_Int in object A was not considered because it was not imported with `import given`.
diff --git a/tests/neg/higher-order-quoted-expressions.scala b/tests/neg/higher-order-quoted-expressions.scala
new file mode 100644
index 000000000000..a5d137ff8fc5
--- /dev/null
+++ b/tests/neg/higher-order-quoted-expressions.scala
@@ -0,0 +1,44 @@
+// Draft of higher order expressions
+// ---------------------------------
+// A higher order expression is a an expression that may contain unbound variables.
+// Unbound variables are listed as arguments of the type lambda of the expression.
+// Splicing can only be done on Expr[_ <: Any].
+// `apply methods on higher order expression provide a way to replace the unbound variables.
+
+// This can be used for HOAS quoted patterns to not return a lambda (see HOAS patterns section in https://infoscience.epfl.ch/record/288718?ln=en).
+// The use would be the same as each higher order expression would have an apply method.
+// But as it would be an expression, the expression would showable.
+// The expression could also be directly transformed into a Term of the reflection API.
+
+// Question: How to extend this to allow unbound type (Type) in the expression?
+
+class Expr[+T <: AnyKind]
+object Expr:
+  extension [T, R](hoe: Expr[[_ >: T <: T] =>> R]) def apply(x1: Expr[T]): Expr[R] = ???
+  extension [T1, T2, R](hoe: Expr[[_ >: T1 <: T1, _ >: T2 <: T2] =>> R]) def apply(x1: Expr[T1], x2: Expr[T2]): Expr[R] = ???
+  // Are lower bounds in lambda parameters necessary?
+  // How could this be generalized to n arguments?
+
+
+def `'`[T](e: T): Expr[T] = ???
+def `$`[T](e: Expr[T]): T = ???
+
+def f(): Unit =
+  val e: Expr[Int] = ???
+  val hoe1: Expr[[T >: Int <: Int] =>> Int] = ??? // assumed to come from HOAS pattern with one unbound variable of type Int
+  val hoe2: Expr[[T1 >: Int <: Int, T2 >: Int <: Int] =>> Int] = ??? // assumed to come from HOAS pattern with 2 unbound variables of type Int
+  val e2: Expr[Int] = hoe1(e)
+  val e3: Expr[Int] = hoe2(e, e)
+
+  {
+    `$`{e}
+    `$`{e2}
+    `$`{e3}
+    `$`{hoe1(e)}
+    `$`{hoe2(e, e)}
+    `$`{hoe1} // error: Found: Expr[[T >: Int <: Int] =>> Int]), Required: Expr[Any] // may contain references to 1 unbound variable
+    `$`{hoe2} // error // may contain references to 2 unbound variables
+  }
+  `'`{1}
+  `'`{`$`{e}}
+  `'`{??? : ([T >: Int <: Int] =>> Int)} // error: Missing type parameter for [T >: Int <: Int] =>> Int // not a valid quote literal expression
diff --git a/tests/pos/i10082.scala b/tests/neg/i10082.scala
similarity index 100%
rename from tests/pos/i10082.scala
rename to tests/neg/i10082.scala
diff --git a/tests/neg/i10268.check b/tests/neg/i10268.check
index e08571f7463d..abe39586b373 100644
--- a/tests/neg/i10268.check
+++ b/tests/neg/i10268.check
@@ -2,5 +2,5 @@
 2 |  def test[T] = ?//test // error
   |                ^
   |                Not found: ?
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i10546.scala b/tests/neg/i10546.scala
index 3a5f42ec1fdf..e40f7117a3d4 100644
--- a/tests/neg/i10546.scala
+++ b/tests/neg/i10546.scala
@@ -1,5 +1,5 @@
 object test:
   def times(num : Int)(block : => Unit) : Unit = ()
-    times(10): println("ah") // error: end of statement expected but '(' found // error
+    times(10): println("ah") // error: end of statement expected but '(' found
 
   def foo: Set(Int) = Set(1)
\ No newline at end of file
diff --git a/tests/neg/i10552a.scala b/tests/neg/i10552a.scala
new file mode 100644
index 000000000000..beae787609ad
--- /dev/null
+++ b/tests/neg/i10552a.scala
@@ -0,0 +1,4 @@
+transparent inline def foo[T]: Int = 10
+
+def test =
+  foo[List] // error
diff --git a/tests/neg/i10552b.check b/tests/neg/i10552b.check
new file mode 100644
index 000000000000..abaf55d2a947
--- /dev/null
+++ b/tests/neg/i10552b.check
@@ -0,0 +1,24 @@
+-- Error: tests/neg/i10552b.scala:10:17 --------------------------------------------------------------------------------
+10 |    println(foo1["hi"]) // error
+   |                 ^^^^
+   |                 ("hi" : String) does not conform to bound <: Int
+-- Error: tests/neg/i10552b.scala:11:17 --------------------------------------------------------------------------------
+11 |    println(foo1[String]) // error
+   |                 ^^^^^^
+   |                 String does not conform to bound <: Int
+-- Error: tests/neg/i10552b.scala:12:17 --------------------------------------------------------------------------------
+12 |    println(foo1[Any]) // error
+   |                 ^^^
+   |                 Any does not conform to bound <: Int
+-- Error: tests/neg/i10552b.scala:13:17 --------------------------------------------------------------------------------
+13 |    println(foo1[AnyKind]) // error
+   |                 ^^^^^^^
+   |                 AnyKind does not conform to bound <: Int
+-- Error: tests/neg/i10552b.scala:15:17 --------------------------------------------------------------------------------
+15 |    println(foo2["hi"]) // error
+   |                 ^^^^
+   |                 ("hi" : String) does not conform to bound >: Int <: Int
+-- Error: tests/neg/i10552b.scala:17:17 --------------------------------------------------------------------------------
+17 |    println(foo3[X]) // error
+   |                 ^
+   |                 Foo.this.X does not conform to bound <: Any. Note that this type is higher-kinded.
diff --git a/tests/neg/i10552b.scala b/tests/neg/i10552b.scala
new file mode 100644
index 000000000000..58191c24645d
--- /dev/null
+++ b/tests/neg/i10552b.scala
@@ -0,0 +1,17 @@
+class Foo:
+  transparent inline def foo1[A <: Int]: Int = valueOf[A]
+  transparent inline def foo2[A >: Int <: Int]: Int = valueOf[A]
+  transparent inline def foo3[A]: Int = ???
+
+  type X >: AnyKind <: AnyKind
+
+  def run =
+    println(foo1[Int])
+    println(foo1["hi"]) // error
+    println(foo1[String]) // error
+    println(foo1[Any]) // error
+    println(foo1[AnyKind]) // error
+
+    println(foo2["hi"]) // error
+
+    println(foo3[X]) // error
diff --git a/tests/neg/i10666.check b/tests/neg/i10666.check
index 65ac39e451af..a70aa9815dc5 100644
--- a/tests/neg/i10666.check
+++ b/tests/neg/i10666.check
@@ -1,8 +1,8 @@
 -- Error: tests/neg/i10666.scala:8:6 -----------------------------------------------------------------------------------
 8 |class Bar extends Foo { // error
   |      ^
-  |      class Bar needs to be abstract, since def foo: [T <: B](tx: T): Unit in trait Foo is not defined 
+  |      class Bar needs to be abstract, since def foo[T <: B](tx: T): Unit in trait Foo is not defined 
   |      (Note that
-  |       parameter T in def foo: [T <: B](tx: T): Unit in trait Foo does not match
-  |       parameter T in def foo: [T <: A](tx: T): Unit in class Bar
+  |       parameter T in def foo[T <: B](tx: T): Unit in trait Foo does not match
+  |       parameter T in def foo[T <: A](tx: T): Unit in class Bar
   |       class B is a subclass of class A, but method parameter types must match exactly.)
diff --git a/tests/neg/i10757.check b/tests/neg/i10757.check
new file mode 100644
index 000000000000..3a46c4e6cc53
--- /dev/null
+++ b/tests/neg/i10757.check
@@ -0,0 +1,6 @@
+-- [E107] Syntax Error: tests/neg/i10757.scala:4:10 --------------------------------------------------------------------
+4 |  case Var(name, _) => name: String // error
+  |       ^^^^^^^^^^^^
+  |       Wrong number of argument patterns for Var; expected: (String)
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i10757.scala b/tests/neg/i10757.scala
new file mode 100644
index 000000000000..d75e79d061fb
--- /dev/null
+++ b/tests/neg/i10757.scala
@@ -0,0 +1,4 @@
+case class Var(name: String)
+
+@main def f = Var("a") match
+  case Var(name, _) => name: String // error
diff --git a/tests/neg/i11103.scala b/tests/neg/i11103.scala
new file mode 100644
index 000000000000..6892f9ad30b2
--- /dev/null
+++ b/tests/neg/i11103.scala
@@ -0,0 +1,16 @@
+@main def test: Unit = {
+  class Foo
+  class Bar
+
+  trait UpBnd[+A]
+  trait P extends UpBnd[Foo]
+
+  def pmatch[A, T <: UpBnd[A]](s: T): A = s match {
+    case p: P =>
+      new Foo // error
+  }
+
+  class UpBndAndB extends UpBnd[Bar] with P
+  // ClassCastException: Foo cannot be cast to Bar
+  val x = pmatch(new UpBndAndB)
+}
diff --git a/tests/neg/i11208.scala b/tests/neg/i11208.scala
new file mode 100644
index 000000000000..c00e16b96993
--- /dev/null
+++ b/tests/neg/i11208.scala
@@ -0,0 +1,8 @@
+import scala.reflect.ClassTag
+
+@main def run = println(Foo)
+
+abstract class Bar[T](implicit val thisClassTag: ClassTag[T])
+
+class Foo
+object Foo extends Bar[Foo] // error
\ No newline at end of file
diff --git a/tests/neg/i11208a.scala b/tests/neg/i11208a.scala
new file mode 100644
index 000000000000..8b2f0917038c
--- /dev/null
+++ b/tests/neg/i11208a.scala
@@ -0,0 +1,6 @@
+class Foo(implicit val foo: Foo)
+
+object Test extends App {
+  implicit object Bar extends Foo  // error
+  Bar.foo
+}
\ No newline at end of file
diff --git a/tests/neg/i11225.check b/tests/neg/i11225.check
index 60805a27b22d..c0f74bc04a14 100644
--- a/tests/neg/i11225.check
+++ b/tests/neg/i11225.check
@@ -42,4 +42,10 @@
 30 |  var x7: Int = uni  // error
    |                ^^^
    |                `uninitialized` can only be used as the right hand side of a mutable field definition
-   | This location contains code that was inlined from i11225.scala:25
+   |--------------------------------------------------------------------------------------------------------------------
+   |Inline stack trace
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i11225.scala:25
+25 |  transparent inline def uni = uninitialized
+   |                               ^^^^^^^^^^^^^
+    --------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/i11437.check b/tests/neg/i11437.check
index f327d6a6a8d2..c8d7a2535964 100644
--- a/tests/neg/i11437.check
+++ b/tests/neg/i11437.check
@@ -2,5 +2,5 @@
 1 |transparent inline def foo = error // error
   |                             ^^^^^
   |                             Not found: error
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i11544.check b/tests/neg/i11544.check
index b4dba8a072c4..15469f0c37a5 100644
--- a/tests/neg/i11544.check
+++ b/tests/neg/i11544.check
@@ -7,5 +7,5 @@
   |          both match arguments ((23 : Int))
   |
   |          Note: Overloaded definitions introduced by refinements cannot be resolved
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i11561.check b/tests/neg/i11561.check
index b1792511b0d0..96bf1ec6accf 100644
--- a/tests/neg/i11561.check
+++ b/tests/neg/i11561.check
@@ -9,5 +9,5 @@
 3 |  val updateText2 = copy(text = (_: String)) // error
   |                         ^^^^^^^^^^^^^^^^^^
   |                         Reassignment to val text
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i11694.scala b/tests/neg/i11694.scala
new file mode 100644
index 000000000000..67138fd5a7eb
--- /dev/null
+++ b/tests/neg/i11694.scala
@@ -0,0 +1,26 @@
+def test1 = {
+  def f11: (Int => Int) | Unit = x => x + 1
+  def f12: Null | (Int => Int) = x => x + 1
+
+  def f21: (Int => Int) | Null = x => x + 1
+  def f22: Null | (Int => Int) = x => x + 1
+
+  def f31: (Int => Int) | (Int => Int) = x => x + 1
+  def f32: (Int => Int) | (Int => Int) | Unit = x => x + 1
+
+  def f41: (Int => Int) & (Int => Int) = x => x + 1
+  def f42: (Int => Int) & (Int => Int) & Any = x => x + 1
+}
+
+def test2 = {
+  def f1: (Int => String) | (Int => Int) | Null = x => x + 1 // error
+  def f2: (Int => String) | Function[String, Int] | Null = x => "" + x // error
+  def f3: Function[Int, Int] | Function[String, Int] | Null = x => x + 1 // error
+  def f4: (Int => Int) & (Int => Int) & Unit = x => x + 1 // error
+}
+
+def test3 = {
+  import java.util.function.Function
+  val f1: Function[String, Int] | Unit = x => x.length
+  val f2: Function[String, Int] | Null = x => x.length
+}
diff --git a/tests/neg/i11828.check b/tests/neg/i11828.check
new file mode 100644
index 000000000000..80824e9b1334
--- /dev/null
+++ b/tests/neg/i11828.check
@@ -0,0 +1,8 @@
+-- Error: tests/neg/i12828.scala:7:7 -----------------------------------------------------------------------------------
+7 |object Baz extends Bar[Int] // error overriding foo: incompatible type
+  |       ^
+  |       object creation impossible, since def foo(x: A): Unit in trait Foo is not defined 
+  |       (Note that
+  |        parameter A in def foo(x: A): Unit in trait Foo does not match
+  |        parameter Int & String in def foo(x: A & String): Unit in trait Bar
+  |        )
diff --git a/tests/neg/i11897.check b/tests/neg/i11897.check
new file mode 100644
index 000000000000..10191735122a
--- /dev/null
+++ b/tests/neg/i11897.check
@@ -0,0 +1,45 @@
+-- Error: tests/neg/i11897.scala:11:10 ---------------------------------------------------------------------------------
+11 |  val (x, given A) = (1, A(23)) // error
+   |          ^^^^^^^
+   |          given patterns are not allowed in a val definition,
+   |          please bind to an identifier and use an alias given.
+-- Error: tests/neg/i11897.scala:12:10 ---------------------------------------------------------------------------------
+12 |  val (_, given B) = (true, B(false)) // error
+   |          ^^^^^^^
+   |          given patterns are not allowed in a val definition,
+   |          please bind to an identifier and use an alias given.
+-- Error: tests/neg/i11897.scala:13:8 ----------------------------------------------------------------------------------
+13 |  val D(given C) = D(C("c")) // error
+   |        ^^^^^^^
+   |        given patterns are not allowed in a val definition,
+   |        please bind to an identifier and use an alias given.
+-- Error: tests/neg/i11897.scala:14:11 ---------------------------------------------------------------------------------
+14 |  val F(y, given E) = F(47, E(93)) // error
+   |           ^^^^^^^
+   |           given patterns are not allowed in a val definition,
+   |           please bind to an identifier and use an alias given.
+-- Error: tests/neg/i11897.scala:15:11 ---------------------------------------------------------------------------------
+15 |  val H(z, q @ given G) = H(47, G(101)) // error
+   |           ^^^^^^^^^^^
+   |           given patterns are not allowed in a val definition,
+   |           please bind to an identifier and use an alias given.
+-- Error: tests/neg/i11897.scala:16:18 ---------------------------------------------------------------------------------
+16 |  assert(summon[A] == A(23)) // error
+   |                  ^
+   |                  no implicit argument of type A was found for parameter x of method summon in object Predef
+-- Error: tests/neg/i11897.scala:17:18 ---------------------------------------------------------------------------------
+17 |  assert(summon[B] == B(false)) // error
+   |                  ^
+   |                  no implicit argument of type B was found for parameter x of method summon in object Predef
+-- Error: tests/neg/i11897.scala:18:18 ---------------------------------------------------------------------------------
+18 |  assert(summon[C] == C("c")) // error
+   |                  ^
+   |                  no implicit argument of type C was found for parameter x of method summon in object Predef
+-- Error: tests/neg/i11897.scala:19:18 ---------------------------------------------------------------------------------
+19 |  assert(summon[E] == E(93)) // error
+   |                  ^
+   |                  no implicit argument of type E was found for parameter x of method summon in object Predef
+-- Error: tests/neg/i11897.scala:20:18 ---------------------------------------------------------------------------------
+20 |  assert(summon[G] == G(101)) // error
+   |                  ^
+   |                  no implicit argument of type G was found for parameter x of method summon in object Predef
diff --git a/tests/neg/i11897.scala b/tests/neg/i11897.scala
new file mode 100644
index 000000000000..897a0026eecd
--- /dev/null
+++ b/tests/neg/i11897.scala
@@ -0,0 +1,20 @@
+case class A(i: Int)
+case class B(b: Boolean)
+case class C(s: String)
+case class D(c: C)
+case class E(i: Int)
+case class F(i: Int, e: E)
+case class G(i: Int)
+case class H(i: Int, e: G)
+
+def Test =
+  val (x, given A) = (1, A(23)) // error
+  val (_, given B) = (true, B(false)) // error
+  val D(given C) = D(C("c")) // error
+  val F(y, given E) = F(47, E(93)) // error
+  val H(z, q @ given G) = H(47, G(101)) // error
+  assert(summon[A] == A(23)) // error
+  assert(summon[B] == B(false)) // error
+  assert(summon[C] == C("c")) // error
+  assert(summon[E] == E(93)) // error
+  assert(summon[G] == G(101)) // error
diff --git a/tests/neg/i11938.scala b/tests/neg/i11938.scala
new file mode 100644
index 000000000000..e8f4e747915b
--- /dev/null
+++ b/tests/neg/i11938.scala
@@ -0,0 +1,16 @@
+import java.util.function.Function
+
+object Test {
+  def foo[V](v: V): Int = 1
+  def foo[U](fn: Function[Int, U]): Int = 2
+
+  def main(args: Array[String]): Unit = {
+    val f: Int => Int = x => x
+    foo(f) // error
+      // Like Scala 2, we emit an error here because the Function1 argument was
+      // deemed SAM-convertible to Function, even though it's not a lambda
+      // expression and therefore not convertible. If we wanted to support this,
+      // we would have to tweak TestApplication#argOK to look at the shape of
+      // `arg` and turn off SAM conversions when it's a non-closure tree.
+  }
+}
diff --git a/tests/neg/i12049.check b/tests/neg/i12049.check
new file mode 100644
index 000000000000..44b8897605f0
--- /dev/null
+++ b/tests/neg/i12049.check
@@ -0,0 +1,77 @@
+-- [E007] Type Mismatch Error: tests/neg/i12049.scala:6:16 -------------------------------------------------------------
+6 |val x: String = ??? : M[B] // error
+  |                ^^^^^^^^^^
+  |                Found:    M[B]
+  |                Required: String
+  |
+  |                Note: a match type could not be fully reduced:
+  |
+  |                  trying to reduce  M[B]
+  |                  failed since selector  B
+  |                  does not match  case A => Int
+  |                  and cannot be shown to be disjoint from it either.
+  |                  Therefore, reduction cannot advance to the remaining case
+  |
+  |                    case B => String
+  |
+  | longer explanation available when compiling with `-explain`
+-- Error: tests/neg/i12049.scala:14:23 ---------------------------------------------------------------------------------
+14 |val y3: String = ??? : Last[Int *: Int *: Boolean *: String *: EmptyTuple]  // error
+   |                       ^
+   |                       Match type reduction failed since selector  EmptyTuple.type
+   |                       matches none of the cases
+   |
+   |                           case _ *: _ *: t => Last[t]
+   |                           case t *: EmptyTuple => t
+-- Error: tests/neg/i12049.scala:22:26 ---------------------------------------------------------------------------------
+22 |val z3: (A, B, A) = ??? : Reverse[(A, B, A)] // error
+   |                          ^
+   |                          Match type reduction failed since selector  A *: EmptyTuple.type
+   |                          matches none of the cases
+   |
+   |                              case t1 *: t2 *: ts => Tuple.Concat[Reverse[ts], (t2, t1)]
+   |                              case EmptyTuple => EmptyTuple
+-- Error: tests/neg/i12049.scala:24:20 ---------------------------------------------------------------------------------
+24 |val _ = summon[M[B]]  // error
+   |                    ^
+   |                   no implicit argument of type M[B] was found for parameter x of method summon in object Predef
+   |
+   |                   Note: a match type could not be fully reduced:
+   |
+   |                     trying to reduce  M[B]
+   |                     failed since selector  B
+   |                     does not match  case A => Int
+   |                     and cannot be shown to be disjoint from it either.
+   |                     Therefore, reduction cannot advance to the remaining case
+   |
+   |                       case B => String
+-- Error: tests/neg/i12049.scala:25:26 ---------------------------------------------------------------------------------
+25 |val _ = summon[String =:= Last[Int *: Int *: Boolean *: String *: EmptyTuple]] // error
+   |                          ^
+   |                          Match type reduction failed since selector  EmptyTuple.type
+   |                          matches none of the cases
+   |
+   |                              case _ *: _ *: t => Last[t]
+   |                              case t *: EmptyTuple => t
+-- Error: tests/neg/i12049.scala:26:29 ---------------------------------------------------------------------------------
+26 |val _ = summon[(A, B, A) =:= Reverse[(A, B, A)]] // error
+   |                             ^
+   |                             Match type reduction failed since selector  A *: EmptyTuple.type
+   |                             matches none of the cases
+   |
+   |                                 case t1 *: t2 *: ts => Tuple.Concat[Reverse[ts], (t2, t1)]
+   |                                 case EmptyTuple => EmptyTuple
+-- [E008] Not Found Error: tests/neg/i12049.scala:28:21 ----------------------------------------------------------------
+28 |val _ = (??? : M[B]).length // error
+   |        ^^^^^^^^^^^^^^^^^^^
+   |        value length is not a member of M[B]
+   |
+   |        Note: a match type could not be fully reduced:
+   |
+   |          trying to reduce  M[B]
+   |          failed since selector  B
+   |          does not match  case A => Int
+   |          and cannot be shown to be disjoint from it either.
+   |          Therefore, reduction cannot advance to the remaining case
+   |
+   |            case B => String
diff --git a/tests/neg/i12049.scala b/tests/neg/i12049.scala
new file mode 100644
index 000000000000..e69ac9e7a217
--- /dev/null
+++ b/tests/neg/i12049.scala
@@ -0,0 +1,29 @@
+trait A
+trait B
+type M[X] = X match
+  case A => Int
+  case B => String
+val x: String = ??? : M[B] // error
+
+type Last[X <: Tuple] = X match
+  case _ *: _ *: t => Last[t]
+  case t *: EmptyTuple => t
+
+val y1: Int = ??? : Last[Int *: EmptyTuple]
+val y2: String = ??? : Last[Int *: Boolean *: String *: EmptyTuple]
+val y3: String = ??? : Last[Int *: Int *: Boolean *: String *: EmptyTuple]  // error
+
+type Reverse[X <: Tuple] = X match
+  case t1 *: t2 *: ts => Tuple.Concat[Reverse[ts], (t2, t1)]
+  case EmptyTuple => EmptyTuple
+
+val z1: (B, A) = ??? : Reverse[(A, B)]
+val z2: (B, A, B, A) = ??? : Reverse[(A, B, A, B)]
+val z3: (A, B, A) = ??? : Reverse[(A, B, A)] // error
+
+val _ = summon[M[B]]  // error
+val _ = summon[String =:= Last[Int *: Int *: Boolean *: String *: EmptyTuple]] // error
+val _ = summon[(A, B, A) =:= Reverse[(A, B, A)]] // error
+
+val _ = (??? : M[B]).length // error
+
diff --git a/tests/neg/i12116.scala b/tests/neg/i12116.scala
new file mode 100644
index 000000000000..4f07f4c3db48
--- /dev/null
+++ b/tests/neg/i12116.scala
@@ -0,0 +1,15 @@
+import compiletime.erasedValue
+
+object test1:
+
+  transparent inline def length[T]: Int =
+      erasedValue[T] match
+          case _: (h *: t) => 1 + length[t]
+          case _: EmptyTuple => 0
+
+  transparent inline def foo(): Int = 1 + foo()
+
+  val y = length[(1, 2, 3)] // error
+  val x = foo() // error
+
+
diff --git a/tests/neg/i12116a.scala b/tests/neg/i12116a.scala
new file mode 100644
index 000000000000..4407e42e649b
--- /dev/null
+++ b/tests/neg/i12116a.scala
@@ -0,0 +1,15 @@
+import compiletime.erasedValue
+
+object test1:
+
+  inline def length[T]: Int =
+      erasedValue[T] match
+          case _: (h *: t) => 1 + length[t]
+          case _: EmptyTuple => 0
+
+  inline def foo(): Int = 1 + foo()
+
+  val y = length[(1, 2, 3)] // error
+  val x = foo() // error
+
+
diff --git a/tests/neg/i12150.check b/tests/neg/i12150.check
new file mode 100644
index 000000000000..60f559cde474
--- /dev/null
+++ b/tests/neg/i12150.check
@@ -0,0 +1,12 @@
+-- [E018] Syntax Error: tests/neg/i12150.scala:1:13 --------------------------------------------------------------------
+1 |def f: Unit = // error
+  |             ^
+  |             expression expected but end found
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E129] Potential Issue Warning: tests/neg/i12150.scala:1:11 ---------------------------------------------------------
+1 |def f: Unit = // error
+  |           ^
+  |           A pure expression does nothing in statement position; you may be omitting necessary parentheses
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i12150.scala b/tests/neg/i12150.scala
new file mode 100644
index 000000000000..06fb5714f27d
--- /dev/null
+++ b/tests/neg/i12150.scala
@@ -0,0 +1,3 @@
+def f: Unit = // error
+
+end f
diff --git a/tests/neg/i12169.scala b/tests/neg/i12169.scala
new file mode 100644
index 000000000000..78507c369b1c
--- /dev/null
+++ b/tests/neg/i12169.scala
@@ -0,0 +1,37 @@
+object Var:
+  class Expanded[T <: Txn[T], B] extends Form[T]
+
+trait Txn[T <: Txn[T]]
+
+trait Form[T]
+
+class TT extends Txn[TT]
+
+private final class FlatVarCellView[T <: Txn[T], B](
+  firstVr  : Option[Var.Expanded[TT, B]]
+)
+
+def Test =
+  val opt: Option[Form[TT]] = ???
+  val firstVr = opt match
+    case Some(ex: Var.Expanded[TT, _]) => Some(ex)
+    case _                            => None
+  new FlatVarCellView(firstVr)  // error
+   //                      Found:    (firstVr : Option[Var.Expanded[TT, ?]])
+   //                      Required: Option[Var.Expanded[TT, B]]
+   //
+   //                      where:    B is a type variable
+   //
+   // Note that we cannot do capture conversion since the `?` does not appear as an argument
+   // of the a type. It's dubious whether capture conversion for more deeply nested types
+   // would be sound.
+
+  // Remedy:
+  opt match
+    case Some(ex: Var.Expanded[TT, _]) => new FlatVarCellView(Some(ex))
+      // here, we instantiate `B` with the unnamed second parameter of `Var.Expanded`
+    case _                             => new FlatVarCellView(None)
+  opt match
+    case Some(ex: Var.Expanded[TT, t]) => new FlatVarCellView[TT, t](Some(ex))
+      // the same as above, spelt out
+    case _                             => new FlatVarCellView(None)
diff --git a/tests/neg/i12177.check b/tests/neg/i12177.check
new file mode 100644
index 000000000000..2918dbfe0533
--- /dev/null
+++ b/tests/neg/i12177.check
@@ -0,0 +1,24 @@
+-- Error: tests/neg/i12177.scala:2:17 ----------------------------------------------------------------------------------
+2 |  inline val v = null // error
+  |                 ^^^^
+  |                 `inline val` with `null` is not supported.
+  |
+  |                 To inline a `null` consider using `inline def`
+-- Error: tests/neg/i12177.scala:4:17 ----------------------------------------------------------------------------------
+4 |  inline val u = () // error
+  |                 ^^
+  |                 `inline val` of type `Unit` is not supported.
+  |
+  |                 To inline a `Unit` consider using `inline def`
+-- Error: tests/neg/i12177.scala:6:18 ----------------------------------------------------------------------------------
+6 |  inline val u2 = { println(); () } // error
+  |                  ^^^^^^^^^^^^^^^^^
+  |                  `inline val` of type `Unit` is not supported.
+  |
+  |                  To inline a `Unit` consider using `inline def`
+-- Error: tests/neg/i12177.scala:7:18 ----------------------------------------------------------------------------------
+7 |  inline val u3 = { } // error
+  |                  ^^^
+  |                  `inline val` of type `Unit` is not supported.
+  |
+  |                  To inline a `Unit` consider using `inline def`
diff --git a/tests/neg/i12177.scala b/tests/neg/i12177.scala
new file mode 100644
index 000000000000..cf8d0a7ffe56
--- /dev/null
+++ b/tests/neg/i12177.scala
@@ -0,0 +1,8 @@
+object Test1 {
+  inline val v = null // error
+  inline def d = null
+  inline val u = () // error
+  inline def e = ()
+  inline val u2 = { println(); () } // error
+  inline val u3 = { } // error
+}
diff --git a/tests/neg/i12196.scala b/tests/neg/i12196.scala
new file mode 100644
index 000000000000..91619ad3c387
--- /dev/null
+++ b/tests/neg/i12196.scala
@@ -0,0 +1,10 @@
+import scala.quoted.*
+
+def qqq(s: String)(using Quotes): Expr[Unit] = '{()}
+
+inline val InlineVal = "i"
+inline def InlineDef = "i"
+
+inline def withInlineVal = ${ qqq(InlineVal) }
+inline def withInlineDef = ${ qqq(InlineDef) } // error
+inline def withString    = ${ qqq("i") }
diff --git a/tests/neg/i12196b.scala b/tests/neg/i12196b.scala
new file mode 100644
index 000000000000..3bd606d9b62e
--- /dev/null
+++ b/tests/neg/i12196b.scala
@@ -0,0 +1,10 @@
+import scala.quoted.*
+
+def qqq(s: String)(using Quotes): Expr[Unit] = '{()}
+
+abstract class Foo:
+  inline val InlineVal: String
+
+val foo: Foo = ???
+
+inline def withInlineVal = ${ qqq(foo.InlineVal) } // error
diff --git a/tests/neg/i12207.scala b/tests/neg/i12207.scala
new file mode 100644
index 000000000000..08c1e76f5ecd
--- /dev/null
+++ b/tests/neg/i12207.scala
@@ -0,0 +1,8 @@
+package example
+
+extension [T](t: T) inline def pi[P <: Tuple](using P): T = ???
+
+inline def env[P <: Tuple, T](op: P ?=> T): P ?=> T = op
+
+@main def Test =
+  env { pi[String] } // error // error
diff --git a/tests/neg/i12208.scala b/tests/neg/i12208.scala
new file mode 100644
index 000000000000..5131464430ff
--- /dev/null
+++ b/tests/neg/i12208.scala
@@ -0,0 +1 @@
+val pi: 3.14 = 3  // error
diff --git a/tests/neg/i12211.scala b/tests/neg/i12211.scala
new file mode 100644
index 000000000000..c7f29b24dc2b
--- /dev/null
+++ b/tests/neg/i12211.scala
@@ -0,0 +1,15 @@
+
+import reflect.Selectable.*
+
+val x: { def f(x: Any): String } = new { def f(x: Any) = x.toString }
+val y: { def f(x: String): String } = x  // error: type mismatch (different signatures)
+
+class Sink[A] { def put(x: A): Unit = {} }
+class Sink1[A] extends Sink[A] { def put(x: "123") = ??? }
+
+@main def Test =
+  println(y.f("abc"))
+  val a = new Sink[String]
+  val b: { def put(x: String): Unit } = a // error: type mismatch (different signatures)
+  b.put("") // gave a NoSuchMethodException: Sink.put(java.lang.String)
+  val c: Sink[String] = Sink1[String]()
diff --git a/tests/neg/i12220.scala b/tests/neg/i12220.scala
new file mode 100644
index 000000000000..c1380b8781b5
--- /dev/null
+++ b/tests/neg/i12220.scala
@@ -0,0 +1,3 @@
+val a: List[Any] = List(List(1,2), List(3,4))
+val _ = for(b <- a ; c <- b.asInstanceOf[List]) { println(c) } // error
+
diff --git a/tests/neg/i12232.check b/tests/neg/i12232.check
new file mode 100644
index 000000000000..2dd7adc02a16
--- /dev/null
+++ b/tests/neg/i12232.check
@@ -0,0 +1,12 @@
+-- Error: tests/neg/i12232.scala:17:15 ---------------------------------------------------------------------------------
+17 |  foo(min(3, 4)) // error: works in Scala 2, not in 3
+   |               ^
+   |             no implicit argument of type Op[Int, Int, V] was found for parameter op of method min in object Foo
+   |
+   |             where:    V is a type variable with constraint <: Double
+-- Error: tests/neg/i12232.scala:19:16 ---------------------------------------------------------------------------------
+19 |  foo(minR(3, 4)) // error: works in Scala 2, not in 3
+   |                ^
+   |            no implicit argument of type Op[Int, Int, R] was found for parameter op of method minR in object Foo
+   |
+   |            where:    R is a type variable with constraint <: Double
diff --git a/tests/neg/i12232.scala b/tests/neg/i12232.scala
new file mode 100644
index 000000000000..3ca080a6fe56
--- /dev/null
+++ b/tests/neg/i12232.scala
@@ -0,0 +1,20 @@
+trait Op[T1, T2, +R] {
+  def apply(t1: T1, t2: T2): R
+}
+
+object Op {
+  implicit val compInt: Op[Int, Int, Int] = new Op[Int, Int, Int] {
+    def apply(x: Int, y: Int) = scala.math.min(x, y)
+  }
+}
+
+object Foo {
+  def foo(x: Double) = x + 1.0
+  def min[T, U, V](x: T, y: U)(implicit op: Op[T, U, V]): V = op(x, y)
+  def minInt(x: Int, y: Int)(implicit op: Op[Int, Int, Int]): Int = op(x, y)
+  def minR[R](x: Int, y: Int)(implicit op: Op[Int, Int, R]): R = op(x, y)
+  min(3, 4) // works in both
+  foo(min(3, 4)) // error: works in Scala 2, not in 3
+  foo(minInt(3, 4)) // works in both
+  foo(minR(3, 4)) // error: works in Scala 2, not in 3
+}
diff --git a/tests/neg/i12245.scala b/tests/neg/i12245.scala
new file mode 100644
index 000000000000..219f73f0702c
--- /dev/null
+++ b/tests/neg/i12245.scala
@@ -0,0 +1,5 @@
+package dotty.tools.dotc.core
+
+def round(f: Float, digits: Int = 0): Float = ???
+//@scala.annotation.targetName("roundDouble") // does not change anything
+def round(d: Double, digits: Int = 0): Double = ???  // error
diff --git a/tests/neg/i12284.check b/tests/neg/i12284.check
new file mode 100644
index 000000000000..7d61acd012a5
--- /dev/null
+++ b/tests/neg/i12284.check
@@ -0,0 +1,9 @@
+-- [E007] Type Mismatch Error: tests/neg/i12284.scala:6:26 -------------------------------------------------------------
+6 |  val y: Vector[F[Any]] = xx // error
+  |                          ^^
+  |                          Found:    (xx : Vector[Any])
+  |                          Required: Vector[F[Any]]
+  |
+  |                          where:    F is a type in method magic with bounds <: [_] =>> Any
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i12284.scala b/tests/neg/i12284.scala
new file mode 100644
index 000000000000..11635a1638cb
--- /dev/null
+++ b/tests/neg/i12284.scala
@@ -0,0 +1,7 @@
+trait I[F[_], A]
+
+def magic[F[_], A](in: I[F, A]): F[A] =
+  val deps: Vector[I[F, _]] = ???
+  val xx = deps.map(i => magic(i))
+  val y: Vector[F[Any]] = xx // error
+  ???
diff --git a/tests/neg/i12299.scala b/tests/neg/i12299.scala
new file mode 100644
index 000000000000..424be6cc4fd2
--- /dev/null
+++ b/tests/neg/i12299.scala
@@ -0,0 +1,24 @@
+object Outer {
+
+  object Inner {
+    class Bar(x: Int)
+    object Bar
+  }
+
+  export Inner.Bar._
+
+  val _ = apply(2)  // error (constructor proxies are not exported)
+
+}
+object Outer2 {
+
+  object Inner {
+    class Bar(x: Int)
+    object Bar
+  }
+
+  export Inner.Bar.apply  // error: no eligible member
+
+  val _ = apply(2)  // error (constructor proxies are not exported)
+
+}
diff --git a/tests/neg/i12344.scala b/tests/neg/i12344.scala
new file mode 100644
index 000000000000..88daf535e699
--- /dev/null
+++ b/tests/neg/i12344.scala
@@ -0,0 +1,26 @@
+import scala.quoted.*
+
+class C(using q: Quotes)(i: Int = 1, f: q.reflect.Flags = q.reflect.Flags.EmptyFlags)
+
+def test1a(using q: Quotes) = new C()                           // error
+def test2a(using q: Quotes) = new C(1)                          // error
+def test3a(using q: Quotes) = new C(1, q.reflect.Flags.Lazy)    // error
+def test4a(using q: Quotes) = new C(f = q.reflect.Flags.Lazy)   // error
+
+def test1b(using q: Quotes) = C()                               // error
+def test2b(using q: Quotes) = C(1)                              // error
+def test3b(using q: Quotes) = C(1, q.reflect.Flags.Lazy)        // error
+def test4b(using q: Quotes) = C(f = q.reflect.Flags.Lazy)       // error
+
+def test1c(using q: Quotes) = new C(using q)()
+def test2c(using q: Quotes) = new C(using q)(1)
+def test3c(using q: Quotes) = new C(using q)(1, q.reflect.Flags.Lazy)
+def test4c(using q: Quotes) = new C(using q)(f = q.reflect.Flags.Lazy)
+
+def test1d(using q: Quotes) = C(using q)()
+def test2d(using q: Quotes) = C(using q)(1)
+def test3d(using q: Quotes) = C(using q)(1, q.reflect.Flags.Lazy)
+def test4d(using q: Quotes) = C(using q)(f = q.reflect.Flags.Lazy)
+
+def test1e(using q: Quotes) = new C()()
+def test2e(using q: Quotes) = C()()
diff --git a/tests/neg/i12348.check b/tests/neg/i12348.check
new file mode 100644
index 000000000000..ccc2b9f7ed00
--- /dev/null
+++ b/tests/neg/i12348.check
@@ -0,0 +1,8 @@
+-- [E040] Syntax Error: tests/neg/i12348.scala:2:15 --------------------------------------------------------------------
+2 |  given inline x: Int = 0 // error
+  |               ^
+  |               'with' expected, but identifier found
+-- [E040] Syntax Error: tests/neg/i12348.scala:3:10 --------------------------------------------------------------------
+3 |} // error
+  |          ^
+  |          '}' expected, but eof found
diff --git a/tests/neg/i12348.scala b/tests/neg/i12348.scala
new file mode 100644
index 000000000000..69fc77fb532e
--- /dev/null
+++ b/tests/neg/i12348.scala
@@ -0,0 +1,3 @@
+object A {
+  given inline x: Int = 0 // error
+} // error
\ No newline at end of file
diff --git a/tests/neg/i12361.scala b/tests/neg/i12361.scala
new file mode 100644
index 000000000000..dfef0321d7c1
--- /dev/null
+++ b/tests/neg/i12361.scala
@@ -0,0 +1,3 @@
+object Test {
+    foo = macro Impls . foo [ U ] +=    // error  // error
+}
diff --git a/tests/neg/i12384.scala b/tests/neg/i12384.scala
new file mode 100644
index 000000000000..fef2ce018ee3
--- /dev/null
+++ b/tests/neg/i12384.scala
@@ -0,0 +1,8 @@
+object Nats {
+  trait Fold {
+    trait Nat
+  }
+  type Inc = Fold {
+    type Apply[N <: Nat] = Succ // error
+  }
+}
\ No newline at end of file
diff --git a/tests/neg/i12430.scala b/tests/neg/i12430.scala
new file mode 100644
index 000000000000..075c3bba4f90
--- /dev/null
+++ b/tests/neg/i12430.scala
@@ -0,0 +1,4 @@
+class i0 {
+  new collection // error
+  new io // error
+}
\ No newline at end of file
diff --git a/tests/neg/i12486.scala b/tests/neg/i12486.scala
new file mode 100644
index 000000000000..8ae605c43bc8
--- /dev/null
+++ b/tests/neg/i12486.scala
@@ -0,0 +1,10 @@
+val hello: String = "hello"
+
+object MyObj {
+  val a: Int = 123
+  val b: Double = 456.789
+  val c: String = "ABC"
+}
+
+val stringFromSingleton: String = new hello.type()    // error: not a class type
+val myObjFromSingleton: MyObj.type = new MyObj.type() // error: not a class type
diff --git a/tests/neg/i12555.scala b/tests/neg/i12555.scala
new file mode 100644
index 000000000000..3a5996159e10
--- /dev/null
+++ b/tests/neg/i12555.scala
@@ -0,0 +1,6 @@
+trait Noop {
+  inline def noop: String
+}
+
+inline def boom: String = (??? : Noop).noop
+def test: Unit = boom // error
diff --git a/tests/neg/i12555b.scala b/tests/neg/i12555b.scala
new file mode 100644
index 000000000000..5931bda4ba27
--- /dev/null
+++ b/tests/neg/i12555b.scala
@@ -0,0 +1,18 @@
+trait Noop[T]:
+  //note: making this "not inline" fixes the result
+  inline def noop(fa: T): T
+
+object Noop {
+  inline def noop[T](alg: T)(using n: Noop[T]): T = n.noop(alg)
+}
+
+import Noop.*
+
+final case class User(name: String, age: Int)
+
+inline given Noop[User] = a => a
+
+val u = User("hello", 45)
+
+@main
+def run = println(Noop.noop(u)) // error
diff --git a/tests/neg/i12555c.scala b/tests/neg/i12555c.scala
new file mode 100644
index 000000000000..9d2a10aff4c9
--- /dev/null
+++ b/tests/neg/i12555c.scala
@@ -0,0 +1,4 @@
+trait Noop {
+  inline def noop: String
+}
+def test2: Unit = (??? : Noop).noop // error
diff --git a/tests/neg/i12557.scala b/tests/neg/i12557.scala
new file mode 100644
index 000000000000..7e2d301e2662
--- /dev/null
+++ b/tests/neg/i12557.scala
@@ -0,0 +1,14 @@
+package example
+
+abstract class X[P <: Product](using val m: scala.deriving.Mirror.ProductOf[P]) {
+  def unapply(p: P): m.MirroredElemTypes = ???
+}
+
+case class A(a: Int)
+object A extends X[A]  // error
+
+object Main {
+  def main(args: Array[String]): Unit = {
+    A.unapply(A(2))
+  }
+}
diff --git a/tests/neg/i12591.check b/tests/neg/i12591.check
new file mode 100644
index 000000000000..694eb68e3299
--- /dev/null
+++ b/tests/neg/i12591.check
@@ -0,0 +1,4 @@
+-- Error: tests/neg/i12591/Inner.scala:12:31 ---------------------------------------------------------------------------
+12 |val badSummon = summon[TC[Bar]] // error here
+   |                               ^
+   |ambiguous implicit arguments: both outer.inner.Foo.ofFoo and outer.Foo.ofFoo match type outer.inner.Foo.TC[outer.Bar] of parameter x of method summon in object Predef
diff --git a/tests/neg/i12591/Inner.scala b/tests/neg/i12591/Inner.scala
new file mode 100644
index 000000000000..aae9bd5b9234
--- /dev/null
+++ b/tests/neg/i12591/Inner.scala
@@ -0,0 +1,13 @@
+package outer
+package inner
+
+sealed trait Foo
+object Foo:
+  trait TC[T]
+  given ofFoo[T <: Foo]: TC[T] = ???
+  trait Bar extends Foo
+
+import Foo.TC
+//Adding import Foo.Bar resolves the issue
+val badSummon = summon[TC[Bar]] // error here
+
diff --git a/tests/neg/i12591/Outer.scala b/tests/neg/i12591/Outer.scala
new file mode 100644
index 000000000000..5c810ec785fe
--- /dev/null
+++ b/tests/neg/i12591/Outer.scala
@@ -0,0 +1,3 @@
+package outer
+export inner.Foo
+export Foo.Bar
diff --git a/tests/neg/i12605.scala b/tests/neg/i12605.scala
new file mode 100644
index 000000000000..bcd7aedc606b
--- /dev/null
+++ b/tests/neg/i12605.scala
@@ -0,0 +1,4 @@
+object Foo:
+  def joe(): List[(Int, Int)] =
+    List((2, 3), (3, 4)).filter case (a, b) => b > a // error // error
+// error
\ No newline at end of file
diff --git a/tests/neg/i12606.scala b/tests/neg/i12606.scala
new file mode 100644
index 000000000000..53f88387af36
--- /dev/null
+++ b/tests/neg/i12606.scala
@@ -0,0 +1,8 @@
+import scala.quoted._
+
+trait ReflectModule {
+  implicit def q: Quotes
+  import quotes.reflect._ // error
+
+  def foo(x: TypeRepr): Unit = ???
+}
\ No newline at end of file
diff --git a/tests/neg/i12664.scala b/tests/neg/i12664.scala
new file mode 100644
index 000000000000..5e4b784475aa
--- /dev/null
+++ b/tests/neg/i12664.scala
@@ -0,0 +1,14 @@
+trait Step {
+  type Self
+  type Next[A]
+}
+
+trait DynamicNextStep {
+  type OneOf[Self, Next[_]]
+  def apply(s: Step): OneOf[s.Self, s.Next]
+}
+
+object X extends DynamicNextStep {
+  override type OneOf[Self] = Self  // error
+  override def apply(s: Step) = ???
+}
diff --git a/tests/neg/i12729.scala b/tests/neg/i12729.scala
new file mode 100644
index 000000000000..50f8f06d9bce
--- /dev/null
+++ b/tests/neg/i12729.scala
@@ -0,0 +1,7 @@
+class Test(i: Int):
+  val `<init>` = "init" // error: Illegal backquoted identifier: `<init>` and `<clinit>` are forbidden
+  val `<clinit>` = "clinit" // error: Illegal backquoted identifier: `<init>` and `<clinit>` are forbidden
+  class `<init>`: // error: Illegal backquoted identifier: `<init>` and `<clinit>` are forbidden
+    def `<init>`(in: String) = ??? // error: Illegal backquoted identifier: `<init>` and `<clinit>` are forbidden
+  class `<clinit>`: // error: Illegal backquoted identifier: `<init>` and `<clinit>` are forbidden
+    def `<clinit>`(in: String) = ??? // error: Illegal backquoted identifier: `<init>` and `<clinit>` are forbidden
diff --git a/tests/neg/i12736a.scala b/tests/neg/i12736a.scala
new file mode 100644
index 000000000000..509465ea3f07
--- /dev/null
+++ b/tests/neg/i12736a.scala
@@ -0,0 +1,6 @@
+object Test {
+  def apply[S](r: Any): Any = r
+
+  def test =
+    (x: Int) => Test(doesntexist, x) // error
+}
diff --git a/tests/neg/i12736b.scala b/tests/neg/i12736b.scala
new file mode 100644
index 000000000000..c7db2f7a92ea
--- /dev/null
+++ b/tests/neg/i12736b.scala
@@ -0,0 +1,6 @@
+object Test {
+  def apply[S](r: Any)(using DoesntExist): Any = r // error
+
+  def test(o: Option[Any]) =
+    o.map(x => Test(doesntExist, x)) // error
+}
diff --git a/tests/neg/i12754.scala b/tests/neg/i12754.scala
new file mode 100644
index 000000000000..ee29f8f97885
--- /dev/null
+++ b/tests/neg/i12754.scala
@@ -0,0 +1,15 @@
+transparent inline def transform(inline a: Any): Any = inline a match {
+  case x: Byte   => x
+  case x: Short  => x
+  case x: Int    => x
+  case x: Long   => x
+  case x: Float  => x
+  case x: Double => x
+  case _         => a
+}
+
+inline def lt(inline a: Any, inline b: Double): Boolean = transform(a) < b // error
+
+def test = {
+  println(lt(0, 5))
+}
diff --git a/tests/neg/i12802.scala b/tests/neg/i12802.scala
new file mode 100644
index 000000000000..a73a4193f120
--- /dev/null
+++ b/tests/neg/i12802.scala
@@ -0,0 +1,12 @@
+trait M:
+  type X
+  object X:
+    def foo(): X = ???
+
+transparent inline def m(using m: M): m.type = m
+
+def Test1 =
+  given M = new M{}
+  import m.*     // error: no implicit argument of type M was found
+  val x: X = X.foo()
+  println(x)
diff --git a/tests/neg/i12828.check b/tests/neg/i12828.check
new file mode 100644
index 000000000000..070633fc35b3
--- /dev/null
+++ b/tests/neg/i12828.check
@@ -0,0 +1,8 @@
+-- Error: tests/neg/i12828.scala:7:7 -----------------------------------------------------------------------------------
+7 |object Baz extends Bar[Int] // error: not implemented
+  |       ^
+  |       object creation impossible, since def foo(x: A): Unit in trait Foo is not defined 
+  |       (Note that
+  |        parameter A in def foo(x: A): Unit in trait Foo does not match
+  |        parameter Int & String in def foo(x: A & String): Unit in trait Bar
+  |        )
diff --git a/tests/neg/i12828.scala b/tests/neg/i12828.scala
new file mode 100644
index 000000000000..d8d099b71d08
--- /dev/null
+++ b/tests/neg/i12828.scala
@@ -0,0 +1,9 @@
+trait Foo[A]:
+  def foo(x: A): Unit
+
+trait Bar[A] extends Foo[A]:
+  def foo(x: A & String): Unit = println(x.toUpperCase)
+
+object Baz extends Bar[Int] // error: not implemented
+
+@main def run() = Baz.foo(42)
diff --git a/tests/neg/i12828c.scala b/tests/neg/i12828c.scala
new file mode 100644
index 000000000000..d36e7a719984
--- /dev/null
+++ b/tests/neg/i12828c.scala
@@ -0,0 +1,12 @@
+abstract class Foo[A] {
+  def foo(x: A): Unit
+}
+abstract class Bar[A] extends Foo[A] {
+  def foo(x: A with String): Unit = println(x.toUpperCase)
+}
+object Baz extends Bar[Int] // error: not implemented (same as Scala 2)
+                            // Scala 2 gives: object creation impossible. Missing implementation for `foo`
+
+object Test {
+  def main(args: Array[String]) = Baz.foo(42)
+}
diff --git a/tests/neg/i12828d.scala b/tests/neg/i12828d.scala
new file mode 100644
index 000000000000..45a95501835d
--- /dev/null
+++ b/tests/neg/i12828d.scala
@@ -0,0 +1,18 @@
+trait A[X] {
+  def foo(x: X): Unit =
+    println("A.foo")
+}
+trait B[X] extends A[X] {
+  def foo(x: Int): Unit =
+    println("B.foo")
+}
+object C extends B[Int] // error: conflicting members
+                        // Scala 2: same
+
+object Test {
+  def main(args: Array[String]) = {
+    C.foo(1)
+    val a: A[Int] = C
+    a.foo(1)
+  }
+}
\ No newline at end of file
diff --git a/tests/neg/i12941.scala b/tests/neg/i12941.scala
new file mode 100644
index 000000000000..0948cf7ce545
--- /dev/null
+++ b/tests/neg/i12941.scala
@@ -0,0 +1,28 @@
+object A:
+  def myFun(op: String ?=> Unit) = ()
+
+@main def func: Unit =
+  A.myFun {
+    val res: String = summon[String]
+    println(ress)  // error
+  }
+
+class I:
+  def runSth: Int = 1
+
+abstract class A:
+  def myFun(op: I ?=> Unit) =
+    op(using I())
+    1
+
+class B extends A
+
+def assertEquals(x: String, y: Int, z: Int): Unit = ()
+
+@main def hello: Unit =
+
+  B().myFun {
+    val res = summon[I].runSth
+    assertEquals("", 1, res, "asd") // error
+    println("Hello!")
+  }
\ No newline at end of file
diff --git a/tests/neg/i12986a/Bar.scala b/tests/neg/i12986a/Bar.scala
new file mode 100644
index 000000000000..fcc12aca6259
--- /dev/null
+++ b/tests/neg/i12986a/Bar.scala
@@ -0,0 +1,2 @@
+class Bar(i: Int):
+  inline def this() = this(0) // error
diff --git a/tests/neg/i12986a/Test.scala b/tests/neg/i12986a/Test.scala
new file mode 100644
index 000000000000..84399837c008
--- /dev/null
+++ b/tests/neg/i12986a/Test.scala
@@ -0,0 +1 @@
+val bar = new Bar()
diff --git a/tests/neg/i12986b.scala b/tests/neg/i12986b.scala
new file mode 100644
index 000000000000..d8de9dbfb51c
--- /dev/null
+++ b/tests/neg/i12986b.scala
@@ -0,0 +1,4 @@
+class Bar(i: Int):
+  transparent inline def this() = this(0) // error
+
+val bar = Bar()
diff --git a/tests/neg/i13044.check b/tests/neg/i13044.check
new file mode 100644
index 000000000000..c5584aadf767
--- /dev/null
+++ b/tests/neg/i13044.check
@@ -0,0 +1,146 @@
+-- Error: tests/neg/i13044.scala:50:40 ---------------------------------------------------------------------------------
+50 |   implicit def typeSchema: Schema[A] = Schema.gen // error // error
+   |                                        ^^^^^^^^^^
+   |                                        given instance gen is declared as `inline`, but was not inlined
+   |
+   |                                        Try increasing `-Xmax-inlines` above 32
+   |--------------------------------------------------------------------------------------------------------------------
+   |Inline stack trace
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
+   |                                   ^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+31 |        lazy val fields = recurse[m.MirroredElemTypes]
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+37 |  inline given gen[A]: Schema[A] = derived
+   |                                   ^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
+   |                                   ^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+31 |        lazy val fields = recurse[m.MirroredElemTypes]
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+37 |  inline given gen[A]: Schema[A] = derived
+   |                                   ^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
+   |                                   ^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+31 |        lazy val fields = recurse[m.MirroredElemTypes]
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+37 |  inline given gen[A]: Schema[A] = derived
+   |                                   ^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
+   |                                   ^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+31 |        lazy val fields = recurse[m.MirroredElemTypes]
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+37 |  inline given gen[A]: Schema[A] = derived
+   |                                   ^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
+   |                                   ^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+18 |        builder :: recurse[ts]
+   |                   ^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+31 |        lazy val fields = recurse[m.MirroredElemTypes]
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:17
+37 |  inline given gen[A]: Schema[A] = derived
+   |                                   ^^^^^^^
+    --------------------------------------------------------------------------------------------------------------------
+-- Error: tests/neg/i13044.scala:50:40 ---------------------------------------------------------------------------------
+50 |   implicit def typeSchema: Schema[A] = Schema.gen // error // error
+   |                                        ^^^^^^^^^^
+   |                                        method recurse is declared as `inline`, but was not inlined
+   |
+   |                                        Try increasing `-Xmax-inlines` above 32
+   |--------------------------------------------------------------------------------------------------------------------
+   |Inline stack trace
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+18 |        builder :: recurse[ts]
+   |                   ^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+31 |        lazy val fields = recurse[m.MirroredElemTypes]
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+37 |  inline given gen[A]: Schema[A] = derived
+   |                                   ^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
+   |                                   ^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+31 |        lazy val fields = recurse[m.MirroredElemTypes]
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+37 |  inline given gen[A]: Schema[A] = derived
+   |                                   ^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
+   |                                   ^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+31 |        lazy val fields = recurse[m.MirroredElemTypes]
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+37 |  inline given gen[A]: Schema[A] = derived
+   |                                   ^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
+   |                                   ^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+31 |        lazy val fields = recurse[m.MirroredElemTypes]
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+37 |  inline given gen[A]: Schema[A] = derived
+   |                                   ^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+17 |        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
+   |                                   ^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+18 |        builder :: recurse[ts]
+   |                   ^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+31 |        lazy val fields = recurse[m.MirroredElemTypes]
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13044.scala:18
+37 |  inline given gen[A]: Schema[A] = derived
+   |                                   ^^^^^^^
+    --------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/i13044.scala b/tests/neg/i13044.scala
new file mode 100644
index 000000000000..081b642c604c
--- /dev/null
+++ b/tests/neg/i13044.scala
@@ -0,0 +1,51 @@
+import scala.deriving.Mirror
+import scala.compiletime._
+
+trait Schema[T] {
+  def build: T
+}
+
+object Schema extends SchemaDerivation {
+  implicit lazy val int: Schema[Int]   = ???
+  implicit def option[A](implicit ev: Schema[A]): Schema[Option[A]] = ???
+}
+
+trait SchemaDerivation {
+  inline def recurse[A <: Tuple]: List[Schema[Any]] =
+    inline erasedValue[A] match {
+      case _: (t *: ts) =>
+        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
+        builder :: recurse[ts]
+      case _: EmptyTuple => Nil
+    }
+
+  inline def derived[A]: Schema[A] =
+    inline summonInline[Mirror.Of[A]] match {
+      case m: Mirror.SumOf[A] =>
+        lazy val subTypes = recurse[m.MirroredElemTypes]
+        new Schema[A] {
+          def build: A = ???
+        }
+
+      case m: Mirror.ProductOf[A] =>
+        lazy val fields = recurse[m.MirroredElemTypes]
+        new Schema[A] {
+          def build: A = ???
+        }
+    }
+
+  inline given gen[A]: Schema[A] = derived
+}
+
+case class H(i: Int)
+case class G(h: H)
+case class F(g: G)
+case class E(f: Option[F])
+case class D(e: E)
+case class C(d: D)
+case class B(c: C)
+case class A(a: A, b: B)
+
+object TestApp {
+   implicit def typeSchema: Schema[A] = Schema.gen // error // error
+}
diff --git a/tests/neg/i13075.scala b/tests/neg/i13075.scala
new file mode 100644
index 000000000000..2a5ff70c0481
--- /dev/null
+++ b/tests/neg/i13075.scala
@@ -0,0 +1,40 @@
+object Implementing_Tuples:
+
+  sealed trait Tup
+  case class ConsTup[T, H <: Tup](head: T, tail: H) extends Tup
+  case object EmptyTup extends Tup
+
+  val *: = ConsTup                     // for unapply
+  type *:[H, T <: Tup] = ConsTup[H, T] // for type matching
+  type EmptyTup = EmptyTup.type        // for type matching
+
+  extension [H](head: H)
+    def *:[T <: Tup](tail: T) = ConsTup(head, tail)
+
+  type Fold[T <: Tup, Seed, F[_,_]] = T match
+    case EmptyTup => Seed
+    case h *: t => Fold[t, F[Seed, h], F]
+
+  extension [T <: Tup](v: T)
+    def fold[Seed, F[_,_]](seed: Seed)(
+      fn: [C, Acc] => (C, Acc) => F[C, Acc]
+    ): Fold[T, Seed, F] =
+      (v match
+        case EmptyTup => seed
+        case h *: t => t.fold(fn(h, seed))(fn)
+      ).asInstanceOf[Fold[T, Seed, F]]
+
+  extension [T <: Tup](v: T) def reversed: Tup =
+    v.fold[EmptyTup, [C, Acc] =>> Acc match {
+      case h *: t => C *: h *: t
+    }](EmptyTup)(
+      [C, Acc] => (c: C, acc: Acc) => acc match
+        case _@(_ *: _) => c *: acc  // error
+    )
+
+  @main def testProperFold =
+    val t = (1 *: '2' *: "foo" *: EmptyTup)
+    val reversed: (String *: Char *: Int *: EmptyTup) = t.reversed // error
+    println(reversed)
+
+end Implementing_Tuples
\ No newline at end of file
diff --git a/tests/neg/i13076.check b/tests/neg/i13076.check
new file mode 100644
index 000000000000..641bf5aa2677
--- /dev/null
+++ b/tests/neg/i13076.check
@@ -0,0 +1,10 @@
+-- Error: tests/neg/i13076.scala:6:6 -----------------------------------------------------------------------------------
+6 |class C[X, Y] extends T[X, Y] {} // error
+  |      ^
+  |      class C needs to be abstract, since:
+  |      it has 2 unimplemented members.
+  |      /** As seen from class C, the missing signatures are as follows.
+  |       *  For convenience, these are usable as stub implementations.
+  |       */
+  |        def f(a: X): Y = ???
+  |        def g(a: X, b: Y): Unit = ???
diff --git a/tests/neg/i13076.scala b/tests/neg/i13076.scala
new file mode 100644
index 000000000000..fa37123995c9
--- /dev/null
+++ b/tests/neg/i13076.scala
@@ -0,0 +1,6 @@
+trait T[A, B] {
+  def f(a: A): B
+  def g(a: A, b: B): Unit
+}
+
+class C[X, Y] extends T[X, Y] {} // error
diff --git a/tests/neg/i13089.check b/tests/neg/i13089.check
new file mode 100644
index 000000000000..ed0f9d5effd9
--- /dev/null
+++ b/tests/neg/i13089.check
@@ -0,0 +1,12 @@
+-- [E161] Naming Error: tests/neg/i13089.scala:6:8 ---------------------------------------------------------------------
+6 |    def fails : Unit = {} // error
+  |    ^^^^^^^^^^^^^^^^^^^^^
+  |    fails is already defined as method fails in tests/neg/i13089.scala
+  |
+  |    Note that overloaded methods must all be defined in the same group of toplevel definitions
+-- [E161] Naming Error: tests/neg/i13089.scala:8:6 ---------------------------------------------------------------------
+8 |  def baz(x: String): Boolean = true // error
+  |  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |  baz is already defined as method baz in tests/neg/i13089.scala
+  |
+  |  Note that overloaded methods must all be defined in the same group of toplevel definitions
diff --git a/tests/neg/i13089.scala b/tests/neg/i13089.scala
new file mode 100644
index 000000000000..5b91996de837
--- /dev/null
+++ b/tests/neg/i13089.scala
@@ -0,0 +1,21 @@
+package pkg:
+
+  trait Bar
+
+  extension (bar : Bar)
+    def fails : Unit = {} // error
+
+  def baz(x: String): Boolean = true // error
+
+package pkg:
+
+  trait Foo
+  extension (foo : Foo)
+    def fails : Unit = {}
+    def works : Unit = {}
+
+  extension (bar : Bar)
+    def works : Unit = {}
+
+  def baz(x: Int): Boolean = true
+
diff --git a/tests/neg/i13101.scala b/tests/neg/i13101.scala
new file mode 100644
index 000000000000..f32ba35ef2c8
--- /dev/null
+++ b/tests/neg/i13101.scala
@@ -0,0 +1,24 @@
+trait Vehicle
+trait Car extends Vehicle
+
+trait Encoder[A]
+object Encoder {
+  implicit val encodeVehicle: Encoder[Vehicle] = ???
+  implicit val encodeCar: Encoder[Car] = ???
+}
+
+trait Route
+trait Printer
+trait Marshaller[-A]  // must be contravariant
+
+object Test {
+  implicit def marshaller[A: Encoder](implicit p: Printer = ???): Marshaller[A] = ???
+    // the `Printer` implicit arg seems to be necessary, either with default value, or no implicit in scope
+
+  def foo[A](v: A)(implicit m: Marshaller[A]): Route = ???
+
+  val route: Route = identity {
+    val f: (Car => Route) => Route = ???  // ok if s/Car/Vehicle/
+    f(vehicle => foo(vehicle)) // error: ambiguous implicit
+  }
+}
diff --git a/tests/neg/i13114/A.scala b/tests/neg/i13114/A.scala
new file mode 100644
index 000000000000..30d3cecc795f
--- /dev/null
+++ b/tests/neg/i13114/A.scala
@@ -0,0 +1,3 @@
+def f = 42
+
+class C
diff --git a/tests/neg/i13114/B.scala b/tests/neg/i13114/B.scala
new file mode 100644
index 000000000000..be778f749ace
--- /dev/null
+++ b/tests/neg/i13114/B.scala
@@ -0,0 +1,7 @@
+class D2 extends C
+
+package p {
+  class D extends C  // error: not found
+
+  @main def test = println(new D)
+}
diff --git a/tests/neg/i13218.scala b/tests/neg/i13218.scala
new file mode 100644
index 000000000000..e033a3637461
--- /dev/null
+++ b/tests/neg/i13218.scala
@@ -0,0 +1,14 @@
+class TagTest extends AnyFreeSpec:
+  "a" - {
+    "b" in {
+      class TF[F[_]]
+      meow // error
+    }
+  }
+
+trait AnyFreeSpec:
+  protected class Wrapper(s: String):
+    def -(f: => Unit): Unit = ???
+    def in(f: => Unit): Unit = ???
+
+  implicit def wrap(s: String): Wrapper = ???
diff --git a/tests/neg/i13320.check b/tests/neg/i13320.check
new file mode 100644
index 000000000000..1e336d8fa7bf
--- /dev/null
+++ b/tests/neg/i13320.check
@@ -0,0 +1,12 @@
+-- [E008] Not Found Error: tests/neg/i13320.scala:8:24 -----------------------------------------------------------------
+8 |    type t = Option[Foo.Boo] // error
+  |                    ^^^^^^^
+  |                    type Boo is not a member of object Foo - did you mean Foo.Boo.type?
+-- [E008] Not Found Error: tests/neg/i13320.scala:4:11 -----------------------------------------------------------------
+4 |var x: Foo.Booo = Foo.Booo // error // error
+  |       ^^^^^^^^
+  |       type Booo is not a member of object Foo - did you mean Foo.Boo.type?
+-- [E008] Not Found Error: tests/neg/i13320.scala:4:22 -----------------------------------------------------------------
+4 |var x: Foo.Booo = Foo.Booo // error // error
+  |                  ^^^^^^^^
+  |                  value Booo is not a member of object Foo - did you mean Foo.Boo?
\ No newline at end of file
diff --git a/tests/neg/i13320.scala b/tests/neg/i13320.scala
new file mode 100644
index 000000000000..05edd7e17008
--- /dev/null
+++ b/tests/neg/i13320.scala
@@ -0,0 +1,8 @@
+object Foo:
+  case object Boo
+
+var x: Foo.Booo = Foo.Booo // error // error
+
+object Main:
+  def main(args: Array[String]) =
+    type t = Option[Foo.Boo] // error
diff --git a/tests/neg/i13340.scala b/tests/neg/i13340.scala
new file mode 100644
index 000000000000..1db3f32af52d
--- /dev/null
+++ b/tests/neg/i13340.scala
@@ -0,0 +1,3 @@
+case class Field(name: String, subQuery: Option[Query] = None)
+case class Query(fields: Seq[Field])
+val x = Query(Seq(Field("a", subQuery=Some(Query(Seq(Field("b")), Nil)))), Nil) // error
diff --git a/tests/neg/i13377/LeakFoo_1.scala b/tests/neg/i13377/LeakFoo_1.scala
new file mode 100644
index 000000000000..e8d679f627a3
--- /dev/null
+++ b/tests/neg/i13377/LeakFoo_1.scala
@@ -0,0 +1,3 @@
+import scala.util.NotGiven
+type LeakFoo[T] = core.LeakingFoo[T]
+val ok = summon[NotGiven[LeakFoo[1] =:= LeakFoo[2]]]
diff --git a/tests/neg/i13377/Test_2.scala b/tests/neg/i13377/Test_2.scala
new file mode 100644
index 000000000000..02971c189679
--- /dev/null
+++ b/tests/neg/i13377/Test_2.scala
@@ -0,0 +1,3 @@
+import scala.util.NotGiven
+val x: LeakFoo[1] = ??? : LeakFoo[2]  // error
+val notok = summon[NotGiven[LeakFoo[1] =:= LeakFoo[2]]] // ok
diff --git a/tests/neg/i13377/coreFoo_1.scala b/tests/neg/i13377/coreFoo_1.scala
new file mode 100644
index 000000000000..cb80a6efb776
--- /dev/null
+++ b/tests/neg/i13377/coreFoo_1.scala
@@ -0,0 +1,4 @@
+package core
+
+opaque type Foo[T] <: Int = Int
+type LeakingFoo[T] = Foo[T]
diff --git a/tests/neg/i13407.scala b/tests/neg/i13407.scala
new file mode 100644
index 000000000000..a0f9efdbf173
--- /dev/null
+++ b/tests/neg/i13407.scala
@@ -0,0 +1,19 @@
+import scala.quoted.Type
+
+trait Tensor[S <: Tuple] {
+  def sum[Axis <: Shape: Type](axis: Axis): Tensor[S] = { // error
+    Tensor.mk
+  }
+}
+
+object Tensor {
+  def mk[S <: Tuple]: Tensor[S] = new Tensor {}
+}
+
+object Foo {
+  val t1: Tensor[("batch", "len", "embed")] = Tensor.mk
+   def foo(x: Any) = {
+
+  }
+  foo(foo(t1.sum("len"))) // error
+}
diff --git a/tests/neg/i13435.check b/tests/neg/i13435.check
new file mode 100644
index 000000000000..ee2027a3dfe2
--- /dev/null
+++ b/tests/neg/i13435.check
@@ -0,0 +1,12 @@
+-- [E029] Pattern Match Exhaustivity Warning: tests/neg/i13435.scala:7:2 -----------------------------------------------
+7 |  s match
+  |  ^
+  |  match may not be exhaustive.
+  |
+  |  It would fail on pattern case: (_), ((_, _), (_, _))
+  |
+  | longer explanation available when compiling with `-explain`
+-- Error: tests/neg/i13435.scala:8:10 ----------------------------------------------------------------------------------
+8 |    case (dim: Axis, size: Int) => dim // error
+  |          ^^^^^^^^^
+  |          trait Singleton cannot be used in runtime type tests
diff --git a/tests/neg/i13435.scala b/tests/neg/i13435.scala
new file mode 100644
index 000000000000..eaff4976eb71
--- /dev/null
+++ b/tests/neg/i13435.scala
@@ -0,0 +1,8 @@
+type Axis = String&Singleton
+type ShapeTuple = Tuple1[(Axis, Int)]|Tuple2[(Axis, Int), (Axis, Int)]
+type Shape = (Axis, Int) |ShapeTuple
+
+
+def mkSchema(s: Shape) =
+  s match
+    case (dim: Axis, size: Int) => dim // error
\ No newline at end of file
diff --git a/tests/neg/i13466.check b/tests/neg/i13466.check
new file mode 100644
index 000000000000..a15ae059427f
--- /dev/null
+++ b/tests/neg/i13466.check
@@ -0,0 +1,11 @@
+-- Error: tests/neg/i13466.scala:9:6 -----------------------------------------------------------------------------------
+9 |given none: SomeTrait[Finally] with {} // error
+  |      ^
+  |      object creation impossible, since:
+  |      it has 3 unimplemented members.
+  |      /** As seen from module class none$, the missing signatures are as follows.
+  |       *  For convenience, these are usable as stub implementations.
+  |       */
+  |        def foo: Finally[Unit] = ???
+  |        def withTV[A]: Finally[A] = ???
+  |        def withTV2[A, B]: Finally[(A, B)] = ???
diff --git a/tests/neg/i13466.scala b/tests/neg/i13466.scala
new file mode 100644
index 000000000000..3d18fc3dc637
--- /dev/null
+++ b/tests/neg/i13466.scala
@@ -0,0 +1,9 @@
+opaque type Finally[A] = A
+
+trait SomeTrait[F[_]] {
+  def foo: F[Unit]
+  def withTV[A]: F[A]
+  def withTV2[A, B]: F[(A, B)]
+}
+
+given none: SomeTrait[Finally] with {} // error
diff --git a/tests/neg/i13487.check b/tests/neg/i13487.check
new file mode 100644
index 000000000000..486124661ea4
--- /dev/null
+++ b/tests/neg/i13487.check
@@ -0,0 +1,4 @@
+-- Error: tests/neg/i13487.scala:6:32 ----------------------------------------------------------------------------------
+6 |case class Foo[A](a: A) derives TC // error
+  |                                ^^
+  |                                Foo cannot be unified with the type argument of TC
diff --git a/tests/neg/i13487.scala b/tests/neg/i13487.scala
new file mode 100644
index 000000000000..e06258087846
--- /dev/null
+++ b/tests/neg/i13487.scala
@@ -0,0 +1,6 @@
+trait TC[F[_, _[_]]]
+object TC {
+  def derived[F[_, _[_]]]: TC[F] = ???
+}
+
+case class Foo[A](a: A) derives TC // error
diff --git a/tests/neg/i13497.scala b/tests/neg/i13497.scala
new file mode 100644
index 000000000000..83f1cd7519b9
--- /dev/null
+++ b/tests/neg/i13497.scala
@@ -0,0 +1,13 @@
+trait Foo
+trait Bar
+object Foo:
+  given (using Bar): Foo = ???
+
+object Bug:
+  def demonstrate: Unit =
+    Option.empty[Unit].flatMap { _ =>
+      Option.empty[Unit].map { _ =>
+        val foo = summon[Foo] // error: Foo.given_Foo(/* missing */summon[Bar])
+        Option.empty[Unit]
+      }
+    }
diff --git a/tests/neg/i13513.scala b/tests/neg/i13513.scala
new file mode 100644
index 000000000000..637f432ca504
--- /dev/null
+++ b/tests/neg/i13513.scala
@@ -0,0 +1,5 @@
+final case class TwoTypes[F, A](value: A)
+class Minimal {
+  def x[C[_]]: C[Int] = ???
+  x[TwoTypes].value // error:  Type argument TwoTypes does not conform to upper bound [_] =>> Any
+}
diff --git a/tests/neg/i13558.check b/tests/neg/i13558.check
new file mode 100644
index 000000000000..4c468a854781
--- /dev/null
+++ b/tests/neg/i13558.check
@@ -0,0 +1,22 @@
+-- [E008] Not Found Error: tests/neg/i13558.scala:23:14 ----------------------------------------------------------------
+23 |    println(a.id) // error
+   |            ^^^^
+   |            value id is not a member of testcode.A.
+   |            An extension method was tried, but could not be fully constructed:
+   |
+   |                testcode.ExtensionA.id(a)    failed with
+   |
+   |                    Reference to id is ambiguous,
+   |                    it is both imported by import testcode.ExtensionB._
+   |                    and imported subsequently by import testcode.ExtensionA._
+-- [E008] Not Found Error: tests/neg/i13558.scala:29:14 ----------------------------------------------------------------
+29 |    println(a.id) // error
+   |            ^^^^
+   |            value id is not a member of testcode.A.
+   |            An extension method was tried, but could not be fully constructed:
+   |
+   |                testcode.ExtensionB.id(a)    failed with
+   |
+   |                    Reference to id is ambiguous,
+   |                    it is both imported by import testcode.ExtensionA._
+   |                    and imported subsequently by import testcode.ExtensionB._
diff --git a/tests/neg/i13558.scala b/tests/neg/i13558.scala
new file mode 100644
index 000000000000..1d4e1c506e43
--- /dev/null
+++ b/tests/neg/i13558.scala
@@ -0,0 +1,31 @@
+package testcode
+
+class A
+
+class B
+
+object ExtensionA {
+  extension (self: A) {
+    def id = "A"
+  }
+}
+object ExtensionB {
+  extension (self: B) {
+    def id = "B"
+  }
+}
+
+object Main {
+  def main1(args: Array[String]): Unit = {
+    import ExtensionB._
+    import ExtensionA._
+    val a = A()
+    println(a.id) // error
+  }
+  def main2(args: Array[String]): Unit = {
+    import ExtensionA._
+    import ExtensionB._
+    val a = A()
+    println(a.id) // error
+  }
+}
\ No newline at end of file
diff --git a/tests/neg/i13570.check b/tests/neg/i13570.check
new file mode 100644
index 000000000000..9c7edc6fdfe0
--- /dev/null
+++ b/tests/neg/i13570.check
@@ -0,0 +1,18 @@
+-- Error: tests/neg/i13570.scala:8:5 -----------------------------------------------------------------------------------
+8 |  jim(Seq(1,2)) // error
+  |  ^^^^^^^^^^^^^
+  |  cannot reduce inline match with
+  |   scrutinee:  seq$proxy1 : (seq$proxy1 : Seq[Int])
+  |   patterns :  case s @ _:Seq[Int] if s.isEmpty
+  |               case s @ _:Seq[Int]
+  |               case _
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from i13570.scala:3
+3 |    inline seq match
+  |           ^
+4 |      case s: Seq[Int] if s.isEmpty => println("seq is empty")
+5 |      case s: Seq[Int] => println("seq is not empty")
+6 |      case _ => println("somthing hinky happened")
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/i13570.scala b/tests/neg/i13570.scala
new file mode 100644
index 000000000000..1376dedbaf19
--- /dev/null
+++ b/tests/neg/i13570.scala
@@ -0,0 +1,8 @@
+object Test:
+  inline def jim(seq: Seq[Int]) =
+    inline seq match
+      case s: Seq[Int] if s.isEmpty => println("seq is empty")
+      case s: Seq[Int] => println("seq is not empty")
+      case _ => println("somthing hinky happened")
+
+  jim(Seq(1,2)) // error
diff --git a/tests/neg/i13701.scala b/tests/neg/i13701.scala
new file mode 100644
index 000000000000..0e038359856a
--- /dev/null
+++ b/tests/neg/i13701.scala
@@ -0,0 +1,2 @@
+@main def Test() = String // error
+
diff --git a/tests/neg/i13703.check b/tests/neg/i13703.check
new file mode 100644
index 000000000000..34f37cc1502f
--- /dev/null
+++ b/tests/neg/i13703.check
@@ -0,0 +1,5 @@
+-- Error: tests/neg/i13703.scala:3:17 ----------------------------------------------------------------------------------
+3 |val f: Foo { var i: Int } = new Foo { var i: Int = 0 } // error
+  |             ^^^^^^^^^^
+  |             refinement cannot be a mutable var.
+  |             You can use an explicit getter i and setter i_= instead
diff --git a/tests/neg/i13703.scala b/tests/neg/i13703.scala
new file mode 100644
index 000000000000..c81d1b6e3e0b
--- /dev/null
+++ b/tests/neg/i13703.scala
@@ -0,0 +1,5 @@
+trait Foo extends reflect.Selectable
+
+val f: Foo { var i: Int } = new Foo { var i: Int = 0 } // error
+
+val f2: Foo { val i: Int; def i_=(x: Int): Unit } = new Foo { var i: Int = 0 } // OK
diff --git a/tests/neg/i13769.check b/tests/neg/i13769.check
new file mode 100644
index 000000000000..3d7af1bd06a1
--- /dev/null
+++ b/tests/neg/i13769.check
@@ -0,0 +1,10 @@
+-- Error: tests/neg/i13769.scala:2:18 ----------------------------------------------------------------------------------
+2 |val te = tup.map((x: _ <: Int) => List(x)) // error // error
+  |                  ^^^^^^^^^^^
+  |                  not a legal formal parameter
+-- [E006] Not Found Error: tests/neg/i13769.scala:2:39 -----------------------------------------------------------------
+2 |val te = tup.map((x: _ <: Int) => List(x)) // error // error
+  |                                       ^
+  |                                       Not found: x
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i13769.scala b/tests/neg/i13769.scala
new file mode 100644
index 000000000000..67575e821334
--- /dev/null
+++ b/tests/neg/i13769.scala
@@ -0,0 +1,2 @@
+val tup = (1, "s")
+val te = tup.map((x: _ <: Int) => List(x)) // error // error
diff --git a/tests/neg/i13808.check b/tests/neg/i13808.check
new file mode 100644
index 000000000000..e9b55a5ddec2
--- /dev/null
+++ b/tests/neg/i13808.check
@@ -0,0 +1,8 @@
+-- Error: tests/neg/i13808.scala:13:37 ---------------------------------------------------------------------------------
+13 |case class Boom[A](value: A) derives OpaqueType, Foo // error // error
+   |                                     ^^^^^^^^^^
+   |                                     OpaqueTypes.OpaqueType is not a class type
+-- Error: tests/neg/i13808.scala:13:49 ---------------------------------------------------------------------------------
+13 |case class Boom[A](value: A) derives OpaqueType, Foo // error // error
+   |                                                 ^^^
+   |                                                 FooModule.Foo is not a class type
diff --git a/tests/neg/i13808.scala b/tests/neg/i13808.scala
new file mode 100644
index 000000000000..6dd568c69423
--- /dev/null
+++ b/tests/neg/i13808.scala
@@ -0,0 +1,14 @@
+object OpaqueTypes:
+  opaque type OpaqueType[A] = List[A]
+  object OpaqueType:
+    def derived[A]: OpaqueType[A] = Nil
+
+object FooModule:
+  type Foo[A]
+  object Foo:
+    def derived[A]: Foo[A] = Nil.asInstanceOf[Foo[A]]
+
+import FooModule.Foo
+import OpaqueTypes.OpaqueType
+case class Boom[A](value: A) derives OpaqueType, Foo // error // error
+
diff --git a/tests/neg/i13838a.scala b/tests/neg/i13838a.scala
new file mode 100644
index 000000000000..9fcb7be7bdcf
--- /dev/null
+++ b/tests/neg/i13838a.scala
@@ -0,0 +1,47 @@
+object TooSlow {
+  trait EqSyntax {
+    implicit def catsSyntaxEq[A: Eq](a: A): EqOps[A] = ???
+  }
+
+  final class EqOps[A]
+
+  object eq extends EqSyntax
+
+  import eq._
+
+  sealed abstract class Foo[A]
+  object Foo {
+    implicit def eqFoo[A: Eq]: Eq[Foo[A]] = ???
+  }
+
+  type FooT[F[_], A] = F[Foo[A]]
+  object FooT {
+    def liftF[F[_], A](fa: F[A]): F[Foo[A]] =
+      map(fa)(???)  // error
+
+    def map[F[_], A, B](ffa: F[Foo[A]])(f: A => B): F[Foo[B]] =
+      ???
+  }
+
+  trait Order[A] extends Eq[A]
+
+  trait Eq[A]
+
+  object Eq {
+    implicit def catsKernelOrderForTuple14[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13)] = ???
+    implicit def catsKernelOrderForTuple13[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12)] = ???
+    implicit def catsKernelOrderForTuple12[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11)] = ???
+    implicit def catsKernelOrderForTuple11[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)] = ???
+    implicit def catsKernelOrderForTuple10[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9)] = ???
+    implicit def catsKernelOrderForTuple9[A0, A1, A2, A3, A4, A5, A6, A7, A8](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8)] = ???
+    implicit def catsKernelOrderForTuple8[A0, A1, A2, A3, A4, A5, A6, A7](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7]): Order[(A0, A1, A2, A3, A4, A5, A6, A7)] = ???
+    implicit def catsKernelOrderForTuple7[A0, A1, A2, A3, A4, A5, A6](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6]): Order[(A0, A1, A2, A3, A4, A5, A6)] = ???
+    implicit def catsKernelOrderForTuple6[A0, A1, A2, A3, A4, A5](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5]): Order[(A0, A1, A2, A3, A4, A5)] = ???
+    implicit def catsKernelOrderForTuple5[A0, A1, A2, A3, A4](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4]): Order[(A0, A1, A2, A3, A4)] = ???
+    implicit def catsKernelOrderForTuple4[A0, A1, A2, A3](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3]): Order[(A0, A1, A2, A3)] = ???
+    implicit def catsKernelOrderForTuple3[A0, A1, A2](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2]): Order[(A0, A1, A2)] = ???
+    implicit def catsKernelOrderForTuple2[A0, A1](implicit A0: Order[A0], A1: Order[A1]): Order[(A0, A1)] = ???
+    implicit def catsKernelOrderForTuple1[A0](implicit A0: Order[A0]): Order[Tuple1[A0]] = ???
+  }
+
+}
\ No newline at end of file
diff --git a/tests/neg/i13846.check b/tests/neg/i13846.check
new file mode 100644
index 000000000000..69ea0f0e51ac
--- /dev/null
+++ b/tests/neg/i13846.check
@@ -0,0 +1,17 @@
+-- Error: tests/neg/i13846.scala:3:22 ----------------------------------------------------------------------------------
+3 |def foo(): Int throws ArithmeticException = 1 / 0 // error
+  |                      ^^^^^^^^^^^^^^^^^^^
+  |                      throws clause cannot be defined for RuntimeException
+-- Error: tests/neg/i13846.scala:7:9 -----------------------------------------------------------------------------------
+7 |    foo() // error
+  |         ^
+  |        The capability to throw exception ArithmeticException is missing.
+  |        The capability can be provided by one of the following:
+  |         - Adding a using clause `(using CanThrow[ArithmeticException])` to the definition of the enclosing method
+  |         - Adding `throws ArithmeticException` clause after the result type of the enclosing method
+  |         - Wrapping this piece of code with a `try` block that catches ArithmeticException
+  |
+  |        The following import might fix the problem:
+  |
+  |          import unsafeExceptions.canThrowAny
+  |
diff --git a/tests/neg/i13846.scala b/tests/neg/i13846.scala
new file mode 100644
index 000000000000..ac2a8ebd8eef
--- /dev/null
+++ b/tests/neg/i13846.scala
@@ -0,0 +1,9 @@
+import language.experimental.saferExceptions
+
+def foo(): Int throws ArithmeticException = 1 / 0 // error
+
+def test(): Unit =
+  try
+    foo() // error
+  catch
+    case _: ArithmeticException => println("Caught")
diff --git a/tests/neg/i13849.check b/tests/neg/i13849.check
new file mode 100644
index 000000000000..6dafaaa30ff1
--- /dev/null
+++ b/tests/neg/i13849.check
@@ -0,0 +1,5 @@
+-- Error: tests/neg/i13849.scala:16:11 ---------------------------------------------------------------------------------
+16 |      case _: Ex if false => println("Caught") // error
+   |           ^^^^^
+   |           Implementation restriction: cannot generate CanThrow capability for this kind of catch.
+   |           CanThrow capabilities can only be generated if no pattern guard is given.
diff --git a/tests/neg/i13849.scala b/tests/neg/i13849.scala
new file mode 100644
index 000000000000..9b734db4be7d
--- /dev/null
+++ b/tests/neg/i13849.scala
@@ -0,0 +1,16 @@
+import annotation.experimental
+import language.experimental.saferExceptions
+
+@experimental
+case class Ex(i: Int) extends Exception(s"Exception: $i")
+
+@experimental
+def foo(): Unit throws Ex = throw Ex(1)
+
+@experimental
+object Main:
+  def main(args: Array[String]): Unit =
+    try
+      foo()
+    catch
+      case _: Ex if false => println("Caught") // error
diff --git a/tests/neg/i13851.scala b/tests/neg/i13851.scala
new file mode 100644
index 000000000000..fb7066a60b3f
--- /dev/null
+++ b/tests/neg/i13851.scala
@@ -0,0 +1,11 @@
+opaque type One = 1
+inline val One: One = 1 // error
+
+opaque type Max = Int.MaxValue.type
+inline val Max: Max = Int.MaxValue // error
+
+inline val MaxValue: Int.MaxValue.type = Int.MaxValue
+
+opaque type Two = 2
+type Bis = Two
+inline val Two: Bis = 2 // error
\ No newline at end of file
diff --git a/tests/neg/i13851b.scala b/tests/neg/i13851b.scala
new file mode 100644
index 000000000000..624735de0a49
--- /dev/null
+++ b/tests/neg/i13851b.scala
@@ -0,0 +1,10 @@
+object Num {
+  opaque type One = 1
+  inline val One: One = 1 // error
+
+  opaque type Two = 2
+  inline def Two: Two = 2
+}
+
+def test1 = Num.One
+def test2 = Num.Two
diff --git a/tests/neg/i13852.scala b/tests/neg/i13852.scala
new file mode 100644
index 000000000000..a0c5e726e1a8
--- /dev/null
+++ b/tests/neg/i13852.scala
@@ -0,0 +1,6 @@
+inline val `1`: 1 = 1
+def get1: 1 = `1`
+
+opaque type One = 1
+inline val One: One = 1 // error
+def getOne: One = One
diff --git a/tests/neg/i13864.check b/tests/neg/i13864.check
new file mode 100644
index 000000000000..54e81ea82774
--- /dev/null
+++ b/tests/neg/i13864.check
@@ -0,0 +1,18 @@
+-- Error: tests/neg/i13864.scala:11:9 ----------------------------------------------------------------------------------
+11 |    case Ex(i: Int) => println("Caught an Int") // error
+   |         ^^^^^^^^^^
+   |         Implementation restriction: cannot generate CanThrow capability for this kind of catch.
+   |         CanThrow capabilities can only be generated for cases of the form `ex: T` where `T` is fully defined.
+-- Error: tests/neg/i13864.scala:9:10 ----------------------------------------------------------------------------------
+9 |    foo(1) // error
+  |          ^
+  |          The capability to throw exception Ex[Int] is missing.
+  |          The capability can be provided by one of the following:
+  |           - Adding a using clause `(using CanThrow[Ex[Int]])` to the definition of the enclosing method
+  |           - Adding `throws Ex[Int]` clause after the result type of the enclosing method
+  |           - Wrapping this piece of code with a `try` block that catches Ex[Int]
+  |
+  |          The following import might fix the problem:
+  |
+  |            import unsafeExceptions.canThrowAny
+  |
diff --git a/tests/neg/i13864.scala b/tests/neg/i13864.scala
new file mode 100644
index 000000000000..3053a2b12e87
--- /dev/null
+++ b/tests/neg/i13864.scala
@@ -0,0 +1,11 @@
+import language.experimental.saferExceptions
+
+case class Ex[A](a: A) extends Exception(s"Ex: $a")
+
+def foo[A](a: A): Unit throws Ex[A] = throw new Ex(a)
+
+def test(): Unit =
+  try
+    foo(1) // error
+  catch
+    case Ex(i: Int) => println("Caught an Int") // error
diff --git a/tests/neg/i13960.check b/tests/neg/i13960.check
new file mode 100644
index 000000000000..190f55690a5b
--- /dev/null
+++ b/tests/neg/i13960.check
@@ -0,0 +1,6 @@
+-- [E108] Declaration Error: tests/neg/i13960.scala:13:10 --------------------------------------------------------------
+13 |    case A() => // error
+   |         ^^^
+   |          A is not a valid result type of an unapply method of an extractor.
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i13960.scala b/tests/neg/i13960.scala
new file mode 100644
index 000000000000..54ae513598f1
--- /dev/null
+++ b/tests/neg/i13960.scala
@@ -0,0 +1,15 @@
+class A() extends Product {
+  override def canEqual(that: Any) = true
+  override def productArity = 0
+  override def productElement(n: Int) = null
+}
+
+object A {
+  def unapply(a: A): A = a
+}
+
+object Main {
+  (new A) match {
+    case A() => // error
+  }
+}
diff --git a/tests/neg/i13987.scala b/tests/neg/i13987.scala
new file mode 100644
index 000000000000..b27cd444cda6
--- /dev/null
+++ b/tests/neg/i13987.scala
@@ -0,0 +1,16 @@
+sealed trait Xa[T]
+sealed trait Mu[T] extends Xa[T]
+object Xa {
+  // bad
+  implicit def convertMu[X[x] <: Xa[x], A, B](implicit t: X[A] with Xa[A]): X[B] = t.asInstanceOf[X[B]]
+  // good
+//  implicit def convertMu[X[x] <: Xa[x], A, B](implicit t: X[A] with Mu[A]): X[B] = t.asInstanceOf[X[B]]
+}
+object Mu {
+  implicit def mu: Mu[Int] = new Mu[Int] {}
+}
+
+object App extends App {
+  def constrain(a: Mu[Long]): Unit = println(a)
+  constrain(Xa.convertMu)  // error
+}
\ No newline at end of file
diff --git a/tests/neg/i13991.check b/tests/neg/i13991.check
new file mode 100644
index 000000000000..009e116f95b1
--- /dev/null
+++ b/tests/neg/i13991.check
@@ -0,0 +1,15 @@
+-- Error: tests/neg/i13991.scala:5:7 -----------------------------------------------------------------------------------
+ 5 |  first[String] // error // before line 10 to test alignment of the error message `|`
+   |  ^^^^^^^^^^^^^
+   |  no implicit argument of type Foo[String] was found
+   |--------------------------------------------------------------------------------------------------------------------
+   |Inline stack trace
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13991.scala:8
+ 8 |  compiletime.summonInline[Foo[A]].foo
+   |  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from i13991.scala:8
+11 |  second[A] + 42 // after line 10 to test alignment of the error message `|`
+   |  ^^^^^^^^^
+    --------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/i13991.scala b/tests/neg/i13991.scala
new file mode 100644
index 000000000000..af15891e82d3
--- /dev/null
+++ b/tests/neg/i13991.scala
@@ -0,0 +1,11 @@
+trait Foo[X]:
+  def foo: Int
+
+def foo =
+  first[String] // error // before line 10 to test alignment of the error message `|`
+
+inline def second[A]: Int =
+  compiletime.summonInline[Foo[A]].foo
+
+inline def first[A]: Int =
+  second[A] + 42 // after line 10 to test alignment of the error message `|`
diff --git a/tests/neg/i13997.scala b/tests/neg/i13997.scala
new file mode 100644
index 000000000000..77cca35d93bd
--- /dev/null
+++ b/tests/neg/i13997.scala
@@ -0,0 +1,10 @@
+  opaque type CovariantArray[+A] = Array[A] // error
+
+  object CovariantArray:
+    def crash() =
+      val stringArray: CovariantArray[String] = Array("foo", "bar")
+      val anyArray: CovariantArray[Any] = stringArray
+      anyArray(0) = 42
+      stringArray(0).length
+
+  @main def Test = CovariantArray.crash()
\ No newline at end of file
diff --git a/tests/neg/i14013.scala b/tests/neg/i14013.scala
new file mode 100644
index 000000000000..96b2e7c0cdd7
--- /dev/null
+++ b/tests/neg/i14013.scala
@@ -0,0 +1,15 @@
+object Foo1 {
+  case class Bar(i: Int)
+
+  private implicit class BarOps(bar: Bar) {
+    def twice = Bar(bar.i * 2)
+  }
+}
+
+class Foo {
+  def bar = Foo.Bar(1).twice // error
+}
+
+object App extends App {
+  println((new Foo).bar)
+}
\ No newline at end of file
diff --git a/tests/neg/i14039.check b/tests/neg/i14039.check
new file mode 100644
index 000000000000..a9bae09c2415
--- /dev/null
+++ b/tests/neg/i14039.check
@@ -0,0 +1,4 @@
+-- Error: tests/neg/i14039.scala:4:14 ----------------------------------------------------------------------------------
+4 |def test = get() // error
+  |           ^^^^^
+  |           my error
diff --git a/tests/neg/i14039.scala b/tests/neg/i14039.scala
new file mode 100644
index 000000000000..3d34a84f0e8d
--- /dev/null
+++ b/tests/neg/i14039.scala
@@ -0,0 +1,4 @@
+val entries = Seq.newBuilder[Any]
+inline def error(): Any = compiletime.error("my error")
+inline def get(): Unit = entries += error()
+def test = get() // error
diff --git a/tests/neg/i14062.scala b/tests/neg/i14062.scala
new file mode 100644
index 000000000000..e2e6625a97e0
--- /dev/null
+++ b/tests/neg/i14062.scala
@@ -0,0 +1,10 @@
+import annotation.*
+
+object Test:
+
+  @targetName("") // error
+  def foo = println("ok")
+
+  foo
+
+
diff --git a/tests/neg/i14145.scala b/tests/neg/i14145.scala
new file mode 100644
index 000000000000..e9619ae9d756
--- /dev/null
+++ b/tests/neg/i14145.scala
@@ -0,0 +1,4 @@
+val l: List[Option[Int]] = List(None, Some(1), None)
+
+@main def m15 =
+  l.collectFirst(Some.unapply.unlift[Option[Int], Int]) // error
diff --git a/tests/neg/i14177a.scala b/tests/neg/i14177a.scala
new file mode 100644
index 000000000000..3031271c369b
--- /dev/null
+++ b/tests/neg/i14177a.scala
@@ -0,0 +1,6 @@
+import scala.compiletime.*
+
+trait C[A]
+
+inline given [Tup <: Tuple]: C[Tup] with
+  val cs = summonAll[Tuple.Map[Tup, C]] // error cannot reduce inline match with
diff --git a/tests/neg/i14177c.scala b/tests/neg/i14177c.scala
new file mode 100644
index 000000000000..d281938ca0ea
--- /dev/null
+++ b/tests/neg/i14177c.scala
@@ -0,0 +1,15 @@
+class T
+
+transparent inline given fail1: T with // error
+  val cs = scala.compiletime.summonAll[EmptyTuple]
+transparent inline given fail2[X]: T with // error
+  val cs = scala.compiletime.summonAll[EmptyTuple]
+transparent inline given fail3(using DummyImplicit): T with // error
+  val cs = scala.compiletime.summonAll[EmptyTuple]
+
+transparent inline given ok1: T = new T:
+  val cs = scala.compiletime.summonAll[EmptyTuple]
+transparent inline given ok2[X]: T = new T:
+  val cs = scala.compiletime.summonAll[EmptyTuple]
+transparent inline given ok3(using DummyImplicit): T = new T:
+  val cs = scala.compiletime.summonAll[EmptyTuple]
diff --git a/tests/neg/i14303/A_1_c3.0.0.scala b/tests/neg/i14303/A_1_c3.0.0.scala
new file mode 100644
index 000000000000..4e1d7cc57472
--- /dev/null
+++ b/tests/neg/i14303/A_1_c3.0.0.scala
@@ -0,0 +1,5 @@
+def a: Int = {
+  3
+  4
+}
+def f: Int = match // error // error
diff --git a/tests/neg/i14303/B_2.scala b/tests/neg/i14303/B_2.scala
new file mode 100644
index 000000000000..39441cd7c630
--- /dev/null
+++ b/tests/neg/i14303/B_2.scala
@@ -0,0 +1 @@
+def test() = f // error
\ No newline at end of file
diff --git a/tests/neg/i14367.check b/tests/neg/i14367.check
new file mode 100644
index 000000000000..94158bf73923
--- /dev/null
+++ b/tests/neg/i14367.check
@@ -0,0 +1,7 @@
+-- [E007] Type Mismatch Error: tests/neg/i14367.scala:2:16 -------------------------------------------------------------
+2 |val h2 = i => p(i)  // error: Found (i : Seq[Int]), Required: Int
+  |                ^
+  |                Found:    (i : Seq[Int])
+  |                Required: Int
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i14367.scala b/tests/neg/i14367.scala
new file mode 100644
index 000000000000..2778ade8dfa1
--- /dev/null
+++ b/tests/neg/i14367.scala
@@ -0,0 +1,5 @@
+def p(i: Int*) = i.sum
+val h2 = i => p(i)  // error: Found (i : Seq[Int]), Required: Int
+  // It would be more logical to fail with a "missing parameter type", however.
+
+
diff --git a/tests/neg/i1501.scala b/tests/neg/i1501.scala
index 68556640383a..045f2be1de2f 100644
--- a/tests/neg/i1501.scala
+++ b/tests/neg/i1501.scala
@@ -16,13 +16,3 @@ object Test {
     println(new C().foo)
   }
 }
-
-object Test2 {
-  class A
-  class SubA(x: Int) extends A
-  trait TA extends A
-  trait TSubA extends SubA(2) // error: trait TSubA may not call constructor of class SubA
-
-
-  class Foo extends TA with TSubA // error: missing argument for parameter x of constructor SubA:
-}
diff --git a/tests/neg/i1501a.scala b/tests/neg/i1501a.scala
new file mode 100644
index 000000000000..4568c637f3de
--- /dev/null
+++ b/tests/neg/i1501a.scala
@@ -0,0 +1,10 @@
+
+object Test2 {
+  class A
+  class SubA(x: Int) extends A
+  trait TA extends A
+  trait TSubA extends SubA(2) // error: trait TSubA may not call constructor of class SubA
+
+
+  class Foo extends TA with TSubA // error: missing argument for parameter x of constructor SubA:
+}
diff --git a/tests/neg/i1653.scala b/tests/neg/i1653.scala
index f21fc7d54d96..ef122b1a76b1 100644
--- a/tests/neg/i1653.scala
+++ b/tests/neg/i1653.scala
@@ -1,3 +1,3 @@
 trait Foo {
-  def foo() = new Unit with Foo  // error: cannot extend final class Unit  // error: illegal trait inheritance
+  def foo() = new Unit with Foo  // error: cannot extend final class Unit
 }
diff --git a/tests/neg/i1679.scala b/tests/neg/i1679.scala
index 08a33bb15596..cadeb85dc8db 100644
--- a/tests/neg/i1679.scala
+++ b/tests/neg/i1679.scala
@@ -1,5 +1,5 @@
 class A[T]
 object o {
   // Testing compiler crash, this test should be modified when named type argument are completely implemented
-  val x: A[T=Int, T=Int] = ??? // error: ']' expected, but '=' found
+  val x: A[T=Int, T=Int] = ??? // error: ']' expected, but '=' found // error
 }
diff --git a/tests/neg/i2033.check b/tests/neg/i2033.check
index 4878ad153a47..5751d91f4f3a 100644
--- a/tests/neg/i2033.check
+++ b/tests/neg/i2033.check
@@ -7,5 +7,9 @@
    |                                   ^^^^^^^
    |                                   Found:    Unit
    |                                   Required: String
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
+-- Warning: tests/neg/i2033.scala:6:37 ---------------------------------------------------------------------------------
+6 |    val out = new ObjectOutputStream(println)
+  |                                     ^^^^^^^
+  |method println is eta-expanded even though java.io.OutputStream does not have the @FunctionalInterface annotation.
diff --git a/tests/neg/i4004.scala b/tests/neg/i4004.scala
new file mode 100644
index 000000000000..bf757a0863a7
--- /dev/null
+++ b/tests/neg/i4004.scala
@@ -0,0 +1,16 @@
+@main def Test =
+  "a".isInstanceOf[Null] // error
+  null.isInstanceOf[Null] // error
+  "a".isInstanceOf[Nothing] // error
+  "a".isInstanceOf[Singleton] // error
+
+  "a" match
+  case _: Null => () // error
+  case _: Nothing => () // error
+  case _: Singleton => () // error
+  case _ => ()
+
+  null match
+  case _: Null => () // error
+  case _ => ()
+
diff --git a/tests/neg/i4241.scala b/tests/neg/i4241.scala
deleted file mode 100644
index 3d93a44a015a..000000000000
--- a/tests/neg/i4241.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-class Test {
-  def test: Unit = {
-    val a: PartialFunction[Int, Int] = { case x => x }
-    val b: PartialFunction[Int, Int] = x => x match { case 1 => 1; case _ => 2 }
-    val c: PartialFunction[Int, Int] = x => { x match { case y => y } }
-    val d: PartialFunction[Int, Int] = x => { { x match { case y => y } } }
-
-    val e: PartialFunction[Int, Int] = x => { println("foo"); x match { case y => y } } // error
-    val f: PartialFunction[Int, Int] = x => x // error
-    val g: PartialFunction[Int, String] = { x => x.toString } // error
-  }
-}
diff --git a/tests/neg/i4373.scala b/tests/neg/i4373.scala
index 2a7d0586f9d6..458dfc09c150 100644
--- a/tests/neg/i4373.scala
+++ b/tests/neg/i4373.scala
@@ -15,8 +15,8 @@ class A4 extends _ with Base // error
 
 object Test {
   type T1 = _ // error
-  type T2 = _[Int] // error // error
-  type T3 = _ { type S } // error // error
+  type T2 = _[Int] // error
+  type T3 = _ { type S } // error
   type T4 = [X] =>> _ // error
 
   // Open questions:
diff --git a/tests/neg/i4382.check b/tests/neg/i4382.check
index 3d21702ffe0f..4905638ab62a 100644
--- a/tests/neg/i4382.check
+++ b/tests/neg/i4382.check
@@ -2,23 +2,23 @@
 3 |  def v1: Id[_] = ??? // error
   |          ^^^^^
   |          unreducible application of higher-kinded type App.Id to wildcard arguments
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E043] Type Error: tests/neg/i4382.scala:6:10 -----------------------------------------------------------------------
 6 |  def v2: HkL[_] = ??? // error
   |          ^^^^^^
   |          unreducible application of higher-kinded type App.HkL to wildcard arguments
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E043] Type Error: tests/neg/i4382.scala:9:10 -----------------------------------------------------------------------
 9 |  def v3: HkU[_] = ???  // error
   |          ^^^^^^
   |          unreducible application of higher-kinded type App.HkU to wildcard arguments
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E043] Type Error: tests/neg/i4382.scala:12:10 ----------------------------------------------------------------------
 12 |  def v4: HkAbs[_] = ??? // error
    |          ^^^^^^^^
    |          unreducible application of higher-kinded type App.HkAbs to wildcard arguments
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i4986a.check b/tests/neg/i4986a.check
index 5375d0fd002b..3aac0a7b2cf3 100644
--- a/tests/neg/i4986a.check
+++ b/tests/neg/i4986a.check
@@ -4,6 +4,6 @@
   |Cannot construct a collection of type List[String] with elements of type Int based on a collection of type List[Int]..
   |I found:
   |
-  |    collection.BuildFrom.buildFromIterableOps[Nothing, Nothing, Nothing]
+  |    collection.BuildFrom.buildFromIterableOps[CC, A0, A]
   |
   |But method buildFromIterableOps in trait BuildFromLowPriority2 does not match type collection.BuildFrom[List[Int], Int, List[String]].
diff --git a/tests/neg/i4986c.check b/tests/neg/i4986c.check
index b93a5520b021..a5fe0cee26bf 100644
--- a/tests/neg/i4986c.check
+++ b/tests/neg/i4986c.check
@@ -61,4 +61,4 @@
 -- Error: tests/neg/i4986c.scala:62:19 ---------------------------------------------------------------------------------
 62 |  i.m[Option[Long]] // error
    |                   ^
-   |                   String; List; [A, _$6] =>> List[Option[?]]; Int; Option[Long]; 
+   |                   String; List; [A, _] =>> List[Option[?]]; Int; Option[Long]; 
diff --git a/tests/neg/i5005.scala b/tests/neg/i5005.scala
index 1734f79d934c..93ca0900fbb0 100644
--- a/tests/neg/i5005.scala
+++ b/tests/neg/i5005.scala
@@ -3,4 +3,4 @@ case class i0 (i0: i1) extends AnyVal // error
 trait i1 extends i0   // error
 
 trait F[x] extends AnyVal    // error
-case class G[x](a: F[x]) extends F[x] // error // error
+case class G[x](a: F[x]) extends F[x] // error
diff --git a/tests/run/i5094.scala b/tests/neg/i5094.scala
similarity index 81%
rename from tests/run/i5094.scala
rename to tests/neg/i5094.scala
index 556a1f0f07df..755e81addf09 100644
--- a/tests/run/i5094.scala
+++ b/tests/neg/i5094.scala
@@ -9,7 +9,7 @@ trait SOIO extends IO {
 }
 trait SOSO extends SOIO with SO
 abstract class AS extends SO
-class L extends AS with SOSO
+class L extends AS with SOSO // error: cannot override final member
 object Test {
   def main(args: Array[String]): Unit = {
     new L
diff --git a/tests/neg/i5101.check b/tests/neg/i5101.check
index 151b8cf2dd4e..4f4bac89aa44 100644
--- a/tests/neg/i5101.check
+++ b/tests/neg/i5101.check
@@ -2,5 +2,5 @@
 11 |      case A0(_) =>     // error
    |           ^^
    |           Not found: A0
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i5311.check b/tests/neg/i5311.check
index bd2940afc7a9..eb9122b94ed6 100644
--- a/tests/neg/i5311.check
+++ b/tests/neg/i5311.check
@@ -3,5 +3,5 @@
    |        ^^^^^^^^^^^^^^^^^^^
    |        Found:    s.T[Int] => s.T[Int]
    |        Required: m.Foo
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i6183.check b/tests/neg/i6183.check
index acb2a58766ec..70c1afaae621 100644
--- a/tests/neg/i6183.check
+++ b/tests/neg/i6183.check
@@ -17,5 +17,5 @@
   |     [B](b: B)(using x$2: DummyImplicit): Char
   |     [A](a: A): String
   |    both match arguments ((42 : Int))
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i6205.check b/tests/neg/i6205.check
index caca487ee2db..9f35c21b5ef3 100644
--- a/tests/neg/i6205.check
+++ b/tests/neg/i6205.check
@@ -2,5 +2,5 @@
 4 |  def foo =   // error
   |         ^
   |         Type argument Nothing does not conform to lower bound Null in inferred type Contra[Nothing]
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i6662.scala b/tests/neg/i6662.scala
deleted file mode 100644
index ccad0675da71..000000000000
--- a/tests/neg/i6662.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-opaque type Opt[A >: Null] = A
-
-extension [A >: Null](x: Opt[A]) inline def nonEmpty: Boolean = x.get != null // error: Implementation restriction
-extension [A >: Null](x: Opt[A]) inline def isEmpty: Boolean = x.get == null // error: Implementation restriction
-extension [A >: Null](x: Opt[A]) inline def isDefined: Boolean = x.nonEmpty // error: Implementation restriction
-extension [A >: Null](x: Opt[A]) inline def get: A = Opt.unOpt(x) // error: Implementation restriction
-
-object Opt
-{
-    inline def unOpt[A >: Null](x: Opt[A]): A = x // error: Implementation restriction
-    inline def apply[A >: Null](x: A): Opt[A] = x // error: Implementation restriction
-    inline def some[A >: Null](x: A): Opt[A] = x // error: Implementation restriction
-    inline def none[A >: Null]: Opt[A] = null // error: Implementation restriction
-    inline def fromOption[A >: Null](x: Option[A]) = x.orNull // error: Implementation restriction
-}
diff --git a/tests/neg/i6762b.check b/tests/neg/i6762b.check
index 9c0d571dd77b..a844fcf280bf 100644
--- a/tests/neg/i6762b.check
+++ b/tests/neg/i6762b.check
@@ -3,5 +3,5 @@
   |                                       ^^^^^^^^^^^
   |                                       Found:    Expr[String]
   |                                       Required: Expr[G[String]]
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i6779.check b/tests/neg/i6779.check
index d2953c80f2b4..d895203221ec 100644
--- a/tests/neg/i6779.check
+++ b/tests/neg/i6779.check
@@ -3,8 +3,8 @@
    |                             ^^^^^^^^^^^^^^^^^^^^^^^^
    |                             Found:    F[T]
    |                             Required: F[G[T]]
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E008] Not Found Error: tests/neg/i6779.scala:12:31 -----------------------------------------------------------------
 12 |  def g2[T](x: T): F[G[T]] = x.f // error
    |                             ^^^
@@ -20,5 +20,5 @@ longer explanation available when compiling with `-explain`
    |                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |                             Found:    F[T]
    |                             Required: F[G[T]]
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i6854.scala b/tests/neg/i6854.scala
deleted file mode 100644
index 5eb0f8bf6028..000000000000
--- a/tests/neg/i6854.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-object Test {
-  import Lib.*
-  val xs: IArray2[Int] = IArray2(1)
-}
-
-object Lib {
-  opaque type IArray2[+T] = Array[_ <: T]
-
-  object IArray2 {
-    inline def apply(x: =>Int): IArray2[Int] = Array(x) // error
-  }
-}
diff --git a/tests/neg/i7056.check b/tests/neg/i7056.check
deleted file mode 100644
index 2dff4dc66b13..000000000000
--- a/tests/neg/i7056.check
+++ /dev/null
@@ -1,7 +0,0 @@
--- [E008] Not Found Error: tests/neg/i7056.scala:19:10 -----------------------------------------------------------------
-19 |val z = x.idnt1  // error
-   |        ^^^^^^^
-   |        value idnt1 is not a member of B.
-   |        An extension method was tried, but could not be fully constructed:
-   |
-   |            i7056$package.given_T1_T[T](given_PartialId_B).idnt1()
diff --git a/tests/neg/i7195.check b/tests/neg/i7195.check
index 0d393ca0e979..3c95a2073b58 100644
--- a/tests/neg/i7195.check
+++ b/tests/neg/i7195.check
@@ -6,5 +6,5 @@
    |
    |        where:    T  is a type in object B
    |                  T² is a type in object A
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i7325.scala b/tests/neg/i7325.scala
new file mode 100644
index 000000000000..a47d416aaedb
--- /dev/null
+++ b/tests/neg/i7325.scala
@@ -0,0 +1,9 @@
+import scala.collection._
+
+class MySeq[A](private val underlying: Seq[A]) // error
+  extends Seq[A]
+  with SeqOps[A, MySeq, MySeq[A]] {
+  def apply(n: Int) = underlying(n)
+  def iterator = underlying.iterator
+  def length = underlying.size
+}
diff --git a/tests/neg/i7359-f.check b/tests/neg/i7359-f.check
index d85a5fd0ad2e..5eabb4e1dd8c 100644
--- a/tests/neg/i7359-f.check
+++ b/tests/neg/i7359-f.check
@@ -2,7 +2,7 @@
 1 |trait SAMTrait: // error
   |      ^
   |      Name clash between inherited members:
-  |      def equals: [T >: Boolean <: Boolean](obj: Any): T in trait SAMTrait at line 3 and
+  |      def equals[T >: Boolean <: Boolean](obj: Any): T in trait SAMTrait at line 3 and
   |      def equals(x$0: Any): Boolean in class Any
   |      have the same type after erasure.
   |
diff --git a/tests/neg/i7359-g.check b/tests/neg/i7359-g.check
index 43257ae2a596..e3f0c89715e4 100644
--- a/tests/neg/i7359-g.check
+++ b/tests/neg/i7359-g.check
@@ -3,5 +3,5 @@
   |                   ^^^^^^^^^^^^^
   |                   Found:    () => String
   |                   Required: SAMTrait
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i7597.scala b/tests/neg/i7597.scala
index 8b18b82b1db4..cc41a3c77e2d 100644
--- a/tests/neg/i7597.scala
+++ b/tests/neg/i7597.scala
@@ -6,8 +6,8 @@ object Test extends App {
     def apply(x: A): B
   }
 
-  class C[S <: String] extends Fn[String, Int] {
-    def apply(s: S): Int = 0 // error
+  class C[S <: String] extends Fn[String, Int] { // error
+    def apply(s: S): Int = 0
   }
 
   foo("")
diff --git a/tests/neg/i7745.scala b/tests/neg/i7745.scala
new file mode 100644
index 000000000000..7b54be159661
--- /dev/null
+++ b/tests/neg/i7745.scala
@@ -0,0 +1,3 @@
+trait F[x]
+implicit def foo[f[_], y, x <: f[y]](implicit ev: F[y]): F[x] = ???
+val test = implicitly // error
\ No newline at end of file
diff --git a/tests/neg/i7891.scala b/tests/neg/i7891.scala
new file mode 100644
index 000000000000..4f305f74cad1
--- /dev/null
+++ b/tests/neg/i7891.scala
@@ -0,0 +1,6 @@
+// was previously ok in one compilation unit
+def f22 = "hello, world"
+
+package p {
+  @main def m = println(f22)  // error
+}
diff --git a/tests/neg/i8569.check b/tests/neg/i8569.check
index c33cb68d750c..89173e1a8334 100644
--- a/tests/neg/i8569.check
+++ b/tests/neg/i8569.check
@@ -2,5 +2,5 @@
 13 |  val x = outer.Inner(2) // error (at posttyper)
    |          ^^^^^^^^^^^^^^
    |          Outer is not a valid class prefix, since it is not an immutable path
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i8569a.check b/tests/neg/i8569a.check
index b6ba88cba3b6..966e80133d31 100644
--- a/tests/neg/i8569a.check
+++ b/tests/neg/i8569a.check
@@ -2,5 +2,5 @@
 13 |  val x = new outer2.Inner(2) // error (at typer)
    |              ^^^^^^
    |              (Test.outer2 : => Outer2) is not a valid type prefix, since it is not an immutable path
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i8623.check b/tests/neg/i8623.check
index 9b9a20ce7bf5..b9d6e244e70e 100644
--- a/tests/neg/i8623.check
+++ b/tests/neg/i8623.check
@@ -7,5 +7,5 @@
    |  But the part corresponding to `<skolem>` is not a reference that can be generated.
    |  This might be because resolution yielded as given instance a function that is not
    |  known to be total and side-effect free.
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i8731.scala b/tests/neg/i8731.scala
index 0d4886c553ec..7eddcd42c030 100644
--- a/tests/neg/i8731.scala
+++ b/tests/neg/i8731.scala
@@ -11,9 +11,9 @@ object test:
   end if
   else     // error: illegal start of definition
     ()
-  end if   // error: misaligned end marker
+  end if
 
   class Test {
     val test = 3
-  end Test // error: misaligned end marker
-  }  // error: eof expected, but unindent found
\ No newline at end of file
+  end Test
+  }
\ No newline at end of file
diff --git a/tests/neg/i8736.check b/tests/neg/i8736.check
index 80986464d035..e7a0d62cb4af 100644
--- a/tests/neg/i8736.check
+++ b/tests/neg/i8736.check
@@ -3,15 +3,15 @@
    |                      ^^^^^^^^^^^^
    |                      Found:    Any
    |                      Required: String
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg/i8736.scala:30:29 -------------------------------------------------------------
 30 |  def res2: Int     = rec.get("v") // error: type mismatch
    |                      ^^^^^^^^^^^^
    |                      Found:    Any
    |                      Required: Int
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E051] Reference Error: tests/neg/i8736.scala:31:26 -----------------------------------------------------------------
 31 |  def res3: Boolean = rec.get("z") // error: ambiguous
    |                      ^^^^^^^
@@ -22,5 +22,5 @@ longer explanation available when compiling with `-explain`
    |                all match arguments (("z" : String))
    |
    |                Note: Overloaded definitions introduced by refinements cannot be resolved
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i8752.check b/tests/neg/i8752.check
index 6d1cf47aa2fd..3ccdee55e676 100644
--- a/tests/neg/i8752.check
+++ b/tests/neg/i8752.check
@@ -3,9 +3,9 @@
   |                                         ^^^^
   |                                         C does not take type parameters
   |                                         (Note that F-bounds of type parameters may not be type lambdas)
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- Error: tests/neg/i8752.scala:3:39 -----------------------------------------------------------------------------------
 3 |trait Arround1[C <:[X]=>>IterableOps[X,C,C[X]] ] // error // error
   |                                       ^
-  |                                       Type argument C does not have the same kind as its bound [_]
+  |                                       Type argument C does not have the same kind as its bound [_$$1]
diff --git a/tests/neg/i8900.scala b/tests/neg/i8900.scala
new file mode 100644
index 000000000000..c82f9cd18aa5
--- /dev/null
+++ b/tests/neg/i8900.scala
@@ -0,0 +1,28 @@
+trait Base {
+  type M
+}
+trait A {
+  type M >: Int | String
+}
+trait B {
+  type M <: Int & String
+}
+object Test {
+  def foo[T](z: T, x: A & B => T): T = z
+  def foo2[T](z: T, x: T): T = z
+
+  def main(args: Array[String]): Unit = {
+    val x = foo(1, x => (??? : x.M))
+    val x1: String = x // error (was: ClassCastException)
+
+    val a = foo2(1,
+      if false then
+        val x: A & B = ???
+        ??? : x.M
+      else 1
+    )
+
+    val b: String = a // error (was: ClassCastException)
+  }
+}
+
diff --git a/tests/neg/i8988.check b/tests/neg/i8988.check
index 6952837128ed..d34e2cfd0047 100644
--- a/tests/neg/i8988.check
+++ b/tests/neg/i8988.check
@@ -3,5 +3,5 @@
   |                 ^^
   |                 Found:    (ys : List[Int])
   |                 Required: String
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i9329.check b/tests/neg/i9329.check
index 8ddb0768a119..7e4968edf607 100644
--- a/tests/neg/i9329.check
+++ b/tests/neg/i9329.check
@@ -1,5 +1,5 @@
 -- Error: tests/neg/i9329.scala:8:6 ------------------------------------------------------------------------------------
 8 |class GrandSon extends Son // error
   |      ^
-  |class GrandSon needs to be abstract, since def name: => String in trait Parent is not defined 
-  |(The class implements abstract override def name: => String in trait Son but that definition still needs an implementation)
+  |class GrandSon needs to be abstract, since def name: String in trait Parent is not defined 
+  |(The class implements abstract override def name: String in trait Son but that definition still needs an implementation)
diff --git a/tests/neg/i9330.scala b/tests/neg/i9330.scala
index 6ba57c033473..ca25582ef7e8 100644
--- a/tests/neg/i9330.scala
+++ b/tests/neg/i9330.scala
@@ -1,4 +1,4 @@
 val x = {
-  () == ""
+  () == "" // error
   implicit def foo[A: A] // error // error // error
 }
diff --git a/tests/neg/i9436.check b/tests/neg/i9436.check
index 8938dbacb6cb..b5f9b5c470b1 100644
--- a/tests/neg/i9436.check
+++ b/tests/neg/i9436.check
@@ -2,8 +2,8 @@
 8 |  println(x.f1)    // error
   |          ^^^^
   |          method f1 must be called with () argument
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- Error: tests/neg/i9436.scala:9:14 -----------------------------------------------------------------------------------
 9 |  println(x.f2(1)) // error
   |          ^^^^^^^
diff --git a/tests/neg/i9437.check b/tests/neg/i9437.check
index d0b2226e5a0c..3bac99b07571 100644
--- a/tests/neg/i9437.check
+++ b/tests/neg/i9437.check
@@ -2,5 +2,5 @@
 7 |  println(x.f1())  // error
   |          ^^^^
   |          method selectDynamic in trait Selectable does not take parameters
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i9460.check b/tests/neg/i9460.check
new file mode 100644
index 000000000000..2d1c08f6cf4d
--- /dev/null
+++ b/tests/neg/i9460.check
@@ -0,0 +1,5 @@
+-- Error: tests/neg/i9460.scala:3:6 ------------------------------------------------------------------------------------
+3 |class C extends B  // error
+  |      ^
+  |      parameterized trait A is indirectly implemented,
+  |      needs to be implemented directly so that arguments can be passed
diff --git a/tests/neg/i9460.scala b/tests/neg/i9460.scala
new file mode 100644
index 000000000000..9cc08bf2ad4d
--- /dev/null
+++ b/tests/neg/i9460.scala
@@ -0,0 +1,4 @@
+trait A(val s: String) { println(s) }
+trait B extends A { override val s = "B" } // requires override val s
+class C extends B  // error
+@main def Test = C()
diff --git a/tests/neg/i9568.check b/tests/neg/i9568.check
index 737abcf21d41..1173d483ed02 100644
--- a/tests/neg/i9568.check
+++ b/tests/neg/i9568.check
@@ -1,9 +1,12 @@
 -- Error: tests/neg/i9568.scala:13:10 ----------------------------------------------------------------------------------
 13 |  blaMonad.foo(bla) // error: diverges
    |          ^
-   |          no implicit argument of type => Monad[F] was found for parameter ev of method blaMonad in object Test.
+   |          no implicit argument of type => Monad[F] was found for parameter ev of method blaMonad in object Test
+   |
+   |          where:    F is a type variable with constraint <: [_] =>> Any
+   |          .
    |          I found:
    |
-   |              Test.blaMonad[Nothing, S](Test.blaMonad[F, S])
+   |              Test.blaMonad[F, S](Test.blaMonad[F, S])
    |
-   |          But method blaMonad in object Test does not match type => Monad[Nothing].
+   |          But method blaMonad in object Test does not match type => Monad[F].
diff --git a/tests/pos/i9740c.scala b/tests/neg/i9740c.scala
similarity index 92%
rename from tests/pos/i9740c.scala
rename to tests/neg/i9740c.scala
index 968355711e19..87881c9b20d7 100644
--- a/tests/pos/i9740c.scala
+++ b/tests/neg/i9740c.scala
@@ -11,6 +11,6 @@ class Foo {
   def bar[A <: Txn[A]](x: Exp[A]): Unit = x match
     case IntExp(x) =>
     case StrExp(x) =>
-    case UnitExp =>
+    case UnitExp => // error
     case Obj(o) =>
 }
diff --git a/tests/neg/i9740d.scala b/tests/neg/i9740d.scala
new file mode 100644
index 000000000000..9f2490b697b6
--- /dev/null
+++ b/tests/neg/i9740d.scala
@@ -0,0 +1,11 @@
+sealed trait Exp[T]
+case class IntExp(x: Int) extends Exp[Int]
+case class StrExp(x: String) extends Exp[String]
+object UnitExp extends Exp[Unit]
+
+class Foo[U <: Int, T <: U] {
+  def bar[A <: T](x: Exp[A]): Unit = x match
+    case IntExp(x) =>
+    case StrExp(x) =>
+    case UnitExp => // error
+}
diff --git a/tests/neg/i9803.check b/tests/neg/i9803.check
index 57e184487504..cc7d56d585b0 100644
--- a/tests/neg/i9803.check
+++ b/tests/neg/i9803.check
@@ -4,5 +4,5 @@
    |          Reference to f421 is ambiguous,
    |          it is both imported by name by import bugs.shadowing.x.f421
    |          and imported by name subsequently by import bugs.shadowing.y.f421
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i9958.check b/tests/neg/i9958.check
index 3657c466dc8b..4da24bb23c7e 100644
--- a/tests/neg/i9958.check
+++ b/tests/neg/i9958.check
@@ -7,5 +7,5 @@
   |          ^
   |          Found:    G[[A <: Int] =>> List[A]]
   |          Required: G[List]
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/if-error.check b/tests/neg/if-error.check
index c2f1b02b2067..d8350da1872b 100644
--- a/tests/neg/if-error.check
+++ b/tests/neg/if-error.check
@@ -4,5 +4,5 @@
   |  Found:    Unit
   |  Required: Int
   |  Maybe you are missing an else part for the conditional?
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/implicit-package-object.scala b/tests/neg/implicit-package-object.scala
index 1af3b413e04a..7b73d620b9b8 100644
--- a/tests/neg/implicit-package-object.scala
+++ b/tests/neg/implicit-package-object.scala
@@ -1,6 +1,9 @@
-trait ToString[A] {
-  def print(a: A): Unit
-}
+package toString:
+  trait ToString[A] {
+    def print(a: A): Unit
+  }
+
+import toString._
 
 package A {
   case class AA(text: String)
diff --git a/tests/neg/implicit-params.scala b/tests/neg/implicit-params.scala
index 0282f34e098f..e1d846ca851e 100644
--- a/tests/neg/implicit-params.scala
+++ b/tests/neg/implicit-params.scala
@@ -11,8 +11,8 @@ object Test {
 
   def h(x: Int) given () = x // error: missing return type
 
-  given C: C(11) with {}
-  given D: D(11) with {}
+  given C: C(11)
+  given D: D(11)
 
   f(1)
   f(1)(using C)
diff --git a/tests/neg/implicitSearch.check b/tests/neg/implicitSearch.check
index efc3ac002739..9ff67e2c2638 100644
--- a/tests/neg/implicitSearch.check
+++ b/tests/neg/implicitSearch.check
@@ -4,7 +4,7 @@
    |   no implicit argument of type Test.Ord[List[List[T]]] was found for parameter o of method sort in object Test.
    |   I found:
    |
-   |       Test.listOrd[T](Test.listOrd[T](/* missing */summon[Test.Ord[T]]))
+   |       Test.listOrd[List[T]](Test.listOrd[T](/* missing */summon[Test.Ord[T]]))
    |
    |   But no implicit values were found that match type Test.Ord[T].
 -- Error: tests/neg/implicitSearch.scala:15:38 -------------------------------------------------------------------------
diff --git a/tests/neg/indent.scala b/tests/neg/indent.scala
index 66ad2c7ca957..e6d6550bee19 100644
--- a/tests/neg/indent.scala
+++ b/tests/neg/indent.scala
@@ -2,7 +2,7 @@ object Test {
 
   extension (x: Int) def gt(y: Int) = x > y
   val y3 =
-    if (1) max 10 gt 0  // error: end of statement expected but integer literal found // error // error // error
+    if (1) max 10 gt 0  // error: end of statement expected but integer literal found // error // error
       1
     else
       2
diff --git a/tests/neg/inline-error-pos.check b/tests/neg/inline-error-pos.check
index 121684fe14d6..5d2225903a8d 100644
--- a/tests/neg/inline-error-pos.check
+++ b/tests/neg/inline-error-pos.check
@@ -4,4 +4,11 @@
   |          cannot reduce inline match with
   |           scrutinee:  2 : (2 : Int)
   |           patterns :  case 1
-  | This location contains code that was inlined from inline-error-pos.scala:3
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from inline-error-pos.scala:3
+3 |  inline x match
+  |         ^
+4 |    case 1 => 9
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/inline3.scala b/tests/neg/inline3.scala
deleted file mode 100644
index 90a8ea9bb788..000000000000
--- a/tests/neg/inline3.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-object K0 {
-
-  type T = String
-
-  opaque type ProductInstances[F[_], T] = ErasedProductInstances[F[T]]
-
-  inline def summonAsArray[F[_], T]: Array[Any] = ??? // error: Implementation restriction: No inline methods allowed
-
-  inline def mkProductInstances[F[_], T]: ProductInstances[F, T] = // error: Implementation restriction: No inline methods allowed
-    new ErasedProductInstances(summonAsArray[F, T]).asInstanceOf[ProductInstances[F, T]]
-
-  val x: T = ""
-
-  inline def foo(x: T): T = "foo".asInstanceOf[T] // error: Implementation restriction: No inline methods allowed
-
-}
-
-final class ErasedProductInstances[FT](is0: => Array[Any])
-
-trait Monoid[A]
-case class ISB(i: Int)
-
-object Test {
-  //val K0 = new K0
-  K0.foo(K0.x)
-  K0.mkProductInstances[Monoid, ISB]
-
-}
\ No newline at end of file
diff --git a/tests/neg/interpolator-dollar.check b/tests/neg/interpolator-dollar.check
new file mode 100644
index 000000000000..2de0c843725e
--- /dev/null
+++ b/tests/neg/interpolator-dollar.check
@@ -0,0 +1,4 @@
+-- Error: tests/neg/interpolator-dollar.scala:5:20 ---------------------------------------------------------------------
+5 |  def oops = f"$s%s $<s" // error: invalid string interpolation
+  |                    ^
+  |                    invalid string interpolation: `$$`, `$"`, `$`ident or `$`BlockExpr expected
diff --git a/tests/neg/interpolator-dollar.scala b/tests/neg/interpolator-dollar.scala
new file mode 100644
index 000000000000..b22bd58220b8
--- /dev/null
+++ b/tests/neg/interpolator-dollar.scala
@@ -0,0 +1,6 @@
+
+trait T {
+  def s = { println("SSS") ; "hello" }
+  def ok = String.format("%s, %<s", s)
+  def oops = f"$s%s $<s" // error: invalid string interpolation
+}
diff --git a/tests/neg/kinds2.check b/tests/neg/kinds2.check
index 2921c7baf022..3a978c635836 100644
--- a/tests/neg/kinds2.check
+++ b/tests/neg/kinds2.check
@@ -2,5 +2,5 @@
 14 |  f[C] // error: missing type parameter(s)
    |    ^
    |    Missing type parameter for Test.C
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/leading-infix-miss.check b/tests/neg/leading-infix-miss.check
index df9c4d8dd3e0..c6bfa458d1ad 100644
--- a/tests/neg/leading-infix-miss.check
+++ b/tests/neg/leading-infix-miss.check
@@ -11,5 +11,5 @@
   |        ^
   |        Found:    Unit
   |        Required: Boolean
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/literals.scala b/tests/neg/literals.scala
index 4b847a74df66..8e062c19351b 100644
--- a/tests/neg/literals.scala
+++ b/tests/neg/literals.scala
@@ -2,7 +2,7 @@ trait RejectedLiterals {
   def missingHex: Int    = { 0x }        // error: invalid literal number
 }
 /*
-// scalac: -Ywarn-octal-literal -Xfatal-warnings -deprecation
+// nsc: -Ywarn-octal-literal -Xfatal-warnings -deprecation
 trait RejectedLiterals {
 
   def missingHex: Int    = { 0x }        // line 4: was: not reported, taken as zero
diff --git a/tests/neg/manifest-summoning.scala b/tests/neg/manifest-summoning.scala
new file mode 100644
index 000000000000..c08e1cefaa91
--- /dev/null
+++ b/tests/neg/manifest-summoning.scala
@@ -0,0 +1,27 @@
+val `Array[Nothing]` = manifest[Array[Nothing]] // error
+val `Array[Null]` = manifest[Array[Null]] // error
+val m_Nothing = manifest[Nothing] // error
+val m_Null = manifest[Null] // error
+
+val `Array[? <: Nothing]` = manifest[Array[? <: Nothing]] // error
+val `Array[? <: Null]` = manifest[Array[? <: Null]] // error
+
+val `Int @unchecked` = manifest[Int @unchecked] // error
+
+val `0 | 1` = manifest[0 | 1] // error
+
+class Box[T] {
+  val m = manifest[T] // error
+}
+
+object Foo {
+  type F[T] <: T
+  manifest[Array[F[Int]]] // error
+}
+
+object opaques {
+  opaque type OpaqueList[+A] = List[A]
+}
+import opaques.*
+
+val `OpaqueList[Int]` = manifest[OpaqueList[Int]] // error (opaque types are not supported)
diff --git a/tests/neg/match-infix.scala b/tests/neg/match-infix.scala
index 12b57f4dc418..267dfbb720b7 100644
--- a/tests/neg/match-infix.scala
+++ b/tests/neg/match-infix.scala
@@ -1,3 +1,3 @@
 def f = 1 + 1 match {
   case 2 => 3
-} + 1   // error // error
+} + 1   // error
diff --git a/tests/neg/matchtype-seq.check b/tests/neg/matchtype-seq.check
new file mode 100644
index 000000000000..aba1e312da01
--- /dev/null
+++ b/tests/neg/matchtype-seq.check
@@ -0,0 +1,473 @@
+-- Error: tests/neg/matchtype-seq.scala:9:11 ---------------------------------------------------------------------------
+9 |  identity[T1[3]]("") // error
+  |           ^
+  |           Match type reduction failed since selector  (3 : Int)
+  |           matches none of the cases
+  |
+  |               case (1 : Int) => Int
+  |               case (2 : Int) => String
+-- Error: tests/neg/matchtype-seq.scala:10:11 --------------------------------------------------------------------------
+10 |  identity[T1[3]](1) // error
+   |           ^
+   |           Match type reduction failed since selector  (3 : Int)
+   |           matches none of the cases
+   |
+   |               case (1 : Int) => Int
+   |               case (2 : Int) => String
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:11:20 -----------------------------------------------------
+11 |  identity[T1[Int]]("") // error
+   |                    ^^
+   |                    Found:    ("" : String)
+   |                    Required: Test.T1[Int]
+   |
+   |                    Note: a match type could not be fully reduced:
+   |
+   |                      trying to reduce  Test.T1[Int]
+   |                      failed since selector  Int
+   |                      does not match  case (1 : Int) => Int
+   |                      and cannot be shown to be disjoint from it either.
+   |                      Therefore, reduction cannot advance to the remaining case
+   |
+   |                        case (2 : Int) => String
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:12:20 -----------------------------------------------------
+12 |  identity[T1[Int]](1) // error
+   |                    ^
+   |                    Found:    (1 : Int)
+   |                    Required: Test.T1[Int]
+   |
+   |                    Note: a match type could not be fully reduced:
+   |
+   |                      trying to reduce  Test.T1[Int]
+   |                      failed since selector  Int
+   |                      does not match  case (1 : Int) => Int
+   |                      and cannot be shown to be disjoint from it either.
+   |                      Therefore, reduction cannot advance to the remaining case
+   |
+   |                        case (2 : Int) => String
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:21:20 -----------------------------------------------------
+21 |  identity[T2[Int]]("") // error
+   |                    ^^
+   |                    Found:    ("" : String)
+   |                    Required: Test.T2[Int]
+   |
+   |                    Note: a match type could not be fully reduced:
+   |
+   |                      trying to reduce  Test.T2[Int]
+   |                      failed since selector  Int
+   |                      does not match  case (1 : Int) => Int
+   |                      and cannot be shown to be disjoint from it either.
+   |                      Therefore, reduction cannot advance to the remaining case
+   |
+   |                        case _ => String
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:22:18 -----------------------------------------------------
+22 |  identity[T2[2]](1) // error
+   |                  ^
+   |                  Found:    (1 : Int)
+   |                  Required: String
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:23:20 -----------------------------------------------------
+23 |  identity[T2[Int]](1) // error
+   |                    ^
+   |                    Found:    (1 : Int)
+   |                    Required: Test.T2[Int]
+   |
+   |                    Note: a match type could not be fully reduced:
+   |
+   |                      trying to reduce  Test.T2[Int]
+   |                      failed since selector  Int
+   |                      does not match  case (1 : Int) => Int
+   |                      and cannot be shown to be disjoint from it either.
+   |                      Therefore, reduction cannot advance to the remaining case
+   |
+   |                        case _ => String
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:36:18 -----------------------------------------------------
+36 |  identity[T3[A]](1) // error
+   |                  ^
+   |                  Found:    (1 : Int)
+   |                  Required: Test.T3[Test.A]
+   |
+   |                  Note: a match type could not be fully reduced:
+   |
+   |                    trying to reduce  Test.T3[Test.A]
+   |                    failed since selector  Test.A
+   |                    does not match  case Test.B => Int
+   |                    and cannot be shown to be disjoint from it either.
+   |                    Therefore, reduction cannot advance to the remaining case
+   |
+   |                      case Test.C => String
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:37:18 -----------------------------------------------------
+37 |  identity[T3[A]]("") // error
+   |                  ^^
+   |                  Found:    ("" : String)
+   |                  Required: Test.T3[Test.A]
+   |
+   |                  Note: a match type could not be fully reduced:
+   |
+   |                    trying to reduce  Test.T3[Test.A]
+   |                    failed since selector  Test.A
+   |                    does not match  case Test.B => Int
+   |                    and cannot be shown to be disjoint from it either.
+   |                    Therefore, reduction cannot advance to the remaining case
+   |
+   |                      case Test.C => String
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:55:18 -----------------------------------------------------
+55 |  identity[T5[A]](1) // error
+   |                  ^
+   |                  Found:    (1 : Int)
+   |                  Required: Test.T5[Test.A]
+   |
+   |                  Note: a match type could not be fully reduced:
+   |
+   |                    trying to reduce  Test.T5[Test.A]
+   |                    failed since selector  Test.A
+   |                    does not match  case Test.C => String
+   |                    and cannot be shown to be disjoint from it either.
+   |                    Therefore, reduction cannot advance to the remaining case
+   |
+   |                      case Test.A => Int
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:56:18 -----------------------------------------------------
+56 |  identity[T5[A]]("") // error
+   |                  ^^
+   |                  Found:    ("" : String)
+   |                  Required: Test.T5[Test.A]
+   |
+   |                  Note: a match type could not be fully reduced:
+   |
+   |                    trying to reduce  Test.T5[Test.A]
+   |                    failed since selector  Test.A
+   |                    does not match  case Test.C => String
+   |                    and cannot be shown to be disjoint from it either.
+   |                    Therefore, reduction cannot advance to the remaining case
+   |
+   |                      case Test.A => Int
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:82:18 -----------------------------------------------------
+82 |  identity[T7[D]]("") // error
+   |                  ^^
+   |                  Found:    ("" : String)
+   |                  Required: Test.T7[Test.D]
+   |
+   |                  Note: a match type could not be fully reduced:
+   |
+   |                    trying to reduce  Test.T7[Test.D]
+   |                    failed since selector  Test.D
+   |                    does not match  case Test.A2 => Int
+   |                    and cannot be shown to be disjoint from it either.
+   |                    Therefore, reduction cannot advance to the remaining case
+   |
+   |                      case Test.D => String
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:83:18 -----------------------------------------------------
+83 |  identity[T7[D]](1) // error
+   |                  ^
+   |                  Found:    (1 : Int)
+   |                  Required: Test.T7[Test.D]
+   |
+   |                  Note: a match type could not be fully reduced:
+   |
+   |                    trying to reduce  Test.T7[Test.D]
+   |                    failed since selector  Test.D
+   |                    does not match  case Test.A2 => Int
+   |                    and cannot be shown to be disjoint from it either.
+   |                    Therefore, reduction cannot advance to the remaining case
+   |
+   |                      case Test.D => String
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:94:19 -----------------------------------------------------
+94 |  identity[T8[E2]](1) // error
+   |                   ^
+   |                   Found:    (1 : Int)
+   |                   Required: Test.T8[Test.E2]
+   |
+   |                   Note: a match type could not be fully reduced:
+   |
+   |                     trying to reduce  Test.T8[Test.E2]
+   |                     failed since selector  Test.E2
+   |                     does not match  case Test.E1 => Int
+   |                     and cannot be shown to be disjoint from it either.
+   |                     Therefore, reduction cannot advance to the remaining case
+   |
+   |                       case Test.E2 => String
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:95:19 -----------------------------------------------------
+95 |  identity[T8[E1]]("") // error
+   |                   ^^
+   |                   Found:    ("" : String)
+   |                   Required: Int
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:96:19 -----------------------------------------------------
+96 |  identity[T8[E2]]("") // error
+   |                   ^^
+   |                   Found:    ("" : String)
+   |                   Required: Test.T8[Test.E2]
+   |
+   |                   Note: a match type could not be fully reduced:
+   |
+   |                     trying to reduce  Test.T8[Test.E2]
+   |                     failed since selector  Test.E2
+   |                     does not match  case Test.E1 => Int
+   |                     and cannot be shown to be disjoint from it either.
+   |                     Therefore, reduction cannot advance to the remaining case
+   |
+   |                       case Test.E2 => String
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:105:40 ----------------------------------------------------
+105 |  identity[T9[Tuple2[Nothing, String]]](1) // error
+    |                                        ^
+    |                                        Found:    (1 : Int)
+    |                                        Required: Test.T9[(Nothing, String)]
+    |
+    |                                        Note: a match type could not be fully reduced:
+    |
+    |                                          trying to reduce  Test.T9[(Nothing, String)]
+    |                                          failed since selector  (Nothing, String)
+    |                                          is uninhabited (there are no values of that type).
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:106:40 ----------------------------------------------------
+106 |  identity[T9[Tuple2[String, Nothing]]]("1") // error
+    |                                        ^^^
+    |                                        Found:    ("1" : String)
+    |                                        Required: Test.T9[(String, Nothing)]
+    |
+    |                                        Note: a match type could not be fully reduced:
+    |
+    |                                          trying to reduce  Test.T9[(String, Nothing)]
+    |                                          failed since selector  (String, Nothing)
+    |                                          is uninhabited (there are no values of that type).
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:107:37 ----------------------------------------------------
+107 |  identity[T9[Tuple2[Int, Nothing]]](1) // error
+    |                                     ^
+    |                                     Found:    (1 : Int)
+    |                                     Required: Test.T9[(Int, Nothing)]
+    |
+    |                                     Note: a match type could not be fully reduced:
+    |
+    |                                       trying to reduce  Test.T9[(Int, Nothing)]
+    |                                       failed since selector  (Int, Nothing)
+    |                                       is uninhabited (there are no values of that type).
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:108:37 ----------------------------------------------------
+108 |  identity[T9[Tuple2[Nothing, Int]]]("1") // error
+    |                                     ^^^
+    |                                     Found:    ("1" : String)
+    |                                     Required: Test.T9[(Nothing, Int)]
+    |
+    |                                     Note: a match type could not be fully reduced:
+    |
+    |                                       trying to reduce  Test.T9[(Nothing, Int)]
+    |                                       failed since selector  (Nothing, Int)
+    |                                       is uninhabited (there are no values of that type).
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:109:29 ----------------------------------------------------
+109 |  identity[T9[Tuple2[_, _]]]("") // error
+    |                             ^^
+    |                             Found:    ("" : String)
+    |                             Required: Test.T9[(?, ?)]
+    |
+    |                             Note: a match type could not be fully reduced:
+    |
+    |                               trying to reduce  Test.T9[(?, ?)]
+    |                               failed since selector  (?, ?)
+    |                               does not match  case (Int, String) => Int
+    |                               and cannot be shown to be disjoint from it either.
+    |                               Therefore, reduction cannot advance to the remaining case
+    |
+    |                                 case (String, Int) => String
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:110:29 ----------------------------------------------------
+110 |  identity[T9[Tuple2[_, _]]](1) // error
+    |                             ^
+    |                             Found:    (1 : Int)
+    |                             Required: Test.T9[(?, ?)]
+    |
+    |                             Note: a match type could not be fully reduced:
+    |
+    |                               trying to reduce  Test.T9[(?, ?)]
+    |                               failed since selector  (?, ?)
+    |                               does not match  case (Int, String) => Int
+    |                               and cannot be shown to be disjoint from it either.
+    |                               Therefore, reduction cannot advance to the remaining case
+    |
+    |                                 case (String, Int) => String
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:111:33 ----------------------------------------------------
+111 |  identity[T9[Tuple2[Any, Any]]]("") // error
+    |                                 ^^
+    |                                 Found:    ("" : String)
+    |                                 Required: Test.T9[(Any, Any)]
+    |
+    |                                 Note: a match type could not be fully reduced:
+    |
+    |                                   trying to reduce  Test.T9[(Any, Any)]
+    |                                   failed since selector  (Any, Any)
+    |                                   does not match  case (Int, String) => Int
+    |                                   and cannot be shown to be disjoint from it either.
+    |                                   Therefore, reduction cannot advance to the remaining case
+    |
+    |                                     case (String, Int) => String
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:112:33 ----------------------------------------------------
+112 |  identity[T9[Tuple2[Any, Any]]](1) // error
+    |                                 ^
+    |                                 Found:    (1 : Int)
+    |                                 Required: Test.T9[(Any, Any)]
+    |
+    |                                 Note: a match type could not be fully reduced:
+    |
+    |                                   trying to reduce  Test.T9[(Any, Any)]
+    |                                   failed since selector  (Any, Any)
+    |                                   does not match  case (Int, String) => Int
+    |                                   and cannot be shown to be disjoint from it either.
+    |                                   Therefore, reduction cannot advance to the remaining case
+    |
+    |                                     case (String, Int) => String
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:122:39 ----------------------------------------------------
+122 |  identity[TA[Box2[Int, Int, String]]](1) // error
+    |                                       ^
+    |                                       Found:    (1 : Int)
+    |                                       Required: Test.TA[Test.Box2[Int, Int, String]]
+    |
+    |                                       Note: a match type could not be fully reduced:
+    |
+    |                                         trying to reduce  Test.TA[Test.Box2[Int, Int, String]]
+    |                                         failed since selector  Test.Box2[Int, Int, String]
+    |                                         does not match  case Test.Box2[Int, Int, Int] => Int
+    |                                         and cannot be shown to be disjoint from it either.
+    |                                         Therefore, reduction cannot advance to the remaining case
+    |
+    |                                           case Test.Box2[Int, Int, String] => String
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:123:39 ----------------------------------------------------
+123 |  identity[TA[Box2[Int, Int, String]]]("") // error
+    |                                       ^^
+    |                                       Found:    ("" : String)
+    |                                       Required: Test.TA[Test.Box2[Int, Int, String]]
+    |
+    |                                       Note: a match type could not be fully reduced:
+    |
+    |                                         trying to reduce  Test.TA[Test.Box2[Int, Int, String]]
+    |                                         failed since selector  Test.Box2[Int, Int, String]
+    |                                         does not match  case Test.Box2[Int, Int, Int] => Int
+    |                                         and cannot be shown to be disjoint from it either.
+    |                                         Therefore, reduction cannot advance to the remaining case
+    |
+    |                                           case Test.Box2[Int, Int, String] => String
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:144:41 ----------------------------------------------------
+144 |  identity[TD[Box2_C[Int, Int, String]]]("") // error
+    |                                         ^^
+    |                                         Found:    ("" : String)
+    |                                         Required: Test.TD[Test.Box2_C[Int, Int, String]]
+    |
+    |                                         Note: a match type could not be fully reduced:
+    |
+    |                                           trying to reduce  Test.TD[Test.Box2_C[Int, Int, String]]
+    |                                           failed since selector  Test.Box2_C[Int, Int, String]
+    |                                           does not match  case Test.Box2_C[Int, Int, Int] => Int
+    |                                           and cannot be shown to be disjoint from it either.
+    |                                           Therefore, reduction cannot advance to the remaining case
+    |
+    |                                             case Test.Box2_C[Int, Int, String] => String
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:153:25 ----------------------------------------------------
+153 |  def a[A]: M[Some[A]] = 1  // error
+    |                         ^
+    |                         Found:    (1 : Int)
+    |                         Required: Test2.M[Some[A]]
+    |
+    |                         Note: a match type could not be fully reduced:
+    |
+    |                           trying to reduce  Test2.M[Some[A]]
+    |                           failed since selector  Some[A]
+    |                           does not match  case Option[Int] => String
+    |                           and cannot be shown to be disjoint from it either.
+    |                           Therefore, reduction cannot advance to the remaining case
+    |
+    |                             case Some[_] => Int
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:154:25 ----------------------------------------------------
+154 |  def b[A]: M[Some[A]] = "" // error
+    |                         ^^
+    |                         Found:    ("" : String)
+    |                         Required: Test2.M[Some[A]]
+    |
+    |                         Note: a match type could not be fully reduced:
+    |
+    |                           trying to reduce  Test2.M[Some[A]]
+    |                           failed since selector  Some[A]
+    |                           does not match  case Option[Int] => String
+    |                           and cannot be shown to be disjoint from it either.
+    |                           Therefore, reduction cannot advance to the remaining case
+    |
+    |                             case Some[_] => Int
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:168:23 ----------------------------------------------------
+168 |    val a: M[Inv[A]] = 1 // error
+    |                       ^
+    |                       Found:    (1 : Int)
+    |                       Required: Test3.M[Test3.Inv[A]]
+    |
+    |                       Note: a match type could not be fully reduced:
+    |
+    |                         trying to reduce  Test3.M[Test3.Inv[A]]
+    |                         failed since selector  Test3.Inv[A]
+    |                         does not match  case Test3.Inv[Int] => String
+    |                         and cannot be shown to be disjoint from it either.
+    |                         Therefore, reduction cannot advance to the remaining case
+    |
+    |                           case _ => Int
+    |
+    | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:187:25 ----------------------------------------------------
+187 |      val a: M[Inv[A]] = 1 // error
+    |                         ^
+    |                         Found:    (1 : Int)
+    |                         Required: Test4.M[Test4.Inv[Foo.this.A]]
+    |
+    |                         Note: a match type could not be fully reduced:
+    |
+    |                           trying to reduce  Test4.M[Test4.Inv[Foo.this.A]]
+    |                           failed since selector  Test4.Inv[Foo.this.A]
+    |                           does not match  case Test4.Inv[Int] => String
+    |                           and cannot be shown to be disjoint from it either.
+    |                           Therefore, reduction cannot advance to the remaining case
+    |
+    |                             case _ => Int
+    |
+    | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/missing-implicit-2.check b/tests/neg/missing-implicit-2.check
index 4ec525f4a34e..e1994c4bf02d 100644
--- a/tests/neg/missing-implicit-2.check
+++ b/tests/neg/missing-implicit-2.check
@@ -26,5 +26,5 @@
   |
   |                         where:    Byte  is a class in package scala
   |                                   Byte² is a class in package java.lang
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/missing-implicit-3.check b/tests/neg/missing-implicit-3.check
index 206f97866186..45837ce11576 100644
--- a/tests/neg/missing-implicit-3.check
+++ b/tests/neg/missing-implicit-3.check
@@ -12,16 +12,14 @@
   |
   |                                              import concurrent.duration.pairIntToDuration
   |
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E008] Not Found Error: tests/neg/missing-implicit-3.scala:8:48 -----------------------------------------------------
 8 |val d2: scala.concurrent.duration.Duration = 10.days // error
   |                                             ^^^^^^^
   |                            value days is not a member of Int, but could be made available as an extension method.
   |
-  |                            One of the following imports might fix the problem:
+  |                            The following import might fix the problem:
   |
   |                              import concurrent.duration.DurationInt
-  |                              import concurrent.duration.DurationLong
-  |                              import concurrent.duration.DurationDouble
   |
diff --git a/tests/neg/missing-implicit3.check b/tests/neg/missing-implicit3.check
index dec05cecdad6..d58216b9173e 100644
--- a/tests/neg/missing-implicit3.check
+++ b/tests/neg/missing-implicit3.check
@@ -4,6 +4,6 @@
    |no implicit argument of type ord.Ord[ord.Foo] was found for an implicit parameter of method sort in package ord.
    |I found:
    |
-   |    ord.Ord.ordered[A](/* missing */summon[ord.Foo => Comparable[? >: ord.Foo]])
+   |    ord.Ord.ordered[ord.Foo](/* missing */summon[ord.Foo => Comparable[? >: ord.Foo]])
    |
    |But no implicit values were found that match type ord.Foo => Comparable[? >: ord.Foo].
diff --git a/tests/neg/mixin-forwarder-clash1.check b/tests/neg/mixin-forwarder-clash1.check
index e581e79d0975..8c1e2a7911ef 100644
--- a/tests/neg/mixin-forwarder-clash1.check
+++ b/tests/neg/mixin-forwarder-clash1.check
@@ -3,7 +3,7 @@
    |      ^
    |      Name clash between inherited members:
    |      def concat(suffix: Int): X in trait One at line 4 and
-   |      def concat: [Dummy](suffix: Int): Y in trait Two at line 8
+   |      def concat[Dummy](suffix: Int): Y in trait Two at line 8
    |      have the same type after erasure.
    |
    |      Consider adding a @targetName annotation to one of the conflicting definitions
diff --git a/tests/neg/mixin-forwarder-clash2.check b/tests/neg/mixin-forwarder-clash2.check
index 02d839551046..8956d96e2071 100644
--- a/tests/neg/mixin-forwarder-clash2.check
+++ b/tests/neg/mixin-forwarder-clash2.check
@@ -4,7 +4,7 @@
   |      ^
   |      Name clash between inherited members:
   |      def concat(suffix: Int): X in trait One at line 4 and
-  |      def concat: [Dummy](suffix: Int): Y in trait Two at line 8
+  |      def concat[Dummy](suffix: Int): Y in trait Two at line 8
   |      have the same type after erasure.
   |
   |      Consider adding a @targetName annotation to one of the conflicting definitions
diff --git a/tests/neg/module-class-name.check b/tests/neg/module-class-name.check
index 0888689553fb..448eebf240b4 100644
--- a/tests/neg/module-class-name.check
+++ b/tests/neg/module-class-name.check
@@ -3,29 +3,29 @@
   |             ^
   |             Found:    Test.C.type
   |             Required: Test.C
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg/module-class-name.scala:9:15 --------------------------------------------------
 9 |  val y: C = f(C) // error
   |               ^
   |               Found:    Test.C.type
   |               Required: Test.C
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg/module-class-name.scala:12:14 -------------------------------------------------
 12 |  val z1: C = z    // error
    |              ^
    |              Found:    Test.C.type
    |              Required: Test.C
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg/module-class-name.scala:13:16 -------------------------------------------------
 13 |  val z2: Int = z  // error
    |                ^
    |                Found:    Test.C.type
    |                Required: Int
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E008] Not Found Error: tests/neg/module-class-name.scala:15:4 ------------------------------------------------------
 15 |  C.foo  // error: value foo is not a member of object Test.C
    |  ^^^^^
diff --git a/tests/neg/multi-file-error.check b/tests/neg/multi-file-error.check
index bf3547333361..716023fc9ce8 100644
--- a/tests/neg/multi-file-error.check
+++ b/tests/neg/multi-file-error.check
@@ -2,11 +2,11 @@
 2 |  foo() // error
   |  ^^^
   |  Not found: foo
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E006] Not Found Error: tests/neg/multi-file-error/B.scala:2:2 ------------------------------------------------------
 2 |  bar() // error
   |  ^^^
   |  Not found: bar
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/multi-param-derives.scala b/tests/neg/multi-param-derives.scala
index 1e228bf38bcf..2eb1a1b5785d 100644
--- a/tests/neg/multi-param-derives.scala
+++ b/tests/neg/multi-param-derives.scala
@@ -4,10 +4,10 @@ object Test extends App {
   {
     trait Show[T]
     object Show {
-      given Show[Int] with {}
-      given [T](using st: Show[T]): Show[Tuple1[T]] with {}
-      given t2[T, U](using st: Show[T], su: Show[U]): Show[(T, U)] with {}
-      given t3[T, U, V](using st: Show[T], su: Show[U], sv: Show[V]): Show[(T, U, V)] with {}
+      given Show[Int]()
+      given [T](using st: Show[T]): Show[Tuple1[T]]()
+      given t2[T, U](using st: Show[T], su: Show[U]): Show[(T, U)]()
+      given t3[T, U, V](using st: Show[T], su: Show[U], sv: Show[V]): Show[(T, U, V)]()
 
       def derived[T](using m: Mirror.Of[T], r: Show[m.MirroredElemTypes]): Show[T] = new Show[T] {}
     }
@@ -22,10 +22,10 @@ object Test extends App {
   {
     trait Functor[F[_]]
     object Functor {
-      given [C]: Functor[[T] =>> C] with {}
-      given Functor[[T] =>> Tuple1[T]] with {}
-      given t2 [T]: Functor[[U] =>> (T, U)] with {}
-      given t3 [T, U]: Functor[[V] =>> (T, U, V)] with {}
+      given [C]: Functor[[T] =>> C]()
+      given Functor[[T] =>> Tuple1[T]]()
+      given t2 [T]: Functor[[U] =>> (T, U)]()
+      given t3 [T, U]: Functor[[V] =>> (T, U, V)]()
 
       def derived[F[_]](using m: Mirror { type MirroredType[X] = F[X] ; type MirroredElemTypes[_] }, r: Functor[m.MirroredElemTypes]): Functor[F] = new Functor[F] {}
     }
@@ -40,8 +40,8 @@ object Test extends App {
   {
     trait FunctorK[F[_[_]]]
     object FunctorK {
-      given [C]: FunctorK[[F[_]] =>> C] with {}
-      given [T]: FunctorK[[F[_]] =>> Tuple1[F[T]]] with {}
+      given [C]: FunctorK[[F[_]] =>> C]()
+      given [T]: FunctorK[[F[_]] =>> Tuple1[F[T]]]()
 
       def derived[F[_[_]]](using m: Mirror { type MirroredType[X[_]] = F[X] ; type MirroredElemTypes[_[_]] }, r: FunctorK[m.MirroredElemTypes]): FunctorK[F] = new FunctorK[F] {}
     }
@@ -56,10 +56,10 @@ object Test extends App {
   {
     trait Bifunctor[F[_, _]]
     object Bifunctor {
-      given [C]: Bifunctor[[T, U] =>> C] with {}
-      given Bifunctor[[T, U] =>> Tuple1[U]] with {}
-      given t2: Bifunctor[[T, U] =>> (T, U)] with {}
-      given t3 [T]: Bifunctor[[U, V] =>> (T, U, V)] with {}
+      given [C]: Bifunctor[[T, U] =>> C]()
+      given Bifunctor[[T, U] =>> Tuple1[U]]()
+      given t2: Bifunctor[[T, U] =>> (T, U)]()
+      given t3 [T]: Bifunctor[[U, V] =>> (T, U, V)]()
 
       def derived[F[_, _]](using m: Mirror { type MirroredType[X, Y] = F[X, Y] ; type MirroredElemTypes[_, _] }, r: Bifunctor[m.MirroredElemTypes]): Bifunctor[F] = ???
     }
diff --git a/tests/neg/multiLineOps.scala b/tests/neg/multiLineOps.scala
index 78a6ba4c3910..8499cc9fe710 100644
--- a/tests/neg/multiLineOps.scala
+++ b/tests/neg/multiLineOps.scala
@@ -6,7 +6,7 @@ val b1 = {
   22
   * 22  // ok
   */*one more*/22 // error: end of statement expected // error: not found: *
-}                 // error: ';' expected, but '}' found
+}
 
 val b2: Boolean = {
   println(x)
diff --git a/tests/neg/overloading-specifity.scala b/tests/neg/overloading-specifity.scala
index b6c10ef1e9bc..7d7cba3ed21f 100644
--- a/tests/neg/overloading-specifity.scala
+++ b/tests/neg/overloading-specifity.scala
@@ -12,7 +12,7 @@ object Generic {
 
 object Test extends App {
   trait Context
-  //given ctx: Context with {}
+  //given ctx: Context()
 
   object a {
     def foo[T](implicit gen: Generic): Show[T] = new Show[T](1)
diff --git a/tests/neg/parent-refinement.check b/tests/neg/parent-refinement.check
new file mode 100644
index 000000000000..550430bd35a7
--- /dev/null
+++ b/tests/neg/parent-refinement.check
@@ -0,0 +1,4 @@
+-- Error: tests/neg/parent-refinement.scala:5:2 ------------------------------------------------------------------------
+5 |  with Ordered[Year] { // error
+  |  ^^^^
+  |  end of toplevel definition expected but 'with' found
diff --git a/tests/neg/parent-refinement.scala b/tests/neg/parent-refinement.scala
new file mode 100644
index 000000000000..ca2b88a75fd8
--- /dev/null
+++ b/tests/neg/parent-refinement.scala
@@ -0,0 +1,7 @@
+
+trait Id { type Value }
+case class Year(value: Int) extends AnyVal
+  with Id { type Value = Int }
+  with Ordered[Year] { // error
+
+}
\ No newline at end of file
diff --git a/tests/neg/parser-stability-17.scala b/tests/neg/parser-stability-17.scala
index db1f212fc4ab..ff603a677378 100644
--- a/tests/neg/parser-stability-17.scala
+++ b/tests/neg/parser-stability-17.scala
@@ -1,2 +1,2 @@
 trait x0[] {      x0: x0 => }      // error // error
-        class x0[x1] extends x0[x0 x0] x2 x0  // error // error // error
+        class x0[x1] extends x0[x0 x0] x2 x0  // error // error
diff --git a/tests/neg/parser-stability-19.scala b/tests/neg/parser-stability-19.scala
index 099c3d962c22..c320c7e8df74 100644
--- a/tests/neg/parser-stability-19.scala
+++ b/tests/neg/parser-stability-19.scala
@@ -1,5 +1,5 @@
 object x0 {
   case class x0[]():                  // error
     def x0( ) ]                       // error
-    def x0 ( x0:x0 ):x0.type = x1 x0  // error // error // error
+    def x0 ( x0:x0 ):x0.type = x1 x0  // error // error
 // error
\ No newline at end of file
diff --git a/tests/neg/parser-stability-23.scala b/tests/neg/parser-stability-23.scala
index d63059288b63..a27d79d5cc3e 100644
--- a/tests/neg/parser-stability-23.scala
+++ b/tests/neg/parser-stability-23.scala
@@ -1,3 +1,3 @@
 object i0 {
-  import Ordering.{ implicitly as } (true: Boolean) match { case _: i1 as true } // error // error // error
+  import Ordering.{ implicitly as } (true: Boolean) match { case _: i1 as true } // error // error
 }
diff --git a/tests/neg/print-infix-type.check b/tests/neg/print-infix-type.check
new file mode 100644
index 000000000000..21ba753f2408
--- /dev/null
+++ b/tests/neg/print-infix-type.check
@@ -0,0 +1,7 @@
+-- [E007] Type Mismatch Error: tests/neg/print-infix-type.scala:8:29 ---------------------------------------------------
+8 |  val x: over[String, Int] = f // error
+  |                             ^
+  |                             Found:    Int over String
+  |                             Required: String over Int
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/print-infix-type.scala b/tests/neg/print-infix-type.scala
new file mode 100644
index 000000000000..7ed71e34964d
--- /dev/null
+++ b/tests/neg/print-infix-type.scala
@@ -0,0 +1,8 @@
+object A:
+
+  opaque infix type over[A, B] = (A, B)
+  def f: over[Int, String] = (1, "")
+
+object B:
+  import A.*
+  val x: over[String, Int] = f // error
diff --git a/tests/neg/safeThrowsStrawman.check b/tests/neg/safeThrowsStrawman.check
index d0f0b8e60176..6bf1ecdae513 100644
--- a/tests/neg/safeThrowsStrawman.check
+++ b/tests/neg/safeThrowsStrawman.check
@@ -4,7 +4,7 @@
    |                                The capability to throw exception scalax.Fail is missing.
    |                                The capability can be provided by one of the following:
    |                                 - A using clause `(using CanThrow[scalax.Fail])`
-   |                                 - A throws clause in a result type such as `X throws scalax.Fail`
+   |                                 - A raises clause in a result type such as `X raises scalax.Fail`
    |                                 - an enclosing `try` that catches scalax.Fail
 -- Error: tests/neg/safeThrowsStrawman.scala:27:15 ---------------------------------------------------------------------
 27 |    println(bar)        // error
@@ -12,5 +12,5 @@
    |               The capability to throw exception Exception is missing.
    |               The capability can be provided by one of the following:
    |                - A using clause `(using CanThrow[Exception])`
-   |                - A throws clause in a result type such as `X throws Exception`
+   |                - A raises clause in a result type such as `X raises Exception`
    |                - an enclosing `try` that catches Exception
diff --git a/tests/neg/safeThrowsStrawman.scala b/tests/neg/safeThrowsStrawman.scala
index 08f169e91701..bc07eb0bb3f9 100644
--- a/tests/neg/safeThrowsStrawman.scala
+++ b/tests/neg/safeThrowsStrawman.scala
@@ -2,26 +2,26 @@ import language.experimental.erasedDefinitions
 import annotation.implicitNotFound
 
 object scalax:
-  @implicitNotFound("The capability to throw exception ${E} is missing.\nThe capability can be provided by one of the following:\n - A using clause `(using CanThrow[${E}])`\n - A throws clause in a result type such as `X throws ${E}`\n - an enclosing `try` that catches ${E}")
+  @implicitNotFound("The capability to throw exception ${E} is missing.\nThe capability can be provided by one of the following:\n - A using clause `(using CanThrow[${E}])`\n - A raises clause in a result type such as `X raises ${E}`\n - an enclosing `try` that catches ${E}")
   erased class CanThrow[-E <: Exception]
 
-  infix type throws[R, +E <: Exception] = CanThrow[E] ?=> R
+  infix type raises[R, +E <: Exception] = CanThrow[E] ?=> R
 
   class Fail extends Exception
 
-  def raise[E <: Exception](e: E): Nothing throws E = throw e
+  def raise[E <: Exception](e: E): Nothing raises E = throw e
 
 import scalax._
 
 def foo(x: Boolean): Int =
   if x then 1 else raise(Fail())  // error
 
-def bar: Int throws Exception =
+def bar: Int raises Exception =
   raise(Fail())
 
 @main def Test =
   try
-    erased given CanThrow[Fail] = ???
+    erased given CanThrow[Fail] = compiletime.erasedValue
     println(foo(true))
     println(foo(false))
     println(bar)        // error
diff --git a/tests/neg/safeThrowsStrawman2.scala b/tests/neg/safeThrowsStrawman2.scala
index 80e5139b1f8d..7d87baad6fa4 100644
--- a/tests/neg/safeThrowsStrawman2.scala
+++ b/tests/neg/safeThrowsStrawman2.scala
@@ -4,15 +4,15 @@ object scalax:
   erased class CanThrow[E <: Exception]
   type CTF = CanThrow[Fail]
 
-  infix type throws[R, E <: Exception] = CanThrow[E] ?=> R
+  infix type raises[R, E <: Exception] = CanThrow[E] ?=> R
 
   class Fail extends Exception
 
-  def raise[E <: Exception](e: E): Nothing throws E = throw e
+  def raise[E <: Exception](e: E): Nothing raises E = throw e
 
 import scalax._
 
-def foo(x: Boolean, y: CanThrow[Fail]): Int throws Fail =
+def foo(x: Boolean, y: CanThrow[Fail]): Int raises Fail =
   if x then 1 else raise(Fail())
 
 def bar(x: Boolean)(using CanThrow[Fail]): Int =
@@ -20,7 +20,7 @@ def bar(x: Boolean)(using CanThrow[Fail]): Int =
 
 @main def Test =
   try
-    given ctf: CanThrow[Fail] = ???
+    given ctf: CanThrow[Fail] = new CanThrow[Fail]
     val x = new CanThrow[Fail]()      // OK, x is erased
     val y: Any = new CanThrow[Fail]() // error: illegal reference to erased class CanThrow
     val y2: Any = new CTF()       // error: illegal reference to erased class CanThrow
diff --git a/tests/neg/saferExceptions.check b/tests/neg/saferExceptions.check
new file mode 100644
index 000000000000..5f51ce08d6db
--- /dev/null
+++ b/tests/neg/saferExceptions.check
@@ -0,0 +1,26 @@
+-- Error: tests/neg/saferExceptions.scala:12:16 ------------------------------------------------------------------------
+12 |      case 4 => throw Exception()             // error
+   |                ^^^^^^^^^^^^^^^^^
+   |                The capability to throw exception Exception is missing.
+   |                The capability can be provided by one of the following:
+   |                 - Adding a using clause `(using CanThrow[Exception])` to the definition of the enclosing method
+   |                 - Adding `throws Exception` clause after the result type of the enclosing method
+   |                 - Wrapping this piece of code with a `try` block that catches Exception
+   |
+   |                The following import might fix the problem:
+   |
+   |                  import unsafeExceptions.canThrowAny
+   |
+-- Error: tests/neg/saferExceptions.scala:17:46 ------------------------------------------------------------------------
+17 |  def baz(x: Int): Int throws Failure = bar(x)  // error
+   |                                              ^
+   |      The capability to throw exception java.io.IOException is missing.
+   |      The capability can be provided by one of the following:
+   |       - Adding a using clause `(using CanThrow[java.io.IOException])` to the definition of the enclosing method
+   |       - Adding `throws java.io.IOException` clause after the result type of the enclosing method
+   |       - Wrapping this piece of code with a `try` block that catches java.io.IOException
+   |
+   |      The following import might fix the problem:
+   |
+   |        import unsafeExceptions.canThrowAny
+   |
diff --git a/tests/neg/saferExceptions.scala b/tests/neg/saferExceptions.scala
new file mode 100644
index 000000000000..3ef2f8bb0067
--- /dev/null
+++ b/tests/neg/saferExceptions.scala
@@ -0,0 +1,17 @@
+object test:
+  import language.experimental.saferExceptions
+  import java.io.IOException
+
+  class Failure extends Exception
+
+  def bar(x: Int): Int throws Failure | IOException =
+    x match
+      case 1 => throw AssertionError()
+      case 2 => throw Failure()               // ok
+      case 3 => throw java.io.IOException()   // ok
+      case 4 => throw Exception()             // error
+      case 5 => throw Throwable()             // ok: Throwable is treated as unchecked
+      case _ => 0
+
+  def foo(x: Int): Int throws Exception = bar(x)
+  def baz(x: Int): Int throws Failure = bar(x)  // error
diff --git a/tests/neg/singleton-ops-any.check b/tests/neg/singleton-ops-any.check
index 6de768fa0b2e..caab2b24e037 100644
--- a/tests/neg/singleton-ops-any.check
+++ b/tests/neg/singleton-ops-any.check
@@ -3,26 +3,40 @@
   |                       ^^^^
   |                       Found:    (true : Boolean)
   |                       Required: (false : Boolean)
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg/singleton-ops-any.scala:7:22 --------------------------------------------------
 7 |  val t35: 10 == 10 = false // error
   |                      ^^^^^
   |                      Found:    (false : Boolean)
   |                      Required: (true : Boolean)
-
-longer explanation available when compiling with `-explain`
+  |
+  | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg/singleton-ops-any.scala:12:24 -------------------------------------------------
 12 |  val t38: false != 5 = false // error
    |                        ^^^^^
    |                        Found:    (false : Boolean)
    |                        Required: (true : Boolean)
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg/singleton-ops-any.scala:13:22 -------------------------------------------------
 13 |  val t39: 10 != 10 = true // error
    |                      ^^^^
    |                      Found:    (true : Boolean)
    |                      Required: (false : Boolean)
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/singleton-ops-any.scala:18:27 -------------------------------------------------
+18 |  val t04: ToString[Int] = "Int" // error
+   |                           ^^^^^
+   |                           Found:    ("Int" : String)
+   |                           Required: compiletime.ops.any.ToString[Int]
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg/singleton-ops-any.scala:32:26 -------------------------------------------------
+32 |  val t48: IsConst[Any] = true // error
+   |                          ^^^^
+   |                          Found:    (true : Boolean)
+   |                          Required: (false : Boolean)
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/singleton-ops-any.scala b/tests/neg/singleton-ops-any.scala
index 0d7c05b55fec..45f63cf68ff1 100644
--- a/tests/neg/singleton-ops-any.scala
+++ b/tests/neg/singleton-ops-any.scala
@@ -11,4 +11,30 @@ object Test {
   val t37: 0 != 1 = true
   val t38: false != 5 = false // error
   val t39: 10 != 10 = true // error
+
+  val t01: ToString[1] = "1"
+  val t02: ToString[-2L] = "-2"
+  val t03: ToString[true] = "true"
+  val t04: ToString[Int] = "Int" // error
+  val t05: ToString[3.33] = "3.33"
+  val t06: ToString["123"] = "123"
+
+  val t40: IsConst[1] = true
+  val t41: IsConst[2L] = true
+  val t42: IsConst[-1.0] = true
+  val t43: IsConst[false] = true
+  val t44: IsConst["hi"] = true
+  val t45: IsConst[Int] = false
+  val one : Int = 1
+  val t46 : IsConst[one.type] = false
+  final val two = 2
+  val t47 : IsConst[two.type] = true
+  val t48: IsConst[Any] = true // error
+  def isConst[X] : IsConst[X] = ???
+  val t49 : true = isConst[1]
+  val t50 : false = isConst[one.type]
+  def isConst2[X <: Int, Y <: Int] : IsConst[X == Y] = ???
+  val t51 : true = isConst2[1, 1]
+  val t52 : false = isConst2[1, one.type]
+  val t53 : true = isConst2[1, two.type]
 }
diff --git a/tests/neg/singleton-ops-double.scala b/tests/neg/singleton-ops-double.scala
new file mode 100644
index 000000000000..006b86270657
--- /dev/null
+++ b/tests/neg/singleton-ops-double.scala
@@ -0,0 +1,77 @@
+import scala.compiletime.ops.double.*
+
+object Test {
+  summon[2.0 + 3.0 =:= 6.0 - 1.0]
+  summon[1763.0 =:= 41.0 * 43.0]
+  summon[2.0 + 2.0 =:= 3.0] // error
+  summon[29.0 * 31.0 =:= 900.0] // error
+  summon[Double <:< Double + 1.0] // error
+  summon[1.0 + Double <:< Double]
+
+  val t0: 2.0 + 3.0 = 5.0
+  val t1: 2.0 + 2.0 = 5.0 // error
+  val t2: -1.0 + 1.0 = 0.0
+  val t3: -5.0 + -5.0 = -11.0 // error
+
+  val t4: 10.0 * 20.0 = 200.0
+  val t5: 30.0 * 10.0 = 400.0 // error
+  val t6: -10.0 * 2.0  = -20.0
+  val t7: -2.0 * -2.0 = 4.0
+
+  val t8: 10.0 / 2.0 = 5.0
+  val t9: 11.0 / -2.0 = -5.5
+  val t10: 2.0 / 4.0 = 2.0 // error
+
+  val t12: 10.0 % 3.0 = 1.0
+  val t13: 12.0 % 2.0 = 1.0 // error
+  val t14: 1.0 % -3.0 = 1.0
+
+  val t16: 1.0 < 0.0 = false
+  val t17: 0.0 < 1.0 = true
+  val t18: 10.0 < 5.0 = true // error
+  val t19: 5.0 < 10.0 = false // error
+
+  val t20: 1.0 <= 0.0 = false
+  val t21: 1.0 <= 1.0 = true
+  val t22: 10.0 <= 5.0 = true // error
+  val t23: 5.0 <= 10.0 = false // error
+
+  val t24: 1.0 > 0.0 = true
+  val t25: 0.0 > 1.0 = false
+  val t26: 10.0 > 5.0 = false // error
+  val t27: 5.0 > 10.0 = true // error
+
+  val t28: 1.0 >= 1.0 = true
+  val t29: 0.0 >= 1.0 = false
+  val t30: 10.0 >= 5.0 = false // error
+  val t31: 5.0 >= 10.0 = true // error
+
+  val t32: Abs[0.0] = 0.0
+  val t33: Abs[-1.0] = 1.0
+  val t34: Abs[-1.0] = -1.0 // error
+  val t35: Abs[1.0] = -1.0 // error
+
+  val t36: Negate[-10.0] = 10.0
+  val t37: Negate[10.0] = -10.0
+  val t38: Negate[1.0] = 1.0 // error
+  val t39: Negate[-1.0] = -1.0 // error
+
+  val t40: Max[-1.0, 10.0] = 10.0
+  val t41: Max[4.0, 2.0] = 4.0
+  val t42: Max[2.0, 2.0] = 1.0 // error
+  val t43: Max[-1.0, -1.0] = 0.0 // error
+
+  val t44: Min[-1.0, 10.0] = -1.0
+  val t45: Min[4.0, 2.0] = 2.0
+  val t46: Min[2.0, 2.0] = 1.0 // error
+  val t47: Min[-1.0, -1.0] = 0.0 // error
+
+  val t79: ToInt[1.0] = 1
+  val t80: ToInt[3.0] = 2 // error
+
+  val t81: ToLong[1.0] = 1L
+  val t82: ToLong[2.0] = 2 // error
+
+  val t83: ToFloat[1.0] = 1.0f
+  val t84: ToFloat[2.0] = 2 // error
+}
diff --git a/tests/neg/singleton-ops-float.scala b/tests/neg/singleton-ops-float.scala
new file mode 100644
index 000000000000..f7263fc804a6
--- /dev/null
+++ b/tests/neg/singleton-ops-float.scala
@@ -0,0 +1,77 @@
+import scala.compiletime.ops.float.*
+
+object Test {
+  summon[2.0f + 3.0f =:= 6.0f - 1.0f]
+  summon[1763.0f =:= 41.0f * 43.0f]
+  summon[2.0f + 2.0f =:= 3.0f] // error
+  summon[29.0f * 31.0f =:= 900.0f] // error
+  summon[Float <:< Float + 1.0f] // error
+  summon[1.0f + Float <:< Float]
+
+  val t0: 2.0f + 3.0f = 5.0f
+  val t1: 2.0f + 2.0f = 5.0f // error
+  val t2: -1.0f + 1.0f = 0.0f
+  val t3: -5.0f + -5.0f = -11.0f // error
+
+  val t4: 10.0f * 20.0f = 200.0f
+  val t5: 30.0f * 10.0f = 400.0f // error
+  val t6: -10.0f * 2.0f  = -20.0f
+  val t7: -2.0f * -2.0f = 4.0f
+
+  val t8: 10.0f / 2.0f = 5.0f
+  val t9: 11.0f / -2.0f = -5.5f
+  val t10: 2.0f / 4.0f = 2.0f // error
+
+  val t12: 10.0f % 3.0f = 1.0f
+  val t13: 12.0f % 2.0f = 1.0f // error
+  val t14: 1.0f % -3.0f = 1.0f
+
+  val t16: 1.0f < 0.0f = false
+  val t17: 0.0f < 1.0f = true
+  val t18: 10.0f < 5.0f = true // error
+  val t19: 5.0f < 10.0f = false // error
+
+  val t20: 1.0f <= 0.0f = false
+  val t21: 1.0f <= 1.0f = true
+  val t22: 10.0f <= 5.0f = true // error
+  val t23: 5.0f <= 10.0f = false // error
+
+  val t24: 1.0f > 0.0f = true
+  val t25: 0.0f > 1.0f = false
+  val t26: 10.0f > 5.0f = false // error
+  val t27: 5.0f > 10.0f = true // error
+
+  val t28: 1.0f >= 1.0f = true
+  val t29: 0.0f >= 1.0f = false
+  val t30: 10.0f >= 5.0f = false // error
+  val t31: 5.0f >= 10.0f = true // error
+
+  val t32: Abs[0.0f] = 0.0f
+  val t33: Abs[-1.0f] = 1.0f
+  val t34: Abs[-1.0f] = -1.0f // error
+  val t35: Abs[1.0f] = -1.0f // error
+
+  val t36: Negate[-10.0f] = 10.0f
+  val t37: Negate[10.0f] = -10.0f
+  val t38: Negate[1.0f] = 1.0f // error
+  val t39: Negate[-1.0f] = -1.0f // error
+
+  val t40: Max[-1.0f, 10.0f] = 10.0f
+  val t41: Max[4.0f, 2.0f] = 4.0f
+  val t42: Max[2.0f, 2.0f] = 1.0f // error
+  val t43: Max[-1.0f, -1.0f] = 0.0f // error
+
+  val t44: Min[-1.0f, 10.0f] = -1.0f
+  val t45: Min[4.0f, 2.0f] = 2.0f
+  val t46: Min[2.0f, 2.0f] = 1.0f // error
+  val t47: Min[-1.0f, -1.0f] = 0.0f // error
+
+  val t79: ToInt[1.0f] = 1
+  val t80: ToInt[3.0f] = 2 // error
+
+  val t81: ToLong[1.0f] = 1L
+  val t82: ToLong[2.0f] = 2 // error
+
+  val t83: ToDouble[1.0f] = 1.0
+  val t84: ToDouble[2.0f] = 2 // error
+}
diff --git a/tests/neg/singleton-ops-int.scala b/tests/neg/singleton-ops-int.scala
index d2fd3a73afcd..e85b6204d1fa 100644
--- a/tests/neg/singleton-ops-int.scala
+++ b/tests/neg/singleton-ops-int.scala
@@ -9,6 +9,9 @@ object Test {
   summon[1 + Int <:< Int]
 
   val t0: 2 + 3 = 5
+  final val two = 2
+  final val three = 3
+  val t0_b : two.type + three.type = 5
   val t1: 2 + 2 = 5 // error
   val t2: -1 + 1 = 0
   val t3: -5 + -5 = -11 // error
@@ -70,8 +73,6 @@ object Test {
 
   val t48: ToString[213] = "213"
   val t49: ToString[-1] = "-1"
-  val t50: ToString[0] = "-0" // error
-  val t51: ToString[200] = "100" // error
 
   val t52: 1 ^ 2 = 3
   val t53: 1 ^ 3 = 3 // error
@@ -102,4 +103,17 @@ object Test {
   val t73: -7 >>> 3 = 536870911
   val t74: -7 >>> 3 = -1 // error
 
+  val t75: NumberOfLeadingZeros[0] = 32
+  val t76: NumberOfLeadingZeros[8] = 28
+  val t77: NumberOfLeadingZeros[-1] = 0
+  val t78: NumberOfLeadingZeros[-1] = 1 // error
+
+  val t79: ToLong[1] = 1L
+  val t80: ToLong[2] = 2 // error
+
+  val t81: ToFloat[1] = 1.0f
+  val t82: ToFloat[2] = 2 // error
+
+  val t83: ToDouble[1] = 1.0
+  val t84: ToDouble[2] = 2 // error
 }
diff --git a/tests/neg/singleton-ops-long.scala b/tests/neg/singleton-ops-long.scala
new file mode 100644
index 000000000000..5af2069beb27
--- /dev/null
+++ b/tests/neg/singleton-ops-long.scala
@@ -0,0 +1,113 @@
+import scala.compiletime.ops.long.*
+
+object Test {
+  summon[2L + 3L =:= 6L - 1L]
+  summon[1763L =:= 41L * 43L]
+  summon[2L + 2L =:= 3L] // error
+  summon[29L * 31L =:= 900L] // error
+  summon[Long <:< Long + 1L] // error
+  summon[1L + Long <:< Long]
+
+  val t0: 2L + 3L = 5L
+  val t1: 2L + 2L = 5L // error
+  val t2: -1L + 1L = 0L
+  val t3: -5L + -5L = -11L // error
+
+  val t4: 10L * 20L = 200L
+  val t5: 30L * 10L = 400L // error
+  val t6: -10L * 2L  = -20L
+  val t7: -2L * -2L = 4L
+
+  val t8: 10L / 2L = 5L
+  val t9: 11L / -2L = -5L // Integer division
+  val t10: 2L / 4L = 2L // error
+  val t11: -1L / 0L = 1L // error
+
+  val t12: 10L % 3L = 1L
+  val t13: 12L % 2L = 1L // error
+  val t14: 1L % -3L = 1L
+  val t15: -3L % 0L = 0L // error
+
+  val t16: 1L < 0L = false
+  val t17: 0L < 1L = true
+  val t18: 10L < 5L = true // error
+  val t19: 5L < 10L = false // error
+
+  val t20: 1L <= 0L = false
+  val t21: 1L <= 1L = true
+  val t22: 10L <= 5L = true // error
+  val t23: 5L <= 10L = false // error
+
+  val t24: 1L > 0L = true
+  val t25: 0L > 1L = false
+  val t26: 10L > 5L = false // error
+  val t27: 5L > 10L = true // error
+
+  val t28: 1L >= 1L = true
+  val t29: 0L >= 1L = false
+  val t30: 10L >= 5L = false // error
+  val t31: 5L >= 10L = true // error
+
+  val t32: Abs[0L] = 0L
+  val t33: Abs[-1L] = 1L
+  val t34: Abs[-1L] = -1L // error
+  val t35: Abs[1L] = -1L // error
+
+  val t36: Negate[-10L] = 10L
+  val t37: Negate[10L] = -10L
+  val t38: Negate[1L] = 1L // error
+  val t39: Negate[-1L] = -1L // error
+
+  val t40: Max[-1L, 10L] = 10L
+  val t41: Max[4L, 2L] = 4L
+  val t42: Max[2L, 2L] = 1L // error
+  val t43: Max[-1L, -1L] = 0L // error
+
+  val t44: Min[-1L, 10L] = -1L
+  val t45: Min[4L, 2L] = 2L
+  val t46: Min[2L, 2L] = 1L // error
+  val t47: Min[-1L, -1L] = 0L // error
+
+  val t52: 1L ^ 2L = 3L
+  val t53: 1L ^ 3L = 3L // error
+  val t54: -1L ^ -2L = 1L
+  val t55: -1L ^ -3L = 1L // error
+
+  val t56: BitwiseOr[1L, 2L] = 3L
+  val t57: BitwiseOr[10L, 12L] = 13L // error
+  val t58: BitwiseOr[-11L, 12L] = -3L
+  val t59: BitwiseOr[-111L, -10L] = 0L // error
+
+  val t60: BitwiseAnd[1L, 1L] = 1L
+  val t61: BitwiseAnd[1L, 2L] = 0L
+  val t62: BitwiseAnd[-1L, -3L] = 3L // error
+  val t63: BitwiseAnd[-1L, -1L] = 1L // error
+
+  val t64: 1L << 1L = 2L
+  val t65: 1L << 2L = 4L
+  val t66: 1L << 3L = 8L
+  val t67: 1L << 4L = 0L // error
+
+  val t68: 100L >> 2L = 25L
+  val t69: 123456789L >> 71L = 964506L
+  val t70: -7L >> 3L = -1L
+  val t71: -7L >> 3L = 0L // error
+
+  val t72: -1L >>> 10000L = 281474976710655L
+  val t73: -7L >>> 3L = 2305843009213693951L
+  val t74: -7L >>> 3L = -1L // error
+
+  val t75: NumberOfLeadingZeros[0L] = 64
+  val t76: NumberOfLeadingZeros[8L] = 60
+  val t77: NumberOfLeadingZeros[-1L] = 0
+  val t78: NumberOfLeadingZeros[-1L] = 1 // error
+
+  val t79: ToInt[1L] = 1
+  val t80: ToInt[3L] = 2 // error
+
+  val t81: ToFloat[1L] = 1.0f
+  val t82: ToFloat[2L] = 2 // error
+
+  val t83: ToDouble[1L] = 1.0
+  val t84: ToDouble[2L] = 2 // error
+}
diff --git a/tests/neg/singleton-ops-string.scala b/tests/neg/singleton-ops-string.scala
index 46093121d3c4..d9cf2377564b 100644
--- a/tests/neg/singleton-ops-string.scala
+++ b/tests/neg/singleton-ops-string.scala
@@ -5,4 +5,14 @@ object Test {
   val t1: "" + "" = ""
   val t2: "3" + "" = "33" // error
   val t3: "Hello " + "world" = "error" // error
+
+  val t4: Length["Hello"] = 5
+  val t5: Length[""] = 0
+  val t6: Length["1"] = 7 // error
+
+  val t7: Substring["hamburger", 4, 8] = "urge"
+  val t8: Substring["hamburger", 4, 8] = "urger" // error
+
+  val t9: Matches["hamburger", "ham.*"] = true
+  val t10: Matches["hamburger", "ham.*"] = false // error
 }
diff --git a/tests/neg/spaces-vs-tabs.check b/tests/neg/spaces-vs-tabs.check
index 51c2689f57bc..f513dbdf31b7 100644
--- a/tests/neg/spaces-vs-tabs.check
+++ b/tests/neg/spaces-vs-tabs.check
@@ -23,12 +23,14 @@
   | Previous indent : 2 tabs
   | Latest indent   : 1 space
 -- Error: tests/neg/spaces-vs-tabs.scala:14:2 --------------------------------------------------------------------------
-14 |	  else 2 // error // error
+14 |	  else 2 // error
    |	  ^
    |	  The start of this line does not match any of the previous indentation widths.
    |	  Indentation width of current line : 1 tab, 2 spaces
    |	  This falls between previous widths: 1 tab and 1 tab, 4 spaces
--- [E040] Syntax Error: tests/neg/spaces-vs-tabs.scala:14:7 ------------------------------------------------------------
-14 |	  else 2 // error // error
-   |	       ^
-   |	       ';' expected, but integer literal found
+-- [E129] Potential Issue Warning: tests/neg/spaces-vs-tabs.scala:13:6 -------------------------------------------------
+13 |	      1
+   |	      ^
+   |	      A pure expression does nothing in statement position; you may be omitting necessary parentheses
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/spaces-vs-tabs.scala b/tests/neg/spaces-vs-tabs.scala
index ff8d1a1c328e..4f48d784eb7d 100644
--- a/tests/neg/spaces-vs-tabs.scala
+++ b/tests/neg/spaces-vs-tabs.scala
@@ -11,5 +11,5 @@ object Test:
 
 	    if true then
 	      1
-	  else 2 // error // error
+	  else 2 // error
 
diff --git a/tests/neg/splice-pat.check b/tests/neg/splice-pat.check
new file mode 100644
index 000000000000..32af3ad6308e
--- /dev/null
+++ b/tests/neg/splice-pat.check
@@ -0,0 +1,10 @@
+-- [E032] Syntax Error: tests/neg/splice-pat.scala:12:16 ---------------------------------------------------------------
+12 |  case '{ foo(${  // error: pattern expected
+   |                ^
+   |                pattern expected
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E040] Syntax Error: tests/neg/splice-pat.scala:15:5 ----------------------------------------------------------------
+15 |    })} => ???  // error
+   |     ^
+   |     '=>' expected, but ')' found
diff --git a/tests/neg/splice-pat.scala b/tests/neg/splice-pat.scala
new file mode 100644
index 000000000000..a43659c5e323
--- /dev/null
+++ b/tests/neg/splice-pat.scala
@@ -0,0 +1,15 @@
+import scala.quoted.*
+
+object MyMatcher {
+  def unapply(expr: Expr[Any])(using Quotes): Option[Expr[Int]] = ???
+}
+
+def foo(x: Any): Unit = ???
+
+def bar(): Expr[Any] = ???
+
+def f(expr: Expr[Any])(using Quotes): Expr[Int] = expr match
+  case '{ foo(${  // error: pattern expected
+    import scala.Int
+    bar()
+    })} => ???  // error
diff --git a/tests/run/structuralNoSuchMethod.scala b/tests/neg/structuralNoSuchMethod.scala
similarity index 83%
rename from tests/run/structuralNoSuchMethod.scala
rename to tests/neg/structuralNoSuchMethod.scala
index 476d7ed8225c..c76900c27704 100644
--- a/tests/run/structuralNoSuchMethod.scala
+++ b/tests/neg/structuralNoSuchMethod.scala
@@ -11,10 +11,10 @@ object Test {
     def f(x: X, y: String): String = "f1"
   }
 
-  val x: T = new C[String]
+  val x: T = new C[String] // error
 
   def main(args: Array[String]) =
-    try println(x.f("", ""))  // throws NoSuchMethodException
+    try println(x.f("", ""))  // used to throw NoSuchMethodException
     catch {
       case ex: NoSuchMethodException =>
         println("no such method")
diff --git a/tests/neg/summonInline.check b/tests/neg/summonInline.check
new file mode 100644
index 000000000000..6c3839266ce4
--- /dev/null
+++ b/tests/neg/summonInline.check
@@ -0,0 +1,22 @@
+-- Error: tests/neg/summonInline.scala:19:32 ---------------------------------------------------------------------------
+19 |val missing1 = summonInlineCheck(1) // error
+   |               ^^^^^^^^^^^^^^^^^^^^
+   |               Missing One
+   |--------------------------------------------------------------------------------------------------------------------
+   |Inline stack trace
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from summonInline.scala:15
+15 |    case 1 => summonInline[Missing1]
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+    --------------------------------------------------------------------------------------------------------------------
+-- Error: tests/neg/summonInline.scala:20:32 ---------------------------------------------------------------------------
+20 |val missing2 = summonInlineCheck(2) // error
+   |               ^^^^^^^^^^^^^^^^^^^^
+   |               Missing Two
+   |--------------------------------------------------------------------------------------------------------------------
+   |Inline stack trace
+   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |This location contains code that was inlined from summonInline.scala:16
+16 |    case 2 => summonInline[Missing2]
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+    --------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/summonInline.scala b/tests/neg/summonInline.scala
new file mode 100755
index 000000000000..463e506bdbdc
--- /dev/null
+++ b/tests/neg/summonInline.scala
@@ -0,0 +1,21 @@
+import scala.compiletime.summonInline
+import scala.annotation.implicitNotFound
+
+@implicitNotFound("Missing One")
+trait Missing1
+
+@implicitNotFound("Missing Two")
+trait Missing2
+
+trait NotMissing
+given NotMissing = ???
+
+transparent inline def summonInlineCheck[T <: Int](inline t : T) : Any = 
+  inline t match 
+    case 1 => summonInline[Missing1]
+    case 2 => summonInline[Missing2]
+    case _ => summonInline[NotMissing]
+    
+val missing1 = summonInlineCheck(1) // error
+val missing2 = summonInlineCheck(2) // error
+val notMissing : NotMissing = summonInlineCheck(3)
\ No newline at end of file
diff --git a/tests/neg/t1625.check b/tests/neg/t1625.check
new file mode 100644
index 000000000000..7e31f49f3729
--- /dev/null
+++ b/tests/neg/t1625.check
@@ -0,0 +1,8 @@
+-- [E040] Syntax Error: tests/neg/t1625.scala:2:20 ---------------------------------------------------------------------
+2 |  def foo(x: String*, y: String*, c: String*): Int // error: an identifier expected, but ',' found // error: an identifier expected, but ',' found
+  |                    ^
+  |                    an identifier expected, but ',' found
+-- [E040] Syntax Error: tests/neg/t1625.scala:2:32 ---------------------------------------------------------------------
+2 |  def foo(x: String*, y: String*, c: String*): Int // error: an identifier expected, but ',' found // error: an identifier expected, but ',' found
+  |                                ^
+  |                                an identifier expected, but ',' found
diff --git a/tests/neg/t1625.scala b/tests/neg/t1625.scala
index e98ce985238e..41929f0ab476 100644
--- a/tests/neg/t1625.scala
+++ b/tests/neg/t1625.scala
@@ -1,3 +1,3 @@
 trait T3 {
-  def foo(x: String*, y: String*, c: String*): Int // error: an identifier expected, but ',' found
-}
\ No newline at end of file
+  def foo(x: String*, y: String*, c: String*): Int // error: an identifier expected, but ',' found // error: an identifier expected, but ',' found
+}
diff --git a/tests/neg/t5702-neg-bad-and-wild.check b/tests/neg/t5702-neg-bad-and-wild.check
new file mode 100644
index 000000000000..cecfb1dfa996
--- /dev/null
+++ b/tests/neg/t5702-neg-bad-and-wild.check
@@ -0,0 +1,44 @@
+-- [E032] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:10:22 ---------------------------------------------------
+10 |      case List(1, _*,) => // error: pattern expected // error
+   |                      ^
+   |                      pattern expected
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E032] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:12:23 ---------------------------------------------------
+12 |      case List(1, _*3,) => // error: pattern expected // error // error
+   |                       ^
+   |                       pattern expected
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E032] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:15:18 ---------------------------------------------------
+15 |      case List(x*, 1) => // error: pattern expected
+   |                  ^
+   |                  pattern expected
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E031] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:17:18 ---------------------------------------------------
+17 |      case (1, x: _*) => // error: bad use of _* (sequence pattern not allowed)
+   |                  ^
+   |                  * can be used only for last argument
+   |
+   | longer explanation available when compiling with `-explain`
+-- [E032] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:23:17 ---------------------------------------------------
+23 |    val K(ns @ _*, x) = k // error: pattern expected
+   |                 ^
+   |                 pattern expected
+   |
+   | longer explanation available when compiling with `-explain`
+-- Error: tests/neg/t5702-neg-bad-and-wild.scala:10:21 -----------------------------------------------------------------
+10 |      case List(1, _*,) => // error: pattern expected // error
+   |                     ^
+   |                     Values of types Null and Int cannot be compared with == or !=
+-- [E006] Not Found Error: tests/neg/t5702-neg-bad-and-wild.scala:12:20 ------------------------------------------------
+12 |      case List(1, _*3,) => // error: pattern expected // error // error
+   |                    ^
+   |                    Not found: *
+   |
+   | longer explanation available when compiling with `-explain`
+-- Error: tests/neg/t5702-neg-bad-and-wild.scala:12:22 -----------------------------------------------------------------
+12 |      case List(1, _*3,) => // error: pattern expected // error // error
+   |                      ^
+   |                      Values of types Null and Int cannot be compared with == or !=
diff --git a/tests/neg/t5702-neg-bad-brace.check b/tests/neg/t5702-neg-bad-brace.check
new file mode 100644
index 000000000000..92e9fe912a92
--- /dev/null
+++ b/tests/neg/t5702-neg-bad-brace.check
@@ -0,0 +1,10 @@
+-- [E032] Syntax Error: tests/neg/t5702-neg-bad-brace.scala:8:21 -------------------------------------------------------
+8 |      case List(1, _*} => // error: pattern expected
+  |                     ^
+  |                     pattern expected
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E040] Syntax Error: tests/neg/t5702-neg-bad-brace.scala:11:0 -------------------------------------------------------
+11 |} // error: eof expected, but '}' found
+   |^
+   |eof expected, but '}' found
diff --git a/tests/neg/t5702-neg-bad-brace.scala b/tests/neg/t5702-neg-bad-brace.scala
new file mode 100644
index 000000000000..8a8e10f462aa
--- /dev/null
+++ b/tests/neg/t5702-neg-bad-brace.scala
@@ -0,0 +1,11 @@
+
+object Test {
+
+  def main(args: Array[String]) = {
+    val is = List(1,2,3)
+
+    is match {
+      case List(1, _*} => // error: pattern expected
+    }
+  }
+} // error: eof expected, but '}' found
diff --git a/tests/neg/t6124.check b/tests/neg/t6124.check
index 9c7498d60f88..871533bf80c8 100644
--- a/tests/neg/t6124.check
+++ b/tests/neg/t6124.check
@@ -62,5 +62,5 @@
 21 |  val x1 = _52 // error
    |           ^^^
    |           Not found: _52
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/t6476.scala b/tests/neg/t6476.scala
index 9d1415f55dd3..bd7868abe3e5 100644
--- a/tests/neg/t6476.scala
+++ b/tests/neg/t6476.scala
@@ -6,4 +6,4 @@ class C {
   s"\ "
   s"\\"
   s"\" // error
-}      // error (should not be one)
+}
diff --git a/tests/neg/t6663.check b/tests/neg/t6663.check
index 806f3357a0f6..4adb6f365082 100644
--- a/tests/neg/t6663.check
+++ b/tests/neg/t6663.check
@@ -3,5 +3,5 @@
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^
    |          Found:    String
    |          Required: Int
-
-longer explanation available when compiling with `-explain`
+   |
+   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/t6810.check b/tests/neg/t6810.check
index 55f9f7ca2443..147081e0daf5 100644
--- a/tests/neg/t6810.check
+++ b/tests/neg/t6810.check
@@ -22,3 +22,11 @@
 30 |  val b = '
    |          ^
    |          unclosed character literal
+-- Warning: tests/neg/t6810.scala:6:0 ----------------------------------------------------------------------------------
+6 |'                     // but not embedded EOL sequences not represented as escapes
+  |^
+  |Line is indented too far to the left, or a `}` is missing
+-- Warning: tests/neg/t6810.scala:31:0 ---------------------------------------------------------------------------------
+31 |'        // anypos-error CR seen as EOL by scanner; FSR, error only on open quote, unlike `y`
+   |^
+   |Line is indented too far to the left, or a `}` is missing
diff --git a/tests/neg/trailing-comma-pattern.check b/tests/neg/trailing-comma-pattern.check
new file mode 100644
index 000000000000..d0ce15081263
--- /dev/null
+++ b/tests/neg/trailing-comma-pattern.check
@@ -0,0 +1,6 @@
+-- [E032] Syntax Error: tests/neg/trailing-comma-pattern.scala:3:8 -----------------------------------------------------
+3 |// error
+  |        ^
+  |        pattern expected
+  |
+  | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/trailing-comma-pattern.scala b/tests/neg/trailing-comma-pattern.scala
new file mode 100644
index 000000000000..02ee158b7ae5
--- /dev/null
+++ b/tests/neg/trailing-comma-pattern.scala
@@ -0,0 +1,3 @@
+object Test:
+  val List(x, y, _*,
+// error
\ No newline at end of file
diff --git a/tests/neg/trailing-comma-pattern2.check b/tests/neg/trailing-comma-pattern2.check
new file mode 100644
index 000000000000..2759c648ff95
--- /dev/null
+++ b/tests/neg/trailing-comma-pattern2.check
@@ -0,0 +1,10 @@
+-- [E032] Syntax Error: tests/neg/trailing-comma-pattern2.scala:2:21 ---------------------------------------------------
+2 |  val List(x, y, _*, ) // error
+  |                     ^
+  |                     pattern expected
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E040] Syntax Error: tests/neg/trailing-comma-pattern2.scala:3:8 ----------------------------------------------------
+3 |// error
+  |        ^
+  |        '=' expected, but unindent found
diff --git a/tests/neg/trailing-comma-pattern2.scala b/tests/neg/trailing-comma-pattern2.scala
new file mode 100644
index 000000000000..2ada489ed234
--- /dev/null
+++ b/tests/neg/trailing-comma-pattern2.scala
@@ -0,0 +1,3 @@
+object Test:
+  val List(x, y, _*, ) // error
+// error
\ No newline at end of file
diff --git a/tests/neg/transparent-trait.scala b/tests/neg/transparent-trait.scala
new file mode 100644
index 000000000000..52beb624087c
--- /dev/null
+++ b/tests/neg/transparent-trait.scala
@@ -0,0 +1,11 @@
+transparent trait A
+transparent trait B
+trait C
+
+object Test:
+  val x = identity(new A with B) // infers A with B (because there's no non-transparent trait in the intersection)
+  val x2: A with B = x // OK
+
+  val y = identity(new A with B with C) // infers C
+  val y2: C = y // OK
+  val y3: A with B = y // error
diff --git a/tests/neg/transparent.scala b/tests/neg/transparent.scala
index f2aae0348b45..b4d89478b0ac 100644
--- a/tests/neg/transparent.scala
+++ b/tests/neg/transparent.scala
@@ -5,5 +5,5 @@ transparent class c // error
 transparent object y // error
 transparent trait t // ok
 transparent type T = c  // error
-transparent given c with {} // error
+transparent given c() // error
 
diff --git a/tests/neg/tuple-ops.scala b/tests/neg/tuple-ops.scala
index 4e787c1932c8..47a8c00cc6ef 100644
--- a/tests/neg/tuple-ops.scala
+++ b/tests/neg/tuple-ops.scala
@@ -12,13 +12,13 @@ val r3: ((2, 1), (8, 2)) = c.zip(a)  // error
 // Map
 case class Foo[X](x: X)
 
-val r6: (Int, Int, String) = a.map[[t] =>> Int]([t] => x: t => x match {  // error
+val r6: (Int, Int, String) = a.map[[t] =>> Int]([t] => (x: t) => x match {  // error
   case x: Int => x * x
   case _ => ???
 })
 
 val r7: ((1, Foo[1]), (2), (3, Foo[3])) =
-  a.map[[t] =>> (t, Foo[t])]( [t] => x: t => (x, Foo(x)) )  // error
+  a.map[[t] =>> (t, Foo[t])]( [t] => (x: t) => (x, Foo(x)) )  // error
 
 // More Zip
 val t1: Int *: Long *: Tuple = (1, 2l, 100, 200)
diff --git a/tests/neg/type-qmark.check b/tests/neg/type-qmark.check
index ec3e8306af11..85d3b8d3cceb 100644
--- a/tests/neg/type-qmark.check
+++ b/tests/neg/type-qmark.check
@@ -27,7 +27,7 @@
    |       ^
    |       `?` is not a valid type name
 -- Error: tests/neg/type-qmark.scala:31:8 ------------------------------------------------------------------------------
-31 |  given ?[T]: Foo[T] with {} // error
+31 |  given ?[T]: Foo[T]() // error
    |        ^
    |        `?` is not a valid type name
 -- Error: tests/neg/type-qmark.scala:3:8 -------------------------------------------------------------------------------
diff --git a/tests/neg/type-qmark.scala b/tests/neg/type-qmark.scala
index bb89f72d6b3d..826a957aaa2e 100644
--- a/tests/neg/type-qmark.scala
+++ b/tests/neg/type-qmark.scala
@@ -28,5 +28,5 @@ object J {
 }
 object K {
   class Foo[T]
-  given ?[T]: Foo[T] with {} // error
+  given ?[T]: Foo[T]() // error
 }
diff --git a/tests/neg/typeclass-encoding3.scala b/tests/neg/typeclass-encoding3.scala
new file mode 100644
index 000000000000..ff403314cd1a
--- /dev/null
+++ b/tests/neg/typeclass-encoding3.scala
@@ -0,0 +1,349 @@
+/** 1. Simple type classes with monomorphic implementations and direct extensions.
+
+    trait SemiGroup extends TypeClass {
+      def add(that: This): This
+    }
+
+    trait Monoid extends SemiGroup
+    common {
+      def unit: This
+    }
+
+    extension IntOps for Int : Monoid {
+      def add(that: Int) = this + that
+    }
+    common {
+      def unit = 0
+    }
+
+    extension StringOps for String : Monoid {
+      def add(that: Int) = this ++ that
+    }
+    common {
+      def unit = ""
+    }
+
+    enum Nat extends Monoid {
+      case Z
+      case S(n: Nat)
+
+      def add(that: Nat): Nat = this match {
+        case S => that
+        case S(n) => S(n.add(that))
+      }
+    }
+    common {
+      def unit = Z
+    }
+
+    def sum[T: Monoid](xs: List[T]): T =
+      xs.foldLeft(Monod.impl[T].unit)(_ `add` _)
+*/
+object runtime {
+
+  trait TypeClass {
+    val commons: TypeClassCommon
+    type This = commons.This
+  }
+
+  trait TypeClassCommon { self =>
+    type This
+    type Instance <: TypeClass
+    def inject(x: This): Instance { val commons: self.type }
+  }
+
+  trait TypeClassCompanion {
+    type Impl[T] <: TypeClassCommon { type This = T }
+    def impl[T](implicit ev: Impl[T]): Impl[T] = ev
+  }
+
+  implicit def inject[From](x: From)
+      (implicit ev: TypeClassCommon { type This = From }): ev.Instance { type This = From } =
+    ev.inject(x)
+}
+import runtime.*
+
+object semiGroups {
+
+  trait SemiGroup extends TypeClass {
+    val commons: SemiGroupCommon
+    import commons.*
+    def add(that: This): This
+  }
+  trait SemiGroupCommon extends TypeClassCommon {
+    type Instance <: SemiGroup
+  }
+  object SemiGroup extends TypeClassCompanion {
+    type Impl[T] = SemiGroupCommon { type This = T }
+  }
+
+  trait Monoid extends SemiGroup {
+    val commons: MonoidCommon
+    import commons.*
+  }
+  trait MonoidCommon extends SemiGroupCommon {
+    type Instance <: Monoid
+    def unit: This
+  }
+  object Monoid extends TypeClassCompanion {
+    type Impl[T] = MonoidCommon { type This = T }
+  }
+
+  implicit object IntOps extends MonoidCommon {
+    type This = Int
+    type Instance = Monoid
+    def unit: Int = 0
+    def inject($this: Int) = new Monoid {
+      val commons: IntOps.this.type = IntOps.this
+      def add(that: this.This): this.This = $this + that
+    }
+  }
+
+  implicit object StringOps extends MonoidCommon {
+    type This = String
+    type Instance = Monoid
+    def unit = ""
+    def inject($this: String) = new Monoid {
+      val commons: StringOps.this.type = StringOps.this
+      def add(that: this.This): this.This = $this.concat(that)
+    }
+  }
+
+  enum Nat extends Monoid {
+    case Z
+    case S(n: Nat)
+
+    def add(that: Nat): Nat = this match {
+      case Z => that
+      case S(n) => S(n.add(that))
+    }
+
+    val commons: Nat.type = Nat
+  }
+  object Nat extends MonoidCommon {
+    type This = Nat
+    type Instance = Nat
+    def unit = Nat.Z
+    def inject($this: Nat) = $this
+  }
+  import Nat.{Z, S}
+
+  implicit def NatOps: Nat.type = Nat
+
+  def sum[T](xs: List[T])(implicit ev: Monoid.Impl[T]) =
+    xs.foldLeft(Monoid.impl[T].unit)((x, y) => x `add` y)
+
+  sum(List(1, 2, 3))
+  sum(List("hello ", "world!"))
+  sum(List(Z, S(Z), S(S(Z))))
+}
+
+/** 2. Generic implementations of simple type classes.
+
+    trait Ord extends TypeClass {
+      def compareTo(that: This): Int
+      def < (that: This) = compareTo(that) < 0
+      def > (that: This) = compareTo(that) > 0
+    }
+    common {
+      val minimum: This
+    }
+
+    extension IntOrd for Int : Ord {
+      def compareTo(that: Int) =
+        if (this < that) -1 else if (this > that) +1 else 0
+    }
+    common {
+      val minimum = Int.MinValue
+    }
+
+    extension ListOrd[T : Ord] for List[T] : Ord {
+      def compareTo(that: List[T]): Int = (this, that) match {
+        case (Nil, Nil) => 0
+        case (Nil, _) => -1
+        case (_, Nil) => +1
+        case (x :: xs, y :: ys) =>
+          val fst = x.compareTo(y)
+          if (fst != 0) fst else xs.compareTo(ys)
+      }
+    }
+    common {
+      val minimum = Nil
+    }
+
+    def min[T: Ord](x: T, y: T) = if (x < y) x else y
+
+    def inf[T: Ord](xs: List[T]): T = (Ord.impl[T].minimum /: xs)(min)
+*/
+object ord {
+
+  trait Ord extends TypeClass {
+    val commons: OrdCommon
+    import commons.*
+    def compareTo(that: This): Int
+    def < (that: This) = compareTo(that) < 0
+    def > (that: This) = compareTo(that) > 0
+  }
+  trait OrdCommon extends TypeClassCommon {
+    type Instance <: Ord
+    def minimum: This
+  }
+  object Ord extends TypeClassCompanion {
+    type Impl[T] = OrdCommon { type This = T }
+  }
+
+  implicit object IntOrd extends OrdCommon {
+    type This = Int
+    type Instance = Ord
+    val minimum: Int = Int.MinValue
+    def inject($this: Int) = new Ord {
+      val commons: IntOrd.this.type = IntOrd.this
+      import commons.*
+      def compareTo(that: this.This): Int =
+        if (this < that) -1 else if (this > that) +1 else 0
+    }
+  }
+
+  class ListOrd[T](implicit ev: Ord.Impl[T]) extends OrdCommon { self =>
+    type This = List[T]
+    type Instance = Ord
+    def minimum: List[T] = Nil
+    def inject($this: List[T]) = new Ord {
+      val commons: self.type = self
+      import commons.*
+      def compareTo(that: List[T]): Int = ($this, that) match {
+        case (Nil, Nil) => 0
+        case (Nil, _) => -1
+        case (_, Nil) => +1
+        case (x :: xs, y :: ys) =>
+          val fst = x.compareTo(y)
+          if (fst != 0) fst else xs.compareTo(ys)
+      }
+    }
+  }
+
+  implicit def listOrd[T](implicit ev: Ord.Impl[T]): ListOrd[T] =
+    new ListOrd[T]
+
+  def min[T](x: T, y: T)(implicit ev: Ord.Impl[T]): T =
+    if (x < y) x else y
+
+  def inf[T](xs: List[T])(implicit ev: Ord.Impl[T]): T = {
+    val smallest = Ord.impl[T].minimum
+    xs.foldLeft(smallest)(min)
+  }
+
+  inf(List[Int]())
+  inf(List(List(1, 2), List(1, 2, 3)))
+  inf(List(List(List(1), List(2)), List(List(1), List(2), List(3))))
+}
+
+/** 3. Higher-kinded type classes
+
+    trait Functor[A] extends TypeClass1 {
+      def map[B](f: A => B): This[B]
+    }
+    common {
+      def pure[A](x: A): This[A]
+    }
+
+    // Generically, `pure[A]{.map(f)}^n`
+    def develop[A, F[X] : Functor[X]](n: Int, f: A => A): F[A] =
+      if (n == 0) Functor.impl[F].pure[A]
+      else develop[A, F](n - 1, f).map(f)
+
+    trait Monad[A] extends Functor[A] {
+      def flatMap[B](f: A => This[B]): This[B]
+      def map[B](f: A => B) = this.flatMap(f.andThen(pure))
+    }
+
+    extension ListMonad[T] for List[T] : Monad[T] {
+      static def pure[A] = Nil
+
+      def flatMap[B](f: A => List[B]): List[B] = this match {
+        case x :: xs => f(x) ++ xs.flatMap(f)
+        case Nil => Nil
+      }
+    }
+
+    extension MonadFlatten[T[X]: Monad[X]] for T[T[A]] {
+      def flatten: T[A] = this.flatMap(identity)
+    }
+*/
+object runtime1 {
+
+  trait TypeClass1 {
+    val commons: TypeClassCommon1
+    type This = [X] =>> commons.This[X]
+  }
+
+  trait TypeClassCommon1 { self =>
+    type This[X]
+    type Instance[X] <: TypeClass1
+    def inject[A](x: This[A]): Instance[A] { val commons: self.type }
+  }
+
+  trait TypeClassCompanion1 {
+    type Impl[T[_]] <: TypeClassCommon1 { type This = [X] =>> T[X] }
+    def impl[T[_]](implicit ev: Impl[T]): Impl[T] = ev
+  }
+
+  implicit def inject1[A, From[_]](x: From[A])
+      (implicit ev: TypeClassCommon1 {
+        type This = [X] =>> From[X]
+      }): ev.Instance[A] { type This = [X] =>> From[X] } =
+    ev.inject(x)
+}
+import runtime1.*
+
+object functors {
+
+  trait Functor[A] extends TypeClass1 {
+    val commons: FunctorCommon
+    import commons.*
+    def map[B](f: A => B): This[B]
+  }
+  trait FunctorCommon extends TypeClassCommon1 {
+    type Instance[X] <: Functor[X]
+    def pure[A](x: A): This[A]
+  }
+  object Functor extends TypeClassCompanion1 {
+    type Impl[T[_]] = FunctorCommon { type This = [X] =>> T[X] }
+  }
+
+  trait Monad[A] extends Functor[A] {
+    val commons: MonadCommon
+    import commons.*
+    def flatMap[B](f: A => This[B]): This[B]
+    def map[B](f: A => B) = this.flatMap(f.andThen(commons.pure))
+  }
+  trait MonadCommon extends FunctorCommon {
+    type Instance[X] <: Monad[X]
+  }
+  object Monad extends TypeClassCompanion1 {
+    type Impl[T[_]] = MonadCommon { type This = [X] =>> T[X] }
+  }
+
+  def develop[A, F[X]](n: Int, x: A, f: A => A)(implicit ev: Functor.Impl[F]): F[A] =
+    if (n == 0) Functor.impl[F].pure(x)
+    else develop(n - 1, x, f).map(f).asInstanceOf
+
+  implicit object ListMonad extends MonadCommon {
+    type This[+X] = List[X]
+    type Instance[X] = Monad[X]
+    def pure[A](x: A) = x :: Nil
+    def inject[A]($this: List[A]) = new Monad[A] {
+      val commons: ListMonad.this.type = ListMonad
+      import commons.*
+      def flatMap[B](f: A => List[B]): List[B] = $this.flatMap(f)
+    }
+  }
+
+  object MonadFlatten {
+    def flattened[T[_], A]($this: T[T[A]])(implicit ev: Monad.Impl[T]): T[A] =
+      ??? // $this.flatMap[A](identity)   disabled since it does not typecheck
+  }
+
+  MonadFlatten.flattened(List(List(1, 2, 3), List(4, 5))) // ok, synthesizes (using ListMonad)
+  MonadFlatten.flattened(List(List(1, 2, 3), List(4, 5)))(using ListMonad) // error
+}
\ No newline at end of file
diff --git a/tests/neg/validate-parsing-2.scala b/tests/neg/validate-parsing-2.scala
new file mode 100644
index 000000000000..7457c649bad0
--- /dev/null
+++ b/tests/neg/validate-parsing-2.scala
@@ -0,0 +1 @@
+case class ByName(x: => Int) // error
diff --git a/tests/neg/validate-parsing.scala b/tests/neg/validate-parsing.scala
index d0eee526ae90..2b416c6eab27 100644
--- a/tests/neg/validate-parsing.scala
+++ b/tests/neg/validate-parsing.scala
@@ -10,4 +10,3 @@ class C () {
 }
 class D override() // error: ';' expected but 'override' found.
 
-case class ByName(x: => Int) // error: `val' parameters may not be call-by-name
diff --git a/tests/neg/varargs-annot-2.scala b/tests/neg/varargs-annot-2.scala
new file mode 100644
index 000000000000..7b0fce1124ea
--- /dev/null
+++ b/tests/neg/varargs-annot-2.scala
@@ -0,0 +1,9 @@
+import annotation.varargs
+
+trait C {
+  @varargs def v(i: Int*) = ()
+}
+
+class D extends C { // error: name clash between defined and inherited member
+  def v(i: Array[Int]) = ()
+}
\ No newline at end of file
diff --git a/tests/neg/varargs-annot.scala b/tests/neg/varargs-annot.scala
index 490d2ab93695..d24b9d350d78 100644
--- a/tests/neg/varargs-annot.scala
+++ b/tests/neg/varargs-annot.scala
@@ -17,7 +17,7 @@ object Test {
 
   class D extends C {
     override def v(i: Int*) = () // error
-    def v(i: Array[Int]) = () // error
+    def v(i: Array[Int]) = () // ok, reported when used alone (see varargs-annot-2.scala)
   }
 
   @varargs def nov(a: Int) = 0 // error: A method without repeated parameters cannot be annotated with @varargs
diff --git a/tests/neg/zipped.scala b/tests/neg/zipped.scala
index c7d55da6000a..7f8909b605f3 100644
--- a/tests/neg/zipped.scala
+++ b/tests/neg/zipped.scala
@@ -1,38 +1,9 @@
-// This test shows some un-intuitive behavior of the `zipped` method.
 object Test {
   val xs: List[Int] = ???
 
-  // 1. This works, since withFilter is not defined on Tuple3zipped. Instead,
-  // an implicit conversion from Tuple3zipped to Traversable[(Int, Int, Int)] is inserted.
-  // The subsequent map operation has the right type for this Traversable.
   xs.lazyZip(xs).lazyZip(xs)
-    .withFilter( (x: (Int, Int, Int)) => x match { case (x, y, z) => true } )  // OK
-    .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z })     // OK
+    .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z })     // ok
 
-
-  // 2. This works as well, because of auto untupling i.e. `case` is inserted.
-  // But it does not work in Scala2.
-  xs.lazyZip(xs).lazyZip(xs)
-  .withFilter( (x: (Int, Int, Int)) => x match { case (x, y, z) => true } )  // OK
-  .map( (x: Int, y: Int, z: Int) => x + y + z )  // OK
-      // works, because of auto untupling i.e. `case` is inserted
-      // does not work in Scala2
-
-  // 3. Now, without withFilter, it's the opposite, we need the 3 parameter map.
-  xs.lazyZip(xs).lazyZip(xs)
-    .map( (x: Int, y: Int, z: Int) => x + y + z )     // OK
-
-  // 4. The single parameter map does not work.
-  xs.lazyZip(xs).lazyZip(xs)
-    .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z })     // error
-
-  // 5. If we leave out the parameter type, we get a "Wrong number of parameters" error instead
   xs.lazyZip(xs).lazyZip(xs)
     .map( x => x match { case (x, y, z) => x + y + z })     // error
-
-  // This means that the following works in Dotty in normal mode, since a `withFilter`
-  // is inserted. But it does no work under -strict. And it will not work in Scala 3.1.
-  // The reason is that without -strict, the code below is mapped to (1), but with -strict
-  // it is mapped to (5).
-  for ((x, y, z) <- xs.lazyZip(xs).lazyZip(xs)) yield x + y + z
 }
\ No newline at end of file
diff --git a/tests/patmat/andtype-opentype-interaction.check b/tests/patmat/andtype-opentype-interaction.check
index a9d8618adad0..b8f9fbc10ac9 100644
--- a/tests/patmat/andtype-opentype-interaction.check
+++ b/tests/patmat/andtype-opentype-interaction.check
@@ -1,5 +1,5 @@
-23: Pattern Match Exhaustivity: _: Trait & OpenTrait, _: Clazz & OpenTrait, _: AbstractClass & OpenTrait, _: SealedClass & OpenTrait
-27: Pattern Match Exhaustivity: _: Trait & OpenTrait & OpenTrait2, _: Clazz & OpenTrait & OpenTrait2, _: AbstractClass & OpenTrait & OpenTrait2, _: SealedClass & OpenTrait & OpenTrait2
+23: Pattern Match Exhaustivity: _: Trait & OpenTrait, _: Clazz & OpenTrait, _: AbstractClass & OpenTrait
+27: Pattern Match Exhaustivity: _: Trait & OpenTrait & OpenTrait2, _: Clazz & OpenTrait & OpenTrait2, _: AbstractClass & OpenTrait & OpenTrait2
 31: Pattern Match Exhaustivity: _: Trait & OpenClass
 35: Pattern Match Exhaustivity: _: Trait & OpenTrait & OpenClass
 43: Pattern Match Exhaustivity: _: Trait & OpenAbstractClass
diff --git a/tests/patmat/boxing.scala b/tests/patmat/boxing.scala
new file mode 100644
index 000000000000..d148e23deca1
--- /dev/null
+++ b/tests/patmat/boxing.scala
@@ -0,0 +1,18 @@
+class C {
+  def matchUnboxed(i: Integer) = i match {
+    case null => 0
+    case 1    => 1
+    case _    => 9
+  }
+
+  def matchBoxed(i: Int) = i match {
+    case C.ZERO => 0
+    case C.ONE  => 1
+    case _      => 9
+  }
+}
+
+object C {
+  final val ZERO: Integer = 0
+  final val ONE: Integer  = 1
+}
diff --git a/tests/patmat/dotty-trees.scala b/tests/patmat/dotty-trees.scala
new file mode 100644
index 000000000000..7fb1a86879b2
--- /dev/null
+++ b/tests/patmat/dotty-trees.scala
@@ -0,0 +1,11 @@
+abstract class Tree[-T >: Null]
+
+case class TypeTree[-T >: Null]() extends Tree[T]
+
+abstract class DerivedTypeTree() extends TypeTree[Null]
+
+def foo(tree: Tree[Null]): Unit =
+  tree match
+  case _: DerivedTypeTree =>
+  case TypeTree() =>
+  case _ =>
\ No newline at end of file
diff --git a/tests/patmat/exhausting.check b/tests/patmat/exhausting.check
index ff3536046ce5..cb1662883aa1 100644
--- a/tests/patmat/exhausting.check
+++ b/tests/patmat/exhausting.check
@@ -3,4 +3,4 @@
 32: Pattern Match Exhaustivity: List(_, _*)
 39: Pattern Match Exhaustivity: Bar3
 44: Pattern Match Exhaustivity: (Bar2, Bar2)
-50: Pattern Match Exhaustivity: (Bar2, Bar2)
+49: Pattern Match Exhaustivity: (Bar2, Bar2)
diff --git a/tests/patmat/exhausting.scala b/tests/patmat/exhausting.scala
index 640c9e88b100..9f17fae9def5 100644
--- a/tests/patmat/exhausting.scala
+++ b/tests/patmat/exhausting.scala
@@ -42,7 +42,6 @@ object Test {
   }
   // fails for: (Bar2, Bar2)
   def fail4[T <: AnyRef](xx: (Foo[T], Foo[T])) = xx match {
-    case (Bar1, Bar1) => ()
     case (Bar2, Bar3) => ()
     case (Bar3, _) => ()
   }
diff --git a/tests/patmat/i10174b.check b/tests/patmat/i10174b.check
index a8e6f96b4bac..582ce090b23d 100644
--- a/tests/patmat/i10174b.check
+++ b/tests/patmat/i10174b.check
@@ -1,2 +1,2 @@
-2: Pattern Match Exhaustivity: _: Int
-58: Match case Unreachable
+3: Pattern Match Exhaustivity: _: Int
+59: Match case Unreachable
diff --git a/tests/patmat/i10174b.scala b/tests/patmat/i10174b.scala
index f227f68c909b..875e19e8f037 100644
--- a/tests/patmat/i10174b.scala
+++ b/tests/patmat/i10174b.scala
@@ -1,3 +1,4 @@
+// scalac: -Ycheck-all-patmat
 def foo(x: Int): Unit =
     x match {
       case 1 =>
@@ -1001,4 +1002,4 @@ def foo(x: Int): Unit =
       case 998 =>
       case 999 =>
       case 1000 =>
-    }
\ No newline at end of file
+    }
diff --git a/tests/patmat/i10667.scala b/tests/patmat/i10667.scala
new file mode 100644
index 000000000000..fde5021929fc
--- /dev/null
+++ b/tests/patmat/i10667.scala
@@ -0,0 +1,15 @@
+sealed trait A
+
+enum Nums {
+  case One
+  case Two extends Nums with A
+  case Three
+}
+
+object Test {
+  val list = List[Nums & A](Nums.Two)
+
+  list.map {
+    case Nums.Two => ()
+  }
+}
diff --git a/tests/patmat/i12241.check b/tests/patmat/i12241.check
new file mode 100644
index 000000000000..1ad41cfa2ac1
--- /dev/null
+++ b/tests/patmat/i12241.check
@@ -0,0 +1 @@
+54: Pattern Match Exhaustivity: (EndpointInput.Pair(), EndpointInput.MappedPair()), (EndpointInput.Pair(), EndpointInput.Pair2()), (EndpointInput.Pair(), EndpointInput.MappedPair2()), (EndpointInput.Pair(), EndpointInput.FixedMethod()), (EndpointInput.Pair(), EndpointInput.FixedPath()), (EndpointInput.Pair(), EndpointInput.PathCapture())
diff --git a/tests/patmat/i12241.scala b/tests/patmat/i12241.scala
new file mode 100644
index 000000000000..4f61027e2f65
--- /dev/null
+++ b/tests/patmat/i12241.scala
@@ -0,0 +1,75 @@
+sealed trait EndpointInput[T]
+
+object EndpointInput {
+  case class Pair[T]() extends EndpointInput[T]
+  case class MappedPair[T]() extends EndpointInput[T]
+  case class Pair2[T]() extends EndpointInput[T]
+  case class MappedPair2[T]() extends EndpointInput[T]
+  case class FixedMethod[T]() extends EndpointInput[T]
+  case class FixedPath[T]() extends EndpointInput[T]
+  case class PathCapture[T]() extends EndpointInput[T]
+  case class PathsCapture[T]() extends EndpointInput[T]
+  case class Query[T]() extends EndpointInput[T]
+  case class QueryParams[T]() extends EndpointInput[T]
+  case class Cookie[T]() extends EndpointInput[T]
+  case class ExtractFromRequest[T]() extends EndpointInput[T]
+  case class ApiKey[T]() extends EndpointInput[T]
+  case class Http[T]() extends EndpointInput[T]
+  case class Body[R, T]() extends EndpointInput[T]
+  case class FixedHeader[T]() extends EndpointInput[T]
+  case class Header[T]() extends EndpointInput[T]
+  case class Headers[T]() extends EndpointInput[T]
+  case class StatusCode[T]() extends EndpointInput[T]
+  case class Empty[T]() extends EndpointInput[T]
+}
+
+object Test extends App {
+  import EndpointInput._
+
+  def compare(left: EndpointInput[_], right: EndpointInput[_]): Boolean =
+    (left, right) match {
+      case (Pair(), Pair()) => true
+      case (MappedPair(), MappedPair()) => true
+      case (Pair2(), Pair2()) => true
+      case (MappedPair2(), MappedPair2()) => true
+      case (FixedMethod(), FixedMethod()) => true
+      case (FixedPath(), FixedPath()) => true
+      case (PathCapture(), PathCapture()) => true
+      case (PathsCapture(), PathsCapture()) => true
+      case (Query(), Query()) => true
+      case (QueryParams(), QueryParams()) => true
+      case (Cookie(), Cookie()) => true
+      case (ExtractFromRequest(), ExtractFromRequest()) => true
+      case (ApiKey(), ApiKey()) => true
+      case (Http(), Http()) => true
+      case (Body(), Body()) => true
+      case (FixedHeader(), FixedHeader()) => true
+      case (Header(), Header()) => true
+      case (Headers(), Headers()) => true
+      case (StatusCode(), StatusCode()) => true
+      case (_, _) => false
+    }
+
+  def compare2(left: EndpointInput[_], right: EndpointInput[_]): Boolean =
+    (left, right) match {
+      case (Pair(), Pair()) => true
+      case (MappedPair(), MappedPair()) => true
+      case (Pair2(), Pair2()) => true
+      case (MappedPair2(), MappedPair2()) => true
+      case (FixedMethod(), FixedMethod()) => true
+      case (FixedPath(), FixedPath()) => true
+      case (PathCapture(), PathCapture()) => true
+      case (PathsCapture(), PathsCapture()) => true
+      case (Query(), Query()) => true
+      case (QueryParams(), QueryParams()) => true
+      case (Cookie(), Cookie()) => true
+      case (ExtractFromRequest(), ExtractFromRequest()) => true
+      case (ApiKey(), ApiKey()) => true
+      case (Http(), Http()) => true
+      case (Body(), Body()) => true
+      case (FixedHeader(), FixedHeader()) => true
+      case (Header(), Header()) => true
+      case (Headers(), Headers()) => true
+      case (StatusCode(), StatusCode()) => true
+    }
+}
diff --git a/tests/patmat/i12279.scala b/tests/patmat/i12279.scala
new file mode 100644
index 000000000000..5ba517757861
--- /dev/null
+++ b/tests/patmat/i12279.scala
@@ -0,0 +1,9 @@
+import scala.reflect.Typeable
+
+def unionTypeTest[T: Typeable](m: Int|T) =
+  m match
+  case x: Int => println("Got Int")
+  case t: T => println("Got T")
+
+@main def run =
+  unionTypeTest(())
diff --git a/tests/patmat/i12337.check b/tests/patmat/i12337.check
new file mode 100644
index 000000000000..2b314017a6dd
--- /dev/null
+++ b/tests/patmat/i12337.check
@@ -0,0 +1,2 @@
+8: Pattern Match Exhaustivity: Foo(Inactive)
+17: Pattern Match Exhaustivity: Foo(Status.Active(_))
diff --git a/tests/patmat/i12337.scala b/tests/patmat/i12337.scala
new file mode 100644
index 000000000000..efa3e04168d6
--- /dev/null
+++ b/tests/patmat/i12337.scala
@@ -0,0 +1,26 @@
+sealed trait Status
+object Status {
+  case class Active(since: Int) extends Status
+  case object Inactive extends Status
+}
+
+case class Foo(status: Status)
+def bar(foo: Foo): Unit = foo match {
+  case Foo(Status.Active(since)) =>
+    println(s"active since $since")
+}
+// Expected:
+// warning: match may not be exhaustive.
+// It would fail on the following input: Foo(Inactive)
+// def bar(foo: Foo): Unit = foo match {
+
+def baz(foo: Foo): Unit = foo match {
+  case Foo(Status.Active(2000)) =>
+    println("active since 2000")
+  case Foo(Status.Inactive) =>
+    println("inactive")
+}
+// Expected:
+// warning: match may not be exhaustive.
+// It would fail on the following input: Foo(Active((x: Int forSome x not in 2000)))
+// def baz(foo: Foo): Unit = foo match {
\ No newline at end of file
diff --git a/tests/patmat/i12358.check b/tests/patmat/i12358.check
new file mode 100644
index 000000000000..0ffca060173b
--- /dev/null
+++ b/tests/patmat/i12358.check
@@ -0,0 +1 @@
+3: Pattern Match Exhaustivity: List(_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _*), List(_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _), List(_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _), List(_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _), List(_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _), List(_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _)
diff --git a/tests/patmat/i12358.scala b/tests/patmat/i12358.scala
new file mode 100644
index 000000000000..9b8a865ae000
--- /dev/null
+++ b/tests/patmat/i12358.scala
@@ -0,0 +1,4 @@
+
+def foo(x: List[Int]): Unit =
+  x match
+  case x1 :: x2 :: x3 :: x4 :: x5 :: x6 :: x7 :: x8 :: x9 :: x10 :: x11 :: x12 :: x13 :: x14 :: x15 :: x16 :: x17 :: x18 :: x19 :: x20 :: x21 :: x22 :: Nil =>
\ No newline at end of file
diff --git a/tests/patmat/i12408.check b/tests/patmat/i12408.check
new file mode 100644
index 000000000000..60acc2cba84e
--- /dev/null
+++ b/tests/patmat/i12408.check
@@ -0,0 +1,2 @@
+13: Pattern Match Exhaustivity: A(_), C(_)
+21: Pattern Match
diff --git a/tests/patmat/i12408.scala b/tests/patmat/i12408.scala
new file mode 100644
index 000000000000..442e723cb195
--- /dev/null
+++ b/tests/patmat/i12408.scala
@@ -0,0 +1,24 @@
+class X[T] {
+  sealed trait P
+
+  case class A(id: Long)          extends P
+  case class B(id: Long, x: Long) extends P
+  case class C(id: Long)          extends P
+
+  def m(p: P): Unit = p match {
+    case B(_, x) =>
+    case _       =>
+  }
+
+  def n(p: P): Unit = p match {
+    case B(_, x) =>
+  }
+
+  def o(p: P): Unit = p match {
+    case A(_)    =>
+    case B(_, x) =>
+    case C(_)    =>
+    case _       =>
+  }
+
+}
diff --git a/tests/patmat/i12475.scala b/tests/patmat/i12475.scala
new file mode 100644
index 000000000000..11ff389df318
--- /dev/null
+++ b/tests/patmat/i12475.scala
@@ -0,0 +1,20 @@
+sealed trait Ty {
+  type T
+}
+
+class TUnit() extends Ty {
+  type T = Unit
+}
+
+case object TUnit extends TUnit()
+
+final case class TFun(dom: Ty, cod: Ty) extends Ty {
+  type T = dom.T => cod.T
+}
+
+def default(ty: Ty): ty.T = (ty: ty.type & Ty) match {
+  case a: (ty.type & TUnit) => (): a.T
+  case a: (ty.type & TFun) =>
+    val f = { (x: a.dom.T) => default(a.cod) }
+    f: a.T
+}
diff --git a/tests/patmat/i12475b.scala b/tests/patmat/i12475b.scala
new file mode 100644
index 000000000000..799d95c0477b
--- /dev/null
+++ b/tests/patmat/i12475b.scala
@@ -0,0 +1,14 @@
+trait SomeRestriction
+
+enum ADT {
+  case A
+  case B extends ADT with SomeRestriction
+}
+
+object MinimalExample {
+  val b: ADT & SomeRestriction = ADT.B
+
+  b match {
+    case ADT.B => ???
+  }
+}
diff --git a/tests/patmat/i12485.scala b/tests/patmat/i12485.scala
new file mode 100644
index 000000000000..66dc0a7b6bb8
--- /dev/null
+++ b/tests/patmat/i12485.scala
@@ -0,0 +1,4 @@
+case class A(a: A)
+
+def foo(x: A) = x match
+  case A(a) =>
\ No newline at end of file
diff --git a/tests/patmat/i12530.check b/tests/patmat/i12530.check
new file mode 100644
index 000000000000..636347516cbc
--- /dev/null
+++ b/tests/patmat/i12530.check
@@ -0,0 +1,2 @@
+6: Match case Unreachable
+14: Match case Unreachable
diff --git a/tests/patmat/i12530.scala b/tests/patmat/i12530.scala
new file mode 100644
index 000000000000..acba5e9ebafa
--- /dev/null
+++ b/tests/patmat/i12530.scala
@@ -0,0 +1,16 @@
+object Test {
+  def foo(a: Boolean, b: Boolean): Unit =
+    (a, b) match {
+      case (false, _) =>
+      case (true,  _) =>
+      case (_, false) => // error: unreachable
+    }
+
+  def bar(a: Option[Boolean], b: Boolean): Unit =
+    (a, b) match {
+      case (Some(false), _) =>
+      case (Some(true), _) =>
+      case (None, _) =>
+      case (_, false) => // reachable: null
+    }
+}
diff --git a/tests/patmat/i12546.scala b/tests/patmat/i12546.scala
new file mode 100644
index 000000000000..23cbfaa77c06
--- /dev/null
+++ b/tests/patmat/i12546.scala
@@ -0,0 +1,14 @@
+trait SomeRestriction
+
+enum ADT {
+  case A extends ADT
+  case B extends ADT with SomeRestriction
+}
+
+object MinimalExample {
+  val b: ADT & SomeRestriction = ADT.B
+
+  b match {
+    case ADT.B => ???
+  }
+}
diff --git a/tests/patmat/i12559.check b/tests/patmat/i12559.check
new file mode 100644
index 000000000000..34be8d4104f9
--- /dev/null
+++ b/tests/patmat/i12559.check
@@ -0,0 +1,2 @@
+10: Match case Unreachable
+27: Match case Unreachable
diff --git a/tests/patmat/i12559.scala b/tests/patmat/i12559.scala
new file mode 100644
index 000000000000..1f043d21e5bd
--- /dev/null
+++ b/tests/patmat/i12559.scala
@@ -0,0 +1,35 @@
+package akka.event
+
+object TestA:
+  sealed trait LogEvent
+
+  object LogEvent:
+    def myOrdinal(e: LogEvent): Int = e match
+      case e: Error => 0
+      // case e: Warning => 1
+      case e: LogEventWithMarker => 2
+
+
+  class Error() extends LogEvent
+  class Error2() extends Error() with LogEventWithMarker
+
+  // case class Warning() extends LogEvent
+
+  sealed trait LogEventWithMarker extends LogEvent
+
+object TestB:
+  sealed trait LogEvent
+
+  object LogEvent:
+    def myOrdinal(e: LogEvent): Int = e match
+      case e: Error => 0
+      case e: Warning => 1
+      case e: LogEventWithMarker => 2
+
+
+  case class Error() extends LogEvent
+  class Error2() extends Error() with LogEventWithMarker
+
+  case class Warning() extends LogEvent
+
+  sealed trait LogEventWithMarker extends LogEvent
\ No newline at end of file
diff --git a/tests/patmat/i12602.scala b/tests/patmat/i12602.scala
new file mode 100644
index 000000000000..3dac513a930c
--- /dev/null
+++ b/tests/patmat/i12602.scala
@@ -0,0 +1,2 @@
+sealed class Foo[T]
+object Foo extends Foo[Nothing]
diff --git a/tests/patmat/i12681.scala b/tests/patmat/i12681.scala
new file mode 100644
index 000000000000..b367e1563611
--- /dev/null
+++ b/tests/patmat/i12681.scala
@@ -0,0 +1,20 @@
+object Examples {
+
+  case class Leaf1() extends i.Root
+  case class Leaf2() extends i.Branch
+
+  val i = new Inner()
+
+  class Inner {
+
+    sealed trait Root
+    sealed trait Branch extends Root
+
+    // simulate ordinal method of a Mirror.SumOf generated at this call site
+    def myOrdinal(r: Root): Int = r match {
+      case _: Examples.Leaf1  => 0
+      case _: Inner.this.Branch => 1
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/tests/patmat/i12805-fallout.scala b/tests/patmat/i12805-fallout.scala
new file mode 100644
index 000000000000..b598b36159ea
--- /dev/null
+++ b/tests/patmat/i12805-fallout.scala
@@ -0,0 +1,30 @@
+import scala.annotation.unchecked.uncheckedVariance
+
+type Untyped = Null
+
+class Type
+
+abstract class Tree[-T >: Untyped] {
+  type ThisTree[T >: Untyped] <: Tree[T]
+
+  protected var myTpe: T @uncheckedVariance = _
+
+  def withType(tpe: Type): ThisTree[Type] = {
+    val tree = this.asInstanceOf[ThisTree[Type]]
+    tree.myTpe = tpe
+    tree
+  }
+}
+
+case class   Ident[-T >: Untyped]() extends Tree[T]
+case class  DefDef[-T >: Untyped]() extends Tree[T]
+case class Inlined[-T >: Untyped]() extends Tree[T]
+case class CaseDef[-T >: Untyped]() extends Tree[T]
+
+def test[T >: Untyped](tree: Tree[T], tp: Type) = tree.withType(tp) match {
+  case Ident()       => 1
+  case DefDef()      => 2
+  case _: Inlined[_] => 3
+  case CaseDef()     => 4
+  case _             => 5
+}
diff --git a/tests/patmat/i12805.check b/tests/patmat/i12805.check
new file mode 100644
index 000000000000..e855c765d801
--- /dev/null
+++ b/tests/patmat/i12805.check
@@ -0,0 +1,3 @@
+10: Match case Unreachable
+16: Match case Unreachable
+22: Match case Unreachable
diff --git a/tests/patmat/i12805.scala b/tests/patmat/i12805.scala
new file mode 100644
index 000000000000..78240c2f9703
--- /dev/null
+++ b/tests/patmat/i12805.scala
@@ -0,0 +1,22 @@
+import scala.language.implicitConversions
+
+type Timeframe = "1m" | "2m" | "1H"
+type TimeframeN = 1 | 2 | 60
+
+def manualConvertToN(tf: Timeframe): TimeframeN = tf match
+  case "1m" => 1
+  case "2m" => 2
+  case "1H" => 60
+  case "4H" => ??? // was: no reachability warning
+
+given Conversion[Timeframe, TimeframeN] =
+  case "1m" => 1
+  case "2m" => 2
+  case "1H" => 60
+  case "4H" => ??? // was: no reachability warning
+
+given Conversion[TimeframeN, Timeframe] =
+  case 1 => "1m"
+  case 2 => "2m"
+  case 60 => "1H"
+  case 240 => ??? // was: no reachability warning
diff --git a/tests/patmat/i12805b.check b/tests/patmat/i12805b.check
new file mode 100644
index 000000000000..62ba8523f65e
--- /dev/null
+++ b/tests/patmat/i12805b.check
@@ -0,0 +1,3 @@
+4: Match case Unreachable
+9: Match case Unreachable
+14: Match case Unreachable
diff --git a/tests/patmat/i12805b.scala b/tests/patmat/i12805b.scala
new file mode 100644
index 000000000000..cbff6ae0d2ca
--- /dev/null
+++ b/tests/patmat/i12805b.scala
@@ -0,0 +1,14 @@
+def test1(a: 1 | 2) = a match
+  case 1 => true
+  case 2 => false
+  case 4 => ??? // unreachable case, was: no warning
+
+def test2(a: 1 | 2) = a match
+  case 1 => true
+  case 2 => false
+  case _ => ??? // unreachable
+
+def test3(a: 1 | 2) = a match
+  case 1 => true
+  case 2 => false
+  case a if a < 0 => ??? // unreachable
diff --git a/tests/patmat/i12808.scala b/tests/patmat/i12808.scala
new file mode 100644
index 000000000000..b0c5aad78a64
--- /dev/null
+++ b/tests/patmat/i12808.scala
@@ -0,0 +1,10 @@
+import scala.reflect.Typeable
+
+case class Err1()
+case class Err2()
+
+def handleError[A: Typeable, B: Typeable](x: Either[A | B, Nothing]): Unit =
+  x match // false alarm warning: It would fail on pattern case: Left(_)
+  case Left(e: A)  => println("A")
+  case Left(_: B) => println("B")
+  case Right(_)    => println("Nothing")
diff --git a/tests/patmat/i13003.check b/tests/patmat/i13003.check
new file mode 100644
index 000000000000..19fb6a466549
--- /dev/null
+++ b/tests/patmat/i13003.check
@@ -0,0 +1,4 @@
+4: Pattern Match Exhaustivity: One(Two(None))
+7: Pattern Match Exhaustivity: Two(None)
+10: Pattern Match Exhaustivity: None, Some(None)
+13: Pattern Match Exhaustivity: None, Some(None), Some(Some(None))
diff --git a/tests/patmat/i13003.scala b/tests/patmat/i13003.scala
new file mode 100644
index 000000000000..af9158e09c5e
--- /dev/null
+++ b/tests/patmat/i13003.scala
@@ -0,0 +1,14 @@
+case class One(two: Two)
+case class Two(o: Option[Int])
+
+def matchOneTwo(one: One) = one match
+    case One(Two(Some(i))) => "match!"
+
+def matchTwo(two: Two) = two match
+    case Two(Some(i)) => "match!"
+
+def matchOO(oo: Option[Option[Int]]) = oo match
+    case Some(Some(i)) => "match!"
+
+def matchOOO(ooo: Option[Option[Option[Int]]]) = ooo match
+    case Some(Some(Some(i))) => "match!"
diff --git a/tests/patmat/i13110.scala b/tests/patmat/i13110.scala
new file mode 100644
index 000000000000..e5a143a948a9
--- /dev/null
+++ b/tests/patmat/i13110.scala
@@ -0,0 +1,12 @@
+object Test {
+  sealed trait Base
+  class Blub extends Base
+  object Blub {
+    def unapply(blub: Blub): Some[(Int, blub.type)] =
+      Some(1 -> blub)
+  }
+
+  (null: Base) match {
+    case Blub(i, x) => println(i)
+  }
+}
diff --git a/tests/patmat/i13189.scala b/tests/patmat/i13189.scala
new file mode 100644
index 000000000000..f633cbf9a514
--- /dev/null
+++ b/tests/patmat/i13189.scala
@@ -0,0 +1,89 @@
+// original report
+def foo(opt: Option[Tuple.Tail[NonEmptyTuple]]): Unit =
+  opt match
+    case None => ???
+    case Some(a) => ???
+
+
+// again with a mini-Tuple with the extra NonEmptyTupExtra parent, to test transitivity
+object WithExtraParent:
+  sealed trait Tup
+
+  object Tup {
+    type Tail[X <: NonEmptyTup] <: Tup = X match {
+      case _ **: xs => xs
+    }
+  }
+
+  object EmptyTup extends Tup
+
+  sealed trait NonEmptyTup extends Tup
+  sealed trait NonEmptyTupExtra extends NonEmptyTup
+  sealed abstract class **:[+H, +T <: Tup] extends NonEmptyTupExtra
+
+  object **: {
+    def unapply[H, T <: Tup](x: H **: T): (H, T) = null
+  }
+
+  def foo(opt: Option[Tup.Tail[NonEmptyTup]]): Unit =
+    opt match
+      case None => ???
+      case Some(a) => ???
+end WithExtraParent
+
+
+// again with a non-abstract parent
+object WithNonAbstractParent:
+  sealed trait Tup
+
+  object Tup {
+    type Tail[X <: NonEmptyTup] <: Tup = X match {
+      case _ **: xs => xs
+    }
+  }
+
+  object EmptyTup extends Tup
+
+  sealed class NonEmptyTup extends Tup
+  sealed class **:[+H, +T <: Tup] extends NonEmptyTup
+
+  object **: {
+    def unapply[H, T <: Tup](x: H **: T): (H, T) = null
+  }
+
+  def foo(opt: Option[Tup.Tail[NonEmptyTup]]): Unit =
+    opt match
+      case None => ???
+      case Some(a) => ???
+end WithNonAbstractParent
+
+
+// again with multiple children, but an exhaustive match
+object WithExhaustiveMatch:
+  sealed trait Tup
+
+  object Tup {
+    type Tail[X <: NonEmptyTup] <: Tup = X match {
+      case _ **: xs => xs
+      case _ *+: xs => xs
+    }
+  }
+
+  object EmptyTup extends Tup
+
+  sealed trait NonEmptyTup extends Tup
+  sealed abstract class **:[+H, +T <: Tup] extends NonEmptyTup
+  sealed abstract class *+:[+H, +T <: Tup] extends NonEmptyTup
+
+  object **: {
+    def unapply[H, T <: Tup](x: H **: T): (H, T) = null
+  }
+  object *+: {
+    def unapply[H, T <: Tup](x: H *+: T): (H, T) = null
+  }
+
+  def foo(opt: Option[Tup.Tail[NonEmptyTup]]): Unit =
+    opt match
+      case None => ???
+      case Some(a) => ???
+end WithExhaustiveMatch
diff --git a/tests/patmat/i13342-testing.check b/tests/patmat/i13342-testing.check
new file mode 100644
index 000000000000..5a1a1e80447f
--- /dev/null
+++ b/tests/patmat/i13342-testing.check
@@ -0,0 +1,5 @@
+13: Match case Unreachable
+13: Match case Unreachable
+14: Match case Unreachable
+14: Match case Unreachable
+15: Pattern Match Exhaustivity: Thu, Fri
diff --git a/tests/patmat/i13342-testing.scala b/tests/patmat/i13342-testing.scala
new file mode 100644
index 000000000000..8ea22d79917f
--- /dev/null
+++ b/tests/patmat/i13342-testing.scala
@@ -0,0 +1,18 @@
+class C {
+  val bool: true      = true
+  val not1: None.type = None
+
+  def t1 = true match { case true => "inline true" }
+  def t2 = bool match { case true => "valdef true" }
+  def t3 = None match { case None => "inline None" }
+  def t4 = not1 match { case None => "valdef None" }
+
+  val monday: Day.Mon.type = Day.Mon
+  val someday: Day         = Day.Mon
+
+  def t5 = Day.Mon match { case Day.Mon => 1 case Day.Tue => 2 case Day.Wed => 3 }
+  def t6 = monday  match { case Day.Mon => 1 case Day.Tue => 2 case Day.Wed => 3 }
+  def t7 = someday match { case Day.Mon => 1 case Day.Tue => 2 case Day.Wed => 3 }
+}
+
+enum Day { case Mon, Tue, Wed, Thu, Fri }
diff --git a/tests/patmat/i13342.check b/tests/patmat/i13342.check
new file mode 100644
index 000000000000..77e4f7cd4ed3
--- /dev/null
+++ b/tests/patmat/i13342.check
@@ -0,0 +1 @@
+8: Match case Unreachable
diff --git a/tests/patmat/i13342.scala b/tests/patmat/i13342.scala
new file mode 100644
index 000000000000..d706442dd692
--- /dev/null
+++ b/tests/patmat/i13342.scala
@@ -0,0 +1,10 @@
+class C {
+  def m(x: true) = x match { // was: match may not be exhaustive.\nIt would fail on pattern case: false
+    case true => println("the one true path")
+  }
+
+  def n(x: true) = x match {
+    case true => 1
+    case false => 2 // was: no reachability warning on this case
+  }
+}
diff --git a/tests/patmat/i13485.check b/tests/patmat/i13485.check
new file mode 100644
index 000000000000..f9d066905a86
--- /dev/null
+++ b/tests/patmat/i13485.check
@@ -0,0 +1,2 @@
+11: Match case Unreachable
+16: Match case Unreachable
diff --git a/tests/patmat/i13485.scala b/tests/patmat/i13485.scala
new file mode 100644
index 000000000000..72cc3a3d2cd3
--- /dev/null
+++ b/tests/patmat/i13485.scala
@@ -0,0 +1,16 @@
+// The intent of this test is test that changing the order of cases doesn't affect whether
+// warnings, originally reachability warnings but exhaustivity warnings too, are emitted.
+// To do so we need a case that typechecks but is statically assessed to be unreachable.
+// How about... a type pattern on a sealed trait that the scrutinee type doesn't extend?
+
+sealed trait Foo
+
+class Bar
+
+def test1(bar: Bar) = bar match
+  case _: Foo => 1
+  case _: Bar => 2
+
+def test2(bar: Bar) = bar match
+  case _: Bar => 2
+  case _: Foo => 1
diff --git a/tests/patmat/i13737.check b/tests/patmat/i13737.check
new file mode 100644
index 000000000000..87d5896f5a1a
--- /dev/null
+++ b/tests/patmat/i13737.check
@@ -0,0 +1 @@
+14: Pattern Match Exhaustivity: _: Success
diff --git a/tests/patmat/i13737.scala b/tests/patmat/i13737.scala
new file mode 100644
index 000000000000..f415e9028334
--- /dev/null
+++ b/tests/patmat/i13737.scala
@@ -0,0 +1,15 @@
+sealed trait Result
+
+case class Success(result: String, next: Int) extends Result {
+  def isEmpty: Boolean = 10 % 2 == 1
+  def get: String = result
+}
+
+object Success {
+  def unapply(x: Success): Success = x
+}
+
+def main =
+  val res: Result = ???
+  res match // error
+    case Success(v) => v
diff --git a/tests/patmat/i13931.scala b/tests/patmat/i13931.scala
new file mode 100644
index 000000000000..0d8d9eb9dcd3
--- /dev/null
+++ b/tests/patmat/i13931.scala
@@ -0,0 +1,7 @@
+class Test:
+  def test = Vector() match
+    case Seq() => println("empty")
+    case _ => println("non-empty")
+
+  def test2 = IndexedSeq() match { case IndexedSeq() => case _ => }
+  def test3 = IndexedSeq() match { case IndexedSeq(1) => case _ => }
diff --git a/tests/patmat/i14102.min.scala b/tests/patmat/i14102.min.scala
new file mode 100644
index 000000000000..fe92c7bc164a
--- /dev/null
+++ b/tests/patmat/i14102.min.scala
@@ -0,0 +1,7 @@
+trait Foo[-X]
+case class Bar(n: Int) extends Foo[Nothing]
+
+def test[X](foo: Foo[X]) = foo match
+  case Bar(1) =>
+  case Bar(_) =>
+  case _      =>
diff --git a/tests/patmat/i14102.scala b/tests/patmat/i14102.scala
new file mode 100644
index 000000000000..75aa983710fb
--- /dev/null
+++ b/tests/patmat/i14102.scala
@@ -0,0 +1,8 @@
+trait T[-X]
+case class CC[-X](x: List[T[X]]) extends T[Nothing]
+case class Id[-X](x: String) extends T[X]
+
+def f[X](tree: T[X]) = tree match
+  case CC(Id("hi") :: Nil) => ???
+  case CC(refs) => ???
+  case _ => ???
diff --git a/tests/patmat/i6197d.check b/tests/patmat/i6197d.check
index 1f4a130c3f86..cb1b11d4b326 100644
--- a/tests/patmat/i6197d.check
+++ b/tests/patmat/i6197d.check
@@ -1 +1 @@
-5: Pattern Match Exhaustivity: _: Array[String]
+6: Pattern Match Exhaustivity: _: Array[String]
diff --git a/tests/patmat/i6197d.scala b/tests/patmat/i6197d.scala
index 247a5f12020d..419c6e7ec2fa 100644
--- a/tests/patmat/i6197d.scala
+++ b/tests/patmat/i6197d.scala
@@ -1,7 +1,8 @@
+// scalac: -Ycheck-all-patmat
 def foo(x: Array[String]) = x match {
   case _: Array[_] =>
 }
 
 def bar(x: Array[String]) = x match {
   case _: Array[_ <: Int] =>
-}
\ No newline at end of file
+}
diff --git a/tests/patmat/i6255b.check b/tests/patmat/i6255b.check
index 582d2e65bc51..265ec9fa9c4b 100644
--- a/tests/patmat/i6255b.check
+++ b/tests/patmat/i6255b.check
@@ -1 +1 @@
-2: Pattern Match Exhaustivity: _: Expr[Int]
+3: Pattern Match Exhaustivity: _: Expr[Int]
diff --git a/tests/patmat/i6255b.scala b/tests/patmat/i6255b.scala
index a5c52c8f28dc..02fba4ad9100 100644
--- a/tests/patmat/i6255b.scala
+++ b/tests/patmat/i6255b.scala
@@ -1,3 +1,4 @@
+// scalac: -Ycheck-all-patmat
 class Foo {
   def foo(x: quoted.Expr[Int])(using scala.quoted.Quotes): Unit = x match {
     case '{ 1 } =>
diff --git a/tests/patmat/i8922c.check b/tests/patmat/i8922c.check
index be8f69feb884..acd56ccd2986 100644
--- a/tests/patmat/i8922c.check
+++ b/tests/patmat/i8922c.check
@@ -1 +1 @@
-26: Pattern Match Exhaustivity: (true, _: String, _), (true, _: Double, _), (true, true, _), (true, false, _), (true, (), _), (false, _: String, _)
+26: Pattern Match Exhaustivity: (_: Int, _: String, _), (_: Int, _: Int, BANG), (_: Int, _: Int, BANG_EQUAL), (_: Int, _: Int, EQUAL), (_: Int, _: Int, EQUAL_EQUAL), (_: Int, true, _)
diff --git a/tests/patmat/irrefutable.check b/tests/patmat/irrefutable.check
index 383a04115664..3d07c35a5502 100644
--- a/tests/patmat/irrefutable.check
+++ b/tests/patmat/irrefutable.check
@@ -1,2 +1,2 @@
 22: Pattern Match Exhaustivity: _: A, _: B, C(_, _)
-65: Pattern Match Exhaustivity: ExM(_, _)
+65: Pattern Match Exhaustivity: _: M
diff --git a/tests/patmat/null.check b/tests/patmat/null.check
index da081e6b56c0..d9c265adf377 100644
--- a/tests/patmat/null.check
+++ b/tests/patmat/null.check
@@ -1,4 +1,3 @@
-6: Match case Unreachable
+6: Pattern Match
 13: Pattern Match
-18: Match case Unreachable
 20: Pattern Match
diff --git a/tests/patmat/patmat-indent.check b/tests/patmat/patmat-indent.check
index 4f0ec4dd99df..7689dd60d8bf 100644
--- a/tests/patmat/patmat-indent.check
+++ b/tests/patmat/patmat-indent.check
@@ -1,3 +1,3 @@
-9: Pattern Match Exhaustivity: Nil
-23: Pattern Match Exhaustivity: true, false
-27: Pattern Match Exhaustivity: _: Int
+10: Pattern Match Exhaustivity: Nil
+24: Pattern Match Exhaustivity: true, false
+28: Pattern Match Exhaustivity: _: Int
diff --git a/tests/patmat/patmat-indent.scala b/tests/patmat/patmat-indent.scala
index a2b18e7fb1f8..f62d704f8ca0 100644
--- a/tests/patmat/patmat-indent.scala
+++ b/tests/patmat/patmat-indent.scala
@@ -1,3 +1,4 @@
+// scalac: -Ycheck-all-patmat
 object Test {
   val Nil: scala.collection.immutable.Nil.type = scala.collection.immutable.Nil
   val X = 5
@@ -27,4 +28,4 @@ object Test {
   def foo3(x: Int) = x match {
     case X => 0
   }
-}
\ No newline at end of file
+}
diff --git a/tests/patmat/t10019.check b/tests/patmat/t10019.check
index 6648193ae4e8..4eb648ea2ae4 100644
--- a/tests/patmat/t10019.check
+++ b/tests/patmat/t10019.check
@@ -1,2 +1,2 @@
-2: Pattern Match Exhaustivity: (List(_, _, _*), List(_, _*)), (Nil, List(_, _*)), (List(_, _*), List(_, _, _*)), (List(_, _*), Nil)
+2: Pattern Match Exhaustivity: (List(_, _, _*), _: List), (Nil, List(_, _*)), (_: List, List(_, _, _*)), (List(_, _*), Nil)
 11: Pattern Match Exhaustivity: (Foo(None), Foo(_))
diff --git a/tests/patmat/t10502.check b/tests/patmat/t10502.check
index b92e0d7cae8a..11be4c628b63 100644
--- a/tests/patmat/t10502.check
+++ b/tests/patmat/t10502.check
@@ -1,4 +1,4 @@
-5: Pattern Match Exhaustivity: Perhaps(None)
-15: Pattern Match Exhaustivity: Nil
-31: Pattern Match Exhaustivity: Multi(None, _)
-44: Pattern Match Exhaustivity: Prod(None, _)
+6: Pattern Match Exhaustivity: Perhaps(None)
+16: Pattern Match Exhaustivity: Nil
+32: Pattern Match Exhaustivity: Multi(None, _)
+45: Pattern Match Exhaustivity: Prod(None, _)
diff --git a/tests/patmat/t10502.scala b/tests/patmat/t10502.scala
index adf6b4df49fa..71066fdb7ae8 100644
--- a/tests/patmat/t10502.scala
+++ b/tests/patmat/t10502.scala
@@ -1,3 +1,4 @@
+// scalac: -Ycheck-all-patmat
 object Perhaps {
 
   def unapply[A](oa: Option[A]): Some[Option[A]] = Some(oa)
diff --git a/tests/patmat/t3163.check b/tests/patmat/t3163.check
index 51c58f9e3fe8..15f00dbfcebe 100644
--- a/tests/patmat/t3163.check
+++ b/tests/patmat/t3163.check
@@ -1 +1 @@
-2: Pattern Match Exhaustivity: _: AnyVal
+3: Pattern Match Exhaustivity: _: AnyVal
diff --git a/tests/patmat/t3163.scala b/tests/patmat/t3163.scala
index 2e0f2c1d9482..19aa6fe93ca8 100644
--- a/tests/patmat/t3163.scala
+++ b/tests/patmat/t3163.scala
@@ -1,3 +1,4 @@
+// scalac: -Ycheck-all-patmat
 object Test {
   def foo(x : AnyVal) = x match {case b : Boolean => "It's a bool"}
-}
\ No newline at end of file
+}
diff --git a/tests/patmat/t4526.check b/tests/patmat/t4526.check
index ac3ef01bcc23..17e8200e9b1d 100644
--- a/tests/patmat/t4526.check
+++ b/tests/patmat/t4526.check
@@ -1,3 +1,3 @@
-2: Pattern Match Exhaustivity: _: Int
-7: Pattern Match Exhaustivity: (_, _)
-12: Pattern Match Exhaustivity: (true, true), (false, false)
+3: Pattern Match Exhaustivity: _: Int
+8: Pattern Match Exhaustivity: (_, _)
+13: Pattern Match Exhaustivity: (true, true), (false, false)
diff --git a/tests/patmat/t4526.scala b/tests/patmat/t4526.scala
index d531c6b34304..016f3782b65b 100644
--- a/tests/patmat/t4526.scala
+++ b/tests/patmat/t4526.scala
@@ -1,3 +1,4 @@
+// scalac: -Ycheck-all-patmat
 object Test{
   def foo(a: Int) = a match {
     case 5  => "Five!"
@@ -13,4 +14,4 @@ object Test{
     case (true, false)  => "tf"
     case (false, true) =>  "ft"
   }
-}
\ No newline at end of file
+}
diff --git a/tests/patmat/t4661b.check b/tests/patmat/t4661b.check
index 50b0c4da452e..d19d4c6db744 100644
--- a/tests/patmat/t4661b.check
+++ b/tests/patmat/t4661b.check
@@ -1,2 +1,2 @@
-10: Pattern Match Exhaustivity: _: c.Foo
-13: Match case Unreachable
+11: Pattern Match Exhaustivity: _: c.Foo
+14: Match case Unreachable
diff --git a/tests/patmat/t4661b.scala b/tests/patmat/t4661b.scala
index ee95ff08ca07..f2329020cb66 100644
--- a/tests/patmat/t4661b.scala
+++ b/tests/patmat/t4661b.scala
@@ -1,3 +1,4 @@
+// scalac: -Ycheck-all-patmat
 class C {
   trait Foo
   class One extends Foo
diff --git a/tests/patmat/t9351.check b/tests/patmat/t9351.check
index 379adffd5a61..b5baf54469fc 100644
--- a/tests/patmat/t9351.check
+++ b/tests/patmat/t9351.check
@@ -1,3 +1,3 @@
-8: Pattern Match Exhaustivity: _: A
-17: Pattern Match Exhaustivity: (_, _)
-28: Pattern Match Exhaustivity: (_, _)
+9: Pattern Match Exhaustivity: _: A
+18: Pattern Match Exhaustivity: (_, _)
+29: Pattern Match Exhaustivity: (_, _)
diff --git a/tests/patmat/t9351.scala b/tests/patmat/t9351.scala
index 9b9bd4312ae7..b43fa948ce87 100644
--- a/tests/patmat/t9351.scala
+++ b/tests/patmat/t9351.scala
@@ -1,3 +1,4 @@
+// scalac: -Ycheck-all-patmat
 trait A {}
 case object B extends A {}
 case object C extends A {}
diff --git a/tests/patmat/t9809.check b/tests/patmat/t9809.check
index ff3fb4c63f64..6baed9fb58f0 100644
--- a/tests/patmat/t9809.check
+++ b/tests/patmat/t9809.check
@@ -1,2 +1,2 @@
-3: Pattern Match Exhaustivity: (_, _)
-7: Pattern Match Exhaustivity: (_, _)
+4: Pattern Match Exhaustivity: (_, _)
+8: Pattern Match Exhaustivity: (_, _)
diff --git a/tests/patmat/t9809.scala b/tests/patmat/t9809.scala
index 45d4946cdbe4..72ff23b11e51 100644
--- a/tests/patmat/t9809.scala
+++ b/tests/patmat/t9809.scala
@@ -1,3 +1,4 @@
+// scalac: -Ycheck-all-patmat
 object Example {
   val op1: (Any, Any) => Unit = {
     case (_, b: Int) =>
diff --git a/tests/pending/i12194.scala b/tests/pending/i12194.scala
new file mode 100644
index 000000000000..29916c461549
--- /dev/null
+++ b/tests/pending/i12194.scala
@@ -0,0 +1,16 @@
+import scala.annotation.implicitNotFound
+import scala.compiletime.package$package.summonAll
+import scala.util.Try
+import scala.util.Success
+import scala.util.Failure
+import scala.util.NotGiven
+import scala.deriving.*
+
+def f(): Unit =
+  var t = (??? : Tuple1[ValueOf["foo"]]); t.toList.map(identity)
+  (??? : Tuple1[ValueOf["foo"]]).toList.map(identity)
+
+@main def Test(): Unit =
+  println(summonAll[Tuple.Map[("foo", "bar"), ValueOf]].toList.map{
+    case str: ValueOf[_] ⇒ str.value
+  })
\ No newline at end of file
diff --git a/tests/plugins/custom/analyzer/Analyzer_1.scala b/tests/plugins/custom/analyzer/Analyzer_1.scala
index 1a42119f8878..0e1cc53290d0 100644
--- a/tests/plugins/custom/analyzer/Analyzer_1.scala
+++ b/tests/plugins/custom/analyzer/Analyzer_1.scala
@@ -1,6 +1,6 @@
-// Similar code resides in scripted tests, which only runs on nightly:
+// Similar code resides in scripted tests:
 //
-// sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin
+// sbt-test/analyzer-plugin/plugin
 //
 // You may want to change the code there too
 
diff --git a/tests/pos-custom-args/erased/i7878.scala b/tests/pos-custom-args/erased/i7878.scala
index 18005e81eab3..63b082d52ca0 100644
--- a/tests/pos-custom-args/erased/i7878.scala
+++ b/tests/pos-custom-args/erased/i7878.scala
@@ -2,7 +2,7 @@ object Boom {
   import scala.compiletime.*
   trait Fail[A <: Int, B <: Int]
 
-  erased transparent inline given fail[X <: Int, Y <: Int]: Fail[X, Y] = {
+  transparent inline given fail[X <: Int, Y <: Int]: Fail[X, Y] = {
      scala.compiletime.summonFrom {
        case t: Fail[X, y] if constValue[y] < constValue[Y] => ???
     }
@@ -12,4 +12,4 @@ object Boom {
   given ev1: Fail[a.type, 2] = null
 
   summon[Fail[a.type, 3]]
-}
\ No newline at end of file
+}
diff --git a/tests/pos-custom-args/erasedInline.scala b/tests/pos-custom-args/erasedInline.scala
new file mode 100644
index 000000000000..6230dfb3dcb2
--- /dev/null
+++ b/tests/pos-custom-args/erasedInline.scala
@@ -0,0 +1,4 @@
+import language.experimental.erasedDefinitions
+
+erased inline def f: Unit = () // error: illegal combination of modifiers: `erased` and `inline` for: method f
+inline def g: Unit = ()
diff --git a/tests/pos-custom-args/help.scala b/tests/pos-custom-args/help.scala
new file mode 100644
index 000000000000..257186338e40
--- /dev/null
+++ b/tests/pos-custom-args/help.scala
@@ -0,0 +1,4 @@
+
+// dummy source for exercising information flags
+//
+class Help
diff --git a/tests/pos-custom-args/i10383.scala b/tests/pos-custom-args/i10383.scala
new file mode 100644
index 000000000000..ca54464eb514
--- /dev/null
+++ b/tests/pos-custom-args/i10383.scala
@@ -0,0 +1 @@
+def r = BigInt(1) to BigInt(3) // error
diff --git a/tests/pos-custom-args/i13044.scala b/tests/pos-custom-args/i13044.scala
new file mode 100644
index 000000000000..33a20b5800c8
--- /dev/null
+++ b/tests/pos-custom-args/i13044.scala
@@ -0,0 +1,51 @@
+import scala.deriving.Mirror
+import scala.compiletime._
+
+trait Schema[T] {
+  def build: T
+}
+
+object Schema extends SchemaDerivation {
+  implicit lazy val int: Schema[Int]   = ???
+  implicit def option[A](implicit ev: Schema[A]): Schema[Option[A]] = ???
+}
+
+trait SchemaDerivation {
+  inline def recurse[A <: Tuple]: List[Schema[Any]] =
+    inline erasedValue[A] match {
+      case _: (t *: ts) =>
+        val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]]
+        builder :: recurse[ts]
+      case _: EmptyTuple => Nil
+    }
+
+  inline def derived[A]: Schema[A] =
+    inline summonInline[Mirror.Of[A]] match {
+      case m: Mirror.SumOf[A] =>
+        lazy val subTypes = recurse[m.MirroredElemTypes]
+        new Schema[A] {
+          def build: A = ???
+        }
+
+      case m: Mirror.ProductOf[A] =>
+        lazy val fields = recurse[m.MirroredElemTypes]
+        new Schema[A] {
+          def build: A = ???
+        }
+    }
+
+  inline given gen[A]: Schema[A] = derived
+}
+
+case class H(i: Int)
+case class G(h: H)
+case class F(g: G)
+case class E(f: Option[F])
+case class D(e: E)
+case class C(d: D)
+case class B(c: C)
+case class A(a: A, b: B)
+
+object TestApp {
+   implicit def typeSchema: Schema[A] = Schema.gen
+}
diff --git a/tests/pos-custom-args/i13405/Macro.scala b/tests/pos-custom-args/i13405/Macro.scala
new file mode 100644
index 000000000000..2996555a6e0c
--- /dev/null
+++ b/tests/pos-custom-args/i13405/Macro.scala
@@ -0,0 +1,12 @@
+import scala.quoted.*
+
+sealed class Foo()
+inline def hh(): Unit = ${ interpMacro() }
+
+private def interpMacro()(using Quotes): Expr[Unit] =
+  import quotes.reflect.*
+  '{
+    val res: Either[String, (Foo, Foo)] =
+      Right((new Foo, new Foo))
+    val (a, b) = res.toOption.get
+  }
diff --git a/tests/pos-custom-args/i13405/Test.scala b/tests/pos-custom-args/i13405/Test.scala
new file mode 100644
index 000000000000..385f4453adeb
--- /dev/null
+++ b/tests/pos-custom-args/i13405/Test.scala
@@ -0,0 +1 @@
+@main def main: Unit = hh()
diff --git a/tests/pos-custom-args/inline-match-gadt.scala b/tests/pos-custom-args/inline-match-gadt.scala
index 0f22f7b96c22..f63d0fb5b68c 100644
--- a/tests/pos-custom-args/inline-match-gadt.scala
+++ b/tests/pos-custom-args/inline-match-gadt.scala
@@ -1,6 +1,6 @@
 object `inline-match-gadt` {
   class Exactly[T]
-  erased def exactType[T]: Exactly[T] = ???
+  erased def exactType[T]: Exactly[T] = compiletime.erasedValue
 
   inline def foo[T](t: T): T =
     inline exactType[T] match {
diff --git a/tests/pos-custom-args/jdk-8-app.scala b/tests/pos-custom-args/jdk-8-app.scala
new file mode 100644
index 000000000000..6a9d07155958
--- /dev/null
+++ b/tests/pos-custom-args/jdk-8-app.scala
@@ -0,0 +1,5 @@
+import java.time.LocalDate
+
+object Jdk8App extends App {
+  println(LocalDate.now())
+}
diff --git a/tests/pos-custom-args/no-experimental/experimental-imports-empty.scala b/tests/pos-custom-args/no-experimental/experimental-imports-empty.scala
new file mode 100644
index 000000000000..bb27629a6062
--- /dev/null
+++ b/tests/pos-custom-args/no-experimental/experimental-imports-empty.scala
@@ -0,0 +1,5 @@
+import annotation.experimental
+import language.experimental.fewerBraces
+import language.experimental.namedTypeArguments
+import language.experimental.genericNumberLiterals
+import language.experimental.erasedDefinitions
diff --git a/tests/pos-custom-args/no-experimental/experimental-imports-top.scala b/tests/pos-custom-args/no-experimental/experimental-imports-top.scala
new file mode 100644
index 000000000000..bee89d6ab6c8
--- /dev/null
+++ b/tests/pos-custom-args/no-experimental/experimental-imports-top.scala
@@ -0,0 +1,5 @@
+import language.experimental.erasedDefinitions
+import annotation.experimental
+
+@experimental
+erased def f = 1
diff --git a/tests/pos-custom-args/no-experimental/i13848.scala b/tests/pos-custom-args/no-experimental/i13848.scala
new file mode 100644
index 000000000000..8b65ccb078e1
--- /dev/null
+++ b/tests/pos-custom-args/no-experimental/i13848.scala
@@ -0,0 +1,8 @@
+import annotation.experimental
+
+@main
+@experimental
+def run(): Unit = f
+
+@experimental
+def f = 2
diff --git a/tests/pos-custom-args/no-experimental/i8945.scala b/tests/pos-custom-args/no-experimental/i8945.scala
new file mode 100644
index 000000000000..5dded16f0160
--- /dev/null
+++ b/tests/pos-custom-args/no-experimental/i8945.scala
@@ -0,0 +1,27 @@
+// src-2/MacroImpl.scala
+trait Context {
+  object universe {
+    type Literal
+  }
+}
+
+class MacroImpl(val c: Context) {
+  import c.universe.*
+  def mono: Literal = ???
+}
+
+// src-3/Macros.scala
+import scala.language.experimental.macros
+
+object Macros {
+
+  object Bundles {
+    def mono: Unit = macro MacroImpl.mono
+    inline def mono: Unit = ${ Macros3.monoImpl }
+  }
+
+  object Macros3 {
+    def monoImpl(using quoted.Quotes) = '{()}
+  }
+
+}
\ No newline at end of file
diff --git a/tests/pos-custom-args/phantom-Eq.scala b/tests/pos-custom-args/phantom-Eq.scala
index 3bd16323524f..6ec5f77676ce 100644
--- a/tests/pos-custom-args/phantom-Eq.scala
+++ b/tests/pos-custom-args/phantom-Eq.scala
@@ -20,12 +20,12 @@ object EqUtil {
   extension [T](x: T)
     def ===[U](y: U)(using erased PhantomEq[T, U]) = x.equals(y)
 
-  erased given eqString: PhantomEqEq[String] = ???
-  erased given eqInt: PhantomEqEq[Int]       = ???
-  erased given eqDouble: PhantomEqEq[Double] = ???
+  erased given eqString: PhantomEqEq[String] = compiletime.erasedValue
+  erased given eqInt: PhantomEqEq[Int]       = compiletime.erasedValue
+  erased given eqDouble: PhantomEqEq[Double] = compiletime.erasedValue
 
-  erased given eqByteNum: PhantomEq[Byte, Number] = ???
-  erased given eqNumByte: PhantomEq[Number, Byte] = ???
+  erased given eqByteNum: PhantomEq[Byte, Number] = compiletime.erasedValue
+  erased given eqNumByte: PhantomEq[Number, Byte] = compiletime.erasedValue
 
-  erased given eqSeq[T, U](using erased PhantomEq[T, U]): PhantomEq[Seq[T], Seq[U]] = ???
+  erased given eqSeq[T, U](using erased PhantomEq[T, U]): PhantomEq[Seq[T], Seq[U]] = compiletime.erasedValue
 }
diff --git a/tests/pos-custom-args/phantom-Evidence.scala b/tests/pos-custom-args/phantom-Evidence.scala
index 414f96f3ef33..3a82cfe0c6e8 100644
--- a/tests/pos-custom-args/phantom-Evidence.scala
+++ b/tests/pos-custom-args/phantom-Evidence.scala
@@ -24,5 +24,5 @@ object WithNormalState {
 
 object Utils {
   type =::=[From, To]
-  erased given tpEquals[A]: A =::= A = ???
+  erased given tpEquals[A]: A =::= A = compiletime.erasedValue
 }
diff --git a/tests/pos-java-interop-separate/inner-fbounds/Configurer_1.java b/tests/pos-java-interop-separate/inner-fbounds/Configurer_1.java
new file mode 100644
index 000000000000..f75aaf1743ed
--- /dev/null
+++ b/tests/pos-java-interop-separate/inner-fbounds/Configurer_1.java
@@ -0,0 +1,8 @@
+abstract class AbstractConfigurer {
+    abstract class AbstractRegistry<R extends AbstractRegistry<R>> {}
+}
+
+public final class Configurer_1 extends AbstractConfigurer {
+    public final class Registry extends AbstractRegistry<Registry> {}
+    public Registry registry() { return null; }
+}
diff --git a/tests/pos-java-interop-separate/inner-fbounds/Test_2.scala b/tests/pos-java-interop-separate/inner-fbounds/Test_2.scala
new file mode 100644
index 000000000000..85455c91762d
--- /dev/null
+++ b/tests/pos-java-interop-separate/inner-fbounds/Test_2.scala
@@ -0,0 +1,2 @@
+object Test:
+  def registry(cfg: Configurer_1) = cfg.registry
diff --git a/tests/pos-java-interop/i13575/Builder.java b/tests/pos-java-interop/i13575/Builder.java
new file mode 100644
index 000000000000..a267a21ffd6a
--- /dev/null
+++ b/tests/pos-java-interop/i13575/Builder.java
@@ -0,0 +1,16 @@
+package com.lamoroso.example;
+
+import java.util.Collections;
+import java.util.List;
+
+public abstract class Builder<T extends Builder<T, R>, R> {
+
+    private List<String> pools;
+
+    public Builder<T, R> withPool(String... pools) {
+        Collections.addAll(this.pools, pools);
+        return this;
+    }
+
+    public Builder<T, R> build(){return null;}
+}
\ No newline at end of file
diff --git a/tests/pos-java-interop/i13575/Client.java b/tests/pos-java-interop/i13575/Client.java
new file mode 100644
index 000000000000..a5b19d39d1f0
--- /dev/null
+++ b/tests/pos-java-interop/i13575/Client.java
@@ -0,0 +1,9 @@
+package com.lamoroso.example;
+
+public class Client {
+    
+    public static Builder<?, ?> builder() {
+        return null;
+    }
+    
+}
diff --git a/tests/pos-java-interop/i13575/RestClient.java b/tests/pos-java-interop/i13575/RestClient.java
new file mode 100644
index 000000000000..feba30c8ac35
--- /dev/null
+++ b/tests/pos-java-interop/i13575/RestClient.java
@@ -0,0 +1,15 @@
+package com.lamoroso.example;
+
+public class RestClient {
+
+    private Object instance;
+
+    public RestClient(Object instance) {
+        this.instance = instance;
+    }
+
+    public static RestClientBuilder<?,?> builder() {
+        return new RestClientBuilder();
+    }
+    
+}
diff --git a/tests/pos-java-interop/i13575/RestClientBuilder.java b/tests/pos-java-interop/i13575/RestClientBuilder.java
new file mode 100644
index 000000000000..65907b157be7
--- /dev/null
+++ b/tests/pos-java-interop/i13575/RestClientBuilder.java
@@ -0,0 +1,19 @@
+package com.lamoroso.example;
+
+public class RestClientBuilder<T extends Builder<T, R>, R> {
+
+    private Builder<?, ?> wrappedBuilder;
+
+    protected RestClientBuilder() {
+        this.wrappedBuilder = Client.builder();
+    }
+    
+    public RestClientBuilder<T, R> withPool(String... pools) {
+        this.wrappedBuilder.withPool(pools);
+        return this;
+    }
+
+    public RestClient build() {
+        return new RestClient(wrappedBuilder.build());
+    }
+}
\ No newline at end of file
diff --git a/tests/pos-java-interop/i13575/ScalaApp.scala b/tests/pos-java-interop/i13575/ScalaApp.scala
new file mode 100644
index 000000000000..230940384f97
--- /dev/null
+++ b/tests/pos-java-interop/i13575/ScalaApp.scala
@@ -0,0 +1,5 @@
+package com.lamoroso.example
+
+object ScalaApp extends App {
+  RestClient.builder().withPool("hello").build()
+}
diff --git a/tests/pos-macros/backwardCompat-3.0/Macro_1_c3.0.0.scala b/tests/pos-macros/backwardCompat-3.0/Macro_1_c3.0.0.scala
new file mode 100644
index 000000000000..fb06e93f91c0
--- /dev/null
+++ b/tests/pos-macros/backwardCompat-3.0/Macro_1_c3.0.0.scala
@@ -0,0 +1,20 @@
+import scala.quoted.*
+
+object Macros:
+
+  inline def power(x: Double, inline n: Int) = ${ powerCode('x, 'n) }
+
+  private def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] =
+    unrolledPowerCode(x, n.valueOrError)
+
+  private def unrolledPowerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] =
+    if n == 0 then '{ 1.0 } // tests simple quotes without splices
+    else if n % 2 == 1 then '{ $x * ${ unrolledPowerCode(x, n - 1) } } // tests simple splices
+    else '{ val y = $x * $x; ${ unrolledPowerCode('y, n / 2) } } // tests splice with term capture
+
+
+  inline def let[T, U](x: T)(inline body: T => U): U = ${ letCode('x, 'body) }
+
+  private def letCode[T: Type, U: Type](x: Expr[T], body: Expr[T => U])(using Quotes): Expr[U] =
+    // tests use of Type
+    '{ val y: T = $x; $body(y): U }
diff --git a/tests/pos-macros/backwardCompat-3.0/Test_2.scala b/tests/pos-macros/backwardCompat-3.0/Test_2.scala
new file mode 100644
index 000000000000..8c0a8004b9cf
--- /dev/null
+++ b/tests/pos-macros/backwardCompat-3.0/Test_2.scala
@@ -0,0 +1,15 @@
+import Macros.*
+
+def powerTest(x: Double): Unit =
+  power(x, 0)
+  power(x, 1)
+  power(x, 5)
+  power(x, 10)
+
+def letTest: Unit =
+  let(0) { _ + 1 }
+  let(0) { _.toString }
+  let((4, 'a')) { _.swap }
+  let(new Foo) { _.hashCode }
+
+class Foo
diff --git a/tests/pos-macros/backwardCompat-3.1/Macro_1_c3.1.0.scala b/tests/pos-macros/backwardCompat-3.1/Macro_1_c3.1.0.scala
new file mode 100644
index 000000000000..fb06e93f91c0
--- /dev/null
+++ b/tests/pos-macros/backwardCompat-3.1/Macro_1_c3.1.0.scala
@@ -0,0 +1,20 @@
+import scala.quoted.*
+
+object Macros:
+
+  inline def power(x: Double, inline n: Int) = ${ powerCode('x, 'n) }
+
+  private def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] =
+    unrolledPowerCode(x, n.valueOrError)
+
+  private def unrolledPowerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] =
+    if n == 0 then '{ 1.0 } // tests simple quotes without splices
+    else if n % 2 == 1 then '{ $x * ${ unrolledPowerCode(x, n - 1) } } // tests simple splices
+    else '{ val y = $x * $x; ${ unrolledPowerCode('y, n / 2) } } // tests splice with term capture
+
+
+  inline def let[T, U](x: T)(inline body: T => U): U = ${ letCode('x, 'body) }
+
+  private def letCode[T: Type, U: Type](x: Expr[T], body: Expr[T => U])(using Quotes): Expr[U] =
+    // tests use of Type
+    '{ val y: T = $x; $body(y): U }
diff --git a/tests/pos-macros/backwardCompat-3.1/Test_2.scala b/tests/pos-macros/backwardCompat-3.1/Test_2.scala
new file mode 100644
index 000000000000..8c0a8004b9cf
--- /dev/null
+++ b/tests/pos-macros/backwardCompat-3.1/Test_2.scala
@@ -0,0 +1,15 @@
+import Macros.*
+
+def powerTest(x: Double): Unit =
+  power(x, 0)
+  power(x, 1)
+  power(x, 5)
+  power(x, 10)
+
+def letTest: Unit =
+  let(0) { _ + 1 }
+  let(0) { _.toString }
+  let((4, 'a')) { _.swap }
+  let(new Foo) { _.hashCode }
+
+class Foo
diff --git a/tests/pos-macros/baseCompat/Macro_1.scala b/tests/pos-macros/baseCompat/Macro_1.scala
new file mode 100644
index 000000000000..fb06e93f91c0
--- /dev/null
+++ b/tests/pos-macros/baseCompat/Macro_1.scala
@@ -0,0 +1,20 @@
+import scala.quoted.*
+
+object Macros:
+
+  inline def power(x: Double, inline n: Int) = ${ powerCode('x, 'n) }
+
+  private def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] =
+    unrolledPowerCode(x, n.valueOrError)
+
+  private def unrolledPowerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] =
+    if n == 0 then '{ 1.0 } // tests simple quotes without splices
+    else if n % 2 == 1 then '{ $x * ${ unrolledPowerCode(x, n - 1) } } // tests simple splices
+    else '{ val y = $x * $x; ${ unrolledPowerCode('y, n / 2) } } // tests splice with term capture
+
+
+  inline def let[T, U](x: T)(inline body: T => U): U = ${ letCode('x, 'body) }
+
+  private def letCode[T: Type, U: Type](x: Expr[T], body: Expr[T => U])(using Quotes): Expr[U] =
+    // tests use of Type
+    '{ val y: T = $x; $body(y): U }
diff --git a/tests/pos-macros/baseCompat/Test_2.scala b/tests/pos-macros/baseCompat/Test_2.scala
new file mode 100644
index 000000000000..8c0a8004b9cf
--- /dev/null
+++ b/tests/pos-macros/baseCompat/Test_2.scala
@@ -0,0 +1,15 @@
+import Macros.*
+
+def powerTest(x: Double): Unit =
+  power(x, 0)
+  power(x, 1)
+  power(x, 5)
+  power(x, 10)
+
+def letTest: Unit =
+  let(0) { _ + 1 }
+  let(0) { _.toString }
+  let((4, 'a')) { _.swap }
+  let(new Foo) { _.hashCode }
+
+class Foo
diff --git a/tests/pos-macros/contruct-desturct/ConstructExpr.scala b/tests/pos-macros/contruct-desturct/ConstructExpr.scala
new file mode 100644
index 000000000000..6a2a6f40f0c5
--- /dev/null
+++ b/tests/pos-macros/contruct-desturct/ConstructExpr.scala
@@ -0,0 +1,45 @@
+package scala.quoted
+package util
+
+trait ConstructExpr[T] {
+
+  type Elems <: Tuple
+
+  def from(x: Elems)(using Quotes): Expr[T]
+  // def from(x: Tuple.Map[Elems, Expr])(using Quotes): Expr[T] // alternative
+
+}
+
+object ConstructExpr {
+
+  def apply[T](using ce: ConstructExpr[T]): ce.type = ce
+
+    /** Default implementation of `ConstructExpr[Tuple1[T]]` */
+  given EmptyTupleConstructExpr[T: Type]: ConstructExpr[EmptyTuple] with {
+    type Elems = EmptyTuple
+    def from(x: Elems)(using Quotes): Expr[EmptyTuple] =
+      '{ EmptyTuple }
+  }
+
+  /** Default implementation of `ConstructExpr[Tuple1[T]]` */
+  given Tuple1ConstructExpr[T: Type]: ConstructExpr[Tuple1[T]] with {
+    type Elems = Tuple1[Expr[T]]
+    def from(x: Elems)(using Quotes): Expr[Tuple1[T]] =
+      '{ Tuple1[T](${x._1}) }
+  }
+
+  /** Default implementation of `ConstructExpr[Tuple2[T1, T2]]` */
+  given Tuple2ConstructExpr[T1: Type, T2: Type]: ConstructExpr[Tuple2[T1, T2]] with {
+    type Elems = (Expr[T1], Expr[T2])
+    def from(x: Elems)(using Quotes): Expr[Tuple2[T1, T2]] =
+      '{ Tuple2[T1, T2](${x._1}, ${x._2}) }
+  }
+
+  /** Default implementation of `ConstructExpr[Tuple3[T1, T2, T3]]` */
+  given Tuple3ConstructExpr[T1: Type, T2: Type, T3: Type]: ConstructExpr[Tuple3[T1, T2, T3]] with {
+    type Elems = (Expr[T1], Expr[T2], Expr[T3])
+    def from(x: Elems)(using Quotes): Expr[Tuple3[T1, T2, T3]] =
+      '{ Tuple3[T1, T2, T3](${x._1}, ${x._2}, ${x._3}) }
+  }
+
+}
diff --git a/tests/pos-macros/contruct-desturct/DestructExpr.scala b/tests/pos-macros/contruct-desturct/DestructExpr.scala
new file mode 100644
index 000000000000..b54be5e1116a
--- /dev/null
+++ b/tests/pos-macros/contruct-desturct/DestructExpr.scala
@@ -0,0 +1,47 @@
+package scala.quoted
+package util
+
+trait DestructExpr[T] {
+
+  type Elems <: Tuple
+
+  def unapply(x: Expr[T])(using Quotes): Option[Elems]
+  // def unapply(x: Expr[T])(using Quotes): Option[Tuple.Map[Elems, Expr]] // alternative
+
+}
+
+/** Default given instances of `DestructExpr` */
+object DestructExpr {
+
+  def unapply[T](x: Expr[T])(using de: DestructExpr[T])(using Quotes): Option[de.Elems] =
+    de.unapply(x)
+
+
+  /** Default implementation of `DestructExpr[Tuple1[...]]`
+   *  - Transform `'{Tuple1(x1)}` into `Some(Tuple1('{x1}))`
+   *  - Otherwise returns `None`
+   */
+  given DestructTuple1[T1](using Type[T1]): DestructExpr[Tuple1[T1]] with {
+    type Elems = Tuple1[Expr[T1]]
+    def unapply(x: Expr[Tuple1[T1]])(using Quotes) = x match {
+      case '{ new Tuple1[T1]($y) } => Some(Tuple1(y))
+      case '{     Tuple1[T1]($y) } => Some(Tuple1(y))
+      case _ => None
+    }
+  }
+
+  /** Default implementation of `DestructExpr[Tuple2[...]]`
+   *  - Transform `'{Tuple2(x1, x2)}` into `Some(Tuple2('{x1}, '{x2}))`
+   *  - Otherwise returns `None`
+   */
+  given DestructTuple2[T1, T2](using Type[T1], Type[T2]): DestructExpr[Tuple2[T1, T2]] with {
+    type Elems = (Expr[T1], Expr[T2])
+    def unapply(x: Expr[Tuple2[T1, T2]])(using Quotes) = x match {
+      case '{ new Tuple2[T1, T2]($y1, $y2) } => Some(Tuple2(y1, y2))
+      case '{     Tuple2[T1, T2]($y1, $y2) } => Some(Tuple2(y1, y2))
+      case '{ ($y1: T1) -> ($y2: T2) } => Some(Tuple2(y1, y2))
+      case _ => None
+    }
+  }
+
+}
diff --git a/tests/pos-macros/contruct-desturct/Test.scala b/tests/pos-macros/contruct-desturct/Test.scala
new file mode 100644
index 000000000000..a4d159ed7d35
--- /dev/null
+++ b/tests/pos-macros/contruct-desturct/Test.scala
@@ -0,0 +1,7 @@
+import scala.quoted.*
+import scala.quoted.util.*
+
+def test(using Quotes) =
+  '{ Tuple2(1, 2) } match
+    case DestructExpr((a, b)) =>
+      ConstructExpr[(Int, Int)].from((a, b))
diff --git a/tests/pos-macros/forwardCompat-3.0/Macro_1_r3.0.scala b/tests/pos-macros/forwardCompat-3.0/Macro_1_r3.0.scala
new file mode 100644
index 000000000000..fb06e93f91c0
--- /dev/null
+++ b/tests/pos-macros/forwardCompat-3.0/Macro_1_r3.0.scala
@@ -0,0 +1,20 @@
+import scala.quoted.*
+
+object Macros:
+
+  inline def power(x: Double, inline n: Int) = ${ powerCode('x, 'n) }
+
+  private def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] =
+    unrolledPowerCode(x, n.valueOrError)
+
+  private def unrolledPowerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] =
+    if n == 0 then '{ 1.0 } // tests simple quotes without splices
+    else if n % 2 == 1 then '{ $x * ${ unrolledPowerCode(x, n - 1) } } // tests simple splices
+    else '{ val y = $x * $x; ${ unrolledPowerCode('y, n / 2) } } // tests splice with term capture
+
+
+  inline def let[T, U](x: T)(inline body: T => U): U = ${ letCode('x, 'body) }
+
+  private def letCode[T: Type, U: Type](x: Expr[T], body: Expr[T => U])(using Quotes): Expr[U] =
+    // tests use of Type
+    '{ val y: T = $x; $body(y): U }
diff --git a/tests/pos-macros/forwardCompat-3.0/Test_2_c3.0.0.scala b/tests/pos-macros/forwardCompat-3.0/Test_2_c3.0.0.scala
new file mode 100644
index 000000000000..8c0a8004b9cf
--- /dev/null
+++ b/tests/pos-macros/forwardCompat-3.0/Test_2_c3.0.0.scala
@@ -0,0 +1,15 @@
+import Macros.*
+
+def powerTest(x: Double): Unit =
+  power(x, 0)
+  power(x, 1)
+  power(x, 5)
+  power(x, 10)
+
+def letTest: Unit =
+  let(0) { _ + 1 }
+  let(0) { _.toString }
+  let((4, 'a')) { _.swap }
+  let(new Foo) { _.hashCode }
+
+class Foo
diff --git a/tests/pos-macros/i10151/Macro_1.scala b/tests/pos-macros/i10151/Macro_1.scala
index c7a2b9a301c2..3b81ed00b2f8 100644
--- a/tests/pos-macros/i10151/Macro_1.scala
+++ b/tests/pos-macros/i10151/Macro_1.scala
@@ -55,7 +55,9 @@ object X:
                      )
                    )
                  )
-        case Block(stats, last) => Block(stats, transform(last))
+        case Block(stats, last) =>
+          val recoverdOwner = stats.headOption.map(_.symbol.owner).getOrElse(Symbol.spliceOwner) // hacky workaround to missing owner tracking in transform
+          Block(stats, transform(last).changeOwner(recoverdOwner))
         case Inlined(x,List(),body) => transform(body)
         case l@Literal(x) =>
            l.asExpr match
diff --git a/tests/pos-macros/i11479/Macro_1.scala b/tests/pos-macros/i11479/Macro_1.scala
index f4a8c0d13767..12f98826ebc5 100644
--- a/tests/pos-macros/i11479/Macro_1.scala
+++ b/tests/pos-macros/i11479/Macro_1.scala
@@ -1,9 +1,9 @@
 trait Foo
-given Foo: Foo with {}
+given Foo: Foo()
 inline def summonFoo(): Foo = scala.compiletime.summonInline[Foo]
 
 package p:
   trait Bar
-  given Bar: Bar with {}
+  given Bar: Bar()
   inline def summonBar(): Bar = scala.compiletime.summonInline[Bar]
 
diff --git a/tests/pos-macros/i11795.scala b/tests/pos-macros/i11795.scala
new file mode 100644
index 000000000000..32eaccf2f4e2
--- /dev/null
+++ b/tests/pos-macros/i11795.scala
@@ -0,0 +1,7 @@
+import scala.quoted._
+import scala.deriving._
+
+def blah2[P <: Product, MEL <: Tuple: Type, MET <: Tuple: Type](m: Mirror.ProductOf[P] { type MirroredElemLabels = MEL; type MirroredElemTypes = MET})(using Quotes) = {
+  Type.of[Tuple.Zip[MEL, MET]]
+  ()
+}
diff --git a/tests/pos-macros/i11835/X.scala b/tests/pos-macros/i11835/X.scala
index ccc05e9e57c3..c5f12c5b8271 100644
--- a/tests/pos-macros/i11835/X.scala
+++ b/tests/pos-macros/i11835/X.scala
@@ -6,7 +6,6 @@ object X:
 
   private def _blah(b: Expr[Boolean])(using Quotes): Expr[Unit] =
     import quotes.reflect.*
-    println("="*120)
-    println(b.asTerm)
-    println(b.valueOrError)
+    b.asTerm
+    b.valueOrAbort
     '{()}
diff --git a/tests/pos-macros/i12072/Macro_1.scala b/tests/pos-macros/i12072/Macro_1.scala
new file mode 100644
index 000000000000..d58160d8f00a
--- /dev/null
+++ b/tests/pos-macros/i12072/Macro_1.scala
@@ -0,0 +1,12 @@
+import scala.quoted.*
+
+object M {
+
+  transparent inline def f(inline s: String): String | Null =
+    ${ f('s) }
+
+  def f(s: Expr[String])(using Quotes): Expr[String | Null] = {
+    s.valueOrError // required
+    '{ null }
+  }
+}
diff --git a/tests/pos-macros/i12072/Test_2.scala b/tests/pos-macros/i12072/Test_2.scala
new file mode 100644
index 000000000000..772e21903fc5
--- /dev/null
+++ b/tests/pos-macros/i12072/Test_2.scala
@@ -0,0 +1,18 @@
+object T2 {
+  import M.f
+
+  private inline val V = "V"
+  private inline def D = "D"
+
+  trait Trait { def s: String }
+
+  object MatchFV extends Trait {
+    override transparent inline def s: String =
+      inline f(V) match { case "V" => "o"; case _   => "x" } // error in RC1
+  }
+
+  object MatchFD extends Trait {
+    override transparent inline def s: String =
+      inline f(D) match { case "D" => "o"; case _   => "x" }
+  }
+}
diff --git a/tests/pos-macros/i12173.scala b/tests/pos-macros/i12173.scala
new file mode 100644
index 000000000000..c5c56ed3e0e7
--- /dev/null
+++ b/tests/pos-macros/i12173.scala
@@ -0,0 +1,7 @@
+object TestMacro {
+  inline def test[T](inline t: T): T = ${ '{ ${ 't } } }
+}
+
+object Test {
+  TestMacro.test("x")
+}
diff --git a/tests/pos-macros/i12173b.scala b/tests/pos-macros/i12173b.scala
new file mode 100644
index 000000000000..ce638485b74c
--- /dev/null
+++ b/tests/pos-macros/i12173b.scala
@@ -0,0 +1,7 @@
+object TestMacro {
+  inline def test[T](inline t: T): T = ${ '{ ${ '{ ${ 't } } } } }
+}
+
+object Test {
+  TestMacro.test("x")
+}
diff --git a/tests/pos-macros/i12173c.scala b/tests/pos-macros/i12173c.scala
new file mode 100644
index 000000000000..2806a2183fdb
--- /dev/null
+++ b/tests/pos-macros/i12173c.scala
@@ -0,0 +1,7 @@
+object TestMacro {
+  inline def test[T](inline t: T): T = ${ '{ ${ '{ ${ '{ ${ '{ ${ '{ ${ '{ ${ '{ ${ 't } } } } } } } } } } } } } } }
+}
+
+object Test {
+  TestMacro.test("x")
+}
diff --git a/tests/pos-macros/i12188b/Macro_1.scala b/tests/pos-macros/i12188b/Macro_1.scala
new file mode 100644
index 000000000000..fa9ea10e666a
--- /dev/null
+++ b/tests/pos-macros/i12188b/Macro_1.scala
@@ -0,0 +1,13 @@
+import scala.quoted.*
+
+object MatchTest {
+  inline def test[T](inline obj: Any): Unit = ${testImpl('obj)}
+
+  def testImpl[T](objExpr: Expr[T])(using Quotes): Expr[Unit] = {
+    import quotes.reflect.*
+    // test that the extractors work
+    val Inlined(None, Nil, Block(Nil, Match(param @ Ident("a"), List(CaseDef(Literal(IntConstant(1)), None, Block(Nil, Literal(UnitConstant()))), CaseDef(Wildcard(), None, Block(Nil, Literal(UnitConstant()))))))) = objExpr.asTerm
+    // test that the constructors work
+    Block(Nil, Match(param, List(CaseDef(Literal(IntConstant(1)), None, Block(Nil, Literal(UnitConstant()))), CaseDef(Wildcard(), None, Block(Nil, Literal(UnitConstant())))))).asExprOf[Unit]
+  }
+}
diff --git a/tests/pos-macros/i12188b/Test_2.scala b/tests/pos-macros/i12188b/Test_2.scala
new file mode 100644
index 000000000000..ee6ef1fdf075
--- /dev/null
+++ b/tests/pos-macros/i12188b/Test_2.scala
@@ -0,0 +1,5 @@
+def test(a: Int) = MatchTest.test {
+  a match
+    case 1 =>
+    case _ =>
+}
diff --git a/tests/pos-macros/i12188c/Macro_1.scala b/tests/pos-macros/i12188c/Macro_1.scala
new file mode 100644
index 000000000000..978e2280759c
--- /dev/null
+++ b/tests/pos-macros/i12188c/Macro_1.scala
@@ -0,0 +1,14 @@
+import scala.quoted.*
+
+object MatchTest {
+  inline def test(a: Int): Unit = ${testImpl('a)}
+
+  def testImpl(a: Expr[Any])(using Quotes): Expr[Unit] = {
+    import quotes.reflect.*
+    val matchTree = Match(a.asTerm, List(
+      CaseDef(Literal(IntConstant(1)), None, Block(Nil, Literal(UnitConstant()))),
+      CaseDef(Alternatives(List(Literal(IntConstant(2)), Literal(IntConstant(3)), Literal(IntConstant(4)))), None, Block(Nil, Literal(UnitConstant()))),
+      CaseDef(Typed(Wildcard(), TypeIdent(defn.IntClass)), None, Block(Nil, Literal(UnitConstant())))))
+    matchTree.asExprOf[Unit]
+  }
+}
\ No newline at end of file
diff --git a/tests/pos-macros/i12188c/Test_2.scala b/tests/pos-macros/i12188c/Test_2.scala
new file mode 100644
index 000000000000..2e7bd48e4a0b
--- /dev/null
+++ b/tests/pos-macros/i12188c/Test_2.scala
@@ -0,0 +1 @@
+def test(a: Int) = MatchTest.test(a)
diff --git a/tests/pos-macros/i12196/Macros_1.scala b/tests/pos-macros/i12196/Macros_1.scala
new file mode 100644
index 000000000000..60e1f56b0b3d
--- /dev/null
+++ b/tests/pos-macros/i12196/Macros_1.scala
@@ -0,0 +1,8 @@
+
+import scala.quoted.*
+
+inline val InlineStringVal = "abc"
+
+inline def withInlineVal = ${ qqq(InlineStringVal) }
+
+def qqq(s: String)(using Quotes): Expr[String] = Expr(s)
diff --git a/tests/pos-macros/i12196/Test_2.scala b/tests/pos-macros/i12196/Test_2.scala
new file mode 100644
index 000000000000..a4b3e340cb52
--- /dev/null
+++ b/tests/pos-macros/i12196/Test_2.scala
@@ -0,0 +1 @@
+def test = withInlineVal
diff --git a/tests/pos-macros/i12221/Macro_1.scala b/tests/pos-macros/i12221/Macro_1.scala
new file mode 100644
index 000000000000..f0df529f8550
--- /dev/null
+++ b/tests/pos-macros/i12221/Macro_1.scala
@@ -0,0 +1,120 @@
+import scala.quoted.*
+import scala.reflect.*
+
+object Macros {
+
+    inline def show[A,B](inline expr: A => B): Unit =
+        ${printExpr('expr)}
+
+    def printExpr[A,B](expr: Expr[A=>B])(using Quotes) = '{
+        println(${showExpr3(expr)})
+    }
+
+    def showExpr3[A,B](expr: Expr[A=>B])(using Quotes): Expr[String] =
+        import quotes.reflect.*
+
+        val sb = new StringBuilder
+
+        // Makes us only print the body of thr function
+        def printDefFun(tree: Tree): Unit ={
+            val acc = new TreeAccumulator[Unit]{
+                def foldTree(s: Unit, tree: Tree)(owner: Symbol): Unit =
+                    tree match
+                        case deff : DefDef =>
+                            treePrint(deff.rhs.get, 0)
+                            sb.append("++++++++++++++++\n")
+                            sb.append(deff.rhs.get.show(using Printer.TreeStructure)).append('\n')
+                        case _ =>
+                            foldOverTree(s, tree)(owner)
+                }
+            acc.foldTree(List(), tree)(tree.symbol)
+        }
+
+        def treePrint(tree: Tree, level: Int): Unit = {
+            val pre = "   " * level
+            tree match {
+                case body : Term => {
+                    body match {
+                        // Normal typed
+                        case typed: Typed =>
+                            sb.append(pre + typed.getClass()).append('\n')
+                            sb.append(pre + s"Typed with ${typed.tpt}:\n")
+                            treePrint(typed.expr , level + 1)
+                        case Block(statements, expr) =>
+                            sb.append(pre + "Block:{").append('\n')
+                            statements.map(stat => stat match{
+                                case term: Term => treePrint(term, level + 1)
+                                case deff: Definition =>
+                                    sb.append(pre + "Definition statement\n")
+                                    treePrint(deff, level + 1)
+                                case _ =>
+                                    sb.append(pre + "Non-term statement\n")
+                                    sb.append(stat.show(using Printer.TreeStructure)).append('\n')
+                                })
+                            treePrint(expr, level + 1)
+                            sb.append(pre + "}\n")
+
+                        case Match(scrutinee, cases) =>
+                            sb.append(pre + "Match:\n")
+                            treePrint(scrutinee, level + 1)
+                            sb.append(pre + "with\n")
+                            cases.map(treePrint(_, level +1))
+
+                        case Ident(name) =>
+                            sb.append(pre + s"Identifier(${name})\n")
+
+                        case Apply(fun, args) =>
+                            sb.append(pre + "Apply\n")
+                            treePrint(fun, level + 1)
+                            if !args.isEmpty then
+                                sb.append(pre + "with arguments\n")
+                                args.zipWithIndex.map(
+                                    (arg, index) =>
+                                        treePrint(arg, level +1)
+                                        if args.size > 1 && index < args.size -1  then
+                                            // Used to seperate list of parameters
+                                            sb.append(pre + ",\n")
+                                    )
+                        case _ =>
+                            sb.append("Term\n")
+                            sb.append(tree.getClass()).append('\n')
+                            sb.append(tree.show(using Printer.TreeStructure)).append('\n')
+                    }
+                }
+
+                case CaseDef(pattern, guard, rhs) =>
+                    sb.append(pre + "caseDef:\n" )
+                    treePrint(pattern, level + 1)
+                    treePrint(rhs, level + 1)
+
+                //Adding this unappy makes the typed get swallowed
+                /*
+                case Unapply(fun, implicits, pattern) =>
+                    sb.append(pre + "Unapply with function").append('\n')
+                    treePrint(fun , level + 1)
+                    sb.append(pre + "with patterns").append('\n')
+                    pattern.map(treePrint(_ , level + 1))
+                */
+                case b: Bind => sb.append(pre + "Bind with stuff").append('\n')
+
+                case typed : Typed =>
+                        //sb.append(pre + typed.getClass()).append('\n')
+                        sb.append(pre + tree.getClass()).append('\n')
+                        sb.append(pre + s"Typed2 with ${typed.tpt}:").append('\n')
+                        treePrint(typed.expr , level + 1)
+
+                case Unapply(_,_,_) => sb.append(pre + "Unapply with stuff").append('\n')
+                case _ =>
+                    tree match
+                        case t: Term => sb.append("Term").append('\n')
+                        case _ => ()
+                    sb.append(tree.getClass()).append('\n')
+                    sb.append(tree.show(using Printer.TreeStructure)).append('\n')
+            }
+        }
+
+        val tree: Term = expr.asTerm
+        printDefFun(tree)
+        sb.append("Finished").append('\n')
+        Expr(sb.result())
+}
diff --git a/tests/pos-macros/i12221/Test_2.scala b/tests/pos-macros/i12221/Test_2.scala
new file mode 100644
index 000000000000..5e2da9920594
--- /dev/null
+++ b/tests/pos-macros/i12221/Test_2.scala
@@ -0,0 +1,20 @@
+@main
+def hello: Unit = {
+    abstract class A
+    case class Foo(a: Int) extends A
+
+    //Will print the body of the given function, then its print (using Printer.TreeStructure)
+    Macros.show((x: A)=>{
+        x match {
+            case Foo(a) => a
+        }:Int
+    })
+    /*
+    val x = Foo(3)
+    Macros.show(
+        x match {
+            case Foo(1) => 3
+        }
+    )*/
+
+}
diff --git a/tests/pos-macros/i12253/Macro_1.scala b/tests/pos-macros/i12253/Macro_1.scala
new file mode 100644
index 000000000000..43eb73542c33
--- /dev/null
+++ b/tests/pos-macros/i12253/Macro_1.scala
@@ -0,0 +1,24 @@
+
+import scala.quoted.*
+import deriving.*,  compiletime.*
+
+object MacroUtils:
+  transparent inline def extractNameFromSelector[To, T](inline code: To => T) = ${extractNameFromSelectorImpl('code)}
+
+  def extractNameFromSelectorImpl[To: Type, T: Type](code: Expr[To => T])(using Quotes): Expr[String] =
+    import quotes.reflect.*
+    code.asTerm match
+      case InlinedLambda(_, Select(_, name)) => Expr(name)
+      case t => Expr("")
+
+  object InlinedLambda:
+    def unapply(using Quotes)(arg: quotes.reflect.Term): Option[(List[quotes.reflect.ValDef], quotes.reflect.Term)] =
+      import quotes.reflect.*
+      arg match
+        case Inlined(_, _, Lambda(vals, term)) => Some((vals, term))
+        case Inlined(_, _, nested) => InlinedLambda.unapply(nested)
+        case t => None
+  end InlinedLambda
+
+end MacroUtils
+
diff --git a/tests/pos-macros/i12253/Test_2.scala b/tests/pos-macros/i12253/Test_2.scala
new file mode 100644
index 000000000000..61aae41d1ee0
--- /dev/null
+++ b/tests/pos-macros/i12253/Test_2.scala
@@ -0,0 +1,4 @@
+object Usage:
+  case class Bar(x: Int, y: String, z: (Double, Double))
+  MacroUtils.extractNameFromSelector[Bar, String](_.y + "abc")
+end Usage
diff --git a/tests/pos-macros/i12309/Macro_1.scala b/tests/pos-macros/i12309/Macro_1.scala
new file mode 100644
index 000000000000..91c0932682bb
--- /dev/null
+++ b/tests/pos-macros/i12309/Macro_1.scala
@@ -0,0 +1,25 @@
+import scala.quoted.*
+
+object TestMacro {
+  def use(f: () => String): Unit = ()
+
+  inline def test: Unit = ${testImpl}
+
+  def testImpl(using Quotes): Expr[Unit] = {
+    import quotes.reflect.*
+
+    def resultDefBody(): Term = '{
+      val result: String = "xxx"
+      result
+    }.asTerm
+    val resultDefSymbol = Symbol.newMethod(Symbol.spliceOwner, "getResult", MethodType(Nil)(_ => Nil, _ => TypeRepr.of[String]))
+    val resultDef = DefDef(resultDefSymbol, { case _ => Some(resultDefBody().changeOwner(resultDefSymbol)) })
+    val resultExpr = Block(List(resultDef), Closure(Ref(resultDefSymbol), None)).asExprOf[() => String]
+
+    //
+
+    val r = '{ TestMacro.use($resultExpr) }
+    // println(r.asTerm.show(using Printer.TreeShortCode))
+    r
+  }
+}
diff --git a/tests/pos-macros/i12309/Test_2.scala b/tests/pos-macros/i12309/Test_2.scala
new file mode 100644
index 000000000000..b290481ebbd2
--- /dev/null
+++ b/tests/pos-macros/i12309/Test_2.scala
@@ -0,0 +1,3 @@
+object Test extends App {
+  TestMacro.test
+}
diff --git a/tests/pos-macros/i12343/Macro.scala b/tests/pos-macros/i12343/Macro.scala
new file mode 100644
index 000000000000..03642dd1f4af
--- /dev/null
+++ b/tests/pos-macros/i12343/Macro.scala
@@ -0,0 +1,13 @@
+package test
+
+import scala.quoted.*
+
+object Macro:
+  def covImpl(arg: Expr[Any])(using Quotes): Expr[Any] = arg match // Covariant (List)
+    case '{ $h : List[h] } => '{ $h : List[h] }
+
+  def invImpl(arg: Expr[Any])(using Quotes): Expr[Any] = arg match // Invariant (Set)
+    case '{ $h : Set[h] } => '{ $h : Set[h] }
+
+  transparent inline def cov(inline arg: Any): Any = ${ covImpl('arg) }
+  transparent inline def inv(inline arg: Any): Any = ${ invImpl('arg) }
diff --git a/tests/pos-macros/i12343/Test.scala b/tests/pos-macros/i12343/Test.scala
new file mode 100644
index 000000000000..ef23a9c16725
--- /dev/null
+++ b/tests/pos-macros/i12343/Test.scala
@@ -0,0 +1,7 @@
+package test
+
+object Test:
+  val cov1: List[Boolean]          = Macro.cov(List(true))
+  val inv1: Set[Boolean]           = Macro.inv(Set(true))
+  def cov2[X](a: List[X]): List[X] = Macro.cov(a)
+  def inv2[X](a: Set[X]): Set[X]   = Macro.inv(a) // doesn't compile; Set[Nothing] is inferred
diff --git a/tests/pos-macros/i12510/Macro_1.scala b/tests/pos-macros/i12510/Macro_1.scala
new file mode 100644
index 000000000000..2c4427224363
--- /dev/null
+++ b/tests/pos-macros/i12510/Macro_1.scala
@@ -0,0 +1,11 @@
+object M {
+  import scala.quoted.*
+
+  inline def valueOfUnit: ValueOf[Unit] =
+    ${ _valueOfUnit }
+
+  def _valueOfUnit(using Quotes): Expr[ValueOf[Unit]] = {
+    import quotes.reflect.*
+    Expr.summon[ValueOf[Unit]] getOrElse sys.error("Not found")
+  }
+}
diff --git a/tests/pos-macros/i12510/Test_2.scala b/tests/pos-macros/i12510/Test_2.scala
new file mode 100644
index 000000000000..457ff3cc6d19
--- /dev/null
+++ b/tests/pos-macros/i12510/Test_2.scala
@@ -0,0 +1,4 @@
+object T {
+  val ok = summon[ValueOf[Unit]]
+  val ko = M.valueOfUnit
+}
diff --git a/tests/pos-macros/i12850/Macros_1.scala b/tests/pos-macros/i12850/Macros_1.scala
new file mode 100644
index 000000000000..a54bff9b12c2
--- /dev/null
+++ b/tests/pos-macros/i12850/Macros_1.scala
@@ -0,0 +1,19 @@
+
+import scala.quoted.*
+
+inline def foo() = ${ expr }
+
+private def expr(using Quotes): Expr[Unit] =
+  import quotes.reflect.*
+
+  // Option(1) match
+  //   case Some(1) => ()
+  //   case None => ()
+  val mtch2 = Match(
+      Apply(TypeApply(Ref(Symbol.requiredMethod("scala.Option.apply")), List(Inferred(TypeRepr.of[Int]))), List(Literal(IntConstant(1)))),
+      List(
+        CaseDef(/** FIXME: needs TypedTree from #12200; remove cast */Typed(Unapply(TypeApply(Ref(Symbol.requiredMethod("scala.Some.unapply")), List(Inferred(TypeRepr.of[Int]))), Nil, List(Literal(IntConstant(1)))).asInstanceOf[Term], Inferred(TypeRepr.of[Some[Int]])), None, Literal(UnitConstant())),
+        CaseDef(Ref(Symbol.requiredModule("scala.None")), None, Literal(UnitConstant())))
+  )
+
+  mtch2.asExprOf[Unit]
diff --git a/tests/pos-macros/i12850/Test_2.scala b/tests/pos-macros/i12850/Test_2.scala
new file mode 100644
index 000000000000..08152921e268
--- /dev/null
+++ b/tests/pos-macros/i12850/Test_2.scala
@@ -0,0 +1 @@
+def test = foo()
diff --git a/tests/pos-macros/i12948/Macros_1.scala b/tests/pos-macros/i12948/Macros_1.scala
new file mode 100644
index 000000000000..a18d9daec2fe
--- /dev/null
+++ b/tests/pos-macros/i12948/Macros_1.scala
@@ -0,0 +1,9 @@
+package mylib
+import scala.quoted.*
+
+object Main:
+  protected def foo: Unit = {}
+  inline def fooCaller: Unit = foo
+  inline def fooCallerM: Unit = ${ fooMacro }
+  def fooMacro(using Quotes): Expr[Unit] =
+    '{ foo }
diff --git a/tests/pos-macros/i12948/Test_2.scala b/tests/pos-macros/i12948/Test_2.scala
new file mode 100644
index 000000000000..386f1b3bd8f5
--- /dev/null
+++ b/tests/pos-macros/i12948/Test_2.scala
@@ -0,0 +1,5 @@
+import mylib.Main
+
+object Test:
+  Main.fooCaller
+  Main.fooCallerM
diff --git a/tests/pos-macros/i13095/Macro_1.scala b/tests/pos-macros/i13095/Macro_1.scala
new file mode 100644
index 000000000000..776d2a18533a
--- /dev/null
+++ b/tests/pos-macros/i13095/Macro_1.scala
@@ -0,0 +1,9 @@
+
+import scala.quoted.*
+
+inline def testMacro = ${ test }
+
+def test(using Quotes): Expr[Unit] =
+  import quotes.reflect.*
+  assert(!Symbol.noSymbol.isDefinedInCurrentRun)
+  '{}
diff --git a/tests/pos-macros/i13095/Test_2.scala b/tests/pos-macros/i13095/Test_2.scala
new file mode 100644
index 000000000000..b301473885ac
--- /dev/null
+++ b/tests/pos-macros/i13095/Test_2.scala
@@ -0,0 +1 @@
+def unitTest = testMacro
diff --git a/tests/pos-macros/i13422/Macro_1.scala b/tests/pos-macros/i13422/Macro_1.scala
new file mode 100644
index 000000000000..a141049523ff
--- /dev/null
+++ b/tests/pos-macros/i13422/Macro_1.scala
@@ -0,0 +1,9 @@
+import scala.quoted._
+
+inline def rule(inline r: Any): Unit = ${ ruleImpl('r) }
+
+def ruleImpl(r: Expr[Any])(using Quotes): Expr[Unit] = {
+  import quotes.reflect.*
+  r.asTerm.show
+  '{}
+}
diff --git a/tests/pos-macros/i13422/Test_2.scala b/tests/pos-macros/i13422/Test_2.scala
new file mode 100644
index 000000000000..f6595825516a
--- /dev/null
+++ b/tests/pos-macros/i13422/Test_2.scala
@@ -0,0 +1,12 @@
+def test = rule {
+  foo(bar(baz))
+}
+
+def foo[I](r: I): Nothing = ???
+
+def bar(i: Baz): i.Out = ???
+
+sealed trait Baz:
+  type Out = Nothing match { case Nothing => Nothing }
+
+def baz: Baz = ???
diff --git a/tests/pos-macros/i13477/Macro.scala b/tests/pos-macros/i13477/Macro.scala
new file mode 100644
index 000000000000..fe58549bc7e5
--- /dev/null
+++ b/tests/pos-macros/i13477/Macro.scala
@@ -0,0 +1,8 @@
+package mylib
+import scala.quoted.*
+
+private[mylib] object Main:
+  transparent inline def d(): Unit = ${interpMacro}
+  def interpMacro(using Quotes) : Expr[Unit] = '{}
+
+transparent inline def f(): Unit = Main.d()
diff --git a/tests/pos-macros/i13477/Test.scala b/tests/pos-macros/i13477/Test.scala
new file mode 100644
index 000000000000..60dadf0a21df
--- /dev/null
+++ b/tests/pos-macros/i13477/Test.scala
@@ -0,0 +1,2 @@
+import mylib.*
+val x = f()
diff --git a/tests/pos-macros/i13546/Macros_1.scala b/tests/pos-macros/i13546/Macros_1.scala
new file mode 100644
index 000000000000..7e90476c5f73
--- /dev/null
+++ b/tests/pos-macros/i13546/Macros_1.scala
@@ -0,0 +1,13 @@
+package mylib
+import scala.quoted.*
+
+object Main:
+  protected def foo: Unit = {}
+  inline def fooCaller: Unit =
+    def f = foo
+    foo
+  inline def fooCallerM: Unit = ${ fooMacro }
+  def fooMacro(using Quotes): Expr[Unit] =
+    '{ foo }
+    val fooExpr = '{ foo }
+    '{ $fooExpr }
diff --git a/tests/pos-macros/i13546/Test_2.scala b/tests/pos-macros/i13546/Test_2.scala
new file mode 100644
index 000000000000..386f1b3bd8f5
--- /dev/null
+++ b/tests/pos-macros/i13546/Test_2.scala
@@ -0,0 +1,5 @@
+import mylib.Main
+
+object Test:
+  Main.fooCaller
+  Main.fooCallerM
diff --git a/tests/pos-macros/i13557/Macro_1.scala b/tests/pos-macros/i13557/Macro_1.scala
new file mode 100644
index 000000000000..73d2328b7e3a
--- /dev/null
+++ b/tests/pos-macros/i13557/Macro_1.scala
@@ -0,0 +1,41 @@
+package x
+
+import scala.quoted.*
+
+def fun(x:Int): Int = ???
+
+transparent inline def in1[T](inline expr: Int => Int): Int => Int =
+     ${
+        M.transformLambdaImpl('expr)
+     }
+
+object M:
+
+  def transformLambdaImpl(cexpr: Expr[Int => Int])(using Quotes): Expr[Int => Int] =
+      import quotes.reflect.*
+
+      def extractLambda(f:Term): (ValDef, Term, Term => Term ) =
+         f match
+            case Inlined(call, bindings, body) =>
+               val inner = extractLambda(body)
+               (inner._1, inner._2, t => Inlined(call, bindings, t) )
+            case Lambda(params,body) =>
+               params match
+                  case List(vd) => (vd, body, identity)
+                  case _ => report.throwError(s"lambda with one argument expected, we have ${params}",cexpr)
+            case Block(Nil,nested@Lambda(params,body)) => extractLambda(nested)
+            case _ =>
+               report.throwError(s"lambda expected, have: ${f}", cexpr)
+
+      val (oldValDef, body, inlineBack) = extractLambda(cexpr.asTerm)
+      val mt = MethodType(List(oldValDef.name))( _ => List(oldValDef.tpt.tpe), _ => TypeRepr.of[Int])
+      val nLambda = Lambda(Symbol.spliceOwner, mt, (owner, params) => {
+            val argTransformer = new TreeMap() {
+                 override def transformTerm(tree: Term)(owner: Symbol): Term =
+                    tree match
+                       case Ident(name) if (tree.symbol == oldValDef.symbol) =>  Ref(params.head.symbol)
+                       case _ => super.transformTerm(tree)(owner)
+            }
+            argTransformer.transformTerm('{ fun(${body.asExprOf[Int]}) }.asTerm )(owner)
+      })
+      inlineBack(nLambda).asExprOf[Int => Int]
diff --git a/tests/pos-macros/i13557/Test_2.scala b/tests/pos-macros/i13557/Test_2.scala
new file mode 100644
index 000000000000..c9468a538abe
--- /dev/null
+++ b/tests/pos-macros/i13557/Test_2.scala
@@ -0,0 +1,9 @@
+package x
+
+object Main:
+
+   def testSimpleContext(): Unit =
+     var x = 0
+     val c = in1{ scope =>
+       1
+     }
diff --git a/tests/pos-macros/i14137/Macro_1.scala b/tests/pos-macros/i14137/Macro_1.scala
new file mode 100644
index 000000000000..e4a6fdc4a7be
--- /dev/null
+++ b/tests/pos-macros/i14137/Macro_1.scala
@@ -0,0 +1,23 @@
+package x
+
+import scala.quoted._
+
+object Macro:
+
+   inline def genOp(inline f:Int): Int = ${
+      genOpImpl('f)
+   }
+
+   def genOpImpl(f: Expr[Int])(using Quotes): Expr[Int] = {
+
+      def firstOp()(using Quotes): Expr[Int] =
+      '{
+        var x=1
+        ${secondOp('x,f)}
+      }
+
+      def secondOp(x:Expr[Int], y:Expr[Int])(using Quotes): Expr[Int] =
+         '{ $x + $y }
+
+      firstOp()
+   }
diff --git a/tests/pos-macros/i14137/Test_2.scala b/tests/pos-macros/i14137/Test_2.scala
new file mode 100644
index 000000000000..4d9c893f5477
--- /dev/null
+++ b/tests/pos-macros/i14137/Test_2.scala
@@ -0,0 +1,6 @@
+package x
+
+object Main:
+
+  def main(args: Array[String]):Unit =
+    Macro.genOp(10)
diff --git a/tests/pos-macros/i14180/Macro_1.scala b/tests/pos-macros/i14180/Macro_1.scala
new file mode 100644
index 000000000000..ee6396c1d1d8
--- /dev/null
+++ b/tests/pos-macros/i14180/Macro_1.scala
@@ -0,0 +1,3 @@
+import scala.quoted._
+def impl(using Quotes): Expr[Unit] =
+  '{ ([V] => (v: V) => println(v)).apply[Int](2) }
diff --git a/tests/pos-macros/i14180/Test_2.scala b/tests/pos-macros/i14180/Test_2.scala
new file mode 100644
index 000000000000..a98ba87e8729
--- /dev/null
+++ b/tests/pos-macros/i14180/Test_2.scala
@@ -0,0 +1,2 @@
+inline def foo = ${ impl }
+def example = foo
diff --git a/tests/pos-macros/i14185/Macro_1.scala b/tests/pos-macros/i14185/Macro_1.scala
new file mode 100644
index 000000000000..c30f65dac67c
--- /dev/null
+++ b/tests/pos-macros/i14185/Macro_1.scala
@@ -0,0 +1,60 @@
+import scala.quoted.*
+
+object Test {
+  inline def foo[A, M[_]]: Unit = ${ fooImpl[A, M] }
+
+  private def fooImpl[A, M[_]](
+      using
+      q: Quotes,
+      tc: Type[M],
+      pt: Type[A]
+    ): Expr[Unit] = {
+    import q.reflect.*
+
+    val ptpe = TypeRepr.of[A]
+    val neededGivenType = TypeRepr.of[M](using tc).appliedTo(ptpe)
+
+    val neededGiven: Option[Term] = Implicits.search(neededGivenType) match {
+      case suc: ImplicitSearchSuccess =>
+        Some(suc.tree)
+
+      case _ =>
+        None
+    }
+
+    neededGiven.map(_.show)
+
+    '{ () }
+  }
+}
+
+// ---
+
+/** Type level evidence that type `A` is not type `B`. */
+final class IsNot[A, B]() {
+  override val toString = "not"
+}
+
+object IsNot {
+  implicit def defaultEvidence[A, B]: IsNot[A, B] = new IsNot[A, B]()
+
+  @annotation.implicitAmbiguous("Could not prove type ${A} is not (IsNot) ${A}")
+  implicit def ambiguousEvidence1[A]: IsNot[A, A] = null
+  implicit def ambiguousEvidence2[A]: IsNot[A, A] = null
+}
+
+// ---
+
+sealed trait SomeTypeclass[T]
+
+object SomeTypeclass extends SomeTypeclassLowPrio {
+
+  given collection[T, Repr <: Iterable[T]](
+      using SomeTypeclass[T],
+      Repr IsNot Option[T]
+  ): SomeTypeclass[Repr] = new SomeTypeclass[Repr] {}
+}
+
+sealed trait SomeTypeclassLowPrio {
+  given int: SomeTypeclass[Int] = new SomeTypeclass[Int] {}
+}
diff --git a/tests/pos-macros/i14185/Test_2.scala b/tests/pos-macros/i14185/Test_2.scala
new file mode 100644
index 000000000000..0dbe4b5ea3b7
--- /dev/null
+++ b/tests/pos-macros/i14185/Test_2.scala
@@ -0,0 +1,2 @@
+def test =
+  Test.foo[Seq[Int], SomeTypeclass]
diff --git a/tests/pos-macros/i14393/Macro_1.scala b/tests/pos-macros/i14393/Macro_1.scala
new file mode 100644
index 000000000000..16ce1e4d4d72
--- /dev/null
+++ b/tests/pos-macros/i14393/Macro_1.scala
@@ -0,0 +1,20 @@
+package i14393
+import scala.quoted.*
+
+object M {
+
+  inline def useFoldTree[X](inline x:X):X = ${
+     useFoldTreeImpl('x)
+  }
+
+  def useFoldTreeImpl[X:Type](x:Expr[X])(using Quotes):Expr[X] = {
+     import quotes.reflect.*
+     val search = new TreeAccumulator[Int] {
+        def foldTree(s:Int, tree: Tree)(owner: Symbol): Int =
+                 foldOverTree(s,tree)(owner)
+     }
+     search.foldTree(0,x.asTerm)(Symbol.spliceOwner)
+     x
+  }
+
+}
diff --git a/tests/pos-macros/i14393/Test_2.scala b/tests/pos-macros/i14393/Test_2.scala
new file mode 100644
index 000000000000..911e82da0424
--- /dev/null
+++ b/tests/pos-macros/i14393/Test_2.scala
@@ -0,0 +1,11 @@
+package i14393
+
+def thing() =
+      M.useFoldTree {
+
+        Option("") match
+          case None =>
+          case Some(_) =>
+            ???
+
+      }
diff --git a/tests/pos-macros/i8208/Macros_1.scala b/tests/pos-macros/i8208/Macros_1.scala
new file mode 100644
index 000000000000..ce21fadc947a
--- /dev/null
+++ b/tests/pos-macros/i8208/Macros_1.scala
@@ -0,0 +1,22 @@
+package playground
+
+import scala.quoted._
+
+object X {
+
+  inline def power(n: Int, x: Double): Double =
+    ${ powerImpl('n, 'x) }
+
+  private def powerImpl(nExpr: Expr[Int], xExpr: Expr[Double])(using Quotes): Expr[Double] =
+    nExpr match {
+      case Expr(n1) => '{ 42.0 }
+      case _ => '{ dynamicPower($nExpr, $xExpr) }
+    }
+
+  private def dynamicPower(n: Int, x: Double): Double = {
+    println(s"dynamic: $n^$x")
+    if (n == 0) 1.0
+    else if (n % 2 == 0) dynamicPower(n / 2, x * x)
+    else x * dynamicPower(n - 1, x)
+  }
+}
diff --git a/tests/pos-macros/i8208/Test_2.scala b/tests/pos-macros/i8208/Test_2.scala
new file mode 100644
index 000000000000..c5e239e50970
--- /dev/null
+++ b/tests/pos-macros/i8208/Test_2.scala
@@ -0,0 +1,2 @@
+import playground.X
+def test(x: Int) = X.power(x, 2)
diff --git a/tests/pos-macros/null-by-name/Macro_1.scala b/tests/pos-macros/null-by-name/Macro_1.scala
new file mode 100644
index 000000000000..7d57990dd136
--- /dev/null
+++ b/tests/pos-macros/null-by-name/Macro_1.scala
@@ -0,0 +1,10 @@
+import scala.quoted.*
+
+inline def foo(x: => Any): Unit =
+  ${ impl('x) }
+
+private def impl(x: Expr[Any])(using Quotes) : Expr[Unit] = {
+  '{
+    val a = $x
+  }
+}
diff --git a/tests/pos-macros/null-by-name/Test_2.scala b/tests/pos-macros/null-by-name/Test_2.scala
new file mode 100644
index 000000000000..34f5a3111ac6
--- /dev/null
+++ b/tests/pos-macros/null-by-name/Test_2.scala
@@ -0,0 +1 @@
+def test = foo(null)
diff --git a/tests/pos-macros/power-macro-2/Macro_1.scala b/tests/pos-macros/power-macro-2/Macro_1.scala
new file mode 100644
index 000000000000..57f7764f0969
--- /dev/null
+++ b/tests/pos-macros/power-macro-2/Macro_1.scala
@@ -0,0 +1,22 @@
+
+import scala.quoted.*
+
+import math.Numeric.Implicits.infixNumericOps
+
+inline def power[Num](x: Num, inline n: Int)(using num: Numeric[Num]) = ${powerCode('x, 'n)(using 'num)}
+
+private def powerCode[Num: Type](x: Expr[Num], n: Expr[Int])(using Expr[Numeric[Num]])(using Quotes): Expr[Num] =
+  powerCode(x, n.valueOrAbort)
+
+private def powerCode[Num: Type](x: Expr[Num], n: Int)(using num: Expr[Numeric[Num]])(using Quotes): Expr[Num] =
+  if (n == 0) '{ $num.one }
+  else if (n % 2 == 0) '{
+    given Numeric[Num] = $num
+    val y = $x * $x
+    ${ powerCode('y, n / 2) }
+  }
+  else '{
+    given Numeric[Num] = $num
+    $x * ${powerCode(x, n - 1)}
+  }
+
diff --git a/tests/pos-macros/power-macro-2/Test_2.scala b/tests/pos-macros/power-macro-2/Test_2.scala
new file mode 100644
index 000000000000..59644c3d51fb
--- /dev/null
+++ b/tests/pos-macros/power-macro-2/Test_2.scala
@@ -0,0 +1,2 @@
+def test(x: Int) = power(x, 5)
+def test(x: Double) = power(x, 5)
diff --git a/tests/pos-macros/power-macro-3/Macro_1.scala b/tests/pos-macros/power-macro-3/Macro_1.scala
new file mode 100644
index 000000000000..d8273c65faf8
--- /dev/null
+++ b/tests/pos-macros/power-macro-3/Macro_1.scala
@@ -0,0 +1,25 @@
+
+import scala.quoted.*
+
+import math.Numeric.Implicits.infixNumericOps
+
+inline def power[Num](x: Num, inline n: Int)(using num: Numeric[Num]) = ${powerCode('x, 'n)(using 'num)}
+
+private def powerCode[Num: Type](x: Expr[Num], n: Expr[Int])(using Expr[Numeric[Num]])(using Quotes): Expr[Num] =
+  powerCode(x, n.valueOrAbort)
+
+private def powerCode[Num: Type](x: Expr[Num], n: Int)(using num: Expr[Numeric[Num]])(using Quotes): Expr[Num] =
+  if (n == 0) '{ $num.one }
+  else if (n % 2 == 0) '{
+    withGiven($num) {
+      val y = $x * $x
+      ${ powerCode('y, n / 2) }
+    }
+  }
+  else '{
+    withGiven($num) {
+      $x * ${powerCode(x, n - 1)}
+    }
+  }
+
+inline def withGiven[U, T](inline x: T)(inline body: T ?=> U): U = body(using x)
diff --git a/tests/pos-macros/power-macro-3/Test_2.scala b/tests/pos-macros/power-macro-3/Test_2.scala
new file mode 100644
index 000000000000..59644c3d51fb
--- /dev/null
+++ b/tests/pos-macros/power-macro-3/Test_2.scala
@@ -0,0 +1,2 @@
+def test(x: Int) = power(x, 5)
+def test(x: Double) = power(x, 5)
diff --git a/tests/pos-macros/power-macro/Macro_1.scala b/tests/pos-macros/power-macro/Macro_1.scala
index 009947d4fe1f..54ac52edf1e4 100644
--- a/tests/pos-macros/power-macro/Macro_1.scala
+++ b/tests/pos-macros/power-macro/Macro_1.scala
@@ -6,7 +6,7 @@ object PowerMacro {
   inline def power(inline n: Long, x: Double) = ${powerCode('n, 'x)}
 
   def powerCode(n: Expr[Long], x: Expr[Double]) (using Quotes): Expr[Double] =
-    powerCode(n.valueOrError, x)
+    powerCode(n.valueOrAbort, x)
 
   def powerCode(n: Long, x: Expr[Double])(using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/pos-macros/quote-nested-object/Macro_1.scala b/tests/pos-macros/quote-nested-object/Macro_1.scala
index 19746c270840..b6f71f00f131 100644
--- a/tests/pos-macros/quote-nested-object/Macro_1.scala
+++ b/tests/pos-macros/quote-nested-object/Macro_1.scala
@@ -9,7 +9,7 @@ object Macro {
     inline def plus(inline n: Int, m: Int): Int = ${ plus('n, 'm) }
 
     def plus(n: Expr[Int], m: Expr[Int]) (using Quotes): Expr[Int] =
-      if (n.valueOrError == 0) m
+      if (n.valueOrAbort == 0) m
       else '{ ${n} + $m }
 
     object Implementation2 {
@@ -17,7 +17,7 @@ object Macro {
       inline def plus(inline n: Int, m: Int): Int = ${ plus('n, 'm) }
 
       def plus(n: Expr[Int], m: Expr[Int]) (using Quotes): Expr[Int] =
-        if (n.valueOrError == 0) m
+        if (n.valueOrAbort == 0) m
         else '{ ${n} + $m }
     }
   }
diff --git a/tests/pos-macros/quote-whitebox-2/Macro_1.scala b/tests/pos-macros/quote-whitebox-2/Macro_1.scala
index 8113cedbc113..f7a3261f0368 100644
--- a/tests/pos-macros/quote-whitebox-2/Macro_1.scala
+++ b/tests/pos-macros/quote-whitebox-2/Macro_1.scala
@@ -6,7 +6,7 @@ object Macro {
   transparent inline def charOrString(inline str: String): Any = ${ impl('str) }
 
   def impl(strExpr: Expr[String]) (using Quotes)=
-    val str = strExpr.valueOrError
+    val str = strExpr.valueOrAbort
     if (str.length == 1) Expr(str.charAt(0)) else Expr(str)
 
 }
diff --git a/tests/pos-macros/splice-pat/Macro_1.scala b/tests/pos-macros/splice-pat/Macro_1.scala
new file mode 100644
index 000000000000..b3fabb046da6
--- /dev/null
+++ b/tests/pos-macros/splice-pat/Macro_1.scala
@@ -0,0 +1,17 @@
+import scala.quoted.*
+
+object Macro {
+  object MyMatcher {
+    def unapply(expr: Expr[Any])(using Quotes): Option[Expr[Int]] = expr match {
+      case '{ (${a}: Int) + (${_}: Int) } => Some(a)
+      case _ => None
+    }
+  }
+
+  def foo(x: Int): Int = x - 1
+
+  def impl(expr: Expr[Any])(using Quotes): Expr[(Int, Int)] = expr match
+    case '{foo(${bound@MyMatcher(x)})}=> '{($bound, $x)}
+
+  inline def macr(inline x: Int): (Int, Int) = ${impl('x)}
+}
diff --git a/tests/pos-macros/splice-pat/Test_1.scala b/tests/pos-macros/splice-pat/Test_1.scala
new file mode 100644
index 000000000000..672001167616
--- /dev/null
+++ b/tests/pos-macros/splice-pat/Test_1.scala
@@ -0,0 +1,3 @@
+object Test {
+  assert(Macro.macr(Macro.foo(1 + 2)) == (3, 1))
+}
diff --git a/tests/pos-special/fatal-warnings/i10994.scala b/tests/pos-special/fatal-warnings/i10994.scala
new file mode 100644
index 000000000000..99ae647466b1
--- /dev/null
+++ b/tests/pos-special/fatal-warnings/i10994.scala
@@ -0,0 +1,2 @@
+def foo = true match
+  case (b: Boolean): Boolean => ()
diff --git a/tests/pos-special/fatal-warnings/i11729.scala b/tests/pos-special/fatal-warnings/i11729.scala
new file mode 100644
index 000000000000..7ba41d081e3b
--- /dev/null
+++ b/tests/pos-special/fatal-warnings/i11729.scala
@@ -0,0 +1,26 @@
+type Return[X] = X match
+    case List[t] => List[t]
+    case Any => List[X]
+
+object Return:
+  def apply[A](a:A):Return[A] = a match 
+    case a: List[t] => a
+    case a: Any => List(a)
+
+object Test1:
+  Return(1).map(x => x)
+
+
+type Boxed[X] = X match
+   case Box[t] => Box[t]
+   case Any => Box[X]
+
+def box[X](x: X): Boxed[X] = x match
+   case b: Box[t] => b
+   case x: Any => Box(x)
+
+case class Box[A](a:A):
+  def map[B](f: A => B): Box[B] = Box(f(a))
+
+object Test2:
+   box(box(1)).map(_ + 1)
diff --git a/tests/pos-special/fatal-warnings/i13433.scala b/tests/pos-special/fatal-warnings/i13433.scala
new file mode 100644
index 000000000000..47a4a520e63a
--- /dev/null
+++ b/tests/pos-special/fatal-warnings/i13433.scala
@@ -0,0 +1,32 @@
+import scala.reflect.TypeTest
+
+type Matcher[A] = A match { case String => String }
+
+def patternMatch[A](a: Any)(using tt: TypeTest[Any, Matcher[A]]): Option[Matcher[A]] = {
+  // type T = RDF.Triple[Rdf]
+  a match {
+    case res: Matcher[A] => Some(res)
+    case _ => None
+  }
+}
+
+def patternMatchWithAlias[A](a: Any)(using tt: TypeTest[Any, Matcher[A]]): Option[Matcher[A]] = {
+  type T = Matcher[A]
+  a match {
+    case res: T => Some(res)
+    case _ => None
+  }
+}
+
+
+@main def main = {
+  println(patternMatch[String]("abc"))
+  println(patternMatchWithAlias[String]("abc"))
+  println(patternMatch[String]("abc")(using (s: Any) => {
+    if s.isInstanceOf[Matcher[String]] then Some[s.type & Matcher[String]](s.asInstanceOf[s.type & Matcher[String]]) else None }))
+  println(patternMatchWithAlias[String]("abc")(using (s: Any) => {
+    if s.isInstanceOf[Matcher[String]] then Some[s.type & Matcher[String]](s.asInstanceOf[s.type & Matcher[String]]) else None }))
+
+  println(patternMatch[String](1))
+  println(patternMatchWithAlias[String](1))
+}
diff --git a/tests/pos-special/fatal-warnings/i13433b.scala b/tests/pos-special/fatal-warnings/i13433b.scala
new file mode 100644
index 000000000000..5e3625166fc0
--- /dev/null
+++ b/tests/pos-special/fatal-warnings/i13433b.scala
@@ -0,0 +1,28 @@
+import scala.reflect.ClassTag
+
+type Matcher[A] = A match { case String => String }
+
+def patternMatch[A](a: Any)(using tt: ClassTag[Matcher[A]]): Option[Matcher[A]] = {
+  // type T = RDF.Triple[Rdf]
+  a match {
+    case res: Matcher[A] => Some(res)
+    case _ => None
+  }
+}
+
+def patternMatchWithAlias[A](a: Any)(using tt: ClassTag[Matcher[A]]): Option[Matcher[A]] = {
+  type T = Matcher[A]
+  a match {
+    case res: T => Some(res)
+    case _ => None
+  }
+}
+
+
+@main def main = {
+  println(patternMatch[String]("abc"))
+  println(patternMatchWithAlias[String]("abc"))
+
+  println(patternMatch[String](1))
+  println(patternMatchWithAlias[String](1))
+}
diff --git a/tests/pos-special/fatal-warnings/i3589b.scala b/tests/pos-special/fatal-warnings/i3589b.scala
index e6fb462736e1..115e74b8cee2 100644
--- a/tests/pos-special/fatal-warnings/i3589b.scala
+++ b/tests/pos-special/fatal-warnings/i3589b.scala
@@ -1,5 +1,5 @@
 class Test {
-  def test(x: 1) = (x: @annotation.switch) match {
+  def test(x: 1 | 2 | 3) = (x: @annotation.switch) match {
     case 1 => 1
     case 2 => 2
     case 3 => 3
diff --git a/tests/pos-special/kind-projector-underscores.scala b/tests/pos-special/kind-projector-underscores.scala
new file mode 100644
index 000000000000..06face862e53
--- /dev/null
+++ b/tests/pos-special/kind-projector-underscores.scala
@@ -0,0 +1,59 @@
+package kind_projector
+
+trait Foo[F[_]]
+trait Qux[F[_, _]]
+trait Baz[F[_], A, B]
+
+trait FooPlus[+F[+_]]
+trait QuxPlus[+F[+_, +_]]
+trait BazPlus[+F[+_], +A, +B]
+
+trait FooMinus[-F[-_]]
+trait QuxMinus[-F[-_, -_]]
+trait BazMinus[-F[-_], -A, -B]
+
+class Bar1 extends Foo[Either[Int, _]]
+class Bar2 extends Foo[Either[_, Int]]
+class Bar3 extends Foo[_ => Int]
+class Bar4 extends Foo[Int => _]
+class Bar5 extends Foo[(Int, _, Int)]
+class Bar6 extends Foo[λ[x => Either[Int, x]]]
+class Bar7 extends Qux[λ[(x, y) => Either[y, x]]]
+class Bar8 extends Foo[Baz[Int => _, _, Int]]
+class Bar9 extends Foo[λ[x => Baz[x => _, Int, x]]]
+
+class BarPlus1 extends FooPlus[Either[Int, +_]]
+class BarPlus2 extends FooPlus[Either[+_, Int]]
+class BarPlus3 extends FooPlus[Int => +_]
+class BarPlus4 extends FooPlus[(Int, +_, Int)]
+class BarPlus5 extends FooPlus[λ[`+x` => Either[Int, x]]]
+class BarPlus6 extends QuxPlus[λ[(`+x`, `+y`) => Either[y, x]]]
+class BarPlus7 extends FooPlus[BazPlus[Int => +_, +_, Int]]
+
+class BarMinus1 extends FooMinus[-_ => Int]
+
+class VarianceAnnotationIsActuallyIgnored1 extends FooPlus[Either[Int, -_]]
+class VarianceAnnotationIsActuallyIgnored2 extends FooPlus[Either[-_, Int]]
+class VarianceAnnotationIsActuallyIgnored3 extends FooMinus[+_ => Int]
+class VarianceAnnotationIsActuallyIgnored4 extends FooPlus[Int => -_]
+class VarianceAnnotationIsActuallyIgnored5 extends FooPlus[(Int, -_, Int)]
+class VarianceAnnotationIsActuallyIgnored6 extends FooPlus[λ[`-x` => Either[Int, x]]]
+class VarianceAnnotationIsActuallyIgnored7 extends QuxPlus[λ[(`-x`, `-y`) => Either[y, x]]]
+class VarianceAnnotationIsActuallyIgnored8 extends FooPlus[BazPlus[Int => -_, -_, Int]]
+class VarianceAnnotationIsActuallyIgnored9 extends Foo[λ[`-x` => BazPlus[x => -_, Int, x]]]
+
+class BackticksAreFine1 extends FooPlus[Either[Int, `-_`]]
+class BackticksAreFine2 extends FooPlus[Either[`-_`, Int]]
+class BackticksAreFine3 extends FooMinus[`+_` => Int]
+class BackticksAreFine4 extends FooPlus[Int => `-_`]
+class BackticksAreFine5 extends FooPlus[(Int, `-_`, Int)]
+class BackticksAreFine6 extends FooPlus[BazPlus[Int => `-_`, `-_`, Int]]
+class BackticksAreFine7 extends Foo[λ[`-x` => BazPlus[x => `-_`, Int, x]]]
+
+class SpacesAreFine1 extends FooPlus[Either[Int, -  _  ]]
+class SpacesAreFine2 extends FooPlus[Either[ - _ , Int]]
+class SpacesAreFine3 extends FooMinus[ + _ => Int]
+class SpacesAreFine4 extends FooPlus[Int => - _]
+class SpacesAreFine5 extends FooPlus[(Int, - _, Int)]
+class SpacesAreFine6 extends FooPlus[BazPlus[Int => -  _ ,  - _, Int]]
+class SpacesAreFine7 extends Foo[λ[`-x` => BazPlus[x =>  - _ , Int, x]]]
diff --git a/tests/pos-special/kind-projector.scala b/tests/pos-special/kind-projector.scala
index 1bfd9a36433a..9048ae90f41c 100644
--- a/tests/pos-special/kind-projector.scala
+++ b/tests/pos-special/kind-projector.scala
@@ -4,6 +4,14 @@ trait Foo[F[_]]
 trait Qux[F[_, _]]
 trait Baz[F[_], A, B]
 
+trait FooPlus[+F[+_]]
+trait QuxPlus[+F[+_, +_]]
+trait BazPlus[+F[+_], +A, +B]
+
+trait FooMinus[-F[-_]]
+trait QuxMinus[-F[-_, -_]]
+trait BazMinus[-F[-_], -A, -B]
+
 class Bar1 extends Foo[Either[Int, *]]
 class Bar2 extends Foo[Either[*, Int]]
 class Bar3 extends Foo[* => Int]
@@ -13,3 +21,40 @@ class Bar6 extends Foo[λ[x => Either[Int, x]]]
 class Bar7 extends Qux[λ[(x, y) => Either[y, x]]]
 class Bar8 extends Foo[Baz[Int => *, *, Int]]
 class Bar9 extends Foo[λ[x => Baz[x => *, Int, x]]]
+
+class BarPlus1 extends FooPlus[Either[Int, +*]]
+class BarPlus2 extends FooPlus[Either[+*, Int]]
+class BarPlus3 extends FooPlus[Int => +*]
+class BarPlus4 extends FooPlus[(Int, +*, Int)]
+class BarPlus5 extends FooPlus[λ[`+x` => Either[Int, x]]]
+class BarPlus6 extends QuxPlus[λ[(`+x`, `+y`) => Either[y, x]]]
+class BarPlus7 extends FooPlus[BazPlus[Int => +*, +*, Int]]
+
+class BarMinus1 extends FooMinus[-* => Int]
+
+class VarianceAnnotationIsActuallyIgnored1 extends FooPlus[Either[Int, -*]]
+class VarianceAnnotationIsActuallyIgnored2 extends FooPlus[Either[-*, Int]]
+class VarianceAnnotationIsActuallyIgnored3 extends FooMinus[+* => Int]
+class VarianceAnnotationIsActuallyIgnored4 extends FooPlus[Int => -*]
+class VarianceAnnotationIsActuallyIgnored5 extends FooPlus[(Int, -*, Int)]
+class VarianceAnnotationIsActuallyIgnored6 extends FooPlus[λ[`-x` => Either[Int, x]]]
+class VarianceAnnotationIsActuallyIgnored7 extends QuxPlus[λ[(`-x`, `-y`) => Either[y, x]]]
+class VarianceAnnotationIsActuallyIgnored8 extends FooPlus[BazPlus[Int => -*, -*, Int]]
+class VarianceAnnotationIsActuallyIgnored9 extends Foo[λ[`-x` => BazPlus[x => -*, Int, x]]]
+
+class BackticksAreFine1 extends FooPlus[Either[Int, `-*`]]
+class BackticksAreFine2 extends FooPlus[Either[`-*`, Int]]
+class BackticksAreFine3 extends FooMinus[`+*` => Int]
+class BackticksAreFine4 extends FooPlus[Int => `-*`]
+class BackticksAreFine5 extends FooPlus[(Int, `-*`, Int)]
+class BackticksAreFine6 extends FooPlus[BazPlus[Int => `-*`, `-*`, Int]]
+class BackticksAreFine7 extends Foo[λ[`-x` => BazPlus[x => `-*`, Int, x]]]
+class BackticksAreFine8 extends Foo[λ[`x` => BazPlus[x => `*`, Int, x]]]
+
+// https://github.com/lampepfl/dotty/issues/13141
+// i13141
+object A {
+  class X { type Blah = Int }
+  val * = new X
+  val a: *.Blah = 2
+}
diff --git a/tests/pos-staging/quote-0.scala b/tests/pos-staging/quote-0.scala
index a9eb68ffce5f..8a48c8a2d87b 100644
--- a/tests/pos-staging/quote-0.scala
+++ b/tests/pos-staging/quote-0.scala
@@ -16,7 +16,7 @@ object Macros {
   inline def power(inline n: Int, x: Double) = ${ powerCode('n, 'x) }
 
   def powerCode(n: Expr[Int], x: Expr[Double]) (using Quotes): Expr[Double] =
-    powerCode(n.valueOrError, x)
+    powerCode(n.valueOrAbort, x)
 
   def powerCode(n: Int, x: Expr[Double])(using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/pos/10077.scala b/tests/pos/10077.scala
new file mode 100644
index 000000000000..bdd326c23cb5
--- /dev/null
+++ b/tests/pos/10077.scala
@@ -0,0 +1,13 @@
+trait T[F[_[_]]]
+
+type Inner[x] = [X[_]] =>> x match { case T[f] => f[X] }
+
+trait Monad[F[_]]
+type TMonad = T[Monad]
+
+trait U[T0]:
+  type T0_member = T0
+  def f(x: Inner[T0][List]): Unit
+
+class X extends U[T[Monad]]:
+  def f(x: Inner[T0_member][List]): Unit = ???
diff --git a/tests/pos/10747-onnxmin.scala b/tests/pos/10747-onnxmin.scala
new file mode 100644
index 000000000000..99d7e0a96d79
--- /dev/null
+++ b/tests/pos/10747-onnxmin.scala
@@ -0,0 +1,45 @@
+import scala.compiletime.ops.string.+
+import scala.compiletime.ops.int
+import scala.compiletime.ops.int.{S, +, <, <=, *}
+import scala.compiletime.ops.boolean.&&
+
+object OnnxMin {
+  type Index = Int & Singleton
+
+  sealed trait Indices
+  final case class :::[+H <: Index, +T <: Indices](head: H, tail: T) extends Indices
+
+  sealed trait INil extends Indices
+  case object INil extends INil
+
+
+  type Dimension = Int & Singleton
+
+  sealed trait Shape extends Product with Serializable
+
+  final case class #:[+H <: Dimension, +T <: Shape](head: H, tail: T) extends Shape
+
+  sealed trait SNil extends Shape
+  case object SNil extends SNil
+
+  type CContains[Haystack <: Indices, Needle <: Index] <: Boolean = Haystack match {
+    case head ::: tail => head match {
+      case Needle => true
+      case _ => CContains[tail, Needle]
+    }
+    case INil => false
+  }
+
+  type AddGivenAxisSizeLoop[First <: Shape, Second <: Shape, AxisIndex <: Indices, I <: Index] <: Shape = First match {
+    case head #: tail => CContains[AxisIndex, I] match {
+      case true =>  Second match {
+        case secondHead #: secondTail => head #: tail
+        case SNil => AxisIndex match{
+          case INil => SNil
+        }
+      }
+    }
+  }
+
+  def ConcatV13: AddGivenAxisSizeLoop[Dimension #: Shape, Dimension #: Shape, Index ::: INil, 0] = ???
+}
diff --git a/tests/pos/10747-shapeless-min.scala b/tests/pos/10747-shapeless-min.scala
new file mode 100644
index 000000000000..fbb8012fc9f2
--- /dev/null
+++ b/tests/pos/10747-shapeless-min.scala
@@ -0,0 +1,12 @@
+trait Monoidal {
+  type to[_] <: Tuple
+}
+
+object eithers extends Monoidal {
+  class Wrap[T]
+
+  type to[t] <: Tuple = Wrap[t] match {
+    case Wrap[Either[hd, tl]] => hd *: to[tl]
+    case Wrap[Nothing] => EmptyTuple
+  }
+}
diff --git a/tests/pos/10867.scala b/tests/pos/10867.scala
new file mode 100644
index 000000000000..e08b0c60a491
--- /dev/null
+++ b/tests/pos/10867.scala
@@ -0,0 +1,49 @@
+object Test {
+  type inserts[a, as <: Tuple] <: Tuple =
+    as match
+      case EmptyTuple => (a *: EmptyTuple) *: EmptyTuple
+      case y *: ys => (a *: y *: ys) *: Tuple.Map[inserts[a, ys], [t <: Tuple] =>> y *: t]
+
+  type inserts2[a] =
+    [as <: Tuple] =>> inserts[a, as]
+
+  type A = inserts [1, EmptyTuple]
+  type B = inserts2[1][EmptyTuple]
+
+  summon[A =:= ((1 *: EmptyTuple) *: EmptyTuple)]
+  summon[B =:= ((1 *: EmptyTuple) *: EmptyTuple)]
+  summon[A =:= B]
+
+  type H[t <: Tuple] = Tuple.Concat[t, EmptyTuple]
+
+  summon[H[A] =:= H[B]]
+
+  summon[Tuple.Concat[A, EmptyTuple] =:= Tuple.Concat[B, EmptyTuple]]
+}
+
+object Minimized {
+  type Concombre[X <: Tuple, +Y <: Tuple] <: Tuple = X match {
+    case EmptyTuple => Y
+    case x1 *: xs1 => X
+  }
+
+  type inserts[a, as <: Tuple] <: Tuple =
+    as match
+      case EmptyTuple => a *: EmptyTuple
+
+  type inserts2[a] =
+    [as <: Tuple] =>> inserts[a, as]
+
+  type A = inserts [1, EmptyTuple]
+  type B = inserts2[1][EmptyTuple]
+  type C = 1 *: EmptyTuple
+
+  summon[A =:= B]
+  summon[A =:= C]
+  summon[B =:= C]
+
+  type H[t <: Tuple] = Concombre[t, EmptyTuple]
+
+  summon[H[C] =:= H[A]]
+  summon[H[C] =:= H[B]]
+}
diff --git a/tests/pos/11973.scala b/tests/pos/11973.scala
new file mode 100644
index 000000000000..4c6e0bbd09a6
--- /dev/null
+++ b/tests/pos/11973.scala
@@ -0,0 +1,9 @@
+enum E:
+  case C
+
+trait T
+
+def f(x: E | T): Unit = x match {
+  case e: E => ()
+  case t: T => ()
+}
diff --git a/tests/pos/12093.scala b/tests/pos/12093.scala
new file mode 100644
index 000000000000..3bf762abb1c9
--- /dev/null
+++ b/tests/pos/12093.scala
@@ -0,0 +1,47 @@
+import scala.compiletime.ops.int.{`*`, +}
+
+// HList
+sealed trait Shape
+final case class #:[H <: Int & Singleton, T <: Shape](head: H, tail: T) extends Shape
+case object Ø extends Shape
+type Ø = Ø.type
+
+// Reduce
+def reduce[T, S <: Shape, A <: Shape](shape: S, axes: A): Reduce[S, A, 0] = ???
+type Reduce[S, Axes <: Shape, I <: Int] <: Shape = S match {
+  case head #: tail => Contains[Axes, I] match {
+    case true => Reduce[tail, Remove[Axes, I], I + 1]
+    case false => head #: Reduce[tail, Axes, I + 1]
+  }
+  case Ø => Axes match {
+    case Ø => Ø
+    // otherwise, do not reduce further
+  }
+}
+type Contains[Haystack <: Shape, Needle <: Int] <: Boolean = Haystack match {
+  case Ø => false
+  case head #: tail => head match {
+    case Needle => true
+    case _ => Contains[tail, Needle]
+  }
+}
+type Remove[From <: Shape, Value <: Int] <: Shape = From match {
+  case Ø => Ø
+  case head #: tail => head match {
+    case Value => Remove[tail, Value]
+    case _ => head #: Remove[tail, Value]
+  }
+}
+
+// Reshape
+def reshape[From <: Shape, To <: Shape](from: From, to: To)
+  (using ev: NumElements[From] =:= NumElements[To]): To = ???
+type NumElements[X <: Shape] <: Int = X match {
+  case Ø => 1
+  case head #: tail => head * NumElements[tail]
+}
+
+// Test cases
+val input = #:(25, #:(256, #:(256, #:(3, Ø))))
+val reduced = reduce(input, #:(3, #:(1, #:(2, Ø))))
+val reshaped: 5 #: 5 #: Ø = reshape(reduced, #:(5, #:(5, Ø)))
diff --git a/tests/pos/12278.scala b/tests/pos/12278.scala
new file mode 100644
index 000000000000..226d1453bc6c
--- /dev/null
+++ b/tests/pos/12278.scala
@@ -0,0 +1,16 @@
+import scala.compiletime.ops.int.*
+
+object Test {
+  type Fib[N <: Int] <: Int = N match {
+    case 0 => 0
+    case 1 => 1
+    case Any => Fib[N - 1] + Fib[N - 2]
+  }
+  val fib0: Fib[0] = 0
+  val fib1: Fib[1] = 1
+  val fib2: Fib[2] = 1
+  val fib3: Fib[3] = 2
+  val fib4: Fib[4] = 3
+  val fib5: Fib[5] = 5
+  val fib6: Fib[6] = 8
+}
diff --git a/tests/pos/12944/12944_1.scala b/tests/pos/12944/12944_1.scala
new file mode 100644
index 000000000000..e6b6286c43a3
--- /dev/null
+++ b/tests/pos/12944/12944_1.scala
@@ -0,0 +1,11 @@
+object Test1 {
+  type ++[L, R] = (L, R) match
+    case (Int, Int)       => 2
+    case (String, String) => "2"
+    case (String, Int)    => "2"
+    case (Int, String)    => "2"
+
+  type Bar[W <: Int] = W ++ "" ++ W
+
+  val works = summon[Bar[2] =:= "2"]
+}
diff --git a/tests/pos/12944/12944_2.scala b/tests/pos/12944/12944_2.scala
new file mode 100644
index 000000000000..cb471a59d191
--- /dev/null
+++ b/tests/pos/12944/12944_2.scala
@@ -0,0 +1,5 @@
+import Test1._
+
+object Test2 {
+  val fails = summon[Bar[2] =:= "2"]
+}
diff --git a/tests/pos/13455.scala b/tests/pos/13455.scala
new file mode 100644
index 000000000000..62e0dae9c881
--- /dev/null
+++ b/tests/pos/13455.scala
@@ -0,0 +1,10 @@
+sealed class R
+
+type X[T] = T match {
+  case R        => String
+  case (z => r) => Int
+}
+def x[T]: X[T] = ???
+
+def i(i0: Int): Unit = ???
+val a = i(x[Int => String])
diff --git a/tests/pos/13469.scala b/tests/pos/13469.scala
new file mode 100644
index 000000000000..7e4238373a4f
--- /dev/null
+++ b/tests/pos/13469.scala
@@ -0,0 +1,47 @@
+object Meta:
+  type Shape = String | Tuple
+
+  type Demote[S <: Tuple]<: Shape = S match
+    case Tuple1[t] => t & Shape
+    case Tuple => S
+
+  type If[T <: Boolean, R1, R2] <: R1 | R2 = T match
+    case true => R1
+    case false => R2
+
+  type Contains[T <: Tuple, X] <: Boolean = T match
+    case X *: r => true
+    case _ *: r => Contains[r, X]
+    case _ => false
+
+  type RemoveStrict[T <: Tuple, X] <: Tuple = T match
+    case head *: tail => head match
+      case X => tail
+      case _ => head *: RemoveStrict[tail, X]
+
+  type WithoutStrict[T <: Tuple, T2 <: Tuple] <: Tuple = T2 match
+    case head *: tail => WithoutStrict[RemoveStrict[T, head], tail]
+    case EmptyTuple => T
+
+  /** Removes all elems from ToReplace and replaces the first replaced elem with replacement */
+  type ReplaceAllStrict[T <: Tuple, ToReplace <: Tuple, Replacement] <: Tuple = T match
+    case head *: tail =>
+      If[Contains[ToReplace, head],
+          Replacement *: WithoutStrict[tail, RemoveStrict[ToReplace, head]],
+          head *: ReplaceAllStrict[tail, ToReplace, Replacement]]
+    case EmptyTuple => T
+
+  type Sub[S <: Tuple, ToReplace <: Tuple, Replacement <: String] =
+    Demote[ReplaceAllStrict[S, ToReplace, Replacement]]
+
+object Foo:
+  import Meta._
+  val _0: Sub["batch" *: EmptyTuple, Int *: EmptyTuple, "batch"] = "batch"
+  val _1: Sub[("batch", "len"), ("batch", "len"), "batch"] = "batch"
+  val _2a: ReplaceAllStrict[("batch", "len", "embed"), "batch" *: EmptyTuple, "b"] = ("b", "len", "embed")
+  type S = ("batch", "len")
+  type ToReplace = "batch" *: EmptyTuple
+  type Replacement = "b"
+  val _2b: ReplaceAllStrict[S, ToReplace, Replacement] = ("b", "len") // ok
+  val _2c: Demote[ReplaceAllStrict[S, ToReplace, Replacement]] = ("b", "len") // ok
+  val _2d: Sub[S, ToReplace, Replacement] = ("b", "len") // error, see below
diff --git a/tests/pos/13491.scala b/tests/pos/13491.scala
new file mode 100644
index 000000000000..d16452cf922c
--- /dev/null
+++ b/tests/pos/13491.scala
@@ -0,0 +1,97 @@
+import scala.annotation.unchecked.uncheckedVariance
+
+import scala.language.implicitConversions
+
+sealed trait HList extends Product with Serializable
+final case class ::[+H, +T <: HList](head: H, tail: T) extends HList
+
+sealed trait HNil extends HList
+case object HNil extends HNil
+
+trait HListable[T] {
+  type Out <: HList
+}
+
+object HListable {
+  type HL0[T] <: HList = T match {
+    case Unit     => HNil
+    case HNil     => HNil
+    case ::[a, b] => ::[a, b]
+    case _        => T :: HNil
+  }
+
+  implicit def calc[T]: HListable[T] { type Out = HL0[T] } = ???
+}
+
+sealed trait TailSwitch[L <: HList, T <: HList, R <: HList] {
+  type Out <: HList
+}
+object TailSwitch {
+  type Reverse0[Acc <: HList, L <: HList] <: HList = L match {
+    case HNil     => Acc
+    case ::[h, t] => Reverse0[h :: Acc, t]
+  }
+
+  type Reverse1[L <: HList] <: HList = L match {
+    case HNil     => HNil
+    case ::[h, t] => Reverse0[h :: HNil, t]
+  }
+
+  type Prepend0[A <: HList, B <: HList] <: HList = A match {
+    case HNil     => B
+    case ::[h, t] => ::[h, Prepend0[t, B]]
+  }
+
+  // type-level implementation of this algorithm:
+  //   @tailrec def rec(L, LI, T, TI, R, RI) =
+  //     if (TI <: L) R
+  //     else if (LI <: T) RI.reverse ::: R
+  //     else if (LI <: HNil) rec(L, HNil, T, TI.tail, R, RI)
+  //     else if (TI <: HNil) rec(L, LI.tail, T, HNil, R, LI.head :: RI)
+  //     else rec(L, LI.tail, T, TI.tail, R, LI.head :: RI)
+  //   rec(L, L, T, T, R, HNil)
+  type TailSwitch0[L <: HList, LI <: HList, T <: HList, TI <: HList, R <: HList, RI <: HList] <: HList = TI match {
+    case L => R
+    case _ =>
+    LI match {
+      case T => Prepend0[Reverse1[RI], R]
+      case HNil =>
+      TI match {
+        case ::[_, t] => TailSwitch0[L, HNil, T, t, R, RI]
+      }
+      case ::[h, t] =>
+      TI match {
+        case HNil      => TailSwitch0[L, t, T, HNil, R, h :: RI]
+        case ::[_, tt] => TailSwitch0[L, t, T, tt, R, h :: RI]
+      }
+    }
+  }
+
+  type Aux[L <: HList, LI <: HList, T <: HList, TI <: HList, R <: HList, RI <: HList, Out <: HList] =
+    TailSwitch[L, T, R] { type Out = TailSwitch0[L, L, T, T, R, HNil] }
+
+  implicit def tailSwitch[L <: HList, T <: HList, R <: HList]
+  : TailSwitch[L, T, R] { type Out = TailSwitch0[L, L, T, T, R, HNil] } = ???
+}
+
+sealed class Rule[-I <: HList, +O <: HList] {
+  def ~[I2 <: HList, O2 <: HList](that: Rule[I2, O2])(implicit
+                                                      i: TailSwitch[I2, O@uncheckedVariance, I@uncheckedVariance],
+                                                      o: TailSwitch[O@uncheckedVariance, I2, O2]
+  ): Rule[i.Out, o.Out] = ???
+
+}
+object Rule {
+  type Rule0 = Rule[HNil, HNil]
+  type RuleN[+L <: HList]   = Rule[HNil, L]
+
+  def rule[I <: HList, O <: HList](r: Rule[I, O]): Rule[I, O] = ???
+  implicit def valueMap[T](m: Map[String, T])(implicit h: HListable[T]): RuleN[h.Out] = ???
+}
+
+object Test {
+  import Rule._
+  val colors: Map[String, Int] = Map("red" -> 1, "green" -> 2, "blue" -> 3)
+  def EOI: Rule0= ???
+  val r = rule(colors ~ EOI)
+}
diff --git a/tests/pos/13495.scala b/tests/pos/13495.scala
new file mode 100644
index 000000000000..a70864d5ca66
--- /dev/null
+++ b/tests/pos/13495.scala
@@ -0,0 +1,20 @@
+import scala.annotation.showAsInfix
+
+object Test {
+  trait Component
+  sealed trait Deleted extends Component
+
+  type Deletable[L <: CList] <: CList = L match {
+    case h &: t => (h | Deleted) &: Deletable[t]
+    case CNil => CNil
+  }
+
+  sealed trait CList
+  sealed trait CNil extends CList
+  @showAsInfix case class &:[+C <: Component, +L <: CList](h: C, t: L) extends CList
+
+  case class A(x: Int, y: Int) extends Component
+  case class B(x: Int, y: Int) extends Component
+
+  val x: Deletable[A &: B &: CNil] = ???
+}
diff --git a/tests/pos/13633.scala b/tests/pos/13633.scala
new file mode 100644
index 000000000000..ca0f7e68e81e
--- /dev/null
+++ b/tests/pos/13633.scala
@@ -0,0 +1,50 @@
+import scala.compiletime.{constValueTuple, constValue}
+
+object Sums extends App:
+
+  println(constValueTuple[Plus[(true, true, true), (true, true)]]) // works
+  println(constValueTuple[Plus1[(true, true, true), (true, true)]]) // fails
+  println(constValueTuple[
+    Reverse[PlusLoop[Reverse[(true, true, true)], Reverse[(true, true)], false]]]
+    ) // also works despite it's just an unfold of `Plus1` application
+
+  type Plus[A <: Tuple, B <: Tuple] <: Tuple = (A, B) match
+    case (EmptyTuple, EmptyTuple) => EmptyTuple
+    case (a, b)                   => Reverse[PlusLoop[Reverse[A], Reverse[B], false]]
+
+  type Plus1[A <: Tuple, B <: Tuple]         = Reverse[PlusLoop[Reverse[A], Reverse[B], false]]
+
+  type ReverseLoop[A, XS <: Tuple] <: Tuple = A match {
+    case EmptyTuple => XS
+    case x *: xs    => ReverseLoop[xs, x *: XS]
+  }
+
+  type Reverse[A] = ReverseLoop[A, EmptyTuple]
+
+  type PlusTri[A, B, C]                             = (A, B, C) match
+    case (false, false, false)                                              => (false, false)
+    case (true, false, false) | (false, true, false) | (false, false, true) => (false, true)
+    case (true, true, false) | (true, false, true) | (false, true, true)    => (true, false)
+    case (true, true, true)                                                 => (true, true)
+
+  type Inc[A <: Tuple] <: Tuple                     = A match
+    case EmptyTuple => true *: EmptyTuple
+    case t *: as    =>
+      t match
+        case false => true *: as
+        case true  => false *: Inc[as]
+
+  type IncT[A <: Tuple, O <: Boolean] <: Tuple      = O match
+    case false => A
+    case true  => Inc[A]
+
+  type PlusLoop[A <: Tuple, B <: Tuple, O] <: Tuple = (A, B) match
+    case (EmptyTuple, EmptyTuple) =>
+      O match
+        case true  => (true *: EmptyTuple)
+        case false => EmptyTuple
+    case (EmptyTuple, B)          => IncT[B, O]
+    case (A, EmptyTuple)          => IncT[A, O]
+    case (a *: as, b *: bs)       =>
+      PlusTri[a, b, O] match
+        case (x, y) => y *: PlusLoop[as, bs, x]
diff --git a/tests/pos/13855.scala b/tests/pos/13855.scala
new file mode 100644
index 000000000000..7c093ed98409
--- /dev/null
+++ b/tests/pos/13855.scala
@@ -0,0 +1,13 @@
+type A[X] = X match
+  case Int => Int
+  case _   => B[X]
+
+def a[X](x: X): A[X] = x match
+  case v: Int => v
+  case _      => b(x)
+
+type B[X] = X match
+  case String => String
+
+def b[X](x: X): B[X] = x match
+  case v: String => v
diff --git a/tests/pos/7512.scala b/tests/pos/7512.scala
new file mode 100644
index 000000000000..fbc8ae6a72e3
--- /dev/null
+++ b/tests/pos/7512.scala
@@ -0,0 +1,24 @@
+import scala.compiletime.ops.int.S
+
+object InfiniteLoopMatchType {
+    def main(args: Array[String]): Unit = {
+        testProd(2, 10)
+    }
+
+    def testProd(a: Int, b: Int)(using ev: (a.type * b.type) =:= (b.type * a.type)) = true
+
+    type *[A <: Int, B <: Int] <: Int = A match {
+        case 0 => 0
+        case _ => MultiplyLoop[A, B, 0]
+    }
+
+    type MultiplyLoop[A <: Int, B <: Int, Acc <: Int] <: Int = A match {
+        case 0 => Acc
+        case S[aMinusOne] => MultiplyLoop[aMinusOne, B, B + Acc]
+    }
+
+    type +[A <: Int, B <: Int] <: Int = A match {
+        case 0 => B
+        case S[aMinusOne] => aMinusOne + S[B]
+    }
+}
diff --git a/tests/pos/8649.scala b/tests/pos/8649.scala
new file mode 100644
index 000000000000..7e0351d52628
--- /dev/null
+++ b/tests/pos/8649.scala
@@ -0,0 +1,32 @@
+// This is crazy:
+type Get0 = OK[Int, Unit]
+def get0: Handler[Get0] = IO[Unit]()
+
+case class HandlerAlt[A](value: Handler[A])
+
+type Handler[API] = handler.Go[API]
+
+case class IO[A]()
+case class OK[A, B]()
+
+object handler:
+  // Starter for Handler reduction:
+  type Go[API] = API match
+    case _ =>
+      HandlerSingle[API]
+
+  type HandlerSingle[X] = X match
+    case OK[_, response] =>
+      IO[response]
+
+object Minimized {
+  case class HandlerAlt[A](value: M2[A])
+
+  type M1[X] = X match {
+    case _ => M2[X]
+  }
+
+  type M2[X] = X match {
+    case Int => String
+  }
+}
diff --git a/tests/pos/9239.scala b/tests/pos/9239.scala
index 8f3ddfbd1ced..c9c0ec268218 100644
--- a/tests/pos/9239.scala
+++ b/tests/pos/9239.scala
@@ -24,5 +24,5 @@ object ABug:
     N match
       case Zero => One
       case One => One
-      case ? => ![--[N]] × (N)
+      case _ => ![--[N]] × (N)
       case ? :: ? => ![--[N]] × (N)
diff --git a/tests/pos/9623.scala b/tests/pos/9623.scala
new file mode 100644
index 000000000000..656afefb941e
--- /dev/null
+++ b/tests/pos/9623.scala
@@ -0,0 +1,22 @@
+object A {
+  sealed trait TList
+  sealed trait TNil extends TList
+  sealed trait ++:[H, T <: TList] extends TList
+
+  type :--[R <: TList, A] <: TList = R match {
+    case (A ++: t) => t
+    case (h ++: t) => h ++: (t :-- A)
+  }
+}
+
+object B {
+  import A.*
+
+  type X = (Int ++: String ++: Double ++: TNil) :-- String
+
+  class T[A]
+
+  def f(ta: T[X]) = ()
+
+  f(new T[Int ++: Double ++: TNil])
+}
diff --git a/tests/pos/9675.scala b/tests/pos/9675.scala
new file mode 100644
index 000000000000..63f01cf73a2f
--- /dev/null
+++ b/tests/pos/9675.scala
@@ -0,0 +1,18 @@
+import scala.compiletime.ops.int.S
+
+sealed trait TList
+sealed trait TNil extends TList
+sealed trait ++:[H[_], T <: TList] extends TList
+
+type IndexOf[H[_], T <: TList] <: Int = T match
+  case H ++: _ => 0
+  case _ ++: t => S[IndexOf[H, t]]
+
+// compiles fine
+val a = summon[ValueOf[IndexOf[List, List ++: Option ++: TNil]]].value
+
+// causes an error
+val b = summon[ValueOf[IndexOf[List, Option ++: List ++: TNil]]].value
+
+object T extends App:
+  println(a)
diff --git a/tests/pos/9757.scala b/tests/pos/9757.scala
new file mode 100644
index 000000000000..aeecfa0a472f
--- /dev/null
+++ b/tests/pos/9757.scala
@@ -0,0 +1,11 @@
+type RemoveFrom[R, A] = R match {
+  case A & newType => newType
+}
+
+def removeOnePart[R, PartR, A](f: R => A, partR: PartR): RemoveFrom[R, PartR] => A = ???
+
+trait A {}
+trait B {}
+
+val f: (A & B) => Int = ???
+val f2 = removeOnePart(f, new A {})
diff --git a/tests/pos/9890.scala b/tests/pos/9890.scala
new file mode 100644
index 000000000000..96d6f1db33b7
--- /dev/null
+++ b/tests/pos/9890.scala
@@ -0,0 +1,49 @@
+object Test {
+  import scala.compiletime.ops.int._
+
+  trait x
+
+  type Range[Min <: Int, Max <: Int] <: Tuple = Min match {
+    case Max => EmptyTuple
+    case _ => Min *: Range[Min + 1, Max]
+  }
+
+  type TupleMap[Tup <: Tuple, Bound, F[_ <: Bound]] <: Tuple = Tup match {
+    case EmptyTuple => EmptyTuple
+    case h *: t => F[h] *: TupleMap[t, Bound, F]
+  }
+  type TupleDedup[Tup <: Tuple, Mask] <: Tuple = Tup match {
+    case EmptyTuple => EmptyTuple
+    case h *: t => h match {
+      case Mask => TupleDedup[t, Mask]
+      case _ => h *: TupleDedup[t, h | Mask]
+    }
+  }
+
+  type CoordToPos[r <: Int, c <: Int] = r * 9 + c
+  type Cell[r <: Int, c <: Int, Board <: Tuple] = Tuple.Elem[Board, CoordToPos[r, c]]
+  type Col[c <: Int, Board <: Tuple] = TupleMap[Range[0, 9], Int, [r <: Int] =>> Cell[r, c, Board]]
+
+  type ColFromPos[Pos <: Int] = Pos % 9
+
+  type Sudoku1 = (
+    x, x, x,  x, 1, x,  4, x, 6,
+    8, x, 1,  6, 2, x,  x, x, 9,
+    x, 3, x,  x, x, 9,  x, 2, x,
+
+    5, x, 9,  1, 3, x,  x, 6, x,
+    x, 6, x,  9, x, 2,  x, 4, x,
+    x, 2, x,  x, 6, 7,  8, x, 5,
+
+    x, 9, x,  5, x, x,  x, 3, x,
+    3, x, x,  x, 4, 6,  9, x, 7,
+    6, x, 7,  x, 9, x,  x, x, x,
+  )
+
+  //compiles fine
+  summon[Col[ColFromPos[0], Sudoku1] =:= (x, 8, x,  5, x, x,  x, 3, 6)]
+
+  summon[TupleDedup[(x, 8, x,  5, x, x,  x, 3, 6), Nothing] =:= (x, 8, 5, 3, 6)]
+  //but this doesn't
+  summon[TupleDedup[Col[ColFromPos[0], Sudoku1], Nothing] =:= (x, 8, 5, 3, 6)]
+}
diff --git a/tests/pos/X.scala b/tests/pos/X.scala
index ce5fcb547bbf..04150b72beeb 100644
--- a/tests/pos/X.scala
+++ b/tests/pos/X.scala
@@ -2,8 +2,8 @@ import scala.deriving.*
 
 trait FunctorK[F[_[_]]]
 object FunctorK {
-  given [C]: FunctorK[[F[_]] =>> C] with {}
-  given [T]: FunctorK[[F[_]] =>> Tuple1[F[T]]] with {}
+  given [C]: FunctorK[[F[_]] =>> C]()
+  given [T]: FunctorK[[F[_]] =>> Tuple1[F[T]]]()
 
   def derived[F[_[_]]](using m: Mirror { type MirroredType[X[_]] = F[X] ; type MirroredElemTypes[_[_]] }, r: FunctorK[m.MirroredElemTypes]): FunctorK[F] = new FunctorK[F] {}
 }
diff --git a/tests/neg/case-semi.scala b/tests/pos/case-semi.scala
similarity index 100%
rename from tests/neg/case-semi.scala
rename to tests/pos/case-semi.scala
diff --git a/tests/pos/dependent-annot.scala b/tests/pos/dependent-annot.scala
new file mode 100644
index 000000000000..28f0f8bd59e6
--- /dev/null
+++ b/tests/pos/dependent-annot.scala
@@ -0,0 +1,7 @@
+class C
+class ann(x: Any*) extends annotation.Annotation
+
+def f(y: C, z: C) =
+  def g(): C @ann(y, z) = ???
+  val ac: ((x: C) => Array[String @ann(x)]) = ???
+  val dc = ac(g())
diff --git a/tests/pos/depfun.scala b/tests/pos/depfun.scala
new file mode 100644
index 000000000000..683b04b32e39
--- /dev/null
+++ b/tests/pos/depfun.scala
@@ -0,0 +1,17 @@
+// The following test is derived from scala/reflect/TypeTest.scala, but using
+// a dependent function instead of a dependent SAM. It shows that the special treatment
+// using a DependentTypeTree is not needed for plain function types.
+// But for SAM types, the treatment is needed, otherwise TypeTest.scala does
+// not typecheck. Todo: Figure out the reason for this difference.
+object Test:
+
+  type F[S, T] = (x: S) => Option[x.type & T]
+
+  /** Trivial type test that always succeeds */
+  def identity[T]: F[T, T] = Some(_)
+
+  val x: 1 = 1
+  val y = identity(x)
+  val z: Option[1] = y
+
+
diff --git a/tests/pos/experimental-erased-2.scala b/tests/pos/experimental-erased-2.scala
new file mode 100644
index 000000000000..f3b524e18463
--- /dev/null
+++ b/tests/pos/experimental-erased-2.scala
@@ -0,0 +1,8 @@
+import language.experimental.erasedDefinitions
+import annotation.experimental
+
+@experimental object Test:
+
+  erased class CanThrow[-E <: Exception]
+
+  def other = 1
diff --git a/tests/pos/experimental-erased.scala b/tests/pos/experimental-erased.scala
new file mode 100644
index 000000000000..156ad639f42d
--- /dev/null
+++ b/tests/pos/experimental-erased.scala
@@ -0,0 +1,11 @@
+import language.experimental.erasedDefinitions
+import annotation.experimental
+
+@experimental
+erased class CanThrow[-E <: Exception](val i: Int = 0)
+
+@experimental
+object Foo
+
+@experimental
+def bar = 1
diff --git a/tests/pos/experimentalErased.scala b/tests/pos/experimentalErased.scala
new file mode 100644
index 000000000000..358c134c714a
--- /dev/null
+++ b/tests/pos/experimentalErased.scala
@@ -0,0 +1,22 @@
+import language.experimental.erasedDefinitions
+import annotation.experimental
+
+@experimental
+erased class Foo
+
+erased class Bar
+
+@experimental
+erased def foo = 2
+
+erased def bar = 2
+
+@experimental
+erased val foo2 = 2
+
+erased val bar2 = 2
+
+@experimental
+def foo3(erased a: Int) = 2
+
+def bar3(erased a: Int) = 2
diff --git a/tests/pos/experimentalExperimental.scala b/tests/pos/experimentalExperimental.scala
new file mode 100644
index 000000000000..4b57e5b94346
--- /dev/null
+++ b/tests/pos/experimentalExperimental.scala
@@ -0,0 +1 @@
+class MyExperimentalAnnot extends scala.annotation.experimental
diff --git a/tests/pos/f112.scala b/tests/pos/f112.scala
new file mode 100644
index 000000000000..ad19fc5c4b04
--- /dev/null
+++ b/tests/pos/f112.scala
@@ -0,0 +1,6 @@
+type X
+val x: X = ???
+extension (x: X) def unapply(arg: Any): Boolean = true
+def test =
+  ??? match
+    case x() =>
diff --git a/tests/pos/forwardCompat-excludedExport/Test_r3.0.scala b/tests/pos/forwardCompat-excludedExport/Test_r3.0.scala
new file mode 100644
index 000000000000..c635935471d8
--- /dev/null
+++ b/tests/pos/forwardCompat-excludedExport/Test_r3.0.scala
@@ -0,0 +1,2 @@
+object A:
+  export Tuple.{canEqualEmptyTuple as _, canEqualTuple as _, given, *}
diff --git a/tests/pos/gadt-hkt-hi-bounds.scala b/tests/pos/gadt-hkt-hi-bounds.scala
new file mode 100644
index 000000000000..fca06f375b6b
--- /dev/null
+++ b/tests/pos/gadt-hkt-hi-bounds.scala
@@ -0,0 +1,8 @@
+type Const = [X] =>> Int
+
+trait Expr[-F[_]]
+case class ConstExpr() extends Expr[Const]
+
+def foo[F[_], A](e: Expr[F]) = e match
+  case _: ConstExpr =>
+    val i: Int = ??? : F[A]
diff --git a/tests/pos/gadt-hkt-lo-bounds.scala b/tests/pos/gadt-hkt-lo-bounds.scala
new file mode 100644
index 000000000000..177b7fe044f3
--- /dev/null
+++ b/tests/pos/gadt-hkt-lo-bounds.scala
@@ -0,0 +1,7 @@
+type Const = [X] =>> Int
+
+trait Expr[+F[_]]
+case class ConstExpr() extends Expr[Const]
+
+def foo[F[_], A](e: Expr[F]): F[A] = e match
+  case _: ConstExpr => 0
diff --git a/tests/pos/gadt-param-unification.scala b/tests/pos/gadt-param-unification.scala
new file mode 100644
index 000000000000..39c944469d74
--- /dev/null
+++ b/tests/pos/gadt-param-unification.scala
@@ -0,0 +1,6 @@
+trait Expr[T]
+final class Lit[T] extends Expr[T]
+
+def foo[X, T1 >: X, T2](m: Expr[T2]): T2 = m match {
+  case _: Lit[T1] => ??? : X
+}
diff --git a/tests/pos/i0239.scala b/tests/pos/i0239.scala
index 258c3c987adc..5b01cd224af1 100644
--- a/tests/pos/i0239.scala
+++ b/tests/pos/i0239.scala
@@ -1,3 +1,5 @@
+package i0239
+
 package p {
   class C[A] {
     implicit def foo: M[A] = ???
diff --git a/tests/pos/i10295.scala b/tests/pos/i10295.scala
index 3ec7eefca0ac..44400ce29de6 100644
--- a/tests/pos/i10295.scala
+++ b/tests/pos/i10295.scala
@@ -10,9 +10,11 @@ def doSomething(body: M ?=> Unit) = body(using new M{})
 
 def Test1 =
   given M = new M{}
-  import m.*
-  val x: X = X.foo()
-  println(x)
+  locally {
+    import m.*
+    val x: X = X.foo()
+    println(x)
+  }
 
 def Test2 =
 
diff --git a/tests/pos/i10347/A_1.scala b/tests/pos/i10347/A_1.scala
new file mode 100644
index 000000000000..e6a87f14edec
--- /dev/null
+++ b/tests/pos/i10347/A_1.scala
@@ -0,0 +1,7 @@
+trait L[+T] { def head: T }
+class K(val s: String) extends AnyVal
+object A {
+  def foo: L[String] = ???
+  def bar: L[K] = ???
+  def baz(k: K): L[String] = ???
+}
diff --git a/tests/pos/i10347/C_2.java b/tests/pos/i10347/C_2.java
new file mode 100644
index 000000000000..7525c5e7325d
--- /dev/null
+++ b/tests/pos/i10347/C_2.java
@@ -0,0 +1,5 @@
+public class C_2 {
+  String hi = A.foo().head();
+  String hy = A.bar().head();
+  String hj = A.baz("").head();
+}
diff --git a/tests/pos/i10389.scala b/tests/pos/i10389.scala
new file mode 100644
index 000000000000..a23f0d269a21
--- /dev/null
+++ b/tests/pos/i10389.scala
@@ -0,0 +1,9 @@
+import scala.util._
+
+object FooBar {
+  def foo = List("1","two","3").collect{ x => 
+    Try(x.toInt) match { 
+      case Success(int) => int 
+    }
+  }
+}
diff --git a/tests/pos/i10897.scala b/tests/pos/i10897.scala
new file mode 100644
index 000000000000..da583090992b
--- /dev/null
+++ b/tests/pos/i10897.scala
@@ -0,0 +1,6 @@
+import Tuple.Union
+
+object Foo
+
+val x = summon[Union[(Foo.type, 1)] =:= (Foo.type | 1)] // doesn't compile
+val y = summon[Union[(Foo.type, 1, String)] =:= (Foo.type | 1 | String)] // compiles
diff --git a/tests/pos/i10900.scala b/tests/pos/i10900.scala
new file mode 100644
index 000000000000..6b7754d7e38f
--- /dev/null
+++ b/tests/pos/i10900.scala
@@ -0,0 +1,23 @@
+import scala.collection.IterableOps
+def foo[CC[A] <: IterableOps[A, CC, CC[A]], A](collection: CC[A]) =
+  collection == collection
+
+object Test1 {
+  import scala.collection.IterableOps
+  implicit class RichCollection[CC[A] <: IterableOps[A, CC, CC[A]], A](val collection: CC[A]) {
+    def awm(update: CC[A] => CC[A]): CC[A] = {
+      val newCollection = update(collection)
+      if (newCollection == collection) collection else newCollection.awm(update)
+    }
+  }
+}
+
+object Test2 {
+  import scala.collection.IterableOps
+  implicit class RichCollection[CC[A] <: IterableOps[A, CC, CC[A]], A](val collection: CC[A]) {
+    def awm(update: CC[A] => CC[A]): CC[A] = update(collection) match {
+      case `collection` => collection
+      case updated      => updated.awm(update)
+    }
+  }
+}
diff --git a/tests/pos/i11045.scala b/tests/pos/i11045.scala
deleted file mode 100644
index da5d66a7a633..000000000000
--- a/tests/pos/i11045.scala
+++ /dev/null
@@ -1,2 +0,0 @@
-abstract class Foo(x: Any)
-class Boom(var x: Unit, y: Unit) extends Foo((x: Int) => x)
\ No newline at end of file
diff --git a/tests/pos/i11163.scala b/tests/pos/i11163.scala
new file mode 100644
index 000000000000..acf5629d1ae9
--- /dev/null
+++ b/tests/pos/i11163.scala
@@ -0,0 +1,12 @@
+inline def summonA[T](using x: T): x.type = x
+inline def summonB[T](using inline x: T): x.type = x
+inline def summonC[T](using inline x: T): T = x
+
+trait Foo:
+  def f: Int = 9
+
+def test(using Foo) =
+  summonA[Foo].f
+  summonB[Foo].f
+  summonC[Foo].f
+  ()
diff --git a/tests/pos/i11168.scala b/tests/pos/i11168.scala
index d40d628ccd5a..4d4ee6d3c1ec 100644
--- a/tests/pos/i11168.scala
+++ b/tests/pos/i11168.scala
@@ -1,5 +1,5 @@
 trait Foo
-given foo: Foo with {}
+given foo: Foo()
 
 extension (using Foo)(x: Any)
   def foo1[A] = ???
diff --git a/tests/pos/i11185.scala b/tests/pos/i11185.scala
new file mode 100644
index 000000000000..3b4a308bbc9e
--- /dev/null
+++ b/tests/pos/i11185.scala
@@ -0,0 +1,14 @@
+class Test:
+  def foo(a: Int, b: Int) = a + b
+
+  Map(1 -> 2).map(foo _)
+  Map(1 -> 2).map(foo)
+
+class Test2:
+  def foo(a: Int, b: Int) = a + b
+
+  def bar(f: ((Int, Int)) => Int) = "ok"
+  def bar(f: ((Int, Int)) => String)(using Int) = "ok"
+
+  bar(foo)
+  bar(foo _)
diff --git a/tests/pos/i11220.scala b/tests/pos/i11220.scala
new file mode 100644
index 000000000000..f6d600280bf6
--- /dev/null
+++ b/tests/pos/i11220.scala
@@ -0,0 +1,8 @@
+import scala.annotation.tailrec
+class Context {
+  type Tree
+}
+
+final def loop3[C <: Context](): Unit =
+  @tailrec
+  def loop4[A <: C](c: A): c.Tree = loop4(c)
\ No newline at end of file
diff --git a/tests/pos/i11318a.scala b/tests/pos/i11318a.scala
new file mode 100644
index 000000000000..6422b32a375e
--- /dev/null
+++ b/tests/pos/i11318a.scala
@@ -0,0 +1,4 @@
+extension(a: Int)
+  def b: Int = ???
+  def h: Unit =
+    [A] => (r: Int) => b
diff --git a/tests/pos/i11318b.scala b/tests/pos/i11318b.scala
new file mode 100644
index 000000000000..b8bf2203d218
--- /dev/null
+++ b/tests/pos/i11318b.scala
@@ -0,0 +1,13 @@
+type FunctionK[A[_], B[_]] = [Z] => A[Z] => B[Z]
+type ~>:[A[_], B[_]] = FunctionK[A, B]
+
+trait RepresentableK[F[_[_], _]]:
+  type RepresentationK[_]
+
+  def tabulateK[A[_], C](f: RepresentationK ~>: A): F[A, C]
+
+  extension[A[_], C](fa: F[A, C])
+    def indexK: RepresentationK ~>: A
+
+    def mapK[B[_]] (f: A ~>: B): F[B, C] =
+      tabulateK([Z] => (r: RepresentationK[Z]) => f(indexK(r)))
diff --git a/tests/pos/i11318c.scala b/tests/pos/i11318c.scala
new file mode 100644
index 000000000000..b1da38d7f6da
--- /dev/null
+++ b/tests/pos/i11318c.scala
@@ -0,0 +1,6 @@
+extension(a: Int)
+  def b: Int = ???
+  def h: Unit =
+    new Function1[Int, Int] {
+      def apply(r: Int): Int = b
+    }
diff --git a/tests/pos/i11481.scala b/tests/pos/i11481.scala
new file mode 100644
index 000000000000..99fa6a250ff0
--- /dev/null
+++ b/tests/pos/i11481.scala
@@ -0,0 +1,2 @@
+case class Foo[F[_]](f: {def f(x: F[Int]): Object})
+case class Bar[F[_], G[_]](f: [B] => F[B] => G[B])
diff --git a/tests/pos/i11499.scala b/tests/pos/i11499.scala
new file mode 100644
index 000000000000..2d64750c3b22
--- /dev/null
+++ b/tests/pos/i11499.scala
@@ -0,0 +1,11 @@
+trait Functor[F[_]]
+
+object data {
+
+  type OptionT[F[_], A] = F[Option[A]]
+
+  def fold[F[_], A, B](value: OptionT[F, A])(f: Functor[F]): F[B] = ???
+
+  def cata[F[_], A, B](value: OptionT[F, A])(f: Functor[F]): F[B] =
+    fold(value)(f) // error
+}
diff --git a/tests/pos/i11556.scala b/tests/pos/i11556.scala
new file mode 100644
index 000000000000..782cdfeeac8f
--- /dev/null
+++ b/tests/pos/i11556.scala
@@ -0,0 +1,24 @@
+type Traverser[-I, +O] = I => LazyList[(O)]
+extension[I, O](ta: Traverser[I, O])
+    def ~>[P](tb: Traverser[O, P]): Traverser[I, P] = ???
+
+class Graph { class Node }
+
+case class Path[+E](e: E)
+type Query[-I, +O] = Traverser[Path[I], Path[O]]
+
+def nodesQ(using g: Graph): Query[Nothing, g.Node] = ???
+def outsQ(using g: Graph): Query[g.Node, g.Node] = ???
+
+object graphObj extends Graph
+import graphObj._
+given graphObj.type = graphObj
+
+object Issue11556:
+  val q1: Query[Nothing, Node] = nodesQ ~> outsQ
+  implicitly[q1.type <:< Query[Nothing, Node]]
+
+  val q2 = nodesQ ~> outsQ
+  val q3: Query[Nothing, Node] = q2
+  implicitly[q2.type <:< Query[Nothing, Node]]
+end Issue11556
diff --git a/tests/pos/i11631.scala b/tests/pos/i11631.scala
new file mode 100644
index 000000000000..ecd6f267dafc
--- /dev/null
+++ b/tests/pos/i11631.scala
@@ -0,0 +1,19 @@
+trait MyTrait:
+  def a(): String = ""
+
+class Nulll
+
+extension [T](x: T | Nulll) inline def nnn: x.type & T = ???
+
+class MyClass:
+  var myTrait: MyTrait|Null = null
+
+  def printA(): Unit = println(myTrait.nnn.a())
+
+@main def runTest(): Unit =
+  val mt = new MyTrait:
+    override def a(): String = "hello world"
+
+  val mc = MyClass()
+  mc.myTrait = mt
+  mc.printA()
diff --git a/tests/pos/i11631b.scala b/tests/pos/i11631b.scala
new file mode 100644
index 000000000000..6f91532158fe
--- /dev/null
+++ b/tests/pos/i11631b.scala
@@ -0,0 +1,15 @@
+trait MyTrait:
+  def a(): String = ""
+
+class MyClass:
+  var myTrait: MyTrait|Null = null
+
+  def printA(): Unit = println(myTrait.nn.a())
+
+@main def runTest(): Unit =
+  val mt = new MyTrait:
+    override def a(): String = "hello world"
+
+  val mc = MyClass()
+  mc.myTrait = mt
+  mc.printA()
diff --git a/tests/pos/i11864.scala b/tests/pos/i11864.scala
index da7140e57b8d..4f7735f1c8c5 100644
--- a/tests/pos/i11864.scala
+++ b/tests/pos/i11864.scala
@@ -40,7 +40,7 @@ final class CallbackTo[+A] {
 object CallbackTo {
 
   type MapGuard[A] = { type Out = A }
-  erased given MapGuard[A]: MapGuard[A] = ???
+  erased given MapGuard[A]: MapGuard[A] = compiletime.erasedValue
 
   def traverse[A, B](ta: List[A]): CallbackTo[List[B]] =
     val x: CallbackTo[List[A] => List[B]] = ???
diff --git a/tests/pos/i11955.scala b/tests/pos/i11955.scala
new file mode 100644
index 000000000000..b4a9f3148ccf
--- /dev/null
+++ b/tests/pos/i11955.scala
@@ -0,0 +1,25 @@
+object Hello {
+
+  sealed abstract class X[+A] {
+    type This[+A] <: X[A]
+    def asThis: This[A]
+  }
+
+  class Y[+A] extends X[A] {
+    override type This[+AA] = Y[AA]
+    override def asThis: This[A] = this
+  }
+
+  def hackBackToSelf[F[+u] <: X[u], A](f: F[Any])(f2: f.This[A]): F[A] =
+    f2.asInstanceOf[F[A]]
+
+  case class G[F[+u] <: X[u], A](wrapped: F[A]) {
+
+    def mapF[F2[+u] <: X[u]](f: F[A] => F2[A]): G[F2, A] =
+      G[F2, A](f(wrapped))
+
+    def test_ko_1: G[F, A] = mapF(ct => hackBackToSelf(ct)(ct.asThis)) // error
+    def test_ko_2: G[F, A] = mapF[F](ct => hackBackToSelf(ct)(ct.asThis)) // error
+    def test_ok  : G[F, A] = mapF(ct => hackBackToSelf[F, A](ct)(ct.asThis)) // ok
+  }
+}
\ No newline at end of file
diff --git a/tests/pos/i12072-b.scala b/tests/pos/i12072-b.scala
new file mode 100644
index 000000000000..07bca25b68be
--- /dev/null
+++ b/tests/pos/i12072-b.scala
@@ -0,0 +1,9 @@
+transparent inline def f: Null = null
+
+inline def g: Unit =
+  inline if f == "V" then 1 else 2
+  inline if f != "V" then 3 else 4
+  inline if "v" == f then 5 else 6
+  inline if "v" != f then 7 else 8
+
+def test = g
diff --git a/tests/pos/i12072-c.scala b/tests/pos/i12072-c.scala
new file mode 100644
index 000000000000..f99f0da9049f
--- /dev/null
+++ b/tests/pos/i12072-c.scala
@@ -0,0 +1,86 @@
+object T {
+
+  transparent inline def f(inline s: String): String | Null =
+    null
+
+  inline val V = "V"
+  inline def D = "D"
+
+  trait Trait { def s: String }
+
+  // ===========================================================================
+  // inline {if,match} over inline {val,def}
+
+  transparent inline def if_v: String =
+    inline if V == "V" then "o" else "x"
+
+  transparent inline def if_d: String =
+    inline if D == "D" then "o" else "x"
+
+  transparent inline def match_v: String =
+    inline V match { case "V" => "o"; case _   => "x" }
+
+  transparent inline def match_d: String =
+    inline D match { case "D" => "o"; case _   => "x" }
+
+  // ===========================================================================
+  // inline {if,match} over inline f(inline {val,def})
+
+  transparent inline def if_fv: String =
+    inline if f(V) == "V" then "o" else "x"
+
+  transparent inline def if_fd: String =
+    inline if f(D) == "D" then "o" else "x"
+
+  transparent inline def match_fv: String =
+    inline f(V) match { case "V" => "o"; case _   => "x" }
+
+  transparent inline def match_fd: String =
+    inline f(D) match { case "D" => "o"; case _   => "x" }
+
+  // ===========================================================================
+  // inline {if,match} over inline {val,def} in overridden method
+
+  object IfV extends Trait {
+    override transparent inline def s: String =
+      inline if V == "V" then "o" else "x"
+  }
+
+  object IfD extends Trait {
+    override transparent inline def s: String =
+      inline if D == "D" then "o" else "x" // <--------------------------- error
+  }
+
+  object MatchV extends Trait {
+    override transparent inline def s: String =
+      inline V match { case "V" => "o"; case _   => "x" }
+  }
+
+  object MatchD extends Trait {
+    override transparent inline def s: String =
+      inline D match { case "D" => "o"; case _   => "x" }
+  }
+
+  // ===========================================================================
+  // inline {if,match} over inline f(inline {val,def}) in overridden method
+
+  object IfFV extends Trait {
+    override transparent inline def s: String =
+      inline if f(V) == "V" then "o" else "x" // <------------------------ error
+  }
+
+  object IfFD extends Trait {
+    override transparent inline def s: String =
+      inline if f(D) == "D" then "o" else "x" // <------------------------ error
+  }
+
+  object MatchFV extends Trait {
+    override transparent inline def s: String =
+      inline f(V) match { case "V" => "o"; case _   => "x" }
+  }
+
+  object MatchFD extends Trait {
+    override transparent inline def s: String =
+      inline f(D) match { case "D" => "o"; case _   => "x" }
+  }
+}
diff --git a/tests/pos/i12072-d.scala b/tests/pos/i12072-d.scala
new file mode 100644
index 000000000000..486e9f478771
--- /dev/null
+++ b/tests/pos/i12072-d.scala
@@ -0,0 +1,4 @@
+class Test:
+  def n: Null = null
+  def test1: Boolean = n == null
+  def test2: Boolean = null == n
diff --git a/tests/pos/i12072-e.scala b/tests/pos/i12072-e.scala
new file mode 100644
index 000000000000..713c86fba909
--- /dev/null
+++ b/tests/pos/i12072-e.scala
@@ -0,0 +1,3 @@
+def test: Boolean = nn(42) == 42
+
+def nn(x: Int): x.type & Int = ???
diff --git a/tests/pos/i12072.scala b/tests/pos/i12072.scala
new file mode 100644
index 000000000000..ab85059d676a
--- /dev/null
+++ b/tests/pos/i12072.scala
@@ -0,0 +1,8 @@
+inline def c: Int = 2
+
+trait A:
+  def f: Unit
+
+class B extends A:
+  override inline def f: Unit =
+    inline if c == 2 then () else ()
diff --git a/tests/pos/i12073.scala b/tests/pos/i12073.scala
new file mode 100644
index 000000000000..52917477c316
--- /dev/null
+++ b/tests/pos/i12073.scala
@@ -0,0 +1,70 @@
+inline def ff: Unit =
+  inline 1 match
+    case 1 | 2 =>
+
+def test = ff
+
+transparent inline def f: Option[String] =
+  None
+
+object Override {
+
+  trait Trait { def s: String }
+
+  object OK extends Trait {
+    override transparent inline def s: String =
+      inline f match {
+        case Some("x") => "x"
+        case Some("y") => "y"
+        case None      => "-"
+      }
+  }
+
+  object KO_1 extends Trait {
+    override transparent inline def s: String =
+      inline f match {
+        case Some("x") => "x"
+        case Some("y")
+           | None      => "0"
+      }
+  }
+
+  object KO_2 extends Trait {
+    override transparent inline def s: String =
+      inline f match {
+        case Some("x") => "x"
+        case Some("y") => "y"
+        case Some(z)   => "z"
+        case None      => "0"
+      }
+  }
+}
+
+object NonOverride {
+
+  transparent inline def ok_1: String =
+    inline f match {
+      case Some("x") => "x"
+      case Some("y") => "y"
+      case None      => "-"
+    }
+
+  // ok: Some("y") | None
+  transparent inline def ok_2: String =
+    inline f match {
+      case Some("x") => "x"
+      case Some("y")
+         | None      => "0"
+    }
+
+  // ok: no None
+  transparent inline def ok_3: String =
+    inline f match {
+      case Some("x") => "x"
+      case Some("y") => "y"
+      case Some(z)   => "z"
+      case None      => "0"
+    }
+
+  ok_1 + ok_2 ++ ok_3
+}
\ No newline at end of file
diff --git a/tests/pos/i12112.scala b/tests/pos/i12112.scala
new file mode 100644
index 000000000000..e979779353c0
--- /dev/null
+++ b/tests/pos/i12112.scala
@@ -0,0 +1,10 @@
+object A:
+  object B:
+    object C
+
+object X {
+  import A.B
+
+  B.C        // ok
+  export B.C // error
+}
diff --git a/tests/pos/i12126.scala b/tests/pos/i12126.scala
new file mode 100644
index 000000000000..cffa7fbcbbca
--- /dev/null
+++ b/tests/pos/i12126.scala
@@ -0,0 +1,59 @@
+object Structures:
+
+  trait Functor[F[_]]:
+    extension [A](fa: F[A])
+      def map[B](f: A => B): F[B]
+      def as[B](b: B): F[B] = map(_ => b)
+      def void: F[Unit] = as(())
+
+  trait Applicative[F[_]] extends Functor[F]:
+    def pure[A](a: A): F[A]
+    def unit: F[Unit] = pure(())
+    extension[A](fa: F[A])
+      def map2[B, C](fb: F[B], f: (A, B) => C): F[C]
+      def map[B](f: A => B): F[B] =
+        fa.map2(unit, (a, _) => f(a))
+
+  trait Monad[F[_]] extends Applicative[F]:
+    extension[A](fa: F[A])
+      def flatMap[B](f: A => F[B]): F[B]
+      override def map[B](f: A => B): F[B] =
+        flatMap(a => pure(f(a)))
+      def map2[B, C](fb: F[B], f: (A, B) => C): F[C] =
+        flatMap(a => fb.map(b => f(a, b)))
+
+  given Monad[List] with
+    def pure[A](a: A) = List(a)
+    extension[A](fa: List[A])
+      def flatMap[B](f: A => List[B]) = fa.flatMap(f)
+
+  given Monad[Option] with
+    def pure[A](a: A) = Some(a)
+    extension[A](fa: Option[A])
+      def flatMap[B](f: A => Option[B]) = fa.flatMap(f)
+
+
+  opaque type Kleisli[F[_], A, B] = A => F[B]
+
+  extension [F[_], A, B](k: Kleisli[F, A, B])
+    def apply(a: A): F[B] = k(a)
+
+  object Kleisli:
+    def apply[F[_], A, B](f: A => F[B]): Kleisli[F, A, B] = f
+
+  given [F[_], A](using F: Monad[F]): Monad[[B] =>> Kleisli[F, A, B]] with
+    def pure[B](b: B) = Kleisli(_ => F.pure(b))
+    extension[B](k: Kleisli[F, A, B])
+      def flatMap[C](f: B => Kleisli[F, A, C]) =
+        a => k(a).flatMap(b => f(b)(a))
+
+end Structures
+
+@main def run =
+  import Structures.{*, given}
+  println(List(1, 2, 3).map2(List(4, 5, 6), (_, _)))
+
+  val p: Kleisli[Option, Int, Int] = Kleisli((x: Int) => if x % 2 == 0 then Some(x) else None)
+  val q: Kleisli[Option, Int, Int] = summon[Applicative[[B] =>> Kleisli[Option, Int, B]]].pure(20)
+  println(p.map2(q, _ + _)(42))
+
diff --git a/tests/pos/i12127.scala b/tests/pos/i12127.scala
new file mode 100644
index 000000000000..ce0ff6b31546
--- /dev/null
+++ b/tests/pos/i12127.scala
@@ -0,0 +1,5 @@
+val x = Option((1, 2, 3)).map(_ + _ + _)
+def foo[T <: Tuple : Tuple.IsMappedBy[Option]](t: T)(f: Tuple.InverseMap[T, Option] => Int) = null
+val y = foo(Option(1), Option(2), Option(3))(_ + _ + _)
+
+//val x: (Tuple3[Int, Int, Int] => Int) = _ + _ + _
diff --git a/tests/pos/i12133.scala b/tests/pos/i12133.scala
new file mode 100644
index 000000000000..46b65f534e99
--- /dev/null
+++ b/tests/pos/i12133.scala
@@ -0,0 +1,15 @@
+class B
+
+class A {
+  def foo(x: B) = ???
+  def foo(str: String) = ???
+}
+
+//implicit class C(x: A) {
+//  def foo(s: Int*) = s.size
+//}
+extension (x: A) def foo(s: Int*) = s.size
+
+val a = new A
+
+def test: Unit = a.foo(1, 2)
\ No newline at end of file
diff --git a/tests/pos/i12140/Test.scala b/tests/pos/i12140/Test.scala
new file mode 100644
index 000000000000..073d096e8490
--- /dev/null
+++ b/tests/pos/i12140/Test.scala
@@ -0,0 +1 @@
+@main def Test = println(example.Trait.get)
\ No newline at end of file
diff --git a/tests/pos/i12140/Trait.scala b/tests/pos/i12140/Trait.scala
new file mode 100644
index 000000000000..23d5cde613a0
--- /dev/null
+++ b/tests/pos/i12140/Trait.scala
@@ -0,0 +1,14 @@
+// Trait.scala
+package example
+
+import quoted._
+
+trait Trait {
+  implicit val foo: Int = 23
+}
+
+object Trait {
+  inline def get: Trait = ${ getImpl }
+
+  def getImpl(using Quotes): Expr[Trait] = '{ new Trait {} }
+}
diff --git a/tests/pos/i12141.scala b/tests/pos/i12141.scala
new file mode 100644
index 000000000000..df0d748ed008
--- /dev/null
+++ b/tests/pos/i12141.scala
@@ -0,0 +1,47 @@
+case class Test1(); case class Test2(); case class Test3();
+case class Test4(); case class Test5(); case class Test6();
+
+sealed abstract class DSL {
+  def cont [P1 >: this.type <: DSL, P2 <: DSL](continuation: => P2) =
+    Continue[P1, P2](() => this, () => continuation)
+}
+case class Continue [P1 <: DSL, P2 <: DSL](p1: () => P1, p2: () => P2) extends DSL
+
+trait More[-A] {}
+case class Out[C <: More[A], A](c: C, v: A) extends DSL
+case class Nop() extends DSL
+
+val decision1:Boolean = true;
+val decision2:Boolean = false;
+
+type P[
+ChanA <: More[Test1|Test2],
+ChanB <: More[Test3|Test4],
+ChanC <: More[Test5|Test6]] =
+ ((Out[ChanA,Test1] Continue ((Out[ChanB,Test3] Continue Nop)|(Out[ChanB,Test4] Continue Nop))) //works if remove first 'Continue Nop'
+ | (Out[ChanA,Test2] Continue ((Out[ChanC,Test5] Continue Nop)|(Out[ChanC,Test6] Continue Nop))))
+
+
+def p( chanA: More[Test1|Test2], chanB: More[Test3|Test4], chanC: More[Test5|Test6])
+ :P[chanA.type,chanB.type,chanC.type] ={
+      if(decision1){
+         Out(chanA,Test1()) cont {
+            if(decision2){
+               Out(chanB,Test3()) cont Nop() //works if replace with 'Out(chanB,Test3())'
+            }
+            else{
+               Out(chanB,Test4()) cont Nop()
+            }
+         }
+      }
+      else{
+         Out(chanA,Test2()) cont {
+            if(decision2){
+               Out(chanC,Test5()) cont Nop()
+            }
+            else{
+               Out(chanC,Test6()) cont Nop()
+            }
+         }
+      }
+   }
\ No newline at end of file
diff --git a/tests/pos/i12168.scala b/tests/pos/i12168.scala
new file mode 100644
index 000000000000..e01d9e024ca2
--- /dev/null
+++ b/tests/pos/i12168.scala
@@ -0,0 +1,9 @@
+package A {
+    opaque type T = Int
+    def t: T = 0
+}
+
+package B {
+    export A.T
+    val t: B.T = A.t
+}
diff --git a/tests/pos/i12169.scala b/tests/pos/i12169.scala
new file mode 100644
index 000000000000..6ad5cc4fb621
--- /dev/null
+++ b/tests/pos/i12169.scala
@@ -0,0 +1,13 @@
+class Property[T]
+
+class VObject {
+  def properties() = {
+    List.empty[Property[?]].collect {
+      case p: Property[?] => List(p)
+    }
+  }
+}
+
+class Event extends VObject {
+  override def properties() = ???
+}
\ No newline at end of file
diff --git a/tests/pos/i12178.scala b/tests/pos/i12178.scala
new file mode 100644
index 000000000000..b2c97b44f0fc
--- /dev/null
+++ b/tests/pos/i12178.scala
@@ -0,0 +1,24 @@
+opaque type LabelTagged[TLabel <: Singleton & String, TValue] = TValue
+
+object LabelTagged:
+  def apply[TLabel <: Singleton & String, TValue]
+  (
+    label: TLabel,
+    value: TValue,
+  )
+  : LabelTagged[TLabel, TValue] = value
+
+extension[TLabel <: Singleton & String, TValue] (labelTagged: LabelTagged[TLabel, TValue])
+  def value
+  : TValue = labelTagged
+
+  def label
+  (using label: ValueOf[TLabel])
+  : TLabel
+  = label.value
+
+@main def hello(): Unit = {
+  val foo: LabelTagged["foo", Int] = LabelTagged("foo", 10)
+  println(label(foo))  // OK
+  println(foo.label)   // was error, now OK
+}
diff --git a/tests/pos/i12180a.scala b/tests/pos/i12180a.scala
new file mode 100644
index 000000000000..c8e6308ce6bc
--- /dev/null
+++ b/tests/pos/i12180a.scala
@@ -0,0 +1,7 @@
+inline def n = null
+inline def f = inline if n == null then 0 else 1
+inline def m = inline n match { case null => 0; case _ => 1 }
+
+@main def main =
+  println(f) // error
+  println(m)
diff --git a/tests/pos/i12180b.scala b/tests/pos/i12180b.scala
new file mode 100644
index 000000000000..56d436cf6772
--- /dev/null
+++ b/tests/pos/i12180b.scala
@@ -0,0 +1,9 @@
+inline def n = "im a string"
+inline def f = inline if n == null then 0 else 1
+inline def g = inline if null == n then 0 else 1
+inline def m = inline n match { case null => 0; case _ => 1 }
+
+@main def main =
+  println(f)
+  println(g)
+  println(m)
diff --git a/tests/pos/i12194-opaque.scala b/tests/pos/i12194-opaque.scala
new file mode 100644
index 000000000000..b800d27bb140
--- /dev/null
+++ b/tests/pos/i12194-opaque.scala
@@ -0,0 +1,3 @@
+opaque type ProductK[F[_], T <: Tuple] = Tuple.Map[T, F]
+object ProductK:
+  def of[F[_], T <: Tuple](t: Tuple.Map[T, F]): ProductK[F, T] = t
diff --git a/tests/pos/i12211.scala b/tests/pos/i12211.scala
new file mode 100644
index 000000000000..6c117e0bf474
--- /dev/null
+++ b/tests/pos/i12211.scala
@@ -0,0 +1,31 @@
+
+def fst0[A, B[_]](a: A)(b: B[a.type]): a.type = a
+
+def fst[A, B[_]]: (a: A) => (b: B[a.type]) => a.type =
+  (a: A) => (b: B[a.type]) => a
+
+def snd[A, B[_]]: (a: A) => () => (b: B[a.type]) => b.type =
+  (a: A) => () => (b: B[a.type]) => b
+
+def fst1[A, B[_]]: (a: A) => (b: B[a.type]) => a.type = fst0
+
+def test1[A, B[_]]: (a: A) => () => (b: B[a.type]) => Any =
+  snd[A, B]
+
+def test2[A, B[_]]: (a: A) => (b: B[a.type]) => A = fst[A, B]
+
+class AA
+class BB[T]
+
+def test3: (a: AA) => (b: BB[a.type]) => BB[?] =
+  (a: AA) => (b: BB[a.type]) => b
+
+trait RelaxedSelectable extends Selectable.WithoutPreciseParameterTypes:
+  def applyDynamic(name: String, paramTypes: Class[_]*)(args: Any*): Any = ???
+
+class Sink[A] extends RelaxedSelectable {
+  def put(x: A): Unit = {}
+}
+val a = new Sink[String]
+val b: RelaxedSelectable { def put(x: String): Unit } = a
+val _ = b.put("")
diff --git a/tests/pos/i12218.scala b/tests/pos/i12218.scala
new file mode 100644
index 000000000000..515e71f83fc8
--- /dev/null
+++ b/tests/pos/i12218.scala
@@ -0,0 +1,10 @@
+import language.experimental.fewerBraces
+@main def runTest(): Unit =
+  val arr = Array(1,2,3)
+  if
+    arr.isEmpty
+    || :
+      val first = arr(0)
+      first != 1
+  then println("invalid arr")
+  else println("valid arr")
diff --git a/tests/pos/i12226.scala b/tests/pos/i12226.scala
new file mode 100644
index 000000000000..b22e8b4cd428
--- /dev/null
+++ b/tests/pos/i12226.scala
@@ -0,0 +1,16 @@
+object Test extends App {
+  sealed trait P[T]
+  case class C1[T <: String](c1: T) extends P[T]
+  case class C2[T](c2: T) extends P[T]
+
+  def test[T](p: P[T], t: T): Unit = p match {
+    case C1(_) =>
+      // T <: String
+      val t : T = ???
+      val s : String = t
+      def test = new C1[T](t)
+      println(1)
+
+    case C2(_) => println(2)
+  }
+}
diff --git a/tests/pos/i12247.scala b/tests/pos/i12247.scala
new file mode 100644
index 000000000000..b2b522f36044
--- /dev/null
+++ b/tests/pos/i12247.scala
@@ -0,0 +1,27 @@
+sealed abstract class CtorType
+object CtorType {
+  final class Props extends CtorType
+  sealed trait Summoner { type CT <: CtorType }
+  implicit def summonP: Summoner {type CT = Props} = ???
+}
+
+final case class Builder() {
+  def build(using ctorType: CtorType.Summoner): Component[ctorType.CT] = ???
+}
+
+final class Component[CT <: CtorType]
+
+object Test {
+
+  def assertTypeOf[A](a: => A) = new TestDsl[A]
+  class TestDsl[A] {
+    def is[B](implicit ev: A =:= B): Unit = ()
+  }
+
+  type Expect = Component[CtorType.Props]
+
+  assertTypeOf( Builder().build ).is[Expect] // error
+
+  val x = Builder().build
+  assertTypeOf(x).is[Expect] // ok
+}
diff --git a/tests/pos/i12264.scala b/tests/pos/i12264.scala
new file mode 100644
index 000000000000..6be35b8e0e9f
--- /dev/null
+++ b/tests/pos/i12264.scala
@@ -0,0 +1,40 @@
+object test1:
+
+  object Html {
+    final opaque type Tag[+N] = String
+    def apply[N](name: String): Tag[N] = ???
+  }
+
+  object HtmlTags {
+    final def br: Html.Tag[Int] = Html("br")
+    final def p = Html[Long]("p")
+  }
+
+  object Test {
+    type Expect = Html.Tag[Any]
+
+    val x = List[Expect](HtmlTags.br, HtmlTags.p) // ok
+
+    val y = List(HtmlTags.br, HtmlTags.p)
+    y: List[Expect] // was error
+  }
+
+class test2:
+  type Tag[+N]
+  object Html:
+    def apply[N](name: String): Tag[N] = ???
+
+  object HtmlTags {
+    final def br: Tag[Int] = Html("br")
+    final def p = Html[Long]("p")
+  }
+
+  object Test {
+    type Expect = Tag[Any]
+
+    val x = List[Expect](HtmlTags.br, HtmlTags.p) // ok
+
+    val y = List(HtmlTags.br, HtmlTags.p)
+    y: List[Expect] // was error
+  }
+
diff --git a/tests/pos/i12265.scala b/tests/pos/i12265.scala
new file mode 100644
index 000000000000..420d382a342b
--- /dev/null
+++ b/tests/pos/i12265.scala
@@ -0,0 +1,14 @@
+object OK {
+  def apply(n: Int ): Unit = ()
+  def apply(n: Long): Unit = ()
+  apply(3)  // ok
+  apply(3L) // ok
+}
+
+object KO {
+  type Key = Int
+  def apply(n: Key ): Unit = ()
+  def apply(n: Long): Unit = ()
+  apply(3)  // error
+  apply(3L) // ok
+}
diff --git a/tests/pos/i12273.scala b/tests/pos/i12273.scala
new file mode 100644
index 000000000000..1201c2fc62bd
--- /dev/null
+++ b/tests/pos/i12273.scala
@@ -0,0 +1,4 @@
+import scala.annotation.unchecked.uncheckedVariance
+
+final case class Outlet[T](out: T)
+final case class SourceShape[+T](val out: Outlet[T @uncheckedVariance])
\ No newline at end of file
diff --git a/tests/pos/i12277.scala b/tests/pos/i12277.scala
new file mode 100644
index 000000000000..99eb7238da00
--- /dev/null
+++ b/tests/pos/i12277.scala
@@ -0,0 +1,18 @@
+def foo(f: => () => Unit): Unit = ???
+def boo(f: [A] => () => Unit): Unit = ???
+
+object test:
+  foo { () =>  // okay
+    println(1)
+    println(2)
+  }
+
+  boo { [A] => () => // error
+    println(1)
+    println(2)
+  }
+
+  boo { [A] => () => { // okay
+    println(1)
+    println(2)
+  }}
\ No newline at end of file
diff --git a/tests/pos/i12286.scala b/tests/pos/i12286.scala
new file mode 100644
index 000000000000..d638c1304ab2
--- /dev/null
+++ b/tests/pos/i12286.scala
@@ -0,0 +1,13 @@
+sealed trait Base { def str: String }
+case class One(str: String) extends Base
+case class Two(str: String) extends Base
+case class Three(str: String) extends Base
+
+case class Item(_id: String)
+
+private def doWithItem[T <: (One | Two | Three)]
+  (item: Item, value: T, action: (T) => Item) = doWithItemId(item._id, value, action)
+private def doWithItemId[U <: (One | Two | Three)]
+  (itemId: String, value: U, action: (U) => Item) =
+    println(value.str)
+    Item("_id")
\ No newline at end of file
diff --git a/tests/pos/i12299.scala b/tests/pos/i12299.scala
new file mode 100644
index 000000000000..cabd12ed3b05
--- /dev/null
+++ b/tests/pos/i12299.scala
@@ -0,0 +1,54 @@
+object Outer0 {
+
+  object Inner {
+    class Bar(x: Int):
+      def this() = this(0)
+  }
+
+  export Inner.Bar
+
+  val _ = Bar()
+  val _ = Bar(2)
+
+}
+
+object Outer2 {
+
+  object Inner {
+    class Bar(x: Int):
+      def this() = this(0)
+  }
+
+  object test2:
+    export Inner._
+
+    val x = Bar()
+    val y = Bar(2)
+
+  object test3:
+    export Inner.Bar
+    def Bar: () => String = () => ""
+    val x = Bar()
+}
+
+object Outer3 {
+  export Outer0._
+
+  private val x = Bar()
+  private val y = Bar(2)
+}
+
+object Outer4 {
+
+  object Inner {
+    class Bar(x: Int):
+      def this() = this(0)
+    object Bar
+  }
+
+  export Inner._
+
+  val _ = Bar()
+  val _ = Bar(2)
+
+}
diff --git a/tests/pos/i12299/Outer_1.scala b/tests/pos/i12299/Outer_1.scala
new file mode 100644
index 000000000000..200c21beecb8
--- /dev/null
+++ b/tests/pos/i12299/Outer_1.scala
@@ -0,0 +1,9 @@
+object Outer {
+
+  object Inner {
+    class Bar(x: Int):
+      def this() = this(0)
+  }
+
+  export Inner.Bar
+}
diff --git a/tests/pos/i12299/Test_2.scala b/tests/pos/i12299/Test_2.scala
new file mode 100644
index 000000000000..ce4c9390744d
--- /dev/null
+++ b/tests/pos/i12299/Test_2.scala
@@ -0,0 +1,4 @@
+import Outer._
+
+val x = Bar()
+val y = Bar(2)
diff --git a/tests/pos/i12299a.scala b/tests/pos/i12299a.scala
new file mode 100644
index 000000000000..90819f0a0bca
--- /dev/null
+++ b/tests/pos/i12299a.scala
@@ -0,0 +1,11 @@
+object Outer {
+
+  object Wrap {
+    export Outer.Bar
+  }
+
+  class Bar
+
+  val wrapBar = Wrap.Bar()
+}
+
diff --git a/tests/pos/i12306.scala b/tests/pos/i12306.scala
new file mode 100644
index 000000000000..86638a2c8c36
--- /dev/null
+++ b/tests/pos/i12306.scala
@@ -0,0 +1,23 @@
+class Record(elems: Map[String, Any]) extends Selectable:
+  val fields = elems.toMap
+  def selectDynamic(name: String): Any = fields(name)
+object Record:
+  def apply(elems: Map[String, Any]): Record = new Record(elems)
+extension [A <: Record] (a:A) {
+  def join[B <: Record] (b:B): A & B = {
+    Record(a.fields ++ b.fields).asInstanceOf[A & B]
+  }
+}
+
+type Person = Record { val name: String; val age: Int }
+type Child = Record { val parent: String }
+type PersonAndChild = Record { val name: String; val age: Int; val parent: String }
+
+@main def hello = {
+  val person = Record(Map("name" -> "Emma", "age" -> 42)).asInstanceOf[Person]
+  val child = Record(Map("parent" -> "Alice")).asInstanceOf[Child]
+  val personAndChild = person.join(child)
+
+  val v1: PersonAndChild = personAndChild
+  val v2: PersonAndChild = person.join(child)
+}
\ No newline at end of file
diff --git a/tests/pos/i12373.scala b/tests/pos/i12373.scala
new file mode 100644
index 000000000000..61ac1e085892
--- /dev/null
+++ b/tests/pos/i12373.scala
@@ -0,0 +1,40 @@
+sealed case class Column[A](name: String)
+
+sealed trait ColumnSet {
+  type Append[That <: ColumnSet] <: ColumnSet
+  def ++[That <: ColumnSet](that: That): Append[That]
+}
+
+object ColumnSet {
+  type Empty                  = Empty.type
+  type Singleton[A]           = Cons[A, Empty]
+
+  case object Empty extends ColumnSet {
+    type Append[That <: ColumnSet] = That
+    override def ++[That <: ColumnSet](that: That): Append[That] = that
+  }
+
+  sealed case class Cons[A, B <: ColumnSet](head: Column[A], tail: B) extends ColumnSet { self =>
+    type Append[That <: ColumnSet] = Cons[A, tail.Append[That]]
+    override def ++[That <: ColumnSet](that: That): Append[That] = Cons(head, tail ++ that)
+  }
+
+  def long(name: String): Singleton[Long]     = Cons(Column[Long](name), Empty)
+  def string(name: String): Singleton[String] = Cons(Column[String](name), Empty)
+}
+
+object Example {
+  import ColumnSet._
+  val schema0 = long("id") ++ string("first_name")
+
+  // inferred type 3.0.0-RC3: Singleton[Long]#Append[Cons[String, Empty]]#Append[Singleton[String]]
+  // inferred type 2.13.5   : Cons[Long,Cons[String,Singleton[String]]]
+  val schema1 = long("id") ++ string("first_name") ++ string("last_name")
+
+  // inferred type 3.0.0-RC3: error
+  // inferred type 2.13.5   : Cons[Long,Cons[String,Cons[String,Singleton[Long]]]]
+  val schema2 = long("id") ++ string("first_name") ++ string("last_name") ++ long("age")
+
+  // inferred type 3.0.0-RC3: Singleton[Long]#Append[Cons[String, Empty]]#Append[Singleton[String]]#Append[Cons[Long, Empty]]
+  val schema3 = ((long("id") ++ string("first_name") ++ string("last_name")): Singleton[Long]#Append[ColumnSet.Cons[String, ColumnSet.Empty]]#Append[ColumnSet.Singleton[String]]) ++ long("age")
+}
diff --git a/tests/pos/i12379a.scala b/tests/pos/i12379a.scala
new file mode 100644
index 000000000000..0a1bc8461226
--- /dev/null
+++ b/tests/pos/i12379a.scala
@@ -0,0 +1,12 @@
+inline def convFail[Of, From](inline from : From) : Unit =
+  val c = compiletime.summonInline[Conversion[from.type, Of]]
+
+inline def convOK[Of, From](inline from : From)(using c : Conversion[from.type, Of]) : Unit = {}
+
+class Bar[T](value : T)
+given [T <: Int] : Conversion[T, Bar[T]] = Bar(_)
+
+@main def main : Unit = {
+  convOK[Bar[1],1](1)
+  convFail[Bar[1],1](1) //causes error
+}
diff --git a/tests/pos/i12379b.scala b/tests/pos/i12379b.scala
new file mode 100644
index 000000000000..2a83f69bae3d
--- /dev/null
+++ b/tests/pos/i12379b.scala
@@ -0,0 +1,12 @@
+inline def convFail[Of, From](inline from : From) : Unit =
+  val c = compiletime.summonInline[Conversion[From, Of]]
+
+inline def convOK[Of, From](inline from : From)(using c : Conversion[From, Of]) : Unit = {}
+
+class Bar[T](value : T)
+given [T <: Int] : Conversion[T, Bar[T]] = Bar(_)
+
+@main def main : Unit = {
+  convOK[Bar[1],1](1)
+  convFail[Bar[1],1](1) //causes error
+}
diff --git a/tests/pos/i12390-gadt.scala b/tests/pos/i12390-gadt.scala
new file mode 100644
index 000000000000..1525350b56f7
--- /dev/null
+++ b/tests/pos/i12390-gadt.scala
@@ -0,0 +1,9 @@
+enum Func[-A, +B] {
+  case Double extends Func[Int, Int]
+  case ToString extends Func[Float, String]
+
+  def run: A => B = this match {
+    case Double => (x: Int) => x * 2
+    case ToString => (x: Float) => x.toString
+  }
+}
diff --git a/tests/pos/i12395.scala b/tests/pos/i12395.scala
new file mode 100644
index 000000000000..6915ba5655b9
--- /dev/null
+++ b/tests/pos/i12395.scala
@@ -0,0 +1,9 @@
+@main def main : Unit =
+  val x = 1
+
+  val y = x match
+    case 1 => 1
+    case _ =>
+      println("bad")
+      ???
+  println(x)
\ No newline at end of file
diff --git a/tests/pos/i12396.scala b/tests/pos/i12396.scala
new file mode 100644
index 000000000000..772cfaf49533
--- /dev/null
+++ b/tests/pos/i12396.scala
@@ -0,0 +1,7 @@
+object + {
+  val x = 1
+}
+
+object Check {
+  val y = +.x
+}
\ No newline at end of file
diff --git a/tests/pos/i12474.scala b/tests/pos/i12474.scala
new file mode 100644
index 000000000000..41762fba55c1
--- /dev/null
+++ b/tests/pos/i12474.scala
@@ -0,0 +1,17 @@
+package bugreport
+
+import scala.compiletime.erasedValue
+
+trait Show[A]:
+  def show(a: A): String
+
+inline def showTuple[Types]: Show[Types] =
+  inline erasedValue[Types] match
+    case _: (head *: tail) =>
+      val instance =
+        new Show[head *: tail]:
+          def show(tuple: head *: tail): String = "dummy"
+      instance.asInstanceOf[Show[Types]]
+
+@main def run() =
+  showTuple[(Int, Int)]
diff --git a/tests/pos/i12476.scala b/tests/pos/i12476.scala
new file mode 100644
index 000000000000..1509f82cdc5f
--- /dev/null
+++ b/tests/pos/i12476.scala
@@ -0,0 +1,10 @@
+object test {
+  def foo[A, B](m: B) = {
+    m match {
+      case _: A =>
+        m match {
+          case _: B =>  // crash with -Yno-deep-subtypes
+        }
+    }
+  }
+}
diff --git a/tests/pos/i12583.scala b/tests/pos/i12583.scala
new file mode 100644
index 000000000000..a680983e92e8
--- /dev/null
+++ b/tests/pos/i12583.scala
@@ -0,0 +1,5 @@
+case class Wrapper[A <: Singleton](a: A)(using ValueOf[A])
+
+def test[A <: Singleton](blabla: Wrapper[A]): Unit = ()
+
+val _ = test(Wrapper("yo"))
\ No newline at end of file
diff --git a/tests/pos/i12616.scala b/tests/pos/i12616.scala
new file mode 100644
index 000000000000..ff5a6bf204fd
--- /dev/null
+++ b/tests/pos/i12616.scala
@@ -0,0 +1,9 @@
+class Foo:
+
+  //object Bar
+  val Bar = 22
+
+  object Baz:
+    def f(x: Any): Unit =
+      x match
+        case s: (Bar.type & x.type) =>
\ No newline at end of file
diff --git a/tests/pos/i12632.scala b/tests/pos/i12632.scala
new file mode 100644
index 000000000000..c17a4324486a
--- /dev/null
+++ b/tests/pos/i12632.scala
@@ -0,0 +1,10 @@
+class CCC[S](val i: Int) {
+  def this() =
+    this(
+      {
+        val z = new Ordering[S] {
+          override def compare(x: S, y: S): Int = ???
+        }
+        3
+      })
+}
diff --git a/tests/pos/i12645.scala b/tests/pos/i12645.scala
new file mode 100644
index 000000000000..ff7e333ec267
--- /dev/null
+++ b/tests/pos/i12645.scala
@@ -0,0 +1,11 @@
+case class TBox[A <: Tuple](v: A)
+case class IBox[A <: Int](v: A)
+
+@main def m =
+    val t: TBox[EmptyTuple] = TBox(EmptyTuple)
+    val tt: Tuple.Map[(EmptyTuple, EmptyTuple), TBox] = (TBox(EmptyTuple), TBox(EmptyTuple))
+
+    val tt2: Tuple.Map[(1, 2), IBox] = (IBox(1), IBox(2))
+
+    type F[X] = (X, X)
+    val tt3: Tuple.FlatMap[(1, 2), F] = (1, 1, 2, 2)
diff --git a/tests/pos/i12677.scala b/tests/pos/i12677.scala
new file mode 100644
index 000000000000..339eb5594b34
--- /dev/null
+++ b/tests/pos/i12677.scala
@@ -0,0 +1,31 @@
+class F[A]
+object F {
+  def apply[A](a: => A) = new F[A]
+}
+
+trait TC[A] { type Out }
+object TC {
+  implicit def tc[A]: TC[A] { type Out = String } = ???
+}
+
+// ====================================================================================
+object Bug {
+  final class CustomHook[A] {
+    def blah(implicit tc: TC[A]): CustomHook[tc.Out] = ???
+  }
+
+  def i: CustomHook[Int] = ???
+  val f = F(i.blah)
+  f: F[CustomHook[String]] // error
+}
+
+// ====================================================================================
+object Workaround {
+  final class CustomHook[A] {
+    def blah[B](implicit tc: TC[A] { type Out = B }): CustomHook[B] = ??? // raise type
+  }
+
+  def i: CustomHook[Int] = ???
+  val f = F(i.blah)
+  f: F[CustomHook[String]] // works
+}
\ No newline at end of file
diff --git a/tests/pos/i12708.scala b/tests/pos/i12708.scala
new file mode 100644
index 000000000000..f8149f0732d0
--- /dev/null
+++ b/tests/pos/i12708.scala
@@ -0,0 +1,37 @@
+import language.implicitConversions
+
+trait AdditiveSemigroup[A]
+
+final class AdditiveSemigroupOps[A](lhs: A)(implicit as: AdditiveSemigroup[A]) {
+  def +(rhs: A): A = ???
+  def ^(rhs: A): A = ???
+}
+
+trait AdditiveSemigroupSyntax {
+  implicit def additiveSemigroupOps[A: AdditiveSemigroup](a: A): AdditiveSemigroupOps[A] =
+     new AdditiveSemigroupOps(a)
+}
+
+object syntax {
+  object additiveSemigroup extends AdditiveSemigroupSyntax
+}
+
+object App {
+
+  def main(args: Array[String]): Unit = {
+    import syntax.additiveSemigroup._
+
+    implicit def IntAlgebra[A]: AdditiveSemigroup[Map[Int, A]] = ???
+
+    def res[A]: Map[Int, A] = {
+      val a: Map[Int, A] = Map.empty
+      val b: Map[Int, A] = Map.empty
+      // Calls the operator on AdditiveSemigroupOps
+      a ^ b
+      // Calls the operator + on AdditiveSemigroupOps only in Scala 2
+      // In Scala 3 tries to call `+` on Map
+      a + b
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/tests/pos/i12715/full.scala b/tests/pos/i12715/full.scala
new file mode 100644
index 000000000000..2f10dd5aaaf5
--- /dev/null
+++ b/tests/pos/i12715/full.scala
@@ -0,0 +1,28 @@
+package repro
+
+import compiletime.{constValue, erasedValue}
+
+sealed trait ValidateExprInt
+
+class And[A <: ValidateExprInt, B <: ValidateExprInt] extends ValidateExprInt
+class GreaterThan[T <: Int]                           extends ValidateExprInt
+
+object Repro:
+  inline def validate[E <: ValidateExprInt](v: Int): String =
+    val failMsg = validateV[E](v)
+    if failMsg == "neverPass" then "neverPass"
+    else "something else"
+
+  transparent inline def validateV[E <: ValidateExprInt](v: Int): String =
+    inline erasedValue[E] match
+      case _: GreaterThan[t] =>
+        "GreaterThan"
+      case _: And[a, b] =>
+        inline validateV[a](v) match
+          case "" =>
+            validateV[b](v)
+          case other =>
+            other
+
+  @main def test(): Unit =
+    println(validate[And[GreaterThan[10], GreaterThan[12]]](5))
diff --git a/tests/pos/i12715/minimized.scala b/tests/pos/i12715/minimized.scala
new file mode 100644
index 000000000000..4bd8a2b1a404
--- /dev/null
+++ b/tests/pos/i12715/minimized.scala
@@ -0,0 +1,8 @@
+transparent inline def f: String =
+  inline 10 match
+    case _ =>
+      inline "foo" match
+        case x : String => x
+
+def test =
+  inline val failMsg = f
diff --git a/tests/pos/i12722.scala b/tests/pos/i12722.scala
new file mode 100644
index 000000000000..3740229dd947
--- /dev/null
+++ b/tests/pos/i12722.scala
@@ -0,0 +1,8 @@
+trait JsAny extends AnyRef
+class JsObject extends JsAny
+
+trait HTMLAttributes[T] extends JsObject
+trait Component[P] extends JsObject
+trait IPersonaSharedProps extends HTMLAttributes[PersonaCoinBase]
+trait PersonaCoinBase extends Component[IPersonaCoinProps]
+trait IPersonaCoinProps extends IPersonaSharedProps
\ No newline at end of file
diff --git a/tests/pos/i12723.scala b/tests/pos/i12723.scala
new file mode 100644
index 000000000000..d1cab3ede638
--- /dev/null
+++ b/tests/pos/i12723.scala
@@ -0,0 +1,10 @@
+class Fun[|*|[_, _]] {
+  enum ->[A, B] {
+    case BiId[X, Y]() extends ((X |*| Y) -> (X |*| Y))
+  }
+
+  def go[A, B](f: A -> B): Unit =
+    f match {
+      case ->.BiId() => ()
+    }
+}
diff --git a/tests/pos/i12730.scala b/tests/pos/i12730.scala
new file mode 100644
index 000000000000..18a6ac921a6d
--- /dev/null
+++ b/tests/pos/i12730.scala
@@ -0,0 +1,37 @@
+class ComponentSimple
+
+class Props {
+  def apply(props: Any): Any = ???
+}
+
+class Foo[C] {
+  def build: ComponentSimple = ???
+}
+
+class Bar[E] {
+  def render(r: E => Any): Unit = {}
+}
+
+trait Conv[A, B] {
+  def apply(a: A): B
+}
+
+object Test {
+  def toComponentCtor[F](c: ComponentSimple): Props = ???
+
+  def defaultToNoBackend[G, H](ev: G => Foo[H]): Conv[Foo[H], Bar[H]] = ???
+
+  def conforms[A]: A => A = ???
+
+  def problem = Main // crashes
+
+  def foo[H]: Foo[H] = ???
+
+  val NameChanger =
+    foo
+      .build
+
+  val Main =
+    defaultToNoBackend(conforms).apply(foo)
+      .render(_ => toComponentCtor(NameChanger)(13))
+}
diff --git a/tests/pos/i12739-fallout.scala b/tests/pos/i12739-fallout.scala
new file mode 100644
index 000000000000..7f685b3c1a0f
--- /dev/null
+++ b/tests/pos/i12739-fallout.scala
@@ -0,0 +1,8 @@
+// This is a minimisation of the fallout that the original fix caused on Shapeless 3.
+
+type Foo = { type Bar }
+
+extension (foo: Foo)
+  def toBar(): foo.Bar = ???
+
+def test(foo: Foo): foo.Bar = foo.toBar()
diff --git a/tests/pos/i12739.scala b/tests/pos/i12739.scala
new file mode 100644
index 000000000000..baf7a7ae2698
--- /dev/null
+++ b/tests/pos/i12739.scala
@@ -0,0 +1,26 @@
+object X {
+
+  class CA[A]
+  type C = CA[_]
+  val c: C = ???
+  def f[A](r: CA[A]) = ()
+  def g(): CA[_] = CA()
+  def h(): C = ???
+
+  // works
+  f(c)
+
+  // works
+  val x = c.asInstanceOf[C]
+  f(x)
+
+  // was: error
+  f(c.asInstanceOf[C])
+
+  // works, error in Scala 2
+  f(c.asInstanceOf[c.type])
+
+  f(c.asInstanceOf[CA[_]])
+  f(g())
+  f(h())
+}
diff --git a/tests/pos/i12754.scala b/tests/pos/i12754.scala
new file mode 100644
index 000000000000..0c4c54bf6883
--- /dev/null
+++ b/tests/pos/i12754.scala
@@ -0,0 +1,13 @@
+transparent inline def transform(inline a: Any): Any = inline a match {
+  case x: Byte   => x
+  case x: Short  => x
+  case x: Int    => x
+  case x: Long   => x
+  case x: Float  => x
+  case x: Double => x
+  case _         => a
+}
+
+def test = {
+  println(transform(0) < 5)
+}
diff --git a/tests/pos/i12757.scala b/tests/pos/i12757.scala
new file mode 100644
index 000000000000..906458f58e63
--- /dev/null
+++ b/tests/pos/i12757.scala
@@ -0,0 +1,8 @@
+val x = Some(10)
+
+def f =
+   if x.exists
+         (x => x == 10) then
+      println("Yes")
+   else
+      println("No")
\ No newline at end of file
diff --git a/tests/pos/i12802.scala b/tests/pos/i12802.scala
new file mode 100644
index 000000000000..e26ea433f2d6
--- /dev/null
+++ b/tests/pos/i12802.scala
@@ -0,0 +1,9 @@
+import scala.quoted._
+
+object Boo:
+  def foo(using Quotes): Unit =
+    import quotes.reflect._
+    given Option[Symbol] = Some[Symbol](???)
+  def bar(using Quotes): Unit =
+    import quotes.reflect.Symbol
+    given Option[Symbol] = Some[Symbol](???)
diff --git a/tests/pos/i12803.scala b/tests/pos/i12803.scala
new file mode 100644
index 000000000000..2b370c70fca6
--- /dev/null
+++ b/tests/pos/i12803.scala
@@ -0,0 +1,12 @@
+trait X {
+  type Y
+}
+
+trait E[A]
+
+trait Test {
+  val x: X
+  def wrap(x: X): E[x.Y] = ???
+  def run[I](i: E[I]): Unit = ???
+  run(wrap(x))
+}
diff --git a/tests/pos/i12834.scala b/tests/pos/i12834.scala
new file mode 100644
index 000000000000..c007eaf6844f
--- /dev/null
+++ b/tests/pos/i12834.scala
@@ -0,0 +1,2 @@
+class A(val ref: Option[B])
+class B extends A(None)
diff --git a/tests/pos/i12897/A.scala b/tests/pos/i12897/A.scala
new file mode 100644
index 000000000000..17caea956de3
--- /dev/null
+++ b/tests/pos/i12897/A.scala
@@ -0,0 +1,5 @@
+
+package TestFoo
+extension (text : String) def foo(defaultArg : Boolean = true) : String = ""
+
+//def foo(text : String) (defaultArg : Boolean = true) : String = ""
diff --git a/tests/pos/i12897/B.scala b/tests/pos/i12897/B.scala
new file mode 100644
index 000000000000..ac1fa8dccf3c
--- /dev/null
+++ b/tests/pos/i12897/B.scala
@@ -0,0 +1,4 @@
+
+package TestFoo
+
+val f = "123".foo() //error
\ No newline at end of file
diff --git a/tests/pos/i12909.scala b/tests/pos/i12909.scala
new file mode 100644
index 000000000000..face34e2e5a3
--- /dev/null
+++ b/tests/pos/i12909.scala
@@ -0,0 +1,42 @@
+package example
+
+final case class Writer[W, A](run: (W, A)) {
+  def map[B](f: A => B): Writer[W, B] = ???
+
+  def flatMap[B](f: A => Writer[W, B]): Writer[W, B] = ???
+}
+
+object Main {
+  implicit class WriterOps[A](a: A) {
+    def set[W](w: W): Writer[W, A] = ???
+  }
+
+  def x1[A]: Writer[Vector[String], Option[A]] = ???
+
+  val failure = for {
+    a1 <- {
+      Option(1) match {
+        case Some(x) =>
+          x1[Boolean]
+        case _ =>
+          Option.empty[Boolean].set(Vector.empty[String])
+      }
+    }
+    a2 <- x1[String]
+  } yield ()
+
+  val success = for {
+    a1 <- {
+      val temp = Option(1) match {
+        case Some(x) =>
+          x1[Boolean]
+        case _ =>
+          Option.empty[Boolean].set(Vector.empty[String])
+      }
+      // why ???
+      temp
+    }
+    a2 <- x1[String]
+  } yield ()
+
+}
\ No newline at end of file
diff --git a/tests/pos/i12910.scala b/tests/pos/i12910.scala
new file mode 100644
index 000000000000..e78408aa5e5f
--- /dev/null
+++ b/tests/pos/i12910.scala
@@ -0,0 +1,27 @@
+trait Type[T]:
+  type Out
+
+type varchar
+
+given Type[varchar] with
+  type Out = String
+
+class Placeholder[T, U]
+
+object Placeholder:
+  def apply[T](using t: Type[T]): Placeholder[T, t.Out] = new Placeholder
+
+trait Encoder[P, X]:
+  def encode(x: X): String
+
+object Encoder:
+  def apply[P, X](placeholder: P)(using e: Encoder[P, X]): X => String = e.encode
+
+  given [T, X]: Encoder[Placeholder[T, X], X] with
+    def encode(x: X): String = ???
+
+def Test =
+  // the following compiles just fine
+  Encoder(new Placeholder[varchar, String])("hello")
+  // the following fails
+  Encoder(Placeholder[varchar])("hello")
diff --git a/tests/pos/i12915.scala b/tests/pos/i12915.scala
new file mode 100644
index 000000000000..657df2a5be8b
--- /dev/null
+++ b/tests/pos/i12915.scala
@@ -0,0 +1,105 @@
+trait E[T]
+
+class X {
+  val e1: E[Int] = ???
+  val e2: E[String] = ???
+  val e3: E[List[Int]] = ???
+  val e4: E[List[String]] = ???
+  val e5: E[Double] = ???
+  val e6: E[(String, String)] = ???
+  val e7: E[(String, Int)] = ???
+  val e8: E[(Int, List[String])] = ???
+  val e9: E[Long] = ???
+  val e10: E[(Long, Long)] = ???
+  val e11: E[(Long, Long, Int)] = ???
+  val e12: E[List[Long]] = ???
+  val e13: E[List[Int]] = ???
+  val e14: E[(String, String)] = ???
+  val e15: E[(String, String, String)] = ???
+  val e16: E[(Int, String)] = ???
+  val e17: E[(String, Long, String)] = ???
+  val e18: E[(Long, String, String)] = ???
+  val e19: E[(String, String, Long)] = ???
+  val e20: E[(String, Int, String)] = ???
+  val e21: E[(Int, String, String)] = ???
+  val e22: E[(String, String, Int)] = ???
+  val e23: E[(String, String, Boolean)] = ???
+  val e24: E[(Boolean, Boolean, String)] = ???
+  val e25: E[(String, Int, Boolean)] = ???
+  val e26: E[List[(String, String)]] = ???
+  val e27: E[List[(Int, String)]] = ???
+  val e28: E[List[(String, Int)]] = ???
+  val e29: E[List[(Long, String)]] = ???
+  val e30: E[List[(String, Long)]] = ???
+  val e31: E[List[(Boolean, String)]] = ???
+  val e32: E[List[(String, Boolean)]] = ???
+  val e33: E[List[((String, String), String)]] = ???
+  val e34: E[List[((String, Int), String)]] = ???
+  val e35: E[List[((Long, String), String)]] = ???
+  val e36: E[List[((Boolean, String), String)]] = ???
+  val e37: E[List[((String, String), Int)]] = ???
+  val e38: E[List[((String, String), (String, Int))]] = ???
+  val e39: E[List[((Boolean, Long), (String, Int))]] = ???
+  val e40: E[List[((Int, Long), (Boolean, Int))]] = ???
+  val e41: E[List[((String, (Int, String)), (String, Int))]] = ???
+  val e42: E[List[((Boolean, (Int, String)), (String, Int))]] = ???
+  val e43: E[List[((String, (Int, String)), (Boolean, Int))]] = ???
+  val e44: E[(Int, List[String], Long)] = ???
+  val e45: E[(Int, List[Int], Long)] = ???
+  val e46: E[(Int, List[Long], Long)] = ???
+  val e47: E[(String, List[String], Long)] = ???
+  val e48: E[(Int, List[String], Boolean)] = ???
+  val e49: E[Char] = ???
+
+  val all = List(
+    e1,
+    e2,
+    e3,
+    e4,
+    e5,
+    e6,
+    e7,
+    e8,
+    e9,
+    e10,
+    e11,
+    e12,
+    e13,
+    e14,
+    e15,
+    e16,
+    e17,
+    e18,
+    e19,
+    e20,
+    e21,
+    e22,
+    e23,
+    e24,
+    e25,
+    e26,
+    e27,
+    e28,
+    e29,
+    e30,
+    e31,
+    e32,
+    e33,
+    e34,
+    e35,
+    e36,
+    e37,
+    e38,
+    e39,
+    e40,
+    e41,
+    e42,
+    e43,
+    e44,
+    e45,
+    e46,
+    e47,
+    e48,
+    e49
+  )
+}
\ No newline at end of file
diff --git a/tests/pos/i12945/A_1.scala b/tests/pos/i12945/A_1.scala
new file mode 100644
index 000000000000..890171a63051
--- /dev/null
+++ b/tests/pos/i12945/A_1.scala
@@ -0,0 +1,10 @@
+opaque type Lie[W <: Int] = Int
+object Lie:
+  trait TC[-T]:
+    type Out
+  object TC:
+    given [W <: Int]: TC[Lie[W]] with
+      type Out = W
+
+val x  = summon[Lie.TC[Lie[7]]]
+val works = summon[x.Out =:= 7]
diff --git a/tests/pos/i12945/B_2.scala b/tests/pos/i12945/B_2.scala
new file mode 100644
index 000000000000..371754a87ff5
--- /dev/null
+++ b/tests/pos/i12945/B_2.scala
@@ -0,0 +1,3 @@
+object Test:
+  val x  = summon[Lie.TC[Lie[7]]]
+  val fails = summon[x.Out =:= 7]
diff --git a/tests/pos/i12949.scala b/tests/pos/i12949.scala
new file mode 100644
index 000000000000..5a886aa894b3
--- /dev/null
+++ b/tests/pos/i12949.scala
@@ -0,0 +1,19 @@
+object Catch22:
+  trait TC[V]
+  object TC:
+    export Hodor.TC.given
+
+object Hodor:
+  object TC:
+    import Catch22.TC
+    given fromString[V <: String]: TC[V] = ???
+    transparent inline given fromDouble[V <: Double]: TC[V] =
+      new TC[V]:
+        type Out = Double
+    given fromInt[V <: Int]: TC[V] with
+      type Out = Int
+
+object Test:
+  summon[Catch22.TC["hi"]] //works
+  summon[Catch22.TC[7.7]] //works
+  summon[Catch22.TC[1]] //error
diff --git a/tests/pos/i12950/repro_1.scala b/tests/pos/i12950/repro_1.scala
new file mode 100644
index 000000000000..4c4a12de8cd6
--- /dev/null
+++ b/tests/pos/i12950/repro_1.scala
@@ -0,0 +1,27 @@
+package repro
+object repro:
+    object opq:
+        opaque type Lift[T] = Int
+        extension(v: Int)
+            def lift[T]: Lift[T] = v
+        extension[T](l: Lift[T])
+            def value: Int = l
+
+    export opq.Lift as Lift
+    export opq.lift as lift
+
+    final type Two
+
+    extension[TL](l: Lift[TL])
+        def repro[TR](using m: Mul[TL, TR]): Int = l.value + m.value
+
+    abstract class Mul[TL, TR]:
+        val value: Int
+
+    transparent inline given mulGivenInt[TL <: Int & Singleton, TR <: Int & Singleton]: Mul[TL, TR] =
+        val m: Int = scala.compiletime.constValue[TL] * scala.compiletime.constValue[TR]
+        new Mul[TL, TR] { val value: Int = m }
+
+    transparent inline given mulGivenTwo[TR <: Int & Singleton]: Mul[Two, TR] =
+        val m: Int = 2 * scala.compiletime.constValue[TR]
+        new Mul[Two, TR] { val value: Int = m }
\ No newline at end of file
diff --git a/tests/pos/i12950/test_2.scala b/tests/pos/i12950/test_2.scala
new file mode 100644
index 000000000000..2640501f4388
--- /dev/null
+++ b/tests/pos/i12950/test_2.scala
@@ -0,0 +1,6 @@
+import repro.repro.{*, given}
+
+val x = 1.lift[Two]
+val _ = x.repro[2]
+val y = 1.lift[2]
+val _ = y.repro[2]
diff --git a/tests/pos/i12953.scala b/tests/pos/i12953.scala
new file mode 100644
index 000000000000..a50bbda70187
--- /dev/null
+++ b/tests/pos/i12953.scala
@@ -0,0 +1,7 @@
+class Schema(impl: Class[_]) extends scala.annotation.StaticAnnotation
+
+class Ann[A] extends scala.annotation.StaticAnnotation
+
+case class Foo[A](@Schema(classOf[List[A]]) foo: String)
+case class Bar[A](@Ann[A] foo: String)
+def baz[A](@Ann[A] foo: String) = ()
diff --git a/tests/pos/i12955.scala b/tests/pos/i12955.scala
new file mode 100644
index 000000000000..32ce3eb3b0ad
--- /dev/null
+++ b/tests/pos/i12955.scala
@@ -0,0 +1,2 @@
+def test[A, B](using c: A <:< B) =
+  val b: B = ??? : A
diff --git a/tests/pos/i12958.scala b/tests/pos/i12958.scala
new file mode 100644
index 000000000000..4c6cfec1f786
--- /dev/null
+++ b/tests/pos/i12958.scala
@@ -0,0 +1,17 @@
+import scala.quoted.*
+
+package mylib:
+  object Export:
+    transparent inline def exported: Any = 1
+
+  object Import:
+    transparent inline def imported: Any = 1
+
+  export Export.*
+
+
+import mylib.*
+import Import.*
+object Test:
+  val oneFail : 1 = exported //error
+  val oneWork : 1 = imported //works
diff --git a/tests/pos/i12973.scala b/tests/pos/i12973.scala
new file mode 100644
index 000000000000..53c6476d798e
--- /dev/null
+++ b/tests/pos/i12973.scala
@@ -0,0 +1,4 @@
+// Compiled and placed on the REPL classpath in the bootstrappedOnlyCmdTests script
+// to test that launching the REPL with `scala -cp <path>` works (issue #12973)
+case class Bug12973():
+  def check = s"$productPrefix is fixed"
diff --git a/tests/pos/i12997.scala b/tests/pos/i12997.scala
new file mode 100644
index 000000000000..288dcc6f4164
--- /dev/null
+++ b/tests/pos/i12997.scala
@@ -0,0 +1,15 @@
+import scala.compiletime._
+
+// works
+val a = {
+    given Int = 0
+    summon[Int]
+}
+
+// doesn't
+inline def summonInt = {
+    given Int = 0
+    summonInline[Int]
+}
+
+val b = summonInt
diff --git a/tests/pos/i13001/Main_1.scala b/tests/pos/i13001/Main_1.scala
new file mode 100644
index 000000000000..ad46df9f2fe1
--- /dev/null
+++ b/tests/pos/i13001/Main_1.scala
@@ -0,0 +1,31 @@
+case class Foo(a: String)
+
+trait Arbitrary[T]
+trait Gen[+T]
+
+object ArbitraryDerivation:
+  given deriveArb[A](using gen: DerivedGen[A]): Arbitrary[A] = ???
+
+opaque type DerivedGen[A] = Gen[A]
+object DerivedGen extends DerivedGenInstances
+
+sealed abstract class DerivedGenInstances:
+  inline given derived[A](using gen: K0.Generic[A]): DerivedGen[A] =
+    val dummy: DerivedGen[A] = ???
+    gen.derive(dummy, dummy)
+
+// from shapeless3-deriving
+import scala.deriving.*
+object K0 {
+  type Kind[C, O] = C { type Kind = K0.type ; type MirroredType = O ; type MirroredElemTypes <: Tuple }
+  type Generic[O] = Kind[Mirror, O]
+  type ProductGeneric[O] = Kind[Mirror.Product, O]
+  type CoproductGeneric[O] = Kind[Mirror.Sum, O]
+
+  extension [F[_], T](gen: Generic[T])
+    inline def derive(f: => (ProductGeneric[T] & gen.type) ?=> F[T], g: => (CoproductGeneric[T] & gen.type) ?=> F[T]): F[T] =
+      inline gen match {
+        case p: ProductGeneric[T]   => f(using p.asInstanceOf)
+        case c: CoproductGeneric[T] => g(using c.asInstanceOf)
+      }
+}
\ No newline at end of file
diff --git a/tests/pos/i13001/Test_2.scala b/tests/pos/i13001/Test_2.scala
new file mode 100644
index 000000000000..42cacb760027
--- /dev/null
+++ b/tests/pos/i13001/Test_2.scala
@@ -0,0 +1,4 @@
+class Test:
+  import ArbitraryDerivation.given
+  private def test[A: Arbitrary]: Unit = {}
+  test[Foo]
\ No newline at end of file
diff --git a/tests/pos/i13019.scala b/tests/pos/i13019.scala
new file mode 100644
index 000000000000..491b6df03d0b
--- /dev/null
+++ b/tests/pos/i13019.scala
@@ -0,0 +1,13 @@
+
+trait Ok1 { var i: Int }
+class Ok1C extends Ok1 { var i: Int = 1 }
+
+trait Ok2 {
+  def i: Int
+  def i_=(v: Int): Unit
+}
+class Ok2C extends Ok2 { override var i: Int = 1 }
+
+// was: variable i of type Int cannot override a mutable variable
+trait NotOk {var i: Int}
+class NotOkC extends NotOk { override var i: Int = 1 }
diff --git a/tests/pos/i13043/Impl.scala b/tests/pos/i13043/Impl.scala
new file mode 100644
index 000000000000..7db75ee99d89
--- /dev/null
+++ b/tests/pos/i13043/Impl.scala
@@ -0,0 +1,5 @@
+class Impl extends Intf {
+  override def thing(x: Int) = ???
+  override def thing(y: String*) = ???
+  override def thing2(y: String*) = ???
+}
\ No newline at end of file
diff --git a/tests/pos/i13043/Intf.java b/tests/pos/i13043/Intf.java
new file mode 100644
index 000000000000..8b845bdca146
--- /dev/null
+++ b/tests/pos/i13043/Intf.java
@@ -0,0 +1,5 @@
+interface Intf {
+    public void thing(int x);
+    public void thing(String... y);
+    public void thing2(String... y);
+}
\ No newline at end of file
diff --git a/tests/pos/i13046/A.java b/tests/pos/i13046/A.java
new file mode 100644
index 000000000000..bed1b0be2576
--- /dev/null
+++ b/tests/pos/i13046/A.java
@@ -0,0 +1,3 @@
+interface A {
+    public boolean override();
+}
diff --git a/tests/pos/i13046/B.scala b/tests/pos/i13046/B.scala
new file mode 100644
index 000000000000..902105e97723
--- /dev/null
+++ b/tests/pos/i13046/B.scala
@@ -0,0 +1,3 @@
+class B extends A {
+  override def `override`: Boolean = true
+}
diff --git a/tests/pos/i13091.scala b/tests/pos/i13091.scala
new file mode 100644
index 000000000000..fa255cd6c08f
--- /dev/null
+++ b/tests/pos/i13091.scala
@@ -0,0 +1,3 @@
+import annotation.experimental
+@experimental class Foo
+val foo = new Foo
diff --git a/tests/pos/i13106.java b/tests/pos/i13106.java
new file mode 100644
index 000000000000..6a10fd3cfa9b
--- /dev/null
+++ b/tests/pos/i13106.java
@@ -0,0 +1,7 @@
+final class A {
+  public static final class C { }
+  public static final class D {
+    public static final class C { }
+    public C foo() { return new C(); }
+  }
+}
diff --git a/tests/pos/i13120/Foo.scala b/tests/pos/i13120/Foo.scala
new file mode 100644
index 000000000000..741babc6aa13
--- /dev/null
+++ b/tests/pos/i13120/Foo.scala
@@ -0,0 +1,8 @@
+import container.ir
+
+opaque type Foo = ir.Foo
+
+object Foo:
+  def bar(foo: Foo): Unit = {}
+
+export Foo.*
\ No newline at end of file
diff --git a/tests/pos/i13120/container.scala b/tests/pos/i13120/container.scala
new file mode 100644
index 000000000000..305781cce555
--- /dev/null
+++ b/tests/pos/i13120/container.scala
@@ -0,0 +1,3 @@
+object container:
+  object ir:
+    sealed trait Foo
diff --git a/tests/pos/i13128/A_1.scala b/tests/pos/i13128/A_1.scala
new file mode 100644
index 000000000000..4a1c9335d2ec
--- /dev/null
+++ b/tests/pos/i13128/A_1.scala
@@ -0,0 +1 @@
+opaque type Foo[T <: Int] = Int
diff --git a/tests/pos/i13128/B_2.scala b/tests/pos/i13128/B_2.scala
new file mode 100644
index 000000000000..797c917d3620
--- /dev/null
+++ b/tests/pos/i13128/B_2.scala
@@ -0,0 +1,3 @@
+def grabT[T <: Int](arg : Foo[T]) : T = ???
+final val t1 = grabT(??? : Foo[8])
+val t2 : 8 = t1
\ No newline at end of file
diff --git a/tests/pos/i13134.scala b/tests/pos/i13134.scala
new file mode 100644
index 000000000000..d3b70d389dcf
--- /dev/null
+++ b/tests/pos/i13134.scala
@@ -0,0 +1,10 @@
+def test =
+  {
+    val end = 0
+    assert(~end == -1) //Not found: ~
+  }
+
+  {
+    val end = false
+    assert(!end) // postfix operator `end` needs to be enabled
+  }              // by making the implicit value scala.language.postfixOps visible.
\ No newline at end of file
diff --git a/tests/pos/i13190/A_1.scala b/tests/pos/i13190/A_1.scala
new file mode 100644
index 000000000000..9bb9b20f2976
--- /dev/null
+++ b/tests/pos/i13190/A_1.scala
@@ -0,0 +1,3 @@
+object Opaque {
+  opaque type FieldType[K, +V] <: V = V
+}
\ No newline at end of file
diff --git a/tests/pos/i13190/B_2.scala b/tests/pos/i13190/B_2.scala
new file mode 100644
index 000000000000..2752778afa04
--- /dev/null
+++ b/tests/pos/i13190/B_2.scala
@@ -0,0 +1,15 @@
+import Opaque.*
+
+object Test {
+  type FindField[R <: scala.Tuple, K] = R match {
+    case FieldType[K, f] *: t => f
+    case _ *: t => FindField[t, K]
+  }
+
+  val f: FieldType["A", Int] = ???
+  val f1: Int = f
+  //val f2: Int = f
+
+  type R = FieldType["A", Int] *: FieldType["B", Double] *: FieldType["C", String] *: FieldType["D", Boolean] *: EmptyTuple
+  summon[FindField[R, "B"] =:= Double]
+}
diff --git a/tests/pos/i13197.scala b/tests/pos/i13197.scala
new file mode 100644
index 000000000000..cf8b2bb3ef0d
--- /dev/null
+++ b/tests/pos/i13197.scala
@@ -0,0 +1,12 @@
+// this test is similar to explicit-nulls/pos/i13197.scala, but without explicit nulls
+
+extension [T](x: T | String) inline def forceString: x.type & String =
+  x.asInstanceOf
+
+trait Bar:
+  def b: String | Int
+
+class Foo(a: String = "", b: String)
+
+object Foo:
+  def foo(bar: Bar) = Foo(b = bar.b.forceString)
\ No newline at end of file
diff --git a/tests/pos/i13282.scala b/tests/pos/i13282.scala
new file mode 100644
index 000000000000..2241fdc17941
--- /dev/null
+++ b/tests/pos/i13282.scala
@@ -0,0 +1,9 @@
+class Ptr[T](var value: T):
+   def `unary_!` : T = value
+   def `unary_!_=`(value: T): Unit = this.value = value
+end Ptr
+
+def test =
+  val x = Ptr(9)
+  !x = 10
+  println(!x)
diff --git a/tests/pos/i13310.java b/tests/pos/i13310.java
new file mode 100644
index 000000000000..7553cbc3130c
--- /dev/null
+++ b/tests/pos/i13310.java
@@ -0,0 +1,2 @@
+// The entire contents of this file is intentionally commented out
+// public class i13310 {}
diff --git a/tests/pos/i13331.scala b/tests/pos/i13331.scala
new file mode 100644
index 000000000000..d862898eaa04
--- /dev/null
+++ b/tests/pos/i13331.scala
@@ -0,0 +1,3 @@
+def Choice = (_: Any) match { case Int => Long; case Long => Int } // ok
+
+type Choice[A] = A match { case Int => Long ; case Long => Int } // error
\ No newline at end of file
diff --git a/tests/pos/i13349.scala b/tests/pos/i13349.scala
new file mode 100644
index 000000000000..e4048424db24
--- /dev/null
+++ b/tests/pos/i13349.scala
@@ -0,0 +1,31 @@
+sealed trait Stream[+A]{
+    import Stream.*;
+
+    def foldRight[B](z: => B)(f: (A, => B) => B): B =
+      this match {
+        case Cons(h,t) => f(h(), t().foldRight(z)(f))
+        case _ => z
+      }
+
+    def append[B >: A](other : => Stream[B]) : Stream[B] =
+      foldRight(other : Stream[B])((elem, stream) => cons(elem, stream))
+
+}
+
+case object Empty extends Stream[Nothing]
+case class Cons[+A](h: () => A, t: () => Stream[A]) extends Stream[A]
+
+object Stream {
+
+  def cons[A](hd: => A, tl: => Stream[A]): Stream[A] = {
+    lazy val head = hd
+    lazy val tail = tl
+    Cons(() => head, () => tail)
+  }
+
+  def empty[A]: Stream[A] = Empty
+
+  def apply[A](as: A*): Stream[A] =
+    if (as.isEmpty) empty else cons(as.head, apply(as.tail: _*))
+
+}
diff --git a/tests/pos/i13349min.scala b/tests/pos/i13349min.scala
new file mode 100644
index 000000000000..da434744b638
--- /dev/null
+++ b/tests/pos/i13349min.scala
@@ -0,0 +1,3 @@
+class Foo:
+  def foo(x: => Foo) = bar(x: Foo)
+  def bar(x: => Foo) = x
diff --git a/tests/pos/i13392.scala b/tests/pos/i13392.scala
new file mode 100644
index 000000000000..614f711eebb5
--- /dev/null
+++ b/tests/pos/i13392.scala
@@ -0,0 +1,11 @@
+package scala
+import language.experimental.erasedDefinitions
+import annotation.{implicitNotFound, experimental}
+
+@experimental
+@implicitNotFound("The capability to throw exception ${E} is missing.\nThe capability can be provided by one of the following:\n - A using clause `(using CanThrow[${E}])`\n - A `throws` clause in a result type such as `X throws ${E}`\n - an enclosing `try` that catches ${E}")
+erased class CanThrow[-E <: Exception]
+
+@experimental
+object unsafeExceptions:
+  given canThrowAny: CanThrow[Exception] = new CanThrow
diff --git a/tests/pos/i13411.scala b/tests/pos/i13411.scala
new file mode 100644
index 000000000000..d310cdbdad21
--- /dev/null
+++ b/tests/pos/i13411.scala
@@ -0,0 +1,12 @@
+class Foo
+class Bar extends Foo
+
+inline def thingy(a: Int = 0, b: Int = 0, inline c: Foo = new Bar) = {
+  inline c match {
+    case _: Bar =>
+  }
+}
+
+def x = 1
+
+def test = thingy(b = x)
diff --git a/tests/pos/i13411b/Constants.java b/tests/pos/i13411b/Constants.java
new file mode 100644
index 000000000000..0cb5fb31ac5e
--- /dev/null
+++ b/tests/pos/i13411b/Constants.java
@@ -0,0 +1,5 @@
+public class Constants {
+  public static final int A = 0;
+  public static final int B = 2;
+  public static final int C = 3;
+}
diff --git a/tests/pos/i13411b/Test.scala b/tests/pos/i13411b/Test.scala
new file mode 100644
index 000000000000..4ed586485d86
--- /dev/null
+++ b/tests/pos/i13411b/Test.scala
@@ -0,0 +1,32 @@
+class broken {
+  sealed trait Foo
+  case object A extends Foo
+  case object B extends Foo
+  case object C extends Foo
+  case object D extends Foo
+
+  inline def foo(inline f: Foo) = inline f match {
+    case _: A.type => "the letter a"
+    case _: B.type => "the letter b"
+    case _: C.type => "the letter c"
+    case _: D.type => "the letter d"
+  }
+
+  inline def thingy(
+    depthClampEnable: Boolean = false,
+    rasterizerDiscardEnable: Boolean = false,
+    polygonMode: Int = 0,
+    cullMode: Int = 0,
+    frontFace: Int = 0,
+    depthBiasEnable: Boolean = false,
+    depthBiasConstantFactor: Float = 0,
+    depthBiasClamp: Float = 0,
+    depthBiasSlopeFactor: Float = 0,
+    lineWidth: Float = 0,
+    inline f: Foo = A,
+  ) = {
+    foo(f)
+  }
+
+  thingy(polygonMode = Constants.A, cullMode = Constants.B, frontFace = Constants.C, lineWidth = 1.0f)
+}
diff --git a/tests/pos/i13426.scala b/tests/pos/i13426.scala
new file mode 100644
index 000000000000..38283fa49483
--- /dev/null
+++ b/tests/pos/i13426.scala
@@ -0,0 +1,2 @@
+val f = [R] => () => [A] => (a: A => R, b: A) => a(b)
+val x = f[Int]()(_, 3)
diff --git a/tests/pos/i13460.scala b/tests/pos/i13460.scala
new file mode 100644
index 000000000000..fd57cd9b8521
--- /dev/null
+++ b/tests/pos/i13460.scala
@@ -0,0 +1,55 @@
+import scala.compiletime.*
+import scala.deriving.Mirror
+
+class Lazy[A](obj: => A) {
+  lazy val value: A = obj
+}
+object Lazy {
+  given [A](using obj: => A ): Lazy[A] = new Lazy(obj)
+}
+
+trait MyTypeClass[A] {
+  def makeString(a: A): String
+}
+object MyTypeClass {
+
+  given IntTypeClass: MyTypeClass[Int] with
+    def makeString(a: Int): String = a.toString
+
+  inline given derived[A](using m: Mirror.Of[A]): MyTypeClass[A] =
+    inline m match
+      case p: Mirror.ProductOf[A] => productConverter(p)
+
+
+  private inline def summonElementTypeClasses[A](m: Mirror.Of[A]): IArray[Object] =
+    // this doesn't work
+    summonAll[Tuple.Map[m.MirroredElemTypes, [A] =>> Lazy[MyTypeClass[A]]]].toIArray
+    // but this does
+    // summonAll[Tuple.Map[Tuple.Map[m.MirroredElemTypes, MyTypeClass], Lazy]].toIArray
+
+  private inline def productConverter[A](m: Mirror.ProductOf[A]): MyTypeClass[A] = {
+    val elementTypeClasses = summonElementTypeClasses(m)
+    new MyTypeClass[A] {
+      def makeString(a: A): String = {
+        val product = a.asInstanceOf[Product]
+        elementTypeClasses
+          .view
+          .zipWithIndex
+          .map((obj, i) => {
+            val tc = obj.asInstanceOf[Lazy[MyTypeClass[Any]]].value
+            tc.makeString(product.productElement(i))
+          })
+          .mkString("[", ", ", "]")
+      }
+    }
+  }
+}
+
+case class Example(a: Int, b: Int) derives MyTypeClass
+
+object Main {
+  def main(args: Array[String]): Unit = {
+    println("hello world")
+    println(summon[MyTypeClass[Example]].makeString(Example(1,2)))
+  }
+}
\ No newline at end of file
diff --git a/tests/pos/i13476.scala b/tests/pos/i13476.scala
new file mode 100644
index 000000000000..e1810d9cfe33
--- /dev/null
+++ b/tests/pos/i13476.scala
@@ -0,0 +1,7 @@
+private object Foo:
+  inline def d(arg : Int): Unit = {}
+  transparent inline def haha() : Unit = {}
+
+export Foo.*
+
+@main def main : Unit = haha()
diff --git a/tests/pos/i13487.scala b/tests/pos/i13487.scala
new file mode 100644
index 000000000000..ce08513f3c25
--- /dev/null
+++ b/tests/pos/i13487.scala
@@ -0,0 +1,6 @@
+trait TC[F[_[_], _]]
+object TC {
+  def derived[F[_[_], _]]: TC[F] = ???
+}
+
+case class Foo[A](a: A) derives TC
diff --git a/tests/pos/i13490.scala b/tests/pos/i13490.scala
new file mode 100644
index 000000000000..c8f3213e0649
--- /dev/null
+++ b/tests/pos/i13490.scala
@@ -0,0 +1,17 @@
+object MyApi {
+  enum MyEnum(a: Int) {
+    case A extends MyEnum(1)
+  }
+  case class Foo(a: MyEnum)
+}
+
+object Test {
+  export MyApi.*
+  import MyEnum.*
+  Foo(MyEnum.A) match {
+    case Foo(a) =>
+      a match {
+        case A =>
+      }
+  }
+}
diff --git a/tests/pos/i13503.scala b/tests/pos/i13503.scala
new file mode 100644
index 000000000000..c60b0e05862c
--- /dev/null
+++ b/tests/pos/i13503.scala
@@ -0,0 +1,8 @@
+trait First {type Out}
+given First with {type Out = 123}
+
+trait Second {type Out}
+transparent inline given (using f: First): Second = new Second {type Out = f.Out}
+
+val s = summon[Second]
+val x = summon[s.Out =:= 123]
\ No newline at end of file
diff --git a/tests/pos/i13512.scala b/tests/pos/i13512.scala
new file mode 100644
index 000000000000..b400809d47b9
--- /dev/null
+++ b/tests/pos/i13512.scala
@@ -0,0 +1,7 @@
+import scala.language.strictEquality
+
+class NotEquatable
+
+def f = List(new NotEquatable) match
+  case Nil => ???
+  case _ =>
diff --git a/tests/pos/i13526.scala b/tests/pos/i13526.scala
new file mode 100644
index 000000000000..3b3c29ca3830
--- /dev/null
+++ b/tests/pos/i13526.scala
@@ -0,0 +1,15 @@
+type ~>[Args <: Tuple, Return] = Args match {
+  case (arg1, arg2) => ((arg1, arg2) => Return)
+}
+
+trait Builder[Args <: NonEmptyTuple] {
+  def apply(f: Args ~> String): String
+}
+
+class BuilderImpl[Args <: NonEmptyTuple] extends Builder[Args] {
+  override def apply(f: Args ~> String): String = ???
+}
+
+val builder = BuilderImpl[Int *: String *: EmptyTuple]()
+// builder { (i: Int, s: String) => "test" } // This line compiles
+val _ = builder { (i, s) => "test" } // Does not compile
\ No newline at end of file
diff --git a/tests/pos/i13532/Bar.scala b/tests/pos/i13532/Bar.scala
new file mode 100644
index 000000000000..aa7e7191f28b
--- /dev/null
+++ b/tests/pos/i13532/Bar.scala
@@ -0,0 +1,7 @@
+package testcode
+
+import testcode.Foo
+
+class Bar(f: Foo) {
+	TestMacro.call()
+}
\ No newline at end of file
diff --git a/tests/pos/i13532/Foo.scala b/tests/pos/i13532/Foo.scala
new file mode 100644
index 000000000000..94d731858a1b
--- /dev/null
+++ b/tests/pos/i13532/Foo.scala
@@ -0,0 +1,5 @@
+package testcode
+
+class Foo {
+	TestMacro.call()
+}
\ No newline at end of file
diff --git a/tests/pos/i13532/TestMacro.scala b/tests/pos/i13532/TestMacro.scala
new file mode 100644
index 000000000000..ef6f6edfb63f
--- /dev/null
+++ b/tests/pos/i13532/TestMacro.scala
@@ -0,0 +1,8 @@
+package testcode
+
+import scala.quoted.Quotes
+
+object TestMacro {
+    private def impl()(using Quotes) = '{ 123 }
+    inline def call(): Int = ${ impl() }
+}
diff --git a/tests/pos/i13541.scala b/tests/pos/i13541.scala
new file mode 100644
index 000000000000..36ec09409b17
--- /dev/null
+++ b/tests/pos/i13541.scala
@@ -0,0 +1,14 @@
+trait F[A]
+trait Z
+object Z:
+  given F[Z] = ???
+
+type Foo[B] = [A] =>> Bar[A, B]
+trait Bar[A, B]
+
+given fooUnit[A: F]: Foo[Unit][A] = ???
+//given bar[A: F]: Bar[A, Unit] = ???
+
+def f[A: F](using Foo[Unit][A]): Nothing = ???
+
+def broken: Nothing = f[Z]
\ No newline at end of file
diff --git a/tests/pos/i13554.scala b/tests/pos/i13554.scala
new file mode 100644
index 000000000000..e30d3eb9bd9f
--- /dev/null
+++ b/tests/pos/i13554.scala
@@ -0,0 +1,6 @@
+object StatusCode:
+  class Matcher
+
+enum StatusCode(m: StatusCode.Matcher):
+  case InternalServerError extends StatusCode(???)
+
diff --git a/tests/pos/i13554a.scala b/tests/pos/i13554a.scala
new file mode 100644
index 000000000000..0c6f0c6c972f
--- /dev/null
+++ b/tests/pos/i13554a.scala
@@ -0,0 +1,15 @@
+object StatusCode:
+  enum Matcher:
+    case ServerError extends Matcher
+  end Matcher
+end StatusCode
+
+enum StatusCode(code: Int, m: StatusCode.Matcher):
+  case InternalServerError extends StatusCode(500, StatusCode.Matcher.ServerError)
+end StatusCode
+
+object Main {
+  def main(args: Array[String]): Unit = {
+    println(StatusCode.InternalServerError)
+  }
+}
diff --git a/tests/pos/i13565.scala b/tests/pos/i13565.scala
new file mode 100644
index 000000000000..00b7e393a016
--- /dev/null
+++ b/tests/pos/i13565.scala
@@ -0,0 +1,67 @@
+package ips.clang
+
+sealed trait         PrimaryExpression extends         PostfixExpression
+sealed trait         PostfixExpression extends           UnaryExpression
+sealed trait           UnaryExpression extends            CastExpression
+sealed trait            CastExpression extends  MultiplicativeExpression
+sealed trait  MultiplicativeExpression extends        AdditiveExpression
+sealed trait        AdditiveExpression extends           ShiftExpression
+sealed trait           ShiftExpression extends      RelationalExpression
+sealed trait      RelationalExpression extends        EqualityExpression
+sealed trait        EqualityExpression extends         PrecAndExpression
+sealed trait         PrecAndExpression extends PrecExclusiveOrExpression
+sealed trait PrecExclusiveOrExpression extends PrecInclusiveOrExpression
+sealed trait PrecInclusiveOrExpression extends  PrecLogicalAndExpression
+sealed trait  PrecLogicalAndExpression extends   PrecLogicalOrExpression
+sealed trait   PrecLogicalOrExpression extends PrecConditionalExpression
+sealed trait PrecConditionalExpression extends   PrecAssigmentExpression
+sealed trait   PrecAssigmentExpression extends                Expression
+sealed trait                Expression
+sealed trait          BinaryExpression { def op: String; def frs: Expression; def snd: Expression }
+
+type TypeName = String
+case class                     Identifier(value: String)                                                                  extends         PrimaryExpression
+case class                    IntConstant(value: Int)                                                                     extends         PrimaryExpression
+case class                   CharConstant(value: Char)                                                                    extends         PrimaryExpression
+case class                  StringLiteral(value: String)                                                                  extends         PrimaryExpression
+case class              WrappedExpression(value: Expression)                                                              extends         PrimaryExpression
+case class           ArrayIndexExpression(base: PostfixExpression, index: Expression)                                     extends         PostfixExpression
+case class         FunctionCallExpression(fun: PostfixExpression, arguments: List[PrecAssigmentExpression])               extends         PostfixExpression
+case class            DotSelectExpression(qualifier: PostfixExpression, select: Identifier)                               extends         PostfixExpression
+case class          ArrowSelectExpression(qualifier: PostfixExpression, select: Identifier)                               extends         PostfixExpression
+case class     PostfixIncrementExpression(base: PostfixExpression)                                                        extends         PostfixExpression
+case class     PostfixDecrementExpression(base: PostfixExpression)                                                        extends         PostfixExpression
+case class                CompoundLiteral(typeName: TypeName, initializers: List[Int])                                    extends         PostfixExpression
+case class      PrefixIncrementExpression(base: UnaryExpression)                                                          extends           UnaryExpression
+case class      PrefixDecrementExpression(base: UnaryExpression)                                                          extends           UnaryExpression
+case class        UnaryOperatorExpression(op: String, argument: CastExpression)                                           extends           UnaryExpression
+case class          SizeofConstExpression(expression: UnaryExpression)                                                    extends           UnaryExpression
+case class           SizeofTypeExpression(typeName: TypeName)                                                             extends           UnaryExpression
+case class                           Cast(typeName: TypeName, argument: CastExpression)                                   extends            CastExpression
+case class MultiplicativeBinaryExpression(op: String, frs:      MultiplicativeExpression, snd:            CastExpression) extends  MultiplicativeExpression with BinaryExpression
+case class       AdditiveBinaryExpression(op: String, frs:      MultiplicativeExpression, snd:            CastExpression) extends  MultiplicativeExpression with BinaryExpression
+case class          ShiftBinaryExpression(op: String, frs:      MultiplicativeExpression, snd:            CastExpression) extends  MultiplicativeExpression with BinaryExpression
+case class     RelationalBinaryExpression(op: String, frs:          RelationalExpression, snd:           ShiftExpression) extends      RelationalExpression with BinaryExpression
+case class       EqualityBinaryExpression(op: String, frs:          RelationalExpression, snd:           ShiftExpression) extends        EqualityExpression with BinaryExpression
+case class            AndBinaryExpression(op: String, frs:             PrecAndExpression, snd:        EqualityExpression) extends         PrecAndExpression with BinaryExpression
+case class    ExclusiveOrBinaryExpression(op: String, frs:     PrecExclusiveOrExpression, snd:         PrecAndExpression) extends PrecExclusiveOrExpression with BinaryExpression
+case class    InclusiveOrBinaryExpression(op: String, frs:     PrecExclusiveOrExpression, snd:         PrecAndExpression) extends PrecInclusiveOrExpression with BinaryExpression
+case class     LogicalAndBinaryExpression(op: String, frs:      PrecLogicalAndExpression, snd: PrecInclusiveOrExpression) extends  PrecLogicalAndExpression with BinaryExpression
+case class      LogicalOrBinaryExpression(op: String, frs:      PrecLogicalAndExpression, snd: PrecInclusiveOrExpression) extends   PrecLogicalOrExpression with BinaryExpression
+case class          ConditionalExpression(cond: PrecLogicalOrExpression, frs: Expression, snd: PrecConditionalExpression) extends PrecConditionalExpression
+case class            AssigmentExpression(op: String, frs:               UnaryExpression, snd:   PrecAssigmentExpression) extends   PrecAssigmentExpression
+case class                CommaExpression(frs: Expression, snd: Expression)                                               extends                Expression
+case class             AltCommaExpression(frs: Expression, snd: Expression)                                               extends                Expression
+
+// each AdditionalUnaryExpressionX increase compilation time
+sealed trait AdditionalUnaryExpression1 extends UnaryExpression
+sealed trait AdditionalUnaryExpression2 extends UnaryExpression
+sealed trait AdditionalUnaryExpression3 extends UnaryExpression
+sealed trait AdditionalUnaryExpression4 extends UnaryExpression
+sealed trait AdditionalUnaryExpression5 extends UnaryExpression
+
+class LongCompilation:
+  // this match used to take 2m30 to compile, with 1 cache it now takes 5s (30x speedup, aka 3000%)
+  def toCastExpression(expr: Expression): CastExpression = expr match
+    case x: CastExpression => x
+    case _                 => WrappedExpression(expr)
diff --git a/tests/pos/i13586.scala b/tests/pos/i13586.scala
new file mode 100644
index 000000000000..353660334091
--- /dev/null
+++ b/tests/pos/i13586.scala
@@ -0,0 +1,5 @@
+class Foo:
+ inline def test(): Unit = this
+
+class Bar extends Foo:
+  def test(s: String) = super.test()
diff --git a/tests/pos/i13586/Macro_1.scala b/tests/pos/i13586/Macro_1.scala
new file mode 100644
index 000000000000..752ccd906df5
--- /dev/null
+++ b/tests/pos/i13586/Macro_1.scala
@@ -0,0 +1,6 @@
+import scala.quoted._
+
+object Position {
+  def withPosition[T](fun: Expr[Unit => T])(using quotes: Quotes, typeOfT: Type[T]): Expr[T] =
+    '{${fun}.apply(null)}
+}
diff --git a/tests/pos/i13586/Test_2.scala b/tests/pos/i13586/Test_2.scala
new file mode 100644
index 000000000000..2c7d23a06630
--- /dev/null
+++ b/tests/pos/i13586/Test_2.scala
@@ -0,0 +1,10 @@
+class Foo {
+ inline def test(): Unit = {
+   ${ Position.withPosition[Unit]('{ _ => this }) }
+ }
+}
+
+class Bar extends Foo {
+  def test(s: String) =
+    super.test()
+}
diff --git a/tests/pos/i13660.scala b/tests/pos/i13660.scala
new file mode 100644
index 000000000000..328a82d0e560
--- /dev/null
+++ b/tests/pos/i13660.scala
@@ -0,0 +1,15 @@
+type Const[A] = [_] =>> A
+type FunctionK[A[_], B[_]] = [Z] => A[Z] => B[Z]
+
+type #~>#:[T, R] = FunctionK[Const[T], Const[R]]
+
+object FunctionK:
+  def liftConst[A, B](f: A => B): /*FunctionK[Const[A], Const[B]]*/ A #~>#: B =
+    [Z1] => (a: A) => f(a)
+
+trait FoldableK[F[_[_], _]]:
+
+  def foldMapK1[A[_], C, B](fa: F[A, C])(f: FunctionK[A, Const[B]]): B
+
+  def toListK[A, C](fa: F[Const[A], C]): List[A] =
+    foldMapK1(fa)(FunctionK.liftConst(List(_: A)))
diff --git a/tests/pos/i13669.scala b/tests/pos/i13669.scala
new file mode 100644
index 000000000000..330eb8d8478d
--- /dev/null
+++ b/tests/pos/i13669.scala
@@ -0,0 +1,6 @@
+trait MyExtensions:
+  extension (lhs: Int) def bash: Unit = {}
+object MyExtensions extends MyExtensions
+
+export MyExtensions.*
+val fails = 1.bash
diff --git a/tests/pos/i13739.scala b/tests/pos/i13739.scala
new file mode 100644
index 000000000000..418e665f44e8
--- /dev/null
+++ b/tests/pos/i13739.scala
@@ -0,0 +1,46 @@
+import scala.language.strictEquality
+
+class Foo(i: Int) extends AnyVal
+
+val _ = summon[CanEqual[Nothing, Nothing]]
+
+val _ = summon[CanEqual[Int, Nothing]]
+val _ = summon[CanEqual[Nothing, Int]]
+val _ = summon[CanEqual[3, Nothing]]
+val _ = summon[CanEqual[Nothing, 3]]
+
+val _ = summon[CanEqual[Byte, Nothing]]
+val _ = summon[CanEqual[Nothing, Byte]]
+val _ = summon[CanEqual[Short, Nothing]]
+val _ = summon[CanEqual[Nothing, Short]]
+val _ = summon[CanEqual[Float, Nothing]]
+val _ = summon[CanEqual[Nothing, Float]]
+
+val _ = summon[CanEqual[Double, Nothing]]
+val _ = summon[CanEqual[Nothing, Double]]
+val _ = summon[CanEqual[3.0, Nothing]]
+val _ = summon[CanEqual[Nothing, 3.0]]
+
+val _ = summon[CanEqual[String, Nothing]]
+val _ = summon[CanEqual[Nothing, String]]
+val _ = summon[CanEqual["foo", Nothing]]
+val _ = summon[CanEqual[Nothing, "foo"]]
+
+val _ = summon[CanEqual[Char, Nothing]]
+val _ = summon[CanEqual[Nothing, Char]]
+val _ = summon[CanEqual['f', Nothing]]
+val _ = summon[CanEqual[Nothing, 'f']]
+
+val _ = summon[CanEqual[Boolean, Nothing]]
+val _ = summon[CanEqual[Nothing, Boolean]]
+val _ = summon[CanEqual[true, Nothing]]
+val _ = summon[CanEqual[Nothing, true]]
+
+val _ = summon[CanEqual[Foo, Nothing]]
+val _ = summon[CanEqual[Nothing, Foo]]
+
+val _ = summon[CanEqual[Option[Int], None.type]]
+val _ = summon[CanEqual[Option[Int], Option[Nothing]]]
+
+val _ = summon[CanEqual[Any & Nothing, Foo]]
+val _ = summon[CanEqual[Nothing & Any, Foo]]
diff --git a/tests/pos/i13816.scala b/tests/pos/i13816.scala
new file mode 100644
index 000000000000..a87be4803936
--- /dev/null
+++ b/tests/pos/i13816.scala
@@ -0,0 +1,57 @@
+import language.experimental.saferExceptions
+
+class Ex1 extends Exception("Ex1")
+class Ex2 extends Exception("Ex2")
+
+def foo1(i: Int): Unit throws Ex1 throws Ex2 =
+  if i > 0 then throw new Ex1 else throw new Ex2
+
+def foo2(i: Int): Unit throws Ex1 | Ex2 =
+  if i > 0 then throw new Ex1 else throw new Ex2
+
+def foo3(i: Int): Unit throws (Ex1 | Ex2) =
+  if i > 0 then throw new Ex1 else throw new Ex2
+
+def foo4(i: Int)(using CanThrow[Ex1], CanThrow[Ex2]): Unit =
+  if i > 0 then throw new Ex1 else throw new Ex2
+
+def foo5(i: Int)(using CanThrow[Ex1])(using CanThrow[Ex2]): Unit =
+  if i > 0 then throw new Ex1 else throw new Ex2
+
+def foo6(i: Int)(using CanThrow[Ex1 | Ex2]): Unit =
+  if i > 0 then throw new Ex1 else throw new Ex2
+
+def foo7(i: Int)(using CanThrow[Ex1]): Unit throws Ex2 =
+  if i > 0 then throw new Ex1 else throw new Ex2
+
+def foo8(i: Int)(using CanThrow[Ex2]): Unit throws Ex1 =
+  if i > 0 then throw new Ex1 else throw new Ex2
+
+def test(): Unit =
+  try
+    foo1(1)
+    foo2(1)
+    foo3(1)
+    foo4(1)
+    foo5(1)
+    foo6(1)
+    foo7(1)
+    foo8(1)
+  catch
+    case _: Ex1 =>
+    case _: Ex2 =>
+
+  try
+    try
+      foo1(1)
+      foo2(1)
+      foo3(1)
+      foo4(1)
+      foo5(1)
+      // foo6(1) // As explained in the docs this won't work until we find a way to aggregate capabilities
+      foo7(1)
+      foo8(1)
+    catch
+      case _: Ex1 =>
+  catch
+    case _: Ex2 =>
diff --git a/tests/pos/i13820.scala b/tests/pos/i13820.scala
new file mode 100644
index 000000000000..1accdee53fb1
--- /dev/null
+++ b/tests/pos/i13820.scala
@@ -0,0 +1,5 @@
+trait Expr { type T }
+
+def foo[A](e: Expr { type T = A }) = e match
+  case e1: Expr { type T <: Int } =>
+    val i: Int = ??? : e1.T
\ No newline at end of file
diff --git a/tests/pos/i13842.scala b/tests/pos/i13842.scala
new file mode 100644
index 000000000000..7d29633619ec
--- /dev/null
+++ b/tests/pos/i13842.scala
@@ -0,0 +1,14 @@
+class Parent { class E }
+
+object ChildA extends Parent
+
+object ChildB extends Parent
+
+class Printer[C <: Parent](val child: C):
+  def print22(e: child.E): String = ""
+
+def test =
+  Printer(ChildA).print22(new ChildA.E) // does not work
+
+  //Printer[ChildA.type](ChildA).print22(new ChildA.E) // works
+  //val p = Printer(ChildA); p.print22(new ChildA.E) // works
diff --git a/tests/pos/i13859.scala b/tests/pos/i13859.scala
new file mode 100644
index 000000000000..4092de52fd94
--- /dev/null
+++ b/tests/pos/i13859.scala
@@ -0,0 +1,31 @@
+import scala.deriving.*
+
+object Test:
+  type Kind1[C, O[_]] = C {
+    type MirroredType[X] = O[X]
+    type MirroredMonoType = O[Any]
+    type MirroredElemTypes[_] <: Tuple
+  }
+
+  type Kind2[C, O[_, _]] = C {
+    type MirroredType[X, Y] = O[X, Y]
+    type MirroredMonoType = O[Any, Any]
+    type MirroredElemTypes[_, _] <: Tuple
+  }
+
+  type Test[X] = (X, Boolean)
+  type Swap[X, Y] = (Y, X)
+
+  locally {
+    val x = summon[Kind1[Mirror.Product, Test]]
+    x: Mirror.Product {
+      type MirroredElemTypes[X] = (X, Boolean)
+    }
+  }
+
+  locally {
+    val x = summon[Kind2[Mirror.Product, Swap]]
+    x: Mirror.Product {
+      type MirroredElemTypes[X, Y] = (Y, X)
+    }
+  }
diff --git a/tests/pos/i13871.scala b/tests/pos/i13871.scala
new file mode 100644
index 000000000000..3b1ed0f1f06c
--- /dev/null
+++ b/tests/pos/i13871.scala
@@ -0,0 +1,10 @@
+import scala.compiletime.{error, codeOf}
+import scala.compiletime.testing.*
+
+inline def testError(inline typeName: Any): String = error("Got error " + codeOf(typeName))
+
+transparent inline def compileErrors(inline code: String): List[Error] = typeCheckErrors(code)
+
+def test =
+  typeCheckErrors("""testError("string")""")
+  compileErrors("""testError("string")""")
diff --git a/tests/pos/i13941.scala b/tests/pos/i13941.scala
new file mode 100644
index 000000000000..299470e455e3
--- /dev/null
+++ b/tests/pos/i13941.scala
@@ -0,0 +1,15 @@
+import scala.annotation.tailrec
+
+object A {
+  def b = Option("a").map { x =>
+    @tailrec
+    def loop(): Int = {
+      try
+        2
+      catch
+        case _: Throwable =>
+          loop()
+    }
+    x
+  }
+}
diff --git a/tests/pos/i13974.scala b/tests/pos/i13974.scala
new file mode 100644
index 000000000000..957baab63eb7
--- /dev/null
+++ b/tests/pos/i13974.scala
@@ -0,0 +1,13 @@
+object Test {
+  class C
+  class Use[A]
+  case class UseC() extends Use[C]
+  class ConversionTarget
+  implicit def convert(c: C): ConversionTarget = ???
+  def go[X](u: Use[X], x: X) =
+    u match {
+      case UseC() =>
+        //val y: C = x
+        x: ConversionTarget
+    }
+}
diff --git a/tests/pos/i13974a.scala b/tests/pos/i13974a.scala
new file mode 100644
index 000000000000..69e764abc14d
--- /dev/null
+++ b/tests/pos/i13974a.scala
@@ -0,0 +1,12 @@
+
+object Test2:
+  class Foo[+X]
+  enum SUB[-S, +T]:
+    case Refl[U]() extends SUB[U, U]
+  def f[A, B, C](sub : A SUB (B,C)) =
+    given Foo[A] = ???
+    val x = summon[Foo[A]]
+    sub match
+      case SUB.Refl() =>
+        val c: Foo[(B, C)] = summon[Foo[A]]
+        summon[Foo[(B, C)]]
diff --git a/tests/pos/i13998.scala b/tests/pos/i13998.scala
new file mode 100644
index 000000000000..474c6dca9e30
--- /dev/null
+++ b/tests/pos/i13998.scala
@@ -0,0 +1,10 @@
+case class Box[V](value: V)
+object Box:
+  def apply[A](a: A): Box[A]        = new Box[A](a)
+  def unapply[U](b: Box[U]): Box[U] = b
+
+class Test:
+  def value: Box[_ <: String] = Box("text")
+
+  def test: String = value match
+    case Box(text) => text: String
diff --git a/tests/pos/i14010.scala b/tests/pos/i14010.scala
new file mode 100644
index 000000000000..a881f783f39b
--- /dev/null
+++ b/tests/pos/i14010.scala
@@ -0,0 +1,46 @@
+abstract class LazyList[+T] {
+  def head: T
+  def tail: LazyList[T]
+  def isEmpty: Boolean
+  def push[E >: T](top: => E): LazyList[E] =
+    new Push[E](top, this)
+  //def map[R](f: T => R): LazyList[R]
+  def append[E >: T](that: => LazyList[E]): LazyList[E]
+}
+
+private class Push[+T](top: => T, stack: => LazyList[T]) extends LazyList[T] {
+  override def head: T =
+    top
+  override def tail: LazyList[T] =
+    stack
+  override def isEmpty: Boolean =
+    false
+  //override def map[R](f: T => R): LazyList[R] =
+  //  new Push[R](f(top), stack.map(f)) {
+  //        override def map[R2](f2: R => R2): LazyList[R2] =
+  //          Push.this.map(f2 compose f)
+  //      }
+  override def append[E >: T](that: => LazyList[E]): LazyList[E] =
+    new Push[E](top, stack.append(that)) {
+          override def append[E2 >: E](that2: => LazyList[E2]): LazyList[E2] =
+            Push.this.append(that.append(that2))
+        }
+}
+
+object LazyList {
+  val empty =
+    new LazyList[Nothing] {
+          override def head: Nothing =
+            throw new NoSuchElementException
+          override def tail: LazyList[Nothing] =
+            throw new UnsupportedOperationException
+          override def isEmpty: Boolean =
+            true
+          //override def map[R](f: _ => R): LazyList[R] =
+          //  this
+          override def append[E](that: => LazyList[E]): LazyList[E] =
+            that
+        }
+  def apply[T](elements: T*): LazyList[T] =
+    elements.foldRight[LazyList[T]](empty)(new Push(_, _))
+}
\ No newline at end of file
diff --git a/tests/pos/i14010a.scala b/tests/pos/i14010a.scala
new file mode 100644
index 000000000000..5e77f55fdf62
--- /dev/null
+++ b/tests/pos/i14010a.scala
@@ -0,0 +1,3 @@
+class Foo(top: => Int) {
+  def foo: Any = new Foo(top) { }
+}
\ No newline at end of file
diff --git a/tests/pos/i14013.scala b/tests/pos/i14013.scala
new file mode 100644
index 000000000000..d20112392002
--- /dev/null
+++ b/tests/pos/i14013.scala
@@ -0,0 +1,63 @@
+import LightTypeTagInheritance._
+
+trait LightTypeTagRef
+
+object LightTypeTagInheritance {
+  private final case class Ctx(self: LightTypeTagInheritance) {
+    def next(): Ctx = Ctx(self)
+  }
+  private implicit final class CtxExt(private val ctx: Ctx) extends AnyVal {
+    def isChild(selfT0: LightTypeTagRef, thatT0: LightTypeTagRef): Boolean = ctx.self.isChild(ctx.next())(selfT0, thatT0)
+  }
+}
+
+class LightTypeTagInheritance {
+
+  def isChild(s: LightTypeTagRef, t: LightTypeTagRef): Boolean = {
+    isChild(new Ctx(this))(s, t)
+  }
+
+  private def isChild(ctx: Ctx)(s: LightTypeTagRef, t: LightTypeTagRef): Boolean = {
+    ctx.isChild(s, t)
+  }
+
+}
+
+object App extends App {
+  println(LightTypeTagInheritance)
+}
+
+
+object Foo {
+  case class Bar(i: Int)
+
+  private implicit class BarOps(bar: Bar) {
+    def twice = Bar(bar.i * 2)
+  }
+}
+
+class Foo {
+  def bar = Foo.Bar(1).twice
+}
+
+object App2 extends App {
+  println((new Foo).bar)
+}
+
+object Foo2 {
+  case class Bar(i: Int)
+
+  private given BarOps: AnyRef with {
+    extension (bar: Bar)
+      def twice: Bar = Bar(bar.i * 2)
+  }
+}
+
+class Foo2 {
+  def bar = Foo2.Bar(1).twice
+}
+
+object App3 extends App {
+  println((new Foo2).bar)
+}
+
diff --git a/tests/pos/i14048.scala b/tests/pos/i14048.scala
new file mode 100644
index 000000000000..b815b68c72fd
--- /dev/null
+++ b/tests/pos/i14048.scala
@@ -0,0 +1,5 @@
+class T:
+  inline def foo(): Unit = bar()
+  private inline def bar(): Unit = ()
+
+def test(t: T) = t.foo()
diff --git a/tests/pos/i14061.scala b/tests/pos/i14061.scala
new file mode 100644
index 000000000000..1431c1248255
--- /dev/null
+++ b/tests/pos/i14061.scala
@@ -0,0 +1,10 @@
+def main(args: Array[String]): Unit =
+  val bar: PartialFunction[Throwable, Unit] =
+    case e: IllegalArgumentException => e.printStackTrace
+    case e: Throwable => e.printStackTrace
+  try
+    println("a")
+  catch
+    bar
+  finally
+    println("a")
\ No newline at end of file
diff --git a/tests/pos/i14152.scala b/tests/pos/i14152.scala
new file mode 100644
index 000000000000..2377d5ffeae3
--- /dev/null
+++ b/tests/pos/i14152.scala
@@ -0,0 +1,30 @@
+val a1 = {
+  object O1 extends AnyRef
+  Array(O1)
+}
+val a2: Array[_ <: AnyRef] = aa1
+
+val aa1 = {
+  object O1 extends AnyRef
+  Array(Array(O1))
+}
+val aa2: Array[_ <: Array[_ <: AnyRef]] = aa1
+
+val aaa1 = {
+  object O1 extends AnyRef
+  Array(Array(Array(O1)))
+}
+val aaa2: Array[_ <: Array[_ <: Array[_ <: AnyRef]]] = aaa1
+
+
+// Let's make sure avoidance still does the right thing given abstract type constructors
+
+class Inv[T](x: T)
+
+def foo[F[_]](fn: [A] => Inv[A] => F[A]) =
+  object O1 extends AnyRef
+  val res0 = fn(new Inv(fn(new Inv[O1.type](O1))))
+  val res1: F[F[O1.type]] = res0
+  res1 // checked with -Xprint:typer that this widens to Any
+       // instead of the original F[F[O1.type]]
+       // or the incorrectly avoided F[? <: F[? <: Object]]
diff --git a/tests/pos/i14177b.scala b/tests/pos/i14177b.scala
new file mode 100644
index 000000000000..6da9a72ae551
--- /dev/null
+++ b/tests/pos/i14177b.scala
@@ -0,0 +1,15 @@
+class T
+
+inline given fail1: T with
+  val cs = scala.compiletime.summonAll[EmptyTuple]
+inline given fail2[X]: T with
+  val cs = scala.compiletime.summonAll[EmptyTuple]
+inline given fail3(using DummyImplicit): T with
+  val cs = scala.compiletime.summonAll[EmptyTuple]
+
+inline given ok1: T = new T:
+  val cs = scala.compiletime.summonAll[EmptyTuple]
+inline given ok2[X]: T = new T:
+  val cs = scala.compiletime.summonAll[EmptyTuple]
+inline given ok3(using DummyImplicit): T = new T:
+  val cs = scala.compiletime.summonAll[EmptyTuple]
diff --git a/tests/pos/i14214.scala b/tests/pos/i14214.scala
new file mode 100644
index 000000000000..9bf1f8b5ff75
--- /dev/null
+++ b/tests/pos/i14214.scala
@@ -0,0 +1,16 @@
+class Dummy
+given Dummy = ???
+trait Foo
+given foo: Foo = ???
+trait Bar
+given bar(using Dummy): Bar = ???
+
+object Test:
+  summon[Dummy ?=> Foo] // was error
+  summon[Dummy ?=> Foo](using foo)  // works
+  summon[Dummy ?=> Foo](using (_: Dummy) ?=> foo)  // works
+  summon[Dummy ?=> Bar]
+  summon[Dummy ?=> Bar](using bar)  // works
+  summon[Dummy ?=> Bar](using (_: Dummy) ?=> bar)  // works
+
+
diff --git a/tests/pos/i14282.scala b/tests/pos/i14282.scala
new file mode 100644
index 000000000000..2cc3ff1226e2
--- /dev/null
+++ b/tests/pos/i14282.scala
@@ -0,0 +1,13 @@
+trait Foo[A] {
+  inline def foo(): Unit
+}
+
+inline given FooA[A]: Foo[A] with {
+  inline def foo(): Unit = println()
+}
+def test1 = FooA.foo()
+
+inline given FooInt: Foo[Int] with {
+  inline def foo(): Unit = println()
+}
+def test2 = FooInt.foo()
diff --git a/tests/pos/i14349.min.scala b/tests/pos/i14349.min.scala
new file mode 100644
index 000000000000..8922d73056d6
--- /dev/null
+++ b/tests/pos/i14349.min.scala
@@ -0,0 +1,13 @@
+class Inv[M]
+
+class Module:
+  type X
+  type Y
+  type M = Module {
+    type X = Module.this.X
+    type Y = Module.this.Y
+  }
+  def expose = new Inv[M]
+  def test                  = this match { case m => m.expose }
+  // was: leak: `(m : Module)` in `m.expose: Inv[? <: Module { X = m.X }]`
+  def res: Inv[_ <: Module] = this match { case m => m.expose }
diff --git a/tests/pos/i14349.scala b/tests/pos/i14349.scala
new file mode 100644
index 000000000000..05e4e1e3603f
--- /dev/null
+++ b/tests/pos/i14349.scala
@@ -0,0 +1,19 @@
+trait Module:
+  self =>
+  type M <: Module {
+    type X = self.X
+    type Y = self.Y
+  }
+  type X
+  type Y
+
+  def expose: Expose[X, Y, M]
+
+trait Expose[
+    X0,
+    Y0,
+    M <: Module { type X = X0; type Y = Y0 }
+]
+
+def test(ms: Seq[Option[Module]]): Seq[Expose[_, _, _]] =
+  ms.collect { case Some(module) => module.expose }
diff --git a/tests/pos/i14367.scala b/tests/pos/i14367.scala
new file mode 100644
index 000000000000..d74f0aa8373e
--- /dev/null
+++ b/tests/pos/i14367.scala
@@ -0,0 +1,7 @@
+def m(i: Int*) = i.sum
+val f1 = m
+val f2 = i => m(i*)
+
+def n(i: Seq[Int]) = i.sum
+val g1 = n
+val g2 = i => n(i)
diff --git a/tests/pos/i14442.scala b/tests/pos/i14442.scala
new file mode 100644
index 000000000000..60d7e26a0b3f
--- /dev/null
+++ b/tests/pos/i14442.scala
@@ -0,0 +1,4 @@
+class Foo(val id: Int) {
+    inline def ==(that: Foo): Boolean = true
+}
+case class FooWrapper(foo: Foo)
diff --git a/tests/pos/i5978.scala b/tests/pos/i5978.scala
index 630a0ec4ea6c..f1954b8c8275 100644
--- a/tests/pos/i5978.scala
+++ b/tests/pos/i5978.scala
@@ -1,3 +1,4 @@
+package test
 import scala.language.implicitConversions
 
 opaque type Position[Buffer] = Int
diff --git a/tests/pos/i6662.scala b/tests/pos/i6662.scala
new file mode 100644
index 000000000000..af0c939c7ed9
--- /dev/null
+++ b/tests/pos/i6662.scala
@@ -0,0 +1,20 @@
+object opt:
+    opaque type Opt[A >: Null] = A
+    object Opt:
+        inline def unOpt[A >: Null](x: Opt[A]): A = x
+        inline def apply[A >: Null](x: A): Opt[A] = x
+        inline def some[A >: Null](x: A): Opt[A] = x
+        inline def none[A >: Null]: Opt[A] = null
+        inline def fromOption[A >: Null](x: Option[A]) = x.orNull
+
+import opt.Opt
+extension [A >: Null](x: Opt[A])
+    inline def nonEmpty : Boolean = x.get != null
+    inline def isEmpty  : Boolean = x.get == null
+    inline def isDefined: Boolean = x.nonEmpty
+    inline def get      : A       = Opt.unOpt(x)
+
+@main def Test =
+  val x: Opt[String] = Opt.some("abc")
+  assert(x.nonEmpty)
+  val y: String = Opt.unOpt(x)
diff --git a/tests/pos/i6678.scala b/tests/pos/i6678.scala
new file mode 100644
index 000000000000..e4fff1789595
--- /dev/null
+++ b/tests/pos/i6678.scala
@@ -0,0 +1,4 @@
+object O {
+  val f = (i:Int) => [T] => (s:String) => 2
+  def m = f(1)("a")
+}
\ No newline at end of file
diff --git a/tests/pos/i6854.scala b/tests/pos/i6854.scala
new file mode 100644
index 000000000000..78ba9c19af7e
--- /dev/null
+++ b/tests/pos/i6854.scala
@@ -0,0 +1,12 @@
+object Test {
+  import Lib.*
+  val xs: IArray2[Int] = IArray2(1)
+}
+
+object Lib {
+  opaque type IArray2[+T] = Array[_ <: T]
+
+  object IArray2 {
+    inline def apply(x: =>Int): IArray2[Int] = Array(x)
+  }
+}
diff --git a/tests/pos/i6864.scala b/tests/pos/i6864.scala
index af0f3d22ba50..aa9376e0fc30 100644
--- a/tests/pos/i6864.scala
+++ b/tests/pos/i6864.scala
@@ -1,17 +1,17 @@
 class A
 class B
 
-given A with {}
-given B with {}
+given A()
+given B()
 
 trait Foo
 trait Bar
 
-given Foo with {}
-given Bar with {}
+given Foo()
+given Bar()
 
 trait C
 trait Baz[A]
 
-given C with {}
-given [A]: Baz[A] with {}
\ No newline at end of file
+given C()
+given [A]: Baz[A]()
\ No newline at end of file
diff --git a/tests/pos/i7034.scala b/tests/pos/i7034.scala
new file mode 100644
index 000000000000..f9bce462aea8
--- /dev/null
+++ b/tests/pos/i7034.scala
@@ -0,0 +1,4780 @@
+val names = IArray(
+  "Aaron",
+  "Abdiel",
+  "Abdul",
+  "Abdullah",
+  "Abe",
+  "Abel",
+  "Abner",
+  "Abraham",
+  "Abram",
+  "Adalberto",
+  "Adam",
+  "Adan",
+  "Addison",
+  "Adelard",
+  "Adelbert",
+  "Aditya",
+  "Adolphus",
+  "Adonis",
+  "Adrain",
+  "Adrian",
+  "Adrien",
+  "Agustin",
+  "Ahmad",
+  "Ahmed",
+  "Aidan",
+  "Aiden",
+  "Akeem",
+  "Al",
+  "Alan",
+  "Albert",
+  "Alberto",
+  "Albin",
+  "Alden",
+  "Aldo",
+  "Alec",
+  "Alejandro",
+  "Alek",
+  "Alessandro",
+  "Alex",
+  "Alexander",
+  "Alexandre",
+  "Alexandrer",
+  "Alexandro",
+  "Alexis",
+  "Alf",
+  "Alfonso",
+  "Alfonzo",
+  "Alford",
+  "Alfred",
+  "Alfredo",
+  "Ali",
+  "Allan",
+  "Allen",
+  "Allie",
+  "Allison",
+  "Allyn",
+  "Alma",
+  "Alois",
+  "Alonso",
+  "Alonza",
+  "Alonzo",
+  "Aloysius",
+  "Alpha",
+  "Alphonse",
+  "Alphonso",
+  "Alton",
+  "Alva",
+  "Alvah",
+  "Alvaro",
+  "Alvie",
+  "Alvin",
+  "Alvis",
+  "Amado",
+  "Amador",
+  "Amanda",
+  "Amari",
+  "Ambrose",
+  "Americo",
+  "Amir",
+  "Amos",
+  "Amy",
+  "Anastacio",
+  "Anderson",
+  "Andra",
+  "Andre",
+  "Andrea",
+  "Andreas",
+  "Andres",
+  "Andrew",
+  "Andy",
+  "Angel",
+  "Angela",
+  "Angelo",
+  "Angus",
+  "Anibal",
+  "Anna",
+  "Ansel",
+  "Anselmo",
+  "Anthony",
+  "Antione",
+  "Antoine",
+  "Anton",
+  "Antone",
+  "Antonia",
+  "Antonio",
+  "Antony",
+  "Antwan",
+  "Antwon",
+  "Arcadio",
+  "Arch",
+  "Archibald",
+  "Archie",
+  "Ardell",
+  "Arden",
+  "Ari",
+  "Aric",
+  "Ariel",
+  "Arlan",
+  "Arlen",
+  "Arley",
+  "Arlie",
+  "Arlin",
+  "Arlis",
+  "Arlo",
+  "Arman",
+  "Armand",
+  "Armando",
+  "Armani",
+  "Armond",
+  "Arnaldo",
+  "Arne",
+  "Arno",
+  "Arnold",
+  "Arnoldo",
+  "Arnulfo",
+  "Aron",
+  "Arron",
+  "Art",
+  "Arther",
+  "Arthur",
+  "Artie",
+  "Artis",
+  "Arturo",
+  "Arvel",
+  "Arvid",
+  "Arvil",
+  "Arvin",
+  "Asa",
+  "Asher",
+  "Ashley",
+  "Ashton",
+  "Aubrey",
+  "Audie",
+  "Audrey",
+  "August",
+  "Augustine",
+  "Augustus",
+  "Aurelio",
+  "Austen",
+  "Austin",
+  "Auston",
+  "Austyn",
+  "Avery",
+  "Axel",
+  "Ayden",
+  "Bailey",
+  "Barbara",
+  "Barney",
+  "Baron",
+  "Barrett",
+  "Barron",
+  "Barry",
+  "Bart",
+  "Bartholome",
+  "Barton",
+  "Basil",
+  "Beau",
+  "Ben",
+  "Benedict",
+  "Benito",
+  "Benjamin",
+  "Bennett",
+  "Bennie",
+  "Benny",
+  "Benton",
+  "Bernard",
+  "Bernardo",
+  "Bernhard",
+  "Bernice",
+  "Bernie",
+  "Berry",
+  "Bert",
+  "Berton",
+  "Bertram",
+  "Bertrand",
+  "Beryl",
+  "Betty",
+  "Beverly",
+  "Bienvenido",
+  "Bill",
+  "Billie",
+  "Billy",
+  "Bishop",
+  "Blaine",
+  "Blair",
+  "Blaise",
+  "Blake",
+  "Blane",
+  "Bo",
+  "Bob",
+  "Bobbie",
+  "Bobby",
+  "Bonnie",
+  "Booker",
+  "Boris",
+  "Boyce",
+  "Boyd",
+  "Brad",
+  "Braden",
+  "Bradford",
+  "Bradley",
+  "Bradly",
+  "Brady",
+  "Braeden",
+  "Braedon",
+  "Braiden",
+  "Brain",
+  "Brandan",
+  "Branden",
+  "Brandon",
+  "Brandt",
+  "Brandy",
+  "Brandyn",
+  "Brannon",
+  "Branson",
+  "Brant",
+  "Braulio",
+  "Braxton",
+  "Brayan",
+  "Brayden",
+  "Braydon",
+  "Brendan",
+  "Brenden",
+  "Brendon",
+  "Brennan",
+  "Brennen",
+  "Brennon",
+  "Brent",
+  "Brenton",
+  "Bret",
+  "Brett",
+  "Brian",
+  "Brice",
+  "Bridger",
+  "Brien",
+  "Britt",
+  "Brock",
+  "Broderick",
+  "Brody",
+  "Bronson",
+  "Brook",
+  "Brooks",
+  "Brown",
+  "Bruce",
+  "Bruno",
+  "Bryan",
+  "Bryant",
+  "Bryce",
+  "Brycen",
+  "Bryon",
+  "Bryson",
+  "Buck",
+  "Bud",
+  "Buddie",
+  "Buddy",
+  "Buford",
+  "Burdette",
+  "Burl",
+  "Burley",
+  "Burnell",
+  "Burt",
+  "Burton",
+  "Buster",
+  "Butch",
+  "Byron",
+  "Cade",
+  "Caden",
+  "Caesar",
+  "Cale",
+  "Caleb",
+  "Calvin",
+  "Camden",
+  "Cameron",
+  "Camren",
+  "Camron",
+  "Candelario",
+  "Candido",
+  "Carey",
+  "Carl",
+  "Carleton",
+  "Carlo",
+  "Carlos",
+  "Carlton",
+  "Carlyle",
+  "Carmelo",
+  "Carmen",
+  "Carmine",
+  "Carnell",
+  "Carol",
+  "Carolyn",
+  "Carrol",
+  "Carroll",
+  "Carson",
+  "Carter",
+  "Cary",
+  "Casey",
+  "Casimer",
+  "Casimir",
+  "Casper",
+  "Cassidy",
+  "Cayden",
+  "Cecil",
+  "Cecilio",
+  "Cedric",
+  "Cedrick",
+  "Celestino",
+  "Cesar",
+  "Chad",
+  "Chadd",
+  "Chadrick",
+  "Chadwick",
+  "Chaim",
+  "Chance",
+  "Chandler",
+  "Charles",
+  "Charley",
+  "Charlie",
+  "Chas",
+  "Chase",
+  "Chauncey",
+  "Chaz",
+  "Chesley",
+  "Chester",
+  "Chet",
+  "Chip",
+  "Chris",
+  "Christ",
+  "Christian",
+  "Christina",
+  "Christion",
+  "Christop",
+  "Christoper",
+  "Christophe",
+  "Christopher",
+  "Chuck",
+  "Cicero",
+  "Clair",
+  "Claire",
+  "Clarance",
+  "Clare",
+  "Clarence",
+  "Clark",
+  "Claud",
+  "Claude",
+  "Claudie",
+  "Claudio",
+  "Clay",
+  "Clayton",
+  "Clem",
+  "Clemens",
+  "Clement",
+  "Cleo",
+  "Cleon",
+  "Cletus",
+  "Cleve",
+  "Cleveland",
+  "Cliff",
+  "Clifford",
+  "Clifton",
+  "Clint",
+  "Clinton",
+  "Clovis",
+  "Cloyd",
+  "Clyde",
+  "Coby",
+  "Codey",
+  "Codie",
+  "Cody",
+  "Colby",
+  "Cole",
+  "Coleman",
+  "Colin",
+  "Collin",
+  "Colt",
+  "Colten",
+  "Colton",
+  "Columbus",
+  "Conner",
+  "Connie",
+  "Connor",
+  "Conor",
+  "Conrad",
+  "Constantin",
+  "Cooper",
+  "Corbin",
+  "Cordell",
+  "Corey",
+  "Cornelius",
+  "Cornell",
+  "Cortez",
+  "Cortney",
+  "Cory",
+  "Coty",
+  "Courtney",
+  "Coy",
+  "Craig",
+  "Crawford",
+  "Cris",
+  "Cristian",
+  "Cristobal",
+  "Cristopher",
+  "Cruz",
+  "Cullen",
+  "Curt",
+  "Curtis",
+  "Curtiss",
+  "Cyril",
+  "Cyrus",
+  "Dakota",
+  "Dakotah",
+  "Dale",
+  "Dallas",
+  "Dallin",
+  "Dalton",
+  "Dameon",
+  "Damian",
+  "Damien",
+  "Damion",
+  "Damon",
+  "Dan",
+  "Dana",
+  "Dandre",
+  "Dane",
+  "Dangelo",
+  "Danial",
+  "Daniel",
+  "Dannie",
+  "Danny",
+  "Dante",
+  "Daquan",
+  "Darby",
+  "Darell",
+  "Daren",
+  "Darian",
+  "Darien",
+  "Darin",
+  "Dario",
+  "Darion",
+  "Darius",
+  "Darnell",
+  "Darold",
+  "Daron",
+  "Darrel",
+  "Darrell",
+  "Darren",
+  "Darrian",
+  "Darrick",
+  "Darrien",
+  "Darrin",
+  "Darrion",
+  "Darrius",
+  "Darron",
+  "Darryl",
+  "Darwin",
+  "Daryl",
+  "Daryle",
+  "Dashawn",
+  "Dave",
+  "Davey",
+  "David",
+  "Davie",
+  "Davin",
+  "Davion",
+  "Davis",
+  "Davon",
+  "Davonte",
+  "Davy",
+  "Dawson",
+  "Dax",
+  "Dayton",
+  "Dean",
+  "Deandre",
+  "Deane",
+  "Deangelo",
+  "Deborah",
+  "Debra",
+  "Declan",
+  "Dedric",
+  "Dedrick",
+  "Dee",
+  "Deion",
+  "Dejuan",
+  "Del",
+  "Delano",
+  "Delbert",
+  "Dell",
+  "Delmar",
+  "Delmas",
+  "Delmer",
+  "Delton",
+  "Delvin",
+  "Demarco",
+  "Demarcus",
+  "Demario",
+  "Demetris",
+  "Demetrius",
+  "Demond",
+  "Dempsey",
+  "Denis",
+  "Dennie",
+  "Dennis",
+  "Denny",
+  "Denton",
+  "Denver",
+  "Denzel",
+  "Denzil",
+  "Deon",
+  "Deondre",
+  "Deontae",
+  "Deonte",
+  "Dequan",
+  "Dereck",
+  "Derek",
+  "Deric",
+  "Derick",
+  "Derik",
+  "Deron",
+  "Derrell",
+  "Derrick",
+  "Derwin",
+  "Deshaun",
+  "Deshawn",
+  "Desmond",
+  "Destin",
+  "Devan",
+  "Devante",
+  "Deven",
+  "Devin",
+  "Devon",
+  "Devonta",
+  "Devontae",
+  "Devonte",
+  "Devyn",
+  "Dewayne",
+  "Dewey",
+  "Dewitt",
+  "Dexter",
+  "Diamond",
+  "Dick",
+  "Dickie",
+  "Diego",
+  "Dillan",
+  "Dillard",
+  "Dillion",
+  "Dillon",
+  "Dimitri",
+  "Dino",
+  "Dion",
+  "Dionisio",
+  "Dionte",
+  "Dirk",
+  "Dock",
+  "Dolores",
+  "Domenic",
+  "Domenick",
+  "Domenico",
+  "Domingo",
+  "Dominic",
+  "Dominick",
+  "Dominik",
+  "Dominique",
+  "Dominque",
+  "Don",
+  "Donal",
+  "Donald",
+  "Donato",
+  "Donavan",
+  "Donavon",
+  "Donell",
+  "Donn",
+  "Donna",
+  "Donnell",
+  "Donnie",
+  "Donny",
+  "Donovan",
+  "Donta",
+  "Dontae",
+  "Donte",
+  "Dorian",
+  "Doris",
+  "Dorman",
+  "Dorothy",
+  "Dorris",
+  "Dorsey",
+  "Doug",
+  "Douglas",
+  "Douglass",
+  "Doyle",
+  "Drake",
+  "Draven",
+  "Drew",
+  "Duane",
+  "Dudley",
+  "Duke",
+  "Duncan",
+  "Durward",
+  "Durwood",
+  "Dustin",
+  "Dusty",
+  "Duwayne",
+  "Dwain",
+  "Dwaine",
+  "Dwane",
+  "Dwayne",
+  "Dwight",
+  "Dylan",
+  "Dyllan",
+  "Dylon",
+  "Ean",
+  "Earl",
+  "Earle",
+  "Earlie",
+  "Early",
+  "Earnest",
+  "Easton",
+  "Ed",
+  "Edd",
+  "Eddie",
+  "Eddy",
+  "Edgar",
+  "Edgardo",
+  "Edison",
+  "Edmond",
+  "Edmund",
+  "Edsel",
+  "Eduardo",
+  "Edward",
+  "Edwardo",
+  "Edwin",
+  "Efrain",
+  "Efren",
+  "Einar",
+  "Eino",
+  "Eladio",
+  "Elbert",
+  "Elden",
+  "Eldon",
+  "Eldred",
+  "Eldridge",
+  "Elgin",
+  "Eli",
+  "Elias",
+  "Eliezer",
+  "Elijah",
+  "Eliot",
+  "Eliseo",
+  "Elisha",
+  "Elizabeth",
+  "Elliot",
+  "Elliott",
+  "Ellis",
+  "Ellsworth",
+  "Ellwood",
+  "Elmer",
+  "Elmo",
+  "Elmore",
+  "Eloy",
+  "Elroy",
+  "Elton",
+  "Elvin",
+  "Elvis",
+  "Elwin",
+  "Elwood",
+  "Elwyn",
+  "Elza",
+  "Elzie",
+  "Emanuel",
+  "Emerson",
+  "Emery",
+  "Emil",
+  "Emile",
+  "Emiliano",
+  "Emilio",
+  "Emma",
+  "Emmanuel",
+  "Emmet",
+  "Emmett",
+  "Emmit",
+  "Emmitt",
+  "Emory",
+  "Ennis",
+  "Enoch",
+  "Enos",
+  "Enrico",
+  "Enrique",
+  "Ephraim",
+  "Epifanio",
+  "Erasmo",
+  "Eric",
+  "Erich",
+  "Erick",
+  "Erik",
+  "Erin",
+  "Erling",
+  "Ernest",
+  "Ernesto",
+  "Ernie",
+  "Ernst",
+  "Errol",
+  "Ervin",
+  "Erwin",
+  "Esteban",
+  "Estel",
+  "Estevan",
+  "Ethan",
+  "Eugene",
+  "Eugenio",
+  "Eusebio",
+  "Evan",
+  "Evans",
+  "Everett",
+  "Everette",
+  "Evert",
+  "Ewald",
+  "Ewell",
+  "Ezekiel",
+  "Ezell",
+  "Ezequiel",
+  "Ezra",
+  "Fabian",
+  "Faron",
+  "Farrell",
+  "Faustino",
+  "Fay",
+  "Federico",
+  "Felipe",
+  "Felix",
+  "Felton",
+  "Ferdinand",
+  "Fermin",
+  "Fernand",
+  "Fernando",
+  "Fidel",
+  "Finis",
+  "Finley",
+  "Fletcher",
+  "Florence",
+  "Florencio",
+  "Florentino",
+  "Florian",
+  "Floyd",
+  "Ford",
+  "Forest",
+  "Forrest",
+  "Fortunato",
+  "Foster",
+  "Foy",
+  "Frances",
+  "Francesco",
+  "Francis",
+  "Francisco",
+  "Frank",
+  "Frankie",
+  "Franklin",
+  "Franklyn",
+  "Franz",
+  "Fred",
+  "Freddie",
+  "Freddy",
+  "Frederic",
+  "Frederick",
+  "Fredric",
+  "Fredrick",
+  "Fredy",
+  "Freeman",
+  "Friedrich",
+  "Fritz",
+  "Furman",
+  "Gabe",
+  "Gabriel",
+  "Gaetano",
+  "Gage",
+  "Gail",
+  "Gale",
+  "Galen",
+  "Gardner",
+  "Garett",
+  "Garfield",
+  "Garland",
+  "Garnet",
+  "Garnett",
+  "Garold",
+  "Garret",
+  "Garrett",
+  "Garrick",
+  "Garrison",
+  "Garry",
+  "Garth",
+  "Gary",
+  "Gaston",
+  "Gaven",
+  "Gavin",
+  "Gayle",
+  "Gaylon",
+  "Gaylord",
+  "Gearld",
+  "Geary",
+  "Genaro",
+  "Gene",
+  "General",
+  "Gennaro",
+  "Geo",
+  "Geoffrey",
+  "George",
+  "Gerald",
+  "Geraldo",
+  "Gerard",
+  "Gerardo",
+  "Gerhard",
+  "Germaine",
+  "German",
+  "Gerold",
+  "Gerry",
+  "Giancarlo",
+  "Gianni",
+  "Gil",
+  "Gilbert",
+  "Gilberto",
+  "Giles",
+  "Gino",
+  "Giovanni",
+  "Giovanny",
+  "Giuseppe",
+  "Glen",
+  "Glendon",
+  "Glenn",
+  "Glynn",
+  "Godfrey",
+  "Golden",
+  "Gonzalo",
+  "Gordon",
+  "Grace",
+  "Grady",
+  "Graham",
+  "Grant",
+  "Granville",
+  "Grayson",
+  "Green",
+  "Greg",
+  "Gregg",
+  "Greggory",
+  "Gregorio",
+  "Gregory",
+  "Greyson",
+  "Griffin",
+  "Grover",
+  "Guadalupe",
+  "Guido",
+  "Guillermo",
+  "Guiseppe",
+  "Gunnar",
+  "Gunner",
+  "Gus",
+  "Gust",
+  "Gustav",
+  "Gustave",
+  "Gustavo",
+  "Guy",
+  "Hakeem",
+  "Hal",
+  "Hallie",
+  "Hamilton",
+  "Hamza",
+  "Hank",
+  "Hans",
+  "Hansel",
+  "Harding",
+  "Hardy",
+  "Harlan",
+  "Harland",
+  "Harlen",
+  "Harley",
+  "Harmon",
+  "Harold",
+  "Harris",
+  "Harrison",
+  "Harry",
+  "Harvey",
+  "Haskell",
+  "Hassan",
+  "Hayden",
+  "Hayward",
+  "Haywood",
+  "Hazel",
+  "Heath",
+  "Heber",
+  "Hector",
+  "Helen",
+  "Helmer",
+  "Henderson",
+  "Henri",
+  "Henry",
+  "Herb",
+  "Herbert",
+  "Heriberto",
+  "Herman",
+  "Hermann",
+  "Herminio",
+  "Hermon",
+  "Hernan",
+  "Herschel",
+  "Hershel",
+  "Hezekiah",
+  "Hilario",
+  "Hilbert",
+  "Hillard",
+  "Hilliard",
+  "Hilton",
+  "Hipolito",
+  "Hiram",
+  "Hobart",
+  "Hobert",
+  "Holden",
+  "Hollie",
+  "Hollis",
+  "Homer",
+  "Hoover",
+  "Horace",
+  "Hosea",
+  "Houston",
+  "Howard",
+  "Howell",
+  "Hoyt",
+  "Hubert",
+  "Hudson",
+  "Huey",
+  "Hugh",
+  "Hugo",
+  "Humberto",
+  "Hunter",
+  "Hurley",
+  "Huston",
+  "Hyman",
+  "Ian",
+  "Ibrahim",
+  "Ignacio",
+  "Ignatius",
+  "Ike",
+  "Infant",
+  "Ira",
+  "Irvin",
+  "Irving",
+  "Irwin",
+  "Isaac",
+  "Isabel",
+  "Isadore",
+  "Isai",
+  "Isaiah",
+  "Isaias",
+  "Ishmael",
+  "Isiah",
+  "Isidore",
+  "Isidro",
+  "Ismael",
+  "Isom",
+  "Israel",
+  "Issac",
+  "Ivan",
+  "Ivey",
+  "Ivory",
+  "Ivy",
+  "Izaiah",
+  "Jabari",
+  "Jace",
+  "Jacinto",
+  "Jack",
+  "Jackie",
+  "Jackson",
+  "Jacky",
+  "Jacob",
+  "Jacoby",
+  "Jacques",
+  "Jacquez",
+  "Jade",
+  "Jaden",
+  "Jadon",
+  "Jaiden",
+  "Jaime",
+  "Jairo",
+  "Jake",
+  "Jakob",
+  "Jaleel",
+  "Jalen",
+  "Jalon",
+  "Jamaal",
+  "Jamal",
+  "Jamar",
+  "Jamarcus",
+  "Jamari",
+  "Jame",
+  "Jamel",
+  "James",
+  "Jameson",
+  "Jamey",
+  "Jamie",
+  "Jamil",
+  "Jamison",
+  "Jammie",
+  "Jan",
+  "Janis",
+  "Jaquan",
+  "Jared",
+  "Jaren",
+  "Jaret",
+  "Jarett",
+  "Jarod",
+  "Jaron",
+  "Jarred",
+  "Jarrell",
+  "Jarret",
+  "Jarrett",
+  "Jarrod",
+  "Jarvis",
+  "Jasen",
+  "Jason",
+  "Jasper",
+  "Javier",
+  "Javon",
+  "Javonte",
+  "Jaxon",
+  "Jaxson",
+  "Jay",
+  "Jayce",
+  "Jayden",
+  "Jaydon",
+  "Jaylan",
+  "Jaylen",
+  "Jaylin",
+  "Jaylon",
+  "Jayme",
+  "Jayson",
+  "Jean",
+  "Jed",
+  "Jedediah",
+  "Jedidiah",
+  "Jeff",
+  "Jefferey",
+  "Jefferson",
+  "Jeffery",
+  "Jeffrey",
+  "Jeffry",
+  "Jelani",
+  "Jennifer",
+  "Jennings",
+  "Jensen",
+  "Jerad",
+  "Jerald",
+  "Jeramie",
+  "Jeramy",
+  "Jere",
+  "Jered",
+  "Jerel",
+  "Jeremey",
+  "Jeremiah",
+  "Jeremie",
+  "Jeremy",
+  "Jermain",
+  "Jermaine",
+  "Jermey",
+  "Jerod",
+  "Jerold",
+  "Jerome",
+  "Jeromy",
+  "Jerrell",
+  "Jerrod",
+  "Jerrold",
+  "Jerry",
+  "Jess",
+  "Jesse",
+  "Jessica",
+  "Jessie",
+  "Jessy",
+  "Jesus",
+  "Jett",
+  "Jevon",
+  "Jewel",
+  "Jewell",
+  "Jim",
+  "Jimmie",
+  "Jimmy",
+  "Joan",
+  "Joaquin",
+  "Jodie",
+  "Jody",
+  "Joe",
+  "Joel",
+  "Joesph",
+  "Joey",
+  "Johan",
+  "Johann",
+  "Johathan",
+  "John",
+  "Johnathan",
+  "Johnathon",
+  "Johnie",
+  "Johnnie",
+  "Johnny",
+  "Johnpaul",
+  "Johnson",
+  "Jomar",
+  "Jon",
+  "Jonah",
+  "Jonas",
+  "Jonatan",
+  "Jonathan",
+  "Jonathon",
+  "Jonnie",
+  "Jordan",
+  "Jorden",
+  "Jordi",
+  "Jordon",
+  "Jordy",
+  "Jorge",
+  "Jose",
+  "Josef",
+  "Joseph",
+  "Josh",
+  "Joshua",
+  "Joshuah",
+  "Josiah",
+  "Josue",
+  "Jovan",
+  "Jovani",
+  "Jovanny",
+  "Jovany",
+  "Joy",
+  "Joyce",
+  "Juan",
+  "Judah",
+  "Judd",
+  "Jude",
+  "Judge",
+  "Judson",
+  "Jules",
+  "Julian",
+  "Julien",
+  "Julio",
+  "Julius",
+  "June",
+  "Junior",
+  "Junious",
+  "Junius",
+  "Justen",
+  "Justice",
+  "Justin",
+  "Justine",
+  "Justo",
+  "Juston",
+  "Justus",
+  "Justyn",
+  "Juwan",
+  "Kade",
+  "Kadeem",
+  "Kaden",
+  "Kadin",
+  "Kai",
+  "Kale",
+  "Kaleb",
+  "Kalen",
+  "Kalvin",
+  "Kameron",
+  "Kamron",
+  "Kane",
+  "Kareem",
+  "Karen",
+  "Karl",
+  "Karson",
+  "Kasey",
+  "Kay",
+  "Keagan",
+  "Keanu",
+  "Keaton",
+  "Keegan",
+  "Keenan",
+  "Kegan",
+  "Keith",
+  "Kelby",
+  "Kellen",
+  "Kelley",
+  "Kelly",
+  "Kelsey",
+  "Kelton",
+  "Kelvin",
+  "Ken",
+  "Kendal",
+  "Kendall",
+  "Kendrick",
+  "Kennedy",
+  "Kenneth",
+  "Kenney",
+  "Kennith",
+  "Kennth",
+  "Kenny",
+  "Kent",
+  "Kenton",
+  "Kenya",
+  "Kenyatta",
+  "Kenyon",
+  "Keon",
+  "Kermit",
+  "Kerry",
+  "Kerwin",
+  "Keshawn",
+  "Keven",
+  "Kevin",
+  "Kevon",
+  "Keyon",
+  "Keyshawn",
+  "Khalid",
+  "Khalil",
+  "Kiel",
+  "Kieran",
+  "Killian",
+  "Kim",
+  "Kimberly",
+  "King",
+  "Kip",
+  "Kirby",
+  "Kirk",
+  "Kirt",
+  "Kobe",
+  "Koby",
+  "Kody",
+  "Kolby",
+  "Kole",
+  "Kolton",
+  "Konnor",
+  "Korbin",
+  "Kordell",
+  "Korey",
+  "Kory",
+  "Kraig",
+  "Kris",
+  "Kristian",
+  "Kristofer",
+  "Kristoffer",
+  "Kristopher",
+  "Kurt",
+  "Kurtis",
+  "Kwame",
+  "Kylan",
+  "Kyle",
+  "Kyler",
+  "Kyree",
+  "Lacy",
+  "Ladarius",
+  "Laddie",
+  "Lafayette",
+  "Lamar",
+  "Lambert",
+  "Lamont",
+  "Lance",
+  "Landen",
+  "Landon",
+  "Lane",
+  "Lannie",
+  "Lanny",
+  "Laron",
+  "Larry",
+  "Lars",
+  "Lashawn",
+  "Latrell",
+  "Laurel",
+  "Lauren",
+  "Laurence",
+  "Lavern",
+  "Laverne",
+  "Lawerence",
+  "Lawrence",
+  "Lawson",
+  "Layne",
+  "Lazaro",
+  "Leamon",
+  "Leander",
+  "Lee",
+  "Leeroy",
+  "Leif",
+  "Leigh",
+  "Leland",
+  "Lemuel",
+  "Len",
+  "Lenard",
+  "Lennie",
+  "Lenny",
+  "Leo",
+  "Leon",
+  "Leonard",
+  "Leonardo",
+  "Leonel",
+  "Leopold",
+  "Leopoldo",
+  "Leroy",
+  "Les",
+  "Lesley",
+  "Leslie",
+  "Lester",
+  "Levar",
+  "Levi",
+  "Lew",
+  "Lewis",
+  "Liam",
+  "Lillian",
+  "Lincoln",
+  "Linda",
+  "Lindsay",
+  "Lindsey",
+  "Linwood",
+  "Lionel",
+  "Lisa",
+  "Llewellyn",
+  "Lloyd",
+  "Logan",
+  "Lois",
+  "Lon",
+  "Lonnie",
+  "Lonny",
+  "Lonzo",
+  "Loran",
+  "Loren",
+  "Lorenz",
+  "Lorenza",
+  "Lorenzo",
+  "Lorin",
+  "Lorne",
+  "Lou",
+  "Louie",
+  "Louis",
+  "Lowell",
+  "Loy",
+  "Loyal",
+  "Loyd",
+  "Lucas",
+  "Lucian",
+  "Luciano",
+  "Lucien",
+  "Lucious",
+  "Lucius",
+  "Ludwig",
+  "Luigi",
+  "Luis",
+  "Lukas",
+  "Luke",
+  "Lupe",
+  "Luther",
+  "Lyle",
+  "Lyman",
+  "Lyn",
+  "Lyndon",
+  "Lynn",
+  "Lynwood",
+  "Mac",
+  "Mack",
+  "Mackenzie",
+  "Madison",
+  "Magnus",
+  "Mahlon",
+  "Major",
+  "Malachi",
+  "Malcolm",
+  "Malcom",
+  "Malik",
+  "Malique",
+  "Manley",
+  "Manuel",
+  "Marc",
+  "Marcel",
+  "Marcelino",
+  "Marcellus",
+  "Marcelo",
+  "Marcial",
+  "Marco",
+  "Marcos",
+  "Marcus",
+  "Margaret",
+  "Margarito",
+  "Maria",
+  "Mariano",
+  "Marie",
+  "Mario",
+  "Marion",
+  "Mark",
+  "Markel",
+  "Markell",
+  "Markus",
+  "Marlin",
+  "Marlon",
+  "Marlyn",
+  "Marques",
+  "Marquez",
+  "Marquis",
+  "Marquise",
+  "Marshal",
+  "Marshall",
+  "Martin",
+  "Marty",
+  "Marvin",
+  "Mary",
+  "Mason",
+  "Mateo",
+  "Mathew",
+  "Mathias",
+  "Matt",
+  "Matteo",
+  "Matthew",
+  "Maurice",
+  "Mauricio",
+  "Maury",
+  "Maverick",
+  "Max",
+  "Maxie",
+  "Maximilian",
+  "Maximillia",
+  "Maximillian",
+  "Maximino",
+  "Maximo",
+  "Maxwell",
+  "Maynard",
+  "Mcarthur",
+  "Mckinley",
+  "Mearl",
+  "Mekhi",
+  "Mel",
+  "Melissa",
+  "Melton",
+  "Melville",
+  "Melvin",
+  "Melvyn",
+  "Meredith",
+  "Merl",
+  "Merle",
+  "Merlin",
+  "Merlyn",
+  "Merrill",
+  "Merritt",
+  "Merton",
+  "Mervin",
+  "Mervyn",
+  "Meyer",
+  "Micah",
+  "Michael",
+  "Michale",
+  "Micheal",
+  "Michel",
+  "Michele",
+  "Michelle",
+  "Mickey",
+  "Miguel",
+  "Miguelangel",
+  "Mike",
+  "Mikel",
+  "Milan",
+  "Milburn",
+  "Miles",
+  "Milford",
+  "Millard",
+  "Miller",
+  "Milo",
+  "Milton",
+  "Misael",
+  "Mitch",
+  "Mitchel",
+  "Mitchell",
+  "Modesto",
+  "Moe",
+  "Mohamed",
+  "Mohammad",
+  "Mohammed",
+  "Moises",
+  "Monroe",
+  "Monserrate",
+  "Montana",
+  "Monte",
+  "Montgomery",
+  "Monty",
+  "Morgan",
+  "Morris",
+  "Mortimer",
+  "Morton",
+  "Mose",
+  "Moses",
+  "Moshe",
+  "Muhammad",
+  "Murl",
+  "Murphy",
+  "Murray",
+  "Murry",
+  "Myles",
+  "Myron",
+  "Najee",
+  "Nakia",
+  "Nancy",
+  "Napoleon",
+  "Narciso",
+  "Nash",
+  "Nasir",
+  "Nat",
+  "Nathan",
+  "Nathanael",
+  "Nathanial",
+  "Nathaniel",
+  "Nathen",
+  "Neal",
+  "Ned",
+  "Neftali",
+  "Nehemiah",
+  "Neil",
+  "Nels",
+  "Nelson",
+  "Nestor",
+  "Newell",
+  "Newman",
+  "Newton",
+  "Nicholas",
+  "Nicholaus",
+  "Nick",
+  "Nicklaus",
+  "Nickolas",
+  "Nicky",
+  "Nico",
+  "Nicola",
+  "Nicolas",
+  "Nigel",
+  "Nikhil",
+  "Niko",
+  "Nikolas",
+  "Niles",
+  "Nils",
+  "Noah",
+  "Noble",
+  "Noe",
+  "Noel",
+  "Nolan",
+  "Norbert",
+  "Norberto",
+  "Norman",
+  "Normand",
+  "Norris",
+  "Norton",
+  "Norval",
+  "Norwood",
+  "Nunzio",
+  "Oakley",
+  "Obie",
+  "Ocie",
+  "Octavio",
+  "Odell",
+  "Odie",
+  "Odis",
+  "Okey",
+  "Olaf",
+  "Olan",
+  "Ole",
+  "Olen",
+  "Olin",
+  "Oliver",
+  "Ollie",
+  "Omar",
+  "Omari",
+  "Omer",
+  "Oneal",
+  "Ora",
+  "Oral",
+  "Oran",
+  "Oren",
+  "Orie",
+  "Orin",
+  "Orion",
+  "Orland",
+  "Orlando",
+  "Orlo",
+  "Orrin",
+  "Orval",
+  "Orvil",
+  "Orville",
+  "Osborne",
+  "Oscar",
+  "Osvaldo",
+  "Oswald",
+  "Otha",
+  "Otho",
+  "Otis",
+  "Ottis",
+  "Otto",
+  "Owen",
+  "Pablo",
+  "Palmer",
+  "Paris",
+  "Parker",
+  "Parrish",
+  "Pascual",
+  "Pasquale",
+  "Pat",
+  "Patricia",
+  "Patrick",
+  "Patsy",
+  "Paul",
+  "Paxton",
+  "Payton",
+  "Pearl",
+  "Pedro",
+  "Percival",
+  "Percy",
+  "Pernell",
+  "Perry",
+  "Pershing",
+  "Pete",
+  "Peter",
+  "Peyton",
+  "Phil",
+  "Philip",
+  "Phillip",
+  "Phoenix",
+  "Pierce",
+  "Pierre",
+  "Pietro",
+  "Pink",
+  "Porfirio",
+  "Porter",
+  "Preston",
+  "Price",
+  "Primitivo",
+  "Prince",
+  "Quentin",
+  "Quincy",
+  "Quinn",
+  "Quinten",
+  "Quintin",
+  "Quinton",
+  "Radames",
+  "Raekwon",
+  "Rafael",
+  "Raheem",
+  "Rahsaan",
+  "Rahul",
+  "Raleigh",
+  "Ralph",
+  "Ramiro",
+  "Ramon",
+  "Ramsey",
+  "Rand",
+  "Randal",
+  "Randall",
+  "Randel",
+  "Randell",
+  "Randle",
+  "Randolph",
+  "Randy",
+  "Ransom",
+  "Raoul",
+  "Raphael",
+  "Rashad",
+  "Rashawn",
+  "Rasheed",
+  "Raul",
+  "Raven",
+  "Ray",
+  "Rayburn",
+  "Rayford",
+  "Raymon",
+  "Raymond",
+  "Raymundo",
+  "Raynard",
+  "Rayshawn",
+  "Reagan",
+  "Reece",
+  "Reed",
+  "Reese",
+  "Refugio",
+  "Reggie",
+  "Reginal",
+  "Reginald",
+  "Regis",
+  "Reid",
+  "Reilly",
+  "Reinaldo",
+  "Reinhold",
+  "Reino",
+  "Remington",
+  "Rene",
+  "Reno",
+  "Reuben",
+  "Rex",
+  "Rexford",
+  "Rey",
+  "Reyes",
+  "Reynaldo",
+  "Reynold",
+  "Rhett",
+  "Ricardo",
+  "Rich",
+  "Richard",
+  "Richie",
+  "Richmond",
+  "Rick",
+  "Rickey",
+  "Ricki",
+  "Rickie",
+  "Ricky",
+  "Rico",
+  "Ridge",
+  "Rigoberto",
+  "Riley",
+  "Ritchie",
+  "River",
+  "Rob",
+  "Robb",
+  "Robbie",
+  "Robby",
+  "Robert",
+  "Roberto",
+  "Robin",
+  "Rocco",
+  "Rock",
+  "Rocky",
+  "Rod",
+  "Roderick",
+  "Rodger",
+  "Rodney",
+  "Rodolfo",
+  "Rodrick",
+  "Rodrigo",
+  "Roel",
+  "Rogelio",
+  "Roger",
+  "Rogers",
+  "Rohan",
+  "Roland",
+  "Rolando",
+  "Rolf",
+  "Rolla",
+  "Rolland",
+  "Rollie",
+  "Rollin",
+  "Roman",
+  "Romeo",
+  "Ron",
+  "Ronald",
+  "Ronaldo",
+  "Ronnie",
+  "Ronny",
+  "Roosevelt",
+  "Rory",
+  "Rosario",
+  "Roscoe",
+  "Rose",
+  "Rosendo",
+  "Rosevelt",
+  "Ross",
+  "Roswell",
+  "Rowan",
+  "Rowland",
+  "Roy",
+  "Royal",
+  "Royce",
+  "Ruben",
+  "Rubin",
+  "Ruby",
+  "Rudolf",
+  "Rudolph",
+  "Rudy",
+  "Rueben",
+  "Rufus",
+  "Rupert",
+  "Russ",
+  "Russel",
+  "Russell",
+  "Rusty",
+  "Ruth",
+  "Ryan",
+  "Ryder",
+  "Rylan",
+  "Ryne",
+  "Sage",
+  "Sal",
+  "Salvador",
+  "Salvatore",
+  "Sam",
+  "Samir",
+  "Sammie",
+  "Sammy",
+  "Samson",
+  "Samuel",
+  "Sandra",
+  "Sandy",
+  "Sanford",
+  "Santiago",
+  "Santo",
+  "Santos",
+  "Sarah",
+  "Saul",
+  "Savion",
+  "Sawyer",
+  "Schuyler",
+  "Scot",
+  "Scott",
+  "Scottie",
+  "Scotty",
+  "Seamus",
+  "Sean",
+  "Sebastian",
+  "Sedrick",
+  "Selmer",
+  "Semaj",
+  "Sergio",
+  "Seth",
+  "Seymour",
+  "Shad",
+  "Shamar",
+  "Shane",
+  "Shannon",
+  "Shanon",
+  "Shaquille",
+  "Sharon",
+  "Shaun",
+  "Shawn",
+  "Shay",
+  "Shayne",
+  "Shea",
+  "Shelby",
+  "Sheldon",
+  "Shelton",
+  "Shemar",
+  "Sherman",
+  "Sherrill",
+  "Sherwin",
+  "Sherwood",
+  "Shirley",
+  "Shon",
+  "Sid",
+  "Sidney",
+  "Sigmund",
+  "Sigurd",
+  "Silas",
+  "Silvio",
+  "Sim",
+  "Simeon",
+  "Simon",
+  "Sixto",
+  "Skylar",
+  "Skyler",
+  "Smith",
+  "Sol",
+  "Solomon",
+  "Solon",
+  "Sonny",
+  "Spencer",
+  "Spenser",
+  "Stacey",
+  "Stacy",
+  "Stan",
+  "Stanford",
+  "Stanley",
+  "Stanton",
+  "Stefan",
+  "Stephan",
+  "Stephanie",
+  "Stephen",
+  "Stephon",
+  "Sterling",
+  "Stetson",
+  "Stevan",
+  "Steve",
+  "Steven",
+  "Stevie",
+  "Stewart",
+  "Stone",
+  "Stoney",
+  "Storm",
+  "Stuart",
+  "Sumner",
+  "Susan",
+  "Sven",
+  "Sydney",
+  "Syed",
+  "Sylvan",
+  "Sylvester",
+  "Tad",
+  "Tahj",
+  "Taj",
+  "Talmadge",
+  "Talon",
+  "Tammy",
+  "Tanner",
+  "Tarik",
+  "Tariq",
+  "Tate",
+  "Taurean",
+  "Tavares",
+  "Tavian",
+  "Tavion",
+  "Tavon",
+  "Tayler",
+  "Taylor",
+  "Ted",
+  "Teddy",
+  "Telly",
+  "Teodoro",
+  "Terence",
+  "Terrance",
+  "Terrell",
+  "Terrence",
+  "Terrill",
+  "Terry",
+  "Tevin",
+  "Thad",
+  "Thaddeus",
+  "Theadore",
+  "Theo",
+  "Theodore",
+  "Theron",
+  "Thomas",
+  "Thornton",
+  "Thurman",
+  "Thurston",
+  "Tillman",
+  "Tim",
+  "Timmie",
+  "Timmothy",
+  "Timmy",
+  "Timothy",
+  "Tito",
+  "Titus",
+  "Tobias",
+  "Tobin",
+  "Toby",
+  "Tod",
+  "Todd",
+  "Tom",
+  "Tomas",
+  "Tommie",
+  "Tommy",
+  "Toney",
+  "Tony",
+  "Torey",
+  "Torrance",
+  "Torrey",
+  "Tory",
+  "Toy",
+  "Trace",
+  "Tracey",
+  "Tracy",
+  "Trae",
+  "Travis",
+  "Travon",
+  "Tre",
+  "Tremaine",
+  "Tremayne",
+  "Trent",
+  "Trenton",
+  "Trever",
+  "Trevin",
+  "Trevion",
+  "Trevon",
+  "Trevor",
+  "Trey",
+  "Treyvon",
+  "Trinidad",
+  "Trinity",
+  "Tristan",
+  "Tristen",
+  "Tristian",
+  "Tristin",
+  "Triston",
+  "Troy",
+  "Truman",
+  "Trystan",
+  "Tucker",
+  "Turner",
+  "Ty",
+  "Tyler",
+  "Tylor",
+  "Tyquan",
+  "Tyree",
+  "Tyreek",
+  "Tyreese",
+  "Tyrek",
+  "Tyreke",
+  "Tyrel",
+  "Tyrell",
+  "Tyrese",
+  "Tyrik",
+  "Tyriq",
+  "Tyrique",
+  "Tyron",
+  "Tyrone",
+  "Tyshawn",
+  "Tyson",
+  "Ulises",
+  "Ulysses",
+  "Urban",
+  "Uriah",
+  "Uriel",
+  "Val",
+  "Valentin",
+  "Valentine",
+  "Van",
+  "Vance",
+  "Vaughn",
+  "Vergil",
+  "Verl",
+  "Verlin",
+  "Vern",
+  "Verne",
+  "Vernell",
+  "Verner",
+  "Vernie",
+  "Vernon",
+  "Vester",
+  "Vicente",
+  "Victor",
+  "Vidal",
+  "Vince",
+  "Vincent",
+  "Vincenzo",
+  "Vinson",
+  "Virgil",
+  "Virgilio",
+  "Virginia",
+  "Vito",
+  "Vivian",
+  "Vladimir",
+  "Von",
+
+
+  "Wade",
+  "Waino",
+  "Waldemar",
+  "Waldo",
+  "Walker",
+  "Wallace",
+  "Wally",
+  "Walter",
+  "Walton",
+  "Ward",
+  "Wardell",
+  "Warner",
+  "Warren",
+  "Washington",
+  "Watson",
+  "Wayland",
+  "Waylon",
+  "Waymon",
+  "Wayne",
+  "Webster",
+  "Weldon",
+  "Wellington",
+  "Welton",
+  "Wendell",
+  "Werner",
+  "Wes",
+  "Wesley",
+  "Westley",
+  "Weston",
+  "Wheeler",
+  "Whitney",
+  "Wilber",
+  "Wilbert",
+  "Wilbur",
+  "Wilburn",
+  "Wiley",
+  "Wilford",
+  "Wilfred",
+  "Wilfredo",
+  "Wilfrid",
+  "Wilhelm",
+  "Will",
+  "Willard",
+  "William",
+  "Williams",
+  "Willian",
+  "Willie",
+  "Willis",
+  "Willy",
+  "Wilmer",
+  "Wilson",
+  "Wilton",
+  "Windell",
+  "Winfield",
+  "Winford",
+  "Winfred",
+  "Winston",
+  "Winton",
+  "Wm",
+  "Woodrow",
+  "Woody",
+  "Worth",
+  "Wyatt",
+  "Wylie",
+  "Wyman",
+  "Xander",
+  "Xavier",
+  "Yosef",
+  "Zachariah",
+  "Zachary",
+  "Zachery",
+  "Zack",
+  "Zackary",
+  "Zackery",
+  "Zaire",
+  "Zakary",
+  "Zane",
+  "Zechariah",
+  "Zigmund",
+  "Zion",
+  "Aaliyah",
+  "Abagail",
+  "Abbey",
+  "Abbie",
+  "Abbigail",
+  "Abby",
+  "Abigail",
+  "Abigale",
+  "Abigayle",
+  "Abril",
+  "Ada",
+  "Adah",
+  "Adaline",
+  "Addie",
+  "Addison",
+  "Adela",
+  "Adelaida",
+  "Adelaide",
+  "Adele",
+  "Adelia",
+  "Adelina",
+  "Adeline",
+  "Adell",
+  "Adella",
+  "Adelle",
+  "Adrian",
+  "Adriana",
+  "Adriane",
+  "Adrianna",
+  "Adrianne",
+  "Adrienne",
+  "Afton",
+  "Agatha",
+  "Agnes",
+  "Agustina",
+  "Aida",
+  "Aileen",
+  "Aimee",
+  "Aisha",
+  "Aiyana",
+  "Aja",
+  "Alaina",
+  "Alana",
+  "Alanis",
+  "Alanna",
+  "Alayna",
+  "Alba",
+  "Alberta",
+  "Albertha",
+  "Albertine",
+  "Albina",
+  "Alda",
+  "Aleah",
+  "Alecia",
+  "Aleen",
+  "Alejandra",
+  "Alejandrin",
+  "Alena",
+  "Alene",
+  "Alesha",
+  "Alesia",
+  "Alessandra",
+  "Aleta",
+  "Aletha",
+  "Alex",
+  "Alexa",
+  "Alexander",
+  "Alexandra",
+  "Alexandrea",
+  "Alexandria",
+  "Alexia",
+  "Alexis",
+  "Alexus",
+  "Alexys",
+  "Alfreda",
+  "Ali",
+  "Alia",
+  "Alice",
+  "Alicia",
+  "Alida",
+  "Alina",
+  "Aline",
+  "Alisa",
+  "Alisha",
+  "Alison",
+  "Alissa",
+  "Alivia",
+  "Aliya",
+  "Aliyah",
+  "Alize",
+  "Allene",
+  "Allie",
+  "Alline",
+  "Allison",
+  "Ally",
+  "Allyson",
+  "Allyssa",
+  "Alma",
+  "Almeda",
+  "Almeta",
+  "Almira",
+  "Alondra",
+  "Alpha",
+  "Alta",
+  "Altagracia",
+  "Altha",
+  "Althea",
+  "Alva",
+  "Alvena",
+  "Alvera",
+  "Alverta",
+  "Alvina",
+  "Alyce",
+  "Alycia",
+  "Alysa",
+  "Alyse",
+  "Alysha",
+  "Alysia",
+  "Alyson",
+  "Alyssa",
+  "Alyssia",
+  "Amalia",
+  "Amanda",
+  "Amani",
+  "Amari",
+  "Amaya",
+  "Amber",
+  "Amelia",
+  "America",
+  "Ami",
+  "Amie",
+  "Amira",
+  "Amparo",
+  "Amy",
+  "Ana",
+  "Anabel",
+  "Anahi",
+  "Anais",
+  "Anastasia",
+  "Andrea",
+  "Andrew",
+  "Andria",
+  "Angel",
+  "Angela",
+  "Angelia",
+  "Angelica",
+  "Angelina",
+  "Angeline",
+  "Angelique",
+  "Angelita",
+  "Angie",
+  "Anika",
+  "Anissa",
+  "Anita",
+  "Anitra",
+  "Aniya",
+  "Aniyah",
+  "Anjanette",
+  "Anjelica",
+  "Ann",
+  "Anna",
+  "Annabel",
+  "Annabell",
+  "Annabelle",
+  "Annamae",
+  "Annamarie",
+  "Anne",
+  "Annemarie",
+  "Annetta",
+  "Annette",
+  "Annie",
+  "Annika",
+  "Annis",
+  "Annmarie",
+  "Ansley",
+  "Anthony",
+  "Antionette",
+  "Antoinette",
+  "Antonetta",
+  "Antonette",
+  "Antonia",
+  "Antonietta",
+  "Antonina",
+  "Anya",
+  "April",
+  "Ara",
+  "Araceli",
+  "Ardell",
+  "Ardella",
+  "Ardis",
+  "Ardith",
+  "Aretha",
+  "Ariana",
+  "Arianna",
+  "Ariel",
+  "Arielle",
+  "Arleen",
+  "Arlene",
+  "Arlie",
+  "Arline",
+  "Armani",
+  "Armida",
+  "Arrie",
+  "Arthur",
+  "Artie",
+  "Arvilla",
+  "Asha",
+  "Ashanti",
+  "Ashely",
+  "Ashlee",
+  "Ashleigh",
+  "Ashley",
+  "Ashli",
+  "Ashlie",
+  "Ashly",
+  "Ashlyn",
+  "Ashlynn",
+  "Ashton",
+  "Ashtyn",
+  "Asia",
+  "Aspen",
+  "Assunta",
+  "Astrid",
+  "Athena",
+  "Aubree",
+  "Aubrey",
+  "Audie",
+  "Audra",
+  "Audrey",
+  "Audry",
+  "Augusta",
+  "Augustine",
+  "Aurea",
+  "Aurelia",
+  "Aurora",
+  "Aurore",
+  "Autumn",
+  "Ava",
+  "Avery",
+  "Avis",
+  "Awilda",
+  "Ayana",
+  "Ayanna",
+  "Ayla",
+  "Aylin",
+  "Bailee",
+  "Bailey",
+  "Bambi",
+  "Barb",
+  "Barbara",
+  "Barbra",
+  "Baylee",
+  "Beatrice",
+  "Beatriz",
+  "Beaulah",
+  "Becky",
+  "Belinda",
+  "Bell",
+  "Bella",
+  "Belle",
+  "Belva",
+  "Benita",
+  "Bennie",
+  "Berenice",
+  "Bernadette",
+  "Bernadine",
+  "Bernardine",
+  "Berneice",
+  "Bernice",
+  "Berniece",
+  "Bernita",
+  "Berta",
+  "Bertha",
+  "Bertie",
+  "Beryl",
+  "Bess",
+  "Bessie",
+  "Beth",
+  "Bethany",
+  "Bethel",
+  "Betsy",
+  "Bette",
+  "Bettie",
+  "Bettina",
+  "Betty",
+  "Bettye",
+  "Beulah",
+  "Beverlee",
+  "Beverley",
+  "Beverly",
+  "Bianca",
+  "Billie",
+  "Billy",
+  "Billye",
+  "Birdie",
+  "Blair",
+  "Blanca",
+  "Blanch",
+  "Blanche",
+  "Blossom",
+  "Bobbi",
+  "Bobbie",
+  "Bobby",
+  "Bobbye",
+  "Bonita",
+  "Bonnie",
+  "Bonny",
+  "Brandee",
+  "Brandi",
+  "Brandie",
+  "Brandon",
+  "Brandy",
+  "Brea",
+  "Breana",
+  "Breann",
+  "Breanna",
+  "Breanne",
+  "Bree",
+  "Brenda",
+  "Brenna",
+  "Breonna",
+  "Bria",
+  "Brian",
+  "Briana",
+  "Brianna",
+  "Brianne",
+  "Bridget",
+  "Bridgett",
+  "Bridgette",
+  "Bridie",
+  "Brielle",
+  "Brigette",
+  "Brigitte",
+  "Brionna",
+  "Britany",
+  "Britney",
+  "Britni",
+  "Brittani",
+  "Brittanie",
+  "Brittany",
+  "Brittney",
+  "Brittni",
+  "Brittny",
+  "Brook",
+  "Brooke",
+  "Brooklyn",
+  "Brooklynn",
+  "Brunilda",
+  "Bryana",
+  "Bryanna",
+  "Bryn",
+  "Brynn",
+  "Buffy",
+  "Bulah",
+  "Burnice",
+  "Caitlin",
+  "Caitlyn",
+  "Caitlynn",
+  "Caleigh",
+  "Cali",
+  "Calista",
+  "Callie",
+  "Cameron",
+  "Camila",
+  "Camilla",
+  "Camille",
+  "Camryn",
+  "Candace",
+  "Candi",
+  "Candice",
+  "Candida",
+  "Candis",
+  "Candy",
+  "Cara",
+  "Caren",
+  "Carey",
+  "Cari",
+  "Carie",
+  "Carina",
+  "Carisa",
+  "Carissa",
+  "Carl",
+  "Carla",
+  "Carlee",
+  "Carleen",
+  "Carlene",
+  "Carley",
+  "Carli",
+  "Carlie",
+  "Carlotta",
+  "Carly",
+  "Carma",
+  "Carmel",
+  "Carmela",
+  "Carmelita",
+  "Carmella",
+  "Carmen",
+  "Carol",
+  "Carolann",
+  "Carole",
+  "Carolee",
+  "Carolina",
+  "Caroline",
+  "Carolyn",
+  "Carolynn",
+  "Caron",
+  "Carri",
+  "Carrie",
+  "Carrol",
+  "Carroll",
+  "Carson",
+  "Cary",
+  "Caryl",
+  "Caryn",
+  "Casandra",
+  "Casey",
+  "Casie",
+  "Cassandra",
+  "Cassidy",
+  "Cassie",
+  "Catalina",
+  "Caterina",
+  "Catharine",
+  "Catherine",
+  "Cathey",
+  "Cathi",
+  "Cathie",
+  "Cathleen",
+  "Cathrine",
+  "Cathryn",
+  "Cathy",
+  "Catina",
+  "Catrina",
+  "Cayla",
+  "Cecelia",
+  "Cecil",
+  "Cecile",
+  "Cecilia",
+  "Ceil",
+  "Celeste",
+  "Celestine",
+  "Celia",
+  "Celina",
+  "Celine",
+  "Chana",
+  "Chanda",
+  "Chandler",
+  "Chandra",
+  "Chanel",
+  "Chanelle",
+  "Chantal",
+  "Chantel",
+  "Chantelle",
+  "Charissa",
+  "Charisse",
+  "Charity",
+  "Charla",
+  "Charleen",
+  "Charlene",
+  "Charles",
+  "Charlie",
+  "Charline",
+  "Charlotte",
+  "Charmaine",
+  "Charolette",
+  "Chase",
+  "Chasity",
+  "Chastity",
+  "Chaya",
+  "Chelsea",
+  "Chelsey",
+  "Chelsi",
+  "Chelsie",
+  "Cheri",
+  "Cherie",
+  "Cherise",
+  "Cherish",
+  "Cherri",
+  "Cherry",
+  "Cheryl",
+  "Cheryle",
+  "Cheyanne",
+  "Cheyenne",
+  "China",
+  "Chiquita",
+  "Chloe",
+  "Chris",
+  "Chrissy",
+  "Christa",
+  "Christal",
+  "Christeen",
+  "Christel",
+  "Christen",
+  "Christene",
+  "Christi",
+  "Christian",
+  "Christiana",
+  "Christie",
+  "Christin",
+  "Christina",
+  "Christine",
+  "Christophe",
+  "Christy",
+  "Chrystal",
+  "Chyna",
+  "Ciara",
+  "Ciera",
+  "Cierra",
+  "Cinda",
+  "Cindi",
+  "Cindy",
+  "Citlalli",
+  "Claire",
+  "Clara",
+  "Clarabelle",
+  "Clare",
+  "Claribel",
+  "Clarice",
+  "Clarine",
+  "Clarissa",
+  "Claudette",
+  "Claudia",
+  "Claudie",
+  "Claudine",
+  "Clementina",
+  "Clementine",
+  "Clemmie",
+  "Cleo",
+  "Cleora",
+  "Cleta",
+  "Clotilde",
+  "Clyde",
+  "Cody",
+  "Coleen",
+  "Colette",
+  "Colleen",
+  "Collette",
+  "Concepcion",
+  "Concetta",
+  "Connie",
+  "Constance",
+  "Consuelo",
+  "Cora",
+  "Coral",
+  "Cordelia",
+  "Cordia",
+  "Cordie",
+  "Corene",
+  "Corey",
+  "Cori",
+  "Corina",
+  "Corine",
+  "Corinna",
+  "Corinne",
+  "Corliss",
+  "Cornelia",
+  "Corrie",
+  "Corrine",
+  "Cortney",
+  "Cory",
+  "Courtney",
+  "Creola",
+  "Crissy",
+  "Cristal",
+  "Cristin",
+  "Cristina",
+  "Cristy",
+  "Cruz",
+  "Crystal",
+  "Cydney",
+  "Cyndi",
+  "Cynthia",
+  "Dagmar",
+  "Dagny",
+  "Daija",
+  "Daisha",
+  "Daisy",
+  "Dakota",
+  "Dale",
+  "Dalia",
+  "Dallas",
+  "Damaris",
+  "Dana",
+  "Danelle",
+  "Danette",
+  "Danica",
+  "Daniel",
+  "Daniela",
+  "Daniella",
+  "Danielle",
+  "Danita",
+  "Danna",
+  "Danyelle",
+  "Daphne",
+  "Dara",
+  "Darby",
+  "Darci",
+  "Darcie",
+  "Darcy",
+  "Daria",
+  "Darian",
+  "Darla",
+  "Darleen",
+  "Darlene",
+  "Darline",
+  "Daryl",
+  "Dasia",
+  "David",
+  "Davina",
+  "Dawn",
+  "Dawna",
+  "Dayna",
+  "Dean",
+  "Deana",
+  "Deann",
+  "Deanna",
+  "Deanne",
+  "Deasia",
+  "Debbi",
+  "Debbie",
+  "Debbra",
+  "Debby",
+  "Debi",
+  "Debora",
+  "Deborah",
+  "Debra",
+  "Debrah",
+  "Dedra",
+  "Dee",
+  "Deedee",
+  "Deena",
+  "Deidra",
+  "Deidre",
+  "Deirdre",
+  "Deja",
+  "Dejah",
+  "Delaney",
+  "Delfina",
+  "Delia",
+  "Delilah",
+  "Delisa",
+  "Dell",
+  "Della",
+  "Delma",
+  "Delois",
+  "Delores",
+  "Deloris",
+  "Delpha",
+  "Delphia",
+  "Delphine",
+  "Delta",
+  "Demetria",
+  "Demi",
+  "Dena",
+  "Deneen",
+  "Denice",
+  "Denise",
+  "Denisse",
+  "Desirae",
+  "Desiree",
+  "Dessie",
+  "Destany",
+  "Destinee",
+  "Destiney",
+  "Destini",
+  "Destiny",
+  "Devan",
+  "Devin",
+  "Devon",
+  "Devyn",
+  "Diamond",
+  "Dian",
+  "Diana",
+  "Diane",
+  "Diann",
+  "Dianna",
+  "Dianne",
+  "Dimple",
+  "Dina",
+  "Dinah",
+  "Dionne",
+  "Dixie",
+  "Dollie",
+  "Dolly",
+  "Dolores",
+  "Doloris",
+  "Domenica",
+  "Dominga",
+  "Dominique",
+  "Dominque",
+  "Domonique",
+  "Dona",
+  "Donald",
+  "Donita",
+  "Donna",
+  "Donnie",
+  "Dora",
+  "Dorathy",
+  "Dorcas",
+  "Doreen",
+  "Dorene",
+  "Doretha",
+  "Dori",
+  "Dorinda",
+  "Dorine",
+  "Doris",
+  "Dorotha",
+  "Dorothea",
+  "Dorothy",
+  "Dorris",
+  "Dortha",
+  "Dorthy",
+  "Dottie",
+  "Dovie",
+  "Drew",
+  "Drucilla",
+  "Dulce",
+  "Earlene",
+  "Earline",
+  "Earnestine",
+  "Easter",
+  "Ebba",
+  "Eboni",
+  "Ebony",
+  "Eda",
+  "Eddie",
+  "Eden",
+  "Edie",
+  "Edith",
+  "Edna",
+  "Edrie",
+  "Edward",
+  "Edwina",
+  "Edyth",
+  "Edythe",
+  "Effie",
+  "Eileen",
+  "Elaina",
+  "Elaine",
+  "Elayne",
+  "Elba",
+  "Elda",
+  "Eldora",
+  "Eleanor",
+  "Eleanora",
+  "Eleanore",
+  "Elease",
+  "Electa",
+  "Elena",
+  "Elenor",
+  "Elenora",
+  "Elfrieda",
+  "Eliana",
+  "Elida",
+  "Elinor",
+  "Elinore",
+  "Elisa",
+  "Elisabeth",
+  "Elise",
+  "Elisha",
+  "Elissa",
+  "Eliza",
+  "Elizabeth",
+  "Ella",
+  "Ellamae",
+  "Ellen",
+  "Ellie",
+  "Elma",
+  "Elmira",
+  "Elna",
+  "Elnora",
+  "Elois",
+  "Eloisa",
+  "Eloise",
+  "Elouise",
+  "Elsa",
+  "Else",
+  "Elsie",
+  "Elta",
+  "Elva",
+  "Elvera",
+  "Elvia",
+  "Elvie",
+  "Elvira",
+  "Elyse",
+  "Elyssa",
+  "Elza",
+  "Emelia",
+  "Emely",
+  "Emerald",
+  "Emilee",
+  "Emilia",
+  "Emilie",
+  "Emily",
+  "Emma",
+  "Emmalee",
+  "Emmie",
+  "Emmy",
+  "Emogene",
+  "Ena",
+  "Enid",
+  "Enola",
+  "Enriqueta",
+  "Era",
+  "Eric",
+  "Erica",
+  "Ericka",
+  "Erika",
+  "Erin",
+  "Eris",
+  "Erlene",
+  "Erlinda",
+  "Erma",
+  "Erna",
+  "Ernestina",
+  "Ernestine",
+  "Erykah",
+  "Eryn",
+  "Esmeralda",
+  "Esperanza",
+  "Essence",
+  "Essie",
+  "Esta",
+  "Estefania",
+  "Estela",
+  "Estell",
+  "Estella",
+  "Estelle",
+  "Ester",
+  "Esther",
+  "Estrella",
+  "Etha",
+  "Ethel",
+  "Ethelene",
+  "Ethelyn",
+  "Ethyl",
+  "Etta",
+  "Ettie",
+  "Eudora",
+  "Eugenia",
+  "Eugenie",
+  "Eula",
+  "Eulah",
+  "Eulalia",
+  "Euna",
+  "Eunice",
+  "Eura",
+  "Eva",
+  "Evalyn",
+  "Evangelina",
+  "Evangeline",
+  "Eve",
+  "Eveline",
+  "Evelyn",
+  "Evelyne",
+  "Evette",
+  "Evie",
+  "Evon",
+  "Evonne",
+  "Exie",
+  "Fabiola",
+  "Fae",
+  "Fairy",
+  "Faith",
+  "Fallon",
+  "Fannie",
+  "Fanny",
+  "Farrah",
+  "Fatima",
+  "Fay",
+  "Faye",
+  "Felecia",
+  "Felicia",
+  "Felicita",
+  "Felicity",
+  "Felipa",
+  "Felisha",
+  "Fern",
+  "Fernanda",
+  "Ferne",
+  "Filomena",
+  "Fiona",
+  "Fleta",
+  "Flo",
+  "Flora",
+  "Florence",
+  "Florene",
+  "Florida",
+  "Florine",
+  "Florrie",
+  "Flossie",
+  "Floy",
+  "Fonda",
+  "Fran",
+  "Frances",
+  "Francesca",
+  "Franchesca",
+  "Francheska",
+  "Francine",
+  "Francis",
+  "Francisca",
+  "Frank",
+  "Frankie",
+  "Freda",
+  "Freddie",
+  "Freeda",
+  "Freida",
+  "Frida",
+  "Frieda",
+  "Gabriel",
+  "Gabriela",
+  "Gabriella",
+  "Gabrielle",
+  "Gail",
+  "Gale",
+  "Garnet",
+  "Garnett",
+  "Gary",
+  "Gay",
+  "Gaye",
+  "Gayla",
+  "Gayle",
+  "Gaynell",
+  "Gearldine",
+  "Gena",
+  "Gene",
+  "Genesis",
+  "Geneva",
+  "Genevieve",
+  "Genoveva",
+  "George",
+  "Georgene",
+  "Georgette",
+  "Georgia",
+  "Georgiana",
+  "Georgianna",
+  "Georgie",
+  "Georgina",
+  "Georgine",
+  "Geraldine",
+  "Geralyn",
+  "Gerda",
+  "Geri",
+  "Germaine",
+  "Gerri",
+  "Gerry",
+  "Gertie",
+  "Gertrude",
+  "Gianna",
+  "Gigi",
+  "Gilda",
+  "Gillian",
+  "Gina",
+  "Ginger",
+  "Ginny",
+  "Giovanna",
+  "Giselle",
+  "Gisselle",
+  "Gladyce",
+  "Gladys",
+  "Glenda",
+  "Glenna",
+  "Glennie",
+  "Glinda",
+  "Gloria",
+  "Glynda",
+  "Glynis",
+  "Golda",
+  "Golden",
+  "Goldia",
+  "Goldie",
+  "Grace",
+  "Gracie",
+  "Graciela",
+  "Grayce",
+  "Gregoria",
+  "Greta",
+  "Gretchen",
+  "Griselda",
+  "Guadalupe",
+  "Gudrun",
+  "Guillermin",
+  "Gussie",
+  "Gwen",
+  "Gwendolyn",
+  "Hadley",
+  "Hailee",
+  "Hailey",
+  "Haleigh",
+  "Haley",
+  "Hali",
+  "Halie",
+  "Halle",
+  "Hallie",
+  "Hana",
+  "Hanna",
+  "Hannah",
+  "Harlene",
+  "Harley",
+  "Harmony",
+  "Harold",
+  "Harriet",
+  "Harriett",
+  "Harriette",
+  "Hassie",
+  "Hattie",
+  "Haven",
+  "Haydee",
+  "Hayden",
+  "Haylee",
+  "Hayley",
+  "Haylie",
+  "Hazel",
+  "Hazle",
+  "Heather",
+  "Heaven",
+  "Hedwig",
+  "Heidi",
+  "Helen",
+  "Helena",
+  "Helene",
+  "Helga",
+  "Hellen",
+  "Henrietta",
+  "Henriette",
+  "Henry",
+  "Hermina",
+  "Hermine",
+  "Herminia",
+  "Herta",
+  "Hertha",
+  "Hester",
+  "Hettie",
+  "Hilary",
+  "Hilda",
+  "Hildegard",
+  "Hildegarde",
+  "Hildred",
+  "Hildur",
+  "Hillary",
+  "Hilma",
+  "Holli",
+  "Hollie",
+  "Holly",
+  "Hope",
+  "Hortencia",
+  "Hortense",
+  "Hortensia",
+  "Hulda",
+  "Hunter",
+  "Icie",
+  "Ida",
+  "Idell",
+  "Idella",
+  "Iesha",
+  "Ila",
+  "Ileana",
+  "Ilene",
+  "Iliana",
+  "Ima",
+  "Imani",
+  "Imelda",
+  "Imogene",
+  "Ina",
+  "India",
+  "Ines",
+  "Inez",
+  "Infant",
+  "Inga",
+  "Ingeborg",
+  "Ingrid",
+  "Iola",
+  "Iona",
+  "Ione",
+  "Ira",
+  "Ireland",
+  "Irene",
+  "Iris",
+  "Irma",
+  "Isabel",
+  "Isabela",
+  "Isabell",
+  "Isabella",
+  "Isabelle",
+  "Isamar",
+  "Isis",
+  "Isobel",
+  "Itzel",
+  "Iva",
+  "Ivah",
+  "Ivana",
+  "Ivelisse",
+  "Ivette",
+  "Ivonne",
+  "Ivory",
+  "Ivy",
+  "Izabella",
+  "Izetta",
+  "Izora",
+  "Jacalyn",
+  "Jacey",
+  "Jack",
+  "Jackeline",
+  "Jackie",
+  "Jacklyn",
+  "Jaclyn",
+  "Jacque",
+  "Jacquelin",
+  "Jacqueline",
+  "Jacquelyn",
+  "Jacquline",
+  "Jada",
+  "Jade",
+  "Jaden",
+  "Jadyn",
+  "Jaelyn",
+  "Jaida",
+  "Jaiden",
+  "Jailene",
+  "Jaime",
+  "Jaimie",
+  "Jakayla",
+  "Jalisa",
+  "Jalyn",
+  "James",
+  "Jami",
+  "Jamie",
+  "Jamila",
+  "Jammie",
+  "Jan",
+  "Jana",
+  "Janae",
+  "Janay",
+  "Jane",
+  "Janeen",
+  "Janel",
+  "Janell",
+  "Janelle",
+  "Janessa",
+  "Janet",
+  "Janette",
+  "Janice",
+  "Janie",
+  "Janine",
+  "Janis",
+  "Jann",
+  "Janna",
+  "Jannette",
+  "Jannie",
+  "Jaqueline",
+  "Jasmin",
+  "Jasmine",
+  "Jasmyn",
+  "Jason",
+  "Jaunita",
+  "Jaycee",
+  "Jayda",
+  "Jayde",
+  "Jayden",
+  "Jayla",
+  "Jaylene",
+  "Jayme",
+  "Jayne",
+  "Jazlyn",
+  "Jazmin",
+  "Jazmine",
+  "Jazmyn",
+  "Jazmyne",
+  "Jean",
+  "Jeana",
+  "Jeane",
+  "Jeanette",
+  "Jeanie",
+  "Jeanine",
+  "Jeanna",
+  "Jeanne",
+  "Jeannette",
+  "Jeannie",
+  "Jeannine",
+  "Jena",
+  "Jenelle",
+  "Jenifer",
+  "Jenna",
+  "Jennie",
+  "Jennifer",
+  "Jenny",
+  "Jensen",
+  "Jeraldine",
+  "Jeri",
+  "Jerilyn",
+  "Jerline",
+  "Jerri",
+  "Jerrica",
+  "Jerrie",
+  "Jerry",
+  "Jesica",
+  "Jesse",
+  "Jessenia",
+  "Jessi",
+  "Jessica",
+  "Jessie",
+  "Jessika",
+  "Jesusa",
+  "Jettie",
+  "Jewel",
+  "Jewell",
+  "Jill",
+  "Jillian",
+  "Jimmie",
+  "Jo",
+  "Joan",
+  "Joana",
+  "Joanie",
+  "Joann",
+  "Joanna",
+  "Joanne",
+  "Jocelyn",
+  "Jocelyne",
+  "Jodi",
+  "Jodie",
+  "Jody",
+  "Joe",
+  "Joelle",
+  "Joellen",
+  "Joetta",
+  "Joey",
+  "Johanna",
+  "John",
+  "Johnie",
+  "Johnna",
+  "Johnnie",
+  "Jolene",
+  "Jonathan",
+  "Joni",
+  "Jonna",
+  "Jonnie",
+  "Jordan",
+  "Jordyn",
+  "Joretta",
+  "Josefa",
+  "Josefina",
+  "Joselyn",
+  "Joseph",
+  "Josephine",
+  "Josette",
+  "Joshua",
+  "Josie",
+  "Journey",
+  "Jovita",
+  "Joy",
+  "Joyce",
+  "Joycelyn",
+  "Juana",
+  "Juanita",
+  "Judi",
+  "Judie",
+  "Judith",
+  "Judy",
+  "Juli",
+  "Julia",
+  "Juliana",
+  "Juliann",
+  "Julianna",
+  "Julianne",
+  "Julie",
+  "Juliet",
+  "Juliette",
+  "Julissa",
+  "June",
+  "Justice",
+  "Justin",
+  "Justina",
+  "Justine",
+  "Kacey",
+  "Kaci",
+  "Kacie",
+  "Kacy",
+  "Kaela",
+  "Kaelyn",
+  "Kaila",
+  "Kailee",
+  "Kailey",
+  "Kailyn",
+  "Kaitlin",
+  "Kaitlyn",
+  "Kaitlynn",
+  "Kala",
+  "Kaleigh",
+  "Kaley",
+  "Kali",
+  "Kalie",
+  "Kallie",
+  "Kalyn",
+  "Kameron",
+  "Kami",
+  "Kamryn",
+  "Kandace",
+  "Kandi",
+  "Kandice",
+  "Kandy",
+  "Kara",
+  "Karan",
+  "Karen",
+  "Kari",
+  "Karie",
+  "Karin",
+  "Karina",
+  "Karissa",
+  "Karla",
+  "Karlee",
+  "Karlene",
+  "Karley",
+  "Karli",
+  "Karlie",
+  "Karly",
+  "Karol",
+  "Karolyn",
+  "Karon",
+  "Karren",
+  "Karri",
+  "Karrie",
+  "Karyn",
+  "Kasandra",
+  "Kasey",
+  "Kassandra",
+  "Kassidy",
+  "Kassie",
+  "Katarina",
+  "Kate",
+  "Katelin",
+  "Katelyn",
+  "Katelynn",
+  "Katerina",
+  "Kathaleen",
+  "Katharina",
+  "Katharine",
+  "Katherine",
+  "Katheryn",
+  "Kathi",
+  "Kathie",
+  "Kathleen",
+  "Kathlyn",
+  "Kathrine",
+  "Kathryn",
+  "Kathryne",
+  "Kathy",
+  "Kati",
+  "Katia",
+  "Katie",
+  "Katina",
+  "Katlin",
+  "Katlyn",
+  "Katlynn",
+  "Katrina",
+  "Kattie",
+  "Katy",
+  "Kay",
+  "Kaycee",
+  "Kaye",
+  "Kayla",
+  "Kaylah",
+  "Kaylan",
+  "Kaylee",
+  "Kayleigh",
+  "Kaylen",
+  "Kayley",
+  "Kayli",
+  "Kaylie",
+  "Kaylin",
+  "Kaylyn",
+  "Kaylynn",
+  "Keara",
+  "Kecia",
+  "Keeley",
+  "Keely",
+  "Keesha",
+  "Keila",
+  "Keisha",
+  "Keishla",
+  "Kelcie",
+  "Kelley",
+  "Kelli",
+  "Kellie",
+  "Kelly",
+  "Kelsea",
+  "Kelsey",
+  "Kelsi",
+  "Kelsie",
+  "Kendal",
+  "Kendall",
+  "Kendra",
+  "Kenia",
+  "Kenna",
+  "Kennedi",
+  "Kennedy",
+  "Kenneth",
+  "Kenya",
+  "Kenyatta",
+  "Kenzie",
+  "Keri",
+  "Kerri",
+  "Kerrie",
+  "Kerry",
+  "Kesha",
+  "Keshia",
+  "Kevin",
+  "Khadijah",
+  "Kia",
+  "Kiana",
+  "Kianna",
+  "Kiara",
+  "Kiarra",
+  "Kiera",
+  "Kierra",
+  "Kiersten",
+  "Kiley",
+  "Kim",
+  "Kimberlee",
+  "Kimberley",
+  "Kimberli",
+  "Kimberly",
+  "Kinsey",
+  "Kira",
+  "Kirsten",
+  "Kirstie",
+  "Kirstin",
+  "Kisha",
+  "Kittie",
+  "Kitty",
+  "Kizzy",
+  "Kori",
+  "Kortney",
+  "Kourtney",
+  "Kris",
+  "Krista",
+  "Kristal",
+  "Kristan",
+  "Kristen",
+  "Kristi",
+  "Kristian",
+  "Kristie",
+  "Kristin",
+  "Kristina",
+  "Kristine",
+  "Kristy",
+  "Kristyn",
+  "Krysta",
+  "Krystal",
+  "Krystina",
+  "Krystle",
+  "Kyara",
+  "Kyla",
+  "Kyle",
+  "Kylee",
+  "Kyleigh",
+  "Kylie",
+  "Kyra",
+  "Lacey",
+  "Laci",
+  "Lacie",
+  "Lacy",
+  "Ladonna",
+  "Lakeisha",
+  "Lakesha",
+  "Lakeshia",
+  "Lakisha",
+  "Lana",
+  "Lanette",
+  "Laquita",
+  "Lara",
+  "Laraine",
+  "Larissa",
+  "Larry",
+  "Larue",
+  "Lashanda",
+  "Lashawn",
+  "Lashonda",
+  "Latanya",
+  "Latasha",
+  "Latisha",
+  "Latonia",
+  "Latonya",
+  "Latosha",
+  "Latoya",
+  "Latrice",
+  "Latricia",
+  "Laura",
+  "Laureen",
+  "Laurel",
+  "Lauren",
+  "Lauretta",
+  "Laurette",
+  "Lauri",
+  "Laurie",
+  "Laurine",
+  "Lauryn",
+  "Lavada",
+  "Lavera",
+  "Lavern",
+  "Laverna",
+  "Laverne",
+  "Lavina",
+  "Lavinia",
+  "Lavon",
+  "Lavonne",
+  "Lawanda",
+  "Layla",
+  "Lea",
+  "Leah",
+  "Leandra",
+  "Leann",
+  "Leanna",
+  "Leanne",
+  "Leatha",
+  "Leatrice",
+  "Leda",
+  "Lee",
+  "Leeann",
+  "Leesa",
+  "Leigh",
+  "Leila",
+  "Leilani",
+  "Leisa",
+  "Lela",
+  "Lelah",
+  "Lelia",
+  "Lempi",
+  "Lena",
+  "Lenna",
+  "Lennie",
+  "Lenora",
+  "Lenore",
+  "Leola",
+  "Leona",
+  "Leone",
+  "Leonor",
+  "Leonora",
+  "Leonore",
+  "Leora",
+  "Leota",
+  "Lera",
+  "Lesa",
+  "Lesia",
+  "Lesley",
+  "Lesli",
+  "Leslie",
+  "Lesly",
+  "Lessie",
+  "Leta",
+  "Letha",
+  "Leticia",
+  "Letitia",
+  "Lettie",
+  "Lexi",
+  "Lexie",
+  "Lexis",
+  "Lexus",
+  "Lia",
+  "Liana",
+  "Libbie",
+  "Libby",
+  "Lida",
+  "Lidia",
+  "Lila",
+  "Lilia",
+  "Lilian",
+  "Liliana",
+  "Lilla",
+  "Lilliam",
+  "Lillian",
+  "Lillie",
+  "Lilly",
+  "Lily",
+  "Lilyan",
+  "Lina",
+  "Linda",
+  "Lindsay",
+  "Lindsey",
+  "Lindy",
+  "Linette",
+  "Linnea",
+  "Linnie",
+  "Linsey",
+  "Lisa",
+  "Lise",
+  "Lisette",
+  "Lisha",
+  "Lissa",
+  "Lissette",
+  "Liz",
+  "Liza",
+  "Lizabeth",
+  "Lizbeth",
+  "Lizeth",
+  "Lizette",
+  "Lizzie",
+  "Logan",
+  "Lois",
+  "Lola",
+  "Lolita",
+  "Loma",
+  "Lona",
+  "London",
+  "Loni",
+  "Lonie",
+  "Lonna",
+  "Lonnie",
+  "Lora",
+  "Loraine",
+  "Lorelei",
+  "Loren",
+  "Lorena",
+  "Lorene",
+  "Lorenza",
+  "Loretta",
+  "Lori",
+  "Loriann",
+  "Lorie",
+  "Lorine",
+  "Lorna",
+  "Lorraine",
+  "Lorri",
+  "Lorrie",
+  "Lottie",
+  "Lou",
+  "Louann",
+  "Louella",
+  "Louie",
+  "Louis",
+  "Louisa",
+  "Louise",
+  "Lourdes",
+  "Louvenia",
+  "Lovie",
+  "Loyce",
+  "Lu",
+  "Luana",
+  "Luann",
+  "Luanne",
+  "Lucero",
+  "Lucia",
+  "Lucie",
+  "Lucienne",
+  "Lucila",
+  "Lucile",
+  "Lucille",
+  "Lucinda",
+  "Lucretia",
+  "Lucy",
+  "Ludie",
+  "Lue",
+  "Luella",
+  "Luetta",
+  "Luisa",
+  "Lula",
+  "Lulu",
+  "Luna",
+  "Lupe",
+  "Lura",
+  "Lurline",
+  "Luvenia",
+  "Luz",
+  "Lyda",
+  "Lydia",
+  "Lyla",
+  "Lyn",
+  "Lynda",
+  "Lyndsay",
+  "Lyndsey",
+  "Lynette",
+  "Lynn",
+  "Lynne",
+  "Lynnette",
+  "Lynsey",
+  "Lyric",
+  "Mabel",
+  "Mabelle",
+  "Mable",
+  "Macey",
+  "Machelle",
+  "Maci",
+  "Macie",
+  "Mackenzie",
+  "Macy",
+  "Madaline",
+  "Madalyn",
+  "Maddison",
+  "Madeleine",
+  "Madeline",
+  "Madelyn",
+  "Madelynn",
+  "Madge",
+  "Madie",
+  "Madilyn",
+  "Madisen",
+  "Madison",
+  "Madisyn",
+  "Madonna",
+  "Madyson",
+  "Mae",
+  "Maegan",
+  "Maeve",
+  "Mafalda",
+  "Magdalen",
+  "Magdalena",
+  "Magdalene",
+  "Maggie",
+  "Magnolia",
+  "Maia",
+  "Maida",
+  "Maira",
+  "Makala",
+  "Makayla",
+  "Makenna",
+  "Makenzie",
+  "Malia",
+  "Malinda",
+  "Malissa",
+  "Mallie",
+  "Mallory",
+  "Malvina",
+  "Mamie",
+  "Mammie",
+  "Mandi",
+  "Mandy",
+  "Manuela",
+  "Mara",
+  "Maranda",
+  "Marcela",
+  "Marcelina",
+  "Marceline",
+  "Marcella",
+  "Marcelle",
+  "Marci",
+  "Marcia",
+  "Marcie",
+  "Marcy",
+  "Margaret",
+  "Margarete",
+  "Margarett",
+  "Margaretta",
+  "Margarette",
+  "Margarita",
+  "Marge",
+  "Margery",
+  "Margie",
+  "Margit",
+  "Margo",
+  "Margot",
+  "Margret",
+  "Marguerite",
+  "Margy",
+  "Mari",
+  "Maria",
+  "Mariah",
+  "Mariam",
+  "Marian",
+  "Mariana",
+  "Mariann",
+  "Marianna",
+  "Marianne",
+  "Maribel",
+  "Maribeth",
+  "Maricela",
+  "Marie",
+  "Mariel",
+  "Mariela",
+  "Marietta",
+  "Marilee",
+  "Marilou",
+  "Marilyn",
+  "Marilynn",
+  "Marina",
+  "Marion",
+  "Marisa",
+  "Marisela",
+  "Marisol",
+  "Marissa",
+  "Marita",
+  "Maritza",
+  "Marjorie",
+  "Marjory",
+  "Mark",
+  "Marla",
+  "Marlee",
+  "Marlena",
+  "Marlene",
+  "Marley",
+  "Marlo",
+  "Marlyn",
+  "Marlys",
+  "Marnie",
+  "Marquita",
+  "Marsha",
+  "Marta",
+  "Martha",
+  "Martina",
+  "Marva",
+  "Marvel",
+  "Mary",
+  "Maryann",
+  "Maryanne",
+  "Marybelle",
+  "Marybeth",
+  "Maryellen",
+  "Maryjane",
+  "Maryjo",
+  "Marylin",
+  "Marylou",
+  "Marylyn",
+  "Mathilda",
+  "Mathilde",
+  "Matilda",
+  "Matilde",
+  "Matthew",
+  "Mattie",
+  "Maud",
+  "Maude",
+  "Maudie",
+  "Maura",
+  "Maureen",
+  "Maurine",
+  "Mavis",
+  "Maxie",
+  "Maxine",
+  "May",
+  "Maya",
+  "Maybell",
+  "Maybelle",
+  "Maye",
+  "Mayme",
+  "Maymie",
+  "Mayra",
+  "Mazie",
+  "Mckayla",
+  "Mckenna",
+  "Mckenzie",
+  "Meagan",
+  "Meaghan",
+  "Mechelle",
+  "Meda",
+  "Meg",
+  "Megan",
+  "Meghan",
+  "Meghann",
+  "Melanie",
+  "Melba",
+  "Melina",
+  "Melinda",
+  "Melisa",
+  "Melissa",
+  "Mellie",
+  "Mellisa",
+  "Mellissa",
+  "Melodie",
+  "Melody",
+  "Melonie",
+  "Melva",
+  "Melvina",
+  "Meranda",
+  "Mercedes",
+  "Meredith",
+  "Merilyn",
+  "Merle",
+  "Merlene",
+  "Merry",
+  "Mertie",
+  "Meryl",
+  "Meta",
+  "Mia",
+  "Micaela",
+  "Micah",
+  "Michael",
+  "Michaela",
+  "Michele",
+  "Michelina",
+  "Michell",
+  "Michelle",
+  "Mickey",
+  "Mickie",
+  "Migdalia",
+  "Mikaela",
+  "Mikala",
+  "Mikayla",
+  "Milagros",
+  "Mildred",
+  "Millicent",
+  "Millie",
+  "Mimi",
+  "Mina",
+  "Mindi",
+  "Mindy",
+  "Minerva",
+  "Minna",
+  "Minnie",
+  "Miracle",
+  "Miranda",
+  "Mireya",
+  "Miriam",
+  "Mirta",
+  "Missouri",
+  "Missy",
+  "Misti",
+  "Misty",
+  "Mittie",
+  "Mitzi",
+  "Miya",
+  "Modesta",
+  "Moira",
+  "Mollie",
+  "Molly",
+  "Mona",
+  "Monica",
+  "Monika",
+  "Monique",
+  "Monserrate",
+  "Montana",
+  "Morgan",
+  "Moriah",
+  "Mossie",
+  "Mozell",
+  "Mozella",
+  "Mozelle",
+  "Muriel",
+  "Mya",
+  "Myah",
+  "Myra",
+  "Myranda",
+  "Myriam",
+  "Myrl",
+  "Myrle",
+  "Myrna",
+  "Myrtice",
+  "Myrtie",
+  "Myrtis",
+  "Myrtle",
+  "Nadia",
+  "Nadine",
+  "Nakia",
+  "Nan",
+  "Nanci",
+  "Nancie",
+  "Nancy",
+  "Nanette",
+  "Nannette",
+  "Nannie",
+  "Naoma",
+  "Naomi",
+  "Nashaly",
+  "Natalia",
+  "Natalie",
+  "Nataly",
+  "Natasha",
+  "Nathalie",
+  "Natividad",
+  "Natosha",
+  "Nautica",
+  "Nayeli",
+  "Nedra",
+  "Nelda",
+  "Nelida",
+  "Nell",
+  "Nella",
+  "Nelle",
+  "Nellie",
+  "Nelly",
+  "Neoma",
+  "Nereida",
+  "Neta",
+  "Nettie",
+  "Neva",
+  "Nia",
+  "Nichol",
+  "Nichole",
+  "Nicki",
+  "Nicola",
+  "Nicole",
+  "Nicolette",
+  "Nicolle",
+  "Niki",
+  "Nikita",
+  "Nikki",
+  "Nikole",
+  "Nila",
+  "Nilda",
+  "Nilsa",
+  "Nina",
+  "Nita",
+  "Noel",
+  "Noelia",
+  "Noelle",
+  "Noemi",
+  "Nola",
+  "Nona",
+  "Nora",
+  "Norah",
+  "Noreen",
+  "Norene",
+  "Norine",
+  "Norma",
+  "Nova",
+  "Novella",
+  "Nyasia",
+  "Nydia",
+  "Ocie",
+  "Octavia",
+  "Oda",
+  "Odalis",
+  "Odalys",
+  "Odell",
+  "Odessa",
+  "Odie",
+  "Ofelia",
+  "Ola",
+  "Olene",
+  "Oleta",
+  "Olga",
+  "Olive",
+  "Olivia",
+  "Ollie",
+  "Oma",
+  "Omayra",
+  "Ona",
+  "Onie",
+  "Opal",
+  "Ophelia",
+  "Ora",
+  "Oralia",
+  "Orpha",
+  "Ossie",
+  "Otha",
+  "Otilia",
+  "Ottie",
+  "Ottilie",
+  "Ouida",
+  "Ova",
+  "Ozella",
+  "Paige",
+  "Palma",
+  "Paloma",
+  "Pam",
+  "Pamala",
+  "Pamela",
+  "Pamella",
+  "Pansy",
+  "Paola",
+  "Paris",
+  "Parker",
+  "Pat",
+  "Patience",
+  "Patrica",
+  "Patrice",
+  "Patricia",
+  "Patsy",
+  "Patti",
+  "Pattie",
+  "Patty",
+  "Paul",
+  "Paula",
+  "Pauletta",
+  "Paulette",
+  "Paulina",
+  "Pauline",
+  "Payton",
+  "Pearl",
+  "Pearle",
+  "Pearlie",
+  "Pearline",
+  "Peggie",
+  "Peggy",
+  "Penelope",
+  "Penni",
+  "Pennie",
+  "Penny",
+  "Perla",
+  "Petra",
+  "Peyton",
+  "Phillis",
+  "Philomena",
+  "Phoebe",
+  "Phylis",
+  "Phyllis",
+  "Pilar",
+  "Pinkie",
+  "Piper",
+  "Polly",
+  "Porsha",
+  "Portia",
+  "Precious",
+  "Presley",
+  "Princess",
+  "Priscilla",
+  "Providenci",
+  "Prudence",
+  "Pura",
+  "Queen",
+  "Queenie",
+  "Quiana",
+  "Quinn",
+  "Rachael",
+  "Racheal",
+  "Rachel",
+  "Rachelle",
+  "Racquel",
+  "Rae",
+  "Raegan",
+  "Rafaela",
+  "Raina",
+  "Ramona",
+  "Ramonita",
+  "Randi",
+  "Randy",
+  "Raquel",
+  "Raven",
+  "Ray",
+  "Rayna",
+  "Reagan",
+  "Reanna",
+  "Reba",
+  "Rebeca",
+  "Rebecca",
+  "Rebekah",
+  "Regan",
+  "Regina",
+  "Reilly",
+  "Reina",
+  "Rena",
+  "Renae",
+  "Renata",
+  "Rene",
+  "Renea",
+  "Renee",
+  "Renita",
+  "Ressie",
+  "Reta",
+  "Retha",
+  "Retta",
+  "Reva",
+  "Reyna",
+  "Rhea",
+  "Rheta",
+  "Rhianna",
+  "Rhiannon",
+  "Rhoda",
+  "Rhonda",
+  "Richard",
+  "Richelle",
+  "Rikki",
+  "Riley",
+  "Rilla",
+  "Rita",
+  "Robbie",
+  "Robbin",
+  "Robert",
+  "Roberta",
+  "Robin",
+  "Robyn",
+  "Rochelle",
+  "Rocio",
+  "Rolanda",
+  "Roma",
+  "Romaine",
+  "Romona",
+  "Rona",
+  "Ronald",
+  "Ronda",
+  "Roni",
+  "Ronna",
+  "Ronnie",
+  "Rosa",
+  "Rosalee",
+  "Rosalia",
+  "Rosalie",
+  "Rosalina",
+  "Rosalind",
+  "Rosalinda",
+  "Rosaline",
+  "Rosalyn",
+  "Rosamond",
+  "Rosann",
+  "Rosanna",
+  "Rosanne",
+  "Rosario",
+  "Rosaura",
+  "Rose",
+  "Roseann",
+  "Roseanna",
+  "Roseanne",
+  "Rosella",
+  "Roselyn",
+  "Rosemarie",
+  "Rosemary",
+  "Rosetta",
+  "Rosia",
+  "Rosie",
+  "Rosina",
+  "Rosita",
+  "Roslyn",
+  "Rossie",
+  "Rowena",
+  "Roxana",
+  "Roxane",
+  "Roxann",
+  "Roxanna",
+  "Roxanne",
+  "Roxie",
+  "Rozella",
+  "Rubie",
+  "Ruby",
+  "Rubye",
+  "Ruth",
+  "Ruthann",
+  "Ruthe",
+  "Ruthie",
+  "Ryan",
+  "Ryann",
+  "Rylee",
+  "Ryleigh",
+  "Rylie",
+  "Sabina",
+  "Sabrina",
+  "Sade",
+  "Sadie",
+  "Sadye",
+  "Sage",
+  "Saige",
+  "Salina",
+  "Sallie",
+  "Sally",
+  "Salma",
+  "Salome",
+  "Samantha",
+  "Samara",
+  "Sammie",
+  "Sandi",
+  "Sandra",
+  "Sandy",
+  "Santa",
+  "Santana",
+  "Santina",
+  "Santos",
+  "Sara",
+  "Sarah",
+  "Sarai",
+  "Sarina",
+  "Sasha",
+  "Saundra",
+  "Savana",
+  "Savanah",
+  "Savanna",
+  "Savannah",
+  "Scarlett",
+  "Selena",
+  "Selina",
+  "Selma",
+  "Serena",
+  "Serenity",
+  "Serina",
+  "Shae",
+  "Shaina",
+  "Shakira",
+  "Shalonda",
+  "Shameka",
+  "Shamika",
+  "Shana",
+  "Shanda",
+  "Shani",
+  "Shania",
+  "Shanice",
+  "Shanika",
+  "Shaniqua",
+  "Shanita",
+  "Shaniya",
+  "Shanna",
+  "Shannan",
+  "Shannon",
+  "Shanon",
+  "Shanta",
+  "Shante",
+  "Shantel",
+  "Shantell",
+  "Shara",
+  "Sharen",
+  "Shari",
+  "Sharla",
+  "Sharlene",
+  "Sharon",
+  "Sharonda",
+  "Sharron",
+  "Sharyn",
+  "Shasta",
+  "Shauna",
+  "Shawanda",
+  "Shawn",
+  "Shawna",
+  "Shayla",
+  "Shaylee",
+  "Shayna",
+  "Shea",
+  "Sheena",
+  "Sheila",
+  "Shelba",
+  "Shelbi",
+  "Shelbie",
+  "Shelby",
+  "Shelia",
+  "Shelley",
+  "Shelli",
+  "Shellie",
+  "Shelly",
+  "Shelva",
+  "Sheree",
+  "Sheri",
+  "Sherie",
+  "Sherita",
+  "Sheron",
+  "Sherri",
+  "Sherrie",
+  "Sherrill",
+  "Sherron",
+  "Sherry",
+  "Sherryl",
+  "Sheryl",
+  "Shianne",
+  "Shiela",
+  "Shirlee",
+  "Shirlene",
+  "Shirley",
+  "Shonda",
+  "Shonna",
+  "Shyann",
+  "Shyanne",
+  "Shyla",
+  "Sibyl",
+  "Sidney",
+  "Sienna",
+  "Sierra",
+  "Signe",
+  "Sigrid",
+  "Silvia",
+  "Simone",
+  "Siobhan",
+  "Sister",
+  "Sky",
+  "Skye",
+  "Skyla",
+  "Skylar",
+  "Skyler",
+  "Socorro",
+  "Sofia",
+  "Soledad",
+  "Sondra",
+  "Sonia",
+  "Sonja",
+  "Sonya",
+  "Sophia",
+  "Sophie",
+  "Spring",
+  "Stacey",
+  "Staci",
+  "Stacia",
+  "Stacie",
+  "Stacy",
+  "Star",
+  "Starla",
+  "Starr",
+  "Stasia",
+  "Stefani",
+  "Stefanie",
+  "Stella",
+  "Stephani",
+  "Stephania",
+  "Stephanie",
+  "Stephany",
+  "Stephenie",
+  "Stevie",
+  "Stormy",
+  "Sudie",
+  "Sue",
+  "Suellen",
+  "Summer",
+  "Sunny",
+  "Sunshine",
+  "Susan",
+  "Susana",
+  "Susann",
+  "Susanna",
+  "Susanne",
+  "Susie",
+  "Suzan",
+  "Suzann",
+  "Suzanna",
+  "Suzanne",
+  "Suzette",
+  "Suzy",
+  "Sybil",
+  "Syble",
+  "Sydnee",
+  "Sydney",
+  "Sydni",
+  "Sydnie",
+  "Sylvia",
+  "Tabatha",
+  "Tabitha",
+  "Talia",
+  "Tamala",
+  "Tamara",
+  "Tamatha",
+  "Tameka",
+  "Tamela",
+  "Tamera",
+  "Tami",
+  "Tamia",
+  "Tamie",
+  "Tamika",
+  "Tamiko",
+  "Tammi",
+  "Tammie",
+  "Tammy",
+  "Tamra",
+  "Tana",
+  "Tanesha",
+  "Tangela",
+  "Tania",
+  "Tanika",
+  "Tanisha",
+  "Tanya",
+  "Tara",
+  "Tarah",
+  "Tarsha",
+  "Taryn",
+  "Tasha",
+  "Tasia",
+  "Tatiana",
+  "Tatianna",
+  "Tatum",
+  "Tatyana",
+  "Tatyanna",
+  "Tawana",
+  "Tawanda",
+  "Tawanna",
+  "Tawny",
+  "Tawnya",
+  "Taya",
+  "Tayla",
+  "Tayler",
+  "Taylor",
+  "Tea",
+  "Teagan",
+  "Teena",
+  "Tena",
+  "Tenisha",
+  "Tennie",
+  "Tennille",
+  "Tera",
+  "Teresa",
+  "Terese",
+  "Teresita",
+  "Teressa",
+  "Teri",
+  "Terra",
+  "Terri",
+  "Terrie",
+  "Terry",
+  "Tess",
+  "Tessa",
+  "Tessie",
+  "Thalia",
+  "Thea",
+  "Theda",
+  "Thelma",
+  "Theo",
+  "Theodora",
+  "Theola",
+  "Theresa",
+  "Therese",
+  "Theresia",
+  "Thomas",
+  "Thora",
+  "Thyra",
+  "Tia",
+  "Tiana",
+  "Tianna",
+  "Tiara",
+  "Tiera",
+  "Tierra",
+  "Tiffani",
+  "Tiffanie",
+  "Tiffany",
+  "Tillie",
+  "Tina",
+  "Tisha",
+  "Toby",
+  "Tomasa",
+  "Tomeka",
+  "Tomika",
+  "Tommie",
+  "Toni",
+  "Tonia",
+  "Tonja",
+  "Tonya",
+  "Tori",
+  "Tosha",
+  "Toya",
+  "Tracey",
+  "Traci",
+  "Tracie",
+  "Tracy",
+  "Trena",
+  "Tresa",
+  "Tressa",
+  "Tressie",
+  "Treva",
+  "Tricia",
+  "Trina",
+  "Trinidad",
+  "Trinity",
+  "Trisha",
+  "Trista",
+  "Tristan",
+  "Trudie",
+  "Trudy",
+  "Twila",
+  "Twyla",
+  "Tyesha",
+  "Tyler",
+  "Tyra",
+  "Una",
+  "Unique",
+  "Ursula",
+  "Vada",
+  "Valarie",
+  "Valencia",
+  "Valentina",
+  "Valentine",
+  "Valeria",
+  "Valerie",
+  "Vallie",
+  "Valorie",
+  "Vanesa",
+  "Vanessa",
+  "Veda",
+  "Velda",
+  "Vella",
+  "Velma",
+  "Velva",
+  "Vena",
+  "Venessa",
+  "Venita",
+  "Venus",
+  "Vera",
+  "Verda",
+  "Verdie",
+  "Vergie",
+  "Verla",
+  "Verlie",
+  "Verna",
+  "Vernell",
+  "Vernice",
+  "Vernie",
+  "Verona",
+  "Veronica",
+  "Versie",
+  "Vesta",
+  "Vicenta",
+  "Vickey",
+  "Vicki",
+  "Vickie",
+  "Vicky",
+  "Victoria",
+  "Vida",
+  "Vikki",
+  "Vilma",
+  "Vina",
+  "Vincenza",
+  "Vinnie",
+  "Viola",
+  "Violet",
+  "Violette",
+  "Virgie",
+  "Virgil",
+  "Virginia",
+  "Vita",
+  "Viva",
+  "Vivian",
+  "Viviana",
+  "Vivien",
+  "Vivienne",
+  "Vonda",
+  "Vonnie",
+  "Waleska",
+  "Walter",
+  "Wanda",
+  "Waneta",
+  "Wanita",
+  "Wava",
+  "Wendi",
+  "Wendy",
+  "Whitley",
+  "Whitney",
+  "Wilda",
+  "Wilhelmina",
+  "Wilhelmine",
+  "Willa",
+  "Willene",
+  "Willia",
+  "William",
+  "Willie",
+  "Willow",
+  "Wilma",
+  "Windy",
+  "Winifred",
+  "Winnie",
+  "Winnifred",
+  "Winona",
+  "Wynona",
+  "Xiomara",
+  "Yadira",
+  "Yahaira",
+  "Yajaira",
+  "Yanira",
+  "Yaritza",
+  "Yasmeen",
+  "Yasmin",
+  "Yasmine",
+  "Yazmin",
+  "Yesenia",
+  "Yessenia",
+  "Yetta",
+  "Yolanda",
+  "Yolonda",
+  "Yoshiko",
+  "Yulissa",
+  "Yvette",
+  "Yvonne",
+  "Zaida",
+  "Zaria",
+  "Zelda",
+  "Zella",
+  "Zelma",
+  "Zena",
+  "Zetta",
+  "Zina",
+  "Zita",
+  "Zoe",
+  "Zoey",
+  "Zoie",
+  "Zoila",
+  "Zola",
+  "Zona",
+  "Zora",
+  "Zoraida",
+  "Zula",
+  "Zulma",
+)
diff --git a/tests/neg/i7056.scala b/tests/pos/i7056.scala
similarity index 84%
rename from tests/neg/i7056.scala
rename to tests/pos/i7056.scala
index d16aa949000e..a347dfe7b519 100644
--- a/tests/neg/i7056.scala
+++ b/tests/pos/i7056.scala
@@ -16,4 +16,5 @@ given [T <: A](using PartialId[T]): T1[T] = new T1[T] {
 given PartialId[B] = ???
 
 val x: B = ???
-val z = x.idnt1  // error
+val z = x.idnt1  // used to be an error, now ok
+
diff --git a/tests/pos/i7304.scala b/tests/pos/i7304.scala
new file mode 100644
index 000000000000..e8ee873a9a5a
--- /dev/null
+++ b/tests/pos/i7304.scala
@@ -0,0 +1,9 @@
+@main def test =
+  val myregex_r = "\\s+".r
+  val text = "adggfgf dfg"
+  myregex_r findFirstMatchIn text
+  text takeRight 5
+  val func = (a: Int) => a + 1
+  List(1,2, 3) map func
+  text stripPrefix "adgg"
+
diff --git a/tests/pos/i7745.scala b/tests/pos/i7745.scala
deleted file mode 100644
index de03d3995d33..000000000000
--- a/tests/pos/i7745.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-trait F[x]
-implicit def foo[f[_], y, x <: f[y]](implicit ev: F[y]): F[x] = ???
-val test = implicitly
\ No newline at end of file
diff --git a/tests/pos/i7888.scala b/tests/pos/i7888.scala
new file mode 100644
index 000000000000..d188bb23e72e
--- /dev/null
+++ b/tests/pos/i7888.scala
@@ -0,0 +1,8 @@
+def usingSeq[B](f: [A] => Seq[A] => B): B = {
+  f(Nil)
+}
+def crash() = {
+  usingSeq { [A] => (a: Seq[A]) =>
+    a
+  }
+}
diff --git a/tests/pos/i7894.scala b/tests/pos/i7894.scala
new file mode 100644
index 000000000000..74cd3e3cb247
--- /dev/null
+++ b/tests/pos/i7894.scala
@@ -0,0 +1,16 @@
+case class Box[T](t: T)
+
+type Boxed[T <: Tuple] <: Tuple = T match {
+  case EmptyTuple => EmptyTuple
+  case h *: t => Box[h] *: Boxed[t]
+}
+
+trait Cmp[T <: Tuple] { def cmp(t: T, b: Boxed[T]): Boolean }
+
+object UnitCmp extends Cmp[EmptyTuple] {
+  def cmp(t: EmptyTuple, b: EmptyTuple): Boolean = true
+}
+
+object UnitCmp2 extends Cmp[EmptyTuple] {
+  def cmp(t: EmptyTuple, b: Boxed[EmptyTuple]): Boolean = true
+}
diff --git a/tests/pos/i864.scala b/tests/pos/i864.scala
index 8d2b859998e9..b372d00a569b 100644
--- a/tests/pos/i864.scala
+++ b/tests/pos/i864.scala
@@ -6,5 +6,5 @@ object C {
   trait X[T]
   implicit def u[A, B]: X[A | B] = new X[A | B] {}
   def y[T](implicit x: X[T]): T = ???
-  val x: a.type & b.type | b.type & c.type = y
+  val x: a.type & b.type | b.type & c.type = y // error
 }
diff --git a/tests/pos/i8666.scala b/tests/pos/i8666.scala
new file mode 100644
index 000000000000..307a4617b172
--- /dev/null
+++ b/tests/pos/i8666.scala
@@ -0,0 +1,10 @@
+class Foo[A, B]()
+
+type FooSnd[X] = X match
+  case Foo[_, b] => b
+
+trait Bar[A]:
+  def bar(h: FooSnd[A]): Int
+
+val foo: Bar[Foo[String, Int]] = new Bar[Foo[String, Int]]:
+  def bar(h: FooSnd[Foo[String, Int]]) = h
diff --git a/tests/pos/i8802a.scala b/tests/pos/i8802a.scala
new file mode 100644
index 000000000000..9e3176b2557c
--- /dev/null
+++ b/tests/pos/i8802a.scala
@@ -0,0 +1,18 @@
+trait Foo[A1, B1] {
+  type Out
+}
+
+object Test {
+
+  type Bar[A2]
+
+  def unit: Bar[Unit] = ???
+  def product[A3, B3](fst: Bar[A3], snd: Bar[B3])(implicit foo: Foo[A3, B3]): Bar[foo.Out] = ???
+
+  implicit def foo[A4]: Foo[A4, Unit] { type Out = A4 } = ???
+
+  def check[A5](bar: Bar[A5])(a: A5): Unit = {}
+
+  check(product(unit, unit)) // ok
+  check(product(unit, unit)(summon[Foo[Unit, Unit]]))(()) // error
+}
\ No newline at end of file
diff --git a/tests/pos/i8833.scala b/tests/pos/i8833.scala
new file mode 100644
index 000000000000..3bb6fabe1e26
--- /dev/null
+++ b/tests/pos/i8833.scala
@@ -0,0 +1,4 @@
+@main def Test = {
+  implicitly[("k" | "v") <:< ("k" | "v")]
+  implicitly[("k" | "v") =:= ("k" | "v")]
+}
diff --git a/tests/pos/i8900-cycle.scala b/tests/pos/i8900-cycle.scala
new file mode 100644
index 000000000000..3b6ae214cb42
--- /dev/null
+++ b/tests/pos/i8900-cycle.scala
@@ -0,0 +1,15 @@
+trait Contra[-A]
+trait Cov[+B]
+
+trait Test {
+  def foo[S](x: S): S
+  def rec1[T <: Cov[T]]: Contra[T]
+  def rec2[T <: Cov[U], U <: T]: Contra[T]
+
+  val a = foo({
+    rec1
+  })
+  val b = foo({
+    rec2
+  })
+}
diff --git a/tests/pos/i8900-polyfunction.scala b/tests/pos/i8900-polyfunction.scala
new file mode 100644
index 000000000000..2836283b3c65
--- /dev/null
+++ b/tests/pos/i8900-polyfunction.scala
@@ -0,0 +1,5 @@
+object Test {
+  def f[F](f: [t] => t => F): Unit = ()
+
+  f([t] => (x: t) => x)
+}
diff --git a/tests/pos/i8900-promote.scala b/tests/pos/i8900-promote.scala
new file mode 100644
index 000000000000..7d3a2ff96bed
--- /dev/null
+++ b/tests/pos/i8900-promote.scala
@@ -0,0 +1,18 @@
+class Inv[A <: Singleton](x: A)
+object Inv {
+  def empty[A <: Singleton]: Inv[A] = new Inv(???)
+}
+
+class Inv2[A](x: A)
+object Inv2 {
+  def empty[A]: Inv2[A] = new Inv2(???)
+}
+
+object Test {
+  def inv(cond: Boolean) = // used to leak: Inv[x.type]
+    if (cond)
+      val x: Int = 1
+      new Inv(x)
+    else
+      Inv.empty
+}
diff --git a/tests/pos/i8900-unflip.scala b/tests/pos/i8900-unflip.scala
new file mode 100644
index 000000000000..568e9d22530e
--- /dev/null
+++ b/tests/pos/i8900-unflip.scala
@@ -0,0 +1,18 @@
+// Minimized from PLens.scala in scalaz
+
+class PLensFamily[A1, A2, B1, B2]
+
+class LazyOption[A3] {
+  def fold[X](some: (=> A3) => X, none: => X): X = ???
+}
+class IndexedStore[I, A4, B4](run: (A4 => B4, I))
+
+object PL {
+
+  def plensFamily[A1x, A2x, B1x, B2x](r: A1x => Option[IndexedStore[B1x, B2x, A2x]]): PLensFamily[A1x, A2x, B1x, B2x] = ???
+
+  def lazySome[T](a: => T): LazyOption[T] = ???
+
+  def lazySomePLensFamily[A1y, A2y]: PLensFamily[LazyOption[A1y], LazyOption[A2y], A1y, A2y] =
+    plensFamily(_.fold(z => Some(IndexedStore(lazySome(_), z)), None))
+}
diff --git a/tests/pos/i8900a.scala b/tests/pos/i8900a.scala
new file mode 100644
index 000000000000..d34b3dc34516
--- /dev/null
+++ b/tests/pos/i8900a.scala
@@ -0,0 +1,11 @@
+class Inv[T](val elem: T)
+object Test {
+  def unwrap[Outer](inv: Inv[Outer]): Outer = inv.elem
+  def wrap[Inner](i: Inner): Inv[Inner] = new Inv(i)
+
+  val a = unwrap({
+    class Local
+    val local = new Local
+    wrap(local)
+  })
+}
diff --git a/tests/pos/i8900a2.scala b/tests/pos/i8900a2.scala
new file mode 100644
index 000000000000..50a263ff7cc2
--- /dev/null
+++ b/tests/pos/i8900a2.scala
@@ -0,0 +1,12 @@
+class ContraCo[-T, +S](val t: S)
+class CoContra[+T, -S](val t: T)
+object Test {
+  def unwrap[Outer](inv: CoContra[Outer, Outer]): Outer = inv.t
+  def wrap[Inner](i: Inner): CoContra[Inner, Inner] = new CoContra(i)
+
+  val a = unwrap({
+    class Local
+    val local = new Local
+    wrap(local)
+  })
+}
diff --git a/tests/pos/i8900a3.scala b/tests/pos/i8900a3.scala
new file mode 100644
index 000000000000..d43f19fcaab6
--- /dev/null
+++ b/tests/pos/i8900a3.scala
@@ -0,0 +1,13 @@
+class ContraCo[-T, +S](val t: S)
+class CoContra[+T, -S](val t: T)
+object Test {
+  type Id[T] = T
+  def unwrap[Outer](inv: CoContra[Outer, Outer]): Outer = inv.t
+  def wrap[Inner](i: Inner): CoContra[Id[Inner], Id[Inner]] = new CoContra(i)
+
+  val a = unwrap({
+    class Local
+    val local = new Local
+    wrap(local)
+  })
+}
diff --git a/tests/pos/i8921.scala b/tests/pos/i8921.scala
new file mode 100644
index 000000000000..19fe6ac17650
--- /dev/null
+++ b/tests/pos/i8921.scala
@@ -0,0 +1,7 @@
+type R[F[_], A] =[B] => (A => F[B]) => F[B]
+
+type M[F[_]] =[A, B] => (A => F[B]) => F[A] => F[B]
+
+def mr[F[_]]: M[[A] =>> R[F, A]] =
+   [A, B] => (f: A => R[F, B]) => (m: R[F, A]) =>
+      [C] => (k: B => F[C]) => m(a => f(a)(k))
\ No newline at end of file
diff --git a/tests/pos/i9363.scala b/tests/pos/i9363.scala
new file mode 100644
index 000000000000..183779349944
--- /dev/null
+++ b/tests/pos/i9363.scala
@@ -0,0 +1,8 @@
+class Foo:
+  protected inline def fooProtected: Int = 12
+
+object Foo extends Foo:
+  inline def foo: Int = fooProtected
+
+object Bar:
+  def bar: Int = Foo.foo
diff --git a/tests/pos/i9482.scala b/tests/pos/i9482.scala
new file mode 100644
index 000000000000..6549539e49a7
--- /dev/null
+++ b/tests/pos/i9482.scala
@@ -0,0 +1,11 @@
+import scala.reflect.OptManifest
+
+object Ref {
+  def make[A: OptManifest]: Ref[A] = ???
+}
+trait Ref[A]
+
+trait Foo[A] {
+  val bar = Ref.make[Int]
+  val baz: Ref[A] = Ref.make
+}
diff --git a/tests/pos/i9531.scala b/tests/pos/i9531.scala
new file mode 100644
index 000000000000..ff82f8e03e43
--- /dev/null
+++ b/tests/pos/i9531.scala
@@ -0,0 +1,10 @@
+trait Scope:
+  type Expr[+T]
+
+def exprQuote[T](x: T)(using s: Scope, dummy: Null = null): s.Expr[T] = ???
+def exprQuote[T <: Singleton](x: T)(using s: Scope): s.Expr[T] = ???
+
+def test(using s: Scope): Unit =
+  val t1: s.Expr[1] = exprQuote(1)
+  val t2 = exprQuote(1)
+  val t3: s.Expr[1] = t2
diff --git a/tests/pos/i9740b.scala b/tests/pos/i9740b.scala
deleted file mode 100644
index 412e8a95dc27..000000000000
--- a/tests/pos/i9740b.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-sealed trait Exp[T]
-case class IntExp(x: Int) extends Exp[Int]
-case class StrExp(x: String) extends Exp[String]
-object UnitExp extends Exp[Unit]
-
-class Foo[U <: Int, T <: U] {
-  def bar[A <: T](x: Exp[A]): Unit = x match
-    case IntExp(x) =>
-    case StrExp(x) =>
-    case UnitExp =>
-}
\ No newline at end of file
diff --git a/tests/pos/i9769.scala b/tests/pos/i9769.scala
new file mode 100644
index 000000000000..1c57b4bb94d3
--- /dev/null
+++ b/tests/pos/i9769.scala
@@ -0,0 +1,9 @@
+object Main {
+  val lifeOfPi = 3.14159
+  val fInterpolator = f"The approximate value of pi is $lifeOfPi%4.2f"
+  
+  def main(args: Array[String]): Unit = {
+    println(fInterpolator)
+  }
+
+}
diff --git a/tests/pos/i9833.scala b/tests/pos/i9833.scala
new file mode 100644
index 000000000000..4e5594707831
--- /dev/null
+++ b/tests/pos/i9833.scala
@@ -0,0 +1,7 @@
+object Main extends App:
+  enum Extends[A, B]:
+    case Ev[B, A <: B]() extends (A Extends B)
+
+    def cast(a: A): B = this match {
+      case Extends.Ev() => a
+    }
diff --git a/tests/pos/indent.scala b/tests/pos/indent.scala
index 03502a26fe79..6e027e1db085 100644
--- a/tests/pos/indent.scala
+++ b/tests/pos/indent.scala
@@ -82,6 +82,14 @@ object Test:
     x < 10
   do ()
 
+  def sign(x: Int): Int =
+    if (x > 0) 1
+    else if (x < 0) - 1        // was: value - is not a member of Boolean
+    else 0
+  def lessPersuasively(x: Int): Unit =
+    while (x < 0) - 42         // was: value - is not a member of Boolean
+end Test
+
 class Test2:
   self =>
   def foo(x: Int) =
@@ -147,4 +155,4 @@ class Coder(words: List[String]):
 end Coder
 
 object Test22:
-  def foo: Int = 22
\ No newline at end of file
+  def foo: Int = 22
diff --git a/tests/pos/inline3.scala b/tests/pos/inline3.scala
new file mode 100644
index 000000000000..d702ca4d7d47
--- /dev/null
+++ b/tests/pos/inline3.scala
@@ -0,0 +1,25 @@
+object K0 {
+
+  type T = String
+
+  opaque type ProductInstances[F[_], T] = ErasedProductInstances[F[T]]
+
+  inline def summonAsArray[F[_], T]: Array[Any] = ???
+  inline def mkProductInstances[F[_], T]: ProductInstances[F, T] =
+    new ErasedProductInstances(summonAsArray[F, T]).asInstanceOf[ProductInstances[F, T]]
+
+  val x: T = ""
+
+  inline def foo(x: T): T = "foo".asInstanceOf[T]
+}
+
+final class ErasedProductInstances[FT](is0: => Array[Any])
+
+trait Monoid[A]
+case class ISB(i: Int)
+
+object Test {
+  K0.foo(K0.x)
+  K0.mkProductInstances[Monoid, ISB]
+
+}
\ No newline at end of file
diff --git a/tests/pos/inlined-the.scala b/tests/pos/inlined-the.scala
index 5a3c43287724..96fec9af958a 100644
--- a/tests/pos/inlined-the.scala
+++ b/tests/pos/inlined-the.scala
@@ -5,7 +5,7 @@ object Instances {
   class C {
     def f() = {
       locally {
-        given d[T]: D[T] with {}
+        given d[T]: D[T]()
         summon[D[Int]]
         implicit val s: 3 = ???
         val a: 3 = summon[3]
@@ -14,7 +14,7 @@ object Instances {
       }
 
       locally {
-        given d[T]: D[T] with {}
+        given d[T]: D[T]()
         the2[D[Int]]
         implicit val s: 3 = ???
         val a: 3 = the2[3]
diff --git a/tests/pos/java-inherited-type/Client.scala b/tests/pos/java-inherited-type/Client.scala
new file mode 100644
index 000000000000..a644363cdd4c
--- /dev/null
+++ b/tests/pos/java-inherited-type/Client.scala
@@ -0,0 +1,19 @@
+object Client {
+  def test= {
+    Test.Outer.Nested.sig
+    Test.Outer.Nested.sig1
+    Test.Outer.Nested.sig2
+    val o = new Test.Outer
+    new o.Nested1().sig
+    new o.Nested1().sig1
+    new o.Nested1().sig2
+  }
+
+  def test1 = {
+    val t = new Test
+    val o = new t.Outer1
+    new o.Nested1().sig
+    new o.Nested1().sig1
+    new o.Nested1().sig2
+  }
+}
diff --git a/tests/pos/java-inherited-type/Test.java b/tests/pos/java-inherited-type/Test.java
new file mode 100644
index 000000000000..ae89a6559a67
--- /dev/null
+++ b/tests/pos/java-inherited-type/Test.java
@@ -0,0 +1,30 @@
+public class Test {
+  static class OuterBase implements OuterBaseInterface {
+    static class StaticInner {}
+    class Inner {}
+  }
+  interface OuterBaseInterface {
+    interface InnerFromInterface {}
+  }
+  public static class Outer extends OuterBase {
+    public static class Nested {
+      public static P<StaticInner, Inner, InnerFromInterface> sig; // was: "type StaticInner", "not found: type Inner", "not found: type InnerFromInterface"
+      public static P<Outer.StaticInner, Outer.Inner, Outer.InnerFromInterface> sig1; // was: "type StaticInner is not a member of Test.Outer"
+      public static P<OuterBase.StaticInner, OuterBase.Inner, OuterBaseInterface.InnerFromInterface> sig2;
+
+    }
+    public class Nested1 {
+      public P<StaticInner, Inner, InnerFromInterface> sig; // was: "not found: type StaticInner"
+      public P<Outer.StaticInner, Outer.Inner, Outer.InnerFromInterface> sig1; // was: "type StaticInner is not a member of Test.Outer"
+      public P<OuterBase.StaticInner, OuterBase.Inner, OuterBaseInterface.InnerFromInterface> sig2;
+    }
+  }
+  public class Outer1 extends OuterBase {
+    public class Nested1 {
+      public P<StaticInner, Inner, InnerFromInterface> sig; // was: "not found: type StaticInner"
+      public P<Outer.StaticInner, Outer.Inner, Outer.InnerFromInterface> sig1; // was: "type StaticInner is not a member of Test.Outer"
+      public P<OuterBase.StaticInner, OuterBase.Inner, OuterBaseInterface.InnerFromInterface> sig2;
+    }
+  }
+  public static class P<A, B, C>{}
+}
diff --git a/tests/pos/java-inherited-type1/J.java b/tests/pos/java-inherited-type1/J.java
new file mode 100644
index 000000000000..ba9963104699
--- /dev/null
+++ b/tests/pos/java-inherited-type1/J.java
@@ -0,0 +1,9 @@
+class J extends S {
+  // These references all work in Javac because `object O { class I }` erases to `O$I`
+
+  void select1(S1.Inner1 i) { new S1.Inner1(); }
+  void ident(Inner i) {}
+
+  void ident1(Inner1 i) {}
+  void select(S.Inner i) { new S.Inner(); }
+}
diff --git a/tests/pos/java-inherited-type1/S.scala b/tests/pos/java-inherited-type1/S.scala
new file mode 100644
index 000000000000..155efc0e06ba
--- /dev/null
+++ b/tests/pos/java-inherited-type1/S.scala
@@ -0,0 +1,9 @@
+class S extends S1
+object S {
+  class Inner
+}
+
+class S1
+object S1 {
+  class Inner1
+}
diff --git a/tests/pos/java-inherited-type1/Test.scala b/tests/pos/java-inherited-type1/Test.scala
new file mode 100644
index 000000000000..082167342a02
--- /dev/null
+++ b/tests/pos/java-inherited-type1/Test.scala
@@ -0,0 +1,13 @@
+object Test {
+  val j = new J
+  // force completion of these signatures
+  j.ident(null);
+  j.ident1(null);
+  j.select(null);
+  j.select1(null);
+
+  val message:TestMessage = null
+  val builder:TestMessage.Builder = message.toBuilder
+  builder.setName("name")
+
+}
diff --git a/tests/pos/java-inherited-type1/TestMessage.java b/tests/pos/java-inherited-type1/TestMessage.java
new file mode 100644
index 000000000000..fac373e302f7
--- /dev/null
+++ b/tests/pos/java-inherited-type1/TestMessage.java
@@ -0,0 +1,17 @@
+abstract class AbstractMessage  {
+  public static abstract class Builder<BuilderType extends Builder<BuilderType>> {
+  }
+}
+
+class TestMessage extends AbstractMessage {
+
+  public Builder toBuilder() {
+    return null;
+  }
+
+  public static class Builder extends AbstractMessage.Builder<Builder> {
+    public Builder setName(String name) {
+      return this;
+    }
+  }
+}
diff --git a/tests/pos/manifest-summoning.scala b/tests/pos/manifest-summoning.scala
new file mode 100644
index 000000000000..e9840d33b8c8
--- /dev/null
+++ b/tests/pos/manifest-summoning.scala
@@ -0,0 +1,22 @@
+object Foo {
+
+  object opaques {
+    opaque type Inner = String
+    val i: Inner = "i"
+  }
+
+  val singleton: opaques.Inner = opaques.i
+
+  val om_Inner     = optManifest[opaques.Inner] // NoManifest
+  val om_singleton = optManifest[singleton.type] // NoManifest
+  val ct_Inner     = reflect.classTag[opaques.Inner]
+  val ct_singleton = reflect.classTag[singleton.type]
+}
+
+val `List[Nothing]` = manifest[List[Nothing]]
+val `List[Array[Nothing]]` = manifest[List[Array[Nothing]]] // ok when Nothing is not the argument of top-level array
+
+val `Array[Array[List[Int]]]` = manifest[Array[Array[List[Int]]]]
+
+trait Mixin[T <: Mixin[T]] { type Self = T }
+class Baz extends Mixin[Baz] { val m = manifest[Self] }
diff --git a/tests/pos/multi-given.scala b/tests/pos/multi-given.scala
index 3be8bece1311..5553df36f1c9 100644
--- a/tests/pos/multi-given.scala
+++ b/tests/pos/multi-given.scala
@@ -5,6 +5,6 @@ trait C
 def fancy(using a: A, b: B, c: C) = "Fancy!"
 def foo(implicit a: A, b: B, c: C) = "foo"
 
-given A with B with {}
+given A() with B
 
-given ops: A with B with {}
\ No newline at end of file
+given ops: A() with B()
diff --git a/tests/pos/opaque-inline.scala b/tests/pos/opaque-inline.scala
new file mode 100644
index 000000000000..a0279f02fbfe
--- /dev/null
+++ b/tests/pos/opaque-inline.scala
@@ -0,0 +1,20 @@
+
+object refined:
+  opaque type Positive = Int
+
+  object Positive extends PositiveFactory
+
+  trait PositiveFactory:
+    inline def apply(value: Int): Positive = value
+
+    def f(x: Positive): Positive = x
+    inline def fapply(value: Int): Positive =
+      val vv = (value, value) // error: implementation restriction
+      f(vv._1)
+
+@main def run: Unit =
+  import refined.*
+  val x = 9
+  val nine = Positive.apply(x)
+  val nine1 = Positive.fapply(x)
+
diff --git a/tests/pos/opaque-inline1-transparent.scala b/tests/pos/opaque-inline1-transparent.scala
new file mode 100644
index 000000000000..9f05bcc34f85
--- /dev/null
+++ b/tests/pos/opaque-inline1-transparent.scala
@@ -0,0 +1,11 @@
+
+object refined:
+  opaque type Positive = Int
+  transparent inline def Positive(value: Int): Positive = f(value)
+  def f(x: Positive): Positive = x
+
+object test:
+  def run: Unit =
+    val x = 9
+    val nine = refined.Positive(x)
+
diff --git a/tests/pos/opaque-inline1.scala b/tests/pos/opaque-inline1.scala
new file mode 100644
index 000000000000..b30eeafdbe77
--- /dev/null
+++ b/tests/pos/opaque-inline1.scala
@@ -0,0 +1,13 @@
+
+object refined:
+  opaque type Positive = Int
+  inline def Positive(value: Int): Positive = f(value)
+  transparent inline def TPositive(value: Int): Positive = f(value)
+  def f(x: Positive): Positive = x
+
+object test:
+  def run: Unit =
+    val x = 9
+    val nine = refined.Positive(x)
+    val tnine: refined.Positive = refined.TPositive(x)
+
diff --git a/tests/pos/opaque-inline2-transparent.scala b/tests/pos/opaque-inline2-transparent.scala
new file mode 100644
index 000000000000..b0474c57b19e
--- /dev/null
+++ b/tests/pos/opaque-inline2-transparent.scala
@@ -0,0 +1,28 @@
+
+import compiletime.*
+
+object refined:
+  opaque type Positive = Int
+
+  object Positive extends PositiveFactory
+
+  trait PositiveFactory:
+    transparent inline def apply(inline value: Int): Positive =
+      inline if value < 0 then error(codeOf(value) + " is not positive.")
+      else value
+
+    transparent inline def safe(value: Int): Positive | IllegalArgumentException =
+      if value < 0 then IllegalArgumentException(s"$value is not positive")
+      else value: Positive
+
+@main def Test: Unit =
+  import refined.*
+  val eight = Positive(8)
+  // val negative = Positive(-1) // This correctly produces a compile error "-1 is not positive."
+  // val random = Positive(scala.util.Random.nextInt()) // This correctly produces a compile error about being unable to inline the method call
+  val random = Positive.safe(scala.util.Random.nextInt())
+  val safeNegative = Positive.safe(-1)
+  val safeFive = Positive.safe(5)
+  println(eight)
+  println(random)
+  println(safeFive)
\ No newline at end of file
diff --git a/tests/pos/opaque-inline2.check b/tests/pos/opaque-inline2.check
new file mode 100644
index 000000000000..1a3888c02635
--- /dev/null
+++ b/tests/pos/opaque-inline2.check
@@ -0,0 +1,3 @@
+8
+java.lang.IllegalArgumentException: -1502782350 is not positive
+5
diff --git a/tests/pos/opaque-inline2.scala b/tests/pos/opaque-inline2.scala
new file mode 100644
index 000000000000..fda5f6756827
--- /dev/null
+++ b/tests/pos/opaque-inline2.scala
@@ -0,0 +1,28 @@
+
+import compiletime.*
+
+object refined:
+  opaque type Positive = Int
+
+  object Positive extends PositiveFactory
+
+  trait PositiveFactory:
+    inline def apply(inline value: Int): Positive =
+      inline if value < 0 then error(codeOf(value) + " is not positive.")
+      else value
+
+    transparent inline def safe(value: Int): Positive | IllegalArgumentException =
+      if value < 0 then IllegalArgumentException(s"$value is not positive")
+      else value: Positive
+
+@main def Test: Unit =
+  import refined.*
+  val eight = Positive(8)
+  // val negative = Positive(-1) // This correctly produces a compile error "-1 is not positive."
+  // val random = Positive(scala.util.Random.nextInt()) // This correctly produces a compile error about being unable to inline the method call
+  val random = Positive.safe(scala.util.Random.nextInt())
+  val safeNegative = Positive.safe(-1)
+  val safeFive = Positive.safe(5)
+  println(eight)
+  println(random)
+  println(safeFive)
\ No newline at end of file
diff --git a/tests/pos/pickleSkolem.scala b/tests/pos/pickleSkolem.scala
new file mode 100644
index 000000000000..852b1cee65ba
--- /dev/null
+++ b/tests/pos/pickleSkolem.scala
@@ -0,0 +1,15 @@
+class A
+
+type B = A
+
+def f[T](x: T): x.type & T = ???
+
+def g = {
+  var a: B = ???
+  f[A](a)
+}
+
+def testNN = {
+  var s: String = ???
+  s.nn
+}
diff --git a/tests/pos/pos_valueclasses/t5953.scala b/tests/pos/pos_valueclasses/t5953.scala
index 84e2243d1d6d..e05ec5b48976 100644
--- a/tests/pos/pos_valueclasses/t5953.scala
+++ b/tests/pos/pos_valueclasses/t5953.scala
@@ -1,3 +1,5 @@
+package t5953
+
 trait CBF[-F, -A, +C]
 trait GenTraversable[+A]
 trait Traversable[+A] extends GenTraversable[A]
diff --git a/tests/pos/preserve-union.scala b/tests/pos/preserve-union.scala
new file mode 100644
index 000000000000..a56fcbef1b84
--- /dev/null
+++ b/tests/pos/preserve-union.scala
@@ -0,0 +1,7 @@
+class A {
+  val a: Int | String = 1
+  val b: AnyVal = 2
+
+  val c = List(a, b)
+  val c1: List[AnyVal | String] = c
+}
diff --git a/tests/pos/reference/delegates.scala b/tests/pos/reference/delegates.scala
index 2a1594192761..1cc7a29eee7d 100644
--- a/tests/pos/reference/delegates.scala
+++ b/tests/pos/reference/delegates.scala
@@ -110,11 +110,11 @@ object Instances extends Common:
         println(summon[Context].value)
       }
       locally {
-        given d[T]: D[T] with {}
+        given d[T]: D[T]()
         println(summon[D[Int]])
       }
       locally {
-        given (using Context): D[Int] with {}
+        given (using Context): D[Int]()
         println(summon[D[Int]])
       }
   end C
diff --git a/tests/pos/reference/extension-methods.scala b/tests/pos/reference/extension-methods.scala
index 3dacf787a436..64fd23322c1b 100644
--- a/tests/pos/reference/extension-methods.scala
+++ b/tests/pos/reference/extension-methods.scala
@@ -70,7 +70,7 @@ object ExtMethods:
   end SafeDiv
 
   def test1 =
-    given ops1: IntOps with {} // brings safeMod into scope
+    given ops1: IntOps() // brings safeMod into scope
     1.safeMod(2)
 
   class Lst[T](xs: T*):
diff --git a/tests/pos/reference/inlines.scala b/tests/pos/reference/inlines.scala
index a1eb215b4d22..657961671efd 100644
--- a/tests/pos/reference/inlines.scala
+++ b/tests/pos/reference/inlines.scala
@@ -41,6 +41,8 @@ object Test{
     }
   }
 
+  val x = log[String]("some op", indentSetting)(_)
+
   def main(args: Array[String]): Unit =
     println(factorial(33))
 }
diff --git a/tests/pos/reference/saferExceptions.scala b/tests/pos/reference/saferExceptions.scala
new file mode 100644
index 000000000000..04dbd5fbfd87
--- /dev/null
+++ b/tests/pos/reference/saferExceptions.scala
@@ -0,0 +1,15 @@
+import language.experimental.saferExceptions
+
+
+class LimitExceeded extends Exception
+
+val limit = 10e9
+
+def f(x: Double): Double throws LimitExceeded =
+  if x < limit then x * x else throw LimitExceeded()
+
+@main def test(xs: Double*) =
+  try println(xs.map(f).sum)
+  catch case ex: LimitExceeded => println("too large")
+
+
diff --git a/tests/pos/source-import-3-0-migration.scala b/tests/pos/source-import-3-0-migration.scala
new file mode 100644
index 000000000000..b0f220fd4e40
--- /dev/null
+++ b/tests/pos/source-import-3-0-migration.scala
@@ -0,0 +1 @@
+import language.`3.0-migration`
diff --git a/tests/pos/source-import-3-0.scala b/tests/pos/source-import-3-0.scala
new file mode 100644
index 000000000000..d6d7f9201b08
--- /dev/null
+++ b/tests/pos/source-import-3-0.scala
@@ -0,0 +1 @@
+import language.`3.0`
diff --git a/tests/pos/source-import-3-1-migration.scala b/tests/pos/source-import-3-1-migration.scala
new file mode 100644
index 000000000000..6e6f9f905b99
--- /dev/null
+++ b/tests/pos/source-import-3-1-migration.scala
@@ -0,0 +1 @@
+import language.`3.1-migration`
diff --git a/tests/pos/source-import-3-1.scala b/tests/pos/source-import-3-1.scala
new file mode 100644
index 000000000000..38216d612864
--- /dev/null
+++ b/tests/pos/source-import-3-1.scala
@@ -0,0 +1 @@
+import language.`3.1`
diff --git a/tests/pos/specs2-failure.scala b/tests/pos/specs2-failure.scala
new file mode 100644
index 000000000000..c705c8e283ce
--- /dev/null
+++ b/tests/pos/specs2-failure.scala
@@ -0,0 +1,20 @@
+import util.matching.Regex
+import util.matching.Regex.Match
+
+// Demonstrate what used to be a failure in specs2, before we refined
+// the scheme when not to typecheck a function argument again.
+object Test:
+
+  extension (s: String)
+
+    def replaceAll(pairs: (String, String)*): String =
+      pairs.foldLeft(s) { (res, cur) =>
+        res.replaceAll(cur._1, cur._2)
+      }
+
+    def replaceAll(exp: String, f: String => String): String =
+      new Regex(exp).replaceAllIn(s, (m: Match) => f(m.group(0).replace("\\", "\\\\")))
+
+    def replaceInsideTag(tag: String, p: (String, String)*): String =
+      s.replaceAll(tag, (s: String) => java.util.regex.Matcher.quoteReplacement(s.replaceAll(p*)))
+
diff --git a/tests/pos/splice-pat.scala b/tests/pos/splice-pat.scala
new file mode 100644
index 000000000000..6a8852b4a7c0
--- /dev/null
+++ b/tests/pos/splice-pat.scala
@@ -0,0 +1,24 @@
+import scala.quoted.*
+
+object MyMatcher {
+  def unapply(expr: Expr[Any])(using Quotes): Option[Expr[Int]] = ???
+}
+
+object MyMatcher2 {
+  def unapply(expr: Expr[Int])(using Quotes): Boolean = ???
+}
+
+def foo(x: Any): Unit = ???
+def bar(x: Int): Int = ???
+
+def oneLevel(expr: Expr[Any])(using Quotes): Expr[Int] = expr match
+  case '{ foo(${MyMatcher(y@MyMatcher2())}) } => y
+
+def twoLevel(expr: Expr[Any])(using Quotes): Expr[Int] = expr match
+  case '{ foo(${MyMatcher('{ bar(${y@MyMatcher2()}).getClass}) }) } => y
+
+def bindQuote(expr: Expr[Any])(using Quotes): Expr[Int] = expr match
+  case '{ foo(${y@'{bar($_)}})} => y
+
+def noop(expr: Expr[Any])(using Quotes): Expr[Int] = expr match
+  case '{ bar(${ '{ $y }  }) } => y
diff --git a/tests/pos/stm.scala b/tests/pos/stm.scala
new file mode 100644
index 000000000000..48ff946f9b5c
--- /dev/null
+++ b/tests/pos/stm.scala
@@ -0,0 +1,10 @@
+class Inv[X]
+class Ref[X]
+object Ref {
+  def apply(i: Inv[Int], x: Int): Ref[Int] = ???
+  def apply[Y](i: Inv[Y], x: Y): Ref[Y] = ???
+}
+
+class A {
+  val ref: Ref[List[AnyRef]] = Ref(new Inv[List[AnyRef]], List.empty)
+}
diff --git a/tests/pos/t0851.scala b/tests/pos/t0851.scala
index fdc504af75c5..c7393723b148 100644
--- a/tests/pos/t0851.scala
+++ b/tests/pos/t0851.scala
@@ -1,9 +1,8 @@
 package test
 
 object test1 {
-  case class Foo[T,T2](f : (T,T2) => String) extends (((T,T2)) => String){
+  case class Foo[T,T2](f : (T,T2) => String) {
     def apply(t : T) = (s:T2) => f(t,s)
-    def apply(p : (T,T2)) = f(p._1,p._2)
   }
   implicit def g[T](f : (T,String) => String): Foo[T, String] = Foo(f)
   def main(args : Array[String]) : Unit = {
diff --git a/tests/pos/t2913.scala b/tests/pos/t2913.scala
index f91ed7b51318..9d7b898cbe9d 100644
--- a/tests/pos/t2913.scala
+++ b/tests/pos/t2913.scala
@@ -33,9 +33,8 @@ object TestNoAutoTupling {
 
 // t0851 is essentially the same:
 object test1 {
-  case class Foo[T,T2](f : (T,T2) => String) extends (((T,T2)) => String){
+  case class Foo[T,T2](f : (T,T2) => String) {
     def apply(t : T) = (s:T2) => f(t,s)
-    def apply(p : (T,T2)) = f(p._1,p._2)
   }
   implicit def g[T](f : (T,String) => String): test1.Foo[T,String] = Foo(f)
   def main(args : Array[String]) : Unit = {
diff --git a/tests/pos/the-given.scala b/tests/pos/the-given.scala
index 97c0e5099215..4d8ed582ac6d 100644
--- a/tests/pos/the-given.scala
+++ b/tests/pos/the-given.scala
@@ -1,7 +1,7 @@
 object Test {
 
   class Encoder { def apply(x: Int): Int = x }
-  given Encoder with {}
+  given Encoder()
 
   summon[Encoder](2)
 
diff --git a/tests/pos/trailing-comma-pattern.scala b/tests/pos/trailing-comma-pattern.scala
new file mode 100644
index 000000000000..878b3af7748a
--- /dev/null
+++ b/tests/pos/trailing-comma-pattern.scala
@@ -0,0 +1,3 @@
+object Test:
+  val List(x, y, _*,
+  ) = List(1, 2, 3)
diff --git a/tests/pos/typeclass-encoding2.scala b/tests/pos/typeclass-encoding2.scala
deleted file mode 100644
index 13db93f91204..000000000000
--- a/tests/pos/typeclass-encoding2.scala
+++ /dev/null
@@ -1,348 +0,0 @@
-/** 1. Simple type classes with monomorphic implementations and direct extensions.
-
-    trait SemiGroup extends TypeClass {
-      def add(that: This): This
-    }
-
-    trait Monoid extends SemiGroup
-    common {
-      def unit: This
-    }
-
-    extension IntOps for Int : Monoid {
-      def add(that: Int) = this + that
-    }
-    common {
-      def unit = 0
-    }
-
-    extension StringOps for String : Monoid {
-      def add(that: Int) = this ++ that
-    }
-    common {
-      def unit = ""
-    }
-
-    enum Nat extends Monoid {
-      case Z
-      case S(n: Nat)
-
-      def add(that: Nat): Nat = this match {
-        case S => that
-        case S(n) => S(n.add(that))
-      }
-    }
-    common {
-      def unit = Z
-    }
-
-    def sum[T: Monoid](xs: List[T]): T =
-      xs.foldLeft(Monod.impl[T].unit)(_ `add` _)
-*/
-object runtime {
-
-  trait TypeClass {
-    val commons: TypeClassCommon
-    type This = commons.This
-  }
-
-  trait TypeClassCommon { self =>
-    type This
-    type Instance <: TypeClass
-    def inject(x: This): Instance { val commons: self.type }
-  }
-
-  trait TypeClassCompanion {
-    type Impl[T] <: TypeClassCommon { type This = T }
-    def impl[T](implicit ev: Impl[T]): Impl[T] = ev
-  }
-
-  implicit def inject[From](x: From)
-      (implicit ev: TypeClassCommon { type This = From }): ev.Instance { type This = From } =
-    ev.inject(x)
-}
-import runtime.*
-
-object semiGroups {
-
-  trait SemiGroup extends TypeClass {
-    val commons: SemiGroupCommon
-    import commons.*
-    def add(that: This): This
-  }
-  trait SemiGroupCommon extends TypeClassCommon {
-    type Instance <: SemiGroup
-  }
-  object SemiGroup extends TypeClassCompanion {
-    type Impl[T] = SemiGroupCommon { type This = T }
-  }
-
-  trait Monoid extends SemiGroup {
-    val commons: MonoidCommon
-    import commons.*
-  }
-  trait MonoidCommon extends SemiGroupCommon {
-    type Instance <: Monoid
-    def unit: This
-  }
-  object Monoid extends TypeClassCompanion {
-    type Impl[T] = MonoidCommon { type This = T }
-  }
-
-  implicit object IntOps extends MonoidCommon {
-    type This = Int
-    type Instance = Monoid
-    def unit: Int = 0
-    def inject($this: Int) = new Monoid {
-      val commons: IntOps.this.type = IntOps.this
-      def add(that: this.This): this.This = $this + that
-    }
-  }
-
-  implicit object StringOps extends MonoidCommon {
-    type This = String
-    type Instance = Monoid
-    def unit = ""
-    def inject($this: String) = new Monoid {
-      val commons: StringOps.this.type = StringOps.this
-      def add(that: this.This): this.This = $this.concat(that)
-    }
-  }
-
-  enum Nat extends Monoid {
-    case Z
-    case S(n: Nat)
-
-    def add(that: Nat): Nat = this match {
-      case Z => that
-      case S(n) => S(n.add(that))
-    }
-
-    val commons: Nat.type = Nat
-  }
-  object Nat extends MonoidCommon {
-    type This = Nat
-    type Instance = Nat
-    def unit = Nat.Z
-    def inject($this: Nat) = $this
-  }
-  import Nat.{Z, S}
-
-  implicit def NatOps: Nat.type = Nat
-
-  def sum[T](xs: List[T])(implicit ev: Monoid.Impl[T]) =
-    xs.foldLeft(Monoid.impl[T].unit)((x, y) => x `add` y)
-
-  sum(List(1, 2, 3))
-  sum(List("hello ", "world!"))
-  sum(List(Z, S(Z), S(S(Z))))
-}
-
-/** 2. Generic implementations of simple type classes.
-
-    trait Ord extends TypeClass {
-      def compareTo(that: This): Int
-      def < (that: This) = compareTo(that) < 0
-      def > (that: This) = compareTo(that) > 0
-    }
-    common {
-      val minimum: This
-    }
-
-    extension IntOrd for Int : Ord {
-      def compareTo(that: Int) =
-        if (this < that) -1 else if (this > that) +1 else 0
-    }
-    common {
-      val minimum = Int.MinValue
-    }
-
-    extension ListOrd[T : Ord] for List[T] : Ord {
-      def compareTo(that: List[T]): Int = (this, that) match {
-        case (Nil, Nil) => 0
-        case (Nil, _) => -1
-        case (_, Nil) => +1
-        case (x :: xs, y :: ys) =>
-          val fst = x.compareTo(y)
-          if (fst != 0) fst else xs.compareTo(ys)
-      }
-    }
-    common {
-      val minimum = Nil
-    }
-
-    def min[T: Ord](x: T, y: T) = if (x < y) x else y
-
-    def inf[T: Ord](xs: List[T]): T = (Ord.impl[T].minimum /: xs)(min)
-*/
-object ord {
-
-  trait Ord extends TypeClass {
-    val commons: OrdCommon
-    import commons.*
-    def compareTo(that: This): Int
-    def < (that: This) = compareTo(that) < 0
-    def > (that: This) = compareTo(that) > 0
-  }
-  trait OrdCommon extends TypeClassCommon {
-    type Instance <: Ord
-    def minimum: This
-  }
-  object Ord extends TypeClassCompanion {
-    type Impl[T] = OrdCommon { type This = T }
-  }
-
-  implicit object IntOrd extends OrdCommon {
-    type This = Int
-    type Instance = Ord
-    val minimum: Int = Int.MinValue
-    def inject($this: Int) = new Ord {
-      val commons: IntOrd.this.type = IntOrd.this
-      import commons.*
-      def compareTo(that: this.This): Int =
-        if (this < that) -1 else if (this > that) +1 else 0
-    }
-  }
-
-  class ListOrd[T](implicit ev: Ord.Impl[T]) extends OrdCommon { self =>
-    type This = List[T]
-    type Instance = Ord
-    def minimum: List[T] = Nil
-    def inject($this: List[T]) = new Ord {
-      val commons: self.type = self
-      import commons.*
-      def compareTo(that: List[T]): Int = ($this, that) match {
-        case (Nil, Nil) => 0
-        case (Nil, _) => -1
-        case (_, Nil) => +1
-        case (x :: xs, y :: ys) =>
-          val fst = x.compareTo(y)
-          if (fst != 0) fst else xs.compareTo(ys)
-      }
-    }
-  }
-
-  implicit def listOrd[T](implicit ev: Ord.Impl[T]): ListOrd[T] =
-    new ListOrd[T]
-
-  def min[T](x: T, y: T)(implicit ev: Ord.Impl[T]): T =
-    if (x < y) x else y
-
-  def inf[T](xs: List[T])(implicit ev: Ord.Impl[T]): T = {
-    val smallest = Ord.impl[T].minimum
-    xs.foldLeft(smallest)(min)
-  }
-
-  inf(List[Int]())
-  inf(List(List(1, 2), List(1, 2, 3)))
-  inf(List(List(List(1), List(2)), List(List(1), List(2), List(3))))
-}
-
-/** 3. Higher-kinded type classes
-
-    trait Functor[A] extends TypeClass1 {
-      def map[B](f: A => B): This[B]
-    }
-    common {
-      def pure[A](x: A): This[A]
-    }
-
-    // Generically, `pure[A]{.map(f)}^n`
-    def develop[A, F[X] : Functor[X]](n: Int, f: A => A): F[A] =
-      if (n == 0) Functor.impl[F].pure[A]
-      else develop[A, F](n - 1, f).map(f)
-
-    trait Monad[A] extends Functor[A] {
-      def flatMap[B](f: A => This[B]): This[B]
-      def map[B](f: A => B) = this.flatMap(f.andThen(pure))
-    }
-
-    extension ListMonad[T] for List[T] : Monad[T] {
-      static def pure[A] = Nil
-
-      def flatMap[B](f: A => List[B]): List[B] = this match {
-        case x :: xs => f(x) ++ xs.flatMap(f)
-        case Nil => Nil
-      }
-    }
-
-    extension MonadFlatten[T[X]: Monad[X]] for T[T[A]] {
-      def flatten: T[A] = this.flatMap(identity)
-    }
-*/
-object runtime1 {
-
-  trait TypeClass1 {
-    val commons: TypeClassCommon1
-    type This = [X] =>> commons.This[X]
-  }
-
-  trait TypeClassCommon1 { self =>
-    type This[X]
-    type Instance[X] <: TypeClass1
-    def inject[A](x: This[A]): Instance[A] { val commons: self.type }
-  }
-
-  trait TypeClassCompanion1 {
-    type Impl[T[_]] <: TypeClassCommon1 { type This = [X] =>> T[X] }
-    def impl[T[_]](implicit ev: Impl[T]): Impl[T] = ev
-  }
-
-  implicit def inject1[A, From[_]](x: From[A])
-      (implicit ev: TypeClassCommon1 {
-        type This = [X] =>> From[X]
-      }): ev.Instance[A] { type This = [X] =>> From[X] } =
-    ev.inject(x)
-}
-import runtime1.*
-
-object functors {
-
-  trait Functor[A] extends TypeClass1 {
-    val commons: FunctorCommon
-    import commons.*
-    def map[B](f: A => B): This[B]
-  }
-  trait FunctorCommon extends TypeClassCommon1 {
-    type Instance[X] <: Functor[X]
-    def pure[A](x: A): This[A]
-  }
-  object Functor extends TypeClassCompanion1 {
-    type Impl[T[_]] = FunctorCommon { type This = [X] =>> T[X] }
-  }
-
-  trait Monad[A] extends Functor[A] {
-    val commons: MonadCommon
-    import commons.*
-    def flatMap[B](f: A => This[B]): This[B]
-    def map[B](f: A => B) = this.flatMap(f.andThen(commons.pure))
-  }
-  trait MonadCommon extends FunctorCommon {
-    type Instance[X] <: Monad[X]
-  }
-  object Monad extends TypeClassCompanion1 {
-    type Impl[T[_]] = MonadCommon { type This = [X] =>> T[X] }
-  }
-
-  def develop[A, F[X]](n: Int, x: A, f: A => A)(implicit ev: Functor.Impl[F]): F[A] =
-    if (n == 0) Functor.impl[F].pure(x)
-    else develop(n - 1, x, f).map(f).asInstanceOf
-
-  implicit object ListMonad extends MonadCommon {
-    type This[+X] = List[X]
-    type Instance[X] = Monad[X]
-    def pure[A](x: A) = x :: Nil
-    def inject[A]($this: List[A]) = new Monad[A] {
-      val commons: ListMonad.this.type = ListMonad
-      import commons.*
-      def flatMap[B](f: A => List[B]): List[B] = $this.flatMap(f)
-    }
-  }
-
-  object MonadFlatten {
-    def flattened[T[_], A]($this: T[T[A]])(implicit ev: Monad.Impl[T]): T[A] =
-      ??? // $this.flatMap[A](identity)   disabled since it does not typecheck
-  }
-
-  MonadFlatten.flattened(List(List(1, 2, 3), List(4, 5)))
-}
\ No newline at end of file
diff --git a/tests/pos/unary-eq.scala b/tests/pos/unary-eq.scala
new file mode 100644
index 000000000000..9e9d871a0912
--- /dev/null
+++ b/tests/pos/unary-eq.scala
@@ -0,0 +1,6 @@
+final class Baz private (val x: Int) extends AnyVal {
+  def `unary_!_=`() : Baz = ??? // parses ok, but will not be usable
+  def `unary_~_=`() : Baz = ??? // parses ok, but will not be usable
+  def `unary_+_=`() : Baz = ??? // parses ok, but will not be usable
+  def `unary_-_=`() : Baz = ??? // parses ok, but will not be usable
+}
diff --git a/tests/pos/unify-wildcard-patterns.scala b/tests/pos/unify-wildcard-patterns.scala
new file mode 100644
index 000000000000..9f18cebae1f5
--- /dev/null
+++ b/tests/pos/unify-wildcard-patterns.scala
@@ -0,0 +1,23 @@
+// `case _ => expr` in a match expression should be equivalant to
+// `case _: Any => expr`. Likewise, in a match type, `case _ => T`
+// should be equivalant to `case Any => T`.
+
+object Test0 {
+  type M[X] =            X match { case String => Int   case Any => String }
+  def m[X](x: X): M[X] = x match { case _: String => 1  case _: Any => "s" }
+}
+
+object Test1 {
+  type M[X] =            X match { case String => Int   case Any => String }
+  def m[X](x: X): M[X] = x match { case _: String => 1  case _ => "s"      }
+}
+
+object Test2 {
+  type M[X] =            X match { case String => Int   case _ => String   }
+  def m[X](x: X): M[X] = x match { case _: String => 1  case _: Any => "s" }
+}
+
+object Test3 {
+  type M[X] =            X match { case String => Int   case _ => String   }
+  def m[X](x: X): M[X] = x match { case _: String => 1  case _ => "s"      }
+}
diff --git a/tests/pos/widen-union.scala b/tests/pos/widen-union.scala
index b0b64f0dc6c6..ec58f3da1941 100644
--- a/tests/pos/widen-union.scala
+++ b/tests/pos/widen-union.scala
@@ -5,6 +5,11 @@ object Test1:
   val z: Int | String = y
 
 object Test2:
+  val x: 3 | "a" = 3
+  val y = x
+  val z: Int | String = y
+
+object Test3:
   type Sig = Int | String
   def consistent(x: Sig, y: Sig): Boolean = ???// x == y
 
@@ -12,7 +17,7 @@ object Test2:
        xs.corresponds(ys)(consistent)        // OK
     || xs.corresponds(ys)(consistent(_, _))  // error, found: Any, required: Int | String
 
-object Test3:
+object Test4:
 
   def g[X](x: X | String): Int = ???
   def y: Boolean | String = ???
diff --git a/tests/pos/zipped.scala b/tests/pos/zipped.scala
new file mode 100644
index 000000000000..a23fd62acbb0
--- /dev/null
+++ b/tests/pos/zipped.scala
@@ -0,0 +1,36 @@
+// This test shows some un-intuitive behavior of the `zipped` method.
+object Test {
+  val xs: List[Int] = ???
+
+  // 1. This works, since withFilter is not defined on Tuple3zipped. Instead,
+  // an implicit conversion from Tuple3zipped to Traversable[(Int, Int, Int)] is inserted.
+  // The subsequent map operation has the right type for this Traversable.
+  xs.lazyZip(xs).lazyZip(xs)
+    .withFilter( (x: (Int, Int, Int)) => x match { case (x, y, z) => true } )  // OK
+    .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z })     // OK
+
+
+  // 2. This works as well, because of auto untupling i.e. `case` is inserted.
+  // But it does not work in Scala2.
+  xs.lazyZip(xs).lazyZip(xs)
+  .withFilter( (x: (Int, Int, Int)) => x match { case (x, y, z) => true } )  // OK
+  .map( (x: Int, y: Int, z: Int) => x + y + z )  // OK
+      // works, because of auto untupling i.e. `case` is inserted
+      // does not work in Scala2
+
+  // 3. Now, without withFilter, it's the opposite, we need the 3 parameter map.
+  xs.lazyZip(xs).lazyZip(xs)
+    .map( (x: Int, y: Int, z: Int) => x + y + z )     // OK
+
+  // 4. The single parameter map works through an inserted conversion
+  xs.lazyZip(xs).lazyZip(xs)
+    .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z })     // now also OK
+
+  // 5. But if that pone is deeper nested, it does not work since we don't retypecheck
+  //    arguments deeply.
+  //xs.lazyZip(xs).lazyZip(xs)
+  //  .map( x => x match { case (x, y, z) => x + y + z })     // now also OK
+
+  // This means that the following works in Dotty 3.0 as well as 3.x
+  for ((x, y, z) <- xs.lazyZip(xs).lazyZip(xs)) yield x + y + z
+}
\ No newline at end of file
diff --git a/tests/pos/zipper.scala b/tests/pos/zipper.scala
new file mode 100644
index 000000000000..6ccd5462a43c
--- /dev/null
+++ b/tests/pos/zipper.scala
@@ -0,0 +1,29 @@
+enum Tree[+A]:
+  case Branch(left: Tree[A], right: Tree[A])
+  case Leaf(value: A)
+
+enum Context[+A]:
+  case Empty
+  case InLeft(right: Tree[A], parent: Context[A])
+  case InRight(left: Tree[A], parent: Context[A])
+
+import Tree.*, Context.*
+
+class Zipper[+A](val focus: Tree[A], val context: Context[A]):
+  def unfocus: Tree[A] = context match
+    case Empty => focus
+    case _ => moveUp.unfocus
+  def moveUp: Zipper[A] = context match
+    case Empty => this
+    case InLeft(right, parent) => Zipper(Branch(focus, right), parent)
+    case InRight(left, parent) => Zipper(Branch(left, focus), parent)
+  def moveLeft: Zipper[A] = focus match
+    case Leaf(_) => this
+    case Branch(left, right) => Zipper(left, InLeft(right, context))
+  def moveRight: Zipper[A] = focus match
+    case Leaf(_) => this
+    case Branch(left, right) => Zipper(right, InRight(left, context))
+  def replaceFocus[B >: A](newFocus: Tree[B]): Zipper[B] =
+    Zipper(newFocus, context)
+
+extension[A](tree: Tree[A]) def focus: Zipper[A] = Zipper(tree, Empty)
diff --git a/tests/printing/annot-printing.check b/tests/printing/annot-printing.check
new file mode 100644
index 000000000000..fc71f5730d78
--- /dev/null
+++ b/tests/printing/annot-printing.check
@@ -0,0 +1,22 @@
+[[syntax trees at end of                     typer]] // tests/printing/annot-printing.scala
+package <empty> {
+  import scala.annotation.*
+  class Foo() extends annotation.Annotation() {}
+  class Bar(s: String) extends annotation.Annotation() {
+    private[this] val s: String
+  }
+  class Xyz(i: Int) extends annotation.Annotation() {
+    private[this] val i: Int
+  }
+  final lazy module val Xyz: Xyz = new Xyz()
+  final module class Xyz() extends AnyRef() { this: Xyz.type =>
+    def $lessinit$greater$default$1: Int @uncheckedVariance = 23
+  }
+  final lazy module val annot-printing$package: annot-printing$package = 
+    new annot-printing$package()
+  final module class annot-printing$package() extends Object() { 
+    this: annot-printing$package.type =>
+    def x: Int @nowarn() @main @Xyz() @Foo @Bar("hello") = ???
+  }
+}
+
diff --git a/tests/printing/annot-printing.scala b/tests/printing/annot-printing.scala
new file mode 100644
index 000000000000..7ef44b0190f3
--- /dev/null
+++ b/tests/printing/annot-printing.scala
@@ -0,0 +1,7 @@
+import scala.annotation.*
+
+class Foo() extends Annotation
+class Bar(s: String) extends Annotation
+class Xyz(i: Int = 23) extends Annotation
+
+def x: Int @nowarn @main @Xyz() @Foo @Bar("hello") = ???
diff --git a/tests/printing/dependent-annot.check b/tests/printing/dependent-annot.check
new file mode 100644
index 000000000000..393d444d5350
--- /dev/null
+++ b/tests/printing/dependent-annot.check
@@ -0,0 +1,25 @@
+[[syntax trees at end of                     typer]] // tests/printing/dependent-annot.scala
+package <empty> {
+  class C() extends Object() {}
+  class ann(x: Seq[Any] @Repeated) extends annotation.Annotation() {
+    private[this] val x: Seq[Any] @Repeated
+  }
+  final lazy module val dependent-annot$package: dependent-annot$package = 
+    new dependent-annot$package()
+  final module class dependent-annot$package() extends Object() { 
+    this: dependent-annot$package.type =>
+    def f(y: C, z: C): Unit = 
+      {
+        def g(): C @ann([y,z : Any]*) = ???
+        val ac: 
+          (C => Array[String]) 
+            {
+              def apply(x: C): Array[String @ann([x : Any]*)]
+            }
+         = ???
+        val dc: Array[String] = ac.apply(g())
+        ()
+      }
+  }
+}
+
diff --git a/tests/printing/dependent-annot.scala b/tests/printing/dependent-annot.scala
new file mode 100644
index 000000000000..28f0f8bd59e6
--- /dev/null
+++ b/tests/printing/dependent-annot.scala
@@ -0,0 +1,7 @@
+class C
+class ann(x: Any*) extends annotation.Annotation
+
+def f(y: C, z: C) =
+  def g(): C @ann(y, z) = ???
+  val ac: ((x: C) => Array[String @ann(x)]) = ???
+  val dc = ac(g())
diff --git a/tests/printing/i13306.check b/tests/printing/i13306.check
new file mode 100644
index 000000000000..053d2f861cf3
--- /dev/null
+++ b/tests/printing/i13306.check
@@ -0,0 +1,14 @@
+[[syntax trees at end of                     typer]] // tests/printing/i13306.scala
+package example {
+  class MyClass() extends Object() {}
+  class MembersContainer() extends Object() {
+    type MyType[T >: Nothing <: example.MyClass] = Comparable[T]
+  }
+  final lazy module val Exports: example.Exports = new example.Exports()
+  final module class Exports() extends Object() { this: example.Exports.type =>
+    val instance: example.MembersContainer = new example.MembersContainer()
+    export example.Exports.instance.*
+    final type MyType[T <: example.MyClass] = Comparable[T]
+  }
+}
+
diff --git a/tests/printing/i13306.scala b/tests/printing/i13306.scala
new file mode 100644
index 000000000000..790f55018404
--- /dev/null
+++ b/tests/printing/i13306.scala
@@ -0,0 +1,12 @@
+package example
+
+class MyClass
+
+class MembersContainer {
+  type MyType[T <: MyClass] = Comparable[T]
+}
+
+object Exports {
+  val instance = new MembersContainer
+  export instance.*
+}
diff --git a/tests/printing/i620.check b/tests/printing/i620.check
index 1dedb6d375a7..3780e2cf3045 100644
--- a/tests/printing/i620.check
+++ b/tests/printing/i620.check
@@ -1,4 +1,4 @@
-result of tests/printing/i620.scala after typer:
+[[syntax trees at end of                     typer]] // tests/printing/i620.scala
 package O {
   package O.A {
     class D() extends Object() {
@@ -30,3 +30,4 @@ package O {
     }
   }
 }
+
diff --git a/tests/printing/untyped/annot-printing.check b/tests/printing/untyped/annot-printing.check
new file mode 100644
index 000000000000..b9ff9670cadd
--- /dev/null
+++ b/tests/printing/untyped/annot-printing.check
@@ -0,0 +1,9 @@
+[[syntax trees at end of                    parser]] // tests/printing/untyped/annot-printing.scala
+package <empty> {
+  import scala.annotation.*
+  class Foo() extends Annotation {}
+  class Bar(private[this] val s: String) extends Annotation {}
+  class Xyz(private[this] val i: Int = 23) extends Annotation {}
+  def x: Int @nowarn @main @Xyz @Foo @Bar("hello") = ???
+}
+
diff --git a/tests/printing/untyped/annot-printing.scala b/tests/printing/untyped/annot-printing.scala
new file mode 100644
index 000000000000..7ef44b0190f3
--- /dev/null
+++ b/tests/printing/untyped/annot-printing.scala
@@ -0,0 +1,7 @@
+import scala.annotation.*
+
+class Foo() extends Annotation
+class Bar(s: String) extends Annotation
+class Xyz(i: Int = 23) extends Annotation
+
+def x: Int @nowarn @main @Xyz() @Foo @Bar("hello") = ???
diff --git a/tests/printing/untyped/dependent-annot.check b/tests/printing/untyped/dependent-annot.check
new file mode 100644
index 000000000000..9322f9286fbf
--- /dev/null
+++ b/tests/printing/untyped/dependent-annot.check
@@ -0,0 +1,13 @@
+[[syntax trees at end of                    parser]] // tests/printing/untyped/dependent-annot.scala
+package <empty> {
+  class C {}
+  class ann(private[this] val x: Any *) extends annotation.Annotation {}
+  def f(y: C, z: C) = 
+    {
+      def g(): C @ann(y, z) = ???
+      val ac: ((x: C) => Array[String @ann(x)]) = ???
+      val dc = ac(g())
+      <empty>
+    }
+}
+
diff --git a/tests/printing/untyped/dependent-annot.scala b/tests/printing/untyped/dependent-annot.scala
new file mode 100644
index 000000000000..28f0f8bd59e6
--- /dev/null
+++ b/tests/printing/untyped/dependent-annot.scala
@@ -0,0 +1,7 @@
+class C
+class ann(x: Any*) extends annotation.Annotation
+
+def f(y: C, z: C) =
+  def g(): C @ann(y, z) = ???
+  val ac: ((x: C) => Array[String @ann(x)]) = ???
+  val dc = ac(g())
diff --git a/tests/rewrites/i12340.check b/tests/rewrites/i12340.check
new file mode 100644
index 000000000000..c6cb9af8bb57
--- /dev/null
+++ b/tests/rewrites/i12340.check
@@ -0,0 +1,17 @@
+
+class C {
+  def f = 42
+} // end C
+
+def f(i: Int) = {
+  if i < 42 then
+    println(i)
+  end if
+  i
+} // end f
+
+def g(i: Int) =
+  if i < 42 then
+    println(i)
+  end if
+end g
diff --git a/tests/rewrites/i12340.scala b/tests/rewrites/i12340.scala
new file mode 100644
index 000000000000..bf907ef9f276
--- /dev/null
+++ b/tests/rewrites/i12340.scala
@@ -0,0 +1,17 @@
+
+class C:
+  def f = 42
+end C
+
+def f(i: Int) =
+  if i < 42 then
+    println(i)
+  end if
+  i
+end f
+
+def g(i: Int) =
+  if i < 42 then
+    println(i)
+  end if
+end g
diff --git a/tests/run-custom-args/Xmacro-settings/compileTimeEnv.check b/tests/run-custom-args/Xmacro-settings/compileTimeEnv.check
new file mode 100644
index 000000000000..61075d3bb6aa
--- /dev/null
+++ b/tests/run-custom-args/Xmacro-settings/compileTimeEnv.check
@@ -0,0 +1,6 @@
+I'm a info msg
+I'm a warn msg
+a = []
+b = [1]
+c.b.a = [x.y.z=1]
+wat is not defined
diff --git a/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Logging.scala b/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Logging.scala
new file mode 100644
index 000000000000..702097671924
--- /dev/null
+++ b/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Logging.scala
@@ -0,0 +1,35 @@
+import scala.compiletime.*
+import scala.quoted.*
+
+
+object Logging {
+
+  // Just use your imagination for now :)
+  private inline val Trace = 0
+  private inline val Debug = 1
+  private inline val Info  = 2
+  private inline val Warn  = 3
+
+  private transparent inline def chosenThreshold: Int = ${
+     choosenTresholdImpl
+  }
+
+
+  private def choosenTresholdImpl(using Quotes):Expr[Int] =
+    import quotes.reflect.*
+    MacroEnv.getInMacro("myLogger.level") match
+        case Some("TRACE") => Expr(Trace)
+        case Some("DEBUG") => Expr(Debug)
+        case Some("INFO")  => Expr(Info)
+        case Some("WARN")  => Expr(Warn)
+        case Some(x)       => report.errorAndAbort("Unsupported logging level: " + x)
+        case None          => Expr(Trace)
+
+  private inline def log(inline lvl: Int, inline msg: String): Unit =
+    inline if lvl >= chosenThreshold then println(msg)
+
+  inline def trace(inline msg: String): Unit = log(Trace, msg)
+  inline def debug(inline msg: String): Unit = log(Debug, msg)
+  inline def info (inline msg: String): Unit = log(Info , msg)
+  inline def warn (inline msg: String): Unit = log(Warn , msg)
+}
diff --git a/tests/run-custom-args/Xmacro-settings/compileTimeEnv/MacroEnv.scala b/tests/run-custom-args/Xmacro-settings/compileTimeEnv/MacroEnv.scala
new file mode 100644
index 000000000000..bde3719396aa
--- /dev/null
+++ b/tests/run-custom-args/Xmacro-settings/compileTimeEnv/MacroEnv.scala
@@ -0,0 +1,25 @@
+import scala.quoted.*
+
+object MacroEnv {
+
+ transparent inline def get(inline key:String):Option[String] = ${
+    getImpl('key)
+ }
+
+ def getImpl(key:Expr[String])(using Quotes):Expr[Option[String]] = {
+    import quotes.reflect.*
+    val retval = getInMacro(key.valueOrAbort)
+    Expr(retval)
+ }
+
+ def getInMacro(key:String)(using Quotes):Option[String] = {
+    import quotes.reflect.*
+    val keyEq = key + "="
+    CompilationInfo.XmacroSettings.collectFirst{
+      case v if v == key => ""
+      case v if v.startsWith(keyEq) =>
+                  v.substring(keyEq.length)
+    }
+ }
+
+}
diff --git a/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Test.scala b/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Test.scala
new file mode 100644
index 000000000000..7cd9b03b7bb6
--- /dev/null
+++ b/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Test.scala
@@ -0,0 +1,30 @@
+import scala.compiletime.*
+
+object Test {
+  import Logging.*
+
+  def main(args: Array[String]): Unit = {
+     runLog()
+     runBasic()
+  }
+
+  def runLog(): Unit = {
+    trace("I'm a trace msg")
+    debug("I'm a debug msg")
+    info("I'm a info msg")
+    warn("I'm a warn msg")
+  }
+
+  def runBasic(): Unit = {
+    printEnv("a")    
+    printEnv("b")    
+    printEnv("c.b.a")    
+    printEnv("wat")    
+  }
+
+  inline def printEnv(inline k: String): Unit =
+    inline MacroEnv.get(k) match
+      case Some(v) => println(s"$k = [$v]")
+      case None    => println(k + " is not defined")
+
+}
diff --git a/tests/run-custom-args/Xmacro-settings/simple/M1.scala b/tests/run-custom-args/Xmacro-settings/simple/M1.scala
new file mode 100644
index 000000000000..1210d1abe05e
--- /dev/null
+++ b/tests/run-custom-args/Xmacro-settings/simple/M1.scala
@@ -0,0 +1,15 @@
+package x
+
+import scala.quoted.*
+
+object M:
+
+  inline def settingsContains(inline x:String): Boolean = ${
+     settingsContainsImpl('x)
+  }
+
+  def settingsContainsImpl(x:Expr[String])(using Quotes): Expr[Boolean] =
+     import quotes.reflect.*
+     val v = x.valueOrAbort
+     val r = CompilationInfo.XmacroSettings.contains(v)
+     Expr(r)
diff --git a/tests/run-custom-args/Xmacro-settings/simple/Test.scala b/tests/run-custom-args/Xmacro-settings/simple/Test.scala
new file mode 100644
index 000000000000..97587362c835
--- /dev/null
+++ b/tests/run-custom-args/Xmacro-settings/simple/Test.scala
@@ -0,0 +1,10 @@
+import x.*
+
+object Test {
+
+   def main(args: Array[String]):Unit =
+    assert(M.settingsContains("one"))
+    assert(!M.settingsContains("notwo"))
+    assert(M.settingsContains("two"))
+
+}
diff --git a/tests/run-custom-args/Yread-comments/i12351/GetDocString_1.scala b/tests/run-custom-args/Yread-comments/i12351/GetDocString_1.scala
new file mode 100644
index 000000000000..5bd3cb1c1f53
--- /dev/null
+++ b/tests/run-custom-args/Yread-comments/i12351/GetDocString_1.scala
@@ -0,0 +1,11 @@
+import scala.quoted.*
+
+/** HELLO */
+case class Data(test: Boolean)
+
+inline def getDocString[T]: Option[String] = ${ getDocStringImpl[T] }
+
+private def getDocStringImpl[T : Type](using Quotes): Expr[Option[String]] = {
+    import quotes.reflect.*
+    Expr(TypeRepr.of[T].typeSymbol.docstring)
+}
diff --git a/tests/run-custom-args/Yread-comments/i12351/Test_2.scala b/tests/run-custom-args/Yread-comments/i12351/Test_2.scala
new file mode 100644
index 000000000000..5afd97061411
--- /dev/null
+++ b/tests/run-custom-args/Yread-comments/i12351/Test_2.scala
@@ -0,0 +1,4 @@
+@main def Test(): Unit = {
+    println(getDocString[Data])
+    assert(getDocString[Data].nonEmpty)
+}
diff --git a/tests/run-custom-args/Yread-comments/i12352/Macro.scala b/tests/run-custom-args/Yread-comments/i12352/Macro.scala
new file mode 100644
index 000000000000..4b4807750dcc
--- /dev/null
+++ b/tests/run-custom-args/Yread-comments/i12352/Macro.scala
@@ -0,0 +1,8 @@
+import scala.quoted.*
+
+inline def getDocString[T]: Option[String] = ${ getDocStringImpl[T] }
+
+private def getDocStringImpl[T : Type](using Quotes): Expr[Option[String]] = {
+    import quotes.reflect.*
+    Expr(TypeRepr.of[T].typeSymbol.docstring)
+}
diff --git a/tests/run-custom-args/Yread-comments/i12352/Main.scala b/tests/run-custom-args/Yread-comments/i12352/Main.scala
new file mode 100644
index 000000000000..78d0906652b2
--- /dev/null
+++ b/tests/run-custom-args/Yread-comments/i12352/Main.scala
@@ -0,0 +1,5 @@
+@main def Test(): Unit = {
+    val res = getDocString[scala.quoted.Quotes]
+    println(res)
+    assert(res.nonEmpty)
+}
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-2.check b/tests/run-custom-args/Yretain-trees/tasty-definitions-2.check
index 3c2b67edfde0..206dda1448d6 100644
--- a/tests/run-custom-args/Yretain-trees/tasty-definitions-2.check
+++ b/tests/run-custom-args/Yretain-trees/tasty-definitions-2.check
@@ -1,3 +1,3 @@
 DefDef("foo", Nil, TypeIdent("Int"), Some(Apply(Select(Literal(IntConstant(1)), "+"), List(Literal(IntConstant(2))))))
 ValDef("bar", TypeIdent("Int"), Some(Apply(Select(Literal(IntConstant(2)), "+"), List(Literal(IntConstant(3))))))
-Bind("x", Ident("_"))
+Bind("x", Wildcard())
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-3.check b/tests/run-custom-args/Yretain-trees/tasty-definitions-3.check
index 3c2b67edfde0..206dda1448d6 100644
--- a/tests/run-custom-args/Yretain-trees/tasty-definitions-3.check
+++ b/tests/run-custom-args/Yretain-trees/tasty-definitions-3.check
@@ -1,3 +1,3 @@
 DefDef("foo", Nil, TypeIdent("Int"), Some(Apply(Select(Literal(IntConstant(1)), "+"), List(Literal(IntConstant(2))))))
 ValDef("bar", TypeIdent("Int"), Some(Apply(Select(Literal(IntConstant(2)), "+"), List(Literal(IntConstant(3))))))
-Bind("x", Ident("_"))
+Bind("x", Wildcard())
diff --git a/tests/run-custom-args/erased/i11996.scala b/tests/run-custom-args/erased/i11996.scala
new file mode 100644
index 000000000000..050d36370ef0
--- /dev/null
+++ b/tests/run-custom-args/erased/i11996.scala
@@ -0,0 +1,23 @@
+final class UnivEq[A]
+
+object UnivEq:
+  erased def force[A]: UnivEq[A] =
+    compiletime.erasedValue
+
+extension [A](a: A)
+  inline def ==*[B >: A](b: B)(using erased UnivEq[B]): Boolean = a == b
+  inline def !=*[B >: A](b: B)(using erased UnivEq[B]): Boolean = a != b
+
+case class I(i: Int)
+
+@main def Test = {
+  def test[A](a: A, b: A): Unit = {
+    erased given UnivEq[A] = UnivEq.force[A]
+    println(a ==* a)
+    println(a !=* b)
+  }
+  println("Test starting...")
+  test(I(1), I(2)) // error
+  test(1, 2)
+  test(true, false)
+}
diff --git a/tests/run-custom-args/fatal-warnings/i11050.scala b/tests/run-custom-args/fatal-warnings/i11050.scala
new file mode 100644
index 000000000000..f0bdd23031fa
--- /dev/null
+++ b/tests/run-custom-args/fatal-warnings/i11050.scala
@@ -0,0 +1,141 @@
+import scala.compiletime.*
+import scala.deriving.*
+
+object OriginalReport:
+  sealed trait TreeValue
+  sealed trait SubLevel extends TreeValue
+  case class Leaf1(value: String) extends TreeValue
+  case class Leaf2(value: Int)    extends SubLevel
+
+// Variants from the initial failure in akka.event.LogEvent
+object FromAkkaCB:
+  sealed trait A
+  sealed trait B extends A
+  sealed trait C extends A
+  case class D() extends B, C
+  case class E() extends C, B
+
+object FromAkkaCB2:
+  sealed trait A
+  sealed trait N extends A
+  case class B() extends A
+  case class C() extends A, N
+
+object FromAkkaCB3:
+  sealed trait A
+  case class B() extends A
+  case class C() extends A
+  class D extends C // ignored pattern: class extending a case class
+
+object NoUnreachableWarnings:
+  sealed trait Top
+  object Top
+
+  final case class MiddleA() extends Top with Bottom
+  final case class MiddleB() extends Top with Bottom
+  final case class MiddleC() extends Top with Bottom
+
+  sealed trait Bottom extends Top
+
+object FromAkkaCB4:
+  sealed trait LogEvent
+  object LogEvent
+  case class Error() extends LogEvent
+  class Error2() extends Error() with LogEventWithMarker // ignored pattern
+  case class Warning() extends LogEvent
+  sealed trait LogEventWithMarker extends LogEvent // must be defined late
+
+object FromAkkaCB4simpler:
+  sealed trait LogEvent
+  object LogEvent
+  case class Error() extends LogEvent
+  class Error2() extends LogEventWithMarker // not a case class
+  case class Warning() extends LogEvent
+  sealed trait LogEventWithMarker extends LogEvent
+
+object Test:
+  def main(args: Array[String]): Unit =
+    testOriginalReport()
+    testFromAkkaCB()
+    testFromAkkaCB2()
+  end main
+
+  def testOriginalReport() =
+    import OriginalReport._
+    val m                 = summon[Mirror.SumOf[TreeValue]]
+    given Show[TreeValue] = Show.derived[TreeValue]
+    val leaf1             = Leaf1("1")
+    val leaf2             = Leaf2(2)
+
+    assertEq(List(leaf1, leaf2).map(m.ordinal), List(1, 0))
+    assertShow[TreeValue](leaf1, "[1] Leaf1(value = \"1\")")
+    assertShow[TreeValue](leaf2, "[0] [0] Leaf2(value = 2)")
+  end testOriginalReport
+
+  def testFromAkkaCB() =
+    import FromAkkaCB._
+    val m         = summon[Mirror.SumOf[A]]
+    given Show[A] = Show.derived[A]
+    val d         = D()
+    val e         = E()
+
+    assertEq(List(d, e).map(m.ordinal), List(0, 0))
+    assertShow[A](d, "[0] [0] D")
+    assertShow[A](e, "[0] [1] E")
+  end testFromAkkaCB
+
+  def testFromAkkaCB2() =
+    import FromAkkaCB2._
+    val m         = summon[Mirror.SumOf[A]]
+    val n         = summon[Mirror.SumOf[N]]
+    given Show[A] = Show.derived[A]
+    val b         = B()
+    val c         = C()
+
+    assertEq(List(b, c).map(m.ordinal), List(1, 0))
+    assertShow[A](b, "[1] B")
+    assertShow[A](c, "[0] [0] C")
+  end testFromAkkaCB2
+
+  def assertEq[A](obt: A, exp: A)          = assert(obt == exp, s"$obt != $exp (obtained != expected)")
+  def assertShow[A: Show](x: A, s: String) = assertEq(Show.show(x), s)
+end Test
+
+trait Show[-T]:
+  def show(x: T): String
+
+object Show:
+  given Show[Int]    with { def show(x: Int)    = s"$x"     }
+  given Show[Char]   with { def show(x: Char)   = s"'$x'"   }
+  given Show[String] with { def show(x: String) = s"$"$x$"" }
+
+  inline def show[T](x: T): String = summonInline[Show[T]].show(x)
+
+  transparent inline def derived[T](implicit ev: Mirror.Of[T]): Show[T] = new {
+    def show(x: T): String = inline ev match {
+      case m: Mirror.ProductOf[T] => showProduct(x.asInstanceOf[Product], m)
+      case m: Mirror.SumOf[T]     => showCases[m.MirroredElemTypes](0)(x, m.ordinal(x))
+    }
+  }
+
+  transparent inline def showProduct[T](x: Product, m: Mirror.ProductOf[T]): String =
+    constValue[m.MirroredLabel] + showElems[m.MirroredElemTypes, m.MirroredElemLabels](0, Nil)(x)
+
+  transparent inline def showElems[Elems <: Tuple, Labels <: Tuple](n: Int, elems: List[String])(x: Product): String =
+    inline (erasedValue[Labels], erasedValue[Elems]) match {
+      case _: (label *: labels, elem *: elems) =>
+        val value = show(x.productElement(n).asInstanceOf[elem])
+        showElems[elems, labels](n + 1, s"${constValue[label]} = $value" :: elems)(x)
+      case _: (EmptyTuple, EmptyTuple)         =>
+        if elems.isEmpty then "" else elems.mkString(s"(", ", ", ")")
+    }
+
+  transparent inline def showCases[Alts <: Tuple](n: Int)(x: Any, ord: Int): String =
+    inline erasedValue[Alts] match {
+      case _: (alt *: alts) =>
+        if (ord == n) summonFrom {
+          case m: Mirror.Of[`alt`] => s"[$ord] " + derived[alt](using m).show(x.asInstanceOf[alt])
+        } else showCases[alts](n + 1)(x, ord)
+      case _: EmptyTuple => throw new MatchError(x)
+    }
+end Show
diff --git a/tests/run-custom-args/generic-tuples.scala b/tests/run-custom-args/generic-tuples.scala
index f134b9d864bb..71aa13427493 100644
--- a/tests/run-custom-args/generic-tuples.scala
+++ b/tests/run-custom-args/generic-tuples.scala
@@ -7,7 +7,7 @@ class HNil extends Tuple
 case object HNil extends HNil
 
 trait Pair[H, T <: Tuple] {
-  erased inline def size = ???
+  erased inline def size = compiletime.erasedValue
 }
 }
 
diff --git a/tests/run-custom-args/phantom-OnHList.scala b/tests/run-custom-args/phantom-OnHList.scala
index 7c1ba18bbec4..81eddfe0d4a3 100644
--- a/tests/run-custom-args/phantom-OnHList.scala
+++ b/tests/run-custom-args/phantom-OnHList.scala
@@ -88,6 +88,6 @@ object Appender {
 
 object PhantomAppender {
   type Aux[L1 <: HList, L2 <: HList, O <: HList]
-  implicit erased def caseHNil[L <: HList]: Aux[HNil, L, L] = ???
-  implicit erased def caseHCons[H, T <: HList, L <: HList, O <: HList] (using erased p: Aux[T, L, O]): Aux[H :: T, L, H :: O] = ???
+  implicit erased def caseHNil[L <: HList]: Aux[HNil, L, L] = compiletime.erasedValue
+  implicit erased def caseHCons[H, T <: HList, L <: HList, O <: HList] (using erased p: Aux[T, L, O]): Aux[H :: T, L, H :: O] = compiletime.erasedValue
 }
diff --git a/tests/run-custom-args/tasty-inspector/i13352.scala b/tests/run-custom-args/tasty-inspector/i13352.scala
new file mode 100644
index 000000000000..d5b319a7e548
--- /dev/null
+++ b/tests/run-custom-args/tasty-inspector/i13352.scala
@@ -0,0 +1,30 @@
+import scala.quoted.*
+import scala.tasty.inspector.*
+
+@main def Test = {
+  // Artefact of the current test infrastructure
+  // TODO improve infrastructure to avoid needing this code on each test
+  val classpath = dotty.tools.dotc.util.ClasspathFromClassloader(this.getClass.getClassLoader).split(java.io.File.pathSeparator).find(_.contains("runWithCompiler")).get
+  val allTastyFiles = dotty.tools.io.Path(classpath).walkFilter(_.extension == "tasty").map(_.toString).toList
+  val tastyFiles = allTastyFiles.filter(_.contains("CanEqual2"))
+
+  TastyInspector.inspectTastyFiles(tastyFiles)(new MyInspector)
+}
+
+class MyInspector extends Inspector:
+
+  override def inspect(using Quotes)(tastys: List[Tasty[quotes.type]]): Unit =
+    import quotes.reflect.*
+    class Traverser extends TreeTraverser:
+      override def traverseTree(tree: Tree)(owner: Symbol) =
+        if tree.pos.startLine < 100 then
+          super.traverseTree(tree)(owner)
+    end Traverser
+
+    val traverser = new Traverser
+    tastys.foreach { tasty =>
+      traverser.traverseTree(tasty.ast)(tasty.ast.symbol)
+    }
+
+
+class CanEqual2[T]
diff --git a/tests/run-custom-args/typeclass-derivation2.scala b/tests/run-custom-args/typeclass-derivation2.scala
index 228547bcccc1..90744d2f7ab6 100644
--- a/tests/run-custom-args/typeclass-derivation2.scala
+++ b/tests/run-custom-args/typeclass-derivation2.scala
@@ -119,7 +119,7 @@ object TypeLevel {
   type Subtype[t] = Type[_, t]
   type Supertype[t] = Type[t, _]
   type Exactly[t] = Type[t, t]
-  erased def typeOf[T]: Type[T, T] = ???
+  erased def typeOf[T]: Type[T, T] = compiletime.erasedValue
 }
 
 // An algebraic datatype
diff --git a/tests/run-custom-args/typeclass-derivation2c.scala b/tests/run-custom-args/typeclass-derivation2c.scala
index ddf4d62e0498..f7eee2a3fafe 100644
--- a/tests/run-custom-args/typeclass-derivation2c.scala
+++ b/tests/run-custom-args/typeclass-derivation2c.scala
@@ -24,12 +24,12 @@ object Deriving {
       /** The number of cases in the sum.
       *  Implemented by an inline method in concrete subclasses.
       */
-      erased def numberOfCases: Int = ???
+      erased def numberOfCases: Int = compiletime.erasedValue
 
       /** The Generic representations of the sum's alternatives.
       *  Implemented by an inline method in concrete subclasses.
       */
-      erased def alternative(n: Int): Generic[_ <: T] = ???
+      erased def alternative(n: Int): Generic[_ <: T] = compiletime.erasedValue
     }
 
     /** The Generic for a product type */
diff --git a/tests/run-custom-args/typelevel-defaultValue.scala b/tests/run-custom-args/typelevel-defaultValue.scala
index 7c3b0af46d25..a171bf8a153c 100644
--- a/tests/run-custom-args/typelevel-defaultValue.scala
+++ b/tests/run-custom-args/typelevel-defaultValue.scala
@@ -1,6 +1,6 @@
 
 object compiletime {
-  erased def erasedValue[T]: T = ???
+  erased def erasedValue[T]: T = compiletime.erasedValue
 }
 
 object Test extends App {
diff --git a/tests/run-deep-subtype/Tuple-append.check b/tests/run-deep-subtype/Tuple-append.check
new file mode 100644
index 000000000000..96c717f2aef0
--- /dev/null
+++ b/tests/run-deep-subtype/Tuple-append.check
@@ -0,0 +1,76 @@
+(0)
+(0,1)
+(0,1,2)
+(0,1,2,3)
+(0,1,2,3,4)
+(0,1,2,3,4,5)
+(0,1,2,3,4,5,6)
+(0,1,2,3,4,5,6,7)
+(0,1,2,3,4,5,6,7,8)
+(0,1,2,3,4,5,6,7,8,9)
+(0,1,2,3,4,5,6,7,8,9,10)
+(0,1,2,3,4,5,6,7,8,9,10,11)
+(0,1,2,3,4,5,6,7,8,9,10,11,12)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24)
+(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25)
+(1)
+(1,2)
+(1,2,3)
+(1,2,3,4)
+(1,2,3,4,5)
+(1,2,3,4,5,6)
+(1,2,3,4,5,6,7)
+(1,2,3,4,5,6,7,8)
+(1,2,3,4,5,6,7,8,9)
+(1,2,3,4,5,6,7,8,9,10)
+(1,2,3,4,5,6,7,8,9,10,11)
+(1,2,3,4,5,6,7,8,9,10,11,12)
+(1,2,3,4,5,6,7,8,9,10,11,12,13)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25)
+(1)
+(1,2)
+(1,2,3)
+(1,2,3,4)
+(1,2,3,4,5)
+(1,2,3,4,5,6)
+(1,2,3,4,5,6,7)
+(1,2,3,4,5,6,7,8)
+(1,2,3,4,5,6,7,8,9)
+(1,2,3,4,5,6,7,8,9,10)
+(1,2,3,4,5,6,7,8,9,10,11)
+(1,2,3,4,5,6,7,8,9,10,11,12)
+(1,2,3,4,5,6,7,8,9,10,11,12,13)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25)
diff --git a/tests/run-deep-subtype/Tuple-append.scala b/tests/run-deep-subtype/Tuple-append.scala
new file mode 100644
index 000000000000..d913b4c98e1d
--- /dev/null
+++ b/tests/run-deep-subtype/Tuple-append.scala
@@ -0,0 +1,65 @@
+import scala.reflect.ClassTag
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    def testArray[T: ClassTag](n: Int, elem: Int => T): Unit = {
+      val t: Tuple = Tuple.fromArray(Array.tabulate(n)(elem))
+      println(t :* n)
+    }
+
+    for (i <- 0 to 25)
+      testArray(i, j => j)
+
+    println(Tuple() :* 1)
+    println(Tuple1(1) :* 2)
+    println((1, 2) :* 3)
+    println((1, 2, 3) :* 4)
+    println((1, 2, 3, 4) :* 5)
+    println((1, 2, 3, 4, 5) :* 6)
+    println((1, 2, 3, 4, 5, 6) :* 7)
+    println((1, 2, 3, 4, 5, 6, 7) :* 8)
+    println((1, 2, 3, 4, 5, 6, 7, 8) :* 9)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9) :* 10)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10) :* 11)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11) :* 12)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12) :* 13)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13) :* 14)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14) :* 15)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15) :* 16)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16) :* 17)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) :* 18)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18) :* 19)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19) :* 20)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20) :* 21)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21) :* 22)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22) :* 23)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23) :* 24)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24) :* 25)
+
+    println(EmptyTuple :* 1)
+    println((1 *: Tuple()) :* 2)
+    println((1 *: 2 *: Tuple()) :* 3)
+    println((1 *: 2 *: 3 *: Tuple()) :* 4)
+    println((1 *: 2 *: 3 *: 4 *: Tuple()) :* 5)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: Tuple()) :* 6)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: Tuple()) :* 7)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: Tuple()) :* 8)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: Tuple()) :* 9)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: Tuple()) :* 10)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: Tuple()) :* 11)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: Tuple()) :* 12)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: Tuple()) :* 13)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: Tuple()) :* 14)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: Tuple()) :* 15)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: Tuple()) :* 16)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: Tuple()) :* 17)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: Tuple()) :* 18)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: Tuple()) :* 19)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: Tuple()) :* 20)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: Tuple()) :* 21)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: Tuple()) :* 22)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: Tuple()) :* 23)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: 23 *: Tuple()) :* 24)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: 23 *: 24 *: Tuple()) :* 25)
+  }
+}
diff --git a/tests/run-deep-subtype/Tuple-init.check b/tests/run-deep-subtype/Tuple-init.check
new file mode 100644
index 000000000000..31c15bbd4e76
--- /dev/null
+++ b/tests/run-deep-subtype/Tuple-init.check
@@ -0,0 +1,76 @@
+()
+(0)
+(0,0)
+(0,0,1)
+(0,0,1,2)
+(0,0,1,2,3)
+(0,0,1,2,3,4)
+(0,0,1,2,3,4,5)
+(0,0,1,2,3,4,5,6)
+(0,0,1,2,3,4,5,6,7)
+(0,0,1,2,3,4,5,6,7,8)
+(0,0,1,2,3,4,5,6,7,8,9)
+(0,0,1,2,3,4,5,6,7,8,9,10)
+(0,0,1,2,3,4,5,6,7,8,9,10,11)
+(0,0,1,2,3,4,5,6,7,8,9,10,11,12)
+(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13)
+(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14)
+(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15)
+(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
+(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17)
+(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18)
+(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19)
+(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20)
+(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21)
+(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22)
+(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
+()
+(1)
+(1,2)
+(1,2,3)
+(1,2,3,4)
+(1,2,3,4,5)
+(1,2,3,4,5,6)
+(1,2,3,4,5,6,7)
+(1,2,3,4,5,6,7,8)
+(1,2,3,4,5,6,7,8,9)
+(1,2,3,4,5,6,7,8,9,10)
+(1,2,3,4,5,6,7,8,9,10,11)
+(1,2,3,4,5,6,7,8,9,10,11,12)
+(1,2,3,4,5,6,7,8,9,10,11,12,13)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24)
+()
+(1)
+(1,2)
+(1,2,3)
+(1,2,3,4)
+(1,2,3,4,5)
+(1,2,3,4,5,6)
+(1,2,3,4,5,6,7)
+(1,2,3,4,5,6,7,8)
+(1,2,3,4,5,6,7,8,9)
+(1,2,3,4,5,6,7,8,9,10)
+(1,2,3,4,5,6,7,8,9,10,11)
+(1,2,3,4,5,6,7,8,9,10,11,12)
+(1,2,3,4,5,6,7,8,9,10,11,12,13)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
+(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24)
diff --git a/tests/run-deep-subtype/Tuple-init.scala b/tests/run-deep-subtype/Tuple-init.scala
new file mode 100644
index 000000000000..286c84a17cf7
--- /dev/null
+++ b/tests/run-deep-subtype/Tuple-init.scala
@@ -0,0 +1,65 @@
+import scala.reflect.ClassTag
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    def testArray[T: ClassTag](n: Int, elem: Int => T): Unit = {
+      val t: Int *: Tuple = 0 *: Tuple.fromArray(Array.tabulate(n)(elem))
+      println(t.init)
+    }
+
+    for (i <- 0 to 25)
+      testArray(i, j => j)
+
+    println(Tuple1(1).init)
+    println((1, 2).init)
+    println((1, 2, 3).init)
+    println((1, 2, 3, 4).init)
+    println((1, 2, 3, 4, 5).init)
+    println((1, 2, 3, 4, 5, 6).init)
+    println((1, 2, 3, 4, 5, 6, 7).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24).init)
+    println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25).init)
+
+    println((1 *: Tuple()).init)
+    println((1 *: 2 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: 23 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: 23 *: 24 *: Tuple()).init)
+    println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: 23 *: 24 *: 25 *: Tuple()).init)
+  }
+}
diff --git a/tests/run-deep-subtype/Tuple-last.check b/tests/run-deep-subtype/Tuple-last.check
new file mode 100644
index 000000000000..cc750f5e721c
--- /dev/null
+++ b/tests/run-deep-subtype/Tuple-last.check
@@ -0,0 +1,26 @@
+0
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
\ No newline at end of file
diff --git a/tests/run-deep-subtype/Tuple-last.scala b/tests/run-deep-subtype/Tuple-last.scala
new file mode 100644
index 000000000000..d4bad1719b64
--- /dev/null
+++ b/tests/run-deep-subtype/Tuple-last.scala
@@ -0,0 +1,65 @@
+import scala.reflect.ClassTag
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    def printArray[T: ClassTag](n: Int, elem: Int => T): Unit = {
+      val t: Int *: Tuple = 0 *: Tuple.fromArray(Array.tabulate(n)(elem))
+      println(t.last)
+    }
+
+    for (i <- 0 to 25)
+      printArray(i, j => j)
+
+    assert(1 == Tuple1(1).last)
+    assert(2 == (1, 2).last)
+    assert(3 == (1, 2, 3).last)
+    assert(4 == (1, 2, 3, 4).last)
+    assert(5 == (1, 2, 3, 4, 5).last)
+    assert(6 == (1, 2, 3, 4, 5, 6).last)
+    assert(7 == (1, 2, 3, 4, 5, 6, 7).last)
+    assert(8 == (1, 2, 3, 4, 5, 6, 7, 8).last)
+    assert(9 == (1, 2, 3, 4, 5, 6, 7, 8, 9).last)
+    assert(10 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10).last)
+    assert(11 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11).last)
+    assert(12 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12).last)
+    assert(13 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13).last)
+    assert(14 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14).last)
+    assert(15 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15).last)
+    assert(16 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16).last)
+    assert(17 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17).last)
+    assert(18 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18).last)
+    assert(19 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19).last)
+    assert(20 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20).last)
+    assert(21 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21).last)
+    assert(22 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22).last)
+    assert(23 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23).last)
+    assert(24 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24).last)
+    assert(25 == (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25).last)
+
+    assert(1 == (1 *: Tuple()).last)
+    assert(2 == (1 *: 2 *: Tuple()).last)
+    assert(3 == (1 *: 2 *: 3 *: Tuple()).last)
+    assert(4 == (1 *: 2 *: 3 *: 4 *: Tuple()).last)
+    assert(5 == (1 *: 2 *: 3 *: 4 *: 5 *: Tuple()).last)
+    assert(6 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: Tuple()).last)
+    assert(7 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: Tuple()).last)
+    assert(8 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: Tuple()).last)
+    assert(9 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: Tuple()).last)
+    assert(10 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: Tuple()).last)
+    assert(11 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: Tuple()).last)
+    assert(12 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: Tuple()).last)
+    assert(13 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: Tuple()).last)
+    assert(14 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: Tuple()).last)
+    assert(15 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: Tuple()).last)
+    assert(16 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: Tuple()).last)
+    assert(17 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: Tuple()).last)
+    assert(18 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: Tuple()).last)
+    assert(19 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: Tuple()).last)
+    assert(20 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: Tuple()).last)
+    assert(21 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: Tuple()).last)
+    assert(22 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: Tuple()).last)
+    assert(23 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: 23 *: Tuple()).last)
+    assert(24 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: 23 *: 24 *: Tuple()).last)
+    assert(25 == (1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: 23 *: 24 *: 25 *: Tuple()).last)
+  }
+}
diff --git a/tests/run/tuple-drop.scala b/tests/run-deep-subtype/tuple-drop.scala
similarity index 100%
rename from tests/run/tuple-drop.scala
rename to tests/run-deep-subtype/tuple-drop.scala
diff --git a/tests/run/tuple-take.scala b/tests/run-deep-subtype/tuple-take.scala
similarity index 100%
rename from tests/run/tuple-take.scala
rename to tests/run-deep-subtype/tuple-take.scala
diff --git a/tests/run-macros/TypeRepr-isTupleN/Macro_1.scala b/tests/run-macros/TypeRepr-isTupleN/Macro_1.scala
new file mode 100644
index 000000000000..37f8c7e32dab
--- /dev/null
+++ b/tests/run-macros/TypeRepr-isTupleN/Macro_1.scala
@@ -0,0 +1,8 @@
+import scala.quoted.*
+
+inline def isTupleN[T]: Boolean = ${ isTupleNImpl[T] }
+
+private def isTupleNImpl[T: Type](using Quotes): Expr[Boolean] = {
+  import quotes.reflect.*
+  Expr(TypeRepr.of[T].isTupleN)
+}
diff --git a/tests/run-macros/TypeRepr-isTupleN/Test_2.scala b/tests/run-macros/TypeRepr-isTupleN/Test_2.scala
new file mode 100644
index 000000000000..12e15d567b78
--- /dev/null
+++ b/tests/run-macros/TypeRepr-isTupleN/Test_2.scala
@@ -0,0 +1,38 @@
+@main def Test = {
+  assert(isTupleN[Tuple1[Int]])
+  assert(isTupleN[(Int, Int)])
+  assert(isTupleN[(Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+  assert(isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)])
+
+  type Tup = (Int, Int)
+  assert(isTupleN[Tup])
+
+  assert(!isTupleN[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int)]) // No tuple 23
+  assert(!isTupleN[Tuple])
+  assert(!isTupleN[EmptyTuple])
+  assert(!isTupleN[NonEmptyTuple])
+  assert(!isTupleN[Int *: Tuple])
+
+  assert(!isTupleN[Any])
+  assert(!isTupleN[Int])
+  assert(!isTupleN[Object])
+  assert(!isTupleN[Nothing])
+}
diff --git a/tests/run-macros/annot-arg-value-in-java.check b/tests/run-macros/annot-arg-value-in-java.check
new file mode 100644
index 000000000000..d49aaf91ae6a
--- /dev/null
+++ b/tests/run-macros/annot-arg-value-in-java.check
@@ -0,0 +1,11 @@
+J:
+new java.lang.SuppressWarnings(value = "a")
+new java.lang.SuppressWarnings(value = "b")
+new java.lang.SuppressWarnings(value = _root_.scala.Array.apply[java.lang.String]("c", "d")(scala.reflect.ClassTag.apply[java.lang.String](classOf[java.lang.String])))
+JOtherTypes:
+new Annot(value = 1, _, _)
+new Annot(value = -2, _, _)
+new Annot(_, m = false, _)
+new Annot(_, m = true, _)
+new Annot(_, _, n = 1.1)
+new Annot(_, _, n = -2.1)
\ No newline at end of file
diff --git a/tests/run-macros/annot-arg-value-in-java/AnnoMacro.scala b/tests/run-macros/annot-arg-value-in-java/AnnoMacro.scala
new file mode 100644
index 000000000000..7528653ef903
--- /dev/null
+++ b/tests/run-macros/annot-arg-value-in-java/AnnoMacro.scala
@@ -0,0 +1,11 @@
+import scala.quoted.*
+
+inline def showAnnots(inline c: String): Unit = ${ showAnnotsImpl('c) }
+
+def showAnnotsImpl(c: Expr[String])(using Quotes): Expr[Unit] =
+  import quotes.reflect.*
+  val al = Expr(Symbol.requiredClass(c.valueOrError).declaredMethods.flatMap(_.annotations.map(_.show)))
+  '{
+    println($c + ":")
+    $al.foreach(println)
+  }
\ No newline at end of file
diff --git a/tests/run-macros/annot-arg-value-in-java/Annot.java b/tests/run-macros/annot-arg-value-in-java/Annot.java
new file mode 100644
index 000000000000..2764bf8c8324
--- /dev/null
+++ b/tests/run-macros/annot-arg-value-in-java/Annot.java
@@ -0,0 +1,5 @@
+public @interface Annot {
+  int value() default 0;
+  boolean m() default false;
+  double n() default 0;
+}
\ No newline at end of file
diff --git a/tests/run-macros/annot-arg-value-in-java/J.java b/tests/run-macros/annot-arg-value-in-java/J.java
new file mode 100644
index 000000000000..d1234e080258
--- /dev/null
+++ b/tests/run-macros/annot-arg-value-in-java/J.java
@@ -0,0 +1,23 @@
+public class J {
+  @SuppressWarnings(value = "a")
+  public void f1() {}
+  @SuppressWarnings("b")
+  public void f2() {}
+  @SuppressWarnings({"c", "d"})
+  public void f3() {}
+}
+
+class JOtherTypes {
+  @Annot(1)
+  public void f1() {}
+  @Annot(-2)
+  public void f2() {}
+  @Annot(m = false)
+  public void f3() {}
+  @Annot(m = true)
+  public void f4() {}
+  @Annot(n = 1.1)
+  public void f5() {}
+  @Annot(n = -2.1)
+  public void f6() {}
+}
\ No newline at end of file
diff --git a/tests/run-macros/annot-arg-value-in-java/S.scala b/tests/run-macros/annot-arg-value-in-java/S.scala
new file mode 100644
index 000000000000..8b4369df97b1
--- /dev/null
+++ b/tests/run-macros/annot-arg-value-in-java/S.scala
@@ -0,0 +1,5 @@
+// Display annotation arguments in Java
+
+@main def Test =
+  showAnnots("J")
+  showAnnots("JOtherTypes")
diff --git a/tests/run-macros/enum-nat-macro/Macros_2.scala b/tests/run-macros/enum-nat-macro/Macros_2.scala
index c533888718ba..a30cfa5729bc 100644
--- a/tests/run-macros/enum-nat-macro/Macros_2.scala
+++ b/tests/run-macros/enum-nat-macro/Macros_2.scala
@@ -25,6 +25,6 @@ import Nat.*
        case 0 => acc
        case n => inner[Succ[N]](n - 1, '{Succ($acc)})
 
-     val i = int.valueOrError
+     val i = int.valueOrAbort
      require(i >= 0)
      inner[Zero.type](i, '{Zero})
diff --git a/tests/run-macros/f-interpolator-tests.check b/tests/run-macros/f-interpolator-tests.check
index be5091b8ef39..4f2464fadae7 100644
--- a/tests/run-macros/f-interpolator-tests.check
+++ b/tests/run-macros/f-interpolator-tests.check
@@ -1,6 +1,7 @@
 integer: 5
 string: l
 5, 6, hello
+3.14 rounds to 3
 5
 6
 Bob is  1 years old
diff --git a/tests/run-macros/f-interpolator-tests.scala b/tests/run-macros/f-interpolator-tests.scala
index ad712948a0d7..8c59ae19a187 100755
--- a/tests/run-macros/f-interpolator-tests.scala
+++ b/tests/run-macros/f-interpolator-tests.scala
@@ -1,15 +1,15 @@
-/**
-  * These tests test all the possible formats the f interpolator has to deal with.
-  * The tests are sorted by argument category as the arguments are on https://docs.oracle.com/javase/6/docs/api/java/util/Formatter.html#detail
-  *
-  *
-  * Some tests come from https://github.com/lampepfl/dotty/pull/3894/files
-  */
+/** These tests test all the possible formats the f interpolator has to deal with.
+ *
+ *  The tests are sorted by argument category as the arguments are on https://docs.oracle.com/javase/6/docs/api/java/util/Formatter.html#detail
+ *
+ *  Some tests come from https://github.com/lampepfl/dotty/pull/3894/files
+ */
 object Test {
   def main(args: Array[String]) = {
     println(f"integer: ${5}%d")
     println(f"string: ${"l"}%s")
     println(f"${5}%s, ${6}%d, ${"hello"}%s")
+    println(f"${3.14}%.2f rounds to ${3}%d")
 
     val x = 5
     println(f"$x%d")
@@ -22,6 +22,7 @@ object Test {
     dateArgsTests
     specificLiteralsTests
     argumentsTests
+    unitTests
   }
 
   def multilineTests = {
@@ -198,5 +199,209 @@ object Test {
   def argumentsTests = {
     println(f"${"a"}%s ${"b"}%s %<s")
   }
+
+  def unitTests =
+    val test = FormatInterpolatorTest()
+    test.`f interpolator baseline`
+    test.fIf
+    test.fIfNot
+}
+
+import java.text.DecimalFormat
+
+import scala.language.implicitConversions
+import scala.util.chaining._
+
+class FormatInterpolatorTest {
+  import StringContextTestUtils.*
+  implicit val stringToBoolean: Conversion[String, Boolean] = _.toBoolean
+  implicit def stringToChar(s: String): Char = s(0)
+  implicit def str2fmt(s: String): java.util.Formattable = new java.util.Formattable {
+    def formatTo(f: java.util.Formatter, g: Int, w: Int, p: Int) = f.format("%s", s)
+  }
+  import java.util.{Calendar, Locale}
+  val cal = Calendar.getInstance(Locale.US).tap(_.set(2012, Calendar.MAY, 26))
+  implicit def strToDate(x: String): Calendar = Calendar.getInstance(Locale.US).tap(_.set(2012, Calendar.MAY, 26))
+
+  def assertEquals(expected: String, actual: String): Unit =
+    assert(expected == actual, s"[$expected] != [$actual]")
+
+  def `f interpolator baseline`: Unit =
+
+    val b_true  = true
+    val b_false = false
+
+    val i = 42
+
+    val f_zero = 0.0
+    val f_zero_- = -0.0
+
+    val s = "Scala"
+
+    val fff  = new java.util.Formattable {
+      def formatTo(f: java.util.Formatter, g: Int, w: Int, p: Int) = f.format("4")
+    }
+
+    val ss = List[(String, String)] (
+      // 'b' / 'B' (category: general)
+      // -----------------------------
+      f"${b_false}%b" -> "false",
+      f"${b_true}%b"  -> "true",
+
+      f"${null}%b"  -> "false",
+      f"${false}%b" -> "false",
+      f"${true}%b"  -> "true",
+      f"${true && false}%b"                    -> "false",
+      f"${java.lang.Boolean.valueOf(false)}%b" -> "false",
+      f"${java.lang.Boolean.valueOf(true)}%b"  -> "true",
+
+      f"${null}%B"  -> "FALSE",
+      f"${false}%B" -> "FALSE",
+      f"${true}%B"  -> "TRUE",
+      f"${java.lang.Boolean.valueOf(false)}%B"  -> "FALSE",
+      f"${java.lang.Boolean.valueOf(true)}%B"   -> "TRUE",
+
+      f"${"true"}%b" -> "true",
+      f"${"false"}%b"-> "false",
+
+      // 'h' | 'H' (category: general)
+      // -----------------------------
+      f"${null}%h"   -> "null",
+      f"${f_zero}%h"   -> "0",
+      f"${f_zero_-}%h" -> "80000000",
+      f"${s}%h"       -> "4c01926",
+
+      f"${null}%H"  -> "NULL",
+      f"${s}%H"       -> "4C01926",
+
+      // 's' | 'S' (category: general)
+      // -----------------------------
+      f"${null}%s"  -> "null",
+      f"${null}%S"  -> "NULL",
+      f"${s}%s"     -> "Scala",
+      f"${s}%S"     -> "SCALA",
+      f"${5}"       -> "5",
+      f"${i}"       -> "42",
+      f"${Symbol("foo")}"    -> "Symbol(foo)",
+
+      f"${Thread.State.NEW}" -> "NEW",
+
+      // 'c' | 'C' (category: character)
+      // -------------------------------
+      f"${120:Char}%c"   -> "x",
+      f"${120:Byte}%c"   -> "x",
+      f"${120:Short}%c"  -> "x",
+      f"${120:Int}%c"    -> "x",
+      f"${java.lang.Character.valueOf('x')}%c"   -> "x",
+      f"${java.lang.Byte.valueOf(120:Byte)}%c"   -> "x",
+      f"${java.lang.Short.valueOf(120:Short)}%c" -> "x",
+      f"${java.lang.Integer.valueOf(120)}%c"     -> "x",
+
+      f"${'x' : java.lang.Character}%c"     -> "x",
+      f"${(120:Byte) : java.lang.Byte}%c"   -> "x",
+      f"${(120:Short) : java.lang.Short}%c" -> "x",
+      f"${120 : java.lang.Integer}%c"       -> "x",
+
+      f"${"Scala"}%c"   -> "S",
+
+      // 'd' | 'o' | 'x' | 'X' (category: integral)
+      // ------------------------------------------
+      f"${120:Byte}%d"    -> "120",
+      f"${120:Short}%d"   -> "120",
+      f"${120:Int}%d"     -> "120",
+      f"${120:Long}%d"    -> "120",
+      f"${60 * 2}%d"      -> "120",
+      f"${java.lang.Byte.valueOf(120:Byte)}%d"   -> "120",
+      f"${java.lang.Short.valueOf(120:Short)}%d" -> "120",
+      f"${java.lang.Integer.valueOf(120)}%d"     -> "120",
+      f"${java.lang.Long.valueOf(120)}%d"        -> "120",
+      f"${120 : java.lang.Integer}%d"        -> "120",
+      f"${120 : java.lang.Long}%d"           -> "120",
+      f"${BigInt(120)}%d"                    -> "120",
+
+      f"${new java.math.BigInteger("120")}%d" -> "120",
+
+      f"${4}%#10X" -> "       0X4",
+
+      f"She is ${fff}%#s feet tall." -> "She is 4 feet tall.",
+
+      f"Just want to say ${"hello, world"}%#s..." -> "Just want to say hello, world...",
+
+      //{ implicit val strToShort: Conversion[String, Short] = java.lang.Short.parseShort ; f"${"120"}%d" } -> "120",
+      //{ implicit val strToInt = (s: String) => 42 ; f"${"120"}%d" } -> "42",
+
+      // 'e' | 'E' | 'g' | 'G' | 'f' | 'a' | 'A' (category: floating point)
+      // ------------------------------------------------------------------
+      f"${3.4f}%e" -> locally"3.400000e+00",
+      f"${3.4}%e"  -> locally"3.400000e+00",
+      f"${3.4f : java.lang.Float}%e" -> locally"3.400000e+00",
+      f"${3.4 : java.lang.Double}%e" -> locally"3.400000e+00",
+
+      f"${BigDecimal(3.4)}%e" -> locally"3.400000e+00",
+
+      f"${new java.math.BigDecimal(3.4)}%e" -> locally"3.400000e+00",
+
+      f"${3}%e"  -> locally"3.000000e+00",
+      f"${3L}%e" -> locally"3.000000e+00",
+
+      // 't' | 'T' (category: date/time)
+      // -------------------------------
+      f"${cal}%TD"                 -> "05/26/12",
+      f"${cal.getTime}%TD"         -> "05/26/12",
+      f"${cal.getTime.getTime}%TD" -> "05/26/12",
+      f"""${"1234"}%TD"""        -> "05/26/12",
+
+      // literals and arg indexes
+      f"%%" -> "%",
+      f" mind%n------%nmatter" ->
+       """| mind
+          |------
+          |matter""".stripMargin.linesIterator.mkString(System.lineSeparator),
+      f"${i}%d %<d ${9}%d"   -> "42 42 9",
+      f"${7}%d %<d ${9}%d"   -> "7 7 9",
+      f"${7}%d %2$$d ${9}%d" -> "7 9 9",
+
+      f"${null}%d %<B" -> "null FALSE",
+
+      f"${5: Any}"      -> "5",
+      f"${5}%s%<d"      -> "55",
+      f"${3.14}%s,%<f"  -> locally"3.14,${"3.140000"}",
+
+      f"z" -> "z"
+    )
+
+    for ((f, s) <- ss) assertEquals(s, f)
+  end `f interpolator baseline`
+
+  def fIf =
+    val res = f"${if true then 2.5 else 2.5}%.2f"
+    val expected = locally"2.50"
+    assertEquals(expected, res)
+
+  def fIfNot =
+    val res = f"${if false then 2.5 else 3.5}%.2f"
+    val expected = locally"3.50"
+    assertEquals(expected, res)
+
+  // in Scala 2, [A >: Any] forced not to convert 3 to 3.0; Scala 3 harmonics should also respect lower bound.
+  def fHeteroArgs() =
+    val res = f"${3.14}%.2f rounds to ${3}%d"
+    val expected = locally"${"3.14"} rounds to 3"
+    assertEquals(expected, res)
 }
 
+object StringContextTestUtils:
+  private val decimalSeparator: Char = new DecimalFormat().getDecimalFormatSymbols().getDecimalSeparator()
+  private val numberPattern = """(\d+)\.(\d+.*)""".r
+  private def applyProperLocale(number: String): String =
+    val numberPattern(intPart, fractionalPartAndSuffix) = number
+    s"$intPart$decimalSeparator$fractionalPartAndSuffix"
+
+  extension (sc: StringContext)
+    // Use this String interpolator to avoid problems with a locale-dependent decimal mark.
+    def locally(numbers: String*): String =
+      val numbersWithCorrectLocale = numbers.map(applyProperLocale)
+      sc.s(numbersWithCorrectLocale: _*)
+
+    // Handles cases like locally"3.14" - it's prettier than locally"${"3.14"}".
+    def locally(): String = sc.parts.map(applyProperLocale).mkString
diff --git a/tests/run-macros/from-type.check b/tests/run-macros/from-type.check
index 9a5fe95f29aa..d8bff3300be2 100644
--- a/tests/run-macros/from-type.check
+++ b/tests/run-macros/from-type.check
@@ -1,7 +1,5 @@
 Some(true)
 Some(false)
-Some(1)
-Some(2)
 Some(3)
 Some(4)
 Some(5)
diff --git a/tests/run-macros/from-type/Test_2.scala b/tests/run-macros/from-type/Test_2.scala
index 272ea7b5dac8..c14b164299f6 100644
--- a/tests/run-macros/from-type/Test_2.scala
+++ b/tests/run-macros/from-type/Test_2.scala
@@ -2,8 +2,9 @@
 @main def Test: Unit =
   testValueOfType[true]
   testValueOfType[false]
-  testValueOfByte[1]
-  testValueOfShort[2]
+  // TODO support Byte and short literal types
+  // testValueOfType[1b]
+  // testValueOfType[2s]
   testValueOfType[3]
   testValueOfType[4]
   testValueOfType[5L]
@@ -29,6 +30,3 @@
   testValueOfType[Null]
   testValueOfType[Any]
   testValueOfType[Some[1]]
-
-transparent inline def testValueOfByte[B <: Byte] = testValueOfType[B]
-transparent inline def testValueOfShort[S <: Short] = testValueOfType[S]
diff --git a/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala b/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala
index 1d085d3a2c15..5f73f7c84386 100644
--- a/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala
+++ b/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala
@@ -44,7 +44,7 @@ object TypeToolbox {
   inline def fieldIn[T](inline mem: String): String = ${fieldInImpl[T]('mem)}
   private def fieldInImpl[T: Type](mem: Expr[String])(using Quotes) : Expr[String] = {
     import quotes.reflect.*
-    val field = TypeTree.of[T].symbol.declaredField(mem.valueOrError)
+    val field = TypeTree.of[T].symbol.declaredField(mem.valueOrAbort)
     Expr(if field.isNoSymbol then "" else field.name)
   }
 
@@ -58,7 +58,7 @@ object TypeToolbox {
   inline def methodIn[T](inline mem: String): Seq[String] = ${methodInImpl[T]('mem)}
   private def methodInImpl[T: Type](mem: Expr[String])(using Quotes) : Expr[Seq[String]] = {
     import quotes.reflect.*
-    Expr(TypeTree.of[T].symbol.declaredMethod(mem.valueOrError).map(_.name))
+    Expr(TypeTree.of[T].symbol.declaredMethod(mem.valueOrAbort).map(_.name))
   }
 
   inline def methodsIn[T]: Seq[String] = ${methodsInImpl[T]}
@@ -70,7 +70,7 @@ object TypeToolbox {
   inline def method[T](inline mem: String): Seq[String] = ${methodImpl[T]('mem)}
   private def methodImpl[T: Type](mem: Expr[String])(using Quotes) : Expr[Seq[String]] = {
     import quotes.reflect.*
-    Expr(TypeTree.of[T].symbol.memberMethod(mem.valueOrError).map(_.name))
+    Expr(TypeTree.of[T].symbol.memberMethod(mem.valueOrAbort).map(_.name))
   }
 
   inline def methods[T]: Seq[String] = ${methodsImpl[T]}
diff --git a/tests/run-macros/i10914a/Macro_1.scala b/tests/run-macros/i10914a/Macro_1.scala
index 0a1b8088d04c..0fa34291ee14 100644
--- a/tests/run-macros/i10914a/Macro_1.scala
+++ b/tests/run-macros/i10914a/Macro_1.scala
@@ -24,7 +24,7 @@ object Dsl {
     import quotes.reflect.*
     val inputs = c match
       case '{ Container($list) } =>
-        list.valueOrError
+        list.valueOrAbort
       case _ => report.throwError("Cannot Extract List from Container")
     '{ Entity(${Expr(inputs.head.value)}) }
 }
diff --git a/tests/run-macros/i10914b/Macro_1.scala b/tests/run-macros/i10914b/Macro_1.scala
index 680f189a3566..c5b375031846 100644
--- a/tests/run-macros/i10914b/Macro_1.scala
+++ b/tests/run-macros/i10914b/Macro_1.scala
@@ -13,7 +13,7 @@ object Dsl {
     //println("Getting Input: " + Printer.TreeStructure.show(c.asTerm))
     val entExpr = c match
       case '{ Input($ent) } => ent
-      case _ => report.throwError("Cannot Extract Entity from Input")
+      case _ => report.errorAndAbort("Cannot Extract Entity from Input")
     '{ Container(List($entExpr)) }
 
 
@@ -28,7 +28,7 @@ object Dsl {
     import quotes.reflect.*
     val inputs = c match
       case '{ Container($list) } =>
-        list.valueOrError
-      case _ => report.throwError("Cannot Extract List from Container")
+        list.valueOrAbort
+      case _ => report.errorAndAbort("Cannot Extract List from Container")
     '{ Entity(${Expr(inputs.head.value)}) }
 }
diff --git a/tests/run-macros/i11161/Macro_1.scala b/tests/run-macros/i11161/Macro_1.scala
index c189eaac46d3..9918234d4659 100644
--- a/tests/run-macros/i11161/Macro_1.scala
+++ b/tests/run-macros/i11161/Macro_1.scala
@@ -8,4 +8,4 @@ private def showTypeImpl[T: Type](using Quotes): Expr[String] =
       case Some(ct) => '{ $ct.runtimeClass.getName }
       case None =>
         import quotes.reflect._
-        report.throwError(s"Unable to find a ClassTag for type ${Type.show[T]}", Position.ofMacroExpansion)
+        report.errorAndAbort(s"Unable to find a ClassTag for type ${Type.show[T]}", Position.ofMacroExpansion)
diff --git a/tests/run-macros/i11856/Test_1.scala b/tests/run-macros/i11856/Test_1.scala
index 2b31f3a4a570..0ec8952863fc 100644
--- a/tests/run-macros/i11856/Test_1.scala
+++ b/tests/run-macros/i11856/Test_1.scala
@@ -5,8 +5,8 @@ object Str:
         ${ evalConcat('a, 'b) }
 
     def evalConcat(expra: Expr[String], exprb: Expr[String])(using Quotes): Expr[String] =
-        val a = expra.valueOrError
-        val b = exprb.valueOrError
+        val a = expra.valueOrAbort
+        val b = exprb.valueOrAbort
         Expr(a ++ b)
 
 object I:
@@ -14,6 +14,6 @@ object I:
       ${ evalConcat('a, 'b) }
 
   def evalConcat(expra: Expr[Int], exprb: Expr[Int])(using Quotes): Expr[Int] =
-      val a = expra.valueOrError
-      val b = exprb.valueOrError
+      val a = expra.valueOrAbort
+      val b = exprb.valueOrAbort
       Expr(a + b)
\ No newline at end of file
diff --git a/tests/run-macros/i12163.check b/tests/run-macros/i12163.check
new file mode 100644
index 000000000000..c24232089f0f
--- /dev/null
+++ b/tests/run-macros/i12163.check
@@ -0,0 +1,4 @@
+Test
+Type
+ABC
+No label matched: sdofjsdifj
diff --git a/tests/run-macros/i12163/Macro_1.scala b/tests/run-macros/i12163/Macro_1.scala
new file mode 100644
index 000000000000..8625bd8ad608
--- /dev/null
+++ b/tests/run-macros/i12163/Macro_1.scala
@@ -0,0 +1,31 @@
+import scala.quoted.*
+import scala.util.matching.Regex
+
+inline def showLabel(inline label: String): String =
+  ${ showLabelExpr('label) }
+
+
+private def showLabelExpr(label: Expr[String])(using Quotes): Expr[String] = {
+  val suggestRegex: Regex = "(Type)([a-zA-Z]+)(Mapping)([a-zA-Z]+)".r
+  val docRegex: Regex = "(Test)(Mapping)([a-zA-Z]+)".r
+  val simpleRegex: Regex = "([a-zA-Z]+)(Mapping)([a-zA-Z]+)".r
+
+  label.value match {
+    case Some(docRegex(doc, _, _)) =>
+      Expr(doc)
+
+    case Some(suggestRegex(suggest, suggestType, _, _)) =>
+      Expr(suggest)
+
+    case Some(simpleRegex(docType, _, _)) =>
+      Expr(docType)
+
+    case Some(value) =>
+      Expr(s"No label matched: $value")
+      // quotes.reflect.report.throwError(s"No label matched: $value")
+
+    case None =>
+      Expr(s"Expected label to be a know string but was: ${label.show}")
+      // quotes.reflect.report.throwError(s"Expected label to be a know string but was: ${label.show}")
+  }
+}
diff --git a/tests/run-macros/i12163/Test_2.scala b/tests/run-macros/i12163/Test_2.scala
new file mode 100644
index 000000000000..3af6e91cc489
--- /dev/null
+++ b/tests/run-macros/i12163/Test_2.scala
@@ -0,0 +1,6 @@
+
+@main def Test(): Unit =
+  println(showLabel("TestMappingDocument"))
+  println(showLabel("TypeABCMappingDocument"))
+  println(showLabel("ABCMappingDocument"))
+  println(showLabel("sdofjsdifj"))
\ No newline at end of file
diff --git a/tests/run-macros/i12188/Macro_1.scala b/tests/run-macros/i12188/Macro_1.scala
new file mode 100644
index 000000000000..619581802e35
--- /dev/null
+++ b/tests/run-macros/i12188/Macro_1.scala
@@ -0,0 +1,23 @@
+import scala.quoted.*
+
+object MatchTest {
+  inline def test[T](inline obj: T): String = ${testImpl('obj)}
+
+  def testImpl[T](objExpr: Expr[T])(using qctx: Quotes, t: Type[T]): Expr[String] = {
+    import qctx.reflect.*
+
+    val obj = objExpr.asTerm
+    val cases = obj.tpe.typeSymbol.children.map { child =>
+      val subtype = TypeIdent(child)
+      val bind = Symbol.newBind(Symbol.spliceOwner, "c", Flags.EmptyFlags, subtype.tpe)
+      CaseDef(Bind(bind, Typed(Ref(bind), subtype)), None, Literal(StringConstant(subtype.show)))
+    } ::: {
+      CaseDef(Wildcard(), None, Literal(StringConstant("default")))
+    } :: Nil
+    val bind = Symbol.newBind(Symbol.spliceOwner, "o", Flags.EmptyFlags, obj.tpe)
+    val result = Match(obj, cases)
+    val code = result.show(using Printer.TreeAnsiCode)
+    // println(code)
+    result.asExprOf[String]
+  }
+}
\ No newline at end of file
diff --git a/tests/run-macros/i12188/Test_2.scala b/tests/run-macros/i12188/Test_2.scala
new file mode 100644
index 000000000000..a3d0f0de58fb
--- /dev/null
+++ b/tests/run-macros/i12188/Test_2.scala
@@ -0,0 +1,8 @@
+sealed trait P
+case class PC1(a: String) extends P
+case class PC2(b: Int) extends P
+
+@main def Test =
+  println(MatchTest.test(PC1("ab"): P))
+  println(MatchTest.test(PC2(10): P))
+  println(MatchTest.test(null: P))
diff --git a/tests/run-macros/i12392.check b/tests/run-macros/i12392.check
new file mode 100644
index 000000000000..54c7f5d06c3f
--- /dev/null
+++ b/tests/run-macros/i12392.check
@@ -0,0 +1 @@
+scala.Option[scala.Predef.String] to scala.Option[scala.Int]
diff --git a/tests/run-macros/i12392/Macros_1.scala b/tests/run-macros/i12392/Macros_1.scala
new file mode 100644
index 000000000000..f604cf815716
--- /dev/null
+++ b/tests/run-macros/i12392/Macros_1.scala
@@ -0,0 +1,24 @@
+import scala.quoted.*
+
+inline def testSubst: Unit = ${ testSubstImpl }
+
+def testSubstImpl(using Quotes): Expr[Unit] = {
+  import quotes.reflect.*
+
+  val intTpe = TypeRepr.of[Int]
+  val strOptTpe = TypeRepr.of[Option[String]]
+
+  val tpeArgs: List[TypeRepr] = strOptTpe match {
+    case AppliedType(_, args) => args
+    case _                    => List.empty[TypeRepr]
+  }
+
+  val intOptTpe = strOptTpe.substituteTypes(
+    tpeArgs.map(_.typeSymbol), List(intTpe))
+
+  val repr = s"${strOptTpe.show} to ${intOptTpe.show}"
+
+  '{
+    println(${Expr(repr)})
+  }
+}
diff --git a/tests/run-macros/i12392/Test_2.scala b/tests/run-macros/i12392/Test_2.scala
new file mode 100644
index 000000000000..6fb9577c8ef9
--- /dev/null
+++ b/tests/run-macros/i12392/Test_2.scala
@@ -0,0 +1 @@
+@main def Test = testSubst
diff --git a/tests/run-macros/i12417/Macros_1.scala b/tests/run-macros/i12417/Macros_1.scala
new file mode 100644
index 000000000000..e961ae6040a1
--- /dev/null
+++ b/tests/run-macros/i12417/Macros_1.scala
@@ -0,0 +1,13 @@
+import scala.deriving.Mirror
+import scala.compiletime.{constValue, error}
+import scala.quoted.*
+
+object TestMacro {
+  inline def test1[CASE_CLASS <: Product](using m: Mirror.ProductOf[CASE_CLASS]): String =
+    ${ code('m) }
+
+  def code[CASE_CLASS <: Product: Type](m: Expr[Mirror.ProductOf[CASE_CLASS]])(using Quotes): Expr[String] =
+    m match
+      case '{ type t <: Tuple; $_ : Mirror { type MirroredElemLabels = `t` } } =>
+        Expr(Type.valueOfTuple[t].toString)
+}
diff --git a/tests/run-macros/i12417/Test_2.scala b/tests/run-macros/i12417/Test_2.scala
new file mode 100644
index 000000000000..0ebe6d377ba0
--- /dev/null
+++ b/tests/run-macros/i12417/Test_2.scala
@@ -0,0 +1,7 @@
+import scala.deriving.Mirror
+import scala.compiletime.{constValue, error}
+
+object Test extends App {
+  case class A(x: String, y: Int)
+  assert(TestMacro.test1[A] == "Some((x,y))")
+}
diff --git a/tests/run-macros/i12417b.check b/tests/run-macros/i12417b.check
new file mode 100644
index 000000000000..ac68840f16bf
--- /dev/null
+++ b/tests/run-macros/i12417b.check
@@ -0,0 +1,6 @@
+Some(())
+Some((1))
+Some((1,2))
+Some((1,2,3))
+Some((1,2,3,4))
+Some((1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26))
diff --git a/tests/run-macros/i12417b/Macros_1.scala b/tests/run-macros/i12417b/Macros_1.scala
new file mode 100644
index 000000000000..2b531e446bc1
--- /dev/null
+++ b/tests/run-macros/i12417b/Macros_1.scala
@@ -0,0 +1,18 @@
+import scala.deriving.Mirror
+import scala.compiletime.{constValue, error}
+import scala.quoted.*
+
+object TestMacro {
+  inline def test1: Unit =
+    ${ code() }
+
+  def code()(using Quotes): Expr[Unit] =
+    '{
+      println(${Expr(Type.valueOfTuple[EmptyTuple].toString)})
+      println(${Expr(Type.valueOfTuple[1 *: EmptyTuple].toString)})
+      println(${Expr(Type.valueOfTuple[(1, 2)].toString)})
+      println(${Expr(Type.valueOfTuple[(1, 2, 3)].toString)})
+      println(${Expr(Type.valueOfTuple[(1, 2, 3, 4)].toString)})
+      println(${Expr(Type.valueOfTuple[(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26)].toString)})
+    }
+}
diff --git a/tests/run-macros/i12417b/Test_2.scala b/tests/run-macros/i12417b/Test_2.scala
new file mode 100644
index 000000000000..182c2c0e2f8a
--- /dev/null
+++ b/tests/run-macros/i12417b/Test_2.scala
@@ -0,0 +1 @@
+@main def Test = TestMacro.test1
diff --git a/tests/run-macros/i13033.check b/tests/run-macros/i13033.check
new file mode 100644
index 000000000000..d7e52d192eb1
--- /dev/null
+++ b/tests/run-macros/i13033.check
@@ -0,0 +1,3 @@
+0
+1
+-1
diff --git a/tests/run-macros/i13033/Macro_1.scala b/tests/run-macros/i13033/Macro_1.scala
new file mode 100644
index 000000000000..8f2c040bad5b
--- /dev/null
+++ b/tests/run-macros/i13033/Macro_1.scala
@@ -0,0 +1,17 @@
+import scala.quoted.*
+
+object Macro:
+  def nanImpl(using Quotes): Expr[Any] =
+    '{ Double.NaN } match
+      case '{ Double.NaN } => '{0}
+  inline def nan: Any = ${nanImpl}
+
+  def positiveImpl(using Quotes): Expr[Any] =
+    '{ 0.0 }  match
+      case '{ 0.0 } => '{1}
+  inline def positive: Any = ${positiveImpl}
+
+  def negativeImpl(using Quotes): Expr[Any] =
+    '{ -0.0 }  match
+      case '{ -0.0 } => '{-1}
+  inline def negative: Any = ${negativeImpl}
diff --git a/tests/run-macros/i13033/Test_2.scala b/tests/run-macros/i13033/Test_2.scala
new file mode 100644
index 000000000000..f972c8f67555
--- /dev/null
+++ b/tests/run-macros/i13033/Test_2.scala
@@ -0,0 +1,4 @@
+@main def Test(): Unit =
+  println(Macro.nan)
+  println(Macro.positive)
+  println(Macro.negative)
diff --git a/tests/run-macros/i13183.check b/tests/run-macros/i13183.check
new file mode 100644
index 000000000000..49dac665435e
--- /dev/null
+++ b/tests/run-macros/i13183.check
@@ -0,0 +1,5 @@
+"\u001b"
+"\u0000\u0001\u0003"
+"ABC"
+"\u0080\u0081翿"
+"\t\n\r👋👌🥳"
diff --git a/tests/run-macros/i13183/Macro_1.scala b/tests/run-macros/i13183/Macro_1.scala
new file mode 100644
index 000000000000..4400a4497cb8
--- /dev/null
+++ b/tests/run-macros/i13183/Macro_1.scala
@@ -0,0 +1,5 @@
+import scala.quoted.*
+
+object Macro_1:
+  inline def stringLiteral(inline s: String): String = ${showExpr('s)}
+  def showExpr(s: Expr[?])(using Quotes): Expr[String] = Expr(s.show.toString)
diff --git a/tests/run-macros/i13183/Test_2.scala b/tests/run-macros/i13183/Test_2.scala
new file mode 100644
index 000000000000..ae5897eb95b0
--- /dev/null
+++ b/tests/run-macros/i13183/Test_2.scala
@@ -0,0 +1,6 @@
+@main def Test =
+  println(Macro_1.stringLiteral("\u001b")) // "\u001b"
+  println(Macro_1.stringLiteral("\u0000\u0001\u0003")) // "\u0000\u0001\u0003"
+  println(Macro_1.stringLiteral("A\u0042C")) // "ABC"
+  println(Macro_1.stringLiteral("\u0080\u0081\u7fff")) // "\u0080\u0081翿"
+  println(Macro_1.stringLiteral("\t\n\r👋👌🥳")) // "\t\n\r👋👌🥳"
diff --git a/tests/run-macros/i13230.check b/tests/run-macros/i13230.check
new file mode 100644
index 000000000000..01b246fb33f6
--- /dev/null
+++ b/tests/run-macros/i13230.check
@@ -0,0 +1 @@
+List((A,E), (B,E))
diff --git a/tests/run-macros/i13230/Macros_1.scala b/tests/run-macros/i13230/Macros_1.scala
new file mode 100644
index 000000000000..424358e83b1a
--- /dev/null
+++ b/tests/run-macros/i13230/Macros_1.scala
@@ -0,0 +1,12 @@
+import scala.quoted.*
+
+enum E:
+  case A, B
+
+inline def showEnumChildren = ${ showEnumChildrenExpr }
+
+def showEnumChildrenExpr(using Quotes) =
+  import quotes.reflect.*
+  val repr = TypeRepr.of[E]
+  Expr(TypeRepr.of[E].classSymbol.get.children.map(sym => (sym.name, repr.memberType(sym).show)))
+
diff --git a/tests/run-macros/i13230/Test_2.scala b/tests/run-macros/i13230/Test_2.scala
new file mode 100644
index 000000000000..23f582ac9c94
--- /dev/null
+++ b/tests/run-macros/i13230/Test_2.scala
@@ -0,0 +1 @@
+@main def Test = println(showEnumChildren)
diff --git a/tests/run-macros/i13947.check b/tests/run-macros/i13947.check
new file mode 100644
index 000000000000..674afdfa11eb
--- /dev/null
+++ b/tests/run-macros/i13947.check
@@ -0,0 +1,3 @@
+[]
+[scala.Predef.String]
+[scala.Int, scala.Float, scala.Long]
diff --git a/tests/run-macros/i13947/Macro_1.scala b/tests/run-macros/i13947/Macro_1.scala
new file mode 100644
index 000000000000..49a4971e553c
--- /dev/null
+++ b/tests/run-macros/i13947/Macro_1.scala
@@ -0,0 +1,12 @@
+import scala.quoted.*
+
+inline def printTypeParams[A]: Unit = ${ printTypeParamsImpl[A] }
+
+def printTypeParamsImpl[A: Type](using Quotes): Expr[Unit] = {
+  import quotes.reflect.*
+
+  val targs: List[TypeRepr] = TypeRepr.of[A].typeArgs
+  val debug = targs.map(_.show).mkString("[", ", ", "]")
+
+  '{ println(${Expr(debug)}) }
+}
diff --git a/tests/run-macros/i13947/Test_2.scala b/tests/run-macros/i13947/Test_2.scala
new file mode 100644
index 000000000000..009193cf12b8
--- /dev/null
+++ b/tests/run-macros/i13947/Test_2.scala
@@ -0,0 +1,4 @@
+@main def Test: Unit =
+  printTypeParams[scala.util.Random]
+  printTypeParams[Option[String]]
+  printTypeParams[Function2[Int, Float, Long]]
diff --git a/tests/run-macros/i4734/Macro_1.scala b/tests/run-macros/i4734/Macro_1.scala
index 30b12d2fce36..39d2457af9d5 100644
--- a/tests/run-macros/i4734/Macro_1.scala
+++ b/tests/run-macros/i4734/Macro_1.scala
@@ -6,7 +6,7 @@ object Macros {
     ${ unrolledForeachImpl('seq, 'f, 'unrollSize) }
 
   def unrolledForeachImpl(seq: Expr[IndexedSeq[Int]], f: Expr[Int => Unit], unrollSizeExpr: Expr[Int]) (using Quotes): Expr[Unit] =
-    unrolledForeachImpl(seq, f, unrollSizeExpr.valueOrError)
+    unrolledForeachImpl(seq, f, unrollSizeExpr.valueOrAbort)
 
   def unrolledForeachImpl(seq: Expr[IndexedSeq[Int]], f: Expr[Int => Unit], unrollSize: Int)(using Quotes): Expr[Unit] = '{
     val size = ($seq).length
diff --git a/tests/run-macros/i4735/Macro_1.scala b/tests/run-macros/i4735/Macro_1.scala
index 54cdcb574c91..de96230c7a6c 100644
--- a/tests/run-macros/i4735/Macro_1.scala
+++ b/tests/run-macros/i4735/Macro_1.scala
@@ -14,7 +14,7 @@ object Macro {
     while (i < size) {
       println("<log> start loop")
       ${
-        for (j <- new UnrolledRange(0, unrollSize.valueOrError)) '{
+        for (j <- new UnrolledRange(0, unrollSize.valueOrAbort)) '{
           val element = ($seq)(i + ${Expr(j)})
           ${Expr.betaReduce('{$f(element)})} // or `($f)(element)` if `f` should not be inlined
         }
diff --git a/tests/run-macros/i4803/Macro_1.scala b/tests/run-macros/i4803/Macro_1.scala
index 9ff32194c708..cac39ac4640d 100644
--- a/tests/run-macros/i4803/Macro_1.scala
+++ b/tests/run-macros/i4803/Macro_1.scala
@@ -2,7 +2,7 @@ import scala.quoted.*
 
 object PowerMacro {
   def powerCode(x: Expr[Double], n: Expr[Long]) (using Quotes): Expr[Double] =
-    powerCode(x, n.valueOrError)
+    powerCode(x, n.valueOrAbort)
 
   def powerCode(x: Expr[Double], n: Long) (using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/run-macros/i4803b/Macro_1.scala b/tests/run-macros/i4803b/Macro_1.scala
index ab82cb100dc3..af782a153b73 100644
--- a/tests/run-macros/i4803b/Macro_1.scala
+++ b/tests/run-macros/i4803b/Macro_1.scala
@@ -2,7 +2,7 @@ import scala.quoted.*
 
 object PowerMacro {
   def powerCode(x: Expr[Double], n: Expr[Long]) (using Quotes): Expr[Double] =
-    powerCode(x, n.valueOrError)
+    powerCode(x, n.valueOrAbort)
 
   def powerCode(x: Expr[Double], n: Long) (using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/run-macros/i4803c/Macro_1.scala b/tests/run-macros/i4803c/Macro_1.scala
index 2058a0bc4b3b..eb4d25bdfaea 100644
--- a/tests/run-macros/i4803c/Macro_1.scala
+++ b/tests/run-macros/i4803c/Macro_1.scala
@@ -2,7 +2,7 @@ import scala.quoted.*
 
 object PowerMacro {
   def powerCode(x: Expr[Double], n: Expr[Long]) (using Quotes): Expr[Double] =
-    powerCode(x, n.valueOrError)
+    powerCode(x, n.valueOrAbort)
 
   def powerCode(x: Expr[Double], n: Long) (using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/run-macros/i5188a/Macro_1.scala b/tests/run-macros/i5188a/Macro_1.scala
index 252f5245c9ea..04782ac8edd8 100644
--- a/tests/run-macros/i5188a/Macro_1.scala
+++ b/tests/run-macros/i5188a/Macro_1.scala
@@ -2,5 +2,5 @@ import scala.quoted.*
 
 object Lib {
   inline def sum(inline args: Int*): Int = ${ impl('args) }
-  def impl(args: Expr[Seq[Int]]) (using Quotes): Expr[Int] = Expr(args.valueOrError.sum)
+  def impl(args: Expr[Seq[Int]]) (using Quotes): Expr[Int] = Expr(args.valueOrAbort.sum)
 }
diff --git a/tests/run-macros/i6201/macro_1.scala b/tests/run-macros/i6201/macro_1.scala
index 2b87f431f3d9..ca1fecde3c02 100644
--- a/tests/run-macros/i6201/macro_1.scala
+++ b/tests/run-macros/i6201/macro_1.scala
@@ -4,10 +4,10 @@ extension (inline x: String) inline def strip: String =
   ${ stripImpl('x) }
 
 def stripImpl(x: Expr[String])(using Quotes) : Expr[String] =
-  Expr(x.valueOrError.stripMargin)
+  Expr(x.valueOrAbort.stripMargin)
 
 inline def isHello(inline x: String): Boolean =
   ${ isHelloImpl('x) }
 
 def isHelloImpl(x: Expr[String])(using Quotes) : Expr[Boolean] =
-  if (x.valueOrError == "hello") Expr(true) else Expr(false)
+  if (x.valueOrAbort == "hello") Expr(true) else Expr(false)
diff --git a/tests/run-macros/i6765-c/Macro_1.scala b/tests/run-macros/i6765-c/Macro_1.scala
index c3401a7f53da..73fe899ed1a5 100644
--- a/tests/run-macros/i6765-c/Macro_1.scala
+++ b/tests/run-macros/i6765-c/Macro_1.scala
@@ -3,6 +3,6 @@ import scala.quoted.*
 inline def foo(inline n: Int) = ${fooImpl('n)}
 
 def fooImpl(n: Expr[Int])(using Quotes) = {
-  val res = Expr.ofList(List.tabulate(n.valueOrError)(i => Expr("#" + i)))
+  val res = Expr.ofList(List.tabulate(n.valueOrAbort)(i => Expr("#" + i)))
   '{ ${Expr(res.show)} + "\n" + $res.toString + "\n" }
 }
diff --git a/tests/run-macros/i8671/Macro_1.scala b/tests/run-macros/i8671/Macro_1.scala
index c00d901a66e3..2a7af715e2dc 100644
--- a/tests/run-macros/i8671/Macro_1.scala
+++ b/tests/run-macros/i8671/Macro_1.scala
@@ -19,10 +19,10 @@ object FileName {
             case Right(fn) =>
               '{FileName.unsafe(${Expr(fn.name)})} // Or `Expr(fn)` if there is a `ToExpr[FileName]`
             case Left(_) =>
-              report.throwError(s"$s is not a valid file name! It must not contain a /", fileName)
+              report.errorAndAbort(s"$s is not a valid file name! It must not contain a /", fileName)
          }
 
       case _ =>
-        report.throwError(s"$fileName is not a valid file name. It must be a literal string", fileName)
+        report.errorAndAbort(s"$fileName is not a valid file name. It must be a literal string", fileName)
     }
 }
diff --git a/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala b/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala
index d8cf1c788851..148ca05f685e 100644
--- a/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala
+++ b/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala
@@ -7,7 +7,7 @@ object E {
   inline def eval[T](inline x: E[T]): T = ${ impl('x) }
 
   def impl[T: Type](expr: Expr[E[T]]) (using Quotes): Expr[T] =
-    expr.valueOrError.lift
+    expr.valueOrAbort.lift
 
   implicit def ev1[T: Type]: FromExpr[E[T]] = new FromExpr { // TODO use type class derivation
     def unapply(x: Expr[E[T]])(using Quotes) = (x match {
diff --git a/tests/run-macros/inline-option/Macro_1.scala b/tests/run-macros/inline-option/Macro_1.scala
index 4021658bc17a..abdedc679a5c 100644
--- a/tests/run-macros/inline-option/Macro_1.scala
+++ b/tests/run-macros/inline-option/Macro_1.scala
@@ -3,11 +3,11 @@ import scala.quoted.*
 
 object Macros {
 
-  def impl(opt: Expr[Option[Int]]) (using Quotes): Expr[Int] = opt.valueOrError match {
+  def impl(opt: Expr[Option[Int]]) (using Quotes): Expr[Int] = opt.valueOrAbort match {
     case Some(i) => Expr(i)
     case None => '{-1}
   }
 
-  def impl2(opt: Expr[Option[Option[Int]]]) (using Quotes): Expr[Int] = impl(Expr(opt.valueOrError.flatten))
+  def impl2(opt: Expr[Option[Option[Int]]]) (using Quotes): Expr[Int] = impl(Expr(opt.valueOrAbort.flatten))
 
 }
diff --git a/tests/run-macros/inline-tuples-1/Macro_1.scala b/tests/run-macros/inline-tuples-1/Macro_1.scala
index 031fb01cabe4..e0ce4f20419a 100644
--- a/tests/run-macros/inline-tuples-1/Macro_1.scala
+++ b/tests/run-macros/inline-tuples-1/Macro_1.scala
@@ -2,26 +2,26 @@
 import scala.quoted.*
 
 object Macros {
-  def tup1(tup: Expr[Tuple1[Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup2(tup: Expr[Tuple2[Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup3(tup: Expr[Tuple3[Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup4(tup: Expr[Tuple4[Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup5(tup: Expr[Tuple5[Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup6(tup: Expr[Tuple6[Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup7(tup: Expr[Tuple7[Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup8(tup: Expr[Tuple8[Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup9(tup: Expr[Tuple9[Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup10(tup: Expr[Tuple10[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup11(tup: Expr[Tuple11[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup12(tup: Expr[Tuple12[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup13(tup: Expr[Tuple13[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup14(tup: Expr[Tuple14[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup15(tup: Expr[Tuple15[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup16(tup: Expr[Tuple16[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup17(tup: Expr[Tuple17[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup18(tup: Expr[Tuple18[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup19(tup: Expr[Tuple19[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup20(tup: Expr[Tuple20[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup21(tup: Expr[Tuple21[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
-  def tup22(tup: Expr[Tuple22[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup1(tup: Expr[Tuple1[Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup2(tup: Expr[Tuple2[Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup3(tup: Expr[Tuple3[Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup4(tup: Expr[Tuple4[Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup5(tup: Expr[Tuple5[Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup6(tup: Expr[Tuple6[Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup7(tup: Expr[Tuple7[Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup8(tup: Expr[Tuple8[Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup9(tup: Expr[Tuple9[Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup10(tup: Expr[Tuple10[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup11(tup: Expr[Tuple11[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup12(tup: Expr[Tuple12[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup13(tup: Expr[Tuple13[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup14(tup: Expr[Tuple14[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup15(tup: Expr[Tuple15[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup16(tup: Expr[Tuple16[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup17(tup: Expr[Tuple17[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup18(tup: Expr[Tuple18[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup19(tup: Expr[Tuple19[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup20(tup: Expr[Tuple20[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup21(tup: Expr[Tuple21[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
+  def tup22(tup: Expr[Tuple22[Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort.productIterator.map(_.asInstanceOf[Int]).sum)
 }
diff --git a/tests/run-macros/inline-tuples-2/Macro_1.scala b/tests/run-macros/inline-tuples-2/Macro_1.scala
index 7027a1f2680a..263ae5b8f645 100644
--- a/tests/run-macros/inline-tuples-2/Macro_1.scala
+++ b/tests/run-macros/inline-tuples-2/Macro_1.scala
@@ -3,8 +3,8 @@ import scala.quoted.*
 
 object Macros {
 
-  def impl(tup: Expr[Tuple1[Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrError._1)
+  def impl(tup: Expr[Tuple1[Int]]) (using Quotes): Expr[Int] = Expr(tup.valueOrAbort._1)
 
-  def impl2(tup: Expr[Tuple1[Tuple1[Int]]]) (using Quotes): Expr[Int] = impl(Expr(tup.valueOrError._1))
+  def impl2(tup: Expr[Tuple1[Tuple1[Int]]]) (using Quotes): Expr[Int] = impl(Expr(tup.valueOrAbort._1))
 
 }
diff --git a/tests/run-macros/inline-varargs-1/Macro_1.scala b/tests/run-macros/inline-varargs-1/Macro_1.scala
index ed58d1479059..22580c3c42c2 100644
--- a/tests/run-macros/inline-varargs-1/Macro_1.scala
+++ b/tests/run-macros/inline-varargs-1/Macro_1.scala
@@ -2,5 +2,5 @@
 import scala.quoted.*
 
 object Macros {
-  def sum(nums: Expr[Int]*) (using Quotes): Expr[Int] = Expr(nums.map(_.valueOrError).sum)
+  def sum(nums: Expr[Int]*) (using Quotes): Expr[Int] = Expr(nums.map(_.valueOrAbort).sum)
 }
diff --git a/tests/run-macros/power-macro/Macro_1.scala b/tests/run-macros/power-macro/Macro_1.scala
index 57d468fd7dc1..abb22c4f2c96 100644
--- a/tests/run-macros/power-macro/Macro_1.scala
+++ b/tests/run-macros/power-macro/Macro_1.scala
@@ -4,7 +4,7 @@ import scala.quoted.*
 inline def power(x: Double, inline n: Int) = ${ powerCode1('x, 'n) }
 
 private def powerCode1(using Quotes)(x: Expr[Double], n: Expr[Int]): Expr[Double] =
-  powerCode(x, n.valueOrError)
+  powerCode(x, n.valueOrAbort)
 
 private def powerCode(using Quotes)(x: Expr[Double], n: Int): Expr[Double] =
   if (n == 0) Expr(1.0)
diff --git a/tests/run-macros/quote-and-splice/Macros_1.scala b/tests/run-macros/quote-and-splice/Macros_1.scala
index e799318eac12..91c4f586d0e2 100644
--- a/tests/run-macros/quote-and-splice/Macros_1.scala
+++ b/tests/run-macros/quote-and-splice/Macros_1.scala
@@ -6,7 +6,7 @@ object Macros {
   def macro1Impl (using Quotes)= '{3}
 
   inline def macro2(inline p: Boolean) = ${ macro2Impl('p) }
-  def macro2Impl(p: Expr[Boolean]) (using Quotes)= if (p.valueOrError) '{3} else '{4}
+  def macro2Impl(p: Expr[Boolean]) (using Quotes)= if (p.valueOrAbort) '{3} else '{4}
 
   inline def macro3(n: Int) = ${ macro3Impl('n) }
   def macro3Impl(p: Expr[Int]) (using Quotes)= '{ 2 + $p }
@@ -20,7 +20,7 @@ object Macros {
   inline def power(inline n: Int, x: Double) = ${ powerCode('n, 'x) }
 
   def powerCode(n: Expr[Int], x: Expr[Double]) (using Quotes): Expr[Double] =
-    powerCode(n.valueOrError, x)
+    powerCode(n.valueOrAbort, x)
 
   def powerCode(n: Int, x: Expr[Double]) (using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/run-macros/quote-matcher-power/Macro_1.scala b/tests/run-macros/quote-matcher-power/Macro_1.scala
index da21736282df..194744bcf85f 100644
--- a/tests/run-macros/quote-matcher-power/Macro_1.scala
+++ b/tests/run-macros/quote-matcher-power/Macro_1.scala
@@ -4,7 +4,7 @@ import scala.quoted.*
 object Macros {
 
   def power_s(x: Expr[Double], n: Expr[Int]) (using Quotes): Expr[Double] =
-    power_s(x, n.valueOrError)
+    power_s(x, n.valueOrAbort)
 
   def power_s(x: Expr[Double], n: Int) (using Quotes): Expr[Double] =
     if (n == 0) '{1.0}
diff --git a/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala b/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala
index f425cd25ae6d..f42935c5f6df 100644
--- a/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala
+++ b/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala
@@ -9,8 +9,8 @@ object Macros {
   private def impl(self: Expr[StringContext], args: Expr[Seq[String]])(using Quotes): Expr[String] = {
     (self, args) match {
       case ('{ StringContext(${Varargs(parts)}*) }, Varargs(args1)) =>
-        val strParts = parts.map(_.valueOrError.reverse)
-        val strArgs = args1.map(_.valueOrError)
+        val strParts = parts.map(_.valueOrAbort.reverse)
+        val strArgs = args1.map(_.valueOrAbort)
         Expr(StringContext(strParts*).s(strArgs*))
       case _ => ???
     }
diff --git a/tests/run-macros/quote-simple-macro/quoted_1.scala b/tests/run-macros/quote-simple-macro/quoted_1.scala
index bd39612bf3ca..174164320fa0 100644
--- a/tests/run-macros/quote-simple-macro/quoted_1.scala
+++ b/tests/run-macros/quote-simple-macro/quoted_1.scala
@@ -2,5 +2,5 @@ import scala.quoted.*
 
 object Macros {
   inline def foo(inline i: Int, dummy: Int, j: Int): Int = ${ bar('i, 'j) }
-  def bar(x: Expr[Int], y: Expr[Int]) (using Quotes): Expr[Int] = '{ ${Expr(x.valueOrError)} + $y }
+  def bar(x: Expr[Int], y: Expr[Int]) (using Quotes): Expr[Int] = '{ ${Expr(x.valueOrAbort)} + $y }
 }
diff --git a/tests/run-macros/quote-unrolled-foreach/quoted_1.scala b/tests/run-macros/quote-unrolled-foreach/quoted_1.scala
index c84cd639bda7..bc974bce6d07 100644
--- a/tests/run-macros/quote-unrolled-foreach/quoted_1.scala
+++ b/tests/run-macros/quote-unrolled-foreach/quoted_1.scala
@@ -7,7 +7,7 @@ object Macro {
     ${unrolledForeachImpl('unrollSize, 'seq, 'f)}
 
   private def unrolledForeachImpl(unrollSizeExpr: Expr[Int], seq: Expr[Array[Int]], f: Expr[Int => Unit]) (using Quotes): Expr[Unit] =
-    unrolledForeachImpl(unrollSizeExpr.valueOrError, seq, f)
+    unrolledForeachImpl(unrollSizeExpr.valueOrAbort, seq, f)
 
   private def unrolledForeachImpl(unrollSize: Int, seq: Expr[Array[Int]], f: Expr[Int => Unit])(using Quotes): Expr[Unit] = '{
     val size = $seq.length
diff --git a/tests/run-macros/quote-whitebox/Macro_1.scala b/tests/run-macros/quote-whitebox/Macro_1.scala
index a18fccbc166e..78b7c36ccce1 100644
--- a/tests/run-macros/quote-whitebox/Macro_1.scala
+++ b/tests/run-macros/quote-whitebox/Macro_1.scala
@@ -2,7 +2,7 @@ import scala.quoted.*
 
 object Macros {
   transparent inline def defaultOf(inline str: String): Any = ${ defaultOfImpl('str) }
-  def defaultOfImpl(str: Expr[String]) (using Quotes): Expr[Any] = str.valueOrError match {
+  def defaultOfImpl(str: Expr[String]) (using Quotes): Expr[Any] = str.valueOrAbort match {
     case "int" => '{1}
     case "string" => '{"a"}
   }
diff --git a/tests/run-macros/quoted-ToExpr-derivation-macro/Derivation_1.scala b/tests/run-macros/quoted-ToExpr-derivation-macro/Derivation_1.scala
index a080ad96109d..7ac7a341d6b1 100644
--- a/tests/run-macros/quoted-ToExpr-derivation-macro/Derivation_1.scala
+++ b/tests/run-macros/quoted-ToExpr-derivation-macro/Derivation_1.scala
@@ -62,7 +62,7 @@ object ToExprMaker {
     Expr.summon[T] match
       case Some(expr) => expr
       case None =>
-        quotes.reflect.report.throwError(s"Could not find implicit ${Type.show[T]}")
+        quotes.reflect.report.errorAndAbort(s"Could not find implicit ${Type.show[T]}")
 
   private def switchExpr(scrutinee: Expr[Int], seq: List[Expr[ToExpr[_]]])(using Quotes): Expr[ToExpr[_]] =
     import quotes.reflect._
diff --git a/tests/run-macros/quoted-expr-block/quoted_1.scala b/tests/run-macros/quoted-expr-block/quoted_1.scala
index 8d2403df4c10..910382c42de0 100644
--- a/tests/run-macros/quoted-expr-block/quoted_1.scala
+++ b/tests/run-macros/quoted-expr-block/quoted_1.scala
@@ -5,5 +5,5 @@ inline def replicate(inline times: Int, code: => Any) = ${replicateImpl('times,
 private def replicateImpl(times: Expr[Int], code: Expr[Any]) (using Quotes)= {
   @annotation.tailrec def loop(n: Int, accum: List[Expr[Any]]): List[Expr[Any]] =
     if (n > 0) loop(n - 1, code :: accum) else accum
-  Expr.block(loop(times.valueOrError, Nil), '{})
+  Expr.block(loop(times.valueOrAbort, Nil), '{})
 }
diff --git a/tests/run-macros/quoted-liftable-derivation-macro-2/Derivation_1.scala b/tests/run-macros/quoted-liftable-derivation-macro-2/Derivation_1.scala
index 7c199910652c..1b45835006c0 100644
--- a/tests/run-macros/quoted-liftable-derivation-macro-2/Derivation_1.scala
+++ b/tests/run-macros/quoted-liftable-derivation-macro-2/Derivation_1.scala
@@ -65,7 +65,7 @@ object Lft {
     Expr.summon[T] match
       case Some(expr) => expr
       case None =>
-        quotes.reflect.report.throwError(s"Could not find implicit ${Type.show[T]}")
+        quotes.reflect.report.errorAndAbort(s"Could not find implicit ${Type.show[T]}")
 
   private def switchExpr(scrutinee: Expr[Int], seq: List[Expr[Lft[_]]])(using Quotes): Expr[Lft[_]] =
     import quotes.reflect._
diff --git a/tests/run-macros/quoted-liftable-derivation-macro/Derivation_1.scala b/tests/run-macros/quoted-liftable-derivation-macro/Derivation_1.scala
index 059ebc16e446..8ecde7988f4e 100644
--- a/tests/run-macros/quoted-liftable-derivation-macro/Derivation_1.scala
+++ b/tests/run-macros/quoted-liftable-derivation-macro/Derivation_1.scala
@@ -52,7 +52,7 @@ object Lft {
   private def elemTypesLfts[X: Type](using Quotes): List[Expr[Lft[_]]] =
     Type.of[X] match
       case '[ head *: tail ] =>
-        Expr.summon[Lft[head]].getOrElse(quotes.reflect.report.throwError(s"Could not find given Lft[${Type.show[head]}]")) :: elemTypesLfts[tail]
+        Expr.summon[Lft[head]].getOrElse(quotes.reflect.report.errorAndAbort(s"Could not find given Lft[${Type.show[head]}]")) :: elemTypesLfts[tail]
       case '[ EmptyTuple ] => Nil
 
   private def elemType[X: Type](ordinal: Int)(using Quotes): Type[_] =
diff --git a/tests/run-macros/reflect-inline/assert_1.scala b/tests/run-macros/reflect-inline/assert_1.scala
index 6c797be0fc85..95bf9dbf04b8 100644
--- a/tests/run-macros/reflect-inline/assert_1.scala
+++ b/tests/run-macros/reflect-inline/assert_1.scala
@@ -5,12 +5,12 @@ object api {
     ${ stripImpl('x) }
 
   private def stripImpl(x: Expr[String])(using Quotes): Expr[String] =
-    Expr(augmentString(x.valueOrError).stripMargin)
+    Expr(augmentString(x.valueOrAbort).stripMargin)
 
   inline def typeChecks(inline x: String): Boolean =
     ${ typeChecksImpl('{scala.compiletime.testing.typeChecks(x)}) }
 
   private def typeChecksImpl(b: Expr[Boolean])(using Quotes): Expr[Boolean] = {
-    if (b.valueOrError) Expr(true) else Expr(false)
+    if (b.valueOrAbort) Expr(true) else Expr(false)
   }
 }
diff --git a/tests/run-macros/self.check b/tests/run-macros/self.check
new file mode 100644
index 000000000000..925316ca5318
--- /dev/null
+++ b/tests/run-macros/self.check
@@ -0,0 +1,3 @@
+ExprType(TypeRef(TermRef(ThisType(TypeRef(NoPrefix,module class <root>)),object scala),Int))
+MethodType(List(x), List(TypeRef(TermRef(TermRef(ThisType(TypeRef(NoPrefix,module class <root>)),object scala),Predef),String)), TypeRef(TypeRef(ThisType(TypeRef(ThisType(TypeRef(NoPrefix,module class <root>)),module class <empty>)),B),X))
+MethodType(List(x), List(TypeRef(TermRef(ThisType(TypeRef(NoPrefix,module class <root>)),object scala),Int)), TypeRef(TypeRef(ThisType(TypeRef(ThisType(TypeRef(NoPrefix,module class <root>)),module class <empty>)),B),X))
diff --git a/tests/run-macros/self/Macro_1.scala b/tests/run-macros/self/Macro_1.scala
new file mode 100644
index 000000000000..98699f2ece14
--- /dev/null
+++ b/tests/run-macros/self/Macro_1.scala
@@ -0,0 +1,35 @@
+import scala.quoted.*
+
+trait A {
+  type X
+}
+trait B { self: A =>
+  def foo(x: Int): X
+  def foo(x: String): X
+}
+
+object Obj {
+  def foo: Int = 1
+}
+
+object Macros {
+
+  inline def test(): String = ${ testImpl }
+
+  private def testImpl(using Quotes) : Expr[String] = {
+    import quotes.reflect.*
+    val bTpe = TypeRepr.of[B]
+    val bSym = bTpe.classSymbol.get
+    val bMethSyms = bSym.methodMember("foo") // Used to throw a MissingType exception
+    val bMethTpes = bMethSyms.map(bTpe.memberType)
+
+    // Make sure we didn't break member lookup on terms
+    val objTpe = TypeRepr.of[Obj.type]
+    val objSym = objTpe.termSymbol
+    val objMethSyms = objSym.methodMember("foo")
+    val objMethTpes = objMethSyms.map(objTpe.memberType)
+
+    Expr((objMethTpes ++ bMethTpes).map(_.toString).sorted.mkString("\n"))
+  }
+
+}
diff --git a/tests/run-macros/self/Test_2.scala b/tests/run-macros/self/Test_2.scala
new file mode 100644
index 000000000000..f0a2a8a00ab8
--- /dev/null
+++ b/tests/run-macros/self/Test_2.scala
@@ -0,0 +1,8 @@
+
+object Test {
+
+  def main(args: Array[String]): Unit = {
+    println(Macros.test())
+  }
+
+}
diff --git a/tests/run-macros/simple-interpreter/Macro_1.scala b/tests/run-macros/simple-interpreter/Macro_1.scala
index 98ce017e563c..324b03676185 100644
--- a/tests/run-macros/simple-interpreter/Macro_1.scala
+++ b/tests/run-macros/simple-interpreter/Macro_1.scala
@@ -34,7 +34,7 @@ object SchemaInterpreter {
             vSchema <- interpretSchema(vSchemaExpr)
         yield Schema.mapSchema(using kSchema, vSchema).asInstanceOf[Schema[T]]
       case _ =>
-        None // could also hangle with `quotes.reflect.{error, throwError}`
+        None // could also hangle with `quotes.reflect.{error, errorAndAbort}`
     }
 }
 
diff --git a/tests/run-macros/tasty-extractors-1.check b/tests/run-macros/tasty-extractors-1.check
index b53e72c1f378..bebfa3d79dbc 100644
--- a/tests/run-macros/tasty-extractors-1.check
+++ b/tests/run-macros/tasty-extractors-1.check
@@ -40,37 +40,37 @@ OrType(ConstantType(IntConstant(1)), ConstantType(IntConstant(2)))
 Inlined(None, Nil, Match(Literal(StringConstant("a")), List(CaseDef(Literal(StringConstant("a")), None, Block(Nil, Literal(UnitConstant()))))))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
-Inlined(None, Nil, Match(Literal(StringConstant("b")), List(CaseDef(Bind("n", Ident("_")), None, Block(Nil, Literal(UnitConstant()))))))
+Inlined(None, Nil, Match(Literal(StringConstant("b")), List(CaseDef(Bind("n", Wildcard()), None, Block(Nil, Literal(UnitConstant()))))))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
-Inlined(None, Nil, Match(Literal(StringConstant("c")), List(CaseDef(Bind("n", Typed(Ident("_"), TypeIdent("String"))), None, Block(Nil, Literal(UnitConstant()))))))
+Inlined(None, Nil, Match(Literal(StringConstant("c")), List(CaseDef(Bind("n", Typed(Wildcard(), TypeIdent("String"))), None, Block(Nil, Literal(UnitConstant()))))))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
-Inlined(None, Nil, Match(Literal(StringConstant("e")), List(CaseDef(Ident("_"), None, Block(Nil, Literal(UnitConstant()))))))
+Inlined(None, Nil, Match(Literal(StringConstant("e")), List(CaseDef(Wildcard(), None, Block(Nil, Literal(UnitConstant()))))))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
-Inlined(None, Nil, Match(Literal(StringConstant("f")), List(CaseDef(Typed(Ident("_"), TypeIdent("String")), None, Block(Nil, Literal(UnitConstant()))))))
+Inlined(None, Nil, Match(Literal(StringConstant("f")), List(CaseDef(Typed(Wildcard(), TypeIdent("String")), None, Block(Nil, Literal(UnitConstant()))))))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
-Inlined(None, Nil, Match(Typed(Literal(StringConstant("g")), TypeIdent("Any")), List(CaseDef(Alternative(List(Typed(Ident("_"), TypeIdent("String")), Typed(Ident("_"), TypeIdent("Int")))), None, Block(Nil, Literal(UnitConstant()))))))
+Inlined(None, Nil, Match(Typed(Literal(StringConstant("g")), TypeIdent("Any")), List(CaseDef(Alternatives(List(Typed(Wildcard(), TypeIdent("String")), Typed(Wildcard(), TypeIdent("Int")))), None, Block(Nil, Literal(UnitConstant()))))))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
-Inlined(None, Nil, Match(Literal(StringConstant("h")), List(CaseDef(Ident("_"), Some(Literal(BooleanConstant(false))), Block(Nil, Literal(UnitConstant()))))))
+Inlined(None, Nil, Match(Literal(StringConstant("h")), List(CaseDef(Wildcard(), Some(Literal(BooleanConstant(false))), Block(Nil, Literal(UnitConstant()))))))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
-Inlined(None, Nil, Block(List(ValDef("a", Inferred(), Some(Literal(StringConstant("o"))))), Match(Literal(StringConstant("i")), List(CaseDef(Bind("a", Ident("_")), None, Block(Nil, Literal(UnitConstant())))))))
+Inlined(None, Nil, Block(List(ValDef("a", Inferred(), Some(Literal(StringConstant("o"))))), Match(Literal(StringConstant("i")), List(CaseDef(Bind("a", Wildcard()), None, Block(Nil, Literal(UnitConstant())))))))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
-Inlined(None, Nil, Match(Ident("Nil"), List(CaseDef(Unapply(TypeApply(Select(Ident("List"), "unapplySeq"), List(Inferred())), Nil, List(Bind("a", Ident("_")), Bind("b", Ident("_")), Bind("c", Ident("_")))), None, Block(Nil, Literal(UnitConstant()))))))
+Inlined(None, Nil, Match(Ident("Nil"), List(CaseDef(Unapply(TypeApply(Select(Ident("List"), "unapplySeq"), List(Inferred())), Nil, List(Bind("a", Wildcard()), Bind("b", Wildcard()), Bind("c", Wildcard()))), None, Block(Nil, Literal(UnitConstant()))))))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
-Inlined(None, Nil, Try(Literal(IntConstant(1)), List(CaseDef(Ident("_"), None, Block(Nil, Literal(UnitConstant())))), None))
+Inlined(None, Nil, Try(Literal(IntConstant(1)), List(CaseDef(Wildcard(), None, Block(Nil, Literal(UnitConstant())))), None))
 OrType(ConstantType(IntConstant(1)), TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit"))
 
 Inlined(None, Nil, Try(Literal(IntConstant(2)), Nil, Some(Literal(UnitConstant()))))
 ConstantType(IntConstant(2))
 
-Inlined(None, Nil, Try(Literal(IntConstant(3)), List(CaseDef(Ident("_"), None, Block(Nil, Literal(UnitConstant())))), Some(Literal(UnitConstant()))))
+Inlined(None, Nil, Try(Literal(IntConstant(3)), List(CaseDef(Wildcard(), None, Block(Nil, Literal(UnitConstant())))), Some(Literal(UnitConstant()))))
 OrType(ConstantType(IntConstant(3)), TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit"))
 
 Inlined(None, Nil, Literal(BooleanConstant(false)))
diff --git a/tests/run-macros/tasty-extractors-2.check b/tests/run-macros/tasty-extractors-2.check
index 1223a1fb71d9..5dd6af8d8b04 100644
--- a/tests/run-macros/tasty-extractors-2.check
+++ b/tests/run-macros/tasty-extractors-2.check
@@ -49,7 +49,7 @@ TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 Inlined(None, Nil, Block(List(ClassDef("Foo", DefDef("<init>", List(TermParamClause(Nil)), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil)), None, List(DefDef("a", Nil, Inferred(), Some(Literal(IntConstant(0))))))), Literal(UnitConstant())))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
-Inlined(None, Nil, Block(List(ClassDef("Foo", DefDef("<init>", List(TermParamClause(Nil)), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil), TypeSelect(Select(Ident("_root_"), "scala"), "Product"), TypeSelect(Select(Ident("_root_"), "scala"), "Serializable")), None, List(DefDef("hashCode", List(TermParamClause(Nil)), Inferred(), Some(Apply(Ident("_hashCode"), List(This(Some("Foo")))))), DefDef("equals", List(TermParamClause(List(ValDef("x$0", Inferred(), None)))), Inferred(), Some(Apply(Select(Apply(Select(This(Some("Foo")), "eq"), List(TypeApply(Select(Ident("x$0"), "$asInstanceOf$"), List(Inferred())))), "||"), List(Match(Ident("x$0"), List(CaseDef(Bind("x$0", Typed(Ident("_"), Inferred())), None, Apply(Select(Literal(BooleanConstant(true)), "&&"), List(Apply(Select(Ident("x$0"), "canEqual"), List(This(Some("Foo"))))))), CaseDef(Ident("_"), None, Literal(BooleanConstant(false))))))))), DefDef("toString", List(TermParamClause(Nil)), Inferred(), Some(Apply(Ident("_toString"), List(This(Some("Foo")))))), DefDef("canEqual", List(TermParamClause(List(ValDef("that", Inferred(), None)))), Inferred(), Some(TypeApply(Select(Ident("that"), "isInstanceOf"), List(Inferred())))), DefDef("productArity", Nil, Inferred(), Some(Literal(IntConstant(0)))), DefDef("productPrefix", Nil, Inferred(), Some(Literal(StringConstant("Foo")))), DefDef("productElement", List(TermParamClause(List(ValDef("n", Inferred(), None)))), Inferred(), Some(Match(Ident("n"), List(CaseDef(Ident("_"), None, Apply(Ident("throw"), List(Apply(Select(New(Inferred()), "<init>"), List(Apply(Select(Ident("n"), "toString"), Nil)))))))))), DefDef("productElementName", List(TermParamClause(List(ValDef("n", Inferred(), None)))), Inferred(), Some(Match(Ident("n"), List(CaseDef(Ident("_"), None, Apply(Ident("throw"), List(Apply(Select(New(Inferred()), "<init>"), List(Apply(Select(Ident("n"), "toString"), Nil)))))))))), DefDef("copy", List(TermParamClause(Nil)), Inferred(), Some(Apply(Select(New(Inferred()), "<init>"), Nil))))), ValDef("Foo", TypeIdent("Foo$"), Some(Apply(Select(New(TypeIdent("Foo$")), "<init>"), Nil))), ClassDef("Foo$", DefDef("<init>", List(TermParamClause(Nil)), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil), Inferred()), Some(ValDef("_", Singleton(Ident("Foo")), None)), List(DefDef("apply", List(TermParamClause(Nil)), Inferred(), Some(Apply(Select(New(Inferred()), "<init>"), Nil))), DefDef("unapply", List(TermParamClause(List(ValDef("x$1", Inferred(), None)))), Singleton(Literal(BooleanConstant(true))), Some(Literal(BooleanConstant(true)))), DefDef("toString", Nil, Inferred(), Some(Literal(StringConstant("Foo")))), TypeDef("MirroredMonoType", TypeBoundsTree(Inferred(), Inferred())), DefDef("fromProduct", List(TermParamClause(List(ValDef("x$0", Inferred(), None)))), Inferred(), Some(Apply(Select(New(Inferred()), "<init>"), Nil)))))), Literal(UnitConstant())))
+Inlined(None, Nil, Block(List(ClassDef("Foo", DefDef("<init>", List(TermParamClause(Nil)), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil), TypeSelect(Select(Ident("_root_"), "scala"), "Product"), TypeSelect(Select(Ident("_root_"), "scala"), "Serializable")), None, List(DefDef("hashCode", List(TermParamClause(Nil)), Inferred(), Some(Apply(Ident("_hashCode"), List(This(Some("Foo")))))), DefDef("equals", List(TermParamClause(List(ValDef("x$0", Inferred(), None)))), Inferred(), Some(Apply(Select(Apply(Select(This(Some("Foo")), "eq"), List(TypeApply(Select(Ident("x$0"), "$asInstanceOf$"), List(Inferred())))), "||"), List(Match(Ident("x$0"), List(CaseDef(Bind("x$0", Typed(Wildcard(), Inferred())), None, Apply(Select(Literal(BooleanConstant(true)), "&&"), List(Apply(Select(Ident("x$0"), "canEqual"), List(This(Some("Foo"))))))), CaseDef(Wildcard(), None, Literal(BooleanConstant(false))))))))), DefDef("toString", List(TermParamClause(Nil)), Inferred(), Some(Apply(Ident("_toString"), List(This(Some("Foo")))))), DefDef("canEqual", List(TermParamClause(List(ValDef("that", Inferred(), None)))), Inferred(), Some(TypeApply(Select(Ident("that"), "isInstanceOf"), List(Inferred())))), DefDef("productArity", Nil, Inferred(), Some(Literal(IntConstant(0)))), DefDef("productPrefix", Nil, Inferred(), Some(Literal(StringConstant("Foo")))), DefDef("productElement", List(TermParamClause(List(ValDef("n", Inferred(), None)))), Inferred(), Some(Match(Ident("n"), List(CaseDef(Wildcard(), None, Apply(Ident("throw"), List(Apply(Select(New(Inferred()), "<init>"), List(Apply(Select(Ident("n"), "toString"), Nil)))))))))), DefDef("productElementName", List(TermParamClause(List(ValDef("n", Inferred(), None)))), Inferred(), Some(Match(Ident("n"), List(CaseDef(Wildcard(), None, Apply(Ident("throw"), List(Apply(Select(New(Inferred()), "<init>"), List(Apply(Select(Ident("n"), "toString"), Nil)))))))))), DefDef("copy", List(TermParamClause(Nil)), Inferred(), Some(Apply(Select(New(Inferred()), "<init>"), Nil))))), ValDef("Foo", TypeIdent("Foo$"), Some(Apply(Select(New(TypeIdent("Foo$")), "<init>"), Nil))), ClassDef("Foo$", DefDef("<init>", List(TermParamClause(Nil)), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil), Inferred()), Some(ValDef("_", Singleton(Ident("Foo")), None)), List(DefDef("apply", List(TermParamClause(Nil)), Inferred(), Some(Apply(Select(New(Inferred()), "<init>"), Nil))), DefDef("unapply", List(TermParamClause(List(ValDef("x$1", Inferred(), None)))), Singleton(Literal(BooleanConstant(true))), Some(Literal(BooleanConstant(true)))), DefDef("toString", Nil, Inferred(), Some(Literal(StringConstant("Foo")))), TypeDef("MirroredMonoType", TypeBoundsTree(Inferred(), Inferred())), DefDef("fromProduct", List(TermParamClause(List(ValDef("x$0", Inferred(), None)))), Inferred(), Some(Apply(Select(New(Inferred()), "<init>"), Nil)))))), Literal(UnitConstant())))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 
 Inlined(None, Nil, Block(List(ClassDef("Foo1", DefDef("<init>", List(TermParamClause(List(ValDef("a", TypeIdent("Int"), None)))), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil)), None, List(ValDef("a", Inferred(), None)))), Literal(UnitConstant())))
diff --git a/tests/run-macros/tasty-getfile-implicit-by-name-fun-context/Macro_1.scala b/tests/run-macros/tasty-getfile-implicit-by-name-fun-context/Macro_1.scala
index bb478331aa64..e78f3b88fe87 100644
--- a/tests/run-macros/tasty-getfile-implicit-by-name-fun-context/Macro_1.scala
+++ b/tests/run-macros/tasty-getfile-implicit-by-name-fun-context/Macro_1.scala
@@ -9,6 +9,6 @@ object SourceFiles {
 
   def getThisFileImpl: Macro[String] =
     val q = quotes // Quotes is ByName and hence not stable (q stabilizes it)
-    Expr(q.reflect.SourceFile.current.jpath.getFileName.toString)
+    Expr(q.reflect.SourceFile.current.name)
 
 }
diff --git a/tests/run-macros/tasty-macro-positions/quoted_1.scala b/tests/run-macros/tasty-macro-positions/quoted_1.scala
index d53cd16088b9..c0765bf1cda3 100644
--- a/tests/run-macros/tasty-macro-positions/quoted_1.scala
+++ b/tests/run-macros/tasty-macro-positions/quoted_1.scala
@@ -30,6 +30,6 @@ object Macros {
 
   def posStr(using Quotes)(pos: quotes.reflect.Position): Expr[String] = {
     import quotes.reflect.*
-    Expr(s"${pos.sourceFile.jpath.getFileName.toString}:[${pos.start}..${pos.end}]")
+    Expr(s"${pos.sourceFile.name}:[${pos.start}..${pos.end}]")
   }
 }
diff --git a/tests/run-macros/tasty-positioned/quoted_1.scala b/tests/run-macros/tasty-positioned/quoted_1.scala
index e6664c6a1774..ff8a614a0ba9 100644
--- a/tests/run-macros/tasty-positioned/quoted_1.scala
+++ b/tests/run-macros/tasty-positioned/quoted_1.scala
@@ -13,7 +13,7 @@ object Positioned {
     import quotes.reflect.{Position as Pos, *}
     val pos = Pos.ofMacroExpansion
 
-    val path = Expr(pos.sourceFile.jpath.toString)
+    val path = Expr(pos.sourceFile.getJPath.get.toString)
     val start = Expr(pos.start)
     val end = Expr(pos.end)
     val startLine = Expr(pos.startLine)
diff --git a/tests/run-macros/tasty-simplified.check b/tests/run-macros/tasty-simplified.check
index 55e725e10f17..41ae9120aa03 100644
--- a/tests/run-macros/tasty-simplified.check
+++ b/tests/run-macros/tasty-simplified.check
@@ -1,4 +1,4 @@
-Functor[Const[scala.collection.immutable.List[Dummy]]]
-Functor[Const[scala.Int]]
-Functor[Const[Dummy]]
-Functor[Const[scala.Option[Dummy]]]
+Functor[[A >: scala.Nothing <: scala.Any] => scala.collection.immutable.List[A]]
+Unapply[[F >: scala.Nothing <: [_$9 >: scala.Nothing <: scala.Any] => scala.Any] => Functor[F], Wrap[scala.Int]]
+Unapply[[F >: scala.Nothing <: [_$9 >: scala.Nothing <: scala.Any] => scala.Any] => Functor[F], Wrap[Dummy]]
+Functor[[A >: scala.Nothing <: scala.Any] => scala.Option[A]]
diff --git a/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala b/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala
index 14d43bd98657..219cd5cfbebf 100644
--- a/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala
+++ b/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala
@@ -52,7 +52,7 @@ object Macro {
 
   private def fooCore(parts: Seq[Expr[String]], args: Seq[Expr[Any]], reporter: Reporter)(using Quotes): Expr[String] = {
     for ((part, idx) <- parts.zipWithIndex) {
-      val v = part.valueOrError
+      val v = part.valueOrAbort
       if (v.contains("#"))
         reporter.errorOnPart("Cannot use #", idx)
     }
diff --git a/tests/run-macros/type-show/Macro_1.scala b/tests/run-macros/type-show/Macro_1.scala
index 57a74a3a24f9..3de9fe579244 100644
--- a/tests/run-macros/type-show/Macro_1.scala
+++ b/tests/run-macros/type-show/Macro_1.scala
@@ -1,7 +1,13 @@
 import scala.quoted.*
 
 object TypeToolbox {
-  inline def show[A]: String = ${ showImpl[A] }
-  private def showImpl[A: Type](using Quotes) : Expr[String] =
+  inline def show[A <: AnyKind]: String = ${ showImpl[A] }
+  private def showImpl[A <: AnyKind: Type](using Quotes) : Expr[String] =
     Expr(Type.show[A])
+
+  inline def showStructure[A <: AnyKind]: String = ${ showStructureImpl[A] }
+  private def showStructureImpl[A <: AnyKind](using q: Quotes, a: Type[A]) : Expr[String] = {
+    import q.reflect._
+    Expr(TypeRepr.of[A].show(using Printer.TypeReprStructure))
+  }
 }
diff --git a/tests/run-macros/type-show/Test_2.scala b/tests/run-macros/type-show/Test_2.scala
index ee33205413f1..d741a426cd69 100644
--- a/tests/run-macros/type-show/Test_2.scala
+++ b/tests/run-macros/type-show/Test_2.scala
@@ -8,6 +8,11 @@ object Test {
     assert(show[Int] == "scala.Int")
     assert(show[Int => Int] == "scala.Function1[scala.Int, scala.Int]")
     assert(show[(Int, String)] == "scala.Tuple2[scala.Int, scala.Predef.String]")
+    assert(show[[X] =>> X match { case Int => Int }] ==
+      """[X >: scala.Nothing <: scala.Any] => X match  {
+        |  case scala.Int => scala.Int
+        |}""".stripMargin)
+    assert(showStructure[[X] =>> X match { case Int => Int }] == """TypeLambda(List(X), List(TypeBounds(TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Nothing"), TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Any"))), MatchType(TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Any"), ParamRef(binder, 0), List(MatchCase(TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Int"), TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Int")))))""")
 
     // TODO: more complex types:
     //  - implicit function types
diff --git a/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala
index 5f3505be3fe7..65d32d9bfbe8 100644
--- a/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala
+++ b/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala
@@ -12,7 +12,7 @@ object XmlQuote {
   }
 
   def impl(receiver: Expr[StringContext], args: Expr[Seq[Any]])(using Quotes): Expr[Xml] = {
-    val string = receiver.valueOrError.parts.mkString("??")
+    val string = receiver.valueOrAbort.parts.mkString("??")
     '{new Xml(${Expr(string)}, $args.toList)}
   }
 }
diff --git a/tests/run-staging/i11162.scala b/tests/run-staging/i11162.scala
new file mode 100644
index 000000000000..81db85f24274
--- /dev/null
+++ b/tests/run-staging/i11162.scala
@@ -0,0 +1,15 @@
+import scala.quoted.*
+
+object Test {
+
+  given staging.Compiler = staging.Compiler.make(getClass.getClassLoader)
+
+  def main(args: Array[String]): Unit =
+    staging.run {
+      '{ foo() }
+    }
+
+  inline def foo(): Unit = ${ fooExpr() }
+
+  private def fooExpr()(using Quotes): Expr[Unit] = '{ println("foo") }
+}
diff --git a/tests/run-staging/i4730.scala b/tests/run-staging/i4730.scala
index 4c3d9b23cb10..cc9b6d52fb9b 100644
--- a/tests/run-staging/i4730.scala
+++ b/tests/run-staging/i4730.scala
@@ -1,7 +1,8 @@
 import scala.quoted.*
 import scala.quoted.staging.*
 
-object Test {
+
+package i4730:
   given Compiler = Compiler.make(getClass.getClassLoader)
   def ret(using Quotes): Expr[Int => Int] = '{ (x: Int) =>
     ${
@@ -9,16 +10,12 @@ object Test {
       Expr(z)
     }
   }
-  def main(args: Array[String]): Unit = {
-    scala.mytest.myTest()
-  }
-}
 
 package scala {
   package mytest {
     def myTest()(using Compiler) = {
       try {
-        run(Test.ret).apply(10)
+        run(i4730.ret).apply(10)
         throw new Exception
       } catch {
         case ex: Exception if ex.getClass.getName == "scala.quoted.runtime.impl.ScopeException" =>
@@ -27,3 +24,9 @@ package scala {
     }
   }
 }
+object Test {
+  import i4730.given
+  def main(args: Array[String]): Unit = {
+    scala.mytest.myTest()
+  }
+}
diff --git a/tests/run-staging/i6992/Macro_1.scala b/tests/run-staging/i6992/Macro_1.scala
index 09cacfd9e1eb..d0a670c5827a 100644
--- a/tests/run-staging/i6992/Macro_1.scala
+++ b/tests/run-staging/i6992/Macro_1.scala
@@ -2,19 +2,20 @@
 import scala.quoted.*
 import scala.quoted.staging.*
 
+package macros:
 
-object macros {
-  inline def mcr(x: => Any): Any = ${mcrImpl('x)}
+  object macros {
+    inline def mcr(x: => Any): Any = ${mcrImpl('x)}
 
-  class Foo { val x = 10 }
+    class Foo { val x = 10 }
 
-  def mcrImpl(body: Expr[Any])(using ctx: Quotes): Expr[Any] =
-    MyTest.mcrImpl(body)
-}
+    def mcrImpl(body: Expr[Any])(using ctx: Quotes): Expr[Any] =
+      MyTest.mcrImpl(body)
+  }
 
 package scala {
   object MyTest {
-    import macros.*
+    import macros.macros.*
 
    given Compiler = Compiler.make(getClass.getClassLoader)
 
diff --git a/tests/run-staging/i6992/Test_2.scala b/tests/run-staging/i6992/Test_2.scala
index 01ce6977c72c..4e814dcc7de8 100644
--- a/tests/run-staging/i6992/Test_2.scala
+++ b/tests/run-staging/i6992/Test_2.scala
@@ -1,4 +1,4 @@
-import macros.*
+import macros.macros.*
 
 object Test {
   val foo = new Foo
diff --git a/tests/run/1938-2.scala b/tests/run/1938-2.scala
index 32e4c4518b96..143a94705455 100644
--- a/tests/run/1938-2.scala
+++ b/tests/run/1938-2.scala
@@ -1,6 +1,6 @@
 object ProdNonEmpty {
   def _1: Int = 0
-  def _2: String = "???" // Slight variation with scalac: this test passes
+  def _2: String = "???" // Slight variation with nsc: this test passes
                          // with ??? here. I think dotty behavior is fine
                          // according to the spec given that methods involved
                          // in pattern matching should be pure.
diff --git a/tests/run/9416.scala b/tests/run/9416.scala
new file mode 100644
index 000000000000..fbc110a948a3
--- /dev/null
+++ b/tests/run/9416.scala
@@ -0,0 +1,20 @@
+trait Base[D <: Domain] {
+  def f(pp: Extract[D]): Unit
+}
+
+class Ext extends Base[ExtDomain] {
+  def f(pp: String) = println(pp.length)
+}
+
+type Domain
+type DomainImpl[T] <: Domain
+type ExtDomain = DomainImpl[String]
+
+type Extract[X] = X match { case DomainImpl[t] => t }
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    def f[M <: Domain](rc: Base[M], v: Extract[M]): Unit =  rc.f(v)
+    f(new Ext, "foo")
+  }
+}
diff --git a/tests/run/StringConcat.check b/tests/run/StringConcat.check
new file mode 100644
index 000000000000..f7c52a0ffece
Binary files /dev/null and b/tests/run/StringConcat.check differ
diff --git a/tests/run/StringConcat.scala b/tests/run/StringConcat.scala
new file mode 100644
index 000000000000..774147ba1303
--- /dev/null
+++ b/tests/run/StringConcat.scala
@@ -0,0 +1,79 @@
+@main def Test() = {
+
+  // This should generally obey 15.18.1. of the JLS (String Concatenation Operator +)
+  def concatenatingVariousTypes(): String = {
+    val str: String = "some string"
+    val sb: StringBuffer = new StringBuffer("some stringbuffer")
+    val cs: CharSequence = java.nio.CharBuffer.allocate(50).append("charsequence")
+    val i: Int = 123456789
+    val s: Short = 345
+    val b: Byte = 12
+    val z: Boolean = true
+    val f: Float = 3.14f
+    val j: Long = 98762147483647L
+    val d: Double = 3.1415d
+
+    "String " + str + "\n" +
+      "StringBuffer " + sb + "\n" +
+      "CharSequence " + cs + "\n" +
+      "Int " + i + "\n" +
+      "Short " + s + "\n" +
+      "Byte " + b + "\n" +
+      "Boolean " + z + "\n" +
+      "Float " + f + "\n" +
+      "Long " + j + "\n" +
+      "Double " + d + "\n"
+  }
+  // The characters `\u0001` and `\u0002` play a special role in `StringConcatFactory`
+  def concatenationInvolvingSpecialCharacters(): String = {
+    val s1 = "Qux"
+    val s2 = "Quux"
+
+    s"Foo \u0001 $s1 Bar \u0002 $s2 Baz"
+  }
+  // Concatenation involving more than 200 elements
+  def largeConcatenation(): String = {
+    val s00 = "s00"
+    val s01 = "s01"
+    val s02 = "s02"
+    val s03 = "s03"
+    val s04 = "s04"
+    val s05 = "s05"
+    val s06 = "s06"
+    val s07 = "s07"
+    val s08 = "s08"
+
+    // 24 rows follow
+    ((s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n") +
+      (s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n")) +
+      ((s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n") +
+      (s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n" +
+      s00 + "," + s01 + "," + s02 + "," + s03 + "," + s04 + "," + s05 + "," + s06 + "," + s07 + "," + s08 + "\n"))
+  }
+  println("----------")
+  println(concatenatingVariousTypes())
+  println("----------")
+  println(concatenationInvolvingSpecialCharacters())
+  println("----------")
+  println(largeConcatenation())
+  println("----------")
+}
diff --git a/tests/run/absoverride.scala b/tests/run/absoverride.scala
index 0301498935a0..6e3c7318c487 100644
--- a/tests/run/absoverride.scala
+++ b/tests/run/absoverride.scala
@@ -34,7 +34,7 @@ class Iter2(s: String) extends StringIterator(s)
                with SyncIterator with LoggedIterator;
 object Test {
   def main(args: Array[String]): Unit = {
-    class Iter extends StringIterator(args(0)) with RichIterator with SyncIterator with LoggedIterator
+    class Iter extends StringIterator("jvm") with RichIterator with SyncIterator with LoggedIterator
     val iter = new Iter
     iter foreach Console.println
   }
diff --git a/tests/run/array-erasure.scala b/tests/run/array-erasure.scala
index 264fe46c36e5..1ce727337a4f 100644
--- a/tests/run/array-erasure.scala
+++ b/tests/run/array-erasure.scala
@@ -65,5 +65,11 @@ object Test {
     arr4(x)
     arr5(x)
     arr6(x)
+
+
+    val str: Any = ""
+    assert(!str.isInstanceOf[Array[?]])
+    assert(!str.isInstanceOf[Array[Array[?]]])
+    assert(!str.isInstanceOf[Array[? <: Array[?]]])
   }
 }
diff --git a/tests/run/boehm-berarducci.check b/tests/run/boehm-berarducci.check
new file mode 100644
index 000000000000..03bc5c4710b0
--- /dev/null
+++ b/tests/run/boehm-berarducci.check
@@ -0,0 +1,8 @@
+List(1, 2)
+List(2)
+1
+false
+List(1, 2)
+List(2)
+1
+false
diff --git a/tests/run/boehm-berarducci.scala b/tests/run/boehm-berarducci.scala
new file mode 100644
index 000000000000..fb75268199c7
--- /dev/null
+++ b/tests/run/boehm-berarducci.scala
@@ -0,0 +1,75 @@
+/* Boehm-Berarducci encoding of lists in polymorphic typed lambda calculus */
+type Op[T, C] = T => C => C
+type List[T] = [C] => Op[T, C] => C => C
+
+def nil[T]: List[T] =
+  [C] => (op: Op[T, C]) => (s: C) => s
+
+def cons[T](hd: T, tl: List[T]): List[T] =
+  [C] => (op: Op[T, C]) => (s: C) => op(hd)(tl(op)(s))
+
+/** A trait that can be instantiated with a list decomposition `ListView` */
+trait ListOps:
+  type ListView[T]
+  def decompose[T](xs: List[T]): ListView[T]
+  def fst[T](v: ListView[T]): T
+  def snd[T](v: ListView[T]): List[T]
+  def isPair[T](v: ListView[T]): Boolean
+
+  // Some operations and tests that operate with the decomposition
+  def head[T](xs: List[T]): T = fst(decompose[T](xs))
+  def tail[T](xs: List[T]): List[T] = snd(decompose[T](xs))
+  def isEmpty[T](xs: List[T]): Boolean = !isPair(decompose[T](xs))
+
+  def toScalaList[T](xs: List[T]): scala.List[T] =
+    xs[scala.List[T]](h => t => h :: t)(Nil)
+
+  def print[T](xs: List[T]): Unit =
+    println(toScalaList[T](xs))
+
+  def test() =
+    val xs: List[Int] = cons(1, cons(2, nil))
+    print[Int](xs)
+    print[Int](tail(xs))
+    println(head[Int](xs))
+    println(isEmpty[Int](xs))
+end ListOps
+
+// A ListView based on regular Scala classes - options of pairs
+object ListOps1 extends ListOps:
+  type ListView[T] = Option[(T, List[T])]
+
+  def push[T](h: T, v: ListView[T]): ListView[T] = v match
+    case Some((h2, xs2)) => Some(h, cons[T](h2, xs2))
+    case None => Some(h, nil[T])
+
+  def decompose[T](xs: List[T]): ListView[T] =
+    xs[Option[(T, List[T])]](h => c => push(h, c))(None)
+
+  def fst[T](v: ListView[T]): T = v.get._1
+  def snd[T](v: ListView[T]): List[T] = v.get._2
+  def isPair[T](v: ListView[T]): Boolean = v.isDefined
+
+// A ListView based on (non-recursive) Church encodings in polymorphic lambda calculus
+object ListOps2 extends ListOps:
+  type ListView[T] = [K] => (T => List[T] => K) => (() => K) => K
+
+  def consView[T](x: T, xs: List[T]): ListView[T] =
+    [K] => (caseCons: T => List[T] => K) => (caseNil: () => K) => caseCons(x)(xs)
+
+  def nilView[T]: ListView[T] =
+    [K] => (caseCons: T => List[T] => K) => (caseNil: () => K) => caseNil()
+
+  def push[T](h: T)(c: ListView[T]): ListView[T] =
+    c[ListView[T]](h2 => xs2 => consView(h, cons[T](h2, xs2)))(() => consView(h, nil[T]))
+
+  def decompose[T](xs: List[T]): ListView[T] =
+    xs[ListView[T]](push)(nilView)
+
+  def fst[T](v: ListView[T]): T = v(hd => tl => hd)(() => ???)
+  def snd[T](v: ListView[T]): List[T] = v(hd => tl => tl)(() => ???)
+  def isPair[T](v: ListView[T]): Boolean = v(hd => tl => true)(() => false)
+
+@main def Test() =
+  ListOps1.test()
+  ListOps2.test()
diff --git a/tests/run/enum-values.scala b/tests/run/enum-values.scala
index b6ac3d2f9bce..ecc356c12b90 100644
--- a/tests/run/enum-values.scala
+++ b/tests/run/enum-values.scala
@@ -50,7 +50,7 @@ enum ClassOnly: // this should still generate the `ordinal` and `fromOrdinal` co
         s"$c does not `eq` companion.fromOrdinal(${c.ordinal}), got ${companion.fromOrdinal(c.ordinal)}")
 
   def notFromOrdinal[T <: AnyRef & reflect.Enum](companion: FromOrdinal[T], compare: T): Unit =
-    cantFind(companion, compare.ordinal)
+    cantFind(companion.asInstanceOf[FromOrdinal[Any]], compare.ordinal)
 
   def cantFind[T](companion: FromOrdinal[T], ordinal: Int): Unit =
     try
diff --git a/tests/run/experimentalRun.scala b/tests/run/experimentalRun.scala
new file mode 100644
index 000000000000..2d93c15c606f
--- /dev/null
+++ b/tests/run/experimentalRun.scala
@@ -0,0 +1,6 @@
+import scala.annotation.experimental
+
+@experimental
+def f = 3
+
+@experimental @main def Test = f
diff --git a/tests/run/exports.scala b/tests/run/exports.scala
index 02862f2d0a39..2c03c52c25b4 100644
--- a/tests/run/exports.scala
+++ b/tests/run/exports.scala
@@ -7,7 +7,7 @@ object Test extends App {
   class Printer {
     def print() = println("printing")
     object cfg extends Config
-    given config: Config with {}
+    given config: Config()
   }
 
   class Scanner {
diff --git a/tests/run/extension-specificity2.scala b/tests/run/extension-specificity2.scala
new file mode 100644
index 000000000000..eeaad80a3687
--- /dev/null
+++ b/tests/run/extension-specificity2.scala
@@ -0,0 +1,37 @@
+trait Foo[F[_]]:
+  extension [A](fa: F[A])
+    def foo[B](fb: F[B]): Int
+
+def test1 =
+  // Simplified from https://github.com/typelevel/spotted-leopards/issues/2
+  given listFoo: Foo[List] with
+    extension [A](fa: List[A])
+      def foo[B](fb: List[B]): Int = 1
+
+  given functionFoo[T]: Foo[[A] =>> T => A] with
+    extension [A](fa: T => A)
+      def foo[B](fb: T => B): Int = 2
+
+  val x = List(1, 2).foo(List(3, 4))
+  assert(x == 1, x)
+
+def test2 =
+  // This test case would fail if we used `wildApprox` on the method types
+  // instead of using the correct typer state.
+  trait Bar1[A]:
+    extension (x: A => A) def bar(y: A): Int
+  trait Bar2:
+    extension (x: Int => 1) def bar(y: Int): Int
+
+  given bla1[T]: Bar1[T] with
+    extension (x: T => T) def bar(y: T): Int = 1
+  given bla2: Bar2 with
+    extension (x: Int => 1) def bar(y: Int): Int = 2
+
+  val f: Int => 1 = x => 1
+  val x = f.bar(1)
+  assert(x == 2, x)
+
+@main def Test =
+  test1
+  test2
diff --git a/tests/run/extmethod-overload.scala b/tests/run/extmethod-overload.scala
index c13a2a99aaa8..4a9fe125a8a9 100644
--- a/tests/run/extmethod-overload.scala
+++ b/tests/run/extmethod-overload.scala
@@ -61,7 +61,7 @@ object Test extends App {
       extension [T](xs: List[T]) def +++ (ys: List[T]): List[T] = xs ++ ys ++ ys
       extension [T](xs: List[T]) def +++ (ys: Iterator[T]): List[T] = xs ++ ys ++ ys
     }
-    given Bar: Foo with {}
+    given Bar: Foo()
 
     assert((1 |+| 2) == 3)
     assert((1 |+| "2") == 2)
diff --git a/tests/run/extra-implicits.scala b/tests/run/extra-implicits.scala
index 72787b92e9a4..62ff862c709f 100644
--- a/tests/run/extra-implicits.scala
+++ b/tests/run/extra-implicits.scala
@@ -1,8 +1,8 @@
 
 case class A(x: String)
 case class B(x: String)
-given a1: A("default") with {}
-given b1: B("default") with {}
+given a1: A("default")
+given b1: B("default")
 val a2 = A("explicit")
 val b2 = B("explicit")
 
diff --git a/tests/run/forwardCompat-nestedSumMirror/Lib1_1_r3.0.scala b/tests/run/forwardCompat-nestedSumMirror/Lib1_1_r3.0.scala
new file mode 100644
index 000000000000..aaac31229228
--- /dev/null
+++ b/tests/run/forwardCompat-nestedSumMirror/Lib1_1_r3.0.scala
@@ -0,0 +1,8 @@
+// Adapted from i11050
+
+sealed trait TreeValue
+
+sealed trait SubLevel extends TreeValue
+
+case class Leaf1(value: String) extends TreeValue
+case class Leaf2(value: Int)    extends SubLevel
diff --git a/tests/run/forwardCompat-nestedSumMirror/Lib2_2_r3.0.scala b/tests/run/forwardCompat-nestedSumMirror/Lib2_2_r3.0.scala
new file mode 100644
index 000000000000..833fe13bb71e
--- /dev/null
+++ b/tests/run/forwardCompat-nestedSumMirror/Lib2_2_r3.0.scala
@@ -0,0 +1,3 @@
+import scala.deriving._
+
+val treeValueMirror = summon[Mirror.Of[TreeValue]]
\ No newline at end of file
diff --git a/tests/run/forwardCompat-nestedSumMirror/Test_3_c3.0.2.scala b/tests/run/forwardCompat-nestedSumMirror/Test_3_c3.0.2.scala
new file mode 100644
index 000000000000..13438d173ffb
--- /dev/null
+++ b/tests/run/forwardCompat-nestedSumMirror/Test_3_c3.0.2.scala
@@ -0,0 +1,3 @@
+object Test:
+  def main(args: Array[String]): Unit =
+    println(treeValueMirror)
diff --git a/tests/run/forwardCompat-refinedGivens/Lib_1_r3.0.scala b/tests/run/forwardCompat-refinedGivens/Lib_1_r3.0.scala
new file mode 100644
index 000000000000..6da2077b0086
--- /dev/null
+++ b/tests/run/forwardCompat-refinedGivens/Lib_1_r3.0.scala
@@ -0,0 +1,16 @@
+// Adapted from i12949
+
+object Catch22:
+  trait TC[V]
+  object TC:
+    export Hodor.TC.given
+
+object Hodor:
+  object TC:
+    import Catch22.TC
+    given fromString[V <: String]: TC[V] = new TC[V] {}
+    transparent inline given fromDouble[V <: Double]: TC[V] =
+      new TC[V]:
+        type Out = Double
+    given fromInt[V <: Int]: TC[V] with
+      type Out = Int
\ No newline at end of file
diff --git a/tests/run/forwardCompat-refinedGivens/Test_2_c3.0.2.scala b/tests/run/forwardCompat-refinedGivens/Test_2_c3.0.2.scala
new file mode 100644
index 000000000000..35f2b594881d
--- /dev/null
+++ b/tests/run/forwardCompat-refinedGivens/Test_2_c3.0.2.scala
@@ -0,0 +1,7 @@
+// Adapted from i12949
+
+object Test:
+  def main(args: Array[String]): Unit =
+    summon[Catch22.TC["hi"]]
+    summon[Catch22.TC[7.7]]
+    summon[Catch22.TC[1]]
diff --git a/tests/run/forwardCompat-strictEquals/Equality_1_r3.0.scala b/tests/run/forwardCompat-strictEquals/Equality_1_r3.0.scala
new file mode 100644
index 000000000000..538b85075bf9
--- /dev/null
+++ b/tests/run/forwardCompat-strictEquals/Equality_1_r3.0.scala
@@ -0,0 +1,5 @@
+// Instances of CanEqual are erased during compilation so their absence at runtime should not cause a crash
+
+import scala.language.strictEquality
+
+def emptyTupleEquality = EmptyTuple == EmptyTuple
diff --git a/tests/run/forwardCompat-strictEquals/Test_2_c3.0.2.scala b/tests/run/forwardCompat-strictEquals/Test_2_c3.0.2.scala
new file mode 100644
index 000000000000..1d1d811d0a9b
--- /dev/null
+++ b/tests/run/forwardCompat-strictEquals/Test_2_c3.0.2.scala
@@ -0,0 +1,3 @@
+object Test:
+  def main(args: Array[String]): Unit =
+    println(emptyTupleEquality)
diff --git a/tests/run/forwardCompat-unusedImport/Imports_1_r3.0.scala b/tests/run/forwardCompat-unusedImport/Imports_1_r3.0.scala
new file mode 100644
index 000000000000..7946a9c9e2cc
--- /dev/null
+++ b/tests/run/forwardCompat-unusedImport/Imports_1_r3.0.scala
@@ -0,0 +1,14 @@
+object A:
+  import scala.quoted.Type.valueOfTuple
+
+object B:
+  import scala.quoted.Type.*
+
+object C:
+  import Tuple.canEqualTuple
+
+object D:
+  import Tuple.given
+
+object E:
+  import Selectable.WithoutPreciseParameterTypes
diff --git a/tests/run/forwardCompat-unusedImport/Test_2_c3.0.2.scala b/tests/run/forwardCompat-unusedImport/Test_2_c3.0.2.scala
new file mode 100644
index 000000000000..c670ace4e768
--- /dev/null
+++ b/tests/run/forwardCompat-unusedImport/Test_2_c3.0.2.scala
@@ -0,0 +1,7 @@
+object Test:
+  def main(args: Array[String]): Unit =
+    println(A)
+    println(B)
+    println(C)
+    println(D)
+    println(E)
diff --git a/tests/run/genericTupleMembers.scala b/tests/run/genericTupleMembers.scala
new file mode 100644
index 000000000000..1b6de1486a05
--- /dev/null
+++ b/tests/run/genericTupleMembers.scala
@@ -0,0 +1,46 @@
+
+@main def Test: Unit =
+  val tup1 = 1 *: EmptyTuple
+  val tup2 = 1 *: 2 *: EmptyTuple
+  val tup3 = 1 *: 2 *: 3 *: EmptyTuple
+  val tup4 = 1 *: 2 *: 3 *: 4 *: EmptyTuple
+  val tup5 = 1 *: 2 *: 3 *: 4 *: 5 *: EmptyTuple
+  val tup22 = 1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: EmptyTuple
+
+  tup1._1
+
+  tup2._1
+  tup2._2
+  tup2.swap
+
+  tup3._1
+  tup3._2
+  tup3._3
+
+  tup4._1
+  tup4._2
+  tup4._3
+  tup4._4
+
+  tup22._1
+  tup22._2
+  tup22._3
+  tup22._4
+  tup22._5
+  tup22._6
+  tup22._7
+  tup22._8
+  tup22._9
+  tup22._10
+  tup22._11
+  tup22._12
+  tup22._13
+  tup22._14
+  tup22._15
+  tup22._16
+  tup22._17
+  tup22._18
+  tup22._19
+  tup22._20
+  tup22._21
+  tup22._22
diff --git a/tests/run/given-eta.scala b/tests/run/given-eta.scala
index 1eaf6fd16c49..a01f1c441018 100644
--- a/tests/run/given-eta.scala
+++ b/tests/run/given-eta.scala
@@ -8,7 +8,7 @@ def f(x: Int)(using c: C) (y: Int) = x + c.x + y
 def g(x: Int)(using d: D) (y: d.T): d.T = d.trans(y)
 
 @main def Test =
-  given C(1) with {}
+  given C(1)
   val x = f
   assert(x(2)(3) == 6)
 
diff --git a/tests/run/i10047.check b/tests/run/i10047.check
new file mode 100644
index 000000000000..8b200126cd1e
--- /dev/null
+++ b/tests/run/i10047.check
@@ -0,0 +1 @@
+slash
diff --git a/tests/run/i10047.scala b/tests/run/i10047.scala
new file mode 100644
index 000000000000..60e1a4319e0f
--- /dev/null
+++ b/tests/run/i10047.scala
@@ -0,0 +1,15 @@
+object wrapper {
+  val / = "slash"
+}
+
+object foo {
+  implicit val postfixOps: scala.languageFeature.postfixOps = scala.language.postfixOps
+  val / = wrapper./
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    val wd = foo./
+    println(wd)
+  }
+}
diff --git a/tests/run/i10178.scala b/tests/run/i10178.scala
index 2225a154fcd0..335de0b0d986 100644
--- a/tests/run/i10178.scala
+++ b/tests/run/i10178.scala
@@ -3,3 +3,42 @@
     x <- Option(23)
     given Int = x
   do assert(summon[Int] == 23)
+
+  for
+    y <- Option("ok")
+    q @ given String = y
+  do assert(summon[String] == "ok")
+
+  for
+    z <- Option("key" -> true)
+    (q @ given String, u @ given Boolean) = z
+  do
+    assert(summon[String] == "key")
+    assert(summon[Boolean] == true)
+
+  for
+    w <- Option("no" -> false)
+    (given String, given Boolean) = w
+  do
+    assert(summon[String] == "no")
+    assert(summon[Boolean] == false)
+
+  for
+    given Int <- Option(23)
+  do assert(summon[Int] == 23)
+
+  for
+    q @ given String <- Option("ok")
+  do assert(summon[String] == "ok")
+
+  for
+    (q @ given String, u @ given Boolean) <- Option("key" -> true)
+  do
+    assert(summon[String] == "key")
+    assert(summon[Boolean] == true)
+
+  for
+    (given String, given Boolean) <- Option("no" -> false)
+  do
+    assert(summon[String] == "no")
+    assert(summon[Boolean] == false)
diff --git a/tests/run/i10889.scala b/tests/run/i10889.scala
new file mode 100644
index 000000000000..130b6d2d9636
--- /dev/null
+++ b/tests/run/i10889.scala
@@ -0,0 +1,25 @@
+import scala.annotation.tailrec
+import scala.util.chaining.given
+
+object Test {
+  class Ctx
+  type Op[A] = Ctx ?=> A
+
+  var min = Int.MaxValue
+  var max = 0
+  def stk = new Throwable().getStackTrace.length
+
+  @tailrec def f[A](n: Int)(op: Op[A]): A =
+    val depth = stk
+    min = min.min(depth)
+    max = max.max(depth)
+    given Ctx = Ctx()
+    if (n > 0) f(n-1)(op)
+    else op
+
+  def g(ctx: Ctx) = stk
+
+  def main(args: Array[String]): Unit =
+    val extra = 3
+    f(10)(Ctx ?=> g(summon[Ctx])).tap(res => assert(res <= max + extra, s"min $min, max $max, ran g at $res"))
+}
\ No newline at end of file
diff --git a/tests/run/i11008.check b/tests/run/i11008.check
new file mode 100644
index 000000000000..3be25c0dc8dd
--- /dev/null
+++ b/tests/run/i11008.check
@@ -0,0 +1,2 @@
+hello
+hello and 10
diff --git a/tests/run/i11008.scala b/tests/run/i11008.scala
new file mode 100644
index 000000000000..dfe6be288d7a
--- /dev/null
+++ b/tests/run/i11008.scala
@@ -0,0 +1,13 @@
+object A:
+  def unapply(s: String): String *: EmptyTuple = Tuple1(s)
+
+object B:
+  def unapply(s:String): String *: Int *: EmptyTuple = Tuple2(s, 10)
+
+@main def Test =
+  "hello" match
+    case A(x) =>
+      println(x)
+  "hello" match
+    case B(x, y) =>
+      println(s"$x and $y")
diff --git a/tests/run/i11008b.check b/tests/run/i11008b.check
new file mode 100644
index 000000000000..c0c7fc09b324
--- /dev/null
+++ b/tests/run/i11008b.check
@@ -0,0 +1 @@
+Many 3 characters List(f, o, o)
\ No newline at end of file
diff --git a/tests/run/i11008b.scala b/tests/run/i11008b.scala
new file mode 100644
index 000000000000..f5c8a69c7b48
--- /dev/null
+++ b/tests/run/i11008b.scala
@@ -0,0 +1,7 @@
+object Foo:
+  def unapplySeq(x: String): Int *: Seq[String] *: EmptyTuple = (x.length, x.toList.map(_.toString))
+
+@main def Test =
+  "foo" match
+    case Foo(1, c) => println("One character " + c)
+    case Foo(x, xs*) => println(s"Many $x characters $xs")
diff --git a/tests/run/i11045.scala b/tests/run/i11045.scala
new file mode 100644
index 000000000000..2885c7608e60
--- /dev/null
+++ b/tests/run/i11045.scala
@@ -0,0 +1,5 @@
+abstract class Foo(x: Any)
+class Boom(var x: Unit, y: Unit) extends Foo((x: Int) => x) // was error: super constructor cannot be passed a self reference
+@main def Test =
+  Boom((), ())
+
diff --git a/tests/run/i11542.scala b/tests/run/i11542.scala
index 90c8471bdf03..32e940e745d0 100644
--- a/tests/run/i11542.scala
+++ b/tests/run/i11542.scala
@@ -2,7 +2,7 @@ object demo {
 
   trait Reader[A]
 
-  given Reader[Int] with {}
+  given Reader[Int]()
 
   inline def summonReader[T <: Tuple]: List[Reader[_]] = inline compiletime.erasedValue[T] match {
     case _: EmptyTuple => Nil
diff --git a/tests/run/i11938.scala b/tests/run/i11938.scala
new file mode 100644
index 000000000000..ac39ecfc7f61
--- /dev/null
+++ b/tests/run/i11938.scala
@@ -0,0 +1,22 @@
+import java.util.function.Function
+
+object Test {
+  def foo[V](v: V): Int = 1
+  def foo[U](fn: Function[Int, U]): Int = 2
+
+  def foo2(a: Int => Int): Int = 1
+  def foo2(a: PartialFunction[Int, Int]): Int = 2
+
+  def main(args: Array[String]): Unit = {
+    assert(foo((x: Int) => x) == 2)
+    val jf: Function[Int, Int] = x => x
+    assert(foo(jf) == 2)
+
+    assert(foo2(x => x) == 1)
+    val f: Int => Int = x => x
+    assert(foo2(f) == 1)
+    assert(foo2({ case x if x % 2 == 0 => x }) == 2)
+    val pf: PartialFunction[Int, Int] = { case x if x % 2 == 0 => x }
+    assert(foo2(pf) == 2)
+  }
+}
diff --git a/tests/run/i12170.scala b/tests/run/i12170.scala
new file mode 100644
index 000000000000..df5811863343
--- /dev/null
+++ b/tests/run/i12170.scala
@@ -0,0 +1,13 @@
+import scala.compiletime.error
+
+object BadFilters:
+  inline def withFilter(f: Int => Boolean): BadFilters.type = error("Unexpected withFilter call")
+  def foreach(f: Int => Unit): Unit = f(42)
+
+@main def Test =
+  for
+    x: Int <- BadFilters
+  do println(x)
+  for
+    given Int <- BadFilters
+  do println(summon[Int])
diff --git a/tests/run/i12194.check b/tests/run/i12194.check
new file mode 100644
index 000000000000..9e90577cbd4f
--- /dev/null
+++ b/tests/run/i12194.check
@@ -0,0 +1 @@
+List(foo, bar)
diff --git a/tests/run/i12204/A_1.scala b/tests/run/i12204/A_1.scala
new file mode 100644
index 000000000000..95b519fa066a
--- /dev/null
+++ b/tests/run/i12204/A_1.scala
@@ -0,0 +1,3 @@
+object A {
+  def intARRAY_131(x: Array[String] with Array[Int]): Unit = {}
+}
diff --git a/tests/run/i12204/B_2.java b/tests/run/i12204/B_2.java
new file mode 100644
index 000000000000..283e63a8974b
--- /dev/null
+++ b/tests/run/i12204/B_2.java
@@ -0,0 +1,5 @@
+public class B_2 {
+  public static void test() {
+    A.intARRAY_131(null); // shouldn't throw a NoSuchMethodError
+  }
+}
diff --git a/tests/run/i12204/Test_3.scala b/tests/run/i12204/Test_3.scala
new file mode 100644
index 000000000000..51ec04559ca7
--- /dev/null
+++ b/tests/run/i12204/Test_3.scala
@@ -0,0 +1,5 @@
+object Test {
+  def main(args: Array[String]): Unit = {
+    B_2.test()
+  }
+}
diff --git a/tests/run/i1240.scala b/tests/run/i1240.scala
index 7092d91314e4..b425c4f55ff2 100644
--- a/tests/run/i1240.scala
+++ b/tests/run/i1240.scala
@@ -19,7 +19,9 @@ object Test {
       // In Java, this gives an error like this:
       // methods foo(A) from C[D] and foo(String) from C[D] are inherited with the same signature
       // But the analogous example with `b1` compiles OK in Java.
-    assert(b2.foo(new D) == "T foo")
+    assert(b2.foo(new D) == "D foo")
+      // Here we get "D foo" since a bridge method for foo(x: D) was inserted
+      // in the anonymous class of b2.
   }
 }
 
diff --git a/tests/run/i12597.scala b/tests/run/i12597.scala
new file mode 100644
index 000000000000..73cc4185d74e
--- /dev/null
+++ b/tests/run/i12597.scala
@@ -0,0 +1,5 @@
+@main def Test =
+  val a: IArray[Int] = IArray(2)
+  val b: IArray[Any] = a
+  val c = IArray.genericWrapArray(b).toArray
+  c(0) = ""
diff --git a/tests/run/i12656.scala b/tests/run/i12656.scala
new file mode 100644
index 000000000000..ee22988ac771
--- /dev/null
+++ b/tests/run/i12656.scala
@@ -0,0 +1,16 @@
+transparent inline def expectCompileError(
+  inline code: String,
+  expectedMsg: String
+) =
+  val errors = compiletime.testing.typeCheckErrors(code)
+  assert(errors.head.message == expectedMsg, (errors.head.message, expectedMsg))
+
+transparent inline def expectTypeCheck(
+  inline code: String,
+) : Boolean = compiletime.testing.typeChecks(code)
+
+@main def Test =
+  assert(!expectTypeCheck("""compiletime.error("some error")"""))
+  assert(expectTypeCheck("""1 + 1"""))
+  expectCompileError("""compiletime.error("some error")""", "some error")
+
diff --git a/tests/run/i12729.scala b/tests/run/i12729.scala
new file mode 100644
index 000000000000..d7683fe72a05
--- /dev/null
+++ b/tests/run/i12729.scala
@@ -0,0 +1,3 @@
+object Test:
+  val `<x>` = "hello!"
+  def main(args: Array[String]): Unit = println(`<x>`)
diff --git a/tests/run/i12753.check b/tests/run/i12753.check
new file mode 100644
index 000000000000..e599ced53b63
--- /dev/null
+++ b/tests/run/i12753.check
@@ -0,0 +1,28 @@
+1
+Dbr
+1
+1
+2
+1
+1
+1
+1
+2
+1
+1
+synthetic public static C D.foo(int)
+public static D D.foo(int)
+public static D D.t()
+synthetic public static java.lang.Object D.bar()
+public static java.lang.String D.bar()
+public static int O.a()
+public static int O.b()
+public static int O.c()
+public static int O.d()
+public static int O.i()
+public static int O.j()
+public static int O.k()
+public static int O.l()
+synthetic public static void O.T$_setter_$a_$eq(int)
+public static void O.b_$eq(int)
+public static void O.j_$eq(int)
diff --git a/tests/run/i12753/C.scala b/tests/run/i12753/C.scala
new file mode 100644
index 000000000000..1b62940d6ffb
--- /dev/null
+++ b/tests/run/i12753/C.scala
@@ -0,0 +1,34 @@
+trait C[This <: C[This]]
+
+trait COps[This <: C[This]] {
+  def t: This
+  def foo(x: Int): This = t
+  def bar: Object = "Cbr"
+}
+
+class D extends C[D] {
+  def x = 1
+}
+object D extends COps[D] {
+  def t = new D
+  override def foo(x: Int): D = super.foo(x)
+  override def bar: String = "Dbr"
+}
+
+trait T {
+  val a = 1
+  var b = 1
+  lazy val c = 1
+  def d = 1
+
+  val i: Int
+  var j: Int
+  lazy val k: Int = 1
+  def l: Int
+}
+object O extends T {
+  val i: Int = 1
+  var j: Int = 1
+  override lazy val k: Int = 1
+  def l: Int = 1
+}
diff --git a/tests/run/i12753/Test.java b/tests/run/i12753/Test.java
new file mode 100644
index 000000000000..2a0bd9480b9c
--- /dev/null
+++ b/tests/run/i12753/Test.java
@@ -0,0 +1,36 @@
+public class Test {
+  public static void s(Object s) {
+    System.out.println(s);
+  }
+
+  public static void statics(Class<?> c) {
+    java.lang.reflect.Method[] ms = c.getDeclaredMethods();
+    java.util.Arrays.sort(ms, (a, b) -> a.toString().compareTo(b.toString()));
+    for (java.lang.reflect.Method a : ms) {
+      if (java.lang.reflect.Modifier.isStatic(a.getModifiers()))
+        s((a.isSynthetic() ? "synthetic " : "") + a);
+    }
+  }
+
+  public static void main(String[] args) {
+    s(D.foo(1).x());
+    s(D.bar().trim());
+
+    s(O.a());
+    s(O.b());
+    O.b_$eq(2);
+    s(O.b());
+    s(O.c());
+    s(O.d());
+
+    s(O.i());
+    s(O.j());
+    O.j_$eq(2);
+    s(O.j());
+    s(O.k());
+    s(O.l());
+
+    statics(D.class);
+    statics(O.class);
+  }
+}
diff --git a/tests/run/i12759.scala b/tests/run/i12759.scala
new file mode 100644
index 000000000000..2c5fcded46ac
--- /dev/null
+++ b/tests/run/i12759.scala
@@ -0,0 +1,15 @@
+package example {
+
+  trait Foo {
+    val (a2, a3) = ("", "")
+    val (x1, x2, x3) = ("", "", "")
+  }
+
+  class A extends Foo
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    new example.A
+  }
+}
diff --git a/tests/run/i12759b.scala b/tests/run/i12759b.scala
new file mode 100644
index 000000000000..c7480575f86b
--- /dev/null
+++ b/tests/run/i12759b.scala
@@ -0,0 +1,39 @@
+package example {
+
+  class A1
+  class A2
+  class A3
+
+  class TypeClass[A](val value: A)
+
+  object TypeClass {
+    def apply[A](implicit a: TypeClass[A]): TypeClass[A] = a
+
+    def get2[X1: TypeClass, X2: TypeClass]: (X1, X2) = {
+      (TypeClass[X1].value, TypeClass[X2].value)
+    }
+
+    def get3[X1: TypeClass, X2: TypeClass, X3: TypeClass]: (X1, X2, X3) = {
+      (TypeClass[X1].value, TypeClass[X2].value, TypeClass[X3].value)
+    }
+
+    implicit def a1: TypeClass[A1] = new TypeClass[A1](new A1)
+    implicit def a2: TypeClass[A2] = new TypeClass[A2](new A2)
+    implicit def a3: TypeClass[A3] = new TypeClass[A3](new A3)
+  }
+
+  trait Foo {
+
+    val (a2, a3) = TypeClass.get2[A2, A3]
+
+    val (x1, x2, x3) = TypeClass.get3[A1, A2, A3]
+
+  }
+
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    new example.Foo {}
+  }
+}
\ No newline at end of file
diff --git a/tests/run/i12796/A_1.scala b/tests/run/i12796/A_1.scala
new file mode 100644
index 000000000000..46290e942335
--- /dev/null
+++ b/tests/run/i12796/A_1.scala
@@ -0,0 +1,4 @@
+object A:
+  type Timeframe = "1m" | "2m" | "1H"
+
+  def test(input: String) = input.isInstanceOf[Timeframe]
diff --git a/tests/run/i12796/Test_2.scala b/tests/run/i12796/Test_2.scala
new file mode 100644
index 000000000000..8274f8804063
--- /dev/null
+++ b/tests/run/i12796/Test_2.scala
@@ -0,0 +1,3 @@
+@main def Test =
+  val x = "1"
+  assert(A.test(x + "m"))
diff --git a/tests/run/i12828a.scala b/tests/run/i12828a.scala
new file mode 100644
index 000000000000..459af156980c
--- /dev/null
+++ b/tests/run/i12828a.scala
@@ -0,0 +1,12 @@
+trait Foo[A] {
+  def foo(x: A): Unit = ()
+}
+trait Bar[A] extends Foo[A] {
+  def foo(x: A with String): Unit = println(x.toUpperCase)
+}
+object Baz extends Bar[Int] // was: error: Baz inherits conflicting members, now like Scala 2
+                            // Scala 2 compiles and runs
+
+object Test {
+  def main(args: Array[String]) = Baz.foo(42)
+}
diff --git a/tests/run/i12828b.scala b/tests/run/i12828b.scala
new file mode 100644
index 000000000000..d1cd3e087a36
--- /dev/null
+++ b/tests/run/i12828b.scala
@@ -0,0 +1,12 @@
+class Foo[A] {
+  def foo(x: A): Unit = ()
+}
+class Bar[A] extends Foo[A] {
+  def foo(x: A with String): Unit = println(x.toUpperCase)
+}
+object Baz extends Bar[Int] // was error: Baz inherits conflicting members, now like Scalac
+                            // Scala 2 compiles and runs
+
+object Test {
+  def main(args: Array[String]) = Baz.foo(42)
+}
diff --git a/tests/run/i12829.check b/tests/run/i12829.check
new file mode 100644
index 000000000000..5d8a5566f0e8
--- /dev/null
+++ b/tests/run/i12829.check
@@ -0,0 +1,2 @@
+abc
+abc
diff --git a/tests/run/i12829.scala b/tests/run/i12829.scala
new file mode 100644
index 000000000000..cf691792e0c3
--- /dev/null
+++ b/tests/run/i12829.scala
@@ -0,0 +1,19 @@
+object Test:
+
+  class Foo:
+    var buf = ""
+
+    def add(v: String): Unit = buf += v
+
+    inline def += (inline v: String): this.type = {add(v); this }
+
+
+  def main(sa: Array[String]): Unit =
+
+    var fooVar = new Foo
+    fooVar += "a" += "b" += "c"
+    println(fooVar.buf)              // Prints: abc
+
+    val fooVal = new Foo
+    fooVal += "a" += "b" += "c"
+    println(fooVal.buf)              // Printed: c     // Expected abc
diff --git a/tests/run/i12914.check b/tests/run/i12914.check
new file mode 100644
index 000000000000..9fe584d62718
--- /dev/null
+++ b/tests/run/i12914.check
@@ -0,0 +1,8 @@
+ASD
+asd
+ASD
+asd
+ASD
+asd
+aSdaSdaSd
+aSdaSdaSd
diff --git a/tests/run/i12914.scala b/tests/run/i12914.scala
new file mode 100644
index 000000000000..c60937916149
--- /dev/null
+++ b/tests/run/i12914.scala
@@ -0,0 +1,27 @@
+
+class opq:
+  opaque type Str = java.lang.String
+  object Str:
+    def apply(s: String): Str = s
+  inline def lower(s: Str): String = s.toLowerCase
+  extension (s: Str)
+    transparent inline def upper: String = s.toUpperCase
+  inline def concat(xs: List[Str]): Str = String(xs.flatten.toArray)
+  transparent inline def concat2(xs: List[Str]): Str = String(xs.flatten.toArray)
+
+
+@main def Test =
+  val opq = new opq()
+  import opq.*
+  val a: Str = Str("aSd")
+  println(a.upper)
+  println(opq.lower(a))
+  def b: Str = Str("aSd")
+  println(b.upper)
+  println(opq.lower(b))
+  def c(): Str = Str("aSd")
+  println(c().upper)
+  println(opq.lower(c()))
+  println(opq.concat(List(a, b, c())))
+  println(opq.concat2(List(a, b, c())))
+
diff --git a/tests/run/i12976.scala b/tests/run/i12976.scala
new file mode 100644
index 000000000000..a14a18885f1e
--- /dev/null
+++ b/tests/run/i12976.scala
@@ -0,0 +1,39 @@
+
+case class A(s: String)
+
+class B {
+  def b1[X](str: String): String = str
+
+  def b2[X](str: String): X = null.asInstanceOf[X]
+}
+
+object Test {
+
+  def main(args: Array[String]): Unit = {
+    val a = A("aaa")
+    val b = new B
+
+    // no error
+    a match {
+      case A(s) =>
+        b.b1(s)
+    }
+
+    // no error if add explicit type param
+    a match {
+      case A(s) =>
+        b.b2[Boolean](s)
+    }
+
+    // scala.MatchError: A(aaa)
+    try
+      a match {
+        case A(s) =>
+          b.b2(s)
+      }
+      assert(false)
+    catch case ex: NullPointerException =>
+      () // OK
+  }
+
+}
\ No newline at end of file
diff --git a/tests/run/i13087.scala b/tests/run/i13087.scala
new file mode 100644
index 000000000000..74eaa0e69e85
--- /dev/null
+++ b/tests/run/i13087.scala
@@ -0,0 +1,38 @@
+import scala.collection.mutable.Builder
+
+class DDD[S,T,A]
+
+trait NN[S, T, A, K[_], +D <: DDD[Set[S],T,K[A]]]
+class NNN[S, T, K[_], A] extends NN[S, T, A, K, DDD[Set[S],T,K[A]]]
+
+object NN {
+  def newBuilder[S, T, A, K[_]]:
+      NNbuilder[S, T, K, A, DDD[Set[S],T,K[A]], NN[S,T,A,K,?], Unit] =
+    new NNNbuilder[S, T, K, A]
+}
+
+// Remove the type parameter E, hardcoding in E := Unit, and the issue
+// goes away.
+trait NNbuilder
+  [S, T, K[_], A, +D <: DDD[Set[S],T,K[A]], +N <: NN[S,T,A,K,D], E]
+    extends Builder[Unit, N] {
+  def clear(): Unit = throw new UnsupportedOperationException()
+  final def addOne(builder: E): this.type = this
+}
+
+// Unfold this class defn, and the issue goes away
+abstract class AbstractNNNbuilder
+  [S, T, K[_], A, +D <: DDD[Set[S],T,K[A]], +N <: NN[S,T,A,K,D], E]
+    extends NNbuilder[S,T,K,A,D,N,E]
+
+class NNNbuilder[S, T, K[_], A] extends AbstractNNNbuilder[
+  S, T, K, A, DDD[Set[S], T, K[A]], NNN[S, T, K, A], Unit
+] {
+  override def result(): NNN[S, T, K, A] = new NNN[S, T, K, A]
+}
+
+@main def Test: Unit = {
+  val builder = NN.newBuilder[String, Char, Int, Set]
+  builder += ()
+  builder.result()
+}
\ No newline at end of file
diff --git a/tests/run/i13087a.scala b/tests/run/i13087a.scala
new file mode 100644
index 000000000000..f1513583e8fb
--- /dev/null
+++ b/tests/run/i13087a.scala
@@ -0,0 +1,17 @@
+trait SimpleTrait[T] {
+  def myMethod(t: T): Int
+  def doIt(t: T): Unit = {
+    myMethod(t) // java.lang.AbstractMethodError: Method BadClass.myMethod(Ljava/lang/Object;)I is abstract
+ }
+}
+
+abstract class SimpleClass[T] extends SimpleTrait[T] {
+  def myMethod(t: String): Int = 5
+}
+
+class BadClass extends SimpleClass[String]
+
+object Test {
+  def main(args: Array[String]): Unit =
+    (new BadClass).doIt("foobar")
+}
\ No newline at end of file
diff --git a/tests/run/i13096.scala b/tests/run/i13096.scala
new file mode 100644
index 000000000000..5afb0d0dc1b3
--- /dev/null
+++ b/tests/run/i13096.scala
@@ -0,0 +1,10 @@
+class C1 {
+  private class C2
+  new C2 match {
+    case c: C2 =>
+  }
+}
+
+object Test extends App {
+  new C1
+}
diff --git a/tests/run/i13131.scala b/tests/run/i13131.scala
new file mode 100644
index 000000000000..0c9661ffa75a
--- /dev/null
+++ b/tests/run/i13131.scala
@@ -0,0 +1,4 @@
+@main def Test =
+  val `ct_[[I` = reflect.classTag[Array[Array[Int]] | Array[Array[Int]]]
+  val arrArrInt = Array(Array(1))
+  assert(`ct_[[I`.runtimeClass == arrArrInt.getClass)
diff --git a/tests/run/i13181.scala b/tests/run/i13181.scala
new file mode 100644
index 000000000000..a6693b3f68e4
--- /dev/null
+++ b/tests/run/i13181.scala
@@ -0,0 +1 @@
+@main def Test = assert(scala.compiletime.codeOf(1+2) == "1.+(2)")
diff --git a/tests/run/i13183.check b/tests/run/i13183.check
new file mode 100644
index 000000000000..2dc88a12f2d4
--- /dev/null
+++ b/tests/run/i13183.check
@@ -0,0 +1 @@
+"\u001b"
diff --git a/tests/run/i13183.scala b/tests/run/i13183.scala
new file mode 100644
index 000000000000..128f42b162f1
--- /dev/null
+++ b/tests/run/i13183.scala
@@ -0,0 +1,2 @@
+@main def Test(): Unit =
+  println(scala.compiletime.codeOf("\u001b"))
diff --git a/tests/run/i13228.check b/tests/run/i13228.check
new file mode 100644
index 000000000000..3cdefad74555
--- /dev/null
+++ b/tests/run/i13228.check
@@ -0,0 +1,5 @@
+RegisteredUser(Id,User(Name))
+false
+false
+false
+false
diff --git a/tests/run/i13228.scala b/tests/run/i13228.scala
new file mode 100644
index 000000000000..e1b0dcc4fb46
--- /dev/null
+++ b/tests/run/i13228.scala
@@ -0,0 +1,13 @@
+case class User(name: String)
+
+case class RegisteredUser(id: String, data: User) {
+  export data.*
+}
+
+@main def Test() =
+  println(RegisteredUser("Id", User("Name"))) // RegisteredUser(Name)
+  println(RegisteredUser("Id", User("Name")).canEqual(User("Name"))) // True
+  // The rest works as expected
+  println(RegisteredUser("Id", User("Name")) == User("Name")) // False
+  println(RegisteredUser("Id", User("Name")).hashCode == User("Name").hashCode) // False
+  println(RegisteredUser("Id", User("Name")).productArity == User("Name").productArity) // False
diff --git a/tests/run/i13252a.scala b/tests/run/i13252a.scala
new file mode 100644
index 000000000000..d12706f62a95
--- /dev/null
+++ b/tests/run/i13252a.scala
@@ -0,0 +1,12 @@
+object Test:
+
+  class Star
+
+  trait Foo:
+    @annotation.targetName("star")
+    val * : Star = new Star
+
+  object Bar extends Foo
+
+  def main(sa: Array[String]): Unit =
+    Bar.*
\ No newline at end of file
diff --git a/tests/run/i13252b/Foo_1.scala b/tests/run/i13252b/Foo_1.scala
new file mode 100644
index 000000000000..7e7551e14f4c
--- /dev/null
+++ b/tests/run/i13252b/Foo_1.scala
@@ -0,0 +1,5 @@
+class Star
+
+trait Foo:
+  @annotation.targetName("star")
+  val * : Star = new Star
diff --git a/tests/run/i13252b/Test_2.scala b/tests/run/i13252b/Test_2.scala
new file mode 100644
index 000000000000..b4d382d2cc1f
--- /dev/null
+++ b/tests/run/i13252b/Test_2.scala
@@ -0,0 +1,6 @@
+object Test:
+
+  object Bar extends Foo
+
+  def main(sa: Array[String]): Unit =
+    Bar.*
\ No newline at end of file
diff --git a/tests/run/i13304.check b/tests/run/i13304.check
new file mode 100644
index 000000000000..257cc5642cb1
--- /dev/null
+++ b/tests/run/i13304.check
@@ -0,0 +1 @@
+foo
diff --git a/tests/run/i13304.scala b/tests/run/i13304.scala
new file mode 100644
index 000000000000..f60359b82d47
--- /dev/null
+++ b/tests/run/i13304.scala
@@ -0,0 +1,13 @@
+trait Zero[F[_]]:
+  def zero[A]: F[A]
+
+given Zero[List] with
+  def zero[A] = List.empty[A]
+
+given Zero[Option] with
+  def zero[A] = Option.empty[A]
+
+
+@main def Test =
+  val test = [F[_]] => (f: Zero[F]) ?=> [G[_]] => (g: Zero[G]) ?=> println("foo")
+  test[List][Option]
\ No newline at end of file
diff --git a/tests/run/i13358.check b/tests/run/i13358.check
new file mode 100644
index 000000000000..d5425d4bc05f
--- /dev/null
+++ b/tests/run/i13358.check
@@ -0,0 +1,8 @@
+1
+1
+1
+1
+2
+2
+2
+2
diff --git a/tests/run/i13358.scala b/tests/run/i13358.scala
new file mode 100644
index 000000000000..c469e5373f54
--- /dev/null
+++ b/tests/run/i13358.scala
@@ -0,0 +1,22 @@
+object Test:
+  var cnt = 0
+
+  trait Foo:
+    lazy val foo1 = {cnt+=1; cnt}
+
+    @scala.annotation.targetName("fooTwo")
+    lazy val foo2 = {cnt+=1; cnt}
+
+  object Bar extends Foo
+
+  def main(sa: Array[String]): Unit =
+
+    println(Bar.foo1)  // Prints 1
+    println(Bar.foo1)  // Prints 1
+    println(Bar.foo1)  // Prints 1
+    println(Bar.foo1)  // Prints 1
+
+    println(Bar.foo2)  // Prints 2
+    println(Bar.foo2)  // Prints 3  EXPECTED 2
+    println(Bar.foo2)  // Prints 4  EXPECTED 2
+    println(Bar.foo2)  // Prints 5  EXPECTED 2
\ No newline at end of file
diff --git a/tests/run/i13433.check b/tests/run/i13433.check
new file mode 100644
index 000000000000..88223478e837
--- /dev/null
+++ b/tests/run/i13433.check
@@ -0,0 +1,4 @@
+Some(abc)
+Some(abc)
+None
+None
diff --git a/tests/run/i13433.scala b/tests/run/i13433.scala
new file mode 100644
index 000000000000..fe634a5ac14a
--- /dev/null
+++ b/tests/run/i13433.scala
@@ -0,0 +1,28 @@
+import scala.reflect.TypeTest
+
+type Matcher[A] = A match { case String => String }
+
+def patternMatch[A](a: Any)(using tt: TypeTest[Any, Matcher[A]]): Option[Matcher[A]] = {
+  // type T = RDF.Triple[Rdf]
+  a match {
+    case res: Matcher[A] => Some(res)
+    case _ => None
+  }
+}
+
+def patternMatchWithAlias[A](a: Any)(using tt: TypeTest[Any, Matcher[A]]): Option[Matcher[A]] = {
+  type T = Matcher[A]
+  a match {
+    case res: T => Some(res)
+    case _ => None
+  }
+}
+
+
+@main def Test = {
+  println(patternMatch[String]("abc"))
+  println(patternMatchWithAlias[String]("abc"))
+
+  println(patternMatch[String](1))
+  println(patternMatchWithAlias[String](1))
+}
diff --git a/tests/run/i13433b.check b/tests/run/i13433b.check
new file mode 100644
index 000000000000..88223478e837
--- /dev/null
+++ b/tests/run/i13433b.check
@@ -0,0 +1,4 @@
+Some(abc)
+Some(abc)
+None
+None
diff --git a/tests/run/i13433b.scala b/tests/run/i13433b.scala
new file mode 100644
index 000000000000..914530b91fd1
--- /dev/null
+++ b/tests/run/i13433b.scala
@@ -0,0 +1,28 @@
+import scala.reflect.ClassTag
+
+type Matcher[A] = A match { case String => String }
+
+def patternMatch[A](a: Any)(using tt: ClassTag[Matcher[A]]): Option[Matcher[A]] = {
+  // type T = RDF.Triple[Rdf]
+  a match {
+    case res: Matcher[A] => Some(res)
+    case _ => None
+  }
+}
+
+def patternMatchWithAlias[A](a: Any)(using tt: ClassTag[Matcher[A]]): Option[Matcher[A]] = {
+  type T = Matcher[A]
+  a match {
+    case res: T => Some(res)
+    case _ => None
+  }
+}
+
+
+@main def Test = {
+  println(patternMatch[String]("abc"))
+  println(patternMatchWithAlias[String]("abc"))
+
+  println(patternMatch[String](1))
+  println(patternMatchWithAlias[String](1))
+}
diff --git a/tests/run/i13490.min.scala b/tests/run/i13490.min.scala
new file mode 100644
index 000000000000..4f9c19764a5d
--- /dev/null
+++ b/tests/run/i13490.min.scala
@@ -0,0 +1,13 @@
+object MyTypes:
+  enum MyEnum:
+    case Foo
+    case Bar
+
+object MyApi:
+  export MyTypes.*
+
+object MyUse:
+  import MyApi.MyEnum.Foo
+  def foo = Foo
+
+@main def Test = assert(MyUse.foo.toString == "Foo")
diff --git a/tests/run/i13630.check b/tests/run/i13630.check
new file mode 100644
index 000000000000..64bf9740e617
--- /dev/null
+++ b/tests/run/i13630.check
@@ -0,0 +1 @@
+it worked
diff --git a/tests/run/i13630.scala b/tests/run/i13630.scala
new file mode 100644
index 000000000000..64f260262a8e
--- /dev/null
+++ b/tests/run/i13630.scala
@@ -0,0 +1,9 @@
+class ClassWithLambda(sup: () => Long)
+class ClassWithVar(var msg: String) extends ClassWithLambda(() => 1)
+
+object Test:
+  val _ = new ClassWithVar("foo")
+
+  def main(args: Array[String]): Unit = {
+    println("it worked")
+  }
\ No newline at end of file
diff --git a/tests/run/i13691.scala b/tests/run/i13691.scala
new file mode 100644
index 000000000000..224656d87923
--- /dev/null
+++ b/tests/run/i13691.scala
@@ -0,0 +1,53 @@
+import language.experimental.erasedDefinitions
+
+erased class CanThrow[-E <: Exception]
+erased class Foo
+class Bar
+
+object unsafeExceptions:
+  given canThrowAny: CanThrow[Exception] = new CanThrow
+
+object test1:
+  trait Decoder[+T]:
+    def apply(): T
+
+  def deco: Decoder[CanThrow[Exception] ?=> Int] = new Decoder[CanThrow[Exception] ?=> Int]:
+    def apply(): CanThrow[Exception] ?=> Int = 1
+
+object test2:
+  trait Decoder[+T]:
+    def apply(): T
+
+  def deco: Decoder[(CanThrow[Exception], Foo) ?=> Int] = new Decoder[(CanThrow[Exception], Foo) ?=> Int]:
+    def apply(): (CanThrow[Exception], Foo) ?=> Int = 1
+
+object test3:
+  trait Decoder[+T]:
+    def apply(): T
+
+  def deco: Decoder[CanThrow[Exception] ?=> Foo ?=> Int] = new Decoder[CanThrow[Exception] ?=> Foo ?=> Int]:
+    def apply(): CanThrow[Exception] ?=> Foo ?=> Int = 1
+
+object test4:
+  trait Decoder[+T]:
+    def apply(): T
+
+  def deco: Decoder[CanThrow[Exception] ?=> Bar ?=> Int] = new Decoder[CanThrow[Exception] ?=> Bar ?=> Int]:
+    def apply(): CanThrow[Exception] ?=> Bar ?=> Int = 1
+
+object test5:
+  trait Decoder[+T]:
+    def apply(): T
+
+  def deco: Decoder[Bar ?=> CanThrow[Exception] ?=> Int] = new Decoder[Bar ?=> CanThrow[Exception] ?=> Int]:
+    def apply(): Bar ?=> CanThrow[Exception] ?=> Int = 1
+
+@main def Test(): Unit =
+  import unsafeExceptions.canThrowAny
+  given Foo = Foo()
+  given Bar = Bar()
+  test1.deco.apply().apply
+  test2.deco.apply().apply
+  test3.deco.apply().apply
+  test4.deco.apply().apply
+  test5.deco.apply().apply
diff --git a/tests/run/i13703.scala b/tests/run/i13703.scala
new file mode 100644
index 000000000000..0483e4ca7dc2
--- /dev/null
+++ b/tests/run/i13703.scala
@@ -0,0 +1,5 @@
+trait Foo extends reflect.Selectable
+
+@main def Test: Unit =
+  val f = new Foo { var i: Int = 0 }
+  f.i = 1
\ No newline at end of file
diff --git a/tests/run/i13747.scala b/tests/run/i13747.scala
new file mode 100644
index 000000000000..2167523bd754
--- /dev/null
+++ b/tests/run/i13747.scala
@@ -0,0 +1,17 @@
+var res = ""
+trait Bar:
+  def +(that: Bar): Bar = new Plus(this, that)
+  transparent inline def -(that: Bar): Bar = new Minus(this, that)
+
+class LHS extends Bar {res += "LHS "}
+class RHS extends Bar {res += "RHS "}
+
+class Plus(lhs: Bar, rhs: Bar) extends Bar {res += "op"}
+class Minus(lhs: Bar, rhs: Bar) extends Bar {res += "op"}
+
+@main def Test =
+  val pls = new LHS + new RHS
+  val plsRes = res
+  res = ""
+  val min = new LHS - new RHS
+  assert(plsRes == res)
\ No newline at end of file
diff --git a/tests/run/i13862.scala b/tests/run/i13862.scala
new file mode 100644
index 000000000000..4577f65e50d9
--- /dev/null
+++ b/tests/run/i13862.scala
@@ -0,0 +1,11 @@
+trait Foo(val num: Int)                 // a trait with a parameter stored in a val
+
+class Bar(num: Int) extends Foo(num):   // an extending class with a parameter of the same name
+  def bar = this.num                    // implicitly creates another num in Bar
+
+@main def Test = Bar(123)
+
+class Bar2(n: Int) extends Foo(n):   // an extending class with a parameter of the same name
+  private val num = n
+  def bar = this.num                    // implicitly creates another num in Bar
+
diff --git a/tests/run/i13950.scala b/tests/run/i13950.scala
new file mode 100644
index 000000000000..b8f93129beb8
--- /dev/null
+++ b/tests/run/i13950.scala
@@ -0,0 +1,11 @@
+def example(x: Any & ([V] => V => Int)) =
+  x[Int](1)
+def example2(x: (Any & ([V] => V => Int)) @unchecked) =
+  x[Int](1)
+def example3[S <: Any & ([V] => V => Int)](x: S) =
+  x[Int](1)
+
+@main def Test =
+  example([A] => (x: A) => 1)
+  example2([A] => (x: A) => 1)
+  example3([A] => (x: A) => 1)
diff --git a/tests/run/i13961a.scala b/tests/run/i13961a.scala
new file mode 100644
index 000000000000..9d49ab30b0a4
--- /dev/null
+++ b/tests/run/i13961a.scala
@@ -0,0 +1,11 @@
+import language.experimental.saferExceptions
+
+trait Decoder[+T]:
+  def apply(): T
+
+given Decoder[Int throws Exception] = new Decoder[Int throws Exception]:
+  def apply(): Int throws Exception = 1
+
+@main def Test(): Unit =
+  import unsafeExceptions.canThrowAny
+  summon[Decoder[Int throws Exception]]()
\ No newline at end of file
diff --git a/tests/run/i13968.scala b/tests/run/i13968.scala
new file mode 100644
index 000000000000..8e63d57ecf1b
--- /dev/null
+++ b/tests/run/i13968.scala
@@ -0,0 +1,26 @@
+object Bar {
+  def unapply(x: Any): Option[Int *: Int *: EmptyTuple] = Some(1 *: 2 *: Tuple())
+}
+
+object Bar23 {
+  def unapply(x: Any): Option[
+      Int *: Int *: Int *: Int *: Int *: Int *: Int *: Int *: Int *: Int *:
+      Int *: Int *: Int *: Int *: Int *: Int *: Int *: Int *: Int *: Int *:
+      Int *: Int *: Int *: EmptyTuple
+  ] = Some(
+     1 *:  2 *:  3 *:  4 *:  5 *:  6 *:  7 *:  8 *:  9 *: 10 *:
+    11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *:
+    21 *: 22 *: 23 *: Tuple()
+  )
+}
+
+@main def Test() =
+  "" match
+    case Bar((a, b)) => assert(a == 1 && b == 2, (a, b))
+
+  "" match
+    case Bar23((
+      u1, u2, u3, u4, u5, u6, u7, u8, u9, u10,
+      u11, u12, u13, u14, u15, u16, u17, u18, u19, u20,
+      u21, u22, u23
+    )) => assert(u1 == 1 && u23 == 23, (u1, u23))
diff --git a/tests/run/i14020.check b/tests/run/i14020.check
new file mode 100644
index 000000000000..304f6c16f72a
--- /dev/null
+++ b/tests/run/i14020.check
@@ -0,0 +1,7 @@
+Hello you
+Hello John
+Hello you
+Hello you
+Hello John
+Hello you
+bark: Woof!
diff --git a/tests/run/i14020.scala b/tests/run/i14020.scala
new file mode 100644
index 000000000000..86123874c034
--- /dev/null
+++ b/tests/run/i14020.scala
@@ -0,0 +1,39 @@
+class A:
+  def greeting(name: String = "you") = s"Hello $name"
+
+class A2:
+  inline def greeting(name: String = "you") = s"Hello $name"
+
+class B:
+  val a = A()
+  export a.*
+
+class C:
+  val a = A2()
+  export a.greeting
+
+@main def Test =
+  val b = B()
+
+  println(b.a.greeting())      // works
+  println(b.greeting("John"))  // works
+  println(b.greeting())        // nope !
+
+  val c = C()
+
+  println(c.a.greeting())      // works
+  println(c.greeting("John"))  // works
+  println(c.greeting())        // nope !
+
+  val w = Wolf()
+  import w.given
+
+  println(summon[String]) // error: I found: w.bark(/* missing */summon[String])
+
+
+class Dog:
+  given bark(using msg: String = "Woof!"): String = s"bark: $msg"
+
+class Wolf:
+  private val dog = Dog()
+  export dog.given // needs to be `export dog.{given, *}` to export the default arguments
diff --git a/tests/run/i14083.scala b/tests/run/i14083.scala
new file mode 100644
index 000000000000..4014e474ad45
--- /dev/null
+++ b/tests/run/i14083.scala
@@ -0,0 +1,13 @@
+class Outer {
+  class Inner
+}
+@main def Test =
+  assert(classOf[Outer#Inner]
+    .getConstructors.head
+    .getParameters.head
+    .isSynthetic)
+  assert(
+    classOf[Outer#Inner]
+      .getDeclaredFields
+      .filter(_.getName == "$outer")
+      .exists(_.isSynthetic))
diff --git a/tests/run/i14198.scala b/tests/run/i14198.scala
new file mode 100644
index 000000000000..94ac07ee5d84
--- /dev/null
+++ b/tests/run/i14198.scala
@@ -0,0 +1,60 @@
+
+import java.lang.ref.WeakReference
+import java.util.concurrent.atomic.AtomicReference
+
+final class Mark
+
+object Test:
+
+  def main(args: Array[String]): Unit =
+    myTest
+    trying
+
+  final def myAssert(cond: => Boolean): Unit = assert(cond)
+
+  def terminally(cond: => Boolean): Unit =
+    System.gc()
+    var n = 10
+    while (n > 0 && !cond)
+    do
+      System.gc()
+      Thread.`yield`()
+      //print(".")
+      n -= 1
+    assert(cond)
+
+  def myTest: Unit =
+    val ref = new AtomicReference[WeakReference[AnyRef]]
+    var mark: AnyRef = null
+    assert(ref.compareAndSet(null, WeakReference(Mark())))
+    mark = ref.get().get()
+    myAssert(mark ne null) // in theory this could fail, but it isn't
+    mark = null
+    terminally(ref.get().get() == null)
+
+  def trying: Unit =
+    def ignore[A]: (Throwable => A) = _ => null.asInstanceOf[A]
+    var i: Int = 21
+    var s: String = "hello"
+    var r: WeakReference[String] = null
+    def f(n: => Int) = n + n + 1
+    def g(x: => String) =
+      r = WeakReference(x + "/" + x)
+      r.get()
+    i = try f(i) catch ignore
+    s = try g(s) catch ignore
+    assert(s == "hello/hello")
+    assert(r.get() == "hello/hello")
+    s = null
+    terminally(r.get() == null)
+    s = "bye"
+    s = try g(s) catch ignore
+    assert(s == "bye/bye")
+    assert(r.get() == "bye/bye")
+    s = null.asInstanceOf[String]
+    terminally(r.get() == null)
+    @volatile var z: String = "whoa"
+    z = try g(z) catch ignore
+    assert(r.get() == "whoa/whoa")
+    z = null
+    terminally(r.get() == null)
diff --git a/tests/run/i14215.scala b/tests/run/i14215.scala
new file mode 100644
index 000000000000..d732337ce0f2
--- /dev/null
+++ b/tests/run/i14215.scala
@@ -0,0 +1,12 @@
+def f[T <: Tuple2[Int, Int]](tup: T): T = tup
+
+@main def Test: Unit =
+  (1, 2)._1
+  f((1, 2))._1
+
+  (1 *: 2 *: EmptyTuple)._1
+  f(1 *: 2 *: EmptyTuple)._1
+  f[Int *: Int *: EmptyTuple](1 *: 2 *: EmptyTuple)._1
+
+  f[Int *: Int *: EmptyTuple]((1, 2))._1
+  f[Tuple2[Int, Int]](1 *: 2 *: EmptyTuple)._1
diff --git a/tests/run/i2567.scala b/tests/run/i2567.scala
index 7ab93aaab4f1..c9625aeb33d1 100644
--- a/tests/run/i2567.scala
+++ b/tests/run/i2567.scala
@@ -1,6 +1,6 @@
 class TC
 
-given tc: TC with {}
+given tc: TC()
 
 class Foo(using TC) {
   println("hi")
diff --git a/tests/run/i2738.check b/tests/run/i2738.check
index b54b3d840cf0..5954c1afefc9 100644
--- a/tests/run/i2738.check
+++ b/tests/run/i2738.check
@@ -1,4 +1,4 @@
-Test$qux$1$
 Test$qux$2$
+Test$qux$4$
 bar$1
 bar$2
diff --git a/tests/run/i2964.check b/tests/run/i2964.check
index 748b2a47faf1..ac42be082812 100644
--- a/tests/run/i2964.check
+++ b/tests/run/i2964.check
@@ -1,4 +1,4 @@
 class Foo$$anon$1
-class Bar$$anon$1
 class Bar$$anon$2
-class Baz$$anon$1
+class Bar$$anon$3
+class Baz$$anon$4
diff --git a/tests/run/i2964b.check b/tests/run/i2964b.check
index 748b2a47faf1..ac42be082812 100644
--- a/tests/run/i2964b.check
+++ b/tests/run/i2964b.check
@@ -1,4 +1,4 @@
 class Foo$$anon$1
-class Bar$$anon$1
 class Bar$$anon$2
-class Baz$$anon$1
+class Bar$$anon$3
+class Baz$$anon$4
diff --git a/tests/run/i2964c.check b/tests/run/i2964c.check
index f7cc0f12df69..729b24dcb9f3 100644
--- a/tests/run/i2964c.check
+++ b/tests/run/i2964c.check
@@ -1,4 +1,4 @@
 class Foo$Inner$1
-class Bar$Inner$1
 class Bar$Inner$2
-class Baz$Inner$1
+class Bar$Inner$3
+class Baz$Inner$4
diff --git a/tests/run/i2964d.check b/tests/run/i2964d.check
index f1a0e8bb51c4..32a719a2630c 100644
--- a/tests/run/i2964d.check
+++ b/tests/run/i2964d.check
@@ -1,4 +1,4 @@
-class Foo$Inner$1$
-class Bar$Inner$1$
-class Bar$Inner$2$
-class Baz$Inner$1$
+class Foo$Inner$2$
+class Bar$Inner$4$
+class Bar$Inner$6$
+class Baz$Inner$8$
diff --git a/tests/run/i2964e.check b/tests/run/i2964e.check
index a42348b97b00..ccffda6bc06b 100644
--- a/tests/run/i2964e.check
+++ b/tests/run/i2964e.check
@@ -1,4 +1,4 @@
 class foo.bar.Foo$$anon$1
 class foo.bar.Foo$$anon$2
-class foo.Foo$$anon$1
-class Foo$$anon$1
+class foo.Foo$$anon$3
+class Foo$$anon$4
diff --git a/tests/run/i3000b.check b/tests/run/i3000b.check
index c5980c545f33..605021c9b2c0 100644
--- a/tests/run/i3000b.check
+++ b/tests/run/i3000b.check
@@ -1,2 +1,2 @@
 Foo$$anon$1
-bar.Bar$$anon$1
+bar.Bar$$anon$2
diff --git a/tests/run/i3006.check b/tests/run/i3006.check
index 8f4e653138b7..a2d3b474408c 100644
--- a/tests/run/i3006.check
+++ b/tests/run/i3006.check
@@ -1,5 +1,5 @@
 f$1
 f$2
 f$3
-f$1
-f$2
+f$4
+f$5
diff --git a/tests/run/i3006b.check b/tests/run/i3006b.check
index 3698829ef115..ec64184dc80c 100644
--- a/tests/run/i3006b.check
+++ b/tests/run/i3006b.check
@@ -1,3 +1,3 @@
 bar$1
 bar$2
-bar$1
+bar$3
diff --git a/tests/run/i4241.scala b/tests/run/i4241.scala
new file mode 100644
index 000000000000..c55cb5be475f
--- /dev/null
+++ b/tests/run/i4241.scala
@@ -0,0 +1,24 @@
+object Test extends App {
+  val a: PartialFunction[Int, Int] = { case x => x }
+  val b: PartialFunction[Int, Int] = x => x match { case 1 => 1; case 2 => 2 }
+  val c: PartialFunction[Int, Int] = x => { x match { case 1 => 1 } }
+  val d: PartialFunction[Int, Int] = x => { { x match { case 1 => 1 } } }
+
+  val e: PartialFunction[Int, Int] = x => { println("foo"); x match { case 1 => 1 } }
+  val f: PartialFunction[Int, Int] = x => x
+  val g: PartialFunction[Int, String] = { x => x.toString }
+  val h: PartialFunction[Int, String] = _.toString
+  assert(a.isDefinedAt(2))
+  assert(b.isDefinedAt(2))
+  assert(!b.isDefinedAt(3))
+  assert(c.isDefinedAt(1))
+  assert(!c.isDefinedAt(2))
+  assert(d.isDefinedAt(1))
+  assert(!d.isDefinedAt(2))
+  assert(e.isDefinedAt(2))
+  assert(f.isDefinedAt(2))
+  assert(g.isDefinedAt(2))
+  assert(h.isDefinedAt(2))
+}
+
+
diff --git a/tests/run/i6996.check b/tests/run/i6996.check
index a4387987de57..3e37e529877c 100644
--- a/tests/run/i6996.check
+++ b/tests/run/i6996.check
@@ -1,3 +1,3 @@
 an `a`
-false
-not `a`
+true
+an `a`
diff --git a/tests/run/i8396.scala b/tests/run/i8396.scala
index 3e44e3898dc5..3f5965d17c9b 100644
--- a/tests/run/i8396.scala
+++ b/tests/run/i8396.scala
@@ -6,9 +6,9 @@ object Prefix:
   type UpperBoundedType <: String
   type FullyBoundedType >: String <: String
 
-  given A: Show[AbstractType] with {}
-  given B: Show[UpperBoundedType] with {}
-  given C: Show[FullyBoundedType] with {}
+  given A: Show[AbstractType]()
+  given B: Show[UpperBoundedType]()
+  given C: Show[FullyBoundedType]()
 
 @main def Test =
   summon[Show[Prefix.AbstractType]]
diff --git a/tests/neg/i8861.scala b/tests/run/i8861.scala
similarity index 77%
rename from tests/neg/i8861.scala
rename to tests/run/i8861.scala
index 87f1884f6155..e1e802a5c72b 100644
--- a/tests/neg/i8861.scala
+++ b/tests/run/i8861.scala
@@ -18,14 +18,16 @@ object Test {
     int = vi => vi.i : vi.A,
     str = vs => vs.t : vs.A
   )
+  // Used to infer `c.visit[Int & M)]` and error out in the second lambda,
+  // now infers `c.visit[(Int & M | String & M)]`
   def minimalFail[M](c: Container { type A = M }): M = c.visit(
     int = vi => vi.i : vi.A,
-    str = vs => vs.t : vs.A  // error
+    str = vs => vs.t : vs.A
   )
 
   def main(args: Array[String]): Unit = {
     val e: Container { type A = String } = new StrV
     println(minimalOk(e)) // this one prints "hello"
-    println(minimalFail(e)) // this one fails with ClassCastException: class java.lang.String cannot be cast to class java.lang.Integer
+    println(minimalFail(e)) // used to fail with ClassCastException, now prints "hello"
   }
-}
\ No newline at end of file
+}
diff --git a/tests/run/i9482.scala b/tests/run/i9482.scala
new file mode 100644
index 000000000000..425a9b333d29
--- /dev/null
+++ b/tests/run/i9482.scala
@@ -0,0 +1,83 @@
+import scala.reflect.{OptManifest, ClassTag}
+
+object Ref {
+
+  object Sentinel
+
+  def makeWithArr[A: OptManifest]: String = optManifest[A] match {
+    case m: ClassTag[_] => m.newArray(0).asInstanceOf[AnyRef] match {
+      // these can be reordered, so long as Unit comes before AnyRef
+      case _: Array[Boolean] => "bool"
+      case _: Array[Byte]    => "byte"
+      case _: Array[Short]   => "short"
+      case _: Array[Char]    => "char"
+      case _: Array[Int]     => "int"
+      case _: Array[Float]   => "float"
+      case _: Array[Long]    => "long"
+      case _: Array[Double]  => "double"
+      case _: Array[Unit]    => "unit"
+      case a: Array[AnyRef]  => a.getClass.getComponentType.getName
+    }
+    case _ => "<?>"
+  }
+
+  def make[A: OptManifest]: String = optManifest[A] match {
+    case m: ClassTag[a] => m match {
+      case ClassTag.Boolean => "bool"
+      case ClassTag.Byte    => "byte"
+      case ClassTag.Short   => "short"
+      case ClassTag.Char    => "char"
+      case ClassTag.Int     => "int"
+      case ClassTag.Float   => "float"
+      case ClassTag.Long    => "long"
+      case ClassTag.Double  => "double"
+      case ClassTag.Unit    => "unit"
+      case ClassTag.Any     => "any"
+      case ClassTag.AnyVal  => "anyval"
+      case ClassTag.Object  => "anyref"
+      case _                => m.runtimeClass.getName
+    }
+    case NoManifest => "<?>"
+  }
+
+}
+
+import Ref.*
+
+def baz[A] = Ref.makeWithArr[A]
+def qux[A] = Ref.make[A]
+
+@main def Test = {
+
+  assert(Ref.makeWithArr[Boolean] == "bool")
+  assert(Ref.makeWithArr[Byte]    == "byte")
+  assert(Ref.makeWithArr[Short]   == "short")
+  assert(Ref.makeWithArr[Char]    == "char")
+  assert(Ref.makeWithArr[Int]     == "int")
+  assert(Ref.makeWithArr[Float]   == "float")
+  assert(Ref.makeWithArr[Long]    == "long")
+  assert(Ref.makeWithArr[Double]  == "double")
+  assert(Ref.makeWithArr[Unit]    == "unit")
+  assert(Ref.makeWithArr["abc"]   == "java.lang.String")
+  assert(Ref.makeWithArr[Null]    == "<?>")
+  assert(Ref.makeWithArr[Nothing] == "<?>")
+  assert(baz[Int]                 == "<?>")
+
+  assert(Ref.make[Boolean] == "bool")
+  assert(Ref.make[Byte]    == "byte")
+  assert(Ref.make[Short]   == "short")
+  assert(Ref.make[Char]    == "char")
+  assert(Ref.make[Int]     == "int")
+  assert(Ref.make[Float]   == "float")
+  assert(Ref.make[Long]    == "long")
+  assert(Ref.make[Double]  == "double")
+  assert(Ref.make[Unit]    == "unit")
+  assert(Ref.make[Any]     == "any")
+  assert(Ref.make[AnyVal]  == "anyval")
+  assert(Ref.make[AnyRef]  == "anyref")
+  assert(Ref.make["abc"]   == "java.lang.String")
+  assert(Ref.make[Null]    == "<?>")
+  assert(Ref.make[Nothing] == "<?>")
+  assert(qux[Int]          == "<?>")
+
+}
diff --git a/tests/run/i9939.check b/tests/run/i9939.check
new file mode 100644
index 000000000000..7040250edc75
--- /dev/null
+++ b/tests/run/i9939.check
@@ -0,0 +1,2 @@
+[3.0, 42]
+[3.0, 42.0]
diff --git a/tests/run/i9939.scala b/tests/run/i9939.scala
new file mode 100644
index 000000000000..84ae5c2723c8
--- /dev/null
+++ b/tests/run/i9939.scala
@@ -0,0 +1,6 @@
+def nonHarmonized[A >: Any](args: A*): String = args.mkString("[", ", ", "]")
+def harmonized[A >: Any](args: A*): List[A] = args.toList
+
+@main def Test =
+  println(nonHarmonized(3.0, 42))
+  println(harmonized(3.0, 42).mkString("[", ", ", "]"))
diff --git a/tests/run/implicit-alias.scala b/tests/run/implicit-alias.scala
index 1a30a3d22915..64117c3fc977 100644
--- a/tests/run/implicit-alias.scala
+++ b/tests/run/implicit-alias.scala
@@ -6,7 +6,7 @@ object Test extends App {
 
   class TC1
 
-  given TC1 with {}
+  given TC1()
 
   class TV(val tc: TC) extends AnyVal
 
diff --git a/tests/run/implicit-disambiguation.scala b/tests/run/implicit-disambiguation.scala
index ad6f9a9bedc6..98ac89f8addf 100644
--- a/tests/run/implicit-disambiguation.scala
+++ b/tests/run/implicit-disambiguation.scala
@@ -14,7 +14,7 @@ object M {
   }
 }
 object Test extends App {
-  given b: B with {}
-  given c: C with {}
+  given b: B()
+  given c: C()
   println(M.f)
 }
diff --git a/tests/run/implicit-specifity.scala b/tests/run/implicit-specifity.scala
index c92ee5f9acef..51fa02d91cfd 100644
--- a/tests/run/implicit-specifity.scala
+++ b/tests/run/implicit-specifity.scala
@@ -20,12 +20,12 @@ object Generic2 {
 
 class SubGen extends Generic
 object SubGen {
-  given SubGen with {}
+  given SubGen()
 }
 object Contextual {
   trait Context
 
-  given ctx: Context with {}
+  given ctx: Context()
 
   given showGen[T](using Generic): Show[T] = new Show[T](2)
 
diff --git a/tests/run/implied-divergence.scala b/tests/run/implied-divergence.scala
index 791df6dbd5bd..ecf5fd81dfd8 100644
--- a/tests/run/implied-divergence.scala
+++ b/tests/run/implied-divergence.scala
@@ -2,11 +2,11 @@
 // recursions.
 case class E(x: E | Null)
 
-given e: E(null) with {}
+given e: E(null)
 
 object Test extends App {
 
-  given f(using e: E): E(e) with {}
+  given f(using e: E): E(e)
 
   assert(summon[E].toString == "E(E(null))")
 
diff --git a/tests/run/implied-for.scala b/tests/run/implied-for.scala
index 252bac528712..c7789ce570e4 100644
--- a/tests/run/implied-for.scala
+++ b/tests/run/implied-for.scala
@@ -6,10 +6,10 @@ object A {
   class C extends T
   class D[T]
 
-  given b: B with {}
-  given c: C with {}
-  given t: T with {}
-  given d: D[Int] with {}
+  given b: B()
+  given c: C()
+  given t: T()
+  given d: D[Int]()
 }
 
 object Test extends App {
@@ -29,11 +29,11 @@ class ExecutionContext
 class Monoid[T]
 
 object Instances {
-  given intOrd: Ordering[Int] with {}
+  given intOrd: Ordering[Int]()
 
-  given listOrd[T](using Ordering[T]): Ordering[List[T]] with {}
-  given ec: ExecutionContext with {}
-  given im: Monoid[Int] with {}
+  given listOrd[T](using Ordering[T]): Ordering[List[T]]()
+  given ec: ExecutionContext()
+  given im: Monoid[Int]()
 }
 
 object Test2 {
diff --git a/tests/run/implied-priority.scala b/tests/run/implied-priority.scala
index 44cd7d56504c..0822fae6778f 100644
--- a/tests/run/implied-priority.scala
+++ b/tests/run/implied-priority.scala
@@ -11,18 +11,18 @@ class Arg[T]  // An argument that we use as a given for some given instances bel
  * Traditional scheme: prioritize with location in class hierarchy
  */
 class LowPriorityImplicits {
-  given t1[T]: E[T]("low") with {}
+  given t1[T]: E[T]("low")
 }
 
 object NormalImplicits extends LowPriorityImplicits {
-  given t2[T](using Arg[T]): E[T]("norm") with {}
+  given t2[T](using Arg[T]): E[T]("norm")
 }
 
 def test1 = {
   import NormalImplicits.given
   assert(summon[E[String]].str == "low") // No Arg available, so only t1 applies
 
-  { given Arg[String] with {}
+  { given Arg[String]()
     assert(summon[E[String]].str == "norm")  // Arg available, t2 takes priority
   }
 }
@@ -31,22 +31,22 @@ def test1 = {
  */
 object Priority {
   class Low
-  object Low { given Low with {} }
+  object Low { given Low() }
 
   class High extends Low
-  object High { given High with {} }
+  object High { given High() }
 }
 
 object Impl2 {
-  given t1[T](using Priority.Low): E[T]("low") with {}
-  given t2[T](using Priority.High)(using Arg[T]): E[T]("norm") with {}
+  given t1[T](using Priority.Low): E[T]("low")
+  given t2[T](using Priority.High)(using Arg[T]): E[T]("norm")
 }
 
 def test2 = {
   import Impl2.given
   assert(summon[E[String]].str == "low") // No Arg available, so only t1 applies
 
-  { given Arg[String] with {}
+  { given Arg[String]()
     assert(summon[E[String]].str == "norm") // Arg available, t2 takes priority
   }
 }
@@ -60,14 +60,14 @@ def test2 = {
  * an alternative without implicit arguments would override all of them.
  */
 object Impl2a {
-  given t3[T]: E[T]("hi") with {}
+  given t3[T]: E[T]("hi")
 }
 
 def test2a = {
   import Impl2.given
   import Impl2a.given
 
-  given Arg[String] with {}
+  given Arg[String]()
   assert(summon[E[String]].str == "hi")
 }
 
@@ -75,13 +75,13 @@ def test2a = {
  * result type of the given instance, e.g. like this:
  */
 object Impl3 {
-  given t1[T]: E[T]("low") with {}
+  given t1[T]: E[T]("low")
 }
 
 object Override {
   trait HighestPriority  // A marker trait to indicate a higher priority
 
-  given over[T]: E[T]("hi") with HighestPriority with {}
+  given over[T]: E[T]("hi") with HighestPriority()
 }
 
 def test3 = {
@@ -101,9 +101,9 @@ def test3 = {
  * with a default argument.
  */
 object Impl4 {
-  given t1: E[String]("string") with {}
+  given t1: E[String]("string")
 
-  given t2[T](using Arg[T]): E[T]("generic") with {}
+  given t2[T](using Arg[T]): E[T]("generic")
 }
 
 object fallback4 {
@@ -116,7 +116,7 @@ def test4 = {
   assert(withFallback[String].str == "string")  // t1 is applicable
   assert(withFallback[Int].str == "fallback")   // No applicable instances, pick the default
 
-  { given Arg[Int] with {}
+  { given Arg[Int]()
     assert(withFallback[Int].str == "generic")  // t2 is applicable
   }
 }
@@ -146,7 +146,7 @@ def test5 = {
   assert(summon[E[String]].str == "string")  // t1 is applicable
   assert(summon[E[Int]].str == "fallback")   // No applicable instances, pick the default
 
-  { given Arg[Int] with {}
+  { given Arg[Int]()
     assert(summon[E[Int]].str == "generic")  // t2 is applicable
   }
 }
diff --git a/tests/run/implied-specifity-2.scala b/tests/run/implied-specifity-2.scala
index a787531c1089..2676b33cda97 100644
--- a/tests/run/implied-specifity-2.scala
+++ b/tests/run/implied-specifity-2.scala
@@ -1,58 +1,58 @@
 class Low
 object Low {
-  given low: Low with {}
+  given low: Low()
 }
 class Medium extends Low
 object Medium {
-  given medium: Medium with {}
+  given medium: Medium()
 }
 class High extends Medium
 object High {
-  given high: High with {}
+  given high: High()
 }
 
 class Foo[T](val i: Int)
 object Foo {
   def apply[T](using fooT: Foo[T]): Int = fooT.i
 
-  given foo[T](using Low): Foo[T](0) with {}
-  given foobar[T](using Low): Foo[Bar[T]](1) with {}
-  given foobarbaz(using Low): Foo[Bar[Baz]](2) with {}
+  given foo[T](using Low): Foo[T](0)
+  given foobar[T](using Low): Foo[Bar[T]](1)
+  given foobarbaz(using Low): Foo[Bar[Baz]](2)
 }
 class Bar[T]
 object Bar {
-  given foobar[T](using Medium): Foo[Bar[T]](3) with {}
-  given foobarbaz(using Medium): Foo[Bar[Baz]](4) with {}
+  given foobar[T](using Medium): Foo[Bar[T]](3)
+  given foobarbaz(using Medium): Foo[Bar[Baz]](4)
 }
 class Baz
 object Baz {
-  given baz(using High): Foo[Bar[Baz]](5) with {}
+  given baz(using High): Foo[Bar[Baz]](5)
 }
 
 class Arg
 
-given Arg with {}
+given Arg()
 
 class Bam(val str: String)
 
-given lo(using Low): Bam("lo") with {}
+given lo(using Low): Bam("lo")
 
-given hi(using High)(using Arg): Bam("hi") with {}
+given hi(using High)(using Arg): Bam("hi")
 
 class Bam2(val str: String)
 
-given lo2(using Low): Bam2("lo") with {}
+given lo2(using Low): Bam2("lo")
 
-given mid2(using High)(using Arg): Bam2("mid") with {}
+given mid2(using High)(using Arg): Bam2("mid")
 
-given hi2: Bam2("hi") with {}
+given hi2: Bam2("hi")
 
 class Arg2
 class Red(val str: String)
 
-given normal(using Arg2): Red("normal") with {}
+given normal(using Arg2): Red("normal")
 
-given reduced(using ev: Arg2 | Low): Red("reduced") with {}
+given reduced(using ev: Arg2 | Low): Red("reduced")
 
 object Test extends App {
   assert(Foo[Int] == 0)
@@ -62,7 +62,7 @@ object Test extends App {
   assert(summon[Bam2].str == "hi")
   assert(summon[Red].str == "reduced")
 
-  { given Arg2 with {}
+  { given Arg2()
     assert(summon[Red].str == "normal")
   }
 }
\ No newline at end of file
diff --git a/tests/run/inline-override-num.scala b/tests/run/inline-override-num.scala
index 06f0ae91c0f8..b4a44e2b3a8d 100644
--- a/tests/run/inline-override-num.scala
+++ b/tests/run/inline-override-num.scala
@@ -6,7 +6,7 @@ object Num {
   class IntNum extends Num[Int] {
     inline def plus(x: Int, y: Int): Int = x + y
   }
-  given IntNum with {}
+  given IntNum()
 
   extension [T](inline x: T)(using inline num: Num[T]) {
     inline def +(inline y: T): T = num.plus(x, y)
diff --git a/tests/run/java-intersection.check b/tests/run/java-intersection.check
new file mode 100644
index 000000000000..51c75c6b280b
--- /dev/null
+++ b/tests/run/java-intersection.check
@@ -0,0 +1,6 @@
+1
+2
+1
+Sub1
+2
+Sub2
diff --git a/tests/run/java-intersection/A_1.java b/tests/run/java-intersection/A_1.java
index ebe834a74cce..f54862e8adc2 100644
--- a/tests/run/java-intersection/A_1.java
+++ b/tests/run/java-intersection/A_1.java
@@ -1,3 +1,11 @@
+import java.io.Serializable;
+
 public class A_1 {
-  public <T extends Object & java.io.Serializable> void foo(T x) {}
+  public <T extends Object & Serializable> void foo(T x) {
+    System.out.println("1");
+  }
+
+  public <T extends Cloneable & Serializable> void foo(T x) {
+    System.out.println("2");
+  }
 }
diff --git a/tests/run/java-intersection/Test_2.scala b/tests/run/java-intersection/Test_2.scala
index cbc39988340a..a3d7b11fce12 100644
--- a/tests/run/java-intersection/Test_2.scala
+++ b/tests/run/java-intersection/Test_2.scala
@@ -1,7 +1,26 @@
+import java.io.Serializable
+
+class Sub extends A_1 {
+  override def foo[T <: Object & Serializable](x: T) =
+    super.foo(x)
+    println("Sub1")
+
+  override def foo[T <: Cloneable & Serializable](x: T) =
+    super.foo(x)
+    println("Sub2")
+}
+
 object Test {
   def main(args: Array[String]): Unit = {
+    val x: Object & Serializable = new Serializable {}
+    val y: Cloneable & Serializable = new Cloneable with java.io.Serializable {}
+
     val a = new A_1
-    val x: java.io.Serializable = new java.io.Serializable {}
     a.foo(x)
+    a.foo(y)
+
+    val s = new Sub
+    s.foo(x)
+    s.foo(y)
   }
 }
diff --git a/tests/run/java-varargs-3/A.java b/tests/run/java-varargs-3/A.java
new file mode 100644
index 000000000000..046592bb020e
--- /dev/null
+++ b/tests/run/java-varargs-3/A.java
@@ -0,0 +1,14 @@
+class A<S> {
+  public void gen(S... args) {
+  }
+
+  public <T extends S> void gen2(S... args) {
+  }
+}
+class B<S extends java.io.Serializable> {
+  public void gen(S... args) {
+  }
+
+  public <T extends S> void gen2(S... args) {
+  }
+}
diff --git a/tests/run/java-varargs-3/Test.scala b/tests/run/java-varargs-3/Test.scala
new file mode 100644
index 000000000000..4c00e491a6ad
--- /dev/null
+++ b/tests/run/java-varargs-3/Test.scala
@@ -0,0 +1,19 @@
+object Test {
+  def main(args: Array[String]): Unit = {
+    val ai = new A[Int]
+    ai.gen(1)
+    ai.gen2(1)
+    ai.gen(Array(1)*)
+    ai.gen2(Array(1)*)
+    ai.gen(Seq(1)*)
+    ai.gen2(Seq(1)*)
+
+    val b = new B[String]
+    b.gen("")
+    b.gen2("")
+    b.gen(Array("")*)
+    b.gen2(Array("")*)
+    b.gen(Seq("")*)
+    b.gen2(Seq("")*)
+  }
+}
diff --git a/tests/run/liftedTry.scala b/tests/run/liftedTry.scala
index ff9af98eca32..0a158b5a0ba2 100644
--- a/tests/run/liftedTry.scala
+++ b/tests/run/liftedTry.scala
@@ -16,7 +16,7 @@ object Test {
     assert(x == 1)
     assert(foo(2) == 2)
     assert(foo(try raise(3) catch handle) == 3)
-    Tr.foo
+    assert(Tr.foo == 3)
   }
 }
 
@@ -24,7 +24,26 @@ object Tr {
   def fun(a: Int => Unit) = a(2)
   def foo: Int = {
     var s = 1
-    s = try {fun(s = _); 3} catch{ case ex: Throwable => val x = 4; s = x; 5 }
+    s = try {fun(s = _); 3} catch { case ex: Throwable => val x = 4; s = x; 5 }
     s
   }
 }
+
+/* was:
+Caused by: java.lang.VerifyError: Inconsistent stackmap frames at branch target 33
+Exception Details:
+  Location:
+    Tr$.foo()I @30: goto
+  Reason:
+    Current frame's stack size doesn't match stackmap.
+  Current Frame:
+    bci: @30
+    flags: { }
+    locals: { 'Tr$', 'scala/runtime/IntRef', 'java/lang/Throwable', integer }
+    stack: { integer }
+  Stackmap Frame:
+    bci: @33
+    flags: { }
+    locals: { 'Tr$', 'scala/runtime/IntRef' }
+    stack: { top, integer }
+ */
diff --git a/tests/run/manifest-summoning.scala b/tests/run/manifest-summoning.scala
new file mode 100644
index 000000000000..dcee63801863
--- /dev/null
+++ b/tests/run/manifest-summoning.scala
@@ -0,0 +1,101 @@
+import scala.reflect.{classTag, ClassTag, NoManifest}
+
+@main def Test: Unit =
+
+  /* ====== no manifest available ====== */
+
+  locally {
+    noManifest[Array[? <: Int]] // available as a manifest
+    noManifest[Array[? <: String]] // available as a manifest
+    noManifest[Array[Nothing]]
+    noManifest[Array[Null]]
+    noManifest[Nothing]
+    noManifest[Null]
+  }
+
+  /* ====== ClassTag and OptManifest have the same runtime class and same equality ======= */
+
+  locally {
+    interopOpt[List[Int]]
+    interopOpt[List[? <: Int]]
+  }
+
+  /* ====== Test some OptManifest have the same runtime class and are equal ======= */
+
+  locally {
+    sameClassEqualOpt[List[Int], List[? <: Int]] // not equal for full manifests
+    sameClassEqualOpt[List[Int], List[String]]   // not equal for full manifests
+  }
+
+  /* ============================================================================= */
+  // The following tests rely on <:< being correct, i.e. `equals` on Manifest      //
+  // uses `<:<` underneath.                                                        //
+  /* ============================================================================= */
+
+  /* ====== Test some Manifest have the same runtime class and are equal ======= */
+
+  locally {
+    trait A
+    trait B {def b: Int}
+    trait C {def c: Int}
+    trait D {def d: Int}
+    class fooAnnot extends scala.annotation.StaticAnnotation
+
+    type SomeRefinedType =
+      ((B {def b: 0} & C) & ((A @fooAnnot) & D {def d: 2})) {def c: 1}
+
+    sameClassEqualMan[Array[? <: String], Array[String]]
+    sameClassEqualMan[SomeRefinedType, A]
+  }
+
+
+  /* ====== Test some Manifest have the same runtime class but are not equal ======= */
+
+  locally {
+    sameClassNonEqualMan[List[Int], List[? <: Int]]
+    sameClassNonEqualMan[List[Int], List[String]]
+  }
+
+  /* ====== Test that some Manifest have the same runtime class, are not equal, but are `<:<` ======= */
+
+  locally {
+    class A
+    class B extends A
+
+    sameClassSub[List[Int], List[AnyVal]]
+    sameClassSub[List[Unit], List[AnyVal]]
+    sameClassSub[List[B], List[A]]
+    sameClassSub[Array[List[B]], Array[List[A]]]
+  }
+
+end Test
+
+def noManifest[A: OptManifest] =
+  assert(optManifest[A] eq NoManifest)
+
+def interopOpt[A: ClassTag: OptManifest] =
+  assert(classTag[A] == optManifest[A])
+  optManifest[A] match
+    case optA: ClassTag[_] =>
+      assert(classTag[A].runtimeClass == optA.runtimeClass)
+
+def sameClassEqualOpt[A: OptManifest, B: OptManifest] =
+  assert(optManifest[A] == optManifest[B])
+  (optManifest[A], optManifest[B]) match
+    case (a: ClassTag[_], b: ClassTag[_]) =>
+      assert(a.runtimeClass == b.runtimeClass)
+
+def sameClassMan[A: Manifest, B: Manifest] =
+  assert(manifest[A].runtimeClass == manifest[B].runtimeClass)
+
+def sameClassEqualMan[A: Manifest, B: Manifest] =
+  sameClassMan[A, B]
+  assert(manifest[A] == manifest[B])
+
+def sameClassNonEqualMan[A: Manifest, B: Manifest] =
+  sameClassMan[A, B]
+  assert(manifest[A] != manifest[B])
+
+def sameClassSub[A: Manifest, B: Manifest] =
+  sameClassNonEqualMan[A, B]
+  assert(manifest[A] <:< manifest[B])
diff --git a/tests/run/opaque-inline/EmailAddress.scala b/tests/run/opaque-inline/EmailAddress.scala
new file mode 100644
index 000000000000..de5036a0ca77
--- /dev/null
+++ b/tests/run/opaque-inline/EmailAddress.scala
@@ -0,0 +1,10 @@
+import scala.quoted.*
+
+opaque type EmailAddress = String
+object EmailAddress extends EmailAddressOps[EmailAddress]:
+
+  given (using s: ToExpr[String]): ToExpr[EmailAddress] = s
+
+  def parse(s: String): Either[String, EmailAddress] =
+    if (s contains "@") Right(s)
+    else Left("No @ symbol")
diff --git a/tests/run/opaque-inline/EmailAddressOps.scala b/tests/run/opaque-inline/EmailAddressOps.scala
new file mode 100644
index 000000000000..217c36dd6724
--- /dev/null
+++ b/tests/run/opaque-inline/EmailAddressOps.scala
@@ -0,0 +1,33 @@
+import scala.quoted.*
+
+trait EmailAddressOps[EmailAddressTransparent <: String]:
+
+  inline def apply(inline s: String): EmailAddress =
+    ${ EmailAddressOps.applyImpl('s) }
+
+  private val pattern = java.util.regex.Pattern.compile("([^@]*)@([^@]*)")
+
+  extension (value: EmailAddressTransparent)
+    inline def localPart: String =
+      val matcher = pattern.matcher(value: String)
+      matcher.matches
+      matcher.group(1)
+    inline def domainPart: String =
+      val matcher = pattern.matcher(value: String)
+      matcher.matches
+      matcher.group(2)
+
+object EmailAddressOps {
+  def applyImpl(expr: Expr[String])(using Quotes): Expr[EmailAddress] =
+    import quotes.reflect.*
+    expr.asTerm match
+      case Inlined(_, _, Literal(StringConstant(s))) =>
+        EmailAddress.parse(s) match
+          case Right(email) => Expr(email)
+          case Left(err) =>
+            report.error(s"Not a valid email address: $err", expr)
+            '{???}
+      case _ =>
+        report.error(s"Not a constant", expr)
+        '{???}
+}
\ No newline at end of file
diff --git a/tests/run/opaque-inline/Test.scala b/tests/run/opaque-inline/Test.scala
new file mode 100644
index 000000000000..c228e361e5a9
--- /dev/null
+++ b/tests/run/opaque-inline/Test.scala
@@ -0,0 +1,2 @@
+@main def Test =
+  (new TestEmail).run
diff --git a/tests/run/opaque-inline/TestEmail.scala b/tests/run/opaque-inline/TestEmail.scala
new file mode 100644
index 000000000000..13121f59e1d6
--- /dev/null
+++ b/tests/run/opaque-inline/TestEmail.scala
@@ -0,0 +1,7 @@
+class TestEmail {
+  def getDomain(e: EmailAddress): String = e.domainPart
+
+  def run: Unit =
+    val em = EmailAddress("a@b.c")
+    assert(getDomain(em) == "b.c")
+}
diff --git a/tests/run/opaque-inline2.scala b/tests/run/opaque-inline2.scala
new file mode 100644
index 000000000000..fda5f6756827
--- /dev/null
+++ b/tests/run/opaque-inline2.scala
@@ -0,0 +1,28 @@
+
+import compiletime.*
+
+object refined:
+  opaque type Positive = Int
+
+  object Positive extends PositiveFactory
+
+  trait PositiveFactory:
+    inline def apply(inline value: Int): Positive =
+      inline if value < 0 then error(codeOf(value) + " is not positive.")
+      else value
+
+    transparent inline def safe(value: Int): Positive | IllegalArgumentException =
+      if value < 0 then IllegalArgumentException(s"$value is not positive")
+      else value: Positive
+
+@main def Test: Unit =
+  import refined.*
+  val eight = Positive(8)
+  // val negative = Positive(-1) // This correctly produces a compile error "-1 is not positive."
+  // val random = Positive(scala.util.Random.nextInt()) // This correctly produces a compile error about being unable to inline the method call
+  val random = Positive.safe(scala.util.Random.nextInt())
+  val safeNegative = Positive.safe(-1)
+  val safeFive = Positive.safe(5)
+  println(eight)
+  println(random)
+  println(safeFive)
\ No newline at end of file
diff --git a/tests/run/overloading-specifity.scala b/tests/run/overloading-specifity.scala
index 905e45ace938..b826b3320d1e 100644
--- a/tests/run/overloading-specifity.scala
+++ b/tests/run/overloading-specifity.scala
@@ -11,7 +11,7 @@ object Generic {
 object Test extends App {
   trait Context
 
-  given ctx: Context with {}
+  given ctx: Context()
 
   object b {
     def foo[T](implicit gen: Generic): Show[T] = new Show[T](1)
diff --git a/tests/run/poly-kinded-derives.scala b/tests/run/poly-kinded-derives.scala
index 73ad7dc1957a..0d3c7e9f8ffd 100644
--- a/tests/run/poly-kinded-derives.scala
+++ b/tests/run/poly-kinded-derives.scala
@@ -4,10 +4,10 @@ object Test extends App {
   {
     trait Show[T]
     object Show {
-      given Show[Int] with {}
-      given [T](using st: Show[T]): Show[Tuple1[T]] with {}
-      given t2[T, U](using st: Show[T], su: Show[U]): Show[(T, U)] with {}
-      given t3 [T, U, V](using st: Show[T], su: Show[U], sv: Show[V]): Show[(T, U, V)] with {}
+      given Show[Int]()
+      given [T](using st: Show[T]): Show[Tuple1[T]]()
+      given t2[T, U](using st: Show[T], su: Show[U]): Show[(T, U)]()
+      given t3 [T, U, V](using st: Show[T], su: Show[U], sv: Show[V]): Show[(T, U, V)]()
 
       def derived[T](using m: Mirror.Of[T], r: Show[m.MirroredElemTypes]): Show[T] = new Show[T] {}
     }
@@ -22,10 +22,10 @@ object Test extends App {
   {
     trait Functor[F[_]]
     object Functor {
-      given [C]: Functor[[T] =>> C] with {}
-      given Functor[[T] =>> Tuple1[T]] with {}
-      given t2 [T]: Functor[[U] =>> (T, U)] with {}
-      given t3 [T, U]: Functor[[V] =>> (T, U, V)] with {}
+      given [C]: Functor[[T] =>> C]()
+      given Functor[[T] =>> Tuple1[T]]()
+      given t2 [T]: Functor[[U] =>> (T, U)]()
+      given t3 [T, U]: Functor[[V] =>> (T, U, V)]()
 
       def derived[F[_]](using m: Mirror { type MirroredType[X] = F[X] ; type MirroredElemTypes[_] }, r: Functor[m.MirroredElemTypes]): Functor[F] = new Functor[F] {}
     }
@@ -40,8 +40,8 @@ object Test extends App {
   {
     trait FunctorK[F[_[_]]]
     object FunctorK {
-      given [C]: FunctorK[[F[_]] =>> C] with {}
-      given [T]: FunctorK[[F[_]] =>> Tuple1[F[T]]] with {}
+      given [C]: FunctorK[[F[_]] =>> C]()
+      given [T]: FunctorK[[F[_]] =>> Tuple1[F[T]]]()
 
       def derived[F[_[_]]](using m: Mirror { type MirroredType[X[_]] = F[X] ; type MirroredElemTypes[_[_]] }, r: FunctorK[m.MirroredElemTypes]): FunctorK[F] = new FunctorK[F] {}
     }
@@ -56,10 +56,10 @@ object Test extends App {
   {
     trait Bifunctor[F[_, _]]
     object Bifunctor {
-      given [C]: Bifunctor[[T, U] =>> C] with {}
-      given Bifunctor[[T, U] =>> Tuple1[U]] with {}
-      given t2: Bifunctor[[T, U] =>> (T, U)] with {}
-      given t3 [T]: Bifunctor[[U, V] =>> (T, U, V)] with {}
+      given [C]: Bifunctor[[T, U] =>> C]()
+      given Bifunctor[[T, U] =>> Tuple1[U]]()
+      given t2: Bifunctor[[T, U] =>> (T, U)]()
+      given t3 [T]: Bifunctor[[U, V] =>> (T, U, V)]()
 
       def derived[F[_, _]](using m: Mirror { type MirroredType[X, Y] = F[X, Y] ; type MirroredElemTypes[_, _] }, r: Bifunctor[m.MirroredElemTypes]): Bifunctor[F] = ???
     }
diff --git a/tests/run/polymorphic-functions.scala b/tests/run/polymorphic-functions.scala
index e723fa34cf79..d059484d60cd 100644
--- a/tests/run/polymorphic-functions.scala
+++ b/tests/run/polymorphic-functions.scala
@@ -95,4 +95,6 @@ object Test extends App {
   // Parens handling
   val tt1: [T] => (T => T) = [T] =>  (x: T) => x
   val tt2: [T] =>  T => T =  [T] => ((x: T) => x)
+  val tt3: [T] =>  T => T =  [T] => { (x: T) => x }
+  val tt4: [T] =>  T => T =  [T] => (x: T) => { x }
 }
diff --git a/tests/run/productElementName.check b/tests/run/productElementName.check
index a7499b7c1e5d..6bad7ad80814 100644
--- a/tests/run/productElementName.check
+++ b/tests/run/productElementName.check
@@ -9,6 +9,6 @@ AuxiliaryConstructor(a=Susan, b=42)
 OverloadedApply(a=Susan, b=123)
 DefinesProductElementName(foo=Susan, foo=42)
 InheritsProductElementName(a=Susan, b=42)
-InheritsProductElementName_Override(overriden=Susan, overriden=42)
+InheritsProductElementName_Override(overridden=Susan, overridden=42)
 InheritsProductElementName_Override_SelfType(a=Susan, b=42)
 PrivateMembers(a=10, b=20, c=30, d=40, e=50, f=60)
diff --git a/tests/run/productElementName.scala b/tests/run/productElementName.scala
index b98ac96cdfa9..ff9a2e4dac33 100644
--- a/tests/run/productElementName.scala
+++ b/tests/run/productElementName.scala
@@ -30,17 +30,17 @@ case class DefinesProductElementName(a: String, b: Int) {
 }
 
 trait A {
-  def productElementName(n: Int): String = "overriden"
+  def productElementName(n: Int): String = "overridden"
 }
 case class InheritsProductElementName(a: String, b: Int) extends A
 
 trait B extends Product {
-  override def productElementName(n: Int): String = "overriden"
+  override def productElementName(n: Int): String = "overridden"
 }
 case class InheritsProductElementName_Override(a: String, b: Int) extends B
 
 trait C { self: Product =>
-  override def productElementName(n: Int): String = "overriden"
+  override def productElementName(n: Int): String = "overridden"
 }
 case class InheritsProductElementName_Override_SelfType(a: String, b: Int) extends C
 
diff --git a/tests/run/safeThrowsStrawman.scala b/tests/run/safeThrowsStrawman.scala
index 8ddb594b787a..973c9d8f5137 100644
--- a/tests/run/safeThrowsStrawman.scala
+++ b/tests/run/safeThrowsStrawman.scala
@@ -3,29 +3,29 @@ import language.experimental.erasedDefinitions
 object scalax:
   erased class CanThrow[-E <: Exception]
 
-  infix type throws[R, +E <: Exception] = CanThrow[E] ?=> R
+  infix type raises[R, +E <: Exception] = CanThrow[E] ?=> R
 
   class Fail extends Exception
 
-  def raise[E <: Exception](e: E): Nothing throws E = throw e
+  def raise[E <: Exception](e: E): Nothing raises E = throw e
 
 import scalax._
 
-def foo(x: Boolean): Int throws Fail =
+def foo(x: Boolean): Int raises Fail =
   if x then 1 else raise(Fail())
 
 def bar(x: Boolean)(using CanThrow[Fail]): Int = foo(x)
-def baz: Int throws Exception = foo(false)
+def baz: Int raises Exception = foo(false)
 
 @main def Test =
   try
-    given CanThrow[Fail] = ???
+    given CanThrow[Fail] = new CanThrow
     println(foo(true))
     println(foo(false))
   catch case ex: Fail =>
     println("failed")
   try
-    given CanThrow[Exception] = ???
+    given CanThrow[Exception] = new CanThrow
     println(baz)
   catch case ex: Fail =>
     println("failed")
diff --git a/tests/run/safeThrowsStrawman2.scala b/tests/run/safeThrowsStrawman2.scala
index 1fa38257c177..1c84d84babc7 100644
--- a/tests/run/safeThrowsStrawman2.scala
+++ b/tests/run/safeThrowsStrawman2.scala
@@ -3,22 +3,22 @@ import language.experimental.erasedDefinitions
 object scalax:
   erased class CanThrow[-E <: Exception]
 
-  infix type throws[R, +E <: Exception] = CanThrow[E] ?=> R
+  infix type raises[R, +E <: Exception] = CanThrow[E] ?=> R
 
   class Fail extends Exception
 
-  def raise[E <: Exception](e: E): Nothing throws E = throw e
+  def raise[E <: Exception](e: E): Nothing raises E = throw e
 
   private class Result[T]:
     var value: T = scala.compiletime.uninitialized
 
-  def try1[R, E <: Exception](body: => R throws E)(c: E => Unit): R =
+  def try1[R, E <: Exception](body: => R raises E)(c: E => Unit): R =
     try2(body)(c) {}
 
-  def try2[R, E <: Exception](body: => R throws E)(c: E => Unit)(f: => Unit): R =
+  def try2[R, E <: Exception](body: => R raises E)(c: E => Unit)(f: => Unit): R =
     val res = new Result[R]
     try
-      given CanThrow[E] = ???
+      given CanThrow[E] = new CanThrow
       res.value = body
     catch c.asInstanceOf[Throwable => Unit]
     finally f
@@ -30,11 +30,11 @@ object scalax:
 
 import scalax._
 
-def foo(x: Boolean): Int throws Fail =
+def foo(x: Boolean): Int raises Fail =
   if x then 1 else raise(Fail())
 
 def bar(x: Boolean)(using CanThrow[Fail]): Int = foo(x)
-def baz: Int throws Exception = foo(false)
+def baz: Int raises Exception = foo(false)
 
 @main def Test =
   try1 {
diff --git a/tests/run/saferExceptions.scala b/tests/run/saferExceptions.scala
new file mode 100644
index 000000000000..c28509ddf7be
--- /dev/null
+++ b/tests/run/saferExceptions.scala
@@ -0,0 +1,34 @@
+import language.experimental.saferExceptions
+
+class Fail extends Exception
+
+def foo(x: Int) =
+  try x match
+    case 1 => throw AssertionError()
+    case 2 => throw Fail()
+    case 3 => throw java.io.IOException()
+    case 4 => throw Exception()
+    case 5 => throw Throwable()
+    case _ => 0
+  catch
+    case ex: AssertionError => 1
+    case ex: Fail => 2
+    case ex: java.io.IOException => 3
+    case ex: Exception => 4
+    case ex: Throwable => 5
+
+def bar(x: Int): Int throws Exception =
+  x match
+    case 1 => throw AssertionError()
+    case 2 => throw Fail()
+    case 3 => throw java.io.IOException()
+    case 4 => throw Exception()
+    case _ => 0
+
+@main def Test =
+  assert(foo(1) + foo(2) + foo(3) + foo(4) + foo(5) + foo(6) == 15)
+  import unsafeExceptions.canThrowAny
+  val x =
+    try bar(2)
+    catch case ex: Fail => 3 // OK
+  assert(x == 3)
diff --git a/tests/run/singleton-ops-flags.scala b/tests/run/singleton-ops-flags.scala
index 667c43251b07..3b8d3c21aaca 100644
--- a/tests/run/singleton-ops-flags.scala
+++ b/tests/run/singleton-ops-flags.scala
@@ -7,8 +7,7 @@ package example {
 
     final val EmptyFlags  = baseFlags
     final val Erased      = EmptyFlags.next
-    final val Internal    = Erased.next
-    final val Inline      = Internal.next
+    final val Inline      = Erased.next
     final val InlineProxy = Inline.next
     final val Opaque      = InlineProxy.next
     final val Scala2x     = Opaque.next
@@ -26,7 +25,6 @@ package example {
       if s == EmptyFlags then "EmptyFlags"
       else s.toSingletonSets[LastFlag].map ( [n <: Int] => (flag: SingletonFlagSet[n]) => flag match {
         case Erased      => "Erased"
-        case Internal    => "Internal"
         case Inline      => "Inline"
         case InlineProxy => "InlineProxy"
         case Opaque      => "Opaque"
diff --git a/tests/run/splice-position.check b/tests/run/splice-position.check
new file mode 100644
index 000000000000..904f7c9c2efd
--- /dev/null
+++ b/tests/run/splice-position.check
@@ -0,0 +1,2 @@
+Test$.main(Test.scala:3)
+Test$.main(Test.scala:4)
diff --git a/tests/run/splice-position/Test.scala b/tests/run/splice-position/Test.scala
new file mode 100644
index 000000000000..0bb354cf0115
--- /dev/null
+++ b/tests/run/splice-position/Test.scala
@@ -0,0 +1,4 @@
+object Test:
+  def main(args: Array[String]) =
+    try assertTrue(1 == 2) catch e => println(e.getStackTrace()(0))
+    try assertTrue(1 == 3) catch e => println(e.getStackTrace()(0))
diff --git a/tests/run/splice-position/macros.scala b/tests/run/splice-position/macros.scala
new file mode 100644
index 000000000000..b575a460b6e5
--- /dev/null
+++ b/tests/run/splice-position/macros.scala
@@ -0,0 +1,7 @@
+import scala.quoted.{Quotes, Expr, quotes}
+
+inline def assertTrue(cond: Boolean) =
+  ${ assertTrueImpl('cond) }
+
+def assertTrueImpl(cond: Expr[Boolean])(using Quotes) =
+  '{ if (!$cond) throw new Error(${'{""}}) }
diff --git a/tests/run/string-switch-defaults-null.check b/tests/run/string-switch-defaults-null.check
new file mode 100644
index 000000000000..4bbcfcf56827
--- /dev/null
+++ b/tests/run/string-switch-defaults-null.check
@@ -0,0 +1,2 @@
+2
+-1
diff --git a/tests/run/string-switch-defaults-null.scala b/tests/run/string-switch-defaults-null.scala
new file mode 100644
index 000000000000..9fc4ce235a2d
--- /dev/null
+++ b/tests/run/string-switch-defaults-null.scala
@@ -0,0 +1,16 @@
+import annotation.switch
+
+object Test {
+  def test(s: String): Int = {
+    (s : @switch) match {
+      case "1" => 0
+      case null => -1
+      case _ => s.toInt
+    }
+  }
+
+  def main(args: Array[String]): Unit = {
+    println(test("2"))
+    println(test(null))
+  }
+}
diff --git a/tests/run/string-switch.check b/tests/run/string-switch.check
new file mode 100644
index 000000000000..7ab6b33ec0ae
--- /dev/null
+++ b/tests/run/string-switch.check
@@ -0,0 +1,29 @@
+fido Success(dog)
+garfield Success(cat)
+wanda Success(fish)
+henry Success(horse)
+felix Failure(scala.MatchError: felix (of class java.lang.String))
+deuteronomy Success(cat)
+=====
+AaAa 2031744 Success(1)
+BBBB 2031744 Success(2)
+BBAa 2031744 Failure(scala.MatchError: BBAa (of class java.lang.String))
+cCCc 3015872 Success(3)
+ddDd 3077408 Success(4)
+EEee 2125120 Failure(scala.MatchError: EEee (of class java.lang.String))
+=====
+A Success(())
+X Failure(scala.MatchError: X (of class java.lang.String))
+=====
+ Success(3)
+null Success(2)
+7 Failure(scala.MatchError: 7 (of class java.lang.String))
+=====
+pig Success(1)
+dog Success(2)
+=====
+Ea 2236 Success(1)
+FB 2236 Success(2)
+cC 3136 Success(3)
+xx 3840 Success(4)
+null 0 Success(4)
diff --git a/tests/run/string-switch.scala b/tests/run/string-switch.scala
new file mode 100644
index 000000000000..6a1522b416d9
--- /dev/null
+++ b/tests/run/string-switch.scala
@@ -0,0 +1,69 @@
+// scalac: -Werror
+import annotation.switch
+import util.Try
+
+object Test extends App {
+
+  def species(name: String) = (name.toLowerCase : @switch) match {
+    case "fido"                     => "dog"
+    case "garfield" | "deuteronomy" => "cat"
+    case "wanda"                    => "fish"
+    case "henry"                    => "horse"
+  }
+  List("fido", "garfield", "wanda", "henry", "felix", "deuteronomy").foreach { n => println(s"$n ${Try(species(n))}") }
+
+  println("=====")
+
+  def collide(in: String) = (in : @switch) match {
+    case "AaAa" => 1
+    case "BBBB" => 2
+    case "cCCc" => 3
+    case x if x == "ddDd" => 4
+  }
+  List("AaAa", "BBBB", "BBAa", "cCCc", "ddDd", "EEee").foreach { s =>
+    println(s"$s ${s.##} ${Try(collide(s))}")
+  }
+
+  println("=====")
+
+  def unitary(in: String) = (in : @switch) match {
+    case "A" =>
+    case x   => throw new MatchError(x)
+  }
+  List("A","X").foreach { s =>
+    println(s"$s ${Try(unitary(s))}")
+  }
+
+  println("=====")
+
+  def nullFun(in: String) = (in : @switch) match {
+    case "1" => 1
+    case null => 2
+    case "" => 3
+  }
+  List("", null, "7").foreach { s =>
+    println(s"$s ${Try(nullFun(s))}")
+  }
+
+  println("=====")
+
+  def default(in: String) = (in : @switch) match {
+    case "pig" => 1
+    case _     => 2
+  }
+  List("pig","dog").foreach { s =>
+    println(s"$s ${Try(default(s))}")
+  }
+
+  println("=====")
+
+  def onceOnly(in: Iterator[String]) = (in.next() : @switch) match {
+    case "Ea" => 1
+    case "FB" => 2 //collision with above
+    case "cC" => 3
+    case _    => 4
+  }
+  List("Ea", "FB", "cC", "xx", null).foreach { s =>
+    println(s"$s ${s.##} ${Try(onceOnly(Iterator(s)))}")
+  }
+}
diff --git a/tests/run/t13418.check b/tests/run/t13418.check
new file mode 100644
index 000000000000..7614df8ec464
--- /dev/null
+++ b/tests/run/t13418.check
@@ -0,0 +1,3 @@
+ok
+ok
+ok
diff --git a/tests/run/t13418.scala b/tests/run/t13418.scala
new file mode 100644
index 000000000000..344bae8a274b
--- /dev/null
+++ b/tests/run/t13418.scala
@@ -0,0 +1,26 @@
+class A { class B }
+val a1 = new A
+val a2 = new A
+val b: Any = new a1.B
+
+class X { class Y[Q] }
+val x1 = new X
+val x2 = new X
+val y: Any = new x1.Y[Int]
+type Foo = [Q] =>> x2.Y[Q]
+type Bar = [Q] =>> x1.Y[Q]
+
+@main def Test() = {
+  b match {
+    case _: a2.B => println("wrong")
+    case _: a1.B => println("ok")
+  }
+  y match {
+    case _: x2.Y[_] => println("wrong")
+    case _: x1.Y[_] => println("ok")
+  }
+  y match {
+    case _: Foo[_] => println("wrong")
+    case _: Bar[_] => println("ok")
+  }
+}
diff --git a/tests/run/t6138-2.check b/tests/run/t6138-2.check
new file mode 100644
index 000000000000..473ecde25dba
--- /dev/null
+++ b/tests/run/t6138-2.check
@@ -0,0 +1 @@
+Foo$Bar was instantiated!
diff --git a/tests/run/t6138-2/JavaClass.java b/tests/run/t6138-2/JavaClass.java
new file mode 100644
index 000000000000..9774c05a0d91
--- /dev/null
+++ b/tests/run/t6138-2/JavaClass.java
@@ -0,0 +1,4 @@
+public class JavaClass {
+    // This is defined in ScalaClass
+    public static final Foo.Bar bar = new Foo.Bar();
+}
\ No newline at end of file
diff --git a/tests/run/t6138-2/ScalaClass.scala b/tests/run/t6138-2/ScalaClass.scala
new file mode 100644
index 000000000000..0528133cbf2c
--- /dev/null
+++ b/tests/run/t6138-2/ScalaClass.scala
@@ -0,0 +1,18 @@
+/* Similar to t10490 -- but defines `Foo` in the object.
+ * Placing this test within t10490 makes it work without a fix, that's why it's independent.
+ * Note that this was already working, we add it to make sure we don't regress
+ */
+
+class Foo
+object Foo {
+  class Bar {
+    override def toString: String = "Foo$Bar was instantiated!"
+  }
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    // JavaClass is the user of the Scala defined classes
+    println(JavaClass.bar)
+  }
+}
\ No newline at end of file
diff --git a/tests/run/t6138/JavaClass.java b/tests/run/t6138/JavaClass.java
new file mode 100644
index 000000000000..08b9e0bd55d4
--- /dev/null
+++ b/tests/run/t6138/JavaClass.java
@@ -0,0 +1,4 @@
+public class JavaClass {
+    // This is defined in ScalaClass
+    public static final Foo.Bar bar = (new Foo()).new Bar();
+}
\ No newline at end of file
diff --git a/tests/run/t6138/ScalaClass.scala b/tests/run/t6138/ScalaClass.scala
new file mode 100644
index 000000000000..da3c682b5033
--- /dev/null
+++ b/tests/run/t6138/ScalaClass.scala
@@ -0,0 +1,13 @@
+class Foo {
+  class Bar {
+    override def toString: String = "Foo$Bar was instantiated!"
+  }
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    // JavaClass is the user of the Scala defined classes
+    println(JavaClass.bar)
+    //println(JavaClass.baz)
+  }
+}
\ No newline at end of file
diff --git a/tests/run/t6238.check b/tests/run/t6238.check
new file mode 100644
index 000000000000..473ecde25dba
--- /dev/null
+++ b/tests/run/t6238.check
@@ -0,0 +1 @@
+Foo$Bar was instantiated!
diff --git a/tests/run/t6476.check b/tests/run/t6476.check
index 69bf68978177..e2a080bcf6dc 100644
--- a/tests/run/t6476.check
+++ b/tests/run/t6476.check
@@ -1,13 +1,18 @@
 "Hello", Alice
 "Hello", Alice
+
+"Hello", Alice
+"Hello", Alice
+
 \"Hello\", Alice
 \"Hello\", Alice
-\"Hello\", Alice
-\"Hello\", Alice
+
 \TILT\
-\\TILT\\
-\\TILT\\
 \TILT\
 \\TILT\\
+
+\TILT\
+\TILT\
 \\TILT\\
+
 \TILT\
diff --git a/tests/run/t6476.scala b/tests/run/t6476.scala
index a04645065a2a..25a1d5f03ec1 100644
--- a/tests/run/t6476.scala
+++ b/tests/run/t6476.scala
@@ -3,21 +3,21 @@ object Test {
     val person = "Alice"
     println(s"\"Hello\", $person")
     println(s"""\"Hello\", $person""")
-
+    println()
     println(f"\"Hello\", $person")
     println(f"""\"Hello\", $person""")
-
+    println()
     println(raw"\"Hello\", $person")
     println(raw"""\"Hello\", $person""")
-
+    println()
     println(s"\\TILT\\")
     println(f"\\TILT\\")
     println(raw"\\TILT\\")
-
+    println()
     println(s"""\\TILT\\""")
     println(f"""\\TILT\\""")
     println(raw"""\\TILT\\""")
-
+    println()
     println(raw"""\TILT\""")
   }
 }
diff --git a/tests/run/tagless.scala b/tests/run/tagless.scala
index 5333c4e30995..5abc32d84578 100644
--- a/tests/run/tagless.scala
+++ b/tests/run/tagless.scala
@@ -103,7 +103,7 @@ object Test extends App {
     private class Exc(msg: String) extends Exception(msg)
     def _throw(msg: String)(using CanThrow): Nothing = throw new Exc(msg)
     def _try[T](op: Maybe[T])(handler: String => T): T = {
-      given CanThrow with {}
+      given CanThrow()
       try op
       catch {
         case ex: Exception => handler(ex.getMessage)
diff --git a/tests/run/tailrec-return.check b/tests/run/tailrec-return.check
new file mode 100644
index 000000000000..361e76d8a285
--- /dev/null
+++ b/tests/run/tailrec-return.check
@@ -0,0 +1,7 @@
+6
+false
+true
+false
+true
+Ada Lovelace, Alan Turing
+List(9, 10)
diff --git a/tests/run/tailrec-return.scala b/tests/run/tailrec-return.scala
new file mode 100644
index 000000000000..aa760960403d
--- /dev/null
+++ b/tests/run/tailrec-return.scala
@@ -0,0 +1,66 @@
+object Test:
+
+  @annotation.tailrec
+  def sum(n: Int, acc: Int = 0): Int =
+    if n != 0 then return sum(n - 1, acc + n)
+    acc
+
+  @annotation.tailrec
+  def isEven(n: Int): Boolean =
+    if n != 0 && n != 1 then return isEven(n - 2)
+    if n == 1 then return false
+    true
+
+  @annotation.tailrec
+  def isEvenApply(n: Int): Boolean =
+    // Return inside an `Apply.fun`
+    (
+      if n != 0 && n != 1 then return isEvenApply(n - 2)
+      else if n == 1 then return false
+      else (x: Boolean) => x
+    )(true)
+
+  @annotation.tailrec
+  def isEvenWhile(n: Int): Boolean =
+    // Return inside a `WhileDo.cond`
+    while(
+      if n != 0 && n != 1 then return isEvenWhile(n - 2)
+      else if n == 1 then return false
+      else true
+    ) {}
+    true
+
+  @annotation.tailrec
+  def isEvenReturn(n: Int): Boolean =
+    // Return inside a `Return`
+    return
+      if n != 0 && n != 1 then return isEvenReturn(n - 2)
+      else if n == 1 then return false
+      else true
+
+  @annotation.tailrec
+  def names(l: List[(String, String) | Null], acc: List[String] = Nil): List[String] =
+    l match
+      case Nil => acc.reverse
+      case x :: xs =>
+        if x == null then return names(xs, acc)
+
+        val displayName = x._1 + " " + x._2
+        names(xs, displayName :: acc)
+
+  def nonTail(l: List[Int]): List[Int] =
+    l match
+      case Nil => Nil
+      case x :: xs =>
+        // The call to nonTail should *not* be eliminated
+        (x + 1) :: nonTail(xs)
+
+
+  def main(args: Array[String]): Unit =
+    println(sum(3))
+    println(isEven(5))
+    println(isEvenApply(6))
+    println(isEvenWhile(7))
+    println(isEvenReturn(8))
+    println(names(List(("Ada",  "Lovelace"), null, ("Alan", "Turing"))).mkString(", "))
+    println(nonTail(List(8, 9)))
diff --git a/tests/run/trailingCommas/trailingCommas.check b/tests/run/trailingCommas.check
similarity index 100%
rename from tests/run/trailingCommas/trailingCommas.check
rename to tests/run/trailingCommas.check
diff --git a/tests/run/trailingCommas/trailingCommas.scala b/tests/run/trailingCommas.scala
similarity index 100%
rename from tests/run/trailingCommas/trailingCommas.scala
rename to tests/run/trailingCommas.scala
diff --git a/tests/run/trait-static-forwarder.check b/tests/run/trait-static-forwarder.check
new file mode 100644
index 000000000000..d81cc0710eb6
--- /dev/null
+++ b/tests/run/trait-static-forwarder.check
@@ -0,0 +1 @@
+42
diff --git a/tests/run/trait-static-forwarder/Test.java b/tests/run/trait-static-forwarder/Test.java
new file mode 100644
index 000000000000..89012c016209
--- /dev/null
+++ b/tests/run/trait-static-forwarder/Test.java
@@ -0,0 +1,5 @@
+public final class Test {
+    public static void main(String... args) {
+        System.out.println(T.foo());
+    }
+}
diff --git a/tests/run/trait-static-forwarder/forwarders.scala b/tests/run/trait-static-forwarder/forwarders.scala
new file mode 100644
index 000000000000..d6ee9a081d02
--- /dev/null
+++ b/tests/run/trait-static-forwarder/forwarders.scala
@@ -0,0 +1,5 @@
+trait T
+
+object T {
+  def foo = 42
+}
diff --git a/tests/semanticdb/expect/Advanced.expect.scala b/tests/semanticdb/expect/Advanced.expect.scala
index d52b8cecf668..0764c11c4dd2 100644
--- a/tests/semanticdb/expect/Advanced.expect.scala
+++ b/tests/semanticdb/expect/Advanced.expect.scala
@@ -11,22 +11,24 @@ class C/*<-advanced::C#*/[T/*<-advanced::C#[T]*/] {
 
 class Structural/*<-advanced::Structural#*/ {
   def s1/*<-advanced::Structural#s1().*/: { val x/*<-local0*/: Int/*->scala::Int#*/ } = ???/*->scala::Predef.`???`().*/
-  def s2/*<-advanced::Structural#s2().*/: { val x/*<-local1*/: Int/*->scala::Int#*/ } = new { val x/*<-local3*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
-  def s3/*<-advanced::Structural#s3().*/: { def m/*<-local4*/(x/*<-local5*/: Int/*->scala::Int#*/): Int/*->scala::Int#*/ } = new { def m/*<-local7*/(x/*<-local8*/: Int/*->scala::Int#*/): Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
+  def s2/*<-advanced::Structural#s2().*/: { val x/*<-local1*/: Int/*->scala::Int#*/ } = new { val x/*<-local2*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
+  def s3/*<-advanced::Structural#s3().*/: { def m/*<-local6*/(x/*<-local5*/: Int/*->scala::Int#*/): Int/*->scala::Int#*/ } = new { def m/*<-local8*/(x/*<-local7*/: Int/*->scala::Int#*/): Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
+  def s4/*<-advanced::Structural#s4().*/(a/*<-advanced::Structural#s4().(a)*/: Int/*->scala::Int#*/): { val x/*<-local11*/: Int/*->scala::Int#*/ } = ???/*->scala::Predef.`???`().*/
 }
 
 class Wildcards/*<-advanced::Wildcards#*/ {
   def e1/*<-advanced::Wildcards#e1().*/: List/*->scala::package.List#*/[_] = ???/*->scala::Predef.`???`().*/
+  def e2/*<-advanced::Wildcards#e2().*/: List/*->scala::package.List#*/[_ <: Int/*->scala::Int#*/] = ???/*->scala::Predef.`???`().*/
 }
 
 object Test/*<-advanced::Test.*/ {
   val s/*<-advanced::Test.s.*/ = new Structural/*->advanced::Structural#*/
   val s1/*<-advanced::Test.s1.*/ = s/*->advanced::Test.s.*/.s1/*->advanced::Structural#s1().*/
-  val s1x/*<-advanced::Test.s1x.*/ = /*->scala::reflect::Selectable.reflectiveSelectable().*/s/*->advanced::Test.s.*/.s1/*->advanced::Structural#s1().*//*->scala::reflect::Selectable#selectDynamic().*/.x
+  val s1x/*<-advanced::Test.s1x.*/ = s/*->advanced::Test.s.*/.s1/*->advanced::Structural#s1().*/.x
   val s2/*<-advanced::Test.s2.*/ = s/*->advanced::Test.s.*/.s2/*->advanced::Structural#s2().*/
-  val s2x/*<-advanced::Test.s2x.*/ = /*->scala::reflect::Selectable.reflectiveSelectable().*/s/*->advanced::Test.s.*/.s2/*->advanced::Structural#s2().*//*->scala::reflect::Selectable#selectDynamic().*/.x
+  val s2x/*<-advanced::Test.s2x.*/ = s/*->advanced::Test.s.*/.s2/*->advanced::Structural#s2().*/.x
   val s3/*<-advanced::Test.s3.*/ = s/*->advanced::Test.s.*/.s3/*->advanced::Structural#s3().*/
-  val s3x/*<-advanced::Test.s3x.*/ = /*->scala::reflect::Selectable.reflectiveSelectable().*/s/*->advanced::Test.s.*/.s3/*->advanced::Structural#s3().*//*->scala::reflect::Selectable#applyDynamic().*/.m(???/*->scala::Predef.`???`().*/)
+  val s3x/*<-advanced::Test.s3x.*/ = s/*->advanced::Test.s.*/.s3/*->advanced::Structural#s3().*/.m(???/*->scala::Predef.`???`().*/)
 
   val e/*<-advanced::Test.e.*/ = new Wildcards/*->advanced::Wildcards#*/
   val e1/*<-advanced::Test.e1.*/ = e/*->advanced::Test.e.*/.e1/*->advanced::Wildcards#e1().*/
@@ -34,9 +36,15 @@ object Test/*<-advanced::Test.*/ {
 
   {
     (???/*->scala::Predef.`???`().*/ : Any/*->scala::Any#*/) match {
-      case e3/*<-local9*/: List/*->scala::package.List#*/[_] =>
-        val e3x/*<-local10*/ = e3/*->local9*/.head/*->scala::collection::IterableOps#head().*/
+      case e3/*<-local12*/: List/*->scala::package.List#*/[_] =>
+        val e3x/*<-local14*/ = e3/*->local12*/.head/*->scala::collection::IterableOps#head().*/
         ()
     }
   }
 }
+
+
+// Curried Type Application
+class HKClass/*<-advanced::HKClass#*/[F/*<-advanced::HKClass#[F]*/ <: [T/*<-advanced::HKClass#`<init>`().[F][T]*/] =>> [U/*<-advanced::HKClass#`<init>`().[F][U]*/] =>> (U/*->advanced::HKClass#`<init>`().[F][U]*/, T/*->advanced::HKClass#`<init>`().[F][T]*/)] {
+  def foo/*<-advanced::HKClass#foo().*/[T/*<-advanced::HKClass#foo().[T]*/,U/*<-advanced::HKClass#foo().[U]*/](x/*<-advanced::HKClass#foo().(x)*/: F/*->advanced::HKClass#[F]*/[T/*->advanced::HKClass#foo().[T]*/][U/*->advanced::HKClass#foo().[U]*/]): String/*->scala::Predef.String#*/ = x/*->advanced::HKClass#foo().(x)*/.toString/*->scala::Tuple2#toString().*/()
+}
diff --git a/tests/semanticdb/expect/Advanced.scala b/tests/semanticdb/expect/Advanced.scala
index 3e14a46cb194..e0439d911c36 100644
--- a/tests/semanticdb/expect/Advanced.scala
+++ b/tests/semanticdb/expect/Advanced.scala
@@ -13,10 +13,12 @@ class Structural {
   def s1: { val x: Int } = ???
   def s2: { val x: Int } = new { val x: Int = ??? }
   def s3: { def m(x: Int): Int } = new { def m(x: Int): Int = ??? }
+  def s4(a: Int): { val x: Int } = ???
 }
 
 class Wildcards {
   def e1: List[_] = ???
+  def e2: List[_ <: Int] = ???
 }
 
 object Test {
@@ -40,3 +42,9 @@ object Test {
     }
   }
 }
+
+
+// Curried Type Application
+class HKClass[F <: [T] =>> [U] =>> (U, T)] {
+  def foo[T,U](x: F[T][U]): String = x.toString()
+}
diff --git a/tests/semanticdb/expect/Annotations.expect.scala b/tests/semanticdb/expect/Annotations.expect.scala
index fb89c0e94abc..2422839c8307 100644
--- a/tests/semanticdb/expect/Annotations.expect.scala
+++ b/tests/semanticdb/expect/Annotations.expect.scala
@@ -21,7 +21,10 @@ class Annotations/*<-annot::Annotations#*/[@TypeParameterAnnotation/*->com::java
 
 class B/*<-annot::B#*/ @ConstructorAnnotation/*->com::javacp::annot::ConstructorAnnotation#*/()(x/*<-annot::B#x.*/: Int/*->scala::Int#*/) {
   @ConstructorAnnotation/*->com::javacp::annot::ConstructorAnnotation#*/
-  def this()/*<-annot::B#`<init>`(+1).*/ = this(42)
+  def this/*<-annot::B#`<init>`(+1).*/() = this(42)
+
+  @throws/*->scala::throws#*/[Exception/*->scala::package.Exception#*/]
+  def throwing/*<-annot::B#throwing().*/ = throw new Exception/*->scala::package.Exception#*/("")
 }
 
 @ObjectAnnotation/*->com::javacp::annot::ObjectAnnotation#*/
diff --git a/tests/semanticdb/expect/Annotations.scala b/tests/semanticdb/expect/Annotations.scala
index 176ced6487e8..0556a2299b80 100644
--- a/tests/semanticdb/expect/Annotations.scala
+++ b/tests/semanticdb/expect/Annotations.scala
@@ -22,6 +22,9 @@ class Annotations[@TypeParameterAnnotation T](@ParameterAnnotation x: T) { self:
 class B @ConstructorAnnotation()(x: Int) {
   @ConstructorAnnotation
   def this() = this(42)
+
+  @throws[Exception]
+  def throwing = throw new Exception("")
 }
 
 @ObjectAnnotation
diff --git a/tests/semanticdb/expect/AnonymousGiven.expect.scala b/tests/semanticdb/expect/AnonymousGiven.expect.scala
index 68800202b6c1..c28b9d5e770d 100644
--- a/tests/semanticdb/expect/AnonymousGiven.expect.scala
+++ b/tests/semanticdb/expect/AnonymousGiven.expect.scala
@@ -2,4 +2,4 @@ package angiven
 
 trait Foo/*<-angiven::Foo#*/
 
-/*<-angiven::AnonymousGiven$package.*/def bar/*<-angiven::AnonymousGiven$package.bar().*/(using Foo/*->angiven::Foo#*/) = 42
\ No newline at end of file
+def bar/*<-angiven::AnonymousGiven$package.bar().*/(using Foo/*->angiven::Foo#*/) = 42
\ No newline at end of file
diff --git a/tests/semanticdb/expect/Classes.expect.scala b/tests/semanticdb/expect/Classes.expect.scala
index af092703c250..a4015d7aa150 100644
--- a/tests/semanticdb/expect/Classes.expect.scala
+++ b/tests/semanticdb/expect/Classes.expect.scala
@@ -1,8 +1,8 @@
 package classes
 import scala.language/*->scala::language.*/.experimental/*->scala::language.experimental.*/.macros/*->scala::language.experimental.macros.*/
-class C1/*<-classes::C1#*/(val x1/*<-classes::C1#x1.*/: Int/*->scala::Int#*/) extends AnyVal/*->scala::AnyVal#*//*->scala::AnyVal#`<init>`().*/
+class C1/*<-classes::C1#*/(val x1/*<-classes::C1#x1.*/: Int/*->scala::Int#*/) extends AnyVal/*->scala::AnyVal#*/
 
-class C2/*<-classes::C2#*/(val x2/*<-classes::C2#x2.*/: Int/*->scala::Int#*/) extends AnyVal/*->scala::AnyVal#*//*->scala::AnyVal#`<init>`().*/
+class C2/*<-classes::C2#*/(val x2/*<-classes::C2#x2.*/: Int/*->scala::Int#*/) extends AnyVal/*->scala::AnyVal#*/
 object C2/*<-classes::C2.*/
 
 case class C3/*<-classes::C3#*/(x/*<-classes::C3#x.*/: Int/*->scala::Int#*/)
@@ -47,10 +47,10 @@ class C12/*<-classes::C12#*/ {
 
 object N/*<-classes::N.*/ {
   val anonClass/*<-classes::N.anonClass.*/ = new C7/*->classes::C7#*/(42) {
-    val local/*<-local1*/ = ???/*->scala::Predef.`???`().*/
+    val local/*<-local0*/ = ???/*->scala::Predef.`???`().*/
   }
-  val anonFun/*<-classes::N.anonFun.*/ = List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/(1).map/*->scala::collection::immutable::List#map().*/ { i/*<-local2*/ =>
-    val local/*<-local3*/ = 2
-    local/*->local3*/ +/*->scala::Int#`+`(+4).*/ 2
+  val anonFun/*<-classes::N.anonFun.*/ = List/*->scala::package.List.*/(1).map/*->scala::collection::immutable::List#map().*/ { i/*<-local3*/ =>
+    val local/*<-local4*/ = 2
+    local/*->local4*/ +/*->scala::Int#`+`(+4).*/ 2
   }
 }
diff --git a/tests/semanticdb/expect/EndMarkers.expect.scala b/tests/semanticdb/expect/EndMarkers.expect.scala
new file mode 100644
index 000000000000..7ace3ceae22f
--- /dev/null
+++ b/tests/semanticdb/expect/EndMarkers.expect.scala
@@ -0,0 +1,59 @@
+package endmarkers:
+
+  class MultiCtor/*<-endmarkers::MultiCtor#*/(val i/*<-endmarkers::MultiCtor#i.*/: Int/*->scala::Int#*/):
+    def this/*<-endmarkers::MultiCtor#`<init>`(+1).*/() =
+      this(23)
+    end this/*->endmarkers::MultiCtor#`<init>`(+1).*/
+  end MultiCtor/*->endmarkers::MultiCtor#*/
+
+  def topLevelMethod/*<-endmarkers::EndMarkers$package.topLevelMethod().*/: String/*->scala::Predef.String#*/ =
+    "hello"
+  end topLevelMethod/*->endmarkers::EndMarkers$package.topLevelMethod().*/
+
+  val topLevelVal/*<-endmarkers::EndMarkers$package.topLevelVal.*/: Int/*->scala::Int#*/ =
+    23
+  end topLevelVal/*->endmarkers::EndMarkers$package.topLevelVal.*/
+
+  var topLevelVar/*<-endmarkers::EndMarkers$package.topLevelVar().*/: String/*->scala::Predef.String#*/ =
+    ""
+  end topLevelVar/*->endmarkers::EndMarkers$package.topLevelVar().*/
+
+  class Container/*<-endmarkers::Container#*/:
+
+    def foo/*<-endmarkers::Container#foo().*/ =
+      (1,2,3)
+    end foo/*->endmarkers::Container#foo().*/
+
+    val bar/*<-endmarkers::Container#bar.*/ =
+      (4,5,6)
+    end bar/*->endmarkers::Container#bar.*/
+
+    var baz/*<-endmarkers::Container#baz().*/ =
+      15
+    end baz/*->endmarkers::Container#baz().*/
+
+  end Container/*->endmarkers::Container#*/
+
+  def topLevelWithLocals/*<-endmarkers::EndMarkers$package.topLevelWithLocals().*/: Unit/*->scala::Unit#*/ =
+
+    val localVal/*<-local0*/ =
+      37
+    end localVal/*->local0*/
+
+    var localVar/*<-local1*/ =
+      43
+    end localVar/*->local1*/
+
+    def localDef/*<-local2*/ =
+      97
+    end localDef/*->local2*/
+
+  end topLevelWithLocals/*->endmarkers::EndMarkers$package.topLevelWithLocals().*/
+
+  object TestObj/*<-endmarkers::TestObj.*/:
+
+    def foo/*<-endmarkers::TestObj.foo().*/ = 23
+
+  end TestObj/*->endmarkers::TestObj.*/
+
+end endmarkers
diff --git a/tests/semanticdb/expect/EndMarkers.scala b/tests/semanticdb/expect/EndMarkers.scala
new file mode 100644
index 000000000000..c7ae04898ebd
--- /dev/null
+++ b/tests/semanticdb/expect/EndMarkers.scala
@@ -0,0 +1,59 @@
+package endmarkers:
+
+  class MultiCtor(val i: Int):
+    def this() =
+      this(23)
+    end this
+  end MultiCtor
+
+  def topLevelMethod: String =
+    "hello"
+  end topLevelMethod
+
+  val topLevelVal: Int =
+    23
+  end topLevelVal
+
+  var topLevelVar: String =
+    ""
+  end topLevelVar
+
+  class Container:
+
+    def foo =
+      (1,2,3)
+    end foo
+
+    val bar =
+      (4,5,6)
+    end bar
+
+    var baz =
+      15
+    end baz
+
+  end Container
+
+  def topLevelWithLocals: Unit =
+
+    val localVal =
+      37
+    end localVal
+
+    var localVar =
+      43
+    end localVar
+
+    def localDef =
+      97
+    end localDef
+
+  end topLevelWithLocals
+
+  object TestObj:
+
+    def foo = 23
+
+  end TestObj
+
+end endmarkers
diff --git a/tests/semanticdb/expect/EndMarkers2.expect.scala b/tests/semanticdb/expect/EndMarkers2.expect.scala
new file mode 100644
index 000000000000..61b8f8093a8e
--- /dev/null
+++ b/tests/semanticdb/expect/EndMarkers2.expect.scala
@@ -0,0 +1,7 @@
+package object endmarkers2/*<-endmarkers2::package.*/:
+
+  type Foo/*<-endmarkers2::package.Foo#*/ =
+    Unit/*->scala::Unit#*/
+  end Foo/*->endmarkers2::package.Foo#*/
+
+end endmarkers2/*->endmarkers2::package.*/
diff --git a/tests/semanticdb/expect/EndMarkers2.scala b/tests/semanticdb/expect/EndMarkers2.scala
new file mode 100644
index 000000000000..377696ca8a79
--- /dev/null
+++ b/tests/semanticdb/expect/EndMarkers2.scala
@@ -0,0 +1,7 @@
+package object endmarkers2:
+
+  type Foo =
+    Unit
+  end Foo
+
+end endmarkers2
diff --git a/tests/semanticdb/expect/Enums.expect.scala b/tests/semanticdb/expect/Enums.expect.scala
index 8d99d98fc6da..3e1dc9087db7 100644
--- a/tests/semanticdb/expect/Enums.expect.scala
+++ b/tests/semanticdb/expect/Enums.expect.scala
@@ -8,7 +8,7 @@ object Enums/*<-_empty_::Enums.*/:
   enum Directions/*<-_empty_::Enums.Directions#*/:
     case North/*<-_empty_::Enums.Directions.North.*/, East/*<-_empty_::Enums.Directions.East.*/, South/*<-_empty_::Enums.Directions.South.*/, West/*<-_empty_::Enums.Directions.West.*/
 
-  enum Suits/*<-_empty_::Enums.Suits#*/ derives /*->scala::CanEqual.derived.*/CanEqual:
+  enum Suits/*<-_empty_::Enums.Suits#*/ derives CanEqual:
     case Hearts/*<-_empty_::Enums.Suits.Hearts.*/, Spades/*<-_empty_::Enums.Suits.Spades.*/, Clubs/*<-_empty_::Enums.Suits.Clubs.*/, Diamonds/*<-_empty_::Enums.Suits.Diamonds.*/
 
   object Suits/*<-_empty_::Enums.Suits.*/:
@@ -47,14 +47,14 @@ object Enums/*<-_empty_::Enums.*/:
     case Refl/*<-_empty_::Enums.`<:<`.Refl#*/[C/*<-_empty_::Enums.`<:<`.Refl#[C]*/]() extends (C/*->_empty_::Enums.`<:<`.Refl#[C]*/ <:</*->_empty_::Enums.`<:<`#*/ C/*->_empty_::Enums.`<:<`.Refl#[C]*/)
 
   object <:</*<-_empty_::Enums.`<:<`.*/ :
-    given /*<-_empty_::Enums.`<:<`.`given_<:<_T_T`().*/[T/*<-_empty_::Enums.`<:<`.`given_<:<_T_T`().[T]*/]: (T/*->_empty_::Enums.`<:<`.`given_<:<_T_T`().[T]*/ <:</*->_empty_::Enums.`<:<`#*/ T/*->_empty_::Enums.`<:<`.`given_<:<_T_T`().[T]*/) = Refl/*->_empty_::Enums.`<:<`.Refl.*//*->_empty_::Enums.`<:<`.Refl.apply().*/()
+    given [T/*<-_empty_::Enums.`<:<`.`given_<:<_T_T`().[T]*/]: (T/*->_empty_::Enums.`<:<`.`given_<:<_T_T`().[T]*/ <:</*->_empty_::Enums.`<:<`#*/ T/*->_empty_::Enums.`<:<`.`given_<:<_T_T`().[T]*/) = Refl/*->_empty_::Enums.`<:<`.Refl.*/()
 
   extension [A/*<-_empty_::Enums.unwrap().[A]*/, B/*<-_empty_::Enums.unwrap().[B]*/](opt/*<-_empty_::Enums.unwrap().(opt)*/: Option/*->scala::Option#*/[A/*->_empty_::Enums.unwrap().[A]*/]) def unwrap/*<-_empty_::Enums.unwrap().*/(using ev/*<-_empty_::Enums.unwrap().(ev)*/: A/*->_empty_::Enums.unwrap().[A]*/ <:</*->_empty_::Enums.`<:<`#*/ Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/]): Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/] = ev/*->_empty_::Enums.unwrap().(ev)*/ match
-    case Refl/*->_empty_::Enums.`<:<`.Refl.*//*->_empty_::Enums.`<:<`.Refl.unapply().*/() => opt/*->_empty_::Enums.unwrap().(opt)*/.flatMap/*->scala::Option#flatMap().*/(identity/*->scala::Predef.identity().*//*->local0*/[Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/]])
+    case Refl/*->_empty_::Enums.`<:<`.Refl.*/() => opt/*->_empty_::Enums.unwrap().(opt)*/.flatMap/*->scala::Option#flatMap().*/(identity/*->scala::Predef.identity().*/[Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/]])
 
-  val some1/*<-_empty_::Enums.some1.*/ = Some/*->scala::Some.*//*->scala::Some.apply().*/(Some/*->scala::Some.*//*->scala::Some.apply().*/(1)).unwrap/*->_empty_::Enums.unwrap().*//*->_empty_::Enums.`<:<`.`given_<:<_T_T`().*/
+  val some1/*<-_empty_::Enums.some1.*/ = Some/*->scala::Some.*/(Some/*->scala::Some.*/(1)).unwrap/*->_empty_::Enums.unwrap().*/
 
-  enum Planet/*<-_empty_::Enums.Planet#*/(mass/*<-_empty_::Enums.Planet#mass.*/: Double/*->scala::Double#*/, radius/*<-_empty_::Enums.Planet#radius.*/: Double/*->scala::Double#*/) extends Enum/*->java::lang::Enum#*/[Planet/*->_empty_::Enums.Planet#*/]/*->java::lang::Enum#`<init>`().*/:
+  enum Planet/*<-_empty_::Enums.Planet#*/(mass/*<-_empty_::Enums.Planet#mass.*/: Double/*->scala::Double#*/, radius/*<-_empty_::Enums.Planet#radius.*/: Double/*->scala::Double#*/) extends Enum/*->java::lang::Enum#*/[Planet/*->_empty_::Enums.Planet#*/]:
     private final val G/*<-_empty_::Enums.Planet#G.*/ = 6.67300E-11
     def surfaceGravity/*<-_empty_::Enums.Planet#surfaceGravity().*/ = G/*->_empty_::Enums.Planet#G.*/ */*->scala::Double#`*`(+6).*/ mass/*->_empty_::Enums.Planet#mass.*/ //*->scala::Double#`::`(+6).*/ (radius/*->_empty_::Enums.Planet#radius.*/ */*->scala::Double#`*`(+6).*/ radius/*->_empty_::Enums.Planet#radius.*/)
     def surfaceWeight/*<-_empty_::Enums.Planet#surfaceWeight().*/(otherMass/*<-_empty_::Enums.Planet#surfaceWeight().(otherMass)*/: Double/*->scala::Double#*/) = otherMass/*->_empty_::Enums.Planet#surfaceWeight().(otherMass)*/ */*->scala::Double#`*`(+6).*/ surfaceGravity/*->_empty_::Enums.Planet#surfaceGravity().*/
diff --git a/tests/semanticdb/expect/EtaExpansion.expect.scala b/tests/semanticdb/expect/EtaExpansion.expect.scala
index 55207ffa5ff2..76a99f66ad1b 100644
--- a/tests/semanticdb/expect/EtaExpansion.expect.scala
+++ b/tests/semanticdb/expect/EtaExpansion.expect.scala
@@ -1,6 +1,6 @@
 package example
 
 class EtaExpansion/*<-example::EtaExpansion#*/ {
-  Some/*->scala::Some.*//*->scala::Some.apply().*/(1).map/*->scala::Option#map().*/(identity/*->scala::Predef.identity().*//*->local0*/)
-  List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/(1).foldLeft/*->scala::collection::LinearSeqOps#foldLeft().*/("")(_ +/*->java::lang::String#`+`().*/ _)
+  Some/*->scala::Some.*/(1).map/*->scala::Option#map().*/(identity/*->scala::Predef.identity().*/)
+  List/*->scala::package.List.*/(1).foldLeft/*->scala::collection::LinearSeqOps#foldLeft().*/("")(_ +/*->java::lang::String#`+`().*/ _)
 }
diff --git a/tests/semanticdb/expect/Example.expect.scala b/tests/semanticdb/expect/Example.expect.scala
index 8ee4cedeae41..5a6513ce1645 100644
--- a/tests/semanticdb/expect/Example.expect.scala
+++ b/tests/semanticdb/expect/Example.expect.scala
@@ -3,9 +3,9 @@ package example
 import scala.concurrent.Future/*->scala::concurrent::Future.*//*->scala::concurrent::Future#*/
 
 object Example/*<-example::Example.*/ { self/*<-local0*/ =>
-  new scala.collection.mutable.Stack/*->scala::collection::mutable::Stack#*/[Int/*->scala::Int#*/]/*->scala::collection::mutable::Stack#`<init>`(+1).*/()
+  new scala.collection.mutable.Stack/*->scala::collection::mutable::Stack#*/[Int/*->scala::Int#*/]()
   def main/*<-example::Example.main().*/(args/*<-example::Example.main().(args)*/: Array/*->scala::Array#*/[String/*->scala::Predef.String#*/]): Unit/*->scala::Unit#*/ = {
     println/*->scala::Predef.println(+1).*/(1)
   }
-  val x/*<-example::Example.x.*/ = scala.reflect.classTag/*->scala::reflect::package.classTag().*/[Int/*->scala::Int#*/]/*->scala::reflect::ClassTag.apply().*/
+  val x/*<-example::Example.x.*/ = scala.reflect.classTag/*->scala::reflect::package.classTag().*/[Int/*->scala::Int#*/]
 }
diff --git a/tests/semanticdb/expect/Extension.expect.scala b/tests/semanticdb/expect/Extension.expect.scala
index d96dcd4c87c8..b40e965d4885 100644
--- a/tests/semanticdb/expect/Extension.expect.scala
+++ b/tests/semanticdb/expect/Extension.expect.scala
@@ -1,9 +1,18 @@
 package ext
 
-/*<-ext::Extension$package.*/extension (s/*<-ext::Extension$package.foo().(s)*//*<-ext::Extension$package.`#*#`().(s)*/: String/*->scala::Predef.String#*/)
+extension (s/*<-ext::Extension$package.foo().(s)*//*<-ext::Extension$package.`#*#`().(s)*/: String/*->scala::Predef.String#*/)
   def foo/*<-ext::Extension$package.foo().*/: Int/*->scala::Int#*/ = 42
-  def #*#/*<-ext::Extension$package.`#*#`().*/ (i/*<-ext::Extension$package.`#*#`().(i)*/: Int/*->scala::Int#*/): (String/*->scala::Predef.String#*/, Int/*->scala::Int#*/) = (/*->scala::Tuple2.apply().*/s/*->ext::Extension$package.`#*#`().(s)*/, i/*->ext::Extension$package.`#*#`().(i)*/)
+  def #*#/*<-ext::Extension$package.`#*#`().*/ (i/*<-ext::Extension$package.`#*#`().(i)*/: Int/*->scala::Int#*/): (String/*->scala::Predef.String#*/, Int/*->scala::Int#*/) = (s/*->ext::Extension$package.`#*#`().(s)*/, i/*->ext::Extension$package.`#*#`().(i)*/)
 
 val a/*<-ext::Extension$package.a.*/ = "asd".foo/*->ext::Extension$package.foo().*/
 
-val c/*<-ext::Extension$package.c.*/ = "foo" #*#/*->ext::Extension$package.`#*#`().*/ 23
\ No newline at end of file
+val c/*<-ext::Extension$package.c.*/ = "foo" #*#/*->ext::Extension$package.`#*#`().*/ 23
+
+trait Read/*<-ext::Read#*/[+T/*<-ext::Read#[T]*/]:
+  def fromString/*<-ext::Read#fromString().*/(s/*<-ext::Read#fromString().(s)*/: String/*->scala::Predef.String#*/): Option/*->scala::Option#*/[T/*->ext::Read#[T]*/]
+
+extension (s/*<-ext::Extension$package.readInto().(s)*/: String/*->scala::Predef.String#*/)
+  def readInto/*<-ext::Extension$package.readInto().*/[T/*<-ext::Extension$package.readInto().[T]*/](using Read/*->ext::Read#*/[T/*->ext::Extension$package.readInto().[T]*/]): Option/*->scala::Option#*/[T/*->ext::Extension$package.readInto().[T]*/] = summon/*->scala::Predef.summon().*/[Read/*->ext::Read#*/[T/*->ext::Extension$package.readInto().[T]*/]].fromString/*->ext::Read#fromString().*/(s/*->ext::Extension$package.readInto().(s)*/)
+
+trait Functor/*<-ext::Functor#*/[F/*<-ext::Functor#[F]*/[_]]:
+  extension [T/*<-ext::Functor#map().[T]*/](t/*<-ext::Functor#map().(t)*/: F/*->ext::Functor#[F]*/[T/*->ext::Functor#map().[T]*/]) def map/*<-ext::Functor#map().*/[U/*<-ext::Functor#map().[U]*/](f/*<-ext::Functor#map().(f)*/: T/*->ext::Functor#map().[T]*/ => U/*->ext::Functor#map().[U]*/): F/*->ext::Functor#[F]*/[U/*->ext::Functor#map().[U]*/]
diff --git a/tests/semanticdb/expect/Extension.scala b/tests/semanticdb/expect/Extension.scala
index 5b9c3e5f21ab..c204b1ff7fcc 100644
--- a/tests/semanticdb/expect/Extension.scala
+++ b/tests/semanticdb/expect/Extension.scala
@@ -6,4 +6,13 @@ extension (s: String)
 
 val a = "asd".foo
 
-val c = "foo" #*# 23
\ No newline at end of file
+val c = "foo" #*# 23
+
+trait Read[+T]:
+  def fromString(s: String): Option[T]
+
+extension (s: String)
+  def readInto[T](using Read[T]): Option[T] = summon[Read[T]].fromString(s)
+
+trait Functor[F[_]]:
+  extension [T](t: F[T]) def map[U](f: T => U): F[U]
diff --git a/tests/semanticdb/expect/ForComprehension.expect.scala b/tests/semanticdb/expect/ForComprehension.expect.scala
index c4d3340bc84c..815b7a93518d 100644
--- a/tests/semanticdb/expect/ForComprehension.expect.scala
+++ b/tests/semanticdb/expect/ForComprehension.expect.scala
@@ -2,39 +2,39 @@ package example
 
 class ForComprehension/*<-example::ForComprehension#*/ {
   for {
-    a/*<-local0*/ <- List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/(1)/*->scala::collection::immutable::List#flatMap().*/
-    b/*<-local1*//*->scala::Tuple2.apply().*//*->local1*//*->local3*//*->scala::Tuple2.unapply().*/ <- List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/(1)/*->scala::collection::IterableOps#withFilter().*/
-    if b/*->local1*/ >/*->scala::Int#`>`(+3).*/ 1/*->scala::collection::WithFilter#map().*/
-    c/*<-local2*//*->local2*/ = a/*->local0*/ +/*->scala::Int#`+`(+4).*/ b/*->local1*//*->scala::collection::immutable::List#map().*/
-  } yield (/*->scala::Tuple3.apply().*/a/*->local0*/, b/*->local1*/, c/*->local2*/)
+    a/*<-local0*/ <- List/*->scala::package.List.*/(1)
+    b/*<-local1*//*->local1*/ <- List/*->scala::package.List.*/(1)
+    if b/*->local1*/ >/*->scala::Int#`>`(+3).*/ 1
+    c/*<-local2*//*->local2*/ = a/*->local0*/ +/*->scala::Int#`+`(+4).*/ b/*->local1*/
+  } yield (a/*->local0*/, b/*->local1*/, c/*->local2*/)
   for {
-    a/*<-local4*/ <- List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/(1)/*->scala::collection::immutable::List#flatMap().*/
-    b/*<-local5*/ <- List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/(a/*->local4*/)/*->scala::collection::IterableOps#withFilter().*/
+    a/*<-local4*/ <- List/*->scala::package.List.*/(1)
+    b/*<-local5*/ <- List/*->scala::package.List.*/(a/*->local4*/)
     if (
-      /*->scala::Tuple2.apply().*/a/*->local4*/,
+      a/*->local4*/,
       b/*->local5*/
-    ) ==/*->scala::Any#`==`().*/ (/*->scala::Tuple2.apply().*/1, 2)/*->scala::collection::WithFilter#flatMap().*/
-    /*->local6*//*->scala::Tuple2.unapply().*/(
-      /*->scala::Tuple2.unapply().*/c/*<-local7*/,
+    ) ==/*->scala::Any#`==`().*/ (1, 2)
+    (
+      c/*<-local7*/,
       d/*<-local8*/
-    ) <- List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/((/*->scala::Tuple2.apply().*/a/*->local4*/, b/*->local5*/))/*->scala::collection::WithFilter#withFilter().*//*->scala::collection::IterableOps#withFilter().*/
+    ) <- List/*->scala::package.List.*/((a/*->local4*/, b/*->local5*/))
     if (
-      /*->scala::Tuple4.apply().*/a/*->local4*/,
+      a/*->local4*/,
       b/*->local5*/,
       c/*->local7*/,
       d/*->local8*/
-    ) ==/*->scala::Any#`==`().*/ (/*->scala::Tuple4.apply().*/1, 2, 3, 4)/*->scala::collection::WithFilter#map().*/
-    e/*<-local9*//*->scala::Tuple2.apply().*//*->local9*/ = (
-      /*->scala::Tuple4.apply().*/a/*->local4*/,
+    ) ==/*->scala::Any#`==`().*/ (1, 2, 3, 4)
+    e/*<-local9*//*->local9*/ = (
+      a/*->local4*/,
       b/*->local5*/,
       c/*->local7*/,
       d/*->local8*/
-    )/*->scala::collection::IterableOps#withFilter().*/
-    if e/*->local9*/ ==/*->scala::Any#`==`().*/ (/*->scala::Tuple4.apply().*/1, 2, 3, 4)/*->scala::collection::WithFilter#flatMap().*/
-    f/*<-local10*/ <- List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/(e/*->local9*/)/*->scala::collection::immutable::List#map().*/
+    )
+    if e/*->local9*/ ==/*->scala::Any#`==`().*/ (1, 2, 3, 4)
+    f/*<-local10*/ <- List/*->scala::package.List.*/(e/*->local9*/)
   } yield {
     (
-      /*->scala::Tuple6.apply().*/a/*->local4*/,
+      a/*->local4*/,
       b/*->local5*/,
       c/*->local7*/,
       d/*->local8*/,
diff --git a/tests/semanticdb/expect/Givens.expect.scala b/tests/semanticdb/expect/Givens.expect.scala
index 35ef1d7c3cf9..5d7a9f5dc798 100644
--- a/tests/semanticdb/expect/Givens.expect.scala
+++ b/tests/semanticdb/expect/Givens.expect.scala
@@ -4,11 +4,11 @@ package b
 object Givens/*<-a::b::Givens.*/:
 
   extension [A/*<-a::b::Givens.sayHello().[A]*/](any/*<-a::b::Givens.sayHello().(any)*/: A/*->a::b::Givens.sayHello().[A]*/)
-    def sayHello/*<-a::b::Givens.sayHello().*/ = s"/*->scala::StringContext.apply().*/Hello, I am $any/*->a::b::Givens.sayHello().(any)*/"/*->scala::StringContext#s().*/
+    def sayHello/*<-a::b::Givens.sayHello().*/ = s"Hello, I am $any/*->a::b::Givens.sayHello().(any)*/"/*->scala::StringContext#s().*/
 
   extension [B/*<-a::b::Givens.sayGoodbye().[B]*//*<-a::b::Givens.saySoLong().[B]*/](any/*<-a::b::Givens.sayGoodbye().(any)*//*<-a::b::Givens.saySoLong().(any)*/: B/*->a::b::Givens.sayGoodbye().[B]*//*->a::b::Givens.saySoLong().[B]*/)
-    def sayGoodbye/*<-a::b::Givens.sayGoodbye().*/ = s"/*->scala::StringContext.apply().*/Goodbye, from $any/*->a::b::Givens.sayGoodbye().(any)*/"/*->scala::StringContext#s().*/
-    def saySoLong/*<-a::b::Givens.saySoLong().*/ = s"/*->scala::StringContext.apply().*/So Long, from $any/*->a::b::Givens.saySoLong().(any)*/"/*->scala::StringContext#s().*/
+    def sayGoodbye/*<-a::b::Givens.sayGoodbye().*/ = s"Goodbye, from $any/*->a::b::Givens.sayGoodbye().(any)*/"/*->scala::StringContext#s().*/
+    def saySoLong/*<-a::b::Givens.saySoLong().*/ = s"So Long, from $any/*->a::b::Givens.saySoLong().(any)*/"/*->scala::StringContext#s().*/
 
   val hello1/*<-a::b::Givens.hello1.*/ = 1.sayHello/*->a::b::Givens.sayHello().*/
   val goodbye1/*<-a::b::Givens.goodbye1.*/ = 1.sayGoodbye/*->a::b::Givens.sayGoodbye().*/
@@ -18,7 +18,7 @@ object Givens/*<-a::b::Givens.*/:
     def empty/*<-a::b::Givens.Monoid#empty().*/: A/*->a::b::Givens.Monoid#[A]*/
     extension (x/*<-a::b::Givens.Monoid#combine().(x)*/: A/*->a::b::Givens.Monoid#[A]*/) def combine/*<-a::b::Givens.Monoid#combine().*/(y/*<-a::b::Givens.Monoid#combine().(y)*/: A/*->a::b::Givens.Monoid#[A]*/): A/*->a::b::Givens.Monoid#[A]*/
 
-  given Monoid[String] with/*<-a::b::Givens.given_Monoid_String.*//*->a::b::Givens.Monoid#*//*->scala::Predef.String#*/
+  given Monoid/*->a::b::Givens.Monoid#*/[String/*->scala::Predef.String#*/] with
     def empty/*<-a::b::Givens.given_Monoid_String.empty().*/ = ""
     extension (x/*<-a::b::Givens.given_Monoid_String.combine().(x)*/: String/*->scala::Predef.String#*/) def combine/*<-a::b::Givens.given_Monoid_String.combine().*/(y/*<-a::b::Givens.given_Monoid_String.combine().(y)*/: String/*->scala::Predef.String#*/) = x/*->a::b::Givens.given_Monoid_String.combine().(x)*/ +/*->java::lang::String#`+`().*/ y/*->a::b::Givens.given_Monoid_String.combine().(y)*/
 
diff --git a/tests/semanticdb/expect/ImplicitConversion.expect.scala b/tests/semanticdb/expect/ImplicitConversion.expect.scala
index e5309ca26467..635ffb4d94c9 100644
--- a/tests/semanticdb/expect/ImplicitConversion.expect.scala
+++ b/tests/semanticdb/expect/ImplicitConversion.expect.scala
@@ -9,29 +9,29 @@ class ImplicitConversion/*<-example::ImplicitConversion#*/ {
   ): Int/*->scala::Int#*/ = 42
   val message/*<-example::ImplicitConversion#message.*/ = ""
   val number/*<-example::ImplicitConversion#number.*/ = 42
-  val tuple/*<-example::ImplicitConversion#tuple.*/ = (/*->scala::Tuple2.apply().*/1, 2)
+  val tuple/*<-example::ImplicitConversion#tuple.*/ = (1, 2)
   val char/*<-example::ImplicitConversion#char.*/: Char/*->scala::Char#*/ = 'a'
 
   // extension methods
-  /*->scala::Predef.augmentString().*/message/*->example::ImplicitConversion#message.*/
+  message/*->example::ImplicitConversion#message.*/
     .stripSuffix/*->scala::collection::StringOps#stripSuffix().*/("h")
-  /*->example::ImplicitConversion.newAny2stringadd().*/tuple/*->example::ImplicitConversion#tuple.*/ +/*->example::ImplicitConversion.newAny2stringadd#`+`().*/ "Hello"
+  tuple/*->example::ImplicitConversion#tuple.*/ +/*->example::ImplicitConversion.newAny2stringadd#`+`().*/ "Hello"
 
   // implicit conversions
-  val x/*<-example::ImplicitConversion#x.*/: Int/*->scala::Int#*/ = /*->example::ImplicitConversion#string2Number().*/message/*->example::ImplicitConversion#message.*/
+  val x/*<-example::ImplicitConversion#x.*/: Int/*->scala::Int#*/ = message/*->example::ImplicitConversion#message.*/
 
   // interpolators
-  s"/*->scala::StringContext.apply().*/Hello $message/*->example::ImplicitConversion#message.*/ $number/*->example::ImplicitConversion#number.*/"/*->scala::StringContext#s().*/
-  /*->scala::Predef.augmentString().*/s"""/*->scala::StringContext.apply().*/Hello
+  s"Hello $message/*->example::ImplicitConversion#message.*/ $number/*->example::ImplicitConversion#number.*/"/*->scala::StringContext#s().*/
+  s"""Hello
      |$message/*->example::ImplicitConversion#message.*/
      |$number/*->example::ImplicitConversion#number.*/"""/*->scala::StringContext#s().*/.stripMargin/*->scala::collection::StringOps#stripMargin(+1).*/
 
-  val a/*<-example::ImplicitConversion#a.*/: Int/*->scala::Int#*/ = /*->scala::Char.char2int().*/char/*->example::ImplicitConversion#char.*/
-  val b/*<-example::ImplicitConversion#b.*/: Long/*->scala::Long#*/ = /*->scala::Char.char2long().*/char/*->example::ImplicitConversion#char.*/
+  val a/*<-example::ImplicitConversion#a.*/: Int/*->scala::Int#*/ = char/*->example::ImplicitConversion#char.*/
+  val b/*<-example::ImplicitConversion#b.*/: Long/*->scala::Long#*/ = char/*->example::ImplicitConversion#char.*/
 }
 
 object ImplicitConversion/*<-example::ImplicitConversion.*/ {
-  implicit final class newAny2stringadd/*<-example::ImplicitConversion.newAny2stringadd#*/[A/*<-example::ImplicitConversion.newAny2stringadd#[A]*/](private val self/*<-example::ImplicitConversion.newAny2stringadd#self.*/: A/*->example::ImplicitConversion.newAny2stringadd#[A]*/) extends AnyVal/*->scala::AnyVal#*//*->scala::AnyVal#`<init>`().*/ {
+  implicit final class newAny2stringadd/*<-example::ImplicitConversion.newAny2stringadd#*/[A/*<-example::ImplicitConversion.newAny2stringadd#[A]*/](private val self/*<-example::ImplicitConversion.newAny2stringadd#self.*/: A/*->example::ImplicitConversion.newAny2stringadd#[A]*/) extends AnyVal/*->scala::AnyVal#*/ {
     def +/*<-example::ImplicitConversion.newAny2stringadd#`+`().*/(other/*<-example::ImplicitConversion.newAny2stringadd#`+`().(other)*/: String/*->scala::Predef.String#*/): String/*->scala::Predef.String#*/ = String/*->java::lang::String#*/.valueOf/*->java::lang::String#valueOf().*/(self/*->example::ImplicitConversion.newAny2stringadd#self.*/) +/*->java::lang::String#`+`().*/ other/*->example::ImplicitConversion.newAny2stringadd#`+`().(other)*/
   }
 }
diff --git a/tests/semanticdb/expect/Imports.expect.scala b/tests/semanticdb/expect/Imports.expect.scala
index 87f7d4cb768f..420545fc02c9 100644
--- a/tests/semanticdb/expect/Imports.expect.scala
+++ b/tests/semanticdb/expect/Imports.expect.scala
@@ -1 +1,4 @@
 import scala.util.control.NonFatal/*->scala::util::control::NonFatal.*/
+import scala.collection.immutable.{HashMap/*->scala::collection::immutable::HashMap.*//*->scala::collection::immutable::HashMap#*/ as HM}
+
+val m/*<-_empty_::Imports$package.m.*/: HM/*->scala::collection::immutable::HashMap#*/[Int/*->scala::Int#*/, Int/*->scala::Int#*/] = HM/*->scala::collection::immutable::HashMap.*/[Int/*->scala::Int#*/, Int/*->scala::Int#*/]()
diff --git a/tests/semanticdb/expect/Imports.scala b/tests/semanticdb/expect/Imports.scala
index e6a2bef1a5c4..611c008ec20c 100644
--- a/tests/semanticdb/expect/Imports.scala
+++ b/tests/semanticdb/expect/Imports.scala
@@ -1 +1,4 @@
 import scala.util.control.NonFatal
+import scala.collection.immutable.{HashMap as HM}
+
+val m: HM[Int, Int] = HM[Int, Int]()
diff --git a/tests/semanticdb/expect/InstrumentTyper.expect.scala b/tests/semanticdb/expect/InstrumentTyper.expect.scala
index fdce47af0a20..5ed05aa56192 100644
--- a/tests/semanticdb/expect/InstrumentTyper.expect.scala
+++ b/tests/semanticdb/expect/InstrumentTyper.expect.scala
@@ -6,7 +6,7 @@ import scala.language/*->scala::language.*/.higherKinds/*->scala::language.highe
 import types.Test/*->types::Test.*/.*
 
 class InstrumentTyper/*<-example::InstrumentTyper#*/ { self/*<-local0*/: AnyRef/*->scala::AnyRef#*/ =>
-  def all/*<-example::InstrumentTyper#all().*/ = List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/(
+  def all/*<-example::InstrumentTyper#all().*/ = List/*->scala::package.List.*/(
     Literal/*->types::Test.Literal.*/.int/*->types::Test.Literal.int.*/,
     Literal/*->types::Test.Literal.*/.long/*->types::Test.Literal.long.*/,
     Literal/*->types::Test.Literal.*/.float/*->types::Test.Literal.float.*/,
@@ -18,7 +18,7 @@ class InstrumentTyper/*<-example::InstrumentTyper#*/ { self/*<-local0*/: AnyRef/
     Literal/*->types::Test.Literal.*/.unit/*->types::Test.Literal.unit.*/,
     Literal/*->types::Test.Literal.*/.javaEnum/*->types::Test.Literal.javaEnum.*/,
     Literal/*->types::Test.Literal.*/.clazzOf/*->types::Test.Literal.clazzOf.*/,
-    List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/()
+    List/*->scala::package.List.*/()
   )
   type AnnotatedType/*<-example::InstrumentTyper#AnnotatedType#*/ = Int/*->scala::Int#*/ @param/*->scala::annotation::meta::param#*/
   def singletonType/*<-example::InstrumentTyper#singletonType().*/(x/*<-example::InstrumentTyper#singletonType().(x)*/: Predef/*->scala::Predef.*/.type) = ???/*->scala::Predef.`???`().*/
diff --git a/tests/semanticdb/expect/InventedNames.expect.scala b/tests/semanticdb/expect/InventedNames.expect.scala
index 5ff2f20213bd..7c5b008209c2 100644
--- a/tests/semanticdb/expect/InventedNames.expect.scala
+++ b/tests/semanticdb/expect/InventedNames.expect.scala
@@ -11,16 +11,16 @@ trait Z/*<-givens::Z#*/[T/*<-givens::Z#[T]*/]:
 
 
 
-/*<-givens::InventedNames$package.*/given intValue/*<-givens::InventedNames$package.intValue.*/: Int/*->scala::Int#*/ = 4
-given /*<-givens::InventedNames$package.given_String.*/String/*->scala::Predef.String#*/ = "str"
-given /*<-givens::InventedNames$package.given_Double().*/(using Int/*->scala::Int#*/): Double/*->scala::Double#*/ = 4.0
-given /*<-givens::InventedNames$package.given_List_T().*/[T/*<-givens::InventedNames$package.given_List_T().[T]*/]: List/*->scala::package.List#*/[T/*->givens::InventedNames$package.given_List_T().[T]*/] = Nil/*->scala::package.Nil.*/
+given intValue/*<-givens::InventedNames$package.intValue.*/: Int/*->scala::Int#*/ = 4
+given String/*->scala::Predef.String#*/ = "str"
+given (using Int/*->scala::Int#*/): Double/*->scala::Double#*/ = 4.0
+given [T/*<-givens::InventedNames$package.given_List_T().[T]*/]: List/*->scala::package.List#*/[T/*->givens::InventedNames$package.given_List_T().[T]*/] = Nil/*->scala::package.Nil.*/
 given given_Char/*<-givens::InventedNames$package.given_Char.*/: Char/*->scala::Char#*/ = '?'
 given `given_Float/*<-givens::InventedNames$package.given_Float.*/`: Float/*->scala::Float#*/ = 3.0
 given `* */*<-givens::InventedNames$package.`* *`.*/`: Long/*->scala::Long#*/ = 5
 
-given X with
-/*<-givens::InventedNames$package.given_X.*//*->givens::X#*/  def doX/*<-givens::InventedNames$package.given_X.doX().*/ = 7
+given X/*->givens::X#*/ with
+  def doX/*<-givens::InventedNames$package.given_X.doX().*/ = 7
 
 given (using X/*->givens::X#*/): Y/*->givens::Y#*/ with
   def doY/*<-givens::InventedNames$package.given_Y#doY().*/ = "7"
@@ -32,11 +32,11 @@ given [T/*<-givens::InventedNames$package.given_Z_T#[T]*/]: Z/*->givens::Z#*/[T/
 
 val a/*<-givens::InventedNames$package.a.*/ = intValue/*->givens::InventedNames$package.intValue.*/
 val b/*<-givens::InventedNames$package.b.*/ = given_String/*->givens::InventedNames$package.given_String.*/
-val c/*<-givens::InventedNames$package.c.*/ = given_Double/*->givens::InventedNames$package.given_Double().*//*->givens::InventedNames$package.intValue.*/
+val c/*<-givens::InventedNames$package.c.*/ = given_Double/*->givens::InventedNames$package.given_Double().*/
 val d/*<-givens::InventedNames$package.d.*/ = given_List_T/*->givens::InventedNames$package.given_List_T().*/[Int/*->scala::Int#*/]
 val e/*<-givens::InventedNames$package.e.*/ = given_Char/*->givens::InventedNames$package.given_Char.*/
 val f/*<-givens::InventedNames$package.f.*/ = given_Float/*->givens::InventedNames$package.given_Float.*/
 val g/*<-givens::InventedNames$package.g.*/ = `* *`/*->givens::InventedNames$package.`* *`.*/
 val x/*<-givens::InventedNames$package.x.*/ = given_X/*->givens::InventedNames$package.given_X.*/
-val y/*<-givens::InventedNames$package.y.*/ = given_Y/*->givens::InventedNames$package.given_Y().*//*->givens::InventedNames$package.given_X.*/
-val z/*<-givens::InventedNames$package.z.*/ = given_Z_T/*->givens::InventedNames$package.given_Z_T().*/[String/*->scala::Predef.String#*/]
\ No newline at end of file
+val y/*<-givens::InventedNames$package.y.*/ = given_Y/*->givens::InventedNames$package.given_Y().*/
+val z/*<-givens::InventedNames$package.z.*/ = given_Z_T/*->givens::InventedNames$package.given_Z_T().*/[String/*->scala::Predef.String#*/]
diff --git a/tests/semanticdb/expect/InventedNames.scala b/tests/semanticdb/expect/InventedNames.scala
index 3858f22c8331..42c14c90e370 100644
--- a/tests/semanticdb/expect/InventedNames.scala
+++ b/tests/semanticdb/expect/InventedNames.scala
@@ -39,4 +39,4 @@ val f = given_Float
 val g = `* *`
 val x = given_X
 val y = given_Y
-val z = given_Z_T[String]
\ No newline at end of file
+val z = given_Z_T[String]
diff --git a/tests/semanticdb/expect/Issue1749.expect.scala b/tests/semanticdb/expect/Issue1749.expect.scala
index b047b771e9ea..19fe1a14ad36 100644
--- a/tests/semanticdb/expect/Issue1749.expect.scala
+++ b/tests/semanticdb/expect/Issue1749.expect.scala
@@ -6,11 +6,11 @@ import scala.math.Ordered/*->scala::math::Ordered.*/.orderingToOrdered/*->scala:
 class Issue1749/*<-example::Issue1749#*/ {
   val x1/*<-example::Issue1749#x1.*/ = 42
   val x2/*<-example::Issue1749#x2.*/ = 42
-  /*->scala::math::Ordered.orderingToOrdered().*/(/*->scala::Tuple2.apply().*/x1/*->example::Issue1749#x1.*/, x1/*->example::Issue1749#x1.*/)/*->scala::math::Ordering.Tuple2().*//*->scala::math::Ordering.Int.*/
-    .compare/*->scala::math::Ordered#compare().*/((/*->scala::Tuple2.apply().*/x2/*->example::Issue1749#x2.*/, x2/*->example::Issue1749#x2.*/))
+  (x1/*->example::Issue1749#x1.*/, x1/*->example::Issue1749#x1.*/)
+    .compare/*->scala::math::Ordered#compare().*/((x2/*->example::Issue1749#x2.*/, x2/*->example::Issue1749#x2.*/))
 }
 
 class Issue1854/*<-example::Issue1854#*/ {
   val map/*<-example::Issue1854#map.*/ = collection.mutable.Map/*->scala::collection::mutable::Map.*/.empty/*->scala::collection::MapFactory.Delegate#empty().*/[String/*->scala::Predef.String#*/, String/*->scala::Predef.String#*/]
-  map/*->example::Issue1854#map.*//*->scala::collection::mutable::MapOps#update().*/("a") = "b"
+  map/*->example::Issue1854#map.*/("a") = "b"
 }
diff --git a/tests/semanticdb/expect/Local.expect.scala b/tests/semanticdb/expect/Local.expect.scala
index 6c1aa8440b23..e6dfc04f5422 100644
--- a/tests/semanticdb/expect/Local.expect.scala
+++ b/tests/semanticdb/expect/Local.expect.scala
@@ -2,7 +2,7 @@ package example
 
 class Local/*<-example::Local#*/ {
   def a/*<-example::Local#a().*/() = {
-    def id/*<-local0*/[A/*<-local1*/](a/*<-local2*/: A/*->local1*/): A/*->local1*/ = a/*->local2*/
-    id/*->local0*/(1)
+    def id/*<-local2*/[A/*<-local0*/](a/*<-local1*/: A/*->local0*/): A/*->local0*/ = a/*->local1*/
+    id/*->local2*/(1)
   }
 }
diff --git a/tests/semanticdb/expect/Locals.expect.scala b/tests/semanticdb/expect/Locals.expect.scala
index 7a8fdf0dd432..8cc14786f7ed 100644
--- a/tests/semanticdb/expect/Locals.expect.scala
+++ b/tests/semanticdb/expect/Locals.expect.scala
@@ -3,6 +3,6 @@ package locals
 object Test/*<-locals::Test.*/ {
   val xs/*<-locals::Test.xs.*/ = {
     val x/*<-local0*/ = 42
-    List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/(x/*->local0*/)
+    List/*->scala::package.List.*/(x/*->local0*/)
   }
 }
diff --git a/tests/semanticdb/expect/MetacJava.expect.scala b/tests/semanticdb/expect/MetacJava.expect.scala
index f95f82d787eb..08e787ce4b8a 100644
--- a/tests/semanticdb/expect/MetacJava.expect.scala
+++ b/tests/semanticdb/expect/MetacJava.expect.scala
@@ -4,16 +4,16 @@ import com.javacp
 
 class MetacJava/*<-example::MetacJava#*/ {
   javacp.MetacJava/*->com::javacp::MetacJava#*/.StaticInner/*->com::javacp::MetacJava#StaticInner#*/.isStatic/*->com::javacp::MetacJava#StaticInner#isStatic().*/()
-  new javacp.MetacJava/*->com::javacp::MetacJava#*/.StaticInner/*->com::javacp::MetacJava#StaticInner#*//*->com::javacp::MetacJava#StaticInner#`<init>`().*/().isNotStatic/*->com::javacp::MetacJava#StaticInner#isNotStatic().*/()
-  val inner/*<-example::MetacJava#inner.*/ = new javacp.MetacJava/*->com::javacp::MetacJava#*//*->com::javacp::MetacJava#`<init>`().*/()
-  val overload1/*<-example::MetacJava#overload1.*/ = new inner/*->example::MetacJava#inner.*/.Overload1/*->com::javacp::MetacJava#Overload1#*//*->com::javacp::MetacJava#Overload1#`<init>`().*/()
-  val overload2/*<-example::MetacJava#overload2.*/ = new inner/*->example::MetacJava#inner.*/.Overload2/*->com::javacp::MetacJava#Overload2#*//*->com::javacp::MetacJava#Overload2#`<init>`().*/()
-  inner/*->example::MetacJava#inner.*/.overload/*->com::javacp::MetacJava#overload().*/(new overload1/*->example::MetacJava#overload1.*/.A/*->com::javacp::MetacJava#Overload1#A#*//*->com::javacp::MetacJava#Overload1#A#`<init>`().*/())
-  inner/*->example::MetacJava#inner.*/.overload/*->com::javacp::MetacJava#overload(+1).*/(new overload2/*->example::MetacJava#overload2.*/.A/*->com::javacp::MetacJava#Overload2#A#*//*->com::javacp::MetacJava#Overload2#A#`<init>`().*/())
-  val staticInner/*<-example::MetacJava#staticInner.*/ = new javacp.MetacJava/*->com::javacp::MetacJava#*/.StaticInner/*->com::javacp::MetacJava#StaticInner#*//*->com::javacp::MetacJava#StaticInner#`<init>`().*/()
-  val nonStatic/*<-example::MetacJava#nonStatic.*/ = new staticInner/*->example::MetacJava#staticInner.*/.NonStatic/*->com::javacp::MetacJava#StaticInner#NonStatic#*//*->com::javacp::MetacJava#StaticInner#NonStatic#`<init>`().*/()
+  new javacp.MetacJava/*->com::javacp::MetacJava#*/.StaticInner/*->com::javacp::MetacJava#StaticInner#*/().isNotStatic/*->com::javacp::MetacJava#StaticInner#isNotStatic().*/()
+  val inner/*<-example::MetacJava#inner.*/ = new javacp.MetacJava/*->com::javacp::MetacJava#*/()
+  val overload1/*<-example::MetacJava#overload1.*/ = new inner/*->example::MetacJava#inner.*/.Overload1/*->com::javacp::MetacJava#Overload1#*/()
+  val overload2/*<-example::MetacJava#overload2.*/ = new inner/*->example::MetacJava#inner.*/.Overload2/*->com::javacp::MetacJava#Overload2#*/()
+  inner/*->example::MetacJava#inner.*/.overload/*->com::javacp::MetacJava#overload().*/(new overload1/*->example::MetacJava#overload1.*/.A/*->com::javacp::MetacJava#Overload1#A#*/())
+  inner/*->example::MetacJava#inner.*/.overload/*->com::javacp::MetacJava#overload(+1).*/(new overload2/*->example::MetacJava#overload2.*/.A/*->com::javacp::MetacJava#Overload2#A#*/())
+  val staticInner/*<-example::MetacJava#staticInner.*/ = new javacp.MetacJava/*->com::javacp::MetacJava#*/.StaticInner/*->com::javacp::MetacJava#StaticInner#*/()
+  val nonStatic/*<-example::MetacJava#nonStatic.*/ = new staticInner/*->example::MetacJava#staticInner.*/.NonStatic/*->com::javacp::MetacJava#StaticInner#NonStatic#*/()
   nonStatic/*->example::MetacJava#nonStatic.*/.method/*->com::javacp::MetacJava#StaticInner#NonStatic#method().*/(nonStatic/*->example::MetacJava#nonStatic.*/)
-  javacp.MetacJava/*->com::javacp::MetacJava#*/.overload/*->com::javacp::MetacJava#overload(+2).*/(new javacp.MetacJava/*->com::javacp::MetacJava#*/.Overload3/*->com::javacp::MetacJava#Overload3#*/.A/*->com::javacp::MetacJava#Overload3#A#*//*->com::javacp::MetacJava#Overload3#A#`<init>`().*/())
+  javacp.MetacJava/*->com::javacp::MetacJava#*/.overload/*->com::javacp::MetacJava#overload(+2).*/(new javacp.MetacJava/*->com::javacp::MetacJava#*/.Overload3/*->com::javacp::MetacJava#Overload3#*/.A/*->com::javacp::MetacJava#Overload3#A#*/())
   val interface/*<-example::MetacJava#interface.*/: javacp.Interface/*->com::javacp::Interface#*/ = null
   val coin/*<-example::MetacJava#coin.*/: javacp.Coin/*->com::javacp::Coin#*/ = javacp.Coin/*->com::javacp::Coin#*/.PENNY/*->com::javacp::Coin#PENNY.*/
   val entry/*<-example::MetacJava#entry.*/: java.util.Map/*->java::util::Map#*/.Entry/*->java::util::Map#Entry#*/[Int/*->scala::Int#*/, Int/*->scala::Int#*/] = null
diff --git a/tests/semanticdb/expect/MethodUsages.expect.scala b/tests/semanticdb/expect/MethodUsages.expect.scala
index d202e21ec851..e6963465c97e 100644
--- a/tests/semanticdb/expect/MethodUsages.expect.scala
+++ b/tests/semanticdb/expect/MethodUsages.expect.scala
@@ -1,7 +1,7 @@
 package example
 
 class MethodUsages/*<-example::MethodUsages#*/ {
-  val m/*<-example::MethodUsages#m.*/ = new Methods/*->example::Methods#*/[Int/*->scala::Int#*/]/*->example::Methods#`<init>`().*/
+  val m/*<-example::MethodUsages#m.*/ = new Methods/*->example::Methods#*/[Int/*->scala::Int#*/]
   m/*->example::MethodUsages#m.*/.m1/*->example::Methods#m1().*/
   m/*->example::MethodUsages#m.*/.m2/*->example::Methods#m2().*/()
   m/*->example::MethodUsages#m.*/.m3/*->example::Methods#m3().*/(0)
@@ -9,9 +9,9 @@ class MethodUsages/*<-example::MethodUsages#*/ {
   m/*->example::MethodUsages#m.*/.m5/*->example::Methods#m5().*/("")
   m/*->example::MethodUsages#m.*/.m5/*->example::Methods#m5(+1).*/(0)
   m/*->example::MethodUsages#m.*/.m6/*->example::Methods#m6().*/(0)
-  m/*->example::MethodUsages#m.*/.m6/*->example::Methods#m6(+1).*/(new m/*->example::MethodUsages#m.*/.List/*->example::Methods#List#*/[Int/*->scala::Int#*/]/*->example::Methods#List#`<init>`().*/)
+  m/*->example::MethodUsages#m.*/.m6/*->example::Methods#m6(+1).*/(new m/*->example::MethodUsages#m.*/.List/*->example::Methods#List#*/[Int/*->scala::Int#*/])
   m/*->example::MethodUsages#m.*/.m6/*->example::Methods#m6(+2).*/(Nil/*->scala::package.Nil.*/)
-  m/*->example::MethodUsages#m.*/.m7/*->example::Methods#m7().*/(m/*->example::MethodUsages#m.*/, new m/*->example::MethodUsages#m.*/.List/*->example::Methods#List#*/[Int/*->scala::Int#*/]/*->example::Methods#List#`<init>`().*/)/*->scala::math::Ordering.Int.*/
+  m/*->example::MethodUsages#m.*/.m7/*->example::Methods#m7().*/(m/*->example::MethodUsages#m.*/, new m/*->example::MethodUsages#m.*/.List/*->example::Methods#List#*/[Int/*->scala::Int#*/])
   m/*->example::MethodUsages#m.*/.`m8().`/*->example::Methods#`m8().`().*/()
   m/*->example::MethodUsages#m.*/.m9/*->example::Methods#m9().*/(null)
   m/*->example::MethodUsages#m.*/.m10/*->example::Methods#m10().*/(null)
diff --git a/tests/semanticdb/expect/Methods.expect.scala b/tests/semanticdb/expect/Methods.expect.scala
index 8190bf0308d1..f34c657b2f6d 100644
--- a/tests/semanticdb/expect/Methods.expect.scala
+++ b/tests/semanticdb/expect/Methods.expect.scala
@@ -15,7 +15,7 @@ class Methods/*<-example::Methods#*/[T/*<-example::Methods#[T]*/] {
   def m6/*<-example::Methods#m6().*/(x/*<-example::Methods#m6().(x)*/: Int/*->scala::Int#*/) = ???/*->scala::Predef.`???`().*/
   def m6/*<-example::Methods#m6(+1).*/(x/*<-example::Methods#m6(+1).(x)*/: List/*->example::Methods#List#*/[T/*->example::Methods#[T]*/]) = ???/*->scala::Predef.`???`().*/
   def m6/*<-example::Methods#m6(+2).*/(x/*<-example::Methods#m6(+2).(x)*/: scala.List/*->scala::package.List#*/[T/*->example::Methods#[T]*/]) = ???/*->scala::Predef.`???`().*/
-  def m7/*<-example::Methods#m7().*/[U/*<-example::Methods#m7().[U]*/: Ordering/*->scala::math::Ordering#*//*->example::Methods#m7().[U]*/](c/*<-example::Methods#m7().(c)*/: Methods/*->example::Methods#*/[T/*->example::Methods#[T]*/], l/*<-example::Methods#m7().(l)*/: List/*->example::Methods#List#*/[U/*->example::Methods#m7().[U]*/]) = ???/*->scala::Predef.`???`().*/
+  def m7/*<-example::Methods#m7().*/[U/*<-example::Methods#m7().[U]*//*<-example::Methods#m7().(evidence$1)*/: Ordering/*->scala::math::Ordering#*/](c/*<-example::Methods#m7().(c)*/: Methods/*->example::Methods#*/[T/*->example::Methods#[T]*/], l/*<-example::Methods#m7().(l)*/: List/*->example::Methods#List#*/[U/*->example::Methods#m7().[U]*/]) = ???/*->scala::Predef.`???`().*/
   def `m8()./*<-example::Methods#`m8().`().*/`() = ???/*->scala::Predef.`???`().*/
   class `m9()./*<-example::Methods#`m9().`#*/`
   def m9/*<-example::Methods#m9().*/(x/*<-example::Methods#m9().(x)*/: `m9().`/*->example::Methods#`m9().`#*/) = ???/*->scala::Predef.`???`().*/
@@ -24,6 +24,7 @@ class Methods/*<-example::Methods#*/[T/*<-example::Methods#[T]*/] {
   def m11/*<-example::Methods#m11(+1).*/(x/*<-example::Methods#m11(+1).(x)*/: Example/*->example::Example.*/.type) = ???/*->scala::Predef.`???`().*/
   def m12a/*<-example::Methods#m12a().*/(x/*<-example::Methods#m12a().(x)*/: {}) = ???/*->scala::Predef.`???`().*/
   def m12b/*<-example::Methods#m12b().*/(x/*<-example::Methods#m12b().(x)*/: { val x/*<-local0*/: Int/*->scala::Int#*/ }) = ???/*->scala::Predef.`???`().*/
+  def m12c/*<-example::Methods#m12c().*/(x/*<-example::Methods#m12c().(x)*/: { val x/*<-local1*/: Int/*->scala::Int#*/; def y/*<-local2*/: Int/*->scala::Int#*/ }) = ???/*->scala::Predef.`???`().*/
   def m13/*<-example::Methods#m13().*/(x/*<-example::Methods#m13().(x)*/: Int/*->scala::Int#*/ @unchecked/*->scala::unchecked#*/) = ???/*->scala::Predef.`???`().*/
   def m15/*<-example::Methods#m15().*/(x/*<-example::Methods#m15().(x)*/: => Int/*->scala::Int#*/) = ???/*->scala::Predef.`???`().*/
   def m16/*<-example::Methods#m16().*/(x/*<-example::Methods#m16().(x)*/: Int/*->scala::Int#*/*) = ???/*->scala::Predef.`???`().*/
diff --git a/tests/semanticdb/expect/Methods.scala b/tests/semanticdb/expect/Methods.scala
index d588d3df2e55..f07dea11752d 100644
--- a/tests/semanticdb/expect/Methods.scala
+++ b/tests/semanticdb/expect/Methods.scala
@@ -24,6 +24,7 @@ class Methods[T] {
   def m11(x: Example.type) = ???
   def m12a(x: {}) = ???
   def m12b(x: { val x: Int }) = ???
+  def m12c(x: { val x: Int; def y: Int }) = ???
   def m13(x: Int @unchecked) = ???
   def m15(x: => Int) = ???
   def m16(x: Int*) = ???
diff --git a/tests/semanticdb/expect/NamedApplyBlock.expect.scala b/tests/semanticdb/expect/NamedApplyBlock.expect.scala
index db1311082bad..f47393b0322a 100644
--- a/tests/semanticdb/expect/NamedApplyBlock.expect.scala
+++ b/tests/semanticdb/expect/NamedApplyBlock.expect.scala
@@ -4,11 +4,11 @@ object NamedApplyBlockMethods/*<-example::NamedApplyBlockMethods.*/ {
   val local/*<-example::NamedApplyBlockMethods.local.*/ = 1
   def foo/*<-example::NamedApplyBlockMethods.foo().*/(a/*<-example::NamedApplyBlockMethods.foo().(a)*/: Int/*->scala::Int#*/ = 1, b/*<-example::NamedApplyBlockMethods.foo().(b)*/: Int/*->scala::Int#*/ = 2, c/*<-example::NamedApplyBlockMethods.foo().(c)*/: Int/*->scala::Int#*/ = 3): Int/*->scala::Int#*/ = a/*->example::NamedApplyBlockMethods.foo().(a)*/ +/*->scala::Int#`+`(+4).*/ b/*->example::NamedApplyBlockMethods.foo().(b)*/ +/*->scala::Int#`+`(+4).*/ c/*->example::NamedApplyBlockMethods.foo().(c)*/
   def baseCase/*<-example::NamedApplyBlockMethods.baseCase().*/ = foo/*->example::NamedApplyBlockMethods.foo().*/(local/*->example::NamedApplyBlockMethods.local.*/, c/*->example::NamedApplyBlockMethods.foo().(c)*/ = 3)
-  def recursive/*<-example::NamedApplyBlockMethods.recursive().*/ = foo/*->example::NamedApplyBlockMethods.foo().*//*->local1*/(local/*->example::NamedApplyBlockMethods.local.*/, c/*->example::NamedApplyBlockMethods.foo().(c)*/ = foo/*->example::NamedApplyBlockMethods.foo().*/(local/*->example::NamedApplyBlockMethods.local.*/, c/*->example::NamedApplyBlockMethods.foo().(c)*/ = 3))
+  def recursive/*<-example::NamedApplyBlockMethods.recursive().*/ = foo/*->example::NamedApplyBlockMethods.foo().*/(local/*->example::NamedApplyBlockMethods.local.*/, c/*->example::NamedApplyBlockMethods.foo().(c)*/ = foo/*->example::NamedApplyBlockMethods.foo().*/(local/*->example::NamedApplyBlockMethods.local.*/, c/*->example::NamedApplyBlockMethods.foo().(c)*/ = 3))
 }
 
 object NamedApplyBlockCaseClassConstruction/*<-example::NamedApplyBlockCaseClassConstruction.*/ {
   case class Msg/*<-example::NamedApplyBlockCaseClassConstruction.Msg#*/(body/*<-example::NamedApplyBlockCaseClassConstruction.Msg#body.*/: String/*->scala::Predef.String#*/, head/*<-example::NamedApplyBlockCaseClassConstruction.Msg#head.*/: String/*->scala::Predef.String#*/ = "default", tail/*<-example::NamedApplyBlockCaseClassConstruction.Msg#tail.*/: String/*->scala::Predef.String#*/)
   val bodyText/*<-example::NamedApplyBlockCaseClassConstruction.bodyText.*/ = "body"
-  val msg/*<-example::NamedApplyBlockCaseClassConstruction.msg.*/ = Msg/*->example::NamedApplyBlockCaseClassConstruction.Msg.*//*->example::NamedApplyBlockCaseClassConstruction.Msg.apply().*/(bodyText/*->example::NamedApplyBlockCaseClassConstruction.bodyText.*/, tail/*->example::NamedApplyBlockCaseClassConstruction.Msg.apply().(tail)*/ = "tail")
+  val msg/*<-example::NamedApplyBlockCaseClassConstruction.msg.*/ = Msg/*->example::NamedApplyBlockCaseClassConstruction.Msg.*/(bodyText/*->example::NamedApplyBlockCaseClassConstruction.bodyText.*/, tail/*->example::NamedApplyBlockCaseClassConstruction.Msg.apply().(tail)*/ = "tail")
 }
diff --git a/tests/semanticdb/expect/NamedArguments.expect.scala b/tests/semanticdb/expect/NamedArguments.expect.scala
index 1d478decc4b4..454a2b6d6281 100644
--- a/tests/semanticdb/expect/NamedArguments.expect.scala
+++ b/tests/semanticdb/expect/NamedArguments.expect.scala
@@ -2,6 +2,6 @@ package example
 
 class NamedArguments/*<-example::NamedArguments#*/ {
   case class User/*<-example::NamedArguments#User#*/(name/*<-example::NamedArguments#User#name.*/: String/*->scala::Predef.String#*/)
-  User/*->example::NamedArguments#User.*//*->example::NamedArguments#User.apply().*/(name/*->example::NamedArguments#User.apply().(name)*/ = "John")
+  User/*->example::NamedArguments#User.*/(name/*->example::NamedArguments#User.apply().(name)*/ = "John")
   User/*->example::NamedArguments#User.*/.apply/*->example::NamedArguments#User.apply().*/(name/*->example::NamedArguments#User.apply().(name)*/ = "John")
 }
diff --git a/tests/semanticdb/expect/NewModifiers.expect.scala b/tests/semanticdb/expect/NewModifiers.expect.scala
index bc0d1dcf71e7..cc93048214bb 100644
--- a/tests/semanticdb/expect/NewModifiers.expect.scala
+++ b/tests/semanticdb/expect/NewModifiers.expect.scala
@@ -2,3 +2,16 @@ object NewModifiers/*<-_empty_::NewModifiers.*/ {
   inline val foo/*<-_empty_::NewModifiers.foo.*/ = "foo"
   opaque type A/*<-_empty_::NewModifiers.A#*/ = Int/*->scala::Int#*/
 }
+
+opaque type OpaqueB/*<-_empty_::NewModifiers$package.OpaqueB#*/ = Int/*->scala::Int#*/
+
+class NewModifiersClass/*<-_empty_::NewModifiersClass#*/ {
+  opaque type C/*<-_empty_::NewModifiersClass#C#*/ = Int/*->scala::Int#*/
+  class Nested/*<-_empty_::NewModifiersClass#Nested#*/ {
+    opaque type NestedOpaque/*<-_empty_::NewModifiersClass#Nested#NestedOpaque#*/ = Int/*->scala::Int#*/
+  }
+}
+
+trait NewModifiersTrait/*<-_empty_::NewModifiersTrait#*/ {
+  opaque type D/*<-_empty_::NewModifiersTrait#D#*/ = Int/*->scala::Int#*/
+}
diff --git a/tests/semanticdb/expect/NewModifiers.scala b/tests/semanticdb/expect/NewModifiers.scala
index 2d5e82551b02..07b47ad8fb02 100644
--- a/tests/semanticdb/expect/NewModifiers.scala
+++ b/tests/semanticdb/expect/NewModifiers.scala
@@ -2,3 +2,16 @@ object NewModifiers {
   inline val foo = "foo"
   opaque type A = Int
 }
+
+opaque type OpaqueB = Int
+
+class NewModifiersClass {
+  opaque type C = Int
+  class Nested {
+    opaque type NestedOpaque = Int
+  }
+}
+
+trait NewModifiersTrait {
+  opaque type D = Int
+}
diff --git a/tests/semanticdb/expect/Prefixes.expect.scala b/tests/semanticdb/expect/Prefixes.expect.scala
index 185e2d3530d8..857dcb28b600 100644
--- a/tests/semanticdb/expect/Prefixes.expect.scala
+++ b/tests/semanticdb/expect/Prefixes.expect.scala
@@ -24,7 +24,7 @@ object Test/*<-prefixes::Test.*/ {
   def m2/*<-prefixes::Test.m2().*/: c/*->prefixes::Test.c.*/.T/*->prefixes::C#T#*/ = ???/*->scala::Predef.`???`().*/
   def k2/*<-prefixes::Test.k2().*/: c/*->prefixes::Test.c.*/.N/*->prefixes::C#N.*/.U/*->prefixes::C#N.U#*/ = ???/*->scala::Predef.`???`().*/
   import c/*->prefixes::Test.c.*/.N/*->prefixes::C#N.*/.*
-  def k3/*<-prefixes::Test.k3().*/: U = ???/*->scala::Predef.`???`().*/
+  def k3/*<-prefixes::Test.k3().*/: U/*->prefixes::C#N.U#*/ = ???/*->scala::Predef.`???`().*/
 
   def n2/*<-prefixes::Test.n2().*/: M/*->prefixes::M.*/.T/*->prefixes::M.T#*/ = ???/*->scala::Predef.`???`().*/
 
diff --git a/tests/semanticdb/expect/RecOrRefined.expect.scala b/tests/semanticdb/expect/RecOrRefined.expect.scala
new file mode 100644
index 000000000000..3c32d22506ef
--- /dev/null
+++ b/tests/semanticdb/expect/RecOrRefined.expect.scala
@@ -0,0 +1,34 @@
+package example
+
+def m1/*<-example::RecOrRefined$package.m1().*/(a/*<-example::RecOrRefined$package.m1().(a)*/: Int/*->scala::Int#*/ { val x/*<-local4*/: Int/*->scala::Int#*/ }) = ???/*->scala::Predef.`???`().*/
+def m2/*<-example::RecOrRefined$package.m2().*/(x/*<-example::RecOrRefined$package.m2().(x)*/: { val x/*<-local5*/: Int/*->scala::Int#*/; def y/*<-local6*/: Int/*->scala::Int#*/ }) = ???/*->scala::Predef.`???`().*/
+def m3/*<-example::RecOrRefined$package.m3().*/(x/*<-example::RecOrRefined$package.m3().(x)*/: { val x/*<-local7*/: Int/*->scala::Int#*/; def y/*<-local8*/: Int/*->scala::Int#*/; type z/*<-local9*/ }) = ???/*->scala::Predef.`???`().*/
+trait PolyHolder/*<-example::PolyHolder#*/ {
+  def foo/*<-example::PolyHolder#foo().*/[T/*<-example::PolyHolder#foo().[T]*/](t/*<-example::PolyHolder#foo().(t)*/: T/*->example::PolyHolder#foo().[T]*/): Any/*->scala::Any#*/
+}
+
+def m4/*<-example::RecOrRefined$package.m4().*/(x/*<-example::RecOrRefined$package.m4().(x)*/: PolyHolder/*->example::PolyHolder#*/ { def foo/*<-local12*/[T/*<-local10*/](t/*<-local11*/: T/*->local10*/): T/*->local10*/ }) = ???/*->scala::Predef.`???`().*/
+def m5/*<-example::RecOrRefined$package.m5().*/[Z/*<-example::RecOrRefined$package.m5().[Z]*/](x/*<-example::RecOrRefined$package.m5().(x)*/: Int/*->scala::Int#*/): PolyHolder/*->example::PolyHolder#*/ { def foo/*<-local15*/[T/*<-local13*/](t/*<-local14*/: T/*->local13*/): T/*->local13*/ } = ???/*->scala::Predef.`???`().*/
+
+type m6/*<-example::RecOrRefined$package.m6#*/ = [X/*<-example::RecOrRefined$package.m6#[X]*/] =>> PolyHolder/*->example::PolyHolder#*/ { def foo/*<-local18*/[T/*<-local16*/](t/*<-local17*/: T/*->local16*/): T/*->local16*/ }
+
+class Record/*<-example::Record#*/(elems/*<-example::Record#elems.*/: (String/*->scala::Predef.String#*/, Any/*->scala::Any#*/)*) extends Selectable/*->scala::Selectable#*/:
+  private val fields/*<-example::Record#fields.*/ = elems/*->example::Record#elems.*/.toMap/*->scala::collection::IterableOnceOps#toMap().*/
+  def selectDynamic/*<-example::Record#selectDynamic().*/(name/*<-example::Record#selectDynamic().(name)*/: String/*->scala::Predef.String#*/): Any/*->scala::Any#*/ = fields/*->example::Record#fields.*/(name/*->example::Record#selectDynamic().(name)*/)
+
+type Person/*<-example::RecOrRefined$package.Person#*/ = Record/*->example::Record#*/ {
+  val name/*<-local19*/: String/*->scala::Predef.String#*/
+  val age/*<-local20*/: Int/*->scala::Int#*/
+}
+
+// RecType
+class C/*<-example::C#*/ { type T1/*<-example::C#T1#*/; type T2/*<-example::C#T2#*/ }
+type C2/*<-example::RecOrRefined$package.C2#*/ = C/*->example::C#*/ { type T1/*<-local21*/; type T2/*<-local22*/ = T1/*->local21*/ }
+
+trait SpecialRefinement/*<-example::SpecialRefinement#*/ {
+  def pickOne/*<-example::SpecialRefinement#pickOne().*/[T/*<-example::SpecialRefinement#pickOne().[T]*/](as/*<-example::SpecialRefinement#pickOne().(as)*/: T/*->example::SpecialRefinement#pickOne().[T]*/*): Option/*->scala::Option#*/[Any/*->scala::Any#*/]
+}
+
+class PickOneRefinement_1/*<-example::PickOneRefinement_1#*/[S/*<-example::PickOneRefinement_1#[S]*/ <: SpecialRefinement/*->example::SpecialRefinement#*/ { def pickOne/*<-local3*/[T/*<-local1*/](as/*<-local2*/: T/*->local1*/*): Option/*->scala::Option#*/[String/*->scala::Predef.String#*/] }] {
+  def run/*<-example::PickOneRefinement_1#run().*/(s/*<-example::PickOneRefinement_1#run().(s)*/: S/*->example::PickOneRefinement_1#[S]*/, as/*<-example::PickOneRefinement_1#run().(as)*/: String/*->scala::Predef.String#*/*): Option/*->scala::Option#*/[String/*->scala::Predef.String#*/] = s/*->example::PickOneRefinement_1#run().(s)*/.pickOne/*->example::SpecialRefinement#pickOne().*/(as/*->example::PickOneRefinement_1#run().(as)*/:_*)
+}
diff --git a/tests/semanticdb/expect/RecOrRefined.scala b/tests/semanticdb/expect/RecOrRefined.scala
new file mode 100644
index 000000000000..06292435a91e
--- /dev/null
+++ b/tests/semanticdb/expect/RecOrRefined.scala
@@ -0,0 +1,34 @@
+package example
+
+def m1(a: Int { val x: Int }) = ???
+def m2(x: { val x: Int; def y: Int }) = ???
+def m3(x: { val x: Int; def y: Int; type z }) = ???
+trait PolyHolder {
+  def foo[T](t: T): Any
+}
+
+def m4(x: PolyHolder { def foo[T](t: T): T }) = ???
+def m5[Z](x: Int): PolyHolder { def foo[T](t: T): T } = ???
+
+type m6 = [X] =>> PolyHolder { def foo[T](t: T): T }
+
+class Record(elems: (String, Any)*) extends Selectable:
+  private val fields = elems.toMap
+  def selectDynamic(name: String): Any = fields(name)
+
+type Person = Record {
+  val name: String
+  val age: Int
+}
+
+// RecType
+class C { type T1; type T2 }
+type C2 = C { type T1; type T2 = T1 }
+
+trait SpecialRefinement {
+  def pickOne[T](as: T*): Option[Any]
+}
+
+class PickOneRefinement_1[S <: SpecialRefinement { def pickOne[T](as: T*): Option[String] }] {
+  def run(s: S, as: String*): Option[String] = s.pickOne(as:_*)
+}
diff --git a/tests/semanticdb/expect/RightAssociativeExtension.expect.scala b/tests/semanticdb/expect/RightAssociativeExtension.expect.scala
index 38f81d0154ef..9d8271a43685 100644
--- a/tests/semanticdb/expect/RightAssociativeExtension.expect.scala
+++ b/tests/semanticdb/expect/RightAssociativeExtension.expect.scala
@@ -1,6 +1,6 @@
 package ext
 
-/*<-ext::RightAssociativeExtension$package.*/extension (s/*<-ext::RightAssociativeExtension$package.`:*:`().(s)*/: String/*->scala::Predef.String#*/)
-  def :*:/*<-ext::RightAssociativeExtension$package.`:*:`().*/ (i/*<-ext::RightAssociativeExtension$package.`:*:`().(i)*/: Int/*->scala::Int#*/): (String/*->scala::Predef.String#*/, Int/*->scala::Int#*/) = (/*->scala::Tuple2.apply().*/s/*->ext::RightAssociativeExtension$package.`:*:`().(s)*/, i/*->ext::RightAssociativeExtension$package.`:*:`().(i)*/)
+extension (s/*<-ext::RightAssociativeExtension$package.`:*:`().(s)*/: String/*->scala::Predef.String#*/)
+  def :*:/*<-ext::RightAssociativeExtension$package.`:*:`().*/ (i/*<-ext::RightAssociativeExtension$package.`:*:`().(i)*/: Int/*->scala::Int#*/): (String/*->scala::Predef.String#*/, Int/*->scala::Int#*/) = (s/*->ext::RightAssociativeExtension$package.`:*:`().(s)*/, i/*->ext::RightAssociativeExtension$package.`:*:`().(i)*/)
 
 val b/*<-ext::RightAssociativeExtension$package.b.*/ = "foo" :*:/*->ext::RightAssociativeExtension$package.`:*:`().*/ 23
\ No newline at end of file
diff --git a/tests/semanticdb/expect/Synthetic.expect.scala b/tests/semanticdb/expect/Synthetic.expect.scala
index 0f95d9d0b01f..2672b8106785 100644
--- a/tests/semanticdb/expect/Synthetic.expect.scala
+++ b/tests/semanticdb/expect/Synthetic.expect.scala
@@ -3,48 +3,59 @@ package example
 import scala.language/*->scala::language.*/.implicitConversions/*->scala::language.implicitConversions.*/
 
 class Synthetic/*<-example::Synthetic#*/ {
-  List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/(1).map/*->scala::collection::immutable::List#map().*/(_ +/*->scala::Int#`+`(+4).*/ 2)
-  /*->scala::Predef.intArrayOps().*/Array/*->scala::Array.*/.empty/*->scala::Array.empty().*/[Int/*->scala::Int#*/]/*->scala::reflect::ClassTag.apply().*/.headOption/*->scala::collection::ArrayOps#headOption().*/
-  /*->scala::Predef.augmentString().*/"fooo".stripPrefix/*->scala::collection::StringOps#stripPrefix().*/("o")
+  List/*->scala::package.List.*/(1).map/*->scala::collection::immutable::List#map().*/(_ +/*->scala::Int#`+`(+4).*/ 2)
+  Array/*->scala::Array.*/.empty/*->scala::Array.empty().*/[Int/*->scala::Int#*/].headOption/*->scala::collection::ArrayOps#headOption().*/
+  "fooo".stripPrefix/*->scala::collection::StringOps#stripPrefix().*/("o")
 
   // See https://github.com/scalameta/scalameta/issues/977
-  val Name/*<-example::Synthetic#Name.*/ = /*->scala::Predef.augmentString().*/"name:(.*)".r/*->scala::collection::StringOps#r().*/
-  val x/*<-example::Synthetic#x.*/ #::/*->scala::package.`#::`.*//*->scala::package.`#::`.unapply().*/ xs/*<-example::Synthetic#xs.*/ = LazyList/*->scala::package.LazyList.*//*->scala::collection::IterableFactory#apply().*/(1, 2)
-  val Name/*->example::Synthetic#Name.*//*->scala::util::matching::Regex#unapplySeq().*/(name/*<-example::Synthetic#name.*/) = "name:foo"
-  1 #:: /*->scala::collection::immutable::LazyList.toDeferrer().*/2 #:: /*->scala::collection::immutable::LazyList.toDeferrer().*/LazyList/*->scala::package.LazyList.*/.empty/*->scala::collection::immutable::LazyList.empty().*//*->scala::collection::immutable::LazyList.Deferrer#`#::`().*/
+  val Name/*<-example::Synthetic#Name.*/ = "name:(.*)".r/*->scala::collection::StringOps#r().*/
+  val x/*<-example::Synthetic#x.*/ #::/*->scala::package.`#::`.*/ xs/*<-example::Synthetic#xs.*/ = LazyList/*->scala::package.LazyList.*/(1, 2)
+  val Name/*->example::Synthetic#Name.*/(name/*<-example::Synthetic#name.*/) = "name:foo"
+  1 #:: 2 #:: LazyList/*->scala::package.LazyList.*/.empty/*->scala::collection::immutable::LazyList.empty().*/
 
-  val a1/*<-example::Synthetic#a1.*/ #::/*->scala::package.`#::`.*//*->scala::package.`#::`.unapply().*/ a2/*<-example::Synthetic#a2.*/ #::/*->scala::package.`#::`.*//*->scala::package.`#::`.unapply().*/ as/*<-example::Synthetic#as.*/ = LazyList/*->scala::package.LazyList.*//*->scala::collection::IterableFactory#apply().*/(1, 2)
+  val a1/*<-example::Synthetic#a1.*/ #::/*->scala::package.`#::`.*/ a2/*<-example::Synthetic#a2.*/ #::/*->scala::package.`#::`.*/ as/*<-example::Synthetic#as.*/ = LazyList/*->scala::package.LazyList.*/(1, 2)
 
-  val lst/*<-example::Synthetic#lst.*/ = 1 #:: /*->scala::collection::immutable::LazyList.toDeferrer().*/2 #:: /*->scala::collection::immutable::LazyList.toDeferrer().*/LazyList/*->scala::package.LazyList.*/.empty/*->scala::collection::immutable::LazyList.empty().*//*->scala::collection::immutable::LazyList.Deferrer#`#::`().*/
+  val lst/*<-example::Synthetic#lst.*/ = 1 #:: 2 #:: LazyList/*->scala::package.LazyList.*/.empty/*->scala::collection::immutable::LazyList.empty().*/
 
-  for (x/*<-local0*/ <- /*->scala::LowPriorityImplicits#intWrapper().*/1 to/*->scala::runtime::RichInt#to().*/ 10/*->scala::collection::immutable::Range#foreach().*/; y/*<-local1*/ <- /*->scala::LowPriorityImplicits#intWrapper().*/0 until/*->scala::runtime::RichInt#until().*/ 10/*->scala::collection::immutable::Range#foreach().*/) println/*->scala::Predef.println(+1).*/(/*->scala::Predef.ArrowAssoc().*/x/*->local0*/ ->/*->scala::Predef.ArrowAssoc#`->`().*/ x/*->local0*/)
-  for (i/*<-local2*/ <- /*->scala::LowPriorityImplicits#intWrapper().*/1 to/*->scala::runtime::RichInt#to().*/ 10/*->scala::collection::StrictOptimizedIterableOps#flatMap().*/; j/*<-local3*/ <- /*->scala::LowPriorityImplicits#intWrapper().*/0 until/*->scala::runtime::RichInt#until().*/ 10/*->scala::collection::immutable::Range#map().*/) yield (/*->scala::Tuple2.apply().*/i/*->local2*/, j/*->local3*/)
-  for (i/*<-local4*/ <- /*->scala::LowPriorityImplicits#intWrapper().*/1 to/*->scala::runtime::RichInt#to().*/ 10/*->scala::collection::StrictOptimizedIterableOps#flatMap().*/; j/*<-local5*/ <- /*->scala::LowPriorityImplicits#intWrapper().*/0 until/*->scala::runtime::RichInt#until().*/ 10/*->scala::collection::IterableOps#withFilter().*/ if i/*->local4*/ %/*->scala::Int#`%`(+3).*/ 2 ==/*->scala::Int#`==`(+3).*/ 0/*->scala::collection::WithFilter#map().*/) yield (/*->scala::Tuple2.apply().*/i/*->local4*/, j/*->local5*/)
+  for (x/*<-local0*/ <- 1 to/*->scala::runtime::RichInt#to().*/ 10; y/*<-local1*/ <- 0 until/*->scala::runtime::RichInt#until().*/ 10) println/*->scala::Predef.println(+1).*/(x/*->local0*/ ->/*->scala::Predef.ArrowAssoc#`->`().*/ x/*->local0*/)
+  for (i/*<-local2*/ <- 1 to/*->scala::runtime::RichInt#to().*/ 10; j/*<-local3*/ <- 0 until/*->scala::runtime::RichInt#until().*/ 10) yield (i/*->local2*/, j/*->local3*/)
+  for (i/*<-local4*/ <- 1 to/*->scala::runtime::RichInt#to().*/ 10; j/*<-local5*/ <- 0 until/*->scala::runtime::RichInt#until().*/ 10 if i/*->local4*/ %/*->scala::Int#`%`(+3).*/ 2 ==/*->scala::Int#`==`(+3).*/ 0) yield (i/*->local4*/, j/*->local5*/)
 
   object s/*<-example::Synthetic#s.*/ {
     def apply/*<-example::Synthetic#s.apply().*/() = 2
-    s/*->example::Synthetic#s.apply().*/()
+    s()
     s.apply/*->example::Synthetic#s.apply().*/()
     case class Bar/*<-example::Synthetic#s.Bar#*/()
-    Bar/*->example::Synthetic#s.Bar.*//*->example::Synthetic#s.Bar.apply().*/()
-    null.asInstanceOf/*->scala::Any#asInstanceOf().*/[Int/*->scala::Int#*/ => Int/*->scala::Int#*/]/*->scala::Function1#apply().*/(2)
+    Bar/*->example::Synthetic#s.Bar.*/()
+    null.asInstanceOf/*->scala::Any#asInstanceOf().*/[Int/*->scala::Int#*/ => Int/*->scala::Int#*/](2)
   }
 
-  class J/*<-example::Synthetic#J#*/[T/*<-example::Synthetic#J#[T]*/: Manifest/*->scala::Predef.Manifest#*//*->example::Synthetic#J#[T]*/] { val arr/*<-example::Synthetic#J#arr.*/ = Array/*->scala::Array.*/.empty/*->scala::Array.empty().*/[T/*->example::Synthetic#J#[T]*/] }
+  class J/*<-example::Synthetic#J#*/[T/*<-example::Synthetic#J#[T]*//*<-example::Synthetic#J#evidence$1.*/: Manifest/*->scala::Predef.Manifest#*/] { val arr/*<-example::Synthetic#J#arr.*/ = Array/*->scala::Array.*/.empty/*->scala::Array.empty().*/[T/*->example::Synthetic#J#[T]*/] }
 
   class F/*<-example::Synthetic#F#*/
   implicit val ordering/*<-example::Synthetic#ordering.*/: Ordering/*->scala::package.Ordering#*/[F/*->example::Synthetic#F#*/] = ???/*->scala::Predef.`???`().*/
-  val f/*<-example::Synthetic#f.*/: Ordered/*->scala::package.Ordered#*/[F/*->example::Synthetic#F#*/] = /*->scala::math::Ordered.orderingToOrdered().*/new F/*->example::Synthetic#F#*//*->example::Synthetic#ordering.*/
+  val f/*<-example::Synthetic#f.*/: Ordered/*->scala::package.Ordered#*/[F/*->example::Synthetic#F#*/] = new F/*->example::Synthetic#F#*/
 
   import scala.concurrent.ExecutionContext/*->scala::concurrent::ExecutionContext.*/.Implicits/*->scala::concurrent::ExecutionContext.Implicits.*/.global/*->scala::concurrent::ExecutionContext.Implicits.global().*/
   for {
-    a/*<-local6*/ <- scala.concurrent.Future/*->scala::concurrent::Future.*/.successful/*->scala::concurrent::Future.successful().*/(1)/*->scala::concurrent::Future#foreach().*/
-    b/*<-local7*/ <- scala.concurrent.Future/*->scala::concurrent::Future.*/.successful/*->scala::concurrent::Future.successful().*/(2)/*->scala::concurrent::Future#foreach().*/
-  } println/*->scala::Predef.println(+1).*/(a/*->local6*/)/*->scala::concurrent::ExecutionContext.Implicits.global().*/
+    a/*<-local6*/ <- scala.concurrent.Future/*->scala::concurrent::Future.*/.successful/*->scala::concurrent::Future.successful().*/(1)
+    b/*<-local7*/ <- scala.concurrent.Future/*->scala::concurrent::Future.*/.successful/*->scala::concurrent::Future.successful().*/(2)
+  } println/*->scala::Predef.println(+1).*/(a/*->local6*/)
   for {
-    a/*<-local8*/ <- scala.concurrent.Future/*->scala::concurrent::Future.*/.successful/*->scala::concurrent::Future.successful().*/(1)/*->scala::concurrent::Future#flatMap().*/
-    b/*<-local9*/ <- scala.concurrent.Future/*->scala::concurrent::Future.*/.successful/*->scala::concurrent::Future.successful().*/(2)/*->scala::concurrent::Future#withFilter().*/
-    if a/*->local8*/ </*->scala::Int#`<`(+3).*/ b/*->local9*//*->scala::concurrent::Future#map().*//*->scala::concurrent::ExecutionContext.Implicits.global().*/
-  } yield a/*->local8*//*->scala::concurrent::ExecutionContext.Implicits.global().*/
-
+    a/*<-local8*/ <- scala.concurrent.Future/*->scala::concurrent::Future.*/.successful/*->scala::concurrent::Future.successful().*/(1)
+    b/*<-local9*/ <- scala.concurrent.Future/*->scala::concurrent::Future.*/.successful/*->scala::concurrent::Future.successful().*/(2)
+    if a/*->local8*/ </*->scala::Int#`<`(+3).*/ b/*->local9*/
+  } yield a/*->local8*/
+
+  object Contexts/*<-example::Synthetic#Contexts.*/ {
+    def foo/*<-example::Synthetic#Contexts.foo().*/(x/*<-example::Synthetic#Contexts.foo().(x)*/: Int/*->scala::Int#*/)(using Int/*->scala::Int#*/) = ???/*->scala::Predef.`???`().*/
+    def m1/*<-example::Synthetic#Contexts.m1().*/(using Int/*->scala::Int#*/) = foo/*->example::Synthetic#Contexts.foo().*/(0)
+    def m2/*<-example::Synthetic#Contexts.m2().*/(using x/*<-example::Synthetic#Contexts.m2().(x)*/: Int/*->scala::Int#*/) = foo/*->example::Synthetic#Contexts.foo().*/(0)
+    def m3/*<-example::Synthetic#Contexts.m3().*/ =
+      given x/*<-local10*/: Int/*->scala::Int#*/ = 1
+      foo/*->example::Synthetic#Contexts.foo().*/(x/*->local10*/)
+    def m4/*<-example::Synthetic#Contexts.m4().*/ =
+      given Int/*->scala::Int#*/ = 1
+      foo/*->example::Synthetic#Contexts.foo().*/(0)
+  }
 }
diff --git a/tests/semanticdb/expect/Synthetic.scala b/tests/semanticdb/expect/Synthetic.scala
index 484e07098877..10d13e936468 100644
--- a/tests/semanticdb/expect/Synthetic.scala
+++ b/tests/semanticdb/expect/Synthetic.scala
@@ -47,4 +47,15 @@ class Synthetic {
     if a < b
   } yield a
 
+  object Contexts {
+    def foo(x: Int)(using Int) = ???
+    def m1(using Int) = foo(0)
+    def m2(using x: Int) = foo(0)
+    def m3 =
+      given x: Int = 1
+      foo(x)
+    def m4 =
+      given Int = 1
+      foo(0)
+  }
 }
diff --git a/tests/semanticdb/expect/Traits.expect.scala b/tests/semanticdb/expect/Traits.expect.scala
index 193390b38826..4cb0d6d65b22 100644
--- a/tests/semanticdb/expect/Traits.expect.scala
+++ b/tests/semanticdb/expect/Traits.expect.scala
@@ -10,5 +10,5 @@ object U/*<-traits::U.*/ {
 }
 
 class C/*<-traits::C#*/
-trait V/*<-traits::V#*/ { self/*<-local1*/: C/*->traits::C#*/ =>
+trait V/*<-traits::V#*/ { self/*<-local2*/: C/*->traits::C#*/ =>
 }
diff --git a/tests/semanticdb/expect/ValPattern.expect.scala b/tests/semanticdb/expect/ValPattern.expect.scala
index f89133f6ef5b..8eac1dc87d87 100644
--- a/tests/semanticdb/expect/ValPattern.expect.scala
+++ b/tests/semanticdb/expect/ValPattern.expect.scala
@@ -2,20 +2,20 @@ package example
 
 class ValPattern/*<-example::ValPattern#*/ {
 
-  val (left/*<-example::ValPattern#left.*/, right/*<-example::ValPattern#right.*/) = (/*->scala::Tuple2.apply().*/1, 2)
-  val Some/*->scala::Some.*//*->scala::Some.unapply().*/(number1/*<-example::ValPattern#number1.*/) =
-    Some/*->scala::Some.*//*->scala::Some.apply().*/(1)
+  val (left/*<-example::ValPattern#left.*/, right/*<-example::ValPattern#right.*/) = (1, 2)
+  val Some/*->scala::Some.*/(number1/*<-example::ValPattern#number1.*/) =
+    Some/*->scala::Some.*/(1)
 
-  val List/*->scala::package.List.*//*->scala::collection::SeqFactory#unapplySeq().*/(Some/*->scala::Some.*//*->scala::Some.unapply().*/(q1/*<-example::ValPattern#q1.*/), None/*->scala::None.*/: None/*->scala::None.*/.type, None/*->scala::None.*/) = ???/*->scala::Predef.`???`().*/
+  val List/*->scala::package.List.*/(Some/*->scala::Some.*/(q1/*<-example::ValPattern#q1.*/), None/*->scala::None.*/: None/*->scala::None.*/.type, None/*->scala::None.*/) = ???/*->scala::Predef.`???`().*/
 
-  var (leftVar/*<-example::ValPattern#leftVar().*/, rightVar/*<-example::ValPattern#rightVar().*/) = (/*->scala::Tuple2.apply().*/1, 2)
-  var Some/*->scala::Some.*//*->scala::Some.unapply().*/(number1Var/*<-example::ValPattern#number1Var().*/) =
-    Some/*->scala::Some.*//*->scala::Some.apply().*/(1)
+  var (leftVar/*<-example::ValPattern#leftVar().*/, rightVar/*<-example::ValPattern#rightVar().*/) = (1, 2)
+  var Some/*->scala::Some.*/(number1Var/*<-example::ValPattern#number1Var().*/) =
+    Some/*->scala::Some.*/(1)
 
   def app/*<-example::ValPattern#app().*/(): Unit/*->scala::Unit#*/ = {
     println/*->scala::Predef.println(+1).*/(
       (
-        /*->scala::Tuple6.apply().*/number1/*->example::ValPattern#number1.*/,
+        number1/*->example::ValPattern#number1.*/,
         left/*->example::ValPattern#left.*/,
         right/*->example::ValPattern#right.*/,
         number1Var/*->example::ValPattern#number1Var().*/,
@@ -24,16 +24,16 @@ class ValPattern/*<-example::ValPattern#*/ {
       )
     )
     locally/*->scala::Predef.locally().*/ {
-      val (left/*<-local0*/, right/*<-local1*/) = (/*->scala::Tuple2.apply().*/1, 2)
-      val Some/*->scala::Some.*//*->scala::Some.unapply().*/(number1/*<-local2*/) =
-        Some/*->scala::Some.*//*->scala::Some.apply().*/(1)
+      val (left/*<-local0*/, right/*<-local1*/) = (1, 2)
+      val Some/*->scala::Some.*/(number1/*<-local2*/) =
+        Some/*->scala::Some.*/(1)
 
-      var (leftVar/*<-local3*/, rightVar/*<-local4*/) = (/*->scala::Tuple2.apply().*/1, 2)
-      var Some/*->scala::Some.*//*->scala::Some.unapply().*/(number1Var/*<-local5*/) =
-        Some/*->scala::Some.*//*->scala::Some.apply().*/(1)
+      var (leftVar/*<-local3*/, rightVar/*<-local4*/) = (1, 2)
+      var Some/*->scala::Some.*/(number1Var/*<-local5*/) =
+        Some/*->scala::Some.*/(1)
       println/*->scala::Predef.println(+1).*/(
         (
-          /*->scala::Tuple6.apply().*/number1/*->local2*/,
+          number1/*->local2*/,
           left/*->local0*/,
           right/*->local1*/,
           number1Var/*->local5*/,
diff --git a/tests/semanticdb/expect/exports-example-Codec.expect.scala b/tests/semanticdb/expect/exports-example-Codec.expect.scala
index b2afc55a75f0..712bb96fccc9 100644
--- a/tests/semanticdb/expect/exports-example-Codec.expect.scala
+++ b/tests/semanticdb/expect/exports-example-Codec.expect.scala
@@ -10,6 +10,6 @@ trait Encoder/*<-exports::example::Encoder#*/[-T/*<-exports::example::Encoder#[T
 
 trait Codec/*<-exports::example::Codec#*/[T/*<-exports::example::Codec#[T]*/](decode/*<-exports::example::Codec#decode.*/: Decoder/*->exports::example::Decoder#*/[T/*->exports::example::Codec#[T]*/], encode/*<-exports::example::Codec#encode.*/: Encoder/*->exports::example::Encoder#*/[T/*->exports::example::Codec#[T]*/])
   extends Decoder/*->exports::example::Decoder#*/[T/*->exports::example::Codec#[T]*/] with Encoder/*->exports::example::Encoder#*/[T/*->exports::example::Codec#[T]*/] {
-  export decode/*->exports::example::Codec#decode.*//*->exports::example::Decoder#decode().*//*->exports::example::Codec#decode().(a)*/./*<-exports::example::Codec#decode().*/_
-  export encode/*->exports::example::Codec#encode.*//*->exports::example::Encoder#encode().*//*->exports::example::Codec#encode().(t)*/./*<-exports::example::Codec#encode().*/_
+  export decode/*->exports::example::Codec#decode.*/._
+  export encode/*->exports::example::Codec#encode.*/._
 }
diff --git a/tests/semanticdb/expect/exports-package.expect.scala b/tests/semanticdb/expect/exports-package.expect.scala
index 79c0f5b16e53..512b68dcc842 100644
--- a/tests/semanticdb/expect/exports-package.expect.scala
+++ b/tests/semanticdb/expect/exports-package.expect.scala
@@ -1,3 +1,3 @@
 package exports
 
-/*<-exports::`exports-package$package`.*/export example.{Decoder/*<-exports::`exports-package$package`.Decoder#*/, Encoder/*<-exports::`exports-package$package`.Encoder#*/, Codec/*<-exports::`exports-package$package`.Codec#*/}
+export example.{Decoder/*<-exports::`exports-package$package`.Decoder#*/, Encoder/*<-exports::`exports-package$package`.Encoder#*/, Codec/*<-exports::`exports-package$package`.Codec#*/}
diff --git a/tests/semanticdb/expect/i9727.expect.scala b/tests/semanticdb/expect/i9727.expect.scala
index 017da086d4b5..4cbe6761906f 100644
--- a/tests/semanticdb/expect/i9727.expect.scala
+++ b/tests/semanticdb/expect/i9727.expect.scala
@@ -1,5 +1,5 @@
 package i9727
 
 class Test/*<-i9727::Test#*/(a/*<-i9727::Test#a.*/: Int/*->scala::Int#*/)
-/*<-i9727::i9727$package.*/val a/*<-i9727::i9727$package.a.*/ = new Test/*->i9727::Test#*/(1)
+val a/*<-i9727::i9727$package.a.*/ = new Test/*->i9727::Test#*/(1)
 val b/*<-i9727::i9727$package.b.*/ = new Test/*->i9727::Test#*/(2)
diff --git a/tests/semanticdb/expect/i9782.expect.scala b/tests/semanticdb/expect/i9782.expect.scala
new file mode 100644
index 000000000000..2b10a2f37d7f
--- /dev/null
+++ b/tests/semanticdb/expect/i9782.expect.scala
@@ -0,0 +1,20 @@
+// LazyRef
+trait Txn/*<-_empty_::Txn#*/[T/*<-_empty_::Txn#[T]*/ <: Txn/*->_empty_::Txn#*/[T/*->_empty_::Txn#[T]*/]]
+
+trait Elem/*<-_empty_::Elem#*/[T/*<-_empty_::Elem#[T]*/ <: Txn/*->_empty_::Txn#*/[T/*->_empty_::Elem#[T]*/]]
+
+trait Obj/*<-_empty_::Obj#*/[T/*<-_empty_::Obj#[T]*/ <: Txn/*->_empty_::Txn#*/[T/*->_empty_::Obj#[T]*/]] extends Elem/*->_empty_::Elem#*/[T/*->_empty_::Obj#[T]*/]
+
+trait Copy/*<-_empty_::Copy#*/[In/*<-_empty_::Copy#[In]*/ <: Txn/*->_empty_::Txn#*/[In/*->_empty_::Copy#[In]*/], Out/*<-_empty_::Copy#[Out]*/ <: Txn/*->_empty_::Txn#*/[Out/*->_empty_::Copy#[Out]*/]] {
+  def copyImpl/*<-_empty_::Copy#copyImpl().*/[Repr/*<-_empty_::Copy#copyImpl().[Repr]*/[~/*<-_empty_::Copy#copyImpl().[Repr][`~`]*/ <: Txn/*->_empty_::Txn#*/[~/*->_empty_::Copy#copyImpl().[Repr][`~`]*/]] <: Elem/*->_empty_::Elem#*/[~/*->_empty_::Copy#copyImpl().[Repr][`~`]*/]](in/*<-_empty_::Copy#copyImpl().(in)*/: Repr/*->_empty_::Copy#copyImpl().[Repr]*/[In/*->_empty_::Copy#[In]*/]): Repr/*->_empty_::Copy#copyImpl().[Repr]*/[Out/*->_empty_::Copy#[Out]*/]
+
+  def apply/*<-_empty_::Copy#apply().*/[Repr/*<-_empty_::Copy#apply().[Repr]*/[~/*<-_empty_::Copy#apply().[Repr][`~`]*/ <: Txn/*->_empty_::Txn#*/[~/*->_empty_::Copy#apply().[Repr][`~`]*/]] <: Elem/*->_empty_::Elem#*/[~/*->_empty_::Copy#apply().[Repr][`~`]*/]](in/*<-_empty_::Copy#apply().(in)*/: Repr/*->_empty_::Copy#apply().[Repr]*/[In/*->_empty_::Copy#[In]*/]): Repr/*->_empty_::Copy#apply().[Repr]*/[Out/*->_empty_::Copy#[Out]*/] = {
+    val out/*<-local0*/ = copyImpl/*->_empty_::Copy#copyImpl().*/[Repr/*->_empty_::Copy#apply().[Repr]*/](in/*->_empty_::Copy#apply().(in)*/)
+    (in/*->_empty_::Copy#apply().(in)*/, out/*->local0*/) match {
+      case (inObj/*<-local1*/: Obj/*->_empty_::Obj#*/[In/*->_empty_::Copy#[In]*/], outObj/*<-local2*/: Obj/*->_empty_::Obj#*/[Out/*->_empty_::Copy#[Out]*/]) =>     // problem here
+        println/*->scala::Predef.println(+1).*/("copy the attributes")
+      case _ =>
+    }
+    out/*->local0*/
+  }
+}
diff --git a/tests/semanticdb/expect/i9782.scala b/tests/semanticdb/expect/i9782.scala
new file mode 100644
index 000000000000..8004300491cd
--- /dev/null
+++ b/tests/semanticdb/expect/i9782.scala
@@ -0,0 +1,20 @@
+// LazyRef
+trait Txn[T <: Txn[T]]
+
+trait Elem[T <: Txn[T]]
+
+trait Obj[T <: Txn[T]] extends Elem[T]
+
+trait Copy[In <: Txn[In], Out <: Txn[Out]] {
+  def copyImpl[Repr[~ <: Txn[~]] <: Elem[~]](in: Repr[In]): Repr[Out]
+
+  def apply[Repr[~ <: Txn[~]] <: Elem[~]](in: Repr[In]): Repr[Out] = {
+    val out = copyImpl[Repr](in)
+    (in, out) match {
+      case (inObj: Obj[In], outObj: Obj[Out]) =>     // problem here
+        println("copy the attributes")
+      case _ =>
+    }
+    out
+  }
+}
diff --git a/tests/semanticdb/expect/inlinedefs.expect.scala b/tests/semanticdb/expect/inlinedefs.expect.scala
index c0e1a8913c0a..390bec22e632 100644
--- a/tests/semanticdb/expect/inlinedefs.expect.scala
+++ b/tests/semanticdb/expect/inlinedefs.expect.scala
@@ -12,6 +12,6 @@ object FakePredef/*<-inlinedefs::FakePredef.*/:
    *  sunt in culpa qui officia deserunt mollit anim id est laborum.
    */
   transparent inline final def assert/*<-inlinedefs::FakePredef.assert().*/(inline assertion/*<-inlinedefs::FakePredef.assert().(assertion)*/: Boolean/*->scala::Boolean#*/): Unit/*->scala::Unit#*/ = {
-    if (!assertion/*->inlinedefs::FakePredef.assert().(assertion)*//*->scala::Boolean#`unary_!`().*/)
-      throw new java.lang.AssertionError/*->java::lang::AssertionError#*//*->java::lang::AssertionError#`<init>`(+2).*/("assertion failed")
+    if (!assertion/*->inlinedefs::FakePredef.assert().(assertion)*/)
+      throw new java.lang.AssertionError/*->java::lang::AssertionError#*/("assertion failed")
   }
diff --git a/tests/semanticdb/expect/nullary.expect.scala b/tests/semanticdb/expect/nullary.expect.scala
new file mode 100644
index 000000000000..3f0fdb1af7b0
--- /dev/null
+++ b/tests/semanticdb/expect/nullary.expect.scala
@@ -0,0 +1,20 @@
+abstract class NullaryTest/*<-_empty_::NullaryTest#*/[T/*<-_empty_::NullaryTest#[T]*/, m/*<-_empty_::NullaryTest#[m]*/[s/*<-_empty_::NullaryTest#`<init>`().[m][s]*/]] {
+  def nullary/*<-_empty_::NullaryTest#nullary().*/: String/*->scala::Predef.String#*/ = "a"
+  val x/*<-_empty_::NullaryTest#x.*/ = nullary/*->_empty_::NullaryTest#nullary().*/
+
+  def nullary2/*<-_empty_::NullaryTest#nullary2().*/: T/*->_empty_::NullaryTest#[T]*/
+  val x2/*<-_empty_::NullaryTest#x2.*/ = nullary2/*->_empty_::NullaryTest#nullary2().*/
+
+  def nullary3/*<-_empty_::NullaryTest#nullary3().*/: m/*->_empty_::NullaryTest#[m]*/[T/*->_empty_::NullaryTest#[T]*/]
+  val x3/*<-_empty_::NullaryTest#x3.*/ = nullary3/*->_empty_::NullaryTest#nullary3().*/
+}
+
+class Concrete/*<-_empty_::Concrete#*/ extends NullaryTest/*->_empty_::NullaryTest#*/[Int/*->scala::Int#*/, List/*->scala::package.List#*/] {
+  def nullary2/*<-_empty_::Concrete#nullary2().*/ = 1
+  def nullary3/*<-_empty_::Concrete#nullary3().*/ = List/*->scala::package.List.*/(1,2,3)
+}
+
+object test/*<-_empty_::test.*/ {
+  (new Concrete/*->_empty_::Concrete#*/).nullary2/*->_empty_::Concrete#nullary2().*/
+  (new Concrete/*->_empty_::Concrete#*/).nullary3/*->_empty_::Concrete#nullary3().*/
+}
diff --git a/tests/semanticdb/expect/nullary.scala b/tests/semanticdb/expect/nullary.scala
new file mode 100644
index 000000000000..d3b5b67ea53e
--- /dev/null
+++ b/tests/semanticdb/expect/nullary.scala
@@ -0,0 +1,20 @@
+abstract class NullaryTest[T, m[s]] {
+  def nullary: String = "a"
+  val x = nullary
+
+  def nullary2: T
+  val x2 = nullary2
+
+  def nullary3: m[T]
+  val x3 = nullary3
+}
+
+class Concrete extends NullaryTest[Int, List] {
+  def nullary2 = 1
+  def nullary3 = List(1,2,3)
+}
+
+object test {
+  (new Concrete).nullary2
+  (new Concrete).nullary3
+}
diff --git a/tests/semanticdb/expect/recursion.expect.scala b/tests/semanticdb/expect/recursion.expect.scala
index aba74b1b032e..0454bd54eecc 100644
--- a/tests/semanticdb/expect/recursion.expect.scala
+++ b/tests/semanticdb/expect/recursion.expect.scala
@@ -3,23 +3,23 @@ package recursion
 
 object Nats/*<-recursion::Nats.*/ {
   sealed trait Nat/*<-recursion::Nats.Nat#*/ {
-    transparent inline def ++/*<-recursion::Nats.Nat#`++`().*/ : Succ/*->recursion::Nats.Succ#*/[this.type] = Succ/*->recursion::Nats.Succ.*//*->recursion::Nats.Succ.apply().*/(this)
+    transparent inline def ++/*<-recursion::Nats.Nat#`++`().*/ : Succ/*->recursion::Nats.Succ#*/[this.type] = Succ/*->recursion::Nats.Succ.*/(this)
 
     transparent inline def +/*<-recursion::Nats.Nat#`+`().*/(inline that/*<-recursion::Nats.Nat#`+`().(that)*/: Nat/*->recursion::Nats.Nat#*/): Nat/*->recursion::Nats.Nat#*/ =
       inline this match {
         case Zero/*->recursion::Nats.Zero.*/    => that/*->recursion::Nats.Nat#`+`().(that)*/
-        case Succ/*->recursion::Nats.Succ.*//*->recursion::Nats.Succ.unapply().*//*->local0*/(p/*<-local1*/) => p/*->local1*/ +/*->recursion::Nats.Nat#`+`().*/ that/*->recursion::Nats.Nat#`+`().(that)*/.++/*->recursion::Nats.Nat#`++`().*/
+        case Succ/*->recursion::Nats.Succ.*/(p/*<-local1*/) => p/*->local1*/ +/*->recursion::Nats.Nat#`+`().*/ that/*->recursion::Nats.Nat#`+`().(that)*/.++/*->recursion::Nats.Nat#`++`().*/
     }
   }
 
   case object Zero/*<-recursion::Nats.Zero.*/ extends Nat/*->recursion::Nats.Nat#*/
-  case class Succ/*<-recursion::Nats.Succ#*/[N/*<-recursion::Nats.Succ#[N]*/ <: Nat](p/*<-recursion::Nats.Succ#p.*/: N/*->recursion::Nats.Succ#[N]*/) extends Nat/*->recursion::Nats.Nat#*/
+  case class Succ/*<-recursion::Nats.Succ#*/[N/*<-recursion::Nats.Succ#[N]*/ <: Nat/*->recursion::Nats.Nat#*/](p/*<-recursion::Nats.Succ#p.*/: N/*->recursion::Nats.Succ#[N]*/) extends Nat/*->recursion::Nats.Nat#*/
 
   transparent inline def toIntg/*<-recursion::Nats.toIntg().*/(inline n/*<-recursion::Nats.toIntg().(n)*/: Nat/*->recursion::Nats.Nat#*/): Int/*->scala::Int#*/ =
     inline n/*->recursion::Nats.toIntg().(n)*/ match {
       case Zero/*->recursion::Nats.Zero.*/    => 0
-      case Succ/*->recursion::Nats.Succ.*//*->recursion::Nats.Succ.unapply().*//*->local2*/(p/*<-local3*/) => toIntg/*->recursion::Nats.toIntg().*/(p/*->local3*/) +/*->scala::Int#`+`(+4).*/ 1
+      case Succ/*->recursion::Nats.Succ.*/(p/*<-local3*/) => toIntg/*->recursion::Nats.toIntg().*/(p/*->local3*/) +/*->scala::Int#`+`(+4).*/ 1
     }
 
-  val j31/*<-recursion::Nats.j31.*/ = toIntg/*->recursion::Nats.toIntg().*/(Zero/*->recursion::Nats.Zero.*/.++.++.++/*<-local4*//*->recursion::Nats.Zero.*//*->recursion::Nats.Nat#`++`().*/ + /*<-local5*//*->recursion::Nats.Nat#`++`().*/Zer/*<-local6*//*->recursion::Nats.Nat#`++`().*//*->recursion::Nats.Nat#`+`().*/o/*->recursion::Nats.Zero.*/.++/*->recursion::Nats.Nat#`++`().*/)
+  val j31/*<-recursion::Nats.j31.*/ = toIntg/*->recursion::Nats.toIntg().*/(Zero/*->recursion::Nats.Zero.*/.++/*->recursion::Nats.Nat#`++`().*/.++/*->recursion::Nats.Nat#`++`().*/.++/*->recursion::Nats.Nat#`++`().*/ +/*->recursion::Nats.Nat#`+`().*/ Zero/*->recursion::Nats.Zero.*/.++/*->recursion::Nats.Nat#`++`().*/)
 }
diff --git a/tests/semanticdb/expect/semanticdb-Flags.expect.scala b/tests/semanticdb/expect/semanticdb-Flags.expect.scala
index fe920433e231..99a7cbdddfb6 100644
--- a/tests/semanticdb/expect/semanticdb-Flags.expect.scala
+++ b/tests/semanticdb/expect/semanticdb-Flags.expect.scala
@@ -2,14 +2,14 @@ package flags
 
 import scala.language/*->scala::language.*/.experimental/*->scala::language.experimental.*/.macros/*->scala::language.experimental.macros.*/
 
-package object p {
-  p/*<-flags::p::package.*/rivate lazy val x/*<-flags::p::package.x.*/ = 1
+package object p/*<-flags::p::package.*/ {
+  private lazy val x/*<-flags::p::package.x.*/ = 1
   protected implicit var y/*<-flags::p::package.y().*/: Int/*->scala::Int#*/ = 2
   def z/*<-flags::p::package.z().*/(pp/*<-flags::p::package.z().(pp)*/: Int/*->scala::Int#*/) = 3
   def m/*<-flags::p::package.m().*/[TT/*<-flags::p::package.m().[TT]*/]: Int/*->scala::Int#*/ = macro ???/*->scala::Predef.`???`().*/
   abstract class C/*<-flags::p::package.C#*/[+T/*<-flags::p::package.C#[T]*/, -U/*<-flags::p::package.C#[U]*/, V/*<-flags::p::package.C#[V]*/](x/*<-flags::p::package.C#x.*/: T/*->flags::p::package.C#[T]*/, y/*<-flags::p::package.C#y.*/: U/*->flags::p::package.C#[U]*/, z/*<-flags::p::package.C#z.*/: V/*->flags::p::package.C#[V]*/) {
-    def this()/*<-flags::p::package.C#`<init>`(+1).*/ = this(???/*->scala::Predef.`???`().*/, ???/*->scala::Predef.`???`().*/, ???/*->scala::Predef.`???`().*/)
-    def this(t/*<-flags::p::package.C#`<init>`(+2).*//*<-flags::p::package.C#`<init>`(+2).(t)*/: T/*->flags::p::package.C#[T]*/) = this(t/*->flags::p::package.C#`<init>`(+2).(t)*/, ???/*->scala::Predef.`???`().*/, ???/*->scala::Predef.`???`().*/)
+    def this/*<-flags::p::package.C#`<init>`(+1).*/() = this(???/*->scala::Predef.`???`().*/, ???/*->scala::Predef.`???`().*/, ???/*->scala::Predef.`???`().*/)
+    def this/*<-flags::p::package.C#`<init>`(+2).*/(t/*<-flags::p::package.C#`<init>`(+2).(t)*/: T/*->flags::p::package.C#[T]*/) = this(t/*->flags::p::package.C#`<init>`(+2).(t)*/, ???/*->scala::Predef.`???`().*/, ???/*->scala::Predef.`???`().*/)
     def w/*<-flags::p::package.C#w().*/: Int/*->scala::Int#*/
   }
   type T1/*<-flags::p::package.T1#*/ = Int/*->scala::Int#*/
@@ -21,7 +21,7 @@ package object p {
   sealed trait Z/*<-flags::p::package.Z#*/
   class AA/*<-flags::p::package.AA#*/(x/*<-flags::p::package.AA#x.*/: Int/*->scala::Int#*/, val y/*<-flags::p::package.AA#y.*/: Int/*->scala::Int#*/, var z/*<-flags::p::package.AA#z().*/: Int/*->scala::Int#*/)
   class S/*<-flags::p::package.S#*/[@specialized/*->scala::specialized#*/ T/*<-flags::p::package.S#[T]*/]
-  val List/*->scala::package.List.*//*->scala::collection::SeqFactory#unapplySeq().*/(xs1/*<-flags::p::package.xs1.*/) = ???/*->scala::Predef.`???`().*/
-  ???/*->scala::Predef.`???`().*/ match { case List/*->scala::package.List.*//*->scala::collection::SeqFactory#unapplySeq().*/(xs2/*<-local0*/) => ???/*->scala::Predef.`???`().*/ }
+  val List/*->scala::package.List.*/(xs1/*<-flags::p::package.xs1.*/) = ???/*->scala::Predef.`???`().*/
+  ???/*->scala::Predef.`???`().*/ match { case List/*->scala::package.List.*/(xs2/*<-local0*/) => ???/*->scala::Predef.`???`().*/ }
   ???/*->scala::Predef.`???`().*/ match { case _: List/*->scala::package.List#*/[t/*<-local1*/] => ???/*->scala::Predef.`???`().*/ }
 }
diff --git a/tests/semanticdb/expect/semanticdb-Types.expect.scala b/tests/semanticdb/expect/semanticdb-Types.expect.scala
index 122579d42a9e..b39d7aad59af 100644
--- a/tests/semanticdb/expect/semanticdb-Types.expect.scala
+++ b/tests/semanticdb/expect/semanticdb-Types.expect.scala
@@ -62,9 +62,9 @@ object Test/*<-types::Test.*/ {
     val compoundType1/*<-types::Test.C#compoundType1.*/: { def k/*<-local0*/: Int/*->scala::Int#*/ } = ???/*->scala::Predef.`???`().*/
     val compoundType2/*<-types::Test.C#compoundType2.*/: M/*->types::Test.M#*/ with N/*->types::Test.N#*/ = ???/*->scala::Predef.`???`().*/
     val compoundType3/*<-types::Test.C#compoundType3.*/: M/*->types::Test.M#*/ with N/*->types::Test.N#*/ { def k/*<-local1*/: Int/*->scala::Int#*/ } = ???/*->scala::Predef.`???`().*/
-    val compoundType4/*<-types::Test.C#compoundType4.*/ = new { def k/*<-local3*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
+    val compoundType4/*<-types::Test.C#compoundType4.*/ = new { def k/*<-local2*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
     val compoundType5/*<-types::Test.C#compoundType5.*/ = new M/*->types::Test.M#*/ with N/*->types::Test.N#*/
-    val compoundType6/*<-types::Test.C#compoundType6.*/ = new M/*->types::Test.M#*/ with N/*->types::Test.N#*/ { def k/*<-local6*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
+    val compoundType6/*<-types::Test.C#compoundType6.*/ = new M/*->types::Test.M#*/ with N/*->types::Test.N#*/ { def k/*<-local7*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
 
     val annType1/*<-types::Test.C#annType1.*/: T/*->types::T#*/ @ann(42) = ???/*->scala::Predef.`???`().*/
     val annType2/*<-types::Test.C#annType2.*/: T/*->types::T#*/ @ann1/*->types::ann1#*/ @ann2/*->types::ann2#*/ = ???/*->scala::Predef.`???`().*/
@@ -74,7 +74,7 @@ object Test/*<-types::Test.*/ {
     val existentialType4/*<-types::Test.C#existentialType4.*/ = Class/*->java::lang::Class#*/.forName/*->java::lang::Class#forName().*/("foo.Bar")
 
     def typeLambda1/*<-types::Test.C#typeLambda1().*/[M/*<-types::Test.C#typeLambda1().[M]*/[_]] = ???/*->scala::Predef.`???`().*/
-    typeLambda1/*->types::Test.C#typeLambda1().*/[({ type L/*<-local7*/[T/*<-local8*/] = List/*->scala::package.List#*/[T/*->local8*/] })#L]
+    typeLambda1/*->types::Test.C#typeLambda1().*/[({ type L/*<-local11*/[T/*<-local10*/] = List/*->scala::package.List#*/[T/*->local10*/] })#L]
 
     object ClassInfoType1/*<-types::Test.C#ClassInfoType1.*/
     class ClassInfoType2/*<-types::Test.C#ClassInfoType2#*/ extends B/*->types::B#*/ { def x/*<-types::Test.C#ClassInfoType2#x().*/ = 42 }
diff --git a/tests/semanticdb/expect/semanticdb-extract.expect.scala b/tests/semanticdb/expect/semanticdb-extract.expect.scala
index 02bd562a718b..a601b65218a9 100644
--- a/tests/semanticdb/expect/semanticdb-extract.expect.scala
+++ b/tests/semanticdb/expect/semanticdb-extract.expect.scala
@@ -9,7 +9,7 @@ object AnObject/*<-_empty_::AnObject.*/ {
   "".substring/*->java::lang::String#substring().*/(1)
   "".substring/*->java::lang::String#substring(+1).*/(1, 2)
 
-  List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/(1, 2)
+  List/*->scala::package.List.*/(1, 2)
   List/*->scala::package.List.*/.apply/*->scala::collection::IterableFactory#apply().*/()
   List/*->scala::package.List.*/.`apply`/*->scala::collection::IterableFactory#apply().*/()
   println/*->scala::Predef.println(+1).*/(1 +/*->scala::Int#`+`(+4).*/ 2)
diff --git a/tests/semanticdb/expect/toplevel.expect.scala b/tests/semanticdb/expect/toplevel.expect.scala
index a856d673e68c..65160afd7ee6 100644
--- a/tests/semanticdb/expect/toplevel.expect.scala
+++ b/tests/semanticdb/expect/toplevel.expect.scala
@@ -1,6 +1,8 @@
-/*<-_empty_::toplevel$package.*/inline val a/*<-_empty_::toplevel$package.a.*/ = ""
+inline val a/*<-_empty_::toplevel$package.a.*/ = ""
 extension (x/*<-_empty_::toplevel$package.combine().(x)*/: Int/*->scala::Int#*/) def combine/*<-_empty_::toplevel$package.combine().*/ (y/*<-_empty_::toplevel$package.combine().(y)*/: Int/*->scala::Int#*/) = x/*->_empty_::toplevel$package.combine().(x)*/ +/*->scala::Int#`+`(+4).*/ y/*->_empty_::toplevel$package.combine().(y)*/
 def combine/*<-_empty_::toplevel$package.combine(+1).*/(x/*<-_empty_::toplevel$package.combine(+1).(x)*/: Int/*->scala::Int#*/, y/*<-_empty_::toplevel$package.combine(+1).(y)*/: Int/*->scala::Int#*/, z/*<-_empty_::toplevel$package.combine(+1).(z)*/: Int/*->scala::Int#*/) = x/*->_empty_::toplevel$package.combine(+1).(x)*/ +/*->scala::Int#`+`(+4).*/ y/*->_empty_::toplevel$package.combine(+1).(y)*/ +/*->scala::Int#`+`(+4).*/ z/*->_empty_::toplevel$package.combine(+1).(z)*/
 def combine/*<-_empty_::toplevel$package.combine(+2).*/ = 0
 def foo/*<-_empty_::toplevel$package.foo().*/ = "foo"
-/*<-_empty_::MyProgram#*//*->_empty_::toplevel$package.MyProgram().*//*->scala::util::CommandLineParser.parseArgument().*//*->_empty_::MyProgram#main().(args)*//*->scala::util::CommandLineParser.FromString.given_FromString_Int.*//*->scala::util::CommandLineParser.showError().*//*->local0*/@main/*->scala::main#*/ def MyProgram/*<-_empty_::toplevel$package.MyProgram().*/(times/*<-_empty_::toplevel$package.MyProgram().(times)*/: Int/*->scala::Int#*/): Unit/*->scala::Unit#*/ = (/*->scala::LowPriorityImplicits#intWrapper().*/1 to/*->scala::runtime::RichInt#to().*/ times/*->_empty_::toplevel$package.MyProgram().(times)*/) foreach/*->scala::collection::immutable::Range#foreach().*/ (_ => println/*->scala::Predef.println(+1).*/("hello"))
+@main/*->scala::main#*/ def MyProgram/*<-_empty_::toplevel$package.MyProgram().*/(times/*<-_empty_::toplevel$package.MyProgram().(times)*/: Int/*->scala::Int#*/): Unit/*->scala::Unit#*/ = (1 to/*->scala::runtime::RichInt#to().*/ times/*->_empty_::toplevel$package.MyProgram().(times)*/) foreach/*->scala::collection::immutable::Range#foreach().*/ (_ => println/*->scala::Predef.println(+1).*/("hello"))
+@main/*->scala::main#*/ def readInts/*<-_empty_::toplevel$package.readInts().*/(ints/*<-_empty_::toplevel$package.readInts().(ints)*/: Int/*->scala::Int#*/*): Unit/*->scala::Unit#*/ = println/*->scala::Predef.println(+1).*/(ints/*->_empty_::toplevel$package.readInts().(ints)*/.mkString/*->scala::collection::IterableOnceOps#mkString(+1).*/(","))
+def fooRef/*<-_empty_::toplevel$package.fooRef().*/ = toplevel$package/*->_empty_::toplevel$package.*/.foo/*->_empty_::toplevel$package.foo().*/
diff --git a/tests/semanticdb/expect/toplevel.scala b/tests/semanticdb/expect/toplevel.scala
index 5dae4ccadd5e..c4340efcf212 100644
--- a/tests/semanticdb/expect/toplevel.scala
+++ b/tests/semanticdb/expect/toplevel.scala
@@ -4,3 +4,5 @@ def combine(x: Int, y: Int, z: Int) = x + y + z
 def combine = 0
 def foo = "foo"
 @main def MyProgram(times: Int): Unit = (1 to times) foreach (_ => println("hello"))
+@main def readInts(ints: Int*): Unit = println(ints.mkString(","))
+def fooRef = toplevel$package.foo
diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect
index 5c741a5acf74..732e9b07aa85 100644
--- a/tests/semanticdb/metac.expect
+++ b/tests/semanticdb/metac.expect
@@ -7,23 +7,22 @@ Uri => Access.scala
 Text => empty
 Language => Scala
 Symbols => 9 entries
-Occurrences => 19 entries
+Occurrences => 18 entries
 
 Symbols:
-example/Access# => class Access
-example/Access#`<init>`(). => primary ctor <init>
-example/Access#m1(). => method m1
-example/Access#m2(). => method m2
-example/Access#m3(). => method m3
-example/Access#m4(). => method m4
-example/Access#m5(). => method m5
-example/Access#m6(). => method m6
-example/Access#m7(). => method m7
+example/Access# => class Access extends Object { self: Access => +8 decls }
+example/Access#`<init>`(). => primary ctor <init> (): Access
+example/Access#m1(). => private[this] method m1 => Nothing
+example/Access#m2(). => private[this] method m2 => Nothing
+example/Access#m3(). => private[example/Access#] method m3 => Nothing
+example/Access#m4(). => protected method m4 => Nothing
+example/Access#m5(). => protected[this] method m5 => Nothing
+example/Access#m6(). => protected[example/] method m6 => Nothing
+example/Access#m7(). => method m7 => Nothing
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:6..2:12): Access <- example/Access#
-[3:2..3:2): <- example/Access#`<init>`().
 [3:14..3:16): m1 <- example/Access#m1().
 [3:19..3:22): ??? -> scala/Predef.`???`().
 [4:20..4:22): m2 <- example/Access#m2().
@@ -49,44 +48,59 @@ Schema => SemanticDB v4
 Uri => Advanced.scala
 Text => empty
 Language => Scala
-Symbols => 34 entries
-Occurrences => 90 entries
+Symbols => 48 entries
+Occurrences => 105 entries
+Synthetics => 3 entries
 
 Symbols:
-advanced/C# => class C
-advanced/C#[T] => typeparam T
-advanced/C#`<init>`(). => primary ctor <init>
-advanced/C#t(). => method t
-advanced/Structural# => class Structural
-advanced/Structural#`<init>`(). => primary ctor <init>
-advanced/Structural#s1(). => method s1
-advanced/Structural#s2(). => method s2
-advanced/Structural#s3(). => method s3
-advanced/Test. => final object Test
-advanced/Test.e. => val method e
-advanced/Test.e1. => val method e1
-advanced/Test.e1x. => val method e1x
-advanced/Test.s. => val method s
-advanced/Test.s1. => val method s1
-advanced/Test.s1x. => val method s1x
-advanced/Test.s2. => val method s2
-advanced/Test.s2x. => val method s2x
-advanced/Test.s3. => val method s3
-advanced/Test.s3x. => val method s3x
-advanced/Wildcards# => class Wildcards
-advanced/Wildcards#`<init>`(). => primary ctor <init>
-advanced/Wildcards#e1(). => method e1
-local0 => abstract val method x
-local1 => abstract val method x
-local2 => final class $anon
-local3 => val method x
-local4 => abstract method m
-local5 => param x
-local6 => final class $anon
-local7 => method m
-local8 => param x
-local9 => val local e3
-local10 => val local e3x
+advanced/C# => class C [typeparam T ] extends Object { self: C[T] => +3 decls }
+advanced/C#[T] => typeparam T 
+advanced/C#`<init>`(). => primary ctor <init> [typeparam T ](): C[T]
+advanced/C#t(). => method t => T
+advanced/HKClass# => class HKClass [typeparam F [typeparam T ] <: <?>] extends Object { self: HKClass[F] => +3 decls }
+advanced/HKClass#[F] => typeparam F [typeparam T ] <: <?>
+advanced/HKClass#[F][T] => typeparam T 
+advanced/HKClass#`<init>`(). => primary ctor <init> [typeparam F [typeparam T ] <: <?>](): HKClass[F]
+advanced/HKClass#`<init>`().[F][T] => typeparam T 
+advanced/HKClass#`<init>`().[F][U] => typeparam U 
+advanced/HKClass#foo(). => method foo [typeparam T , typeparam U ](param x: F[T, U]): String
+advanced/HKClass#foo().(x) => param x: F[T, U]
+advanced/HKClass#foo().[T] => typeparam T 
+advanced/HKClass#foo().[U] => typeparam U 
+advanced/Structural# => class Structural extends Object { self: Structural => +5 decls }
+advanced/Structural#`<init>`(). => primary ctor <init> (): Structural
+advanced/Structural#s1(). => method s1 => Object { abstract val method x Int }
+advanced/Structural#s2(). => method s2 => Object { abstract val method x Int }
+advanced/Structural#s3(). => method s3 => Object { abstract method m (param x: Int): Int }
+advanced/Structural#s4(). => method s4 (param a: Int): Object { abstract val method x Int }
+advanced/Structural#s4().(a) => param a: Int
+advanced/Test. => final object Test extends Object { self: Test.type => +11 decls }
+advanced/Test.e. => val method e Wildcards
+advanced/Test.e1. => val method e1 List[_] forSome { type _  }
+advanced/Test.e1x. => val method e1x Any
+advanced/Test.s. => val method s Structural
+advanced/Test.s1. => val method s1 Object { abstract val method x Int }
+advanced/Test.s1x. => val method s1x Int
+advanced/Test.s2. => val method s2 Object { abstract val method x Int }
+advanced/Test.s2x. => val method s2x Int
+advanced/Test.s3. => val method s3 Object { abstract method m (param x: Int): Int }
+advanced/Test.s3x. => val method s3x Int
+advanced/Wildcards# => class Wildcards extends Object { self: Wildcards => +3 decls }
+advanced/Wildcards#`<init>`(). => primary ctor <init> (): Wildcards
+advanced/Wildcards#e1(). => method e1 => List[_] forSome { type _  }
+advanced/Wildcards#e2(). => method e2 => List[_] forSome { type _  <: Int }
+local0 => abstract val method x Int
+local1 => abstract val method x Int
+local2 => val method x Int
+local3 => final class $anon extends Object { self: $anon => +2 decls }
+local5 => param x: Int
+local6 => abstract method m (param x: Int): Int
+local7 => param x: Int
+local8 => method m (param x: Int): Int
+local9 => final class $anon extends Object { self: $anon => +2 decls }
+local11 => abstract val method x Int
+local12 => val local e3: List[local13]
+local14 => val local e3x: local13
 
 Occurrences:
 [0:8..0:16): advanced <- advanced/
@@ -101,13 +115,11 @@ Occurrences:
 [5:21..5:31): Selectable -> scala/reflect/Selectable.
 [5:32..5:52): reflectiveSelectable -> scala/reflect/Selectable.reflectiveSelectable().
 [7:6..7:7): C <- advanced/C#
-[7:7..7:7): <- advanced/C#`<init>`().
 [7:8..7:9): T <- advanced/C#[T]
 [8:6..8:7): t <- advanced/C#t().
 [8:9..8:10): T -> advanced/C#[T]
 [8:13..8:16): ??? -> scala/Predef.`???`().
 [11:6..11:16): Structural <- advanced/Structural#
-[12:2..12:2): <- advanced/Structural#`<init>`().
 [12:6..12:8): s1 <- advanced/Structural#s1().
 [12:16..12:17): x <- local0
 [12:19..12:22): Int -> scala/Int#
@@ -115,70 +127,92 @@ Occurrences:
 [13:6..13:8): s2 <- advanced/Structural#s2().
 [13:16..13:17): x <- local1
 [13:19..13:22): Int -> scala/Int#
-[13:37..13:38): x <- local3
+[13:37..13:38): x <- local2
 [13:40..13:43): Int -> scala/Int#
 [13:46..13:49): ??? -> scala/Predef.`???`().
 [14:6..14:8): s3 <- advanced/Structural#s3().
-[14:16..14:17): m <- local4
+[14:16..14:17): m <- local6
 [14:18..14:19): x <- local5
 [14:21..14:24): Int -> scala/Int#
 [14:27..14:30): Int -> scala/Int#
-[14:45..14:46): m <- local7
-[14:47..14:48): x <- local8
+[14:45..14:46): m <- local8
+[14:47..14:48): x <- local7
 [14:50..14:53): Int -> scala/Int#
 [14:56..14:59): Int -> scala/Int#
 [14:62..14:65): ??? -> scala/Predef.`???`().
-[17:6..17:15): Wildcards <- advanced/Wildcards#
-[18:2..18:2): <- advanced/Wildcards#`<init>`().
-[18:6..18:8): e1 <- advanced/Wildcards#e1().
-[18:10..18:14): List -> scala/package.List#
-[18:20..18:23): ??? -> scala/Predef.`???`().
-[21:7..21:11): Test <- advanced/Test.
-[22:6..22:7): s <- advanced/Test.s.
-[22:14..22:24): Structural -> advanced/Structural#
-[22:24..22:24): -> advanced/Structural#`<init>`().
-[23:6..23:8): s1 <- advanced/Test.s1.
-[23:11..23:12): s -> advanced/Test.s.
-[23:13..23:15): s1 -> advanced/Structural#s1().
-[24:6..24:9): s1x <- advanced/Test.s1x.
-[24:12..24:12): -> scala/reflect/Selectable.reflectiveSelectable().
-[24:12..24:13): s -> advanced/Test.s.
-[24:14..24:16): s1 -> advanced/Structural#s1().
-[24:16..24:16): -> scala/reflect/Selectable#selectDynamic().
-[25:6..25:8): s2 <- advanced/Test.s2.
+[15:6..15:8): s4 <- advanced/Structural#s4().
+[15:9..15:10): a <- advanced/Structural#s4().(a)
+[15:12..15:15): Int -> scala/Int#
+[15:24..15:25): x <- local11
+[15:27..15:30): Int -> scala/Int#
+[15:35..15:38): ??? -> scala/Predef.`???`().
+[18:6..18:15): Wildcards <- advanced/Wildcards#
+[19:6..19:8): e1 <- advanced/Wildcards#e1().
+[19:10..19:14): List -> scala/package.List#
+[19:20..19:23): ??? -> scala/Predef.`???`().
+[20:6..20:8): e2 <- advanced/Wildcards#e2().
+[20:10..20:14): List -> scala/package.List#
+[20:20..20:23): Int -> scala/Int#
+[20:27..20:30): ??? -> scala/Predef.`???`().
+[23:7..23:11): Test <- advanced/Test.
+[24:6..24:7): s <- advanced/Test.s.
+[24:14..24:24): Structural -> advanced/Structural#
+[25:6..25:8): s1 <- advanced/Test.s1.
 [25:11..25:12): s -> advanced/Test.s.
-[25:13..25:15): s2 -> advanced/Structural#s2().
-[26:6..26:9): s2x <- advanced/Test.s2x.
-[26:12..26:12): -> scala/reflect/Selectable.reflectiveSelectable().
+[25:13..25:15): s1 -> advanced/Structural#s1().
+[26:6..26:9): s1x <- advanced/Test.s1x.
 [26:12..26:13): s -> advanced/Test.s.
-[26:14..26:16): s2 -> advanced/Structural#s2().
-[26:16..26:16): -> scala/reflect/Selectable#selectDynamic().
-[27:6..27:8): s3 <- advanced/Test.s3.
+[26:14..26:16): s1 -> advanced/Structural#s1().
+[27:6..27:8): s2 <- advanced/Test.s2.
 [27:11..27:12): s -> advanced/Test.s.
-[27:13..27:15): s3 -> advanced/Structural#s3().
-[28:6..28:9): s3x <- advanced/Test.s3x.
-[28:12..28:12): -> scala/reflect/Selectable.reflectiveSelectable().
+[27:13..27:15): s2 -> advanced/Structural#s2().
+[28:6..28:9): s2x <- advanced/Test.s2x.
 [28:12..28:13): s -> advanced/Test.s.
-[28:14..28:16): s3 -> advanced/Structural#s3().
-[28:16..28:16): -> scala/reflect/Selectable#applyDynamic().
-[28:19..28:22): ??? -> scala/Predef.`???`().
-[30:6..30:7): e <- advanced/Test.e.
-[30:14..30:23): Wildcards -> advanced/Wildcards#
-[30:23..30:23): -> advanced/Wildcards#`<init>`().
-[31:6..31:8): e1 <- advanced/Test.e1.
-[31:11..31:12): e -> advanced/Test.e.
-[31:13..31:15): e1 -> advanced/Wildcards#e1().
-[32:6..32:9): e1x <- advanced/Test.e1x.
-[32:12..32:13): e -> advanced/Test.e.
-[32:14..32:16): e1 -> advanced/Wildcards#e1().
-[32:17..32:21): head -> scala/collection/IterableOps#head().
-[35:5..35:8): ??? -> scala/Predef.`???`().
-[35:11..35:14): Any -> scala/Any#
-[36:11..36:13): e3 <- local9
-[36:15..36:19): List -> scala/package.List#
-[37:12..37:15): e3x <- local10
-[37:18..37:20): e3 -> local9
-[37:21..37:25): head -> scala/collection/IterableOps#head().
+[28:14..28:16): s2 -> advanced/Structural#s2().
+[29:6..29:8): s3 <- advanced/Test.s3.
+[29:11..29:12): s -> advanced/Test.s.
+[29:13..29:15): s3 -> advanced/Structural#s3().
+[30:6..30:9): s3x <- advanced/Test.s3x.
+[30:12..30:13): s -> advanced/Test.s.
+[30:14..30:16): s3 -> advanced/Structural#s3().
+[30:19..30:22): ??? -> scala/Predef.`???`().
+[32:6..32:7): e <- advanced/Test.e.
+[32:14..32:23): Wildcards -> advanced/Wildcards#
+[33:6..33:8): e1 <- advanced/Test.e1.
+[33:11..33:12): e -> advanced/Test.e.
+[33:13..33:15): e1 -> advanced/Wildcards#e1().
+[34:6..34:9): e1x <- advanced/Test.e1x.
+[34:12..34:13): e -> advanced/Test.e.
+[34:14..34:16): e1 -> advanced/Wildcards#e1().
+[34:17..34:21): head -> scala/collection/IterableOps#head().
+[37:5..37:8): ??? -> scala/Predef.`???`().
+[37:11..37:14): Any -> scala/Any#
+[38:11..38:13): e3 <- local12
+[38:15..38:19): List -> scala/package.List#
+[39:12..39:15): e3x <- local14
+[39:18..39:20): e3 -> local12
+[39:21..39:25): head -> scala/collection/IterableOps#head().
+[47:6..47:13): HKClass <- advanced/HKClass#
+[47:14..47:15): F <- advanced/HKClass#[F]
+[47:20..47:21): T <- advanced/HKClass#`<init>`().[F][T]
+[47:28..47:29): U <- advanced/HKClass#`<init>`().[F][U]
+[47:36..47:37): U -> advanced/HKClass#`<init>`().[F][U]
+[47:39..47:40): T -> advanced/HKClass#`<init>`().[F][T]
+[48:6..48:9): foo <- advanced/HKClass#foo().
+[48:10..48:11): T <- advanced/HKClass#foo().[T]
+[48:12..48:13): U <- advanced/HKClass#foo().[U]
+[48:15..48:16): x <- advanced/HKClass#foo().(x)
+[48:18..48:19): F -> advanced/HKClass#[F]
+[48:20..48:21): T -> advanced/HKClass#foo().[T]
+[48:23..48:24): U -> advanced/HKClass#foo().[U]
+[48:28..48:34): String -> scala/Predef.String#
+[48:37..48:38): x -> advanced/HKClass#foo().(x)
+[48:39..48:47): toString -> scala/Tuple2#toString().
+
+Synthetics:
+[26:12..26:16):s.s1 => reflectiveSelectable(*)
+[28:12..28:16):s.s2 => reflectiveSelectable(*)
+[30:12..30:16):s.s3 => reflectiveSelectable(*)
 
 expect/Annotations.scala
 ------------------------
@@ -188,32 +222,34 @@ Schema => SemanticDB v4
 Uri => Annotations.scala
 Text => empty
 Language => Scala
-Symbols => 22 entries
+Symbols => 23 entries
 Occurrences => 52 entries
+Synthetics => 2 entries
 
 Symbols:
-annot/Alias. => final object Alias
-annot/Alias.A# => type A
-annot/Annotations# => class Annotations
-annot/Annotations#S# => type S
-annot/Annotations#[T] => typeparam T
-annot/Annotations#`<init>`(). => primary ctor <init>
-annot/Annotations#`<init>`().(x) => param x
-annot/Annotations#field. => val method field
-annot/Annotations#method(). => method method
-annot/Annotations#x. => val method x
-annot/B# => class B
-annot/B#`<init>`(). => primary ctor <init>
-annot/B#`<init>`().(x) => param x
-annot/B#`<init>`(+1). => ctor <init>
-annot/B#x. => val method x
-annot/M. => final object M
-annot/M.m(). => macro m
-annot/M.m().[TT] => typeparam TT
-annot/T# => trait T
-annot/T#`<init>`(). => primary ctor <init>
-local0 => selfparam self
-local1 => val local local
+annot/Alias. => final object Alias extends Object { self: Alias.type => +2 decls }
+annot/Alias.A# => type A  = ClassAnnotation @param
+annot/Annotations# => @ClassAnnotation class Annotations [@TypeParameterAnnotation typeparam T ] extends Object { self: AnyRef & Annotations[T] => +6 decls }
+annot/Annotations#S# => @TypeAnnotation type S 
+annot/Annotations#[T] => @TypeParameterAnnotation typeparam T 
+annot/Annotations#`<init>`(). => primary ctor <init> [@TypeParameterAnnotation typeparam T ](@ParameterAnnotation param x: T): Annotations[T]
+annot/Annotations#`<init>`().(x) => @ParameterAnnotation param x: T
+annot/Annotations#field. => @FieldAnnotation val method field Int
+annot/Annotations#method(). => @MethodAnnotation method method => Int
+annot/Annotations#x. => @ParameterAnnotation private[this] val method x T
+annot/B# => class B extends Object { self: B => +4 decls }
+annot/B#`<init>`(). => @ConstructorAnnotation primary ctor <init> (param x: Int): B
+annot/B#`<init>`().(x) => param x: Int
+annot/B#`<init>`(+1). => @ConstructorAnnotation ctor <init> (): B
+annot/B#throwing(). => @throws[Exception] method throwing => Nothing
+annot/B#x. => private[this] val method x Int
+annot/M. => @ObjectAnnotation final object M extends Object { self: M.type => +1 decls }
+annot/M.m(). => @MacroAnnotation macro m [typeparam TT ]: Int
+annot/M.m().[TT] => typeparam TT 
+annot/T# => @TraitAnnotation trait T extends Object { self: T => +1 decls }
+annot/T#`<init>`(). => primary ctor <init> (): T
+local0 => selfparam self: AnyRef
+local1 => @LocalAnnotation val local local: Int
 
 Occurrences:
 [0:8..0:13): annot <- annot/
@@ -229,7 +265,6 @@ Occurrences:
 [4:35..4:41): macros -> scala/language.experimental.macros.
 [6:1..6:16): ClassAnnotation -> com/javacp/annot/ClassAnnotation#
 [7:6..7:17): Annotations <- annot/Annotations#
-[7:17..7:17): <- annot/Annotations#`<init>`().
 [7:19..7:42): TypeParameterAnnotation -> com/javacp/annot/TypeParameterAnnotation#
 [7:43..7:44): T <- annot/Annotations#[T]
 [7:47..7:66): ParameterAnnotation -> com/javacp/annot/ParameterAnnotation#
@@ -247,27 +282,32 @@ Occurrences:
 [17:3..17:17): TypeAnnotation -> com/javacp/annot/TypeAnnotation#
 [18:7..18:8): S <- annot/Annotations#S#
 [21:6..21:7): B <- annot/B#
-[21:7..21:7): <- annot/B#`<init>`().
 [21:9..21:30): ConstructorAnnotation -> com/javacp/annot/ConstructorAnnotation#
 [21:33..21:34): x <- annot/B#x.
 [21:36..21:39): Int -> scala/Int#
 [22:3..22:24): ConstructorAnnotation -> com/javacp/annot/ConstructorAnnotation#
-[23:6..23:12): <- annot/B#`<init>`(+1).
-[23:20..23:20): -> annot/B#`<init>`().
-[26:1..26:17): ObjectAnnotation -> com/javacp/annot/ObjectAnnotation#
-[27:7..27:8): M <- annot/M.
-[28:3..28:18): MacroAnnotation -> com/javacp/annot/MacroAnnotation#
-[29:6..29:7): m <- annot/M.m().
-[29:8..29:10): TT <- annot/M.m().[TT]
-[29:13..29:16): Int -> scala/Int#
-[29:25..29:28): ??? -> scala/Predef.`???`().
-[32:0..32:0): <- annot/T#`<init>`().
-[32:1..32:16): TraitAnnotation -> com/javacp/annot/TraitAnnotation#
-[33:6..33:7): T <- annot/T#
-[35:7..35:12): Alias <- annot/Alias.
-[36:7..36:8): A <- annot/Alias.A#
-[36:11..36:26): ClassAnnotation -> com/javacp/annot/ClassAnnotation#
-[36:28..36:33): param -> scala/annotation/meta/param#
+[23:6..23:10): <- annot/B#`<init>`(+1).
+[25:3..25:9): throws -> scala/throws#
+[25:10..25:19): Exception -> scala/package.Exception#
+[26:6..26:14): throwing <- annot/B#throwing().
+[26:27..26:36): Exception -> scala/package.Exception#
+[29:1..29:17): ObjectAnnotation -> com/javacp/annot/ObjectAnnotation#
+[30:7..30:8): M <- annot/M.
+[31:3..31:18): MacroAnnotation -> com/javacp/annot/MacroAnnotation#
+[32:6..32:7): m <- annot/M.m().
+[32:8..32:10): TT <- annot/M.m().[TT]
+[32:13..32:16): Int -> scala/Int#
+[32:25..32:28): ??? -> scala/Predef.`???`().
+[35:1..35:16): TraitAnnotation -> com/javacp/annot/TraitAnnotation#
+[36:6..36:7): T <- annot/T#
+[38:7..38:12): Alias <- annot/Alias.
+[39:7..39:8): A <- annot/Alias.A#
+[39:11..39:26): ClassAnnotation -> com/javacp/annot/ClassAnnotation#
+[39:28..39:33): param -> scala/annotation/meta/param#
+
+Synthetics:
+[25:2..25:20):@throws[Exception] => *[Exception]
+[25:2..25:20):@throws[Exception] => *[Exception]
 
 expect/Anonymous.scala
 ----------------------
@@ -277,23 +317,25 @@ Schema => SemanticDB v4
 Uri => Anonymous.scala
 Text => empty
 Language => Scala
-Symbols => 13 entries
-Occurrences => 32 entries
+Symbols => 14 entries
+Occurrences => 30 entries
+Synthetics => 2 entries
 
 Symbols:
-example/Anonymous# => class Anonymous
-example/Anonymous#Foo# => trait Foo
-example/Anonymous#Foo#`<init>`(). => primary ctor <init>
-example/Anonymous#`<init>`(). => primary ctor <init>
-example/Anonymous#foo. => val method foo
-example/Anonymous#locally(). => method locally
-example/Anonymous#locally().(x) => param x
-example/Anonymous#locally().[A] => typeparam A
-example/Anonymous#m1(). => method m1
-example/Anonymous#m1().[T] => typeparam T
-example/Anonymous#m2(). => method m2
-local0 => val local x
-local1 => final class $anon
+example/Anonymous# => class Anonymous extends Object { self: Anonymous & Anonymous => +6 decls }
+example/Anonymous#Foo# => trait Foo extends Object { self: Foo => +1 decls }
+example/Anonymous#Foo#`<init>`(). => primary ctor <init> (): Foo
+example/Anonymous#`<init>`(). => primary ctor <init> (): Anonymous
+example/Anonymous#foo. => val method foo Foo
+example/Anonymous#locally(). => method locally [typeparam A ](param x: A): A
+example/Anonymous#locally().(x) => param x: A
+example/Anonymous#locally().[A] => typeparam A 
+example/Anonymous#m1(). => method m1 [typeparam T [type _ ]]: Nothing
+example/Anonymous#m1().[T] => typeparam T [type _ ]
+example/Anonymous#m1().[T][_] => type _ 
+example/Anonymous#m2(). => method m2 => Map[_, List[_] forSome { type _  }] forSome { type _  }
+local0 => val local x: Function1[Int, Int]
+local1 => final class $anon extends Object with Foo { self: $anon => +1 decls }
 
 Occurrences:
 [0:8..0:15): example <- example/
@@ -301,7 +343,6 @@ Occurrences:
 [1:13..1:21): language -> scala/language.
 [1:22..1:33): higherKinds -> scala/language.higherKinds.
 [3:6..3:15): Anonymous <- example/Anonymous#
-[4:2..4:2): <- example/Anonymous#`<init>`().
 [4:8..4:17): Anonymous -> example/Anonymous#
 [6:6..6:13): locally <- example/Anonymous#locally().
 [6:14..6:15): A <- example/Anonymous#locally().[A]
@@ -324,11 +365,14 @@ Occurrences:
 [14:11..14:14): Int -> scala/Int#
 [14:18..14:21): Int -> scala/Int#
 [14:29..14:32): ??? -> scala/Predef.`???`().
-[17:2..17:2): <- example/Anonymous#Foo#`<init>`().
 [17:8..17:11): Foo <- example/Anonymous#Foo#
 [18:6..18:9): foo <- example/Anonymous#foo.
 [18:16..18:19): Foo -> example/Anonymous#Foo#
 
+Synthetics:
+[10:2..10:9):locally => *[Unit]
+[13:2..13:9):locally => *[Unit]
+
 expect/AnonymousGiven.scala
 ---------------------------
 
@@ -338,20 +382,18 @@ Uri => AnonymousGiven.scala
 Text => empty
 Language => Scala
 Symbols => 5 entries
-Occurrences => 6 entries
+Occurrences => 4 entries
 
 Symbols:
-angiven/AnonymousGiven$package. => final package object angiven
-angiven/AnonymousGiven$package.bar(). => method bar
-angiven/AnonymousGiven$package.bar().(x$1) => implicit param x$1
-angiven/Foo# => trait Foo
-angiven/Foo#`<init>`(). => primary ctor <init>
+angiven/AnonymousGiven$package. => final package object angiven extends Object { self: angiven.type => +2 decls }
+angiven/AnonymousGiven$package.bar(). => method bar (implicit given param x$1: Foo): Int
+angiven/AnonymousGiven$package.bar().(x$1) => implicit given param x$1: Foo
+angiven/Foo# => trait Foo extends Object { self: Foo => +1 decls }
+angiven/Foo#`<init>`(). => primary ctor <init> (): Foo
 
 Occurrences:
 [0:8..0:15): angiven <- angiven/
-[2:0..2:0): <- angiven/Foo#`<init>`().
 [2:6..2:9): Foo <- angiven/Foo#
-[4:0..4:0): <- angiven/AnonymousGiven$package.
 [4:4..4:7): bar <- angiven/AnonymousGiven$package.bar().
 [4:14..4:17): Foo -> angiven/Foo#
 
@@ -364,118 +406,119 @@ Uri => Classes.scala
 Text => empty
 Language => Scala
 Symbols => 109 entries
-Occurrences => 130 entries
+Occurrences => 113 entries
+Synthetics => 2 entries
 
 Symbols:
-classes/C1# => final class C1
-classes/C1#`<init>`(). => primary ctor <init>
-classes/C1#`<init>`().(x1) => val param x1
-classes/C1#x1. => val method x1
-classes/C1. => final object C1
-classes/C2# => final class C2
-classes/C2#`<init>`(). => primary ctor <init>
-classes/C2#`<init>`().(x2) => val param x2
-classes/C2#x2. => val method x2
-classes/C2. => final object C2
-classes/C3# => case class C3
-classes/C3#_1(). => method _1
-classes/C3#`<init>`(). => primary ctor <init>
-classes/C3#`<init>`().(x) => val param x
-classes/C3#copy$default$1(). => method copy$default$1
-classes/C3#copy(). => method copy
-classes/C3#copy().(x) => param x
-classes/C3#x. => val method x
-classes/C3. => final object C3
-classes/C3.apply(). => method apply
-classes/C3.apply().(x) => param x
-classes/C3.toString(). => method toString
-classes/C3.unapply(). => method unapply
-classes/C3.unapply().(x$1) => param x$1
-classes/C4# => case class C4
-classes/C4#_1(). => method _1
-classes/C4#`<init>`(). => primary ctor <init>
-classes/C4#`<init>`().(x) => val param x
-classes/C4#copy$default$1(). => method copy$default$1
-classes/C4#copy(). => method copy
-classes/C4#copy().(x) => param x
-classes/C4#x. => val method x
-classes/C4. => final object C4
-classes/C4.apply(). => method apply
-classes/C4.apply().(x) => param x
-classes/C4.toString(). => method toString
-classes/C4.unapply(). => method unapply
-classes/C4.unapply().(x$1) => param x$1
-classes/C6# => case class C6
-classes/C6#_1(). => method _1
-classes/C6#`<init>`(). => primary ctor <init>
-classes/C6#`<init>`().(x) => param x
-classes/C6#copy$default$1(). => method copy$default$1
-classes/C6#copy(). => method copy
-classes/C6#copy().(x) => param x
-classes/C6#x. => val method x
-classes/C6. => final object C6
-classes/C6.apply(). => method apply
-classes/C6.apply().(x) => param x
-classes/C6.toString(). => method toString
-classes/C6.unapply(). => method unapply
-classes/C6.unapply().(x$1) => param x$1
-classes/C7# => class C7
-classes/C7#`<init>`(). => primary ctor <init>
-classes/C7#`<init>`().(x) => param x
-classes/C7#x. => val method x
-classes/C8# => class C8
-classes/C8#`<init>`(). => primary ctor <init>
-classes/C8#`<init>`().(x) => param x
-classes/C8#x. => val method x
-classes/C9# => class C9
-classes/C9#`<init>`(). => primary ctor <init>
-classes/C9#`<init>`().(x) => param x
-classes/C9#x(). => var method x
-classes/C10# => class C10
-classes/C10#`<init>`(). => primary ctor <init>
-classes/C10#`<init>`().(s) => param s
-classes/C10#s. => val method s
-classes/C11# => class C11
-classes/C11#`<init>`(). => primary ctor <init>
-classes/C11#foo(). => macro foo
-classes/C11#foo(). => macro foo
-classes/C12# => class C12
-classes/C12#Context# => class Context
-classes/C12#Context#Expr# => type Expr
-classes/C12#Context#Expr#[T] => typeparam T
-classes/C12#Context#`<init>`(). => primary ctor <init>
-classes/C12#`<init>`(). => primary ctor <init>
-classes/C12#foo1(). => macro foo1
-classes/C12#foo1(). => method foo1
-classes/C12#foo1().(x) => param x
-classes/C12#foo1().(x) => param x
-classes/C12#foo1Impl(). => method foo1Impl
-classes/C12#foo1Impl().(context) => param context
-classes/C12#foo1Impl().(x) => param x
-classes/C12#foo2(). => macro foo2
-classes/C12#foo2(). => method foo2
-classes/C12#foo2().(x) => param x
-classes/C12#foo2().(x) => param x
-classes/C12#foo2().(y) => param y
-classes/C12#foo2().(y) => param y
-classes/C12#foo2Impl(). => method foo2Impl
-classes/C12#foo2Impl().(context) => param context
-classes/C12#foo2Impl().(x) => param x
-classes/C12#foo2Impl().(y) => param y
-classes/M. => final object M
-classes/M.C5# => class C5
-classes/M.C5#`<init>`(). => primary ctor <init>
-classes/M.C5#`<init>`().(x) => param x
-classes/M.C5#x. => val method x
-classes/M.C5(). => final implicit method C5
-classes/M.C5().(x) => param x
-classes/N. => final object N
-classes/N.anonClass. => val method anonClass
-classes/N.anonFun. => val method anonFun
-local0 => final class $anon
-local1 => val method local
-local2 => param i
-local3 => val local local
+classes/C1# => final class C1 extends AnyVal { self: C1 => +2 decls }
+classes/C1#`<init>`(). => primary ctor <init> (val param x1: Int): C1
+classes/C1#`<init>`().(x1) => val param x1: Int
+classes/C1#x1. => val method x1 Int
+classes/C1. => final object C1 extends Object { self: C1.type => +2 decls }
+classes/C2# => final class C2 extends AnyVal { self: C2 => +2 decls }
+classes/C2#`<init>`(). => primary ctor <init> (val param x2: Int): C2
+classes/C2#`<init>`().(x2) => val param x2: Int
+classes/C2#x2. => val method x2 Int
+classes/C2. => final object C2 extends Object { self: C2.type => +2 decls }
+classes/C3# => case class C3 extends Object with Product with Serializable { self: C3 => +5 decls }
+classes/C3#_1(). => method _1 => Int
+classes/C3#`<init>`(). => primary ctor <init> (val param x: Int): C3
+classes/C3#`<init>`().(x) => val param x: Int
+classes/C3#copy$default$1(). => method copy$default$1 => Int @uncheckedVariance
+classes/C3#copy(). => method copy (param x: Int): C3
+classes/C3#copy().(x) => param x: Int
+classes/C3#x. => val method x Int
+classes/C3. => final object C3 extends Object { self: C3.type => +4 decls }
+classes/C3.apply(). => method apply (param x: Int): C3
+classes/C3.apply().(x) => param x: Int
+classes/C3.toString(). => method toString => String <: scala/Any#toString().
+classes/C3.unapply(). => method unapply (param x$1: C3): C3
+classes/C3.unapply().(x$1) => param x$1: C3
+classes/C4# => case class C4 extends Object with Product with Serializable { self: C4 => +5 decls }
+classes/C4#_1(). => method _1 => Int
+classes/C4#`<init>`(). => primary ctor <init> (val param x: Int): C4
+classes/C4#`<init>`().(x) => val param x: Int
+classes/C4#copy$default$1(). => method copy$default$1 => Int @uncheckedVariance
+classes/C4#copy(). => method copy (param x: Int): C4
+classes/C4#copy().(x) => param x: Int
+classes/C4#x. => val method x Int
+classes/C4. => final object C4 extends Object { self: C4.type => +4 decls }
+classes/C4.apply(). => method apply (param x: Int): C4
+classes/C4.apply().(x) => param x: Int
+classes/C4.toString(). => method toString => String <: scala/Any#toString().
+classes/C4.unapply(). => method unapply (param x$1: C4): C4
+classes/C4.unapply().(x$1) => param x$1: C4
+classes/C6# => case class C6 extends Object with Product with Serializable { self: C6 => +5 decls }
+classes/C6#_1(). => method _1 => Int
+classes/C6#`<init>`(). => primary ctor <init> (param x: Int): C6
+classes/C6#`<init>`().(x) => param x: Int
+classes/C6#copy$default$1(). => method copy$default$1 => Int @uncheckedVariance
+classes/C6#copy(). => method copy (param x: Int): C6
+classes/C6#copy().(x) => param x: Int
+classes/C6#x. => private val method x Int
+classes/C6. => final object C6 extends Object { self: C6.type => +4 decls }
+classes/C6.apply(). => method apply (param x: Int): C6
+classes/C6.apply().(x) => param x: Int
+classes/C6.toString(). => method toString => String <: scala/Any#toString().
+classes/C6.unapply(). => method unapply (param x$1: C6): C6
+classes/C6.unapply().(x$1) => param x$1: C6
+classes/C7# => class C7 extends Object { self: C7 => +2 decls }
+classes/C7#`<init>`(). => primary ctor <init> (param x: Int): C7
+classes/C7#`<init>`().(x) => param x: Int
+classes/C7#x. => private[this] val method x Int
+classes/C8# => class C8 extends Object { self: C8 => +2 decls }
+classes/C8#`<init>`(). => primary ctor <init> (param x: Int): C8
+classes/C8#`<init>`().(x) => param x: Int
+classes/C8#x. => private[this] val method x Int
+classes/C9# => class C9 extends Object { self: C9 => +2 decls }
+classes/C9#`<init>`(). => primary ctor <init> (param x: Int): C9
+classes/C9#`<init>`().(x) => param x: Int
+classes/C9#x(). => private[this] var method x Int
+classes/C10# => class C10 extends Object { self: C10 => +2 decls }
+classes/C10#`<init>`(). => primary ctor <init> (param s: => String): C10
+classes/C10#`<init>`().(s) => param s: => String
+classes/C10#s. => private[this] val method s => String
+classes/C11# => class C11 extends Object { self: C11 => +2 decls }
+classes/C11#`<init>`(). => primary ctor <init> (): C11
+classes/C11#foo(). => macro foo => Int
+classes/C11#foo(). => inline macro foo => Int
+classes/C12# => class C12 extends Object { self: C12 => +8 decls }
+classes/C12#Context# => class Context extends Object { self: Context => +2 decls }
+classes/C12#Context#Expr# => type Expr [typeparam T ]
+classes/C12#Context#Expr#[T] => typeparam T 
+classes/C12#Context#`<init>`(). => primary ctor <init> (): Context
+classes/C12#`<init>`(). => primary ctor <init> (): C12
+classes/C12#foo1(). => macro foo1 (param x: Int): Int
+classes/C12#foo1(). => method foo1 (param x: Int): Int
+classes/C12#foo1().(x) => param x: Int
+classes/C12#foo1().(x) => param x: Int
+classes/C12#foo1Impl(). => method foo1Impl (param context: Context)(param x: context.Expr[Int]): context.Expr[Int]
+classes/C12#foo1Impl().(context) => param context: Context
+classes/C12#foo1Impl().(x) => param x: context.Expr[Int]
+classes/C12#foo2(). => macro foo2 (param x: Int, param y: String): Int
+classes/C12#foo2(). => method foo2 (param x: Int, param y: String): Int
+classes/C12#foo2().(x) => param x: Int
+classes/C12#foo2().(x) => param x: Int
+classes/C12#foo2().(y) => param y: String
+classes/C12#foo2().(y) => param y: String
+classes/C12#foo2Impl(). => method foo2Impl (param context: Context)(param x: context.Expr[Int], param y: context.Expr[String]): context.Expr[Int]
+classes/C12#foo2Impl().(context) => param context: Context
+classes/C12#foo2Impl().(x) => param x: context.Expr[Int]
+classes/C12#foo2Impl().(y) => param y: context.Expr[String]
+classes/M. => final object M extends Object { self: M.type => +3 decls }
+classes/M.C5# => implicit class C5 extends Object { self: C5 => +2 decls }
+classes/M.C5#`<init>`(). => primary ctor <init> (param x: Int): C5
+classes/M.C5#`<init>`().(x) => param x: Int
+classes/M.C5#x. => private[this] val method x Int
+classes/M.C5(). => final implicit method C5 (param x: Int): C5
+classes/M.C5().(x) => param x: Int
+classes/N. => final object N extends Object { self: N.type => +3 decls }
+classes/N.anonClass. => val method anonClass C7
+classes/N.anonFun. => val method anonFun List[Int]
+local0 => val method local Nothing
+local1 => final class $anon extends C7 { self: $anon => +2 decls }
+local3 => param i: Int
+local4 => val local local: Int
 
 Occurrences:
 [0:8..0:15): classes <- classes/
@@ -484,54 +527,41 @@ Occurrences:
 [1:22..1:34): experimental -> scala/language.experimental.
 [1:35..1:41): macros -> scala/language.experimental.macros.
 [2:6..2:8): C1 <- classes/C1#
-[2:8..2:8): <- classes/C1#`<init>`().
 [2:13..2:15): x1 <- classes/C1#x1.
 [2:17..2:20): Int -> scala/Int#
 [2:30..2:36): AnyVal -> scala/AnyVal#
-[2:36..2:36): -> scala/AnyVal#`<init>`().
 [4:6..4:8): C2 <- classes/C2#
-[4:8..4:8): <- classes/C2#`<init>`().
 [4:13..4:15): x2 <- classes/C2#x2.
 [4:17..4:20): Int -> scala/Int#
 [4:30..4:36): AnyVal -> scala/AnyVal#
-[4:36..4:36): -> scala/AnyVal#`<init>`().
 [5:7..5:9): C2 <- classes/C2.
 [7:11..7:13): C3 <- classes/C3#
-[7:13..7:13): <- classes/C3#`<init>`().
 [7:14..7:15): x <- classes/C3#x.
 [7:17..7:20): Int -> scala/Int#
 [9:11..9:13): C4 <- classes/C4#
-[9:13..9:13): <- classes/C4#`<init>`().
 [9:14..9:15): x <- classes/C4#x.
 [9:17..9:20): Int -> scala/Int#
 [10:7..10:9): C4 <- classes/C4.
 [12:7..12:8): M <- classes/M.
 [13:17..13:19): C5 <- classes/M.C5#
-[13:19..13:19): <- classes/M.C5#`<init>`().
 [13:20..13:21): x <- classes/M.C5#x.
 [13:23..13:26): Int -> scala/Int#
 [16:11..16:13): C6 <- classes/C6#
-[16:13..16:13): <- classes/C6#`<init>`().
 [16:26..16:27): x <- classes/C6#x.
 [16:29..16:32): Int -> scala/Int#
 [18:6..18:8): C7 <- classes/C7#
-[18:8..18:8): <- classes/C7#`<init>`().
 [18:9..18:10): x <- classes/C7#x.
 [18:12..18:15): Int -> scala/Int#
 [20:6..20:8): C8 <- classes/C8#
-[20:8..20:8): <- classes/C8#`<init>`().
 [20:27..20:28): x <- classes/C8#x.
 [20:30..20:33): Int -> scala/Int#
 [22:6..22:8): C9 <- classes/C9#
-[22:8..22:8): <- classes/C9#`<init>`().
 [22:27..22:28): x <- classes/C9#x().
 [22:30..22:33): Int -> scala/Int#
 [24:6..24:9): C10 <- classes/C10#
-[24:9..24:9): <- classes/C10#`<init>`().
 [24:10..24:11): s <- classes/C10#s.
 [24:16..24:22): String -> scala/Predef.String#
 [26:6..26:9): C11 <- classes/C11#
-[27:2..27:2): <- classes/C11#`<init>`().
 [27:6..27:9): foo <- classes/C11#foo().
 [27:11..27:14): Int -> scala/Int#
 [27:23..27:26): ??? -> scala/Predef.`???`().
@@ -539,9 +569,7 @@ Occurrences:
 [28:18..28:21): Int -> scala/Int#
 [28:24..28:27): ??? -> scala/Predef.`???`().
 [31:6..31:9): C12 <- classes/C12#
-[33:2..33:2): <- classes/C12#`<init>`().
 [33:8..33:15): Context <- classes/C12#Context#
-[34:4..34:4): <- classes/C12#Context#`<init>`().
 [34:9..34:13): Expr <- classes/C12#Context#Expr#
 [34:14..34:15): T <- classes/C12#Context#Expr#[T]
 [36:6..36:10): foo1 <- classes/C12#foo1().
@@ -597,18 +625,20 @@ Occurrences:
 [47:7..47:8): N <- classes/N.
 [48:6..48:15): anonClass <- classes/N.anonClass.
 [48:22..48:24): C7 -> classes/C7#
-[48:24..48:24): -> classes/C7#`<init>`().
-[49:8..49:13): local <- local1
+[49:8..49:13): local <- local0
 [49:16..49:19): ??? -> scala/Predef.`???`().
 [51:6..51:13): anonFun <- classes/N.anonFun.
 [51:16..51:20): List -> scala/package.List.
-[51:20..51:20): -> scala/collection/IterableFactory#apply().
 [51:24..51:27): map -> scala/collection/immutable/List#map().
-[51:30..51:31): i <- local2
-[52:8..52:13): local <- local3
-[53:4..53:9): local -> local3
+[51:30..51:31): i <- local3
+[52:8..52:13): local <- local4
+[53:4..53:9): local -> local4
 [53:10..53:11): + -> scala/Int#`+`(+4).
 
+Synthetics:
+[51:16..51:27):List(1).map => *[Int]
+[51:16..51:20):List => *.apply[Int]
+
 expect/Empty.scala
 ------------------
 
@@ -618,24 +648,22 @@ Uri => Empty.scala
 Text => empty
 Language => Scala
 Symbols => 6 entries
-Occurrences => 10 entries
+Occurrences => 8 entries
 
 Symbols:
-_empty_/A# => class A
-_empty_/A#`<init>`(). => primary ctor <init>
-_empty_/A#b(). => method b
-_empty_/B# => class B
-_empty_/B#`<init>`(). => primary ctor <init>
-_empty_/B#a(). => method a
+_empty_/A# => class A extends Object { self: A => +2 decls }
+_empty_/A#`<init>`(). => primary ctor <init> (): A
+_empty_/A#b(). => method b => B
+_empty_/B# => class B extends Object { self: B => +2 decls }
+_empty_/B#`<init>`(). => primary ctor <init> (): B
+_empty_/B#a(). => method a => A
 
 Occurrences:
 [0:6..0:7): A <- _empty_/A#
-[1:2..1:2): <- _empty_/A#`<init>`().
 [1:6..1:7): b <- _empty_/A#b().
 [1:9..1:10): B -> _empty_/B#
 [1:13..1:16): ??? -> scala/Predef.`???`().
 [4:6..4:7): B <- _empty_/B#
-[5:2..5:2): <- _empty_/B#`<init>`().
 [5:6..5:7): a <- _empty_/B#a().
 [5:9..5:10): A -> _empty_/A#
 [5:13..5:16): ??? -> scala/Predef.`???`().
@@ -652,12 +680,110 @@ Symbols => 1 entries
 Occurrences => 2 entries
 
 Symbols:
-example/EmptyObject. => final object EmptyObject
+example/EmptyObject. => final object EmptyObject extends Object { self: EmptyObject.type => +1 decls }
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:7..2:18): EmptyObject <- example/EmptyObject.
 
+expect/EndMarkers.scala
+-----------------------
+
+Summary:
+Schema => SemanticDB v4
+Uri => EndMarkers.scala
+Text => empty
+Language => Scala
+Symbols => 24 entries
+Occurrences => 37 entries
+
+Symbols:
+endmarkers/Container# => class Container extends Object { self: Container => +5 decls }
+endmarkers/Container#`<init>`(). => primary ctor <init> (): Container
+endmarkers/Container#`baz_=`(). => var method baz_= (param x$1: Int): Unit
+endmarkers/Container#`baz_=`().(x$1) => param x$1: Int
+endmarkers/Container#bar. => val method bar Tuple3[Int, Int, Int]
+endmarkers/Container#baz(). => var method baz Int
+endmarkers/Container#foo(). => method foo => Tuple3[Int, Int, Int]
+endmarkers/EndMarkers$package. => final package object endmarkers extends Object { self: endmarkers.type => +6 decls }
+endmarkers/EndMarkers$package.`topLevelVar_=`(). => var method topLevelVar_= (param x$1: String): Unit
+endmarkers/EndMarkers$package.`topLevelVar_=`().(x$1) => param x$1: String
+endmarkers/EndMarkers$package.topLevelMethod(). => method topLevelMethod => String
+endmarkers/EndMarkers$package.topLevelVal. => val method topLevelVal Int
+endmarkers/EndMarkers$package.topLevelVar(). => var method topLevelVar String
+endmarkers/EndMarkers$package.topLevelWithLocals(). => method topLevelWithLocals => Unit
+endmarkers/MultiCtor# => class MultiCtor extends Object { self: MultiCtor => +3 decls }
+endmarkers/MultiCtor#`<init>`(). => primary ctor <init> (val param i: Int): MultiCtor
+endmarkers/MultiCtor#`<init>`().(i) => val param i: Int
+endmarkers/MultiCtor#`<init>`(+1). => ctor <init> (): MultiCtor
+endmarkers/MultiCtor#i. => val method i Int
+endmarkers/TestObj. => final object TestObj extends Object { self: TestObj.type => +2 decls }
+endmarkers/TestObj.foo(). => method foo => Int
+local0 => val local localVal: Int
+local1 => var local localVar: Int
+local2 => local localDef: => Int
+
+Occurrences:
+[0:8..0:18): endmarkers <- endmarkers/
+[2:8..2:17): MultiCtor <- endmarkers/MultiCtor#
+[2:22..2:23): i <- endmarkers/MultiCtor#i.
+[2:25..2:28): Int -> scala/Int#
+[3:8..3:12): <- endmarkers/MultiCtor#`<init>`(+1).
+[5:8..5:12): this -> endmarkers/MultiCtor#`<init>`(+1).
+[6:6..6:15): MultiCtor -> endmarkers/MultiCtor#
+[8:6..8:20): topLevelMethod <- endmarkers/EndMarkers$package.topLevelMethod().
+[8:22..8:28): String -> scala/Predef.String#
+[10:6..10:20): topLevelMethod -> endmarkers/EndMarkers$package.topLevelMethod().
+[12:6..12:17): topLevelVal <- endmarkers/EndMarkers$package.topLevelVal.
+[12:19..12:22): Int -> scala/Int#
+[14:6..14:17): topLevelVal -> endmarkers/EndMarkers$package.topLevelVal.
+[16:6..16:17): topLevelVar <- endmarkers/EndMarkers$package.topLevelVar().
+[16:19..16:25): String -> scala/Predef.String#
+[18:6..18:17): topLevelVar -> endmarkers/EndMarkers$package.topLevelVar().
+[20:8..20:17): Container <- endmarkers/Container#
+[22:8..22:11): foo <- endmarkers/Container#foo().
+[24:8..24:11): foo -> endmarkers/Container#foo().
+[26:8..26:11): bar <- endmarkers/Container#bar.
+[28:8..28:11): bar -> endmarkers/Container#bar.
+[30:8..30:11): baz <- endmarkers/Container#baz().
+[32:8..32:11): baz -> endmarkers/Container#baz().
+[34:6..34:15): Container -> endmarkers/Container#
+[36:6..36:24): topLevelWithLocals <- endmarkers/EndMarkers$package.topLevelWithLocals().
+[36:26..36:30): Unit -> scala/Unit#
+[38:8..38:16): localVal <- local0
+[40:8..40:16): localVal -> local0
+[42:8..42:16): localVar <- local1
+[44:8..44:16): localVar -> local1
+[46:8..46:16): localDef <- local2
+[48:8..48:16): localDef -> local2
+[50:6..50:24): topLevelWithLocals -> endmarkers/EndMarkers$package.topLevelWithLocals().
+[52:9..52:16): TestObj <- endmarkers/TestObj.
+[54:8..54:11): foo <- endmarkers/TestObj.foo().
+[56:6..56:13): TestObj -> endmarkers/TestObj.
+[58:4..58:14): endmarkers -> endmarkers/
+
+expect/EndMarkers2.scala
+------------------------
+
+Summary:
+Schema => SemanticDB v4
+Uri => EndMarkers2.scala
+Text => empty
+Language => Scala
+Symbols => 2 entries
+Occurrences => 5 entries
+
+Symbols:
+endmarkers2/package. => final package object endmarkers2 extends Object { self: endmarkers2.type => +2 decls }
+endmarkers2/package.Foo# => type Foo  = Unit
+
+Occurrences:
+[0:15..0:26): endmarkers2 <- endmarkers2/package.
+[2:7..2:10): Foo <- endmarkers2/package.Foo#
+[3:4..3:8): Unit -> scala/Unit#
+[4:6..4:9): Foo -> endmarkers2/package.Foo#
+[6:4..6:15): endmarkers2 -> endmarkers2/package.
+
 expect/EnumVal.scala
 --------------------
 
@@ -667,48 +793,43 @@ Uri => EnumVal.scala
 Text => empty
 Language => Scala
 Symbols => 16 entries
-Occurrences => 21 entries
+Occurrences => 16 entries
 
 Symbols:
-enumVal/A# => trait A
-enumVal/A#`<init>`(). => primary ctor <init>
-enumVal/Color# => abstract sealed enum class Color
-enumVal/Color#`<init>`(). => primary ctor <init>
-enumVal/Color#`<init>`().(rgb) => val param rgb
-enumVal/Color#rgb. => val method rgb
-enumVal/Color. => final object Color
-enumVal/Color.$values. => val method $values
-enumVal/Color.Blue. => case val static enum method Blue
-enumVal/Color.Green. => case val static enum method Green
-enumVal/Color.Red. => case val static enum method Red
-enumVal/Color.fromOrdinal(). => method fromOrdinal
-enumVal/Color.fromOrdinal().(ordinal) => param ordinal
-enumVal/Color.valueOf(). => method valueOf
-enumVal/Color.valueOf().($name) => param $name
-enumVal/Color.values(). => method values
+enumVal/A# => trait A extends Object { self: A => +1 decls }
+enumVal/A#`<init>`(). => primary ctor <init> (): A
+enumVal/Color# => abstract sealed enum class Color extends Object with Enum { self: Color => +2 decls }
+enumVal/Color#`<init>`(). => primary ctor <init> (val param rgb: Int): Color
+enumVal/Color#`<init>`().(rgb) => val param rgb: Int
+enumVal/Color#rgb. => val method rgb Int
+enumVal/Color. => final object Color extends Object { self: Color.type => +8 decls }
+enumVal/Color.$values. => private[this] val method $values Array[Color]
+enumVal/Color.Blue. => case val static enum method Blue Color
+enumVal/Color.Green. => case val static enum method Green Color & A
+enumVal/Color.Red. => case val static enum method Red Color
+enumVal/Color.fromOrdinal(). => method fromOrdinal (param ordinal: Int): Color
+enumVal/Color.fromOrdinal().(ordinal) => param ordinal: Int
+enumVal/Color.valueOf(). => method valueOf (param $name: String): Color
+enumVal/Color.valueOf().($name) => param $name: String
+enumVal/Color.values(). => method values => Array[Color]
 
 Occurrences:
 [0:8..0:15): enumVal <- enumVal/
 [2:7..2:12): scala -> scala/
 [2:13..2:20): runtime -> scala/runtime/
 [2:21..2:30): EnumValue -> scala/runtime/EnumValue.
-[5:0..5:0): <- enumVal/A#`<init>`().
 [5:6..5:7): A <- enumVal/A#
 [7:5..7:10): Color <- enumVal/Color#
-[7:10..7:10): <- enumVal/Color#`<init>`().
 [7:15..7:18): rgb <- enumVal/Color#rgb.
 [7:20..7:23): Int -> scala/Int#
 [8:7..8:10): Red <- enumVal/Color.Red.
 [8:21..8:26): Color -> enumVal/Color#
-[8:26..8:26): -> enumVal/Color#`<init>`().
 [8:42..8:51): EnumValue -> scala/runtime/EnumValue#
 [9:7..9:12): Green <- enumVal/Color.Green.
 [9:21..9:26): Color -> enumVal/Color#
-[9:26..9:26): -> enumVal/Color#`<init>`().
 [9:42..9:43): A -> enumVal/A#
 [10:7..10:11): Blue <- enumVal/Color.Blue.
 [10:21..10:26): Color -> enumVal/Color#
-[10:26..10:26): -> enumVal/Color#`<init>`().
 
 expect/Enums.scala
 ------------------
@@ -719,210 +840,207 @@ Uri => Enums.scala
 Text => empty
 Language => Scala
 Symbols => 181 entries
-Occurrences => 184 entries
+Occurrences => 148 entries
+Synthetics => 10 entries
 
 Symbols:
-_empty_/Enums. => final object Enums
-_empty_/Enums.Coin# => abstract sealed enum class Coin
-_empty_/Enums.Coin#`<init>`(). => primary ctor <init>
-_empty_/Enums.Coin#`<init>`().(value) => param value
-_empty_/Enums.Coin#value. => val method value
-_empty_/Enums.Coin. => final object Coin
-_empty_/Enums.Coin.$values. => val method $values
-_empty_/Enums.Coin.Dime. => case val static enum method Dime
-_empty_/Enums.Coin.Dollar. => case val static enum method Dollar
-_empty_/Enums.Coin.Nickel. => case val static enum method Nickel
-_empty_/Enums.Coin.Penny. => case val static enum method Penny
-_empty_/Enums.Coin.Quarter. => case val static enum method Quarter
-_empty_/Enums.Coin.fromOrdinal(). => method fromOrdinal
-_empty_/Enums.Coin.fromOrdinal().(ordinal) => param ordinal
-_empty_/Enums.Coin.valueOf(). => method valueOf
-_empty_/Enums.Coin.valueOf().($name) => param $name
-_empty_/Enums.Coin.values(). => method values
-_empty_/Enums.Colour# => abstract sealed enum class Colour
-_empty_/Enums.Colour#`<init>`(). => primary ctor <init>
-_empty_/Enums.Colour. => final object Colour
-_empty_/Enums.Colour.$new(). => method $new
-_empty_/Enums.Colour.$new().($name) => param $name
-_empty_/Enums.Colour.$new().(_$ordinal) => param _$ordinal
-_empty_/Enums.Colour.$values. => val method $values
-_empty_/Enums.Colour.Blue. => case val static enum method Blue
-_empty_/Enums.Colour.Green. => case val static enum method Green
-_empty_/Enums.Colour.Red. => case val static enum method Red
-_empty_/Enums.Colour.fromOrdinal(). => method fromOrdinal
-_empty_/Enums.Colour.fromOrdinal().(ordinal) => param ordinal
-_empty_/Enums.Colour.valueOf(). => method valueOf
-_empty_/Enums.Colour.valueOf().($name) => param $name
-_empty_/Enums.Colour.values(). => method values
-_empty_/Enums.Directions# => abstract sealed enum class Directions
-_empty_/Enums.Directions#`<init>`(). => primary ctor <init>
-_empty_/Enums.Directions. => final object Directions
-_empty_/Enums.Directions.$new(). => method $new
-_empty_/Enums.Directions.$new().($name) => param $name
-_empty_/Enums.Directions.$new().(_$ordinal) => param _$ordinal
-_empty_/Enums.Directions.$values. => val method $values
-_empty_/Enums.Directions.East. => case val static enum method East
-_empty_/Enums.Directions.North. => case val static enum method North
-_empty_/Enums.Directions.South. => case val static enum method South
-_empty_/Enums.Directions.West. => case val static enum method West
-_empty_/Enums.Directions.fromOrdinal(). => method fromOrdinal
-_empty_/Enums.Directions.fromOrdinal().(ordinal) => param ordinal
-_empty_/Enums.Directions.valueOf(). => method valueOf
-_empty_/Enums.Directions.valueOf().($name) => param $name
-_empty_/Enums.Directions.values(). => method values
-_empty_/Enums.Maybe# => abstract sealed enum class Maybe
-_empty_/Enums.Maybe#[A] => covariant typeparam A
-_empty_/Enums.Maybe#`<init>`(). => primary ctor <init>
-_empty_/Enums.Maybe. => final object Maybe
-_empty_/Enums.Maybe.Just# => final case enum class Just
-_empty_/Enums.Maybe.Just#[A] => covariant typeparam A
-_empty_/Enums.Maybe.Just#_1(). => method _1
-_empty_/Enums.Maybe.Just#`<init>`(). => primary ctor <init>
-_empty_/Enums.Maybe.Just#`<init>`().(value) => val param value
-_empty_/Enums.Maybe.Just#copy$default$1(). => method copy$default$1
-_empty_/Enums.Maybe.Just#copy$default$1().[A] => typeparam A
-_empty_/Enums.Maybe.Just#copy(). => method copy
-_empty_/Enums.Maybe.Just#copy().(value) => param value
-_empty_/Enums.Maybe.Just#copy().[A] => typeparam A
-_empty_/Enums.Maybe.Just#ordinal(). => method ordinal
-_empty_/Enums.Maybe.Just#value. => val method value
-_empty_/Enums.Maybe.Just. => final object Just
-_empty_/Enums.Maybe.Just.apply(). => method apply
-_empty_/Enums.Maybe.Just.apply().(value) => param value
-_empty_/Enums.Maybe.Just.apply().[A] => typeparam A
-_empty_/Enums.Maybe.Just.toString(). => method toString
-_empty_/Enums.Maybe.Just.unapply(). => method unapply
-_empty_/Enums.Maybe.Just.unapply().(x$1) => param x$1
-_empty_/Enums.Maybe.Just.unapply().[A] => typeparam A
-_empty_/Enums.Maybe.None. => case val static enum method None
-_empty_/Enums.Maybe.fromOrdinal(). => method fromOrdinal
-_empty_/Enums.Maybe.fromOrdinal().(ordinal) => param ordinal
-_empty_/Enums.Planet# => abstract sealed enum class Planet
-_empty_/Enums.Planet#G. => final val method G
-_empty_/Enums.Planet#`<init>`(). => primary ctor <init>
-_empty_/Enums.Planet#`<init>`().(mass) => param mass
-_empty_/Enums.Planet#`<init>`().(radius) => param radius
-_empty_/Enums.Planet#mass. => val method mass
-_empty_/Enums.Planet#radius. => val method radius
-_empty_/Enums.Planet#surfaceGravity(). => method surfaceGravity
-_empty_/Enums.Planet#surfaceWeight(). => method surfaceWeight
-_empty_/Enums.Planet#surfaceWeight().(otherMass) => param otherMass
-_empty_/Enums.Planet. => final object Planet
-_empty_/Enums.Planet.$values. => val method $values
-_empty_/Enums.Planet.Earth. => case val static enum method Earth
-_empty_/Enums.Planet.Jupiter. => case val static enum method Jupiter
-_empty_/Enums.Planet.Mars. => case val static enum method Mars
-_empty_/Enums.Planet.Mercury. => case val static enum method Mercury
-_empty_/Enums.Planet.Neptune. => case val static enum method Neptune
-_empty_/Enums.Planet.Saturn. => case val static enum method Saturn
-_empty_/Enums.Planet.Uranus. => case val static enum method Uranus
-_empty_/Enums.Planet.Venus. => case val static enum method Venus
-_empty_/Enums.Planet.fromOrdinal(). => method fromOrdinal
-_empty_/Enums.Planet.fromOrdinal().(ordinal) => param ordinal
-_empty_/Enums.Planet.valueOf(). => method valueOf
-_empty_/Enums.Planet.valueOf().($name) => param $name
-_empty_/Enums.Planet.values(). => method values
-_empty_/Enums.Suits# => abstract sealed enum class Suits
-_empty_/Enums.Suits#`<init>`(). => primary ctor <init>
-_empty_/Enums.Suits. => final object Suits
-_empty_/Enums.Suits.$new(). => method $new
-_empty_/Enums.Suits.$new().($name) => param $name
-_empty_/Enums.Suits.$new().(_$ordinal) => param _$ordinal
-_empty_/Enums.Suits.$values. => val method $values
-_empty_/Enums.Suits.Clubs. => case val static enum method Clubs
-_empty_/Enums.Suits.Diamonds. => case val static enum method Diamonds
-_empty_/Enums.Suits.Hearts. => case val static enum method Hearts
-_empty_/Enums.Suits.Spades. => case val static enum method Spades
-_empty_/Enums.Suits.derived$CanEqual. => implicit lazy val method derived$CanEqual
-_empty_/Enums.Suits.fromOrdinal(). => method fromOrdinal
-_empty_/Enums.Suits.fromOrdinal().(ordinal) => param ordinal
-_empty_/Enums.Suits.isBlack(). => method isBlack
-_empty_/Enums.Suits.isBlack().(suit) => param suit
-_empty_/Enums.Suits.isRed(). => method isRed
-_empty_/Enums.Suits.isRed().(suit) => param suit
-_empty_/Enums.Suits.valueOf(). => method valueOf
-_empty_/Enums.Suits.valueOf().($name) => param $name
-_empty_/Enums.Suits.values(). => method values
-_empty_/Enums.Tag# => abstract sealed enum class Tag
-_empty_/Enums.Tag#[A] => typeparam A
-_empty_/Enums.Tag#`<init>`(). => primary ctor <init>
-_empty_/Enums.Tag. => final object Tag
-_empty_/Enums.Tag.$values. => val method $values
-_empty_/Enums.Tag.BooleanTag. => case val static enum method BooleanTag
-_empty_/Enums.Tag.IntTag. => case val static enum method IntTag
-_empty_/Enums.Tag.fromOrdinal(). => method fromOrdinal
-_empty_/Enums.Tag.fromOrdinal().(ordinal) => param ordinal
-_empty_/Enums.Tag.valueOf(). => method valueOf
-_empty_/Enums.Tag.valueOf().($name) => param $name
-_empty_/Enums.Tag.values(). => method values
-_empty_/Enums.WeekDays# => abstract sealed enum class WeekDays
-_empty_/Enums.WeekDays#`<init>`(). => primary ctor <init>
-_empty_/Enums.WeekDays. => final object WeekDays
-_empty_/Enums.WeekDays.$new(). => method $new
-_empty_/Enums.WeekDays.$new().($name) => param $name
-_empty_/Enums.WeekDays.$new().(_$ordinal) => param _$ordinal
-_empty_/Enums.WeekDays.$values. => val method $values
-_empty_/Enums.WeekDays.Friday. => case val static enum method Friday
-_empty_/Enums.WeekDays.Monday. => case val static enum method Monday
-_empty_/Enums.WeekDays.Saturday. => case val static enum method Saturday
-_empty_/Enums.WeekDays.Sunday. => case val static enum method Sunday
-_empty_/Enums.WeekDays.Thursday. => case val static enum method Thursday
-_empty_/Enums.WeekDays.Tuesday. => case val static enum method Tuesday
-_empty_/Enums.WeekDays.Wednesday. => case val static enum method Wednesday
-_empty_/Enums.WeekDays.fromOrdinal(). => method fromOrdinal
-_empty_/Enums.WeekDays.fromOrdinal().(ordinal) => param ordinal
-_empty_/Enums.WeekDays.valueOf(). => method valueOf
-_empty_/Enums.WeekDays.valueOf().($name) => param $name
-_empty_/Enums.WeekDays.values(). => method values
-_empty_/Enums.`<:<`# => abstract sealed enum class <:<
-_empty_/Enums.`<:<`#[A] => contravariant typeparam A
-_empty_/Enums.`<:<`#[B] => typeparam B
-_empty_/Enums.`<:<`#`<init>`(). => primary ctor <init>
-_empty_/Enums.`<:<`. => final object <:<
-_empty_/Enums.`<:<`.Refl# => final case enum class Refl
-_empty_/Enums.`<:<`.Refl#[C] => typeparam C
-_empty_/Enums.`<:<`.Refl#`<init>`(). => primary ctor <init>
-_empty_/Enums.`<:<`.Refl#copy(). => method copy
-_empty_/Enums.`<:<`.Refl#copy().[C] => typeparam C
-_empty_/Enums.`<:<`.Refl#ordinal(). => method ordinal
-_empty_/Enums.`<:<`.Refl. => final object Refl
-_empty_/Enums.`<:<`.Refl.apply(). => method apply
-_empty_/Enums.`<:<`.Refl.apply().[C] => typeparam C
-_empty_/Enums.`<:<`.Refl.toString(). => method toString
-_empty_/Enums.`<:<`.Refl.unapply(). => method unapply
-_empty_/Enums.`<:<`.Refl.unapply().(x$1) => param x$1
-_empty_/Enums.`<:<`.Refl.unapply().[C] => typeparam C
-_empty_/Enums.`<:<`.`given_<:<_T_T`(). => final implicit method given_<:<_T_T
-_empty_/Enums.`<:<`.`given_<:<_T_T`().[T] => typeparam T
-_empty_/Enums.`<:<`.fromOrdinal(). => method fromOrdinal
-_empty_/Enums.`<:<`.fromOrdinal().(ordinal) => param ordinal
-_empty_/Enums.some1. => val method some1
-_empty_/Enums.unwrap(). => method unwrap
-_empty_/Enums.unwrap().(ev) => implicit param ev
-_empty_/Enums.unwrap().(opt) => param opt
-_empty_/Enums.unwrap().[A] => typeparam A
-_empty_/Enums.unwrap().[B] => typeparam B
-local0 => param x
+_empty_/Enums. => final object Enums extends Object { self: Enums.type => +30 decls }
+_empty_/Enums.Coin# => abstract sealed enum class Coin extends Object with Enum { self: Coin => +2 decls }
+_empty_/Enums.Coin#`<init>`(). => primary ctor <init> (param value: Int): Coin
+_empty_/Enums.Coin#`<init>`().(value) => param value: Int
+_empty_/Enums.Coin#value. => private[this] val method value Int
+_empty_/Enums.Coin. => final object Coin extends Object { self: Coin.type => +10 decls }
+_empty_/Enums.Coin.$values. => private[this] val method $values Array[Coin]
+_empty_/Enums.Coin.Dime. => case val static enum method Dime Coin
+_empty_/Enums.Coin.Dollar. => case val static enum method Dollar Coin
+_empty_/Enums.Coin.Nickel. => case val static enum method Nickel Coin
+_empty_/Enums.Coin.Penny. => case val static enum method Penny Coin
+_empty_/Enums.Coin.Quarter. => case val static enum method Quarter Coin
+_empty_/Enums.Coin.fromOrdinal(). => method fromOrdinal (param ordinal: Int): Coin
+_empty_/Enums.Coin.fromOrdinal().(ordinal) => param ordinal: Int
+_empty_/Enums.Coin.valueOf(). => method valueOf (param $name: String): Coin
+_empty_/Enums.Coin.valueOf().($name) => param $name: String
+_empty_/Enums.Coin.values(). => method values => Array[Coin]
+_empty_/Enums.Colour# => abstract sealed enum class Colour extends Object with Enum { self: Colour => +1 decls }
+_empty_/Enums.Colour#`<init>`(). => primary ctor <init> (): Colour
+_empty_/Enums.Colour. => final object Colour extends Object { self: Colour.type => +9 decls }
+_empty_/Enums.Colour.$new(). => private[this] method $new (param _$ordinal: Int, param $name: String): Colour
+_empty_/Enums.Colour.$new().($name) => param $name: String
+_empty_/Enums.Colour.$new().(_$ordinal) => param _$ordinal: Int
+_empty_/Enums.Colour.$values. => private[this] val method $values Array[Colour]
+_empty_/Enums.Colour.Blue. => case val static enum method Blue Colour
+_empty_/Enums.Colour.Green. => case val static enum method Green Colour
+_empty_/Enums.Colour.Red. => case val static enum method Red Colour
+_empty_/Enums.Colour.fromOrdinal(). => method fromOrdinal (param ordinal: Int): Colour
+_empty_/Enums.Colour.fromOrdinal().(ordinal) => param ordinal: Int
+_empty_/Enums.Colour.valueOf(). => method valueOf (param $name: String): Colour
+_empty_/Enums.Colour.valueOf().($name) => param $name: String
+_empty_/Enums.Colour.values(). => method values => Array[Colour]
+_empty_/Enums.Directions# => abstract sealed enum class Directions extends Object with Enum { self: Directions => +1 decls }
+_empty_/Enums.Directions#`<init>`(). => primary ctor <init> (): Directions
+_empty_/Enums.Directions. => final object Directions extends Object { self: Directions.type => +10 decls }
+_empty_/Enums.Directions.$new(). => private[this] method $new (param _$ordinal: Int, param $name: String): Directions
+_empty_/Enums.Directions.$new().($name) => param $name: String
+_empty_/Enums.Directions.$new().(_$ordinal) => param _$ordinal: Int
+_empty_/Enums.Directions.$values. => private[this] val method $values Array[Directions]
+_empty_/Enums.Directions.East. => case val static enum method East Directions
+_empty_/Enums.Directions.North. => case val static enum method North Directions
+_empty_/Enums.Directions.South. => case val static enum method South Directions
+_empty_/Enums.Directions.West. => case val static enum method West Directions
+_empty_/Enums.Directions.fromOrdinal(). => method fromOrdinal (param ordinal: Int): Directions
+_empty_/Enums.Directions.fromOrdinal().(ordinal) => param ordinal: Int
+_empty_/Enums.Directions.valueOf(). => method valueOf (param $name: String): Directions
+_empty_/Enums.Directions.valueOf().($name) => param $name: String
+_empty_/Enums.Directions.values(). => method values => Array[Directions]
+_empty_/Enums.Maybe# => abstract sealed enum class Maybe [covariant typeparam A ] extends Object with Enum { self: Maybe[A] => +2 decls }
+_empty_/Enums.Maybe#[A] => covariant typeparam A 
+_empty_/Enums.Maybe#`<init>`(). => primary ctor <init> [covariant typeparam A ](): Maybe[A]
+_empty_/Enums.Maybe. => final object Maybe extends Object { self: Maybe.type => +6 decls }
+_empty_/Enums.Maybe.Just# => final case enum class Just [covariant typeparam A ] extends Maybe[A] { self: Just[A] => +7 decls }
+_empty_/Enums.Maybe.Just#[A] => covariant typeparam A 
+_empty_/Enums.Maybe.Just#_1(). => method _1 => A
+_empty_/Enums.Maybe.Just#`<init>`(). => primary ctor <init> [covariant typeparam A ](val param value: A): Just[A]
+_empty_/Enums.Maybe.Just#`<init>`().(value) => val param value: A
+_empty_/Enums.Maybe.Just#copy$default$1(). => method copy$default$1 [covariant typeparam A ]: A
+_empty_/Enums.Maybe.Just#copy$default$1().[A] => typeparam A 
+_empty_/Enums.Maybe.Just#copy(). => method copy [covariant typeparam A ](param value: A): Just[A]
+_empty_/Enums.Maybe.Just#copy().(value) => param value: A
+_empty_/Enums.Maybe.Just#copy().[A] => typeparam A 
+_empty_/Enums.Maybe.Just#ordinal(). => method ordinal => Int <: scala/reflect/Enum#ordinal().
+_empty_/Enums.Maybe.Just#value. => val method value A
+_empty_/Enums.Maybe.Just. => final object Just extends Object { self: Just.type => +4 decls }
+_empty_/Enums.Maybe.Just.apply(). => method apply [typeparam A ](param value: A): Just[A]
+_empty_/Enums.Maybe.Just.apply().(value) => param value: A
+_empty_/Enums.Maybe.Just.apply().[A] => typeparam A 
+_empty_/Enums.Maybe.Just.toString(). => method toString => String <: scala/Any#toString().
+_empty_/Enums.Maybe.Just.unapply(). => method unapply [typeparam A ](param x$1: Just[A]): Just[A]
+_empty_/Enums.Maybe.Just.unapply().(x$1) => param x$1: Just[A]
+_empty_/Enums.Maybe.Just.unapply().[A] => typeparam A 
+_empty_/Enums.Maybe.None. => case val static enum method None Maybe[Nothing]
+_empty_/Enums.Maybe.fromOrdinal(). => method fromOrdinal (param ordinal: Int): Maybe[_] forSome { type _  }
+_empty_/Enums.Maybe.fromOrdinal().(ordinal) => param ordinal: Int
+_empty_/Enums.Planet# => abstract sealed enum class Planet extends Enum[Planet] with Enum { self: Planet => +6 decls }
+_empty_/Enums.Planet#G. => private[this] final val method G 6.673E-11
+_empty_/Enums.Planet#`<init>`(). => primary ctor <init> (param mass: Double, param radius: Double): Planet
+_empty_/Enums.Planet#`<init>`().(mass) => param mass: Double
+_empty_/Enums.Planet#`<init>`().(radius) => param radius: Double
+_empty_/Enums.Planet#mass. => private[this] val method mass Double
+_empty_/Enums.Planet#radius. => private[this] val method radius Double
+_empty_/Enums.Planet#surfaceGravity(). => method surfaceGravity => Double
+_empty_/Enums.Planet#surfaceWeight(). => method surfaceWeight (param otherMass: Double): Double
+_empty_/Enums.Planet#surfaceWeight().(otherMass) => param otherMass: Double
+_empty_/Enums.Planet. => final object Planet extends Object { self: Planet.type => +13 decls }
+_empty_/Enums.Planet.$values. => private[this] val method $values Array[Planet]
+_empty_/Enums.Planet.Earth. => case val static enum method Earth Planet
+_empty_/Enums.Planet.Jupiter. => case val static enum method Jupiter Planet
+_empty_/Enums.Planet.Mars. => case val static enum method Mars Planet
+_empty_/Enums.Planet.Mercury. => case val static enum method Mercury Planet
+_empty_/Enums.Planet.Neptune. => case val static enum method Neptune Planet
+_empty_/Enums.Planet.Saturn. => case val static enum method Saturn Planet
+_empty_/Enums.Planet.Uranus. => case val static enum method Uranus Planet
+_empty_/Enums.Planet.Venus. => case val static enum method Venus Planet
+_empty_/Enums.Planet.fromOrdinal(). => method fromOrdinal (param ordinal: Int): Planet
+_empty_/Enums.Planet.fromOrdinal().(ordinal) => param ordinal: Int
+_empty_/Enums.Planet.valueOf(). => method valueOf (param $name: String): Planet
+_empty_/Enums.Planet.valueOf().($name) => param $name: String
+_empty_/Enums.Planet.values(). => method values => Array[Planet]
+_empty_/Enums.Suits# => abstract sealed enum class Suits extends Object with Enum { self: Suits => +1 decls }
+_empty_/Enums.Suits#`<init>`(). => primary ctor <init> (): Suits
+_empty_/Enums.Suits. => final object Suits extends Object { self: Suits.type => +13 decls }
+_empty_/Enums.Suits.$new(). => private[this] method $new (param _$ordinal: Int, param $name: String): Suits
+_empty_/Enums.Suits.$new().($name) => param $name: String
+_empty_/Enums.Suits.$new().(_$ordinal) => param _$ordinal: Int
+_empty_/Enums.Suits.$values. => private[this] val method $values Array[Suits]
+_empty_/Enums.Suits.Clubs. => case val static enum method Clubs Suits
+_empty_/Enums.Suits.Diamonds. => case val static enum method Diamonds Suits
+_empty_/Enums.Suits.Hearts. => case val static enum method Hearts Suits
+_empty_/Enums.Suits.Spades. => case val static enum method Spades Suits
+_empty_/Enums.Suits.derived$CanEqual. => implicit lazy val given method derived$CanEqual CanEqual[Suits, Suits]
+_empty_/Enums.Suits.fromOrdinal(). => method fromOrdinal (param ordinal: Int): Suits
+_empty_/Enums.Suits.fromOrdinal().(ordinal) => param ordinal: Int
+_empty_/Enums.Suits.isBlack(). => method isBlack (param suit: Suits): Boolean
+_empty_/Enums.Suits.isBlack().(suit) => param suit: Suits
+_empty_/Enums.Suits.isRed(). => method isRed (param suit: Suits): Boolean
+_empty_/Enums.Suits.isRed().(suit) => param suit: Suits
+_empty_/Enums.Suits.valueOf(). => method valueOf (param $name: String): Suits
+_empty_/Enums.Suits.valueOf().($name) => param $name: String
+_empty_/Enums.Suits.values(). => method values => Array[Suits]
+_empty_/Enums.Tag# => abstract sealed enum class Tag [typeparam A ] extends Object with Enum { self: Tag[A] => +2 decls }
+_empty_/Enums.Tag#[A] => typeparam A 
+_empty_/Enums.Tag#`<init>`(). => primary ctor <init> [typeparam A ](): Tag[A]
+_empty_/Enums.Tag. => final object Tag extends Object { self: Tag.type => +7 decls }
+_empty_/Enums.Tag.$values. => private[this] val method $values Array[Tag[_] forSome { type _  }]
+_empty_/Enums.Tag.BooleanTag. => case val static enum method BooleanTag Tag[Boolean]
+_empty_/Enums.Tag.IntTag. => case val static enum method IntTag Tag[Int]
+_empty_/Enums.Tag.fromOrdinal(). => method fromOrdinal (param ordinal: Int): Tag[_] forSome { type _  }
+_empty_/Enums.Tag.fromOrdinal().(ordinal) => param ordinal: Int
+_empty_/Enums.Tag.valueOf(). => method valueOf (param $name: String): Tag[_] forSome { type _  >: Int & Boolean <: Int | Boolean }
+_empty_/Enums.Tag.valueOf().($name) => param $name: String
+_empty_/Enums.Tag.values(). => method values => Array[Tag[_] forSome { type _  }]
+_empty_/Enums.WeekDays# => abstract sealed enum class WeekDays extends Object with Enum { self: WeekDays => +1 decls }
+_empty_/Enums.WeekDays#`<init>`(). => primary ctor <init> (): WeekDays
+_empty_/Enums.WeekDays. => final object WeekDays extends Object { self: WeekDays.type => +13 decls }
+_empty_/Enums.WeekDays.$new(). => private[this] method $new (param _$ordinal: Int, param $name: String): WeekDays
+_empty_/Enums.WeekDays.$new().($name) => param $name: String
+_empty_/Enums.WeekDays.$new().(_$ordinal) => param _$ordinal: Int
+_empty_/Enums.WeekDays.$values. => private[this] val method $values Array[WeekDays]
+_empty_/Enums.WeekDays.Friday. => case val static enum method Friday WeekDays
+_empty_/Enums.WeekDays.Monday. => case val static enum method Monday WeekDays
+_empty_/Enums.WeekDays.Saturday. => case val static enum method Saturday WeekDays
+_empty_/Enums.WeekDays.Sunday. => case val static enum method Sunday WeekDays
+_empty_/Enums.WeekDays.Thursday. => case val static enum method Thursday WeekDays
+_empty_/Enums.WeekDays.Tuesday. => case val static enum method Tuesday WeekDays
+_empty_/Enums.WeekDays.Wednesday. => case val static enum method Wednesday WeekDays
+_empty_/Enums.WeekDays.fromOrdinal(). => method fromOrdinal (param ordinal: Int): WeekDays
+_empty_/Enums.WeekDays.fromOrdinal().(ordinal) => param ordinal: Int
+_empty_/Enums.WeekDays.valueOf(). => method valueOf (param $name: String): WeekDays
+_empty_/Enums.WeekDays.valueOf().($name) => param $name: String
+_empty_/Enums.WeekDays.values(). => method values => Array[WeekDays]
+_empty_/Enums.`<:<`# => abstract sealed enum class <:< [contravariant typeparam A , typeparam B ] extends Object with Enum { self: <:<[A, B] => +3 decls }
+_empty_/Enums.`<:<`#[A] => contravariant typeparam A 
+_empty_/Enums.`<:<`#[B] => typeparam B 
+_empty_/Enums.`<:<`#`<init>`(). => primary ctor <init> [contravariant typeparam A , typeparam B ](): <:<[A, B]
+_empty_/Enums.`<:<`. => final object <:< extends Object { self: <:<.type => +6 decls }
+_empty_/Enums.`<:<`.Refl# => final case enum class Refl [typeparam C ] extends <:<[C, C] { self: Refl[C] => +4 decls }
+_empty_/Enums.`<:<`.Refl#[C] => typeparam C 
+_empty_/Enums.`<:<`.Refl#`<init>`(). => primary ctor <init> [typeparam C ](): Refl[C]
+_empty_/Enums.`<:<`.Refl#copy(). => method copy [typeparam C ](): Refl[C]
+_empty_/Enums.`<:<`.Refl#copy().[C] => typeparam C 
+_empty_/Enums.`<:<`.Refl#ordinal(). => method ordinal => Int <: scala/reflect/Enum#ordinal().
+_empty_/Enums.`<:<`.Refl. => final object Refl extends Object { self: Refl.type => +4 decls }
+_empty_/Enums.`<:<`.Refl.apply(). => method apply [typeparam C ](): Refl[C]
+_empty_/Enums.`<:<`.Refl.apply().[C] => typeparam C 
+_empty_/Enums.`<:<`.Refl.toString(). => method toString => String <: scala/Any#toString().
+_empty_/Enums.`<:<`.Refl.unapply(). => method unapply [typeparam C ](param x$1: Refl[C]): true
+_empty_/Enums.`<:<`.Refl.unapply().(x$1) => param x$1: Refl[C]
+_empty_/Enums.`<:<`.Refl.unapply().[C] => typeparam C 
+_empty_/Enums.`<:<`.`given_<:<_T_T`(). => final implicit given method given_<:<_T_T [typeparam T ]: <:<[T, T]
+_empty_/Enums.`<:<`.`given_<:<_T_T`().[T] => typeparam T 
+_empty_/Enums.`<:<`.fromOrdinal(). => method fromOrdinal (param ordinal: Int): <:<[_, _] forSome { type _ ; type _  }
+_empty_/Enums.`<:<`.fromOrdinal().(ordinal) => param ordinal: Int
+_empty_/Enums.some1. => val method some1 Option[Int]
+_empty_/Enums.unwrap(). => method unwrap [typeparam A , typeparam B ](param opt: Option[A])(implicit given param ev: <:<[A, Option[B]]): Option[B]
+_empty_/Enums.unwrap().(ev) => implicit given param ev: <:<[A, Option[B]]
+_empty_/Enums.unwrap().(opt) => param opt: Option[A]
+_empty_/Enums.unwrap().[A] => typeparam A 
+_empty_/Enums.unwrap().[B] => typeparam B 
+local0 => param x: Option[B]
 
 Occurrences:
 [0:7..0:12): Enums <- _empty_/Enums.
 [1:9..1:12): <:< -> _empty_/Enums.`<:<`.
 [3:7..3:13): Colour <- _empty_/Enums.Colour#
-[4:4..4:4): <- _empty_/Enums.Colour#`<init>`().
 [4:11..4:17): Colour -> _empty_/Enums.Colour.
 [4:18..4:21): Red -> _empty_/Enums.Colour.Red.
 [5:9..5:12): Red <- _empty_/Enums.Colour.Red.
 [5:14..5:19): Green <- _empty_/Enums.Colour.Green.
 [5:21..5:25): Blue <- _empty_/Enums.Colour.Blue.
 [7:7..7:17): Directions <- _empty_/Enums.Directions#
-[8:4..8:4): <- _empty_/Enums.Directions#`<init>`().
 [8:9..8:14): North <- _empty_/Enums.Directions.North.
 [8:16..8:20): East <- _empty_/Enums.Directions.East.
 [8:22..8:27): South <- _empty_/Enums.Directions.South.
 [8:29..8:33): West <- _empty_/Enums.Directions.West.
 [10:7..10:12): Suits <- _empty_/Enums.Suits#
-[10:21..10:21): <- _empty_/Enums.Suits#`<init>`().
-[10:21..10:21): -> scala/CanEqual.derived.
 [11:9..11:15): Hearts <- _empty_/Enums.Suits.Hearts.
 [11:17..11:23): Spades <- _empty_/Enums.Suits.Spades.
 [11:25..11:30): Clubs <- _empty_/Enums.Suits.Clubs.
@@ -947,7 +1065,6 @@ Occurrences:
 [18:11..18:17): Spades -> _empty_/Enums.Suits.Spades.
 [18:20..18:25): Clubs -> _empty_/Enums.Suits.Clubs.
 [21:7..21:15): WeekDays <- _empty_/Enums.WeekDays#
-[22:4..22:4): <- _empty_/Enums.WeekDays#`<init>`().
 [22:9..22:15): Monday <- _empty_/Enums.WeekDays.Monday.
 [23:9..23:16): Tuesday <- _empty_/Enums.WeekDays.Tuesday.
 [24:9..24:18): Wednesday <- _empty_/Enums.WeekDays.Wednesday.
@@ -956,62 +1073,46 @@ Occurrences:
 [27:9..27:17): Saturday <- _empty_/Enums.WeekDays.Saturday.
 [28:9..28:15): Sunday <- _empty_/Enums.WeekDays.Sunday.
 [30:7..30:11): Coin <- _empty_/Enums.Coin#
-[30:11..30:11): <- _empty_/Enums.Coin#`<init>`().
 [30:12..30:17): value <- _empty_/Enums.Coin#value.
 [30:19..30:22): Int -> scala/Int#
 [31:9..31:14): Penny <- _empty_/Enums.Coin.Penny.
 [31:26..31:30): Coin -> _empty_/Enums.Coin#
-[31:30..31:30): -> _empty_/Enums.Coin#`<init>`().
 [32:9..32:15): Nickel <- _empty_/Enums.Coin.Nickel.
 [32:26..32:30): Coin -> _empty_/Enums.Coin#
-[32:30..32:30): -> _empty_/Enums.Coin#`<init>`().
 [33:9..33:13): Dime <- _empty_/Enums.Coin.Dime.
 [33:26..33:30): Coin -> _empty_/Enums.Coin#
-[33:30..33:30): -> _empty_/Enums.Coin#`<init>`().
 [34:9..34:16): Quarter <- _empty_/Enums.Coin.Quarter.
 [34:26..34:30): Coin -> _empty_/Enums.Coin#
-[34:30..34:30): -> _empty_/Enums.Coin#`<init>`().
 [35:9..35:15): Dollar <- _empty_/Enums.Coin.Dollar.
 [35:26..35:30): Coin -> _empty_/Enums.Coin#
-[35:30..35:30): -> _empty_/Enums.Coin#`<init>`().
 [37:7..37:12): Maybe <- _empty_/Enums.Maybe#
-[37:12..37:12): <- _empty_/Enums.Maybe#`<init>`().
 [37:14..37:15): A <- _empty_/Enums.Maybe#[A]
 [38:9..38:13): Just <- _empty_/Enums.Maybe.Just#
-[38:13..38:13): <- _empty_/Enums.Maybe.Just#`<init>`().
 [38:14..38:19): value <- _empty_/Enums.Maybe.Just#value.
 [38:21..38:22): A -> _empty_/Enums.Maybe.Just#[A]
 [39:9..39:13): None <- _empty_/Enums.Maybe.None.
 [41:7..41:10): Tag <- _empty_/Enums.Tag#
-[41:10..41:10): <- _empty_/Enums.Tag#`<init>`().
 [41:11..41:12): A <- _empty_/Enums.Tag#[A]
 [42:9..42:15): IntTag <- _empty_/Enums.Tag.IntTag.
 [42:24..42:27): Tag -> _empty_/Enums.Tag#
 [42:28..42:31): Int -> scala/Int#
-[42:32..42:32): -> _empty_/Enums.Tag#`<init>`().
 [43:9..43:19): BooleanTag <- _empty_/Enums.Tag.BooleanTag.
 [43:28..43:31): Tag -> _empty_/Enums.Tag#
 [43:32..43:39): Boolean -> scala/Boolean#
-[43:40..43:40): -> _empty_/Enums.Tag#`<init>`().
 [45:7..45:10): <:< <- _empty_/Enums.`<:<`#
-[45:10..45:10): <- _empty_/Enums.`<:<`#`<init>`().
 [45:12..45:13): A <- _empty_/Enums.`<:<`#[A]
 [45:15..45:16): B <- _empty_/Enums.`<:<`#[B]
 [46:9..46:13): Refl <- _empty_/Enums.`<:<`.Refl#
-[46:13..46:13): <- _empty_/Enums.`<:<`.Refl#`<init>`().
 [46:14..46:15): C <- _empty_/Enums.`<:<`.Refl#[C]
 [46:28..46:29): C -> _empty_/Enums.`<:<`.Refl#[C]
 [46:30..46:33): <:< -> _empty_/Enums.`<:<`#
 [46:34..46:35): C -> _empty_/Enums.`<:<`.Refl#[C]
-[46:35..46:35): -> _empty_/Enums.`<:<`#`<init>`().
 [48:9..48:12): <:< <- _empty_/Enums.`<:<`.
-[49:10..49:10): <- _empty_/Enums.`<:<`.`given_<:<_T_T`().
 [49:11..49:12): T <- _empty_/Enums.`<:<`.`given_<:<_T_T`().[T]
 [49:16..49:17): T -> _empty_/Enums.`<:<`.`given_<:<_T_T`().[T]
 [49:18..49:21): <:< -> _empty_/Enums.`<:<`#
 [49:22..49:23): T -> _empty_/Enums.`<:<`.`given_<:<_T_T`().[T]
 [49:27..49:31): Refl -> _empty_/Enums.`<:<`.Refl.
-[49:31..49:31): -> _empty_/Enums.`<:<`.Refl.apply().
 [51:13..51:14): A <- _empty_/Enums.unwrap().[A]
 [51:16..51:17): B <- _empty_/Enums.unwrap().[B]
 [51:19..51:22): opt <- _empty_/Enums.unwrap().(opt)
@@ -1027,29 +1128,22 @@ Occurrences:
 [51:81..51:82): B -> _empty_/Enums.unwrap().[B]
 [51:86..51:88): ev -> _empty_/Enums.unwrap().(ev)
 [52:9..52:13): Refl -> _empty_/Enums.`<:<`.Refl.
-[52:13..52:13): -> _empty_/Enums.`<:<`.Refl.unapply().
 [52:19..52:22): opt -> _empty_/Enums.unwrap().(opt)
 [52:23..52:30): flatMap -> scala/Option#flatMap().
 [52:31..52:39): identity -> scala/Predef.identity().
-[52:31..52:31): -> local0
 [52:40..52:46): Option -> scala/Option#
 [52:47..52:48): B -> _empty_/Enums.unwrap().[B]
 [54:6..54:11): some1 <- _empty_/Enums.some1.
 [54:14..54:18): Some -> scala/Some.
-[54:18..54:18): -> scala/Some.apply().
 [54:19..54:23): Some -> scala/Some.
-[54:23..54:23): -> scala/Some.apply().
 [54:28..54:34): unwrap -> _empty_/Enums.unwrap().
-[54:34..54:34): -> _empty_/Enums.`<:<`.`given_<:<_T_T`().
 [56:7..56:13): Planet <- _empty_/Enums.Planet#
-[56:13..56:13): <- _empty_/Enums.Planet#`<init>`().
 [56:14..56:18): mass <- _empty_/Enums.Planet#mass.
 [56:20..56:26): Double -> scala/Double#
 [56:28..56:34): radius <- _empty_/Enums.Planet#radius.
 [56:36..56:42): Double -> scala/Double#
 [56:52..56:56): Enum -> java/lang/Enum#
 [56:57..56:63): Planet -> _empty_/Enums.Planet#
-[56:64..56:64): -> java/lang/Enum#`<init>`().
 [57:22..57:23): G <- _empty_/Enums.Planet#G.
 [58:8..58:22): surfaceGravity <- _empty_/Enums.Planet#surfaceGravity().
 [58:25..58:26): G -> _empty_/Enums.Planet#G.
@@ -1067,28 +1161,32 @@ Occurrences:
 [59:55..59:69): surfaceGravity -> _empty_/Enums.Planet#surfaceGravity().
 [61:9..61:16): Mercury <- _empty_/Enums.Planet.Mercury.
 [61:25..61:31): Planet -> _empty_/Enums.Planet#
-[61:31..61:31): -> _empty_/Enums.Planet#`<init>`().
 [62:9..62:14): Venus <- _empty_/Enums.Planet.Venus.
 [62:25..62:31): Planet -> _empty_/Enums.Planet#
-[62:31..62:31): -> _empty_/Enums.Planet#`<init>`().
 [63:9..63:14): Earth <- _empty_/Enums.Planet.Earth.
 [63:25..63:31): Planet -> _empty_/Enums.Planet#
-[63:31..63:31): -> _empty_/Enums.Planet#`<init>`().
 [64:9..64:13): Mars <- _empty_/Enums.Planet.Mars.
 [64:25..64:31): Planet -> _empty_/Enums.Planet#
-[64:31..64:31): -> _empty_/Enums.Planet#`<init>`().
 [65:9..65:16): Jupiter <- _empty_/Enums.Planet.Jupiter.
 [65:25..65:31): Planet -> _empty_/Enums.Planet#
-[65:31..65:31): -> _empty_/Enums.Planet#`<init>`().
 [66:9..66:15): Saturn <- _empty_/Enums.Planet.Saturn.
 [66:25..66:31): Planet -> _empty_/Enums.Planet#
-[66:31..66:31): -> _empty_/Enums.Planet#`<init>`().
 [67:9..67:15): Uranus <- _empty_/Enums.Planet.Uranus.
 [67:25..67:31): Planet -> _empty_/Enums.Planet#
-[67:31..67:31): -> _empty_/Enums.Planet#`<init>`().
 [68:9..68:16): Neptune <- _empty_/Enums.Planet.Neptune.
 [68:25..68:31): Planet -> _empty_/Enums.Planet#
-[68:31..68:31): -> _empty_/Enums.Planet#`<init>`().
+
+Synthetics:
+[46:28..46:35):C <:< C => *[C, C]
+[49:27..49:31):Refl => *.apply[T]
+[52:9..52:13):Refl => *.unapply[Option[B]]
+[52:19..52:30):opt.flatMap => *[B]
+[52:31..52:50):identity[Option[B]] => *[Function1[A, Option[B]]]
+[54:14..54:18):Some => *.apply[Some[Int]]
+[54:14..54:34):Some(Some(1)).unwrap => *(given_<:<_T_T[Option[Int]])
+[54:19..54:23):Some => *.apply[Int]
+[54:28..54:34):unwrap => *[Some[Int], Int]
+[56:52..56:64):Enum[Planet] => *[Planet]
 
 expect/EtaExpansion.scala
 -------------------------
@@ -1099,27 +1197,31 @@ Uri => EtaExpansion.scala
 Text => empty
 Language => Scala
 Symbols => 3 entries
-Occurrences => 12 entries
+Occurrences => 8 entries
+Synthetics => 5 entries
 
 Symbols:
-example/EtaExpansion# => class EtaExpansion
-example/EtaExpansion#`<init>`(). => primary ctor <init>
-local0 => param x
+example/EtaExpansion# => class EtaExpansion extends Object { self: EtaExpansion => +1 decls }
+example/EtaExpansion#`<init>`(). => primary ctor <init> (): EtaExpansion
+local0 => param x: Int
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:6..2:18): EtaExpansion <- example/EtaExpansion#
-[3:2..3:2): <- example/EtaExpansion#`<init>`().
 [3:2..3:6): Some -> scala/Some.
-[3:6..3:6): -> scala/Some.apply().
 [3:10..3:13): map -> scala/Option#map().
 [3:14..3:22): identity -> scala/Predef.identity().
-[3:14..3:14): -> local0
 [4:2..4:6): List -> scala/package.List.
-[4:6..4:6): -> scala/collection/IterableFactory#apply().
 [4:10..4:18): foldLeft -> scala/collection/LinearSeqOps#foldLeft().
 [4:25..4:26): + -> java/lang/String#`+`().
 
+Synthetics:
+[3:2..3:13):Some(1).map => *[Int]
+[3:2..3:6):Some => *.apply[Int]
+[3:14..3:22):identity => *[Int]
+[4:2..4:18):List(1).foldLeft => *[String]
+[4:2..4:6):List => *.apply[Int]
+
 expect/Example.scala
 --------------------
 
@@ -1129,14 +1231,14 @@ Uri => Example.scala
 Text => empty
 Language => Scala
 Symbols => 5 entries
-Occurrences => 25 entries
+Occurrences => 23 entries
 
 Symbols:
-example/Example. => final object Example
-example/Example.main(). => method main
-example/Example.main().(args) => param args
-example/Example.x. => val method x
-local0 => selfparam self
+example/Example. => final object Example extends Object { self: Example.type => +3 decls }
+example/Example.main(). => method main (param args: Array[String]): Unit
+example/Example.main().(args) => param args: Array[String]
+example/Example.x. => val method x ClassTag[Int]
+local0 => selfparam self: Example.type
 
 Occurrences:
 [0:8..0:15): example <- example/
@@ -1151,7 +1253,6 @@ Occurrences:
 [5:23..5:30): mutable -> scala/collection/mutable/
 [5:31..5:36): Stack -> scala/collection/mutable/Stack#
 [5:37..5:40): Int -> scala/Int#
-[5:41..5:41): -> scala/collection/mutable/Stack#`<init>`(+1).
 [6:6..6:10): main <- example/Example.main().
 [6:11..6:15): args <- example/Example.main().(args)
 [6:17..6:22): Array -> scala/Array#
@@ -1163,7 +1264,6 @@ Occurrences:
 [9:16..9:23): reflect -> scala/reflect/
 [9:24..9:32): classTag -> scala/reflect/package.classTag().
 [9:33..9:36): Int -> scala/Int#
-[9:37..9:37): -> scala/reflect/ClassTag.apply().
 
 expect/Extension.scala
 ----------------------
@@ -1173,22 +1273,40 @@ Schema => SemanticDB v4
 Uri => Extension.scala
 Text => empty
 Language => Scala
-Symbols => 8 entries
-Occurrences => 19 entries
+Symbols => 26 entries
+Occurrences => 50 entries
+Synthetics => 1 entries
 
 Symbols:
-ext/Extension$package. => final package object ext
-ext/Extension$package.`#*#`(). => method #*#
-ext/Extension$package.`#*#`().(i) => param i
-ext/Extension$package.`#*#`().(s) => param s
-ext/Extension$package.a. => val method a
-ext/Extension$package.c. => val method c
-ext/Extension$package.foo(). => method foo
-ext/Extension$package.foo().(s) => param s
+ext/Extension$package. => final package object ext extends Object { self: ext.type => +6 decls }
+ext/Extension$package.`#*#`(). => method #*# (param s: String)(param i: Int): Tuple2[String, Int]
+ext/Extension$package.`#*#`().(i) => param i: Int
+ext/Extension$package.`#*#`().(s) => param s: String
+ext/Extension$package.a. => val method a Int
+ext/Extension$package.c. => val method c Tuple2[String, Int]
+ext/Extension$package.foo(). => method foo (param s: String): Int
+ext/Extension$package.foo().(s) => param s: String
+ext/Extension$package.readInto(). => method readInto [typeparam T ](param s: String)(implicit given param x$2: Read[T]): Option[T]
+ext/Extension$package.readInto().(s) => param s: String
+ext/Extension$package.readInto().(x$2) => implicit given param x$2: Read[T]
+ext/Extension$package.readInto().[T] => typeparam T 
+ext/Functor# => trait Functor [typeparam F [type _ ]] extends Object { self: Functor[F] => +3 decls }
+ext/Functor#[F] => typeparam F [type _ ]
+ext/Functor#[F][_] => type _ 
+ext/Functor#`<init>`(). => primary ctor <init> [typeparam F [type _ ]](): Functor[F]
+ext/Functor#map(). => abstract method map [typeparam T , typeparam U ](param t: F[T])(param f: Function1[T, U]): F[U]
+ext/Functor#map().(f) => param f: Function1[T, U]
+ext/Functor#map().(t) => param t: F[T]
+ext/Functor#map().[T] => typeparam T 
+ext/Functor#map().[U] => typeparam U 
+ext/Read# => trait Read [covariant typeparam T ] extends Object { self: Read[T] => +3 decls }
+ext/Read#[T] => covariant typeparam T 
+ext/Read#`<init>`(). => primary ctor <init> [covariant typeparam T ](): Read[T]
+ext/Read#fromString(). => abstract method fromString (param s: String): Option[T]
+ext/Read#fromString().(s) => param s: String
 
 Occurrences:
 [0:8..0:11): ext <- ext/
-[2:0..2:0): <- ext/Extension$package.
 [2:11..2:12): s <- ext/Extension$package.foo().(s)
 [2:11..2:12): s <- ext/Extension$package.`#*#`().(s)
 [2:14..2:20): String -> scala/Predef.String#
@@ -1199,13 +1317,48 @@ Occurrences:
 [4:14..4:17): Int -> scala/Int#
 [4:21..4:27): String -> scala/Predef.String#
 [4:29..4:32): Int -> scala/Int#
-[4:37..4:37): -> scala/Tuple2.apply().
 [4:37..4:38): s -> ext/Extension$package.`#*#`().(s)
 [4:40..4:41): i -> ext/Extension$package.`#*#`().(i)
 [6:4..6:5): a <- ext/Extension$package.a.
 [6:14..6:17): foo -> ext/Extension$package.foo().
 [8:4..8:5): c <- ext/Extension$package.c.
 [8:14..8:17): #*# -> ext/Extension$package.`#*#`().
+[10:6..10:10): Read <- ext/Read#
+[10:12..10:13): T <- ext/Read#[T]
+[11:6..11:16): fromString <- ext/Read#fromString().
+[11:17..11:18): s <- ext/Read#fromString().(s)
+[11:20..11:26): String -> scala/Predef.String#
+[11:29..11:35): Option -> scala/Option#
+[11:36..11:37): T -> ext/Read#[T]
+[13:11..13:12): s <- ext/Extension$package.readInto().(s)
+[13:14..13:20): String -> scala/Predef.String#
+[14:6..14:14): readInto <- ext/Extension$package.readInto().
+[14:15..14:16): T <- ext/Extension$package.readInto().[T]
+[14:24..14:28): Read -> ext/Read#
+[14:29..14:30): T -> ext/Extension$package.readInto().[T]
+[14:34..14:40): Option -> scala/Option#
+[14:41..14:42): T -> ext/Extension$package.readInto().[T]
+[14:46..14:52): summon -> scala/Predef.summon().
+[14:53..14:57): Read -> ext/Read#
+[14:58..14:59): T -> ext/Extension$package.readInto().[T]
+[14:62..14:72): fromString -> ext/Read#fromString().
+[14:73..14:74): s -> ext/Extension$package.readInto().(s)
+[16:6..16:13): Functor <- ext/Functor#
+[16:14..16:15): F <- ext/Functor#[F]
+[17:13..17:14): T <- ext/Functor#map().[T]
+[17:16..17:17): t <- ext/Functor#map().(t)
+[17:19..17:20): F -> ext/Functor#[F]
+[17:21..17:22): T -> ext/Functor#map().[T]
+[17:29..17:32): map <- ext/Functor#map().
+[17:33..17:34): U <- ext/Functor#map().[U]
+[17:36..17:37): f <- ext/Functor#map().(f)
+[17:39..17:40): T -> ext/Functor#map().[T]
+[17:44..17:45): U -> ext/Functor#map().[U]
+[17:48..17:49): F -> ext/Functor#[F]
+[17:50..17:51): U -> ext/Functor#map().[U]
+
+Synthetics:
+[14:46..14:61):summon[Read[T]] => *(x$2)
 
 expect/ForComprehension.scala
 -----------------------------
@@ -1216,106 +1369,71 @@ Uri => ForComprehension.scala
 Text => empty
 Language => Scala
 Symbols => 13 entries
-Occurrences => 88 entries
+Occurrences => 52 entries
+Synthetics => 6 entries
 
 Symbols:
-example/ForComprehension# => class ForComprehension
-example/ForComprehension#`<init>`(). => primary ctor <init>
-local0 => param a
-local1 => param b
-local2 => val local c
-local3 => param x$1
-local4 => param a
-local5 => param b
-local6 => param x$1
-local7 => val local c
-local8 => val local d
-local9 => val local e
-local10 => param f
+example/ForComprehension# => class ForComprehension extends Object { self: ForComprehension => +1 decls }
+example/ForComprehension#`<init>`(). => primary ctor <init> (): ForComprehension
+local0 => param a: Int
+local1 => param b: Int
+local2 => val local c: Int
+local3 => param x$1: Tuple2[Int, Int]
+local4 => param a: Int
+local5 => param b: Int
+local6 => param x$1: Tuple2[Int, Int]
+local7 => val local c: Int
+local8 => val local d: Int
+local9 => val local e: Tuple4[Int, Int, Int, Int]
+local10 => param f: Tuple4[Int, Int, Int, Int]
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:6..2:22): ForComprehension <- example/ForComprehension#
-[3:2..3:2): <- example/ForComprehension#`<init>`().
 [4:4..4:5): a <- local0
 [4:9..4:13): List -> scala/package.List.
-[4:13..4:13): -> scala/collection/IterableFactory#apply().
-[4:16..4:16): -> scala/collection/immutable/List#flatMap().
 [5:4..5:5): b <- local1
-[5:4..5:4): -> scala/Tuple2.apply().
 [5:4..5:5): b -> local1
-[5:4..5:4): -> local3
-[5:4..5:4): -> scala/Tuple2.unapply().
 [5:9..5:13): List -> scala/package.List.
-[5:13..5:13): -> scala/collection/IterableFactory#apply().
-[5:16..5:16): -> scala/collection/IterableOps#withFilter().
 [6:7..6:8): b -> local1
 [6:9..6:10): > -> scala/Int#`>`(+3).
-[6:12..6:12): -> scala/collection/WithFilter#map().
 [7:4..7:5): c <- local2
 [7:4..7:5): c -> local2
 [7:8..7:9): a -> local0
 [7:10..7:11): + -> scala/Int#`+`(+4).
 [7:12..7:13): b -> local1
-[7:13..7:13): -> scala/collection/immutable/List#map().
-[8:11..8:11): -> scala/Tuple3.apply().
 [8:11..8:12): a -> local0
 [8:14..8:15): b -> local1
 [8:17..8:18): c -> local2
 [10:4..10:5): a <- local4
 [10:9..10:13): List -> scala/package.List.
-[10:13..10:13): -> scala/collection/IterableFactory#apply().
-[10:16..10:16): -> scala/collection/immutable/List#flatMap().
 [11:4..11:5): b <- local5
 [11:9..11:13): List -> scala/package.List.
-[11:13..11:13): -> scala/collection/IterableFactory#apply().
 [11:14..11:15): a -> local4
-[11:16..11:16): -> scala/collection/IterableOps#withFilter().
-[13:6..13:6): -> scala/Tuple2.apply().
 [13:6..13:7): a -> local4
 [14:6..14:7): b -> local5
 [15:6..15:8): == -> scala/Any#`==`().
-[15:10..15:10): -> scala/Tuple2.apply().
-[15:15..15:15): -> scala/collection/WithFilter#flatMap().
-[16:4..16:4): -> local6
-[16:4..16:4): -> scala/Tuple2.unapply().
-[17:6..17:6): -> scala/Tuple2.unapply().
 [17:6..17:7): c <- local7
 [18:6..18:7): d <- local8
 [19:9..19:13): List -> scala/package.List.
-[19:13..19:13): -> scala/collection/IterableFactory#apply().
-[19:15..19:15): -> scala/Tuple2.apply().
 [19:15..19:16): a -> local4
 [19:18..19:19): b -> local5
-[19:21..19:21): -> scala/collection/WithFilter#withFilter().
-[19:21..19:21): -> scala/collection/IterableOps#withFilter().
-[21:6..21:6): -> scala/Tuple4.apply().
 [21:6..21:7): a -> local4
 [22:6..22:7): b -> local5
 [23:6..23:7): c -> local7
 [24:6..24:7): d -> local8
 [25:6..25:8): == -> scala/Any#`==`().
-[25:10..25:10): -> scala/Tuple4.apply().
-[25:21..25:21): -> scala/collection/WithFilter#map().
 [26:4..26:5): e <- local9
-[26:4..26:4): -> scala/Tuple2.apply().
 [26:4..26:5): e -> local9
-[27:6..27:6): -> scala/Tuple4.apply().
 [27:6..27:7): a -> local4
 [28:6..28:7): b -> local5
 [29:6..29:7): c -> local7
 [30:6..30:7): d -> local8
-[31:5..31:5): -> scala/collection/IterableOps#withFilter().
 [32:7..32:8): e -> local9
 [32:9..32:11): == -> scala/Any#`==`().
-[32:13..32:13): -> scala/Tuple4.apply().
-[32:24..32:24): -> scala/collection/WithFilter#flatMap().
 [33:4..33:5): f <- local10
 [33:9..33:13): List -> scala/package.List.
-[33:13..33:13): -> scala/collection/IterableFactory#apply().
 [33:14..33:15): e -> local9
-[33:16..33:16): -> scala/collection/immutable/List#map().
-[36:6..36:6): -> scala/Tuple6.apply().
 [36:6..36:7): a -> local4
 [37:6..37:7): b -> local5
 [38:6..38:7): c -> local7
@@ -1323,6 +1441,14 @@ Occurrences:
 [40:6..40:7): e -> local9
 [41:6..41:7): f -> local10
 
+Synthetics:
+[4:9..4:13):List => *.apply[Int]
+[5:9..5:13):List => *.apply[Int]
+[10:9..10:13):List => *.apply[Int]
+[11:9..11:13):List => *.apply[Int]
+[19:9..19:13):List => *.apply[Tuple2[Int, Int]]
+[33:9..33:13):List => *.apply[Tuple4[Int, Int, Int, Int]]
+
 expect/Givens.scala
 -------------------
 
@@ -1332,38 +1458,39 @@ Uri => Givens.scala
 Text => empty
 Language => Scala
 Symbols => 29 entries
-Occurrences => 70 entries
+Occurrences => 65 entries
+Synthetics => 3 entries
 
 Symbols:
-a/b/Givens. => final object Givens
-a/b/Givens.Monoid# => trait Monoid
-a/b/Givens.Monoid#[A] => typeparam A
-a/b/Givens.Monoid#`<init>`(). => primary ctor <init>
-a/b/Givens.Monoid#combine(). => abstract method combine
-a/b/Givens.Monoid#combine().(x) => param x
-a/b/Givens.Monoid#combine().(y) => param y
-a/b/Givens.Monoid#empty(). => abstract method empty
-a/b/Givens.foo(). => method foo
-a/b/Givens.foo().(A) => implicit param A
-a/b/Givens.foo().[A] => typeparam A
-a/b/Givens.given_Monoid_String. => final implicit object given_Monoid_String
-a/b/Givens.given_Monoid_String.combine(). => method combine
-a/b/Givens.given_Monoid_String.combine().(x) => param x
-a/b/Givens.given_Monoid_String.combine().(y) => param y
-a/b/Givens.given_Monoid_String.empty(). => method empty
-a/b/Givens.goodbye1. => val method goodbye1
-a/b/Givens.hello1. => val method hello1
-a/b/Givens.int2String(). => final implicit macro int2String
-a/b/Givens.sayGoodbye(). => method sayGoodbye
-a/b/Givens.sayGoodbye().(any) => param any
-a/b/Givens.sayGoodbye().[B] => typeparam B
-a/b/Givens.sayHello(). => method sayHello
-a/b/Givens.sayHello().(any) => param any
-a/b/Givens.sayHello().[A] => typeparam A
-a/b/Givens.saySoLong(). => method saySoLong
-a/b/Givens.saySoLong().(any) => param any
-a/b/Givens.saySoLong().[B] => typeparam B
-a/b/Givens.soLong1. => val method soLong1
+a/b/Givens. => final object Givens extends Object { self: Givens.type => +12 decls }
+a/b/Givens.Monoid# => trait Monoid [typeparam A ] extends Object { self: Monoid[A] => +4 decls }
+a/b/Givens.Monoid#[A] => typeparam A 
+a/b/Givens.Monoid#`<init>`(). => primary ctor <init> [typeparam A ](): Monoid[A]
+a/b/Givens.Monoid#combine(). => abstract method combine (param x: A)(param y: A): A
+a/b/Givens.Monoid#combine().(x) => param x: A
+a/b/Givens.Monoid#combine().(y) => param y: A
+a/b/Givens.Monoid#empty(). => abstract method empty => A
+a/b/Givens.foo(). => method foo [typeparam A ](implicit given param A: Monoid[A]): A
+a/b/Givens.foo().(A) => implicit given param A: Monoid[A]
+a/b/Givens.foo().[A] => typeparam A 
+a/b/Givens.given_Monoid_String. => final implicit given object given_Monoid_String extends Object with Monoid[String] { self: given_Monoid_String.type => +3 decls }
+a/b/Givens.given_Monoid_String.combine(). => method combine (param x: String)(param y: String): String <: a/b/Givens.Monoid#combine().
+a/b/Givens.given_Monoid_String.combine().(x) => param x: String
+a/b/Givens.given_Monoid_String.combine().(y) => param y: String
+a/b/Givens.given_Monoid_String.empty(). => method empty => String <: a/b/Givens.Monoid#empty().
+a/b/Givens.goodbye1. => val method goodbye1 String
+a/b/Givens.hello1. => val method hello1 String
+a/b/Givens.int2String(). => final implicit given inline macro int2String => Conversion[Int, String]
+a/b/Givens.sayGoodbye(). => method sayGoodbye [typeparam B ](param any: B): String
+a/b/Givens.sayGoodbye().(any) => param any: B
+a/b/Givens.sayGoodbye().[B] => typeparam B 
+a/b/Givens.sayHello(). => method sayHello [typeparam A ](param any: A): String
+a/b/Givens.sayHello().(any) => param any: A
+a/b/Givens.sayHello().[A] => typeparam A 
+a/b/Givens.saySoLong(). => method saySoLong [typeparam B ](param any: B): String
+a/b/Givens.saySoLong().(any) => param any: B
+a/b/Givens.saySoLong().[B] => typeparam B 
+a/b/Givens.soLong1. => val method soLong1 String
 
 Occurrences:
 [0:8..0:9): a <- a/
@@ -1373,7 +1500,6 @@ Occurrences:
 [5:16..5:19): any <- a/b/Givens.sayHello().(any)
 [5:21..5:22): A -> a/b/Givens.sayHello().[A]
 [6:8..6:16): sayHello <- a/b/Givens.sayHello().
-[6:21..6:21): -> scala/StringContext.apply().
 [6:34..6:37): any -> a/b/Givens.sayHello().(any)
 [6:37..6:38): " -> scala/StringContext#s().
 [8:13..8:14): B <- a/b/Givens.sayGoodbye().[B]
@@ -1383,11 +1509,9 @@ Occurrences:
 [8:21..8:22): B -> a/b/Givens.sayGoodbye().[B]
 [8:21..8:22): B -> a/b/Givens.saySoLong().[B]
 [9:8..9:18): sayGoodbye <- a/b/Givens.sayGoodbye().
-[9:23..9:23): -> scala/StringContext.apply().
 [9:38..9:41): any -> a/b/Givens.sayGoodbye().(any)
 [9:41..9:42): " -> scala/StringContext#s().
 [10:8..10:17): saySoLong <- a/b/Givens.saySoLong().
-[10:22..10:22): -> scala/StringContext.apply().
 [10:37..10:40): any -> a/b/Givens.saySoLong().(any)
 [10:40..10:41): " -> scala/StringContext#s().
 [12:6..12:12): hello1 <- a/b/Givens.hello1.
@@ -1397,7 +1521,6 @@ Occurrences:
 [14:6..14:13): soLong1 <- a/b/Givens.soLong1.
 [14:18..14:27): saySoLong -> a/b/Givens.saySoLong().
 [16:8..16:14): Monoid <- a/b/Givens.Monoid#
-[16:14..16:14): <- a/b/Givens.Monoid#`<init>`().
 [16:15..16:16): A <- a/b/Givens.Monoid#[A]
 [17:8..17:13): empty <- a/b/Givens.Monoid#empty().
 [17:15..17:16): A -> a/b/Givens.Monoid#[A]
@@ -1407,7 +1530,6 @@ Occurrences:
 [18:33..18:34): y <- a/b/Givens.Monoid#combine().(y)
 [18:36..18:37): A -> a/b/Givens.Monoid#[A]
 [18:40..18:41): A -> a/b/Givens.Monoid#[A]
-[20:8..20:27): Monoid[String] with <- a/b/Givens.given_Monoid_String.
 [20:8..20:14): Monoid -> a/b/Givens.Monoid#
 [20:15..20:21): String -> scala/Predef.String#
 [21:8..21:13): empty <- a/b/Givens.given_Monoid_String.empty().
@@ -1437,6 +1559,11 @@ Occurrences:
 [26:57..26:58): A -> a/b/Givens.foo().(A)
 [26:59..26:64): empty -> a/b/Givens.Monoid#empty().
 
+Synthetics:
+[12:17..12:25):sayHello => *[Int]
+[13:19..13:29):sayGoodbye => *[Int]
+[14:18..14:27):saySoLong => *[Int]
+
 expect/ImplicitConversion.scala
 -------------------------------
 
@@ -1446,32 +1573,33 @@ Uri => ImplicitConversion.scala
 Text => empty
 Language => Scala
 Symbols => 23 entries
-Occurrences => 62 entries
+Occurrences => 50 entries
+Synthetics => 6 entries
 
 Symbols:
-example/ImplicitConversion# => class ImplicitConversion
-example/ImplicitConversion#`<init>`(). => primary ctor <init>
-example/ImplicitConversion#a. => val method a
-example/ImplicitConversion#b. => val method b
-example/ImplicitConversion#char. => val method char
-example/ImplicitConversion#message. => val method message
-example/ImplicitConversion#number. => val method number
-example/ImplicitConversion#string2Number(). => implicit method string2Number
-example/ImplicitConversion#string2Number().(string) => param string
-example/ImplicitConversion#tuple. => val method tuple
-example/ImplicitConversion#x. => val method x
-example/ImplicitConversion. => final object ImplicitConversion
-example/ImplicitConversion.newAny2stringadd# => final class newAny2stringadd
-example/ImplicitConversion.newAny2stringadd#[A] => typeparam A
-example/ImplicitConversion.newAny2stringadd#`+`(). => method +
-example/ImplicitConversion.newAny2stringadd#`+`().(other) => param other
-example/ImplicitConversion.newAny2stringadd#`<init>`(). => primary ctor <init>
-example/ImplicitConversion.newAny2stringadd#`<init>`().(self) => param self
-example/ImplicitConversion.newAny2stringadd#self. => val method self
-example/ImplicitConversion.newAny2stringadd(). => final implicit method newAny2stringadd
-example/ImplicitConversion.newAny2stringadd().(self) => param self
-example/ImplicitConversion.newAny2stringadd().[A] => typeparam A
-example/ImplicitConversion.newAny2stringadd. => final object newAny2stringadd
+example/ImplicitConversion# => class ImplicitConversion extends Object { self: ImplicitConversion => +9 decls }
+example/ImplicitConversion#`<init>`(). => primary ctor <init> (): ImplicitConversion
+example/ImplicitConversion#a. => val method a Int
+example/ImplicitConversion#b. => val method b Long
+example/ImplicitConversion#char. => val method char Char
+example/ImplicitConversion#message. => val method message String
+example/ImplicitConversion#number. => val method number Int
+example/ImplicitConversion#string2Number(). => implicit method string2Number (param string: String): Int
+example/ImplicitConversion#string2Number().(string) => param string: String
+example/ImplicitConversion#tuple. => val method tuple Tuple2[Int, Int]
+example/ImplicitConversion#x. => val method x Int
+example/ImplicitConversion. => final object ImplicitConversion extends Object { self: ImplicitConversion.type => +6 decls }
+example/ImplicitConversion.newAny2stringadd# => final implicit class newAny2stringadd [typeparam A ] extends AnyVal { self: newAny2stringadd[A] => +4 decls }
+example/ImplicitConversion.newAny2stringadd#[A] => typeparam A 
+example/ImplicitConversion.newAny2stringadd#`+`(). => method + (param other: String): String
+example/ImplicitConversion.newAny2stringadd#`+`().(other) => param other: String
+example/ImplicitConversion.newAny2stringadd#`<init>`(). => primary ctor <init> [typeparam A ](param self: A): newAny2stringadd[A]
+example/ImplicitConversion.newAny2stringadd#`<init>`().(self) => param self: A
+example/ImplicitConversion.newAny2stringadd#self. => private val method self A
+example/ImplicitConversion.newAny2stringadd(). => final implicit method newAny2stringadd [typeparam A ](param self: A): newAny2stringadd[A]
+example/ImplicitConversion.newAny2stringadd().(self) => param self: A
+example/ImplicitConversion.newAny2stringadd().[A] => typeparam A 
+example/ImplicitConversion.newAny2stringadd. => final object newAny2stringadd extends Object { self: newAny2stringadd.type => +2 decls }
 
 Occurrences:
 [0:8..0:15): example <- example/
@@ -1479,7 +1607,6 @@ Occurrences:
 [2:13..2:21): language -> scala/language.
 [2:22..2:41): implicitConversions -> scala/language.implicitConversions.
 [4:6..4:24): ImplicitConversion <- example/ImplicitConversion#
-[5:2..5:2): <- example/ImplicitConversion#`<init>`().
 [5:9..5:27): ImplicitConversion -> example/ImplicitConversion.
 [6:15..6:28): string2Number <- example/ImplicitConversion#string2Number().
 [7:6..7:12): string <- example/ImplicitConversion#string2Number().(string)
@@ -1488,45 +1615,34 @@ Occurrences:
 [9:6..9:13): message <- example/ImplicitConversion#message.
 [10:6..10:12): number <- example/ImplicitConversion#number.
 [11:6..11:11): tuple <- example/ImplicitConversion#tuple.
-[11:15..11:15): -> scala/Tuple2.apply().
 [12:6..12:10): char <- example/ImplicitConversion#char.
 [12:12..12:16): Char -> scala/Char#
-[15:2..15:2): -> scala/Predef.augmentString().
 [15:2..15:9): message -> example/ImplicitConversion#message.
 [16:5..16:16): stripSuffix -> scala/collection/StringOps#stripSuffix().
-[17:2..17:2): -> example/ImplicitConversion.newAny2stringadd().
 [17:2..17:7): tuple -> example/ImplicitConversion#tuple.
 [17:8..17:9): + -> example/ImplicitConversion.newAny2stringadd#`+`().
 [20:6..20:7): x <- example/ImplicitConversion#x.
 [20:9..20:12): Int -> scala/Int#
-[20:15..20:15): -> example/ImplicitConversion#string2Number().
 [20:15..20:22): message -> example/ImplicitConversion#message.
-[23:4..23:4): -> scala/StringContext.apply().
 [23:11..23:18): message -> example/ImplicitConversion#message.
 [23:20..23:26): number -> example/ImplicitConversion#number.
 [23:26..23:27): " -> scala/StringContext#s().
-[24:2..24:2): -> scala/Predef.augmentString().
-[24:6..24:6): -> scala/StringContext.apply().
 [25:7..25:14): message -> example/ImplicitConversion#message.
 [26:7..26:13): number -> example/ImplicitConversion#number.
 [26:15..26:16): " -> scala/StringContext#s().
 [26:17..26:28): stripMargin -> scala/collection/StringOps#stripMargin(+1).
 [28:6..28:7): a <- example/ImplicitConversion#a.
 [28:9..28:12): Int -> scala/Int#
-[28:15..28:15): -> scala/Char.char2int().
 [28:15..28:19): char -> example/ImplicitConversion#char.
 [29:6..29:7): b <- example/ImplicitConversion#b.
 [29:9..29:13): Long -> scala/Long#
-[29:16..29:16): -> scala/Char.char2long().
 [29:16..29:20): char -> example/ImplicitConversion#char.
 [32:7..32:25): ImplicitConversion <- example/ImplicitConversion.
 [33:23..33:39): newAny2stringadd <- example/ImplicitConversion.newAny2stringadd#
-[33:39..33:39): <- example/ImplicitConversion.newAny2stringadd#`<init>`().
 [33:40..33:41): A <- example/ImplicitConversion.newAny2stringadd#[A]
 [33:55..33:59): self <- example/ImplicitConversion.newAny2stringadd#self.
 [33:61..33:62): A -> example/ImplicitConversion.newAny2stringadd#[A]
 [33:72..33:78): AnyVal -> scala/AnyVal#
-[33:78..33:78): -> scala/AnyVal#`<init>`().
 [34:8..34:9): + <- example/ImplicitConversion.newAny2stringadd#`+`().
 [34:10..34:15): other <- example/ImplicitConversion.newAny2stringadd#`+`().(other)
 [34:17..34:23): String -> scala/Predef.String#
@@ -1537,6 +1653,16 @@ Occurrences:
 [34:56..34:57): + -> java/lang/String#`+`().
 [34:58..34:63): other -> example/ImplicitConversion.newAny2stringadd#`+`().(other)
 
+Synthetics:
+[15:2..15:9):message => augmentString(*)
+[17:2..17:7):tuple => newAny2stringadd[Tuple2[Int, Int]](*)
+[20:15..20:22):message => string2Number(*)
+[24:2..26:16):s"""Hello
+     |$message
+     |$number""" => augmentString(*)
+[28:15..28:19):char => char2int(*)
+[29:16..29:20):char => char2long(*)
+
 expect/Imports.scala
 --------------------
 
@@ -1545,16 +1671,30 @@ Schema => SemanticDB v4
 Uri => Imports.scala
 Text => empty
 Language => Scala
-Symbols => 0 entries
-Occurrences => 4 entries
+Symbols => 2 entries
+Occurrences => 16 entries
 
 Symbols:
+_empty_/Imports$package. => final package object _empty_ extends Object { self: _empty_.type => +2 decls }
+_empty_/Imports$package.m. => val method m HashMap[Int, Int]
 
 Occurrences:
 [0:7..0:12): scala -> scala/
 [0:13..0:17): util -> scala/util/
 [0:18..0:25): control -> scala/util/control/
 [0:26..0:34): NonFatal -> scala/util/control/NonFatal.
+[1:7..1:12): scala -> scala/
+[1:13..1:23): collection -> scala/collection/
+[1:24..1:33): immutable -> scala/collection/immutable/
+[1:35..1:42): HashMap -> scala/collection/immutable/HashMap.
+[1:35..1:42): HashMap -> scala/collection/immutable/HashMap#
+[3:4..3:5): m <- _empty_/Imports$package.m.
+[3:7..3:9): HM -> scala/collection/immutable/HashMap#
+[3:10..3:13): Int -> scala/Int#
+[3:15..3:18): Int -> scala/Int#
+[3:22..3:24): HM -> scala/collection/immutable/HashMap.
+[3:25..3:28): Int -> scala/Int#
+[3:30..3:33): Int -> scala/Int#
 
 expect/InstrumentTyper.scala
 ----------------------------
@@ -1565,17 +1705,18 @@ Uri => InstrumentTyper.scala
 Text => empty
 Language => Scala
 Symbols => 8 entries
-Occurrences => 55 entries
+Occurrences => 52 entries
+Synthetics => 2 entries
 
 Symbols:
-example/InstrumentTyper# => class InstrumentTyper
-example/InstrumentTyper#AnnotatedType# => type AnnotatedType
-example/InstrumentTyper#`<init>`(). => primary ctor <init>
-example/InstrumentTyper#all(). => method all
-example/InstrumentTyper#clazzOf. => final val method clazzOf
-example/InstrumentTyper#singletonType(). => method singletonType
-example/InstrumentTyper#singletonType().(x) => param x
-local0 => selfparam self
+example/InstrumentTyper# => class InstrumentTyper extends Object { self: AnyRef & InstrumentTyper => +5 decls }
+example/InstrumentTyper#AnnotatedType# => type AnnotatedType  = Int @param
+example/InstrumentTyper#`<init>`(). => primary ctor <init> (): InstrumentTyper
+example/InstrumentTyper#all(). => method all => List[Matchable]
+example/InstrumentTyper#clazzOf. => final val method clazzOf Option[Int]
+example/InstrumentTyper#singletonType(). => method singletonType (param x: Predef.type): Nothing
+example/InstrumentTyper#singletonType().(x) => param x: Predef.type
+local0 => selfparam self: AnyRef
 
 Occurrences:
 [0:8..0:15): example <- example/
@@ -1592,12 +1733,10 @@ Occurrences:
 [5:7..5:12): types -> types/
 [5:13..5:17): Test -> types/Test.
 [7:6..7:21): InstrumentTyper <- example/InstrumentTyper#
-[7:24..7:24): <- example/InstrumentTyper#`<init>`().
 [7:24..7:28): self <- local0
 [7:30..7:36): AnyRef -> scala/AnyRef#
 [8:6..8:9): all <- example/InstrumentTyper#all().
 [8:12..8:16): List -> scala/package.List.
-[8:16..8:16): -> scala/collection/IterableFactory#apply().
 [9:4..9:11): Literal -> types/Test.Literal.
 [9:12..9:15): int -> types/Test.Literal.int.
 [10:4..10:11): Literal -> types/Test.Literal.
@@ -1621,7 +1760,6 @@ Occurrences:
 [19:4..19:11): Literal -> types/Test.Literal.
 [19:12..19:19): clazzOf -> types/Test.Literal.clazzOf.
 [20:4..20:8): List -> scala/package.List.
-[20:8..20:8): -> scala/collection/IterableFactory#apply().
 [22:7..22:20): AnnotatedType <- example/InstrumentTyper#AnnotatedType#
 [22:23..22:26): Int -> scala/Int#
 [22:28..22:33): param -> scala/annotation/meta/param#
@@ -1634,6 +1772,10 @@ Occurrences:
 [24:30..24:36): Option -> scala/Option#
 [24:37..24:40): Int -> scala/Int#
 
+Synthetics:
+[8:12..8:16):List => *.apply[Matchable]
+[20:4..20:8):List => *.apply[Nothing]
+
 expect/InventedNames.scala
 --------------------------
 
@@ -1643,80 +1785,74 @@ Uri => InventedNames.scala
 Text => empty
 Language => Scala
 Symbols => 45 entries
-Occurrences => 73 entries
+Occurrences => 61 entries
+Synthetics => 3 entries
 
 Symbols:
-givens/InventedNames$package. => final package object givens
-givens/InventedNames$package.`* *`. => final implicit lazy val method * *
-givens/InventedNames$package.a. => val method a
-givens/InventedNames$package.b. => val method b
-givens/InventedNames$package.c. => val method c
-givens/InventedNames$package.d. => val method d
-givens/InventedNames$package.e. => val method e
-givens/InventedNames$package.f. => val method f
-givens/InventedNames$package.g. => val method g
-givens/InventedNames$package.given_Char. => final implicit lazy val method given_Char
-givens/InventedNames$package.given_Double(). => final implicit method given_Double
-givens/InventedNames$package.given_Double().(x$1) => implicit param x$1
-givens/InventedNames$package.given_Float. => final implicit lazy val method given_Float
-givens/InventedNames$package.given_List_T(). => final implicit method given_List_T
-givens/InventedNames$package.given_List_T().[T] => typeparam T
-givens/InventedNames$package.given_String. => final implicit lazy val method given_String
-givens/InventedNames$package.given_X. => final implicit object given_X
-givens/InventedNames$package.given_X.doX(). => method doX
-givens/InventedNames$package.given_Y# => class given_Y
-givens/InventedNames$package.given_Y#`<init>`(). => primary ctor <init>
-givens/InventedNames$package.given_Y#`<init>`().(x$1) => implicit val param x$1
-givens/InventedNames$package.given_Y#doY(). => method doY
-givens/InventedNames$package.given_Y#x$1. => implicit val method x$1
-givens/InventedNames$package.given_Y(). => final implicit method given_Y
-givens/InventedNames$package.given_Y().(x$1) => implicit param x$1
-givens/InventedNames$package.given_Z_T# => class given_Z_T
-givens/InventedNames$package.given_Z_T#[T] => typeparam T
-givens/InventedNames$package.given_Z_T#`<init>`(). => primary ctor <init>
-givens/InventedNames$package.given_Z_T#doZ(). => method doZ
-givens/InventedNames$package.given_Z_T(). => final implicit method given_Z_T
-givens/InventedNames$package.given_Z_T().[T] => typeparam T
-givens/InventedNames$package.intValue. => final implicit lazy val method intValue
-givens/InventedNames$package.x. => val method x
-givens/InventedNames$package.y. => val method y
-givens/InventedNames$package.z. => val method z
-givens/X# => trait X
-givens/X#`<init>`(). => primary ctor <init>
-givens/X#doX(). => abstract method doX
-givens/Y# => trait Y
-givens/Y#`<init>`(). => primary ctor <init>
-givens/Y#doY(). => abstract method doY
-givens/Z# => trait Z
-givens/Z#[T] => typeparam T
-givens/Z#`<init>`(). => primary ctor <init>
-givens/Z#doZ(). => abstract method doZ
+givens/InventedNames$package. => final package object givens extends Object { self: givens.type => +24 decls }
+givens/InventedNames$package.`* *`. => final implicit lazy val given method * * Long
+givens/InventedNames$package.a. => val method a Int
+givens/InventedNames$package.b. => val method b String
+givens/InventedNames$package.c. => val method c Double
+givens/InventedNames$package.d. => val method d List[Int]
+givens/InventedNames$package.e. => val method e Char
+givens/InventedNames$package.f. => val method f Float
+givens/InventedNames$package.g. => val method g Long
+givens/InventedNames$package.given_Char. => final implicit lazy val given method given_Char Char
+givens/InventedNames$package.given_Double(). => final implicit given method given_Double (implicit given param x$1: Int): Double
+givens/InventedNames$package.given_Double().(x$1) => implicit given param x$1: Int
+givens/InventedNames$package.given_Float. => final implicit lazy val given method given_Float Float
+givens/InventedNames$package.given_List_T(). => final implicit given method given_List_T [typeparam T ]: List[T]
+givens/InventedNames$package.given_List_T().[T] => typeparam T 
+givens/InventedNames$package.given_String. => final implicit lazy val given method given_String String
+givens/InventedNames$package.given_X. => final implicit given object given_X extends Object with X { self: given_X.type => +2 decls }
+givens/InventedNames$package.given_X.doX(). => method doX => Int <: givens/X#doX().
+givens/InventedNames$package.given_Y# => implicit given class given_Y extends Object with Y { self: given_Y => +3 decls }
+givens/InventedNames$package.given_Y#`<init>`(). => primary ctor <init> ()(implicit val given param x$1: X): given_Y
+givens/InventedNames$package.given_Y#`<init>`().(x$1) => implicit val given param x$1: X
+givens/InventedNames$package.given_Y#doY(). => method doY => String <: givens/Y#doY().
+givens/InventedNames$package.given_Y#x$1. => protected implicit val given method x$1 X
+givens/InventedNames$package.given_Y(). => final implicit given method given_Y (implicit given param x$1: X): given_Y
+givens/InventedNames$package.given_Y().(x$1) => implicit given param x$1: X
+givens/InventedNames$package.given_Z_T# => implicit given class given_Z_T [typeparam T ] extends Object with Z[T] { self: given_Z_T[T] => +3 decls }
+givens/InventedNames$package.given_Z_T#[T] => typeparam T 
+givens/InventedNames$package.given_Z_T#`<init>`(). => primary ctor <init> [typeparam T ](): given_Z_T[T]
+givens/InventedNames$package.given_Z_T#doZ(). => method doZ => List[T] <: givens/Z#doZ().
+givens/InventedNames$package.given_Z_T(). => final implicit given method given_Z_T [typeparam T ]: given_Z_T[T]
+givens/InventedNames$package.given_Z_T().[T] => typeparam T 
+givens/InventedNames$package.intValue. => final implicit lazy val given method intValue Int
+givens/InventedNames$package.x. => val method x given_X.type
+givens/InventedNames$package.y. => val method y given_Y
+givens/InventedNames$package.z. => val method z given_Z_T[String]
+givens/X# => trait X extends Object { self: X => +2 decls }
+givens/X#`<init>`(). => primary ctor <init> (): X
+givens/X#doX(). => abstract method doX => Int
+givens/Y# => trait Y extends Object { self: Y => +2 decls }
+givens/Y#`<init>`(). => primary ctor <init> (): Y
+givens/Y#doY(). => abstract method doY => String
+givens/Z# => trait Z [typeparam T ] extends Object { self: Z[T] => +3 decls }
+givens/Z#[T] => typeparam T 
+givens/Z#`<init>`(). => primary ctor <init> [typeparam T ](): Z[T]
+givens/Z#doZ(). => abstract method doZ => List[T]
 
 Occurrences:
 [0:8..0:14): givens <- givens/
 [2:6..2:7): X <- givens/X#
-[3:2..3:2): <- givens/X#`<init>`().
 [3:6..3:9): doX <- givens/X#doX().
 [3:11..3:14): Int -> scala/Int#
 [5:6..5:7): Y <- givens/Y#
-[6:2..6:2): <- givens/Y#`<init>`().
 [6:6..6:9): doY <- givens/Y#doY().
 [6:11..6:17): String -> scala/Predef.String#
 [8:6..8:7): Z <- givens/Z#
-[8:7..8:7): <- givens/Z#`<init>`().
 [8:8..8:9): T <- givens/Z#[T]
 [9:6..9:9): doZ <- givens/Z#doZ().
 [9:11..9:15): List -> scala/package.List#
 [9:16..9:17): T -> givens/Z#[T]
-[13:0..13:0): <- givens/InventedNames$package.
 [13:6..13:14): intValue <- givens/InventedNames$package.intValue.
 [13:16..13:19): Int -> scala/Int#
-[14:6..14:6): <- givens/InventedNames$package.given_String.
 [14:6..14:12): String -> scala/Predef.String#
-[15:6..15:6): <- givens/InventedNames$package.given_Double().
 [15:13..15:16): Int -> scala/Int#
 [15:19..15:25): Double -> scala/Double#
-[16:6..16:6): <- givens/InventedNames$package.given_List_T().
 [16:7..16:8): T <- givens/InventedNames$package.given_List_T().[T]
 [16:11..16:15): List -> scala/package.List#
 [16:16..16:17): T -> givens/InventedNames$package.given_List_T().[T]
@@ -1727,14 +1863,11 @@ Occurrences:
 [18:21..18:26): Float -> scala/Float#
 [19:7..19:10): * * <- givens/InventedNames$package.`* *`.
 [19:13..19:17): Long -> scala/Long#
-[21:6..22:0): <- givens/InventedNames$package.given_X.
 [21:6..21:7): X -> givens/X#
 [22:6..22:9): doX <- givens/InventedNames$package.given_X.doX().
-[24:13..24:13): <- givens/InventedNames$package.given_Y#`<init>`().
 [24:13..24:14): X -> givens/X#
 [24:17..24:18): Y -> givens/Y#
 [25:6..25:9): doY <- givens/InventedNames$package.given_Y#doY().
-[27:7..27:7): <- givens/InventedNames$package.given_Z_T#`<init>`().
 [27:7..27:8): T <- givens/InventedNames$package.given_Z_T#[T]
 [27:11..27:12): Z -> givens/Z#
 [27:13..27:14): T -> givens/InventedNames$package.given_Z_T#[T]
@@ -1748,7 +1881,6 @@ Occurrences:
 [33:8..33:20): given_String -> givens/InventedNames$package.given_String.
 [34:4..34:5): c <- givens/InventedNames$package.c.
 [34:8..34:20): given_Double -> givens/InventedNames$package.given_Double().
-[34:20..34:20): -> givens/InventedNames$package.intValue.
 [35:4..35:5): d <- givens/InventedNames$package.d.
 [35:8..35:20): given_List_T -> givens/InventedNames$package.given_List_T().
 [35:21..35:24): Int -> scala/Int#
@@ -1762,11 +1894,15 @@ Occurrences:
 [39:8..39:15): given_X -> givens/InventedNames$package.given_X.
 [40:4..40:5): y <- givens/InventedNames$package.y.
 [40:8..40:15): given_Y -> givens/InventedNames$package.given_Y().
-[40:15..40:15): -> givens/InventedNames$package.given_X.
 [41:4..41:5): z <- givens/InventedNames$package.z.
 [41:8..41:17): given_Z_T -> givens/InventedNames$package.given_Z_T().
 [41:18..41:24): String -> scala/Predef.String#
 
+Synthetics:
+[24:0..24:0): => *(x$1)
+[34:8..34:20):given_Double => *(intValue)
+[40:8..40:15):given_Y => *(given_X)
+
 expect/Issue1749.scala
 ----------------------
 
@@ -1776,16 +1912,17 @@ Uri => Issue1749.scala
 Text => empty
 Language => Scala
 Symbols => 7 entries
-Occurrences => 30 entries
+Occurrences => 22 entries
+Synthetics => 3 entries
 
 Symbols:
-example/Issue1749# => class Issue1749
-example/Issue1749#`<init>`(). => primary ctor <init>
-example/Issue1749#x1. => val method x1
-example/Issue1749#x2. => val method x2
-example/Issue1854# => class Issue1854
-example/Issue1854#`<init>`(). => primary ctor <init>
-example/Issue1854#map. => val method map
+example/Issue1749# => class Issue1749 extends Object { self: Issue1749 => +3 decls }
+example/Issue1749#`<init>`(). => primary ctor <init> (): Issue1749
+example/Issue1749#x1. => val method x1 Int
+example/Issue1749#x2. => val method x2 Int
+example/Issue1854# => class Issue1854 extends Object { self: Issue1854 => +2 decls }
+example/Issue1854#`<init>`(). => primary ctor <init> (): Issue1854
+example/Issue1854#map. => val method map Map[String, String]
 
 Occurrences:
 [1:8..1:15): example <- example/
@@ -1794,21 +1931,14 @@ Occurrences:
 [3:18..3:25): Ordered -> scala/math/Ordered.
 [3:26..3:43): orderingToOrdered -> scala/math/Ordered.orderingToOrdered().
 [5:6..5:15): Issue1749 <- example/Issue1749#
-[6:2..6:2): <- example/Issue1749#`<init>`().
 [6:6..6:8): x1 <- example/Issue1749#x1.
 [7:6..7:8): x2 <- example/Issue1749#x2.
-[8:2..8:2): -> scala/math/Ordered.orderingToOrdered().
-[8:3..8:3): -> scala/Tuple2.apply().
 [8:3..8:5): x1 -> example/Issue1749#x1.
 [8:7..8:9): x1 -> example/Issue1749#x1.
-[8:10..8:10): -> scala/math/Ordering.Tuple2().
-[8:10..8:10): -> scala/math/Ordering.Int.
 [9:5..9:12): compare -> scala/math/Ordered#compare().
-[9:14..9:14): -> scala/Tuple2.apply().
 [9:14..9:16): x2 -> example/Issue1749#x2.
 [9:18..9:20): x2 -> example/Issue1749#x2.
 [12:6..12:15): Issue1854 <- example/Issue1854#
-[13:2..13:2): <- example/Issue1854#`<init>`().
 [13:6..13:9): map <- example/Issue1854#map.
 [13:12..13:22): collection -> scala/collection/
 [13:23..13:30): mutable -> scala/collection/mutable/
@@ -1817,7 +1947,11 @@ Occurrences:
 [13:41..13:47): String -> scala/Predef.String#
 [13:49..13:55): String -> scala/Predef.String#
 [14:2..14:5): map -> example/Issue1854#map.
-[14:5..14:5): -> scala/collection/mutable/MapOps#update().
+
+Synthetics:
+[8:2..8:10):(x1, x1) => orderingToOrdered[Tuple2[Int, Int]](*)
+[8:2..8:10):(x1, x1) => *(Tuple2(Int, Int))
+[8:10..8:10): => *(Int, Int)
 
 expect/Local.scala
 ------------------
@@ -1828,28 +1962,31 @@ Uri => Local.scala
 Text => empty
 Language => Scala
 Symbols => 6 entries
-Occurrences => 11 entries
+Occurrences => 10 entries
+Synthetics => 1 entries
 
 Symbols:
-example/Local# => class Local
-example/Local#`<init>`(). => primary ctor <init>
-example/Local#a(). => method a
-local0 => local id
-local1 => typeparam A
-local2 => param a
+example/Local# => class Local extends Object { self: Local => +2 decls }
+example/Local#`<init>`(). => primary ctor <init> (): Local
+example/Local#a(). => method a (): Int
+local0 => typeparam A 
+local1 => param a: A
+local2 => local id: [typeparam A ](param a: A): A
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:6..2:11): Local <- example/Local#
-[3:2..3:2): <- example/Local#`<init>`().
 [3:6..3:7): a <- example/Local#a().
-[4:8..4:10): id <- local0
-[4:11..4:12): A <- local1
-[4:14..4:15): a <- local2
-[4:17..4:18): A -> local1
-[4:21..4:22): A -> local1
-[4:25..4:26): a -> local2
-[5:4..5:6): id -> local0
+[4:8..4:10): id <- local2
+[4:11..4:12): A <- local0
+[4:14..4:15): a <- local1
+[4:17..4:18): A -> local0
+[4:21..4:22): A -> local0
+[4:25..4:26): a -> local1
+[5:4..5:6): id -> local2
+
+Synthetics:
+[5:4..5:6):id => *[Int]
 
 expect/Locals.scala
 -------------------
@@ -1860,12 +1997,13 @@ Uri => Locals.scala
 Text => empty
 Language => Scala
 Symbols => 3 entries
-Occurrences => 7 entries
+Occurrences => 6 entries
+Synthetics => 1 entries
 
 Symbols:
-local0 => val local x
-locals/Test. => final object Test
-locals/Test.xs. => val method xs
+local0 => val local x: Int
+locals/Test. => final object Test extends Object { self: Test.type => +2 decls }
+locals/Test.xs. => val method xs List[Int]
 
 Occurrences:
 [0:8..0:14): locals <- locals/
@@ -1873,9 +2011,11 @@ Occurrences:
 [3:6..3:8): xs <- locals/Test.xs.
 [4:8..4:9): x <- local0
 [5:4..5:8): List -> scala/package.List.
-[5:8..5:8): -> scala/collection/IterableFactory#apply().
 [5:9..5:10): x -> local0
 
+Synthetics:
+[5:4..5:8):List => *.apply[Int]
+
 expect/MetacJava.scala
 ----------------------
 
@@ -1885,26 +2025,25 @@ Uri => MetacJava.scala
 Text => empty
 Language => Scala
 Symbols => 10 entries
-Occurrences => 72 entries
+Occurrences => 62 entries
 
 Symbols:
-example/MetacJava# => class MetacJava
-example/MetacJava#`<init>`(). => primary ctor <init>
-example/MetacJava#coin. => val method coin
-example/MetacJava#entry. => val method entry
-example/MetacJava#inner. => val method inner
-example/MetacJava#interface. => val method interface
-example/MetacJava#nonStatic. => val method nonStatic
-example/MetacJava#overload1. => val method overload1
-example/MetacJava#overload2. => val method overload2
-example/MetacJava#staticInner. => val method staticInner
+example/MetacJava# => class MetacJava extends Object { self: MetacJava => +9 decls }
+example/MetacJava#`<init>`(). => primary ctor <init> (): MetacJava
+example/MetacJava#coin. => val method coin Coin
+example/MetacJava#entry. => val method entry Entry[Int, Int]
+example/MetacJava#inner. => val method inner MetacJava
+example/MetacJava#interface. => val method interface Interface
+example/MetacJava#nonStatic. => val method nonStatic staticInner.NonStatic
+example/MetacJava#overload1. => val method overload1 inner.Overload1
+example/MetacJava#overload2. => val method overload2 inner.Overload2
+example/MetacJava#staticInner. => val method staticInner StaticInner
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:7..2:10): com -> com/
 [2:11..2:17): javacp -> com/javacp/
 [4:6..4:15): MetacJava <- example/MetacJava#
-[5:2..5:2): <- example/MetacJava#`<init>`().
 [5:2..5:8): javacp -> com/javacp/
 [5:9..5:18): MetacJava -> com/javacp/MetacJava#
 [5:19..5:30): StaticInner -> com/javacp/MetacJava#StaticInner#
@@ -1912,39 +2051,31 @@ Occurrences:
 [6:6..6:12): javacp -> com/javacp/
 [6:13..6:22): MetacJava -> com/javacp/MetacJava#
 [6:23..6:34): StaticInner -> com/javacp/MetacJava#StaticInner#
-[6:34..6:34): -> com/javacp/MetacJava#StaticInner#`<init>`().
 [6:37..6:48): isNotStatic -> com/javacp/MetacJava#StaticInner#isNotStatic().
 [7:6..7:11): inner <- example/MetacJava#inner.
 [7:18..7:24): javacp -> com/javacp/
 [7:25..7:34): MetacJava -> com/javacp/MetacJava#
-[7:34..7:34): -> com/javacp/MetacJava#`<init>`().
 [8:6..8:15): overload1 <- example/MetacJava#overload1.
 [8:22..8:27): inner -> example/MetacJava#inner.
 [8:28..8:37): Overload1 -> com/javacp/MetacJava#Overload1#
-[8:37..8:37): -> com/javacp/MetacJava#Overload1#`<init>`().
 [9:6..9:15): overload2 <- example/MetacJava#overload2.
 [9:22..9:27): inner -> example/MetacJava#inner.
 [9:28..9:37): Overload2 -> com/javacp/MetacJava#Overload2#
-[9:37..9:37): -> com/javacp/MetacJava#Overload2#`<init>`().
 [10:2..10:7): inner -> example/MetacJava#inner.
 [10:8..10:16): overload -> com/javacp/MetacJava#overload().
 [10:21..10:30): overload1 -> example/MetacJava#overload1.
 [10:31..10:32): A -> com/javacp/MetacJava#Overload1#A#
-[10:32..10:32): -> com/javacp/MetacJava#Overload1#A#`<init>`().
 [11:2..11:7): inner -> example/MetacJava#inner.
 [11:8..11:16): overload -> com/javacp/MetacJava#overload(+1).
 [11:21..11:30): overload2 -> example/MetacJava#overload2.
 [11:31..11:32): A -> com/javacp/MetacJava#Overload2#A#
-[11:32..11:32): -> com/javacp/MetacJava#Overload2#A#`<init>`().
 [12:6..12:17): staticInner <- example/MetacJava#staticInner.
 [12:24..12:30): javacp -> com/javacp/
 [12:31..12:40): MetacJava -> com/javacp/MetacJava#
 [12:41..12:52): StaticInner -> com/javacp/MetacJava#StaticInner#
-[12:52..12:52): -> com/javacp/MetacJava#StaticInner#`<init>`().
 [13:6..13:15): nonStatic <- example/MetacJava#nonStatic.
 [13:22..13:33): staticInner -> example/MetacJava#staticInner.
 [13:34..13:43): NonStatic -> com/javacp/MetacJava#StaticInner#NonStatic#
-[13:43..13:43): -> com/javacp/MetacJava#StaticInner#NonStatic#`<init>`().
 [14:2..14:11): nonStatic -> example/MetacJava#nonStatic.
 [14:12..14:18): method -> com/javacp/MetacJava#StaticInner#NonStatic#method().
 [14:19..14:28): nonStatic -> example/MetacJava#nonStatic.
@@ -1955,7 +2086,6 @@ Occurrences:
 [15:39..15:48): MetacJava -> com/javacp/MetacJava#
 [15:49..15:58): Overload3 -> com/javacp/MetacJava#Overload3#
 [15:59..15:60): A -> com/javacp/MetacJava#Overload3#A#
-[15:60..15:60): -> com/javacp/MetacJava#Overload3#A#`<init>`().
 [16:6..16:15): interface <- example/MetacJava#interface.
 [16:17..16:23): javacp -> com/javacp/
 [16:24..16:33): Interface -> com/javacp/Interface#
@@ -1982,21 +2112,20 @@ Uri => MethodUsages.scala
 Text => empty
 Language => Scala
 Symbols => 3 entries
-Occurrences => 85 entries
+Occurrences => 80 entries
+Synthetics => 2 entries
 
 Symbols:
-example/MethodUsages# => class MethodUsages
-example/MethodUsages#`<init>`(). => primary ctor <init>
-example/MethodUsages#m. => val method m
+example/MethodUsages# => class MethodUsages extends Object { self: MethodUsages => +2 decls }
+example/MethodUsages#`<init>`(). => primary ctor <init> (): MethodUsages
+example/MethodUsages#m. => val method m Methods[Int]
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:6..2:18): MethodUsages <- example/MethodUsages#
-[3:2..3:2): <- example/MethodUsages#`<init>`().
 [3:6..3:7): m <- example/MethodUsages#m.
 [3:14..3:21): Methods -> example/Methods#
 [3:22..3:25): Int -> scala/Int#
-[3:26..3:26): -> example/Methods#`<init>`().
 [4:2..4:3): m -> example/MethodUsages#m.
 [4:4..4:6): m1 -> example/Methods#m1().
 [5:2..5:3): m -> example/MethodUsages#m.
@@ -2016,7 +2145,6 @@ Occurrences:
 [11:11..11:12): m -> example/MethodUsages#m.
 [11:13..11:17): List -> example/Methods#List#
 [11:18..11:21): Int -> scala/Int#
-[11:22..11:22): -> example/Methods#List#`<init>`().
 [12:2..12:3): m -> example/MethodUsages#m.
 [12:4..12:6): m6 -> example/Methods#m6(+2).
 [12:7..12:10): Nil -> scala/package.Nil.
@@ -2026,8 +2154,6 @@ Occurrences:
 [13:14..13:15): m -> example/MethodUsages#m.
 [13:16..13:20): List -> example/Methods#List#
 [13:21..13:24): Int -> scala/Int#
-[13:25..13:25): -> example/Methods#List#`<init>`().
-[13:26..13:26): -> scala/math/Ordering.Int.
 [14:2..14:3): m -> example/MethodUsages#m.
 [14:4..14:11): `m8().` -> example/Methods#`m8().`().
 [15:2..15:3): m -> example/MethodUsages#m.
@@ -2076,6 +2202,10 @@ Occurrences:
 [34:4..34:7): m20 -> example/Methods#m20(+2).
 [34:8..34:9): m -> example/Methods#m17.m().
 
+Synthetics:
+[13:2..13:6):m.m7 => *[Int]
+[13:2..13:26):m.m7(m, new m.List[Int]) => *(Int)
+
 expect/Methods.scala
 --------------------
 
@@ -2084,87 +2214,92 @@ Schema => SemanticDB v4
 Uri => Methods.scala
 Text => empty
 Language => Scala
-Symbols => 77 entries
-Occurrences => 149 entries
+Symbols => 82 entries
+Occurrences => 153 entries
 
 Symbols:
-example/Methods# => class Methods
-example/Methods#AList# => type AList
-example/Methods#AList#[T] => typeparam T
-example/Methods#List# => class List
-example/Methods#List#[T] => typeparam T
-example/Methods#List#`<init>`(). => primary ctor <init>
-example/Methods#[T] => typeparam T
-example/Methods#`<init>`(). => primary ctor <init>
-example/Methods#`m8().`(). => method m8().
-example/Methods#`m9().`# => class m9().
-example/Methods#`m9().`#`<init>`(). => primary ctor <init>
-example/Methods#`m20_=`(). => var method m20_=
-example/Methods#`m20_=`().(x$1) => param x$1
-example/Methods#m1(). => method m1
-example/Methods#m2(). => method m2
-example/Methods#m3(). => method m3
-example/Methods#m3().(x) => param x
-example/Methods#m4(). => method m4
-example/Methods#m4().(x) => param x
-example/Methods#m4().(y) => param y
-example/Methods#m5(). => method m5
-example/Methods#m5().(x) => param x
-example/Methods#m5(+1). => method m5
-example/Methods#m5(+1).(x) => param x
-example/Methods#m6(). => method m6
-example/Methods#m6().(x) => param x
-example/Methods#m6(+1). => method m6
-example/Methods#m6(+1).(x) => param x
-example/Methods#m6(+2). => method m6
-example/Methods#m6(+2).(x) => param x
-example/Methods#m7(). => method m7
-example/Methods#m7().(c) => param c
-example/Methods#m7().(l) => param l
-example/Methods#m7().[U] => typeparam U
-example/Methods#m9(). => method m9
-example/Methods#m9().(x) => param x
-example/Methods#m10(). => method m10
-example/Methods#m10().(x) => param x
-example/Methods#m11(). => method m11
-example/Methods#m11().(x) => param x
-example/Methods#m11(+1). => method m11
-example/Methods#m11(+1).(x) => param x
-example/Methods#m12a(). => method m12a
-example/Methods#m12a().(x) => param x
-example/Methods#m12b(). => method m12b
-example/Methods#m12b().(x) => param x
-example/Methods#m13(). => method m13
-example/Methods#m13().(x) => param x
-example/Methods#m15(). => method m15
-example/Methods#m15().(x) => param x
-example/Methods#m16(). => method m16
-example/Methods#m16().(x) => param x
-example/Methods#m17(). => method m17
-example/Methods#m17().(a) => param a
-example/Methods#m17(+1). => method m17
-example/Methods#m17(+1).(b) => param b
-example/Methods#m17. => final object m17
-example/Methods#m17.m(). => method m
-example/Methods#m18(). => method m18
-example/Methods#m18().(a) => param a
-example/Methods#m18(+1). => method m18
-example/Methods#m18(+1).(b) => param b
-example/Methods#m18. => val method m18
-example/Methods#m19$default$2(). => method m19$default$2
-example/Methods#m19$default$3(). => method m19$default$3
-example/Methods#m19$default$3().(x) => param x
-example/Methods#m19$default$3().(y) => param y
-example/Methods#m19(). => method m19
-example/Methods#m19().(x) => param x
-example/Methods#m19().(y) => param y
-example/Methods#m19().(z) => param z
-example/Methods#m20(). => method m20
-example/Methods#m20().(a) => param a
-example/Methods#m20(+1). => method m20
-example/Methods#m20(+1).(b) => param b
-example/Methods#m20(+2). => var method m20
-local0 => abstract val method x
+example/Methods# => class Methods [typeparam T ] extends Object { self: Methods[T] => +44 decls }
+example/Methods#AList# => type AList [typeparam T ] = List[T]
+example/Methods#AList#[T] => typeparam T 
+example/Methods#List# => class List [typeparam T ] extends Object { self: List[T] => +2 decls }
+example/Methods#List#[T] => typeparam T 
+example/Methods#List#`<init>`(). => primary ctor <init> [typeparam T ](): List[T]
+example/Methods#[T] => typeparam T 
+example/Methods#`<init>`(). => primary ctor <init> [typeparam T ](): Methods[T]
+example/Methods#`m8().`(). => method m8(). (): Nothing
+example/Methods#`m9().`# => class m9(). extends Object { self: m9(). => +1 decls }
+example/Methods#`m9().`#`<init>`(). => primary ctor <init> (): m9().
+example/Methods#`m20_=`(). => var method m20_= (param x$1: m17.type): Unit
+example/Methods#`m20_=`().(x$1) => param x$1: m17.type
+example/Methods#m1(). => method m1 => Nothing
+example/Methods#m2(). => method m2 (): Nothing
+example/Methods#m3(). => method m3 (param x: Int): Nothing
+example/Methods#m3().(x) => param x: Int
+example/Methods#m4(). => method m4 (param x: Int)(param y: Int): Nothing
+example/Methods#m4().(x) => param x: Int
+example/Methods#m4().(y) => param y: Int
+example/Methods#m5(). => method m5 (param x: String): Nothing
+example/Methods#m5().(x) => param x: String
+example/Methods#m5(+1). => method m5 (param x: Int): Nothing
+example/Methods#m5(+1).(x) => param x: Int
+example/Methods#m6(). => method m6 (param x: Int): Nothing
+example/Methods#m6().(x) => param x: Int
+example/Methods#m6(+1). => method m6 (param x: List[T]): Nothing
+example/Methods#m6(+1).(x) => param x: List[T]
+example/Methods#m6(+2). => method m6 (param x: List[T]): Nothing
+example/Methods#m6(+2).(x) => param x: List[T]
+example/Methods#m7(). => method m7 [typeparam U ](param c: Methods[T], param l: List[U])(implicit param evidence$1: Ordering[U]): Nothing
+example/Methods#m7().(c) => param c: Methods[T]
+example/Methods#m7().(evidence$1) => implicit param evidence$1: Ordering[U]
+example/Methods#m7().(l) => param l: List[U]
+example/Methods#m7().[U] => typeparam U 
+example/Methods#m9(). => method m9 (param x: m9().): Nothing
+example/Methods#m9().(x) => param x: m9().
+example/Methods#m10(). => method m10 (param x: List[T]): Nothing
+example/Methods#m10().(x) => param x: List[T]
+example/Methods#m11(). => method m11 (param x: Predef.type): Nothing
+example/Methods#m11().(x) => param x: Predef.type
+example/Methods#m11(+1). => method m11 (param x: Example.type): Nothing
+example/Methods#m11(+1).(x) => param x: Example.type
+example/Methods#m12a(). => method m12a (param x: Object): Nothing
+example/Methods#m12a().(x) => param x: Object
+example/Methods#m12b(). => method m12b (param x: Object { abstract val method x Int }): Nothing
+example/Methods#m12b().(x) => param x: Object { abstract val method x Int }
+example/Methods#m12c(). => method m12c (param x: Object { abstract method y => Int; abstract val method x Int }): Nothing
+example/Methods#m12c().(x) => param x: Object { abstract method y => Int; abstract val method x Int }
+example/Methods#m13(). => method m13 (param x: Int @unchecked): Nothing
+example/Methods#m13().(x) => param x: Int @unchecked
+example/Methods#m15(). => method m15 (param x: => Int): Nothing
+example/Methods#m15().(x) => param x: => Int
+example/Methods#m16(). => method m16 (param x: Int*): Nothing
+example/Methods#m16().(x) => param x: Int*
+example/Methods#m17(). => method m17 (param a: Int): Nothing
+example/Methods#m17().(a) => param a: Int
+example/Methods#m17(+1). => method m17 (param b: String): Nothing
+example/Methods#m17(+1).(b) => param b: String
+example/Methods#m17. => final object m17 extends Object { self: m17.type => +2 decls }
+example/Methods#m17.m(). => method m (): Nothing
+example/Methods#m18(). => method m18 (param a: Int): Nothing
+example/Methods#m18().(a) => param a: Int
+example/Methods#m18(+1). => method m18 (param b: String): Nothing
+example/Methods#m18(+1).(b) => param b: String
+example/Methods#m18. => val method m18 m17.type
+example/Methods#m19$default$2(). => method m19$default$2 => Int @uncheckedVariance
+example/Methods#m19$default$3(). => method m19$default$3 (param x: Int, param y: Int): Int @uncheckedVariance
+example/Methods#m19$default$3().(x) => param x: Int
+example/Methods#m19$default$3().(y) => param y: Int
+example/Methods#m19(). => method m19 (param x: Int, param y: Int)(param z: Int): Nothing
+example/Methods#m19().(x) => param x: Int
+example/Methods#m19().(y) => param y: Int
+example/Methods#m19().(z) => param z: Int
+example/Methods#m20(). => method m20 (param a: Int): Nothing
+example/Methods#m20().(a) => param a: Int
+example/Methods#m20(+1). => method m20 (param b: String): Nothing
+example/Methods#m20(+1).(b) => param b: String
+example/Methods#m20(+2). => var method m20 m17.type
+local0 => abstract val method x Int
+local1 => abstract val method x Int
+local2 => abstract method y => Int
 
 Occurrences:
 [0:8..0:15): example <- example/
@@ -2176,10 +2311,8 @@ Occurrences:
 [3:13..3:21): language -> scala/language.
 [3:22..3:34): existentials -> scala/language.existentials.
 [5:6..5:13): Methods <- example/Methods#
-[5:13..5:13): <- example/Methods#`<init>`().
 [5:14..5:15): T <- example/Methods#[T]
 [6:8..6:12): List <- example/Methods#List#
-[6:12..6:12): <- example/Methods#List#`<init>`().
 [6:13..6:14): T <- example/Methods#List#[T]
 [7:7..7:12): AList <- example/Methods#AList#
 [7:13..7:14): T <- example/Methods#AList#[T]
@@ -2224,8 +2357,8 @@ Occurrences:
 [16:29..16:32): ??? -> scala/Predef.`???`().
 [17:6..17:8): m7 <- example/Methods#m7().
 [17:9..17:10): U <- example/Methods#m7().[U]
+[17:10..17:10): <- example/Methods#m7().(evidence$1)
 [17:12..17:20): Ordering -> scala/math/Ordering#
-[17:20..17:20): -> example/Methods#m7().[U]
 [17:22..17:23): c <- example/Methods#m7().(c)
 [17:25..17:32): Methods -> example/Methods#
 [17:33..17:34): T -> example/Methods#[T]
@@ -2235,7 +2368,6 @@ Occurrences:
 [17:51..17:54): ??? -> scala/Predef.`???`().
 [18:7..18:12): m8(). <- example/Methods#`m8().`().
 [18:18..18:21): ??? -> scala/Predef.`???`().
-[19:2..19:2): <- example/Methods#`m9().`#`<init>`().
 [19:9..19:14): m9(). <- example/Methods#`m9().`#
 [20:6..20:8): m9 <- example/Methods#m9().
 [20:9..20:10): x <- example/Methods#m9().(x)
@@ -2262,60 +2394,67 @@ Occurrences:
 [25:20..25:21): x <- local0
 [25:23..25:26): Int -> scala/Int#
 [25:32..25:35): ??? -> scala/Predef.`???`().
-[26:6..26:9): m13 <- example/Methods#m13().
-[26:10..26:11): x <- example/Methods#m13().(x)
-[26:13..26:16): Int -> scala/Int#
-[26:18..26:27): unchecked -> scala/unchecked#
-[26:31..26:34): ??? -> scala/Predef.`???`().
-[27:6..27:9): m15 <- example/Methods#m15().
-[27:10..27:11): x <- example/Methods#m15().(x)
-[27:16..27:19): Int -> scala/Int#
-[27:23..27:26): ??? -> scala/Predef.`???`().
-[28:6..28:9): m16 <- example/Methods#m16().
-[28:10..28:11): x <- example/Methods#m16().(x)
-[28:13..28:16): Int -> scala/Int#
-[28:21..28:24): ??? -> scala/Predef.`???`().
-[29:9..29:12): m17 <- example/Methods#m17.
-[29:19..29:20): m <- example/Methods#m17.m().
-[29:25..29:28): ??? -> scala/Predef.`???`().
-[30:6..30:9): m17 <- example/Methods#m17().
-[30:10..30:11): a <- example/Methods#m17().(a)
-[30:13..30:16): Int -> scala/Int#
-[30:20..30:23): ??? -> scala/Predef.`???`().
-[31:6..31:9): m17 <- example/Methods#m17(+1).
-[31:10..31:11): b <- example/Methods#m17(+1).(b)
-[31:13..31:19): String -> scala/Predef.String#
-[31:23..31:26): ??? -> scala/Predef.`???`().
-[32:6..32:9): m18 <- example/Methods#m18.
-[32:12..32:15): m17 -> example/Methods#m17.
-[33:6..33:9): m18 <- example/Methods#m18().
-[33:10..33:11): a <- example/Methods#m18().(a)
-[33:13..33:16): Int -> scala/Int#
-[33:20..33:23): ??? -> scala/Predef.`???`().
-[34:6..34:9): m18 <- example/Methods#m18(+1).
-[34:10..34:11): b <- example/Methods#m18(+1).(b)
-[34:13..34:19): String -> scala/Predef.String#
-[34:23..34:26): ??? -> scala/Predef.`???`().
-[35:6..35:9): m19 <- example/Methods#m19().
-[35:10..35:11): x <- example/Methods#m19().(x)
-[35:10..35:11): x <- example/Methods#m19$default$3().(x)
-[35:13..35:16): Int -> scala/Int#
-[35:18..35:19): y <- example/Methods#m19().(y)
-[35:18..35:19): y <- example/Methods#m19$default$3().(y)
-[35:21..35:24): Int -> scala/Int#
-[35:30..35:31): z <- example/Methods#m19().(z)
-[35:33..35:36): Int -> scala/Int#
-[35:44..35:47): ??? -> scala/Predef.`???`().
-[36:6..36:9): m20 <- example/Methods#m20().
-[36:10..36:11): a <- example/Methods#m20().(a)
+[26:6..26:10): m12c <- example/Methods#m12c().
+[26:11..26:12): x <- example/Methods#m12c().(x)
+[26:20..26:21): x <- local1
+[26:23..26:26): Int -> scala/Int#
+[26:32..26:33): y <- local2
+[26:35..26:38): Int -> scala/Int#
+[26:44..26:47): ??? -> scala/Predef.`???`().
+[27:6..27:9): m13 <- example/Methods#m13().
+[27:10..27:11): x <- example/Methods#m13().(x)
+[27:13..27:16): Int -> scala/Int#
+[27:18..27:27): unchecked -> scala/unchecked#
+[27:31..27:34): ??? -> scala/Predef.`???`().
+[28:6..28:9): m15 <- example/Methods#m15().
+[28:10..28:11): x <- example/Methods#m15().(x)
+[28:16..28:19): Int -> scala/Int#
+[28:23..28:26): ??? -> scala/Predef.`???`().
+[29:6..29:9): m16 <- example/Methods#m16().
+[29:10..29:11): x <- example/Methods#m16().(x)
+[29:13..29:16): Int -> scala/Int#
+[29:21..29:24): ??? -> scala/Predef.`???`().
+[30:9..30:12): m17 <- example/Methods#m17.
+[30:19..30:20): m <- example/Methods#m17.m().
+[30:25..30:28): ??? -> scala/Predef.`???`().
+[31:6..31:9): m17 <- example/Methods#m17().
+[31:10..31:11): a <- example/Methods#m17().(a)
+[31:13..31:16): Int -> scala/Int#
+[31:20..31:23): ??? -> scala/Predef.`???`().
+[32:6..32:9): m17 <- example/Methods#m17(+1).
+[32:10..32:11): b <- example/Methods#m17(+1).(b)
+[32:13..32:19): String -> scala/Predef.String#
+[32:23..32:26): ??? -> scala/Predef.`???`().
+[33:6..33:9): m18 <- example/Methods#m18.
+[33:12..33:15): m17 -> example/Methods#m17.
+[34:6..34:9): m18 <- example/Methods#m18().
+[34:10..34:11): a <- example/Methods#m18().(a)
+[34:13..34:16): Int -> scala/Int#
+[34:20..34:23): ??? -> scala/Predef.`???`().
+[35:6..35:9): m18 <- example/Methods#m18(+1).
+[35:10..35:11): b <- example/Methods#m18(+1).(b)
+[35:13..35:19): String -> scala/Predef.String#
+[35:23..35:26): ??? -> scala/Predef.`???`().
+[36:6..36:9): m19 <- example/Methods#m19().
+[36:10..36:11): x <- example/Methods#m19().(x)
+[36:10..36:11): x <- example/Methods#m19$default$3().(x)
 [36:13..36:16): Int -> scala/Int#
-[36:20..36:23): ??? -> scala/Predef.`???`().
-[37:6..37:9): m20 <- example/Methods#m20(+1).
-[37:10..37:11): b <- example/Methods#m20(+1).(b)
-[37:13..37:19): String -> scala/Predef.String#
-[37:23..37:26): ??? -> scala/Predef.`???`().
-[38:6..38:9): m20 <- example/Methods#m20(+2).
-[38:12..38:15): m17 -> example/Methods#m17.
+[36:18..36:19): y <- example/Methods#m19().(y)
+[36:18..36:19): y <- example/Methods#m19$default$3().(y)
+[36:21..36:24): Int -> scala/Int#
+[36:30..36:31): z <- example/Methods#m19().(z)
+[36:33..36:36): Int -> scala/Int#
+[36:44..36:47): ??? -> scala/Predef.`???`().
+[37:6..37:9): m20 <- example/Methods#m20().
+[37:10..37:11): a <- example/Methods#m20().(a)
+[37:13..37:16): Int -> scala/Int#
+[37:20..37:23): ??? -> scala/Predef.`???`().
+[38:6..38:9): m20 <- example/Methods#m20(+1).
+[38:10..38:11): b <- example/Methods#m20(+1).(b)
+[38:13..38:19): String -> scala/Predef.String#
+[38:23..38:26): ??? -> scala/Predef.`???`().
+[39:6..39:9): m20 <- example/Methods#m20(+2).
+[39:12..39:15): m17 -> example/Methods#m17.
 
 expect/NamedApplyBlock.scala
 ----------------------------
@@ -2326,52 +2465,52 @@ Uri => NamedApplyBlock.scala
 Text => empty
 Language => Scala
 Symbols => 43 entries
-Occurrences => 43 entries
+Occurrences => 40 entries
 
 Symbols:
-example/NamedApplyBlockCaseClassConstruction. => final object NamedApplyBlockCaseClassConstruction
-example/NamedApplyBlockCaseClassConstruction.Msg# => case class Msg
-example/NamedApplyBlockCaseClassConstruction.Msg#_1(). => method _1
-example/NamedApplyBlockCaseClassConstruction.Msg#_2(). => method _2
-example/NamedApplyBlockCaseClassConstruction.Msg#_3(). => method _3
-example/NamedApplyBlockCaseClassConstruction.Msg#`<init>`(). => primary ctor <init>
-example/NamedApplyBlockCaseClassConstruction.Msg#`<init>`().(body) => val param body
-example/NamedApplyBlockCaseClassConstruction.Msg#`<init>`().(head) => val param head
-example/NamedApplyBlockCaseClassConstruction.Msg#`<init>`().(tail) => val param tail
-example/NamedApplyBlockCaseClassConstruction.Msg#body. => val method body
-example/NamedApplyBlockCaseClassConstruction.Msg#copy$default$1(). => method copy$default$1
-example/NamedApplyBlockCaseClassConstruction.Msg#copy$default$2(). => method copy$default$2
-example/NamedApplyBlockCaseClassConstruction.Msg#copy$default$3(). => method copy$default$3
-example/NamedApplyBlockCaseClassConstruction.Msg#copy(). => method copy
-example/NamedApplyBlockCaseClassConstruction.Msg#copy().(body) => param body
-example/NamedApplyBlockCaseClassConstruction.Msg#copy().(head) => param head
-example/NamedApplyBlockCaseClassConstruction.Msg#copy().(tail) => param tail
-example/NamedApplyBlockCaseClassConstruction.Msg#head. => val method head
-example/NamedApplyBlockCaseClassConstruction.Msg#tail. => val method tail
-example/NamedApplyBlockCaseClassConstruction.Msg. => final object Msg
-example/NamedApplyBlockCaseClassConstruction.Msg.$lessinit$greater$default$2(). => method $lessinit$greater$default$2
-example/NamedApplyBlockCaseClassConstruction.Msg.apply(). => method apply
-example/NamedApplyBlockCaseClassConstruction.Msg.apply().(body) => param body
-example/NamedApplyBlockCaseClassConstruction.Msg.apply().(head) => param head
-example/NamedApplyBlockCaseClassConstruction.Msg.apply().(tail) => param tail
-example/NamedApplyBlockCaseClassConstruction.Msg.toString(). => method toString
-example/NamedApplyBlockCaseClassConstruction.Msg.unapply(). => method unapply
-example/NamedApplyBlockCaseClassConstruction.Msg.unapply().(x$1) => param x$1
-example/NamedApplyBlockCaseClassConstruction.bodyText. => val method bodyText
-example/NamedApplyBlockCaseClassConstruction.msg. => val method msg
-example/NamedApplyBlockMethods. => final object NamedApplyBlockMethods
-example/NamedApplyBlockMethods.baseCase(). => method baseCase
-example/NamedApplyBlockMethods.foo$default$1(). => method foo$default$1
-example/NamedApplyBlockMethods.foo$default$2(). => method foo$default$2
-example/NamedApplyBlockMethods.foo$default$3(). => method foo$default$3
-example/NamedApplyBlockMethods.foo(). => method foo
-example/NamedApplyBlockMethods.foo().(a) => param a
-example/NamedApplyBlockMethods.foo().(b) => param b
-example/NamedApplyBlockMethods.foo().(c) => param c
-example/NamedApplyBlockMethods.local. => val method local
-example/NamedApplyBlockMethods.recursive(). => method recursive
-local0 => val local c$1
-local1 => val local b$1
+example/NamedApplyBlockCaseClassConstruction. => final object NamedApplyBlockCaseClassConstruction extends Object { self: NamedApplyBlockCaseClassConstruction.type => +6 decls }
+example/NamedApplyBlockCaseClassConstruction.Msg# => case class Msg extends Object with Product with Serializable { self: Msg => +11 decls }
+example/NamedApplyBlockCaseClassConstruction.Msg#_1(). => method _1 => String
+example/NamedApplyBlockCaseClassConstruction.Msg#_2(). => method _2 => String
+example/NamedApplyBlockCaseClassConstruction.Msg#_3(). => method _3 => String
+example/NamedApplyBlockCaseClassConstruction.Msg#`<init>`(). => primary ctor <init> (val param body: String, val param head: String, val param tail: String): Msg
+example/NamedApplyBlockCaseClassConstruction.Msg#`<init>`().(body) => val param body: String
+example/NamedApplyBlockCaseClassConstruction.Msg#`<init>`().(head) => val param head: String
+example/NamedApplyBlockCaseClassConstruction.Msg#`<init>`().(tail) => val param tail: String
+example/NamedApplyBlockCaseClassConstruction.Msg#body. => val method body String
+example/NamedApplyBlockCaseClassConstruction.Msg#copy$default$1(). => method copy$default$1 => String @uncheckedVariance
+example/NamedApplyBlockCaseClassConstruction.Msg#copy$default$2(). => method copy$default$2 => String @uncheckedVariance
+example/NamedApplyBlockCaseClassConstruction.Msg#copy$default$3(). => method copy$default$3 => String @uncheckedVariance
+example/NamedApplyBlockCaseClassConstruction.Msg#copy(). => method copy (param body: String, param head: String, param tail: String): Msg
+example/NamedApplyBlockCaseClassConstruction.Msg#copy().(body) => param body: String
+example/NamedApplyBlockCaseClassConstruction.Msg#copy().(head) => param head: String
+example/NamedApplyBlockCaseClassConstruction.Msg#copy().(tail) => param tail: String
+example/NamedApplyBlockCaseClassConstruction.Msg#head. => val method head String
+example/NamedApplyBlockCaseClassConstruction.Msg#tail. => val method tail String
+example/NamedApplyBlockCaseClassConstruction.Msg. => final object Msg extends Object { self: Msg.type => +5 decls }
+example/NamedApplyBlockCaseClassConstruction.Msg.$lessinit$greater$default$2(). => method $lessinit$greater$default$2 => String @uncheckedVariance
+example/NamedApplyBlockCaseClassConstruction.Msg.apply(). => method apply (param body: String, param head: String, param tail: String): Msg
+example/NamedApplyBlockCaseClassConstruction.Msg.apply().(body) => param body: String
+example/NamedApplyBlockCaseClassConstruction.Msg.apply().(head) => param head: String
+example/NamedApplyBlockCaseClassConstruction.Msg.apply().(tail) => param tail: String
+example/NamedApplyBlockCaseClassConstruction.Msg.toString(). => method toString => String <: scala/Any#toString().
+example/NamedApplyBlockCaseClassConstruction.Msg.unapply(). => method unapply (param x$1: Msg): Msg
+example/NamedApplyBlockCaseClassConstruction.Msg.unapply().(x$1) => param x$1: Msg
+example/NamedApplyBlockCaseClassConstruction.bodyText. => val method bodyText String
+example/NamedApplyBlockCaseClassConstruction.msg. => val method msg Msg
+example/NamedApplyBlockMethods. => final object NamedApplyBlockMethods extends Object { self: NamedApplyBlockMethods.type => +8 decls }
+example/NamedApplyBlockMethods.baseCase(). => method baseCase => Int
+example/NamedApplyBlockMethods.foo$default$1(). => method foo$default$1 => Int @uncheckedVariance
+example/NamedApplyBlockMethods.foo$default$2(). => method foo$default$2 => Int @uncheckedVariance
+example/NamedApplyBlockMethods.foo$default$3(). => method foo$default$3 => Int @uncheckedVariance
+example/NamedApplyBlockMethods.foo(). => method foo (param a: Int, param b: Int, param c: Int): Int
+example/NamedApplyBlockMethods.foo().(a) => param a: Int
+example/NamedApplyBlockMethods.foo().(b) => param b: Int
+example/NamedApplyBlockMethods.foo().(c) => param c: Int
+example/NamedApplyBlockMethods.local. => val method local Int
+example/NamedApplyBlockMethods.recursive(). => method recursive => Int
+local0 => val local c$1: Int
+local1 => val local b$1: Int @uncheckedVariance
 
 Occurrences:
 [0:8..0:15): example <- example/
@@ -2396,7 +2535,6 @@ Occurrences:
 [5:28..5:29): c -> example/NamedApplyBlockMethods.foo().(c)
 [6:6..6:15): recursive <- example/NamedApplyBlockMethods.recursive().
 [6:18..6:21): foo -> example/NamedApplyBlockMethods.foo().
-[6:18..6:18): -> local1
 [6:22..6:27): local -> example/NamedApplyBlockMethods.local.
 [6:29..6:30): c -> example/NamedApplyBlockMethods.foo().(c)
 [6:33..6:36): foo -> example/NamedApplyBlockMethods.foo().
@@ -2404,7 +2542,6 @@ Occurrences:
 [6:44..6:45): c -> example/NamedApplyBlockMethods.foo().(c)
 [9:7..9:43): NamedApplyBlockCaseClassConstruction <- example/NamedApplyBlockCaseClassConstruction.
 [10:13..10:16): Msg <- example/NamedApplyBlockCaseClassConstruction.Msg#
-[10:16..10:16): <- example/NamedApplyBlockCaseClassConstruction.Msg#`<init>`().
 [10:17..10:21): body <- example/NamedApplyBlockCaseClassConstruction.Msg#body.
 [10:23..10:29): String -> scala/Predef.String#
 [10:31..10:35): head <- example/NamedApplyBlockCaseClassConstruction.Msg#head.
@@ -2414,7 +2551,6 @@ Occurrences:
 [11:6..11:14): bodyText <- example/NamedApplyBlockCaseClassConstruction.bodyText.
 [12:6..12:9): msg <- example/NamedApplyBlockCaseClassConstruction.msg.
 [12:12..12:15): Msg -> example/NamedApplyBlockCaseClassConstruction.Msg.
-[12:15..12:15): -> example/NamedApplyBlockCaseClassConstruction.Msg.apply().
 [12:16..12:24): bodyText -> example/NamedApplyBlockCaseClassConstruction.bodyText.
 [12:26..12:30): tail -> example/NamedApplyBlockCaseClassConstruction.Msg.apply().(tail)
 
@@ -2427,36 +2563,33 @@ Uri => NamedArguments.scala
 Text => empty
 Language => Scala
 Symbols => 16 entries
-Occurrences => 13 entries
+Occurrences => 10 entries
 
 Symbols:
-example/NamedArguments# => class NamedArguments
-example/NamedArguments#User# => case class User
-example/NamedArguments#User#_1(). => method _1
-example/NamedArguments#User#`<init>`(). => primary ctor <init>
-example/NamedArguments#User#`<init>`().(name) => val param name
-example/NamedArguments#User#copy$default$1(). => method copy$default$1
-example/NamedArguments#User#copy(). => method copy
-example/NamedArguments#User#copy().(name) => param name
-example/NamedArguments#User#name. => val method name
-example/NamedArguments#User. => final object User
-example/NamedArguments#User.apply(). => method apply
-example/NamedArguments#User.apply().(name) => param name
-example/NamedArguments#User.toString(). => method toString
-example/NamedArguments#User.unapply(). => method unapply
-example/NamedArguments#User.unapply().(x$1) => param x$1
-example/NamedArguments#`<init>`(). => primary ctor <init>
+example/NamedArguments# => class NamedArguments extends Object { self: NamedArguments => +4 decls }
+example/NamedArguments#User# => case class User extends Object with Product with Serializable { self: User => +5 decls }
+example/NamedArguments#User#_1(). => method _1 => String
+example/NamedArguments#User#`<init>`(). => primary ctor <init> (val param name: String): User
+example/NamedArguments#User#`<init>`().(name) => val param name: String
+example/NamedArguments#User#copy$default$1(). => method copy$default$1 => String @uncheckedVariance
+example/NamedArguments#User#copy(). => method copy (param name: String): User
+example/NamedArguments#User#copy().(name) => param name: String
+example/NamedArguments#User#name. => val method name String
+example/NamedArguments#User. => final object User extends Object { self: User.type => +4 decls }
+example/NamedArguments#User.apply(). => method apply (param name: String): User
+example/NamedArguments#User.apply().(name) => param name: String
+example/NamedArguments#User.toString(). => method toString => String <: scala/Any#toString().
+example/NamedArguments#User.unapply(). => method unapply (param x$1: User): User
+example/NamedArguments#User.unapply().(x$1) => param x$1: User
+example/NamedArguments#`<init>`(). => primary ctor <init> (): NamedArguments
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:6..2:20): NamedArguments <- example/NamedArguments#
-[3:2..3:2): <- example/NamedArguments#`<init>`().
 [3:13..3:17): User <- example/NamedArguments#User#
-[3:17..3:17): <- example/NamedArguments#User#`<init>`().
 [3:18..3:22): name <- example/NamedArguments#User#name.
 [3:24..3:30): String -> scala/Predef.String#
 [4:2..4:6): User -> example/NamedArguments#User.
-[4:6..4:6): -> example/NamedArguments#User.apply().
 [4:7..4:11): name -> example/NamedArguments#User.apply().(name)
 [5:2..5:6): User -> example/NamedArguments#User.
 [5:7..5:12): apply -> example/NamedArguments#User.apply().
@@ -2470,19 +2603,41 @@ Schema => SemanticDB v4
 Uri => NewModifiers.scala
 Text => empty
 Language => Scala
-Symbols => 3 entries
-Occurrences => 4 entries
+Symbols => 14 entries
+Occurrences => 15 entries
 
 Symbols:
-_empty_/NewModifiers. => final object NewModifiers
-_empty_/NewModifiers.A# => type A
-_empty_/NewModifiers.foo. => val method foo
+_empty_/NewModifiers$package. => final package object _empty_ extends Object { self: _empty_.type { opaque type OpaqueB  } => +2 decls }
+_empty_/NewModifiers$package.OpaqueB# => opaque type OpaqueB 
+_empty_/NewModifiers. => final object NewModifiers extends Object { self: NewModifiers.type { opaque type A  } => +3 decls }
+_empty_/NewModifiers.A# => opaque type A 
+_empty_/NewModifiers.foo. => val inline method foo "foo"
+_empty_/NewModifiersClass# => opaque class NewModifiersClass extends Object { self: Any { opaque type C  } & NewModifiersClass => +5 decls }
+_empty_/NewModifiersClass#C# => opaque type C 
+_empty_/NewModifiersClass#Nested# => opaque class Nested extends Object { self: Any { opaque type NestedOpaque  } & Nested => +2 decls }
+_empty_/NewModifiersClass#Nested#NestedOpaque# => opaque type NestedOpaque 
+_empty_/NewModifiersClass#Nested#`<init>`(). => primary ctor <init> (): Nested
+_empty_/NewModifiersClass#`<init>`(). => primary ctor <init> (): NewModifiersClass
+_empty_/NewModifiersTrait# => opaque trait NewModifiersTrait extends Object { self: Any { opaque type D  } & NewModifiersTrait => +2 decls }
+_empty_/NewModifiersTrait#D# => opaque type D 
+_empty_/NewModifiersTrait#`<init>`(). => primary ctor <init> (): NewModifiersTrait
 
 Occurrences:
 [0:7..0:19): NewModifiers <- _empty_/NewModifiers.
 [1:13..1:16): foo <- _empty_/NewModifiers.foo.
 [2:14..2:15): A <- _empty_/NewModifiers.A#
 [2:18..2:21): Int -> scala/Int#
+[5:12..5:19): OpaqueB <- _empty_/NewModifiers$package.OpaqueB#
+[5:22..5:25): Int -> scala/Int#
+[7:6..7:23): NewModifiersClass <- _empty_/NewModifiersClass#
+[8:14..8:15): C <- _empty_/NewModifiersClass#C#
+[8:18..8:21): Int -> scala/Int#
+[9:8..9:14): Nested <- _empty_/NewModifiersClass#Nested#
+[10:16..10:28): NestedOpaque <- _empty_/NewModifiersClass#Nested#NestedOpaque#
+[10:31..10:34): Int -> scala/Int#
+[14:6..14:23): NewModifiersTrait <- _empty_/NewModifiersTrait#
+[15:14..15:15): D <- _empty_/NewModifiersTrait#D#
+[15:18..15:21): Int -> scala/Int#
 
 expect/Objects.scala
 --------------------
@@ -2496,8 +2651,8 @@ Symbols => 2 entries
 Occurrences => 3 entries
 
 Symbols:
-objects/X. => final object X
-objects/X.Y. => final object Y
+objects/X. => final object X extends Object { self: X.type => +3 decls }
+objects/X.Y. => final object Y extends Object { self: Y.type => +1 decls }
 
 Occurrences:
 [0:8..0:15): objects <- objects/
@@ -2513,24 +2668,22 @@ Uri => Overrides.scala
 Text => empty
 Language => Scala
 Symbols => 6 entries
-Occurrences => 10 entries
+Occurrences => 8 entries
 
 Symbols:
-example/A# => trait A
-example/A#`<init>`(). => primary ctor <init>
-example/A#foo(). => abstract method foo
-example/B# => class B
-example/B#`<init>`(). => primary ctor <init>
-example/B#foo(). => method foo
+example/A# => trait A extends Object { self: A => +2 decls }
+example/A#`<init>`(). => primary ctor <init> (): A
+example/A#foo(). => abstract method foo => Int
+example/B# => class B extends Object with A { self: B => +2 decls }
+example/B#`<init>`(). => primary ctor <init> (): B
+example/B#foo(). => method foo => Int <: example/A#foo().
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:6..2:7): A <- example/A#
-[2:10..2:10): <- example/A#`<init>`().
 [2:14..2:17): foo <- example/A#foo().
 [2:19..2:22): Int -> scala/Int#
 [3:6..3:7): B <- example/B#
-[3:7..3:7): <- example/B#`<init>`().
 [3:18..3:19): A -> example/A#
 [3:26..3:29): foo <- example/B#foo().
 [3:31..3:34): Int -> scala/Int#
@@ -2544,33 +2697,32 @@ Uri => Prefixes.scala
 Text => empty
 Language => Scala
 Symbols => 19 entries
-Occurrences => 49 entries
+Occurrences => 48 entries
 
 Symbols:
-prefixes/C# => class C
-prefixes/C#N. => final object N
-prefixes/C#N.U# => type U
-prefixes/C#T# => type T
-prefixes/C#`<init>`(). => primary ctor <init>
-prefixes/C#k1(). => method k1
-prefixes/C#m1(). => method m1
-prefixes/M. => final object M
-prefixes/M.T# => type T
-prefixes/M.n1(). => method n1
-prefixes/O. => final object O
-prefixes/O.o1(). => method o1
-prefixes/Test. => final object Test
-prefixes/Test.c. => val method c
-prefixes/Test.k2(). => method k2
-prefixes/Test.k3(). => method k3
-prefixes/Test.m2(). => method m2
-prefixes/Test.n2(). => method n2
-prefixes/Test.n3(). => method n3
+prefixes/C# => class C extends Object { self: C => +6 decls }
+prefixes/C#N. => final object N extends Object { self: N.type => +2 decls }
+prefixes/C#N.U# => type U 
+prefixes/C#T# => type T 
+prefixes/C#`<init>`(). => primary ctor <init> (): C
+prefixes/C#k1(). => method k1 => U
+prefixes/C#m1(). => method m1 => T
+prefixes/M. => final object M extends Object { self: M.type => +3 decls }
+prefixes/M.T# => type T 
+prefixes/M.n1(). => method n1 => T
+prefixes/O. => final object O extends C { self: O.type => +2 decls }
+prefixes/O.o1(). => method o1 => O.this.T
+prefixes/Test. => final object Test extends Object { self: Test.type => +7 decls }
+prefixes/Test.c. => val method c C
+prefixes/Test.k2(). => method k2 => c.N.U
+prefixes/Test.k3(). => method k3 => c.N.U
+prefixes/Test.m2(). => method m2 => c.T
+prefixes/Test.n2(). => method n2 => T
+prefixes/Test.n3(). => method n3 => T
 
 Occurrences:
 [0:8..0:16): prefixes <- prefixes/
 [2:6..2:7): C <- prefixes/C#
-[3:2..3:2): <- prefixes/C#`<init>`().
 [3:7..3:8): T <- prefixes/C#T#
 [4:6..4:8): m1 <- prefixes/C#m1().
 [4:10..4:11): T -> prefixes/C#T#
@@ -2588,7 +2740,6 @@ Occurrences:
 [14:14..14:17): ??? -> scala/Predef.`???`().
 [17:7..17:8): O <- prefixes/O.
 [17:17..17:18): C -> prefixes/C#
-[17:18..17:18): -> prefixes/C#`<init>`().
 [18:6..18:8): o1 <- prefixes/O.o1().
 [18:10..18:11): T -> prefixes/C#T#
 [18:14..18:17): ??? -> scala/Predef.`???`().
@@ -2608,6 +2759,7 @@ Occurrences:
 [25:9..25:10): c -> prefixes/Test.c.
 [25:11..25:12): N -> prefixes/C#N.
 [26:6..26:8): k3 <- prefixes/Test.k3().
+[26:10..26:11): U -> prefixes/C#N.U#
 [26:14..26:17): ??? -> scala/Predef.`???`().
 [28:6..28:8): n2 <- prefixes/Test.n2().
 [28:10..28:11): M -> prefixes/M.
@@ -2618,6 +2770,205 @@ Occurrences:
 [31:10..31:11): T -> prefixes/M.T#
 [31:14..31:17): ??? -> scala/Predef.`???`().
 
+expect/RecOrRefined.scala
+-------------------------
+
+Summary:
+Schema => SemanticDB v4
+Uri => RecOrRefined.scala
+Text => empty
+Language => Scala
+Symbols => 68 entries
+Occurrences => 110 entries
+Synthetics => 3 entries
+
+Symbols:
+example/C# => class C extends Object { self: C => +3 decls }
+example/C#T1# => type T1 
+example/C#T2# => type T2 
+example/C#`<init>`(). => primary ctor <init> (): C
+example/PickOneRefinement_1# => class PickOneRefinement_1 [typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }] extends Object { self: PickOneRefinement_1[S] => +3 decls }
+example/PickOneRefinement_1#[S] => typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }
+example/PickOneRefinement_1#[S](as) => param as: T*
+example/PickOneRefinement_1#[S][T] => typeparam T 
+example/PickOneRefinement_1#`<init>`(). => primary ctor <init> [typeparam S  <: SpecialRefinement { abstract method pickOne [typeparam T ](param as: T*): Option[String] }](): PickOneRefinement_1[S]
+example/PickOneRefinement_1#run(). => method run (param s: S, param as: String*): Option[String]
+example/PickOneRefinement_1#run().(as) => param as: String*
+example/PickOneRefinement_1#run().(s) => param s: S
+example/PolyHolder# => trait PolyHolder extends Object { self: PolyHolder => +2 decls }
+example/PolyHolder#`<init>`(). => primary ctor <init> (): PolyHolder
+example/PolyHolder#foo(). => abstract method foo [typeparam T ](param t: T): Any
+example/PolyHolder#foo().(t) => param t: T
+example/PolyHolder#foo().[T] => typeparam T 
+example/RecOrRefined$package. => final package object example extends Object { self: example.type => +9 decls }
+example/RecOrRefined$package.C2# => type C2  = C { type T2  = T1 <: example/C#T2#; type T1  <: example/C#T1# }
+example/RecOrRefined$package.Person# => type Person  = Record { abstract val method age Int; abstract val method name String }
+example/RecOrRefined$package.m1(). => method m1 (param a: Int { abstract val method x Int }): Nothing
+example/RecOrRefined$package.m1().(a) => param a: Int { abstract val method x Int }
+example/RecOrRefined$package.m2(). => method m2 (param x: Object { abstract method y => Int; abstract val method x Int }): Nothing
+example/RecOrRefined$package.m2().(x) => param x: Object { abstract method y => Int; abstract val method x Int }
+example/RecOrRefined$package.m3(). => method m3 (param x: Object { type z ; abstract method y => Int; abstract val method x Int }): Nothing
+example/RecOrRefined$package.m3().(x) => param x: Object { type z ; abstract method y => Int; abstract val method x Int }
+example/RecOrRefined$package.m4(). => method m4 (param x: PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }): Nothing
+example/RecOrRefined$package.m4().(x) => param x: PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
+example/RecOrRefined$package.m5(). => method m5 [typeparam Z ](param x: Int): PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
+example/RecOrRefined$package.m5().(x) => param x: Int
+example/RecOrRefined$package.m5().[Z] => typeparam Z 
+example/RecOrRefined$package.m6# => type m6 [typeparam X ] = PolyHolder { abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo(). }
+example/RecOrRefined$package.m6#[X] => typeparam X 
+example/Record# => class Record extends Object with Selectable { self: Record => +4 decls }
+example/Record#`<init>`(). => primary ctor <init> (param elems: Tuple2[String, Any]*): Record
+example/Record#`<init>`().(elems) => param elems: Tuple2[String, Any]*
+example/Record#elems. => private[this] val method elems Tuple2[String, Any]*
+example/Record#fields. => private[this] val method fields Map[String, Any]
+example/Record#selectDynamic(). => method selectDynamic (param name: String): Any
+example/Record#selectDynamic().(name) => param name: String
+example/SpecialRefinement# => trait SpecialRefinement extends Object { self: SpecialRefinement => +2 decls }
+example/SpecialRefinement#`<init>`(). => primary ctor <init> (): SpecialRefinement
+example/SpecialRefinement#pickOne(). => abstract method pickOne [typeparam T ](param as: T*): Option[Any]
+example/SpecialRefinement#pickOne().(as) => param as: T*
+example/SpecialRefinement#pickOne().[T] => typeparam T 
+local0 => abstract method pickOne [typeparam T ](param as: T*): Option[String]
+local1 => typeparam T 
+local2 => param as: T*
+local3 => abstract method pickOne [typeparam T ](param as: T*): Option[String] <: example/SpecialRefinement#pickOne().
+local4 => abstract val method x Int
+local5 => abstract val method x Int
+local6 => abstract method y => Int
+local7 => abstract val method x Int
+local8 => abstract method y => Int
+local9 => type z 
+local10 => typeparam T 
+local11 => param t: T
+local12 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
+local13 => typeparam T 
+local14 => param t: T
+local15 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
+local16 => typeparam T 
+local17 => param t: T
+local18 => abstract method foo [typeparam T ](param t: T): T <: example/PolyHolder#foo().
+local19 => abstract val method name String
+local20 => abstract val method age Int
+local21 => type T1  <: example/C#T1#
+local22 => type T2  = T1 <: example/C#T2#
+
+Occurrences:
+[0:8..0:15): example <- example/
+[2:4..2:6): m1 <- example/RecOrRefined$package.m1().
+[2:7..2:8): a <- example/RecOrRefined$package.m1().(a)
+[2:10..2:13): Int -> scala/Int#
+[2:20..2:21): x <- local4
+[2:23..2:26): Int -> scala/Int#
+[2:32..2:35): ??? -> scala/Predef.`???`().
+[3:4..3:6): m2 <- example/RecOrRefined$package.m2().
+[3:7..3:8): x <- example/RecOrRefined$package.m2().(x)
+[3:16..3:17): x <- local5
+[3:19..3:22): Int -> scala/Int#
+[3:28..3:29): y <- local6
+[3:31..3:34): Int -> scala/Int#
+[3:40..3:43): ??? -> scala/Predef.`???`().
+[4:4..4:6): m3 <- example/RecOrRefined$package.m3().
+[4:7..4:8): x <- example/RecOrRefined$package.m3().(x)
+[4:16..4:17): x <- local7
+[4:19..4:22): Int -> scala/Int#
+[4:28..4:29): y <- local8
+[4:31..4:34): Int -> scala/Int#
+[4:41..4:42): z <- local9
+[4:48..4:51): ??? -> scala/Predef.`???`().
+[5:6..5:16): PolyHolder <- example/PolyHolder#
+[6:6..6:9): foo <- example/PolyHolder#foo().
+[6:10..6:11): T <- example/PolyHolder#foo().[T]
+[6:13..6:14): t <- example/PolyHolder#foo().(t)
+[6:16..6:17): T -> example/PolyHolder#foo().[T]
+[6:20..6:23): Any -> scala/Any#
+[9:4..9:6): m4 <- example/RecOrRefined$package.m4().
+[9:7..9:8): x <- example/RecOrRefined$package.m4().(x)
+[9:10..9:20): PolyHolder -> example/PolyHolder#
+[9:27..9:30): foo <- local12
+[9:31..9:32): T <- local10
+[9:34..9:35): t <- local11
+[9:37..9:38): T -> local10
+[9:41..9:42): T -> local10
+[9:48..9:51): ??? -> scala/Predef.`???`().
+[10:4..10:6): m5 <- example/RecOrRefined$package.m5().
+[10:7..10:8): Z <- example/RecOrRefined$package.m5().[Z]
+[10:10..10:11): x <- example/RecOrRefined$package.m5().(x)
+[10:13..10:16): Int -> scala/Int#
+[10:19..10:29): PolyHolder -> example/PolyHolder#
+[10:36..10:39): foo <- local15
+[10:40..10:41): T <- local13
+[10:43..10:44): t <- local14
+[10:46..10:47): T -> local13
+[10:50..10:51): T -> local13
+[10:56..10:59): ??? -> scala/Predef.`???`().
+[12:5..12:7): m6 <- example/RecOrRefined$package.m6#
+[12:11..12:12): X <- example/RecOrRefined$package.m6#[X]
+[12:18..12:28): PolyHolder -> example/PolyHolder#
+[12:35..12:38): foo <- local18
+[12:39..12:40): T <- local16
+[12:42..12:43): t <- local17
+[12:45..12:46): T -> local16
+[12:49..12:50): T -> local16
+[14:6..14:12): Record <- example/Record#
+[14:13..14:18): elems <- example/Record#elems.
+[14:21..14:27): String -> scala/Predef.String#
+[14:29..14:32): Any -> scala/Any#
+[14:44..14:54): Selectable -> scala/Selectable#
+[15:14..15:20): fields <- example/Record#fields.
+[15:23..15:28): elems -> example/Record#elems.
+[15:29..15:34): toMap -> scala/collection/IterableOnceOps#toMap().
+[16:6..16:19): selectDynamic <- example/Record#selectDynamic().
+[16:20..16:24): name <- example/Record#selectDynamic().(name)
+[16:26..16:32): String -> scala/Predef.String#
+[16:35..16:38): Any -> scala/Any#
+[16:41..16:47): fields -> example/Record#fields.
+[16:48..16:52): name -> example/Record#selectDynamic().(name)
+[18:5..18:11): Person <- example/RecOrRefined$package.Person#
+[18:14..18:20): Record -> example/Record#
+[19:6..19:10): name <- local19
+[19:12..19:18): String -> scala/Predef.String#
+[20:6..20:9): age <- local20
+[20:11..20:14): Int -> scala/Int#
+[24:6..24:7): C <- example/C#
+[24:15..24:17): T1 <- example/C#T1#
+[24:24..24:26): T2 <- example/C#T2#
+[25:5..25:7): C2 <- example/RecOrRefined$package.C2#
+[25:10..25:11): C -> example/C#
+[25:19..25:21): T1 <- local21
+[25:28..25:30): T2 <- local22
+[25:33..25:35): T1 -> local21
+[27:6..27:23): SpecialRefinement <- example/SpecialRefinement#
+[28:6..28:13): pickOne <- example/SpecialRefinement#pickOne().
+[28:14..28:15): T <- example/SpecialRefinement#pickOne().[T]
+[28:17..28:19): as <- example/SpecialRefinement#pickOne().(as)
+[28:21..28:22): T -> example/SpecialRefinement#pickOne().[T]
+[28:26..28:32): Option -> scala/Option#
+[28:33..28:36): Any -> scala/Any#
+[31:6..31:25): PickOneRefinement_1 <- example/PickOneRefinement_1#
+[31:26..31:27): S <- example/PickOneRefinement_1#[S]
+[31:31..31:48): SpecialRefinement -> example/SpecialRefinement#
+[31:55..31:62): pickOne <- local3
+[31:63..31:64): T <- local1
+[31:66..31:68): as <- local2
+[31:70..31:71): T -> local1
+[31:75..31:81): Option -> scala/Option#
+[31:82..31:88): String -> scala/Predef.String#
+[32:6..32:9): run <- example/PickOneRefinement_1#run().
+[32:10..32:11): s <- example/PickOneRefinement_1#run().(s)
+[32:13..32:14): S -> example/PickOneRefinement_1#[S]
+[32:16..32:18): as <- example/PickOneRefinement_1#run().(as)
+[32:20..32:26): String -> scala/Predef.String#
+[32:30..32:36): Option -> scala/Option#
+[32:37..32:43): String -> scala/Predef.String#
+[32:47..32:48): s -> example/PickOneRefinement_1#run().(s)
+[32:49..32:56): pickOne -> example/SpecialRefinement#pickOne().
+[32:57..32:59): as -> example/PickOneRefinement_1#run().(as)
+
+Synthetics:
+[15:23..15:34):elems.toMap => *[String, Any]
+[15:23..15:34):elems.toMap => *(refl[Tuple2[String, Any]])
+[32:47..32:56):s.pickOne => *[String]
+
 expect/RightAssociativeExtension.scala
 --------------------------------------
 
@@ -2627,18 +2978,17 @@ Uri => RightAssociativeExtension.scala
 Text => empty
 Language => Scala
 Symbols => 5 entries
-Occurrences => 14 entries
+Occurrences => 12 entries
 
 Symbols:
-ext/RightAssociativeExtension$package. => final package object ext
-ext/RightAssociativeExtension$package.`:*:`(). => method :*:
-ext/RightAssociativeExtension$package.`:*:`().(i) => param i
-ext/RightAssociativeExtension$package.`:*:`().(s) => param s
-ext/RightAssociativeExtension$package.b. => val method b
+ext/RightAssociativeExtension$package. => final package object ext extends Object { self: ext.type => +3 decls }
+ext/RightAssociativeExtension$package.`:*:`(). => method :*: (param i: Int)(param s: String): Tuple2[String, Int]
+ext/RightAssociativeExtension$package.`:*:`().(i) => param i: Int
+ext/RightAssociativeExtension$package.`:*:`().(s) => param s: String
+ext/RightAssociativeExtension$package.b. => val method b Tuple2[String, Int]
 
 Occurrences:
 [0:8..0:11): ext <- ext/
-[2:0..2:0): <- ext/RightAssociativeExtension$package.
 [2:11..2:12): s <- ext/RightAssociativeExtension$package.`:*:`().(s)
 [2:14..2:20): String -> scala/Predef.String#
 [3:6..3:9): :*: <- ext/RightAssociativeExtension$package.`:*:`().
@@ -2646,7 +2996,6 @@ Occurrences:
 [3:14..3:17): Int -> scala/Int#
 [3:21..3:27): String -> scala/Predef.String#
 [3:29..3:32): Int -> scala/Int#
-[3:37..3:37): -> scala/Tuple2.apply().
 [3:37..3:38): s -> ext/RightAssociativeExtension$package.`:*:`().(s)
 [3:40..3:41): i -> ext/RightAssociativeExtension$package.`:*:`().(i)
 [5:4..5:5): b <- ext/RightAssociativeExtension$package.b.
@@ -2661,49 +3010,40 @@ Uri => Selfs.scala
 Text => empty
 Language => Scala
 Symbols => 13 entries
-Occurrences => 26 entries
+Occurrences => 17 entries
 
 Symbols:
-local0 => selfparam self
-local1 => selfparam self
-local2 => selfparam self
-selfs/B# => class B
-selfs/B#`<init>`(). => primary ctor <init>
-selfs/C1# => class C1
-selfs/C1#`<init>`(). => primary ctor <init>
-selfs/C2# => class C2
-selfs/C2#`<init>`(). => primary ctor <init>
-selfs/C3# => class C3
-selfs/C3#`<init>`(). => primary ctor <init>
-selfs/C6# => class C6
-selfs/C6#`<init>`(). => primary ctor <init>
+local0 => selfparam self: C1
+local1 => selfparam self: B
+local2 => selfparam self: B & C1
+selfs/B# => class B extends Object { self: B => +1 decls }
+selfs/B#`<init>`(). => primary ctor <init> (): B
+selfs/C1# => class C1 extends B { self: C1 & C1 => +1 decls }
+selfs/C1#`<init>`(). => primary ctor <init> (): C1
+selfs/C2# => class C2 extends B { self: B & C2 => +1 decls }
+selfs/C2#`<init>`(). => primary ctor <init> (): C2
+selfs/C3# => class C3 extends B { self: B & C1 & C3 => +1 decls }
+selfs/C3#`<init>`(). => primary ctor <init> (): C3
+selfs/C6# => class C6 extends B { self: B & C6 => +1 decls }
+selfs/C6#`<init>`(). => primary ctor <init> (): C6
 
 Occurrences:
 [0:8..0:13): selfs <- selfs/
-[2:0..2:0): <- selfs/B#`<init>`().
 [2:6..2:7): B <- selfs/B#
 [4:6..4:8): C1 <- selfs/C1#
-[4:17..4:17): <- selfs/C1#`<init>`().
 [4:17..4:18): B -> selfs/B#
-[4:18..4:18): -> selfs/B#`<init>`().
 [4:21..4:25): self <- local0
 [7:6..7:8): C2 <- selfs/C2#
-[7:17..7:17): <- selfs/C2#`<init>`().
 [7:17..7:18): B -> selfs/B#
-[7:18..7:18): -> selfs/B#`<init>`().
 [7:21..7:25): self <- local1
 [7:27..7:28): B -> selfs/B#
 [10:6..10:8): C3 <- selfs/C3#
-[10:17..10:17): <- selfs/C3#`<init>`().
 [10:17..10:18): B -> selfs/B#
-[10:18..10:18): -> selfs/B#`<init>`().
 [10:21..10:25): self <- local2
 [10:27..10:28): B -> selfs/B#
 [10:34..10:36): C1 -> selfs/C1#
 [13:6..13:8): C6 <- selfs/C6#
-[13:17..13:17): <- selfs/C6#`<init>`().
 [13:17..13:18): B -> selfs/B#
-[13:18..13:18): -> selfs/B#`<init>`().
 [13:27..13:28): B -> selfs/B#
 
 expect/Synthetic.scala
@@ -2714,48 +3054,63 @@ Schema => SemanticDB v4
 Uri => Synthetic.scala
 Text => empty
 Language => Scala
-Symbols => 38 entries
-Occurrences => 162 entries
+Symbols => 52 entries
+Occurrences => 132 entries
+Synthetics => 36 entries
 
 Symbols:
-example/Synthetic# => class Synthetic
-example/Synthetic#F# => class F
-example/Synthetic#F#`<init>`(). => primary ctor <init>
-example/Synthetic#J# => class J
-example/Synthetic#J#[T] => typeparam T
-example/Synthetic#J#`<init>`(). => primary ctor <init>
-example/Synthetic#J#arr. => val method arr
-example/Synthetic#Name. => val method Name
-example/Synthetic#`<init>`(). => primary ctor <init>
-example/Synthetic#a1. => val method a1
-example/Synthetic#a2. => val method a2
-example/Synthetic#as. => val method as
-example/Synthetic#f. => val method f
-example/Synthetic#lst. => val method lst
-example/Synthetic#name. => val method name
-example/Synthetic#ordering. => implicit val method ordering
-example/Synthetic#s. => final object s
-example/Synthetic#s.Bar# => case class Bar
-example/Synthetic#s.Bar#`<init>`(). => primary ctor <init>
-example/Synthetic#s.Bar#copy(). => method copy
-example/Synthetic#s.Bar. => final object Bar
-example/Synthetic#s.Bar.apply(). => method apply
-example/Synthetic#s.Bar.toString(). => method toString
-example/Synthetic#s.Bar.unapply(). => method unapply
-example/Synthetic#s.Bar.unapply().(x$1) => param x$1
-example/Synthetic#s.apply(). => method apply
-example/Synthetic#x. => val method x
-example/Synthetic#xs. => val method xs
-local0 => param x
-local1 => param y
-local2 => param i
-local3 => param j
-local4 => param i
-local5 => param j
-local6 => param a
-local7 => param b
-local8 => param a
-local9 => param b
+example/Synthetic# => class Synthetic extends Object { self: Synthetic => +23 decls }
+example/Synthetic#Contexts. => final object Contexts extends Object { self: Contexts.type => +6 decls }
+example/Synthetic#Contexts.foo(). => method foo (param x: Int)(implicit given param x$2: Int): Nothing
+example/Synthetic#Contexts.foo().(x$2) => implicit given param x$2: Int
+example/Synthetic#Contexts.foo().(x) => param x: Int
+example/Synthetic#Contexts.m1(). => method m1 (implicit given param x$1: Int): Nothing
+example/Synthetic#Contexts.m1().(x$1) => implicit given param x$1: Int
+example/Synthetic#Contexts.m2(). => method m2 (implicit given param x: Int): Nothing
+example/Synthetic#Contexts.m2().(x) => implicit given param x: Int
+example/Synthetic#Contexts.m3(). => method m3 => Nothing
+example/Synthetic#Contexts.m4(). => method m4 => Nothing
+example/Synthetic#F# => class F extends Object { self: F => +1 decls }
+example/Synthetic#F#`<init>`(). => primary ctor <init> (): F
+example/Synthetic#J# => class J [typeparam T ] extends Object { self: J[T] => +4 decls }
+example/Synthetic#J#[T] => typeparam T 
+example/Synthetic#J#`<init>`(). => primary ctor <init> [typeparam T ]()(implicit param evidence$1: Manifest[T]): J[T]
+example/Synthetic#J#`<init>`().(evidence$1) => implicit param evidence$1: Manifest[T]
+example/Synthetic#J#arr. => val method arr Array[T]
+example/Synthetic#J#evidence$1. => private[this] implicit val method evidence$1 Manifest[T]
+example/Synthetic#Name. => val method Name Regex
+example/Synthetic#`<init>`(). => primary ctor <init> (): Synthetic
+example/Synthetic#a1. => val method a1 Int
+example/Synthetic#a2. => val method a2 Int
+example/Synthetic#as. => val method as LazyList[Int]
+example/Synthetic#f. => val method f Ordered[F]
+example/Synthetic#lst. => val method lst LazyList[Int]
+example/Synthetic#name. => val method name String
+example/Synthetic#ordering. => implicit val method ordering Ordering[F]
+example/Synthetic#s. => final object s extends Object { self: s.type => +5 decls }
+example/Synthetic#s.Bar# => case class Bar extends Object with Product with Serializable { self: Bar => +2 decls }
+example/Synthetic#s.Bar#`<init>`(). => primary ctor <init> (): Bar
+example/Synthetic#s.Bar#copy(). => method copy (): Bar
+example/Synthetic#s.Bar. => final object Bar extends Object { self: Bar.type => +4 decls }
+example/Synthetic#s.Bar.apply(). => method apply (): Bar
+example/Synthetic#s.Bar.toString(). => method toString => String <: scala/Any#toString().
+example/Synthetic#s.Bar.unapply(). => method unapply (param x$1: Bar): true
+example/Synthetic#s.Bar.unapply().(x$1) => param x$1: Bar
+example/Synthetic#s.apply(). => method apply (): Int
+example/Synthetic#x. => val method x Int
+example/Synthetic#xs. => val method xs LazyList[Int]
+local0 => param x: Int
+local1 => param y: Int
+local2 => param i: Int
+local3 => param j: Int
+local4 => param i: Int
+local5 => param j: Int
+local6 => param a: Int
+local7 => param b: Int
+local8 => param a: Int
+local9 => param b: Int
+local10 => final implicit lazy val given local x: Int
+local11 => final implicit lazy val given local given_Int: Int
 
 Occurrences:
 [0:8..0:15): example <- example/
@@ -2763,112 +3118,72 @@ Occurrences:
 [2:13..2:21): language -> scala/language.
 [2:22..2:41): implicitConversions -> scala/language.implicitConversions.
 [4:6..4:15): Synthetic <- example/Synthetic#
-[5:2..5:2): <- example/Synthetic#`<init>`().
 [5:2..5:6): List -> scala/package.List.
-[5:6..5:6): -> scala/collection/IterableFactory#apply().
 [5:10..5:13): map -> scala/collection/immutable/List#map().
 [5:16..5:17): + -> scala/Int#`+`(+4).
-[6:2..6:2): -> scala/Predef.intArrayOps().
 [6:2..6:7): Array -> scala/Array.
 [6:8..6:13): empty -> scala/Array.empty().
 [6:14..6:17): Int -> scala/Int#
-[6:18..6:18): -> scala/reflect/ClassTag.apply().
 [6:19..6:29): headOption -> scala/collection/ArrayOps#headOption().
-[7:2..7:2): -> scala/Predef.augmentString().
 [7:9..7:20): stripPrefix -> scala/collection/StringOps#stripPrefix().
 [10:6..10:10): Name <- example/Synthetic#Name.
-[10:13..10:13): -> scala/Predef.augmentString().
 [10:25..10:26): r -> scala/collection/StringOps#r().
 [11:6..11:7): x <- example/Synthetic#x.
 [11:8..11:11): #:: -> scala/package.`#::`.
-[11:11..11:11): -> scala/package.`#::`.unapply().
 [11:12..11:14): xs <- example/Synthetic#xs.
 [11:17..11:25): LazyList -> scala/package.LazyList.
-[11:25..11:25): -> scala/collection/IterableFactory#apply().
 [12:6..12:10): Name -> example/Synthetic#Name.
-[12:10..12:10): -> scala/util/matching/Regex#unapplySeq().
 [12:11..12:15): name <- example/Synthetic#name.
-[13:8..13:8): -> scala/collection/immutable/LazyList.toDeferrer().
-[13:14..13:14): -> scala/collection/immutable/LazyList.toDeferrer().
 [13:14..13:22): LazyList -> scala/package.LazyList.
 [13:23..13:28): empty -> scala/collection/immutable/LazyList.empty().
-[13:28..13:28): -> scala/collection/immutable/LazyList.Deferrer#`#::`().
 [15:6..15:8): a1 <- example/Synthetic#a1.
 [15:9..15:12): #:: -> scala/package.`#::`.
-[15:12..15:12): -> scala/package.`#::`.unapply().
 [15:13..15:15): a2 <- example/Synthetic#a2.
 [15:16..15:19): #:: -> scala/package.`#::`.
-[15:19..15:19): -> scala/package.`#::`.unapply().
 [15:20..15:22): as <- example/Synthetic#as.
 [15:25..15:33): LazyList -> scala/package.LazyList.
-[15:33..15:33): -> scala/collection/IterableFactory#apply().
 [17:6..17:9): lst <- example/Synthetic#lst.
-[17:18..17:18): -> scala/collection/immutable/LazyList.toDeferrer().
-[17:24..17:24): -> scala/collection/immutable/LazyList.toDeferrer().
 [17:24..17:32): LazyList -> scala/package.LazyList.
 [17:33..17:38): empty -> scala/collection/immutable/LazyList.empty().
-[17:38..17:38): -> scala/collection/immutable/LazyList.Deferrer#`#::`().
 [19:7..19:8): x <- local0
-[19:12..19:12): -> scala/LowPriorityImplicits#intWrapper().
 [19:14..19:16): to -> scala/runtime/RichInt#to().
-[19:19..19:19): -> scala/collection/immutable/Range#foreach().
 [19:21..19:22): y <- local1
-[19:26..19:26): -> scala/LowPriorityImplicits#intWrapper().
 [19:28..19:33): until -> scala/runtime/RichInt#until().
-[19:36..19:36): -> scala/collection/immutable/Range#foreach().
 [19:38..19:45): println -> scala/Predef.println(+1).
-[19:46..19:46): -> scala/Predef.ArrowAssoc().
 [19:46..19:47): x -> local0
 [19:48..19:50): -> -> scala/Predef.ArrowAssoc#`->`().
 [19:51..19:52): x -> local0
 [20:7..20:8): i <- local2
-[20:12..20:12): -> scala/LowPriorityImplicits#intWrapper().
 [20:14..20:16): to -> scala/runtime/RichInt#to().
-[20:19..20:19): -> scala/collection/StrictOptimizedIterableOps#flatMap().
 [20:21..20:22): j <- local3
-[20:26..20:26): -> scala/LowPriorityImplicits#intWrapper().
 [20:28..20:33): until -> scala/runtime/RichInt#until().
-[20:36..20:36): -> scala/collection/immutable/Range#map().
-[20:45..20:45): -> scala/Tuple2.apply().
 [20:45..20:46): i -> local2
 [20:48..20:49): j -> local3
 [21:7..21:8): i <- local4
-[21:12..21:12): -> scala/LowPriorityImplicits#intWrapper().
 [21:14..21:16): to -> scala/runtime/RichInt#to().
-[21:19..21:19): -> scala/collection/StrictOptimizedIterableOps#flatMap().
 [21:21..21:22): j <- local5
-[21:26..21:26): -> scala/LowPriorityImplicits#intWrapper().
 [21:28..21:33): until -> scala/runtime/RichInt#until().
-[21:36..21:36): -> scala/collection/IterableOps#withFilter().
 [21:40..21:41): i -> local4
 [21:42..21:43): % -> scala/Int#`%`(+3).
 [21:46..21:48): == -> scala/Int#`==`(+3).
-[21:50..21:50): -> scala/collection/WithFilter#map().
-[21:59..21:59): -> scala/Tuple2.apply().
 [21:59..21:60): i -> local4
 [21:62..21:63): j -> local5
 [23:9..23:10): s <- example/Synthetic#s.
 [24:8..24:13): apply <- example/Synthetic#s.apply().
-[25:5..25:5): -> example/Synthetic#s.apply().
 [26:6..26:11): apply -> example/Synthetic#s.apply().
 [27:15..27:18): Bar <- example/Synthetic#s.Bar#
-[27:18..27:18): <- example/Synthetic#s.Bar#`<init>`().
 [28:4..28:7): Bar -> example/Synthetic#s.Bar.
-[28:7..28:7): -> example/Synthetic#s.Bar.apply().
 [29:9..29:21): asInstanceOf -> scala/Any#asInstanceOf().
 [29:22..29:25): Int -> scala/Int#
 [29:29..29:32): Int -> scala/Int#
-[29:33..29:33): -> scala/Function1#apply().
 [32:8..32:9): J <- example/Synthetic#J#
-[32:9..32:9): <- example/Synthetic#J#`<init>`().
 [32:10..32:11): T <- example/Synthetic#J#[T]
+[32:11..32:11): <- example/Synthetic#J#evidence$1.
 [32:13..32:21): Manifest -> scala/Predef.Manifest#
-[32:21..32:21): -> example/Synthetic#J#[T]
 [32:29..32:32): arr <- example/Synthetic#J#arr.
 [32:35..32:40): Array -> scala/Array.
 [32:41..32:46): empty -> scala/Array.empty().
 [32:47..32:48): T -> example/Synthetic#J#[T]
-[34:2..34:2): <- example/Synthetic#F#`<init>`().
 [34:8..34:9): F <- example/Synthetic#F#
 [35:15..35:23): ordering <- example/Synthetic#ordering.
 [35:25..35:33): Ordering -> scala/package.Ordering#
@@ -2877,10 +3192,7 @@ Occurrences:
 [36:6..36:7): f <- example/Synthetic#f.
 [36:9..36:16): Ordered -> scala/package.Ordered#
 [36:17..36:18): F -> example/Synthetic#F#
-[36:22..36:22): -> scala/math/Ordered.orderingToOrdered().
 [36:26..36:27): F -> example/Synthetic#F#
-[36:27..36:27): -> example/Synthetic#F#`<init>`().
-[36:27..36:27): -> example/Synthetic#ordering.
 [38:9..38:14): scala -> scala/
 [38:15..38:25): concurrent -> scala/concurrent/
 [38:26..38:42): ExecutionContext -> scala/concurrent/ExecutionContext.
@@ -2891,35 +3203,86 @@ Occurrences:
 [40:15..40:25): concurrent -> scala/concurrent/
 [40:26..40:32): Future -> scala/concurrent/Future.
 [40:33..40:43): successful -> scala/concurrent/Future.successful().
-[40:46..40:46): -> scala/concurrent/Future#foreach().
 [41:4..41:5): b <- local7
 [41:9..41:14): scala -> scala/
 [41:15..41:25): concurrent -> scala/concurrent/
 [41:26..41:32): Future -> scala/concurrent/Future.
 [41:33..41:43): successful -> scala/concurrent/Future.successful().
-[41:46..41:46): -> scala/concurrent/Future#foreach().
 [42:4..42:11): println -> scala/Predef.println(+1).
 [42:12..42:13): a -> local6
-[42:14..42:14): -> scala/concurrent/ExecutionContext.Implicits.global().
 [44:4..44:5): a <- local8
 [44:9..44:14): scala -> scala/
 [44:15..44:25): concurrent -> scala/concurrent/
 [44:26..44:32): Future -> scala/concurrent/Future.
 [44:33..44:43): successful -> scala/concurrent/Future.successful().
-[44:46..44:46): -> scala/concurrent/Future#flatMap().
 [45:4..45:5): b <- local9
 [45:9..45:14): scala -> scala/
 [45:15..45:25): concurrent -> scala/concurrent/
 [45:26..45:32): Future -> scala/concurrent/Future.
 [45:33..45:43): successful -> scala/concurrent/Future.successful().
-[45:46..45:46): -> scala/concurrent/Future#withFilter().
 [46:7..46:8): a -> local8
 [46:9..46:10): < -> scala/Int#`<`(+3).
 [46:11..46:12): b -> local9
-[46:12..46:12): -> scala/concurrent/Future#map().
-[46:12..46:12): -> scala/concurrent/ExecutionContext.Implicits.global().
 [47:10..47:11): a -> local8
-[47:11..47:11): -> scala/concurrent/ExecutionContext.Implicits.global().
+[49:9..49:17): Contexts <- example/Synthetic#Contexts.
+[50:8..50:11): foo <- example/Synthetic#Contexts.foo().
+[50:12..50:13): x <- example/Synthetic#Contexts.foo().(x)
+[50:15..50:18): Int -> scala/Int#
+[50:26..50:29): Int -> scala/Int#
+[50:33..50:36): ??? -> scala/Predef.`???`().
+[51:8..51:10): m1 <- example/Synthetic#Contexts.m1().
+[51:17..51:20): Int -> scala/Int#
+[51:24..51:27): foo -> example/Synthetic#Contexts.foo().
+[52:8..52:10): m2 <- example/Synthetic#Contexts.m2().
+[52:17..52:18): x <- example/Synthetic#Contexts.m2().(x)
+[52:20..52:23): Int -> scala/Int#
+[52:27..52:30): foo -> example/Synthetic#Contexts.foo().
+[53:8..53:10): m3 <- example/Synthetic#Contexts.m3().
+[54:12..54:13): x <- local10
+[54:15..54:18): Int -> scala/Int#
+[55:6..55:9): foo -> example/Synthetic#Contexts.foo().
+[55:10..55:11): x -> local10
+[56:8..56:10): m4 <- example/Synthetic#Contexts.m4().
+[57:12..57:15): Int -> scala/Int#
+[58:6..58:9): foo -> example/Synthetic#Contexts.foo().
+
+Synthetics:
+[5:2..5:13):List(1).map => *[Int]
+[5:2..5:6):List => *.apply[Int]
+[6:2..6:18):Array.empty[Int] => intArrayOps(*)
+[7:2..7:8):"fooo" => augmentString(*)
+[10:13..10:24):"name:(.*)" => augmentString(*)
+[11:17..11:25):LazyList => *.apply[Int]
+[13:4..13:28):#:: 2 #:: LazyList.empty => *[Int]
+[13:8..13:28):2 #:: LazyList.empty => toDeferrer[Int](*)
+[13:10..13:28):#:: LazyList.empty => *[Int]
+[13:14..13:28):LazyList.empty => toDeferrer[Nothing](*)
+[13:14..13:28):LazyList.empty => *[Nothing]
+[15:25..15:33):LazyList => *.apply[Int]
+[17:14..17:38):#:: 2 #:: LazyList.empty => *[Int]
+[17:18..17:38):2 #:: LazyList.empty => toDeferrer[Int](*)
+[17:20..17:38):#:: LazyList.empty => *[Int]
+[17:24..17:38):LazyList.empty => toDeferrer[Nothing](*)
+[17:24..17:38):LazyList.empty => *[Nothing]
+[19:12..19:13):1 => intWrapper(*)
+[19:26..19:27):0 => intWrapper(*)
+[19:46..19:50):x -> => *[Int]
+[19:46..19:47):x => ArrowAssoc[Int](*)
+[20:12..20:13):1 => intWrapper(*)
+[20:26..20:27):0 => intWrapper(*)
+[21:12..21:13):1 => intWrapper(*)
+[21:26..21:27):0 => intWrapper(*)
+[32:35..32:49):Array.empty[T] => *(evidence$1)
+[36:22..36:27):new F => orderingToOrdered[F](*)
+[36:22..36:27):new F => *(ordering)
+[40:9..40:43):scala.concurrent.Future.successful => *[Int]
+[41:9..41:43):scala.concurrent.Future.successful => *[Int]
+[44:9..44:43):scala.concurrent.Future.successful => *[Int]
+[45:9..45:43):scala.concurrent.Future.successful => *[Int]
+[51:24..51:30):foo(0) => *(x$1)
+[52:27..52:33):foo(0) => *(x)
+[55:6..55:12):foo(x) => *(x)
+[58:6..58:12):foo(0) => *(given_Int)
 
 expect/Traits.scala
 -------------------
@@ -2930,39 +3293,35 @@ Uri => Traits.scala
 Text => empty
 Language => Scala
 Symbols => 13 entries
-Occurrences => 16 entries
+Occurrences => 12 entries
 
 Symbols:
-local0 => final class $anon
-local1 => selfparam self
-traits/C# => class C
-traits/C#`<init>`(). => primary ctor <init>
-traits/T# => trait T
-traits/T#`<init>`(). => primary ctor <init>
-traits/T#x(). => method x
-traits/U# => sealed trait U
-traits/U#`<init>`(). => primary ctor <init>
-traits/U. => final object U
-traits/U.u(). => method u
-traits/V# => trait V
-traits/V#`<init>`(). => primary ctor <init>
+local0 => final class $anon extends Object with U { self: $anon => +1 decls }
+local2 => selfparam self: C
+traits/C# => class C extends Object { self: C => +1 decls }
+traits/C#`<init>`(). => primary ctor <init> (): C
+traits/T# => trait T extends Object { self: T => +2 decls }
+traits/T#`<init>`(). => primary ctor <init> (): T
+traits/T#x(). => method x => Int
+traits/U# => sealed trait U extends Object { self: U => +1 decls }
+traits/U#`<init>`(). => primary ctor <init> (): U
+traits/U. => final object U extends Object { self: U.type => +2 decls }
+traits/U.u(). => method u => U
+traits/V# => trait V extends Object { self: C & V => +1 decls }
+traits/V#`<init>`(). => primary ctor <init> (): V
 
 Occurrences:
 [0:8..0:14): traits <- traits/
 [2:6..2:7): T <- traits/T#
-[3:2..3:2): <- traits/T#`<init>`().
 [3:6..3:7): x <- traits/T#x().
-[6:0..6:0): <- traits/U#`<init>`().
 [6:13..6:14): U <- traits/U#
 [7:7..7:8): U <- traits/U.
 [8:6..8:7): u <- traits/U.u().
 [8:9..8:10): U -> traits/U#
 [8:17..8:18): U -> traits/U#
-[11:0..11:0): <- traits/C#`<init>`().
 [11:6..11:7): C <- traits/C#
 [12:6..12:7): V <- traits/V#
-[12:10..12:10): <- traits/V#`<init>`().
-[12:10..12:14): self <- local1
+[12:10..12:14): self <- local2
 [12:16..12:17): C -> traits/C#
 
 expect/ValPattern.scala
@@ -2974,48 +3333,43 @@ Uri => ValPattern.scala
 Text => empty
 Language => Scala
 Symbols => 22 entries
-Occurrences => 63 entries
+Occurrences => 46 entries
+Synthetics => 7 entries
 
 Symbols:
-example/ValPattern# => class ValPattern
-example/ValPattern#`<init>`(). => primary ctor <init>
-example/ValPattern#`leftVar_=`(). => var method leftVar_=
-example/ValPattern#`leftVar_=`().(x$1) => param x$1
-example/ValPattern#`number1Var_=`(). => var method number1Var_=
-example/ValPattern#`number1Var_=`().(x$1) => param x$1
-example/ValPattern#`rightVar_=`(). => var method rightVar_=
-example/ValPattern#`rightVar_=`().(x$1) => param x$1
-example/ValPattern#app(). => method app
-example/ValPattern#left. => val method left
-example/ValPattern#leftVar(). => var method leftVar
-example/ValPattern#number1. => val method number1
-example/ValPattern#number1Var(). => var method number1Var
-example/ValPattern#q1. => val method q1
-example/ValPattern#right. => val method right
-example/ValPattern#rightVar(). => var method rightVar
-local0 => val local left
-local1 => val local right
-local2 => val local number1
-local3 => var local leftVar
-local4 => var local rightVar
-local5 => var local number1Var
+example/ValPattern# => class ValPattern extends Object { self: ValPattern => +14 decls }
+example/ValPattern#`<init>`(). => primary ctor <init> (): ValPattern
+example/ValPattern#`leftVar_=`(). => var method leftVar_= (param x$1: Int): Unit
+example/ValPattern#`leftVar_=`().(x$1) => param x$1: Int
+example/ValPattern#`number1Var_=`(). => var method number1Var_= (param x$1: Int): Unit
+example/ValPattern#`number1Var_=`().(x$1) => param x$1: Int
+example/ValPattern#`rightVar_=`(). => var method rightVar_= (param x$1: Int): Unit
+example/ValPattern#`rightVar_=`().(x$1) => param x$1: Int
+example/ValPattern#app(). => method app (): Unit
+example/ValPattern#left. => val method left Int
+example/ValPattern#leftVar(). => var method leftVar Int
+example/ValPattern#number1. => val method number1 Int
+example/ValPattern#number1Var(). => var method number1Var Int
+example/ValPattern#q1. => val method q1 Nothing
+example/ValPattern#right. => val method right Int
+example/ValPattern#rightVar(). => var method rightVar Int
+local0 => val local left: Int
+local1 => val local right: Int
+local2 => val local number1: Int
+local3 => var local leftVar: Int
+local4 => var local rightVar: Int
+local5 => var local number1Var: Int
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:6..2:16): ValPattern <- example/ValPattern#
-[4:2..4:2): <- example/ValPattern#`<init>`().
 [4:7..4:11): left <- example/ValPattern#left.
 [4:13..4:18): right <- example/ValPattern#right.
-[4:23..4:23): -> scala/Tuple2.apply().
 [5:6..5:10): Some -> scala/Some.
-[5:10..5:10): -> scala/Some.unapply().
 [5:11..5:18): number1 <- example/ValPattern#number1.
 [6:4..6:8): Some -> scala/Some.
-[6:8..6:8): -> scala/Some.apply().
 [8:6..8:10): List -> scala/package.List.
-[8:10..8:10): -> scala/collection/SeqFactory#unapplySeq().
 [8:11..8:15): Some -> scala/Some.
-[8:15..8:15): -> scala/Some.unapply().
 [8:16..8:18): q1 <- example/ValPattern#q1.
 [8:21..8:25): None -> scala/None.
 [8:27..8:31): None -> scala/None.
@@ -3023,16 +3377,12 @@ Occurrences:
 [8:46..8:49): ??? -> scala/Predef.`???`().
 [10:7..10:14): leftVar <- example/ValPattern#leftVar().
 [10:16..10:24): rightVar <- example/ValPattern#rightVar().
-[10:29..10:29): -> scala/Tuple2.apply().
 [11:6..11:10): Some -> scala/Some.
-[11:10..11:10): -> scala/Some.unapply().
 [11:11..11:21): number1Var <- example/ValPattern#number1Var().
 [12:4..12:8): Some -> scala/Some.
-[12:8..12:8): -> scala/Some.apply().
 [14:6..14:9): app <- example/ValPattern#app().
 [14:13..14:17): Unit -> scala/Unit#
 [15:4..15:11): println -> scala/Predef.println(+1).
-[17:8..17:8): -> scala/Tuple6.apply().
 [17:8..17:15): number1 -> example/ValPattern#number1.
 [18:8..18:12): left -> example/ValPattern#left.
 [19:8..19:13): right -> example/ValPattern#right.
@@ -3042,22 +3392,15 @@ Occurrences:
 [25:4..25:11): locally -> scala/Predef.locally().
 [26:11..26:15): left <- local0
 [26:17..26:22): right <- local1
-[26:27..26:27): -> scala/Tuple2.apply().
 [27:10..27:14): Some -> scala/Some.
-[27:14..27:14): -> scala/Some.unapply().
 [27:15..27:22): number1 <- local2
 [28:8..28:12): Some -> scala/Some.
-[28:12..28:12): -> scala/Some.apply().
 [30:11..30:18): leftVar <- local3
 [30:20..30:28): rightVar <- local4
-[30:33..30:33): -> scala/Tuple2.apply().
 [31:10..31:14): Some -> scala/Some.
-[31:14..31:14): -> scala/Some.unapply().
 [31:15..31:25): number1Var <- local5
 [32:8..32:12): Some -> scala/Some.
-[32:12..32:12): -> scala/Some.apply().
 [33:6..33:13): println -> scala/Predef.println(+1).
-[35:10..35:10): -> scala/Tuple6.apply().
 [35:10..35:17): number1 -> local2
 [36:10..36:14): left -> local0
 [37:10..37:15): right -> local1
@@ -3065,6 +3408,15 @@ Occurrences:
 [39:10..39:17): leftVar -> local3
 [40:10..40:18): rightVar -> local4
 
+Synthetics:
+[6:4..6:8):Some => *.apply[Int]
+[8:6..8:10):List => *.unapplySeq[Nothing]
+[8:11..8:15):Some => *.unapply[Nothing]
+[12:4..12:8):Some => *.apply[Int]
+[25:4..25:11):locally => *[Unit]
+[28:8..28:12):Some => *.apply[Int]
+[32:8..32:12):Some => *.apply[Int]
+
 expect/Vals.scala
 -----------------
 
@@ -3074,56 +3426,55 @@ Uri => Vals.scala
 Text => empty
 Language => Scala
 Symbols => 42 entries
-Occurrences => 129 entries
+Occurrences => 128 entries
 
 Symbols:
-example/ValUsages. => final object ValUsages
-example/ValUsages.v. => val method v
-example/Vals# => abstract class Vals
-example/Vals#_explicitSetter(). => var method _explicitSetter
-example/Vals#`<init>`(). => primary ctor <init>
-example/Vals#`<init>`().(p) => param p
-example/Vals#`<init>`().(xp) => val param xp
-example/Vals#`<init>`().(yp) => var param yp
-example/Vals#`explicitSetter_=`(). => method explicitSetter_=
-example/Vals#`explicitSetter_=`().(x) => param x
-example/Vals#`yam_=`(). => var method yam_=
-example/Vals#`yam_=`().(x$1) => param x$1
-example/Vals#`yfm_=`(). => final var method yfm_=
-example/Vals#`yfm_=`().(x$1) => param x$1
-example/Vals#`yim_=`(). => var method yim_=
-example/Vals#`yim_=`().(x$1) => param x$1
-example/Vals#`ym_=`(). => var method ym_=
-example/Vals#`ym_=`().(x$1) => param x$1
-example/Vals#`yp_=`(). => var method yp_=
-example/Vals#`yp_=`().(x$1) => param x$1
-example/Vals#explicitSetter(). => method explicitSetter
-example/Vals#m(). => method m
-example/Vals#p. => val method p
-example/Vals#xam. => abstract val method xam
-example/Vals#xfm. => final val method xfm
-example/Vals#xim. => implicit val method xim
-example/Vals#xlm. => val method xlm
-example/Vals#xm. => val method xm
-example/Vals#xp. => val method xp
-example/Vals#xzlm. => lazy val method xzlm
-example/Vals#xzm. => lazy val method xzm
-example/Vals#yam(). => abstract var method yam
-example/Vals#yfm(). => final var method yfm
-example/Vals#yim(). => implicit var method yim
-example/Vals#ylm(). => var method ylm
-example/Vals#ym(). => var method ym
-example/Vals#yp(). => var method yp
-local0 => val local xl
-local1 => lazy val local xzl
-local2 => implicit val local xil
-local3 => var local yl
-local4 => implicit var local yil
+example/ValUsages. => final object ValUsages extends Object { self: ValUsages.type => +2 decls }
+example/ValUsages.v. => val method v Vals
+example/Vals# => abstract class Vals extends Object { self: Vals => +25 decls }
+example/Vals#_explicitSetter(). => private[this] var method _explicitSetter Int
+example/Vals#`<init>`(). => primary ctor <init> (param p: Int, val param xp: Int, var param yp: Int): Vals
+example/Vals#`<init>`().(p) => param p: Int
+example/Vals#`<init>`().(xp) => val param xp: Int
+example/Vals#`<init>`().(yp) => var param yp: Int
+example/Vals#`explicitSetter_=`(). => method explicitSetter_= (param x: Int): Unit
+example/Vals#`explicitSetter_=`().(x) => param x: Int
+example/Vals#`yam_=`(). => var method yam_= (param x$1: Int): Unit
+example/Vals#`yam_=`().(x$1) => param x$1: Int
+example/Vals#`yfm_=`(). => final var method yfm_= (param x$1: Int): Unit
+example/Vals#`yfm_=`().(x$1) => param x$1: Int
+example/Vals#`yim_=`(). => var method yim_= (param x$1: Int): Unit
+example/Vals#`yim_=`().(x$1) => param x$1: Int
+example/Vals#`ym_=`(). => var method ym_= (param x$1: Int): Unit
+example/Vals#`ym_=`().(x$1) => param x$1: Int
+example/Vals#`yp_=`(). => var method yp_= (param x$1: Int): Unit
+example/Vals#`yp_=`().(x$1) => param x$1: Int
+example/Vals#explicitSetter(). => method explicitSetter => Int
+example/Vals#m(). => method m => Unit
+example/Vals#p. => private[this] val method p Int
+example/Vals#xam. => abstract val method xam Int
+example/Vals#xfm. => final val method xfm Int
+example/Vals#xim. => implicit val method xim Int
+example/Vals#xlm. => private[this] val method xlm Int
+example/Vals#xm. => val method xm Int
+example/Vals#xp. => val method xp Int
+example/Vals#xzlm. => private[this] lazy val method xzlm Int
+example/Vals#xzm. => lazy val method xzm Int
+example/Vals#yam(). => abstract var method yam Int
+example/Vals#yfm(). => final var method yfm Int
+example/Vals#yim(). => implicit var method yim Int
+example/Vals#ylm(). => private[this] var method ylm Int
+example/Vals#ym(). => var method ym Int
+example/Vals#yp(). => var method yp Int
+local0 => val local xl: Int
+local1 => lazy val local xzl: Int
+local2 => implicit val local xil: Int
+local3 => var local yl: Int
+local4 => implicit var local yil: Int
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:15..2:19): Vals <- example/Vals#
-[2:19..2:19): <- example/Vals#`<init>`().
 [2:20..2:21): p <- example/Vals#p.
 [2:23..2:26): Int -> scala/Int#
 [2:32..2:34): xp <- example/Vals#xp.
@@ -3260,20 +3611,19 @@ Uri => Vararg.scala
 Text => empty
 Language => Scala
 Symbols => 6 entries
-Occurrences => 11 entries
+Occurrences => 10 entries
 
 Symbols:
-example/Vararg# => class Vararg
-example/Vararg#`<init>`(). => primary ctor <init>
-example/Vararg#add1(). => method add1
-example/Vararg#add1().(a) => param a
-example/Vararg#add2(). => method add2
-example/Vararg#add2().(a) => param a
+example/Vararg# => class Vararg extends Object { self: Vararg => +3 decls }
+example/Vararg#`<init>`(). => primary ctor <init> (): Vararg
+example/Vararg#add1(). => method add1 (param a: Int*): Unit
+example/Vararg#add1().(a) => param a: Int*
+example/Vararg#add2(). => method add2 (param a: Seq[Int]*): Unit
+example/Vararg#add2().(a) => param a: Seq[Int]*
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:6..2:12): Vararg <- example/Vararg#
-[3:2..3:2): <- example/Vararg#`<init>`().
 [3:6..3:10): add1 <- example/Vararg#add1().
 [3:11..3:12): a <- example/Vararg#add1().(a)
 [3:14..3:17): Int -> scala/Int#
@@ -3292,36 +3642,35 @@ Uri => exports-example-Codec.scala
 Text => empty
 Language => Scala
 Symbols => 21 entries
-Occurrences => 39 entries
+Occurrences => 30 entries
 
 Symbols:
-exports/example/Codec# => trait Codec
-exports/example/Codec#[T] => typeparam T
-exports/example/Codec#`<init>`(). => primary ctor <init>
-exports/example/Codec#`<init>`().(decode) => param decode
-exports/example/Codec#`<init>`().(encode) => param encode
-exports/example/Codec#decode(). => final method decode
-exports/example/Codec#decode().(a) => param a
-exports/example/Codec#decode. => val method decode
-exports/example/Codec#encode(). => final method encode
-exports/example/Codec#encode().(t) => param t
-exports/example/Codec#encode. => val method encode
-exports/example/Decoder# => trait Decoder
-exports/example/Decoder#[T] => covariant typeparam T
-exports/example/Decoder#`<init>`(). => primary ctor <init>
-exports/example/Decoder#decode(). => abstract method decode
-exports/example/Decoder#decode().(a) => param a
-exports/example/Encoder# => trait Encoder
-exports/example/Encoder#[T] => contravariant typeparam T
-exports/example/Encoder#`<init>`(). => primary ctor <init>
-exports/example/Encoder#encode(). => abstract method encode
-exports/example/Encoder#encode().(t) => param t
+exports/example/Codec# => trait Codec [typeparam T ] extends Object with Decoder[T] with Encoder[T] { self: Codec[T] => +6 decls }
+exports/example/Codec#[T] => typeparam T 
+exports/example/Codec#`<init>`(). => primary ctor <init> [typeparam T ](param decode: Decoder[T], param encode: Encoder[T]): Codec[T]
+exports/example/Codec#`<init>`().(decode) => param decode: Decoder[T]
+exports/example/Codec#`<init>`().(encode) => param encode: Encoder[T]
+exports/example/Codec#decode(). => final method decode (param a: Array[Byte]): T <: exports/example/Decoder#decode().
+exports/example/Codec#decode().(a) => param a: Array[Byte]
+exports/example/Codec#decode. => private[this] val method decode Decoder[T]
+exports/example/Codec#encode(). => final method encode (param t: T): Array[Byte] <: exports/example/Encoder#encode().
+exports/example/Codec#encode().(t) => param t: T
+exports/example/Codec#encode. => private[this] val method encode Encoder[T]
+exports/example/Decoder# => trait Decoder [covariant typeparam T ] extends Object { self: Decoder[T] => +3 decls }
+exports/example/Decoder#[T] => covariant typeparam T 
+exports/example/Decoder#`<init>`(). => primary ctor <init> [covariant typeparam T ](): Decoder[T]
+exports/example/Decoder#decode(). => abstract method decode (param a: Array[Byte]): T
+exports/example/Decoder#decode().(a) => param a: Array[Byte]
+exports/example/Encoder# => trait Encoder [contravariant typeparam T ] extends Object { self: Encoder[T] => +3 decls }
+exports/example/Encoder#[T] => contravariant typeparam T 
+exports/example/Encoder#`<init>`(). => primary ctor <init> [contravariant typeparam T ](): Encoder[T]
+exports/example/Encoder#encode(). => abstract method encode (param t: T): Array[Byte]
+exports/example/Encoder#encode().(t) => param t: T
 
 Occurrences:
 [0:8..0:15): exports -> exports/
 [0:16..0:23): example <- exports/example/
 [2:6..2:13): Decoder <- exports/example/Decoder#
-[2:13..2:13): <- exports/example/Decoder#`<init>`().
 [2:15..2:16): T <- exports/example/Decoder#[T]
 [3:6..3:12): decode <- exports/example/Decoder#decode().
 [3:13..3:14): a <- exports/example/Decoder#decode().(a)
@@ -3329,7 +3678,6 @@ Occurrences:
 [3:22..3:26): Byte -> scala/Byte#
 [3:30..3:31): T -> exports/example/Decoder#[T]
 [6:6..6:13): Encoder <- exports/example/Encoder#
-[6:13..6:13): <- exports/example/Encoder#`<init>`().
 [6:15..6:16): T <- exports/example/Encoder#[T]
 [7:6..7:12): encode <- exports/example/Encoder#encode().
 [7:13..7:14): t <- exports/example/Encoder#encode().(t)
@@ -3337,7 +3685,6 @@ Occurrences:
 [7:20..7:25): Array -> scala/Array#
 [7:26..7:30): Byte -> scala/Byte#
 [10:6..10:11): Codec <- exports/example/Codec#
-[10:11..10:11): <- exports/example/Codec#`<init>`().
 [10:12..10:13): T <- exports/example/Codec#[T]
 [10:15..10:21): decode <- exports/example/Codec#decode.
 [10:23..10:30): Decoder -> exports/example/Decoder#
@@ -3350,13 +3697,7 @@ Occurrences:
 [11:26..11:33): Encoder -> exports/example/Encoder#
 [11:34..11:35): T -> exports/example/Codec#[T]
 [12:9..12:15): decode -> exports/example/Codec#decode.
-[12:15..12:15): -> exports/example/Decoder#decode().
-[12:15..12:15): -> exports/example/Codec#decode().(a)
-[12:16..12:16): <- exports/example/Codec#decode().
 [13:9..13:15): encode -> exports/example/Codec#encode.
-[13:15..13:15): -> exports/example/Encoder#encode().
-[13:15..13:15): -> exports/example/Codec#encode().(t)
-[13:16..13:16): <- exports/example/Codec#encode().
 
 expect/exports-package.scala
 ----------------------------
@@ -3366,18 +3707,20 @@ Schema => SemanticDB v4
 Uri => exports-package.scala
 Text => empty
 Language => Scala
-Symbols => 4 entries
-Occurrences => 6 entries
+Symbols => 7 entries
+Occurrences => 5 entries
 
 Symbols:
-exports/`exports-package$package`. => final package object exports
-exports/`exports-package$package`.Codec# => final type Codec
-exports/`exports-package$package`.Decoder# => final type Decoder
-exports/`exports-package$package`.Encoder# => final type Encoder
+exports/`exports-package$package`. => final package object exports extends Object { self: exports.type => +4 decls }
+exports/`exports-package$package`.Codec# => final type Codec [typeparam T ] = Codec[T]
+exports/`exports-package$package`.Codec#[T] => typeparam T 
+exports/`exports-package$package`.Decoder# => final type Decoder [typeparam T ] = Decoder[T]
+exports/`exports-package$package`.Decoder#[T] => typeparam T 
+exports/`exports-package$package`.Encoder# => final type Encoder [typeparam T ] = Encoder[T]
+exports/`exports-package$package`.Encoder#[T] => typeparam T 
 
 Occurrences:
 [0:8..0:15): exports <- exports/
-[2:0..2:0): <- exports/`exports-package$package`.
 [2:7..2:14): example -> exports/example/
 [2:16..2:23): Decoder <- exports/`exports-package$package`.Decoder#
 [2:25..2:32): Encoder <- exports/`exports-package$package`.Encoder#
@@ -3392,15 +3735,14 @@ Uri => filename%20with%20spaces.scala
 Text => empty
 Language => Scala
 Symbols => 2 entries
-Occurrences => 3 entries
+Occurrences => 2 entries
 
 Symbols:
-example/FilenameWithSpaces# => class FilenameWithSpaces
-example/FilenameWithSpaces#`<init>`(). => primary ctor <init>
+example/FilenameWithSpaces# => class FilenameWithSpaces extends Object { self: FilenameWithSpaces => +1 decls }
+example/FilenameWithSpaces#`<init>`(). => primary ctor <init> (): FilenameWithSpaces
 
 Occurrences:
 [0:8..0:15): example <- example/
-[2:0..2:0): <- example/FilenameWithSpaces#`<init>`().
 [2:6..2:24): FilenameWithSpaces <- example/FilenameWithSpaces#
 
 expect/i9727.scala
@@ -3412,30 +3754,124 @@ Uri => i9727.scala
 Text => empty
 Language => Scala
 Symbols => 7 entries
-Occurrences => 12 entries
+Occurrences => 8 entries
 
 Symbols:
-i9727/Test# => class Test
-i9727/Test#`<init>`(). => primary ctor <init>
-i9727/Test#`<init>`().(a) => param a
-i9727/Test#a. => val method a
-i9727/i9727$package. => final package object i9727
-i9727/i9727$package.a. => val method a
-i9727/i9727$package.b. => val method b
+i9727/Test# => class Test extends Object { self: Test => +2 decls }
+i9727/Test#`<init>`(). => primary ctor <init> (param a: Int): Test
+i9727/Test#`<init>`().(a) => param a: Int
+i9727/Test#a. => private[this] val method a Int
+i9727/i9727$package. => final package object i9727 extends Object { self: i9727.type => +3 decls }
+i9727/i9727$package.a. => val method a Test
+i9727/i9727$package.b. => val method b Test
 
 Occurrences:
 [0:8..0:13): i9727 <- i9727/
 [2:6..2:10): Test <- i9727/Test#
-[2:10..2:10): <- i9727/Test#`<init>`().
 [2:11..2:12): a <- i9727/Test#a.
 [2:14..2:17): Int -> scala/Int#
-[3:0..3:0): <- i9727/i9727$package.
 [3:4..3:5): a <- i9727/i9727$package.a.
 [3:12..3:16): Test -> i9727/Test#
-[3:16..3:16): -> i9727/Test#`<init>`().
 [4:4..4:5): b <- i9727/i9727$package.b.
 [4:12..4:16): Test -> i9727/Test#
-[4:16..4:16): -> i9727/Test#`<init>`().
+
+expect/i9782.scala
+------------------
+
+Summary:
+Schema => SemanticDB v4
+Uri => i9782.scala
+Text => empty
+Language => Scala
+Symbols => 24 entries
+Occurrences => 59 entries
+
+Symbols:
+_empty_/Copy# => trait Copy [typeparam In  <: Txn[In], typeparam Out  <: Txn[Out]] extends Object { self: Copy[In, Out] => +5 decls }
+_empty_/Copy#[In] => typeparam In  <: Txn[In]
+_empty_/Copy#[Out] => typeparam Out  <: Txn[Out]
+_empty_/Copy#`<init>`(). => primary ctor <init> [typeparam In  <: Txn[In], typeparam Out  <: Txn[Out]](): Copy[In, Out]
+_empty_/Copy#apply(). => method apply [typeparam Repr [typeparam ~  <: Txn[~]] <: Elem[~]](param in: Repr[In]): Repr[Out]
+_empty_/Copy#apply().(in) => param in: Repr[In]
+_empty_/Copy#apply().[Repr] => typeparam Repr [typeparam ~  <: Txn[~]] <: Elem[~]
+_empty_/Copy#apply().[Repr][`~`] => typeparam ~  <: Txn[~]
+_empty_/Copy#copyImpl(). => abstract method copyImpl [typeparam Repr [typeparam ~  <: Txn[~]] <: Elem[~]](param in: Repr[In]): Repr[Out]
+_empty_/Copy#copyImpl().(in) => param in: Repr[In]
+_empty_/Copy#copyImpl().[Repr] => typeparam Repr [typeparam ~  <: Txn[~]] <: Elem[~]
+_empty_/Copy#copyImpl().[Repr][`~`] => typeparam ~  <: Txn[~]
+_empty_/Elem# => trait Elem [typeparam T  <: Txn[T]] extends Object { self: Elem[T] => +2 decls }
+_empty_/Elem#[T] => typeparam T  <: Txn[T]
+_empty_/Elem#`<init>`(). => primary ctor <init> [typeparam T  <: Txn[T]](): Elem[T]
+_empty_/Obj# => trait Obj [typeparam T  <: Txn[T]] extends Object with Elem[T] { self: Obj[T] => +2 decls }
+_empty_/Obj#[T] => typeparam T  <: Txn[T]
+_empty_/Obj#`<init>`(). => primary ctor <init> [typeparam T  <: Txn[T]](): Obj[T]
+_empty_/Txn# => trait Txn [typeparam T  <: Txn[T]] extends Object { self: Txn[T] => +2 decls }
+_empty_/Txn#[T] => typeparam T  <: Txn[T]
+_empty_/Txn#`<init>`(). => primary ctor <init> [typeparam T  <: Txn[T]](): Txn[T]
+local0 => val local out: Repr[Out]
+local1 => val local inObj: Repr[In] & Obj[In]
+local2 => val local outObj: Repr[Out] & Obj[Out]
+
+Occurrences:
+[1:6..1:9): Txn <- _empty_/Txn#
+[1:10..1:11): T <- _empty_/Txn#[T]
+[1:15..1:18): Txn -> _empty_/Txn#
+[1:19..1:20): T -> _empty_/Txn#[T]
+[3:6..3:10): Elem <- _empty_/Elem#
+[3:11..3:12): T <- _empty_/Elem#[T]
+[3:16..3:19): Txn -> _empty_/Txn#
+[3:20..3:21): T -> _empty_/Elem#[T]
+[5:6..5:9): Obj <- _empty_/Obj#
+[5:10..5:11): T <- _empty_/Obj#[T]
+[5:15..5:18): Txn -> _empty_/Txn#
+[5:19..5:20): T -> _empty_/Obj#[T]
+[5:31..5:35): Elem -> _empty_/Elem#
+[5:36..5:37): T -> _empty_/Obj#[T]
+[7:6..7:10): Copy <- _empty_/Copy#
+[7:11..7:13): In <- _empty_/Copy#[In]
+[7:17..7:20): Txn -> _empty_/Txn#
+[7:21..7:23): In -> _empty_/Copy#[In]
+[7:26..7:29): Out <- _empty_/Copy#[Out]
+[7:33..7:36): Txn -> _empty_/Txn#
+[7:37..7:40): Out -> _empty_/Copy#[Out]
+[8:6..8:14): copyImpl <- _empty_/Copy#copyImpl().
+[8:15..8:19): Repr <- _empty_/Copy#copyImpl().[Repr]
+[8:20..8:21): ~ <- _empty_/Copy#copyImpl().[Repr][`~`]
+[8:25..8:28): Txn -> _empty_/Txn#
+[8:29..8:30): ~ -> _empty_/Copy#copyImpl().[Repr][`~`]
+[8:36..8:40): Elem -> _empty_/Elem#
+[8:41..8:42): ~ -> _empty_/Copy#copyImpl().[Repr][`~`]
+[8:45..8:47): in <- _empty_/Copy#copyImpl().(in)
+[8:49..8:53): Repr -> _empty_/Copy#copyImpl().[Repr]
+[8:54..8:56): In -> _empty_/Copy#[In]
+[8:60..8:64): Repr -> _empty_/Copy#copyImpl().[Repr]
+[8:65..8:68): Out -> _empty_/Copy#[Out]
+[10:6..10:11): apply <- _empty_/Copy#apply().
+[10:12..10:16): Repr <- _empty_/Copy#apply().[Repr]
+[10:17..10:18): ~ <- _empty_/Copy#apply().[Repr][`~`]
+[10:22..10:25): Txn -> _empty_/Txn#
+[10:26..10:27): ~ -> _empty_/Copy#apply().[Repr][`~`]
+[10:33..10:37): Elem -> _empty_/Elem#
+[10:38..10:39): ~ -> _empty_/Copy#apply().[Repr][`~`]
+[10:42..10:44): in <- _empty_/Copy#apply().(in)
+[10:46..10:50): Repr -> _empty_/Copy#apply().[Repr]
+[10:51..10:53): In -> _empty_/Copy#[In]
+[10:57..10:61): Repr -> _empty_/Copy#apply().[Repr]
+[10:62..10:65): Out -> _empty_/Copy#[Out]
+[11:8..11:11): out <- local0
+[11:14..11:22): copyImpl -> _empty_/Copy#copyImpl().
+[11:23..11:27): Repr -> _empty_/Copy#apply().[Repr]
+[11:29..11:31): in -> _empty_/Copy#apply().(in)
+[12:5..12:7): in -> _empty_/Copy#apply().(in)
+[12:9..12:12): out -> local0
+[13:12..13:17): inObj <- local1
+[13:19..13:22): Obj -> _empty_/Obj#
+[13:23..13:25): In -> _empty_/Copy#[In]
+[13:28..13:34): outObj <- local2
+[13:36..13:39): Obj -> _empty_/Obj#
+[13:40..13:43): Out -> _empty_/Copy#[Out]
+[14:8..14:15): println -> scala/Predef.println(+1).
+[17:4..17:7): out -> local0
 
 expect/inlineconsume.scala
 --------------------------
@@ -3446,12 +3882,12 @@ Uri => inlineconsume.scala
 Text => empty
 Language => Scala
 Symbols => 3 entries
-Occurrences => 9 entries
+Occurrences => 8 entries
 
 Symbols:
-inlineconsume/Foo# => class Foo
-inlineconsume/Foo#`<init>`(). => primary ctor <init>
-inlineconsume/Foo#test(). => method test
+inlineconsume/Foo# => class Foo extends Object { self: Foo => +2 decls }
+inlineconsume/Foo#`<init>`(). => primary ctor <init> (): Foo
+inlineconsume/Foo#test(). => method test => Unit
 
 Occurrences:
 [0:8..0:21): inlineconsume <- inlineconsume/
@@ -3459,7 +3895,6 @@ Occurrences:
 [2:18..2:28): FakePredef -> inlinedefs/FakePredef.
 [2:29..2:35): assert -> inlinedefs/FakePredef.assert().
 [4:6..4:9): Foo <- inlineconsume/Foo#
-[5:2..5:2): <- inlineconsume/Foo#`<init>`().
 [5:6..5:10): test <- inlineconsume/Foo#test().
 [5:13..5:19): assert -> inlinedefs/FakePredef.assert().
 [5:22..5:23): > -> scala/Int#`>`(+3).
@@ -3473,12 +3908,12 @@ Uri => inlinedefs.scala
 Text => empty
 Language => Scala
 Symbols => 3 entries
-Occurrences => 12 entries
+Occurrences => 10 entries
 
 Symbols:
-inlinedefs/FakePredef. => final object FakePredef
-inlinedefs/FakePredef.assert(). => final macro assert
-inlinedefs/FakePredef.assert().(assertion) => param assertion
+inlinedefs/FakePredef. => final object FakePredef extends Object { self: FakePredef.type => +2 decls }
+inlinedefs/FakePredef.assert(). => final inline transparent macro assert (inline param assertion: Boolean): Unit
+inlinedefs/FakePredef.assert().(assertion) => inline param assertion: Boolean
 
 Occurrences:
 [0:8..0:18): inlinedefs <- inlinedefs/
@@ -3488,11 +3923,9 @@ Occurrences:
 [13:56..13:63): Boolean -> scala/Boolean#
 [13:66..13:70): Unit -> scala/Unit#
 [14:9..14:18): assertion -> inlinedefs/FakePredef.assert().(assertion)
-[14:18..14:18): -> scala/Boolean#`unary_!`().
 [15:16..15:20): java -> java/
 [15:21..15:25): lang -> java/lang/
 [15:26..15:40): AssertionError -> java/lang/AssertionError#
-[15:40..15:40): -> java/lang/AssertionError#`<init>`(+2).
 
 expect/local-file.scala
 -----------------------
@@ -3503,22 +3936,90 @@ Uri => local-file.scala
 Text => empty
 Language => Scala
 Symbols => 3 entries
-Occurrences => 7 entries
+Occurrences => 6 entries
+Synthetics => 1 entries
 
 Symbols:
-example/`local-file`# => class local-file
-example/`local-file`#`<init>`(). => primary ctor <init>
-local0 => val local local
+example/`local-file`# => class local-file extends Object { self: local-file => +1 decls }
+example/`local-file`#`<init>`(). => primary ctor <init> (): local-file
+local0 => val local local: Int
 
 Occurrences:
 [0:8..0:15): example <- example/
 [2:7..2:17): local-file <- example/`local-file`#
-[3:2..3:2): <- example/`local-file`#`<init>`().
 [3:2..3:9): locally -> scala/Predef.locally().
 [4:8..4:13): local <- local0
 [5:4..5:9): local -> local0
 [5:10..5:11): + -> scala/Int#`+`(+4).
 
+Synthetics:
+[3:2..3:9):locally => *[Int]
+
+expect/nullary.scala
+--------------------
+
+Summary:
+Schema => SemanticDB v4
+Uri => nullary.scala
+Text => empty
+Language => Scala
+Symbols => 17 entries
+Occurrences => 29 entries
+Synthetics => 1 entries
+
+Symbols:
+_empty_/Concrete# => class Concrete extends NullaryTest[Int, List] { self: Concrete => +3 decls }
+_empty_/Concrete#`<init>`(). => primary ctor <init> (): Concrete
+_empty_/Concrete#nullary2(). => method nullary2 => Int <: _empty_/NullaryTest#nullary2().
+_empty_/Concrete#nullary3(). => method nullary3 => List[Int] <: _empty_/NullaryTest#nullary3().
+_empty_/NullaryTest# => abstract class NullaryTest [typeparam T , typeparam m [typeparam s ]] extends Object { self: NullaryTest[T, m] => +9 decls }
+_empty_/NullaryTest#[T] => typeparam T 
+_empty_/NullaryTest#[m] => typeparam m [typeparam s ]
+_empty_/NullaryTest#[m][s] => typeparam s 
+_empty_/NullaryTest#`<init>`(). => primary ctor <init> [typeparam T , typeparam m [typeparam s ]](): NullaryTest[T, m]
+_empty_/NullaryTest#`<init>`().[m][s] => typeparam s 
+_empty_/NullaryTest#nullary(). => method nullary => String
+_empty_/NullaryTest#nullary2(). => abstract method nullary2 => T
+_empty_/NullaryTest#nullary3(). => abstract method nullary3 => m[T]
+_empty_/NullaryTest#x. => val method x String
+_empty_/NullaryTest#x2. => val method x2 T
+_empty_/NullaryTest#x3. => val method x3 m[T]
+_empty_/test. => final object test extends Object { self: test.type => +1 decls }
+
+Occurrences:
+[0:15..0:26): NullaryTest <- _empty_/NullaryTest#
+[0:27..0:28): T <- _empty_/NullaryTest#[T]
+[0:30..0:31): m <- _empty_/NullaryTest#[m]
+[0:32..0:33): s <- _empty_/NullaryTest#`<init>`().[m][s]
+[1:6..1:13): nullary <- _empty_/NullaryTest#nullary().
+[1:15..1:21): String -> scala/Predef.String#
+[2:6..2:7): x <- _empty_/NullaryTest#x.
+[2:10..2:17): nullary -> _empty_/NullaryTest#nullary().
+[4:6..4:14): nullary2 <- _empty_/NullaryTest#nullary2().
+[4:16..4:17): T -> _empty_/NullaryTest#[T]
+[5:6..5:8): x2 <- _empty_/NullaryTest#x2.
+[5:11..5:19): nullary2 -> _empty_/NullaryTest#nullary2().
+[7:6..7:14): nullary3 <- _empty_/NullaryTest#nullary3().
+[7:16..7:17): m -> _empty_/NullaryTest#[m]
+[7:18..7:19): T -> _empty_/NullaryTest#[T]
+[8:6..8:8): x3 <- _empty_/NullaryTest#x3.
+[8:11..8:19): nullary3 -> _empty_/NullaryTest#nullary3().
+[11:6..11:14): Concrete <- _empty_/Concrete#
+[11:23..11:34): NullaryTest -> _empty_/NullaryTest#
+[11:35..11:38): Int -> scala/Int#
+[11:40..11:44): List -> scala/package.List#
+[12:6..12:14): nullary2 <- _empty_/Concrete#nullary2().
+[13:6..13:14): nullary3 <- _empty_/Concrete#nullary3().
+[13:17..13:21): List -> scala/package.List.
+[16:7..16:11): test <- _empty_/test.
+[17:7..17:15): Concrete -> _empty_/Concrete#
+[17:17..17:25): nullary2 -> _empty_/Concrete#nullary2().
+[18:7..18:15): Concrete -> _empty_/Concrete#
+[18:17..18:25): nullary3 -> _empty_/Concrete#nullary3().
+
+Synthetics:
+[13:17..13:21):List => *.apply[Int]
+
 expect/recursion.scala
 ----------------------
 
@@ -3528,55 +4029,54 @@ Uri => recursion.scala
 Text => empty
 Language => Scala
 Symbols => 36 entries
-Occurrences => 56 entries
+Occurrences => 46 entries
+Synthetics => 3 entries
 
 Symbols:
-local0 => case val method N$1
-local1 => val local p
-local2 => case val method N$2
-local3 => val local p
-local4 => val local Nat_this
-local5 => val local Nat_this
-local6 => val local Nat_this
-recursion/Nats. => final object Nats
-recursion/Nats.Nat# => sealed trait Nat
-recursion/Nats.Nat#`++`(). => macro ++
-recursion/Nats.Nat#`+`(). => macro +
-recursion/Nats.Nat#`+`().(that) => param that
-recursion/Nats.Nat#`<init>`(). => primary ctor <init>
-recursion/Nats.Succ# => case class Succ
-recursion/Nats.Succ#[N] => typeparam N
-recursion/Nats.Succ#_1(). => method _1
-recursion/Nats.Succ#`<init>`(). => primary ctor <init>
-recursion/Nats.Succ#`<init>`().(p) => val param p
-recursion/Nats.Succ#copy$default$1(). => method copy$default$1
-recursion/Nats.Succ#copy$default$1().[N] => typeparam N
-recursion/Nats.Succ#copy(). => method copy
-recursion/Nats.Succ#copy().(p) => param p
-recursion/Nats.Succ#copy().[N] => typeparam N
-recursion/Nats.Succ#p. => val method p
-recursion/Nats.Succ. => final object Succ
-recursion/Nats.Succ.apply(). => method apply
-recursion/Nats.Succ.apply().(p) => param p
-recursion/Nats.Succ.apply().[N] => typeparam N
-recursion/Nats.Succ.toString(). => method toString
-recursion/Nats.Succ.unapply(). => method unapply
-recursion/Nats.Succ.unapply().(x$1) => param x$1
-recursion/Nats.Succ.unapply().[N] => typeparam N
-recursion/Nats.Zero. => final case object Zero
-recursion/Nats.j31. => val method j31
-recursion/Nats.toIntg(). => macro toIntg
-recursion/Nats.toIntg().(n) => param n
+local0 => case val method N$1  <: Nat
+local1 => val local p: N$1
+local2 => case val method N$2  <: Nat
+local3 => val local p: N$2
+local4 => val local Nat_this: Zero.type
+local5 => val local Nat_this: Succ[Zero.type]
+local6 => val local Nat_this: Succ[_] forSome { type _  <: Succ[Zero.type] }
+recursion/Nats. => final object Nats extends Object { self: Nats.type => +9 decls }
+recursion/Nats.Nat# => sealed trait Nat extends Object { self: Nat => +3 decls }
+recursion/Nats.Nat#`++`(). => inline transparent macro ++ => Succ[Nat.this.type]
+recursion/Nats.Nat#`+`(). => inline transparent macro + (inline param that: Nat): Nat
+recursion/Nats.Nat#`+`().(that) => inline param that: Nat
+recursion/Nats.Nat#`<init>`(). => primary ctor <init> (): Nat
+recursion/Nats.Succ# => case class Succ [typeparam N  <: Nat] extends Object with Nat with Product with Serializable { self: Succ[N] => +6 decls }
+recursion/Nats.Succ#[N] => typeparam N  <: Nat
+recursion/Nats.Succ#_1(). => method _1 => N
+recursion/Nats.Succ#`<init>`(). => primary ctor <init> [typeparam N  <: Nat](val param p: N): Succ[N]
+recursion/Nats.Succ#`<init>`().(p) => val param p: N
+recursion/Nats.Succ#copy$default$1(). => method copy$default$1 [typeparam N  <: Nat]: N
+recursion/Nats.Succ#copy$default$1().[N] => typeparam N  <: Nat
+recursion/Nats.Succ#copy(). => method copy [typeparam N  <: Nat](param p: N): Succ[N]
+recursion/Nats.Succ#copy().(p) => param p: N
+recursion/Nats.Succ#copy().[N] => typeparam N  <: Nat
+recursion/Nats.Succ#p. => val method p N
+recursion/Nats.Succ. => final object Succ extends Object { self: Succ.type => +4 decls }
+recursion/Nats.Succ.apply(). => method apply [typeparam N  <: Nat](param p: N): Succ[N]
+recursion/Nats.Succ.apply().(p) => param p: N
+recursion/Nats.Succ.apply().[N] => typeparam N  <: Nat
+recursion/Nats.Succ.toString(). => method toString => String <: scala/Any#toString().
+recursion/Nats.Succ.unapply(). => method unapply [typeparam N  <: Nat](param x$1: Succ[N]): Succ[N]
+recursion/Nats.Succ.unapply().(x$1) => param x$1: Succ[N]
+recursion/Nats.Succ.unapply().[N] => typeparam N  <: Nat
+recursion/Nats.Zero. => final case object Zero extends Object with Nat with Product with Serializable { self: Zero.type => +1 decls }
+recursion/Nats.j31. => val method j31 Int
+recursion/Nats.toIntg(). => inline transparent macro toIntg (inline param n: Nat): Int
+recursion/Nats.toIntg().(n) => inline param n: Nat
 
 Occurrences:
 [1:8..1:17): recursion <- recursion/
 [3:7..3:11): Nats <- recursion/Nats.
 [4:15..4:18): Nat <- recursion/Nats.Nat#
-[5:4..5:4): <- recursion/Nats.Nat#`<init>`().
 [5:27..5:29): ++ <- recursion/Nats.Nat#`++`().
 [5:32..5:36): Succ -> recursion/Nats.Succ#
 [5:50..5:54): Succ -> recursion/Nats.Succ.
-[5:54..5:54): -> recursion/Nats.Succ.apply().
 [7:27..7:28): + <- recursion/Nats.Nat#`+`().
 [7:36..7:40): that <- recursion/Nats.Nat#`+`().(that)
 [7:42..7:45): Nat -> recursion/Nats.Nat#
@@ -3584,8 +4084,6 @@ Occurrences:
 [9:13..9:17): Zero -> recursion/Nats.Zero.
 [9:24..9:28): that -> recursion/Nats.Nat#`+`().(that)
 [10:13..10:17): Succ -> recursion/Nats.Succ.
-[10:17..10:17): -> recursion/Nats.Succ.unapply().
-[10:17..10:17): -> local0
 [10:18..10:19): p <- local1
 [10:24..10:25): p -> local1
 [10:26..10:27): + -> recursion/Nats.Nat#`+`().
@@ -3594,8 +4092,8 @@ Occurrences:
 [14:14..14:18): Zero <- recursion/Nats.Zero.
 [14:27..14:30): Nat -> recursion/Nats.Nat#
 [15:13..15:17): Succ <- recursion/Nats.Succ#
-[15:17..15:17): <- recursion/Nats.Succ#`<init>`().
 [15:18..15:19): N <- recursion/Nats.Succ#[N]
+[15:23..15:26): Nat -> recursion/Nats.Nat#
 [15:28..15:29): p <- recursion/Nats.Succ#p.
 [15:31..15:32): N -> recursion/Nats.Succ#[N]
 [15:42..15:45): Nat -> recursion/Nats.Nat#
@@ -3606,8 +4104,6 @@ Occurrences:
 [18:11..18:12): n -> recursion/Nats.toIntg().(n)
 [19:11..19:15): Zero -> recursion/Nats.Zero.
 [20:11..20:15): Succ -> recursion/Nats.Succ.
-[20:15..20:15): -> recursion/Nats.Succ.unapply().
-[20:15..20:15): -> local2
 [20:16..20:17): p <- local3
 [20:22..20:28): toIntg -> recursion/Nats.toIntg().
 [20:29..20:30): p -> local3
@@ -3615,17 +4111,18 @@ Occurrences:
 [23:6..23:9): j31 <- recursion/Nats.j31.
 [23:12..23:18): toIntg -> recursion/Nats.toIntg().
 [23:19..23:23): Zero -> recursion/Nats.Zero.
-[23:24..23:32): ++.++.++ <- local4
-[23:24..23:24): -> recursion/Nats.Zero.
 [23:24..23:26): ++ -> recursion/Nats.Nat#`++`().
-[23:27..23:35): ++.++ +  <- local5
 [23:27..23:29): ++ -> recursion/Nats.Nat#`++`().
-[23:30..23:38): ++ + Zer <- local6
 [23:30..23:32): ++ -> recursion/Nats.Nat#`++`().
 [23:33..23:34): + -> recursion/Nats.Nat#`+`().
 [23:35..23:39): Zero -> recursion/Nats.Zero.
 [23:40..23:42): ++ -> recursion/Nats.Nat#`++`().
 
+Synthetics:
+[5:50..5:54):Succ => *.apply[Nat.this.type]
+[10:13..10:17):Succ => *.unapply[N$1]
+[20:11..20:15):Succ => *.unapply[N$2]
+
 expect/semanticdb-Definitions.scala
 -----------------------------------
 
@@ -3635,19 +4132,19 @@ Uri => semanticdb-Definitions.scala
 Text => empty
 Language => Scala
 Symbols => 10 entries
-Occurrences => 9 entries
+Occurrences => 7 entries
 
 Symbols:
-a/Definitions. => final object Definitions
-a/Definitions.D# => class D
-a/Definitions.D#`<init>`(). => primary ctor <init>
-a/Definitions.E# => trait E
-a/Definitions.E#`<init>`(). => primary ctor <init>
-a/Definitions.`b_=`(). => var method b_=
-a/Definitions.`b_=`().(x$1) => param x$1
-a/Definitions.a. => val method a
-a/Definitions.b(). => var method b
-a/Definitions.c(). => method c
+a/Definitions. => final object Definitions extends Object { self: Definitions.type => +9 decls }
+a/Definitions.D# => class D extends Object { self: D => +1 decls }
+a/Definitions.D#`<init>`(). => primary ctor <init> (): D
+a/Definitions.E# => trait E extends Object { self: E => +1 decls }
+a/Definitions.E#`<init>`(). => primary ctor <init> (): E
+a/Definitions.`b_=`(). => var method b_= (param x$1: Int): Unit
+a/Definitions.`b_=`().(x$1) => param x$1: Int
+a/Definitions.a. => val method a Int
+a/Definitions.b(). => var method b Int
+a/Definitions.c(). => method c => Int
 
 Occurrences:
 [0:8..0:9): a <- a/
@@ -3655,9 +4152,7 @@ Occurrences:
 [2:6..2:7): a <- a/Definitions.a.
 [3:6..3:7): b <- a/Definitions.b().
 [4:6..4:7): c <- a/Definitions.c().
-[5:2..5:2): <- a/Definitions.D#`<init>`().
 [5:8..5:9): D <- a/Definitions.D#
-[6:2..6:2): <- a/Definitions.E#`<init>`().
 [6:8..6:9): E <- a/Definitions.E#
 
 expect/semanticdb-Flags.scala
@@ -3669,59 +4164,60 @@ Uri => semanticdb-Flags.scala
 Text => empty
 Language => Scala
 Symbols => 50 entries
-Occurrences => 82 entries
+Occurrences => 73 entries
+Synthetics => 2 entries
 
 Symbols:
-flags/p/package. => final package object p
-flags/p/package.AA# => class AA
-flags/p/package.AA#`<init>`(). => primary ctor <init>
-flags/p/package.AA#`<init>`().(x) => param x
-flags/p/package.AA#`<init>`().(y) => val param y
-flags/p/package.AA#`<init>`().(z) => var param z
-flags/p/package.AA#`z_=`(). => var method z_=
-flags/p/package.AA#`z_=`().(x$1) => param x$1
-flags/p/package.AA#x. => val method x
-flags/p/package.AA#y. => val method y
-flags/p/package.AA#z(). => var method z
-flags/p/package.C# => abstract class C
-flags/p/package.C#[T] => covariant typeparam T
-flags/p/package.C#[U] => contravariant typeparam U
-flags/p/package.C#[V] => typeparam V
-flags/p/package.C#`<init>`(). => primary ctor <init>
-flags/p/package.C#`<init>`().(x) => param x
-flags/p/package.C#`<init>`().(y) => param y
-flags/p/package.C#`<init>`().(z) => param z
-flags/p/package.C#`<init>`(+1). => ctor <init>
-flags/p/package.C#`<init>`(+2). => ctor <init>
-flags/p/package.C#`<init>`(+2).(t) => param t
-flags/p/package.C#w(). => abstract method w
-flags/p/package.C#x. => val method x
-flags/p/package.C#y. => val method y
-flags/p/package.C#z. => val method z
-flags/p/package.S# => class S
-flags/p/package.S#[T] => typeparam T
-flags/p/package.S#`<init>`(). => primary ctor <init>
-flags/p/package.T1# => type T1
-flags/p/package.T2# => type T2
-flags/p/package.T2#[T] => typeparam T
-flags/p/package.U# => type U
-flags/p/package.V# => type V
-flags/p/package.X. => final case object X
-flags/p/package.Y# => final class Y
-flags/p/package.Y#`<init>`(). => primary ctor <init>
-flags/p/package.Z# => sealed trait Z
-flags/p/package.Z#`<init>`(). => primary ctor <init>
-flags/p/package.`y_=`(). => var method y_=
-flags/p/package.`y_=`().(x$1) => param x$1
-flags/p/package.m(). => macro m
-flags/p/package.m().[TT] => typeparam TT
-flags/p/package.x. => lazy val method x
-flags/p/package.xs1. => val method xs1
-flags/p/package.y(). => implicit var method y
-flags/p/package.z(). => method z
-flags/p/package.z().(pp) => param pp
-local0 => val local xs2
-local1 => case val method t
+flags/p/package. => final package object p extends Object { self: p.type => +23 decls }
+flags/p/package.AA# => class AA extends Object { self: AA => +5 decls }
+flags/p/package.AA#`<init>`(). => primary ctor <init> (param x: Int, val param y: Int, var param z: Int): AA
+flags/p/package.AA#`<init>`().(x) => param x: Int
+flags/p/package.AA#`<init>`().(y) => val param y: Int
+flags/p/package.AA#`<init>`().(z) => var param z: Int
+flags/p/package.AA#`z_=`(). => var method z_= (param x$1: Int): Unit
+flags/p/package.AA#`z_=`().(x$1) => param x$1: Int
+flags/p/package.AA#x. => private[this] val method x Int
+flags/p/package.AA#y. => val method y Int
+flags/p/package.AA#z(). => var method z Int
+flags/p/package.C# => abstract class C [covariant typeparam T , contravariant typeparam U , typeparam V ] extends Object { self: C[T, U, V] => +10 decls }
+flags/p/package.C#[T] => covariant typeparam T 
+flags/p/package.C#[U] => contravariant typeparam U 
+flags/p/package.C#[V] => typeparam V 
+flags/p/package.C#`<init>`(). => primary ctor <init> [covariant typeparam T , contravariant typeparam U , typeparam V ](param x: T, param y: U, param z: V): C[T, U, V]
+flags/p/package.C#`<init>`().(x) => param x: T
+flags/p/package.C#`<init>`().(y) => param y: U
+flags/p/package.C#`<init>`().(z) => param z: V
+flags/p/package.C#`<init>`(+1). => ctor <init> [covariant typeparam T , contravariant typeparam U , typeparam V ](): C[T, U, V]
+flags/p/package.C#`<init>`(+2). => ctor <init> [covariant typeparam T , contravariant typeparam U , typeparam V ](param t: T): C[T, U, V]
+flags/p/package.C#`<init>`(+2).(t) => param t: T
+flags/p/package.C#w(). => abstract method w => Int
+flags/p/package.C#x. => private[this] val method x T
+flags/p/package.C#y. => private[this] val method y U
+flags/p/package.C#z. => private[this] val method z V
+flags/p/package.S# => class S [@specialized typeparam T ] extends Object { self: S[T] => +2 decls }
+flags/p/package.S#[T] => @specialized typeparam T 
+flags/p/package.S#`<init>`(). => primary ctor <init> [@specialized typeparam T ](): S[T]
+flags/p/package.T1# => type T1  = Int
+flags/p/package.T2# => type T2 [typeparam T ] = S[T]
+flags/p/package.T2#[T] => typeparam T 
+flags/p/package.U# => type U  <: Int
+flags/p/package.V# => type V  >: Int
+flags/p/package.X. => final case object X extends Object with Product with Serializable { self: X.type => +1 decls }
+flags/p/package.Y# => final class Y extends Object { self: Y => +1 decls }
+flags/p/package.Y#`<init>`(). => primary ctor <init> (): Y
+flags/p/package.Z# => sealed trait Z extends Object { self: Z => +1 decls }
+flags/p/package.Z#`<init>`(). => primary ctor <init> (): Z
+flags/p/package.`y_=`(). => protected var method y_= (param x$1: Int): Unit
+flags/p/package.`y_=`().(x$1) => param x$1: Int
+flags/p/package.m(). => macro m [typeparam TT ]: Int
+flags/p/package.m().[TT] => typeparam TT 
+flags/p/package.x. => private[flags/p/] lazy val method x Int
+flags/p/package.xs1. => val method xs1 Nothing
+flags/p/package.y(). => protected implicit var method y Int
+flags/p/package.z(). => method z (param pp: Int): Int
+flags/p/package.z().(pp) => param pp: Int
+local0 => val local xs2: Nothing
+local1 => case val method t 
 
 Occurrences:
 [0:8..0:13): flags <- flags/
@@ -3729,7 +4225,7 @@ Occurrences:
 [2:13..2:21): language -> scala/language.
 [2:22..2:34): experimental -> scala/language.experimental.
 [2:35..2:41): macros -> scala/language.experimental.macros.
-[4:15..5:3): <- flags/p/package.
+[4:15..4:16): p <- flags/p/package.
 [5:2..5:3): p -> flags/p/
 [5:19..5:20): x <- flags/p/package.x.
 [6:25..6:26): y <- flags/p/package.y().
@@ -3742,7 +4238,6 @@ Occurrences:
 [8:13..8:16): Int -> scala/Int#
 [8:25..8:28): ??? -> scala/Predef.`???`().
 [9:17..9:18): C <- flags/p/package.C#
-[9:18..9:18): <- flags/p/package.C#`<init>`().
 [9:20..9:21): T <- flags/p/package.C#[T]
 [9:24..9:25): U <- flags/p/package.C#[U]
 [9:27..9:28): V <- flags/p/package.C#[V]
@@ -3752,15 +4247,13 @@ Occurrences:
 [9:39..9:40): U -> flags/p/package.C#[U]
 [9:42..9:43): z <- flags/p/package.C#z.
 [9:45..9:46): V -> flags/p/package.C#[V]
-[10:8..10:14): <- flags/p/package.C#`<init>`(+1).
-[10:22..10:22): -> flags/p/package.C#`<init>`().
+[10:8..10:12): <- flags/p/package.C#`<init>`(+1).
 [10:22..10:25): ??? -> scala/Predef.`???`().
 [10:27..10:30): ??? -> scala/Predef.`???`().
 [10:32..10:35): ??? -> scala/Predef.`???`().
-[11:8..11:14): <- flags/p/package.C#`<init>`(+2).
+[11:8..11:12): <- flags/p/package.C#`<init>`(+2).
 [11:13..11:14): t <- flags/p/package.C#`<init>`(+2).(t)
 [11:16..11:17): T -> flags/p/package.C#[T]
-[11:26..11:26): -> flags/p/package.C#`<init>`().
 [11:26..11:27): t -> flags/p/package.C#`<init>`(+2).(t)
 [11:29..11:32): ??? -> scala/Predef.`???`().
 [11:34..11:37): ??? -> scala/Predef.`???`().
@@ -3777,12 +4270,9 @@ Occurrences:
 [17:7..17:8): V <- flags/p/package.V#
 [17:12..17:15): Int -> scala/Int#
 [18:14..18:15): X <- flags/p/package.X.
-[19:2..19:2): <- flags/p/package.Y#`<init>`().
 [19:14..19:15): Y <- flags/p/package.Y#
-[20:2..20:2): <- flags/p/package.Z#`<init>`().
 [20:15..20:16): Z <- flags/p/package.Z#
 [21:8..21:10): AA <- flags/p/package.AA#
-[21:10..21:10): <- flags/p/package.AA#`<init>`().
 [21:11..21:12): x <- flags/p/package.AA#x.
 [21:14..21:17): Int -> scala/Int#
 [21:23..21:24): y <- flags/p/package.AA#y.
@@ -3790,16 +4280,13 @@ Occurrences:
 [21:35..21:36): z <- flags/p/package.AA#z().
 [21:38..21:41): Int -> scala/Int#
 [22:8..22:9): S <- flags/p/package.S#
-[22:9..22:9): <- flags/p/package.S#`<init>`().
 [22:11..22:22): specialized -> scala/specialized#
 [22:23..22:24): T <- flags/p/package.S#[T]
 [23:6..23:10): List -> scala/package.List.
-[23:10..23:10): -> scala/collection/SeqFactory#unapplySeq().
 [23:11..23:14): xs1 <- flags/p/package.xs1.
 [23:18..23:21): ??? -> scala/Predef.`???`().
 [24:2..24:5): ??? -> scala/Predef.`???`().
 [24:19..24:23): List -> scala/package.List.
-[24:23..24:23): -> scala/collection/SeqFactory#unapplySeq().
 [24:24..24:27): xs2 <- local0
 [24:32..24:35): ??? -> scala/Predef.`???`().
 [25:2..25:5): ??? -> scala/Predef.`???`().
@@ -3807,6 +4294,10 @@ Occurrences:
 [25:27..25:28): t <- local1
 [25:33..25:36): ??? -> scala/Predef.`???`().
 
+Synthetics:
+[23:6..23:10):List => *.unapplySeq[Nothing]
+[24:19..24:23):List => *.unapplySeq[Nothing]
+
 expect/semanticdb-Types.scala
 -----------------------------
 
@@ -3815,152 +4306,155 @@ Schema => SemanticDB v4
 Uri => semanticdb-Types.scala
 Text => empty
 Language => Scala
-Symbols => 142 entries
-Occurrences => 250 entries
+Symbols => 144 entries
+Occurrences => 225 entries
+Synthetics => 1 entries
 
 Symbols:
-local0 => abstract method k
-local1 => abstract method k
-local2 => final class $anon
-local3 => method k
-local4 => final class $anon
-local5 => final class $anon
-local6 => method k
-local7 => type L
-local8 => typeparam T
-types/B# => class B
-types/B#`<init>`(). => primary ctor <init>
-types/C# => class C
-types/C#`<init>`(). => primary ctor <init>
-types/Foo# => case class Foo
-types/Foo#_1(). => method _1
-types/Foo#`<init>`(). => primary ctor <init>
-types/Foo#`<init>`().(s) => val param s
-types/Foo#copy$default$1(). => method copy$default$1
-types/Foo#copy(). => method copy
-types/Foo#copy().(s) => param s
-types/Foo#s. => val method s
-types/Foo. => final object Foo
-types/Foo.apply(). => method apply
-types/Foo.apply().(s) => param s
-types/Foo.toString(). => method toString
-types/Foo.unapply(). => method unapply
-types/Foo.unapply().(x$1) => param x$1
-types/Foo.x. => val method x
-types/Foo.y. => val method y
-types/P# => class P
-types/P#C# => class C
-types/P#C#`<init>`(). => primary ctor <init>
-types/P#X# => class X
-types/P#X#`<init>`(). => primary ctor <init>
-types/P#`<init>`(). => primary ctor <init>
-types/P#x. => val method x
-types/T# => class T
-types/T#C# => class C
-types/T#C#`<init>`(). => primary ctor <init>
-types/T#X# => class X
-types/T#X#`<init>`(). => primary ctor <init>
-types/T#`<init>`(). => primary ctor <init>
-types/T#x. => val method x
-types/Test. => final object Test
-types/Test.C# => class C
-types/Test.C#ByNameType. => final object ByNameType
-types/Test.C#ByNameType.m1(). => method m1
-types/Test.C#ByNameType.m1().(x) => param x
-types/Test.C#ClassInfoType1. => final object ClassInfoType1
-types/Test.C#ClassInfoType2# => class ClassInfoType2
-types/Test.C#ClassInfoType2#`<init>`(). => primary ctor <init>
-types/Test.C#ClassInfoType2#x(). => method x
-types/Test.C#ClassInfoType3# => trait ClassInfoType3
-types/Test.C#ClassInfoType3#[T] => typeparam T
-types/Test.C#ClassInfoType3#`<init>`(). => primary ctor <init>
-types/Test.C#Either. => val method Either
-types/Test.C#MethodType. => final object MethodType
-types/Test.C#MethodType.m3(). => method m3
-types/Test.C#MethodType.m4(). => method m4
-types/Test.C#MethodType.m5(). => method m5
-types/Test.C#MethodType.m5().(x) => param x
-types/Test.C#MethodType.m6(). => method m6
-types/Test.C#MethodType.m6().(x) => param x
-types/Test.C#MethodType.m6().[T] => typeparam T
-types/Test.C#MethodType.x1(). => method x1
-types/Test.C#MethodType.x2(). => method x2
-types/Test.C#RepeatedType# => case class RepeatedType
-types/Test.C#RepeatedType#_1(). => method _1
-types/Test.C#RepeatedType#`<init>`(). => primary ctor <init>
-types/Test.C#RepeatedType#`<init>`().(s) => val param s
-types/Test.C#RepeatedType#m1(). => method m1
-types/Test.C#RepeatedType#m1().(x) => param x
-types/Test.C#RepeatedType#s. => val method s
-types/Test.C#RepeatedType. => final object RepeatedType
-types/Test.C#RepeatedType.apply(). => method apply
-types/Test.C#RepeatedType.apply().(s) => param s
-types/Test.C#RepeatedType.toString(). => method toString
-types/Test.C#RepeatedType.unapplySeq(). => method unapplySeq
-types/Test.C#RepeatedType.unapplySeq().(x$1) => param x$1
-types/Test.C#TypeType. => final object TypeType
-types/Test.C#TypeType.T1# => type T1
-types/Test.C#TypeType.T4# => type T4
-types/Test.C#TypeType.T5# => type T5
-types/Test.C#TypeType.T5#[U] => typeparam U
-types/Test.C#TypeType.m2(). => method m2
-types/Test.C#TypeType.m2().[T2] => typeparam T2
-types/Test.C#TypeType.m3(). => method m3
-types/Test.C#TypeType.m3().[M3] => typeparam M3
-types/Test.C#`<init>`(). => primary ctor <init>
-types/Test.C#annType1. => val method annType1
-types/Test.C#annType2. => val method annType2
-types/Test.C#compoundType1. => val method compoundType1
-types/Test.C#compoundType2. => val method compoundType2
-types/Test.C#compoundType3. => val method compoundType3
-types/Test.C#compoundType4. => val method compoundType4
-types/Test.C#compoundType5. => val method compoundType5
-types/Test.C#compoundType6. => val method compoundType6
-types/Test.C#existentialType2. => val method existentialType2
-types/Test.C#existentialType3. => val method existentialType3
-types/Test.C#existentialType4. => val method existentialType4
-types/Test.C#p. => val method p
-types/Test.C#singleType1. => val method singleType1
-types/Test.C#singleType2. => val method singleType2
-types/Test.C#superType1. => val method superType1
-types/Test.C#superType2. => val method superType2
-types/Test.C#superType3. => val method superType3
-types/Test.C#thisType1. => val method thisType1
-types/Test.C#thisType2. => val method thisType2
-types/Test.C#typeLambda1(). => method typeLambda1
-types/Test.C#typeLambda1().[M] => typeparam M
-types/Test.C#typeRef1. => val method typeRef1
-types/Test.C#typeRef2. => val method typeRef2
-types/Test.C#typeRef3. => val method typeRef3
-types/Test.C#typeRef4. => val method typeRef4
-types/Test.C#x. => val method x
-types/Test.Literal. => final object Literal
-types/Test.Literal.bool. => final val method bool
-types/Test.Literal.char. => final val method char
-types/Test.Literal.clazzOf. => final val method clazzOf
-types/Test.Literal.double. => final val method double
-types/Test.Literal.float. => final val method float
-types/Test.Literal.int. => final val method int
-types/Test.Literal.javaEnum. => final val method javaEnum
-types/Test.Literal.long. => final val method long
-types/Test.Literal.nil. => final val method nil
-types/Test.Literal.string. => final val method string
-types/Test.Literal.unit. => final val method unit
-types/Test.M# => class M
-types/Test.M#`<init>`(). => primary ctor <init>
-types/Test.M#m(). => method m
-types/Test.N# => trait N
-types/Test.N#`<init>`(). => primary ctor <init>
-types/Test.N#n(). => method n
-types/ann# => class ann
-types/ann#[T] => typeparam T
-types/ann#`<init>`(). => primary ctor <init>
-types/ann#`<init>`().(x) => param x
-types/ann#x. => val method x
-types/ann1# => class ann1
-types/ann1#`<init>`(). => primary ctor <init>
-types/ann2# => class ann2
-types/ann2#`<init>`(). => primary ctor <init>
+local0 => abstract method k => Int
+local1 => abstract method k => Int
+local2 => method k => Int
+local3 => final class $anon extends Object { self: $anon => +2 decls }
+local5 => final class $anon extends M with N { self: $anon => +1 decls }
+local7 => method k => Int
+local8 => final class $anon extends M with N { self: $anon => +2 decls }
+local10 => typeparam T 
+local11 => type L [typeparam T ] = List[T]
+types/B# => class B extends Object { self: B => +1 decls }
+types/B#`<init>`(). => primary ctor <init> (): B
+types/C# => class C extends Object { self: C => +1 decls }
+types/C#`<init>`(). => primary ctor <init> (): C
+types/Foo# => case class Foo extends Object with Product with Serializable { self: Foo => +5 decls }
+types/Foo#_1(). => method _1 => "abc"
+types/Foo#`<init>`(). => primary ctor <init> (val param s: "abc"): Foo
+types/Foo#`<init>`().(s) => val param s: "abc"
+types/Foo#copy$default$1(). => method copy$default$1 => "abc" @uncheckedVariance
+types/Foo#copy(). => method copy (param s: "abc"): Foo
+types/Foo#copy().(s) => param s: "abc"
+types/Foo#s. => val method s "abc"
+types/Foo. => final object Foo extends Object { self: Foo.type => +6 decls }
+types/Foo.apply(). => method apply (param s: "abc"): Foo
+types/Foo.apply().(s) => param s: "abc"
+types/Foo.toString(). => method toString => String <: scala/Any#toString().
+types/Foo.unapply(). => method unapply (param x$1: Foo): Foo
+types/Foo.unapply().(x$1) => param x$1: Foo
+types/Foo.x. => val method x "abc" @deprecated
+types/Foo.y. => val method y "abc"
+types/P# => class P extends Object { self: P => +8 decls }
+types/P#C# => class C extends Object { self: C => +1 decls }
+types/P#C#`<init>`(). => primary ctor <init> (): C
+types/P#X# => class X extends Object { self: X => +1 decls }
+types/P#X#`<init>`(). => primary ctor <init> (): X
+types/P#`<init>`(). => primary ctor <init> (): P
+types/P#x. => val method x X
+types/T# => class T extends Object { self: T => +8 decls }
+types/T#C# => class C extends Object { self: C => +1 decls }
+types/T#C#`<init>`(). => primary ctor <init> (): C
+types/T#X# => class X extends Object { self: X => +1 decls }
+types/T#X#`<init>`(). => primary ctor <init> (): X
+types/T#`<init>`(). => primary ctor <init> (): T
+types/T#x. => val method x X
+types/Test. => final object Test extends Object { self: Test.type => +10 decls }
+types/Test.C# => class C extends M { self: C => +42 decls }
+types/Test.C#ByNameType. => final object ByNameType extends Object { self: ByNameType.type => +2 decls }
+types/Test.C#ByNameType.m1(). => method m1 (param x: => Int): Int
+types/Test.C#ByNameType.m1().(x) => param x: => Int
+types/Test.C#ClassInfoType1. => final object ClassInfoType1 extends Object { self: ClassInfoType1.type => +1 decls }
+types/Test.C#ClassInfoType2# => class ClassInfoType2 extends B { self: ClassInfoType2 => +2 decls }
+types/Test.C#ClassInfoType2#`<init>`(). => primary ctor <init> (): ClassInfoType2
+types/Test.C#ClassInfoType2#x(). => method x => Int
+types/Test.C#ClassInfoType3# => trait ClassInfoType3 [typeparam T ] extends Object { self: ClassInfoType3[T] => +2 decls }
+types/Test.C#ClassInfoType3#[T] => typeparam T 
+types/Test.C#ClassInfoType3#`<init>`(). => primary ctor <init> [typeparam T ](): ClassInfoType3[T]
+types/Test.C#Either. => val method Either Either.type
+types/Test.C#MethodType. => final object MethodType extends Object { self: MethodType.type => +7 decls }
+types/Test.C#MethodType.m3(). => method m3 => Int
+types/Test.C#MethodType.m4(). => method m4 (): Int
+types/Test.C#MethodType.m5(). => method m5 (param x: Int): Int
+types/Test.C#MethodType.m5().(x) => param x: Int
+types/Test.C#MethodType.m6(). => method m6 [typeparam T ](param x: T): T
+types/Test.C#MethodType.m6().(x) => param x: T
+types/Test.C#MethodType.m6().[T] => typeparam T 
+types/Test.C#MethodType.x1(). => method x1 => Int
+types/Test.C#MethodType.x2(). => method x2 => Int
+types/Test.C#RepeatedType# => case class RepeatedType extends Object with Product with Serializable { self: RepeatedType => +4 decls }
+types/Test.C#RepeatedType#_1(). => method _1 => String*
+types/Test.C#RepeatedType#`<init>`(). => primary ctor <init> (val param s: String*): RepeatedType
+types/Test.C#RepeatedType#`<init>`().(s) => val param s: String*
+types/Test.C#RepeatedType#m1(). => method m1 (param x: Int*): Int
+types/Test.C#RepeatedType#m1().(x) => param x: Int*
+types/Test.C#RepeatedType#s. => val method s String*
+types/Test.C#RepeatedType. => final object RepeatedType extends Object { self: RepeatedType.type => +4 decls }
+types/Test.C#RepeatedType.apply(). => method apply (param s: String*): RepeatedType
+types/Test.C#RepeatedType.apply().(s) => param s: String*
+types/Test.C#RepeatedType.toString(). => method toString => String <: scala/Any#toString().
+types/Test.C#RepeatedType.unapplySeq(). => method unapplySeq (param x$1: RepeatedType): RepeatedType
+types/Test.C#RepeatedType.unapplySeq().(x$1) => param x$1: RepeatedType
+types/Test.C#TypeType. => final object TypeType extends Object { self: TypeType.type => +6 decls }
+types/Test.C#TypeType.T1# => type T1 
+types/Test.C#TypeType.T4# => type T4  = C
+types/Test.C#TypeType.T5# => type T5 [typeparam U ] = U
+types/Test.C#TypeType.T5#[U] => typeparam U 
+types/Test.C#TypeType.m2(). => method m2 [typeparam T2  = C]: Nothing
+types/Test.C#TypeType.m2().[T2] => typeparam T2  = C
+types/Test.C#TypeType.m3(). => method m3 [typeparam M3 [type _ ]]: Nothing
+types/Test.C#TypeType.m3().[M3] => typeparam M3 [type _ ]
+types/Test.C#TypeType.m3().[M3][_] => type _ 
+types/Test.C#`<init>`(). => primary ctor <init> (): C
+types/Test.C#annType1. => val method annType1 T @ann[T]
+types/Test.C#annType2. => val method annType2 T @ann1 @ann2
+types/Test.C#compoundType1. => val method compoundType1 Object { abstract method k => Int }
+types/Test.C#compoundType2. => val method compoundType2 M & N
+types/Test.C#compoundType3. => val method compoundType3 M & N { abstract method k => Int }
+types/Test.C#compoundType4. => val method compoundType4 Object
+types/Test.C#compoundType5. => val method compoundType5 M & N
+types/Test.C#compoundType6. => val method compoundType6 M & N
+types/Test.C#existentialType2. => val method existentialType2 List[_] forSome { type _  }
+types/Test.C#existentialType3. => val method existentialType3 Class[_] forSome { type _  }
+types/Test.C#existentialType4. => val method existentialType4 Class[_] forSome { type _  }
+types/Test.C#p. => val method p P
+types/Test.C#singleType1. => val method singleType1 x.type
+types/Test.C#singleType2. => val method singleType2 p.x.type
+types/Test.C#superType1. => val method superType1 Int
+types/Test.C#superType2. => val method superType2 Int
+types/Test.C#superType3. => val method superType3 Int
+types/Test.C#thisType1. => val method thisType1 C.this.type
+types/Test.C#thisType2. => val method thisType2 C.this.type
+types/Test.C#typeLambda1(). => method typeLambda1 [typeparam M [type _ ]]: Nothing
+types/Test.C#typeLambda1().[M] => typeparam M [type _ ]
+types/Test.C#typeLambda1().[M][_] => type _ 
+types/Test.C#typeRef1. => val method typeRef1 C
+types/Test.C#typeRef2. => val method typeRef2 p.C
+types/Test.C#typeRef3. => val method typeRef3 T#C
+types/Test.C#typeRef4. => val method typeRef4 List[Int]
+types/Test.C#x. => val method x p.X
+types/Test.Literal. => final object Literal extends Object { self: Literal.type => +12 decls }
+types/Test.Literal.bool. => final val method bool true
+types/Test.Literal.char. => final val method char 'a'
+types/Test.Literal.clazzOf. => final val method clazzOf Option[Int]
+types/Test.Literal.double. => final val method double 2.0
+types/Test.Literal.float. => final val method float 1.0f
+types/Test.Literal.int. => final val method int 1
+types/Test.Literal.javaEnum. => final val method javaEnum LinkOption
+types/Test.Literal.long. => final val method long 1L
+types/Test.Literal.nil. => final val method nil Null
+types/Test.Literal.string. => final val method string "a"
+types/Test.Literal.unit. => final val method unit Unit
+types/Test.M# => class M extends Object { self: M => +2 decls }
+types/Test.M#`<init>`(). => primary ctor <init> (): M
+types/Test.M#m(). => method m => Int
+types/Test.N# => trait N extends Object { self: N => +2 decls }
+types/Test.N#`<init>`(). => primary ctor <init> (): N
+types/Test.N#n(). => method n => Int
+types/ann# => class ann [typeparam T ] extends Annotation with StaticAnnotation { self: ann[T] => +3 decls }
+types/ann#[T] => typeparam T 
+types/ann#`<init>`(). => primary ctor <init> [typeparam T ](param x: T): ann[T]
+types/ann#`<init>`().(x) => param x: T
+types/ann#x. => private[this] val method x T
+types/ann1# => class ann1 extends Annotation with StaticAnnotation { self: ann1 => +1 decls }
+types/ann1#`<init>`(). => primary ctor <init> (): ann1
+types/ann2# => class ann2 extends Annotation with StaticAnnotation { self: ann2 => +1 decls }
+types/ann2#`<init>`(). => primary ctor <init> (): ann2
 
 Occurrences:
 [0:8..0:13): types <- types/
@@ -3971,7 +4465,6 @@ Occurrences:
 [3:13..3:21): language -> scala/language.
 [3:22..3:33): higherKinds -> scala/language.higherKinds.
 [5:6..5:9): ann <- types/ann#
-[5:9..5:9): <- types/ann#`<init>`().
 [5:10..5:11): T <- types/ann#[T]
 [5:13..5:14): x <- types/ann#x.
 [5:16..5:17): T -> types/ann#[T]
@@ -3979,39 +4472,26 @@ Occurrences:
 [5:33..5:43): annotation -> scala/annotation/
 [5:44..5:60): StaticAnnotation -> scala/annotation/StaticAnnotation#
 [6:6..6:10): ann1 <- types/ann1#
-[6:19..6:19): <- types/ann1#`<init>`().
 [6:19..6:24): scala -> scala/
 [6:25..6:35): annotation -> scala/annotation/
 [6:36..6:52): StaticAnnotation -> scala/annotation/StaticAnnotation#
 [7:6..7:10): ann2 <- types/ann2#
-[7:19..7:19): <- types/ann2#`<init>`().
 [7:19..7:24): scala -> scala/
 [7:25..7:35): annotation -> scala/annotation/
 [7:36..7:52): StaticAnnotation -> scala/annotation/StaticAnnotation#
-[9:0..9:0): <- types/B#`<init>`().
 [9:6..9:7): B <- types/B#
-[11:0..11:0): <- types/C#`<init>`().
 [11:6..11:7): C <- types/C#
 [13:6..13:7): P <- types/P#
-[14:2..14:2): <- types/P#`<init>`().
-[14:2..14:2): <- types/P#C#`<init>`().
 [14:8..14:9): C <- types/P#C#
-[15:2..15:2): <- types/P#X#`<init>`().
 [15:8..15:9): X <- types/P#X#
 [16:6..16:7): x <- types/P#x.
 [16:14..16:15): X -> types/P#X#
-[16:15..16:15): -> types/P#X#`<init>`().
 [19:6..19:7): T <- types/T#
-[20:2..20:2): <- types/T#`<init>`().
-[20:2..20:2): <- types/T#C#`<init>`().
 [20:8..20:9): C <- types/T#C#
-[21:2..21:2): <- types/T#X#`<init>`().
 [21:8..21:9): X <- types/T#X#
 [22:6..22:7): x <- types/T#x.
 [22:14..22:15): X -> types/T#X#
-[22:15..22:15): -> types/T#X#`<init>`().
 [25:11..25:14): Foo <- types/Foo#
-[25:14..25:14): <- types/Foo#`<init>`().
 [25:15..25:16): s <- types/Foo#s.
 [27:7..27:10): Foo <- types/Foo.
 [28:6..28:7): x <- types/Foo.x.
@@ -4020,22 +4500,17 @@ Occurrences:
 [29:17..29:18): x -> types/Foo.x.
 [32:7..32:11): Test <- types/Test.
 [33:8..33:9): M <- types/Test.M#
-[34:4..34:4): <- types/Test.M#`<init>`().
 [34:8..34:9): m <- types/Test.M#m().
 [34:11..34:14): Int -> scala/Int#
 [34:17..34:20): ??? -> scala/Predef.`???`().
 [37:8..37:9): N <- types/Test.N#
-[38:4..38:4): <- types/Test.N#`<init>`().
 [38:8..38:9): n <- types/Test.N#n().
 [38:11..38:14): Int -> scala/Int#
 [38:17..38:20): ??? -> scala/Predef.`???`().
 [41:8..41:9): C <- types/Test.C#
-[41:18..41:18): <- types/Test.C#`<init>`().
 [41:18..41:19): M -> types/Test.M#
-[41:19..41:19): -> types/Test.M#`<init>`().
 [42:8..42:9): p <- types/Test.C#p.
 [42:16..42:17): P -> types/P#
-[42:17..42:17): -> types/P#`<init>`().
 [43:8..43:9): x <- types/Test.C#x.
 [43:12..43:13): p -> types/Test.C#p.
 [43:14..43:15): x -> types/P#x.
@@ -4090,18 +4565,16 @@ Occurrences:
 [63:41..63:44): Int -> scala/Int#
 [63:49..63:52): ??? -> scala/Predef.`???`().
 [64:8..64:21): compoundType4 <- types/Test.C#compoundType4.
-[64:34..64:35): k <- local3
+[64:34..64:35): k <- local2
 [64:37..64:40): Int -> scala/Int#
 [64:43..64:46): ??? -> scala/Predef.`???`().
 [65:8..65:21): compoundType5 <- types/Test.C#compoundType5.
 [65:28..65:29): M -> types/Test.M#
-[65:29..65:29): -> types/Test.M#`<init>`().
 [65:35..65:36): N -> types/Test.N#
 [66:8..66:21): compoundType6 <- types/Test.C#compoundType6.
 [66:28..66:29): M -> types/Test.M#
-[66:29..66:29): -> types/Test.M#`<init>`().
 [66:35..66:36): N -> types/Test.N#
-[66:43..66:44): k <- local6
+[66:43..66:44): k <- local7
 [66:46..66:49): Int -> scala/Int#
 [66:52..66:55): ??? -> scala/Predef.`???`().
 [68:8..68:16): annType1 <- types/Test.C#annType1.
@@ -4125,18 +4598,15 @@ Occurrences:
 [75:20..75:21): M <- types/Test.C#typeLambda1().[M]
 [75:28..75:31): ??? -> scala/Predef.`???`().
 [76:4..76:15): typeLambda1 -> types/Test.C#typeLambda1().
-[76:24..76:25): L <- local7
-[76:26..76:27): T <- local8
+[76:24..76:25): L <- local11
+[76:26..76:27): T <- local10
 [76:31..76:35): List -> scala/package.List#
-[76:36..76:37): T -> local8
+[76:36..76:37): T -> local10
 [78:11..78:25): ClassInfoType1 <- types/Test.C#ClassInfoType1.
 [79:10..79:24): ClassInfoType2 <- types/Test.C#ClassInfoType2#
-[79:33..79:33): <- types/Test.C#ClassInfoType2#`<init>`().
 [79:33..79:34): B -> types/B#
-[79:34..79:34): -> types/B#`<init>`().
 [79:41..79:42): x <- types/Test.C#ClassInfoType2#x().
 [80:10..80:24): ClassInfoType3 <- types/Test.C#ClassInfoType3#
-[80:24..80:24): <- types/Test.C#ClassInfoType3#`<init>`().
 [80:25..80:26): T <- types/Test.C#ClassInfoType3#[T]
 [82:11..82:21): MethodType <- types/Test.C#MethodType.
 [83:10..83:12): x1 <- types/Test.C#MethodType.x1().
@@ -4169,7 +4639,6 @@ Occurrences:
 [92:25..92:28): Int -> scala/Int#
 [92:31..92:34): ??? -> scala/Predef.`???`().
 [95:15..95:27): RepeatedType <- types/Test.C#RepeatedType#
-[95:27..95:27): <- types/Test.C#RepeatedType#`<init>`().
 [95:28..95:29): s <- types/Test.C#RepeatedType#s.
 [95:31..95:37): String -> scala/Predef.String#
 [96:10..96:12): m1 <- types/Test.C#RepeatedType#m1().
@@ -4214,6 +4683,9 @@ Occurrences:
 [119:32..119:38): Option -> scala/Option#
 [119:39..119:42): Int -> scala/Int#
 
+Synthetics:
+[68:20..68:24):@ann => *[Int]
+
 expect/semanticdb-extract.scala
 -------------------------------
 
@@ -4223,27 +4695,28 @@ Uri => semanticdb-extract.scala
 Text => empty
 Language => Scala
 Symbols => 18 entries
-Occurrences => 22 entries
+Occurrences => 20 entries
+Synthetics => 3 entries
 
 Symbols:
-_empty_/AnObject. => final object AnObject
-_empty_/AnObject.Foo# => case class Foo
-_empty_/AnObject.Foo#_1(). => method _1
-_empty_/AnObject.Foo#`<init>`(). => primary ctor <init>
-_empty_/AnObject.Foo#`<init>`().(x) => val param x
-_empty_/AnObject.Foo#copy$default$1(). => method copy$default$1
-_empty_/AnObject.Foo#copy(). => method copy
-_empty_/AnObject.Foo#copy().(x) => param x
-_empty_/AnObject.Foo#x. => val method x
-_empty_/AnObject.Foo. => final object Foo
-_empty_/AnObject.Foo.apply(). => method apply
-_empty_/AnObject.Foo.apply().(x) => param x
-_empty_/AnObject.Foo.toString(). => method toString
-_empty_/AnObject.Foo.unapply(). => method unapply
-_empty_/AnObject.Foo.unapply().(x$1) => param x$1
-_empty_/AnObject.foo(). => method foo
-_empty_/AnObject.foo().(x) => param x
-_empty_/AnObject.foo(+1). => method foo
+_empty_/AnObject. => final object AnObject extends Object { self: AnObject.type => +6 decls }
+_empty_/AnObject.Foo# => case class Foo extends Object with Product with Serializable { self: Foo => +5 decls }
+_empty_/AnObject.Foo#_1(). => method _1 => Int
+_empty_/AnObject.Foo#`<init>`(). => primary ctor <init> (val param x: Int): Foo
+_empty_/AnObject.Foo#`<init>`().(x) => val param x: Int
+_empty_/AnObject.Foo#copy$default$1(). => method copy$default$1 => Int @uncheckedVariance
+_empty_/AnObject.Foo#copy(). => method copy (param x: Int): Foo
+_empty_/AnObject.Foo#copy().(x) => param x: Int
+_empty_/AnObject.Foo#x. => val method x Int
+_empty_/AnObject.Foo. => final object Foo extends Object { self: Foo.type => +4 decls }
+_empty_/AnObject.Foo.apply(). => method apply (param x: Int): Foo
+_empty_/AnObject.Foo.apply().(x) => param x: Int
+_empty_/AnObject.Foo.toString(). => method toString => String <: scala/Any#toString().
+_empty_/AnObject.Foo.unapply(). => method unapply (param x$1: Foo): Foo
+_empty_/AnObject.Foo.unapply().(x$1) => param x$1: Foo
+_empty_/AnObject.foo(). => method foo (param x: Int): Unit
+_empty_/AnObject.foo().(x) => param x: Int
+_empty_/AnObject.foo(+1). => method foo (): Unit
 
 Occurrences:
 [0:7..0:15): AnObject <- _empty_/AnObject.
@@ -4257,7 +4730,6 @@ Occurrences:
 [8:5..8:14): substring -> java/lang/String#substring().
 [9:5..9:14): substring -> java/lang/String#substring(+1).
 [11:2..11:6): List -> scala/package.List.
-[11:6..11:6): -> scala/collection/IterableFactory#apply().
 [12:2..12:6): List -> scala/package.List.
 [12:7..12:12): apply -> scala/collection/IterableFactory#apply().
 [13:2..13:6): List -> scala/package.List.
@@ -4265,10 +4737,14 @@ Occurrences:
 [14:2..14:9): println -> scala/Predef.println(+1).
 [14:12..14:13): + -> scala/Int#`+`(+4).
 [16:13..16:16): Foo <- _empty_/AnObject.Foo#
-[16:16..16:16): <- _empty_/AnObject.Foo#`<init>`().
 [16:17..16:18): x <- _empty_/AnObject.Foo#x.
 [16:20..16:23): Int -> scala/Int#
 
+Synthetics:
+[11:2..11:6):List => *.apply[Int]
+[12:2..12:12):List.apply => *[Nothing]
+[13:2..13:14):List.`apply` => *[Nothing]
+
 expect/toplevel.scala
 ---------------------
 
@@ -4278,30 +4754,30 @@ Uri => toplevel.scala
 Text => empty
 Language => Scala
 Symbols => 18 entries
-Occurrences => 42 entries
+Occurrences => 43 entries
+Synthetics => 2 entries
 
 Symbols:
-_empty_/MyProgram# => final class MyProgram
-_empty_/MyProgram#`<init>`(). => primary ctor <init>
-_empty_/MyProgram#main(). => static method main
-_empty_/MyProgram#main().(args) => param args
-_empty_/toplevel$package. => final package object _empty_
-_empty_/toplevel$package.MyProgram(). => method MyProgram
-_empty_/toplevel$package.MyProgram().(times) => param times
-_empty_/toplevel$package.a. => val method a
-_empty_/toplevel$package.combine(). => method combine
-_empty_/toplevel$package.combine().(x) => param x
-_empty_/toplevel$package.combine().(y) => param y
-_empty_/toplevel$package.combine(+1). => method combine
-_empty_/toplevel$package.combine(+1).(x) => param x
-_empty_/toplevel$package.combine(+1).(y) => param y
-_empty_/toplevel$package.combine(+1).(z) => param z
-_empty_/toplevel$package.combine(+2). => method combine
-_empty_/toplevel$package.foo(). => method foo
-local0 => val local error
+_empty_/MyProgram# => final class MyProgram extends Object { self: MyProgram => +2 decls }
+_empty_/readInts# => final class readInts extends Object { self: readInts => +2 decls }
+_empty_/toplevel$package. => final package object _empty_ extends Object { self: _empty_.type => +9 decls }
+_empty_/toplevel$package.MyProgram(). => @main method MyProgram (param times: Int): Unit
+_empty_/toplevel$package.MyProgram().(times) => param times: Int
+_empty_/toplevel$package.a. => val inline method a ""
+_empty_/toplevel$package.combine(). => method combine (param x: Int)(param y: Int): Int
+_empty_/toplevel$package.combine().(x) => param x: Int
+_empty_/toplevel$package.combine().(y) => param y: Int
+_empty_/toplevel$package.combine(+1). => method combine (param x: Int, param y: Int, param z: Int): Int
+_empty_/toplevel$package.combine(+1).(x) => param x: Int
+_empty_/toplevel$package.combine(+1).(y) => param y: Int
+_empty_/toplevel$package.combine(+1).(z) => param z: Int
+_empty_/toplevel$package.combine(+2). => method combine => Int
+_empty_/toplevel$package.foo(). => method foo => String
+_empty_/toplevel$package.fooRef(). => method fooRef => String
+_empty_/toplevel$package.readInts(). => @main method readInts (param ints: Int*): Unit
+_empty_/toplevel$package.readInts().(ints) => param ints: Int*
 
 Occurrences:
-[0:0..0:0): <- _empty_/toplevel$package.
 [0:11..0:12): a <- _empty_/toplevel$package.a.
 [1:11..1:12): x <- _empty_/toplevel$package.combine().(x)
 [1:14..1:17): Int -> scala/Int#
@@ -4325,22 +4801,28 @@ Occurrences:
 [2:46..2:47): z -> _empty_/toplevel$package.combine(+1).(z)
 [3:4..3:11): combine <- _empty_/toplevel$package.combine(+2).
 [4:4..4:7): foo <- _empty_/toplevel$package.foo().
-[5:0..5:0): <- _empty_/MyProgram#
-[5:0..5:0): <- _empty_/MyProgram#`<init>`().
-[5:0..5:0): -> _empty_/toplevel$package.MyProgram().
-[5:0..5:0): -> scala/util/CommandLineParser.parseArgument().
-[5:0..5:0): -> _empty_/MyProgram#main().(args)
-[5:0..5:0): -> scala/util/CommandLineParser.FromString.given_FromString_Int.
-[5:0..5:0): -> scala/util/CommandLineParser.showError().
-[5:0..5:0): -> local0
 [5:1..5:5): main -> scala/main#
 [5:10..5:19): MyProgram <- _empty_/toplevel$package.MyProgram().
 [5:20..5:25): times <- _empty_/toplevel$package.MyProgram().(times)
 [5:27..5:30): Int -> scala/Int#
 [5:33..5:37): Unit -> scala/Unit#
-[5:41..5:41): -> scala/LowPriorityImplicits#intWrapper().
 [5:43..5:45): to -> scala/runtime/RichInt#to().
 [5:46..5:51): times -> _empty_/toplevel$package.MyProgram().(times)
 [5:53..5:60): foreach -> scala/collection/immutable/Range#foreach().
 [5:67..5:74): println -> scala/Predef.println(+1).
+[6:1..6:5): main -> scala/main#
+[6:10..6:18): readInts <- _empty_/toplevel$package.readInts().
+[6:19..6:23): ints <- _empty_/toplevel$package.readInts().(ints)
+[6:25..6:28): Int -> scala/Int#
+[6:32..6:36): Unit -> scala/Unit#
+[6:39..6:46): println -> scala/Predef.println(+1).
+[6:47..6:51): ints -> _empty_/toplevel$package.readInts().(ints)
+[6:52..6:60): mkString -> scala/collection/IterableOnceOps#mkString(+1).
+[7:4..7:10): fooRef <- _empty_/toplevel$package.fooRef().
+[7:13..7:29): toplevel$package -> _empty_/toplevel$package.
+[7:30..7:33): foo -> _empty_/toplevel$package.foo().
+
+Synthetics:
+[5:40..5:60):(1 to times) foreach => *[Unit]
+[5:41..5:42):1 => intWrapper(*)
 
diff --git a/tests/sjs-junit/test/org/scalajs/testsuite/compiler/RegressionTestScala3.scala b/tests/sjs-junit/test/org/scalajs/testsuite/compiler/RegressionTestScala3.scala
index 4a7ccad3cc5a..08aa26726dc7 100644
--- a/tests/sjs-junit/test/org/scalajs/testsuite/compiler/RegressionTestScala3.scala
+++ b/tests/sjs-junit/test/org/scalajs/testsuite/compiler/RegressionTestScala3.scala
@@ -27,6 +27,38 @@ class RegressionTestScala3 {
     assertEquals("foo", new RangeErrorIssue11592("foo").message)
     assertEquals("", new RangeErrorIssue11592().message)
   }
+
+  @Test def testNonJVMCharsInClosureParametersIssue12507(): Unit = {
+    def foo(`[-3, 3]`: Int): Int => Int = { x =>
+      `[-3, 3]`
+    }
+
+    assertEquals(5, foo(5)(4))
+  }
+
+  @Test def defaultAccessorBridgesIssue12572(): Unit = {
+    new MyPromiseIssue12572[Int](5)
+  }
+
+  @Test def desugarIdentCrashIssue13221(): Unit = {
+    assertEquals(1, X_Issue13221.I.i)
+    assertEquals(1, X_Issue13221.blah)
+  }
+
+  @Test def primitivePlusStringThatIsATermRefIssue13518(): Unit = {
+    def charPlusString(x: String): String = 'a' + x
+    assertEquals("abc", charPlusString("bc"))
+
+    def intPlusString(x: String): String = 5 + x
+    assertEquals("5bc", intPlusString("bc"))
+  }
+
+  @Test def defaultParamsInModuleDefWithBridgesIssue13860(): Unit = {
+    import Issue13860._
+
+    assertEquals(0L, Foo.bar().x)
+    assertEquals(5L, Foo.bar(5L).x)
+  }
 }
 
 object RegressionTestScala3 {
@@ -45,6 +77,48 @@ object RegressionTestScala3 {
   class RangeErrorIssue11592(msg: String = js.native) extends js.Object {
     val message: String = js.native
   }
+
+  class MyPromiseIssue12572[T](t: T) extends js.Promise[T]((resolve, reject) => resolve(t)) {
+    override def `then`[S](
+        onFulfilled: js.Function1[T, S | js.Thenable[S]],
+        onRejected: js.UndefOr[js.Function1[scala.Any, S | js.Thenable[S]]] = js.undefined): js.Promise[S] = {
+      ???
+    }
+
+    override def `then`[S >: T](
+        onFulfilled: Unit,
+        onRejected: js.UndefOr[js.Function1[scala.Any, S | js.Thenable[S]]]): js.Promise[S] = {
+      ???
+    }
+
+    override def `catch`[S >: T](
+        onRejected: js.UndefOr[js.Function1[scala.Any, S | js.Thenable[S]]] = js.undefined): js.Promise[S] = {
+      ???
+    }
+  }
+
+  object X_Issue13221 extends Y_Issue13221 {
+    object I {
+      def i = 1
+    }
+  }
+
+  abstract class Y_Issue13221 { self: X_Issue13221.type =>
+    import I._
+    def blah = i
+  }
+
+  object Issue13860 {
+    class Foo(var x: Long)
+
+    trait Companion[A] {
+      def bar(x: Long = 0): A
+    }
+
+    object Foo extends Companion[Foo] {
+      def bar(x: Long = 0): Foo = new Foo(x)
+    }
+  }
 }
 
 // This class needs to be at the top-level, not in an object, to reproduce the issue
diff --git a/tests/sjs-junit/test/org/scalajs/testsuite/jsinterop/ExportedJSNativeMembersScala3.scala b/tests/sjs-junit/test/org/scalajs/testsuite/jsinterop/ExportedJSNativeMembersScala3.scala
new file mode 100644
index 000000000000..79d78d929578
--- /dev/null
+++ b/tests/sjs-junit/test/org/scalajs/testsuite/jsinterop/ExportedJSNativeMembersScala3.scala
@@ -0,0 +1,161 @@
+package org.scalajs.testsuite.jsinterop
+
+import org.junit.Assert.*
+import org.junit.Test
+
+import scala.scalajs.js
+import scala.scalajs.js.annotation.*
+
+object ExportedJSNativeMembersScala3:
+
+  object A {
+
+    @js.native
+    trait FooModule extends js.Any { self: Foo.type =>
+      val foo: String
+    }
+
+    @js.native
+    @JSGlobal("Foo_GlobalThatWillBeExported")
+    val Foo: FooModule = js.native
+
+    @js.native
+    @JSGlobal("Bar_GlobalThatWillBeExported")
+    object Bar extends js.Any {
+      val bar: Int = js.native
+    }
+
+    @js.native
+    @JSGlobal("Baz_GlobalThatWillBeExported")
+    final class Baz(var baz: String) extends js.Object
+
+    @js.native
+    @JSGlobal("QuxHolder_GlobalThatWillBeExported")
+    final class QuxHolder(val qux: String) extends js.Object
+
+    @js.native
+    @JSGlobal("QuxHolderHolder_GlobalThatWillBeExported")
+    final class QuxHolderHolder(val quxHolder: QuxHolder) extends js.Object {
+      val qux: quxHolder.qux.type = js.native
+    }
+
+    @js.native // structurally equivalent to QuxHolderHolder, but a trait
+    trait QuxHolderHolderTrait(val quxHolder: QuxHolder) extends js.Any {
+      val qux: quxHolder.qux.type
+    }
+
+    @js.native
+    @JSGlobal("quxxInstance_GlobalThatWillBeExported")
+    val quxxInstance: QuxHolderHolderTrait = js.native
+
+    @js.native
+    @JSGlobal("addOne_GlobalThatWillBeExported")
+    def addOne(i: Int): Int = js.native
+
+  }
+
+  object B extends js.Object {
+    export A.FooModule            // trait  (native)
+    export A.Foo                  // val    (native)
+    export A.Bar                  // object (native)
+    export A.Baz                  // class  (native)
+    export A.QuxHolder            // class  (native)
+    export A.QuxHolderHolder      // class  (native)
+    export A.QuxHolderHolderTrait // trait  (native)
+    export A.quxxInstance         // val    (native)
+    export A.addOne               // def    (native)
+  }
+
+  final class C extends js.Object {
+    export A.FooModule            // trait  (native)
+    export A.Foo                  // val    (native)
+    export A.Bar                  // object (native)
+    export A.Baz                  // class  (native)
+    export A.QuxHolder            // class  (native)
+    export A.QuxHolderHolder      // class  (native)
+    export A.QuxHolderHolderTrait // trait  (native)
+    export A.quxxInstance         // val    (native)
+    export A.addOne               // def    (native)
+  }
+
+class ExportedJSNativeMembersScala3:
+  import ExportedJSNativeMembersScala3.*
+
+  @Test def forward_top_level_JS_var_with_export(): Unit = {
+    js.eval("""
+      var Foo_GlobalThatWillBeExported = {
+        foo: "foo"
+      }
+      var Bar_GlobalThatWillBeExported = {
+        bar: 23
+      }
+      function Baz_GlobalThatWillBeExported(baz) {
+        this.baz = baz
+      }
+      function QuxHolder_GlobalThatWillBeExported(qux) {
+        this.qux = qux
+      }
+      function QuxHolderHolder_GlobalThatWillBeExported(quxHolder) {
+        this.quxHolder = quxHolder;
+        this.qux = quxHolder.qux;
+      }
+      var quxxInstance_GlobalThatWillBeExported = (
+        new QuxHolderHolder_GlobalThatWillBeExported(
+          new QuxHolder_GlobalThatWillBeExported("quxxInstance")
+        )
+      )
+      function addOne_GlobalThatWillBeExported(i) {
+        return i + 1;
+      }
+    """)
+
+    val C = ExportedJSNativeMembersScala3.C()
+
+    assertEquals("foo", A.Foo.foo)
+    assertEquals("foo", B.Foo.foo)
+    assertEquals("foo", C.Foo.foo)
+
+    assertEquals(23, A.Bar.bar)
+    assertEquals(23, B.Bar.bar)
+    assertEquals(23, C.Bar.bar)
+
+    val abaz = A.Baz("abaz1")
+    assertEquals("abaz1", abaz.baz)
+    abaz.baz = "abaz2"
+    assertEquals("abaz2", abaz.baz)
+
+    val bbaz = B.Baz("bbaz1")
+    assertEquals("bbaz1", bbaz.baz)
+    bbaz.baz = "bbaz2"
+    assertEquals("bbaz2", bbaz.baz)
+
+    val cbaz = C.Baz("cbaz1")
+    assertEquals("cbaz1", cbaz.baz)
+    cbaz.baz = "cbaz2"
+    assertEquals("cbaz2", cbaz.baz)
+
+    val quxHolderHolderA = A.QuxHolderHolder(A.QuxHolder("quxHolderHolderA"))
+    assertEquals("quxHolderHolderA", quxHolderHolderA.qux)
+    assertEquals("quxHolderHolderA", quxHolderHolderA.quxHolder.qux)
+
+    val quxHolderHolderB = B.QuxHolderHolder(B.QuxHolder("quxHolderHolderB"))
+    assertEquals("quxHolderHolderB", quxHolderHolderB.qux)
+    assertEquals("quxHolderHolderB", quxHolderHolderB.quxHolder.qux)
+
+    val quxHolderHolderC = C.QuxHolderHolder(C.QuxHolder("quxHolderHolderC"))
+    assertEquals("quxHolderHolderC", quxHolderHolderC.qux)
+    assertEquals("quxHolderHolderC", quxHolderHolderC.quxHolder.qux)
+
+    assertEquals("quxxInstance", A.quxxInstance.qux)
+    assertEquals("quxxInstance", A.quxxInstance.quxHolder.qux)
+    assertEquals("quxxInstance", B.quxxInstance.qux)
+    assertEquals("quxxInstance", B.quxxInstance.quxHolder.qux)
+    assertEquals("quxxInstance", C.quxxInstance.qux)
+    assertEquals("quxxInstance", C.quxxInstance.quxHolder.qux)
+
+    assertEquals(2, A.addOne(1))
+    assertEquals(3, B.addOne(2))
+    assertEquals(4, C.addOne(3))
+  }
+
+end ExportedJSNativeMembersScala3
diff --git a/tests/sjs-junit/test/org/scalajs/testsuite/jsinterop/PromiseMock.scala b/tests/sjs-junit/test/org/scalajs/testsuite/jsinterop/PromiseMock.scala
deleted file mode 100644
index 6764cdc7ac83..000000000000
--- a/tests/sjs-junit/test/org/scalajs/testsuite/jsinterop/PromiseMock.scala
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Scala.js (https://www.scala-js.org/)
- *
- * Copyright EPFL.
- *
- * Licensed under Apache License 2.0
- * (https://www.apache.org/licenses/LICENSE-2.0).
- *
- * See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
- */
-
-package org.scalajs.testsuite.jsinterop
-
-import scala.scalajs.js
-import scala.scalajs.js.annotation._
-import scala.scalajs.js.|
-
-import js.Thenable
-
-object PromiseMock {
-
-  @noinline
-  def withMockedPromise[A](body: (() => Unit) => A): A = {
-    val global = org.scalajs.testsuite.utils.JSUtils.globalObject
-
-    val oldPromise =
-      if (global.hasOwnProperty("Promise").asInstanceOf[Boolean]) Some(global.Promise)
-      else None
-
-    global.Promise = js.constructorOf[MockPromise[_]]
-    try {
-      body(MockPromise.processQueue _)
-    } finally {
-      oldPromise.fold {
-        js.special.delete(global, "Promise")
-      } { old =>
-        global.Promise = old
-      }
-    }
-  }
-
-  @noinline
-  def withMockedPromiseIfExists[A](body: (Option[() => Unit]) => A): A = {
-    val global = org.scalajs.testsuite.utils.JSUtils.globalObject
-
-    val oldPromise = global.Promise
-
-    if (js.isUndefined(oldPromise)) {
-      body(None)
-    } else {
-      global.Promise = js.constructorOf[MockPromise[_]]
-      try {
-        body(Some(MockPromise.processQueue _))
-      } finally {
-        global.Promise = oldPromise
-      }
-    }
-  }
-
-  private object MockPromise {
-    private val queue = js.Array[js.Function0[Any]]()
-
-    @JSExportStatic
-    def resolve[A](value: A | js.Thenable[A]): MockPromise[A] = {
-      new MockPromise[A]({
-        (resolve: js.Function1[A | js.Thenable[A], _],
-            reject: js.Function1[Any, _]) =>
-          resolve(value)
-      })
-    }
-
-    @JSExportStatic
-    def reject(reason: Any): MockPromise[Nothing] = {
-      new MockPromise[Nothing]({
-        (resolve: js.Function1[Nothing | js.Thenable[Nothing], _],
-            reject: js.Function1[Any, _]) =>
-          reject(reason)
-      })
-    }
-
-    def enqueue(f: js.Function0[Any]): Unit =
-      queue.push(f)
-
-    def processQueue(): Unit = {
-      while (queue.nonEmpty)
-        queue.shift()()
-    }
-
-    private sealed abstract class State[+A]
-
-    private case object Pending extends State[Nothing]
-    private case class Fulfilled[+A](value: A) extends State[A]
-    private case class Rejected(reason: Any) extends State[Nothing]
-
-    private def isNotAnObject(x: Any): Boolean = x match {
-      case null | () | _:Double | _:Boolean | _:String => true
-      case _                                           => false
-    }
-
-    private def isCallable(x: Any): Boolean =
-      js.typeOf(x.asInstanceOf[js.Any]) == "function"
-
-    private def throwAny(e: Any): Nothing = {
-      throw (e match {
-        case th: Throwable => th
-        case _             => js.JavaScriptException(e)
-      })
-    }
-
-    private def tryCatchAny[A](tryBody: => A)(catchBody: Any => A): A = {
-      try {
-        tryBody
-      } catch {
-        case th: Throwable =>
-          catchBody(th match {
-            case js.JavaScriptException(e) => e
-            case _                         => th
-          })
-      }
-    }
-  }
-
-  private class MockPromise[+A](
-      executor: js.Function2[js.Function1[A | Thenable[A], _], js.Function1[scala.Any, _], _])
-      extends js.Object with js.Thenable[A] {
-
-    import MockPromise._
-
-    private[this] var state: State[A] = Pending
-
-    private[this] var fulfillReactions = js.Array[js.Function1[A, Any]]()
-    private[this] var rejectReactions = js.Array[js.Function1[Any, Any]]()
-
-    init(executor)
-
-    // 25.4.3.1 Promise(executor)
-    private[this] def init(
-        executor: js.Function2[js.Function1[A | Thenable[A], _], js.Function1[scala.Any, _], _]) = {
-      tryCatchAny[Unit] {
-        executor(resolve _, reject _)
-      } { e =>
-        reject(e)
-      }
-    }
-
-    private[this] def fulfill(value: A): Unit = {
-      assert(state == Pending)
-      state = Fulfilled(value)
-      clearAndTriggerReactions(fulfillReactions, value)
-    }
-
-    private[this] def clearAndTriggerReactions[A](
-        reactions: js.Array[js.Function1[A, Any]],
-        argument: A): Unit = {
-
-      assert(state != Pending)
-
-      fulfillReactions = null
-      rejectReactions = null
-
-      for (reaction <- reactions)
-        enqueue(() => reaction(argument))
-    }
-
-    // 25.4.1.3.2 Promise Resolve Functions
-    private[this] def resolve(resolution: A | Thenable[A]): Unit = {
-      if (state == Pending) {
-        if (resolution.asInstanceOf[AnyRef] eq this) {
-          reject(new js.TypeError("Self resolution"))
-        } else if (isNotAnObject(resolution)) {
-          fulfill(resolution.asInstanceOf[A])
-        } else {
-          tryCatchAny {
-            val thenAction = resolution.asInstanceOf[js.Dynamic].`then`
-            if (!isCallable(thenAction)) {
-              fulfill(resolution.asInstanceOf[A])
-            } else {
-              val thenable = resolution.asInstanceOf[Thenable[A]]
-              val thenActionFun = thenAction.asInstanceOf[js.Function]
-              enqueue(() => promiseResolveThenableJob(thenable, thenActionFun))
-            }
-          } { e =>
-            reject(e)
-          }
-        }
-      }
-    }
-
-    // 25.4.2.2 PromiseResolveThenableJob
-    private[this] def promiseResolveThenableJob(thenable: Thenable[A],
-        thenAction: js.Function): Unit = {
-      thenAction.call(thenable, resolve _, reject _)
-    }
-
-    // 25.4.1.3.1 Promise Reject Functions
-    private[this] def reject(reason: Any): Unit = {
-      if (state == Pending) {
-        state = Rejected(reason)
-        clearAndTriggerReactions(rejectReactions, reason)
-      }
-    }
-
-    // 25.4.5.3 Promise.prototype.then
-    def `then`[B](
-        onFulfilled: js.Function1[A, B | Thenable[B]],
-        onRejected: js.UndefOr[js.Function1[scala.Any, B | Thenable[B]]]): MockPromise[B] = {
-
-      new MockPromise[B](
-        { (innerResolve: js.Function1[B | Thenable[B], _],
-            innerReject: js.Function1[scala.Any, _]) =>
-
-          def doFulfilled(value: A): Unit = {
-            tryCatchAny[Unit] {
-              innerResolve(onFulfilled(value))
-            } { e =>
-              innerReject(e)
-            }
-          }
-
-          def doRejected(reason: Any): Unit = {
-            tryCatchAny[Unit] {
-              onRejected.fold[Unit] {
-                innerReject(reason)
-              } { onRejectedFun =>
-                innerResolve(onRejectedFun(reason))
-              }
-            } { e =>
-              innerReject(e)
-            }
-          }
-
-          state match {
-            case Pending =>
-              fulfillReactions += doFulfilled _
-              rejectReactions += doRejected _
-
-            case Fulfilled(value) =>
-              enqueue(() => doFulfilled(value))
-
-            case Rejected(reason) =>
-              enqueue(() => doRejected(reason))
-          }
-        }
-      )
-    }
-
-    def `then`[B >: A](
-        onFulfilled: Unit,
-        onRejected: js.UndefOr[js.Function1[scala.Any, B | Thenable[B]]]): MockPromise[B] = {
-      `then`((x: A) => (x: B | Thenable[B]), onRejected)
-    }
-
-    // 25.4.5.1 Promise.prototype.catch
-    def `catch`[B >: A](
-        onRejected: js.UndefOr[js.Function1[scala.Any, B | Thenable[B]]]): MockPromise[B] = {
-      `then`((), onRejected)
-    }
-  }
-}
diff --git a/tests/untried/neg/t5702-neg-bad-and-wild.check b/tests/untried/neg/t5702-neg-bad-and-wild.check
deleted file mode 100644
index a52136dbf889..000000000000
--- a/tests/untried/neg/t5702-neg-bad-and-wild.check
+++ /dev/null
@@ -1,28 +0,0 @@
-t5702-neg-bad-and-wild.scala:10: error: bad simple pattern: bad use of _* (a sequence pattern must be the last pattern)
-      case List(1, _*,) => // bad use of _* (a sequence pattern must be the last pattern)
-                     ^
-t5702-neg-bad-and-wild.scala:10: error: illegal start of simple pattern
-      case List(1, _*,) => // bad use of _* (a sequence pattern must be the last pattern)
-                      ^
-t5702-neg-bad-and-wild.scala:12: error: illegal start of simple pattern
-      case List(1, _*3,) => // illegal start of simple pattern
-                       ^
-t5702-neg-bad-and-wild.scala:14: error: bad simple pattern: use _* to match a sequence
-      case List(1, x*) => // use _* to match a sequence
-                     ^
-t5702-neg-bad-and-wild.scala:15: error: bad simple pattern: trailing * is not a valid pattern
-      case List(x*, 1) => // trailing * is not a valid pattern
-                  ^
-t5702-neg-bad-and-wild.scala:16: error: bad simple pattern: trailing * is not a valid pattern
-      case (1, x*) => // trailing * is not a valid pattern
-                 ^
-t5702-neg-bad-and-wild.scala:17: error: bad simple pattern: bad use of _* (sequence pattern not allowed)
-      case (1, x@_*) => // bad use of _* (sequence pattern not allowed)
-                   ^
-t5702-neg-bad-and-wild.scala:23: error: bad simple pattern: bad use of _* (a sequence pattern must be the last pattern)
-    val K(ns @ _*, x) = k // bad use of _* (a sequence pattern must be the last pattern)
-                 ^
-t5702-neg-bad-and-wild.scala:24: error: bad simple pattern: bad use of _* (sequence pattern not allowed)
-    val (b, _ * ) = (5,6) // bad use of _* (sequence pattern not allowed)
-                ^
-9 errors found
diff --git a/tests/untried/neg/t5702-neg-bad-brace.check b/tests/untried/neg/t5702-neg-bad-brace.check
deleted file mode 100644
index 503f7d95edc1..000000000000
--- a/tests/untried/neg/t5702-neg-bad-brace.check
+++ /dev/null
@@ -1,10 +0,0 @@
-t5702-neg-bad-brace.scala:14: error: Unmatched closing brace '}' ignored here
-      case List(1, _*} =>
-                     ^
-t5702-neg-bad-brace.scala:14: error: illegal start of simple pattern
-      case List(1, _*} =>
-                       ^
-t5702-neg-bad-brace.scala:15: error: ')' expected but '}' found.
-    }
-    ^
-three errors found
diff --git a/tests/untried/neg/t5702-neg-bad-brace.scala b/tests/untried/neg/t5702-neg-bad-brace.scala
deleted file mode 100644
index 16a341cf8c17..000000000000
--- a/tests/untried/neg/t5702-neg-bad-brace.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-
-object Test {
-
-  def main(args: Array[String]) {
-    val is = List(1,2,3)
-
-    is match {
-// the erroneous brace is ignored, so we can't halt on it.
-// maybe brace healing can detect overlapping unmatched (...}
-// In this case, the fix emits an extra error:
-// t5702-neg-bad-brace.scala:10: error: Unmatched closing brace '}' ignored here
-// t5702-neg-bad-brace.scala:10: error: illegal start of simple pattern (i.e., =>)
-// t5702-neg-bad-brace.scala:11: error: ')' expected but '}' found.
-      case List(1, _*} =>
-    }
-  }
-}