mac: add new scripts and category for services

Fix YAML error for site release in CI/CD
Fix the syntax error in the GitHub action script that was caused by improper multi-line YAML notation. This correction ensures the action can successfully parse and execute.
2023-10-19 01:21:03 +02:00 · 2023-10-19 00:45:23 +02:00 · 2023-10-18 16:44:49 +02:00 · 2023-10-17 13:56:32 +02:00 · 2023-10-16 18:42:29 +02:00 · 2023-10-16 02:06:19 +02:00
174 changed files with 13779 additions and 8782 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,3 +5,7 @@ end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
 max_line_length = 100
+
+[{Dockerfile}]
+indent_style = space
+indent_size = 4
--- a/.github/actions/npm-install-dependencies/action.yml
+++ b/.github/actions/npm-install-dependencies/action.yml
@@ -8,4 +8,5 @@ runs:
    -
      name: Run `npm ci` with retries
      shell: bash
-      run: npm run install-deps -- --ci --root-directory "${{ inputs.working-directory }}"
+      run: npm run install-deps -- --ci
+      working-directory: ${{ inputs.working-directory }}
--- a/.github/actions/setup-node/action.yml
+++ b/.github/actions/setup-node/action.yml
@@ -3,6 +3,6 @@ runs:
  steps:
    -
      name: Setup node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
      with:
        node-version: 16.x
--- a/.github/workflows/checks.build.yaml
+++ b/.github/workflows/checks.build.yaml
@@ -1,4 +1,4 @@
-name: build-checks
+name: checks.build

 on:
  push:
@@ -21,7 +21,7 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      -
        name: Setup node
        uses: ./.github/actions/setup-node
@@ -49,7 +49,7 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      -
        name: Setup node
        uses: ./.github/actions/setup-node
@@ -68,3 +68,33 @@ jobs:
      -
        name: Verify bundled desktop build artifacts
        run: npm run check:verify-build-artifacts -- --electron-bundled
+
+  build-docker:
+    strategy:
+      matrix:
+        os: [ macos, ubuntu ] # Windows runners do not support Linux containers
+      fail-fast: false # Allows to see results from other combinations
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Install Docker on macOS
+        if: matrix.os == 'macos' # macOS runner is missing Docker
+        run: |-
+          # Install Docker
+          brew install docker
+          # Docker on macOS misses daemon due to licensing, so install colima as runtime
+          brew install colima
+          # Start the daemon
+          colima start
+      -
+        name: Build Docker image
+        run: docker build -t undergroundwires/privacy.sexy:latest .
+      -
+        name: Run Docker image on port 8080
+        run: docker run -d -p 8080:80 --rm --name privacy.sexy undergroundwires/privacy.sexy:latest
+      -
+        name: Check server is up and returns HTTP 200
+        run: node ./scripts/verify-web-server-status.js --url http://localhost:8080
--- a/.github/workflows/checks.desktop-runtime-errors.yaml
+++ b/.github/workflows/checks.desktop-runtime-errors.yaml
@@ -15,7 +15,7 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      -
        name: Setup node
        uses: ./.github/actions/setup-node
--- a/.github/workflows/checks.external-urls.yaml
+++ b/.github/workflows/checks.external-urls.yaml
@@ -10,7 +10,7 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      -
        name: Setup node
        uses: ./.github/actions/setup-node
--- a/.github/workflows/checks.quality.yaml
+++ b/.github/workflows/checks.quality.yaml
@@ -18,7 +18,7 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      -
        name: Setup node
        uses: ./.github/actions/setup-node
--- a/.github/workflows/checks.scripts.yaml
+++ b/.github/workflows/checks.scripts.yaml
@@ -14,7 +14,7 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      -
        name: Setup node
        uses: ./.github/actions/setup-node
@@ -42,7 +42,7 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      -
        name: Setup node
        uses: ./.github/actions/setup-node
--- a/.github/workflows/checks.security.dependencies.yaml
+++ b/.github/workflows/checks.security.dependencies.yaml
@@ -1,4 +1,4 @@
-name: security-checks
+name: checks.security.dependencies

 on:
  push:
@@ -13,7 +13,7 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      -
        name: Setup node
        uses: ./.github/actions/setup-node
--- a/.github/workflows/checks.security.sast.yaml
+++ b/.github/workflows/checks.security.sast.yaml
@@ -0,0 +1,42 @@
+name: checks.security.sast
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 0 * * 0' # at 00:00 on every Sunday
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [
+          javascript # analyzes code written in JavaScript, TypeScript and both.
+        ]
+
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+      -
+        name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+      -
+        name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"
--- a/.github/workflows/release.desktop.yaml
+++ b/.github/workflows/release.desktop.yaml
@@ -14,7 +14,7 @@ jobs:
    runs-on: ${{ matrix.os }}-latest
    steps:
      -
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
        with:
          ref: master # otherwise it defaults to the version tag missing bump commit
          fetch-depth: 0 # fetch all history
--- a/.github/workflows/release.site.yaml
+++ b/.github/workflows/release.site.yaml
@@ -10,7 +10,7 @@ jobs:
    steps:
      -
        name: "Infrastructure: Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
        with:
          path: aws
          repository: undergroundwires/aws-static-site-with-cd
@@ -75,7 +75,7 @@ jobs:
        working-directory: aws
      -
        name: "App: Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
        with:
          path: app
          ref: master # otherwise we don't get version bump commit
@@ -84,7 +84,7 @@ jobs:
        uses: ./app/.github/actions/setup-node
      -
        name: "App: Install dependencies"
-        uses: ./.github/actions/npm-install-dependencies
+        uses: ./app/.github/actions/npm-install-dependencies
        with:
          working-directory: app
      -
@@ -102,7 +102,7 @@ jobs:
      -
        name: "App: Deploy to S3"
        shell: bash
-        run: >-
+        run: |-
          declare web_output_dir
          if ! web_output_dir=$(cd app && node scripts/print-dist-dir.js --web); then
            echo 'Error: Could not determine distribution directory.'
--- a/.github/workflows/tests.e2e.yaml
+++ b/.github/workflows/tests.e2e.yaml
@@ -14,7 +14,7 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      -
        name: Setup node
        uses: ./.github/actions/setup-node
--- a/.github/workflows/tests.integration.yaml
+++ b/.github/workflows/tests.integration.yaml
@@ -16,7 +16,7 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      -
        name: Setup node
        uses: ./.github/actions/setup-node
--- a/.github/workflows/tests.unit.yaml
+++ b/.github/workflows/tests.unit.yaml
@@ -14,7 +14,7 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      -
        name: Set-up node
        uses: ./.github/actions/setup-node
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,61 @@
 # Changelog

