Try to fix events not rendering sometimes.

Remove dead code.
Format
2025-10-15 10:19:04 +00:00 · 2025-01-06 17:58:18 +01:00 · 2025-01-06 17:09:09 +01:00 · 2025-01-06 16:24:02 +01:00 · 2025-01-06 16:24:01 +01:00 · 2025-01-06 16:24:01 +01:00
1356 changed files with 35260 additions and 131650 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:
@@ -301,203 +295,14 @@ jobs:
          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:
+    jobs:
+      - build-gdevelop_js-wasm-only
  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.
+          # Extra checks are resource intensive so don't all run them.
          filters:
            branches:
              only:
@@ -505,36 +310,13 @@ workflows:
                - /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/.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/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/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/CodeGeneration/EventsCodeGenerator.cpp
+++ b/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp
@@ -42,19 +42,15 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
    const vector<gd::String>& arguments,
    const gd::String& callStartString,
    std::size_t startFromArgument) {
-  std::size_t relationalOperatorIndex =
-      instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument;
-       i < instrInfos.parameters.GetParametersCount();
+  std::size_t relationalOperatorIndex = instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
       ++i) {
-    if (instrInfos.parameters.GetParameter(i).GetType() ==
-        "relationalOperator") {
+    if (instrInfos.parameters.GetParameter(i).GetType() == "relationalOperator") {
      relationalOperatorIndex = i;
    }
  }
  // Ensure that there is at least one parameter after the relational operator
-  if (relationalOperatorIndex + 1 >=
-      instrInfos.parameters.GetParametersCount()) {
+  if (relationalOperatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
    ReportError();
    return "";
  }
@@ -91,23 +87,20 @@ gd::String EventsCodeGenerator::GenerateRelationalOperation(
    const gd::String& relationalOperator,
    const gd::String& lhs,
    const gd::String& rhs) {
-  return lhs + " " + GenerateRelationalOperatorCodes(relationalOperator) + " " +
-         rhs;
+  return lhs + " " + GenerateRelationalOperatorCodes(relationalOperator) + " " + rhs;
 }

-const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(
-    const gd::String& operatorString) {
-  if (operatorString == "=") {
-    return "==";
-  }
-  if (operatorString != "<" && operatorString != ">" &&
-      operatorString != "<=" && operatorString != ">=" &&
-      operatorString != "!=" && operatorString != "startsWith" &&
-      operatorString != "endsWith" && operatorString != "contains") {
-    cout << "Warning: Bad relational operator: Set to == by default." << endl;
-    return "==";
-  }
-  return operatorString;
+const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
+    if (operatorString == "=") {
+        return "==";
+    }
+    if (operatorString != "<" && operatorString != ">" &&
+        operatorString != "<=" && operatorString != ">=" && operatorString != "!=" &&
+        operatorString != "startsWith" && operatorString != "endsWith" && operatorString != "contains") {
+      cout << "Warning: Bad relational operator: Set to == by default." << endl;
+      return "==";
+    }
+    return operatorString;
 }

 /**
@@ -131,8 +124,7 @@ gd::String EventsCodeGenerator::GenerateOperatorCall(
    const gd::String& getterStartString,
    std::size_t startFromArgument) {
  std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument;
-       i < instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
       ++i) {
    if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
      operatorIndex = i;
@@ -203,8 +195,7 @@ gd::String EventsCodeGenerator::GenerateCompoundOperatorCall(
    const gd::String& callStartString,
    std::size_t startFromArgument) {
  std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument;
-       i < instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
       ++i) {
    if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
      operatorIndex = i;
@@ -257,8 +248,7 @@ gd::String EventsCodeGenerator::GenerateMutatorCall(
    const gd::String& callStartString,
    std::size_t startFromArgument) {
  std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument;
-       i < instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
       ++i) {
    if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
      operatorIndex = i;
@@ -333,97 +323,83 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
  }

  // Insert code only parameters and be sure there is no lack of parameter.
-  while (condition.GetParameters().size() <
-         instrInfos.parameters.GetParametersCount()) {
+  while (condition.GetParameters().size() < instrInfos.parameters.GetParametersCount()) {
    vector<gd::Expression> parameters = condition.GetParameters();
    parameters.push_back(gd::Expression(""));
    condition.SetParameters(parameters);
  }

+  gd::EventsCodeGenerator::CheckBehaviorParameters(condition, instrInfos);
  // Verify that there are no mismatches between object type in parameters.
-  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount();
-       ++pNb) {
-    if (ParameterMetadata::IsObject(
-            instrInfos.parameters.GetParameter(pNb).GetType())) {
+  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType())) {
      gd::String objectInParameter =
          condition.GetParameter(pNb).GetPlainString();

-      const auto& expectedObjectType =
+      const auto &expectedObjectType =
          instrInfos.parameters.GetParameter(pNb).GetExtraInfo();
-      const auto& actualObjectType =
+      const auto &actualObjectType =
          GetObjectsContainersList().GetTypeOfObject(objectInParameter);
      if (!GetObjectsContainersList().HasObjectOrGroupNamed(
              objectInParameter)) {
        gd::ProjectDiagnostic projectDiagnostic(
-            gd::ProjectDiagnostic::ErrorType::UnknownObject,
-            "",
-            objectInParameter,
-            "");
+            gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
+            objectInParameter, "");
        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
        return "/* Unknown object - skipped. */";
      } else if (!expectedObjectType.empty() &&
                 actualObjectType != expectedObjectType) {
        gd::ProjectDiagnostic projectDiagnostic(
-            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType,
-            "",
-            actualObjectType,
-            expectedObjectType,
-            objectInParameter);
+            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
+            actualObjectType, expectedObjectType, objectInParameter);
        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
        return "/* Mismatched object type - skipped. */";
      }
    }
  }
-  bool isAnyBehaviorMissing =
-      gd::EventsCodeGenerator::CheckBehaviorParameters(condition, instrInfos);
-  if (isAnyBehaviorMissing) {
-    return "/* Missing behavior - skipped. */";
-  }

  if (instrInfos.IsObjectInstruction()) {
    gd::String objectName = condition.GetParameter(0).GetPlainString();
    if (!objectName.empty() && instrInfos.parameters.GetParametersCount() > 0) {
      std::vector<gd::String> realObjects =
-          GetObjectsContainersList().ExpandObjectName(
-              objectName, context.GetCurrentObject());
+          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
      for (std::size_t i = 0; i < realObjects.size(); ++i) {
        // Set up the context
-        gd::String objectType =
-            GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
+        gd::String objectType = GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
        const ObjectMetadata& objInfo =
            MetadataProvider::GetObjectMetadata(platform, objectType);

-        AddIncludeFiles(objInfo.includeFiles);
-        context.SetCurrentObject(realObjects[i]);
-        context.ObjectsListNeeded(realObjects[i]);
+          AddIncludeFiles(objInfo.includeFiles);
+          context.SetCurrentObject(realObjects[i]);
+          context.ObjectsListNeeded(realObjects[i]);

-        // Prepare arguments and generate the condition whole code
-        vector<gd::String> arguments = GenerateParametersCodes(
-            condition.GetParameters(), instrInfos.parameters, context);
-        conditionCode += GenerateObjectCondition(realObjects[i],
-                                                 objInfo,
-                                                 arguments,
-                                                 instrInfos,
-                                                 returnBoolean,
-                                                 condition.IsInverted(),
-                                                 context);
+          // Prepare arguments and generate the condition whole code
+          vector<gd::String> arguments = GenerateParametersCodes(
+              condition.GetParameters(), instrInfos.parameters, context);
+          conditionCode += GenerateObjectCondition(realObjects[i],
+                                                   objInfo,
+                                                   arguments,
+                                                   instrInfos,
+                                                   returnBoolean,
+                                                   condition.IsInverted(),
+                                                   context);

-        context.SetNoCurrentObject();
+          context.SetNoCurrentObject();
      }
    }
  } else if (instrInfos.IsBehaviorInstruction()) {
    if (instrInfos.parameters.GetParametersCount() >= 2) {
-      const gd::String& objectName = condition.GetParameter(0).GetPlainString();
-      const gd::String& behaviorName =
+      const gd::String &objectName = condition.GetParameter(0).GetPlainString();
+      const gd::String &behaviorName =
          condition.GetParameter(1).GetPlainString();
-      const gd::String& actualBehaviorType =
+      const gd::String &actualBehaviorType =
          GetObjectsContainersList().GetTypeOfBehavior(behaviorName);

      std::vector<gd::String> realObjects =
          GetObjectsContainersList().ExpandObjectName(
              objectName, context.GetCurrentObject());

-      const BehaviorMetadata& autoInfo =
+      const BehaviorMetadata &autoInfo =
          MetadataProvider::GetBehaviorMetadata(platform, actualBehaviorType);

      for (std::size_t i = 0; i < realObjects.size(); ++i) {
@@ -435,14 +411,15 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
        // Prepare arguments and generate the whole condition code
        vector<gd::String> arguments = GenerateParametersCodes(
            condition.GetParameters(), instrInfos.parameters, context);
-        conditionCode += GenerateBehaviorCondition(realObjects[i],
-                                                   behaviorName,
-                                                   autoInfo,
-                                                   arguments,
-                                                   instrInfos,
-                                                   returnBoolean,
-                                                   condition.IsInverted(),
-                                                   context);
+        conditionCode += GenerateBehaviorCondition(
+            realObjects[i],
+            behaviorName,
+            autoInfo,
+            arguments,
+            instrInfos,
+            returnBoolean,
+            condition.IsInverted(),
+            context);

        context.SetNoCurrentObject();
      }
@@ -511,50 +488,31 @@ gd::String EventsCodeGenerator::GenerateConditionsListCode(
  return outputCode;
 }

-bool EventsCodeGenerator::CheckBehaviorParameters(
-    const gd::Instruction& instruction,
-    const gd::InstructionMetadata& instrInfos) {
-  bool isAnyBehaviorMissing = false;
-  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(),
-      instrInfos.parameters,
-      [this, &isAnyBehaviorMissing, &instrInfos](
-          const gd::ParameterMetadata& parameterMetadata,
-          const gd::Expression& parameterValue,
-          size_t parameterIndex,
-          const gd::String& lastObjectName,
-          size_t lastObjectIndex) {
+void EventsCodeGenerator::CheckBehaviorParameters(
+    const gd::Instruction &instruction,
+    const gd::InstructionMetadata &instrInfos) {
+  gd::ParameterMetadataTools::IterateOverParameters(
+      instruction.GetParameters(), instrInfos.parameters,
+      [this](const gd::ParameterMetadata &parameterMetadata,
+             const gd::Expression &parameterValue,
+             const gd::String &lastObjectName) {
        if (ParameterMetadata::IsBehavior(parameterMetadata.GetType())) {
-          const gd::String& behaviorName = parameterValue.GetPlainString();
-          const gd::String& actualBehaviorType =
+          const gd::String &behaviorName = parameterValue.GetPlainString();
+          const gd::String &actualBehaviorType =
              GetObjectsContainersList().GetTypeOfBehaviorInObjectOrGroup(
                  lastObjectName, behaviorName);
-          const gd::String& expectedBehaviorType =
+          const gd::String &expectedBehaviorType =
              parameterMetadata.GetExtraInfo();

          if (!expectedBehaviorType.empty() &&
              actualBehaviorType != expectedBehaviorType) {
-            const auto& objectParameterMetadata =
-                instrInfos.GetParameter(lastObjectIndex);
-            // Event functions crash if some objects in a group are missing
-            // the required behaviors, since they lose reference to the original
-            // objects. Missing behaviors are considered "fatal" only for
-            // ObjectList parameters, in order to minimize side effects on
-            // built-in functions.
-            if (objectParameterMetadata.GetType() == "objectList") {
-              isAnyBehaviorMissing = true;
-            }
            gd::ProjectDiagnostic projectDiagnostic(
-                gd::ProjectDiagnostic::ErrorType::MissingBehavior,
-                "",
-                actualBehaviorType,
-                expectedBehaviorType,
-                lastObjectName);
+                gd::ProjectDiagnostic::ErrorType::MissingBehavior, "",
+                actualBehaviorType, expectedBehaviorType, lastObjectName);
            if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
          }
        }
      });
-  return isAnyBehaviorMissing;
 }

 /**
@@ -563,8 +521,7 @@ bool EventsCodeGenerator::CheckBehaviorParameters(
 gd::String EventsCodeGenerator::GenerateActionCode(
    gd::Instruction& action,
    EventsCodeGenerationContext& context,
-    const gd::String& optionalAsyncCallbackName,
-    const gd::String& optionalAsyncCallbackId) {
+    const gd::String& optionalAsyncCallbackName) {
  gd::String actionCode;

  const gd::InstructionMetadata& instrInfos =
@@ -589,51 +546,39 @@ gd::String EventsCodeGenerator::GenerateActionCode(
          : instrInfos.codeExtraInformation.functionCallName;

  // Be sure there is no lack of parameter.
-  while (action.GetParameters().size() <
-         instrInfos.parameters.GetParametersCount()) {
+  while (action.GetParameters().size() < instrInfos.parameters.GetParametersCount()) {
    vector<gd::Expression> parameters = action.GetParameters();
    parameters.push_back(gd::Expression(""));
    action.SetParameters(parameters);
  }

+  gd::EventsCodeGenerator::CheckBehaviorParameters(action, instrInfos);
  // Verify that there are no mismatches between object type in parameters.
-  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount();
-       ++pNb) {
-    if (ParameterMetadata::IsObject(
-            instrInfos.parameters.GetParameter(pNb).GetType())) {
+  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType())) {
      gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();

-      const auto& expectedObjectType =
+      const auto &expectedObjectType =
          instrInfos.parameters.GetParameter(pNb).GetExtraInfo();
-      const auto& actualObjectType =
+      const auto &actualObjectType =
          GetObjectsContainersList().GetTypeOfObject(objectInParameter);
      if (!GetObjectsContainersList().HasObjectOrGroupNamed(
              objectInParameter)) {
        gd::ProjectDiagnostic projectDiagnostic(
-            gd::ProjectDiagnostic::ErrorType::UnknownObject,
-            "",
-            objectInParameter,
-            "");
+            gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
+            objectInParameter, "");
        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
        return "/* Unknown object - skipped. */";
      } else if (!expectedObjectType.empty() &&
                 actualObjectType != expectedObjectType) {
        gd::ProjectDiagnostic projectDiagnostic(
-            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType,
-            "",
-            actualObjectType,
-            expectedObjectType,
-            objectInParameter);
+            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
+            actualObjectType, expectedObjectType, objectInParameter);
        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
        return "/* Mismatched object type - skipped. */";
      }
    }
  }
-  bool isAnyBehaviorMissing =
-      gd::EventsCodeGenerator::CheckBehaviorParameters(action, instrInfos);
-  if (isAnyBehaviorMissing) {
-    return "/* Missing behavior - skipped. */";
-  }

  // Call free function first if available
  if (instrInfos.IsObjectInstruction()) {
@@ -641,46 +586,43 @@ gd::String EventsCodeGenerator::GenerateActionCode(

    if (instrInfos.parameters.GetParametersCount() > 0) {
      std::vector<gd::String> realObjects =
-          GetObjectsContainersList().ExpandObjectName(
-              objectName, context.GetCurrentObject());
+          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
      for (std::size_t i = 0; i < realObjects.size(); ++i) {
        // Setup context
-        gd::String objectType =
-            GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
+        gd::String objectType = GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
        const ObjectMetadata& objInfo =
            MetadataProvider::GetObjectMetadata(platform, objectType);

-        AddIncludeFiles(objInfo.includeFiles);
-        context.SetCurrentObject(realObjects[i]);
-        context.ObjectsListNeeded(realObjects[i]);
+          AddIncludeFiles(objInfo.includeFiles);
+          context.SetCurrentObject(realObjects[i]);
+          context.ObjectsListNeeded(realObjects[i]);

-        // Prepare arguments and generate the whole action code
-        vector<gd::String> arguments = GenerateParametersCodes(
-            action.GetParameters(), instrInfos.parameters, context);
-        actionCode += GenerateObjectAction(realObjects[i],
-                                           objInfo,
-                                           functionCallName,
-                                           arguments,
-                                           instrInfos,
-                                           context,
-                                           optionalAsyncCallbackName,
-                                           optionalAsyncCallbackId);
+          // Prepare arguments and generate the whole action code
+          vector<gd::String> arguments = GenerateParametersCodes(
+              action.GetParameters(), instrInfos.parameters, context);
+          actionCode += GenerateObjectAction(realObjects[i],
+                                             objInfo,
+                                             functionCallName,
+                                             arguments,
+                                             instrInfos,
+                                             context,
+                                             optionalAsyncCallbackName);

-        context.SetNoCurrentObject();
+          context.SetNoCurrentObject();
      }
    }
  } else if (instrInfos.IsBehaviorInstruction()) {
    if (instrInfos.parameters.GetParametersCount() >= 2) {
-      const gd::String& objectName = action.GetParameter(0).GetPlainString();
-      const gd::String& behaviorName = action.GetParameter(1).GetPlainString();
-      const gd::String& actualBehaviorType =
+      const gd::String &objectName = action.GetParameter(0).GetPlainString();
+      const gd::String &behaviorName = action.GetParameter(1).GetPlainString();
+      const gd::String &actualBehaviorType =
          GetObjectsContainersList().GetTypeOfBehavior(behaviorName);

      std::vector<gd::String> realObjects =
          GetObjectsContainersList().ExpandObjectName(
              objectName, context.GetCurrentObject());

-      const BehaviorMetadata& autoInfo =
+      const BehaviorMetadata &autoInfo =
          MetadataProvider::GetBehaviorMetadata(platform, actualBehaviorType);

      AddIncludeFiles(autoInfo.includeFiles);
@@ -692,15 +634,15 @@ gd::String EventsCodeGenerator::GenerateActionCode(
        // Prepare arguments and generate the whole action code
        vector<gd::String> arguments = GenerateParametersCodes(
            action.GetParameters(), instrInfos.parameters, context);
-        actionCode += GenerateBehaviorAction(realObjects[i],
-                                             behaviorName,
-                                             autoInfo,
-                                             functionCallName,
-                                             arguments,
-                                             instrInfos,
-                                             context,
-                                             optionalAsyncCallbackName,
-                                             optionalAsyncCallbackId);
+        actionCode +=
+            GenerateBehaviorAction(realObjects[i],
+                                   behaviorName,
+                                   autoInfo,
+                                   functionCallName,
+                                   arguments,
+                                   instrInfos,
+                                   context,
+                                   optionalAsyncCallbackName);

        context.SetNoCurrentObject();
      }
@@ -712,8 +654,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
                                     arguments,
                                     instrInfos,
                                     context,
-                                     optionalAsyncCallbackName,
-                                     optionalAsyncCallbackId);
+                                     optionalAsyncCallbackName);
  }

  return actionCode;
@@ -726,8 +667,8 @@ gd::String EventsCodeGenerator::GenerateLocalVariablesStackAccessor() {
 }

 gd::String EventsCodeGenerator::GenerateAnyOrSceneVariableGetter(
-    const gd::Expression& variableExpression,
-    EventsCodeGenerationContext& context) {
+    const gd::Expression &variableExpression,
+    EventsCodeGenerationContext &context) {
  const auto variableName = gd::ExpressionVariableNameFinder::GetVariableName(
      *variableExpression.GetRootNode());

@@ -738,12 +679,8 @@ gd::String EventsCodeGenerator::GenerateAnyOrSceneVariableGetter(
          : "scenevar";

  return gd::ExpressionCodeGenerator::GenerateExpressionCode(
-      *this,
-      context,
-      variableParameterType,
-      variableExpression.GetPlainString(),
-      "",
-      "AllowUndeclaredVariable");
+      *this, context, variableParameterType,
+      variableExpression.GetPlainString(), "", "AllowUndeclaredVariable");
 }

 const EventsCodeGenerator::CallbackDescriptor
@@ -790,11 +727,6 @@ EventsCodeGenerator::GenerateCallback(

  AddCustomCodeOutsideMain(callbackCode);

-  const gd::String idToCallbackMapUpdate = GetCodeNamespaceAccessor() +
-                                           "idToCallbackMap.set(" + callbackID +
-                                           ", " + callbackFunctionName + ");\n";
-  AddCustomCodeOutsideMain(idToCallbackMapUpdate);
-
  std::set<gd::String> requiredObjects;
  // Build the list of all objects required by the callback. Any object that has
  // already been declared could have gone through previous object picking, so
@@ -837,7 +769,7 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
    } else {
      outputCode += actionCode;
    }
-    outputCode += "}\n";
+    outputCode += "}";
  }

  return outputCode;
