Fix some renderedInstances not flipping correctly

2025-10-15 10:19:04 +00:00 · 2024-09-17 14:59:03 +02:00
1727 changed files with 47744 additions and 150888 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,18 +13,17 @@ orbs:
  aws-cli: circleci/aws-cli@2.0.6
  macos: circleci/macos@2.5.1 # For Rosetta (see below)
  node: circleci/node@5.2.0 # For a recent npm version (see below)
-  win: circleci/windows@5.1.0
 jobs:
-  # Build the **entire** app for macOS (including the GDevelop.js library).
+  # Build the **entire** app for macOS.
  build-macos:
    macos:
-      xcode: 16.4.0
-    resource_class: m4pro.medium
+      xcode: 14.2.0
+    resource_class: macos.m1.large.gen1
    steps:
      - checkout
      # Install Rosetta for AWS CLI and disable TSO to speed up S3 uploads (https://support.circleci.com/hc/en-us/articles/19334402064027-Troubleshooting-slow-uploads-to-S3-for-jobs-using-an-m1-macOS-resource-class)
      - macos/install-rosetta
-      # - run: sudo sysctl net.inet.tcp.tso=0
+      - run: sudo sysctl net.inet.tcp.tso=0

      # Install a recent version of npm to workaround a notarization issue because of a symlink made by npm: https://github.com/electron-userland/electron-builder/issues/7755
      # Node.js v20.14.0 comes with npm v10.7.0.
@@ -47,9 +46,9 @@ jobs:
      # GDevelop.js dependencies
      - restore_cache:
          keys:
-            - gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
+            - gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
            # fallback to using the latest cache if no exact match is found
-            - gd-macos-nodejs-dependencies-
+            - gd-macos-nodejs-dependencies---

      - run:
          name: Install GDevelop.js dependencies
@@ -70,8 +69,7 @@ jobs:
            - newIDE/electron-app/node_modules
            - newIDE/app/node_modules
            - GDevelop.js/node_modules
-            - GDJS/node_modules
-          key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
+          key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}

      # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
      # Note: Code signing is done using CSC_LINK (see https://www.electron.build/code-signing).
@@ -88,37 +86,15 @@ jobs:
      - store_artifacts:
          path: newIDE/electron-app/dist

-
      # Upload artifacts (AWS)
      - run:
          name: Deploy to S3 (specific commit)
-          command: |
-            export PATH=~/.local/bin:$PATH
-            for i in 1 2 3 4 5 6 7; do
-              aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/ && break
-              echo "Retry $i failed... retrying in 10 seconds"
-              sleep 10
-            done
-            if [ $i -eq 7 ]; then
-              echo "All retries for deployment failed!" >&2
-              exit 1
-            fi
-
+          command: export PATH=~/.local/bin:$PATH && aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/
      - run:
          name: Deploy to S3 (latest)
-          command: |
-            export PATH=~/.local/bin:$PATH
-            for i in 1 2 3 4 5 6 7; do
-              aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/ && break
-              echo "Retry $i failed... retrying in 10 seconds"
-              sleep 10
-            done
-            if [ $i -eq 7 ]; then
-              echo "All retries for deployment failed!" >&2
-              exit 1
-            fi
+          command: export PATH=~/.local/bin:$PATH && aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/

-  # Build the app for Linux (using a pre-built GDevelop.js library).
+  # Build the **entire** app for Linux.
  build-linux:
    # CircleCI docker workers are failing if they don't have enough memory (no swap)
    resource_class: xlarge
@@ -131,33 +107,51 @@ jobs:
      - checkout
      - aws-cli/setup

-      # System dependencies (for Electron Builder)
+      # System dependencies (for Electron Builder and Emscripten)
      - run:
-          name: Update system dependencies
-          command: sudo apt-get update
+          name: Install dependencies for Emscripten
+          command: sudo apt-get update && sudo apt install cmake
+
+      - run:
+          name: Install Python3 dependencies for Emscripten
+          command: sudo apt install python-is-python3 python3-distutils -y
+
+      - run:
+          name: Install Emscripten (for GDevelop.js)
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..

      - run:
          name: Install system dependencies for Electron builder
          command: sudo apt install icnsutils && sudo apt install graphicsmagick && sudo apt install rsync

+      # GDevelop.js dependencies
      - restore_cache:
          keys:
-            - gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
+            - gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
            # fallback to using the latest cache if no exact match is found
-            - gd-linux-nodejs-dependencies-
+            - gd-linux-nodejs-dependencies---

-      # GDevelop IDE dependencies (using an exact version of GDevelop.js, built previously)
+      - run:
+          name: Install GDevelop.js dependencies and build it
+          command: cd GDevelop.js && npm install && cd ..
+
+      # Build GDevelop.js (and run tests to ensure it works)
+      - run:
+          name: Build GDevelop.js
+          # Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
+
+      # GDevelop IDE dependencies (after building GDevelop.js to avoid downloading a pre-built version)
      - run:
          name: Install GDevelop IDE dependencies
-          command: export REQUIRES_EXACT_LIBGD_JS_VERSION=true && cd newIDE/app && npm install && cd ../electron-app && npm install
+          command: cd newIDE/app && npm install && cd ../electron-app && npm install

      - save_cache:
          paths:
            - newIDE/electron-app/node_modules
            - newIDE/app/node_modules
            - GDevelop.js/node_modules
-            - GDJS/node_modules
-          key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
+          key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}

      # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
      - run:
@@ -182,7 +176,6 @@ jobs:

  # Build the WebAssembly library only (so that it's cached on a S3 and easy to re-use).
  build-gdevelop_js-wasm-only:
-    resource_class: medium+ # Compilation time decrease linearly with the number of CPUs, but not linking (so "large" does not speedup total build time).
    docker:
      - image: cimg/node:16.13

@@ -239,302 +232,17 @@ jobs:
          name: Deploy to S3 (latest)
          command: aws s3 sync Binaries/embuild/GDevelop.js s3://gdevelop-gdevelop.js/$(git rev-parse --abbrev-ref HEAD)/latest/