+## 0.12.5 (2023-10-13)
+
+* Fix Docker build and improve checks #220 | [7669985](https://github.com/undergroundwires/privacy.sexy/commit/7669985f8e1446e726a95626ecf35b3ce6b60a16)
+* Add SAST security checks with SECURITY.md #178 | [3e5239f](https://github.com/undergroundwires/privacy.sexy/commit/3e5239f7d35e57749c01adf3dbbcd365aebb39c8)
+* Add Scoop download instructions #174 | [cf55ca9](https://github.com/undergroundwires/privacy.sexy/commit/cf55ca9e28b064fa7a516077a9da23e3a8e3f534)
+* win: fix and improve temp dir cleanup #176, #89 | [d457504](https://github.com/undergroundwires/privacy.sexy/commit/d45750428cca010daf2721b33a8ae3a01b28813b)
+* win, linux: improve VSCode setting robustness #196 | [e8a52f7](https://github.com/undergroundwires/privacy.sexy/commit/e8a52f717dc799b34ceeb1c27c2b8219391dff6a)
+* linux: fix obsolete Firefox DPI script #239 | [e5f6edf](https://github.com/undergroundwires/privacy.sexy/commit/e5f6edf405bcec7c29ea4d7932d1910620fa15f8)
+* win: add removal of Edge assocations #64 | [888c916](https://github.com/undergroundwires/privacy.sexy/commit/888c9166fc66a2094137fa8be739cc21bafef5f6)
+* win: improve Edge & OneDrive shortcut removal #73 | [8501495](https://github.com/undergroundwires/privacy.sexy/commit/8501495c170af61913288a63dbd369db5bbc5003)
+* win: relocate and document SecHealthUI #190 | [2862951](https://github.com/undergroundwires/privacy.sexy/commit/286295128d0179358e0c6b7b6415d752175a1aed)
+* Add developer toolkit UI component | [2147eae](https://github.com/undergroundwires/privacy.sexy/commit/2147eae687b82d05bc43bb4605d9068f148bb92a)
+* win: fix and improve network data usage reset #265 | [5e359c2](https://github.com/undergroundwires/privacy.sexy/commit/5e359c2fb82a08e6acf7159b70ca86a8234b359b)
+* win: improve app reversion and docs #260 | [a3f11df](https://github.com/undergroundwires/privacy.sexy/commit/a3f11dff187c821a00910c20dac05e285cda9073)
+* Fix working directory in CI/CD web release | [698b570](https://github.com/undergroundwires/privacy.sexy/commit/698b570ee6e300d6703015464f4345b5e706f1cb)
+* Implement new UI component for icons #230 | [48730bc](https://github.com/undergroundwires/privacy.sexy/commit/48730bca0506120bca4bf3a23545d59f2b1a9009)
+* win: fix and improve AppCompat disabling #255 | [bab6316](https://github.com/undergroundwires/privacy.sexy/commit/bab6316e7625230cf4a4cf67c3aca417347db75c)
+* win, linux, mac: fix typos and improve naming | [67c3677](https://github.com/undergroundwires/privacy.sexy/commit/67c3677621b201525a813e8a26f07d607176e89b)
+
+[compare](https://github.com/undergroundwires/privacy.sexy/compare/0.12.4...0.12.5)
+
+## 0.12.4 (2023-09-25)
+
+* win: fix Windows spotlight revert, docs, recommend | [659fea7](https://github.com/undergroundwires/privacy.sexy/commit/659fea7afcabcd0ea273cfdcc8c4bae190c126f3)
+* win: fix Edge telemetry disabling for v116+ #242 | [6d301f9](https://github.com/undergroundwires/privacy.sexy/commit/6d301f99616ed49975876803d0098eafe4d3cb2e)
+* win: fix, improve disabling automatic updates #252 | [6e9b65d](https://github.com/undergroundwires/privacy.sexy/commit/6e9b65d8b1b481c1471dde90876c37838b4ac4e5)
+* win: refactor `update.mode` key for VSCode #215 | [c27172c](https://github.com/undergroundwires/privacy.sexy/commit/c27172c32e7c316b7cb0f44cab611eed89ca034e)
+* Fix wrong action path in website CI deployment | [a1f2497](https://github.com/undergroundwires/privacy.sexy/commit/a1f24973813ccbdd7e1f06c64e1912a991a6bb64)
+* Fix compiler bug with nested optional arguments | [53222fd](https://github.com/undergroundwires/privacy.sexy/commit/53222fd83c2846089746a217482195806f960d18)
+* Fix no spacing after lists in documentation text | [f810ed0](https://github.com/undergroundwires/privacy.sexy/commit/f810ed0c147c2a46cae3b70b635ed81128646fff)
+* Rewrite tooltip UI for efficiency and Vue 3.0 #230 | [8b930fc](https://github.com/undergroundwires/privacy.sexy/commit/8b930fc57c8ee6691ed6165bcb27d97e64a1a0c0)
+* win: fix uninstallation of newer Edge #236 | [60dde11](https://github.com/undergroundwires/privacy.sexy/commit/60dde11311a2409537f5965f370b0daaaec53339)
+* win: fix delivery optimization side-effects #173 | [203daeb](https://github.com/undergroundwires/privacy.sexy/commit/203daeb4a2fca0a0295cbc2a736394f9f87725e6)
+* win: fix Defender scan artifacts removal #246 | [cb21a97](https://github.com/undergroundwires/privacy.sexy/commit/cb21a970b6b867e1476a5eb8a72b9a7fdd53a744)
+* Fix outdated and broken links in README #161 | [0303ef2](https://github.com/undergroundwires/privacy.sexy/commit/0303ef2fd98b36306523e2a0c5f5ae812a4c6c99)
+* Fix loss of tree node state when switching views | [8f188ac](https://github.com/undergroundwires/privacy.sexy/commit/8f188acd3c2d93e40c89569c74bc5cff992f0052)
+* Fix slow appearance of nodes on tree view | [bd2082e](https://github.com/undergroundwires/privacy.sexy/commit/bd2082e8c574db065bb4462f30ea3ace2cb028cb)
+
+[compare](https://github.com/undergroundwires/privacy.sexy/compare/0.12.3...0.12.4)
+
+## 0.12.3 (2023-09-09)
+
+* linux: use user.js over prefs.js for Firefox #232 | [dae6d11](https://github.com/undergroundwires/privacy.sexy/commit/dae6d114daab6857d773071211eb57619b136281)
+* win: fix typo in Defender retention script #213 | [35be05d](https://github.com/undergroundwires/privacy.sexy/commit/35be05df2094ea8bba4ee4725e6fa4956a79493d)
+* Improve desktop runtime execution tests | [ad0576a](https://github.com/undergroundwires/privacy.sexy/commit/ad0576a752f8fd6ea2f917a59173fe61f9951246)
+* Fix Windows artifact naming in desktop packaging | [f4d86fc](https://github.com/undergroundwires/privacy.sexy/commit/f4d86fccfd0e73e94c8c6e400a33514900bc5abe)
+* Refactor and improve external URL checks | [19e42c9](https://github.com/undergroundwires/privacy.sexy/commit/19e42c9c52a18c813ded4265e687e01032cdd4c8)
+* Fix memory leaks via auto-unsubscribing and DI | [eb096d0](https://github.com/undergroundwires/privacy.sexy/commit/eb096d07e276e1b4c8040220c47f186d02841e14)
+* Refactor build configs and improve CI/CD checks | [0a2a1a0](https://github.com/undergroundwires/privacy.sexy/commit/0a2a1a026b0efb29624be82b06536c518c1ea439)
+* Introduce retry mechanism for npm install in CI/CD | [4beb1bb](https://github.com/undergroundwires/privacy.sexy/commit/4beb1bb5748a60886210187ca3cdc7f4b41067c0)
+* win: fix disable recent apps revert #211, #248 | [4ce327e](https://github.com/undergroundwires/privacy.sexy/commit/4ce327eb6af542ed2916d649553e5e1ba5833882)
+* Change license to AGPLv3 | [821cc62](https://github.com/undergroundwires/privacy.sexy/commit/821cc62c4c8347cb76d041f82f574754e4d948c5)
+* Introduce new TreeView UI component | [65f121c](https://github.com/undergroundwires/privacy.sexy/commit/65f121c451af87315e1c91df4198562e0445b2c2)
+
+[compare](https://github.com/undergroundwires/privacy.sexy/compare/0.12.2...0.12.3)
+
 ## 0.12.2 (2023-08-25)

 * Add automated checks for desktop app runtime #233 | [04b3133](https://github.com/undergroundwires/privacy.sexy/commit/04b3133500485d0d278a81a177a1677134131405)
--- a/17
+++ b/17
@@ -1,13 +1,16 @@
 # Build
-FROM node:lts-alpine as build-stage
+FROM node:lts-alpine AS build-stage
 WORKDIR /app
-COPY package*.json ./
-RUN npm install
 COPY . .
-RUN npm run build
+RUN npm run install-deps
+RUN npm run build \
+    && npm run check:verify-build-artifacts -- --web
+RUN mkdir /dist \
+    && dist_directory=$(node 'scripts/print-dist-dir.js' --web) \
+    && cp -a "${dist_directory}/." '/dist'

 # Production stage
-FROM nginx:stable-alpine as production-stage
-COPY --from=build-stage /app/dist /usr/share/nginx/html
+FROM nginx:stable-alpine AS production-stage
+COPY --from=build-stage /dist /usr/share/nginx/html
 EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]
--- a/README.md
+++ b/README.md
@@ -16,14 +16,6 @@
      src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat"
    />
  </a>
-  <!-- Code quality -->
-  <br />
-  <a href="https://lgtm.com/projects/g/undergroundwires/privacy.sexy/context:javascript" target="_blank" rel="noopener noreferrer">
-    <img
-      alt="Language grade: JavaScript/TypeScript"
-      src="https://img.shields.io/lgtm/grade/javascript/g/undergroundwires/privacy.sexy.svg?logo=lgtm&logoWidth=18"
-    />
-  </a>
  <a href="https://codeclimate.com/github/undergroundwires/privacy.sexy/maintainability" target="_blank" rel="noopener noreferrer">
    <img
      alt="Maintainability"
@@ -50,6 +42,20 @@
      src="https://github.com/undergroundwires/privacy.sexy/workflows/e2e-tests/badge.svg"
    />
  </a>
+  <!-- Security checks -->
+  <br />
+  <a href="https://github.com/undergroundwires/privacy.sexy/actions/workflows/checks.security.sast.yaml" target="_blank" rel="noopener noreferrer">
+    <img
+      alt="Status of dependency security checks"
+      src="https://github.com/undergroundwires/privacy.sexy/workflows/checks.security.sast/badge.svg"
+    />
+  </a>
+  <a href="https://github.com/undergroundwires/privacy.sexy/actions/workflows/checks.security.dependencies.yaml" target="_blank" rel="noopener noreferrer">
+    <img
+      alt="Status of Static Analysis Security Testing (SAST)"
+      src="https://github.com/undergroundwires/privacy.sexy/workflows/checks.security.dependencies/badge.svg"
+    />
+  </a>
  <!-- Checks -->
  <br />
  <a href="https://github.com/undergroundwires/privacy.sexy/actions/workflows/checks.quality.yaml" target="_blank" rel="noopener noreferrer">
@@ -58,16 +64,10 @@
      src="https://github.com/undergroundwires/privacy.sexy/workflows/quality-checks/badge.svg"
    />
  </a>
-  <a href="https://github.com/undergroundwires/privacy.sexy/actions/workflows/checks.security.yaml" target="_blank" rel="noopener noreferrer">
-    <img
-      alt="Security checks status"
-      src="https://github.com/undergroundwires/privacy.sexy/workflows/security-checks/badge.svg"
-    />
-  </a>
  <a href="https://github.com/undergroundwires/privacy.sexy/actions/workflows/checks.build.yaml" target="_blank" rel="noopener noreferrer">
    <img
-      alt="Build checks status"
-      src="https://github.com/undergroundwires/privacy.sexy/workflows/build-checks/badge.svg"
+      alt="Status of build checks"
+      src="https://github.com/undergroundwires/privacy.sexy/workflows/checks.build/badge.svg"
    />
  </a>
  <a href="https://github.com/undergroundwires/privacy.sexy/actions/workflows/checks.desktop-runtime-errors.yaml" target="_blank" rel="noopener noreferrer">
@@ -122,7 +122,7 @@
 ## Get started

 - 🌍️ **Online**: [https://privacy.sexy](https://privacy.sexy).
- 🖥️ **Offline**: Check [releases page](https://github.com/undergroundwires/privacy.sexy/releases), or download directly for: [Windows](https://github.com/undergroundwires/privacy.sexy/releases/download/0.11.2/privacy.sexy-Setup-0.11.2.exe), [macOS](https://github.com/undergroundwires/privacy.sexy/releases/download/0.11.2/privacy.sexy-0.11.2.dmg), [Linux](https://github.com/undergroundwires/pr.vacy.sexy/releases/download/0.11.2/privacy.sexy-0.11.2.AppImage).
+- 🖥️ **Offline**: Download directly for: [Windows](https://github.com/undergroundwires/privacy.sexy/releases/download/0.12.5/privacy.sexy-Setup-0.12.5.exe), [macOS](https://github.com/undergroundwires/privacy.sexy/releases/download/0.12.5/privacy.sexy-0.12.5.dmg), [Linux](https://github.com/undergroundwires/privacy.sexy/releases/download/0.12.5/privacy.sexy-0.12.5.AppImage). For more options, see [here](#additional-install-options).

 Online version does not require to run any software on your computer. Offline version has more functions such as running the scripts directly.

@@ -150,6 +150,16 @@ Online version does not require to run any software on your computer. Offline ve

 **Contribute 👷**. Contributions of any type are welcome. See [CONTRIBUTING.md](./CONTRIBUTING.md) as the starting point. It includes useful information like [how to add new scripts](./CONTRIBUTING.md#extend-scripts).

+## Additional Install Options
+
+- Check the [releases page](https://github.com/undergroundwires/privacy.sexy/releases) for all available versions.
+- Using [Scoop](https://scoop.sh/#/apps?q=privacy.sexy&s=2&d=1&o=true) package manager on Windows:
+
+  ```powershell
+    scoop bucket add extras
+    scoop install privacy.sexy
+  ```
+
 ## Development

 Refer to [development.md](./docs/development.md) for Docker usage and reading more about setting up your development environment.
@@ -157,3 +167,7 @@ Refer to [development.md](./docs/development.md) for Docker usage and reading mo
 Check [architecture.md](./docs/architecture.md) for an overview of design and how different parts and layers work together. You can refer to [application.md](./docs/application.md) for a closer look at application layer codebase and [presentation.md](./docs/presentation.md) for code related to GUI layer. [collection-files.md](./docs/collection-files.md) explains the YAML files that are the core of the application and [templating.md](./docs/templating.md) documents how to use templating language in those files. In [ci-cd.md](./docs/ci-cd.md), you can read more about the pipelines that automates maintenance tasks and ensures you get what see.

 [docs/](./docs/) folder includes all other documentation.
+
+## Security
+
+Security is a top priority at privacy.sexy. An extensive commitment to security verification ensures this priority. For any security concerns or vulnerabilities, please consult the [Security Policy](./SECURITY.md).
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,31 @@
+# Security Policy
+
+privacy.sexy takes security seriously. Commitment is made to address all security issues with urgency. Responsible reporting of any discovered vulnerabilities in the project is highly encouraged.
+
+## Reporting a Vulnerability
+
+Efforts to responsibly disclose findings are greatly appreciated. To report a security vulnerability, follow these steps:
+
+- For general vulnerabilities, [open an issue](https://github.com/undergroundwires/privacy.sexy/issues/new/choose) using the bug report template.
+- For sensitive matters, [contact the developer directly](https://undergroundwires.dev).
+
+## Security Report Handling
+
+Upon receipt of a security report, the following actions will be taken:
+
+- The report will be confirmed, identifying the affected components.
+- The impact and severity of the issue will be assessed.
+- Work on a fix and plan a release to address the vulnerability will be initiated.
+- The reporter will be kept updated about the progress.
+
+## Testing
+
+Regular and extensive testing is conducted to ensure robust security in the project. Information about testing practices can be found in the [Testing Documentation](./docs/tests.md).
+
+## Support
+
+For additional assistance or any unanswered questions, [submit a GitHub issue](https://github.com/undergroundwires/privacy.sexy/issues/new/choose). Security concerns are a priority, and necessary support to address them is assured.
+
+---
+
+Active contribution to the safety and security of privacy.sexy is thanked. This collaborative effort keeps the project resilient and trustworthy for all.
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -6,7 +6,10 @@ const CYPRESS_BASE_DIR = 'tests/e2e/';
 export default defineConfig({
  fixturesFolder: `${CYPRESS_BASE_DIR}/fixtures`,
  screenshotsFolder: `${CYPRESS_BASE_DIR}/screenshots`,
+
+  video: true,
  videosFolder: `${CYPRESS_BASE_DIR}/videos`,
+
  e2e: {
    baseUrl: `http://localhost:${ViteConfig.server.port}/`,
    specPattern: `${CYPRESS_BASE_DIR}/**/*.cy.{js,jsx,ts,tsx}`, // Default: cypress/e2e/**/*.cy.{js,jsx,ts,tsx}
--- a/docs/collection-files.md
+++ b/docs/collection-files.md
@@ -174,3 +174,19 @@
 - `endCode:` *`string`* (**required**)
  - Code that'll be inserted at the end of user created script.
  - Global variables such as `$homepage`, `$version`, `$date` can be used using [parameter substitution](./templating.md#parameter-substitution) code syntax such as `Welcome to {{ $homepage }}!`
+
+## Naming guidelines
+
+- Prioritize consistency throughout all names.
+- Use an instruction format like "do this, do that" for clear, direct guidance. This approach reduces potential confusion and offers easy-to-follow steps. It provides specific, unambiguous instructions.
+- Ensure brand names adhere to their official casing.
+- Choose clear and uncomplicated language.
+- Favor the terms:
+  - "Disable" over "Turn off"
+  - "Configure" over "Set up"
+  - "Clear" over "Erase" or "Clean"
+  - "Minimize" over "Limit" or "Reduce" (when it enhances clarity)
+  - "Remove" over "Uninstall"
+- Structure your phrases for clarity.
+  - For instance, "Disable XX telemetry" or "Clear XX data" are preferred over "Clear data from XX", "Disable telemetry in XX", or "Clear data of XX".
+- Use sentence case rather than Title Case.
--- a/docs/development.md
+++ b/docs/development.md
@@ -60,6 +60,7 @@ See [ci-cd.md](./ci-cd.md) for more information.

 1. Build: `docker build -t undergroundwires/privacy.sexy:latest .`
 2. Run: `docker run -it -p 8080:80 --rm --name privacy.sexy undergroundwires/privacy.sexy:latest`
+3. Application should be available at [`http://localhost:8080`](http://localhost:8080)

 ### Building

@@ -81,11 +82,12 @@ See [ci-cd.md](./ci-cd.md) for more information.

 #### Automation scripts

- [**`node scripts/print-dist-dir.js [-- <options>]`**](../scripts/print-dist-dir.js):
+- [**`node scripts/print-dist-dir.js [<options>]`**](../scripts/print-dist-dir.js):
  - Determines the absolute path of a distribution directory based on CLI arguments and outputs its absolute path.
-  - Primarily used by automation scripts.
 - [**`npm run check:verify-build-artifacts [-- <options>]`**](../scripts/verify-build-artifacts.js):
  - Verifies the existence and content of build artifacts. Useful for ensuring that the build process is generating the expected output.
+- [**`node scripts/verify-web-server-status.js --url [URL]`**](../scripts/verify-web-server-status.js):
+  - Checks if a specified server is up with retries and returns an HTTP 200 status code.

 ## Recommended extensions

--- a/docs/presentation.md
+++ b/docs/presentation.md
@@ -20,7 +20,6 @@ The presentation layer uses an event-driven architecture for bidirectional react
    - [**`fonts/`**](./../src/presentation/assets/fonts/): Contains fonts.
    - [**`styles/`**](./../src/presentation/assets/styles/): Contains shared styles.
      - [**`components/`**](./../src/presentation/assets/styles/components): Contains styles coupled to Vue components.
-      - [**`vendors-extensions/`**](./../src/presentation/assets/styles/third-party-extensions): Contains styles for third-party components.
      - [**`main.scss`**](./../src/presentation/assets/styles/main.scss): Main Sass file, imported by other components as single entrypoint.
  - [**`main.ts`**](./../src/presentation/main.ts): Starts Vue app.
  - [**`electron/`**](./../src/presentation/electron/): Contains Electron code.
--- a/docs/tests.md
+++ b/docs/tests.md
@@ -56,6 +56,11 @@ These checks validate various qualities like runtime execution, building process
 - Use [various tools](./../package.json) and [scripts](./../scripts).
 - Are automatically executed as [GitHub workflows](./../.github/workflows).

+### Security checks
+
+- [`checks.security.sast`](./../.github/workflows/checks.security.sast.yaml): Utilizes CodeQL to conduct Static Analysis Security Testing (SAST) to ensure the secure integrity of the codebase.
+- [`checks.security.dependencies`](./../.github/workflows/checks.security.dependencies.yaml): Performs audits on third-party dependencies to identify and mitigate potential vulnerabilities, safeguarding the project from exploitable weaknesses.
+
 ## Tests structure

 - [`package.json`](./../package.json): Defines test commands and includes tools used in tests.
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "privacy.sexy",
-  "version": "0.12.2",
+  "version": "0.12.5",
  "private": true,
  "slogan": "Now you have the choice",
  "description": "Enforce privacy & security best-practices on Windows, macOS and Linux, because privacy is sexy 🍑🍆",
@@ -34,25 +34,21 @@
    "postuninstall": "electron-builder install-app-deps"
  },
  "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.4.0",
-    "@fortawesome/free-brands-svg-icons": "^6.4.0",
-    "@fortawesome/free-regular-svg-icons": "^6.4.0",
-    "@fortawesome/free-solid-svg-icons": "^6.4.0",
-    "@fortawesome/vue-fontawesome": "^2.0.9",
+    "@floating-ui/vue": "^1.0.2",
    "@juggle/resize-observer": "^3.4.0",
-    "ace-builds": "^1.23.4",
+    "ace-builds": "^1.30.0",
    "cross-fetch": "^4.0.0",
+    "electron-log": "^4.4.8",
    "electron-progressbar": "^2.1.0",
+    "electron-updater": "^6.1.4",
    "file-saver": "^2.0.5",
-    "markdown-it": "^13.0.1",
-    "npm": "^9.8.1",
-    "v-tooltip": "2.1.3",
+    "markdown-it": "^13.0.2",
    "vue": "^2.7.14"
  },
  "devDependencies": {
    "@modyfi/vite-plugin-yaml": "^1.0.4",
-    "@rushstack/eslint-patch": "^1.3.2",
-    "@types/ace": "^0.0.48",
+    "@rushstack/eslint-patch": "^1.5.1",
+    "@types/ace": "^0.0.49",
    "@types/file-saver": "^2.0.5",
    "@typescript-eslint/eslint-plugin": "^5.62.0",
    "@typescript-eslint/parser": "^5.62.0",
@@ -61,47 +57,42 @@
    "@vue/eslint-config-airbnb-with-typescript": "^7.0.0",
    "@vue/eslint-config-typescript": "^11.0.3",
    "@vue/test-utils": "^1.3.6",
-    "autoprefixer": "^10.4.15",
-    "cypress": "^12.17.2",
-    "electron": "^25.3.2",
-    "electron-builder": "^24.6.3",
+    "autoprefixer": "^10.4.16",
+    "cypress": "^13.3.1",
+    "electron": "^27.0.0",
+    "electron-builder": "^24.6.4",
    "electron-devtools-installer": "^3.2.0",
    "electron-icon-builder": "^2.0.1",
-    "electron-log": "^4.4.8",
-    "electron-updater": "^6.1.4",
    "electron-vite": "^1.0.27",
-    "eslint": "^8.46.0",
-    "eslint-plugin-cypress": "^2.14.0",
-    "eslint-plugin-vue": "^9.6.0",
-    "eslint-plugin-vuejs-accessibility": "^1.2.0",
-    "icon-gen": "^3.0.1",
+    "eslint": "^8.51.0",
+    "eslint-plugin-cypress": "^2.15.1",
+    "eslint-plugin-vue": "^9.17.0",
+    "eslint-plugin-vuejs-accessibility": "^2.2.0",
+    "icon-gen": "^4.0.0",
    "jsdom": "^22.1.0",
-    "markdownlint-cli": "^0.35.0",
-    "postcss": "^8.4.28",
-    "remark-cli": "^11.0.0",
+    "markdownlint-cli": "^0.37.0",
+    "postcss": "^8.4.31",
+    "remark-cli": "^12.0.0",
    "remark-lint-no-dead-urls": "^1.1.0",
    "remark-preset-lint-consistent": "^5.1.2",
-    "remark-validate-links": "^12.1.1",
-    "sass": "^1.64.1",
-    "start-server-and-test": "^2.0.0",
+    "remark-validate-links": "^13.0.0",
+    "sass": "^1.69.3",
+    "start-server-and-test": "^2.0.1",
    "svgexport": "^0.4.2",
-    "terser": "^5.19.2",
-    "tslib": "~2.4.0",
-    "typescript": "~4.6.2",
-    "vite": "^4.4.9",
-    "vitest": "^0.34.2",
-    "vue-tsc": "^1.8.8",
+    "terser": "^5.21.0",
+    "tslib": "^2.6.2",
+    "typescript": "^5.2.2",
+    "vite": "^4.4.11",
+    "vitest": "^0.34.6",
+    "vue-tsc": "^1.8.19",
    "yaml-lint": "^1.7.0"
  },
  "//devDependencies": {
    "terser": "Used by @vitejs/plugin-legacy for minification",
-    "typescript": [
-      "Cannot upgrade to 5.X.X due to unmaintained @vue/cli-plugin-typescript, https://github.com/vuejs/vue-cli/issues/7401",
-      "Cannot upgrade to > 4.6.X otherwise unit tests do not work, https://github.com/evanw/node-source-map-support/issues/252"
-    ],
-    "tslib": "Cannot upgrade to > 2.4.X otherwise unit tests do not work, https://github.com/evanw/node-source-map-support/issues/252",
-    "@typescript-eslint/eslint-plugin": "Cannot upgrade to 6.X.X due to @vue/eslint-config-typescript, https://github.com/vuejs/eslint-config-typescript/pull/60",
-    "@typescript-eslint/parser": "Cannot upgrade to 6.X.X due to @vue/eslint-config-typescript, https://github.com/vuejs/eslint-config-typescript/pull/60"
+    "@rushstack/eslint-patch": "Needed by @vue/eslint-config-typescript",
+    "@vue/eslint-config-typescript": "Cannot upgrade to 12.X.X due to @vue/eslint-config-airbnb-with-typescript, https://github.com/vuejs/eslint-config-airbnb/issues/58",
+    "@typescript-eslint/eslint-plugin": "Cannot upgrade to 6.X.X due to @vue/eslint-config-airbnb-with-typescript, https://github.com/vuejs/eslint-config-airbnb/issues/58",
+    "@typescript-eslint/parser": "Cannot upgrade to 6.X.X due to @vue/eslint-config-airbnb-with-typescript, https://github.com/vuejs/eslint-config-airbnb/issues/58"
  },
  "homepage": "https://privacy.sexy",
  "repository": {
--- a/scripts/verify-web-server-status.js
+++ b/scripts/verify-web-server-status.js
@@ -0,0 +1,62 @@
+/**
+ * Description:
+ *   This script checks if a server, provided as a CLI argument, is up
+ *   and returns an HTTP 200 status code.
+ *   It is designed to provide easy verification of server availability
+ *   and will retry a specified number of times.
+ *
+ * Usage:
+ *   node ./scripts/verify-web-server-status.js --url [URL]
+ *
+ * Options:
+ *   --url   URL of the server to check
+ */
+
+import { get } from 'http';
+
+const MAX_RETRIES = 30;
+const RETRY_DELAY_IN_SECONDS = 3;
+const URL_PARAMETER_NAME = '--url';
+
+function checkServer(currentRetryCount = 1) {
+  const serverUrl = getServerUrl();
+  console.log(`Requesting ${serverUrl}...`);
+  get(serverUrl, (res) => {
+    if (res.statusCode === 200) {
+      console.log('🎊 Success: The server is up and returned HTTP 200.');
+      process.exit(0);
+    } else {
+      console.log(`Server returned HTTP status code ${res.statusCode}.`);
+      retry(currentRetryCount);
+    }
+  }).on('error', (err) => {
+    console.error('Error making the request:', err);
+    retry(currentRetryCount);
+  });
+}
+
+function retry(currentRetryCount) {
+  console.log(`Attempt ${currentRetryCount}/${MAX_RETRIES}:`);
+  console.log(`Retrying in ${RETRY_DELAY_IN_SECONDS} seconds.`);
+
+  const remainingTime = (MAX_RETRIES - currentRetryCount) * RETRY_DELAY_IN_SECONDS;
+  console.log(`Time remaining before timeout: ${remainingTime}s`);
+
+  if (currentRetryCount < MAX_RETRIES) {
+    setTimeout(() => checkServer(currentRetryCount + 1), RETRY_DELAY_IN_SECONDS * 1000);
+  } else {
+    console.log('Failure: The server at did not return HTTP 200 within the allocated time. Exiting.');
+    process.exit(1);
+  }
+}
+
+function getServerUrl() {
+  const urlIndex = process.argv.indexOf(URL_PARAMETER_NAME);
+  if (urlIndex === -1 || urlIndex === process.argv.length - 1) {
+    console.error(`Parameter "${URL_PARAMETER_NAME}" is not provided.`);
+    process.exit(1);
+  }
+  return process.argv[urlIndex + 1];
+}
+
+checkServer();
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/CodeSegmentJoin/CodeSegmentMerger.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/CodeSegmentJoin/CodeSegmentMerger.ts
@@ -0,0 +1,5 @@
+import { CompiledCode } from '../CompiledCode';
+
+export interface CodeSegmentMerger {
+  mergeCodeParts(codeSegments: readonly CompiledCode[]): CompiledCode;
+}
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/CodeSegmentJoin/NewlineCodeSegmentMerger.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/CodeSegmentJoin/NewlineCodeSegmentMerger.ts
@@ -0,0 +1,20 @@
+import { CompiledCode } from '../CompiledCode';
+import { CodeSegmentMerger } from './CodeSegmentMerger';
+
+export class NewlineCodeSegmentMerger implements CodeSegmentMerger {
+  public mergeCodeParts(codeSegments: readonly CompiledCode[]): CompiledCode {
+    if (!codeSegments?.length) {
+      throw new Error('missing segments');
+    }
+    return {
+      code: joinCodeParts(codeSegments.map((f) => f.code)),
+      revertCode: joinCodeParts(codeSegments.map((f) => f.revertCode)),
+    };
+  }
+}
+
+function joinCodeParts(codeSegments: readonly string[]): string {
+  return codeSegments
+    .filter((segment) => segment?.length > 0)
+    .join('\n');
+}
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/ICompiledCode.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/ICompiledCode.ts
@@ -1,4 +1,4 @@
-export interface ICompiledCode {
+export interface CompiledCode {
  readonly code: string;
  readonly revertCode?: string;
 }
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/FunctionCallCompilationContext.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/FunctionCallCompilationContext.ts
@@ -0,0 +1,9 @@
+import { ISharedFunctionCollection } from '@/application/Parser/Script/Compiler/Function/ISharedFunctionCollection';
+import { FunctionCall } from '../FunctionCall';
+import type { SingleCallCompiler } from './SingleCall/SingleCallCompiler';
+
+export interface FunctionCallCompilationContext {
+  readonly allFunctions: ISharedFunctionCollection;
+  readonly rootCallSequence: readonly FunctionCall[];
+  readonly singleCallCompiler: SingleCallCompiler;
+}
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/FunctionCallCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/FunctionCallCompiler.ts
@@ -1,149 +1,10 @@
-import { IReadOnlyFunctionCallArgumentCollection } from '@/application/Parser/Script/Compiler/Function/Call/Argument/IFunctionCallArgumentCollection';
-import { IFunctionCall } from '@/application/Parser/Script/Compiler/Function/Call/IFunctionCall';
-import { FunctionCallArgument } from '@/application/Parser/Script/Compiler/Function/Call/Argument/FunctionCallArgument';
-import { ISharedFunctionCollection } from '../../ISharedFunctionCollection';
-import { IExpressionsCompiler } from '../../../Expressions/IExpressionsCompiler';
-import { ExpressionsCompiler } from '../../../Expressions/ExpressionsCompiler';
-import { ISharedFunction, IFunctionCode } from '../../ISharedFunction';
+import { ISharedFunctionCollection } from '@/application/Parser/Script/Compiler/Function/ISharedFunctionCollection';
 import { FunctionCall } from '../FunctionCall';
-import { FunctionCallArgumentCollection } from '../Argument/FunctionCallArgumentCollection';
-import { IFunctionCallCompiler } from './IFunctionCallCompiler';
-import { ICompiledCode } from './ICompiledCode';
+import { CompiledCode } from './CompiledCode';

-export class FunctionCallCompiler implements IFunctionCallCompiler {
-  public static readonly instance: IFunctionCallCompiler = new FunctionCallCompiler();
-
-  protected constructor(
-    private readonly expressionsCompiler: IExpressionsCompiler = new ExpressionsCompiler(),
-  ) {
-  }
-
-  public compileCall(
-    calls: IFunctionCall[],
+export interface FunctionCallCompiler {
+  compileFunctionCalls(
+    calls: readonly FunctionCall[],
    functions: ISharedFunctionCollection,
-  ): ICompiledCode {
-    if (!functions) { throw new Error('missing functions'); }
-    if (!calls) { throw new Error('missing calls'); }
-    if (calls.some((f) => !f)) { throw new Error('missing function call'); }
-    const context: ICompilationContext = {
-      allFunctions: functions,
-      callSequence: calls,
-      expressionsCompiler: this.expressionsCompiler,
-    };
-    const code = compileCallSequence(context);
-    return code;
-  }
-}
-
-interface ICompilationContext {
-  allFunctions: ISharedFunctionCollection;
-  callSequence: readonly IFunctionCall[];
-  expressionsCompiler: IExpressionsCompiler;
-}
-
-interface ICompiledFunctionCall {
-  readonly code: string;
-  readonly revertCode: string;
-}
-
-function compileCallSequence(context: ICompilationContext): ICompiledFunctionCall {
-  const compiledFunctions = context.callSequence
-    .flatMap((call) => compileSingleCall(call, context));
-  return {
-    code: merge(compiledFunctions.map((f) => f.code)),
-    revertCode: merge(compiledFunctions.map((f) => f.revertCode)),
-  };
-}
-
-function compileSingleCall(
-  call: IFunctionCall,
-  context: ICompilationContext,
-): ICompiledFunctionCall[] {
-  const func = context.allFunctions.getFunctionByName(call.functionName);
-  ensureThatCallArgumentsExistInParameterDefinition(func, call.args);
-  if (func.body.code) { // Function with inline code
-    const compiledCode = compileCode(func.body.code, call.args, context.expressionsCompiler);
-    return [compiledCode];
-  }
-  // Function with inner calls
-  return func.body.calls
-    .map((innerCall) => {
-      const compiledArgs = compileArgs(innerCall.args, call.args, context.expressionsCompiler);
-      const compiledCall = new FunctionCall(innerCall.functionName, compiledArgs);
-      return compileSingleCall(compiledCall, context);
-    })
-    .flat();
-}
-
-function compileCode(
-  code: IFunctionCode,
-  args: IReadOnlyFunctionCallArgumentCollection,
-  compiler: IExpressionsCompiler,
-): ICompiledFunctionCall {
-  return {
-    code: compiler.compileExpressions(code.execute, args),
-    revertCode: compiler.compileExpressions(code.revert, args),
-  };
-}
-
-function compileArgs(
-  argsToCompile: IReadOnlyFunctionCallArgumentCollection,
-  args: IReadOnlyFunctionCallArgumentCollection,
-  compiler: IExpressionsCompiler,
-): IReadOnlyFunctionCallArgumentCollection {
-  return argsToCompile
-    .getAllParameterNames()
-    .map((parameterName) => {
-      const { argumentValue } = argsToCompile.getArgument(parameterName);
-      const compiledValue = compiler.compileExpressions(argumentValue, args);
-      return new FunctionCallArgument(parameterName, compiledValue);
-    })
-    .reduce((compiledArgs, arg) => {
-      compiledArgs.addArgument(arg);
-      return compiledArgs;
-    }, new FunctionCallArgumentCollection());
-}
-
-function merge(codeParts: readonly string[]): string {
-  return codeParts
-    .filter((part) => part?.length > 0)
-    .join('\n');
-}
-
-function ensureThatCallArgumentsExistInParameterDefinition(
-  func: ISharedFunction,
-  args: IReadOnlyFunctionCallArgumentCollection,
-): void {
-  const callArgumentNames = args.getAllParameterNames();
-  const functionParameterNames = func.parameters.all.map((param) => param.name) || [];
-  const unexpectedParameters = findUnexpectedParameters(callArgumentNames, functionParameterNames);
-  throwIfNotEmpty(func.name, unexpectedParameters, functionParameterNames);
-}
-
-function findUnexpectedParameters(
-  callArgumentNames: string[],
-  functionParameterNames: string[],
-): string[] {
-  if (!callArgumentNames.length && !functionParameterNames.length) {
-    return [];
-  }
-  return callArgumentNames
-    .filter((callParam) => !functionParameterNames.includes(callParam));
-}
-
-function throwIfNotEmpty(
-  functionName: string,
-  unexpectedParameters: string[],
-  expectedParameters: string[],
-) {
-  if (!unexpectedParameters.length) {
-    return;
-  }
-  throw new Error(
-    // eslint-disable-next-line prefer-template
-    `Function "${functionName}" has unexpected parameter(s) provided: `
-      + `"${unexpectedParameters.join('", "')}"`
-      + '. Expected parameter(s): '
-      + (expectedParameters.length ? `"${expectedParameters.join('", "')}"` : 'none'),
-  );
+  ): CompiledCode;
 }
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/FunctionCallSequenceCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/FunctionCallSequenceCompiler.ts
@@ -0,0 +1,36 @@
+import { FunctionCall } from '@/application/Parser/Script/Compiler/Function/Call/FunctionCall';
+import { ISharedFunctionCollection } from '../../ISharedFunctionCollection';
+import { FunctionCallCompiler } from './FunctionCallCompiler';
+import { CompiledCode } from './CompiledCode';
+import { FunctionCallCompilationContext } from './FunctionCallCompilationContext';
+import { SingleCallCompiler } from './SingleCall/SingleCallCompiler';
+import { AdaptiveFunctionCallCompiler } from './SingleCall/AdaptiveFunctionCallCompiler';
+import { CodeSegmentMerger } from './CodeSegmentJoin/CodeSegmentMerger';
+import { NewlineCodeSegmentMerger } from './CodeSegmentJoin/NewlineCodeSegmentMerger';
+
+export class FunctionCallSequenceCompiler implements FunctionCallCompiler {
+  public static readonly instance: FunctionCallCompiler = new FunctionCallSequenceCompiler();
+
+  /* The constructor is protected to enforce the singleton pattern. */
+  protected constructor(
+    private readonly singleCallCompiler: SingleCallCompiler = new AdaptiveFunctionCallCompiler(),
+    private readonly codeSegmentMerger: CodeSegmentMerger = new NewlineCodeSegmentMerger(),
+  ) { }
+
+  public compileFunctionCalls(
+    calls: readonly FunctionCall[],
+    functions: ISharedFunctionCollection,
+  ): CompiledCode {
+    if (!functions) { throw new Error('missing functions'); }
+    if (!calls?.length) { throw new Error('missing calls'); }
+    if (calls.some((f) => !f)) { throw new Error('missing function call'); }
+    const context: FunctionCallCompilationContext = {
+      allFunctions: functions,
+      rootCallSequence: calls,
+      singleCallCompiler: this.singleCallCompiler,
+    };
+    const codeSegments = context.rootCallSequence
+      .flatMap((call) => this.singleCallCompiler.compileSingleCall(call, context));
+    return this.codeSegmentMerger.mergeCodeParts(codeSegments);
+  }
+}
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/IFunctionCallCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/IFunctionCallCompiler.ts
@@ -1,9 +0,0 @@
-import { ISharedFunctionCollection } from '@/application/Parser/Script/Compiler/Function/ISharedFunctionCollection';
-import { IFunctionCall } from '../IFunctionCall';
-import { ICompiledCode } from './ICompiledCode';
-
-export interface IFunctionCallCompiler {
-  compileCall(
-    calls: IFunctionCall[],
-    functions: ISharedFunctionCollection): ICompiledCode;
-}
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/AdaptiveFunctionCallCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/AdaptiveFunctionCallCompiler.ts
@@ -0,0 +1,78 @@
+import { FunctionCall } from '../../FunctionCall';
+import { CompiledCode } from '../CompiledCode';
+import { FunctionCallCompilationContext } from '../FunctionCallCompilationContext';
+import { IReadOnlyFunctionCallArgumentCollection } from '../../Argument/IFunctionCallArgumentCollection';
+import { ISharedFunction } from '../../../ISharedFunction';
+import { SingleCallCompiler } from './SingleCallCompiler';
+import { SingleCallCompilerStrategy } from './SingleCallCompilerStrategy';
+import { InlineFunctionCallCompiler } from './Strategies/InlineFunctionCallCompiler';
+import { NestedFunctionCallCompiler } from './Strategies/NestedFunctionCallCompiler';
+
+export class AdaptiveFunctionCallCompiler implements SingleCallCompiler {
+  public constructor(
+    private readonly strategies: SingleCallCompilerStrategy[] = [
+      new InlineFunctionCallCompiler(),
+      new NestedFunctionCallCompiler(),
+    ],
+  ) {
+  }
+
+  public compileSingleCall(
+    call: FunctionCall,
+    context: FunctionCallCompilationContext,
+  ): CompiledCode[] {
+    const func = context.allFunctions.getFunctionByName(call.functionName);
+    ensureThatCallArgumentsExistInParameterDefinition(func, call.args);
+    const strategy = this.findStrategy(func);
+    return strategy.compileFunction(func, call, context);
+  }
+
+  private findStrategy(func: ISharedFunction): SingleCallCompilerStrategy {
+    const strategies = this.strategies.filter((strategy) => strategy.canCompile(func));
+    if (strategies.length > 1) {
+      throw new Error('Multiple strategies found to compile the function call.');
+    }
+    if (strategies.length === 0) {
+      throw new Error('No strategies found to compile the function call.');
+    }
+    return strategies[0];
+  }
+}
+
+function ensureThatCallArgumentsExistInParameterDefinition(
+  func: ISharedFunction,
+  callArguments: IReadOnlyFunctionCallArgumentCollection,
+): void {
+  const callArgumentNames = callArguments.getAllParameterNames();
+  const functionParameterNames = func.parameters.all.map((param) => param.name) || [];
+  const unexpectedParameters = findUnexpectedParameters(callArgumentNames, functionParameterNames);
+  throwIfUnexpectedParametersExist(func.name, unexpectedParameters, functionParameterNames);
+}
+
+function findUnexpectedParameters(
+  callArgumentNames: string[],
+  functionParameterNames: string[],
+): string[] {
+  if (!callArgumentNames.length && !functionParameterNames.length) {
+    return [];
+  }
+  return callArgumentNames
+    .filter((callParam) => !functionParameterNames.includes(callParam));
+}
+
+function throwIfUnexpectedParametersExist(
+  functionName: string,
+  unexpectedParameters: string[],
+  expectedParameters: string[],
+) {
+  if (!unexpectedParameters.length) {
+    return;
+  }
+  throw new Error(
+    // eslint-disable-next-line prefer-template
+    `Function "${functionName}" has unexpected parameter(s) provided: `
+      + `"${unexpectedParameters.join('", "')}"`
+      + '. Expected parameter(s): '
+      + (expectedParameters.length ? `"${expectedParameters.join('", "')}"` : 'none'),
+  );
+}
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/SingleCallCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/SingleCallCompiler.ts
@@ -0,0 +1,10 @@
+import { FunctionCall } from '../../FunctionCall';
+import { CompiledCode } from '../CompiledCode';
+import { FunctionCallCompilationContext } from '../FunctionCallCompilationContext';
+
+export interface SingleCallCompiler {
+  compileSingleCall(
+    call: FunctionCall,
+    context: FunctionCallCompilationContext,
+  ): CompiledCode[];
+}
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/SingleCallCompilerStrategy.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/SingleCallCompilerStrategy.ts
@@ -0,0 +1,13 @@
+import { ISharedFunction } from '@/application/Parser/Script/Compiler/Function/ISharedFunction';
+import { FunctionCall } from '@/application/Parser/Script/Compiler/Function/Call/FunctionCall';
+import { CompiledCode } from '../CompiledCode';
+import { FunctionCallCompilationContext } from '../FunctionCallCompilationContext';
+
+export interface SingleCallCompilerStrategy {
+  canCompile(func: ISharedFunction): boolean;
+  compileFunction(
+    calledFunction: ISharedFunction,
+    callToFunction: FunctionCall,
+    context: FunctionCallCompilationContext,
+  ): CompiledCode[],
+}
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/Strategies/Argument/ArgumentCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/Strategies/Argument/ArgumentCompiler.ts
@@ -0,0 +1,10 @@
+import { FunctionCall } from '@/application/Parser/Script/Compiler/Function/Call/FunctionCall';
+import { FunctionCallCompilationContext } from '@/application/Parser/Script/Compiler/Function/Call/Compiler/FunctionCallCompilationContext';
+
+export interface ArgumentCompiler {
+  createCompiledNestedCall(
+    nestedFunctionCall: FunctionCall,
+    parentFunctionCall: FunctionCall,
+    context: FunctionCallCompilationContext,
+  ): FunctionCall;
+}
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/Strategies/Argument/NestedFunctionArgumentCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/Strategies/Argument/NestedFunctionArgumentCompiler.ts
@@ -0,0 +1,109 @@
+import { IReadOnlyFunctionCallArgumentCollection } from '@/application/Parser/Script/Compiler/Function/Call/Argument/IFunctionCallArgumentCollection';
+import { FunctionCallArgument } from '@/application/Parser/Script/Compiler/Function/Call/Argument/FunctionCallArgument';
+import { FunctionCallArgumentCollection } from '@/application/Parser/Script/Compiler/Function/Call/Argument/FunctionCallArgumentCollection';
+import { ExpressionsCompiler } from '@/application/Parser/Script/Compiler/Expressions/ExpressionsCompiler';
+import { IExpressionsCompiler } from '@/application/Parser/Script/Compiler/Expressions/IExpressionsCompiler';
+import { FunctionCall } from '@/application/Parser/Script/Compiler/Function/Call/FunctionCall';
+import { FunctionCallCompilationContext } from '@/application/Parser/Script/Compiler/Function/Call/Compiler/FunctionCallCompilationContext';
+import { ParsedFunctionCall } from '@/application/Parser/Script/Compiler/Function/Call/ParsedFunctionCall';
+import { ArgumentCompiler } from './ArgumentCompiler';
+
+export class NestedFunctionArgumentCompiler implements ArgumentCompiler {
+  constructor(
+    private readonly expressionsCompiler: IExpressionsCompiler = new ExpressionsCompiler(),
+  ) { }
+
+  public createCompiledNestedCall(
+    nestedFunction: FunctionCall,
+    parentFunction: FunctionCall,
+    context: FunctionCallCompilationContext,
+  ): FunctionCall {
+    const compiledArgs = compileNestedFunctionArguments(
+      nestedFunction,
+      parentFunction.args,
+      context,
+      this.expressionsCompiler,
+    );
+    const compiledCall = new ParsedFunctionCall(nestedFunction.functionName, compiledArgs);
+    return compiledCall;
+  }
+}
+
+function compileNestedFunctionArguments(
+  nestedFunction: FunctionCall,
+  parentFunctionArgs: IReadOnlyFunctionCallArgumentCollection,
+  context: FunctionCallCompilationContext,
+  expressionsCompiler: IExpressionsCompiler,
+): IReadOnlyFunctionCallArgumentCollection {
+  const requiredParameterNames = context
+    .allFunctions
+    .getRequiredParameterNames(nestedFunction.functionName);
+  const compiledArguments = nestedFunction.args
+    .getAllParameterNames()
+    // Compile each argument value
+    .map((paramName) => ({
+      parameterName: paramName,
+      compiledArgumentValue: compileArgument(
+        paramName,
+        nestedFunction,
+        parentFunctionArgs,
+        expressionsCompiler,
+      ),
+    }))
+    // Filter out arguments with absent values
+    .filter(({
+      parameterName,
+      compiledArgumentValue,
+    }) => isValidNonAbsentArgumentValue(
+      parameterName,
+      compiledArgumentValue,
+      requiredParameterNames,
+    ))
+    /*
+      Create argument object with non-absent values.
+      This is done after eliminating absent values because otherwise creating argument object
+      with absent values throws error.
+    */
+    .map(({
+      parameterName,
+      compiledArgumentValue,
+    }) => new FunctionCallArgument(parameterName, compiledArgumentValue));
+  return buildArgumentCollectionFromArguments(compiledArguments);
+}
+
+function isValidNonAbsentArgumentValue(
+  parameterName: string,
+  argumentValue: string | undefined,
+  requiredParameterNames: string[],
+): boolean {
+  if (argumentValue) {
+    return true;
+  }
+  if (!requiredParameterNames.includes(parameterName)) {
+    return false;
+  }
+  throw new Error(`Compilation resulted in empty value for required parameter: "${parameterName}"`);
+}
+
+function compileArgument(
+  parameterName: string,
+  nestedFunction: FunctionCall,
+  parentFunctionArgs: IReadOnlyFunctionCallArgumentCollection,
+  expressionsCompiler: IExpressionsCompiler,
+): string {
+  try {
+    const { argumentValue: codeInArgument } = nestedFunction.args.getArgument(parameterName);
+    return expressionsCompiler.compileExpressions(codeInArgument, parentFunctionArgs);
+  } catch (err) {
+    throw new AggregateError([err], `Error when compiling argument for "${parameterName}"`);
+  }
+}
+
+function buildArgumentCollectionFromArguments(
+  args: FunctionCallArgument[],
+): FunctionCallArgumentCollection {
+  return args.reduce((compiledArgs, arg) => {
+    compiledArgs.addArgument(arg);
+    return compiledArgs;
+  }, new FunctionCallArgumentCollection());
+}
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/Strategies/InlineFunctionCallCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/Strategies/InlineFunctionCallCompiler.ts
@@ -0,0 +1,31 @@
+import { ExpressionsCompiler } from '@/application/Parser/Script/Compiler/Expressions/ExpressionsCompiler';
+import { IExpressionsCompiler } from '@/application/Parser/Script/Compiler/Expressions/IExpressionsCompiler';
+import { ISharedFunction } from '@/application/Parser/Script/Compiler/Function/ISharedFunction';
+import { FunctionCall } from '@/application/Parser/Script/Compiler/Function/Call/FunctionCall';
+import { CompiledCode } from '@/application/Parser/Script/Compiler/Function/Call/Compiler/CompiledCode';
+import { SingleCallCompilerStrategy } from '../SingleCallCompilerStrategy';
+
+export class InlineFunctionCallCompiler implements SingleCallCompilerStrategy {
+  public constructor(
+    private readonly expressionsCompiler: IExpressionsCompiler = new ExpressionsCompiler(),
+  ) {
+  }
+
+  public canCompile(func: ISharedFunction): boolean {
+    return func.body.code !== undefined;
+  }
+
+  public compileFunction(
+    calledFunction: ISharedFunction,
+    callToFunction: FunctionCall,
+  ): CompiledCode[] {
+    const { code } = calledFunction.body;
+    const { args } = callToFunction;
+    return [
+      {
+        code: this.expressionsCompiler.compileExpressions(code.execute, args),
+        revertCode: this.expressionsCompiler.compileExpressions(code.revert, args),
+      },
+    ];
+  }
+}
--- a/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/Strategies/NestedFunctionCallCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/Compiler/SingleCall/Strategies/NestedFunctionCallCompiler.ts
@@ -0,0 +1,37 @@
+import { ISharedFunction } from '@/application/Parser/Script/Compiler/Function/ISharedFunction';
+import { FunctionCall } from '@/application/Parser/Script/Compiler/Function/Call/FunctionCall';
+import { FunctionCallCompilationContext } from '@/application/Parser/Script/Compiler/Function/Call/Compiler/FunctionCallCompilationContext';
+import { CompiledCode } from '@/application/Parser/Script/Compiler/Function/Call/Compiler/CompiledCode';
+import { SingleCallCompilerStrategy } from '../SingleCallCompilerStrategy';
+import { ArgumentCompiler } from './Argument/ArgumentCompiler';
+import { NestedFunctionArgumentCompiler } from './Argument/NestedFunctionArgumentCompiler';
+
+export class NestedFunctionCallCompiler implements SingleCallCompilerStrategy {
+  public constructor(
+    private readonly argumentCompiler: ArgumentCompiler = new NestedFunctionArgumentCompiler(),
+  ) {
+  }
+
+  public canCompile(func: ISharedFunction): boolean {
+    return func.body.calls !== undefined;
+  }
+
+  public compileFunction(
+    calledFunction: ISharedFunction,
+    callToFunction: FunctionCall,
+    context: FunctionCallCompilationContext,
+  ): CompiledCode[] {
+    const nestedCalls = calledFunction.body.calls;
+    return nestedCalls.map((nestedCall) => {
+      try {
+        const compiledParentCall = this.argumentCompiler
+          .createCompiledNestedCall(nestedCall, callToFunction, context);
+        const compiledNestedCall = context.singleCallCompiler
+          .compileSingleCall(compiledParentCall, context);
+        return compiledNestedCall;
+      } catch (err) {
+        throw new AggregateError([err], `Error with call to "${nestedCall.functionName}" function from "${callToFunction.functionName}" function`);
+      }
+    }).flat();
+  }
+}
--- a/src/application/Parser/Script/Compiler/Function/Call/FunctionCall.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/FunctionCall.ts
@@ -1,16 +1,6 @@
 import { IReadOnlyFunctionCallArgumentCollection } from './Argument/IFunctionCallArgumentCollection';
-import { IFunctionCall } from './IFunctionCall';

-export class FunctionCall implements IFunctionCall {
-  constructor(
-    public readonly functionName: string,
-    public readonly args: IReadOnlyFunctionCallArgumentCollection,
-  ) {
-    if (!functionName) {
-      throw new Error('missing function name in function call');
-    }
-    if (!args) {
-      throw new Error('missing args');
-    }
-  }
+export interface FunctionCall {
+  readonly functionName: string;
+  readonly args: IReadOnlyFunctionCallArgumentCollection;
 }
--- a/src/application/Parser/Script/Compiler/Function/Call/FunctionCallParser.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/FunctionCallParser.ts
@@ -1,10 +1,10 @@
 import type { FunctionCallData, FunctionCallsData, FunctionCallParametersData } from '@/application/collections/';
-import { IFunctionCall } from './IFunctionCall';
+import { FunctionCall } from './FunctionCall';
 import { FunctionCallArgumentCollection } from './Argument/FunctionCallArgumentCollection';
 import { FunctionCallArgument } from './Argument/FunctionCallArgument';
-import { FunctionCall } from './FunctionCall';
+import { ParsedFunctionCall } from './ParsedFunctionCall';

-export function parseFunctionCalls(calls: FunctionCallsData): IFunctionCall[] {
+export function parseFunctionCalls(calls: FunctionCallsData): FunctionCall[] {
  if (calls === undefined) {
    throw new Error('missing call data');
  }
@@ -22,12 +22,12 @@ function getCallSequence(calls: FunctionCallsData): FunctionCallData[] {
  return [calls as FunctionCallData];
 }

-function parseFunctionCall(call: FunctionCallData): IFunctionCall {
+function parseFunctionCall(call: FunctionCallData): FunctionCall {
  if (!call) {
    throw new Error('missing call data');
  }
  const callArgs = parseArgs(call.parameters);
-  return new FunctionCall(call.function, callArgs);
+  return new ParsedFunctionCall(call.function, callArgs);
 }

 function parseArgs(
--- a/src/application/Parser/Script/Compiler/Function/Call/IFunctionCall.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/IFunctionCall.ts
@@ -1,6 +0,0 @@
-import { IReadOnlyFunctionCallArgumentCollection } from './Argument/IFunctionCallArgumentCollection';
-
-export interface IFunctionCall {
-  readonly functionName: string;
-  readonly args: IReadOnlyFunctionCallArgumentCollection;
-}
--- a/src/application/Parser/Script/Compiler/Function/Call/ParsedFunctionCall.ts
+++ b/src/application/Parser/Script/Compiler/Function/Call/ParsedFunctionCall.ts
@@ -0,0 +1,16 @@
+import { IReadOnlyFunctionCallArgumentCollection } from './Argument/IFunctionCallArgumentCollection';
+import { FunctionCall } from './FunctionCall';
+
+export class ParsedFunctionCall implements FunctionCall {
+  constructor(
+    public readonly functionName: string,
+    public readonly args: IReadOnlyFunctionCallArgumentCollection,
+  ) {
+    if (!functionName) {
+      throw new Error('missing function name in function call');
+    }
+    if (!args) {
+      throw new Error('missing args');
+    }
+  }
+}
--- a/src/application/Parser/Script/Compiler/Function/ISharedFunction.ts
+++ b/src/application/Parser/Script/Compiler/Function/ISharedFunction.ts
@@ -1,5 +1,5 @@
 import { IReadOnlyFunctionParameterCollection } from './Parameter/IFunctionParameterCollection';
-import { IFunctionCall } from './Call/IFunctionCall';
+import { FunctionCall } from './Call/FunctionCall';

 export interface ISharedFunction {
  readonly name: string;
@@ -9,8 +9,8 @@ export interface ISharedFunction {

 export interface ISharedFunctionBody {
  readonly type: FunctionBodyType;
-  readonly code: IFunctionCode;
-  readonly calls: readonly IFunctionCall[];
+  readonly code: IFunctionCode | undefined;
+  readonly calls: readonly FunctionCall[] | undefined;
 }

 export enum FunctionBodyType {
--- a/src/application/Parser/Script/Compiler/Function/ISharedFunctionCollection.ts
+++ b/src/application/Parser/Script/Compiler/Function/ISharedFunctionCollection.ts
@@ -2,4 +2,5 @@ import { ISharedFunction } from './ISharedFunction';

 export interface ISharedFunctionCollection {
  getFunctionByName(name: string): ISharedFunction;
+  getRequiredParameterNames(functionName: string): string[];
 }
--- a/src/application/Parser/Script/Compiler/Function/SharedFunction.ts
+++ b/src/application/Parser/Script/Compiler/Function/SharedFunction.ts
@@ -1,4 +1,4 @@
-import { IFunctionCall } from './Call/IFunctionCall';
+import { FunctionCall } from './Call/FunctionCall';

 import {
  FunctionBodyType, IFunctionCode, ISharedFunction, ISharedFunctionBody,
@@ -8,7 +8,7 @@ import { IReadOnlyFunctionParameterCollection } from './Parameter/IFunctionParam
 export function createCallerFunction(
  name: string,
  parameters: IReadOnlyFunctionParameterCollection,
-  callSequence: readonly IFunctionCall[],
+  callSequence: readonly FunctionCall[],
 ): ISharedFunction {
  if (!callSequence || !callSequence.length) {
    throw new Error(`missing call sequence in function "${name}"`);
@@ -38,7 +38,7 @@ class SharedFunction implements ISharedFunction {
  constructor(
    public readonly name: string,
    public readonly parameters: IReadOnlyFunctionParameterCollection,
-    content: IFunctionCode | readonly IFunctionCall[],
+    content: IFunctionCode | readonly FunctionCall[],
    bodyType: FunctionBodyType,
  ) {
    if (!name) { throw new Error('missing function name'); }
@@ -46,7 +46,7 @@ class SharedFunction implements ISharedFunction {
    this.body = {
      type: bodyType,
      code: bodyType === FunctionBodyType.Code ? content as IFunctionCode : undefined,
-      calls: bodyType === FunctionBodyType.Calls ? content as readonly IFunctionCall[] : undefined,
+      calls: bodyType === FunctionBodyType.Calls ? content as readonly FunctionCall[] : undefined,
    };
  }
 }
--- a/src/application/Parser/Script/Compiler/Function/SharedFunctionCollection.ts
+++ b/src/application/Parser/Script/Compiler/Function/SharedFunctionCollection.ts
@@ -21,6 +21,15 @@ export class SharedFunctionCollection implements ISharedFunctionCollection {
    return func;
  }

+  public getRequiredParameterNames(functionName: string): string[] {
+    return this
+      .getFunctionByName(functionName)
+      .parameters
+      .all
+      .filter((parameter) => !parameter.isOptional)
+      .map((parameter) => parameter.name);
+  }
+
  private has(functionName: string) {
    return this.functionsByName.has(functionName);
  }
--- a/src/application/Parser/Script/Compiler/ScriptCompiler.ts
+++ b/src/application/Parser/Script/Compiler/ScriptCompiler.ts
@@ -7,12 +7,12 @@ import { NoEmptyLines } from '@/application/Parser/Script/Validation/Rules/NoEmp
 import { ICodeValidator } from '@/application/Parser/Script/Validation/ICodeValidator';
 import { IScriptCompiler } from './IScriptCompiler';
 import { ISharedFunctionCollection } from './Function/ISharedFunctionCollection';
-import { IFunctionCallCompiler } from './Function/Call/Compiler/IFunctionCallCompiler';
+import { FunctionCallSequenceCompiler } from './Function/Call/Compiler/FunctionCallSequenceCompiler';
 import { FunctionCallCompiler } from './Function/Call/Compiler/FunctionCallCompiler';
 import { ISharedFunctionsParser } from './Function/ISharedFunctionsParser';
 import { SharedFunctionsParser } from './Function/SharedFunctionsParser';
 import { parseFunctionCalls } from './Function/Call/FunctionCallParser';
-import { ICompiledCode } from './Function/Call/Compiler/ICompiledCode';
+import { CompiledCode } from './Function/Call/Compiler/CompiledCode';

 export class ScriptCompiler implements IScriptCompiler {
  private readonly functions: ISharedFunctionCollection;
@@ -21,7 +21,7 @@ export class ScriptCompiler implements IScriptCompiler {
    functions: readonly FunctionData[] | undefined,
    syntax: ILanguageSyntax,
    sharedFunctionsParser: ISharedFunctionsParser = SharedFunctionsParser.instance,
-    private readonly callCompiler: IFunctionCallCompiler = FunctionCallCompiler.instance,
+    private readonly callCompiler: FunctionCallCompiler = FunctionCallSequenceCompiler.instance,
    private readonly codeValidator: ICodeValidator = CodeValidator.instance,
  ) {
    if (!syntax) { throw new Error('missing syntax'); }
@@ -40,7 +40,7 @@ export class ScriptCompiler implements IScriptCompiler {
    if (!script) { throw new Error('missing script'); }
    try {
      const calls = parseFunctionCalls(script.call);
-      const compiledCode = this.callCompiler.compileCall(calls, this.functions);
+      const compiledCode = this.callCompiler.compileFunctionCalls(calls, this.functions);
      validateCompiledCode(compiledCode, this.codeValidator);
      return new ScriptCode(
        compiledCode.code,
@@ -52,7 +52,7 @@ export class ScriptCompiler implements IScriptCompiler {
  }
 }

-function validateCompiledCode(compiledCode: ICompiledCode, validator: ICodeValidator): void {
+function validateCompiledCode(compiledCode: CompiledCode, validator: ICodeValidator): void {
  [compiledCode.code, compiledCode.revertCode].forEach(
    (code) => validator.throwIfInvalid(code, [new NoEmptyLines()]),
  );
--- a/src/application/collections/linux.yaml
+++ b/src/application/collections/linux.yaml
--- a/src/application/collections/macos.yaml
+++ b/src/application/collections/macos.yaml
--- a/src/application/collections/windows.yaml
+++ b/src/application/collections/windows.yaml
--- a/src/presentation/assets/icons/battery-full.svg
+++ b/src/presentation/assets/icons/battery-full.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M464 160c8.8 0 16 7.2 16 16V336c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16V176c0-8.8 7.2-16 16-16H464zM80 96C35.8 96 0 131.8 0 176V336c0 44.2 35.8 80 80 80H464c44.2 0 80-35.8 80-80V320c17.7 0 32-14.3 32-32V224c0-17.7-14.3-32-32-32V176c0-44.2-35.8-80-80-80H80zm368 96H96V320H448V192z"/></svg>
--- a/src/presentation/assets/icons/battery-half.svg
+++ b/src/presentation/assets/icons/battery-half.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M464 160c8.8 0 16 7.2 16 16V336c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16V176c0-8.8 7.2-16 16-16H464zM80 96C35.8 96 0 131.8 0 176V336c0 44.2 35.8 80 80 80H464c44.2 0 80-35.8 80-80V320c17.7 0 32-14.3 32-32V224c0-17.7-14.3-32-32-32V176c0-44.2-35.8-80-80-80H80zm208 96H96V320H288V192z"/></svg>
--- a/src/presentation/assets/icons/circle-info.svg
+++ b/src/presentation/assets/icons/circle-info.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM216 336h24V272H216c-13.3 0-24-10.7-24-24s10.7-24 24-24h48c13.3 0 24 10.7 24 24v88h8c13.3 0 24 10.7 24 24s-10.7 24-24 24H216c-13.3 0-24-10.7-24-24s10.7-24 24-24zm40-208a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"/></svg>
--- a/src/presentation/assets/icons/copy.svg
+++ b/src/presentation/assets/icons/copy.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M208 0H332.1c12.7 0 24.9 5.1 33.9 14.1l67.9 67.9c9 9 14.1 21.2 14.1 33.9V336c0 26.5-21.5 48-48 48H208c-26.5 0-48-21.5-48-48V48c0-26.5 21.5-48 48-48zM48 128h80v64H64V448H256V416h64v48c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V176c0-26.5 21.5-48 48-48z"/></svg>
--- a/src/presentation/assets/icons/desktop.svg
+++ b/src/presentation/assets/icons/desktop.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M64 0C28.7 0 0 28.7 0 64V352c0 35.3 28.7 64 64 64H240l-10.7 32H160c-17.7 0-32 14.3-32 32s14.3 32 32 32H416c17.7 0 32-14.3 32-32s-14.3-32-32-32H346.7L336 416H512c35.3 0 64-28.7 64-64V64c0-35.3-28.7-64-64-64H64zM512 64V288H64V64H512z"/></svg>
--- a/src/presentation/assets/icons/face-smile.svg
+++ b/src/presentation/assets/icons/face-smile.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M464 256A208 208 0 1 0 48 256a208 208 0 1 0 416 0zM0 256a256 256 0 1 1 512 0A256 256 0 1 1 0 256zm177.6 62.1C192.8 334.5 218.8 352 256 352s63.2-17.5 78.4-33.9c9-9.7 24.2-10.4 33.9-1.4s10.4 24.2 1.4 33.9c-22 23.8-60 49.4-113.6 49.4s-91.7-25.5-113.6-49.4c-9-9.7-8.4-24.9 1.4-33.9s24.9-8.4 33.9 1.4zM144.4 208a32 32 0 1 1 64 0 32 32 0 1 1 -64 0zm192-32a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"/></svg>
--- a/src/presentation/assets/icons/file-arrow-down.svg
+++ b/src/presentation/assets/icons/file-arrow-down.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M64 0C28.7 0 0 28.7 0 64V448c0 35.3 28.7 64 64 64H320c35.3 0 64-28.7 64-64V160H256c-17.7 0-32-14.3-32-32V0H64zM256 0V128H384L256 0zM216 232V334.1l31-31c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9l-72 72c-9.4 9.4-24.6 9.4-33.9 0l-72-72c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l31 31V232c0-13.3 10.7-24 24-24s24 10.7 24 24z"/></svg>
--- a/src/presentation/assets/icons/floppy-disk.svg
+++ b/src/presentation/assets/icons/floppy-disk.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V173.3c0-17-6.7-33.3-18.7-45.3L352 50.7C340 38.7 323.7 32 306.7 32H64zm0 96c0-17.7 14.3-32 32-32H288c17.7 0 32 14.3 32 32v64c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32V128zM224 288a64 64 0 1 1 0 128 64 64 0 1 1 0-128z"/></svg>
--- a/src/presentation/assets/icons/folder-open.svg
+++ b/src/presentation/assets/icons/folder-open.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M384 480h48c11.4 0 21.9-6 27.6-15.9l112-192c5.8-9.9 5.8-22.1 .1-32.1S555.5 224 544 224H144c-11.4 0-21.9 6-27.6 15.9L48 357.1V96c0-8.8 7.2-16 16-16H181.5c4.2 0 8.3 1.7 11.3 4.7l26.5 26.5c21 21 49.5 32.8 79.2 32.8H416c8.8 0 16 7.2 16 16v32h48V160c0-35.3-28.7-64-64-64H298.5c-17 0-33.3-6.7-45.3-18.7L226.7 50.7c-12-12-28.3-18.7-45.3-18.7H64C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H87.7 384z"/></svg>
--- a/src/presentation/assets/icons/folder.svg
+++ b/src/presentation/assets/icons/folder.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M0 96C0 60.7 28.7 32 64 32H196.1c19.1 0 37.4 7.6 50.9 21.1L289.9 96H448c35.3 0 64 28.7 64 64V416c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V96zM64 80c-8.8 0-16 7.2-16 16V416c0 8.8 7.2 16 16 16H448c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16H286.6c-10.6 0-20.8-4.2-28.3-11.7L213.1 87c-4.5-4.5-10.6-7-17-7H64z"/></svg>
--- a/src/presentation/assets/icons/github.svg
+++ b/src/presentation/assets/icons/github.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/></svg>
--- a/src/presentation/assets/icons/globe.svg
+++ b/src/presentation/assets/icons/globe.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M352 256c0 22.2-1.2 43.6-3.3 64H163.3c-2.2-20.4-3.3-41.8-3.3-64s1.2-43.6 3.3-64H348.7c2.2 20.4 3.3 41.8 3.3 64zm28.8-64H503.9c5.3 20.5 8.1 41.9 8.1 64s-2.8 43.5-8.1 64H380.8c2.1-20.6 3.2-42 3.2-64s-1.1-43.4-3.2-64zm112.6-32H376.7c-10-63.9-29.8-117.4-55.3-151.6c78.3 20.7 142 77.5 171.9 151.6zm-149.1 0H167.7c6.1-36.4 15.5-68.6 27-94.7c10.5-23.6 22.2-40.7 33.5-51.5C239.4 3.2 248.7 0 256 0s16.6 3.2 27.8 13.8c11.3 10.8 23 27.9 33.5 51.5c11.6 26 20.9 58.2 27 94.7zm-209 0H18.6C48.6 85.9 112.2 29.1 190.6 8.4C165.1 42.6 145.3 96.1 135.3 160zM8.1 192H131.2c-2.1 20.6-3.2 42-3.2 64s1.1 43.4 3.2 64H8.1C2.8 299.5 0 278.1 0 256s2.8-43.5 8.1-64zM194.7 446.6c-11.6-26-20.9-58.2-27-94.6H344.3c-6.1 36.4-15.5 68.6-27 94.6c-10.5 23.6-22.2 40.7-33.5 51.5C272.6 508.8 263.3 512 256 512s-16.6-3.2-27.8-13.8c-11.3-10.8-23-27.9-33.5-51.5zM135.3 352c10 63.9 29.8 117.4 55.3 151.6C112.2 482.9 48.6 426.1 18.6 352H135.3zm358.1 0c-30 74.1-93.6 130.9-171.9 151.6c25.5-34.2 45.2-87.7 55.3-151.6H493.4z"/></svg>
--- a/src/presentation/assets/icons/left-right.svg
+++ b/src/presentation/assets/icons/left-right.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M504.3 273.6c4.9-4.5 7.7-10.9 7.7-17.6s-2.8-13-7.7-17.6l-112-104c-7-6.5-17.2-8.2-25.9-4.4s-14.4 12.5-14.4 22l0 56-192 0 0-56c0-9.5-5.7-18.2-14.4-22s-18.9-2.1-25.9 4.4l-112 104C2.8 243 0 249.3 0 256s2.8 13 7.7 17.6l112 104c7 6.5 17.2 8.2 25.9 4.4s14.4-12.5 14.4-22l0-56 192 0 0 56c0 9.5 5.7 18.2 14.4 22s18.9 2.1 25.9-4.4l112-104z"/></svg>
--- a/src/presentation/assets/icons/magnifying-glass.svg
+++ b/src/presentation/assets/icons/magnifying-glass.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M416 208c0 45.9-14.9 88.3-40 122.7L502.6 457.4c12.5 12.5 12.5 32.8 0 45.3s-32.8 12.5-45.3 0L330.7 376c-34.4 25.2-76.8 40-122.7 40C93.1 416 0 322.9 0 208S93.1 0 208 0S416 93.1 416 208zM208 352a144 144 0 1 0 0-288 144 144 0 1 0 0 288z"/></svg>
--- a/src/presentation/assets/icons/play.svg
+++ b/src/presentation/assets/icons/play.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M73 39c-14.8-9.1-33.4-9.4-48.5-.9S0 62.6 0 80V432c0 17.4 9.4 33.4 24.5 41.9s33.7 8.1 48.5-.9L361 297c14.3-8.7 23-24.2 23-41s-8.7-32.2-23-41L73 39z"/></svg>
--- a/src/presentation/assets/icons/tag.svg
+++ b/src/presentation/assets/icons/tag.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M0 80V229.5c0 17 6.7 33.3 18.7 45.3l176 176c25 25 65.5 25 90.5 0L418.7 317.3c25-25 25-65.5 0-90.5l-176-176c-12-12-28.3-18.7-45.3-18.7H48C21.5 32 0 53.5 0 80zm112 32a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"/></svg>
--- a/src/presentation/assets/icons/user-secret.svg
+++ b/src/presentation/assets/icons/user-secret.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M224 16c-6.7 0-10.8-2.8-15.5-6.1C201.9 5.4 194 0 176 0c-30.5 0-52 43.7-66 89.4C62.7 98.1 32 112.2 32 128c0 14.3 25 27.1 64.6 35.9c-.4 4-.6 8-.6 12.1c0 17 3.3 33.2 9.3 48H45.4C38 224 32 230 32 237.4c0 1.7 .3 3.4 1 5l38.8 96.9C28.2 371.8 0 423.8 0 482.3C0 498.7 13.3 512 29.7 512H418.3c16.4 0 29.7-13.3 29.7-29.7c0-58.5-28.2-110.4-71.7-143L415 242.4c.6-1.6 1-3.3 1-5c0-7.4-6-13.4-13.4-13.4H342.7c6-14.8 9.3-31 9.3-48c0-4.1-.2-8.1-.6-12.1C391 155.1 416 142.3 416 128c0-15.8-30.7-29.9-78-38.6C324 43.7 302.5 0 272 0c-18 0-25.9 5.4-32.5 9.9c-4.8 3.3-8.8 6.1-15.5 6.1zm56 208H267.6c-16.5 0-31.1-10.6-36.3-26.2c-2.3-7-12.2-7-14.5 0c-5.2 15.6-19.9 26.2-36.3 26.2H168c-22.1 0-40-17.9-40-40V169.6c28.2 4.1 61 6.4 96 6.4s67.8-2.3 96-6.4V184c0 22.1-17.9 40-40 40zm-88 96l16 32L176 480 128 288l64 32zm128-32L272 480 240 352l16-32 64-32z"/></svg>
--- a/src/presentation/assets/icons/xmark.svg
+++ b/src/presentation/assets/icons/xmark.svg
@@ -0,0 +1 @@
+<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M342.6 150.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L192 210.7 86.6 105.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3L146.7 256 41.4 361.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L192 301.3 297.4 406.6c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L237.3 256 342.6 150.6z"/></svg>
--- a/src/presentation/assets/styles/main.scss
+++ b/src/presentation/assets/styles/main.scss
@@ -7,5 +7,3 @@
@forward "./mixins";

@forward "./components/card";
-
-@forward "./third-party-extensions/tooltip.scss";
--- a/src/presentation/assets/styles/third-party-extensions/_tooltip.scss
+++ b/src/presentation/assets/styles/third-party-extensions/_tooltip.scss
@@ -1,45 +0,0 @@
-// Based on https://github.com/Akryum/v-tooltip/blob/83615e394c96ca491a4df04b892ae87e833beb97/demo-src/src/App.vue#L179-L303
-@use "@/presentation/assets/styles/colors" as *;
-
-.tooltip {
-    display: block !important;
-    z-index: 10000;
-    .tooltip-inner {
-      background: $color-primary-darkest;
-      color: $color-on-primary;
-      border-radius: 16px;
-      padding: 5px 10px 4px;
-    }
-    .tooltip-arrow {
-      width: 0;
-      height: 0;
-      border-style: solid;
-      position: absolute;
-      margin: 5px;
-      border-color: $color-primary-darkest;
-      z-index: 1;
-    }
-    &[x-placement^="top"] {
-      margin-bottom: 5px;
-      .tooltip-arrow {
-        border-width: 5px 5px 0 5px;
-        border-left-color: transparent !important;
-        border-right-color: transparent !important;
-        border-bottom-color: transparent !important;
-        bottom: -5px;
-        left: calc(50% - 5px);
-        margin-top: 0;
-        margin-bottom: 0;
-      }
-    }
-    &[aria-hidden='true'] {
-      visibility: hidden;
-      opacity: 0;
-      transition: opacity .15s, visibility .15s;
-    }
-    &[aria-hidden='false'] {
-      visibility: visible;
-      opacity: 1;
-      transition: opacity .15s;
-    }
-  }
--- a/src/presentation/bootstrapping/ApplicationBootstrapper.ts
+++ b/src/presentation/bootstrapping/ApplicationBootstrapper.ts
@@ -1,7 +1,5 @@
-import { IconBootstrapper } from './Modules/IconBootstrapper';
 import { VueConstructor, IVueBootstrapper } from './IVueBootstrapper';
 import { VueBootstrapper } from './Modules/VueBootstrapper';
-import { TooltipBootstrapper } from './Modules/TooltipBootstrapper';
 import { RuntimeSanityValidator } from './Modules/RuntimeSanityValidator';
 import { AppInitializationLogger } from './Modules/AppInitializationLogger';

@@ -15,9 +13,7 @@ export class ApplicationBootstrapper implements IVueBootstrapper {

  private static getAllBootstrappers(): IVueBootstrapper[] {
    return [
-      new IconBootstrapper(),
      new VueBootstrapper(),
-      new TooltipBootstrapper(),
      new RuntimeSanityValidator(),
      new AppInitializationLogger(),
    ];
--- a/src/presentation/bootstrapping/Modules/IconBootstrapper.ts
+++ b/src/presentation/bootstrapping/Modules/IconBootstrapper.ts
@@ -1,38 +0,0 @@
-import { library } from '@fortawesome/fontawesome-svg-core';
-import { faGithub } from '@fortawesome/free-brands-svg-icons';
-/** BRAND ICONS (PREFIX: fab) */
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
-/** REGULAR ICONS (PREFIX: far) */
-import { faFolderOpen, faFolder, faSmile } from '@fortawesome/free-regular-svg-icons';
-/** SOLID ICONS (PREFIX: fas (default)) */
-import {
-  faTimes, faFileDownload, faCopy, faSearch, faInfoCircle, faUserSecret, faDesktop, faTag, faGlobe,
-  faSave, faBatteryFull, faBatteryHalf, faPlay, faArrowsAltH,
-} from '@fortawesome/free-solid-svg-icons';
-import { IVueBootstrapper, VueConstructor } from '../IVueBootstrapper';
-
-export class IconBootstrapper implements IVueBootstrapper {
-  public bootstrap(vue: VueConstructor): void {
-    library.add(
-      faGithub,
-      faUserSecret,
-      faSmile,
-      faDesktop,
-      faGlobe,
-      faTag,
-      faFolderOpen,
-      faFolder,
-      faTimes,
-      faFileDownload,
-      faSave,
-      faCopy,
-      faPlay,
-      faSearch,
-      faBatteryFull,
-      faBatteryHalf,
-      faInfoCircle,
-      faArrowsAltH,
-    );
-    vue.component('font-awesome-icon', FontAwesomeIcon);
-  }
-}
--- a/src/presentation/bootstrapping/Modules/TooltipBootstrapper.ts
+++ b/src/presentation/bootstrapping/Modules/TooltipBootstrapper.ts
@@ -1,8 +0,0 @@
-import VTooltip from 'v-tooltip';
-import { VueConstructor, IVueBootstrapper } from '../IVueBootstrapper';
-
-export class TooltipBootstrapper implements IVueBootstrapper {
-  public bootstrap(vue: VueConstructor): void {
-    vue.use(VTooltip);
-  }
-}
--- a/src/presentation/components/App.vue
+++ b/src/presentation/components/App.vue
@@ -7,11 +7,12 @@
      <TheCodeButtons class="app__row app__code-buttons" />
      <TheFooter />
    </div>
+    <OptionalDevToolkit />
  </div>
 </template>

 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineAsyncComponent, defineComponent } from 'vue';
 import TheHeader from '@/presentation/components/TheHeader.vue';
 import TheFooter from '@/presentation/components/TheFooter/TheFooter.vue';
 import TheCodeButtons from '@/presentation/components/Code/CodeButtons/TheCodeButtons.vue';
@@ -22,6 +23,10 @@ import { provideDependencies } from '../bootstrapping/DependencyProvider';

 const singletonAppContext = await buildContext();

+const OptionalDevToolkit = process.env.NODE_ENV !== 'production'
+  ? defineAsyncComponent(() => import('@/presentation/components/DevToolkit/DevToolkit.vue'))
+  : null;
+
 export default defineComponent({
  components: {
    TheHeader,
@@ -29,6 +34,7 @@ export default defineComponent({
    TheScriptArea,
    TheSearchBar,
    TheFooter,
+    OptionalDevToolkit,
  },
  setup() {
    provideDependencies(singletonAppContext); // In Vue 3.0 we can move it to main.ts
@@ -59,5 +65,4 @@ export default defineComponent({
    }
  }
 }
-
 </style>
--- a/src/presentation/components/Code/CodeButtons/IconButton.vue
+++ b/src/presentation/components/Code/CodeButtons/IconButton.vue
@@ -4,30 +4,30 @@
    type="button"
    @click="onClicked"
  >
-    <font-awesome-icon
+    <AppIcon
      class="button__icon"
-      :icon="[iconPrefix, iconName]"
-      size="2x"
+      :icon="iconName"
    />
    <div class="button__text">{{text}}</div>
  </button>
 </template>

 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, PropType } from 'vue';
+import { IconName } from '@/presentation/components/Shared/Icon/IconName';
+import AppIcon from '@/presentation/components/Shared/Icon/AppIcon.vue';

 export default defineComponent({
+  components: {
+    AppIcon,
+  },
  props: {
    text: {
      type: String,
      required: true,
    },
-    iconPrefix: {
-      type: String,
-      required: true,
-    },
    iconName: {
-      type: String,
+      type: String as PropType<IconName>,
      required: true,
    },
  },
@@ -64,6 +64,10 @@ export default defineComponent({
  box-shadow: 0 3px 9px $color-primary-darkest;
  border-radius: 4px;

+  &__icon {
+    font-size: 2em;
+  }
+
  @include clickable;

  width: 10%;
--- a/src/presentation/components/Code/CodeButtons/Instructions/CodeInstruction.vue
+++ b/src/presentation/components/Code/CodeButtons/Instructions/CodeInstruction.vue
@@ -3,9 +3,9 @@
    <span class="dollar">$</span>
    <code><slot /></code>
    <TooltipWrapper>
-      <font-awesome-icon
+      <AppIcon
        class="copy-button"
-        :icon="['fas', 'copy']"
+        icon="copy"
        @click="copyCode"
      />
      <template v-slot:tooltip>
@@ -19,10 +19,12 @@
 import { defineComponent, useSlots } from 'vue';
 import { Clipboard } from '@/infrastructure/Clipboard';
 import TooltipWrapper from '@/presentation/components/Shared/TooltipWrapper.vue';
+import AppIcon from '@/presentation/components/Shared/Icon/AppIcon.vue';

 export default defineComponent({
  components: {
    TooltipWrapper,
+    AppIcon,
  },
  setup() {
    const slots = useSlots();
--- a/src/presentation/components/Code/CodeButtons/Instructions/InstructionList.vue
+++ b/src/presentation/components/Code/CodeButtons/Instructions/InstructionList.vue
@@ -14,7 +14,7 @@
    <p>
      <strong>2. The hard (manual) alternative</strong>. This requires you to do additional manual
      steps. If you are unsure how to follow the instructions, hover on information
-      (<font-awesome-icon :icon="['fas', 'info-circle']" />)
+      (<AppIcon icon="circle-info" />)
      icons near the steps, or follow the easy alternative described above.
    </p>
    <p>
@@ -27,9 +27,9 @@
          <div class="step__action">
            <span>{{ step.action.instruction }}</span>
            <TooltipWrapper v-if="step.action.details">
-              <font-awesome-icon
+              <AppIcon
                class="explanation"
-                :icon="['fas', 'info-circle']"
+                icon="circle-info"
              />
              <template v-slot:tooltip>
                <div v-html="step.action.details" />
@@ -39,9 +39,9 @@
          <div v-if="step.code" class="step__code">
            <CodeInstruction>{{ step.code.instruction }}</CodeInstruction>
            <TooltipWrapper v-if="step.code.details">
-              <font-awesome-icon
+              <AppIcon
                class="explanation"
-                :icon="['fas', 'info-circle']"
+                icon="circle-info"
              />
              <template v-slot:tooltip>
                <div v-html="step.code.details" />
@@ -62,6 +62,7 @@ import {
 import { InjectionKeys } from '@/presentation/injectionSymbols';
 import { OperatingSystem } from '@/domain/OperatingSystem';
 import TooltipWrapper from '@/presentation/components/Shared/TooltipWrapper.vue';
+import AppIcon from '@/presentation/components/Shared/Icon/AppIcon.vue';
 import CodeInstruction from './CodeInstruction.vue';
 import { IInstructionListData } from './InstructionListData';

@@ -69,6 +70,7 @@ export default defineComponent({
  components: {
    CodeInstruction,
    TooltipWrapper,
+    AppIcon,
  },
  props: {
    data: {
--- a/src/presentation/components/Code/CodeButtons/TheCodeButtons.vue
+++ b/src/presentation/components/Code/CodeButtons/TheCodeButtons.vue
@@ -4,19 +4,16 @@
      v-if="canRun"
      text="Run"
      v-on:click="executeCode"
-      icon-prefix="fas"
      icon-name="play"
    />
    <IconButton
      :text="isDesktopVersion ? 'Save' : 'Download'"
      v-on:click="saveCode"
-      icon-prefix="fas"
-      :icon-name="isDesktopVersion ? 'save' : 'file-download'"
+      :icon-name="isDesktopVersion ? 'floppy-disk' : 'file-arrow-down'"
    />
    <IconButton
      text="Copy"
      v-on:click="copyCode"
-      icon-prefix="fas"
      icon-name="copy"
    />
    <ModalDialog v-if="instructions" v-model="areInstructionsVisible">
--- a/src/presentation/components/DevToolkit/DevToolkit.vue
+++ b/src/presentation/components/DevToolkit/DevToolkit.vue
@@ -0,0 +1,71 @@
+<template>
+  <div class="dev-toolkit">
+    <div class="title">
+      Tools
+    </div>
+    <hr />
+    <button
+      v-for="action in devActions"
+      @click="action.handler"
+      :key="action.name"
+      type="button">
+      {{ action.name }}
+    </button>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { dumpNames } from './DumpNames';
+
+export default defineComponent({
+  setup() {
+    const devActions: readonly DevAction[] = [
+      {
+        name: 'Log script/category names',
+        handler: async () => {
+          const names = await dumpNames();
+          console.log(names);
+        },
+      },
+    ];
+    return {
+      devActions,
+    };
+  },
+});
+
+interface DevAction {
+  readonly name: string;
+  readonly handler: () => void | Promise<void>;
+}
+</script>
+
+<style scoped lang="scss">
+@use "@/presentation/assets/styles/main" as *;
+
+.dev-toolkit {
+  position: fixed;
+  top: 0;
+  right: 0;
+  background-color: rgba($color-on-surface, 0.5);
+  color: $color-on-primary;
+  padding: 10px;
+  z-index: 10000;
+
+  .title {
+    font-weight: bold;
+    text-align: center;
+  }
+
+  button {
+    display: block;
+    margin-bottom: 10px;
+    padding: 5px 10px;
+    background-color: $color-primary;
+    color: $color-on-primary;
+    border: none;
+    cursor: pointer;
+  }
+}
+</style>
--- a/src/presentation/components/DevToolkit/DumpNames.ts
+++ b/src/presentation/components/DevToolkit/DumpNames.ts
@@ -0,0 +1,35 @@
+import { IApplication } from '@/domain/IApplication';
+import { ApplicationFactory } from '@/application/ApplicationFactory';
+
+export async function dumpNames(): Promise<string> {
+  const application = await ApplicationFactory.Current.getApp();
+  const names = collectNames(application);
+  const output = names.join('\n');
+  return output;
+}
+
+function collectNames(application: IApplication): string[] {
+  const { collections } = application;
+
+  const allNames = [
+    ...collections.flatMap((collection) => collection.getAllCategories().map((c) => c.name)),
+    ...collections.flatMap((collection) => collection.getAllScripts().map((c) => c.name)),
+  ];
+
+  const uniqueNames = [...new Set(allNames)];
+
+  return shuffle(uniqueNames);
+}
+
+/*
+  Shuffle an array of strings, returning a new array with elements in random order.
+  Uses the Fisher-Yates (or Durstenfeld) algorithm.
+*/
+function shuffle(array: readonly string[]): string[] {
+  const shuffledArray = [...array];
+  for (let i = array.length - 1; i > 0; i--) {
+    const j = Math.floor(Math.random() * (i + 1));
+    [shuffledArray[i], shuffledArray[j]] = [shuffledArray[j], shuffledArray[i]];
+  }
+  return shuffledArray;
+}
--- a/src/presentation/components/Scripts/Slider/SliderHandle.vue
+++ b/src/presentation/components/Scripts/Slider/SliderHandle.vue
@@ -4,9 +4,9 @@
    :style="{ cursor: cursorCssValue }"
    @mousedown="startResize">
    <div class="line" />
-    <font-awesome-icon
+    <AppIcon
      class="icon"
-      :icon="['fas', 'arrows-alt-h']"
+      icon="left-right"
    />
    <div class="line" />
  </div>
@@ -14,8 +14,12 @@

 <script lang="ts">
 import { defineComponent, onUnmounted } from 'vue';
+import AppIcon from '@/presentation/components/Shared/Icon/AppIcon.vue';

 export default defineComponent({
+  components: {
+    AppIcon,
+  },
  emits: {
    /* eslint-disable @typescript-eslint/no-unused-vars */
    resized: (displacementX: number) => true,
--- a/src/presentation/components/Scripts/View/Cards/CardListItem.vue
+++ b/src/presentation/components/Scripts/View/Cards/CardListItem.vue
@@ -17,18 +17,18 @@
      </span>
      <span v-else>Oh no 😢</span>
      <!-- Expand icon -->
-      <font-awesome-icon
+      <AppIcon
        class="card__inner__expand-icon"
-        :icon="['far', isExpanded ? 'folder-open' : 'folder']"
+        :icon="isExpanded ? 'folder-open' : 'folder'"
      />
      <!-- Indeterminate and full states -->
      <div class="card__inner__state-icons">
-        <font-awesome-icon
-          :icon="['fa', 'battery-half']"
+        <AppIcon
+          icon="battery-half"
          v-if="isAnyChildSelected && !areAllChildrenSelected"
        />
-        <font-awesome-icon
-          :icon="['fa', 'battery-full']"
+        <AppIcon
+          icon="battery-full"
          v-if="areAllChildrenSelected"
        />
      </div>
@@ -38,8 +38,8 @@
        <ScriptsTree :categoryId="categoryId" />
      </div>
      <div class="card__expander__close-button">
-        <font-awesome-icon
-          :icon="['fas', 'times']"
+        <AppIcon
+          icon="xmark"
          v-on:click="collapse()"
        />
      </div>
@@ -52,6 +52,7 @@ import {
  defineComponent, ref, watch, computed,
  inject,
 } from 'vue';
+import AppIcon from '@/presentation/components/Shared/Icon/AppIcon.vue';
 import { InjectionKeys } from '@/presentation/injectionSymbols';
 import ScriptsTree from '@/presentation/components/Scripts/View/Tree/ScriptsTree.vue';
 import { sleep } from '@/infrastructure/Threading/AsyncSleep';
@@ -59,6 +60,7 @@ import { sleep } from '@/infrastructure/Threading/AsyncSleep';
 export default defineComponent({
  components: {
    ScriptsTree,
+    AppIcon,
  },
  props: {
    categoryId: {
--- a/src/presentation/components/Scripts/View/TheScriptsView.vue
+++ b/src/presentation/components/Scripts/View/TheScriptsView.vue
@@ -18,7 +18,7 @@
            class="search__query__close-button"
            v-on:click="clearSearchQuery()"
          >
-            <font-awesome-icon :icon="['fas', 'times']" />
+            <AppIcon icon="xmark" />
          </div>
        </div>
        <div v-if="!searchHasMatches" class="search-no-matches">
@@ -41,6 +41,7 @@ import {
  defineComponent, PropType, ref, computed,
  inject,
 } from 'vue';
+import AppIcon from '@/presentation/components/Shared/Icon/AppIcon.vue';
 import { InjectionKeys } from '@/presentation/injectionSymbols';
 import ScriptsTree from '@/presentation/components/Scripts/View/Tree/ScriptsTree.vue';
 import CardList from '@/presentation/components/Scripts/View/Cards/CardList.vue';
@@ -52,6 +53,7 @@ export default defineComponent({
  components: {
    ScriptsTree,
    CardList,
+    AppIcon,
  },
  props: {
    currentView: {
--- a/src/presentation/components/Scripts/View/Tree/NodeContent/Documentation/DocumentationText.vue
+++ b/src/presentation/components/Scripts/View/Tree/NodeContent/Documentation/DocumentationText.vue
@@ -100,20 +100,27 @@ $text-size: 0.75em; // Lower looks bad on Firefox
      }
    }
  }
-  /*
-    Different browsers have different <p>, we should even this out.
-    See CSS 2.1 specification https://www.w3.org/TR/CSS21/sample.html.
-  */
-  p {
+  @mixin set-paragraph-vertical-gap($paragraph-vertical-gap) {
+    p {
+      /*
+        Remove default browser margin on paragraphs to ensure:
+          1. A markdown text represented as a list (e.g. <ul>, <ol>) has same vertical spacing as a standalone paragraph (</p>).
+          2. The first paragraph in a sequence (first `<p>` usage) does not introduce top spacing.
+          3. Uniformity, so margin can be set consistently across browsers.
+      */
+      margin: 0;
+    }
    /*
-      Remove surrounding padding so a markdown text that is a list (e.g. <ul>)
-      has same outer padding as a paragraph (</p>).
+      Introduce spacing between successive elements and paragraphs.
+      E.g., spacing between two paragraphs (`p`), paragraphs after lists (<ul>, <ol>)...
    */
-    margin: 0;
-    + p {
-      margin-top: 1em;
+    * {
+      + p {
+        margin-top: $paragraph-vertical-gap;
+      }
    }
  }
+  @include set-paragraph-vertical-gap($text-size);
  ul {
    // CSS default is 40px, if the text is a bulletpoint, it leads to unexpected padding.
    padding-inline-start: 1em;
--- a/src/presentation/components/Scripts/View/Tree/NodeContent/Documentation/ToggleDocumentationButton.vue
+++ b/src/presentation/components/Scripts/View/Tree/NodeContent/Documentation/ToggleDocumentationButton.vue
@@ -6,14 +6,18 @@
    v-on:click.stop
    v-on:click="toggle()"
  >
-    <font-awesome-icon :icon="['fas', 'info-circle']" />
+    <AppIcon icon="circle-info" />
  </a>
 </template>

 <script lang="ts">
 import { defineComponent, ref } from 'vue';
+import AppIcon from '@/presentation/components/Shared/Icon/AppIcon.vue';

 export default defineComponent({
+  components: {
+    AppIcon,
+  },
  emits: [
    'show',
    'hide',
@@ -52,5 +56,4 @@ export default defineComponent({
    color: $color-primary-light;
  }
 }
-
 </style>
--- a/src/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeNodeStateChangedEmittedEvent.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeNodeStateChangedEmittedEvent.ts
@@ -1,7 +1,8 @@
-import { NodeStateChangedEvent } from '../Node/State/StateAccess';
+import { TreeNodeStateDescriptor } from '../Node/State/StateDescriptor';
 import { ReadOnlyTreeNode } from '../Node/TreeNode';

 export interface TreeNodeStateChangedEmittedEvent {
-  readonly change: NodeStateChangedEvent;
  readonly node: ReadOnlyTreeNode;
+  readonly oldState?: TreeNodeStateDescriptor;
+  readonly newState: TreeNodeStateDescriptor;
 }
--- a/src/presentation/components/Scripts/View/Tree/TreeView/Node/HierarchicalTreeNode.vue
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/Node/HierarchicalTreeNode.vue
@@ -51,7 +51,7 @@ import {
 } from 'vue';
 import { TreeRoot } from '../TreeRoot/TreeRoot';
 import { useCurrentTreeNodes } from '../UseCurrentTreeNodes';
-import { NodeRenderingStrategy } from '../Rendering/NodeRenderingStrategy';
+import { NodeRenderingStrategy } from '../Rendering/Scheduling/NodeRenderingStrategy';
 import { useNodeState } from './UseNodeState';
 import { TreeNode } from './TreeNode';
 import LeafTreeNode from './LeafTreeNode.vue';
--- a/src/presentation/components/Scripts/View/Tree/TreeView/Rendering/DelayScheduler.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/Rendering/DelayScheduler.ts
@@ -0,0 +1,3 @@
+export interface DelayScheduler {
+  scheduleNext(callback: () => void, delayInMs: number): void;
+}
--- a/src/presentation/components/Scripts/View/Tree/TreeView/Rendering/Ordering/CollapsedParentOrderer.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/Rendering/Ordering/CollapsedParentOrderer.ts
@@ -0,0 +1,35 @@
+import { ReadOnlyTreeNode } from '../../Node/TreeNode';
+import { RenderQueueOrderer } from './RenderQueueOrderer';
+
+export class CollapsedParentOrderer implements RenderQueueOrderer {
+  public orderNodes(nodes: Iterable<ReadOnlyTreeNode>): ReadOnlyTreeNode[] {
+    return orderNodes(nodes);
+  }
+}
+
+function orderNodes(nodes: Iterable<ReadOnlyTreeNode>): ReadOnlyTreeNode[] {
+  return [...nodes]
+    .map((node, index) => ({ node, index }))
+    .sort((a, b) => {
+      const [
+        isANodeOfCollapsedParent,
+        isBNodeOfCollapsedParent,
+      ] = [isParentCollapsed(a.node), isParentCollapsed(b.node)];
+      if (isANodeOfCollapsedParent !== isBNodeOfCollapsedParent) {
+        return (isANodeOfCollapsedParent ? 1 : 0) - (isBNodeOfCollapsedParent ? 1 : 0);
+      }
+      return a.index - b.index;
+    })
+    .map(({ node }) => node);
+}
+
+function isParentCollapsed(node: ReadOnlyTreeNode): boolean {
+  const parentNode = node.hierarchy.parent;
+  if (parentNode) {
+    if (!parentNode.state.current.isExpanded) {
+      return true;
+    }
+    return isParentCollapsed(parentNode);
+  }
+  return false;
+}
--- a/src/presentation/components/Scripts/View/Tree/TreeView/Rendering/Ordering/RenderQueueOrderer.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/Rendering/Ordering/RenderQueueOrderer.ts
@@ -0,0 +1,5 @@
+import { ReadOnlyTreeNode } from '../../Node/TreeNode';
+
+export interface RenderQueueOrderer {
+  orderNodes(nodes: Iterable<ReadOnlyTreeNode>): ReadOnlyTreeNode[];
+}
--- a/src/presentation/components/Scripts/View/Tree/TreeView/Rendering/Scheduling/NodeRenderingStrategy.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/Rendering/Scheduling/NodeRenderingStrategy.ts
@@ -1,4 +1,4 @@
-import { TreeNode } from '../Node/TreeNode';
+import { TreeNode } from '../../Node/TreeNode';

 export interface NodeRenderingStrategy {
  shouldRender(node: TreeNode): boolean;
--- a/src/presentation/components/Scripts/View/Tree/TreeView/Rendering/Scheduling/TimeoutDelayScheduler.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/Rendering/Scheduling/TimeoutDelayScheduler.ts
@@ -0,0 +1,28 @@
+import { DelayScheduler } from '../DelayScheduler';
+
+export class TimeoutDelayScheduler implements DelayScheduler {
+  private timeoutId: ReturnType<typeof setTimeout> | undefined = undefined;
+
+  constructor(private readonly timer: TimeFunctions = {
+    clearTimeout: globalThis.clearTimeout.bind(globalThis),
+    setTimeout: globalThis.setTimeout.bind(globalThis),
+  }) { }
+
+  public scheduleNext(callback: () => void, delayInMs: number): void {
+    this.clear();
+    this.timeoutId = this.timer.setTimeout(callback, delayInMs);
+  }
+
+  private clear(): void {
+    if (this.timeoutId === undefined) {
+      return;
+    }
+    this.timer.clearTimeout(this.timeoutId);
+    this.timeoutId = undefined;
+  }
+}
+
+export interface TimeFunctions {
+  clearTimeout(id: ReturnType<typeof setTimeout>): void;
+  setTimeout(callback: () => void, delayInMs: number): ReturnType<typeof setTimeout>;
+}
--- a/src/presentation/components/Scripts/View/Tree/TreeView/Rendering/UseGradualNodeRendering.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/Rendering/UseGradualNodeRendering.ts
@@ -1,44 +1,43 @@
 import {
-  WatchSource, computed, shallowRef, triggerRef, watch,
+  WatchSource, shallowRef, triggerRef, watch,
 } from 'vue';
 import { ReadOnlyTreeNode } from '../Node/TreeNode';
 import { useNodeStateChangeAggregator } from '../UseNodeStateChangeAggregator';
 import { TreeRoot } from '../TreeRoot/TreeRoot';
 import { useCurrentTreeNodes } from '../UseCurrentTreeNodes';
-import { NodeRenderingStrategy } from './NodeRenderingStrategy';
+import { NodeRenderingStrategy } from './Scheduling/NodeRenderingStrategy';
+import { DelayScheduler } from './DelayScheduler';
+import { TimeoutDelayScheduler } from './Scheduling/TimeoutDelayScheduler';
+import { RenderQueueOrderer } from './Ordering/RenderQueueOrderer';
+import { CollapsedParentOrderer } from './Ordering/CollapsedParentOrderer';

 /**
 * Renders tree nodes gradually to prevent UI freeze when loading large amounts of nodes.
 */
 export function useGradualNodeRendering(
  treeWatcher: WatchSource<TreeRoot>,
+  useChangeAggregator = useNodeStateChangeAggregator,
+  useTreeNodes = useCurrentTreeNodes,
+  scheduler: DelayScheduler = new TimeoutDelayScheduler(),
+  initialBatchSize = 30,
+  subsequentBatchSize = 5,
+  orderer: RenderQueueOrderer = new CollapsedParentOrderer(),
 ): NodeRenderingStrategy {
  const nodesToRender = new Set<ReadOnlyTreeNode>();
  const nodesBeingRendered = shallowRef(new Set<ReadOnlyTreeNode>());
-  let isFirstRender = true;
  let isRenderingInProgress = false;
  const renderingDelayInMs = 50;
-  const initialBatchSize = 30;
-  const subsequentBatchSize = 5;

-  const { onNodeStateChange } = useNodeStateChangeAggregator(treeWatcher);
-  const { nodes } = useCurrentTreeNodes(treeWatcher);
+  const { onNodeStateChange } = useChangeAggregator(treeWatcher);
+  const { nodes } = useTreeNodes(treeWatcher);

-  const orderedNodes = computed<readonly ReadOnlyTreeNode[]>(() => nodes.value.flattenedNodes);
-
-  watch(() => orderedNodes.value, (newNodes) => {
-    newNodes.forEach((node) => updateNodeRenderQueue(node));
-  }, { immediate: true });
-
-  function updateNodeRenderQueue(node: ReadOnlyTreeNode) {
-    if (node.state.current.isVisible
+  function updateNodeRenderQueue(node: ReadOnlyTreeNode, isVisible: boolean) {
+    if (isVisible
        && !nodesToRender.has(node)
        && !nodesBeingRendered.value.has(node)) {
      nodesToRender.add(node);
-      if (!isRenderingInProgress) {
-        scheduleRendering();
-      }
-    } else if (!node.state.current.isVisible) {
+      beginRendering();
+    } else if (!isVisible) {
      if (nodesToRender.has(node)) {
        nodesToRender.delete(node);
      }
@@ -49,47 +48,57 @@ export function useGradualNodeRendering(
    }
  }

-  onNodeStateChange((node, change) => {
-    if (change.newState.isVisible === change.oldState.isVisible) {
+  watch(() => nodes.value, (newNodes) => {
+    nodesToRender.clear();
+    nodesBeingRendered.value.clear();
+    if (!newNodes || newNodes.flattenedNodes.length === 0) {
+      triggerRef(nodesBeingRendered);
      return;
    }
-    updateNodeRenderQueue(node);
+    newNodes
+      .flattenedNodes
+      .filter((node) => node.state.current.isVisible)
+      .forEach((node) => nodesToRender.add(node));
+    beginRendering();
+  }, { immediate: true });
+
+  onNodeStateChange((change) => {
+    if (change.newState.isVisible === change.oldState?.isVisible) {
+      return;
+    }
+    updateNodeRenderQueue(change.node, change.newState.isVisible);
  });

-  scheduleRendering();
-
-  function scheduleRendering() {
-    if (isFirstRender) {
-      renderNodeBatch();
-      isFirstRender = false;
-    } else {
-      const delayScheduler = new DelayScheduler(renderingDelayInMs);
-      delayScheduler.schedule(renderNodeBatch);
+  function beginRendering() {
+    if (isRenderingInProgress) {
+      return;
    }
+    renderNextBatch(initialBatchSize);
  }

-  function renderNodeBatch() {
+  function renderNextBatch(batchSize: number) {
    if (nodesToRender.size === 0) {
      isRenderingInProgress = false;
      return;
    }
    isRenderingInProgress = true;
-    const batchSize = isFirstRender ? initialBatchSize : subsequentBatchSize;
-    const sortedNodes = Array.from(nodesToRender).sort(
-      (a, b) => orderedNodes.value.indexOf(a) - orderedNodes.value.indexOf(b),
-    );
-    const currentBatch = sortedNodes.slice(0, batchSize);
+    const orderedNodes = orderer.orderNodes(nodesToRender);
+    const currentBatch = orderedNodes.slice(0, batchSize);
+    if (currentBatch.length === 0) {
+      return;
+    }
    currentBatch.forEach((node) => {
      nodesToRender.delete(node);
      nodesBeingRendered.value.add(node);
    });
    triggerRef(nodesBeingRendered);
-    if (nodesToRender.size > 0) {
-      scheduleRendering();
-    }
+    scheduler.scheduleNext(
+      () => renderNextBatch(subsequentBatchSize),
+      renderingDelayInMs,
+    );
  }

-  function shouldNodeBeRendered(node: ReadOnlyTreeNode) {
+  function shouldNodeBeRendered(node: ReadOnlyTreeNode): boolean {
    return nodesBeingRendered.value.has(node);
  }

@@ -97,21 +106,3 @@ export function useGradualNodeRendering(
    shouldRender: shouldNodeBeRendered,
  };
 }
-
-class DelayScheduler {
-  private timeoutId: ReturnType<typeof setTimeout> = null;
-
-  constructor(private delay: number) {}
-
-  schedule(callback: () => void) {
-    this.clear();
-    this.timeoutId = setTimeout(callback, this.delay);
-  }
-
-  clear() {
-    if (this.timeoutId) {
-      clearTimeout(this.timeoutId);
-      this.timeoutId = null;
-    }
-  }
-}
--- a/src/presentation/components/Scripts/View/Tree/TreeView/TreeRoot/TreeRoot.vue
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/TreeRoot/TreeRoot.vue
@@ -22,7 +22,7 @@ import {
 } from 'vue';
 import HierarchicalTreeNode from '../Node/HierarchicalTreeNode.vue';
 import { useCurrentTreeNodes } from '../UseCurrentTreeNodes';
-import { NodeRenderingStrategy } from '../Rendering/NodeRenderingStrategy';
+import { NodeRenderingStrategy } from '../Rendering/Scheduling/NodeRenderingStrategy';
 import { TreeRoot } from './TreeRoot';

 export default defineComponent({
--- a/src/presentation/components/Scripts/View/Tree/TreeView/TreeView.vue
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/TreeView.vue
@@ -68,8 +68,13 @@ export default defineComponent({
    const nodeRenderingScheduler = useGradualNodeRendering(() => tree);

    const { onNodeStateChange } = useNodeStateChangeAggregator(() => tree);
-    onNodeStateChange((node, change) => {
-      emit('nodeStateChanged', { node, change });
+
+    onNodeStateChange((change) => {
+      emit('nodeStateChanged', {
+        node: change.node,
+        newState: change.newState,
+        oldState: change.oldState,
+      });
    });

    onMounted(() => {
--- a/src/presentation/components/Scripts/View/Tree/TreeView/UseAutoUpdateChildrenCheckState.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/UseAutoUpdateChildrenCheckState.ts
@@ -6,14 +6,15 @@ import { TreeNodeCheckState } from './Node/State/CheckState';

 export function useAutoUpdateChildrenCheckState(
  treeWatcher: WatchSource<TreeRoot>,
+  useChangeAggregator = useNodeStateChangeAggregator,
 ) {
-  const { onNodeStateChange } = useNodeStateChangeAggregator(treeWatcher);
+  const { onNodeStateChange } = useChangeAggregator(treeWatcher);

-  onNodeStateChange((node, change) => {
-    if (change.newState.checkState === change.oldState.checkState) {
+  onNodeStateChange((change) => {
+    if (change.newState.checkState === change.oldState?.checkState) {
      return;
    }
-    updateChildrenCheckedState(node.hierarchy, change.newState.checkState);
+    updateChildrenCheckedState(change.node.hierarchy, change.newState.checkState);
  });
 }

--- a/src/presentation/components/Scripts/View/Tree/TreeView/UseAutoUpdateParentCheckState.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/UseAutoUpdateParentCheckState.ts
@@ -7,14 +7,15 @@ import { ReadOnlyTreeNode } from './Node/TreeNode';

 export function useAutoUpdateParentCheckState(
  treeWatcher: WatchSource<TreeRoot>,
+  useChangeAggregator = useNodeStateChangeAggregator,
 ) {
-  const { onNodeStateChange } = useNodeStateChangeAggregator(treeWatcher);
+  const { onNodeStateChange } = useChangeAggregator(treeWatcher);

-  onNodeStateChange((node, change) => {
-    if (change.newState.checkState === change.oldState.checkState) {
+  onNodeStateChange((change) => {
+    if (change.newState.checkState === change.oldState?.checkState) {
      return;
    }
-    updateNodeParentCheckedState(node.hierarchy);
+    updateNodeParentCheckedState(change.node.hierarchy);
  });
 }

--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M464 160c8.8 0 16 7.2 16 16V336c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16V176c0-8.8 7.2-16 16-16H464zM80 96C35.8 96 0 131.8 0 176V336c0 44.2 35.8 80 80 80H464c44.2 0 80-35.8 80-80V320c17.7 0 32-14.3 32-32V224c0-17.7-14.3-32-32-32V176c0-44.2-35.8-80-80-80H80zm368 96H96V320H448V192z"/></svg>`
				`@@ -0,0 +1 @@`
				<!-- Source: Font Awesome 6 --><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M384 480h48c11.4 0 21.9-6 27.6-15.9l112-192c5.8-9.9 5.8-22.1 .1-32.1S555.5 224 544 224H144c-11.4 0-21.9 6-27.6 15.9L48 357.1V96c0-8.8 7.2-16 16-16H181.5c4.2 0 8.3 1.7 11.3 4.7l26.5 26.5c21 21 49.5 32.8 79.2 32.8H416c8.8 0 16 7.2 16 16v32h48V160c0-35.3-28.7-64-64-64H298.5c-17 0-33.3-6.7-45.3-18.7L226.7 50.7c-12-12-28.3-18.7-45.3-18.7H64C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H87.7 384z"/></svg>