@@ -854,28 +786,13 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(

  if (ParameterMetadata::IsExpression("number", metadata.GetType())) {
    argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this,
-        context,
-        "number",
-        parameter,
-        lastObjectName,
-        metadata.GetExtraInfo());
+        *this, context, "number", parameter, lastObjectName, metadata.GetExtraInfo());
  } else if (ParameterMetadata::IsExpression("string", metadata.GetType())) {
    argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this,
-        context,
-        "string",
-        parameter,
-        lastObjectName,
-        metadata.GetExtraInfo());
+        *this, context, "string", parameter, lastObjectName, metadata.GetExtraInfo());
  } else if (ParameterMetadata::IsExpression("variable", metadata.GetType())) {
    argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this,
-        context,
-        metadata.GetType(),
-        parameter,
-        lastObjectName,
-        metadata.GetExtraInfo());
+        *this, context, metadata.GetType(), parameter, lastObjectName, metadata.GetExtraInfo());
  } else if (ParameterMetadata::IsObject(metadata.GetType())) {
    // It would be possible to run a gd::ExpressionCodeGenerator if later
    // objects can have nested objects, or function returning objects.
@@ -910,8 +827,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
             metadata.GetType() == "atlasResource" ||
             metadata.GetType() == "spineResource" ||
             // Deprecated, old parameter names:
-             metadata.GetType() == "password" ||
-             metadata.GetType() == "musicfile" ||
+             metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
             metadata.GetType() == "soundfile") {
    argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
  } else if (metadata.GetType() == "mouse") {
@@ -1061,8 +977,7 @@ gd::String EventsCodeGenerator::GenerateEventsListCode(
  for (std::size_t eId = 0; eId < events.size(); ++eId) {
    auto& event = events[eId];
    if (event.HasVariables()) {
-      GetProjectScopedContainers().GetVariablesContainersList().Push(
-          event.GetVariables());
+      GetProjectScopedContainers().GetVariablesContainersList().Push(event.GetVariables());
    }

    // Each event has its own context : Objects picked in an event are totally
@@ -1187,7 +1102,7 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
        instrInfos.codeExtraInformation.functionCallName);
  } else {
    predicate = instrInfos.codeExtraInformation.functionCallName + "(" +
-                GenerateArgumentsList(arguments, 0) + ")";
+               GenerateArgumentsList(arguments, 0) + ")";
  }

  // Add logical not if needed
@@ -1231,7 +1146,7 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
        instrInfos, arguments, objectFunctionCallNamePart, 1);
  } else {
    predicate = objectFunctionCallNamePart + "(" +
-                GenerateArgumentsList(arguments, 1) + ")";
+               GenerateArgumentsList(arguments, 1) + ")";
  }
  if (conditionInverted) predicate = GenerateNegatedPredicate(predicate);

@@ -1263,20 +1178,18 @@ gd::String EventsCodeGenerator::GenerateBehaviorCondition(
 }

 gd::String EventsCodeGenerator::GenerateFreeAction(
-    const gd::String& functionCallName,
+      const gd::String& functionCallName,
    const std::vector<gd::String>& arguments,
    const gd::InstructionMetadata& instrInfos,
    gd::EventsCodeGenerationContext& context,
-    const gd::String& optionalAsyncCallbackName,
-    const gd::String& optionalAsyncCallbackId) {
+    const gd::String& optionalAsyncCallbackName) {
  // Generate call
  gd::String call;
  if (instrInfos.codeExtraInformation.type == "number" ||
      instrInfos.codeExtraInformation.type == "string" ||
      // Boolean actions declared with addExpressionAndConditionAndAction uses
-      // MutatorAndOrAccessor even though they don't declare an operator
-      // parameter. Boolean operators are only used with SetMutators or
-      // SetCustomCodeGenerator.
+      // MutatorAndOrAccessor even though they don't declare an operator parameter.
+      // Boolean operators are only used with SetMutators or SetCustomCodeGenerator.
      (instrInfos.codeExtraInformation.type == "boolean" &&
       instrInfos.codeExtraInformation.accessType ==
           gd::InstructionMetadata::ExtraInformation::AccessType::Mutators)) {
@@ -1289,19 +1202,23 @@ gd::String EventsCodeGenerator::GenerateFreeAction(
          instrInfos.codeExtraInformation.optionalAssociatedInstruction);
    else if (instrInfos.codeExtraInformation.accessType ==
             gd::InstructionMetadata::ExtraInformation::Mutators)
-      call = GenerateMutatorCall(instrInfos, arguments, functionCallName);
-    else
      call =
-          GenerateCompoundOperatorCall(instrInfos, arguments, functionCallName);
+          GenerateMutatorCall(instrInfos,
+                              arguments,
+                              functionCallName);
+    else
+      call = GenerateCompoundOperatorCall(
+          instrInfos,
+          arguments,
+          functionCallName);
  } else {
-    call = functionCallName + "(" + GenerateArgumentsList(arguments) + ")";
+    call = functionCallName + "(" +
+           GenerateArgumentsList(arguments) + ")";
  }

-  if (!optionalAsyncCallbackName.empty() && !optionalAsyncCallbackId.empty()) {
+  if (!optionalAsyncCallbackName.empty())
    call = "runtimeScene.getAsyncTasksManager().addTask(" + call + ", " +
-           optionalAsyncCallbackName + ", " + optionalAsyncCallbackId +
-           ", asyncObjectsList)";
-  }
+           optionalAsyncCallbackName + ")";

  return call + ";\n";
 }