-  # Build the WebAssembly library with clang-tidy and memory sanitizers.
-  build-gdevelop_js-debug-sanitizers-and-extra-checks:
-    resource_class: xlarge # Total time decrease linearly with the number of CPUs.
-    docker:
-      - image: cimg/node:16.13
-
-    working_directory: ~/GDevelop
-
-    steps:
-      - checkout
-      - aws-cli/setup
-
-      # System dependencies (for Emscripten)
-      - run:
-          name: Install dependencies for Emscripten
-          command: sudo apt-get update && sudo apt install cmake
-
-      - run:
-          name: Install dependencies for clang-tidy v19
-          command: wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 19 && sudo apt install clang-tidy-19
-
-      - run:
-          name: Install Python3 dependencies for Emscripten
-          command: sudo apt install python-is-python3 python3-distutils -y
-
-      - run:
-          name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
-
-      # GDevelop.js dependencies
-      - restore_cache:
-          keys:
-            - gdevelop.js-linux-nodejs-dependencies-{{ checksum "GDevelop.js/package-lock.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - gdevelop.js-linux-nodejs-dependencies-
-
-      - run:
-          name: Install GDevelop.js dependencies and build it
-          command: cd GDevelop.js && npm install && cd ..
-
-      # Build GDevelop.js
-      - run:
-          name: Build GDevelop.js ('debug-sanitizers' variant)
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build -- --variant=debug-sanitizers
-
-      - run:
-          name: Run clang-tidy
-          command: cd GDevelop.js && npm run lint
-
-      - run:
-          name: Run tests
-          command: cd GDevelop.js && npm run test -- --maxWorkers=4
-
-      # Upload artifacts (CircleCI)
-      - store_artifacts:
-          path: Binaries/embuild/GDevelop.js
-
-      # Upload artifacts (AWS)
-      - run:
-          name: Deploy to S3 (specific commit)
-          command: aws s3 sync Binaries/embuild/GDevelop.js s3://gdevelop-gdevelop.js/$(git rev-parse --abbrev-ref HEAD)/variant/debug-sanitizers/commit/$(git rev-parse HEAD)/
-
-  # Trigger AppVeyor build, which also does a Windows build (keep it for redundancy).
-  trigger-appveyor-windows-build:
-    docker:
-      - image: cimg/node:16.13
-    steps:
-      - run:
-          name: Trigger AppVeyor Windows build
-          command: |
-            curl -H "Content-Type: application/json" \
-                 -H "Authorization: Bearer ${APPVEYOR_API_KEY}" \
-                 --data "{
-                   \"accountName\": \"4ian\",
-                   \"projectSlug\": \"gdevelop\",
-                   \"branch\": \"${CIRCLE_BRANCH}\"
-                 }" \
-                 -X POST https://ci.appveyor.com/api/builds
-
-  build-windows:
-    executor:
-      name: win/default
-      size: medium
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - run:
-          # See https://www.ssl.com/how-to/how-to-integrate-esigner-cka-with-ci-cd-tools-for-automated-code-signing/
-          #
-          # This is necessary because of "signing to be FIPS-140 compliant". See
-          # https://github.com/electron-userland/electron-builder/issues/6158
-          #
-          # Make sure to DISABLE "malware blocker" in SSL.com to avoid errors like:
-          # Error information: "Error: SignerSign() failed." (-2146893821/0x80090003)
-          name: Download and Unzip eSignerCKA Setup
-          command: |
-
-            Invoke-WebRequest -OutFile eSigner_CKA_1.0.3.zip "https://www.ssl.com/download/ssl-com-esigner-cka-1-0-3"
-
-            Expand-Archive -Force eSigner_CKA_1.0.3.zip
-
-            Remove-Item eSigner_CKA_1.0.3.zip
-
-            Move-Item -Destination "eSigner_CKA_1.0.3.exe" -Path "eSigner_CKA_*\*.exe"
-      - run:
-          name: Setup eSignerCKA in Silent Mode
-          command: |
-
-            mkdir -p "/home/circleci/project/eSignerCKA"
-
-            ./eSigner_CKA_1.0.3.exe /CURRENTUSER /VERYSILENT /SUPPRESSMSGBOXES /DIR="/home/circleci/project/eSignerCKA" | Out-Null
-      - run:
-          name: Config Account Information on eSignerCKA
-          command: |
-
-            /home/circleci/project/eSignerCKA/eSignerCKATool.exe config -mode product -user "$env:ESIGNER_USER_NAME" -pass "$env:ESIGNER_USER_PASSWORD" -totp "$env:ESIGNER_USER_TOTP" -key "/home/circleci/project/eSignerCKA/master.key" -r
-      - run:
-          name: Load Certificate into Windows Store
-          command: |
-
-            /home/circleci/project/eSignerCKA/eSignerCKATool.exe unload
-
-            /home/circleci/project/eSignerCKA/eSignerCKATool.exe load
-      - run:
-          name: Select Certificate From Windows Store and Sign Sample File with SignTool
-          command: |
-
-            $CodeSigningCert = Get-ChildItem Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1
-
-            echo Certificate: $CodeSigningCert
-
-      - restore_cache:
-          name: Restore node_modules cache
-          keys:
-            - v1-win-node-{{ checksum "newIDE/app/package-lock.json" }}-{{ checksum "newIDE/electron-app/package-lock.json" }}-{{ checksum "GDJS/package-lock.json" }}
-            - v1-win-node-
-
-      - run:
-          name: Install dependencies
-          no_output_timeout: 25m
-          # Remove package-lock.json because they seems to cause the npm install to be stuck. We should try again after re-generating them.
-          # Also install setuptools as something requires distutils in electron-app, and it was removed in Python 3.12.
-          # setuptools will make distutils available again (but we should migrate our packages probably).
-          command: |
-            pip install setuptools
-
-            cd newIDE\app
-
-            npm -v
-
-            Remove-Item package-lock.json
-
-            $Env:REQUIRES_EXACT_LIBGD_JS_VERSION = "true"
-
-            npm install
-
-            cd ..\electron-app
-
-            Remove-Item package-lock.json
-
-            npm install
-
-            cd ..\..
-
-      - save_cache:
-          name: Save node_modules cache
-          key: v1-win-node-{{ checksum "newIDE/app/package-lock.json" }}-{{ checksum "newIDE/electron-app/package-lock.json" }}-{{ checksum "GDJS/package-lock.json" }}
-          paths:
-            - newIDE/app/node_modules
-            - newIDE/electron-app/node_modules
-            - GDJS/node_modules
-
-      - run:
-          name: Build NSIS executable (with code signing)
-          command: |
-            cd newIDE\electron-app
-
-            $CodeSigningCert = Get-ChildItem Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1
-
-            echo Certificate: $CodeSigningCert
-
-            # Use a custom signtool path because of the signtool.exe bundled withy electron-builder not working for some reason.
-            # Can also be found in versioned folders like "C:/Program Files (x86)/Windows Kits/10/bin/10.0.22000.0/x86/signtool.exe".
-            # or "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\signtool.exe".
-
-            $Env:SIGNTOOL_PATH = "C:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe"
-
-            # Extract thumbprint and subject name of the certificate (will be passed to electron-builder).
-
-            $Env:GD_SIGNTOOL_THUMBPRINT = $CodeSigningCert.Thumbprint
-
-            $Env:GD_SIGNTOOL_SUBJECT_NAME = ($CodeSigningCert.Subject -replace ", ?", "`n" | ConvertFrom-StringData).CN
-
-            # Build the nsis installer (signed: electron-builder will use SignTool.exe with the certificate)
-
-            node scripts/build.js --win nsis --publish=never
-
-            cd ..\..
-      - run:
-          name: Build AppX (without code signing)
-          # Don't sign the appx (it will be signed by the Microsoft Store).
-          command: |
-            cd newIDE\electron-app
-
-            # Build the appx (not signed). Ensure all variables used for code signing are empty.
-
-            $Env:GD_SIGNTOOL_THUMBPRINT = ''
-
-            $Env:GD_SIGNTOOL_SUBJECT_NAME = ''
-
-            $Env:CSC_LINK = ''
-
-            $Env:CSC_KEY_PASSWORD = ''
-
-            node scripts/build.js --skip-app-build --win appx --publish=never
-
-            cd ..\..
-
-      - run:
-          name: Clean binaries
-          shell: cmd.exe
-          command: |
-            rmdir /s /q newIDE\electron-app\dist\win-unpacked
-
-      - run:
-          name: Install AWS CLI
-          command: |
-            # Install the CLI for the current user
-
-            pip install --quiet --upgrade --user awscli
-
-            # Add the user-Scripts dir to PATH for this step and the next.
-
-            $binDir = (python -m site --user-base) + "\Scripts"
-            $Env:Path += ";$binDir"
-
-            # Sanity check:
-            aws --version
-
-      # Upload artifacts (S3)
-      - run:
-          name: Deploy to S3 (specific commit)
-          command: |
-            aws s3 sync newIDE\electron-app\dist "s3://gdevelop-releases/$Env:CIRCLE_BRANCH/commit/$Env:CIRCLE_SHA1/"
-
-      - run:
-          name: Deploy to S3 (latest)
-          command: |
-            aws s3 sync newIDE\electron-app\dist "s3://gdevelop-releases/$Env:CIRCLE_BRANCH/latest/"
-
-      # Upload artifacts (CircleCI)
-      - store_artifacts:
-          path: newIDE/electron-app/dist
-
 workflows:
-  gdevelop_js-wasm-extra-checks:
-    jobs:
-      - build-gdevelop_js-debug-sanitizers-and-extra-checks:
-          # Extra checks are resource intensive so don't always run them.
-          filters:
-            branches:
-              only:
-                - master
-                - /experimental-build.*/
  builds:
    jobs:
      - build-gdevelop_js-wasm-only
      - build-macos:
-          # The macOS version builds by itself GDevelop.js
-          # (so we verify we can build it on macOS).
-          # requires:
-          #   - build-gdevelop_js-wasm-only
          filters:
            branches:
              only:
                - master
                - /experimental-build.*/
      - build-linux:
-          requires:
-            - build-gdevelop_js-wasm-only
-          filters:
-            branches:
-              only:
-                - master
-                - /experimental-build.*/
-      - build-windows:
-          requires:
-            - build-gdevelop_js-wasm-only
-          filters:
-            branches:
-              only:
-                - master
-                - /experimental-build.*/
-      - trigger-appveyor-windows-build:
-          requires:
-            - build-gdevelop_js-wasm-only
          filters:
            branches:
              only:
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,4 +0,0 @@
-Checks: 'clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,-cppcoreguidelines-explicit-virtual-functions,-cppcoreguidelines-avoid-const-or-ref-data-members,-cppcoreguidelines-special-member-functions,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-non-private-member-variables-in-classes,-cppcoreguidelines-owning-memory,-cppcoreguidelines-virtual-class-destructor,-clang-analyzer-optin.performance.Padding,-cppcoreguidelines-narrowing-conversions'
-WarningsAsErrors: 'cppcoreguidelines-pro-type-member-init, clang-analyzer-optin.cplusplus.UninitializedObject'
-HeaderFilterRegex: '.*'
-FormatStyle: none
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,7 +3,6 @@ Extensions/ParticleSystem/SPARK/* linguist-vendored
 Extensions/PhysicsBehavior/Box2D/* linguist-vendored
 Extensions/PhysicsBehavior/box2djs/* linguist-vendored
 Extensions/Physics2Behavior/box2d.js linguist-vendored
-Extensions/Physics3DBehavior/*.wasm-compat.js linguist-vendored
 Extensions/BBText/pixi-multistyle-text/* linguist-vendored
 Extensions/P2P/A_peer.js linguist-vendored
 Extensions/Multiplayer/peer.js linguist-vendored
--- a/.github/workflows/gdcore-tools-hook.yml
+++ b/.github/workflows/gdcore-tools-hook.yml
@@ -1,22 +0,0 @@
-# This worflow notifies arthuro555's gdcore-tools repository when a new release is published.
-#
-# This is used to allow gdcore-tools, a library to use GDCore outside of GDevelop,
-# to attempt to automatically build, test, and publish a release for the new
-# GDevelop version.
-name: Trigger gdcore-tools pipeline
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  dispatch-event:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.GDCORE_TOOLS_PAT }}
-          repository: arthuro555/gdcore-tools
-          event-type: gdevelop-release
-          client-payload: '{"release": ${{ toJson(github.event.release) }}}'
--- a/.github/workflows/update-extension-translations.yml
+++ b/.github/workflows/update-extension-translations.yml
@@ -1,47 +0,0 @@
-# GitHub Action to update extension translations.
-# It copies the latest messages.js files from the GDevelop-extensions repository
-# and opens a Pull Request with the changes on GDevelop's repository.
-
-name: Update extension translations
-on:
-  push:
-    branches:
-      - master
-    tags-ignore:
-      - "**" # Don't run on new tags
-  workflow_dispatch: # Allows manual triggering from the Actions tab
-
-jobs:
-  update-extension-translations:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout current repository
-        uses: actions/checkout@v3
-
-      - name: Clone GDevelop-extensions repository
-        run: git clone https://github.com/GDevelopApp/GDevelop-extensions.git /tmp/GDevelop-extensions
-
-      - name: Copy and rename translation files
-        run: |
-          mkdir -p newIDE/app/src/locales
-          for folder in /tmp/GDevelop-extensions/.translations/*; do
-            if [ -d "$folder" ]; then
-              lang=$(basename "$folder")
-              mkdir -p "newIDE/app/src/locales/$lang"
-              cp "$folder/messages.js" "newIDE/app/src/locales/$lang/extension-messages.js"
-            fi
-          done
-          cp /tmp/GDevelop-extensions/.translations/LocalesMetadata.js newIDE/app/src/locales/ExtensionLocalesMetadata.js
-
-      - name: Create Pull Request with updated translations
-        uses: peter-evans/create-pull-request@v6
-        with:
-          commit-message: Update extension translations [skip ci]
-          branch: chore/update-extension-translations
-          delete-branch: true
-          title: "[Auto PR] Update extension translations"
-          body: |
-            This updates the extension translations by copying the latest messages.js files from the GDevelop-extensions repository.
-            Each messages.js file is renamed to extension-messages.js and placed in the corresponding language folder under `newIDE/app/src/locales`.
-
-            Please review the changes carefully before merging.
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,3 @@
 .Spotlight-V100
 .Trashes
 Thumbs.db
-.claude
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -114,8 +114,7 @@
    "__bits": "cpp",
    "__verbose_abort": "cpp",
    "variant": "cpp",
-    "charconv": "cpp",
-    "execution": "cpp"
+    "charconv": "cpp"
  },
  "files.exclude": {
    "Binaries/*build*": true,
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -38,7 +38,8 @@
      "presentation": {
        "reveal": "silent"
      },
-      "isBackground": true
+      "isBackground": true,
+      "runOptions": { "instanceLimit": 1, "runOn": "folderOpen" }
    },
    {
      "type": "npm",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,18 +69,12 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	# uninitialized variables or other hard to debug bugs.
 	add_compile_options(
 		-Wall
-		-Wextra
-		-Wuninitialized
-		-Wconditional-uninitialized
 		-Wno-unknown-warning-option
 		-Wno-reorder-ctor
 		-Wno-reorder
-		-Wno-unused-parameter
 		-Wno-pessimizing-move
-		-Wno-unused-variable # Not a good style, but not a risk
+		-Wno-unused-variable
 		-Wno-unused-private-field
-		-Wno-ignored-qualifiers # Not a risk
-		-Wno-sign-compare # Not a big risk

 		# Make as much warnings considered as errors as possible (only one for now).
 		-Werror=return-stack-address
--- a/Core/GDCore/Events/Builtin/GroupEvent.cpp
+++ b/Core/GDCore/Events/Builtin/GroupEvent.cpp
@@ -61,12 +61,10 @@ void GroupEvent::UnserializeFrom(gd::Project& project,
      project, events, element.GetChild("events"));

  parameters.clear();
-  if (element.HasChild("parameters")) {
-    gd::SerializerElement& parametersElement = element.GetChild("parameters");
-    parametersElement.ConsiderAsArrayOf("parameters");
-    for (std::size_t i = 0; i < parametersElement.GetChildrenCount(); ++i)
-      parameters.push_back(parametersElement.GetChild(i).GetValue().GetString());
-  }
+  gd::SerializerElement& parametersElement = element.GetChild("parameters");
+  parametersElement.ConsiderAsArrayOf("parameters");
+  for (std::size_t i = 0; i < parametersElement.GetChildrenCount(); ++i)
+    parameters.push_back(parametersElement.GetChild(i).GetValue().GetString());
 }

 void GroupEvent::SetBackgroundColor(unsigned int colorR_,
--- a/Core/GDCore/Events/Builtin/LinkEvent.cpp
+++ b/Core/GDCore/Events/Builtin/LinkEvent.cpp
@@ -163,21 +163,6 @@ void LinkEvent::UnserializeFrom(gd::Project& project,
  // end of compatibility code
 }

-vector<gd::String> LinkEvent::GetAllSearchableStrings() const {
-  vector<gd::String> allSearchableStrings;
-
-  allSearchableStrings.push_back(target);
-
-  return allSearchableStrings;
-}
-
-bool LinkEvent::ReplaceAllSearchableStrings(
-    std::vector<gd::String> newSearchableString) {
-  if (newSearchableString[0] == target) return false;
-  SetTarget(newSearchableString[0]);
-  return true;
-}
-
 bool LinkEvent::AcceptVisitor(gd::EventVisitor &eventVisitor) {
  return BaseEvent::AcceptVisitor(eventVisitor) ||
         eventVisitor.VisitLinkEvent(*this);
--- a/Core/GDCore/Events/Builtin/LinkEvent.h
+++ b/Core/GDCore/Events/Builtin/LinkEvent.h
@@ -109,10 +109,6 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {

  virtual bool IsExecutable() const override { return true; };

-  virtual std::vector<gd::String> GetAllSearchableStrings() const override;
-  virtual bool ReplaceAllSearchableStrings(
-      std::vector<gd::String> newSearchableString) override;
-
  virtual void SerializeTo(SerializerElement& element) const override;
  virtual void UnserializeFrom(gd::Project& project,
                               const SerializerElement& element) override;
--- a/Core/GDCore/Events/Builtin/WhileEvent.h
+++ b/Core/GDCore/Events/Builtin/WhileEvent.h
@@ -72,6 +72,8 @@ class GD_CORE_API WhileEvent : public gd::BaseEvent {
                              ///< de/activate infinite loop warning when the
                              ///< user create the event

+  mutable unsigned int whileConditionsHeight;
+
  int GetConditionsHeight() const;
  int GetActionsHeight() const;
  int GetWhileConditionsHeight() const;
--- a/Core/GDCore/Events/CodeGeneration/DiagnosticReport.h
+++ b/Core/GDCore/Events/CodeGeneration/DiagnosticReport.h
@@ -14,10 +14,10 @@
 namespace gd {

 /**
- * \brief
+ * \brief 
 */
 class GD_CORE_API ProjectDiagnostic {
- public:
+public:
  enum ErrorType {
    UndeclaredVariable,
    MissingBehavior,
@@ -25,17 +25,12 @@ class GD_CORE_API ProjectDiagnostic {
    MismatchedObjectType,
  };

-  ProjectDiagnostic(ErrorType type_,
-                    const gd::String &message_,
+  ProjectDiagnostic(ErrorType type_, const gd::String &message_,
                    const gd::String &actualValue_,
-                    const gd::String &expectedValue_,
-                    const gd::String &objectName_ = "")
-      : type(type_),
-        message(message_),
-        actualValue(actualValue_),
-        expectedValue(expectedValue_),
-        objectName(objectName_) {};
-  virtual ~ProjectDiagnostic() {};
+                    const gd::String &expectedValue_, const gd::String &objectName_ = "")
+      : type(type_), message(message_), actualValue(actualValue_), expectedValue(expectedValue_),
+        objectName(objectName_){};
+  virtual ~ProjectDiagnostic(){};

  ErrorType GetType() const { return type; };
  const gd::String &GetMessage() const { return message; }
@@ -43,7 +38,7 @@ class GD_CORE_API ProjectDiagnostic {
  const gd::String &GetActualValue() const { return actualValue; }
  const gd::String &GetExpectedValue() const { return expectedValue; }

- private:
+private:
  ErrorType type;
  gd::String message;
  gd::String objectName;
@@ -52,12 +47,12 @@ class GD_CORE_API ProjectDiagnostic {
 };

 /**
- * \brief
+ * \brief 
 */
 class GD_CORE_API DiagnosticReport {
- public:
-  DiagnosticReport() {};
-  virtual ~DiagnosticReport() {};
+public:
+  DiagnosticReport(){};
+  virtual ~DiagnosticReport(){};

  void Add(const gd::ProjectDiagnostic &projectDiagnostic) {
    projectDiagnostics.push_back(
@@ -72,39 +67,32 @@ class GD_CORE_API DiagnosticReport {

  const gd::String &GetSceneName() const { return sceneName; }

-  void SetSceneName(const gd::String &sceneName_) { sceneName = sceneName_; }
-
-  void LogAllDiagnostics() {
-    for (auto &diagnostic : projectDiagnostics) {
-      std::cout << diagnostic->GetMessage()
-                << "(object: " << diagnostic->GetObjectName()
-                << ", actual value: " << diagnostic->GetActualValue()
-                << ", expected value: " << diagnostic->GetExpectedValue() << ")"
-                << std::endl;
-    }
+  void SetSceneName(const gd::String &sceneName_) {
+    sceneName = sceneName_;
  }

- private:
+private:
  std::vector<std::unique_ptr<gd::ProjectDiagnostic>> projectDiagnostics;
  gd::String sceneName;
 };

 /**
- * \brief
+ * \brief 
 */
 class GD_CORE_API WholeProjectDiagnosticReport {
- public:
-  WholeProjectDiagnosticReport() {};
-  virtual ~WholeProjectDiagnosticReport() {};
+public:
+  WholeProjectDiagnosticReport(){};
+  virtual ~WholeProjectDiagnosticReport(){};

  const DiagnosticReport &Get(std::size_t index) const {
    return *diagnosticReports[index].get();
  };

-  void Clear() { diagnosticReports.clear(); };
+  void Clear() {
+    diagnosticReports.clear();
+  };

-  DiagnosticReport &AddNewDiagnosticReportForScene(
-      const gd::String &sceneName) {
+  DiagnosticReport& AddNewDiagnosticReportForScene(const gd::String &sceneName) {
    auto diagnosticReport = gd::make_unique<gd::DiagnosticReport>();
    diagnosticReport->SetSceneName(sceneName);
    diagnosticReports.push_back(std::move(diagnosticReport));
@@ -114,7 +102,7 @@ class GD_CORE_API WholeProjectDiagnosticReport {
  std::size_t Count() const { return diagnosticReports.size(); };

  bool HasAnyIssue() {
-    for (auto &diagnosticReport : diagnosticReports) {
+    for (auto& diagnosticReport : diagnosticReports) {
      if (diagnosticReport->Count() > 0) {
        return true;
      }
@@ -122,8 +110,8 @@ class GD_CORE_API WholeProjectDiagnosticReport {
    return false;
  }

- private:
+private:
  std::vector<std::unique_ptr<gd::DiagnosticReport>> diagnosticReports;
 };

-}  // namespace gd
+} // namespace gd
--- a/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp
+++ b/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp
@@ -345,14 +345,14 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
        gd::ProjectDiagnostic projectDiagnostic(
            gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
            objectInParameter, "");
-        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+        diagnosticReport->Add(projectDiagnostic);
        return "/* Unknown object - skipped. */";
      } else if (!expectedObjectType.empty() &&
                 actualObjectType != expectedObjectType) {
        gd::ProjectDiagnostic projectDiagnostic(
            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
            actualObjectType, expectedObjectType, objectInParameter);
-        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+        diagnosticReport->Add(projectDiagnostic);
        return "/* Mismatched object type - skipped. */";
      }
    }
@@ -509,7 +509,7 @@ void EventsCodeGenerator::CheckBehaviorParameters(
            gd::ProjectDiagnostic projectDiagnostic(
                gd::ProjectDiagnostic::ErrorType::MissingBehavior, "",
                actualBehaviorType, expectedBehaviorType, lastObjectName);
-            if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+            diagnosticReport->Add(projectDiagnostic);
          }
        }
      });
@@ -567,14 +567,14 @@ gd::String EventsCodeGenerator::GenerateActionCode(
        gd::ProjectDiagnostic projectDiagnostic(
            gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
            objectInParameter, "");
-        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+        diagnosticReport->Add(projectDiagnostic);
        return "/* Unknown object - skipped. */";
      } else if (!expectedObjectType.empty() &&
                 actualObjectType != expectedObjectType) {
        gd::ProjectDiagnostic projectDiagnostic(
            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
            actualObjectType, expectedObjectType, objectInParameter);
-        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+        diagnosticReport->Add(projectDiagnostic);
        return "/* Mismatched object type - skipped. */";
      }
    }
@@ -1358,30 +1358,12 @@ gd::String EventsCodeGenerator::GeneratePropertyGetter(const gd::PropertiesConta
  return "getProperty" + property.GetName() + "As" + type + "()";
 }

-gd::String EventsCodeGenerator::GeneratePropertyGetterWithoutCasting(
-    const gd::PropertiesContainer &propertiesContainer,
-    const gd::NamedPropertyDescriptor &property) {
-  return "getProperty" + property.GetName() + "()";
-}
-
-gd::String EventsCodeGenerator::GeneratePropertySetterWithoutCasting(
-    const gd::PropertiesContainer &propertiesContainer,
-    const gd::NamedPropertyDescriptor &property,
-    const gd::String &operandCode) {
-  return "setProperty" + property.GetName() + "(" + operandCode + ")";
-    }
-
 gd::String EventsCodeGenerator::GenerateParameterGetter(const gd::ParameterMetadata& parameter,
                                                        const gd::String& type,
                                                        gd::EventsCodeGenerationContext& context) {
  return "getParameter" + parameter.GetName() + "As" + type + "()";
 }

-gd::String EventsCodeGenerator::GenerateParameterGetterWithoutCasting(
-    const gd::ParameterMetadata &parameter) {
-      return "getParameter" + parameter.GetName() + "()";
-    }
-
 EventsCodeGenerator::EventsCodeGenerator(const gd::Project& project_,
                                         const gd::Layout& layout,
                                         const gd::Platform& platform_)
--- a/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h
+++ b/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h
@@ -467,14 +467,7 @@ class GD_CORE_API EventsCodeGenerator {
   */
  virtual gd::String GetCodeNamespace() { return ""; };

-  enum VariableScope {
-    LAYOUT_VARIABLE = 0,
-    PROJECT_VARIABLE,
-    OBJECT_VARIABLE,
-    ANY_VARIABLE,
-    VARIABLE_OR_PROPERTY,
-    VARIABLE_OR_PROPERTY_OR_PARAMETER
-  };
+  enum VariableScope { LAYOUT_VARIABLE = 0, PROJECT_VARIABLE, OBJECT_VARIABLE, ANY_VARIABLE };

  /**
   * Generate a single unique number for the specified instruction.
@@ -517,11 +510,6 @@ class GD_CORE_API EventsCodeGenerator {
  GenerateAnyOrSceneVariableGetter(const gd::Expression &variableExpression,
                                   EventsCodeGenerationContext &context);

-  virtual gd::String GeneratePropertySetterWithoutCasting(
-      const gd::PropertiesContainer &propertiesContainer,
-      const gd::NamedPropertyDescriptor &property,
-      const gd::String &operandCode);
-
 protected:
  virtual const gd::String GenerateRelationalOperatorCodes(
      const gd::String& operatorString);
@@ -577,8 +565,7 @@ protected:
      const gd::String& variableName,
      const VariableScope& scope,
      gd::EventsCodeGenerationContext& context,
-      const gd::String& objectName,
-      bool hasChild) {
+      const gd::String& objectName) {
    // This code is only used as a mock.
    // See the real implementation in GDJS.
    if (scope == LAYOUT_VARIABLE) {
@@ -586,9 +573,7 @@ protected:

    } else if (scope == PROJECT_VARIABLE) {
      return "getProjectVariable(" + variableName + ")";
-    } else if (scope == ANY_VARIABLE || scope == VARIABLE_OR_PROPERTY ||
-               scope == VARIABLE_OR_PROPERTY_OR_PARAMETER) {
-      // TODO Split the 3 cases to make tests stronger.
+    } else if (scope == ANY_VARIABLE) {
      return "getAnyVariable(" + variableName + ")";
    }

@@ -642,18 +627,11 @@ protected:
      const gd::String& type,
      gd::EventsCodeGenerationContext& context);

-  virtual gd::String GeneratePropertyGetterWithoutCasting(
-      const gd::PropertiesContainer &propertiesContainer,
-      const gd::NamedPropertyDescriptor &property);
-
  virtual gd::String GenerateParameterGetter(
      const gd::ParameterMetadata& parameter,
      const gd::String& type,
      gd::EventsCodeGenerationContext& context);

-  virtual gd::String
-  GenerateParameterGetterWithoutCasting(const gd::ParameterMetadata &parameter);
-
  /**
   * \brief Generate the code to reference an object which is
   * in an empty/null state.
--- a/Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp
+++ b/Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp
@@ -135,20 +135,18 @@ void ExpressionCodeGenerator::OnVisitVariableNode(VariableNode& node) {
    EventsCodeGenerator::VariableScope scope =
        type == "variable"
            ? gd::EventsCodeGenerator::ANY_VARIABLE
-        : type == "variableOrProperty"
-            ? gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY
-        : type == "variableOrPropertyOrParameter"
-            ? gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY_OR_PARAMETER
-        : type == "globalvar" ? gd::EventsCodeGenerator::PROJECT_VARIABLE
-        : type == "scenevar"  ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
-                              : gd::EventsCodeGenerator::OBJECT_VARIABLE;
+        : type == "globalvar"
+            ? gd::EventsCodeGenerator::PROJECT_VARIABLE
+            : type == "scenevar"
+                  ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
+                  : gd::EventsCodeGenerator::OBJECT_VARIABLE;

    auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
                                          codeGenerator.GetObjectsContainersList(),
                                          rootObjectName,
                                          node);
    output += codeGenerator.GenerateGetVariable(
-        node.name, scope, context, objectName, node.child != nullptr);
+        node.name, scope, context, objectName);
    if (node.child) node.child->Visit(*this);
  } else {
    // The node represents a variable or an object variable in an expression waiting for its *value* to be returned.
@@ -165,7 +163,7 @@ void ExpressionCodeGenerator::OnVisitVariableNode(VariableNode& node) {
      output += codeGenerator.GenerateVariableValueAs(type);
    }, [&]() {
      output += codeGenerator.GenerateGetVariable(
-          node.name, gd::EventsCodeGenerator::ANY_VARIABLE, context, "", node.child != nullptr);
+          node.name, gd::EventsCodeGenerator::ANY_VARIABLE, context, "");
      if (node.child) node.child->Visit(*this);
      output += codeGenerator.GenerateVariableValueAs(type);
    }, [&]() {
@@ -186,9 +184,8 @@ void ExpressionCodeGenerator::OnVisitVariableAccessorNode(
    VariableAccessorNode& node) {
    if (!objectNameToUseForVariableAccessor.empty()) {
      // Use the name of the object passed by the parent, as we need both to access an object variable.
-      output += codeGenerator.GenerateGetVariable(
-          node.name, gd::EventsCodeGenerator::OBJECT_VARIABLE, context,
-          objectNameToUseForVariableAccessor, node.child != nullptr);
+      output += codeGenerator.GenerateGetVariable(node.name,
+          gd::EventsCodeGenerator::OBJECT_VARIABLE, context, objectNameToUseForVariableAccessor);

      // We have accessed an object variable, from now we can continue accessing the child variables
      // (including using the bracket notation).
@@ -225,27 +222,24 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
    output +=
        codeGenerator.GenerateObject(node.identifierName, type, context);
  } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
-    EventsCodeGenerator::VariableScope scope =
+      EventsCodeGenerator::VariableScope scope =
        type == "variable"
            ? gd::EventsCodeGenerator::ANY_VARIABLE
-        : type == "variableOrProperty"
-            ? gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY
-        : type == "variableOrPropertyOrParameter"
-            ? gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY_OR_PARAMETER
-        : type == "globalvar" ? gd::EventsCodeGenerator::PROJECT_VARIABLE
-        : type == "scenevar"  ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
-                              : gd::EventsCodeGenerator::OBJECT_VARIABLE;
+        : type == "globalvar"
+              ? gd::EventsCodeGenerator::PROJECT_VARIABLE
+              : type == "scenevar"
+                    ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
+                    : gd::EventsCodeGenerator::OBJECT_VARIABLE;

-    auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-        codeGenerator.GetPlatform(), codeGenerator.GetObjectsContainersList(),
-        rootObjectName, node);
-    output += codeGenerator.GenerateGetVariable(
-        node.identifierName, scope, context, objectName,
-        !node.childIdentifierName.empty());
-    if (!node.childIdentifierName.empty()) {
-      output +=
-          codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
-    }
+      auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
+                                            codeGenerator.GetObjectsContainersList(),
+                                            rootObjectName,
+                                            node);
+      output += codeGenerator.GenerateGetVariable(
+          node.identifierName, scope, context, objectName);
+      if (!node.childIdentifierName.empty()) {
+        output += codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
+      }
  } else {
    const auto& variablesContainersList = codeGenerator.GetProjectScopedContainers().GetVariablesContainersList();
    const auto& propertiesContainersList = codeGenerator.GetProjectScopedContainers().GetPropertiesContainersList();
@@ -255,13 +249,12 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
    codeGenerator.GetProjectScopedContainers().MatchIdentifierWithName<void>(node.identifierName, [&]() {
      // Generate the code to access the object variable.
      output += codeGenerator.GenerateGetVariable(
-          node.childIdentifierName, gd::EventsCodeGenerator::OBJECT_VARIABLE,
-          context, node.identifierName, !node.childIdentifierName.empty());
+        node.childIdentifierName, gd::EventsCodeGenerator::OBJECT_VARIABLE, context, node.identifierName);
      output += codeGenerator.GenerateVariableValueAs(type);
    }, [&]() {
      output += codeGenerator.GenerateGetVariable(
-          node.identifierName, gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY_OR_PARAMETER, context,
-          "", !node.childIdentifierName.empty());
+          node.identifierName, gd::EventsCodeGenerator::ANY_VARIABLE, context,
+          "");
      if (!node.childIdentifierName.empty()) {
        output += codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
      }
--- a/Core/GDCore/Events/Event.cpp
+++ b/Core/GDCore/Events/Event.cpp
@@ -18,6 +18,8 @@ namespace gd {

 EventsList BaseEvent::badSubEvents;
 VariablesContainer BaseEvent::badLocalVariables;
+std::vector<gd::String> BaseEvent::emptyDependencies;
+gd::String BaseEvent::emptySourceFile;

 BaseEvent::BaseEvent()
    : totalTimeDuringLastSession(0),
--- a/Core/GDCore/Events/Event.h
+++ b/Core/GDCore/Events/Event.h
@@ -175,6 +175,26 @@ class GD_CORE_API BaseEvent {
        noExpr;
    return noExpr;
  };
+
+  /**
+   * \brief Returns the dependencies on source files of the project.
+   * \note Default implementation returns an empty list of dependencies. This is
+   * fine for most events that are not related to adding custom user source
+   * code.
+   */
+  virtual const std::vector<gd::String>& GetSourceFileDependencies() const {
+    return emptyDependencies;
+  };
+
+  /**
+   * \brief Returns the name of the source file associated with the event
+   * \note Default implementation returns an empty string. This is fine for most
+   * events that are not related to adding custom user source code.
+   */
+  virtual const gd::String& GetAssociatedGDManagedSourceFile(
+      gd::Project& project) const {
+    return emptySourceFile;
+  };
  ///@}

  /** \name Code generation
@@ -286,20 +306,6 @@ class GD_CORE_API BaseEvent {
   * \brief True if the event should be folded in the events editor.
   */
  bool IsFolded() const { return folded; }
-
-  /**
-   * \brief Set the AI generated event ID.
-   */
-  void SetAiGeneratedEventId(const gd::String& aiGeneratedEventId_) {
-    aiGeneratedEventId = aiGeneratedEventId_;
-  }
-
-  /**
-   * \brief Get the AI generated event ID.
-   */
-  const gd::String& GetAiGeneratedEventId() const {
-    return aiGeneratedEventId;
-  }
  ///@}

  std::weak_ptr<gd::BaseEvent>
@@ -318,10 +324,11 @@ class GD_CORE_API BaseEvent {
  bool disabled;    ///< True if the event is disabled and must not be executed
  gd::String type;  ///< Type of the event. Must be assigned at the creation.
                    ///< Used for saving the event for instance.
-  gd::String aiGeneratedEventId;  ///< When generated by an AI/external tool.

  static gd::EventsList badSubEvents;
  static gd::VariablesContainer badLocalVariables;
+  static std::vector<gd::String> emptyDependencies;
+  static gd::String emptySourceFile;
 };

 /**
--- a/Core/GDCore/Events/Parsers/ExpressionParser2Node.h
+++ b/Core/GDCore/Events/Parsers/ExpressionParser2Node.h
@@ -36,8 +36,8 @@ struct GD_CORE_API ExpressionParserLocation {

 private:
  bool isValid;
-  size_t startPosition = 0;
-  size_t endPosition = 0;
+  size_t startPosition;
+  size_t endPosition;
 };

 /**
--- a/Core/GDCore/Events/Serialization.cpp
+++ b/Core/GDCore/Events/Serialization.cpp
@@ -221,8 +221,6 @@ void EventsListSerialization::UnserializeEventsFrom(

    event->SetDisabled(eventElem.GetBoolAttribute("disabled", false));
    event->SetFolded(eventElem.GetBoolAttribute("folded", false));
-    event->SetAiGeneratedEventId(
-        eventElem.GetStringAttribute("aiGeneratedEventId", ""));

    list.InsertEvent(event, list.GetEventsCount());
  }
@@ -238,8 +236,6 @@ void EventsListSerialization::SerializeEventsTo(const EventsList& list,
    if (event.IsDisabled())
      eventElem.SetAttribute("disabled", event.IsDisabled());
    if (event.IsFolded()) eventElem.SetAttribute("folded", event.IsFolded());
-    if (!event.GetAiGeneratedEventId().empty())
-      eventElem.SetAttribute("aiGeneratedEventId", event.GetAiGeneratedEventId());
    eventElem.AddChild("type").SetValue(event.GetType());

    event.SerializeTo(eventElem);
--- a/Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp
@@ -141,8 +141,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                    "res/function32.png")
      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
      .SetRelevantForFunctionEventsOnly()
-      .MarkAsAdvanced()
-      .SetHidden();
+      .MarkAsAdvanced();

  extension
      .AddExpression(
@@ -178,8 +177,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
      .UseStandardRelationalOperatorParameters(
          "number", gd::ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddCondition(
@@ -193,8 +191,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
      .UseStandardRelationalOperatorParameters(
          "string", gd::ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 }

 }  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp
@@ -37,8 +37,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .SetIcon("res/actions/position24_black.png");
  extension.AddInstructionOrExpressionGroupMetadata(_("Angle"))
      .SetIcon("res/actions/direction24_black.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
-      "res/actions/scale24_black.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
+      .SetIcon("res/actions/scale24_black.png");

  gd::ObjectMetadata& obj = extension.AddObject<gd::ObjectConfiguration>(
      "", _("Base object"), _("Base object"), "res/objeticon24.png");
@@ -117,7 +117,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                _("Change the position of the center of _PARAM0_: _PARAM1_ "
                  "_PARAM2_ (x "
                  "axis), _PARAM3_ _PARAM4_ (y axis)"),
-                _("Position ❯ Center"),
+                _("Position/Center"),
                "res/actions/position24_black.png",
                "res/actions/position_black.png")
      .AddParameter("object", _("Object"))
@@ -133,7 +133,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Center X position"),
         _("the X position of the center of rotation"),
         _("the X position of the center"),
-         _("Position ❯ Center"),
+         _("Position/Center"),
         "res/actions/position24_black.png")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -144,7 +144,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Center Y position"),
         _("the Y position of the center of rotation"),
         _("the Y position of the center"),
-         _("Position ❯ Center"),
+         _("Position/Center"),
         "res/actions/position24_black.png")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -155,7 +155,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                _("the bounding box (the area encapsulating "
                                  "the object) left position"),
                                _("the bounding box left position"),
-                                _("Position ❯ Bounding Box"),
+                                _("Position/Bounding Box"),
                                "res/conditions/bounding-box-left_black.svg")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -166,7 +166,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Bounding box top position"),
         _("the bounding box (the area encapsulating the object) top position"),
         _("the bounding box top position"),
-         _("Position ❯ Bounding Box"),
+         _("Position/Bounding Box"),
         "res/conditions/bounding-box-top_black.svg")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -177,7 +177,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                _("the bounding box (the area encapsulating "
                                  "the object) right position"),
                                _("the bounding box right position"),
-                                _("Position ❯ Bounding Box"),
+                                _("Position/Bounding Box"),
                                "res/conditions/bounding-box-right_black.svg")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -188,7 +188,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                _("the bounding box (the area encapsulating "
                                  "the object) bottom position"),
                                _("the bounding box bottom position"),
-                                _("Position ❯ Bounding Box"),
+                                _("Position/Bounding Box"),
                                "res/conditions/bounding-box-bottom_black.svg")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -199,7 +199,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                _("the bounding box (the area encapsulating "
                                  "the object) center X position"),
                                _("the bounding box center X position"),
-                                _("Position ❯ Bounding Box"),
+                                _("Position/Bounding Box"),
                                "res/conditions/bounding-box-center_black.svg")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -210,7 +210,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                _("the bounding box (the area encapsulating "
                                  "the object) center Y position"),
                                _("the bounding box center Y position"),
-                                _("Position ❯ Bounding Box"),
+                                _("Position/Bounding Box"),
                                "res/conditions/bounding-box-center_black.svg")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -235,8 +235,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

  obj.AddAction("SetAngle",
                _("Angle"),
-                _("Change the angle of rotation of an object (in degrees). For "
-                  "3D objects, this is the rotation around the Z axis."),
+                _("Change the angle of rotation of an object (in degrees)."),
                _("the angle"),
                _("Angle"),
                "res/actions/direction24_black.png",
@@ -251,12 +250,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
  obj.AddAction("Rotate",
                _("Rotate"),
                _("Rotate an object, clockwise if the speed is positive, "
-                  "counterclockwise otherwise. For 3D objects, this is the "
-                  "rotation around the Z axis."),
+                  "counterclockwise otherwise."),
                _("Rotate _PARAM0_ at speed _PARAM1_ deg/second"),
                _("Angle"),
                "res/actions/rotate24_black.png",
                "res/actions/rotate_black.png")
+
      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Angular speed (in degrees per second)"))
      .AddCodeOnlyParameter("currentScene", "")
@@ -270,6 +269,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Angle"),
         "res/actions/rotate24_black.png",
         "res/actions/rotate_black.png")
+
      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Angle to rotate towards (in degrees)"))
      .AddParameter("expression", _("Angular speed (in degrees per second)"))
@@ -285,6 +285,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Angle"),
         "res/actions/rotate24_black.png",
         "res/actions/rotate_black.png")
+
      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("X position"))
      .AddParameter("expression", _("Y position"))
@@ -303,12 +304,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Movement using forces"),
         "res/actions/force24.png",
         "res/actions/force.png")
+
      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Speed on X axis (in pixels per second)"))
      .AddParameter("expression", _("Speed on Y axis (in pixels per second)"))
      .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
-      .SetDefaultValue("0")
-      .SetHelpPath("/tutorials/how-to-move-objects/");
+      .SetDefaultValue("0");

  obj.AddAction("AddForceAL",
                _("Add a force (angle)"),
@@ -320,12 +321,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                _("Movement using forces"),
                "res/actions/force24.png",
                "res/actions/force.png")
+
      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Angle"))
      .AddParameter("expression", _("Speed (in pixels per second)"))
      .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
      .SetDefaultValue("0")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .MarkAsAdvanced();

  obj.AddAction(
@@ -338,13 +339,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Movement using forces"),
         "res/actions/force24.png",
         "res/actions/force.png")
+
      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("X position"))
      .AddParameter("expression", _("Y position"))
      .AddParameter("expression", _("Speed (in pixels per second)"))
      .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
      .SetDefaultValue("0")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .MarkAsAdvanced();

  obj.AddAction(
@@ -359,13 +360,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Movement using forces"),
         "res/actions/forceTourne24.png",
         "res/actions/forceTourne.png")
+
      .AddParameter("object", _("Object"))
      .AddParameter("expression", "X position of the center")
      .AddParameter("expression", "Y position of the center")
      .AddParameter("expression", "Speed (in Degrees per seconds)")
      .AddParameter("expression", "Distance (in pixels)")
      .AddParameter("forceMultiplier", "Force multiplier")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .SetHidden();

  obj.AddAction("Arreter",
@@ -375,8 +376,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                _("Movement using forces"),
                "res/actions/arreter24.png",
                "res/actions/arreter.png")
+
      .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .MarkAsAdvanced();

  obj.AddAction("Delete",
@@ -417,7 +418,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .MarkAsAdvanced();

  obj.AddAction("SetNumberObjectVariable",
-                _("Change object variable value"),
+                _("Change variable value"),
                _("Modify the number value of an object variable."),
                _("the variable _PARAM1_"),
                _("Variables"),
@@ -428,11 +429,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("objectvar", _("Variable"))
      .UseStandardOperatorParameters("number",
                                     ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForLayoutEventsOnly();

  obj.AddAction("SetStringObjectVariable",
-                _("Change object variable value"),
+                _("Change text variable"),
                _("Modify the text of an object variable."),
                _("the variable _PARAM1_"),
                _("Variables"),
@@ -443,11 +443,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("objectvar", _("Variable"))
      .UseStandardOperatorParameters("string",
                                     ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForLayoutEventsOnly();

  obj.AddAction("SetBooleanObjectVariable",
-                _("Change object variable value"),
+                _("Change boolean variable"),
                _("Modify the boolean value of an object variable."),
                _("Change the variable _PARAM1_ of _PARAM0_: _PARAM2_"),
                _("Variables"),
@@ -459,11 +458,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      // This parameter allows to keep the operand expression
      // when the editor switch between variable instructions.
      .AddCodeOnlyParameter("yesorno", _("Value"))
-      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForLayoutEventsOnly();

  obj.AddCondition("NumberObjectVariable",
-                   _("Object variable value"),
+                   _("Variable value"),
                   _("Compare the number value of an object variable."),
                   _("the variable _PARAM1_"),
                   _("Variables"),
@@ -474,11 +472,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("objectvar", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForLayoutEventsOnly();

  obj.AddCondition("StringObjectVariable",
-                   _("Object variable value"),
+                   _("Text variable"),
                   _("Compare the text of an object variable."),
                   _("the variable _PARAM1_"),
                   _("Variables"),
@@ -489,11 +486,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("objectvar", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "string", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForLayoutEventsOnly();

  obj.AddCondition("BooleanObjectVariable",
-                   _("Object variable value"),
+                   _("Boolean variable"),
                   _("Compare the boolean value of an object variable."),
                   _("The variable _PARAM1_ of _PARAM0_ is _PARAM2_"),
                   _("Variables"),
@@ -506,7 +502,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      // This parameter allows to keep the operand expression
      // when the editor switch between variable instructions.
      .AddCodeOnlyParameter("yesorno", _("Value"))
-      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForLayoutEventsOnly();

  obj.AddAction("ModVarObjet",
@@ -519,7 +514,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Variable"))
-      .SetHelpPath("/all-features/variables/object-variables/")
      .UseStandardOperatorParameters("number",
                                     ParameterOptions::MakeNewOptions())
      .SetRelevantForFunctionEventsOnly();
@@ -534,7 +528,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Variable"))
-      .SetHelpPath("/all-features/variables/object-variables/")
      .UseStandardOperatorParameters("string",
                                     ParameterOptions::MakeNewOptions())
      .SetRelevantForFunctionEventsOnly();
@@ -551,7 +544,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Variable"))
      .AddParameter("trueorfalse", _("New Value:"))
-      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForFunctionEventsOnly();

  obj.AddAction(
@@ -568,7 +560,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Variable"))
-      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForFunctionEventsOnly();

  obj.AddCondition("ObjectVariableChildExists",
@@ -576,26 +567,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   _("Check if the specified child of the object "
                     "structure variable exists."),
                   _("Child _PARAM2_ of variable _PARAM1_ of _PARAM0_ exists"),
-                   _("Variables ❯ Arrays and structures"),
+                   _("Variables/Arrays and structures"),
                   "res/conditions/var24.png",
                   "res/conditions/var.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Structure variable"))
      .AddParameter("string", _("Name of the child"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  obj.AddAction("ObjectVariableRemoveChild",
                _("Remove a child"),
                _("Remove a child from an object structure variable."),
                _("Remove child _PARAM2_ from variable _PARAM1_ of _PARAM0_"),
-                _("Variables ❯ Arrays and structures"),
+                _("Variables/Arrays and structures"),
                "res/actions/var24.png",
                "res/actions/var.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Structure variable"))
      .AddParameter("string", _("Child's name"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  obj.AddAction("ObjectVariableClearChildren",
@@ -603,12 +592,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                _("Remove all the children from the object array or structure "
                  "variable."),
                _("Clear children from variable _PARAM1_ of _PARAM0_"),
-                _("Variables ❯ Arrays and structures"),
+                _("Variables/Arrays and structures"),
                "res/actions/var24.png",
                "res/actions/var.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Array or structure variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  obj.AddAction("Cache",
@@ -636,8 +624,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

  obj.AddCondition("Angle",
                   _("Angle"),
-                   _("Compare the angle, in degrees, of the specified object. "
-                     "For 3D objects, this is the angle around the Z axis."),
+                   _("Compare the angle of the specified object."),
                   _("the angle (in degrees)"),
                   _("Angle"),
                   "res/conditions/direction24_black.png",
@@ -704,8 +691,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   _("Movement using forces"),
                   "res/conditions/arret24.png",
                   "res/conditions/arret.png")
+
      .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .MarkAsAdvanced();

  obj.AddCondition("Vitesse",
@@ -715,10 +702,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   _("Movement using forces"),
                   "res/conditions/vitesse24.png",
                   "res/conditions/vitesse.png")
+
      .AddParameter("object", _("Object"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .MarkAsAdvanced();

  // Deprecated
@@ -735,7 +722,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Angle, in degrees"))
      .AddParameter("expression", _("Tolerance, in degrees"))
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .MarkAsAdvanced();

  obj.AddCondition("IsTotalForceAngleAround",
@@ -749,7 +735,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Angle, in degrees"))
      .AddParameter("expression", _("Tolerance, in degrees"))
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .MarkAsAdvanced();

  obj.AddCondition("VarObjet",
@@ -764,7 +749,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("objectvar", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForFunctionEventsOnly();

  obj.AddCondition("VarObjetTxt",
@@ -779,7 +763,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("objectvar", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "string", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForFunctionEventsOnly();

  obj.AddCondition("ObjectVariableAsBoolean",
@@ -794,7 +777,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("objectvar", _("Variable"))
      .AddParameter("trueorfalse", _("Check if the value is"))
      .SetDefaultValue("true")
-      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForFunctionEventsOnly();

  obj.AddCondition("VarObjetDef",
@@ -811,44 +793,42 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

  obj.AddAction(
         "PushStringToObjectVariable",
-         _("Add value to object array variable"),
+         _("Add text variable"),
         _("Adds a text (string) to the end of an object array variable."),
         _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
         "res/actions/var24.png",
         "res/actions/var.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Array variable"))
      .AddParameter("string", _("Text to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced()
      .SetRelevantForLayoutEventsOnly();

  obj.AddAction("PushNumberToObjectVariable",
-                _("Add value to object array variable"),
+                _("Add variable array value"),
                _("Adds a number to the end of an object array variable."),
                _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-                _("Variables ❯ Arrays and structures"),
+                _("Variables/Arrays and structures"),
                "res/actions/var24.png",
                "res/actions/var.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Array variable"))
      .AddParameter("expression", _("Number to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced()
      .SetRelevantForLayoutEventsOnly();

-  obj.AddAction("PushBooleanToObjectVariable",
-                _("Add value to object array variable"),
-                _("Adds a boolean to the end of an object array variable."),
-                _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-                _("Variables ❯ Arrays and structures"),
-                "res/actions/var24.png",
-                "res/actions/var.png")
+  obj.AddAction(
+         "PushBooleanToObjectVariable",
+         _("Add boolean variable"),
+         _("Adds a boolean to the end of an object array variable."),
+         _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
+         "res/actions/var24.png",
+         "res/actions/var.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Array variable"))
      .AddParameter("trueorfalse", _("Boolean to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced()
      .SetRelevantForLayoutEventsOnly();

@@ -858,7 +838,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Add existing variable"),
         _("Adds an existing variable to the end of an object array variable."),
         _("Add variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
         "res/actions/var24.png",
         "res/actions/var.png")
      .AddParameter("object", _("Object"))
@@ -867,7 +847,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .SetParameterLongDescription(_("The content of the object variable will "
                                     "*be copied* and added at the "
                                     "end of the array."))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced()
      .SetHidden();

@@ -876,7 +855,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Add existing variable"),
         _("Adds an existing variable to the end of an object array variable."),
         _("Add variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
         "res/actions/var24.png",
         "res/actions/var.png")
      .AddParameter("object", _("Object"))
@@ -885,7 +864,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .SetParameterLongDescription(_("The content of the object variable will "
                                     "*be copied* and added at the "
                                     "end of the array."))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  obj.AddAction(
@@ -893,13 +871,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Add text variable"),
         _("Adds a text (string) to the end of an object array variable."),
         _("Add text _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
         "res/actions/var24.png",
         "res/actions/var.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Array variable"))
      .AddParameter("string", _("Text to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced()
      .SetRelevantForFunctionEventsOnly();

@@ -907,13 +884,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                _("Add number variable"),
                _("Adds a number to the end of an object array variable."),
                _("Add number _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-                _("Variables ❯ Arrays and structures"),
+                _("Variables/Arrays and structures"),
                "res/actions/var24.png",
                "res/actions/var.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Array variable"))
      .AddParameter("expression", _("Number to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced()
      .SetRelevantForFunctionEventsOnly();

@@ -922,13 +898,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Add boolean variable"),
         _("Adds a boolean to the end of an object array variable."),
         _("Add boolean _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
         "res/actions/var24.png",
         "res/actions/var.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Array variable"))
      .AddParameter("trueorfalse", _("Boolean to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced()
      .SetRelevantForFunctionEventsOnly();

@@ -939,13 +914,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "variable."),
         _("Remove variable at index _PARAM2_ from array variable _PARAM1_ of "
           "_PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
         "res/actions/var24.png",
         "res/actions/var.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Array variable"))
      .AddParameter("expression", _("Index to remove"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  obj.AddCondition(
@@ -953,14 +927,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Number of children"),
         _("Compare the number of children in an object array variable."),
         _("The number of children in the array variable _PARAM1_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
         "res/conditions/var24.png",
         "res/conditions/var.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  obj.AddStrExpression(
@@ -968,44 +941,40 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("First text child"),
         _("Get the value of the first element of an object array variable, if "
           "it is a text (string) variable."),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
         "res/actions/var.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("objectvar", _("Array variable"));

  obj.AddExpression(
         "ArrayVariableFirstNumber",
         _("First number child"),
         _("Get the value of the first element of an object array variable, if "
           "it is a number variable."),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
         "res/actions/var.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("objectvar", _("Array variable"));

  obj.AddStrExpression(
         "ArrayVariableLastString",
         _("Last text child"),
         _("Get the value of the last element of an object array variable, if "
           "it is a text (string) variable."),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
         "res/actions/var.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("objectvar", _("Array variable"));

  obj.AddExpression(
         "ArrayVariableLastNumber",
         _("Last number child"),
         _("Get the value of the last element of an object array variable, if "
           "it is a number variable."),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
         "res/actions/var.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("objectvar", _("Array variable"));

  obj.AddCondition("BehaviorActivated",
                   _("Behavior activated"),
@@ -1040,12 +1009,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                _("Movement using forces"),
                "res/actions/forceVers24.png",
                "res/actions/forceVers.png")
+
      .AddParameter("object", _("Object"))
      .AddParameter("objectPtr", _("Target Object"))
      .AddParameter("expression", _("Speed (in pixels per second)"))
      .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
      .SetDefaultValue("0")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .MarkAsAdvanced();

  obj.AddAction(
@@ -1060,13 +1029,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Movement using forces"),
         "res/actions/forceTourne24.png",
         "res/actions/forceTourne.png")
+
      .AddParameter("object", _("Object"))
      .AddParameter("objectPtr", _("Rotate around this object"))
      .AddParameter("expression", _("Speed (in degrees per second)"))
      .AddParameter("expression", _("Distance (in pixels)"))
      .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
      .SetDefaultValue("0")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .MarkAsAdvanced();

  obj.AddAction("MettreAutour",
@@ -1094,10 +1063,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                _("Movement using forces"),
                "res/actions/ecarter24.png",
                "res/actions/ecarter.png")
+
      .SetHidden()
      .AddParameter("object", _("Object"))
-      .AddParameter("objectList", "Object 2 (won't move)")
-      .SetHelpPath("/tutorials/how-to-move-objects/");
+      .AddParameter("objectList", "Object 2 (won't move)");

  // Deprecated action
  obj.AddAction("Ecarter",
@@ -1121,6 +1090,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                _("Position"),
                "res/actions/ecarter24.png",
                "res/actions/ecarter.png")
+
      .AddParameter("object", _("Object"))
      .AddParameter("objectList", _("Objects (won't move)"))
      .AddParameter("yesorno",
@@ -1129,7 +1099,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "",
                    true)
      .SetDefaultValue("no")
-      .SetHelpPath("/all-features/collisions/")
      .MarkAsSimple();

  obj.AddCondition("CollisionPoint",
@@ -1142,7 +1111,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("X position of the point"))
      .AddParameter("expression", _("Y position of the point"))
-      .SetHelpPath("/all-features/collisions/")
      .MarkAsSimple();

  extension
@@ -1174,7 +1142,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("object", _("Object"))
      .AddParameter("identifier", _("Timer's name"), "objectTimer")
      .AddParameter("expression", _("Time in seconds"))
-      .SetHelpPath("/all-features/timers-and-time/")
      .SetHidden();

  obj.AddCondition(
@@ -1190,7 +1157,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("identifier", _("Timer's name"), "objectTimer")
      .AddParameter("relationalOperator", _("Sign of the test"), "time")
      .AddParameter("expression", _("Time in seconds"))
-      .SetHelpPath("/all-features/timers-and-time/")
      .SetManipulatedType("number");

  obj.AddCondition("ObjectTimerPaused",
@@ -1202,7 +1168,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   "res/conditions/timerPaused.png")
      .AddParameter("object", _("Object"))
      .AddParameter("identifier", _("Timer's name"), "objectTimer")
-      .SetHelpPath("/all-features/timers-and-time/")
      .MarkAsAdvanced();

  obj.AddAction(
@@ -1215,8 +1180,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         "res/actions/timer24.png",
         "res/actions/timer.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
-      .SetHelpPath("/all-features/timers-and-time/");
+      .AddParameter("identifier", _("Timer's name"), "objectTimer");

  obj.AddAction("PauseObjectTimer",
                _("Pause an object timer"),
@@ -1227,7 +1191,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                "res/actions/pauseTimer.png")
      .AddParameter("object", _("Object"))
      .AddParameter("identifier", _("Timer's name"), "objectTimer")
-      .SetHelpPath("/all-features/timers-and-time/")
      .MarkAsAdvanced();

  obj.AddAction("UnPauseObjectTimer",
@@ -1239,7 +1202,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                "res/actions/unPauseTimer.png")
      .AddParameter("object", _("Object"))
      .AddParameter("identifier", _("Timer's name"), "objectTimer")
-      .SetHelpPath("/all-features/timers-and-time/")
      .MarkAsAdvanced();

  obj.AddAction("RemoveObjectTimer",
@@ -1251,7 +1213,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                "res/actions/timer.png")
      .AddParameter("object", _("Object"))
      .AddParameter("identifier", _("Timer's name"), "objectTimer")
-      .SetHelpPath("/all-features/timers-and-time/")
      .MarkAsAdvanced();

  obj.AddExpression("X",
@@ -1270,8 +1231,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

  obj.AddExpression("Angle",
                    _("Angle"),
-                    _("Current angle, in degrees, of the object. For 3D "
-                      "objects, this is the angle around the Z axis."),
+                    _("Current angle, in degrees, of the object"),
                    _("Angle"),
                    "res/actions/direction_black.png")
      .AddParameter("object", _("Object"));
@@ -1281,32 +1241,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("X coordinate of the sum of forces"),
                    _("Movement using forces"),
                    "res/actions/force.png")
-      .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/");
+      .AddParameter("object", _("Object"));

  obj.AddExpression("ForceY",
                    _("Y coordinate of the sum of forces"),
                    _("Y coordinate of the sum of forces"),
                    _("Movement using forces"),
                    "res/actions/force.png")
-      .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/");
+      .AddParameter("object", _("Object"));

  obj.AddExpression("ForceAngle",
                    _("Angle of the sum of forces"),
                    _("Angle of the sum of forces (in degrees)"),
                    _("Movement using forces"),
                    "res/actions/force.png")
-      .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/");
+      .AddParameter("object", _("Object"));

  obj.AddExpression("ForceLength",
                    _("Length of the sum of forces"),
                    _("Length of the sum of forces"),
                    _("Movement using forces"),
                    "res/actions/force.png")
-      .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/");
+      .AddParameter("object", _("Object"));

  obj.AddExpression("Longueur",
                    _("Length of the sum of forces"),
@@ -1314,7 +1270,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Movement using forces"),
                    "res/actions/force.png")
      .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .SetHidden();

  obj.AddExpression("Width",
@@ -1411,11 +1366,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         "VariableChildCount",
         _("Number of children"),
         _("Number of children in an object array or structure variable"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
         "res/actions/var.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array or structure variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("objectvar", _("Array or structure variable"));

  obj.AddStrExpression("VariableString",
                       _("Text variable"),
@@ -1424,7 +1378,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "res/actions/var.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Variable"))
-      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForFunctionEventsOnly();

  obj.AddExpression("ObjectTimerElapsedTime",
@@ -1433,8 +1386,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Timers"),
                    "res/actions/time.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
-      .SetHelpPath("/all-features/timers-and-time/");
+      .AddParameter("identifier", _("Timer's name"), "objectTimer");

  obj.AddExpression("AngleToObject",
                    _("Angle between two objects"),
@@ -1574,9 +1526,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
  extension
      .AddAction("Create",
                 _("Create an object"),
-                 _("Create an instance of the object at the specified position."
-                   "The created object instance will be available for the next "
-                   "actions and sub-events."),
+                 _("Create an object at specified position"),
                 _("Create object _PARAM1_ at position _PARAM2_;_PARAM3_ "
                   "(layer: _PARAM4_)"),
                 "",
@@ -1656,7 +1606,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/actions/doMove24.png",
          "res/actions/doMove.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .MarkAsAdvanced();

  extension
@@ -1672,7 +1621,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("objectList", _("Object 2"))
      .AddParameter("expression", _("Tolerance, in degrees"))
      .AddCodeOnlyParameter("conditionInverted", "")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
      .MarkAsAdvanced();

  extension
@@ -1805,7 +1753,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "",
                    true)
      .SetDefaultValue("no")
-      .SetHelpPath("/all-features/collisions/")
      .MarkAsSimple();

  extension
@@ -1821,22 +1768,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("expression",
                    _("Angle of tolerance, in degrees (0: minimum tolerance)"))
      .AddCodeOnlyParameter("conditionInverted", "")
-      .SetHidden()
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("IsTurnedTowardObject",
-                    _("An object is turned toward another"),
-                    _("Check if an object is turned toward another"),
-                    _("_PARAM0_ is turned toward _PARAM1_ ± _PARAM2_°"),
-                    _("Angle"),
-                    "res/conditions/estTourne24.png",
-                    "res/conditions/estTourne.png")
-      .AddParameter("objectList", _("Name of the object"))
-      .AddParameter("objectList", _("Name of the second object"))
-      .AddParameter("expression",
-                    _("Angle of tolerance, in degrees (0: minimum tolerance)"))
-      .AddCodeOnlyParameter("conditionInverted", "")
      .MarkAsAdvanced();

  extension
@@ -1868,7 +1799,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Scene variable where to store the Y position of the intersection. "
            "If no intersection is found, the variable won't be changed."))
      .AddCodeOnlyParameter("conditionInverted", "")
-      .SetHelpPath("/all-features/collisions/")
      .MarkAsAdvanced();

  extension
@@ -1900,7 +1830,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Scene variable where to store the Y position of the intersection. "
            "If no intersection is found, the variable won't be changed."))
      .AddCodeOnlyParameter("conditionInverted", "")
-      .SetHelpPath("/all-features/collisions/")
      .MarkAsAdvanced();

  extension
--- a/Core/GDCore/Extensions/Builtin/Capabilities/AnimatableExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/AnimatableExtension.cpp
@@ -18,21 +18,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
    gd::PlatformExtension& extension) {
  extension
      .SetExtensionInformation("AnimatableCapability",
-                               _("Objects with animations"),
-                               _("Actions and conditions for objects having animations (sprite, 3D models...)."),
+                               _("Animatable capability"),
+                               _("Animate objects."),
                               "Florian Rival",
                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects with animations"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Animatable capability"))
      .SetIcon("res/actions/animation24.png");
  extension.AddInstructionOrExpressionGroupMetadata(_("Animations and images"))
      .SetIcon("res/actions/animation24.png");

  gd::BehaviorMetadata& aut = extension.AddBehavior(
      "AnimatableBehavior",
-      _("Objects with animations"),
+      _("Animatable capability"),
      "Animation",
-      _("Actions and conditions for objects having animations (sprite, 3D models...).."),
+      _("Animate objects."),
      "",
      "res/actions/animation24.png",
      "AnimatableBehavior",
--- a/Core/GDCore/Extensions/Builtin/Capabilities/EffectExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/EffectExtension.cpp
@@ -18,8 +18,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
    gd::PlatformExtension& extension) {
  extension
      .SetExtensionInformation("EffectCapability",
-                               _("Objects with effects"),
-                               _("Actions/conditions to enable/disable and change parameters of visual effects applied on objects."),
+                               _("Effect capability"),
+                               _("Apply visual effects to objects."),
                               "Florian Rival",
                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects");
@@ -28,9 +28,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(

  gd::BehaviorMetadata& aut = extension.AddBehavior(
      "EffectBehavior",
-      _("Objects with effects"),
+      _("Effect capability"),
      "Effect",
-      _("Actions/conditions to enable/disable and change parameters of visual effects applied on objects."),
+      _("Apply visual effects to objects."),
      "",
      "res/actions/effect_black.svg",
      "EffectBehavior",
--- a/Core/GDCore/Extensions/Builtin/Capabilities/FlippableExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/FlippableExtension.cpp
@@ -18,8 +18,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFlippableExtension(
    gd::PlatformExtension& extension) {
  extension
      .SetExtensionInformation("FlippableCapability",
-                               _("Flippable objects"),
-                               _("Actions/conditions for objects which can be flipped horizontally or vertically."),
+                               _("Flippable capability"),
+                               _("Flip objects."),
                               "Florian Rival",
                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects");
@@ -28,9 +28,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFlippableExtension(

  gd::BehaviorMetadata& aut = extension.AddBehavior(
      "FlippableBehavior",
-      _("Flippable objects"),
+      _("Flippable capability"),
      "Flippable",
-      _("Actions/conditions for objects which can be flipped horizontally or vertically."),
+      _("Flip objects."),
      "",
      "res/actions/flipX24.png",
      "FlippableBehavior",
--- a/Core/GDCore/Extensions/Builtin/Capabilities/OpacityExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/OpacityExtension.cpp
@@ -18,30 +18,27 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
    gd::PlatformExtension& extension) {
  extension
      .SetExtensionInformation("OpacityCapability",
-                               _("Objects with opacity"),
-                               _("Action/condition/expression to change or "
-                                 "check the opacity of an object (0-255)."),
+                               _("Opacity capability"),
+                               _("Change the object opacity."),
                               "Florian Rival",
                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects with opacity"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Opacity capability"))
      .SetIcon("res/actions/opacity24.png");
  extension.AddInstructionOrExpressionGroupMetadata(_("Visibility"))
      .SetIcon("res/actions/opacity24.png");

-  gd::BehaviorMetadata& aut =
-      extension
-          .AddBehavior("OpacityBehavior",
-                       _("Objects with opacity"),
-                       "Opacity",
-                       _("Action/condition/expression to change or check the "
-                         "opacity of an object (0-255)."),
-                       "",
-                       "res/actions/opacity24.png",
-                       "OpacityBehavior",
-                       std::make_shared<gd::Behavior>(),
-                       std::make_shared<gd::BehaviorsSharedData>())
-          .SetHidden();
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "OpacityBehavior",
+      _("Opacity capability"),
+      "Opacity",
+      _("Change the object opacity."),
+      "",
+      "res/actions/opacity24.png",
+      "OpacityBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();

  aut.AddExpressionAndConditionAndAction(
         "number",
@@ -55,9 +52,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
      .AddParameter("object", _("Object"))
      .AddParameter("behavior", _("Behavior"), "OpacityBehavior")
      .UseStandardParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Opacity (0-255)")))
+          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
+                        _("Opacity (0-255)")))
      .SetFunctionName("setOpacity")
      .SetGetter("getOpacity");
  aut.GetAllExpressions()["Value"].SetGroup("");
--- a/Core/GDCore/Extensions/Builtin/Capabilities/ResizableExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/ResizableExtension.cpp
@@ -16,13 +16,11 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
    gd::PlatformExtension &extension) {
  extension
-      .SetExtensionInformation(
-          "ResizableCapability",
-          _("Resizable objects"),
-          _("Change or compare the size (width/height) of an object which can "
-            "be resized (i.e: most objects)."),
-          "Florian Rival",
-          "Open source (MIT License)")
+      .SetExtensionInformation("ResizableCapability",
+                               _("Resizable capability"),
+                               _("Change the object dimensions."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects");
  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
      "res/actions/scale24_black.png");
@@ -30,10 +28,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
  gd::BehaviorMetadata &aut =
      extension
          .AddBehavior("ResizableBehavior",
-                       _("Resizable objects"),
+                       _("Resizable capability"),
                       "Resizable",
-                       _("Change or compare the size (width/height) of an "
-                         "object which can be resized (i.e: most objects)."),
+                       _("Change the object dimensions."),
                       "",
                       "res/actions/scale24_black.png",
                       "ResizableBehavior",
--- a/Core/GDCore/Extensions/Builtin/Capabilities/ScalableExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/ScalableExtension.cpp
@@ -18,30 +18,27 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
    gd::PlatformExtension& extension) {
  extension
      .SetExtensionInformation("ScalableCapability",
-                               _("Scalable objects"),
-                               _("Actions/conditions/expression to change or "
-                                 "check the scale of an object (default: 1)."),
+                               _("Scalable capability"),
+                               _("Change the object scale."),
                               "Florian Rival",
                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable objects"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable capability"))
+      .SetIcon("res/actions/scale24_black.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
      .SetIcon("res/actions/scale24_black.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
-      "res/actions/scale24_black.png");

-  gd::BehaviorMetadata& aut =
-      extension
-          .AddBehavior("ScalableBehavior",
-                       _("Scalable objects"),
-                       "Scale",
-                       _("Actions/conditions/expression to change or check the "
-                         "scale of an object (default: 1)."),
-                       "",
-                       "res/actions/scale24_black.png",
-                       "ResizableBehavior",
-                       std::make_shared<gd::Behavior>(),
-                       std::make_shared<gd::BehaviorsSharedData>())
-          .SetHidden();
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "ScalableBehavior",
+      _("Scalable capability"),
+      "Scale",
+      _("Change the object scale."),
+      "",
+      "res/actions/scale24_black.png",
+      "ResizableBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();

  aut.AddExpressionAndConditionAndAction(
         "number",
--- a/Core/GDCore/Extensions/Builtin/Capabilities/TextContainerExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/TextContainerExtension.cpp
@@ -18,19 +18,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTextContainerExtension(
    gd::PlatformExtension& extension) {
  extension
      .SetExtensionInformation("TextContainerCapability",
-                               _("Objects containing a text"),
-                               _("Allows an object to contain a text, usually shown on screen, that can be modified."),
+                               _("Text capability"),
+                               _("Animate objects."),
                               "Florian Rival",
                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects containing a text"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Text capability"))
      .SetIcon("res/conditions/text24_black.png");

  gd::BehaviorMetadata& aut = extension.AddBehavior(
      "TextContainerBehavior",
-      _("Objects containing a text"),
+      _("Text capability"),
      "Text",
-      _("Allows an object to contain a text, usually shown on screen, that can be modified."),
+      _("Access objects text."),
      "",
      "res/conditions/text24_black.png",
      "TextContainerBehavior",
--- a/Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp
@@ -16,9 +16,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
      .SetExtensionInformation(
          "BuiltinCommonConversions",
          _("Conversion"),
-          "Expressions to convert numbers to string, strings to numbers, "
-          "angles (degrees from/to radians) and a GDevelop variable to/from a "
-          "JSON string.",
+          "Expressions to convert number, texts and quantities.",
          "Florian Rival",
          "Open source (MIT License)")
      .SetExtensionHelpPath("/all-features/common-conversions");
@@ -43,7 +41,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(

  extension
      .AddStrExpression("LargeNumberToString",
-                        _("Number > Text (without scientific notation)"),
+                        _("Number > Text ( without scientific notation )"),
                        _("Convert the result of the expression to text, "
                          "without using the scientific notation"),
                        "",
@@ -74,8 +72,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                        _("Convert a variable to JSON"),
                        _("JSON"),
                        "res/conditions/toujours24_black.png")
-      .AddParameter("variable",
-                    _("The variable to be stringified"),
+      .AddParameter("variable", _("The variable to be stringified"),
                    "AllowUndeclaredVariable");

  // Deprecated
--- a/Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp
@@ -59,57 +59,47 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
  // end of compatibility code

  extension
-      .AddCondition(
-          "Or",
-          _("Or"),
-          _("Checks if at least one sub-condition is true. If no "
-            "sub-condition is specified, it will always be false. "
-            "This is rarely used — multiple events and sub-events are "
-            "usually a better approach."),
-          _("If one of these conditions is true:"),
-          "",
-          "res/conditions/or24_black.png",
-          "res/conditions/or_black.png")
+      .AddCondition("Or",
+                    _("Or"),
+                    _("Check if one of the sub conditions is true"),
+                    _("If one of these conditions is true:"),
+                    "",
+                    "res/conditions/or24_black.png",
+                    "res/conditions/or_black.png")
+      .SetCanHaveSubInstructions()
+      .MarkAsAdvanced();
+
+  extension
+      .AddCondition("And",
+                    _("And"),
+                    _("Check if all sub conditions are true"),
+                    _("If all of these conditions are true:"),
+                    "",
+                    "res/conditions/and24_black.png",
+                    "res/conditions/and_black.png")
      .SetCanHaveSubInstructions()
      .MarkAsAdvanced();

  extension
      .AddCondition(
-          "And",
-          _("And"),
-          _("Checks if all sub-conditions are true. If no sub-condition is "
-            "specified, it will always be false. This is rarely needed, as "
-            "events already check all conditions before running actions."),
-          _("If all of these conditions are true:"),
+          "Not",
+          _("Not"),
+          _("Return the contrary of the result of the sub conditions"),
+          _("Invert the logical result of these conditions:"),
          "",
-          "res/conditions/and24_black.png",
-          "res/conditions/and_black.png")
+          "res/conditions/not24_black.png",
+          "res/conditions/not_black.png")
      .SetCanHaveSubInstructions()
      .MarkAsAdvanced();

-  extension
-      .AddCondition("Not",
-                    _("Not"),
-                    _("Returns the opposite of the sub-condition(s) result. "
-                      "This is rarely needed, as most conditions can be "
-                      "inverted or expressed more simply."),
-                    _("Invert the logical result of these conditions:"),
-                    "",
-                    "res/conditions/not24_black.png",
-                    "res/conditions/not_black.png")
-      .SetCanHaveSubInstructions()
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("Once",
-                    _("Trigger once while true"),
-                    _("Run actions only once, for each time the conditions "
-                      "have been met."),
-                    _("Trigger once"),
-                    "",
-                    "res/conditions/once24.png",
-                    "res/conditions/once.png")
-      .SetHelpPath("/all-features/advanced-conditions/trigger-once");
+  extension.AddCondition(
+      "Once",
+      _("Trigger once while true"),
+      _("Run actions only once, for each time the conditions have been met."),
+      _("Trigger once"),
+      "",
+      "res/conditions/once24.png",
+      "res/conditions/once.png");

  extension
      .AddCondition("CompareNumbers",
--- a/Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp
@@ -28,7 +28,7 @@ BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(
      .AddAction("CreateObjectsFromExternalLayout",
                 _("Create objects from an external layout"),
                 _("Create objects from an external layout."),
-                 _("Create objects from the external layout named _PARAM1_ at position _PARAM2_;_PARAM3_;_PARAM4_"),
+                 _("Create objects from the external layout named _PARAM1_"),
                 "",
                 "res/ribbon_default/externallayout32.png",
                 "res/ribbon_default/externallayout32.png")
--- a/Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp
@@ -15,11 +15,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
      .SetExtensionInformation(
          "BuiltinKeyboard",
          _("Keyboard"),
-          _("Conditions to check keys pressed on a keyboard. Note that this "
+          _("Allows your game to respond to keyboard input. Note that this "
            "does not work with on-screen keyboard on touch devices: use "
-            "instead mouse/touch conditions when making a game for "
-            "mobile/touchscreen devices or when making a new game from "
-            "scratch."),
+            "instead conditions related to touch when making a game for "
+            "mobile/touchscreen devices."),
          "Florian Rival",
          "Open source (MIT License)")
      .SetExtensionHelpPath("/all-features/keyboard")
@@ -36,8 +35,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
                    "res/conditions/keyboard24.png",
                    "res/conditions/keyboard.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("key", _("Key to check"))
-      .SetHidden();
+      .AddParameter("key", _("Key"));

  extension
      .AddCondition("KeyReleased",
@@ -48,32 +46,33 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
                    "res/conditions/keyboard24.png",
                    "res/conditions/keyboard.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("key", _("Key to check"))
-      .SetHidden();
+      .AddParameter("key", _("Key"));

  extension
      .AddCondition("KeyFromTextPressed",
-                    _("Key pressed"),
-                    _("Check if a key is pressed"),
+                    _("Key pressed (text expression)"),
+                    _("Check if a key, retrieved from the result of the "
+                      "expression, is pressed"),
                    _("_PARAM1_ key is pressed"),
                    "",
                    "res/conditions/keyboard24.png",
                    "res/conditions/keyboard.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("keyboardKey", _("Key to check"))
-      .MarkAsSimple();
+      .AddParameter("string", _("Expression generating the key to check"))
+      .MarkAsAdvanced();

  extension
      .AddCondition("KeyFromTextReleased",
-                    _("Key released"),
-                    _("Check if a key was just released"),
+                    _("Key released (text expression)"),
+                    _("Check if a key, retrieved from the result of the "
+                      "expression, was just released"),
                    _("_PARAM1_ key is released"),
                    "",
                    "res/conditions/keyboard24.png",
                    "res/conditions/keyboard.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("keyboardKey", _("Key to check"))
-      .MarkAsSimple();
+      .AddParameter("string", _("Expression generating the key to check"))
+      .MarkAsAdvanced();

  extension
      .AddCondition("AnyKeyPressed",
@@ -85,7 +84,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
                    "res/conditions/keyboard.png")
      .AddCodeOnlyParameter("currentScene", "");

-  extension
+ extension
      .AddCondition("AnyKeyReleased",
                    _("Any key released"),
                    _("Check if any key is released"),
--- a/Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp
@@ -72,8 +72,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(

  extension
      .AddExpression("normalize",
-                     _("Normalize a value between `min` and `max` to a value "
-                       "between 0 and 1."),
+                     _("Normalize a value between `min` and `max` to a value between 0 and 1."),
                     _("Remap a value between 0 and 1."),
                     "",
                     "res/mathfunction.png")
@@ -125,8 +124,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
  extension
      .AddExpression("mod",
                     _("Modulo"),
-                     _("Compute \"x mod y\". GDevelop does NOT support the \% "
-                       "operator. Use this mod(x, y) function instead."),
+                     _("x mod y"),
                     "",
                     "res/mathfunction.png")
      .AddParameter("expression", _("x (as in x mod y)"))
@@ -153,8 +151,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
  extension
      .AddExpression("abs",
                     _("Absolute value"),
-                     _("Return the non-negative value by removing the sign. "
-                       "The absolute value of -8 is 8."),
+                     _("Absolute value"),
                     "",
                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));
@@ -186,8 +183,11 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
      .AddParameter("expression", _("Expression"));

  extension
-      .AddExpression(
-          "asinh", _("Arcsine"), _("Arcsine"), "", "res/mathfunction.png")
+      .AddExpression("asinh",
+                     _("Arcsine"),
+                     _("Arcsine"),
+                     "",
+                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));

  extension
@@ -217,8 +217,11 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
      .AddParameter("expression", _("Expression"));

  extension
-      .AddExpression(
-          "cbrt", _("Cube root"), _("Cube root"), "", "res/mathfunction.png")
+      .AddExpression("cbrt",
+                     _("Cube root"),
+                     _("Cube root"),
+                     "",
+                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));

  extension
@@ -256,13 +259,12 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
      .AddParameter("expression", _("Expression"), "", true);

  extension
-      .AddExpression(
-          "cos",
-          _("Cosine"),
-          _("Cosine of an angle (in radian). "
-            "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("cos",
+                     _("Cosine"),
+                     _("Cosine of an angle (in radian). "
+                       "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
+                     "",
+                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));

  extension
@@ -290,20 +292,29 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
      .AddParameter("expression", _("Expression"));

  extension
-      .AddExpression(
-          "int", _("Round"), _("Round a number"), "", "res/mathfunction.png")
+      .AddExpression("int",
+                     _("Round"),
+                     _("Round a number"),
+                     "",
+                     "res/mathfunction.png")
      .SetHidden()
      .AddParameter("expression", _("Expression"));

  extension
-      .AddExpression(
-          "rint", _("Round"), _("Round a number"), "", "res/mathfunction.png")
+      .AddExpression("rint",
+                     _("Round"),
+                     _("Round a number"),
+                     "",
+                     "res/mathfunction.png")
      .SetHidden()
      .AddParameter("expression", _("Expression"));

  extension
-      .AddExpression(
-          "round", _("Round"), _("Round a number"), "", "res/mathfunction.png")
+      .AddExpression("round",
+                     _("Round"),
+                     _("Round a number"),
+                     "",
+                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));

  extension
@@ -312,8 +323,8 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
                     _("Round a number to the Nth decimal place"),
                     "",
                     "res/mathfunction.png")
-      .AddParameter("expression", _("Number to Round"))
-      .AddParameter("expression", _("Decimal Places"), "", true);
+      .AddParameter("expression", _("Expression"))
+      .AddParameter("expression", _("Expression"), "", true);

  extension
      .AddExpression("exp",
@@ -324,13 +335,19 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
      .AddParameter("expression", _("Expression"));

  extension
-      .AddExpression(
-          "log", _("Logarithm"), _("Logarithm"), "", "res/mathfunction.png")
+      .AddExpression("log",
+                     _("Logarithm"),
+                     _("Logarithm"),
+                     "",
+                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));

  extension
-      .AddExpression(
-          "ln", _("Logarithm"), _("Logarithm"), "", "res/mathfunction.png")
+      .AddExpression("ln",
+                     _("Logarithm"),
+                     _("Logarithm"),
+                     "",
+                     "res/mathfunction.png")
      .SetHidden()
      .AddParameter("expression", _("Expression"));

@@ -369,8 +386,11 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
      .AddParameter("expression", _("The exponent (n in x^n)"));

  extension
-      .AddExpression(
-          "sec", _("Secant"), _("Secant"), "", "res/mathfunction.png")
+      .AddExpression("sec",
+                     _("Secant"),
+                     _("Secant"),
+                     "",
+                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));

  extension
@@ -382,13 +402,12 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
      .AddParameter("expression", _("Expression"));

  extension
-      .AddExpression(
-          "sin",
-          _("Sine"),
-          _("Sine of an angle (in radian). "
-            "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("sin",
+                     _("Sine"),
+                     _("Sine of an angle (in radian). "
+                       "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
+                     "",
+                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));

  extension
@@ -408,13 +427,12 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
      .AddParameter("expression", _("Expression"));

  extension
-      .AddExpression(
-          "tan",
-          _("Tangent"),
-          _("Tangent of an angle (in radian). "
-            "If you want to use degrees, use`ToRad`: `tan(ToRad(45))`."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("tan",
+                     _("Tangent"),
+                     _("Tangent of an angle (in radian). "
+                       "If you want to use degrees, use`ToRad`: `tan(ToRad(45))`."),
+                     "",
+                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));

  extension
@@ -444,28 +462,26 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
      .AddParameter("expression", _("x (in a+(b-a)*x)"));

  extension
-      .AddExpression(
-          "XFromAngleAndDistance",
-          _("X position from angle and distance"),
-          _("Compute the X position when given an angle and distance "
-            "relative to the origin (0;0). This is also known as "
-            "getting the cartesian coordinates of a 2D vector, using "
-            "its polar coordinates."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("XFromAngleAndDistance",
+                     _("X position from angle and distance"),
+                     _("Compute the X position when given an angle and distance "
+                      "relative to the origin (0;0). This is also known as "
+                      "getting the cartesian coordinates of a 2D vector, using "
+                      "its polar coordinates."),
+                     "",
+                     "res/mathfunction.png")
      .AddParameter("expression", _("Angle, in degrees"))
      .AddParameter("expression", _("Distance"));

  extension
-      .AddExpression(
-          "YFromAngleAndDistance",
-          _("Y position from angle and distance"),
-          _("Compute the Y position when given an angle and distance "
-            "relative to the origin (0;0). This is also known as "
-            "getting the cartesian coordinates of a 2D vector, using "
-            "its polar coordinates."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("YFromAngleAndDistance",
+                     _("Y position from angle and distance"),
+                     _("Compute the Y position when given an angle and distance "
+                      "relative to the origin (0;0). This is also known as "
+                      "getting the cartesian coordinates of a 2D vector, using "
+                      "its polar coordinates."),
+                     "",
+                     "res/mathfunction.png")
      .AddParameter("expression", _("Angle, in degrees"))
      .AddParameter("expression", _("Distance"));

@@ -480,8 +496,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
  extension
      .AddExpression("lerpAngle",
                     _("Lerp (Linear interpolation) between two angles"),
-                     _("Linearly interpolates between two angles (in degrees) "
-                       "by taking the shortest direction around the circle."),
+                     _("Linearly interpolates between two angles (in degrees) by taking the shortest direction around the circle."),
                     "",
                     "res/mathfunction.png")
      .AddParameter("expression", _("Starting angle, in degrees"))
--- a/Core/GDCore/Extensions/Builtin/MouseExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/MouseExtension.cpp
@@ -16,11 +16,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
      .SetExtensionInformation(
          "BuiltinMouse",
          _("Mouse and touch"),
-          "Conditions, actions and expressions to handle either the mouse or "
-          "touches on a touchscreen. Notably: cursor position, mouse wheel, "
-          "mouse buttons, touch positions, started/end touches, etc...\n"
-          "\n"
-          "By default, conditions related to the mouse will also "
+          "Conditions and actions to handle either the mouse or touches on "
+          "touchscreen. By default, conditions related to the mouse will also "
          "handle the touches - so that it's easier to handle both in your "
          "game. You can disable this behavior if you want to handle them "
          "separately in different events.",
@@ -255,8 +252,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                    "res/conditions/mouse.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("mouse", _("Button to check"))
-      .MarkAsSimple()
-      .SetHidden();
+      .MarkAsSimple();

  // Support for deprecated names:
  extension.AddDuplicatedCondition("SourisBouton", "MouseButtonPressed")
@@ -266,39 +262,49 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
      .AddCondition("MouseButtonReleased",
                    _("Mouse button released"),
                    _("Check if the specified mouse button was released."),
-                    _("Touch or _PARAM1_ mouse button is released"),
+                    _("_PARAM1_ mouse button was released"),
                    "",
                    "res/conditions/mouse24.png",
                    "res/conditions/mouse.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("mouse", _("Button to check"))
-      .MarkAsSimple()
-      .SetHidden();
-
-  extension
-      .AddCondition("MouseButtonFromTextPressed",
-                    _("Mouse button pressed or touch held"),
-                    _("Check if the specified mouse button is pressed or "
-                      "if a touch is in contact with the screen."),
-                    _("Touch or _PARAM1_ mouse button is down"),
-                    "",
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouseButton", _("Button to check"))
      .MarkAsSimple();

  extension
-      .AddCondition("MouseButtonFromTextReleased",
-                    _("Mouse button released"),
-                    _("Check if the specified mouse button was released."),
-                    _("Touch or _PARAM1_ mouse button is released"),
-                    "",
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
+      .AddCondition(
+          "MouseButtonFromTextPressed",
+          _("Mouse button pressed or touch held (text expression)"),
+          _("Check if a mouse button, retrieved from the result of the "
+            "expression, is pressed."),
+          _("_PARAM1_ mouse button is pressed"),
+          "",
+          "res/conditions/mouse24.png",
+          "res/conditions/mouse.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouseButton", _("Button to check"))
-      .MarkAsSimple();
+      .AddParameter("stringWithSelector",
+                    _("Expression generating the mouse button to check"),
+                    "[\"Left\", \"Right\", \"Middle\"]")
+      .SetParameterLongDescription(
+          _("Possible values are Left, Right and Middle."))
+      .MarkAsAdvanced();
+
+  extension
+      .AddCondition(
+          "MouseButtonFromTextReleased",
+          _("Mouse button released (text expression)"),
+          _("Check if a mouse button, retrieved from the result of the "
+            "expression, was just released."),
+          _("_PARAM1_ mouse button is released"),
+          "",
+          "res/conditions/mouse24.png",
+          "res/conditions/mouse.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("stringWithSelector",
+                    _("Expression generating the mouse button to check"),
+                    "[\"Left\", \"Right\", \"Middle\"]")
+      .SetParameterLongDescription(
+          _("Possible values are Left, Right and Middle."))
+      .MarkAsAdvanced();

  extension
      .AddExpressionAndCondition("number",
@@ -332,7 +338,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
      .SetDefaultValue("0");

-  // Deprecated
  extension
      .AddCondition(
          "PopStartedTouch",
@@ -349,7 +354,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
      .AddCodeOnlyParameter("currentScene", "")
      .SetHidden();

-  // Deprecated
  extension
      .AddCondition(
          "PopEndedTouch",
@@ -366,7 +370,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
      .AddCodeOnlyParameter("currentScene", "")
      .SetHidden();

-  // Deprecated
  extension
      .AddCondition(
          "HasAnyTouchStarted",
--- a/Core/GDCore/Extensions/Builtin/NetworkExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/NetworkExtension.cpp
@@ -15,9 +15,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
      .SetExtensionInformation(
          "BuiltinNetwork",
          _("Network"),
-          _("Actions to send web requests, communicate with external \"APIs\" "
-            "and other network related tasks. Also contains an action to open "
-            "a URL on the device browser."),
+          _("Features to send web requests, communicate with external \"APIs\" "
+            "and other network related tasks."),
          "Florian Rival",
          "Open source (MIT License)")
      .SetExtensionHelpPath("/all-features/network")
--- a/Core/GDCore/Extensions/Builtin/SceneExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/SceneExtension.cpp
@@ -4,8 +4,8 @@
 * reserved. This project is released under the MIT License.
 */
 #include "AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Tools/Localization.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"

 using namespace std;
 namespace gd {
@@ -16,11 +16,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
      .SetExtensionInformation(
          "BuiltinScene",
          _("Scene"),
-          _("Actions/conditions to change the current scene (or pause it and "
-            "launch another one, or go back to the previous one), check if a "
-            "scene or the game has just started/resumed, preload assets of a "
-            "scene, get the current scene name or loading progress, quit the "
-            "game, set background color, or disable input when focus is lost."),
+          _("Actions and conditions to manipulate the scenes during the game."),
          "Florian Rival",
          "Open source (MIT License)")
      .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
@@ -170,28 +166,25 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
      .AddCodeOnlyParameter("currentScene", "");

  extension
-      .AddAction(
-          "PrioritizeLoadingOfScene",
-          _("Preload scene"),
-          _("Preload a scene resources as soon as possible in background."),
-          _("Preload scene _PARAM1_ in background"),
-          "",
-          "res/actions/hourglass_black.svg",
-          "res/actions/hourglass_black.svg")
+      .AddAction("PrioritizeLoadingOfScene",
+                 _("Preload scene"),
+                 _("Preload a scene resources as soon as possible in background."),
+                 _("Preload scene _PARAM1_ in background"),
+                 "",
+                 "res/actions/hourglass_black.svg",
+                 "res/actions/hourglass_black.svg")
      .SetHelpPath("/all-features/resources-loading")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("sceneName", _("Name of the new scene"))
      .MarkAsAdvanced();

-  extension
-      .AddExpressionAndCondition("number",
-                                 "SceneLoadingProgress",
-                                 _("Scene loading progress"),
-                                 _("The progress of resources loading in "
-                                   "background for a scene (between 0 and 1)."),
-                                 _("_PARAM1_ loading progress"),
-                                 _(""),
-                                 "res/actions/hourglass_black.svg")
+  extension.AddExpressionAndCondition("number",
+                                "SceneLoadingProgress",
+                                _("Scene loading progress"),
+                                _("The progress of resources loading in background for a scene (between 0 and 1)."),
+                                _("_PARAM0_ loading progress"),
+                                _(""),
+                                "res/actions/hourglass_black.svg")
      .SetHelpPath("/all-features/resources-loading")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("sceneName", _("Scene name"))
@@ -199,14 +192,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
      .MarkAsAdvanced();

  extension
-      .AddCondition(
-          "AreSceneAssetsLoaded",
-          _("Scene preloaded"),
-          _("Check if scene resources have finished to load in background."),
-          _("Scene _PARAM1_ was preloaded in background"),
-          "",
-          "res/actions/hourglass_black.svg",
-          "res/actions/hourglass_black.svg")
+      .AddCondition("AreSceneAssetsLoaded",
+                    _("Scene preloaded"),
+                    _("Check if scene resources have finished to load in background."),
+                    _("Scene _PARAM1_ was preloaded in background"),
+                    "",
+                    "res/actions/hourglass_black.svg",
+                    "res/actions/hourglass_black.svg")
      .SetHelpPath("/all-features/resources-loading")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("sceneName", _("Scene name"))
--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteExtension.cpp
@@ -15,13 +15,12 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
    gd::PlatformExtension& extension) {
  extension
-      .SetExtensionInformation(
-          "Sprite",
-          _("Sprite"),
-          _("Sprite are animated objects which can be used "
-            "for most elements of a 2D game."),
-          "Florian Rival",
-          "Open source (MIT License)")
+      .SetExtensionInformation("Sprite",
+                               _("Sprite"),
+                               _("Sprite are animated object which can be used "
+                                 "for most elements of a game."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects/sprite");
  extension.AddInstructionOrExpressionGroupMetadata(_("Sprite"))
      .SetIcon("CppPlatform/Extensions/spriteicon.png");
@@ -31,10 +30,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          .AddObject<SpriteObject>("Sprite",
                                   _("Sprite"),
                                   _("Animated object which can be used for "
-                                     "most elements of a 2D game."),
+                                     "most elements of a game."),
                                   "CppPlatform/Extensions/spriteicon.png")
          .SetCategoryFullName(_("General"))
-          .SetOpenFullEditorLabel(_("Edit animations"))
          .AddDefaultBehavior("EffectCapability::EffectBehavior")
          .AddDefaultBehavior("ResizableCapability::ResizableBehavior")
          .AddDefaultBehavior("ScalableCapability::ScalableBehavior")
@@ -646,12 +644,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/actions/sprite.png")
      .AddParameter("object", _("Object"), "Sprite");

-  obj.AddExpression(
-         "AnimationFrameCount",
-         _("Number of frames"),
-         _("Number of frames in the current animation of the object"),
-         _("Animations and images"),
-         "res/actions/sprite.png")
+  obj.AddExpression("AnimationFrameCount",
+                    _("Number of frames"),
+                    _("Number of frames in the current animation of the object"),
+                    _("Animations and images"),
+                    "res/actions/sprite.png")
      .AddParameter("object", _("Object"), "Sprite");

  // Deprecated
--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.cpp
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.cpp
@@ -47,11 +47,19 @@ void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
 std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties()
    const {
  std::map<gd::String, gd::PropertyDescriptor> properties;
+  properties[_("Animate even if hidden or far from the screen")]
+      .SetValue(updateIfNotVisible ? "true" : "false")
+      .SetType("Boolean");
+  properties["PLEASE_ALSO_SHOW_EDIT_BUTTON_THANKS"].SetValue("");
+
  return properties;
 }

 bool SpriteObject::UpdateProperty(const gd::String& name,
                                  const gd::String& value) {
+  if (name == _("Animate even if hidden or far from the screen"))
+    updateIfNotVisible = value == "1";
+
  return true;
 }

--- a/Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp
@@ -16,8 +16,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
      .SetExtensionInformation(
          "BuiltinStringInstructions",
          _("Text manipulation"),
-          "Provides expressions to manipulate strings (also called texts): new "
-          "line, upper/lowercase, substring, find, replace, etc...",
+          "Provides expressions to manipulate strings (also called texts).",
          "Florian Rival",
          "Open source (MIT License)")
      .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
@@ -192,8 +191,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                        "res/conditions/toujours24_black.png")
      .AddParameter("string", _("Text in which the replacement must be done"))
      .AddParameter("string", _("Text to find inside the first text"))
-      .AddParameter("string",
-                    _("Replacement to put instead of the text to find"));
+      .AddParameter("string", _("Replacement to put instead of the text to find"));

  extension
      .AddStrExpression("StrReplaceAll",
@@ -201,11 +199,10 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                        _("Replace all occurrences of a text by another."),
                        "",
                        "res/conditions/toujours24_black.png")
-      .AddParameter("string",
-                    _("Text in which the replacement(s) must be done"))
+      .AddParameter("string", _("Text in which the replacement(s) must be done"))
      .AddParameter("string", _("Text to find inside the first text"))
-      .AddParameter("string",
-                    _("Replacement to put instead of the text to find"));
+      .AddParameter("string", _("Replacement to put instead of the text to find"));
+
 }

 }  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/TimeExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/TimeExtension.cpp
@@ -15,12 +15,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
      .SetExtensionInformation(
          "BuiltinTime",
          _("Timers and time"),
-          "Actions and conditions to start, pause or reset scene timers, "
-          "modify the time scale (speed at which the game "
-          "is running - useful for slow motion effects). Also contains an "
-          "action that wait for a delay before running the next actions and "
-          "sub-events and expressions to read the time scale, time delta of "
-          "the last frame or timer elapsed time.",
+          "Actions and conditions to run timers, get the current time or "
+          "modify the time scale (speed at which the game is running - useful "
+          "for slow motion effects).",
          "Florian Rival",
          "Open source (MIT License)")
      .SetExtensionHelpPath("/all-features/timers-and-time");
@@ -46,9 +43,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
      .AddCondition("CompareTimer",
                    _("Value of a scene timer"),
                    _("Compare the elapsed time of a scene timer. This "
-                      "condition doesn't start the timer and will always be "
-                      "false if the timer was not started previously (whatever "
-                      "the comparison being made)."),
+                      "condition doesn't start the timer."),
                    _("The timer _PARAM1_ _PARAM2_ _PARAM3_ seconds"),

                    "",
@@ -195,28 +190,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
  extension
      .AddExpression("TimerElapsedTime",
                     _("Scene timer value"),
-                     _("Value of a scene timer (in seconds)"),
+                     _("Value of a scene timer"),
                     "",
                     "res/actions/time.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("identifier", _("Timer's name"), "sceneTimer");

  extension
-      .AddExpression(
-          "TimeFromStart",
-          _("Time elapsed since the beginning of the scene (in seconds)."),
-          _("Time elapsed since the beginning of the scene (in seconds)."),
-          "",
-          "res/actions/time.png")
+      .AddExpression("TimeFromStart",
+                     _("Time elapsed since the beginning of the scene"),
+                     _("Time elapsed since the beginning of the scene"),
+                     "",
+                     "res/actions/time.png")
      .AddCodeOnlyParameter("currentScene", "");

  extension
-      .AddExpression(
-          "TempsDebut",
-          _("Time elapsed since the beginning of the scene (in seconds)."),
-          _("Time elapsed since the beginning of the scene (in seconds)."),
-          "",
-          "res/actions/time.png")
+      .AddExpression("TempsDebut",
+                     _("Time elapsed since the beginning of the scene"),
+                     _("Time elapsed since the beginning of the scene"),
+                     "",
+                     "res/actions/time.png")
      .SetHidden()
      .AddCodeOnlyParameter("currentScene", "");

@@ -231,21 +224,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
  extension
      .AddExpression("Time",
                     _("Current time"),
-                     _("Gives the current time"),
+                     _("Current time"),
                     "",
                     "res/actions/time.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter(
          "stringWithSelector",
-          _("- Hour of the day: \"hour\"\n"
-            "- Minutes: \"min\"\n"
-            "- Seconds: \"sec\"\n"
-            "- Day of month: \"mday\"\n"
-            "- Months since January: \"mon\"\n"
-            "- Year since 1900: \"year\"\n"
-            "- Days since Sunday: \"wday\"\n"
-            "- Days since Jan 1st: \"yday\"\n"
-            "- Timestamp (ms): \"timestamp\""),
+          _("Hour: hour - Minutes: min - Seconds: sec - Day of month: "
+            "mday - Months since January: mon - Year since 1900: year - Days "
+            "since Sunday: wday - Days since Jan 1st: yday - Timestamp (ms): "
+            "timestamp\""),
          "[\"hour\", \"min\", \"sec\", \"mon\", \"year\", \"wday\", \"mday\", "
          "\"yday\", \"timestamp\"]");
 }
--- a/Core/GDCore/Extensions/Builtin/VariablesExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/VariablesExtension.cpp
@@ -33,7 +33,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "",
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
-      .AddParameter("variableOrPropertyOrParameter", _("Variable"))
+      .AddParameter("variable", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions());

@@ -45,7 +45,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "",
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
-      .AddParameter("variableOrPropertyOrParameter", _("Variable"))
+      .AddParameter("variable", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "string", ParameterOptions::MakeNewOptions());

@@ -58,7 +58,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          "",
          "res/conditions/var24.png",
          "res/conditions/var.png")
-      .AddParameter("variableOrPropertyOrParameter", _("Variable"))
+      .AddParameter("variable", _("Variable"))
      .AddParameter("trueorfalse", _("Check if the value is"))
      .SetDefaultValue("true")
      // This parameter allows to keep the operand expression
@@ -73,32 +73,32 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 "",
                 "res/actions/var24.png",
                 "res/actions/var.png")
-      .AddParameter("variableOrProperty", _("Variable"))
+      .AddParameter("variable", _("Variable"))
      .UseStandardOperatorParameters("number",
                                     ParameterOptions::MakeNewOptions());

  extension
      .AddAction("SetStringVariable",
-                 _("Change variable value"),
+                 _("Change text variable"),
                 _("Modify the text (string) of a variable."),
                 _("the variable _PARAM0_"),
                 "",
                 "res/actions/var24.png",
                 "res/actions/var.png")
-      .AddParameter("variableOrProperty", _("Variable"))
+      .AddParameter("variable", _("Variable"))
      .UseStandardOperatorParameters("string",
                                     ParameterOptions::MakeNewOptions());

  extension
      .AddAction(
          "SetBooleanVariable",
-          _("Change variable value"),
+          _("Change boolean variable"),
          _("Modify the boolean value of a variable."),
          _("Change the variable _PARAM0_: _PARAM1_"),
          "",
          "res/conditions/var24.png",
          "res/conditions/var.png")
-      .AddParameter("variableOrProperty", _("Variable"))
+      .AddParameter("variable", _("Variable"))
      .AddParameter("operator", _("Value"), "boolean")
      // This parameter allows to keep the operand expression
      // when the editor switch between variable instructions.
@@ -116,7 +116,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
      .AddParameter("variable", _("Array variable"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  extension
@@ -130,7 +129,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "res/conditions/var.png")
      .AddParameter("variable", _("Variable"))
      .AddParameter("string", _("Name of the child"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  extension
@@ -144,7 +142,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          "res/actions/var.png")
      .AddParameter("variable", _("Structure variable"))
      .AddParameter("string", _("Child's name"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  extension
@@ -157,7 +154,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("variable", _("Structure or array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  extension
@@ -174,13 +170,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
      .SetParameterLongDescription(
          _("The content of the variable will *be copied* and added at the "
            "end of the array."))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  extension
      .AddAction(
          "PushString",
-          _("Add value to array variable"),
+          _("Add text variable"),
          _("Adds a text (string) at the end of a array variable."),
          _("Add the value _PARAM1_ to array variable _PARAM0_"),
          _("Arrays and structures"),
@@ -188,12 +183,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          "res/actions/var.png")
      .AddParameter("variable", _("Array variable"))
      .AddParameter("string", _("Text to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  extension
      .AddAction("PushNumber",
-                 _("Add value to array variable"),
+                 _("Add variable array value"),
                 _("Adds a number at the end of an array variable."),
                 _("Add the value _PARAM1_ to array variable _PARAM0_"),
                 _("Arrays and structures"),
@@ -201,12 +195,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 "res/actions/var.png")
      .AddParameter("variable", _("Array variable"))
      .AddParameter("expression", _("Number to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  extension
      .AddAction("PushBoolean",
-                 _("Add value to array variable"),
+                 _("Add boolean variable"),
                 _("Adds a boolean at the end of an array variable."),
                 _("Add the value _PARAM1_ to array variable _PARAM0_"),
                 _("Arrays and structures"),
@@ -214,7 +207,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 "res/actions/var.png")
      .AddParameter("variable", _("Array variable"))
      .AddParameter("trueorfalse", _("Boolean to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  extension
@@ -229,7 +221,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 "res/actions/var.png")
      .AddParameter("variable", _("Array variable"))
      .AddParameter("expression", _("Index to remove"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced();

  extension
@@ -240,8 +231,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
            "it is a text (string)."),
          _("Arrays and structures"),
          "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("variable", _("Array variable"));

  extension
      .AddExpression(
@@ -251,8 +241,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
            "it is a number."),
          _("Arrays and structures"),
          "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("variable", _("Array variable"));

  extension
      .AddStrExpression(
@@ -262,8 +251,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
            "it is a text (string)."),
          _("Arrays and structures"),
          "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("variable", _("Array variable"));

  extension
      .AddExpression(
@@ -273,8 +261,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
            "it is a number."),
          _("Arrays and structures"),
          "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("variable", _("Array variable"));

  // Legacy instructions

@@ -283,28 +270,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    _("Number variable"),
                    _("Compare the number value of a scene variable."),
                    _("The number of scene variable _PARAM0_"),
-                    _("External variables ❯ Scene variables"),
+                    _("External variables/Scene variables"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
      .AddParameter("scenevar", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddCondition("VarSceneTxt",
                    _("Text variable"),
                    _("Compare the text (string) of a scene variable."),
                    _("The text of scene variable _PARAM0_"),
-                    _("External variables ❯ Scene variables"),
+                    _("External variables/Scene variables"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
      .AddParameter("scenevar", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "string", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddCondition(
@@ -312,14 +297,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Boolean variable"),
          _("Compare the boolean value of a scene variable."),
          _("The boolean value of scene variable _PARAM0_ is _PARAM1_"),
-          _("External variables ❯ Scene variables"),
+          _("External variables/Scene variables"),
          "res/conditions/var24.png",
          "res/conditions/var.png")
      .AddParameter("scenevar", _("Variable"))
      .AddParameter("trueorfalse", _("Check if the value is"))
      .SetDefaultValue("true")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddCondition("VariableChildExists",
@@ -327,14 +311,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    _("Check if the specified child of the scene structure "
                      "variable exists."),
                    _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
-                    _("External variables ❯ Scene variables ❯ Arrays and structures"),
+                    _("External variables/Scene variables/Arrays and structures"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
      .AddParameter("scenevar", _("Variable"))
      .AddParameter("string", _("Name of the child"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -343,14 +325,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    _("Check if the specified child of the global structure "
                      "variable exists."),
                    _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("External variables ❯ Global variables ❯ Arrays and structures"),
+                    _("External variables/Global variables/Arrays and structures"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
      .AddParameter("globalvar", _("Variable"))
      .AddParameter("string", _("Name of the child"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -358,7 +338,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "Variable defined",
                    "Test if the scene variable exists.",
                    "Scene variable _PARAM0_ is defined",
-                    _("External variables ❯ Scene variables"),
+                    _("External variables/Scene variables"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
      .AddCodeOnlyParameter("currentScene", "")
@@ -370,14 +350,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    _("Number variable"),
                    _("Compare the number value of a global variable."),
                    _("the global variable _PARAM0_"),
-                    _("External variables ❯ Global variables"),
+                    _("External variables/Global variables"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
      .AddParameter("globalvar", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions())
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -385,14 +364,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    _("Text variable"),
                    _("Compare the text (string) of a global variable."),
                    _("the text of the global variable _PARAM0_"),
-                    _("External variables ❯ Global variables"),
+                    _("External variables/Global variables"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
      .AddParameter("globalvar", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "string", ParameterOptions::MakeNewOptions())
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -401,21 +379,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Boolean variable"),
          _("Compare the boolean value of a global variable."),
          _("The boolean value of global variable _PARAM0_ is _PARAM1_"),
-          _("External variables ❯ Global variables"),
+          _("External variables/Global variables"),
          "res/conditions/var24.png",
          "res/conditions/var.png")
      .AddParameter("globalvar", _("Variable"))
      .AddParameter("trueorfalse", _("Check if the value is"))
      .SetDefaultValue("true")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddCondition("VarGlobalDef",
                    "Variable defined",
                    "Test if a global variable exists.",
                    "Global variable _PARAM0_ is defined",
-                    _("External variables ❯ Global variables"),
+                    _("External variables/Global variables"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
      .AddCodeOnlyParameter("currentScene", "")
@@ -428,28 +405,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 _("Change number variable"),
                 _("Modify the number value of a scene variable."),
                 _("the scene variable _PARAM0_"),
-                 _("External variables ❯ Scene variables"),
+                 _("External variables/Scene variables"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("scenevar", _("Variable"))
      .UseStandardOperatorParameters("number",
                                     ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddAction("ModVarSceneTxt",
                 _("Change text variable"),
                 _("Modify the text (string) of a scene variable."),
                 _("the text of scene variable _PARAM0_"),
-                 _("External variables ❯ Scene variables"),
+                 _("External variables/Scene variables"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("scenevar", _("Variable"))
      .UseStandardOperatorParameters("string",
                                     ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddAction(
@@ -457,13 +432,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Change boolean variable"),
          _("Modify the boolean value of a scene variable."),
          _("Set the boolean value of scene variable _PARAM0_ to _PARAM1_"),
-          _("External variables ❯ Scene variables"),
+          _("External variables/Scene variables"),
          "res/conditions/var24.png",
          "res/conditions/var.png")
      .AddParameter("scenevar", _("Variable"))
      .AddParameter("trueorfalse", _("New Value:"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddAction("ToggleSceneVariableAsBoolean",
@@ -472,26 +446,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("If it was true, it will become false, and if it was "
                       "false it will become true."),
                 _("Toggle the boolean value of scene variable _PARAM0_"),
-                 _("External variables ❯ Scene variables"),
+                 _("External variables/Scene variables"),
                 "res/conditions/var24.png",
                 "res/conditions/var.png")
      .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddAction("ModVarGlobal",
                 _("Change number variable"),
                 _("Modify the number value of a global variable."),
                 _("the global variable _PARAM0_"),
-                 _("External variables ❯ Global variables"),
+                 _("External variables/Global variables"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("globalvar", _("Variable"))
      .UseStandardOperatorParameters("number",
                                     ParameterOptions::MakeNewOptions())
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -499,14 +471,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 _("Change text variable"),
                 _("Modify the text (string) of a global variable."),
                 _("the text of global variable _PARAM0_"),
-                 _("External variables ❯ Global variables"),
+                 _("External variables/Global variables"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("globalvar", _("Variable"))
      .UseStandardOperatorParameters("string",
                                     ParameterOptions::MakeNewOptions())
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -515,13 +486,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Change boolean variable"),
          _("Modify the boolean value of a global variable."),
          _("Set the boolean value of global variable _PARAM0_ to _PARAM1_"),
-          _("External variables ❯ Global variables"),
+          _("External variables/Global variables"),
          "res/conditions/var24.png",
          "res/conditions/var.png")
      .AddParameter("globalvar", _("Variable"))
      .AddParameter("trueorfalse", _("New Value:"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddAction("ToggleGlobalVariableAsBoolean",
@@ -530,12 +500,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("If it was true, it will become false, and if it was "
                       "false it will become true."),
                 _("Toggle the boolean value of global variable _PARAM0_"),
-                 _("External variables ❯ Global variables"),
+                 _("External variables/Global variables"),
                 "res/conditions/var24.png",
                 "res/conditions/var.png")
      .AddParameter("globalvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddAction(
@@ -543,15 +512,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Remove a child"),
          _("Remove a child from a scene structure variable."),
          _("Remove child _PARAM1_ from scene structure variable _PARAM0_"),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
      .AddParameter("scenevar", _("Structure variable"))
      .AddParameter("string", _("Child's name"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddAction(
@@ -559,15 +526,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Remove a child"),
          _("Remove a child from a global structure variable."),
          _("Remove child _PARAM1_ from global structure variable _PARAM0_"),
-          _("External variables ❯ Global variables ❯ Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
      .AddParameter("globalvar", _("Structure variable"))
      .AddParameter("string", _("Child's name"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddAction("VariableClearChildren",
@@ -575,13 +540,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 _("Remove all the children from the scene structure or array "
                   "variable."),
                 _("Clear children from scene variable _PARAM0_"),
-                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("scenevar", _("Structure or array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -590,13 +553,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 _("Remove all the children from the global structure or array "
                   "variable."),
                 _("Clear children from global variable _PARAM0_"),
-                 _("External variables ❯ Global variables ❯ Arrays and structures"),
+                 _("External variables/Global variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("globalvar", _("Structure or array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -605,7 +566,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 _("Adds an existing variable at the end of a scene array "
                   "variable."),
                 _("Add variable _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
@@ -613,9 +574,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
      .SetParameterLongDescription(
          _("The content of the variable will *be copied* and added at the "
            "end of the array."))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -624,14 +583,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Add text variable"),
          _("Adds a text (string) at the end of a scene array variable."),
          _("Add text _PARAM1_ to array variable _PARAM0_"),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
      .AddParameter("string", _("Text to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -639,14 +596,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 _("Add number variable"),
                 _("Adds a number at the end of a scene array variable."),
                 _("Add number _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
      .AddParameter("expression", _("Number to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -654,14 +609,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 _("Add boolean variable"),
                 _("Adds a boolean at the end of a scene array variable."),
                 _("Add boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
      .AddParameter("trueorfalse", _("Boolean to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -671,14 +624,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                   "variable."),
                 _("Remove variable at index _PARAM1_ from scene array "
                   "variable _PARAM0_"),
-                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
      .AddParameter("expression", _("Index to remove"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -687,15 +638,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Number of children"),
          _("Compare the number of children in a scene array variable."),
          _("The number of children in the array variable _PARAM0_"),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
          "res/conditions/var24.png",
          "res/conditions/var.png")
      .AddParameter("scenevar", _("Array variable"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -704,12 +653,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("First text child"),
          _("Get the value of the first element of a scene array variable, if "
            "it is a text (string)."),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
          "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddExpression(
@@ -717,12 +664,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("First number child"),
          _("Get the value of the first element of a scene array variable, if "
            "it is a number."),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
          "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddStrExpression(
@@ -730,12 +675,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Last text child"),
          _("Get the value of the last element of a scene array variable, if "
            "it is a text (string)."),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
          "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddExpression(
@@ -743,12 +686,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Last number child"),
          _("Get the value of the last element of a scene array variable, if "
            "it is a number."),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
          "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddAction(
@@ -756,7 +697,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Add existing variable"),
          _("Adds an existing variable at the end of a global array variable."),
          _("Add variable _PARAM1_ to array variable _PARAM0_"),
-          _("External variables ❯ Global variables ❯ Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
      .AddParameter("globalvar", _("Array variable"))
@@ -764,9 +705,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
      .SetParameterLongDescription(
          _("The content of the variable will *be copied* and added at the "
            "end of the array."))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -776,14 +715,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                   "array variable."),
                 _("Remove variable at index _PARAM1_ from global array "
                   "variable _PARAM0_"),
-                 _("External variables ❯ Global variables ❯ Arrays and structures"),
+                 _("External variables/Global variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("globalvar", _("Array variable"))
      .AddParameter("expression", _("Index to remove"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -792,14 +729,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Add text variable"),
          _("Adds a text (string) at the end of a global array variable."),
          _("Add text _PARAM1_ to array variable _PARAM0_"),
-          _("External variables ❯ Global variables ❯ Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
      .AddParameter("globalvar", _("Array variable"))
      .AddParameter("string", _("Text to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -807,14 +742,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 _("Add number variable"),
                 _("Adds a number at the end of a global array variable."),
                 _("Add number _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables ❯ Global variables ❯ Arrays and structures"),
+                 _("External variables/Global variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("globalvar", _("Array variable"))
      .AddParameter("expression", _("Number to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -822,14 +755,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                 _("Add boolean variable"),
                 _("Adds a boolean at the end of a global array variable."),
                 _("Add boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables ❯ Global variables ❯ Arrays and structures"),
+                 _("External variables/Global variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("globalvar", _("Array variable"))
      .AddParameter("trueorfalse", _("Boolean to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -838,15 +769,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Number of children"),
          _("Compare the number of children in a global array variable."),
          _("The number of children of the array variable _PARAM0_"),
-          _("External variables ❯ Global variables ❯ Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
          "res/conditions/var24.png",
          "res/conditions/var.png")
      .AddParameter("globalvar", _("Array variable"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
      .MarkAsAdvanced();

  extension
@@ -854,24 +783,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                        _("First text child"),
                        _("Value of the first element of a global array "
                          "variable, if it is a text (string) variable."),
-                        _("External variables ❯ Global variables ❯ Arrays and structures"),
+                        _("External variables/Global variables/Arrays and structures"),
                        "res/actions/var.png")
      .AddParameter("globalvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddExpression("GlobalVariableFirstNumber",
                     _("First number child"),
                     _("Value of the first element of a global array "
                       "variable, if it is a number variable"),
-                     _("External variables ❯ Global variables ❯ Arrays and structures"),
+                     _("External variables/Global variables/Arrays and structures"),
                     "res/actions/var.png")
      .AddParameter("globalvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddStrExpression(
@@ -879,12 +804,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Last text child"),
          _("Value of the last element of a global array variable, if "
            "it is a text (string) variable."),
-          _("External variables ❯ Global variables ❯ Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
          "res/actions/var.png")
      .AddParameter("globalvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddExpression(
@@ -892,23 +815,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          _("Last number child"),
          _("Value of the last element of a global array variable, if "
            "it is a number variable"),
-          _("External variables ❯ Global variables ❯ Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
          "res/actions/var.png")
      .AddParameter("globalvar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddExpression("GlobalVariableChildCount",
                     _("Number of children"),
                     _("Number of children in a global array or "
                       "structure variable"),
-                     _("External variables ❯ Global variables ❯ Arrays and structures"),
+                     _("External variables/Global variables/Arrays and structures"),
                     "res/actions/var.png")
      .AddParameter("globalvar", _("Array or structure variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddExpression("VariableChildCount",
@@ -917,48 +837,43 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                       "structure variable"),
                     _("Arrays and structures"),
                     "res/actions/var.png")
-      .AddParameter("variable", _("Array or structure variable"), "AllowUndeclaredVariable")
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("variable", _("Array or structure variable"), "AllowUndeclaredVariable");

  extension
      .AddExpression("Variable",
                     _("Number variable"),
                     _("Number value of a scene variable"),
-                     _("External variables ❯ Scene variables"),
+                     _("External variables/Scene variables"),
                     "res/actions/var.png")
      .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddStrExpression("VariableString",
                        _("Text variable"),
                        _("Text of a scene variable"),
-                        _("External variables ❯ Scene variables"),
+                        _("External variables/Scene variables"),
                        "res/actions/var.png")
      .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddExpression("GlobalVariable",
                     _("Number variable"),
                     _("Number value of a global variable"),
-                     _("External variables ❯ Global variables"),
+                     _("External variables/Global variables"),
                     "res/actions/var.png")
      .AddParameter("globalvar", _("Name of the global variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();

  extension
      .AddStrExpression("GlobalVariableString",
                        _("Text variable"),
                        _("Text of a global variable"),
-                        _("External variables ❯ Global variables"),
+                        _("External variables/Global variables"),
                        "res/actions/var.png")
      .AddParameter("globalvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 }

 }  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/WindowExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/WindowExtension.cpp
@@ -15,17 +15,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
      .SetExtensionInformation(
          "BuiltinWindow",
          _("Game window and resolution"),
-          "Actions and conditions to manipulate the game window or change how "
-          "the game is resized according to the screen size. "
+          "Provides actions and conditions to manipulate the game window. "
          "Depending on the platform on which the game is running, not all of "
-          "these features can be applied.\n"
-          "Also contains expressions to read the screen size.",
+          "these features can be applied.",
          "Florian Rival",
          "Open source (MIT License)")
      .SetCategory("User interface")
      .SetExtensionHelpPath("/all-features/window");
  extension
-      .AddInstructionOrExpressionGroupMetadata(_("Game window and resolution"))
+      .AddInstructionOrExpressionGroupMetadata(
+          _("Game window and resolution"))
      .SetIcon("res/actions/window24.png");

  extension
--- a/Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp
+++ b/Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp
@@ -37,7 +37,8 @@ BehaviorMetadata::BehaviorMetadata(
      className(className_),
      iconFilename(icon24x24),
      instance(instance_),
-      sharedDatasInstance(sharedDatasInstance_) {
+      sharedDatasInstance(sharedDatasInstance_),
+      quickCustomizationVisibility(QuickCustomization::Visibility::Default) {
  SetFullName(gd::String(fullname_));
  SetDescription(gd::String(description_));
  SetDefaultName(gd::String(defaultName_));
--- a/Core/GDCore/Extensions/Metadata/BehaviorMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/BehaviorMetadata.h
@@ -272,7 +272,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   * Check if the behavior is private - it can't be used outside of its
   * extension.
   */
-  bool IsPrivate() const override { return isPrivate; }
+  bool IsPrivate() const { return isPrivate; }

  /**
   * Set that the behavior is private - it can't be used outside of its
@@ -307,15 +307,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    return *this;
  }

-  BehaviorMetadata &SetOpenFullEditorLabel(const gd::String& label) {
-    openFullEditorLabel = label;
-    return *this;
-  }
-
-  const gd::String& GetOpenFullEditorLabel() const {
-    return openFullEditorLabel;
-  }
-
  /**
   * \brief Return the associated gd::Behavior, handling behavior contents.
   *
@@ -393,8 +384,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
  mutable std::vector<gd::String> requiredBehaviors;
  bool isPrivate = false;
  bool isHidden = false;
-  gd::String openFullEditorLabel;
-  QuickCustomization::Visibility quickCustomizationVisibility = QuickCustomization::Visibility::Default;
+  QuickCustomization::Visibility quickCustomizationVisibility;

  // TODO: Nitpicking: convert these to std::unique_ptr to clarify ownership.
  std::shared_ptr<gd::Behavior> instance;
--- a/Core/GDCore/Extensions/Metadata/EffectMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/EffectMetadata.h
@@ -185,10 +185,10 @@ class GD_CORE_API EffectMetadata {
  gd::String fullname;
  gd::String description;
  std::vector<gd::String> includeFiles;
-  bool isMarkedAsNotWorkingForObjects = false;
-  bool isMarkedAsOnlyWorkingFor2D = false;
-  bool isMarkedAsOnlyWorkingFor3D = false;
-  bool isMarkedAsUnique = false;
+  bool isMarkedAsNotWorkingForObjects;
+  bool isMarkedAsOnlyWorkingFor2D;
+  bool isMarkedAsOnlyWorkingFor3D;
+  bool isMarkedAsUnique;
  std::map<gd::String, gd::PropertyDescriptor> properties;
 };

--- a/Core/GDCore/Extensions/Metadata/EventMetadata.cpp
+++ b/Core/GDCore/Extensions/Metadata/EventMetadata.cpp
@@ -19,8 +19,7 @@ EventMetadata::EventMetadata(const gd::String &name_,
    : fullname(fullname_),
      description(description_),
      group(group_),
-      instance(instance_),
-      hasCustomCodeGenerator(false) {
+      instance(instance_) {
  ClearCodeGenerationAndPreprocessing();
  if (instance) instance->SetType(name_);
 }
--- a/Core/GDCore/Extensions/Metadata/EventMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/EventMetadata.h
@@ -83,7 +83,7 @@ class GD_CORE_API EventMetadata {
  gd::String group;

  std::shared_ptr<gd::BaseEvent> instance;
-  bool hasCustomCodeGenerator = false;
+  bool hasCustomCodeGenerator;
  std::function<gd::String(gd::BaseEvent& event,
                           gd::EventsCodeGenerator& codeGenerator,
                           gd::EventsCodeGenerationContext& context)>
--- a/Core/GDCore/Extensions/Metadata/InstructionOrExpressionContainerMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/InstructionOrExpressionContainerMetadata.h
@@ -174,7 +174,6 @@ public:
  virtual const gd::String &GetFullName() const = 0;
  virtual const gd::String &GetDescription() const = 0;
  virtual const gd::String &GetIconFilename() const = 0;
-  virtual bool IsPrivate() const = 0;

  /**
   * \brief Return a reference to a map containing the names of the actions
--- a/Core/GDCore/Extensions/Metadata/MetadataProvider.h
+++ b/Core/GDCore/Extensions/Metadata/MetadataProvider.h
@@ -288,8 +288,8 @@ class GD_CORE_API MetadataProvider {
  static EffectMetadata badEffectMetadata;
  static gd::InstructionMetadata badInstructionMetadata;
  static gd::ExpressionMetadata badExpressionMetadata;
-  int useless = 0;  // Useless member to avoid emscripten "must have a positive
-                    // integer typeid pointer" runtime error.
+  int useless;  // Useless member to avoid emscripten "must have a positive
+                // integer typeid pointer" runtime error.
 };

 }  // namespace gd
--- a/Core/GDCore/Extensions/Metadata/ObjectMetadata.cpp
+++ b/Core/GDCore/Extensions/Metadata/ObjectMetadata.cpp
@@ -46,25 +46,30 @@ ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                               const gd::String& fullname_,
                               const gd::String& description_,
                               const gd::String& icon24x24)
-    : name(name_),
-      iconFilename(icon24x24),
-      extensionNamespace(extensionNamespace_) {
-  SetFullName(gd::String(fullname_));
-  SetDescription(gd::String(description_));
-}
+    : ObjectMetadata(extensionNamespace_,
+                     name_,
+                     fullname_,
+                     description_,
+                     icon24x24,
+                     []() -> std::unique_ptr<gd::ObjectConfiguration> {
+      gd::LogFatalError(
+          "Error: Event-based objects don't have blueprint. "
+          "This method should not never be called.");
+      return nullptr;
+    }) {}

 ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                               const gd::String& name_,
                               const gd::String& fullname_,
                               const gd::String& description_,
                               const gd::String& icon24x24,
-                               CreateFunPtr createFunPtr_)
-    : ObjectMetadata(extensionNamespace_,
-                     name_,
-                     fullname_,
-                     description_,
-                     icon24x24) {
-  createFunPtr = createFunPtr_;
+                               CreateFunPtr createFunPtrP)
+    : name(name_),
+      iconFilename(icon24x24),
+      createFunPtr(createFunPtrP),
+      extensionNamespace(extensionNamespace_) {
+  SetFullName(gd::String(fullname_));
+  SetDescription(gd::String(description_));
 }

 gd::InstructionMetadata& ObjectMetadata::AddCondition(
--- a/Core/GDCore/Extensions/Metadata/ObjectMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/ObjectMetadata.h
@@ -39,8 +39,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
  /**
   * \brief Construct an object metadata, using a "blueprint" object that will
   * be copied when a new object is requested.
-   *
-   * \note This is used for objects declared in JavaScript extensions.
   */
  ObjectMetadata(const gd::String& extensionNamespace_,
                 const gd::String& name_,
@@ -49,9 +47,9 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                 const gd::String& icon24x24_,
                 std::shared_ptr<gd::ObjectConfiguration> blueprintObject_);
  /**
-   * \brief Construct an object metadata.
+   * \brief Construct an object metadata, without "blueprint" object
   *
-   * \note This is used by events based objects ("custom objects").
+   * \note This is used by events based objects.
   */
  ObjectMetadata(const gd::String& extensionNamespace_,
                 const gd::String& name_,
@@ -62,17 +60,14 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
  /**
   * \brief Construct an object metadata, with a function that will be called
   * to instantiate a new object.
-   *
-   * \note This is used for objects declared in C++ extensions.
   */
  ObjectMetadata(const gd::String& extensionNamespace_,
                 const gd::String& name_,
                 const gd::String& fullname_,
                 const gd::String& description_,
                 const gd::String& icon24x24_,
-                 CreateFunPtr createFunPtr_);
-
-  ObjectMetadata() {}
+                 CreateFunPtr createFunPtrP);
+  ObjectMetadata() : createFunPtr(NULL) {}
  virtual ~ObjectMetadata(){};

  /**
@@ -251,11 +246,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    return *this;
  }

-  ObjectMetadata& ResetDefaultBehaviorsJustForTesting() {
-    defaultBehaviorTypes.clear();
-    return *this;
-  }
-
  const gd::String& GetName() const override { return name; }
  const gd::String& GetFullName() const override { return fullname; }
  const gd::String& GetCategoryFullName() const { return categoryFullName; }
@@ -305,22 +295,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   */
  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() override { return strExpressionsInfos; };

-
-  /**
-   * Check if the behavior is private - it can't be used outside of its
-   * extension.
-   */
-  bool IsPrivate() const override { return isPrivate; }
-
-  /**
-   * Set that the behavior is private - it can't be used outside of its
-   * extension.
-   */
-  ObjectMetadata &SetPrivate() {
-    isPrivate = true;
-    return *this;
-  }
-
  /**
   * \brief Set the object to be hidden in the IDE.
   *
@@ -349,15 +323,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   */
  bool IsRenderedIn3D() const { return isRenderedIn3D; }

-  ObjectMetadata &SetOpenFullEditorLabel(const gd::String& label) {
-    openFullEditorLabel = label;
-    return *this;
-  }
-
-  const gd::String& GetOpenFullEditorLabel() const {
-    return openFullEditorLabel;
-  }
-
  std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
  std::map<gd::String, gd::InstructionMetadata> actionsInfos;
  std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
@@ -365,7 +330,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada

  std::vector<gd::String> includeFiles;
  gd::String className;
-  CreateFunPtr createFunPtr = nullptr;
+  CreateFunPtr createFunPtr;

 private:
  gd::String extensionNamespace;
@@ -377,10 +342,8 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
  gd::String iconFilename;
  gd::String categoryFullName;
  std::set<gd::String> defaultBehaviorTypes;
-  bool isPrivate = false;
  bool hidden = false;
  bool isRenderedIn3D = false;
-  gd::String openFullEditorLabel;

  std::shared_ptr<gd::ObjectConfiguration>
      blueprintObject;  ///< The "blueprint" object to be copied when a new
--- a/Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp
+++ b/Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp
@@ -6,8 +6,6 @@
 #include "ParameterMetadataTools.h"

 #include "GDCore/Events/Expression.h"
-#include "GDCore/Events/Parsers/ExpressionParser2.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/ObjectsContainersList.h"
@@ -15,6 +13,8 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/String.h"
 #include "InstructionMetadata.h"
+#include "GDCore/Events/Parsers/ExpressionParser2.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"

 namespace gd {
 const ParameterMetadata ParameterMetadataTools::badParameterMetadata;
@@ -23,109 +23,42 @@ void ParameterMetadataTools::ParametersToObjectsContainer(
    const gd::Project& project,
    const ParameterMetadataContainer& parameters,
    gd::ObjectsContainer& outputObjectsContainer) {
-  // Keep track of all objects and their behaviors names, so we can remove
-  // those who are in the container but not in the parameters anymore.
-  std::set<gd::String> allObjectNames;
-  std::map<gd::String, std::set<gd::String>> allObjectNonDefaultBehaviorNames;
+  outputObjectsContainer.GetObjects().clear();

  gd::String lastObjectName;
  for (std::size_t i = 0; i < parameters.GetParametersCount(); ++i) {
    const auto& parameter = parameters.GetParameter(i);
    if (parameter.GetName().empty()) continue;

-    auto &valueTypeMetadata = parameter.GetValueTypeMetadata();
-    if (valueTypeMetadata.IsObject()) {
-      const gd::String& objectName = parameter.GetName();
-      const gd::String& objectType = parameter.GetExtraInfo();
-      allObjectNames.insert(objectName);
-
-      // Check if we can keep the existing object.
-      if (outputObjectsContainer.HasObjectNamed(objectName)) {
-        const gd::Object& object = outputObjectsContainer.GetObject(objectName);
-
-        if (object.GetType() != objectType) {
-          // Object type has changed, remove it so it is re-created.
-          outputObjectsContainer.RemoveObject(objectName);
-        }
-      }
-
-      if (outputObjectsContainer.HasObjectNamed(objectName)) {
-        // Keep the existing object, ensure the default behaviors
-        // are all present (and no more than required by the object type).
-        // Non default behaviors coming from parameters will be added or removed later.
-        project.EnsureObjectDefaultBehaviors(outputObjectsContainer.GetObject(objectName));
-      } else {
-        // Create a new object (and its default behaviors) if needed.
-        outputObjectsContainer.InsertNewObject(
-            project,
-            objectType,
-            objectName,
-            outputObjectsContainer.GetObjectsCount());
-      }
+    if (gd::ParameterMetadata::IsObject(parameter.GetType())) {
+      outputObjectsContainer.InsertNewObject(
+          project,
+          parameter.GetExtraInfo(),
+          parameter.GetName(),
+          outputObjectsContainer.GetObjectsCount());

      // Memorize the last object name. By convention, parameters that require
      // an object (mainly, "objectvar" and "behavior") should be placed after
      // the object in the list of parameters (if possible, just after).
      // Search "lastObjectName" in the codebase for other place where this
      // convention is enforced.
-      lastObjectName = objectName;
-    } else if (valueTypeMetadata.IsBehavior()) {
+      lastObjectName = parameter.GetName();
+    } else if (gd::ParameterMetadata::IsBehavior(parameter.GetType())) {
      if (!lastObjectName.empty()) {
        if (outputObjectsContainer.HasObjectNamed(lastObjectName)) {
-          const gd::String& behaviorName = parameter.GetName();
-          const gd::String& behaviorType = parameter.GetExtraInfo();
-
-          gd::Object& object = outputObjectsContainer.GetObject(lastObjectName);
-          allObjectNonDefaultBehaviorNames[lastObjectName].insert(behaviorName);
-
-          // Check if we can keep the existing behavior.
-          if (object.HasBehaviorNamed(behaviorName)) {
-            if (object.GetBehavior(behaviorName).GetTypeName() !=
-                behaviorType) {
-              // Behavior type has changed, remove it so it is re-created.
-              object.RemoveBehavior(behaviorName);
-            }
-          }
+          const gd::Object& object =
+              outputObjectsContainer.GetObject(lastObjectName);
+          gd::String behaviorName = parameter.GetName();

          if (!object.HasBehaviorNamed(behaviorName)) {
-            object.AddNewBehavior(
-                project, parameter.GetExtraInfo(), behaviorName);
+            outputObjectsContainer.GetObject(lastObjectName)
+                .AddNewBehavior(
+                    project, parameter.GetExtraInfo(), behaviorName);
          }
        }
      }
    }
  }
-
-  // Remove objects that are not in the parameters anymore.
-  std::set<gd::String> objectNamesInContainer =
-      outputObjectsContainer.GetAllObjectNames();
-  for (const auto& objectName : objectNamesInContainer) {
-    if (allObjectNames.find(objectName) == allObjectNames.end()) {
-      outputObjectsContainer.RemoveObject(objectName);
-    }
-  }
-
-  // Remove behaviors of objects that are not in the parameters anymore.
-  for (const auto& objectName : allObjectNames) {
-    if (!outputObjectsContainer.HasObjectNamed(objectName)) {
-      // Should not happen.
-      continue;
-    }
-
-    auto& object = outputObjectsContainer.GetObject(objectName);
-    const auto& allBehaviorNames = allObjectNonDefaultBehaviorNames[objectName];
-    for (const auto& behaviorName : object.GetAllBehaviorNames()) {
-      if (object.GetBehavior(behaviorName).IsDefaultBehavior()) {
-        // Default behaviors are already ensured to be all present
-        // (and no more than required by the object type).
-        continue;
-      }
-
-      if (allBehaviorNames.find(behaviorName) == allBehaviorNames.end()) {
-        object.RemoveBehavior(behaviorName);
-      }
-    }
-  }
 }

 void ParameterMetadataTools::ForEachParameterMatchingSearch(
--- a/Core/GDCore/Extensions/Metadata/SourceFileMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/SourceFileMetadata.h
@@ -1,56 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-#include "GDCore/String.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-namespace gd {
-/**
- * \brief Contains information about a source file that must be included
- * when an extension is used.
- */
-class GD_CORE_API SourceFileMetadata {
- public:
-  /**
-   * Construct a new dependency metadata, though you probably want to call
-   * `AddSourceFile` on gd::PlatformExtension.
-   *
-   * \see gd::PlatformExtension
-   */
-  SourceFileMetadata() {};
-
-  SourceFileMetadata& SetResourceName(const gd::String& resourceName_) {
-    resourceName = resourceName_;
-    return *this;
-  };
-
-  SourceFileMetadata& SetIncludePosition(const gd::String& includePosition_) {
-    includePosition = includePosition_;
-    return *this;
-  };
-
-  const gd::String& GetResourceName() const { return resourceName; };
-
-  gd::String& GetResourceName() { return resourceName; };
-
-  const gd::String& GetIncludePosition() const { return includePosition; };
-
-  void SerializeTo(SerializerElement& element) const {
-    element.AddChild("resourceName").SetStringValue(resourceName);
-    element.AddChild("includePosition").SetStringValue(includePosition);
-  }
-
-  void UnserializeFrom(const SerializerElement& element) {
-    resourceName = element.GetStringAttribute("resourceName");
-    includePosition = element.GetStringAttribute("includePosition", "last");
-  }
-
- private:
-  gd::String resourceName;  ///< The name of the resource in the project.
-  gd::String includePosition = "last";  ///< "first" or "last".
-};
-
-}  // namespace gd
--- a/Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp
+++ b/Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp
@@ -53,34 +53,27 @@ const gd::String &ValueTypeMetadata::GetExpressionPrimitiveValueType(

 const gd::String &
 ValueTypeMetadata::GetPrimitiveValueType(const gd::String &parameterType) {
-  if (parameterType == "number" ||
-      gd::ValueTypeMetadata::IsTypeValue("number", parameterType)) {
-    return ValueTypeMetadata::numberType;
-  }
-  if (parameterType == "string" ||
-      gd::ValueTypeMetadata::IsTypeValue("string", parameterType)) {
-    return ValueTypeMetadata::stringType;
-  }
  if (parameterType == "variable" ||
-      gd::ValueTypeMetadata::IsTypeValue("variable", parameterType)) {
+      gd::ValueTypeMetadata::IsTypeExpression("variable", parameterType)) {
    return ValueTypeMetadata::variableType;
  }
-  if (parameterType == "boolean" ||
-      gd::ValueTypeMetadata::IsTypeValue("boolean", parameterType)) {
+  if (parameterType == "boolean" || parameterType == "yesorno" ||
+      parameterType == "trueorfalse") {
    return ValueTypeMetadata::booleanType;
  }
-  return parameterType;
+  // These 2 types are not strings from the code generator point of view,
+  // but it is for event-based extensions.
+  if (parameterType == "key" || parameterType == "mouse") {
+    return ValueTypeMetadata::stringType;
+  }
+  return GetExpressionPrimitiveValueType(parameterType);
 }

 const gd::String ValueTypeMetadata::numberValueType = "number";
 const gd::String ValueTypeMetadata::booleanValueType = "boolean";
-const gd::String ValueTypeMetadata::stringValueType = "string";
 const gd::String ValueTypeMetadata::colorValueType = "color";
 const gd::String ValueTypeMetadata::choiceValueType = "stringWithSelector";
-const gd::String ValueTypeMetadata::behaviorValueType = "behavior";
-const gd::String ValueTypeMetadata::leaderboardIdValueType = "leaderboardId";
-const gd::String ValueTypeMetadata::objectAnimationNameValueType = "objectAnimationName";
-const gd::String ValueTypeMetadata::keyboardKeyValueType = "keyboardKey";
+const gd::String ValueTypeMetadata::stringValueType = "string";

 const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
    const gd::String &propertyType) {
@@ -92,16 +85,8 @@ const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
    return colorValueType;
  } else if (propertyType == "Choice") {
    return choiceValueType;
-  } else if (propertyType == "Behavior") {
-    return behaviorValueType;
-  } else if (propertyType == "LeaderboardId") {
-    return leaderboardIdValueType;
-  } else if (propertyType == "ObjectAnimationName") {
-    return objectAnimationNameValueType;
-  } else if (propertyType == "KeyboardKey") {
-    return keyboardKeyValueType;
  }
-  // For "String", "Resource", "MultilineString" or default
+  // For "String" or default
  return stringValueType;
 };

--- a/Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h
@@ -111,54 +111,31 @@ class GD_CORE_API ValueTypeMetadata {
   * given type.
   */
  bool IsNumber() const {
-    return gd::ValueTypeMetadata::IsTypeValue("number", name);
+    return gd::ValueTypeMetadata::IsTypeExpression("number", name);
  }

  /**
   * \brief Return true if the type is a string.
   */
  bool IsString() const {
-    return gd::ValueTypeMetadata::IsTypeValue("string", name);
+    return gd::ValueTypeMetadata::IsTypeExpression("string", name);
  }

  /**
   * \brief Return true if the type is a boolean.
   */
  bool IsBoolean() const {
-    return gd::ValueTypeMetadata::IsTypeValue("boolean", name);
+    return gd::ValueTypeMetadata::IsTypeExpression("boolean", name);
  }

  /**
-   * \brief Return true if the type of the parameter is a variable.
+   * \brief Return true if the type of the parameter is a number.
   * \note If you had a new type of parameter, also add it in the IDE (
   * see EventsFunctionParametersEditor, ParameterRenderingService
   * and ExpressionAutocompletion) and in the EventsCodeGenerator.
   */
  bool IsVariable() const {
-    return gd::ValueTypeMetadata::IsVariable(name);
-  }
-
-  /**
-   * \brief Return true if the type of the parameter is a variable.
-   * \note If you had a new type of parameter, also add it in the IDE (
-   * see EventsFunctionParametersEditor, ParameterRenderingService
-   * and ExpressionAutocompletion) and in the EventsCodeGenerator.
-   */
-  static bool IsVariable(const gd::String &type) {
-    return gd::ValueTypeMetadata::GetPrimitiveValueType(type) == "variable";
-  }
-
-  /**
-   * \brief Return true if the type of the parameter is a variable and not a
-   * property or a parameter.
-   */
-  bool IsVariableOnly() const {
-      return
-          // Any variable.
-          name == "variable" ||
-          // Old, "pre-scoped" variables:
-          name == "objectvar" || name == "globalvar" ||
-          name == "scenevar";
+    return gd::ValueTypeMetadata::IsTypeExpression("variable", name);
  }

  /**
@@ -198,9 +175,7 @@ class GD_CORE_API ValueTypeMetadata {
  }

  /**
-   * \brief Return true if the type is an expression of the given type from the
-   * caller point of view.
-   *
+   * \brief Return true if the type is an expression of the given type.
   * \note If you are adding a new type of parameter, also add it in the IDE (
   * see EventsFunctionParametersEditor, ParameterRenderingService
   * and ExpressionAutocompletion) and in the EventsCodeGenerator.
@@ -211,7 +186,6 @@ class GD_CORE_API ValueTypeMetadata {
      return parameterType == "number" || parameterType == "expression" ||
             parameterType == "camera" || parameterType == "forceMultiplier";
    } else if (type == "string") {
-      // "key" and "mouse" are not mapped her, see GetPrimitiveValueType.
      return parameterType == "string" || parameterType == "layer" ||
             parameterType == "color" || parameterType == "file" ||
             parameterType == "stringWithSelector" ||
@@ -225,20 +199,15 @@ class GD_CORE_API ValueTypeMetadata {
             parameterType == "functionParameterName" ||
             parameterType == "externalLayoutName" ||
             parameterType == "leaderboardId" ||
-             parameterType == "keyboardKey" ||
-             parameterType == "mouseButton" ||
             parameterType == "identifier";
    } else if (type == "boolean") {
      return parameterType == "yesorno" || parameterType == "trueorfalse";
    } else if (type == "variable") {
      return
-          // Any variable.
-          parameterType == "variable" ||
-          parameterType == "variableOrProperty" ||
-          parameterType == "variableOrPropertyOrParameter" ||
-          // Old, "pre-scoped" variables:
-          parameterType == "objectvar" || parameterType == "globalvar" ||
-          parameterType == "scenevar";
+             parameterType == "variable" || // Any variable.
+             // Old, "pre-scoped" variables:
+             parameterType == "objectvar" || parameterType == "globalvar" ||
+             parameterType == "scenevar";
    } else if (type == "resource") {
      return parameterType == "fontResource" ||
             parameterType == "audioResource" ||
@@ -258,26 +227,6 @@ class GD_CORE_API ValueTypeMetadata {
    return false;
  }

-  /**
-   * \brief Return true if the type is a value of the given primitive type from
-   * the function events point of view
-   */
-  static bool IsTypeValue(const gd::String &type,
-                           const gd::String &parameterType) {
-    if (gd::ValueTypeMetadata::IsTypeExpression(type, parameterType)) {
-      return true;
-    }
-    // These 2 parameter types are not strings from the outside of a function as
-    // the generator add quote around a text, but from the events inside of the
-    // function the parameter is a string.
-    //
-    // See EventsCodeGenerator::GenerateParameterCodes
-    if (type == "string") {
-      return parameterType == "key" || parameterType == "mouse";
-    }
-    return false;
-  }
-
  /**
   * \brief Return the expression type from the parameter type.
   * Declinations of "number" and "string" types (like "forceMultiplier" or
@@ -329,13 +278,9 @@ class GD_CORE_API ValueTypeMetadata {

  static const gd::String numberValueType;
  static const gd::String booleanValueType;
-  static const gd::String stringValueType;
  static const gd::String colorValueType;
  static const gd::String choiceValueType;
-  static const gd::String behaviorValueType;
-  static const gd::String leaderboardIdValueType;
-  static const gd::String objectAnimationNameValueType;
-  static const gd::String keyboardKeyValueType;
+  static const gd::String stringValueType;
 };

 }  // namespace gd
--- a/Core/GDCore/Extensions/Platform.cpp
+++ b/Core/GDCore/Extensions/Platform.cpp
@@ -38,14 +38,12 @@ bool Platform::AddExtension(std::shared_ptr<gd::PlatformExtension> extension) {

  extensionsLoaded.push_back(extension);

-  // Load all creation functions for objects provided by the
-  // extension.
+  // Load all creation/destruction functions for objects provided by the
+  // extension
  vector<gd::String> objectsTypes = extension->GetExtensionObjectsTypes();
  for (std::size_t i = 0; i < objectsTypes.size(); ++i) {
-    CreateFunPtr createFunPtr = extension->GetObjectCreationFunctionPtr(objectsTypes[i]);
-    if (createFunPtr != nullptr) {
-      creationFunctionTable[objectsTypes[i]] = createFunPtr;
-    }
+    creationFunctionTable[objectsTypes[i]] =
+        extension->GetObjectCreationFunctionPtr(objectsTypes[i]);
  }

  for (const auto& it :
@@ -64,9 +62,7 @@ void Platform::RemoveExtension(const gd::String& name) {
    if (extension->GetName() == name) {
      vector<gd::String> objectsTypes = extension->GetExtensionObjectsTypes();
      for (std::size_t i = 0; i < objectsTypes.size(); ++i) {
-        if (creationFunctionTable.find(objectsTypes[i]) != creationFunctionTable.end()) {
-          creationFunctionTable.erase(objectsTypes[i]);
-        }
+        creationFunctionTable.erase(objectsTypes[i]);
      }
    }
  }
--- a/Core/GDCore/Extensions/PlatformExtension.cpp
+++ b/Core/GDCore/Extensions/PlatformExtension.cpp
@@ -18,8 +18,8 @@
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/IDE/PlatformManager.h"
 #include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorsSharedData.h"
 #include "GDCore/Project/ObjectConfiguration.h"
+#include "GDCore/Project/BehaviorsSharedData.h"
 #include "GDCore/Tools/Localization.h"

 namespace gd {
@@ -200,11 +200,11 @@ PlatformExtension::AddExpressionAndConditionAndAction(
                          group,
                          icon)
          : AddStrExpression(name,
-                             fullname,
-                             expressionDescriptionTemplate.FindAndReplace(
-                                 "<subject>", descriptionSubject),
-                             group,
-                             icon);
+                              fullname,
+                              expressionDescriptionTemplate.FindAndReplace(
+                                  "<subject>", descriptionSubject),
+                              group,
+                              icon);

  return MultipleInstructionMetadata::WithExpressionAndConditionAndAction(
      expression, condition, action);
@@ -215,11 +215,6 @@ gd::DependencyMetadata& PlatformExtension::AddDependency() {
  return extensionDependenciesMetadata.back();
 }

-gd::SourceFileMetadata& PlatformExtension::AddSourceFile() {
-  extensionSourceFilesMetadata.push_back(SourceFileMetadata());
-  return extensionSourceFilesMetadata.back();
-}
-
 gd::ObjectMetadata& PlatformExtension::AddObject(
    const gd::String& name,
    const gd::String& fullname,
@@ -244,10 +239,12 @@ gd::ObjectMetadata& PlatformExtension::AddEventsBasedObject(
    const gd::String& description,
    const gd::String& icon24x24) {
  gd::String nameWithNamespace = GetNameSpace() + name;
-  objectsInfos[nameWithNamespace] =
-      ObjectMetadata(
-          GetNameSpace(), nameWithNamespace, fullname, description, icon24x24)
-          .SetHelpPath(GetHelpPath());
+  objectsInfos[nameWithNamespace] = ObjectMetadata(GetNameSpace(),
+                                                   nameWithNamespace,
+                                                   fullname,
+                                                   description,
+                                                   icon24x24)
+                                        .SetHelpPath(GetHelpPath());
  return objectsInfos[nameWithNamespace];
 }

@@ -351,7 +348,8 @@ gd::BehaviorMetadata& PlatformExtension::GetBehaviorMetadata(
  return badBehaviorMetadata;
 }

-bool PlatformExtension::HasBehavior(const gd::String& behaviorType) const {
+bool PlatformExtension::HasBehavior(
+    const gd::String& behaviorType) const {
  return behaviorsInfo.find(behaviorType) != behaviorsInfo.end();
 }

@@ -383,7 +381,7 @@ gd::InstructionMetadata& PlatformExtension::AddDuplicatedAction(
  auto copiedAction = actionsInfos.find(copiedNameWithNamespace);
  if (copiedAction == actionsInfos.end()) {
    gd::LogError("Could not find an action with name " +
-                 copiedNameWithNamespace + " to copy.");
+                   copiedNameWithNamespace + " to copy.");
  } else {
    actionsInfos[newNameWithNamespace] = copiedAction->second;
  }
@@ -403,7 +401,7 @@ gd::InstructionMetadata& PlatformExtension::AddDuplicatedCondition(
  auto copiedCondition = conditionsInfos.find(copiedNameWithNamespace);
  if (copiedCondition == conditionsInfos.end()) {
    gd::LogError("Could not find a condition with name " +
-                 copiedNameWithNamespace + " to copy.");
+                   copiedNameWithNamespace + " to copy.");
  } else {
    conditionsInfos[newNameWithNamespace] = copiedCondition->second;
  }
@@ -420,7 +418,7 @@ gd::ExpressionMetadata& PlatformExtension::AddDuplicatedExpression(
  auto copiedExpression = expressionsInfos.find(copiedNameWithNamespace);
  if (copiedExpression == expressionsInfos.end()) {
    gd::LogError("Could not find an expression with name " +
-                 copiedNameWithNamespace + " to copy.");
+                   copiedNameWithNamespace + " to copy.");
  } else {
    expressionsInfos[newNameWithNamespace] = copiedExpression->second;
  }
@@ -437,7 +435,7 @@ gd::ExpressionMetadata& PlatformExtension::AddDuplicatedStrExpression(
  auto copiedExpression = strExpressionsInfos.find(copiedNameWithNamespace);
  if (copiedExpression == strExpressionsInfos.end()) {
    gd::LogError("Could not find a string expression with name " +
-                 copiedNameWithNamespace + " to copy.");
+                   copiedNameWithNamespace + " to copy.");
  } else {
    strExpressionsInfos[newNameWithNamespace] = copiedExpression->second;
  }
@@ -465,24 +463,10 @@ PlatformExtension::GetAllStrExpressions() {
  return strExpressionsInfos;
 }

-const std::vector<gd::DependencyMetadata>&
-PlatformExtension::GetAllDependencies() const {
-  return extensionDependenciesMetadata;
-}
-
 std::vector<gd::DependencyMetadata>& PlatformExtension::GetAllDependencies() {
  return extensionDependenciesMetadata;
 }

-const std::vector<gd::SourceFileMetadata>&
-PlatformExtension::GetAllSourceFiles() const {
-  return extensionSourceFilesMetadata;
-}
-
-std::vector<gd::SourceFileMetadata>& PlatformExtension::GetAllSourceFiles() {
-  return extensionSourceFilesMetadata;
-}
-
 std::map<gd::String, gd::EventMetadata>& PlatformExtension::GetAllEvents() {
  return eventsInfos;
 }
@@ -614,6 +598,37 @@ void PlatformExtension::SetNameSpace(gd::String nameSpace_) {
  nameSpace = nameSpace_ + GetNamespaceSeparator();
 }

+std::vector<gd::String> PlatformExtension::GetBuiltinExtensionsNames() {
+  std::vector<gd::String> builtinExtensions;
+  builtinExtensions.push_back("Sprite");
+  builtinExtensions.push_back("BuiltinObject");
+  builtinExtensions.push_back("BuiltinAudio");
+  builtinExtensions.push_back("BuiltinMouse");
+  builtinExtensions.push_back("BuiltinKeyboard");
+  builtinExtensions.push_back("BuiltinJoystick");
+  builtinExtensions.push_back("BuiltinTime");
+  builtinExtensions.push_back("BuiltinFile");
+  builtinExtensions.push_back("BuiltinVariables");
+  builtinExtensions.push_back("BuiltinCamera");
+  builtinExtensions.push_back("BuiltinWindow");
+  builtinExtensions.push_back("BuiltinNetwork");
+  builtinExtensions.push_back("BuiltinScene");
+  builtinExtensions.push_back("BuiltinAdvanced");
+  builtinExtensions.push_back("BuiltinCommonConversions");
+  builtinExtensions.push_back("BuiltinStringInstructions");
+  builtinExtensions.push_back("BuiltinMathematicalTools");
+  builtinExtensions.push_back("BuiltinExternalLayouts");
+  builtinExtensions.push_back("BuiltinCommonInstructions");
+
+  return builtinExtensions;
+}
+
+bool PlatformExtension::IsBuiltin() const {
+  std::vector<gd::String> builtinExtensions = GetBuiltinExtensionsNames();
+  return std::find(builtinExtensions.begin(), builtinExtensions.end(), name) !=
+         builtinExtensions.end();
+}
+
 void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
  for (std::map<gd::String, gd::InstructionMetadata>::iterator it =
           GetAllActions().begin();
@@ -759,80 +774,40 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
  }
 }

-gd::String PlatformExtension::GetEventsFunctionFullType(
-    const gd::String& extensionName, const gd::String& functionName) {
-  const auto& separator = GetNamespaceSeparator();
+gd::String
+PlatformExtension::GetEventsFunctionFullType(const gd::String &extensionName,
+                                             const gd::String &functionName) {
+  const auto &separator = GetNamespaceSeparator();
  return extensionName + separator + functionName;
 }

 gd::String PlatformExtension::GetBehaviorEventsFunctionFullType(
-    const gd::String& extensionName,
-    const gd::String& behaviorName,
-    const gd::String& functionName) {
-  const auto& separator = GetNamespaceSeparator();
+    const gd::String &extensionName, const gd::String &behaviorName,
+    const gd::String &functionName) {
+  const auto &separator = GetNamespaceSeparator();
  return extensionName + separator + behaviorName + separator + functionName;
 }

-gd::String PlatformExtension::GetBehaviorFullType(
-    const gd::String& extensionName, const gd::String& behaviorName) {
-  const auto& separator = GetNamespaceSeparator();
+gd::String
+PlatformExtension::GetBehaviorFullType(const gd::String &extensionName,
+                                       const gd::String &behaviorName) {
+  const auto &separator = GetNamespaceSeparator();
  return extensionName + separator + behaviorName;
 }

-gd::String PlatformExtension::GetExtensionFromFullBehaviorType(
-    const gd::String& type) {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  if (separatorIndex == std::string::npos) {
-    return "";
-  }
-  return type.substr(0, separatorIndex);
-}
-
-gd::String PlatformExtension::GetBehaviorNameFromFullBehaviorType(
-    const gd::String& type) {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  if (separatorIndex == std::string::npos) {
-    return "";
-  }
-  return type.substr(separatorIndex + 2);
-}
-
 gd::String PlatformExtension::GetObjectEventsFunctionFullType(
-    const gd::String& extensionName,
-    const gd::String& objectName,
-    const gd::String& functionName) {
-  const auto& separator = GetNamespaceSeparator();
+    const gd::String &extensionName, const gd::String &objectName,
+    const gd::String &functionName) {
+  const auto &separator = GetNamespaceSeparator();
  return extensionName + separator + objectName + separator + functionName;
 }

-gd::String PlatformExtension::GetObjectFullType(const gd::String& extensionName,
-                                                const gd::String& objectName) {
-  const auto& separator = GetNamespaceSeparator();
+gd::String PlatformExtension::GetObjectFullType(const gd::String &extensionName,
+                                                const gd::String &objectName) {
+  const auto &separator = GetNamespaceSeparator();
  return extensionName + separator + objectName;
 }

-gd::String PlatformExtension::GetExtensionFromFullObjectType(
-    const gd::String& type) {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  if (separatorIndex == std::string::npos) {
-    return "";
-  }
-  return type.substr(0, separatorIndex);
-}
-
-gd::String PlatformExtension::GetObjectNameFromFullObjectType(
-    const gd::String& type) {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  if (separatorIndex == std::string::npos) {
-    return "";
-  }
-  return type.substr(separatorIndex + 2);
-}
-
 PlatformExtension::PlatformExtension()
    : deprecated(false), category(_("General")) {}

--- a/Core/GDCore/Extensions/PlatformExtension.h
+++ b/Core/GDCore/Extensions/PlatformExtension.h
@@ -17,7 +17,6 @@
 #include "GDCore/Extensions/Metadata/EventMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionOrExpressionGroupMetadata.h"
 #include "GDCore/Extensions/Metadata/ObjectMetadata.h"
-#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
 #include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/VersionPriv.h"
@@ -41,7 +40,8 @@ class Object;
 class ObjectConfiguration;
 }  // namespace gd

-typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()> CreateFunPtr;
+typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
+    CreateFunPtr;

 namespace gd {

@@ -51,25 +51,25 @@ namespace gd {
 */
 class GD_CORE_API CompilationInfo {
 public:
-  CompilationInfo() {};
-  virtual ~CompilationInfo() {};
+  CompilationInfo() : informationCompleted(false){};
+  virtual ~CompilationInfo(){};

-  bool informationCompleted = false;
+  bool informationCompleted;

-  bool runtimeOnly = false;  ///< True if the extension was compiled for a
-                             ///< runtime use only
+  bool runtimeOnly;  ///< True if the extension was compiled for a runtime use
+                     ///< only

 #if defined(__GNUC__)
-  int gccMajorVersion = 0;
-  int gccMinorVersion = 0;
-  int gccPatchLevel = 0;
+  int gccMajorVersion;
+  int gccMinorVersion;
+  int gccPatchLevel;
 #endif

-  int sfmlMajorVersion = 0;
-  int sfmlMinorVersion = 0;
+  int sfmlMajorVersion;
+  int sfmlMinorVersion;

  gd::String gdCoreVersion;
-  int sizeOfpInt = 0;
+  int sizeOfpInt;
 };

 struct GD_CORE_API DuplicatedInstructionOptions {
@@ -215,7 +215,6 @@ class GD_CORE_API PlatformExtension {
      const gd::String& icon);

  gd::DependencyMetadata& AddDependency();
-  gd::SourceFileMetadata& AddSourceFile();

  /**
   * \brief Declare a new object as being part of the extension.
@@ -240,12 +239,11 @@ class GD_CORE_API PlatformExtension {
   * \param instance The "blueprint" object to be copied when a new object is
   asked for.
   */
-  gd::ObjectMetadata& AddObject(
-      const gd::String& name_,
-      const gd::String& fullname_,
-      const gd::String& description_,
-      const gd::String& icon_,
-      std::shared_ptr<gd::ObjectConfiguration> instance);
+  gd::ObjectMetadata& AddObject(const gd::String& name_,
+                                const gd::String& fullname_,
+                                const gd::String& description_,
+                                const gd::String& icon_,
+                                std::shared_ptr<gd::ObjectConfiguration> instance);

  /**
   * \brief Declare a new events based object as being part of the extension.
@@ -255,10 +253,11 @@ class GD_CORE_API PlatformExtension {
   * \param description The user friendly description of the object
   * \param icon The icon of the object.
   */
-  gd::ObjectMetadata& AddEventsBasedObject(const gd::String& name_,
-                                           const gd::String& fullname_,
-                                           const gd::String& description_,
-                                           const gd::String& icon_);
+  gd::ObjectMetadata& AddEventsBasedObject(
+      const gd::String& name_,
+      const gd::String& fullname_,
+      const gd::String& description_,
+      const gd::String& icon_);

  /**
   * \brief Declare a new behavior as being part of the extension.
@@ -421,7 +420,8 @@ class GD_CORE_API PlatformExtension {
  PlatformExtension& SetTags(const gd::String& csvTags) {
    tags.clear();
    tags = csvTags.Split(',');
-    for (size_t i = 0; i < tags.size(); i++) {
+    for (size_t i = 0; i < tags.size(); i++)
+    {
      tags[i] = tags[i].Trim().LowerCase();
    }
    return *this;
@@ -440,6 +440,12 @@ class GD_CORE_API PlatformExtension {
   */
  bool IsDeprecated() const { return deprecated; }

+  /**
+   * \brief Return true if the extension is a standard extension that cannot be
+   * deactivated
+   */
+  bool IsBuiltin() const;
+
  /**
   * \brief Get the namespace of the extension.
   * \note The namespace is simply the name of the extension concatenated with
@@ -548,24 +554,6 @@ class GD_CORE_API PlatformExtension {
   */
  std::vector<gd::DependencyMetadata>& GetAllDependencies();

-  /**
-   * \brief Return a reference to a vector containing the metadata of all the
-   * dependencies of the extension.
-   */
-  const std::vector<gd::DependencyMetadata>& GetAllDependencies() const;
-
-  /**
-   * \brief Return a reference to a vector containing the metadata of all the
-   * dependencies of the extension.
-   */
-  std::vector<gd::SourceFileMetadata>& GetAllSourceFiles();
-
-  /**
-   * \brief Return a reference to a vector containing the metadata of all the
-   * dependencies of the extension.
-   */
-  const std::vector<gd::SourceFileMetadata>& GetAllSourceFiles() const;
-
  /**
   * \brief Return a reference to a map containing the names of the actions,
   * related to the object type, and the metadata associated with.
@@ -634,40 +622,38 @@ class GD_CORE_API PlatformExtension {
  }
  ///@}

+  /**
+   * \brief Return the name of all the extensions which are considered provided
+   * by platforms.
+   */
+  static std::vector<gd::String> GetBuiltinExtensionsNames();
+
  /**
   * \brief Get the string used to separate the name of the
   * instruction/expression and the extension.
   */
  static gd::String GetNamespaceSeparator() { return "::"; }

-  static gd::String GetEventsFunctionFullType(const gd::String& extensionName,
-                                              const gd::String& functionName);
+  static gd::String GetEventsFunctionFullType(const gd::String &extensionName,
+                                              const gd::String &functionName);

-  static gd::String GetBehaviorEventsFunctionFullType(
-      const gd::String& extensionName,
-      const gd::String& behaviorName,
-      const gd::String& functionName);
+  static gd::String
+  GetBehaviorEventsFunctionFullType(const gd::String &extensionName,
+                                    const gd::String &behaviorName,
+                                    const gd::String &functionName);

-  static gd::String GetBehaviorFullType(const gd::String& extensionName,
-                                        const gd::String& behaviorName);
+  static gd::String GetBehaviorFullType(const gd::String &extensionName,
+                                        const gd::String &behaviorName);

-  static gd::String GetExtensionFromFullBehaviorType(const gd::String& type);
+  static gd::String
+  GetObjectEventsFunctionFullType(const gd::String &extensionName,
+                                  const gd::String &objectName,
+                                  const gd::String &functionName);

-  static gd::String GetBehaviorNameFromFullBehaviorType(const gd::String& type);
+  static gd::String GetObjectFullType(const gd::String &extensionName,
+                                      const gd::String &objectName);

-  static gd::String GetObjectEventsFunctionFullType(
-      const gd::String& extensionName,
-      const gd::String& objectName,
-      const gd::String& functionName);
-
-  static gd::String GetObjectFullType(const gd::String& extensionName,
-                                      const gd::String& objectName);
-
-  static gd::String GetExtensionFromFullObjectType(const gd::String& type);
-
-  static gd::String GetObjectNameFromFullObjectType(const gd::String& type);
-
- private:
+private:
  /**
   * Set the namespace (the string all actions/conditions/expressions start
   * with).
@@ -682,10 +668,10 @@ class GD_CORE_API PlatformExtension {
  gd::String fullname;      ///< Name displayed to users in the editor.
  gd::String informations;  ///< Description displayed to users in the editor.
  gd::String category;
-  gd::String author;   ///< Author displayed to users in the editor.
-  gd::String license;  ///< License name displayed to users in the editor.
-  bool deprecated;     ///< true if the extension is deprecated and shouldn't be
-                       ///< shown in IDE.
+  gd::String author;        ///< Author displayed to users in the editor.
+  gd::String license;       ///< License name displayed to users in the editor.
+  bool deprecated;  ///< true if the extension is deprecated and shouldn't be
+                    ///< shown in IDE.
  gd::String helpPath;  ///< The relative path to the help for this extension in
                        ///< the documentation.
  gd::String iconUrl;   ///< The URL to the icon to be shown for this extension.
@@ -699,7 +685,6 @@ class GD_CORE_API PlatformExtension {
  std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
  std::map<gd::String, gd::ExpressionMetadata> strExpressionsInfos;
  std::vector<gd::DependencyMetadata> extensionDependenciesMetadata;
-  std::vector<gd::SourceFileMetadata> extensionSourceFilesMetadata;
  std::map<gd::String, gd::EventMetadata> eventsInfos;
  std::map<gd::String, gd::PropertyDescriptor> extensionPropertiesMetadata;
  std::map<gd::String, InstructionOrExpressionGroupMetadata>
--- a/Core/GDCore/Extensions/PlatformExtension.inl
+++ b/Core/GDCore/Extensions/PlatformExtension.inl
@@ -5,8 +5,6 @@
 * project is released under the MIT License.
 */

-// NOLINTBEGIN
-
 #ifndef GDCORE_PLATFORMEXTENSION_INL
 #define GDCORE_PLATFORMEXTENSION_INL

@@ -38,5 +36,3 @@ gd::ObjectMetadata& PlatformExtension::AddObject(const gd::String& name,
 }  // namespace gd

 #endif
-
-// NOLINTEND
--- a/Core/GDCore/IDE/CaptureOptions.cpp
+++ b/Core/GDCore/IDE/CaptureOptions.cpp
@@ -1,18 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/IDE/CaptureOptions.h"
-
-#include "GDCore/String.h"
-
-using namespace std;
-
-namespace gd {
-
-Screenshot::Screenshot() {}
-
-CaptureOptions::CaptureOptions() {}
-
-}  // namespace gd
--- a/Core/GDCore/IDE/CaptureOptions.h
+++ b/Core/GDCore/IDE/CaptureOptions.h
@@ -1,50 +0,0 @@
-#pragma once
-#include <memory>
-#include <vector>
-
-#include "GDCore/String.h"
-
-namespace gd {
-
-class GD_CORE_API Screenshot {
- public:
-  Screenshot();
-  virtual ~Screenshot() {};
-
-  void SetDelayTimeInSeconds(int delayTimeInMs_) {
-    delayTimeInMs = delayTimeInMs_;
-  }
-  int GetDelayTimeInSeconds() const { return delayTimeInMs; }
-
-  void SetSignedUrl(const gd::String& signedUrl_) { signedUrl = signedUrl_; }
-  const gd::String& GetSignedUrl() const { return signedUrl; }
-
-  void SetPublicUrl(const gd::String& publicUrl_) { publicUrl = publicUrl_; }
-  const gd::String& GetPublicUrl() const { return publicUrl; }
-
- private:
-  int delayTimeInMs = 0;
-  gd::String signedUrl;
-  gd::String publicUrl;
-};
-
-class GD_CORE_API CaptureOptions {
- public:
-  CaptureOptions();
-  virtual ~CaptureOptions() {};
-
-  bool IsEmpty() const { return screenshots.empty(); }
-
-  void AddScreenshot(const Screenshot& screenshot) {
-    screenshots.push_back(screenshot);
-  }
-
-  const std::vector<Screenshot>& GetScreenshots() const { return screenshots; }
-
-  void ClearScreenshots() { screenshots.clear(); }
-
- private:
-  std::vector<Screenshot> screenshots;
-};
-
-}  // namespace gd
--- a/Core/GDCore/IDE/DependenciesAnalyzer.cpp
+++ b/Core/GDCore/IDE/DependenciesAnalyzer.cpp
@@ -12,6 +12,7 @@
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
+#include "GDCore/Project/SourceFile.h"

 DependenciesAnalyzer::DependenciesAnalyzer(const gd::Project& project_,
                                           const gd::Layout& layout_)
@@ -73,6 +74,16 @@ bool DependenciesAnalyzer::Analyze(const gd::EventsList& events) {
      }
    }

+    // Search for source files dependencies
+    std::vector<gd::String> dependencies =
+        events[i].GetSourceFileDependencies();
+    sourceFilesDependencies.insert(dependencies.begin(), dependencies.end());
+
+    const gd::String& associatedSourceFile =
+        events[i].GetAssociatedGDManagedSourceFile(const_cast<gd::Project&>(project));
+    if (!associatedSourceFile.empty())
+      sourceFilesDependencies.insert(associatedSourceFile);
+
    // Analyze sub events dependencies
    if (events[i].CanHaveSubEvents()) {
      if (!Analyze(events[i].GetSubEvents())) return false;
--- a/Core/GDCore/IDE/DependenciesAnalyzer.h
+++ b/Core/GDCore/IDE/DependenciesAnalyzer.h
@@ -71,6 +71,14 @@ class GD_CORE_API DependenciesAnalyzer {
    return externalEventsDependencies;
  };

+  /**
+   * \brief Return the source files being dependencies of the scene or external
+   * events passed in the constructor.
+   */
+  const std::set<gd::String>& GetSourceFilesDependencies() const {
+    return sourceFilesDependencies;
+  };
+
 private:
  /**
   * \brief Analyze the dependencies of the events.
@@ -84,6 +92,7 @@ class GD_CORE_API DependenciesAnalyzer {

  std::set<gd::String> scenesDependencies;
  std::set<gd::String> externalEventsDependencies;
+  std::set<gd::String> sourceFilesDependencies;
  std::vector<gd::String>
      parentScenes;  ///< Used to check for circular dependencies.
  std::vector<gd::String>
--- a/Core/GDCore/IDE/EventBasedBehaviorBrowser.cpp
+++ b/Core/GDCore/IDE/EventBasedBehaviorBrowser.cpp
@@ -29,6 +29,9 @@ void EventBasedBehaviorBrowser::ExposeEvents(
      project, eventsFunctionsExtension, eventsBasedBehavior, worker);
 }

+void EventBasedBehaviorBrowser::ExposeObjects(
+    gd::Project &project, gd::ArbitraryObjectsWorker &worker) const {}
+
 void EventBasedBehaviorBrowser::ExposeFunctions(
    gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) const {
  worker.Launch(eventsBasedBehavior.GetEventsFunctions());
@@ -40,4 +43,7 @@ void EventBasedBehaviorBrowser::ExposeEventBasedBehaviors(
  worker.Launch(eventsBasedBehavior);
 }

+void EventBasedBehaviorBrowser::ExposeBehaviorSharedDatas(
+    gd::Project &project, gd::ArbitraryBehaviorSharedDataWorker &worker) const {}
+
 } // namespace gd
--- a/Core/GDCore/IDE/EventBasedBehaviorBrowser.h
+++ b/Core/GDCore/IDE/EventBasedBehaviorBrowser.h
@@ -67,7 +67,7 @@ public:
   * \brief Do nothing.
   */
  void ExposeObjects(gd::Project &project,
-                     gd::ArbitraryObjectsWorker &worker) const override {};
+                     gd::ArbitraryObjectsWorker &worker) const override;

  /**
   * \brief Call the specified worker on the event-based behavior.
@@ -80,7 +80,7 @@ public:
   * \brief Do nothing.
   */
  void ExposeBehaviorSharedDatas(gd::Project &project,
-                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override {};
+                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override;

 private:
  const gd::EventsFunctionsExtension &eventsFunctionsExtension;
--- a/Core/GDCore/IDE/EventBasedObjectBrowser.cpp
+++ b/Core/GDCore/IDE/EventBasedObjectBrowser.cpp
@@ -1,37 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "EventBasedObjectBrowser.h"
-
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
-#include "GDCore/IDE/ProjectBrowserHelper.h"
-#include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-void EventBasedObjectBrowser::ExposeEvents(
-    gd::Project &project, gd::ArbitraryEventsWorker &worker) const {
-  gd::ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-      project, eventsBasedObject, worker);
-}
-
-void EventBasedObjectBrowser::ExposeEvents(
-    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) const {
-  gd::ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-      project, eventsFunctionsExtension, eventsBasedObject, worker);
-}
-
-void EventBasedObjectBrowser::ExposeFunctions(
-    gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) const {
-  worker.Launch(eventsBasedObject.GetEventsFunctions());
-}
-
-} // namespace gd
--- a/Core/GDCore/IDE/EventBasedObjectBrowser.h
+++ b/Core/GDCore/IDE/EventBasedObjectBrowser.h
@@ -1,90 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include "GDCore/IDE/ProjectBrowser.h"
-
-namespace gd {
-class Project;
-class String;
-class EventsFunctionsExtension;
-class EventsFunction;
-class EventsBasedBehavior;
-class EventsBasedObject;
-class ArbitraryEventsWorker;
-class ArbitraryEventsWorkerWithContext;
-class ArbitraryEventsFunctionsWorker;
-class ArbitraryObjectsWorker;
-class ArbitraryEventBasedBehaviorsWorker;
-class ArbitraryBehaviorSharedDataWorker;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Expose event-based object contents to workers.
- */
-class GD_CORE_API EventBasedObjectBrowser : public ProjectBrowser {
-public:
-  EventBasedObjectBrowser(
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension_,
-      gd::EventsBasedObject &eventsBasedObject_)
-      : eventsFunctionsExtension(eventsFunctionsExtension_),
-        eventsBasedObject(eventsBasedObject_) {}
-
-  /**
-   * \brief Call the specified worker on all events of the event-based
-   * object.
-   *
-   * This should be the preferred way to traverse all the events of an event-based object.
-   */
-  void ExposeEvents(gd::Project &project,
-                    gd::ArbitraryEventsWorker &worker) const override;
-
-  /**
-   * \brief Call the specified worker on all events of the event-based
-   * object.
-   *
-   * This should be the preferred way to traverse all the events of an event-based object.
-   */
-  void
-  ExposeEvents(gd::Project &project, 
-               gd::ArbitraryEventsWorkerWithContext &worker) const override;
-
-  /**
-   * \brief Call the specified worker on all functions of the event-based object
-   *
-   * This should be the preferred way to traverse all the function signatures
-   * of an event-based object.
-   */
-  void ExposeFunctions(gd::Project &project,
-                       gd::ArbitraryEventsFunctionsWorker &worker) const override;
-
-  /**
-   * \brief Do nothing.
-   */
-  void ExposeObjects(gd::Project &project,
-                     gd::ArbitraryObjectsWorker &worker) const override {};
-
-  /**
-   * @brief Do nothing.
-   */
-  void ExposeEventBasedBehaviors(
-      gd::Project &project,
-      gd::ArbitraryEventBasedBehaviorsWorker &worker) const override {};
-
-  /**
-   * \brief Do nothing.
-   */
-  void ExposeBehaviorSharedDatas(gd::Project &project,
-                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override {};
-
-private:
-  const gd::EventsFunctionsExtension &eventsFunctionsExtension;
-  gd::EventsBasedObject &eventsBasedObject;
-};
-
-} // namespace gd
--- a/Core/GDCore/IDE/Events/EventsLeaderboardsLister.cpp
+++ b/Core/GDCore/IDE/Events/EventsLeaderboardsLister.cpp
@@ -0,0 +1,41 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/IDE/Events/EventsLeaderboardsLister.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+bool EventsLeaderboardsLister::DoVisitInstruction(gd::Instruction& instruction,
+                                                  bool isCondition) {
+  const gd::InstructionMetadata& instrInfo =
+      isCondition ? MetadataProvider::GetConditionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType())
+                  : MetadataProvider::GetActionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType());
+
+  for (int i = 0; i < instruction.GetParametersCount() &&
+                  i < instrInfo.GetParametersCount();
+       ++i)
+    if (instrInfo.GetParameter(i).GetType() == "leaderboardId") {
+      leaderboardIds.insert(instruction.GetParameter(i).GetPlainString());
+    }
+  return false;
+}
+
+EventsLeaderboardsLister::~EventsLeaderboardsLister() {}
+
+}  // namespace gd
--- a/Core/GDCore/IDE/Events/EventsLeaderboardsLister.h
+++ b/Core/GDCore/IDE/Events/EventsLeaderboardsLister.h
@@ -0,0 +1,48 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef EventsLeaderboardsLister_H
+#define EventsLeaderboardsLister_H
+#include <map>
+#include <memory>
+#include <set>
+#include <vector>
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/String.h"
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+}
+
+namespace gd {
+
+/**
+ * \brief List the leaderboard ids in the instructions.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API EventsLeaderboardsLister : public ArbitraryEventsWorker {
+ public:
+  EventsLeaderboardsLister(gd::Project& project_) : project(project_){};
+  virtual ~EventsLeaderboardsLister();
+
+  /**
+   * Return the values of all leaderboardIds found in the events.
+   */
+  const std::set<gd::String>& GetLeaderboardIds() { return leaderboardIds; }
+
+ private:
+  virtual bool DoVisitInstruction(gd::Instruction& instruction,
+                                  bool isCondition);
+
+  std::set<gd::String> leaderboardIds;
+  gd::Project& project;
+};
+
+}  // namespace gd
+
+#endif  // EventsLeaderboardsLister_H
--- a/Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.cpp
+++ b/Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.cpp
@@ -0,0 +1,49 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/IDE/Events/EventsLeaderboardsRenamer.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+bool EventsLeaderboardsRenamer::DoVisitInstruction(gd::Instruction& instruction,
+                                                   bool isCondition) {
+  const gd::InstructionMetadata& instrInfo =
+      isCondition ? MetadataProvider::GetConditionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType())
+                  : MetadataProvider::GetActionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType());
+
+  for (int i = 0; i < instruction.GetParametersCount() &&
+                  i < instrInfo.GetParametersCount();
+       ++i) {
+    const gd::ParameterMetadata parameter = instrInfo.GetParameter(i);
+
+    if (parameter.GetType() == "leaderboardId") {
+      const gd::String leaderboardId =
+          instruction.GetParameter(i).GetPlainString();
+
+      if (leaderboardIdMap.find(leaderboardId) != leaderboardIdMap.end()) {
+        instruction.SetParameter(i, leaderboardIdMap[leaderboardId]);
+      }
+    }
+  }
+  return false;
+}
+
+EventsLeaderboardsRenamer::~EventsLeaderboardsRenamer() {}
+
+}  // namespace gd
--- a/Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.h
+++ b/Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.h
@@ -0,0 +1,46 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef EventsLeaderboardsRenamer_H
+#define EventsLeaderboardsRenamer_H
+#include <map>
+#include <memory>
+#include <set>
+#include <vector>
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/String.h"
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+}
+
+namespace gd {
+
+/**
+ * \brief Replace the leaderboard ids in the instructions.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API EventsLeaderboardsRenamer : public ArbitraryEventsWorker {
+ public:
+  EventsLeaderboardsRenamer(
+      gd::Project& project_,
+      const std::map<gd::String, gd::String>& leaderboardIdMap_)
+      : project(project_), leaderboardIdMap(leaderboardIdMap_){};
+  virtual ~EventsLeaderboardsRenamer();
+
+ private:
+  virtual bool DoVisitInstruction(gd::Instruction& instruction,
+                                  bool isCondition);
+
+  std::map<gd::String, gd::String> leaderboardIdMap;
+  gd::Project& project;
+};
+
+}  // namespace gd
+
+#endif  // EventsLeaderboardsRenamer_H
--- a/Core/GDCore/IDE/Events/EventsParameterReplacer.cpp
+++ b/Core/GDCore/IDE/Events/EventsParameterReplacer.cpp
@@ -1,243 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/IDE/Events/EventsParameterReplacer.h"
-
-#include <map>
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadata.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
-#include "GDCore/IDE/Events/ExpressionValidator.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/ProjectScopedContainers.h"
-#include "GDCore/Project/PropertiesContainer.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/Log.h"
-
-namespace gd {
-
-/**
- * \brief Go through the nodes and rename parameters.
- *
- * \see gd::ExpressionParser2
- */
-class GD_CORE_API ExpressionParameterReplacer
-    : public ExpressionParser2NodeWorker {
- public:
-  ExpressionParameterReplacer(
-      const gd::Platform& platform_,
-      const gd::ProjectScopedContainers& projectScopedContainers_,
-      bool isParentTypeAVariable_,
-      const std::unordered_map<gd::String, gd::String>& oldToNewPropertyNames_)
-      : hasDoneRenaming(false),
-        platform(platform_),
-        projectScopedContainers(projectScopedContainers_),
-        isParentTypeAVariable(isParentTypeAVariable_),
-        oldToNewPropertyNames(oldToNewPropertyNames_){};
-  virtual ~ExpressionParameterReplacer(){};
-
-  bool HasDoneRenaming() const { return hasDoneRenaming; }
-
- protected:
-  void OnVisitSubExpressionNode(SubExpressionNode& node) override {
-    node.expression->Visit(*this);
-  }
-  void OnVisitOperatorNode(OperatorNode& node) override {
-    node.leftHandSide->Visit(*this);
-    node.rightHandSide->Visit(*this);
-  }
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
-    node.factor->Visit(*this);
-  }
-  void OnVisitNumberNode(NumberNode& node) override {}
-  void OnVisitTextNode(TextNode& node) override {}
-  void OnVisitVariableNode(VariableNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        if (node.child) node.child->Visit(*this);
-        return;
-    }
-
-    // The node represents a variable or an object name on which a variable
-    // will be accessed, or a property with a child.
-
-    projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation.
-      node.name,
-      [&]() {
-        // Do nothing, it's an object variable.
-        if (node.child) node.child->Visit(*this);
-      }, [&]() {
-        // Do nothing, it's a variable.
-        if (node.child) node.child->Visit(*this);
-      }, [&]() {
-        // Do nothing, it's a property.
-        if (node.child) node.child->Visit(*this);
-      }, [&]() {
-        // This is a parameter
-        RenameParameter(node.name);
-        if (node.child) node.child->Visit(*this);
-      }, [&]() {
-        // Do nothing, it's something else.
-        if (node.child) node.child->Visit(*this);
-      });
-  }
-  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    isParentTypeAVariable = false;
-    node.expression->Visit(*this);
-    isParentTypeAVariable = isGrandParentTypeAVariable;
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitIdentifierNode(IdentifierNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        return;
-    }
-    projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation
-      node.identifierName,
-      [&]() {
-        // Do nothing, it's an object variable.
-      }, [&]() {
-        // Do nothing, it's a variable.
-      }, [&]() {
-        // Do nothing, it's a property.
-      }, [&]() {
-        // This is a parameter.
-        RenameParameter(node.identifierName);
-      }, [&]() {
-        // Do nothing, it's something else.
-      });
-  }
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitFunctionCallNode(FunctionCallNode &node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    for (auto &parameter : node.parameters) {
-      const auto &parameterMetadata =
-          gd::MetadataProvider::GetFunctionCallParameterMetadata(
-              platform, projectScopedContainers.GetObjectsContainersList(),
-              node, *parameter);
-      if (!parameterMetadata) {
-        continue;
-      }
-      const auto &parameterTypeMetadata =
-          parameterMetadata->GetValueTypeMetadata();
-      if (gd::EventsParameterReplacer::CanContainParameter(
-              parameterTypeMetadata)) {
-        isParentTypeAVariable = parameterTypeMetadata.IsVariableOnly();
-        parameter->Visit(*this);
-      }
-    }
-    isParentTypeAVariable = isGrandParentTypeAVariable;
-  }
-  void OnVisitEmptyNode(EmptyNode& node) override {}
-
- private:
-  bool hasDoneRenaming;
-
-  bool RenameParameter(
-      gd::String& name) {
-    if (oldToNewPropertyNames.count(name) >= 1) {
-      name = oldToNewPropertyNames.find(name)->second;
-      hasDoneRenaming = true;
-      return true;
-    }
-
-    return false;  // Nothing was changed or done.
-  }
-
-  // Scope:
-  const gd::Platform& platform;
-  const gd::ProjectScopedContainers& projectScopedContainers;
-
-  // Renaming to do
-  const std::unordered_map<gd::String, gd::String>& oldToNewPropertyNames;
-
-  gd::String objectNameToUseForVariableAccessor;
-  bool isParentTypeAVariable;
-};
-
-bool EventsParameterReplacer::DoVisitInstruction(gd::Instruction& instruction,
-                                                bool isCondition) {
-  const auto& metadata = isCondition
-                             ? gd::MetadataProvider::GetConditionMetadata(
-                                   platform, instruction.GetType())
-                             : gd::MetadataProvider::GetActionMetadata(
-                                   platform, instruction.GetType());
-
-  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(),
-      metadata.GetParameters(),
-      [&](const gd::ParameterMetadata& parameterMetadata,
-          const gd::Expression& parameterValue,
-          size_t parameterIndex,
-          const gd::String& lastObjectName) {
-        if (!gd::EventsParameterReplacer::CanContainParameter(
-          parameterMetadata.GetValueTypeMetadata())) {
-          return;
-        }
-        auto node = parameterValue.GetRootNode();
-        if (node) {
-          ExpressionParameterReplacer renamer(
-              platform, GetProjectScopedContainers(),
-              parameterMetadata.GetValueTypeMetadata().IsVariableOnly(),
-              oldToNewPropertyNames);
-          node->Visit(renamer);
-
-          if (renamer.HasDoneRenaming()) {
-            instruction.SetParameter(
-                parameterIndex, ExpressionParser2NodePrinter::PrintNode(*node));
-          }
-        }
-      });
-
-  return false;
-}
-
-bool EventsParameterReplacer::DoVisitEventExpression(
-    gd::Expression& expression, const gd::ParameterMetadata& metadata) {
-  if (!gd::EventsParameterReplacer::CanContainParameter(
-          metadata.GetValueTypeMetadata())) {
-    return false;
-  }
-  auto node = expression.GetRootNode();
-  if (node) {
-    ExpressionParameterReplacer renamer(
-        platform, GetProjectScopedContainers(),
-        metadata.GetValueTypeMetadata().IsVariableOnly(), oldToNewPropertyNames);
-    node->Visit(renamer);
-
-    if (renamer.HasDoneRenaming()) {
-      expression = ExpressionParser2NodePrinter::PrintNode(*node);
-    }
-  }
-
-  return false;
-}
-
-bool EventsParameterReplacer::CanContainParameter(
-    const gd::ValueTypeMetadata &valueTypeMetadata) {
-  return valueTypeMetadata.IsVariable() || valueTypeMetadata.IsNumber() ||
-         valueTypeMetadata.IsString();
-}
-
-EventsParameterReplacer::~EventsParameterReplacer() {}
-
-}  // namespace gd
--- a/Core/GDCore/IDE/Events/EventsParameterReplacer.h
+++ b/Core/GDCore/IDE/Events/EventsParameterReplacer.h
@@ -1,52 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include <map>
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/String.h"
-namespace gd {
-class BaseEvent;
-class PropertiesContainer;
-class EventsList;
-class Platform;
-}  // namespace gd
-
-namespace gd {
-/**
- * \brief Replace in expressions and in parameters of actions or conditions,
- * references to the name of a parameter by another.
- *
- * \ingroup IDE
- */
-class GD_CORE_API EventsParameterReplacer
-    : public ArbitraryEventsWorkerWithContext {
- public:
-  EventsParameterReplacer(
-      const gd::Platform &platform_,
-      const std::unordered_map<gd::String, gd::String> &oldToNewPropertyNames_)
-      : platform(platform_),
-        oldToNewPropertyNames(oldToNewPropertyNames_){};
-  virtual ~EventsParameterReplacer();
-
-  static bool CanContainParameter(const gd::ValueTypeMetadata &valueTypeMetadata);
-
- private:
-  bool DoVisitInstruction(gd::Instruction &instruction,
-                          bool isCondition) override;
-  bool DoVisitEventExpression(gd::Expression &expression,
-                              const gd::ParameterMetadata &metadata) override;
-
-  const gd::Platform &platform;
-  const std::unordered_map<gd::String, gd::String> &oldToNewPropertyNames;
-};
-
-}  // namespace gd
--- a/Core/GDCore/IDE/Events/EventsPropertyReplacer.cpp
+++ b/Core/GDCore/IDE/Events/EventsPropertyReplacer.cpp
@@ -41,7 +41,6 @@ class GD_CORE_API ExpressionPropertyReplacer
      const gd::Platform& platform_,
      const gd::ProjectScopedContainers& projectScopedContainers_,
      const gd::PropertiesContainer& targetPropertiesContainer_,
-      bool isParentTypeAVariable_,
      const std::unordered_map<gd::String, gd::String>& oldToNewPropertyNames_,
      const std::unordered_set<gd::String>& removedPropertyNames_)
      : hasDoneRenaming(false),
@@ -49,7 +48,6 @@ class GD_CORE_API ExpressionPropertyReplacer
        platform(platform_),
        projectScopedContainers(projectScopedContainers_),
        targetPropertiesContainer(targetPropertiesContainer_),
-        isParentTypeAVariable(isParentTypeAVariable_),
        oldToNewPropertyNames(oldToNewPropertyNames_),
        removedPropertyNames(removedPropertyNames_){};
  virtual ~ExpressionPropertyReplacer(){};
@@ -71,21 +69,16 @@ class GD_CORE_API ExpressionPropertyReplacer
  void OnVisitNumberNode(NumberNode& node) override {}
  void OnVisitTextNode(TextNode& node) override {}
  void OnVisitVariableNode(VariableNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        if (node.child) node.child->Visit(*this);
-        return;
-    }
-
    auto& propertiesContainersList =
        projectScopedContainers.GetPropertiesContainersList();

    // The node represents a variable or an object name on which a variable
    // will be accessed, or a property with a child.

+    // Match the potential *new* name of the property, because refactorings are
+    // done after changes in the variables container.
    projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation.
-      node.name,
+      GetPotentialNewName(node.name),
      [&]() {
        // Do nothing, it's an object variable.
        if (node.child) node.child->Visit(*this);
@@ -107,7 +100,16 @@ class GD_CORE_API ExpressionPropertyReplacer
        // Do nothing, it's a parameter.
        if (node.child) node.child->Visit(*this);
      }, [&]() {
-        // Do nothing, it's something else.
+        // This is something else - potentially a deleted property.
+        // Check if it's coming from the target container with
+        // properties to replace.
+        if (propertiesContainersList.HasPropertiesContainer(
+                targetPropertiesContainer)) {
+          // The node represents a property, that can come from the target
+          // (because the target is in the scope), replace or remove it:
+          RenameOrRemovePropertyOfTargetPropertyContainer(node.name);
+        }
+
        if (node.child) node.child->Visit(*this);
      });
  }
@@ -116,24 +118,17 @@ class GD_CORE_API ExpressionPropertyReplacer
  }
  void OnVisitVariableBracketAccessorNode(
      VariableBracketAccessorNode& node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    isParentTypeAVariable = false;
    node.expression->Visit(*this);
-    isParentTypeAVariable = isGrandParentTypeAVariable;
    if (node.child) node.child->Visit(*this);
  }
  void OnVisitIdentifierNode(IdentifierNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        return;
-    }
-
    auto& propertiesContainersList =
        projectScopedContainers.GetPropertiesContainersList();

+    // Match the potential *new* name of the property, because refactorings are
+    // done after changes in the variables container.
    projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation
-      node.identifierName,
+      GetPotentialNewName(node.identifierName),
      [&]() {
        // Do nothing, it's an object variable.
      }, [&]() {
@@ -150,29 +145,22 @@ class GD_CORE_API ExpressionPropertyReplacer
      }, [&]() {
        // Do nothing, it's a parameter.
      }, [&]() {
-        // Do nothing, it's something else.
+        // This is something else - potentially a deleted property.
+        // Check if it's coming from the target container with
+        // properties to replace.
+        if (propertiesContainersList.HasPropertiesContainer(
+                targetPropertiesContainer)) {
+          // The node represents a property, that can come from the target
+          // (because the target is in the scope), replace or remove it:
+          RenameOrRemovePropertyOfTargetPropertyContainer(node.identifierName);
+        }
      });
  }
  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitFunctionCallNode(FunctionCallNode &node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    for (auto &parameter : node.parameters) {
-      const auto &parameterMetadata =
-          gd::MetadataProvider::GetFunctionCallParameterMetadata(
-              platform, projectScopedContainers.GetObjectsContainersList(),
-              node, *parameter);
-      if (!parameterMetadata) {
-        continue;
-      }
-      const auto &parameterTypeMetadata =
-          parameterMetadata->GetValueTypeMetadata();
-      if (gd::EventsPropertyReplacer::CanContainProperty(
-              parameterTypeMetadata)) {
-        isParentTypeAVariable = parameterTypeMetadata.IsVariableOnly();
-        parameter->Visit(*this);
-      }
+  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
+    for (auto& parameter : node.parameters) {
+      parameter->Visit(*this);
    }
-    isParentTypeAVariable = isGrandParentTypeAVariable;
  }
  void OnVisitEmptyNode(EmptyNode& node) override {}

@@ -180,6 +168,12 @@ class GD_CORE_API ExpressionPropertyReplacer
  bool hasDoneRenaming;
  bool removedPropertyUsed;

+  const gd::String& GetPotentialNewName(const gd::String& oldName) {
+    return oldToNewPropertyNames.count(oldName) >= 1
+            ? oldToNewPropertyNames.find(oldName)->second
+            : oldName;
+  }
+
  bool RenameOrRemovePropertyOfTargetPropertyContainer(
      gd::String& propertyName) {
    if (oldToNewPropertyNames.count(propertyName) >= 1) {
@@ -204,7 +198,6 @@ class GD_CORE_API ExpressionPropertyReplacer
  const std::unordered_set<gd::String>& removedPropertyNames;

  gd::String objectNameToUseForVariableAccessor;
-  bool isParentTypeAVariable;
 };

 bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
@@ -223,16 +216,20 @@ bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
          const gd::Expression& parameterValue,
          size_t parameterIndex,
          const gd::String& lastObjectName) {
-        if (!gd::EventsPropertyReplacer::CanContainProperty(
-          parameterMetadata.GetValueTypeMetadata())) {
-          return;
-        }
+        const gd::String& type = parameterMetadata.GetType();
+
+        if (!gd::ParameterMetadata::IsExpression("variable", type) &&
+            !gd::ParameterMetadata::IsExpression("number", type) &&
+            !gd::ParameterMetadata::IsExpression("string", type))
+          return;  // Not an expression that can contain properties.
+
        auto node = parameterValue.GetRootNode();
        if (node) {
-          ExpressionPropertyReplacer renamer(
-              platform, GetProjectScopedContainers(), targetPropertiesContainer,
-              parameterMetadata.GetValueTypeMetadata().IsVariableOnly(),
-              oldToNewPropertyNames, removedPropertyNames);
+          ExpressionPropertyReplacer renamer(platform,
+                                             GetProjectScopedContainers(),
+                                             targetPropertiesContainer,
+                                             oldToNewPropertyNames,
+                                             removedPropertyNames);
          node->Visit(renamer);

          if (renamer.IsRemovedPropertyUsed()) {
@@ -249,16 +246,20 @@ bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,

 bool EventsPropertyReplacer::DoVisitEventExpression(
    gd::Expression& expression, const gd::ParameterMetadata& metadata) {
-  if (!gd::EventsPropertyReplacer::CanContainProperty(
-          metadata.GetValueTypeMetadata())) {
-    return false;
-  }
+  const gd::String& type = metadata.GetType();
+
+  if (!gd::ParameterMetadata::IsExpression("variable", type) &&
+      !gd::ParameterMetadata::IsExpression("number", type) &&
+      !gd::ParameterMetadata::IsExpression("string", type))
+    return false;  // Not an expression that can contain properties.
+
  auto node = expression.GetRootNode();
  if (node) {
-    ExpressionPropertyReplacer renamer(
-        platform, GetProjectScopedContainers(), targetPropertiesContainer,
-        metadata.GetValueTypeMetadata().IsVariableOnly(), oldToNewPropertyNames,
-        removedPropertyNames);
+    ExpressionPropertyReplacer renamer(platform,
+                                       GetProjectScopedContainers(),
+                                       targetPropertiesContainer,
+                                       oldToNewPropertyNames,
+                                       removedPropertyNames);
    node->Visit(renamer);

    if (renamer.IsRemovedPropertyUsed()) {
@@ -271,12 +272,6 @@ bool EventsPropertyReplacer::DoVisitEventExpression(
  return false;
 }

-bool EventsPropertyReplacer::CanContainProperty(
-    const gd::ValueTypeMetadata &valueTypeMetadata) {
-  return valueTypeMetadata.IsVariable() || valueTypeMetadata.IsNumber() ||
-         valueTypeMetadata.IsString();
-}
-
 EventsPropertyReplacer::~EventsPropertyReplacer() {}

 }  // namespace gd
--- a/Core/GDCore/IDE/Events/EventsPropertyReplacer.h
+++ b/Core/GDCore/IDE/Events/EventsPropertyReplacer.h
@@ -4,7 +4,6 @@
 * reserved. This project is released under the MIT License.
 */
 #pragma once
-
 #include <map>
 #include <memory>
 #include <unordered_map>
@@ -42,8 +41,6 @@ class GD_CORE_API EventsPropertyReplacer
        removedPropertyNames(removedPropertyNames_){};
  virtual ~EventsPropertyReplacer();

-  static bool CanContainProperty(const gd::ValueTypeMetadata &valueTypeMetadata);
-
 private:
  bool DoVisitInstruction(gd::Instruction &instruction,
                          bool isCondition) override;
--- a/Core/GDCore/IDE/Events/EventsRefactorer.cpp
+++ b/Core/GDCore/IDE/Events/EventsRefactorer.cpp
@@ -22,7 +22,6 @@
 #include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"

 using namespace std;

@@ -52,17 +51,17 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {

  static bool Rename(const gd::Platform &platform,
                     const gd::ProjectScopedContainers &projectScopedContainers,
-                     const gd::String &rootType, gd::ExpressionNode &node,
-                     const gd::String &objectName,
-                     const gd::String &objectNewName) {
-    if (gd::ExpressionValidator::HasNoErrors(platform, projectScopedContainers,
-                                             rootType, node)) {
-      ExpressionObjectRenamer renamer(platform, projectScopedContainers,
-                                      rootType, objectName, objectNewName);
+                     const gd::String &rootType,
+                     gd::ExpressionNode& node,
+                     const gd::String& objectName,
+                     const gd::String& objectNewName) {
+    if (gd::ExpressionValidator::HasNoErrors(platform, projectScopedContainers, rootType, node)) {
+      ExpressionObjectRenamer renamer(platform, projectScopedContainers, rootType, objectName, objectNewName);
      node.Visit(renamer);

      return renamer.HasDoneRenaming();
    }
+
    return false;
  }

@@ -84,7 +83,7 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
  void OnVisitVariableNode(VariableNode& node) override {
    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);

-    if (gd::ValueTypeMetadata::IsVariable(type)) {
+    if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
      // Nothing to do (this can't reference an object)
    } else {
      if (node.name == objectName) {
@@ -120,7 +119,7 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
        node.identifierName == objectName) {
      hasDoneRenaming = true;
      node.identifierName = objectNewName;
-    } else if (gd::ValueTypeMetadata::IsVariable(type)) {
+    } else if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
      // Nothing to do (this can't reference an object)
    } else {
      if (node.identifierName == objectName) {
@@ -296,114 +295,183 @@ class GD_CORE_API ExpressionObjectFinder : public ExpressionParser2NodeWorker {
  const gd::String rootType;
 };

-/**
- * \brief Replace in expressions and in parameters of actions or conditions,
- * references to the name of an object by another.
- *
- * \ingroup IDE
- */
-class GD_CORE_API EventsObjectReplacer
-    : public ArbitraryEventsWorkerWithContext {
-public:
-  EventsObjectReplacer(const gd::Platform &platform_,
-                       const gd::ObjectsContainer &targetedObjectsContainer_,
-                       const gd::String &oldObjectName_,
-                       const gd::String &newObjectName_)
-      : platform(platform_),
-        targetedObjectsContainer(targetedObjectsContainer_),
-        oldObjectName(oldObjectName_), newObjectName(newObjectName_){};
+bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
+                                             const gd::ProjectScopedContainers& projectScopedContainers,
+                                             gd::InstructionsList& actions,
+                                             gd::String oldName,
+                                             gd::String newName) {
+  bool somethingModified = false;

-  virtual ~EventsObjectReplacer() {}
+  for (std::size_t aId = 0; aId < actions.size(); ++aId) {
+    const gd::InstructionMetadata& instrInfos =
+        MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+      // Replace object's name in parameters
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
+          actions[aId].GetParameter(pNb).GetPlainString() == oldName)
+        actions[aId].SetParameter(pNb, gd::Expression(newName));
+      // Replace object's name in expressions
+      else if (ParameterMetadata::IsExpression(
+                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
+        auto node = actions[aId].GetParameter(pNb).GetRootNode();

-private:
-  bool DoVisitInstruction(gd::Instruction &instruction,
-                          bool isCondition) override {
-    if (&targetedObjectsContainer !=
-        GetProjectScopedContainers()
-            .GetObjectsContainersList()
-            .GetObjectsContainerFromObjectName(oldObjectName)) {
-      return false;
-    }
-    const auto &metadata = isCondition
-                               ? gd::MetadataProvider::GetConditionMetadata(
-                                     platform, instruction.GetType())
-                               : gd::MetadataProvider::GetActionMetadata(
-                                     platform, instruction.GetType());
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
+          actions[aId].SetParameter(
+              pNb, ExpressionParser2NodePrinter::PrintNode(*node));
+        }
+      }
+      // Replace object's name in text expressions
+      else if (ParameterMetadata::IsExpression(
+                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+        auto node = actions[aId].GetParameter(pNb).GetRootNode();

-    gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-        instruction.GetParameters(), metadata.GetParameters(),
-        [&](const gd::ParameterMetadata &parameterMetadata,
-            const gd::Expression &parameterValue, size_t parameterIndex,
-            const gd::String &lastObjectName) {
-          if (!gd::EventsObjectReplacer::CanContainObject(
-                  parameterMetadata.GetValueTypeMetadata())) {
-            return;
-          }
-          auto node = parameterValue.GetRootNode();
-          if (node) {
-            ExpressionObjectRenamer renamer(
-                platform, GetProjectScopedContainers(),
-                parameterMetadata.GetValueTypeMetadata().GetName(),
-                oldObjectName, newObjectName);
-            node->Visit(renamer);
-
-            if (renamer.HasDoneRenaming()) {
-              instruction.SetParameter(
-                  parameterIndex,
-                  ExpressionParser2NodePrinter::PrintNode(*node));
-            }
-          }
-        });
-
-    return false;
-  }
-
-  bool DoVisitEventExpression(gd::Expression &expression,
-                              const gd::ParameterMetadata &metadata) override {
-    if (&targetedObjectsContainer !=
-        GetProjectScopedContainers()
-            .GetObjectsContainersList()
-            .GetObjectsContainerFromObjectName(oldObjectName)) {
-      return false;
-    }
-    if (!gd::EventsObjectReplacer::CanContainObject(
-            metadata.GetValueTypeMetadata())) {
-      return false;
-    }
-    auto node = expression.GetRootNode();
-    if (node) {
-      ExpressionObjectRenamer renamer(platform, GetProjectScopedContainers(),
-                                      metadata.GetValueTypeMetadata().GetName(),
-                                      oldObjectName, newObjectName);
-      node->Visit(renamer);
-
-      if (renamer.HasDoneRenaming()) {
-        expression = ExpressionParser2NodePrinter::PrintNode(*node);
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
+          actions[aId].SetParameter(
+              pNb, ExpressionParser2NodePrinter::PrintNode(*node));
+        }
      }
    }

-    return false;
+    if (!actions[aId].GetSubInstructions().empty())
+      somethingModified =
+          RenameObjectInActions(platform,
+                                projectScopedContainers,
+                                actions[aId].GetSubInstructions(),
+                                oldName,
+                                newName) ||
+          somethingModified;
  }

-  bool CanContainObject(const gd::ValueTypeMetadata &valueTypeMetadata) {
-    return valueTypeMetadata.IsObject() || valueTypeMetadata.IsVariable() ||
-           valueTypeMetadata.IsNumber() || valueTypeMetadata.IsString();
+  return somethingModified;
+}
+
+bool EventsRefactorer::RenameObjectInConditions(
+    const gd::Platform& platform,
+    const gd::ProjectScopedContainers& projectScopedContainers,
+    gd::InstructionsList& conditions,
+    gd::String oldName,
+    gd::String newName) {
+  bool somethingModified = false;
+
+  for (std::size_t cId = 0; cId < conditions.size(); ++cId) {
+    const gd::InstructionMetadata& instrInfos =
+        MetadataProvider::GetConditionMetadata(platform,
+                                               conditions[cId].GetType());
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+      // Replace object's name in parameters
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
+          conditions[cId].GetParameter(pNb).GetPlainString() == oldName)
+        conditions[cId].SetParameter(pNb, gd::Expression(newName));
+      // Replace object's name in expressions
+      else if (ParameterMetadata::IsExpression(
+                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
+        auto node = conditions[cId].GetParameter(pNb).GetRootNode();
+
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
+          conditions[cId].SetParameter(
+              pNb, ExpressionParser2NodePrinter::PrintNode(*node));
+        }
+      }
+      // Replace object's name in text expressions
+      else if (ParameterMetadata::IsExpression(
+                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+        auto node = conditions[cId].GetParameter(pNb).GetRootNode();
+
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
+          conditions[cId].SetParameter(
+              pNb, ExpressionParser2NodePrinter::PrintNode(*node));
+        }
+      }
+    }
+
+    if (!conditions[cId].GetSubInstructions().empty())
+      somethingModified =
+          RenameObjectInConditions(platform,
+                                   projectScopedContainers,
+                                   conditions[cId].GetSubInstructions(),
+                                   oldName,
+                                   newName) ||
+          somethingModified;
  }

-  const gd::Platform &platform;
-  const gd::ObjectsContainer &targetedObjectsContainer;
-  const gd::String &oldObjectName;
-  const gd::String &newObjectName;
-};
+  return somethingModified;
+}
+
+bool EventsRefactorer::RenameObjectInEventParameters(
+    const gd::Platform& platform,
+    const gd::ProjectScopedContainers& projectScopedContainers,
+    gd::Expression& expression,
+    gd::ParameterMetadata parameterMetadata,
+    gd::String oldName,
+    gd::String newName) {
+  bool somethingModified = false;
+
+  if (gd::ParameterMetadata::IsObject(parameterMetadata.GetType()) &&
+      expression.GetPlainString() == oldName)
+    expression = gd::Expression(newName);
+  // Replace object's name in expressions
+  else if (ParameterMetadata::IsExpression("number",
+                                           parameterMetadata.GetType())) {
+    auto node = expression.GetRootNode();
+
+    if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
+      expression = ExpressionParser2NodePrinter::PrintNode(*node);
+    }
+  }
+  // Replace object's name in text expressions
+  else if (ParameterMetadata::IsExpression("string",
+                                           parameterMetadata.GetType())) {
+    auto node = expression.GetRootNode();
+
+    if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
+      expression = ExpressionParser2NodePrinter::PrintNode(*node);
+    }
+  }
+
+  return somethingModified;
+}

 void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
                                            const gd::ProjectScopedContainers& projectScopedContainers,
                                            gd::EventsList& events,
-                                            const gd::ObjectsContainer &targetedObjectsContainer,
                                            gd::String oldName,
                                            gd::String newName) {
-  gd::EventsObjectReplacer eventsParameterReplacer(platform, targetedObjectsContainer, oldName, newName);
-  eventsParameterReplacer.Launch(events, projectScopedContainers);
+  for (std::size_t i = 0; i < events.size(); ++i) {
+    vector<gd::InstructionsList*> conditionsVectors =
+        events[i].GetAllConditionsVectors();
+    for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
+      bool somethingModified = RenameObjectInConditions(
+          platform, projectScopedContainers, *conditionsVectors[j], oldName, newName);
+    }
+
+    vector<gd::InstructionsList*> actionsVectors =
+        events[i].GetAllActionsVectors();
+    for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
+      bool somethingModified = RenameObjectInActions(
+          platform, projectScopedContainers, *actionsVectors[j], oldName, newName);
+    }
+
+    vector<pair<gd::Expression*, gd::ParameterMetadata>>
+        expressionsWithMetadata = events[i].GetAllExpressionsWithMetadata();
+    for (std::size_t j = 0; j < expressionsWithMetadata.size(); ++j) {
+      gd::Expression* expression = expressionsWithMetadata[j].first;
+      gd::ParameterMetadata parameterMetadata =
+          expressionsWithMetadata[j].second;
+      bool somethingModified = RenameObjectInEventParameters(platform,
+                                                             projectScopedContainers,
+                                                             *expression,
+                                                             parameterMetadata,
+                                                             oldName,
+                                                             newName);
+    }
+
+    if (events[i].CanHaveSubEvents())
+      RenameObjectInEvents(platform,
+                           projectScopedContainers,
+                           events[i].GetSubEvents(),
+                           oldName,
+                           newName);
+  }
 }

 bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
--- a/Core/GDCore/IDE/Events/EventsRefactorer.h
+++ b/Core/GDCore/IDE/Events/EventsRefactorer.h
@@ -83,7 +83,6 @@ class GD_CORE_API EventsRefactorer {
  static void RenameObjectInEvents(const gd::Platform& platform,
                                   const gd::ProjectScopedContainers& projectScopedContainers,
                                   gd::EventsList& events,
-                                   const gd::ObjectsContainer &targetedObjectsContainer,
                                   gd::String oldName,
                                   gd::String newName);

@@ -122,6 +121,44 @@ class GD_CORE_API EventsRefactorer {
  virtual ~EventsRefactorer(){};

 private:
+  /**
+   * Replace all occurrences of an object name by another name in an action
+   * ( include : objects in parameters and in math/text expressions ).
+   *
+   * \return true if something was modified.
+   */
+  static bool RenameObjectInActions(const gd::Platform& platform,
+                                    const gd::ProjectScopedContainers& projectScopedContainers,
+                                    gd::InstructionsList& instructions,
+                                    gd::String oldName,
+                                    gd::String newName);
+
+  /**
+   * Replace all occurrences of an object name by another name in a condition
+   * ( include : objects in parameters and in math/text expressions ).
+   *
+   * \return true if something was modified.
+   */
+  static bool RenameObjectInConditions(const gd::Platform& platform,
+                                       const gd::ProjectScopedContainers& projectScopedContainers,
+                                       gd::InstructionsList& instructions,
+                                       gd::String oldName,
+                                       gd::String newName);
+  /**
+   * Replace all occurrences of an object name by another name in an expression
+   * with the specified metadata
+   * ( include : objects or objects in math/text expressions ).
+   *
+   * \return true if something was modified.
+   */
+  static bool RenameObjectInEventParameters(
+      const gd::Platform& platform,
+      const gd::ProjectScopedContainers& projectScopedContainers,
+      gd::Expression& expression,
+      gd::ParameterMetadata parameterMetadata,
+      gd::String oldName,
+      gd::String newName);
+
  /**
   * Remove all conditions of the list using an object
   *
--- a/Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.cpp
+++ b/Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.cpp
@@ -71,18 +71,13 @@ bool EventsVariableInstructionTypeSwitcher::DoVisitInstruction(gd::Instruction&
                    .GetObjectsContainersList()
                    .GetObjectOrGroupVariablesContainer(lastObjectName);
          }
-        } else if (type == "variableOrProperty") {
-            variablesContainer =
-                &GetProjectScopedContainers()
-                      .GetVariablesContainersList()
-                      .GetVariablesContainerFromVariableOrPropertyName(variableName);
        } else {
          if (GetProjectScopedContainers().GetVariablesContainersList().Has(
                  variableName)) {
            variablesContainer =
                &GetProjectScopedContainers()
                      .GetVariablesContainersList()
-                      .GetVariablesContainerFromVariableOrPropertyOrParameterName(variableName);
+                      .GetVariablesContainerFromVariableName(variableName);
          }
        }

--- a/Core/GDCore/IDE/Events/EventsVariableReplacer.cpp
+++ b/Core/GDCore/IDE/Events/EventsVariableReplacer.cpp
@@ -122,7 +122,7 @@ class GD_CORE_API ExpressionVariableReplacer
        [&]() {
          // This is a variable.
          if (&projectScopedContainers.GetVariablesContainersList()
-                   .GetVariablesContainerFromVariableOrPropertyOrParameterName(node.name) ==
+                   .GetVariablesContainerFromVariableName(node.name) ==
              &targetVariablesContainer) {
            // The node represents a variable, that can come from the target
            // (because the target is in the scope), replace or remove it:
@@ -235,7 +235,7 @@ class GD_CORE_API ExpressionVariableReplacer
        [&]() {
          // This is a variable.
          if (&projectScopedContainers.GetVariablesContainersList()
-                   .GetVariablesContainerFromVariableOrPropertyOrParameterName(
+                   .GetVariablesContainerFromVariableName(
                       node.identifierName) == &targetVariablesContainer) {
            // The node represents a variable, that can come from the target
            // (because the target is in the scope), replace or remove it:
--- a/Core/GDCore/IDE/Events/EventsVariableReplacer.h
+++ b/Core/GDCore/IDE/Events/EventsVariableReplacer.h
@@ -73,7 +73,6 @@ class GD_CORE_API EventsVariableReplacer
   */
  const gd::String targetGroupName;
  const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot;
-  // TODO There is no reason de delete events. This dead code should be removed.
  const std::unordered_set<gd::String> &removedVariableNames;

  static VariablesContainer nullVariablesContainer;
--- a/Core/GDCore/IDE/Events/ExampleExtensionUsagesFinder.cpp
+++ b/Core/GDCore/IDE/Events/ExampleExtensionUsagesFinder.cpp
@@ -1,235 +0,0 @@
-#include "ExampleExtensionUsagesFinder.h"
-
-#include "GDCore/Events/Instruction.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/Events/ExpressionTypeFinder.h"
-#include "GDCore/IDE/ProjectBrowserHelper.h"
-#include "GDCore/IDE/WholeProjectRefactorer.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-
-namespace gd {
-
-std::set<gd::String>
-ExampleExtensionUsagesFinder::GetUsedExtensions(gd::Project &project) {
-  ExampleExtensionUsagesFinder worker(project);
-  gd::ProjectBrowserHelper::ExposeProjectObjects(project, worker);
-  gd::ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(project,
-                                                                 worker);
-
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    worker.isStoreExtension =
-        eventsFunctionsExtension.GetOriginName() == "gdevelop-extension-store";
-    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
-        project, eventsFunctionsExtension, worker);
-  }
-  if (!worker.has3DObjects) {
-    worker.usedExtensions.erase("Scene3D");
-  }
-  return worker.usedExtensions;
-};
-
-void ExampleExtensionUsagesFinder::AddUsedExtension(
-    const gd::PlatformExtension &extension) {
-  usedExtensions.insert(extension.GetName());
-}
-
-void ExampleExtensionUsagesFinder::AddUsedBuiltinExtension(
-    const gd::String &extensionName) {
-  usedExtensions.insert(extensionName);
-}
-
-// Objects scanner
-
-void ExampleExtensionUsagesFinder::DoVisitObject(gd::Object &object) {
-  auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
-      project.GetCurrentPlatform(), object.GetType());
-  if (metadata.GetMetadata().IsRenderedIn3D()) {
-    has3DObjects = true;
-  }
-  AddUsedExtension(metadata.GetExtension());
-};
-
-// Behaviors scanner
-
-void ExampleExtensionUsagesFinder::DoVisitBehavior(gd::Behavior &behavior) {
-  auto metadata = gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
-      project.GetCurrentPlatform(), behavior.GetTypeName());
-  AddUsedExtension(metadata.GetExtension());
-};
-
-// Instructions scanner
-
-bool ExampleExtensionUsagesFinder::DoVisitInstruction(
-    gd::Instruction &instruction, bool isCondition) {
-  auto metadata =
-      isCondition ? gd::MetadataProvider::GetExtensionAndConditionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType())
-                  : gd::MetadataProvider::GetExtensionAndActionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType());
-  // Unused event-based objects or events-based behaviors may use object and
-  // behavior instructions that should not be detected as extension usage.
-  // The extension of actually used objects and behaviors will be detected on
-  // scene objects. This is why object or behavior instructions usually don't
-  // have any import.
-  // Built-in extensions that are included by default don't declare any include
-  // files on their instructions either. To still detect their usage, we
-  // consider that main events and dedicated extensions can't have dead code.
-  if (!isStoreExtension || !metadata.GetMetadata().GetIncludeFiles().empty()) {
-    AddUsedExtension(metadata.GetExtension());
-  }
-
-  gd::ParameterMetadataTools::IterateOverParameters(
-      instruction.GetParameters(), metadata.GetMetadata().GetParameters(),
-      [this](const gd::ParameterMetadata &parameterMetadata,
-             const gd::Expression &parameterValue,
-             const gd::String &lastObjectName) {
-        const gd::String &parameterType = parameterMetadata.GetType();
-
-        if (gd::ParameterMetadata::IsExpression("string", parameterType)) {
-          rootType = "string";
-          parameterValue.GetRootNode()->Visit(*this);
-        } else if (gd::ParameterMetadata::IsExpression("number",
-                                                       parameterType)) {
-          rootType = "number";
-          parameterValue.GetRootNode()->Visit(*this);
-        } else if (gd::ParameterMetadata::IsExpression("variable",
-                                                       parameterType))
-          AddUsedBuiltinExtension("BuiltinVariables");
-      });
-
-  return false;
-}
-
-// Expressions scanner
-
-// Ignore literals nodes
-void ExampleExtensionUsagesFinder::OnVisitNumberNode(NumberNode &node){};
-void ExampleExtensionUsagesFinder::OnVisitTextNode(TextNode &node){};
-
-// Ignore nodes without valid extensions
-void ExampleExtensionUsagesFinder::OnVisitEmptyNode(EmptyNode &node){};
-void ExampleExtensionUsagesFinder::OnVisitObjectFunctionNameNode(
-    ObjectFunctionNameNode &node){};
-
-// Visit sub-expressions
-void ExampleExtensionUsagesFinder::OnVisitSubExpressionNode(
-    SubExpressionNode &node) {
-  node.expression->Visit(*this);
-};
-
-void ExampleExtensionUsagesFinder::OnVisitOperatorNode(OperatorNode &node) {
-  node.leftHandSide->Visit(*this);
-  node.rightHandSide->Visit(*this);
-};
-
-void ExampleExtensionUsagesFinder::OnVisitUnaryOperatorNode(
-    UnaryOperatorNode &node) {
-  node.factor->Visit(*this);
-};
-
-// Add variable extension and visit sub-expressions on variable nodes
-void ExampleExtensionUsagesFinder::OnVisitVariableNode(VariableNode &node) {
-  AddUsedBuiltinExtension("BuiltinVariables");
-
-  auto type = gd::ExpressionTypeFinder::GetType(project.GetCurrentPlatform(),
-                                                GetProjectScopedContainers(),
-                                                rootType, node);
-
-  if (gd::ParameterMetadata::IsExpression("variable", type)) {
-    // Nothing to do (this can't reference an object)
-  } else {
-    GetProjectScopedContainers().MatchIdentifierWithName<void>(
-        node.name,
-        [&]() {
-          // This represents an object.
-          auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
-              project.GetCurrentPlatform(), node.name);
-          AddUsedExtension(metadata.GetExtension());
-        },
-        [&]() {
-          // This is a variable.
-        },
-        [&]() {
-          // This is a property.
-        },
-        [&]() {
-          // This is a parameter.
-        },
-        [&]() {
-          // This is something else.
-        });
-  }
-
-  if (node.child)
-    node.child->Visit(*this);
-};
-
-void ExampleExtensionUsagesFinder::OnVisitVariableAccessorNode(
-    VariableAccessorNode &node) {
-  AddUsedBuiltinExtension("BuiltinVariables");
-  if (node.child)
-    node.child->Visit(*this);
-};
-
-void ExampleExtensionUsagesFinder::OnVisitVariableBracketAccessorNode(
-    VariableBracketAccessorNode &node) {
-  AddUsedBuiltinExtension("BuiltinVariables");
-  node.expression->Visit(*this);
-  if (node.child)
-    node.child->Visit(*this);
-};
-
-// Add extensions bound to Objects/Behaviors/Functions
-void ExampleExtensionUsagesFinder::OnVisitIdentifierNode(IdentifierNode &node) {
-  auto type = gd::ExpressionTypeFinder::GetType(project.GetCurrentPlatform(),
-                                                GetProjectScopedContainers(),
-                                                rootType, node);
-  if (gd::ParameterMetadata::IsObject(type) ||
-      GetObjectsContainersList().HasObjectOrGroupNamed(node.identifierName)) {
-    // An object or object variable is used.
-    auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
-        project.GetCurrentPlatform(), node.identifierName);
-    AddUsedExtension(metadata.GetExtension());
-  }
-};
-
-void ExampleExtensionUsagesFinder::OnVisitFunctionCallNode(
-    FunctionCallNode &node) {
-  // Extensions of non-free functions are already found when scanning objects.
-  if (!(node.objectName.empty() && node.behaviorName.empty()))
-    return;
-  gd::ExtensionAndMetadata<gd::ExpressionMetadata> metadata;
-
-  // Try to find a free number expression
-  metadata = gd::MetadataProvider::GetExtensionAndExpressionMetadata(
-      project.GetCurrentPlatform(), node.functionName);
-  if (gd::MetadataProvider::IsBadExpressionMetadata(metadata.GetMetadata())) {
-    // Try to find a free str expression
-    metadata = gd::MetadataProvider::GetExtensionAndStrExpressionMetadata(
-        project.GetCurrentPlatform(), node.functionName);
-    // No valid expression found, return.
-    if (gd::MetadataProvider::IsBadExpressionMetadata(metadata.GetMetadata()))
-      return;
-  }
-
-  // Unused event-based objects or events-based behaviors may use object and
-  // behavior expressions that should not be detected as extension usage.
-  // The extension of actually used objects and behaviors will be detected on
-  // scene objects. This is why object or behavior expressions usually don't
-  // have any import.
-  // Built-in extensions that are included by default don't declare any include
-  // files on their instructions either. To still detect their usage, we
-  // consider that main events and dedicated extensions can't have dead code.
-  if (!isStoreExtension || !metadata.GetMetadata().GetIncludeFiles().empty()) {
-    AddUsedExtension(metadata.GetExtension());
-  }
-};
-
-} // namespace gd
--- a/Core/GDCore/IDE/Events/ExampleExtensionUsagesFinder.h
+++ b/Core/GDCore/IDE/Events/ExampleExtensionUsagesFinder.h
@@ -1,77 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#pragma once
-
-#include <set>
-
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class Project;
-class Object;
-class Behavior;
-} // namespace gd
-
-namespace gd {
-
-/**
- * @brief List extension usages for generated example web-pages.
- * 
- * Dependency transitivity is not ensured (see UsedExtensionsFinder).
- */
-class GD_CORE_API ExampleExtensionUsagesFinder
-    : public ArbitraryObjectsWorker,
-      public ArbitraryEventsWorkerWithContext,
-      public ExpressionParser2NodeWorker {
-public:
-  static std::set<gd::String> GetUsedExtensions(gd::Project &project);
-
-private:
-  ExampleExtensionUsagesFinder(gd::Project &project_) : project(project_){};
-  gd::Project &project;
-  gd::String rootType;
-  bool isStoreExtension = false;
-
-  // Result
-  std::set<gd::String> usedExtensions;
-  bool has3DObjects = false;
-
-  void AddUsedExtension(const gd::PlatformExtension &extension);
-  void AddUsedBuiltinExtension(const gd::String &extensionName);
-
-  // Object Visitor
-  void DoVisitObject(gd::Object &object) override;
-
-  // Behavior Visitor
-  void DoVisitBehavior(gd::Behavior &behavior) override;
-
-  // Instructions Visitor
-  bool DoVisitInstruction(gd::Instruction &instruction,
-                          bool isCondition) override;
-
-  // Expression Visitor
-  void OnVisitSubExpressionNode(SubExpressionNode &node) override;
-  void OnVisitOperatorNode(OperatorNode &node) override;
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode &node) override;
-  void OnVisitNumberNode(NumberNode &node) override;
-  void OnVisitTextNode(TextNode &node) override;
-  void OnVisitVariableNode(VariableNode &node) override;
-  void OnVisitVariableAccessorNode(VariableAccessorNode &node) override;
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode &node) override;
-  void OnVisitIdentifierNode(IdentifierNode &node) override;
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode &node) override;
-  void OnVisitFunctionCallNode(FunctionCallNode &node) override;
-  void OnVisitEmptyNode(EmptyNode &node) override;
-};
-
-}; // namespace gd
--- a/Core/GDCore/IDE/Events/ExpressionCompletionFinder.h
+++ b/Core/GDCore/IDE/Events/ExpressionCompletionFinder.h
@@ -337,19 +337,19 @@ struct GD_CORE_API ExpressionCompletionDescription {

 private:
  CompletionKind completionKind;
-  gd::Variable::Type variableType = gd::Variable::Unknown;
-  gd::VariablesContainer::SourceType variableScope = gd::VariablesContainer::Unknown;
+  gd::Variable::Type variableType;
+  gd::VariablesContainer::SourceType variableScope;
  gd::String type;
  gd::String prefix;
  gd::String completion;
-  size_t replacementStartPosition = 0;
-  size_t replacementEndPosition = 0;
+  size_t replacementStartPosition;
+  size_t replacementEndPosition;
  gd::String objectName;
  gd::String behaviorName;
-  bool isExact = false;
-  bool isLastParameter = false;
-  const gd::ParameterMetadata* parameterMetadata = &badParameterMetadata;
-  const gd::ObjectConfiguration* objectConfiguration = &badObjectConfiguration;
+  bool isExact;
+  bool isLastParameter;
+  const gd::ParameterMetadata* parameterMetadata;
+  const gd::ObjectConfiguration* objectConfiguration;

  static const gd::ParameterMetadata badParameterMetadata;
  static const gd::ObjectConfiguration badObjectConfiguration;
@@ -1034,7 +1034,7 @@ class GD_CORE_API ExpressionCompletionFinder
          description.SetVariableType(variable.GetType());
          description.SetVariableScope(
              projectScopedContainers.GetVariablesContainersList()
-                  .GetVariablesContainerFromVariableOrPropertyOrParameterName(variableName)
+                  .GetVariablesContainerFromVariableName(variableName)
                  .GetSourceType());
          completions.push_back(description);

@@ -1066,8 +1066,8 @@ class GD_CORE_API ExpressionCompletionFinder
      bool eagerlyCompleteIfExactMatch = false) {
    projectScopedContainers.ForEachIdentifierMatchingSearch(
        search,
-        [&](const gd::String &objectName,
-            const ObjectConfiguration *objectConfiguration) {
+        [&](const gd::String& objectName,
+            const ObjectConfiguration* objectConfiguration) {
          ExpressionCompletionDescription description(
              ExpressionCompletionDescription::Object,
              location.GetStartPosition(),
@@ -1077,7 +1077,7 @@ class GD_CORE_API ExpressionCompletionFinder
          description.SetType(type);
          completions.push_back(description);
        },
-        [&](const gd::String &variableName, const gd::Variable &variable) {
+        [&](const gd::String& variableName, const gd::Variable& variable) {
          ExpressionCompletionDescription description(
              ExpressionCompletionDescription::Variable,
              location.GetStartPosition(),
@@ -1086,7 +1086,7 @@ class GD_CORE_API ExpressionCompletionFinder
          description.SetVariableType(variable.GetType());
          description.SetVariableScope(
              projectScopedContainers.GetVariablesContainersList()
-                  .GetVariablesContainerFromVariableOrPropertyOrParameterName(variableName)
+                  .GetVariablesContainerFromVariableName(variableName)
                  .GetSourceType());
          completions.push_back(description);

@@ -1095,29 +1095,23 @@ class GD_CORE_API ExpressionCompletionFinder
                variable, variableName, location);
          }
        },
-        [&](const gd::NamedPropertyDescriptor &property) {
-          auto propertyType = gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-              property.GetType());
-          if (gd::ValueTypeMetadata::IsTypeValue("number", propertyType) ||
-              gd::ValueTypeMetadata::IsTypeValue("string", propertyType)) {
-            ExpressionCompletionDescription description(
-                ExpressionCompletionDescription::Property,
-                location.GetStartPosition(), location.GetEndPosition());
-            description.SetCompletion(property.GetName());
-            description.SetType(property.GetType());
-            completions.push_back(description);
-          }
+        [&](const gd::NamedPropertyDescriptor& property) {
+          ExpressionCompletionDescription description(
+              ExpressionCompletionDescription::Property,
+              location.GetStartPosition(),
+              location.GetEndPosition());
+          description.SetCompletion(property.GetName());
+          description.SetType(property.GetType());
+          completions.push_back(description);
        },
-        [&](const gd::ParameterMetadata &parameter) {
-          if (parameter.GetValueTypeMetadata().IsNumber() ||
-              parameter.GetValueTypeMetadata().IsString()) {
-            ExpressionCompletionDescription description(
-                ExpressionCompletionDescription::Parameter,
-                location.GetStartPosition(), location.GetEndPosition());
-            description.SetCompletion(parameter.GetName());
-            description.SetType(parameter.GetType());
-            completions.push_back(description);
-          }
+        [&](const gd::ParameterMetadata& parameter) {
+          ExpressionCompletionDescription description(
+              ExpressionCompletionDescription::Parameter,
+              location.GetStartPosition(),
+              location.GetEndPosition());
+          description.SetCompletion(parameter.GetName());
+          description.SetType(parameter.GetType());
+          completions.push_back(description);
        });
  }

--- a/Core/GDCore/IDE/Events/ExpressionNodeLocationFinder.h
+++ b/Core/GDCore/IDE/Events/ExpressionNodeLocationFinder.h
@@ -33,10 +33,8 @@ class GD_CORE_API ExpressionNodeLocationFinder
   * \brief Initialize the finder to search at the specified position.
   */
  ExpressionNodeLocationFinder(size_t searchedPosition_)
-      : searchedPosition(searchedPosition_),
-        foundNode(nullptr),
-        parentNode(nullptr) {};
-  virtual ~ExpressionNodeLocationFinder() {};
+      : searchedPosition(searchedPosition_), foundNode(nullptr){};
+  virtual ~ExpressionNodeLocationFinder(){};

  /**
   * \brief Helper function to find the deepest node at the search position, if
--- a/Core/GDCore/IDE/Events/ExpressionTypeFinder.h
+++ b/Core/GDCore/IDE/Events/ExpressionTypeFinder.h
@@ -72,7 +72,7 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
        child(nullptr) {};

  const gd::String &GetType() {
-    return gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(type);
+    return gd::ParameterMetadata::GetExpressionValueType(type);
  };

  void OnVisitSubExpressionNode(SubExpressionNode& node) override {
--- a/Core/GDCore/IDE/Events/ExpressionValidator.cpp
+++ b/Core/GDCore/IDE/Events/ExpressionValidator.cpp
@@ -68,26 +68,19 @@ size_t GetMaximumParametersNumber(

 bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
    const gd::IdentifierNode& identifier) {
-  return ValidateObjectVariableOrVariableOrProperty(identifier.identifierName, identifier.identifierNameLocation, identifier.childIdentifierName, identifier.childIdentifierNameLocation);
-}
-
-bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
-    const gd::String &identifierName,
-    const gd::ExpressionParserLocation identifierNameLocation,
-    const gd::String &childIdentifierName,
-    const gd::ExpressionParserLocation childIdentifierNameLocation) {
  auto validateVariableTypeForExpression =
-      [this, &identifierNameLocation](gd::Variable::Type type) {
+      [this, &identifier](gd::Variable::Type type) {
        // Collections type can't be used directly in expressions, a child
        // must be accessed.
        if (type == Variable::Structure) {
          RaiseTypeError(_("You need to specify the name of the child variable "
                           "to access. For example: `MyVariable.child`."),
-                         identifierNameLocation);
+                         identifier.identifierNameLocation);
        } else if (type == Variable::Array) {
          RaiseTypeError(_("You need to specify the name of the child variable "
                           "to access. For example: `MyVariable[0]`."),
-                         identifierNameLocation);
+                         identifier.identifierNameLocation);
+
        } else {
          // Number, string or boolean variables can be used in expressions.
          return;
@@ -103,41 +96,38 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
  // we consider this node will be of the type required by the parent.
  childType = parentType;

-  return projectScopedContainers.MatchIdentifierWithName<bool>(identifierName,
+  return projectScopedContainers.MatchIdentifierWithName<bool>(identifier.identifierName,
    [&]() {
      // This represents an object.
-      if (childIdentifierName.empty()) {
+      if (identifier.childIdentifierName.empty()) {
        RaiseTypeError(_("An object variable or expression should be entered."),
-                        identifierNameLocation);
+                        identifier.identifierNameLocation);

        return true; // We should have found a variable.
      }

-      auto variableExistence =
-          objectsContainersList.HasObjectOrGroupWithVariableNamed(
-              identifierName, childIdentifierName);
+      auto variableExistence = objectsContainersList.HasObjectOrGroupWithVariableNamed(identifier.identifierName, identifier.childIdentifierName);

      if (variableExistence == gd::ObjectsContainersList::DoesNotExist) {
        RaiseUndeclaredVariableError(_("This variable does not exist on this object or group."),
-                        childIdentifierNameLocation, childIdentifierName, identifierName);
+                        identifier.childIdentifierNameLocation, identifier.childIdentifierName, identifier.identifierName);

        return true; // We should have found a variable.
      }
      else if (variableExistence == gd::ObjectsContainersList::ExistsOnlyOnSomeObjectsOfTheGroup) {
        RaiseUndeclaredVariableError(_("This variable only exists on some objects of the group. It must be declared for all objects."),
-                        childIdentifierNameLocation, childIdentifierName, identifierName);
+                        identifier.childIdentifierNameLocation, identifier.childIdentifierName, identifier.identifierName);

        return true; // We should have found a variable.
      }
      else if (variableExistence == gd::ObjectsContainersList::GroupIsEmpty) {
        RaiseUndeclaredVariableError(_("This group is empty. Add an object to this group first."),
-                        identifierNameLocation, childIdentifierName, identifierName);
+                        identifier.identifierNameLocation, identifier.childIdentifierName, identifier.identifierName);

        return true; // We should have found a variable.
      }

-      auto variableType = objectsContainersList.GetTypeOfObjectOrGroupVariable(
-          identifierName, childIdentifierName);
+      auto variableType = objectsContainersList.GetTypeOfObjectOrGroupVariable(identifier.identifierName, identifier.childIdentifierName);
      ReadChildTypeFromVariable(variableType);

      return true; // We found a variable.
@@ -147,9 +137,9 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
      // Try to identify a declared variable with the name (and maybe the child
      // variable).
      const gd::Variable& variable =
-          variablesContainersList.Get(identifierName);
+          variablesContainersList.Get(identifier.identifierName);

-      if (childIdentifierName.empty()) {
+      if (identifier.childIdentifierName.empty()) {
        // Just the root variable is accessed, check it can be used in an
        // expression.
        validateVariableTypeForExpression(variable.GetType());
@@ -158,38 +148,33 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
        return true; // We found a variable.
      } else {
        // A child variable is accessed, check it can be used in an expression.
-        if (!variable.HasChild(childIdentifierName)) {
+        if (!variable.HasChild(identifier.childIdentifierName)) {
          RaiseTypeError(_("No child variable with this name found."),
-                        childIdentifierNameLocation);
+                        identifier.childIdentifierNameLocation);

          return true; // We should have found a variable.
        }

        const gd::Variable& childVariable =
-            variable.GetChild(childIdentifierName);
+            variable.GetChild(identifier.childIdentifierName);
        ReadChildTypeFromVariable(childVariable.GetType());
        return true; // We found a variable.
      }
    }, [&]() {
      // This is a property.
-      if (!childIdentifierName.empty()) {
+      if (!identifier.childIdentifierName.empty()) {
        RaiseTypeError(_("Accessing a child variable of a property is not possible - just write the property name."),
-            childIdentifierNameLocation);
+            identifier.childIdentifierNameLocation);

        return true; // We found a property, even if the child is not allowed.
      }

-      const gd::NamedPropertyDescriptor &property =
-          propertiesContainersList.Get(identifierName).second;
+      const gd::NamedPropertyDescriptor& property = propertiesContainersList.Get(identifier.identifierName).second;

      if (property.GetType() == "Number") {
-        childType = Type::Number;
+       childType = Type::Number;
      } else if (property.GetType() == "Boolean") {
-        // Nothing - we don't know the precise type (this could be used a string
-        // or as a number)
-      } else if (property.GetType() == "Behavior") {
-        RaiseTypeError(_("Behaviors can't be used as a value in expressions."),
-                       identifierNameLocation);
+        // Nothing - we don't know the precise type (this could be used a string or as a number)
      } else {
        // Assume type is String or equivalent.
        childType = Type::String;
@@ -198,14 +183,14 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
      return true; // We found a property.
    }, [&]() {
      // This is a parameter.
-      if (!childIdentifierName.empty()) {
+      if (!identifier.childIdentifierName.empty()) {
        RaiseTypeError(_("Accessing a child variable of a parameter is not possible - just write the parameter name."),
-            childIdentifierNameLocation);
+            identifier.childIdentifierNameLocation);

        return true; // We found a parameter, even if the child is not allowed.
      }

-      const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, identifierName);
+      const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, identifier.identifierName);
      const auto& valueTypeMetadata = parameter.GetValueTypeMetadata();
      if (valueTypeMetadata.IsNumber()) {
        childType = Type::Number;
@@ -215,7 +200,7 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
        // Nothing - we don't know the precise type (this could be used as a string or as a number).
      } else {
        RaiseTypeError(_("This parameter is not a string, number or boolean - it can't be used in an expression."),
-            identifierNameLocation);
+            identifier.identifierNameLocation);

        return true; // We found a parameter, even though the type is incompatible.
      }
@@ -460,12 +445,10 @@ const gd::String& ExpressionValidator::TypeToString(Type type) {
    case Type::NumberOrString:
      return numberOrStringTypeString;
    case Type::Variable:
-      // This function is only used to display errors.
-      // Users don't care if it's legacy or not or
-      // if it allows properties and parameters.
-    case Type::VariableOrProperty:
-    case Type::VariableOrPropertyOrParameter:
+      return variableTypeString;
    case Type::LegacyVariable:
+      // This function is only used to display error.
+      // Users don't care if it's legacy or not.
      return variableTypeString;
    case Type::Object:
      return objectTypeString;
@@ -495,11 +478,8 @@ ExpressionValidator::Type ExpressionValidator::StringToType(
          ExpressionValidator::variableTypeString, type)) {
    if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
      return Type::LegacyVariable;
-    } else if (type == "variableOrProperty") {
-      return Type::VariableOrProperty;
-    } else if (type == "variableOrPropertyOrParameter") {
-      return Type::VariableOrPropertyOrParameter;
-    } else {
+    }
+    else {
      return Type::Variable;
    }
  }
--- a/Core/GDCore/IDE/Events/ExpressionValidator.h
+++ b/Core/GDCore/IDE/Events/ExpressionValidator.h
@@ -14,7 +14,6 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/Project/VariablesContainersList.h"
-#include "GDCore/Project/VariablesContainer.h"

 namespace gd {
 class Expression;
@@ -43,12 +42,10 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
                      const gd::String &extraInfo_ = "")
      : platform(platform_),
        projectScopedContainers(projectScopedContainers_),
-        parentType(StringToType(gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(rootType_))),
+        parentType(StringToType(gd::ParameterMetadata::GetExpressionValueType(rootType_))),
        childType(Type::Unknown),
        forbidsUsageOfBracketsBecauseParentIsObject(false),
-        currentParameterExtraInfo(&extraInfo_),
-        variableObjectName(),
-        variableObjectNameLocation() {};
+        currentParameterExtraInfo(&extraInfo_) {};
  virtual ~ExpressionValidator(){};

  /**
@@ -203,12 +200,10 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
  void OnVisitVariableNode(VariableNode& node) override {
    ReportAnyError(node);

-    if (parentType == Type::Variable ||
-        parentType == Type::VariableOrProperty ||
-        parentType == Type::VariableOrPropertyOrParameter) {
+    if (parentType == Type::Variable) {
      childType = parentType;

-      CheckVariableExistence(node.location, node.name, node.child != nullptr);
+      CheckVariableExistence(node.location, node.name);
      if (node.child) {
        node.child->Visit(*this);
      }
@@ -218,8 +213,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
      if (node.child) {
        node.child->Visit(*this);
      }
-    } else if (parentType == Type::String || parentType == Type::Number ||
-               parentType == Type::NumberOrString) {
+    } else if (parentType == Type::String || parentType == Type::Number || parentType == Type::NumberOrString) {
      // The node represents a variable or an object variable in an expression waiting for its *value* to be returned.
      childType = parentType;

@@ -231,8 +225,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
      projectScopedContainers.MatchIdentifierWithName<void>(node.name,
        [&]() {
          // This represents an object.
-          variableObjectName = node.name;
-          variableObjectNameLocation = node.nameLocation;
+
          // While understood by the parser, it's forbidden to use the bracket notation just after
          // an object name (`MyObject["MyVariable"]`).
          forbidsUsageOfBracketsBecauseParentIsObject = true;
@@ -271,13 +264,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
  }
  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
    ReportAnyError(node);
-    // TODO Also check child-variables existence on a path with only VariableAccessor to raise non-fatal errors.
-    if (!variableObjectName.empty()) {
-      ValidateObjectVariableOrVariableOrProperty(variableObjectName,
-                                                 variableObjectNameLocation,
-                                                 node.name, node.nameLocation);
-      variableObjectName = "";
-    }
+
    // In the case we accessed an object variable (`MyObject.MyVariable`),
    // brackets can now be used (`MyObject.MyVariable["MyChildVariable"]` is now valid).
    forbidsUsageOfBracketsBecauseParentIsObject = false;
@@ -290,7 +277,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
      VariableBracketAccessorNode& node) override {
    ReportAnyError(node);

-    variableObjectName = "";
    if (forbidsUsageOfBracketsBecauseParentIsObject) {
      RaiseError(gd::ExpressionParserError::ErrorType::BracketsNotAllowedForObjects,
                 _("You can't use the brackets to access an object variable. "
@@ -339,12 +325,11 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
            _("You must enter a number or a text, wrapped inside double quotes (example: \"Hello world\"), or a variable name."),
            node.location);
      }
-    } else if (parentType == Type::Variable ||
-               parentType == Type::VariableOrProperty ||
-               parentType == Type::VariableOrPropertyOrParameter) {
-      CheckVariableExistence(node.location, node.identifierName, !node.childIdentifierName.empty());
-    } else if (parentType != Type::Object &&
-               parentType != Type::LegacyVariable) {
+    }
+    else if (parentType == Type::Variable) {
+      CheckVariableExistence(node.location, node.identifierName);
+    }
+    else if (parentType != Type::Object && parentType != Type::LegacyVariable) {
      // It can't happen.
      RaiseTypeError(
          _("You've entered a name, but this type was expected:") + " " + TypeToString(parentType),
@@ -380,31 +365,13 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
    childType = Type::Empty;
  }

-private:
-  enum Type {
-    Unknown = 0,
-    Number,
-    String,
-    NumberOrString,
-    Variable,
-    LegacyVariable,
-    Object,
-    Empty,
-    VariableOrProperty,
-    VariableOrPropertyOrParameter
-  };
+ private:
+  enum Type {Unknown = 0, Number, String, NumberOrString, Variable, LegacyVariable, Object, Empty};
  Type ValidateFunction(const gd::FunctionCallNode& function);
  bool ValidateObjectVariableOrVariableOrProperty(const gd::IdentifierNode& identifier);
-  bool ValidateObjectVariableOrVariableOrProperty(
-      const gd::String &identifierName,
-      const gd::ExpressionParserLocation identifierNameLocation,
-      const gd::String &childIdentifierName,
-      const gd::ExpressionParserLocation childIdentifierNameLocation);

-  void CheckVariableExistence(const ExpressionParserLocation &location,
-                              const gd::String &name, bool hasChild) {
-    if (!currentParameterExtraInfo ||
-        *currentParameterExtraInfo != "AllowUndeclaredVariable") {
+  void CheckVariableExistence(const ExpressionParserLocation &location, const gd::String& name) {
+    if (!currentParameterExtraInfo || *currentParameterExtraInfo != "AllowUndeclaredVariable") {
      projectScopedContainers.MatchIdentifierWithName<void>(
          name,
          [&]() {
@@ -419,28 +386,19 @@ private:
          },
          [&]() {
            // This is a property.
-            if (parentType != Type::VariableOrProperty &&
-                parentType != Type::VariableOrPropertyOrParameter) {
-              RaiseVariableNameCollisionError(
-                  _("This variable has the same name as a property. Consider "
-                    "renaming one or the other."),
-                  location, name);
-            } else if (hasChild) {
-              RaiseMalformedVariableParameter(
-                  _("Properties can't have children."), location, name);
-            }
+            // This error won't happen unless the priority is changed.
+            RaiseVariableNameCollisionError(
+                _("This variable has the same name as a property. Consider "
+                  "renaming one or the other."),
+                location, name);
          },
          [&]() {
            // This is a parameter.
-            if (parentType != Type::VariableOrPropertyOrParameter) {
-              RaiseVariableNameCollisionError(
-                  _("This variable has the same name as a parameter. Consider "
-                    "renaming one or the other."),
-                  location, name);
-            } else if (hasChild) {
-              RaiseMalformedVariableParameter(
-                  _("Properties can't have children."), location, name);
-            }
+            // This error won't happen unless the priority is changed.
+            RaiseVariableNameCollisionError(
+                _("This variable has the same name as a parameter. Consider "
+                  "renaming one or the other."),
+                location, name);
          },
          [&]() {
            // This is something else.
@@ -502,13 +460,6 @@ private:
               message, location, false, variableName, objectName);
  }

-  void RaiseMalformedVariableParameter(const gd::String &message,
-                                   const ExpressionParserLocation &location,
-                                   const gd::String &variableName) {
-    RaiseError(gd::ExpressionParserError::ErrorType::MalformedVariableParameter,
-               message, location, true, variableName, "");
-  }
-
  void RaiseTypeError(const gd::String &message,
                      const ExpressionParserLocation &location,
                      bool isFatal = true) {
@@ -554,8 +505,6 @@ private:
  Type childType; ///< The type "discovered" down the tree and passed up.
  Type parentType; ///< The type "required" by the top of the tree.
  bool forbidsUsageOfBracketsBecauseParentIsObject;
-  gd::String variableObjectName;
-  gd::ExpressionParserLocation variableObjectNameLocation;
  const gd::String *currentParameterExtraInfo;
  const gd::Platform &platform;
  const gd::ProjectScopedContainers &projectScopedContainers;
--- a/Core/GDCore/IDE/Events/ExpressionVariablePathFinder.h
+++ b/Core/GDCore/IDE/Events/ExpressionVariablePathFinder.h
@@ -215,7 +215,7 @@ class GD_CORE_API ExpressionVariablePathFinder
            if (projectScopedContainers.GetVariablesContainersList().Has(identifier)) {
              variablesContainer =
                  &(projectScopedContainers.GetVariablesContainersList()
-                        .GetVariablesContainerFromVariableOrPropertyOrParameterName(identifier));
+                        .GetVariablesContainerFromVariableName(identifier));
              variableName = identifier;
              if (childIdentifier) {
                childVariableNames.push_back(*childIdentifier);
@@ -223,28 +223,12 @@ class GD_CORE_API ExpressionVariablePathFinder
            }
          },
          [&]() {
-            // This is a property.
-            if (parameterType != "objectvar" &&
-                    projectScopedContainers.GetVariablesContainersList().Has(
-                        identifier)) {
-              variablesContainer =
-                  &(projectScopedContainers.GetVariablesContainersList()
-                        .GetVariablesContainerFromVariableOrPropertyOrParameterName(identifier));
-              variableName = identifier;
-              // There is no support for "children" of properties.
-            }
+            // Ignore properties here.
+            // There is no support for "children" of properties.
          },
          [&]() {
-            // This is a parameter.
-            if (parameterType != "objectvar" &&
-                projectScopedContainers.GetVariablesContainersList().Has(
-                    identifier)) {
-              variablesContainer =
-                  &(projectScopedContainers.GetVariablesContainersList()
-                        .GetVariablesContainerFromVariableOrPropertyOrParameterName(identifier));
-              variableName = identifier;
-              // There is no support for "children" of parameters.
-            }
+            // Ignore parameters here.
+            // There is no support for "children" of parameters.
          },
          [&]() {
            // Ignore unrecognised identifiers here.
--- a/Core/GDCore/IDE/Events/ExpressionsParameterMover.h
+++ b/Core/GDCore/IDE/Events/ExpressionsParameterMover.h
@@ -74,8 +74,8 @@ class GD_CORE_API ExpressionsParameterMover

  const gd::Platform &platform;
  gd::String functionName;
-  std::size_t oldIndex = 0;
-  std::size_t newIndex = 0;
+  std::size_t oldIndex;
+  std::size_t newIndex;
  gd::String behaviorType;
  gd::String objectType;
 };
--- a/Core/GDCore/IDE/Events/LeaderboardIdRenamer.cpp
+++ b/Core/GDCore/IDE/Events/LeaderboardIdRenamer.cpp
@@ -1,76 +0,0 @@
-#include "LeaderboardIdRenamer.h"
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-void LeaderboardIdRenamer::DoVisitObject(gd::Object &object) {
-  for (auto &pair : object.GetConfiguration().GetProperties()) {
-    auto &propertyName = pair.first;
-    auto &property = pair.second;
-    if (property.GetType() == "LeaderboardId") {
-      auto &leaderboardId = property.GetValue();
-
-      allLeaderboardIds.insert(leaderboardId);
-
-      if (leaderboardIdMap.find(leaderboardId) != leaderboardIdMap.end()) {
-        object.GetConfiguration().UpdateProperty(
-            propertyName, leaderboardIdMap[leaderboardId]);
-      }
-    }
-  }
-};
-
-void LeaderboardIdRenamer::DoVisitBehavior(gd::Behavior &behavior) {};
-
-bool LeaderboardIdRenamer::DoVisitInstruction(gd::Instruction &instruction,
-                                              bool isCondition) {
-  const gd::InstructionMetadata &instrInfo =
-      isCondition ? MetadataProvider::GetConditionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType())
-                  : MetadataProvider::GetActionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType());
-
-  for (int i = 0; i < instruction.GetParametersCount() &&
-                  i < instrInfo.GetParametersCount();
-       ++i) {
-    const gd::ParameterMetadata parameter = instrInfo.GetParameter(i);
-
-    if (parameter.GetType() != "leaderboardId") {
-      continue;
-    }
-    const gd::String leaderboardIdExpression =
-        instruction.GetParameter(i).GetPlainString();
-    if (leaderboardIdExpression[0] != '"' ||
-        leaderboardIdExpression[leaderboardIdExpression.size() - 1] != '"') {
-      continue;
-    }
-    const gd::String leaderboardId =
-        leaderboardIdExpression.substr(1, leaderboardIdExpression.size() - 2);
-
-    allLeaderboardIds.insert(leaderboardId);
-
-    if (leaderboardIdMap.find(leaderboardId) != leaderboardIdMap.end()) {
-      instruction.SetParameter(i,
-                               "\"" + leaderboardIdMap[leaderboardId] + "\"");
-    }
-  }
-  return false;
-}
-
-LeaderboardIdRenamer::~LeaderboardIdRenamer() {}
-
-}  // namespace gd
--- a/Core/GDCore/IDE/Events/LeaderboardIdRenamer.h
+++ b/Core/GDCore/IDE/Events/LeaderboardIdRenamer.h
@@ -1,50 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#pragma once
-#include <map>
-
-#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class Object;
-class Behavior;
-}  // namespace gd
-
-namespace gd {
-
-class GD_CORE_API LeaderboardIdRenamer : public ArbitraryObjectsWorker, public ArbitraryEventsWorker {
- public:
-  LeaderboardIdRenamer(gd::Project& project_): project(project_) {};
-  virtual ~LeaderboardIdRenamer();
-
-  /**
-   * Set the leaderboard identifiers to be replaced.
-   */
-  void SetLeaderboardIdsToReplace(const std::map<gd::String, gd::String>& leaderboardIdMap_) {
-    leaderboardIdMap = leaderboardIdMap_;
-  }
-
-  /**
-   * Return the all the leaderboard identifiers found in the project.
-   */
-  const std::set<gd::String>& GetAllLeaderboardIds() const {
-    return allLeaderboardIds;
-  }
-
- private:
-  bool DoVisitInstruction(gd::Instruction& instruction, bool isCondition) override;
-  void DoVisitObject(gd::Object& object) override;
-  void DoVisitBehavior(gd::Behavior& behavior) override;
-
-  std::map<gd::String, gd::String> leaderboardIdMap;
-  std::set<gd::String> allLeaderboardIds;
-  gd::Project& project;
-};
-
-};  // namespace gd
--- a/Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp
+++ b/Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp
@@ -13,18 +13,6 @@

 namespace gd {

-void UsedExtensionsResult::AddUsedExtension(const gd::PlatformExtension& extension) {
-  usedExtensions.insert(extension.GetName());
-
-  usedSourceFiles.insert(usedSourceFiles.end(),
-                         extension.GetAllSourceFiles().begin(),
-                         extension.GetAllSourceFiles().end());
-}
-
-void UsedExtensionsResult::AddUsedBuiltinExtension(const gd::String& extensionName) {
-  usedExtensions.insert(extensionName);
-}
-
 const UsedExtensionsResult UsedExtensionsFinder::ScanProject(gd::Project& project) {
  UsedExtensionsFinder worker(project);
  gd::ProjectBrowserHelper::ExposeProjectObjects(project, worker);
@@ -40,9 +28,9 @@ void UsedExtensionsFinder::DoVisitObject(gd::Object &object) {
  if (metadata.GetMetadata().IsRenderedIn3D()) {
    result.MarkAsHaving3DObjects();
  }
-  result.AddUsedExtension(metadata.GetExtension());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
  for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
-    result.AddUsedIncludeFiles(includeFile);
+    result.GetUsedIncludeFiles().insert(includeFile);
  }
 };

@@ -51,12 +39,12 @@ void UsedExtensionsFinder::DoVisitObject(gd::Object &object) {
 void UsedExtensionsFinder::DoVisitBehavior(gd::Behavior &behavior) {
  auto metadata = gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
      project.GetCurrentPlatform(), behavior.GetTypeName());
-  result.AddUsedExtension(metadata.GetExtension());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
  for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
-    result.AddUsedIncludeFiles(includeFile);
+    result.GetUsedIncludeFiles().insert(includeFile);
  }
  for (auto &&includeFile : metadata.GetMetadata().requiredFiles) {
-    result.AddUsedRequiredFiles(includeFile);
+    result.GetUsedRequiredFiles().insert(includeFile);
  }
 };

@@ -69,9 +57,9 @@ bool UsedExtensionsFinder::DoVisitInstruction(gd::Instruction& instruction,
                        project.GetCurrentPlatform(), instruction.GetType())
                  : gd::MetadataProvider::GetExtensionAndActionMetadata(
                        project.GetCurrentPlatform(), instruction.GetType());
-  result.AddUsedExtension(metadata.GetExtension());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
  for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) {
-    result.AddUsedIncludeFiles(includeFile);
+    result.GetUsedIncludeFiles().insert(includeFile);
  }

  gd::ParameterMetadataTools::IterateOverParameters(
@@ -89,7 +77,7 @@ bool UsedExtensionsFinder::DoVisitInstruction(gd::Instruction& instruction,
      rootType = "number";
      parameterValue.GetRootNode()->Visit(*this);
    } else if (gd::ParameterMetadata::IsExpression("variable", parameterType))
-      result.AddUsedBuiltinExtension("BuiltinVariables");
+      result.GetUsedExtensions().insert("BuiltinVariables");
  });

  return false;
@@ -122,7 +110,7 @@ void UsedExtensionsFinder::OnVisitUnaryOperatorNode(UnaryOperatorNode& node) {

 // Add variable extension and visit sub-expressions on variable nodes
 void UsedExtensionsFinder::OnVisitVariableNode(VariableNode& node) {
-  result.AddUsedBuiltinExtension("BuiltinVariables");
+  result.GetUsedExtensions().insert("BuiltinVariables");

  auto type = gd::ExpressionTypeFinder::GetType(
      project.GetCurrentPlatform(), GetProjectScopedContainers(), rootType, node);
@@ -135,9 +123,9 @@ void UsedExtensionsFinder::OnVisitVariableNode(VariableNode& node) {
        // This represents an object.
        auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
          project.GetCurrentPlatform(), node.name);
-        result.AddUsedExtension(metadata.GetExtension());
+        result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
        for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
-          result.AddUsedIncludeFiles(includeFile);
+          result.GetUsedIncludeFiles().insert(includeFile);
        }
      }, [&]() {
        // This is a variable.
@@ -155,13 +143,13 @@ void UsedExtensionsFinder::OnVisitVariableNode(VariableNode& node) {

 void UsedExtensionsFinder::OnVisitVariableAccessorNode(
    VariableAccessorNode& node) {
-  result.AddUsedBuiltinExtension("BuiltinVariables");
+  result.GetUsedExtensions().insert("BuiltinVariables");
  if (node.child) node.child->Visit(*this);
 };

 void UsedExtensionsFinder::OnVisitVariableBracketAccessorNode(
    VariableBracketAccessorNode& node) {
-  result.AddUsedBuiltinExtension("BuiltinVariables");
+  result.GetUsedExtensions().insert("BuiltinVariables");
  node.expression->Visit(*this);
  if (node.child) node.child->Visit(*this);
 };
@@ -175,9 +163,9 @@ void UsedExtensionsFinder::OnVisitIdentifierNode(IdentifierNode &node) {
    // An object or object variable is used.
    auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
        project.GetCurrentPlatform(), node.identifierName);
-    result.AddUsedExtension(metadata.GetExtension());
+    result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
    for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
-      result.AddUsedIncludeFiles(includeFile);
+      result.GetUsedIncludeFiles().insert(includeFile);
    }
  }
 };
@@ -199,9 +187,9 @@ void UsedExtensionsFinder::OnVisitFunctionCallNode(FunctionCallNode& node) {
      return;
  }

-  result.AddUsedExtension(metadata.GetExtension());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
  for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) {
-    result.AddUsedIncludeFiles(includeFile);
+    result.GetUsedIncludeFiles().insert(includeFile);
  }
 };

--- a/Core/GDCore/IDE/Events/UsedExtensionsFinder.h
+++ b/Core/GDCore/IDE/Events/UsedExtensionsFinder.h
@@ -9,8 +9,6 @@
 #include <set>

 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
-#include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
 #include "GDCore/String.h"
@@ -46,10 +44,6 @@ public:
    return usedRequiredFiles;
  }

-  const std::vector<gd::SourceFileMetadata>& GetUsedSourceFiles() const {
-    return usedSourceFiles;
-  }
-
  /**
   * \brief Return true when at least 1 object uses the 3D renderer.
   */
@@ -57,10 +51,20 @@ public:
    return has3DObjects;
  }

-  void AddUsedExtension(const gd::PlatformExtension& extension);
-  void AddUsedBuiltinExtension(const gd::String& extensionName);
-  void AddUsedIncludeFiles(const gd::String& includeFile) { usedIncludeFiles.insert(includeFile); }
-  void AddUsedRequiredFiles(const gd::String& requiredFile) { usedRequiredFiles.insert(requiredFile); }
+  /**
+   * The extensions used by the project (or part of it).
+   */
+  std::set<gd::String> &GetUsedExtensions() { return usedExtensions; }
+
+  /**
+   * The include files used at runtime by the project (or part of it).
+   */
+  std::set<gd::String> &GetUsedIncludeFiles() { return usedIncludeFiles; }
+
+  /**
+   * The additional files required at runtime by the project (or part of it).
+   */
+  std::set<gd::String> &GetUsedRequiredFiles() { return usedRequiredFiles; }

  void MarkAsHaving3DObjects() {
    has3DObjects = true;
@@ -70,7 +74,6 @@ private:
  std::set<gd::String> usedExtensions;
  std::set<gd::String> usedIncludeFiles;
  std::set<gd::String> usedRequiredFiles;
-  std::vector<gd::SourceFileMetadata> usedSourceFiles;
  bool has3DObjects = false;
 };

--- a/Core/GDCore/IDE/EventsBasedObjectVariantHelper.cpp
+++ b/Core/GDCore/IDE/EventsBasedObjectVariantHelper.cpp
@@ -1,154 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "EventsBasedObjectVariantHelper.h"
-
-#include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/InitialInstancesContainer.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/ObjectGroup.h"
-#include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/Project/ObjectsContainersList.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/Variable.h"
-#include "GDCore/Project/VariablesContainer.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-void EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
-    const gd::Project &project, gd::EventsBasedObject &eventsBasedObject) {
-  auto &defaultObjects = eventsBasedObject.GetDefaultVariant().GetObjects();
-
-  for (const auto &variant :
-       eventsBasedObject.GetVariants().GetInternalVector()) {
-    auto &objects = variant->GetObjects();
-
-    // Delete extra objects
-    for (auto it = objects.GetObjects().begin();
-         it != objects.GetObjects().end(); ++it) {
-      const auto &objectName = it->get()->GetName();
-      if (!defaultObjects.HasObjectNamed(objectName)) {
-        variant->GetInitialInstances().RemoveInitialInstancesOfObject(
-            objectName);
-        // Do it in last because it unalloc objectName.
-        objects.RemoveObject(objectName);
-        --it;
-      }
-    }
-    for (const auto &defaultObject : defaultObjects.GetObjects()) {
-      const auto &objectName = defaultObject->GetName();
-      const auto &defaultVariables = defaultObject->GetVariables();
-      const auto &defaultBehaviors = defaultObject->GetAllBehaviorContents();
-
-      // Copy missing objects
-      if (!objects.HasObjectNamed(objectName)) {
-        objects.InsertObject(*defaultObject,
-                             defaultObjects.GetObjectPosition(objectName));
-        objects.AddMissingObjectsInRootFolder();
-        continue;
-      }
-      // Change object types
-      auto &object = objects.GetObject(objectName);
-      if (object.GetType() != defaultObject->GetType()) {
-        // Keep a copy of the old object.
-        auto oldObject = objects.GetObject(objectName);
-        objects.RemoveObject(objectName);
-        objects.InsertObject(*defaultObject,
-                             defaultObjects.GetObjectPosition(objectName));
-        object.CopyWithoutConfiguration(oldObject);
-        objects.AddMissingObjectsInRootFolder();
-      }
-
-      // Copy missing behaviors
-      for (const auto &pair : defaultBehaviors) {
-        const auto &behaviorName = pair.first;
-        const auto &defaultBehavior = pair.second;
-
-        if (object.HasBehaviorNamed(behaviorName) &&
-            object.GetBehavior(behaviorName).GetTypeName() !=
-                defaultBehavior->GetTypeName()) {
-          object.RemoveBehavior(behaviorName);
-        }
-        if (!object.HasBehaviorNamed(behaviorName)) {
-          auto *behavior = object.AddNewBehavior(
-              project, defaultBehavior->GetTypeName(), behaviorName);
-          gd::SerializerElement element;
-          defaultBehavior->SerializeTo(element);
-          behavior->UnserializeFrom(element);
-        }
-      }
-      // Delete extra behaviors
-      for (auto &behaviorName : object.GetAllBehaviorNames()) {
-        if (!defaultObject->HasBehaviorNamed(behaviorName)) {
-          object.RemoveBehavior(behaviorName);
-        }
-      }
-
-      // Sort and copy missing variables
-      auto &variables = object.GetVariables();
-      for (size_t defaultVariableIndex = 0;
-           defaultVariableIndex < defaultVariables.Count();
-           defaultVariableIndex++) {
-        const auto &variableName =
-            defaultVariables.GetNameAt(defaultVariableIndex);
-        const auto &defaultVariable =
-            defaultVariables.Get(defaultVariableIndex);
-
-        auto variableIndex = variables.GetPosition(variableName);
-        if (variableIndex == gd::String::npos) {
-          variables.Insert(variableName, defaultVariable, defaultVariableIndex);
-        } else {
-          variables.Move(variableIndex, defaultVariableIndex);
-        }
-        if (variables.Get(variableName).GetType() != defaultVariable.GetType()) {
-          variables.Remove(variableName);
-          variables.Insert(variableName, defaultVariable, defaultVariableIndex);
-        }
-      }
-      // Remove extra variables
-      auto variableToRemoveCount = variables.Count() - defaultVariables.Count();
-      for (size_t iteration = 0; iteration < variableToRemoveCount;
-           iteration++) {
-        variables.Remove(variables.GetNameAt(variables.Count() - 1));
-      }
-
-      // Remove extra instance variables
-      variant->GetInitialInstances().IterateOverInstances(
-          [&objectName,
-           &defaultVariables](gd::InitialInstance &initialInstance) {
-            if (initialInstance.GetObjectName() != objectName) {
-              return false;
-            }
-            auto &instanceVariables = initialInstance.GetVariables();
-            for (size_t instanceVariableIndex = 0;
-                 instanceVariableIndex < instanceVariables.Count();
-                 instanceVariableIndex++) {
-              const auto &variableName =
-                  defaultVariables.GetNameAt(instanceVariableIndex);
-
-              if (!defaultVariables.Has(variableName)) {
-                instanceVariables.Remove(variableName);
-              }
-            }
-            return false;
-          });
-    }
-    auto &defaultObjectGroups =
-        eventsBasedObject.GetDefaultVariant().GetObjects().GetObjectGroups();
-    auto &objectGroups = variant->GetObjects().GetObjectGroups();
-    auto objectGroupsCount = objectGroups.Count();
-    // Clear groups
-    for (size_t index = 0; index < objectGroupsCount; index++) {
-      objectGroups.Remove(objectGroups.Get(0).GetName());
-    }
-    // Copy groups
-    for (size_t index = 0; index < defaultObjectGroups.Count(); index++) {
-      objectGroups.Insert(defaultObjectGroups.Get(index), index);
-    }
-  }
-}
-
-} // namespace gd
--- a/Core/GDCore/IDE/EventsBasedObjectVariantHelper.h
+++ b/Core/GDCore/IDE/EventsBasedObjectVariantHelper.h
@@ -1,26 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-namespace gd {
-class EventsBasedObject;
-class Project;
-} // namespace gd
-
-namespace gd {
-
-class GD_CORE_API EventsBasedObjectVariantHelper {
-public:
-  /**
-   * @brief Apply the changes done on events-based object children to all its
-   * variants.
-   */
-  static void
-  ComplyVariantsToEventsBasedObject(const gd::Project &project,
-                                    gd::EventsBasedObject &eventsBasedObject);
-};
-
-} // namespace gd
--- a/Core/GDCore/IDE/EventsFunctionTools.cpp
+++ b/Core/GDCore/IDE/EventsFunctionTools.cpp
@@ -9,10 +9,7 @@
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/Project/ParameterMetadataContainer.h"
-#include "GDCore/Project/PropertiesContainer.h"
-#include "GDCore/Project/VariablesContainer.h"
+//#include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/EventsFunction.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
@@ -27,16 +24,15 @@ void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
    const gd::EventsFunction& eventsFunction,
    gd::ObjectsContainer& outputObjectsContainer) {
  // Functions scope for objects is defined according
-  // to parameters.
+  // to parameters
+  outputObjectsContainer.GetObjects().clear();
+  outputObjectsContainer.GetObjectGroups().Clear();
+
  auto &parameters = eventsFunction.GetParametersForEvents(functionContainer);
  gd::ParameterMetadataTools::ParametersToObjectsContainer(
      project,
      parameters,
      outputObjectsContainer);
-
-  // TODO: in theory we should ensure stability of the groups across calls
-  // to this function. BUT groups in functions should probably have never been
-  // supported, so we're phasing this out in the UI.
  outputObjectsContainer.GetObjectGroups() = eventsFunction.GetObjectGroups();
 }

@@ -101,73 +97,25 @@ void EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
                  "for the parent. ");
    return;
  }
+
+  gd::EventsFunctionTools::CopyEventsBasedObjectChildrenToObjectsContainer(
+      eventsBasedObject, outputObjectsContainer);
 }

-void EventsFunctionTools::ParametersToVariablesContainer(
-    const ParameterMetadataContainer &parameters,
-    gd::VariablesContainer &outputVariablesContainer) {
-  if (outputVariablesContainer.GetSourceType() !=
-      gd::VariablesContainer::SourceType::Parameters) {
-    throw std::logic_error("Tried to generate a variables container from "
-                           "parameters with the wrong source type.");
+void EventsFunctionTools::CopyEventsBasedObjectChildrenToObjectsContainer(
+    const gd::EventsBasedObject& eventsBasedObject,
+    gd::ObjectsContainer& outputObjectsContainer) {
+  auto &children = eventsBasedObject.GetObjects().GetObjects();
+  for (auto &childObject : children) {
+    auto child = childObject.get();
+    outputObjectsContainer.InsertObject(
+        *child, outputObjectsContainer.GetObjectsCount());
  }
-  outputVariablesContainer.Clear();
-
-  gd::String lastObjectName;
-  for (std::size_t i = 0; i < parameters.GetParametersCount(); ++i) {
-    const auto &parameter = parameters.GetParameter(i);
-    if (parameter.GetName().empty())
-      continue;
-
-    auto &valueTypeMetadata = parameter.GetValueTypeMetadata();
-    if (valueTypeMetadata.IsNumber()) {
-      auto &variable = outputVariablesContainer.InsertNew(
-          parameter.GetName(), outputVariablesContainer.Count());
-      variable.SetValue(0);
-    } else if (valueTypeMetadata.IsString()) {
-      auto &variable = outputVariablesContainer.InsertNew(
-          parameter.GetName(), outputVariablesContainer.Count());
-      variable.SetString("");
-    } else if (valueTypeMetadata.IsBoolean()) {
-      auto &variable = outputVariablesContainer.InsertNew(
-          parameter.GetName(), outputVariablesContainer.Count());
-      variable.SetBool(false);
-    }
-  }
-}
-
-void EventsFunctionTools::PropertiesToVariablesContainer(
-    const PropertiesContainer &properties,
-    gd::VariablesContainer &outputVariablesContainer) {
-  if (outputVariablesContainer.GetSourceType() !=
-      gd::VariablesContainer::SourceType::Properties) {
-    throw std::logic_error("Tried to generate a variables container from "
-                           "properties with the wrong source type.");
-  }
-  outputVariablesContainer.Clear();
-
-  gd::String lastObjectName;
-  for (std::size_t i = 0; i < properties.GetCount(); ++i) {
-    const auto &property = properties.Get(i);
-    if (property.GetName().empty())
-      continue;
-
-    auto &propertyType = gd::ValueTypeMetadata::GetPrimitiveValueType(
-        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-            property.GetType()));
-    if (propertyType == "number") {
-      auto &variable = outputVariablesContainer.InsertNew(
-          property.GetName(), outputVariablesContainer.Count());
-      variable.SetValue(0);
-    } else if (propertyType == "string") {
-      auto &variable = outputVariablesContainer.InsertNew(
-          property.GetName(), outputVariablesContainer.Count());
-      variable.SetString("");
-    } else if (propertyType == "boolean") {
-      auto &variable = outputVariablesContainer.InsertNew(
-          property.GetName(), outputVariablesContainer.Count());
-      variable.SetBool(false);
-    }
+  auto &childrenGroups = eventsBasedObject.GetObjects().GetObjectGroups();
+  for (size_t index = 0; index < childrenGroups.Count(); ++index) {
+    auto &childGroup = childrenGroups.Get(index);
+    outputObjectsContainer.GetObjectGroups().Insert(
+        childGroup, outputObjectsContainer.GetObjectGroups().Count());
  }
 }

--- a/Core/GDCore/IDE/EventsFunctionTools.h
+++ b/Core/GDCore/IDE/EventsFunctionTools.h
@@ -12,9 +12,6 @@ namespace gd {
 class Project;
 class EventsFunctionsContainer;
 class ObjectsContainer;
-class ParameterMetadataContainer;
-class PropertiesContainer;
-class VariablesContainer;
 class ParameterMetadata;
 class EventsFunction;
 class EventsBasedBehavior;
@@ -72,12 +69,8 @@ class GD_CORE_API EventsFunctionTools {
      const gd::EventsFunction& eventsFunction,
      gd::ObjectsContainer& outputObjectsContainer);

-  static void ParametersToVariablesContainer(
-      const ParameterMetadataContainer &parameters,
-      gd::VariablesContainer &outputVariablesContainer);
-
-  static void PropertiesToVariablesContainer(
-      const PropertiesContainer &properties,
-      gd::VariablesContainer &outputVariablesContainer);
+  static void CopyEventsBasedObjectChildrenToObjectsContainer(
+      const gd::EventsBasedObject &eventsBasedObject,
+      gd::ObjectsContainer &outputObjectsContainer);
 };
 }  // namespace gd
--- a/Core/GDCore/IDE/ExportedDependencyResolver.h
+++ b/Core/GDCore/IDE/ExportedDependencyResolver.h
@@ -4,7 +4,6 @@
 #include "GDCore/Extensions/Metadata/DependencyMetadata.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Project.h"
-#include "GDCore/Extensions/Platform.h"

 namespace gd {

--- a/Show More
+++ b/Show More