@@ -1313,8 +1230,7 @@ gd::String EventsCodeGenerator::GenerateObjectAction(
    const std::vector<gd::String>& arguments,
    const gd::InstructionMetadata& instrInfos,
    gd::EventsCodeGenerationContext& context,
-    const gd::String& optionalAsyncCallbackName,
-    const gd::String& optionalAsyncCallbackId) {
+    const gd::String& optionalAsyncCallbackName) {
  // Create call
  gd::String call;
  if ((instrInfos.codeExtraInformation.type == "number" ||
@@ -1355,8 +1271,7 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
    const std::vector<gd::String>& arguments,
    const gd::InstructionMetadata& instrInfos,
    gd::EventsCodeGenerationContext& context,
-    const gd::String& optionalAsyncCallbackName,
-    const gd::String& optionalAsyncCallbackId) {
+    const gd::String& optionalAsyncCallbackName) {
  // Create call
  gd::String call;
  if ((instrInfos.codeExtraInformation.type == "number" ||
@@ -1371,13 +1286,17 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
          2);
    else
      call = GenerateCompoundOperatorCall(
-          instrInfos, arguments, functionCallName, 2);
+          instrInfos,
+          arguments,
+          functionCallName,
+          2);
    return "For each picked object \"" + objectName + "\", call " + call +
           " for behavior \"" + behaviorName + "\".\n";
  } else {
    gd::String argumentsStr = GenerateArgumentsList(arguments, 2);

-    call = functionCallName + "(" + argumentsStr + ")";
+    call = functionCallName + "(" +
+           argumentsStr + ")";

    return "For each picked object \"" + objectName + "\", call " + call + "(" +
           argumentsStr + ")" + " for behavior \"" + behaviorName + "\"" +
@@ -1432,47 +1351,24 @@ gd::String EventsCodeGenerator::GenerateArgumentsList(
  return argumentsStr;
 }

-gd::String EventsCodeGenerator::GeneratePropertyGetter(
-    const gd::PropertiesContainer& propertiesContainer,
-    const gd::NamedPropertyDescriptor& property,
-    const gd::String& type,
-    gd::EventsCodeGenerationContext& context) {
+gd::String EventsCodeGenerator::GeneratePropertyGetter(const gd::PropertiesContainer& propertiesContainer,
+                                                       const gd::NamedPropertyDescriptor& property,
+                                                       const gd::String& type,
+                                                       gd::EventsCodeGenerationContext& context) {
  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) {
+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_)
    : platform(platform_),
-      projectScopedContainers(
-          gd::ProjectScopedContainers::
-              MakeNewProjectScopedContainersForProjectAndLayout(project_,
-                                                                layout)),
+      projectScopedContainers(gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project_, layout)),
      hasProjectAndLayout(true),
      project(&project_),
      scene(&layout),
@@ -1481,7 +1377,7 @@ EventsCodeGenerator::EventsCodeGenerator(const gd::Project& project_,
      maxCustomConditionsDepth(0),
      maxConditionsListsSize(0),
      eventsListNextUniqueId(0),
-      diagnosticReport(nullptr) {};
+      diagnosticReport(nullptr){};

 EventsCodeGenerator::EventsCodeGenerator(
    const gd::Platform& platform_,
@@ -1496,6 +1392,6 @@ EventsCodeGenerator::EventsCodeGenerator(
      maxCustomConditionsDepth(0),
      maxConditionsListsSize(0),
      eventsListNextUniqueId(0),
-      diagnosticReport(nullptr) {};
+      diagnosticReport(nullptr){};

 }  // namespace gd
--- a/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h
+++ b/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h
@@ -9,9 +9,9 @@
 #include <utility>
 #include <vector>

-#include "GDCore/Events/CodeGeneration/DiagnosticReport.h"
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Instruction.h"
+#include "GDCore/Events/CodeGeneration/DiagnosticReport.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"

@@ -62,7 +62,7 @@ class GD_CORE_API EventsCodeGenerator {
  EventsCodeGenerator(
      const gd::Platform& platform,
      const gd::ProjectScopedContainers& projectScopedContainers_);
-  virtual ~EventsCodeGenerator() {};
+  virtual ~EventsCodeGenerator(){};

  /**
   * \brief Preprocess an events list (replacing for example links with the
@@ -160,8 +160,7 @@ class GD_CORE_API EventsCodeGenerator {
  gd::String GenerateActionCode(
      gd::Instruction& action,
      EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "",
-      const gd::String& optionalAsyncCallbackId = "");
+      const gd::String& optionalAsyncCallbackName = "");

  struct CallbackDescriptor {
    CallbackDescriptor(const gd::String functionName_,
@@ -169,7 +168,7 @@ class GD_CORE_API EventsCodeGenerator {
                       const std::set<gd::String> requiredObjects_)
        : functionName(functionName_),
          argumentsList(argumentsList_),
-          requiredObjects(requiredObjects_) {};
+          requiredObjects(requiredObjects_){};
    /**
     * The name by which the function can be invoked.
     */
@@ -339,9 +338,9 @@ class GD_CORE_API EventsCodeGenerator {
  }

  /**
-   * @brief Give access to the project scoped containers as code generation
-   * might push and pop variable containers (for local variables). This could be
-   * passed as a parameter recursively in code generation, but this requires
+   * @brief Give access to the project scoped containers as code generation might
+   * push and pop variable containers (for local variables).
+   * This could be passed as a parameter recursively in code generation, but this requires
   * heavy refactoring. Instead, we use this single instance.
   */
  gd::ProjectScopedContainers& GetProjectScopedContainers() {
@@ -388,7 +387,9 @@ class GD_CORE_API EventsCodeGenerator {
    diagnosticReport = diagnosticReport_;
  }

-  gd::DiagnosticReport* GetDiagnosticReport() { return diagnosticReport; }
+  gd::DiagnosticReport* GetDiagnosticReport() {
+    return diagnosticReport;
+  }

  /**
   * \brief Generate the full name for accessing to a boolean variable used for
@@ -466,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.
@@ -512,16 +506,11 @@ class GD_CORE_API EventsCodeGenerator {
   * \brief Generate an any variable getter that fallbacks on scene variable for
   * compatibility reason.
   */
-  gd::String GenerateAnyOrSceneVariableGetter(
-      const gd::Expression& variableExpression,
-      EventsCodeGenerationContext& context);
+  gd::String
+  GenerateAnyOrSceneVariableGetter(const gd::Expression &variableExpression,
+                                   EventsCodeGenerationContext &context);

-  virtual gd::String GeneratePropertySetterWithoutCasting(
-      const gd::PropertiesContainer& propertiesContainer,
-      const gd::NamedPropertyDescriptor& property,
-      const gd::String& operandCode);
-
- protected:
+protected:
  virtual const gd::String GenerateRelationalOperatorCodes(
      const gd::String& operatorString);

@@ -576,8 +565,7 @@ class GD_CORE_API EventsCodeGenerator {
      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) {
@@ -585,9 +573,7 @@ class GD_CORE_API EventsCodeGenerator {

    } 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 + ")";
    }

@@ -641,18 +627,11 @@ class GD_CORE_API EventsCodeGenerator {
      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.
@@ -768,8 +747,7 @@ class GD_CORE_API EventsCodeGenerator {
      const std::vector<gd::String>& arguments,
      const gd::InstructionMetadata& instrInfos,
      gd::EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "",
-      const gd::String& optionalAsyncCallbackId = "");
+      const gd::String& optionalAsyncCallbackName = "");

  virtual gd::String GenerateObjectAction(
      const gd::String& objectName,
@@ -778,8 +756,7 @@ class GD_CORE_API EventsCodeGenerator {
      const std::vector<gd::String>& arguments,
      const gd::InstructionMetadata& instrInfos,
      gd::EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "",
-      const gd::String& optionalAsyncCallbackId = "");
+      const gd::String& optionalAsyncCallbackName = "");

  virtual gd::String GenerateBehaviorAction(
      const gd::String& objectName,
@@ -789,8 +766,7 @@ class GD_CORE_API EventsCodeGenerator {
      const std::vector<gd::String>& arguments,
      const gd::InstructionMetadata& instrInfos,
      gd::EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "",
-      const gd::String& optionalAsyncCallbackId = "");
+      const gd::String& optionalAsyncCallbackName = "");

  gd::String GenerateRelationalOperatorCall(
      const gd::InstructionMetadata& instrInfos,
@@ -839,8 +815,9 @@ class GD_CORE_API EventsCodeGenerator {
  virtual gd::String GenerateGetBehaviorNameCode(
      const gd::String& behaviorName);

-  bool CheckBehaviorParameters(const gd::Instruction& instruction,
-                               const gd::InstructionMetadata& instrInfos);
+  void CheckBehaviorParameters(
+      const gd::Instruction &instruction,
+      const gd::InstructionMetadata &instrInfos);

  const gd::Platform& platform;  ///< The platform being used.

@@ -877,3 +854,4 @@ class GD_CORE_API EventsCodeGenerator {
 };

 }  // namespace gd
+
--- 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.h
+++ b/Core/GDCore/Events/Event.h
@@ -286,20 +286,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,7 +304,6 @@ 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;
--- 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"))
@@ -293,25 +294,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddCodeOnlyParameter("currentScene", "")
      .MarkAsAdvanced();

-  obj.AddAction(
-         "RotateTowardObject",
-         _("Rotate toward another object"),
-         _("Rotate an object towards another object, with the specified speed. "
-           "Note that if multiple instances of the target object are picked, "
-           "only the first one will be used. Use a For Each event or actions "
-           "like \"Pick nearest object\", \"Pick a random object\" to refine "
-           "the choice of the target object."),
-         _("Rotate _PARAM0_ towards _PARAM1_ at speed _PARAM2_ deg/second"),
-         _("Angle"),
-         "res/actions/rotate24_black.png",
-         "res/actions/rotate_black.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("objectPtr", _("Target object"))
-      .AddParameter("expression", _("Angular speed (in degrees per second)"))
-      .SetParameterLongDescription(_("Enter 0 for an immediate rotation."))
-      .AddCodeOnlyParameter("currentScene", "")
-      .MarkAsAdvanced();
-
  obj.AddAction(
         "AddForceXY",
         _("Add a force"),
@@ -322,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)"),
@@ -339,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(
@@ -357,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(
@@ -378,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",
@@ -394,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",
@@ -436,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"),
@@ -447,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"),
@@ -462,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"),
@@ -478,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"),
@@ -493,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"),
@@ -508,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"),
@@ -525,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",
@@ -538,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();
@@ -553,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();
@@ -570,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(
@@ -587,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",
@@ -595,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",
@@ -622,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",
@@ -655,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",
@@ -723,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",
@@ -734,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
@@ -754,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",
@@ -768,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",
@@ -783,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",
@@ -798,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",
@@ -813,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",
@@ -830,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();

@@ -877,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"))
@@ -886,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();

@@ -895,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"))
@@ -904,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(
@@ -912,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();

@@ -926,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();

@@ -941,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();

@@ -958,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(
@@ -972,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(
@@ -987,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"),
@@ -1059,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(
@@ -1079,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",
@@ -1113,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",
@@ -1140,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",
@@ -1148,7 +1099,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "",
                    true)
      .SetDefaultValue("no")
-      .SetHelpPath("/all-features/collisions/")
      .MarkAsSimple();

  obj.AddCondition("CollisionPoint",
@@ -1161,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
@@ -1193,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(
@@ -1209,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",
@@ -1221,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(
@@ -1234,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"),
@@ -1246,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",
@@ -1258,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",
@@ -1270,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",
@@ -1289,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"));
@@ -1300,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"),
@@ -1333,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",
@@ -1430,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"),
@@ -1443,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",
@@ -1452,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"),
@@ -1593,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_)"),
                 "",
@@ -1636,7 +1567,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

  extension
      .AddAction("AjoutObjConcern",
-                 _("Pick all object instances"),
+                 _("Pick all instances"),
                 _("Pick all instances of the specified object(s). When you "
                   "pick all instances, "
                   "the next conditions and actions of this event work on all "
@@ -1650,34 +1581,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .MarkAsAdvanced();

  extension
-      .AddAction("AjoutHasard",
-                 _("Pick a random object"),
-                 _("Pick one instance from all the specified objects. When an "
-                   "instance is picked, the next conditions and actions of "
-                   "this event work only on that object instance."),
-                 _("Pick a random _PARAM1_"),
-                 _("Objects"),
-                 "res/actions/ajouthasard24.png",
-                 "res/actions/ajouthasard.png")
+      .AddAction(
+          "AjoutHasard",
+          _("Pick a random object"),
+          _("Pick one object from all the specified objects. When an object "
+            "is picked, the next conditions and actions of this event work "
+            "only on that object."),
+          _("Pick a random _PARAM1_"),
+          _("Objects"),
+          "res/actions/ajouthasard24.png",
+          "res/actions/ajouthasard.png")
      .AddCodeOnlyParameter("objectsContext", "")
      .AddParameter("objectList", _("Object"))
      .MarkAsSimple();

-  extension
-      .AddAction(
-          "PickNearest",
-          _("Pick nearest object"),
-          _("Pick the instance of this object that is nearest to the specified "
-            "position."),
-          _("Pick the _PARAM0_ that is nearest to _PARAM1_;_PARAM2_"),
-          _("Objects"),
-          "res/conditions/distance24.png",
-          "res/conditions/distance.png")
-      .AddParameter("objectList", _("Object"))
-      .AddParameter("expression", _("X position"))
-      .AddParameter("expression", _("Y position"))
-      .MarkAsSimple();
-
  extension
      .AddAction(
          "MoveObjects",
@@ -1689,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
@@ -1705,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
@@ -1727,12 +1642,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
  extension
      .AddCondition(
          "AjoutObjConcern",
-          _("Pick all object instances"),
-          _("Pick all instances of the specified object(s). When you "
-            "pick all instances, "
+          _("Pick all objects"),
+          _("Pick all the specified objects. When you pick all objects, "
            "the next conditions and actions of this event work on all "
            "of them."),
-          _("Pick all instances of _PARAM1_"),
+          _("Pick all _PARAM1_ objects"),
          _("Objects"),
          "res/conditions/add24.png",
          "res/conditions/add.png")
@@ -1741,15 +1655,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .MarkAsAdvanced();

  extension
-      .AddCondition("AjoutHasard",
-                    _("Pick a random object"),
-                    _("Pick one instance from all the specified objects. When "
-                      "an instance is picked, the next conditions and actions "
-                      "of this event work only on that object instance."),
-                    _("Pick a random _PARAM1_"),
-                    _("Objects"),
-                    "res/conditions/ajouthasard24.png",
-                    "res/conditions/ajouthasard.png")
+      .AddCondition(
+          "AjoutHasard",
+          _("Pick a random object"),
+          _("Pick one object from all the specified objects. When an object "
+            "is picked, the next conditions and actions of this event work "
+            "only on that object."),
+          _("Pick a random _PARAM1_"),
+          _("Objects"),
+          "res/conditions/ajouthasard24.png",
+          "res/conditions/ajouthasard.png")
      .AddCodeOnlyParameter("objectsContext", "")
      .AddParameter("objectList", _("Object"))
      .MarkAsSimple();
@@ -1758,9 +1673,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddCondition(
          "PickNearest",
          _("Pick nearest object"),
-          _("Pick the instance of this object that is nearest to the specified "
-            "position. If the condition is inverted, the instance farthest "
-            "from the specified position is picked instead."),
+          _("Pick the object of this type that is nearest to the specified "
+            "position. If the condition is inverted, the object farthest from "
+            "the specified position is picked instead."),
          _("Pick the _PARAM0_ that is nearest to _PARAM1_;_PARAM2_"),
          _("Objects"),
          "res/conditions/distance24.png",
@@ -1838,7 +1753,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "",
                    true)
      .SetDefaultValue("no")
-      .SetHelpPath("/all-features/collisions/")
      .MarkAsSimple();

  extension
@@ -1901,7 +1815,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
@@ -1933,7 +1846,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/FileExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/FileExtension.cpp
@@ -42,17 +42,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
  extension
      .AddAction(
          "LoadFile",
-          _("Manually preload a storage in memory"),
-          _("Forces the specified storage to be loaded and kept in "
-            "memory, allowing faster reads/writes. "
-            "However, it requires manual management: if you use this "
-            "action, you *must* also unload the storage manually when "
-            "it's no longer needed to ensure data is persisted.\n\n"
-            "Unless you have a specific performance need, avoid using this "
-            "action. The system already handles loading/unloading "
-            "automatically."),
-          _("Load data storage _PARAM0_ in memory"),
-          _("Advanced"),
+          _("Load a storage in memory"),
+          _("This action loads the specified storage in memory, so you can "
+            "write and read it.\nYou can open and write without using this "
+            "action, but it will be slower.\nIf you use this action, do not "
+            "forget to unload the storage from memory."),
+          _("Load storage _PARAM0_ in memory"),
+          "",
          "res/actions/fichier24.png",
          "res/actions/fichier.png")
      .AddParameter("string", _("Storage name"))
@@ -60,11 +56,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(

  extension
      .AddAction("UnloadFile",
-                 _("Manually unload and persist a storage"),
-                 _("Close the specified storage previously loaded "
+                 _("Close a storage"),
+                 _("This action closes the structured data previously loaded "
                   "in memory, saving all changes made."),
-                 _("Unload and persist data storage _PARAM0_"),
-                 _("Advanced"),
+                 _("Close structured data _PARAM0_"),
+                 "",
                 "res/actions/fichier24.png",
                 "res/actions/fichier.png")
      .AddParameter("string", _("Storage name"))
--- 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,47 +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. This stays true as long as "
-            "the key is held down. To check if a key was pressed during "
-            "the frame, use \"Key just pressed\" instead."),
-          _("_PARAM1_ key is pressed"),
-          "",
-          "res/conditions/keyboard24.png",
-          "res/conditions/keyboard.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("keyboardKey", _("Key to check"))
-      .MarkAsSimple();
-
-  extension
-      .AddCondition("KeyFromTextJustPressed",
-                    _("Key just pressed"),
-                    _("Check if a key was just pressed."),
-                    _("_PARAM1_ key was just pressed"),
+      .AddCondition("KeyFromTextPressed",
+                    _("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",
@@ -100,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",
--- 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,7 +30,7 @@ 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"))
@@ -646,12 +645,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/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.h
+++ b/Core/GDCore/Extensions/Metadata/BehaviorMetadata.h
@@ -298,19 +298,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    return *this;
  }

-  /**
-   * Check if the behavior can be used on objects from event-based objects.
-   */
-  bool IsRelevantForChildObjects() const { return isRelevantForChildObjects; }
-
-  /**
-   * Set that behavior can't be used on objects from event-based objects.
-   */
-  BehaviorMetadata &MarkAsIrrelevantForChildObjects() {
-    isRelevantForChildObjects = false;
-    return *this;
-  }
-
  QuickCustomization::Visibility GetQuickCustomizationVisibility() const {
    return quickCustomizationVisibility;
  }
@@ -406,7 +393,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
  mutable std::vector<gd::String> requiredBehaviors;
  bool isPrivate = false;
  bool isHidden = false;
-  bool isRelevantForChildObjects = true;
  gd::String openFullEditorLabel;
  QuickCustomization::Visibility quickCustomizationVisibility = QuickCustomization::Visibility::Default;

--- a/Core/GDCore/Extensions/Metadata/MetadataProvider.h
+++ b/Core/GDCore/Extensions/Metadata/MetadataProvider.h
@@ -277,10 +277,6 @@ class GD_CORE_API MetadataProvider {
    return &metadata == &badObjectInfo;
  }

-  static bool IsBadEffectMetadata(const gd::EffectMetadata& metadata) {
-    return &metadata == &badEffectMetadata;
-  }
-
  virtual ~MetadataProvider();

 private:
--- 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 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(){};

  /**
@@ -365,7 +360,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;
--- a/Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp
+++ b/Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp
@@ -33,8 +33,7 @@ void ParameterMetadataTools::ParametersToObjectsContainer(
    const auto& parameter = parameters.GetParameter(i);
    if (parameter.GetName().empty()) continue;

-    auto &valueTypeMetadata = parameter.GetValueTypeMetadata();
-    if (valueTypeMetadata.IsObject()) {
+    if (gd::ParameterMetadata::IsObject(parameter.GetType())) {
      const gd::String& objectName = parameter.GetName();
      const gd::String& objectType = parameter.GetExtraInfo();
      allObjectNames.insert(objectName);
@@ -69,7 +68,7 @@ void ParameterMetadataTools::ParametersToObjectsContainer(
      // Search "lastObjectName" in the codebase for other place where this
      // convention is enforced.
      lastObjectName = objectName;
-    } else if (valueTypeMetadata.IsBehavior()) {
+    } else if (gd::ParameterMetadata::IsBehavior(parameter.GetType())) {
      if (!lastObjectName.empty()) {
        if (outputObjectsContainer.HasObjectNamed(lastObjectName)) {
          const gd::String& behaviorName = parameter.GetName();
@@ -194,8 +193,7 @@ void ParameterMetadataTools::IterateOverParameters(
      [&fn](const gd::ParameterMetadata& parameterMetadata,
            const gd::Expression& parameterValue,
            size_t parameterIndex,
-            const gd::String& lastObjectName,
-            size_t lastObjectIndex) {
+            const gd::String& lastObjectName) {
        fn(parameterMetadata, parameterValue, lastObjectName);
      });
 }
@@ -206,10 +204,8 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
    std::function<void(const gd::ParameterMetadata& parameterMetadata,
                       const gd::Expression& parameterValue,
                       size_t parameterIndex,
-                       const gd::String& lastObjectName,
-                       size_t lastObjectIndex)> fn) {
+                       const gd::String& lastObjectName)> fn) {
  gd::String lastObjectName = "";
-  size_t lastObjectIndex = 0;
  for (std::size_t pNb = 0; pNb < parametersMetadata.GetParametersCount();
       ++pNb) {
    const gd::ParameterMetadata &parameterMetadata =
@@ -221,17 +217,15 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
            ? Expression(parameterMetadata.GetDefaultValue())
            : parameterValue;

-    fn(parameterMetadata, parameterValueOrDefault, pNb, lastObjectName, lastObjectIndex);
+    fn(parameterMetadata, parameterValueOrDefault, pNb, lastObjectName);

    // 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.
-    if (gd::ParameterMetadata::IsObject(parameterMetadata.GetType())) {
+    if (gd::ParameterMetadata::IsObject(parameterMetadata.GetType()))
      lastObjectName = parameterValueOrDefault.GetPlainString();
-      lastObjectIndex = pNb;
-    }
  }
 }

--- a/Core/GDCore/Extensions/Metadata/ParameterMetadataTools.h
+++ b/Core/GDCore/Extensions/Metadata/ParameterMetadataTools.h
@@ -64,8 +64,7 @@ class GD_CORE_API ParameterMetadataTools {
      std::function<void(const gd::ParameterMetadata& parameterMetadata,
                         const gd::Expression& parameterValue,
                         size_t parameterIndex,
-                         const gd::String& lastObjectName,
-                         size_t lastObjectIndex)> fn);
+                         const gd::String& lastObjectName)> fn);

  /**
   * Iterate over the parameters of a FunctionCallNode.
--- a/Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp
+++ b/Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp
@@ -79,8 +79,6 @@ 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::ConvertPropertyTypeToValueType(
    const gd::String &propertyType) {
@@ -96,12 +94,8 @@ const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
    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
@@ -129,7 +129,7 @@ class GD_CORE_API ValueTypeMetadata {
  }

  /**
-   * \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.
@@ -148,19 +148,6 @@ class GD_CORE_API ValueTypeMetadata {
    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";
-  }
-
  /**
   * \brief Return true if the type is a variable but from a specific scope
   * (scene, project or object). In new code, prefer to use the more generic "variable"
@@ -225,20 +212,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" ||
@@ -334,8 +316,6 @@ class GD_CORE_API ValueTypeMetadata {
  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;
 };

 }  // 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);
@@ -244,10 +244,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 +353,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 +386,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 +406,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 +423,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 +440,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,8 +468,7 @@ PlatformExtension::GetAllStrExpressions() {
  return strExpressionsInfos;
 }

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

@@ -474,8 +476,7 @@ std::vector<gd::DependencyMetadata>& PlatformExtension::GetAllDependencies() {
  return extensionDependenciesMetadata;
 }

-const std::vector<gd::SourceFileMetadata>&
-PlatformExtension::GetAllSourceFiles() const {
+const std::vector<gd::SourceFileMetadata>& PlatformExtension::GetAllSourceFiles() const {
  return extensionSourceFilesMetadata;
 }

@@ -614,6 +615,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,62 +791,41 @@ 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) {
+gd::String PlatformExtension::GetExtensionFromFullObjectType(const gd::String& type) {
  const auto separatorIndex =
      type.find(PlatformExtension::GetNamespaceSeparator());
  if (separatorIndex == std::string::npos) {
@@ -823,8 +834,7 @@ gd::String PlatformExtension::GetExtensionFromFullObjectType(
  return type.substr(0, separatorIndex);
 }

-gd::String PlatformExtension::GetObjectNameFromFullObjectType(
-    const gd::String& type) {
+gd::String PlatformExtension::GetObjectNameFromFullObjectType(const gd::String& type) {
  const auto separatorIndex =
      type.find(PlatformExtension::GetNamespaceSeparator());
  if (separatorIndex == std::string::npos) {
--- a/Core/GDCore/Extensions/PlatformExtension.h
+++ b/Core/GDCore/Extensions/PlatformExtension.h
@@ -13,11 +13,11 @@
 #include "GDCore/CommonTools.h"
 #include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
 #include "GDCore/Extensions/Metadata/DependencyMetadata.h"
+#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
 #include "GDCore/Extensions/Metadata/EffectMetadata.h"
 #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"
@@ -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
@@ -634,6 +640,12 @@ 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.
@@ -651,10 +663,6 @@ class GD_CORE_API PlatformExtension {
  static gd::String GetBehaviorFullType(const gd::String& extensionName,
                                        const gd::String& behaviorName);

-  static gd::String GetExtensionFromFullBehaviorType(const gd::String& type);
-
-  static gd::String GetBehaviorNameFromFullBehaviorType(const gd::String& type);
-
  static gd::String GetObjectEventsFunctionFullType(
      const gd::String& extensionName,
      const gd::String& objectName,
--- a/Core/GDCore/IDE/Events/BehaviorParametersFiller.cpp
+++ b/Core/GDCore/IDE/Events/BehaviorParametersFiller.cpp
@@ -29,7 +29,7 @@ bool BehaviorParametersFiller::DoVisitInstruction(gd::Instruction &instruction,
      instruction.GetParameters(), metadata.GetParameters(),
      [&](const gd::ParameterMetadata &parameterMetadata,
          const gd::Expression &parameterValue, size_t parameterIndex,
-          const gd::String &lastObjectName, size_t lastObjectIndex) {
+          const gd::String &lastObjectName) {
        if (parameterMetadata.GetValueTypeMetadata().IsBehavior() &&
            parameterValue.GetPlainString().length() == 0) {

--- a/Core/GDCore/IDE/Events/EventsBehaviorRenamer.cpp
+++ b/Core/GDCore/IDE/Events/EventsBehaviorRenamer.cpp
@@ -108,10 +108,12 @@ bool EventsBehaviorRenamer::DoVisitInstruction(gd::Instruction& instruction,
                                   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, size_t lastObjectIndex) {
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [&](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          size_t parameterIndex,
+          const gd::String& lastObjectName) {
        const gd::String& type = parameterMetadata.GetType();

        if (gd::ParameterMetadata::IsBehavior(type)) {
--- a/Core/GDCore/IDE/Events/EventsParameterReplacer.cpp
+++ b/Core/GDCore/IDE/Events/EventsParameterReplacer.cpp
@@ -141,7 +141,7 @@ class GD_CORE_API ExpressionParameterReplacer
          parameterMetadata->GetValueTypeMetadata();
      if (gd::EventsParameterReplacer::CanContainParameter(
              parameterTypeMetadata)) {
-        isParentTypeAVariable = parameterTypeMetadata.IsVariableOnly();
+        isParentTypeAVariable = parameterTypeMetadata.IsVariable();
        parameter->Visit(*this);
      }
    }
@@ -183,10 +183,12 @@ bool EventsParameterReplacer::DoVisitInstruction(gd::Instruction& instruction,
                                   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, size_t lastObjectIndex) {
+      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;
@@ -195,7 +197,7 @@ bool EventsParameterReplacer::DoVisitInstruction(gd::Instruction& instruction,
        if (node) {
          ExpressionParameterReplacer renamer(
              platform, GetProjectScopedContainers(),
-              parameterMetadata.GetValueTypeMetadata().IsVariableOnly(),
+              parameterMetadata.GetValueTypeMetadata().IsVariable(),
              oldToNewPropertyNames);
          node->Visit(renamer);

@@ -219,7 +221,7 @@ bool EventsParameterReplacer::DoVisitEventExpression(
  if (node) {
    ExpressionParameterReplacer renamer(
        platform, GetProjectScopedContainers(),
-        metadata.GetValueTypeMetadata().IsVariableOnly(), oldToNewPropertyNames);
+        metadata.GetValueTypeMetadata().IsVariable(), oldToNewPropertyNames);
    node->Visit(renamer);

    if (renamer.HasDoneRenaming()) {
--- a/Core/GDCore/IDE/Events/EventsPropertyReplacer.cpp
+++ b/Core/GDCore/IDE/Events/EventsPropertyReplacer.cpp
@@ -168,7 +168,7 @@ class GD_CORE_API ExpressionPropertyReplacer
          parameterMetadata->GetValueTypeMetadata();
      if (gd::EventsPropertyReplacer::CanContainProperty(
              parameterTypeMetadata)) {
-        isParentTypeAVariable = parameterTypeMetadata.IsVariableOnly();
+        isParentTypeAVariable = parameterTypeMetadata.IsVariable();
        parameter->Visit(*this);
      }
    }
@@ -217,10 +217,12 @@ bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
  bool shouldDeleteInstruction = false;

  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(), metadata.GetParameters(),
-      [&](const gd::ParameterMetadata &parameterMetadata,
-          const gd::Expression &parameterValue, size_t parameterIndex,
-          const gd::String &lastObjectName, size_t lastObjectIndex) {
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [&](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          size_t parameterIndex,
+          const gd::String& lastObjectName) {
        if (!gd::EventsPropertyReplacer::CanContainProperty(
          parameterMetadata.GetValueTypeMetadata())) {
          return;
@@ -229,7 +231,7 @@ bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
        if (node) {
          ExpressionPropertyReplacer renamer(
              platform, GetProjectScopedContainers(), targetPropertiesContainer,
-              parameterMetadata.GetValueTypeMetadata().IsVariableOnly(),
+              parameterMetadata.GetValueTypeMetadata().IsVariable(),
              oldToNewPropertyNames, removedPropertyNames);
          node->Visit(renamer);

@@ -255,7 +257,7 @@ bool EventsPropertyReplacer::DoVisitEventExpression(
  if (node) {
    ExpressionPropertyReplacer renamer(
        platform, GetProjectScopedContainers(), targetPropertiesContainer,
-        metadata.GetValueTypeMetadata().IsVariableOnly(), oldToNewPropertyNames,
+        metadata.GetValueTypeMetadata().IsVariable(), oldToNewPropertyNames,
        removedPropertyNames);
    node->Visit(renamer);

--- a/Core/GDCore/IDE/Events/EventsRefactorer.cpp
+++ b/Core/GDCore/IDE/Events/EventsRefactorer.cpp
@@ -334,7 +334,7 @@ private:
        instruction.GetParameters(), metadata.GetParameters(),
        [&](const gd::ParameterMetadata &parameterMetadata,
            const gd::Expression &parameterValue, size_t parameterIndex,
-            const gd::String &lastObjectName, size_t lastObjectIndex) {
+            const gd::String &lastObjectName) {
          if (!gd::EventsObjectReplacer::CanContainObject(
                  parameterMetadata.GetValueTypeMetadata())) {
            return;
--- a/Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.cpp
+++ b/Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.cpp
@@ -42,16 +42,18 @@ bool EventsVariableInstructionTypeSwitcher::DoVisitInstruction(gd::Instruction&
                                   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, size_t lastObjectIndex) {
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [&](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          size_t parameterIndex,
+          const gd::String& lastObjectName) {
        const gd::String& type = parameterMetadata.GetType();

        if (!gd::ParameterMetadata::IsExpression("variable", type) ||
            !gd::VariableInstructionSwitcher::IsSwitchableVariableInstruction(
                instruction.GetType())) {
-          return;
+                  return;
        }
        const auto variableName =
            gd::ExpressionVariableNameFinder::GetVariableName(
@@ -69,19 +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:
@@ -448,10 +448,12 @@ bool EventsVariableReplacer::DoVisitInstruction(gd::Instruction& instruction,
  bool shouldDeleteInstruction = false;

  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(), metadata.GetParameters(),
-      [&](const gd::ParameterMetadata &parameterMetadata,
-          const gd::Expression &parameterValue, size_t parameterIndex,
-          const gd::String &lastObjectName, size_t lastObjectIndex) {
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [&](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          size_t parameterIndex,
+          const gd::String& lastObjectName) {
        const gd::String& type = parameterMetadata.GetType();

        if (!gd::ParameterMetadata::IsExpression("variable", type) &&
--- 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
@@ -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);

@@ -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);

--- a/Core/GDCore/IDE/Events/ExpressionValidator.cpp
+++ b/Core/GDCore/IDE/Events/ExpressionValidator.cpp
@@ -460,12 +460,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 +493,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
@@ -203,12 +203,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 +216,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;

@@ -339,12 +336,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,19 +376,8 @@ 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(
@@ -401,10 +386,8 @@ private:
      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 +402,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 +476,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) {
--- 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/ProjectElementRenamer.cpp
+++ b/Core/GDCore/IDE/Events/ProjectElementRenamer.cpp
@@ -150,7 +150,7 @@ bool ProjectElementRenamer::DoVisitInstruction(gd::Instruction &instruction,
      instruction.GetParameters(), metadata.GetParameters(),
      [&](const gd::ParameterMetadata &parameterMetadata,
          const gd::Expression &parameterValue, size_t parameterIndex,
-          const gd::String &lastObjectName, size_t lastObjectIndex) {
+          const gd::String &lastObjectName) {
        if (parameterMetadata.GetType() == "layer") {
          if (parameterValue.GetPlainString().length() < 2) {
            // This is either the base layer or an invalid layer name.
--- 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"
@@ -103,72 +100,4 @@ void EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
  }
 }

-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.");
-  }
-  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);
-    }
-  }
-}
-
 }  // namespace gd
--- 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;
@@ -71,13 +68,5 @@ class GD_CORE_API EventsFunctionTools {
      const gd::EventsBasedObject& eventsBasedObject,
      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);
 };
 }  // namespace gd
--- a/Core/GDCore/IDE/ObjectVariableHelper.cpp
+++ b/Core/GDCore/IDE/ObjectVariableHelper.cpp
@@ -3,11 +3,9 @@
 * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
 * reserved. This project is released under the MIT License.
 */
-#include "ObjectVariableHelper.h"
+#include "GroupVariableHelper.h"

 #include "GDCore/IDE/WholeProjectRefactorer.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"
@@ -18,7 +16,7 @@

 namespace gd {

-void ObjectVariableHelper::FillAnyVariableBetweenObjects(
+void GroupVariableHelper::FillAnyVariableBetweenObjects(
    gd::ObjectsContainer &globalObjectsContainer,
    gd::ObjectsContainer &objectsContainer,
    const gd::ObjectGroup &objectGroup) {
@@ -67,7 +65,7 @@ void ObjectVariableHelper::FillAnyVariableBetweenObjects(
  }
 }

-gd::VariablesContainer ObjectVariableHelper::MergeVariableContainers(
+gd::VariablesContainer GroupVariableHelper::MergeVariableContainers(
    const gd::ObjectsContainersList &objectsContainersList,
    const gd::ObjectGroup &objectGroup) {
  gd::VariablesContainer mergedVariablesContainer;
@@ -115,7 +113,7 @@ gd::VariablesContainer ObjectVariableHelper::MergeVariableContainers(
  return mergedVariablesContainer;
 }

-void ObjectVariableHelper::FillMissingGroupVariablesToObjects(
+void GroupVariableHelper::FillMissingGroupVariablesToObjects(
    gd::ObjectsContainer &globalObjectsContainer,
    gd::ObjectsContainer &objectsContainer, const gd::ObjectGroup &objectGroup,
    const gd::SerializerElement &originalSerializedVariables) {
@@ -147,7 +145,7 @@ void ObjectVariableHelper::FillMissingGroupVariablesToObjects(
 // TODO Handle position changes for group variables.
 // We could try to change the order of object variables in a way that the next
 // call to MergeVariableContainers rebuild them in the same order.
-void ObjectVariableHelper::ApplyChangesToObjects(
+void GroupVariableHelper::ApplyChangesToObjects(
    gd::ObjectsContainer &globalObjectsContainer,
    gd::ObjectsContainer &objectsContainer,
    const gd::VariablesContainer &groupVariablesContainer,
@@ -174,7 +172,6 @@ void ObjectVariableHelper::ApplyChangesToObjects(
                                groupVariablesContainer.Get(variableName),
                                variablesContainer.Count());
    }
-    // TODO Check what happens if 2 variables exchange their names.
    for (const auto &pair : changeset.oldToNewVariableNames) {
      const gd::String &oldVariableName = pair.first;
      const gd::String &newVariableName = pair.second;
@@ -196,109 +193,4 @@ void ObjectVariableHelper::ApplyChangesToObjects(
  }
 }

-void ObjectVariableHelper::ApplyChangesToObjectInstances(
-    gd::VariablesContainer &objectVariablesContainer,
-    gd::InitialInstancesContainer &initialInstancesContainer,
-    const gd::String &objectName, const gd::VariablesChangeset &changeset) {
-  initialInstancesContainer.IterateOverInstances(
-      [&objectVariablesContainer, &objectName,
-       &changeset](gd::InitialInstance &instance) {
-        if (instance.GetObjectName() == objectName) {
-          auto &destinationVariablesContainer = instance.GetVariables();
-          for (const gd::String &variableName :
-               changeset.removedVariableNames) {
-            destinationVariablesContainer.Remove(variableName);
-          }
-          for (const gd::String &variableName : changeset.addedVariableNames) {
-            // Instance variables may already exist with another type.
-            if (destinationVariablesContainer.Has(variableName) &&
-                destinationVariablesContainer.Get(variableName).GetType() !=
-                    objectVariablesContainer.Get(variableName).GetType()) {
-              destinationVariablesContainer.Remove(variableName);
-            }
-          }
-          // TODO Check what happens if 2 variables exchange their names.
-          for (const auto &pair : changeset.oldToNewVariableNames) {
-            const gd::String &oldVariableName = pair.first;
-            const gd::String &newVariableName = pair.second;
-            if (destinationVariablesContainer.Has(newVariableName)) {
-              // It can happens if an instance already had the variable.
-              destinationVariablesContainer.Remove(oldVariableName);
-            } else {
-              destinationVariablesContainer.Rename(oldVariableName,
-                                                   newVariableName);
-            }
-          }
-          // Apply type changes
-          for (const gd::String &variableName :
-               changeset.valueChangedVariableNames) {
-            if (destinationVariablesContainer.Has(variableName) &&
-                destinationVariablesContainer.Get(variableName).GetType() !=
-                    objectVariablesContainer.Get(variableName).GetType()) {
-              destinationVariablesContainer.Remove(variableName);
-            }
-          }
-        }
-        return false;
-      });
-}
-
-void ObjectVariableHelper::ApplyChangesToVariants(
-    gd::EventsBasedObject &eventsBasedObject, const gd::String &objectName,
-    const gd::VariablesChangeset &changeset) {
-  auto &defaultVariablesContainer = eventsBasedObject.GetDefaultVariant()
-                                        .GetObjects()
-                                        .GetObject(objectName)
-                                        .GetVariables();
-  for (auto &variant : eventsBasedObject.GetVariants().GetInternalVector()) {
-    if (!variant->GetObjects().HasObjectNamed(objectName)) {
-      continue;
-    }
-    auto &object = variant->GetObjects().GetObject(objectName);
-    auto &variablesContainer = object.GetVariables();
-
-    for (const gd::String &variableName : changeset.removedVariableNames) {
-      variablesContainer.Remove(variableName);
-    }
-    for (const gd::String &variableName : changeset.addedVariableNames) {
-      if (variablesContainer.Has(variableName)) {
-        // It can happens if a child-object already had the variable but it was
-        // missing in other variant child-object.
-        continue;
-      }
-      variablesContainer.Insert(variableName,
-                                defaultVariablesContainer.Get(variableName),
-                                variablesContainer.Count());
-    }
-    // TODO Check what happens if 2 variables exchange their names.
-    for (const auto &pair : changeset.oldToNewVariableNames) {
-      const gd::String &oldVariableName = pair.first;
-      const gd::String &newVariableName = pair.second;
-      if (variablesContainer.Has(newVariableName)) {
-        // It can happens if a child-object already had the variable but it was
-        // missing in other variant child-object.
-        variablesContainer.Remove(oldVariableName);
-      } else {
-        variablesContainer.Rename(oldVariableName, newVariableName);
-      }
-    }
-    // Apply type changes
-    for (const gd::String &variableName : changeset.valueChangedVariableNames) {
-      size_t index = variablesContainer.GetPosition(variableName);
-
-      if (variablesContainer.Has(variableName) &&
-          variablesContainer.Get(variableName).GetType() !=
-              defaultVariablesContainer.Get(variableName).GetType()) {
-        variablesContainer.Remove(variableName);
-        variablesContainer.Insert(
-            variableName, defaultVariablesContainer.Get(variableName), index);
-      }
-    }
-
-    gd::ObjectVariableHelper::ApplyChangesToObjectInstances(
-        variablesContainer, variant->GetInitialInstances(), objectName,
-        changeset);
-  }
-}
-
 } // namespace gd
--- a/Core/GDCore/IDE/ObjectVariableHelper.h
+++ b/Core/GDCore/IDE/ObjectVariableHelper.h
@@ -8,8 +8,6 @@
 #include "GDCore/Project/VariablesContainer.h"

 namespace gd {
-class EventsBasedObject;
-class InitialInstancesContainer;
 class ObjectsContainersList;
 class ObjectsContainer;
 class ObjectGroup;
@@ -24,7 +22,7 @@ namespace gd {
 *
 * This is used by the object group variable editor.
 */
-class GD_CORE_API ObjectVariableHelper {
+class GD_CORE_API GroupVariableHelper {
 public:
  /**
   * Copy every variable from every object of the group to the other objects
@@ -54,7 +52,7 @@ public:
   * Objects can be added during the group edition and may not necessarily have
   * all the variables initially shared by the group.
   *
-   * \see gd::ObjectVariableHelper::MergeVariableContainers
+   * \see gd::GroupVariableHelper::MergeVariableContainers
   */
  static void FillMissingGroupVariablesToObjects(
      gd::ObjectsContainer &globalObjectsContainer,
@@ -72,22 +70,6 @@ public:
                        const gd::VariablesContainer &groupVariablesContainer,
                        const gd::ObjectGroup &objectGroup,
                        const gd::VariablesChangeset &changeset);
-
-  /**
-   * @brief Apply the changes done on an object to all its instances.
-   */
-  static void ApplyChangesToObjectInstances(
-      gd::VariablesContainer &objectVariablesContainer,
-      gd::InitialInstancesContainer &initialInstancesContainer,
-      const gd::String &objectName, const gd::VariablesChangeset &changeset);
-
-  /**
-   * @brief Apply the changes done on events-based object child to all its
-   * variants.
-   */
-  static void ApplyChangesToVariants(gd::EventsBasedObject &eventsBasedObject,
-                                     const gd::String &objectName,
-                                     const gd::VariablesChangeset &changeset);
 };

-} // namespace gd
+} // namespace gd
--- a/Core/GDCore/IDE/ObjectAssetSerializer.cpp
+++ b/Core/GDCore/IDE/ObjectAssetSerializer.cpp
@@ -17,8 +17,6 @@
 #include "GDCore/IDE/Project/ResourcesRenamer.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/CustomBehavior.h"
-#include "GDCore/Project/CustomObjectConfiguration.h"
-#include "GDCore/Project/EventsBasedObjectVariant.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
@@ -62,6 +60,9 @@ void ObjectAssetSerializer::SerializeTo(
  element.SetAttribute("version", "");
  element.SetIntAttribute("animationsCount", 1);
  element.SetIntAttribute("maxFramesCount", 1);
+  // TODO Find the right object dimensions.
+  element.SetIntAttribute("width", 0);
+  element.SetIntAttribute("height", 0);
  SerializerElement &authorsElement = element.AddChild("authors");
  authorsElement.ConsiderAsArrayOf("author");
  SerializerElement &tagsElement = element.AddChild("tags");
@@ -74,28 +75,6 @@ void ObjectAssetSerializer::SerializeTo(

  cleanObject->SerializeTo(objectAssetElement.AddChild("object"));

-  double width = 0;
-  double height = 0;
-  std::unordered_set<gd::String> alreadyUsedVariantIdentifiers;
-  if (project.HasEventsBasedObject(object.GetType())) {
-    SerializerElement &variantsElement =
-        objectAssetElement.AddChild("variants");
-    variantsElement.ConsiderAsArrayOf("variant");
-
-    const auto *variant = ObjectAssetSerializer::GetVariant(project, object);
-    if (variant) {
-      width = variant->GetAreaMaxX() - variant->GetAreaMinX();
-      height = variant->GetAreaMaxY() - variant->GetAreaMinY();
-    }
-
-    gd::ObjectAssetSerializer::SerializeUsedVariantsTo(
-        project, object, variantsElement, alreadyUsedVariantIdentifiers);
-  }
-
-  // TODO Find the right object dimensions when their is no variant.
-  element.SetIntAttribute("width", width);
-  element.SetIntAttribute("height", height);
-
  SerializerElement &resourcesElement =
      objectAssetElement.AddChild("resources");
  resourcesElement.ConsiderAsArrayOf("resource");
@@ -114,24 +93,14 @@ void ObjectAssetSerializer::SerializeTo(
    resourceElement.SetAttribute("name", resource.GetName());
  }

-  std::unordered_set<gd::String> usedExtensionNames;
-  usedExtensionNames.insert(extensionName);
-  for (auto &usedVariantIdentifier : alreadyUsedVariantIdentifiers) {
-    usedExtensionNames.insert(PlatformExtension::GetExtensionFromFullObjectType(
-        usedVariantIdentifier));
-  }
  SerializerElement &requiredExtensionsElement =
      objectAssetElement.AddChild("requiredExtensions");
  requiredExtensionsElement.ConsiderAsArrayOf("requiredExtension");
-  for (auto &usedExtensionName : usedExtensionNames) {
-    if (project.HasEventsFunctionsExtensionNamed(usedExtensionName)) {
-      auto &extension = project.GetEventsFunctionsExtension(usedExtensionName);
-      SerializerElement &requiredExtensionElement =
-          requiredExtensionsElement.AddChild("requiredExtension");
-      requiredExtensionElement.SetAttribute("extensionName", usedExtensionName);
-      requiredExtensionElement.SetAttribute("extensionVersion",
-                                            extension.GetVersion());
-    }
+  if (project.HasEventsFunctionsExtensionNamed(extensionName)) {
+    SerializerElement &requiredExtensionElement =
+        requiredExtensionsElement.AddChild("requiredExtension");
+    requiredExtensionElement.SetAttribute("extensionName", extensionName);
+    requiredExtensionElement.SetAttribute("extensionVersion", "1.0.0");
  }

  // TODO This can be removed when the asset script no longer require it.
@@ -139,59 +108,4 @@ void ObjectAssetSerializer::SerializeTo(
      objectAssetElement.AddChild("customization");
  customizationElement.ConsiderAsArrayOf("empty");
 }
-
-void ObjectAssetSerializer::SerializeUsedVariantsTo(
-    gd::Project &project, const gd::Object &object,
-    SerializerElement &variantsElement,
-    std::unordered_set<gd::String> &alreadyUsedVariantIdentifiers) {
-  const auto *variant = ObjectAssetSerializer::GetVariant(project, object);
-  if (!variant) {
-    return;
-  }
-  const auto &variantIdentifier =
-      object.GetType() + gd::PlatformExtension::GetNamespaceSeparator() +
-      variant->GetName();
-  auto insertResult = alreadyUsedVariantIdentifiers.insert(variantIdentifier);
-  if (!insertResult.second) {
-    return;
-  }
-  SerializerElement &pairElement = variantsElement.AddChild("variant");
-  pairElement.SetAttribute("objectType", object.GetType());
-  SerializerElement &variantElement = pairElement.AddChild("variant");
-  variant->SerializeTo(variantElement);
-
-  for (auto &object : variant->GetObjects().GetObjects()) {
-    gd::ObjectAssetSerializer::SerializeUsedVariantsTo(
-        project, *object, variantsElement, alreadyUsedVariantIdentifiers);
-  }
-}
-
-const gd::EventsBasedObjectVariant *
-ObjectAssetSerializer::GetVariant(gd::Project &project,
-                                  const gd::Object &object) {
-  if (!project.HasEventsBasedObject(object.GetType())) {
-    return nullptr;
-  }
-  const auto &eventsBasedObject =
-      project.GetEventsBasedObject(object.GetType());
-  const auto &variants = eventsBasedObject.GetVariants();
-  const auto *customObjectConfiguration =
-      dynamic_cast<const gd::CustomObjectConfiguration *>(
-          &object.GetConfiguration());
-  const auto &variantName = customObjectConfiguration->GetVariantName();
-  if (!variants.HasVariantNamed(variantName) &&
-      (customObjectConfiguration
-           ->IsMarkedAsOverridingEventsBasedObjectChildrenConfiguration() ||
-       customObjectConfiguration
-           ->IsForcedToOverrideEventsBasedObjectChildrenConfiguration())) {
-    return nullptr;
-  }
-  const auto &variantIdentifier =
-      object.GetType() + gd::PlatformExtension::GetNamespaceSeparator() +
-      variantName;
-  const auto &variant = variants.HasVariantNamed(variantName)
-                            ? variants.GetVariant(variantName)
-                            : eventsBasedObject.GetDefaultVariant();
-  return &variant;
-}
 } // namespace gd
--- a/Core/GDCore/IDE/ObjectAssetSerializer.h
+++ b/Core/GDCore/IDE/ObjectAssetSerializer.h
@@ -6,7 +6,6 @@
 #pragma once
 #include <map>
 #include <vector>
-#include <unordered_set>

 #include "GDCore/String.h"

@@ -21,7 +20,6 @@ class InitialInstance;
 class SerializerElement;
 class EffectsContainer;
 class AbstractFileSystem;
-class EventsBasedObjectVariant;
 } // namespace gd

 namespace gd {
@@ -54,13 +52,6 @@ private:
  ObjectAssetSerializer(){};

  static gd::String GetObjectExtensionName(const gd::Object &object);
-
-  static void SerializeUsedVariantsTo(
-      gd::Project &project, const gd::Object &object,
-      SerializerElement &variantsElement,
-      std::unordered_set<gd::String> &alreadyUsedVariantIdentifiers);
-
-  static const gd::EventsBasedObjectVariant* GetVariant(gd::Project &project, const gd::Object &object);
 };

 } // namespace gd
--- a/Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp
+++ b/Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp
@@ -227,11 +227,12 @@ bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instructi
                                    platform, instruction.GetType());

  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(), metadata.GetParameters(),
-      [this, &instruction](
-          const gd::ParameterMetadata &parameterMetadata,
-          const gd::Expression &parameterExpression, size_t parameterIndex,
-          const gd::String &lastObjectName, size_t lastObjectIndex) {
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [this, &instruction](const gd::ParameterMetadata& parameterMetadata,
+                            const gd::Expression& parameterExpression,
+                            size_t parameterIndex,
+                            const gd::String& lastObjectName) {
        const String& parameterValue = parameterExpression.GetPlainString();
        if (parameterMetadata.GetType() == "fontResource") {
          gd::String updatedParameterValue = parameterValue;
--- a/Core/GDCore/IDE/ProjectBrowserHelper.cpp
+++ b/Core/GDCore/IDE/ProjectBrowserHelper.cpp
@@ -39,22 +39,6 @@ void ProjectBrowserHelper::ExposeProjectEvents(
  }
 }

-void ProjectBrowserHelper::ExposeProjectEvents(
-    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) {
-  // See also gd::ResourceExposer::ExposeWholeProjectResources
-  // for a method that traverses the whole project (this time for resources)
-  // and ExposeProjectEffects (this time for effects).
-
-  ExposeProjectEventsWithoutExtensions(project, worker);
-
-  // Add events based extensions
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, worker);
-  }
-}
-
 void ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(
    gd::Project& project, gd::ArbitraryEventsWorker& worker) {
  // Add layouts events
@@ -67,28 +51,6 @@ void ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(
  }
 }

-void ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(
-    gd::Project& project, gd::ArbitraryEventsWorkerWithContext& worker) {
-  // Add layouts events
-  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
-    auto &layout = project.GetLayout(s);
-    auto projectScopedContainers =
-      gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
-    worker.Launch(layout.GetEvents(), projectScopedContainers);
-  }
-  // Add external events events
-  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
-    const auto &externalEvents = project.GetExternalEvents(s);
-    const gd::String &associatedLayout = externalEvents.GetAssociatedLayout();
-    if (project.HasLayoutNamed(associatedLayout)) {
-      auto &layout = project.GetLayout(associatedLayout);
-      auto projectScopedContainers =
-        gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
-      worker.Launch(project.GetExternalEvents(s).GetEvents(), projectScopedContainers);
-    }
-  }
-}
-
 void ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
    gd::Project &project, gd::Layout &layout,
    gd::ArbitraryEventsWorker &worker) {
@@ -149,12 +111,43 @@ void ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(
  }
 }

+void ProjectBrowserHelper::ExposeProjectEvents(
+    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) {
+  // See also gd::ResourceExposer::ExposeWholeProjectResources
+  // for a method that traverses the whole project (this time for resources)
+  // and ExposeProjectEffects (this time for effects).
+
+  // Add layouts events
+  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
+    auto &layout = project.GetLayout(s);
+    auto projectScopedContainers =
+      gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
+    worker.Launch(layout.GetEvents(), projectScopedContainers);
+  }
+  // Add external events events
+  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
+    const auto &externalEvents = project.GetExternalEvents(s);
+    const gd::String &associatedLayout = externalEvents.GetAssociatedLayout();
+    if (project.HasLayoutNamed(associatedLayout)) {
+      auto &layout = project.GetLayout(associatedLayout);
+      auto projectScopedContainers =
+        gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
+      worker.Launch(project.GetExternalEvents(s).GetEvents(), projectScopedContainers);
+    }
+  }
+  // Add events based extensions
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, worker);
+  }
+}
+
 void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
    gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
    gd::ArbitraryEventsWorker &worker) {
    // Add (free) events functions
-    for (auto &&eventsFunction :
-         eventsFunctionsExtension.GetEventsFunctions().GetInternalVector()) {
+    for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
      worker.Launch(eventsFunction->GetEvents());
    }

@@ -176,18 +169,13 @@ void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
    gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
    gd::ArbitraryEventsWorkerWithContext &worker) {
    // Add (free) events functions
-    for (auto &&eventsFunction :
-         eventsFunctionsExtension.GetEventsFunctions().GetInternalVector()) {
+    for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
      gd::ObjectsContainer parameterObjectsContainer(
          gd::ObjectsContainer::SourceType::Function);
-    gd::VariablesContainer parameterVariablesContainer(
-        gd::VariablesContainer::SourceType::Parameters);
-    gd::VariablesContainer propertyVariablesContainer(
-        gd::VariablesContainer::SourceType::Properties);
      auto projectScopedContainers = gd::ProjectScopedContainers::
          MakeNewProjectScopedContainersForFreeEventsFunction(
              project, eventsFunctionsExtension, *eventsFunction,
-              parameterObjectsContainer, parameterVariablesContainer);
+              parameterObjectsContainer);

      worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
    }
@@ -219,32 +207,15 @@ void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
    gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
    const gd::EventsBasedBehavior &eventsBasedBehavior,
    gd::ArbitraryEventsWorkerWithContext &worker) {
-  gd::VariablesContainer propertyVariablesContainer(
-      gd::VariablesContainer::SourceType::Properties);
-  gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
-    project, eventsFunctionsExtension,
-    eventsBasedBehavior,
-    propertyVariablesContainer,
-    worker);
-}
-
-void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
-    gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedBehavior &eventsBasedBehavior,
-    gd::VariablesContainer &propertyVariablesContainer,
-    gd::ArbitraryEventsWorkerWithContext &worker) {
  auto &behaviorEventsFunctions = eventsBasedBehavior.GetEventsFunctions();
  for (auto &&eventsFunction : behaviorEventsFunctions.GetInternalVector()) {

    gd::ObjectsContainer parameterObjectsContainers(
        gd::ObjectsContainer::SourceType::Function);
-    gd::VariablesContainer parameterVariablesContainer(
-        gd::VariablesContainer::SourceType::Parameters);
    auto projectScopedContainers = gd::ProjectScopedContainers::
        MakeNewProjectScopedContainersForBehaviorEventsFunction(
            project, eventsFunctionsExtension, eventsBasedBehavior,
-            *eventsFunction, parameterObjectsContainers,
-            parameterVariablesContainer, propertyVariablesContainer);
+            *eventsFunction, parameterObjectsContainers);

    worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
  }
@@ -264,31 +235,15 @@ void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
    const gd::EventsBasedObject &eventsBasedObject,
    gd::ArbitraryEventsWorkerWithContext &worker) {
-  gd::VariablesContainer propertyVariablesContainer(
-      gd::VariablesContainer::SourceType::Properties);
-  gd::ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-      project, eventsFunctionsExtension, eventsBasedObject,
-      propertyVariablesContainer, worker);
-}
-
-void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-    gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedObject &eventsBasedObject,
-    gd::VariablesContainer &propertyVariablesContainer,
-    gd::ArbitraryEventsWorkerWithContext &worker) {
  auto &objectEventsFunctions = eventsBasedObject.GetEventsFunctions();
  for (auto &&eventsFunction : objectEventsFunctions.GetInternalVector()) {

    gd::ObjectsContainer parameterObjectsContainers(
        gd::ObjectsContainer::SourceType::Function);
-    gd::VariablesContainer parameterVariablesContainer(
-        gd::VariablesContainer::SourceType::Parameters);
    auto projectScopedContainers = gd::ProjectScopedContainers::
        MakeNewProjectScopedContainersForObjectEventsFunction(
            project, eventsFunctionsExtension, eventsBasedObject,
-            *eventsFunction, parameterObjectsContainers,
-            parameterVariablesContainer, propertyVariablesContainer);
+            *eventsFunction, parameterObjectsContainers);

    worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
  }
@@ -314,12 +269,6 @@ void ProjectBrowserHelper::ExposeProjectObjects(
         eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
      auto eventsBasedObject = eventsBasedObjectUniquePtr.get();
      worker.Launch(eventsBasedObject->GetObjects());
-
-      for (auto &&variantUniquePtr :
-           eventsBasedObject->GetVariants().GetInternalVector()) {
-        auto variant = variantUniquePtr.get();
-        worker.Launch(variant->GetObjects());
-      }
    }
  }
 };
@@ -338,7 +287,7 @@ void ProjectBrowserHelper::ExposeProjectFunctions(
  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
       e++) {
    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    worker.Launch(eventsFunctionsExtension.GetEventsFunctions());
+    worker.Launch(eventsFunctionsExtension);

    for (auto &&eventsBasedBehavior :
         eventsFunctionsExtension.GetEventsBasedBehaviors()
--- a/Core/GDCore/IDE/ProjectBrowserHelper.h
+++ b/Core/GDCore/IDE/ProjectBrowserHelper.h
@@ -19,7 +19,6 @@ class ArbitraryEventsFunctionsWorker;
 class ArbitraryObjectsWorker;
 class ArbitraryEventBasedBehaviorsWorker;
 class ArbitraryBehaviorSharedDataWorker;
-class VariablesContainer;
 } // namespace gd

 namespace gd {
@@ -57,15 +56,6 @@ public:
  ExposeProjectEventsWithoutExtensions(gd::Project &project,
                                       gd::ArbitraryEventsWorker &worker);

-  /**
-   * \brief Call the specified worker on all events of the project (layout and
-   * external events) but not events from extensions.
-   *
-   * Only use this for stats.
-   */
-  static void ExposeProjectEventsWithoutExtensions(
-      gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker);
-
  /**
   * \brief Call the specified worker on all events of a layout and
   * its external events.
@@ -137,20 +127,6 @@ public:
      const gd::EventsBasedBehavior &eventsBasedBehavior,
      gd::ArbitraryEventsWorkerWithContext &worker);

-  /**
-   * \brief Call the specified worker on all events of the event-based
-   * behavior.
-   *
-   * This should be the preferred way to traverse all the events of an
-   * event-based behavior.
-   */
-  static void ExposeEventsBasedBehaviorEvents(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedBehavior &eventsBasedBehavior,
-      gd::VariablesContainer &propertyVariablesContainer,
-      gd::ArbitraryEventsWorkerWithContext &worker);
-
  /**
   * \brief Call the specified worker on all events of the event-based
   * object.
@@ -176,20 +152,6 @@ public:
      const gd::EventsBasedObject &eventsBasedObject,
      gd::ArbitraryEventsWorkerWithContext &worker);

-  /**
-   * \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.
-   */
-  static void ExposeEventsBasedObjectEvents(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedObject &eventsBasedObject,
-      gd::VariablesContainer &propertyVariablesContainer,
-      gd::ArbitraryEventsWorkerWithContext &worker);
-
  /**
   * \brief Call the specified worker on all ObjectContainers of the project
   * (global, layouts...)
--- a/Core/GDCore/IDE/ProjectStripper.cpp
+++ b/Core/GDCore/IDE/ProjectStripper.cpp
@@ -63,7 +63,7 @@ void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project &project) {
      eventsBasedObject.GetPropertyDescriptors().GetInternalVector().clear();
    }
    extension.GetEventsBasedBehaviors().Clear();
-    extension.GetEventsFunctions().ClearEventsFunctions();
+    extension.ClearEventsFunctions();
  }
 }

--- a/Core/GDCore/IDE/PropertyFunctionGenerator.cpp
+++ b/Core/GDCore/IDE/PropertyFunctionGenerator.cpp
@@ -42,9 +42,6 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
    const gd::NamedPropertyDescriptor &property, const gd::String &objectType,
    bool isBehavior, bool isSharedProperties) {
  auto &propertyName = property.GetName();
-  const auto &primitiveType = gd::ValueTypeMetadata::GetPrimitiveValueType(
-      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-          property.GetType()));
  auto &functionsContainer = eventsBasedEntity.GetEventsFunctions();
  gd::String capitalizedName = CapitalizeFirstLetter(property.GetName());
  gd::String setterName = "Set" + capitalizedName;
@@ -62,9 +59,9 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
      property.GetLabel().empty() ? property.GetName() : property.GetLabel();

  gd::String descriptionSubject =
-      (primitiveType == "boolean" ? "if " : "the ") +
+      (property.GetType() == "Boolean" ? "if " : "the ") +
      UnCapitalizeFirstLetter(propertyLabel) +
-      (isSharedProperties || primitiveType == "boolean"
+      (isSharedProperties || property.GetType() == "Boolean"
           ? "."
           : " of the object.") +
      (property.GetDescription().empty() ? ""
@@ -74,7 +71,19 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
             "objects using the behavior."
           : "");

+  gd::String propertyGetterName =
+      (isSharedProperties ? "SharedProperty" : "Property") + property.GetName();
+  gd::String getterType =
+      gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+          extension.GetName(), eventsBasedEntity.GetName(), propertyGetterName);
+  gd::String setterType =
+      gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+          extension.GetName(), eventsBasedEntity.GetName(),
+          "Set" + propertyGetterName);
+
  gd::String getterName = capitalizedName;
+  gd::String numberOrString =
+      property.GetType() == "Number" ? "Number" : "String";

  if (!functionsContainer.HasEventsFunctionNamed(getterName)) {
    auto &getter = functionsContainer.InsertNewEventsFunction(
@@ -90,7 +99,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
        .SetName(legacyExpressionType)
        .SetExtraInfo(GetStringifiedExtraInfo(property));
    getter.SetFullName(propertyLabel).SetGroup(functionGroupName);
-    if (primitiveType == "boolean") {
+    if (property.GetType() == "Boolean") {
      getter.SetFunctionType(gd::EventsFunction::Condition)
          .SetDescription("Check " + descriptionSubject)
          .SetSentence("_PARAM0_ " + UnCapitalizeFirstLetter(propertyLabel));
@@ -103,12 +112,13 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
    auto &event =
        dynamic_cast<gd::StandardEvent &>(getter.GetEvents().InsertNewEvent(
            project, "BuiltinCommonInstructions::Standard", 0));
-    if (primitiveType == "boolean") {
+    if (property.GetType() == "Boolean") {
      gd::Instruction condition;
-      condition.SetType("BooleanVariable");
-      condition.AddParameter(propertyName);
-      condition.AddParameter("True");
-      condition.AddParameter("");
+      condition.SetType(getterType);
+      condition.AddParameter("Object");
+      if (isBehavior) {
+        condition.AddParameter("Behavior");
+      }
      event.GetConditions().Insert(condition, 0);

      gd::Instruction action;
@@ -117,8 +127,6 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
      event.GetActions().Insert(action, 0);
    } else {
      gd::Instruction action;
-      gd::String numberOrString =
-          primitiveType == "number" ? "Number" : "String";
      action.SetType("SetReturn" + numberOrString);
      action.AddParameter(property.GetName());
      event.GetActions().Insert(action, 0);
@@ -128,7 +136,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
  if (!functionsContainer.HasEventsFunctionNamed(setterName)) {
    auto &setter = functionsContainer.InsertNewEventsFunction(
        setterName, functionsContainer.GetEventsFunctionsCount());
-    if (primitiveType == "boolean") {
+    if (property.GetType() == "Boolean") {
      setter.SetFunctionType(gd::EventsFunction::Action)
          .SetFullName(propertyLabel)
          .SetGroup(functionGroupName)
@@ -169,24 +177,26 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
      setter.SetGetterName(getterName);
    }

-    if (primitiveType == "boolean") {
+    if (property.GetType() == "Boolean") {
      {
        auto &event =
            dynamic_cast<gd::StandardEvent &>(setter.GetEvents().InsertNewEvent(
                project, "BuiltinCommonInstructions::Standard", 0));

        gd::Instruction condition;
-        condition.SetType("BooleanVariable");
-        condition.AddParameter("Value");
-        condition.AddParameter("True");
-        condition.AddParameter("");
+        condition.SetType("GetArgumentAsBoolean");
+        condition.AddParameter("\"Value\"");
        event.GetConditions().Insert(condition, 0);

        gd::Instruction action;
-        action.SetType("SetBooleanVariable");
-        action.AddParameter(propertyName);
-        action.AddParameter("True");
-        action.AddParameter("");
+        action.SetType(setterType);
+        action.AddParameter("Object");
+        if (isBehavior) {
+          action.AddParameter("Behavior");
+          action.AddParameter("yes");
+        } else {
+          action.AddParameter("yes");
+        }
        event.GetActions().Insert(action, 0);
      }
      {
@@ -195,17 +205,20 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
                project, "BuiltinCommonInstructions::Standard", 0));

        gd::Instruction condition;
-        condition.SetType("BooleanVariable");
-        condition.AddParameter("Value");
-        condition.AddParameter("False");
-        condition.AddParameter("");
+        condition.SetType("GetArgumentAsBoolean");
+        condition.AddParameter("\"Value\"");
+        condition.SetInverted(true);
        event.GetConditions().Insert(condition, 0);

        gd::Instruction action;
-        action.SetType("SetBooleanVariable");
-        action.AddParameter(propertyName);
-        action.AddParameter("False");
-        action.AddParameter("");
+        action.SetType(setterType);
+        action.AddParameter("Object");
+        if (isBehavior) {
+          action.AddParameter("Behavior");
+          action.AddParameter("no");
+        } else {
+          action.AddParameter("no");
+        }
        event.GetActions().Insert(action, 0);
      }
    } else {
@@ -214,11 +227,16 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
              project, "BuiltinCommonInstructions::Standard", 0));

      gd::Instruction action;
-      action.SetType(primitiveType == "number" ? "SetNumberVariable"
-                                               : "SetStringVariable");
-      action.AddParameter(propertyName);
-      action.AddParameter("=");
-      action.AddParameter("Value");
+      action.SetType(setterType);
+      action.AddParameter("Object");
+      if (isBehavior) {
+        action.AddParameter("Behavior");
+        action.AddParameter("=");
+        action.AddParameter("Value");
+      } else {
+        action.AddParameter("=");
+        action.AddParameter("Value");
+      }
      event.GetActions().Insert(action, 0);
    }
  }
@@ -227,11 +245,9 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
 bool PropertyFunctionGenerator::CanGenerateGetterAndSetter(
    const gd::AbstractEventsBasedEntity &eventsBasedEntity,
    const gd::NamedPropertyDescriptor &property) {
-  const auto &primitiveType = gd::ValueTypeMetadata::GetPrimitiveValueType(
-      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-          property.GetType()));
-  if (primitiveType != "boolean" && primitiveType != "number" &&
-      primitiveType != "string") {
+  auto &type = property.GetType();
+  if (type != "Boolean" && type != "Number" && type != "String" &&
+      type != "Choice" && type != "Color" && type != "LeaderboardId") {
    return false;
  }

@@ -248,13 +264,12 @@ gd::String PropertyFunctionGenerator::GetStringifiedExtraInfo(
    gd::String arrayString;
    arrayString += "[";
    bool isFirst = true;
-    for (const auto &choice : property.GetChoices()) {
+    for (const gd::String &choice : property.GetExtraInfo()) {
      if (!isFirst) {
        arrayString += ",";
      }
      isFirst = false;
-      // TODO Handle labels (and search "choice label")
-      arrayString += "\"" + choice.GetValue() + "\"";
+      arrayString += "\"" + choice + "\"";
    }
    arrayString += "]";
    return arrayString;
--- a/Core/GDCore/IDE/PropertyFunctionGenerator.h
+++ b/Core/GDCore/IDE/PropertyFunctionGenerator.h
@@ -3,7 +3,8 @@
 * Copyright 2008-2022 Florian Rival (Florian.Rival@gmail.com). All rights
 * reserved. This project is released under the MIT License.
 */
-#pragma once
+#ifndef GDCORE_PROPERTYFUNCTIONGENERATOR_H
+#define GDCORE_PROPERTYFUNCTIONGENERATOR_H

 namespace gd {
 class String;
@@ -72,3 +73,5 @@ class GD_CORE_API PropertyFunctionGenerator {
 };

 }  // namespace gd
+
+#endif  // GDCORE_PROPERTYFUNCTIONGENERATOR_H
--- a/Core/GDCore/IDE/ResourceExposer.cpp
+++ b/Core/GDCore/IDE/ResourceExposer.cpp
@@ -75,17 +75,6 @@ void ResourceExposer::ExposeProjectResources(
  // Expose global objects configuration resources
  auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
  objectWorker.Launch(project.GetObjects());
-
-  // Exposed extension event resources
-  // Note that using resources in extensions is very unlikely and probably not
-  // worth the effort of something smart.
-  auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    gd::ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
-        project, eventsFunctionsExtension, eventWorker);
-  }
 }

 void ResourceExposer::ExposeLayoutResources(
@@ -114,6 +103,16 @@ void ResourceExposer::ExposeLayoutResources(
  auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
  gd::ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(
      project, layout, eventWorker);
+
+  // Exposed extension event resources
+  // Note that using resources in extensions is very unlikely and probably not
+  // worth the effort of something smart.
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    gd::ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
+        project, eventsFunctionsExtension, eventWorker);
+  }
 }

 void ResourceExposer::ExposeEffectResources(
--- a/Core/GDCore/IDE/WholeProjectRefactorer.cpp
+++ b/Core/GDCore/IDE/WholeProjectRefactorer.cpp
@@ -11,7 +11,7 @@
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/DependenciesAnalyzer.h"
-#include "GDCore/IDE/ObjectVariableHelper.h"
+#include "GDCore/IDE/GroupVariableHelper.h"
 #include "GDCore/IDE/EventBasedBehaviorBrowser.h"
 #include "GDCore/IDE/EventBasedObjectBrowser.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
@@ -314,16 +314,9 @@ void WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
  variablesContainer.SerializeTo(editedSerializedVariables);
  variablesContainer.UnserializeFrom(originalSerializedVariables);

-  // Rename variables
-  // Pass an empty set to avoid deletion of actions/conditions or events using
-  // them.
-  // While we support refactoring that would remove all references (actions,
-  // conditions...) it's both a bit dangerous for the user and we would need to
-  // show the user what will be removed before doing so. For now, just clear the
-  // removed variables so they don't trigger any refactoring.
-  std::unordered_set<gd::String> removedVariableNames;
+  // Rename and remove variables
  gd::EventsVariableReplacer eventsVariableReplacer(
-      project.GetCurrentPlatform(), changeset, removedVariableNames,
+      project.GetCurrentPlatform(), changeset, changeset.removedVariableNames,
      variablesContainer);
  gd::ProjectBrowserHelper::ExposeProjectEvents(project,
                                                eventsVariableReplacer);
@@ -340,25 +333,9 @@ void WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
      project, eventsVariableInstructionTypeSwitcher);
 }

-// TODO Apply the refactor to external layouts.
-void WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
-    gd::Project &project, gd::VariablesContainer &objectVariablesContainer,
-    gd::InitialInstancesContainer &initialInstancesContainer,
-    const gd::String &objectName, const gd::VariablesChangeset &changeset,
-    const gd::SerializerElement &originalSerializedVariables) {
-  gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-      project, objectVariablesContainer, changeset,
-      originalSerializedVariables);
-
-  gd::ObjectVariableHelper::ApplyChangesToObjectInstances(
-      objectVariablesContainer, initialInstancesContainer, objectName,
-      changeset);
-}
-
 void WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
    gd::Project &project, gd::ObjectsContainer &globalObjectsContainer,
    gd::ObjectsContainer &objectsContainer,
-    gd::InitialInstancesContainer &initialInstancesContainer,
    const gd::VariablesContainer &groupVariablesContainer,
    const gd::ObjectGroup &objectGroup,
    const gd::VariablesChangeset &changeset,
@@ -378,15 +355,11 @@ void WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
    }
    auto &object = hasObject ? objectsContainer.GetObject(objectName)
                             : globalObjectsContainer.GetObject(objectName);
-    auto &objectVariablesContainer = object.GetVariables();
-
-    gd::ObjectVariableHelper::ApplyChangesToObjectInstances(
-      objectVariablesContainer, initialInstancesContainer, objectName,
-      changeset);
+    auto &variablesContainer = object.GetVariables();

    gd::EventsVariableReplacer eventsVariableReplacer(
        project.GetCurrentPlatform(), changeset,
-        removedVariableNames, objectVariablesContainer);
+        removedVariableNames, variablesContainer);
    gd::ProjectBrowserHelper::ExposeProjectEvents(project,
                                                  eventsVariableReplacer);
  }
@@ -399,12 +372,12 @@ void WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
                                                eventsVariableReplacer);

  // Apply changes to objects.
-  gd::ObjectVariableHelper::FillMissingGroupVariablesToObjects(
+  gd::GroupVariableHelper::FillMissingGroupVariablesToObjects(
      globalObjectsContainer,
      objectsContainer,
      objectGroup,
      originalSerializedVariables);
-  gd::ObjectVariableHelper::ApplyChangesToObjects(
+  gd::GroupVariableHelper::ApplyChangesToObjects(
      globalObjectsContainer, objectsContainer, groupVariablesContainer,
      objectGroup, changeset);

@@ -627,8 +600,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
  // instructions after they are renamed.

  // Free expressions
-  for (auto &&eventsFunction :
-       eventsFunctionsExtension.GetEventsFunctions().GetInternalVector()) {
+  for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
    if (eventsFunction->IsExpression()) {
      renameEventsFunction(*eventsFunction);
    }
@@ -645,8 +617,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
  }

  // Free instructions
-  for (auto &&eventsFunction :
-       eventsFunctionsExtension.GetEventsFunctions().GetInternalVector()) {
+  for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
    if (eventsFunction->IsAction() || eventsFunction->IsCondition()) {
      renameEventsFunction(*eventsFunction);
    }
@@ -726,12 +697,11 @@ void WholeProjectRefactorer::RenameEventsFunction(
    gd::Project &project,
    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
    const gd::String &oldFunctionName, const gd::String &newFunctionName) {
-  const auto &eventsFunctions = eventsFunctionsExtension.GetEventsFunctions();
-  if (!eventsFunctions.HasEventsFunctionNamed(oldFunctionName))
+  if (!eventsFunctionsExtension.HasEventsFunctionNamed(oldFunctionName))
    return;

  const gd::EventsFunction &eventsFunction =
-      eventsFunctions.GetEventsFunction(oldFunctionName);
+      eventsFunctionsExtension.GetEventsFunction(oldFunctionName);

  const WholeProjectBrowser wholeProjectExposer;
  DoRenameEventsFunction(
@@ -744,7 +714,7 @@ void WholeProjectRefactorer::RenameEventsFunction(

  if (eventsFunction.GetFunctionType() ==
      gd::EventsFunction::ExpressionAndCondition) {
-    for (auto &&otherFunction : eventsFunctions.GetInternalVector()) {
+    for (auto &&otherFunction : eventsFunctionsExtension.GetInternalVector()) {
      if (otherFunction->GetFunctionType() ==
              gd::EventsFunction::ActionWithOperator &&
          otherFunction->GetGetterName() == oldFunctionName) {
@@ -892,34 +862,16 @@ void WholeProjectRefactorer::RenameParameter(
  }
 }

-void WholeProjectRefactorer::ChangeParameterType(
-    gd::Project &project, gd::ProjectScopedContainers &projectScopedContainers,
-    gd::EventsFunction &eventsFunction,
-    const gd::ObjectsContainer &parameterObjectsContainer,
-    const gd::String &parameterName) {
-  std::unordered_set<gd::String> typeChangedPropertyNames;
-  typeChangedPropertyNames.insert(parameterName);
-  gd::VariablesContainer propertyVariablesContainer(
-      gd::VariablesContainer::SourceType::Properties);
-  gd::EventsVariableInstructionTypeSwitcher
-      eventsVariableInstructionTypeSwitcher(project.GetCurrentPlatform(),
-                                            typeChangedPropertyNames,
-                                            propertyVariablesContainer);
-  eventsVariableInstructionTypeSwitcher.Launch(eventsFunction.GetEvents(),
-                                               projectScopedContainers);
-}
-
 void WholeProjectRefactorer::MoveEventsFunctionParameter(
    gd::Project &project,
    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
    const gd::String &functionName, std::size_t oldIndex,
    std::size_t newIndex) {
-  const auto &eventsFunctions = eventsFunctionsExtension.GetEventsFunctions();
-  if (!eventsFunctions.HasEventsFunctionNamed(functionName))
+  if (!eventsFunctionsExtension.HasEventsFunctionNamed(functionName))
    return;

  const gd::EventsFunction &eventsFunction =
-      eventsFunctions.GetEventsFunction(functionName);
+      eventsFunctionsExtension.GetEventsFunction(functionName);

  const gd::String &eventsFunctionType =
      gd::PlatformExtension::GetEventsFunctionFullType(
@@ -1223,42 +1175,6 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
  gd::ProjectBrowserHelper::ExposeProjectEvents(project, conditionRenamer);
 }

-void WholeProjectRefactorer::ChangeEventsBasedBehaviorPropertyType(
-    gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedBehavior &eventsBasedBehavior,
-    const gd::String &propertyName) {
-  std::unordered_set<gd::String> typeChangedPropertyNames;
-  typeChangedPropertyNames.insert(propertyName);
-  gd::VariablesContainer propertyVariablesContainer(
-      gd::VariablesContainer::SourceType::Properties);
-  gd::EventsVariableInstructionTypeSwitcher
-      eventsVariableInstructionTypeSwitcher(project.GetCurrentPlatform(),
-                                            typeChangedPropertyNames,
-                                            propertyVariablesContainer);
-  gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
-      project, eventsFunctionsExtension, eventsBasedBehavior,
-      propertyVariablesContainer, eventsVariableInstructionTypeSwitcher);
-}
-
-void WholeProjectRefactorer::ChangeEventsBasedObjectPropertyType(
-    gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedObject &eventsBasedObject,
-    const gd::String &propertyName) {
-  std::unordered_set<gd::String> typeChangedPropertyNames;
-  typeChangedPropertyNames.insert(propertyName);
-  gd::VariablesContainer propertyVariablesContainer(
-      gd::VariablesContainer::SourceType::Properties);
-  gd::EventsVariableInstructionTypeSwitcher
-      eventsVariableInstructionTypeSwitcher(project.GetCurrentPlatform(),
-                                            typeChangedPropertyNames,
-                                            propertyVariablesContainer);
-  gd::ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-      project, eventsFunctionsExtension, eventsBasedObject,
-      propertyVariablesContainer, eventsVariableInstructionTypeSwitcher);
-}
-
 void WholeProjectRefactorer::AddBehaviorAndRequiredBehaviors(
    gd::Project &project, gd::Object &object, const gd::String &behaviorType,
    const gd::String &behaviorName) {
@@ -1781,14 +1697,6 @@ void WholeProjectRefactorer::DoRenameBehavior(
  projectBrowser.ExposeFunctions(project, behaviorParameterRenamer);
 }

-void WholeProjectRefactorer::UpdateBehaviorsSharedData(gd::Project &project) {
-  for (std::size_t i = 0; i < project.GetLayoutsCount(); ++i) {
-    gd::Layout &layout = project.GetLayout(i);
-
-    layout.UpdateBehaviorsSharedData(project);
-  }
-}
-
 void WholeProjectRefactorer::DoRenameObject(
    gd::Project &project, const gd::String &oldObjectType,
    const gd::String &newObjectType, const gd::ProjectBrowser &projectBrowser) {
@@ -2137,26 +2045,6 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsBasedObject(
      groups[g].RenameObject(oldName, newName);
    }
  }
-
-  for (auto &variant : eventsBasedObject.GetVariants().GetInternalVector()) {
-    auto &variantObjects = variant->GetObjects();
-    auto &variantObjectGroups = variantObjects.GetObjectGroups();
-    if (isObjectGroup) {
-      if (variantObjectGroups.Has(oldName)) {
-        variantObjectGroups.Get(oldName).SetName(newName);
-      }
-      // Object groups can't have instances or be in other groups
-    }
-    else {
-      if (variantObjects.HasObjectNamed(oldName)) {
-        variantObjects.GetObject(oldName).SetName(newName);
-      }
-      variant->GetInitialInstances().RenameInstancesOfObject(oldName, newName);
-      for (std::size_t g = 0; g < variantObjectGroups.size(); ++g) {
-        variantObjectGroups[g].RenameObject(oldName, newName);
-      }
-    }
-  }
 }

 void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsFunction(
--- a/Core/GDCore/IDE/WholeProjectRefactorer.h
+++ b/Core/GDCore/IDE/WholeProjectRefactorer.h
@@ -32,7 +32,6 @@ class UnfilledRequiredBehaviorPropertyProblem;
 class ProjectBrowser;
 class SerializerElement;
 class ProjectScopedContainers;
-class InitialInstancesContainer;
 struct VariablesRenamingChangesetNode;
 }  // namespace gd

@@ -81,23 +80,13 @@ class GD_CORE_API WholeProjectRefactorer {

  /**
   * \brief Refactor the project according to the changes (renaming or deletion)
-   * made to global or scene variables.
+   * made to variables.
   */
  static void ApplyRefactoringForVariablesContainer(
      gd::Project &project, gd::VariablesContainer &variablesContainer,
      const gd::VariablesChangeset &changeset,
      const gd::SerializerElement &originalSerializedVariables);

-  /**
-   * \brief Refactor the project according to the changes (renaming or deletion)
-   * made to object variables.
-   */
-  static void ApplyRefactoringForObjectVariablesContainer(
-      gd::Project &project, gd::VariablesContainer &objectVariablesContainer,
-      gd::InitialInstancesContainer &initialInstancesContainer,
-      const gd::String &objectName, const gd::VariablesChangeset &changeset,
-      const gd::SerializerElement &originalSerializedVariables);
-
  /**
   * \brief Refactor the project according to the changes (renaming or deletion)
   * made to variables of a group.
@@ -105,7 +94,6 @@ class GD_CORE_API WholeProjectRefactorer {
  static void ApplyRefactoringForGroupVariablesContainer(
      gd::Project &project, gd::ObjectsContainer &globalObjectsContainer,
      gd::ObjectsContainer &objectsContainer,
-      gd::InitialInstancesContainer &initialInstancesContainer,
      const gd::VariablesContainer &groupVariablesContainer,
      const gd::ObjectGroup &objectGroup,
      const gd::VariablesChangeset &changeset,
@@ -203,16 +191,6 @@ class GD_CORE_API WholeProjectRefactorer {
                  const gd::String &oldParameterName,
                  const gd::String &newParameterName);

-  /**
-   * \brief Refactor the function **after** a parameter has changed of type.
-   */
-  static void
-  ChangeParameterType(gd::Project &project,
-                      gd::ProjectScopedContainers &projectScopedContainers,
-                      gd::EventsFunction &eventsFunction,
-                      const gd::ObjectsContainer &parameterObjectsContainer,
-                      const gd::String &parameterName);
-
  /**
   * \brief Refactor the project **before** an events function parameter
   * is moved.
@@ -305,26 +283,6 @@ class GD_CORE_API WholeProjectRefactorer {
      const gd::String& oldPropertyName,
      const gd::String& newPropertyName);

-  /**
-   * \brief Refactor the project **after** a property of a behavior has
-   * changed of type.
-   */
-  static void ChangeEventsBasedBehaviorPropertyType(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedBehavior &eventsBasedBehavior,
-      const gd::String &propertyName);
-
-  /**
-   * \brief Refactor the project **after** a property of an object has
-   * changed of type.
-   */
-  static void ChangeEventsBasedObjectPropertyType(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedObject &eventsBasedObject,
-      const gd::String &propertyName);
-
  /**
   * \brief Add a behavior to an object and add required behaviors if necessary
   * to fill every behavior properties of the added behaviors.
@@ -704,16 +662,6 @@ class GD_CORE_API WholeProjectRefactorer {
  static size_t GetLayoutAndExternalLayoutLayerInstancesCount(
      gd::Project &project, gd::Layout &layout, const gd::String &layerName);

-  /**
-   * This ensures that the scenes had an instance of shared data for
-   * every behavior of every object that can be used on the scene
-   * (i.e. the objects of the scene and the global objects)
-   *
-   * Must be called when a behavior have been added/deleted
-   * from a global object or an object has been made global.
-   */
-  static void UpdateBehaviorsSharedData(gd::Project &project);
-
  virtual ~WholeProjectRefactorer(){};

 private:
--- a/Core/GDCore/Project/CustomConfigurationHelper.cpp
+++ b/Core/GDCore/Project/CustomConfigurationHelper.cpp
@@ -22,17 +22,15 @@ void CustomConfigurationHelper::InitializeContent(
    gd::SerializerElement &configurationContent) {
  for (auto &&property : properties.GetInternalVector()) {
    auto &element = configurationContent.AddChild(property->GetName());
+    auto propertyType = property->GetType();

-    const auto &valueType =
-        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-            property->GetType());
-    const auto &primitiveType =
-        gd::ValueTypeMetadata::GetPrimitiveValueType(valueType);
-    if (primitiveType == "string" || valueType == "behavior") {
+    if (propertyType == "String" || propertyType == "Choice" ||
+        propertyType == "Color" || propertyType == "Behavior" ||
+        propertyType == "Resource" || propertyType == "LeaderboardId") {
      element.SetStringValue(property->GetValue());
-    } else if (primitiveType == "number") {
+    } else if (propertyType == "Number") {
      element.SetDoubleValue(property->GetValue().To<double>());
-    } else if (primitiveType == "boolean") {
+    } else if (propertyType == "Boolean") {
      element.SetBoolValue(property->GetValue() == "true");
    }
  }
@@ -45,25 +43,23 @@ std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetPrope

  for (auto &property : properties.GetInternalVector()) {
    const auto &propertyName = property->GetName();
+    const auto &propertyType = property->GetType();

    // Copy the property
    objectProperties[propertyName] = *property;

    auto &newProperty = objectProperties[propertyName];

-    const auto &valueType =
-        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-            property->GetType());
-    const auto &primitiveType =
-        gd::ValueTypeMetadata::GetPrimitiveValueType(valueType);
    if (configurationContent.HasChild(propertyName)) {
-      if (primitiveType == "string" || valueType == "behavior") {
+      if (propertyType == "String" || propertyType == "Choice" ||
+          propertyType == "Color" || propertyType == "Behavior" ||
+          propertyType == "Resource" || propertyType == "LeaderboardId") {
        newProperty.SetValue(
            configurationContent.GetChild(propertyName).GetStringValue());
-      } else if (primitiveType == "number") {
+      } else if (propertyType == "Number") {
        newProperty.SetValue(gd::String::From(
            configurationContent.GetChild(propertyName).GetDoubleValue()));
-      } else if (primitiveType == "boolean") {
+      } else if (propertyType == "Boolean") {
        newProperty.SetValue(
            configurationContent.GetChild(propertyName).GetBoolValue()
                ? "true"
@@ -89,16 +85,15 @@ bool CustomConfigurationHelper::UpdateProperty(
  const auto &property = properties.Get(propertyName);

  auto &element = configurationContent.AddChild(propertyName);
+  const gd::String &propertyType = property.GetType();

-  const auto &valueType =
-      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(property.GetType());
-  const auto &primitiveType =
-      gd::ValueTypeMetadata::GetPrimitiveValueType(valueType);
-  if (primitiveType == "string" || valueType == "behavior") {
+  if (propertyType == "String" || propertyType == "Choice" ||
+      propertyType == "Color" || propertyType == "Behavior" ||
+      propertyType == "Resource" || propertyType == "LeaderboardId") {
    element.SetStringValue(newValue);
-  } else if (primitiveType == "number") {
+  } else if (propertyType == "Number") {
    element.SetDoubleValue(newValue.To<double>());
-  } else if (primitiveType == "boolean") {
+  } else if (propertyType == "Boolean") {
    element.SetBoolValue(newValue == "1");
  }

--- a/Core/GDCore/Project/CustomObjectConfiguration.cpp
+++ b/Core/GDCore/Project/CustomObjectConfiguration.cpp
@@ -19,7 +19,6 @@ using namespace gd;

 void CustomObjectConfiguration::Init(const gd::CustomObjectConfiguration& objectConfiguration) {
  project = objectConfiguration.project;
-  variantName = objectConfiguration.variantName;
  objectContent = objectConfiguration.objectContent;
  animations = objectConfiguration.animations;
  isMarkedAsOverridingEventsBasedObjectChildrenConfiguration =
@@ -166,7 +165,6 @@ void CustomObjectConfiguration::DoSerializeTo(SerializerElement& element) const
    animations.SerializeTo(animatableElement);
  }

-  element.SetAttribute("variant", variantName);
  if (IsOverridingEventsBasedObjectChildrenConfiguration()) {
    auto &childrenContentElement = element.AddChild("childrenContent");
    for (auto &pair : childObjectConfigurations) {
@@ -186,7 +184,6 @@ void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
    animations.UnserializeFrom(animatableElement);
  }

-  variantName = element.GetStringAttribute("variant");
  isMarkedAsOverridingEventsBasedObjectChildrenConfiguration =
      element.HasChild("childrenContent");
  if (isMarkedAsOverridingEventsBasedObjectChildrenConfiguration) {
@@ -250,29 +247,9 @@ void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& wor
  }
  const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());

-  if (IsForcedToOverrideEventsBasedObjectChildrenConfiguration()) {
-    for (auto &childObject : eventsBasedObject.GetObjects().GetObjects()) {
-      auto &configuration = GetChildObjectConfiguration(childObject->GetName());
-      configuration.ExposeResources(worker);
-    }
-  }
-  else if (eventsBasedObject.GetVariants().HasVariantNamed(variantName)) {
-    for (auto &childObject : eventsBasedObject.GetVariants()
-                                 .GetVariant(variantName)
-                                 .GetObjects()
-                                 .GetObjects()) {
-      childObject->GetConfiguration().ExposeResources(worker);
-    }
-  } else if (isMarkedAsOverridingEventsBasedObjectChildrenConfiguration) {
-    for (auto &childObject : eventsBasedObject.GetObjects().GetObjects()) {
-      auto &configuration = GetChildObjectConfiguration(childObject->GetName());
-      configuration.ExposeResources(worker);
-    }
-  } else {
-    for (auto &childObject :
-         eventsBasedObject.GetDefaultVariant().GetObjects().GetObjects()) {
-      childObject->GetConfiguration().ExposeResources(worker);
-    }
+  for (auto& childObject : eventsBasedObject.GetObjects().GetObjects()) {
+    auto &configuration = GetChildObjectConfiguration(childObject->GetName());
+    configuration.ExposeResources(worker);
  }
 }

--- a/Core/GDCore/Project/CustomObjectConfiguration.h
+++ b/Core/GDCore/Project/CustomObjectConfiguration.h
@@ -29,9 +29,9 @@ namespace gd {
 * "resource".
 */
 class CustomObjectConfiguration : public gd::ObjectConfiguration {
-public:
-  CustomObjectConfiguration(const Project &project_, const String &type_)
-      : project(&project_) {
+ public:
+  CustomObjectConfiguration(const Project& project_, const String& type_)
+      : project(&project_), isMarkedAsOverridingEventsBasedObjectChildrenConfiguration(false) {
    SetType(type_);
  }
  std::unique_ptr<gd::ObjectConfiguration> Clone() const override;
@@ -66,27 +66,6 @@ public:

  void ExposeResources(gd::ArbitraryResourceWorker& worker) override;

-  /**
-   * \brief Get the name of the events-based object variant used by this custom object.
-   */
-  const gd::String &GetVariantName() const { return variantName; };
-
-  /**
-   * \brief Set the name of the events-based object variant used by this custom object.
-   */
-  void SetVariantName(const gd::String &variantName_) {
-    variantName = variantName_;
-  }
-
-  /**
-   * Legacy events-based objects don't have any instance in their default
-   * variant since there wasn't a graphical editor at the time. In this case,
-   * the editor doesn't allow to choose a variant, but a variant may have stayed
-   * after a user rolled back the extension. This variant must be ignored.
-   *
-   * @return true when its events-based object doesn't have any initial
-   * instance.
-   */
  bool IsForcedToOverrideEventsBasedObjectChildrenConfiguration() const;

  bool IsMarkedAsOverridingEventsBasedObjectChildrenConfiguration() const {
@@ -166,7 +145,6 @@ protected:
  gd::SerializerElement objectContent;
  std::unordered_set<gd::String> unfoldedChildren;

-  gd::String variantName = "";
  bool isMarkedAsOverridingEventsBasedObjectChildrenConfiguration = false;
  mutable std::map<gd::String, std::unique_ptr<gd::ObjectConfiguration>> childObjectConfigurations;

--- a/Core/GDCore/Project/Effect.cpp
+++ b/Core/GDCore/Project/Effect.cpp
@@ -8,8 +8,6 @@
 #include "GDCore/Serialization/SerializerElement.h"

 namespace gd {
-  
-gd::String Effect::badStringParameterValue;

 void Effect::SerializeTo(SerializerElement& element) const {
  element.SetAttribute("name", GetName());
--- a/Core/GDCore/Project/Effect.h
+++ b/Core/GDCore/Project/Effect.h
@@ -3,7 +3,8 @@
 * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
 * reserved. This project is released under the MIT License.
 */
-#pragma once
+#ifndef GDCORE_EFFECT_H
+#define GDCORE_EFFECT_H
 #include <map>
 namespace gd {
 class SerializerElement;
@@ -34,43 +35,28 @@ class GD_CORE_API Effect {
  void SetFolded(bool fold = true) { folded = fold; }
  bool IsFolded() const { return folded; }

-  void SetDoubleParameter(const gd::String &name, double value) {
+  void SetDoubleParameter(const gd::String& name, double value) {
    doubleParameters[name] = value;
  }

-  double GetDoubleParameter(const gd::String &name) const {
-    auto itr = doubleParameters.find(name);
-    return itr == doubleParameters.end() ? 0 : itr->second;
+  double GetDoubleParameter(const gd::String& name) {
+    return doubleParameters[name];
  }

-  bool HasDoubleParameter(const gd::String &name) const {
-    return doubleParameters.find(name) != doubleParameters.end();
-  }
-
-  void SetStringParameter(const gd::String &name, const gd::String &value) {
+  void SetStringParameter(const gd::String& name, const gd::String& value) {
    stringParameters[name] = value;
  }

-  const gd::String &GetStringParameter(const gd::String &name) const {
-    auto itr = stringParameters.find(name);
-    return itr == stringParameters.end() ? badStringParameterValue : itr->second;
+  const gd::String& GetStringParameter(const gd::String& name) {
+    return stringParameters[name];
  }

-  bool HasStringParameter(const gd::String &name) const {
-    return stringParameters.find(name) != stringParameters.end();
-  }
-
-  void SetBooleanParameter(const gd::String &name, bool value) {
+  void SetBooleanParameter(const gd::String& name, bool value) {
    booleanParameters[name] = value;
  }

-  bool GetBooleanParameter(const gd::String &name) const {
-    auto itr = booleanParameters.find(name);
-    return itr == booleanParameters.end() ? false : itr->second;
-  }
-
-  bool HasBooleanParameter(const gd::String &name) const {
-    return booleanParameters.find(name) != booleanParameters.end();
+  bool GetBooleanParameter(const gd::String& name) {
+    return booleanParameters[name];
  }

  const std::map<gd::String, double>& GetAllDoubleParameters() const {
@@ -108,9 +94,7 @@ class GD_CORE_API Effect {
  std::map<gd::String, double> doubleParameters; ///< Values of parameters being doubles, keyed by names.
  std::map<gd::String, gd::String> stringParameters; ///< Values of parameters being strings, keyed by names.
  std::map<gd::String, bool> booleanParameters; ///< Values of parameters being booleans, keyed by names.
-
-  static gd::String badStringParameterValue;  ///< Empty string returned by
-                                              ///< GeStringParameter
 };

 }  // namespace gd
+#endif
--- a/Core/GDCore/Project/EventsBasedObject.cpp
+++ b/Core/GDCore/Project/EventsBasedObject.cpp
@@ -17,13 +17,19 @@ EventsBasedObject::EventsBasedObject()
    isAnimatable(false),
    isTextContainer(false),
    isInnerAreaFollowingParentSize(false),
-    isUsingLegacyInstancesRenderer(false) {
+    isUsingLegacyInstancesRenderer(false),
+    areaMinX(0),
+    areaMinY(0),
+    areaMinZ(0),
+    areaMaxX(64),
+    areaMaxY(64),
+    areaMaxZ(64),
+    objectsContainer(gd::ObjectsContainer::SourceType::Object) {
 }

 EventsBasedObject::~EventsBasedObject() {}

-
-void EventsBasedObject::SerializeToExternal(SerializerElement& element) const {
+void EventsBasedObject::SerializeTo(SerializerElement& element) const {
  element.SetAttribute("defaultName", defaultName);
  if (isRenderedIn3D) {
    element.SetBoolAttribute("is3D", true);
@@ -38,16 +44,20 @@ void EventsBasedObject::SerializeToExternal(SerializerElement& element) const {
    element.SetBoolAttribute("isInnerAreaFollowingParentSize", true);
  }
  element.SetBoolAttribute("isUsingLegacyInstancesRenderer", isUsingLegacyInstancesRenderer);
+  element.SetIntAttribute("areaMinX", areaMinX);
+  element.SetIntAttribute("areaMinY", areaMinY);
+  element.SetIntAttribute("areaMinZ", areaMinZ);
+  element.SetIntAttribute("areaMaxX", areaMaxX);
+  element.SetIntAttribute("areaMaxY", areaMaxY);
+  element.SetIntAttribute("areaMaxZ", areaMaxZ);

-  // The EventsBasedObjectVariant SerializeTo method override the name.
-  // AbstractEventsBasedEntity::SerializeTo must be done after.
-  defaultVariant.SerializeTo(element);
  AbstractEventsBasedEntity::SerializeTo(element);
-}
+  objectsContainer.SerializeObjectsTo(element.AddChild("objects"));
+  objectsContainer.SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
+  objectsContainer.GetObjectGroups().SerializeTo(element.AddChild("objectsGroups"));

-void EventsBasedObject::SerializeTo(SerializerElement& element) const {
-  SerializeToExternal(element);
-  variants.SerializeVariantsTo(element.AddChild("variants"));
+  layers.SerializeLayersTo(element.AddChild("layers"));
+  initialInstances.SerializeTo(element.AddChild("instances"));
 }

 void EventsBasedObject::UnserializeFrom(gd::Project& project,
@@ -58,22 +68,36 @@ void EventsBasedObject::UnserializeFrom(gd::Project& project,
  isTextContainer = element.GetBoolAttribute("isTextContainer", false);
  isInnerAreaFollowingParentSize =
      element.GetBoolAttribute("isInnerAreaFollowingParentSize", false);
+  areaMinX = element.GetIntAttribute("areaMinX", 0);
+  areaMinY = element.GetIntAttribute("areaMinY", 0);
+  areaMinZ = element.GetIntAttribute("areaMinZ", 0);
+  areaMaxX = element.GetIntAttribute("areaMaxX", 64);
+  areaMaxY = element.GetIntAttribute("areaMaxY", 64);
+  areaMaxZ = element.GetIntAttribute("areaMaxZ", 64);

-  defaultVariant.UnserializeFrom(project, element);
-  defaultVariant.SetName("");
  AbstractEventsBasedEntity::UnserializeFrom(project, element);
+  objectsContainer.UnserializeObjectsFrom(project, element.GetChild("objects"));
+  if (element.HasChild("objectsFolderStructure")) {
+    objectsContainer.UnserializeFoldersFrom(project, element.GetChild("objectsFolderStructure", 0));
+  }
+  objectsContainer.AddMissingObjectsInRootFolder();
+  objectsContainer.GetObjectGroups().UnserializeFrom(
+      element.GetChild("objectsGroups"));

-  if (element.HasChild("variants")) {
-    variants.UnserializeVariantsFrom(project, element.GetChild("variants"));
+  if (element.HasChild("layers")) {
+    layers.UnserializeLayersFrom(element.GetChild("layers"));
+  } else {
+    layers.Reset();
  }

+  initialInstances.UnserializeFrom(element.GetChild("instances"));
  if (element.HasChild("isUsingLegacyInstancesRenderer")) {
    isUsingLegacyInstancesRenderer =
        element.GetBoolAttribute("isUsingLegacyInstancesRenderer", false);
  }
  else {
    // Compatibility with GD <= 5.4.212
-    isUsingLegacyInstancesRenderer = GetInitialInstances().GetInstancesCount() == 0;
+    isUsingLegacyInstancesRenderer = initialInstances.GetInstancesCount() == 0;
    // end of compatibility code
  }
 }
--- a/Core/GDCore/Project/EventsBasedObject.h
+++ b/Core/GDCore/Project/EventsBasedObject.h
@@ -7,8 +7,6 @@

 #include <vector>
 #include "GDCore/Project/AbstractEventsBasedEntity.h"
-#include "GDCore/Project/EventsBasedObjectVariant.h"
-#include "GDCore/Project/EventsBasedObjectVariantsContainer.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/InitialInstancesContainer.h"
 #include "GDCore/Project/LayersContainer.h"
@@ -164,38 +162,18 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   */
  bool IsTextContainer() const { return isTextContainer; }

-  /**
-   * \brief Get the default variant of the custom object.
-   */
-  const gd::EventsBasedObjectVariant& GetDefaultVariant() const { return defaultVariant; }
-
-  /**
-   * \brief Get the default variant of the custom object.
-   */
-  gd::EventsBasedObjectVariant& GetDefaultVariant() { return defaultVariant; }
-
-  /**
-   * \brief Get the variants of the custom object.
-   */
-  const gd::EventsBasedObjectVariantsContainer& GetVariants() const { return variants; }
-
-  /**
-   * \brief Get the variants of the custom object.
-   */
-  gd::EventsBasedObjectVariantsContainer& GetVariants() { return variants; }
-
  /** \name Layers
   */
  ///@{
  /**
   * \brief Get the layers of the custom object.
   */
-  const gd::LayersContainer& GetLayers() const { return defaultVariant.GetLayers(); }
+  const gd::LayersContainer& GetLayers() const { return layers; }

  /**
   * \brief Get the layers of the custom object.
   */
-  gd::LayersContainer& GetLayers() { return defaultVariant.GetLayers(); }
+  gd::LayersContainer& GetLayers() { return layers; }
  ///@}

  /** \name Child objects
@@ -205,14 +183,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   * \brief Get the objects of the custom object.
   */
  gd::ObjectsContainer& GetObjects() {
-    return defaultVariant.GetObjects();
+    return objectsContainer;
  }

  /**
   * \brief Get the objects of the custom object.
   */
  const gd::ObjectsContainer& GetObjects() const {
-    return defaultVariant.GetObjects();
+    return objectsContainer;
  }
  ///@}

@@ -223,14 +201,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   * \brief Get the instances of the custom object.
   */
  gd::InitialInstancesContainer& GetInitialInstances() {
-    return defaultVariant.GetInitialInstances();
+    return initialInstances;
  }

  /**
   * \brief Get the instances of the custom object.
   */
  const gd::InitialInstancesContainer& GetInitialInstances() const {
-    return defaultVariant.GetInitialInstances();
+    return initialInstances;
  }

  /**
@@ -241,14 +219,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   * \see EventsBasedObject::GetInitialInstances
   */
  int GetAreaMinX() const {
-    return defaultVariant.GetAreaMinX();
+    return areaMinX;
  }

  /**
   * \brief Set the left bound of the custom object.
   */
-  void SetAreaMinX(int areaMinX) {
-    defaultVariant.SetAreaMinX(areaMinX);
+  void SetAreaMinX(int areaMinX_) {
+    areaMinX = areaMinX_;
  }

  /**
@@ -259,14 +237,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   * \see EventsBasedObject::GetInitialInstances
   */
  int GetAreaMinY() const {
-    return defaultVariant.GetAreaMinY();
+    return areaMinY;
  }

  /**
   * \brief Set the top bound of the custom object.
   */
-  void SetAreaMinY(int areaMinY) {
-    defaultVariant.SetAreaMinY(areaMinY);
+  void SetAreaMinY(int areaMinY_) {
+    areaMinY = areaMinY_;
  }

  /**
@@ -277,14 +255,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   * \see EventsBasedObject::GetInitialInstances
   */
  int GetAreaMinZ() const {
-    return defaultVariant.GetAreaMinZ();
+    return areaMinZ;
  }

  /**
   * \brief Set the min Z bound of the custom object.
   */
-  void SetAreaMinZ(int areaMinZ) {
-    defaultVariant.SetAreaMinZ(areaMinZ);
+  void SetAreaMinZ(int areaMinZ_) {
+    areaMinZ = areaMinZ_;
  }

  /**
@@ -295,14 +273,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   * \see EventsBasedObject::GetInitialInstances
   */
  int GetAreaMaxX() const {
-    return defaultVariant.GetAreaMaxX();
+    return areaMaxX;
  }

  /**
   * \brief Set the right bound of the custom object.
   */
-  void SetAreaMaxX(int areaMaxX) {
-    defaultVariant.SetAreaMaxX(areaMaxX);
+  void SetAreaMaxX(int areaMaxX_) {
+    areaMaxX = areaMaxX_;
  }

  /**
@@ -313,14 +291,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   * \see EventsBasedObject::GetInitialInstances
   */
  int GetAreaMaxY() const {
-    return defaultVariant.GetAreaMaxY();
+    return areaMaxY;
  }

  /**
   * \brief Set the bottom bound of the custom object.
   */
-  void SetAreaMaxY(int areaMaxY) {
-    defaultVariant.SetAreaMaxY(areaMaxY);
+  void SetAreaMaxY(int areaMaxY_) {
+    areaMaxY = areaMaxY_;
  }

  /**
@@ -331,22 +309,16 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   * \see EventsBasedObject::GetInitialInstances
   */
  int GetAreaMaxZ() const {
-    return defaultVariant.GetAreaMaxZ();
+    return areaMaxZ;
  }

  /**
   * \brief Set the bottom bound of the custom object.
   */
-  void SetAreaMaxZ(int areaMaxZ) {
-    defaultVariant.SetAreaMaxZ(areaMaxZ);
+  void SetAreaMaxZ(int areaMaxZ_) {
+    areaMaxZ = areaMaxZ_;
  }
  ///@}
-  
-  /**
-   * @brief Serialize the events-based object for an extension in an external file.
-   * Variants are not serialized.
-   */
-  void SerializeToExternal(SerializerElement& element) const;

  void SerializeTo(SerializerElement& element) const override;

@@ -360,8 +332,15 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
  bool isTextContainer;
  bool isInnerAreaFollowingParentSize;
  bool isUsingLegacyInstancesRenderer;
-  gd::EventsBasedObjectVariant defaultVariant;
-  gd::EventsBasedObjectVariantsContainer variants;
+  gd::InitialInstancesContainer initialInstances;
+  gd::LayersContainer layers;
+  gd::ObjectsContainer objectsContainer;
+  double areaMinX;
+  double areaMinY;
+  double areaMinZ;
+  double areaMaxX;
+  double areaMaxY;
+  double areaMaxZ;
 };

 }  // namespace gd
--- a/Core/GDCore/Project/EventsBasedObjectVariant.cpp
+++ b/Core/GDCore/Project/EventsBasedObjectVariant.cpp
@@ -1,73 +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 "EventsBasedObjectVariant.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-namespace gd {
-
-EventsBasedObjectVariant::EventsBasedObjectVariant()
-    : areaMinX(0), areaMinY(0), areaMinZ(0), areaMaxX(64), areaMaxY(64),
-      areaMaxZ(64), objectsContainer(gd::ObjectsContainer::SourceType::Object) {
-}
-
-EventsBasedObjectVariant::~EventsBasedObjectVariant() {}
-
-void EventsBasedObjectVariant::SerializeTo(SerializerElement &element) const {
-  element.SetAttribute("name", name);
-  if (!GetAssetStoreAssetId().empty() && !GetAssetStoreOriginalName().empty()) {
-    element.SetAttribute("assetStoreAssetId", GetAssetStoreAssetId());
-    element.SetAttribute("assetStoreOriginalName", GetAssetStoreOriginalName());
-  }
-  element.SetIntAttribute("areaMinX", areaMinX);
-  element.SetIntAttribute("areaMinY", areaMinY);
-  element.SetIntAttribute("areaMinZ", areaMinZ);
-  element.SetIntAttribute("areaMaxX", areaMaxX);
-  element.SetIntAttribute("areaMaxY", areaMaxY);
-  element.SetIntAttribute("areaMaxZ", areaMaxZ);
-
-  objectsContainer.SerializeObjectsTo(element.AddChild("objects"));
-  objectsContainer.SerializeFoldersTo(
-      element.AddChild("objectsFolderStructure"));
-  objectsContainer.GetObjectGroups().SerializeTo(
-      element.AddChild("objectsGroups"));
-
-  layers.SerializeLayersTo(element.AddChild("layers"));
-  initialInstances.SerializeTo(element.AddChild("instances"));
-  editorSettings.SerializeTo(element.AddChild("editionSettings"));
-}
-
-void EventsBasedObjectVariant::UnserializeFrom(
-    gd::Project &project, const SerializerElement &element) {
-  name = element.GetStringAttribute("name");
-  assetStoreAssetId = element.GetStringAttribute("assetStoreAssetId");
-  assetStoreOriginalName = element.GetStringAttribute("assetStoreOriginalName");
-  areaMinX = element.GetIntAttribute("areaMinX", 0);
-  areaMinY = element.GetIntAttribute("areaMinY", 0);
-  areaMinZ = element.GetIntAttribute("areaMinZ", 0);
-  areaMaxX = element.GetIntAttribute("areaMaxX", 64);
-  areaMaxY = element.GetIntAttribute("areaMaxY", 64);
-  areaMaxZ = element.GetIntAttribute("areaMaxZ", 64);
-
-  objectsContainer.UnserializeObjectsFrom(project, element.GetChild("objects"));
-  if (element.HasChild("objectsFolderStructure")) {
-    objectsContainer.UnserializeFoldersFrom(
-        project, element.GetChild("objectsFolderStructure", 0));
-  }
-  objectsContainer.AddMissingObjectsInRootFolder();
-  objectsContainer.GetObjectGroups().UnserializeFrom(
-      element.GetChild("objectsGroups"));
-
-  if (element.HasChild("layers")) {
-    layers.UnserializeLayersFrom(element.GetChild("layers"));
-  } else {
-    layers.Reset();
-  }
-  initialInstances.UnserializeFrom(element.GetChild("instances"));
-  editorSettings.UnserializeFrom(element.GetChild("editionSettings"));
-}
-
-} // namespace gd
--- a/Core/GDCore/Project/EventsBasedObjectVariant.h
+++ b/Core/GDCore/Project/EventsBasedObjectVariant.h
@@ -1,244 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2025 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include "GDCore/IDE/Dialogs/LayoutEditorCanvas/EditorSettings.h"
-#include "GDCore/Project/InitialInstancesContainer.h"
-#include "GDCore/Project/LayersContainer.h"
-#include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/String.h"
-#include <vector>
-
-namespace gd {
-class SerializerElement;
-class Project;
-} // namespace gd
-
-namespace gd {
-/**
- * \brief Represents a variation of style of an events-based object.
- *
- * \ingroup PlatformDefinition
- */
-class GD_CORE_API EventsBasedObjectVariant {
-public:
-  EventsBasedObjectVariant();
-  virtual ~EventsBasedObjectVariant();
-
-  /**
-   * \brief Return a pointer to a new EventsBasedObjectVariant constructed from
-   * this one.
-   */
-  EventsBasedObjectVariant *Clone() const {
-    return new EventsBasedObjectVariant(*this);
-  };
-
-  /**
-   * \brief Get the name of the variant.
-   */
-  const gd::String &GetName() const { return name; };
-
-  /**
-   * \brief Set the name of the variant.
-   */
-  EventsBasedObjectVariant &SetName(const gd::String &name_) {
-    name = name_;
-    return *this;
-  }
-
-  /** \name Layers
-   */
-  ///@{
-  /**
-   * \brief Get the layers of the variant.
-   */
-  const gd::LayersContainer &GetLayers() const { return layers; }
-
-  /**
-   * \brief Get the layers of the variant.
-   */
-  gd::LayersContainer &GetLayers() { return layers; }
-  ///@}
-
-  /** \name Child objects
-   */
-  ///@{
-  /**
-   * \brief Get the objects of the variant.
-   */
-  gd::ObjectsContainer &GetObjects() { return objectsContainer; }
-
-  /**
-   * \brief Get the objects of the variant.
-   */
-  const gd::ObjectsContainer &GetObjects() const { return objectsContainer; }
-  ///@}
-
-  /** \name Instances
-   */
-  ///@{
-  /**
-   * \brief Get the instances of the variant.
-   */
-  gd::InitialInstancesContainer &GetInitialInstances() {
-    return initialInstances;
-  }
-
-  /**
-   * \brief Get the instances of the variant.
-   */
-  const gd::InitialInstancesContainer &GetInitialInstances() const {
-    return initialInstances;
-  }
-
-  /**
-   * \brief Get the left bound of the variant.
-   *
-   * This is used only if there is any initial instances.
-   *
-   * \see EventsBasedObjectVariant::GetInitialInstances
-   */
-  int GetAreaMinX() const { return areaMinX; }
-
-  /**
-   * \brief Set the left bound of the variant.
-   */
-  void SetAreaMinX(int areaMinX_) { areaMinX = areaMinX_; }
-
-  /**
-   * \brief Get the top bound of the variant.
-   *
-   * This is used only if there is any initial instances.
-   *
-   * \see EventsBasedObjectVariant::GetInitialInstances
-   */
-  int GetAreaMinY() const { return areaMinY; }
-
-  /**
-   * \brief Set the top bound of the variant.
-   */
-  void SetAreaMinY(int areaMinY_) { areaMinY = areaMinY_; }
-
-  /**
-   * \brief Get the min Z bound of the variant.
-   *
-   * This is used only if there is any initial instances.
-   *
-   * \see EventsBasedObjectVariant::GetInitialInstances
-   */
-  int GetAreaMinZ() const { return areaMinZ; }
-
-  /**
-   * \brief Set the min Z bound of the variant.
-   */
-  void SetAreaMinZ(int areaMinZ_) { areaMinZ = areaMinZ_; }
-
-  /**
-   * \brief Get the right bound of the variant.
-   *
-   * This is used only if there is any initial instances.
-   *
-   * \see EventsBasedObjectVariant::GetInitialInstances
-   */
-  int GetAreaMaxX() const { return areaMaxX; }
-
-  /**
-   * \brief Set the right bound of the variant.
-   */
-  void SetAreaMaxX(int areaMaxX_) { areaMaxX = areaMaxX_; }
-
-  /**
-   * \brief Get the bottom bound of the variant.
-   *
-   * This is used only if there is any initial instances.
-   *
-   * \see EventsBasedObjectVariant::GetInitialInstances
-   */
-  int GetAreaMaxY() const { return areaMaxY; }
-
-  /**
-   * \brief Set the bottom bound of the variant.
-   */
-  void SetAreaMaxY(int areaMaxY_) { areaMaxY = areaMaxY_; }
-
-  /**
-   * \brief Get the max Z bound of the variant.
-   *
-   * This is used only if there is any initial instances.
-   *
-   * \see EventsBasedObjectVariant::GetInitialInstances
-   */
-  int GetAreaMaxZ() const { return areaMaxZ; }
-
-  /**
-   * \brief Set the bottom bound of the variant.
-   */
-  void SetAreaMaxZ(int areaMaxZ_) { areaMaxZ = areaMaxZ_; }
-  ///@}
-
-  /** \brief Change the object asset store id of this variant.
-   */
-  void SetAssetStoreAssetId(const gd::String &assetStoreId_) {
-    assetStoreAssetId = assetStoreId_;
-  };
-
-  /** \brief Return the object asset store id of this variant.
-   */
-  const gd::String &GetAssetStoreAssetId() const { return assetStoreAssetId; };
-
-  /** \brief Change the original name of the variant in the asset.
-   */
-  void SetAssetStoreOriginalName(const gd::String &assetStoreOriginalName_) {
-    assetStoreOriginalName = assetStoreOriginalName_;
-  };
-
-  /** \brief Return the original name of the variant in the asset.
-   */
-  const gd::String &GetAssetStoreOriginalName() const {
-    return assetStoreOriginalName;
-  };
-  
-  /**
-   * 
-   * \brief Get the user settings for the IDE.
-   */
-  const gd::EditorSettings& GetAssociatedEditorSettings() const {
-    return editorSettings;
-  }
-
-  /**
-   * \brief Get the user settings for the IDE.
-   */
-  gd::EditorSettings& GetAssociatedEditorSettings() { return editorSettings; }
-
-  void SerializeTo(SerializerElement &element) const;
-
-  void UnserializeFrom(gd::Project &project, const SerializerElement &element);
-
-private:
-  gd::String name;
-  gd::InitialInstancesContainer initialInstances;
-  gd::LayersContainer layers;
-  gd::ObjectsContainer objectsContainer;
-  double areaMinX;
-  double areaMinY;
-  double areaMinZ;
-  double areaMaxX;
-  double areaMaxY;
-  double areaMaxZ;
-  /**
-   * The ID of the asset if the object comes from the store.
-   */
-  gd::String assetStoreAssetId;
-  /**
-   * The original name of the variant in the asset if the object comes from the
-   * store.
-   */
-  gd::String assetStoreOriginalName;
-  gd::EditorSettings editorSettings;
-};
-
-} // namespace gd
--- a/Core/GDCore/Project/EventsBasedObjectVariantsContainer.h
+++ b/Core/GDCore/Project/EventsBasedObjectVariantsContainer.h
@@ -1,160 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include <vector>
-#include "GDCore/Project/EventsBasedObjectVariant.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/SerializableWithNameList.h"
-
-namespace gd {
-class SerializerElement;
-}
-
-namespace gd {
-
-/**
- * \brief Used as a base class for classes that will own events-backed
- * variants.
- *
- * \see gd::EventsBasedObjectVariantContainer
- * \ingroup PlatformDefinition
- */
-class GD_CORE_API EventsBasedObjectVariantsContainer
-    : private SerializableWithNameList<gd::EventsBasedObjectVariant> {
-public:
-  EventsBasedObjectVariantsContainer() {}
-
-  EventsBasedObjectVariantsContainer(const EventsBasedObjectVariantsContainer &other) {
-    Init(other);
-  }
-
-  EventsBasedObjectVariantsContainer &operator=(const EventsBasedObjectVariantsContainer &other) {
-    if (this != &other) {
-      Init(other);
-    }
-    return *this;
-  }
-
-  /** \name Events Functions management
-   */
-  ///@{
-  /**
-   * \brief Check if the variant with the specified name exists.
-   */
-  bool HasVariantNamed(const gd::String& name) const {
-    return Has(name);
-  }
-
-  /**
-   * \brief Get the variant with the specified name.
-   *
-   * \warning Trying to access to a not existing variant will result in
-   * undefined behavior.
-   */
-  gd::EventsBasedObjectVariant& GetVariant(const gd::String& name) {
-    return Get(name);
-  }
-
-  /**
-   * \brief Get the variant with the specified name.
-   *
-   * \warning Trying to access to a not existing variant will result in
-   * undefined behavior.
-   */
-  const gd::EventsBasedObjectVariant& GetVariant(const gd::String& name) const {
-    return Get(name);
-  }
-
-  /**
-   * \brief Get the variant at the specified index in the list.
-   *
-   * \warning Trying to access to a not existing variant will result in
-   * undefined behavior.
-   */
-  gd::EventsBasedObjectVariant& GetVariant(std::size_t index) {
-    return Get(index);
-  }
-
-  /**
-   * \brief Get the variant at the specified index in the list.
-   *
-   * \warning Trying to access to a not existing variant will result in
-   * undefined behavior.
-   */
-  const gd::EventsBasedObjectVariant& GetVariant(std::size_t index) const {
-    return Get(index);
-  }
-
-  /**
-   * \brief Return the number of variants.
-   */
-  std::size_t GetVariantsCount() const { return GetCount(); }
-
-  gd::EventsBasedObjectVariant& InsertNewVariant(const gd::String& name,
-                                              std::size_t position) {
-    return InsertNew(name, position);
-  }
-  gd::EventsBasedObjectVariant& InsertVariant(const gd::EventsBasedObjectVariant& object,
-                                           std::size_t position) {
-    return Insert(object, position);
-  }
-  void RemoveVariant(const gd::String& name) { return Remove(name); }
-  void ClearVariants() { return Clear(); }
-  void MoveVariant(std::size_t oldIndex, std::size_t newIndex) {
-    return Move(oldIndex, newIndex);
-  };
-  std::size_t GetVariantPosition(const gd::EventsBasedObjectVariant& eventsFunction) {
-    return GetPosition(eventsFunction);
-  };
-
-  /**
-   * \brief Provide a raw access to the vector containing the variants.
-   */
-  const std::vector<std::unique_ptr<gd::EventsBasedObjectVariant>>& GetInternalVector()
-      const {
-    return elements;
-  };
-
-  /**
-   * \brief Provide a raw access to the vector containing the variants.
-   */
-  std::vector<std::unique_ptr<gd::EventsBasedObjectVariant>>& GetInternalVector() {
-    return elements;
-  };
-  ///@}
-
-  /** \name Serialization
-   */
-  ///@{
-  /**
-   * \brief Serialize events variants.
-   */
-  void SerializeVariantsTo(SerializerElement& element) const {
-    return SerializeElementsTo("variant", element);
-  };
-
-  /**
-   * \brief Unserialize the events variants.
-   */
-  void UnserializeVariantsFrom(gd::Project& project,
-                                      const SerializerElement& element) {
-    return UnserializeElementsFrom("variant", project, element);
-  };
-  ///@}
- protected:
-  /**
-   * Initialize object using another object. Used by copy-ctor and assign-op.
-   * Don't forget to update me if members were changed!
-   */
-  void Init(const gd::EventsBasedObjectVariantsContainer& other) {
-    return SerializableWithNameList<gd::EventsBasedObjectVariant>::Init(other);
-  };
-
-private:
-};
-
-}  // namespace gd
--- a/Core/GDCore/Project/EventsFunctionsContainer.h
+++ b/Core/GDCore/Project/EventsFunctionsContainer.h
@@ -33,20 +33,6 @@ public:

  EventsFunctionsContainer(FunctionOwner source_) : owner(source_) {}

-  EventsFunctionsContainer(const EventsFunctionsContainer &other)
-      : owner(other.owner) {
-    Init(other);
-  }
-
-  EventsFunctionsContainer &operator=(const EventsFunctionsContainer &other) {
-    if (this != &other) {
-      owner = other.owner;
-      Init(other);
-    }
-
-    return *this;
-  }
-
  /**
   * \brief Get the source of the function container.
   * 
--- a/Core/GDCore/Project/EventsFunctionsExtension.cpp
+++ b/Core/GDCore/Project/EventsFunctionsExtension.cpp
@@ -15,13 +15,14 @@
 namespace gd {

 EventsFunctionsExtension::EventsFunctionsExtension() :
-      eventsFunctionsContainer(gd::EventsFunctionsContainer::FunctionOwner::Extension),
+    gd::EventsFunctionsContainer(
+        gd::EventsFunctionsContainer::FunctionOwner::Extension),
      globalVariables(gd::VariablesContainer::SourceType::ExtensionGlobal),
      sceneVariables(gd::VariablesContainer::SourceType::ExtensionScene) {}

 EventsFunctionsExtension::EventsFunctionsExtension(
    const EventsFunctionsExtension& other) :
-    eventsFunctionsContainer(
+    gd::EventsFunctionsContainer(
        gd::EventsFunctionsContainer::FunctionOwner::Extension) {
  Init(other);
 }
@@ -47,15 +48,14 @@ void EventsFunctionsExtension::Init(const gd::EventsFunctionsExtension& other) {
  previewIconUrl = other.previewIconUrl;
  iconUrl = other.iconUrl;
  helpPath = other.helpPath;
-  gdevelopVersion = other.gdevelopVersion;
-  eventsFunctionsContainer = other.eventsFunctionsContainer;
+  EventsFunctionsContainer::Init(other);
  eventsBasedBehaviors = other.eventsBasedBehaviors;
  eventsBasedObjects = other.eventsBasedObjects;
  globalVariables = other.GetGlobalVariables();
  sceneVariables = other.GetSceneVariables();
 }

-void EventsFunctionsExtension::SerializeTo(SerializerElement& element, bool isExternal) const {
+void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
  element.SetAttribute("version", version);
  element.SetAttribute("extensionNamespace", extensionNamespace);
  element.SetAttribute("shortDescription", shortDescription);
@@ -82,10 +82,6 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element, bool isEx
  element.SetAttribute("previewIconUrl", previewIconUrl);
  element.SetAttribute("iconUrl", iconUrl);
  element.SetAttribute("helpPath", helpPath);
-  element.SetAttribute("gdevelopVersion", gdevelopVersion);
-  if (changelog.GetChangesCount() > 0) {
-    changelog.SerializeTo(element.AddChild("changelog"));
-  }
  auto& dependenciesElement = element.AddChild("dependencies");
  dependenciesElement.ConsiderAsArray();
  for (auto& dependency : dependencies)
@@ -101,22 +97,11 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element, bool isEx
  GetGlobalVariables().SerializeTo(element.AddChild("globalVariables"));
  GetSceneVariables().SerializeTo(element.AddChild("sceneVariables"));

-  eventsFunctionsContainer.SerializeEventsFunctionsTo(
-      element.AddChild("eventsFunctions"));
+  SerializeEventsFunctionsTo(element.AddChild("eventsFunctions"));
  eventsBasedBehaviors.SerializeElementsTo(
      "eventsBasedBehavior", element.AddChild("eventsBasedBehaviors"));
-  if (isExternal) {
-    auto &eventsBasedObjectElement = element.AddChild("eventsBasedObjects");
-    eventsBasedObjectElement.ConsiderAsArrayOf("eventsBasedObject");
-    for (const auto &eventsBasedObject :
-         eventsBasedObjects.GetInternalVector()) {
-      eventsBasedObject->SerializeToExternal(
-          eventsBasedObjectElement.AddChild("eventsBasedObject"));
-    }
-  } else {
-    eventsBasedObjects.SerializeElementsTo(
-        "eventsBasedObject", element.AddChild("eventsBasedObjects"));
-  }
+  eventsBasedObjects.SerializeElementsTo(
+      "eventsBasedObject", element.AddChild("eventsBasedObjects"));
 }

 void EventsFunctionsExtension::UnserializeFrom(
@@ -141,10 +126,6 @@ void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
  previewIconUrl = element.GetStringAttribute("previewIconUrl");
  iconUrl = element.GetStringAttribute("iconUrl");
  helpPath = element.GetStringAttribute("helpPath");
-  gdevelopVersion = element.GetStringAttribute("gdevelopVersion");
-  if (element.HasChild("changelog")) {
-    changelog.UnserializeFrom(element.GetChild("changelog"));
-  }

  if (element.HasChild("origin")) {
    gd::String originName =
@@ -224,8 +205,7 @@ void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
 void EventsFunctionsExtension::UnserializeExtensionImplementationFrom(
    gd::Project& project,
    const SerializerElement& element) {
-  eventsFunctionsContainer.UnserializeEventsFunctionsFrom(
-      project, element.GetChild("eventsFunctions"));
+  UnserializeEventsFunctionsFrom(project, element.GetChild("eventsFunctions"));
  eventsBasedBehaviors.UnserializeElementsFrom(
      "eventsBasedBehavior", project, element.GetChild("eventsBasedBehaviors"));

--- a/Core/GDCore/Project/EventsFunctionsExtension.h
+++ b/Core/GDCore/Project/EventsFunctionsExtension.h
@@ -12,11 +12,9 @@
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/EventsFunctionsContainer.h"
-#include "GDCore/Project/EventsFunctionsExtensionChangelog.h"
 #include "GDCore/Project/VariablesContainer.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/SerializableWithNameList.h"
-
 namespace gd {
 class SerializerElement;
 class Project;
@@ -38,7 +36,7 @@ namespace gd {
 *
 * \ingroup PlatformDefinition
 */
-class GD_CORE_API EventsFunctionsExtension {
+class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
 public:
  EventsFunctionsExtension();
  EventsFunctionsExtension(const EventsFunctionsExtension&);
@@ -136,19 +134,6 @@ class GD_CORE_API EventsFunctionsExtension {
    return *this;
  }

-  /**
-   * \brief Get the GDevelop version required by this extension.
-   */
-  const gd::String& GetGDevelopVersion() const { return gdevelopVersion; };
-
-  /**
-   * \brief Set the GDevelop version required by this extension.
-   */
-  EventsFunctionsExtension& SetGDevelopVersion(const gd::String& gdevelopVersion_) {
-    gdevelopVersion = gdevelopVersion_;
-    return *this;
-  }
-
  /**
   * \brief Return a reference to the list of the events based behaviors.
   */
@@ -196,21 +181,6 @@ class GD_CORE_API EventsFunctionsExtension {
    return originIdentifier;
  }

-  /**
-   * \brief Return a reference to the functions of the events based behavior or object.
-   */
-  EventsFunctionsContainer& GetEventsFunctions() {
-    return eventsFunctionsContainer;
-  }
-
-  /**
-   * \brief Return a const reference to the functions of the events based
-   * behavior or object.
-   */
-  const EventsFunctionsContainer& GetEventsFunctions() const {
-    return eventsFunctionsContainer;
-  }
-
  /** \name Dependencies
   */
  ///@{
@@ -288,14 +258,7 @@ class GD_CORE_API EventsFunctionsExtension {
  /**
   * \brief Serialize the EventsFunctionsExtension to the specified element
   */
-  void SerializeTo(gd::SerializerElement& element, bool isExternal = false) const;
-
-  /**
-   * \brief Serialize the EventsFunctionsExtension to the specified element
-   */
-  void SerializeToExternal(gd::SerializerElement& element) const {
-    SerializeTo(element, true);
-  }
+  void SerializeTo(gd::SerializerElement& element) const;

  /**
   * \brief Load the EventsFunctionsExtension from the specified element.
@@ -407,14 +370,11 @@ class GD_CORE_API EventsFunctionsExtension {
  gd::String iconUrl;
  gd::String helpPath;  ///< The relative path to the help for this extension in
                        ///< the documentation (or an absolute URL).
-  gd::String gdevelopVersion;
-  gd::EventsFunctionsExtensionChangelog changelog;
  gd::SerializableWithNameList<EventsBasedBehavior> eventsBasedBehaviors;
  gd::SerializableWithNameList<EventsBasedObject> eventsBasedObjects;
  std::vector<gd::DependencyMetadata> dependencies;
  std::vector<gd::SourceFileMetadata> sourceFiles;

-  gd::EventsFunctionsContainer eventsFunctionsContainer;
  gd::VariablesContainer globalVariables;
  gd::VariablesContainer sceneVariables;
 };
--- a/Core/GDCore/Project/EventsFunctionsExtensionChangelog.h
+++ b/Core/GDCore/Project/EventsFunctionsExtensionChangelog.h
@@ -1,105 +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 <vector>
-
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-/**
- * @brief The change of a specific extension version (only the breaking
- * changes).
- */
-class GD_CORE_API EventsFunctionsExtensionVersionChange {
-public:
-  EventsFunctionsExtensionVersionChange(){};
-  virtual ~EventsFunctionsExtensionVersionChange(){};
-
-  const gd::String &GetVersion() const { return version; };
-  gd::EventsFunctionsExtensionVersionChange &
-  SetVersion(const gd::String &version_) {
-    version = version_;
-    return *this;
-  }
-
-  const gd::String &GetBreakingChangesDescription() const { return version; };
-  gd::EventsFunctionsExtensionVersionChange &
-  GetBreakingChangesDescription(const gd::String &breakingChangesDescription_) {
-    breakingChangesDescription = breakingChangesDescription_;
-    return *this;
-  }
-
-  /**
-   * \brief Serialize the EventsFunctionsExtensionVersionChange to the specified
-   * element
-   */
-  void SerializeTo(gd::SerializerElement &element) const {
-    element.SetAttribute("version", version);
-    element.AddChild("breaking")
-        .SetMultilineStringValue(breakingChangesDescription);
-  }
-
-  /**
-   * \brief Load the EventsFunctionsExtensionVersionChange from the specified
-   * element.
-   */
-  void UnserializeFrom(const gd::SerializerElement &element) {
-    version = element.GetStringAttribute("version");
-    breakingChangesDescription =
-        element.GetChild("breaking").GetMultilineStringValue();
-  }
-
-private:
-  gd::String version;
-  gd::String breakingChangesDescription;
-};
-
-/**
- * @brief The changelog of an extension (only the breaking changes).
- */
-class GD_CORE_API EventsFunctionsExtensionChangelog {
-public:
-  EventsFunctionsExtensionChangelog(){};
-  virtual ~EventsFunctionsExtensionChangelog(){};
-
-  /**
-   * \brief Return the number of variants.
-   */
-  std::size_t GetChangesCount() const { return versionChanges.size(); }
-
-  /**
-   * \brief Serialize the EventsFunctionsExtensionChangelog to the specified
-   * element
-   */
-  void SerializeTo(gd::SerializerElement &element) const {
-    element.ConsiderAsArray();
-    for (const auto &versionChange : versionChanges) {
-      versionChange.SerializeTo(element.AddChild(""));
-    }
-  }
-
-  /**
-   * \brief Load the EventsFunctionsExtensionChangelog from the specified
-   * element.
-   */
-  void UnserializeFrom(const gd::SerializerElement &element) {
-    versionChanges.clear();
-    element.ConsiderAsArray();
-    for (std::size_t i = 0; i < element.GetChildrenCount(); ++i) {
-      gd::EventsFunctionsExtensionVersionChange versionChange;
-      versionChange.UnserializeFrom(element.GetChild(i));
-      versionChanges.push_back(versionChange);
-    }
-  }
-
-private:
-  std::vector<gd::EventsFunctionsExtensionVersionChange> versionChanges;
-};
-
-} // namespace gd
--- a/Core/GDCore/Project/InitialInstance.h
+++ b/Core/GDCore/Project/InitialInstance.h
@@ -365,8 +365,6 @@ class GD_CORE_API InitialInstance {
   * the same initial instance between serialization.
   */
  InitialInstance& ResetPersistentUuid();
-
-  const gd::String& GetPersistentUuid() const { return persistentUuid; }
  ///@}

 private:
--- a/Core/GDCore/Project/InitialInstancesContainer.cpp
+++ b/Core/GDCore/Project/InitialInstancesContainer.cpp
@@ -41,16 +41,6 @@ void InitialInstancesContainer::IterateOverInstances(
  for (auto& instance : initialInstances) func(instance);
 }

-void InitialInstancesContainer::IterateOverInstances(
-  const std::function< bool(gd::InitialInstance &) >& func) {
-  for (auto& instance : initialInstances) {
-    bool shouldStop = func(instance);
-    if (shouldStop) {
-      return;
-    }
-  }
-}
-
 void InitialInstancesContainer::IterateOverInstancesWithZOrdering(
    gd::InitialInstanceFunctor& func, const gd::String& layerName) {
  std::vector<std::reference_wrapper<gd::InitialInstance>> sortedInstances;
--- a/Core/GDCore/Project/InitialInstancesContainer.h
+++ b/Core/GDCore/Project/InitialInstancesContainer.h
@@ -87,13 +87,6 @@ class GD_CORE_API InitialInstancesContainer {
   */
  void IterateOverInstances(InitialInstanceFunctor &func);

-  /**
-   * \brief Apply \a func to each instance of the container.
-   * \see InitialInstanceFunctor
-   */
-  void IterateOverInstances(
-    const std::function< bool(gd::InitialInstance &) >& func);
-
  /**
   * Get the instances on the specified layer,
   * sort them regarding their Z order and then apply \a func on them.
--- a/Core/GDCore/Project/Layout.cpp
+++ b/Core/GDCore/Project/Layout.cpp
@@ -36,7 +36,7 @@ namespace gd {

 gd::BehaviorsSharedData Layout::badBehaviorSharedData("", "");

-Layout::Layout(const Layout& other)
+Layout::Layout(const Layout &other)
    : objectsContainer(gd::ObjectsContainer::SourceType::Scene) {
  Init(other);
 }
@@ -54,8 +54,6 @@ Layout::Layout()
      backgroundColorG(209),
      backgroundColorB(209),
      stopSoundsOnStartup(true),
-      resourcesPreloading("inherit"),
-      resourcesUnloading("inherit"),
      standardSortMethod(true),
      disableInputWhenNotFocused(true),
      variables(gd::VariablesContainer::SourceType::Scene),
@@ -246,10 +244,6 @@ void Layout::SerializeTo(SerializerElement& element) const {
  element.SetAttribute("title", GetWindowDefaultTitle());
  element.SetAttribute("standardSortMethod", standardSortMethod);
  element.SetAttribute("stopSoundsOnStartup", stopSoundsOnStartup);
-  if (resourcesPreloading != "inherit")
-    element.SetAttribute("resourcesPreloading", resourcesPreloading);
-  if (resourcesUnloading != "inherit")
-    element.SetAttribute("resourcesUnloading", resourcesUnloading);
  element.SetAttribute("disableInputWhenNotFocused",
                       disableInputWhenNotFocused);

@@ -310,10 +304,6 @@ void Layout::UnserializeFrom(gd::Project& project,
      element.GetStringAttribute("title", "(No title)", "titre"));
  standardSortMethod = element.GetBoolAttribute("standardSortMethod");
  stopSoundsOnStartup = element.GetBoolAttribute("stopSoundsOnStartup");
-  resourcesPreloading =
-      element.GetStringAttribute("resourcesPreloading", "inherit");
-  resourcesUnloading =
-      element.GetStringAttribute("resourcesUnloading", "inherit");
  disableInputWhenNotFocused =
      element.GetBoolAttribute("disableInputWhenNotFocused");

@@ -401,8 +391,6 @@ void Layout::Init(const Layout& other) {
  standardSortMethod = other.standardSortMethod;
  title = other.title;
  stopSoundsOnStartup = other.stopSoundsOnStartup;
-  resourcesPreloading = other.resourcesPreloading;
-  resourcesUnloading = other.resourcesUnloading;
  disableInputWhenNotFocused = other.disableInputWhenNotFocused;
  initialInstances = other.initialInstances;
  layers = other.layers;
--- a/Core/GDCore/Project/Layout.h
+++ b/Core/GDCore/Project/Layout.h
@@ -349,36 +349,6 @@ class GD_CORE_API Layout {
   * launched
   */
  bool StopSoundsOnStartup() const { return stopSoundsOnStartup; }
-
-  /**
-   * Set when the scene must preload its resources: `at-startup`, `never` or
-   * `inherit` (default).
-   */
-  void SetResourcesPreloading(gd::String resourcesPreloading_) {
-    resourcesPreloading = resourcesPreloading_;
-  }
-
-  /**
-   * Get when the scene must preload its resources: `at-startup`, `never` or
-   * `inherit` (default).
-   */
-  const gd::String& GetResourcesPreloading() const {
-    return resourcesPreloading;
-  }
-
-  /**
-   * Set when the scene must unload its resources: `at-scene-exit`, `never` or
-   * `inherit` (default).
-   */
-  void SetResourcesUnloading(gd::String resourcesUnloading_) {
-    resourcesUnloading = resourcesUnloading_;
-  }
-
-  /**
-   * Get when the scene must unload its resources: `at-scene-exit`, `never` or
-   * `inherit` (default).
-   */
-  const gd::String& GetResourcesUnloading() const { return resourcesUnloading; }
  ///@}

  /** \name Saving and loading
@@ -411,10 +381,6 @@ class GD_CORE_API Layout {
      behaviorsSharedData;   ///< Initial shared datas of behaviors
  bool stopSoundsOnStartup = true;  ///< True to make the scene stop all sounds at
                                    ///< startup.
-  gd::String
-      resourcesPreloading;  ///< `at-startup`, `never` or `inherit` (default).
-  gd::String
-      resourcesUnloading;  ///< `at-scene-exit`, `never` or `inherit` (default).
  bool standardSortMethod = true;   ///< True to sort objects using standard sort.
  bool disableInputWhenNotFocused = true;  /// If set to true, the input must be
                                           /// disabled when the window do not have the
--- a/Core/GDCore/Project/Object.cpp
+++ b/Core/GDCore/Project/Object.cpp
@@ -41,11 +41,6 @@ Object::Object(const gd::String& name_,
 }

 void Object::Init(const gd::Object& object) {
-  CopyWithoutConfiguration(object);
-  configuration = object.configuration->Clone();
-}
-
-void Object::CopyWithoutConfiguration(const gd::Object& object) {
  persistentUuid = object.persistentUuid;
  name = object.name;
  assetStoreId = object.assetStoreId;
@@ -56,6 +51,8 @@ void Object::CopyWithoutConfiguration(const gd::Object& object) {
  for (auto& it : object.behaviors) {
    behaviors[it.first] = gd::make_unique<gd::Behavior>(*it.second);
  }
+
+  configuration = object.configuration->Clone();
 }

 gd::ObjectConfiguration& Object::GetConfiguration() { return *configuration; }
--- a/Core/GDCore/Project/Object.h
+++ b/Core/GDCore/Project/Object.h
@@ -82,8 +82,6 @@ class GD_CORE_API Object {
    return gd::make_unique<gd::Object>(*this);
  }

-  void CopyWithoutConfiguration(const gd::Object& object);
-
  /**
   * \brief Return the object configuration.
   */
--- a/Core/GDCore/Project/ObjectFolderOrObject.cpp
+++ b/Core/GDCore/Project/ObjectFolderOrObject.cpp
@@ -137,15 +137,6 @@ void ObjectFolderOrObject::RemoveRecursivelyObjectNamed(
  }
 };

-void ObjectFolderOrObject::Clear() {
-  if (IsFolder()) {
-    for (auto& it : children) {
-      it->Clear();
-    }
-    children.clear();
-  }
-};
-
 bool ObjectFolderOrObject::IsADescendantOf(
    const ObjectFolderOrObject& otherObjectFolderOrObject) {
  if (parent == nullptr) return false;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Davy Hélard	1e8debf722	Try to fix events not rendering sometimes.	2025-01-06 17:58:18 +01:00
Davy Hélard	b66c2d5d6d	Remove dead code.	2025-01-06 17:09:09 +01:00
Davy Hélard	aedd6981a0	Format	2025-01-06 16:24:02 +01:00
Davy Hélard	862b2d637f	Remove commented code.	2025-01-06 16:24:01 +01:00
Davy Hélard	7405fb75d0	Remove useless line.	2025-01-06 16:24:01 +01:00
Davy Hélard	5a9c35657a	Avoid to use a delay.	2025-01-06 16:24:00 +01:00
Davy Hélard	64ad0931c4	Try to save the event-function scroll.	2025-01-06 16:24:00 +01:00